diff --git a/java-client/src/main/java/org/opensearch/client/ApiClient.java b/java-client/src/main/java/org/opensearch/client/ApiClient.java
index 1938dea4bb..327fc235ec 100644
--- a/java-client/src/main/java/org/opensearch/client/ApiClient.java
+++ b/java-client/src/main/java/org/opensearch/client/ApiClient.java
@@ -32,12 +32,11 @@
 
 package org.opensearch.client;
 
-import org.opensearch.client.transport.TransportOptions;
-import org.opensearch.client.transport.Transport;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapperBase;
-
-import javax.annotation.Nullable;
+import org.opensearch.client.transport.Transport;
+import org.opensearch.client.transport.TransportOptions;
 
 public abstract class ApiClient<T extends Transport, Self extends ApiClient<T, Self>> {
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/OpenSearchAsyncClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/OpenSearchAsyncClient.java
index 0aa60b542c..5d869c6f59 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/OpenSearchAsyncClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/OpenSearchAsyncClient.java
@@ -32,9 +32,13 @@
 
 package org.opensearch.client.opensearch;
 
+import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch.cat.OpenSearchCatAsyncClient;
 import org.opensearch.client.opensearch.cluster.OpenSearchClusterAsyncClient;
 import org.opensearch.client.opensearch.core.BulkRequest;
@@ -126,1470 +130,1567 @@
 import org.opensearch.client.opensearch.shutdown.OpenSearchShutdownAsyncClient;
 import org.opensearch.client.opensearch.snapshot.OpenSearchSnapshotAsyncClient;
 import org.opensearch.client.opensearch.tasks.OpenSearchTasksAsyncClient;
-import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.JsonEndpoint;
+import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.TransportOptions;
 import org.opensearch.client.transport.endpoints.BooleanResponse;
 import org.opensearch.client.transport.endpoints.EndpointWithResponseMapperAttr;
 import org.opensearch.client.util.ObjectBuilder;
-import java.io.IOException;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 /**
  * Client for the namespace.
  */
 public class OpenSearchAsyncClient extends ApiClient<OpenSearchTransport, OpenSearchAsyncClient> {
 
-	public OpenSearchAsyncClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchAsyncClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchAsyncClient(this.transport, transportOptions);
-	}
-
-	// ----- Child clients
-
-	public OpenSearchCatAsyncClient cat() {
-		return new OpenSearchCatAsyncClient(this.transport, this.transportOptions);
-	}
-
-
-	public OpenSearchClusterAsyncClient cluster() {
-		return new OpenSearchClusterAsyncClient(this.transport, this.transportOptions);
-	}
-
-	public OpenSearchDanglingIndicesAsyncClient danglingIndices() {
-		return new OpenSearchDanglingIndicesAsyncClient(this.transport, this.transportOptions);
-	}
-
-	public OpenSearchFeaturesAsyncClient features() {
-		return new OpenSearchFeaturesAsyncClient(this.transport, this.transportOptions);
-	}
-
-	public OpenSearchIndicesAsyncClient indices() {
-		return new OpenSearchIndicesAsyncClient(this.transport, this.transportOptions);
-	}
-
-	public OpenSearchIngestAsyncClient ingest() {
-		return new OpenSearchIngestAsyncClient(this.transport, this.transportOptions);
-	}
-
-	public OpenSearchNodesAsyncClient nodes() {
-		return new OpenSearchNodesAsyncClient(this.transport, this.transportOptions);
-	}
-
-	public OpenSearchShutdownAsyncClient shutdown() {
-		return new OpenSearchShutdownAsyncClient(this.transport, this.transportOptions);
-	}
-
-	public OpenSearchSnapshotAsyncClient snapshot() {
-		return new OpenSearchSnapshotAsyncClient(this.transport, this.transportOptions);
-	}
-
-	public OpenSearchTasksAsyncClient tasks() {
-		return new OpenSearchTasksAsyncClient(this.transport, this.transportOptions);
-	}
-
-	// ----- Endpoint: bulk
-
-	/**
-	 * Allows to perform multiple index/update/delete operations in a single
-	 * request.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<BulkResponse> bulk(BulkRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<BulkRequest, BulkResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<BulkRequest, BulkResponse, ErrorResponse>) BulkRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to perform multiple index/update/delete operations in a single
-	 * request.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link BulkRequest}
-	 *
-	 */
-
-	public final CompletableFuture<BulkResponse> bulk(Function<BulkRequest.Builder, ObjectBuilder<BulkRequest>> fn)
-			throws IOException, OpenSearchException {
-		return bulk(fn.apply(new BulkRequest.Builder()).build());
-	}
-
-	/**
-	 * Allows to perform multiple index/update/delete operations in a single
-	 * request.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<BulkResponse> bulk() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new BulkRequest.Builder().build(), BulkRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: clear_scroll
-
-	/**
-	 * Explicitly clears the search context for a scroll.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ClearScrollResponse> clearScroll(ClearScrollRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ClearScrollRequest, ClearScrollResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ClearScrollRequest, ClearScrollResponse, ErrorResponse>) ClearScrollRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Explicitly clears the search context for a scroll.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ClearScrollRequest}
-	 *
-	 */
-
-	public final CompletableFuture<ClearScrollResponse> clearScroll(
-			Function<ClearScrollRequest.Builder, ObjectBuilder<ClearScrollRequest>> fn)
-			throws IOException, OpenSearchException {
-		return clearScroll(fn.apply(new ClearScrollRequest.Builder()).build());
-	}
-
-	/**
-	 * Explicitly clears the search context for a scroll.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ClearScrollResponse> clearScroll() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new ClearScrollRequest.Builder().build(),
-				ClearScrollRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: count
-
-	/**
-	 * Returns number of documents matching a query.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<CountResponse> count(CountRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CountRequest, CountResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CountRequest, CountResponse, ErrorResponse>) CountRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns number of documents matching a query.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CountRequest}
-	 *
-	 */
-
-	public final CompletableFuture<CountResponse> count(Function<CountRequest.Builder, ObjectBuilder<CountRequest>> fn)
-			throws IOException, OpenSearchException {
-		return count(fn.apply(new CountRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns number of documents matching a query.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<CountResponse> count() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new CountRequest.Builder().build(), CountRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: create
-
-	/**
-	 * Creates a new document in the index.
-	 * <p>
-	 * Returns a 409 response when a document with a same ID already exists in the
-	 * index.
-	 * 
-	 *
-	 */
-
-	public <TDocument> CompletableFuture<CreateResponse> create(CreateRequest<TDocument> request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CreateRequest<?>, CreateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CreateRequest<?>, CreateResponse, ErrorResponse>) CreateRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates a new document in the index.
-	 * <p>
-	 * Returns a 409 response when a document with a same ID already exists in the
-	 * index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CreateRequest}
-	 *
-	 */
-
-	public final <TDocument> CompletableFuture<CreateResponse> create(
-			Function<CreateRequest.Builder<TDocument>, ObjectBuilder<CreateRequest<TDocument>>> fn)
-			throws IOException, OpenSearchException {
-		return create(fn.apply(new CreateRequest.Builder<TDocument>()).build());
-	}
-
-	// ----- Endpoint: create_point_in_time
-
-	/**
-	 * Provides low-level information about the disk utilization of a PIT by
-	 * describing its Lucene segments.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<CreatePitResponse> createPit(CreatePitRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CreatePitRequest, CreatePitResponse, ErrorResponse> endpoint = (JsonEndpoint<CreatePitRequest, CreatePitResponse, ErrorResponse>) CreatePitRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Provides low-level information about the disk utilization of a PIT by
-	 * describing its Lucene segments.
-	 * 
-	 * @param fn
-	 *           a function that initializes a builder to create the
-	 *           {@link CreatePitRequest}
-	 *
-	 */
-
-	public final CompletableFuture<CreatePitResponse> createPit(
-			Function<CreatePitRequest.Builder, ObjectBuilder<CreatePitRequest>> fn)
-			throws IOException, OpenSearchException {
-		return createPit(fn.apply(new CreatePitRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: delete
-
-	/**
-	 * Removes a document from the index.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<DeleteResponse> delete(DeleteRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteRequest, DeleteResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteRequest, DeleteResponse, ErrorResponse>) DeleteRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Removes a document from the index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteRequest}
-	 *
-	 */
-
-	public final CompletableFuture<DeleteResponse> delete(
-			Function<DeleteRequest.Builder, ObjectBuilder<DeleteRequest>> fn)
-			throws IOException, OpenSearchException {
-		return delete(fn.apply(new DeleteRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: delete_point_in_time
-
-	/**
-	 * Delete Point In Time
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<DeletePitResponse> deletePit(DeletePitRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeletePitRequest, DeletePitResponse, ErrorResponse> endpoint = (JsonEndpoint<DeletePitRequest, DeletePitResponse, ErrorResponse>) DeletePitRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Delete Point In Time
-	 * 
-	 * @param fn
-	 *           a function that initializes a builder to create the
-	 *           {@link DeletePitRequest}
-	 *
-	 */
-
-	public final CompletableFuture<DeletePitResponse> deletePit(
-			Function<DeletePitRequest.Builder, ObjectBuilder<DeletePitRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deletePit(fn.apply(new DeletePitRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: delete_by_query
-
-	/**
-	 * Deletes documents matching the provided query.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<DeleteByQueryResponse> deleteByQuery(DeleteByQueryRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteByQueryRequest, DeleteByQueryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteByQueryRequest, DeleteByQueryResponse, ErrorResponse>) DeleteByQueryRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes documents matching the provided query.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteByQueryRequest}
-	 *
-	 */
-
-	public final CompletableFuture<DeleteByQueryResponse> deleteByQuery(
-			Function<DeleteByQueryRequest.Builder, ObjectBuilder<DeleteByQueryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteByQuery(fn.apply(new DeleteByQueryRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: delete_by_query_rethrottle
-
-	/**
-	 * Changes the number of requests per second for a particular Delete By Query
-	 * operation.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<DeleteByQueryRethrottleResponse> deleteByQueryRethrottle(
-			DeleteByQueryRethrottleRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteByQueryRethrottleRequest, DeleteByQueryRethrottleResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteByQueryRethrottleRequest, DeleteByQueryRethrottleResponse, ErrorResponse>)
-						DeleteByQueryRethrottleRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Changes the number of requests per second for a particular Delete By Query
-	 * operation.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteByQueryRethrottleRequest}
-	 *
-	 */
-
-	public final CompletableFuture<DeleteByQueryRethrottleResponse> deleteByQueryRethrottle(
-			Function<DeleteByQueryRethrottleRequest.Builder, ObjectBuilder<DeleteByQueryRethrottleRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteByQueryRethrottle(fn.apply(new DeleteByQueryRethrottleRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: delete_script
-
-	/**
-	 * Deletes a script.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<DeleteScriptResponse> deleteScript(DeleteScriptRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteScriptRequest, DeleteScriptResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteScriptRequest, DeleteScriptResponse, ErrorResponse>) DeleteScriptRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes a script.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteScriptRequest}
-	 *
-	 */
-
-	public final CompletableFuture<DeleteScriptResponse> deleteScript(
-			Function<DeleteScriptRequest.Builder, ObjectBuilder<DeleteScriptRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteScript(fn.apply(new DeleteScriptRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: exists
-
-	/**
-	 * Returns information about whether a document exists in an index.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<BooleanResponse> exists(ExistsRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ExistsRequest, BooleanResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ExistsRequest, BooleanResponse, ErrorResponse>) ExistsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about whether a document exists in an index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ExistsRequest}
-	 *
-	 */
-
-	public final CompletableFuture<BooleanResponse> exists(
-			Function<ExistsRequest.Builder, ObjectBuilder<ExistsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return exists(fn.apply(new ExistsRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: exists_source
-
-	/**
-	 * Returns information about whether a document source exists in an index.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<BooleanResponse> existsSource(ExistsSourceRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ExistsSourceRequest, BooleanResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ExistsSourceRequest, BooleanResponse, ErrorResponse>) ExistsSourceRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about whether a document source exists in an index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ExistsSourceRequest}
-	 *
-	 */
-
-	public final CompletableFuture<BooleanResponse> existsSource(
-			Function<ExistsSourceRequest.Builder, ObjectBuilder<ExistsSourceRequest>> fn)
-			throws IOException, OpenSearchException {
-		return existsSource(fn.apply(new ExistsSourceRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: explain
-
-	/**
-	 * Returns information about why a specific matches (or doesn't match) a query.
-	 * 
-	 *
-	 */
-
-	public <TDocument> CompletableFuture<ExplainResponse<TDocument>> explain(ExplainRequest request,
-			Class<TDocument> tDocumentClass) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ExplainRequest, ExplainResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<ExplainRequest, ExplainResponse<TDocument>, ErrorResponse>) ExplainRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.explain.TDocument", getDeserializer(tDocumentClass));
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about why a specific matches (or doesn't match) a query.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ExplainRequest}
-	 *
-	 */
-
-	public final <TDocument> CompletableFuture<ExplainResponse<TDocument>> explain(
-			Function<ExplainRequest.Builder, ObjectBuilder<ExplainRequest>> fn, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		return explain(fn.apply(new ExplainRequest.Builder()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: field_caps
-
-	/**
-	 * Returns the information about the capabilities of fields among multiple
-	 * indices.
-	 */
-
-	public CompletableFuture<FieldCapsResponse> fieldCaps(FieldCapsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<FieldCapsRequest, FieldCapsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<FieldCapsRequest, FieldCapsResponse, ErrorResponse>) FieldCapsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns the information about the capabilities of fields among multiple
-	 * indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link FieldCapsRequest}
-	 *
-	 */
-
-	public final CompletableFuture<FieldCapsResponse> fieldCaps(
-			Function<FieldCapsRequest.Builder, ObjectBuilder<FieldCapsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return fieldCaps(fn.apply(new FieldCapsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns the information about the capabilities of fields among multiple
-	 * indices.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<FieldCapsResponse> fieldCaps() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new FieldCapsRequest.Builder().build(), FieldCapsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: get
-
-	/**
-	 * Returns a document.
-	 * 
-	 *
-	 */
-
-	public <TDocument> CompletableFuture<GetResponse<TDocument>> get(GetRequest request,
-			Class<TDocument> tDocumentClass) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetRequest, GetResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<GetRequest, GetResponse<TDocument>, ErrorResponse>) GetRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.get.TDocument", getDeserializer(tDocumentClass));
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns a document.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetRequest}
-	 *
-	 */
-
-	public final <TDocument> CompletableFuture<GetResponse<TDocument>> get(
-			Function<GetRequest.Builder, ObjectBuilder<GetRequest>> fn, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		return get(fn.apply(new GetRequest.Builder()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: get_script
-
-	/**
-	 * Returns a script.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetScriptResponse> getScript(GetScriptRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetScriptRequest, GetScriptResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetScriptRequest, GetScriptResponse, ErrorResponse>) GetScriptRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns a script.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetScriptRequest}
-	 *
-	 */
-
-	public final CompletableFuture<GetScriptResponse> getScript(
-			Function<GetScriptRequest.Builder, ObjectBuilder<GetScriptRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getScript(fn.apply(new GetScriptRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: get_script_context
-
-	/**
-	 * Returns all script contexts.
-	 * 
-	 *
-	 */
-	public CompletableFuture<GetScriptContextResponse> getScriptContext() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(GetScriptContextRequest._INSTANCE, GetScriptContextRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: get_script_languages
-
-	/**
-	 * Returns available script types, languages and contexts
-	 * 
-	 *
-	 */
-	public CompletableFuture<GetScriptLanguagesResponse> getScriptLanguages()
-			throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(GetScriptLanguagesRequest._INSTANCE,
-				GetScriptLanguagesRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: get_source
-
-	/**
-	 * Returns the source of a document.
-	 * 
-	 *
-	 */
-
-	public <TDocument> CompletableFuture<GetSourceResponse<TDocument>> getSource(GetSourceRequest request,
-			Class<TDocument> tDocumentClass) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetSourceRequest, GetSourceResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<GetSourceRequest, GetSourceResponse<TDocument>, ErrorResponse>) GetSourceRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.get_source.TDocument", getDeserializer(tDocumentClass));
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns the source of a document.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetSourceRequest}
-	 *
-	 */
-
-	public final <TDocument> CompletableFuture<GetSourceResponse<TDocument>> getSource(
-			Function<GetSourceRequest.Builder, ObjectBuilder<GetSourceRequest>> fn, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		return getSource(fn.apply(new GetSourceRequest.Builder()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: index
-
-	/**
-	 * Creates or updates a document in an index.
-	 * 
-	 *
-	 */
-
-	public <TDocument> CompletableFuture<IndexResponse> index(IndexRequest<TDocument> request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<IndexRequest<?>, IndexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<IndexRequest<?>, IndexResponse, ErrorResponse>) IndexRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates or updates a document in an index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link IndexRequest}
-	 *
-	 */
-
-	public final <TDocument> CompletableFuture<IndexResponse> index(
-			Function<IndexRequest.Builder<TDocument>, ObjectBuilder<IndexRequest<TDocument>>> fn)
-			throws IOException, OpenSearchException {
-		return index(fn.apply(new IndexRequest.Builder<TDocument>()).build());
-	}
-
-	// ----- Endpoint: info
-
-	/**
-	 * Returns basic information about the cluster.
-	 * 
-	 *
-	 */
-	public CompletableFuture<InfoResponse> info() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(InfoRequest._INSTANCE, InfoRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: list_point_in_time
-
-	/**
-	 * List all Point In Time
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ListAllPitResponse> listAllPit()
-			throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(ListAllPitRequest._INSTANCE, ListAllPitRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: mget
-
-	/**
-	 * Allows to get multiple documents in one request.
-	 * 
-	 *
-	 */
-
-	public <TDocument> CompletableFuture<MgetResponse<TDocument>> mget(MgetRequest request,
-			Class<TDocument> tDocumentClass) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<MgetRequest, MgetResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<MgetRequest, MgetResponse<TDocument>, ErrorResponse>) MgetRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.mget.TDocument", getDeserializer(tDocumentClass));
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to get multiple documents in one request.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link MgetRequest}
-	 *
-	 */
-
-	public final <TDocument> CompletableFuture<MgetResponse<TDocument>> mget(
-			Function<MgetRequest.Builder, ObjectBuilder<MgetRequest>> fn, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		return mget(fn.apply(new MgetRequest.Builder()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: msearch
-
-	/**
-	 * Allows to execute several search operations in one request.
-	 * 
-	 *
-	 */
-
-	public <TDocument> CompletableFuture<MsearchResponse<TDocument>> msearch(MsearchRequest request,
-			Class<TDocument> tDocumentClass) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<MsearchRequest, MsearchResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<MsearchRequest, MsearchResponse<TDocument>, ErrorResponse>) MsearchRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.msearch.TDocument", getDeserializer(tDocumentClass));
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to execute several search operations in one request.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link MsearchRequest}
-	 *
-	 */
-
-	public final <TDocument> CompletableFuture<MsearchResponse<TDocument>> msearch(
-			Function<MsearchRequest.Builder, ObjectBuilder<MsearchRequest>> fn, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		return msearch(fn.apply(new MsearchRequest.Builder()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: msearch_template
-
-	/**
-	 * Allows to execute several search template operations in one request.
-	 * 
-	 *
-	 */
-
-	public <TDocument> CompletableFuture<MsearchTemplateResponse<TDocument>> msearchTemplate(
-			MsearchTemplateRequest request, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<MsearchTemplateRequest, MsearchTemplateResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<MsearchTemplateRequest, MsearchTemplateResponse<TDocument>, ErrorResponse>)
-						MsearchTemplateRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.msearch_template.TDocument", getDeserializer(tDocumentClass));
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to execute several search template operations in one request.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link MsearchTemplateRequest}
-	 *
-	 */
-
-	public final <TDocument> CompletableFuture<MsearchTemplateResponse<TDocument>> msearchTemplate(
-			Function<MsearchTemplateRequest.Builder, ObjectBuilder<MsearchTemplateRequest>> fn,
-			Class<TDocument> tDocumentClass) throws IOException, OpenSearchException {
-		return msearchTemplate(fn.apply(new MsearchTemplateRequest.Builder()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: mtermvectors
-
-	/**
-	 * Returns multiple termvectors in one request.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<MtermvectorsResponse> mtermvectors(MtermvectorsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<MtermvectorsRequest, MtermvectorsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<MtermvectorsRequest, MtermvectorsResponse, ErrorResponse>) MtermvectorsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns multiple termvectors in one request.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link MtermvectorsRequest}
-	 *
-	 */
-
-	public final CompletableFuture<MtermvectorsResponse> mtermvectors(
-			Function<MtermvectorsRequest.Builder, ObjectBuilder<MtermvectorsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return mtermvectors(fn.apply(new MtermvectorsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns multiple termvectors in one request.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<MtermvectorsResponse> mtermvectors() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new MtermvectorsRequest.Builder().build(),
-				MtermvectorsRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: ping
-
-	/**
-	 * Returns whether the cluster is running.
-	 * 
-	 *
-	 */
-	public CompletableFuture<BooleanResponse> ping() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(PingRequest._INSTANCE, PingRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: put_script
-
-	/**
-	 * Creates or updates a script.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<PutScriptResponse> putScript(PutScriptRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutScriptRequest, PutScriptResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutScriptRequest, PutScriptResponse, ErrorResponse>) PutScriptRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates or updates a script.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutScriptRequest}
-	 *
-	 */
-
-	public final CompletableFuture<PutScriptResponse> putScript(
-			Function<PutScriptRequest.Builder, ObjectBuilder<PutScriptRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putScript(fn.apply(new PutScriptRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: rank_eval
-
-	/**
-	 * Allows to evaluate the quality of ranked search results over a set of typical
-	 * search queries
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<RankEvalResponse> rankEval(RankEvalRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<RankEvalRequest, RankEvalResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<RankEvalRequest, RankEvalResponse, ErrorResponse>) RankEvalRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to evaluate the quality of ranked search results over a set of typical
-	 * search queries
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link RankEvalRequest}
-	 *
-	 */
-
-	public final CompletableFuture<RankEvalResponse> rankEval(
-			Function<RankEvalRequest.Builder, ObjectBuilder<RankEvalRequest>> fn)
-			throws IOException, OpenSearchException {
-		return rankEval(fn.apply(new RankEvalRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: reindex
-
-	/**
-	 * Allows to copy documents from one index to another, optionally filtering the
-	 * source documents by a query, changing the destination index settings, or
-	 * fetching the documents from a remote cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ReindexResponse> reindex(ReindexRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ReindexRequest, ReindexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ReindexRequest, ReindexResponse, ErrorResponse>) ReindexRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to copy documents from one index to another, optionally filtering the
-	 * source documents by a query, changing the destination index settings, or
-	 * fetching the documents from a remote cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ReindexRequest}
-	 *
-	 */
-
-	public final CompletableFuture<ReindexResponse> reindex(
-			Function<ReindexRequest.Builder, ObjectBuilder<ReindexRequest>> fn)
-			throws IOException, OpenSearchException {
-		return reindex(fn.apply(new ReindexRequest.Builder()).build());
-	}
-
-	/**
-	 * Allows to copy documents from one index to another, optionally filtering the
-	 * source documents by a query, changing the destination index settings, or
-	 * fetching the documents from a remote cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ReindexResponse> reindex() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new ReindexRequest.Builder().build(), ReindexRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: reindex_rethrottle
-
-	/**
-	 * Changes the number of requests per second for a particular Reindex operation.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ReindexRethrottleResponse> reindexRethrottle(ReindexRethrottleRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ReindexRethrottleRequest, ReindexRethrottleResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ReindexRethrottleRequest, ReindexRethrottleResponse, ErrorResponse>)
-						ReindexRethrottleRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Changes the number of requests per second for a particular Reindex operation.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ReindexRethrottleRequest}
-	 *
-	 */
-
-	public final CompletableFuture<ReindexRethrottleResponse> reindexRethrottle(
-			Function<ReindexRethrottleRequest.Builder, ObjectBuilder<ReindexRethrottleRequest>> fn)
-			throws IOException, OpenSearchException {
-		return reindexRethrottle(fn.apply(new ReindexRethrottleRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: render_search_template
-
-	/**
-	 * Allows to use the Mustache language to pre-render a search definition.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<RenderSearchTemplateResponse> renderSearchTemplate(RenderSearchTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<RenderSearchTemplateRequest, RenderSearchTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<RenderSearchTemplateRequest, RenderSearchTemplateResponse, ErrorResponse>)
-						RenderSearchTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to use the Mustache language to pre-render a search definition.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link RenderSearchTemplateRequest}
-	 *
-	 */
-
-	public final CompletableFuture<RenderSearchTemplateResponse> renderSearchTemplate(
-			Function<RenderSearchTemplateRequest.Builder, ObjectBuilder<RenderSearchTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return renderSearchTemplate(fn.apply(new RenderSearchTemplateRequest.Builder()).build());
-	}
-
-	/**
-	 * Allows to use the Mustache language to pre-render a search definition.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<RenderSearchTemplateResponse> renderSearchTemplate()
-			throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new RenderSearchTemplateRequest.Builder().build(),
-				RenderSearchTemplateRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: scripts_painless_execute
-
-	/**
-	 * Allows an arbitrary script to be executed and a result to be returned
-	 * 
-	 *
-	 */
-
-	public <TResult> CompletableFuture<ScriptsPainlessExecuteResponse<TResult>> scriptsPainlessExecute(
-			ScriptsPainlessExecuteRequest request, Class<TResult> tResultClass)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ScriptsPainlessExecuteRequest, ScriptsPainlessExecuteResponse<TResult>, ErrorResponse> endpoint =
-				(JsonEndpoint<ScriptsPainlessExecuteRequest, ScriptsPainlessExecuteResponse<TResult>, ErrorResponse>)
-						ScriptsPainlessExecuteRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.scripts_painless_execute.TResult",
-				getDeserializer(tResultClass));
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows an arbitrary script to be executed and a result to be returned
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ScriptsPainlessExecuteRequest}
-	 *
-	 */
-
-	public final <TResult> CompletableFuture<ScriptsPainlessExecuteResponse<TResult>> scriptsPainlessExecute(
-			Function<ScriptsPainlessExecuteRequest.Builder, ObjectBuilder<ScriptsPainlessExecuteRequest>> fn,
-			Class<TResult> tResultClass) throws IOException, OpenSearchException {
-		return scriptsPainlessExecute(fn.apply(new ScriptsPainlessExecuteRequest.Builder()).build(), tResultClass);
-	}
-
-	// ----- Endpoint: scroll
-
-	/**
-	 * Allows to retrieve a large numbers of results from a single search request.
-	 * 
-	 */
-
-	public <TDocument> CompletableFuture<ScrollResponse<TDocument>> scroll(ScrollRequest request,
-			Class<TDocument> tDocumentClass) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ScrollRequest, ScrollResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<ScrollRequest, ScrollResponse<TDocument>, ErrorResponse>) ScrollRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.scroll.TDocument", getDeserializer(tDocumentClass));
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to retrieve a large numbers of results from a single search request.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ScrollRequest}
-	 */
-
-	public final <TDocument> CompletableFuture<ScrollResponse<TDocument>> scroll(
-			Function<ScrollRequest.Builder, ObjectBuilder<ScrollRequest>> fn, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		return scroll(fn.apply(new ScrollRequest.Builder()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: search
-
-	/**
-	 * Returns results matching a query.
-	 * 
-	 *
-	 */
-
-	public <TDocument> CompletableFuture<SearchResponse<TDocument>> search(SearchRequest request,
-			Class<TDocument> tDocumentClass) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SearchRequest, SearchResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<SearchRequest, SearchResponse<TDocument>, ErrorResponse>) SearchRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.search.TDocument", getDeserializer(tDocumentClass));
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns results matching a query.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SearchRequest}
-	 *
-	 */
-
-	public final <TDocument> CompletableFuture<SearchResponse<TDocument>> search(
-			Function<SearchRequest.Builder, ObjectBuilder<SearchRequest>> fn, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		return search(fn.apply(new SearchRequest.Builder()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: search_shards
-
-	/**
-	 * Returns information about the indices and shards that a search request would
-	 * be executed against.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<SearchShardsResponse> searchShards(SearchShardsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SearchShardsRequest, SearchShardsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<SearchShardsRequest, SearchShardsResponse, ErrorResponse>) SearchShardsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about the indices and shards that a search request would
-	 * be executed against.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SearchShardsRequest}
-	 *
-	 */
-
-	public final CompletableFuture<SearchShardsResponse> searchShards(
-			Function<SearchShardsRequest.Builder, ObjectBuilder<SearchShardsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return searchShards(fn.apply(new SearchShardsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about the indices and shards that a search request would
-	 * be executed against.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<SearchShardsResponse> searchShards() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new SearchShardsRequest.Builder().build(),
-				SearchShardsRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: search_template
-
-	/**
-	 * Allows to use the Mustache language to pre-render a search definition.
-	 * 
-	 *
-	 */
-
-	public <TDocument> CompletableFuture<SearchTemplateResponse<TDocument>> searchTemplate(
-			SearchTemplateRequest request, Class<TDocument> tDocumentClass) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SearchTemplateRequest, SearchTemplateResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<SearchTemplateRequest, SearchTemplateResponse<TDocument>, ErrorResponse>)
-						SearchTemplateRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.search_template.TDocument", getDeserializer(tDocumentClass));
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to use the Mustache language to pre-render a search definition.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SearchTemplateRequest}
-	 *
-	 */
-
-	public final <TDocument> CompletableFuture<SearchTemplateResponse<TDocument>> searchTemplate(
-			Function<SearchTemplateRequest.Builder, ObjectBuilder<SearchTemplateRequest>> fn,
-			Class<TDocument> tDocumentClass) throws IOException, OpenSearchException {
-		return searchTemplate(fn.apply(new SearchTemplateRequest.Builder()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: terms_enum
-
-	/**
-	 * The terms enum API can be used to discover terms in the index that begin with
-	 * the provided string. It is designed for low-latency look-ups used in
-	 * auto-complete scenarios.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<TermsEnumResponse> termsEnum(TermsEnumRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<TermsEnumRequest, TermsEnumResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<TermsEnumRequest, TermsEnumResponse, ErrorResponse>) TermsEnumRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * The terms enum API can be used to discover terms in the index that begin with
-	 * the provided string. It is designed for low-latency look-ups used in
-	 * auto-complete scenarios.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link TermsEnumRequest}
-	 *
-	 */
-
-	public final CompletableFuture<TermsEnumResponse> termsEnum(
-			Function<TermsEnumRequest.Builder, ObjectBuilder<TermsEnumRequest>> fn)
-			throws IOException, OpenSearchException {
-		return termsEnum(fn.apply(new TermsEnumRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: termvectors
-
-	/**
-	 * Returns information and statistics about terms in the fields of a particular
-	 * document.
-	 * 
-	 *
-	 */
-
-	public <TDocument> CompletableFuture<TermvectorsResponse> termvectors(TermvectorsRequest<TDocument> request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<TermvectorsRequest<?>, TermvectorsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<TermvectorsRequest<?>, TermvectorsResponse, ErrorResponse>) TermvectorsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information and statistics about terms in the fields of a particular
-	 * document.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link TermvectorsRequest}
-	 *
-	 */
-
-	public final <TDocument> CompletableFuture<TermvectorsResponse> termvectors(
-			Function<TermvectorsRequest.Builder<TDocument>, ObjectBuilder<TermvectorsRequest<TDocument>>> fn)
-			throws IOException, OpenSearchException {
-		return termvectors(fn.apply(new TermvectorsRequest.Builder<TDocument>()).build());
-	}
-
-	// ----- Endpoint: update
-
-	/**
-	 * Updates a document with a script or partial document.
-	 * 
-	 *
-	 */
-
-	public <TDocument, TPartialDocument> CompletableFuture<UpdateResponse<TDocument>> update(
-			UpdateRequest<TDocument, TPartialDocument> request, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<UpdateRequest<?, ?>, UpdateResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<UpdateRequest<?, ?>, UpdateResponse<TDocument>, ErrorResponse>) UpdateRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.update.TDocument", getDeserializer(tDocumentClass));
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Updates a document with a script or partial document.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link UpdateRequest}
-	 *
-	 */
-
-	public final <TDocument, TPartialDocument> CompletableFuture<UpdateResponse<TDocument>> update(
-			Function<UpdateRequest.Builder<TDocument, TPartialDocument>,
-					ObjectBuilder<UpdateRequest<TDocument, TPartialDocument>>> fn,
-			Class<TDocument> tDocumentClass) throws IOException, OpenSearchException {
-		return update(fn.apply(new UpdateRequest.Builder<TDocument, TPartialDocument>()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: update_by_query
-
-	/**
-	 * Performs an update on every document in the index without changing the
-	 * source, for example to pick up a mapping change.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<UpdateByQueryResponse> updateByQuery(UpdateByQueryRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<UpdateByQueryRequest, UpdateByQueryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<UpdateByQueryRequest, UpdateByQueryResponse, ErrorResponse>)
-						UpdateByQueryRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Performs an update on every document in the index without changing the
-	 * source, for example to pick up a mapping change.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link UpdateByQueryRequest}
-	 *
-	 */
-
-	public final CompletableFuture<UpdateByQueryResponse> updateByQuery(
-			Function<UpdateByQueryRequest.Builder, ObjectBuilder<UpdateByQueryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return updateByQuery(fn.apply(new UpdateByQueryRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: update_by_query_rethrottle
-
-	/**
-	 * Changes the number of requests per second for a particular Update By Query
-	 * operation.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<UpdateByQueryRethrottleResponse> updateByQueryRethrottle(
-			UpdateByQueryRethrottleRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<UpdateByQueryRethrottleRequest, UpdateByQueryRethrottleResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<UpdateByQueryRethrottleRequest, UpdateByQueryRethrottleResponse, ErrorResponse>)
-						UpdateByQueryRethrottleRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Changes the number of requests per second for a particular Update By Query
-	 * operation.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link UpdateByQueryRethrottleRequest}
-	 *
-	 */
-
-	public final CompletableFuture<UpdateByQueryRethrottleResponse> updateByQueryRethrottle(
-			Function<UpdateByQueryRethrottleRequest.Builder, ObjectBuilder<UpdateByQueryRethrottleRequest>> fn)
-			throws IOException, OpenSearchException {
-		return updateByQueryRethrottle(fn.apply(new UpdateByQueryRethrottleRequest.Builder()).build());
-	}
+    public OpenSearchAsyncClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchAsyncClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchAsyncClient(this.transport, transportOptions);
+    }
+
+    // ----- Child clients
+
+    public OpenSearchCatAsyncClient cat() {
+        return new OpenSearchCatAsyncClient(this.transport, this.transportOptions);
+    }
+
+    public OpenSearchClusterAsyncClient cluster() {
+        return new OpenSearchClusterAsyncClient(this.transport, this.transportOptions);
+    }
+
+    public OpenSearchDanglingIndicesAsyncClient danglingIndices() {
+        return new OpenSearchDanglingIndicesAsyncClient(this.transport, this.transportOptions);
+    }
+
+    public OpenSearchFeaturesAsyncClient features() {
+        return new OpenSearchFeaturesAsyncClient(this.transport, this.transportOptions);
+    }
+
+    public OpenSearchIndicesAsyncClient indices() {
+        return new OpenSearchIndicesAsyncClient(this.transport, this.transportOptions);
+    }
+
+    public OpenSearchIngestAsyncClient ingest() {
+        return new OpenSearchIngestAsyncClient(this.transport, this.transportOptions);
+    }
+
+    public OpenSearchNodesAsyncClient nodes() {
+        return new OpenSearchNodesAsyncClient(this.transport, this.transportOptions);
+    }
+
+    public OpenSearchShutdownAsyncClient shutdown() {
+        return new OpenSearchShutdownAsyncClient(this.transport, this.transportOptions);
+    }
+
+    public OpenSearchSnapshotAsyncClient snapshot() {
+        return new OpenSearchSnapshotAsyncClient(this.transport, this.transportOptions);
+    }
+
+    public OpenSearchTasksAsyncClient tasks() {
+        return new OpenSearchTasksAsyncClient(this.transport, this.transportOptions);
+    }
+
+    // ----- Endpoint: bulk
+
+    /**
+     * Allows to perform multiple index/update/delete operations in a single
+     * request.
+     *
+     *
+     */
+
+    public CompletableFuture<BulkResponse> bulk(BulkRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<BulkRequest, BulkResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            BulkRequest,
+            BulkResponse,
+            ErrorResponse>) BulkRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to perform multiple index/update/delete operations in a single
+     * request.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link BulkRequest}
+     *
+     */
+
+    public final CompletableFuture<BulkResponse> bulk(Function<BulkRequest.Builder, ObjectBuilder<BulkRequest>> fn) throws IOException,
+        OpenSearchException {
+        return bulk(fn.apply(new BulkRequest.Builder()).build());
+    }
+
+    /**
+     * Allows to perform multiple index/update/delete operations in a single
+     * request.
+     *
+     *
+     */
+
+    public CompletableFuture<BulkResponse> bulk() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new BulkRequest.Builder().build(), BulkRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: clear_scroll
+
+    /**
+     * Explicitly clears the search context for a scroll.
+     *
+     *
+     */
+
+    public CompletableFuture<ClearScrollResponse> clearScroll(ClearScrollRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ClearScrollRequest, ClearScrollResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ClearScrollRequest,
+            ClearScrollResponse,
+            ErrorResponse>) ClearScrollRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Explicitly clears the search context for a scroll.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ClearScrollRequest}
+     *
+     */
+
+    public final CompletableFuture<ClearScrollResponse> clearScroll(
+        Function<ClearScrollRequest.Builder, ObjectBuilder<ClearScrollRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return clearScroll(fn.apply(new ClearScrollRequest.Builder()).build());
+    }
+
+    /**
+     * Explicitly clears the search context for a scroll.
+     *
+     *
+     */
+
+    public CompletableFuture<ClearScrollResponse> clearScroll() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new ClearScrollRequest.Builder().build(),
+            ClearScrollRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: count
+
+    /**
+     * Returns number of documents matching a query.
+     *
+     *
+     */
+
+    public CompletableFuture<CountResponse> count(CountRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CountRequest, CountResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CountRequest,
+            CountResponse,
+            ErrorResponse>) CountRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns number of documents matching a query.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CountRequest}
+     *
+     */
+
+    public final CompletableFuture<CountResponse> count(Function<CountRequest.Builder, ObjectBuilder<CountRequest>> fn) throws IOException,
+        OpenSearchException {
+        return count(fn.apply(new CountRequest.Builder()).build());
+    }
+
+    /**
+     * Returns number of documents matching a query.
+     *
+     *
+     */
+
+    public CompletableFuture<CountResponse> count() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new CountRequest.Builder().build(), CountRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: create
+
+    /**
+     * Creates a new document in the index.
+     * <p>
+     * Returns a 409 response when a document with a same ID already exists in the
+     * index.
+     *
+     *
+     */
+
+    public <TDocument> CompletableFuture<CreateResponse> create(CreateRequest<TDocument> request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CreateRequest<?>, CreateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CreateRequest<?>,
+            CreateResponse,
+            ErrorResponse>) CreateRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates a new document in the index.
+     * <p>
+     * Returns a 409 response when a document with a same ID already exists in the
+     * index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CreateRequest}
+     *
+     */
+
+    public final <TDocument> CompletableFuture<CreateResponse> create(
+        Function<CreateRequest.Builder<TDocument>, ObjectBuilder<CreateRequest<TDocument>>> fn
+    ) throws IOException, OpenSearchException {
+        return create(fn.apply(new CreateRequest.Builder<TDocument>()).build());
+    }
+
+    // ----- Endpoint: create_point_in_time
+
+    /**
+     * Provides low-level information about the disk utilization of a PIT by
+     * describing its Lucene segments.
+     *
+     *
+     */
+
+    public CompletableFuture<CreatePitResponse> createPit(CreatePitRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CreatePitRequest, CreatePitResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CreatePitRequest,
+            CreatePitResponse,
+            ErrorResponse>) CreatePitRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Provides low-level information about the disk utilization of a PIT by
+     * describing its Lucene segments.
+     *
+     * @param fn
+     *           a function that initializes a builder to create the
+     *           {@link CreatePitRequest}
+     *
+     */
+
+    public final CompletableFuture<CreatePitResponse> createPit(Function<CreatePitRequest.Builder, ObjectBuilder<CreatePitRequest>> fn)
+        throws IOException, OpenSearchException {
+        return createPit(fn.apply(new CreatePitRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: delete
+
+    /**
+     * Removes a document from the index.
+     *
+     *
+     */
+
+    public CompletableFuture<DeleteResponse> delete(DeleteRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteRequest, DeleteResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteRequest,
+            DeleteResponse,
+            ErrorResponse>) DeleteRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Removes a document from the index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteRequest}
+     *
+     */
+
+    public final CompletableFuture<DeleteResponse> delete(Function<DeleteRequest.Builder, ObjectBuilder<DeleteRequest>> fn)
+        throws IOException, OpenSearchException {
+        return delete(fn.apply(new DeleteRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: delete_point_in_time
+
+    /**
+     * Delete Point In Time
+     *
+     *
+     */
+
+    public CompletableFuture<DeletePitResponse> deletePit(DeletePitRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeletePitRequest, DeletePitResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeletePitRequest,
+            DeletePitResponse,
+            ErrorResponse>) DeletePitRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Delete Point In Time
+     *
+     * @param fn
+     *           a function that initializes a builder to create the
+     *           {@link DeletePitRequest}
+     *
+     */
+
+    public final CompletableFuture<DeletePitResponse> deletePit(Function<DeletePitRequest.Builder, ObjectBuilder<DeletePitRequest>> fn)
+        throws IOException, OpenSearchException {
+        return deletePit(fn.apply(new DeletePitRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: delete_by_query
+
+    /**
+     * Deletes documents matching the provided query.
+     *
+     *
+     */
+
+    public CompletableFuture<DeleteByQueryResponse> deleteByQuery(DeleteByQueryRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteByQueryRequest, DeleteByQueryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteByQueryRequest,
+            DeleteByQueryResponse,
+            ErrorResponse>) DeleteByQueryRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes documents matching the provided query.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteByQueryRequest}
+     *
+     */
+
+    public final CompletableFuture<DeleteByQueryResponse> deleteByQuery(
+        Function<DeleteByQueryRequest.Builder, ObjectBuilder<DeleteByQueryRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deleteByQuery(fn.apply(new DeleteByQueryRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: delete_by_query_rethrottle
+
+    /**
+     * Changes the number of requests per second for a particular Delete By Query
+     * operation.
+     *
+     *
+     */
+
+    public CompletableFuture<DeleteByQueryRethrottleResponse> deleteByQueryRethrottle(DeleteByQueryRethrottleRequest request)
+        throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteByQueryRethrottleRequest, DeleteByQueryRethrottleResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteByQueryRethrottleRequest,
+            DeleteByQueryRethrottleResponse,
+            ErrorResponse>) DeleteByQueryRethrottleRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Changes the number of requests per second for a particular Delete By Query
+     * operation.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteByQueryRethrottleRequest}
+     *
+     */
+
+    public final CompletableFuture<DeleteByQueryRethrottleResponse> deleteByQueryRethrottle(
+        Function<DeleteByQueryRethrottleRequest.Builder, ObjectBuilder<DeleteByQueryRethrottleRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deleteByQueryRethrottle(fn.apply(new DeleteByQueryRethrottleRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: delete_script
+
+    /**
+     * Deletes a script.
+     *
+     *
+     */
+
+    public CompletableFuture<DeleteScriptResponse> deleteScript(DeleteScriptRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteScriptRequest, DeleteScriptResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteScriptRequest,
+            DeleteScriptResponse,
+            ErrorResponse>) DeleteScriptRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes a script.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteScriptRequest}
+     *
+     */
+
+    public final CompletableFuture<DeleteScriptResponse> deleteScript(
+        Function<DeleteScriptRequest.Builder, ObjectBuilder<DeleteScriptRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deleteScript(fn.apply(new DeleteScriptRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: exists
+
+    /**
+     * Returns information about whether a document exists in an index.
+     *
+     *
+     */
+
+    public CompletableFuture<BooleanResponse> exists(ExistsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ExistsRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ExistsRequest,
+            BooleanResponse,
+            ErrorResponse>) ExistsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about whether a document exists in an index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ExistsRequest}
+     *
+     */
+
+    public final CompletableFuture<BooleanResponse> exists(Function<ExistsRequest.Builder, ObjectBuilder<ExistsRequest>> fn)
+        throws IOException, OpenSearchException {
+        return exists(fn.apply(new ExistsRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: exists_source
+
+    /**
+     * Returns information about whether a document source exists in an index.
+     *
+     *
+     */
+
+    public CompletableFuture<BooleanResponse> existsSource(ExistsSourceRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ExistsSourceRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ExistsSourceRequest,
+            BooleanResponse,
+            ErrorResponse>) ExistsSourceRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about whether a document source exists in an index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ExistsSourceRequest}
+     *
+     */
+
+    public final CompletableFuture<BooleanResponse> existsSource(
+        Function<ExistsSourceRequest.Builder, ObjectBuilder<ExistsSourceRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return existsSource(fn.apply(new ExistsSourceRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: explain
+
+    /**
+     * Returns information about why a specific matches (or doesn't match) a query.
+     *
+     *
+     */
+
+    public <TDocument> CompletableFuture<ExplainResponse<TDocument>> explain(ExplainRequest request, Class<TDocument> tDocumentClass)
+        throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ExplainRequest, ExplainResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            ExplainRequest,
+            ExplainResponse<TDocument>,
+            ErrorResponse>) ExplainRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.explain.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about why a specific matches (or doesn't match) a query.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ExplainRequest}
+     *
+     */
+
+    public final <TDocument> CompletableFuture<ExplainResponse<TDocument>> explain(
+        Function<ExplainRequest.Builder, ObjectBuilder<ExplainRequest>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return explain(fn.apply(new ExplainRequest.Builder()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: field_caps
+
+    /**
+     * Returns the information about the capabilities of fields among multiple
+     * indices.
+     */
+
+    public CompletableFuture<FieldCapsResponse> fieldCaps(FieldCapsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<FieldCapsRequest, FieldCapsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            FieldCapsRequest,
+            FieldCapsResponse,
+            ErrorResponse>) FieldCapsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns the information about the capabilities of fields among multiple
+     * indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link FieldCapsRequest}
+     *
+     */
+
+    public final CompletableFuture<FieldCapsResponse> fieldCaps(Function<FieldCapsRequest.Builder, ObjectBuilder<FieldCapsRequest>> fn)
+        throws IOException, OpenSearchException {
+        return fieldCaps(fn.apply(new FieldCapsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns the information about the capabilities of fields among multiple
+     * indices.
+     *
+     *
+     */
+
+    public CompletableFuture<FieldCapsResponse> fieldCaps() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new FieldCapsRequest.Builder().build(),
+            FieldCapsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: get
+
+    /**
+     * Returns a document.
+     *
+     *
+     */
+
+    public <TDocument> CompletableFuture<GetResponse<TDocument>> get(GetRequest request, Class<TDocument> tDocumentClass)
+        throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetRequest, GetResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            GetRequest,
+            GetResponse<TDocument>,
+            ErrorResponse>) GetRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.get.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns a document.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetRequest}
+     *
+     */
+
+    public final <TDocument> CompletableFuture<GetResponse<TDocument>> get(
+        Function<GetRequest.Builder, ObjectBuilder<GetRequest>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return get(fn.apply(new GetRequest.Builder()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: get_script
+
+    /**
+     * Returns a script.
+     *
+     *
+     */
+
+    public CompletableFuture<GetScriptResponse> getScript(GetScriptRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetScriptRequest, GetScriptResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetScriptRequest,
+            GetScriptResponse,
+            ErrorResponse>) GetScriptRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns a script.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetScriptRequest}
+     *
+     */
+
+    public final CompletableFuture<GetScriptResponse> getScript(Function<GetScriptRequest.Builder, ObjectBuilder<GetScriptRequest>> fn)
+        throws IOException, OpenSearchException {
+        return getScript(fn.apply(new GetScriptRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: get_script_context
+
+    /**
+     * Returns all script contexts.
+     *
+     *
+     */
+    public CompletableFuture<GetScriptContextResponse> getScriptContext() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            GetScriptContextRequest._INSTANCE,
+            GetScriptContextRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: get_script_languages
+
+    /**
+     * Returns available script types, languages and contexts
+     *
+     *
+     */
+    public CompletableFuture<GetScriptLanguagesResponse> getScriptLanguages() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            GetScriptLanguagesRequest._INSTANCE,
+            GetScriptLanguagesRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: get_source
+
+    /**
+     * Returns the source of a document.
+     *
+     *
+     */
+
+    public <TDocument> CompletableFuture<GetSourceResponse<TDocument>> getSource(GetSourceRequest request, Class<TDocument> tDocumentClass)
+        throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetSourceRequest, GetSourceResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            GetSourceRequest,
+            GetSourceResponse<TDocument>,
+            ErrorResponse>) GetSourceRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.get_source.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns the source of a document.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetSourceRequest}
+     *
+     */
+
+    public final <TDocument> CompletableFuture<GetSourceResponse<TDocument>> getSource(
+        Function<GetSourceRequest.Builder, ObjectBuilder<GetSourceRequest>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return getSource(fn.apply(new GetSourceRequest.Builder()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: index
+
+    /**
+     * Creates or updates a document in an index.
+     *
+     *
+     */
+
+    public <TDocument> CompletableFuture<IndexResponse> index(IndexRequest<TDocument> request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<IndexRequest<?>, IndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            IndexRequest<?>,
+            IndexResponse,
+            ErrorResponse>) IndexRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates or updates a document in an index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link IndexRequest}
+     *
+     */
+
+    public final <TDocument> CompletableFuture<IndexResponse> index(
+        Function<IndexRequest.Builder<TDocument>, ObjectBuilder<IndexRequest<TDocument>>> fn
+    ) throws IOException, OpenSearchException {
+        return index(fn.apply(new IndexRequest.Builder<TDocument>()).build());
+    }
+
+    // ----- Endpoint: info
+
+    /**
+     * Returns basic information about the cluster.
+     *
+     *
+     */
+    public CompletableFuture<InfoResponse> info() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(InfoRequest._INSTANCE, InfoRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: list_point_in_time
+
+    /**
+     * List all Point In Time
+     *
+     *
+     */
+
+    public CompletableFuture<ListAllPitResponse> listAllPit() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(ListAllPitRequest._INSTANCE, ListAllPitRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: mget
+
+    /**
+     * Allows to get multiple documents in one request.
+     *
+     *
+     */
+
+    public <TDocument> CompletableFuture<MgetResponse<TDocument>> mget(MgetRequest request, Class<TDocument> tDocumentClass)
+        throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<MgetRequest, MgetResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            MgetRequest,
+            MgetResponse<TDocument>,
+            ErrorResponse>) MgetRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.mget.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to get multiple documents in one request.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link MgetRequest}
+     *
+     */
+
+    public final <TDocument> CompletableFuture<MgetResponse<TDocument>> mget(
+        Function<MgetRequest.Builder, ObjectBuilder<MgetRequest>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return mget(fn.apply(new MgetRequest.Builder()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: msearch
+
+    /**
+     * Allows to execute several search operations in one request.
+     *
+     *
+     */
+
+    public <TDocument> CompletableFuture<MsearchResponse<TDocument>> msearch(MsearchRequest request, Class<TDocument> tDocumentClass)
+        throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<MsearchRequest, MsearchResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            MsearchRequest,
+            MsearchResponse<TDocument>,
+            ErrorResponse>) MsearchRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.msearch.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to execute several search operations in one request.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link MsearchRequest}
+     *
+     */
+
+    public final <TDocument> CompletableFuture<MsearchResponse<TDocument>> msearch(
+        Function<MsearchRequest.Builder, ObjectBuilder<MsearchRequest>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return msearch(fn.apply(new MsearchRequest.Builder()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: msearch_template
+
+    /**
+     * Allows to execute several search template operations in one request.
+     *
+     *
+     */
+
+    public <TDocument> CompletableFuture<MsearchTemplateResponse<TDocument>> msearchTemplate(
+        MsearchTemplateRequest request,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<MsearchTemplateRequest, MsearchTemplateResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            MsearchTemplateRequest,
+            MsearchTemplateResponse<TDocument>,
+            ErrorResponse>) MsearchTemplateRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.msearch_template.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to execute several search template operations in one request.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link MsearchTemplateRequest}
+     *
+     */
+
+    public final <TDocument> CompletableFuture<MsearchTemplateResponse<TDocument>> msearchTemplate(
+        Function<MsearchTemplateRequest.Builder, ObjectBuilder<MsearchTemplateRequest>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return msearchTemplate(fn.apply(new MsearchTemplateRequest.Builder()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: mtermvectors
+
+    /**
+     * Returns multiple termvectors in one request.
+     *
+     *
+     */
+
+    public CompletableFuture<MtermvectorsResponse> mtermvectors(MtermvectorsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<MtermvectorsRequest, MtermvectorsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            MtermvectorsRequest,
+            MtermvectorsResponse,
+            ErrorResponse>) MtermvectorsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns multiple termvectors in one request.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link MtermvectorsRequest}
+     *
+     */
+
+    public final CompletableFuture<MtermvectorsResponse> mtermvectors(
+        Function<MtermvectorsRequest.Builder, ObjectBuilder<MtermvectorsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return mtermvectors(fn.apply(new MtermvectorsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns multiple termvectors in one request.
+     *
+     *
+     */
+
+    public CompletableFuture<MtermvectorsResponse> mtermvectors() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new MtermvectorsRequest.Builder().build(),
+            MtermvectorsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: ping
+
+    /**
+     * Returns whether the cluster is running.
+     *
+     *
+     */
+    public CompletableFuture<BooleanResponse> ping() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(PingRequest._INSTANCE, PingRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: put_script
+
+    /**
+     * Creates or updates a script.
+     *
+     *
+     */
+
+    public CompletableFuture<PutScriptResponse> putScript(PutScriptRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutScriptRequest, PutScriptResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutScriptRequest,
+            PutScriptResponse,
+            ErrorResponse>) PutScriptRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates or updates a script.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutScriptRequest}
+     *
+     */
+
+    public final CompletableFuture<PutScriptResponse> putScript(Function<PutScriptRequest.Builder, ObjectBuilder<PutScriptRequest>> fn)
+        throws IOException, OpenSearchException {
+        return putScript(fn.apply(new PutScriptRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: rank_eval
+
+    /**
+     * Allows to evaluate the quality of ranked search results over a set of typical
+     * search queries
+     *
+     *
+     */
+
+    public CompletableFuture<RankEvalResponse> rankEval(RankEvalRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<RankEvalRequest, RankEvalResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            RankEvalRequest,
+            RankEvalResponse,
+            ErrorResponse>) RankEvalRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to evaluate the quality of ranked search results over a set of typical
+     * search queries
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link RankEvalRequest}
+     *
+     */
+
+    public final CompletableFuture<RankEvalResponse> rankEval(Function<RankEvalRequest.Builder, ObjectBuilder<RankEvalRequest>> fn)
+        throws IOException, OpenSearchException {
+        return rankEval(fn.apply(new RankEvalRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: reindex
+
+    /**
+     * Allows to copy documents from one index to another, optionally filtering the
+     * source documents by a query, changing the destination index settings, or
+     * fetching the documents from a remote cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<ReindexResponse> reindex(ReindexRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ReindexRequest, ReindexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ReindexRequest,
+            ReindexResponse,
+            ErrorResponse>) ReindexRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to copy documents from one index to another, optionally filtering the
+     * source documents by a query, changing the destination index settings, or
+     * fetching the documents from a remote cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ReindexRequest}
+     *
+     */
+
+    public final CompletableFuture<ReindexResponse> reindex(Function<ReindexRequest.Builder, ObjectBuilder<ReindexRequest>> fn)
+        throws IOException, OpenSearchException {
+        return reindex(fn.apply(new ReindexRequest.Builder()).build());
+    }
+
+    /**
+     * Allows to copy documents from one index to another, optionally filtering the
+     * source documents by a query, changing the destination index settings, or
+     * fetching the documents from a remote cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<ReindexResponse> reindex() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new ReindexRequest.Builder().build(), ReindexRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: reindex_rethrottle
+
+    /**
+     * Changes the number of requests per second for a particular Reindex operation.
+     *
+     *
+     */
+
+    public CompletableFuture<ReindexRethrottleResponse> reindexRethrottle(ReindexRethrottleRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ReindexRethrottleRequest, ReindexRethrottleResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ReindexRethrottleRequest,
+            ReindexRethrottleResponse,
+            ErrorResponse>) ReindexRethrottleRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Changes the number of requests per second for a particular Reindex operation.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ReindexRethrottleRequest}
+     *
+     */
+
+    public final CompletableFuture<ReindexRethrottleResponse> reindexRethrottle(
+        Function<ReindexRethrottleRequest.Builder, ObjectBuilder<ReindexRethrottleRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return reindexRethrottle(fn.apply(new ReindexRethrottleRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: render_search_template
+
+    /**
+     * Allows to use the Mustache language to pre-render a search definition.
+     *
+     *
+     */
+
+    public CompletableFuture<RenderSearchTemplateResponse> renderSearchTemplate(RenderSearchTemplateRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<RenderSearchTemplateRequest, RenderSearchTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            RenderSearchTemplateRequest,
+            RenderSearchTemplateResponse,
+            ErrorResponse>) RenderSearchTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to use the Mustache language to pre-render a search definition.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link RenderSearchTemplateRequest}
+     *
+     */
+
+    public final CompletableFuture<RenderSearchTemplateResponse> renderSearchTemplate(
+        Function<RenderSearchTemplateRequest.Builder, ObjectBuilder<RenderSearchTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return renderSearchTemplate(fn.apply(new RenderSearchTemplateRequest.Builder()).build());
+    }
+
+    /**
+     * Allows to use the Mustache language to pre-render a search definition.
+     *
+     *
+     */
+
+    public CompletableFuture<RenderSearchTemplateResponse> renderSearchTemplate() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new RenderSearchTemplateRequest.Builder().build(),
+            RenderSearchTemplateRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: scripts_painless_execute
+
+    /**
+     * Allows an arbitrary script to be executed and a result to be returned
+     *
+     *
+     */
+
+    public <TResult> CompletableFuture<ScriptsPainlessExecuteResponse<TResult>> scriptsPainlessExecute(
+        ScriptsPainlessExecuteRequest request,
+        Class<TResult> tResultClass
+    ) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ScriptsPainlessExecuteRequest, ScriptsPainlessExecuteResponse<TResult>, ErrorResponse> endpoint = (JsonEndpoint<
+            ScriptsPainlessExecuteRequest,
+            ScriptsPainlessExecuteResponse<TResult>,
+            ErrorResponse>) ScriptsPainlessExecuteRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.scripts_painless_execute.TResult",
+            getDeserializer(tResultClass)
+        );
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows an arbitrary script to be executed and a result to be returned
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ScriptsPainlessExecuteRequest}
+     *
+     */
+
+    public final <TResult> CompletableFuture<ScriptsPainlessExecuteResponse<TResult>> scriptsPainlessExecute(
+        Function<ScriptsPainlessExecuteRequest.Builder, ObjectBuilder<ScriptsPainlessExecuteRequest>> fn,
+        Class<TResult> tResultClass
+    ) throws IOException, OpenSearchException {
+        return scriptsPainlessExecute(fn.apply(new ScriptsPainlessExecuteRequest.Builder()).build(), tResultClass);
+    }
+
+    // ----- Endpoint: scroll
+
+    /**
+     * Allows to retrieve a large numbers of results from a single search request.
+     *
+     */
+
+    public <TDocument> CompletableFuture<ScrollResponse<TDocument>> scroll(ScrollRequest request, Class<TDocument> tDocumentClass)
+        throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ScrollRequest, ScrollResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            ScrollRequest,
+            ScrollResponse<TDocument>,
+            ErrorResponse>) ScrollRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.scroll.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to retrieve a large numbers of results from a single search request.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ScrollRequest}
+     */
+
+    public final <TDocument> CompletableFuture<ScrollResponse<TDocument>> scroll(
+        Function<ScrollRequest.Builder, ObjectBuilder<ScrollRequest>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return scroll(fn.apply(new ScrollRequest.Builder()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: search
+
+    /**
+     * Returns results matching a query.
+     *
+     *
+     */
+
+    public <TDocument> CompletableFuture<SearchResponse<TDocument>> search(SearchRequest request, Class<TDocument> tDocumentClass)
+        throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SearchRequest, SearchResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            SearchRequest,
+            SearchResponse<TDocument>,
+            ErrorResponse>) SearchRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.search.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns results matching a query.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SearchRequest}
+     *
+     */
+
+    public final <TDocument> CompletableFuture<SearchResponse<TDocument>> search(
+        Function<SearchRequest.Builder, ObjectBuilder<SearchRequest>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return search(fn.apply(new SearchRequest.Builder()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: search_shards
+
+    /**
+     * Returns information about the indices and shards that a search request would
+     * be executed against.
+     *
+     *
+     */
+
+    public CompletableFuture<SearchShardsResponse> searchShards(SearchShardsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SearchShardsRequest, SearchShardsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            SearchShardsRequest,
+            SearchShardsResponse,
+            ErrorResponse>) SearchShardsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about the indices and shards that a search request would
+     * be executed against.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SearchShardsRequest}
+     *
+     */
+
+    public final CompletableFuture<SearchShardsResponse> searchShards(
+        Function<SearchShardsRequest.Builder, ObjectBuilder<SearchShardsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return searchShards(fn.apply(new SearchShardsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about the indices and shards that a search request would
+     * be executed against.
+     *
+     *
+     */
+
+    public CompletableFuture<SearchShardsResponse> searchShards() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new SearchShardsRequest.Builder().build(),
+            SearchShardsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: search_template
+
+    /**
+     * Allows to use the Mustache language to pre-render a search definition.
+     *
+     *
+     */
+
+    public <TDocument> CompletableFuture<SearchTemplateResponse<TDocument>> searchTemplate(
+        SearchTemplateRequest request,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SearchTemplateRequest, SearchTemplateResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            SearchTemplateRequest,
+            SearchTemplateResponse<TDocument>,
+            ErrorResponse>) SearchTemplateRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.search_template.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to use the Mustache language to pre-render a search definition.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SearchTemplateRequest}
+     *
+     */
+
+    public final <TDocument> CompletableFuture<SearchTemplateResponse<TDocument>> searchTemplate(
+        Function<SearchTemplateRequest.Builder, ObjectBuilder<SearchTemplateRequest>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return searchTemplate(fn.apply(new SearchTemplateRequest.Builder()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: terms_enum
+
+    /**
+     * The terms enum API can be used to discover terms in the index that begin with
+     * the provided string. It is designed for low-latency look-ups used in
+     * auto-complete scenarios.
+     *
+     *
+     */
+
+    public CompletableFuture<TermsEnumResponse> termsEnum(TermsEnumRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<TermsEnumRequest, TermsEnumResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            TermsEnumRequest,
+            TermsEnumResponse,
+            ErrorResponse>) TermsEnumRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * The terms enum API can be used to discover terms in the index that begin with
+     * the provided string. It is designed for low-latency look-ups used in
+     * auto-complete scenarios.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link TermsEnumRequest}
+     *
+     */
+
+    public final CompletableFuture<TermsEnumResponse> termsEnum(Function<TermsEnumRequest.Builder, ObjectBuilder<TermsEnumRequest>> fn)
+        throws IOException, OpenSearchException {
+        return termsEnum(fn.apply(new TermsEnumRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: termvectors
+
+    /**
+     * Returns information and statistics about terms in the fields of a particular
+     * document.
+     *
+     *
+     */
+
+    public <TDocument> CompletableFuture<TermvectorsResponse> termvectors(TermvectorsRequest<TDocument> request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<TermvectorsRequest<?>, TermvectorsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            TermvectorsRequest<?>,
+            TermvectorsResponse,
+            ErrorResponse>) TermvectorsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information and statistics about terms in the fields of a particular
+     * document.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link TermvectorsRequest}
+     *
+     */
+
+    public final <TDocument> CompletableFuture<TermvectorsResponse> termvectors(
+        Function<TermvectorsRequest.Builder<TDocument>, ObjectBuilder<TermvectorsRequest<TDocument>>> fn
+    ) throws IOException, OpenSearchException {
+        return termvectors(fn.apply(new TermvectorsRequest.Builder<TDocument>()).build());
+    }
+
+    // ----- Endpoint: update
+
+    /**
+     * Updates a document with a script or partial document.
+     *
+     *
+     */
+
+    public <TDocument, TPartialDocument> CompletableFuture<UpdateResponse<TDocument>> update(
+        UpdateRequest<TDocument, TPartialDocument> request,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<UpdateRequest<?, ?>, UpdateResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            UpdateRequest<?, ?>,
+            UpdateResponse<TDocument>,
+            ErrorResponse>) UpdateRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.update.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Updates a document with a script or partial document.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link UpdateRequest}
+     *
+     */
+
+    public final <TDocument, TPartialDocument> CompletableFuture<UpdateResponse<TDocument>> update(
+        Function<UpdateRequest.Builder<TDocument, TPartialDocument>, ObjectBuilder<UpdateRequest<TDocument, TPartialDocument>>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return update(fn.apply(new UpdateRequest.Builder<TDocument, TPartialDocument>()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: update_by_query
+
+    /**
+     * Performs an update on every document in the index without changing the
+     * source, for example to pick up a mapping change.
+     *
+     *
+     */
+
+    public CompletableFuture<UpdateByQueryResponse> updateByQuery(UpdateByQueryRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<UpdateByQueryRequest, UpdateByQueryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            UpdateByQueryRequest,
+            UpdateByQueryResponse,
+            ErrorResponse>) UpdateByQueryRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Performs an update on every document in the index without changing the
+     * source, for example to pick up a mapping change.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link UpdateByQueryRequest}
+     *
+     */
+
+    public final CompletableFuture<UpdateByQueryResponse> updateByQuery(
+        Function<UpdateByQueryRequest.Builder, ObjectBuilder<UpdateByQueryRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return updateByQuery(fn.apply(new UpdateByQueryRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: update_by_query_rethrottle
+
+    /**
+     * Changes the number of requests per second for a particular Update By Query
+     * operation.
+     *
+     *
+     */
+
+    public CompletableFuture<UpdateByQueryRethrottleResponse> updateByQueryRethrottle(UpdateByQueryRethrottleRequest request)
+        throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<UpdateByQueryRethrottleRequest, UpdateByQueryRethrottleResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            UpdateByQueryRethrottleRequest,
+            UpdateByQueryRethrottleResponse,
+            ErrorResponse>) UpdateByQueryRethrottleRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Changes the number of requests per second for a particular Update By Query
+     * operation.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link UpdateByQueryRethrottleRequest}
+     *
+     */
+
+    public final CompletableFuture<UpdateByQueryRethrottleResponse> updateByQueryRethrottle(
+        Function<UpdateByQueryRethrottleRequest.Builder, ObjectBuilder<UpdateByQueryRethrottleRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return updateByQueryRethrottle(fn.apply(new UpdateByQueryRethrottleRequest.Builder()).build());
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/OpenSearchClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/OpenSearchClient.java
index 801ff279df..3b2d8d76ff 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/OpenSearchClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/OpenSearchClient.java
@@ -32,9 +32,12 @@
 
 package org.opensearch.client.opensearch;
 
+import java.io.IOException;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch.cat.OpenSearchCatClient;
 import org.opensearch.client.opensearch.cluster.OpenSearchClusterClient;
 import org.opensearch.client.opensearch.core.BulkRequest;
@@ -126,1446 +129,1540 @@
 import org.opensearch.client.opensearch.shutdown.OpenSearchShutdownClient;
 import org.opensearch.client.opensearch.snapshot.OpenSearchSnapshotClient;
 import org.opensearch.client.opensearch.tasks.OpenSearchTasksClient;
-import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.JsonEndpoint;
+import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.TransportOptions;
 import org.opensearch.client.transport.endpoints.BooleanResponse;
 import org.opensearch.client.transport.endpoints.EndpointWithResponseMapperAttr;
 import org.opensearch.client.util.ObjectBuilder;
-import java.io.IOException;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 /**
  * Client for the namespace.
  */
 public class OpenSearchClient extends ApiClient<OpenSearchTransport, OpenSearchClient> {
 
-	public OpenSearchClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchClient(this.transport, transportOptions);
-	}
-
-	// ----- Child clients
-
-	public OpenSearchCatClient cat() {
-		return new OpenSearchCatClient(this.transport, this.transportOptions);
-	}
-
-	public OpenSearchClusterClient cluster() {
-		return new OpenSearchClusterClient(this.transport, this.transportOptions);
-	}
-
-	public OpenSearchDanglingIndicesClient danglingIndices() {
-		return new OpenSearchDanglingIndicesClient(this.transport, this.transportOptions);
-	}
-
-	public OpenSearchFeaturesClient features() {
-		return new OpenSearchFeaturesClient(this.transport, this.transportOptions);
-	}
-
-	public OpenSearchIndicesClient indices() {
-		return new OpenSearchIndicesClient(this.transport, this.transportOptions);
-	}
-
-	public OpenSearchIngestClient ingest() {
-		return new OpenSearchIngestClient(this.transport, this.transportOptions);
-	}
-
-	public OpenSearchNodesClient nodes() {
-		return new OpenSearchNodesClient(this.transport, this.transportOptions);
-	}
-
-	public OpenSearchShutdownClient shutdown() {
-		return new OpenSearchShutdownClient(this.transport, this.transportOptions);
-	}
-
-	public OpenSearchSnapshotClient snapshot() {
-		return new OpenSearchSnapshotClient(this.transport, this.transportOptions);
-	}
-
-	public OpenSearchTasksClient tasks() {
-		return new OpenSearchTasksClient(this.transport, this.transportOptions);
-	}
-
-	// ----- Endpoint: bulk
-
-	/**
-	 * Allows to perform multiple index/update/delete operations in a single
-	 * request.
-	 * 
-	 *
-	 */
-
-	public BulkResponse bulk(BulkRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<BulkRequest, BulkResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<BulkRequest, BulkResponse, ErrorResponse>) BulkRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to perform multiple index/update/delete operations in a single
-	 * request.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link BulkRequest}
-	 *
-	 */
-
-	public final BulkResponse bulk(Function<BulkRequest.Builder, ObjectBuilder<BulkRequest>> fn)
-			throws IOException, OpenSearchException {
-		return bulk(fn.apply(new BulkRequest.Builder()).build());
-	}
-
-	/**
-	 * Allows to perform multiple index/update/delete operations in a single
-	 * request.
-	 * 
-	 *
-	 */
-
-	public BulkResponse bulk() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new BulkRequest.Builder().build(), BulkRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: clear_scroll
-
-	/**
-	 * Explicitly clears the search context for a scroll.
-	 * 
-	 *
-	 */
-
-	public ClearScrollResponse clearScroll(ClearScrollRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ClearScrollRequest, ClearScrollResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ClearScrollRequest, ClearScrollResponse, ErrorResponse>) ClearScrollRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Explicitly clears the search context for a scroll.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ClearScrollRequest}
-	 *
-	 */
-
-	public final ClearScrollResponse clearScroll(
-			Function<ClearScrollRequest.Builder, ObjectBuilder<ClearScrollRequest>> fn)
-			throws IOException, OpenSearchException {
-		return clearScroll(fn.apply(new ClearScrollRequest.Builder()).build());
-	}
-
-	/**
-	 * Explicitly clears the search context for a scroll.
-	 * 
-	 *
-	 */
-
-	public ClearScrollResponse clearScroll() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new ClearScrollRequest.Builder().build(), ClearScrollRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: count
-
-	/**
-	 * Returns number of documents matching a query.
-	 * 
-	 *
-	 */
-
-	public CountResponse count(CountRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CountRequest, CountResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CountRequest, CountResponse, ErrorResponse>) CountRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns number of documents matching a query.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CountRequest}
-	 *
-	 */
-
-	public final CountResponse count(Function<CountRequest.Builder, ObjectBuilder<CountRequest>> fn)
-			throws IOException, OpenSearchException {
-		return count(fn.apply(new CountRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns number of documents matching a query.
-	 * 
-	 *
-	 */
-
-	public CountResponse count() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new CountRequest.Builder().build(), CountRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: create
-
-	/**
-	 * Creates a new document in the index.
-	 * <p>
-	 * Returns a 409 response when a document with a same ID already exists in the
-	 * index.
-	 * 
-	 *
-	 */
-
-	public <TDocument> CreateResponse create(CreateRequest<TDocument> request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CreateRequest<?>, CreateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CreateRequest<?>, CreateResponse, ErrorResponse>) CreateRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates a new document in the index.
-	 * <p>
-	 * Returns a 409 response when a document with a same ID already exists in the
-	 * index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CreateRequest}
-	 *
-	 */
-
-	public final <TDocument> CreateResponse create(
-			Function<CreateRequest.Builder<TDocument>, ObjectBuilder<CreateRequest<TDocument>>> fn)
-			throws IOException, OpenSearchException {
-		return create(fn.apply(new CreateRequest.Builder<TDocument>()).build());
-	}
-
-	// ----- Endpoint: create_point_in_time
-
-	/**
-	 * Provides low-level information about the disk utilization of a PIT by
-	 * describing its Lucene segments.
-	 * 
-	 *
-	 */
-
-	public CreatePitResponse createPit(CreatePitRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CreatePitRequest, CreatePitResponse, ErrorResponse> endpoint = (JsonEndpoint<CreatePitRequest, CreatePitResponse, ErrorResponse>) CreatePitRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Provides low-level information about the disk utilization of a PIT by
-	 * describing its Lucene segments.
-	 * 
-	 * @param fn
-	 *           a function that initializes a builder to create the
-	 *           {@link CreatePitRequest}
-	 *
-	 */
-
-	public final CreatePitResponse createPit(
-			Function<CreatePitRequest.Builder, ObjectBuilder<CreatePitRequest>> fn)
-			throws IOException, OpenSearchException {
-		return createPit(fn.apply(new CreatePitRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: delete
-
-	/**
-	 * Removes a document from the index.
-	 * 
-	 *
-	 */
-
-	public DeleteResponse delete(DeleteRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteRequest, DeleteResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteRequest, DeleteResponse, ErrorResponse>) DeleteRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Removes a document from the index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteRequest}
-	 *
-	 */
-
-	public final DeleteResponse delete(Function<DeleteRequest.Builder, ObjectBuilder<DeleteRequest>> fn)
-			throws IOException, OpenSearchException {
-		return delete(fn.apply(new DeleteRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: delete_point_in_time
-
-	/**
-	 * Delete Point In Time
-	 * 
-	 *
-	 */
-
-	public DeletePitResponse deletePit(DeletePitRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeletePitRequest, DeletePitResponse, ErrorResponse> endpoint = (JsonEndpoint<DeletePitRequest, DeletePitResponse, ErrorResponse>) DeletePitRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Delete Point In Time
-	 * 
-	 * @param fn
-	 *           a function that initializes a builder to create the
-	 *           {@link DeletePitRequest}
-	 *
-	 */
-
-	public final DeletePitResponse deletePit(
-			Function<DeletePitRequest.Builder, ObjectBuilder<DeletePitRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deletePit(fn.apply(new DeletePitRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: delete_by_query
-
-	/**
-	 * Deletes documents matching the provided query.
-	 * 
-	 *
-	 */
-
-	public DeleteByQueryResponse deleteByQuery(DeleteByQueryRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteByQueryRequest, DeleteByQueryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteByQueryRequest, DeleteByQueryResponse, ErrorResponse>) DeleteByQueryRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes documents matching the provided query.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteByQueryRequest}
-	 *
-	 */
-
-	public final DeleteByQueryResponse deleteByQuery(
-			Function<DeleteByQueryRequest.Builder, ObjectBuilder<DeleteByQueryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteByQuery(fn.apply(new DeleteByQueryRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: delete_by_query_rethrottle
-
-	/**
-	 * Changes the number of requests per second for a particular Delete By Query
-	 * operation.
-	 * 
-	 *
-	 */
-
-	public DeleteByQueryRethrottleResponse deleteByQueryRethrottle(DeleteByQueryRethrottleRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteByQueryRethrottleRequest, DeleteByQueryRethrottleResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteByQueryRethrottleRequest, DeleteByQueryRethrottleResponse, ErrorResponse>)
-						DeleteByQueryRethrottleRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Changes the number of requests per second for a particular Delete By Query
-	 * operation.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteByQueryRethrottleRequest}
-	 *
-	 */
-
-	public final DeleteByQueryRethrottleResponse deleteByQueryRethrottle(
-			Function<DeleteByQueryRethrottleRequest.Builder, ObjectBuilder<DeleteByQueryRethrottleRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteByQueryRethrottle(fn.apply(new DeleteByQueryRethrottleRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: delete_script
-
-	/**
-	 * Deletes a script.
-	 * 
-	 *
-	 */
-
-	public DeleteScriptResponse deleteScript(DeleteScriptRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteScriptRequest, DeleteScriptResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteScriptRequest, DeleteScriptResponse, ErrorResponse>) DeleteScriptRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes a script.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteScriptRequest}
-	 *
-	 */
-
-	public final DeleteScriptResponse deleteScript(
-			Function<DeleteScriptRequest.Builder, ObjectBuilder<DeleteScriptRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteScript(fn.apply(new DeleteScriptRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: exists
-
-	/**
-	 * Returns information about whether a document exists in an index.
-	 * 
-	 *
-	 */
-
-	public BooleanResponse exists(ExistsRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ExistsRequest, BooleanResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ExistsRequest, BooleanResponse, ErrorResponse>) ExistsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about whether a document exists in an index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ExistsRequest}
-	 *
-	 */
-
-	public final BooleanResponse exists(Function<ExistsRequest.Builder, ObjectBuilder<ExistsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return exists(fn.apply(new ExistsRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: exists_source
-
-	/**
-	 * Returns information about whether a document source exists in an index.
-	 * 
-	 *
-	 */
-
-	public BooleanResponse existsSource(ExistsSourceRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ExistsSourceRequest, BooleanResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ExistsSourceRequest, BooleanResponse, ErrorResponse>) ExistsSourceRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about whether a document source exists in an index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ExistsSourceRequest}
-	 *
-	 */
-
-	public final BooleanResponse existsSource(
-			Function<ExistsSourceRequest.Builder, ObjectBuilder<ExistsSourceRequest>> fn)
-			throws IOException, OpenSearchException {
-		return existsSource(fn.apply(new ExistsSourceRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: explain
-
-	/**
-	 * Returns information about why a specific matches (or doesn't match) a query.
-	 * 
-	 *
-	 */
-
-	public <TDocument> ExplainResponse<TDocument> explain(ExplainRequest request, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ExplainRequest, ExplainResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<ExplainRequest, ExplainResponse<TDocument>, ErrorResponse>) ExplainRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.explain.TDocument", getDeserializer(tDocumentClass));
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about why a specific matches (or doesn't match) a query.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ExplainRequest}
-	 *
-	 */
-
-	public final <TDocument> ExplainResponse<TDocument> explain(
-			Function<ExplainRequest.Builder, ObjectBuilder<ExplainRequest>> fn, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		return explain(fn.apply(new ExplainRequest.Builder()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: field_caps
-
-	/**
-	 * Returns the information about the capabilities of fields among multiple
-	 * indices.
-	 * 
-	 *
-	 */
-
-	public FieldCapsResponse fieldCaps(FieldCapsRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<FieldCapsRequest, FieldCapsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<FieldCapsRequest, FieldCapsResponse, ErrorResponse>) FieldCapsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns the information about the capabilities of fields among multiple
-	 * indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link FieldCapsRequest}
-	 *
-	 */
-
-	public final FieldCapsResponse fieldCaps(Function<FieldCapsRequest.Builder, ObjectBuilder<FieldCapsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return fieldCaps(fn.apply(new FieldCapsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns the information about the capabilities of fields among multiple
-	 * indices.
-	 * 
-	 *
-	 */
-
-	public FieldCapsResponse fieldCaps() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new FieldCapsRequest.Builder().build(), FieldCapsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: get
-
-	/**
-	 * Returns a document.
-	 * 
-	 *
-	 */
-
-	public <TDocument> GetResponse<TDocument> get(GetRequest request, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetRequest, GetResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<GetRequest, GetResponse<TDocument>, ErrorResponse>) GetRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.get.TDocument", getDeserializer(tDocumentClass));
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns a document.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetRequest}
-	 *
-	 */
-
-	public final <TDocument> GetResponse<TDocument> get(Function<GetRequest.Builder, ObjectBuilder<GetRequest>> fn,
-			Class<TDocument> tDocumentClass) throws IOException, OpenSearchException {
-		return get(fn.apply(new GetRequest.Builder()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: get_script
-
-	/**
-	 * Returns a script.
-	 * 
-	 *
-	 */
-
-	public GetScriptResponse getScript(GetScriptRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetScriptRequest, GetScriptResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetScriptRequest, GetScriptResponse, ErrorResponse>) GetScriptRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns a script.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetScriptRequest}
-	 *
-	 */
-
-	public final GetScriptResponse getScript(Function<GetScriptRequest.Builder, ObjectBuilder<GetScriptRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getScript(fn.apply(new GetScriptRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: get_script_context
-
-	/**
-	 * Returns all script contexts.
-	 * 
-	 *
-	 */
-	public GetScriptContextResponse getScriptContext() throws IOException, OpenSearchException {
-		return this.transport.performRequest(GetScriptContextRequest._INSTANCE, GetScriptContextRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: get_script_languages
-
-	/**
-	 * Returns available script types, languages and contexts
-	 * 
-	 *
-	 */
-	public GetScriptLanguagesResponse getScriptLanguages() throws IOException, OpenSearchException {
-		return this.transport.performRequest(GetScriptLanguagesRequest._INSTANCE, GetScriptLanguagesRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: get_source
-
-	/**
-	 * Returns the source of a document.
-	 * 
-	 *
-	 */
-
-	public <TDocument> GetSourceResponse<TDocument> getSource(GetSourceRequest request, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetSourceRequest, GetSourceResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<GetSourceRequest, GetSourceResponse<TDocument>, ErrorResponse>)
-						GetSourceRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.get_source.TDocument", getDeserializer(tDocumentClass));
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns the source of a document.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetSourceRequest}
-	 *
-	 */
-
-	public final <TDocument> GetSourceResponse<TDocument> getSource(
-			Function<GetSourceRequest.Builder, ObjectBuilder<GetSourceRequest>> fn, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		return getSource(fn.apply(new GetSourceRequest.Builder()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: index
-
-	/**
-	 * Creates or updates a document in an index.
-	 * 
-	 *
-	 */
-
-	public <TDocument> IndexResponse index(IndexRequest<TDocument> request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<IndexRequest<?>, IndexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<IndexRequest<?>, IndexResponse, ErrorResponse>) IndexRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates or updates a document in an index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link IndexRequest}
-	 *
-	 */
-
-	public final <TDocument> IndexResponse index(
-			Function<IndexRequest.Builder<TDocument>, ObjectBuilder<IndexRequest<TDocument>>> fn)
-			throws IOException, OpenSearchException {
-		return index(fn.apply(new IndexRequest.Builder<TDocument>()).build());
-	}
-
-	// ----- Endpoint: info
-
-	/**
-	 * Returns basic information about the cluster.
-	 * 
-	 *
-	 */
-	public InfoResponse info() throws IOException, OpenSearchException {
-		return this.transport.performRequest(InfoRequest._INSTANCE, InfoRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: list_point_in_time
-
-	/**
-	 * List all Point In Time
-	 * 
-	 *
-	 */
-
-	public ListAllPitResponse listAllPit()
-			throws IOException, OpenSearchException {
-			return this.transport.performRequest(ListAllPitRequest._INSTANCE, ListAllPitRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: mget
-
-	/**
-	 * Allows to get multiple documents in one request.
-	 * 
-	 *
-	 */
-
-	public <TDocument> MgetResponse<TDocument> mget(MgetRequest request, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<MgetRequest, MgetResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<MgetRequest, MgetResponse<TDocument>, ErrorResponse>) MgetRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.mget.TDocument", getDeserializer(tDocumentClass));
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to get multiple documents in one request.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link MgetRequest}
-	 *
-	 */
-
-	public final <TDocument> MgetResponse<TDocument> mget(Function<MgetRequest.Builder, ObjectBuilder<MgetRequest>> fn,
-			Class<TDocument> tDocumentClass) throws IOException, OpenSearchException {
-		return mget(fn.apply(new MgetRequest.Builder()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: msearch
-
-	/**
-	 * Allows to execute several search operations in one request.
-	 * 
-	 *
-	 */
-
-	public <TDocument> MsearchResponse<TDocument> msearch(MsearchRequest request, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<MsearchRequest, MsearchResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<MsearchRequest, MsearchResponse<TDocument>, ErrorResponse>) MsearchRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.msearch.TDocument", getDeserializer(tDocumentClass));
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to execute several search operations in one request.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link MsearchRequest}
-	 *
-	 */
-
-	public final <TDocument> MsearchResponse<TDocument> msearch(
-			Function<MsearchRequest.Builder, ObjectBuilder<MsearchRequest>> fn, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		return msearch(fn.apply(new MsearchRequest.Builder()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: msearch_template
-
-	/**
-	 * Allows to execute several search template operations in one request.
-	 * 
-	 *
-	 */
-
-	public <TDocument> MsearchTemplateResponse<TDocument> msearchTemplate(MsearchTemplateRequest request,
-			Class<TDocument> tDocumentClass) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<MsearchTemplateRequest, MsearchTemplateResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<MsearchTemplateRequest, MsearchTemplateResponse<TDocument>, ErrorResponse>)
-						MsearchTemplateRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.msearch_template.TDocument", getDeserializer(tDocumentClass));
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to execute several search template operations in one request.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link MsearchTemplateRequest}
-	 *
-	 */
-
-	public final <TDocument> MsearchTemplateResponse<TDocument> msearchTemplate(
-			Function<MsearchTemplateRequest.Builder, ObjectBuilder<MsearchTemplateRequest>> fn,
-			Class<TDocument> tDocumentClass) throws IOException, OpenSearchException {
-		return msearchTemplate(fn.apply(new MsearchTemplateRequest.Builder()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: mtermvectors
-
-	/**
-	 * Returns multiple termvectors in one request.
-	 * 
-	 *
-	 */
-
-	public MtermvectorsResponse mtermvectors(MtermvectorsRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<MtermvectorsRequest, MtermvectorsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<MtermvectorsRequest, MtermvectorsResponse, ErrorResponse>) MtermvectorsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns multiple termvectors in one request.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link MtermvectorsRequest}
-	 *
-	 */
-
-	public final MtermvectorsResponse mtermvectors(
-			Function<MtermvectorsRequest.Builder, ObjectBuilder<MtermvectorsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return mtermvectors(fn.apply(new MtermvectorsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns multiple termvectors in one request.
-	 * 
-	 *
-	 */
-
-	public MtermvectorsResponse mtermvectors() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new MtermvectorsRequest.Builder().build(), MtermvectorsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: ping
-
-	/**
-	 * Returns whether the cluster is running.
-	 * 
-	 *
-	 */
-	public BooleanResponse ping() throws IOException, OpenSearchException {
-		return this.transport.performRequest(PingRequest._INSTANCE, PingRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: put_script
-
-	/**
-	 * Creates or updates a script.
-	 * 
-	 *
-	 */
-
-	public PutScriptResponse putScript(PutScriptRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutScriptRequest, PutScriptResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutScriptRequest, PutScriptResponse, ErrorResponse>) PutScriptRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates or updates a script.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutScriptRequest}
-	 *
-	 */
-
-	public final PutScriptResponse putScript(Function<PutScriptRequest.Builder, ObjectBuilder<PutScriptRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putScript(fn.apply(new PutScriptRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: rank_eval
-
-	/**
-	 * Allows to evaluate the quality of ranked search results over a set of typical
-	 * search queries
-	 * 
-	 *
-	 */
-
-	public RankEvalResponse rankEval(RankEvalRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<RankEvalRequest, RankEvalResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<RankEvalRequest, RankEvalResponse, ErrorResponse>) RankEvalRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to evaluate the quality of ranked search results over a set of typical
-	 * search queries
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link RankEvalRequest}
-	 *
-	 */
-
-	public final RankEvalResponse rankEval(Function<RankEvalRequest.Builder, ObjectBuilder<RankEvalRequest>> fn)
-			throws IOException, OpenSearchException {
-		return rankEval(fn.apply(new RankEvalRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: reindex
-
-	/**
-	 * Allows to copy documents from one index to another, optionally filtering the
-	 * source documents by a query, changing the destination index settings, or
-	 * fetching the documents from a remote cluster.
-	 * 
-	 *
-	 */
-
-	public ReindexResponse reindex(ReindexRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ReindexRequest, ReindexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ReindexRequest, ReindexResponse, ErrorResponse>) ReindexRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to copy documents from one index to another, optionally filtering the
-	 * source documents by a query, changing the destination index settings, or
-	 * fetching the documents from a remote cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ReindexRequest}
-	 *
-	 */
-
-	public final ReindexResponse reindex(Function<ReindexRequest.Builder, ObjectBuilder<ReindexRequest>> fn)
-			throws IOException, OpenSearchException {
-		return reindex(fn.apply(new ReindexRequest.Builder()).build());
-	}
-
-	/**
-	 * Allows to copy documents from one index to another, optionally filtering the
-	 * source documents by a query, changing the destination index settings, or
-	 * fetching the documents from a remote cluster.
-	 * 
-	 *
-	 */
-
-	public ReindexResponse reindex() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new ReindexRequest.Builder().build(), ReindexRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: reindex_rethrottle
-
-	/**
-	 * Changes the number of requests per second for a particular Reindex operation.
-	 * 
-	 *
-	 */
-
-	public ReindexRethrottleResponse reindexRethrottle(ReindexRethrottleRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ReindexRethrottleRequest, ReindexRethrottleResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ReindexRethrottleRequest, ReindexRethrottleResponse, ErrorResponse>)
-						ReindexRethrottleRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Changes the number of requests per second for a particular Reindex operation.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ReindexRethrottleRequest}
-	 *
-	 */
-
-	public final ReindexRethrottleResponse reindexRethrottle(
-			Function<ReindexRethrottleRequest.Builder, ObjectBuilder<ReindexRethrottleRequest>> fn)
-			throws IOException, OpenSearchException {
-		return reindexRethrottle(fn.apply(new ReindexRethrottleRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: render_search_template
-
-	/**
-	 * Allows to use the Mustache language to pre-render a search definition.
-	 * 
-	 *
-	 */
-
-	public RenderSearchTemplateResponse renderSearchTemplate(RenderSearchTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<RenderSearchTemplateRequest, RenderSearchTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<RenderSearchTemplateRequest, RenderSearchTemplateResponse, ErrorResponse>)
-						RenderSearchTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to use the Mustache language to pre-render a search definition.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link RenderSearchTemplateRequest}
-	 *
-	 */
-
-	public final RenderSearchTemplateResponse renderSearchTemplate(
-			Function<RenderSearchTemplateRequest.Builder, ObjectBuilder<RenderSearchTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return renderSearchTemplate(fn.apply(new RenderSearchTemplateRequest.Builder()).build());
-	}
-
-	/**
-	 * Allows to use the Mustache language to pre-render a search definition.
-	 * 
-	 *
-	 */
-
-	public RenderSearchTemplateResponse renderSearchTemplate() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new RenderSearchTemplateRequest.Builder().build(),
-				RenderSearchTemplateRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: scripts_painless_execute
-
-	/**
-	 * Allows an arbitrary script to be executed and a result to be returned
-	 * 
-	 *
-	 */
-
-	public <TResult> ScriptsPainlessExecuteResponse<TResult> scriptsPainlessExecute(
-			ScriptsPainlessExecuteRequest request, Class<TResult> tResultClass)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ScriptsPainlessExecuteRequest, ScriptsPainlessExecuteResponse<TResult>, ErrorResponse> endpoint =
-				(JsonEndpoint<ScriptsPainlessExecuteRequest, ScriptsPainlessExecuteResponse<TResult>, ErrorResponse>)
-						ScriptsPainlessExecuteRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.scripts_painless_execute.TResult",
-				getDeserializer(tResultClass));
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows an arbitrary script to be executed and a result to be returned
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ScriptsPainlessExecuteRequest}
-	 *
-	 */
-
-	public final <TResult> ScriptsPainlessExecuteResponse<TResult> scriptsPainlessExecute(
-			Function<ScriptsPainlessExecuteRequest.Builder, ObjectBuilder<ScriptsPainlessExecuteRequest>> fn,
-			Class<TResult> tResultClass) throws IOException, OpenSearchException {
-		return scriptsPainlessExecute(fn.apply(new ScriptsPainlessExecuteRequest.Builder()).build(), tResultClass);
-	}
-
-	// ----- Endpoint: scroll
-
-	/**
-	 * Allows to retrieve a large numbers of results from a single search request.
-	 * 
-	 */
-
-	public <TDocument> ScrollResponse<TDocument> scroll(ScrollRequest request, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ScrollRequest, ScrollResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<ScrollRequest, ScrollResponse<TDocument>, ErrorResponse>) ScrollRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.scroll.TDocument", getDeserializer(tDocumentClass));
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to retrieve a large numbers of results from a single search request.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ScrollRequest}
-	 */
-
-	public final <TDocument> ScrollResponse<TDocument> scroll(
-			Function<ScrollRequest.Builder, ObjectBuilder<ScrollRequest>> fn, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		return scroll(fn.apply(new ScrollRequest.Builder()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: search
-
-	/**
-	 * Returns results matching a query.
-	 * 
-	 *
-	 */
-
-	public <TDocument> SearchResponse<TDocument> search(SearchRequest request, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SearchRequest, SearchResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<SearchRequest, SearchResponse<TDocument>, ErrorResponse>) SearchRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.search.TDocument", getDeserializer(tDocumentClass));
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns results matching a query.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SearchRequest}
-	 *
-	 */
-
-	public final <TDocument> SearchResponse<TDocument> search(
-			Function<SearchRequest.Builder, ObjectBuilder<SearchRequest>> fn, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		return search(fn.apply(new SearchRequest.Builder()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: search_shards
-
-	/**
-	 * Returns information about the indices and shards that a search request would
-	 * be executed against.
-	 * 
-	 *
-	 */
-
-	public SearchShardsResponse searchShards(SearchShardsRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SearchShardsRequest, SearchShardsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<SearchShardsRequest, SearchShardsResponse, ErrorResponse>) SearchShardsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about the indices and shards that a search request would
-	 * be executed against.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SearchShardsRequest}
-	 *
-	 */
-
-	public final SearchShardsResponse searchShards(
-			Function<SearchShardsRequest.Builder, ObjectBuilder<SearchShardsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return searchShards(fn.apply(new SearchShardsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about the indices and shards that a search request would
-	 * be executed against.
-	 * 
-	 *
-	 */
-
-	public SearchShardsResponse searchShards() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new SearchShardsRequest.Builder().build(), SearchShardsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: search_template
-
-	/**
-	 * Allows to use the Mustache language to pre-render a search definition.
-	 * 
-	 *
-	 */
-
-	public <TDocument> SearchTemplateResponse<TDocument> searchTemplate(SearchTemplateRequest request,
-			Class<TDocument> tDocumentClass) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SearchTemplateRequest, SearchTemplateResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<SearchTemplateRequest, SearchTemplateResponse<TDocument>, ErrorResponse>)
-						SearchTemplateRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.search_template.TDocument",
-				getDeserializer(tDocumentClass));
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to use the Mustache language to pre-render a search definition.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SearchTemplateRequest}
-	 *
-	 */
-
-	public final <TDocument> SearchTemplateResponse<TDocument> searchTemplate(
-			Function<SearchTemplateRequest.Builder, ObjectBuilder<SearchTemplateRequest>> fn,
-			Class<TDocument> tDocumentClass) throws IOException, OpenSearchException {
-		return searchTemplate(fn.apply(new SearchTemplateRequest.Builder()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: terms_enum
-
-	/**
-	 * The terms enum API can be used to discover terms in the index that begin with
-	 * the provided string. It is designed for low-latency look-ups used in
-	 * auto-complete scenarios.
-	 * 
-	 *
-	 */
-
-	public TermsEnumResponse termsEnum(TermsEnumRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<TermsEnumRequest, TermsEnumResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<TermsEnumRequest, TermsEnumResponse, ErrorResponse>) TermsEnumRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * The terms enum API can be used to discover terms in the index that begin with
-	 * the provided string. It is designed for low-latency look-ups used in
-	 * auto-complete scenarios.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link TermsEnumRequest}
-	 *
-	 */
-
-	public final TermsEnumResponse termsEnum(Function<TermsEnumRequest.Builder, ObjectBuilder<TermsEnumRequest>> fn)
-			throws IOException, OpenSearchException {
-		return termsEnum(fn.apply(new TermsEnumRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: termvectors
-
-	/**
-	 * Returns information and statistics about terms in the fields of a particular
-	 * document.
-	 * 
-	 *
-	 */
-
-	public <TDocument> TermvectorsResponse termvectors(TermvectorsRequest<TDocument> request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<TermvectorsRequest<?>, TermvectorsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<TermvectorsRequest<?>, TermvectorsResponse, ErrorResponse>) TermvectorsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information and statistics about terms in the fields of a particular
-	 * document.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link TermvectorsRequest}
-	 *
-	 */
-
-	public final <TDocument> TermvectorsResponse termvectors(
-			Function<TermvectorsRequest.Builder<TDocument>, ObjectBuilder<TermvectorsRequest<TDocument>>> fn)
-			throws IOException, OpenSearchException {
-		return termvectors(fn.apply(new TermvectorsRequest.Builder<TDocument>()).build());
-	}
-
-	// ----- Endpoint: update
-
-	/**
-	 * Updates a document with a script or partial document.
-	 * 
-	 *
-	 */
-
-	public <TDocument, TPartialDocument> UpdateResponse<TDocument> update(
-			UpdateRequest<TDocument, TPartialDocument> request, Class<TDocument> tDocumentClass)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<UpdateRequest<?, ?>, UpdateResponse<TDocument>, ErrorResponse> endpoint =
-				(JsonEndpoint<UpdateRequest<?, ?>, UpdateResponse<TDocument>, ErrorResponse>) UpdateRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
-				"org.opensearch.client:Deserializer:_global.update.TDocument", getDeserializer(tDocumentClass));
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Updates a document with a script or partial document.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link UpdateRequest}
-	 *
-	 */
-
-	public final <TDocument, TPartialDocument> UpdateResponse<TDocument> update(
-
-			Function<UpdateRequest.Builder<TDocument, TPartialDocument>,
-					ObjectBuilder<UpdateRequest<TDocument, TPartialDocument>>> fn,
-			Class<TDocument> tDocumentClass) throws IOException, OpenSearchException {
-		return update(fn.apply(new UpdateRequest.Builder<TDocument, TPartialDocument>()).build(), tDocumentClass);
-	}
-
-	// ----- Endpoint: update_by_query
-
-	/**
-	 * Performs an update on every document in the index without changing the
-	 * source, for example to pick up a mapping change.
-	 * 
-	 *
-	 */
-
-	public UpdateByQueryResponse updateByQuery(UpdateByQueryRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<UpdateByQueryRequest, UpdateByQueryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<UpdateByQueryRequest, UpdateByQueryResponse, ErrorResponse>)
-						UpdateByQueryRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Performs an update on every document in the index without changing the
-	 * source, for example to pick up a mapping change.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link UpdateByQueryRequest}
-	 *
-	 */
-
-	public final UpdateByQueryResponse updateByQuery(
-			Function<UpdateByQueryRequest.Builder, ObjectBuilder<UpdateByQueryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return updateByQuery(fn.apply(new UpdateByQueryRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: update_by_query_rethrottle
-
-	/**
-	 * Changes the number of requests per second for a particular Update By Query
-	 * operation.
-	 * 
-	 *
-	 */
-
-	public UpdateByQueryRethrottleResponse updateByQueryRethrottle(UpdateByQueryRethrottleRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<UpdateByQueryRethrottleRequest, UpdateByQueryRethrottleResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<UpdateByQueryRethrottleRequest, UpdateByQueryRethrottleResponse, ErrorResponse>)
-						UpdateByQueryRethrottleRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Changes the number of requests per second for a particular Update By Query
-	 * operation.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link UpdateByQueryRethrottleRequest}
-	 *
-	 */
-
-	public final UpdateByQueryRethrottleResponse updateByQueryRethrottle(
-			Function<UpdateByQueryRethrottleRequest.Builder, ObjectBuilder<UpdateByQueryRethrottleRequest>> fn)
-			throws IOException, OpenSearchException {
-		return updateByQueryRethrottle(fn.apply(new UpdateByQueryRethrottleRequest.Builder()).build());
-	}
+    public OpenSearchClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchClient(this.transport, transportOptions);
+    }
+
+    // ----- Child clients
+
+    public OpenSearchCatClient cat() {
+        return new OpenSearchCatClient(this.transport, this.transportOptions);
+    }
+
+    public OpenSearchClusterClient cluster() {
+        return new OpenSearchClusterClient(this.transport, this.transportOptions);
+    }
+
+    public OpenSearchDanglingIndicesClient danglingIndices() {
+        return new OpenSearchDanglingIndicesClient(this.transport, this.transportOptions);
+    }
+
+    public OpenSearchFeaturesClient features() {
+        return new OpenSearchFeaturesClient(this.transport, this.transportOptions);
+    }
+
+    public OpenSearchIndicesClient indices() {
+        return new OpenSearchIndicesClient(this.transport, this.transportOptions);
+    }
+
+    public OpenSearchIngestClient ingest() {
+        return new OpenSearchIngestClient(this.transport, this.transportOptions);
+    }
+
+    public OpenSearchNodesClient nodes() {
+        return new OpenSearchNodesClient(this.transport, this.transportOptions);
+    }
+
+    public OpenSearchShutdownClient shutdown() {
+        return new OpenSearchShutdownClient(this.transport, this.transportOptions);
+    }
+
+    public OpenSearchSnapshotClient snapshot() {
+        return new OpenSearchSnapshotClient(this.transport, this.transportOptions);
+    }
+
+    public OpenSearchTasksClient tasks() {
+        return new OpenSearchTasksClient(this.transport, this.transportOptions);
+    }
+
+    // ----- Endpoint: bulk
+
+    /**
+     * Allows to perform multiple index/update/delete operations in a single
+     * request.
+     *
+     *
+     */
+
+    public BulkResponse bulk(BulkRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<BulkRequest, BulkResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            BulkRequest,
+            BulkResponse,
+            ErrorResponse>) BulkRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to perform multiple index/update/delete operations in a single
+     * request.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link BulkRequest}
+     *
+     */
+
+    public final BulkResponse bulk(Function<BulkRequest.Builder, ObjectBuilder<BulkRequest>> fn) throws IOException, OpenSearchException {
+        return bulk(fn.apply(new BulkRequest.Builder()).build());
+    }
+
+    /**
+     * Allows to perform multiple index/update/delete operations in a single
+     * request.
+     *
+     *
+     */
+
+    public BulkResponse bulk() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new BulkRequest.Builder().build(), BulkRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: clear_scroll
+
+    /**
+     * Explicitly clears the search context for a scroll.
+     *
+     *
+     */
+
+    public ClearScrollResponse clearScroll(ClearScrollRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ClearScrollRequest, ClearScrollResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ClearScrollRequest,
+            ClearScrollResponse,
+            ErrorResponse>) ClearScrollRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Explicitly clears the search context for a scroll.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ClearScrollRequest}
+     *
+     */
+
+    public final ClearScrollResponse clearScroll(Function<ClearScrollRequest.Builder, ObjectBuilder<ClearScrollRequest>> fn)
+        throws IOException, OpenSearchException {
+        return clearScroll(fn.apply(new ClearScrollRequest.Builder()).build());
+    }
+
+    /**
+     * Explicitly clears the search context for a scroll.
+     *
+     *
+     */
+
+    public ClearScrollResponse clearScroll() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new ClearScrollRequest.Builder().build(), ClearScrollRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: count
+
+    /**
+     * Returns number of documents matching a query.
+     *
+     *
+     */
+
+    public CountResponse count(CountRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CountRequest, CountResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CountRequest,
+            CountResponse,
+            ErrorResponse>) CountRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns number of documents matching a query.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CountRequest}
+     *
+     */
+
+    public final CountResponse count(Function<CountRequest.Builder, ObjectBuilder<CountRequest>> fn) throws IOException,
+        OpenSearchException {
+        return count(fn.apply(new CountRequest.Builder()).build());
+    }
+
+    /**
+     * Returns number of documents matching a query.
+     *
+     *
+     */
+
+    public CountResponse count() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new CountRequest.Builder().build(), CountRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: create
+
+    /**
+     * Creates a new document in the index.
+     * <p>
+     * Returns a 409 response when a document with a same ID already exists in the
+     * index.
+     *
+     *
+     */
+
+    public <TDocument> CreateResponse create(CreateRequest<TDocument> request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CreateRequest<?>, CreateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CreateRequest<?>,
+            CreateResponse,
+            ErrorResponse>) CreateRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates a new document in the index.
+     * <p>
+     * Returns a 409 response when a document with a same ID already exists in the
+     * index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CreateRequest}
+     *
+     */
+
+    public final <TDocument> CreateResponse create(Function<CreateRequest.Builder<TDocument>, ObjectBuilder<CreateRequest<TDocument>>> fn)
+        throws IOException, OpenSearchException {
+        return create(fn.apply(new CreateRequest.Builder<TDocument>()).build());
+    }
+
+    // ----- Endpoint: create_point_in_time
+
+    /**
+     * Provides low-level information about the disk utilization of a PIT by
+     * describing its Lucene segments.
+     *
+     *
+     */
+
+    public CreatePitResponse createPit(CreatePitRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CreatePitRequest, CreatePitResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CreatePitRequest,
+            CreatePitResponse,
+            ErrorResponse>) CreatePitRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Provides low-level information about the disk utilization of a PIT by
+     * describing its Lucene segments.
+     *
+     * @param fn
+     *           a function that initializes a builder to create the
+     *           {@link CreatePitRequest}
+     *
+     */
+
+    public final CreatePitResponse createPit(Function<CreatePitRequest.Builder, ObjectBuilder<CreatePitRequest>> fn) throws IOException,
+        OpenSearchException {
+        return createPit(fn.apply(new CreatePitRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: delete
+
+    /**
+     * Removes a document from the index.
+     *
+     *
+     */
+
+    public DeleteResponse delete(DeleteRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteRequest, DeleteResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteRequest,
+            DeleteResponse,
+            ErrorResponse>) DeleteRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Removes a document from the index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteRequest}
+     *
+     */
+
+    public final DeleteResponse delete(Function<DeleteRequest.Builder, ObjectBuilder<DeleteRequest>> fn) throws IOException,
+        OpenSearchException {
+        return delete(fn.apply(new DeleteRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: delete_point_in_time
+
+    /**
+     * Delete Point In Time
+     *
+     *
+     */
+
+    public DeletePitResponse deletePit(DeletePitRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeletePitRequest, DeletePitResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeletePitRequest,
+            DeletePitResponse,
+            ErrorResponse>) DeletePitRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Delete Point In Time
+     *
+     * @param fn
+     *           a function that initializes a builder to create the
+     *           {@link DeletePitRequest}
+     *
+     */
+
+    public final DeletePitResponse deletePit(Function<DeletePitRequest.Builder, ObjectBuilder<DeletePitRequest>> fn) throws IOException,
+        OpenSearchException {
+        return deletePit(fn.apply(new DeletePitRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: delete_by_query
+
+    /**
+     * Deletes documents matching the provided query.
+     *
+     *
+     */
+
+    public DeleteByQueryResponse deleteByQuery(DeleteByQueryRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteByQueryRequest, DeleteByQueryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteByQueryRequest,
+            DeleteByQueryResponse,
+            ErrorResponse>) DeleteByQueryRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes documents matching the provided query.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteByQueryRequest}
+     *
+     */
+
+    public final DeleteByQueryResponse deleteByQuery(Function<DeleteByQueryRequest.Builder, ObjectBuilder<DeleteByQueryRequest>> fn)
+        throws IOException, OpenSearchException {
+        return deleteByQuery(fn.apply(new DeleteByQueryRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: delete_by_query_rethrottle
+
+    /**
+     * Changes the number of requests per second for a particular Delete By Query
+     * operation.
+     *
+     *
+     */
+
+    public DeleteByQueryRethrottleResponse deleteByQueryRethrottle(DeleteByQueryRethrottleRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteByQueryRethrottleRequest, DeleteByQueryRethrottleResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteByQueryRethrottleRequest,
+            DeleteByQueryRethrottleResponse,
+            ErrorResponse>) DeleteByQueryRethrottleRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Changes the number of requests per second for a particular Delete By Query
+     * operation.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteByQueryRethrottleRequest}
+     *
+     */
+
+    public final DeleteByQueryRethrottleResponse deleteByQueryRethrottle(
+        Function<DeleteByQueryRethrottleRequest.Builder, ObjectBuilder<DeleteByQueryRethrottleRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deleteByQueryRethrottle(fn.apply(new DeleteByQueryRethrottleRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: delete_script
+
+    /**
+     * Deletes a script.
+     *
+     *
+     */
+
+    public DeleteScriptResponse deleteScript(DeleteScriptRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteScriptRequest, DeleteScriptResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteScriptRequest,
+            DeleteScriptResponse,
+            ErrorResponse>) DeleteScriptRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes a script.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteScriptRequest}
+     *
+     */
+
+    public final DeleteScriptResponse deleteScript(Function<DeleteScriptRequest.Builder, ObjectBuilder<DeleteScriptRequest>> fn)
+        throws IOException, OpenSearchException {
+        return deleteScript(fn.apply(new DeleteScriptRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: exists
+
+    /**
+     * Returns information about whether a document exists in an index.
+     *
+     *
+     */
+
+    public BooleanResponse exists(ExistsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ExistsRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ExistsRequest,
+            BooleanResponse,
+            ErrorResponse>) ExistsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about whether a document exists in an index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ExistsRequest}
+     *
+     */
+
+    public final BooleanResponse exists(Function<ExistsRequest.Builder, ObjectBuilder<ExistsRequest>> fn) throws IOException,
+        OpenSearchException {
+        return exists(fn.apply(new ExistsRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: exists_source
+
+    /**
+     * Returns information about whether a document source exists in an index.
+     *
+     *
+     */
+
+    public BooleanResponse existsSource(ExistsSourceRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ExistsSourceRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ExistsSourceRequest,
+            BooleanResponse,
+            ErrorResponse>) ExistsSourceRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about whether a document source exists in an index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ExistsSourceRequest}
+     *
+     */
+
+    public final BooleanResponse existsSource(Function<ExistsSourceRequest.Builder, ObjectBuilder<ExistsSourceRequest>> fn)
+        throws IOException, OpenSearchException {
+        return existsSource(fn.apply(new ExistsSourceRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: explain
+
+    /**
+     * Returns information about why a specific matches (or doesn't match) a query.
+     *
+     *
+     */
+
+    public <TDocument> ExplainResponse<TDocument> explain(ExplainRequest request, Class<TDocument> tDocumentClass) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ExplainRequest, ExplainResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            ExplainRequest,
+            ExplainResponse<TDocument>,
+            ErrorResponse>) ExplainRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.explain.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about why a specific matches (or doesn't match) a query.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ExplainRequest}
+     *
+     */
+
+    public final <TDocument> ExplainResponse<TDocument> explain(
+        Function<ExplainRequest.Builder, ObjectBuilder<ExplainRequest>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return explain(fn.apply(new ExplainRequest.Builder()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: field_caps
+
+    /**
+     * Returns the information about the capabilities of fields among multiple
+     * indices.
+     *
+     *
+     */
+
+    public FieldCapsResponse fieldCaps(FieldCapsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<FieldCapsRequest, FieldCapsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            FieldCapsRequest,
+            FieldCapsResponse,
+            ErrorResponse>) FieldCapsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns the information about the capabilities of fields among multiple
+     * indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link FieldCapsRequest}
+     *
+     */
+
+    public final FieldCapsResponse fieldCaps(Function<FieldCapsRequest.Builder, ObjectBuilder<FieldCapsRequest>> fn) throws IOException,
+        OpenSearchException {
+        return fieldCaps(fn.apply(new FieldCapsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns the information about the capabilities of fields among multiple
+     * indices.
+     *
+     *
+     */
+
+    public FieldCapsResponse fieldCaps() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new FieldCapsRequest.Builder().build(), FieldCapsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: get
+
+    /**
+     * Returns a document.
+     *
+     *
+     */
+
+    public <TDocument> GetResponse<TDocument> get(GetRequest request, Class<TDocument> tDocumentClass) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetRequest, GetResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            GetRequest,
+            GetResponse<TDocument>,
+            ErrorResponse>) GetRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.get.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns a document.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetRequest}
+     *
+     */
+
+    public final <TDocument> GetResponse<TDocument> get(
+        Function<GetRequest.Builder, ObjectBuilder<GetRequest>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return get(fn.apply(new GetRequest.Builder()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: get_script
+
+    /**
+     * Returns a script.
+     *
+     *
+     */
+
+    public GetScriptResponse getScript(GetScriptRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetScriptRequest, GetScriptResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetScriptRequest,
+            GetScriptResponse,
+            ErrorResponse>) GetScriptRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns a script.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetScriptRequest}
+     *
+     */
+
+    public final GetScriptResponse getScript(Function<GetScriptRequest.Builder, ObjectBuilder<GetScriptRequest>> fn) throws IOException,
+        OpenSearchException {
+        return getScript(fn.apply(new GetScriptRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: get_script_context
+
+    /**
+     * Returns all script contexts.
+     *
+     *
+     */
+    public GetScriptContextResponse getScriptContext() throws IOException, OpenSearchException {
+        return this.transport.performRequest(GetScriptContextRequest._INSTANCE, GetScriptContextRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: get_script_languages
+
+    /**
+     * Returns available script types, languages and contexts
+     *
+     *
+     */
+    public GetScriptLanguagesResponse getScriptLanguages() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            GetScriptLanguagesRequest._INSTANCE,
+            GetScriptLanguagesRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: get_source
+
+    /**
+     * Returns the source of a document.
+     *
+     *
+     */
+
+    public <TDocument> GetSourceResponse<TDocument> getSource(GetSourceRequest request, Class<TDocument> tDocumentClass) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetSourceRequest, GetSourceResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            GetSourceRequest,
+            GetSourceResponse<TDocument>,
+            ErrorResponse>) GetSourceRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.get_source.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns the source of a document.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetSourceRequest}
+     *
+     */
+
+    public final <TDocument> GetSourceResponse<TDocument> getSource(
+        Function<GetSourceRequest.Builder, ObjectBuilder<GetSourceRequest>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return getSource(fn.apply(new GetSourceRequest.Builder()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: index
+
+    /**
+     * Creates or updates a document in an index.
+     *
+     *
+     */
+
+    public <TDocument> IndexResponse index(IndexRequest<TDocument> request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<IndexRequest<?>, IndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            IndexRequest<?>,
+            IndexResponse,
+            ErrorResponse>) IndexRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates or updates a document in an index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link IndexRequest}
+     *
+     */
+
+    public final <TDocument> IndexResponse index(Function<IndexRequest.Builder<TDocument>, ObjectBuilder<IndexRequest<TDocument>>> fn)
+        throws IOException, OpenSearchException {
+        return index(fn.apply(new IndexRequest.Builder<TDocument>()).build());
+    }
+
+    // ----- Endpoint: info
+
+    /**
+     * Returns basic information about the cluster.
+     *
+     *
+     */
+    public InfoResponse info() throws IOException, OpenSearchException {
+        return this.transport.performRequest(InfoRequest._INSTANCE, InfoRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: list_point_in_time
+
+    /**
+     * List all Point In Time
+     *
+     *
+     */
+
+    public ListAllPitResponse listAllPit() throws IOException, OpenSearchException {
+        return this.transport.performRequest(ListAllPitRequest._INSTANCE, ListAllPitRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: mget
+
+    /**
+     * Allows to get multiple documents in one request.
+     *
+     *
+     */
+
+    public <TDocument> MgetResponse<TDocument> mget(MgetRequest request, Class<TDocument> tDocumentClass) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<MgetRequest, MgetResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            MgetRequest,
+            MgetResponse<TDocument>,
+            ErrorResponse>) MgetRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.mget.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to get multiple documents in one request.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link MgetRequest}
+     *
+     */
+
+    public final <TDocument> MgetResponse<TDocument> mget(
+        Function<MgetRequest.Builder, ObjectBuilder<MgetRequest>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return mget(fn.apply(new MgetRequest.Builder()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: msearch
+
+    /**
+     * Allows to execute several search operations in one request.
+     *
+     *
+     */
+
+    public <TDocument> MsearchResponse<TDocument> msearch(MsearchRequest request, Class<TDocument> tDocumentClass) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<MsearchRequest, MsearchResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            MsearchRequest,
+            MsearchResponse<TDocument>,
+            ErrorResponse>) MsearchRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.msearch.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to execute several search operations in one request.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link MsearchRequest}
+     *
+     */
+
+    public final <TDocument> MsearchResponse<TDocument> msearch(
+        Function<MsearchRequest.Builder, ObjectBuilder<MsearchRequest>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return msearch(fn.apply(new MsearchRequest.Builder()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: msearch_template
+
+    /**
+     * Allows to execute several search template operations in one request.
+     *
+     *
+     */
+
+    public <TDocument> MsearchTemplateResponse<TDocument> msearchTemplate(MsearchTemplateRequest request, Class<TDocument> tDocumentClass)
+        throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<MsearchTemplateRequest, MsearchTemplateResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            MsearchTemplateRequest,
+            MsearchTemplateResponse<TDocument>,
+            ErrorResponse>) MsearchTemplateRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.msearch_template.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to execute several search template operations in one request.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link MsearchTemplateRequest}
+     *
+     */
+
+    public final <TDocument> MsearchTemplateResponse<TDocument> msearchTemplate(
+        Function<MsearchTemplateRequest.Builder, ObjectBuilder<MsearchTemplateRequest>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return msearchTemplate(fn.apply(new MsearchTemplateRequest.Builder()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: mtermvectors
+
+    /**
+     * Returns multiple termvectors in one request.
+     *
+     *
+     */
+
+    public MtermvectorsResponse mtermvectors(MtermvectorsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<MtermvectorsRequest, MtermvectorsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            MtermvectorsRequest,
+            MtermvectorsResponse,
+            ErrorResponse>) MtermvectorsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns multiple termvectors in one request.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link MtermvectorsRequest}
+     *
+     */
+
+    public final MtermvectorsResponse mtermvectors(Function<MtermvectorsRequest.Builder, ObjectBuilder<MtermvectorsRequest>> fn)
+        throws IOException, OpenSearchException {
+        return mtermvectors(fn.apply(new MtermvectorsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns multiple termvectors in one request.
+     *
+     *
+     */
+
+    public MtermvectorsResponse mtermvectors() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new MtermvectorsRequest.Builder().build(),
+            MtermvectorsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: ping
+
+    /**
+     * Returns whether the cluster is running.
+     *
+     *
+     */
+    public BooleanResponse ping() throws IOException, OpenSearchException {
+        return this.transport.performRequest(PingRequest._INSTANCE, PingRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: put_script
+
+    /**
+     * Creates or updates a script.
+     *
+     *
+     */
+
+    public PutScriptResponse putScript(PutScriptRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutScriptRequest, PutScriptResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutScriptRequest,
+            PutScriptResponse,
+            ErrorResponse>) PutScriptRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates or updates a script.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutScriptRequest}
+     *
+     */
+
+    public final PutScriptResponse putScript(Function<PutScriptRequest.Builder, ObjectBuilder<PutScriptRequest>> fn) throws IOException,
+        OpenSearchException {
+        return putScript(fn.apply(new PutScriptRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: rank_eval
+
+    /**
+     * Allows to evaluate the quality of ranked search results over a set of typical
+     * search queries
+     *
+     *
+     */
+
+    public RankEvalResponse rankEval(RankEvalRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<RankEvalRequest, RankEvalResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            RankEvalRequest,
+            RankEvalResponse,
+            ErrorResponse>) RankEvalRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to evaluate the quality of ranked search results over a set of typical
+     * search queries
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link RankEvalRequest}
+     *
+     */
+
+    public final RankEvalResponse rankEval(Function<RankEvalRequest.Builder, ObjectBuilder<RankEvalRequest>> fn) throws IOException,
+        OpenSearchException {
+        return rankEval(fn.apply(new RankEvalRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: reindex
+
+    /**
+     * Allows to copy documents from one index to another, optionally filtering the
+     * source documents by a query, changing the destination index settings, or
+     * fetching the documents from a remote cluster.
+     *
+     *
+     */
+
+    public ReindexResponse reindex(ReindexRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ReindexRequest, ReindexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ReindexRequest,
+            ReindexResponse,
+            ErrorResponse>) ReindexRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to copy documents from one index to another, optionally filtering the
+     * source documents by a query, changing the destination index settings, or
+     * fetching the documents from a remote cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ReindexRequest}
+     *
+     */
+
+    public final ReindexResponse reindex(Function<ReindexRequest.Builder, ObjectBuilder<ReindexRequest>> fn) throws IOException,
+        OpenSearchException {
+        return reindex(fn.apply(new ReindexRequest.Builder()).build());
+    }
+
+    /**
+     * Allows to copy documents from one index to another, optionally filtering the
+     * source documents by a query, changing the destination index settings, or
+     * fetching the documents from a remote cluster.
+     *
+     *
+     */
+
+    public ReindexResponse reindex() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new ReindexRequest.Builder().build(), ReindexRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: reindex_rethrottle
+
+    /**
+     * Changes the number of requests per second for a particular Reindex operation.
+     *
+     *
+     */
+
+    public ReindexRethrottleResponse reindexRethrottle(ReindexRethrottleRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ReindexRethrottleRequest, ReindexRethrottleResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ReindexRethrottleRequest,
+            ReindexRethrottleResponse,
+            ErrorResponse>) ReindexRethrottleRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Changes the number of requests per second for a particular Reindex operation.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ReindexRethrottleRequest}
+     *
+     */
+
+    public final ReindexRethrottleResponse reindexRethrottle(
+        Function<ReindexRethrottleRequest.Builder, ObjectBuilder<ReindexRethrottleRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return reindexRethrottle(fn.apply(new ReindexRethrottleRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: render_search_template
+
+    /**
+     * Allows to use the Mustache language to pre-render a search definition.
+     *
+     *
+     */
+
+    public RenderSearchTemplateResponse renderSearchTemplate(RenderSearchTemplateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<RenderSearchTemplateRequest, RenderSearchTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            RenderSearchTemplateRequest,
+            RenderSearchTemplateResponse,
+            ErrorResponse>) RenderSearchTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to use the Mustache language to pre-render a search definition.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link RenderSearchTemplateRequest}
+     *
+     */
+
+    public final RenderSearchTemplateResponse renderSearchTemplate(
+        Function<RenderSearchTemplateRequest.Builder, ObjectBuilder<RenderSearchTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return renderSearchTemplate(fn.apply(new RenderSearchTemplateRequest.Builder()).build());
+    }
+
+    /**
+     * Allows to use the Mustache language to pre-render a search definition.
+     *
+     *
+     */
+
+    public RenderSearchTemplateResponse renderSearchTemplate() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new RenderSearchTemplateRequest.Builder().build(),
+            RenderSearchTemplateRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: scripts_painless_execute
+
+    /**
+     * Allows an arbitrary script to be executed and a result to be returned
+     *
+     *
+     */
+
+    public <TResult> ScriptsPainlessExecuteResponse<TResult> scriptsPainlessExecute(
+        ScriptsPainlessExecuteRequest request,
+        Class<TResult> tResultClass
+    ) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ScriptsPainlessExecuteRequest, ScriptsPainlessExecuteResponse<TResult>, ErrorResponse> endpoint = (JsonEndpoint<
+            ScriptsPainlessExecuteRequest,
+            ScriptsPainlessExecuteResponse<TResult>,
+            ErrorResponse>) ScriptsPainlessExecuteRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.scripts_painless_execute.TResult",
+            getDeserializer(tResultClass)
+        );
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows an arbitrary script to be executed and a result to be returned
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ScriptsPainlessExecuteRequest}
+     *
+     */
+
+    public final <TResult> ScriptsPainlessExecuteResponse<TResult> scriptsPainlessExecute(
+        Function<ScriptsPainlessExecuteRequest.Builder, ObjectBuilder<ScriptsPainlessExecuteRequest>> fn,
+        Class<TResult> tResultClass
+    ) throws IOException, OpenSearchException {
+        return scriptsPainlessExecute(fn.apply(new ScriptsPainlessExecuteRequest.Builder()).build(), tResultClass);
+    }
+
+    // ----- Endpoint: scroll
+
+    /**
+     * Allows to retrieve a large numbers of results from a single search request.
+     *
+     */
+
+    public <TDocument> ScrollResponse<TDocument> scroll(ScrollRequest request, Class<TDocument> tDocumentClass) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ScrollRequest, ScrollResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            ScrollRequest,
+            ScrollResponse<TDocument>,
+            ErrorResponse>) ScrollRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.scroll.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to retrieve a large numbers of results from a single search request.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ScrollRequest}
+     */
+
+    public final <TDocument> ScrollResponse<TDocument> scroll(
+        Function<ScrollRequest.Builder, ObjectBuilder<ScrollRequest>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return scroll(fn.apply(new ScrollRequest.Builder()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: search
+
+    /**
+     * Returns results matching a query.
+     *
+     *
+     */
+
+    public <TDocument> SearchResponse<TDocument> search(SearchRequest request, Class<TDocument> tDocumentClass) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SearchRequest, SearchResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            SearchRequest,
+            SearchResponse<TDocument>,
+            ErrorResponse>) SearchRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.search.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns results matching a query.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SearchRequest}
+     *
+     */
+
+    public final <TDocument> SearchResponse<TDocument> search(
+        Function<SearchRequest.Builder, ObjectBuilder<SearchRequest>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return search(fn.apply(new SearchRequest.Builder()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: search_shards
+
+    /**
+     * Returns information about the indices and shards that a search request would
+     * be executed against.
+     *
+     *
+     */
+
+    public SearchShardsResponse searchShards(SearchShardsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SearchShardsRequest, SearchShardsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            SearchShardsRequest,
+            SearchShardsResponse,
+            ErrorResponse>) SearchShardsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about the indices and shards that a search request would
+     * be executed against.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SearchShardsRequest}
+     *
+     */
+
+    public final SearchShardsResponse searchShards(Function<SearchShardsRequest.Builder, ObjectBuilder<SearchShardsRequest>> fn)
+        throws IOException, OpenSearchException {
+        return searchShards(fn.apply(new SearchShardsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about the indices and shards that a search request would
+     * be executed against.
+     *
+     *
+     */
+
+    public SearchShardsResponse searchShards() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new SearchShardsRequest.Builder().build(),
+            SearchShardsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: search_template
+
+    /**
+     * Allows to use the Mustache language to pre-render a search definition.
+     *
+     *
+     */
+
+    public <TDocument> SearchTemplateResponse<TDocument> searchTemplate(SearchTemplateRequest request, Class<TDocument> tDocumentClass)
+        throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SearchTemplateRequest, SearchTemplateResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            SearchTemplateRequest,
+            SearchTemplateResponse<TDocument>,
+            ErrorResponse>) SearchTemplateRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.search_template.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to use the Mustache language to pre-render a search definition.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SearchTemplateRequest}
+     *
+     */
+
+    public final <TDocument> SearchTemplateResponse<TDocument> searchTemplate(
+        Function<SearchTemplateRequest.Builder, ObjectBuilder<SearchTemplateRequest>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return searchTemplate(fn.apply(new SearchTemplateRequest.Builder()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: terms_enum
+
+    /**
+     * The terms enum API can be used to discover terms in the index that begin with
+     * the provided string. It is designed for low-latency look-ups used in
+     * auto-complete scenarios.
+     *
+     *
+     */
+
+    public TermsEnumResponse termsEnum(TermsEnumRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<TermsEnumRequest, TermsEnumResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            TermsEnumRequest,
+            TermsEnumResponse,
+            ErrorResponse>) TermsEnumRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * The terms enum API can be used to discover terms in the index that begin with
+     * the provided string. It is designed for low-latency look-ups used in
+     * auto-complete scenarios.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link TermsEnumRequest}
+     *
+     */
+
+    public final TermsEnumResponse termsEnum(Function<TermsEnumRequest.Builder, ObjectBuilder<TermsEnumRequest>> fn) throws IOException,
+        OpenSearchException {
+        return termsEnum(fn.apply(new TermsEnumRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: termvectors
+
+    /**
+     * Returns information and statistics about terms in the fields of a particular
+     * document.
+     *
+     *
+     */
+
+    public <TDocument> TermvectorsResponse termvectors(TermvectorsRequest<TDocument> request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<TermvectorsRequest<?>, TermvectorsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            TermvectorsRequest<?>,
+            TermvectorsResponse,
+            ErrorResponse>) TermvectorsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information and statistics about terms in the fields of a particular
+     * document.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link TermvectorsRequest}
+     *
+     */
+
+    public final <TDocument> TermvectorsResponse termvectors(
+        Function<TermvectorsRequest.Builder<TDocument>, ObjectBuilder<TermvectorsRequest<TDocument>>> fn
+    ) throws IOException, OpenSearchException {
+        return termvectors(fn.apply(new TermvectorsRequest.Builder<TDocument>()).build());
+    }
+
+    // ----- Endpoint: update
+
+    /**
+     * Updates a document with a script or partial document.
+     *
+     *
+     */
+
+    public <TDocument, TPartialDocument> UpdateResponse<TDocument> update(
+        UpdateRequest<TDocument, TPartialDocument> request,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<UpdateRequest<?, ?>, UpdateResponse<TDocument>, ErrorResponse> endpoint = (JsonEndpoint<
+            UpdateRequest<?, ?>,
+            UpdateResponse<TDocument>,
+            ErrorResponse>) UpdateRequest._ENDPOINT;
+        endpoint = new EndpointWithResponseMapperAttr<>(
+            endpoint,
+            "org.opensearch.client:Deserializer:_global.update.TDocument",
+            getDeserializer(tDocumentClass)
+        );
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Updates a document with a script or partial document.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link UpdateRequest}
+     *
+     */
+
+    public final <TDocument, TPartialDocument> UpdateResponse<TDocument> update(
+
+        Function<UpdateRequest.Builder<TDocument, TPartialDocument>, ObjectBuilder<UpdateRequest<TDocument, TPartialDocument>>> fn,
+        Class<TDocument> tDocumentClass
+    ) throws IOException, OpenSearchException {
+        return update(fn.apply(new UpdateRequest.Builder<TDocument, TPartialDocument>()).build(), tDocumentClass);
+    }
+
+    // ----- Endpoint: update_by_query
+
+    /**
+     * Performs an update on every document in the index without changing the
+     * source, for example to pick up a mapping change.
+     *
+     *
+     */
+
+    public UpdateByQueryResponse updateByQuery(UpdateByQueryRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<UpdateByQueryRequest, UpdateByQueryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            UpdateByQueryRequest,
+            UpdateByQueryResponse,
+            ErrorResponse>) UpdateByQueryRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Performs an update on every document in the index without changing the
+     * source, for example to pick up a mapping change.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link UpdateByQueryRequest}
+     *
+     */
+
+    public final UpdateByQueryResponse updateByQuery(Function<UpdateByQueryRequest.Builder, ObjectBuilder<UpdateByQueryRequest>> fn)
+        throws IOException, OpenSearchException {
+        return updateByQuery(fn.apply(new UpdateByQueryRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: update_by_query_rethrottle
+
+    /**
+     * Changes the number of requests per second for a particular Update By Query
+     * operation.
+     *
+     *
+     */
+
+    public UpdateByQueryRethrottleResponse updateByQueryRethrottle(UpdateByQueryRethrottleRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<UpdateByQueryRethrottleRequest, UpdateByQueryRethrottleResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            UpdateByQueryRethrottleRequest,
+            UpdateByQueryRethrottleResponse,
+            ErrorResponse>) UpdateByQueryRethrottleRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Changes the number of requests per second for a particular Update By Query
+     * operation.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link UpdateByQueryRethrottleRequest}
+     *
+     */
+
+    public final UpdateByQueryRethrottleResponse updateByQueryRethrottle(
+        Function<UpdateByQueryRethrottleRequest.Builder, ObjectBuilder<UpdateByQueryRethrottleRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return updateByQueryRethrottle(fn.apply(new UpdateByQueryRethrottleRequest.Builder()).build());
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/AcknowledgedResponseBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/AcknowledgedResponseBase.java
index 548be19f3d..96afe7515c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/AcknowledgedResponseBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/AcknowledgedResponseBase.java
@@ -32,80 +32,78 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
 
 // typedef: _types.AcknowledgedResponseBase
 
-
 public abstract class AcknowledgedResponseBase implements JsonpSerializable {
-	private final boolean acknowledged;
+    private final boolean acknowledged;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected AcknowledgedResponseBase(AbstractBuilder<?> builder) {
+    protected AcknowledgedResponseBase(AbstractBuilder<?> builder) {
 
-		this.acknowledged = ApiTypeHelper.requireNonNull(builder.acknowledged, this, "acknowledged");
+        this.acknowledged = ApiTypeHelper.requireNonNull(builder.acknowledged, this, "acknowledged");
 
-	}
+    }
 
-	/**
-	 * Required - For a successful response, this value is always true. On failure,
-	 * an exception is returned instead.
-	 * <p>
-	 * API name: {@code acknowledged}
-	 */
-	public final boolean acknowledged() {
-		return this.acknowledged;
-	}
+    /**
+     * Required - For a successful response, this value is always true. On failure,
+     * an exception is returned instead.
+     * <p>
+     * API name: {@code acknowledged}
+     */
+    public final boolean acknowledged() {
+        return this.acknowledged;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("acknowledged");
-		generator.write(this.acknowledged);
+        generator.writeKey("acknowledged");
+        generator.write(this.acknowledged);
 
-	}
+    }
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		private Boolean acknowledged;
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        private Boolean acknowledged;
 
-		/**
-		 * Required - For a successful response, this value is always true. On failure,
-		 * an exception is returned instead.
-		 * <p>
-		 * API name: {@code acknowledged}
-		 */
-		public final BuilderT acknowledged(boolean value) {
-			this.acknowledged = value;
-			return self();
-		}
+        /**
+         * Required - For a successful response, this value is always true. On failure,
+         * an exception is returned instead.
+         * <p>
+         * API name: {@code acknowledged}
+         */
+        public final BuilderT acknowledged(boolean value) {
+            this.acknowledged = value;
+            return self();
+        }
 
-		protected abstract BuilderT self();
+        protected abstract BuilderT self();
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupAcknowledgedResponseBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupAcknowledgedResponseBaseDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
 
-		op.add(AbstractBuilder::acknowledged, JsonpDeserializer.booleanDeserializer(), "acknowledged");
+        op.add(AbstractBuilder::acknowledged, JsonpDeserializer.booleanDeserializer(), "acknowledged");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/BaseNode.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/BaseNode.java
index 3fee84a10f..abd2b4204e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/BaseNode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/BaseNode.java
@@ -32,242 +32,237 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Nullable;
 
 // typedef: _spec_utils.BaseNode
 
-
 public abstract class BaseNode implements JsonpSerializable {
-	private final Map<String, String> attributes;
-
-	private final String host;
-
-	private final String ip;
-
-	private final String name;
-
-	private final List<NodeRole> roles;
-
-	private final String transportAddress;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected BaseNode(AbstractBuilder<?> builder) {
-
-		this.attributes = ApiTypeHelper.unmodifiable(builder.attributes);
-		this.host = builder.host;
-		this.ip = builder.ip;
-		this.name = builder.name;
-		this.roles = ApiTypeHelper.unmodifiable(builder.roles);
-		this.transportAddress = builder.transportAddress;
-
-	}
-
-	/**
-	 * API name: {@code attributes}
-	 */
-	public final Map<String, String> attributes() {
-		return this.attributes;
-	}
-
-	/**
-	 * API name: {@code host}
-	 */
-	public final String host() {
-		return this.host;
-	}
-
-	/**
-	 * API name: {@code ip}
-	 */
-	public final String ip() {
-		return this.ip;
-	}
-
-	/**
-	 * API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * API name: {@code roles}
-	 */
-	public final List<NodeRole> roles() {
-		return this.roles;
-	}
-
-	/**
-	 * API name: {@code transport_address}
-	 */
-	public final String transportAddress() {
-		return this.transportAddress;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.attributes)) {
-			generator.writeKey("attributes");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.attributes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("host");
-		generator.write(this.host);
-
-		generator.writeKey("ip");
-		generator.write(this.ip);
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		if (ApiTypeHelper.isDefined(this.roles)) {
-			generator.writeKey("roles");
-			generator.writeStartArray();
-			for (NodeRole item0 : this.roles) {
-				item0.serialize(generator, mapper);
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("transport_address");
-		generator.write(this.transportAddress);
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		@Nullable			
-		private Map<String, String> attributes;
-
-		@Nullable
-		private String host;
-
-		@Nullable
-		private String ip;
-
-		@Nullable
-		private String name;
-
-		@Nullable
-		private List<NodeRole> roles;
-
-		@Nullable
-		private String transportAddress;
-
-		/**
-		 * API name: {@code attributes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>attributes</code>.
-		 */
-		public final BuilderT attributes(Map<String, String> map) {
-			this.attributes = _mapPutAll(this.attributes, map);
-			return self();
-		}
-
-		/**
-		 * API name: {@code attributes}
-		 * <p>
-		 * Adds an entry to <code>attributes</code>.
-		 */
-		public final BuilderT attributes(String key, String value) {
-			this.attributes = _mapPut(this.attributes, key, value);
-			return self();
-		}
-
-		/**
-		 * API name: {@code host}
-		 */
-		public final BuilderT host(String value) {
-			this.host = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code ip}
-		 */
-		public final BuilderT ip(String value) {
-			this.ip = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code name}
-		 */
-		public final BuilderT name(String value) {
-			this.name = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code roles}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>roles</code>.
-		 */
-		public final BuilderT roles(List<NodeRole> list) {
-			this.roles = _listAddAll(this.roles, list);
-			return self();
-		}
-
-		/**
-		 * API name: {@code roles}
-		 * <p>
-		 * Adds one or more values to <code>roles</code>.
-		 */
-		public final BuilderT roles(NodeRole value, NodeRole... values) {
-			this.roles = _listAdd(this.roles, value, values);
-			return self();
-		}
-
-		/**
-		 * API name: {@code transport_address}
-		 */
-		public final BuilderT transportAddress(String value) {
-			this.transportAddress = value;
-			return self();
-		}
-
-		protected abstract BuilderT self();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupBaseNodeDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-
-		op.add(AbstractBuilder::attributes,
-				JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "attributes");
-		op.add(AbstractBuilder::host, JsonpDeserializer.stringDeserializer(), "host");
-		op.add(AbstractBuilder::ip, JsonpDeserializer.stringDeserializer(), "ip");
-		op.add(AbstractBuilder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(AbstractBuilder::roles, JsonpDeserializer.arrayDeserializer(NodeRole._DESERIALIZER), "roles");
-		op.add(AbstractBuilder::transportAddress, JsonpDeserializer.stringDeserializer(), "transport_address");
-
-	}
+    private final Map<String, String> attributes;
+
+    private final String host;
+
+    private final String ip;
+
+    private final String name;
+
+    private final List<NodeRole> roles;
+
+    private final String transportAddress;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected BaseNode(AbstractBuilder<?> builder) {
+
+        this.attributes = ApiTypeHelper.unmodifiable(builder.attributes);
+        this.host = builder.host;
+        this.ip = builder.ip;
+        this.name = builder.name;
+        this.roles = ApiTypeHelper.unmodifiable(builder.roles);
+        this.transportAddress = builder.transportAddress;
+
+    }
+
+    /**
+     * API name: {@code attributes}
+     */
+    public final Map<String, String> attributes() {
+        return this.attributes;
+    }
+
+    /**
+     * API name: {@code host}
+     */
+    public final String host() {
+        return this.host;
+    }
+
+    /**
+     * API name: {@code ip}
+     */
+    public final String ip() {
+        return this.ip;
+    }
+
+    /**
+     * API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * API name: {@code roles}
+     */
+    public final List<NodeRole> roles() {
+        return this.roles;
+    }
+
+    /**
+     * API name: {@code transport_address}
+     */
+    public final String transportAddress() {
+        return this.transportAddress;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.attributes)) {
+            generator.writeKey("attributes");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.attributes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("host");
+        generator.write(this.host);
+
+        generator.writeKey("ip");
+        generator.write(this.ip);
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        if (ApiTypeHelper.isDefined(this.roles)) {
+            generator.writeKey("roles");
+            generator.writeStartArray();
+            for (NodeRole item0 : this.roles) {
+                item0.serialize(generator, mapper);
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("transport_address");
+        generator.write(this.transportAddress);
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        @Nullable
+        private Map<String, String> attributes;
+
+        @Nullable
+        private String host;
+
+        @Nullable
+        private String ip;
+
+        @Nullable
+        private String name;
+
+        @Nullable
+        private List<NodeRole> roles;
+
+        @Nullable
+        private String transportAddress;
+
+        /**
+         * API name: {@code attributes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>attributes</code>.
+         */
+        public final BuilderT attributes(Map<String, String> map) {
+            this.attributes = _mapPutAll(this.attributes, map);
+            return self();
+        }
+
+        /**
+         * API name: {@code attributes}
+         * <p>
+         * Adds an entry to <code>attributes</code>.
+         */
+        public final BuilderT attributes(String key, String value) {
+            this.attributes = _mapPut(this.attributes, key, value);
+            return self();
+        }
+
+        /**
+         * API name: {@code host}
+         */
+        public final BuilderT host(String value) {
+            this.host = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code ip}
+         */
+        public final BuilderT ip(String value) {
+            this.ip = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code name}
+         */
+        public final BuilderT name(String value) {
+            this.name = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code roles}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>roles</code>.
+         */
+        public final BuilderT roles(List<NodeRole> list) {
+            this.roles = _listAddAll(this.roles, list);
+            return self();
+        }
+
+        /**
+         * API name: {@code roles}
+         * <p>
+         * Adds one or more values to <code>roles</code>.
+         */
+        public final BuilderT roles(NodeRole value, NodeRole... values) {
+            this.roles = _listAdd(this.roles, value, values);
+            return self();
+        }
+
+        /**
+         * API name: {@code transport_address}
+         */
+        public final BuilderT transportAddress(String value) {
+            this.transportAddress = value;
+            return self();
+        }
+
+        protected abstract BuilderT self();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupBaseNodeDeserializer(ObjectDeserializer<BuilderT> op) {
+
+        op.add(AbstractBuilder::attributes, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "attributes");
+        op.add(AbstractBuilder::host, JsonpDeserializer.stringDeserializer(), "host");
+        op.add(AbstractBuilder::ip, JsonpDeserializer.stringDeserializer(), "ip");
+        op.add(AbstractBuilder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(AbstractBuilder::roles, JsonpDeserializer.arrayDeserializer(NodeRole._DESERIALIZER), "roles");
+        op.add(AbstractBuilder::transportAddress, JsonpDeserializer.stringDeserializer(), "transport_address");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/BulkIndexByScrollFailure.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/BulkIndexByScrollFailure.java
index 183b486e8c..4718d336ab 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/BulkIndexByScrollFailure.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/BulkIndexByScrollFailure.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,196 +43,195 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.BulkIndexByScrollFailure
 
 @JsonpDeserializable
 public class BulkIndexByScrollFailure implements JsonpSerializable {
-	private final ErrorCause cause;
+    private final ErrorCause cause;
 
-	private final String id;
+    private final String id;
 
-	private final String index;
+    private final String index;
 
-	private final int status;
+    private final int status;
 
-	private final String type;
+    private final String type;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private BulkIndexByScrollFailure(Builder builder) {
+    private BulkIndexByScrollFailure(Builder builder) {
 
-		this.cause = ApiTypeHelper.requireNonNull(builder.cause, this, "cause");
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.cause = ApiTypeHelper.requireNonNull(builder.cause, this, "cause");
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
 
-	}
+    }
 
-	public static BulkIndexByScrollFailure of(Function<Builder, ObjectBuilder<BulkIndexByScrollFailure>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static BulkIndexByScrollFailure of(Function<Builder, ObjectBuilder<BulkIndexByScrollFailure>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code cause}
-	 */
-	public final ErrorCause cause() {
-		return this.cause;
-	}
+    /**
+     * Required - API name: {@code cause}
+     */
+    public final ErrorCause cause() {
+        return this.cause;
+    }
 
-	/**
-	 * Required - API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Required - API name: {@code status}
-	 */
-	public final int status() {
-		return this.status;
-	}
-
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("cause");
-		this.cause.serialize(generator, mapper);
-
-		generator.writeKey("id");
-		generator.write(this.id);
-
-		generator.writeKey("index");
-		generator.write(this.index);
-
-		generator.writeKey("status");
-		generator.write(this.status);
-
-		generator.writeKey("type");
-		generator.write(this.type);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link BulkIndexByScrollFailure}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<BulkIndexByScrollFailure> {
-		private ErrorCause cause;
-
-		private String id;
-
-		private String index;
-
-		private Integer status;
-
-		private String type;
-
-		/**
-		 * Required - API name: {@code cause}
-		 */
-		public final Builder cause(ErrorCause value) {
-			this.cause = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code cause}
-		 */
-		public final Builder cause(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
-			return this.cause(fn.apply(new ErrorCause.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code status}
-		 */
-		public final Builder status(int value) {
-			this.status = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link BulkIndexByScrollFailure}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public BulkIndexByScrollFailure build() {
-			_checkSingleUse();
-
-			return new BulkIndexByScrollFailure(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link BulkIndexByScrollFailure}
-	 */
-	public static final JsonpDeserializer<BulkIndexByScrollFailure> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, BulkIndexByScrollFailure::setupBulkIndexByScrollFailureDeserializer);
-
-	protected static void setupBulkIndexByScrollFailureDeserializer(
-			ObjectDeserializer<BulkIndexByScrollFailure.Builder> op) {
-
-		op.add(Builder::cause, ErrorCause._DESERIALIZER, "cause");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::status, JsonpDeserializer.integerDeserializer(), "status");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-
-	}
+    /**
+     * Required - API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Required - API name: {@code status}
+     */
+    public final int status() {
+        return this.status;
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("cause");
+        this.cause.serialize(generator, mapper);
+
+        generator.writeKey("id");
+        generator.write(this.id);
+
+        generator.writeKey("index");
+        generator.write(this.index);
+
+        generator.writeKey("status");
+        generator.write(this.status);
+
+        generator.writeKey("type");
+        generator.write(this.type);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link BulkIndexByScrollFailure}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<BulkIndexByScrollFailure> {
+        private ErrorCause cause;
+
+        private String id;
+
+        private String index;
+
+        private Integer status;
+
+        private String type;
+
+        /**
+         * Required - API name: {@code cause}
+         */
+        public final Builder cause(ErrorCause value) {
+            this.cause = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code cause}
+         */
+        public final Builder cause(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
+            return this.cause(fn.apply(new ErrorCause.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code status}
+         */
+        public final Builder status(int value) {
+            this.status = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link BulkIndexByScrollFailure}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public BulkIndexByScrollFailure build() {
+            _checkSingleUse();
+
+            return new BulkIndexByScrollFailure(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link BulkIndexByScrollFailure}
+     */
+    public static final JsonpDeserializer<BulkIndexByScrollFailure> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        BulkIndexByScrollFailure::setupBulkIndexByScrollFailureDeserializer
+    );
+
+    protected static void setupBulkIndexByScrollFailureDeserializer(ObjectDeserializer<BulkIndexByScrollFailure.Builder> op) {
+
+        op.add(Builder::cause, ErrorCause._DESERIALIZER, "cause");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::status, JsonpDeserializer.integerDeserializer(), "status");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/BulkStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/BulkStats.java
index 6cf3fb2dd0..ab174f1dcf 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/BulkStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/BulkStats.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,306 +44,304 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.BulkStats
 
 @JsonpDeserializable
 public class BulkStats implements JsonpSerializable {
-	private final long totalOperations;
-
-	@Nullable
-	private final String totalTime;
-
-	private final long totalTimeInMillis;
-
-	@Nullable
-	private final String totalSize;
-
-	private final long totalSizeInBytes;
-
-	@Nullable
-	private final String avgTime;
-
-	private final long avgTimeInMillis;
-
-	@Nullable
-	private final String avgSize;
-
-	private final long avgSizeInBytes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private BulkStats(Builder builder) {
-
-		this.totalOperations = ApiTypeHelper.requireNonNull(builder.totalOperations, this, "totalOperations");
-		this.totalTime = builder.totalTime;
-		this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
-		this.totalSize = builder.totalSize;
-		this.totalSizeInBytes = ApiTypeHelper.requireNonNull(builder.totalSizeInBytes, this, "totalSizeInBytes");
-		this.avgTime = builder.avgTime;
-		this.avgTimeInMillis = ApiTypeHelper.requireNonNull(builder.avgTimeInMillis, this, "avgTimeInMillis");
-		this.avgSize = builder.avgSize;
-		this.avgSizeInBytes = ApiTypeHelper.requireNonNull(builder.avgSizeInBytes, this, "avgSizeInBytes");
-
-	}
-
-	public static BulkStats of(Function<Builder, ObjectBuilder<BulkStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code total_operations}
-	 */
-	public final long totalOperations() {
-		return this.totalOperations;
-	}
-
-	/**
-	 * API name: {@code total_time}
-	 */
-	@Nullable
-	public final String totalTime() {
-		return this.totalTime;
-	}
-
-	/**
-	 * Required - API name: {@code total_time_in_millis}
-	 */
-	public final long totalTimeInMillis() {
-		return this.totalTimeInMillis;
-	}
-
-	/**
-	 * API name: {@code total_size}
-	 */
-	@Nullable
-	public final String totalSize() {
-		return this.totalSize;
-	}
-
-	/**
-	 * Required - API name: {@code total_size_in_bytes}
-	 */
-	public final long totalSizeInBytes() {
-		return this.totalSizeInBytes;
-	}
-
-	/**
-	 * API name: {@code avg_time}
-	 */
-	@Nullable
-	public final String avgTime() {
-		return this.avgTime;
-	}
+    private final long totalOperations;
+
+    @Nullable
+    private final String totalTime;
+
+    private final long totalTimeInMillis;
+
+    @Nullable
+    private final String totalSize;
+
+    private final long totalSizeInBytes;
+
+    @Nullable
+    private final String avgTime;
+
+    private final long avgTimeInMillis;
+
+    @Nullable
+    private final String avgSize;
+
+    private final long avgSizeInBytes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private BulkStats(Builder builder) {
+
+        this.totalOperations = ApiTypeHelper.requireNonNull(builder.totalOperations, this, "totalOperations");
+        this.totalTime = builder.totalTime;
+        this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
+        this.totalSize = builder.totalSize;
+        this.totalSizeInBytes = ApiTypeHelper.requireNonNull(builder.totalSizeInBytes, this, "totalSizeInBytes");
+        this.avgTime = builder.avgTime;
+        this.avgTimeInMillis = ApiTypeHelper.requireNonNull(builder.avgTimeInMillis, this, "avgTimeInMillis");
+        this.avgSize = builder.avgSize;
+        this.avgSizeInBytes = ApiTypeHelper.requireNonNull(builder.avgSizeInBytes, this, "avgSizeInBytes");
+
+    }
+
+    public static BulkStats of(Function<Builder, ObjectBuilder<BulkStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code total_operations}
+     */
+    public final long totalOperations() {
+        return this.totalOperations;
+    }
+
+    /**
+     * API name: {@code total_time}
+     */
+    @Nullable
+    public final String totalTime() {
+        return this.totalTime;
+    }
+
+    /**
+     * Required - API name: {@code total_time_in_millis}
+     */
+    public final long totalTimeInMillis() {
+        return this.totalTimeInMillis;
+    }
+
+    /**
+     * API name: {@code total_size}
+     */
+    @Nullable
+    public final String totalSize() {
+        return this.totalSize;
+    }
+
+    /**
+     * Required - API name: {@code total_size_in_bytes}
+     */
+    public final long totalSizeInBytes() {
+        return this.totalSizeInBytes;
+    }
+
+    /**
+     * API name: {@code avg_time}
+     */
+    @Nullable
+    public final String avgTime() {
+        return this.avgTime;
+    }
 
-	/**
-	 * Required - API name: {@code avg_time_in_millis}
-	 */
-	public final long avgTimeInMillis() {
-		return this.avgTimeInMillis;
-	}
-
-	/**
-	 * API name: {@code avg_size}
-	 */
-	@Nullable
-	public final String avgSize() {
-		return this.avgSize;
-	}
-
-	/**
-	 * Required - API name: {@code avg_size_in_bytes}
-	 */
-	public final long avgSizeInBytes() {
-		return this.avgSizeInBytes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("total_operations");
-		generator.write(this.totalOperations);
-
-		if (this.totalTime != null) {
-			generator.writeKey("total_time");
-			generator.write(this.totalTime);
-
-		}
-		generator.writeKey("total_time_in_millis");
-		generator.write(this.totalTimeInMillis);
-
-		if (this.totalSize != null) {
-			generator.writeKey("total_size");
-			generator.write(this.totalSize);
-
-		}
-		generator.writeKey("total_size_in_bytes");
-		generator.write(this.totalSizeInBytes);
-
-		if (this.avgTime != null) {
-			generator.writeKey("avg_time");
-			generator.write(this.avgTime);
-
-		}
-		generator.writeKey("avg_time_in_millis");
-		generator.write(this.avgTimeInMillis);
-
-		if (this.avgSize != null) {
-			generator.writeKey("avg_size");
-			generator.write(this.avgSize);
-
-		}
-		generator.writeKey("avg_size_in_bytes");
-		generator.write(this.avgSizeInBytes);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link BulkStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<BulkStats> {
-		private Long totalOperations;
-
-		@Nullable
-		private String totalTime;
-
-		private Long totalTimeInMillis;
-
-		@Nullable
-		private String totalSize;
-
-		private Long totalSizeInBytes;
-
-		@Nullable
-		private String avgTime;
-
-		private Long avgTimeInMillis;
-
-		@Nullable
-		private String avgSize;
-
-		private Long avgSizeInBytes;
-
-		/**
-		 * Required - API name: {@code total_operations}
-		 */
-		public final Builder totalOperations(long value) {
-			this.totalOperations = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total_time}
-		 */
-		public final Builder totalTime(@Nullable String value) {
-			this.totalTime = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_time_in_millis}
-		 */
-		public final Builder totalTimeInMillis(long value) {
-			this.totalTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total_size}
-		 */
-		public final Builder totalSize(@Nullable String value) {
-			this.totalSize = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_size_in_bytes}
-		 */
-		public final Builder totalSizeInBytes(long value) {
-			this.totalSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code avg_time}
-		 */
-		public final Builder avgTime(@Nullable String value) {
-			this.avgTime = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code avg_time_in_millis}
-		 */
-		public final Builder avgTimeInMillis(long value) {
-			this.avgTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code avg_size}
-		 */
-		public final Builder avgSize(@Nullable String value) {
-			this.avgSize = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code avg_size_in_bytes}
-		 */
-		public final Builder avgSizeInBytes(long value) {
-			this.avgSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link BulkStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public BulkStats build() {
-			_checkSingleUse();
-
-			return new BulkStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link BulkStats}
-	 */
-	public static final JsonpDeserializer<BulkStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			BulkStats::setupBulkStatsDeserializer);
-
-	protected static void setupBulkStatsDeserializer(ObjectDeserializer<BulkStats.Builder> op) {
-
-		op.add(Builder::totalOperations, JsonpDeserializer.longDeserializer(), "total_operations");
-		op.add(Builder::totalTime, JsonpDeserializer.stringDeserializer(), "total_time");
-		op.add(Builder::totalTimeInMillis, JsonpDeserializer.longDeserializer(), "total_time_in_millis");
-		op.add(Builder::totalSize, JsonpDeserializer.stringDeserializer(), "total_size");
-		op.add(Builder::totalSizeInBytes, JsonpDeserializer.longDeserializer(), "total_size_in_bytes");
-		op.add(Builder::avgTime, JsonpDeserializer.stringDeserializer(), "avg_time");
-		op.add(Builder::avgTimeInMillis, JsonpDeserializer.longDeserializer(), "avg_time_in_millis");
-		op.add(Builder::avgSize, JsonpDeserializer.stringDeserializer(), "avg_size");
-		op.add(Builder::avgSizeInBytes, JsonpDeserializer.longDeserializer(), "avg_size_in_bytes");
-
-	}
+    /**
+     * Required - API name: {@code avg_time_in_millis}
+     */
+    public final long avgTimeInMillis() {
+        return this.avgTimeInMillis;
+    }
+
+    /**
+     * API name: {@code avg_size}
+     */
+    @Nullable
+    public final String avgSize() {
+        return this.avgSize;
+    }
+
+    /**
+     * Required - API name: {@code avg_size_in_bytes}
+     */
+    public final long avgSizeInBytes() {
+        return this.avgSizeInBytes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("total_operations");
+        generator.write(this.totalOperations);
+
+        if (this.totalTime != null) {
+            generator.writeKey("total_time");
+            generator.write(this.totalTime);
+
+        }
+        generator.writeKey("total_time_in_millis");
+        generator.write(this.totalTimeInMillis);
+
+        if (this.totalSize != null) {
+            generator.writeKey("total_size");
+            generator.write(this.totalSize);
+
+        }
+        generator.writeKey("total_size_in_bytes");
+        generator.write(this.totalSizeInBytes);
+
+        if (this.avgTime != null) {
+            generator.writeKey("avg_time");
+            generator.write(this.avgTime);
+
+        }
+        generator.writeKey("avg_time_in_millis");
+        generator.write(this.avgTimeInMillis);
+
+        if (this.avgSize != null) {
+            generator.writeKey("avg_size");
+            generator.write(this.avgSize);
+
+        }
+        generator.writeKey("avg_size_in_bytes");
+        generator.write(this.avgSizeInBytes);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link BulkStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<BulkStats> {
+        private Long totalOperations;
+
+        @Nullable
+        private String totalTime;
+
+        private Long totalTimeInMillis;
+
+        @Nullable
+        private String totalSize;
+
+        private Long totalSizeInBytes;
+
+        @Nullable
+        private String avgTime;
+
+        private Long avgTimeInMillis;
+
+        @Nullable
+        private String avgSize;
+
+        private Long avgSizeInBytes;
+
+        /**
+         * Required - API name: {@code total_operations}
+         */
+        public final Builder totalOperations(long value) {
+            this.totalOperations = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total_time}
+         */
+        public final Builder totalTime(@Nullable String value) {
+            this.totalTime = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_time_in_millis}
+         */
+        public final Builder totalTimeInMillis(long value) {
+            this.totalTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total_size}
+         */
+        public final Builder totalSize(@Nullable String value) {
+            this.totalSize = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_size_in_bytes}
+         */
+        public final Builder totalSizeInBytes(long value) {
+            this.totalSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code avg_time}
+         */
+        public final Builder avgTime(@Nullable String value) {
+            this.avgTime = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code avg_time_in_millis}
+         */
+        public final Builder avgTimeInMillis(long value) {
+            this.avgTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code avg_size}
+         */
+        public final Builder avgSize(@Nullable String value) {
+            this.avgSize = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code avg_size_in_bytes}
+         */
+        public final Builder avgSizeInBytes(long value) {
+            this.avgSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link BulkStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public BulkStats build() {
+            _checkSingleUse();
+
+            return new BulkStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link BulkStats}
+     */
+    public static final JsonpDeserializer<BulkStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        BulkStats::setupBulkStatsDeserializer
+    );
+
+    protected static void setupBulkStatsDeserializer(ObjectDeserializer<BulkStats.Builder> op) {
+
+        op.add(Builder::totalOperations, JsonpDeserializer.longDeserializer(), "total_operations");
+        op.add(Builder::totalTime, JsonpDeserializer.stringDeserializer(), "total_time");
+        op.add(Builder::totalTimeInMillis, JsonpDeserializer.longDeserializer(), "total_time_in_millis");
+        op.add(Builder::totalSize, JsonpDeserializer.stringDeserializer(), "total_size");
+        op.add(Builder::totalSizeInBytes, JsonpDeserializer.longDeserializer(), "total_size_in_bytes");
+        op.add(Builder::avgTime, JsonpDeserializer.stringDeserializer(), "avg_time");
+        op.add(Builder::avgTimeInMillis, JsonpDeserializer.longDeserializer(), "avg_time_in_millis");
+        op.add(Builder::avgSize, JsonpDeserializer.stringDeserializer(), "avg_size");
+        op.add(Builder::avgSizeInBytes, JsonpDeserializer.longDeserializer(), "avg_size_in_bytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Bytes.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/Bytes.java
index 5f3cf670f8..0d6077e653 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Bytes.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/Bytes.java
@@ -37,29 +37,29 @@
 
 @JsonpDeserializable
 public enum Bytes implements JsonEnum {
-	Bytes("b"),
+    Bytes("b"),
 
-	KiloBytes("kb"),
+    KiloBytes("kb"),
 
-	MegaBytes("mb"),
+    MegaBytes("mb"),
 
-	GigaBytes("gb"),
+    GigaBytes("gb"),
 
-	TeraBytes("tb"),
+    TeraBytes("tb"),
 
-	PetaBytes("pb"),
+    PetaBytes("pb"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	Bytes(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    Bytes(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<Bytes> _DESERIALIZER = new JsonEnum.Deserializer<>(Bytes.values());
+    public static final JsonEnum.Deserializer<Bytes> _DESERIALIZER = new JsonEnum.Deserializer<>(Bytes.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ClusterStatistics.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ClusterStatistics.java
index 1c3bd5fa9a..025ebbe097 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ClusterStatistics.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ClusterStatistics.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,140 +43,140 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.ClusterStatistics
 
 @JsonpDeserializable
 public class ClusterStatistics implements JsonpSerializable {
-	private final int skipped;
-
-	private final int successful;
-
-	private final int total;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterStatistics(Builder builder) {
-
-		this.skipped = ApiTypeHelper.requireNonNull(builder.skipped, this, "skipped");
-		this.successful = ApiTypeHelper.requireNonNull(builder.successful, this, "successful");
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
-
-	}
-
-	public static ClusterStatistics of(Function<Builder, ObjectBuilder<ClusterStatistics>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code skipped}
-	 */
-	public final int skipped() {
-		return this.skipped;
-	}
+    private final int skipped;
 
-	/**
-	 * Required - API name: {@code successful}
-	 */
-	public final int successful() {
-		return this.successful;
-	}
-
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final int total() {
-		return this.total;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("skipped");
-		generator.write(this.skipped);
-
-		generator.writeKey("successful");
-		generator.write(this.successful);
-
-		generator.writeKey("total");
-		generator.write(this.total);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterStatistics}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterStatistics> {
-		private Integer skipped;
-
-		private Integer successful;
-
-		private Integer total;
-
-		/**
-		 * Required - API name: {@code skipped}
-		 */
-		public final Builder skipped(int value) {
-			this.skipped = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code successful}
-		 */
-		public final Builder successful(int value) {
-			this.successful = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(int value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ClusterStatistics}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterStatistics build() {
-			_checkSingleUse();
-
-			return new ClusterStatistics(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterStatistics}
-	 */
-	public static final JsonpDeserializer<ClusterStatistics> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClusterStatistics::setupClusterStatisticsDeserializer);
-
-	protected static void setupClusterStatisticsDeserializer(ObjectDeserializer<ClusterStatistics.Builder> op) {
-
-		op.add(Builder::skipped, JsonpDeserializer.integerDeserializer(), "skipped");
-		op.add(Builder::successful, JsonpDeserializer.integerDeserializer(), "successful");
-		op.add(Builder::total, JsonpDeserializer.integerDeserializer(), "total");
-
-	}
+    private final int successful;
+
+    private final int total;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterStatistics(Builder builder) {
+
+        this.skipped = ApiTypeHelper.requireNonNull(builder.skipped, this, "skipped");
+        this.successful = ApiTypeHelper.requireNonNull(builder.successful, this, "successful");
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+
+    }
+
+    public static ClusterStatistics of(Function<Builder, ObjectBuilder<ClusterStatistics>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code skipped}
+     */
+    public final int skipped() {
+        return this.skipped;
+    }
+
+    /**
+     * Required - API name: {@code successful}
+     */
+    public final int successful() {
+        return this.successful;
+    }
+
+    /**
+     * Required - API name: {@code total}
+     */
+    public final int total() {
+        return this.total;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("skipped");
+        generator.write(this.skipped);
+
+        generator.writeKey("successful");
+        generator.write(this.successful);
+
+        generator.writeKey("total");
+        generator.write(this.total);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterStatistics}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterStatistics> {
+        private Integer skipped;
+
+        private Integer successful;
+
+        private Integer total;
+
+        /**
+         * Required - API name: {@code skipped}
+         */
+        public final Builder skipped(int value) {
+            this.skipped = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code successful}
+         */
+        public final Builder successful(int value) {
+            this.successful = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(int value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ClusterStatistics}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterStatistics build() {
+            _checkSingleUse();
+
+            return new ClusterStatistics(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterStatistics}
+     */
+    public static final JsonpDeserializer<ClusterStatistics> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterStatistics::setupClusterStatisticsDeserializer
+    );
+
+    protected static void setupClusterStatisticsDeserializer(ObjectDeserializer<ClusterStatistics.Builder> op) {
+
+        op.add(Builder::skipped, JsonpDeserializer.integerDeserializer(), "skipped");
+        op.add(Builder::successful, JsonpDeserializer.integerDeserializer(), "successful");
+        op.add(Builder::total, JsonpDeserializer.integerDeserializer(), "total");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/CompletionStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/CompletionStats.java
index d375f28eab..85a4f4c1d3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/CompletionStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/CompletionStats.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,178 +45,176 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.CompletionStats
 
 @JsonpDeserializable
 public class CompletionStats implements JsonpSerializable {
-	private final long sizeInBytes;
+    private final long sizeInBytes;
 
-	@Nullable
-	private final String size;
-
-	private final Map<String, FieldSizeUsage> fields;
+    @Nullable
+    private final String size;
+
+    private final Map<String, FieldSizeUsage> fields;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private CompletionStats(Builder builder) {
-
-		this.sizeInBytes = ApiTypeHelper.requireNonNull(builder.sizeInBytes, this, "sizeInBytes");
-		this.size = builder.size;
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-
-	}
-
-	public static CompletionStats of(Function<Builder, ObjectBuilder<CompletionStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code size_in_bytes}
-	 */
-	public final long sizeInBytes() {
-		return this.sizeInBytes;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final String size() {
-		return this.size;
-	}
-
-	/**
-	 * API name: {@code fields}
-	 */
-	public final Map<String, FieldSizeUsage> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("size_in_bytes");
-		generator.write(this.sizeInBytes);
-
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartObject();
-			for (Map.Entry<String, FieldSizeUsage> item0 : this.fields.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CompletionStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CompletionStats> {
-		private Long sizeInBytes;
-
-		@Nullable
-		private String size;
-
-		@Nullable
-		private Map<String, FieldSizeUsage> fields;
-
-		/**
-		 * Required - API name: {@code size_in_bytes}
-		 */
-		public final Builder sizeInBytes(long value) {
-			this.sizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable String value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>fields</code>.
-		 */
-		public final Builder fields(Map<String, FieldSizeUsage> map) {
-			this.fields = _mapPutAll(this.fields, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds an entry to <code>fields</code>.
-		 */
-		public final Builder fields(String key, FieldSizeUsage value) {
-			this.fields = _mapPut(this.fields, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds an entry to <code>fields</code> using a builder lambda.
-		 */
-		public final Builder fields(String key, Function<FieldSizeUsage.Builder, ObjectBuilder<FieldSizeUsage>> fn) {
-			return fields(key, fn.apply(new FieldSizeUsage.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link CompletionStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CompletionStats build() {
-			_checkSingleUse();
-
-			return new CompletionStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CompletionStats}
-	 */
-	public static final JsonpDeserializer<CompletionStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CompletionStats::setupCompletionStatsDeserializer);
-
-	protected static void setupCompletionStatsDeserializer(ObjectDeserializer<CompletionStats.Builder> op) {
-
-		op.add(Builder::sizeInBytes, JsonpDeserializer.longDeserializer(), "size_in_bytes");
-		op.add(Builder::size, JsonpDeserializer.stringDeserializer(), "size");
-		op.add(Builder::fields, JsonpDeserializer.stringMapDeserializer(FieldSizeUsage._DESERIALIZER), "fields");
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private CompletionStats(Builder builder) {
+
+        this.sizeInBytes = ApiTypeHelper.requireNonNull(builder.sizeInBytes, this, "sizeInBytes");
+        this.size = builder.size;
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+
+    }
+
+    public static CompletionStats of(Function<Builder, ObjectBuilder<CompletionStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code size_in_bytes}
+     */
+    public final long sizeInBytes() {
+        return this.sizeInBytes;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final String size() {
+        return this.size;
+    }
+
+    /**
+     * API name: {@code fields}
+     */
+    public final Map<String, FieldSizeUsage> fields() {
+        return this.fields;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("size_in_bytes");
+        generator.write(this.sizeInBytes);
+
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartObject();
+            for (Map.Entry<String, FieldSizeUsage> item0 : this.fields.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CompletionStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CompletionStats> {
+        private Long sizeInBytes;
+
+        @Nullable
+        private String size;
+
+        @Nullable
+        private Map<String, FieldSizeUsage> fields;
+
+        /**
+         * Required - API name: {@code size_in_bytes}
+         */
+        public final Builder sizeInBytes(long value) {
+            this.sizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable String value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>fields</code>.
+         */
+        public final Builder fields(Map<String, FieldSizeUsage> map) {
+            this.fields = _mapPutAll(this.fields, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds an entry to <code>fields</code>.
+         */
+        public final Builder fields(String key, FieldSizeUsage value) {
+            this.fields = _mapPut(this.fields, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds an entry to <code>fields</code> using a builder lambda.
+         */
+        public final Builder fields(String key, Function<FieldSizeUsage.Builder, ObjectBuilder<FieldSizeUsage>> fn) {
+            return fields(key, fn.apply(new FieldSizeUsage.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link CompletionStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CompletionStats build() {
+            _checkSingleUse();
+
+            return new CompletionStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CompletionStats}
+     */
+    public static final JsonpDeserializer<CompletionStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CompletionStats::setupCompletionStatsDeserializer
+    );
+
+    protected static void setupCompletionStatsDeserializer(ObjectDeserializer<CompletionStats.Builder> op) {
+
+        op.add(Builder::sizeInBytes, JsonpDeserializer.longDeserializer(), "size_in_bytes");
+        op.add(Builder::size, JsonpDeserializer.stringDeserializer(), "size");
+        op.add(Builder::fields, JsonpDeserializer.stringMapDeserializer(FieldSizeUsage._DESERIALIZER), "fields");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Conflicts.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/Conflicts.java
index 7bd42f6bc9..dc551c5d2a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Conflicts.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/Conflicts.java
@@ -37,22 +37,21 @@
 
 @JsonpDeserializable
 public enum Conflicts implements JsonEnum {
-	Abort("abort"),
+    Abort("abort"),
 
-	Proceed("proceed"),
+    Proceed("proceed"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	Conflicts(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    Conflicts(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<Conflicts> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			Conflicts.values());
+    public static final JsonEnum.Deserializer<Conflicts> _DESERIALIZER = new JsonEnum.Deserializer<>(Conflicts.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/CoordsGeoBounds.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/CoordsGeoBounds.java
index dd7db05815..0551e8642c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/CoordsGeoBounds.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/CoordsGeoBounds.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,164 +43,164 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.CoordsGeoBounds
 
 @JsonpDeserializable
 public class CoordsGeoBounds implements JsonpSerializable {
-	private final double top;
+    private final double top;
 
-	private final double bottom;
+    private final double bottom;
 
-	private final double left;
+    private final double left;
 
-	private final double right;
+    private final double right;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private CoordsGeoBounds(Builder builder) {
+    private CoordsGeoBounds(Builder builder) {
 
-		this.top = ApiTypeHelper.requireNonNull(builder.top, this, "top");
-		this.bottom = ApiTypeHelper.requireNonNull(builder.bottom, this, "bottom");
-		this.left = ApiTypeHelper.requireNonNull(builder.left, this, "left");
-		this.right = ApiTypeHelper.requireNonNull(builder.right, this, "right");
+        this.top = ApiTypeHelper.requireNonNull(builder.top, this, "top");
+        this.bottom = ApiTypeHelper.requireNonNull(builder.bottom, this, "bottom");
+        this.left = ApiTypeHelper.requireNonNull(builder.left, this, "left");
+        this.right = ApiTypeHelper.requireNonNull(builder.right, this, "right");
 
-	}
+    }
 
-	public static CoordsGeoBounds of(Function<Builder, ObjectBuilder<CoordsGeoBounds>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static CoordsGeoBounds of(Function<Builder, ObjectBuilder<CoordsGeoBounds>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code top}
-	 */
-	public final double top() {
-		return this.top;
-	}
-
-	/**
-	 * Required - API name: {@code bottom}
-	 */
-	public final double bottom() {
-		return this.bottom;
-	}
-
-	/**
-	 * Required - API name: {@code left}
-	 */
-	public final double left() {
-		return this.left;
-	}
-
-	/**
-	 * Required - API name: {@code right}
-	 */
-	public final double right() {
-		return this.right;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("top");
-		generator.write(this.top);
-
-		generator.writeKey("bottom");
-		generator.write(this.bottom);
-
-		generator.writeKey("left");
-		generator.write(this.left);
-
-		generator.writeKey("right");
-		generator.write(this.right);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CoordsGeoBounds}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CoordsGeoBounds> {
-		private Double top;
-
-		private Double bottom;
-
-		private Double left;
-
-		private Double right;
-
-		/**
-		 * Required - API name: {@code top}
-		 */
-		public final Builder top(double value) {
-			this.top = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code bottom}
-		 */
-		public final Builder bottom(double value) {
-			this.bottom = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code left}
-		 */
-		public final Builder left(double value) {
-			this.left = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code right}
-		 */
-		public final Builder right(double value) {
-			this.right = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CoordsGeoBounds}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CoordsGeoBounds build() {
-			_checkSingleUse();
-
-			return new CoordsGeoBounds(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CoordsGeoBounds}
-	 */
-	public static final JsonpDeserializer<CoordsGeoBounds> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CoordsGeoBounds::setupCoordsGeoBoundsDeserializer);
-
-	protected static void setupCoordsGeoBoundsDeserializer(ObjectDeserializer<CoordsGeoBounds.Builder> op) {
-
-		op.add(Builder::top, JsonpDeserializer.doubleDeserializer(), "top");
-		op.add(Builder::bottom, JsonpDeserializer.doubleDeserializer(), "bottom");
-		op.add(Builder::left, JsonpDeserializer.doubleDeserializer(), "left");
-		op.add(Builder::right, JsonpDeserializer.doubleDeserializer(), "right");
-
-	}
+    /**
+     * Required - API name: {@code top}
+     */
+    public final double top() {
+        return this.top;
+    }
+
+    /**
+     * Required - API name: {@code bottom}
+     */
+    public final double bottom() {
+        return this.bottom;
+    }
+
+    /**
+     * Required - API name: {@code left}
+     */
+    public final double left() {
+        return this.left;
+    }
+
+    /**
+     * Required - API name: {@code right}
+     */
+    public final double right() {
+        return this.right;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("top");
+        generator.write(this.top);
+
+        generator.writeKey("bottom");
+        generator.write(this.bottom);
+
+        generator.writeKey("left");
+        generator.write(this.left);
+
+        generator.writeKey("right");
+        generator.write(this.right);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CoordsGeoBounds}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CoordsGeoBounds> {
+        private Double top;
+
+        private Double bottom;
+
+        private Double left;
+
+        private Double right;
+
+        /**
+         * Required - API name: {@code top}
+         */
+        public final Builder top(double value) {
+            this.top = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code bottom}
+         */
+        public final Builder bottom(double value) {
+            this.bottom = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code left}
+         */
+        public final Builder left(double value) {
+            this.left = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code right}
+         */
+        public final Builder right(double value) {
+            this.right = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link CoordsGeoBounds}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CoordsGeoBounds build() {
+            _checkSingleUse();
+
+            return new CoordsGeoBounds(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CoordsGeoBounds}
+     */
+    public static final JsonpDeserializer<CoordsGeoBounds> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CoordsGeoBounds::setupCoordsGeoBoundsDeserializer
+    );
+
+    protected static void setupCoordsGeoBoundsDeserializer(ObjectDeserializer<CoordsGeoBounds.Builder> op) {
+
+        op.add(Builder::top, JsonpDeserializer.doubleDeserializer(), "top");
+        op.add(Builder::bottom, JsonpDeserializer.doubleDeserializer(), "bottom");
+        op.add(Builder::left, JsonpDeserializer.doubleDeserializer(), "left");
+        op.add(Builder::right, JsonpDeserializer.doubleDeserializer(), "right");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/DistanceUnit.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/DistanceUnit.java
index 89bfa132da..fa3511a98c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/DistanceUnit.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/DistanceUnit.java
@@ -37,36 +37,35 @@
 
 @JsonpDeserializable
 public enum DistanceUnit implements JsonEnum {
-	Inches("in"),
+    Inches("in"),
 
-	Feet("ft"),
+    Feet("ft"),
 
-	Yards("yd"),
+    Yards("yd"),
 
-	Miles("mi"),
+    Miles("mi"),
 
-	NauticMiles("nmi"),
+    NauticMiles("nmi"),
 
-	Kilometers("km"),
+    Kilometers("km"),
 
-	Meters("m"),
+    Meters("m"),
 
-	Centimeters("cm"),
+    Centimeters("cm"),
 
-	Millimeters("mm"),
+    Millimeters("mm"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	DistanceUnit(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    DistanceUnit(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<DistanceUnit> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			DistanceUnit.values());
+    public static final JsonEnum.Deserializer<DistanceUnit> _DESERIALIZER = new JsonEnum.Deserializer<>(DistanceUnit.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/DocStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/DocStats.java
index 9cd3381b5b..25f5f8a39f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/DocStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/DocStats.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,116 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.DocStats
 
 @JsonpDeserializable
 public class DocStats implements JsonpSerializable {
-	private final long count;
-
-	private final long deleted;
-
-	// ---------------------------------------------------------------------------------------------
+    private final long count;
 
-	private DocStats(Builder builder) {
+    private final long deleted;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.deleted = ApiTypeHelper.requireNonNull(builder.deleted, this, "deleted");
+    private DocStats(Builder builder) {
 
-	}
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.deleted = ApiTypeHelper.requireNonNull(builder.deleted, this, "deleted");
 
-	public static DocStats of(Function<Builder, ObjectBuilder<DocStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code count}
-	 */
-	public final long count() {
-		return this.count;
-	}
+    public static DocStats of(Function<Builder, ObjectBuilder<DocStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code deleted}
-	 */
-	public final long deleted() {
-		return this.deleted;
-	}
+    /**
+     * Required - API name: {@code count}
+     */
+    public final long count() {
+        return this.count;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code deleted}
+     */
+    public final long deleted() {
+        return this.deleted;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("count");
-		generator.write(this.count);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("deleted");
-		generator.write(this.deleted);
+        generator.writeKey("count");
+        generator.write(this.count);
 
-	}
+        generator.writeKey("deleted");
+        generator.write(this.deleted);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link DocStats}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DocStats> {
-		private Long count;
+    /**
+     * Builder for {@link DocStats}.
+     */
 
-		private Long deleted;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DocStats> {
+        private Long count;
 
-		/**
-		 * Required - API name: {@code count}
-		 */
-		public final Builder count(long value) {
-			this.count = value;
-			return this;
-		}
+        private Long deleted;
 
-		/**
-		 * Required - API name: {@code deleted}
-		 */
-		public final Builder deleted(long value) {
-			this.deleted = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code count}
+         */
+        public final Builder count(long value) {
+            this.count = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link DocStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DocStats build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code deleted}
+         */
+        public final Builder deleted(long value) {
+            this.deleted = value;
+            return this;
+        }
 
-			return new DocStats(this);
-		}
-	}
+        /**
+         * Builds a {@link DocStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DocStats build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new DocStats(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link DocStats}
-	 */
-	public static final JsonpDeserializer<DocStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			DocStats::setupDocStatsDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupDocStatsDeserializer(ObjectDeserializer<DocStats.Builder> op) {
+    /**
+     * Json deserializer for {@link DocStats}
+     */
+    public static final JsonpDeserializer<DocStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DocStats::setupDocStatsDeserializer
+    );
 
-		op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
-		op.add(Builder::deleted, JsonpDeserializer.longDeserializer(), "deleted");
+    protected static void setupDocStatsDeserializer(ObjectDeserializer<DocStats.Builder> op) {
 
-	}
+        op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
+        op.add(Builder::deleted, JsonpDeserializer.longDeserializer(), "deleted");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/EmptyObject.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/EmptyObject.java
index a4de144e2f..2bac7df617 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/EmptyObject.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/EmptyObject.java
@@ -32,41 +32,40 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
 
 /**
  * For empty Class assignments
- * 
+ *
  */
 @JsonpDeserializable
 public class EmptyObject implements JsonpSerializable {
 
-	public static final class Builder implements ObjectBuilder<EmptyObject> {
-		@Override
-		public EmptyObject build() {
-			return EmptyObject._INSTANCE;
-		}
-	}
+    public static final class Builder implements ObjectBuilder<EmptyObject> {
+        @Override
+        public EmptyObject build() {
+            return EmptyObject._INSTANCE;
+        }
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        generator.writeEnd();
+    }
 
-	/**
-	 * Singleton instance for empty class {@link EmptyObject}.
-	 */
-	public static final EmptyObject _INSTANCE = new EmptyObject();
+    /**
+     * Singleton instance for empty class {@link EmptyObject}.
+     */
+    public static final EmptyObject _INSTANCE = new EmptyObject();
 
-	public static final JsonpDeserializer<EmptyObject> _DESERIALIZER = JsonpDeserializer
-			.emptyObject(EmptyObject._INSTANCE);
+    public static final JsonpDeserializer<EmptyObject> _DESERIALIZER = JsonpDeserializer.emptyObject(EmptyObject._INSTANCE);
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/EmptyTransform.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/EmptyTransform.java
index 8baccedfaa..6d298b5a7c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/EmptyTransform.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/EmptyTransform.java
@@ -32,37 +32,36 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
 
 @JsonpDeserializable
 public class EmptyTransform implements JsonpSerializable {
 
-	public static final class Builder implements ObjectBuilder<EmptyTransform> {
-		@Override
-		public EmptyTransform build() {
-			return EmptyTransform._INSTANCE;
-		}
-	}
+    public static final class Builder implements ObjectBuilder<EmptyTransform> {
+        @Override
+        public EmptyTransform build() {
+            return EmptyTransform._INSTANCE;
+        }
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        generator.writeEnd();
+    }
 
-	/**
-	 * Singleton instance for empty class {@link EmptyTransform}.
-	 */
-	public static final EmptyTransform _INSTANCE = new EmptyTransform();
+    /**
+     * Singleton instance for empty class {@link EmptyTransform}.
+     */
+    public static final EmptyTransform _INSTANCE = new EmptyTransform();
 
-	public static final JsonpDeserializer<EmptyTransform> _DESERIALIZER = JsonpDeserializer
-			.emptyObject(EmptyTransform._INSTANCE);
+    public static final JsonpDeserializer<EmptyTransform> _DESERIALIZER = JsonpDeserializer.emptyObject(EmptyTransform._INSTANCE);
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ErrorCause.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ErrorCause.java
index c2b4b1cd13..469134d325 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ErrorCause.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ErrorCause.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,12 +48,6 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.ErrorCause
 
@@ -58,342 +58,344 @@
  */
 @JsonpDeserializable
 public class ErrorCause implements JsonpSerializable {
-	private final Map<String, JsonData> metadata;
-
-	private final String type;
-
-	private final String reason;
-
-	@Nullable
-	private final String stackTrace;
-
-	@Nullable
-	private final ErrorCause causedBy;
-
-	private final List<ErrorCause> rootCause;
-
-	private final List<ErrorCause> suppressed;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ErrorCause(Builder builder) {
-
-		this.metadata = ApiTypeHelper.unmodifiable(builder.metadata);
-
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-		this.reason = ApiTypeHelper.requireNonNull(builder.reason, this, "reason");
-		this.stackTrace = builder.stackTrace;
-		this.causedBy = builder.causedBy;
-		this.rootCause = ApiTypeHelper.unmodifiable(builder.rootCause);
-		this.suppressed = ApiTypeHelper.unmodifiable(builder.suppressed);
-
-	}
-
-	public static ErrorCause of(Function<Builder, ObjectBuilder<ErrorCause>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Additional details about the error
-	 */
-	public final Map<String, JsonData> metadata() {
-		return this.metadata;
-	}
-
-	/**
-	 * Required - The type of error
-	 * <p>
-	 * API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * Required - A human-readable explanation of the error, in english
-	 * <p>
-	 * API name: {@code reason}
-	 */
-	public final String reason() {
-		return this.reason;
-	}
-
-	/**
-	 * The server stack trace. Present only if the <code>error_trace=true</code>
-	 * parameter was sent with the request.
-	 * <p>
-	 * API name: {@code stack_trace}
-	 */
-	@Nullable
-	public final String stackTrace() {
-		return this.stackTrace;
-	}
-
-	/**
-	 * API name: {@code caused_by}
-	 */
-	@Nullable
-	public final ErrorCause causedBy() {
-		return this.causedBy;
-	}
-
-	/**
-	 * API name: {@code root_cause}
-	 */
-	public final List<ErrorCause> rootCause() {
-		return this.rootCause;
-	}
-
-	/**
-	 * API name: {@code suppressed}
-	 */
-	public final List<ErrorCause> suppressed() {
-		return this.suppressed;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		for (Map.Entry<String, JsonData> item0 : this.metadata.entrySet()) {
-			generator.writeKey(item0.getKey());
-			item0.getValue().serialize(generator, mapper);
-
-		}
-
-		generator.writeKey("type");
-		generator.write(this.type);
-
-		generator.writeKey("reason");
-		generator.write(this.reason);
-
-		if (this.stackTrace != null) {
-			generator.writeKey("stack_trace");
-			generator.write(this.stackTrace);
-
-		}
-		if (this.causedBy != null) {
-			generator.writeKey("caused_by");
-			this.causedBy.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.rootCause)) {
-			generator.writeKey("root_cause");
-			generator.writeStartArray();
-			for (ErrorCause item0 : this.rootCause) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.suppressed)) {
-			generator.writeKey("suppressed");
-			generator.writeStartArray();
-			for (ErrorCause item0 : this.suppressed) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ErrorCause}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ErrorCause> {
-		@Nullable
-		private Map<String, JsonData> metadata = new HashMap<>();
-
-		/**
-		 * Additional details about the error
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>metadata</code>.
-		 */
-		public final Builder metadata(Map<String, JsonData> map) {
-			this.metadata = _mapPutAll(this.metadata, map);
-			return this;
-		}
-
-		/**
-		 * Additional details about the error
-		 * <p>
-		 * Adds an entry to <code>metadata</code>.
-		 */
-		public final Builder metadata(String key, JsonData value) {
-			this.metadata = _mapPut(this.metadata, key, value);
-			return this;
-		}
-
-		private String type;
-
-		private String reason;
-
-		@Nullable
-		private String stackTrace;
-
-		@Nullable
-		private ErrorCause causedBy;
-
-		@Nullable
-		private List<ErrorCause> rootCause;
-
-		@Nullable
-		private List<ErrorCause> suppressed;
-
-		/**
-		 * Required - The type of error
-		 * <p>
-		 * API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Required - A human-readable explanation of the error, in english
-		 * <p>
-		 * API name: {@code reason}
-		 */
-		public final Builder reason(String value) {
-			this.reason = value;
-			return this;
-		}
-
-		/**
-		 * The server stack trace. Present only if the <code>error_trace=true</code>
-		 * parameter was sent with the request.
-		 * <p>
-		 * API name: {@code stack_trace}
-		 */
-		public final Builder stackTrace(@Nullable String value) {
-			this.stackTrace = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code caused_by}
-		 */
-		public final Builder causedBy(@Nullable ErrorCause value) {
-			this.causedBy = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code caused_by}
-		 */
-		public final Builder causedBy(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
-			return this.causedBy(fn.apply(new ErrorCause.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code root_cause}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>rootCause</code>.
-		 */
-		public final Builder rootCause(List<ErrorCause> list) {
-			this.rootCause = _listAddAll(this.rootCause, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code root_cause}
-		 * <p>
-		 * Adds one or more values to <code>rootCause</code>.
-		 */
-		public final Builder rootCause(ErrorCause value, ErrorCause... values) {
-			this.rootCause = _listAdd(this.rootCause, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code root_cause}
-		 * <p>
-		 * Adds a value to <code>rootCause</code> using a builder lambda.
-		 */
-		public final Builder rootCause(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
-			return rootCause(fn.apply(new ErrorCause.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code suppressed}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>suppressed</code>.
-		 */
-		public final Builder suppressed(List<ErrorCause> list) {
-			this.suppressed = _listAddAll(this.suppressed, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code suppressed}
-		 * <p>
-		 * Adds one or more values to <code>suppressed</code>.
-		 */
-		public final Builder suppressed(ErrorCause value, ErrorCause... values) {
-			this.suppressed = _listAdd(this.suppressed, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code suppressed}
-		 * <p>
-		 * Adds a value to <code>suppressed</code> using a builder lambda.
-		 */
-		public final Builder suppressed(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
-			return suppressed(fn.apply(new ErrorCause.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ErrorCause}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ErrorCause build() {
-			_checkSingleUse();
-
-			return new ErrorCause(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ErrorCause}
-	 */
-	public static final JsonpDeserializer<ErrorCause> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ErrorCause::setupErrorCauseDeserializer);
-
-	protected static void setupErrorCauseDeserializer(ObjectDeserializer<ErrorCause.Builder> op) {
-
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-		op.add(Builder::reason, JsonpDeserializer.stringDeserializer(), "reason");
-		op.add(Builder::stackTrace, JsonpDeserializer.stringDeserializer(), "stack_trace");
-		op.add(Builder::causedBy, ErrorCause._DESERIALIZER, "caused_by");
-		op.add(Builder::rootCause, JsonpDeserializer.arrayDeserializer(ErrorCause._DESERIALIZER), "root_cause");
-		op.add(Builder::suppressed, JsonpDeserializer.arrayDeserializer(ErrorCause._DESERIALIZER), "suppressed");
-
-		op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
-			if (builder.metadata == null) {
-				builder.metadata = new HashMap<>();
-			}
-			builder.metadata.put(name, JsonData._DESERIALIZER.deserialize(parser, mapper));
-		});
-
-	}
+    private final Map<String, JsonData> metadata;
+
+    private final String type;
+
+    private final String reason;
+
+    @Nullable
+    private final String stackTrace;
+
+    @Nullable
+    private final ErrorCause causedBy;
+
+    private final List<ErrorCause> rootCause;
+
+    private final List<ErrorCause> suppressed;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ErrorCause(Builder builder) {
+
+        this.metadata = ApiTypeHelper.unmodifiable(builder.metadata);
+
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.reason = ApiTypeHelper.requireNonNull(builder.reason, this, "reason");
+        this.stackTrace = builder.stackTrace;
+        this.causedBy = builder.causedBy;
+        this.rootCause = ApiTypeHelper.unmodifiable(builder.rootCause);
+        this.suppressed = ApiTypeHelper.unmodifiable(builder.suppressed);
+
+    }
+
+    public static ErrorCause of(Function<Builder, ObjectBuilder<ErrorCause>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Additional details about the error
+     */
+    public final Map<String, JsonData> metadata() {
+        return this.metadata;
+    }
+
+    /**
+     * Required - The type of error
+     * <p>
+     * API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * Required - A human-readable explanation of the error, in english
+     * <p>
+     * API name: {@code reason}
+     */
+    public final String reason() {
+        return this.reason;
+    }
+
+    /**
+     * The server stack trace. Present only if the <code>error_trace=true</code>
+     * parameter was sent with the request.
+     * <p>
+     * API name: {@code stack_trace}
+     */
+    @Nullable
+    public final String stackTrace() {
+        return this.stackTrace;
+    }
+
+    /**
+     * API name: {@code caused_by}
+     */
+    @Nullable
+    public final ErrorCause causedBy() {
+        return this.causedBy;
+    }
+
+    /**
+     * API name: {@code root_cause}
+     */
+    public final List<ErrorCause> rootCause() {
+        return this.rootCause;
+    }
+
+    /**
+     * API name: {@code suppressed}
+     */
+    public final List<ErrorCause> suppressed() {
+        return this.suppressed;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        for (Map.Entry<String, JsonData> item0 : this.metadata.entrySet()) {
+            generator.writeKey(item0.getKey());
+            item0.getValue().serialize(generator, mapper);
+
+        }
+
+        generator.writeKey("type");
+        generator.write(this.type);
+
+        generator.writeKey("reason");
+        generator.write(this.reason);
+
+        if (this.stackTrace != null) {
+            generator.writeKey("stack_trace");
+            generator.write(this.stackTrace);
+
+        }
+        if (this.causedBy != null) {
+            generator.writeKey("caused_by");
+            this.causedBy.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.rootCause)) {
+            generator.writeKey("root_cause");
+            generator.writeStartArray();
+            for (ErrorCause item0 : this.rootCause) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.suppressed)) {
+            generator.writeKey("suppressed");
+            generator.writeStartArray();
+            for (ErrorCause item0 : this.suppressed) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ErrorCause}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ErrorCause> {
+        @Nullable
+        private Map<String, JsonData> metadata = new HashMap<>();
+
+        /**
+         * Additional details about the error
+         * <p>
+         * Adds all entries of <code>map</code> to <code>metadata</code>.
+         */
+        public final Builder metadata(Map<String, JsonData> map) {
+            this.metadata = _mapPutAll(this.metadata, map);
+            return this;
+        }
+
+        /**
+         * Additional details about the error
+         * <p>
+         * Adds an entry to <code>metadata</code>.
+         */
+        public final Builder metadata(String key, JsonData value) {
+            this.metadata = _mapPut(this.metadata, key, value);
+            return this;
+        }
+
+        private String type;
+
+        private String reason;
+
+        @Nullable
+        private String stackTrace;
+
+        @Nullable
+        private ErrorCause causedBy;
+
+        @Nullable
+        private List<ErrorCause> rootCause;
+
+        @Nullable
+        private List<ErrorCause> suppressed;
+
+        /**
+         * Required - The type of error
+         * <p>
+         * API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Required - A human-readable explanation of the error, in english
+         * <p>
+         * API name: {@code reason}
+         */
+        public final Builder reason(String value) {
+            this.reason = value;
+            return this;
+        }
+
+        /**
+         * The server stack trace. Present only if the <code>error_trace=true</code>
+         * parameter was sent with the request.
+         * <p>
+         * API name: {@code stack_trace}
+         */
+        public final Builder stackTrace(@Nullable String value) {
+            this.stackTrace = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code caused_by}
+         */
+        public final Builder causedBy(@Nullable ErrorCause value) {
+            this.causedBy = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code caused_by}
+         */
+        public final Builder causedBy(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
+            return this.causedBy(fn.apply(new ErrorCause.Builder()).build());
+        }
+
+        /**
+         * API name: {@code root_cause}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>rootCause</code>.
+         */
+        public final Builder rootCause(List<ErrorCause> list) {
+            this.rootCause = _listAddAll(this.rootCause, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code root_cause}
+         * <p>
+         * Adds one or more values to <code>rootCause</code>.
+         */
+        public final Builder rootCause(ErrorCause value, ErrorCause... values) {
+            this.rootCause = _listAdd(this.rootCause, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code root_cause}
+         * <p>
+         * Adds a value to <code>rootCause</code> using a builder lambda.
+         */
+        public final Builder rootCause(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
+            return rootCause(fn.apply(new ErrorCause.Builder()).build());
+        }
+
+        /**
+         * API name: {@code suppressed}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>suppressed</code>.
+         */
+        public final Builder suppressed(List<ErrorCause> list) {
+            this.suppressed = _listAddAll(this.suppressed, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code suppressed}
+         * <p>
+         * Adds one or more values to <code>suppressed</code>.
+         */
+        public final Builder suppressed(ErrorCause value, ErrorCause... values) {
+            this.suppressed = _listAdd(this.suppressed, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code suppressed}
+         * <p>
+         * Adds a value to <code>suppressed</code> using a builder lambda.
+         */
+        public final Builder suppressed(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
+            return suppressed(fn.apply(new ErrorCause.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ErrorCause}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ErrorCause build() {
+            _checkSingleUse();
+
+            return new ErrorCause(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ErrorCause}
+     */
+    public static final JsonpDeserializer<ErrorCause> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ErrorCause::setupErrorCauseDeserializer
+    );
+
+    protected static void setupErrorCauseDeserializer(ObjectDeserializer<ErrorCause.Builder> op) {
+
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+        op.add(Builder::reason, JsonpDeserializer.stringDeserializer(), "reason");
+        op.add(Builder::stackTrace, JsonpDeserializer.stringDeserializer(), "stack_trace");
+        op.add(Builder::causedBy, ErrorCause._DESERIALIZER, "caused_by");
+        op.add(Builder::rootCause, JsonpDeserializer.arrayDeserializer(ErrorCause._DESERIALIZER), "root_cause");
+        op.add(Builder::suppressed, JsonpDeserializer.arrayDeserializer(ErrorCause._DESERIALIZER), "suppressed");
+
+        op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
+            if (builder.metadata == null) {
+                builder.metadata = new HashMap<>();
+            }
+            builder.metadata.put(name, JsonData._DESERIALIZER.deserialize(parser, mapper));
+        });
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ErrorResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ErrorResponse.java
index 19d97fec9e..029d6a20c0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ErrorResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ErrorResponse.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,147 +44,146 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.ErrorResponseBase
 
 /**
  * The response returned by Elasticsearch when request execution did not
  * succeed.
- * 
+ *
  */
 @JsonpDeserializable
 public class ErrorResponse implements JsonpSerializable {
 
-	private enum Kind {
-		OBJECT,
-		STRING
-	}
-	private final ErrorCause error;
-
-	private final int status;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ErrorResponse(Builder builder) {
-
-		this.error = ApiTypeHelper.requireNonNull(builder.error, this, "error");
-		this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
-
-	}
+    private enum Kind {
+        OBJECT,
+        STRING
+    }
+
+    private final ErrorCause error;
+
+    private final int status;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ErrorResponse(Builder builder) {
+
+        this.error = ApiTypeHelper.requireNonNull(builder.error, this, "error");
+        this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
+
+    }
+
+    public static ErrorResponse of(Function<Builder, ObjectBuilder<ErrorResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	public static ErrorResponse of(Function<Builder, ObjectBuilder<ErrorResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code error}
-	 */
-	public final ErrorCause error() {
-		return this.error;
-	}
-
-	/**
-	 * Required - API name: {@code status}
-	 */
-	public final int status() {
-		return this.status;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("error");
-		this.error.serialize(generator, mapper);
-
-		generator.writeKey("status");
-		generator.write(this.status);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ErrorResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ErrorResponse> {
-		private ErrorCause error;
-
-		private Integer status;
-
-		/**
-		 * Required - API name: {@code error}
-		 */
-		public final Builder error(ErrorCause value) {
-			this.error = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code error}
-		 */
-		public final Builder error(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
-			return this.error(fn.apply(new ErrorCause.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code status}
-		 */
-		public final Builder status(int value) {
-			this.status = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ErrorResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ErrorResponse build() {
-			_checkSingleUse();
-
-			return new ErrorResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ErrorResponse}
-	 */
-	public static final JsonpDeserializer<ErrorResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ErrorResponse::setupErrorResponseDeserializer);
-
-	protected static void setupErrorResponseDeserializer(ObjectDeserializer<ErrorResponse.Builder> op) {
-
-		op.add(Builder::error, buildErrorCauseDeserializers(), "error");
-		op.add(Builder::status, JsonpDeserializer.integerDeserializer(), "status");
-
-	}
-
-	protected static JsonpDeserializer<ErrorCause> buildErrorCauseDeserializers() {
-		return new UnionDeserializer.Builder<>(ErrorResponse::getErrorCause, false)
-				.addMember(Kind.OBJECT, ErrorCause._DESERIALIZER)
-				.addMember(Kind.STRING, JsonpDeserializer.stringDeserializer())
-				.build();
-	}
-
-	private static ErrorCause getErrorCause(Kind kind, Object errorCause) {
-		return Kind.STRING.equals(kind) ?
-				ErrorCause.of(builder -> builder.type("string_error").reason((String) errorCause)) :
-				(ErrorCause) errorCause;
-	}
+    /**
+     * Required - API name: {@code error}
+     */
+    public final ErrorCause error() {
+        return this.error;
+    }
+
+    /**
+     * Required - API name: {@code status}
+     */
+    public final int status() {
+        return this.status;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("error");
+        this.error.serialize(generator, mapper);
+
+        generator.writeKey("status");
+        generator.write(this.status);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ErrorResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ErrorResponse> {
+        private ErrorCause error;
+
+        private Integer status;
+
+        /**
+         * Required - API name: {@code error}
+         */
+        public final Builder error(ErrorCause value) {
+            this.error = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code error}
+         */
+        public final Builder error(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
+            return this.error(fn.apply(new ErrorCause.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code status}
+         */
+        public final Builder status(int value) {
+            this.status = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ErrorResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ErrorResponse build() {
+            _checkSingleUse();
+
+            return new ErrorResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ErrorResponse}
+     */
+    public static final JsonpDeserializer<ErrorResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ErrorResponse::setupErrorResponseDeserializer
+    );
+
+    protected static void setupErrorResponseDeserializer(ObjectDeserializer<ErrorResponse.Builder> op) {
+
+        op.add(Builder::error, buildErrorCauseDeserializers(), "error");
+        op.add(Builder::status, JsonpDeserializer.integerDeserializer(), "status");
+
+    }
+
+    protected static JsonpDeserializer<ErrorCause> buildErrorCauseDeserializers() {
+        return new UnionDeserializer.Builder<>(ErrorResponse::getErrorCause, false).addMember(Kind.OBJECT, ErrorCause._DESERIALIZER)
+            .addMember(Kind.STRING, JsonpDeserializer.stringDeserializer())
+            .build();
+    }
+
+    private static ErrorCause getErrorCause(Kind kind, Object errorCause) {
+        return Kind.STRING.equals(kind)
+            ? ErrorCause.of(builder -> builder.type("string_error").reason((String) errorCause))
+            : (ErrorCause) errorCause;
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ExpandWildcard.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ExpandWildcard.java
index 352063ee54..5b66a33bd2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ExpandWildcard.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ExpandWildcard.java
@@ -37,45 +37,44 @@
 
 @JsonpDeserializable
 public enum ExpandWildcard implements JsonEnum {
-	/**
-	 * Match any data stream or index, including hidden ones.
-	 */
-	All("all"),
+    /**
+     * Match any data stream or index, including hidden ones.
+     */
+    All("all"),
 
-	/**
-	 * Match open, non-hidden indices. Also matches any non-hidden data stream.
-	 */
-	Open("open"),
+    /**
+     * Match open, non-hidden indices. Also matches any non-hidden data stream.
+     */
+    Open("open"),
 
-	/**
-	 * Match closed, non-hidden indices. Also matches any non-hidden data stream.
-	 * Data streams cannot be closed.
-	 */
-	Closed("closed"),
+    /**
+     * Match closed, non-hidden indices. Also matches any non-hidden data stream.
+     * Data streams cannot be closed.
+     */
+    Closed("closed"),
 
-	/**
-	 * Match hidden data streams and hidden indices. Must be combined with open,
-	 * closed, or both.
-	 */
-	Hidden("hidden"),
+    /**
+     * Match hidden data streams and hidden indices. Must be combined with open,
+     * closed, or both.
+     */
+    Hidden("hidden"),
 
-	/**
-	 * Wildcard expressions are not accepted.
-	 */
-	None("none"),
+    /**
+     * Wildcard expressions are not accepted.
+     */
+    None("none"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	ExpandWildcard(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    ExpandWildcard(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<ExpandWildcard> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			ExpandWildcard.values());
+    public static final JsonEnum.Deserializer<ExpandWildcard> _DESERIALIZER = new JsonEnum.Deserializer<>(ExpandWildcard.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldMemoryUsage.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldMemoryUsage.java
index 0802fbdaa5..b202739387 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldMemoryUsage.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldMemoryUsage.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,122 +44,121 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.FieldMemoryUsage
 
 @JsonpDeserializable
 public class FieldMemoryUsage implements JsonpSerializable {
-	@Nullable
-	private final String memorySize;
-
-	private final long memorySizeInBytes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FieldMemoryUsage(Builder builder) {
-
-		this.memorySize = builder.memorySize;
-		this.memorySizeInBytes = ApiTypeHelper.requireNonNull(builder.memorySizeInBytes, this, "memorySizeInBytes");
-
-	}
-
-	public static FieldMemoryUsage of(Function<Builder, ObjectBuilder<FieldMemoryUsage>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code memory_size}
-	 */
-	@Nullable
-	public final String memorySize() {
-		return this.memorySize;
-	}
-
-	/**
-	 * Required - API name: {@code memory_size_in_bytes}
-	 */
-	public final long memorySizeInBytes() {
-		return this.memorySizeInBytes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.memorySize != null) {
-			generator.writeKey("memory_size");
-			generator.write(this.memorySize);
-
-		}
-		generator.writeKey("memory_size_in_bytes");
-		generator.write(this.memorySizeInBytes);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FieldMemoryUsage}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldMemoryUsage> {
-		@Nullable
-		private String memorySize;
-
-		private Long memorySizeInBytes;
-
-		/**
-		 * API name: {@code memory_size}
-		 */
-		public final Builder memorySize(@Nullable String value) {
-			this.memorySize = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code memory_size_in_bytes}
-		 */
-		public final Builder memorySizeInBytes(long value) {
-			this.memorySizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FieldMemoryUsage}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FieldMemoryUsage build() {
-			_checkSingleUse();
-
-			return new FieldMemoryUsage(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FieldMemoryUsage}
-	 */
-	public static final JsonpDeserializer<FieldMemoryUsage> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FieldMemoryUsage::setupFieldMemoryUsageDeserializer);
-
-	protected static void setupFieldMemoryUsageDeserializer(ObjectDeserializer<FieldMemoryUsage.Builder> op) {
-
-		op.add(Builder::memorySize, JsonpDeserializer.stringDeserializer(), "memory_size");
-		op.add(Builder::memorySizeInBytes, JsonpDeserializer.longDeserializer(), "memory_size_in_bytes");
-
-	}
+    @Nullable
+    private final String memorySize;
+
+    private final long memorySizeInBytes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FieldMemoryUsage(Builder builder) {
+
+        this.memorySize = builder.memorySize;
+        this.memorySizeInBytes = ApiTypeHelper.requireNonNull(builder.memorySizeInBytes, this, "memorySizeInBytes");
+
+    }
+
+    public static FieldMemoryUsage of(Function<Builder, ObjectBuilder<FieldMemoryUsage>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code memory_size}
+     */
+    @Nullable
+    public final String memorySize() {
+        return this.memorySize;
+    }
+
+    /**
+     * Required - API name: {@code memory_size_in_bytes}
+     */
+    public final long memorySizeInBytes() {
+        return this.memorySizeInBytes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.memorySize != null) {
+            generator.writeKey("memory_size");
+            generator.write(this.memorySize);
+
+        }
+        generator.writeKey("memory_size_in_bytes");
+        generator.write(this.memorySizeInBytes);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FieldMemoryUsage}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldMemoryUsage> {
+        @Nullable
+        private String memorySize;
+
+        private Long memorySizeInBytes;
+
+        /**
+         * API name: {@code memory_size}
+         */
+        public final Builder memorySize(@Nullable String value) {
+            this.memorySize = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code memory_size_in_bytes}
+         */
+        public final Builder memorySizeInBytes(long value) {
+            this.memorySizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link FieldMemoryUsage}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FieldMemoryUsage build() {
+            _checkSingleUse();
+
+            return new FieldMemoryUsage(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FieldMemoryUsage}
+     */
+    public static final JsonpDeserializer<FieldMemoryUsage> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FieldMemoryUsage::setupFieldMemoryUsageDeserializer
+    );
+
+    protected static void setupFieldMemoryUsageDeserializer(ObjectDeserializer<FieldMemoryUsage.Builder> op) {
+
+        op.add(Builder::memorySize, JsonpDeserializer.stringDeserializer(), "memory_size");
+        op.add(Builder::memorySizeInBytes, JsonpDeserializer.longDeserializer(), "memory_size_in_bytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldSizeUsage.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldSizeUsage.java
index edb66f531e..9d90e1e566 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldSizeUsage.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldSizeUsage.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,122 +44,121 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.FieldSizeUsage
 
 @JsonpDeserializable
 public class FieldSizeUsage implements JsonpSerializable {
-	@Nullable
-	private final String size;
-
-	private final long sizeInBytes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FieldSizeUsage(Builder builder) {
-
-		this.size = builder.size;
-		this.sizeInBytes = ApiTypeHelper.requireNonNull(builder.sizeInBytes, this, "sizeInBytes");
-
-	}
-
-	public static FieldSizeUsage of(Function<Builder, ObjectBuilder<FieldSizeUsage>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final String size() {
-		return this.size;
-	}
-
-	/**
-	 * Required - API name: {@code size_in_bytes}
-	 */
-	public final long sizeInBytes() {
-		return this.sizeInBytes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		generator.writeKey("size_in_bytes");
-		generator.write(this.sizeInBytes);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FieldSizeUsage}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldSizeUsage> {
-		@Nullable
-		private String size;
-
-		private Long sizeInBytes;
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable String value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code size_in_bytes}
-		 */
-		public final Builder sizeInBytes(long value) {
-			this.sizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FieldSizeUsage}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FieldSizeUsage build() {
-			_checkSingleUse();
-
-			return new FieldSizeUsage(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FieldSizeUsage}
-	 */
-	public static final JsonpDeserializer<FieldSizeUsage> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FieldSizeUsage::setupFieldSizeUsageDeserializer);
-
-	protected static void setupFieldSizeUsageDeserializer(ObjectDeserializer<FieldSizeUsage.Builder> op) {
-
-		op.add(Builder::size, JsonpDeserializer.stringDeserializer(), "size");
-		op.add(Builder::sizeInBytes, JsonpDeserializer.longDeserializer(), "size_in_bytes");
-
-	}
+    @Nullable
+    private final String size;
+
+    private final long sizeInBytes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FieldSizeUsage(Builder builder) {
+
+        this.size = builder.size;
+        this.sizeInBytes = ApiTypeHelper.requireNonNull(builder.sizeInBytes, this, "sizeInBytes");
+
+    }
+
+    public static FieldSizeUsage of(Function<Builder, ObjectBuilder<FieldSizeUsage>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final String size() {
+        return this.size;
+    }
+
+    /**
+     * Required - API name: {@code size_in_bytes}
+     */
+    public final long sizeInBytes() {
+        return this.sizeInBytes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        generator.writeKey("size_in_bytes");
+        generator.write(this.sizeInBytes);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FieldSizeUsage}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldSizeUsage> {
+        @Nullable
+        private String size;
+
+        private Long sizeInBytes;
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable String value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code size_in_bytes}
+         */
+        public final Builder sizeInBytes(long value) {
+            this.sizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link FieldSizeUsage}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FieldSizeUsage build() {
+            _checkSingleUse();
+
+            return new FieldSizeUsage(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FieldSizeUsage}
+     */
+    public static final JsonpDeserializer<FieldSizeUsage> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FieldSizeUsage::setupFieldSizeUsageDeserializer
+    );
+
+    protected static void setupFieldSizeUsageDeserializer(ObjectDeserializer<FieldSizeUsage.Builder> op) {
+
+        op.add(Builder::size, JsonpDeserializer.stringDeserializer(), "size");
+        op.add(Builder::sizeInBytes, JsonpDeserializer.longDeserializer(), "size_in_bytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldSort.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldSort.java
index c9ab537e29..08806a7cc8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldSort.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldSort.java
@@ -32,322 +32,323 @@
 
 package org.opensearch.client.opensearch._types;
 
-import org.opensearch.client.opensearch._types.mapping.FieldType;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.mapping.FieldType;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.FieldSort
 
 @JsonpDeserializable
 public class FieldSort implements JsonpSerializable {
-	// Single key dictionary
-	private final String field;
-
-	@Nullable
-	private final FieldValue missing;
-
-	@Nullable
-	private final SortMode mode;
-
-	@Nullable
-	private final NestedSortValue nested;
-
-	@Nullable
-	private final SortOrder order;
-
-	@Nullable
-	private final FieldType unmappedType;
-
-	@Nullable
-	private final FieldSortNumericType numericType;
-
-	@Nullable
-	private final String format;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FieldSort(Builder builder) {
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-
-		this.missing = builder.missing;
-		this.mode = builder.mode;
-		this.nested = builder.nested;
-		this.order = builder.order;
-		this.unmappedType = builder.unmappedType;
-		this.numericType = builder.numericType;
-		this.format = builder.format;
-
-	}
-
-	public static FieldSort of(Function<Builder, ObjectBuilder<FieldSort>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - The target field
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code missing}
-	 */
-	@Nullable
-	public final FieldValue missing() {
-		return this.missing;
-	}
-
-	/**
-	 * API name: {@code mode}
-	 */
-	@Nullable
-	public final SortMode mode() {
-		return this.mode;
-	}
-
-	/**
-	 * API name: {@code nested}
-	 */
-	@Nullable
-	public final NestedSortValue nested() {
-		return this.nested;
-	}
-
-	/**
-	 * API name: {@code order}
-	 */
-	@Nullable
-	public final SortOrder order() {
-		return this.order;
-	}
-
-	/**
-	 * API name: {@code unmapped_type}
-	 */
-	@Nullable
-	public final FieldType unmappedType() {
-		return this.unmappedType;
-	}
-
-	/**
-	 * API name: {@code numeric_type}
-	 */
-	@Nullable
-	public final FieldSortNumericType numericType() {
-		return this.numericType;
-	}
-
-	/**
-	 * API name: {@code format}
-	 */
-	@Nullable
-	public final String format() {
-		return this.format;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject(this.field);
-
-		if (this.missing != null) {
-			generator.writeKey("missing");
-			this.missing.serialize(generator, mapper);
-
-		}
-		if (this.mode != null) {
-			generator.writeKey("mode");
-			this.mode.serialize(generator, mapper);
-		}
-		if (this.nested != null) {
-			generator.writeKey("nested");
-			this.nested.serialize(generator, mapper);
-
-		}
-		if (this.order != null) {
-			generator.writeKey("order");
-			this.order.serialize(generator, mapper);
-		}
-		if (this.unmappedType != null) {
-			generator.writeKey("unmapped_type");
-			this.unmappedType.serialize(generator, mapper);
-		}
-		if (this.numericType != null) {
-			generator.writeKey("numeric_type");
-			this.numericType.serialize(generator, mapper);
-		}
-		if (this.format != null) {
-			generator.writeKey("format");
-			generator.write(this.format);
-
-		}
-
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FieldSort}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldSort> {
-		private String field;
-
-		/**
-		 * Required - The target field
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		@Nullable
-		private FieldValue missing;
-
-		@Nullable
-		private SortMode mode;
-
-		@Nullable
-		private NestedSortValue nested;
-
-		@Nullable
-		private SortOrder order;
-
-		@Nullable
-		private FieldType unmappedType;
-
-		@Nullable
-		private FieldSortNumericType numericType;
-
-		@Nullable
-		private String format;
-
-		/**
-		 * API name: {@code missing}
-		 */
-		public final Builder missing(@Nullable FieldValue value) {
-			this.missing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code missing}
-		 */
-		public final Builder missing(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
-			return this.missing(fn.apply(new FieldValue.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code mode}
-		 */
-		public final Builder mode(@Nullable SortMode value) {
-			this.mode = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code nested}
-		 */
-		public final Builder nested(@Nullable NestedSortValue value) {
-			this.nested = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code nested}
-		 */
-		public final Builder nested(Function<NestedSortValue.Builder, ObjectBuilder<NestedSortValue>> fn) {
-			return this.nested(fn.apply(new NestedSortValue.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code order}
-		 */
-		public final Builder order(@Nullable SortOrder value) {
-			this.order = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code unmapped_type}
-		 */
-		public final Builder unmappedType(@Nullable FieldType value) {
-			this.unmappedType = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code numeric_type}
-		 */
-		public final Builder numericType(@Nullable FieldSortNumericType value) {
-			this.numericType = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code format}
-		 */
-		public final Builder format(@Nullable String value) {
-			this.format = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FieldSort}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FieldSort build() {
-			_checkSingleUse();
-
-			return new FieldSort(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FieldSort}
-	 */
-	public static final JsonpDeserializer<FieldSort> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FieldSort::setupFieldSortDeserializer);
-
-	protected static void setupFieldSortDeserializer(ObjectDeserializer<FieldSort.Builder> op) {
-
-		op.add(Builder::missing, FieldValue._DESERIALIZER, "missing");
-		op.add(Builder::mode, SortMode._DESERIALIZER, "mode");
-		op.add(Builder::nested, NestedSortValue._DESERIALIZER, "nested");
-		op.add(Builder::order, SortOrder._DESERIALIZER, "order");
-		op.add(Builder::unmappedType, FieldType._DESERIALIZER, "unmapped_type");
-		op.add(Builder::numericType, FieldSortNumericType._DESERIALIZER, "numeric_type");
-		op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
-
-		op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
-		op.shortcutProperty("order");
-
-	}
+    // Single key dictionary
+    private final String field;
+
+    @Nullable
+    private final FieldValue missing;
+
+    @Nullable
+    private final SortMode mode;
+
+    @Nullable
+    private final NestedSortValue nested;
+
+    @Nullable
+    private final SortOrder order;
+
+    @Nullable
+    private final FieldType unmappedType;
+
+    @Nullable
+    private final FieldSortNumericType numericType;
+
+    @Nullable
+    private final String format;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FieldSort(Builder builder) {
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+
+        this.missing = builder.missing;
+        this.mode = builder.mode;
+        this.nested = builder.nested;
+        this.order = builder.order;
+        this.unmappedType = builder.unmappedType;
+        this.numericType = builder.numericType;
+        this.format = builder.format;
+
+    }
+
+    public static FieldSort of(Function<Builder, ObjectBuilder<FieldSort>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - The target field
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code missing}
+     */
+    @Nullable
+    public final FieldValue missing() {
+        return this.missing;
+    }
+
+    /**
+     * API name: {@code mode}
+     */
+    @Nullable
+    public final SortMode mode() {
+        return this.mode;
+    }
+
+    /**
+     * API name: {@code nested}
+     */
+    @Nullable
+    public final NestedSortValue nested() {
+        return this.nested;
+    }
+
+    /**
+     * API name: {@code order}
+     */
+    @Nullable
+    public final SortOrder order() {
+        return this.order;
+    }
+
+    /**
+     * API name: {@code unmapped_type}
+     */
+    @Nullable
+    public final FieldType unmappedType() {
+        return this.unmappedType;
+    }
+
+    /**
+     * API name: {@code numeric_type}
+     */
+    @Nullable
+    public final FieldSortNumericType numericType() {
+        return this.numericType;
+    }
+
+    /**
+     * API name: {@code format}
+     */
+    @Nullable
+    public final String format() {
+        return this.format;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject(this.field);
+
+        if (this.missing != null) {
+            generator.writeKey("missing");
+            this.missing.serialize(generator, mapper);
+
+        }
+        if (this.mode != null) {
+            generator.writeKey("mode");
+            this.mode.serialize(generator, mapper);
+        }
+        if (this.nested != null) {
+            generator.writeKey("nested");
+            this.nested.serialize(generator, mapper);
+
+        }
+        if (this.order != null) {
+            generator.writeKey("order");
+            this.order.serialize(generator, mapper);
+        }
+        if (this.unmappedType != null) {
+            generator.writeKey("unmapped_type");
+            this.unmappedType.serialize(generator, mapper);
+        }
+        if (this.numericType != null) {
+            generator.writeKey("numeric_type");
+            this.numericType.serialize(generator, mapper);
+        }
+        if (this.format != null) {
+            generator.writeKey("format");
+            generator.write(this.format);
+
+        }
+
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FieldSort}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldSort> {
+        private String field;
+
+        /**
+         * Required - The target field
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        @Nullable
+        private FieldValue missing;
+
+        @Nullable
+        private SortMode mode;
+
+        @Nullable
+        private NestedSortValue nested;
+
+        @Nullable
+        private SortOrder order;
+
+        @Nullable
+        private FieldType unmappedType;
+
+        @Nullable
+        private FieldSortNumericType numericType;
+
+        @Nullable
+        private String format;
+
+        /**
+         * API name: {@code missing}
+         */
+        public final Builder missing(@Nullable FieldValue value) {
+            this.missing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code missing}
+         */
+        public final Builder missing(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
+            return this.missing(fn.apply(new FieldValue.Builder()).build());
+        }
+
+        /**
+         * API name: {@code mode}
+         */
+        public final Builder mode(@Nullable SortMode value) {
+            this.mode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code nested}
+         */
+        public final Builder nested(@Nullable NestedSortValue value) {
+            this.nested = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code nested}
+         */
+        public final Builder nested(Function<NestedSortValue.Builder, ObjectBuilder<NestedSortValue>> fn) {
+            return this.nested(fn.apply(new NestedSortValue.Builder()).build());
+        }
+
+        /**
+         * API name: {@code order}
+         */
+        public final Builder order(@Nullable SortOrder value) {
+            this.order = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code unmapped_type}
+         */
+        public final Builder unmappedType(@Nullable FieldType value) {
+            this.unmappedType = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code numeric_type}
+         */
+        public final Builder numericType(@Nullable FieldSortNumericType value) {
+            this.numericType = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code format}
+         */
+        public final Builder format(@Nullable String value) {
+            this.format = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link FieldSort}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FieldSort build() {
+            _checkSingleUse();
+
+            return new FieldSort(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FieldSort}
+     */
+    public static final JsonpDeserializer<FieldSort> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FieldSort::setupFieldSortDeserializer
+    );
+
+    protected static void setupFieldSortDeserializer(ObjectDeserializer<FieldSort.Builder> op) {
+
+        op.add(Builder::missing, FieldValue._DESERIALIZER, "missing");
+        op.add(Builder::mode, SortMode._DESERIALIZER, "mode");
+        op.add(Builder::nested, NestedSortValue._DESERIALIZER, "nested");
+        op.add(Builder::order, SortOrder._DESERIALIZER, "order");
+        op.add(Builder::unmappedType, FieldType._DESERIALIZER, "unmapped_type");
+        op.add(Builder::numericType, FieldSortNumericType._DESERIALIZER, "numeric_type");
+        op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
+
+        op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
+        op.shortcutProperty("order");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldSortNumericType.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldSortNumericType.java
index 776101e80c..faf7f9d667 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldSortNumericType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldSortNumericType.java
@@ -37,26 +37,27 @@
 
 @JsonpDeserializable
 public enum FieldSortNumericType implements JsonEnum {
-	Long("long"),
+    Long("long"),
 
-	Double("double"),
+    Double("double"),
 
-	Date("date"),
+    Date("date"),
 
-	DateNanos("date_nanos"),
+    DateNanos("date_nanos"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	FieldSortNumericType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    FieldSortNumericType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<FieldSortNumericType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			FieldSortNumericType.values());
+    public static final JsonEnum.Deserializer<FieldSortNumericType> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        FieldSortNumericType.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldValue.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldValue.java
index c5efb8350e..fbf6808921 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldValue.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/FieldValue.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonParser;
+import java.util.EnumSet;
+import java.util.function.Consumer;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,245 +45,250 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import jakarta.json.stream.JsonParser;
-
-import java.util.EnumSet;
-import java.util.function.Consumer;
 
 // typedef: _types.FieldValue
 
 @JsonpDeserializable
 public class FieldValue implements TaggedUnion<FieldValue.Kind, Object>, JsonpSerializable {
 
-	public static FieldValue of(long value) {
-		return new FieldValue(Kind.Long, value);
-	}
-
-	public static FieldValue of(double value) {
-		return new FieldValue(Kind.Double, value);
-	}
-
-	public static FieldValue of(boolean value) {
-		return value ? TRUE : FALSE;
-	}
-
-	public static FieldValue of(String value) {
-		return new FieldValue(Kind.String, value);
-	}
-
-	public static final FieldValue NULL = new FieldValue(Kind.Null, null);
-	public static final FieldValue TRUE = new FieldValue(Kind.Boolean, Boolean.TRUE);
-	public static final FieldValue FALSE = new FieldValue(Kind.Boolean, Boolean.FALSE);
-
-	public enum Kind {
-		Double, Long, Boolean, String, Null
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	public String _toJsonString() {
-		switch (_kind) {
-			case Double :
-				return String.valueOf(this.doubleValue());
-			case Long :
-				return String.valueOf(this.longValue());
-			case Boolean :
-				return String.valueOf(this.booleanValue());
-			case String :
-				return this.stringValue();
-			case Null :
-				return "null";
-
-			default :
-				throw new IllegalStateException("Unknown kind " + _kind);
-		}
-	}
-
-	private FieldValue(Builder builder) {
-		this(builder._kind, builder._value);
-	}
-
-	private FieldValue(Kind kind, Object value) {
-		this._kind = ApiTypeHelper.requireNonNull(kind, this, "<variant kind>");
-		this._value = kind == Kind.Null ? null : ApiTypeHelper.requireNonNull(value, this, "<variant value>");
-	}
-
-	public static FieldValue of(Consumer<Builder> fn) {
-		Builder builder = new Builder();
-		fn.accept(builder);
-		return builder.build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code double}?
-	 */
-	public boolean isDouble() {
-		return _kind == Kind.Double;
-	}
-
-	/**
-	 * Get the {@code double} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code double} kind.
-	 */
-	public double doubleValue() {
-		return TaggedUnionUtils.get(this, Kind.Double);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code long}?
-	 */
-	public boolean isLong() {
-		return _kind == Kind.Long;
-	}
-
-	/**
-	 * Get the {@code long} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code long} kind.
-	 */
-	public long longValue() {
-		return TaggedUnionUtils.get(this, Kind.Long);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code boolean}?
-	 */
-	public boolean isBoolean() {
-		return _kind == Kind.Boolean;
-	}
-
-	/**
-	 * Get the {@code boolean} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code boolean} kind.
-	 */
-	public boolean booleanValue() {
-		return TaggedUnionUtils.get(this, Kind.Boolean);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code string}?
-	 */
-	public boolean isString() {
-		return _kind == Kind.String;
-	}
-
-	/**
-	 * Get the {@code string} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code string} kind.
-	 */
-	public String stringValue() {
-		return TaggedUnionUtils.get(this, Kind.String);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code null}?
-	 */
-	public boolean isNull() {
-		return _kind == Kind.Null;
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		switch (_kind) {
-			case Double :
-				generator.write(((Double) this._value));
-				break;
-			case Long :
-				generator.write(((Long) this._value));
-				break;
-			case Boolean :
-				generator.write(((Boolean) this._value));
-				break;
-			case String :
-				generator.write(((String) this._value));
-				break;
-			case Null :
-				generator.writeNull();
-				break;
-		}
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldValue> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<FieldValue> doubleValue(double v) {
-			this._kind = Kind.Double;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<FieldValue> longValue(long v) {
-			this._kind = Kind.Long;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<FieldValue> booleanValue(boolean v) {
-			this._kind = Kind.Boolean;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<FieldValue> stringValue(String v) {
-			this._kind = Kind.String;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<FieldValue> nullValue() {
-			this._kind = Kind.Null;
-			this._value = null;
-			return this;
-		}
-
-		public FieldValue build() {
-			_checkSingleUse();
-			return new FieldValue(this);
-		}
-	}
-
-	public static final JsonpDeserializer<FieldValue> _DESERIALIZER = JsonpDeserializer
-			.lazy(() -> JsonpDeserializer.of(
-					EnumSet.of(JsonParser.Event.VALUE_STRING, JsonParser.Event.VALUE_NUMBER,
-							JsonParser.Event.VALUE_NULL,
-							JsonParser.Event.VALUE_TRUE, JsonParser.Event.VALUE_FALSE),
-					(parser, mapper, event) -> {
-						switch (event) {
-							case VALUE_NULL :
-								return NULL;
-							case VALUE_STRING :
-								return FieldValue.of(parser.getString());
-							case VALUE_TRUE :
-								return FieldValue.of(true);
-							case VALUE_FALSE :
-								return FieldValue.of(false);
-							case VALUE_NUMBER :
-								if (parser.isIntegralNumber()) {
-									return FieldValue.of(parser.getLong());
-								} else {
-									return FieldValue.of(parser.getBigDecimal().doubleValue());
-								}
-						}
-						return null;
-					}));
+    public static FieldValue of(long value) {
+        return new FieldValue(Kind.Long, value);
+    }
+
+    public static FieldValue of(double value) {
+        return new FieldValue(Kind.Double, value);
+    }
+
+    public static FieldValue of(boolean value) {
+        return value ? TRUE : FALSE;
+    }
+
+    public static FieldValue of(String value) {
+        return new FieldValue(Kind.String, value);
+    }
+
+    public static final FieldValue NULL = new FieldValue(Kind.Null, null);
+    public static final FieldValue TRUE = new FieldValue(Kind.Boolean, Boolean.TRUE);
+    public static final FieldValue FALSE = new FieldValue(Kind.Boolean, Boolean.FALSE);
+
+    public enum Kind {
+        Double,
+        Long,
+        Boolean,
+        String,
+        Null
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    public String _toJsonString() {
+        switch (_kind) {
+            case Double:
+                return String.valueOf(this.doubleValue());
+            case Long:
+                return String.valueOf(this.longValue());
+            case Boolean:
+                return String.valueOf(this.booleanValue());
+            case String:
+                return this.stringValue();
+            case Null:
+                return "null";
+
+            default:
+                throw new IllegalStateException("Unknown kind " + _kind);
+        }
+    }
+
+    private FieldValue(Builder builder) {
+        this(builder._kind, builder._value);
+    }
+
+    private FieldValue(Kind kind, Object value) {
+        this._kind = ApiTypeHelper.requireNonNull(kind, this, "<variant kind>");
+        this._value = kind == Kind.Null ? null : ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+    }
+
+    public static FieldValue of(Consumer<Builder> fn) {
+        Builder builder = new Builder();
+        fn.accept(builder);
+        return builder.build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code double}?
+     */
+    public boolean isDouble() {
+        return _kind == Kind.Double;
+    }
+
+    /**
+     * Get the {@code double} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code double} kind.
+     */
+    public double doubleValue() {
+        return TaggedUnionUtils.get(this, Kind.Double);
+    }
+
+    /**
+     * Is this variant instance of kind {@code long}?
+     */
+    public boolean isLong() {
+        return _kind == Kind.Long;
+    }
+
+    /**
+     * Get the {@code long} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code long} kind.
+     */
+    public long longValue() {
+        return TaggedUnionUtils.get(this, Kind.Long);
+    }
+
+    /**
+     * Is this variant instance of kind {@code boolean}?
+     */
+    public boolean isBoolean() {
+        return _kind == Kind.Boolean;
+    }
+
+    /**
+     * Get the {@code boolean} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code boolean} kind.
+     */
+    public boolean booleanValue() {
+        return TaggedUnionUtils.get(this, Kind.Boolean);
+    }
+
+    /**
+     * Is this variant instance of kind {@code string}?
+     */
+    public boolean isString() {
+        return _kind == Kind.String;
+    }
+
+    /**
+     * Get the {@code string} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code string} kind.
+     */
+    public String stringValue() {
+        return TaggedUnionUtils.get(this, Kind.String);
+    }
+
+    /**
+     * Is this variant instance of kind {@code null}?
+     */
+    public boolean isNull() {
+        return _kind == Kind.Null;
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        switch (_kind) {
+            case Double:
+                generator.write(((Double) this._value));
+                break;
+            case Long:
+                generator.write(((Long) this._value));
+                break;
+            case Boolean:
+                generator.write(((Boolean) this._value));
+                break;
+            case String:
+                generator.write(((String) this._value));
+                break;
+            case Null:
+                generator.writeNull();
+                break;
+        }
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldValue> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<FieldValue> doubleValue(double v) {
+            this._kind = Kind.Double;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<FieldValue> longValue(long v) {
+            this._kind = Kind.Long;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<FieldValue> booleanValue(boolean v) {
+            this._kind = Kind.Boolean;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<FieldValue> stringValue(String v) {
+            this._kind = Kind.String;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<FieldValue> nullValue() {
+            this._kind = Kind.Null;
+            this._value = null;
+            return this;
+        }
+
+        public FieldValue build() {
+            _checkSingleUse();
+            return new FieldValue(this);
+        }
+    }
+
+    public static final JsonpDeserializer<FieldValue> _DESERIALIZER = JsonpDeserializer.lazy(
+        () -> JsonpDeserializer.of(
+            EnumSet.of(
+                JsonParser.Event.VALUE_STRING,
+                JsonParser.Event.VALUE_NUMBER,
+                JsonParser.Event.VALUE_NULL,
+                JsonParser.Event.VALUE_TRUE,
+                JsonParser.Event.VALUE_FALSE
+            ),
+            (parser, mapper, event) -> {
+                switch (event) {
+                    case VALUE_NULL:
+                        return NULL;
+                    case VALUE_STRING:
+                        return FieldValue.of(parser.getString());
+                    case VALUE_TRUE:
+                        return FieldValue.of(true);
+                    case VALUE_FALSE:
+                        return FieldValue.of(false);
+                    case VALUE_NUMBER:
+                        if (parser.isIntegralNumber()) {
+                            return FieldValue.of(parser.getLong());
+                        } else {
+                            return FieldValue.of(parser.getBigDecimal().doubleValue());
+                        }
+                }
+                return null;
+            }
+        )
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/FielddataStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/FielddataStats.java
index ea10424dd4..ece673c2b5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/FielddataStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/FielddataStats.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,208 +45,205 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.FielddataStats
 
 @JsonpDeserializable
 public class FielddataStats implements JsonpSerializable {
-	@Nullable
-	private final Long evictions;
+    @Nullable
+    private final Long evictions;
 
-	@Nullable
-	private final String memorySize;
+    @Nullable
+    private final String memorySize;
 
-	private final long memorySizeInBytes;
+    private final long memorySizeInBytes;
 
-	private final Map<String, FieldMemoryUsage> fields;
+    private final Map<String, FieldMemoryUsage> fields;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private FielddataStats(Builder builder) {
+    private FielddataStats(Builder builder) {
 
-		this.evictions = builder.evictions;
-		this.memorySize = builder.memorySize;
-		this.memorySizeInBytes = ApiTypeHelper.requireNonNull(builder.memorySizeInBytes, this, "memorySizeInBytes");
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.evictions = builder.evictions;
+        this.memorySize = builder.memorySize;
+        this.memorySizeInBytes = ApiTypeHelper.requireNonNull(builder.memorySizeInBytes, this, "memorySizeInBytes");
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
 
-	}
-
-	public static FielddataStats of(Function<Builder, ObjectBuilder<FielddataStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code evictions}
-	 */
-	@Nullable
-	public final Long evictions() {
-		return this.evictions;
-	}
-
-	/**
-	 * API name: {@code memory_size}
-	 */
-	@Nullable
-	public final String memorySize() {
-		return this.memorySize;
-	}
-
-	/**
-	 * Required - API name: {@code memory_size_in_bytes}
-	 */
-	public final long memorySizeInBytes() {
-		return this.memorySizeInBytes;
-	}
-
-	/**
-	 * API name: {@code fields}
-	 */
-	public final Map<String, FieldMemoryUsage> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.evictions != null) {
-			generator.writeKey("evictions");
-			generator.write(this.evictions);
-
-		}
-		if (this.memorySize != null) {
-			generator.writeKey("memory_size");
-			generator.write(this.memorySize);
-
-		}
-		generator.writeKey("memory_size_in_bytes");
-		generator.write(this.memorySizeInBytes);
-
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartObject();
-			for (Map.Entry<String, FieldMemoryUsage> item0 : this.fields.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FielddataStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FielddataStats> {
-		@Nullable
-		private Long evictions;
-
-		@Nullable
-		private String memorySize;
-
-		private Long memorySizeInBytes;
-
-		@Nullable
-		private Map<String, FieldMemoryUsage> fields;
-
-		/**
-		 * API name: {@code evictions}
-		 */
-		public final Builder evictions(@Nullable Long value) {
-			this.evictions = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code memory_size}
-		 */
-		public final Builder memorySize(@Nullable String value) {
-			this.memorySize = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code memory_size_in_bytes}
-		 */
-		public final Builder memorySizeInBytes(long value) {
-			this.memorySizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>fields</code>.
-		 */
-		public final Builder fields(Map<String, FieldMemoryUsage> map) {
-			this.fields = _mapPutAll(this.fields, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds an entry to <code>fields</code>.
-		 */
-		public final Builder fields(String key, FieldMemoryUsage value) {
-			this.fields = _mapPut(this.fields, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds an entry to <code>fields</code> using a builder lambda.
-		 */
-		public final Builder fields(String key,
-				Function<FieldMemoryUsage.Builder, ObjectBuilder<FieldMemoryUsage>> fn) {
-			return fields(key, fn.apply(new FieldMemoryUsage.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link FielddataStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FielddataStats build() {
-			_checkSingleUse();
-
-			return new FielddataStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FielddataStats}
-	 */
-	public static final JsonpDeserializer<FielddataStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FielddataStats::setupFielddataStatsDeserializer);
-
-	protected static void setupFielddataStatsDeserializer(ObjectDeserializer<FielddataStats.Builder> op) {
-
-		op.add(Builder::evictions, JsonpDeserializer.longDeserializer(), "evictions");
-		op.add(Builder::memorySize, JsonpDeserializer.stringDeserializer(), "memory_size");
-		op.add(Builder::memorySizeInBytes, JsonpDeserializer.longDeserializer(), "memory_size_in_bytes");
-		op.add(Builder::fields, JsonpDeserializer.stringMapDeserializer(FieldMemoryUsage._DESERIALIZER), "fields");
-
-	}
+    }
+
+    public static FielddataStats of(Function<Builder, ObjectBuilder<FielddataStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code evictions}
+     */
+    @Nullable
+    public final Long evictions() {
+        return this.evictions;
+    }
+
+    /**
+     * API name: {@code memory_size}
+     */
+    @Nullable
+    public final String memorySize() {
+        return this.memorySize;
+    }
+
+    /**
+     * Required - API name: {@code memory_size_in_bytes}
+     */
+    public final long memorySizeInBytes() {
+        return this.memorySizeInBytes;
+    }
+
+    /**
+     * API name: {@code fields}
+     */
+    public final Map<String, FieldMemoryUsage> fields() {
+        return this.fields;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.evictions != null) {
+            generator.writeKey("evictions");
+            generator.write(this.evictions);
+
+        }
+        if (this.memorySize != null) {
+            generator.writeKey("memory_size");
+            generator.write(this.memorySize);
+
+        }
+        generator.writeKey("memory_size_in_bytes");
+        generator.write(this.memorySizeInBytes);
+
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartObject();
+            for (Map.Entry<String, FieldMemoryUsage> item0 : this.fields.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FielddataStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FielddataStats> {
+        @Nullable
+        private Long evictions;
+
+        @Nullable
+        private String memorySize;
+
+        private Long memorySizeInBytes;
+
+        @Nullable
+        private Map<String, FieldMemoryUsage> fields;
+
+        /**
+         * API name: {@code evictions}
+         */
+        public final Builder evictions(@Nullable Long value) {
+            this.evictions = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code memory_size}
+         */
+        public final Builder memorySize(@Nullable String value) {
+            this.memorySize = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code memory_size_in_bytes}
+         */
+        public final Builder memorySizeInBytes(long value) {
+            this.memorySizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>fields</code>.
+         */
+        public final Builder fields(Map<String, FieldMemoryUsage> map) {
+            this.fields = _mapPutAll(this.fields, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds an entry to <code>fields</code>.
+         */
+        public final Builder fields(String key, FieldMemoryUsage value) {
+            this.fields = _mapPut(this.fields, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds an entry to <code>fields</code> using a builder lambda.
+         */
+        public final Builder fields(String key, Function<FieldMemoryUsage.Builder, ObjectBuilder<FieldMemoryUsage>> fn) {
+            return fields(key, fn.apply(new FieldMemoryUsage.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link FielddataStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FielddataStats build() {
+            _checkSingleUse();
+
+            return new FielddataStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FielddataStats}
+     */
+    public static final JsonpDeserializer<FielddataStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FielddataStats::setupFielddataStatsDeserializer
+    );
+
+    protected static void setupFielddataStatsDeserializer(ObjectDeserializer<FielddataStats.Builder> op) {
+
+        op.add(Builder::evictions, JsonpDeserializer.longDeserializer(), "evictions");
+        op.add(Builder::memorySize, JsonpDeserializer.stringDeserializer(), "memory_size");
+        op.add(Builder::memorySizeInBytes, JsonpDeserializer.longDeserializer(), "memory_size_in_bytes");
+        op.add(Builder::fields, JsonpDeserializer.stringMapDeserializer(FieldMemoryUsage._DESERIALIZER), "fields");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/FlushStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/FlushStats.java
index 2747d47c4d..709cc8f81e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/FlushStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/FlushStats.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,170 +44,169 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.FlushStats
 
 @JsonpDeserializable
 public class FlushStats implements JsonpSerializable {
-	private final long periodic;
+    private final long periodic;
 
-	private final long total;
+    private final long total;
 
-	@Nullable
-	private final String totalTime;
+    @Nullable
+    private final String totalTime;
 
-	private final long totalTimeInMillis;
+    private final long totalTimeInMillis;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private FlushStats(Builder builder) {
+    private FlushStats(Builder builder) {
 
-		this.periodic = ApiTypeHelper.requireNonNull(builder.periodic, this, "periodic");
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
-		this.totalTime = builder.totalTime;
-		this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
-
-	}
-
-	public static FlushStats of(Function<Builder, ObjectBuilder<FlushStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code periodic}
-	 */
-	public final long periodic() {
-		return this.periodic;
-	}
-
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final long total() {
-		return this.total;
-	}
-
-	/**
-	 * API name: {@code total_time}
-	 */
-	@Nullable
-	public final String totalTime() {
-		return this.totalTime;
-	}
-
-	/**
-	 * Required - API name: {@code total_time_in_millis}
-	 */
-	public final long totalTimeInMillis() {
-		return this.totalTimeInMillis;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("periodic");
-		generator.write(this.periodic);
-
-		generator.writeKey("total");
-		generator.write(this.total);
-
-		if (this.totalTime != null) {
-			generator.writeKey("total_time");
-			generator.write(this.totalTime);
-
-		}
-		generator.writeKey("total_time_in_millis");
-		generator.write(this.totalTimeInMillis);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FlushStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FlushStats> {
-		private Long periodic;
-
-		private Long total;
-
-		@Nullable
-		private String totalTime;
-
-		private Long totalTimeInMillis;
-
-		/**
-		 * Required - API name: {@code periodic}
-		 */
-		public final Builder periodic(long value) {
-			this.periodic = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(long value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total_time}
-		 */
-		public final Builder totalTime(@Nullable String value) {
-			this.totalTime = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_time_in_millis}
-		 */
-		public final Builder totalTimeInMillis(long value) {
-			this.totalTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FlushStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FlushStats build() {
-			_checkSingleUse();
-
-			return new FlushStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FlushStats}
-	 */
-	public static final JsonpDeserializer<FlushStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FlushStats::setupFlushStatsDeserializer);
-
-	protected static void setupFlushStatsDeserializer(ObjectDeserializer<FlushStats.Builder> op) {
-
-		op.add(Builder::periodic, JsonpDeserializer.longDeserializer(), "periodic");
-		op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
-		op.add(Builder::totalTime, JsonpDeserializer.stringDeserializer(), "total_time");
-		op.add(Builder::totalTimeInMillis, JsonpDeserializer.longDeserializer(), "total_time_in_millis");
-
-	}
+        this.periodic = ApiTypeHelper.requireNonNull(builder.periodic, this, "periodic");
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+        this.totalTime = builder.totalTime;
+        this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
+
+    }
+
+    public static FlushStats of(Function<Builder, ObjectBuilder<FlushStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code periodic}
+     */
+    public final long periodic() {
+        return this.periodic;
+    }
+
+    /**
+     * Required - API name: {@code total}
+     */
+    public final long total() {
+        return this.total;
+    }
+
+    /**
+     * API name: {@code total_time}
+     */
+    @Nullable
+    public final String totalTime() {
+        return this.totalTime;
+    }
+
+    /**
+     * Required - API name: {@code total_time_in_millis}
+     */
+    public final long totalTimeInMillis() {
+        return this.totalTimeInMillis;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("periodic");
+        generator.write(this.periodic);
+
+        generator.writeKey("total");
+        generator.write(this.total);
+
+        if (this.totalTime != null) {
+            generator.writeKey("total_time");
+            generator.write(this.totalTime);
+
+        }
+        generator.writeKey("total_time_in_millis");
+        generator.write(this.totalTimeInMillis);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FlushStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FlushStats> {
+        private Long periodic;
+
+        private Long total;
+
+        @Nullable
+        private String totalTime;
+
+        private Long totalTimeInMillis;
+
+        /**
+         * Required - API name: {@code periodic}
+         */
+        public final Builder periodic(long value) {
+            this.periodic = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(long value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total_time}
+         */
+        public final Builder totalTime(@Nullable String value) {
+            this.totalTime = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_time_in_millis}
+         */
+        public final Builder totalTimeInMillis(long value) {
+            this.totalTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link FlushStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FlushStats build() {
+            _checkSingleUse();
+
+            return new FlushStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FlushStats}
+     */
+    public static final JsonpDeserializer<FlushStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FlushStats::setupFlushStatsDeserializer
+    );
+
+    protected static void setupFlushStatsDeserializer(ObjectDeserializer<FlushStats.Builder> op) {
+
+        op.add(Builder::periodic, JsonpDeserializer.longDeserializer(), "periodic");
+        op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
+        op.add(Builder::totalTime, JsonpDeserializer.stringDeserializer(), "total_time");
+        op.add(Builder::totalTimeInMillis, JsonpDeserializer.longDeserializer(), "total_time_in_millis");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoBounds.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoBounds.java
index 7be1836e37..56f23b35d9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoBounds.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoBounds.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,8 +44,6 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.GeoBounds
 
@@ -60,177 +60,180 @@
 @JsonpDeserializable
 public class GeoBounds implements TaggedUnion<GeoBounds.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Coords, Tlbr, Trbl, Wkt
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private GeoBounds(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	private GeoBounds(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static GeoBounds of(Function<Builder, ObjectBuilder<GeoBounds>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code coords}?
-	 */
-	public boolean isCoords() {
-		return _kind == Kind.Coords;
-	}
-
-	/**
-	 * Get the {@code coords} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code coords} kind.
-	 */
-	public CoordsGeoBounds coords() {
-		return TaggedUnionUtils.get(this, Kind.Coords);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code tlbr}?
-	 */
-	public boolean isTlbr() {
-		return _kind == Kind.Tlbr;
-	}
-
-	/**
-	 * Get the {@code tlbr} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code tlbr} kind.
-	 */
-	public TopLeftBottomRightGeoBounds tlbr() {
-		return TaggedUnionUtils.get(this, Kind.Tlbr);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code trbl}?
-	 */
-	public boolean isTrbl() {
-		return _kind == Kind.Trbl;
-	}
-
-	/**
-	 * Get the {@code trbl} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code trbl} kind.
-	 */
-	public TopRightBottomLeftGeoBounds trbl() {
-		return TaggedUnionUtils.get(this, Kind.Trbl);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code wkt}?
-	 */
-	public boolean isWkt() {
-		return _kind == Kind.Wkt;
-	}
-
-	/**
-	 * Get the {@code wkt} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code wkt} kind.
-	 */
-	public WktGeoBounds wkt() {
-		return TaggedUnionUtils.get(this, Kind.Wkt);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoBounds> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<GeoBounds> coords(CoordsGeoBounds v) {
-			this._kind = Kind.Coords;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<GeoBounds> coords(Function<CoordsGeoBounds.Builder, ObjectBuilder<CoordsGeoBounds>> fn) {
-			return this.coords(fn.apply(new CoordsGeoBounds.Builder()).build());
-		}
-
-		public ObjectBuilder<GeoBounds> tlbr(TopLeftBottomRightGeoBounds v) {
-			this._kind = Kind.Tlbr;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<GeoBounds> tlbr(
-				Function<TopLeftBottomRightGeoBounds.Builder, ObjectBuilder<TopLeftBottomRightGeoBounds>> fn) {
-			return this.tlbr(fn.apply(new TopLeftBottomRightGeoBounds.Builder()).build());
-		}
-
-		public ObjectBuilder<GeoBounds> trbl(TopRightBottomLeftGeoBounds v) {
-			this._kind = Kind.Trbl;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<GeoBounds> trbl(
-				Function<TopRightBottomLeftGeoBounds.Builder, ObjectBuilder<TopRightBottomLeftGeoBounds>> fn) {
-			return this.trbl(fn.apply(new TopRightBottomLeftGeoBounds.Builder()).build());
-		}
-
-		public ObjectBuilder<GeoBounds> wkt(WktGeoBounds v) {
-			this._kind = Kind.Wkt;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<GeoBounds> wkt(Function<WktGeoBounds.Builder, ObjectBuilder<WktGeoBounds>> fn) {
-			return this.wkt(fn.apply(new WktGeoBounds.Builder()).build());
-		}
-
-		public GeoBounds build() {
-			_checkSingleUse();
-			return new GeoBounds(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<GeoBounds> buildGeoBoundsDeserializer() {
-		return new UnionDeserializer.Builder<GeoBounds, Kind, Object>(GeoBounds::new, false)
-				.addMember(Kind.Coords, CoordsGeoBounds._DESERIALIZER)
-				.addMember(Kind.Tlbr, TopLeftBottomRightGeoBounds._DESERIALIZER)
-				.addMember(Kind.Trbl, TopRightBottomLeftGeoBounds._DESERIALIZER)
-				.addMember(Kind.Wkt, WktGeoBounds._DESERIALIZER).build();
-	}
-
-	public static final JsonpDeserializer<GeoBounds> _DESERIALIZER = JsonpDeserializer
-			.lazy(GeoBounds::buildGeoBoundsDeserializer);
+    public enum Kind {
+        Coords,
+        Tlbr,
+        Trbl,
+        Wkt
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private GeoBounds(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private GeoBounds(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static GeoBounds of(Function<Builder, ObjectBuilder<GeoBounds>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code coords}?
+     */
+    public boolean isCoords() {
+        return _kind == Kind.Coords;
+    }
+
+    /**
+     * Get the {@code coords} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code coords} kind.
+     */
+    public CoordsGeoBounds coords() {
+        return TaggedUnionUtils.get(this, Kind.Coords);
+    }
+
+    /**
+     * Is this variant instance of kind {@code tlbr}?
+     */
+    public boolean isTlbr() {
+        return _kind == Kind.Tlbr;
+    }
+
+    /**
+     * Get the {@code tlbr} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code tlbr} kind.
+     */
+    public TopLeftBottomRightGeoBounds tlbr() {
+        return TaggedUnionUtils.get(this, Kind.Tlbr);
+    }
+
+    /**
+     * Is this variant instance of kind {@code trbl}?
+     */
+    public boolean isTrbl() {
+        return _kind == Kind.Trbl;
+    }
+
+    /**
+     * Get the {@code trbl} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code trbl} kind.
+     */
+    public TopRightBottomLeftGeoBounds trbl() {
+        return TaggedUnionUtils.get(this, Kind.Trbl);
+    }
+
+    /**
+     * Is this variant instance of kind {@code wkt}?
+     */
+    public boolean isWkt() {
+        return _kind == Kind.Wkt;
+    }
+
+    /**
+     * Get the {@code wkt} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code wkt} kind.
+     */
+    public WktGeoBounds wkt() {
+        return TaggedUnionUtils.get(this, Kind.Wkt);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoBounds> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<GeoBounds> coords(CoordsGeoBounds v) {
+            this._kind = Kind.Coords;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<GeoBounds> coords(Function<CoordsGeoBounds.Builder, ObjectBuilder<CoordsGeoBounds>> fn) {
+            return this.coords(fn.apply(new CoordsGeoBounds.Builder()).build());
+        }
+
+        public ObjectBuilder<GeoBounds> tlbr(TopLeftBottomRightGeoBounds v) {
+            this._kind = Kind.Tlbr;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<GeoBounds> tlbr(Function<TopLeftBottomRightGeoBounds.Builder, ObjectBuilder<TopLeftBottomRightGeoBounds>> fn) {
+            return this.tlbr(fn.apply(new TopLeftBottomRightGeoBounds.Builder()).build());
+        }
+
+        public ObjectBuilder<GeoBounds> trbl(TopRightBottomLeftGeoBounds v) {
+            this._kind = Kind.Trbl;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<GeoBounds> trbl(Function<TopRightBottomLeftGeoBounds.Builder, ObjectBuilder<TopRightBottomLeftGeoBounds>> fn) {
+            return this.trbl(fn.apply(new TopRightBottomLeftGeoBounds.Builder()).build());
+        }
+
+        public ObjectBuilder<GeoBounds> wkt(WktGeoBounds v) {
+            this._kind = Kind.Wkt;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<GeoBounds> wkt(Function<WktGeoBounds.Builder, ObjectBuilder<WktGeoBounds>> fn) {
+            return this.wkt(fn.apply(new WktGeoBounds.Builder()).build());
+        }
+
+        public GeoBounds build() {
+            _checkSingleUse();
+            return new GeoBounds(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<GeoBounds> buildGeoBoundsDeserializer() {
+        return new UnionDeserializer.Builder<GeoBounds, Kind, Object>(GeoBounds::new, false).addMember(
+            Kind.Coords,
+            CoordsGeoBounds._DESERIALIZER
+        )
+            .addMember(Kind.Tlbr, TopLeftBottomRightGeoBounds._DESERIALIZER)
+            .addMember(Kind.Trbl, TopRightBottomLeftGeoBounds._DESERIALIZER)
+            .addMember(Kind.Wkt, WktGeoBounds._DESERIALIZER)
+            .build();
+    }
+
+    public static final JsonpDeserializer<GeoBounds> _DESERIALIZER = JsonpDeserializer.lazy(GeoBounds::buildGeoBoundsDeserializer);
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoBoundsBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoBoundsBuilders.java
index 5c8c63f16c..614522f557 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoBoundsBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoBoundsBuilders.java
@@ -36,38 +36,37 @@
  * Builders for {@link GeoBounds} variants.
  */
 public class GeoBoundsBuilders {
-	private GeoBoundsBuilders() {
-	}
+    private GeoBoundsBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link CoordsGeoBounds coords} {@code GeoBounds}
-	 * variant.
-	 */
-	public static CoordsGeoBounds.Builder coords() {
-		return new CoordsGeoBounds.Builder();
-	}
+    /**
+     * Creates a builder for the {@link CoordsGeoBounds coords} {@code GeoBounds}
+     * variant.
+     */
+    public static CoordsGeoBounds.Builder coords() {
+        return new CoordsGeoBounds.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link TopLeftBottomRightGeoBounds tlbr}
-	 * {@code GeoBounds} variant.
-	 */
-	public static TopLeftBottomRightGeoBounds.Builder tlbr() {
-		return new TopLeftBottomRightGeoBounds.Builder();
-	}
+    /**
+     * Creates a builder for the {@link TopLeftBottomRightGeoBounds tlbr}
+     * {@code GeoBounds} variant.
+     */
+    public static TopLeftBottomRightGeoBounds.Builder tlbr() {
+        return new TopLeftBottomRightGeoBounds.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link TopRightBottomLeftGeoBounds trbl}
-	 * {@code GeoBounds} variant.
-	 */
-	public static TopRightBottomLeftGeoBounds.Builder trbl() {
-		return new TopRightBottomLeftGeoBounds.Builder();
-	}
+    /**
+     * Creates a builder for the {@link TopRightBottomLeftGeoBounds trbl}
+     * {@code GeoBounds} variant.
+     */
+    public static TopRightBottomLeftGeoBounds.Builder trbl() {
+        return new TopRightBottomLeftGeoBounds.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link WktGeoBounds wkt} {@code GeoBounds} variant.
-	 */
-	public static WktGeoBounds.Builder wkt() {
-		return new WktGeoBounds.Builder();
-	}
+    /**
+     * Creates a builder for the {@link WktGeoBounds wkt} {@code GeoBounds} variant.
+     */
+    public static WktGeoBounds.Builder wkt() {
+        return new WktGeoBounds.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoDistanceSort.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoDistanceSort.java
index c08ae130a6..6aaa338fb3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoDistanceSort.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoDistanceSort.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,289 +45,286 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.GeoDistanceSort
 
 @JsonpDeserializable
 public class GeoDistanceSort implements SortOptionsVariant, JsonpSerializable {
-	private final String field;
-
-	private final List<GeoLocation> location;
-
-	@Nullable
-	private final SortMode mode;
-
-	@Nullable
-	private final GeoDistanceType distanceType;
-
-	@Nullable
-	private final Boolean ignoreUnmapped;
-
-	@Nullable
-	private final SortOrder order;
-
-	@Nullable
-	private final DistanceUnit unit;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoDistanceSort(Builder builder) {
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.location = ApiTypeHelper.unmodifiableRequired(builder.location, this, "location");
-
-		this.mode = builder.mode;
-		this.distanceType = builder.distanceType;
-		this.ignoreUnmapped = builder.ignoreUnmapped;
-		this.order = builder.order;
-		this.unit = builder.unit;
-
-	}
-
-	public static GeoDistanceSort of(Function<Builder, ObjectBuilder<GeoDistanceSort>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * SortOptions variant kind.
-	 */
-	@Override
-	public SortOptions.Kind _sortOptionsKind() {
-		return SortOptions.Kind.GeoDistance;
-	}
-
-	/**
-	 * Required -
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required -
-	 */
-	public final List<GeoLocation> location() {
-		return this.location;
-	}
-
-	/**
-	 * API name: {@code mode}
-	 */
-	@Nullable
-	public final SortMode mode() {
-		return this.mode;
-	}
-
-	/**
-	 * API name: {@code distance_type}
-	 */
-	@Nullable
-	public final GeoDistanceType distanceType() {
-		return this.distanceType;
-	}
-
-	/**
-	 * API name: {@code ignore_unmapped}
-	 */
-	@Nullable
-	public final Boolean ignoreUnmapped() {
-		return this.ignoreUnmapped;
-	}
-
-	/**
-	 * API name: {@code order}
-	 */
-	@Nullable
-	public final SortOrder order() {
-		return this.order;
-	}
-
-	/**
-	 * API name: {@code unit}
-	 */
-	@Nullable
-	public final DistanceUnit unit() {
-		return this.unit;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeKey(this.field);
-		generator.writeStartArray();
-		for (GeoLocation item0 : this.location) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-		if (this.mode != null) {
-			generator.writeKey("mode");
-			this.mode.serialize(generator, mapper);
-		}
-		if (this.distanceType != null) {
-			generator.writeKey("distance_type");
-			this.distanceType.serialize(generator, mapper);
-		}
-		if (this.ignoreUnmapped != null) {
-			generator.writeKey("ignore_unmapped");
-			generator.write(this.ignoreUnmapped);
-
-		}
-		if (this.order != null) {
-			generator.writeKey("order");
-			this.order.serialize(generator, mapper);
-		}
-		if (this.unit != null) {
-			generator.writeKey("unit");
-			this.unit.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoDistanceSort}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoDistanceSort> {
-		private String field;
-
-		private List<GeoLocation> location;
-
-		/**
-		 * Required -
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required - Adds all elements of <code>list</code> to <code>location</code>.
-		 */
-		public final Builder location(List<GeoLocation> list) {
-			this.location = _listAddAll(this.location, list);
-			return this;
-		}
-
-		/**
-		 * Required - Adds one or more values to <code>location</code>.
-		 */
-		public final Builder location(GeoLocation value, GeoLocation... values) {
-			this.location = _listAdd(this.location, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Adds a value to <code>location</code> using a builder lambda.
-		 */
-		public final Builder location(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
-			return location(fn.apply(new GeoLocation.Builder()).build());
-		}
-
-		@Nullable
-		private SortMode mode;
-
-		@Nullable
-		private GeoDistanceType distanceType;
-
-		@Nullable
-		private Boolean ignoreUnmapped;
-
-		@Nullable
-		private SortOrder order;
-
-		@Nullable
-		private DistanceUnit unit;
-
-		/**
-		 * API name: {@code mode}
-		 */
-		public final Builder mode(@Nullable SortMode value) {
-			this.mode = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code distance_type}
-		 */
-		public final Builder distanceType(@Nullable GeoDistanceType value) {
-			this.distanceType = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_unmapped}
-		 */
-		public final Builder ignoreUnmapped(@Nullable Boolean value) {
-			this.ignoreUnmapped = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code order}
-		 */
-		public final Builder order(@Nullable SortOrder value) {
-			this.order = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code unit}
-		 */
-		public final Builder unit(@Nullable DistanceUnit value) {
-			this.unit = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoDistanceSort}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoDistanceSort build() {
-			_checkSingleUse();
-
-			return new GeoDistanceSort(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoDistanceSort}
-	 */
-	public static final JsonpDeserializer<GeoDistanceSort> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GeoDistanceSort::setupGeoDistanceSortDeserializer);
-
-	protected static void setupGeoDistanceSortDeserializer(ObjectDeserializer<GeoDistanceSort.Builder> op) {
-
-		op.add(Builder::mode, SortMode._DESERIALIZER, "mode");
-		op.add(Builder::distanceType, GeoDistanceType._DESERIALIZER, "distance_type");
-		op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
-		op.add(Builder::order, SortOrder._DESERIALIZER, "order");
-		op.add(Builder::unit, DistanceUnit._DESERIALIZER, "unit");
-
-		op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
-			builder.field(name);
-			builder.location(
-					JsonpDeserializer.arrayDeserializer(GeoLocation._DESERIALIZER).deserialize(parser, mapper));
-		});
-
-	}
+    private final String field;
+
+    private final List<GeoLocation> location;
+
+    @Nullable
+    private final SortMode mode;
+
+    @Nullable
+    private final GeoDistanceType distanceType;
+
+    @Nullable
+    private final Boolean ignoreUnmapped;
+
+    @Nullable
+    private final SortOrder order;
+
+    @Nullable
+    private final DistanceUnit unit;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoDistanceSort(Builder builder) {
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.location = ApiTypeHelper.unmodifiableRequired(builder.location, this, "location");
+
+        this.mode = builder.mode;
+        this.distanceType = builder.distanceType;
+        this.ignoreUnmapped = builder.ignoreUnmapped;
+        this.order = builder.order;
+        this.unit = builder.unit;
+
+    }
+
+    public static GeoDistanceSort of(Function<Builder, ObjectBuilder<GeoDistanceSort>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * SortOptions variant kind.
+     */
+    @Override
+    public SortOptions.Kind _sortOptionsKind() {
+        return SortOptions.Kind.GeoDistance;
+    }
+
+    /**
+     * Required -
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required -
+     */
+    public final List<GeoLocation> location() {
+        return this.location;
+    }
+
+    /**
+     * API name: {@code mode}
+     */
+    @Nullable
+    public final SortMode mode() {
+        return this.mode;
+    }
+
+    /**
+     * API name: {@code distance_type}
+     */
+    @Nullable
+    public final GeoDistanceType distanceType() {
+        return this.distanceType;
+    }
+
+    /**
+     * API name: {@code ignore_unmapped}
+     */
+    @Nullable
+    public final Boolean ignoreUnmapped() {
+        return this.ignoreUnmapped;
+    }
+
+    /**
+     * API name: {@code order}
+     */
+    @Nullable
+    public final SortOrder order() {
+        return this.order;
+    }
+
+    /**
+     * API name: {@code unit}
+     */
+    @Nullable
+    public final DistanceUnit unit() {
+        return this.unit;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeKey(this.field);
+        generator.writeStartArray();
+        for (GeoLocation item0 : this.location) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+        if (this.mode != null) {
+            generator.writeKey("mode");
+            this.mode.serialize(generator, mapper);
+        }
+        if (this.distanceType != null) {
+            generator.writeKey("distance_type");
+            this.distanceType.serialize(generator, mapper);
+        }
+        if (this.ignoreUnmapped != null) {
+            generator.writeKey("ignore_unmapped");
+            generator.write(this.ignoreUnmapped);
+
+        }
+        if (this.order != null) {
+            generator.writeKey("order");
+            this.order.serialize(generator, mapper);
+        }
+        if (this.unit != null) {
+            generator.writeKey("unit");
+            this.unit.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoDistanceSort}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoDistanceSort> {
+        private String field;
+
+        private List<GeoLocation> location;
+
+        /**
+         * Required -
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required - Adds all elements of <code>list</code> to <code>location</code>.
+         */
+        public final Builder location(List<GeoLocation> list) {
+            this.location = _listAddAll(this.location, list);
+            return this;
+        }
+
+        /**
+         * Required - Adds one or more values to <code>location</code>.
+         */
+        public final Builder location(GeoLocation value, GeoLocation... values) {
+            this.location = _listAdd(this.location, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Adds a value to <code>location</code> using a builder lambda.
+         */
+        public final Builder location(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
+            return location(fn.apply(new GeoLocation.Builder()).build());
+        }
+
+        @Nullable
+        private SortMode mode;
+
+        @Nullable
+        private GeoDistanceType distanceType;
+
+        @Nullable
+        private Boolean ignoreUnmapped;
+
+        @Nullable
+        private SortOrder order;
+
+        @Nullable
+        private DistanceUnit unit;
+
+        /**
+         * API name: {@code mode}
+         */
+        public final Builder mode(@Nullable SortMode value) {
+            this.mode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code distance_type}
+         */
+        public final Builder distanceType(@Nullable GeoDistanceType value) {
+            this.distanceType = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_unmapped}
+         */
+        public final Builder ignoreUnmapped(@Nullable Boolean value) {
+            this.ignoreUnmapped = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code order}
+         */
+        public final Builder order(@Nullable SortOrder value) {
+            this.order = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code unit}
+         */
+        public final Builder unit(@Nullable DistanceUnit value) {
+            this.unit = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoDistanceSort}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoDistanceSort build() {
+            _checkSingleUse();
+
+            return new GeoDistanceSort(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoDistanceSort}
+     */
+    public static final JsonpDeserializer<GeoDistanceSort> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoDistanceSort::setupGeoDistanceSortDeserializer
+    );
+
+    protected static void setupGeoDistanceSortDeserializer(ObjectDeserializer<GeoDistanceSort.Builder> op) {
+
+        op.add(Builder::mode, SortMode._DESERIALIZER, "mode");
+        op.add(Builder::distanceType, GeoDistanceType._DESERIALIZER, "distance_type");
+        op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
+        op.add(Builder::order, SortOrder._DESERIALIZER, "order");
+        op.add(Builder::unit, DistanceUnit._DESERIALIZER, "unit");
+
+        op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
+            builder.field(name);
+            builder.location(JsonpDeserializer.arrayDeserializer(GeoLocation._DESERIALIZER).deserialize(parser, mapper));
+        });
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoDistanceType.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoDistanceType.java
index f9b0266251..ff616f352f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoDistanceType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoDistanceType.java
@@ -37,22 +37,21 @@
 
 @JsonpDeserializable
 public enum GeoDistanceType implements JsonEnum {
-	Arc("arc"),
+    Arc("arc"),
 
-	Plane("plane"),
+    Plane("plane"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	GeoDistanceType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    GeoDistanceType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<GeoDistanceType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			GeoDistanceType.values());
+    public static final JsonEnum.Deserializer<GeoDistanceType> _DESERIALIZER = new JsonEnum.Deserializer<>(GeoDistanceType.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoHashLocation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoHashLocation.java
index 47ba815a26..ddb345f60d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoHashLocation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoHashLocation.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,92 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.GeoHashLocation
 
 @JsonpDeserializable
 public class GeoHashLocation implements JsonpSerializable {
-	private final String geohash;
+    private final String geohash;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private GeoHashLocation(Builder builder) {
+    private GeoHashLocation(Builder builder) {
 
-		this.geohash = ApiTypeHelper.requireNonNull(builder.geohash, this, "geohash");
+        this.geohash = ApiTypeHelper.requireNonNull(builder.geohash, this, "geohash");
 
-	}
+    }
 
-	public static GeoHashLocation of(Function<Builder, ObjectBuilder<GeoHashLocation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static GeoHashLocation of(Function<Builder, ObjectBuilder<GeoHashLocation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code geohash}
-	 */
-	public final String geohash() {
-		return this.geohash;
-	}
+    /**
+     * Required - API name: {@code geohash}
+     */
+    public final String geohash() {
+        return this.geohash;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("geohash");
-		generator.write(this.geohash);
+        generator.writeKey("geohash");
+        generator.write(this.geohash);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link GeoHashLocation}.
-	 */
+    /**
+     * Builder for {@link GeoHashLocation}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoHashLocation> {
-		private String geohash;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoHashLocation> {
+        private String geohash;
 
-		/**
-		 * Required - API name: {@code geohash}
-		 */
-		public final Builder geohash(String value) {
-			this.geohash = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code geohash}
+         */
+        public final Builder geohash(String value) {
+            this.geohash = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link GeoHashLocation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoHashLocation build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link GeoHashLocation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoHashLocation build() {
+            _checkSingleUse();
 
-			return new GeoHashLocation(this);
-		}
-	}
+            return new GeoHashLocation(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link GeoHashLocation}
-	 */
-	public static final JsonpDeserializer<GeoHashLocation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GeoHashLocation::setupGeoHashLocationDeserializer);
+    /**
+     * Json deserializer for {@link GeoHashLocation}
+     */
+    public static final JsonpDeserializer<GeoHashLocation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoHashLocation::setupGeoHashLocationDeserializer
+    );
 
-	protected static void setupGeoHashLocationDeserializer(ObjectDeserializer<GeoHashLocation.Builder> op) {
+    protected static void setupGeoHashLocationDeserializer(ObjectDeserializer<GeoHashLocation.Builder> op) {
 
-		op.add(Builder::geohash, JsonpDeserializer.stringDeserializer(), "geohash");
+        op.add(Builder::geohash, JsonpDeserializer.stringDeserializer(), "geohash");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoHashPrecision.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoHashPrecision.java
index 9ab1939d53..0b25072c7e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoHashPrecision.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoHashPrecision.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,147 +44,148 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.GeoHashPrecision
 
 /**
  * A precision that can be expressed as a geohash length between 1 and 12, or a
  * distance measure like &quot;1km&quot;, &quot;10m&quot;.
- * 
+ *
  */
 @JsonpDeserializable
 public class GeoHashPrecision implements TaggedUnion<GeoHashPrecision.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		GeohashLength, Distance
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private GeoHashPrecision(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	public String _toJsonString() {
-		switch (_kind) {
-			case GeohashLength :
-				return this.geohashLength().toString();
-			case Distance :
-				return this.distance();
-
-			default :
-				throw new IllegalStateException("Unknown kind " + _kind);
-		}
-	}
-
-	private GeoHashPrecision(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static GeoHashPrecision of(Function<Builder, ObjectBuilder<GeoHashPrecision>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geohash_length}?
-	 */
-	public boolean isGeohashLength() {
-		return _kind == Kind.GeohashLength;
-	}
-
-	/**
-	 * Get the {@code geohash_length} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geohash_length} kind.
-	 */
-	public Number geohashLength() {
-		return TaggedUnionUtils.get(this, Kind.GeohashLength);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code distance}?
-	 */
-	public boolean isDistance() {
-		return _kind == Kind.Distance;
-	}
-
-	/**
-	 * Get the {@code distance} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code distance} kind.
-	 */
-	public String distance() {
-		return TaggedUnionUtils.get(this, Kind.Distance);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case GeohashLength :
-					generator.write(((Number) this._value).doubleValue());
-
-					break;
-				case Distance :
-					generator.write(((String) this._value));
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoHashPrecision> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<GeoHashPrecision> geohashLength(Number v) {
-			this._kind = Kind.GeohashLength;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<GeoHashPrecision> distance(String v) {
-			this._kind = Kind.Distance;
-			this._value = v;
-			return this;
-		}
-
-		public GeoHashPrecision build() {
-			_checkSingleUse();
-			return new GeoHashPrecision(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<GeoHashPrecision> buildGeoHashPrecisionDeserializer() {
-		return new UnionDeserializer.Builder<GeoHashPrecision, Kind, Object>(GeoHashPrecision::new, false)
-				.addMember(Kind.GeohashLength, JsonpDeserializer.numberDeserializer())
-				.addMember(Kind.Distance, JsonpDeserializer.stringDeserializer()).build();
-	}
-
-	public static final JsonpDeserializer<GeoHashPrecision> _DESERIALIZER = JsonpDeserializer
-			.lazy(GeoHashPrecision::buildGeoHashPrecisionDeserializer);
+    public enum Kind {
+        GeohashLength,
+        Distance
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private GeoHashPrecision(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    public String _toJsonString() {
+        switch (_kind) {
+            case GeohashLength:
+                return this.geohashLength().toString();
+            case Distance:
+                return this.distance();
+
+            default:
+                throw new IllegalStateException("Unknown kind " + _kind);
+        }
+    }
+
+    private GeoHashPrecision(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static GeoHashPrecision of(Function<Builder, ObjectBuilder<GeoHashPrecision>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code geohash_length}?
+     */
+    public boolean isGeohashLength() {
+        return _kind == Kind.GeohashLength;
+    }
+
+    /**
+     * Get the {@code geohash_length} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geohash_length} kind.
+     */
+    public Number geohashLength() {
+        return TaggedUnionUtils.get(this, Kind.GeohashLength);
+    }
+
+    /**
+     * Is this variant instance of kind {@code distance}?
+     */
+    public boolean isDistance() {
+        return _kind == Kind.Distance;
+    }
+
+    /**
+     * Get the {@code distance} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code distance} kind.
+     */
+    public String distance() {
+        return TaggedUnionUtils.get(this, Kind.Distance);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case GeohashLength:
+                    generator.write(((Number) this._value).doubleValue());
+
+                    break;
+                case Distance:
+                    generator.write(((String) this._value));
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoHashPrecision> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<GeoHashPrecision> geohashLength(Number v) {
+            this._kind = Kind.GeohashLength;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<GeoHashPrecision> distance(String v) {
+            this._kind = Kind.Distance;
+            this._value = v;
+            return this;
+        }
+
+        public GeoHashPrecision build() {
+            _checkSingleUse();
+            return new GeoHashPrecision(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<GeoHashPrecision> buildGeoHashPrecisionDeserializer() {
+        return new UnionDeserializer.Builder<GeoHashPrecision, Kind, Object>(GeoHashPrecision::new, false).addMember(
+            Kind.GeohashLength,
+            JsonpDeserializer.numberDeserializer()
+        ).addMember(Kind.Distance, JsonpDeserializer.stringDeserializer()).build();
+    }
+
+    public static final JsonpDeserializer<GeoHashPrecision> _DESERIALIZER = JsonpDeserializer.lazy(
+        GeoHashPrecision::buildGeoHashPrecisionDeserializer
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoHashPrecisionBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoHashPrecisionBuilders.java
index 1a635a467c..be883f856f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoHashPrecisionBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoHashPrecisionBuilders.java
@@ -38,10 +38,9 @@
  * Variants <code>geohash_length</code>, <code>distance</code> are not available
  * here as they don't have a dedicated class. Use {@link GeoHashPrecision}'s
  * builder for these.
- * 
+ *
  */
 public class GeoHashPrecisionBuilders {
-	private GeoHashPrecisionBuilders() {
-	}
+    private GeoHashPrecisionBuilders() {}
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoLine.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoLine.java
index 872218cbf2..0b21c874f9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoLine.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoLine.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,159 +44,161 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _types.GeoLine
 
 /**
  * A GeoJson GeoLine.
- * 
+ *
  */
 @JsonpDeserializable
 public class GeoLine implements JsonpSerializable {
-	private final String type;
-
-	private final List<List<Double>> coordinates;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoLine(Builder builder) {
-
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-		this.coordinates = ApiTypeHelper.unmodifiableRequired(builder.coordinates, this, "coordinates");
-
-	}
-
-	public static GeoLine of(Function<Builder, ObjectBuilder<GeoLine>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Always <code>&quot;LineString&quot;</code>
-	 * <p>
-	 * API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * Required - Array of <code>[lon, lat]</code> coordinates
-	 * <p>
-	 * API name: {@code coordinates}
-	 */
-	public final List<List<Double>> coordinates() {
-		return this.coordinates;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("type");
-		generator.write(this.type);
-
-		if (ApiTypeHelper.isDefined(this.coordinates)) {
-			generator.writeKey("coordinates");
-			generator.writeStartArray();
-			for (List<Double> item0 : this.coordinates) {
-				generator.writeStartArray();
-				if (item0 != null) {
-					for (Double item1 : item0) {
-						generator.write(item1);
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoLine}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoLine> {
-		private String type;
-
-		private List<List<Double>> coordinates;
-
-		/**
-		 * Required - Always <code>&quot;LineString&quot;</code>
-		 * <p>
-		 * API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Required - Array of <code>[lon, lat]</code> coordinates
-		 * <p>
-		 * API name: {@code coordinates}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>coordinates</code>.
-		 */
-		public final Builder coordinates(List<List<Double>> list) {
-			this.coordinates = _listAddAll(this.coordinates, list);
-			return this;
-		}
-
-		/**
-		 * Required - Array of <code>[lon, lat]</code> coordinates
-		 * <p>
-		 * API name: {@code coordinates}
-		 * <p>
-		 * Adds one or more values to <code>coordinates</code>.
-		 */
-		public final Builder coordinates(List<Double> value, List<Double>... values) {
-			this.coordinates = _listAdd(this.coordinates, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoLine}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoLine build() {
-			_checkSingleUse();
-
-			return new GeoLine(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoLine}
-	 */
-	public static final JsonpDeserializer<GeoLine> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GeoLine::setupGeoLineDeserializer);
-
-	protected static void setupGeoLineDeserializer(ObjectDeserializer<GeoLine.Builder> op) {
-
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-		op.add(Builder::coordinates, JsonpDeserializer.arrayDeserializer(
-				JsonpDeserializer.arrayDeserializer(JsonpDeserializer.doubleDeserializer())), "coordinates");
-
-	}
+    private final String type;
+
+    private final List<List<Double>> coordinates;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoLine(Builder builder) {
+
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.coordinates = ApiTypeHelper.unmodifiableRequired(builder.coordinates, this, "coordinates");
+
+    }
+
+    public static GeoLine of(Function<Builder, ObjectBuilder<GeoLine>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Always <code>&quot;LineString&quot;</code>
+     * <p>
+     * API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * Required - Array of <code>[lon, lat]</code> coordinates
+     * <p>
+     * API name: {@code coordinates}
+     */
+    public final List<List<Double>> coordinates() {
+        return this.coordinates;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("type");
+        generator.write(this.type);
+
+        if (ApiTypeHelper.isDefined(this.coordinates)) {
+            generator.writeKey("coordinates");
+            generator.writeStartArray();
+            for (List<Double> item0 : this.coordinates) {
+                generator.writeStartArray();
+                if (item0 != null) {
+                    for (Double item1 : item0) {
+                        generator.write(item1);
+
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoLine}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoLine> {
+        private String type;
+
+        private List<List<Double>> coordinates;
+
+        /**
+         * Required - Always <code>&quot;LineString&quot;</code>
+         * <p>
+         * API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Required - Array of <code>[lon, lat]</code> coordinates
+         * <p>
+         * API name: {@code coordinates}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>coordinates</code>.
+         */
+        public final Builder coordinates(List<List<Double>> list) {
+            this.coordinates = _listAddAll(this.coordinates, list);
+            return this;
+        }
+
+        /**
+         * Required - Array of <code>[lon, lat]</code> coordinates
+         * <p>
+         * API name: {@code coordinates}
+         * <p>
+         * Adds one or more values to <code>coordinates</code>.
+         */
+        public final Builder coordinates(List<Double> value, List<Double>... values) {
+            this.coordinates = _listAdd(this.coordinates, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoLine}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoLine build() {
+            _checkSingleUse();
+
+            return new GeoLine(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoLine}
+     */
+    public static final JsonpDeserializer<GeoLine> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoLine::setupGeoLineDeserializer
+    );
+
+    protected static void setupGeoLineDeserializer(ObjectDeserializer<GeoLine.Builder> op) {
+
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+        op.add(
+            Builder::coordinates,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.arrayDeserializer(JsonpDeserializer.doubleDeserializer())),
+            "coordinates"
+        );
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoLocation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoLocation.java
index 41a8a107a0..f04f86d802 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoLocation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoLocation.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,9 +45,6 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _types.GeoLocation
 
@@ -63,185 +63,188 @@
 @JsonpDeserializable
 public class GeoLocation implements TaggedUnion<GeoLocation.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Coords, Geohash, Latlon, Text
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private GeoLocation(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	private GeoLocation(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static GeoLocation of(Function<Builder, ObjectBuilder<GeoLocation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code coords}?
-	 */
-	public boolean isCoords() {
-		return _kind == Kind.Coords;
-	}
-
-	/**
-	 * Get the {@code coords} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code coords} kind.
-	 */
-	public List<Double> coords() {
-		return TaggedUnionUtils.get(this, Kind.Coords);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geohash}?
-	 */
-	public boolean isGeohash() {
-		return _kind == Kind.Geohash;
-	}
-
-	/**
-	 * Get the {@code geohash} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geohash} kind.
-	 */
-	public GeoHashLocation geohash() {
-		return TaggedUnionUtils.get(this, Kind.Geohash);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code latlon}?
-	 */
-	public boolean isLatlon() {
-		return _kind == Kind.Latlon;
-	}
-
-	/**
-	 * Get the {@code latlon} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code latlon} kind.
-	 */
-	public LatLonGeoLocation latlon() {
-		return TaggedUnionUtils.get(this, Kind.Latlon);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code text}?
-	 */
-	public boolean isText() {
-		return _kind == Kind.Text;
-	}
-
-	/**
-	 * Get the {@code text} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code text} kind.
-	 */
-	public String text() {
-		return TaggedUnionUtils.get(this, Kind.Text);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Coords :
-					generator.writeStartArray();
-					for (Double item0 : ((List<Double>) this._value)) {
-						generator.write(item0);
-
-					}
-					generator.writeEnd();
-
-					break;
-				case Text :
-					generator.write(((String) this._value));
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoLocation> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<GeoLocation> coords(List<Double> v) {
-			this._kind = Kind.Coords;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<GeoLocation> geohash(GeoHashLocation v) {
-			this._kind = Kind.Geohash;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<GeoLocation> geohash(
-				Function<GeoHashLocation.Builder, ObjectBuilder<GeoHashLocation>> fn) {
-			return this.geohash(fn.apply(new GeoHashLocation.Builder()).build());
-		}
-
-		public ObjectBuilder<GeoLocation> latlon(LatLonGeoLocation v) {
-			this._kind = Kind.Latlon;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<GeoLocation> latlon(
-				Function<LatLonGeoLocation.Builder, ObjectBuilder<LatLonGeoLocation>> fn) {
-			return this.latlon(fn.apply(new LatLonGeoLocation.Builder()).build());
-		}
-
-		public ObjectBuilder<GeoLocation> text(String v) {
-			this._kind = Kind.Text;
-			this._value = v;
-			return this;
-		}
-
-		public GeoLocation build() {
-			_checkSingleUse();
-			return new GeoLocation(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<GeoLocation> buildGeoLocationDeserializer() {
-		return new UnionDeserializer.Builder<GeoLocation, Kind, Object>(GeoLocation::new, false)
-				.addMember(Kind.Coords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.doubleDeserializer()))
-				.addMember(Kind.Geohash, GeoHashLocation._DESERIALIZER)
-				.addMember(Kind.Latlon, LatLonGeoLocation._DESERIALIZER)
-				.addMember(Kind.Text, JsonpDeserializer.stringDeserializer()).build();
-	}
-
-	public static final JsonpDeserializer<GeoLocation> _DESERIALIZER = JsonpDeserializer
-			.lazy(GeoLocation::buildGeoLocationDeserializer);
+    public enum Kind {
+        Coords,
+        Geohash,
+        Latlon,
+        Text
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private GeoLocation(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private GeoLocation(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static GeoLocation of(Function<Builder, ObjectBuilder<GeoLocation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code coords}?
+     */
+    public boolean isCoords() {
+        return _kind == Kind.Coords;
+    }
+
+    /**
+     * Get the {@code coords} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code coords} kind.
+     */
+    public List<Double> coords() {
+        return TaggedUnionUtils.get(this, Kind.Coords);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geohash}?
+     */
+    public boolean isGeohash() {
+        return _kind == Kind.Geohash;
+    }
+
+    /**
+     * Get the {@code geohash} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geohash} kind.
+     */
+    public GeoHashLocation geohash() {
+        return TaggedUnionUtils.get(this, Kind.Geohash);
+    }
+
+    /**
+     * Is this variant instance of kind {@code latlon}?
+     */
+    public boolean isLatlon() {
+        return _kind == Kind.Latlon;
+    }
+
+    /**
+     * Get the {@code latlon} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code latlon} kind.
+     */
+    public LatLonGeoLocation latlon() {
+        return TaggedUnionUtils.get(this, Kind.Latlon);
+    }
+
+    /**
+     * Is this variant instance of kind {@code text}?
+     */
+    public boolean isText() {
+        return _kind == Kind.Text;
+    }
+
+    /**
+     * Get the {@code text} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code text} kind.
+     */
+    public String text() {
+        return TaggedUnionUtils.get(this, Kind.Text);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Coords:
+                    generator.writeStartArray();
+                    for (Double item0 : ((List<Double>) this._value)) {
+                        generator.write(item0);
+
+                    }
+                    generator.writeEnd();
+
+                    break;
+                case Text:
+                    generator.write(((String) this._value));
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoLocation> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<GeoLocation> coords(List<Double> v) {
+            this._kind = Kind.Coords;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<GeoLocation> geohash(GeoHashLocation v) {
+            this._kind = Kind.Geohash;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<GeoLocation> geohash(Function<GeoHashLocation.Builder, ObjectBuilder<GeoHashLocation>> fn) {
+            return this.geohash(fn.apply(new GeoHashLocation.Builder()).build());
+        }
+
+        public ObjectBuilder<GeoLocation> latlon(LatLonGeoLocation v) {
+            this._kind = Kind.Latlon;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<GeoLocation> latlon(Function<LatLonGeoLocation.Builder, ObjectBuilder<LatLonGeoLocation>> fn) {
+            return this.latlon(fn.apply(new LatLonGeoLocation.Builder()).build());
+        }
+
+        public ObjectBuilder<GeoLocation> text(String v) {
+            this._kind = Kind.Text;
+            this._value = v;
+            return this;
+        }
+
+        public GeoLocation build() {
+            _checkSingleUse();
+            return new GeoLocation(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<GeoLocation> buildGeoLocationDeserializer() {
+        return new UnionDeserializer.Builder<GeoLocation, Kind, Object>(GeoLocation::new, false).addMember(
+            Kind.Coords,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.doubleDeserializer())
+        )
+            .addMember(Kind.Geohash, GeoHashLocation._DESERIALIZER)
+            .addMember(Kind.Latlon, LatLonGeoLocation._DESERIALIZER)
+            .addMember(Kind.Text, JsonpDeserializer.stringDeserializer())
+            .build();
+    }
+
+    public static final JsonpDeserializer<GeoLocation> _DESERIALIZER = JsonpDeserializer.lazy(GeoLocation::buildGeoLocationDeserializer);
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoLocationBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoLocationBuilders.java
index 602c5f1ff8..7568ad87a6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoLocationBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoLocationBuilders.java
@@ -38,26 +38,25 @@
  * Variants <code>coords</code>, <code>text</code> are not available here as
  * they don't have a dedicated class. Use {@link GeoLocation}'s builder for
  * these.
- * 
+ *
  */
 public class GeoLocationBuilders {
-	private GeoLocationBuilders() {
-	}
+    private GeoLocationBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link GeoHashLocation geohash} {@code GeoLocation}
-	 * variant.
-	 */
-	public static GeoHashLocation.Builder geohash() {
-		return new GeoHashLocation.Builder();
-	}
+    /**
+     * Creates a builder for the {@link GeoHashLocation geohash} {@code GeoLocation}
+     * variant.
+     */
+    public static GeoHashLocation.Builder geohash() {
+        return new GeoHashLocation.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link LatLonGeoLocation latlon}
-	 * {@code GeoLocation} variant.
-	 */
-	public static LatLonGeoLocation.Builder latlon() {
-		return new LatLonGeoLocation.Builder();
-	}
+    /**
+     * Creates a builder for the {@link LatLonGeoLocation latlon}
+     * {@code GeoLocation} variant.
+     */
+    public static LatLonGeoLocation.Builder latlon() {
+        return new LatLonGeoLocation.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoShapeRelation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoShapeRelation.java
index 1098174b2b..f51d42a238 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoShapeRelation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GeoShapeRelation.java
@@ -37,26 +37,25 @@
 
 @JsonpDeserializable
 public enum GeoShapeRelation implements JsonEnum {
-	Intersects("intersects"),
+    Intersects("intersects"),
 
-	Disjoint("disjoint"),
+    Disjoint("disjoint"),
 
-	Within("within"),
+    Within("within"),
 
-	Contains("contains"),
+    Contains("contains"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	GeoShapeRelation(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    GeoShapeRelation(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<GeoShapeRelation> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			GeoShapeRelation.values());
+    public static final JsonEnum.Deserializer<GeoShapeRelation> _DESERIALIZER = new JsonEnum.Deserializer<>(GeoShapeRelation.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GetStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GetStats.java
index 42f595cb30..4e53545c95 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/GetStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/GetStats.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,325 +44,323 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.GetStats
 
 @JsonpDeserializable
 public class GetStats implements JsonpSerializable {
-	private final long current;
-
-	@Nullable
-	private final String existsTime;
-
-	private final long existsTimeInMillis;
-
-	private final long existsTotal;
-
-	@Nullable
-	private final String missingTime;
-
-	private final long missingTimeInMillis;
-
-	private final long missingTotal;
-
-	@Nullable
-	private final String time;
-
-	private final long timeInMillis;
-
-	private final long total;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetStats(Builder builder) {
-
-		this.current = ApiTypeHelper.requireNonNull(builder.current, this, "current");
-		this.existsTime = builder.existsTime;
-		this.existsTimeInMillis = ApiTypeHelper.requireNonNull(builder.existsTimeInMillis, this, "existsTimeInMillis");
-		this.existsTotal = ApiTypeHelper.requireNonNull(builder.existsTotal, this, "existsTotal");
-		this.missingTime = builder.missingTime;
-		this.missingTimeInMillis = ApiTypeHelper.requireNonNull(builder.missingTimeInMillis, this,
-				"missingTimeInMillis");
-		this.missingTotal = ApiTypeHelper.requireNonNull(builder.missingTotal, this, "missingTotal");
-		this.time = builder.time;
-		this.timeInMillis = ApiTypeHelper.requireNonNull(builder.timeInMillis, this, "timeInMillis");
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
-
-	}
-
-	public static GetStats of(Function<Builder, ObjectBuilder<GetStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code current}
-	 */
-	public final long current() {
-		return this.current;
-	}
-
-	/**
-	 * API name: {@code exists_time}
-	 */
-	@Nullable
-	public final String existsTime() {
-		return this.existsTime;
-	}
-
-	/**
-	 * Required - API name: {@code exists_time_in_millis}
-	 */
-	public final long existsTimeInMillis() {
-		return this.existsTimeInMillis;
-	}
-
-	/**
-	 * Required - API name: {@code exists_total}
-	 */
-	public final long existsTotal() {
-		return this.existsTotal;
-	}
-
-	/**
-	 * API name: {@code missing_time}
-	 */
-	@Nullable
-	public final String missingTime() {
-		return this.missingTime;
-	}
-
-	/**
-	 * Required - API name: {@code missing_time_in_millis}
-	 */
-	public final long missingTimeInMillis() {
-		return this.missingTimeInMillis;
-	}
-
-	/**
-	 * Required - API name: {@code missing_total}
-	 */
-	public final long missingTotal() {
-		return this.missingTotal;
-	}
+    private final long current;
+
+    @Nullable
+    private final String existsTime;
+
+    private final long existsTimeInMillis;
+
+    private final long existsTotal;
+
+    @Nullable
+    private final String missingTime;
+
+    private final long missingTimeInMillis;
+
+    private final long missingTotal;
+
+    @Nullable
+    private final String time;
+
+    private final long timeInMillis;
+
+    private final long total;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetStats(Builder builder) {
+
+        this.current = ApiTypeHelper.requireNonNull(builder.current, this, "current");
+        this.existsTime = builder.existsTime;
+        this.existsTimeInMillis = ApiTypeHelper.requireNonNull(builder.existsTimeInMillis, this, "existsTimeInMillis");
+        this.existsTotal = ApiTypeHelper.requireNonNull(builder.existsTotal, this, "existsTotal");
+        this.missingTime = builder.missingTime;
+        this.missingTimeInMillis = ApiTypeHelper.requireNonNull(builder.missingTimeInMillis, this, "missingTimeInMillis");
+        this.missingTotal = ApiTypeHelper.requireNonNull(builder.missingTotal, this, "missingTotal");
+        this.time = builder.time;
+        this.timeInMillis = ApiTypeHelper.requireNonNull(builder.timeInMillis, this, "timeInMillis");
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+
+    }
+
+    public static GetStats of(Function<Builder, ObjectBuilder<GetStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code current}
+     */
+    public final long current() {
+        return this.current;
+    }
+
+    /**
+     * API name: {@code exists_time}
+     */
+    @Nullable
+    public final String existsTime() {
+        return this.existsTime;
+    }
+
+    /**
+     * Required - API name: {@code exists_time_in_millis}
+     */
+    public final long existsTimeInMillis() {
+        return this.existsTimeInMillis;
+    }
+
+    /**
+     * Required - API name: {@code exists_total}
+     */
+    public final long existsTotal() {
+        return this.existsTotal;
+    }
+
+    /**
+     * API name: {@code missing_time}
+     */
+    @Nullable
+    public final String missingTime() {
+        return this.missingTime;
+    }
+
+    /**
+     * Required - API name: {@code missing_time_in_millis}
+     */
+    public final long missingTimeInMillis() {
+        return this.missingTimeInMillis;
+    }
+
+    /**
+     * Required - API name: {@code missing_total}
+     */
+    public final long missingTotal() {
+        return this.missingTotal;
+    }
 
-	/**
-	 * API name: {@code time}
-	 */
-	@Nullable
-	public final String time() {
-		return this.time;
-	}
-
-	/**
-	 * Required - API name: {@code time_in_millis}
-	 */
-	public final long timeInMillis() {
-		return this.timeInMillis;
-	}
-
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final long total() {
-		return this.total;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("current");
-		generator.write(this.current);
-
-		if (this.existsTime != null) {
-			generator.writeKey("exists_time");
-			generator.write(this.existsTime);
-
-		}
-		generator.writeKey("exists_time_in_millis");
-		generator.write(this.existsTimeInMillis);
-
-		generator.writeKey("exists_total");
-		generator.write(this.existsTotal);
-
-		if (this.missingTime != null) {
-			generator.writeKey("missing_time");
-			generator.write(this.missingTime);
-
-		}
-		generator.writeKey("missing_time_in_millis");
-		generator.write(this.missingTimeInMillis);
-
-		generator.writeKey("missing_total");
-		generator.write(this.missingTotal);
-
-		if (this.time != null) {
-			generator.writeKey("time");
-			generator.write(this.time);
-
-		}
-		generator.writeKey("time_in_millis");
-		generator.write(this.timeInMillis);
-
-		generator.writeKey("total");
-		generator.write(this.total);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetStats> {
-		private Long current;
-
-		@Nullable
-		private String existsTime;
-
-		private Long existsTimeInMillis;
-
-		private Long existsTotal;
-
-		@Nullable
-		private String missingTime;
-
-		private Long missingTimeInMillis;
-
-		private Long missingTotal;
-
-		@Nullable
-		private String time;
-
-		private Long timeInMillis;
-
-		private Long total;
-
-		/**
-		 * Required - API name: {@code current}
-		 */
-		public final Builder current(long value) {
-			this.current = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code exists_time}
-		 */
-		public final Builder existsTime(@Nullable String value) {
-			this.existsTime = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code exists_time_in_millis}
-		 */
-		public final Builder existsTimeInMillis(long value) {
-			this.existsTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code exists_total}
-		 */
-		public final Builder existsTotal(long value) {
-			this.existsTotal = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code missing_time}
-		 */
-		public final Builder missingTime(@Nullable String value) {
-			this.missingTime = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code missing_time_in_millis}
-		 */
-		public final Builder missingTimeInMillis(long value) {
-			this.missingTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code missing_total}
-		 */
-		public final Builder missingTotal(long value) {
-			this.missingTotal = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code time}
-		 */
-		public final Builder time(@Nullable String value) {
-			this.time = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code time_in_millis}
-		 */
-		public final Builder timeInMillis(long value) {
-			this.timeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(long value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetStats build() {
-			_checkSingleUse();
-
-			return new GetStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetStats}
-	 */
-	public static final JsonpDeserializer<GetStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GetStats::setupGetStatsDeserializer);
-
-	protected static void setupGetStatsDeserializer(ObjectDeserializer<GetStats.Builder> op) {
-
-		op.add(Builder::current, JsonpDeserializer.longDeserializer(), "current");
-		op.add(Builder::existsTime, JsonpDeserializer.stringDeserializer(), "exists_time");
-		op.add(Builder::existsTimeInMillis, JsonpDeserializer.longDeserializer(), "exists_time_in_millis");
-		op.add(Builder::existsTotal, JsonpDeserializer.longDeserializer(), "exists_total");
-		op.add(Builder::missingTime, JsonpDeserializer.stringDeserializer(), "missing_time");
-		op.add(Builder::missingTimeInMillis, JsonpDeserializer.longDeserializer(), "missing_time_in_millis");
-		op.add(Builder::missingTotal, JsonpDeserializer.longDeserializer(), "missing_total");
-		op.add(Builder::time, JsonpDeserializer.stringDeserializer(), "time");
-		op.add(Builder::timeInMillis, JsonpDeserializer.longDeserializer(), "time_in_millis");
-		op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
-
-	}
+    /**
+     * API name: {@code time}
+     */
+    @Nullable
+    public final String time() {
+        return this.time;
+    }
+
+    /**
+     * Required - API name: {@code time_in_millis}
+     */
+    public final long timeInMillis() {
+        return this.timeInMillis;
+    }
+
+    /**
+     * Required - API name: {@code total}
+     */
+    public final long total() {
+        return this.total;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("current");
+        generator.write(this.current);
+
+        if (this.existsTime != null) {
+            generator.writeKey("exists_time");
+            generator.write(this.existsTime);
+
+        }
+        generator.writeKey("exists_time_in_millis");
+        generator.write(this.existsTimeInMillis);
+
+        generator.writeKey("exists_total");
+        generator.write(this.existsTotal);
+
+        if (this.missingTime != null) {
+            generator.writeKey("missing_time");
+            generator.write(this.missingTime);
+
+        }
+        generator.writeKey("missing_time_in_millis");
+        generator.write(this.missingTimeInMillis);
+
+        generator.writeKey("missing_total");
+        generator.write(this.missingTotal);
+
+        if (this.time != null) {
+            generator.writeKey("time");
+            generator.write(this.time);
+
+        }
+        generator.writeKey("time_in_millis");
+        generator.write(this.timeInMillis);
+
+        generator.writeKey("total");
+        generator.write(this.total);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetStats> {
+        private Long current;
+
+        @Nullable
+        private String existsTime;
+
+        private Long existsTimeInMillis;
+
+        private Long existsTotal;
+
+        @Nullable
+        private String missingTime;
+
+        private Long missingTimeInMillis;
+
+        private Long missingTotal;
+
+        @Nullable
+        private String time;
+
+        private Long timeInMillis;
+
+        private Long total;
+
+        /**
+         * Required - API name: {@code current}
+         */
+        public final Builder current(long value) {
+            this.current = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code exists_time}
+         */
+        public final Builder existsTime(@Nullable String value) {
+            this.existsTime = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code exists_time_in_millis}
+         */
+        public final Builder existsTimeInMillis(long value) {
+            this.existsTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code exists_total}
+         */
+        public final Builder existsTotal(long value) {
+            this.existsTotal = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code missing_time}
+         */
+        public final Builder missingTime(@Nullable String value) {
+            this.missingTime = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code missing_time_in_millis}
+         */
+        public final Builder missingTimeInMillis(long value) {
+            this.missingTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code missing_total}
+         */
+        public final Builder missingTotal(long value) {
+            this.missingTotal = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code time}
+         */
+        public final Builder time(@Nullable String value) {
+            this.time = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code time_in_millis}
+         */
+        public final Builder timeInMillis(long value) {
+            this.timeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(long value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetStats build() {
+            _checkSingleUse();
+
+            return new GetStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetStats}
+     */
+    public static final JsonpDeserializer<GetStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetStats::setupGetStatsDeserializer
+    );
+
+    protected static void setupGetStatsDeserializer(ObjectDeserializer<GetStats.Builder> op) {
+
+        op.add(Builder::current, JsonpDeserializer.longDeserializer(), "current");
+        op.add(Builder::existsTime, JsonpDeserializer.stringDeserializer(), "exists_time");
+        op.add(Builder::existsTimeInMillis, JsonpDeserializer.longDeserializer(), "exists_time_in_millis");
+        op.add(Builder::existsTotal, JsonpDeserializer.longDeserializer(), "exists_total");
+        op.add(Builder::missingTime, JsonpDeserializer.stringDeserializer(), "missing_time");
+        op.add(Builder::missingTimeInMillis, JsonpDeserializer.longDeserializer(), "missing_time_in_millis");
+        op.add(Builder::missingTotal, JsonpDeserializer.longDeserializer(), "missing_total");
+        op.add(Builder::time, JsonpDeserializer.stringDeserializer(), "time");
+        op.add(Builder::timeInMillis, JsonpDeserializer.longDeserializer(), "time_in_millis");
+        op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/HealthStatus.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/HealthStatus.java
index 371497cf65..09a9914a63 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/HealthStatus.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/HealthStatus.java
@@ -37,42 +37,41 @@
 
 @JsonpDeserializable
 public enum HealthStatus implements JsonEnum {
-	/**
-	 * All shards are assigned.
-	 */
-	Green("green", "GREEN"),
+    /**
+     * All shards are assigned.
+     */
+    Green("green", "GREEN"),
 
-	/**
-	 * All primary shards are assigned, but one or more replica shards are
-	 * unassigned. If a node in the cluster fails, some data could be unavailable
-	 * until that node is repaired.
-	 */
-	Yellow("yellow", "YELLOW"),
+    /**
+     * All primary shards are assigned, but one or more replica shards are
+     * unassigned. If a node in the cluster fails, some data could be unavailable
+     * until that node is repaired.
+     */
+    Yellow("yellow", "YELLOW"),
 
-	/**
-	 * One or more primary shards are unassigned, so some data is unavailable. This
-	 * can occur briefly during cluster startup as primary shards are assigned.
-	 */
-	Red("red", "RED"),
+    /**
+     * One or more primary shards are unassigned, so some data is unavailable. This
+     * can occur briefly during cluster startup as primary shards are assigned.
+     */
+    Red("red", "RED"),
 
-	;
+    ;
 
-	private final String jsonValue;
-	private final String[] aliases;
+    private final String jsonValue;
+    private final String[] aliases;
 
-	HealthStatus(String jsonValue, String... aliases) {
-		this.jsonValue = jsonValue;
-		this.aliases = aliases;
-	}
+    HealthStatus(String jsonValue, String... aliases) {
+        this.jsonValue = jsonValue;
+        this.aliases = aliases;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public String[] aliases() {
-		return this.aliases;
-	}
+    public String[] aliases() {
+        return this.aliases;
+    }
 
-	public static final JsonEnum.Deserializer<HealthStatus> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			HealthStatus.values());
+    public static final JsonEnum.Deserializer<HealthStatus> _DESERIALIZER = new JsonEnum.Deserializer<>(HealthStatus.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/IndexingStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/IndexingStats.java
index 85dd47c932..9c81681f7a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/IndexingStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/IndexingStats.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,453 +45,450 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.IndexingStats
 
 @JsonpDeserializable
 public class IndexingStats implements JsonpSerializable {
-	private final long indexCurrent;
+    private final long indexCurrent;
 
-	private final long deleteCurrent;
-
-	@Nullable
-	private final String deleteTime;
+    private final long deleteCurrent;
+
+    @Nullable
+    private final String deleteTime;
 
-	private final long deleteTimeInMillis;
-
-	private final long deleteTotal;
-
-	private final boolean isThrottled;
-
-	private final long noopUpdateTotal;
-
-	@Nullable
-	private final String throttleTime;
-
-	private final long throttleTimeInMillis;
-
-	@Nullable
-	private final String indexTime;
-
-	private final long indexTimeInMillis;
-
-	private final long indexTotal;
-
-	private final long indexFailed;
-
-	private final Map<String, IndexingStats> types;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexingStats(Builder builder) {
-
-		this.indexCurrent = ApiTypeHelper.requireNonNull(builder.indexCurrent, this, "indexCurrent");
-		this.deleteCurrent = ApiTypeHelper.requireNonNull(builder.deleteCurrent, this, "deleteCurrent");
-		this.deleteTime = builder.deleteTime;
-		this.deleteTimeInMillis = ApiTypeHelper.requireNonNull(builder.deleteTimeInMillis, this, "deleteTimeInMillis");
-		this.deleteTotal = ApiTypeHelper.requireNonNull(builder.deleteTotal, this, "deleteTotal");
-		this.isThrottled = ApiTypeHelper.requireNonNull(builder.isThrottled, this, "isThrottled");
-		this.noopUpdateTotal = ApiTypeHelper.requireNonNull(builder.noopUpdateTotal, this, "noopUpdateTotal");
-		this.throttleTime = builder.throttleTime;
-		this.throttleTimeInMillis = ApiTypeHelper.requireNonNull(builder.throttleTimeInMillis, this,
-				"throttleTimeInMillis");
-		this.indexTime = builder.indexTime;
-		this.indexTimeInMillis = ApiTypeHelper.requireNonNull(builder.indexTimeInMillis, this, "indexTimeInMillis");
-		this.indexTotal = ApiTypeHelper.requireNonNull(builder.indexTotal, this, "indexTotal");
-		this.indexFailed = ApiTypeHelper.requireNonNull(builder.indexFailed, this, "indexFailed");
-		this.types = ApiTypeHelper.unmodifiable(builder.types);
-
-	}
-
-	public static IndexingStats of(Function<Builder, ObjectBuilder<IndexingStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code index_current}
-	 */
-	public final long indexCurrent() {
-		return this.indexCurrent;
-	}
-
-	/**
-	 * Required - API name: {@code delete_current}
-	 */
-	public final long deleteCurrent() {
-		return this.deleteCurrent;
-	}
-
-	/**
-	 * API name: {@code delete_time}
-	 */
-	@Nullable
-	public final String deleteTime() {
-		return this.deleteTime;
-	}
-
-	/**
-	 * Required - API name: {@code delete_time_in_millis}
-	 */
-	public final long deleteTimeInMillis() {
-		return this.deleteTimeInMillis;
-	}
-
-	/**
-	 * Required - API name: {@code delete_total}
-	 */
-	public final long deleteTotal() {
-		return this.deleteTotal;
-	}
-
-	/**
-	 * Required - API name: {@code is_throttled}
-	 */
-	public final boolean isThrottled() {
-		return this.isThrottled;
-	}
-
-	/**
-	 * Required - API name: {@code noop_update_total}
-	 */
-	public final long noopUpdateTotal() {
-		return this.noopUpdateTotal;
-	}
-
-	/**
-	 * API name: {@code throttle_time}
-	 */
-	@Nullable
-	public final String throttleTime() {
-		return this.throttleTime;
-	}
-
-	/**
-	 * Required - API name: {@code throttle_time_in_millis}
-	 */
-	public final long throttleTimeInMillis() {
-		return this.throttleTimeInMillis;
-	}
-
-	/**
-	 * API name: {@code index_time}
-	 */
-	@Nullable
-	public final String indexTime() {
-		return this.indexTime;
-	}
-
-	/**
-	 * Required - API name: {@code index_time_in_millis}
-	 */
-	public final long indexTimeInMillis() {
-		return this.indexTimeInMillis;
-	}
-
-	/**
-	 * Required - API name: {@code index_total}
-	 */
-	public final long indexTotal() {
-		return this.indexTotal;
-	}
-
-	/**
-	 * Required - API name: {@code index_failed}
-	 */
-	public final long indexFailed() {
-		return this.indexFailed;
-	}
-
-	/**
-	 * API name: {@code types}
-	 */
-	public final Map<String, IndexingStats> types() {
-		return this.types;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("index_current");
-		generator.write(this.indexCurrent);
-
-		generator.writeKey("delete_current");
-		generator.write(this.deleteCurrent);
-
-		if (this.deleteTime != null) {
-			generator.writeKey("delete_time");
-			generator.write(this.deleteTime);
-
-		}
-		generator.writeKey("delete_time_in_millis");
-		generator.write(this.deleteTimeInMillis);
-
-		generator.writeKey("delete_total");
-		generator.write(this.deleteTotal);
-
-		generator.writeKey("is_throttled");
-		generator.write(this.isThrottled);
-
-		generator.writeKey("noop_update_total");
-		generator.write(this.noopUpdateTotal);
-
-		if (this.throttleTime != null) {
-			generator.writeKey("throttle_time");
-			generator.write(this.throttleTime);
-
-		}
-		generator.writeKey("throttle_time_in_millis");
-		generator.write(this.throttleTimeInMillis);
-
-		if (this.indexTime != null) {
-			generator.writeKey("index_time");
-			generator.write(this.indexTime);
-
-		}
-		generator.writeKey("index_time_in_millis");
-		generator.write(this.indexTimeInMillis);
-
-		generator.writeKey("index_total");
-		generator.write(this.indexTotal);
-
-		generator.writeKey("index_failed");
-		generator.write(this.indexFailed);
-
-		if (ApiTypeHelper.isDefined(this.types)) {
-			generator.writeKey("types");
-			generator.writeStartObject();
-			for (Map.Entry<String, IndexingStats> item0 : this.types.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexingStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexingStats> {
-		private Long indexCurrent;
-
-		private Long deleteCurrent;
-
-		@Nullable
-		private String deleteTime;
-
-		private Long deleteTimeInMillis;
-
-		private Long deleteTotal;
-
-		private Boolean isThrottled;
-
-		private Long noopUpdateTotal;
-
-		@Nullable
-		private String throttleTime;
-
-		private Long throttleTimeInMillis;
-
-		@Nullable
-		private String indexTime;
-
-		private Long indexTimeInMillis;
-
-		private Long indexTotal;
-
-		private Long indexFailed;
-
-		@Nullable
-		private Map<String, IndexingStats> types;
-
-		/**
-		 * Required - API name: {@code index_current}
-		 */
-		public final Builder indexCurrent(long value) {
-			this.indexCurrent = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code delete_current}
-		 */
-		public final Builder deleteCurrent(long value) {
-			this.deleteCurrent = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code delete_time}
-		 */
-		public final Builder deleteTime(@Nullable String value) {
-			this.deleteTime = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code delete_time_in_millis}
-		 */
-		public final Builder deleteTimeInMillis(long value) {
-			this.deleteTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code delete_total}
-		 */
-		public final Builder deleteTotal(long value) {
-			this.deleteTotal = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code is_throttled}
-		 */
-		public final Builder isThrottled(boolean value) {
-			this.isThrottled = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code noop_update_total}
-		 */
-		public final Builder noopUpdateTotal(long value) {
-			this.noopUpdateTotal = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code throttle_time}
-		 */
-		public final Builder throttleTime(@Nullable String value) {
-			this.throttleTime = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code throttle_time_in_millis}
-		 */
-		public final Builder throttleTimeInMillis(long value) {
-			this.throttleTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_time}
-		 */
-		public final Builder indexTime(@Nullable String value) {
-			this.indexTime = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index_time_in_millis}
-		 */
-		public final Builder indexTimeInMillis(long value) {
-			this.indexTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index_total}
-		 */
-		public final Builder indexTotal(long value) {
-			this.indexTotal = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index_failed}
-		 */
-		public final Builder indexFailed(long value) {
-			this.indexFailed = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code types}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>types</code>.
-		 */
-		public final Builder types(Map<String, IndexingStats> map) {
-			this.types = _mapPutAll(this.types, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code types}
-		 * <p>
-		 * Adds an entry to <code>types</code>.
-		 */
-		public final Builder types(String key, IndexingStats value) {
-			this.types = _mapPut(this.types, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code types}
-		 * <p>
-		 * Adds an entry to <code>types</code> using a builder lambda.
-		 */
-		public final Builder types(String key, Function<IndexingStats.Builder, ObjectBuilder<IndexingStats>> fn) {
-			return types(key, fn.apply(new IndexingStats.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link IndexingStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexingStats build() {
-			_checkSingleUse();
-
-			return new IndexingStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndexingStats}
-	 */
-	public static final JsonpDeserializer<IndexingStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IndexingStats::setupIndexingStatsDeserializer);
-
-	protected static void setupIndexingStatsDeserializer(ObjectDeserializer<IndexingStats.Builder> op) {
-
-		op.add(Builder::indexCurrent, JsonpDeserializer.longDeserializer(), "index_current");
-		op.add(Builder::deleteCurrent, JsonpDeserializer.longDeserializer(), "delete_current");
-		op.add(Builder::deleteTime, JsonpDeserializer.stringDeserializer(), "delete_time");
-		op.add(Builder::deleteTimeInMillis, JsonpDeserializer.longDeserializer(), "delete_time_in_millis");
-		op.add(Builder::deleteTotal, JsonpDeserializer.longDeserializer(), "delete_total");
-		op.add(Builder::isThrottled, JsonpDeserializer.booleanDeserializer(), "is_throttled");
-		op.add(Builder::noopUpdateTotal, JsonpDeserializer.longDeserializer(), "noop_update_total");
-		op.add(Builder::throttleTime, JsonpDeserializer.stringDeserializer(), "throttle_time");
-		op.add(Builder::throttleTimeInMillis, JsonpDeserializer.longDeserializer(), "throttle_time_in_millis");
-		op.add(Builder::indexTime, JsonpDeserializer.stringDeserializer(), "index_time");
-		op.add(Builder::indexTimeInMillis, JsonpDeserializer.longDeserializer(), "index_time_in_millis");
-		op.add(Builder::indexTotal, JsonpDeserializer.longDeserializer(), "index_total");
-		op.add(Builder::indexFailed, JsonpDeserializer.longDeserializer(), "index_failed");
-		op.add(Builder::types, JsonpDeserializer.stringMapDeserializer(IndexingStats._DESERIALIZER), "types");
-
-	}
+    private final long deleteTimeInMillis;
+
+    private final long deleteTotal;
+
+    private final boolean isThrottled;
+
+    private final long noopUpdateTotal;
+
+    @Nullable
+    private final String throttleTime;
+
+    private final long throttleTimeInMillis;
+
+    @Nullable
+    private final String indexTime;
+
+    private final long indexTimeInMillis;
+
+    private final long indexTotal;
+
+    private final long indexFailed;
+
+    private final Map<String, IndexingStats> types;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexingStats(Builder builder) {
+
+        this.indexCurrent = ApiTypeHelper.requireNonNull(builder.indexCurrent, this, "indexCurrent");
+        this.deleteCurrent = ApiTypeHelper.requireNonNull(builder.deleteCurrent, this, "deleteCurrent");
+        this.deleteTime = builder.deleteTime;
+        this.deleteTimeInMillis = ApiTypeHelper.requireNonNull(builder.deleteTimeInMillis, this, "deleteTimeInMillis");
+        this.deleteTotal = ApiTypeHelper.requireNonNull(builder.deleteTotal, this, "deleteTotal");
+        this.isThrottled = ApiTypeHelper.requireNonNull(builder.isThrottled, this, "isThrottled");
+        this.noopUpdateTotal = ApiTypeHelper.requireNonNull(builder.noopUpdateTotal, this, "noopUpdateTotal");
+        this.throttleTime = builder.throttleTime;
+        this.throttleTimeInMillis = ApiTypeHelper.requireNonNull(builder.throttleTimeInMillis, this, "throttleTimeInMillis");
+        this.indexTime = builder.indexTime;
+        this.indexTimeInMillis = ApiTypeHelper.requireNonNull(builder.indexTimeInMillis, this, "indexTimeInMillis");
+        this.indexTotal = ApiTypeHelper.requireNonNull(builder.indexTotal, this, "indexTotal");
+        this.indexFailed = ApiTypeHelper.requireNonNull(builder.indexFailed, this, "indexFailed");
+        this.types = ApiTypeHelper.unmodifiable(builder.types);
+
+    }
+
+    public static IndexingStats of(Function<Builder, ObjectBuilder<IndexingStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code index_current}
+     */
+    public final long indexCurrent() {
+        return this.indexCurrent;
+    }
+
+    /**
+     * Required - API name: {@code delete_current}
+     */
+    public final long deleteCurrent() {
+        return this.deleteCurrent;
+    }
+
+    /**
+     * API name: {@code delete_time}
+     */
+    @Nullable
+    public final String deleteTime() {
+        return this.deleteTime;
+    }
+
+    /**
+     * Required - API name: {@code delete_time_in_millis}
+     */
+    public final long deleteTimeInMillis() {
+        return this.deleteTimeInMillis;
+    }
+
+    /**
+     * Required - API name: {@code delete_total}
+     */
+    public final long deleteTotal() {
+        return this.deleteTotal;
+    }
+
+    /**
+     * Required - API name: {@code is_throttled}
+     */
+    public final boolean isThrottled() {
+        return this.isThrottled;
+    }
+
+    /**
+     * Required - API name: {@code noop_update_total}
+     */
+    public final long noopUpdateTotal() {
+        return this.noopUpdateTotal;
+    }
+
+    /**
+     * API name: {@code throttle_time}
+     */
+    @Nullable
+    public final String throttleTime() {
+        return this.throttleTime;
+    }
+
+    /**
+     * Required - API name: {@code throttle_time_in_millis}
+     */
+    public final long throttleTimeInMillis() {
+        return this.throttleTimeInMillis;
+    }
+
+    /**
+     * API name: {@code index_time}
+     */
+    @Nullable
+    public final String indexTime() {
+        return this.indexTime;
+    }
+
+    /**
+     * Required - API name: {@code index_time_in_millis}
+     */
+    public final long indexTimeInMillis() {
+        return this.indexTimeInMillis;
+    }
+
+    /**
+     * Required - API name: {@code index_total}
+     */
+    public final long indexTotal() {
+        return this.indexTotal;
+    }
+
+    /**
+     * Required - API name: {@code index_failed}
+     */
+    public final long indexFailed() {
+        return this.indexFailed;
+    }
+
+    /**
+     * API name: {@code types}
+     */
+    public final Map<String, IndexingStats> types() {
+        return this.types;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("index_current");
+        generator.write(this.indexCurrent);
+
+        generator.writeKey("delete_current");
+        generator.write(this.deleteCurrent);
+
+        if (this.deleteTime != null) {
+            generator.writeKey("delete_time");
+            generator.write(this.deleteTime);
+
+        }
+        generator.writeKey("delete_time_in_millis");
+        generator.write(this.deleteTimeInMillis);
+
+        generator.writeKey("delete_total");
+        generator.write(this.deleteTotal);
+
+        generator.writeKey("is_throttled");
+        generator.write(this.isThrottled);
+
+        generator.writeKey("noop_update_total");
+        generator.write(this.noopUpdateTotal);
+
+        if (this.throttleTime != null) {
+            generator.writeKey("throttle_time");
+            generator.write(this.throttleTime);
+
+        }
+        generator.writeKey("throttle_time_in_millis");
+        generator.write(this.throttleTimeInMillis);
+
+        if (this.indexTime != null) {
+            generator.writeKey("index_time");
+            generator.write(this.indexTime);
+
+        }
+        generator.writeKey("index_time_in_millis");
+        generator.write(this.indexTimeInMillis);
+
+        generator.writeKey("index_total");
+        generator.write(this.indexTotal);
+
+        generator.writeKey("index_failed");
+        generator.write(this.indexFailed);
+
+        if (ApiTypeHelper.isDefined(this.types)) {
+            generator.writeKey("types");
+            generator.writeStartObject();
+            for (Map.Entry<String, IndexingStats> item0 : this.types.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexingStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexingStats> {
+        private Long indexCurrent;
+
+        private Long deleteCurrent;
+
+        @Nullable
+        private String deleteTime;
+
+        private Long deleteTimeInMillis;
+
+        private Long deleteTotal;
+
+        private Boolean isThrottled;
+
+        private Long noopUpdateTotal;
+
+        @Nullable
+        private String throttleTime;
+
+        private Long throttleTimeInMillis;
+
+        @Nullable
+        private String indexTime;
+
+        private Long indexTimeInMillis;
+
+        private Long indexTotal;
+
+        private Long indexFailed;
+
+        @Nullable
+        private Map<String, IndexingStats> types;
+
+        /**
+         * Required - API name: {@code index_current}
+         */
+        public final Builder indexCurrent(long value) {
+            this.indexCurrent = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code delete_current}
+         */
+        public final Builder deleteCurrent(long value) {
+            this.deleteCurrent = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code delete_time}
+         */
+        public final Builder deleteTime(@Nullable String value) {
+            this.deleteTime = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code delete_time_in_millis}
+         */
+        public final Builder deleteTimeInMillis(long value) {
+            this.deleteTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code delete_total}
+         */
+        public final Builder deleteTotal(long value) {
+            this.deleteTotal = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code is_throttled}
+         */
+        public final Builder isThrottled(boolean value) {
+            this.isThrottled = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code noop_update_total}
+         */
+        public final Builder noopUpdateTotal(long value) {
+            this.noopUpdateTotal = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code throttle_time}
+         */
+        public final Builder throttleTime(@Nullable String value) {
+            this.throttleTime = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code throttle_time_in_millis}
+         */
+        public final Builder throttleTimeInMillis(long value) {
+            this.throttleTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index_time}
+         */
+        public final Builder indexTime(@Nullable String value) {
+            this.indexTime = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index_time_in_millis}
+         */
+        public final Builder indexTimeInMillis(long value) {
+            this.indexTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index_total}
+         */
+        public final Builder indexTotal(long value) {
+            this.indexTotal = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index_failed}
+         */
+        public final Builder indexFailed(long value) {
+            this.indexFailed = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code types}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>types</code>.
+         */
+        public final Builder types(Map<String, IndexingStats> map) {
+            this.types = _mapPutAll(this.types, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code types}
+         * <p>
+         * Adds an entry to <code>types</code>.
+         */
+        public final Builder types(String key, IndexingStats value) {
+            this.types = _mapPut(this.types, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code types}
+         * <p>
+         * Adds an entry to <code>types</code> using a builder lambda.
+         */
+        public final Builder types(String key, Function<IndexingStats.Builder, ObjectBuilder<IndexingStats>> fn) {
+            return types(key, fn.apply(new IndexingStats.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link IndexingStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexingStats build() {
+            _checkSingleUse();
+
+            return new IndexingStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndexingStats}
+     */
+    public static final JsonpDeserializer<IndexingStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexingStats::setupIndexingStatsDeserializer
+    );
+
+    protected static void setupIndexingStatsDeserializer(ObjectDeserializer<IndexingStats.Builder> op) {
+
+        op.add(Builder::indexCurrent, JsonpDeserializer.longDeserializer(), "index_current");
+        op.add(Builder::deleteCurrent, JsonpDeserializer.longDeserializer(), "delete_current");
+        op.add(Builder::deleteTime, JsonpDeserializer.stringDeserializer(), "delete_time");
+        op.add(Builder::deleteTimeInMillis, JsonpDeserializer.longDeserializer(), "delete_time_in_millis");
+        op.add(Builder::deleteTotal, JsonpDeserializer.longDeserializer(), "delete_total");
+        op.add(Builder::isThrottled, JsonpDeserializer.booleanDeserializer(), "is_throttled");
+        op.add(Builder::noopUpdateTotal, JsonpDeserializer.longDeserializer(), "noop_update_total");
+        op.add(Builder::throttleTime, JsonpDeserializer.stringDeserializer(), "throttle_time");
+        op.add(Builder::throttleTimeInMillis, JsonpDeserializer.longDeserializer(), "throttle_time_in_millis");
+        op.add(Builder::indexTime, JsonpDeserializer.stringDeserializer(), "index_time");
+        op.add(Builder::indexTimeInMillis, JsonpDeserializer.longDeserializer(), "index_time_in_millis");
+        op.add(Builder::indexTotal, JsonpDeserializer.longDeserializer(), "index_total");
+        op.add(Builder::indexFailed, JsonpDeserializer.longDeserializer(), "index_failed");
+        op.add(Builder::types, JsonpDeserializer.stringMapDeserializer(IndexingStats._DESERIALIZER), "types");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/IndicesResponseBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/IndicesResponseBase.java
index 3c72c61935..ba251d885a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/IndicesResponseBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/IndicesResponseBase.java
@@ -32,78 +32,76 @@
 
 package org.opensearch.client.opensearch._types;
 
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.ObjectDeserializer;
-import org.opensearch.client.util.ObjectBuilder;
 import jakarta.json.stream.JsonGenerator;
-
 import java.util.function.Function;
 import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.util.ObjectBuilder;
 
 // typedef: _types.IndicesResponseBase
 
-
 public abstract class IndicesResponseBase extends AcknowledgedResponseBase {
-	@Nullable
-	private final ShardStatistics shards;
+    @Nullable
+    private final ShardStatistics shards;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected IndicesResponseBase(AbstractBuilder<?> builder) {
-		super(builder);
+    protected IndicesResponseBase(AbstractBuilder<?> builder) {
+        super(builder);
 
-		this.shards = builder.shards;
+        this.shards = builder.shards;
 
-	}
+    }
 
-	/**
-	 * API name: {@code _shards}
-	 */
-	@Nullable
-	public final ShardStatistics shards() {
-		return this.shards;
-	}
+    /**
+     * API name: {@code _shards}
+     */
+    @Nullable
+    public final ShardStatistics shards() {
+        return this.shards;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		super.serializeInternal(generator, mapper);
-		if (this.shards != null) {
-			generator.writeKey("_shards");
-			this.shards.serialize(generator, mapper);
+        super.serializeInternal(generator, mapper);
+        if (this.shards != null) {
+            generator.writeKey("_shards");
+            this.shards.serialize(generator, mapper);
 
-		}
+        }
 
-	}
+    }
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				AcknowledgedResponseBase.AbstractBuilder<BuilderT> {
-		@Nullable
-		private ShardStatistics shards;
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends
+        AcknowledgedResponseBase.AbstractBuilder<BuilderT> {
+        @Nullable
+        private ShardStatistics shards;
 
-		/**
-		 * API name: {@code _shards}
-		 */
-		public final BuilderT shards(@Nullable ShardStatistics value) {
-			this.shards = value;
-			return self();
-		}
+        /**
+         * API name: {@code _shards}
+         */
+        public final BuilderT shards(@Nullable ShardStatistics value) {
+            this.shards = value;
+            return self();
+        }
 
-		/**
-		 * API name: {@code _shards}
-		 */
-		public final BuilderT shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
-			return this.shards(fn.apply(new ShardStatistics.Builder()).build());
-		}
+        /**
+         * API name: {@code _shards}
+         */
+        public final BuilderT shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
+            return this.shards(fn.apply(new ShardStatistics.Builder()).build());
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupIndicesResponseBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		setupAcknowledgedResponseBaseDeserializer(op);
-		op.add(AbstractBuilder::shards, ShardStatistics._DESERIALIZER, "_shards");
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupIndicesResponseBaseDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
+        setupAcknowledgedResponseBaseDeserializer(op);
+        op.add(AbstractBuilder::shards, ShardStatistics._DESERIALIZER, "_shards");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/InlineGet.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/InlineGet.java
index 57ae78d5b1..cdebb2c397 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/InlineGet.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/InlineGet.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -43,321 +49,317 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import javax.annotation.Nullable;
 
 // typedef: _types.InlineGet
 
-
 public class InlineGet<TDocument> implements JsonpSerializable {
-	private final Map<String, JsonData> metadata;
-
-	private final Map<String, JsonData> fields;
-
-	private final boolean found;
-
-	@Nullable
-	private final Long seqNo;
-
-	@Nullable
-	private final Long primaryTerm;
-
-	@Nullable
-	private final String routing;
-
-	private final TDocument source;
-
-	@Nullable
-	private final JsonpSerializer<TDocument> tDocumentSerializer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private InlineGet(Builder<TDocument> builder) {
-
-		this.metadata = ApiTypeHelper.unmodifiable(builder.metadata);
-
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-		this.found = ApiTypeHelper.requireNonNull(builder.found, this, "found");
-		this.seqNo = builder.seqNo;
-		this.primaryTerm = builder.primaryTerm;
-		this.routing = builder.routing;
-		this.source = ApiTypeHelper.requireNonNull(builder.source, this, "source");
-		this.tDocumentSerializer = builder.tDocumentSerializer;
-
-	}
-
-	public static <TDocument> InlineGet<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<InlineGet<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * Document metadata
-	 */
-	public final Map<String, JsonData> metadata() {
-		return this.metadata;
-	}
-
-	/**
-	 * API name: {@code fields}
-	 */
-	public final Map<String, JsonData> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * Required - API name: {@code found}
-	 */
-	public final boolean found() {
-		return this.found;
-	}
-
-	/**
-	 * API name: {@code _seq_no}
-	 */
-	@Nullable
-	public final Long seqNo() {
-		return this.seqNo;
-	}
-
-	/**
-	 * API name: {@code _primary_term}
-	 */
-	@Nullable
-	public final Long primaryTerm() {
-		return this.primaryTerm;
-	}
-
-	/**
-	 * API name: {@code _routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Required - API name: {@code _source}
-	 */
-	public final TDocument source() {
-		return this.source;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		for (Map.Entry<String, JsonData> item0 : this.metadata.entrySet()) {
-			generator.writeKey(item0.getKey());
-			item0.getValue().serialize(generator, mapper);
-
-		}
-
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.fields.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("found");
-		generator.write(this.found);
-
-		if (this.seqNo != null) {
-			generator.writeKey("_seq_no");
-			generator.write(this.seqNo);
-
-		}
-		if (this.primaryTerm != null) {
-			generator.writeKey("_primary_term");
-			generator.write(this.primaryTerm);
-
-		}
-		if (this.routing != null) {
-			generator.writeKey("_routing");
-			generator.write(this.routing);
-
-		}
-		generator.writeKey("_source");
-		JsonpUtils.serialize(this.source, generator, tDocumentSerializer, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link InlineGet}.
-	 */
-
-	public static class Builder<TDocument> extends ObjectBuilderBase implements ObjectBuilder<InlineGet<TDocument>> {
-		@Nullable
-		private Map<String, JsonData> metadata = new HashMap<>();
-
-		/**
-		 * Document metadata
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>metadata</code>.
-		 */
-		public final Builder<TDocument> metadata(Map<String, JsonData> map) {
-			this.metadata = _mapPutAll(this.metadata, map);
-			return this;
-		}
-
-		/**
-		 * Document metadata
-		 * <p>
-		 * Adds an entry to <code>metadata</code>.
-		 */
-		public final Builder<TDocument> metadata(String key, JsonData value) {
-			this.metadata = _mapPut(this.metadata, key, value);
-			return this;
-		}
-
-		@Nullable
-		private Map<String, JsonData> fields;
-
-		private Boolean found;
-
-		@Nullable
-		private Long seqNo;
-
-		@Nullable
-		private Long primaryTerm;
-
-		@Nullable
-		private String routing;
-
-		private TDocument source;
-
-		@Nullable
-		private JsonpSerializer<TDocument> tDocumentSerializer;
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>fields</code>.
-		 */
-		public final Builder<TDocument> fields(Map<String, JsonData> map) {
-			this.fields = _mapPutAll(this.fields, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds an entry to <code>fields</code>.
-		 */
-		public final Builder<TDocument> fields(String key, JsonData value) {
-			this.fields = _mapPut(this.fields, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code found}
-		 */
-		public final Builder<TDocument> found(boolean value) {
-			this.found = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _seq_no}
-		 */
-		public final Builder<TDocument> seqNo(@Nullable Long value) {
-			this.seqNo = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _primary_term}
-		 */
-		public final Builder<TDocument> primaryTerm(@Nullable Long value) {
-			this.primaryTerm = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _routing}
-		 */
-		public final Builder<TDocument> routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _source}
-		 */
-		public final Builder<TDocument> source(TDocument value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * Serializer for TDocument. If not set, an attempt will be made to find a
-		 * serializer from the JSON context.
-		 */
-		public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
-			this.tDocumentSerializer = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link InlineGet}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public InlineGet<TDocument> build() {
-			_checkSingleUse();
-
-			return new InlineGet<TDocument>(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Create a JSON deserializer for InlineGet
-	 */
-	public static <TDocument> JsonpDeserializer<InlineGet<TDocument>> createInlineGetDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return ObjectBuilderDeserializer.createForObject((Supplier<Builder<TDocument>>) Builder::new,
-				op -> InlineGet.setupInlineGetDeserializer(op, tDocumentDeserializer));
-	};
-
-	protected static <TDocument> void setupInlineGetDeserializer(ObjectDeserializer<InlineGet.Builder<TDocument>> op,
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-
-		op.add(Builder::fields, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "fields");
-		op.add(Builder::found, JsonpDeserializer.booleanDeserializer(), "found");
-		op.add(Builder::seqNo, JsonpDeserializer.longDeserializer(), "_seq_no");
-		op.add(Builder::primaryTerm, JsonpDeserializer.longDeserializer(), "_primary_term");
-		op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "_routing");
-		op.add(Builder::source, tDocumentDeserializer, "_source");
-
-		op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
-			if (builder.metadata == null) {
-				builder.metadata = new HashMap<>();
-			}
-			builder.metadata.put(name, JsonData._DESERIALIZER.deserialize(parser, mapper));
-		});
-
-	}
+    private final Map<String, JsonData> metadata;
+
+    private final Map<String, JsonData> fields;
+
+    private final boolean found;
+
+    @Nullable
+    private final Long seqNo;
+
+    @Nullable
+    private final Long primaryTerm;
+
+    @Nullable
+    private final String routing;
+
+    private final TDocument source;
+
+    @Nullable
+    private final JsonpSerializer<TDocument> tDocumentSerializer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private InlineGet(Builder<TDocument> builder) {
+
+        this.metadata = ApiTypeHelper.unmodifiable(builder.metadata);
+
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.found = ApiTypeHelper.requireNonNull(builder.found, this, "found");
+        this.seqNo = builder.seqNo;
+        this.primaryTerm = builder.primaryTerm;
+        this.routing = builder.routing;
+        this.source = ApiTypeHelper.requireNonNull(builder.source, this, "source");
+        this.tDocumentSerializer = builder.tDocumentSerializer;
+
+    }
+
+    public static <TDocument> InlineGet<TDocument> of(Function<Builder<TDocument>, ObjectBuilder<InlineGet<TDocument>>> fn) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * Document metadata
+     */
+    public final Map<String, JsonData> metadata() {
+        return this.metadata;
+    }
+
+    /**
+     * API name: {@code fields}
+     */
+    public final Map<String, JsonData> fields() {
+        return this.fields;
+    }
+
+    /**
+     * Required - API name: {@code found}
+     */
+    public final boolean found() {
+        return this.found;
+    }
+
+    /**
+     * API name: {@code _seq_no}
+     */
+    @Nullable
+    public final Long seqNo() {
+        return this.seqNo;
+    }
+
+    /**
+     * API name: {@code _primary_term}
+     */
+    @Nullable
+    public final Long primaryTerm() {
+        return this.primaryTerm;
+    }
+
+    /**
+     * API name: {@code _routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * Required - API name: {@code _source}
+     */
+    public final TDocument source() {
+        return this.source;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        for (Map.Entry<String, JsonData> item0 : this.metadata.entrySet()) {
+            generator.writeKey(item0.getKey());
+            item0.getValue().serialize(generator, mapper);
+
+        }
+
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.fields.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("found");
+        generator.write(this.found);
+
+        if (this.seqNo != null) {
+            generator.writeKey("_seq_no");
+            generator.write(this.seqNo);
+
+        }
+        if (this.primaryTerm != null) {
+            generator.writeKey("_primary_term");
+            generator.write(this.primaryTerm);
+
+        }
+        if (this.routing != null) {
+            generator.writeKey("_routing");
+            generator.write(this.routing);
+
+        }
+        generator.writeKey("_source");
+        JsonpUtils.serialize(this.source, generator, tDocumentSerializer, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link InlineGet}.
+     */
+
+    public static class Builder<TDocument> extends ObjectBuilderBase implements ObjectBuilder<InlineGet<TDocument>> {
+        @Nullable
+        private Map<String, JsonData> metadata = new HashMap<>();
+
+        /**
+         * Document metadata
+         * <p>
+         * Adds all entries of <code>map</code> to <code>metadata</code>.
+         */
+        public final Builder<TDocument> metadata(Map<String, JsonData> map) {
+            this.metadata = _mapPutAll(this.metadata, map);
+            return this;
+        }
+
+        /**
+         * Document metadata
+         * <p>
+         * Adds an entry to <code>metadata</code>.
+         */
+        public final Builder<TDocument> metadata(String key, JsonData value) {
+            this.metadata = _mapPut(this.metadata, key, value);
+            return this;
+        }
+
+        @Nullable
+        private Map<String, JsonData> fields;
+
+        private Boolean found;
+
+        @Nullable
+        private Long seqNo;
+
+        @Nullable
+        private Long primaryTerm;
+
+        @Nullable
+        private String routing;
+
+        private TDocument source;
+
+        @Nullable
+        private JsonpSerializer<TDocument> tDocumentSerializer;
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>fields</code>.
+         */
+        public final Builder<TDocument> fields(Map<String, JsonData> map) {
+            this.fields = _mapPutAll(this.fields, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds an entry to <code>fields</code>.
+         */
+        public final Builder<TDocument> fields(String key, JsonData value) {
+            this.fields = _mapPut(this.fields, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code found}
+         */
+        public final Builder<TDocument> found(boolean value) {
+            this.found = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _seq_no}
+         */
+        public final Builder<TDocument> seqNo(@Nullable Long value) {
+            this.seqNo = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _primary_term}
+         */
+        public final Builder<TDocument> primaryTerm(@Nullable Long value) {
+            this.primaryTerm = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _routing}
+         */
+        public final Builder<TDocument> routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _source}
+         */
+        public final Builder<TDocument> source(TDocument value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * Serializer for TDocument. If not set, an attempt will be made to find a
+         * serializer from the JSON context.
+         */
+        public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
+            this.tDocumentSerializer = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link InlineGet}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public InlineGet<TDocument> build() {
+            _checkSingleUse();
+
+            return new InlineGet<TDocument>(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Create a JSON deserializer for InlineGet
+     */
+    public static <TDocument> JsonpDeserializer<InlineGet<TDocument>> createInlineGetDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<TDocument>>) Builder::new,
+            op -> InlineGet.setupInlineGetDeserializer(op, tDocumentDeserializer)
+        );
+    };
+
+    protected static <TDocument> void setupInlineGetDeserializer(
+        ObjectDeserializer<InlineGet.Builder<TDocument>> op,
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+
+        op.add(Builder::fields, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "fields");
+        op.add(Builder::found, JsonpDeserializer.booleanDeserializer(), "found");
+        op.add(Builder::seqNo, JsonpDeserializer.longDeserializer(), "_seq_no");
+        op.add(Builder::primaryTerm, JsonpDeserializer.longDeserializer(), "_primary_term");
+        op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "_routing");
+        op.add(Builder::source, tDocumentDeserializer, "_source");
+
+        op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
+            if (builder.metadata == null) {
+                builder.metadata = new HashMap<>();
+            }
+            builder.metadata.put(name, JsonData._DESERIALIZER.deserialize(parser, mapper));
+        });
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/InlineScript.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/InlineScript.java
index f6aafdd58f..be2177029b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/InlineScript.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/InlineScript.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,169 +43,166 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.InlineScript
 
 @JsonpDeserializable
 public class InlineScript extends ScriptBase {
-	@Nullable
-	private final String lang;
-
-	private final Map<String, String> options;
-
-	private final String source;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private InlineScript(Builder builder) {
-		super(builder);
-
-		this.lang = builder.lang;
-		this.options = ApiTypeHelper.unmodifiable(builder.options);
-		this.source = ApiTypeHelper.requireNonNull(builder.source, this, "source");
-
-	}
-
-	public static InlineScript of(Function<Builder, ObjectBuilder<InlineScript>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code lang}
-	 */
-	@Nullable
-	public final String lang() {
-		return this.lang;
-	}
-
-	/**
-	 * API name: {@code options}
-	 */
-	public final Map<String, String> options() {
-		return this.options;
-	}
-
-	/**
-	 * Required - API name: {@code source}
-	 */
-	public final String source() {
-		return this.source;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.lang != null) {
-			generator.writeKey("lang");
-			generator.write(this.lang);
-
-		}
-		if (ApiTypeHelper.isDefined(this.options)) {
-			generator.writeKey("options");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.options.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("source");
-		generator.write(this.source);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link InlineScript}.
-	 */
-
-	public static class Builder extends ScriptBase.AbstractBuilder<Builder> implements ObjectBuilder<InlineScript> {
-		@Nullable
-		private String lang;
-
-		@Nullable
-		private Map<String, String> options;
-
-		private String source;
-
-		/**
-		 * API name: {@code lang}
-		 */
-		public final Builder lang(@Nullable String value) {
-			this.lang = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code options}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>options</code>.
-		 */
-		public final Builder options(Map<String, String> map) {
-			this.options = _mapPutAll(this.options, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code options}
-		 * <p>
-		 * Adds an entry to <code>options</code>.
-		 */
-		public final Builder options(String key, String value) {
-			this.options = _mapPut(this.options, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code source}
-		 */
-		public final Builder source(String value) {
-			this.source = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link InlineScript}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public InlineScript build() {
-			_checkSingleUse();
-
-			return new InlineScript(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link InlineScript}
-	 */
-	public static final JsonpDeserializer<InlineScript> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			InlineScript::setupInlineScriptDeserializer);
-
-	protected static void setupInlineScriptDeserializer(ObjectDeserializer<InlineScript.Builder> op) {
-		ScriptBase.setupScriptBaseDeserializer(op);
-		op.add(Builder::lang, JsonpDeserializer.stringDeserializer(), "lang");
-		op.add(Builder::options, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
-				"options");
-		op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source");
-
-		op.shortcutProperty("source");
-
-	}
+    @Nullable
+    private final String lang;
+
+    private final Map<String, String> options;
+
+    private final String source;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private InlineScript(Builder builder) {
+        super(builder);
+
+        this.lang = builder.lang;
+        this.options = ApiTypeHelper.unmodifiable(builder.options);
+        this.source = ApiTypeHelper.requireNonNull(builder.source, this, "source");
+
+    }
+
+    public static InlineScript of(Function<Builder, ObjectBuilder<InlineScript>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code lang}
+     */
+    @Nullable
+    public final String lang() {
+        return this.lang;
+    }
+
+    /**
+     * API name: {@code options}
+     */
+    public final Map<String, String> options() {
+        return this.options;
+    }
+
+    /**
+     * Required - API name: {@code source}
+     */
+    public final String source() {
+        return this.source;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.lang != null) {
+            generator.writeKey("lang");
+            generator.write(this.lang);
+
+        }
+        if (ApiTypeHelper.isDefined(this.options)) {
+            generator.writeKey("options");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.options.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("source");
+        generator.write(this.source);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link InlineScript}.
+     */
+
+    public static class Builder extends ScriptBase.AbstractBuilder<Builder> implements ObjectBuilder<InlineScript> {
+        @Nullable
+        private String lang;
+
+        @Nullable
+        private Map<String, String> options;
+
+        private String source;
+
+        /**
+         * API name: {@code lang}
+         */
+        public final Builder lang(@Nullable String value) {
+            this.lang = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code options}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>options</code>.
+         */
+        public final Builder options(Map<String, String> map) {
+            this.options = _mapPutAll(this.options, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code options}
+         * <p>
+         * Adds an entry to <code>options</code>.
+         */
+        public final Builder options(String key, String value) {
+            this.options = _mapPut(this.options, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code source}
+         */
+        public final Builder source(String value) {
+            this.source = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link InlineScript}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public InlineScript build() {
+            _checkSingleUse();
+
+            return new InlineScript(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link InlineScript}
+     */
+    public static final JsonpDeserializer<InlineScript> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        InlineScript::setupInlineScriptDeserializer
+    );
+
+    protected static void setupInlineScriptDeserializer(ObjectDeserializer<InlineScript.Builder> op) {
+        ScriptBase.setupScriptBaseDeserializer(op);
+        op.add(Builder::lang, JsonpDeserializer.stringDeserializer(), "lang");
+        op.add(Builder::options, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "options");
+        op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source");
+
+        op.shortcutProperty("source");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/LatLonGeoLocation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/LatLonGeoLocation.java
index d100024525..986416874a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/LatLonGeoLocation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/LatLonGeoLocation.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,116 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.LatLonGeoLocation
 
 @JsonpDeserializable
 public class LatLonGeoLocation implements JsonpSerializable {
-	private final double lat;
-
-	private final double lon;
-
-	// ---------------------------------------------------------------------------------------------
+    private final double lat;
 
-	private LatLonGeoLocation(Builder builder) {
+    private final double lon;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.lat = ApiTypeHelper.requireNonNull(builder.lat, this, "lat");
-		this.lon = ApiTypeHelper.requireNonNull(builder.lon, this, "lon");
+    private LatLonGeoLocation(Builder builder) {
 
-	}
+        this.lat = ApiTypeHelper.requireNonNull(builder.lat, this, "lat");
+        this.lon = ApiTypeHelper.requireNonNull(builder.lon, this, "lon");
 
-	public static LatLonGeoLocation of(Function<Builder, ObjectBuilder<LatLonGeoLocation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code lat}
-	 */
-	public final double lat() {
-		return this.lat;
-	}
+    public static LatLonGeoLocation of(Function<Builder, ObjectBuilder<LatLonGeoLocation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code lon}
-	 */
-	public final double lon() {
-		return this.lon;
-	}
+    /**
+     * Required - API name: {@code lat}
+     */
+    public final double lat() {
+        return this.lat;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code lon}
+     */
+    public final double lon() {
+        return this.lon;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("lat");
-		generator.write(this.lat);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("lon");
-		generator.write(this.lon);
+        generator.writeKey("lat");
+        generator.write(this.lat);
 
-	}
+        generator.writeKey("lon");
+        generator.write(this.lon);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link LatLonGeoLocation}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<LatLonGeoLocation> {
-		private Double lat;
+    /**
+     * Builder for {@link LatLonGeoLocation}.
+     */
 
-		private Double lon;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<LatLonGeoLocation> {
+        private Double lat;
 
-		/**
-		 * Required - API name: {@code lat}
-		 */
-		public final Builder lat(double value) {
-			this.lat = value;
-			return this;
-		}
+        private Double lon;
 
-		/**
-		 * Required - API name: {@code lon}
-		 */
-		public final Builder lon(double value) {
-			this.lon = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code lat}
+         */
+        public final Builder lat(double value) {
+            this.lat = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link LatLonGeoLocation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LatLonGeoLocation build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code lon}
+         */
+        public final Builder lon(double value) {
+            this.lon = value;
+            return this;
+        }
 
-			return new LatLonGeoLocation(this);
-		}
-	}
+        /**
+         * Builds a {@link LatLonGeoLocation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LatLonGeoLocation build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new LatLonGeoLocation(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link LatLonGeoLocation}
-	 */
-	public static final JsonpDeserializer<LatLonGeoLocation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, LatLonGeoLocation::setupLatLonGeoLocationDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupLatLonGeoLocationDeserializer(ObjectDeserializer<LatLonGeoLocation.Builder> op) {
+    /**
+     * Json deserializer for {@link LatLonGeoLocation}
+     */
+    public static final JsonpDeserializer<LatLonGeoLocation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LatLonGeoLocation::setupLatLonGeoLocationDeserializer
+    );
 
-		op.add(Builder::lat, JsonpDeserializer.doubleDeserializer(), "lat");
-		op.add(Builder::lon, JsonpDeserializer.doubleDeserializer(), "lon");
+    protected static void setupLatLonGeoLocationDeserializer(ObjectDeserializer<LatLonGeoLocation.Builder> op) {
 
-	}
+        op.add(Builder::lat, JsonpDeserializer.doubleDeserializer(), "lat");
+        op.add(Builder::lon, JsonpDeserializer.doubleDeserializer(), "lon");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Level.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/Level.java
index 0987308078..a7df990bb7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Level.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/Level.java
@@ -37,23 +37,23 @@
 
 @JsonpDeserializable
 public enum Level implements JsonEnum {
-	Cluster("cluster"),
+    Cluster("cluster"),
 
-	Indices("indices"),
+    Indices("indices"),
 
-	Shards("shards"),
+    Shards("shards"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	Level(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    Level(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<Level> _DESERIALIZER = new JsonEnum.Deserializer<>(Level.values());
+    public static final JsonEnum.Deserializer<Level> _DESERIALIZER = new JsonEnum.Deserializer<>(Level.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/LifecycleOperationMode.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/LifecycleOperationMode.java
index 85e8b718e2..71cd0307ce 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/LifecycleOperationMode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/LifecycleOperationMode.java
@@ -37,24 +37,25 @@
 
 @JsonpDeserializable
 public enum LifecycleOperationMode implements JsonEnum {
-	Running("RUNNING"),
+    Running("RUNNING"),
 
-	Stopping("STOPPING"),
+    Stopping("STOPPING"),
 
-	Stopped("STOPPED"),
+    Stopped("STOPPED"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	LifecycleOperationMode(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    LifecycleOperationMode(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<LifecycleOperationMode> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			LifecycleOperationMode.values());
+    public static final JsonEnum.Deserializer<LifecycleOperationMode> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        LifecycleOperationMode.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/MergesStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/MergesStats.java
index d98b62be8a..7a09b9de4a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/MergesStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/MergesStats.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,487 +44,486 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.MergesStats
 
 @JsonpDeserializable
 public class MergesStats implements JsonpSerializable {
-	private final long current;
-
-	private final long currentDocs;
+    private final long current;
 
-	@Nullable
-	private final String currentSize;
+    private final long currentDocs;
+
+    @Nullable
+    private final String currentSize;
 
-	private final long currentSizeInBytes;
-
-	private final long total;
-
-	@Nullable
-	private final String totalAutoThrottle;
-
-	private final long totalAutoThrottleInBytes;
-
-	private final long totalDocs;
-
-	@Nullable
-	private final String totalSize;
-
-	private final long totalSizeInBytes;
-
-	@Nullable
-	private final String totalStoppedTime;
-
-	private final long totalStoppedTimeInMillis;
-
-	@Nullable
-	private final String totalThrottledTime;
-
-	private final long totalThrottledTimeInMillis;
-
-	@Nullable
-	private final String totalTime;
-
-	private final long totalTimeInMillis;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MergesStats(Builder builder) {
-
-		this.current = ApiTypeHelper.requireNonNull(builder.current, this, "current");
-		this.currentDocs = ApiTypeHelper.requireNonNull(builder.currentDocs, this, "currentDocs");
-		this.currentSize = builder.currentSize;
-		this.currentSizeInBytes = ApiTypeHelper.requireNonNull(builder.currentSizeInBytes, this, "currentSizeInBytes");
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
-		this.totalAutoThrottle = builder.totalAutoThrottle;
-		this.totalAutoThrottleInBytes = ApiTypeHelper.requireNonNull(builder.totalAutoThrottleInBytes, this,
-				"totalAutoThrottleInBytes");
-		this.totalDocs = ApiTypeHelper.requireNonNull(builder.totalDocs, this, "totalDocs");
-		this.totalSize = builder.totalSize;
-		this.totalSizeInBytes = ApiTypeHelper.requireNonNull(builder.totalSizeInBytes, this, "totalSizeInBytes");
-		this.totalStoppedTime = builder.totalStoppedTime;
-		this.totalStoppedTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalStoppedTimeInMillis, this,
-				"totalStoppedTimeInMillis");
-		this.totalThrottledTime = builder.totalThrottledTime;
-		this.totalThrottledTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalThrottledTimeInMillis, this,
-				"totalThrottledTimeInMillis");
-		this.totalTime = builder.totalTime;
-		this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
-
-	}
-
-	public static MergesStats of(Function<Builder, ObjectBuilder<MergesStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code current}
-	 */
-	public final long current() {
-		return this.current;
-	}
-
-	/**
-	 * Required - API name: {@code current_docs}
-	 */
-	public final long currentDocs() {
-		return this.currentDocs;
-	}
-
-	/**
-	 * API name: {@code current_size}
-	 */
-	@Nullable
-	public final String currentSize() {
-		return this.currentSize;
-	}
-
-	/**
-	 * Required - API name: {@code current_size_in_bytes}
-	 */
-	public final long currentSizeInBytes() {
-		return this.currentSizeInBytes;
-	}
-
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final long total() {
-		return this.total;
-	}
-
-	/**
-	 * API name: {@code total_auto_throttle}
-	 */
-	@Nullable
-	public final String totalAutoThrottle() {
-		return this.totalAutoThrottle;
-	}
-
-	/**
-	 * Required - API name: {@code total_auto_throttle_in_bytes}
-	 */
-	public final long totalAutoThrottleInBytes() {
-		return this.totalAutoThrottleInBytes;
-	}
-
-	/**
-	 * Required - API name: {@code total_docs}
-	 */
-	public final long totalDocs() {
-		return this.totalDocs;
-	}
-
-	/**
-	 * API name: {@code total_size}
-	 */
-	@Nullable
-	public final String totalSize() {
-		return this.totalSize;
-	}
-
-	/**
-	 * Required - API name: {@code total_size_in_bytes}
-	 */
-	public final long totalSizeInBytes() {
-		return this.totalSizeInBytes;
-	}
-
-	/**
-	 * API name: {@code total_stopped_time}
-	 */
-	@Nullable
-	public final String totalStoppedTime() {
-		return this.totalStoppedTime;
-	}
-
-	/**
-	 * Required - API name: {@code total_stopped_time_in_millis}
-	 */
-	public final long totalStoppedTimeInMillis() {
-		return this.totalStoppedTimeInMillis;
-	}
-
-	/**
-	 * API name: {@code total_throttled_time}
-	 */
-	@Nullable
-	public final String totalThrottledTime() {
-		return this.totalThrottledTime;
-	}
-
-	/**
-	 * Required - API name: {@code total_throttled_time_in_millis}
-	 */
-	public final long totalThrottledTimeInMillis() {
-		return this.totalThrottledTimeInMillis;
-	}
-
-	/**
-	 * API name: {@code total_time}
-	 */
-	@Nullable
-	public final String totalTime() {
-		return this.totalTime;
-	}
-
-	/**
-	 * Required - API name: {@code total_time_in_millis}
-	 */
-	public final long totalTimeInMillis() {
-		return this.totalTimeInMillis;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("current");
-		generator.write(this.current);
-
-		generator.writeKey("current_docs");
-		generator.write(this.currentDocs);
-
-		if (this.currentSize != null) {
-			generator.writeKey("current_size");
-			generator.write(this.currentSize);
-
-		}
-		generator.writeKey("current_size_in_bytes");
-		generator.write(this.currentSizeInBytes);
-
-		generator.writeKey("total");
-		generator.write(this.total);
-
-		if (this.totalAutoThrottle != null) {
-			generator.writeKey("total_auto_throttle");
-			generator.write(this.totalAutoThrottle);
-
-		}
-		generator.writeKey("total_auto_throttle_in_bytes");
-		generator.write(this.totalAutoThrottleInBytes);
-
-		generator.writeKey("total_docs");
-		generator.write(this.totalDocs);
-
-		if (this.totalSize != null) {
-			generator.writeKey("total_size");
-			generator.write(this.totalSize);
-
-		}
-		generator.writeKey("total_size_in_bytes");
-		generator.write(this.totalSizeInBytes);
-
-		if (this.totalStoppedTime != null) {
-			generator.writeKey("total_stopped_time");
-			generator.write(this.totalStoppedTime);
-
-		}
-		generator.writeKey("total_stopped_time_in_millis");
-		generator.write(this.totalStoppedTimeInMillis);
-
-		if (this.totalThrottledTime != null) {
-			generator.writeKey("total_throttled_time");
-			generator.write(this.totalThrottledTime);
-
-		}
-		generator.writeKey("total_throttled_time_in_millis");
-		generator.write(this.totalThrottledTimeInMillis);
-
-		if (this.totalTime != null) {
-			generator.writeKey("total_time");
-			generator.write(this.totalTime);
-
-		}
-		generator.writeKey("total_time_in_millis");
-		generator.write(this.totalTimeInMillis);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MergesStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MergesStats> {
-		private Long current;
-
-		private Long currentDocs;
-
-		@Nullable
-		private String currentSize;
-
-		private Long currentSizeInBytes;
-
-		private Long total;
-
-		@Nullable
-		private String totalAutoThrottle;
-
-		private Long totalAutoThrottleInBytes;
-
-		private Long totalDocs;
-
-		@Nullable
-		private String totalSize;
-
-		private Long totalSizeInBytes;
-
-		@Nullable
-		private String totalStoppedTime;
-
-		private Long totalStoppedTimeInMillis;
-
-		@Nullable
-		private String totalThrottledTime;
-
-		private Long totalThrottledTimeInMillis;
-
-		@Nullable
-		private String totalTime;
-
-		private Long totalTimeInMillis;
-
-		/**
-		 * Required - API name: {@code current}
-		 */
-		public final Builder current(long value) {
-			this.current = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code current_docs}
-		 */
-		public final Builder currentDocs(long value) {
-			this.currentDocs = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code current_size}
-		 */
-		public final Builder currentSize(@Nullable String value) {
-			this.currentSize = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code current_size_in_bytes}
-		 */
-		public final Builder currentSizeInBytes(long value) {
-			this.currentSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(long value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total_auto_throttle}
-		 */
-		public final Builder totalAutoThrottle(@Nullable String value) {
-			this.totalAutoThrottle = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_auto_throttle_in_bytes}
-		 */
-		public final Builder totalAutoThrottleInBytes(long value) {
-			this.totalAutoThrottleInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_docs}
-		 */
-		public final Builder totalDocs(long value) {
-			this.totalDocs = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total_size}
-		 */
-		public final Builder totalSize(@Nullable String value) {
-			this.totalSize = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_size_in_bytes}
-		 */
-		public final Builder totalSizeInBytes(long value) {
-			this.totalSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total_stopped_time}
-		 */
-		public final Builder totalStoppedTime(@Nullable String value) {
-			this.totalStoppedTime = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_stopped_time_in_millis}
-		 */
-		public final Builder totalStoppedTimeInMillis(long value) {
-			this.totalStoppedTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total_throttled_time}
-		 */
-		public final Builder totalThrottledTime(@Nullable String value) {
-			this.totalThrottledTime = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_throttled_time_in_millis}
-		 */
-		public final Builder totalThrottledTimeInMillis(long value) {
-			this.totalThrottledTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total_time}
-		 */
-		public final Builder totalTime(@Nullable String value) {
-			this.totalTime = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_time_in_millis}
-		 */
-		public final Builder totalTimeInMillis(long value) {
-			this.totalTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MergesStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MergesStats build() {
-			_checkSingleUse();
-
-			return new MergesStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MergesStats}
-	 */
-	public static final JsonpDeserializer<MergesStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			MergesStats::setupMergesStatsDeserializer);
-
-	protected static void setupMergesStatsDeserializer(ObjectDeserializer<MergesStats.Builder> op) {
-
-		op.add(Builder::current, JsonpDeserializer.longDeserializer(), "current");
-		op.add(Builder::currentDocs, JsonpDeserializer.longDeserializer(), "current_docs");
-		op.add(Builder::currentSize, JsonpDeserializer.stringDeserializer(), "current_size");
-		op.add(Builder::currentSizeInBytes, JsonpDeserializer.longDeserializer(), "current_size_in_bytes");
-		op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
-		op.add(Builder::totalAutoThrottle, JsonpDeserializer.stringDeserializer(), "total_auto_throttle");
-		op.add(Builder::totalAutoThrottleInBytes, JsonpDeserializer.longDeserializer(), "total_auto_throttle_in_bytes");
-		op.add(Builder::totalDocs, JsonpDeserializer.longDeserializer(), "total_docs");
-		op.add(Builder::totalSize, JsonpDeserializer.stringDeserializer(), "total_size");
-		op.add(Builder::totalSizeInBytes, JsonpDeserializer.longDeserializer(), "total_size_in_bytes");
-		op.add(Builder::totalStoppedTime, JsonpDeserializer.stringDeserializer(), "total_stopped_time");
-		op.add(Builder::totalStoppedTimeInMillis, JsonpDeserializer.longDeserializer(), "total_stopped_time_in_millis");
-		op.add(Builder::totalThrottledTime, JsonpDeserializer.stringDeserializer(), "total_throttled_time");
-		op.add(Builder::totalThrottledTimeInMillis, JsonpDeserializer.longDeserializer(),
-				"total_throttled_time_in_millis");
-		op.add(Builder::totalTime, JsonpDeserializer.stringDeserializer(), "total_time");
-		op.add(Builder::totalTimeInMillis, JsonpDeserializer.longDeserializer(), "total_time_in_millis");
-
-	}
+    private final long currentSizeInBytes;
+
+    private final long total;
+
+    @Nullable
+    private final String totalAutoThrottle;
+
+    private final long totalAutoThrottleInBytes;
+
+    private final long totalDocs;
+
+    @Nullable
+    private final String totalSize;
+
+    private final long totalSizeInBytes;
+
+    @Nullable
+    private final String totalStoppedTime;
+
+    private final long totalStoppedTimeInMillis;
+
+    @Nullable
+    private final String totalThrottledTime;
+
+    private final long totalThrottledTimeInMillis;
+
+    @Nullable
+    private final String totalTime;
+
+    private final long totalTimeInMillis;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MergesStats(Builder builder) {
+
+        this.current = ApiTypeHelper.requireNonNull(builder.current, this, "current");
+        this.currentDocs = ApiTypeHelper.requireNonNull(builder.currentDocs, this, "currentDocs");
+        this.currentSize = builder.currentSize;
+        this.currentSizeInBytes = ApiTypeHelper.requireNonNull(builder.currentSizeInBytes, this, "currentSizeInBytes");
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+        this.totalAutoThrottle = builder.totalAutoThrottle;
+        this.totalAutoThrottleInBytes = ApiTypeHelper.requireNonNull(builder.totalAutoThrottleInBytes, this, "totalAutoThrottleInBytes");
+        this.totalDocs = ApiTypeHelper.requireNonNull(builder.totalDocs, this, "totalDocs");
+        this.totalSize = builder.totalSize;
+        this.totalSizeInBytes = ApiTypeHelper.requireNonNull(builder.totalSizeInBytes, this, "totalSizeInBytes");
+        this.totalStoppedTime = builder.totalStoppedTime;
+        this.totalStoppedTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalStoppedTimeInMillis, this, "totalStoppedTimeInMillis");
+        this.totalThrottledTime = builder.totalThrottledTime;
+        this.totalThrottledTimeInMillis = ApiTypeHelper.requireNonNull(
+            builder.totalThrottledTimeInMillis,
+            this,
+            "totalThrottledTimeInMillis"
+        );
+        this.totalTime = builder.totalTime;
+        this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
+
+    }
+
+    public static MergesStats of(Function<Builder, ObjectBuilder<MergesStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code current}
+     */
+    public final long current() {
+        return this.current;
+    }
+
+    /**
+     * Required - API name: {@code current_docs}
+     */
+    public final long currentDocs() {
+        return this.currentDocs;
+    }
+
+    /**
+     * API name: {@code current_size}
+     */
+    @Nullable
+    public final String currentSize() {
+        return this.currentSize;
+    }
+
+    /**
+     * Required - API name: {@code current_size_in_bytes}
+     */
+    public final long currentSizeInBytes() {
+        return this.currentSizeInBytes;
+    }
+
+    /**
+     * Required - API name: {@code total}
+     */
+    public final long total() {
+        return this.total;
+    }
+
+    /**
+     * API name: {@code total_auto_throttle}
+     */
+    @Nullable
+    public final String totalAutoThrottle() {
+        return this.totalAutoThrottle;
+    }
+
+    /**
+     * Required - API name: {@code total_auto_throttle_in_bytes}
+     */
+    public final long totalAutoThrottleInBytes() {
+        return this.totalAutoThrottleInBytes;
+    }
+
+    /**
+     * Required - API name: {@code total_docs}
+     */
+    public final long totalDocs() {
+        return this.totalDocs;
+    }
+
+    /**
+     * API name: {@code total_size}
+     */
+    @Nullable
+    public final String totalSize() {
+        return this.totalSize;
+    }
+
+    /**
+     * Required - API name: {@code total_size_in_bytes}
+     */
+    public final long totalSizeInBytes() {
+        return this.totalSizeInBytes;
+    }
+
+    /**
+     * API name: {@code total_stopped_time}
+     */
+    @Nullable
+    public final String totalStoppedTime() {
+        return this.totalStoppedTime;
+    }
+
+    /**
+     * Required - API name: {@code total_stopped_time_in_millis}
+     */
+    public final long totalStoppedTimeInMillis() {
+        return this.totalStoppedTimeInMillis;
+    }
+
+    /**
+     * API name: {@code total_throttled_time}
+     */
+    @Nullable
+    public final String totalThrottledTime() {
+        return this.totalThrottledTime;
+    }
+
+    /**
+     * Required - API name: {@code total_throttled_time_in_millis}
+     */
+    public final long totalThrottledTimeInMillis() {
+        return this.totalThrottledTimeInMillis;
+    }
+
+    /**
+     * API name: {@code total_time}
+     */
+    @Nullable
+    public final String totalTime() {
+        return this.totalTime;
+    }
+
+    /**
+     * Required - API name: {@code total_time_in_millis}
+     */
+    public final long totalTimeInMillis() {
+        return this.totalTimeInMillis;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("current");
+        generator.write(this.current);
+
+        generator.writeKey("current_docs");
+        generator.write(this.currentDocs);
+
+        if (this.currentSize != null) {
+            generator.writeKey("current_size");
+            generator.write(this.currentSize);
+
+        }
+        generator.writeKey("current_size_in_bytes");
+        generator.write(this.currentSizeInBytes);
+
+        generator.writeKey("total");
+        generator.write(this.total);
+
+        if (this.totalAutoThrottle != null) {
+            generator.writeKey("total_auto_throttle");
+            generator.write(this.totalAutoThrottle);
+
+        }
+        generator.writeKey("total_auto_throttle_in_bytes");
+        generator.write(this.totalAutoThrottleInBytes);
+
+        generator.writeKey("total_docs");
+        generator.write(this.totalDocs);
+
+        if (this.totalSize != null) {
+            generator.writeKey("total_size");
+            generator.write(this.totalSize);
+
+        }
+        generator.writeKey("total_size_in_bytes");
+        generator.write(this.totalSizeInBytes);
+
+        if (this.totalStoppedTime != null) {
+            generator.writeKey("total_stopped_time");
+            generator.write(this.totalStoppedTime);
+
+        }
+        generator.writeKey("total_stopped_time_in_millis");
+        generator.write(this.totalStoppedTimeInMillis);
+
+        if (this.totalThrottledTime != null) {
+            generator.writeKey("total_throttled_time");
+            generator.write(this.totalThrottledTime);
+
+        }
+        generator.writeKey("total_throttled_time_in_millis");
+        generator.write(this.totalThrottledTimeInMillis);
+
+        if (this.totalTime != null) {
+            generator.writeKey("total_time");
+            generator.write(this.totalTime);
+
+        }
+        generator.writeKey("total_time_in_millis");
+        generator.write(this.totalTimeInMillis);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MergesStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MergesStats> {
+        private Long current;
+
+        private Long currentDocs;
+
+        @Nullable
+        private String currentSize;
+
+        private Long currentSizeInBytes;
+
+        private Long total;
+
+        @Nullable
+        private String totalAutoThrottle;
+
+        private Long totalAutoThrottleInBytes;
+
+        private Long totalDocs;
+
+        @Nullable
+        private String totalSize;
+
+        private Long totalSizeInBytes;
+
+        @Nullable
+        private String totalStoppedTime;
+
+        private Long totalStoppedTimeInMillis;
+
+        @Nullable
+        private String totalThrottledTime;
+
+        private Long totalThrottledTimeInMillis;
+
+        @Nullable
+        private String totalTime;
+
+        private Long totalTimeInMillis;
+
+        /**
+         * Required - API name: {@code current}
+         */
+        public final Builder current(long value) {
+            this.current = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code current_docs}
+         */
+        public final Builder currentDocs(long value) {
+            this.currentDocs = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code current_size}
+         */
+        public final Builder currentSize(@Nullable String value) {
+            this.currentSize = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code current_size_in_bytes}
+         */
+        public final Builder currentSizeInBytes(long value) {
+            this.currentSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(long value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total_auto_throttle}
+         */
+        public final Builder totalAutoThrottle(@Nullable String value) {
+            this.totalAutoThrottle = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_auto_throttle_in_bytes}
+         */
+        public final Builder totalAutoThrottleInBytes(long value) {
+            this.totalAutoThrottleInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_docs}
+         */
+        public final Builder totalDocs(long value) {
+            this.totalDocs = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total_size}
+         */
+        public final Builder totalSize(@Nullable String value) {
+            this.totalSize = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_size_in_bytes}
+         */
+        public final Builder totalSizeInBytes(long value) {
+            this.totalSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total_stopped_time}
+         */
+        public final Builder totalStoppedTime(@Nullable String value) {
+            this.totalStoppedTime = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_stopped_time_in_millis}
+         */
+        public final Builder totalStoppedTimeInMillis(long value) {
+            this.totalStoppedTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total_throttled_time}
+         */
+        public final Builder totalThrottledTime(@Nullable String value) {
+            this.totalThrottledTime = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_throttled_time_in_millis}
+         */
+        public final Builder totalThrottledTimeInMillis(long value) {
+            this.totalThrottledTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total_time}
+         */
+        public final Builder totalTime(@Nullable String value) {
+            this.totalTime = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_time_in_millis}
+         */
+        public final Builder totalTimeInMillis(long value) {
+            this.totalTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link MergesStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MergesStats build() {
+            _checkSingleUse();
+
+            return new MergesStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MergesStats}
+     */
+    public static final JsonpDeserializer<MergesStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MergesStats::setupMergesStatsDeserializer
+    );
+
+    protected static void setupMergesStatsDeserializer(ObjectDeserializer<MergesStats.Builder> op) {
+
+        op.add(Builder::current, JsonpDeserializer.longDeserializer(), "current");
+        op.add(Builder::currentDocs, JsonpDeserializer.longDeserializer(), "current_docs");
+        op.add(Builder::currentSize, JsonpDeserializer.stringDeserializer(), "current_size");
+        op.add(Builder::currentSizeInBytes, JsonpDeserializer.longDeserializer(), "current_size_in_bytes");
+        op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
+        op.add(Builder::totalAutoThrottle, JsonpDeserializer.stringDeserializer(), "total_auto_throttle");
+        op.add(Builder::totalAutoThrottleInBytes, JsonpDeserializer.longDeserializer(), "total_auto_throttle_in_bytes");
+        op.add(Builder::totalDocs, JsonpDeserializer.longDeserializer(), "total_docs");
+        op.add(Builder::totalSize, JsonpDeserializer.stringDeserializer(), "total_size");
+        op.add(Builder::totalSizeInBytes, JsonpDeserializer.longDeserializer(), "total_size_in_bytes");
+        op.add(Builder::totalStoppedTime, JsonpDeserializer.stringDeserializer(), "total_stopped_time");
+        op.add(Builder::totalStoppedTimeInMillis, JsonpDeserializer.longDeserializer(), "total_stopped_time_in_millis");
+        op.add(Builder::totalThrottledTime, JsonpDeserializer.stringDeserializer(), "total_throttled_time");
+        op.add(Builder::totalThrottledTimeInMillis, JsonpDeserializer.longDeserializer(), "total_throttled_time_in_millis");
+        op.add(Builder::totalTime, JsonpDeserializer.stringDeserializer(), "total_time");
+        op.add(Builder::totalTimeInMillis, JsonpDeserializer.longDeserializer(), "total_time_in_millis");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/NestedSortValue.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/NestedSortValue.java
index b1f16ea6bb..366abbca50 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/NestedSortValue.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/NestedSortValue.java
@@ -32,205 +32,206 @@
 
 package org.opensearch.client.opensearch._types;
 
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.NestedSortValue
 
 @JsonpDeserializable
 public class NestedSortValue implements JsonpSerializable {
-	@Nullable
-	private final Query filter;
-
-	@Nullable
-	private final Integer maxChildren;
+    @Nullable
+    private final Query filter;
+
+    @Nullable
+    private final Integer maxChildren;
 
-	@Nullable
-	private final NestedSortValue nested;
-
-	private final String path;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NestedSortValue(Builder builder) {
-
-		this.filter = builder.filter;
-		this.maxChildren = builder.maxChildren;
-		this.nested = builder.nested;
-		this.path = ApiTypeHelper.requireNonNull(builder.path, this, "path");
-
-	}
-
-	public static NestedSortValue of(Function<Builder, ObjectBuilder<NestedSortValue>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code filter}
-	 */
-	@Nullable
-	public final Query filter() {
-		return this.filter;
-	}
-
-	/**
-	 * API name: {@code max_children}
-	 */
-	@Nullable
-	public final Integer maxChildren() {
-		return this.maxChildren;
-	}
-
-	/**
-	 * API name: {@code nested}
-	 */
-	@Nullable
-	public final NestedSortValue nested() {
-		return this.nested;
-	}
-
-	/**
-	 * Required - API name: {@code path}
-	 */
-	public final String path() {
-		return this.path;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.filter != null) {
-			generator.writeKey("filter");
-			this.filter.serialize(generator, mapper);
-
-		}
-		if (this.maxChildren != null) {
-			generator.writeKey("max_children");
-			generator.write(this.maxChildren);
-
-		}
-		if (this.nested != null) {
-			generator.writeKey("nested");
-			this.nested.serialize(generator, mapper);
-
-		}
-		generator.writeKey("path");
-		generator.write(this.path);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NestedSortValue}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NestedSortValue> {
-		@Nullable
-		private Query filter;
-
-		@Nullable
-		private Integer maxChildren;
-
-		@Nullable
-		private NestedSortValue nested;
-
-		private String path;
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(@Nullable Query value) {
-			this.filter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.filter(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code max_children}
-		 */
-		public final Builder maxChildren(@Nullable Integer value) {
-			this.maxChildren = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code nested}
-		 */
-		public final Builder nested(@Nullable NestedSortValue value) {
-			this.nested = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code nested}
-		 */
-		public final Builder nested(Function<NestedSortValue.Builder, ObjectBuilder<NestedSortValue>> fn) {
-			return this.nested(fn.apply(new NestedSortValue.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code path}
-		 */
-		public final Builder path(String value) {
-			this.path = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NestedSortValue}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NestedSortValue build() {
-			_checkSingleUse();
-
-			return new NestedSortValue(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NestedSortValue}
-	 */
-	public static final JsonpDeserializer<NestedSortValue> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NestedSortValue::setupNestedSortValueDeserializer);
-
-	protected static void setupNestedSortValueDeserializer(ObjectDeserializer<NestedSortValue.Builder> op) {
-
-		op.add(Builder::filter, Query._DESERIALIZER, "filter");
-		op.add(Builder::maxChildren, JsonpDeserializer.integerDeserializer(), "max_children");
-		op.add(Builder::nested, NestedSortValue._DESERIALIZER, "nested");
-		op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
-
-	}
+    @Nullable
+    private final NestedSortValue nested;
+
+    private final String path;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NestedSortValue(Builder builder) {
+
+        this.filter = builder.filter;
+        this.maxChildren = builder.maxChildren;
+        this.nested = builder.nested;
+        this.path = ApiTypeHelper.requireNonNull(builder.path, this, "path");
+
+    }
+
+    public static NestedSortValue of(Function<Builder, ObjectBuilder<NestedSortValue>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code filter}
+     */
+    @Nullable
+    public final Query filter() {
+        return this.filter;
+    }
+
+    /**
+     * API name: {@code max_children}
+     */
+    @Nullable
+    public final Integer maxChildren() {
+        return this.maxChildren;
+    }
+
+    /**
+     * API name: {@code nested}
+     */
+    @Nullable
+    public final NestedSortValue nested() {
+        return this.nested;
+    }
+
+    /**
+     * Required - API name: {@code path}
+     */
+    public final String path() {
+        return this.path;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.filter != null) {
+            generator.writeKey("filter");
+            this.filter.serialize(generator, mapper);
+
+        }
+        if (this.maxChildren != null) {
+            generator.writeKey("max_children");
+            generator.write(this.maxChildren);
+
+        }
+        if (this.nested != null) {
+            generator.writeKey("nested");
+            this.nested.serialize(generator, mapper);
+
+        }
+        generator.writeKey("path");
+        generator.write(this.path);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NestedSortValue}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NestedSortValue> {
+        @Nullable
+        private Query filter;
+
+        @Nullable
+        private Integer maxChildren;
+
+        @Nullable
+        private NestedSortValue nested;
+
+        private String path;
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(@Nullable Query value) {
+            this.filter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.filter(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code max_children}
+         */
+        public final Builder maxChildren(@Nullable Integer value) {
+            this.maxChildren = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code nested}
+         */
+        public final Builder nested(@Nullable NestedSortValue value) {
+            this.nested = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code nested}
+         */
+        public final Builder nested(Function<NestedSortValue.Builder, ObjectBuilder<NestedSortValue>> fn) {
+            return this.nested(fn.apply(new NestedSortValue.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code path}
+         */
+        public final Builder path(String value) {
+            this.path = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NestedSortValue}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NestedSortValue build() {
+            _checkSingleUse();
+
+            return new NestedSortValue(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NestedSortValue}
+     */
+    public static final JsonpDeserializer<NestedSortValue> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NestedSortValue::setupNestedSortValueDeserializer
+    );
+
+    protected static void setupNestedSortValueDeserializer(ObjectDeserializer<NestedSortValue.Builder> op) {
+
+        op.add(Builder::filter, Query._DESERIALIZER, "filter");
+        op.add(Builder::maxChildren, JsonpDeserializer.integerDeserializer(), "max_children");
+        op.add(Builder::nested, NestedSortValue._DESERIALIZER, "nested");
+        op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/NodeAttributes.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/NodeAttributes.java
index 53f19e7382..ac02a7b1d3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/NodeAttributes.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/NodeAttributes.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,283 +46,279 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.NodeAttributes
 
 @JsonpDeserializable
 public class NodeAttributes implements JsonpSerializable {
-	private final Map<String, String> attributes;
-
-	private final String ephemeralId;
-
-	@Nullable
-	private final String id;
-
-	private final String name;
-
-	private final String transportAddress;
-
-	private final List<NodeRole> roles;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeAttributes(Builder builder) {
-
-		this.attributes = ApiTypeHelper.unmodifiableRequired(builder.attributes, this, "attributes");
-		this.ephemeralId = ApiTypeHelper.requireNonNull(builder.ephemeralId, this, "ephemeralId");
-		this.id = builder.id;
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.transportAddress = ApiTypeHelper.requireNonNull(builder.transportAddress, this, "transportAddress");
-		this.roles = ApiTypeHelper.unmodifiable(builder.roles);
-
-	}
-
-	public static NodeAttributes of(Function<Builder, ObjectBuilder<NodeAttributes>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Lists node attributes.
-	 * <p>
-	 * API name: {@code attributes}
-	 */
-	public final Map<String, String> attributes() {
-		return this.attributes;
-	}
-
-	/**
-	 * Required - The ephemeral ID of the node.
-	 * <p>
-	 * API name: {@code ephemeral_id}
-	 */
-	public final String ephemeralId() {
-		return this.ephemeralId;
-	}
-
-	/**
-	 * The unique identifier of the node.
-	 * <p>
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - The unique identifier of the node.
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Required - The host and port where transport HTTP connections are accepted.
-	 * <p>
-	 * API name: {@code transport_address}
-	 */
-	public final String transportAddress() {
-		return this.transportAddress;
-	}
-
-	/**
-	 * API name: {@code roles}
-	 */
-	public final List<NodeRole> roles() {
-		return this.roles;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.attributes)) {
-			generator.writeKey("attributes");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.attributes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("ephemeral_id");
-		generator.write(this.ephemeralId);
-
-		if (this.id != null) {
-			generator.writeKey("id");
-			generator.write(this.id);
-
-		}
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		generator.writeKey("transport_address");
-		generator.write(this.transportAddress);
-
-		if (ApiTypeHelper.isDefined(this.roles)) {
-			generator.writeKey("roles");
-			generator.writeStartArray();
-			for (NodeRole item0 : this.roles) {
-				item0.serialize(generator, mapper);
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeAttributes}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeAttributes> {
-		private Map<String, String> attributes;
-
-		private String ephemeralId;
-
-		@Nullable
-		private String id;
-
-		private String name;
-
-		private String transportAddress;
-
-		@Nullable
-		private List<NodeRole> roles;
-
-		/**
-		 * Required - Lists node attributes.
-		 * <p>
-		 * API name: {@code attributes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>attributes</code>.
-		 */
-		public final Builder attributes(Map<String, String> map) {
-			this.attributes = _mapPutAll(this.attributes, map);
-			return this;
-		}
-
-		/**
-		 * Required - Lists node attributes.
-		 * <p>
-		 * API name: {@code attributes}
-		 * <p>
-		 * Adds an entry to <code>attributes</code>.
-		 */
-		public final Builder attributes(String key, String value) {
-			this.attributes = _mapPut(this.attributes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - The ephemeral ID of the node.
-		 * <p>
-		 * API name: {@code ephemeral_id}
-		 */
-		public final Builder ephemeralId(String value) {
-			this.ephemeralId = value;
-			return this;
-		}
-
-		/**
-		 * The unique identifier of the node.
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - The unique identifier of the node.
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - The host and port where transport HTTP connections are accepted.
-		 * <p>
-		 * API name: {@code transport_address}
-		 */
-		public final Builder transportAddress(String value) {
-			this.transportAddress = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code roles}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>roles</code>.
-		 */
-		public final Builder roles(List<NodeRole> list) {
-			this.roles = _listAddAll(this.roles, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code roles}
-		 * <p>
-		 * Adds one or more values to <code>roles</code>.
-		 */
-		public final Builder roles(NodeRole value, NodeRole... values) {
-			this.roles = _listAdd(this.roles, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeAttributes}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeAttributes build() {
-			_checkSingleUse();
-
-			return new NodeAttributes(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeAttributes}
-	 */
-	public static final JsonpDeserializer<NodeAttributes> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeAttributes::setupNodeAttributesDeserializer);
-
-	protected static void setupNodeAttributesDeserializer(ObjectDeserializer<NodeAttributes.Builder> op) {
-
-		op.add(Builder::attributes, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
-				"attributes");
-		op.add(Builder::ephemeralId, JsonpDeserializer.stringDeserializer(), "ephemeral_id");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::transportAddress, JsonpDeserializer.stringDeserializer(), "transport_address");
-		op.add(Builder::roles, JsonpDeserializer.arrayDeserializer(NodeRole._DESERIALIZER), "roles");
-
-	}
+    private final Map<String, String> attributes;
+
+    private final String ephemeralId;
+
+    @Nullable
+    private final String id;
+
+    private final String name;
+
+    private final String transportAddress;
+
+    private final List<NodeRole> roles;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeAttributes(Builder builder) {
+
+        this.attributes = ApiTypeHelper.unmodifiableRequired(builder.attributes, this, "attributes");
+        this.ephemeralId = ApiTypeHelper.requireNonNull(builder.ephemeralId, this, "ephemeralId");
+        this.id = builder.id;
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.transportAddress = ApiTypeHelper.requireNonNull(builder.transportAddress, this, "transportAddress");
+        this.roles = ApiTypeHelper.unmodifiable(builder.roles);
+
+    }
+
+    public static NodeAttributes of(Function<Builder, ObjectBuilder<NodeAttributes>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Lists node attributes.
+     * <p>
+     * API name: {@code attributes}
+     */
+    public final Map<String, String> attributes() {
+        return this.attributes;
+    }
+
+    /**
+     * Required - The ephemeral ID of the node.
+     * <p>
+     * API name: {@code ephemeral_id}
+     */
+    public final String ephemeralId() {
+        return this.ephemeralId;
+    }
+
+    /**
+     * The unique identifier of the node.
+     * <p>
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - The unique identifier of the node.
+     * <p>
+     * API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Required - The host and port where transport HTTP connections are accepted.
+     * <p>
+     * API name: {@code transport_address}
+     */
+    public final String transportAddress() {
+        return this.transportAddress;
+    }
+
+    /**
+     * API name: {@code roles}
+     */
+    public final List<NodeRole> roles() {
+        return this.roles;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.attributes)) {
+            generator.writeKey("attributes");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.attributes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("ephemeral_id");
+        generator.write(this.ephemeralId);
+
+        if (this.id != null) {
+            generator.writeKey("id");
+            generator.write(this.id);
+
+        }
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        generator.writeKey("transport_address");
+        generator.write(this.transportAddress);
+
+        if (ApiTypeHelper.isDefined(this.roles)) {
+            generator.writeKey("roles");
+            generator.writeStartArray();
+            for (NodeRole item0 : this.roles) {
+                item0.serialize(generator, mapper);
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeAttributes}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeAttributes> {
+        private Map<String, String> attributes;
+
+        private String ephemeralId;
+
+        @Nullable
+        private String id;
+
+        private String name;
+
+        private String transportAddress;
+
+        @Nullable
+        private List<NodeRole> roles;
+
+        /**
+         * Required - Lists node attributes.
+         * <p>
+         * API name: {@code attributes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>attributes</code>.
+         */
+        public final Builder attributes(Map<String, String> map) {
+            this.attributes = _mapPutAll(this.attributes, map);
+            return this;
+        }
+
+        /**
+         * Required - Lists node attributes.
+         * <p>
+         * API name: {@code attributes}
+         * <p>
+         * Adds an entry to <code>attributes</code>.
+         */
+        public final Builder attributes(String key, String value) {
+            this.attributes = _mapPut(this.attributes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - The ephemeral ID of the node.
+         * <p>
+         * API name: {@code ephemeral_id}
+         */
+        public final Builder ephemeralId(String value) {
+            this.ephemeralId = value;
+            return this;
+        }
+
+        /**
+         * The unique identifier of the node.
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - The unique identifier of the node.
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - The host and port where transport HTTP connections are accepted.
+         * <p>
+         * API name: {@code transport_address}
+         */
+        public final Builder transportAddress(String value) {
+            this.transportAddress = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code roles}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>roles</code>.
+         */
+        public final Builder roles(List<NodeRole> list) {
+            this.roles = _listAddAll(this.roles, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code roles}
+         * <p>
+         * Adds one or more values to <code>roles</code>.
+         */
+        public final Builder roles(NodeRole value, NodeRole... values) {
+            this.roles = _listAdd(this.roles, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeAttributes}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeAttributes build() {
+            _checkSingleUse();
+
+            return new NodeAttributes(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeAttributes}
+     */
+    public static final JsonpDeserializer<NodeAttributes> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeAttributes::setupNodeAttributesDeserializer
+    );
+
+    protected static void setupNodeAttributesDeserializer(ObjectDeserializer<NodeAttributes.Builder> op) {
+
+        op.add(Builder::attributes, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "attributes");
+        op.add(Builder::ephemeralId, JsonpDeserializer.stringDeserializer(), "ephemeral_id");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::transportAddress, JsonpDeserializer.stringDeserializer(), "transport_address");
+        op.add(Builder::roles, JsonpDeserializer.arrayDeserializer(NodeRole._DESERIALIZER), "roles");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/NodeRole.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/NodeRole.java
index f00cbc9146..530603353f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/NodeRole.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/NodeRole.java
@@ -37,48 +37,48 @@
 
 @JsonpDeserializable
 public enum NodeRole implements JsonEnum {
-	@Deprecated
-	Master("master"),
+    @Deprecated
+    Master("master"),
 
-	ClusterManager("cluster_manager"),
+    ClusterManager("cluster_manager"),
 
-	Data("data"),
+    Data("data"),
 
-	DataCold("data_cold"),
+    DataCold("data_cold"),
 
-	DataContent("data_content"),
+    DataContent("data_content"),
 
-	DataFrozen("data_frozen"),
+    DataFrozen("data_frozen"),
 
-	DataHot("data_hot"),
+    DataHot("data_hot"),
 
-	DataWarm("data_warm"),
+    DataWarm("data_warm"),
 
-	Client("client"),
+    Client("client"),
 
-	Ingest("ingest"),
+    Ingest("ingest"),
 
-	Ml("ml"),
+    Ml("ml"),
 
-	VotingOnly("voting_only"),
+    VotingOnly("voting_only"),
 
-	Transform("transform"),
+    Transform("transform"),
 
-	RemoteClusterClient("remote_cluster_client"),
+    RemoteClusterClient("remote_cluster_client"),
 
-	CoordinatingOnly("coordinating_only"),
+    CoordinatingOnly("coordinating_only"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	NodeRole(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    NodeRole(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<NodeRole> _DESERIALIZER = new JsonEnum.Deserializer<>(NodeRole.values());
+    public static final JsonEnum.Deserializer<NodeRole> _DESERIALIZER = new JsonEnum.Deserializer<>(NodeRole.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/NodeShard.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/NodeShard.java
index 1c77110356..2e504aa517 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/NodeShard.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/NodeShard.java
@@ -32,336 +32,334 @@
 
 package org.opensearch.client.opensearch._types;
 
-import org.opensearch.client.opensearch.cluster.allocation_explain.UnassignedInformation;
-import org.opensearch.client.opensearch.indices.stats.ShardRoutingState;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.cluster.allocation_explain.UnassignedInformation;
+import org.opensearch.client.opensearch.indices.stats.ShardRoutingState;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.NodeShard
 
 @JsonpDeserializable
 public class NodeShard implements JsonpSerializable {
-	private final ShardRoutingState state;
-
-	private final boolean primary;
-
-	@Nullable
-	private final String node;
-
-	private final int shard;
-
-	private final String index;
-
-	private final Map<String, String> allocationId;
-
-	private final Map<String, String> recoverySource;
-
-	@Nullable
-	private final UnassignedInformation unassignedInfo;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeShard(Builder builder) {
-
-		this.state = ApiTypeHelper.requireNonNull(builder.state, this, "state");
-		this.primary = ApiTypeHelper.requireNonNull(builder.primary, this, "primary");
-		this.node = builder.node;
-		this.shard = ApiTypeHelper.requireNonNull(builder.shard, this, "shard");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.allocationId = ApiTypeHelper.unmodifiable(builder.allocationId);
-		this.recoverySource = ApiTypeHelper.unmodifiable(builder.recoverySource);
-		this.unassignedInfo = builder.unassignedInfo;
-
-	}
-
-	public static NodeShard of(Function<Builder, ObjectBuilder<NodeShard>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code state}
-	 */
-	public final ShardRoutingState state() {
-		return this.state;
-	}
-
-	/**
-	 * Required - API name: {@code primary}
-	 */
-	public final boolean primary() {
-		return this.primary;
-	}
-
-	/**
-	 * API name: {@code node}
-	 */
-	@Nullable
-	public final String node() {
-		return this.node;
-	}
-
-	/**
-	 * Required - API name: {@code shard}
-	 */
-	public final int shard() {
-		return this.shard;
-	}
-
-	/**
-	 * Required - API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code allocation_id}
-	 */
-	public final Map<String, String> allocationId() {
-		return this.allocationId;
-	}
-
-	/**
-	 * API name: {@code recovery_source}
-	 */
-	public final Map<String, String> recoverySource() {
-		return this.recoverySource;
-	}
-
-	/**
-	 * API name: {@code unassigned_info}
-	 */
-	@Nullable
-	public final UnassignedInformation unassignedInfo() {
-		return this.unassignedInfo;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("state");
-		this.state.serialize(generator, mapper);
-		generator.writeKey("primary");
-		generator.write(this.primary);
-
-		if (this.node != null) {
-			generator.writeKey("node");
-			generator.write(this.node);
-
-		}
-		generator.writeKey("shard");
-		generator.write(this.shard);
-
-		generator.writeKey("index");
-		generator.write(this.index);
-
-		if (ApiTypeHelper.isDefined(this.allocationId)) {
-			generator.writeKey("allocation_id");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.allocationId.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.recoverySource)) {
-			generator.writeKey("recovery_source");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.recoverySource.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.unassignedInfo != null) {
-			generator.writeKey("unassigned_info");
-			this.unassignedInfo.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeShard}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeShard> {
-		private ShardRoutingState state;
-
-		private Boolean primary;
-
-		@Nullable
-		private String node;
-
-		private Integer shard;
-
-		private String index;
-
-		@Nullable
-		private Map<String, String> allocationId;
-
-		@Nullable
-		private Map<String, String> recoverySource;
-
-		@Nullable
-		private UnassignedInformation unassignedInfo;
-
-		/**
-		 * Required - API name: {@code state}
-		 */
-		public final Builder state(ShardRoutingState value) {
-			this.state = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code primary}
-		 */
-		public final Builder primary(boolean value) {
-			this.primary = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code node}
-		 */
-		public final Builder node(@Nullable String value) {
-			this.node = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shard}
-		 */
-		public final Builder shard(int value) {
-			this.shard = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code allocation_id}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>allocationId</code>.
-		 */
-		public final Builder allocationId(Map<String, String> map) {
-			this.allocationId = _mapPutAll(this.allocationId, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code allocation_id}
-		 * <p>
-		 * Adds an entry to <code>allocationId</code>.
-		 */
-		public final Builder allocationId(String key, String value) {
-			this.allocationId = _mapPut(this.allocationId, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code recovery_source}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>recoverySource</code>.
-		 */
-		public final Builder recoverySource(Map<String, String> map) {
-			this.recoverySource = _mapPutAll(this.recoverySource, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code recovery_source}
-		 * <p>
-		 * Adds an entry to <code>recoverySource</code>.
-		 */
-		public final Builder recoverySource(String key, String value) {
-			this.recoverySource = _mapPut(this.recoverySource, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code unassigned_info}
-		 */
-		public final Builder unassignedInfo(@Nullable UnassignedInformation value) {
-			this.unassignedInfo = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code unassigned_info}
-		 */
-		public final Builder unassignedInfo(
-				Function<UnassignedInformation.Builder, ObjectBuilder<UnassignedInformation>> fn) {
-			return this.unassignedInfo(fn.apply(new UnassignedInformation.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link NodeShard}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeShard build() {
-			_checkSingleUse();
-
-			return new NodeShard(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeShard}
-	 */
-	public static final JsonpDeserializer<NodeShard> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeShard::setupNodeShardDeserializer);
-
-	protected static void setupNodeShardDeserializer(ObjectDeserializer<NodeShard.Builder> op) {
-
-		op.add(Builder::state, ShardRoutingState._DESERIALIZER, "state");
-		op.add(Builder::primary, JsonpDeserializer.booleanDeserializer(), "primary");
-		op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
-		op.add(Builder::shard, JsonpDeserializer.integerDeserializer(), "shard");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::allocationId, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
-				"allocation_id");
-		op.add(Builder::recoverySource, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
-				"recovery_source");
-		op.add(Builder::unassignedInfo, UnassignedInformation._DESERIALIZER, "unassigned_info");
-
-	}
+    private final ShardRoutingState state;
+
+    private final boolean primary;
+
+    @Nullable
+    private final String node;
+
+    private final int shard;
+
+    private final String index;
+
+    private final Map<String, String> allocationId;
+
+    private final Map<String, String> recoverySource;
+
+    @Nullable
+    private final UnassignedInformation unassignedInfo;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeShard(Builder builder) {
+
+        this.state = ApiTypeHelper.requireNonNull(builder.state, this, "state");
+        this.primary = ApiTypeHelper.requireNonNull(builder.primary, this, "primary");
+        this.node = builder.node;
+        this.shard = ApiTypeHelper.requireNonNull(builder.shard, this, "shard");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.allocationId = ApiTypeHelper.unmodifiable(builder.allocationId);
+        this.recoverySource = ApiTypeHelper.unmodifiable(builder.recoverySource);
+        this.unassignedInfo = builder.unassignedInfo;
+
+    }
+
+    public static NodeShard of(Function<Builder, ObjectBuilder<NodeShard>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code state}
+     */
+    public final ShardRoutingState state() {
+        return this.state;
+    }
+
+    /**
+     * Required - API name: {@code primary}
+     */
+    public final boolean primary() {
+        return this.primary;
+    }
+
+    /**
+     * API name: {@code node}
+     */
+    @Nullable
+    public final String node() {
+        return this.node;
+    }
+
+    /**
+     * Required - API name: {@code shard}
+     */
+    public final int shard() {
+        return this.shard;
+    }
+
+    /**
+     * Required - API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code allocation_id}
+     */
+    public final Map<String, String> allocationId() {
+        return this.allocationId;
+    }
+
+    /**
+     * API name: {@code recovery_source}
+     */
+    public final Map<String, String> recoverySource() {
+        return this.recoverySource;
+    }
+
+    /**
+     * API name: {@code unassigned_info}
+     */
+    @Nullable
+    public final UnassignedInformation unassignedInfo() {
+        return this.unassignedInfo;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("state");
+        this.state.serialize(generator, mapper);
+        generator.writeKey("primary");
+        generator.write(this.primary);
+
+        if (this.node != null) {
+            generator.writeKey("node");
+            generator.write(this.node);
+
+        }
+        generator.writeKey("shard");
+        generator.write(this.shard);
+
+        generator.writeKey("index");
+        generator.write(this.index);
+
+        if (ApiTypeHelper.isDefined(this.allocationId)) {
+            generator.writeKey("allocation_id");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.allocationId.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.recoverySource)) {
+            generator.writeKey("recovery_source");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.recoverySource.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.unassignedInfo != null) {
+            generator.writeKey("unassigned_info");
+            this.unassignedInfo.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeShard}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeShard> {
+        private ShardRoutingState state;
+
+        private Boolean primary;
+
+        @Nullable
+        private String node;
+
+        private Integer shard;
+
+        private String index;
+
+        @Nullable
+        private Map<String, String> allocationId;
+
+        @Nullable
+        private Map<String, String> recoverySource;
+
+        @Nullable
+        private UnassignedInformation unassignedInfo;
+
+        /**
+         * Required - API name: {@code state}
+         */
+        public final Builder state(ShardRoutingState value) {
+            this.state = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code primary}
+         */
+        public final Builder primary(boolean value) {
+            this.primary = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code node}
+         */
+        public final Builder node(@Nullable String value) {
+            this.node = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shard}
+         */
+        public final Builder shard(int value) {
+            this.shard = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code allocation_id}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>allocationId</code>.
+         */
+        public final Builder allocationId(Map<String, String> map) {
+            this.allocationId = _mapPutAll(this.allocationId, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code allocation_id}
+         * <p>
+         * Adds an entry to <code>allocationId</code>.
+         */
+        public final Builder allocationId(String key, String value) {
+            this.allocationId = _mapPut(this.allocationId, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code recovery_source}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>recoverySource</code>.
+         */
+        public final Builder recoverySource(Map<String, String> map) {
+            this.recoverySource = _mapPutAll(this.recoverySource, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code recovery_source}
+         * <p>
+         * Adds an entry to <code>recoverySource</code>.
+         */
+        public final Builder recoverySource(String key, String value) {
+            this.recoverySource = _mapPut(this.recoverySource, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code unassigned_info}
+         */
+        public final Builder unassignedInfo(@Nullable UnassignedInformation value) {
+            this.unassignedInfo = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code unassigned_info}
+         */
+        public final Builder unassignedInfo(Function<UnassignedInformation.Builder, ObjectBuilder<UnassignedInformation>> fn) {
+            return this.unassignedInfo(fn.apply(new UnassignedInformation.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link NodeShard}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeShard build() {
+            _checkSingleUse();
+
+            return new NodeShard(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeShard}
+     */
+    public static final JsonpDeserializer<NodeShard> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeShard::setupNodeShardDeserializer
+    );
+
+    protected static void setupNodeShardDeserializer(ObjectDeserializer<NodeShard.Builder> op) {
+
+        op.add(Builder::state, ShardRoutingState._DESERIALIZER, "state");
+        op.add(Builder::primary, JsonpDeserializer.booleanDeserializer(), "primary");
+        op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
+        op.add(Builder::shard, JsonpDeserializer.integerDeserializer(), "shard");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::allocationId, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "allocation_id");
+        op.add(Builder::recoverySource, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "recovery_source");
+        op.add(Builder::unassignedInfo, UnassignedInformation._DESERIALIZER, "unassigned_info");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/NodeStatistics.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/NodeStatistics.java
index ea17496835..61bc2e5fc1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/NodeStatistics.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/NodeStatistics.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,211 +45,209 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.NodeStatistics
 
 @JsonpDeserializable
 public class NodeStatistics implements JsonpSerializable {
-	private final List<ErrorCause> failures;
-
-	private final int total;
-
-	private final int successful;
+    private final List<ErrorCause> failures;
+
+    private final int total;
+
+    private final int successful;
 
-	private final int failed;
+    private final int failed;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private NodeStatistics(Builder builder) {
-
-		this.failures = ApiTypeHelper.unmodifiable(builder.failures);
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
-		this.successful = ApiTypeHelper.requireNonNull(builder.successful, this, "successful");
-		this.failed = ApiTypeHelper.requireNonNull(builder.failed, this, "failed");
-
-	}
-
-	public static NodeStatistics of(Function<Builder, ObjectBuilder<NodeStatistics>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code failures}
-	 */
-	public final List<ErrorCause> failures() {
-		return this.failures;
-	}
-
-	/**
-	 * Required - Total number of nodes selected by the request.
-	 * <p>
-	 * API name: {@code total}
-	 */
-	public final int total() {
-		return this.total;
-	}
-
-	/**
-	 * Required - Number of nodes that responded successfully to the request.
-	 * <p>
-	 * API name: {@code successful}
-	 */
-	public final int successful() {
-		return this.successful;
-	}
-
-	/**
-	 * Required - Number of nodes that rejected the request or failed to respond. If
-	 * this value is not 0, a reason for the rejection or failure is included in the
-	 * response.
-	 * <p>
-	 * API name: {@code failed}
-	 */
-	public final int failed() {
-		return this.failed;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.failures)) {
-			generator.writeKey("failures");
-			generator.writeStartArray();
-			for (ErrorCause item0 : this.failures) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("total");
-		generator.write(this.total);
-
-		generator.writeKey("successful");
-		generator.write(this.successful);
-
-		generator.writeKey("failed");
-		generator.write(this.failed);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeStatistics}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeStatistics> {
-		@Nullable
-		private List<ErrorCause> failures;
-
-		private Integer total;
-
-		private Integer successful;
-
-		private Integer failed;
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>failures</code>.
-		 */
-		public final Builder failures(List<ErrorCause> list) {
-			this.failures = _listAddAll(this.failures, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds one or more values to <code>failures</code>.
-		 */
-		public final Builder failures(ErrorCause value, ErrorCause... values) {
-			this.failures = _listAdd(this.failures, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds a value to <code>failures</code> using a builder lambda.
-		 */
-		public final Builder failures(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
-			return failures(fn.apply(new ErrorCause.Builder()).build());
-		}
-
-		/**
-		 * Required - Total number of nodes selected by the request.
-		 * <p>
-		 * API name: {@code total}
-		 */
-		public final Builder total(int value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * Required - Number of nodes that responded successfully to the request.
-		 * <p>
-		 * API name: {@code successful}
-		 */
-		public final Builder successful(int value) {
-			this.successful = value;
-			return this;
-		}
-
-		/**
-		 * Required - Number of nodes that rejected the request or failed to respond. If
-		 * this value is not 0, a reason for the rejection or failure is included in the
-		 * response.
-		 * <p>
-		 * API name: {@code failed}
-		 */
-		public final Builder failed(int value) {
-			this.failed = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeStatistics}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeStatistics build() {
-			_checkSingleUse();
-
-			return new NodeStatistics(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeStatistics}
-	 */
-	public static final JsonpDeserializer<NodeStatistics> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeStatistics::setupNodeStatisticsDeserializer);
-
-	protected static void setupNodeStatisticsDeserializer(ObjectDeserializer<NodeStatistics.Builder> op) {
-
-		op.add(Builder::failures, JsonpDeserializer.arrayDeserializer(ErrorCause._DESERIALIZER), "failures");
-		op.add(Builder::total, JsonpDeserializer.integerDeserializer(), "total");
-		op.add(Builder::successful, JsonpDeserializer.integerDeserializer(), "successful");
-		op.add(Builder::failed, JsonpDeserializer.integerDeserializer(), "failed");
-
-	}
+    private NodeStatistics(Builder builder) {
+
+        this.failures = ApiTypeHelper.unmodifiable(builder.failures);
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+        this.successful = ApiTypeHelper.requireNonNull(builder.successful, this, "successful");
+        this.failed = ApiTypeHelper.requireNonNull(builder.failed, this, "failed");
+
+    }
+
+    public static NodeStatistics of(Function<Builder, ObjectBuilder<NodeStatistics>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code failures}
+     */
+    public final List<ErrorCause> failures() {
+        return this.failures;
+    }
+
+    /**
+     * Required - Total number of nodes selected by the request.
+     * <p>
+     * API name: {@code total}
+     */
+    public final int total() {
+        return this.total;
+    }
+
+    /**
+     * Required - Number of nodes that responded successfully to the request.
+     * <p>
+     * API name: {@code successful}
+     */
+    public final int successful() {
+        return this.successful;
+    }
+
+    /**
+     * Required - Number of nodes that rejected the request or failed to respond. If
+     * this value is not 0, a reason for the rejection or failure is included in the
+     * response.
+     * <p>
+     * API name: {@code failed}
+     */
+    public final int failed() {
+        return this.failed;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.failures)) {
+            generator.writeKey("failures");
+            generator.writeStartArray();
+            for (ErrorCause item0 : this.failures) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("total");
+        generator.write(this.total);
+
+        generator.writeKey("successful");
+        generator.write(this.successful);
+
+        generator.writeKey("failed");
+        generator.write(this.failed);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeStatistics}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeStatistics> {
+        @Nullable
+        private List<ErrorCause> failures;
+
+        private Integer total;
+
+        private Integer successful;
+
+        private Integer failed;
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>failures</code>.
+         */
+        public final Builder failures(List<ErrorCause> list) {
+            this.failures = _listAddAll(this.failures, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds one or more values to <code>failures</code>.
+         */
+        public final Builder failures(ErrorCause value, ErrorCause... values) {
+            this.failures = _listAdd(this.failures, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds a value to <code>failures</code> using a builder lambda.
+         */
+        public final Builder failures(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
+            return failures(fn.apply(new ErrorCause.Builder()).build());
+        }
+
+        /**
+         * Required - Total number of nodes selected by the request.
+         * <p>
+         * API name: {@code total}
+         */
+        public final Builder total(int value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * Required - Number of nodes that responded successfully to the request.
+         * <p>
+         * API name: {@code successful}
+         */
+        public final Builder successful(int value) {
+            this.successful = value;
+            return this;
+        }
+
+        /**
+         * Required - Number of nodes that rejected the request or failed to respond. If
+         * this value is not 0, a reason for the rejection or failure is included in the
+         * response.
+         * <p>
+         * API name: {@code failed}
+         */
+        public final Builder failed(int value) {
+            this.failed = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeStatistics}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeStatistics build() {
+            _checkSingleUse();
+
+            return new NodeStatistics(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeStatistics}
+     */
+    public static final JsonpDeserializer<NodeStatistics> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeStatistics::setupNodeStatisticsDeserializer
+    );
+
+    protected static void setupNodeStatisticsDeserializer(ObjectDeserializer<NodeStatistics.Builder> op) {
+
+        op.add(Builder::failures, JsonpDeserializer.arrayDeserializer(ErrorCause._DESERIALIZER), "failures");
+        op.add(Builder::total, JsonpDeserializer.integerDeserializer(), "total");
+        op.add(Builder::successful, JsonpDeserializer.integerDeserializer(), "successful");
+        op.add(Builder::failed, JsonpDeserializer.integerDeserializer(), "failed");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/OpType.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/OpType.java
index e415250039..0a3151caa2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/OpType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/OpType.java
@@ -37,21 +37,21 @@
 
 @JsonpDeserializable
 public enum OpType implements JsonEnum {
-	Index("index"),
+    Index("index"),
 
-	Create("create"),
+    Create("create"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	OpType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    OpType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<OpType> _DESERIALIZER = new JsonEnum.Deserializer<>(OpType.values());
+    public static final JsonEnum.Deserializer<OpType> _DESERIALIZER = new JsonEnum.Deserializer<>(OpType.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/OpenSearchException.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/OpenSearchException.java
index 993d68989d..e2addab959 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/OpenSearchException.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/OpenSearchException.java
@@ -42,32 +42,32 @@
  */
 public class OpenSearchException extends RuntimeException {
 
-	private final ErrorResponse response;
+    private final ErrorResponse response;
 
-	public OpenSearchException(ErrorResponse response) {
-		super("Request failed: [" + response.error().type() + "] " + response.error().reason());
-		this.response = response;
-	}
+    public OpenSearchException(ErrorResponse response) {
+        super("Request failed: [" + response.error().type() + "] " + response.error().reason());
+        this.response = response;
+    }
 
-	/**
-	 * The error response sent by Elasticsearch
-	 */
-	public ErrorResponse response() {
-		return this.response;
-	}
+    /**
+     * The error response sent by Elasticsearch
+     */
+    public ErrorResponse response() {
+        return this.response;
+    }
 
-	/**
-	 * The cause of the error. Shortcut for {@code response().error()}.
-	 */
-	public ErrorCause error() {
-		return this.response.error();
-	}
+    /**
+     * The cause of the error. Shortcut for {@code response().error()}.
+     */
+    public ErrorCause error() {
+        return this.response.error();
+    }
 
-	/**
-	 * Status code returned by Elasticsearch. Shortcut for
-	 * {@code response().status()}.
-	 */
-	public int status() {
-		return this.response.status();
-	}
+    /**
+     * Status code returned by Elasticsearch. Shortcut for
+     * {@code response().status()}.
+     */
+    public int status() {
+        return this.response.status();
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/OpenSearchVersionInfo.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/OpenSearchVersionInfo.java
index 3995461826..12f9e60a7e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/OpenSearchVersionInfo.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/OpenSearchVersionInfo.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,310 +43,313 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 @JsonpDeserializable
 public final class OpenSearchVersionInfo implements JsonpSerializable {
-	private final String buildDate;
-
-	private final String buildFlavor;
-
-	private final String buildHash;
-
-	private final boolean buildSnapshot;
-
-	private final String buildType;
-
-	private final String distribution;
-
-	private final String luceneVersion;
-
-	private final String minimumIndexCompatibilityVersion;
-
-	private final String minimumWireCompatibilityVersion;
-
-	private final String number;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private OpenSearchVersionInfo(Builder builder) {
-
-		this.buildDate = ApiTypeHelper.requireNonNull(builder.buildDate, this, "buildDate");
-		this.buildFlavor = builder.buildFlavor;
-		this.buildHash = ApiTypeHelper.requireNonNull(builder.buildHash, this, "buildHash");
-		this.buildSnapshot = ApiTypeHelper.requireNonNull(builder.buildSnapshot, this, "buildSnapshot");
-		this.buildType = ApiTypeHelper.requireNonNull(builder.buildType, this, "buildType");
-		this.distribution = ApiTypeHelper.requireNonNull(builder.distribution, this, "distribution");
-		this.luceneVersion = ApiTypeHelper.requireNonNull(builder.luceneVersion, this, "luceneVersion");
-		this.minimumIndexCompatibilityVersion = ApiTypeHelper.requireNonNull(builder.minimumIndexCompatibilityVersion,
-				this, "minimumIndexCompatibilityVersion");
-		this.minimumWireCompatibilityVersion = ApiTypeHelper.requireNonNull(builder.minimumWireCompatibilityVersion,
-				this, "minimumWireCompatibilityVersion");
-		this.number = ApiTypeHelper.requireNonNull(builder.number, this, "number");
-
-	}
-
-	public static OpenSearchVersionInfo of(Function<Builder, ObjectBuilder<OpenSearchVersionInfo>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code build_date}
-	 */
-	public String buildDate() {
-		return this.buildDate;
-	}
-
-	/**
-	 * API name: {@code build_flavor}
-	 */
-	public String buildFlavor() {
-		return this.buildFlavor;
-	}
-
-	/**
-	 * API name: {@code build_hash}
-	 */
-	public String buildHash() {
-		return this.buildHash;
-	}
-
-	/**
-	 * Required - API name: {@code build_snapshot}
-	 */
-	public boolean buildSnapshot() {
-		return this.buildSnapshot;
-	}
-
-	/**
-	 * Required - API name: {@code build_type}
-	 */
-	public String buildType() {
-		return this.buildType;
-	}
-
-	/**
-	 * API name: {@code distribution}
-	 */
-	public String distribution() {
-		return this.distribution;
-	}
-
-	/**
-	 * API name: {@code lucene_version}
-	 */
-	public String luceneVersion() {
-		return this.luceneVersion;
-	}
+    private final String buildDate;
+
+    private final String buildFlavor;
+
+    private final String buildHash;
+
+    private final boolean buildSnapshot;
+
+    private final String buildType;
+
+    private final String distribution;
+
+    private final String luceneVersion;
+
+    private final String minimumIndexCompatibilityVersion;
+
+    private final String minimumWireCompatibilityVersion;
+
+    private final String number;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private OpenSearchVersionInfo(Builder builder) {
+
+        this.buildDate = ApiTypeHelper.requireNonNull(builder.buildDate, this, "buildDate");
+        this.buildFlavor = builder.buildFlavor;
+        this.buildHash = ApiTypeHelper.requireNonNull(builder.buildHash, this, "buildHash");
+        this.buildSnapshot = ApiTypeHelper.requireNonNull(builder.buildSnapshot, this, "buildSnapshot");
+        this.buildType = ApiTypeHelper.requireNonNull(builder.buildType, this, "buildType");
+        this.distribution = ApiTypeHelper.requireNonNull(builder.distribution, this, "distribution");
+        this.luceneVersion = ApiTypeHelper.requireNonNull(builder.luceneVersion, this, "luceneVersion");
+        this.minimumIndexCompatibilityVersion = ApiTypeHelper.requireNonNull(
+            builder.minimumIndexCompatibilityVersion,
+            this,
+            "minimumIndexCompatibilityVersion"
+        );
+        this.minimumWireCompatibilityVersion = ApiTypeHelper.requireNonNull(
+            builder.minimumWireCompatibilityVersion,
+            this,
+            "minimumWireCompatibilityVersion"
+        );
+        this.number = ApiTypeHelper.requireNonNull(builder.number, this, "number");
+
+    }
+
+    public static OpenSearchVersionInfo of(Function<Builder, ObjectBuilder<OpenSearchVersionInfo>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code build_date}
+     */
+    public String buildDate() {
+        return this.buildDate;
+    }
+
+    /**
+     * API name: {@code build_flavor}
+     */
+    public String buildFlavor() {
+        return this.buildFlavor;
+    }
+
+    /**
+     * API name: {@code build_hash}
+     */
+    public String buildHash() {
+        return this.buildHash;
+    }
+
+    /**
+     * Required - API name: {@code build_snapshot}
+     */
+    public boolean buildSnapshot() {
+        return this.buildSnapshot;
+    }
+
+    /**
+     * Required - API name: {@code build_type}
+     */
+    public String buildType() {
+        return this.buildType;
+    }
 
-	/**
-	 * Required - API name: {@code minimum_index_compatibility_version}
-	 */
-	public String minimumIndexCompatibilityVersion() {
-		return this.minimumIndexCompatibilityVersion;
-	}
+    /**
+     * API name: {@code distribution}
+     */
+    public String distribution() {
+        return this.distribution;
+    }
 
-	/**
-	 * Required - API name: {@code minimum_wire_compatibility_version}
-	 */
-	public String minimumWireCompatibilityVersion() {
-		return this.minimumWireCompatibilityVersion;
-	}
+    /**
+     * API name: {@code lucene_version}
+     */
+    public String luceneVersion() {
+        return this.luceneVersion;
+    }
 
-	/**
-	 * Required - API name: {@code number}
-	 */
-	public String number() {
-		return this.number;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("build_date");
-		generator.write(this.buildDate);
-
-		generator.writeKey("build_flavor");
-		generator.write(this.buildFlavor);
-
-		generator.writeKey("build_hash");
-		generator.write(this.buildHash);
-
-		generator.writeKey("build_snapshot");
-		generator.write(this.buildSnapshot);
-
-		generator.writeKey("build_type");
-		generator.write(this.buildType);
-
-		generator.writeKey("distribution");
-		generator.write(this.distribution);
-
-		generator.writeKey("lucene_version");
-		generator.write(this.luceneVersion);
-
-		generator.writeKey("minimum_index_compatibility_version");
-		generator.write(this.minimumIndexCompatibilityVersion);
-
-		generator.writeKey("minimum_wire_compatibility_version");
-		generator.write(this.minimumWireCompatibilityVersion);
-
-		generator.writeKey("number");
-		generator.write(this.number);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link OpenSearchVersionInfo}.
-	 */
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<OpenSearchVersionInfo> {
-		private String buildDate;
-
-		private String buildFlavor;
-
-		private String buildHash;
-
-		private Boolean buildSnapshot;
-
-		private String buildType;
-
-		private String distribution;
-
-		private String luceneVersion;
-
-		private String minimumIndexCompatibilityVersion;
-
-		private String minimumWireCompatibilityVersion;
-
-		private String number;
-
-		/**
-		 * Required - API name: {@code build_date}
-		 */
-		public final Builder buildDate(String value) {
-			this.buildDate = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code build_flavor}
-		 */
-		public Builder buildFlavor(String value) {
-			this.buildFlavor = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code build_hash}
-		 */
-		public final Builder buildHash(String value) {
-			this.buildHash = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code build_snapshot}
-		 */
-		public final Builder buildSnapshot(boolean value) {
-			this.buildSnapshot = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code build_type}
-		 */
-		public final Builder buildType(String value) {
-			this.buildType = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code distribution}
-		 */
-		public Builder distribution(String value) {
-			this.distribution = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code lucene_version}
-		 */
-		public final Builder luceneVersion(String value) {
-			this.luceneVersion = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code minimum_index_compatibility_version}
-		 */
-		public final Builder minimumIndexCompatibilityVersion(String value) {
-			this.minimumIndexCompatibilityVersion = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code minimum_wire_compatibility_version}
-		 */
-		public final Builder minimumWireCompatibilityVersion(String value) {
-			this.minimumWireCompatibilityVersion = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code number}
-		 */
-		public final Builder number(String value) {
-			this.number = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link OpenSearchVersionInfo}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-
-		public OpenSearchVersionInfo build() {
-			_checkSingleUse();
-			return new OpenSearchVersionInfo(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for OpenSearchVersionInfo
-	 */
-	public static final JsonpDeserializer<OpenSearchVersionInfo> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, OpenSearchVersionInfo::setupOpenSearchVersionInfoDeserializer);
-
-	protected static void setupOpenSearchVersionInfoDeserializer(
-			ObjectDeserializer<OpenSearchVersionInfo.Builder> op) {
-
-		op.add(Builder::buildDate, JsonpDeserializer.stringDeserializer(), "build_date");
-		op.add(Builder::buildFlavor, JsonpDeserializer.stringDeserializer(), "build_flavor");
-		op.add(Builder::buildHash, JsonpDeserializer.stringDeserializer(), "build_hash");
-		op.add(Builder::buildSnapshot, JsonpDeserializer.booleanDeserializer(), "build_snapshot");
-		op.add(Builder::buildType, JsonpDeserializer.stringDeserializer(), "build_type");
-		op.add(Builder::distribution, JsonpDeserializer.stringDeserializer(), "distribution");
-		op.add(Builder::luceneVersion, JsonpDeserializer.stringDeserializer(), "lucene_version");
-		op.add(Builder::minimumIndexCompatibilityVersion, JsonpDeserializer.stringDeserializer(),
-				"minimum_index_compatibility_version");
-		op.add(Builder::minimumWireCompatibilityVersion, JsonpDeserializer.stringDeserializer(),
-				"minimum_wire_compatibility_version");
-		op.add(Builder::number, JsonpDeserializer.stringDeserializer(), "number");
-
-	}
+    /**
+     * Required - API name: {@code minimum_index_compatibility_version}
+     */
+    public String minimumIndexCompatibilityVersion() {
+        return this.minimumIndexCompatibilityVersion;
+    }
+
+    /**
+     * Required - API name: {@code minimum_wire_compatibility_version}
+     */
+    public String minimumWireCompatibilityVersion() {
+        return this.minimumWireCompatibilityVersion;
+    }
+
+    /**
+     * Required - API name: {@code number}
+     */
+    public String number() {
+        return this.number;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("build_date");
+        generator.write(this.buildDate);
+
+        generator.writeKey("build_flavor");
+        generator.write(this.buildFlavor);
+
+        generator.writeKey("build_hash");
+        generator.write(this.buildHash);
+
+        generator.writeKey("build_snapshot");
+        generator.write(this.buildSnapshot);
+
+        generator.writeKey("build_type");
+        generator.write(this.buildType);
+
+        generator.writeKey("distribution");
+        generator.write(this.distribution);
+
+        generator.writeKey("lucene_version");
+        generator.write(this.luceneVersion);
+
+        generator.writeKey("minimum_index_compatibility_version");
+        generator.write(this.minimumIndexCompatibilityVersion);
+
+        generator.writeKey("minimum_wire_compatibility_version");
+        generator.write(this.minimumWireCompatibilityVersion);
+
+        generator.writeKey("number");
+        generator.write(this.number);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link OpenSearchVersionInfo}.
+     */
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<OpenSearchVersionInfo> {
+        private String buildDate;
+
+        private String buildFlavor;
+
+        private String buildHash;
+
+        private Boolean buildSnapshot;
+
+        private String buildType;
+
+        private String distribution;
+
+        private String luceneVersion;
+
+        private String minimumIndexCompatibilityVersion;
+
+        private String minimumWireCompatibilityVersion;
+
+        private String number;
+
+        /**
+         * Required - API name: {@code build_date}
+         */
+        public final Builder buildDate(String value) {
+            this.buildDate = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code build_flavor}
+         */
+        public Builder buildFlavor(String value) {
+            this.buildFlavor = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code build_hash}
+         */
+        public final Builder buildHash(String value) {
+            this.buildHash = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code build_snapshot}
+         */
+        public final Builder buildSnapshot(boolean value) {
+            this.buildSnapshot = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code build_type}
+         */
+        public final Builder buildType(String value) {
+            this.buildType = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code distribution}
+         */
+        public Builder distribution(String value) {
+            this.distribution = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code lucene_version}
+         */
+        public final Builder luceneVersion(String value) {
+            this.luceneVersion = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code minimum_index_compatibility_version}
+         */
+        public final Builder minimumIndexCompatibilityVersion(String value) {
+            this.minimumIndexCompatibilityVersion = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code minimum_wire_compatibility_version}
+         */
+        public final Builder minimumWireCompatibilityVersion(String value) {
+            this.minimumWireCompatibilityVersion = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code number}
+         */
+        public final Builder number(String value) {
+            this.number = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link OpenSearchVersionInfo}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+
+        public OpenSearchVersionInfo build() {
+            _checkSingleUse();
+            return new OpenSearchVersionInfo(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for OpenSearchVersionInfo
+     */
+    public static final JsonpDeserializer<OpenSearchVersionInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        OpenSearchVersionInfo::setupOpenSearchVersionInfoDeserializer
+    );
+
+    protected static void setupOpenSearchVersionInfoDeserializer(ObjectDeserializer<OpenSearchVersionInfo.Builder> op) {
+
+        op.add(Builder::buildDate, JsonpDeserializer.stringDeserializer(), "build_date");
+        op.add(Builder::buildFlavor, JsonpDeserializer.stringDeserializer(), "build_flavor");
+        op.add(Builder::buildHash, JsonpDeserializer.stringDeserializer(), "build_hash");
+        op.add(Builder::buildSnapshot, JsonpDeserializer.booleanDeserializer(), "build_snapshot");
+        op.add(Builder::buildType, JsonpDeserializer.stringDeserializer(), "build_type");
+        op.add(Builder::distribution, JsonpDeserializer.stringDeserializer(), "distribution");
+        op.add(Builder::luceneVersion, JsonpDeserializer.stringDeserializer(), "lucene_version");
+        op.add(Builder::minimumIndexCompatibilityVersion, JsonpDeserializer.stringDeserializer(), "minimum_index_compatibility_version");
+        op.add(Builder::minimumWireCompatibilityVersion, JsonpDeserializer.stringDeserializer(), "minimum_wire_compatibility_version");
+        op.add(Builder::number, JsonpDeserializer.stringDeserializer(), "number");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/PluginStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/PluginStats.java
index d421b224fe..9ed07791d4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/PluginStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/PluginStats.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,282 +44,278 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _types.PluginStats
 
 @JsonpDeserializable
 public class PluginStats implements JsonpSerializable {
-	private final String classname;
-
-	private final String description;
-
-	private final String opensearchVersion;
-
-	private final List<String> extendedPlugins;
-
-	private final boolean hasNativeController;
-
-	private final String javaVersion;
-
-	private final String name;
-
-	private final String version;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PluginStats(Builder builder) {
-
-		this.classname = ApiTypeHelper.requireNonNull(builder.classname, this, "classname");
-		this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
-		this.opensearchVersion = ApiTypeHelper.requireNonNull(builder.opensearchVersion, this,
-				"opensearchVersion");
-		this.extendedPlugins = ApiTypeHelper.unmodifiableRequired(builder.extendedPlugins, this, "extendedPlugins");
-		this.hasNativeController = ApiTypeHelper.requireNonNull(builder.hasNativeController, this,
-				"hasNativeController");
-		this.javaVersion = ApiTypeHelper.requireNonNull(builder.javaVersion, this, "javaVersion");
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
-
-	}
-
-	public static PluginStats of(Function<Builder, ObjectBuilder<PluginStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code classname}
-	 */
-	public final String classname() {
-		return this.classname;
-	}
-
-	/**
-	 * Required - API name: {@code description}
-	 */
-	public final String description() {
-		return this.description;
-	}
+    private final String classname;
+
+    private final String description;
+
+    private final String opensearchVersion;
+
+    private final List<String> extendedPlugins;
+
+    private final boolean hasNativeController;
+
+    private final String javaVersion;
+
+    private final String name;
+
+    private final String version;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PluginStats(Builder builder) {
+
+        this.classname = ApiTypeHelper.requireNonNull(builder.classname, this, "classname");
+        this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
+        this.opensearchVersion = ApiTypeHelper.requireNonNull(builder.opensearchVersion, this, "opensearchVersion");
+        this.extendedPlugins = ApiTypeHelper.unmodifiableRequired(builder.extendedPlugins, this, "extendedPlugins");
+        this.hasNativeController = ApiTypeHelper.requireNonNull(builder.hasNativeController, this, "hasNativeController");
+        this.javaVersion = ApiTypeHelper.requireNonNull(builder.javaVersion, this, "javaVersion");
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
+
+    }
+
+    public static PluginStats of(Function<Builder, ObjectBuilder<PluginStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code classname}
+     */
+    public final String classname() {
+        return this.classname;
+    }
+
+    /**
+     * Required - API name: {@code description}
+     */
+    public final String description() {
+        return this.description;
+    }
 
-	/**
-	 * API name: {@code opensearch_version}
-	 */
-	public String opensearchVersion() {
-		return this.opensearchVersion;
-	}
+    /**
+     * API name: {@code opensearch_version}
+     */
+    public String opensearchVersion() {
+        return this.opensearchVersion;
+    }
 
-	/**
-	 * Required - API name: {@code extended_plugins}
-	 */
-	public final List<String> extendedPlugins() {
-		return this.extendedPlugins;
-	}
+    /**
+     * Required - API name: {@code extended_plugins}
+     */
+    public final List<String> extendedPlugins() {
+        return this.extendedPlugins;
+    }
 
-	/**
-	 * Required - API name: {@code has_native_controller}
-	 */
-	public final boolean hasNativeController() {
-		return this.hasNativeController;
-	}
+    /**
+     * Required - API name: {@code has_native_controller}
+     */
+    public final boolean hasNativeController() {
+        return this.hasNativeController;
+    }
 
-	/**
-	 * Required - API name: {@code java_version}
-	 */
-	public final String javaVersion() {
-		return this.javaVersion;
-	}
+    /**
+     * Required - API name: {@code java_version}
+     */
+    public final String javaVersion() {
+        return this.javaVersion;
+    }
 
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Required - API name: {@code version}
-	 */
-	public final String version() {
-		return this.version;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("classname");
-		generator.write(this.classname);
-
-		generator.writeKey("description");
-		generator.write(this.description);
-
-		generator.writeKey("opensearch_version");
-		generator.write(this.opensearchVersion);
-
-		if (ApiTypeHelper.isDefined(this.extendedPlugins)) {
-			generator.writeKey("extended_plugins");
-			generator.writeStartArray();
-			for (String item0 : this.extendedPlugins) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("has_native_controller");
-		generator.write(this.hasNativeController);
-
-		generator.writeKey("java_version");
-		generator.write(this.javaVersion);
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		generator.writeKey("version");
-		generator.write(this.version);
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PluginStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PluginStats> {
-		private String classname;
-
-		private String description;
-
-		private String opensearchVersion;
-
-		private List<String> extendedPlugins;
-
-		private Boolean hasNativeController;
-
-		private String javaVersion;
-
-		private String name;
-
-		private String version;
-
-		/**
-		 * Required - API name: {@code classname}
-		 */
-		public final Builder classname(String value) {
-			this.classname = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code description}
-		 */
-		public final Builder description(String value) {
-			this.description = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code opensearch_version}
-		 */
-		public final Builder opensearchVersion(String value) {
-			this.opensearchVersion = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code extended_plugins}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>extendedPlugins</code>.
-		 */
-		public final Builder extendedPlugins(List<String> list) {
-			this.extendedPlugins = _listAddAll(this.extendedPlugins, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code extended_plugins}
-		 * <p>
-		 * Adds one or more values to <code>extendedPlugins</code>.
-		 */
-		public final Builder extendedPlugins(String value, String... values) {
-			this.extendedPlugins = _listAdd(this.extendedPlugins, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code has_native_controller}
-		 */
-		public final Builder hasNativeController(boolean value) {
-			this.hasNativeController = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code java_version}
-		 */
-		public final Builder javaVersion(String value) {
-			this.javaVersion = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code version}
-		 */
-		public final Builder version(String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PluginStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PluginStats build() {
-			_checkSingleUse();
-
-			return new PluginStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PluginStats}
-	 */
-	public static final JsonpDeserializer<PluginStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			PluginStats::setupPluginStatsDeserializer);
-
-	protected static void setupPluginStatsDeserializer(ObjectDeserializer<PluginStats.Builder> op) {
-
-		op.add(Builder::classname, JsonpDeserializer.stringDeserializer(), "classname");
-		op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
-		op.add(Builder::opensearchVersion, JsonpDeserializer.stringDeserializer(), "opensearch_version");
-		op.add(Builder::extendedPlugins, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"extended_plugins");
-		op.add(Builder::hasNativeController, JsonpDeserializer.booleanDeserializer(), "has_native_controller");
-		op.add(Builder::javaVersion, JsonpDeserializer.stringDeserializer(), "java_version");
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
-
-	}
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Required - API name: {@code version}
+     */
+    public final String version() {
+        return this.version;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("classname");
+        generator.write(this.classname);
+
+        generator.writeKey("description");
+        generator.write(this.description);
+
+        generator.writeKey("opensearch_version");
+        generator.write(this.opensearchVersion);
+
+        if (ApiTypeHelper.isDefined(this.extendedPlugins)) {
+            generator.writeKey("extended_plugins");
+            generator.writeStartArray();
+            for (String item0 : this.extendedPlugins) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("has_native_controller");
+        generator.write(this.hasNativeController);
+
+        generator.writeKey("java_version");
+        generator.write(this.javaVersion);
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        generator.writeKey("version");
+        generator.write(this.version);
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PluginStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PluginStats> {
+        private String classname;
+
+        private String description;
+
+        private String opensearchVersion;
+
+        private List<String> extendedPlugins;
+
+        private Boolean hasNativeController;
+
+        private String javaVersion;
+
+        private String name;
+
+        private String version;
+
+        /**
+         * Required - API name: {@code classname}
+         */
+        public final Builder classname(String value) {
+            this.classname = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code description}
+         */
+        public final Builder description(String value) {
+            this.description = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code opensearch_version}
+         */
+        public final Builder opensearchVersion(String value) {
+            this.opensearchVersion = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code extended_plugins}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>extendedPlugins</code>.
+         */
+        public final Builder extendedPlugins(List<String> list) {
+            this.extendedPlugins = _listAddAll(this.extendedPlugins, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code extended_plugins}
+         * <p>
+         * Adds one or more values to <code>extendedPlugins</code>.
+         */
+        public final Builder extendedPlugins(String value, String... values) {
+            this.extendedPlugins = _listAdd(this.extendedPlugins, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code has_native_controller}
+         */
+        public final Builder hasNativeController(boolean value) {
+            this.hasNativeController = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code java_version}
+         */
+        public final Builder javaVersion(String value) {
+            this.javaVersion = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code version}
+         */
+        public final Builder version(String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link PluginStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PluginStats build() {
+            _checkSingleUse();
+
+            return new PluginStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PluginStats}
+     */
+    public static final JsonpDeserializer<PluginStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PluginStats::setupPluginStatsDeserializer
+    );
+
+    protected static void setupPluginStatsDeserializer(ObjectDeserializer<PluginStats.Builder> op) {
+
+        op.add(Builder::classname, JsonpDeserializer.stringDeserializer(), "classname");
+        op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
+        op.add(Builder::opensearchVersion, JsonpDeserializer.stringDeserializer(), "opensearch_version");
+        op.add(Builder::extendedPlugins, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "extended_plugins");
+        op.add(Builder::hasNativeController, JsonpDeserializer.booleanDeserializer(), "has_native_controller");
+        op.add(Builder::javaVersion, JsonpDeserializer.stringDeserializer(), "java_version");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/QueryCacheStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/QueryCacheStats.java
index 6b3df16c7e..d5ba4b1224 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/QueryCacheStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/QueryCacheStats.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,266 +44,265 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.QueryCacheStats
 
 @JsonpDeserializable
 public class QueryCacheStats implements JsonpSerializable {
-	private final int cacheCount;
-
-	private final int cacheSize;
-
-	private final int evictions;
-
-	private final int hitCount;
-
-	@Nullable
-	private final String memorySize;
-
-	private final int memorySizeInBytes;
-
-	private final int missCount;
-
-	private final int totalCount;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private QueryCacheStats(Builder builder) {
-
-		this.cacheCount = ApiTypeHelper.requireNonNull(builder.cacheCount, this, "cacheCount");
-		this.cacheSize = ApiTypeHelper.requireNonNull(builder.cacheSize, this, "cacheSize");
-		this.evictions = ApiTypeHelper.requireNonNull(builder.evictions, this, "evictions");
-		this.hitCount = ApiTypeHelper.requireNonNull(builder.hitCount, this, "hitCount");
-		this.memorySize = builder.memorySize;
-		this.memorySizeInBytes = ApiTypeHelper.requireNonNull(builder.memorySizeInBytes, this, "memorySizeInBytes");
-		this.missCount = ApiTypeHelper.requireNonNull(builder.missCount, this, "missCount");
-		this.totalCount = ApiTypeHelper.requireNonNull(builder.totalCount, this, "totalCount");
-
-	}
-
-	public static QueryCacheStats of(Function<Builder, ObjectBuilder<QueryCacheStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code cache_count}
-	 */
-	public final int cacheCount() {
-		return this.cacheCount;
-	}
+    private final int cacheCount;
+
+    private final int cacheSize;
+
+    private final int evictions;
+
+    private final int hitCount;
+
+    @Nullable
+    private final String memorySize;
+
+    private final int memorySizeInBytes;
+
+    private final int missCount;
+
+    private final int totalCount;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private QueryCacheStats(Builder builder) {
+
+        this.cacheCount = ApiTypeHelper.requireNonNull(builder.cacheCount, this, "cacheCount");
+        this.cacheSize = ApiTypeHelper.requireNonNull(builder.cacheSize, this, "cacheSize");
+        this.evictions = ApiTypeHelper.requireNonNull(builder.evictions, this, "evictions");
+        this.hitCount = ApiTypeHelper.requireNonNull(builder.hitCount, this, "hitCount");
+        this.memorySize = builder.memorySize;
+        this.memorySizeInBytes = ApiTypeHelper.requireNonNull(builder.memorySizeInBytes, this, "memorySizeInBytes");
+        this.missCount = ApiTypeHelper.requireNonNull(builder.missCount, this, "missCount");
+        this.totalCount = ApiTypeHelper.requireNonNull(builder.totalCount, this, "totalCount");
+
+    }
+
+    public static QueryCacheStats of(Function<Builder, ObjectBuilder<QueryCacheStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code cache_count}
+     */
+    public final int cacheCount() {
+        return this.cacheCount;
+    }
 
-	/**
-	 * Required - API name: {@code cache_size}
-	 */
-	public final int cacheSize() {
-		return this.cacheSize;
-	}
+    /**
+     * Required - API name: {@code cache_size}
+     */
+    public final int cacheSize() {
+        return this.cacheSize;
+    }
 
-	/**
-	 * Required - API name: {@code evictions}
-	 */
-	public final int evictions() {
-		return this.evictions;
-	}
+    /**
+     * Required - API name: {@code evictions}
+     */
+    public final int evictions() {
+        return this.evictions;
+    }
 
-	/**
-	 * Required - API name: {@code hit_count}
-	 */
-	public final int hitCount() {
-		return this.hitCount;
-	}
+    /**
+     * Required - API name: {@code hit_count}
+     */
+    public final int hitCount() {
+        return this.hitCount;
+    }
 
-	/**
-	 * API name: {@code memory_size}
-	 */
-	@Nullable
-	public final String memorySize() {
-		return this.memorySize;
-	}
+    /**
+     * API name: {@code memory_size}
+     */
+    @Nullable
+    public final String memorySize() {
+        return this.memorySize;
+    }
 
-	/**
-	 * Required - API name: {@code memory_size_in_bytes}
-	 */
-	public final int memorySizeInBytes() {
-		return this.memorySizeInBytes;
-	}
+    /**
+     * Required - API name: {@code memory_size_in_bytes}
+     */
+    public final int memorySizeInBytes() {
+        return this.memorySizeInBytes;
+    }
 
-	/**
-	 * Required - API name: {@code miss_count}
-	 */
-	public final int missCount() {
-		return this.missCount;
-	}
-
-	/**
-	 * Required - API name: {@code total_count}
-	 */
-	public final int totalCount() {
-		return this.totalCount;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("cache_count");
-		generator.write(this.cacheCount);
-
-		generator.writeKey("cache_size");
-		generator.write(this.cacheSize);
-
-		generator.writeKey("evictions");
-		generator.write(this.evictions);
-
-		generator.writeKey("hit_count");
-		generator.write(this.hitCount);
-
-		if (this.memorySize != null) {
-			generator.writeKey("memory_size");
-			generator.write(this.memorySize);
-
-		}
-		generator.writeKey("memory_size_in_bytes");
-		generator.write(this.memorySizeInBytes);
-
-		generator.writeKey("miss_count");
-		generator.write(this.missCount);
-
-		generator.writeKey("total_count");
-		generator.write(this.totalCount);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link QueryCacheStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<QueryCacheStats> {
-		private Integer cacheCount;
-
-		private Integer cacheSize;
-
-		private Integer evictions;
-
-		private Integer hitCount;
-
-		@Nullable
-		private String memorySize;
-
-		private Integer memorySizeInBytes;
-
-		private Integer missCount;
-
-		private Integer totalCount;
-
-		/**
-		 * Required - API name: {@code cache_count}
-		 */
-		public final Builder cacheCount(int value) {
-			this.cacheCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code cache_size}
-		 */
-		public final Builder cacheSize(int value) {
-			this.cacheSize = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code evictions}
-		 */
-		public final Builder evictions(int value) {
-			this.evictions = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code hit_count}
-		 */
-		public final Builder hitCount(int value) {
-			this.hitCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code memory_size}
-		 */
-		public final Builder memorySize(@Nullable String value) {
-			this.memorySize = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code memory_size_in_bytes}
-		 */
-		public final Builder memorySizeInBytes(int value) {
-			this.memorySizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code miss_count}
-		 */
-		public final Builder missCount(int value) {
-			this.missCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_count}
-		 */
-		public final Builder totalCount(int value) {
-			this.totalCount = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link QueryCacheStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public QueryCacheStats build() {
-			_checkSingleUse();
-
-			return new QueryCacheStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link QueryCacheStats}
-	 */
-	public static final JsonpDeserializer<QueryCacheStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			QueryCacheStats::setupQueryCacheStatsDeserializer);
-
-	protected static void setupQueryCacheStatsDeserializer(ObjectDeserializer<QueryCacheStats.Builder> op) {
-
-		op.add(Builder::cacheCount, JsonpDeserializer.integerDeserializer(), "cache_count");
-		op.add(Builder::cacheSize, JsonpDeserializer.integerDeserializer(), "cache_size");
-		op.add(Builder::evictions, JsonpDeserializer.integerDeserializer(), "evictions");
-		op.add(Builder::hitCount, JsonpDeserializer.integerDeserializer(), "hit_count");
-		op.add(Builder::memorySize, JsonpDeserializer.stringDeserializer(), "memory_size");
-		op.add(Builder::memorySizeInBytes, JsonpDeserializer.integerDeserializer(), "memory_size_in_bytes");
-		op.add(Builder::missCount, JsonpDeserializer.integerDeserializer(), "miss_count");
-		op.add(Builder::totalCount, JsonpDeserializer.integerDeserializer(), "total_count");
-
-	}
+    /**
+     * Required - API name: {@code miss_count}
+     */
+    public final int missCount() {
+        return this.missCount;
+    }
+
+    /**
+     * Required - API name: {@code total_count}
+     */
+    public final int totalCount() {
+        return this.totalCount;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("cache_count");
+        generator.write(this.cacheCount);
+
+        generator.writeKey("cache_size");
+        generator.write(this.cacheSize);
+
+        generator.writeKey("evictions");
+        generator.write(this.evictions);
+
+        generator.writeKey("hit_count");
+        generator.write(this.hitCount);
+
+        if (this.memorySize != null) {
+            generator.writeKey("memory_size");
+            generator.write(this.memorySize);
+
+        }
+        generator.writeKey("memory_size_in_bytes");
+        generator.write(this.memorySizeInBytes);
+
+        generator.writeKey("miss_count");
+        generator.write(this.missCount);
+
+        generator.writeKey("total_count");
+        generator.write(this.totalCount);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link QueryCacheStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<QueryCacheStats> {
+        private Integer cacheCount;
+
+        private Integer cacheSize;
+
+        private Integer evictions;
+
+        private Integer hitCount;
+
+        @Nullable
+        private String memorySize;
+
+        private Integer memorySizeInBytes;
+
+        private Integer missCount;
+
+        private Integer totalCount;
+
+        /**
+         * Required - API name: {@code cache_count}
+         */
+        public final Builder cacheCount(int value) {
+            this.cacheCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code cache_size}
+         */
+        public final Builder cacheSize(int value) {
+            this.cacheSize = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code evictions}
+         */
+        public final Builder evictions(int value) {
+            this.evictions = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code hit_count}
+         */
+        public final Builder hitCount(int value) {
+            this.hitCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code memory_size}
+         */
+        public final Builder memorySize(@Nullable String value) {
+            this.memorySize = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code memory_size_in_bytes}
+         */
+        public final Builder memorySizeInBytes(int value) {
+            this.memorySizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code miss_count}
+         */
+        public final Builder missCount(int value) {
+            this.missCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_count}
+         */
+        public final Builder totalCount(int value) {
+            this.totalCount = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link QueryCacheStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public QueryCacheStats build() {
+            _checkSingleUse();
+
+            return new QueryCacheStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link QueryCacheStats}
+     */
+    public static final JsonpDeserializer<QueryCacheStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        QueryCacheStats::setupQueryCacheStatsDeserializer
+    );
+
+    protected static void setupQueryCacheStatsDeserializer(ObjectDeserializer<QueryCacheStats.Builder> op) {
+
+        op.add(Builder::cacheCount, JsonpDeserializer.integerDeserializer(), "cache_count");
+        op.add(Builder::cacheSize, JsonpDeserializer.integerDeserializer(), "cache_size");
+        op.add(Builder::evictions, JsonpDeserializer.integerDeserializer(), "evictions");
+        op.add(Builder::hitCount, JsonpDeserializer.integerDeserializer(), "hit_count");
+        op.add(Builder::memorySize, JsonpDeserializer.stringDeserializer(), "memory_size");
+        op.add(Builder::memorySizeInBytes, JsonpDeserializer.integerDeserializer(), "memory_size_in_bytes");
+        op.add(Builder::missCount, JsonpDeserializer.integerDeserializer(), "miss_count");
+        op.add(Builder::totalCount, JsonpDeserializer.integerDeserializer(), "total_count");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/RecoveryStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/RecoveryStats.java
index 475d640048..80f4d182ff 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/RecoveryStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/RecoveryStats.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,171 +44,169 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.RecoveryStats
 
 @JsonpDeserializable
 public class RecoveryStats implements JsonpSerializable {
-	private final long currentAsSource;
+    private final long currentAsSource;
 
-	private final long currentAsTarget;
+    private final long currentAsTarget;
 
-	@Nullable
-	private final String throttleTime;
+    @Nullable
+    private final String throttleTime;
 
-	private final long throttleTimeInMillis;
+    private final long throttleTimeInMillis;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private RecoveryStats(Builder builder) {
+    private RecoveryStats(Builder builder) {
 
-		this.currentAsSource = ApiTypeHelper.requireNonNull(builder.currentAsSource, this, "currentAsSource");
-		this.currentAsTarget = ApiTypeHelper.requireNonNull(builder.currentAsTarget, this, "currentAsTarget");
-		this.throttleTime = builder.throttleTime;
-		this.throttleTimeInMillis = ApiTypeHelper.requireNonNull(builder.throttleTimeInMillis, this,
-				"throttleTimeInMillis");
-
-	}
-
-	public static RecoveryStats of(Function<Builder, ObjectBuilder<RecoveryStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code current_as_source}
-	 */
-	public final long currentAsSource() {
-		return this.currentAsSource;
-	}
-
-	/**
-	 * Required - API name: {@code current_as_target}
-	 */
-	public final long currentAsTarget() {
-		return this.currentAsTarget;
-	}
-
-	/**
-	 * API name: {@code throttle_time}
-	 */
-	@Nullable
-	public final String throttleTime() {
-		return this.throttleTime;
-	}
-
-	/**
-	 * Required - API name: {@code throttle_time_in_millis}
-	 */
-	public final long throttleTimeInMillis() {
-		return this.throttleTimeInMillis;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("current_as_source");
-		generator.write(this.currentAsSource);
-
-		generator.writeKey("current_as_target");
-		generator.write(this.currentAsTarget);
-
-		if (this.throttleTime != null) {
-			generator.writeKey("throttle_time");
-			generator.write(this.throttleTime);
-
-		}
-		generator.writeKey("throttle_time_in_millis");
-		generator.write(this.throttleTimeInMillis);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RecoveryStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryStats> {
-		private Long currentAsSource;
-
-		private Long currentAsTarget;
-
-		@Nullable
-		private String throttleTime;
-
-		private Long throttleTimeInMillis;
-
-		/**
-		 * Required - API name: {@code current_as_source}
-		 */
-		public final Builder currentAsSource(long value) {
-			this.currentAsSource = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code current_as_target}
-		 */
-		public final Builder currentAsTarget(long value) {
-			this.currentAsTarget = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code throttle_time}
-		 */
-		public final Builder throttleTime(@Nullable String value) {
-			this.throttleTime = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code throttle_time_in_millis}
-		 */
-		public final Builder throttleTimeInMillis(long value) {
-			this.throttleTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RecoveryStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RecoveryStats build() {
-			_checkSingleUse();
-
-			return new RecoveryStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RecoveryStats}
-	 */
-	public static final JsonpDeserializer<RecoveryStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RecoveryStats::setupRecoveryStatsDeserializer);
-
-	protected static void setupRecoveryStatsDeserializer(ObjectDeserializer<RecoveryStats.Builder> op) {
-
-		op.add(Builder::currentAsSource, JsonpDeserializer.longDeserializer(), "current_as_source");
-		op.add(Builder::currentAsTarget, JsonpDeserializer.longDeserializer(), "current_as_target");
-		op.add(Builder::throttleTime, JsonpDeserializer.stringDeserializer(), "throttle_time");
-		op.add(Builder::throttleTimeInMillis, JsonpDeserializer.longDeserializer(), "throttle_time_in_millis");
-
-	}
+        this.currentAsSource = ApiTypeHelper.requireNonNull(builder.currentAsSource, this, "currentAsSource");
+        this.currentAsTarget = ApiTypeHelper.requireNonNull(builder.currentAsTarget, this, "currentAsTarget");
+        this.throttleTime = builder.throttleTime;
+        this.throttleTimeInMillis = ApiTypeHelper.requireNonNull(builder.throttleTimeInMillis, this, "throttleTimeInMillis");
+
+    }
+
+    public static RecoveryStats of(Function<Builder, ObjectBuilder<RecoveryStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code current_as_source}
+     */
+    public final long currentAsSource() {
+        return this.currentAsSource;
+    }
+
+    /**
+     * Required - API name: {@code current_as_target}
+     */
+    public final long currentAsTarget() {
+        return this.currentAsTarget;
+    }
+
+    /**
+     * API name: {@code throttle_time}
+     */
+    @Nullable
+    public final String throttleTime() {
+        return this.throttleTime;
+    }
+
+    /**
+     * Required - API name: {@code throttle_time_in_millis}
+     */
+    public final long throttleTimeInMillis() {
+        return this.throttleTimeInMillis;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("current_as_source");
+        generator.write(this.currentAsSource);
+
+        generator.writeKey("current_as_target");
+        generator.write(this.currentAsTarget);
+
+        if (this.throttleTime != null) {
+            generator.writeKey("throttle_time");
+            generator.write(this.throttleTime);
+
+        }
+        generator.writeKey("throttle_time_in_millis");
+        generator.write(this.throttleTimeInMillis);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RecoveryStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryStats> {
+        private Long currentAsSource;
+
+        private Long currentAsTarget;
+
+        @Nullable
+        private String throttleTime;
+
+        private Long throttleTimeInMillis;
+
+        /**
+         * Required - API name: {@code current_as_source}
+         */
+        public final Builder currentAsSource(long value) {
+            this.currentAsSource = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code current_as_target}
+         */
+        public final Builder currentAsTarget(long value) {
+            this.currentAsTarget = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code throttle_time}
+         */
+        public final Builder throttleTime(@Nullable String value) {
+            this.throttleTime = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code throttle_time_in_millis}
+         */
+        public final Builder throttleTimeInMillis(long value) {
+            this.throttleTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RecoveryStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RecoveryStats build() {
+            _checkSingleUse();
+
+            return new RecoveryStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RecoveryStats}
+     */
+    public static final JsonpDeserializer<RecoveryStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RecoveryStats::setupRecoveryStatsDeserializer
+    );
+
+    protected static void setupRecoveryStatsDeserializer(ObjectDeserializer<RecoveryStats.Builder> op) {
+
+        op.add(Builder::currentAsSource, JsonpDeserializer.longDeserializer(), "current_as_source");
+        op.add(Builder::currentAsTarget, JsonpDeserializer.longDeserializer(), "current_as_target");
+        op.add(Builder::throttleTime, JsonpDeserializer.stringDeserializer(), "throttle_time");
+        op.add(Builder::throttleTimeInMillis, JsonpDeserializer.longDeserializer(), "throttle_time_in_millis");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Refresh.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/Refresh.java
index 190d4c62c5..b1b78d0305 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Refresh.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/Refresh.java
@@ -37,23 +37,23 @@
 
 @JsonpDeserializable
 public enum Refresh implements JsonEnum {
-	True("true"),
+    True("true"),
 
-	False("false"),
+    False("false"),
 
-	WaitFor("wait_for"),
+    WaitFor("wait_for"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	Refresh(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    Refresh(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<Refresh> _DESERIALIZER = new JsonEnum.Deserializer<>(Refresh.values());
+    public static final JsonEnum.Deserializer<Refresh> _DESERIALIZER = new JsonEnum.Deserializer<>(Refresh.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/RefreshStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/RefreshStats.java
index f811195f56..bfa6015a4b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/RefreshStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/RefreshStats.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,221 +44,217 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.RefreshStats
 
-
 @JsonpDeserializable
 public class RefreshStats implements JsonpSerializable {
-	private final long externalTotal;
-
-	private final long externalTotalTimeInMillis;
-
-	private final long listeners;
-
-	private final long total;
-
-	@Nullable
-	private final String totalTime;
+    private final long externalTotal;
+
+    private final long externalTotalTimeInMillis;
+
+    private final long listeners;
+
+    private final long total;
+
+    @Nullable
+    private final String totalTime;
+
+    private final long totalTimeInMillis;
 
-	private final long totalTimeInMillis;
+    // ---------------------------------------------------------------------------------------------
 
-	// ---------------------------------------------------------------------------------------------
+    private RefreshStats(Builder builder) {
 
-	private RefreshStats(Builder builder) {
+        this.externalTotal = ApiTypeHelper.requireNonNull(builder.externalTotal, this, "externalTotal");
+        this.externalTotalTimeInMillis = ApiTypeHelper.requireNonNull(builder.externalTotalTimeInMillis, this, "externalTotalTimeInMillis");
+        this.listeners = ApiTypeHelper.requireNonNull(builder.listeners, this, "listeners");
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+        this.totalTime = builder.totalTime;
+        this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
 
-		this.externalTotal = ApiTypeHelper.requireNonNull(builder.externalTotal, this, "externalTotal");
-		this.externalTotalTimeInMillis = ApiTypeHelper.requireNonNull(builder.externalTotalTimeInMillis, this,
-				"externalTotalTimeInMillis");
-		this.listeners = ApiTypeHelper.requireNonNull(builder.listeners, this, "listeners");
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
-		this.totalTime = builder.totalTime;
-		this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
+    }
 
-	}
+    public static RefreshStats of(Function<Builder, ObjectBuilder<RefreshStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	public static RefreshStats of(Function<Builder, ObjectBuilder<RefreshStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    /**
+     * Required - API name: {@code external_total}
+     */
+    public final long externalTotal() {
+        return this.externalTotal;
+    }
 
-	/**
-	 * Required - API name: {@code external_total}
-	 */
-	public final long externalTotal() {
-		return this.externalTotal;
-	}
+    /**
+     * Required - API name: {@code external_total_time_in_millis}
+     */
+    public final long externalTotalTimeInMillis() {
+        return this.externalTotalTimeInMillis;
+    }
 
-	/**
-	 * Required - API name: {@code external_total_time_in_millis}
-	 */
-	public final long externalTotalTimeInMillis() {
-		return this.externalTotalTimeInMillis;
-	}
+    /**
+     * Required - API name: {@code listeners}
+     */
+    public final long listeners() {
+        return this.listeners;
+    }
 
-	/**
-	 * Required - API name: {@code listeners}
-	 */
-	public final long listeners() {
-		return this.listeners;
-	}
-
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final long total() {
-		return this.total;
-	}
-
-	/**
-	 * API name: {@code total_time}
-	 */
-	@Nullable
-	public final String totalTime() {
-		return this.totalTime;
-	}
-
-	/**
-	 * Required - API name: {@code total_time_in_millis}
-	 */
-	public final long totalTimeInMillis() {
-		return this.totalTimeInMillis;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("external_total");
-		generator.write(this.externalTotal);
-
-		generator.writeKey("external_total_time_in_millis");
-		generator.write(this.externalTotalTimeInMillis);
-
-		generator.writeKey("listeners");
-		generator.write(this.listeners);
-
-		generator.writeKey("total");
-		generator.write(this.total);
-
-		if (this.totalTime != null) {
-			generator.writeKey("total_time");
-			generator.write(this.totalTime);
-
-		}
-		generator.writeKey("total_time_in_millis");
-		generator.write(this.totalTimeInMillis);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RefreshStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RefreshStats> {
-		private Long externalTotal;
-
-		private Long externalTotalTimeInMillis;
-
-		private Long listeners;
-
-		private Long total;
-
-		@Nullable
-		private String totalTime;
-
-		private Long totalTimeInMillis;
-
-		/**
-		 * Required - API name: {@code external_total}
-		 */
-		public final Builder externalTotal(long value) {
-			this.externalTotal = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code external_total_time_in_millis}
-		 */
-		public final Builder externalTotalTimeInMillis(long value) {
-			this.externalTotalTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code listeners}
-		 */
-		public final Builder listeners(long value) {
-			this.listeners = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(long value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total_time}
-		 */
-		public final Builder totalTime(@Nullable String value) {
-			this.totalTime = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_time_in_millis}
-		 */
-		public final Builder totalTimeInMillis(long value) {
-			this.totalTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RefreshStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RefreshStats build() {
-			_checkSingleUse();
-
-			return new RefreshStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RefreshStats}
-	 */
-	public static final JsonpDeserializer<RefreshStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RefreshStats::setupRefreshStatsDeserializer);
-
-	protected static void setupRefreshStatsDeserializer(ObjectDeserializer<RefreshStats.Builder> op) {
-
-		op.add(Builder::externalTotal, JsonpDeserializer.longDeserializer(), "external_total");
-		op.add(Builder::externalTotalTimeInMillis, JsonpDeserializer.longDeserializer(),
-				"external_total_time_in_millis");
-		op.add(Builder::listeners, JsonpDeserializer.longDeserializer(), "listeners");
-		op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
-		op.add(Builder::totalTime, JsonpDeserializer.stringDeserializer(), "total_time");
-		op.add(Builder::totalTimeInMillis, JsonpDeserializer.longDeserializer(), "total_time_in_millis");
-
-	}
+    /**
+     * Required - API name: {@code total}
+     */
+    public final long total() {
+        return this.total;
+    }
+
+    /**
+     * API name: {@code total_time}
+     */
+    @Nullable
+    public final String totalTime() {
+        return this.totalTime;
+    }
+
+    /**
+     * Required - API name: {@code total_time_in_millis}
+     */
+    public final long totalTimeInMillis() {
+        return this.totalTimeInMillis;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("external_total");
+        generator.write(this.externalTotal);
+
+        generator.writeKey("external_total_time_in_millis");
+        generator.write(this.externalTotalTimeInMillis);
+
+        generator.writeKey("listeners");
+        generator.write(this.listeners);
+
+        generator.writeKey("total");
+        generator.write(this.total);
+
+        if (this.totalTime != null) {
+            generator.writeKey("total_time");
+            generator.write(this.totalTime);
+
+        }
+        generator.writeKey("total_time_in_millis");
+        generator.write(this.totalTimeInMillis);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RefreshStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RefreshStats> {
+        private Long externalTotal;
+
+        private Long externalTotalTimeInMillis;
+
+        private Long listeners;
+
+        private Long total;
+
+        @Nullable
+        private String totalTime;
+
+        private Long totalTimeInMillis;
+
+        /**
+         * Required - API name: {@code external_total}
+         */
+        public final Builder externalTotal(long value) {
+            this.externalTotal = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code external_total_time_in_millis}
+         */
+        public final Builder externalTotalTimeInMillis(long value) {
+            this.externalTotalTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code listeners}
+         */
+        public final Builder listeners(long value) {
+            this.listeners = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(long value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total_time}
+         */
+        public final Builder totalTime(@Nullable String value) {
+            this.totalTime = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_time_in_millis}
+         */
+        public final Builder totalTimeInMillis(long value) {
+            this.totalTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RefreshStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RefreshStats build() {
+            _checkSingleUse();
+
+            return new RefreshStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RefreshStats}
+     */
+    public static final JsonpDeserializer<RefreshStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RefreshStats::setupRefreshStatsDeserializer
+    );
+
+    protected static void setupRefreshStatsDeserializer(ObjectDeserializer<RefreshStats.Builder> op) {
+
+        op.add(Builder::externalTotal, JsonpDeserializer.longDeserializer(), "external_total");
+        op.add(Builder::externalTotalTimeInMillis, JsonpDeserializer.longDeserializer(), "external_total_time_in_millis");
+        op.add(Builder::listeners, JsonpDeserializer.longDeserializer(), "listeners");
+        op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
+        op.add(Builder::totalTime, JsonpDeserializer.stringDeserializer(), "total_time");
+        op.add(Builder::totalTimeInMillis, JsonpDeserializer.longDeserializer(), "total_time_in_millis");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/RequestBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/RequestBase.java
index bb57c5de8c..165c5258a0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/RequestBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/RequestBase.java
@@ -36,16 +36,12 @@
 
 // typedef: _types.RequestBase
 
-
 public abstract class RequestBase {
-	public RequestBase() {
-	}
+    public RequestBase() {}
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		protected abstract BuilderT self();
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        protected abstract BuilderT self();
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/RequestCacheStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/RequestCacheStats.java
index ace6ed3e06..1b7a25c28f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/RequestCacheStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/RequestCacheStats.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,194 +44,193 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.RequestCacheStats
 
 @JsonpDeserializable
 public class RequestCacheStats implements JsonpSerializable {
-	private final long evictions;
+    private final long evictions;
 
-	private final long hitCount;
+    private final long hitCount;
 
-	@Nullable
-	private final String memorySize;
+    @Nullable
+    private final String memorySize;
 
-	private final long memorySizeInBytes;
+    private final long memorySizeInBytes;
 
-	private final long missCount;
+    private final long missCount;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private RequestCacheStats(Builder builder) {
+    private RequestCacheStats(Builder builder) {
 
-		this.evictions = ApiTypeHelper.requireNonNull(builder.evictions, this, "evictions");
-		this.hitCount = ApiTypeHelper.requireNonNull(builder.hitCount, this, "hitCount");
-		this.memorySize = builder.memorySize;
-		this.memorySizeInBytes = ApiTypeHelper.requireNonNull(builder.memorySizeInBytes, this, "memorySizeInBytes");
-		this.missCount = ApiTypeHelper.requireNonNull(builder.missCount, this, "missCount");
+        this.evictions = ApiTypeHelper.requireNonNull(builder.evictions, this, "evictions");
+        this.hitCount = ApiTypeHelper.requireNonNull(builder.hitCount, this, "hitCount");
+        this.memorySize = builder.memorySize;
+        this.memorySizeInBytes = ApiTypeHelper.requireNonNull(builder.memorySizeInBytes, this, "memorySizeInBytes");
+        this.missCount = ApiTypeHelper.requireNonNull(builder.missCount, this, "missCount");
 
-	}
+    }
 
-	public static RequestCacheStats of(Function<Builder, ObjectBuilder<RequestCacheStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static RequestCacheStats of(Function<Builder, ObjectBuilder<RequestCacheStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code evictions}
-	 */
-	public final long evictions() {
-		return this.evictions;
-	}
-
-	/**
-	 * Required - API name: {@code hit_count}
-	 */
-	public final long hitCount() {
-		return this.hitCount;
-	}
-
-	/**
-	 * API name: {@code memory_size}
-	 */
-	@Nullable
-	public final String memorySize() {
-		return this.memorySize;
-	}
-
-	/**
-	 * Required - API name: {@code memory_size_in_bytes}
-	 */
-	public final long memorySizeInBytes() {
-		return this.memorySizeInBytes;
-	}
-
-	/**
-	 * Required - API name: {@code miss_count}
-	 */
-	public final long missCount() {
-		return this.missCount;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("evictions");
-		generator.write(this.evictions);
-
-		generator.writeKey("hit_count");
-		generator.write(this.hitCount);
-
-		if (this.memorySize != null) {
-			generator.writeKey("memory_size");
-			generator.write(this.memorySize);
-
-		}
-		generator.writeKey("memory_size_in_bytes");
-		generator.write(this.memorySizeInBytes);
-
-		generator.writeKey("miss_count");
-		generator.write(this.missCount);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RequestCacheStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RequestCacheStats> {
-		private Long evictions;
-
-		private Long hitCount;
-
-		@Nullable
-		private String memorySize;
-
-		private Long memorySizeInBytes;
-
-		private Long missCount;
-
-		/**
-		 * Required - API name: {@code evictions}
-		 */
-		public final Builder evictions(long value) {
-			this.evictions = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code hit_count}
-		 */
-		public final Builder hitCount(long value) {
-			this.hitCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code memory_size}
-		 */
-		public final Builder memorySize(@Nullable String value) {
-			this.memorySize = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code memory_size_in_bytes}
-		 */
-		public final Builder memorySizeInBytes(long value) {
-			this.memorySizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code miss_count}
-		 */
-		public final Builder missCount(long value) {
-			this.missCount = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RequestCacheStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RequestCacheStats build() {
-			_checkSingleUse();
-
-			return new RequestCacheStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RequestCacheStats}
-	 */
-	public static final JsonpDeserializer<RequestCacheStats> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RequestCacheStats::setupRequestCacheStatsDeserializer);
-
-	protected static void setupRequestCacheStatsDeserializer(ObjectDeserializer<RequestCacheStats.Builder> op) {
-
-		op.add(Builder::evictions, JsonpDeserializer.longDeserializer(), "evictions");
-		op.add(Builder::hitCount, JsonpDeserializer.longDeserializer(), "hit_count");
-		op.add(Builder::memorySize, JsonpDeserializer.stringDeserializer(), "memory_size");
-		op.add(Builder::memorySizeInBytes, JsonpDeserializer.longDeserializer(), "memory_size_in_bytes");
-		op.add(Builder::missCount, JsonpDeserializer.longDeserializer(), "miss_count");
-
-	}
+    /**
+     * Required - API name: {@code evictions}
+     */
+    public final long evictions() {
+        return this.evictions;
+    }
+
+    /**
+     * Required - API name: {@code hit_count}
+     */
+    public final long hitCount() {
+        return this.hitCount;
+    }
+
+    /**
+     * API name: {@code memory_size}
+     */
+    @Nullable
+    public final String memorySize() {
+        return this.memorySize;
+    }
+
+    /**
+     * Required - API name: {@code memory_size_in_bytes}
+     */
+    public final long memorySizeInBytes() {
+        return this.memorySizeInBytes;
+    }
+
+    /**
+     * Required - API name: {@code miss_count}
+     */
+    public final long missCount() {
+        return this.missCount;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("evictions");
+        generator.write(this.evictions);
+
+        generator.writeKey("hit_count");
+        generator.write(this.hitCount);
+
+        if (this.memorySize != null) {
+            generator.writeKey("memory_size");
+            generator.write(this.memorySize);
+
+        }
+        generator.writeKey("memory_size_in_bytes");
+        generator.write(this.memorySizeInBytes);
+
+        generator.writeKey("miss_count");
+        generator.write(this.missCount);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RequestCacheStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RequestCacheStats> {
+        private Long evictions;
+
+        private Long hitCount;
+
+        @Nullable
+        private String memorySize;
+
+        private Long memorySizeInBytes;
+
+        private Long missCount;
+
+        /**
+         * Required - API name: {@code evictions}
+         */
+        public final Builder evictions(long value) {
+            this.evictions = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code hit_count}
+         */
+        public final Builder hitCount(long value) {
+            this.hitCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code memory_size}
+         */
+        public final Builder memorySize(@Nullable String value) {
+            this.memorySize = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code memory_size_in_bytes}
+         */
+        public final Builder memorySizeInBytes(long value) {
+            this.memorySizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code miss_count}
+         */
+        public final Builder missCount(long value) {
+            this.missCount = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RequestCacheStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RequestCacheStats build() {
+            _checkSingleUse();
+
+            return new RequestCacheStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RequestCacheStats}
+     */
+    public static final JsonpDeserializer<RequestCacheStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RequestCacheStats::setupRequestCacheStatsDeserializer
+    );
+
+    protected static void setupRequestCacheStatsDeserializer(ObjectDeserializer<RequestCacheStats.Builder> op) {
+
+        op.add(Builder::evictions, JsonpDeserializer.longDeserializer(), "evictions");
+        op.add(Builder::hitCount, JsonpDeserializer.longDeserializer(), "hit_count");
+        op.add(Builder::memorySize, JsonpDeserializer.stringDeserializer(), "memory_size");
+        op.add(Builder::memorySizeInBytes, JsonpDeserializer.longDeserializer(), "memory_size_in_bytes");
+        op.add(Builder::missCount, JsonpDeserializer.longDeserializer(), "miss_count");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Result.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/Result.java
index 6d2a026a12..54b408cf76 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Result.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/Result.java
@@ -37,27 +37,27 @@
 
 @JsonpDeserializable
 public enum Result implements JsonEnum {
-	Created("created"),
+    Created("created"),
 
-	Updated("updated"),
+    Updated("updated"),
 
-	Deleted("deleted"),
+    Deleted("deleted"),
 
-	NotFound("not_found"),
+    NotFound("not_found"),
 
-	NoOp("noop"),
+    NoOp("noop"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	Result(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    Result(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<Result> _DESERIALIZER = new JsonEnum.Deserializer<>(Result.values());
+    public static final JsonEnum.Deserializer<Result> _DESERIALIZER = new JsonEnum.Deserializer<>(Result.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Retries.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/Retries.java
index 677fbd2707..235a05576c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Retries.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/Retries.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,116 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.Retries
 
 @JsonpDeserializable
 public class Retries implements JsonpSerializable {
-	private final long bulk;
-
-	private final long search;
-
-	// ---------------------------------------------------------------------------------------------
+    private final long bulk;
 
-	private Retries(Builder builder) {
+    private final long search;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.bulk = ApiTypeHelper.requireNonNull(builder.bulk, this, "bulk");
-		this.search = ApiTypeHelper.requireNonNull(builder.search, this, "search");
+    private Retries(Builder builder) {
 
-	}
+        this.bulk = ApiTypeHelper.requireNonNull(builder.bulk, this, "bulk");
+        this.search = ApiTypeHelper.requireNonNull(builder.search, this, "search");
 
-	public static Retries of(Function<Builder, ObjectBuilder<Retries>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code bulk}
-	 */
-	public final long bulk() {
-		return this.bulk;
-	}
+    public static Retries of(Function<Builder, ObjectBuilder<Retries>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code search}
-	 */
-	public final long search() {
-		return this.search;
-	}
+    /**
+     * Required - API name: {@code bulk}
+     */
+    public final long bulk() {
+        return this.bulk;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code search}
+     */
+    public final long search() {
+        return this.search;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("bulk");
-		generator.write(this.bulk);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("search");
-		generator.write(this.search);
+        generator.writeKey("bulk");
+        generator.write(this.bulk);
 
-	}
+        generator.writeKey("search");
+        generator.write(this.search);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link Retries}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Retries> {
-		private Long bulk;
+    /**
+     * Builder for {@link Retries}.
+     */
 
-		private Long search;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Retries> {
+        private Long bulk;
 
-		/**
-		 * Required - API name: {@code bulk}
-		 */
-		public final Builder bulk(long value) {
-			this.bulk = value;
-			return this;
-		}
+        private Long search;
 
-		/**
-		 * Required - API name: {@code search}
-		 */
-		public final Builder search(long value) {
-			this.search = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code bulk}
+         */
+        public final Builder bulk(long value) {
+            this.bulk = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link Retries}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Retries build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code search}
+         */
+        public final Builder search(long value) {
+            this.search = value;
+            return this;
+        }
 
-			return new Retries(this);
-		}
-	}
+        /**
+         * Builds a {@link Retries}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Retries build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new Retries(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link Retries}
-	 */
-	public static final JsonpDeserializer<Retries> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Retries::setupRetriesDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupRetriesDeserializer(ObjectDeserializer<Retries.Builder> op) {
+    /**
+     * Json deserializer for {@link Retries}
+     */
+    public static final JsonpDeserializer<Retries> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Retries::setupRetriesDeserializer
+    );
 
-		op.add(Builder::bulk, JsonpDeserializer.longDeserializer(), "bulk");
-		op.add(Builder::search, JsonpDeserializer.longDeserializer(), "search");
+    protected static void setupRetriesDeserializer(ObjectDeserializer<Retries.Builder> op) {
 
-	}
+        op.add(Builder::bulk, JsonpDeserializer.longDeserializer(), "bulk");
+        op.add(Builder::search, JsonpDeserializer.longDeserializer(), "search");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScoreSort.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScoreSort.java
index 5e1a86fc87..b432f1dfd1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScoreSort.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScoreSort.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,107 +43,105 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.ScoreSort
 
 @JsonpDeserializable
 public class ScoreSort implements SortOptionsVariant, JsonpSerializable {
-	@Nullable
-	private final SortOrder order;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ScoreSort(Builder builder) {
-
-		this.order = builder.order;
-
-	}
-
-	public static ScoreSort of(Function<Builder, ObjectBuilder<ScoreSort>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * SortOptions variant kind.
-	 */
-	@Override
-	public SortOptions.Kind _sortOptionsKind() {
-		return SortOptions.Kind.Doc;
-	}
-
-	/**
-	 * API name: {@code order}
-	 */
-	@Nullable
-	public final SortOrder order() {
-		return this.order;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.order != null) {
-			generator.writeKey("order");
-			this.order.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ScoreSort}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ScoreSort> {
-		@Nullable
-		private SortOrder order;
-
-		/**
-		 * API name: {@code order}
-		 */
-		public final Builder order(@Nullable SortOrder value) {
-			this.order = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ScoreSort}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ScoreSort build() {
-			_checkSingleUse();
-
-			return new ScoreSort(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ScoreSort}
-	 */
-	public static final JsonpDeserializer<ScoreSort> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ScoreSort::setupScoreSortDeserializer);
-
-	protected static void setupScoreSortDeserializer(ObjectDeserializer<ScoreSort.Builder> op) {
-
-		op.add(Builder::order, SortOrder._DESERIALIZER, "order");
-
-	}
+    @Nullable
+    private final SortOrder order;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ScoreSort(Builder builder) {
+
+        this.order = builder.order;
+
+    }
+
+    public static ScoreSort of(Function<Builder, ObjectBuilder<ScoreSort>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * SortOptions variant kind.
+     */
+    @Override
+    public SortOptions.Kind _sortOptionsKind() {
+        return SortOptions.Kind.Doc;
+    }
+
+    /**
+     * API name: {@code order}
+     */
+    @Nullable
+    public final SortOrder order() {
+        return this.order;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.order != null) {
+            generator.writeKey("order");
+            this.order.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ScoreSort}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ScoreSort> {
+        @Nullable
+        private SortOrder order;
+
+        /**
+         * API name: {@code order}
+         */
+        public final Builder order(@Nullable SortOrder value) {
+            this.order = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ScoreSort}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ScoreSort build() {
+            _checkSingleUse();
+
+            return new ScoreSort(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ScoreSort}
+     */
+    public static final JsonpDeserializer<ScoreSort> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ScoreSort::setupScoreSortDeserializer
+    );
+
+    protected static void setupScoreSortDeserializer(ObjectDeserializer<ScoreSort.Builder> op) {
+
+        op.add(Builder::order, SortOrder._DESERIALIZER, "order");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Script.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/Script.java
index 0f6250be36..6f969b8f5a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Script.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/Script.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,127 +44,125 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.Script
 
 @JsonpDeserializable
 public class Script implements TaggedUnion<Script.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Inline, Stored
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private Script(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	private Script(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static Script of(Function<Builder, ObjectBuilder<Script>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code inline}?
-	 */
-	public boolean isInline() {
-		return _kind == Kind.Inline;
-	}
-
-	/**
-	 * Get the {@code inline} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code inline} kind.
-	 */
-	public InlineScript inline() {
-		return TaggedUnionUtils.get(this, Kind.Inline);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code stored}?
-	 */
-	public boolean isStored() {
-		return _kind == Kind.Stored;
-	}
-
-	/**
-	 * Get the {@code stored} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code stored} kind.
-	 */
-	public StoredScriptId stored() {
-		return TaggedUnionUtils.get(this, Kind.Stored);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Script> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<Script> inline(InlineScript v) {
-			this._kind = Kind.Inline;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Script> inline(Function<InlineScript.Builder, ObjectBuilder<InlineScript>> fn) {
-			return this.inline(fn.apply(new InlineScript.Builder()).build());
-		}
-
-		public ObjectBuilder<Script> stored(StoredScriptId v) {
-			this._kind = Kind.Stored;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Script> stored(Function<StoredScriptId.Builder, ObjectBuilder<StoredScriptId>> fn) {
-			return this.stored(fn.apply(new StoredScriptId.Builder()).build());
-		}
-
-		public Script build() {
-			_checkSingleUse();
-			return new Script(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<Script> buildScriptDeserializer() {
-		return new UnionDeserializer.Builder<Script, Kind, Object>(Script::new, false)
-				.addMember(Kind.Inline, InlineScript._DESERIALIZER).addMember(Kind.Stored, StoredScriptId._DESERIALIZER)
-				.build();
-	}
-
-	public static final JsonpDeserializer<Script> _DESERIALIZER = JsonpDeserializer
-			.lazy(Script::buildScriptDeserializer);
+    public enum Kind {
+        Inline,
+        Stored
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private Script(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private Script(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static Script of(Function<Builder, ObjectBuilder<Script>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code inline}?
+     */
+    public boolean isInline() {
+        return _kind == Kind.Inline;
+    }
+
+    /**
+     * Get the {@code inline} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code inline} kind.
+     */
+    public InlineScript inline() {
+        return TaggedUnionUtils.get(this, Kind.Inline);
+    }
+
+    /**
+     * Is this variant instance of kind {@code stored}?
+     */
+    public boolean isStored() {
+        return _kind == Kind.Stored;
+    }
+
+    /**
+     * Get the {@code stored} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code stored} kind.
+     */
+    public StoredScriptId stored() {
+        return TaggedUnionUtils.get(this, Kind.Stored);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Script> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<Script> inline(InlineScript v) {
+            this._kind = Kind.Inline;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Script> inline(Function<InlineScript.Builder, ObjectBuilder<InlineScript>> fn) {
+            return this.inline(fn.apply(new InlineScript.Builder()).build());
+        }
+
+        public ObjectBuilder<Script> stored(StoredScriptId v) {
+            this._kind = Kind.Stored;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Script> stored(Function<StoredScriptId.Builder, ObjectBuilder<StoredScriptId>> fn) {
+            return this.stored(fn.apply(new StoredScriptId.Builder()).build());
+        }
+
+        public Script build() {
+            _checkSingleUse();
+            return new Script(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<Script> buildScriptDeserializer() {
+        return new UnionDeserializer.Builder<Script, Kind, Object>(Script::new, false).addMember(Kind.Inline, InlineScript._DESERIALIZER)
+            .addMember(Kind.Stored, StoredScriptId._DESERIALIZER)
+            .build();
+    }
+
+    public static final JsonpDeserializer<Script> _DESERIALIZER = JsonpDeserializer.lazy(Script::buildScriptDeserializer);
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBase.java
index dcf5f852fd..cb31efd18e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBase.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,92 +42,85 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import javax.annotation.Nullable;
 
 // typedef: _types.ScriptBase
 
-
 public abstract class ScriptBase implements JsonpSerializable {
-	private final Map<String, JsonData> params;
+    private final Map<String, JsonData> params;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected ScriptBase(AbstractBuilder<?> builder) {
+    protected ScriptBase(AbstractBuilder<?> builder) {
 
-		this.params = ApiTypeHelper.unmodifiable(builder.params);
+        this.params = ApiTypeHelper.unmodifiable(builder.params);
 
-	}
+    }
 
-	/**
-	 * API name: {@code params}
-	 */
-	public final Map<String, JsonData> params() {
-		return this.params;
-	}
+    /**
+     * API name: {@code params}
+     */
+    public final Map<String, JsonData> params() {
+        return this.params;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		if (ApiTypeHelper.isDefined(this.params)) {
-			generator.writeKey("params");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.params)) {
+            generator.writeKey("params");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
 
-			}
-			generator.writeEnd();
+            }
+            generator.writeEnd();
 
-		}
+        }
 
-	}
+    }
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		@Nullable
-		private Map<String, JsonData> params;
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        @Nullable
+        private Map<String, JsonData> params;
 
-		/**
-		 * API name: {@code params}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>params</code>.
-		 */
-		public final BuilderT params(Map<String, JsonData> map) {
-			this.params = _mapPutAll(this.params, map);
-			return self();
-		}
+        /**
+         * API name: {@code params}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>params</code>.
+         */
+        public final BuilderT params(Map<String, JsonData> map) {
+            this.params = _mapPutAll(this.params, map);
+            return self();
+        }
 
-		/**
-		 * API name: {@code params}
-		 * <p>
-		 * Adds an entry to <code>params</code>.
-		 */
-		public final BuilderT params(String key, JsonData value) {
-			this.params = _mapPut(this.params, key, value);
-			return self();
-		}
+        /**
+         * API name: {@code params}
+         * <p>
+         * Adds an entry to <code>params</code>.
+         */
+        public final BuilderT params(String key, JsonData value) {
+            this.params = _mapPut(this.params, key, value);
+            return self();
+        }
 
-		protected abstract BuilderT self();
+        protected abstract BuilderT self();
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupScriptBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupScriptBaseDeserializer(ObjectDeserializer<BuilderT> op) {
 
-		op.add(AbstractBuilder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
+        op.add(AbstractBuilder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBuilders.java
index 5cb07983a6..4908e13b45 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBuilders.java
@@ -36,22 +36,21 @@
  * Builders for {@link Script} variants.
  */
 public class ScriptBuilders {
-	private ScriptBuilders() {
-	}
+    private ScriptBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link InlineScript inline} {@code Script} variant.
-	 */
-	public static InlineScript.Builder inline() {
-		return new InlineScript.Builder();
-	}
+    /**
+     * Creates a builder for the {@link InlineScript inline} {@code Script} variant.
+     */
+    public static InlineScript.Builder inline() {
+        return new InlineScript.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link StoredScriptId stored} {@code Script}
-	 * variant.
-	 */
-	public static StoredScriptId.Builder stored() {
-		return new StoredScriptId.Builder();
-	}
+    /**
+     * Creates a builder for the {@link StoredScriptId stored} {@code Script}
+     * variant.
+     */
+    public static StoredScriptId.Builder stored() {
+        return new StoredScriptId.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptField.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptField.java
index d4ad28e586..1324f49718 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptField.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptField.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,130 +44,129 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.ScriptField
 
 @JsonpDeserializable
 public class ScriptField implements JsonpSerializable {
-	private final Script script;
-
-	@Nullable
-	private final Boolean ignoreFailure;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ScriptField(Builder builder) {
-
-		this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
-		this.ignoreFailure = builder.ignoreFailure;
-
-	}
-
-	public static ScriptField of(Function<Builder, ObjectBuilder<ScriptField>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code script}
-	 */
-	public final Script script() {
-		return this.script;
-	}
-
-	/**
-	 * API name: {@code ignore_failure}
-	 */
-	@Nullable
-	public final Boolean ignoreFailure() {
-		return this.ignoreFailure;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("script");
-		this.script.serialize(generator, mapper);
-
-		if (this.ignoreFailure != null) {
-			generator.writeKey("ignore_failure");
-			generator.write(this.ignoreFailure);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ScriptField}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ScriptField> {
-		private Script script;
-
-		@Nullable
-		private Boolean ignoreFailure;
-
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code ignore_failure}
-		 */
-		public final Builder ignoreFailure(@Nullable Boolean value) {
-			this.ignoreFailure = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ScriptField}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ScriptField build() {
-			_checkSingleUse();
-
-			return new ScriptField(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ScriptField}
-	 */
-	public static final JsonpDeserializer<ScriptField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ScriptField::setupScriptFieldDeserializer);
-
-	protected static void setupScriptFieldDeserializer(ObjectDeserializer<ScriptField.Builder> op) {
-
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-		op.add(Builder::ignoreFailure, JsonpDeserializer.booleanDeserializer(), "ignore_failure");
-
-	}
+    private final Script script;
+
+    @Nullable
+    private final Boolean ignoreFailure;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ScriptField(Builder builder) {
+
+        this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
+        this.ignoreFailure = builder.ignoreFailure;
+
+    }
+
+    public static ScriptField of(Function<Builder, ObjectBuilder<ScriptField>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code script}
+     */
+    public final Script script() {
+        return this.script;
+    }
+
+    /**
+     * API name: {@code ignore_failure}
+     */
+    @Nullable
+    public final Boolean ignoreFailure() {
+        return this.ignoreFailure;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("script");
+        this.script.serialize(generator, mapper);
+
+        if (this.ignoreFailure != null) {
+            generator.writeKey("ignore_failure");
+            generator.write(this.ignoreFailure);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ScriptField}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ScriptField> {
+        private Script script;
+
+        @Nullable
+        private Boolean ignoreFailure;
+
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * API name: {@code ignore_failure}
+         */
+        public final Builder ignoreFailure(@Nullable Boolean value) {
+            this.ignoreFailure = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ScriptField}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ScriptField build() {
+            _checkSingleUse();
+
+            return new ScriptField(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ScriptField}
+     */
+    public static final JsonpDeserializer<ScriptField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ScriptField::setupScriptFieldDeserializer
+    );
+
+    protected static void setupScriptFieldDeserializer(ObjectDeserializer<ScriptField.Builder> op) {
+
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+        op.add(Builder::ignoreFailure, JsonpDeserializer.booleanDeserializer(), "ignore_failure");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptSort.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptSort.java
index 63fc9a0cd6..f87fc67dd6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptSort.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptSort.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,230 +44,228 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.ScriptSort
 
 @JsonpDeserializable
 public class ScriptSort implements SortOptionsVariant, JsonpSerializable {
-	@Nullable
-	private final SortOrder order;
-
-	private final Script script;
-
-	@Nullable
-	private final ScriptSortType type;
-
-	@Nullable
-	private final SortMode mode;
-
-	@Nullable
-	private final NestedSortValue nested;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ScriptSort(Builder builder) {
-
-		this.order = builder.order;
-		this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
-		this.type = builder.type;
-		this.mode = builder.mode;
-		this.nested = builder.nested;
-
-	}
-
-	public static ScriptSort of(Function<Builder, ObjectBuilder<ScriptSort>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * SortOptions variant kind.
-	 */
-	@Override
-	public SortOptions.Kind _sortOptionsKind() {
-		return SortOptions.Kind.Script;
-	}
-
-	/**
-	 * API name: {@code order}
-	 */
-	@Nullable
-	public final SortOrder order() {
-		return this.order;
-	}
-
-	/**
-	 * Required - API name: {@code script}
-	 */
-	public final Script script() {
-		return this.script;
-	}
-
-	/**
-	 * API name: {@code type}
-	 */
-	@Nullable
-	public final ScriptSortType type() {
-		return this.type;
-	}
-
-	/**
-	 * API name: {@code mode}
-	 */
-	@Nullable
-	public final SortMode mode() {
-		return this.mode;
-	}
-
-	/**
-	 * API name: {@code nested}
-	 */
-	@Nullable
-	public final NestedSortValue nested() {
-		return this.nested;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.order != null) {
-			generator.writeKey("order");
-			this.order.serialize(generator, mapper);
-		}
-		generator.writeKey("script");
-		this.script.serialize(generator, mapper);
-
-		if (this.type != null) {
-			generator.writeKey("type");
-			this.type.serialize(generator, mapper);
-		}
-		if (this.mode != null) {
-			generator.writeKey("mode");
-			this.mode.serialize(generator, mapper);
-		}
-		if (this.nested != null) {
-			generator.writeKey("nested");
-			this.nested.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ScriptSort}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ScriptSort> {
-		@Nullable
-		private SortOrder order;
-
-		private Script script;
-
-		@Nullable
-		private ScriptSortType type;
-
-		@Nullable
-		private SortMode mode;
-
-		@Nullable
-		private NestedSortValue nested;
-
-		/**
-		 * API name: {@code order}
-		 */
-		public final Builder order(@Nullable SortOrder value) {
-			this.order = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code type}
-		 */
-		public final Builder type(@Nullable ScriptSortType value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mode}
-		 */
-		public final Builder mode(@Nullable SortMode value) {
-			this.mode = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code nested}
-		 */
-		public final Builder nested(@Nullable NestedSortValue value) {
-			this.nested = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code nested}
-		 */
-		public final Builder nested(Function<NestedSortValue.Builder, ObjectBuilder<NestedSortValue>> fn) {
-			return this.nested(fn.apply(new NestedSortValue.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ScriptSort}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ScriptSort build() {
-			_checkSingleUse();
-
-			return new ScriptSort(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ScriptSort}
-	 */
-	public static final JsonpDeserializer<ScriptSort> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ScriptSort::setupScriptSortDeserializer);
-
-	protected static void setupScriptSortDeserializer(ObjectDeserializer<ScriptSort.Builder> op) {
-
-		op.add(Builder::order, SortOrder._DESERIALIZER, "order");
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-		op.add(Builder::type, ScriptSortType._DESERIALIZER, "type");
-		op.add(Builder::mode, SortMode._DESERIALIZER, "mode");
-		op.add(Builder::nested, NestedSortValue._DESERIALIZER, "nested");
-
-	}
+    @Nullable
+    private final SortOrder order;
+
+    private final Script script;
+
+    @Nullable
+    private final ScriptSortType type;
+
+    @Nullable
+    private final SortMode mode;
+
+    @Nullable
+    private final NestedSortValue nested;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ScriptSort(Builder builder) {
+
+        this.order = builder.order;
+        this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
+        this.type = builder.type;
+        this.mode = builder.mode;
+        this.nested = builder.nested;
+
+    }
+
+    public static ScriptSort of(Function<Builder, ObjectBuilder<ScriptSort>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * SortOptions variant kind.
+     */
+    @Override
+    public SortOptions.Kind _sortOptionsKind() {
+        return SortOptions.Kind.Script;
+    }
+
+    /**
+     * API name: {@code order}
+     */
+    @Nullable
+    public final SortOrder order() {
+        return this.order;
+    }
+
+    /**
+     * Required - API name: {@code script}
+     */
+    public final Script script() {
+        return this.script;
+    }
+
+    /**
+     * API name: {@code type}
+     */
+    @Nullable
+    public final ScriptSortType type() {
+        return this.type;
+    }
+
+    /**
+     * API name: {@code mode}
+     */
+    @Nullable
+    public final SortMode mode() {
+        return this.mode;
+    }
+
+    /**
+     * API name: {@code nested}
+     */
+    @Nullable
+    public final NestedSortValue nested() {
+        return this.nested;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.order != null) {
+            generator.writeKey("order");
+            this.order.serialize(generator, mapper);
+        }
+        generator.writeKey("script");
+        this.script.serialize(generator, mapper);
+
+        if (this.type != null) {
+            generator.writeKey("type");
+            this.type.serialize(generator, mapper);
+        }
+        if (this.mode != null) {
+            generator.writeKey("mode");
+            this.mode.serialize(generator, mapper);
+        }
+        if (this.nested != null) {
+            generator.writeKey("nested");
+            this.nested.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ScriptSort}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ScriptSort> {
+        @Nullable
+        private SortOrder order;
+
+        private Script script;
+
+        @Nullable
+        private ScriptSortType type;
+
+        @Nullable
+        private SortMode mode;
+
+        @Nullable
+        private NestedSortValue nested;
+
+        /**
+         * API name: {@code order}
+         */
+        public final Builder order(@Nullable SortOrder value) {
+            this.order = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * API name: {@code type}
+         */
+        public final Builder type(@Nullable ScriptSortType value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mode}
+         */
+        public final Builder mode(@Nullable SortMode value) {
+            this.mode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code nested}
+         */
+        public final Builder nested(@Nullable NestedSortValue value) {
+            this.nested = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code nested}
+         */
+        public final Builder nested(Function<NestedSortValue.Builder, ObjectBuilder<NestedSortValue>> fn) {
+            return this.nested(fn.apply(new NestedSortValue.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ScriptSort}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ScriptSort build() {
+            _checkSingleUse();
+
+            return new ScriptSort(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ScriptSort}
+     */
+    public static final JsonpDeserializer<ScriptSort> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ScriptSort::setupScriptSortDeserializer
+    );
+
+    protected static void setupScriptSortDeserializer(ObjectDeserializer<ScriptSort.Builder> op) {
+
+        op.add(Builder::order, SortOrder._DESERIALIZER, "order");
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+        op.add(Builder::type, ScriptSortType._DESERIALIZER, "type");
+        op.add(Builder::mode, SortMode._DESERIALIZER, "mode");
+        op.add(Builder::nested, NestedSortValue._DESERIALIZER, "nested");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptSortType.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptSortType.java
index da34ce5f7a..c91b12a90d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptSortType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptSortType.java
@@ -37,22 +37,21 @@
 
 @JsonpDeserializable
 public enum ScriptSortType implements JsonEnum {
-	String("string"),
+    String("string"),
 
-	Number("number"),
+    Number("number"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	ScriptSortType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    ScriptSortType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<ScriptSortType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			ScriptSortType.values());
+    public static final JsonEnum.Deserializer<ScriptSortType> _DESERIALIZER = new JsonEnum.Deserializer<>(ScriptSortType.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SearchStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SearchStats.java
index 012281c83a..026d8ce8de 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SearchStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SearchStats.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,443 +45,440 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.SearchStats
 
 @JsonpDeserializable
 public class SearchStats implements JsonpSerializable {
-	private final long fetchCurrent;
+    private final long fetchCurrent;
+
+    private final long fetchTimeInMillis;
+
+    private final long fetchTotal;
 
-	private final long fetchTimeInMillis;
-
-	private final long fetchTotal;
+    @Nullable
+    private final Long openContexts;
+
+    private final long queryCurrent;
 
-	@Nullable
-	private final Long openContexts;
-
-	private final long queryCurrent;
-
-	private final long queryTimeInMillis;
-
-	private final long queryTotal;
-
-	private final long scrollCurrent;
-
-	private final long scrollTimeInMillis;
-
-	private final long scrollTotal;
-
-	private final long suggestCurrent;
-
-	private final long suggestTimeInMillis;
-
-	private final long suggestTotal;
-
-	private final Map<String, SearchStats> groups;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SearchStats(Builder builder) {
-
-		this.fetchCurrent = ApiTypeHelper.requireNonNull(builder.fetchCurrent, this, "fetchCurrent");
-		this.fetchTimeInMillis = ApiTypeHelper.requireNonNull(builder.fetchTimeInMillis, this, "fetchTimeInMillis");
-		this.fetchTotal = ApiTypeHelper.requireNonNull(builder.fetchTotal, this, "fetchTotal");
-		this.openContexts = builder.openContexts;
-		this.queryCurrent = ApiTypeHelper.requireNonNull(builder.queryCurrent, this, "queryCurrent");
-		this.queryTimeInMillis = ApiTypeHelper.requireNonNull(builder.queryTimeInMillis, this, "queryTimeInMillis");
-		this.queryTotal = ApiTypeHelper.requireNonNull(builder.queryTotal, this, "queryTotal");
-		this.scrollCurrent = ApiTypeHelper.requireNonNull(builder.scrollCurrent, this, "scrollCurrent");
-		this.scrollTimeInMillis = ApiTypeHelper.requireNonNull(builder.scrollTimeInMillis, this, "scrollTimeInMillis");
-		this.scrollTotal = ApiTypeHelper.requireNonNull(builder.scrollTotal, this, "scrollTotal");
-		this.suggestCurrent = ApiTypeHelper.requireNonNull(builder.suggestCurrent, this, "suggestCurrent");
-		this.suggestTimeInMillis = ApiTypeHelper.requireNonNull(builder.suggestTimeInMillis, this,
-				"suggestTimeInMillis");
-		this.suggestTotal = ApiTypeHelper.requireNonNull(builder.suggestTotal, this, "suggestTotal");
-		this.groups = ApiTypeHelper.unmodifiable(builder.groups);
-
-	}
-
-	public static SearchStats of(Function<Builder, ObjectBuilder<SearchStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code fetch_current}
-	 */
-	public final long fetchCurrent() {
-		return this.fetchCurrent;
-	}
-
-	/**
-	 * Required - API name: {@code fetch_time_in_millis}
-	 */
-	public final long fetchTimeInMillis() {
-		return this.fetchTimeInMillis;
-	}
-
-	/**
-	 * Required - API name: {@code fetch_total}
-	 */
-	public final long fetchTotal() {
-		return this.fetchTotal;
-	}
-
-	/**
-	 * API name: {@code open_contexts}
-	 */
-	@Nullable
-	public final Long openContexts() {
-		return this.openContexts;
-	}
-
-	/**
-	 * Required - API name: {@code query_current}
-	 */
-	public final long queryCurrent() {
-		return this.queryCurrent;
-	}
-
-	/**
-	 * Required - API name: {@code query_time_in_millis}
-	 */
-	public final long queryTimeInMillis() {
-		return this.queryTimeInMillis;
-	}
-
-	/**
-	 * Required - API name: {@code query_total}
-	 */
-	public final long queryTotal() {
-		return this.queryTotal;
-	}
-
-	/**
-	 * Required - API name: {@code scroll_current}
-	 */
-	public final long scrollCurrent() {
-		return this.scrollCurrent;
-	}
-
-	/**
-	 * Required - API name: {@code scroll_time_in_millis}
-	 */
-	public final long scrollTimeInMillis() {
-		return this.scrollTimeInMillis;
-	}
-
-	/**
-	 * Required - API name: {@code scroll_total}
-	 */
-	public final long scrollTotal() {
-		return this.scrollTotal;
-	}
-
-	/**
-	 * Required - API name: {@code suggest_current}
-	 */
-	public final long suggestCurrent() {
-		return this.suggestCurrent;
-	}
-
-	/**
-	 * Required - API name: {@code suggest_time_in_millis}
-	 */
-	public final long suggestTimeInMillis() {
-		return this.suggestTimeInMillis;
-	}
-
-	/**
-	 * Required - API name: {@code suggest_total}
-	 */
-	public final long suggestTotal() {
-		return this.suggestTotal;
-	}
-
-	/**
-	 * API name: {@code groups}
-	 */
-	public final Map<String, SearchStats> groups() {
-		return this.groups;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("fetch_current");
-		generator.write(this.fetchCurrent);
-
-		generator.writeKey("fetch_time_in_millis");
-		generator.write(this.fetchTimeInMillis);
-
-		generator.writeKey("fetch_total");
-		generator.write(this.fetchTotal);
-
-		if (this.openContexts != null) {
-			generator.writeKey("open_contexts");
-			generator.write(this.openContexts);
-
-		}
-		generator.writeKey("query_current");
-		generator.write(this.queryCurrent);
-
-		generator.writeKey("query_time_in_millis");
-		generator.write(this.queryTimeInMillis);
-
-		generator.writeKey("query_total");
-		generator.write(this.queryTotal);
-
-		generator.writeKey("scroll_current");
-		generator.write(this.scrollCurrent);
-
-		generator.writeKey("scroll_time_in_millis");
-		generator.write(this.scrollTimeInMillis);
-
-		generator.writeKey("scroll_total");
-		generator.write(this.scrollTotal);
-
-		generator.writeKey("suggest_current");
-		generator.write(this.suggestCurrent);
-
-		generator.writeKey("suggest_time_in_millis");
-		generator.write(this.suggestTimeInMillis);
-
-		generator.writeKey("suggest_total");
-		generator.write(this.suggestTotal);
-
-		if (ApiTypeHelper.isDefined(this.groups)) {
-			generator.writeKey("groups");
-			generator.writeStartObject();
-			for (Map.Entry<String, SearchStats> item0 : this.groups.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SearchStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SearchStats> {
-		private Long fetchCurrent;
-
-		private Long fetchTimeInMillis;
-
-		private Long fetchTotal;
-
-		@Nullable
-		private Long openContexts;
-
-		private Long queryCurrent;
-
-		private Long queryTimeInMillis;
-
-		private Long queryTotal;
-
-		private Long scrollCurrent;
-
-		private Long scrollTimeInMillis;
-
-		private Long scrollTotal;
-
-		private Long suggestCurrent;
-
-		private Long suggestTimeInMillis;
-
-		private Long suggestTotal;
-
-		@Nullable
-		private Map<String, SearchStats> groups;
-
-		/**
-		 * Required - API name: {@code fetch_current}
-		 */
-		public final Builder fetchCurrent(long value) {
-			this.fetchCurrent = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code fetch_time_in_millis}
-		 */
-		public final Builder fetchTimeInMillis(long value) {
-			this.fetchTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code fetch_total}
-		 */
-		public final Builder fetchTotal(long value) {
-			this.fetchTotal = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code open_contexts}
-		 */
-		public final Builder openContexts(@Nullable Long value) {
-			this.openContexts = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query_current}
-		 */
-		public final Builder queryCurrent(long value) {
-			this.queryCurrent = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query_time_in_millis}
-		 */
-		public final Builder queryTimeInMillis(long value) {
-			this.queryTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query_total}
-		 */
-		public final Builder queryTotal(long value) {
-			this.queryTotal = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code scroll_current}
-		 */
-		public final Builder scrollCurrent(long value) {
-			this.scrollCurrent = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code scroll_time_in_millis}
-		 */
-		public final Builder scrollTimeInMillis(long value) {
-			this.scrollTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code scroll_total}
-		 */
-		public final Builder scrollTotal(long value) {
-			this.scrollTotal = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code suggest_current}
-		 */
-		public final Builder suggestCurrent(long value) {
-			this.suggestCurrent = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code suggest_time_in_millis}
-		 */
-		public final Builder suggestTimeInMillis(long value) {
-			this.suggestTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code suggest_total}
-		 */
-		public final Builder suggestTotal(long value) {
-			this.suggestTotal = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code groups}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>groups</code>.
-		 */
-		public final Builder groups(Map<String, SearchStats> map) {
-			this.groups = _mapPutAll(this.groups, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code groups}
-		 * <p>
-		 * Adds an entry to <code>groups</code>.
-		 */
-		public final Builder groups(String key, SearchStats value) {
-			this.groups = _mapPut(this.groups, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code groups}
-		 * <p>
-		 * Adds an entry to <code>groups</code> using a builder lambda.
-		 */
-		public final Builder groups(String key, Function<SearchStats.Builder, ObjectBuilder<SearchStats>> fn) {
-			return groups(key, fn.apply(new SearchStats.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link SearchStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SearchStats build() {
-			_checkSingleUse();
-
-			return new SearchStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SearchStats}
-	 */
-	public static final JsonpDeserializer<SearchStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SearchStats::setupSearchStatsDeserializer);
-
-	protected static void setupSearchStatsDeserializer(ObjectDeserializer<SearchStats.Builder> op) {
-
-		op.add(Builder::fetchCurrent, JsonpDeserializer.longDeserializer(), "fetch_current");
-		op.add(Builder::fetchTimeInMillis, JsonpDeserializer.longDeserializer(), "fetch_time_in_millis");
-		op.add(Builder::fetchTotal, JsonpDeserializer.longDeserializer(), "fetch_total");
-		op.add(Builder::openContexts, JsonpDeserializer.longDeserializer(), "open_contexts");
-		op.add(Builder::queryCurrent, JsonpDeserializer.longDeserializer(), "query_current");
-		op.add(Builder::queryTimeInMillis, JsonpDeserializer.longDeserializer(), "query_time_in_millis");
-		op.add(Builder::queryTotal, JsonpDeserializer.longDeserializer(), "query_total");
-		op.add(Builder::scrollCurrent, JsonpDeserializer.longDeserializer(), "scroll_current");
-		op.add(Builder::scrollTimeInMillis, JsonpDeserializer.longDeserializer(), "scroll_time_in_millis");
-		op.add(Builder::scrollTotal, JsonpDeserializer.longDeserializer(), "scroll_total");
-		op.add(Builder::suggestCurrent, JsonpDeserializer.longDeserializer(), "suggest_current");
-		op.add(Builder::suggestTimeInMillis, JsonpDeserializer.longDeserializer(), "suggest_time_in_millis");
-		op.add(Builder::suggestTotal, JsonpDeserializer.longDeserializer(), "suggest_total");
-		op.add(Builder::groups, JsonpDeserializer.stringMapDeserializer(SearchStats._DESERIALIZER), "groups");
-
-	}
+    private final long queryTimeInMillis;
+
+    private final long queryTotal;
+
+    private final long scrollCurrent;
+
+    private final long scrollTimeInMillis;
+
+    private final long scrollTotal;
+
+    private final long suggestCurrent;
+
+    private final long suggestTimeInMillis;
+
+    private final long suggestTotal;
+
+    private final Map<String, SearchStats> groups;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SearchStats(Builder builder) {
+
+        this.fetchCurrent = ApiTypeHelper.requireNonNull(builder.fetchCurrent, this, "fetchCurrent");
+        this.fetchTimeInMillis = ApiTypeHelper.requireNonNull(builder.fetchTimeInMillis, this, "fetchTimeInMillis");
+        this.fetchTotal = ApiTypeHelper.requireNonNull(builder.fetchTotal, this, "fetchTotal");
+        this.openContexts = builder.openContexts;
+        this.queryCurrent = ApiTypeHelper.requireNonNull(builder.queryCurrent, this, "queryCurrent");
+        this.queryTimeInMillis = ApiTypeHelper.requireNonNull(builder.queryTimeInMillis, this, "queryTimeInMillis");
+        this.queryTotal = ApiTypeHelper.requireNonNull(builder.queryTotal, this, "queryTotal");
+        this.scrollCurrent = ApiTypeHelper.requireNonNull(builder.scrollCurrent, this, "scrollCurrent");
+        this.scrollTimeInMillis = ApiTypeHelper.requireNonNull(builder.scrollTimeInMillis, this, "scrollTimeInMillis");
+        this.scrollTotal = ApiTypeHelper.requireNonNull(builder.scrollTotal, this, "scrollTotal");
+        this.suggestCurrent = ApiTypeHelper.requireNonNull(builder.suggestCurrent, this, "suggestCurrent");
+        this.suggestTimeInMillis = ApiTypeHelper.requireNonNull(builder.suggestTimeInMillis, this, "suggestTimeInMillis");
+        this.suggestTotal = ApiTypeHelper.requireNonNull(builder.suggestTotal, this, "suggestTotal");
+        this.groups = ApiTypeHelper.unmodifiable(builder.groups);
+
+    }
+
+    public static SearchStats of(Function<Builder, ObjectBuilder<SearchStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code fetch_current}
+     */
+    public final long fetchCurrent() {
+        return this.fetchCurrent;
+    }
+
+    /**
+     * Required - API name: {@code fetch_time_in_millis}
+     */
+    public final long fetchTimeInMillis() {
+        return this.fetchTimeInMillis;
+    }
+
+    /**
+     * Required - API name: {@code fetch_total}
+     */
+    public final long fetchTotal() {
+        return this.fetchTotal;
+    }
+
+    /**
+     * API name: {@code open_contexts}
+     */
+    @Nullable
+    public final Long openContexts() {
+        return this.openContexts;
+    }
+
+    /**
+     * Required - API name: {@code query_current}
+     */
+    public final long queryCurrent() {
+        return this.queryCurrent;
+    }
+
+    /**
+     * Required - API name: {@code query_time_in_millis}
+     */
+    public final long queryTimeInMillis() {
+        return this.queryTimeInMillis;
+    }
+
+    /**
+     * Required - API name: {@code query_total}
+     */
+    public final long queryTotal() {
+        return this.queryTotal;
+    }
+
+    /**
+     * Required - API name: {@code scroll_current}
+     */
+    public final long scrollCurrent() {
+        return this.scrollCurrent;
+    }
+
+    /**
+     * Required - API name: {@code scroll_time_in_millis}
+     */
+    public final long scrollTimeInMillis() {
+        return this.scrollTimeInMillis;
+    }
+
+    /**
+     * Required - API name: {@code scroll_total}
+     */
+    public final long scrollTotal() {
+        return this.scrollTotal;
+    }
+
+    /**
+     * Required - API name: {@code suggest_current}
+     */
+    public final long suggestCurrent() {
+        return this.suggestCurrent;
+    }
+
+    /**
+     * Required - API name: {@code suggest_time_in_millis}
+     */
+    public final long suggestTimeInMillis() {
+        return this.suggestTimeInMillis;
+    }
+
+    /**
+     * Required - API name: {@code suggest_total}
+     */
+    public final long suggestTotal() {
+        return this.suggestTotal;
+    }
+
+    /**
+     * API name: {@code groups}
+     */
+    public final Map<String, SearchStats> groups() {
+        return this.groups;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("fetch_current");
+        generator.write(this.fetchCurrent);
+
+        generator.writeKey("fetch_time_in_millis");
+        generator.write(this.fetchTimeInMillis);
+
+        generator.writeKey("fetch_total");
+        generator.write(this.fetchTotal);
+
+        if (this.openContexts != null) {
+            generator.writeKey("open_contexts");
+            generator.write(this.openContexts);
+
+        }
+        generator.writeKey("query_current");
+        generator.write(this.queryCurrent);
+
+        generator.writeKey("query_time_in_millis");
+        generator.write(this.queryTimeInMillis);
+
+        generator.writeKey("query_total");
+        generator.write(this.queryTotal);
+
+        generator.writeKey("scroll_current");
+        generator.write(this.scrollCurrent);
+
+        generator.writeKey("scroll_time_in_millis");
+        generator.write(this.scrollTimeInMillis);
+
+        generator.writeKey("scroll_total");
+        generator.write(this.scrollTotal);
+
+        generator.writeKey("suggest_current");
+        generator.write(this.suggestCurrent);
+
+        generator.writeKey("suggest_time_in_millis");
+        generator.write(this.suggestTimeInMillis);
+
+        generator.writeKey("suggest_total");
+        generator.write(this.suggestTotal);
+
+        if (ApiTypeHelper.isDefined(this.groups)) {
+            generator.writeKey("groups");
+            generator.writeStartObject();
+            for (Map.Entry<String, SearchStats> item0 : this.groups.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SearchStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SearchStats> {
+        private Long fetchCurrent;
+
+        private Long fetchTimeInMillis;
+
+        private Long fetchTotal;
+
+        @Nullable
+        private Long openContexts;
+
+        private Long queryCurrent;
+
+        private Long queryTimeInMillis;
+
+        private Long queryTotal;
+
+        private Long scrollCurrent;
+
+        private Long scrollTimeInMillis;
+
+        private Long scrollTotal;
+
+        private Long suggestCurrent;
+
+        private Long suggestTimeInMillis;
+
+        private Long suggestTotal;
+
+        @Nullable
+        private Map<String, SearchStats> groups;
+
+        /**
+         * Required - API name: {@code fetch_current}
+         */
+        public final Builder fetchCurrent(long value) {
+            this.fetchCurrent = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code fetch_time_in_millis}
+         */
+        public final Builder fetchTimeInMillis(long value) {
+            this.fetchTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code fetch_total}
+         */
+        public final Builder fetchTotal(long value) {
+            this.fetchTotal = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code open_contexts}
+         */
+        public final Builder openContexts(@Nullable Long value) {
+            this.openContexts = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query_current}
+         */
+        public final Builder queryCurrent(long value) {
+            this.queryCurrent = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query_time_in_millis}
+         */
+        public final Builder queryTimeInMillis(long value) {
+            this.queryTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query_total}
+         */
+        public final Builder queryTotal(long value) {
+            this.queryTotal = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code scroll_current}
+         */
+        public final Builder scrollCurrent(long value) {
+            this.scrollCurrent = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code scroll_time_in_millis}
+         */
+        public final Builder scrollTimeInMillis(long value) {
+            this.scrollTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code scroll_total}
+         */
+        public final Builder scrollTotal(long value) {
+            this.scrollTotal = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code suggest_current}
+         */
+        public final Builder suggestCurrent(long value) {
+            this.suggestCurrent = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code suggest_time_in_millis}
+         */
+        public final Builder suggestTimeInMillis(long value) {
+            this.suggestTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code suggest_total}
+         */
+        public final Builder suggestTotal(long value) {
+            this.suggestTotal = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code groups}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>groups</code>.
+         */
+        public final Builder groups(Map<String, SearchStats> map) {
+            this.groups = _mapPutAll(this.groups, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code groups}
+         * <p>
+         * Adds an entry to <code>groups</code>.
+         */
+        public final Builder groups(String key, SearchStats value) {
+            this.groups = _mapPut(this.groups, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code groups}
+         * <p>
+         * Adds an entry to <code>groups</code> using a builder lambda.
+         */
+        public final Builder groups(String key, Function<SearchStats.Builder, ObjectBuilder<SearchStats>> fn) {
+            return groups(key, fn.apply(new SearchStats.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link SearchStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SearchStats build() {
+            _checkSingleUse();
+
+            return new SearchStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SearchStats}
+     */
+    public static final JsonpDeserializer<SearchStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SearchStats::setupSearchStatsDeserializer
+    );
+
+    protected static void setupSearchStatsDeserializer(ObjectDeserializer<SearchStats.Builder> op) {
+
+        op.add(Builder::fetchCurrent, JsonpDeserializer.longDeserializer(), "fetch_current");
+        op.add(Builder::fetchTimeInMillis, JsonpDeserializer.longDeserializer(), "fetch_time_in_millis");
+        op.add(Builder::fetchTotal, JsonpDeserializer.longDeserializer(), "fetch_total");
+        op.add(Builder::openContexts, JsonpDeserializer.longDeserializer(), "open_contexts");
+        op.add(Builder::queryCurrent, JsonpDeserializer.longDeserializer(), "query_current");
+        op.add(Builder::queryTimeInMillis, JsonpDeserializer.longDeserializer(), "query_time_in_millis");
+        op.add(Builder::queryTotal, JsonpDeserializer.longDeserializer(), "query_total");
+        op.add(Builder::scrollCurrent, JsonpDeserializer.longDeserializer(), "scroll_current");
+        op.add(Builder::scrollTimeInMillis, JsonpDeserializer.longDeserializer(), "scroll_time_in_millis");
+        op.add(Builder::scrollTotal, JsonpDeserializer.longDeserializer(), "scroll_total");
+        op.add(Builder::suggestCurrent, JsonpDeserializer.longDeserializer(), "suggest_current");
+        op.add(Builder::suggestTimeInMillis, JsonpDeserializer.longDeserializer(), "suggest_time_in_millis");
+        op.add(Builder::suggestTotal, JsonpDeserializer.longDeserializer(), "suggest_total");
+        op.add(Builder::groups, JsonpDeserializer.stringMapDeserializer(SearchStats._DESERIALIZER), "groups");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SearchType.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SearchType.java
index 44d0142e7e..7d6201c6f3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SearchType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SearchType.java
@@ -37,30 +37,29 @@
 
 @JsonpDeserializable
 public enum SearchType implements JsonEnum {
-	/**
-	 * Documents are scored using local term and document frequencies for the shard.
-	 * This is usually faster but less accurate.
-	 */
-	QueryThenFetch("query_then_fetch"),
+    /**
+     * Documents are scored using local term and document frequencies for the shard.
+     * This is usually faster but less accurate.
+     */
+    QueryThenFetch("query_then_fetch"),
 
-	/**
-	 * Documents are scored using global term and document frequencies across all
-	 * shards. This is usually slower but more accurate.
-	 */
-	DfsQueryThenFetch("dfs_query_then_fetch"),
+    /**
+     * Documents are scored using global term and document frequencies across all
+     * shards. This is usually slower but more accurate.
+     */
+    DfsQueryThenFetch("dfs_query_then_fetch"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	SearchType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    SearchType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<SearchType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			SearchType.values());
+    public static final JsonEnum.Deserializer<SearchType> _DESERIALIZER = new JsonEnum.Deserializer<>(SearchType.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SegmentsStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SegmentsStats.java
index 487c2a74b8..b8f924f99e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SegmentsStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SegmentsStats.java
@@ -32,758 +32,742 @@
 
 package org.opensearch.client.opensearch._types;
 
-import org.opensearch.client.opensearch.indices.stats.ShardFileSizeInfo;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.indices.stats.ShardFileSizeInfo;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.SegmentsStats
 
 @JsonpDeserializable
 public class SegmentsStats implements JsonpSerializable {
-	private final int count;
+    private final int count;
+
+    @Nullable
+    private final String docValuesMemory;
+
+    private final int docValuesMemoryInBytes;
+
+    private final Map<String, ShardFileSizeInfo> fileSizes;
 
-	@Nullable
-	private final String docValuesMemory;
+    @Nullable
+    private final String fixedBitSet;
 
-	private final int docValuesMemoryInBytes;
+    private final int fixedBitSetMemoryInBytes;
 
-	private final Map<String, ShardFileSizeInfo> fileSizes;
+    @Nullable
+    private final String indexWriterMemory;
 
-	@Nullable
-	private final String fixedBitSet;
+    @Nullable
+    private final Integer indexWriterMaxMemoryInBytes;
 
-	private final int fixedBitSetMemoryInBytes;
+    private final int indexWriterMemoryInBytes;
 
-	@Nullable
-	private final String indexWriterMemory;
+    private final long maxUnsafeAutoIdTimestamp;
 
-	@Nullable
-	private final Integer indexWriterMaxMemoryInBytes;
+    @Nullable
+    private final String memory;
 
-	private final int indexWriterMemoryInBytes;
+    private final int memoryInBytes;
 
-	private final long maxUnsafeAutoIdTimestamp;
+    @Nullable
+    private final String normsMemory;
 
-	@Nullable
-	private final String memory;
+    private final int normsMemoryInBytes;
 
-	private final int memoryInBytes;
+    @Nullable
+    private final String pointsMemory;
 
-	@Nullable
-	private final String normsMemory;
+    private final int pointsMemoryInBytes;
 
-	private final int normsMemoryInBytes;
+    @Nullable
+    private final String storedMemory;
 
-	@Nullable
-	private final String pointsMemory;
-
-	private final int pointsMemoryInBytes;
+    private final int storedFieldsMemoryInBytes;
+
+    private final int termsMemoryInBytes;
 
-	@Nullable
-	private final String storedMemory;
-
-	private final int storedFieldsMemoryInBytes;
-
-	private final int termsMemoryInBytes;
-
-	@Nullable
-	private final String termsMemory;
-
-	@Nullable
-	private final String termVectoryMemory;
-
-	private final int termVectorsMemoryInBytes;
-
-	@Nullable
-	private final String versionMapMemory;
-
-	private final int versionMapMemoryInBytes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SegmentsStats(Builder builder) {
-
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.docValuesMemory = builder.docValuesMemory;
-		this.docValuesMemoryInBytes = ApiTypeHelper.requireNonNull(builder.docValuesMemoryInBytes, this,
-				"docValuesMemoryInBytes");
-		this.fileSizes = ApiTypeHelper.unmodifiableRequired(builder.fileSizes, this, "fileSizes");
-		this.fixedBitSet = builder.fixedBitSet;
-		this.fixedBitSetMemoryInBytes = ApiTypeHelper.requireNonNull(builder.fixedBitSetMemoryInBytes, this,
-				"fixedBitSetMemoryInBytes");
-		this.indexWriterMemory = builder.indexWriterMemory;
-		this.indexWriterMaxMemoryInBytes = builder.indexWriterMaxMemoryInBytes;
-		this.indexWriterMemoryInBytes = ApiTypeHelper.requireNonNull(builder.indexWriterMemoryInBytes, this,
-				"indexWriterMemoryInBytes");
-		this.maxUnsafeAutoIdTimestamp = ApiTypeHelper.requireNonNull(builder.maxUnsafeAutoIdTimestamp, this,
-				"maxUnsafeAutoIdTimestamp");
-		this.memory = builder.memory;
-		this.memoryInBytes = ApiTypeHelper.requireNonNull(builder.memoryInBytes, this, "memoryInBytes");
-		this.normsMemory = builder.normsMemory;
-		this.normsMemoryInBytes = ApiTypeHelper.requireNonNull(builder.normsMemoryInBytes, this, "normsMemoryInBytes");
-		this.pointsMemory = builder.pointsMemory;
-		this.pointsMemoryInBytes = ApiTypeHelper.requireNonNull(builder.pointsMemoryInBytes, this,
-				"pointsMemoryInBytes");
-		this.storedMemory = builder.storedMemory;
-		this.storedFieldsMemoryInBytes = ApiTypeHelper.requireNonNull(builder.storedFieldsMemoryInBytes, this,
-				"storedFieldsMemoryInBytes");
-		this.termsMemoryInBytes = ApiTypeHelper.requireNonNull(builder.termsMemoryInBytes, this, "termsMemoryInBytes");
-		this.termsMemory = builder.termsMemory;
-		this.termVectoryMemory = builder.termVectoryMemory;
-		this.termVectorsMemoryInBytes = ApiTypeHelper.requireNonNull(builder.termVectorsMemoryInBytes, this,
-				"termVectorsMemoryInBytes");
-		this.versionMapMemory = builder.versionMapMemory;
-		this.versionMapMemoryInBytes = ApiTypeHelper.requireNonNull(builder.versionMapMemoryInBytes, this,
-				"versionMapMemoryInBytes");
-
-	}
-
-	public static SegmentsStats of(Function<Builder, ObjectBuilder<SegmentsStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code count}
-	 */
-	public final int count() {
-		return this.count;
-	}
-
-	/**
-	 * API name: {@code doc_values_memory}
-	 */
-	@Nullable
-	public final String docValuesMemory() {
-		return this.docValuesMemory;
-	}
-
-	/**
-	 * Required - API name: {@code doc_values_memory_in_bytes}
-	 */
-	public final int docValuesMemoryInBytes() {
-		return this.docValuesMemoryInBytes;
-	}
-
-	/**
-	 * Required - API name: {@code file_sizes}
-	 */
-	public final Map<String, ShardFileSizeInfo> fileSizes() {
-		return this.fileSizes;
-	}
-
-	/**
-	 * API name: {@code fixed_bit_set}
-	 */
-	@Nullable
-	public final String fixedBitSet() {
-		return this.fixedBitSet;
-	}
-
-	/**
-	 * Required - API name: {@code fixed_bit_set_memory_in_bytes}
-	 */
-	public final int fixedBitSetMemoryInBytes() {
-		return this.fixedBitSetMemoryInBytes;
-	}
-
-	/**
-	 * API name: {@code index_writer_memory}
-	 */
-	@Nullable
-	public final String indexWriterMemory() {
-		return this.indexWriterMemory;
-	}
-
-	/**
-	 * API name: {@code index_writer_max_memory_in_bytes}
-	 */
-	@Nullable
-	public final Integer indexWriterMaxMemoryInBytes() {
-		return this.indexWriterMaxMemoryInBytes;
-	}
-
-	/**
-	 * Required - API name: {@code index_writer_memory_in_bytes}
-	 */
-	public final int indexWriterMemoryInBytes() {
-		return this.indexWriterMemoryInBytes;
-	}
-
-	/**
-	 * Required - API name: {@code max_unsafe_auto_id_timestamp}
-	 */
-	public final long maxUnsafeAutoIdTimestamp() {
-		return this.maxUnsafeAutoIdTimestamp;
-	}
-
-	/**
-	 * API name: {@code memory}
-	 */
-	@Nullable
-	public final String memory() {
-		return this.memory;
-	}
-
-	/**
-	 * Required - API name: {@code memory_in_bytes}
-	 */
-	public final int memoryInBytes() {
-		return this.memoryInBytes;
-	}
-
-	/**
-	 * API name: {@code norms_memory}
-	 */
-	@Nullable
-	public final String normsMemory() {
-		return this.normsMemory;
-	}
-
-	/**
-	 * Required - API name: {@code norms_memory_in_bytes}
-	 */
-	public final int normsMemoryInBytes() {
-		return this.normsMemoryInBytes;
-	}
-
-	/**
-	 * API name: {@code points_memory}
-	 */
-	@Nullable
-	public final String pointsMemory() {
-		return this.pointsMemory;
-	}
-
-	/**
-	 * Required - API name: {@code points_memory_in_bytes}
-	 */
-	public final int pointsMemoryInBytes() {
-		return this.pointsMemoryInBytes;
-	}
-
-	/**
-	 * API name: {@code stored_memory}
-	 */
-	@Nullable
-	public final String storedMemory() {
-		return this.storedMemory;
-	}
-
-	/**
-	 * Required - API name: {@code stored_fields_memory_in_bytes}
-	 */
-	public final int storedFieldsMemoryInBytes() {
-		return this.storedFieldsMemoryInBytes;
-	}
-
-	/**
-	 * Required - API name: {@code terms_memory_in_bytes}
-	 */
-	public final int termsMemoryInBytes() {
-		return this.termsMemoryInBytes;
-	}
-
-	/**
-	 * API name: {@code terms_memory}
-	 */
-	@Nullable
-	public final String termsMemory() {
-		return this.termsMemory;
-	}
-
-	/**
-	 * API name: {@code term_vectory_memory}
-	 */
-	@Nullable
-	public final String termVectoryMemory() {
-		return this.termVectoryMemory;
-	}
-
-	/**
-	 * Required - API name: {@code term_vectors_memory_in_bytes}
-	 */
-	public final int termVectorsMemoryInBytes() {
-		return this.termVectorsMemoryInBytes;
-	}
-
-	/**
-	 * API name: {@code version_map_memory}
-	 */
-	@Nullable
-	public final String versionMapMemory() {
-		return this.versionMapMemory;
-	}
-
-	/**
-	 * Required - API name: {@code version_map_memory_in_bytes}
-	 */
-	public final int versionMapMemoryInBytes() {
-		return this.versionMapMemoryInBytes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("count");
-		generator.write(this.count);
-
-		if (this.docValuesMemory != null) {
-			generator.writeKey("doc_values_memory");
-			generator.write(this.docValuesMemory);
-
-		}
-		generator.writeKey("doc_values_memory_in_bytes");
-		generator.write(this.docValuesMemoryInBytes);
-
-		if (ApiTypeHelper.isDefined(this.fileSizes)) {
-			generator.writeKey("file_sizes");
-			generator.writeStartObject();
-			for (Map.Entry<String, ShardFileSizeInfo> item0 : this.fileSizes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.fixedBitSet != null) {
-			generator.writeKey("fixed_bit_set");
-			generator.write(this.fixedBitSet);
-
-		}
-		generator.writeKey("fixed_bit_set_memory_in_bytes");
-		generator.write(this.fixedBitSetMemoryInBytes);
-
-		if (this.indexWriterMemory != null) {
-			generator.writeKey("index_writer_memory");
-			generator.write(this.indexWriterMemory);
-
-		}
-		if (this.indexWriterMaxMemoryInBytes != null) {
-			generator.writeKey("index_writer_max_memory_in_bytes");
-			generator.write(this.indexWriterMaxMemoryInBytes);
-
-		}
-		generator.writeKey("index_writer_memory_in_bytes");
-		generator.write(this.indexWriterMemoryInBytes);
+    @Nullable
+    private final String termsMemory;
+
+    @Nullable
+    private final String termVectoryMemory;
+
+    private final int termVectorsMemoryInBytes;
+
+    @Nullable
+    private final String versionMapMemory;
+
+    private final int versionMapMemoryInBytes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SegmentsStats(Builder builder) {
+
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.docValuesMemory = builder.docValuesMemory;
+        this.docValuesMemoryInBytes = ApiTypeHelper.requireNonNull(builder.docValuesMemoryInBytes, this, "docValuesMemoryInBytes");
+        this.fileSizes = ApiTypeHelper.unmodifiableRequired(builder.fileSizes, this, "fileSizes");
+        this.fixedBitSet = builder.fixedBitSet;
+        this.fixedBitSetMemoryInBytes = ApiTypeHelper.requireNonNull(builder.fixedBitSetMemoryInBytes, this, "fixedBitSetMemoryInBytes");
+        this.indexWriterMemory = builder.indexWriterMemory;
+        this.indexWriterMaxMemoryInBytes = builder.indexWriterMaxMemoryInBytes;
+        this.indexWriterMemoryInBytes = ApiTypeHelper.requireNonNull(builder.indexWriterMemoryInBytes, this, "indexWriterMemoryInBytes");
+        this.maxUnsafeAutoIdTimestamp = ApiTypeHelper.requireNonNull(builder.maxUnsafeAutoIdTimestamp, this, "maxUnsafeAutoIdTimestamp");
+        this.memory = builder.memory;
+        this.memoryInBytes = ApiTypeHelper.requireNonNull(builder.memoryInBytes, this, "memoryInBytes");
+        this.normsMemory = builder.normsMemory;
+        this.normsMemoryInBytes = ApiTypeHelper.requireNonNull(builder.normsMemoryInBytes, this, "normsMemoryInBytes");
+        this.pointsMemory = builder.pointsMemory;
+        this.pointsMemoryInBytes = ApiTypeHelper.requireNonNull(builder.pointsMemoryInBytes, this, "pointsMemoryInBytes");
+        this.storedMemory = builder.storedMemory;
+        this.storedFieldsMemoryInBytes = ApiTypeHelper.requireNonNull(builder.storedFieldsMemoryInBytes, this, "storedFieldsMemoryInBytes");
+        this.termsMemoryInBytes = ApiTypeHelper.requireNonNull(builder.termsMemoryInBytes, this, "termsMemoryInBytes");
+        this.termsMemory = builder.termsMemory;
+        this.termVectoryMemory = builder.termVectoryMemory;
+        this.termVectorsMemoryInBytes = ApiTypeHelper.requireNonNull(builder.termVectorsMemoryInBytes, this, "termVectorsMemoryInBytes");
+        this.versionMapMemory = builder.versionMapMemory;
+        this.versionMapMemoryInBytes = ApiTypeHelper.requireNonNull(builder.versionMapMemoryInBytes, this, "versionMapMemoryInBytes");
+
+    }
+
+    public static SegmentsStats of(Function<Builder, ObjectBuilder<SegmentsStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code count}
+     */
+    public final int count() {
+        return this.count;
+    }
+
+    /**
+     * API name: {@code doc_values_memory}
+     */
+    @Nullable
+    public final String docValuesMemory() {
+        return this.docValuesMemory;
+    }
+
+    /**
+     * Required - API name: {@code doc_values_memory_in_bytes}
+     */
+    public final int docValuesMemoryInBytes() {
+        return this.docValuesMemoryInBytes;
+    }
+
+    /**
+     * Required - API name: {@code file_sizes}
+     */
+    public final Map<String, ShardFileSizeInfo> fileSizes() {
+        return this.fileSizes;
+    }
+
+    /**
+     * API name: {@code fixed_bit_set}
+     */
+    @Nullable
+    public final String fixedBitSet() {
+        return this.fixedBitSet;
+    }
+
+    /**
+     * Required - API name: {@code fixed_bit_set_memory_in_bytes}
+     */
+    public final int fixedBitSetMemoryInBytes() {
+        return this.fixedBitSetMemoryInBytes;
+    }
+
+    /**
+     * API name: {@code index_writer_memory}
+     */
+    @Nullable
+    public final String indexWriterMemory() {
+        return this.indexWriterMemory;
+    }
+
+    /**
+     * API name: {@code index_writer_max_memory_in_bytes}
+     */
+    @Nullable
+    public final Integer indexWriterMaxMemoryInBytes() {
+        return this.indexWriterMaxMemoryInBytes;
+    }
+
+    /**
+     * Required - API name: {@code index_writer_memory_in_bytes}
+     */
+    public final int indexWriterMemoryInBytes() {
+        return this.indexWriterMemoryInBytes;
+    }
+
+    /**
+     * Required - API name: {@code max_unsafe_auto_id_timestamp}
+     */
+    public final long maxUnsafeAutoIdTimestamp() {
+        return this.maxUnsafeAutoIdTimestamp;
+    }
+
+    /**
+     * API name: {@code memory}
+     */
+    @Nullable
+    public final String memory() {
+        return this.memory;
+    }
+
+    /**
+     * Required - API name: {@code memory_in_bytes}
+     */
+    public final int memoryInBytes() {
+        return this.memoryInBytes;
+    }
+
+    /**
+     * API name: {@code norms_memory}
+     */
+    @Nullable
+    public final String normsMemory() {
+        return this.normsMemory;
+    }
+
+    /**
+     * Required - API name: {@code norms_memory_in_bytes}
+     */
+    public final int normsMemoryInBytes() {
+        return this.normsMemoryInBytes;
+    }
+
+    /**
+     * API name: {@code points_memory}
+     */
+    @Nullable
+    public final String pointsMemory() {
+        return this.pointsMemory;
+    }
+
+    /**
+     * Required - API name: {@code points_memory_in_bytes}
+     */
+    public final int pointsMemoryInBytes() {
+        return this.pointsMemoryInBytes;
+    }
+
+    /**
+     * API name: {@code stored_memory}
+     */
+    @Nullable
+    public final String storedMemory() {
+        return this.storedMemory;
+    }
+
+    /**
+     * Required - API name: {@code stored_fields_memory_in_bytes}
+     */
+    public final int storedFieldsMemoryInBytes() {
+        return this.storedFieldsMemoryInBytes;
+    }
+
+    /**
+     * Required - API name: {@code terms_memory_in_bytes}
+     */
+    public final int termsMemoryInBytes() {
+        return this.termsMemoryInBytes;
+    }
+
+    /**
+     * API name: {@code terms_memory}
+     */
+    @Nullable
+    public final String termsMemory() {
+        return this.termsMemory;
+    }
+
+    /**
+     * API name: {@code term_vectory_memory}
+     */
+    @Nullable
+    public final String termVectoryMemory() {
+        return this.termVectoryMemory;
+    }
+
+    /**
+     * Required - API name: {@code term_vectors_memory_in_bytes}
+     */
+    public final int termVectorsMemoryInBytes() {
+        return this.termVectorsMemoryInBytes;
+    }
+
+    /**
+     * API name: {@code version_map_memory}
+     */
+    @Nullable
+    public final String versionMapMemory() {
+        return this.versionMapMemory;
+    }
+
+    /**
+     * Required - API name: {@code version_map_memory_in_bytes}
+     */
+    public final int versionMapMemoryInBytes() {
+        return this.versionMapMemoryInBytes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("count");
+        generator.write(this.count);
+
+        if (this.docValuesMemory != null) {
+            generator.writeKey("doc_values_memory");
+            generator.write(this.docValuesMemory);
+
+        }
+        generator.writeKey("doc_values_memory_in_bytes");
+        generator.write(this.docValuesMemoryInBytes);
+
+        if (ApiTypeHelper.isDefined(this.fileSizes)) {
+            generator.writeKey("file_sizes");
+            generator.writeStartObject();
+            for (Map.Entry<String, ShardFileSizeInfo> item0 : this.fileSizes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.fixedBitSet != null) {
+            generator.writeKey("fixed_bit_set");
+            generator.write(this.fixedBitSet);
+
+        }
+        generator.writeKey("fixed_bit_set_memory_in_bytes");
+        generator.write(this.fixedBitSetMemoryInBytes);
+
+        if (this.indexWriterMemory != null) {
+            generator.writeKey("index_writer_memory");
+            generator.write(this.indexWriterMemory);
+
+        }
+        if (this.indexWriterMaxMemoryInBytes != null) {
+            generator.writeKey("index_writer_max_memory_in_bytes");
+            generator.write(this.indexWriterMaxMemoryInBytes);
+
+        }
+        generator.writeKey("index_writer_memory_in_bytes");
+        generator.write(this.indexWriterMemoryInBytes);
 
-		generator.writeKey("max_unsafe_auto_id_timestamp");
-		generator.write(this.maxUnsafeAutoIdTimestamp);
+        generator.writeKey("max_unsafe_auto_id_timestamp");
+        generator.write(this.maxUnsafeAutoIdTimestamp);
 
-		if (this.memory != null) {
-			generator.writeKey("memory");
-			generator.write(this.memory);
+        if (this.memory != null) {
+            generator.writeKey("memory");
+            generator.write(this.memory);
 
-		}
-		generator.writeKey("memory_in_bytes");
-		generator.write(this.memoryInBytes);
+        }
+        generator.writeKey("memory_in_bytes");
+        generator.write(this.memoryInBytes);
 
-		if (this.normsMemory != null) {
-			generator.writeKey("norms_memory");
-			generator.write(this.normsMemory);
+        if (this.normsMemory != null) {
+            generator.writeKey("norms_memory");
+            generator.write(this.normsMemory);
 
-		}
-		generator.writeKey("norms_memory_in_bytes");
-		generator.write(this.normsMemoryInBytes);
+        }
+        generator.writeKey("norms_memory_in_bytes");
+        generator.write(this.normsMemoryInBytes);
 
-		if (this.pointsMemory != null) {
-			generator.writeKey("points_memory");
-			generator.write(this.pointsMemory);
+        if (this.pointsMemory != null) {
+            generator.writeKey("points_memory");
+            generator.write(this.pointsMemory);
 
-		}
-		generator.writeKey("points_memory_in_bytes");
-		generator.write(this.pointsMemoryInBytes);
+        }
+        generator.writeKey("points_memory_in_bytes");
+        generator.write(this.pointsMemoryInBytes);
 
-		if (this.storedMemory != null) {
-			generator.writeKey("stored_memory");
-			generator.write(this.storedMemory);
+        if (this.storedMemory != null) {
+            generator.writeKey("stored_memory");
+            generator.write(this.storedMemory);
 
-		}
-		generator.writeKey("stored_fields_memory_in_bytes");
-		generator.write(this.storedFieldsMemoryInBytes);
+        }
+        generator.writeKey("stored_fields_memory_in_bytes");
+        generator.write(this.storedFieldsMemoryInBytes);
 
-		generator.writeKey("terms_memory_in_bytes");
-		generator.write(this.termsMemoryInBytes);
+        generator.writeKey("terms_memory_in_bytes");
+        generator.write(this.termsMemoryInBytes);
 
-		if (this.termsMemory != null) {
-			generator.writeKey("terms_memory");
-			generator.write(this.termsMemory);
+        if (this.termsMemory != null) {
+            generator.writeKey("terms_memory");
+            generator.write(this.termsMemory);
 
-		}
-		if (this.termVectoryMemory != null) {
-			generator.writeKey("term_vectory_memory");
-			generator.write(this.termVectoryMemory);
+        }
+        if (this.termVectoryMemory != null) {
+            generator.writeKey("term_vectory_memory");
+            generator.write(this.termVectoryMemory);
 
-		}
-		generator.writeKey("term_vectors_memory_in_bytes");
-		generator.write(this.termVectorsMemoryInBytes);
+        }
+        generator.writeKey("term_vectors_memory_in_bytes");
+        generator.write(this.termVectorsMemoryInBytes);
 
-		if (this.versionMapMemory != null) {
-			generator.writeKey("version_map_memory");
-			generator.write(this.versionMapMemory);
+        if (this.versionMapMemory != null) {
+            generator.writeKey("version_map_memory");
+            generator.write(this.versionMapMemory);
 
-		}
-		generator.writeKey("version_map_memory_in_bytes");
-		generator.write(this.versionMapMemoryInBytes);
+        }
+        generator.writeKey("version_map_memory_in_bytes");
+        generator.write(this.versionMapMemoryInBytes);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link SegmentsStats}.
-	 */
+    /**
+     * Builder for {@link SegmentsStats}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SegmentsStats> {
-		private Integer count;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SegmentsStats> {
+        private Integer count;
 
-		@Nullable
-		private String docValuesMemory;
+        @Nullable
+        private String docValuesMemory;
 
-		private Integer docValuesMemoryInBytes;
+        private Integer docValuesMemoryInBytes;
 
-		private Map<String, ShardFileSizeInfo> fileSizes;
+        private Map<String, ShardFileSizeInfo> fileSizes;
 
-		@Nullable
-		private String fixedBitSet;
+        @Nullable
+        private String fixedBitSet;
 
-		private Integer fixedBitSetMemoryInBytes;
+        private Integer fixedBitSetMemoryInBytes;
 
-		@Nullable
-		private String indexWriterMemory;
+        @Nullable
+        private String indexWriterMemory;
 
-		@Nullable
-		private Integer indexWriterMaxMemoryInBytes;
+        @Nullable
+        private Integer indexWriterMaxMemoryInBytes;
 
-		private Integer indexWriterMemoryInBytes;
+        private Integer indexWriterMemoryInBytes;
 
-		private Long maxUnsafeAutoIdTimestamp;
+        private Long maxUnsafeAutoIdTimestamp;
 
-		@Nullable
-		private String memory;
+        @Nullable
+        private String memory;
 
-		private Integer memoryInBytes;
+        private Integer memoryInBytes;
 
-		@Nullable
-		private String normsMemory;
+        @Nullable
+        private String normsMemory;
 
-		private Integer normsMemoryInBytes;
+        private Integer normsMemoryInBytes;
 
-		@Nullable
-		private String pointsMemory;
+        @Nullable
+        private String pointsMemory;
 
-		private Integer pointsMemoryInBytes;
+        private Integer pointsMemoryInBytes;
 
-		@Nullable
-		private String storedMemory;
-
-		private Integer storedFieldsMemoryInBytes;
-
-		private Integer termsMemoryInBytes;
-
-		@Nullable
-		private String termsMemory;
-
-		@Nullable
-		private String termVectoryMemory;
-
-		private Integer termVectorsMemoryInBytes;
-
-		@Nullable
-		private String versionMapMemory;
-
-		private Integer versionMapMemoryInBytes;
-
-		/**
-		 * Required - API name: {@code count}
-		 */
-		public final Builder count(int value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code doc_values_memory}
-		 */
-		public final Builder docValuesMemory(@Nullable String value) {
-			this.docValuesMemory = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code doc_values_memory_in_bytes}
-		 */
-		public final Builder docValuesMemoryInBytes(int value) {
-			this.docValuesMemoryInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code file_sizes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>fileSizes</code>.
-		 */
-		public final Builder fileSizes(Map<String, ShardFileSizeInfo> map) {
-			this.fileSizes = _mapPutAll(this.fileSizes, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code file_sizes}
-		 * <p>
-		 * Adds an entry to <code>fileSizes</code>.
-		 */
-		public final Builder fileSizes(String key, ShardFileSizeInfo value) {
-			this.fileSizes = _mapPut(this.fileSizes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code file_sizes}
-		 * <p>
-		 * Adds an entry to <code>fileSizes</code> using a builder lambda.
-		 */
-		public final Builder fileSizes(String key,
-				Function<ShardFileSizeInfo.Builder, ObjectBuilder<ShardFileSizeInfo>> fn) {
-			return fileSizes(key, fn.apply(new ShardFileSizeInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code fixed_bit_set}
-		 */
-		public final Builder fixedBitSet(@Nullable String value) {
-			this.fixedBitSet = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code fixed_bit_set_memory_in_bytes}
-		 */
-		public final Builder fixedBitSetMemoryInBytes(int value) {
-			this.fixedBitSetMemoryInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_writer_memory}
-		 */
-		public final Builder indexWriterMemory(@Nullable String value) {
-			this.indexWriterMemory = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_writer_max_memory_in_bytes}
-		 */
-		public final Builder indexWriterMaxMemoryInBytes(@Nullable Integer value) {
-			this.indexWriterMaxMemoryInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index_writer_memory_in_bytes}
-		 */
-		public final Builder indexWriterMemoryInBytes(int value) {
-			this.indexWriterMemoryInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code max_unsafe_auto_id_timestamp}
-		 */
-		public final Builder maxUnsafeAutoIdTimestamp(long value) {
-			this.maxUnsafeAutoIdTimestamp = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code memory}
-		 */
-		public final Builder memory(@Nullable String value) {
-			this.memory = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code memory_in_bytes}
-		 */
-		public final Builder memoryInBytes(int value) {
-			this.memoryInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code norms_memory}
-		 */
-		public final Builder normsMemory(@Nullable String value) {
-			this.normsMemory = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code norms_memory_in_bytes}
-		 */
-		public final Builder normsMemoryInBytes(int value) {
-			this.normsMemoryInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code points_memory}
-		 */
-		public final Builder pointsMemory(@Nullable String value) {
-			this.pointsMemory = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code points_memory_in_bytes}
-		 */
-		public final Builder pointsMemoryInBytes(int value) {
-			this.pointsMemoryInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code stored_memory}
-		 */
-		public final Builder storedMemory(@Nullable String value) {
-			this.storedMemory = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code stored_fields_memory_in_bytes}
-		 */
-		public final Builder storedFieldsMemoryInBytes(int value) {
-			this.storedFieldsMemoryInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code terms_memory_in_bytes}
-		 */
-		public final Builder termsMemoryInBytes(int value) {
-			this.termsMemoryInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code terms_memory}
-		 */
-		public final Builder termsMemory(@Nullable String value) {
-			this.termsMemory = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code term_vectory_memory}
-		 */
-		public final Builder termVectoryMemory(@Nullable String value) {
-			this.termVectoryMemory = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code term_vectors_memory_in_bytes}
-		 */
-		public final Builder termVectorsMemoryInBytes(int value) {
-			this.termVectorsMemoryInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code version_map_memory}
-		 */
-		public final Builder versionMapMemory(@Nullable String value) {
-			this.versionMapMemory = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code version_map_memory_in_bytes}
-		 */
-		public final Builder versionMapMemoryInBytes(int value) {
-			this.versionMapMemoryInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SegmentsStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SegmentsStats build() {
-			_checkSingleUse();
-
-			return new SegmentsStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SegmentsStats}
-	 */
-	public static final JsonpDeserializer<SegmentsStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SegmentsStats::setupSegmentsStatsDeserializer);
-
-	protected static void setupSegmentsStatsDeserializer(ObjectDeserializer<SegmentsStats.Builder> op) {
-
-		op.add(Builder::count, JsonpDeserializer.integerDeserializer(), "count");
-		op.add(Builder::docValuesMemory, JsonpDeserializer.stringDeserializer(), "doc_values_memory");
-		op.add(Builder::docValuesMemoryInBytes, JsonpDeserializer.integerDeserializer(), "doc_values_memory_in_bytes");
-		op.add(Builder::fileSizes, JsonpDeserializer.stringMapDeserializer(ShardFileSizeInfo._DESERIALIZER),
-				"file_sizes");
-		op.add(Builder::fixedBitSet, JsonpDeserializer.stringDeserializer(), "fixed_bit_set");
-		op.add(Builder::fixedBitSetMemoryInBytes, JsonpDeserializer.integerDeserializer(),
-				"fixed_bit_set_memory_in_bytes");
-		op.add(Builder::indexWriterMemory, JsonpDeserializer.stringDeserializer(), "index_writer_memory");
-		op.add(Builder::indexWriterMaxMemoryInBytes, JsonpDeserializer.integerDeserializer(),
-				"index_writer_max_memory_in_bytes");
-		op.add(Builder::indexWriterMemoryInBytes, JsonpDeserializer.integerDeserializer(),
-				"index_writer_memory_in_bytes");
-		op.add(Builder::maxUnsafeAutoIdTimestamp, JsonpDeserializer.longDeserializer(),
-				"max_unsafe_auto_id_timestamp");
-		op.add(Builder::memory, JsonpDeserializer.stringDeserializer(), "memory");
-		op.add(Builder::memoryInBytes, JsonpDeserializer.integerDeserializer(), "memory_in_bytes");
-		op.add(Builder::normsMemory, JsonpDeserializer.stringDeserializer(), "norms_memory");
-		op.add(Builder::normsMemoryInBytes, JsonpDeserializer.integerDeserializer(), "norms_memory_in_bytes");
-		op.add(Builder::pointsMemory, JsonpDeserializer.stringDeserializer(), "points_memory");
-		op.add(Builder::pointsMemoryInBytes, JsonpDeserializer.integerDeserializer(), "points_memory_in_bytes");
-		op.add(Builder::storedMemory, JsonpDeserializer.stringDeserializer(), "stored_memory");
-		op.add(Builder::storedFieldsMemoryInBytes, JsonpDeserializer.integerDeserializer(),
-				"stored_fields_memory_in_bytes");
-		op.add(Builder::termsMemoryInBytes, JsonpDeserializer.integerDeserializer(), "terms_memory_in_bytes");
-		op.add(Builder::termsMemory, JsonpDeserializer.stringDeserializer(), "terms_memory");
-		op.add(Builder::termVectoryMemory, JsonpDeserializer.stringDeserializer(), "term_vectory_memory");
-		op.add(Builder::termVectorsMemoryInBytes, JsonpDeserializer.integerDeserializer(),
-				"term_vectors_memory_in_bytes");
-		op.add(Builder::versionMapMemory, JsonpDeserializer.stringDeserializer(), "version_map_memory");
-		op.add(Builder::versionMapMemoryInBytes, JsonpDeserializer.integerDeserializer(),
-				"version_map_memory_in_bytes");
-
-	}
+        @Nullable
+        private String storedMemory;
+
+        private Integer storedFieldsMemoryInBytes;
+
+        private Integer termsMemoryInBytes;
+
+        @Nullable
+        private String termsMemory;
+
+        @Nullable
+        private String termVectoryMemory;
+
+        private Integer termVectorsMemoryInBytes;
+
+        @Nullable
+        private String versionMapMemory;
+
+        private Integer versionMapMemoryInBytes;
+
+        /**
+         * Required - API name: {@code count}
+         */
+        public final Builder count(int value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code doc_values_memory}
+         */
+        public final Builder docValuesMemory(@Nullable String value) {
+            this.docValuesMemory = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code doc_values_memory_in_bytes}
+         */
+        public final Builder docValuesMemoryInBytes(int value) {
+            this.docValuesMemoryInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code file_sizes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>fileSizes</code>.
+         */
+        public final Builder fileSizes(Map<String, ShardFileSizeInfo> map) {
+            this.fileSizes = _mapPutAll(this.fileSizes, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code file_sizes}
+         * <p>
+         * Adds an entry to <code>fileSizes</code>.
+         */
+        public final Builder fileSizes(String key, ShardFileSizeInfo value) {
+            this.fileSizes = _mapPut(this.fileSizes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code file_sizes}
+         * <p>
+         * Adds an entry to <code>fileSizes</code> using a builder lambda.
+         */
+        public final Builder fileSizes(String key, Function<ShardFileSizeInfo.Builder, ObjectBuilder<ShardFileSizeInfo>> fn) {
+            return fileSizes(key, fn.apply(new ShardFileSizeInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code fixed_bit_set}
+         */
+        public final Builder fixedBitSet(@Nullable String value) {
+            this.fixedBitSet = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code fixed_bit_set_memory_in_bytes}
+         */
+        public final Builder fixedBitSetMemoryInBytes(int value) {
+            this.fixedBitSetMemoryInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index_writer_memory}
+         */
+        public final Builder indexWriterMemory(@Nullable String value) {
+            this.indexWriterMemory = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index_writer_max_memory_in_bytes}
+         */
+        public final Builder indexWriterMaxMemoryInBytes(@Nullable Integer value) {
+            this.indexWriterMaxMemoryInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index_writer_memory_in_bytes}
+         */
+        public final Builder indexWriterMemoryInBytes(int value) {
+            this.indexWriterMemoryInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code max_unsafe_auto_id_timestamp}
+         */
+        public final Builder maxUnsafeAutoIdTimestamp(long value) {
+            this.maxUnsafeAutoIdTimestamp = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code memory}
+         */
+        public final Builder memory(@Nullable String value) {
+            this.memory = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code memory_in_bytes}
+         */
+        public final Builder memoryInBytes(int value) {
+            this.memoryInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code norms_memory}
+         */
+        public final Builder normsMemory(@Nullable String value) {
+            this.normsMemory = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code norms_memory_in_bytes}
+         */
+        public final Builder normsMemoryInBytes(int value) {
+            this.normsMemoryInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code points_memory}
+         */
+        public final Builder pointsMemory(@Nullable String value) {
+            this.pointsMemory = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code points_memory_in_bytes}
+         */
+        public final Builder pointsMemoryInBytes(int value) {
+            this.pointsMemoryInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code stored_memory}
+         */
+        public final Builder storedMemory(@Nullable String value) {
+            this.storedMemory = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code stored_fields_memory_in_bytes}
+         */
+        public final Builder storedFieldsMemoryInBytes(int value) {
+            this.storedFieldsMemoryInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code terms_memory_in_bytes}
+         */
+        public final Builder termsMemoryInBytes(int value) {
+            this.termsMemoryInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code terms_memory}
+         */
+        public final Builder termsMemory(@Nullable String value) {
+            this.termsMemory = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code term_vectory_memory}
+         */
+        public final Builder termVectoryMemory(@Nullable String value) {
+            this.termVectoryMemory = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code term_vectors_memory_in_bytes}
+         */
+        public final Builder termVectorsMemoryInBytes(int value) {
+            this.termVectorsMemoryInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code version_map_memory}
+         */
+        public final Builder versionMapMemory(@Nullable String value) {
+            this.versionMapMemory = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code version_map_memory_in_bytes}
+         */
+        public final Builder versionMapMemoryInBytes(int value) {
+            this.versionMapMemoryInBytes = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link SegmentsStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SegmentsStats build() {
+            _checkSingleUse();
+
+            return new SegmentsStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SegmentsStats}
+     */
+    public static final JsonpDeserializer<SegmentsStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SegmentsStats::setupSegmentsStatsDeserializer
+    );
+
+    protected static void setupSegmentsStatsDeserializer(ObjectDeserializer<SegmentsStats.Builder> op) {
+
+        op.add(Builder::count, JsonpDeserializer.integerDeserializer(), "count");
+        op.add(Builder::docValuesMemory, JsonpDeserializer.stringDeserializer(), "doc_values_memory");
+        op.add(Builder::docValuesMemoryInBytes, JsonpDeserializer.integerDeserializer(), "doc_values_memory_in_bytes");
+        op.add(Builder::fileSizes, JsonpDeserializer.stringMapDeserializer(ShardFileSizeInfo._DESERIALIZER), "file_sizes");
+        op.add(Builder::fixedBitSet, JsonpDeserializer.stringDeserializer(), "fixed_bit_set");
+        op.add(Builder::fixedBitSetMemoryInBytes, JsonpDeserializer.integerDeserializer(), "fixed_bit_set_memory_in_bytes");
+        op.add(Builder::indexWriterMemory, JsonpDeserializer.stringDeserializer(), "index_writer_memory");
+        op.add(Builder::indexWriterMaxMemoryInBytes, JsonpDeserializer.integerDeserializer(), "index_writer_max_memory_in_bytes");
+        op.add(Builder::indexWriterMemoryInBytes, JsonpDeserializer.integerDeserializer(), "index_writer_memory_in_bytes");
+        op.add(Builder::maxUnsafeAutoIdTimestamp, JsonpDeserializer.longDeserializer(), "max_unsafe_auto_id_timestamp");
+        op.add(Builder::memory, JsonpDeserializer.stringDeserializer(), "memory");
+        op.add(Builder::memoryInBytes, JsonpDeserializer.integerDeserializer(), "memory_in_bytes");
+        op.add(Builder::normsMemory, JsonpDeserializer.stringDeserializer(), "norms_memory");
+        op.add(Builder::normsMemoryInBytes, JsonpDeserializer.integerDeserializer(), "norms_memory_in_bytes");
+        op.add(Builder::pointsMemory, JsonpDeserializer.stringDeserializer(), "points_memory");
+        op.add(Builder::pointsMemoryInBytes, JsonpDeserializer.integerDeserializer(), "points_memory_in_bytes");
+        op.add(Builder::storedMemory, JsonpDeserializer.stringDeserializer(), "stored_memory");
+        op.add(Builder::storedFieldsMemoryInBytes, JsonpDeserializer.integerDeserializer(), "stored_fields_memory_in_bytes");
+        op.add(Builder::termsMemoryInBytes, JsonpDeserializer.integerDeserializer(), "terms_memory_in_bytes");
+        op.add(Builder::termsMemory, JsonpDeserializer.stringDeserializer(), "terms_memory");
+        op.add(Builder::termVectoryMemory, JsonpDeserializer.stringDeserializer(), "term_vectory_memory");
+        op.add(Builder::termVectorsMemoryInBytes, JsonpDeserializer.integerDeserializer(), "term_vectors_memory_in_bytes");
+        op.add(Builder::versionMapMemory, JsonpDeserializer.stringDeserializer(), "version_map_memory");
+        op.add(Builder::versionMapMemoryInBytes, JsonpDeserializer.integerDeserializer(), "version_map_memory_in_bytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ShardFailure.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ShardFailure.java
index 29a2542c68..cb3d8b9035 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ShardFailure.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ShardFailure.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,212 +44,211 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.ShardFailure
 
 @JsonpDeserializable
 public class ShardFailure implements JsonpSerializable {
-	@Nullable
-	private final String index;
-
-	@Nullable
-	private final String node;
-
-	private final ErrorCause reason;
-
-	private final int shard;
-
-	@Nullable
-	private final String status;
-
-	// ---------------------------------------------------------------------------------------------
+    @Nullable
+    private final String index;
+
+    @Nullable
+    private final String node;
+
+    private final ErrorCause reason;
+
+    private final int shard;
+
+    @Nullable
+    private final String status;
+
+    // ---------------------------------------------------------------------------------------------
 
-	private ShardFailure(Builder builder) {
+    private ShardFailure(Builder builder) {
 
-		this.index = builder.index;
-		this.node = builder.node;
-		this.reason = ApiTypeHelper.requireNonNull(builder.reason, this, "reason");
-		this.shard = ApiTypeHelper.requireNonNull(builder.shard, this, "shard");
-		this.status = builder.status;
+        this.index = builder.index;
+        this.node = builder.node;
+        this.reason = ApiTypeHelper.requireNonNull(builder.reason, this, "reason");
+        this.shard = ApiTypeHelper.requireNonNull(builder.shard, this, "shard");
+        this.status = builder.status;
 
-	}
+    }
 
-	public static ShardFailure of(Function<Builder, ObjectBuilder<ShardFailure>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code node}
-	 */
-	@Nullable
-	public final String node() {
-		return this.node;
-	}
-
-	/**
-	 * Required - API name: {@code reason}
-	 */
-	public final ErrorCause reason() {
-		return this.reason;
-	}
-
-	/**
-	 * Required - API name: {@code shard}
-	 */
-	public final int shard() {
-		return this.shard;
-	}
-
-	/**
-	 * API name: {@code status}
-	 */
-	@Nullable
-	public final String status() {
-		return this.status;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.node != null) {
-			generator.writeKey("node");
-			generator.write(this.node);
-
-		}
-		generator.writeKey("reason");
-		this.reason.serialize(generator, mapper);
-
-		generator.writeKey("shard");
-		generator.write(this.shard);
-
-		if (this.status != null) {
-			generator.writeKey("status");
-			generator.write(this.status);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardFailure}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardFailure> {
-		@Nullable
-		private String index;
-
-		@Nullable
-		private String node;
-
-		private ErrorCause reason;
-
-		private Integer shard;
-
-		@Nullable
-		private String status;
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code node}
-		 */
-		public final Builder node(@Nullable String value) {
-			this.node = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code reason}
-		 */
-		public final Builder reason(ErrorCause value) {
-			this.reason = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code reason}
-		 */
-		public final Builder reason(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
-			return this.reason(fn.apply(new ErrorCause.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code shard}
-		 */
-		public final Builder shard(int value) {
-			this.shard = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code status}
-		 */
-		public final Builder status(@Nullable String value) {
-			this.status = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShardFailure}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardFailure build() {
-			_checkSingleUse();
-
-			return new ShardFailure(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardFailure}
-	 */
-	public static final JsonpDeserializer<ShardFailure> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShardFailure::setupShardFailureDeserializer);
-
-	protected static void setupShardFailureDeserializer(ObjectDeserializer<ShardFailure.Builder> op) {
-
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
-		op.add(Builder::reason, ErrorCause._DESERIALIZER, "reason");
-		op.add(Builder::shard, JsonpDeserializer.integerDeserializer(), "shard");
-		op.add(Builder::status, JsonpDeserializer.stringDeserializer(), "status");
-
-	}
+    public static ShardFailure of(Function<Builder, ObjectBuilder<ShardFailure>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code node}
+     */
+    @Nullable
+    public final String node() {
+        return this.node;
+    }
+
+    /**
+     * Required - API name: {@code reason}
+     */
+    public final ErrorCause reason() {
+        return this.reason;
+    }
+
+    /**
+     * Required - API name: {@code shard}
+     */
+    public final int shard() {
+        return this.shard;
+    }
+
+    /**
+     * API name: {@code status}
+     */
+    @Nullable
+    public final String status() {
+        return this.status;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.node != null) {
+            generator.writeKey("node");
+            generator.write(this.node);
+
+        }
+        generator.writeKey("reason");
+        this.reason.serialize(generator, mapper);
+
+        generator.writeKey("shard");
+        generator.write(this.shard);
+
+        if (this.status != null) {
+            generator.writeKey("status");
+            generator.write(this.status);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardFailure}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardFailure> {
+        @Nullable
+        private String index;
+
+        @Nullable
+        private String node;
+
+        private ErrorCause reason;
+
+        private Integer shard;
+
+        @Nullable
+        private String status;
+
+        /**
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code node}
+         */
+        public final Builder node(@Nullable String value) {
+            this.node = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code reason}
+         */
+        public final Builder reason(ErrorCause value) {
+            this.reason = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code reason}
+         */
+        public final Builder reason(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
+            return this.reason(fn.apply(new ErrorCause.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code shard}
+         */
+        public final Builder shard(int value) {
+            this.shard = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code status}
+         */
+        public final Builder status(@Nullable String value) {
+            this.status = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShardFailure}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardFailure build() {
+            _checkSingleUse();
+
+            return new ShardFailure(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardFailure}
+     */
+    public static final JsonpDeserializer<ShardFailure> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardFailure::setupShardFailureDeserializer
+    );
+
+    protected static void setupShardFailureDeserializer(ObjectDeserializer<ShardFailure.Builder> op) {
+
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
+        op.add(Builder::reason, ErrorCause._DESERIALIZER, "reason");
+        op.add(Builder::shard, JsonpDeserializer.integerDeserializer(), "shard");
+        op.add(Builder::status, JsonpDeserializer.stringDeserializer(), "status");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ShardStatistics.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ShardStatistics.java
index f0d6308cc3..af53a7c7b0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ShardStatistics.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ShardStatistics.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,225 +45,223 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.ShardStatistics
 
 @JsonpDeserializable
 public class ShardStatistics implements JsonpSerializable {
-	private final Number failed;
+    private final Number failed;
 
-	private final Number successful;
+    private final Number successful;
 
-	private final Number total;
+    private final Number total;
 
-	private final List<ShardFailure> failures;
+    private final List<ShardFailure> failures;
 
-	@Nullable
-	private final Number skipped;
+    @Nullable
+    private final Number skipped;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ShardStatistics(Builder builder) {
+    private ShardStatistics(Builder builder) {
 
-		this.failed = ApiTypeHelper.requireNonNull(builder.failed, this, "failed");
-		this.successful = ApiTypeHelper.requireNonNull(builder.successful, this, "successful");
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
-		this.failures = ApiTypeHelper.unmodifiable(builder.failures);
-		this.skipped = builder.skipped;
+        this.failed = ApiTypeHelper.requireNonNull(builder.failed, this, "failed");
+        this.successful = ApiTypeHelper.requireNonNull(builder.successful, this, "successful");
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+        this.failures = ApiTypeHelper.unmodifiable(builder.failures);
+        this.skipped = builder.skipped;
 
-	}
+    }
 
-	public static ShardStatistics of(Function<Builder, ObjectBuilder<ShardStatistics>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ShardStatistics of(Function<Builder, ObjectBuilder<ShardStatistics>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code failed}
-	 */
-	public final Number failed() {
-		return this.failed;
-	}
+    /**
+     * Required - API name: {@code failed}
+     */
+    public final Number failed() {
+        return this.failed;
+    }
 
-	/**
-	 * Required - API name: {@code successful}
-	 */
-	public final Number successful() {
-		return this.successful;
-	}
-
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final Number total() {
-		return this.total;
-	}
-
-	/**
-	 * API name: {@code failures}
-	 */
-	public final List<ShardFailure> failures() {
-		return this.failures;
-	}
-
-	/**
-	 * API name: {@code skipped}
-	 */
-	@Nullable
-	public final Number skipped() {
-		return this.skipped;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("failed");
-		generator.write(this.failed.doubleValue());
-
-		generator.writeKey("successful");
-		generator.write(this.successful.doubleValue());
-
-		generator.writeKey("total");
-		generator.write(this.total.doubleValue());
-
-		if (ApiTypeHelper.isDefined(this.failures)) {
-			generator.writeKey("failures");
-			generator.writeStartArray();
-			for (ShardFailure item0 : this.failures) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.skipped != null) {
-			generator.writeKey("skipped");
-			generator.write(this.skipped.doubleValue());
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardStatistics}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardStatistics> {
-		private Number failed;
-
-		private Number successful;
-
-		private Number total;
-
-		@Nullable
-		private List<ShardFailure> failures;
-
-		@Nullable
-		private Number skipped;
-
-		/**
-		 * Required - API name: {@code failed}
-		 */
-		public final Builder failed(Number value) {
-			this.failed = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code successful}
-		 */
-		public final Builder successful(Number value) {
-			this.successful = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(Number value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>failures</code>.
-		 */
-		public final Builder failures(List<ShardFailure> list) {
-			this.failures = _listAddAll(this.failures, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds one or more values to <code>failures</code>.
-		 */
-		public final Builder failures(ShardFailure value, ShardFailure... values) {
-			this.failures = _listAdd(this.failures, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds a value to <code>failures</code> using a builder lambda.
-		 */
-		public final Builder failures(Function<ShardFailure.Builder, ObjectBuilder<ShardFailure>> fn) {
-			return failures(fn.apply(new ShardFailure.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code skipped}
-		 */
-		public final Builder skipped(@Nullable Number value) {
-			this.skipped = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShardStatistics}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardStatistics build() {
-			_checkSingleUse();
-
-			return new ShardStatistics(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardStatistics}
-	 */
-	public static final JsonpDeserializer<ShardStatistics> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShardStatistics::setupShardStatisticsDeserializer);
-
-	protected static void setupShardStatisticsDeserializer(ObjectDeserializer<ShardStatistics.Builder> op) {
-
-		op.add(Builder::failed, JsonpDeserializer.numberDeserializer(), "failed");
-		op.add(Builder::successful, JsonpDeserializer.numberDeserializer(), "successful");
-		op.add(Builder::total, JsonpDeserializer.numberDeserializer(), "total");
-		op.add(Builder::failures, JsonpDeserializer.arrayDeserializer(ShardFailure._DESERIALIZER), "failures");
-		op.add(Builder::skipped, JsonpDeserializer.numberDeserializer(), "skipped");
-
-	}
+    /**
+     * Required - API name: {@code successful}
+     */
+    public final Number successful() {
+        return this.successful;
+    }
+
+    /**
+     * Required - API name: {@code total}
+     */
+    public final Number total() {
+        return this.total;
+    }
+
+    /**
+     * API name: {@code failures}
+     */
+    public final List<ShardFailure> failures() {
+        return this.failures;
+    }
+
+    /**
+     * API name: {@code skipped}
+     */
+    @Nullable
+    public final Number skipped() {
+        return this.skipped;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("failed");
+        generator.write(this.failed.doubleValue());
+
+        generator.writeKey("successful");
+        generator.write(this.successful.doubleValue());
+
+        generator.writeKey("total");
+        generator.write(this.total.doubleValue());
+
+        if (ApiTypeHelper.isDefined(this.failures)) {
+            generator.writeKey("failures");
+            generator.writeStartArray();
+            for (ShardFailure item0 : this.failures) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.skipped != null) {
+            generator.writeKey("skipped");
+            generator.write(this.skipped.doubleValue());
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardStatistics}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardStatistics> {
+        private Number failed;
+
+        private Number successful;
+
+        private Number total;
+
+        @Nullable
+        private List<ShardFailure> failures;
+
+        @Nullable
+        private Number skipped;
+
+        /**
+         * Required - API name: {@code failed}
+         */
+        public final Builder failed(Number value) {
+            this.failed = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code successful}
+         */
+        public final Builder successful(Number value) {
+            this.successful = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(Number value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>failures</code>.
+         */
+        public final Builder failures(List<ShardFailure> list) {
+            this.failures = _listAddAll(this.failures, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds one or more values to <code>failures</code>.
+         */
+        public final Builder failures(ShardFailure value, ShardFailure... values) {
+            this.failures = _listAdd(this.failures, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds a value to <code>failures</code> using a builder lambda.
+         */
+        public final Builder failures(Function<ShardFailure.Builder, ObjectBuilder<ShardFailure>> fn) {
+            return failures(fn.apply(new ShardFailure.Builder()).build());
+        }
+
+        /**
+         * API name: {@code skipped}
+         */
+        public final Builder skipped(@Nullable Number value) {
+            this.skipped = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShardStatistics}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardStatistics build() {
+            _checkSingleUse();
+
+            return new ShardStatistics(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardStatistics}
+     */
+    public static final JsonpDeserializer<ShardStatistics> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardStatistics::setupShardStatisticsDeserializer
+    );
+
+    protected static void setupShardStatisticsDeserializer(ObjectDeserializer<ShardStatistics.Builder> op) {
+
+        op.add(Builder::failed, JsonpDeserializer.numberDeserializer(), "failed");
+        op.add(Builder::successful, JsonpDeserializer.numberDeserializer(), "successful");
+        op.add(Builder::total, JsonpDeserializer.numberDeserializer(), "total");
+        op.add(Builder::failures, JsonpDeserializer.arrayDeserializer(ShardFailure._DESERIALIZER), "failures");
+        op.add(Builder::skipped, JsonpDeserializer.numberDeserializer(), "skipped");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ShardsOperationResponseBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ShardsOperationResponseBase.java
index 05730bce87..92d78f301b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ShardsOperationResponseBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ShardsOperationResponseBase.java
@@ -32,83 +32,80 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.ShardsOperationResponseBase
 
-
 public abstract class ShardsOperationResponseBase implements JsonpSerializable {
-	private final ShardStatistics shards;
+    private final ShardStatistics shards;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected ShardsOperationResponseBase(AbstractBuilder<?> builder) {
+    protected ShardsOperationResponseBase(AbstractBuilder<?> builder) {
 
-		this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
+        this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
 
-	}
+    }
 
-	/**
-	 * Required - API name: {@code _shards}
-	 */
-	public final ShardStatistics shards() {
-		return this.shards;
-	}
+    /**
+     * Required - API name: {@code _shards}
+     */
+    public final ShardStatistics shards() {
+        return this.shards;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("_shards");
-		this.shards.serialize(generator, mapper);
+        generator.writeKey("_shards");
+        this.shards.serialize(generator, mapper);
 
-	}
+    }
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		private ShardStatistics shards;
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        private ShardStatistics shards;
 
-		/**
-		 * Required - API name: {@code _shards}
-		 */
-		public final BuilderT shards(ShardStatistics value) {
-			this.shards = value;
-			return self();
-		}
+        /**
+         * Required - API name: {@code _shards}
+         */
+        public final BuilderT shards(ShardStatistics value) {
+            this.shards = value;
+            return self();
+        }
 
-		/**
-		 * Required - API name: {@code _shards}
-		 */
-		public final BuilderT shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
-			return this.shards(fn.apply(new ShardStatistics.Builder()).build());
-		}
+        /**
+         * Required - API name: {@code _shards}
+         */
+        public final BuilderT shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
+            return this.shards(fn.apply(new ShardStatistics.Builder()).build());
+        }
 
-		protected abstract BuilderT self();
+        protected abstract BuilderT self();
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupShardsOperationResponseBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupShardsOperationResponseBaseDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
 
-		op.add(AbstractBuilder::shards, ShardStatistics._DESERIALIZER, "_shards");
+        op.add(AbstractBuilder::shards, ShardStatistics._DESERIALIZER, "_shards");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SlicedScroll.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SlicedScroll.java
index 6cbe44655e..2a7d9ca047 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SlicedScroll.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SlicedScroll.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,146 +44,145 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.SlicedScroll
 
 @JsonpDeserializable
 public class SlicedScroll implements JsonpSerializable {
-	@Nullable
-	private final String field;
-
-	private final int id;
-
-	private final int max;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SlicedScroll(Builder builder) {
-
-		this.field = builder.field;
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
-
-	}
-
-	public static SlicedScroll of(Function<Builder, ObjectBuilder<SlicedScroll>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required - API name: {@code id}
-	 */
-	public final int id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - API name: {@code max}
-	 */
-	public final int max() {
-		return this.max;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		generator.writeKey("id");
-		generator.write(this.id);
-
-		generator.writeKey("max");
-		generator.write(this.max);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SlicedScroll}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SlicedScroll> {
-		@Nullable
-		private String field;
-
-		private Integer id;
-
-		private Integer max;
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code id}
-		 */
-		public final Builder id(int value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code max}
-		 */
-		public final Builder max(int value) {
-			this.max = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SlicedScroll}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SlicedScroll build() {
-			_checkSingleUse();
-
-			return new SlicedScroll(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SlicedScroll}
-	 */
-	public static final JsonpDeserializer<SlicedScroll> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SlicedScroll::setupSlicedScrollDeserializer);
-
-	protected static void setupSlicedScrollDeserializer(ObjectDeserializer<SlicedScroll.Builder> op) {
-
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::id, JsonpDeserializer.integerDeserializer(), "id");
-		op.add(Builder::max, JsonpDeserializer.integerDeserializer(), "max");
-
-	}
+    @Nullable
+    private final String field;
+
+    private final int id;
+
+    private final int max;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SlicedScroll(Builder builder) {
+
+        this.field = builder.field;
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
+
+    }
+
+    public static SlicedScroll of(Function<Builder, ObjectBuilder<SlicedScroll>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required - API name: {@code id}
+     */
+    public final int id() {
+        return this.id;
+    }
+
+    /**
+     * Required - API name: {@code max}
+     */
+    public final int max() {
+        return this.max;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        generator.writeKey("id");
+        generator.write(this.id);
+
+        generator.writeKey("max");
+        generator.write(this.max);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SlicedScroll}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SlicedScroll> {
+        @Nullable
+        private String field;
+
+        private Integer id;
+
+        private Integer max;
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code id}
+         */
+        public final Builder id(int value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code max}
+         */
+        public final Builder max(int value) {
+            this.max = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link SlicedScroll}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SlicedScroll build() {
+            _checkSingleUse();
+
+            return new SlicedScroll(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SlicedScroll}
+     */
+    public static final JsonpDeserializer<SlicedScroll> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SlicedScroll::setupSlicedScrollDeserializer
+    );
+
+    protected static void setupSlicedScrollDeserializer(ObjectDeserializer<SlicedScroll.Builder> op) {
+
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::id, JsonpDeserializer.integerDeserializer(), "id");
+        op.add(Builder::max, JsonpDeserializer.integerDeserializer(), "max");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortMode.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortMode.java
index 4dce64b64f..e33189ea6a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortMode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortMode.java
@@ -37,27 +37,27 @@
 
 @JsonpDeserializable
 public enum SortMode implements JsonEnum {
-	Min("min"),
+    Min("min"),
 
-	Max("max"),
+    Max("max"),
 
-	Sum("sum"),
+    Sum("sum"),
 
-	Avg("avg"),
+    Avg("avg"),
 
-	Median("median"),
+    Median("median"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	SortMode(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    SortMode(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<SortMode> _DESERIALIZER = new JsonEnum.Deserializer<>(SortMode.values());
+    public static final JsonEnum.Deserializer<SortMode> _DESERIALIZER = new JsonEnum.Deserializer<>(SortMode.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortOptions.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortOptions.java
index b29df51fde..163f320c0e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortOptions.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortOptions.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonParser;
+import java.util.EnumSet;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -43,286 +47,280 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import jakarta.json.stream.JsonParser;
-import java.util.EnumSet;
-import java.util.function.Function;
 
 // typedef: _types.SortOptions
 
 @JsonpDeserializable
 public class SortOptions implements TaggedUnion<SortOptions.Kind, Object>, JsonpSerializable {
 
-	/**
-	 * {@link SortOptions} variant kinds.
-	 */
-	/**
-	 * {@link SortOptions} variant kinds.
-	 */
+    /**
+     * {@link SortOptions} variant kinds.
+     */
+    /**
+     * {@link SortOptions} variant kinds.
+     */
 
-	public enum Kind implements JsonEnum {
-		Score("_score"),
+    public enum Kind implements JsonEnum {
+        Score("_score"),
 
-		Doc("_doc"),
-
-		GeoDistance("_geo_distance"),
+        Doc("_doc"),
+
+        GeoDistance("_geo_distance"),
 
-		Script("_script"),
-
-		Field("field"),
-
-		;
-
-		private final String jsonValue;
-
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
-
-		public String jsonValue() {
-			return this.jsonValue;
-		}
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	public SortOptions(SortOptionsVariant value) {
-
-		this._kind = ApiTypeHelper.requireNonNull(value._sortOptionsKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
-
-	}
-
-	private SortOptions(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static SortOptions of(Function<Builder, ObjectBuilder<SortOptions>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code _score}?
-	 */
-	public boolean isScore() {
-		return _kind == Kind.Score;
-	}
-
-	/**
-	 * Get the {@code _score} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code _score} kind.
-	 */
-	public ScoreSort score() {
-		return TaggedUnionUtils.get(this, Kind.Score);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code _doc}?
-	 */
-	public boolean isDoc() {
-		return _kind == Kind.Doc;
-	}
-
-	/**
-	 * Get the {@code _doc} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code _doc} kind.
-	 */
-	public ScoreSort doc() {
-		return TaggedUnionUtils.get(this, Kind.Doc);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code _geo_distance}?
-	 */
-	public boolean isGeoDistance() {
-		return _kind == Kind.GeoDistance;
-	}
-
-	/**
-	 * Get the {@code _geo_distance} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code _geo_distance} kind.
-	 */
-	public GeoDistanceSort geoDistance() {
-		return TaggedUnionUtils.get(this, Kind.GeoDistance);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code _script}?
-	 */
-	public boolean isScript() {
-		return _kind == Kind.Script;
-	}
-
-	/**
-	 * Get the {@code _script} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code _script} kind.
-	 */
-	public ScriptSort script() {
-		return TaggedUnionUtils.get(this, Kind.Script);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code field}?
-	 */
-	public boolean isField() {
-		return _kind == Kind.Field;
-	}
-
-	/**
-	 * Get the {@code field} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code field} kind.
-	 */
-	public FieldSort field() {
-		return TaggedUnionUtils.get(this, Kind.Field);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (isField()) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-
-			generator.writeStartObject();
-
-			generator.writeKey(_kind.jsonValue());
-			if (_value instanceof JsonpSerializable) {
-				((JsonpSerializable) _value).serialize(generator, mapper);
-			}
-
-			generator.writeEnd();
-		}
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SortOptions> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<SortOptions> score(ScoreSort v) {
-			this._kind = Kind.Score;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SortOptions> score(Function<ScoreSort.Builder, ObjectBuilder<ScoreSort>> fn) {
-			return this.score(fn.apply(new ScoreSort.Builder()).build());
-		}
-
-		public ObjectBuilder<SortOptions> doc(ScoreSort v) {
-			this._kind = Kind.Doc;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SortOptions> doc(Function<ScoreSort.Builder, ObjectBuilder<ScoreSort>> fn) {
-			return this.doc(fn.apply(new ScoreSort.Builder()).build());
-		}
-
-		public ObjectBuilder<SortOptions> geoDistance(GeoDistanceSort v) {
-			this._kind = Kind.GeoDistance;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SortOptions> geoDistance(
-				Function<GeoDistanceSort.Builder, ObjectBuilder<GeoDistanceSort>> fn) {
-			return this.geoDistance(fn.apply(new GeoDistanceSort.Builder()).build());
-		}
-
-		public ObjectBuilder<SortOptions> script(ScriptSort v) {
-			this._kind = Kind.Script;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SortOptions> script(Function<ScriptSort.Builder, ObjectBuilder<ScriptSort>> fn) {
-			return this.script(fn.apply(new ScriptSort.Builder()).build());
-		}
-
-		public ObjectBuilder<SortOptions> field(FieldSort v) {
-			this._kind = Kind.Field;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SortOptions> field(Function<FieldSort.Builder, ObjectBuilder<FieldSort>> fn) {
-			return this.field(fn.apply(new FieldSort.Builder()).build());
-		}
-
-		public SortOptions build() {
-			_checkSingleUse();
-			return new SortOptions(this);
-		}
-
-	}
-
-	public static final JsonpDeserializer<SortOptions> _DESERIALIZER = JsonpDeserializer.lazy(() -> JsonpDeserializer
-			.of(EnumSet.of(JsonParser.Event.START_OBJECT, JsonParser.Event.VALUE_STRING), (parser, mapper) -> {
-				SortOptions.Builder b = new SortOptions.Builder();
-
-				JsonParser.Event event = parser.next();
-				if (event == JsonParser.Event.VALUE_STRING) {
-					switch (parser.getString()) {
-						case "_score" :
-							b.score(s -> s);
-							break;
-						case "_doc" :
-							b.doc(d -> d);
-							break;
-						default :
-							b.field(f -> f.field(parser.getString()));
-					}
-					return b.build();
-				}
-
-				JsonpUtils.expectEvent(parser, JsonParser.Event.START_OBJECT, event);
-				JsonpUtils.expectNextEvent(parser, JsonParser.Event.KEY_NAME);
-				switch (parser.getString()) {
-					case "_score" :
-						b.score(ScoreSort._DESERIALIZER.deserialize(parser, mapper));
-						break;
-					case "_doc" :
-						b.doc(ScoreSort._DESERIALIZER.deserialize(parser, mapper));
-						break;
-					case "_geo_distance" :
-						b.geoDistance(GeoDistanceSort._DESERIALIZER.deserialize(parser, mapper));
-						break;
-					case "_script" :
-						b.script(ScriptSort._DESERIALIZER.deserialize(parser, mapper));
-						break;
-					default :
-						// Consumes END_OBJECT
-						return b.field(FieldSort._DESERIALIZER
-								.deserialize(parser, mapper, JsonParser.Event.KEY_NAME))
-								.build();
-				}
-
-				JsonpUtils.expectNextEvent(parser, JsonParser.Event.END_OBJECT);
-				return b.build();
-			}));
+        Script("_script"),
+
+        Field("field"),
+
+        ;
+
+        private final String jsonValue;
+
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
+
+        public String jsonValue() {
+            return this.jsonValue;
+        }
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    public SortOptions(SortOptionsVariant value) {
+
+        this._kind = ApiTypeHelper.requireNonNull(value._sortOptionsKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+
+    }
+
+    private SortOptions(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static SortOptions of(Function<Builder, ObjectBuilder<SortOptions>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code _score}?
+     */
+    public boolean isScore() {
+        return _kind == Kind.Score;
+    }
+
+    /**
+     * Get the {@code _score} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code _score} kind.
+     */
+    public ScoreSort score() {
+        return TaggedUnionUtils.get(this, Kind.Score);
+    }
+
+    /**
+     * Is this variant instance of kind {@code _doc}?
+     */
+    public boolean isDoc() {
+        return _kind == Kind.Doc;
+    }
+
+    /**
+     * Get the {@code _doc} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code _doc} kind.
+     */
+    public ScoreSort doc() {
+        return TaggedUnionUtils.get(this, Kind.Doc);
+    }
+
+    /**
+     * Is this variant instance of kind {@code _geo_distance}?
+     */
+    public boolean isGeoDistance() {
+        return _kind == Kind.GeoDistance;
+    }
+
+    /**
+     * Get the {@code _geo_distance} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code _geo_distance} kind.
+     */
+    public GeoDistanceSort geoDistance() {
+        return TaggedUnionUtils.get(this, Kind.GeoDistance);
+    }
+
+    /**
+     * Is this variant instance of kind {@code _script}?
+     */
+    public boolean isScript() {
+        return _kind == Kind.Script;
+    }
+
+    /**
+     * Get the {@code _script} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code _script} kind.
+     */
+    public ScriptSort script() {
+        return TaggedUnionUtils.get(this, Kind.Script);
+    }
+
+    /**
+     * Is this variant instance of kind {@code field}?
+     */
+    public boolean isField() {
+        return _kind == Kind.Field;
+    }
+
+    /**
+     * Get the {@code field} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code field} kind.
+     */
+    public FieldSort field() {
+        return TaggedUnionUtils.get(this, Kind.Field);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (isField()) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+
+            generator.writeStartObject();
+
+            generator.writeKey(_kind.jsonValue());
+            if (_value instanceof JsonpSerializable) {
+                ((JsonpSerializable) _value).serialize(generator, mapper);
+            }
+
+            generator.writeEnd();
+        }
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SortOptions> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<SortOptions> score(ScoreSort v) {
+            this._kind = Kind.Score;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SortOptions> score(Function<ScoreSort.Builder, ObjectBuilder<ScoreSort>> fn) {
+            return this.score(fn.apply(new ScoreSort.Builder()).build());
+        }
+
+        public ObjectBuilder<SortOptions> doc(ScoreSort v) {
+            this._kind = Kind.Doc;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SortOptions> doc(Function<ScoreSort.Builder, ObjectBuilder<ScoreSort>> fn) {
+            return this.doc(fn.apply(new ScoreSort.Builder()).build());
+        }
+
+        public ObjectBuilder<SortOptions> geoDistance(GeoDistanceSort v) {
+            this._kind = Kind.GeoDistance;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SortOptions> geoDistance(Function<GeoDistanceSort.Builder, ObjectBuilder<GeoDistanceSort>> fn) {
+            return this.geoDistance(fn.apply(new GeoDistanceSort.Builder()).build());
+        }
+
+        public ObjectBuilder<SortOptions> script(ScriptSort v) {
+            this._kind = Kind.Script;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SortOptions> script(Function<ScriptSort.Builder, ObjectBuilder<ScriptSort>> fn) {
+            return this.script(fn.apply(new ScriptSort.Builder()).build());
+        }
+
+        public ObjectBuilder<SortOptions> field(FieldSort v) {
+            this._kind = Kind.Field;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SortOptions> field(Function<FieldSort.Builder, ObjectBuilder<FieldSort>> fn) {
+            return this.field(fn.apply(new FieldSort.Builder()).build());
+        }
+
+        public SortOptions build() {
+            _checkSingleUse();
+            return new SortOptions(this);
+        }
+
+    }
+
+    public static final JsonpDeserializer<SortOptions> _DESERIALIZER = JsonpDeserializer.lazy(
+        () -> JsonpDeserializer.of(EnumSet.of(JsonParser.Event.START_OBJECT, JsonParser.Event.VALUE_STRING), (parser, mapper) -> {
+            SortOptions.Builder b = new SortOptions.Builder();
+
+            JsonParser.Event event = parser.next();
+            if (event == JsonParser.Event.VALUE_STRING) {
+                switch (parser.getString()) {
+                    case "_score":
+                        b.score(s -> s);
+                        break;
+                    case "_doc":
+                        b.doc(d -> d);
+                        break;
+                    default:
+                        b.field(f -> f.field(parser.getString()));
+                }
+                return b.build();
+            }
+
+            JsonpUtils.expectEvent(parser, JsonParser.Event.START_OBJECT, event);
+            JsonpUtils.expectNextEvent(parser, JsonParser.Event.KEY_NAME);
+            switch (parser.getString()) {
+                case "_score":
+                    b.score(ScoreSort._DESERIALIZER.deserialize(parser, mapper));
+                    break;
+                case "_doc":
+                    b.doc(ScoreSort._DESERIALIZER.deserialize(parser, mapper));
+                    break;
+                case "_geo_distance":
+                    b.geoDistance(GeoDistanceSort._DESERIALIZER.deserialize(parser, mapper));
+                    break;
+                case "_script":
+                    b.script(ScriptSort._DESERIALIZER.deserialize(parser, mapper));
+                    break;
+                default:
+                    // Consumes END_OBJECT
+                    return b.field(FieldSort._DESERIALIZER.deserialize(parser, mapper, JsonParser.Event.KEY_NAME)).build();
+            }
+
+            JsonpUtils.expectNextEvent(parser, JsonParser.Event.END_OBJECT);
+            return b.build();
+        })
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortOptionsBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortOptionsBuilders.java
index 766e1f595d..1be26976e3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortOptionsBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortOptionsBuilders.java
@@ -36,46 +36,45 @@
  * Builders for {@link SortOptions} variants.
  */
 public class SortOptionsBuilders {
-	private SortOptionsBuilders() {
-	}
+    private SortOptionsBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link ScoreSort _score} {@code SortOptions}
-	 * variant.
-	 */
-	public static ScoreSort.Builder score() {
-		return new ScoreSort.Builder();
-	}
+    /**
+     * Creates a builder for the {@link ScoreSort _score} {@code SortOptions}
+     * variant.
+     */
+    public static ScoreSort.Builder score() {
+        return new ScoreSort.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link ScoreSort _doc} {@code SortOptions} variant.
-	 */
-	public static ScoreSort.Builder doc() {
-		return new ScoreSort.Builder();
-	}
+    /**
+     * Creates a builder for the {@link ScoreSort _doc} {@code SortOptions} variant.
+     */
+    public static ScoreSort.Builder doc() {
+        return new ScoreSort.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link GeoDistanceSort _geo_distance}
-	 * {@code SortOptions} variant.
-	 */
-	public static GeoDistanceSort.Builder geoDistance() {
-		return new GeoDistanceSort.Builder();
-	}
+    /**
+     * Creates a builder for the {@link GeoDistanceSort _geo_distance}
+     * {@code SortOptions} variant.
+     */
+    public static GeoDistanceSort.Builder geoDistance() {
+        return new GeoDistanceSort.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link ScriptSort _script} {@code SortOptions}
-	 * variant.
-	 */
-	public static ScriptSort.Builder script() {
-		return new ScriptSort.Builder();
-	}
+    /**
+     * Creates a builder for the {@link ScriptSort _script} {@code SortOptions}
+     * variant.
+     */
+    public static ScriptSort.Builder script() {
+        return new ScriptSort.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link FieldSort field} {@code SortOptions}
-	 * variant.
-	 */
-	public static FieldSort.Builder field() {
-		return new FieldSort.Builder();
-	}
+    /**
+     * Creates a builder for the {@link FieldSort field} {@code SortOptions}
+     * variant.
+     */
+    public static FieldSort.Builder field() {
+        return new FieldSort.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortOptionsVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortOptionsVariant.java
index 5d7b6ed4a8..42c97b8ee7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortOptionsVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortOptionsVariant.java
@@ -37,10 +37,10 @@
  */
 public interface SortOptionsVariant {
 
-	SortOptions.Kind _sortOptionsKind();
+    SortOptions.Kind _sortOptionsKind();
 
-	default SortOptions _toSortOptions() {
-		return new SortOptions(this);
-	}
+    default SortOptions _toSortOptions() {
+        return new SortOptions(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortOrder.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortOrder.java
index 2f894cbbbe..641eff2e33 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortOrder.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SortOrder.java
@@ -37,22 +37,21 @@
 
 @JsonpDeserializable
 public enum SortOrder implements JsonEnum {
-	Asc("asc"),
+    Asc("asc"),
 
-	Desc("desc"),
+    Desc("desc"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	SortOrder(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    SortOrder(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<SortOrder> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			SortOrder.values());
+    public static final JsonEnum.Deserializer<SortOrder> _DESERIALIZER = new JsonEnum.Deserializer<>(SortOrder.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/StoreStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/StoreStats.java
index 8c1c76379f..829ede92c6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/StoreStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/StoreStats.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,252 +44,249 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.StoreStats
 
 @JsonpDeserializable
 public class StoreStats implements JsonpSerializable {
-	@Nullable
-	private final String size;
-
-	private final long sizeInBytes;
-
-	@Nullable
-	private final String reserved;
-
-	private final long reservedInBytes;
-
-	@Deprecated
-	@Nullable
-	private final String totalDataSetSize;
-
-	@Deprecated
-	@Nullable
-	private final Long totalDataSetSizeInBytes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private StoreStats(Builder builder) {
-
-		this.size = builder.size;
-		this.sizeInBytes = ApiTypeHelper.requireNonNull(builder.sizeInBytes, this, "sizeInBytes");
-		this.reserved = builder.reserved;
-		this.reservedInBytes = ApiTypeHelper.requireNonNull(builder.reservedInBytes, this, "reservedInBytes");
-		this.totalDataSetSize = builder.totalDataSetSize;
-		this.totalDataSetSizeInBytes = builder.totalDataSetSizeInBytes;
-
-	}
-
-	public static StoreStats of(Function<Builder, ObjectBuilder<StoreStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final String size() {
-		return this.size;
-	}
-
-	/**
-	 * Required - API name: {@code size_in_bytes}
-	 */
-	public final long sizeInBytes() {
-		return this.sizeInBytes;
-	}
-
-	/**
-	 * API name: {@code reserved}
-	 */
-	@Nullable
-	public final String reserved() {
-		return this.reserved;
-	}
-
-	/**
-	 * Required - API name: {@code reserved_in_bytes}
-	 */
-	public final long reservedInBytes() {
-		return this.reservedInBytes;
-	}
-
-	/**
-	 * @deprecated
-	 * Not returned by server
-	 * API name: {@code total_data_set_size}
-	 */
-	@Deprecated
-	@Nullable
-	public final String totalDataSetSize() {
-		return this.totalDataSetSize;
-	}
-
-	/**
-	 * @deprecated
-	 * Not returned by server
-	 * API name: {@code total_data_set_size_in_bytes}
-	 */
-	@Deprecated
-	@Nullable
-	public final Long totalDataSetSizeInBytes() {
-		return this.totalDataSetSizeInBytes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		generator.writeKey("size_in_bytes");
-		generator.write(this.sizeInBytes);
-
-		if (this.reserved != null) {
-			generator.writeKey("reserved");
-			generator.write(this.reserved);
-
-		}
-		generator.writeKey("reserved_in_bytes");
-		generator.write(this.reservedInBytes);
-
-		if (this.totalDataSetSize != null) {
-			generator.writeKey("total_data_set_size");
-			generator.write(this.totalDataSetSize);
-
-		}
-		if (this.totalDataSetSizeInBytes != null) {
-			generator.writeKey("total_data_set_size_in_bytes");
-			generator.write(this.totalDataSetSizeInBytes);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link StoreStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<StoreStats> {
-		@Nullable
-		private String size;
-
-		private Long sizeInBytes;
-
-		@Nullable
-		private String reserved;
-
-		private Long reservedInBytes;
-
-		@Deprecated
-		@Nullable
-		private String totalDataSetSize;
-
-		@Deprecated
-		@Nullable
-		private Long totalDataSetSizeInBytes;
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable String value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code size_in_bytes}
-		 */
-		public final Builder sizeInBytes(long value) {
-			this.sizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code reserved}
-		 */
-		public final Builder reserved(@Nullable String value) {
-			this.reserved = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code reserved_in_bytes}
-		 */
-		public final Builder reservedInBytes(long value) {
-			this.reservedInBytes = value;
-			return this;
-		}
-
-		/**
-		 * @deprecated
-		 * Not returned by server
-		 * API name: {@code total_data_set_size}
-		 */
-		@Deprecated
-		public final Builder totalDataSetSize(@Nullable String value) {
-			this.totalDataSetSize = value;
-			return this;
-		}
-
-		/**
-		 * @deprecated
-		 * Not returned by server
-		 * API name: {@code total_data_set_size_in_bytes}
-		 */
-		@Deprecated
-		public final Builder totalDataSetSizeInBytes(@Nullable Long value) {
-			this.totalDataSetSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link StoreStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StoreStats build() {
-			_checkSingleUse();
-
-			return new StoreStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link StoreStats}
-	 */
-	public static final JsonpDeserializer<StoreStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			StoreStats::setupStoreStatsDeserializer);
-
-	protected static void setupStoreStatsDeserializer(ObjectDeserializer<StoreStats.Builder> op) {
-
-		op.add(Builder::size, JsonpDeserializer.stringDeserializer(), "size");
-		op.add(Builder::sizeInBytes, JsonpDeserializer.longDeserializer(), "size_in_bytes");
-		op.add(Builder::reserved, JsonpDeserializer.stringDeserializer(), "reserved");
-		op.add(Builder::reservedInBytes, JsonpDeserializer.longDeserializer(), "reserved_in_bytes");
-		op.add(Builder::totalDataSetSize, JsonpDeserializer.stringDeserializer(), "total_data_set_size");
-		op.add(Builder::totalDataSetSizeInBytes, JsonpDeserializer.longDeserializer(),
-				"total_data_set_size_in_bytes");
-
-	}
+    @Nullable
+    private final String size;
+
+    private final long sizeInBytes;
+
+    @Nullable
+    private final String reserved;
+
+    private final long reservedInBytes;
+
+    @Deprecated
+    @Nullable
+    private final String totalDataSetSize;
+
+    @Deprecated
+    @Nullable
+    private final Long totalDataSetSizeInBytes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private StoreStats(Builder builder) {
+
+        this.size = builder.size;
+        this.sizeInBytes = ApiTypeHelper.requireNonNull(builder.sizeInBytes, this, "sizeInBytes");
+        this.reserved = builder.reserved;
+        this.reservedInBytes = ApiTypeHelper.requireNonNull(builder.reservedInBytes, this, "reservedInBytes");
+        this.totalDataSetSize = builder.totalDataSetSize;
+        this.totalDataSetSizeInBytes = builder.totalDataSetSizeInBytes;
+
+    }
+
+    public static StoreStats of(Function<Builder, ObjectBuilder<StoreStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final String size() {
+        return this.size;
+    }
+
+    /**
+     * Required - API name: {@code size_in_bytes}
+     */
+    public final long sizeInBytes() {
+        return this.sizeInBytes;
+    }
+
+    /**
+     * API name: {@code reserved}
+     */
+    @Nullable
+    public final String reserved() {
+        return this.reserved;
+    }
+
+    /**
+     * Required - API name: {@code reserved_in_bytes}
+     */
+    public final long reservedInBytes() {
+        return this.reservedInBytes;
+    }
+
+    /**
+     * @deprecated
+     * Not returned by server
+     * API name: {@code total_data_set_size}
+     */
+    @Deprecated
+    @Nullable
+    public final String totalDataSetSize() {
+        return this.totalDataSetSize;
+    }
+
+    /**
+     * @deprecated
+     * Not returned by server
+     * API name: {@code total_data_set_size_in_bytes}
+     */
+    @Deprecated
+    @Nullable
+    public final Long totalDataSetSizeInBytes() {
+        return this.totalDataSetSizeInBytes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        generator.writeKey("size_in_bytes");
+        generator.write(this.sizeInBytes);
+
+        if (this.reserved != null) {
+            generator.writeKey("reserved");
+            generator.write(this.reserved);
+
+        }
+        generator.writeKey("reserved_in_bytes");
+        generator.write(this.reservedInBytes);
+
+        if (this.totalDataSetSize != null) {
+            generator.writeKey("total_data_set_size");
+            generator.write(this.totalDataSetSize);
+
+        }
+        if (this.totalDataSetSizeInBytes != null) {
+            generator.writeKey("total_data_set_size_in_bytes");
+            generator.write(this.totalDataSetSizeInBytes);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link StoreStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<StoreStats> {
+        @Nullable
+        private String size;
+
+        private Long sizeInBytes;
+
+        @Nullable
+        private String reserved;
+
+        private Long reservedInBytes;
+
+        @Deprecated
+        @Nullable
+        private String totalDataSetSize;
+
+        @Deprecated
+        @Nullable
+        private Long totalDataSetSizeInBytes;
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable String value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code size_in_bytes}
+         */
+        public final Builder sizeInBytes(long value) {
+            this.sizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code reserved}
+         */
+        public final Builder reserved(@Nullable String value) {
+            this.reserved = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code reserved_in_bytes}
+         */
+        public final Builder reservedInBytes(long value) {
+            this.reservedInBytes = value;
+            return this;
+        }
+
+        /**
+         * @deprecated
+         * Not returned by server
+         * API name: {@code total_data_set_size}
+         */
+        @Deprecated
+        public final Builder totalDataSetSize(@Nullable String value) {
+            this.totalDataSetSize = value;
+            return this;
+        }
+
+        /**
+         * @deprecated
+         * Not returned by server
+         * API name: {@code total_data_set_size_in_bytes}
+         */
+        @Deprecated
+        public final Builder totalDataSetSizeInBytes(@Nullable Long value) {
+            this.totalDataSetSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link StoreStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StoreStats build() {
+            _checkSingleUse();
+
+            return new StoreStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link StoreStats}
+     */
+    public static final JsonpDeserializer<StoreStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StoreStats::setupStoreStatsDeserializer
+    );
+
+    protected static void setupStoreStatsDeserializer(ObjectDeserializer<StoreStats.Builder> op) {
+
+        op.add(Builder::size, JsonpDeserializer.stringDeserializer(), "size");
+        op.add(Builder::sizeInBytes, JsonpDeserializer.longDeserializer(), "size_in_bytes");
+        op.add(Builder::reserved, JsonpDeserializer.stringDeserializer(), "reserved");
+        op.add(Builder::reservedInBytes, JsonpDeserializer.longDeserializer(), "reserved_in_bytes");
+        op.add(Builder::totalDataSetSize, JsonpDeserializer.stringDeserializer(), "total_data_set_size");
+        op.add(Builder::totalDataSetSizeInBytes, JsonpDeserializer.longDeserializer(), "total_data_set_size_in_bytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/StoredScript.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/StoredScript.java
index 12ef3610e2..81bfc637b1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/StoredScript.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/StoredScript.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,165 +45,161 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.StoredScript
 
 @JsonpDeserializable
 public class StoredScript implements JsonpSerializable {
-	private final String lang;
-
-	private final Map<String, String> options;
-
-	private final String source;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private StoredScript(Builder builder) {
-
-		this.lang = ApiTypeHelper.requireNonNull(builder.lang, this, "lang");
-		this.options = ApiTypeHelper.unmodifiable(builder.options);
-		this.source = ApiTypeHelper.requireNonNull(builder.source, this, "source");
-
-	}
-
-	public static StoredScript of(Function<Builder, ObjectBuilder<StoredScript>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code lang}
-	 */
-	public final String lang() {
-		return this.lang;
-	}
-
-	/**
-	 * API name: {@code options}
-	 */
-	public final Map<String, String> options() {
-		return this.options;
-	}
-
-	/**
-	 * Required - API name: {@code source}
-	 */
-	public final String source() {
-		return this.source;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("lang");
-		generator.write(this.lang);
-
-		if (ApiTypeHelper.isDefined(this.options)) {
-			generator.writeKey("options");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.options.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("source");
-		generator.write(this.source);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link StoredScript}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<StoredScript> {
-		private String lang;
-
-		@Nullable
-		private Map<String, String> options;
-
-		private String source;
-
-		/**
-		 * Required - API name: {@code lang}
-		 */
-		public final Builder lang(String value) {
-			this.lang = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code options}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>options</code>.
-		 */
-		public final Builder options(Map<String, String> map) {
-			this.options = _mapPutAll(this.options, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code options}
-		 * <p>
-		 * Adds an entry to <code>options</code>.
-		 */
-		public final Builder options(String key, String value) {
-			this.options = _mapPut(this.options, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code source}
-		 */
-		public final Builder source(String value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link StoredScript}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StoredScript build() {
-			_checkSingleUse();
-
-			return new StoredScript(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link StoredScript}
-	 */
-	public static final JsonpDeserializer<StoredScript> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			StoredScript::setupStoredScriptDeserializer);
-
-	protected static void setupStoredScriptDeserializer(ObjectDeserializer<StoredScript.Builder> op) {
-
-		op.add(Builder::lang, JsonpDeserializer.stringDeserializer(), "lang");
-		op.add(Builder::options, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
-				"options");
-		op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source");
-
-	}
+    private final String lang;
+
+    private final Map<String, String> options;
+
+    private final String source;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private StoredScript(Builder builder) {
+
+        this.lang = ApiTypeHelper.requireNonNull(builder.lang, this, "lang");
+        this.options = ApiTypeHelper.unmodifiable(builder.options);
+        this.source = ApiTypeHelper.requireNonNull(builder.source, this, "source");
+
+    }
+
+    public static StoredScript of(Function<Builder, ObjectBuilder<StoredScript>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code lang}
+     */
+    public final String lang() {
+        return this.lang;
+    }
+
+    /**
+     * API name: {@code options}
+     */
+    public final Map<String, String> options() {
+        return this.options;
+    }
+
+    /**
+     * Required - API name: {@code source}
+     */
+    public final String source() {
+        return this.source;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("lang");
+        generator.write(this.lang);
+
+        if (ApiTypeHelper.isDefined(this.options)) {
+            generator.writeKey("options");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.options.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("source");
+        generator.write(this.source);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link StoredScript}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<StoredScript> {
+        private String lang;
+
+        @Nullable
+        private Map<String, String> options;
+
+        private String source;
+
+        /**
+         * Required - API name: {@code lang}
+         */
+        public final Builder lang(String value) {
+            this.lang = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code options}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>options</code>.
+         */
+        public final Builder options(Map<String, String> map) {
+            this.options = _mapPutAll(this.options, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code options}
+         * <p>
+         * Adds an entry to <code>options</code>.
+         */
+        public final Builder options(String key, String value) {
+            this.options = _mapPut(this.options, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code source}
+         */
+        public final Builder source(String value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link StoredScript}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StoredScript build() {
+            _checkSingleUse();
+
+            return new StoredScript(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link StoredScript}
+     */
+    public static final JsonpDeserializer<StoredScript> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StoredScript::setupStoredScriptDeserializer
+    );
+
+    protected static void setupStoredScriptDeserializer(ObjectDeserializer<StoredScript.Builder> op) {
+
+        op.add(Builder::lang, JsonpDeserializer.stringDeserializer(), "lang");
+        op.add(Builder::options, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "options");
+        op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/StoredScriptId.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/StoredScriptId.java
index 1e4af7c740..f61b3a6016 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/StoredScriptId.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/StoredScriptId.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,90 +41,90 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.StoredScriptId
 
 @JsonpDeserializable
 public class StoredScriptId extends ScriptBase {
-	private final String id;
+    private final String id;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private StoredScriptId(Builder builder) {
-		super(builder);
+    private StoredScriptId(Builder builder) {
+        super(builder);
 
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
 
-	}
+    }
 
-	public static StoredScriptId of(Function<Builder, ObjectBuilder<StoredScriptId>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static StoredScriptId of(Function<Builder, ObjectBuilder<StoredScriptId>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
+    /**
+     * Required - API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("id");
-		generator.write(this.id);
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("id");
+        generator.write(this.id);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link StoredScriptId}.
-	 */
+    /**
+     * Builder for {@link StoredScriptId}.
+     */
 
-	public static class Builder extends ScriptBase.AbstractBuilder<Builder> implements ObjectBuilder<StoredScriptId> {
-		private String id;
+    public static class Builder extends ScriptBase.AbstractBuilder<Builder> implements ObjectBuilder<StoredScriptId> {
+        private String id;
 
-		/**
-		 * Required - API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
 
-		@Override
-		protected Builder self() {
-			return this;
-		}
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link StoredScriptId}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StoredScriptId build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link StoredScriptId}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StoredScriptId build() {
+            _checkSingleUse();
 
-			return new StoredScriptId(this);
-		}
-	}
+            return new StoredScriptId(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link StoredScriptId}
-	 */
-	public static final JsonpDeserializer<StoredScriptId> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			StoredScriptId::setupStoredScriptIdDeserializer);
+    /**
+     * Json deserializer for {@link StoredScriptId}
+     */
+    public static final JsonpDeserializer<StoredScriptId> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StoredScriptId::setupStoredScriptIdDeserializer
+    );
 
-	protected static void setupStoredScriptIdDeserializer(ObjectDeserializer<StoredScriptId.Builder> op) {
-		ScriptBase.setupScriptBaseDeserializer(op);
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+    protected static void setupStoredScriptIdDeserializer(ObjectDeserializer<StoredScriptId.Builder> op) {
+        ScriptBase.setupScriptBaseDeserializer(op);
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SuggestMode.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SuggestMode.java
index 33800b640a..d68f484e01 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/SuggestMode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/SuggestMode.java
@@ -37,24 +37,23 @@
 
 @JsonpDeserializable
 public enum SuggestMode implements JsonEnum {
-	Missing("missing"),
+    Missing("missing"),
 
-	Popular("popular"),
+    Popular("popular"),
 
-	Always("always"),
+    Always("always"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	SuggestMode(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    SuggestMode(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<SuggestMode> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			SuggestMode.values());
+    public static final JsonEnum.Deserializer<SuggestMode> _DESERIALIZER = new JsonEnum.Deserializer<>(SuggestMode.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ThreadType.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ThreadType.java
index dab1c9ba27..ab2fa6ee39 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ThreadType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ThreadType.java
@@ -37,24 +37,23 @@
 
 @JsonpDeserializable
 public enum ThreadType implements JsonEnum {
-	Cpu("cpu"),
+    Cpu("cpu"),
 
-	Wait("wait"),
+    Wait("wait"),
 
-	Block("block"),
+    Block("block"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	ThreadType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    ThreadType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<ThreadType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			ThreadType.values());
+    public static final JsonEnum.Deserializer<ThreadType> _DESERIALIZER = new JsonEnum.Deserializer<>(ThreadType.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Time.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/Time.java
index d03ec3aab6..a7b640c26a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/Time.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/Time.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,146 +44,146 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.Time
 
 /**
  * Whenever durations need to be specified, e.g. for a timeout parameter, the
  * duration must specify the unit, like 2d for 2 days.
- * 
+ *
  */
 @JsonpDeserializable
 public class Time implements TaggedUnion<Time.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Offset, Time
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private Time(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	public String _toJsonString() {
-		switch (_kind) {
-			case Offset :
-				return String.valueOf(this.offset());
-			case Time :
-				return this.time();
-
-			default :
-				throw new IllegalStateException("Unknown kind " + _kind);
-		}
-	}
-
-	private Time(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static Time of(Function<Builder, ObjectBuilder<Time>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code offset}?
-	 */
-	public boolean isOffset() {
-		return _kind == Kind.Offset;
-	}
-
-	/**
-	 * Get the {@code offset} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code offset} kind.
-	 */
-	public Integer offset() {
-		return TaggedUnionUtils.get(this, Kind.Offset);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code time}?
-	 */
-	public boolean isTime() {
-		return _kind == Kind.Time;
-	}
-
-	/**
-	 * Get the {@code time} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code time} kind.
-	 */
-	public String time() {
-		return TaggedUnionUtils.get(this, Kind.Time);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Offset :
-					generator.write(((Integer) this._value));
-
-					break;
-				case Time :
-					generator.write(((String) this._value));
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Time> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<Time> offset(Integer v) {
-			this._kind = Kind.Offset;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Time> time(String v) {
-			this._kind = Kind.Time;
-			this._value = v;
-			return this;
-		}
-
-		public Time build() {
-			_checkSingleUse();
-			return new Time(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<Time> buildTimeDeserializer() {
-		return new UnionDeserializer.Builder<Time, Kind, Object>(Time::new, false)
-				.addMember(Kind.Offset, JsonpDeserializer.integerDeserializer())
-				.addMember(Kind.Time, JsonpDeserializer.stringDeserializer()).build();
-	}
-
-	public static final JsonpDeserializer<Time> _DESERIALIZER = JsonpDeserializer.lazy(Time::buildTimeDeserializer);
+    public enum Kind {
+        Offset,
+        Time
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private Time(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    public String _toJsonString() {
+        switch (_kind) {
+            case Offset:
+                return String.valueOf(this.offset());
+            case Time:
+                return this.time();
+
+            default:
+                throw new IllegalStateException("Unknown kind " + _kind);
+        }
+    }
+
+    private Time(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static Time of(Function<Builder, ObjectBuilder<Time>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code offset}?
+     */
+    public boolean isOffset() {
+        return _kind == Kind.Offset;
+    }
+
+    /**
+     * Get the {@code offset} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code offset} kind.
+     */
+    public Integer offset() {
+        return TaggedUnionUtils.get(this, Kind.Offset);
+    }
+
+    /**
+     * Is this variant instance of kind {@code time}?
+     */
+    public boolean isTime() {
+        return _kind == Kind.Time;
+    }
+
+    /**
+     * Get the {@code time} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code time} kind.
+     */
+    public String time() {
+        return TaggedUnionUtils.get(this, Kind.Time);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Offset:
+                    generator.write(((Integer) this._value));
+
+                    break;
+                case Time:
+                    generator.write(((String) this._value));
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Time> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<Time> offset(Integer v) {
+            this._kind = Kind.Offset;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Time> time(String v) {
+            this._kind = Kind.Time;
+            this._value = v;
+            return this;
+        }
+
+        public Time build() {
+            _checkSingleUse();
+            return new Time(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<Time> buildTimeDeserializer() {
+        return new UnionDeserializer.Builder<Time, Kind, Object>(Time::new, false).addMember(
+            Kind.Offset,
+            JsonpDeserializer.integerDeserializer()
+        ).addMember(Kind.Time, JsonpDeserializer.stringDeserializer()).build();
+    }
+
+    public static final JsonpDeserializer<Time> _DESERIALIZER = JsonpDeserializer.lazy(Time::buildTimeDeserializer);
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/TimeBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/TimeBuilders.java
index 8ed743de95..4bf03715f4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/TimeBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/TimeBuilders.java
@@ -37,10 +37,9 @@
  * <p>
  * Variants <code>offset</code>, <code>time</code> are not available here as
  * they don't have a dedicated class. Use {@link Time}'s builder for these.
- * 
+ *
  */
 public class TimeBuilders {
-	private TimeBuilders() {
-	}
+    private TimeBuilders() {}
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/TimeUnit.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/TimeUnit.java
index 34eba452cb..a525661224 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/TimeUnit.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/TimeUnit.java
@@ -37,31 +37,31 @@
 
 @JsonpDeserializable
 public enum TimeUnit implements JsonEnum {
-	Nanoseconds("nanos"),
+    Nanoseconds("nanos"),
 
-	Microseconds("micros"),
+    Microseconds("micros"),
 
-	Milliseconds("ms"),
+    Milliseconds("ms"),
 
-	Seconds("s"),
+    Seconds("s"),
 
-	Minutes("m"),
+    Minutes("m"),
 
-	Hours("h"),
+    Hours("h"),
 
-	Days("d"),
+    Days("d"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	TimeUnit(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    TimeUnit(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<TimeUnit> _DESERIALIZER = new JsonEnum.Deserializer<>(TimeUnit.values());
+    public static final JsonEnum.Deserializer<TimeUnit> _DESERIALIZER = new JsonEnum.Deserializer<>(TimeUnit.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/TopLeftBottomRightGeoBounds.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/TopLeftBottomRightGeoBounds.java
index b753e70f13..26b386d58c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/TopLeftBottomRightGeoBounds.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/TopLeftBottomRightGeoBounds.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,132 +43,130 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.TopLeftBottomRightGeoBounds
 
 @JsonpDeserializable
 public class TopLeftBottomRightGeoBounds implements JsonpSerializable {
-	private final GeoLocation topLeft;
-
-	private final GeoLocation bottomRight;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TopLeftBottomRightGeoBounds(Builder builder) {
-
-		this.topLeft = ApiTypeHelper.requireNonNull(builder.topLeft, this, "topLeft");
-		this.bottomRight = ApiTypeHelper.requireNonNull(builder.bottomRight, this, "bottomRight");
-
-	}
-
-	public static TopLeftBottomRightGeoBounds of(Function<Builder, ObjectBuilder<TopLeftBottomRightGeoBounds>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code top_left}
-	 */
-	public final GeoLocation topLeft() {
-		return this.topLeft;
-	}
-
-	/**
-	 * Required - API name: {@code bottom_right}
-	 */
-	public final GeoLocation bottomRight() {
-		return this.bottomRight;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("top_left");
-		this.topLeft.serialize(generator, mapper);
-
-		generator.writeKey("bottom_right");
-		this.bottomRight.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TopLeftBottomRightGeoBounds}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TopLeftBottomRightGeoBounds> {
-		private GeoLocation topLeft;
-
-		private GeoLocation bottomRight;
-
-		/**
-		 * Required - API name: {@code top_left}
-		 */
-		public final Builder topLeft(GeoLocation value) {
-			this.topLeft = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code top_left}
-		 */
-		public final Builder topLeft(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
-			return this.topLeft(fn.apply(new GeoLocation.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code bottom_right}
-		 */
-		public final Builder bottomRight(GeoLocation value) {
-			this.bottomRight = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code bottom_right}
-		 */
-		public final Builder bottomRight(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
-			return this.bottomRight(fn.apply(new GeoLocation.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link TopLeftBottomRightGeoBounds}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TopLeftBottomRightGeoBounds build() {
-			_checkSingleUse();
-
-			return new TopLeftBottomRightGeoBounds(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TopLeftBottomRightGeoBounds}
-	 */
-	public static final JsonpDeserializer<TopLeftBottomRightGeoBounds> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, TopLeftBottomRightGeoBounds::setupTopLeftBottomRightGeoBoundsDeserializer);
-
-	protected static void setupTopLeftBottomRightGeoBoundsDeserializer(
-			ObjectDeserializer<TopLeftBottomRightGeoBounds.Builder> op) {
-
-		op.add(Builder::topLeft, GeoLocation._DESERIALIZER, "top_left");
-		op.add(Builder::bottomRight, GeoLocation._DESERIALIZER, "bottom_right");
-
-	}
+    private final GeoLocation topLeft;
+
+    private final GeoLocation bottomRight;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TopLeftBottomRightGeoBounds(Builder builder) {
+
+        this.topLeft = ApiTypeHelper.requireNonNull(builder.topLeft, this, "topLeft");
+        this.bottomRight = ApiTypeHelper.requireNonNull(builder.bottomRight, this, "bottomRight");
+
+    }
+
+    public static TopLeftBottomRightGeoBounds of(Function<Builder, ObjectBuilder<TopLeftBottomRightGeoBounds>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code top_left}
+     */
+    public final GeoLocation topLeft() {
+        return this.topLeft;
+    }
+
+    /**
+     * Required - API name: {@code bottom_right}
+     */
+    public final GeoLocation bottomRight() {
+        return this.bottomRight;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("top_left");
+        this.topLeft.serialize(generator, mapper);
+
+        generator.writeKey("bottom_right");
+        this.bottomRight.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TopLeftBottomRightGeoBounds}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TopLeftBottomRightGeoBounds> {
+        private GeoLocation topLeft;
+
+        private GeoLocation bottomRight;
+
+        /**
+         * Required - API name: {@code top_left}
+         */
+        public final Builder topLeft(GeoLocation value) {
+            this.topLeft = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code top_left}
+         */
+        public final Builder topLeft(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
+            return this.topLeft(fn.apply(new GeoLocation.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code bottom_right}
+         */
+        public final Builder bottomRight(GeoLocation value) {
+            this.bottomRight = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code bottom_right}
+         */
+        public final Builder bottomRight(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
+            return this.bottomRight(fn.apply(new GeoLocation.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link TopLeftBottomRightGeoBounds}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TopLeftBottomRightGeoBounds build() {
+            _checkSingleUse();
+
+            return new TopLeftBottomRightGeoBounds(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TopLeftBottomRightGeoBounds}
+     */
+    public static final JsonpDeserializer<TopLeftBottomRightGeoBounds> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TopLeftBottomRightGeoBounds::setupTopLeftBottomRightGeoBoundsDeserializer
+    );
+
+    protected static void setupTopLeftBottomRightGeoBoundsDeserializer(ObjectDeserializer<TopLeftBottomRightGeoBounds.Builder> op) {
+
+        op.add(Builder::topLeft, GeoLocation._DESERIALIZER, "top_left");
+        op.add(Builder::bottomRight, GeoLocation._DESERIALIZER, "bottom_right");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/TopRightBottomLeftGeoBounds.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/TopRightBottomLeftGeoBounds.java
index 7e0fd8773c..8dbcd66489 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/TopRightBottomLeftGeoBounds.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/TopRightBottomLeftGeoBounds.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,132 +43,130 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.TopRightBottomLeftGeoBounds
 
 @JsonpDeserializable
 public class TopRightBottomLeftGeoBounds implements JsonpSerializable {
-	private final GeoLocation topRight;
-
-	private final GeoLocation bottomLeft;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TopRightBottomLeftGeoBounds(Builder builder) {
-
-		this.topRight = ApiTypeHelper.requireNonNull(builder.topRight, this, "topRight");
-		this.bottomLeft = ApiTypeHelper.requireNonNull(builder.bottomLeft, this, "bottomLeft");
-
-	}
-
-	public static TopRightBottomLeftGeoBounds of(Function<Builder, ObjectBuilder<TopRightBottomLeftGeoBounds>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code top_right}
-	 */
-	public final GeoLocation topRight() {
-		return this.topRight;
-	}
-
-	/**
-	 * Required - API name: {@code bottom_left}
-	 */
-	public final GeoLocation bottomLeft() {
-		return this.bottomLeft;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("top_right");
-		this.topRight.serialize(generator, mapper);
-
-		generator.writeKey("bottom_left");
-		this.bottomLeft.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TopRightBottomLeftGeoBounds}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TopRightBottomLeftGeoBounds> {
-		private GeoLocation topRight;
-
-		private GeoLocation bottomLeft;
-
-		/**
-		 * Required - API name: {@code top_right}
-		 */
-		public final Builder topRight(GeoLocation value) {
-			this.topRight = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code top_right}
-		 */
-		public final Builder topRight(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
-			return this.topRight(fn.apply(new GeoLocation.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code bottom_left}
-		 */
-		public final Builder bottomLeft(GeoLocation value) {
-			this.bottomLeft = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code bottom_left}
-		 */
-		public final Builder bottomLeft(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
-			return this.bottomLeft(fn.apply(new GeoLocation.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link TopRightBottomLeftGeoBounds}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TopRightBottomLeftGeoBounds build() {
-			_checkSingleUse();
-
-			return new TopRightBottomLeftGeoBounds(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TopRightBottomLeftGeoBounds}
-	 */
-	public static final JsonpDeserializer<TopRightBottomLeftGeoBounds> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, TopRightBottomLeftGeoBounds::setupTopRightBottomLeftGeoBoundsDeserializer);
-
-	protected static void setupTopRightBottomLeftGeoBoundsDeserializer(
-			ObjectDeserializer<TopRightBottomLeftGeoBounds.Builder> op) {
-
-		op.add(Builder::topRight, GeoLocation._DESERIALIZER, "top_right");
-		op.add(Builder::bottomLeft, GeoLocation._DESERIALIZER, "bottom_left");
-
-	}
+    private final GeoLocation topRight;
+
+    private final GeoLocation bottomLeft;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TopRightBottomLeftGeoBounds(Builder builder) {
+
+        this.topRight = ApiTypeHelper.requireNonNull(builder.topRight, this, "topRight");
+        this.bottomLeft = ApiTypeHelper.requireNonNull(builder.bottomLeft, this, "bottomLeft");
+
+    }
+
+    public static TopRightBottomLeftGeoBounds of(Function<Builder, ObjectBuilder<TopRightBottomLeftGeoBounds>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code top_right}
+     */
+    public final GeoLocation topRight() {
+        return this.topRight;
+    }
+
+    /**
+     * Required - API name: {@code bottom_left}
+     */
+    public final GeoLocation bottomLeft() {
+        return this.bottomLeft;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("top_right");
+        this.topRight.serialize(generator, mapper);
+
+        generator.writeKey("bottom_left");
+        this.bottomLeft.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TopRightBottomLeftGeoBounds}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TopRightBottomLeftGeoBounds> {
+        private GeoLocation topRight;
+
+        private GeoLocation bottomLeft;
+
+        /**
+         * Required - API name: {@code top_right}
+         */
+        public final Builder topRight(GeoLocation value) {
+            this.topRight = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code top_right}
+         */
+        public final Builder topRight(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
+            return this.topRight(fn.apply(new GeoLocation.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code bottom_left}
+         */
+        public final Builder bottomLeft(GeoLocation value) {
+            this.bottomLeft = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code bottom_left}
+         */
+        public final Builder bottomLeft(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
+            return this.bottomLeft(fn.apply(new GeoLocation.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link TopRightBottomLeftGeoBounds}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TopRightBottomLeftGeoBounds build() {
+            _checkSingleUse();
+
+            return new TopRightBottomLeftGeoBounds(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TopRightBottomLeftGeoBounds}
+     */
+    public static final JsonpDeserializer<TopRightBottomLeftGeoBounds> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TopRightBottomLeftGeoBounds::setupTopRightBottomLeftGeoBoundsDeserializer
+    );
+
+    protected static void setupTopRightBottomLeftGeoBoundsDeserializer(ObjectDeserializer<TopRightBottomLeftGeoBounds.Builder> op) {
+
+        op.add(Builder::topRight, GeoLocation._DESERIALIZER, "top_right");
+        op.add(Builder::bottomLeft, GeoLocation._DESERIALIZER, "bottom_left");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/TranslogStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/TranslogStats.java
index 07fe5551ac..1edbf3c210 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/TranslogStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/TranslogStats.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,250 +44,246 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.TranslogStats
 
 @JsonpDeserializable
 public class TranslogStats implements JsonpSerializable {
-	private final long earliestLastModifiedAge;
-
-	private final long operations;
-
-	@Nullable
-	private final String size;
-
-	private final long sizeInBytes;
-
-	private final int uncommittedOperations;
-
-	@Nullable
-	private final String uncommittedSize;
-
-	private final long uncommittedSizeInBytes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TranslogStats(Builder builder) {
-
-		this.earliestLastModifiedAge = ApiTypeHelper.requireNonNull(builder.earliestLastModifiedAge, this,
-				"earliestLastModifiedAge");
-		this.operations = ApiTypeHelper.requireNonNull(builder.operations, this, "operations");
-		this.size = builder.size;
-		this.sizeInBytes = ApiTypeHelper.requireNonNull(builder.sizeInBytes, this, "sizeInBytes");
-		this.uncommittedOperations = ApiTypeHelper.requireNonNull(builder.uncommittedOperations, this,
-				"uncommittedOperations");
-		this.uncommittedSize = builder.uncommittedSize;
-		this.uncommittedSizeInBytes = ApiTypeHelper.requireNonNull(builder.uncommittedSizeInBytes, this,
-				"uncommittedSizeInBytes");
-
-	}
-
-	public static TranslogStats of(Function<Builder, ObjectBuilder<TranslogStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code earliest_last_modified_age}
-	 */
-	public final long earliestLastModifiedAge() {
-		return this.earliestLastModifiedAge;
-	}
+    private final long earliestLastModifiedAge;
+
+    private final long operations;
+
+    @Nullable
+    private final String size;
+
+    private final long sizeInBytes;
+
+    private final int uncommittedOperations;
+
+    @Nullable
+    private final String uncommittedSize;
+
+    private final long uncommittedSizeInBytes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TranslogStats(Builder builder) {
+
+        this.earliestLastModifiedAge = ApiTypeHelper.requireNonNull(builder.earliestLastModifiedAge, this, "earliestLastModifiedAge");
+        this.operations = ApiTypeHelper.requireNonNull(builder.operations, this, "operations");
+        this.size = builder.size;
+        this.sizeInBytes = ApiTypeHelper.requireNonNull(builder.sizeInBytes, this, "sizeInBytes");
+        this.uncommittedOperations = ApiTypeHelper.requireNonNull(builder.uncommittedOperations, this, "uncommittedOperations");
+        this.uncommittedSize = builder.uncommittedSize;
+        this.uncommittedSizeInBytes = ApiTypeHelper.requireNonNull(builder.uncommittedSizeInBytes, this, "uncommittedSizeInBytes");
+
+    }
+
+    public static TranslogStats of(Function<Builder, ObjectBuilder<TranslogStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code earliest_last_modified_age}
+     */
+    public final long earliestLastModifiedAge() {
+        return this.earliestLastModifiedAge;
+    }
+
+    /**
+     * Required - API name: {@code operations}
+     */
+    public final long operations() {
+        return this.operations;
+    }
 
-	/**
-	 * Required - API name: {@code operations}
-	 */
-	public final long operations() {
-		return this.operations;
-	}
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final String size() {
+        return this.size;
+    }
 
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final String size() {
-		return this.size;
-	}
+    /**
+     * Required - API name: {@code size_in_bytes}
+     */
+    public final long sizeInBytes() {
+        return this.sizeInBytes;
+    }
 
-	/**
-	 * Required - API name: {@code size_in_bytes}
-	 */
-	public final long sizeInBytes() {
-		return this.sizeInBytes;
-	}
-
-	/**
-	 * Required - API name: {@code uncommitted_operations}
-	 */
-	public final int uncommittedOperations() {
-		return this.uncommittedOperations;
-	}
-
-	/**
-	 * API name: {@code uncommitted_size}
-	 */
-	@Nullable
-	public final String uncommittedSize() {
-		return this.uncommittedSize;
-	}
-
-	/**
-	 * Required - API name: {@code uncommitted_size_in_bytes}
-	 */
-	public final long uncommittedSizeInBytes() {
-		return this.uncommittedSizeInBytes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("earliest_last_modified_age");
-		generator.write(this.earliestLastModifiedAge);
-
-		generator.writeKey("operations");
-		generator.write(this.operations);
-
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		generator.writeKey("size_in_bytes");
-		generator.write(this.sizeInBytes);
-
-		generator.writeKey("uncommitted_operations");
-		generator.write(this.uncommittedOperations);
-
-		if (this.uncommittedSize != null) {
-			generator.writeKey("uncommitted_size");
-			generator.write(this.uncommittedSize);
-
-		}
-		generator.writeKey("uncommitted_size_in_bytes");
-		generator.write(this.uncommittedSizeInBytes);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TranslogStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TranslogStats> {
-		private Long earliestLastModifiedAge;
-
-		private Long operations;
-
-		@Nullable
-		private String size;
-
-		private Long sizeInBytes;
-
-		private Integer uncommittedOperations;
-
-		@Nullable
-		private String uncommittedSize;
-
-		private Long uncommittedSizeInBytes;
-
-		/**
-		 * Required - API name: {@code earliest_last_modified_age}
-		 */
-		public final Builder earliestLastModifiedAge(long value) {
-			this.earliestLastModifiedAge = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code operations}
-		 */
-		public final Builder operations(long value) {
-			this.operations = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable String value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code size_in_bytes}
-		 */
-		public final Builder sizeInBytes(long value) {
-			this.sizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code uncommitted_operations}
-		 */
-		public final Builder uncommittedOperations(int value) {
-			this.uncommittedOperations = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code uncommitted_size}
-		 */
-		public final Builder uncommittedSize(@Nullable String value) {
-			this.uncommittedSize = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code uncommitted_size_in_bytes}
-		 */
-		public final Builder uncommittedSizeInBytes(long value) {
-			this.uncommittedSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TranslogStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TranslogStats build() {
-			_checkSingleUse();
-
-			return new TranslogStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TranslogStats}
-	 */
-	public static final JsonpDeserializer<TranslogStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TranslogStats::setupTranslogStatsDeserializer);
-
-	protected static void setupTranslogStatsDeserializer(ObjectDeserializer<TranslogStats.Builder> op) {
-
-		op.add(Builder::earliestLastModifiedAge, JsonpDeserializer.longDeserializer(), "earliest_last_modified_age");
-		op.add(Builder::operations, JsonpDeserializer.longDeserializer(), "operations");
-		op.add(Builder::size, JsonpDeserializer.stringDeserializer(), "size");
-		op.add(Builder::sizeInBytes, JsonpDeserializer.longDeserializer(), "size_in_bytes");
-		op.add(Builder::uncommittedOperations, JsonpDeserializer.integerDeserializer(), "uncommitted_operations");
-		op.add(Builder::uncommittedSize, JsonpDeserializer.stringDeserializer(), "uncommitted_size");
-		op.add(Builder::uncommittedSizeInBytes, JsonpDeserializer.longDeserializer(), "uncommitted_size_in_bytes");
-
-	}
+    /**
+     * Required - API name: {@code uncommitted_operations}
+     */
+    public final int uncommittedOperations() {
+        return this.uncommittedOperations;
+    }
+
+    /**
+     * API name: {@code uncommitted_size}
+     */
+    @Nullable
+    public final String uncommittedSize() {
+        return this.uncommittedSize;
+    }
+
+    /**
+     * Required - API name: {@code uncommitted_size_in_bytes}
+     */
+    public final long uncommittedSizeInBytes() {
+        return this.uncommittedSizeInBytes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("earliest_last_modified_age");
+        generator.write(this.earliestLastModifiedAge);
+
+        generator.writeKey("operations");
+        generator.write(this.operations);
+
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        generator.writeKey("size_in_bytes");
+        generator.write(this.sizeInBytes);
+
+        generator.writeKey("uncommitted_operations");
+        generator.write(this.uncommittedOperations);
+
+        if (this.uncommittedSize != null) {
+            generator.writeKey("uncommitted_size");
+            generator.write(this.uncommittedSize);
+
+        }
+        generator.writeKey("uncommitted_size_in_bytes");
+        generator.write(this.uncommittedSizeInBytes);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TranslogStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TranslogStats> {
+        private Long earliestLastModifiedAge;
+
+        private Long operations;
+
+        @Nullable
+        private String size;
+
+        private Long sizeInBytes;
+
+        private Integer uncommittedOperations;
+
+        @Nullable
+        private String uncommittedSize;
+
+        private Long uncommittedSizeInBytes;
+
+        /**
+         * Required - API name: {@code earliest_last_modified_age}
+         */
+        public final Builder earliestLastModifiedAge(long value) {
+            this.earliestLastModifiedAge = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code operations}
+         */
+        public final Builder operations(long value) {
+            this.operations = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable String value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code size_in_bytes}
+         */
+        public final Builder sizeInBytes(long value) {
+            this.sizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code uncommitted_operations}
+         */
+        public final Builder uncommittedOperations(int value) {
+            this.uncommittedOperations = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code uncommitted_size}
+         */
+        public final Builder uncommittedSize(@Nullable String value) {
+            this.uncommittedSize = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code uncommitted_size_in_bytes}
+         */
+        public final Builder uncommittedSizeInBytes(long value) {
+            this.uncommittedSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link TranslogStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TranslogStats build() {
+            _checkSingleUse();
+
+            return new TranslogStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TranslogStats}
+     */
+    public static final JsonpDeserializer<TranslogStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TranslogStats::setupTranslogStatsDeserializer
+    );
+
+    protected static void setupTranslogStatsDeserializer(ObjectDeserializer<TranslogStats.Builder> op) {
+
+        op.add(Builder::earliestLastModifiedAge, JsonpDeserializer.longDeserializer(), "earliest_last_modified_age");
+        op.add(Builder::operations, JsonpDeserializer.longDeserializer(), "operations");
+        op.add(Builder::size, JsonpDeserializer.stringDeserializer(), "size");
+        op.add(Builder::sizeInBytes, JsonpDeserializer.longDeserializer(), "size_in_bytes");
+        op.add(Builder::uncommittedOperations, JsonpDeserializer.integerDeserializer(), "uncommitted_operations");
+        op.add(Builder::uncommittedSize, JsonpDeserializer.stringDeserializer(), "uncommitted_size");
+        op.add(Builder::uncommittedSizeInBytes, JsonpDeserializer.longDeserializer(), "uncommitted_size_in_bytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/VersionType.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/VersionType.java
index 359b3dc477..fa4b51312d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/VersionType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/VersionType.java
@@ -37,26 +37,25 @@
 
 @JsonpDeserializable
 public enum VersionType implements JsonEnum {
-	Internal("internal"),
+    Internal("internal"),
 
-	External("external"),
+    External("external"),
 
-	ExternalGte("external_gte"),
+    ExternalGte("external_gte"),
 
-	Force("force"),
+    Force("force"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	VersionType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    VersionType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<VersionType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			VersionType.values());
+    public static final JsonEnum.Deserializer<VersionType> _DESERIALIZER = new JsonEnum.Deserializer<>(VersionType.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/WaitForActiveShardOptions.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/WaitForActiveShardOptions.java
index 27870a140c..fef26538b2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/WaitForActiveShardOptions.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/WaitForActiveShardOptions.java
@@ -37,20 +37,21 @@
 
 @JsonpDeserializable
 public enum WaitForActiveShardOptions implements JsonEnum {
-	All("all"),
+    All("all"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	WaitForActiveShardOptions(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    WaitForActiveShardOptions(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<WaitForActiveShardOptions> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			WaitForActiveShardOptions.values());
+    public static final JsonEnum.Deserializer<WaitForActiveShardOptions> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        WaitForActiveShardOptions.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/WaitForActiveShards.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/WaitForActiveShards.java
index 5908743308..05a374ed2f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/WaitForActiveShards.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/WaitForActiveShards.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,138 +44,139 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.WaitForActiveShards
 
 @JsonpDeserializable
 public class WaitForActiveShards implements TaggedUnion<WaitForActiveShards.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Option, Count
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private WaitForActiveShards(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	public String _toJsonString() {
-		switch (_kind) {
-			case Option :
-				return this.option().jsonValue();
-			case Count :
-				return String.valueOf(this.count());
-
-			default :
-				throw new IllegalStateException("Unknown kind " + _kind);
-		}
-	}
-
-	private WaitForActiveShards(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static WaitForActiveShards of(Function<Builder, ObjectBuilder<WaitForActiveShards>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code option}?
-	 */
-	public boolean isOption() {
-		return _kind == Kind.Option;
-	}
-
-	/**
-	 * Get the {@code option} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code option} kind.
-	 */
-	public WaitForActiveShardOptions option() {
-		return TaggedUnionUtils.get(this, Kind.Option);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code count}?
-	 */
-	public boolean isCount() {
-		return _kind == Kind.Count;
-	}
-
-	/**
-	 * Get the {@code count} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code count} kind.
-	 */
-	public Integer count() {
-		return TaggedUnionUtils.get(this, Kind.Count);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Count :
-					generator.write(((Integer) this._value));
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<WaitForActiveShards> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<WaitForActiveShards> option(WaitForActiveShardOptions v) {
-			this._kind = Kind.Option;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<WaitForActiveShards> count(Integer v) {
-			this._kind = Kind.Count;
-			this._value = v;
-			return this;
-		}
-
-		public WaitForActiveShards build() {
-			_checkSingleUse();
-			return new WaitForActiveShards(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<WaitForActiveShards> buildWaitForActiveShardsDeserializer() {
-		return new UnionDeserializer.Builder<WaitForActiveShards, Kind, Object>(WaitForActiveShards::new, false)
-				.addMember(Kind.Option, WaitForActiveShardOptions._DESERIALIZER)
-				.addMember(Kind.Count, JsonpDeserializer.integerDeserializer()).build();
-	}
-
-	public static final JsonpDeserializer<WaitForActiveShards> _DESERIALIZER = JsonpDeserializer
-			.lazy(WaitForActiveShards::buildWaitForActiveShardsDeserializer);
+    public enum Kind {
+        Option,
+        Count
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private WaitForActiveShards(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    public String _toJsonString() {
+        switch (_kind) {
+            case Option:
+                return this.option().jsonValue();
+            case Count:
+                return String.valueOf(this.count());
+
+            default:
+                throw new IllegalStateException("Unknown kind " + _kind);
+        }
+    }
+
+    private WaitForActiveShards(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static WaitForActiveShards of(Function<Builder, ObjectBuilder<WaitForActiveShards>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code option}?
+     */
+    public boolean isOption() {
+        return _kind == Kind.Option;
+    }
+
+    /**
+     * Get the {@code option} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code option} kind.
+     */
+    public WaitForActiveShardOptions option() {
+        return TaggedUnionUtils.get(this, Kind.Option);
+    }
+
+    /**
+     * Is this variant instance of kind {@code count}?
+     */
+    public boolean isCount() {
+        return _kind == Kind.Count;
+    }
+
+    /**
+     * Get the {@code count} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code count} kind.
+     */
+    public Integer count() {
+        return TaggedUnionUtils.get(this, Kind.Count);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Count:
+                    generator.write(((Integer) this._value));
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<WaitForActiveShards> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<WaitForActiveShards> option(WaitForActiveShardOptions v) {
+            this._kind = Kind.Option;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<WaitForActiveShards> count(Integer v) {
+            this._kind = Kind.Count;
+            this._value = v;
+            return this;
+        }
+
+        public WaitForActiveShards build() {
+            _checkSingleUse();
+            return new WaitForActiveShards(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<WaitForActiveShards> buildWaitForActiveShardsDeserializer() {
+        return new UnionDeserializer.Builder<WaitForActiveShards, Kind, Object>(WaitForActiveShards::new, false).addMember(
+            Kind.Option,
+            WaitForActiveShardOptions._DESERIALIZER
+        ).addMember(Kind.Count, JsonpDeserializer.integerDeserializer()).build();
+    }
+
+    public static final JsonpDeserializer<WaitForActiveShards> _DESERIALIZER = JsonpDeserializer.lazy(
+        WaitForActiveShards::buildWaitForActiveShardsDeserializer
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/WaitForActiveShardsBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/WaitForActiveShardsBuilders.java
index 147df6274f..ef18bbaa3e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/WaitForActiveShardsBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/WaitForActiveShardsBuilders.java
@@ -38,10 +38,9 @@
  * Variants <code>option</code>, <code>count</code> are not available here as
  * they don't have a dedicated class. Use {@link WaitForActiveShards}'s builder
  * for these.
- * 
+ *
  */
 public class WaitForActiveShardsBuilders {
-	private WaitForActiveShardsBuilders() {
-	}
+    private WaitForActiveShardsBuilders() {}
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/WaitForEvents.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/WaitForEvents.java
index 718f05315c..e6707e97b6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/WaitForEvents.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/WaitForEvents.java
@@ -37,30 +37,29 @@
 
 @JsonpDeserializable
 public enum WaitForEvents implements JsonEnum {
-	Immediate("immediate"),
+    Immediate("immediate"),
 
-	Urgent("urgent"),
+    Urgent("urgent"),
 
-	High("high"),
+    High("high"),
 
-	Normal("normal"),
+    Normal("normal"),
 
-	Low("low"),
+    Low("low"),
 
-	Languid("languid"),
+    Languid("languid"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	WaitForEvents(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    WaitForEvents(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<WaitForEvents> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			WaitForEvents.values());
+    public static final JsonEnum.Deserializer<WaitForEvents> _DESERIALIZER = new JsonEnum.Deserializer<>(WaitForEvents.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/WarmerStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/WarmerStats.java
index d239dd9007..2c2a8b3158 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/WarmerStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/WarmerStats.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,170 +44,169 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.WarmerStats
 
 @JsonpDeserializable
 public class WarmerStats implements JsonpSerializable {
-	private final long current;
+    private final long current;
 
-	private final long total;
+    private final long total;
 
-	@Nullable
-	private final String totalTime;
+    @Nullable
+    private final String totalTime;
 
-	private final long totalTimeInMillis;
+    private final long totalTimeInMillis;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private WarmerStats(Builder builder) {
+    private WarmerStats(Builder builder) {
 
-		this.current = ApiTypeHelper.requireNonNull(builder.current, this, "current");
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
-		this.totalTime = builder.totalTime;
-		this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
-
-	}
-
-	public static WarmerStats of(Function<Builder, ObjectBuilder<WarmerStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code current}
-	 */
-	public final long current() {
-		return this.current;
-	}
-
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final long total() {
-		return this.total;
-	}
-
-	/**
-	 * API name: {@code total_time}
-	 */
-	@Nullable
-	public final String totalTime() {
-		return this.totalTime;
-	}
-
-	/**
-	 * Required - API name: {@code total_time_in_millis}
-	 */
-	public final long totalTimeInMillis() {
-		return this.totalTimeInMillis;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("current");
-		generator.write(this.current);
-
-		generator.writeKey("total");
-		generator.write(this.total);
-
-		if (this.totalTime != null) {
-			generator.writeKey("total_time");
-			generator.write(this.totalTime);
-
-		}
-		generator.writeKey("total_time_in_millis");
-		generator.write(this.totalTimeInMillis);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link WarmerStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<WarmerStats> {
-		private Long current;
-
-		private Long total;
-
-		@Nullable
-		private String totalTime;
-
-		private Long totalTimeInMillis;
-
-		/**
-		 * Required - API name: {@code current}
-		 */
-		public final Builder current(long value) {
-			this.current = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(long value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total_time}
-		 */
-		public final Builder totalTime(@Nullable String value) {
-			this.totalTime = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_time_in_millis}
-		 */
-		public final Builder totalTimeInMillis(long value) {
-			this.totalTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link WarmerStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public WarmerStats build() {
-			_checkSingleUse();
-
-			return new WarmerStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link WarmerStats}
-	 */
-	public static final JsonpDeserializer<WarmerStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			WarmerStats::setupWarmerStatsDeserializer);
-
-	protected static void setupWarmerStatsDeserializer(ObjectDeserializer<WarmerStats.Builder> op) {
-
-		op.add(Builder::current, JsonpDeserializer.longDeserializer(), "current");
-		op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
-		op.add(Builder::totalTime, JsonpDeserializer.stringDeserializer(), "total_time");
-		op.add(Builder::totalTimeInMillis, JsonpDeserializer.longDeserializer(), "total_time_in_millis");
-
-	}
+        this.current = ApiTypeHelper.requireNonNull(builder.current, this, "current");
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+        this.totalTime = builder.totalTime;
+        this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
+
+    }
+
+    public static WarmerStats of(Function<Builder, ObjectBuilder<WarmerStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code current}
+     */
+    public final long current() {
+        return this.current;
+    }
+
+    /**
+     * Required - API name: {@code total}
+     */
+    public final long total() {
+        return this.total;
+    }
+
+    /**
+     * API name: {@code total_time}
+     */
+    @Nullable
+    public final String totalTime() {
+        return this.totalTime;
+    }
+
+    /**
+     * Required - API name: {@code total_time_in_millis}
+     */
+    public final long totalTimeInMillis() {
+        return this.totalTimeInMillis;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("current");
+        generator.write(this.current);
+
+        generator.writeKey("total");
+        generator.write(this.total);
+
+        if (this.totalTime != null) {
+            generator.writeKey("total_time");
+            generator.write(this.totalTime);
+
+        }
+        generator.writeKey("total_time_in_millis");
+        generator.write(this.totalTimeInMillis);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link WarmerStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<WarmerStats> {
+        private Long current;
+
+        private Long total;
+
+        @Nullable
+        private String totalTime;
+
+        private Long totalTimeInMillis;
+
+        /**
+         * Required - API name: {@code current}
+         */
+        public final Builder current(long value) {
+            this.current = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(long value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total_time}
+         */
+        public final Builder totalTime(@Nullable String value) {
+            this.totalTime = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_time_in_millis}
+         */
+        public final Builder totalTimeInMillis(long value) {
+            this.totalTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link WarmerStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public WarmerStats build() {
+            _checkSingleUse();
+
+            return new WarmerStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link WarmerStats}
+     */
+    public static final JsonpDeserializer<WarmerStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        WarmerStats::setupWarmerStatsDeserializer
+    );
+
+    protected static void setupWarmerStatsDeserializer(ObjectDeserializer<WarmerStats.Builder> op) {
+
+        op.add(Builder::current, JsonpDeserializer.longDeserializer(), "current");
+        op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
+        op.add(Builder::totalTime, JsonpDeserializer.stringDeserializer(), "total_time");
+        op.add(Builder::totalTimeInMillis, JsonpDeserializer.longDeserializer(), "total_time_in_millis");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/WktGeoBounds.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/WktGeoBounds.java
index 4c317e3daa..16c2202ed9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/WktGeoBounds.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/WktGeoBounds.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,92 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.WktGeoBounds
 
 @JsonpDeserializable
 public class WktGeoBounds implements JsonpSerializable {
-	private final String wkt;
+    private final String wkt;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private WktGeoBounds(Builder builder) {
+    private WktGeoBounds(Builder builder) {
 
-		this.wkt = ApiTypeHelper.requireNonNull(builder.wkt, this, "wkt");
+        this.wkt = ApiTypeHelper.requireNonNull(builder.wkt, this, "wkt");
 
-	}
+    }
 
-	public static WktGeoBounds of(Function<Builder, ObjectBuilder<WktGeoBounds>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static WktGeoBounds of(Function<Builder, ObjectBuilder<WktGeoBounds>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code wkt}
-	 */
-	public final String wkt() {
-		return this.wkt;
-	}
+    /**
+     * Required - API name: {@code wkt}
+     */
+    public final String wkt() {
+        return this.wkt;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("wkt");
-		generator.write(this.wkt);
+        generator.writeKey("wkt");
+        generator.write(this.wkt);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link WktGeoBounds}.
-	 */
+    /**
+     * Builder for {@link WktGeoBounds}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<WktGeoBounds> {
-		private String wkt;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<WktGeoBounds> {
+        private String wkt;
 
-		/**
-		 * Required - API name: {@code wkt}
-		 */
-		public final Builder wkt(String value) {
-			this.wkt = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code wkt}
+         */
+        public final Builder wkt(String value) {
+            this.wkt = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link WktGeoBounds}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public WktGeoBounds build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link WktGeoBounds}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public WktGeoBounds build() {
+            _checkSingleUse();
 
-			return new WktGeoBounds(this);
-		}
-	}
+            return new WktGeoBounds(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link WktGeoBounds}
-	 */
-	public static final JsonpDeserializer<WktGeoBounds> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			WktGeoBounds::setupWktGeoBoundsDeserializer);
+    /**
+     * Json deserializer for {@link WktGeoBounds}
+     */
+    public static final JsonpDeserializer<WktGeoBounds> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        WktGeoBounds::setupWktGeoBoundsDeserializer
+    );
 
-	protected static void setupWktGeoBoundsDeserializer(ObjectDeserializer<WktGeoBounds.Builder> op) {
+    protected static void setupWktGeoBoundsDeserializer(ObjectDeserializer<WktGeoBounds.Builder> op) {
 
-		op.add(Builder::wkt, JsonpDeserializer.stringDeserializer(), "wkt");
+        op.add(Builder::wkt, JsonpDeserializer.stringDeserializer(), "wkt");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/WriteResponseBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/WriteResponseBase.java
index 9e22f6e3c9..1e6c3e8411 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/WriteResponseBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/WriteResponseBase.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
@@ -39,250 +42,243 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.WriteResponseBase
 
-
 public abstract class WriteResponseBase implements JsonpSerializable {
-	private final String id;
-
-	private final String index;
-
-	private final long primaryTerm;
-
-	private final Result result;
-
-	private final long seqNo;
-
-	private final ShardStatistics shards;
-
-	private final long version;
-
-	@Nullable
-	private final Boolean forcedRefresh;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected WriteResponseBase(AbstractBuilder<?> builder) {
-
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.primaryTerm = ApiTypeHelper.requireNonNull(builder.primaryTerm, this, "primaryTerm");
-		this.result = ApiTypeHelper.requireNonNull(builder.result, this, "result");
-		this.seqNo = ApiTypeHelper.requireNonNull(builder.seqNo, this, "seqNo");
-		this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
-		this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
-		this.forcedRefresh = builder.forcedRefresh;
-
-	}
-
-	/**
-	 * Required - API name: {@code _id}
-	 */
-	public final String id() {
-		return this.id;
-	}
+    private final String id;
+
+    private final String index;
+
+    private final long primaryTerm;
+
+    private final Result result;
+
+    private final long seqNo;
+
+    private final ShardStatistics shards;
+
+    private final long version;
+
+    @Nullable
+    private final Boolean forcedRefresh;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected WriteResponseBase(AbstractBuilder<?> builder) {
+
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.primaryTerm = ApiTypeHelper.requireNonNull(builder.primaryTerm, this, "primaryTerm");
+        this.result = ApiTypeHelper.requireNonNull(builder.result, this, "result");
+        this.seqNo = ApiTypeHelper.requireNonNull(builder.seqNo, this, "seqNo");
+        this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
+        this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
+        this.forcedRefresh = builder.forcedRefresh;
+
+    }
+
+    /**
+     * Required - API name: {@code _id}
+     */
+    public final String id() {
+        return this.id;
+    }
 
-	/**
-	 * Required - API name: {@code _index}
-	 */
-	public final String index() {
-		return this.index;
-	}
+    /**
+     * Required - API name: {@code _index}
+     */
+    public final String index() {
+        return this.index;
+    }
 
-	/**
-	 * Required - API name: {@code _primary_term}
-	 */
-	public final long primaryTerm() {
-		return this.primaryTerm;
-	}
+    /**
+     * Required - API name: {@code _primary_term}
+     */
+    public final long primaryTerm() {
+        return this.primaryTerm;
+    }
 
-	/**
-	 * Required - API name: {@code result}
-	 */
-	public final Result result() {
-		return this.result;
-	}
+    /**
+     * Required - API name: {@code result}
+     */
+    public final Result result() {
+        return this.result;
+    }
 
-	/**
-	 * Required - API name: {@code _seq_no}
-	 */
-	public final long seqNo() {
-		return this.seqNo;
-	}
+    /**
+     * Required - API name: {@code _seq_no}
+     */
+    public final long seqNo() {
+        return this.seqNo;
+    }
 
-	/**
-	 * Required - API name: {@code _shards}
-	 */
-	public final ShardStatistics shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Required - API name: {@code _version}
-	 */
-	public final long version() {
-		return this.version;
-	}
-
-	/**
-	 * API name: {@code forced_refresh}
-	 */
-	@Nullable
-	public final Boolean forcedRefresh() {
-		return this.forcedRefresh;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("_id");
-		generator.write(this.id);
-
-		generator.writeKey("_index");
-		generator.write(this.index);
-
-		generator.writeKey("_primary_term");
-		generator.write(this.primaryTerm);
-
-		generator.writeKey("result");
-		this.result.serialize(generator, mapper);
-		generator.writeKey("_seq_no");
-		generator.write(this.seqNo);
-
-		generator.writeKey("_shards");
-		this.shards.serialize(generator, mapper);
-
-		generator.writeKey("_version");
-		generator.write(this.version);
-
-		if (this.forcedRefresh != null) {
-			generator.writeKey("forced_refresh");
-			generator.write(this.forcedRefresh);
-
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		private String id;
-
-		private String index;
-
-		private Long primaryTerm;
-
-		private Result result;
-
-		private Long seqNo;
-
-		private ShardStatistics shards;
-
-		private Long version;
-
-		@Nullable
-		private Boolean forcedRefresh;
-
-		/**
-		 * Required - API name: {@code _id}
-		 */
-		public final BuilderT id(String value) {
-			this.id = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code _index}
-		 */
-		public final BuilderT index(String value) {
-			this.index = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code _primary_term}
-		 */
-		public final BuilderT primaryTerm(long value) {
-			this.primaryTerm = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code result}
-		 */
-		public final BuilderT result(Result value) {
-			this.result = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code _seq_no}
-		 */
-		public final BuilderT seqNo(long value) {
-			this.seqNo = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code _shards}
-		 */
-		public final BuilderT shards(ShardStatistics value) {
-			this.shards = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code _shards}
-		 */
-		public final BuilderT shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
-			return this.shards(fn.apply(new ShardStatistics.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code _version}
-		 */
-		public final BuilderT version(long value) {
-			this.version = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code forced_refresh}
-		 */
-		public final BuilderT forcedRefresh(@Nullable Boolean value) {
-			this.forcedRefresh = value;
-			return self();
-		}
-
-		protected abstract BuilderT self();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupWriteResponseBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-
-		op.add(AbstractBuilder::id, JsonpDeserializer.stringDeserializer(), "_id");
-		op.add(AbstractBuilder::index, JsonpDeserializer.stringDeserializer(), "_index");
-		op.add(AbstractBuilder::primaryTerm, JsonpDeserializer.longDeserializer(), "_primary_term");
-		op.add(AbstractBuilder::result, Result._DESERIALIZER, "result");
-		op.add(AbstractBuilder::seqNo, JsonpDeserializer.longDeserializer(), "_seq_no");
-		op.add(AbstractBuilder::shards, ShardStatistics._DESERIALIZER, "_shards");
-		op.add(AbstractBuilder::version, JsonpDeserializer.longDeserializer(), "_version");
-		op.add(AbstractBuilder::forcedRefresh, JsonpDeserializer.booleanDeserializer(), "forced_refresh");
-
-	}
+    /**
+     * Required - API name: {@code _shards}
+     */
+    public final ShardStatistics shards() {
+        return this.shards;
+    }
+
+    /**
+     * Required - API name: {@code _version}
+     */
+    public final long version() {
+        return this.version;
+    }
+
+    /**
+     * API name: {@code forced_refresh}
+     */
+    @Nullable
+    public final Boolean forcedRefresh() {
+        return this.forcedRefresh;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("_id");
+        generator.write(this.id);
+
+        generator.writeKey("_index");
+        generator.write(this.index);
+
+        generator.writeKey("_primary_term");
+        generator.write(this.primaryTerm);
+
+        generator.writeKey("result");
+        this.result.serialize(generator, mapper);
+        generator.writeKey("_seq_no");
+        generator.write(this.seqNo);
+
+        generator.writeKey("_shards");
+        this.shards.serialize(generator, mapper);
+
+        generator.writeKey("_version");
+        generator.write(this.version);
+
+        if (this.forcedRefresh != null) {
+            generator.writeKey("forced_refresh");
+            generator.write(this.forcedRefresh);
+
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        private String id;
+
+        private String index;
+
+        private Long primaryTerm;
+
+        private Result result;
+
+        private Long seqNo;
+
+        private ShardStatistics shards;
+
+        private Long version;
+
+        @Nullable
+        private Boolean forcedRefresh;
+
+        /**
+         * Required - API name: {@code _id}
+         */
+        public final BuilderT id(String value) {
+            this.id = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code _index}
+         */
+        public final BuilderT index(String value) {
+            this.index = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code _primary_term}
+         */
+        public final BuilderT primaryTerm(long value) {
+            this.primaryTerm = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code result}
+         */
+        public final BuilderT result(Result value) {
+            this.result = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code _seq_no}
+         */
+        public final BuilderT seqNo(long value) {
+            this.seqNo = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code _shards}
+         */
+        public final BuilderT shards(ShardStatistics value) {
+            this.shards = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code _shards}
+         */
+        public final BuilderT shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
+            return this.shards(fn.apply(new ShardStatistics.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code _version}
+         */
+        public final BuilderT version(long value) {
+            this.version = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code forced_refresh}
+         */
+        public final BuilderT forcedRefresh(@Nullable Boolean value) {
+            this.forcedRefresh = value;
+            return self();
+        }
+
+        protected abstract BuilderT self();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupWriteResponseBaseDeserializer(ObjectDeserializer<BuilderT> op) {
+
+        op.add(AbstractBuilder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(AbstractBuilder::index, JsonpDeserializer.stringDeserializer(), "_index");
+        op.add(AbstractBuilder::primaryTerm, JsonpDeserializer.longDeserializer(), "_primary_term");
+        op.add(AbstractBuilder::result, Result._DESERIALIZER, "result");
+        op.add(AbstractBuilder::seqNo, JsonpDeserializer.longDeserializer(), "_seq_no");
+        op.add(AbstractBuilder::shards, ShardStatistics._DESERIALIZER, "_shards");
+        op.add(AbstractBuilder::version, JsonpDeserializer.longDeserializer(), "_version");
+        op.add(AbstractBuilder::forcedRefresh, JsonpDeserializer.booleanDeserializer(), "forced_refresh");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AdjacencyMatrixAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AdjacencyMatrixAggregate.java
index 311a428d78..ad0b32fedb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AdjacencyMatrixAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AdjacencyMatrixAggregate.java
@@ -32,79 +32,77 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.AdjacencyMatrixAggregate
 
 @JsonpDeserializable
-public class AdjacencyMatrixAggregate extends MultiBucketAggregateBase<AdjacencyMatrixBucket>
-		implements
-			AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private AdjacencyMatrixAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static AdjacencyMatrixAggregate of(Function<Builder, ObjectBuilder<AdjacencyMatrixAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.AdjacencyMatrix;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AdjacencyMatrixAggregate}.
-	 */
-
-	public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<AdjacencyMatrixBucket, Builder>
-			implements
-				ObjectBuilder<AdjacencyMatrixAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AdjacencyMatrixAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AdjacencyMatrixAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new AdjacencyMatrixAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AdjacencyMatrixAggregate}
-	 */
-	public static final JsonpDeserializer<AdjacencyMatrixAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, AdjacencyMatrixAggregate::setupAdjacencyMatrixAggregateDeserializer);
-
-	protected static void setupAdjacencyMatrixAggregateDeserializer(
-			ObjectDeserializer<AdjacencyMatrixAggregate.Builder> op) {
-		setupMultiBucketAggregateBaseDeserializer(op, AdjacencyMatrixBucket._DESERIALIZER);
-
-	}
+public class AdjacencyMatrixAggregate extends MultiBucketAggregateBase<AdjacencyMatrixBucket> implements AggregateVariant {
+    // ---------------------------------------------------------------------------------------------
+
+    private AdjacencyMatrixAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static AdjacencyMatrixAggregate of(Function<Builder, ObjectBuilder<AdjacencyMatrixAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.AdjacencyMatrix;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AdjacencyMatrixAggregate}.
+     */
+
+    public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<AdjacencyMatrixBucket, Builder>
+        implements
+            ObjectBuilder<AdjacencyMatrixAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link AdjacencyMatrixAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AdjacencyMatrixAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new AdjacencyMatrixAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AdjacencyMatrixAggregate}
+     */
+    public static final JsonpDeserializer<AdjacencyMatrixAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AdjacencyMatrixAggregate::setupAdjacencyMatrixAggregateDeserializer
+    );
+
+    protected static void setupAdjacencyMatrixAggregateDeserializer(ObjectDeserializer<AdjacencyMatrixAggregate.Builder> op) {
+        setupMultiBucketAggregateBaseDeserializer(op, AdjacencyMatrixBucket._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AdjacencyMatrixAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AdjacencyMatrixAggregation.java
index 7f92e20fd9..2d36024495 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AdjacencyMatrixAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AdjacencyMatrixAggregation.java
@@ -32,142 +32,143 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.AdjacencyMatrixAggregation
 
 @JsonpDeserializable
 public class AdjacencyMatrixAggregation extends BucketAggregationBase implements AggregationVariant {
-	private final Map<String, Query> filters;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AdjacencyMatrixAggregation(Builder builder) {
-		super(builder);
-
-		this.filters = ApiTypeHelper.unmodifiable(builder.filters);
-
-	}
-
-	public static AdjacencyMatrixAggregation of(Function<Builder, ObjectBuilder<AdjacencyMatrixAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.AdjacencyMatrix;
-	}
-
-	/**
-	 * API name: {@code filters}
-	 */
-	public final Map<String, Query> filters() {
-		return this.filters;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.filters)) {
-			generator.writeKey("filters");
-			generator.writeStartObject();
-			for (Map.Entry<String, Query> item0 : this.filters.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AdjacencyMatrixAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<AdjacencyMatrixAggregation> {
-		@Nullable
-		private Map<String, Query> filters;
-
-		/**
-		 * API name: {@code filters}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>filters</code>.
-		 */
-		public final Builder filters(Map<String, Query> map) {
-			this.filters = _mapPutAll(this.filters, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code filters}
-		 * <p>
-		 * Adds an entry to <code>filters</code>.
-		 */
-		public final Builder filters(String key, Query value) {
-			this.filters = _mapPut(this.filters, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code filters}
-		 * <p>
-		 * Adds an entry to <code>filters</code> using a builder lambda.
-		 */
-		public final Builder filters(String key, Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return filters(key, fn.apply(new Query.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AdjacencyMatrixAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AdjacencyMatrixAggregation build() {
-			_checkSingleUse();
-
-			return new AdjacencyMatrixAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AdjacencyMatrixAggregation}
-	 */
-	public static final JsonpDeserializer<AdjacencyMatrixAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, AdjacencyMatrixAggregation::setupAdjacencyMatrixAggregationDeserializer);
-
-	protected static void setupAdjacencyMatrixAggregationDeserializer(
-			ObjectDeserializer<AdjacencyMatrixAggregation.Builder> op) {
-		setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::filters, JsonpDeserializer.stringMapDeserializer(Query._DESERIALIZER), "filters");
-
-	}
+    private final Map<String, Query> filters;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AdjacencyMatrixAggregation(Builder builder) {
+        super(builder);
+
+        this.filters = ApiTypeHelper.unmodifiable(builder.filters);
+
+    }
+
+    public static AdjacencyMatrixAggregation of(Function<Builder, ObjectBuilder<AdjacencyMatrixAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.AdjacencyMatrix;
+    }
+
+    /**
+     * API name: {@code filters}
+     */
+    public final Map<String, Query> filters() {
+        return this.filters;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.filters)) {
+            generator.writeKey("filters");
+            generator.writeStartObject();
+            for (Map.Entry<String, Query> item0 : this.filters.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AdjacencyMatrixAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<AdjacencyMatrixAggregation> {
+        @Nullable
+        private Map<String, Query> filters;
+
+        /**
+         * API name: {@code filters}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>filters</code>.
+         */
+        public final Builder filters(Map<String, Query> map) {
+            this.filters = _mapPutAll(this.filters, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code filters}
+         * <p>
+         * Adds an entry to <code>filters</code>.
+         */
+        public final Builder filters(String key, Query value) {
+            this.filters = _mapPut(this.filters, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code filters}
+         * <p>
+         * Adds an entry to <code>filters</code> using a builder lambda.
+         */
+        public final Builder filters(String key, Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return filters(key, fn.apply(new Query.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link AdjacencyMatrixAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AdjacencyMatrixAggregation build() {
+            _checkSingleUse();
+
+            return new AdjacencyMatrixAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AdjacencyMatrixAggregation}
+     */
+    public static final JsonpDeserializer<AdjacencyMatrixAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AdjacencyMatrixAggregation::setupAdjacencyMatrixAggregationDeserializer
+    );
+
+    protected static void setupAdjacencyMatrixAggregationDeserializer(ObjectDeserializer<AdjacencyMatrixAggregation.Builder> op) {
+        setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::filters, JsonpDeserializer.stringMapDeserializer(Query._DESERIALIZER), "filters");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AdjacencyMatrixBucket.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AdjacencyMatrixBucket.java
index d50dac4a00..3e9dae20b0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AdjacencyMatrixBucket.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AdjacencyMatrixBucket.java
@@ -32,67 +32,66 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.AdjacencyMatrixBucket
 
 @JsonpDeserializable
 public class AdjacencyMatrixBucket extends MultiBucketBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private AdjacencyMatrixBucket(Builder builder) {
-		super(builder);
+    private AdjacencyMatrixBucket(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static AdjacencyMatrixBucket of(Function<Builder, ObjectBuilder<AdjacencyMatrixBucket>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static AdjacencyMatrixBucket of(Function<Builder, ObjectBuilder<AdjacencyMatrixBucket>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link AdjacencyMatrixBucket}.
-	 */
+    /**
+     * Builder for {@link AdjacencyMatrixBucket}.
+     */
 
-	public static class Builder extends MultiBucketBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<AdjacencyMatrixBucket> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends MultiBucketBase.AbstractBuilder<Builder> implements ObjectBuilder<AdjacencyMatrixBucket> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link AdjacencyMatrixBucket}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AdjacencyMatrixBucket build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link AdjacencyMatrixBucket}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AdjacencyMatrixBucket build() {
+            _checkSingleUse();
 
-			return new AdjacencyMatrixBucket(this);
-		}
-	}
+            return new AdjacencyMatrixBucket(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link AdjacencyMatrixBucket}
-	 */
-	public static final JsonpDeserializer<AdjacencyMatrixBucket> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, AdjacencyMatrixBucket::setupAdjacencyMatrixBucketDeserializer);
+    /**
+     * Json deserializer for {@link AdjacencyMatrixBucket}
+     */
+    public static final JsonpDeserializer<AdjacencyMatrixBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AdjacencyMatrixBucket::setupAdjacencyMatrixBucketDeserializer
+    );
 
-	protected static void setupAdjacencyMatrixBucketDeserializer(ObjectDeserializer<AdjacencyMatrixBucket.Builder> op) {
-		MultiBucketBase.setupMultiBucketBaseDeserializer(op);
+    protected static void setupAdjacencyMatrixBucketDeserializer(ObjectDeserializer<AdjacencyMatrixBucket.Builder> op) {
+        MultiBucketBase.setupMultiBucketBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/Aggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/Aggregate.java
index 106f822526..999bdfc84f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/Aggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/Aggregate.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.ExternallyTaggedUnion;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonEnum;
@@ -43,2086 +47,2061 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.Aggregate
 
-
 public class Aggregate implements TaggedUnion<Aggregate.Kind, AggregateVariant>, JsonpSerializable {
 
-	/**
-	 * {@link Aggregate} variant kinds.
-	 */
-	/**
-	 * {@link Aggregate} variant kinds.
-	 */
+    /**
+     * {@link Aggregate} variant kinds.
+     */
+    /**
+     * {@link Aggregate} variant kinds.
+     */
 
-	public enum Kind implements JsonEnum {
-		AdjacencyMatrix("adjacency_matrix"),
+    public enum Kind implements JsonEnum {
+        AdjacencyMatrix("adjacency_matrix"),
 
-		AutoDateHistogram("auto_date_histogram"),
+        AutoDateHistogram("auto_date_histogram"),
 
-		Avg("avg"),
+        Avg("avg"),
 
-		BoxPlot("box_plot"),
+        BoxPlot("box_plot"),
 
-		BucketMetricValue("bucket_metric_value"),
+        BucketMetricValue("bucket_metric_value"),
 
-		Cardinality("cardinality"),
+        Cardinality("cardinality"),
 
-		Children("children"),
+        Children("children"),
 
-		Composite("composite"),
+        Composite("composite"),
 
-		SimpleLongValue("simple_long_value"),
+        SimpleLongValue("simple_long_value"),
 
-		DateHistogram("date_histogram"),
+        DateHistogram("date_histogram"),
 
-		DateRange("date_range"),
+        DateRange("date_range"),
 
-		Derivative("derivative"),
+        Derivative("derivative"),
 
-		Dterms("dterms"),
+        Dterms("dterms"),
 
-		ExtendedStats("extended_stats"),
+        ExtendedStats("extended_stats"),
 
-		ExtendedStatsBucket("extended_stats_bucket"),
+        ExtendedStatsBucket("extended_stats_bucket"),
 
-		Filter("filter"),
+        Filter("filter"),
 
-		Filters("filters"),
+        Filters("filters"),
 
-		GeoBounds("geo_bounds"),
+        GeoBounds("geo_bounds"),
 
-		GeoCentroid("geo_centroid"),
+        GeoCentroid("geo_centroid"),
 
-		GeoDistance("geo_distance"),
+        GeoDistance("geo_distance"),
 
-		GeohashGrid("geohash_grid"),
+        GeohashGrid("geohash_grid"),
 
-		GeoLine("geo_line"),
+        GeoLine("geo_line"),
 
-		GeotileGrid("geotile_grid"),
+        GeotileGrid("geotile_grid"),
 
-		Global("global"),
+        Global("global"),
 
-		HdrPercentileRanks("hdr_percentile_ranks"),
+        HdrPercentileRanks("hdr_percentile_ranks"),
 
-		HdrPercentiles("hdr_percentiles"),
+        HdrPercentiles("hdr_percentiles"),
 
-		Histogram("histogram"),
+        Histogram("histogram"),
 
-		Inference("inference"),
+        Inference("inference"),
 
-		IpRange("ip_range"),
+        IpRange("ip_range"),
 
-		Lrareterms("lrareterms"),
+        Lrareterms("lrareterms"),
 
-		Lterms("lterms"),
+        Lterms("lterms"),
 
-		MatrixStats("matrix_stats"),
+        MatrixStats("matrix_stats"),
 
-		Max("max"),
+        Max("max"),
 
-		MedianAbsoluteDeviation("median_absolute_deviation"),
+        MedianAbsoluteDeviation("median_absolute_deviation"),
 
-		Min("min"),
+        Min("min"),
 
-		Missing("missing"),
+        Missing("missing"),
 
-		MultiTerms("multi_terms"),
+        MultiTerms("multi_terms"),
 
-		Nested("nested"),
+        Nested("nested"),
 
-		PercentilesBucket("percentiles_bucket"),
+        PercentilesBucket("percentiles_bucket"),
 
-		Range("range"),
+        Range("range"),
 
-		Rate("rate"),
+        Rate("rate"),
 
-		ReverseNested("reverse_nested"),
+        ReverseNested("reverse_nested"),
 
-		Sampler("sampler"),
+        Sampler("sampler"),
 
-		ScriptedMetric("scripted_metric"),
+        ScriptedMetric("scripted_metric"),
 
-		Siglterms("siglterms"),
+        Siglterms("siglterms"),
 
-		Sigsterms("sigsterms"),
+        Sigsterms("sigsterms"),
 
-		SimpleValue("simple_value"),
+        SimpleValue("simple_value"),
 
-		Stats("stats"),
+        Stats("stats"),
 
-		StatsBucket("stats_bucket"),
+        StatsBucket("stats_bucket"),
 
-		Srareterms("srareterms"),
+        Srareterms("srareterms"),
 
-		StringStats("string_stats"),
+        StringStats("string_stats"),
 
-		Sterms("sterms"),
+        Sterms("sterms"),
 
-		Sum("sum"),
+        Sum("sum"),
 
-		TdigestPercentileRanks("tdigest_percentile_ranks"),
+        TdigestPercentileRanks("tdigest_percentile_ranks"),
 
-		TdigestPercentiles("tdigest_percentiles"),
+        TdigestPercentiles("tdigest_percentiles"),
 
-		TTest("t_test"),
+        TTest("t_test"),
 
-		TopHits("top_hits"),
+        TopHits("top_hits"),
 
-		TopMetrics("top_metrics"),
+        TopMetrics("top_metrics"),
 
-		Umrareterms("umrareterms"),
+        Umrareterms("umrareterms"),
 
-		Umsigterms("umsigterms"),
+        Umsigterms("umsigterms"),
 
-		Umterms("umterms"),
+        Umterms("umterms"),
 
-		ValueCount("value_count"),
+        ValueCount("value_count"),
 
-		VariableWidthHistogram("variable_width_histogram"),
+        VariableWidthHistogram("variable_width_histogram"),
 
-		WeightedAvg("weighted_avg"),
+        WeightedAvg("weighted_avg"),
 
-		_Custom(null),
+        _Custom(null),
 
-		;
+        ;
 
-		private final String jsonValue;
+        private final String jsonValue;
 
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
 
-		public String jsonValue() {
-			return this.jsonValue;
-		}
+        public String jsonValue() {
+            return this.jsonValue;
+        }
 
-	}
+    }
 
-	private final Kind _kind;
-	private final AggregateVariant _value;
+    private final Kind _kind;
+    private final AggregateVariant _value;
 
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
 
-	@Override
-	public final AggregateVariant _get() {
-		return _value;
-	}
+    @Override
+    public final AggregateVariant _get() {
+        return _value;
+    }
 
-	public Aggregate(AggregateVariant value) {
+    public Aggregate(AggregateVariant value) {
 
-		this._kind = ApiTypeHelper.requireNonNull(value._aggregateKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+        this._kind = ApiTypeHelper.requireNonNull(value._aggregateKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
 
-	}
+    }
 
-	private Aggregate(Builder builder) {
+    private Aggregate(Builder builder) {
 
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
 
-	}
+    }
 
-	public Aggregate(String kind, JsonData value) {
-		this._kind = Kind._Custom;
-		this._value = (AggregateVariant) value;
-	}
+    public Aggregate(String kind, JsonData value) {
+        this._kind = Kind._Custom;
+        this._value = (AggregateVariant) value;
+    }
 
-	public static Aggregate of(Function<Builder, ObjectBuilder<Aggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static Aggregate of(Function<Builder, ObjectBuilder<Aggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Is this variant instance of kind {@code adjacency_matrix}?
-	 */
-	public boolean isAdjacencyMatrix() {
-		return _kind == Kind.AdjacencyMatrix;
-	}
+    /**
+     * Is this variant instance of kind {@code adjacency_matrix}?
+     */
+    public boolean isAdjacencyMatrix() {
+        return _kind == Kind.AdjacencyMatrix;
+    }
 
-	/**
-	 * Get the {@code adjacency_matrix} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code adjacency_matrix}
-	 *             kind.
-	 */
-	public AdjacencyMatrixAggregate adjacencyMatrix() {
-		return TaggedUnionUtils.get(this, Kind.AdjacencyMatrix);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code auto_date_histogram}?
-	 */
-	public boolean isAutoDateHistogram() {
-		return _kind == Kind.AutoDateHistogram;
-	}
-
-	/**
-	 * Get the {@code auto_date_histogram} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code auto_date_histogram}
-	 *             kind.
-	 */
-	public AutoDateHistogramAggregate autoDateHistogram() {
-		return TaggedUnionUtils.get(this, Kind.AutoDateHistogram);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code avg}?
-	 */
-	public boolean isAvg() {
-		return _kind == Kind.Avg;
-	}
-
-	/**
-	 * Get the {@code avg} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code avg} kind.
-	 */
-	public AvgAggregate avg() {
-		return TaggedUnionUtils.get(this, Kind.Avg);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code box_plot}?
-	 */
-	public boolean isBoxPlot() {
-		return _kind == Kind.BoxPlot;
-	}
-
-	/**
-	 * Get the {@code box_plot} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code box_plot} kind.
-	 */
-	public BoxPlotAggregate boxPlot() {
-		return TaggedUnionUtils.get(this, Kind.BoxPlot);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code bucket_metric_value}?
-	 */
-	public boolean isBucketMetricValue() {
-		return _kind == Kind.BucketMetricValue;
-	}
-
-	/**
-	 * Get the {@code bucket_metric_value} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code bucket_metric_value}
-	 *             kind.
-	 */
-	public BucketMetricValueAggregate bucketMetricValue() {
-		return TaggedUnionUtils.get(this, Kind.BucketMetricValue);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code cardinality}?
-	 */
-	public boolean isCardinality() {
-		return _kind == Kind.Cardinality;
-	}
-
-	/**
-	 * Get the {@code cardinality} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code cardinality} kind.
-	 */
-	public CardinalityAggregate cardinality() {
-		return TaggedUnionUtils.get(this, Kind.Cardinality);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code children}?
-	 */
-	public boolean isChildren() {
-		return _kind == Kind.Children;
-	}
-
-	/**
-	 * Get the {@code children} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code children} kind.
-	 */
-	public ChildrenAggregate children() {
-		return TaggedUnionUtils.get(this, Kind.Children);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code composite}?
-	 */
-	public boolean isComposite() {
-		return _kind == Kind.Composite;
-	}
-
-	/**
-	 * Get the {@code composite} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code composite} kind.
-	 */
-	public CompositeAggregate composite() {
-		return TaggedUnionUtils.get(this, Kind.Composite);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code simple_long_value}?
-	 */
-	public boolean isSimpleLongValue() {
-		return _kind == Kind.SimpleLongValue;
-	}
-
-	/**
-	 * Get the {@code simple_long_value} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code simple_long_value}
-	 *             kind.
-	 */
-	public CumulativeCardinalityAggregate simpleLongValue() {
-		return TaggedUnionUtils.get(this, Kind.SimpleLongValue);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code date_histogram}?
-	 */
-	public boolean isDateHistogram() {
-		return _kind == Kind.DateHistogram;
-	}
-
-	/**
-	 * Get the {@code date_histogram} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code date_histogram} kind.
-	 */
-	public DateHistogramAggregate dateHistogram() {
-		return TaggedUnionUtils.get(this, Kind.DateHistogram);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code date_range}?
-	 */
-	public boolean isDateRange() {
-		return _kind == Kind.DateRange;
-	}
-
-	/**
-	 * Get the {@code date_range} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code date_range} kind.
-	 */
-	public DateRangeAggregate dateRange() {
-		return TaggedUnionUtils.get(this, Kind.DateRange);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code derivative}?
-	 */
-	public boolean isDerivative() {
-		return _kind == Kind.Derivative;
-	}
-
-	/**
-	 * Get the {@code derivative} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code derivative} kind.
-	 */
-	public DerivativeAggregate derivative() {
-		return TaggedUnionUtils.get(this, Kind.Derivative);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code dterms}?
-	 */
-	public boolean isDterms() {
-		return _kind == Kind.Dterms;
-	}
-
-	/**
-	 * Get the {@code dterms} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code dterms} kind.
-	 */
-	public DoubleTermsAggregate dterms() {
-		return TaggedUnionUtils.get(this, Kind.Dterms);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code extended_stats}?
-	 */
-	public boolean isExtendedStats() {
-		return _kind == Kind.ExtendedStats;
-	}
-
-	/**
-	 * Get the {@code extended_stats} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code extended_stats} kind.
-	 */
-	public ExtendedStatsAggregate extendedStats() {
-		return TaggedUnionUtils.get(this, Kind.ExtendedStats);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code extended_stats_bucket}?
-	 */
-	public boolean isExtendedStatsBucket() {
-		return _kind == Kind.ExtendedStatsBucket;
-	}
-
-	/**
-	 * Get the {@code extended_stats_bucket} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the
-	 *             {@code extended_stats_bucket} kind.
-	 */
-	public ExtendedStatsBucketAggregate extendedStatsBucket() {
-		return TaggedUnionUtils.get(this, Kind.ExtendedStatsBucket);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code filter}?
-	 */
-	public boolean isFilter() {
-		return _kind == Kind.Filter;
-	}
-
-	/**
-	 * Get the {@code filter} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code filter} kind.
-	 */
-	public FilterAggregate filter() {
-		return TaggedUnionUtils.get(this, Kind.Filter);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code filters}?
-	 */
-	public boolean isFilters() {
-		return _kind == Kind.Filters;
-	}
-
-	/**
-	 * Get the {@code filters} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code filters} kind.
-	 */
-	public FiltersAggregate filters() {
-		return TaggedUnionUtils.get(this, Kind.Filters);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geo_bounds}?
-	 */
-	public boolean isGeoBounds() {
-		return _kind == Kind.GeoBounds;
-	}
-
-	/**
-	 * Get the {@code geo_bounds} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geo_bounds} kind.
-	 */
-	public GeoBoundsAggregate geoBounds() {
-		return TaggedUnionUtils.get(this, Kind.GeoBounds);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geo_centroid}?
-	 */
-	public boolean isGeoCentroid() {
-		return _kind == Kind.GeoCentroid;
-	}
-
-	/**
-	 * Get the {@code geo_centroid} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geo_centroid} kind.
-	 */
-	public GeoCentroidAggregate geoCentroid() {
-		return TaggedUnionUtils.get(this, Kind.GeoCentroid);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geo_distance}?
-	 */
-	public boolean isGeoDistance() {
-		return _kind == Kind.GeoDistance;
-	}
-
-	/**
-	 * Get the {@code geo_distance} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geo_distance} kind.
-	 */
-	public GeoDistanceAggregate geoDistance() {
-		return TaggedUnionUtils.get(this, Kind.GeoDistance);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geohash_grid}?
-	 */
-	public boolean isGeohashGrid() {
-		return _kind == Kind.GeohashGrid;
-	}
-
-	/**
-	 * Get the {@code geohash_grid} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geohash_grid} kind.
-	 */
-	public GeoHashGridAggregate geohashGrid() {
-		return TaggedUnionUtils.get(this, Kind.GeohashGrid);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geo_line}?
-	 */
-	public boolean isGeoLine() {
-		return _kind == Kind.GeoLine;
-	}
-
-	/**
-	 * Get the {@code geo_line} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geo_line} kind.
-	 */
-	public GeoLineAggregate geoLine() {
-		return TaggedUnionUtils.get(this, Kind.GeoLine);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geotile_grid}?
-	 */
-	public boolean isGeotileGrid() {
-		return _kind == Kind.GeotileGrid;
-	}
-
-	/**
-	 * Get the {@code geotile_grid} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geotile_grid} kind.
-	 */
-	public GeoTileGridAggregate geotileGrid() {
-		return TaggedUnionUtils.get(this, Kind.GeotileGrid);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code global}?
-	 */
-	public boolean isGlobal() {
-		return _kind == Kind.Global;
-	}
-
-	/**
-	 * Get the {@code global} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code global} kind.
-	 */
-	public GlobalAggregate global() {
-		return TaggedUnionUtils.get(this, Kind.Global);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code hdr_percentile_ranks}?
-	 */
-	public boolean isHdrPercentileRanks() {
-		return _kind == Kind.HdrPercentileRanks;
-	}
-
-	/**
-	 * Get the {@code hdr_percentile_ranks} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code hdr_percentile_ranks}
-	 *             kind.
-	 */
-	public HdrPercentileRanksAggregate hdrPercentileRanks() {
-		return TaggedUnionUtils.get(this, Kind.HdrPercentileRanks);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code hdr_percentiles}?
-	 */
-	public boolean isHdrPercentiles() {
-		return _kind == Kind.HdrPercentiles;
-	}
-
-	/**
-	 * Get the {@code hdr_percentiles} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code hdr_percentiles}
-	 *             kind.
-	 */
-	public HdrPercentilesAggregate hdrPercentiles() {
-		return TaggedUnionUtils.get(this, Kind.HdrPercentiles);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code histogram}?
-	 */
-	public boolean isHistogram() {
-		return _kind == Kind.Histogram;
-	}
-
-	/**
-	 * Get the {@code histogram} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code histogram} kind.
-	 */
-	public HistogramAggregate histogram() {
-		return TaggedUnionUtils.get(this, Kind.Histogram);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code inference}?
-	 */
-	public boolean isInference() {
-		return _kind == Kind.Inference;
-	}
-
-	/**
-	 * Get the {@code inference} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code inference} kind.
-	 */
-	public InferenceAggregate inference() {
-		return TaggedUnionUtils.get(this, Kind.Inference);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code ip_range}?
-	 */
-	public boolean isIpRange() {
-		return _kind == Kind.IpRange;
-	}
-
-	/**
-	 * Get the {@code ip_range} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code ip_range} kind.
-	 */
-	public IpRangeAggregate ipRange() {
-		return TaggedUnionUtils.get(this, Kind.IpRange);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code lrareterms}?
-	 */
-	public boolean isLrareterms() {
-		return _kind == Kind.Lrareterms;
-	}
-
-	/**
-	 * Get the {@code lrareterms} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code lrareterms} kind.
-	 */
-	public LongRareTermsAggregate lrareterms() {
-		return TaggedUnionUtils.get(this, Kind.Lrareterms);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code lterms}?
-	 */
-	public boolean isLterms() {
-		return _kind == Kind.Lterms;
-	}
-
-	/**
-	 * Get the {@code lterms} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code lterms} kind.
-	 */
-	public LongTermsAggregate lterms() {
-		return TaggedUnionUtils.get(this, Kind.Lterms);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code matrix_stats}?
-	 */
-	public boolean isMatrixStats() {
-		return _kind == Kind.MatrixStats;
-	}
-
-	/**
-	 * Get the {@code matrix_stats} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code matrix_stats} kind.
-	 */
-	public MatrixStatsAggregate matrixStats() {
-		return TaggedUnionUtils.get(this, Kind.MatrixStats);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code max}?
-	 */
-	public boolean isMax() {
-		return _kind == Kind.Max;
-	}
-
-	/**
-	 * Get the {@code max} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code max} kind.
-	 */
-	public MaxAggregate max() {
-		return TaggedUnionUtils.get(this, Kind.Max);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code median_absolute_deviation}?
-	 */
-	public boolean isMedianAbsoluteDeviation() {
-		return _kind == Kind.MedianAbsoluteDeviation;
-	}
-
-	/**
-	 * Get the {@code median_absolute_deviation} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the
-	 *             {@code median_absolute_deviation} kind.
-	 */
-	public MedianAbsoluteDeviationAggregate medianAbsoluteDeviation() {
-		return TaggedUnionUtils.get(this, Kind.MedianAbsoluteDeviation);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code min}?
-	 */
-	public boolean isMin() {
-		return _kind == Kind.Min;
-	}
-
-	/**
-	 * Get the {@code min} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code min} kind.
-	 */
-	public MinAggregate min() {
-		return TaggedUnionUtils.get(this, Kind.Min);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code missing}?
-	 */
-	public boolean isMissing() {
-		return _kind == Kind.Missing;
-	}
-
-	/**
-	 * Get the {@code missing} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code missing} kind.
-	 */
-	public MissingAggregate missing() {
-		return TaggedUnionUtils.get(this, Kind.Missing);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code multi_terms}?
-	 */
-	public boolean isMultiTerms() {
-		return _kind == Kind.MultiTerms;
-	}
-
-	/**
-	 * Get the {@code multi_terms} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code multi_terms} kind.
-	 */
-	public MultiTermsAggregate multiTerms() {
-		return TaggedUnionUtils.get(this, Kind.MultiTerms);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code nested}?
-	 */
-	public boolean isNested() {
-		return _kind == Kind.Nested;
-	}
-
-	/**
-	 * Get the {@code nested} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code nested} kind.
-	 */
-	public NestedAggregate nested() {
-		return TaggedUnionUtils.get(this, Kind.Nested);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code percentiles_bucket}?
-	 */
-	public boolean isPercentilesBucket() {
-		return _kind == Kind.PercentilesBucket;
-	}
-
-	/**
-	 * Get the {@code percentiles_bucket} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code percentiles_bucket}
-	 *             kind.
-	 */
-	public PercentilesBucketAggregate percentilesBucket() {
-		return TaggedUnionUtils.get(this, Kind.PercentilesBucket);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code range}?
-	 */
-	public boolean isRange() {
-		return _kind == Kind.Range;
-	}
-
-	/**
-	 * Get the {@code range} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code range} kind.
-	 */
-	public RangeAggregate range() {
-		return TaggedUnionUtils.get(this, Kind.Range);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code rate}?
-	 */
-	public boolean isRate() {
-		return _kind == Kind.Rate;
-	}
-
-	/**
-	 * Get the {@code rate} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code rate} kind.
-	 */
-	public RateAggregate rate() {
-		return TaggedUnionUtils.get(this, Kind.Rate);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code reverse_nested}?
-	 */
-	public boolean isReverseNested() {
-		return _kind == Kind.ReverseNested;
-	}
-
-	/**
-	 * Get the {@code reverse_nested} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code reverse_nested} kind.
-	 */
-	public ReverseNestedAggregate reverseNested() {
-		return TaggedUnionUtils.get(this, Kind.ReverseNested);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code sampler}?
-	 */
-	public boolean isSampler() {
-		return _kind == Kind.Sampler;
-	}
-
-	/**
-	 * Get the {@code sampler} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code sampler} kind.
-	 */
-	public SamplerAggregate sampler() {
-		return TaggedUnionUtils.get(this, Kind.Sampler);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code scripted_metric}?
-	 */
-	public boolean isScriptedMetric() {
-		return _kind == Kind.ScriptedMetric;
-	}
-
-	/**
-	 * Get the {@code scripted_metric} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code scripted_metric}
-	 *             kind.
-	 */
-	public ScriptedMetricAggregate scriptedMetric() {
-		return TaggedUnionUtils.get(this, Kind.ScriptedMetric);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code siglterms}?
-	 */
-	public boolean isSiglterms() {
-		return _kind == Kind.Siglterms;
-	}
-
-	/**
-	 * Get the {@code siglterms} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code siglterms} kind.
-	 */
-	public SignificantLongTermsAggregate siglterms() {
-		return TaggedUnionUtils.get(this, Kind.Siglterms);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code sigsterms}?
-	 */
-	public boolean isSigsterms() {
-		return _kind == Kind.Sigsterms;
-	}
-
-	/**
-	 * Get the {@code sigsterms} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code sigsterms} kind.
-	 */
-	public SignificantStringTermsAggregate sigsterms() {
-		return TaggedUnionUtils.get(this, Kind.Sigsterms);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code simple_value}?
-	 */
-	public boolean isSimpleValue() {
-		return _kind == Kind.SimpleValue;
-	}
-
-	/**
-	 * Get the {@code simple_value} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code simple_value} kind.
-	 */
-	public SimpleValueAggregate simpleValue() {
-		return TaggedUnionUtils.get(this, Kind.SimpleValue);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code stats}?
-	 */
-	public boolean isStats() {
-		return _kind == Kind.Stats;
-	}
-
-	/**
-	 * Get the {@code stats} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code stats} kind.
-	 */
-	public StatsAggregate stats() {
-		return TaggedUnionUtils.get(this, Kind.Stats);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code stats_bucket}?
-	 */
-	public boolean isStatsBucket() {
-		return _kind == Kind.StatsBucket;
-	}
-
-	/**
-	 * Get the {@code stats_bucket} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code stats_bucket} kind.
-	 */
-	public StatsBucketAggregate statsBucket() {
-		return TaggedUnionUtils.get(this, Kind.StatsBucket);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code srareterms}?
-	 */
-	public boolean isSrareterms() {
-		return _kind == Kind.Srareterms;
-	}
-
-	/**
-	 * Get the {@code srareterms} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code srareterms} kind.
-	 */
-	public StringRareTermsAggregate srareterms() {
-		return TaggedUnionUtils.get(this, Kind.Srareterms);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code string_stats}?
-	 */
-	public boolean isStringStats() {
-		return _kind == Kind.StringStats;
-	}
-
-	/**
-	 * Get the {@code string_stats} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code string_stats} kind.
-	 */
-	public StringStatsAggregate stringStats() {
-		return TaggedUnionUtils.get(this, Kind.StringStats);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code sterms}?
-	 */
-	public boolean isSterms() {
-		return _kind == Kind.Sterms;
-	}
-
-	/**
-	 * Get the {@code sterms} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code sterms} kind.
-	 */
-	public StringTermsAggregate sterms() {
-		return TaggedUnionUtils.get(this, Kind.Sterms);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code sum}?
-	 */
-	public boolean isSum() {
-		return _kind == Kind.Sum;
-	}
-
-	/**
-	 * Get the {@code sum} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code sum} kind.
-	 */
-	public SumAggregate sum() {
-		return TaggedUnionUtils.get(this, Kind.Sum);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code tdigest_percentile_ranks}?
-	 */
-	public boolean isTdigestPercentileRanks() {
-		return _kind == Kind.TdigestPercentileRanks;
-	}
-
-	/**
-	 * Get the {@code tdigest_percentile_ranks} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the
-	 *             {@code tdigest_percentile_ranks} kind.
-	 */
-	public TDigestPercentileRanksAggregate tdigestPercentileRanks() {
-		return TaggedUnionUtils.get(this, Kind.TdigestPercentileRanks);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code tdigest_percentiles}?
-	 */
-	public boolean isTdigestPercentiles() {
-		return _kind == Kind.TdigestPercentiles;
-	}
-
-	/**
-	 * Get the {@code tdigest_percentiles} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code tdigest_percentiles}
-	 *             kind.
-	 */
-	public TDigestPercentilesAggregate tdigestPercentiles() {
-		return TaggedUnionUtils.get(this, Kind.TdigestPercentiles);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code t_test}?
-	 */
-	public boolean isTTest() {
-		return _kind == Kind.TTest;
-	}
-
-	/**
-	 * Get the {@code t_test} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code t_test} kind.
-	 */
-	public TTestAggregate tTest() {
-		return TaggedUnionUtils.get(this, Kind.TTest);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code top_hits}?
-	 */
-	public boolean isTopHits() {
-		return _kind == Kind.TopHits;
-	}
-
-	/**
-	 * Get the {@code top_hits} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code top_hits} kind.
-	 */
-	public TopHitsAggregate topHits() {
-		return TaggedUnionUtils.get(this, Kind.TopHits);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code top_metrics}?
-	 */
-	public boolean isTopMetrics() {
-		return _kind == Kind.TopMetrics;
-	}
-
-	/**
-	 * Get the {@code top_metrics} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code top_metrics} kind.
-	 */
-	public TopMetricsAggregate topMetrics() {
-		return TaggedUnionUtils.get(this, Kind.TopMetrics);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code umrareterms}?
-	 */
-	public boolean isUmrareterms() {
-		return _kind == Kind.Umrareterms;
-	}
-
-	/**
-	 * Get the {@code umrareterms} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code umrareterms} kind.
-	 */
-	public UnmappedRareTermsAggregate umrareterms() {
-		return TaggedUnionUtils.get(this, Kind.Umrareterms);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code umsigterms}?
-	 */
-	public boolean isUmsigterms() {
-		return _kind == Kind.Umsigterms;
-	}
-
-	/**
-	 * Get the {@code umsigterms} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code umsigterms} kind.
-	 */
-	public UnmappedSignificantTermsAggregate umsigterms() {
-		return TaggedUnionUtils.get(this, Kind.Umsigterms);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code umterms}?
-	 */
-	public boolean isUmterms() {
-		return _kind == Kind.Umterms;
-	}
-
-	/**
-	 * Get the {@code umterms} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code umterms} kind.
-	 */
-	public UnmappedTermsAggregate umterms() {
-		return TaggedUnionUtils.get(this, Kind.Umterms);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code value_count}?
-	 */
-	public boolean isValueCount() {
-		return _kind == Kind.ValueCount;
-	}
-
-	/**
-	 * Get the {@code value_count} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code value_count} kind.
-	 */
-	public ValueCountAggregate valueCount() {
-		return TaggedUnionUtils.get(this, Kind.ValueCount);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code variable_width_histogram}?
-	 */
-	public boolean isVariableWidthHistogram() {
-		return _kind == Kind.VariableWidthHistogram;
-	}
-
-	/**
-	 * Get the {@code variable_width_histogram} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the
-	 *             {@code variable_width_histogram} kind.
-	 */
-	public VariableWidthHistogramAggregate variableWidthHistogram() {
-		return TaggedUnionUtils.get(this, Kind.VariableWidthHistogram);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code weighted_avg}?
-	 */
-	public boolean isWeightedAvg() {
-		return _kind == Kind.WeightedAvg;
-	}
-
-	/**
-	 * Get the {@code weighted_avg} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code weighted_avg} kind.
-	 */
-	public WeightedAvgAggregate weightedAvg() {
-		return TaggedUnionUtils.get(this, Kind.WeightedAvg);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		mapper.serialize(_value, generator);
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Aggregate> {
-		private Kind _kind;
-		private AggregateVariant _value;
-
-		public ObjectBuilder<Aggregate> adjacencyMatrix(AdjacencyMatrixAggregate v) {
-			this._kind = Kind.AdjacencyMatrix;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> adjacencyMatrix(
-				Function<AdjacencyMatrixAggregate.Builder, ObjectBuilder<AdjacencyMatrixAggregate>> fn) {
-			return this.adjacencyMatrix(fn.apply(new AdjacencyMatrixAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> autoDateHistogram(AutoDateHistogramAggregate v) {
-			this._kind = Kind.AutoDateHistogram;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> autoDateHistogram(
-				Function<AutoDateHistogramAggregate.Builder, ObjectBuilder<AutoDateHistogramAggregate>> fn) {
-			return this.autoDateHistogram(fn.apply(new AutoDateHistogramAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> avg(AvgAggregate v) {
-			this._kind = Kind.Avg;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> avg(Function<AvgAggregate.Builder, ObjectBuilder<AvgAggregate>> fn) {
-			return this.avg(fn.apply(new AvgAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> boxPlot(BoxPlotAggregate v) {
-			this._kind = Kind.BoxPlot;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> boxPlot(
-				Function<BoxPlotAggregate.Builder, ObjectBuilder<BoxPlotAggregate>> fn) {
-			return this.boxPlot(fn.apply(new BoxPlotAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> bucketMetricValue(BucketMetricValueAggregate v) {
-			this._kind = Kind.BucketMetricValue;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> bucketMetricValue(
-				Function<BucketMetricValueAggregate.Builder, ObjectBuilder<BucketMetricValueAggregate>> fn) {
-			return this.bucketMetricValue(fn.apply(new BucketMetricValueAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> cardinality(CardinalityAggregate v) {
-			this._kind = Kind.Cardinality;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> cardinality(
-				Function<CardinalityAggregate.Builder, ObjectBuilder<CardinalityAggregate>> fn) {
-			return this.cardinality(fn.apply(new CardinalityAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> children(ChildrenAggregate v) {
-			this._kind = Kind.Children;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> children(
-				Function<ChildrenAggregate.Builder, ObjectBuilder<ChildrenAggregate>> fn) {
-			return this.children(fn.apply(new ChildrenAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> composite(CompositeAggregate v) {
-			this._kind = Kind.Composite;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> composite(
-				Function<CompositeAggregate.Builder, ObjectBuilder<CompositeAggregate>> fn) {
-			return this.composite(fn.apply(new CompositeAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> simpleLongValue(CumulativeCardinalityAggregate v) {
-			this._kind = Kind.SimpleLongValue;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> simpleLongValue(
-				Function<CumulativeCardinalityAggregate.Builder, ObjectBuilder<CumulativeCardinalityAggregate>> fn) {
-			return this.simpleLongValue(fn.apply(new CumulativeCardinalityAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> dateHistogram(DateHistogramAggregate v) {
-			this._kind = Kind.DateHistogram;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> dateHistogram(
-				Function<DateHistogramAggregate.Builder, ObjectBuilder<DateHistogramAggregate>> fn) {
-			return this.dateHistogram(fn.apply(new DateHistogramAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> dateRange(DateRangeAggregate v) {
-			this._kind = Kind.DateRange;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> dateRange(
-				Function<DateRangeAggregate.Builder, ObjectBuilder<DateRangeAggregate>> fn) {
-			return this.dateRange(fn.apply(new DateRangeAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> derivative(DerivativeAggregate v) {
-			this._kind = Kind.Derivative;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> derivative(
-				Function<DerivativeAggregate.Builder, ObjectBuilder<DerivativeAggregate>> fn) {
-			return this.derivative(fn.apply(new DerivativeAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> dterms(DoubleTermsAggregate v) {
-			this._kind = Kind.Dterms;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> dterms(
-				Function<DoubleTermsAggregate.Builder, ObjectBuilder<DoubleTermsAggregate>> fn) {
-			return this.dterms(fn.apply(new DoubleTermsAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> extendedStats(ExtendedStatsAggregate v) {
-			this._kind = Kind.ExtendedStats;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> extendedStats(
-				Function<ExtendedStatsAggregate.Builder, ObjectBuilder<ExtendedStatsAggregate>> fn) {
-			return this.extendedStats(fn.apply(new ExtendedStatsAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> extendedStatsBucket(ExtendedStatsBucketAggregate v) {
-			this._kind = Kind.ExtendedStatsBucket;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> extendedStatsBucket(
-				Function<ExtendedStatsBucketAggregate.Builder, ObjectBuilder<ExtendedStatsBucketAggregate>> fn) {
-			return this.extendedStatsBucket(fn.apply(new ExtendedStatsBucketAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> filter(FilterAggregate v) {
-			this._kind = Kind.Filter;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> filter(Function<FilterAggregate.Builder, ObjectBuilder<FilterAggregate>> fn) {
-			return this.filter(fn.apply(new FilterAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> filters(FiltersAggregate v) {
-			this._kind = Kind.Filters;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> filters(
-				Function<FiltersAggregate.Builder, ObjectBuilder<FiltersAggregate>> fn) {
-			return this.filters(fn.apply(new FiltersAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> geoBounds(GeoBoundsAggregate v) {
-			this._kind = Kind.GeoBounds;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> geoBounds(
-				Function<GeoBoundsAggregate.Builder, ObjectBuilder<GeoBoundsAggregate>> fn) {
-			return this.geoBounds(fn.apply(new GeoBoundsAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> geoCentroid(GeoCentroidAggregate v) {
-			this._kind = Kind.GeoCentroid;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> geoCentroid(
-				Function<GeoCentroidAggregate.Builder, ObjectBuilder<GeoCentroidAggregate>> fn) {
-			return this.geoCentroid(fn.apply(new GeoCentroidAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> geoDistance(GeoDistanceAggregate v) {
-			this._kind = Kind.GeoDistance;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> geoDistance(
-				Function<GeoDistanceAggregate.Builder, ObjectBuilder<GeoDistanceAggregate>> fn) {
-			return this.geoDistance(fn.apply(new GeoDistanceAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> geohashGrid(GeoHashGridAggregate v) {
-			this._kind = Kind.GeohashGrid;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> geohashGrid(
-				Function<GeoHashGridAggregate.Builder, ObjectBuilder<GeoHashGridAggregate>> fn) {
-			return this.geohashGrid(fn.apply(new GeoHashGridAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> geoLine(GeoLineAggregate v) {
-			this._kind = Kind.GeoLine;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> geoLine(
-				Function<GeoLineAggregate.Builder, ObjectBuilder<GeoLineAggregate>> fn) {
-			return this.geoLine(fn.apply(new GeoLineAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> geotileGrid(GeoTileGridAggregate v) {
-			this._kind = Kind.GeotileGrid;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> geotileGrid(
-				Function<GeoTileGridAggregate.Builder, ObjectBuilder<GeoTileGridAggregate>> fn) {
-			return this.geotileGrid(fn.apply(new GeoTileGridAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> global(GlobalAggregate v) {
-			this._kind = Kind.Global;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> global(Function<GlobalAggregate.Builder, ObjectBuilder<GlobalAggregate>> fn) {
-			return this.global(fn.apply(new GlobalAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> hdrPercentileRanks(HdrPercentileRanksAggregate v) {
-			this._kind = Kind.HdrPercentileRanks;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> hdrPercentileRanks(
-				Function<HdrPercentileRanksAggregate.Builder, ObjectBuilder<HdrPercentileRanksAggregate>> fn) {
-			return this.hdrPercentileRanks(fn.apply(new HdrPercentileRanksAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> hdrPercentiles(HdrPercentilesAggregate v) {
-			this._kind = Kind.HdrPercentiles;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> hdrPercentiles(
-				Function<HdrPercentilesAggregate.Builder, ObjectBuilder<HdrPercentilesAggregate>> fn) {
-			return this.hdrPercentiles(fn.apply(new HdrPercentilesAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> histogram(HistogramAggregate v) {
-			this._kind = Kind.Histogram;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> histogram(
-				Function<HistogramAggregate.Builder, ObjectBuilder<HistogramAggregate>> fn) {
-			return this.histogram(fn.apply(new HistogramAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> inference(InferenceAggregate v) {
-			this._kind = Kind.Inference;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> inference(
-				Function<InferenceAggregate.Builder, ObjectBuilder<InferenceAggregate>> fn) {
-			return this.inference(fn.apply(new InferenceAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> ipRange(IpRangeAggregate v) {
-			this._kind = Kind.IpRange;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> ipRange(
-				Function<IpRangeAggregate.Builder, ObjectBuilder<IpRangeAggregate>> fn) {
-			return this.ipRange(fn.apply(new IpRangeAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> lrareterms(LongRareTermsAggregate v) {
-			this._kind = Kind.Lrareterms;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> lrareterms(
-				Function<LongRareTermsAggregate.Builder, ObjectBuilder<LongRareTermsAggregate>> fn) {
-			return this.lrareterms(fn.apply(new LongRareTermsAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> lterms(LongTermsAggregate v) {
-			this._kind = Kind.Lterms;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> lterms(
-				Function<LongTermsAggregate.Builder, ObjectBuilder<LongTermsAggregate>> fn) {
-			return this.lterms(fn.apply(new LongTermsAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> matrixStats(MatrixStatsAggregate v) {
-			this._kind = Kind.MatrixStats;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> matrixStats(
-				Function<MatrixStatsAggregate.Builder, ObjectBuilder<MatrixStatsAggregate>> fn) {
-			return this.matrixStats(fn.apply(new MatrixStatsAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> max(MaxAggregate v) {
-			this._kind = Kind.Max;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> max(Function<MaxAggregate.Builder, ObjectBuilder<MaxAggregate>> fn) {
-			return this.max(fn.apply(new MaxAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> medianAbsoluteDeviation(MedianAbsoluteDeviationAggregate v) {
-			this._kind = Kind.MedianAbsoluteDeviation;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> medianAbsoluteDeviation(
-				Function<MedianAbsoluteDeviationAggregate.Builder, ObjectBuilder<MedianAbsoluteDeviationAggregate>> fn) {
-			return this.medianAbsoluteDeviation(fn.apply(new MedianAbsoluteDeviationAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> min(MinAggregate v) {
-			this._kind = Kind.Min;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> min(Function<MinAggregate.Builder, ObjectBuilder<MinAggregate>> fn) {
-			return this.min(fn.apply(new MinAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> missing(MissingAggregate v) {
-			this._kind = Kind.Missing;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> missing(
-				Function<MissingAggregate.Builder, ObjectBuilder<MissingAggregate>> fn) {
-			return this.missing(fn.apply(new MissingAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> multiTerms(MultiTermsAggregate v) {
-			this._kind = Kind.MultiTerms;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> multiTerms(
-				Function<MultiTermsAggregate.Builder, ObjectBuilder<MultiTermsAggregate>> fn) {
-			return this.multiTerms(fn.apply(new MultiTermsAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> nested(NestedAggregate v) {
-			this._kind = Kind.Nested;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> nested(Function<NestedAggregate.Builder, ObjectBuilder<NestedAggregate>> fn) {
-			return this.nested(fn.apply(new NestedAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> percentilesBucket(PercentilesBucketAggregate v) {
-			this._kind = Kind.PercentilesBucket;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> percentilesBucket(
-				Function<PercentilesBucketAggregate.Builder, ObjectBuilder<PercentilesBucketAggregate>> fn) {
-			return this.percentilesBucket(fn.apply(new PercentilesBucketAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> range(RangeAggregate v) {
-			this._kind = Kind.Range;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> range(Function<RangeAggregate.Builder, ObjectBuilder<RangeAggregate>> fn) {
-			return this.range(fn.apply(new RangeAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> rate(RateAggregate v) {
-			this._kind = Kind.Rate;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> rate(Function<RateAggregate.Builder, ObjectBuilder<RateAggregate>> fn) {
-			return this.rate(fn.apply(new RateAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> reverseNested(ReverseNestedAggregate v) {
-			this._kind = Kind.ReverseNested;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> reverseNested(
-				Function<ReverseNestedAggregate.Builder, ObjectBuilder<ReverseNestedAggregate>> fn) {
-			return this.reverseNested(fn.apply(new ReverseNestedAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> sampler(SamplerAggregate v) {
-			this._kind = Kind.Sampler;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> sampler(
-				Function<SamplerAggregate.Builder, ObjectBuilder<SamplerAggregate>> fn) {
-			return this.sampler(fn.apply(new SamplerAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> scriptedMetric(ScriptedMetricAggregate v) {
-			this._kind = Kind.ScriptedMetric;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> scriptedMetric(
-				Function<ScriptedMetricAggregate.Builder, ObjectBuilder<ScriptedMetricAggregate>> fn) {
-			return this.scriptedMetric(fn.apply(new ScriptedMetricAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> siglterms(SignificantLongTermsAggregate v) {
-			this._kind = Kind.Siglterms;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> siglterms(
-				Function<SignificantLongTermsAggregate.Builder, ObjectBuilder<SignificantLongTermsAggregate>> fn) {
-			return this.siglterms(fn.apply(new SignificantLongTermsAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> sigsterms(SignificantStringTermsAggregate v) {
-			this._kind = Kind.Sigsterms;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> sigsterms(
-				Function<SignificantStringTermsAggregate.Builder, ObjectBuilder<SignificantStringTermsAggregate>> fn) {
-			return this.sigsterms(fn.apply(new SignificantStringTermsAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> simpleValue(SimpleValueAggregate v) {
-			this._kind = Kind.SimpleValue;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> simpleValue(
-				Function<SimpleValueAggregate.Builder, ObjectBuilder<SimpleValueAggregate>> fn) {
-			return this.simpleValue(fn.apply(new SimpleValueAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> stats(StatsAggregate v) {
-			this._kind = Kind.Stats;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> stats(Function<StatsAggregate.Builder, ObjectBuilder<StatsAggregate>> fn) {
-			return this.stats(fn.apply(new StatsAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> statsBucket(StatsBucketAggregate v) {
-			this._kind = Kind.StatsBucket;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> statsBucket(
-				Function<StatsBucketAggregate.Builder, ObjectBuilder<StatsBucketAggregate>> fn) {
-			return this.statsBucket(fn.apply(new StatsBucketAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> srareterms(StringRareTermsAggregate v) {
-			this._kind = Kind.Srareterms;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> srareterms(
-				Function<StringRareTermsAggregate.Builder, ObjectBuilder<StringRareTermsAggregate>> fn) {
-			return this.srareterms(fn.apply(new StringRareTermsAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> stringStats(StringStatsAggregate v) {
-			this._kind = Kind.StringStats;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> stringStats(
-				Function<StringStatsAggregate.Builder, ObjectBuilder<StringStatsAggregate>> fn) {
-			return this.stringStats(fn.apply(new StringStatsAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> sterms(StringTermsAggregate v) {
-			this._kind = Kind.Sterms;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> sterms(
-				Function<StringTermsAggregate.Builder, ObjectBuilder<StringTermsAggregate>> fn) {
-			return this.sterms(fn.apply(new StringTermsAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> sum(SumAggregate v) {
-			this._kind = Kind.Sum;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> sum(Function<SumAggregate.Builder, ObjectBuilder<SumAggregate>> fn) {
-			return this.sum(fn.apply(new SumAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> tdigestPercentileRanks(TDigestPercentileRanksAggregate v) {
-			this._kind = Kind.TdigestPercentileRanks;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> tdigestPercentileRanks(
-				Function<TDigestPercentileRanksAggregate.Builder, ObjectBuilder<TDigestPercentileRanksAggregate>> fn) {
-			return this.tdigestPercentileRanks(fn.apply(new TDigestPercentileRanksAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> tdigestPercentiles(TDigestPercentilesAggregate v) {
-			this._kind = Kind.TdigestPercentiles;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> tdigestPercentiles(
-				Function<TDigestPercentilesAggregate.Builder, ObjectBuilder<TDigestPercentilesAggregate>> fn) {
-			return this.tdigestPercentiles(fn.apply(new TDigestPercentilesAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> tTest(TTestAggregate v) {
-			this._kind = Kind.TTest;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> tTest(Function<TTestAggregate.Builder, ObjectBuilder<TTestAggregate>> fn) {
-			return this.tTest(fn.apply(new TTestAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> topHits(TopHitsAggregate v) {
-			this._kind = Kind.TopHits;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> topHits(
-				Function<TopHitsAggregate.Builder, ObjectBuilder<TopHitsAggregate>> fn) {
-			return this.topHits(fn.apply(new TopHitsAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> topMetrics(TopMetricsAggregate v) {
-			this._kind = Kind.TopMetrics;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> topMetrics(
-				Function<TopMetricsAggregate.Builder, ObjectBuilder<TopMetricsAggregate>> fn) {
-			return this.topMetrics(fn.apply(new TopMetricsAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> umrareterms(UnmappedRareTermsAggregate v) {
-			this._kind = Kind.Umrareterms;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> umrareterms(
-				Function<UnmappedRareTermsAggregate.Builder, ObjectBuilder<UnmappedRareTermsAggregate>> fn) {
-			return this.umrareterms(fn.apply(new UnmappedRareTermsAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> umsigterms(UnmappedSignificantTermsAggregate v) {
-			this._kind = Kind.Umsigterms;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> umsigterms(
-				Function<UnmappedSignificantTermsAggregate.Builder, ObjectBuilder<UnmappedSignificantTermsAggregate>> fn) {
-			return this.umsigterms(fn.apply(new UnmappedSignificantTermsAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> umterms(UnmappedTermsAggregate v) {
-			this._kind = Kind.Umterms;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> umterms(
-				Function<UnmappedTermsAggregate.Builder, ObjectBuilder<UnmappedTermsAggregate>> fn) {
-			return this.umterms(fn.apply(new UnmappedTermsAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> valueCount(ValueCountAggregate v) {
-			this._kind = Kind.ValueCount;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> valueCount(
-				Function<ValueCountAggregate.Builder, ObjectBuilder<ValueCountAggregate>> fn) {
-			return this.valueCount(fn.apply(new ValueCountAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> variableWidthHistogram(VariableWidthHistogramAggregate v) {
-			this._kind = Kind.VariableWidthHistogram;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> variableWidthHistogram(
-				Function<VariableWidthHistogramAggregate.Builder, ObjectBuilder<VariableWidthHistogramAggregate>> fn) {
-			return this.variableWidthHistogram(fn.apply(new VariableWidthHistogramAggregate.Builder()).build());
-		}
-
-		public ObjectBuilder<Aggregate> weightedAvg(WeightedAvgAggregate v) {
-			this._kind = Kind.WeightedAvg;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Aggregate> weightedAvg(
-				Function<WeightedAvgAggregate.Builder, ObjectBuilder<WeightedAvgAggregate>> fn) {
-			return this.weightedAvg(fn.apply(new WeightedAvgAggregate.Builder()).build());
-		}
-
-		public Aggregate build() {
-			_checkSingleUse();
-			return new Aggregate(this);
-		}
-
-	}
-
-	public static final ExternallyTaggedUnion.TypedKeysDeserializer<Aggregate> _TYPED_KEYS_DESERIALIZER;
-
-	static {
-		Map<String, JsonpDeserializer<? extends AggregateVariant>> deserializers = new HashMap<>();
-		deserializers.put("adjacency_matrix", AdjacencyMatrixAggregate._DESERIALIZER);
-		deserializers.put("auto_date_histogram", AutoDateHistogramAggregate._DESERIALIZER);
-		deserializers.put("avg", AvgAggregate._DESERIALIZER);
-		deserializers.put("box_plot", BoxPlotAggregate._DESERIALIZER);
-		deserializers.put("bucket_metric_value", BucketMetricValueAggregate._DESERIALIZER);
-		deserializers.put("cardinality", CardinalityAggregate._DESERIALIZER);
-		deserializers.put("children", ChildrenAggregate._DESERIALIZER);
-		deserializers.put("composite", CompositeAggregate._DESERIALIZER);
-		deserializers.put("simple_long_value", CumulativeCardinalityAggregate._DESERIALIZER);
-		deserializers.put("date_histogram", DateHistogramAggregate._DESERIALIZER);
-		deserializers.put("date_range", DateRangeAggregate._DESERIALIZER);
-		deserializers.put("derivative", DerivativeAggregate._DESERIALIZER);
-		deserializers.put("dterms", DoubleTermsAggregate._DESERIALIZER);
-		deserializers.put("extended_stats", ExtendedStatsAggregate._DESERIALIZER);
-		deserializers.put("extended_stats_bucket", ExtendedStatsBucketAggregate._DESERIALIZER);
-		deserializers.put("filter", FilterAggregate._DESERIALIZER);
-		deserializers.put("filters", FiltersAggregate._DESERIALIZER);
-		deserializers.put("geo_bounds", GeoBoundsAggregate._DESERIALIZER);
-		deserializers.put("geo_centroid", GeoCentroidAggregate._DESERIALIZER);
-		deserializers.put("geo_distance", GeoDistanceAggregate._DESERIALIZER);
-		deserializers.put("geohash_grid", GeoHashGridAggregate._DESERIALIZER);
-		deserializers.put("geo_line", GeoLineAggregate._DESERIALIZER);
-		deserializers.put("geotile_grid", GeoTileGridAggregate._DESERIALIZER);
-		deserializers.put("global", GlobalAggregate._DESERIALIZER);
-		deserializers.put("hdr_percentile_ranks", HdrPercentileRanksAggregate._DESERIALIZER);
-		deserializers.put("hdr_percentiles", HdrPercentilesAggregate._DESERIALIZER);
-		deserializers.put("histogram", HistogramAggregate._DESERIALIZER);
-		deserializers.put("inference", InferenceAggregate._DESERIALIZER);
-		deserializers.put("ip_range", IpRangeAggregate._DESERIALIZER);
-		deserializers.put("lrareterms", LongRareTermsAggregate._DESERIALIZER);
-		deserializers.put("lterms", LongTermsAggregate._DESERIALIZER);
-		deserializers.put("matrix_stats", MatrixStatsAggregate._DESERIALIZER);
-		deserializers.put("max", MaxAggregate._DESERIALIZER);
-		deserializers.put("median_absolute_deviation", MedianAbsoluteDeviationAggregate._DESERIALIZER);
-		deserializers.put("min", MinAggregate._DESERIALIZER);
-		deserializers.put("missing", MissingAggregate._DESERIALIZER);
-		deserializers.put("multi_terms", MultiTermsAggregate._DESERIALIZER);
-		deserializers.put("nested", NestedAggregate._DESERIALIZER);
-		deserializers.put("percentiles_bucket", PercentilesBucketAggregate._DESERIALIZER);
-		deserializers.put("range", RangeAggregate._DESERIALIZER);
-		deserializers.put("rate", RateAggregate._DESERIALIZER);
-		deserializers.put("reverse_nested", ReverseNestedAggregate._DESERIALIZER);
-		deserializers.put("sampler", SamplerAggregate._DESERIALIZER);
-		deserializers.put("scripted_metric", ScriptedMetricAggregate._DESERIALIZER);
-		deserializers.put("siglterms", SignificantLongTermsAggregate._DESERIALIZER);
-		deserializers.put("sigsterms", SignificantStringTermsAggregate._DESERIALIZER);
-		deserializers.put("simple_value", SimpleValueAggregate._DESERIALIZER);
-		deserializers.put("stats", StatsAggregate._DESERIALIZER);
-		deserializers.put("stats_bucket", StatsBucketAggregate._DESERIALIZER);
-		deserializers.put("srareterms", StringRareTermsAggregate._DESERIALIZER);
-		deserializers.put("string_stats", StringStatsAggregate._DESERIALIZER);
-		deserializers.put("sterms", StringTermsAggregate._DESERIALIZER);
-		deserializers.put("sum", SumAggregate._DESERIALIZER);
-		deserializers.put("tdigest_percentile_ranks", TDigestPercentileRanksAggregate._DESERIALIZER);
-		deserializers.put("tdigest_percentiles", TDigestPercentilesAggregate._DESERIALIZER);
-		deserializers.put("t_test", TTestAggregate._DESERIALIZER);
-		deserializers.put("top_hits", TopHitsAggregate._DESERIALIZER);
-		deserializers.put("top_metrics", TopMetricsAggregate._DESERIALIZER);
-		deserializers.put("umrareterms", UnmappedRareTermsAggregate._DESERIALIZER);
-		deserializers.put("umsigterms", UnmappedSignificantTermsAggregate._DESERIALIZER);
-		deserializers.put("umterms", UnmappedTermsAggregate._DESERIALIZER);
-		deserializers.put("value_count", ValueCountAggregate._DESERIALIZER);
-		deserializers.put("variable_width_histogram", VariableWidthHistogramAggregate._DESERIALIZER);
-		deserializers.put("weighted_avg", WeightedAvgAggregate._DESERIALIZER);
-
-		_TYPED_KEYS_DESERIALIZER = new ExternallyTaggedUnion.Deserializer<>(deserializers,
-				Aggregate::new, Aggregate::new).typedKeys();
-	}
+    /**
+     * Get the {@code adjacency_matrix} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code adjacency_matrix}
+     *             kind.
+     */
+    public AdjacencyMatrixAggregate adjacencyMatrix() {
+        return TaggedUnionUtils.get(this, Kind.AdjacencyMatrix);
+    }
+
+    /**
+     * Is this variant instance of kind {@code auto_date_histogram}?
+     */
+    public boolean isAutoDateHistogram() {
+        return _kind == Kind.AutoDateHistogram;
+    }
+
+    /**
+     * Get the {@code auto_date_histogram} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code auto_date_histogram}
+     *             kind.
+     */
+    public AutoDateHistogramAggregate autoDateHistogram() {
+        return TaggedUnionUtils.get(this, Kind.AutoDateHistogram);
+    }
+
+    /**
+     * Is this variant instance of kind {@code avg}?
+     */
+    public boolean isAvg() {
+        return _kind == Kind.Avg;
+    }
+
+    /**
+     * Get the {@code avg} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code avg} kind.
+     */
+    public AvgAggregate avg() {
+        return TaggedUnionUtils.get(this, Kind.Avg);
+    }
+
+    /**
+     * Is this variant instance of kind {@code box_plot}?
+     */
+    public boolean isBoxPlot() {
+        return _kind == Kind.BoxPlot;
+    }
+
+    /**
+     * Get the {@code box_plot} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code box_plot} kind.
+     */
+    public BoxPlotAggregate boxPlot() {
+        return TaggedUnionUtils.get(this, Kind.BoxPlot);
+    }
+
+    /**
+     * Is this variant instance of kind {@code bucket_metric_value}?
+     */
+    public boolean isBucketMetricValue() {
+        return _kind == Kind.BucketMetricValue;
+    }
+
+    /**
+     * Get the {@code bucket_metric_value} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code bucket_metric_value}
+     *             kind.
+     */
+    public BucketMetricValueAggregate bucketMetricValue() {
+        return TaggedUnionUtils.get(this, Kind.BucketMetricValue);
+    }
+
+    /**
+     * Is this variant instance of kind {@code cardinality}?
+     */
+    public boolean isCardinality() {
+        return _kind == Kind.Cardinality;
+    }
+
+    /**
+     * Get the {@code cardinality} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code cardinality} kind.
+     */
+    public CardinalityAggregate cardinality() {
+        return TaggedUnionUtils.get(this, Kind.Cardinality);
+    }
+
+    /**
+     * Is this variant instance of kind {@code children}?
+     */
+    public boolean isChildren() {
+        return _kind == Kind.Children;
+    }
+
+    /**
+     * Get the {@code children} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code children} kind.
+     */
+    public ChildrenAggregate children() {
+        return TaggedUnionUtils.get(this, Kind.Children);
+    }
+
+    /**
+     * Is this variant instance of kind {@code composite}?
+     */
+    public boolean isComposite() {
+        return _kind == Kind.Composite;
+    }
+
+    /**
+     * Get the {@code composite} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code composite} kind.
+     */
+    public CompositeAggregate composite() {
+        return TaggedUnionUtils.get(this, Kind.Composite);
+    }
+
+    /**
+     * Is this variant instance of kind {@code simple_long_value}?
+     */
+    public boolean isSimpleLongValue() {
+        return _kind == Kind.SimpleLongValue;
+    }
+
+    /**
+     * Get the {@code simple_long_value} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code simple_long_value}
+     *             kind.
+     */
+    public CumulativeCardinalityAggregate simpleLongValue() {
+        return TaggedUnionUtils.get(this, Kind.SimpleLongValue);
+    }
+
+    /**
+     * Is this variant instance of kind {@code date_histogram}?
+     */
+    public boolean isDateHistogram() {
+        return _kind == Kind.DateHistogram;
+    }
+
+    /**
+     * Get the {@code date_histogram} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code date_histogram} kind.
+     */
+    public DateHistogramAggregate dateHistogram() {
+        return TaggedUnionUtils.get(this, Kind.DateHistogram);
+    }
+
+    /**
+     * Is this variant instance of kind {@code date_range}?
+     */
+    public boolean isDateRange() {
+        return _kind == Kind.DateRange;
+    }
+
+    /**
+     * Get the {@code date_range} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code date_range} kind.
+     */
+    public DateRangeAggregate dateRange() {
+        return TaggedUnionUtils.get(this, Kind.DateRange);
+    }
+
+    /**
+     * Is this variant instance of kind {@code derivative}?
+     */
+    public boolean isDerivative() {
+        return _kind == Kind.Derivative;
+    }
+
+    /**
+     * Get the {@code derivative} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code derivative} kind.
+     */
+    public DerivativeAggregate derivative() {
+        return TaggedUnionUtils.get(this, Kind.Derivative);
+    }
+
+    /**
+     * Is this variant instance of kind {@code dterms}?
+     */
+    public boolean isDterms() {
+        return _kind == Kind.Dterms;
+    }
+
+    /**
+     * Get the {@code dterms} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code dterms} kind.
+     */
+    public DoubleTermsAggregate dterms() {
+        return TaggedUnionUtils.get(this, Kind.Dterms);
+    }
+
+    /**
+     * Is this variant instance of kind {@code extended_stats}?
+     */
+    public boolean isExtendedStats() {
+        return _kind == Kind.ExtendedStats;
+    }
+
+    /**
+     * Get the {@code extended_stats} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code extended_stats} kind.
+     */
+    public ExtendedStatsAggregate extendedStats() {
+        return TaggedUnionUtils.get(this, Kind.ExtendedStats);
+    }
+
+    /**
+     * Is this variant instance of kind {@code extended_stats_bucket}?
+     */
+    public boolean isExtendedStatsBucket() {
+        return _kind == Kind.ExtendedStatsBucket;
+    }
+
+    /**
+     * Get the {@code extended_stats_bucket} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the
+     *             {@code extended_stats_bucket} kind.
+     */
+    public ExtendedStatsBucketAggregate extendedStatsBucket() {
+        return TaggedUnionUtils.get(this, Kind.ExtendedStatsBucket);
+    }
+
+    /**
+     * Is this variant instance of kind {@code filter}?
+     */
+    public boolean isFilter() {
+        return _kind == Kind.Filter;
+    }
+
+    /**
+     * Get the {@code filter} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code filter} kind.
+     */
+    public FilterAggregate filter() {
+        return TaggedUnionUtils.get(this, Kind.Filter);
+    }
+
+    /**
+     * Is this variant instance of kind {@code filters}?
+     */
+    public boolean isFilters() {
+        return _kind == Kind.Filters;
+    }
+
+    /**
+     * Get the {@code filters} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code filters} kind.
+     */
+    public FiltersAggregate filters() {
+        return TaggedUnionUtils.get(this, Kind.Filters);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geo_bounds}?
+     */
+    public boolean isGeoBounds() {
+        return _kind == Kind.GeoBounds;
+    }
+
+    /**
+     * Get the {@code geo_bounds} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geo_bounds} kind.
+     */
+    public GeoBoundsAggregate geoBounds() {
+        return TaggedUnionUtils.get(this, Kind.GeoBounds);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geo_centroid}?
+     */
+    public boolean isGeoCentroid() {
+        return _kind == Kind.GeoCentroid;
+    }
+
+    /**
+     * Get the {@code geo_centroid} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geo_centroid} kind.
+     */
+    public GeoCentroidAggregate geoCentroid() {
+        return TaggedUnionUtils.get(this, Kind.GeoCentroid);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geo_distance}?
+     */
+    public boolean isGeoDistance() {
+        return _kind == Kind.GeoDistance;
+    }
+
+    /**
+     * Get the {@code geo_distance} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geo_distance} kind.
+     */
+    public GeoDistanceAggregate geoDistance() {
+        return TaggedUnionUtils.get(this, Kind.GeoDistance);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geohash_grid}?
+     */
+    public boolean isGeohashGrid() {
+        return _kind == Kind.GeohashGrid;
+    }
+
+    /**
+     * Get the {@code geohash_grid} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geohash_grid} kind.
+     */
+    public GeoHashGridAggregate geohashGrid() {
+        return TaggedUnionUtils.get(this, Kind.GeohashGrid);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geo_line}?
+     */
+    public boolean isGeoLine() {
+        return _kind == Kind.GeoLine;
+    }
+
+    /**
+     * Get the {@code geo_line} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geo_line} kind.
+     */
+    public GeoLineAggregate geoLine() {
+        return TaggedUnionUtils.get(this, Kind.GeoLine);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geotile_grid}?
+     */
+    public boolean isGeotileGrid() {
+        return _kind == Kind.GeotileGrid;
+    }
+
+    /**
+     * Get the {@code geotile_grid} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geotile_grid} kind.
+     */
+    public GeoTileGridAggregate geotileGrid() {
+        return TaggedUnionUtils.get(this, Kind.GeotileGrid);
+    }
+
+    /**
+     * Is this variant instance of kind {@code global}?
+     */
+    public boolean isGlobal() {
+        return _kind == Kind.Global;
+    }
+
+    /**
+     * Get the {@code global} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code global} kind.
+     */
+    public GlobalAggregate global() {
+        return TaggedUnionUtils.get(this, Kind.Global);
+    }
+
+    /**
+     * Is this variant instance of kind {@code hdr_percentile_ranks}?
+     */
+    public boolean isHdrPercentileRanks() {
+        return _kind == Kind.HdrPercentileRanks;
+    }
+
+    /**
+     * Get the {@code hdr_percentile_ranks} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code hdr_percentile_ranks}
+     *             kind.
+     */
+    public HdrPercentileRanksAggregate hdrPercentileRanks() {
+        return TaggedUnionUtils.get(this, Kind.HdrPercentileRanks);
+    }
+
+    /**
+     * Is this variant instance of kind {@code hdr_percentiles}?
+     */
+    public boolean isHdrPercentiles() {
+        return _kind == Kind.HdrPercentiles;
+    }
+
+    /**
+     * Get the {@code hdr_percentiles} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code hdr_percentiles}
+     *             kind.
+     */
+    public HdrPercentilesAggregate hdrPercentiles() {
+        return TaggedUnionUtils.get(this, Kind.HdrPercentiles);
+    }
+
+    /**
+     * Is this variant instance of kind {@code histogram}?
+     */
+    public boolean isHistogram() {
+        return _kind == Kind.Histogram;
+    }
+
+    /**
+     * Get the {@code histogram} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code histogram} kind.
+     */
+    public HistogramAggregate histogram() {
+        return TaggedUnionUtils.get(this, Kind.Histogram);
+    }
+
+    /**
+     * Is this variant instance of kind {@code inference}?
+     */
+    public boolean isInference() {
+        return _kind == Kind.Inference;
+    }
+
+    /**
+     * Get the {@code inference} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code inference} kind.
+     */
+    public InferenceAggregate inference() {
+        return TaggedUnionUtils.get(this, Kind.Inference);
+    }
+
+    /**
+     * Is this variant instance of kind {@code ip_range}?
+     */
+    public boolean isIpRange() {
+        return _kind == Kind.IpRange;
+    }
+
+    /**
+     * Get the {@code ip_range} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code ip_range} kind.
+     */
+    public IpRangeAggregate ipRange() {
+        return TaggedUnionUtils.get(this, Kind.IpRange);
+    }
+
+    /**
+     * Is this variant instance of kind {@code lrareterms}?
+     */
+    public boolean isLrareterms() {
+        return _kind == Kind.Lrareterms;
+    }
+
+    /**
+     * Get the {@code lrareterms} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code lrareterms} kind.
+     */
+    public LongRareTermsAggregate lrareterms() {
+        return TaggedUnionUtils.get(this, Kind.Lrareterms);
+    }
+
+    /**
+     * Is this variant instance of kind {@code lterms}?
+     */
+    public boolean isLterms() {
+        return _kind == Kind.Lterms;
+    }
+
+    /**
+     * Get the {@code lterms} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code lterms} kind.
+     */
+    public LongTermsAggregate lterms() {
+        return TaggedUnionUtils.get(this, Kind.Lterms);
+    }
+
+    /**
+     * Is this variant instance of kind {@code matrix_stats}?
+     */
+    public boolean isMatrixStats() {
+        return _kind == Kind.MatrixStats;
+    }
+
+    /**
+     * Get the {@code matrix_stats} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code matrix_stats} kind.
+     */
+    public MatrixStatsAggregate matrixStats() {
+        return TaggedUnionUtils.get(this, Kind.MatrixStats);
+    }
+
+    /**
+     * Is this variant instance of kind {@code max}?
+     */
+    public boolean isMax() {
+        return _kind == Kind.Max;
+    }
+
+    /**
+     * Get the {@code max} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code max} kind.
+     */
+    public MaxAggregate max() {
+        return TaggedUnionUtils.get(this, Kind.Max);
+    }
+
+    /**
+     * Is this variant instance of kind {@code median_absolute_deviation}?
+     */
+    public boolean isMedianAbsoluteDeviation() {
+        return _kind == Kind.MedianAbsoluteDeviation;
+    }
+
+    /**
+     * Get the {@code median_absolute_deviation} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the
+     *             {@code median_absolute_deviation} kind.
+     */
+    public MedianAbsoluteDeviationAggregate medianAbsoluteDeviation() {
+        return TaggedUnionUtils.get(this, Kind.MedianAbsoluteDeviation);
+    }
+
+    /**
+     * Is this variant instance of kind {@code min}?
+     */
+    public boolean isMin() {
+        return _kind == Kind.Min;
+    }
+
+    /**
+     * Get the {@code min} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code min} kind.
+     */
+    public MinAggregate min() {
+        return TaggedUnionUtils.get(this, Kind.Min);
+    }
+
+    /**
+     * Is this variant instance of kind {@code missing}?
+     */
+    public boolean isMissing() {
+        return _kind == Kind.Missing;
+    }
+
+    /**
+     * Get the {@code missing} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code missing} kind.
+     */
+    public MissingAggregate missing() {
+        return TaggedUnionUtils.get(this, Kind.Missing);
+    }
+
+    /**
+     * Is this variant instance of kind {@code multi_terms}?
+     */
+    public boolean isMultiTerms() {
+        return _kind == Kind.MultiTerms;
+    }
+
+    /**
+     * Get the {@code multi_terms} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code multi_terms} kind.
+     */
+    public MultiTermsAggregate multiTerms() {
+        return TaggedUnionUtils.get(this, Kind.MultiTerms);
+    }
+
+    /**
+     * Is this variant instance of kind {@code nested}?
+     */
+    public boolean isNested() {
+        return _kind == Kind.Nested;
+    }
+
+    /**
+     * Get the {@code nested} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code nested} kind.
+     */
+    public NestedAggregate nested() {
+        return TaggedUnionUtils.get(this, Kind.Nested);
+    }
+
+    /**
+     * Is this variant instance of kind {@code percentiles_bucket}?
+     */
+    public boolean isPercentilesBucket() {
+        return _kind == Kind.PercentilesBucket;
+    }
+
+    /**
+     * Get the {@code percentiles_bucket} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code percentiles_bucket}
+     *             kind.
+     */
+    public PercentilesBucketAggregate percentilesBucket() {
+        return TaggedUnionUtils.get(this, Kind.PercentilesBucket);
+    }
+
+    /**
+     * Is this variant instance of kind {@code range}?
+     */
+    public boolean isRange() {
+        return _kind == Kind.Range;
+    }
+
+    /**
+     * Get the {@code range} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code range} kind.
+     */
+    public RangeAggregate range() {
+        return TaggedUnionUtils.get(this, Kind.Range);
+    }
+
+    /**
+     * Is this variant instance of kind {@code rate}?
+     */
+    public boolean isRate() {
+        return _kind == Kind.Rate;
+    }
+
+    /**
+     * Get the {@code rate} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code rate} kind.
+     */
+    public RateAggregate rate() {
+        return TaggedUnionUtils.get(this, Kind.Rate);
+    }
+
+    /**
+     * Is this variant instance of kind {@code reverse_nested}?
+     */
+    public boolean isReverseNested() {
+        return _kind == Kind.ReverseNested;
+    }
+
+    /**
+     * Get the {@code reverse_nested} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code reverse_nested} kind.
+     */
+    public ReverseNestedAggregate reverseNested() {
+        return TaggedUnionUtils.get(this, Kind.ReverseNested);
+    }
+
+    /**
+     * Is this variant instance of kind {@code sampler}?
+     */
+    public boolean isSampler() {
+        return _kind == Kind.Sampler;
+    }
+
+    /**
+     * Get the {@code sampler} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code sampler} kind.
+     */
+    public SamplerAggregate sampler() {
+        return TaggedUnionUtils.get(this, Kind.Sampler);
+    }
+
+    /**
+     * Is this variant instance of kind {@code scripted_metric}?
+     */
+    public boolean isScriptedMetric() {
+        return _kind == Kind.ScriptedMetric;
+    }
+
+    /**
+     * Get the {@code scripted_metric} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code scripted_metric}
+     *             kind.
+     */
+    public ScriptedMetricAggregate scriptedMetric() {
+        return TaggedUnionUtils.get(this, Kind.ScriptedMetric);
+    }
+
+    /**
+     * Is this variant instance of kind {@code siglterms}?
+     */
+    public boolean isSiglterms() {
+        return _kind == Kind.Siglterms;
+    }
+
+    /**
+     * Get the {@code siglterms} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code siglterms} kind.
+     */
+    public SignificantLongTermsAggregate siglterms() {
+        return TaggedUnionUtils.get(this, Kind.Siglterms);
+    }
+
+    /**
+     * Is this variant instance of kind {@code sigsterms}?
+     */
+    public boolean isSigsterms() {
+        return _kind == Kind.Sigsterms;
+    }
+
+    /**
+     * Get the {@code sigsterms} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code sigsterms} kind.
+     */
+    public SignificantStringTermsAggregate sigsterms() {
+        return TaggedUnionUtils.get(this, Kind.Sigsterms);
+    }
+
+    /**
+     * Is this variant instance of kind {@code simple_value}?
+     */
+    public boolean isSimpleValue() {
+        return _kind == Kind.SimpleValue;
+    }
+
+    /**
+     * Get the {@code simple_value} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code simple_value} kind.
+     */
+    public SimpleValueAggregate simpleValue() {
+        return TaggedUnionUtils.get(this, Kind.SimpleValue);
+    }
+
+    /**
+     * Is this variant instance of kind {@code stats}?
+     */
+    public boolean isStats() {
+        return _kind == Kind.Stats;
+    }
+
+    /**
+     * Get the {@code stats} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code stats} kind.
+     */
+    public StatsAggregate stats() {
+        return TaggedUnionUtils.get(this, Kind.Stats);
+    }
+
+    /**
+     * Is this variant instance of kind {@code stats_bucket}?
+     */
+    public boolean isStatsBucket() {
+        return _kind == Kind.StatsBucket;
+    }
+
+    /**
+     * Get the {@code stats_bucket} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code stats_bucket} kind.
+     */
+    public StatsBucketAggregate statsBucket() {
+        return TaggedUnionUtils.get(this, Kind.StatsBucket);
+    }
+
+    /**
+     * Is this variant instance of kind {@code srareterms}?
+     */
+    public boolean isSrareterms() {
+        return _kind == Kind.Srareterms;
+    }
+
+    /**
+     * Get the {@code srareterms} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code srareterms} kind.
+     */
+    public StringRareTermsAggregate srareterms() {
+        return TaggedUnionUtils.get(this, Kind.Srareterms);
+    }
+
+    /**
+     * Is this variant instance of kind {@code string_stats}?
+     */
+    public boolean isStringStats() {
+        return _kind == Kind.StringStats;
+    }
+
+    /**
+     * Get the {@code string_stats} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code string_stats} kind.
+     */
+    public StringStatsAggregate stringStats() {
+        return TaggedUnionUtils.get(this, Kind.StringStats);
+    }
+
+    /**
+     * Is this variant instance of kind {@code sterms}?
+     */
+    public boolean isSterms() {
+        return _kind == Kind.Sterms;
+    }
+
+    /**
+     * Get the {@code sterms} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code sterms} kind.
+     */
+    public StringTermsAggregate sterms() {
+        return TaggedUnionUtils.get(this, Kind.Sterms);
+    }
+
+    /**
+     * Is this variant instance of kind {@code sum}?
+     */
+    public boolean isSum() {
+        return _kind == Kind.Sum;
+    }
+
+    /**
+     * Get the {@code sum} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code sum} kind.
+     */
+    public SumAggregate sum() {
+        return TaggedUnionUtils.get(this, Kind.Sum);
+    }
+
+    /**
+     * Is this variant instance of kind {@code tdigest_percentile_ranks}?
+     */
+    public boolean isTdigestPercentileRanks() {
+        return _kind == Kind.TdigestPercentileRanks;
+    }
+
+    /**
+     * Get the {@code tdigest_percentile_ranks} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the
+     *             {@code tdigest_percentile_ranks} kind.
+     */
+    public TDigestPercentileRanksAggregate tdigestPercentileRanks() {
+        return TaggedUnionUtils.get(this, Kind.TdigestPercentileRanks);
+    }
+
+    /**
+     * Is this variant instance of kind {@code tdigest_percentiles}?
+     */
+    public boolean isTdigestPercentiles() {
+        return _kind == Kind.TdigestPercentiles;
+    }
+
+    /**
+     * Get the {@code tdigest_percentiles} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code tdigest_percentiles}
+     *             kind.
+     */
+    public TDigestPercentilesAggregate tdigestPercentiles() {
+        return TaggedUnionUtils.get(this, Kind.TdigestPercentiles);
+    }
+
+    /**
+     * Is this variant instance of kind {@code t_test}?
+     */
+    public boolean isTTest() {
+        return _kind == Kind.TTest;
+    }
+
+    /**
+     * Get the {@code t_test} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code t_test} kind.
+     */
+    public TTestAggregate tTest() {
+        return TaggedUnionUtils.get(this, Kind.TTest);
+    }
+
+    /**
+     * Is this variant instance of kind {@code top_hits}?
+     */
+    public boolean isTopHits() {
+        return _kind == Kind.TopHits;
+    }
+
+    /**
+     * Get the {@code top_hits} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code top_hits} kind.
+     */
+    public TopHitsAggregate topHits() {
+        return TaggedUnionUtils.get(this, Kind.TopHits);
+    }
+
+    /**
+     * Is this variant instance of kind {@code top_metrics}?
+     */
+    public boolean isTopMetrics() {
+        return _kind == Kind.TopMetrics;
+    }
+
+    /**
+     * Get the {@code top_metrics} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code top_metrics} kind.
+     */
+    public TopMetricsAggregate topMetrics() {
+        return TaggedUnionUtils.get(this, Kind.TopMetrics);
+    }
+
+    /**
+     * Is this variant instance of kind {@code umrareterms}?
+     */
+    public boolean isUmrareterms() {
+        return _kind == Kind.Umrareterms;
+    }
+
+    /**
+     * Get the {@code umrareterms} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code umrareterms} kind.
+     */
+    public UnmappedRareTermsAggregate umrareterms() {
+        return TaggedUnionUtils.get(this, Kind.Umrareterms);
+    }
+
+    /**
+     * Is this variant instance of kind {@code umsigterms}?
+     */
+    public boolean isUmsigterms() {
+        return _kind == Kind.Umsigterms;
+    }
+
+    /**
+     * Get the {@code umsigterms} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code umsigterms} kind.
+     */
+    public UnmappedSignificantTermsAggregate umsigterms() {
+        return TaggedUnionUtils.get(this, Kind.Umsigterms);
+    }
+
+    /**
+     * Is this variant instance of kind {@code umterms}?
+     */
+    public boolean isUmterms() {
+        return _kind == Kind.Umterms;
+    }
+
+    /**
+     * Get the {@code umterms} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code umterms} kind.
+     */
+    public UnmappedTermsAggregate umterms() {
+        return TaggedUnionUtils.get(this, Kind.Umterms);
+    }
+
+    /**
+     * Is this variant instance of kind {@code value_count}?
+     */
+    public boolean isValueCount() {
+        return _kind == Kind.ValueCount;
+    }
+
+    /**
+     * Get the {@code value_count} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code value_count} kind.
+     */
+    public ValueCountAggregate valueCount() {
+        return TaggedUnionUtils.get(this, Kind.ValueCount);
+    }
+
+    /**
+     * Is this variant instance of kind {@code variable_width_histogram}?
+     */
+    public boolean isVariableWidthHistogram() {
+        return _kind == Kind.VariableWidthHistogram;
+    }
+
+    /**
+     * Get the {@code variable_width_histogram} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the
+     *             {@code variable_width_histogram} kind.
+     */
+    public VariableWidthHistogramAggregate variableWidthHistogram() {
+        return TaggedUnionUtils.get(this, Kind.VariableWidthHistogram);
+    }
+
+    /**
+     * Is this variant instance of kind {@code weighted_avg}?
+     */
+    public boolean isWeightedAvg() {
+        return _kind == Kind.WeightedAvg;
+    }
+
+    /**
+     * Get the {@code weighted_avg} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code weighted_avg} kind.
+     */
+    public WeightedAvgAggregate weightedAvg() {
+        return TaggedUnionUtils.get(this, Kind.WeightedAvg);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        mapper.serialize(_value, generator);
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Aggregate> {
+        private Kind _kind;
+        private AggregateVariant _value;
+
+        public ObjectBuilder<Aggregate> adjacencyMatrix(AdjacencyMatrixAggregate v) {
+            this._kind = Kind.AdjacencyMatrix;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> adjacencyMatrix(
+            Function<AdjacencyMatrixAggregate.Builder, ObjectBuilder<AdjacencyMatrixAggregate>> fn
+        ) {
+            return this.adjacencyMatrix(fn.apply(new AdjacencyMatrixAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> autoDateHistogram(AutoDateHistogramAggregate v) {
+            this._kind = Kind.AutoDateHistogram;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> autoDateHistogram(
+            Function<AutoDateHistogramAggregate.Builder, ObjectBuilder<AutoDateHistogramAggregate>> fn
+        ) {
+            return this.autoDateHistogram(fn.apply(new AutoDateHistogramAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> avg(AvgAggregate v) {
+            this._kind = Kind.Avg;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> avg(Function<AvgAggregate.Builder, ObjectBuilder<AvgAggregate>> fn) {
+            return this.avg(fn.apply(new AvgAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> boxPlot(BoxPlotAggregate v) {
+            this._kind = Kind.BoxPlot;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> boxPlot(Function<BoxPlotAggregate.Builder, ObjectBuilder<BoxPlotAggregate>> fn) {
+            return this.boxPlot(fn.apply(new BoxPlotAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> bucketMetricValue(BucketMetricValueAggregate v) {
+            this._kind = Kind.BucketMetricValue;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> bucketMetricValue(
+            Function<BucketMetricValueAggregate.Builder, ObjectBuilder<BucketMetricValueAggregate>> fn
+        ) {
+            return this.bucketMetricValue(fn.apply(new BucketMetricValueAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> cardinality(CardinalityAggregate v) {
+            this._kind = Kind.Cardinality;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> cardinality(Function<CardinalityAggregate.Builder, ObjectBuilder<CardinalityAggregate>> fn) {
+            return this.cardinality(fn.apply(new CardinalityAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> children(ChildrenAggregate v) {
+            this._kind = Kind.Children;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> children(Function<ChildrenAggregate.Builder, ObjectBuilder<ChildrenAggregate>> fn) {
+            return this.children(fn.apply(new ChildrenAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> composite(CompositeAggregate v) {
+            this._kind = Kind.Composite;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> composite(Function<CompositeAggregate.Builder, ObjectBuilder<CompositeAggregate>> fn) {
+            return this.composite(fn.apply(new CompositeAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> simpleLongValue(CumulativeCardinalityAggregate v) {
+            this._kind = Kind.SimpleLongValue;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> simpleLongValue(
+            Function<CumulativeCardinalityAggregate.Builder, ObjectBuilder<CumulativeCardinalityAggregate>> fn
+        ) {
+            return this.simpleLongValue(fn.apply(new CumulativeCardinalityAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> dateHistogram(DateHistogramAggregate v) {
+            this._kind = Kind.DateHistogram;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> dateHistogram(Function<DateHistogramAggregate.Builder, ObjectBuilder<DateHistogramAggregate>> fn) {
+            return this.dateHistogram(fn.apply(new DateHistogramAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> dateRange(DateRangeAggregate v) {
+            this._kind = Kind.DateRange;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> dateRange(Function<DateRangeAggregate.Builder, ObjectBuilder<DateRangeAggregate>> fn) {
+            return this.dateRange(fn.apply(new DateRangeAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> derivative(DerivativeAggregate v) {
+            this._kind = Kind.Derivative;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> derivative(Function<DerivativeAggregate.Builder, ObjectBuilder<DerivativeAggregate>> fn) {
+            return this.derivative(fn.apply(new DerivativeAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> dterms(DoubleTermsAggregate v) {
+            this._kind = Kind.Dterms;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> dterms(Function<DoubleTermsAggregate.Builder, ObjectBuilder<DoubleTermsAggregate>> fn) {
+            return this.dterms(fn.apply(new DoubleTermsAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> extendedStats(ExtendedStatsAggregate v) {
+            this._kind = Kind.ExtendedStats;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> extendedStats(Function<ExtendedStatsAggregate.Builder, ObjectBuilder<ExtendedStatsAggregate>> fn) {
+            return this.extendedStats(fn.apply(new ExtendedStatsAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> extendedStatsBucket(ExtendedStatsBucketAggregate v) {
+            this._kind = Kind.ExtendedStatsBucket;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> extendedStatsBucket(
+            Function<ExtendedStatsBucketAggregate.Builder, ObjectBuilder<ExtendedStatsBucketAggregate>> fn
+        ) {
+            return this.extendedStatsBucket(fn.apply(new ExtendedStatsBucketAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> filter(FilterAggregate v) {
+            this._kind = Kind.Filter;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> filter(Function<FilterAggregate.Builder, ObjectBuilder<FilterAggregate>> fn) {
+            return this.filter(fn.apply(new FilterAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> filters(FiltersAggregate v) {
+            this._kind = Kind.Filters;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> filters(Function<FiltersAggregate.Builder, ObjectBuilder<FiltersAggregate>> fn) {
+            return this.filters(fn.apply(new FiltersAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> geoBounds(GeoBoundsAggregate v) {
+            this._kind = Kind.GeoBounds;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> geoBounds(Function<GeoBoundsAggregate.Builder, ObjectBuilder<GeoBoundsAggregate>> fn) {
+            return this.geoBounds(fn.apply(new GeoBoundsAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> geoCentroid(GeoCentroidAggregate v) {
+            this._kind = Kind.GeoCentroid;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> geoCentroid(Function<GeoCentroidAggregate.Builder, ObjectBuilder<GeoCentroidAggregate>> fn) {
+            return this.geoCentroid(fn.apply(new GeoCentroidAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> geoDistance(GeoDistanceAggregate v) {
+            this._kind = Kind.GeoDistance;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> geoDistance(Function<GeoDistanceAggregate.Builder, ObjectBuilder<GeoDistanceAggregate>> fn) {
+            return this.geoDistance(fn.apply(new GeoDistanceAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> geohashGrid(GeoHashGridAggregate v) {
+            this._kind = Kind.GeohashGrid;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> geohashGrid(Function<GeoHashGridAggregate.Builder, ObjectBuilder<GeoHashGridAggregate>> fn) {
+            return this.geohashGrid(fn.apply(new GeoHashGridAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> geoLine(GeoLineAggregate v) {
+            this._kind = Kind.GeoLine;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> geoLine(Function<GeoLineAggregate.Builder, ObjectBuilder<GeoLineAggregate>> fn) {
+            return this.geoLine(fn.apply(new GeoLineAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> geotileGrid(GeoTileGridAggregate v) {
+            this._kind = Kind.GeotileGrid;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> geotileGrid(Function<GeoTileGridAggregate.Builder, ObjectBuilder<GeoTileGridAggregate>> fn) {
+            return this.geotileGrid(fn.apply(new GeoTileGridAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> global(GlobalAggregate v) {
+            this._kind = Kind.Global;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> global(Function<GlobalAggregate.Builder, ObjectBuilder<GlobalAggregate>> fn) {
+            return this.global(fn.apply(new GlobalAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> hdrPercentileRanks(HdrPercentileRanksAggregate v) {
+            this._kind = Kind.HdrPercentileRanks;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> hdrPercentileRanks(
+            Function<HdrPercentileRanksAggregate.Builder, ObjectBuilder<HdrPercentileRanksAggregate>> fn
+        ) {
+            return this.hdrPercentileRanks(fn.apply(new HdrPercentileRanksAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> hdrPercentiles(HdrPercentilesAggregate v) {
+            this._kind = Kind.HdrPercentiles;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> hdrPercentiles(
+            Function<HdrPercentilesAggregate.Builder, ObjectBuilder<HdrPercentilesAggregate>> fn
+        ) {
+            return this.hdrPercentiles(fn.apply(new HdrPercentilesAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> histogram(HistogramAggregate v) {
+            this._kind = Kind.Histogram;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> histogram(Function<HistogramAggregate.Builder, ObjectBuilder<HistogramAggregate>> fn) {
+            return this.histogram(fn.apply(new HistogramAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> inference(InferenceAggregate v) {
+            this._kind = Kind.Inference;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> inference(Function<InferenceAggregate.Builder, ObjectBuilder<InferenceAggregate>> fn) {
+            return this.inference(fn.apply(new InferenceAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> ipRange(IpRangeAggregate v) {
+            this._kind = Kind.IpRange;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> ipRange(Function<IpRangeAggregate.Builder, ObjectBuilder<IpRangeAggregate>> fn) {
+            return this.ipRange(fn.apply(new IpRangeAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> lrareterms(LongRareTermsAggregate v) {
+            this._kind = Kind.Lrareterms;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> lrareterms(Function<LongRareTermsAggregate.Builder, ObjectBuilder<LongRareTermsAggregate>> fn) {
+            return this.lrareterms(fn.apply(new LongRareTermsAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> lterms(LongTermsAggregate v) {
+            this._kind = Kind.Lterms;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> lterms(Function<LongTermsAggregate.Builder, ObjectBuilder<LongTermsAggregate>> fn) {
+            return this.lterms(fn.apply(new LongTermsAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> matrixStats(MatrixStatsAggregate v) {
+            this._kind = Kind.MatrixStats;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> matrixStats(Function<MatrixStatsAggregate.Builder, ObjectBuilder<MatrixStatsAggregate>> fn) {
+            return this.matrixStats(fn.apply(new MatrixStatsAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> max(MaxAggregate v) {
+            this._kind = Kind.Max;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> max(Function<MaxAggregate.Builder, ObjectBuilder<MaxAggregate>> fn) {
+            return this.max(fn.apply(new MaxAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> medianAbsoluteDeviation(MedianAbsoluteDeviationAggregate v) {
+            this._kind = Kind.MedianAbsoluteDeviation;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> medianAbsoluteDeviation(
+            Function<MedianAbsoluteDeviationAggregate.Builder, ObjectBuilder<MedianAbsoluteDeviationAggregate>> fn
+        ) {
+            return this.medianAbsoluteDeviation(fn.apply(new MedianAbsoluteDeviationAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> min(MinAggregate v) {
+            this._kind = Kind.Min;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> min(Function<MinAggregate.Builder, ObjectBuilder<MinAggregate>> fn) {
+            return this.min(fn.apply(new MinAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> missing(MissingAggregate v) {
+            this._kind = Kind.Missing;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> missing(Function<MissingAggregate.Builder, ObjectBuilder<MissingAggregate>> fn) {
+            return this.missing(fn.apply(new MissingAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> multiTerms(MultiTermsAggregate v) {
+            this._kind = Kind.MultiTerms;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> multiTerms(Function<MultiTermsAggregate.Builder, ObjectBuilder<MultiTermsAggregate>> fn) {
+            return this.multiTerms(fn.apply(new MultiTermsAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> nested(NestedAggregate v) {
+            this._kind = Kind.Nested;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> nested(Function<NestedAggregate.Builder, ObjectBuilder<NestedAggregate>> fn) {
+            return this.nested(fn.apply(new NestedAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> percentilesBucket(PercentilesBucketAggregate v) {
+            this._kind = Kind.PercentilesBucket;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> percentilesBucket(
+            Function<PercentilesBucketAggregate.Builder, ObjectBuilder<PercentilesBucketAggregate>> fn
+        ) {
+            return this.percentilesBucket(fn.apply(new PercentilesBucketAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> range(RangeAggregate v) {
+            this._kind = Kind.Range;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> range(Function<RangeAggregate.Builder, ObjectBuilder<RangeAggregate>> fn) {
+            return this.range(fn.apply(new RangeAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> rate(RateAggregate v) {
+            this._kind = Kind.Rate;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> rate(Function<RateAggregate.Builder, ObjectBuilder<RateAggregate>> fn) {
+            return this.rate(fn.apply(new RateAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> reverseNested(ReverseNestedAggregate v) {
+            this._kind = Kind.ReverseNested;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> reverseNested(Function<ReverseNestedAggregate.Builder, ObjectBuilder<ReverseNestedAggregate>> fn) {
+            return this.reverseNested(fn.apply(new ReverseNestedAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> sampler(SamplerAggregate v) {
+            this._kind = Kind.Sampler;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> sampler(Function<SamplerAggregate.Builder, ObjectBuilder<SamplerAggregate>> fn) {
+            return this.sampler(fn.apply(new SamplerAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> scriptedMetric(ScriptedMetricAggregate v) {
+            this._kind = Kind.ScriptedMetric;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> scriptedMetric(
+            Function<ScriptedMetricAggregate.Builder, ObjectBuilder<ScriptedMetricAggregate>> fn
+        ) {
+            return this.scriptedMetric(fn.apply(new ScriptedMetricAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> siglterms(SignificantLongTermsAggregate v) {
+            this._kind = Kind.Siglterms;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> siglterms(
+            Function<SignificantLongTermsAggregate.Builder, ObjectBuilder<SignificantLongTermsAggregate>> fn
+        ) {
+            return this.siglterms(fn.apply(new SignificantLongTermsAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> sigsterms(SignificantStringTermsAggregate v) {
+            this._kind = Kind.Sigsterms;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> sigsterms(
+            Function<SignificantStringTermsAggregate.Builder, ObjectBuilder<SignificantStringTermsAggregate>> fn
+        ) {
+            return this.sigsterms(fn.apply(new SignificantStringTermsAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> simpleValue(SimpleValueAggregate v) {
+            this._kind = Kind.SimpleValue;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> simpleValue(Function<SimpleValueAggregate.Builder, ObjectBuilder<SimpleValueAggregate>> fn) {
+            return this.simpleValue(fn.apply(new SimpleValueAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> stats(StatsAggregate v) {
+            this._kind = Kind.Stats;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> stats(Function<StatsAggregate.Builder, ObjectBuilder<StatsAggregate>> fn) {
+            return this.stats(fn.apply(new StatsAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> statsBucket(StatsBucketAggregate v) {
+            this._kind = Kind.StatsBucket;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> statsBucket(Function<StatsBucketAggregate.Builder, ObjectBuilder<StatsBucketAggregate>> fn) {
+            return this.statsBucket(fn.apply(new StatsBucketAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> srareterms(StringRareTermsAggregate v) {
+            this._kind = Kind.Srareterms;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> srareterms(Function<StringRareTermsAggregate.Builder, ObjectBuilder<StringRareTermsAggregate>> fn) {
+            return this.srareterms(fn.apply(new StringRareTermsAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> stringStats(StringStatsAggregate v) {
+            this._kind = Kind.StringStats;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> stringStats(Function<StringStatsAggregate.Builder, ObjectBuilder<StringStatsAggregate>> fn) {
+            return this.stringStats(fn.apply(new StringStatsAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> sterms(StringTermsAggregate v) {
+            this._kind = Kind.Sterms;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> sterms(Function<StringTermsAggregate.Builder, ObjectBuilder<StringTermsAggregate>> fn) {
+            return this.sterms(fn.apply(new StringTermsAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> sum(SumAggregate v) {
+            this._kind = Kind.Sum;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> sum(Function<SumAggregate.Builder, ObjectBuilder<SumAggregate>> fn) {
+            return this.sum(fn.apply(new SumAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> tdigestPercentileRanks(TDigestPercentileRanksAggregate v) {
+            this._kind = Kind.TdigestPercentileRanks;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> tdigestPercentileRanks(
+            Function<TDigestPercentileRanksAggregate.Builder, ObjectBuilder<TDigestPercentileRanksAggregate>> fn
+        ) {
+            return this.tdigestPercentileRanks(fn.apply(new TDigestPercentileRanksAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> tdigestPercentiles(TDigestPercentilesAggregate v) {
+            this._kind = Kind.TdigestPercentiles;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> tdigestPercentiles(
+            Function<TDigestPercentilesAggregate.Builder, ObjectBuilder<TDigestPercentilesAggregate>> fn
+        ) {
+            return this.tdigestPercentiles(fn.apply(new TDigestPercentilesAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> tTest(TTestAggregate v) {
+            this._kind = Kind.TTest;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> tTest(Function<TTestAggregate.Builder, ObjectBuilder<TTestAggregate>> fn) {
+            return this.tTest(fn.apply(new TTestAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> topHits(TopHitsAggregate v) {
+            this._kind = Kind.TopHits;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> topHits(Function<TopHitsAggregate.Builder, ObjectBuilder<TopHitsAggregate>> fn) {
+            return this.topHits(fn.apply(new TopHitsAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> topMetrics(TopMetricsAggregate v) {
+            this._kind = Kind.TopMetrics;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> topMetrics(Function<TopMetricsAggregate.Builder, ObjectBuilder<TopMetricsAggregate>> fn) {
+            return this.topMetrics(fn.apply(new TopMetricsAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> umrareterms(UnmappedRareTermsAggregate v) {
+            this._kind = Kind.Umrareterms;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> umrareterms(
+            Function<UnmappedRareTermsAggregate.Builder, ObjectBuilder<UnmappedRareTermsAggregate>> fn
+        ) {
+            return this.umrareterms(fn.apply(new UnmappedRareTermsAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> umsigterms(UnmappedSignificantTermsAggregate v) {
+            this._kind = Kind.Umsigterms;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> umsigterms(
+            Function<UnmappedSignificantTermsAggregate.Builder, ObjectBuilder<UnmappedSignificantTermsAggregate>> fn
+        ) {
+            return this.umsigterms(fn.apply(new UnmappedSignificantTermsAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> umterms(UnmappedTermsAggregate v) {
+            this._kind = Kind.Umterms;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> umterms(Function<UnmappedTermsAggregate.Builder, ObjectBuilder<UnmappedTermsAggregate>> fn) {
+            return this.umterms(fn.apply(new UnmappedTermsAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> valueCount(ValueCountAggregate v) {
+            this._kind = Kind.ValueCount;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> valueCount(Function<ValueCountAggregate.Builder, ObjectBuilder<ValueCountAggregate>> fn) {
+            return this.valueCount(fn.apply(new ValueCountAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> variableWidthHistogram(VariableWidthHistogramAggregate v) {
+            this._kind = Kind.VariableWidthHistogram;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> variableWidthHistogram(
+            Function<VariableWidthHistogramAggregate.Builder, ObjectBuilder<VariableWidthHistogramAggregate>> fn
+        ) {
+            return this.variableWidthHistogram(fn.apply(new VariableWidthHistogramAggregate.Builder()).build());
+        }
+
+        public ObjectBuilder<Aggregate> weightedAvg(WeightedAvgAggregate v) {
+            this._kind = Kind.WeightedAvg;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Aggregate> weightedAvg(Function<WeightedAvgAggregate.Builder, ObjectBuilder<WeightedAvgAggregate>> fn) {
+            return this.weightedAvg(fn.apply(new WeightedAvgAggregate.Builder()).build());
+        }
+
+        public Aggregate build() {
+            _checkSingleUse();
+            return new Aggregate(this);
+        }
+
+    }
+
+    public static final ExternallyTaggedUnion.TypedKeysDeserializer<Aggregate> _TYPED_KEYS_DESERIALIZER;
+
+    static {
+        Map<String, JsonpDeserializer<? extends AggregateVariant>> deserializers = new HashMap<>();
+        deserializers.put("adjacency_matrix", AdjacencyMatrixAggregate._DESERIALIZER);
+        deserializers.put("auto_date_histogram", AutoDateHistogramAggregate._DESERIALIZER);
+        deserializers.put("avg", AvgAggregate._DESERIALIZER);
+        deserializers.put("box_plot", BoxPlotAggregate._DESERIALIZER);
+        deserializers.put("bucket_metric_value", BucketMetricValueAggregate._DESERIALIZER);
+        deserializers.put("cardinality", CardinalityAggregate._DESERIALIZER);
+        deserializers.put("children", ChildrenAggregate._DESERIALIZER);
+        deserializers.put("composite", CompositeAggregate._DESERIALIZER);
+        deserializers.put("simple_long_value", CumulativeCardinalityAggregate._DESERIALIZER);
+        deserializers.put("date_histogram", DateHistogramAggregate._DESERIALIZER);
+        deserializers.put("date_range", DateRangeAggregate._DESERIALIZER);
+        deserializers.put("derivative", DerivativeAggregate._DESERIALIZER);
+        deserializers.put("dterms", DoubleTermsAggregate._DESERIALIZER);
+        deserializers.put("extended_stats", ExtendedStatsAggregate._DESERIALIZER);
+        deserializers.put("extended_stats_bucket", ExtendedStatsBucketAggregate._DESERIALIZER);
+        deserializers.put("filter", FilterAggregate._DESERIALIZER);
+        deserializers.put("filters", FiltersAggregate._DESERIALIZER);
+        deserializers.put("geo_bounds", GeoBoundsAggregate._DESERIALIZER);
+        deserializers.put("geo_centroid", GeoCentroidAggregate._DESERIALIZER);
+        deserializers.put("geo_distance", GeoDistanceAggregate._DESERIALIZER);
+        deserializers.put("geohash_grid", GeoHashGridAggregate._DESERIALIZER);
+        deserializers.put("geo_line", GeoLineAggregate._DESERIALIZER);
+        deserializers.put("geotile_grid", GeoTileGridAggregate._DESERIALIZER);
+        deserializers.put("global", GlobalAggregate._DESERIALIZER);
+        deserializers.put("hdr_percentile_ranks", HdrPercentileRanksAggregate._DESERIALIZER);
+        deserializers.put("hdr_percentiles", HdrPercentilesAggregate._DESERIALIZER);
+        deserializers.put("histogram", HistogramAggregate._DESERIALIZER);
+        deserializers.put("inference", InferenceAggregate._DESERIALIZER);
+        deserializers.put("ip_range", IpRangeAggregate._DESERIALIZER);
+        deserializers.put("lrareterms", LongRareTermsAggregate._DESERIALIZER);
+        deserializers.put("lterms", LongTermsAggregate._DESERIALIZER);
+        deserializers.put("matrix_stats", MatrixStatsAggregate._DESERIALIZER);
+        deserializers.put("max", MaxAggregate._DESERIALIZER);
+        deserializers.put("median_absolute_deviation", MedianAbsoluteDeviationAggregate._DESERIALIZER);
+        deserializers.put("min", MinAggregate._DESERIALIZER);
+        deserializers.put("missing", MissingAggregate._DESERIALIZER);
+        deserializers.put("multi_terms", MultiTermsAggregate._DESERIALIZER);
+        deserializers.put("nested", NestedAggregate._DESERIALIZER);
+        deserializers.put("percentiles_bucket", PercentilesBucketAggregate._DESERIALIZER);
+        deserializers.put("range", RangeAggregate._DESERIALIZER);
+        deserializers.put("rate", RateAggregate._DESERIALIZER);
+        deserializers.put("reverse_nested", ReverseNestedAggregate._DESERIALIZER);
+        deserializers.put("sampler", SamplerAggregate._DESERIALIZER);
+        deserializers.put("scripted_metric", ScriptedMetricAggregate._DESERIALIZER);
+        deserializers.put("siglterms", SignificantLongTermsAggregate._DESERIALIZER);
+        deserializers.put("sigsterms", SignificantStringTermsAggregate._DESERIALIZER);
+        deserializers.put("simple_value", SimpleValueAggregate._DESERIALIZER);
+        deserializers.put("stats", StatsAggregate._DESERIALIZER);
+        deserializers.put("stats_bucket", StatsBucketAggregate._DESERIALIZER);
+        deserializers.put("srareterms", StringRareTermsAggregate._DESERIALIZER);
+        deserializers.put("string_stats", StringStatsAggregate._DESERIALIZER);
+        deserializers.put("sterms", StringTermsAggregate._DESERIALIZER);
+        deserializers.put("sum", SumAggregate._DESERIALIZER);
+        deserializers.put("tdigest_percentile_ranks", TDigestPercentileRanksAggregate._DESERIALIZER);
+        deserializers.put("tdigest_percentiles", TDigestPercentilesAggregate._DESERIALIZER);
+        deserializers.put("t_test", TTestAggregate._DESERIALIZER);
+        deserializers.put("top_hits", TopHitsAggregate._DESERIALIZER);
+        deserializers.put("top_metrics", TopMetricsAggregate._DESERIALIZER);
+        deserializers.put("umrareterms", UnmappedRareTermsAggregate._DESERIALIZER);
+        deserializers.put("umsigterms", UnmappedSignificantTermsAggregate._DESERIALIZER);
+        deserializers.put("umterms", UnmappedTermsAggregate._DESERIALIZER);
+        deserializers.put("value_count", ValueCountAggregate._DESERIALIZER);
+        deserializers.put("variable_width_histogram", VariableWidthHistogramAggregate._DESERIALIZER);
+        deserializers.put("weighted_avg", WeightedAvgAggregate._DESERIALIZER);
+
+        _TYPED_KEYS_DESERIALIZER = new ExternallyTaggedUnion.Deserializer<>(deserializers, Aggregate::new, Aggregate::new).typedKeys();
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregateBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregateBase.java
index 78bb5bc7d3..b395f8d69b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregateBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregateBase.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,92 +42,85 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.AggregateBase
 
-
 public abstract class AggregateBase implements JsonpSerializable {
-	private final Map<String, JsonData> meta;
+    private final Map<String, JsonData> meta;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected AggregateBase(AbstractBuilder<?> builder) {
+    protected AggregateBase(AbstractBuilder<?> builder) {
 
-		this.meta = ApiTypeHelper.unmodifiable(builder.meta);
+        this.meta = ApiTypeHelper.unmodifiable(builder.meta);
 
-	}
+    }
 
-	/**
-	 * API name: {@code meta}
-	 */
-	public final Map<String, JsonData> meta() {
-		return this.meta;
-	}
+    /**
+     * API name: {@code meta}
+     */
+    public final Map<String, JsonData> meta() {
+        return this.meta;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		if (ApiTypeHelper.isDefined(this.meta)) {
-			generator.writeKey("meta");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.meta)) {
+            generator.writeKey("meta");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
 
-			}
-			generator.writeEnd();
+            }
+            generator.writeEnd();
 
-		}
+        }
 
-	}
+    }
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		@Nullable
-		private Map<String, JsonData> meta;
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        @Nullable
+        private Map<String, JsonData> meta;
 
-		/**
-		 * API name: {@code meta}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>meta</code>.
-		 */
-		public final BuilderT meta(Map<String, JsonData> map) {
-			this.meta = _mapPutAll(this.meta, map);
-			return self();
-		}
+        /**
+         * API name: {@code meta}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>meta</code>.
+         */
+        public final BuilderT meta(Map<String, JsonData> map) {
+            this.meta = _mapPutAll(this.meta, map);
+            return self();
+        }
 
-		/**
-		 * API name: {@code meta}
-		 * <p>
-		 * Adds an entry to <code>meta</code>.
-		 */
-		public final BuilderT meta(String key, JsonData value) {
-			this.meta = _mapPut(this.meta, key, value);
-			return self();
-		}
+        /**
+         * API name: {@code meta}
+         * <p>
+         * Adds an entry to <code>meta</code>.
+         */
+        public final BuilderT meta(String key, JsonData value) {
+            this.meta = _mapPut(this.meta, key, value);
+            return self();
+        }
 
-		protected abstract BuilderT self();
+        protected abstract BuilderT self();
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupAggregateBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupAggregateBaseDeserializer(ObjectDeserializer<BuilderT> op) {
 
-		op.add(AbstractBuilder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "meta");
+        op.add(AbstractBuilder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "meta");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregateBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregateBuilders.java
index 5d7929b809..71a60c593b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregateBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregateBuilders.java
@@ -36,515 +36,514 @@
  * Builders for {@link Aggregate} variants.
  */
 public class AggregateBuilders {
-	private AggregateBuilders() {
-	}
-
-	/**
-	 * Creates a builder for the {@link AdjacencyMatrixAggregate adjacency_matrix}
-	 * {@code Aggregate} variant.
-	 */
-	public static AdjacencyMatrixAggregate.Builder adjacencyMatrix() {
-		return new AdjacencyMatrixAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link AutoDateHistogramAggregate
-	 * auto_date_histogram} {@code Aggregate} variant.
-	 */
-	public static AutoDateHistogramAggregate.Builder autoDateHistogram() {
-		return new AutoDateHistogramAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link AvgAggregate avg} {@code Aggregate} variant.
-	 */
-	public static AvgAggregate.Builder avg() {
-		return new AvgAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link BoxPlotAggregate box_plot} {@code Aggregate}
-	 * variant.
-	 */
-	public static BoxPlotAggregate.Builder boxPlot() {
-		return new BoxPlotAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link BucketMetricValueAggregate
-	 * bucket_metric_value} {@code Aggregate} variant.
-	 */
-	public static BucketMetricValueAggregate.Builder bucketMetricValue() {
-		return new BucketMetricValueAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link CardinalityAggregate cardinality}
-	 * {@code Aggregate} variant.
-	 */
-	public static CardinalityAggregate.Builder cardinality() {
-		return new CardinalityAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ChildrenAggregate children}
-	 * {@code Aggregate} variant.
-	 */
-	public static ChildrenAggregate.Builder children() {
-		return new ChildrenAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link CompositeAggregate composite}
-	 * {@code Aggregate} variant.
-	 */
-	public static CompositeAggregate.Builder composite() {
-		return new CompositeAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link CumulativeCardinalityAggregate
-	 * simple_long_value} {@code Aggregate} variant.
-	 */
-	public static CumulativeCardinalityAggregate.Builder simpleLongValue() {
-		return new CumulativeCardinalityAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DateHistogramAggregate date_histogram}
-	 * {@code Aggregate} variant.
-	 */
-	public static DateHistogramAggregate.Builder dateHistogram() {
-		return new DateHistogramAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DateRangeAggregate date_range}
-	 * {@code Aggregate} variant.
-	 */
-	public static DateRangeAggregate.Builder dateRange() {
-		return new DateRangeAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DerivativeAggregate derivative}
-	 * {@code Aggregate} variant.
-	 */
-	public static DerivativeAggregate.Builder derivative() {
-		return new DerivativeAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DoubleTermsAggregate dterms}
-	 * {@code Aggregate} variant.
-	 */
-	public static DoubleTermsAggregate.Builder dterms() {
-		return new DoubleTermsAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ExtendedStatsAggregate extended_stats}
-	 * {@code Aggregate} variant.
-	 */
-	public static ExtendedStatsAggregate.Builder extendedStats() {
-		return new ExtendedStatsAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ExtendedStatsBucketAggregate
-	 * extended_stats_bucket} {@code Aggregate} variant.
-	 */
-	public static ExtendedStatsBucketAggregate.Builder extendedStatsBucket() {
-		return new ExtendedStatsBucketAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link FilterAggregate filter} {@code Aggregate}
-	 * variant.
-	 */
-	public static FilterAggregate.Builder filter() {
-		return new FilterAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link FiltersAggregate filters} {@code Aggregate}
-	 * variant.
-	 */
-	public static FiltersAggregate.Builder filters() {
-		return new FiltersAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GeoBoundsAggregate geo_bounds}
-	 * {@code Aggregate} variant.
-	 */
-	public static GeoBoundsAggregate.Builder geoBounds() {
-		return new GeoBoundsAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GeoCentroidAggregate geo_centroid}
-	 * {@code Aggregate} variant.
-	 */
-	public static GeoCentroidAggregate.Builder geoCentroid() {
-		return new GeoCentroidAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GeoDistanceAggregate geo_distance}
-	 * {@code Aggregate} variant.
-	 */
-	public static GeoDistanceAggregate.Builder geoDistance() {
-		return new GeoDistanceAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GeoHashGridAggregate geohash_grid}
-	 * {@code Aggregate} variant.
-	 */
-	public static GeoHashGridAggregate.Builder geohashGrid() {
-		return new GeoHashGridAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GeoLineAggregate geo_line} {@code Aggregate}
-	 * variant.
-	 */
-	public static GeoLineAggregate.Builder geoLine() {
-		return new GeoLineAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GeoTileGridAggregate geotile_grid}
-	 * {@code Aggregate} variant.
-	 */
-	public static GeoTileGridAggregate.Builder geotileGrid() {
-		return new GeoTileGridAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GlobalAggregate global} {@code Aggregate}
-	 * variant.
-	 */
-	public static GlobalAggregate.Builder global() {
-		return new GlobalAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link HdrPercentileRanksAggregate
-	 * hdr_percentile_ranks} {@code Aggregate} variant.
-	 */
-	public static HdrPercentileRanksAggregate.Builder hdrPercentileRanks() {
-		return new HdrPercentileRanksAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link HdrPercentilesAggregate hdr_percentiles}
-	 * {@code Aggregate} variant.
-	 */
-	public static HdrPercentilesAggregate.Builder hdrPercentiles() {
-		return new HdrPercentilesAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link HistogramAggregate histogram}
-	 * {@code Aggregate} variant.
-	 */
-	public static HistogramAggregate.Builder histogram() {
-		return new HistogramAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link InferenceAggregate inference}
-	 * {@code Aggregate} variant.
-	 */
-	public static InferenceAggregate.Builder inference() {
-		return new InferenceAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link IpRangeAggregate ip_range} {@code Aggregate}
-	 * variant.
-	 */
-	public static IpRangeAggregate.Builder ipRange() {
-		return new IpRangeAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link LongRareTermsAggregate lrareterms}
-	 * {@code Aggregate} variant.
-	 */
-	public static LongRareTermsAggregate.Builder lrareterms() {
-		return new LongRareTermsAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link LongTermsAggregate lterms} {@code Aggregate}
-	 * variant.
-	 */
-	public static LongTermsAggregate.Builder lterms() {
-		return new LongTermsAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MatrixStatsAggregate matrix_stats}
-	 * {@code Aggregate} variant.
-	 */
-	public static MatrixStatsAggregate.Builder matrixStats() {
-		return new MatrixStatsAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MaxAggregate max} {@code Aggregate} variant.
-	 */
-	public static MaxAggregate.Builder max() {
-		return new MaxAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MedianAbsoluteDeviationAggregate
-	 * median_absolute_deviation} {@code Aggregate} variant.
-	 */
-	public static MedianAbsoluteDeviationAggregate.Builder medianAbsoluteDeviation() {
-		return new MedianAbsoluteDeviationAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MinAggregate min} {@code Aggregate} variant.
-	 */
-	public static MinAggregate.Builder min() {
-		return new MinAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MissingAggregate missing} {@code Aggregate}
-	 * variant.
-	 */
-	public static MissingAggregate.Builder missing() {
-		return new MissingAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MultiTermsAggregate multi_terms}
-	 * {@code Aggregate} variant.
-	 */
-	public static MultiTermsAggregate.Builder multiTerms() {
-		return new MultiTermsAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link NestedAggregate nested} {@code Aggregate}
-	 * variant.
-	 */
-	public static NestedAggregate.Builder nested() {
-		return new NestedAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link PercentilesBucketAggregate
-	 * percentiles_bucket} {@code Aggregate} variant.
-	 */
-	public static PercentilesBucketAggregate.Builder percentilesBucket() {
-		return new PercentilesBucketAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link RangeAggregate range} {@code Aggregate}
-	 * variant.
-	 */
-	public static RangeAggregate.Builder range() {
-		return new RangeAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link RateAggregate rate} {@code Aggregate}
-	 * variant.
-	 */
-	public static RateAggregate.Builder rate() {
-		return new RateAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ReverseNestedAggregate reverse_nested}
-	 * {@code Aggregate} variant.
-	 */
-	public static ReverseNestedAggregate.Builder reverseNested() {
-		return new ReverseNestedAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SamplerAggregate sampler} {@code Aggregate}
-	 * variant.
-	 */
-	public static SamplerAggregate.Builder sampler() {
-		return new SamplerAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ScriptedMetricAggregate scripted_metric}
-	 * {@code Aggregate} variant.
-	 */
-	public static ScriptedMetricAggregate.Builder scriptedMetric() {
-		return new ScriptedMetricAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SignificantLongTermsAggregate siglterms}
-	 * {@code Aggregate} variant.
-	 */
-	public static SignificantLongTermsAggregate.Builder siglterms() {
-		return new SignificantLongTermsAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SignificantStringTermsAggregate sigsterms}
-	 * {@code Aggregate} variant.
-	 */
-	public static SignificantStringTermsAggregate.Builder sigsterms() {
-		return new SignificantStringTermsAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SimpleValueAggregate simple_value}
-	 * {@code Aggregate} variant.
-	 */
-	public static SimpleValueAggregate.Builder simpleValue() {
-		return new SimpleValueAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link StatsAggregate stats} {@code Aggregate}
-	 * variant.
-	 */
-	public static StatsAggregate.Builder stats() {
-		return new StatsAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link StatsBucketAggregate stats_bucket}
-	 * {@code Aggregate} variant.
-	 */
-	public static StatsBucketAggregate.Builder statsBucket() {
-		return new StatsBucketAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link StringRareTermsAggregate srareterms}
-	 * {@code Aggregate} variant.
-	 */
-	public static StringRareTermsAggregate.Builder srareterms() {
-		return new StringRareTermsAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link StringStatsAggregate string_stats}
-	 * {@code Aggregate} variant.
-	 */
-	public static StringStatsAggregate.Builder stringStats() {
-		return new StringStatsAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link StringTermsAggregate sterms}
-	 * {@code Aggregate} variant.
-	 */
-	public static StringTermsAggregate.Builder sterms() {
-		return new StringTermsAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SumAggregate sum} {@code Aggregate} variant.
-	 */
-	public static SumAggregate.Builder sum() {
-		return new SumAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link TDigestPercentileRanksAggregate
-	 * tdigest_percentile_ranks} {@code Aggregate} variant.
-	 */
-	public static TDigestPercentileRanksAggregate.Builder tdigestPercentileRanks() {
-		return new TDigestPercentileRanksAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link TDigestPercentilesAggregate
-	 * tdigest_percentiles} {@code Aggregate} variant.
-	 */
-	public static TDigestPercentilesAggregate.Builder tdigestPercentiles() {
-		return new TDigestPercentilesAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link TTestAggregate t_test} {@code Aggregate}
-	 * variant.
-	 */
-	public static TTestAggregate.Builder tTest() {
-		return new TTestAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link TopHitsAggregate top_hits} {@code Aggregate}
-	 * variant.
-	 */
-	public static TopHitsAggregate.Builder topHits() {
-		return new TopHitsAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link TopMetricsAggregate top_metrics}
-	 * {@code Aggregate} variant.
-	 */
-	public static TopMetricsAggregate.Builder topMetrics() {
-		return new TopMetricsAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link UnmappedRareTermsAggregate umrareterms}
-	 * {@code Aggregate} variant.
-	 */
-	public static UnmappedRareTermsAggregate.Builder umrareterms() {
-		return new UnmappedRareTermsAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link UnmappedSignificantTermsAggregate
-	 * umsigterms} {@code Aggregate} variant.
-	 */
-	public static UnmappedSignificantTermsAggregate.Builder umsigterms() {
-		return new UnmappedSignificantTermsAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link UnmappedTermsAggregate umterms}
-	 * {@code Aggregate} variant.
-	 */
-	public static UnmappedTermsAggregate.Builder umterms() {
-		return new UnmappedTermsAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ValueCountAggregate value_count}
-	 * {@code Aggregate} variant.
-	 */
-	public static ValueCountAggregate.Builder valueCount() {
-		return new ValueCountAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link VariableWidthHistogramAggregate
-	 * variable_width_histogram} {@code Aggregate} variant.
-	 */
-	public static VariableWidthHistogramAggregate.Builder variableWidthHistogram() {
-		return new VariableWidthHistogramAggregate.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link WeightedAvgAggregate weighted_avg}
-	 * {@code Aggregate} variant.
-	 */
-	public static WeightedAvgAggregate.Builder weightedAvg() {
-		return new WeightedAvgAggregate.Builder();
-	}
+    private AggregateBuilders() {}
+
+    /**
+     * Creates a builder for the {@link AdjacencyMatrixAggregate adjacency_matrix}
+     * {@code Aggregate} variant.
+     */
+    public static AdjacencyMatrixAggregate.Builder adjacencyMatrix() {
+        return new AdjacencyMatrixAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link AutoDateHistogramAggregate
+     * auto_date_histogram} {@code Aggregate} variant.
+     */
+    public static AutoDateHistogramAggregate.Builder autoDateHistogram() {
+        return new AutoDateHistogramAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link AvgAggregate avg} {@code Aggregate} variant.
+     */
+    public static AvgAggregate.Builder avg() {
+        return new AvgAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link BoxPlotAggregate box_plot} {@code Aggregate}
+     * variant.
+     */
+    public static BoxPlotAggregate.Builder boxPlot() {
+        return new BoxPlotAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link BucketMetricValueAggregate
+     * bucket_metric_value} {@code Aggregate} variant.
+     */
+    public static BucketMetricValueAggregate.Builder bucketMetricValue() {
+        return new BucketMetricValueAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link CardinalityAggregate cardinality}
+     * {@code Aggregate} variant.
+     */
+    public static CardinalityAggregate.Builder cardinality() {
+        return new CardinalityAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ChildrenAggregate children}
+     * {@code Aggregate} variant.
+     */
+    public static ChildrenAggregate.Builder children() {
+        return new ChildrenAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link CompositeAggregate composite}
+     * {@code Aggregate} variant.
+     */
+    public static CompositeAggregate.Builder composite() {
+        return new CompositeAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link CumulativeCardinalityAggregate
+     * simple_long_value} {@code Aggregate} variant.
+     */
+    public static CumulativeCardinalityAggregate.Builder simpleLongValue() {
+        return new CumulativeCardinalityAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DateHistogramAggregate date_histogram}
+     * {@code Aggregate} variant.
+     */
+    public static DateHistogramAggregate.Builder dateHistogram() {
+        return new DateHistogramAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DateRangeAggregate date_range}
+     * {@code Aggregate} variant.
+     */
+    public static DateRangeAggregate.Builder dateRange() {
+        return new DateRangeAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DerivativeAggregate derivative}
+     * {@code Aggregate} variant.
+     */
+    public static DerivativeAggregate.Builder derivative() {
+        return new DerivativeAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DoubleTermsAggregate dterms}
+     * {@code Aggregate} variant.
+     */
+    public static DoubleTermsAggregate.Builder dterms() {
+        return new DoubleTermsAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ExtendedStatsAggregate extended_stats}
+     * {@code Aggregate} variant.
+     */
+    public static ExtendedStatsAggregate.Builder extendedStats() {
+        return new ExtendedStatsAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ExtendedStatsBucketAggregate
+     * extended_stats_bucket} {@code Aggregate} variant.
+     */
+    public static ExtendedStatsBucketAggregate.Builder extendedStatsBucket() {
+        return new ExtendedStatsBucketAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link FilterAggregate filter} {@code Aggregate}
+     * variant.
+     */
+    public static FilterAggregate.Builder filter() {
+        return new FilterAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link FiltersAggregate filters} {@code Aggregate}
+     * variant.
+     */
+    public static FiltersAggregate.Builder filters() {
+        return new FiltersAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GeoBoundsAggregate geo_bounds}
+     * {@code Aggregate} variant.
+     */
+    public static GeoBoundsAggregate.Builder geoBounds() {
+        return new GeoBoundsAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GeoCentroidAggregate geo_centroid}
+     * {@code Aggregate} variant.
+     */
+    public static GeoCentroidAggregate.Builder geoCentroid() {
+        return new GeoCentroidAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GeoDistanceAggregate geo_distance}
+     * {@code Aggregate} variant.
+     */
+    public static GeoDistanceAggregate.Builder geoDistance() {
+        return new GeoDistanceAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GeoHashGridAggregate geohash_grid}
+     * {@code Aggregate} variant.
+     */
+    public static GeoHashGridAggregate.Builder geohashGrid() {
+        return new GeoHashGridAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GeoLineAggregate geo_line} {@code Aggregate}
+     * variant.
+     */
+    public static GeoLineAggregate.Builder geoLine() {
+        return new GeoLineAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GeoTileGridAggregate geotile_grid}
+     * {@code Aggregate} variant.
+     */
+    public static GeoTileGridAggregate.Builder geotileGrid() {
+        return new GeoTileGridAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GlobalAggregate global} {@code Aggregate}
+     * variant.
+     */
+    public static GlobalAggregate.Builder global() {
+        return new GlobalAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link HdrPercentileRanksAggregate
+     * hdr_percentile_ranks} {@code Aggregate} variant.
+     */
+    public static HdrPercentileRanksAggregate.Builder hdrPercentileRanks() {
+        return new HdrPercentileRanksAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link HdrPercentilesAggregate hdr_percentiles}
+     * {@code Aggregate} variant.
+     */
+    public static HdrPercentilesAggregate.Builder hdrPercentiles() {
+        return new HdrPercentilesAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link HistogramAggregate histogram}
+     * {@code Aggregate} variant.
+     */
+    public static HistogramAggregate.Builder histogram() {
+        return new HistogramAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link InferenceAggregate inference}
+     * {@code Aggregate} variant.
+     */
+    public static InferenceAggregate.Builder inference() {
+        return new InferenceAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link IpRangeAggregate ip_range} {@code Aggregate}
+     * variant.
+     */
+    public static IpRangeAggregate.Builder ipRange() {
+        return new IpRangeAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link LongRareTermsAggregate lrareterms}
+     * {@code Aggregate} variant.
+     */
+    public static LongRareTermsAggregate.Builder lrareterms() {
+        return new LongRareTermsAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link LongTermsAggregate lterms} {@code Aggregate}
+     * variant.
+     */
+    public static LongTermsAggregate.Builder lterms() {
+        return new LongTermsAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MatrixStatsAggregate matrix_stats}
+     * {@code Aggregate} variant.
+     */
+    public static MatrixStatsAggregate.Builder matrixStats() {
+        return new MatrixStatsAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MaxAggregate max} {@code Aggregate} variant.
+     */
+    public static MaxAggregate.Builder max() {
+        return new MaxAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MedianAbsoluteDeviationAggregate
+     * median_absolute_deviation} {@code Aggregate} variant.
+     */
+    public static MedianAbsoluteDeviationAggregate.Builder medianAbsoluteDeviation() {
+        return new MedianAbsoluteDeviationAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MinAggregate min} {@code Aggregate} variant.
+     */
+    public static MinAggregate.Builder min() {
+        return new MinAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MissingAggregate missing} {@code Aggregate}
+     * variant.
+     */
+    public static MissingAggregate.Builder missing() {
+        return new MissingAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MultiTermsAggregate multi_terms}
+     * {@code Aggregate} variant.
+     */
+    public static MultiTermsAggregate.Builder multiTerms() {
+        return new MultiTermsAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link NestedAggregate nested} {@code Aggregate}
+     * variant.
+     */
+    public static NestedAggregate.Builder nested() {
+        return new NestedAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link PercentilesBucketAggregate
+     * percentiles_bucket} {@code Aggregate} variant.
+     */
+    public static PercentilesBucketAggregate.Builder percentilesBucket() {
+        return new PercentilesBucketAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link RangeAggregate range} {@code Aggregate}
+     * variant.
+     */
+    public static RangeAggregate.Builder range() {
+        return new RangeAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link RateAggregate rate} {@code Aggregate}
+     * variant.
+     */
+    public static RateAggregate.Builder rate() {
+        return new RateAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ReverseNestedAggregate reverse_nested}
+     * {@code Aggregate} variant.
+     */
+    public static ReverseNestedAggregate.Builder reverseNested() {
+        return new ReverseNestedAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SamplerAggregate sampler} {@code Aggregate}
+     * variant.
+     */
+    public static SamplerAggregate.Builder sampler() {
+        return new SamplerAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ScriptedMetricAggregate scripted_metric}
+     * {@code Aggregate} variant.
+     */
+    public static ScriptedMetricAggregate.Builder scriptedMetric() {
+        return new ScriptedMetricAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SignificantLongTermsAggregate siglterms}
+     * {@code Aggregate} variant.
+     */
+    public static SignificantLongTermsAggregate.Builder siglterms() {
+        return new SignificantLongTermsAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SignificantStringTermsAggregate sigsterms}
+     * {@code Aggregate} variant.
+     */
+    public static SignificantStringTermsAggregate.Builder sigsterms() {
+        return new SignificantStringTermsAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SimpleValueAggregate simple_value}
+     * {@code Aggregate} variant.
+     */
+    public static SimpleValueAggregate.Builder simpleValue() {
+        return new SimpleValueAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link StatsAggregate stats} {@code Aggregate}
+     * variant.
+     */
+    public static StatsAggregate.Builder stats() {
+        return new StatsAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link StatsBucketAggregate stats_bucket}
+     * {@code Aggregate} variant.
+     */
+    public static StatsBucketAggregate.Builder statsBucket() {
+        return new StatsBucketAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link StringRareTermsAggregate srareterms}
+     * {@code Aggregate} variant.
+     */
+    public static StringRareTermsAggregate.Builder srareterms() {
+        return new StringRareTermsAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link StringStatsAggregate string_stats}
+     * {@code Aggregate} variant.
+     */
+    public static StringStatsAggregate.Builder stringStats() {
+        return new StringStatsAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link StringTermsAggregate sterms}
+     * {@code Aggregate} variant.
+     */
+    public static StringTermsAggregate.Builder sterms() {
+        return new StringTermsAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SumAggregate sum} {@code Aggregate} variant.
+     */
+    public static SumAggregate.Builder sum() {
+        return new SumAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link TDigestPercentileRanksAggregate
+     * tdigest_percentile_ranks} {@code Aggregate} variant.
+     */
+    public static TDigestPercentileRanksAggregate.Builder tdigestPercentileRanks() {
+        return new TDigestPercentileRanksAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link TDigestPercentilesAggregate
+     * tdigest_percentiles} {@code Aggregate} variant.
+     */
+    public static TDigestPercentilesAggregate.Builder tdigestPercentiles() {
+        return new TDigestPercentilesAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link TTestAggregate t_test} {@code Aggregate}
+     * variant.
+     */
+    public static TTestAggregate.Builder tTest() {
+        return new TTestAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link TopHitsAggregate top_hits} {@code Aggregate}
+     * variant.
+     */
+    public static TopHitsAggregate.Builder topHits() {
+        return new TopHitsAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link TopMetricsAggregate top_metrics}
+     * {@code Aggregate} variant.
+     */
+    public static TopMetricsAggregate.Builder topMetrics() {
+        return new TopMetricsAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link UnmappedRareTermsAggregate umrareterms}
+     * {@code Aggregate} variant.
+     */
+    public static UnmappedRareTermsAggregate.Builder umrareterms() {
+        return new UnmappedRareTermsAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link UnmappedSignificantTermsAggregate
+     * umsigterms} {@code Aggregate} variant.
+     */
+    public static UnmappedSignificantTermsAggregate.Builder umsigterms() {
+        return new UnmappedSignificantTermsAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link UnmappedTermsAggregate umterms}
+     * {@code Aggregate} variant.
+     */
+    public static UnmappedTermsAggregate.Builder umterms() {
+        return new UnmappedTermsAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ValueCountAggregate value_count}
+     * {@code Aggregate} variant.
+     */
+    public static ValueCountAggregate.Builder valueCount() {
+        return new ValueCountAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link VariableWidthHistogramAggregate
+     * variable_width_histogram} {@code Aggregate} variant.
+     */
+    public static VariableWidthHistogramAggregate.Builder variableWidthHistogram() {
+        return new VariableWidthHistogramAggregate.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link WeightedAvgAggregate weighted_avg}
+     * {@code Aggregate} variant.
+     */
+    public static WeightedAvgAggregate.Builder weightedAvg() {
+        return new WeightedAvgAggregate.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregateVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregateVariant.java
index 9aba988fb5..3d23d99c61 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregateVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregateVariant.java
@@ -37,10 +37,10 @@
  */
 public interface AggregateVariant {
 
-	Aggregate.Kind _aggregateKind();
+    Aggregate.Kind _aggregateKind();
 
-	default Aggregate _toAggregate() {
-		return new Aggregate(this);
-	}
+    default Aggregate _toAggregate() {
+        return new Aggregate(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/Aggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/Aggregation.java
index bef8fbd76c..9e596a954c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/Aggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/Aggregation.java
@@ -32,7 +32,10 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
@@ -41,2416 +44,2388 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.AggregationContainer
 
 @JsonpDeserializable
 public class Aggregation implements TaggedUnion<Aggregation.Kind, Object>, JsonpSerializable {
 
-	/**
-	 * {@link Aggregation} variant kinds.
-	 */
-	/**
-	 * {@link Aggregation} variant kinds.
-	 */
+    /**
+     * {@link Aggregation} variant kinds.
+     */
+    /**
+     * {@link Aggregation} variant kinds.
+     */
 
-	public enum Kind implements JsonEnum {
-		AdjacencyMatrix("adjacency_matrix"),
+    public enum Kind implements JsonEnum {
+        AdjacencyMatrix("adjacency_matrix"),
 
-		AutoDateHistogram("auto_date_histogram"),
+        AutoDateHistogram("auto_date_histogram"),
 
-		Avg("avg"),
+        Avg("avg"),
 
-		AvgBucket("avg_bucket"),
+        AvgBucket("avg_bucket"),
 
-		Boxplot("boxplot"),
+        Boxplot("boxplot"),
 
-		BucketScript("bucket_script"),
+        BucketScript("bucket_script"),
 
-		BucketSelector("bucket_selector"),
+        BucketSelector("bucket_selector"),
 
-		BucketSort("bucket_sort"),
+        BucketSort("bucket_sort"),
 
-		Cardinality("cardinality"),
+        Cardinality("cardinality"),
 
-		Children("children"),
+        Children("children"),
 
-		Composite("composite"),
+        Composite("composite"),
 
-		CumulativeCardinality("cumulative_cardinality"),
+        CumulativeCardinality("cumulative_cardinality"),
 
-		CumulativeSum("cumulative_sum"),
+        CumulativeSum("cumulative_sum"),
 
-		DateHistogram("date_histogram"),
+        DateHistogram("date_histogram"),
 
-		DateRange("date_range"),
+        DateRange("date_range"),
 
-		Derivative("derivative"),
+        Derivative("derivative"),
 
-		DiversifiedSampler("diversified_sampler"),
+        DiversifiedSampler("diversified_sampler"),
 
-		ExtendedStats("extended_stats"),
+        ExtendedStats("extended_stats"),
 
-		ExtendedStatsBucket("extended_stats_bucket"),
+        ExtendedStatsBucket("extended_stats_bucket"),
 
-		Filter("filter"),
+        Filter("filter"),
 
-		Filters("filters"),
+        Filters("filters"),
 
-		GeoBounds("geo_bounds"),
+        GeoBounds("geo_bounds"),
 
-		GeoCentroid("geo_centroid"),
+        GeoCentroid("geo_centroid"),
 
-		GeoDistance("geo_distance"),
+        GeoDistance("geo_distance"),
 
-		GeohashGrid("geohash_grid"),
+        GeohashGrid("geohash_grid"),
 
-		GeoLine("geo_line"),
+        GeoLine("geo_line"),
 
-		GeotileGrid("geotile_grid"),
+        GeotileGrid("geotile_grid"),
 
-		Global("global"),
+        Global("global"),
 
-		Histogram("histogram"),
+        Histogram("histogram"),
 
-		IpRange("ip_range"),
+        IpRange("ip_range"),
 
-		Inference("inference"),
+        Inference("inference"),
 
-		MatrixStats("matrix_stats"),
+        MatrixStats("matrix_stats"),
 
-		Max("max"),
+        Max("max"),
 
-		MaxBucket("max_bucket"),
+        MaxBucket("max_bucket"),
 
-		MedianAbsoluteDeviation("median_absolute_deviation"),
+        MedianAbsoluteDeviation("median_absolute_deviation"),
 
-		Min("min"),
+        Min("min"),
 
-		MinBucket("min_bucket"),
+        MinBucket("min_bucket"),
 
-		Missing("missing"),
+        Missing("missing"),
 
-		MovingAvg("moving_avg"),
+        MovingAvg("moving_avg"),
 
-		MovingPercentiles("moving_percentiles"),
+        MovingPercentiles("moving_percentiles"),
 
-		MovingFn("moving_fn"),
+        MovingFn("moving_fn"),
 
-		MultiTerms("multi_terms"),
+        MultiTerms("multi_terms"),
 
-		Nested("nested"),
+        Nested("nested"),
 
-		Normalize("normalize"),
+        Normalize("normalize"),
 
-		Parent("parent"),
+        Parent("parent"),
 
-		PercentileRanks("percentile_ranks"),
+        PercentileRanks("percentile_ranks"),
 
-		Percentiles("percentiles"),
+        Percentiles("percentiles"),
 
-		PercentilesBucket("percentiles_bucket"),
+        PercentilesBucket("percentiles_bucket"),
 
-		Range("range"),
+        Range("range"),
 
-		RareTerms("rare_terms"),
+        RareTerms("rare_terms"),
 
-		Rate("rate"),
+        Rate("rate"),
 
-		ReverseNested("reverse_nested"),
+        ReverseNested("reverse_nested"),
 
-		Sampler("sampler"),
+        Sampler("sampler"),
 
-		ScriptedMetric("scripted_metric"),
+        ScriptedMetric("scripted_metric"),
 
-		SerialDiff("serial_diff"),
+        SerialDiff("serial_diff"),
 
-		SignificantTerms("significant_terms"),
+        SignificantTerms("significant_terms"),
 
-		SignificantText("significant_text"),
+        SignificantText("significant_text"),
 
-		Stats("stats"),
+        Stats("stats"),
 
-		StatsBucket("stats_bucket"),
+        StatsBucket("stats_bucket"),
 
-		StringStats("string_stats"),
+        StringStats("string_stats"),
 
-		Sum("sum"),
+        Sum("sum"),
 
-		SumBucket("sum_bucket"),
+        SumBucket("sum_bucket"),
 
-		Terms("terms"),
+        Terms("terms"),
 
-		TopHits("top_hits"),
+        TopHits("top_hits"),
 
-		TTest("t_test"),
+        TTest("t_test"),
 
-		TopMetrics("top_metrics"),
+        TopMetrics("top_metrics"),
 
-		ValueCount("value_count"),
+        ValueCount("value_count"),
 
-		WeightedAvg("weighted_avg"),
+        WeightedAvg("weighted_avg"),
 
-		VariableWidthHistogram("variable_width_histogram"),
+        VariableWidthHistogram("variable_width_histogram"),
 
-		;
+        ;
 
-		private final String jsonValue;
+        private final String jsonValue;
 
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
 
-		public String jsonValue() {
-			return this.jsonValue;
-		}
+        public String jsonValue() {
+            return this.jsonValue;
+        }
 
-	}
+    }
 
-	private final Kind _kind;
-	private final Object _value;
+    private final Kind _kind;
+    private final Object _value;
 
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
 
-	@Override
-	public final Object _get() {
-		return _value;
-	}
+    @Override
+    public final Object _get() {
+        return _value;
+    }
 
-	private final Map<String, Aggregation> aggregations;
+    private final Map<String, Aggregation> aggregations;
 
-	private final Map<String, JsonData> meta;
+    private final Map<String, JsonData> meta;
 
-	public Aggregation(AggregationVariant value) {
+    public Aggregation(AggregationVariant value) {
 
-		this._kind = ApiTypeHelper.requireNonNull(value._aggregationKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+        this._kind = ApiTypeHelper.requireNonNull(value._aggregationKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
 
-		this.aggregations = null;
-		this.meta = null;
+        this.aggregations = null;
+        this.meta = null;
 
-	}
+    }
 
-	private Aggregation(Builder builder) {
+    private Aggregation(Builder builder) {
 
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
 
-		this.aggregations = ApiTypeHelper.unmodifiable(builder.aggregations);
-		this.meta = ApiTypeHelper.unmodifiable(builder.meta);
+        this.aggregations = ApiTypeHelper.unmodifiable(builder.aggregations);
+        this.meta = ApiTypeHelper.unmodifiable(builder.meta);
 
-	}
+    }
 
-	public static Aggregation of(Function<Builder, ObjectBuilder<Aggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static Aggregation of(Function<Builder, ObjectBuilder<Aggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Sub-aggregations for this aggregation. Only applies to bucket aggregations.
-	 * <p>
-	 * API name: {@code aggregations}
-	 */
-	public final Map<String, Aggregation> aggregations() {
-		return this.aggregations;
-	}
+    /**
+     * Sub-aggregations for this aggregation. Only applies to bucket aggregations.
+     * <p>
+     * API name: {@code aggregations}
+     */
+    public final Map<String, Aggregation> aggregations() {
+        return this.aggregations;
+    }
 
-	/**
-	 * API name: {@code meta}
-	 */
-	public final Map<String, JsonData> meta() {
-		return this.meta;
-	}
-
-	/**
-	 * Is this variant instance of kind {@code adjacency_matrix}?
-	 */
-	public boolean isAdjacencyMatrix() {
-		return _kind == Kind.AdjacencyMatrix;
-	}
-
-	/**
-	 * Get the {@code adjacency_matrix} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code adjacency_matrix}
-	 *             kind.
-	 */
-	public AdjacencyMatrixAggregation adjacencyMatrix() {
-		return TaggedUnionUtils.get(this, Kind.AdjacencyMatrix);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code auto_date_histogram}?
-	 */
-	public boolean isAutoDateHistogram() {
-		return _kind == Kind.AutoDateHistogram;
-	}
-
-	/**
-	 * Get the {@code auto_date_histogram} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code auto_date_histogram}
-	 *             kind.
-	 */
-	public AutoDateHistogramAggregation autoDateHistogram() {
-		return TaggedUnionUtils.get(this, Kind.AutoDateHistogram);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code avg}?
-	 */
-	public boolean isAvg() {
-		return _kind == Kind.Avg;
-	}
-
-	/**
-	 * Get the {@code avg} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code avg} kind.
-	 */
-	public AverageAggregation avg() {
-		return TaggedUnionUtils.get(this, Kind.Avg);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code avg_bucket}?
-	 */
-	public boolean isAvgBucket() {
-		return _kind == Kind.AvgBucket;
-	}
-
-	/**
-	 * Get the {@code avg_bucket} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code avg_bucket} kind.
-	 */
-	public AverageBucketAggregation avgBucket() {
-		return TaggedUnionUtils.get(this, Kind.AvgBucket);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code boxplot}?
-	 */
-	public boolean isBoxplot() {
-		return _kind == Kind.Boxplot;
-	}
-
-	/**
-	 * Get the {@code boxplot} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code boxplot} kind.
-	 */
-	public BoxplotAggregation boxplot() {
-		return TaggedUnionUtils.get(this, Kind.Boxplot);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code bucket_script}?
-	 */
-	public boolean isBucketScript() {
-		return _kind == Kind.BucketScript;
-	}
-
-	/**
-	 * Get the {@code bucket_script} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code bucket_script} kind.
-	 */
-	public BucketScriptAggregation bucketScript() {
-		return TaggedUnionUtils.get(this, Kind.BucketScript);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code bucket_selector}?
-	 */
-	public boolean isBucketSelector() {
-		return _kind == Kind.BucketSelector;
-	}
-
-	/**
-	 * Get the {@code bucket_selector} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code bucket_selector}
-	 *             kind.
-	 */
-	public BucketSelectorAggregation bucketSelector() {
-		return TaggedUnionUtils.get(this, Kind.BucketSelector);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code bucket_sort}?
-	 */
-	public boolean isBucketSort() {
-		return _kind == Kind.BucketSort;
-	}
-
-	/**
-	 * Get the {@code bucket_sort} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code bucket_sort} kind.
-	 */
-	public BucketSortAggregation bucketSort() {
-		return TaggedUnionUtils.get(this, Kind.BucketSort);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code cardinality}?
-	 */
-	public boolean isCardinality() {
-		return _kind == Kind.Cardinality;
-	}
-
-	/**
-	 * Get the {@code cardinality} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code cardinality} kind.
-	 */
-	public CardinalityAggregation cardinality() {
-		return TaggedUnionUtils.get(this, Kind.Cardinality);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code children}?
-	 */
-	public boolean isChildren() {
-		return _kind == Kind.Children;
-	}
-
-	/**
-	 * Get the {@code children} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code children} kind.
-	 */
-	public ChildrenAggregation children() {
-		return TaggedUnionUtils.get(this, Kind.Children);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code composite}?
-	 */
-	public boolean isComposite() {
-		return _kind == Kind.Composite;
-	}
-
-	/**
-	 * Get the {@code composite} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code composite} kind.
-	 */
-	public CompositeAggregation composite() {
-		return TaggedUnionUtils.get(this, Kind.Composite);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code cumulative_cardinality}?
-	 */
-	public boolean isCumulativeCardinality() {
-		return _kind == Kind.CumulativeCardinality;
-	}
-
-	/**
-	 * Get the {@code cumulative_cardinality} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the
-	 *             {@code cumulative_cardinality} kind.
-	 */
-	public CumulativeCardinalityAggregation cumulativeCardinality() {
-		return TaggedUnionUtils.get(this, Kind.CumulativeCardinality);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code cumulative_sum}?
-	 */
-	public boolean isCumulativeSum() {
-		return _kind == Kind.CumulativeSum;
-	}
-
-	/**
-	 * Get the {@code cumulative_sum} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code cumulative_sum} kind.
-	 */
-	public CumulativeSumAggregation cumulativeSum() {
-		return TaggedUnionUtils.get(this, Kind.CumulativeSum);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code date_histogram}?
-	 */
-	public boolean isDateHistogram() {
-		return _kind == Kind.DateHistogram;
-	}
-
-	/**
-	 * Get the {@code date_histogram} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code date_histogram} kind.
-	 */
-	public DateHistogramAggregation dateHistogram() {
-		return TaggedUnionUtils.get(this, Kind.DateHistogram);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code date_range}?
-	 */
-	public boolean isDateRange() {
-		return _kind == Kind.DateRange;
-	}
-
-	/**
-	 * Get the {@code date_range} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code date_range} kind.
-	 */
-	public DateRangeAggregation dateRange() {
-		return TaggedUnionUtils.get(this, Kind.DateRange);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code derivative}?
-	 */
-	public boolean isDerivative() {
-		return _kind == Kind.Derivative;
-	}
-
-	/**
-	 * Get the {@code derivative} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code derivative} kind.
-	 */
-	public DerivativeAggregation derivative() {
-		return TaggedUnionUtils.get(this, Kind.Derivative);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code diversified_sampler}?
-	 */
-	public boolean isDiversifiedSampler() {
-		return _kind == Kind.DiversifiedSampler;
-	}
-
-	/**
-	 * Get the {@code diversified_sampler} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code diversified_sampler}
-	 *             kind.
-	 */
-	public DiversifiedSamplerAggregation diversifiedSampler() {
-		return TaggedUnionUtils.get(this, Kind.DiversifiedSampler);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code extended_stats}?
-	 */
-	public boolean isExtendedStats() {
-		return _kind == Kind.ExtendedStats;
-	}
-
-	/**
-	 * Get the {@code extended_stats} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code extended_stats} kind.
-	 */
-	public ExtendedStatsAggregation extendedStats() {
-		return TaggedUnionUtils.get(this, Kind.ExtendedStats);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code extended_stats_bucket}?
-	 */
-	public boolean isExtendedStatsBucket() {
-		return _kind == Kind.ExtendedStatsBucket;
-	}
-
-	/**
-	 * Get the {@code extended_stats_bucket} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the
-	 *             {@code extended_stats_bucket} kind.
-	 */
-	public ExtendedStatsBucketAggregation extendedStatsBucket() {
-		return TaggedUnionUtils.get(this, Kind.ExtendedStatsBucket);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code filter}?
-	 */
-	public boolean isFilter() {
-		return _kind == Kind.Filter;
-	}
-
-	/**
-	 * Get the {@code filter} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code filter} kind.
-	 */
-	public Query filter() {
-		return TaggedUnionUtils.get(this, Kind.Filter);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code filters}?
-	 */
-	public boolean isFilters() {
-		return _kind == Kind.Filters;
-	}
-
-	/**
-	 * Get the {@code filters} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code filters} kind.
-	 */
-	public FiltersAggregation filters() {
-		return TaggedUnionUtils.get(this, Kind.Filters);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geo_bounds}?
-	 */
-	public boolean isGeoBounds() {
-		return _kind == Kind.GeoBounds;
-	}
-
-	/**
-	 * Get the {@code geo_bounds} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geo_bounds} kind.
-	 */
-	public GeoBoundsAggregation geoBounds() {
-		return TaggedUnionUtils.get(this, Kind.GeoBounds);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geo_centroid}?
-	 */
-	public boolean isGeoCentroid() {
-		return _kind == Kind.GeoCentroid;
-	}
-
-	/**
-	 * Get the {@code geo_centroid} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geo_centroid} kind.
-	 */
-	public GeoCentroidAggregation geoCentroid() {
-		return TaggedUnionUtils.get(this, Kind.GeoCentroid);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geo_distance}?
-	 */
-	public boolean isGeoDistance() {
-		return _kind == Kind.GeoDistance;
-	}
-
-	/**
-	 * Get the {@code geo_distance} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geo_distance} kind.
-	 */
-	public GeoDistanceAggregation geoDistance() {
-		return TaggedUnionUtils.get(this, Kind.GeoDistance);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geohash_grid}?
-	 */
-	public boolean isGeohashGrid() {
-		return _kind == Kind.GeohashGrid;
-	}
-
-	/**
-	 * Get the {@code geohash_grid} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geohash_grid} kind.
-	 */
-	public GeoHashGridAggregation geohashGrid() {
-		return TaggedUnionUtils.get(this, Kind.GeohashGrid);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geo_line}?
-	 */
-	public boolean isGeoLine() {
-		return _kind == Kind.GeoLine;
-	}
-
-	/**
-	 * Get the {@code geo_line} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geo_line} kind.
-	 */
-	public GeoLineAggregation geoLine() {
-		return TaggedUnionUtils.get(this, Kind.GeoLine);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geotile_grid}?
-	 */
-	public boolean isGeotileGrid() {
-		return _kind == Kind.GeotileGrid;
-	}
-
-	/**
-	 * Get the {@code geotile_grid} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geotile_grid} kind.
-	 */
-	public GeoTileGridAggregation geotileGrid() {
-		return TaggedUnionUtils.get(this, Kind.GeotileGrid);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code global}?
-	 */
-	public boolean isGlobal() {
-		return _kind == Kind.Global;
-	}
-
-	/**
-	 * Get the {@code global} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code global} kind.
-	 */
-	public GlobalAggregation global() {
-		return TaggedUnionUtils.get(this, Kind.Global);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code histogram}?
-	 */
-	public boolean isHistogram() {
-		return _kind == Kind.Histogram;
-	}
-
-	/**
-	 * Get the {@code histogram} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code histogram} kind.
-	 */
-	public HistogramAggregation histogram() {
-		return TaggedUnionUtils.get(this, Kind.Histogram);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code ip_range}?
-	 */
-	public boolean isIpRange() {
-		return _kind == Kind.IpRange;
-	}
-
-	/**
-	 * Get the {@code ip_range} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code ip_range} kind.
-	 */
-	public IpRangeAggregation ipRange() {
-		return TaggedUnionUtils.get(this, Kind.IpRange);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code inference}?
-	 */
-	public boolean isInference() {
-		return _kind == Kind.Inference;
-	}
-
-	/**
-	 * Get the {@code inference} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code inference} kind.
-	 */
-	public InferenceAggregation inference() {
-		return TaggedUnionUtils.get(this, Kind.Inference);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code matrix_stats}?
-	 */
-	public boolean isMatrixStats() {
-		return _kind == Kind.MatrixStats;
-	}
-
-	/**
-	 * Get the {@code matrix_stats} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code matrix_stats} kind.
-	 */
-	public MatrixStatsAggregation matrixStats() {
-		return TaggedUnionUtils.get(this, Kind.MatrixStats);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code max}?
-	 */
-	public boolean isMax() {
-		return _kind == Kind.Max;
-	}
-
-	/**
-	 * Get the {@code max} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code max} kind.
-	 */
-	public MaxAggregation max() {
-		return TaggedUnionUtils.get(this, Kind.Max);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code max_bucket}?
-	 */
-	public boolean isMaxBucket() {
-		return _kind == Kind.MaxBucket;
-	}
-
-	/**
-	 * Get the {@code max_bucket} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code max_bucket} kind.
-	 */
-	public MaxBucketAggregation maxBucket() {
-		return TaggedUnionUtils.get(this, Kind.MaxBucket);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code median_absolute_deviation}?
-	 */
-	public boolean isMedianAbsoluteDeviation() {
-		return _kind == Kind.MedianAbsoluteDeviation;
-	}
-
-	/**
-	 * Get the {@code median_absolute_deviation} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the
-	 *             {@code median_absolute_deviation} kind.
-	 */
-	public MedianAbsoluteDeviationAggregation medianAbsoluteDeviation() {
-		return TaggedUnionUtils.get(this, Kind.MedianAbsoluteDeviation);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code min}?
-	 */
-	public boolean isMin() {
-		return _kind == Kind.Min;
-	}
-
-	/**
-	 * Get the {@code min} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code min} kind.
-	 */
-	public MinAggregation min() {
-		return TaggedUnionUtils.get(this, Kind.Min);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code min_bucket}?
-	 */
-	public boolean isMinBucket() {
-		return _kind == Kind.MinBucket;
-	}
-
-	/**
-	 * Get the {@code min_bucket} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code min_bucket} kind.
-	 */
-	public MinBucketAggregation minBucket() {
-		return TaggedUnionUtils.get(this, Kind.MinBucket);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code missing}?
-	 */
-	public boolean isMissing() {
-		return _kind == Kind.Missing;
-	}
-
-	/**
-	 * Get the {@code missing} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code missing} kind.
-	 */
-	public MissingAggregation missing() {
-		return TaggedUnionUtils.get(this, Kind.Missing);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code moving_avg}?
-	 */
-	public boolean isMovingAvg() {
-		return _kind == Kind.MovingAvg;
-	}
-
-	/**
-	 * Get the {@code moving_avg} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code moving_avg} kind.
-	 */
-	public MovingAverageAggregation movingAvg() {
-		return TaggedUnionUtils.get(this, Kind.MovingAvg);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code moving_percentiles}?
-	 */
-	public boolean isMovingPercentiles() {
-		return _kind == Kind.MovingPercentiles;
-	}
-
-	/**
-	 * Get the {@code moving_percentiles} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code moving_percentiles}
-	 *             kind.
-	 */
-	public MovingPercentilesAggregation movingPercentiles() {
-		return TaggedUnionUtils.get(this, Kind.MovingPercentiles);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code moving_fn}?
-	 */
-	public boolean isMovingFn() {
-		return _kind == Kind.MovingFn;
-	}
-
-	/**
-	 * Get the {@code moving_fn} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code moving_fn} kind.
-	 */
-	public MovingFunctionAggregation movingFn() {
-		return TaggedUnionUtils.get(this, Kind.MovingFn);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code multi_terms}?
-	 */
-	public boolean isMultiTerms() {
-		return _kind == Kind.MultiTerms;
-	}
-
-	/**
-	 * Get the {@code multi_terms} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code multi_terms} kind.
-	 */
-	public MultiTermsAggregation multiTerms() {
-		return TaggedUnionUtils.get(this, Kind.MultiTerms);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code nested}?
-	 */
-	public boolean isNested() {
-		return _kind == Kind.Nested;
-	}
-
-	/**
-	 * Get the {@code nested} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code nested} kind.
-	 */
-	public NestedAggregation nested() {
-		return TaggedUnionUtils.get(this, Kind.Nested);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code normalize}?
-	 */
-	public boolean isNormalize() {
-		return _kind == Kind.Normalize;
-	}
-
-	/**
-	 * Get the {@code normalize} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code normalize} kind.
-	 */
-	public NormalizeAggregation normalize() {
-		return TaggedUnionUtils.get(this, Kind.Normalize);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code parent}?
-	 */
-	public boolean isParent() {
-		return _kind == Kind.Parent;
-	}
-
-	/**
-	 * Get the {@code parent} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code parent} kind.
-	 */
-	public ParentAggregation parent() {
-		return TaggedUnionUtils.get(this, Kind.Parent);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code percentile_ranks}?
-	 */
-	public boolean isPercentileRanks() {
-		return _kind == Kind.PercentileRanks;
-	}
-
-	/**
-	 * Get the {@code percentile_ranks} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code percentile_ranks}
-	 *             kind.
-	 */
-	public PercentileRanksAggregation percentileRanks() {
-		return TaggedUnionUtils.get(this, Kind.PercentileRanks);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code percentiles}?
-	 */
-	public boolean isPercentiles() {
-		return _kind == Kind.Percentiles;
-	}
-
-	/**
-	 * Get the {@code percentiles} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code percentiles} kind.
-	 */
-	public PercentilesAggregation percentiles() {
-		return TaggedUnionUtils.get(this, Kind.Percentiles);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code percentiles_bucket}?
-	 */
-	public boolean isPercentilesBucket() {
-		return _kind == Kind.PercentilesBucket;
-	}
-
-	/**
-	 * Get the {@code percentiles_bucket} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code percentiles_bucket}
-	 *             kind.
-	 */
-	public PercentilesBucketAggregation percentilesBucket() {
-		return TaggedUnionUtils.get(this, Kind.PercentilesBucket);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code range}?
-	 */
-	public boolean isRange() {
-		return _kind == Kind.Range;
-	}
-
-	/**
-	 * Get the {@code range} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code range} kind.
-	 */
-	public RangeAggregation range() {
-		return TaggedUnionUtils.get(this, Kind.Range);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code rare_terms}?
-	 */
-	public boolean isRareTerms() {
-		return _kind == Kind.RareTerms;
-	}
-
-	/**
-	 * Get the {@code rare_terms} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code rare_terms} kind.
-	 */
-	public RareTermsAggregation rareTerms() {
-		return TaggedUnionUtils.get(this, Kind.RareTerms);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code rate}?
-	 */
-	public boolean isRate() {
-		return _kind == Kind.Rate;
-	}
-
-	/**
-	 * Get the {@code rate} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code rate} kind.
-	 */
-	public RateAggregation rate() {
-		return TaggedUnionUtils.get(this, Kind.Rate);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code reverse_nested}?
-	 */
-	public boolean isReverseNested() {
-		return _kind == Kind.ReverseNested;
-	}
-
-	/**
-	 * Get the {@code reverse_nested} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code reverse_nested} kind.
-	 */
-	public ReverseNestedAggregation reverseNested() {
-		return TaggedUnionUtils.get(this, Kind.ReverseNested);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code sampler}?
-	 */
-	public boolean isSampler() {
-		return _kind == Kind.Sampler;
-	}
-
-	/**
-	 * Get the {@code sampler} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code sampler} kind.
-	 */
-	public SamplerAggregation sampler() {
-		return TaggedUnionUtils.get(this, Kind.Sampler);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code scripted_metric}?
-	 */
-	public boolean isScriptedMetric() {
-		return _kind == Kind.ScriptedMetric;
-	}
-
-	/**
-	 * Get the {@code scripted_metric} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code scripted_metric}
-	 *             kind.
-	 */
-	public ScriptedMetricAggregation scriptedMetric() {
-		return TaggedUnionUtils.get(this, Kind.ScriptedMetric);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code serial_diff}?
-	 */
-	public boolean isSerialDiff() {
-		return _kind == Kind.SerialDiff;
-	}
-
-	/**
-	 * Get the {@code serial_diff} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code serial_diff} kind.
-	 */
-	public SerialDifferencingAggregation serialDiff() {
-		return TaggedUnionUtils.get(this, Kind.SerialDiff);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code significant_terms}?
-	 */
-	public boolean isSignificantTerms() {
-		return _kind == Kind.SignificantTerms;
-	}
-
-	/**
-	 * Get the {@code significant_terms} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code significant_terms}
-	 *             kind.
-	 */
-	public SignificantTermsAggregation significantTerms() {
-		return TaggedUnionUtils.get(this, Kind.SignificantTerms);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code significant_text}?
-	 */
-	public boolean isSignificantText() {
-		return _kind == Kind.SignificantText;
-	}
-
-	/**
-	 * Get the {@code significant_text} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code significant_text}
-	 *             kind.
-	 */
-	public SignificantTextAggregation significantText() {
-		return TaggedUnionUtils.get(this, Kind.SignificantText);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code stats}?
-	 */
-	public boolean isStats() {
-		return _kind == Kind.Stats;
-	}
-
-	/**
-	 * Get the {@code stats} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code stats} kind.
-	 */
-	public StatsAggregation stats() {
-		return TaggedUnionUtils.get(this, Kind.Stats);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code stats_bucket}?
-	 */
-	public boolean isStatsBucket() {
-		return _kind == Kind.StatsBucket;
-	}
-
-	/**
-	 * Get the {@code stats_bucket} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code stats_bucket} kind.
-	 */
-	public StatsBucketAggregation statsBucket() {
-		return TaggedUnionUtils.get(this, Kind.StatsBucket);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code string_stats}?
-	 */
-	public boolean isStringStats() {
-		return _kind == Kind.StringStats;
-	}
-
-	/**
-	 * Get the {@code string_stats} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code string_stats} kind.
-	 */
-	public StringStatsAggregation stringStats() {
-		return TaggedUnionUtils.get(this, Kind.StringStats);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code sum}?
-	 */
-	public boolean isSum() {
-		return _kind == Kind.Sum;
-	}
-
-	/**
-	 * Get the {@code sum} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code sum} kind.
-	 */
-	public SumAggregation sum() {
-		return TaggedUnionUtils.get(this, Kind.Sum);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code sum_bucket}?
-	 */
-	public boolean isSumBucket() {
-		return _kind == Kind.SumBucket;
-	}
-
-	/**
-	 * Get the {@code sum_bucket} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code sum_bucket} kind.
-	 */
-	public SumBucketAggregation sumBucket() {
-		return TaggedUnionUtils.get(this, Kind.SumBucket);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code terms}?
-	 */
-	public boolean isTerms() {
-		return _kind == Kind.Terms;
-	}
-
-	/**
-	 * Get the {@code terms} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code terms} kind.
-	 */
-	public TermsAggregation terms() {
-		return TaggedUnionUtils.get(this, Kind.Terms);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code top_hits}?
-	 */
-	public boolean isTopHits() {
-		return _kind == Kind.TopHits;
-	}
-
-	/**
-	 * Get the {@code top_hits} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code top_hits} kind.
-	 */
-	public TopHitsAggregation topHits() {
-		return TaggedUnionUtils.get(this, Kind.TopHits);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code t_test}?
-	 */
-	public boolean isTTest() {
-		return _kind == Kind.TTest;
-	}
-
-	/**
-	 * Get the {@code t_test} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code t_test} kind.
-	 */
-	public TTestAggregation tTest() {
-		return TaggedUnionUtils.get(this, Kind.TTest);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code top_metrics}?
-	 */
-	public boolean isTopMetrics() {
-		return _kind == Kind.TopMetrics;
-	}
-
-	/**
-	 * Get the {@code top_metrics} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code top_metrics} kind.
-	 */
-	public TopMetricsAggregation topMetrics() {
-		return TaggedUnionUtils.get(this, Kind.TopMetrics);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code value_count}?
-	 */
-	public boolean isValueCount() {
-		return _kind == Kind.ValueCount;
-	}
-
-	/**
-	 * Get the {@code value_count} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code value_count} kind.
-	 */
-	public ValueCountAggregation valueCount() {
-		return TaggedUnionUtils.get(this, Kind.ValueCount);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code weighted_avg}?
-	 */
-	public boolean isWeightedAvg() {
-		return _kind == Kind.WeightedAvg;
-	}
-
-	/**
-	 * Get the {@code weighted_avg} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code weighted_avg} kind.
-	 */
-	public WeightedAverageAggregation weightedAvg() {
-		return TaggedUnionUtils.get(this, Kind.WeightedAvg);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code variable_width_histogram}?
-	 */
-	public boolean isVariableWidthHistogram() {
-		return _kind == Kind.VariableWidthHistogram;
-	}
-
-	/**
-	 * Get the {@code variable_width_histogram} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the
-	 *             {@code variable_width_histogram} kind.
-	 */
-	public VariableWidthHistogramAggregation variableWidthHistogram() {
-		return TaggedUnionUtils.get(this, Kind.VariableWidthHistogram);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeStartObject();
-
-		if (ApiTypeHelper.isDefined(this.aggregations)) {
-			generator.writeKey("aggregations");
-			generator.writeStartObject();
-			for (Map.Entry<String, Aggregation> item0 : this.aggregations.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.meta)) {
-			generator.writeKey("meta");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-		generator.writeKey(_kind.jsonValue());
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		}
-
-		generator.writeEnd();
-
-	}
-
-	public static class Builder extends ObjectBuilderBase {
-		private Kind _kind;
-		private Object _value;
-
-		@Nullable
-		private Map<String, Aggregation> aggregations;
-
-		@Nullable
-		private Map<String, JsonData> meta;
-
-		/**
-		 * Sub-aggregations for this aggregation. Only applies to bucket aggregations.
-		 * <p>
-		 * API name: {@code aggregations}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aggregations</code>.
-		 */
-		public final Builder aggregations(Map<String, Aggregation> map) {
-			this.aggregations = _mapPutAll(this.aggregations, map);
-			return this;
-		}
-
-		/**
-		 * Sub-aggregations for this aggregation. Only applies to bucket aggregations.
-		 * <p>
-		 * API name: {@code aggregations}
-		 * <p>
-		 * Adds an entry to <code>aggregations</code>.
-		 */
-		public final Builder aggregations(String key, Aggregation value) {
-			this.aggregations = _mapPut(this.aggregations, key, value);
-			return this;
-		}
-
-		/**
-		 * Sub-aggregations for this aggregation. Only applies to bucket aggregations.
-		 * <p>
-		 * API name: {@code aggregations}
-		 * <p>
-		 * Adds an entry to <code>aggregations</code> using a builder lambda.
-		 */
-		public final Builder aggregations(String key, Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
-			return aggregations(key, fn.apply(new Aggregation.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code meta}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>meta</code>.
-		 */
-		public final Builder meta(Map<String, JsonData> map) {
-			this.meta = _mapPutAll(this.meta, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code meta}
-		 * <p>
-		 * Adds an entry to <code>meta</code>.
-		 */
-		public final Builder meta(String key, JsonData value) {
-			this.meta = _mapPut(this.meta, key, value);
-			return this;
-		}
-
-		public ContainerBuilder adjacencyMatrix(AdjacencyMatrixAggregation v) {
-			this._kind = Kind.AdjacencyMatrix;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder adjacencyMatrix(
-				Function<AdjacencyMatrixAggregation.Builder, ObjectBuilder<AdjacencyMatrixAggregation>> fn) {
-			return this.adjacencyMatrix(fn.apply(new AdjacencyMatrixAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder autoDateHistogram(AutoDateHistogramAggregation v) {
-			this._kind = Kind.AutoDateHistogram;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder autoDateHistogram(
-				Function<AutoDateHistogramAggregation.Builder, ObjectBuilder<AutoDateHistogramAggregation>> fn) {
-			return this.autoDateHistogram(fn.apply(new AutoDateHistogramAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder avg(AverageAggregation v) {
-			this._kind = Kind.Avg;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder avg(Function<AverageAggregation.Builder, ObjectBuilder<AverageAggregation>> fn) {
-			return this.avg(fn.apply(new AverageAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder avgBucket(AverageBucketAggregation v) {
-			this._kind = Kind.AvgBucket;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder avgBucket(
-				Function<AverageBucketAggregation.Builder, ObjectBuilder<AverageBucketAggregation>> fn) {
-			return this.avgBucket(fn.apply(new AverageBucketAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder boxplot(BoxplotAggregation v) {
-			this._kind = Kind.Boxplot;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder boxplot(Function<BoxplotAggregation.Builder, ObjectBuilder<BoxplotAggregation>> fn) {
-			return this.boxplot(fn.apply(new BoxplotAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder bucketScript(BucketScriptAggregation v) {
-			this._kind = Kind.BucketScript;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder bucketScript(
-				Function<BucketScriptAggregation.Builder, ObjectBuilder<BucketScriptAggregation>> fn) {
-			return this.bucketScript(fn.apply(new BucketScriptAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder bucketSelector(BucketSelectorAggregation v) {
-			this._kind = Kind.BucketSelector;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder bucketSelector(
-				Function<BucketSelectorAggregation.Builder, ObjectBuilder<BucketSelectorAggregation>> fn) {
-			return this.bucketSelector(fn.apply(new BucketSelectorAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder bucketSort(BucketSortAggregation v) {
-			this._kind = Kind.BucketSort;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder bucketSort(
-				Function<BucketSortAggregation.Builder, ObjectBuilder<BucketSortAggregation>> fn) {
-			return this.bucketSort(fn.apply(new BucketSortAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder cardinality(CardinalityAggregation v) {
-			this._kind = Kind.Cardinality;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder cardinality(
-				Function<CardinalityAggregation.Builder, ObjectBuilder<CardinalityAggregation>> fn) {
-			return this.cardinality(fn.apply(new CardinalityAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder children(ChildrenAggregation v) {
-			this._kind = Kind.Children;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder children(Function<ChildrenAggregation.Builder, ObjectBuilder<ChildrenAggregation>> fn) {
-			return this.children(fn.apply(new ChildrenAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder composite(CompositeAggregation v) {
-			this._kind = Kind.Composite;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder composite(
-				Function<CompositeAggregation.Builder, ObjectBuilder<CompositeAggregation>> fn) {
-			return this.composite(fn.apply(new CompositeAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder cumulativeCardinality(CumulativeCardinalityAggregation v) {
-			this._kind = Kind.CumulativeCardinality;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder cumulativeCardinality(
-				Function<CumulativeCardinalityAggregation.Builder, ObjectBuilder<CumulativeCardinalityAggregation>> fn) {
-			return this.cumulativeCardinality(fn.apply(new CumulativeCardinalityAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder cumulativeSum(CumulativeSumAggregation v) {
-			this._kind = Kind.CumulativeSum;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder cumulativeSum(
-				Function<CumulativeSumAggregation.Builder, ObjectBuilder<CumulativeSumAggregation>> fn) {
-			return this.cumulativeSum(fn.apply(new CumulativeSumAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder dateHistogram(DateHistogramAggregation v) {
-			this._kind = Kind.DateHistogram;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder dateHistogram(
-				Function<DateHistogramAggregation.Builder, ObjectBuilder<DateHistogramAggregation>> fn) {
-			return this.dateHistogram(fn.apply(new DateHistogramAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder dateRange(DateRangeAggregation v) {
-			this._kind = Kind.DateRange;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder dateRange(
-				Function<DateRangeAggregation.Builder, ObjectBuilder<DateRangeAggregation>> fn) {
-			return this.dateRange(fn.apply(new DateRangeAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder derivative(DerivativeAggregation v) {
-			this._kind = Kind.Derivative;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder derivative(
-				Function<DerivativeAggregation.Builder, ObjectBuilder<DerivativeAggregation>> fn) {
-			return this.derivative(fn.apply(new DerivativeAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder diversifiedSampler(DiversifiedSamplerAggregation v) {
-			this._kind = Kind.DiversifiedSampler;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder diversifiedSampler(
-				Function<DiversifiedSamplerAggregation.Builder, ObjectBuilder<DiversifiedSamplerAggregation>> fn) {
-			return this.diversifiedSampler(fn.apply(new DiversifiedSamplerAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder extendedStats(ExtendedStatsAggregation v) {
-			this._kind = Kind.ExtendedStats;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder extendedStats(
-				Function<ExtendedStatsAggregation.Builder, ObjectBuilder<ExtendedStatsAggregation>> fn) {
-			return this.extendedStats(fn.apply(new ExtendedStatsAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder extendedStatsBucket(ExtendedStatsBucketAggregation v) {
-			this._kind = Kind.ExtendedStatsBucket;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder extendedStatsBucket(
-				Function<ExtendedStatsBucketAggregation.Builder, ObjectBuilder<ExtendedStatsBucketAggregation>> fn) {
-			return this.extendedStatsBucket(fn.apply(new ExtendedStatsBucketAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder filter(Query v) {
-			this._kind = Kind.Filter;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.filter(fn.apply(new Query.Builder()).build());
-		}
-
-		public ContainerBuilder filters(FiltersAggregation v) {
-			this._kind = Kind.Filters;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder filters(Function<FiltersAggregation.Builder, ObjectBuilder<FiltersAggregation>> fn) {
-			return this.filters(fn.apply(new FiltersAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder geoBounds(GeoBoundsAggregation v) {
-			this._kind = Kind.GeoBounds;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder geoBounds(
-				Function<GeoBoundsAggregation.Builder, ObjectBuilder<GeoBoundsAggregation>> fn) {
-			return this.geoBounds(fn.apply(new GeoBoundsAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder geoCentroid(GeoCentroidAggregation v) {
-			this._kind = Kind.GeoCentroid;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder geoCentroid(
-				Function<GeoCentroidAggregation.Builder, ObjectBuilder<GeoCentroidAggregation>> fn) {
-			return this.geoCentroid(fn.apply(new GeoCentroidAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder geoDistance(GeoDistanceAggregation v) {
-			this._kind = Kind.GeoDistance;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder geoDistance(
-				Function<GeoDistanceAggregation.Builder, ObjectBuilder<GeoDistanceAggregation>> fn) {
-			return this.geoDistance(fn.apply(new GeoDistanceAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder geohashGrid(GeoHashGridAggregation v) {
-			this._kind = Kind.GeohashGrid;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder geohashGrid(
-				Function<GeoHashGridAggregation.Builder, ObjectBuilder<GeoHashGridAggregation>> fn) {
-			return this.geohashGrid(fn.apply(new GeoHashGridAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder geoLine(GeoLineAggregation v) {
-			this._kind = Kind.GeoLine;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder geoLine(Function<GeoLineAggregation.Builder, ObjectBuilder<GeoLineAggregation>> fn) {
-			return this.geoLine(fn.apply(new GeoLineAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder geotileGrid(GeoTileGridAggregation v) {
-			this._kind = Kind.GeotileGrid;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder geotileGrid(
-				Function<GeoTileGridAggregation.Builder, ObjectBuilder<GeoTileGridAggregation>> fn) {
-			return this.geotileGrid(fn.apply(new GeoTileGridAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder global(GlobalAggregation v) {
-			this._kind = Kind.Global;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder global(Function<GlobalAggregation.Builder, ObjectBuilder<GlobalAggregation>> fn) {
-			return this.global(fn.apply(new GlobalAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder histogram(HistogramAggregation v) {
-			this._kind = Kind.Histogram;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder histogram(
-				Function<HistogramAggregation.Builder, ObjectBuilder<HistogramAggregation>> fn) {
-			return this.histogram(fn.apply(new HistogramAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder ipRange(IpRangeAggregation v) {
-			this._kind = Kind.IpRange;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder ipRange(Function<IpRangeAggregation.Builder, ObjectBuilder<IpRangeAggregation>> fn) {
-			return this.ipRange(fn.apply(new IpRangeAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder inference(InferenceAggregation v) {
-			this._kind = Kind.Inference;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder inference(
-				Function<InferenceAggregation.Builder, ObjectBuilder<InferenceAggregation>> fn) {
-			return this.inference(fn.apply(new InferenceAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder matrixStats(MatrixStatsAggregation v) {
-			this._kind = Kind.MatrixStats;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder matrixStats(
-				Function<MatrixStatsAggregation.Builder, ObjectBuilder<MatrixStatsAggregation>> fn) {
-			return this.matrixStats(fn.apply(new MatrixStatsAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder max(MaxAggregation v) {
-			this._kind = Kind.Max;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder max(Function<MaxAggregation.Builder, ObjectBuilder<MaxAggregation>> fn) {
-			return this.max(fn.apply(new MaxAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder maxBucket(MaxBucketAggregation v) {
-			this._kind = Kind.MaxBucket;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder maxBucket(
-				Function<MaxBucketAggregation.Builder, ObjectBuilder<MaxBucketAggregation>> fn) {
-			return this.maxBucket(fn.apply(new MaxBucketAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder medianAbsoluteDeviation(MedianAbsoluteDeviationAggregation v) {
-			this._kind = Kind.MedianAbsoluteDeviation;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder medianAbsoluteDeviation(
-				Function<MedianAbsoluteDeviationAggregation.Builder,
-						ObjectBuilder<MedianAbsoluteDeviationAggregation>> fn) {
-			return this.medianAbsoluteDeviation(fn.apply(new MedianAbsoluteDeviationAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder min(MinAggregation v) {
-			this._kind = Kind.Min;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder min(Function<MinAggregation.Builder, ObjectBuilder<MinAggregation>> fn) {
-			return this.min(fn.apply(new MinAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder minBucket(MinBucketAggregation v) {
-			this._kind = Kind.MinBucket;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder minBucket(
-				Function<MinBucketAggregation.Builder, ObjectBuilder<MinBucketAggregation>> fn) {
-			return this.minBucket(fn.apply(new MinBucketAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder missing(MissingAggregation v) {
-			this._kind = Kind.Missing;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder missing(Function<MissingAggregation.Builder, ObjectBuilder<MissingAggregation>> fn) {
-			return this.missing(fn.apply(new MissingAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder movingAvg(MovingAverageAggregation v) {
-			this._kind = Kind.MovingAvg;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder movingAvg(
-				Function<MovingAverageAggregation.Builder, ObjectBuilder<MovingAverageAggregation>> fn) {
-			return this.movingAvg(fn.apply(new MovingAverageAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder movingPercentiles(MovingPercentilesAggregation v) {
-			this._kind = Kind.MovingPercentiles;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder movingPercentiles(
-				Function<MovingPercentilesAggregation.Builder, ObjectBuilder<MovingPercentilesAggregation>> fn) {
-			return this.movingPercentiles(fn.apply(new MovingPercentilesAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder movingFn(MovingFunctionAggregation v) {
-			this._kind = Kind.MovingFn;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder movingFn(
-				Function<MovingFunctionAggregation.Builder, ObjectBuilder<MovingFunctionAggregation>> fn) {
-			return this.movingFn(fn.apply(new MovingFunctionAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder multiTerms(MultiTermsAggregation v) {
-			this._kind = Kind.MultiTerms;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder multiTerms(
-				Function<MultiTermsAggregation.Builder, ObjectBuilder<MultiTermsAggregation>> fn) {
-			return this.multiTerms(fn.apply(new MultiTermsAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder nested(NestedAggregation v) {
-			this._kind = Kind.Nested;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder nested(Function<NestedAggregation.Builder, ObjectBuilder<NestedAggregation>> fn) {
-			return this.nested(fn.apply(new NestedAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder normalize(NormalizeAggregation v) {
-			this._kind = Kind.Normalize;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder normalize(
-				Function<NormalizeAggregation.Builder, ObjectBuilder<NormalizeAggregation>> fn) {
-			return this.normalize(fn.apply(new NormalizeAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder parent(ParentAggregation v) {
-			this._kind = Kind.Parent;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder parent(Function<ParentAggregation.Builder, ObjectBuilder<ParentAggregation>> fn) {
-			return this.parent(fn.apply(new ParentAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder percentileRanks(PercentileRanksAggregation v) {
-			this._kind = Kind.PercentileRanks;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder percentileRanks(
-				Function<PercentileRanksAggregation.Builder, ObjectBuilder<PercentileRanksAggregation>> fn) {
-			return this.percentileRanks(fn.apply(new PercentileRanksAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder percentiles(PercentilesAggregation v) {
-			this._kind = Kind.Percentiles;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder percentiles(
-				Function<PercentilesAggregation.Builder, ObjectBuilder<PercentilesAggregation>> fn) {
-			return this.percentiles(fn.apply(new PercentilesAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder percentilesBucket(PercentilesBucketAggregation v) {
-			this._kind = Kind.PercentilesBucket;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder percentilesBucket(
-				Function<PercentilesBucketAggregation.Builder, ObjectBuilder<PercentilesBucketAggregation>> fn) {
-			return this.percentilesBucket(fn.apply(new PercentilesBucketAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder range(RangeAggregation v) {
-			this._kind = Kind.Range;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder range(Function<RangeAggregation.Builder, ObjectBuilder<RangeAggregation>> fn) {
-			return this.range(fn.apply(new RangeAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder rareTerms(RareTermsAggregation v) {
-			this._kind = Kind.RareTerms;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder rareTerms(
-				Function<RareTermsAggregation.Builder, ObjectBuilder<RareTermsAggregation>> fn) {
-			return this.rareTerms(fn.apply(new RareTermsAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder rate(RateAggregation v) {
-			this._kind = Kind.Rate;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder rate(Function<RateAggregation.Builder, ObjectBuilder<RateAggregation>> fn) {
-			return this.rate(fn.apply(new RateAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder reverseNested(ReverseNestedAggregation v) {
-			this._kind = Kind.ReverseNested;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder reverseNested(
-				Function<ReverseNestedAggregation.Builder, ObjectBuilder<ReverseNestedAggregation>> fn) {
-			return this.reverseNested(fn.apply(new ReverseNestedAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder sampler(SamplerAggregation v) {
-			this._kind = Kind.Sampler;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder sampler(Function<SamplerAggregation.Builder, ObjectBuilder<SamplerAggregation>> fn) {
-			return this.sampler(fn.apply(new SamplerAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder scriptedMetric(ScriptedMetricAggregation v) {
-			this._kind = Kind.ScriptedMetric;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder scriptedMetric(
-				Function<ScriptedMetricAggregation.Builder, ObjectBuilder<ScriptedMetricAggregation>> fn) {
-			return this.scriptedMetric(fn.apply(new ScriptedMetricAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder serialDiff(SerialDifferencingAggregation v) {
-			this._kind = Kind.SerialDiff;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder serialDiff(
-				Function<SerialDifferencingAggregation.Builder, ObjectBuilder<SerialDifferencingAggregation>> fn) {
-			return this.serialDiff(fn.apply(new SerialDifferencingAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder significantTerms(SignificantTermsAggregation v) {
-			this._kind = Kind.SignificantTerms;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder significantTerms(
-				Function<SignificantTermsAggregation.Builder, ObjectBuilder<SignificantTermsAggregation>> fn) {
-			return this.significantTerms(fn.apply(new SignificantTermsAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder significantText(SignificantTextAggregation v) {
-			this._kind = Kind.SignificantText;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder significantText(
-				Function<SignificantTextAggregation.Builder, ObjectBuilder<SignificantTextAggregation>> fn) {
-			return this.significantText(fn.apply(new SignificantTextAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder stats(StatsAggregation v) {
-			this._kind = Kind.Stats;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder stats(Function<StatsAggregation.Builder, ObjectBuilder<StatsAggregation>> fn) {
-			return this.stats(fn.apply(new StatsAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder statsBucket(StatsBucketAggregation v) {
-			this._kind = Kind.StatsBucket;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder statsBucket(
-				Function<StatsBucketAggregation.Builder, ObjectBuilder<StatsBucketAggregation>> fn) {
-			return this.statsBucket(fn.apply(new StatsBucketAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder stringStats(StringStatsAggregation v) {
-			this._kind = Kind.StringStats;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder stringStats(
-				Function<StringStatsAggregation.Builder, ObjectBuilder<StringStatsAggregation>> fn) {
-			return this.stringStats(fn.apply(new StringStatsAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder sum(SumAggregation v) {
-			this._kind = Kind.Sum;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder sum(Function<SumAggregation.Builder, ObjectBuilder<SumAggregation>> fn) {
-			return this.sum(fn.apply(new SumAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder sumBucket(SumBucketAggregation v) {
-			this._kind = Kind.SumBucket;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder sumBucket(
-				Function<SumBucketAggregation.Builder, ObjectBuilder<SumBucketAggregation>> fn) {
-			return this.sumBucket(fn.apply(new SumBucketAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder terms(TermsAggregation v) {
-			this._kind = Kind.Terms;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder terms(Function<TermsAggregation.Builder, ObjectBuilder<TermsAggregation>> fn) {
-			return this.terms(fn.apply(new TermsAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder topHits(TopHitsAggregation v) {
-			this._kind = Kind.TopHits;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder topHits(Function<TopHitsAggregation.Builder, ObjectBuilder<TopHitsAggregation>> fn) {
-			return this.topHits(fn.apply(new TopHitsAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder tTest(TTestAggregation v) {
-			this._kind = Kind.TTest;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder tTest(Function<TTestAggregation.Builder, ObjectBuilder<TTestAggregation>> fn) {
-			return this.tTest(fn.apply(new TTestAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder topMetrics(TopMetricsAggregation v) {
-			this._kind = Kind.TopMetrics;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder topMetrics(
-				Function<TopMetricsAggregation.Builder, ObjectBuilder<TopMetricsAggregation>> fn) {
-			return this.topMetrics(fn.apply(new TopMetricsAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder valueCount(ValueCountAggregation v) {
-			this._kind = Kind.ValueCount;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder valueCount(
-				Function<ValueCountAggregation.Builder, ObjectBuilder<ValueCountAggregation>> fn) {
-			return this.valueCount(fn.apply(new ValueCountAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder weightedAvg(WeightedAverageAggregation v) {
-			this._kind = Kind.WeightedAvg;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder weightedAvg(
-				Function<WeightedAverageAggregation.Builder, ObjectBuilder<WeightedAverageAggregation>> fn) {
-			return this.weightedAvg(fn.apply(new WeightedAverageAggregation.Builder()).build());
-		}
-
-		public ContainerBuilder variableWidthHistogram(VariableWidthHistogramAggregation v) {
-			this._kind = Kind.VariableWidthHistogram;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder variableWidthHistogram(
-				Function<VariableWidthHistogramAggregation.Builder, ObjectBuilder<VariableWidthHistogramAggregation>> fn) {
-			return this.variableWidthHistogram(fn.apply(new VariableWidthHistogramAggregation.Builder()).build());
-		}
-
-		protected Aggregation build() {
-			_checkSingleUse();
-			return new Aggregation(this);
-		}
-
-		public class ContainerBuilder implements ObjectBuilder<Aggregation> {
-
-			/**
-			 * Sub-aggregations for this aggregation. Only applies to bucket aggregations.
-			 * <p>
-			 * API name: {@code aggregations}
-			 * <p>
-			 * Adds all entries of <code>map</code> to <code>aggregations</code>.
-			 */
-			public final ContainerBuilder aggregations(Map<String, Aggregation> map) {
-				Builder.this.aggregations = _mapPutAll(Builder.this.aggregations, map);
-				return this;
-			}
-
-			/**
-			 * Sub-aggregations for this aggregation. Only applies to bucket aggregations.
-			 * <p>
-			 * API name: {@code aggregations}
-			 * <p>
-			 * Adds an entry to <code>aggregations</code>.
-			 */
-			public final ContainerBuilder aggregations(String key, Aggregation value) {
-				Builder.this.aggregations = _mapPut(Builder.this.aggregations, key, value);
-				return this;
-			}
-
-			/**
-			 * Sub-aggregations for this aggregation. Only applies to bucket aggregations.
-			 * <p>
-			 * API name: {@code aggregations}
-			 * <p>
-			 * Adds an entry to <code>aggregations</code> using a builder lambda.
-			 */
-			public final ContainerBuilder aggregations(String key,
-					Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
-				return aggregations(key, fn.apply(new Aggregation.Builder()).build());
-			}
-
-			/**
-			 * API name: {@code meta}
-			 * <p>
-			 * Adds all entries of <code>map</code> to <code>meta</code>.
-			 */
-			public final ContainerBuilder meta(Map<String, JsonData> map) {
-				Builder.this.meta = _mapPutAll(Builder.this.meta, map);
-				return this;
-			}
-
-			/**
-			 * API name: {@code meta}
-			 * <p>
-			 * Adds an entry to <code>meta</code>.
-			 */
-			public final ContainerBuilder meta(String key, JsonData value) {
-				Builder.this.meta = _mapPut(Builder.this.meta, key, value);
-				return this;
-			}
-
-			public Aggregation build() {
-				return Builder.this.build();
-			}
-		}
-	}
-
-	protected static void setupAggregationDeserializer(ObjectDeserializer<Builder> op) {
-
-		op.add(Builder::aggregations, JsonpDeserializer.stringMapDeserializer(Aggregation._DESERIALIZER),
-				"aggregations", "aggs");
-		op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "meta");
-		op.add(Builder::adjacencyMatrix, AdjacencyMatrixAggregation._DESERIALIZER, "adjacency_matrix");
-		op.add(Builder::autoDateHistogram, AutoDateHistogramAggregation._DESERIALIZER, "auto_date_histogram");
-		op.add(Builder::avg, AverageAggregation._DESERIALIZER, "avg");
-		op.add(Builder::avgBucket, AverageBucketAggregation._DESERIALIZER, "avg_bucket");
-		op.add(Builder::boxplot, BoxplotAggregation._DESERIALIZER, "boxplot");
-		op.add(Builder::bucketScript, BucketScriptAggregation._DESERIALIZER, "bucket_script");
-		op.add(Builder::bucketSelector, BucketSelectorAggregation._DESERIALIZER, "bucket_selector");
-		op.add(Builder::bucketSort, BucketSortAggregation._DESERIALIZER, "bucket_sort");
-		op.add(Builder::cardinality, CardinalityAggregation._DESERIALIZER, "cardinality");
-		op.add(Builder::children, ChildrenAggregation._DESERIALIZER, "children");
-		op.add(Builder::composite, CompositeAggregation._DESERIALIZER, "composite");
-		op.add(Builder::cumulativeCardinality, CumulativeCardinalityAggregation._DESERIALIZER,
-				"cumulative_cardinality");
-		op.add(Builder::cumulativeSum, CumulativeSumAggregation._DESERIALIZER, "cumulative_sum");
-		op.add(Builder::dateHistogram, DateHistogramAggregation._DESERIALIZER, "date_histogram");
-		op.add(Builder::dateRange, DateRangeAggregation._DESERIALIZER, "date_range");
-		op.add(Builder::derivative, DerivativeAggregation._DESERIALIZER, "derivative");
-		op.add(Builder::diversifiedSampler, DiversifiedSamplerAggregation._DESERIALIZER, "diversified_sampler");
-		op.add(Builder::extendedStats, ExtendedStatsAggregation._DESERIALIZER, "extended_stats");
-		op.add(Builder::extendedStatsBucket, ExtendedStatsBucketAggregation._DESERIALIZER, "extended_stats_bucket");
-		op.add(Builder::filter, Query._DESERIALIZER, "filter");
-		op.add(Builder::filters, FiltersAggregation._DESERIALIZER, "filters");
-		op.add(Builder::geoBounds, GeoBoundsAggregation._DESERIALIZER, "geo_bounds");
-		op.add(Builder::geoCentroid, GeoCentroidAggregation._DESERIALIZER, "geo_centroid");
-		op.add(Builder::geoDistance, GeoDistanceAggregation._DESERIALIZER, "geo_distance");
-		op.add(Builder::geohashGrid, GeoHashGridAggregation._DESERIALIZER, "geohash_grid");
-		op.add(Builder::geoLine, GeoLineAggregation._DESERIALIZER, "geo_line");
-		op.add(Builder::geotileGrid, GeoTileGridAggregation._DESERIALIZER, "geotile_grid");
-		op.add(Builder::global, GlobalAggregation._DESERIALIZER, "global");
-		op.add(Builder::histogram, HistogramAggregation._DESERIALIZER, "histogram");
-		op.add(Builder::ipRange, IpRangeAggregation._DESERIALIZER, "ip_range");
-		op.add(Builder::inference, InferenceAggregation._DESERIALIZER, "inference");
-		op.add(Builder::matrixStats, MatrixStatsAggregation._DESERIALIZER, "matrix_stats");
-		op.add(Builder::max, MaxAggregation._DESERIALIZER, "max");
-		op.add(Builder::maxBucket, MaxBucketAggregation._DESERIALIZER, "max_bucket");
-		op.add(Builder::medianAbsoluteDeviation, MedianAbsoluteDeviationAggregation._DESERIALIZER,
-				"median_absolute_deviation");
-		op.add(Builder::min, MinAggregation._DESERIALIZER, "min");
-		op.add(Builder::minBucket, MinBucketAggregation._DESERIALIZER, "min_bucket");
-		op.add(Builder::missing, MissingAggregation._DESERIALIZER, "missing");
-		op.add(Builder::movingAvg, MovingAverageAggregation._DESERIALIZER, "moving_avg");
-		op.add(Builder::movingPercentiles, MovingPercentilesAggregation._DESERIALIZER, "moving_percentiles");
-		op.add(Builder::movingFn, MovingFunctionAggregation._DESERIALIZER, "moving_fn");
-		op.add(Builder::multiTerms, MultiTermsAggregation._DESERIALIZER, "multi_terms");
-		op.add(Builder::nested, NestedAggregation._DESERIALIZER, "nested");
-		op.add(Builder::normalize, NormalizeAggregation._DESERIALIZER, "normalize");
-		op.add(Builder::parent, ParentAggregation._DESERIALIZER, "parent");
-		op.add(Builder::percentileRanks, PercentileRanksAggregation._DESERIALIZER, "percentile_ranks");
-		op.add(Builder::percentiles, PercentilesAggregation._DESERIALIZER, "percentiles");
-		op.add(Builder::percentilesBucket, PercentilesBucketAggregation._DESERIALIZER, "percentiles_bucket");
-		op.add(Builder::range, RangeAggregation._DESERIALIZER, "range");
-		op.add(Builder::rareTerms, RareTermsAggregation._DESERIALIZER, "rare_terms");
-		op.add(Builder::rate, RateAggregation._DESERIALIZER, "rate");
-		op.add(Builder::reverseNested, ReverseNestedAggregation._DESERIALIZER, "reverse_nested");
-		op.add(Builder::sampler, SamplerAggregation._DESERIALIZER, "sampler");
-		op.add(Builder::scriptedMetric, ScriptedMetricAggregation._DESERIALIZER, "scripted_metric");
-		op.add(Builder::serialDiff, SerialDifferencingAggregation._DESERIALIZER, "serial_diff");
-		op.add(Builder::significantTerms, SignificantTermsAggregation._DESERIALIZER, "significant_terms");
-		op.add(Builder::significantText, SignificantTextAggregation._DESERIALIZER, "significant_text");
-		op.add(Builder::stats, StatsAggregation._DESERIALIZER, "stats");
-		op.add(Builder::statsBucket, StatsBucketAggregation._DESERIALIZER, "stats_bucket");
-		op.add(Builder::stringStats, StringStatsAggregation._DESERIALIZER, "string_stats");
-		op.add(Builder::sum, SumAggregation._DESERIALIZER, "sum");
-		op.add(Builder::sumBucket, SumBucketAggregation._DESERIALIZER, "sum_bucket");
-		op.add(Builder::terms, TermsAggregation._DESERIALIZER, "terms");
-		op.add(Builder::topHits, TopHitsAggregation._DESERIALIZER, "top_hits");
-		op.add(Builder::tTest, TTestAggregation._DESERIALIZER, "t_test");
-		op.add(Builder::topMetrics, TopMetricsAggregation._DESERIALIZER, "top_metrics");
-		op.add(Builder::valueCount, ValueCountAggregation._DESERIALIZER, "value_count");
-		op.add(Builder::weightedAvg, WeightedAverageAggregation._DESERIALIZER, "weighted_avg");
-		op.add(Builder::variableWidthHistogram, VariableWidthHistogramAggregation._DESERIALIZER,
-				"variable_width_histogram");
-
-	}
-
-	public static final JsonpDeserializer<Aggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Aggregation::setupAggregationDeserializer, Builder::build);
+    /**
+     * API name: {@code meta}
+     */
+    public final Map<String, JsonData> meta() {
+        return this.meta;
+    }
+
+    /**
+     * Is this variant instance of kind {@code adjacency_matrix}?
+     */
+    public boolean isAdjacencyMatrix() {
+        return _kind == Kind.AdjacencyMatrix;
+    }
+
+    /**
+     * Get the {@code adjacency_matrix} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code adjacency_matrix}
+     *             kind.
+     */
+    public AdjacencyMatrixAggregation adjacencyMatrix() {
+        return TaggedUnionUtils.get(this, Kind.AdjacencyMatrix);
+    }
+
+    /**
+     * Is this variant instance of kind {@code auto_date_histogram}?
+     */
+    public boolean isAutoDateHistogram() {
+        return _kind == Kind.AutoDateHistogram;
+    }
+
+    /**
+     * Get the {@code auto_date_histogram} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code auto_date_histogram}
+     *             kind.
+     */
+    public AutoDateHistogramAggregation autoDateHistogram() {
+        return TaggedUnionUtils.get(this, Kind.AutoDateHistogram);
+    }
+
+    /**
+     * Is this variant instance of kind {@code avg}?
+     */
+    public boolean isAvg() {
+        return _kind == Kind.Avg;
+    }
+
+    /**
+     * Get the {@code avg} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code avg} kind.
+     */
+    public AverageAggregation avg() {
+        return TaggedUnionUtils.get(this, Kind.Avg);
+    }
+
+    /**
+     * Is this variant instance of kind {@code avg_bucket}?
+     */
+    public boolean isAvgBucket() {
+        return _kind == Kind.AvgBucket;
+    }
+
+    /**
+     * Get the {@code avg_bucket} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code avg_bucket} kind.
+     */
+    public AverageBucketAggregation avgBucket() {
+        return TaggedUnionUtils.get(this, Kind.AvgBucket);
+    }
+
+    /**
+     * Is this variant instance of kind {@code boxplot}?
+     */
+    public boolean isBoxplot() {
+        return _kind == Kind.Boxplot;
+    }
+
+    /**
+     * Get the {@code boxplot} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code boxplot} kind.
+     */
+    public BoxplotAggregation boxplot() {
+        return TaggedUnionUtils.get(this, Kind.Boxplot);
+    }
+
+    /**
+     * Is this variant instance of kind {@code bucket_script}?
+     */
+    public boolean isBucketScript() {
+        return _kind == Kind.BucketScript;
+    }
+
+    /**
+     * Get the {@code bucket_script} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code bucket_script} kind.
+     */
+    public BucketScriptAggregation bucketScript() {
+        return TaggedUnionUtils.get(this, Kind.BucketScript);
+    }
+
+    /**
+     * Is this variant instance of kind {@code bucket_selector}?
+     */
+    public boolean isBucketSelector() {
+        return _kind == Kind.BucketSelector;
+    }
+
+    /**
+     * Get the {@code bucket_selector} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code bucket_selector}
+     *             kind.
+     */
+    public BucketSelectorAggregation bucketSelector() {
+        return TaggedUnionUtils.get(this, Kind.BucketSelector);
+    }
+
+    /**
+     * Is this variant instance of kind {@code bucket_sort}?
+     */
+    public boolean isBucketSort() {
+        return _kind == Kind.BucketSort;
+    }
+
+    /**
+     * Get the {@code bucket_sort} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code bucket_sort} kind.
+     */
+    public BucketSortAggregation bucketSort() {
+        return TaggedUnionUtils.get(this, Kind.BucketSort);
+    }
+
+    /**
+     * Is this variant instance of kind {@code cardinality}?
+     */
+    public boolean isCardinality() {
+        return _kind == Kind.Cardinality;
+    }
+
+    /**
+     * Get the {@code cardinality} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code cardinality} kind.
+     */
+    public CardinalityAggregation cardinality() {
+        return TaggedUnionUtils.get(this, Kind.Cardinality);
+    }
+
+    /**
+     * Is this variant instance of kind {@code children}?
+     */
+    public boolean isChildren() {
+        return _kind == Kind.Children;
+    }
+
+    /**
+     * Get the {@code children} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code children} kind.
+     */
+    public ChildrenAggregation children() {
+        return TaggedUnionUtils.get(this, Kind.Children);
+    }
+
+    /**
+     * Is this variant instance of kind {@code composite}?
+     */
+    public boolean isComposite() {
+        return _kind == Kind.Composite;
+    }
+
+    /**
+     * Get the {@code composite} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code composite} kind.
+     */
+    public CompositeAggregation composite() {
+        return TaggedUnionUtils.get(this, Kind.Composite);
+    }
+
+    /**
+     * Is this variant instance of kind {@code cumulative_cardinality}?
+     */
+    public boolean isCumulativeCardinality() {
+        return _kind == Kind.CumulativeCardinality;
+    }
+
+    /**
+     * Get the {@code cumulative_cardinality} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the
+     *             {@code cumulative_cardinality} kind.
+     */
+    public CumulativeCardinalityAggregation cumulativeCardinality() {
+        return TaggedUnionUtils.get(this, Kind.CumulativeCardinality);
+    }
+
+    /**
+     * Is this variant instance of kind {@code cumulative_sum}?
+     */
+    public boolean isCumulativeSum() {
+        return _kind == Kind.CumulativeSum;
+    }
+
+    /**
+     * Get the {@code cumulative_sum} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code cumulative_sum} kind.
+     */
+    public CumulativeSumAggregation cumulativeSum() {
+        return TaggedUnionUtils.get(this, Kind.CumulativeSum);
+    }
+
+    /**
+     * Is this variant instance of kind {@code date_histogram}?
+     */
+    public boolean isDateHistogram() {
+        return _kind == Kind.DateHistogram;
+    }
+
+    /**
+     * Get the {@code date_histogram} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code date_histogram} kind.
+     */
+    public DateHistogramAggregation dateHistogram() {
+        return TaggedUnionUtils.get(this, Kind.DateHistogram);
+    }
+
+    /**
+     * Is this variant instance of kind {@code date_range}?
+     */
+    public boolean isDateRange() {
+        return _kind == Kind.DateRange;
+    }
+
+    /**
+     * Get the {@code date_range} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code date_range} kind.
+     */
+    public DateRangeAggregation dateRange() {
+        return TaggedUnionUtils.get(this, Kind.DateRange);
+    }
+
+    /**
+     * Is this variant instance of kind {@code derivative}?
+     */
+    public boolean isDerivative() {
+        return _kind == Kind.Derivative;
+    }
+
+    /**
+     * Get the {@code derivative} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code derivative} kind.
+     */
+    public DerivativeAggregation derivative() {
+        return TaggedUnionUtils.get(this, Kind.Derivative);
+    }
+
+    /**
+     * Is this variant instance of kind {@code diversified_sampler}?
+     */
+    public boolean isDiversifiedSampler() {
+        return _kind == Kind.DiversifiedSampler;
+    }
+
+    /**
+     * Get the {@code diversified_sampler} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code diversified_sampler}
+     *             kind.
+     */
+    public DiversifiedSamplerAggregation diversifiedSampler() {
+        return TaggedUnionUtils.get(this, Kind.DiversifiedSampler);
+    }
+
+    /**
+     * Is this variant instance of kind {@code extended_stats}?
+     */
+    public boolean isExtendedStats() {
+        return _kind == Kind.ExtendedStats;
+    }
+
+    /**
+     * Get the {@code extended_stats} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code extended_stats} kind.
+     */
+    public ExtendedStatsAggregation extendedStats() {
+        return TaggedUnionUtils.get(this, Kind.ExtendedStats);
+    }
+
+    /**
+     * Is this variant instance of kind {@code extended_stats_bucket}?
+     */
+    public boolean isExtendedStatsBucket() {
+        return _kind == Kind.ExtendedStatsBucket;
+    }
+
+    /**
+     * Get the {@code extended_stats_bucket} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the
+     *             {@code extended_stats_bucket} kind.
+     */
+    public ExtendedStatsBucketAggregation extendedStatsBucket() {
+        return TaggedUnionUtils.get(this, Kind.ExtendedStatsBucket);
+    }
+
+    /**
+     * Is this variant instance of kind {@code filter}?
+     */
+    public boolean isFilter() {
+        return _kind == Kind.Filter;
+    }
+
+    /**
+     * Get the {@code filter} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code filter} kind.
+     */
+    public Query filter() {
+        return TaggedUnionUtils.get(this, Kind.Filter);
+    }
+
+    /**
+     * Is this variant instance of kind {@code filters}?
+     */
+    public boolean isFilters() {
+        return _kind == Kind.Filters;
+    }
+
+    /**
+     * Get the {@code filters} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code filters} kind.
+     */
+    public FiltersAggregation filters() {
+        return TaggedUnionUtils.get(this, Kind.Filters);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geo_bounds}?
+     */
+    public boolean isGeoBounds() {
+        return _kind == Kind.GeoBounds;
+    }
+
+    /**
+     * Get the {@code geo_bounds} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geo_bounds} kind.
+     */
+    public GeoBoundsAggregation geoBounds() {
+        return TaggedUnionUtils.get(this, Kind.GeoBounds);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geo_centroid}?
+     */
+    public boolean isGeoCentroid() {
+        return _kind == Kind.GeoCentroid;
+    }
+
+    /**
+     * Get the {@code geo_centroid} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geo_centroid} kind.
+     */
+    public GeoCentroidAggregation geoCentroid() {
+        return TaggedUnionUtils.get(this, Kind.GeoCentroid);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geo_distance}?
+     */
+    public boolean isGeoDistance() {
+        return _kind == Kind.GeoDistance;
+    }
+
+    /**
+     * Get the {@code geo_distance} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geo_distance} kind.
+     */
+    public GeoDistanceAggregation geoDistance() {
+        return TaggedUnionUtils.get(this, Kind.GeoDistance);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geohash_grid}?
+     */
+    public boolean isGeohashGrid() {
+        return _kind == Kind.GeohashGrid;
+    }
+
+    /**
+     * Get the {@code geohash_grid} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geohash_grid} kind.
+     */
+    public GeoHashGridAggregation geohashGrid() {
+        return TaggedUnionUtils.get(this, Kind.GeohashGrid);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geo_line}?
+     */
+    public boolean isGeoLine() {
+        return _kind == Kind.GeoLine;
+    }
+
+    /**
+     * Get the {@code geo_line} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geo_line} kind.
+     */
+    public GeoLineAggregation geoLine() {
+        return TaggedUnionUtils.get(this, Kind.GeoLine);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geotile_grid}?
+     */
+    public boolean isGeotileGrid() {
+        return _kind == Kind.GeotileGrid;
+    }
+
+    /**
+     * Get the {@code geotile_grid} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geotile_grid} kind.
+     */
+    public GeoTileGridAggregation geotileGrid() {
+        return TaggedUnionUtils.get(this, Kind.GeotileGrid);
+    }
+
+    /**
+     * Is this variant instance of kind {@code global}?
+     */
+    public boolean isGlobal() {
+        return _kind == Kind.Global;
+    }
+
+    /**
+     * Get the {@code global} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code global} kind.
+     */
+    public GlobalAggregation global() {
+        return TaggedUnionUtils.get(this, Kind.Global);
+    }
+
+    /**
+     * Is this variant instance of kind {@code histogram}?
+     */
+    public boolean isHistogram() {
+        return _kind == Kind.Histogram;
+    }
+
+    /**
+     * Get the {@code histogram} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code histogram} kind.
+     */
+    public HistogramAggregation histogram() {
+        return TaggedUnionUtils.get(this, Kind.Histogram);
+    }
+
+    /**
+     * Is this variant instance of kind {@code ip_range}?
+     */
+    public boolean isIpRange() {
+        return _kind == Kind.IpRange;
+    }
+
+    /**
+     * Get the {@code ip_range} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code ip_range} kind.
+     */
+    public IpRangeAggregation ipRange() {
+        return TaggedUnionUtils.get(this, Kind.IpRange);
+    }
+
+    /**
+     * Is this variant instance of kind {@code inference}?
+     */
+    public boolean isInference() {
+        return _kind == Kind.Inference;
+    }
+
+    /**
+     * Get the {@code inference} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code inference} kind.
+     */
+    public InferenceAggregation inference() {
+        return TaggedUnionUtils.get(this, Kind.Inference);
+    }
+
+    /**
+     * Is this variant instance of kind {@code matrix_stats}?
+     */
+    public boolean isMatrixStats() {
+        return _kind == Kind.MatrixStats;
+    }
+
+    /**
+     * Get the {@code matrix_stats} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code matrix_stats} kind.
+     */
+    public MatrixStatsAggregation matrixStats() {
+        return TaggedUnionUtils.get(this, Kind.MatrixStats);
+    }
+
+    /**
+     * Is this variant instance of kind {@code max}?
+     */
+    public boolean isMax() {
+        return _kind == Kind.Max;
+    }
+
+    /**
+     * Get the {@code max} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code max} kind.
+     */
+    public MaxAggregation max() {
+        return TaggedUnionUtils.get(this, Kind.Max);
+    }
+
+    /**
+     * Is this variant instance of kind {@code max_bucket}?
+     */
+    public boolean isMaxBucket() {
+        return _kind == Kind.MaxBucket;
+    }
+
+    /**
+     * Get the {@code max_bucket} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code max_bucket} kind.
+     */
+    public MaxBucketAggregation maxBucket() {
+        return TaggedUnionUtils.get(this, Kind.MaxBucket);
+    }
+
+    /**
+     * Is this variant instance of kind {@code median_absolute_deviation}?
+     */
+    public boolean isMedianAbsoluteDeviation() {
+        return _kind == Kind.MedianAbsoluteDeviation;
+    }
+
+    /**
+     * Get the {@code median_absolute_deviation} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the
+     *             {@code median_absolute_deviation} kind.
+     */
+    public MedianAbsoluteDeviationAggregation medianAbsoluteDeviation() {
+        return TaggedUnionUtils.get(this, Kind.MedianAbsoluteDeviation);
+    }
+
+    /**
+     * Is this variant instance of kind {@code min}?
+     */
+    public boolean isMin() {
+        return _kind == Kind.Min;
+    }
+
+    /**
+     * Get the {@code min} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code min} kind.
+     */
+    public MinAggregation min() {
+        return TaggedUnionUtils.get(this, Kind.Min);
+    }
+
+    /**
+     * Is this variant instance of kind {@code min_bucket}?
+     */
+    public boolean isMinBucket() {
+        return _kind == Kind.MinBucket;
+    }
+
+    /**
+     * Get the {@code min_bucket} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code min_bucket} kind.
+     */
+    public MinBucketAggregation minBucket() {
+        return TaggedUnionUtils.get(this, Kind.MinBucket);
+    }
+
+    /**
+     * Is this variant instance of kind {@code missing}?
+     */
+    public boolean isMissing() {
+        return _kind == Kind.Missing;
+    }
+
+    /**
+     * Get the {@code missing} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code missing} kind.
+     */
+    public MissingAggregation missing() {
+        return TaggedUnionUtils.get(this, Kind.Missing);
+    }
+
+    /**
+     * Is this variant instance of kind {@code moving_avg}?
+     */
+    public boolean isMovingAvg() {
+        return _kind == Kind.MovingAvg;
+    }
+
+    /**
+     * Get the {@code moving_avg} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code moving_avg} kind.
+     */
+    public MovingAverageAggregation movingAvg() {
+        return TaggedUnionUtils.get(this, Kind.MovingAvg);
+    }
+
+    /**
+     * Is this variant instance of kind {@code moving_percentiles}?
+     */
+    public boolean isMovingPercentiles() {
+        return _kind == Kind.MovingPercentiles;
+    }
+
+    /**
+     * Get the {@code moving_percentiles} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code moving_percentiles}
+     *             kind.
+     */
+    public MovingPercentilesAggregation movingPercentiles() {
+        return TaggedUnionUtils.get(this, Kind.MovingPercentiles);
+    }
+
+    /**
+     * Is this variant instance of kind {@code moving_fn}?
+     */
+    public boolean isMovingFn() {
+        return _kind == Kind.MovingFn;
+    }
+
+    /**
+     * Get the {@code moving_fn} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code moving_fn} kind.
+     */
+    public MovingFunctionAggregation movingFn() {
+        return TaggedUnionUtils.get(this, Kind.MovingFn);
+    }
+
+    /**
+     * Is this variant instance of kind {@code multi_terms}?
+     */
+    public boolean isMultiTerms() {
+        return _kind == Kind.MultiTerms;
+    }
+
+    /**
+     * Get the {@code multi_terms} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code multi_terms} kind.
+     */
+    public MultiTermsAggregation multiTerms() {
+        return TaggedUnionUtils.get(this, Kind.MultiTerms);
+    }
+
+    /**
+     * Is this variant instance of kind {@code nested}?
+     */
+    public boolean isNested() {
+        return _kind == Kind.Nested;
+    }
+
+    /**
+     * Get the {@code nested} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code nested} kind.
+     */
+    public NestedAggregation nested() {
+        return TaggedUnionUtils.get(this, Kind.Nested);
+    }
+
+    /**
+     * Is this variant instance of kind {@code normalize}?
+     */
+    public boolean isNormalize() {
+        return _kind == Kind.Normalize;
+    }
+
+    /**
+     * Get the {@code normalize} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code normalize} kind.
+     */
+    public NormalizeAggregation normalize() {
+        return TaggedUnionUtils.get(this, Kind.Normalize);
+    }
+
+    /**
+     * Is this variant instance of kind {@code parent}?
+     */
+    public boolean isParent() {
+        return _kind == Kind.Parent;
+    }
+
+    /**
+     * Get the {@code parent} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code parent} kind.
+     */
+    public ParentAggregation parent() {
+        return TaggedUnionUtils.get(this, Kind.Parent);
+    }
+
+    /**
+     * Is this variant instance of kind {@code percentile_ranks}?
+     */
+    public boolean isPercentileRanks() {
+        return _kind == Kind.PercentileRanks;
+    }
+
+    /**
+     * Get the {@code percentile_ranks} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code percentile_ranks}
+     *             kind.
+     */
+    public PercentileRanksAggregation percentileRanks() {
+        return TaggedUnionUtils.get(this, Kind.PercentileRanks);
+    }
+
+    /**
+     * Is this variant instance of kind {@code percentiles}?
+     */
+    public boolean isPercentiles() {
+        return _kind == Kind.Percentiles;
+    }
+
+    /**
+     * Get the {@code percentiles} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code percentiles} kind.
+     */
+    public PercentilesAggregation percentiles() {
+        return TaggedUnionUtils.get(this, Kind.Percentiles);
+    }
+
+    /**
+     * Is this variant instance of kind {@code percentiles_bucket}?
+     */
+    public boolean isPercentilesBucket() {
+        return _kind == Kind.PercentilesBucket;
+    }
+
+    /**
+     * Get the {@code percentiles_bucket} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code percentiles_bucket}
+     *             kind.
+     */
+    public PercentilesBucketAggregation percentilesBucket() {
+        return TaggedUnionUtils.get(this, Kind.PercentilesBucket);
+    }
+
+    /**
+     * Is this variant instance of kind {@code range}?
+     */
+    public boolean isRange() {
+        return _kind == Kind.Range;
+    }
+
+    /**
+     * Get the {@code range} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code range} kind.
+     */
+    public RangeAggregation range() {
+        return TaggedUnionUtils.get(this, Kind.Range);
+    }
+
+    /**
+     * Is this variant instance of kind {@code rare_terms}?
+     */
+    public boolean isRareTerms() {
+        return _kind == Kind.RareTerms;
+    }
+
+    /**
+     * Get the {@code rare_terms} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code rare_terms} kind.
+     */
+    public RareTermsAggregation rareTerms() {
+        return TaggedUnionUtils.get(this, Kind.RareTerms);
+    }
+
+    /**
+     * Is this variant instance of kind {@code rate}?
+     */
+    public boolean isRate() {
+        return _kind == Kind.Rate;
+    }
+
+    /**
+     * Get the {@code rate} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code rate} kind.
+     */
+    public RateAggregation rate() {
+        return TaggedUnionUtils.get(this, Kind.Rate);
+    }
+
+    /**
+     * Is this variant instance of kind {@code reverse_nested}?
+     */
+    public boolean isReverseNested() {
+        return _kind == Kind.ReverseNested;
+    }
+
+    /**
+     * Get the {@code reverse_nested} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code reverse_nested} kind.
+     */
+    public ReverseNestedAggregation reverseNested() {
+        return TaggedUnionUtils.get(this, Kind.ReverseNested);
+    }
+
+    /**
+     * Is this variant instance of kind {@code sampler}?
+     */
+    public boolean isSampler() {
+        return _kind == Kind.Sampler;
+    }
+
+    /**
+     * Get the {@code sampler} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code sampler} kind.
+     */
+    public SamplerAggregation sampler() {
+        return TaggedUnionUtils.get(this, Kind.Sampler);
+    }
+
+    /**
+     * Is this variant instance of kind {@code scripted_metric}?
+     */
+    public boolean isScriptedMetric() {
+        return _kind == Kind.ScriptedMetric;
+    }
+
+    /**
+     * Get the {@code scripted_metric} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code scripted_metric}
+     *             kind.
+     */
+    public ScriptedMetricAggregation scriptedMetric() {
+        return TaggedUnionUtils.get(this, Kind.ScriptedMetric);
+    }
+
+    /**
+     * Is this variant instance of kind {@code serial_diff}?
+     */
+    public boolean isSerialDiff() {
+        return _kind == Kind.SerialDiff;
+    }
+
+    /**
+     * Get the {@code serial_diff} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code serial_diff} kind.
+     */
+    public SerialDifferencingAggregation serialDiff() {
+        return TaggedUnionUtils.get(this, Kind.SerialDiff);
+    }
+
+    /**
+     * Is this variant instance of kind {@code significant_terms}?
+     */
+    public boolean isSignificantTerms() {
+        return _kind == Kind.SignificantTerms;
+    }
+
+    /**
+     * Get the {@code significant_terms} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code significant_terms}
+     *             kind.
+     */
+    public SignificantTermsAggregation significantTerms() {
+        return TaggedUnionUtils.get(this, Kind.SignificantTerms);
+    }
+
+    /**
+     * Is this variant instance of kind {@code significant_text}?
+     */
+    public boolean isSignificantText() {
+        return _kind == Kind.SignificantText;
+    }
+
+    /**
+     * Get the {@code significant_text} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code significant_text}
+     *             kind.
+     */
+    public SignificantTextAggregation significantText() {
+        return TaggedUnionUtils.get(this, Kind.SignificantText);
+    }
+
+    /**
+     * Is this variant instance of kind {@code stats}?
+     */
+    public boolean isStats() {
+        return _kind == Kind.Stats;
+    }
+
+    /**
+     * Get the {@code stats} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code stats} kind.
+     */
+    public StatsAggregation stats() {
+        return TaggedUnionUtils.get(this, Kind.Stats);
+    }
+
+    /**
+     * Is this variant instance of kind {@code stats_bucket}?
+     */
+    public boolean isStatsBucket() {
+        return _kind == Kind.StatsBucket;
+    }
+
+    /**
+     * Get the {@code stats_bucket} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code stats_bucket} kind.
+     */
+    public StatsBucketAggregation statsBucket() {
+        return TaggedUnionUtils.get(this, Kind.StatsBucket);
+    }
+
+    /**
+     * Is this variant instance of kind {@code string_stats}?
+     */
+    public boolean isStringStats() {
+        return _kind == Kind.StringStats;
+    }
+
+    /**
+     * Get the {@code string_stats} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code string_stats} kind.
+     */
+    public StringStatsAggregation stringStats() {
+        return TaggedUnionUtils.get(this, Kind.StringStats);
+    }
+
+    /**
+     * Is this variant instance of kind {@code sum}?
+     */
+    public boolean isSum() {
+        return _kind == Kind.Sum;
+    }
+
+    /**
+     * Get the {@code sum} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code sum} kind.
+     */
+    public SumAggregation sum() {
+        return TaggedUnionUtils.get(this, Kind.Sum);
+    }
+
+    /**
+     * Is this variant instance of kind {@code sum_bucket}?
+     */
+    public boolean isSumBucket() {
+        return _kind == Kind.SumBucket;
+    }
+
+    /**
+     * Get the {@code sum_bucket} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code sum_bucket} kind.
+     */
+    public SumBucketAggregation sumBucket() {
+        return TaggedUnionUtils.get(this, Kind.SumBucket);
+    }
+
+    /**
+     * Is this variant instance of kind {@code terms}?
+     */
+    public boolean isTerms() {
+        return _kind == Kind.Terms;
+    }
+
+    /**
+     * Get the {@code terms} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code terms} kind.
+     */
+    public TermsAggregation terms() {
+        return TaggedUnionUtils.get(this, Kind.Terms);
+    }
+
+    /**
+     * Is this variant instance of kind {@code top_hits}?
+     */
+    public boolean isTopHits() {
+        return _kind == Kind.TopHits;
+    }
+
+    /**
+     * Get the {@code top_hits} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code top_hits} kind.
+     */
+    public TopHitsAggregation topHits() {
+        return TaggedUnionUtils.get(this, Kind.TopHits);
+    }
+
+    /**
+     * Is this variant instance of kind {@code t_test}?
+     */
+    public boolean isTTest() {
+        return _kind == Kind.TTest;
+    }
+
+    /**
+     * Get the {@code t_test} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code t_test} kind.
+     */
+    public TTestAggregation tTest() {
+        return TaggedUnionUtils.get(this, Kind.TTest);
+    }
+
+    /**
+     * Is this variant instance of kind {@code top_metrics}?
+     */
+    public boolean isTopMetrics() {
+        return _kind == Kind.TopMetrics;
+    }
+
+    /**
+     * Get the {@code top_metrics} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code top_metrics} kind.
+     */
+    public TopMetricsAggregation topMetrics() {
+        return TaggedUnionUtils.get(this, Kind.TopMetrics);
+    }
+
+    /**
+     * Is this variant instance of kind {@code value_count}?
+     */
+    public boolean isValueCount() {
+        return _kind == Kind.ValueCount;
+    }
+
+    /**
+     * Get the {@code value_count} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code value_count} kind.
+     */
+    public ValueCountAggregation valueCount() {
+        return TaggedUnionUtils.get(this, Kind.ValueCount);
+    }
+
+    /**
+     * Is this variant instance of kind {@code weighted_avg}?
+     */
+    public boolean isWeightedAvg() {
+        return _kind == Kind.WeightedAvg;
+    }
+
+    /**
+     * Get the {@code weighted_avg} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code weighted_avg} kind.
+     */
+    public WeightedAverageAggregation weightedAvg() {
+        return TaggedUnionUtils.get(this, Kind.WeightedAvg);
+    }
+
+    /**
+     * Is this variant instance of kind {@code variable_width_histogram}?
+     */
+    public boolean isVariableWidthHistogram() {
+        return _kind == Kind.VariableWidthHistogram;
+    }
+
+    /**
+     * Get the {@code variable_width_histogram} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the
+     *             {@code variable_width_histogram} kind.
+     */
+    public VariableWidthHistogramAggregation variableWidthHistogram() {
+        return TaggedUnionUtils.get(this, Kind.VariableWidthHistogram);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeStartObject();
+
+        if (ApiTypeHelper.isDefined(this.aggregations)) {
+            generator.writeKey("aggregations");
+            generator.writeStartObject();
+            for (Map.Entry<String, Aggregation> item0 : this.aggregations.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.meta)) {
+            generator.writeKey("meta");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+        generator.writeKey(_kind.jsonValue());
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        }
+
+        generator.writeEnd();
+
+    }
+
+    public static class Builder extends ObjectBuilderBase {
+        private Kind _kind;
+        private Object _value;
+
+        @Nullable
+        private Map<String, Aggregation> aggregations;
+
+        @Nullable
+        private Map<String, JsonData> meta;
+
+        /**
+         * Sub-aggregations for this aggregation. Only applies to bucket aggregations.
+         * <p>
+         * API name: {@code aggregations}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aggregations</code>.
+         */
+        public final Builder aggregations(Map<String, Aggregation> map) {
+            this.aggregations = _mapPutAll(this.aggregations, map);
+            return this;
+        }
+
+        /**
+         * Sub-aggregations for this aggregation. Only applies to bucket aggregations.
+         * <p>
+         * API name: {@code aggregations}
+         * <p>
+         * Adds an entry to <code>aggregations</code>.
+         */
+        public final Builder aggregations(String key, Aggregation value) {
+            this.aggregations = _mapPut(this.aggregations, key, value);
+            return this;
+        }
+
+        /**
+         * Sub-aggregations for this aggregation. Only applies to bucket aggregations.
+         * <p>
+         * API name: {@code aggregations}
+         * <p>
+         * Adds an entry to <code>aggregations</code> using a builder lambda.
+         */
+        public final Builder aggregations(String key, Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
+            return aggregations(key, fn.apply(new Aggregation.Builder()).build());
+        }
+
+        /**
+         * API name: {@code meta}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>meta</code>.
+         */
+        public final Builder meta(Map<String, JsonData> map) {
+            this.meta = _mapPutAll(this.meta, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code meta}
+         * <p>
+         * Adds an entry to <code>meta</code>.
+         */
+        public final Builder meta(String key, JsonData value) {
+            this.meta = _mapPut(this.meta, key, value);
+            return this;
+        }
+
+        public ContainerBuilder adjacencyMatrix(AdjacencyMatrixAggregation v) {
+            this._kind = Kind.AdjacencyMatrix;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder adjacencyMatrix(
+            Function<AdjacencyMatrixAggregation.Builder, ObjectBuilder<AdjacencyMatrixAggregation>> fn
+        ) {
+            return this.adjacencyMatrix(fn.apply(new AdjacencyMatrixAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder autoDateHistogram(AutoDateHistogramAggregation v) {
+            this._kind = Kind.AutoDateHistogram;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder autoDateHistogram(
+            Function<AutoDateHistogramAggregation.Builder, ObjectBuilder<AutoDateHistogramAggregation>> fn
+        ) {
+            return this.autoDateHistogram(fn.apply(new AutoDateHistogramAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder avg(AverageAggregation v) {
+            this._kind = Kind.Avg;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder avg(Function<AverageAggregation.Builder, ObjectBuilder<AverageAggregation>> fn) {
+            return this.avg(fn.apply(new AverageAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder avgBucket(AverageBucketAggregation v) {
+            this._kind = Kind.AvgBucket;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder avgBucket(Function<AverageBucketAggregation.Builder, ObjectBuilder<AverageBucketAggregation>> fn) {
+            return this.avgBucket(fn.apply(new AverageBucketAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder boxplot(BoxplotAggregation v) {
+            this._kind = Kind.Boxplot;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder boxplot(Function<BoxplotAggregation.Builder, ObjectBuilder<BoxplotAggregation>> fn) {
+            return this.boxplot(fn.apply(new BoxplotAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder bucketScript(BucketScriptAggregation v) {
+            this._kind = Kind.BucketScript;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder bucketScript(Function<BucketScriptAggregation.Builder, ObjectBuilder<BucketScriptAggregation>> fn) {
+            return this.bucketScript(fn.apply(new BucketScriptAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder bucketSelector(BucketSelectorAggregation v) {
+            this._kind = Kind.BucketSelector;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder bucketSelector(Function<BucketSelectorAggregation.Builder, ObjectBuilder<BucketSelectorAggregation>> fn) {
+            return this.bucketSelector(fn.apply(new BucketSelectorAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder bucketSort(BucketSortAggregation v) {
+            this._kind = Kind.BucketSort;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder bucketSort(Function<BucketSortAggregation.Builder, ObjectBuilder<BucketSortAggregation>> fn) {
+            return this.bucketSort(fn.apply(new BucketSortAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder cardinality(CardinalityAggregation v) {
+            this._kind = Kind.Cardinality;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder cardinality(Function<CardinalityAggregation.Builder, ObjectBuilder<CardinalityAggregation>> fn) {
+            return this.cardinality(fn.apply(new CardinalityAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder children(ChildrenAggregation v) {
+            this._kind = Kind.Children;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder children(Function<ChildrenAggregation.Builder, ObjectBuilder<ChildrenAggregation>> fn) {
+            return this.children(fn.apply(new ChildrenAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder composite(CompositeAggregation v) {
+            this._kind = Kind.Composite;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder composite(Function<CompositeAggregation.Builder, ObjectBuilder<CompositeAggregation>> fn) {
+            return this.composite(fn.apply(new CompositeAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder cumulativeCardinality(CumulativeCardinalityAggregation v) {
+            this._kind = Kind.CumulativeCardinality;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder cumulativeCardinality(
+            Function<CumulativeCardinalityAggregation.Builder, ObjectBuilder<CumulativeCardinalityAggregation>> fn
+        ) {
+            return this.cumulativeCardinality(fn.apply(new CumulativeCardinalityAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder cumulativeSum(CumulativeSumAggregation v) {
+            this._kind = Kind.CumulativeSum;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder cumulativeSum(Function<CumulativeSumAggregation.Builder, ObjectBuilder<CumulativeSumAggregation>> fn) {
+            return this.cumulativeSum(fn.apply(new CumulativeSumAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder dateHistogram(DateHistogramAggregation v) {
+            this._kind = Kind.DateHistogram;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder dateHistogram(Function<DateHistogramAggregation.Builder, ObjectBuilder<DateHistogramAggregation>> fn) {
+            return this.dateHistogram(fn.apply(new DateHistogramAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder dateRange(DateRangeAggregation v) {
+            this._kind = Kind.DateRange;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder dateRange(Function<DateRangeAggregation.Builder, ObjectBuilder<DateRangeAggregation>> fn) {
+            return this.dateRange(fn.apply(new DateRangeAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder derivative(DerivativeAggregation v) {
+            this._kind = Kind.Derivative;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder derivative(Function<DerivativeAggregation.Builder, ObjectBuilder<DerivativeAggregation>> fn) {
+            return this.derivative(fn.apply(new DerivativeAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder diversifiedSampler(DiversifiedSamplerAggregation v) {
+            this._kind = Kind.DiversifiedSampler;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder diversifiedSampler(
+            Function<DiversifiedSamplerAggregation.Builder, ObjectBuilder<DiversifiedSamplerAggregation>> fn
+        ) {
+            return this.diversifiedSampler(fn.apply(new DiversifiedSamplerAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder extendedStats(ExtendedStatsAggregation v) {
+            this._kind = Kind.ExtendedStats;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder extendedStats(Function<ExtendedStatsAggregation.Builder, ObjectBuilder<ExtendedStatsAggregation>> fn) {
+            return this.extendedStats(fn.apply(new ExtendedStatsAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder extendedStatsBucket(ExtendedStatsBucketAggregation v) {
+            this._kind = Kind.ExtendedStatsBucket;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder extendedStatsBucket(
+            Function<ExtendedStatsBucketAggregation.Builder, ObjectBuilder<ExtendedStatsBucketAggregation>> fn
+        ) {
+            return this.extendedStatsBucket(fn.apply(new ExtendedStatsBucketAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder filter(Query v) {
+            this._kind = Kind.Filter;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.filter(fn.apply(new Query.Builder()).build());
+        }
+
+        public ContainerBuilder filters(FiltersAggregation v) {
+            this._kind = Kind.Filters;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder filters(Function<FiltersAggregation.Builder, ObjectBuilder<FiltersAggregation>> fn) {
+            return this.filters(fn.apply(new FiltersAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder geoBounds(GeoBoundsAggregation v) {
+            this._kind = Kind.GeoBounds;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder geoBounds(Function<GeoBoundsAggregation.Builder, ObjectBuilder<GeoBoundsAggregation>> fn) {
+            return this.geoBounds(fn.apply(new GeoBoundsAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder geoCentroid(GeoCentroidAggregation v) {
+            this._kind = Kind.GeoCentroid;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder geoCentroid(Function<GeoCentroidAggregation.Builder, ObjectBuilder<GeoCentroidAggregation>> fn) {
+            return this.geoCentroid(fn.apply(new GeoCentroidAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder geoDistance(GeoDistanceAggregation v) {
+            this._kind = Kind.GeoDistance;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder geoDistance(Function<GeoDistanceAggregation.Builder, ObjectBuilder<GeoDistanceAggregation>> fn) {
+            return this.geoDistance(fn.apply(new GeoDistanceAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder geohashGrid(GeoHashGridAggregation v) {
+            this._kind = Kind.GeohashGrid;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder geohashGrid(Function<GeoHashGridAggregation.Builder, ObjectBuilder<GeoHashGridAggregation>> fn) {
+            return this.geohashGrid(fn.apply(new GeoHashGridAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder geoLine(GeoLineAggregation v) {
+            this._kind = Kind.GeoLine;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder geoLine(Function<GeoLineAggregation.Builder, ObjectBuilder<GeoLineAggregation>> fn) {
+            return this.geoLine(fn.apply(new GeoLineAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder geotileGrid(GeoTileGridAggregation v) {
+            this._kind = Kind.GeotileGrid;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder geotileGrid(Function<GeoTileGridAggregation.Builder, ObjectBuilder<GeoTileGridAggregation>> fn) {
+            return this.geotileGrid(fn.apply(new GeoTileGridAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder global(GlobalAggregation v) {
+            this._kind = Kind.Global;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder global(Function<GlobalAggregation.Builder, ObjectBuilder<GlobalAggregation>> fn) {
+            return this.global(fn.apply(new GlobalAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder histogram(HistogramAggregation v) {
+            this._kind = Kind.Histogram;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder histogram(Function<HistogramAggregation.Builder, ObjectBuilder<HistogramAggregation>> fn) {
+            return this.histogram(fn.apply(new HistogramAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder ipRange(IpRangeAggregation v) {
+            this._kind = Kind.IpRange;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder ipRange(Function<IpRangeAggregation.Builder, ObjectBuilder<IpRangeAggregation>> fn) {
+            return this.ipRange(fn.apply(new IpRangeAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder inference(InferenceAggregation v) {
+            this._kind = Kind.Inference;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder inference(Function<InferenceAggregation.Builder, ObjectBuilder<InferenceAggregation>> fn) {
+            return this.inference(fn.apply(new InferenceAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder matrixStats(MatrixStatsAggregation v) {
+            this._kind = Kind.MatrixStats;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder matrixStats(Function<MatrixStatsAggregation.Builder, ObjectBuilder<MatrixStatsAggregation>> fn) {
+            return this.matrixStats(fn.apply(new MatrixStatsAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder max(MaxAggregation v) {
+            this._kind = Kind.Max;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder max(Function<MaxAggregation.Builder, ObjectBuilder<MaxAggregation>> fn) {
+            return this.max(fn.apply(new MaxAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder maxBucket(MaxBucketAggregation v) {
+            this._kind = Kind.MaxBucket;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder maxBucket(Function<MaxBucketAggregation.Builder, ObjectBuilder<MaxBucketAggregation>> fn) {
+            return this.maxBucket(fn.apply(new MaxBucketAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder medianAbsoluteDeviation(MedianAbsoluteDeviationAggregation v) {
+            this._kind = Kind.MedianAbsoluteDeviation;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder medianAbsoluteDeviation(
+            Function<MedianAbsoluteDeviationAggregation.Builder, ObjectBuilder<MedianAbsoluteDeviationAggregation>> fn
+        ) {
+            return this.medianAbsoluteDeviation(fn.apply(new MedianAbsoluteDeviationAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder min(MinAggregation v) {
+            this._kind = Kind.Min;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder min(Function<MinAggregation.Builder, ObjectBuilder<MinAggregation>> fn) {
+            return this.min(fn.apply(new MinAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder minBucket(MinBucketAggregation v) {
+            this._kind = Kind.MinBucket;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder minBucket(Function<MinBucketAggregation.Builder, ObjectBuilder<MinBucketAggregation>> fn) {
+            return this.minBucket(fn.apply(new MinBucketAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder missing(MissingAggregation v) {
+            this._kind = Kind.Missing;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder missing(Function<MissingAggregation.Builder, ObjectBuilder<MissingAggregation>> fn) {
+            return this.missing(fn.apply(new MissingAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder movingAvg(MovingAverageAggregation v) {
+            this._kind = Kind.MovingAvg;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder movingAvg(Function<MovingAverageAggregation.Builder, ObjectBuilder<MovingAverageAggregation>> fn) {
+            return this.movingAvg(fn.apply(new MovingAverageAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder movingPercentiles(MovingPercentilesAggregation v) {
+            this._kind = Kind.MovingPercentiles;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder movingPercentiles(
+            Function<MovingPercentilesAggregation.Builder, ObjectBuilder<MovingPercentilesAggregation>> fn
+        ) {
+            return this.movingPercentiles(fn.apply(new MovingPercentilesAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder movingFn(MovingFunctionAggregation v) {
+            this._kind = Kind.MovingFn;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder movingFn(Function<MovingFunctionAggregation.Builder, ObjectBuilder<MovingFunctionAggregation>> fn) {
+            return this.movingFn(fn.apply(new MovingFunctionAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder multiTerms(MultiTermsAggregation v) {
+            this._kind = Kind.MultiTerms;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder multiTerms(Function<MultiTermsAggregation.Builder, ObjectBuilder<MultiTermsAggregation>> fn) {
+            return this.multiTerms(fn.apply(new MultiTermsAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder nested(NestedAggregation v) {
+            this._kind = Kind.Nested;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder nested(Function<NestedAggregation.Builder, ObjectBuilder<NestedAggregation>> fn) {
+            return this.nested(fn.apply(new NestedAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder normalize(NormalizeAggregation v) {
+            this._kind = Kind.Normalize;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder normalize(Function<NormalizeAggregation.Builder, ObjectBuilder<NormalizeAggregation>> fn) {
+            return this.normalize(fn.apply(new NormalizeAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder parent(ParentAggregation v) {
+            this._kind = Kind.Parent;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder parent(Function<ParentAggregation.Builder, ObjectBuilder<ParentAggregation>> fn) {
+            return this.parent(fn.apply(new ParentAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder percentileRanks(PercentileRanksAggregation v) {
+            this._kind = Kind.PercentileRanks;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder percentileRanks(
+            Function<PercentileRanksAggregation.Builder, ObjectBuilder<PercentileRanksAggregation>> fn
+        ) {
+            return this.percentileRanks(fn.apply(new PercentileRanksAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder percentiles(PercentilesAggregation v) {
+            this._kind = Kind.Percentiles;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder percentiles(Function<PercentilesAggregation.Builder, ObjectBuilder<PercentilesAggregation>> fn) {
+            return this.percentiles(fn.apply(new PercentilesAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder percentilesBucket(PercentilesBucketAggregation v) {
+            this._kind = Kind.PercentilesBucket;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder percentilesBucket(
+            Function<PercentilesBucketAggregation.Builder, ObjectBuilder<PercentilesBucketAggregation>> fn
+        ) {
+            return this.percentilesBucket(fn.apply(new PercentilesBucketAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder range(RangeAggregation v) {
+            this._kind = Kind.Range;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder range(Function<RangeAggregation.Builder, ObjectBuilder<RangeAggregation>> fn) {
+            return this.range(fn.apply(new RangeAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder rareTerms(RareTermsAggregation v) {
+            this._kind = Kind.RareTerms;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder rareTerms(Function<RareTermsAggregation.Builder, ObjectBuilder<RareTermsAggregation>> fn) {
+            return this.rareTerms(fn.apply(new RareTermsAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder rate(RateAggregation v) {
+            this._kind = Kind.Rate;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder rate(Function<RateAggregation.Builder, ObjectBuilder<RateAggregation>> fn) {
+            return this.rate(fn.apply(new RateAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder reverseNested(ReverseNestedAggregation v) {
+            this._kind = Kind.ReverseNested;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder reverseNested(Function<ReverseNestedAggregation.Builder, ObjectBuilder<ReverseNestedAggregation>> fn) {
+            return this.reverseNested(fn.apply(new ReverseNestedAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder sampler(SamplerAggregation v) {
+            this._kind = Kind.Sampler;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder sampler(Function<SamplerAggregation.Builder, ObjectBuilder<SamplerAggregation>> fn) {
+            return this.sampler(fn.apply(new SamplerAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder scriptedMetric(ScriptedMetricAggregation v) {
+            this._kind = Kind.ScriptedMetric;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder scriptedMetric(Function<ScriptedMetricAggregation.Builder, ObjectBuilder<ScriptedMetricAggregation>> fn) {
+            return this.scriptedMetric(fn.apply(new ScriptedMetricAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder serialDiff(SerialDifferencingAggregation v) {
+            this._kind = Kind.SerialDiff;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder serialDiff(
+            Function<SerialDifferencingAggregation.Builder, ObjectBuilder<SerialDifferencingAggregation>> fn
+        ) {
+            return this.serialDiff(fn.apply(new SerialDifferencingAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder significantTerms(SignificantTermsAggregation v) {
+            this._kind = Kind.SignificantTerms;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder significantTerms(
+            Function<SignificantTermsAggregation.Builder, ObjectBuilder<SignificantTermsAggregation>> fn
+        ) {
+            return this.significantTerms(fn.apply(new SignificantTermsAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder significantText(SignificantTextAggregation v) {
+            this._kind = Kind.SignificantText;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder significantText(
+            Function<SignificantTextAggregation.Builder, ObjectBuilder<SignificantTextAggregation>> fn
+        ) {
+            return this.significantText(fn.apply(new SignificantTextAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder stats(StatsAggregation v) {
+            this._kind = Kind.Stats;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder stats(Function<StatsAggregation.Builder, ObjectBuilder<StatsAggregation>> fn) {
+            return this.stats(fn.apply(new StatsAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder statsBucket(StatsBucketAggregation v) {
+            this._kind = Kind.StatsBucket;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder statsBucket(Function<StatsBucketAggregation.Builder, ObjectBuilder<StatsBucketAggregation>> fn) {
+            return this.statsBucket(fn.apply(new StatsBucketAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder stringStats(StringStatsAggregation v) {
+            this._kind = Kind.StringStats;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder stringStats(Function<StringStatsAggregation.Builder, ObjectBuilder<StringStatsAggregation>> fn) {
+            return this.stringStats(fn.apply(new StringStatsAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder sum(SumAggregation v) {
+            this._kind = Kind.Sum;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder sum(Function<SumAggregation.Builder, ObjectBuilder<SumAggregation>> fn) {
+            return this.sum(fn.apply(new SumAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder sumBucket(SumBucketAggregation v) {
+            this._kind = Kind.SumBucket;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder sumBucket(Function<SumBucketAggregation.Builder, ObjectBuilder<SumBucketAggregation>> fn) {
+            return this.sumBucket(fn.apply(new SumBucketAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder terms(TermsAggregation v) {
+            this._kind = Kind.Terms;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder terms(Function<TermsAggregation.Builder, ObjectBuilder<TermsAggregation>> fn) {
+            return this.terms(fn.apply(new TermsAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder topHits(TopHitsAggregation v) {
+            this._kind = Kind.TopHits;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder topHits(Function<TopHitsAggregation.Builder, ObjectBuilder<TopHitsAggregation>> fn) {
+            return this.topHits(fn.apply(new TopHitsAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder tTest(TTestAggregation v) {
+            this._kind = Kind.TTest;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder tTest(Function<TTestAggregation.Builder, ObjectBuilder<TTestAggregation>> fn) {
+            return this.tTest(fn.apply(new TTestAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder topMetrics(TopMetricsAggregation v) {
+            this._kind = Kind.TopMetrics;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder topMetrics(Function<TopMetricsAggregation.Builder, ObjectBuilder<TopMetricsAggregation>> fn) {
+            return this.topMetrics(fn.apply(new TopMetricsAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder valueCount(ValueCountAggregation v) {
+            this._kind = Kind.ValueCount;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder valueCount(Function<ValueCountAggregation.Builder, ObjectBuilder<ValueCountAggregation>> fn) {
+            return this.valueCount(fn.apply(new ValueCountAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder weightedAvg(WeightedAverageAggregation v) {
+            this._kind = Kind.WeightedAvg;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder weightedAvg(Function<WeightedAverageAggregation.Builder, ObjectBuilder<WeightedAverageAggregation>> fn) {
+            return this.weightedAvg(fn.apply(new WeightedAverageAggregation.Builder()).build());
+        }
+
+        public ContainerBuilder variableWidthHistogram(VariableWidthHistogramAggregation v) {
+            this._kind = Kind.VariableWidthHistogram;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder variableWidthHistogram(
+            Function<VariableWidthHistogramAggregation.Builder, ObjectBuilder<VariableWidthHistogramAggregation>> fn
+        ) {
+            return this.variableWidthHistogram(fn.apply(new VariableWidthHistogramAggregation.Builder()).build());
+        }
+
+        protected Aggregation build() {
+            _checkSingleUse();
+            return new Aggregation(this);
+        }
+
+        public class ContainerBuilder implements ObjectBuilder<Aggregation> {
+
+            /**
+             * Sub-aggregations for this aggregation. Only applies to bucket aggregations.
+             * <p>
+             * API name: {@code aggregations}
+             * <p>
+             * Adds all entries of <code>map</code> to <code>aggregations</code>.
+             */
+            public final ContainerBuilder aggregations(Map<String, Aggregation> map) {
+                Builder.this.aggregations = _mapPutAll(Builder.this.aggregations, map);
+                return this;
+            }
+
+            /**
+             * Sub-aggregations for this aggregation. Only applies to bucket aggregations.
+             * <p>
+             * API name: {@code aggregations}
+             * <p>
+             * Adds an entry to <code>aggregations</code>.
+             */
+            public final ContainerBuilder aggregations(String key, Aggregation value) {
+                Builder.this.aggregations = _mapPut(Builder.this.aggregations, key, value);
+                return this;
+            }
+
+            /**
+             * Sub-aggregations for this aggregation. Only applies to bucket aggregations.
+             * <p>
+             * API name: {@code aggregations}
+             * <p>
+             * Adds an entry to <code>aggregations</code> using a builder lambda.
+             */
+            public final ContainerBuilder aggregations(String key, Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
+                return aggregations(key, fn.apply(new Aggregation.Builder()).build());
+            }
+
+            /**
+             * API name: {@code meta}
+             * <p>
+             * Adds all entries of <code>map</code> to <code>meta</code>.
+             */
+            public final ContainerBuilder meta(Map<String, JsonData> map) {
+                Builder.this.meta = _mapPutAll(Builder.this.meta, map);
+                return this;
+            }
+
+            /**
+             * API name: {@code meta}
+             * <p>
+             * Adds an entry to <code>meta</code>.
+             */
+            public final ContainerBuilder meta(String key, JsonData value) {
+                Builder.this.meta = _mapPut(Builder.this.meta, key, value);
+                return this;
+            }
+
+            public Aggregation build() {
+                return Builder.this.build();
+            }
+        }
+    }
+
+    protected static void setupAggregationDeserializer(ObjectDeserializer<Builder> op) {
+
+        op.add(Builder::aggregations, JsonpDeserializer.stringMapDeserializer(Aggregation._DESERIALIZER), "aggregations", "aggs");
+        op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "meta");
+        op.add(Builder::adjacencyMatrix, AdjacencyMatrixAggregation._DESERIALIZER, "adjacency_matrix");
+        op.add(Builder::autoDateHistogram, AutoDateHistogramAggregation._DESERIALIZER, "auto_date_histogram");
+        op.add(Builder::avg, AverageAggregation._DESERIALIZER, "avg");
+        op.add(Builder::avgBucket, AverageBucketAggregation._DESERIALIZER, "avg_bucket");
+        op.add(Builder::boxplot, BoxplotAggregation._DESERIALIZER, "boxplot");
+        op.add(Builder::bucketScript, BucketScriptAggregation._DESERIALIZER, "bucket_script");
+        op.add(Builder::bucketSelector, BucketSelectorAggregation._DESERIALIZER, "bucket_selector");
+        op.add(Builder::bucketSort, BucketSortAggregation._DESERIALIZER, "bucket_sort");
+        op.add(Builder::cardinality, CardinalityAggregation._DESERIALIZER, "cardinality");
+        op.add(Builder::children, ChildrenAggregation._DESERIALIZER, "children");
+        op.add(Builder::composite, CompositeAggregation._DESERIALIZER, "composite");
+        op.add(Builder::cumulativeCardinality, CumulativeCardinalityAggregation._DESERIALIZER, "cumulative_cardinality");
+        op.add(Builder::cumulativeSum, CumulativeSumAggregation._DESERIALIZER, "cumulative_sum");
+        op.add(Builder::dateHistogram, DateHistogramAggregation._DESERIALIZER, "date_histogram");
+        op.add(Builder::dateRange, DateRangeAggregation._DESERIALIZER, "date_range");
+        op.add(Builder::derivative, DerivativeAggregation._DESERIALIZER, "derivative");
+        op.add(Builder::diversifiedSampler, DiversifiedSamplerAggregation._DESERIALIZER, "diversified_sampler");
+        op.add(Builder::extendedStats, ExtendedStatsAggregation._DESERIALIZER, "extended_stats");
+        op.add(Builder::extendedStatsBucket, ExtendedStatsBucketAggregation._DESERIALIZER, "extended_stats_bucket");
+        op.add(Builder::filter, Query._DESERIALIZER, "filter");
+        op.add(Builder::filters, FiltersAggregation._DESERIALIZER, "filters");
+        op.add(Builder::geoBounds, GeoBoundsAggregation._DESERIALIZER, "geo_bounds");
+        op.add(Builder::geoCentroid, GeoCentroidAggregation._DESERIALIZER, "geo_centroid");
+        op.add(Builder::geoDistance, GeoDistanceAggregation._DESERIALIZER, "geo_distance");
+        op.add(Builder::geohashGrid, GeoHashGridAggregation._DESERIALIZER, "geohash_grid");
+        op.add(Builder::geoLine, GeoLineAggregation._DESERIALIZER, "geo_line");
+        op.add(Builder::geotileGrid, GeoTileGridAggregation._DESERIALIZER, "geotile_grid");
+        op.add(Builder::global, GlobalAggregation._DESERIALIZER, "global");
+        op.add(Builder::histogram, HistogramAggregation._DESERIALIZER, "histogram");
+        op.add(Builder::ipRange, IpRangeAggregation._DESERIALIZER, "ip_range");
+        op.add(Builder::inference, InferenceAggregation._DESERIALIZER, "inference");
+        op.add(Builder::matrixStats, MatrixStatsAggregation._DESERIALIZER, "matrix_stats");
+        op.add(Builder::max, MaxAggregation._DESERIALIZER, "max");
+        op.add(Builder::maxBucket, MaxBucketAggregation._DESERIALIZER, "max_bucket");
+        op.add(Builder::medianAbsoluteDeviation, MedianAbsoluteDeviationAggregation._DESERIALIZER, "median_absolute_deviation");
+        op.add(Builder::min, MinAggregation._DESERIALIZER, "min");
+        op.add(Builder::minBucket, MinBucketAggregation._DESERIALIZER, "min_bucket");
+        op.add(Builder::missing, MissingAggregation._DESERIALIZER, "missing");
+        op.add(Builder::movingAvg, MovingAverageAggregation._DESERIALIZER, "moving_avg");
+        op.add(Builder::movingPercentiles, MovingPercentilesAggregation._DESERIALIZER, "moving_percentiles");
+        op.add(Builder::movingFn, MovingFunctionAggregation._DESERIALIZER, "moving_fn");
+        op.add(Builder::multiTerms, MultiTermsAggregation._DESERIALIZER, "multi_terms");
+        op.add(Builder::nested, NestedAggregation._DESERIALIZER, "nested");
+        op.add(Builder::normalize, NormalizeAggregation._DESERIALIZER, "normalize");
+        op.add(Builder::parent, ParentAggregation._DESERIALIZER, "parent");
+        op.add(Builder::percentileRanks, PercentileRanksAggregation._DESERIALIZER, "percentile_ranks");
+        op.add(Builder::percentiles, PercentilesAggregation._DESERIALIZER, "percentiles");
+        op.add(Builder::percentilesBucket, PercentilesBucketAggregation._DESERIALIZER, "percentiles_bucket");
+        op.add(Builder::range, RangeAggregation._DESERIALIZER, "range");
+        op.add(Builder::rareTerms, RareTermsAggregation._DESERIALIZER, "rare_terms");
+        op.add(Builder::rate, RateAggregation._DESERIALIZER, "rate");
+        op.add(Builder::reverseNested, ReverseNestedAggregation._DESERIALIZER, "reverse_nested");
+        op.add(Builder::sampler, SamplerAggregation._DESERIALIZER, "sampler");
+        op.add(Builder::scriptedMetric, ScriptedMetricAggregation._DESERIALIZER, "scripted_metric");
+        op.add(Builder::serialDiff, SerialDifferencingAggregation._DESERIALIZER, "serial_diff");
+        op.add(Builder::significantTerms, SignificantTermsAggregation._DESERIALIZER, "significant_terms");
+        op.add(Builder::significantText, SignificantTextAggregation._DESERIALIZER, "significant_text");
+        op.add(Builder::stats, StatsAggregation._DESERIALIZER, "stats");
+        op.add(Builder::statsBucket, StatsBucketAggregation._DESERIALIZER, "stats_bucket");
+        op.add(Builder::stringStats, StringStatsAggregation._DESERIALIZER, "string_stats");
+        op.add(Builder::sum, SumAggregation._DESERIALIZER, "sum");
+        op.add(Builder::sumBucket, SumBucketAggregation._DESERIALIZER, "sum_bucket");
+        op.add(Builder::terms, TermsAggregation._DESERIALIZER, "terms");
+        op.add(Builder::topHits, TopHitsAggregation._DESERIALIZER, "top_hits");
+        op.add(Builder::tTest, TTestAggregation._DESERIALIZER, "t_test");
+        op.add(Builder::topMetrics, TopMetricsAggregation._DESERIALIZER, "top_metrics");
+        op.add(Builder::valueCount, ValueCountAggregation._DESERIALIZER, "value_count");
+        op.add(Builder::weightedAvg, WeightedAverageAggregation._DESERIALIZER, "weighted_avg");
+        op.add(Builder::variableWidthHistogram, VariableWidthHistogramAggregation._DESERIALIZER, "variable_width_histogram");
+
+    }
+
+    public static final JsonpDeserializer<Aggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Aggregation::setupAggregationDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregationBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregationBase.java
index c99c2e6e59..7ec6dce4c8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregationBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregationBase.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,121 +42,114 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.Aggregation
 
-
 public abstract class AggregationBase implements JsonpSerializable {
-	private final Map<String, JsonData> meta;
-
-	@Nullable
-	private final String name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected AggregationBase(AbstractBuilder<?> builder) {
-
-		this.meta = ApiTypeHelper.unmodifiable(builder.meta);
-		this.name = builder.name;
-
-	}
-
-	/**
-	 * API name: {@code meta}
-	 */
-	public final Map<String, JsonData> meta() {
-		return this.meta;
-	}
-
-	/**
-	 * API name: {@code name}
-	 */
-	@Nullable
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.meta)) {
-			generator.writeKey("meta");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.name != null) {
-			generator.writeKey("name");
-			generator.write(this.name);
-
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		@Nullable
-		private Map<String, JsonData> meta;
-
-		@Nullable
-		private String name;
-
-		/**
-		 * API name: {@code meta}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>meta</code>.
-		 */
-		public final BuilderT meta(Map<String, JsonData> map) {
-			this.meta = _mapPutAll(this.meta, map);
-			return self();
-		}
-
-		/**
-		 * API name: {@code meta}
-		 * <p>
-		 * Adds an entry to <code>meta</code>.
-		 */
-		public final BuilderT meta(String key, JsonData value) {
-			this.meta = _mapPut(this.meta, key, value);
-			return self();
-		}
-
-		/**
-		 * API name: {@code name}
-		 */
-		public final BuilderT name(@Nullable String value) {
-			this.name = value;
-			return self();
-		}
-
-		protected abstract BuilderT self();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupAggregationBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-
-		op.add(AbstractBuilder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "meta");
-		op.add(AbstractBuilder::name, JsonpDeserializer.stringDeserializer(), "name");
-
-	}
+    private final Map<String, JsonData> meta;
+
+    @Nullable
+    private final String name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected AggregationBase(AbstractBuilder<?> builder) {
+
+        this.meta = ApiTypeHelper.unmodifiable(builder.meta);
+        this.name = builder.name;
+
+    }
+
+    /**
+     * API name: {@code meta}
+     */
+    public final Map<String, JsonData> meta() {
+        return this.meta;
+    }
+
+    /**
+     * API name: {@code name}
+     */
+    @Nullable
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.meta)) {
+            generator.writeKey("meta");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.name != null) {
+            generator.writeKey("name");
+            generator.write(this.name);
+
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        @Nullable
+        private Map<String, JsonData> meta;
+
+        @Nullable
+        private String name;
+
+        /**
+         * API name: {@code meta}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>meta</code>.
+         */
+        public final BuilderT meta(Map<String, JsonData> map) {
+            this.meta = _mapPutAll(this.meta, map);
+            return self();
+        }
+
+        /**
+         * API name: {@code meta}
+         * <p>
+         * Adds an entry to <code>meta</code>.
+         */
+        public final BuilderT meta(String key, JsonData value) {
+            this.meta = _mapPut(this.meta, key, value);
+            return self();
+        }
+
+        /**
+         * API name: {@code name}
+         */
+        public final BuilderT name(@Nullable String value) {
+            this.name = value;
+            return self();
+        }
+
+        protected abstract BuilderT self();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupAggregationBaseDeserializer(ObjectDeserializer<BuilderT> op) {
+
+        op.add(AbstractBuilder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "meta");
+        op.add(AbstractBuilder::name, JsonpDeserializer.stringDeserializer(), "name");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregationBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregationBuilders.java
index eac30ab4ec..68121b10f2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregationBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregationBuilders.java
@@ -38,558 +38,557 @@
  * Builders for {@link Aggregation} variants.
  */
 public class AggregationBuilders {
-	private AggregationBuilders() {
-	}
-
-	/**
-	 * Creates a builder for the {@link AdjacencyMatrixAggregation adjacency_matrix}
-	 * {@code Aggregation} variant.
-	 */
-	public static AdjacencyMatrixAggregation.Builder adjacencyMatrix() {
-		return new AdjacencyMatrixAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link AutoDateHistogramAggregation
-	 * auto_date_histogram} {@code Aggregation} variant.
-	 */
-	public static AutoDateHistogramAggregation.Builder autoDateHistogram() {
-		return new AutoDateHistogramAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link AverageAggregation avg} {@code Aggregation}
-	 * variant.
-	 */
-	public static AverageAggregation.Builder avg() {
-		return new AverageAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link AverageBucketAggregation avg_bucket}
-	 * {@code Aggregation} variant.
-	 */
-	public static AverageBucketAggregation.Builder avgBucket() {
-		return new AverageBucketAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link BoxplotAggregation boxplot}
-	 * {@code Aggregation} variant.
-	 */
-	public static BoxplotAggregation.Builder boxplot() {
-		return new BoxplotAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link BucketScriptAggregation bucket_script}
-	 * {@code Aggregation} variant.
-	 */
-	public static BucketScriptAggregation.Builder bucketScript() {
-		return new BucketScriptAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link BucketSelectorAggregation bucket_selector}
-	 * {@code Aggregation} variant.
-	 */
-	public static BucketSelectorAggregation.Builder bucketSelector() {
-		return new BucketSelectorAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link BucketSortAggregation bucket_sort}
-	 * {@code Aggregation} variant.
-	 */
-	public static BucketSortAggregation.Builder bucketSort() {
-		return new BucketSortAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link CardinalityAggregation cardinality}
-	 * {@code Aggregation} variant.
-	 */
-	public static CardinalityAggregation.Builder cardinality() {
-		return new CardinalityAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ChildrenAggregation children}
-	 * {@code Aggregation} variant.
-	 */
-	public static ChildrenAggregation.Builder children() {
-		return new ChildrenAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link CompositeAggregation composite}
-	 * {@code Aggregation} variant.
-	 */
-	public static CompositeAggregation.Builder composite() {
-		return new CompositeAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link CumulativeCardinalityAggregation
-	 * cumulative_cardinality} {@code Aggregation} variant.
-	 */
-	public static CumulativeCardinalityAggregation.Builder cumulativeCardinality() {
-		return new CumulativeCardinalityAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link CumulativeSumAggregation cumulative_sum}
-	 * {@code Aggregation} variant.
-	 */
-	public static CumulativeSumAggregation.Builder cumulativeSum() {
-		return new CumulativeSumAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DateHistogramAggregation date_histogram}
-	 * {@code Aggregation} variant.
-	 */
-	public static DateHistogramAggregation.Builder dateHistogram() {
-		return new DateHistogramAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DateRangeAggregation date_range}
-	 * {@code Aggregation} variant.
-	 */
-	public static DateRangeAggregation.Builder dateRange() {
-		return new DateRangeAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DerivativeAggregation derivative}
-	 * {@code Aggregation} variant.
-	 */
-	public static DerivativeAggregation.Builder derivative() {
-		return new DerivativeAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DiversifiedSamplerAggregation
-	 * diversified_sampler} {@code Aggregation} variant.
-	 */
-	public static DiversifiedSamplerAggregation.Builder diversifiedSampler() {
-		return new DiversifiedSamplerAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ExtendedStatsAggregation extended_stats}
-	 * {@code Aggregation} variant.
-	 */
-	public static ExtendedStatsAggregation.Builder extendedStats() {
-		return new ExtendedStatsAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ExtendedStatsBucketAggregation
-	 * extended_stats_bucket} {@code Aggregation} variant.
-	 */
-	public static ExtendedStatsBucketAggregation.Builder extendedStatsBucket() {
-		return new ExtendedStatsBucketAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link Query filter} {@code Aggregation} variant.
-	 */
-	public static Query.Builder filter() {
-		return new Query.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link FiltersAggregation filters}
-	 * {@code Aggregation} variant.
-	 */
-	public static FiltersAggregation.Builder filters() {
-		return new FiltersAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GeoBoundsAggregation geo_bounds}
-	 * {@code Aggregation} variant.
-	 */
-	public static GeoBoundsAggregation.Builder geoBounds() {
-		return new GeoBoundsAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GeoCentroidAggregation geo_centroid}
-	 * {@code Aggregation} variant.
-	 */
-	public static GeoCentroidAggregation.Builder geoCentroid() {
-		return new GeoCentroidAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GeoDistanceAggregation geo_distance}
-	 * {@code Aggregation} variant.
-	 */
-	public static GeoDistanceAggregation.Builder geoDistance() {
-		return new GeoDistanceAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GeoHashGridAggregation geohash_grid}
-	 * {@code Aggregation} variant.
-	 */
-	public static GeoHashGridAggregation.Builder geohashGrid() {
-		return new GeoHashGridAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GeoLineAggregation geo_line}
-	 * {@code Aggregation} variant.
-	 */
-	public static GeoLineAggregation.Builder geoLine() {
-		return new GeoLineAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GeoTileGridAggregation geotile_grid}
-	 * {@code Aggregation} variant.
-	 */
-	public static GeoTileGridAggregation.Builder geotileGrid() {
-		return new GeoTileGridAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GlobalAggregation global}
-	 * {@code Aggregation} variant.
-	 */
-	public static GlobalAggregation.Builder global() {
-		return new GlobalAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link HistogramAggregation histogram}
-	 * {@code Aggregation} variant.
-	 */
-	public static HistogramAggregation.Builder histogram() {
-		return new HistogramAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link IpRangeAggregation ip_range}
-	 * {@code Aggregation} variant.
-	 */
-	public static IpRangeAggregation.Builder ipRange() {
-		return new IpRangeAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link InferenceAggregation inference}
-	 * {@code Aggregation} variant.
-	 */
-	public static InferenceAggregation.Builder inference() {
-		return new InferenceAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MatrixStatsAggregation matrix_stats}
-	 * {@code Aggregation} variant.
-	 */
-	public static MatrixStatsAggregation.Builder matrixStats() {
-		return new MatrixStatsAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MaxAggregation max} {@code Aggregation}
-	 * variant.
-	 */
-	public static MaxAggregation.Builder max() {
-		return new MaxAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MaxBucketAggregation max_bucket}
-	 * {@code Aggregation} variant.
-	 */
-	public static MaxBucketAggregation.Builder maxBucket() {
-		return new MaxBucketAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MedianAbsoluteDeviationAggregation
-	 * median_absolute_deviation} {@code Aggregation} variant.
-	 */
-	public static MedianAbsoluteDeviationAggregation.Builder medianAbsoluteDeviation() {
-		return new MedianAbsoluteDeviationAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MinAggregation min} {@code Aggregation}
-	 * variant.
-	 */
-	public static MinAggregation.Builder min() {
-		return new MinAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MinBucketAggregation min_bucket}
-	 * {@code Aggregation} variant.
-	 */
-	public static MinBucketAggregation.Builder minBucket() {
-		return new MinBucketAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MissingAggregation missing}
-	 * {@code Aggregation} variant.
-	 */
-	public static MissingAggregation.Builder missing() {
-		return new MissingAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MovingAverageAggregation moving_avg}
-	 * {@code Aggregation} variant.
-	 */
-	public static MovingAverageAggregation.Builder movingAvg() {
-		return new MovingAverageAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MovingPercentilesAggregation
-	 * moving_percentiles} {@code Aggregation} variant.
-	 */
-	public static MovingPercentilesAggregation.Builder movingPercentiles() {
-		return new MovingPercentilesAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MovingFunctionAggregation moving_fn}
-	 * {@code Aggregation} variant.
-	 */
-	public static MovingFunctionAggregation.Builder movingFn() {
-		return new MovingFunctionAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MultiTermsAggregation multi_terms}
-	 * {@code Aggregation} variant.
-	 */
-	public static MultiTermsAggregation.Builder multiTerms() {
-		return new MultiTermsAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link NestedAggregation nested}
-	 * {@code Aggregation} variant.
-	 */
-	public static NestedAggregation.Builder nested() {
-		return new NestedAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link NormalizeAggregation normalize}
-	 * {@code Aggregation} variant.
-	 */
-	public static NormalizeAggregation.Builder normalize() {
-		return new NormalizeAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ParentAggregation parent}
-	 * {@code Aggregation} variant.
-	 */
-	public static ParentAggregation.Builder parent() {
-		return new ParentAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link PercentileRanksAggregation percentile_ranks}
-	 * {@code Aggregation} variant.
-	 */
-	public static PercentileRanksAggregation.Builder percentileRanks() {
-		return new PercentileRanksAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link PercentilesAggregation percentiles}
-	 * {@code Aggregation} variant.
-	 */
-	public static PercentilesAggregation.Builder percentiles() {
-		return new PercentilesAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link PercentilesBucketAggregation
-	 * percentiles_bucket} {@code Aggregation} variant.
-	 */
-	public static PercentilesBucketAggregation.Builder percentilesBucket() {
-		return new PercentilesBucketAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link RangeAggregation range} {@code Aggregation}
-	 * variant.
-	 */
-	public static RangeAggregation.Builder range() {
-		return new RangeAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link RareTermsAggregation rare_terms}
-	 * {@code Aggregation} variant.
-	 */
-	public static RareTermsAggregation.Builder rareTerms() {
-		return new RareTermsAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link RateAggregation rate} {@code Aggregation}
-	 * variant.
-	 */
-	public static RateAggregation.Builder rate() {
-		return new RateAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ReverseNestedAggregation reverse_nested}
-	 * {@code Aggregation} variant.
-	 */
-	public static ReverseNestedAggregation.Builder reverseNested() {
-		return new ReverseNestedAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SamplerAggregation sampler}
-	 * {@code Aggregation} variant.
-	 */
-	public static SamplerAggregation.Builder sampler() {
-		return new SamplerAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ScriptedMetricAggregation scripted_metric}
-	 * {@code Aggregation} variant.
-	 */
-	public static ScriptedMetricAggregation.Builder scriptedMetric() {
-		return new ScriptedMetricAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SerialDifferencingAggregation serial_diff}
-	 * {@code Aggregation} variant.
-	 */
-	public static SerialDifferencingAggregation.Builder serialDiff() {
-		return new SerialDifferencingAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SignificantTermsAggregation
-	 * significant_terms} {@code Aggregation} variant.
-	 */
-	public static SignificantTermsAggregation.Builder significantTerms() {
-		return new SignificantTermsAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SignificantTextAggregation significant_text}
-	 * {@code Aggregation} variant.
-	 */
-	public static SignificantTextAggregation.Builder significantText() {
-		return new SignificantTextAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link StatsAggregation stats} {@code Aggregation}
-	 * variant.
-	 */
-	public static StatsAggregation.Builder stats() {
-		return new StatsAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link StatsBucketAggregation stats_bucket}
-	 * {@code Aggregation} variant.
-	 */
-	public static StatsBucketAggregation.Builder statsBucket() {
-		return new StatsBucketAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link StringStatsAggregation string_stats}
-	 * {@code Aggregation} variant.
-	 */
-	public static StringStatsAggregation.Builder stringStats() {
-		return new StringStatsAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SumAggregation sum} {@code Aggregation}
-	 * variant.
-	 */
-	public static SumAggregation.Builder sum() {
-		return new SumAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SumBucketAggregation sum_bucket}
-	 * {@code Aggregation} variant.
-	 */
-	public static SumBucketAggregation.Builder sumBucket() {
-		return new SumBucketAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link TermsAggregation terms} {@code Aggregation}
-	 * variant.
-	 */
-	public static TermsAggregation.Builder terms() {
-		return new TermsAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link TopHitsAggregation top_hits}
-	 * {@code Aggregation} variant.
-	 */
-	public static TopHitsAggregation.Builder topHits() {
-		return new TopHitsAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link TTestAggregation t_test} {@code Aggregation}
-	 * variant.
-	 */
-	public static TTestAggregation.Builder tTest() {
-		return new TTestAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link TopMetricsAggregation top_metrics}
-	 * {@code Aggregation} variant.
-	 */
-	public static TopMetricsAggregation.Builder topMetrics() {
-		return new TopMetricsAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ValueCountAggregation value_count}
-	 * {@code Aggregation} variant.
-	 */
-	public static ValueCountAggregation.Builder valueCount() {
-		return new ValueCountAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link WeightedAverageAggregation weighted_avg}
-	 * {@code Aggregation} variant.
-	 */
-	public static WeightedAverageAggregation.Builder weightedAvg() {
-		return new WeightedAverageAggregation.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link VariableWidthHistogramAggregation
-	 * variable_width_histogram} {@code Aggregation} variant.
-	 */
-	public static VariableWidthHistogramAggregation.Builder variableWidthHistogram() {
-		return new VariableWidthHistogramAggregation.Builder();
-	}
+    private AggregationBuilders() {}
+
+    /**
+     * Creates a builder for the {@link AdjacencyMatrixAggregation adjacency_matrix}
+     * {@code Aggregation} variant.
+     */
+    public static AdjacencyMatrixAggregation.Builder adjacencyMatrix() {
+        return new AdjacencyMatrixAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link AutoDateHistogramAggregation
+     * auto_date_histogram} {@code Aggregation} variant.
+     */
+    public static AutoDateHistogramAggregation.Builder autoDateHistogram() {
+        return new AutoDateHistogramAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link AverageAggregation avg} {@code Aggregation}
+     * variant.
+     */
+    public static AverageAggregation.Builder avg() {
+        return new AverageAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link AverageBucketAggregation avg_bucket}
+     * {@code Aggregation} variant.
+     */
+    public static AverageBucketAggregation.Builder avgBucket() {
+        return new AverageBucketAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link BoxplotAggregation boxplot}
+     * {@code Aggregation} variant.
+     */
+    public static BoxplotAggregation.Builder boxplot() {
+        return new BoxplotAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link BucketScriptAggregation bucket_script}
+     * {@code Aggregation} variant.
+     */
+    public static BucketScriptAggregation.Builder bucketScript() {
+        return new BucketScriptAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link BucketSelectorAggregation bucket_selector}
+     * {@code Aggregation} variant.
+     */
+    public static BucketSelectorAggregation.Builder bucketSelector() {
+        return new BucketSelectorAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link BucketSortAggregation bucket_sort}
+     * {@code Aggregation} variant.
+     */
+    public static BucketSortAggregation.Builder bucketSort() {
+        return new BucketSortAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link CardinalityAggregation cardinality}
+     * {@code Aggregation} variant.
+     */
+    public static CardinalityAggregation.Builder cardinality() {
+        return new CardinalityAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ChildrenAggregation children}
+     * {@code Aggregation} variant.
+     */
+    public static ChildrenAggregation.Builder children() {
+        return new ChildrenAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link CompositeAggregation composite}
+     * {@code Aggregation} variant.
+     */
+    public static CompositeAggregation.Builder composite() {
+        return new CompositeAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link CumulativeCardinalityAggregation
+     * cumulative_cardinality} {@code Aggregation} variant.
+     */
+    public static CumulativeCardinalityAggregation.Builder cumulativeCardinality() {
+        return new CumulativeCardinalityAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link CumulativeSumAggregation cumulative_sum}
+     * {@code Aggregation} variant.
+     */
+    public static CumulativeSumAggregation.Builder cumulativeSum() {
+        return new CumulativeSumAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DateHistogramAggregation date_histogram}
+     * {@code Aggregation} variant.
+     */
+    public static DateHistogramAggregation.Builder dateHistogram() {
+        return new DateHistogramAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DateRangeAggregation date_range}
+     * {@code Aggregation} variant.
+     */
+    public static DateRangeAggregation.Builder dateRange() {
+        return new DateRangeAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DerivativeAggregation derivative}
+     * {@code Aggregation} variant.
+     */
+    public static DerivativeAggregation.Builder derivative() {
+        return new DerivativeAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DiversifiedSamplerAggregation
+     * diversified_sampler} {@code Aggregation} variant.
+     */
+    public static DiversifiedSamplerAggregation.Builder diversifiedSampler() {
+        return new DiversifiedSamplerAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ExtendedStatsAggregation extended_stats}
+     * {@code Aggregation} variant.
+     */
+    public static ExtendedStatsAggregation.Builder extendedStats() {
+        return new ExtendedStatsAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ExtendedStatsBucketAggregation
+     * extended_stats_bucket} {@code Aggregation} variant.
+     */
+    public static ExtendedStatsBucketAggregation.Builder extendedStatsBucket() {
+        return new ExtendedStatsBucketAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link Query filter} {@code Aggregation} variant.
+     */
+    public static Query.Builder filter() {
+        return new Query.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link FiltersAggregation filters}
+     * {@code Aggregation} variant.
+     */
+    public static FiltersAggregation.Builder filters() {
+        return new FiltersAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GeoBoundsAggregation geo_bounds}
+     * {@code Aggregation} variant.
+     */
+    public static GeoBoundsAggregation.Builder geoBounds() {
+        return new GeoBoundsAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GeoCentroidAggregation geo_centroid}
+     * {@code Aggregation} variant.
+     */
+    public static GeoCentroidAggregation.Builder geoCentroid() {
+        return new GeoCentroidAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GeoDistanceAggregation geo_distance}
+     * {@code Aggregation} variant.
+     */
+    public static GeoDistanceAggregation.Builder geoDistance() {
+        return new GeoDistanceAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GeoHashGridAggregation geohash_grid}
+     * {@code Aggregation} variant.
+     */
+    public static GeoHashGridAggregation.Builder geohashGrid() {
+        return new GeoHashGridAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GeoLineAggregation geo_line}
+     * {@code Aggregation} variant.
+     */
+    public static GeoLineAggregation.Builder geoLine() {
+        return new GeoLineAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GeoTileGridAggregation geotile_grid}
+     * {@code Aggregation} variant.
+     */
+    public static GeoTileGridAggregation.Builder geotileGrid() {
+        return new GeoTileGridAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GlobalAggregation global}
+     * {@code Aggregation} variant.
+     */
+    public static GlobalAggregation.Builder global() {
+        return new GlobalAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link HistogramAggregation histogram}
+     * {@code Aggregation} variant.
+     */
+    public static HistogramAggregation.Builder histogram() {
+        return new HistogramAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link IpRangeAggregation ip_range}
+     * {@code Aggregation} variant.
+     */
+    public static IpRangeAggregation.Builder ipRange() {
+        return new IpRangeAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link InferenceAggregation inference}
+     * {@code Aggregation} variant.
+     */
+    public static InferenceAggregation.Builder inference() {
+        return new InferenceAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MatrixStatsAggregation matrix_stats}
+     * {@code Aggregation} variant.
+     */
+    public static MatrixStatsAggregation.Builder matrixStats() {
+        return new MatrixStatsAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MaxAggregation max} {@code Aggregation}
+     * variant.
+     */
+    public static MaxAggregation.Builder max() {
+        return new MaxAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MaxBucketAggregation max_bucket}
+     * {@code Aggregation} variant.
+     */
+    public static MaxBucketAggregation.Builder maxBucket() {
+        return new MaxBucketAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MedianAbsoluteDeviationAggregation
+     * median_absolute_deviation} {@code Aggregation} variant.
+     */
+    public static MedianAbsoluteDeviationAggregation.Builder medianAbsoluteDeviation() {
+        return new MedianAbsoluteDeviationAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MinAggregation min} {@code Aggregation}
+     * variant.
+     */
+    public static MinAggregation.Builder min() {
+        return new MinAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MinBucketAggregation min_bucket}
+     * {@code Aggregation} variant.
+     */
+    public static MinBucketAggregation.Builder minBucket() {
+        return new MinBucketAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MissingAggregation missing}
+     * {@code Aggregation} variant.
+     */
+    public static MissingAggregation.Builder missing() {
+        return new MissingAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MovingAverageAggregation moving_avg}
+     * {@code Aggregation} variant.
+     */
+    public static MovingAverageAggregation.Builder movingAvg() {
+        return new MovingAverageAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MovingPercentilesAggregation
+     * moving_percentiles} {@code Aggregation} variant.
+     */
+    public static MovingPercentilesAggregation.Builder movingPercentiles() {
+        return new MovingPercentilesAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MovingFunctionAggregation moving_fn}
+     * {@code Aggregation} variant.
+     */
+    public static MovingFunctionAggregation.Builder movingFn() {
+        return new MovingFunctionAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MultiTermsAggregation multi_terms}
+     * {@code Aggregation} variant.
+     */
+    public static MultiTermsAggregation.Builder multiTerms() {
+        return new MultiTermsAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link NestedAggregation nested}
+     * {@code Aggregation} variant.
+     */
+    public static NestedAggregation.Builder nested() {
+        return new NestedAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link NormalizeAggregation normalize}
+     * {@code Aggregation} variant.
+     */
+    public static NormalizeAggregation.Builder normalize() {
+        return new NormalizeAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ParentAggregation parent}
+     * {@code Aggregation} variant.
+     */
+    public static ParentAggregation.Builder parent() {
+        return new ParentAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link PercentileRanksAggregation percentile_ranks}
+     * {@code Aggregation} variant.
+     */
+    public static PercentileRanksAggregation.Builder percentileRanks() {
+        return new PercentileRanksAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link PercentilesAggregation percentiles}
+     * {@code Aggregation} variant.
+     */
+    public static PercentilesAggregation.Builder percentiles() {
+        return new PercentilesAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link PercentilesBucketAggregation
+     * percentiles_bucket} {@code Aggregation} variant.
+     */
+    public static PercentilesBucketAggregation.Builder percentilesBucket() {
+        return new PercentilesBucketAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link RangeAggregation range} {@code Aggregation}
+     * variant.
+     */
+    public static RangeAggregation.Builder range() {
+        return new RangeAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link RareTermsAggregation rare_terms}
+     * {@code Aggregation} variant.
+     */
+    public static RareTermsAggregation.Builder rareTerms() {
+        return new RareTermsAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link RateAggregation rate} {@code Aggregation}
+     * variant.
+     */
+    public static RateAggregation.Builder rate() {
+        return new RateAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ReverseNestedAggregation reverse_nested}
+     * {@code Aggregation} variant.
+     */
+    public static ReverseNestedAggregation.Builder reverseNested() {
+        return new ReverseNestedAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SamplerAggregation sampler}
+     * {@code Aggregation} variant.
+     */
+    public static SamplerAggregation.Builder sampler() {
+        return new SamplerAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ScriptedMetricAggregation scripted_metric}
+     * {@code Aggregation} variant.
+     */
+    public static ScriptedMetricAggregation.Builder scriptedMetric() {
+        return new ScriptedMetricAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SerialDifferencingAggregation serial_diff}
+     * {@code Aggregation} variant.
+     */
+    public static SerialDifferencingAggregation.Builder serialDiff() {
+        return new SerialDifferencingAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SignificantTermsAggregation
+     * significant_terms} {@code Aggregation} variant.
+     */
+    public static SignificantTermsAggregation.Builder significantTerms() {
+        return new SignificantTermsAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SignificantTextAggregation significant_text}
+     * {@code Aggregation} variant.
+     */
+    public static SignificantTextAggregation.Builder significantText() {
+        return new SignificantTextAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link StatsAggregation stats} {@code Aggregation}
+     * variant.
+     */
+    public static StatsAggregation.Builder stats() {
+        return new StatsAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link StatsBucketAggregation stats_bucket}
+     * {@code Aggregation} variant.
+     */
+    public static StatsBucketAggregation.Builder statsBucket() {
+        return new StatsBucketAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link StringStatsAggregation string_stats}
+     * {@code Aggregation} variant.
+     */
+    public static StringStatsAggregation.Builder stringStats() {
+        return new StringStatsAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SumAggregation sum} {@code Aggregation}
+     * variant.
+     */
+    public static SumAggregation.Builder sum() {
+        return new SumAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SumBucketAggregation sum_bucket}
+     * {@code Aggregation} variant.
+     */
+    public static SumBucketAggregation.Builder sumBucket() {
+        return new SumBucketAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link TermsAggregation terms} {@code Aggregation}
+     * variant.
+     */
+    public static TermsAggregation.Builder terms() {
+        return new TermsAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link TopHitsAggregation top_hits}
+     * {@code Aggregation} variant.
+     */
+    public static TopHitsAggregation.Builder topHits() {
+        return new TopHitsAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link TTestAggregation t_test} {@code Aggregation}
+     * variant.
+     */
+    public static TTestAggregation.Builder tTest() {
+        return new TTestAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link TopMetricsAggregation top_metrics}
+     * {@code Aggregation} variant.
+     */
+    public static TopMetricsAggregation.Builder topMetrics() {
+        return new TopMetricsAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ValueCountAggregation value_count}
+     * {@code Aggregation} variant.
+     */
+    public static ValueCountAggregation.Builder valueCount() {
+        return new ValueCountAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link WeightedAverageAggregation weighted_avg}
+     * {@code Aggregation} variant.
+     */
+    public static WeightedAverageAggregation.Builder weightedAvg() {
+        return new WeightedAverageAggregation.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link VariableWidthHistogramAggregation
+     * variable_width_histogram} {@code Aggregation} variant.
+     */
+    public static VariableWidthHistogramAggregation.Builder variableWidthHistogram() {
+        return new VariableWidthHistogramAggregation.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregationRange.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregationRange.java
index 7524abb7a6..29960c5fdf 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregationRange.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregationRange.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,157 +43,156 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.AggregationRange
 
 @JsonpDeserializable
 public class AggregationRange implements JsonpSerializable {
-	@Nullable
-	private final String from;
-
-	@Nullable
-	private final String key;
-
-	@Nullable
-	private final String to;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AggregationRange(Builder builder) {
-
-		this.from = builder.from;
-		this.key = builder.key;
-		this.to = builder.to;
-
-	}
-
-	public static AggregationRange of(Function<Builder, ObjectBuilder<AggregationRange>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code from}
-	 */
-	@Nullable
-	public final String from() {
-		return this.from;
-	}
-
-	/**
-	 * API name: {@code key}
-	 */
-	@Nullable
-	public final String key() {
-		return this.key;
-	}
-
-	/**
-	 * API name: {@code to}
-	 */
-	@Nullable
-	public final String to() {
-		return this.to;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.from != null) {
-			generator.writeKey("from");
-			generator.write(this.from);
-
-		}
-		if (this.key != null) {
-			generator.writeKey("key");
-			generator.write(this.key);
-
-		}
-		if (this.to != null) {
-			generator.writeKey("to");
-			generator.write(this.to);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AggregationRange}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AggregationRange> {
-		@Nullable
-		private String from;
-
-		@Nullable
-		private String key;
-
-		@Nullable
-		private String to;
-
-		/**
-		 * API name: {@code from}
-		 */
-		public final Builder from(@Nullable String value) {
-			this.from = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code key}
-		 */
-		public final Builder key(@Nullable String value) {
-			this.key = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code to}
-		 */
-		public final Builder to(@Nullable String value) {
-			this.to = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AggregationRange}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AggregationRange build() {
-			_checkSingleUse();
-
-			return new AggregationRange(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AggregationRange}
-	 */
-	public static final JsonpDeserializer<AggregationRange> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			AggregationRange::setupAggregationRangeDeserializer);
-
-	protected static void setupAggregationRangeDeserializer(ObjectDeserializer<AggregationRange.Builder> op) {
-
-		op.add(Builder::from, JsonpDeserializer.stringDeserializer(), "from");
-		op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
-		op.add(Builder::to, JsonpDeserializer.stringDeserializer(), "to");
-
-	}
+    @Nullable
+    private final String from;
+
+    @Nullable
+    private final String key;
+
+    @Nullable
+    private final String to;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AggregationRange(Builder builder) {
+
+        this.from = builder.from;
+        this.key = builder.key;
+        this.to = builder.to;
+
+    }
+
+    public static AggregationRange of(Function<Builder, ObjectBuilder<AggregationRange>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code from}
+     */
+    @Nullable
+    public final String from() {
+        return this.from;
+    }
+
+    /**
+     * API name: {@code key}
+     */
+    @Nullable
+    public final String key() {
+        return this.key;
+    }
+
+    /**
+     * API name: {@code to}
+     */
+    @Nullable
+    public final String to() {
+        return this.to;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.from != null) {
+            generator.writeKey("from");
+            generator.write(this.from);
+
+        }
+        if (this.key != null) {
+            generator.writeKey("key");
+            generator.write(this.key);
+
+        }
+        if (this.to != null) {
+            generator.writeKey("to");
+            generator.write(this.to);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AggregationRange}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AggregationRange> {
+        @Nullable
+        private String from;
+
+        @Nullable
+        private String key;
+
+        @Nullable
+        private String to;
+
+        /**
+         * API name: {@code from}
+         */
+        public final Builder from(@Nullable String value) {
+            this.from = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code key}
+         */
+        public final Builder key(@Nullable String value) {
+            this.key = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code to}
+         */
+        public final Builder to(@Nullable String value) {
+            this.to = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link AggregationRange}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AggregationRange build() {
+            _checkSingleUse();
+
+            return new AggregationRange(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AggregationRange}
+     */
+    public static final JsonpDeserializer<AggregationRange> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AggregationRange::setupAggregationRangeDeserializer
+    );
+
+    protected static void setupAggregationRangeDeserializer(ObjectDeserializer<AggregationRange.Builder> op) {
+
+        op.add(Builder::from, JsonpDeserializer.stringDeserializer(), "from");
+        op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
+        op.add(Builder::to, JsonpDeserializer.stringDeserializer(), "to");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregationVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregationVariant.java
index 6e0f4b6c3c..48e1c4dbd3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregationVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregationVariant.java
@@ -37,10 +37,10 @@
  */
 public interface AggregationVariant {
 
-	Aggregation.Kind _aggregationKind();
+    Aggregation.Kind _aggregationKind();
 
-	default Aggregation _toAggregation() {
-		return new Aggregation(this);
-	}
+    default Aggregation _toAggregation() {
+        return new Aggregation(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ArrayPercentilesItem.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ArrayPercentilesItem.java
index f0f8d7b2bc..34cf7c6ae9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ArrayPercentilesItem.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ArrayPercentilesItem.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,150 +45,149 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.ArrayPercentilesItem
 
 @JsonpDeserializable
 public class ArrayPercentilesItem implements JsonpSerializable {
-	private final String key;
-
-	private final double value;
-
-	@Nullable
-	private final String valueAsString;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ArrayPercentilesItem(Builder builder) {
-
-		this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
-		this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
-		this.valueAsString = builder.valueAsString;
-
-	}
-
-	public static ArrayPercentilesItem of(Function<Builder, ObjectBuilder<ArrayPercentilesItem>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code key}
-	 */
-	public final String key() {
-		return this.key;
-	}
-
-	/**
-	 * Required - API name: {@code value}
-	 * <p>
-	 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-	 */
-	public final double value() {
-		return this.value;
-	}
-
-	/**
-	 * API name: {@code value_as_string}
-	 */
-	@Nullable
-	public final String valueAsString() {
-		return this.valueAsString;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("key");
-		generator.write(this.key);
-
-		generator.writeKey("value");
-		JsonpUtils.serializeDoubleOrNull(generator, this.value, 0);
-		if (this.valueAsString != null) {
-			generator.writeKey("value_as_string");
-			generator.write(this.valueAsString);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ArrayPercentilesItem}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ArrayPercentilesItem> {
-		private String key;
-
-		private Double value;
-
-		@Nullable
-		private String valueAsString;
-
-		/**
-		 * Required - API name: {@code key}
-		 */
-		public final Builder key(String value) {
-			this.key = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code value}
-		 * <p>
-		 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-		 */
-		public final Builder value(double value) {
-			this.value = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code value_as_string}
-		 */
-		public final Builder valueAsString(@Nullable String value) {
-			this.valueAsString = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ArrayPercentilesItem}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ArrayPercentilesItem build() {
-			_checkSingleUse();
-
-			return new ArrayPercentilesItem(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ArrayPercentilesItem}
-	 */
-	public static final JsonpDeserializer<ArrayPercentilesItem> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ArrayPercentilesItem::setupArrayPercentilesItemDeserializer);
-
-	protected static void setupArrayPercentilesItemDeserializer(ObjectDeserializer<ArrayPercentilesItem.Builder> op) {
-
-		op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
-		op.add(Builder::value, JsonpDeserializer.doubleOrNullDeserializer(0), "value");
-		op.add(Builder::valueAsString, JsonpDeserializer.stringDeserializer(), "value_as_string");
-
-	}
+    private final String key;
+
+    private final double value;
+
+    @Nullable
+    private final String valueAsString;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ArrayPercentilesItem(Builder builder) {
+
+        this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
+        this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
+        this.valueAsString = builder.valueAsString;
+
+    }
+
+    public static ArrayPercentilesItem of(Function<Builder, ObjectBuilder<ArrayPercentilesItem>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code key}
+     */
+    public final String key() {
+        return this.key;
+    }
+
+    /**
+     * Required - API name: {@code value}
+     * <p>
+     * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+     */
+    public final double value() {
+        return this.value;
+    }
+
+    /**
+     * API name: {@code value_as_string}
+     */
+    @Nullable
+    public final String valueAsString() {
+        return this.valueAsString;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("key");
+        generator.write(this.key);
+
+        generator.writeKey("value");
+        JsonpUtils.serializeDoubleOrNull(generator, this.value, 0);
+        if (this.valueAsString != null) {
+            generator.writeKey("value_as_string");
+            generator.write(this.valueAsString);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ArrayPercentilesItem}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ArrayPercentilesItem> {
+        private String key;
+
+        private Double value;
+
+        @Nullable
+        private String valueAsString;
+
+        /**
+         * Required - API name: {@code key}
+         */
+        public final Builder key(String value) {
+            this.key = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code value}
+         * <p>
+         * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+         */
+        public final Builder value(double value) {
+            this.value = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code value_as_string}
+         */
+        public final Builder valueAsString(@Nullable String value) {
+            this.valueAsString = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ArrayPercentilesItem}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ArrayPercentilesItem build() {
+            _checkSingleUse();
+
+            return new ArrayPercentilesItem(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ArrayPercentilesItem}
+     */
+    public static final JsonpDeserializer<ArrayPercentilesItem> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ArrayPercentilesItem::setupArrayPercentilesItemDeserializer
+    );
+
+    protected static void setupArrayPercentilesItemDeserializer(ObjectDeserializer<ArrayPercentilesItem.Builder> op) {
+
+        op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
+        op.add(Builder::value, JsonpDeserializer.doubleOrNullDeserializer(0), "value");
+        op.add(Builder::valueAsString, JsonpDeserializer.stringDeserializer(), "value_as_string");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AutoDateHistogramAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AutoDateHistogramAggregate.java
index 2e4034c8dd..4301d66416 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AutoDateHistogramAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AutoDateHistogramAggregate.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,104 +41,101 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.AutoDateHistogramAggregate
 
 @JsonpDeserializable
-public class AutoDateHistogramAggregate extends MultiBucketAggregateBase<DateHistogramBucket>
-		implements
-			AggregateVariant {
-	private final String interval;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AutoDateHistogramAggregate(Builder builder) {
-		super(builder);
-
-		this.interval = ApiTypeHelper.requireNonNull(builder.interval, this, "interval");
-
-	}
-
-	public static AutoDateHistogramAggregate of(Function<Builder, ObjectBuilder<AutoDateHistogramAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.AutoDateHistogram;
-	}
-
-	/**
-	 * Required - API name: {@code interval}
-	 */
-	public final String interval() {
-		return this.interval;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("interval");
-		generator.write(this.interval);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AutoDateHistogramAggregate}.
-	 */
-
-	public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<DateHistogramBucket, Builder>
-			implements
-				ObjectBuilder<AutoDateHistogramAggregate> {
-		private String interval;
-
-		/**
-		 * Required - API name: {@code interval}
-		 */
-		public final Builder interval(String value) {
-			this.interval = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AutoDateHistogramAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AutoDateHistogramAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new AutoDateHistogramAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AutoDateHistogramAggregate}
-	 */
-	public static final JsonpDeserializer<AutoDateHistogramAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, AutoDateHistogramAggregate::setupAutoDateHistogramAggregateDeserializer);
-
-	protected static void setupAutoDateHistogramAggregateDeserializer(
-			ObjectDeserializer<AutoDateHistogramAggregate.Builder> op) {
-		setupMultiBucketAggregateBaseDeserializer(op, DateHistogramBucket._DESERIALIZER);
-		op.add(Builder::interval, JsonpDeserializer.stringDeserializer(), "interval");
-
-	}
+public class AutoDateHistogramAggregate extends MultiBucketAggregateBase<DateHistogramBucket> implements AggregateVariant {
+    private final String interval;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AutoDateHistogramAggregate(Builder builder) {
+        super(builder);
+
+        this.interval = ApiTypeHelper.requireNonNull(builder.interval, this, "interval");
+
+    }
+
+    public static AutoDateHistogramAggregate of(Function<Builder, ObjectBuilder<AutoDateHistogramAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.AutoDateHistogram;
+    }
+
+    /**
+     * Required - API name: {@code interval}
+     */
+    public final String interval() {
+        return this.interval;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("interval");
+        generator.write(this.interval);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AutoDateHistogramAggregate}.
+     */
+
+    public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<DateHistogramBucket, Builder>
+        implements
+            ObjectBuilder<AutoDateHistogramAggregate> {
+        private String interval;
+
+        /**
+         * Required - API name: {@code interval}
+         */
+        public final Builder interval(String value) {
+            this.interval = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link AutoDateHistogramAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AutoDateHistogramAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new AutoDateHistogramAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AutoDateHistogramAggregate}
+     */
+    public static final JsonpDeserializer<AutoDateHistogramAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AutoDateHistogramAggregate::setupAutoDateHistogramAggregateDeserializer
+    );
+
+    protected static void setupAutoDateHistogramAggregateDeserializer(ObjectDeserializer<AutoDateHistogramAggregate.Builder> op) {
+        setupMultiBucketAggregateBaseDeserializer(op, DateHistogramBucket._DESERIALIZER);
+        op.add(Builder::interval, JsonpDeserializer.stringDeserializer(), "interval");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AutoDateHistogramAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AutoDateHistogramAggregation.java
index 32f7d08491..f369ca758b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AutoDateHistogramAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AutoDateHistogramAggregation.java
@@ -32,372 +32,373 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.AutoDateHistogramAggregation
 
 @JsonpDeserializable
 public class AutoDateHistogramAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Integer buckets;
-
-	@Nullable
-	private final String field;
-
-	@Nullable
-	private final String format;
-
-	@Nullable
-	private final MinimumInterval minimumInterval;
-
-	@Nullable
-	private final String missing;
-
-	@Nullable
-	private final String offset;
-
-	private final Map<String, JsonData> params;
-
-	@Nullable
-	private final Script script;
-
-	@Nullable
-	private final String timeZone;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AutoDateHistogramAggregation(Builder builder) {
-		super(builder);
-
-		this.buckets = builder.buckets;
-		this.field = builder.field;
-		this.format = builder.format;
-		this.minimumInterval = builder.minimumInterval;
-		this.missing = builder.missing;
-		this.offset = builder.offset;
-		this.params = ApiTypeHelper.unmodifiable(builder.params);
-		this.script = builder.script;
-		this.timeZone = builder.timeZone;
-
-	}
-
-	public static AutoDateHistogramAggregation of(Function<Builder, ObjectBuilder<AutoDateHistogramAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.AutoDateHistogram;
-	}
-
-	/**
-	 * API name: {@code buckets}
-	 */
-	@Nullable
-	public final Integer buckets() {
-		return this.buckets;
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code format}
-	 */
-	@Nullable
-	public final String format() {
-		return this.format;
-	}
-
-	/**
-	 * API name: {@code minimum_interval}
-	 */
-	@Nullable
-	public final MinimumInterval minimumInterval() {
-		return this.minimumInterval;
-	}
-
-	/**
-	 * API name: {@code missing}
-	 */
-	@Nullable
-	public final String missing() {
-		return this.missing;
-	}
-
-	/**
-	 * API name: {@code offset}
-	 */
-	@Nullable
-	public final String offset() {
-		return this.offset;
-	}
-
-	/**
-	 * API name: {@code params}
-	 */
-	public final Map<String, JsonData> params() {
-		return this.params;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final Script script() {
-		return this.script;
-	}
-
-	/**
-	 * API name: {@code time_zone}
-	 */
-	@Nullable
-	public final String timeZone() {
-		return this.timeZone;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.buckets != null) {
-			generator.writeKey("buckets");
-			generator.write(this.buckets);
-
-		}
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (this.format != null) {
-			generator.writeKey("format");
-			generator.write(this.format);
-
-		}
-		if (this.minimumInterval != null) {
-			generator.writeKey("minimum_interval");
-			this.minimumInterval.serialize(generator, mapper);
-		}
-		if (this.missing != null) {
-			generator.writeKey("missing");
-			generator.write(this.missing);
-
-		}
-		if (this.offset != null) {
-			generator.writeKey("offset");
-			generator.write(this.offset);
-
-		}
-		if (ApiTypeHelper.isDefined(this.params)) {
-			generator.writeKey("params");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-		if (this.timeZone != null) {
-			generator.writeKey("time_zone");
-			generator.write(this.timeZone);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AutoDateHistogramAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<AutoDateHistogramAggregation> {
-		@Nullable
-		private Integer buckets;
-
-		@Nullable
-		private String field;
-
-		@Nullable
-		private String format;
-
-		@Nullable
-		private MinimumInterval minimumInterval;
-
-		@Nullable
-		private String missing;
-
-		@Nullable
-		private String offset;
-
-		@Nullable
-		private Map<String, JsonData> params;
-
-		@Nullable
-		private Script script;
-
-		@Nullable
-		private String timeZone;
-
-		/**
-		 * API name: {@code buckets}
-		 */
-		public final Builder buckets(@Nullable Integer value) {
-			this.buckets = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code format}
-		 */
-		public final Builder format(@Nullable String value) {
-			this.format = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code minimum_interval}
-		 */
-		public final Builder minimumInterval(@Nullable MinimumInterval value) {
-			this.minimumInterval = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code missing}
-		 */
-		public final Builder missing(@Nullable String value) {
-			this.missing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code offset}
-		 */
-		public final Builder offset(@Nullable String value) {
-			this.offset = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code params}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>params</code>.
-		 */
-		public final Builder params(Map<String, JsonData> map) {
-			this.params = _mapPutAll(this.params, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code params}
-		 * <p>
-		 * Adds an entry to <code>params</code>.
-		 */
-		public final Builder params(String key, JsonData value) {
-			this.params = _mapPut(this.params, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(@Nullable Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code time_zone}
-		 */
-		public final Builder timeZone(@Nullable String value) {
-			this.timeZone = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AutoDateHistogramAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AutoDateHistogramAggregation build() {
-			_checkSingleUse();
-
-			return new AutoDateHistogramAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AutoDateHistogramAggregation}
-	 */
-	public static final JsonpDeserializer<AutoDateHistogramAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, AutoDateHistogramAggregation::setupAutoDateHistogramAggregationDeserializer);
-
-	protected static void setupAutoDateHistogramAggregationDeserializer(
-			ObjectDeserializer<AutoDateHistogramAggregation.Builder> op) {
-		BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::buckets, JsonpDeserializer.integerDeserializer(), "buckets");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
-		op.add(Builder::minimumInterval, MinimumInterval._DESERIALIZER, "minimum_interval");
-		op.add(Builder::missing, JsonpDeserializer.stringDeserializer(), "missing");
-		op.add(Builder::offset, JsonpDeserializer.stringDeserializer(), "offset");
-		op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-		op.add(Builder::timeZone, JsonpDeserializer.stringDeserializer(), "time_zone");
-
-	}
+    @Nullable
+    private final Integer buckets;
+
+    @Nullable
+    private final String field;
+
+    @Nullable
+    private final String format;
+
+    @Nullable
+    private final MinimumInterval minimumInterval;
+
+    @Nullable
+    private final String missing;
+
+    @Nullable
+    private final String offset;
+
+    private final Map<String, JsonData> params;
+
+    @Nullable
+    private final Script script;
+
+    @Nullable
+    private final String timeZone;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AutoDateHistogramAggregation(Builder builder) {
+        super(builder);
+
+        this.buckets = builder.buckets;
+        this.field = builder.field;
+        this.format = builder.format;
+        this.minimumInterval = builder.minimumInterval;
+        this.missing = builder.missing;
+        this.offset = builder.offset;
+        this.params = ApiTypeHelper.unmodifiable(builder.params);
+        this.script = builder.script;
+        this.timeZone = builder.timeZone;
+
+    }
+
+    public static AutoDateHistogramAggregation of(Function<Builder, ObjectBuilder<AutoDateHistogramAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.AutoDateHistogram;
+    }
+
+    /**
+     * API name: {@code buckets}
+     */
+    @Nullable
+    public final Integer buckets() {
+        return this.buckets;
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code format}
+     */
+    @Nullable
+    public final String format() {
+        return this.format;
+    }
+
+    /**
+     * API name: {@code minimum_interval}
+     */
+    @Nullable
+    public final MinimumInterval minimumInterval() {
+        return this.minimumInterval;
+    }
+
+    /**
+     * API name: {@code missing}
+     */
+    @Nullable
+    public final String missing() {
+        return this.missing;
+    }
+
+    /**
+     * API name: {@code offset}
+     */
+    @Nullable
+    public final String offset() {
+        return this.offset;
+    }
+
+    /**
+     * API name: {@code params}
+     */
+    public final Map<String, JsonData> params() {
+        return this.params;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final Script script() {
+        return this.script;
+    }
+
+    /**
+     * API name: {@code time_zone}
+     */
+    @Nullable
+    public final String timeZone() {
+        return this.timeZone;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.buckets != null) {
+            generator.writeKey("buckets");
+            generator.write(this.buckets);
+
+        }
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (this.format != null) {
+            generator.writeKey("format");
+            generator.write(this.format);
+
+        }
+        if (this.minimumInterval != null) {
+            generator.writeKey("minimum_interval");
+            this.minimumInterval.serialize(generator, mapper);
+        }
+        if (this.missing != null) {
+            generator.writeKey("missing");
+            generator.write(this.missing);
+
+        }
+        if (this.offset != null) {
+            generator.writeKey("offset");
+            generator.write(this.offset);
+
+        }
+        if (ApiTypeHelper.isDefined(this.params)) {
+            generator.writeKey("params");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+        if (this.timeZone != null) {
+            generator.writeKey("time_zone");
+            generator.write(this.timeZone);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AutoDateHistogramAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<AutoDateHistogramAggregation> {
+        @Nullable
+        private Integer buckets;
+
+        @Nullable
+        private String field;
+
+        @Nullable
+        private String format;
+
+        @Nullable
+        private MinimumInterval minimumInterval;
+
+        @Nullable
+        private String missing;
+
+        @Nullable
+        private String offset;
+
+        @Nullable
+        private Map<String, JsonData> params;
+
+        @Nullable
+        private Script script;
+
+        @Nullable
+        private String timeZone;
+
+        /**
+         * API name: {@code buckets}
+         */
+        public final Builder buckets(@Nullable Integer value) {
+            this.buckets = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code format}
+         */
+        public final Builder format(@Nullable String value) {
+            this.format = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code minimum_interval}
+         */
+        public final Builder minimumInterval(@Nullable MinimumInterval value) {
+            this.minimumInterval = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code missing}
+         */
+        public final Builder missing(@Nullable String value) {
+            this.missing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code offset}
+         */
+        public final Builder offset(@Nullable String value) {
+            this.offset = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code params}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>params</code>.
+         */
+        public final Builder params(Map<String, JsonData> map) {
+            this.params = _mapPutAll(this.params, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code params}
+         * <p>
+         * Adds an entry to <code>params</code>.
+         */
+        public final Builder params(String key, JsonData value) {
+            this.params = _mapPut(this.params, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(@Nullable Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * API name: {@code time_zone}
+         */
+        public final Builder timeZone(@Nullable String value) {
+            this.timeZone = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link AutoDateHistogramAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AutoDateHistogramAggregation build() {
+            _checkSingleUse();
+
+            return new AutoDateHistogramAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AutoDateHistogramAggregation}
+     */
+    public static final JsonpDeserializer<AutoDateHistogramAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AutoDateHistogramAggregation::setupAutoDateHistogramAggregationDeserializer
+    );
+
+    protected static void setupAutoDateHistogramAggregationDeserializer(ObjectDeserializer<AutoDateHistogramAggregation.Builder> op) {
+        BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::buckets, JsonpDeserializer.integerDeserializer(), "buckets");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
+        op.add(Builder::minimumInterval, MinimumInterval._DESERIALIZER, "minimum_interval");
+        op.add(Builder::missing, JsonpDeserializer.stringDeserializer(), "missing");
+        op.add(Builder::offset, JsonpDeserializer.stringDeserializer(), "offset");
+        op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+        op.add(Builder::timeZone, JsonpDeserializer.stringDeserializer(), "time_zone");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AverageAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AverageAggregation.java
index 8b1d4da20b..e89d7738e7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AverageAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AverageAggregation.java
@@ -32,75 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.AverageAggregation
 
 @JsonpDeserializable
 public class AverageAggregation extends FormatMetricAggregationBase implements AggregationVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private AverageAggregation(Builder builder) {
-		super(builder);
-
-	}
-
-	public static AverageAggregation of(Function<Builder, ObjectBuilder<AverageAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Avg;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AverageAggregation}.
-	 */
-
-	public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<AverageAggregation> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AverageAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AverageAggregation build() {
-			_checkSingleUse();
-
-			return new AverageAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AverageAggregation}
-	 */
-	public static final JsonpDeserializer<AverageAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, AverageAggregation::setupAverageAggregationDeserializer);
-
-	protected static void setupAverageAggregationDeserializer(ObjectDeserializer<AverageAggregation.Builder> op) {
-		FormatMetricAggregationBase.setupFormatMetricAggregationBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private AverageAggregation(Builder builder) {
+        super(builder);
+
+    }
+
+    public static AverageAggregation of(Function<Builder, ObjectBuilder<AverageAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Avg;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AverageAggregation}.
+     */
+
+    public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<AverageAggregation> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link AverageAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AverageAggregation build() {
+            _checkSingleUse();
+
+            return new AverageAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AverageAggregation}
+     */
+    public static final JsonpDeserializer<AverageAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AverageAggregation::setupAverageAggregationDeserializer
+    );
+
+    protected static void setupAverageAggregationDeserializer(ObjectDeserializer<AverageAggregation.Builder> op) {
+        FormatMetricAggregationBase.setupFormatMetricAggregationBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AverageBucketAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AverageBucketAggregation.java
index 4b1ec7b0df..b8e616706d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AverageBucketAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AverageBucketAggregation.java
@@ -32,76 +32,76 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.AverageBucketAggregation
 
 @JsonpDeserializable
 public class AverageBucketAggregation extends PipelineAggregationBase implements AggregationVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private AverageBucketAggregation(Builder builder) {
-		super(builder);
-
-	}
-
-	public static AverageBucketAggregation of(Function<Builder, ObjectBuilder<AverageBucketAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.AvgBucket;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AverageBucketAggregation}.
-	 */
-
-	public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<AverageBucketAggregation> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AverageBucketAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AverageBucketAggregation build() {
-			_checkSingleUse();
-
-			return new AverageBucketAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AverageBucketAggregation}
-	 */
-	public static final JsonpDeserializer<AverageBucketAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, AverageBucketAggregation::setupAverageBucketAggregationDeserializer);
-
-	protected static void setupAverageBucketAggregationDeserializer(
-			ObjectDeserializer<AverageBucketAggregation.Builder> op) {
-		PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private AverageBucketAggregation(Builder builder) {
+        super(builder);
+
+    }
+
+    public static AverageBucketAggregation of(Function<Builder, ObjectBuilder<AverageBucketAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.AvgBucket;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AverageBucketAggregation}.
+     */
+
+    public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<AverageBucketAggregation> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link AverageBucketAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AverageBucketAggregation build() {
+            _checkSingleUse();
+
+            return new AverageBucketAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AverageBucketAggregation}
+     */
+    public static final JsonpDeserializer<AverageBucketAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AverageBucketAggregation::setupAverageBucketAggregationDeserializer
+    );
+
+    protected static void setupAverageBucketAggregationDeserializer(ObjectDeserializer<AverageBucketAggregation.Builder> op) {
+        PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AvgAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AvgAggregate.java
index 16f7b2b1a8..e3921dbc46 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AvgAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AvgAggregate.java
@@ -32,75 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.AvgAggregate
 
 @JsonpDeserializable
 public class AvgAggregate extends SingleMetricAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private AvgAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static AvgAggregate of(Function<Builder, ObjectBuilder<AvgAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Avg;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AvgAggregate}.
-	 */
-
-	public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<AvgAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AvgAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AvgAggregate build() {
-			_checkSingleUse();
-
-			return new AvgAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AvgAggregate}
-	 */
-	public static final JsonpDeserializer<AvgAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			AvgAggregate::setupAvgAggregateDeserializer);
-
-	protected static void setupAvgAggregateDeserializer(ObjectDeserializer<AvgAggregate.Builder> op) {
-		setupSingleMetricAggregateBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private AvgAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static AvgAggregate of(Function<Builder, ObjectBuilder<AvgAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Avg;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AvgAggregate}.
+     */
+
+    public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<AvgAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link AvgAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AvgAggregate build() {
+            _checkSingleUse();
+
+            return new AvgAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AvgAggregate}
+     */
+    public static final JsonpDeserializer<AvgAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AvgAggregate::setupAvgAggregateDeserializer
+    );
+
+    protected static void setupAvgAggregateDeserializer(ObjectDeserializer<AvgAggregate.Builder> op) {
+        setupSingleMetricAggregateBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BoxPlotAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BoxPlotAggregate.java
index d3ba4b4fc8..4dbcc65265 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BoxPlotAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BoxPlotAggregate.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,449 +42,446 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.BoxPlotAggregate
 
 @JsonpDeserializable
 public class BoxPlotAggregate extends AggregateBase implements AggregateVariant {
-	private final double min;
-
-	private final double max;
-
-	private final double q1;
-
-	private final double q2;
-
-	private final double q3;
-
-	private final double lower;
-
-	private final double upper;
-
-	@Nullable
-	private final String minAsString;
-
-	@Nullable
-	private final String maxAsString;
-
-	@Nullable
-	private final String q1AsString;
-
-	@Nullable
-	private final String q2AsString;
-
-	@Nullable
-	private final String q3AsString;
-
-	@Nullable
-	private final String lowerAsString;
-
-	@Nullable
-	private final String upperAsString;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private BoxPlotAggregate(Builder builder) {
-		super(builder);
-
-		this.min = ApiTypeHelper.requireNonNull(builder.min, this, "min");
-		this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
-		this.q1 = ApiTypeHelper.requireNonNull(builder.q1, this, "q1");
-		this.q2 = ApiTypeHelper.requireNonNull(builder.q2, this, "q2");
-		this.q3 = ApiTypeHelper.requireNonNull(builder.q3, this, "q3");
-		this.lower = ApiTypeHelper.requireNonNull(builder.lower, this, "lower");
-		this.upper = ApiTypeHelper.requireNonNull(builder.upper, this, "upper");
-		this.minAsString = builder.minAsString;
-		this.maxAsString = builder.maxAsString;
-		this.q1AsString = builder.q1AsString;
-		this.q2AsString = builder.q2AsString;
-		this.q3AsString = builder.q3AsString;
-		this.lowerAsString = builder.lowerAsString;
-		this.upperAsString = builder.upperAsString;
-
-	}
-
-	public static BoxPlotAggregate of(Function<Builder, ObjectBuilder<BoxPlotAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.BoxPlot;
-	}
-
-	/**
-	 * Required - API name: {@code min}
-	 */
-	public final double min() {
-		return this.min;
-	}
-
-	/**
-	 * Required - API name: {@code max}
-	 */
-	public final double max() {
-		return this.max;
-	}
-
-	/**
-	 * Required - API name: {@code q1}
-	 */
-	public final double q1() {
-		return this.q1;
-	}
-
-	/**
-	 * Required - API name: {@code q2}
-	 */
-	public final double q2() {
-		return this.q2;
-	}
-
-	/**
-	 * Required - API name: {@code q3}
-	 */
-	public final double q3() {
-		return this.q3;
-	}
-
-	/**
-	 * Required - API name: {@code lower}
-	 */
-	public final double lower() {
-		return this.lower;
-	}
-
-	/**
-	 * Required - API name: {@code upper}
-	 */
-	public final double upper() {
-		return this.upper;
-	}
-
-	/**
-	 * API name: {@code min_as_string}
-	 */
-	@Nullable
-	public final String minAsString() {
-		return this.minAsString;
-	}
-
-	/**
-	 * API name: {@code max_as_string}
-	 */
-	@Nullable
-	public final String maxAsString() {
-		return this.maxAsString;
-	}
-
-	/**
-	 * API name: {@code q1_as_string}
-	 */
-	@Nullable
-	public final String q1AsString() {
-		return this.q1AsString;
-	}
-
-	/**
-	 * API name: {@code q2_as_string}
-	 */
-	@Nullable
-	public final String q2AsString() {
-		return this.q2AsString;
-	}
-
-	/**
-	 * API name: {@code q3_as_string}
-	 */
-	@Nullable
-	public final String q3AsString() {
-		return this.q3AsString;
-	}
-
-	/**
-	 * API name: {@code lower_as_string}
-	 */
-	@Nullable
-	public final String lowerAsString() {
-		return this.lowerAsString;
-	}
-
-	/**
-	 * API name: {@code upper_as_string}
-	 */
-	@Nullable
-	public final String upperAsString() {
-		return this.upperAsString;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("min");
-		generator.write(this.min);
-
-		generator.writeKey("max");
-		generator.write(this.max);
-
-		generator.writeKey("q1");
-		generator.write(this.q1);
-
-		generator.writeKey("q2");
-		generator.write(this.q2);
-
-		generator.writeKey("q3");
-		generator.write(this.q3);
-
-		generator.writeKey("lower");
-		generator.write(this.lower);
-
-		generator.writeKey("upper");
-		generator.write(this.upper);
-
-		if (this.minAsString != null) {
-			generator.writeKey("min_as_string");
-			generator.write(this.minAsString);
-
-		}
-		if (this.maxAsString != null) {
-			generator.writeKey("max_as_string");
-			generator.write(this.maxAsString);
-
-		}
-		if (this.q1AsString != null) {
-			generator.writeKey("q1_as_string");
-			generator.write(this.q1AsString);
-
-		}
-		if (this.q2AsString != null) {
-			generator.writeKey("q2_as_string");
-			generator.write(this.q2AsString);
-
-		}
-		if (this.q3AsString != null) {
-			generator.writeKey("q3_as_string");
-			generator.write(this.q3AsString);
-
-		}
-		if (this.lowerAsString != null) {
-			generator.writeKey("lower_as_string");
-			generator.write(this.lowerAsString);
-
-		}
-		if (this.upperAsString != null) {
-			generator.writeKey("upper_as_string");
-			generator.write(this.upperAsString);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link BoxPlotAggregate}.
-	 */
-
-	public static class Builder extends AggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<BoxPlotAggregate> {
-		private Double min;
-
-		private Double max;
-
-		private Double q1;
-
-		private Double q2;
-
-		private Double q3;
-
-		private Double lower;
-
-		private Double upper;
-
-		@Nullable
-		private String minAsString;
-
-		@Nullable
-		private String maxAsString;
-
-		@Nullable
-		private String q1AsString;
-
-		@Nullable
-		private String q2AsString;
-
-		@Nullable
-		private String q3AsString;
-
-		@Nullable
-		private String lowerAsString;
-
-		@Nullable
-		private String upperAsString;
-
-		/**
-		 * Required - API name: {@code min}
-		 */
-		public final Builder min(double value) {
-			this.min = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code max}
-		 */
-		public final Builder max(double value) {
-			this.max = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code q1}
-		 */
-		public final Builder q1(double value) {
-			this.q1 = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code q2}
-		 */
-		public final Builder q2(double value) {
-			this.q2 = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code q3}
-		 */
-		public final Builder q3(double value) {
-			this.q3 = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code lower}
-		 */
-		public final Builder lower(double value) {
-			this.lower = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code upper}
-		 */
-		public final Builder upper(double value) {
-			this.upper = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_as_string}
-		 */
-		public final Builder minAsString(@Nullable String value) {
-			this.minAsString = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_as_string}
-		 */
-		public final Builder maxAsString(@Nullable String value) {
-			this.maxAsString = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code q1_as_string}
-		 */
-		public final Builder q1AsString(@Nullable String value) {
-			this.q1AsString = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code q2_as_string}
-		 */
-		public final Builder q2AsString(@Nullable String value) {
-			this.q2AsString = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code q3_as_string}
-		 */
-		public final Builder q3AsString(@Nullable String value) {
-			this.q3AsString = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code lower_as_string}
-		 */
-		public final Builder lowerAsString(@Nullable String value) {
-			this.lowerAsString = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code upper_as_string}
-		 */
-		public final Builder upperAsString(@Nullable String value) {
-			this.upperAsString = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link BoxPlotAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public BoxPlotAggregate build() {
-			_checkSingleUse();
-
-			return new BoxPlotAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link BoxPlotAggregate}
-	 */
-	public static final JsonpDeserializer<BoxPlotAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			BoxPlotAggregate::setupBoxPlotAggregateDeserializer);
-
-	protected static void setupBoxPlotAggregateDeserializer(ObjectDeserializer<BoxPlotAggregate.Builder> op) {
-		AggregateBase.setupAggregateBaseDeserializer(op);
-		op.add(Builder::min, JsonpDeserializer.doubleDeserializer(), "min");
-		op.add(Builder::max, JsonpDeserializer.doubleDeserializer(), "max");
-		op.add(Builder::q1, JsonpDeserializer.doubleDeserializer(), "q1");
-		op.add(Builder::q2, JsonpDeserializer.doubleDeserializer(), "q2");
-		op.add(Builder::q3, JsonpDeserializer.doubleDeserializer(), "q3");
-		op.add(Builder::lower, JsonpDeserializer.doubleDeserializer(), "lower");
-		op.add(Builder::upper, JsonpDeserializer.doubleDeserializer(), "upper");
-		op.add(Builder::minAsString, JsonpDeserializer.stringDeserializer(), "min_as_string");
-		op.add(Builder::maxAsString, JsonpDeserializer.stringDeserializer(), "max_as_string");
-		op.add(Builder::q1AsString, JsonpDeserializer.stringDeserializer(), "q1_as_string");
-		op.add(Builder::q2AsString, JsonpDeserializer.stringDeserializer(), "q2_as_string");
-		op.add(Builder::q3AsString, JsonpDeserializer.stringDeserializer(), "q3_as_string");
-		op.add(Builder::lowerAsString, JsonpDeserializer.stringDeserializer(), "lower_as_string");
-		op.add(Builder::upperAsString, JsonpDeserializer.stringDeserializer(), "upper_as_string");
-
-	}
+    private final double min;
+
+    private final double max;
+
+    private final double q1;
+
+    private final double q2;
+
+    private final double q3;
+
+    private final double lower;
+
+    private final double upper;
+
+    @Nullable
+    private final String minAsString;
+
+    @Nullable
+    private final String maxAsString;
+
+    @Nullable
+    private final String q1AsString;
+
+    @Nullable
+    private final String q2AsString;
+
+    @Nullable
+    private final String q3AsString;
+
+    @Nullable
+    private final String lowerAsString;
+
+    @Nullable
+    private final String upperAsString;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private BoxPlotAggregate(Builder builder) {
+        super(builder);
+
+        this.min = ApiTypeHelper.requireNonNull(builder.min, this, "min");
+        this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
+        this.q1 = ApiTypeHelper.requireNonNull(builder.q1, this, "q1");
+        this.q2 = ApiTypeHelper.requireNonNull(builder.q2, this, "q2");
+        this.q3 = ApiTypeHelper.requireNonNull(builder.q3, this, "q3");
+        this.lower = ApiTypeHelper.requireNonNull(builder.lower, this, "lower");
+        this.upper = ApiTypeHelper.requireNonNull(builder.upper, this, "upper");
+        this.minAsString = builder.minAsString;
+        this.maxAsString = builder.maxAsString;
+        this.q1AsString = builder.q1AsString;
+        this.q2AsString = builder.q2AsString;
+        this.q3AsString = builder.q3AsString;
+        this.lowerAsString = builder.lowerAsString;
+        this.upperAsString = builder.upperAsString;
+
+    }
+
+    public static BoxPlotAggregate of(Function<Builder, ObjectBuilder<BoxPlotAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.BoxPlot;
+    }
+
+    /**
+     * Required - API name: {@code min}
+     */
+    public final double min() {
+        return this.min;
+    }
+
+    /**
+     * Required - API name: {@code max}
+     */
+    public final double max() {
+        return this.max;
+    }
+
+    /**
+     * Required - API name: {@code q1}
+     */
+    public final double q1() {
+        return this.q1;
+    }
+
+    /**
+     * Required - API name: {@code q2}
+     */
+    public final double q2() {
+        return this.q2;
+    }
+
+    /**
+     * Required - API name: {@code q3}
+     */
+    public final double q3() {
+        return this.q3;
+    }
+
+    /**
+     * Required - API name: {@code lower}
+     */
+    public final double lower() {
+        return this.lower;
+    }
+
+    /**
+     * Required - API name: {@code upper}
+     */
+    public final double upper() {
+        return this.upper;
+    }
+
+    /**
+     * API name: {@code min_as_string}
+     */
+    @Nullable
+    public final String minAsString() {
+        return this.minAsString;
+    }
+
+    /**
+     * API name: {@code max_as_string}
+     */
+    @Nullable
+    public final String maxAsString() {
+        return this.maxAsString;
+    }
+
+    /**
+     * API name: {@code q1_as_string}
+     */
+    @Nullable
+    public final String q1AsString() {
+        return this.q1AsString;
+    }
+
+    /**
+     * API name: {@code q2_as_string}
+     */
+    @Nullable
+    public final String q2AsString() {
+        return this.q2AsString;
+    }
+
+    /**
+     * API name: {@code q3_as_string}
+     */
+    @Nullable
+    public final String q3AsString() {
+        return this.q3AsString;
+    }
+
+    /**
+     * API name: {@code lower_as_string}
+     */
+    @Nullable
+    public final String lowerAsString() {
+        return this.lowerAsString;
+    }
+
+    /**
+     * API name: {@code upper_as_string}
+     */
+    @Nullable
+    public final String upperAsString() {
+        return this.upperAsString;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("min");
+        generator.write(this.min);
+
+        generator.writeKey("max");
+        generator.write(this.max);
+
+        generator.writeKey("q1");
+        generator.write(this.q1);
+
+        generator.writeKey("q2");
+        generator.write(this.q2);
+
+        generator.writeKey("q3");
+        generator.write(this.q3);
+
+        generator.writeKey("lower");
+        generator.write(this.lower);
+
+        generator.writeKey("upper");
+        generator.write(this.upper);
+
+        if (this.minAsString != null) {
+            generator.writeKey("min_as_string");
+            generator.write(this.minAsString);
+
+        }
+        if (this.maxAsString != null) {
+            generator.writeKey("max_as_string");
+            generator.write(this.maxAsString);
+
+        }
+        if (this.q1AsString != null) {
+            generator.writeKey("q1_as_string");
+            generator.write(this.q1AsString);
+
+        }
+        if (this.q2AsString != null) {
+            generator.writeKey("q2_as_string");
+            generator.write(this.q2AsString);
+
+        }
+        if (this.q3AsString != null) {
+            generator.writeKey("q3_as_string");
+            generator.write(this.q3AsString);
+
+        }
+        if (this.lowerAsString != null) {
+            generator.writeKey("lower_as_string");
+            generator.write(this.lowerAsString);
+
+        }
+        if (this.upperAsString != null) {
+            generator.writeKey("upper_as_string");
+            generator.write(this.upperAsString);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link BoxPlotAggregate}.
+     */
+
+    public static class Builder extends AggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<BoxPlotAggregate> {
+        private Double min;
+
+        private Double max;
+
+        private Double q1;
+
+        private Double q2;
+
+        private Double q3;
+
+        private Double lower;
+
+        private Double upper;
+
+        @Nullable
+        private String minAsString;
+
+        @Nullable
+        private String maxAsString;
+
+        @Nullable
+        private String q1AsString;
+
+        @Nullable
+        private String q2AsString;
+
+        @Nullable
+        private String q3AsString;
+
+        @Nullable
+        private String lowerAsString;
+
+        @Nullable
+        private String upperAsString;
+
+        /**
+         * Required - API name: {@code min}
+         */
+        public final Builder min(double value) {
+            this.min = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code max}
+         */
+        public final Builder max(double value) {
+            this.max = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code q1}
+         */
+        public final Builder q1(double value) {
+            this.q1 = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code q2}
+         */
+        public final Builder q2(double value) {
+            this.q2 = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code q3}
+         */
+        public final Builder q3(double value) {
+            this.q3 = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code lower}
+         */
+        public final Builder lower(double value) {
+            this.lower = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code upper}
+         */
+        public final Builder upper(double value) {
+            this.upper = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code min_as_string}
+         */
+        public final Builder minAsString(@Nullable String value) {
+            this.minAsString = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_as_string}
+         */
+        public final Builder maxAsString(@Nullable String value) {
+            this.maxAsString = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code q1_as_string}
+         */
+        public final Builder q1AsString(@Nullable String value) {
+            this.q1AsString = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code q2_as_string}
+         */
+        public final Builder q2AsString(@Nullable String value) {
+            this.q2AsString = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code q3_as_string}
+         */
+        public final Builder q3AsString(@Nullable String value) {
+            this.q3AsString = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code lower_as_string}
+         */
+        public final Builder lowerAsString(@Nullable String value) {
+            this.lowerAsString = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code upper_as_string}
+         */
+        public final Builder upperAsString(@Nullable String value) {
+            this.upperAsString = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link BoxPlotAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public BoxPlotAggregate build() {
+            _checkSingleUse();
+
+            return new BoxPlotAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link BoxPlotAggregate}
+     */
+    public static final JsonpDeserializer<BoxPlotAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        BoxPlotAggregate::setupBoxPlotAggregateDeserializer
+    );
+
+    protected static void setupBoxPlotAggregateDeserializer(ObjectDeserializer<BoxPlotAggregate.Builder> op) {
+        AggregateBase.setupAggregateBaseDeserializer(op);
+        op.add(Builder::min, JsonpDeserializer.doubleDeserializer(), "min");
+        op.add(Builder::max, JsonpDeserializer.doubleDeserializer(), "max");
+        op.add(Builder::q1, JsonpDeserializer.doubleDeserializer(), "q1");
+        op.add(Builder::q2, JsonpDeserializer.doubleDeserializer(), "q2");
+        op.add(Builder::q3, JsonpDeserializer.doubleDeserializer(), "q3");
+        op.add(Builder::lower, JsonpDeserializer.doubleDeserializer(), "lower");
+        op.add(Builder::upper, JsonpDeserializer.doubleDeserializer(), "upper");
+        op.add(Builder::minAsString, JsonpDeserializer.stringDeserializer(), "min_as_string");
+        op.add(Builder::maxAsString, JsonpDeserializer.stringDeserializer(), "max_as_string");
+        op.add(Builder::q1AsString, JsonpDeserializer.stringDeserializer(), "q1_as_string");
+        op.add(Builder::q2AsString, JsonpDeserializer.stringDeserializer(), "q2_as_string");
+        op.add(Builder::q3AsString, JsonpDeserializer.stringDeserializer(), "q3_as_string");
+        op.add(Builder::lowerAsString, JsonpDeserializer.stringDeserializer(), "lower_as_string");
+        op.add(Builder::upperAsString, JsonpDeserializer.stringDeserializer(), "upper_as_string");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BoxplotAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BoxplotAggregation.java
index da7f6efc18..17f0a6c239 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BoxplotAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BoxplotAggregation.java
@@ -32,113 +32,113 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.BoxplotAggregation
 
 @JsonpDeserializable
 public class BoxplotAggregation extends MetricAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Double compression;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private BoxplotAggregation(Builder builder) {
-		super(builder);
-
-		this.compression = builder.compression;
-
-	}
-
-	public static BoxplotAggregation of(Function<Builder, ObjectBuilder<BoxplotAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Boxplot;
-	}
-
-	/**
-	 * API name: {@code compression}
-	 */
-	@Nullable
-	public final Double compression() {
-		return this.compression;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.compression != null) {
-			generator.writeKey("compression");
-			generator.write(this.compression);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link BoxplotAggregation}.
-	 */
-
-	public static class Builder extends MetricAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<BoxplotAggregation> {
-		@Nullable
-		private Double compression;
-
-		/**
-		 * API name: {@code compression}
-		 */
-		public final Builder compression(@Nullable Double value) {
-			this.compression = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link BoxplotAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public BoxplotAggregation build() {
-			_checkSingleUse();
-
-			return new BoxplotAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link BoxplotAggregation}
-	 */
-	public static final JsonpDeserializer<BoxplotAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, BoxplotAggregation::setupBoxplotAggregationDeserializer);
-
-	protected static void setupBoxplotAggregationDeserializer(ObjectDeserializer<BoxplotAggregation.Builder> op) {
-		MetricAggregationBase.setupMetricAggregationBaseDeserializer(op);
-		op.add(Builder::compression, JsonpDeserializer.doubleDeserializer(), "compression");
-
-	}
+    @Nullable
+    private final Double compression;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private BoxplotAggregation(Builder builder) {
+        super(builder);
+
+        this.compression = builder.compression;
+
+    }
+
+    public static BoxplotAggregation of(Function<Builder, ObjectBuilder<BoxplotAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Boxplot;
+    }
+
+    /**
+     * API name: {@code compression}
+     */
+    @Nullable
+    public final Double compression() {
+        return this.compression;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.compression != null) {
+            generator.writeKey("compression");
+            generator.write(this.compression);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link BoxplotAggregation}.
+     */
+
+    public static class Builder extends MetricAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<BoxplotAggregation> {
+        @Nullable
+        private Double compression;
+
+        /**
+         * API name: {@code compression}
+         */
+        public final Builder compression(@Nullable Double value) {
+            this.compression = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link BoxplotAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public BoxplotAggregation build() {
+            _checkSingleUse();
+
+            return new BoxplotAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link BoxplotAggregation}
+     */
+    public static final JsonpDeserializer<BoxplotAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        BoxplotAggregation::setupBoxplotAggregationDeserializer
+    );
+
+    protected static void setupBoxplotAggregationDeserializer(ObjectDeserializer<BoxplotAggregation.Builder> op) {
+        MetricAggregationBase.setupMetricAggregationBaseDeserializer(op);
+        op.add(Builder::compression, JsonpDeserializer.doubleDeserializer(), "compression");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketAggregationBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketAggregationBase.java
index e34929676e..3d35d09a44 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketAggregationBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketAggregationBase.java
@@ -39,27 +39,26 @@
 /**
  * Base type for bucket aggregations. These aggregations also accept
  * sub-aggregations.
- * 
+ *
  */
 
 public abstract class BucketAggregationBase extends AggregationBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected BucketAggregationBase(AbstractBuilder<?> builder) {
-		super(builder);
+    protected BucketAggregationBase(AbstractBuilder<?> builder) {
+        super(builder);
 
-	}
+    }
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				AggregationBase.AbstractBuilder<BuilderT> {
-	}
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregationBase.AbstractBuilder<
+        BuilderT> {}
 
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupBucketAggregationBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		AggregationBase.setupAggregationBaseDeserializer(op);
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupBucketAggregationBaseDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
+        AggregationBase.setupAggregationBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketMetricValueAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketMetricValueAggregate.java
index fb09a86120..aaaf56ba31 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketMetricValueAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketMetricValueAggregate.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,122 +42,120 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.BucketMetricValueAggregate
 
 @JsonpDeserializable
 public class BucketMetricValueAggregate extends SingleMetricAggregateBase implements AggregateVariant {
-	private final List<String> keys;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private BucketMetricValueAggregate(Builder builder) {
-		super(builder);
-
-		this.keys = ApiTypeHelper.unmodifiableRequired(builder.keys, this, "keys");
-
-	}
-
-	public static BucketMetricValueAggregate of(Function<Builder, ObjectBuilder<BucketMetricValueAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.BucketMetricValue;
-	}
-
-	/**
-	 * Required - API name: {@code keys}
-	 */
-	public final List<String> keys() {
-		return this.keys;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.keys)) {
-			generator.writeKey("keys");
-			generator.writeStartArray();
-			for (String item0 : this.keys) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link BucketMetricValueAggregate}.
-	 */
-
-	public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<BucketMetricValueAggregate> {
-		private List<String> keys;
-
-		/**
-		 * Required - API name: {@code keys}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>keys</code>.
-		 */
-		public final Builder keys(List<String> list) {
-			this.keys = _listAddAll(this.keys, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code keys}
-		 * <p>
-		 * Adds one or more values to <code>keys</code>.
-		 */
-		public final Builder keys(String value, String... values) {
-			this.keys = _listAdd(this.keys, value, values);
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link BucketMetricValueAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public BucketMetricValueAggregate build() {
-			_checkSingleUse();
-
-			return new BucketMetricValueAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link BucketMetricValueAggregate}
-	 */
-	public static final JsonpDeserializer<BucketMetricValueAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, BucketMetricValueAggregate::setupBucketMetricValueAggregateDeserializer);
-
-	protected static void setupBucketMetricValueAggregateDeserializer(
-			ObjectDeserializer<BucketMetricValueAggregate.Builder> op) {
-		setupSingleMetricAggregateBaseDeserializer(op);
-		op.add(Builder::keys, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "keys");
-
-	}
+    private final List<String> keys;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private BucketMetricValueAggregate(Builder builder) {
+        super(builder);
+
+        this.keys = ApiTypeHelper.unmodifiableRequired(builder.keys, this, "keys");
+
+    }
+
+    public static BucketMetricValueAggregate of(Function<Builder, ObjectBuilder<BucketMetricValueAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.BucketMetricValue;
+    }
+
+    /**
+     * Required - API name: {@code keys}
+     */
+    public final List<String> keys() {
+        return this.keys;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.keys)) {
+            generator.writeKey("keys");
+            generator.writeStartArray();
+            for (String item0 : this.keys) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link BucketMetricValueAggregate}.
+     */
+
+    public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<BucketMetricValueAggregate> {
+        private List<String> keys;
+
+        /**
+         * Required - API name: {@code keys}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>keys</code>.
+         */
+        public final Builder keys(List<String> list) {
+            this.keys = _listAddAll(this.keys, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code keys}
+         * <p>
+         * Adds one or more values to <code>keys</code>.
+         */
+        public final Builder keys(String value, String... values) {
+            this.keys = _listAdd(this.keys, value, values);
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link BucketMetricValueAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public BucketMetricValueAggregate build() {
+            _checkSingleUse();
+
+            return new BucketMetricValueAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link BucketMetricValueAggregate}
+     */
+    public static final JsonpDeserializer<BucketMetricValueAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        BucketMetricValueAggregate::setupBucketMetricValueAggregateDeserializer
+    );
+
+    protected static void setupBucketMetricValueAggregateDeserializer(ObjectDeserializer<BucketMetricValueAggregate.Builder> op) {
+        setupSingleMetricAggregateBaseDeserializer(op);
+        op.add(Builder::keys, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "keys");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketScriptAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketScriptAggregation.java
index b86b59794d..69db250263 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketScriptAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketScriptAggregation.java
@@ -32,123 +32,121 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.BucketScriptAggregation
 
 @JsonpDeserializable
 public class BucketScriptAggregation extends PipelineAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Script script;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private BucketScriptAggregation(Builder builder) {
-		super(builder);
-
-		this.script = builder.script;
-
-	}
-
-	public static BucketScriptAggregation of(Function<Builder, ObjectBuilder<BucketScriptAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.BucketScript;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final Script script() {
-		return this.script;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link BucketScriptAggregation}.
-	 */
-
-	public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<BucketScriptAggregation> {
-		@Nullable
-		private Script script;
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(@Nullable Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link BucketScriptAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public BucketScriptAggregation build() {
-			_checkSingleUse();
-
-			return new BucketScriptAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link BucketScriptAggregation}
-	 */
-	public static final JsonpDeserializer<BucketScriptAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, BucketScriptAggregation::setupBucketScriptAggregationDeserializer);
-
-	protected static void setupBucketScriptAggregationDeserializer(
-			ObjectDeserializer<BucketScriptAggregation.Builder> op) {
-		PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-
-	}
+    @Nullable
+    private final Script script;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private BucketScriptAggregation(Builder builder) {
+        super(builder);
+
+        this.script = builder.script;
+
+    }
+
+    public static BucketScriptAggregation of(Function<Builder, ObjectBuilder<BucketScriptAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.BucketScript;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final Script script() {
+        return this.script;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link BucketScriptAggregation}.
+     */
+
+    public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<BucketScriptAggregation> {
+        @Nullable
+        private Script script;
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(@Nullable Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link BucketScriptAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public BucketScriptAggregation build() {
+            _checkSingleUse();
+
+            return new BucketScriptAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link BucketScriptAggregation}
+     */
+    public static final JsonpDeserializer<BucketScriptAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        BucketScriptAggregation::setupBucketScriptAggregationDeserializer
+    );
+
+    protected static void setupBucketScriptAggregationDeserializer(ObjectDeserializer<BucketScriptAggregation.Builder> op) {
+        PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketSelectorAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketSelectorAggregation.java
index 021c6b868f..5b244edb69 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketSelectorAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketSelectorAggregation.java
@@ -32,123 +32,123 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.BucketSelectorAggregation
 
 @JsonpDeserializable
 public class BucketSelectorAggregation extends PipelineAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Script script;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private BucketSelectorAggregation(Builder builder) {
-		super(builder);
-
-		this.script = builder.script;
-
-	}
-
-	public static BucketSelectorAggregation of(Function<Builder, ObjectBuilder<BucketSelectorAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.BucketSelector;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final Script script() {
-		return this.script;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link BucketSelectorAggregation}.
-	 */
-
-	public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<BucketSelectorAggregation> {
-		@Nullable
-		private Script script;
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(@Nullable Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link BucketSelectorAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public BucketSelectorAggregation build() {
-			_checkSingleUse();
-
-			return new BucketSelectorAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link BucketSelectorAggregation}
-	 */
-	public static final JsonpDeserializer<BucketSelectorAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, BucketSelectorAggregation::setupBucketSelectorAggregationDeserializer);
-
-	protected static void setupBucketSelectorAggregationDeserializer(
-			ObjectDeserializer<BucketSelectorAggregation.Builder> op) {
-		PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-
-	}
+    @Nullable
+    private final Script script;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private BucketSelectorAggregation(Builder builder) {
+        super(builder);
+
+        this.script = builder.script;
+
+    }
+
+    public static BucketSelectorAggregation of(Function<Builder, ObjectBuilder<BucketSelectorAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.BucketSelector;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final Script script() {
+        return this.script;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link BucketSelectorAggregation}.
+     */
+
+    public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<BucketSelectorAggregation> {
+        @Nullable
+        private Script script;
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(@Nullable Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link BucketSelectorAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public BucketSelectorAggregation build() {
+            _checkSingleUse();
+
+            return new BucketSelectorAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link BucketSelectorAggregation}
+     */
+    public static final JsonpDeserializer<BucketSelectorAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        BucketSelectorAggregation::setupBucketSelectorAggregationDeserializer
+    );
+
+    protected static void setupBucketSelectorAggregationDeserializer(ObjectDeserializer<BucketSelectorAggregation.Builder> op) {
+        PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketSortAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketSortAggregation.java
index a479ce8d4f..21542a0fd5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketSortAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketSortAggregation.java
@@ -32,226 +32,226 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.SortOptions;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.SortOptions;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.BucketSortAggregation
 
 @JsonpDeserializable
 public class BucketSortAggregation extends AggregationBase implements AggregationVariant {
-	@Nullable
-	private final Integer from;
-
-	@Nullable
-	private final GapPolicy gapPolicy;
-
-	@Nullable
-	private final Integer size;
-
-	private final List<SortOptions> sort;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private BucketSortAggregation(Builder builder) {
-		super(builder);
-
-		this.from = builder.from;
-		this.gapPolicy = builder.gapPolicy;
-		this.size = builder.size;
-		this.sort = ApiTypeHelper.unmodifiable(builder.sort);
-
-	}
-
-	public static BucketSortAggregation of(Function<Builder, ObjectBuilder<BucketSortAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.BucketSort;
-	}
-
-	/**
-	 * API name: {@code from}
-	 */
-	@Nullable
-	public final Integer from() {
-		return this.from;
-	}
-
-	/**
-	 * API name: {@code gap_policy}
-	 */
-	@Nullable
-	public final GapPolicy gapPolicy() {
-		return this.gapPolicy;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	/**
-	 * API name: {@code sort}
-	 */
-	public final List<SortOptions> sort() {
-		return this.sort;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.from != null) {
-			generator.writeKey("from");
-			generator.write(this.from);
-
-		}
-		if (this.gapPolicy != null) {
-			generator.writeKey("gap_policy");
-			this.gapPolicy.serialize(generator, mapper);
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		if (ApiTypeHelper.isDefined(this.sort)) {
-			generator.writeKey("sort");
-			generator.writeStartArray();
-			for (SortOptions item0 : this.sort) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link BucketSortAggregation}.
-	 */
-
-	public static class Builder extends AggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<BucketSortAggregation> {
-		@Nullable
-		private Integer from;
-
-		@Nullable
-		private GapPolicy gapPolicy;
-
-		@Nullable
-		private Integer size;
-
-		@Nullable
-		private List<SortOptions> sort;
-
-		/**
-		 * API name: {@code from}
-		 */
-		public final Builder from(@Nullable Integer value) {
-			this.from = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code gap_policy}
-		 */
-		public final Builder gapPolicy(@Nullable GapPolicy value) {
-			this.gapPolicy = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Integer value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sort</code>.
-		 */
-		public final Builder sort(List<SortOptions> list) {
-			this.sort = _listAddAll(this.sort, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds one or more values to <code>sort</code>.
-		 */
-		public final Builder sort(SortOptions value, SortOptions... values) {
-			this.sort = _listAdd(this.sort, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds a value to <code>sort</code> using a builder lambda.
-		 */
-		public final Builder sort(Function<SortOptions.Builder, ObjectBuilder<SortOptions>> fn) {
-			return sort(fn.apply(new SortOptions.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link BucketSortAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public BucketSortAggregation build() {
-			_checkSingleUse();
-
-			return new BucketSortAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link BucketSortAggregation}
-	 */
-	public static final JsonpDeserializer<BucketSortAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, BucketSortAggregation::setupBucketSortAggregationDeserializer);
-
-	protected static void setupBucketSortAggregationDeserializer(ObjectDeserializer<BucketSortAggregation.Builder> op) {
-		setupAggregationBaseDeserializer(op);
-		op.add(Builder::from, JsonpDeserializer.integerDeserializer(), "from");
-		op.add(Builder::gapPolicy, GapPolicy._DESERIALIZER, "gap_policy");
-		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
-		op.add(Builder::sort, JsonpDeserializer.arrayDeserializer(SortOptions._DESERIALIZER), "sort");
-
-	}
+    @Nullable
+    private final Integer from;
+
+    @Nullable
+    private final GapPolicy gapPolicy;
+
+    @Nullable
+    private final Integer size;
+
+    private final List<SortOptions> sort;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private BucketSortAggregation(Builder builder) {
+        super(builder);
+
+        this.from = builder.from;
+        this.gapPolicy = builder.gapPolicy;
+        this.size = builder.size;
+        this.sort = ApiTypeHelper.unmodifiable(builder.sort);
+
+    }
+
+    public static BucketSortAggregation of(Function<Builder, ObjectBuilder<BucketSortAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.BucketSort;
+    }
+
+    /**
+     * API name: {@code from}
+     */
+    @Nullable
+    public final Integer from() {
+        return this.from;
+    }
+
+    /**
+     * API name: {@code gap_policy}
+     */
+    @Nullable
+    public final GapPolicy gapPolicy() {
+        return this.gapPolicy;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    /**
+     * API name: {@code sort}
+     */
+    public final List<SortOptions> sort() {
+        return this.sort;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.from != null) {
+            generator.writeKey("from");
+            generator.write(this.from);
+
+        }
+        if (this.gapPolicy != null) {
+            generator.writeKey("gap_policy");
+            this.gapPolicy.serialize(generator, mapper);
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        if (ApiTypeHelper.isDefined(this.sort)) {
+            generator.writeKey("sort");
+            generator.writeStartArray();
+            for (SortOptions item0 : this.sort) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link BucketSortAggregation}.
+     */
+
+    public static class Builder extends AggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<BucketSortAggregation> {
+        @Nullable
+        private Integer from;
+
+        @Nullable
+        private GapPolicy gapPolicy;
+
+        @Nullable
+        private Integer size;
+
+        @Nullable
+        private List<SortOptions> sort;
+
+        /**
+         * API name: {@code from}
+         */
+        public final Builder from(@Nullable Integer value) {
+            this.from = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code gap_policy}
+         */
+        public final Builder gapPolicy(@Nullable GapPolicy value) {
+            this.gapPolicy = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Integer value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sort</code>.
+         */
+        public final Builder sort(List<SortOptions> list) {
+            this.sort = _listAddAll(this.sort, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds one or more values to <code>sort</code>.
+         */
+        public final Builder sort(SortOptions value, SortOptions... values) {
+            this.sort = _listAdd(this.sort, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds a value to <code>sort</code> using a builder lambda.
+         */
+        public final Builder sort(Function<SortOptions.Builder, ObjectBuilder<SortOptions>> fn) {
+            return sort(fn.apply(new SortOptions.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link BucketSortAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public BucketSortAggregation build() {
+            _checkSingleUse();
+
+            return new BucketSortAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link BucketSortAggregation}
+     */
+    public static final JsonpDeserializer<BucketSortAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        BucketSortAggregation::setupBucketSortAggregationDeserializer
+    );
+
+    protected static void setupBucketSortAggregationDeserializer(ObjectDeserializer<BucketSortAggregation.Builder> op) {
+        setupAggregationBaseDeserializer(op);
+        op.add(Builder::from, JsonpDeserializer.integerDeserializer(), "from");
+        op.add(Builder::gapPolicy, GapPolicy._DESERIALIZER, "gap_policy");
+        op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
+        op.add(Builder::sort, JsonpDeserializer.arrayDeserializer(SortOptions._DESERIALIZER), "sort");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/Buckets.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/Buckets.java
index 8527069619..d772bf6d85 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/Buckets.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/Buckets.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
@@ -43,10 +47,6 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.Buckets
 
@@ -54,139 +54,140 @@
  * Aggregation buckets. By default they are returned as an array, but if the
  * aggregation has keys configured for the different buckets, the result is a
  * dictionary.
- * 
+ *
  */
 
 public class Buckets<TBucket> implements TaggedUnion<Buckets.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Array, Keyed
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private final JsonpSerializer<TBucket> tBucketSerializer = null;
-
-	private Buckets(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	private Buckets(Builder<TBucket> builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static <TBucket> Buckets<TBucket> of(Function<Builder<TBucket>, ObjectBuilder<Buckets<TBucket>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code array}?
-	 */
-	public boolean isArray() {
-		return _kind == Kind.Array;
-	}
-
-	/**
-	 * Get the {@code array} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code array} kind.
-	 */
-	public List<TBucket> array() {
-		return TaggedUnionUtils.get(this, Kind.Array);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code keyed}?
-	 */
-	public boolean isKeyed() {
-		return _kind == Kind.Keyed;
-	}
-
-	/**
-	 * Get the {@code keyed} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code keyed} kind.
-	 */
-	public Map<String, TBucket> keyed() {
-		return TaggedUnionUtils.get(this, Kind.Keyed);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Array :
-					generator.writeStartArray();
-					for (TBucket item0 : ((List<TBucket>) this._value)) {
-						JsonpUtils.serialize(item0, generator, tBucketSerializer, mapper);
-
-					}
-					generator.writeEnd();
-
-					break;
-				case Keyed :
-					generator.writeStartObject();
-					for (Map.Entry<String, TBucket> item0 : ((Map<String, TBucket>) this._value).entrySet()) {
-						generator.writeKey(item0.getKey());
-						JsonpUtils.serialize(item0.getValue(), generator, tBucketSerializer, mapper);
-
-					}
-					generator.writeEnd();
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder<TBucket> extends ObjectBuilderBase implements ObjectBuilder<Buckets<TBucket>> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<Buckets<TBucket>> array(List<TBucket> v) {
-			this._kind = Kind.Array;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Buckets<TBucket>> keyed(Map<String, TBucket> v) {
-			this._kind = Kind.Keyed;
-			this._value = v;
-			return this;
-		}
-
-		public Buckets<TBucket> build() {
-			_checkSingleUse();
-			return new Buckets<>(this);
-		}
-
-	}
-
-	public static <TBucket> JsonpDeserializer<Buckets<TBucket>> createBucketsDeserializer(
-			JsonpDeserializer<TBucket> tBucketDeserializer) {
-		return new UnionDeserializer.Builder<Buckets<TBucket>, Kind, Object>(Buckets<TBucket>::new, false)
-				.addMember(Kind.Array, JsonpDeserializer.arrayDeserializer(tBucketDeserializer))
-				.addMember(Kind.Keyed, JsonpDeserializer.stringMapDeserializer(tBucketDeserializer)).build();
-	}
+    public enum Kind {
+        Array,
+        Keyed
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private final JsonpSerializer<TBucket> tBucketSerializer = null;
+
+    private Buckets(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private Buckets(Builder<TBucket> builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static <TBucket> Buckets<TBucket> of(Function<Builder<TBucket>, ObjectBuilder<Buckets<TBucket>>> fn) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code array}?
+     */
+    public boolean isArray() {
+        return _kind == Kind.Array;
+    }
+
+    /**
+     * Get the {@code array} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code array} kind.
+     */
+    public List<TBucket> array() {
+        return TaggedUnionUtils.get(this, Kind.Array);
+    }
+
+    /**
+     * Is this variant instance of kind {@code keyed}?
+     */
+    public boolean isKeyed() {
+        return _kind == Kind.Keyed;
+    }
+
+    /**
+     * Get the {@code keyed} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code keyed} kind.
+     */
+    public Map<String, TBucket> keyed() {
+        return TaggedUnionUtils.get(this, Kind.Keyed);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Array:
+                    generator.writeStartArray();
+                    for (TBucket item0 : ((List<TBucket>) this._value)) {
+                        JsonpUtils.serialize(item0, generator, tBucketSerializer, mapper);
+
+                    }
+                    generator.writeEnd();
+
+                    break;
+                case Keyed:
+                    generator.writeStartObject();
+                    for (Map.Entry<String, TBucket> item0 : ((Map<String, TBucket>) this._value).entrySet()) {
+                        generator.writeKey(item0.getKey());
+                        JsonpUtils.serialize(item0.getValue(), generator, tBucketSerializer, mapper);
+
+                    }
+                    generator.writeEnd();
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder<TBucket> extends ObjectBuilderBase implements ObjectBuilder<Buckets<TBucket>> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<Buckets<TBucket>> array(List<TBucket> v) {
+            this._kind = Kind.Array;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Buckets<TBucket>> keyed(Map<String, TBucket> v) {
+            this._kind = Kind.Keyed;
+            this._value = v;
+            return this;
+        }
+
+        public Buckets<TBucket> build() {
+            _checkSingleUse();
+            return new Buckets<>(this);
+        }
+
+    }
+
+    public static <TBucket> JsonpDeserializer<Buckets<TBucket>> createBucketsDeserializer(JsonpDeserializer<TBucket> tBucketDeserializer) {
+        return new UnionDeserializer.Builder<Buckets<TBucket>, Kind, Object>(Buckets<TBucket>::new, false).addMember(
+            Kind.Array,
+            JsonpDeserializer.arrayDeserializer(tBucketDeserializer)
+        ).addMember(Kind.Keyed, JsonpDeserializer.stringMapDeserializer(tBucketDeserializer)).build();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketsBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketsBuilders.java
index f2b501ccc9..8513ecad10 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketsBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketsBuilders.java
@@ -37,10 +37,9 @@
  * <p>
  * Variants <code>array</code>, <code>keyed</code> are not available here as
  * they don't have a dedicated class. Use {@link Buckets}'s builder for these.
- * 
+ *
  */
 public class BucketsBuilders {
-	private BucketsBuilders() {
-	}
+    private BucketsBuilders() {}
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketsPath.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketsPath.java
index 2c95995b55..0ea0845f3a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketsPath.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketsPath.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,10 +46,6 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.BucketsPath
 
@@ -53,166 +53,170 @@
  * Buckets path can be expressed in different ways, and an aggregation may
  * accept some or all of these forms depending on its type. Please refer to each
  * aggregation's documentation to know what buckets path forms they accept.
- * 
+ *
  */
 @JsonpDeserializable
 public class BucketsPath implements TaggedUnion<BucketsPath.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Array, Dict, Single
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private BucketsPath(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	private BucketsPath(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static BucketsPath of(Function<Builder, ObjectBuilder<BucketsPath>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code array}?
-	 */
-	public boolean isArray() {
-		return _kind == Kind.Array;
-	}
-
-	/**
-	 * Get the {@code array} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code array} kind.
-	 */
-	public List<String> array() {
-		return TaggedUnionUtils.get(this, Kind.Array);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code dict}?
-	 */
-	public boolean isDict() {
-		return _kind == Kind.Dict;
-	}
-
-	/**
-	 * Get the {@code dict} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code dict} kind.
-	 */
-	public Map<String, String> dict() {
-		return TaggedUnionUtils.get(this, Kind.Dict);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code single}?
-	 */
-	public boolean isSingle() {
-		return _kind == Kind.Single;
-	}
-
-	/**
-	 * Get the {@code single} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code single} kind.
-	 */
-	public String single() {
-		return TaggedUnionUtils.get(this, Kind.Single);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Array :
-					generator.writeStartArray();
-					for (String item0 : ((List<String>) this._value)) {
-						generator.write(item0);
-
-					}
-					generator.writeEnd();
-
-					break;
-				case Dict :
-					generator.writeStartObject();
-					for (Map.Entry<String, String> item0 : ((Map<String, String>) this._value).entrySet()) {
-						generator.writeKey(item0.getKey());
-						generator.write(item0.getValue());
-
-					}
-					generator.writeEnd();
-
-					break;
-				case Single :
-					generator.write(((String) this._value));
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<BucketsPath> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<BucketsPath> array(List<String> v) {
-			this._kind = Kind.Array;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<BucketsPath> dict(Map<String, String> v) {
-			this._kind = Kind.Dict;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<BucketsPath> single(String v) {
-			this._kind = Kind.Single;
-			this._value = v;
-			return this;
-		}
-
-		public BucketsPath build() {
-			_checkSingleUse();
-			return new BucketsPath(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<BucketsPath> buildBucketsPathDeserializer() {
-		return new UnionDeserializer.Builder<BucketsPath, Kind, Object>(BucketsPath::new, false)
-				.addMember(Kind.Array, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()))
-				.addMember(Kind.Dict, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()))
-				.addMember(Kind.Single, JsonpDeserializer.stringDeserializer()).build();
-	}
-
-	public static final JsonpDeserializer<BucketsPath> _DESERIALIZER = JsonpDeserializer
-			.lazy(BucketsPath::buildBucketsPathDeserializer);
+    public enum Kind {
+        Array,
+        Dict,
+        Single
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private BucketsPath(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private BucketsPath(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static BucketsPath of(Function<Builder, ObjectBuilder<BucketsPath>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code array}?
+     */
+    public boolean isArray() {
+        return _kind == Kind.Array;
+    }
+
+    /**
+     * Get the {@code array} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code array} kind.
+     */
+    public List<String> array() {
+        return TaggedUnionUtils.get(this, Kind.Array);
+    }
+
+    /**
+     * Is this variant instance of kind {@code dict}?
+     */
+    public boolean isDict() {
+        return _kind == Kind.Dict;
+    }
+
+    /**
+     * Get the {@code dict} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code dict} kind.
+     */
+    public Map<String, String> dict() {
+        return TaggedUnionUtils.get(this, Kind.Dict);
+    }
+
+    /**
+     * Is this variant instance of kind {@code single}?
+     */
+    public boolean isSingle() {
+        return _kind == Kind.Single;
+    }
+
+    /**
+     * Get the {@code single} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code single} kind.
+     */
+    public String single() {
+        return TaggedUnionUtils.get(this, Kind.Single);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Array:
+                    generator.writeStartArray();
+                    for (String item0 : ((List<String>) this._value)) {
+                        generator.write(item0);
+
+                    }
+                    generator.writeEnd();
+
+                    break;
+                case Dict:
+                    generator.writeStartObject();
+                    for (Map.Entry<String, String> item0 : ((Map<String, String>) this._value).entrySet()) {
+                        generator.writeKey(item0.getKey());
+                        generator.write(item0.getValue());
+
+                    }
+                    generator.writeEnd();
+
+                    break;
+                case Single:
+                    generator.write(((String) this._value));
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<BucketsPath> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<BucketsPath> array(List<String> v) {
+            this._kind = Kind.Array;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<BucketsPath> dict(Map<String, String> v) {
+            this._kind = Kind.Dict;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<BucketsPath> single(String v) {
+            this._kind = Kind.Single;
+            this._value = v;
+            return this;
+        }
+
+        public BucketsPath build() {
+            _checkSingleUse();
+            return new BucketsPath(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<BucketsPath> buildBucketsPathDeserializer() {
+        return new UnionDeserializer.Builder<BucketsPath, Kind, Object>(BucketsPath::new, false).addMember(
+            Kind.Array,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer())
+        )
+            .addMember(Kind.Dict, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()))
+            .addMember(Kind.Single, JsonpDeserializer.stringDeserializer())
+            .build();
+    }
+
+    public static final JsonpDeserializer<BucketsPath> _DESERIALIZER = JsonpDeserializer.lazy(BucketsPath::buildBucketsPathDeserializer);
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketsPathBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketsPathBuilders.java
index 10e3b0ef62..faa27bff84 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketsPathBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketsPathBuilders.java
@@ -38,10 +38,9 @@
  * Variants <code>array</code>, <code>dict</code>, <code>single</code> are not
  * available here as they don't have a dedicated class. Use
  * {@link BucketsPath}'s builder for these.
- * 
+ *
  */
 public class BucketsPathBuilders {
-	private BucketsPathBuilders() {
-	}
+    private BucketsPathBuilders() {}
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CalendarInterval.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CalendarInterval.java
index 18f275b070..3fc101e364 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CalendarInterval.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CalendarInterval.java
@@ -37,40 +37,39 @@
 
 @JsonpDeserializable
 public enum CalendarInterval implements JsonEnum {
-	Second("second", "1s"),
+    Second("second", "1s"),
 
-	Minute("minute", "1m"),
+    Minute("minute", "1m"),
 
-	Hour("hour", "1h"),
+    Hour("hour", "1h"),
 
-	Day("day", "1d"),
+    Day("day", "1d"),
 
-	Week("week", "1w"),
+    Week("week", "1w"),
 
-	Month("month", "1M"),
+    Month("month", "1M"),
 
-	Quarter("quarter", "1q"),
+    Quarter("quarter", "1q"),
 
-	Year("year", "1Y"),
+    Year("year", "1Y"),
 
-	;
+    ;
 
-	private final String jsonValue;
-	private final String[] aliases;
+    private final String jsonValue;
+    private final String[] aliases;
 
-	CalendarInterval(String jsonValue, String... aliases) {
-		this.jsonValue = jsonValue;
-		this.aliases = aliases;
-	}
+    CalendarInterval(String jsonValue, String... aliases) {
+        this.jsonValue = jsonValue;
+        this.aliases = aliases;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public String[] aliases() {
-		return this.aliases;
-	}
+    public String[] aliases() {
+        return this.aliases;
+    }
 
-	public static final JsonEnum.Deserializer<CalendarInterval> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			CalendarInterval.values());
+    public static final JsonEnum.Deserializer<CalendarInterval> _DESERIALIZER = new JsonEnum.Deserializer<>(CalendarInterval.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CardinalityAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CardinalityAggregate.java
index dc8514c376..bcb5bcf64d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CardinalityAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CardinalityAggregate.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,100 +41,98 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.CardinalityAggregate
 
 @JsonpDeserializable
 public class CardinalityAggregate extends AggregateBase implements AggregateVariant {
-	private final long value;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CardinalityAggregate(Builder builder) {
-		super(builder);
-
-		this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
-
-	}
-
-	public static CardinalityAggregate of(Function<Builder, ObjectBuilder<CardinalityAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Cardinality;
-	}
-
-	/**
-	 * Required - API name: {@code value}
-	 */
-	public final long value() {
-		return this.value;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("value");
-		generator.write(this.value);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CardinalityAggregate}.
-	 */
-
-	public static class Builder extends AggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<CardinalityAggregate> {
-		private Long value;
-
-		/**
-		 * Required - API name: {@code value}
-		 */
-		public final Builder value(long value) {
-			this.value = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CardinalityAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CardinalityAggregate build() {
-			_checkSingleUse();
-
-			return new CardinalityAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CardinalityAggregate}
-	 */
-	public static final JsonpDeserializer<CardinalityAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CardinalityAggregate::setupCardinalityAggregateDeserializer);
-
-	protected static void setupCardinalityAggregateDeserializer(ObjectDeserializer<CardinalityAggregate.Builder> op) {
-		AggregateBase.setupAggregateBaseDeserializer(op);
-		op.add(Builder::value, JsonpDeserializer.longDeserializer(), "value");
-
-	}
+    private final long value;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CardinalityAggregate(Builder builder) {
+        super(builder);
+
+        this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
+
+    }
+
+    public static CardinalityAggregate of(Function<Builder, ObjectBuilder<CardinalityAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Cardinality;
+    }
+
+    /**
+     * Required - API name: {@code value}
+     */
+    public final long value() {
+        return this.value;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("value");
+        generator.write(this.value);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CardinalityAggregate}.
+     */
+
+    public static class Builder extends AggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<CardinalityAggregate> {
+        private Long value;
+
+        /**
+         * Required - API name: {@code value}
+         */
+        public final Builder value(long value) {
+            this.value = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CardinalityAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CardinalityAggregate build() {
+            _checkSingleUse();
+
+            return new CardinalityAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CardinalityAggregate}
+     */
+    public static final JsonpDeserializer<CardinalityAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CardinalityAggregate::setupCardinalityAggregateDeserializer
+    );
+
+    protected static void setupCardinalityAggregateDeserializer(ObjectDeserializer<CardinalityAggregate.Builder> op) {
+        AggregateBase.setupAggregateBaseDeserializer(op);
+        op.add(Builder::value, JsonpDeserializer.longDeserializer(), "value");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CardinalityAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CardinalityAggregation.java
index 7969fc70dc..3a7d5f12f2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CardinalityAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CardinalityAggregation.java
@@ -32,143 +32,142 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.CardinalityAggregation
 
 @JsonpDeserializable
 public class CardinalityAggregation extends MetricAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Integer precisionThreshold;
-
-	@Nullable
-	private final Boolean rehash;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CardinalityAggregation(Builder builder) {
-		super(builder);
-
-		this.precisionThreshold = builder.precisionThreshold;
-		this.rehash = builder.rehash;
-
-	}
-
-	public static CardinalityAggregation of(Function<Builder, ObjectBuilder<CardinalityAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Cardinality;
-	}
-
-	/**
-	 * API name: {@code precision_threshold}
-	 */
-	@Nullable
-	public final Integer precisionThreshold() {
-		return this.precisionThreshold;
-	}
-
-	/**
-	 * API name: {@code rehash}
-	 */
-	@Nullable
-	public final Boolean rehash() {
-		return this.rehash;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.precisionThreshold != null) {
-			generator.writeKey("precision_threshold");
-			generator.write(this.precisionThreshold);
-
-		}
-		if (this.rehash != null) {
-			generator.writeKey("rehash");
-			generator.write(this.rehash);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CardinalityAggregation}.
-	 */
-
-	public static class Builder extends MetricAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<CardinalityAggregation> {
-		@Nullable
-		private Integer precisionThreshold;
-
-		@Nullable
-		private Boolean rehash;
-
-		/**
-		 * API name: {@code precision_threshold}
-		 */
-		public final Builder precisionThreshold(@Nullable Integer value) {
-			this.precisionThreshold = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code rehash}
-		 */
-		public final Builder rehash(@Nullable Boolean value) {
-			this.rehash = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CardinalityAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CardinalityAggregation build() {
-			_checkSingleUse();
-
-			return new CardinalityAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CardinalityAggregation}
-	 */
-	public static final JsonpDeserializer<CardinalityAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CardinalityAggregation::setupCardinalityAggregationDeserializer);
-
-	protected static void setupCardinalityAggregationDeserializer(
-			ObjectDeserializer<CardinalityAggregation.Builder> op) {
-		setupMetricAggregationBaseDeserializer(op);
-		op.add(Builder::precisionThreshold, JsonpDeserializer.integerDeserializer(), "precision_threshold");
-		op.add(Builder::rehash, JsonpDeserializer.booleanDeserializer(), "rehash");
-
-	}
+    @Nullable
+    private final Integer precisionThreshold;
+
+    @Nullable
+    private final Boolean rehash;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CardinalityAggregation(Builder builder) {
+        super(builder);
+
+        this.precisionThreshold = builder.precisionThreshold;
+        this.rehash = builder.rehash;
+
+    }
+
+    public static CardinalityAggregation of(Function<Builder, ObjectBuilder<CardinalityAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Cardinality;
+    }
+
+    /**
+     * API name: {@code precision_threshold}
+     */
+    @Nullable
+    public final Integer precisionThreshold() {
+        return this.precisionThreshold;
+    }
+
+    /**
+     * API name: {@code rehash}
+     */
+    @Nullable
+    public final Boolean rehash() {
+        return this.rehash;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.precisionThreshold != null) {
+            generator.writeKey("precision_threshold");
+            generator.write(this.precisionThreshold);
+
+        }
+        if (this.rehash != null) {
+            generator.writeKey("rehash");
+            generator.write(this.rehash);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CardinalityAggregation}.
+     */
+
+    public static class Builder extends MetricAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<CardinalityAggregation> {
+        @Nullable
+        private Integer precisionThreshold;
+
+        @Nullable
+        private Boolean rehash;
+
+        /**
+         * API name: {@code precision_threshold}
+         */
+        public final Builder precisionThreshold(@Nullable Integer value) {
+            this.precisionThreshold = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code rehash}
+         */
+        public final Builder rehash(@Nullable Boolean value) {
+            this.rehash = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CardinalityAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CardinalityAggregation build() {
+            _checkSingleUse();
+
+            return new CardinalityAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CardinalityAggregation}
+     */
+    public static final JsonpDeserializer<CardinalityAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CardinalityAggregation::setupCardinalityAggregationDeserializer
+    );
+
+    protected static void setupCardinalityAggregationDeserializer(ObjectDeserializer<CardinalityAggregation.Builder> op) {
+        setupMetricAggregationBaseDeserializer(op);
+        op.add(Builder::precisionThreshold, JsonpDeserializer.integerDeserializer(), "precision_threshold");
+        op.add(Builder::rehash, JsonpDeserializer.booleanDeserializer(), "rehash");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ChiSquareHeuristic.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ChiSquareHeuristic.java
index 150a347c41..9a1f4b2fbe 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ChiSquareHeuristic.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ChiSquareHeuristic.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,117 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.ChiSquareHeuristic
 
 @JsonpDeserializable
 public class ChiSquareHeuristic implements JsonpSerializable {
-	private final boolean backgroundIsSuperset;
-
-	private final boolean includeNegatives;
-
-	// ---------------------------------------------------------------------------------------------
+    private final boolean backgroundIsSuperset;
 
-	private ChiSquareHeuristic(Builder builder) {
+    private final boolean includeNegatives;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.backgroundIsSuperset = ApiTypeHelper.requireNonNull(builder.backgroundIsSuperset, this,
-				"backgroundIsSuperset");
-		this.includeNegatives = ApiTypeHelper.requireNonNull(builder.includeNegatives, this, "includeNegatives");
+    private ChiSquareHeuristic(Builder builder) {
 
-	}
+        this.backgroundIsSuperset = ApiTypeHelper.requireNonNull(builder.backgroundIsSuperset, this, "backgroundIsSuperset");
+        this.includeNegatives = ApiTypeHelper.requireNonNull(builder.includeNegatives, this, "includeNegatives");
 
-	public static ChiSquareHeuristic of(Function<Builder, ObjectBuilder<ChiSquareHeuristic>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code background_is_superset}
-	 */
-	public final boolean backgroundIsSuperset() {
-		return this.backgroundIsSuperset;
-	}
+    public static ChiSquareHeuristic of(Function<Builder, ObjectBuilder<ChiSquareHeuristic>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code include_negatives}
-	 */
-	public final boolean includeNegatives() {
-		return this.includeNegatives;
-	}
+    /**
+     * Required - API name: {@code background_is_superset}
+     */
+    public final boolean backgroundIsSuperset() {
+        return this.backgroundIsSuperset;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code include_negatives}
+     */
+    public final boolean includeNegatives() {
+        return this.includeNegatives;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("background_is_superset");
-		generator.write(this.backgroundIsSuperset);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("include_negatives");
-		generator.write(this.includeNegatives);
+        generator.writeKey("background_is_superset");
+        generator.write(this.backgroundIsSuperset);
 
-	}
+        generator.writeKey("include_negatives");
+        generator.write(this.includeNegatives);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link ChiSquareHeuristic}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ChiSquareHeuristic> {
-		private Boolean backgroundIsSuperset;
+    /**
+     * Builder for {@link ChiSquareHeuristic}.
+     */
 
-		private Boolean includeNegatives;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ChiSquareHeuristic> {
+        private Boolean backgroundIsSuperset;
 
-		/**
-		 * Required - API name: {@code background_is_superset}
-		 */
-		public final Builder backgroundIsSuperset(boolean value) {
-			this.backgroundIsSuperset = value;
-			return this;
-		}
+        private Boolean includeNegatives;
 
-		/**
-		 * Required - API name: {@code include_negatives}
-		 */
-		public final Builder includeNegatives(boolean value) {
-			this.includeNegatives = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code background_is_superset}
+         */
+        public final Builder backgroundIsSuperset(boolean value) {
+            this.backgroundIsSuperset = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link ChiSquareHeuristic}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ChiSquareHeuristic build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code include_negatives}
+         */
+        public final Builder includeNegatives(boolean value) {
+            this.includeNegatives = value;
+            return this;
+        }
 
-			return new ChiSquareHeuristic(this);
-		}
-	}
+        /**
+         * Builds a {@link ChiSquareHeuristic}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ChiSquareHeuristic build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new ChiSquareHeuristic(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link ChiSquareHeuristic}
-	 */
-	public static final JsonpDeserializer<ChiSquareHeuristic> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ChiSquareHeuristic::setupChiSquareHeuristicDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupChiSquareHeuristicDeserializer(ObjectDeserializer<ChiSquareHeuristic.Builder> op) {
+    /**
+     * Json deserializer for {@link ChiSquareHeuristic}
+     */
+    public static final JsonpDeserializer<ChiSquareHeuristic> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ChiSquareHeuristic::setupChiSquareHeuristicDeserializer
+    );
 
-		op.add(Builder::backgroundIsSuperset, JsonpDeserializer.booleanDeserializer(), "background_is_superset");
-		op.add(Builder::includeNegatives, JsonpDeserializer.booleanDeserializer(), "include_negatives");
+    protected static void setupChiSquareHeuristicDeserializer(ObjectDeserializer<ChiSquareHeuristic.Builder> op) {
 
-	}
+        op.add(Builder::backgroundIsSuperset, JsonpDeserializer.booleanDeserializer(), "background_is_superset");
+        op.add(Builder::includeNegatives, JsonpDeserializer.booleanDeserializer(), "include_negatives");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ChildrenAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ChildrenAggregate.java
index 43caae3d09..2c1a0a5d93 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ChildrenAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ChildrenAggregate.java
@@ -32,74 +32,73 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.ChildrenAggregate
 
 @JsonpDeserializable
 public class ChildrenAggregate extends SingleBucketAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private ChildrenAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static ChildrenAggregate of(Function<Builder, ObjectBuilder<ChildrenAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Children;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ChildrenAggregate}.
-	 */
-
-	public static class Builder extends SingleBucketAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ChildrenAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ChildrenAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ChildrenAggregate build() {
-			_checkSingleUse();
-
-			return new ChildrenAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ChildrenAggregate}
-	 */
-	public static final JsonpDeserializer<ChildrenAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ChildrenAggregate::setupChildrenAggregateDeserializer);
-
-	protected static void setupChildrenAggregateDeserializer(ObjectDeserializer<ChildrenAggregate.Builder> op) {
-		SingleBucketAggregateBase.setupSingleBucketAggregateBaseDeserializer(op);
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private ChildrenAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static ChildrenAggregate of(Function<Builder, ObjectBuilder<ChildrenAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Children;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ChildrenAggregate}.
+     */
+
+    public static class Builder extends SingleBucketAggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<ChildrenAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ChildrenAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ChildrenAggregate build() {
+            _checkSingleUse();
+
+            return new ChildrenAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ChildrenAggregate}
+     */
+    public static final JsonpDeserializer<ChildrenAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ChildrenAggregate::setupChildrenAggregateDeserializer
+    );
+
+    protected static void setupChildrenAggregateDeserializer(ObjectDeserializer<ChildrenAggregate.Builder> op) {
+        SingleBucketAggregateBase.setupSingleBucketAggregateBaseDeserializer(op);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ChildrenAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ChildrenAggregation.java
index 14eb2c7569..698a38bb2d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ChildrenAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ChildrenAggregation.java
@@ -32,113 +32,113 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.ChildrenAggregation
 
 @JsonpDeserializable
 public class ChildrenAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final String type;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ChildrenAggregation(Builder builder) {
-		super(builder);
-
-		this.type = builder.type;
-
-	}
-
-	public static ChildrenAggregation of(Function<Builder, ObjectBuilder<ChildrenAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Children;
-	}
-
-	/**
-	 * API name: {@code type}
-	 */
-	@Nullable
-	public final String type() {
-		return this.type;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.type != null) {
-			generator.writeKey("type");
-			generator.write(this.type);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ChildrenAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ChildrenAggregation> {
-		@Nullable
-		private String type;
-
-		/**
-		 * API name: {@code type}
-		 */
-		public final Builder type(@Nullable String value) {
-			this.type = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ChildrenAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ChildrenAggregation build() {
-			_checkSingleUse();
-
-			return new ChildrenAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ChildrenAggregation}
-	 */
-	public static final JsonpDeserializer<ChildrenAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ChildrenAggregation::setupChildrenAggregationDeserializer);
-
-	protected static void setupChildrenAggregationDeserializer(ObjectDeserializer<ChildrenAggregation.Builder> op) {
-		BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-
-	}
+    @Nullable
+    private final String type;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ChildrenAggregation(Builder builder) {
+        super(builder);
+
+        this.type = builder.type;
+
+    }
+
+    public static ChildrenAggregation of(Function<Builder, ObjectBuilder<ChildrenAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Children;
+    }
+
+    /**
+     * API name: {@code type}
+     */
+    @Nullable
+    public final String type() {
+        return this.type;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.type != null) {
+            generator.writeKey("type");
+            generator.write(this.type);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ChildrenAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<ChildrenAggregation> {
+        @Nullable
+        private String type;
+
+        /**
+         * API name: {@code type}
+         */
+        public final Builder type(@Nullable String value) {
+            this.type = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ChildrenAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ChildrenAggregation build() {
+            _checkSingleUse();
+
+            return new ChildrenAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ChildrenAggregation}
+     */
+    public static final JsonpDeserializer<ChildrenAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ChildrenAggregation::setupChildrenAggregationDeserializer
+    );
+
+    protected static void setupChildrenAggregationDeserializer(ObjectDeserializer<ChildrenAggregation.Builder> op) {
+        BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ClassificationInferenceOptions.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ClassificationInferenceOptions.java
index 2802e37e0c..002a2d37b6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ClassificationInferenceOptions.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ClassificationInferenceOptions.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,248 +43,244 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.ClassificationInferenceOptions
 
 @JsonpDeserializable
 public class ClassificationInferenceOptions implements JsonpSerializable {
-	@Nullable
-	private final Integer numTopClasses;
-
-	@Nullable
-	private final Integer numTopFeatureImportanceValues;
-
-	@Nullable
-	private final String predictionFieldType;
-
-	@Nullable
-	private final String resultsField;
-
-	@Nullable
-	private final String topClassesResultsField;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClassificationInferenceOptions(Builder builder) {
-
-		this.numTopClasses = builder.numTopClasses;
-		this.numTopFeatureImportanceValues = builder.numTopFeatureImportanceValues;
-		this.predictionFieldType = builder.predictionFieldType;
-		this.resultsField = builder.resultsField;
-		this.topClassesResultsField = builder.topClassesResultsField;
-
-	}
-
-	public static ClassificationInferenceOptions of(
-			Function<Builder, ObjectBuilder<ClassificationInferenceOptions>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Specifies the number of top class predictions to return. Defaults to 0.
-	 * <p>
-	 * API name: {@code num_top_classes}
-	 */
-	@Nullable
-	public final Integer numTopClasses() {
-		return this.numTopClasses;
-	}
-
-	/**
-	 * Specifies the maximum number of feature importance values per document. By
-	 * default, it is zero and no feature importance calculation occurs.
-	 * <p>
-	 * API name: {@code num_top_feature_importance_values}
-	 */
-	@Nullable
-	public final Integer numTopFeatureImportanceValues() {
-		return this.numTopFeatureImportanceValues;
-	}
-
-	/**
-	 * Specifies the type of the predicted field to write. Acceptable values are:
-	 * string, number, boolean. When boolean is provided 1.0 is transformed to true
-	 * and 0.0 to false.
-	 * <p>
-	 * API name: {@code prediction_field_type}
-	 */
-	@Nullable
-	public final String predictionFieldType() {
-		return this.predictionFieldType;
-	}
-
-	/**
-	 * The field that is added to incoming documents to contain the inference
-	 * prediction. Defaults to predicted_value.
-	 * <p>
-	 * API name: {@code results_field}
-	 */
-	@Nullable
-	public final String resultsField() {
-		return this.resultsField;
-	}
-
-	/**
-	 * Specifies the field to which the top classes are written. Defaults to
-	 * top_classes.
-	 * <p>
-	 * API name: {@code top_classes_results_field}
-	 */
-	@Nullable
-	public final String topClassesResultsField() {
-		return this.topClassesResultsField;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.numTopClasses != null) {
-			generator.writeKey("num_top_classes");
-			generator.write(this.numTopClasses);
-
-		}
-		if (this.numTopFeatureImportanceValues != null) {
-			generator.writeKey("num_top_feature_importance_values");
-			generator.write(this.numTopFeatureImportanceValues);
-
-		}
-		if (this.predictionFieldType != null) {
-			generator.writeKey("prediction_field_type");
-			generator.write(this.predictionFieldType);
-
-		}
-		if (this.resultsField != null) {
-			generator.writeKey("results_field");
-			generator.write(this.resultsField);
-
-		}
-		if (this.topClassesResultsField != null) {
-			generator.writeKey("top_classes_results_field");
-			generator.write(this.topClassesResultsField);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClassificationInferenceOptions}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClassificationInferenceOptions> {
-		@Nullable
-		private Integer numTopClasses;
-
-		@Nullable
-		private Integer numTopFeatureImportanceValues;
-
-		@Nullable
-		private String predictionFieldType;
-
-		@Nullable
-		private String resultsField;
-
-		@Nullable
-		private String topClassesResultsField;
-
-		/**
-		 * Specifies the number of top class predictions to return. Defaults to 0.
-		 * <p>
-		 * API name: {@code num_top_classes}
-		 */
-		public final Builder numTopClasses(@Nullable Integer value) {
-			this.numTopClasses = value;
-			return this;
-		}
-
-		/**
-		 * Specifies the maximum number of feature importance values per document. By
-		 * default, it is zero and no feature importance calculation occurs.
-		 * <p>
-		 * API name: {@code num_top_feature_importance_values}
-		 */
-		public final Builder numTopFeatureImportanceValues(@Nullable Integer value) {
-			this.numTopFeatureImportanceValues = value;
-			return this;
-		}
-
-		/**
-		 * Specifies the type of the predicted field to write. Acceptable values are:
-		 * string, number, boolean. When boolean is provided 1.0 is transformed to true
-		 * and 0.0 to false.
-		 * <p>
-		 * API name: {@code prediction_field_type}
-		 */
-		public final Builder predictionFieldType(@Nullable String value) {
-			this.predictionFieldType = value;
-			return this;
-		}
-
-		/**
-		 * The field that is added to incoming documents to contain the inference
-		 * prediction. Defaults to predicted_value.
-		 * <p>
-		 * API name: {@code results_field}
-		 */
-		public final Builder resultsField(@Nullable String value) {
-			this.resultsField = value;
-			return this;
-		}
-
-		/**
-		 * Specifies the field to which the top classes are written. Defaults to
-		 * top_classes.
-		 * <p>
-		 * API name: {@code top_classes_results_field}
-		 */
-		public final Builder topClassesResultsField(@Nullable String value) {
-			this.topClassesResultsField = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ClassificationInferenceOptions}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClassificationInferenceOptions build() {
-			_checkSingleUse();
-
-			return new ClassificationInferenceOptions(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClassificationInferenceOptions}
-	 */
-	public static final JsonpDeserializer<ClassificationInferenceOptions> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClassificationInferenceOptions::setupClassificationInferenceOptionsDeserializer);
-
-	protected static void setupClassificationInferenceOptionsDeserializer(
-			ObjectDeserializer<ClassificationInferenceOptions.Builder> op) {
-
-		op.add(Builder::numTopClasses, JsonpDeserializer.integerDeserializer(), "num_top_classes");
-		op.add(Builder::numTopFeatureImportanceValues, JsonpDeserializer.integerDeserializer(),
-				"num_top_feature_importance_values");
-		op.add(Builder::predictionFieldType, JsonpDeserializer.stringDeserializer(), "prediction_field_type");
-		op.add(Builder::resultsField, JsonpDeserializer.stringDeserializer(), "results_field");
-		op.add(Builder::topClassesResultsField, JsonpDeserializer.stringDeserializer(), "top_classes_results_field");
-
-	}
+    @Nullable
+    private final Integer numTopClasses;
+
+    @Nullable
+    private final Integer numTopFeatureImportanceValues;
+
+    @Nullable
+    private final String predictionFieldType;
+
+    @Nullable
+    private final String resultsField;
+
+    @Nullable
+    private final String topClassesResultsField;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClassificationInferenceOptions(Builder builder) {
+
+        this.numTopClasses = builder.numTopClasses;
+        this.numTopFeatureImportanceValues = builder.numTopFeatureImportanceValues;
+        this.predictionFieldType = builder.predictionFieldType;
+        this.resultsField = builder.resultsField;
+        this.topClassesResultsField = builder.topClassesResultsField;
+
+    }
+
+    public static ClassificationInferenceOptions of(Function<Builder, ObjectBuilder<ClassificationInferenceOptions>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Specifies the number of top class predictions to return. Defaults to 0.
+     * <p>
+     * API name: {@code num_top_classes}
+     */
+    @Nullable
+    public final Integer numTopClasses() {
+        return this.numTopClasses;
+    }
+
+    /**
+     * Specifies the maximum number of feature importance values per document. By
+     * default, it is zero and no feature importance calculation occurs.
+     * <p>
+     * API name: {@code num_top_feature_importance_values}
+     */
+    @Nullable
+    public final Integer numTopFeatureImportanceValues() {
+        return this.numTopFeatureImportanceValues;
+    }
+
+    /**
+     * Specifies the type of the predicted field to write. Acceptable values are:
+     * string, number, boolean. When boolean is provided 1.0 is transformed to true
+     * and 0.0 to false.
+     * <p>
+     * API name: {@code prediction_field_type}
+     */
+    @Nullable
+    public final String predictionFieldType() {
+        return this.predictionFieldType;
+    }
+
+    /**
+     * The field that is added to incoming documents to contain the inference
+     * prediction. Defaults to predicted_value.
+     * <p>
+     * API name: {@code results_field}
+     */
+    @Nullable
+    public final String resultsField() {
+        return this.resultsField;
+    }
+
+    /**
+     * Specifies the field to which the top classes are written. Defaults to
+     * top_classes.
+     * <p>
+     * API name: {@code top_classes_results_field}
+     */
+    @Nullable
+    public final String topClassesResultsField() {
+        return this.topClassesResultsField;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.numTopClasses != null) {
+            generator.writeKey("num_top_classes");
+            generator.write(this.numTopClasses);
+
+        }
+        if (this.numTopFeatureImportanceValues != null) {
+            generator.writeKey("num_top_feature_importance_values");
+            generator.write(this.numTopFeatureImportanceValues);
+
+        }
+        if (this.predictionFieldType != null) {
+            generator.writeKey("prediction_field_type");
+            generator.write(this.predictionFieldType);
+
+        }
+        if (this.resultsField != null) {
+            generator.writeKey("results_field");
+            generator.write(this.resultsField);
+
+        }
+        if (this.topClassesResultsField != null) {
+            generator.writeKey("top_classes_results_field");
+            generator.write(this.topClassesResultsField);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClassificationInferenceOptions}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClassificationInferenceOptions> {
+        @Nullable
+        private Integer numTopClasses;
+
+        @Nullable
+        private Integer numTopFeatureImportanceValues;
+
+        @Nullable
+        private String predictionFieldType;
+
+        @Nullable
+        private String resultsField;
+
+        @Nullable
+        private String topClassesResultsField;
+
+        /**
+         * Specifies the number of top class predictions to return. Defaults to 0.
+         * <p>
+         * API name: {@code num_top_classes}
+         */
+        public final Builder numTopClasses(@Nullable Integer value) {
+            this.numTopClasses = value;
+            return this;
+        }
+
+        /**
+         * Specifies the maximum number of feature importance values per document. By
+         * default, it is zero and no feature importance calculation occurs.
+         * <p>
+         * API name: {@code num_top_feature_importance_values}
+         */
+        public final Builder numTopFeatureImportanceValues(@Nullable Integer value) {
+            this.numTopFeatureImportanceValues = value;
+            return this;
+        }
+
+        /**
+         * Specifies the type of the predicted field to write. Acceptable values are:
+         * string, number, boolean. When boolean is provided 1.0 is transformed to true
+         * and 0.0 to false.
+         * <p>
+         * API name: {@code prediction_field_type}
+         */
+        public final Builder predictionFieldType(@Nullable String value) {
+            this.predictionFieldType = value;
+            return this;
+        }
+
+        /**
+         * The field that is added to incoming documents to contain the inference
+         * prediction. Defaults to predicted_value.
+         * <p>
+         * API name: {@code results_field}
+         */
+        public final Builder resultsField(@Nullable String value) {
+            this.resultsField = value;
+            return this;
+        }
+
+        /**
+         * Specifies the field to which the top classes are written. Defaults to
+         * top_classes.
+         * <p>
+         * API name: {@code top_classes_results_field}
+         */
+        public final Builder topClassesResultsField(@Nullable String value) {
+            this.topClassesResultsField = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ClassificationInferenceOptions}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClassificationInferenceOptions build() {
+            _checkSingleUse();
+
+            return new ClassificationInferenceOptions(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClassificationInferenceOptions}
+     */
+    public static final JsonpDeserializer<ClassificationInferenceOptions> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClassificationInferenceOptions::setupClassificationInferenceOptionsDeserializer
+    );
+
+    protected static void setupClassificationInferenceOptionsDeserializer(ObjectDeserializer<ClassificationInferenceOptions.Builder> op) {
+
+        op.add(Builder::numTopClasses, JsonpDeserializer.integerDeserializer(), "num_top_classes");
+        op.add(Builder::numTopFeatureImportanceValues, JsonpDeserializer.integerDeserializer(), "num_top_feature_importance_values");
+        op.add(Builder::predictionFieldType, JsonpDeserializer.stringDeserializer(), "prediction_field_type");
+        op.add(Builder::resultsField, JsonpDeserializer.stringDeserializer(), "results_field");
+        op.add(Builder::topClassesResultsField, JsonpDeserializer.stringDeserializer(), "top_classes_results_field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeAggregate.java
index 433063517e..bae121ec7b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeAggregate.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,125 +44,123 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.CompositeAggregate
 
 @JsonpDeserializable
 public class CompositeAggregate extends MultiBucketAggregateBase<CompositeBucket> implements AggregateVariant {
-	private final Map<String, JsonData> afterKey;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CompositeAggregate(Builder builder) {
-		super(builder);
-
-		this.afterKey = ApiTypeHelper.unmodifiable(builder.afterKey);
-
-	}
-
-	public static CompositeAggregate of(Function<Builder, ObjectBuilder<CompositeAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Composite;
-	}
-
-	/**
-	 * API name: {@code after_key}
-	 */
-	public final Map<String, JsonData> afterKey() {
-		return this.afterKey;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.afterKey)) {
-			generator.writeKey("after_key");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.afterKey.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CompositeAggregate}.
-	 */
-
-	public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<CompositeBucket, Builder>
-			implements
-				ObjectBuilder<CompositeAggregate> {
-		@Nullable
-		private Map<String, JsonData> afterKey;
-
-		/**
-		 * API name: {@code after_key}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>afterKey</code>.
-		 */
-		public final Builder afterKey(Map<String, JsonData> map) {
-			this.afterKey = _mapPutAll(this.afterKey, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code after_key}
-		 * <p>
-		 * Adds an entry to <code>afterKey</code>.
-		 */
-		public final Builder afterKey(String key, JsonData value) {
-			this.afterKey = _mapPut(this.afterKey, key, value);
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CompositeAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CompositeAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new CompositeAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CompositeAggregate}
-	 */
-	public static final JsonpDeserializer<CompositeAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CompositeAggregate::setupCompositeAggregateDeserializer);
-
-	protected static void setupCompositeAggregateDeserializer(ObjectDeserializer<CompositeAggregate.Builder> op) {
-		MultiBucketAggregateBase.setupMultiBucketAggregateBaseDeserializer(op, CompositeBucket._DESERIALIZER);
-		op.add(Builder::afterKey, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "after_key");
-
-	}
+    private final Map<String, JsonData> afterKey;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CompositeAggregate(Builder builder) {
+        super(builder);
+
+        this.afterKey = ApiTypeHelper.unmodifiable(builder.afterKey);
+
+    }
+
+    public static CompositeAggregate of(Function<Builder, ObjectBuilder<CompositeAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Composite;
+    }
+
+    /**
+     * API name: {@code after_key}
+     */
+    public final Map<String, JsonData> afterKey() {
+        return this.afterKey;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.afterKey)) {
+            generator.writeKey("after_key");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.afterKey.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CompositeAggregate}.
+     */
+
+    public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<CompositeBucket, Builder>
+        implements
+            ObjectBuilder<CompositeAggregate> {
+        @Nullable
+        private Map<String, JsonData> afterKey;
+
+        /**
+         * API name: {@code after_key}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>afterKey</code>.
+         */
+        public final Builder afterKey(Map<String, JsonData> map) {
+            this.afterKey = _mapPutAll(this.afterKey, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code after_key}
+         * <p>
+         * Adds an entry to <code>afterKey</code>.
+         */
+        public final Builder afterKey(String key, JsonData value) {
+            this.afterKey = _mapPut(this.afterKey, key, value);
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CompositeAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CompositeAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new CompositeAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CompositeAggregate}
+     */
+    public static final JsonpDeserializer<CompositeAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CompositeAggregate::setupCompositeAggregateDeserializer
+    );
+
+    protected static void setupCompositeAggregateDeserializer(ObjectDeserializer<CompositeAggregate.Builder> op) {
+        MultiBucketAggregateBase.setupMultiBucketAggregateBaseDeserializer(op, CompositeBucket._DESERIALIZER);
+        op.add(Builder::afterKey, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "after_key");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeAggregation.java
index 472e8c4d45..66e742af1d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeAggregation.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,209 +44,205 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.CompositeAggregation
 
 @JsonpDeserializable
 public class CompositeAggregation extends BucketAggregationBase implements AggregationVariant {
-	private final Map<String, String> after;
-
-	@Nullable
-	private final Integer size;
-
-	private final List<Map<String, CompositeAggregationSource>> sources;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CompositeAggregation(Builder builder) {
-		super(builder);
-
-		this.after = ApiTypeHelper.unmodifiable(builder.after);
-		this.size = builder.size;
-		this.sources = ApiTypeHelper.unmodifiable(builder.sources);
-
-	}
-
-	public static CompositeAggregation of(Function<Builder, ObjectBuilder<CompositeAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Composite;
-	}
-
-	/**
-	 * API name: {@code after}
-	 */
-	public final Map<String, String> after() {
-		return this.after;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	/**
-	 * API name: {@code sources}
-	 */
-	public final List<Map<String, CompositeAggregationSource>> sources() {
-		return this.sources;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.after)) {
-			generator.writeKey("after");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.after.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		if (ApiTypeHelper.isDefined(this.sources)) {
-			generator.writeKey("sources");
-			generator.writeStartArray();
-			for (Map<String, CompositeAggregationSource> item0 : this.sources) {
-				generator.writeStartObject();
-				if (item0 != null) {
-					for (Map.Entry<String, CompositeAggregationSource> item1 : item0.entrySet()) {
-						generator.writeKey(item1.getKey());
-						item1.getValue().serialize(generator, mapper);
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CompositeAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<CompositeAggregation> {
-		@Nullable
-		private Map<String, String> after;
-
-		@Nullable
-		private Integer size;
-
-		@Nullable
-		private List<Map<String, CompositeAggregationSource>> sources;
-
-		/**
-		 * API name: {@code after}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>after</code>.
-		 */
-		public final Builder after(Map<String, String> map) {
-			this.after = _mapPutAll(this.after, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code after}
-		 * <p>
-		 * Adds an entry to <code>after</code>.
-		 */
-		public final Builder after(String key, String value) {
-			this.after = _mapPut(this.after, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Integer value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code sources}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sources</code>.
-		 */
-		public final Builder sources(List<Map<String, CompositeAggregationSource>> list) {
-			this.sources = _listAddAll(this.sources, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code sources}
-		 * <p>
-		 * Adds one or more values to <code>sources</code>.
-		 */
-		public final Builder sources(Map<String, CompositeAggregationSource> value,
-				Map<String, CompositeAggregationSource>... values) {
-			this.sources = _listAdd(this.sources, value, values);
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CompositeAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CompositeAggregation build() {
-			_checkSingleUse();
-
-			return new CompositeAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CompositeAggregation}
-	 */
-	public static final JsonpDeserializer<CompositeAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CompositeAggregation::setupCompositeAggregationDeserializer);
-
-	protected static void setupCompositeAggregationDeserializer(ObjectDeserializer<CompositeAggregation.Builder> op) {
-		BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::after, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
-				"after");
-		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
-		op.add(Builder::sources, JsonpDeserializer.arrayDeserializer(
-				JsonpDeserializer.stringMapDeserializer(CompositeAggregationSource._DESERIALIZER)), "sources");
-
-	}
+    private final Map<String, String> after;
+
+    @Nullable
+    private final Integer size;
+
+    private final List<Map<String, CompositeAggregationSource>> sources;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CompositeAggregation(Builder builder) {
+        super(builder);
+
+        this.after = ApiTypeHelper.unmodifiable(builder.after);
+        this.size = builder.size;
+        this.sources = ApiTypeHelper.unmodifiable(builder.sources);
+
+    }
+
+    public static CompositeAggregation of(Function<Builder, ObjectBuilder<CompositeAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Composite;
+    }
+
+    /**
+     * API name: {@code after}
+     */
+    public final Map<String, String> after() {
+        return this.after;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    /**
+     * API name: {@code sources}
+     */
+    public final List<Map<String, CompositeAggregationSource>> sources() {
+        return this.sources;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.after)) {
+            generator.writeKey("after");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.after.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        if (ApiTypeHelper.isDefined(this.sources)) {
+            generator.writeKey("sources");
+            generator.writeStartArray();
+            for (Map<String, CompositeAggregationSource> item0 : this.sources) {
+                generator.writeStartObject();
+                if (item0 != null) {
+                    for (Map.Entry<String, CompositeAggregationSource> item1 : item0.entrySet()) {
+                        generator.writeKey(item1.getKey());
+                        item1.getValue().serialize(generator, mapper);
+
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CompositeAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<CompositeAggregation> {
+        @Nullable
+        private Map<String, String> after;
+
+        @Nullable
+        private Integer size;
+
+        @Nullable
+        private List<Map<String, CompositeAggregationSource>> sources;
+
+        /**
+         * API name: {@code after}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>after</code>.
+         */
+        public final Builder after(Map<String, String> map) {
+            this.after = _mapPutAll(this.after, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code after}
+         * <p>
+         * Adds an entry to <code>after</code>.
+         */
+        public final Builder after(String key, String value) {
+            this.after = _mapPut(this.after, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Integer value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code sources}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sources</code>.
+         */
+        public final Builder sources(List<Map<String, CompositeAggregationSource>> list) {
+            this.sources = _listAddAll(this.sources, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code sources}
+         * <p>
+         * Adds one or more values to <code>sources</code>.
+         */
+        public final Builder sources(Map<String, CompositeAggregationSource> value, Map<String, CompositeAggregationSource>... values) {
+            this.sources = _listAdd(this.sources, value, values);
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CompositeAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CompositeAggregation build() {
+            _checkSingleUse();
+
+            return new CompositeAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CompositeAggregation}
+     */
+    public static final JsonpDeserializer<CompositeAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CompositeAggregation::setupCompositeAggregationDeserializer
+    );
+
+    protected static void setupCompositeAggregationDeserializer(ObjectDeserializer<CompositeAggregation.Builder> op) {
+        BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::after, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "after");
+        op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
+        op.add(
+            Builder::sources,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringMapDeserializer(CompositeAggregationSource._DESERIALIZER)),
+            "sources"
+        );
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeAggregationSource.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeAggregationSource.java
index 83e7b88c58..00ab5deca8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeAggregationSource.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeAggregationSource.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,218 +43,213 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.CompositeAggregationSource
 
 @JsonpDeserializable
 public class CompositeAggregationSource implements JsonpSerializable {
-	@Nullable
-	private final TermsAggregation terms;
-
-	@Nullable
-	private final HistogramAggregation histogram;
-
-	@Nullable
-	private final DateHistogramAggregation dateHistogram;
-
-	@Nullable
-	private final GeoTileGridAggregation geotileGrid;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CompositeAggregationSource(Builder builder) {
-
-		this.terms = builder.terms;
-		this.histogram = builder.histogram;
-		this.dateHistogram = builder.dateHistogram;
-		this.geotileGrid = builder.geotileGrid;
-
-	}
-
-	public static CompositeAggregationSource of(Function<Builder, ObjectBuilder<CompositeAggregationSource>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code terms}
-	 */
-	@Nullable
-	public final TermsAggregation terms() {
-		return this.terms;
-	}
-
-	/**
-	 * API name: {@code histogram}
-	 */
-	@Nullable
-	public final HistogramAggregation histogram() {
-		return this.histogram;
-	}
-
-	/**
-	 * API name: {@code date_histogram}
-	 */
-	@Nullable
-	public final DateHistogramAggregation dateHistogram() {
-		return this.dateHistogram;
-	}
-
-	/**
-	 * API name: {@code geotile_grid}
-	 */
-	@Nullable
-	public final GeoTileGridAggregation geotileGrid() {
-		return this.geotileGrid;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.terms != null) {
-			generator.writeKey("terms");
-			this.terms.serialize(generator, mapper);
-
-		}
-		if (this.histogram != null) {
-			generator.writeKey("histogram");
-			this.histogram.serialize(generator, mapper);
-
-		}
-		if (this.dateHistogram != null) {
-			generator.writeKey("date_histogram");
-			this.dateHistogram.serialize(generator, mapper);
-
-		}
-		if (this.geotileGrid != null) {
-			generator.writeKey("geotile_grid");
-			this.geotileGrid.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CompositeAggregationSource}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CompositeAggregationSource> {
-		@Nullable
-		private TermsAggregation terms;
-
-		@Nullable
-		private HistogramAggregation histogram;
-
-		@Nullable
-		private DateHistogramAggregation dateHistogram;
-
-		@Nullable
-		private GeoTileGridAggregation geotileGrid;
-
-		/**
-		 * API name: {@code terms}
-		 */
-		public final Builder terms(@Nullable TermsAggregation value) {
-			this.terms = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code terms}
-		 */
-		public final Builder terms(Function<TermsAggregation.Builder, ObjectBuilder<TermsAggregation>> fn) {
-			return this.terms(fn.apply(new TermsAggregation.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code histogram}
-		 */
-		public final Builder histogram(@Nullable HistogramAggregation value) {
-			this.histogram = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code histogram}
-		 */
-		public final Builder histogram(Function<HistogramAggregation.Builder, ObjectBuilder<HistogramAggregation>> fn) {
-			return this.histogram(fn.apply(new HistogramAggregation.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code date_histogram}
-		 */
-		public final Builder dateHistogram(@Nullable DateHistogramAggregation value) {
-			this.dateHistogram = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code date_histogram}
-		 */
-		public final Builder dateHistogram(
-				Function<DateHistogramAggregation.Builder, ObjectBuilder<DateHistogramAggregation>> fn) {
-			return this.dateHistogram(fn.apply(new DateHistogramAggregation.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code geotile_grid}
-		 */
-		public final Builder geotileGrid(@Nullable GeoTileGridAggregation value) {
-			this.geotileGrid = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code geotile_grid}
-		 */
-		public final Builder geotileGrid(
-				Function<GeoTileGridAggregation.Builder, ObjectBuilder<GeoTileGridAggregation>> fn) {
-			return this.geotileGrid(fn.apply(new GeoTileGridAggregation.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link CompositeAggregationSource}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CompositeAggregationSource build() {
-			_checkSingleUse();
-
-			return new CompositeAggregationSource(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CompositeAggregationSource}
-	 */
-	public static final JsonpDeserializer<CompositeAggregationSource> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CompositeAggregationSource::setupCompositeAggregationSourceDeserializer);
-
-	protected static void setupCompositeAggregationSourceDeserializer(
-			ObjectDeserializer<CompositeAggregationSource.Builder> op) {
-
-		op.add(Builder::terms, TermsAggregation._DESERIALIZER, "terms");
-		op.add(Builder::histogram, HistogramAggregation._DESERIALIZER, "histogram");
-		op.add(Builder::dateHistogram, DateHistogramAggregation._DESERIALIZER, "date_histogram");
-		op.add(Builder::geotileGrid, GeoTileGridAggregation._DESERIALIZER, "geotile_grid");
-
-	}
+    @Nullable
+    private final TermsAggregation terms;
+
+    @Nullable
+    private final HistogramAggregation histogram;
+
+    @Nullable
+    private final DateHistogramAggregation dateHistogram;
+
+    @Nullable
+    private final GeoTileGridAggregation geotileGrid;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CompositeAggregationSource(Builder builder) {
+
+        this.terms = builder.terms;
+        this.histogram = builder.histogram;
+        this.dateHistogram = builder.dateHistogram;
+        this.geotileGrid = builder.geotileGrid;
+
+    }
+
+    public static CompositeAggregationSource of(Function<Builder, ObjectBuilder<CompositeAggregationSource>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code terms}
+     */
+    @Nullable
+    public final TermsAggregation terms() {
+        return this.terms;
+    }
+
+    /**
+     * API name: {@code histogram}
+     */
+    @Nullable
+    public final HistogramAggregation histogram() {
+        return this.histogram;
+    }
+
+    /**
+     * API name: {@code date_histogram}
+     */
+    @Nullable
+    public final DateHistogramAggregation dateHistogram() {
+        return this.dateHistogram;
+    }
+
+    /**
+     * API name: {@code geotile_grid}
+     */
+    @Nullable
+    public final GeoTileGridAggregation geotileGrid() {
+        return this.geotileGrid;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.terms != null) {
+            generator.writeKey("terms");
+            this.terms.serialize(generator, mapper);
+
+        }
+        if (this.histogram != null) {
+            generator.writeKey("histogram");
+            this.histogram.serialize(generator, mapper);
+
+        }
+        if (this.dateHistogram != null) {
+            generator.writeKey("date_histogram");
+            this.dateHistogram.serialize(generator, mapper);
+
+        }
+        if (this.geotileGrid != null) {
+            generator.writeKey("geotile_grid");
+            this.geotileGrid.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CompositeAggregationSource}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CompositeAggregationSource> {
+        @Nullable
+        private TermsAggregation terms;
+
+        @Nullable
+        private HistogramAggregation histogram;
+
+        @Nullable
+        private DateHistogramAggregation dateHistogram;
+
+        @Nullable
+        private GeoTileGridAggregation geotileGrid;
+
+        /**
+         * API name: {@code terms}
+         */
+        public final Builder terms(@Nullable TermsAggregation value) {
+            this.terms = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code terms}
+         */
+        public final Builder terms(Function<TermsAggregation.Builder, ObjectBuilder<TermsAggregation>> fn) {
+            return this.terms(fn.apply(new TermsAggregation.Builder()).build());
+        }
+
+        /**
+         * API name: {@code histogram}
+         */
+        public final Builder histogram(@Nullable HistogramAggregation value) {
+            this.histogram = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code histogram}
+         */
+        public final Builder histogram(Function<HistogramAggregation.Builder, ObjectBuilder<HistogramAggregation>> fn) {
+            return this.histogram(fn.apply(new HistogramAggregation.Builder()).build());
+        }
+
+        /**
+         * API name: {@code date_histogram}
+         */
+        public final Builder dateHistogram(@Nullable DateHistogramAggregation value) {
+            this.dateHistogram = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code date_histogram}
+         */
+        public final Builder dateHistogram(Function<DateHistogramAggregation.Builder, ObjectBuilder<DateHistogramAggregation>> fn) {
+            return this.dateHistogram(fn.apply(new DateHistogramAggregation.Builder()).build());
+        }
+
+        /**
+         * API name: {@code geotile_grid}
+         */
+        public final Builder geotileGrid(@Nullable GeoTileGridAggregation value) {
+            this.geotileGrid = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code geotile_grid}
+         */
+        public final Builder geotileGrid(Function<GeoTileGridAggregation.Builder, ObjectBuilder<GeoTileGridAggregation>> fn) {
+            return this.geotileGrid(fn.apply(new GeoTileGridAggregation.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link CompositeAggregationSource}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CompositeAggregationSource build() {
+            _checkSingleUse();
+
+            return new CompositeAggregationSource(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CompositeAggregationSource}
+     */
+    public static final JsonpDeserializer<CompositeAggregationSource> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CompositeAggregationSource::setupCompositeAggregationSourceDeserializer
+    );
+
+    protected static void setupCompositeAggregationSourceDeserializer(ObjectDeserializer<CompositeAggregationSource.Builder> op) {
+
+        op.add(Builder::terms, TermsAggregation._DESERIALIZER, "terms");
+        op.add(Builder::histogram, HistogramAggregation._DESERIALIZER, "histogram");
+        op.add(Builder::dateHistogram, DateHistogramAggregation._DESERIALIZER, "date_histogram");
+        op.add(Builder::geotileGrid, GeoTileGridAggregation._DESERIALIZER, "geotile_grid");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeBucket.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeBucket.java
index 938c6dff17..41d4145682 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeBucket.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeBucket.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,114 +43,111 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.CompositeBucket
 
 @JsonpDeserializable
 public class CompositeBucket extends MultiBucketBase {
-	private final Map<String, JsonData> key;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CompositeBucket(Builder builder) {
-		super(builder);
-
-		this.key = ApiTypeHelper.unmodifiableRequired(builder.key, this, "key");
-
-	}
-
-	public static CompositeBucket of(Function<Builder, ObjectBuilder<CompositeBucket>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code key}
-	 */
-	public final Map<String, JsonData> key() {
-		return this.key;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.key)) {
-			generator.writeKey("key");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.key.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CompositeBucket}.
-	 */
-
-	public static class Builder extends MultiBucketBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<CompositeBucket> {
-		private Map<String, JsonData> key;
-
-		/**
-		 * Required - API name: {@code key}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>key</code>.
-		 */
-		public final Builder key(Map<String, JsonData> map) {
-			this.key = _mapPutAll(this.key, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code key}
-		 * <p>
-		 * Adds an entry to <code>key</code>.
-		 */
-		public final Builder key(String key, JsonData value) {
-			this.key = _mapPut(this.key, key, value);
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CompositeBucket}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CompositeBucket build() {
-			_checkSingleUse();
-
-			return new CompositeBucket(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CompositeBucket}
-	 */
-	public static final JsonpDeserializer<CompositeBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CompositeBucket::setupCompositeBucketDeserializer);
-
-	protected static void setupCompositeBucketDeserializer(ObjectDeserializer<CompositeBucket.Builder> op) {
-		MultiBucketBase.setupMultiBucketBaseDeserializer(op);
-		op.add(Builder::key, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "key");
-
-	}
+    private final Map<String, JsonData> key;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CompositeBucket(Builder builder) {
+        super(builder);
+
+        this.key = ApiTypeHelper.unmodifiableRequired(builder.key, this, "key");
+
+    }
+
+    public static CompositeBucket of(Function<Builder, ObjectBuilder<CompositeBucket>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code key}
+     */
+    public final Map<String, JsonData> key() {
+        return this.key;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.key)) {
+            generator.writeKey("key");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.key.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CompositeBucket}.
+     */
+
+    public static class Builder extends MultiBucketBase.AbstractBuilder<Builder> implements ObjectBuilder<CompositeBucket> {
+        private Map<String, JsonData> key;
+
+        /**
+         * Required - API name: {@code key}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>key</code>.
+         */
+        public final Builder key(Map<String, JsonData> map) {
+            this.key = _mapPutAll(this.key, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code key}
+         * <p>
+         * Adds an entry to <code>key</code>.
+         */
+        public final Builder key(String key, JsonData value) {
+            this.key = _mapPut(this.key, key, value);
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CompositeBucket}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CompositeBucket build() {
+            _checkSingleUse();
+
+            return new CompositeBucket(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CompositeBucket}
+     */
+    public static final JsonpDeserializer<CompositeBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CompositeBucket::setupCompositeBucketDeserializer
+    );
+
+    protected static void setupCompositeBucketDeserializer(ObjectDeserializer<CompositeBucket.Builder> op) {
+        MultiBucketBase.setupMultiBucketBaseDeserializer(op);
+        op.add(Builder::key, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "key");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CumulativeCardinalityAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CumulativeCardinalityAggregate.java
index e76d7d46d1..7121eeab5d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CumulativeCardinalityAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CumulativeCardinalityAggregate.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,137 +42,132 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.CumulativeCardinalityAggregate
 
 /**
  * Result of the <code>cumulative_cardinality</code> aggregation
- * 
+ *
  */
 @JsonpDeserializable
 public class CumulativeCardinalityAggregate extends AggregateBase implements AggregateVariant {
-	private final long value;
-
-	@Nullable
-	private final String valueAsString;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CumulativeCardinalityAggregate(Builder builder) {
-		super(builder);
-
-		this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
-		this.valueAsString = builder.valueAsString;
-
-	}
-
-	public static CumulativeCardinalityAggregate of(
-			Function<Builder, ObjectBuilder<CumulativeCardinalityAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.SimpleLongValue;
-	}
-
-	/**
-	 * Required - API name: {@code value}
-	 */
-	public final long value() {
-		return this.value;
-	}
-
-	/**
-	 * API name: {@code value_as_string}
-	 */
-	@Nullable
-	public final String valueAsString() {
-		return this.valueAsString;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("value");
-		generator.write(this.value);
-
-		if (this.valueAsString != null) {
-			generator.writeKey("value_as_string");
-			generator.write(this.valueAsString);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CumulativeCardinalityAggregate}.
-	 */
-
-	public static class Builder extends AggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<CumulativeCardinalityAggregate> {
-		private Long value;
-
-		@Nullable
-		private String valueAsString;
-
-		/**
-		 * Required - API name: {@code value}
-		 */
-		public final Builder value(long value) {
-			this.value = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code value_as_string}
-		 */
-		public final Builder valueAsString(@Nullable String value) {
-			this.valueAsString = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CumulativeCardinalityAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CumulativeCardinalityAggregate build() {
-			_checkSingleUse();
-
-			return new CumulativeCardinalityAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CumulativeCardinalityAggregate}
-	 */
-	public static final JsonpDeserializer<CumulativeCardinalityAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CumulativeCardinalityAggregate::setupCumulativeCardinalityAggregateDeserializer);
-
-	protected static void setupCumulativeCardinalityAggregateDeserializer(
-			ObjectDeserializer<CumulativeCardinalityAggregate.Builder> op) {
-		AggregateBase.setupAggregateBaseDeserializer(op);
-		op.add(Builder::value, JsonpDeserializer.longDeserializer(), "value");
-		op.add(Builder::valueAsString, JsonpDeserializer.stringDeserializer(), "value_as_string");
-
-	}
+    private final long value;
+
+    @Nullable
+    private final String valueAsString;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CumulativeCardinalityAggregate(Builder builder) {
+        super(builder);
+
+        this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
+        this.valueAsString = builder.valueAsString;
+
+    }
+
+    public static CumulativeCardinalityAggregate of(Function<Builder, ObjectBuilder<CumulativeCardinalityAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.SimpleLongValue;
+    }
+
+    /**
+     * Required - API name: {@code value}
+     */
+    public final long value() {
+        return this.value;
+    }
+
+    /**
+     * API name: {@code value_as_string}
+     */
+    @Nullable
+    public final String valueAsString() {
+        return this.valueAsString;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("value");
+        generator.write(this.value);
+
+        if (this.valueAsString != null) {
+            generator.writeKey("value_as_string");
+            generator.write(this.valueAsString);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CumulativeCardinalityAggregate}.
+     */
+
+    public static class Builder extends AggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<CumulativeCardinalityAggregate> {
+        private Long value;
+
+        @Nullable
+        private String valueAsString;
+
+        /**
+         * Required - API name: {@code value}
+         */
+        public final Builder value(long value) {
+            this.value = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code value_as_string}
+         */
+        public final Builder valueAsString(@Nullable String value) {
+            this.valueAsString = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CumulativeCardinalityAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CumulativeCardinalityAggregate build() {
+            _checkSingleUse();
+
+            return new CumulativeCardinalityAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CumulativeCardinalityAggregate}
+     */
+    public static final JsonpDeserializer<CumulativeCardinalityAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CumulativeCardinalityAggregate::setupCumulativeCardinalityAggregateDeserializer
+    );
+
+    protected static void setupCumulativeCardinalityAggregateDeserializer(ObjectDeserializer<CumulativeCardinalityAggregate.Builder> op) {
+        AggregateBase.setupAggregateBaseDeserializer(op);
+        op.add(Builder::value, JsonpDeserializer.longDeserializer(), "value");
+        op.add(Builder::valueAsString, JsonpDeserializer.stringDeserializer(), "value_as_string");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CumulativeCardinalityAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CumulativeCardinalityAggregation.java
index 33a64459ae..7fa68d83fe 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CumulativeCardinalityAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CumulativeCardinalityAggregation.java
@@ -32,77 +32,78 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.CumulativeCardinalityAggregation
 
 @JsonpDeserializable
 public class CumulativeCardinalityAggregation extends PipelineAggregationBase implements AggregationVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private CumulativeCardinalityAggregation(Builder builder) {
-		super(builder);
-
-	}
-
-	public static CumulativeCardinalityAggregation of(
-			Function<Builder, ObjectBuilder<CumulativeCardinalityAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.CumulativeCardinality;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CumulativeCardinalityAggregation}.
-	 */
-
-	public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<CumulativeCardinalityAggregation> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CumulativeCardinalityAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CumulativeCardinalityAggregation build() {
-			_checkSingleUse();
-
-			return new CumulativeCardinalityAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CumulativeCardinalityAggregation}
-	 */
-	public static final JsonpDeserializer<CumulativeCardinalityAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CumulativeCardinalityAggregation::setupCumulativeCardinalityAggregationDeserializer);
-
-	protected static void setupCumulativeCardinalityAggregationDeserializer(
-			ObjectDeserializer<CumulativeCardinalityAggregation.Builder> op) {
-		PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private CumulativeCardinalityAggregation(Builder builder) {
+        super(builder);
+
+    }
+
+    public static CumulativeCardinalityAggregation of(Function<Builder, ObjectBuilder<CumulativeCardinalityAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.CumulativeCardinality;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CumulativeCardinalityAggregation}.
+     */
+
+    public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<CumulativeCardinalityAggregation> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CumulativeCardinalityAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CumulativeCardinalityAggregation build() {
+            _checkSingleUse();
+
+            return new CumulativeCardinalityAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CumulativeCardinalityAggregation}
+     */
+    public static final JsonpDeserializer<CumulativeCardinalityAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CumulativeCardinalityAggregation::setupCumulativeCardinalityAggregationDeserializer
+    );
+
+    protected static void setupCumulativeCardinalityAggregationDeserializer(
+        ObjectDeserializer<CumulativeCardinalityAggregation.Builder> op
+    ) {
+        PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CumulativeSumAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CumulativeSumAggregation.java
index 2dd864a016..a78384e73a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CumulativeSumAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CumulativeSumAggregation.java
@@ -32,76 +32,76 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.CumulativeSumAggregation
 
 @JsonpDeserializable
 public class CumulativeSumAggregation extends PipelineAggregationBase implements AggregationVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private CumulativeSumAggregation(Builder builder) {
-		super(builder);
-
-	}
-
-	public static CumulativeSumAggregation of(Function<Builder, ObjectBuilder<CumulativeSumAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.CumulativeSum;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CumulativeSumAggregation}.
-	 */
-
-	public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<CumulativeSumAggregation> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CumulativeSumAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CumulativeSumAggregation build() {
-			_checkSingleUse();
-
-			return new CumulativeSumAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CumulativeSumAggregation}
-	 */
-	public static final JsonpDeserializer<CumulativeSumAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CumulativeSumAggregation::setupCumulativeSumAggregationDeserializer);
-
-	protected static void setupCumulativeSumAggregationDeserializer(
-			ObjectDeserializer<CumulativeSumAggregation.Builder> op) {
-		PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private CumulativeSumAggregation(Builder builder) {
+        super(builder);
+
+    }
+
+    public static CumulativeSumAggregation of(Function<Builder, ObjectBuilder<CumulativeSumAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.CumulativeSum;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CumulativeSumAggregation}.
+     */
+
+    public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<CumulativeSumAggregation> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CumulativeSumAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CumulativeSumAggregation build() {
+            _checkSingleUse();
+
+            return new CumulativeSumAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CumulativeSumAggregation}
+     */
+    public static final JsonpDeserializer<CumulativeSumAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CumulativeSumAggregation::setupCumulativeSumAggregationDeserializer
+    );
+
+    protected static void setupCumulativeSumAggregationDeserializer(ObjectDeserializer<CumulativeSumAggregation.Builder> op) {
+        PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateHistogramAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateHistogramAggregate.java
index 0661b8fe69..dad8496ac3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateHistogramAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateHistogramAggregate.java
@@ -32,77 +32,77 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.DateHistogramAggregate
 
 @JsonpDeserializable
 public class DateHistogramAggregate extends MultiBucketAggregateBase<DateHistogramBucket> implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private DateHistogramAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static DateHistogramAggregate of(Function<Builder, ObjectBuilder<DateHistogramAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.DateHistogram;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DateHistogramAggregate}.
-	 */
-
-	public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<DateHistogramBucket, Builder>
-			implements
-				ObjectBuilder<DateHistogramAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DateHistogramAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DateHistogramAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new DateHistogramAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DateHistogramAggregate}
-	 */
-	public static final JsonpDeserializer<DateHistogramAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DateHistogramAggregate::setupDateHistogramAggregateDeserializer);
-
-	protected static void setupDateHistogramAggregateDeserializer(
-			ObjectDeserializer<DateHistogramAggregate.Builder> op) {
-		setupMultiBucketAggregateBaseDeserializer(op, DateHistogramBucket._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private DateHistogramAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static DateHistogramAggregate of(Function<Builder, ObjectBuilder<DateHistogramAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.DateHistogram;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DateHistogramAggregate}.
+     */
+
+    public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<DateHistogramBucket, Builder>
+        implements
+            ObjectBuilder<DateHistogramAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DateHistogramAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DateHistogramAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new DateHistogramAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DateHistogramAggregate}
+     */
+    public static final JsonpDeserializer<DateHistogramAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DateHistogramAggregate::setupDateHistogramAggregateDeserializer
+    );
+
+    protected static void setupDateHistogramAggregateDeserializer(ObjectDeserializer<DateHistogramAggregate.Builder> op) {
+        setupMultiBucketAggregateBaseDeserializer(op, DateHistogramBucket._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateHistogramAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateHistogramAggregation.java
index 00b468e31a..350d3582c0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateHistogramAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateHistogramAggregation.java
@@ -32,593 +32,590 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.Script;
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
+import org.opensearch.client.opensearch._types.Time;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.DateHistogramAggregation
 
 @JsonpDeserializable
 public class DateHistogramAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final CalendarInterval calendarInterval;
-
-	@Nullable
-	private final ExtendedBounds<FieldDateMath> extendedBounds;
-
-	@Nullable
-	private final ExtendedBounds<FieldDateMath> hardBounds;
-
-	@Nullable
-	private final String field;
-
-	@Nullable
-	private final Time fixedInterval;
-
-	@Nullable
-	private final String format;
-
-	@Nullable
-	private final Time interval;
-
-	@Nullable
-	private final Integer minDocCount;
-
-	@Nullable
-	private final String missing;
-
-	@Nullable
-	private final Time offset;
-
-	@Nullable
-	private final HistogramOrder order;
-
-	private final Map<String, JsonData> params;
-
-	@Nullable
-	private final Script script;
-
-	@Nullable
-	private final String timeZone;
-
-	@Nullable
-	private final Boolean keyed;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DateHistogramAggregation(Builder builder) {
-		super(builder);
-
-		this.calendarInterval = builder.calendarInterval;
-		this.extendedBounds = builder.extendedBounds;
-		this.hardBounds = builder.hardBounds;
-		this.field = builder.field;
-		this.fixedInterval = builder.fixedInterval;
-		this.format = builder.format;
-		this.interval = builder.interval;
-		this.minDocCount = builder.minDocCount;
-		this.missing = builder.missing;
-		this.offset = builder.offset;
-		this.order = builder.order;
-		this.params = ApiTypeHelper.unmodifiable(builder.params);
-		this.script = builder.script;
-		this.timeZone = builder.timeZone;
-		this.keyed = builder.keyed;
-
-	}
-
-	public static DateHistogramAggregation of(Function<Builder, ObjectBuilder<DateHistogramAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.DateHistogram;
-	}
-
-	/**
-	 * API name: {@code calendar_interval}
-	 */
-	@Nullable
-	public final CalendarInterval calendarInterval() {
-		return this.calendarInterval;
-	}
-
-	/**
-	 * API name: {@code extended_bounds}
-	 */
-	@Nullable
-	public final ExtendedBounds<FieldDateMath> extendedBounds() {
-		return this.extendedBounds;
-	}
-
-	/**
-	 * API name: {@code hard_bounds}
-	 */
-	@Nullable
-	public final ExtendedBounds<FieldDateMath> hardBounds() {
-		return this.hardBounds;
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code fixed_interval}
-	 */
-	@Nullable
-	public final Time fixedInterval() {
-		return this.fixedInterval;
-	}
-
-	/**
-	 * API name: {@code format}
-	 */
-	@Nullable
-	public final String format() {
-		return this.format;
-	}
-
-	/**
-	 * API name: {@code interval}
-	 */
-	@Nullable
-	public final Time interval() {
-		return this.interval;
-	}
-
-	/**
-	 * API name: {@code min_doc_count}
-	 */
-	@Nullable
-	public final Integer minDocCount() {
-		return this.minDocCount;
-	}
-
-	/**
-	 * API name: {@code missing}
-	 */
-	@Nullable
-	public final String missing() {
-		return this.missing;
-	}
-
-	/**
-	 * API name: {@code offset}
-	 */
-	@Nullable
-	public final Time offset() {
-		return this.offset;
-	}
-
-	/**
-	 * API name: {@code order}
-	 */
-	@Nullable
-	public final HistogramOrder order() {
-		return this.order;
-	}
-
-	/**
-	 * API name: {@code params}
-	 */
-	public final Map<String, JsonData> params() {
-		return this.params;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final Script script() {
-		return this.script;
-	}
-
-	/**
-	 * API name: {@code time_zone}
-	 */
-	@Nullable
-	public final String timeZone() {
-		return this.timeZone;
-	}
-
-	/**
-	 * API name: {@code keyed}
-	 */
-	@Nullable
-	public final Boolean keyed() {
-		return this.keyed;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.calendarInterval != null) {
-			generator.writeKey("calendar_interval");
-			this.calendarInterval.serialize(generator, mapper);
-		}
-		if (this.extendedBounds != null) {
-			generator.writeKey("extended_bounds");
-			this.extendedBounds.serialize(generator, mapper);
-
-		}
-		if (this.hardBounds != null) {
-			generator.writeKey("hard_bounds");
-			this.hardBounds.serialize(generator, mapper);
-
-		}
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (this.fixedInterval != null) {
-			generator.writeKey("fixed_interval");
-			this.fixedInterval.serialize(generator, mapper);
-
-		}
-		if (this.format != null) {
-			generator.writeKey("format");
-			generator.write(this.format);
-
-		}
-		if (this.interval != null) {
-			generator.writeKey("interval");
-			this.interval.serialize(generator, mapper);
-
-		}
-		if (this.minDocCount != null) {
-			generator.writeKey("min_doc_count");
-			generator.write(this.minDocCount);
-
-		}
-		if (this.missing != null) {
-			generator.writeKey("missing");
-			generator.write(this.missing);
-
-		}
-		if (this.offset != null) {
-			generator.writeKey("offset");
-			this.offset.serialize(generator, mapper);
-
-		}
-		if (this.order != null) {
-			generator.writeKey("order");
-			this.order.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.params)) {
-			generator.writeKey("params");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-		if (this.timeZone != null) {
-			generator.writeKey("time_zone");
-			generator.write(this.timeZone);
-
-		}
-		if (this.keyed != null) {
-			generator.writeKey("keyed");
-			generator.write(this.keyed);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DateHistogramAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DateHistogramAggregation> {
-		@Nullable
-		private CalendarInterval calendarInterval;
-
-		@Nullable
-		private ExtendedBounds<FieldDateMath> extendedBounds;
-
-		@Nullable
-		private ExtendedBounds<FieldDateMath> hardBounds;
-
-		@Nullable
-		private String field;
-
-		@Nullable
-		private Time fixedInterval;
-
-		@Nullable
-		private String format;
-
-		@Nullable
-		private Time interval;
-
-		@Nullable
-		private Integer minDocCount;
-
-		@Nullable
-		private String missing;
-
-		@Nullable
-		private Time offset;
-
-		@Nullable
-		private HistogramOrder order;
-
-		@Nullable
-		private Map<String, JsonData> params;
-
-		@Nullable
-		private Script script;
-
-		@Nullable
-		private String timeZone;
-
-		@Nullable
-		private Boolean keyed;
-
-		/**
-		 * API name: {@code calendar_interval}
-		 */
-		public final Builder calendarInterval(@Nullable CalendarInterval value) {
-			this.calendarInterval = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code extended_bounds}
-		 */
-		public final Builder extendedBounds(@Nullable ExtendedBounds<FieldDateMath> value) {
-			this.extendedBounds = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code extended_bounds}
-		 */
-		public final Builder extendedBounds(
-				Function<ExtendedBounds.Builder<FieldDateMath>, ObjectBuilder<ExtendedBounds<FieldDateMath>>> fn) {
-			return this.extendedBounds(fn.apply(new ExtendedBounds.Builder<FieldDateMath>()).build());
-		}
-
-		/**
-		 * API name: {@code hard_bounds}
-		 */
-		public final Builder hardBounds(@Nullable ExtendedBounds<FieldDateMath> value) {
-			this.hardBounds = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code hard_bounds}
-		 */
-		public final Builder hardBounds(
-				Function<ExtendedBounds.Builder<FieldDateMath>, ObjectBuilder<ExtendedBounds<FieldDateMath>>> fn) {
-			return this.hardBounds(fn.apply(new ExtendedBounds.Builder<FieldDateMath>()).build());
-		}
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fixed_interval}
-		 */
-		public final Builder fixedInterval(@Nullable Time value) {
-			this.fixedInterval = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fixed_interval}
-		 */
-		public final Builder fixedInterval(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.fixedInterval(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code format}
-		 */
-		public final Builder format(@Nullable String value) {
-			this.format = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code interval}
-		 */
-		public final Builder interval(@Nullable Time value) {
-			this.interval = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code interval}
-		 */
-		public final Builder interval(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.interval(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code min_doc_count}
-		 */
-		public final Builder minDocCount(@Nullable Integer value) {
-			this.minDocCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code missing}
-		 */
-		public final Builder missing(@Nullable String value) {
-			this.missing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code offset}
-		 */
-		public final Builder offset(@Nullable Time value) {
-			this.offset = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code offset}
-		 */
-		public final Builder offset(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.offset(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code order}
-		 */
-		public final Builder order(@Nullable HistogramOrder value) {
-			this.order = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code order}
-		 */
-		public final Builder order(Function<HistogramOrder.Builder, ObjectBuilder<HistogramOrder>> fn) {
-			return this.order(fn.apply(new HistogramOrder.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code params}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>params</code>.
-		 */
-		public final Builder params(Map<String, JsonData> map) {
-			this.params = _mapPutAll(this.params, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code params}
-		 * <p>
-		 * Adds an entry to <code>params</code>.
-		 */
-		public final Builder params(String key, JsonData value) {
-			this.params = _mapPut(this.params, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(@Nullable Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code time_zone}
-		 */
-		public final Builder timeZone(@Nullable String value) {
-			this.timeZone = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code keyed}
-		 */
-		public final Builder keyed(@Nullable Boolean value) {
-			this.keyed = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DateHistogramAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DateHistogramAggregation build() {
-			_checkSingleUse();
-
-			return new DateHistogramAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DateHistogramAggregation}
-	 */
-	public static final JsonpDeserializer<DateHistogramAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DateHistogramAggregation::setupDateHistogramAggregationDeserializer);
-
-	protected static void setupDateHistogramAggregationDeserializer(
-			ObjectDeserializer<DateHistogramAggregation.Builder> op) {
-		setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::calendarInterval, CalendarInterval._DESERIALIZER, "calendar_interval");
-		op.add(Builder::extendedBounds, ExtendedBounds.createExtendedBoundsDeserializer(FieldDateMath._DESERIALIZER),
-				"extended_bounds");
-		op.add(Builder::hardBounds, ExtendedBounds.createExtendedBoundsDeserializer(FieldDateMath._DESERIALIZER),
-				"hard_bounds");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::fixedInterval, Time._DESERIALIZER, "fixed_interval");
-		op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
-		op.add(Builder::interval, Time._DESERIALIZER, "interval");
-		op.add(Builder::minDocCount, JsonpDeserializer.integerDeserializer(), "min_doc_count");
-		op.add(Builder::missing, JsonpDeserializer.stringDeserializer(), "missing");
-		op.add(Builder::offset, Time._DESERIALIZER, "offset");
-		op.add(Builder::order, HistogramOrder._DESERIALIZER, "order");
-		op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-		op.add(Builder::timeZone, JsonpDeserializer.stringDeserializer(), "time_zone");
-		op.add(Builder::keyed, JsonpDeserializer.booleanDeserializer(), "keyed");
-
-	}
+    @Nullable
+    private final CalendarInterval calendarInterval;
+
+    @Nullable
+    private final ExtendedBounds<FieldDateMath> extendedBounds;
+
+    @Nullable
+    private final ExtendedBounds<FieldDateMath> hardBounds;
+
+    @Nullable
+    private final String field;
+
+    @Nullable
+    private final Time fixedInterval;
+
+    @Nullable
+    private final String format;
+
+    @Nullable
+    private final Time interval;
+
+    @Nullable
+    private final Integer minDocCount;
+
+    @Nullable
+    private final String missing;
+
+    @Nullable
+    private final Time offset;
+
+    @Nullable
+    private final HistogramOrder order;
+
+    private final Map<String, JsonData> params;
+
+    @Nullable
+    private final Script script;
+
+    @Nullable
+    private final String timeZone;
+
+    @Nullable
+    private final Boolean keyed;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DateHistogramAggregation(Builder builder) {
+        super(builder);
+
+        this.calendarInterval = builder.calendarInterval;
+        this.extendedBounds = builder.extendedBounds;
+        this.hardBounds = builder.hardBounds;
+        this.field = builder.field;
+        this.fixedInterval = builder.fixedInterval;
+        this.format = builder.format;
+        this.interval = builder.interval;
+        this.minDocCount = builder.minDocCount;
+        this.missing = builder.missing;
+        this.offset = builder.offset;
+        this.order = builder.order;
+        this.params = ApiTypeHelper.unmodifiable(builder.params);
+        this.script = builder.script;
+        this.timeZone = builder.timeZone;
+        this.keyed = builder.keyed;
+
+    }
+
+    public static DateHistogramAggregation of(Function<Builder, ObjectBuilder<DateHistogramAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.DateHistogram;
+    }
+
+    /**
+     * API name: {@code calendar_interval}
+     */
+    @Nullable
+    public final CalendarInterval calendarInterval() {
+        return this.calendarInterval;
+    }
+
+    /**
+     * API name: {@code extended_bounds}
+     */
+    @Nullable
+    public final ExtendedBounds<FieldDateMath> extendedBounds() {
+        return this.extendedBounds;
+    }
+
+    /**
+     * API name: {@code hard_bounds}
+     */
+    @Nullable
+    public final ExtendedBounds<FieldDateMath> hardBounds() {
+        return this.hardBounds;
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code fixed_interval}
+     */
+    @Nullable
+    public final Time fixedInterval() {
+        return this.fixedInterval;
+    }
+
+    /**
+     * API name: {@code format}
+     */
+    @Nullable
+    public final String format() {
+        return this.format;
+    }
+
+    /**
+     * API name: {@code interval}
+     */
+    @Nullable
+    public final Time interval() {
+        return this.interval;
+    }
+
+    /**
+     * API name: {@code min_doc_count}
+     */
+    @Nullable
+    public final Integer minDocCount() {
+        return this.minDocCount;
+    }
+
+    /**
+     * API name: {@code missing}
+     */
+    @Nullable
+    public final String missing() {
+        return this.missing;
+    }
+
+    /**
+     * API name: {@code offset}
+     */
+    @Nullable
+    public final Time offset() {
+        return this.offset;
+    }
+
+    /**
+     * API name: {@code order}
+     */
+    @Nullable
+    public final HistogramOrder order() {
+        return this.order;
+    }
+
+    /**
+     * API name: {@code params}
+     */
+    public final Map<String, JsonData> params() {
+        return this.params;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final Script script() {
+        return this.script;
+    }
+
+    /**
+     * API name: {@code time_zone}
+     */
+    @Nullable
+    public final String timeZone() {
+        return this.timeZone;
+    }
+
+    /**
+     * API name: {@code keyed}
+     */
+    @Nullable
+    public final Boolean keyed() {
+        return this.keyed;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.calendarInterval != null) {
+            generator.writeKey("calendar_interval");
+            this.calendarInterval.serialize(generator, mapper);
+        }
+        if (this.extendedBounds != null) {
+            generator.writeKey("extended_bounds");
+            this.extendedBounds.serialize(generator, mapper);
+
+        }
+        if (this.hardBounds != null) {
+            generator.writeKey("hard_bounds");
+            this.hardBounds.serialize(generator, mapper);
+
+        }
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (this.fixedInterval != null) {
+            generator.writeKey("fixed_interval");
+            this.fixedInterval.serialize(generator, mapper);
+
+        }
+        if (this.format != null) {
+            generator.writeKey("format");
+            generator.write(this.format);
+
+        }
+        if (this.interval != null) {
+            generator.writeKey("interval");
+            this.interval.serialize(generator, mapper);
+
+        }
+        if (this.minDocCount != null) {
+            generator.writeKey("min_doc_count");
+            generator.write(this.minDocCount);
+
+        }
+        if (this.missing != null) {
+            generator.writeKey("missing");
+            generator.write(this.missing);
+
+        }
+        if (this.offset != null) {
+            generator.writeKey("offset");
+            this.offset.serialize(generator, mapper);
+
+        }
+        if (this.order != null) {
+            generator.writeKey("order");
+            this.order.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.params)) {
+            generator.writeKey("params");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+        if (this.timeZone != null) {
+            generator.writeKey("time_zone");
+            generator.write(this.timeZone);
+
+        }
+        if (this.keyed != null) {
+            generator.writeKey("keyed");
+            generator.write(this.keyed);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DateHistogramAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<DateHistogramAggregation> {
+        @Nullable
+        private CalendarInterval calendarInterval;
+
+        @Nullable
+        private ExtendedBounds<FieldDateMath> extendedBounds;
+
+        @Nullable
+        private ExtendedBounds<FieldDateMath> hardBounds;
+
+        @Nullable
+        private String field;
+
+        @Nullable
+        private Time fixedInterval;
+
+        @Nullable
+        private String format;
+
+        @Nullable
+        private Time interval;
+
+        @Nullable
+        private Integer minDocCount;
+
+        @Nullable
+        private String missing;
+
+        @Nullable
+        private Time offset;
+
+        @Nullable
+        private HistogramOrder order;
+
+        @Nullable
+        private Map<String, JsonData> params;
+
+        @Nullable
+        private Script script;
+
+        @Nullable
+        private String timeZone;
+
+        @Nullable
+        private Boolean keyed;
+
+        /**
+         * API name: {@code calendar_interval}
+         */
+        public final Builder calendarInterval(@Nullable CalendarInterval value) {
+            this.calendarInterval = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code extended_bounds}
+         */
+        public final Builder extendedBounds(@Nullable ExtendedBounds<FieldDateMath> value) {
+            this.extendedBounds = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code extended_bounds}
+         */
+        public final Builder extendedBounds(
+            Function<ExtendedBounds.Builder<FieldDateMath>, ObjectBuilder<ExtendedBounds<FieldDateMath>>> fn
+        ) {
+            return this.extendedBounds(fn.apply(new ExtendedBounds.Builder<FieldDateMath>()).build());
+        }
+
+        /**
+         * API name: {@code hard_bounds}
+         */
+        public final Builder hardBounds(@Nullable ExtendedBounds<FieldDateMath> value) {
+            this.hardBounds = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code hard_bounds}
+         */
+        public final Builder hardBounds(Function<ExtendedBounds.Builder<FieldDateMath>, ObjectBuilder<ExtendedBounds<FieldDateMath>>> fn) {
+            return this.hardBounds(fn.apply(new ExtendedBounds.Builder<FieldDateMath>()).build());
+        }
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fixed_interval}
+         */
+        public final Builder fixedInterval(@Nullable Time value) {
+            this.fixedInterval = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fixed_interval}
+         */
+        public final Builder fixedInterval(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.fixedInterval(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code format}
+         */
+        public final Builder format(@Nullable String value) {
+            this.format = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code interval}
+         */
+        public final Builder interval(@Nullable Time value) {
+            this.interval = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code interval}
+         */
+        public final Builder interval(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.interval(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code min_doc_count}
+         */
+        public final Builder minDocCount(@Nullable Integer value) {
+            this.minDocCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code missing}
+         */
+        public final Builder missing(@Nullable String value) {
+            this.missing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code offset}
+         */
+        public final Builder offset(@Nullable Time value) {
+            this.offset = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code offset}
+         */
+        public final Builder offset(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.offset(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code order}
+         */
+        public final Builder order(@Nullable HistogramOrder value) {
+            this.order = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code order}
+         */
+        public final Builder order(Function<HistogramOrder.Builder, ObjectBuilder<HistogramOrder>> fn) {
+            return this.order(fn.apply(new HistogramOrder.Builder()).build());
+        }
+
+        /**
+         * API name: {@code params}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>params</code>.
+         */
+        public final Builder params(Map<String, JsonData> map) {
+            this.params = _mapPutAll(this.params, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code params}
+         * <p>
+         * Adds an entry to <code>params</code>.
+         */
+        public final Builder params(String key, JsonData value) {
+            this.params = _mapPut(this.params, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(@Nullable Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * API name: {@code time_zone}
+         */
+        public final Builder timeZone(@Nullable String value) {
+            this.timeZone = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code keyed}
+         */
+        public final Builder keyed(@Nullable Boolean value) {
+            this.keyed = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DateHistogramAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DateHistogramAggregation build() {
+            _checkSingleUse();
+
+            return new DateHistogramAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DateHistogramAggregation}
+     */
+    public static final JsonpDeserializer<DateHistogramAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DateHistogramAggregation::setupDateHistogramAggregationDeserializer
+    );
+
+    protected static void setupDateHistogramAggregationDeserializer(ObjectDeserializer<DateHistogramAggregation.Builder> op) {
+        setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::calendarInterval, CalendarInterval._DESERIALIZER, "calendar_interval");
+        op.add(Builder::extendedBounds, ExtendedBounds.createExtendedBoundsDeserializer(FieldDateMath._DESERIALIZER), "extended_bounds");
+        op.add(Builder::hardBounds, ExtendedBounds.createExtendedBoundsDeserializer(FieldDateMath._DESERIALIZER), "hard_bounds");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::fixedInterval, Time._DESERIALIZER, "fixed_interval");
+        op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
+        op.add(Builder::interval, Time._DESERIALIZER, "interval");
+        op.add(Builder::minDocCount, JsonpDeserializer.integerDeserializer(), "min_doc_count");
+        op.add(Builder::missing, JsonpDeserializer.stringDeserializer(), "missing");
+        op.add(Builder::offset, Time._DESERIALIZER, "offset");
+        op.add(Builder::order, HistogramOrder._DESERIALIZER, "order");
+        op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+        op.add(Builder::timeZone, JsonpDeserializer.stringDeserializer(), "time_zone");
+        op.add(Builder::keyed, JsonpDeserializer.booleanDeserializer(), "keyed");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateHistogramBucket.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateHistogramBucket.java
index 9666ff3c8f..a54141cb0f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateHistogramBucket.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateHistogramBucket.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,122 +42,119 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.DateHistogramBucket
 
 @JsonpDeserializable
 public class DateHistogramBucket extends MultiBucketBase {
-	@Nullable
-	private final String keyAsString;
-
-	private final String key;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DateHistogramBucket(Builder builder) {
-		super(builder);
-
-		this.keyAsString = builder.keyAsString;
-		this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
-
-	}
-
-	public static DateHistogramBucket of(Function<Builder, ObjectBuilder<DateHistogramBucket>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code key_as_string}
-	 */
-	@Nullable
-	public final String keyAsString() {
-		return this.keyAsString;
-	}
-
-	/**
-	 * Required - API name: {@code key}
-	 */
-	public final String key() {
-		return this.key;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.keyAsString != null) {
-			generator.writeKey("key_as_string");
-			generator.write(this.keyAsString);
-
-		}
-		generator.writeKey("key");
-		generator.write(this.key);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DateHistogramBucket}.
-	 */
-
-	public static class Builder extends MultiBucketBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DateHistogramBucket> {
-		@Nullable
-		private String keyAsString;
-
-		private String key;
-
-		/**
-		 * API name: {@code key_as_string}
-		 */
-		public final Builder keyAsString(@Nullable String value) {
-			this.keyAsString = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code key}
-		 */
-		public final Builder key(String value) {
-			this.key = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DateHistogramBucket}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DateHistogramBucket build() {
-			_checkSingleUse();
-
-			return new DateHistogramBucket(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DateHistogramBucket}
-	 */
-	public static final JsonpDeserializer<DateHistogramBucket> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DateHistogramBucket::setupDateHistogramBucketDeserializer);
-
-	protected static void setupDateHistogramBucketDeserializer(ObjectDeserializer<DateHistogramBucket.Builder> op) {
-		setupMultiBucketBaseDeserializer(op);
-		op.add(Builder::keyAsString, JsonpDeserializer.stringDeserializer(), "key_as_string");
-		op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
-
-	}
+    @Nullable
+    private final String keyAsString;
+
+    private final String key;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DateHistogramBucket(Builder builder) {
+        super(builder);
+
+        this.keyAsString = builder.keyAsString;
+        this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
+
+    }
+
+    public static DateHistogramBucket of(Function<Builder, ObjectBuilder<DateHistogramBucket>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code key_as_string}
+     */
+    @Nullable
+    public final String keyAsString() {
+        return this.keyAsString;
+    }
+
+    /**
+     * Required - API name: {@code key}
+     */
+    public final String key() {
+        return this.key;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.keyAsString != null) {
+            generator.writeKey("key_as_string");
+            generator.write(this.keyAsString);
+
+        }
+        generator.writeKey("key");
+        generator.write(this.key);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DateHistogramBucket}.
+     */
+
+    public static class Builder extends MultiBucketBase.AbstractBuilder<Builder> implements ObjectBuilder<DateHistogramBucket> {
+        @Nullable
+        private String keyAsString;
+
+        private String key;
+
+        /**
+         * API name: {@code key_as_string}
+         */
+        public final Builder keyAsString(@Nullable String value) {
+            this.keyAsString = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code key}
+         */
+        public final Builder key(String value) {
+            this.key = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DateHistogramBucket}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DateHistogramBucket build() {
+            _checkSingleUse();
+
+            return new DateHistogramBucket(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DateHistogramBucket}
+     */
+    public static final JsonpDeserializer<DateHistogramBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DateHistogramBucket::setupDateHistogramBucketDeserializer
+    );
+
+    protected static void setupDateHistogramBucketDeserializer(ObjectDeserializer<DateHistogramBucket.Builder> op) {
+        setupMultiBucketBaseDeserializer(op);
+        op.add(Builder::keyAsString, JsonpDeserializer.stringDeserializer(), "key_as_string");
+        op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateRangeAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateRangeAggregate.java
index ef49a878da..7196a6dbc8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateRangeAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateRangeAggregate.java
@@ -32,14 +32,13 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.DateRangeAggregate
 
 /**
@@ -47,67 +46,67 @@
  * <code>range</code> aggregation: <code>from</code> and <code>to</code> in
  * <code>buckets</code> are milliseconds since the Epoch, represented as a
  * floating point number.
- * 
+ *
  */
 @JsonpDeserializable
 public class DateRangeAggregate extends RangeAggregate implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private DateRangeAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static DateRangeAggregate of(Function<Builder, ObjectBuilder<DateRangeAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.DateRange;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DateRangeAggregate}.
-	 */
-
-	public static class Builder extends RangeAggregate.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DateRangeAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DateRangeAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DateRangeAggregate build() {
-			_checkSingleUse();
-
-			return new DateRangeAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DateRangeAggregate}
-	 */
-	public static final JsonpDeserializer<DateRangeAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DateRangeAggregate::setupDateRangeAggregateDeserializer);
-
-	protected static void setupDateRangeAggregateDeserializer(ObjectDeserializer<DateRangeAggregate.Builder> op) {
-		RangeAggregate.setupRangeAggregateDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private DateRangeAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static DateRangeAggregate of(Function<Builder, ObjectBuilder<DateRangeAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.DateRange;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DateRangeAggregate}.
+     */
+
+    public static class Builder extends RangeAggregate.AbstractBuilder<Builder> implements ObjectBuilder<DateRangeAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DateRangeAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DateRangeAggregate build() {
+            _checkSingleUse();
+
+            return new DateRangeAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DateRangeAggregate}
+     */
+    public static final JsonpDeserializer<DateRangeAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DateRangeAggregate::setupDateRangeAggregateDeserializer
+    );
+
+    protected static void setupDateRangeAggregateDeserializer(ObjectDeserializer<DateRangeAggregate.Builder> op) {
+        RangeAggregate.setupRangeAggregateDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateRangeAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateRangeAggregation.java
index 6f121233c8..171a97d78d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateRangeAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateRangeAggregation.java
@@ -32,292 +32,292 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.FieldValue;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.FieldValue;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.DateRangeAggregation
 
 @JsonpDeserializable
 public class DateRangeAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final String field;
-
-	@Nullable
-	private final String format;
-
-	@Nullable
-	private final FieldValue missing;
-
-	private final List<DateRangeExpression> ranges;
-
-	@Nullable
-	private final String timeZone;
-
-	@Nullable
-	private final Boolean keyed;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DateRangeAggregation(Builder builder) {
-		super(builder);
-
-		this.field = builder.field;
-		this.format = builder.format;
-		this.missing = builder.missing;
-		this.ranges = ApiTypeHelper.unmodifiable(builder.ranges);
-		this.timeZone = builder.timeZone;
-		this.keyed = builder.keyed;
-
-	}
-
-	public static DateRangeAggregation of(Function<Builder, ObjectBuilder<DateRangeAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.DateRange;
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code format}
-	 */
-	@Nullable
-	public final String format() {
-		return this.format;
-	}
-
-	/**
-	 * API name: {@code missing}
-	 */
-	@Nullable
-	public final FieldValue missing() {
-		return this.missing;
-	}
-
-	/**
-	 * API name: {@code ranges}
-	 */
-	public final List<DateRangeExpression> ranges() {
-		return this.ranges;
-	}
-
-	/**
-	 * API name: {@code time_zone}
-	 */
-	@Nullable
-	public final String timeZone() {
-		return this.timeZone;
-	}
-
-	/**
-	 * API name: {@code keyed}
-	 */
-	@Nullable
-	public final Boolean keyed() {
-		return this.keyed;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (this.format != null) {
-			generator.writeKey("format");
-			generator.write(this.format);
-
-		}
-		if (this.missing != null) {
-			generator.writeKey("missing");
-			this.missing.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.ranges)) {
-			generator.writeKey("ranges");
-			generator.writeStartArray();
-			for (DateRangeExpression item0 : this.ranges) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.timeZone != null) {
-			generator.writeKey("time_zone");
-			generator.write(this.timeZone);
-
-		}
-		if (this.keyed != null) {
-			generator.writeKey("keyed");
-			generator.write(this.keyed);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DateRangeAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DateRangeAggregation> {
-		@Nullable
-		private String field;
-
-		@Nullable
-		private String format;
-
-		@Nullable
-		private FieldValue missing;
-
-		@Nullable
-		private List<DateRangeExpression> ranges;
-
-		@Nullable
-		private String timeZone;
-
-		@Nullable
-		private Boolean keyed;
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code format}
-		 */
-		public final Builder format(@Nullable String value) {
-			this.format = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code missing}
-		 */
-		public final Builder missing(@Nullable FieldValue value) {
-			this.missing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code missing}
-		 */
-		public final Builder missing(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
-			return this.missing(fn.apply(new FieldValue.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code ranges}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>ranges</code>.
-		 */
-		public final Builder ranges(List<DateRangeExpression> list) {
-			this.ranges = _listAddAll(this.ranges, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code ranges}
-		 * <p>
-		 * Adds one or more values to <code>ranges</code>.
-		 */
-		public final Builder ranges(DateRangeExpression value, DateRangeExpression... values) {
-			this.ranges = _listAdd(this.ranges, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code ranges}
-		 * <p>
-		 * Adds a value to <code>ranges</code> using a builder lambda.
-		 */
-		public final Builder ranges(Function<DateRangeExpression.Builder, ObjectBuilder<DateRangeExpression>> fn) {
-			return ranges(fn.apply(new DateRangeExpression.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code time_zone}
-		 */
-		public final Builder timeZone(@Nullable String value) {
-			this.timeZone = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code keyed}
-		 */
-		public final Builder keyed(@Nullable Boolean value) {
-			this.keyed = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DateRangeAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DateRangeAggregation build() {
-			_checkSingleUse();
-
-			return new DateRangeAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DateRangeAggregation}
-	 */
-	public static final JsonpDeserializer<DateRangeAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DateRangeAggregation::setupDateRangeAggregationDeserializer);
-
-	protected static void setupDateRangeAggregationDeserializer(ObjectDeserializer<DateRangeAggregation.Builder> op) {
-		setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
-		op.add(Builder::missing, FieldValue._DESERIALIZER, "missing");
-		op.add(Builder::ranges, JsonpDeserializer.arrayDeserializer(DateRangeExpression._DESERIALIZER), "ranges");
-		op.add(Builder::timeZone, JsonpDeserializer.stringDeserializer(), "time_zone");
-		op.add(Builder::keyed, JsonpDeserializer.booleanDeserializer(), "keyed");
-
-	}
+    @Nullable
+    private final String field;
+
+    @Nullable
+    private final String format;
+
+    @Nullable
+    private final FieldValue missing;
+
+    private final List<DateRangeExpression> ranges;
+
+    @Nullable
+    private final String timeZone;
+
+    @Nullable
+    private final Boolean keyed;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DateRangeAggregation(Builder builder) {
+        super(builder);
+
+        this.field = builder.field;
+        this.format = builder.format;
+        this.missing = builder.missing;
+        this.ranges = ApiTypeHelper.unmodifiable(builder.ranges);
+        this.timeZone = builder.timeZone;
+        this.keyed = builder.keyed;
+
+    }
+
+    public static DateRangeAggregation of(Function<Builder, ObjectBuilder<DateRangeAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.DateRange;
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code format}
+     */
+    @Nullable
+    public final String format() {
+        return this.format;
+    }
+
+    /**
+     * API name: {@code missing}
+     */
+    @Nullable
+    public final FieldValue missing() {
+        return this.missing;
+    }
+
+    /**
+     * API name: {@code ranges}
+     */
+    public final List<DateRangeExpression> ranges() {
+        return this.ranges;
+    }
+
+    /**
+     * API name: {@code time_zone}
+     */
+    @Nullable
+    public final String timeZone() {
+        return this.timeZone;
+    }
+
+    /**
+     * API name: {@code keyed}
+     */
+    @Nullable
+    public final Boolean keyed() {
+        return this.keyed;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (this.format != null) {
+            generator.writeKey("format");
+            generator.write(this.format);
+
+        }
+        if (this.missing != null) {
+            generator.writeKey("missing");
+            this.missing.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.ranges)) {
+            generator.writeKey("ranges");
+            generator.writeStartArray();
+            for (DateRangeExpression item0 : this.ranges) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.timeZone != null) {
+            generator.writeKey("time_zone");
+            generator.write(this.timeZone);
+
+        }
+        if (this.keyed != null) {
+            generator.writeKey("keyed");
+            generator.write(this.keyed);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DateRangeAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<DateRangeAggregation> {
+        @Nullable
+        private String field;
+
+        @Nullable
+        private String format;
+
+        @Nullable
+        private FieldValue missing;
+
+        @Nullable
+        private List<DateRangeExpression> ranges;
+
+        @Nullable
+        private String timeZone;
+
+        @Nullable
+        private Boolean keyed;
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code format}
+         */
+        public final Builder format(@Nullable String value) {
+            this.format = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code missing}
+         */
+        public final Builder missing(@Nullable FieldValue value) {
+            this.missing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code missing}
+         */
+        public final Builder missing(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
+            return this.missing(fn.apply(new FieldValue.Builder()).build());
+        }
+
+        /**
+         * API name: {@code ranges}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>ranges</code>.
+         */
+        public final Builder ranges(List<DateRangeExpression> list) {
+            this.ranges = _listAddAll(this.ranges, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code ranges}
+         * <p>
+         * Adds one or more values to <code>ranges</code>.
+         */
+        public final Builder ranges(DateRangeExpression value, DateRangeExpression... values) {
+            this.ranges = _listAdd(this.ranges, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code ranges}
+         * <p>
+         * Adds a value to <code>ranges</code> using a builder lambda.
+         */
+        public final Builder ranges(Function<DateRangeExpression.Builder, ObjectBuilder<DateRangeExpression>> fn) {
+            return ranges(fn.apply(new DateRangeExpression.Builder()).build());
+        }
+
+        /**
+         * API name: {@code time_zone}
+         */
+        public final Builder timeZone(@Nullable String value) {
+            this.timeZone = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code keyed}
+         */
+        public final Builder keyed(@Nullable Boolean value) {
+            this.keyed = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DateRangeAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DateRangeAggregation build() {
+            _checkSingleUse();
+
+            return new DateRangeAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DateRangeAggregation}
+     */
+    public static final JsonpDeserializer<DateRangeAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DateRangeAggregation::setupDateRangeAggregationDeserializer
+    );
+
+    protected static void setupDateRangeAggregationDeserializer(ObjectDeserializer<DateRangeAggregation.Builder> op) {
+        setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
+        op.add(Builder::missing, FieldValue._DESERIALIZER, "missing");
+        op.add(Builder::ranges, JsonpDeserializer.arrayDeserializer(DateRangeExpression._DESERIALIZER), "ranges");
+        op.add(Builder::timeZone, JsonpDeserializer.stringDeserializer(), "time_zone");
+        op.add(Builder::keyed, JsonpDeserializer.booleanDeserializer(), "keyed");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateRangeExpression.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateRangeExpression.java
index 28395a066e..9ed347c446 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateRangeExpression.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DateRangeExpression.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,171 +43,170 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.DateRangeExpression
 
 @JsonpDeserializable
 public class DateRangeExpression implements JsonpSerializable {
-	@Nullable
-	private final FieldDateMath from;
-
-	@Nullable
-	private final String key;
-
-	@Nullable
-	private final FieldDateMath to;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DateRangeExpression(Builder builder) {
-
-		this.from = builder.from;
-		this.key = builder.key;
-		this.to = builder.to;
-
-	}
-
-	public static DateRangeExpression of(Function<Builder, ObjectBuilder<DateRangeExpression>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code from}
-	 */
-	@Nullable
-	public final FieldDateMath from() {
-		return this.from;
-	}
-
-	/**
-	 * API name: {@code key}
-	 */
-	@Nullable
-	public final String key() {
-		return this.key;
-	}
-
-	/**
-	 * API name: {@code to}
-	 */
-	@Nullable
-	public final FieldDateMath to() {
-		return this.to;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.from != null) {
-			generator.writeKey("from");
-			this.from.serialize(generator, mapper);
-
-		}
-		if (this.key != null) {
-			generator.writeKey("key");
-			generator.write(this.key);
-
-		}
-		if (this.to != null) {
-			generator.writeKey("to");
-			this.to.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DateRangeExpression}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DateRangeExpression> {
-		@Nullable
-		private FieldDateMath from;
-
-		@Nullable
-		private String key;
-
-		@Nullable
-		private FieldDateMath to;
-
-		/**
-		 * API name: {@code from}
-		 */
-		public final Builder from(@Nullable FieldDateMath value) {
-			this.from = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code from}
-		 */
-		public final Builder from(Function<FieldDateMath.Builder, ObjectBuilder<FieldDateMath>> fn) {
-			return this.from(fn.apply(new FieldDateMath.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code key}
-		 */
-		public final Builder key(@Nullable String value) {
-			this.key = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code to}
-		 */
-		public final Builder to(@Nullable FieldDateMath value) {
-			this.to = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code to}
-		 */
-		public final Builder to(Function<FieldDateMath.Builder, ObjectBuilder<FieldDateMath>> fn) {
-			return this.to(fn.apply(new FieldDateMath.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link DateRangeExpression}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DateRangeExpression build() {
-			_checkSingleUse();
-
-			return new DateRangeExpression(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DateRangeExpression}
-	 */
-	public static final JsonpDeserializer<DateRangeExpression> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DateRangeExpression::setupDateRangeExpressionDeserializer);
-
-	protected static void setupDateRangeExpressionDeserializer(ObjectDeserializer<DateRangeExpression.Builder> op) {
-
-		op.add(Builder::from, FieldDateMath._DESERIALIZER, "from");
-		op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
-		op.add(Builder::to, FieldDateMath._DESERIALIZER, "to");
-
-	}
+    @Nullable
+    private final FieldDateMath from;
+
+    @Nullable
+    private final String key;
+
+    @Nullable
+    private final FieldDateMath to;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DateRangeExpression(Builder builder) {
+
+        this.from = builder.from;
+        this.key = builder.key;
+        this.to = builder.to;
+
+    }
+
+    public static DateRangeExpression of(Function<Builder, ObjectBuilder<DateRangeExpression>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code from}
+     */
+    @Nullable
+    public final FieldDateMath from() {
+        return this.from;
+    }
+
+    /**
+     * API name: {@code key}
+     */
+    @Nullable
+    public final String key() {
+        return this.key;
+    }
+
+    /**
+     * API name: {@code to}
+     */
+    @Nullable
+    public final FieldDateMath to() {
+        return this.to;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.from != null) {
+            generator.writeKey("from");
+            this.from.serialize(generator, mapper);
+
+        }
+        if (this.key != null) {
+            generator.writeKey("key");
+            generator.write(this.key);
+
+        }
+        if (this.to != null) {
+            generator.writeKey("to");
+            this.to.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DateRangeExpression}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DateRangeExpression> {
+        @Nullable
+        private FieldDateMath from;
+
+        @Nullable
+        private String key;
+
+        @Nullable
+        private FieldDateMath to;
+
+        /**
+         * API name: {@code from}
+         */
+        public final Builder from(@Nullable FieldDateMath value) {
+            this.from = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code from}
+         */
+        public final Builder from(Function<FieldDateMath.Builder, ObjectBuilder<FieldDateMath>> fn) {
+            return this.from(fn.apply(new FieldDateMath.Builder()).build());
+        }
+
+        /**
+         * API name: {@code key}
+         */
+        public final Builder key(@Nullable String value) {
+            this.key = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code to}
+         */
+        public final Builder to(@Nullable FieldDateMath value) {
+            this.to = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code to}
+         */
+        public final Builder to(Function<FieldDateMath.Builder, ObjectBuilder<FieldDateMath>> fn) {
+            return this.to(fn.apply(new FieldDateMath.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link DateRangeExpression}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DateRangeExpression build() {
+            _checkSingleUse();
+
+            return new DateRangeExpression(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DateRangeExpression}
+     */
+    public static final JsonpDeserializer<DateRangeExpression> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DateRangeExpression::setupDateRangeExpressionDeserializer
+    );
+
+    protected static void setupDateRangeExpressionDeserializer(ObjectDeserializer<DateRangeExpression.Builder> op) {
+
+        op.add(Builder::from, FieldDateMath._DESERIALIZER, "from");
+        op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
+        op.add(Builder::to, FieldDateMath._DESERIALIZER, "to");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DerivativeAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DerivativeAggregate.java
index 1cb424b4e3..e6925c58c9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DerivativeAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DerivativeAggregate.java
@@ -32,142 +32,142 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.DerivativeAggregate
 
 @JsonpDeserializable
 public class DerivativeAggregate extends SingleMetricAggregateBase implements AggregateVariant {
-	@Nullable
-	private final Double normalizedValue;
-
-	@Nullable
-	private final String normalizedValueAsString;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DerivativeAggregate(Builder builder) {
-		super(builder);
-
-		this.normalizedValue = builder.normalizedValue;
-		this.normalizedValueAsString = builder.normalizedValueAsString;
-
-	}
-
-	public static DerivativeAggregate of(Function<Builder, ObjectBuilder<DerivativeAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Derivative;
-	}
-
-	/**
-	 * API name: {@code normalized_value}
-	 */
-	@Nullable
-	public final Double normalizedValue() {
-		return this.normalizedValue;
-	}
-
-	/**
-	 * API name: {@code normalized_value_as_string}
-	 */
-	@Nullable
-	public final String normalizedValueAsString() {
-		return this.normalizedValueAsString;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.normalizedValue != null) {
-			generator.writeKey("normalized_value");
-			generator.write(this.normalizedValue);
-
-		}
-		if (this.normalizedValueAsString != null) {
-			generator.writeKey("normalized_value_as_string");
-			generator.write(this.normalizedValueAsString);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DerivativeAggregate}.
-	 */
-
-	public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DerivativeAggregate> {
-		@Nullable
-		private Double normalizedValue;
-
-		@Nullable
-		private String normalizedValueAsString;
-
-		/**
-		 * API name: {@code normalized_value}
-		 */
-		public final Builder normalizedValue(@Nullable Double value) {
-			this.normalizedValue = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code normalized_value_as_string}
-		 */
-		public final Builder normalizedValueAsString(@Nullable String value) {
-			this.normalizedValueAsString = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DerivativeAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DerivativeAggregate build() {
-			_checkSingleUse();
-
-			return new DerivativeAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DerivativeAggregate}
-	 */
-	public static final JsonpDeserializer<DerivativeAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DerivativeAggregate::setupDerivativeAggregateDeserializer);
-
-	protected static void setupDerivativeAggregateDeserializer(ObjectDeserializer<DerivativeAggregate.Builder> op) {
-		setupSingleMetricAggregateBaseDeserializer(op);
-		op.add(Builder::normalizedValue, JsonpDeserializer.doubleDeserializer(), "normalized_value");
-		op.add(Builder::normalizedValueAsString, JsonpDeserializer.stringDeserializer(), "normalized_value_as_string");
-
-	}
+    @Nullable
+    private final Double normalizedValue;
+
+    @Nullable
+    private final String normalizedValueAsString;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DerivativeAggregate(Builder builder) {
+        super(builder);
+
+        this.normalizedValue = builder.normalizedValue;
+        this.normalizedValueAsString = builder.normalizedValueAsString;
+
+    }
+
+    public static DerivativeAggregate of(Function<Builder, ObjectBuilder<DerivativeAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Derivative;
+    }
+
+    /**
+     * API name: {@code normalized_value}
+     */
+    @Nullable
+    public final Double normalizedValue() {
+        return this.normalizedValue;
+    }
+
+    /**
+     * API name: {@code normalized_value_as_string}
+     */
+    @Nullable
+    public final String normalizedValueAsString() {
+        return this.normalizedValueAsString;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.normalizedValue != null) {
+            generator.writeKey("normalized_value");
+            generator.write(this.normalizedValue);
+
+        }
+        if (this.normalizedValueAsString != null) {
+            generator.writeKey("normalized_value_as_string");
+            generator.write(this.normalizedValueAsString);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DerivativeAggregate}.
+     */
+
+    public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<DerivativeAggregate> {
+        @Nullable
+        private Double normalizedValue;
+
+        @Nullable
+        private String normalizedValueAsString;
+
+        /**
+         * API name: {@code normalized_value}
+         */
+        public final Builder normalizedValue(@Nullable Double value) {
+            this.normalizedValue = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code normalized_value_as_string}
+         */
+        public final Builder normalizedValueAsString(@Nullable String value) {
+            this.normalizedValueAsString = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DerivativeAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DerivativeAggregate build() {
+            _checkSingleUse();
+
+            return new DerivativeAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DerivativeAggregate}
+     */
+    public static final JsonpDeserializer<DerivativeAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DerivativeAggregate::setupDerivativeAggregateDeserializer
+    );
+
+    protected static void setupDerivativeAggregateDeserializer(ObjectDeserializer<DerivativeAggregate.Builder> op) {
+        setupSingleMetricAggregateBaseDeserializer(op);
+        op.add(Builder::normalizedValue, JsonpDeserializer.doubleDeserializer(), "normalized_value");
+        op.add(Builder::normalizedValueAsString, JsonpDeserializer.stringDeserializer(), "normalized_value_as_string");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DerivativeAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DerivativeAggregation.java
index 61c74424d0..c58e3842b6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DerivativeAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DerivativeAggregation.java
@@ -32,75 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.DerivativeAggregation
 
 @JsonpDeserializable
 public class DerivativeAggregation extends PipelineAggregationBase implements AggregationVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private DerivativeAggregation(Builder builder) {
-		super(builder);
-
-	}
-
-	public static DerivativeAggregation of(Function<Builder, ObjectBuilder<DerivativeAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Derivative;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DerivativeAggregation}.
-	 */
-
-	public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DerivativeAggregation> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DerivativeAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DerivativeAggregation build() {
-			_checkSingleUse();
-
-			return new DerivativeAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DerivativeAggregation}
-	 */
-	public static final JsonpDeserializer<DerivativeAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DerivativeAggregation::setupDerivativeAggregationDeserializer);
-
-	protected static void setupDerivativeAggregationDeserializer(ObjectDeserializer<DerivativeAggregation.Builder> op) {
-		PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private DerivativeAggregation(Builder builder) {
+        super(builder);
+
+    }
+
+    public static DerivativeAggregation of(Function<Builder, ObjectBuilder<DerivativeAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Derivative;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DerivativeAggregation}.
+     */
+
+    public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<DerivativeAggregation> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DerivativeAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DerivativeAggregation build() {
+            _checkSingleUse();
+
+            return new DerivativeAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DerivativeAggregation}
+     */
+    public static final JsonpDeserializer<DerivativeAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DerivativeAggregation::setupDerivativeAggregationDeserializer
+    );
+
+    protected static void setupDerivativeAggregationDeserializer(ObjectDeserializer<DerivativeAggregation.Builder> op) {
+        PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DiversifiedSamplerAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DiversifiedSamplerAggregation.java
index 9bd8cf61e0..abc6dccca3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DiversifiedSamplerAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DiversifiedSamplerAggregation.java
@@ -32,237 +32,238 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.DiversifiedSamplerAggregation
 
 @JsonpDeserializable
 public class DiversifiedSamplerAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final SamplerAggregationExecutionHint executionHint;
-
-	@Nullable
-	private final Integer maxDocsPerValue;
-
-	@Nullable
-	private final Script script;
-
-	@Nullable
-	private final Integer shardSize;
-
-	@Nullable
-	private final String field;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DiversifiedSamplerAggregation(Builder builder) {
-		super(builder);
-
-		this.executionHint = builder.executionHint;
-		this.maxDocsPerValue = builder.maxDocsPerValue;
-		this.script = builder.script;
-		this.shardSize = builder.shardSize;
-		this.field = builder.field;
-
-	}
-
-	public static DiversifiedSamplerAggregation of(Function<Builder, ObjectBuilder<DiversifiedSamplerAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.DiversifiedSampler;
-	}
-
-	/**
-	 * API name: {@code execution_hint}
-	 */
-	@Nullable
-	public final SamplerAggregationExecutionHint executionHint() {
-		return this.executionHint;
-	}
-
-	/**
-	 * API name: {@code max_docs_per_value}
-	 */
-	@Nullable
-	public final Integer maxDocsPerValue() {
-		return this.maxDocsPerValue;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final Script script() {
-		return this.script;
-	}
-
-	/**
-	 * API name: {@code shard_size}
-	 */
-	@Nullable
-	public final Integer shardSize() {
-		return this.shardSize;
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.executionHint != null) {
-			generator.writeKey("execution_hint");
-			this.executionHint.serialize(generator, mapper);
-		}
-		if (this.maxDocsPerValue != null) {
-			generator.writeKey("max_docs_per_value");
-			generator.write(this.maxDocsPerValue);
-
-		}
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-		if (this.shardSize != null) {
-			generator.writeKey("shard_size");
-			generator.write(this.shardSize);
-
-		}
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DiversifiedSamplerAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DiversifiedSamplerAggregation> {
-		@Nullable
-		private SamplerAggregationExecutionHint executionHint;
-
-		@Nullable
-		private Integer maxDocsPerValue;
-
-		@Nullable
-		private Script script;
-
-		@Nullable
-		private Integer shardSize;
-
-		@Nullable
-		private String field;
-
-		/**
-		 * API name: {@code execution_hint}
-		 */
-		public final Builder executionHint(@Nullable SamplerAggregationExecutionHint value) {
-			this.executionHint = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_docs_per_value}
-		 */
-		public final Builder maxDocsPerValue(@Nullable Integer value) {
-			this.maxDocsPerValue = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(@Nullable Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code shard_size}
-		 */
-		public final Builder shardSize(@Nullable Integer value) {
-			this.shardSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DiversifiedSamplerAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DiversifiedSamplerAggregation build() {
-			_checkSingleUse();
-
-			return new DiversifiedSamplerAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DiversifiedSamplerAggregation}
-	 */
-	public static final JsonpDeserializer<DiversifiedSamplerAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DiversifiedSamplerAggregation::setupDiversifiedSamplerAggregationDeserializer);
-
-	protected static void setupDiversifiedSamplerAggregationDeserializer(
-			ObjectDeserializer<DiversifiedSamplerAggregation.Builder> op) {
-		BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::executionHint, SamplerAggregationExecutionHint._DESERIALIZER, "execution_hint");
-		op.add(Builder::maxDocsPerValue, JsonpDeserializer.integerDeserializer(), "max_docs_per_value");
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-		op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-
-	}
+    @Nullable
+    private final SamplerAggregationExecutionHint executionHint;
+
+    @Nullable
+    private final Integer maxDocsPerValue;
+
+    @Nullable
+    private final Script script;
+
+    @Nullable
+    private final Integer shardSize;
+
+    @Nullable
+    private final String field;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DiversifiedSamplerAggregation(Builder builder) {
+        super(builder);
+
+        this.executionHint = builder.executionHint;
+        this.maxDocsPerValue = builder.maxDocsPerValue;
+        this.script = builder.script;
+        this.shardSize = builder.shardSize;
+        this.field = builder.field;
+
+    }
+
+    public static DiversifiedSamplerAggregation of(Function<Builder, ObjectBuilder<DiversifiedSamplerAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.DiversifiedSampler;
+    }
+
+    /**
+     * API name: {@code execution_hint}
+     */
+    @Nullable
+    public final SamplerAggregationExecutionHint executionHint() {
+        return this.executionHint;
+    }
+
+    /**
+     * API name: {@code max_docs_per_value}
+     */
+    @Nullable
+    public final Integer maxDocsPerValue() {
+        return this.maxDocsPerValue;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final Script script() {
+        return this.script;
+    }
+
+    /**
+     * API name: {@code shard_size}
+     */
+    @Nullable
+    public final Integer shardSize() {
+        return this.shardSize;
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.executionHint != null) {
+            generator.writeKey("execution_hint");
+            this.executionHint.serialize(generator, mapper);
+        }
+        if (this.maxDocsPerValue != null) {
+            generator.writeKey("max_docs_per_value");
+            generator.write(this.maxDocsPerValue);
+
+        }
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+        if (this.shardSize != null) {
+            generator.writeKey("shard_size");
+            generator.write(this.shardSize);
+
+        }
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DiversifiedSamplerAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<DiversifiedSamplerAggregation> {
+        @Nullable
+        private SamplerAggregationExecutionHint executionHint;
+
+        @Nullable
+        private Integer maxDocsPerValue;
+
+        @Nullable
+        private Script script;
+
+        @Nullable
+        private Integer shardSize;
+
+        @Nullable
+        private String field;
+
+        /**
+         * API name: {@code execution_hint}
+         */
+        public final Builder executionHint(@Nullable SamplerAggregationExecutionHint value) {
+            this.executionHint = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_docs_per_value}
+         */
+        public final Builder maxDocsPerValue(@Nullable Integer value) {
+            this.maxDocsPerValue = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(@Nullable Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * API name: {@code shard_size}
+         */
+        public final Builder shardSize(@Nullable Integer value) {
+            this.shardSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DiversifiedSamplerAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DiversifiedSamplerAggregation build() {
+            _checkSingleUse();
+
+            return new DiversifiedSamplerAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DiversifiedSamplerAggregation}
+     */
+    public static final JsonpDeserializer<DiversifiedSamplerAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DiversifiedSamplerAggregation::setupDiversifiedSamplerAggregationDeserializer
+    );
+
+    protected static void setupDiversifiedSamplerAggregationDeserializer(ObjectDeserializer<DiversifiedSamplerAggregation.Builder> op) {
+        BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::executionHint, SamplerAggregationExecutionHint._DESERIALIZER, "execution_hint");
+        op.add(Builder::maxDocsPerValue, JsonpDeserializer.integerDeserializer(), "max_docs_per_value");
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+        op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DoubleTermsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DoubleTermsAggregate.java
index fee1f3f246..6701a1966f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DoubleTermsAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DoubleTermsAggregate.java
@@ -32,81 +32,82 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.DoubleTermsAggregate
 
 /**
  * Result of a <code>terms</code> aggregation when the field is some kind of
  * decimal number like a float, double, or distance.
- * 
+ *
  */
 @JsonpDeserializable
 public class DoubleTermsAggregate extends TermsAggregateBase<DoubleTermsBucket> implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private DoubleTermsAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static DoubleTermsAggregate of(Function<Builder, ObjectBuilder<DoubleTermsAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Dterms;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DoubleTermsAggregate}.
-	 */
-
-	public static class Builder extends TermsAggregateBase.AbstractBuilder<DoubleTermsBucket, Builder>
-			implements
-				ObjectBuilder<DoubleTermsAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DoubleTermsAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DoubleTermsAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new DoubleTermsAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DoubleTermsAggregate}
-	 */
-	public static final JsonpDeserializer<DoubleTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DoubleTermsAggregate::setupDoubleTermsAggregateDeserializer);
-
-	protected static void setupDoubleTermsAggregateDeserializer(ObjectDeserializer<DoubleTermsAggregate.Builder> op) {
-		setupTermsAggregateBaseDeserializer(op, DoubleTermsBucket._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private DoubleTermsAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static DoubleTermsAggregate of(Function<Builder, ObjectBuilder<DoubleTermsAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Dterms;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DoubleTermsAggregate}.
+     */
+
+    public static class Builder extends TermsAggregateBase.AbstractBuilder<DoubleTermsBucket, Builder>
+        implements
+            ObjectBuilder<DoubleTermsAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DoubleTermsAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DoubleTermsAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new DoubleTermsAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DoubleTermsAggregate}
+     */
+    public static final JsonpDeserializer<DoubleTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DoubleTermsAggregate::setupDoubleTermsAggregateDeserializer
+    );
+
+    protected static void setupDoubleTermsAggregateDeserializer(ObjectDeserializer<DoubleTermsAggregate.Builder> op) {
+        setupTermsAggregateBaseDeserializer(op, DoubleTermsBucket._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DoubleTermsBucket.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DoubleTermsBucket.java
index b03f543968..6f24e3d5da 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DoubleTermsBucket.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/DoubleTermsBucket.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,123 +42,120 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.DoubleTermsBucket
 
 @JsonpDeserializable
 public class DoubleTermsBucket extends TermsBucketBase {
-	private final double key;
-
-	@Nullable
-	private final String keyAsString;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DoubleTermsBucket(Builder builder) {
-		super(builder);
-
-		this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
-		this.keyAsString = builder.keyAsString;
-
-	}
-
-	public static DoubleTermsBucket of(Function<Builder, ObjectBuilder<DoubleTermsBucket>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code key}
-	 */
-	public final double key() {
-		return this.key;
-	}
-
-	/**
-	 * API name: {@code key_as_string}
-	 */
-	@Nullable
-	public final String keyAsString() {
-		return this.keyAsString;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("key");
-		generator.write(this.key);
-
-		if (this.keyAsString != null) {
-			generator.writeKey("key_as_string");
-			generator.write(this.keyAsString);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DoubleTermsBucket}.
-	 */
-
-	public static class Builder extends TermsBucketBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DoubleTermsBucket> {
-		private Double key;
-
-		@Nullable
-		private String keyAsString;
-
-		/**
-		 * Required - API name: {@code key}
-		 */
-		public final Builder key(double value) {
-			this.key = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code key_as_string}
-		 */
-		public final Builder keyAsString(@Nullable String value) {
-			this.keyAsString = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DoubleTermsBucket}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DoubleTermsBucket build() {
-			_checkSingleUse();
-
-			return new DoubleTermsBucket(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DoubleTermsBucket}
-	 */
-	public static final JsonpDeserializer<DoubleTermsBucket> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DoubleTermsBucket::setupDoubleTermsBucketDeserializer);
-
-	protected static void setupDoubleTermsBucketDeserializer(ObjectDeserializer<DoubleTermsBucket.Builder> op) {
-		setupTermsBucketBaseDeserializer(op);
-		op.add(Builder::key, JsonpDeserializer.doubleDeserializer(), "key");
-		op.add(Builder::keyAsString, JsonpDeserializer.stringDeserializer(), "key_as_string");
-
-	}
+    private final double key;
+
+    @Nullable
+    private final String keyAsString;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DoubleTermsBucket(Builder builder) {
+        super(builder);
+
+        this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
+        this.keyAsString = builder.keyAsString;
+
+    }
+
+    public static DoubleTermsBucket of(Function<Builder, ObjectBuilder<DoubleTermsBucket>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code key}
+     */
+    public final double key() {
+        return this.key;
+    }
+
+    /**
+     * API name: {@code key_as_string}
+     */
+    @Nullable
+    public final String keyAsString() {
+        return this.keyAsString;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("key");
+        generator.write(this.key);
+
+        if (this.keyAsString != null) {
+            generator.writeKey("key_as_string");
+            generator.write(this.keyAsString);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DoubleTermsBucket}.
+     */
+
+    public static class Builder extends TermsBucketBase.AbstractBuilder<Builder> implements ObjectBuilder<DoubleTermsBucket> {
+        private Double key;
+
+        @Nullable
+        private String keyAsString;
+
+        /**
+         * Required - API name: {@code key}
+         */
+        public final Builder key(double value) {
+            this.key = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code key_as_string}
+         */
+        public final Builder keyAsString(@Nullable String value) {
+            this.keyAsString = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DoubleTermsBucket}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DoubleTermsBucket build() {
+            _checkSingleUse();
+
+            return new DoubleTermsBucket(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DoubleTermsBucket}
+     */
+    public static final JsonpDeserializer<DoubleTermsBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DoubleTermsBucket::setupDoubleTermsBucketDeserializer
+    );
+
+    protected static void setupDoubleTermsBucketDeserializer(ObjectDeserializer<DoubleTermsBucket.Builder> op) {
+        setupTermsBucketBaseDeserializer(op);
+        op.add(Builder::key, JsonpDeserializer.doubleDeserializer(), "key");
+        op.add(Builder::keyAsString, JsonpDeserializer.stringDeserializer(), "key_as_string");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/EwmaModelSettings.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/EwmaModelSettings.java
index d8d4f1628c..ba3ceee21a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/EwmaModelSettings.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/EwmaModelSettings.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,99 +43,98 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.EwmaModelSettings
 
 @JsonpDeserializable
 public class EwmaModelSettings implements JsonpSerializable {
-	@Nullable
-	private final Float alpha;
+    @Nullable
+    private final Float alpha;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private EwmaModelSettings(Builder builder) {
+    private EwmaModelSettings(Builder builder) {
 
-		this.alpha = builder.alpha;
+        this.alpha = builder.alpha;
 
-	}
+    }
 
-	public static EwmaModelSettings of(Function<Builder, ObjectBuilder<EwmaModelSettings>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static EwmaModelSettings of(Function<Builder, ObjectBuilder<EwmaModelSettings>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * API name: {@code alpha}
-	 */
-	@Nullable
-	public final Float alpha() {
-		return this.alpha;
-	}
+    /**
+     * API name: {@code alpha}
+     */
+    @Nullable
+    public final Float alpha() {
+        return this.alpha;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		if (this.alpha != null) {
-			generator.writeKey("alpha");
-			generator.write(this.alpha);
+        if (this.alpha != null) {
+            generator.writeKey("alpha");
+            generator.write(this.alpha);
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link EwmaModelSettings}.
-	 */
+    /**
+     * Builder for {@link EwmaModelSettings}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<EwmaModelSettings> {
-		@Nullable
-		private Float alpha;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<EwmaModelSettings> {
+        @Nullable
+        private Float alpha;
 
-		/**
-		 * API name: {@code alpha}
-		 */
-		public final Builder alpha(@Nullable Float value) {
-			this.alpha = value;
-			return this;
-		}
+        /**
+         * API name: {@code alpha}
+         */
+        public final Builder alpha(@Nullable Float value) {
+            this.alpha = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link EwmaModelSettings}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public EwmaModelSettings build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link EwmaModelSettings}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public EwmaModelSettings build() {
+            _checkSingleUse();
 
-			return new EwmaModelSettings(this);
-		}
-	}
+            return new EwmaModelSettings(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link EwmaModelSettings}
-	 */
-	public static final JsonpDeserializer<EwmaModelSettings> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, EwmaModelSettings::setupEwmaModelSettingsDeserializer);
+    /**
+     * Json deserializer for {@link EwmaModelSettings}
+     */
+    public static final JsonpDeserializer<EwmaModelSettings> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        EwmaModelSettings::setupEwmaModelSettingsDeserializer
+    );
 
-	protected static void setupEwmaModelSettingsDeserializer(ObjectDeserializer<EwmaModelSettings.Builder> op) {
+    protected static void setupEwmaModelSettingsDeserializer(ObjectDeserializer<EwmaModelSettings.Builder> op) {
 
-		op.add(Builder::alpha, JsonpDeserializer.floatDeserializer(), "alpha");
+        op.add(Builder::alpha, JsonpDeserializer.floatDeserializer(), "alpha");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/EwmaMovingAverageAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/EwmaMovingAverageAggregation.java
index ce4130bcf8..2ad3417df0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/EwmaMovingAverageAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/EwmaMovingAverageAggregation.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,113 +41,109 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.aggregations.EwmaMovingAverageAggregation
 
 @JsonpDeserializable
-public class EwmaMovingAverageAggregation extends MovingAverageAggregationBase
-		implements
-			MovingAverageAggregationVariant {
-	private final EwmaModelSettings settings;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private EwmaMovingAverageAggregation(Builder builder) {
-		super(builder);
-
-		this.settings = ApiTypeHelper.requireNonNull(builder.settings, this, "settings");
-
-	}
-
-	public static EwmaMovingAverageAggregation of(Function<Builder, ObjectBuilder<EwmaMovingAverageAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * MovingAverageAggregation variant kind.
-	 */
-	@Override
-	public MovingAverageAggregation.Kind _movingAverageAggregationKind() {
-		return MovingAverageAggregation.Kind.Ewma;
-	}
-
-	/**
-	 * Required - API name: {@code settings}
-	 */
-	public final EwmaModelSettings settings() {
-		return this.settings;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("model", "ewma");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("settings");
-		this.settings.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link EwmaMovingAverageAggregation}.
-	 */
-
-	public static class Builder extends MovingAverageAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<EwmaMovingAverageAggregation> {
-		private EwmaModelSettings settings;
-
-		/**
-		 * Required - API name: {@code settings}
-		 */
-		public final Builder settings(EwmaModelSettings value) {
-			this.settings = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code settings}
-		 */
-		public final Builder settings(Function<EwmaModelSettings.Builder, ObjectBuilder<EwmaModelSettings>> fn) {
-			return this.settings(fn.apply(new EwmaModelSettings.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link EwmaMovingAverageAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public EwmaMovingAverageAggregation build() {
-			_checkSingleUse();
-
-			return new EwmaMovingAverageAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link EwmaMovingAverageAggregation}
-	 */
-	public static final JsonpDeserializer<EwmaMovingAverageAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, EwmaMovingAverageAggregation::setupEwmaMovingAverageAggregationDeserializer);
-
-	protected static void setupEwmaMovingAverageAggregationDeserializer(
-			ObjectDeserializer<EwmaMovingAverageAggregation.Builder> op) {
-		MovingAverageAggregationBase.setupMovingAverageAggregationBaseDeserializer(op);
-		op.add(Builder::settings, EwmaModelSettings._DESERIALIZER, "settings");
-
-		op.ignore("model");
-	}
+public class EwmaMovingAverageAggregation extends MovingAverageAggregationBase implements MovingAverageAggregationVariant {
+    private final EwmaModelSettings settings;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private EwmaMovingAverageAggregation(Builder builder) {
+        super(builder);
+
+        this.settings = ApiTypeHelper.requireNonNull(builder.settings, this, "settings");
+
+    }
+
+    public static EwmaMovingAverageAggregation of(Function<Builder, ObjectBuilder<EwmaMovingAverageAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * MovingAverageAggregation variant kind.
+     */
+    @Override
+    public MovingAverageAggregation.Kind _movingAverageAggregationKind() {
+        return MovingAverageAggregation.Kind.Ewma;
+    }
+
+    /**
+     * Required - API name: {@code settings}
+     */
+    public final EwmaModelSettings settings() {
+        return this.settings;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("model", "ewma");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("settings");
+        this.settings.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link EwmaMovingAverageAggregation}.
+     */
+
+    public static class Builder extends MovingAverageAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<EwmaMovingAverageAggregation> {
+        private EwmaModelSettings settings;
+
+        /**
+         * Required - API name: {@code settings}
+         */
+        public final Builder settings(EwmaModelSettings value) {
+            this.settings = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code settings}
+         */
+        public final Builder settings(Function<EwmaModelSettings.Builder, ObjectBuilder<EwmaModelSettings>> fn) {
+            return this.settings(fn.apply(new EwmaModelSettings.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link EwmaMovingAverageAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public EwmaMovingAverageAggregation build() {
+            _checkSingleUse();
+
+            return new EwmaMovingAverageAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link EwmaMovingAverageAggregation}
+     */
+    public static final JsonpDeserializer<EwmaMovingAverageAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        EwmaMovingAverageAggregation::setupEwmaMovingAverageAggregationDeserializer
+    );
+
+    protected static void setupEwmaMovingAverageAggregationDeserializer(ObjectDeserializer<EwmaMovingAverageAggregation.Builder> op) {
+        MovingAverageAggregationBase.setupMovingAverageAggregationBaseDeserializer(op);
+        op.add(Builder::settings, EwmaModelSettings._DESERIALIZER, "settings");
+
+        op.ignore("model");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedBounds.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedBounds.java
index 66b6363c05..8b244e34ba 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedBounds.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedBounds.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
@@ -42,139 +46,136 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import java.util.function.Supplier;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.ExtendedBounds
 
-
 public class ExtendedBounds<T> implements JsonpSerializable {
-	private final T max;
-
-	private final T min;
-
-	@Nullable
-	private final JsonpSerializer<T> tSerializer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ExtendedBounds(Builder<T> builder) {
-
-		this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
-		this.min = ApiTypeHelper.requireNonNull(builder.min, this, "min");
-		this.tSerializer = builder.tSerializer;
-
-	}
-
-	public static <T> ExtendedBounds<T> of(Function<Builder<T>, ObjectBuilder<ExtendedBounds<T>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * Required - API name: {@code max}
-	 */
-	public final T max() {
-		return this.max;
-	}
-
-	/**
-	 * Required - API name: {@code min}
-	 */
-	public final T min() {
-		return this.min;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("max");
-		JsonpUtils.serialize(this.max, generator, tSerializer, mapper);
-
-		generator.writeKey("min");
-		JsonpUtils.serialize(this.min, generator, tSerializer, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ExtendedBounds}.
-	 */
-
-	public static class Builder<T> extends ObjectBuilderBase implements ObjectBuilder<ExtendedBounds<T>> {
-		private T max;
-
-		private T min;
-
-		@Nullable
-		private JsonpSerializer<T> tSerializer;
-
-		/**
-		 * Required - API name: {@code max}
-		 */
-		public final Builder<T> max(T value) {
-			this.max = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code min}
-		 */
-		public final Builder<T> min(T value) {
-			this.min = value;
-			return this;
-		}
-
-		/**
-		 * Serializer for T. If not set, an attempt will be made to find a serializer
-		 * from the JSON context.
-		 */
-		public final Builder<T> tSerializer(@Nullable JsonpSerializer<T> value) {
-			this.tSerializer = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ExtendedBounds}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ExtendedBounds<T> build() {
-			_checkSingleUse();
-
-			return new ExtendedBounds<T>(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Create a JSON deserializer for ExtendedBounds
-	 */
-	public static <T> JsonpDeserializer<ExtendedBounds<T>> createExtendedBoundsDeserializer(
-			JsonpDeserializer<T> tDeserializer) {
-		return ObjectBuilderDeserializer.createForObject((Supplier<Builder<T>>) Builder::new,
-				op -> ExtendedBounds.setupExtendedBoundsDeserializer(op, tDeserializer));
-	};
-
-	protected static <T> void setupExtendedBoundsDeserializer(ObjectDeserializer<ExtendedBounds.Builder<T>> op,
-			JsonpDeserializer<T> tDeserializer) {
-
-		op.add(Builder::max, tDeserializer, "max");
-		op.add(Builder::min, tDeserializer, "min");
-
-	}
+    private final T max;
+
+    private final T min;
+
+    @Nullable
+    private final JsonpSerializer<T> tSerializer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ExtendedBounds(Builder<T> builder) {
+
+        this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
+        this.min = ApiTypeHelper.requireNonNull(builder.min, this, "min");
+        this.tSerializer = builder.tSerializer;
+
+    }
+
+    public static <T> ExtendedBounds<T> of(Function<Builder<T>, ObjectBuilder<ExtendedBounds<T>>> fn) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * Required - API name: {@code max}
+     */
+    public final T max() {
+        return this.max;
+    }
+
+    /**
+     * Required - API name: {@code min}
+     */
+    public final T min() {
+        return this.min;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("max");
+        JsonpUtils.serialize(this.max, generator, tSerializer, mapper);
+
+        generator.writeKey("min");
+        JsonpUtils.serialize(this.min, generator, tSerializer, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ExtendedBounds}.
+     */
+
+    public static class Builder<T> extends ObjectBuilderBase implements ObjectBuilder<ExtendedBounds<T>> {
+        private T max;
+
+        private T min;
+
+        @Nullable
+        private JsonpSerializer<T> tSerializer;
+
+        /**
+         * Required - API name: {@code max}
+         */
+        public final Builder<T> max(T value) {
+            this.max = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code min}
+         */
+        public final Builder<T> min(T value) {
+            this.min = value;
+            return this;
+        }
+
+        /**
+         * Serializer for T. If not set, an attempt will be made to find a serializer
+         * from the JSON context.
+         */
+        public final Builder<T> tSerializer(@Nullable JsonpSerializer<T> value) {
+            this.tSerializer = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ExtendedBounds}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ExtendedBounds<T> build() {
+            _checkSingleUse();
+
+            return new ExtendedBounds<T>(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Create a JSON deserializer for ExtendedBounds
+     */
+    public static <T> JsonpDeserializer<ExtendedBounds<T>> createExtendedBoundsDeserializer(JsonpDeserializer<T> tDeserializer) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<T>>) Builder::new,
+            op -> ExtendedBounds.setupExtendedBoundsDeserializer(op, tDeserializer)
+        );
+    };
+
+    protected static <T> void setupExtendedBoundsDeserializer(
+        ObjectDeserializer<ExtendedBounds.Builder<T>> op,
+        JsonpDeserializer<T> tDeserializer
+    ) {
+
+        op.add(Builder::max, tDeserializer, "max");
+        op.add(Builder::min, tDeserializer, "min");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedStatsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedStatsAggregate.java
index a771bd3ac4..86ed812c94 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedStatsAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedStatsAggregate.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,445 +43,439 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.ExtendedStatsAggregate
 
 @JsonpDeserializable
 public class ExtendedStatsAggregate extends StatsAggregate implements AggregateVariant {
-	private final double sumOfSquares;
-
-	private final double variance;
-
-	private final double variancePopulation;
-
-	private final double varianceSampling;
-
-	private final double stdDeviation;
-
-	@Nullable
-	private final StandardDeviationBounds stdDeviationBounds;
-
-	@Nullable
-	private final String sumOfSquaresAsString;
-
-	@Nullable
-	private final String varianceAsString;
-
-	@Nullable
-	private final String variancePopulationAsString;
-
-	@Nullable
-	private final String varianceSamplingAsString;
-
-	@Nullable
-	private final String stdDeviationAsString;
-
-	@Nullable
-	private final StandardDeviationBoundsAsString stdDeviationBoundsAsString;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected ExtendedStatsAggregate(AbstractBuilder<?> builder) {
-		super(builder);
-
-		this.sumOfSquares = ApiTypeHelper.requireNonNull(builder.sumOfSquares, this, "sumOfSquares");
-		this.variance = ApiTypeHelper.requireNonNull(builder.variance, this, "variance");
-		this.variancePopulation = ApiTypeHelper.requireNonNull(builder.variancePopulation, this, "variancePopulation");
-		this.varianceSampling = ApiTypeHelper.requireNonNull(builder.varianceSampling, this, "varianceSampling");
-		this.stdDeviation = ApiTypeHelper.requireNonNull(builder.stdDeviation, this, "stdDeviation");
-		this.stdDeviationBounds = builder.stdDeviationBounds;
-		this.sumOfSquaresAsString = builder.sumOfSquaresAsString;
-		this.varianceAsString = builder.varianceAsString;
-		this.variancePopulationAsString = builder.variancePopulationAsString;
-		this.varianceSamplingAsString = builder.varianceSamplingAsString;
-		this.stdDeviationAsString = builder.stdDeviationAsString;
-		this.stdDeviationBoundsAsString = builder.stdDeviationBoundsAsString;
-
-	}
-
-	public static ExtendedStatsAggregate extendedStatsAggregateOf(
-			Function<Builder, ObjectBuilder<ExtendedStatsAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.ExtendedStats;
-	}
-
-	/**
-	 * Required - API name: {@code sum_of_squares}
-	 * <p>
-	 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-	 */
-	public final double sumOfSquares() {
-		return this.sumOfSquares;
-	}
-
-	/**
-	 * Required - API name: {@code variance}
-	 * <p>
-	 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-	 */
-	public final double variance() {
-		return this.variance;
-	}
-
-	/**
-	 * Required - API name: {@code variance_population}
-	 * <p>
-	 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-	 */
-	public final double variancePopulation() {
-		return this.variancePopulation;
-	}
-
-	/**
-	 * Required - API name: {@code variance_sampling}
-	 * <p>
-	 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-	 */
-	public final double varianceSampling() {
-		return this.varianceSampling;
-	}
-
-	/**
-	 * Required - API name: {@code std_deviation}
-	 * <p>
-	 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-	 */
-	public final double stdDeviation() {
-		return this.stdDeviation;
-	}
-
-	/**
-	 * API name: {@code std_deviation_bounds}
-	 */
-	@Nullable
-	public final StandardDeviationBounds stdDeviationBounds() {
-		return this.stdDeviationBounds;
-	}
-
-	/**
-	 * API name: {@code sum_of_squares_as_string}
-	 */
-	@Nullable
-	public final String sumOfSquaresAsString() {
-		return this.sumOfSquaresAsString;
-	}
-
-	/**
-	 * API name: {@code variance_as_string}
-	 */
-	@Nullable
-	public final String varianceAsString() {
-		return this.varianceAsString;
-	}
-
-	/**
-	 * API name: {@code variance_population_as_string}
-	 */
-	@Nullable
-	public final String variancePopulationAsString() {
-		return this.variancePopulationAsString;
-	}
-
-	/**
-	 * API name: {@code variance_sampling_as_string}
-	 */
-	@Nullable
-	public final String varianceSamplingAsString() {
-		return this.varianceSamplingAsString;
-	}
-
-	/**
-	 * API name: {@code std_deviation_as_string}
-	 */
-	@Nullable
-	public final String stdDeviationAsString() {
-		return this.stdDeviationAsString;
-	}
-
-	/**
-	 * API name: {@code std_deviation_bounds_as_string}
-	 */
-	@Nullable
-	public final StandardDeviationBoundsAsString stdDeviationBoundsAsString() {
-		return this.stdDeviationBoundsAsString;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("sum_of_squares");
-		JsonpUtils.serializeDoubleOrNull(generator, this.sumOfSquares, 0);
-		generator.writeKey("variance");
-		JsonpUtils.serializeDoubleOrNull(generator, this.variance, 0);
-		generator.writeKey("variance_population");
-		JsonpUtils.serializeDoubleOrNull(generator, this.variancePopulation, 0);
-		generator.writeKey("variance_sampling");
-		JsonpUtils.serializeDoubleOrNull(generator, this.varianceSampling, 0);
-		generator.writeKey("std_deviation");
-		JsonpUtils.serializeDoubleOrNull(generator, this.stdDeviation, 0);
-		if (this.stdDeviationBounds != null) {
-			generator.writeKey("std_deviation_bounds");
-			this.stdDeviationBounds.serialize(generator, mapper);
-
-		}
-		if (this.sumOfSquaresAsString != null) {
-			generator.writeKey("sum_of_squares_as_string");
-			generator.write(this.sumOfSquaresAsString);
-
-		}
-		if (this.varianceAsString != null) {
-			generator.writeKey("variance_as_string");
-			generator.write(this.varianceAsString);
-
-		}
-		if (this.variancePopulationAsString != null) {
-			generator.writeKey("variance_population_as_string");
-			generator.write(this.variancePopulationAsString);
-
-		}
-		if (this.varianceSamplingAsString != null) {
-			generator.writeKey("variance_sampling_as_string");
-			generator.write(this.varianceSamplingAsString);
-
-		}
-		if (this.stdDeviationAsString != null) {
-			generator.writeKey("std_deviation_as_string");
-			generator.write(this.stdDeviationAsString);
-
-		}
-		if (this.stdDeviationBoundsAsString != null) {
-			generator.writeKey("std_deviation_bounds_as_string");
-			this.stdDeviationBoundsAsString.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ExtendedStatsAggregate}.
-	 */
-
-	public static class Builder extends ExtendedStatsAggregate.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ExtendedStatsAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ExtendedStatsAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ExtendedStatsAggregate build() {
-			_checkSingleUse();
-
-			return new ExtendedStatsAggregate(this);
-		}
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				StatsAggregate.AbstractBuilder<BuilderT> {
-		private Double sumOfSquares;
-
-		private Double variance;
-
-		private Double variancePopulation;
-
-		private Double varianceSampling;
-
-		private Double stdDeviation;
-
-		@Nullable
-		private StandardDeviationBounds stdDeviationBounds;
-
-		@Nullable
-		private String sumOfSquaresAsString;
-
-		@Nullable
-		private String varianceAsString;
-
-		@Nullable
-		private String variancePopulationAsString;
-
-		@Nullable
-		private String varianceSamplingAsString;
-
-		@Nullable
-		private String stdDeviationAsString;
-
-		@Nullable
-		private StandardDeviationBoundsAsString stdDeviationBoundsAsString;
-
-		/**
-		 * Required - API name: {@code sum_of_squares}
-		 * <p>
-		 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-		 */
-		public final BuilderT sumOfSquares(double value) {
-			this.sumOfSquares = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code variance}
-		 * <p>
-		 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-		 */
-		public final BuilderT variance(double value) {
-			this.variance = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code variance_population}
-		 * <p>
-		 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-		 */
-		public final BuilderT variancePopulation(double value) {
-			this.variancePopulation = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code variance_sampling}
-		 * <p>
-		 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-		 */
-		public final BuilderT varianceSampling(double value) {
-			this.varianceSampling = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code std_deviation}
-		 * <p>
-		 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-		 */
-		public final BuilderT stdDeviation(double value) {
-			this.stdDeviation = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code std_deviation_bounds}
-		 */
-		public final BuilderT stdDeviationBounds(@Nullable StandardDeviationBounds value) {
-			this.stdDeviationBounds = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code std_deviation_bounds}
-		 */
-		public final BuilderT stdDeviationBounds(
-				Function<StandardDeviationBounds.Builder, ObjectBuilder<StandardDeviationBounds>> fn) {
-			return this.stdDeviationBounds(fn.apply(new StandardDeviationBounds.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code sum_of_squares_as_string}
-		 */
-		public final BuilderT sumOfSquaresAsString(@Nullable String value) {
-			this.sumOfSquaresAsString = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code variance_as_string}
-		 */
-		public final BuilderT varianceAsString(@Nullable String value) {
-			this.varianceAsString = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code variance_population_as_string}
-		 */
-		public final BuilderT variancePopulationAsString(@Nullable String value) {
-			this.variancePopulationAsString = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code variance_sampling_as_string}
-		 */
-		public final BuilderT varianceSamplingAsString(@Nullable String value) {
-			this.varianceSamplingAsString = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code std_deviation_as_string}
-		 */
-		public final BuilderT stdDeviationAsString(@Nullable String value) {
-			this.stdDeviationAsString = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code std_deviation_bounds_as_string}
-		 */
-		public final BuilderT stdDeviationBoundsAsString(@Nullable StandardDeviationBoundsAsString value) {
-			this.stdDeviationBoundsAsString = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code std_deviation_bounds_as_string}
-		 */
-		public final BuilderT stdDeviationBoundsAsString(
-				Function<StandardDeviationBoundsAsString.Builder, ObjectBuilder<StandardDeviationBoundsAsString>> fn) {
-			return this.stdDeviationBoundsAsString(fn.apply(new StandardDeviationBoundsAsString.Builder()).build());
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ExtendedStatsAggregate}
-	 */
-	public static final JsonpDeserializer<ExtendedStatsAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ExtendedStatsAggregate::setupExtendedStatsAggregateDeserializer);
-
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupExtendedStatsAggregateDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		StatsAggregate.setupStatsAggregateDeserializer(op);
-		op.add(AbstractBuilder::sumOfSquares, JsonpDeserializer.doubleOrNullDeserializer(0), "sum_of_squares");
-		op.add(AbstractBuilder::variance, JsonpDeserializer.doubleOrNullDeserializer(0), "variance");
-		op.add(AbstractBuilder::variancePopulation, JsonpDeserializer.doubleOrNullDeserializer(0),
-				"variance_population");
-		op.add(AbstractBuilder::varianceSampling, JsonpDeserializer.doubleOrNullDeserializer(0), "variance_sampling");
-		op.add(AbstractBuilder::stdDeviation, JsonpDeserializer.doubleOrNullDeserializer(0), "std_deviation");
-		op.add(AbstractBuilder::stdDeviationBounds, StandardDeviationBounds._DESERIALIZER, "std_deviation_bounds");
-		op.add(AbstractBuilder::sumOfSquaresAsString, JsonpDeserializer.stringDeserializer(),
-				"sum_of_squares_as_string");
-		op.add(AbstractBuilder::varianceAsString, JsonpDeserializer.stringDeserializer(), "variance_as_string");
-		op.add(AbstractBuilder::variancePopulationAsString, JsonpDeserializer.stringDeserializer(),
-				"variance_population_as_string");
-		op.add(AbstractBuilder::varianceSamplingAsString, JsonpDeserializer.stringDeserializer(),
-				"variance_sampling_as_string");
-		op.add(AbstractBuilder::stdDeviationAsString, JsonpDeserializer.stringDeserializer(),
-				"std_deviation_as_string");
-		op.add(AbstractBuilder::stdDeviationBoundsAsString, StandardDeviationBoundsAsString._DESERIALIZER,
-				"std_deviation_bounds_as_string");
-
-	}
+    private final double sumOfSquares;
+
+    private final double variance;
+
+    private final double variancePopulation;
+
+    private final double varianceSampling;
+
+    private final double stdDeviation;
+
+    @Nullable
+    private final StandardDeviationBounds stdDeviationBounds;
+
+    @Nullable
+    private final String sumOfSquaresAsString;
+
+    @Nullable
+    private final String varianceAsString;
+
+    @Nullable
+    private final String variancePopulationAsString;
+
+    @Nullable
+    private final String varianceSamplingAsString;
+
+    @Nullable
+    private final String stdDeviationAsString;
+
+    @Nullable
+    private final StandardDeviationBoundsAsString stdDeviationBoundsAsString;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected ExtendedStatsAggregate(AbstractBuilder<?> builder) {
+        super(builder);
+
+        this.sumOfSquares = ApiTypeHelper.requireNonNull(builder.sumOfSquares, this, "sumOfSquares");
+        this.variance = ApiTypeHelper.requireNonNull(builder.variance, this, "variance");
+        this.variancePopulation = ApiTypeHelper.requireNonNull(builder.variancePopulation, this, "variancePopulation");
+        this.varianceSampling = ApiTypeHelper.requireNonNull(builder.varianceSampling, this, "varianceSampling");
+        this.stdDeviation = ApiTypeHelper.requireNonNull(builder.stdDeviation, this, "stdDeviation");
+        this.stdDeviationBounds = builder.stdDeviationBounds;
+        this.sumOfSquaresAsString = builder.sumOfSquaresAsString;
+        this.varianceAsString = builder.varianceAsString;
+        this.variancePopulationAsString = builder.variancePopulationAsString;
+        this.varianceSamplingAsString = builder.varianceSamplingAsString;
+        this.stdDeviationAsString = builder.stdDeviationAsString;
+        this.stdDeviationBoundsAsString = builder.stdDeviationBoundsAsString;
+
+    }
+
+    public static ExtendedStatsAggregate extendedStatsAggregateOf(Function<Builder, ObjectBuilder<ExtendedStatsAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.ExtendedStats;
+    }
+
+    /**
+     * Required - API name: {@code sum_of_squares}
+     * <p>
+     * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+     */
+    public final double sumOfSquares() {
+        return this.sumOfSquares;
+    }
+
+    /**
+     * Required - API name: {@code variance}
+     * <p>
+     * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+     */
+    public final double variance() {
+        return this.variance;
+    }
+
+    /**
+     * Required - API name: {@code variance_population}
+     * <p>
+     * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+     */
+    public final double variancePopulation() {
+        return this.variancePopulation;
+    }
+
+    /**
+     * Required - API name: {@code variance_sampling}
+     * <p>
+     * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+     */
+    public final double varianceSampling() {
+        return this.varianceSampling;
+    }
+
+    /**
+     * Required - API name: {@code std_deviation}
+     * <p>
+     * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+     */
+    public final double stdDeviation() {
+        return this.stdDeviation;
+    }
+
+    /**
+     * API name: {@code std_deviation_bounds}
+     */
+    @Nullable
+    public final StandardDeviationBounds stdDeviationBounds() {
+        return this.stdDeviationBounds;
+    }
+
+    /**
+     * API name: {@code sum_of_squares_as_string}
+     */
+    @Nullable
+    public final String sumOfSquaresAsString() {
+        return this.sumOfSquaresAsString;
+    }
+
+    /**
+     * API name: {@code variance_as_string}
+     */
+    @Nullable
+    public final String varianceAsString() {
+        return this.varianceAsString;
+    }
+
+    /**
+     * API name: {@code variance_population_as_string}
+     */
+    @Nullable
+    public final String variancePopulationAsString() {
+        return this.variancePopulationAsString;
+    }
+
+    /**
+     * API name: {@code variance_sampling_as_string}
+     */
+    @Nullable
+    public final String varianceSamplingAsString() {
+        return this.varianceSamplingAsString;
+    }
+
+    /**
+     * API name: {@code std_deviation_as_string}
+     */
+    @Nullable
+    public final String stdDeviationAsString() {
+        return this.stdDeviationAsString;
+    }
+
+    /**
+     * API name: {@code std_deviation_bounds_as_string}
+     */
+    @Nullable
+    public final StandardDeviationBoundsAsString stdDeviationBoundsAsString() {
+        return this.stdDeviationBoundsAsString;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("sum_of_squares");
+        JsonpUtils.serializeDoubleOrNull(generator, this.sumOfSquares, 0);
+        generator.writeKey("variance");
+        JsonpUtils.serializeDoubleOrNull(generator, this.variance, 0);
+        generator.writeKey("variance_population");
+        JsonpUtils.serializeDoubleOrNull(generator, this.variancePopulation, 0);
+        generator.writeKey("variance_sampling");
+        JsonpUtils.serializeDoubleOrNull(generator, this.varianceSampling, 0);
+        generator.writeKey("std_deviation");
+        JsonpUtils.serializeDoubleOrNull(generator, this.stdDeviation, 0);
+        if (this.stdDeviationBounds != null) {
+            generator.writeKey("std_deviation_bounds");
+            this.stdDeviationBounds.serialize(generator, mapper);
+
+        }
+        if (this.sumOfSquaresAsString != null) {
+            generator.writeKey("sum_of_squares_as_string");
+            generator.write(this.sumOfSquaresAsString);
+
+        }
+        if (this.varianceAsString != null) {
+            generator.writeKey("variance_as_string");
+            generator.write(this.varianceAsString);
+
+        }
+        if (this.variancePopulationAsString != null) {
+            generator.writeKey("variance_population_as_string");
+            generator.write(this.variancePopulationAsString);
+
+        }
+        if (this.varianceSamplingAsString != null) {
+            generator.writeKey("variance_sampling_as_string");
+            generator.write(this.varianceSamplingAsString);
+
+        }
+        if (this.stdDeviationAsString != null) {
+            generator.writeKey("std_deviation_as_string");
+            generator.write(this.stdDeviationAsString);
+
+        }
+        if (this.stdDeviationBoundsAsString != null) {
+            generator.writeKey("std_deviation_bounds_as_string");
+            this.stdDeviationBoundsAsString.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ExtendedStatsAggregate}.
+     */
+
+    public static class Builder extends ExtendedStatsAggregate.AbstractBuilder<Builder> implements ObjectBuilder<ExtendedStatsAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ExtendedStatsAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ExtendedStatsAggregate build() {
+            _checkSingleUse();
+
+            return new ExtendedStatsAggregate(this);
+        }
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends StatsAggregate.AbstractBuilder<
+        BuilderT> {
+        private Double sumOfSquares;
+
+        private Double variance;
+
+        private Double variancePopulation;
+
+        private Double varianceSampling;
+
+        private Double stdDeviation;
+
+        @Nullable
+        private StandardDeviationBounds stdDeviationBounds;
+
+        @Nullable
+        private String sumOfSquaresAsString;
+
+        @Nullable
+        private String varianceAsString;
+
+        @Nullable
+        private String variancePopulationAsString;
+
+        @Nullable
+        private String varianceSamplingAsString;
+
+        @Nullable
+        private String stdDeviationAsString;
+
+        @Nullable
+        private StandardDeviationBoundsAsString stdDeviationBoundsAsString;
+
+        /**
+         * Required - API name: {@code sum_of_squares}
+         * <p>
+         * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+         */
+        public final BuilderT sumOfSquares(double value) {
+            this.sumOfSquares = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code variance}
+         * <p>
+         * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+         */
+        public final BuilderT variance(double value) {
+            this.variance = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code variance_population}
+         * <p>
+         * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+         */
+        public final BuilderT variancePopulation(double value) {
+            this.variancePopulation = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code variance_sampling}
+         * <p>
+         * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+         */
+        public final BuilderT varianceSampling(double value) {
+            this.varianceSampling = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code std_deviation}
+         * <p>
+         * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+         */
+        public final BuilderT stdDeviation(double value) {
+            this.stdDeviation = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code std_deviation_bounds}
+         */
+        public final BuilderT stdDeviationBounds(@Nullable StandardDeviationBounds value) {
+            this.stdDeviationBounds = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code std_deviation_bounds}
+         */
+        public final BuilderT stdDeviationBounds(Function<StandardDeviationBounds.Builder, ObjectBuilder<StandardDeviationBounds>> fn) {
+            return this.stdDeviationBounds(fn.apply(new StandardDeviationBounds.Builder()).build());
+        }
+
+        /**
+         * API name: {@code sum_of_squares_as_string}
+         */
+        public final BuilderT sumOfSquaresAsString(@Nullable String value) {
+            this.sumOfSquaresAsString = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code variance_as_string}
+         */
+        public final BuilderT varianceAsString(@Nullable String value) {
+            this.varianceAsString = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code variance_population_as_string}
+         */
+        public final BuilderT variancePopulationAsString(@Nullable String value) {
+            this.variancePopulationAsString = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code variance_sampling_as_string}
+         */
+        public final BuilderT varianceSamplingAsString(@Nullable String value) {
+            this.varianceSamplingAsString = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code std_deviation_as_string}
+         */
+        public final BuilderT stdDeviationAsString(@Nullable String value) {
+            this.stdDeviationAsString = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code std_deviation_bounds_as_string}
+         */
+        public final BuilderT stdDeviationBoundsAsString(@Nullable StandardDeviationBoundsAsString value) {
+            this.stdDeviationBoundsAsString = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code std_deviation_bounds_as_string}
+         */
+        public final BuilderT stdDeviationBoundsAsString(
+            Function<StandardDeviationBoundsAsString.Builder, ObjectBuilder<StandardDeviationBoundsAsString>> fn
+        ) {
+            return this.stdDeviationBoundsAsString(fn.apply(new StandardDeviationBoundsAsString.Builder()).build());
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ExtendedStatsAggregate}
+     */
+    public static final JsonpDeserializer<ExtendedStatsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ExtendedStatsAggregate::setupExtendedStatsAggregateDeserializer
+    );
+
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupExtendedStatsAggregateDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
+        StatsAggregate.setupStatsAggregateDeserializer(op);
+        op.add(AbstractBuilder::sumOfSquares, JsonpDeserializer.doubleOrNullDeserializer(0), "sum_of_squares");
+        op.add(AbstractBuilder::variance, JsonpDeserializer.doubleOrNullDeserializer(0), "variance");
+        op.add(AbstractBuilder::variancePopulation, JsonpDeserializer.doubleOrNullDeserializer(0), "variance_population");
+        op.add(AbstractBuilder::varianceSampling, JsonpDeserializer.doubleOrNullDeserializer(0), "variance_sampling");
+        op.add(AbstractBuilder::stdDeviation, JsonpDeserializer.doubleOrNullDeserializer(0), "std_deviation");
+        op.add(AbstractBuilder::stdDeviationBounds, StandardDeviationBounds._DESERIALIZER, "std_deviation_bounds");
+        op.add(AbstractBuilder::sumOfSquaresAsString, JsonpDeserializer.stringDeserializer(), "sum_of_squares_as_string");
+        op.add(AbstractBuilder::varianceAsString, JsonpDeserializer.stringDeserializer(), "variance_as_string");
+        op.add(AbstractBuilder::variancePopulationAsString, JsonpDeserializer.stringDeserializer(), "variance_population_as_string");
+        op.add(AbstractBuilder::varianceSamplingAsString, JsonpDeserializer.stringDeserializer(), "variance_sampling_as_string");
+        op.add(AbstractBuilder::stdDeviationAsString, JsonpDeserializer.stringDeserializer(), "std_deviation_as_string");
+        op.add(
+            AbstractBuilder::stdDeviationBoundsAsString,
+            StandardDeviationBoundsAsString._DESERIALIZER,
+            "std_deviation_bounds_as_string"
+        );
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedStatsAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedStatsAggregation.java
index 7cfdfe7b87..2f8ddcff1c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedStatsAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedStatsAggregation.java
@@ -32,114 +32,115 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.ExtendedStatsAggregation
 
 @JsonpDeserializable
 public class ExtendedStatsAggregation extends FormatMetricAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Double sigma;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ExtendedStatsAggregation(Builder builder) {
-		super(builder);
-
-		this.sigma = builder.sigma;
-
-	}
-
-	public static ExtendedStatsAggregation of(Function<Builder, ObjectBuilder<ExtendedStatsAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.ExtendedStats;
-	}
-
-	/**
-	 * API name: {@code sigma}
-	 */
-	@Nullable
-	public final Double sigma() {
-		return this.sigma;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.sigma != null) {
-			generator.writeKey("sigma");
-			generator.write(this.sigma);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ExtendedStatsAggregation}.
-	 */
-
-	public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ExtendedStatsAggregation> {
-		@Nullable
-		private Double sigma;
-
-		/**
-		 * API name: {@code sigma}
-		 */
-		public final Builder sigma(@Nullable Double value) {
-			this.sigma = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ExtendedStatsAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ExtendedStatsAggregation build() {
-			_checkSingleUse();
-
-			return new ExtendedStatsAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ExtendedStatsAggregation}
-	 */
-	public static final JsonpDeserializer<ExtendedStatsAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ExtendedStatsAggregation::setupExtendedStatsAggregationDeserializer);
-
-	protected static void setupExtendedStatsAggregationDeserializer(
-			ObjectDeserializer<ExtendedStatsAggregation.Builder> op) {
-		setupFormatMetricAggregationBaseDeserializer(op);
-		op.add(Builder::sigma, JsonpDeserializer.doubleDeserializer(), "sigma");
-
-	}
+    @Nullable
+    private final Double sigma;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ExtendedStatsAggregation(Builder builder) {
+        super(builder);
+
+        this.sigma = builder.sigma;
+
+    }
+
+    public static ExtendedStatsAggregation of(Function<Builder, ObjectBuilder<ExtendedStatsAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.ExtendedStats;
+    }
+
+    /**
+     * API name: {@code sigma}
+     */
+    @Nullable
+    public final Double sigma() {
+        return this.sigma;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.sigma != null) {
+            generator.writeKey("sigma");
+            generator.write(this.sigma);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ExtendedStatsAggregation}.
+     */
+
+    public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<ExtendedStatsAggregation> {
+        @Nullable
+        private Double sigma;
+
+        /**
+         * API name: {@code sigma}
+         */
+        public final Builder sigma(@Nullable Double value) {
+            this.sigma = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ExtendedStatsAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ExtendedStatsAggregation build() {
+            _checkSingleUse();
+
+            return new ExtendedStatsAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ExtendedStatsAggregation}
+     */
+    public static final JsonpDeserializer<ExtendedStatsAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ExtendedStatsAggregation::setupExtendedStatsAggregationDeserializer
+    );
+
+    protected static void setupExtendedStatsAggregationDeserializer(ObjectDeserializer<ExtendedStatsAggregation.Builder> op) {
+        setupFormatMetricAggregationBaseDeserializer(op);
+        op.add(Builder::sigma, JsonpDeserializer.doubleDeserializer(), "sigma");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedStatsBucketAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedStatsBucketAggregate.java
index 590bab0946..b51094fc3c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedStatsBucketAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedStatsBucketAggregate.java
@@ -32,76 +32,76 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.ExtendedStatsBucketAggregate
 
 @JsonpDeserializable
 public class ExtendedStatsBucketAggregate extends ExtendedStatsAggregate implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private ExtendedStatsBucketAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static ExtendedStatsBucketAggregate of(Function<Builder, ObjectBuilder<ExtendedStatsBucketAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.ExtendedStatsBucket;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ExtendedStatsBucketAggregate}.
-	 */
-
-	public static class Builder extends ExtendedStatsAggregate.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ExtendedStatsBucketAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ExtendedStatsBucketAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ExtendedStatsBucketAggregate build() {
-			_checkSingleUse();
-
-			return new ExtendedStatsBucketAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ExtendedStatsBucketAggregate}
-	 */
-	public static final JsonpDeserializer<ExtendedStatsBucketAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ExtendedStatsBucketAggregate::setupExtendedStatsBucketAggregateDeserializer);
-
-	protected static void setupExtendedStatsBucketAggregateDeserializer(
-			ObjectDeserializer<ExtendedStatsBucketAggregate.Builder> op) {
-		setupExtendedStatsAggregateDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private ExtendedStatsBucketAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static ExtendedStatsBucketAggregate of(Function<Builder, ObjectBuilder<ExtendedStatsBucketAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.ExtendedStatsBucket;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ExtendedStatsBucketAggregate}.
+     */
+
+    public static class Builder extends ExtendedStatsAggregate.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<ExtendedStatsBucketAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ExtendedStatsBucketAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ExtendedStatsBucketAggregate build() {
+            _checkSingleUse();
+
+            return new ExtendedStatsBucketAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ExtendedStatsBucketAggregate}
+     */
+    public static final JsonpDeserializer<ExtendedStatsBucketAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ExtendedStatsBucketAggregate::setupExtendedStatsBucketAggregateDeserializer
+    );
+
+    protected static void setupExtendedStatsBucketAggregateDeserializer(ObjectDeserializer<ExtendedStatsBucketAggregate.Builder> op) {
+        setupExtendedStatsAggregateDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedStatsBucketAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedStatsBucketAggregation.java
index cd54081927..21f416a07c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedStatsBucketAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedStatsBucketAggregation.java
@@ -32,115 +32,115 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.ExtendedStatsBucketAggregation
 
 @JsonpDeserializable
 public class ExtendedStatsBucketAggregation extends PipelineAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Double sigma;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ExtendedStatsBucketAggregation(Builder builder) {
-		super(builder);
-
-		this.sigma = builder.sigma;
-
-	}
-
-	public static ExtendedStatsBucketAggregation of(
-			Function<Builder, ObjectBuilder<ExtendedStatsBucketAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.ExtendedStatsBucket;
-	}
-
-	/**
-	 * API name: {@code sigma}
-	 */
-	@Nullable
-	public final Double sigma() {
-		return this.sigma;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.sigma != null) {
-			generator.writeKey("sigma");
-			generator.write(this.sigma);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ExtendedStatsBucketAggregation}.
-	 */
-
-	public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ExtendedStatsBucketAggregation> {
-		@Nullable
-		private Double sigma;
-
-		/**
-		 * API name: {@code sigma}
-		 */
-		public final Builder sigma(@Nullable Double value) {
-			this.sigma = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ExtendedStatsBucketAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ExtendedStatsBucketAggregation build() {
-			_checkSingleUse();
-
-			return new ExtendedStatsBucketAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ExtendedStatsBucketAggregation}
-	 */
-	public static final JsonpDeserializer<ExtendedStatsBucketAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ExtendedStatsBucketAggregation::setupExtendedStatsBucketAggregationDeserializer);
-
-	protected static void setupExtendedStatsBucketAggregationDeserializer(
-			ObjectDeserializer<ExtendedStatsBucketAggregation.Builder> op) {
-		PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
-		op.add(Builder::sigma, JsonpDeserializer.doubleDeserializer(), "sigma");
-
-	}
+    @Nullable
+    private final Double sigma;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ExtendedStatsBucketAggregation(Builder builder) {
+        super(builder);
+
+        this.sigma = builder.sigma;
+
+    }
+
+    public static ExtendedStatsBucketAggregation of(Function<Builder, ObjectBuilder<ExtendedStatsBucketAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.ExtendedStatsBucket;
+    }
+
+    /**
+     * API name: {@code sigma}
+     */
+    @Nullable
+    public final Double sigma() {
+        return this.sigma;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.sigma != null) {
+            generator.writeKey("sigma");
+            generator.write(this.sigma);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ExtendedStatsBucketAggregation}.
+     */
+
+    public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<ExtendedStatsBucketAggregation> {
+        @Nullable
+        private Double sigma;
+
+        /**
+         * API name: {@code sigma}
+         */
+        public final Builder sigma(@Nullable Double value) {
+            this.sigma = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ExtendedStatsBucketAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ExtendedStatsBucketAggregation build() {
+            _checkSingleUse();
+
+            return new ExtendedStatsBucketAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ExtendedStatsBucketAggregation}
+     */
+    public static final JsonpDeserializer<ExtendedStatsBucketAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ExtendedStatsBucketAggregation::setupExtendedStatsBucketAggregationDeserializer
+    );
+
+    protected static void setupExtendedStatsBucketAggregationDeserializer(ObjectDeserializer<ExtendedStatsBucketAggregation.Builder> op) {
+        PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
+        op.add(Builder::sigma, JsonpDeserializer.doubleDeserializer(), "sigma");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FieldDateMath.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FieldDateMath.java
index ca2b4f3070..775fb5e4ed 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FieldDateMath.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FieldDateMath.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,147 +44,148 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.FieldDateMath
 
 /**
  * A date range limit, represented either as a DateMath expression or a number
  * expressed according to the target field's precision.
- * 
+ *
  */
 @JsonpDeserializable
 public class FieldDateMath implements TaggedUnion<FieldDateMath.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Expr, Value
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private FieldDateMath(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	public String _toJsonString() {
-		switch (_kind) {
-			case Expr :
-				return this.expr();
-			case Value :
-				return String.valueOf(this.value());
-
-			default :
-				throw new IllegalStateException("Unknown kind " + _kind);
-		}
-	}
-
-	private FieldDateMath(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static FieldDateMath of(Function<Builder, ObjectBuilder<FieldDateMath>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code expr}?
-	 */
-	public boolean isExpr() {
-		return _kind == Kind.Expr;
-	}
-
-	/**
-	 * Get the {@code expr} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code expr} kind.
-	 */
-	public String expr() {
-		return TaggedUnionUtils.get(this, Kind.Expr);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code value}?
-	 */
-	public boolean isValue() {
-		return _kind == Kind.Value;
-	}
-
-	/**
-	 * Get the {@code value} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code value} kind.
-	 */
-	public Double value() {
-		return TaggedUnionUtils.get(this, Kind.Value);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Expr :
-					generator.write(((String) this._value));
-
-					break;
-				case Value :
-					generator.write(((Double) this._value));
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldDateMath> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<FieldDateMath> expr(String v) {
-			this._kind = Kind.Expr;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<FieldDateMath> value(Double v) {
-			this._kind = Kind.Value;
-			this._value = v;
-			return this;
-		}
-
-		public FieldDateMath build() {
-			_checkSingleUse();
-			return new FieldDateMath(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<FieldDateMath> buildFieldDateMathDeserializer() {
-		return new UnionDeserializer.Builder<FieldDateMath, Kind, Object>(FieldDateMath::new, false)
-				.addMember(Kind.Expr, JsonpDeserializer.stringDeserializer())
-				.addMember(Kind.Value, JsonpDeserializer.doubleDeserializer()).build();
-	}
-
-	public static final JsonpDeserializer<FieldDateMath> _DESERIALIZER = JsonpDeserializer
-			.lazy(FieldDateMath::buildFieldDateMathDeserializer);
+    public enum Kind {
+        Expr,
+        Value
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private FieldDateMath(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    public String _toJsonString() {
+        switch (_kind) {
+            case Expr:
+                return this.expr();
+            case Value:
+                return String.valueOf(this.value());
+
+            default:
+                throw new IllegalStateException("Unknown kind " + _kind);
+        }
+    }
+
+    private FieldDateMath(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static FieldDateMath of(Function<Builder, ObjectBuilder<FieldDateMath>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code expr}?
+     */
+    public boolean isExpr() {
+        return _kind == Kind.Expr;
+    }
+
+    /**
+     * Get the {@code expr} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code expr} kind.
+     */
+    public String expr() {
+        return TaggedUnionUtils.get(this, Kind.Expr);
+    }
+
+    /**
+     * Is this variant instance of kind {@code value}?
+     */
+    public boolean isValue() {
+        return _kind == Kind.Value;
+    }
+
+    /**
+     * Get the {@code value} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code value} kind.
+     */
+    public Double value() {
+        return TaggedUnionUtils.get(this, Kind.Value);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Expr:
+                    generator.write(((String) this._value));
+
+                    break;
+                case Value:
+                    generator.write(((Double) this._value));
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldDateMath> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<FieldDateMath> expr(String v) {
+            this._kind = Kind.Expr;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<FieldDateMath> value(Double v) {
+            this._kind = Kind.Value;
+            this._value = v;
+            return this;
+        }
+
+        public FieldDateMath build() {
+            _checkSingleUse();
+            return new FieldDateMath(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<FieldDateMath> buildFieldDateMathDeserializer() {
+        return new UnionDeserializer.Builder<FieldDateMath, Kind, Object>(FieldDateMath::new, false).addMember(
+            Kind.Expr,
+            JsonpDeserializer.stringDeserializer()
+        ).addMember(Kind.Value, JsonpDeserializer.doubleDeserializer()).build();
+    }
+
+    public static final JsonpDeserializer<FieldDateMath> _DESERIALIZER = JsonpDeserializer.lazy(
+        FieldDateMath::buildFieldDateMathDeserializer
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FieldDateMathBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FieldDateMathBuilders.java
index 3019e5b543..803450d015 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FieldDateMathBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FieldDateMathBuilders.java
@@ -37,10 +37,9 @@
  * <p>
  * Variants <code>expr</code>, <code>value</code> are not available here as they
  * don't have a dedicated class. Use {@link FieldDateMath}'s builder for these.
- * 
+ *
  */
 public class FieldDateMathBuilders {
-	private FieldDateMathBuilders() {
-	}
+    private FieldDateMathBuilders() {}
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FilterAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FilterAggregate.java
index 536e2fdbbb..f2e7b0d692 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FilterAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FilterAggregate.java
@@ -32,75 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.FilterAggregate
 
 @JsonpDeserializable
 public class FilterAggregate extends SingleBucketAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private FilterAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static FilterAggregate of(Function<Builder, ObjectBuilder<FilterAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Filter;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FilterAggregate}.
-	 */
-
-	public static class Builder extends SingleBucketAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<FilterAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FilterAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FilterAggregate build() {
-			_checkSingleUse();
-
-			return new FilterAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FilterAggregate}
-	 */
-	public static final JsonpDeserializer<FilterAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FilterAggregate::setupFilterAggregateDeserializer);
-
-	protected static void setupFilterAggregateDeserializer(ObjectDeserializer<FilterAggregate.Builder> op) {
-		setupSingleBucketAggregateBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private FilterAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static FilterAggregate of(Function<Builder, ObjectBuilder<FilterAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Filter;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FilterAggregate}.
+     */
+
+    public static class Builder extends SingleBucketAggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<FilterAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link FilterAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FilterAggregate build() {
+            _checkSingleUse();
+
+            return new FilterAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FilterAggregate}
+     */
+    public static final JsonpDeserializer<FilterAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FilterAggregate::setupFilterAggregateDeserializer
+    );
+
+    protected static void setupFilterAggregateDeserializer(ObjectDeserializer<FilterAggregate.Builder> op) {
+        setupSingleBucketAggregateBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FiltersAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FiltersAggregate.java
index 396dab6309..dac24a6ab6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FiltersAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FiltersAggregate.java
@@ -32,76 +32,77 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.FiltersAggregate
 
 @JsonpDeserializable
 public class FiltersAggregate extends MultiBucketAggregateBase<FiltersBucket> implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private FiltersAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static FiltersAggregate of(Function<Builder, ObjectBuilder<FiltersAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Filters;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FiltersAggregate}.
-	 */
-
-	public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<FiltersBucket, Builder>
-			implements
-				ObjectBuilder<FiltersAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FiltersAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FiltersAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new FiltersAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FiltersAggregate}
-	 */
-	public static final JsonpDeserializer<FiltersAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FiltersAggregate::setupFiltersAggregateDeserializer);
-
-	protected static void setupFiltersAggregateDeserializer(ObjectDeserializer<FiltersAggregate.Builder> op) {
-		setupMultiBucketAggregateBaseDeserializer(op, FiltersBucket._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private FiltersAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static FiltersAggregate of(Function<Builder, ObjectBuilder<FiltersAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Filters;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FiltersAggregate}.
+     */
+
+    public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<FiltersBucket, Builder>
+        implements
+            ObjectBuilder<FiltersAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link FiltersAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FiltersAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new FiltersAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FiltersAggregate}
+     */
+    public static final JsonpDeserializer<FiltersAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FiltersAggregate::setupFiltersAggregateDeserializer
+    );
+
+    protected static void setupFiltersAggregateDeserializer(ObjectDeserializer<FiltersAggregate.Builder> op) {
+        setupMultiBucketAggregateBaseDeserializer(op, FiltersBucket._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FiltersAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FiltersAggregation.java
index 6c4a68c3e8..e55c7ed62f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FiltersAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FiltersAggregation.java
@@ -32,208 +32,208 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.FiltersAggregation
 
 @JsonpDeserializable
 public class FiltersAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Buckets<Query> filters;
-
-	@Nullable
-	private final Boolean otherBucket;
-
-	@Nullable
-	private final String otherBucketKey;
-
-	@Nullable
-	private final Boolean keyed;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FiltersAggregation(Builder builder) {
-		super(builder);
-
-		this.filters = builder.filters;
-		this.otherBucket = builder.otherBucket;
-		this.otherBucketKey = builder.otherBucketKey;
-		this.keyed = builder.keyed;
-
-	}
-
-	public static FiltersAggregation of(Function<Builder, ObjectBuilder<FiltersAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Filters;
-	}
-
-	/**
-	 * API name: {@code filters}
-	 */
-	@Nullable
-	public final Buckets<Query> filters() {
-		return this.filters;
-	}
-
-	/**
-	 * API name: {@code other_bucket}
-	 */
-	@Nullable
-	public final Boolean otherBucket() {
-		return this.otherBucket;
-	}
-
-	/**
-	 * API name: {@code other_bucket_key}
-	 */
-	@Nullable
-	public final String otherBucketKey() {
-		return this.otherBucketKey;
-	}
-
-	/**
-	 * API name: {@code keyed}
-	 */
-	@Nullable
-	public final Boolean keyed() {
-		return this.keyed;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.filters != null) {
-			generator.writeKey("filters");
-			this.filters.serialize(generator, mapper);
-
-		}
-		if (this.otherBucket != null) {
-			generator.writeKey("other_bucket");
-			generator.write(this.otherBucket);
-
-		}
-		if (this.otherBucketKey != null) {
-			generator.writeKey("other_bucket_key");
-			generator.write(this.otherBucketKey);
-
-		}
-		if (this.keyed != null) {
-			generator.writeKey("keyed");
-			generator.write(this.keyed);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FiltersAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<FiltersAggregation> {
-		@Nullable
-		private Buckets<Query> filters;
-
-		@Nullable
-		private Boolean otherBucket;
-
-		@Nullable
-		private String otherBucketKey;
-
-		@Nullable
-		private Boolean keyed;
-
-		/**
-		 * API name: {@code filters}
-		 */
-		public final Builder filters(@Nullable Buckets<Query> value) {
-			this.filters = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code filters}
-		 */
-		public final Builder filters(Function<Buckets.Builder<Query>, ObjectBuilder<Buckets<Query>>> fn) {
-			return this.filters(fn.apply(new Buckets.Builder<Query>()).build());
-		}
-
-		/**
-		 * API name: {@code other_bucket}
-		 */
-		public final Builder otherBucket(@Nullable Boolean value) {
-			this.otherBucket = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code other_bucket_key}
-		 */
-		public final Builder otherBucketKey(@Nullable String value) {
-			this.otherBucketKey = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code keyed}
-		 */
-		public final Builder keyed(@Nullable Boolean value) {
-			this.keyed = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FiltersAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FiltersAggregation build() {
-			_checkSingleUse();
-
-			return new FiltersAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FiltersAggregation}
-	 */
-	public static final JsonpDeserializer<FiltersAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, FiltersAggregation::setupFiltersAggregationDeserializer);
-
-	protected static void setupFiltersAggregationDeserializer(ObjectDeserializer<FiltersAggregation.Builder> op) {
-		BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::filters, Buckets.createBucketsDeserializer(Query._DESERIALIZER), "filters");
-		op.add(Builder::otherBucket, JsonpDeserializer.booleanDeserializer(), "other_bucket");
-		op.add(Builder::otherBucketKey, JsonpDeserializer.stringDeserializer(), "other_bucket_key");
-		op.add(Builder::keyed, JsonpDeserializer.booleanDeserializer(), "keyed");
-
-	}
+    @Nullable
+    private final Buckets<Query> filters;
+
+    @Nullable
+    private final Boolean otherBucket;
+
+    @Nullable
+    private final String otherBucketKey;
+
+    @Nullable
+    private final Boolean keyed;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FiltersAggregation(Builder builder) {
+        super(builder);
+
+        this.filters = builder.filters;
+        this.otherBucket = builder.otherBucket;
+        this.otherBucketKey = builder.otherBucketKey;
+        this.keyed = builder.keyed;
+
+    }
+
+    public static FiltersAggregation of(Function<Builder, ObjectBuilder<FiltersAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Filters;
+    }
+
+    /**
+     * API name: {@code filters}
+     */
+    @Nullable
+    public final Buckets<Query> filters() {
+        return this.filters;
+    }
+
+    /**
+     * API name: {@code other_bucket}
+     */
+    @Nullable
+    public final Boolean otherBucket() {
+        return this.otherBucket;
+    }
+
+    /**
+     * API name: {@code other_bucket_key}
+     */
+    @Nullable
+    public final String otherBucketKey() {
+        return this.otherBucketKey;
+    }
+
+    /**
+     * API name: {@code keyed}
+     */
+    @Nullable
+    public final Boolean keyed() {
+        return this.keyed;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.filters != null) {
+            generator.writeKey("filters");
+            this.filters.serialize(generator, mapper);
+
+        }
+        if (this.otherBucket != null) {
+            generator.writeKey("other_bucket");
+            generator.write(this.otherBucket);
+
+        }
+        if (this.otherBucketKey != null) {
+            generator.writeKey("other_bucket_key");
+            generator.write(this.otherBucketKey);
+
+        }
+        if (this.keyed != null) {
+            generator.writeKey("keyed");
+            generator.write(this.keyed);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FiltersAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<FiltersAggregation> {
+        @Nullable
+        private Buckets<Query> filters;
+
+        @Nullable
+        private Boolean otherBucket;
+
+        @Nullable
+        private String otherBucketKey;
+
+        @Nullable
+        private Boolean keyed;
+
+        /**
+         * API name: {@code filters}
+         */
+        public final Builder filters(@Nullable Buckets<Query> value) {
+            this.filters = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code filters}
+         */
+        public final Builder filters(Function<Buckets.Builder<Query>, ObjectBuilder<Buckets<Query>>> fn) {
+            return this.filters(fn.apply(new Buckets.Builder<Query>()).build());
+        }
+
+        /**
+         * API name: {@code other_bucket}
+         */
+        public final Builder otherBucket(@Nullable Boolean value) {
+            this.otherBucket = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code other_bucket_key}
+         */
+        public final Builder otherBucketKey(@Nullable String value) {
+            this.otherBucketKey = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code keyed}
+         */
+        public final Builder keyed(@Nullable Boolean value) {
+            this.keyed = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link FiltersAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FiltersAggregation build() {
+            _checkSingleUse();
+
+            return new FiltersAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FiltersAggregation}
+     */
+    public static final JsonpDeserializer<FiltersAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FiltersAggregation::setupFiltersAggregationDeserializer
+    );
+
+    protected static void setupFiltersAggregationDeserializer(ObjectDeserializer<FiltersAggregation.Builder> op) {
+        BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::filters, Buckets.createBucketsDeserializer(Query._DESERIALIZER), "filters");
+        op.add(Builder::otherBucket, JsonpDeserializer.booleanDeserializer(), "other_bucket");
+        op.add(Builder::otherBucketKey, JsonpDeserializer.stringDeserializer(), "other_bucket_key");
+        op.add(Builder::keyed, JsonpDeserializer.booleanDeserializer(), "keyed");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FiltersBucket.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FiltersBucket.java
index 7c7441e3bb..27f91fc8df 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FiltersBucket.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FiltersBucket.java
@@ -32,67 +32,66 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.FiltersBucket
 
 @JsonpDeserializable
 public class FiltersBucket extends MultiBucketBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private FiltersBucket(Builder builder) {
-		super(builder);
+    private FiltersBucket(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static FiltersBucket of(Function<Builder, ObjectBuilder<FiltersBucket>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static FiltersBucket of(Function<Builder, ObjectBuilder<FiltersBucket>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link FiltersBucket}.
-	 */
+    /**
+     * Builder for {@link FiltersBucket}.
+     */
 
-	public static class Builder extends MultiBucketBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<FiltersBucket> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends MultiBucketBase.AbstractBuilder<Builder> implements ObjectBuilder<FiltersBucket> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link FiltersBucket}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FiltersBucket build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link FiltersBucket}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FiltersBucket build() {
+            _checkSingleUse();
 
-			return new FiltersBucket(this);
-		}
-	}
+            return new FiltersBucket(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link FiltersBucket}
-	 */
-	public static final JsonpDeserializer<FiltersBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FiltersBucket::setupFiltersBucketDeserializer);
+    /**
+     * Json deserializer for {@link FiltersBucket}
+     */
+    public static final JsonpDeserializer<FiltersBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FiltersBucket::setupFiltersBucketDeserializer
+    );
 
-	protected static void setupFiltersBucketDeserializer(ObjectDeserializer<FiltersBucket.Builder> op) {
-		MultiBucketBase.setupMultiBucketBaseDeserializer(op);
+    protected static void setupFiltersBucketDeserializer(ObjectDeserializer<FiltersBucket.Builder> op) {
+        MultiBucketBase.setupMultiBucketBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FormatMetricAggregationBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FormatMetricAggregationBase.java
index d712a6ab10..1fbb2c8aa4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FormatMetricAggregationBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FormatMetricAggregationBase.java
@@ -32,69 +32,68 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectDeserializer;
-import jakarta.json.stream.JsonGenerator;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.FormatMetricAggregationBase
 
-
 public abstract class FormatMetricAggregationBase extends MetricAggregationBase {
-	@Nullable
-	private final String format;
+    @Nullable
+    private final String format;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected FormatMetricAggregationBase(AbstractBuilder<?> builder) {
-		super(builder);
+    protected FormatMetricAggregationBase(AbstractBuilder<?> builder) {
+        super(builder);
 
-		this.format = builder.format;
+        this.format = builder.format;
 
-	}
+    }
 
-	/**
-	 * API name: {@code format}
-	 */
-	@Nullable
-	public final String format() {
-		return this.format;
-	}
+    /**
+     * API name: {@code format}
+     */
+    @Nullable
+    public final String format() {
+        return this.format;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		super.serializeInternal(generator, mapper);
-		if (this.format != null) {
-			generator.writeKey("format");
-			generator.write(this.format);
+        super.serializeInternal(generator, mapper);
+        if (this.format != null) {
+            generator.writeKey("format");
+            generator.write(this.format);
 
-		}
+        }
 
-	}
+    }
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				MetricAggregationBase.AbstractBuilder<BuilderT> {
-		@Nullable
-		private String format;
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends
+        MetricAggregationBase.AbstractBuilder<BuilderT> {
+        @Nullable
+        private String format;
 
-		/**
-		 * API name: {@code format}
-		 */
-		public final BuilderT format(@Nullable String value) {
-			this.format = value;
-			return self();
-		}
+        /**
+         * API name: {@code format}
+         */
+        public final BuilderT format(@Nullable String value) {
+            this.format = value;
+            return self();
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupFormatMetricAggregationBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		MetricAggregationBase.setupMetricAggregationBaseDeserializer(op);
-		op.add(AbstractBuilder::format, JsonpDeserializer.stringDeserializer(), "format");
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupFormatMetricAggregationBaseDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
+        MetricAggregationBase.setupMetricAggregationBaseDeserializer(op);
+        op.add(AbstractBuilder::format, JsonpDeserializer.stringDeserializer(), "format");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FormattableMetricAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FormattableMetricAggregation.java
index 8887ea48f6..798f5f760f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FormattableMetricAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FormattableMetricAggregation.java
@@ -32,69 +32,68 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectDeserializer;
-import jakarta.json.stream.JsonGenerator;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.FormattableMetricAggregation
 
-
 public abstract class FormattableMetricAggregation extends MetricAggregationBase {
-	@Nullable
-	private final String format;
+    @Nullable
+    private final String format;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected FormattableMetricAggregation(AbstractBuilder<?> builder) {
-		super(builder);
+    protected FormattableMetricAggregation(AbstractBuilder<?> builder) {
+        super(builder);
 
-		this.format = builder.format;
+        this.format = builder.format;
 
-	}
+    }
 
-	/**
-	 * API name: {@code format}
-	 */
-	@Nullable
-	public final String format() {
-		return this.format;
-	}
+    /**
+     * API name: {@code format}
+     */
+    @Nullable
+    public final String format() {
+        return this.format;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		super.serializeInternal(generator, mapper);
-		if (this.format != null) {
-			generator.writeKey("format");
-			generator.write(this.format);
+        super.serializeInternal(generator, mapper);
+        if (this.format != null) {
+            generator.writeKey("format");
+            generator.write(this.format);
 
-		}
+        }
 
-	}
+    }
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				MetricAggregationBase.AbstractBuilder<BuilderT> {
-		@Nullable
-		private String format;
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends
+        MetricAggregationBase.AbstractBuilder<BuilderT> {
+        @Nullable
+        private String format;
 
-		/**
-		 * API name: {@code format}
-		 */
-		public final BuilderT format(@Nullable String value) {
-			this.format = value;
-			return self();
-		}
+        /**
+         * API name: {@code format}
+         */
+        public final BuilderT format(@Nullable String value) {
+            this.format = value;
+            return self();
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupFormattableMetricAggregationDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		MetricAggregationBase.setupMetricAggregationBaseDeserializer(op);
-		op.add(AbstractBuilder::format, JsonpDeserializer.stringDeserializer(), "format");
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupFormattableMetricAggregationDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
+        MetricAggregationBase.setupMetricAggregationBaseDeserializer(op);
+        op.add(AbstractBuilder::format, JsonpDeserializer.stringDeserializer(), "format");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GapPolicy.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GapPolicy.java
index c6bf7009bb..edd004266b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GapPolicy.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GapPolicy.java
@@ -37,22 +37,21 @@
 
 @JsonpDeserializable
 public enum GapPolicy implements JsonEnum {
-	Skip("skip"),
+    Skip("skip"),
 
-	InsertZeros("insert_zeros"),
+    InsertZeros("insert_zeros"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	GapPolicy(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    GapPolicy(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<GapPolicy> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			GapPolicy.values());
+    public static final JsonEnum.Deserializer<GapPolicy> _DESERIALIZER = new JsonEnum.Deserializer<>(GapPolicy.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoBoundsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoBoundsAggregate.java
index 7a364e829d..02c093aa6e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoBoundsAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoBoundsAggregate.java
@@ -32,116 +32,115 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.GeoBounds;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.GeoBounds;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.aggregations.GeoBoundsAggregate
 
 @JsonpDeserializable
 public class GeoBoundsAggregate extends AggregateBase implements AggregateVariant {
-	private final GeoBounds bounds;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoBoundsAggregate(Builder builder) {
-		super(builder);
-
-		this.bounds = ApiTypeHelper.requireNonNull(builder.bounds, this, "bounds");
-
-	}
-
-	public static GeoBoundsAggregate of(Function<Builder, ObjectBuilder<GeoBoundsAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.GeoBounds;
-	}
-
-	/**
-	 * Required - API name: {@code bounds}
-	 */
-	public final GeoBounds bounds() {
-		return this.bounds;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("bounds");
-		this.bounds.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoBoundsAggregate}.
-	 */
-
-	public static class Builder extends AggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<GeoBoundsAggregate> {
-		private GeoBounds bounds;
-
-		/**
-		 * Required - API name: {@code bounds}
-		 */
-		public final Builder bounds(GeoBounds value) {
-			this.bounds = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code bounds}
-		 */
-		public final Builder bounds(Function<GeoBounds.Builder, ObjectBuilder<GeoBounds>> fn) {
-			return this.bounds(fn.apply(new GeoBounds.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoBoundsAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoBoundsAggregate build() {
-			_checkSingleUse();
-
-			return new GeoBoundsAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoBoundsAggregate}
-	 */
-	public static final JsonpDeserializer<GeoBoundsAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GeoBoundsAggregate::setupGeoBoundsAggregateDeserializer);
-
-	protected static void setupGeoBoundsAggregateDeserializer(ObjectDeserializer<GeoBoundsAggregate.Builder> op) {
-		setupAggregateBaseDeserializer(op);
-		op.add(Builder::bounds, GeoBounds._DESERIALIZER, "bounds");
-
-	}
+    private final GeoBounds bounds;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoBoundsAggregate(Builder builder) {
+        super(builder);
+
+        this.bounds = ApiTypeHelper.requireNonNull(builder.bounds, this, "bounds");
+
+    }
+
+    public static GeoBoundsAggregate of(Function<Builder, ObjectBuilder<GeoBoundsAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.GeoBounds;
+    }
+
+    /**
+     * Required - API name: {@code bounds}
+     */
+    public final GeoBounds bounds() {
+        return this.bounds;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("bounds");
+        this.bounds.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoBoundsAggregate}.
+     */
+
+    public static class Builder extends AggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoBoundsAggregate> {
+        private GeoBounds bounds;
+
+        /**
+         * Required - API name: {@code bounds}
+         */
+        public final Builder bounds(GeoBounds value) {
+            this.bounds = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code bounds}
+         */
+        public final Builder bounds(Function<GeoBounds.Builder, ObjectBuilder<GeoBounds>> fn) {
+            return this.bounds(fn.apply(new GeoBounds.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoBoundsAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoBoundsAggregate build() {
+            _checkSingleUse();
+
+            return new GeoBoundsAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoBoundsAggregate}
+     */
+    public static final JsonpDeserializer<GeoBoundsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoBoundsAggregate::setupGeoBoundsAggregateDeserializer
+    );
+
+    protected static void setupGeoBoundsAggregateDeserializer(ObjectDeserializer<GeoBoundsAggregate.Builder> op) {
+        setupAggregateBaseDeserializer(op);
+        op.add(Builder::bounds, GeoBounds._DESERIALIZER, "bounds");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoBoundsAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoBoundsAggregation.java
index ded5b9560f..b295de9c40 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoBoundsAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoBoundsAggregation.java
@@ -32,113 +32,113 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.GeoBoundsAggregation
 
 @JsonpDeserializable
 public class GeoBoundsAggregation extends MetricAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Boolean wrapLongitude;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoBoundsAggregation(Builder builder) {
-		super(builder);
-
-		this.wrapLongitude = builder.wrapLongitude;
-
-	}
-
-	public static GeoBoundsAggregation of(Function<Builder, ObjectBuilder<GeoBoundsAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.GeoBounds;
-	}
-
-	/**
-	 * API name: {@code wrap_longitude}
-	 */
-	@Nullable
-	public final Boolean wrapLongitude() {
-		return this.wrapLongitude;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.wrapLongitude != null) {
-			generator.writeKey("wrap_longitude");
-			generator.write(this.wrapLongitude);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoBoundsAggregation}.
-	 */
-
-	public static class Builder extends MetricAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<GeoBoundsAggregation> {
-		@Nullable
-		private Boolean wrapLongitude;
-
-		/**
-		 * API name: {@code wrap_longitude}
-		 */
-		public final Builder wrapLongitude(@Nullable Boolean value) {
-			this.wrapLongitude = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoBoundsAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoBoundsAggregation build() {
-			_checkSingleUse();
-
-			return new GeoBoundsAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoBoundsAggregation}
-	 */
-	public static final JsonpDeserializer<GeoBoundsAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GeoBoundsAggregation::setupGeoBoundsAggregationDeserializer);
-
-	protected static void setupGeoBoundsAggregationDeserializer(ObjectDeserializer<GeoBoundsAggregation.Builder> op) {
-		MetricAggregationBase.setupMetricAggregationBaseDeserializer(op);
-		op.add(Builder::wrapLongitude, JsonpDeserializer.booleanDeserializer(), "wrap_longitude");
-
-	}
+    @Nullable
+    private final Boolean wrapLongitude;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoBoundsAggregation(Builder builder) {
+        super(builder);
+
+        this.wrapLongitude = builder.wrapLongitude;
+
+    }
+
+    public static GeoBoundsAggregation of(Function<Builder, ObjectBuilder<GeoBoundsAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.GeoBounds;
+    }
+
+    /**
+     * API name: {@code wrap_longitude}
+     */
+    @Nullable
+    public final Boolean wrapLongitude() {
+        return this.wrapLongitude;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.wrapLongitude != null) {
+            generator.writeKey("wrap_longitude");
+            generator.write(this.wrapLongitude);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoBoundsAggregation}.
+     */
+
+    public static class Builder extends MetricAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoBoundsAggregation> {
+        @Nullable
+        private Boolean wrapLongitude;
+
+        /**
+         * API name: {@code wrap_longitude}
+         */
+        public final Builder wrapLongitude(@Nullable Boolean value) {
+            this.wrapLongitude = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoBoundsAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoBoundsAggregation build() {
+            _checkSingleUse();
+
+            return new GeoBoundsAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoBoundsAggregation}
+     */
+    public static final JsonpDeserializer<GeoBoundsAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoBoundsAggregation::setupGeoBoundsAggregationDeserializer
+    );
+
+    protected static void setupGeoBoundsAggregationDeserializer(ObjectDeserializer<GeoBoundsAggregation.Builder> op) {
+        MetricAggregationBase.setupMetricAggregationBaseDeserializer(op);
+        op.add(Builder::wrapLongitude, JsonpDeserializer.booleanDeserializer(), "wrap_longitude");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoCentroidAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoCentroidAggregate.java
index 775e05970c..0e95d4d238 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoCentroidAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoCentroidAggregate.java
@@ -32,146 +32,146 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.GeoLocation;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.GeoLocation;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.GeoCentroidAggregate
 
 @JsonpDeserializable
 public class GeoCentroidAggregate extends AggregateBase implements AggregateVariant {
-	private final long count;
-
-	@Nullable
-	private final GeoLocation location;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoCentroidAggregate(Builder builder) {
-		super(builder);
-
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.location = builder.location;
-
-	}
-
-	public static GeoCentroidAggregate of(Function<Builder, ObjectBuilder<GeoCentroidAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.GeoCentroid;
-	}
-
-	/**
-	 * Required - API name: {@code count}
-	 */
-	public final long count() {
-		return this.count;
-	}
-
-	/**
-	 * API name: {@code location}
-	 */
-	@Nullable
-	public final GeoLocation location() {
-		return this.location;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("count");
-		generator.write(this.count);
-
-		if (this.location != null) {
-			generator.writeKey("location");
-			this.location.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoCentroidAggregate}.
-	 */
-
-	public static class Builder extends AggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<GeoCentroidAggregate> {
-		private Long count;
-
-		@Nullable
-		private GeoLocation location;
-
-		/**
-		 * Required - API name: {@code count}
-		 */
-		public final Builder count(long value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code location}
-		 */
-		public final Builder location(@Nullable GeoLocation value) {
-			this.location = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code location}
-		 */
-		public final Builder location(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
-			return this.location(fn.apply(new GeoLocation.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoCentroidAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoCentroidAggregate build() {
-			_checkSingleUse();
-
-			return new GeoCentroidAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoCentroidAggregate}
-	 */
-	public static final JsonpDeserializer<GeoCentroidAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GeoCentroidAggregate::setupGeoCentroidAggregateDeserializer);
-
-	protected static void setupGeoCentroidAggregateDeserializer(ObjectDeserializer<GeoCentroidAggregate.Builder> op) {
-		AggregateBase.setupAggregateBaseDeserializer(op);
-		op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
-		op.add(Builder::location, GeoLocation._DESERIALIZER, "location");
-
-	}
+    private final long count;
+
+    @Nullable
+    private final GeoLocation location;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoCentroidAggregate(Builder builder) {
+        super(builder);
+
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.location = builder.location;
+
+    }
+
+    public static GeoCentroidAggregate of(Function<Builder, ObjectBuilder<GeoCentroidAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.GeoCentroid;
+    }
+
+    /**
+     * Required - API name: {@code count}
+     */
+    public final long count() {
+        return this.count;
+    }
+
+    /**
+     * API name: {@code location}
+     */
+    @Nullable
+    public final GeoLocation location() {
+        return this.location;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("count");
+        generator.write(this.count);
+
+        if (this.location != null) {
+            generator.writeKey("location");
+            this.location.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoCentroidAggregate}.
+     */
+
+    public static class Builder extends AggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoCentroidAggregate> {
+        private Long count;
+
+        @Nullable
+        private GeoLocation location;
+
+        /**
+         * Required - API name: {@code count}
+         */
+        public final Builder count(long value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code location}
+         */
+        public final Builder location(@Nullable GeoLocation value) {
+            this.location = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code location}
+         */
+        public final Builder location(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
+            return this.location(fn.apply(new GeoLocation.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoCentroidAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoCentroidAggregate build() {
+            _checkSingleUse();
+
+            return new GeoCentroidAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoCentroidAggregate}
+     */
+    public static final JsonpDeserializer<GeoCentroidAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoCentroidAggregate::setupGeoCentroidAggregateDeserializer
+    );
+
+    protected static void setupGeoCentroidAggregateDeserializer(ObjectDeserializer<GeoCentroidAggregate.Builder> op) {
+        AggregateBase.setupAggregateBaseDeserializer(op);
+        op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
+        op.add(Builder::location, GeoLocation._DESERIALIZER, "location");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoCentroidAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoCentroidAggregation.java
index 73a67e80d3..abbc56a3f4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoCentroidAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoCentroidAggregation.java
@@ -32,151 +32,150 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.GeoLocation;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.GeoLocation;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.GeoCentroidAggregation
 
 @JsonpDeserializable
 public class GeoCentroidAggregation extends MetricAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Long count;
-
-	@Nullable
-	private final GeoLocation location;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoCentroidAggregation(Builder builder) {
-		super(builder);
-
-		this.count = builder.count;
-		this.location = builder.location;
-
-	}
-
-	public static GeoCentroidAggregation of(Function<Builder, ObjectBuilder<GeoCentroidAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.GeoCentroid;
-	}
-
-	/**
-	 * API name: {@code count}
-	 */
-	@Nullable
-	public final Long count() {
-		return this.count;
-	}
-
-	/**
-	 * API name: {@code location}
-	 */
-	@Nullable
-	public final GeoLocation location() {
-		return this.location;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.count != null) {
-			generator.writeKey("count");
-			generator.write(this.count);
-
-		}
-		if (this.location != null) {
-			generator.writeKey("location");
-			this.location.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoCentroidAggregation}.
-	 */
-
-	public static class Builder extends MetricAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<GeoCentroidAggregation> {
-		@Nullable
-		private Long count;
-
-		@Nullable
-		private GeoLocation location;
-
-		/**
-		 * API name: {@code count}
-		 */
-		public final Builder count(@Nullable Long value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code location}
-		 */
-		public final Builder location(@Nullable GeoLocation value) {
-			this.location = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code location}
-		 */
-		public final Builder location(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
-			return this.location(fn.apply(new GeoLocation.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoCentroidAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoCentroidAggregation build() {
-			_checkSingleUse();
-
-			return new GeoCentroidAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoCentroidAggregation}
-	 */
-	public static final JsonpDeserializer<GeoCentroidAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GeoCentroidAggregation::setupGeoCentroidAggregationDeserializer);
-
-	protected static void setupGeoCentroidAggregationDeserializer(
-			ObjectDeserializer<GeoCentroidAggregation.Builder> op) {
-		setupMetricAggregationBaseDeserializer(op);
-		op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
-		op.add(Builder::location, GeoLocation._DESERIALIZER, "location");
-
-	}
+    @Nullable
+    private final Long count;
+
+    @Nullable
+    private final GeoLocation location;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoCentroidAggregation(Builder builder) {
+        super(builder);
+
+        this.count = builder.count;
+        this.location = builder.location;
+
+    }
+
+    public static GeoCentroidAggregation of(Function<Builder, ObjectBuilder<GeoCentroidAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.GeoCentroid;
+    }
+
+    /**
+     * API name: {@code count}
+     */
+    @Nullable
+    public final Long count() {
+        return this.count;
+    }
+
+    /**
+     * API name: {@code location}
+     */
+    @Nullable
+    public final GeoLocation location() {
+        return this.location;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.count != null) {
+            generator.writeKey("count");
+            generator.write(this.count);
+
+        }
+        if (this.location != null) {
+            generator.writeKey("location");
+            this.location.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoCentroidAggregation}.
+     */
+
+    public static class Builder extends MetricAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoCentroidAggregation> {
+        @Nullable
+        private Long count;
+
+        @Nullable
+        private GeoLocation location;
+
+        /**
+         * API name: {@code count}
+         */
+        public final Builder count(@Nullable Long value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code location}
+         */
+        public final Builder location(@Nullable GeoLocation value) {
+            this.location = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code location}
+         */
+        public final Builder location(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
+            return this.location(fn.apply(new GeoLocation.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoCentroidAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoCentroidAggregation build() {
+            _checkSingleUse();
+
+            return new GeoCentroidAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoCentroidAggregation}
+     */
+    public static final JsonpDeserializer<GeoCentroidAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoCentroidAggregation::setupGeoCentroidAggregationDeserializer
+    );
+
+    protected static void setupGeoCentroidAggregationDeserializer(ObjectDeserializer<GeoCentroidAggregation.Builder> op) {
+        setupMetricAggregationBaseDeserializer(op);
+        op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
+        op.add(Builder::location, GeoLocation._DESERIALIZER, "location");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoDistanceAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoDistanceAggregate.java
index b06b2506dd..493837afe1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoDistanceAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoDistanceAggregate.java
@@ -32,80 +32,79 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.GeoDistanceAggregate
 
 /**
  * Result of a <code>geo_distance</code> aggregation. The unit for
  * <code>from</code> and <code>to</code> is meters by default.
- * 
+ *
  */
 @JsonpDeserializable
 public class GeoDistanceAggregate extends RangeAggregate implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoDistanceAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static GeoDistanceAggregate of(Function<Builder, ObjectBuilder<GeoDistanceAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.GeoDistance;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoDistanceAggregate}.
-	 */
-
-	public static class Builder extends RangeAggregate.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<GeoDistanceAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoDistanceAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoDistanceAggregate build() {
-			_checkSingleUse();
-
-			return new GeoDistanceAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoDistanceAggregate}
-	 */
-	public static final JsonpDeserializer<GeoDistanceAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GeoDistanceAggregate::setupGeoDistanceAggregateDeserializer);
-
-	protected static void setupGeoDistanceAggregateDeserializer(ObjectDeserializer<GeoDistanceAggregate.Builder> op) {
-		RangeAggregate.setupRangeAggregateDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoDistanceAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static GeoDistanceAggregate of(Function<Builder, ObjectBuilder<GeoDistanceAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.GeoDistance;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoDistanceAggregate}.
+     */
+
+    public static class Builder extends RangeAggregate.AbstractBuilder<Builder> implements ObjectBuilder<GeoDistanceAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoDistanceAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoDistanceAggregate build() {
+            _checkSingleUse();
+
+            return new GeoDistanceAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoDistanceAggregate}
+     */
+    public static final JsonpDeserializer<GeoDistanceAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoDistanceAggregate::setupGeoDistanceAggregateDeserializer
+    );
+
+    protected static void setupGeoDistanceAggregateDeserializer(ObjectDeserializer<GeoDistanceAggregate.Builder> op) {
+        RangeAggregate.setupRangeAggregateDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoDistanceAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoDistanceAggregation.java
index c79430841e..4d1acafacf 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoDistanceAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoDistanceAggregation.java
@@ -32,264 +32,263 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.DistanceUnit;
-import org.opensearch.client.opensearch._types.GeoDistanceType;
-import org.opensearch.client.opensearch._types.GeoLocation;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.DistanceUnit;
+import org.opensearch.client.opensearch._types.GeoDistanceType;
+import org.opensearch.client.opensearch._types.GeoLocation;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.GeoDistanceAggregation
 
 @JsonpDeserializable
 public class GeoDistanceAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final GeoDistanceType distanceType;
-
-	@Nullable
-	private final String field;
-
-	@Nullable
-	private final GeoLocation origin;
-
-	private final List<AggregationRange> ranges;
-
-	@Nullable
-	private final DistanceUnit unit;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoDistanceAggregation(Builder builder) {
-		super(builder);
-
-		this.distanceType = builder.distanceType;
-		this.field = builder.field;
-		this.origin = builder.origin;
-		this.ranges = ApiTypeHelper.unmodifiable(builder.ranges);
-		this.unit = builder.unit;
-
-	}
-
-	public static GeoDistanceAggregation of(Function<Builder, ObjectBuilder<GeoDistanceAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.GeoDistance;
-	}
-
-	/**
-	 * API name: {@code distance_type}
-	 */
-	@Nullable
-	public final GeoDistanceType distanceType() {
-		return this.distanceType;
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code origin}
-	 */
-	@Nullable
-	public final GeoLocation origin() {
-		return this.origin;
-	}
-
-	/**
-	 * API name: {@code ranges}
-	 */
-	public final List<AggregationRange> ranges() {
-		return this.ranges;
-	}
-
-	/**
-	 * API name: {@code unit}
-	 */
-	@Nullable
-	public final DistanceUnit unit() {
-		return this.unit;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.distanceType != null) {
-			generator.writeKey("distance_type");
-			this.distanceType.serialize(generator, mapper);
-		}
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (this.origin != null) {
-			generator.writeKey("origin");
-			this.origin.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.ranges)) {
-			generator.writeKey("ranges");
-			generator.writeStartArray();
-			for (AggregationRange item0 : this.ranges) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.unit != null) {
-			generator.writeKey("unit");
-			this.unit.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoDistanceAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<GeoDistanceAggregation> {
-		@Nullable
-		private GeoDistanceType distanceType;
-
-		@Nullable
-		private String field;
-
-		@Nullable
-		private GeoLocation origin;
-
-		@Nullable
-		private List<AggregationRange> ranges;
-
-		@Nullable
-		private DistanceUnit unit;
-
-		/**
-		 * API name: {@code distance_type}
-		 */
-		public final Builder distanceType(@Nullable GeoDistanceType value) {
-			this.distanceType = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code origin}
-		 */
-		public final Builder origin(@Nullable GeoLocation value) {
-			this.origin = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code origin}
-		 */
-		public final Builder origin(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
-			return this.origin(fn.apply(new GeoLocation.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code ranges}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>ranges</code>.
-		 */
-		public final Builder ranges(List<AggregationRange> list) {
-			this.ranges = _listAddAll(this.ranges, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code ranges}
-		 * <p>
-		 * Adds one or more values to <code>ranges</code>.
-		 */
-		public final Builder ranges(AggregationRange value, AggregationRange... values) {
-			this.ranges = _listAdd(this.ranges, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code ranges}
-		 * <p>
-		 * Adds a value to <code>ranges</code> using a builder lambda.
-		 */
-		public final Builder ranges(Function<AggregationRange.Builder, ObjectBuilder<AggregationRange>> fn) {
-			return ranges(fn.apply(new AggregationRange.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code unit}
-		 */
-		public final Builder unit(@Nullable DistanceUnit value) {
-			this.unit = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoDistanceAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoDistanceAggregation build() {
-			_checkSingleUse();
-
-			return new GeoDistanceAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoDistanceAggregation}
-	 */
-	public static final JsonpDeserializer<GeoDistanceAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GeoDistanceAggregation::setupGeoDistanceAggregationDeserializer);
-
-	protected static void setupGeoDistanceAggregationDeserializer(
-			ObjectDeserializer<GeoDistanceAggregation.Builder> op) {
-		setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::distanceType, GeoDistanceType._DESERIALIZER, "distance_type");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::origin, GeoLocation._DESERIALIZER, "origin");
-		op.add(Builder::ranges, JsonpDeserializer.arrayDeserializer(AggregationRange._DESERIALIZER), "ranges");
-		op.add(Builder::unit, DistanceUnit._DESERIALIZER, "unit");
-
-	}
+    @Nullable
+    private final GeoDistanceType distanceType;
+
+    @Nullable
+    private final String field;
+
+    @Nullable
+    private final GeoLocation origin;
+
+    private final List<AggregationRange> ranges;
+
+    @Nullable
+    private final DistanceUnit unit;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoDistanceAggregation(Builder builder) {
+        super(builder);
+
+        this.distanceType = builder.distanceType;
+        this.field = builder.field;
+        this.origin = builder.origin;
+        this.ranges = ApiTypeHelper.unmodifiable(builder.ranges);
+        this.unit = builder.unit;
+
+    }
+
+    public static GeoDistanceAggregation of(Function<Builder, ObjectBuilder<GeoDistanceAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.GeoDistance;
+    }
+
+    /**
+     * API name: {@code distance_type}
+     */
+    @Nullable
+    public final GeoDistanceType distanceType() {
+        return this.distanceType;
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code origin}
+     */
+    @Nullable
+    public final GeoLocation origin() {
+        return this.origin;
+    }
+
+    /**
+     * API name: {@code ranges}
+     */
+    public final List<AggregationRange> ranges() {
+        return this.ranges;
+    }
+
+    /**
+     * API name: {@code unit}
+     */
+    @Nullable
+    public final DistanceUnit unit() {
+        return this.unit;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.distanceType != null) {
+            generator.writeKey("distance_type");
+            this.distanceType.serialize(generator, mapper);
+        }
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (this.origin != null) {
+            generator.writeKey("origin");
+            this.origin.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.ranges)) {
+            generator.writeKey("ranges");
+            generator.writeStartArray();
+            for (AggregationRange item0 : this.ranges) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.unit != null) {
+            generator.writeKey("unit");
+            this.unit.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoDistanceAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoDistanceAggregation> {
+        @Nullable
+        private GeoDistanceType distanceType;
+
+        @Nullable
+        private String field;
+
+        @Nullable
+        private GeoLocation origin;
+
+        @Nullable
+        private List<AggregationRange> ranges;
+
+        @Nullable
+        private DistanceUnit unit;
+
+        /**
+         * API name: {@code distance_type}
+         */
+        public final Builder distanceType(@Nullable GeoDistanceType value) {
+            this.distanceType = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code origin}
+         */
+        public final Builder origin(@Nullable GeoLocation value) {
+            this.origin = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code origin}
+         */
+        public final Builder origin(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
+            return this.origin(fn.apply(new GeoLocation.Builder()).build());
+        }
+
+        /**
+         * API name: {@code ranges}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>ranges</code>.
+         */
+        public final Builder ranges(List<AggregationRange> list) {
+            this.ranges = _listAddAll(this.ranges, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code ranges}
+         * <p>
+         * Adds one or more values to <code>ranges</code>.
+         */
+        public final Builder ranges(AggregationRange value, AggregationRange... values) {
+            this.ranges = _listAdd(this.ranges, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code ranges}
+         * <p>
+         * Adds a value to <code>ranges</code> using a builder lambda.
+         */
+        public final Builder ranges(Function<AggregationRange.Builder, ObjectBuilder<AggregationRange>> fn) {
+            return ranges(fn.apply(new AggregationRange.Builder()).build());
+        }
+
+        /**
+         * API name: {@code unit}
+         */
+        public final Builder unit(@Nullable DistanceUnit value) {
+            this.unit = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoDistanceAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoDistanceAggregation build() {
+            _checkSingleUse();
+
+            return new GeoDistanceAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoDistanceAggregation}
+     */
+    public static final JsonpDeserializer<GeoDistanceAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoDistanceAggregation::setupGeoDistanceAggregationDeserializer
+    );
+
+    protected static void setupGeoDistanceAggregationDeserializer(ObjectDeserializer<GeoDistanceAggregation.Builder> op) {
+        setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::distanceType, GeoDistanceType._DESERIALIZER, "distance_type");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::origin, GeoLocation._DESERIALIZER, "origin");
+        op.add(Builder::ranges, JsonpDeserializer.arrayDeserializer(AggregationRange._DESERIALIZER), "ranges");
+        op.add(Builder::unit, DistanceUnit._DESERIALIZER, "unit");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoHashGridAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoHashGridAggregate.java
index c0ed84a347..7f98ae1fb9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoHashGridAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoHashGridAggregate.java
@@ -32,76 +32,77 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.GeoHashGridAggregate
 
 @JsonpDeserializable
 public class GeoHashGridAggregate extends MultiBucketAggregateBase<GeoHashGridBucket> implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoHashGridAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static GeoHashGridAggregate of(Function<Builder, ObjectBuilder<GeoHashGridAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.GeohashGrid;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoHashGridAggregate}.
-	 */
-
-	public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<GeoHashGridBucket, Builder>
-			implements
-				ObjectBuilder<GeoHashGridAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoHashGridAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoHashGridAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new GeoHashGridAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoHashGridAggregate}
-	 */
-	public static final JsonpDeserializer<GeoHashGridAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GeoHashGridAggregate::setupGeoHashGridAggregateDeserializer);
-
-	protected static void setupGeoHashGridAggregateDeserializer(ObjectDeserializer<GeoHashGridAggregate.Builder> op) {
-		setupMultiBucketAggregateBaseDeserializer(op, GeoHashGridBucket._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoHashGridAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static GeoHashGridAggregate of(Function<Builder, ObjectBuilder<GeoHashGridAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.GeohashGrid;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoHashGridAggregate}.
+     */
+
+    public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<GeoHashGridBucket, Builder>
+        implements
+            ObjectBuilder<GeoHashGridAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoHashGridAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoHashGridAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new GeoHashGridAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoHashGridAggregate}
+     */
+    public static final JsonpDeserializer<GeoHashGridAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoHashGridAggregate::setupGeoHashGridAggregateDeserializer
+    );
+
+    protected static void setupGeoHashGridAggregateDeserializer(ObjectDeserializer<GeoHashGridAggregate.Builder> op) {
+        setupMultiBucketAggregateBaseDeserializer(op, GeoHashGridBucket._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoHashGridAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoHashGridAggregation.java
index 1d29c7da0d..efecfb45de 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoHashGridAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoHashGridAggregation.java
@@ -32,246 +32,245 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.GeoBounds;
-import org.opensearch.client.opensearch._types.GeoHashPrecision;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.GeoBounds;
+import org.opensearch.client.opensearch._types.GeoHashPrecision;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.GeoHashGridAggregation
 
 @JsonpDeserializable
 public class GeoHashGridAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final GeoBounds bounds;
-
-	@Nullable
-	private final String field;
-
-	@Nullable
-	private final GeoHashPrecision precision;
-
-	@Nullable
-	private final Integer shardSize;
-
-	@Nullable
-	private final Integer size;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoHashGridAggregation(Builder builder) {
-		super(builder);
-
-		this.bounds = builder.bounds;
-		this.field = builder.field;
-		this.precision = builder.precision;
-		this.shardSize = builder.shardSize;
-		this.size = builder.size;
-
-	}
-
-	public static GeoHashGridAggregation of(Function<Builder, ObjectBuilder<GeoHashGridAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.GeohashGrid;
-	}
-
-	/**
-	 * API name: {@code bounds}
-	 */
-	@Nullable
-	public final GeoBounds bounds() {
-		return this.bounds;
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code precision}
-	 */
-	@Nullable
-	public final GeoHashPrecision precision() {
-		return this.precision;
-	}
-
-	/**
-	 * API name: {@code shard_size}
-	 */
-	@Nullable
-	public final Integer shardSize() {
-		return this.shardSize;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.bounds != null) {
-			generator.writeKey("bounds");
-			this.bounds.serialize(generator, mapper);
-
-		}
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (this.precision != null) {
-			generator.writeKey("precision");
-			this.precision.serialize(generator, mapper);
-
-		}
-		if (this.shardSize != null) {
-			generator.writeKey("shard_size");
-			generator.write(this.shardSize);
-
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoHashGridAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<GeoHashGridAggregation> {
-		@Nullable
-		private GeoBounds bounds;
-
-		@Nullable
-		private String field;
-
-		@Nullable
-		private GeoHashPrecision precision;
-
-		@Nullable
-		private Integer shardSize;
-
-		@Nullable
-		private Integer size;
-
-		/**
-		 * API name: {@code bounds}
-		 */
-		public final Builder bounds(@Nullable GeoBounds value) {
-			this.bounds = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code bounds}
-		 */
-		public final Builder bounds(Function<GeoBounds.Builder, ObjectBuilder<GeoBounds>> fn) {
-			return this.bounds(fn.apply(new GeoBounds.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code precision}
-		 */
-		public final Builder precision(@Nullable GeoHashPrecision value) {
-			this.precision = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code precision}
-		 */
-		public final Builder precision(Function<GeoHashPrecision.Builder, ObjectBuilder<GeoHashPrecision>> fn) {
-			return this.precision(fn.apply(new GeoHashPrecision.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code shard_size}
-		 */
-		public final Builder shardSize(@Nullable Integer value) {
-			this.shardSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Integer value) {
-			this.size = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoHashGridAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoHashGridAggregation build() {
-			_checkSingleUse();
-
-			return new GeoHashGridAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoHashGridAggregation}
-	 */
-	public static final JsonpDeserializer<GeoHashGridAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GeoHashGridAggregation::setupGeoHashGridAggregationDeserializer);
-
-	protected static void setupGeoHashGridAggregationDeserializer(
-			ObjectDeserializer<GeoHashGridAggregation.Builder> op) {
-		setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::bounds, GeoBounds._DESERIALIZER, "bounds");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::precision, GeoHashPrecision._DESERIALIZER, "precision");
-		op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
-		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
-
-	}
+    @Nullable
+    private final GeoBounds bounds;
+
+    @Nullable
+    private final String field;
+
+    @Nullable
+    private final GeoHashPrecision precision;
+
+    @Nullable
+    private final Integer shardSize;
+
+    @Nullable
+    private final Integer size;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoHashGridAggregation(Builder builder) {
+        super(builder);
+
+        this.bounds = builder.bounds;
+        this.field = builder.field;
+        this.precision = builder.precision;
+        this.shardSize = builder.shardSize;
+        this.size = builder.size;
+
+    }
+
+    public static GeoHashGridAggregation of(Function<Builder, ObjectBuilder<GeoHashGridAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.GeohashGrid;
+    }
+
+    /**
+     * API name: {@code bounds}
+     */
+    @Nullable
+    public final GeoBounds bounds() {
+        return this.bounds;
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code precision}
+     */
+    @Nullable
+    public final GeoHashPrecision precision() {
+        return this.precision;
+    }
+
+    /**
+     * API name: {@code shard_size}
+     */
+    @Nullable
+    public final Integer shardSize() {
+        return this.shardSize;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.bounds != null) {
+            generator.writeKey("bounds");
+            this.bounds.serialize(generator, mapper);
+
+        }
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (this.precision != null) {
+            generator.writeKey("precision");
+            this.precision.serialize(generator, mapper);
+
+        }
+        if (this.shardSize != null) {
+            generator.writeKey("shard_size");
+            generator.write(this.shardSize);
+
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoHashGridAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoHashGridAggregation> {
+        @Nullable
+        private GeoBounds bounds;
+
+        @Nullable
+        private String field;
+
+        @Nullable
+        private GeoHashPrecision precision;
+
+        @Nullable
+        private Integer shardSize;
+
+        @Nullable
+        private Integer size;
+
+        /**
+         * API name: {@code bounds}
+         */
+        public final Builder bounds(@Nullable GeoBounds value) {
+            this.bounds = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code bounds}
+         */
+        public final Builder bounds(Function<GeoBounds.Builder, ObjectBuilder<GeoBounds>> fn) {
+            return this.bounds(fn.apply(new GeoBounds.Builder()).build());
+        }
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code precision}
+         */
+        public final Builder precision(@Nullable GeoHashPrecision value) {
+            this.precision = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code precision}
+         */
+        public final Builder precision(Function<GeoHashPrecision.Builder, ObjectBuilder<GeoHashPrecision>> fn) {
+            return this.precision(fn.apply(new GeoHashPrecision.Builder()).build());
+        }
+
+        /**
+         * API name: {@code shard_size}
+         */
+        public final Builder shardSize(@Nullable Integer value) {
+            this.shardSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Integer value) {
+            this.size = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoHashGridAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoHashGridAggregation build() {
+            _checkSingleUse();
+
+            return new GeoHashGridAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoHashGridAggregation}
+     */
+    public static final JsonpDeserializer<GeoHashGridAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoHashGridAggregation::setupGeoHashGridAggregationDeserializer
+    );
+
+    protected static void setupGeoHashGridAggregationDeserializer(ObjectDeserializer<GeoHashGridAggregation.Builder> op) {
+        setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::bounds, GeoBounds._DESERIALIZER, "bounds");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::precision, GeoHashPrecision._DESERIALIZER, "precision");
+        op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
+        op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoHashGridBucket.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoHashGridBucket.java
index 30c1e73abb..0257da8cc9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoHashGridBucket.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoHashGridBucket.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,92 +41,90 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.GeoHashGridBucket
 
 @JsonpDeserializable
 public class GeoHashGridBucket extends MultiBucketBase {
-	private final String key;
+    private final String key;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private GeoHashGridBucket(Builder builder) {
-		super(builder);
+    private GeoHashGridBucket(Builder builder) {
+        super(builder);
 
-		this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
+        this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
 
-	}
+    }
 
-	public static GeoHashGridBucket of(Function<Builder, ObjectBuilder<GeoHashGridBucket>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static GeoHashGridBucket of(Function<Builder, ObjectBuilder<GeoHashGridBucket>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code key}
-	 */
-	public final String key() {
-		return this.key;
-	}
+    /**
+     * Required - API name: {@code key}
+     */
+    public final String key() {
+        return this.key;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("key");
-		generator.write(this.key);
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("key");
+        generator.write(this.key);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link GeoHashGridBucket}.
-	 */
+    /**
+     * Builder for {@link GeoHashGridBucket}.
+     */
 
-	public static class Builder extends MultiBucketBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<GeoHashGridBucket> {
-		private String key;
+    public static class Builder extends MultiBucketBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoHashGridBucket> {
+        private String key;
 
-		/**
-		 * Required - API name: {@code key}
-		 */
-		public final Builder key(String value) {
-			this.key = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code key}
+         */
+        public final Builder key(String value) {
+            this.key = value;
+            return this;
+        }
 
-		@Override
-		protected Builder self() {
-			return this;
-		}
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link GeoHashGridBucket}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoHashGridBucket build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link GeoHashGridBucket}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoHashGridBucket build() {
+            _checkSingleUse();
 
-			return new GeoHashGridBucket(this);
-		}
-	}
+            return new GeoHashGridBucket(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link GeoHashGridBucket}
-	 */
-	public static final JsonpDeserializer<GeoHashGridBucket> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GeoHashGridBucket::setupGeoHashGridBucketDeserializer);
+    /**
+     * Json deserializer for {@link GeoHashGridBucket}
+     */
+    public static final JsonpDeserializer<GeoHashGridBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoHashGridBucket::setupGeoHashGridBucketDeserializer
+    );
 
-	protected static void setupGeoHashGridBucketDeserializer(ObjectDeserializer<GeoHashGridBucket.Builder> op) {
-		MultiBucketBase.setupMultiBucketBaseDeserializer(op);
-		op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
+    protected static void setupGeoHashGridBucketDeserializer(ObjectDeserializer<GeoHashGridBucket.Builder> op) {
+        MultiBucketBase.setupMultiBucketBaseDeserializer(op);
+        op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoLineAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoLineAggregate.java
index b291e2adc2..b1ee3fd252 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoLineAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoLineAggregate.java
@@ -32,139 +32,139 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.GeoLine;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.GeoLine;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.GeoLineAggregate
 
 @JsonpDeserializable
 public class GeoLineAggregate extends AggregateBase implements AggregateVariant {
-	private final String type;
-
-	private final GeoLine geometry;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoLineAggregate(Builder builder) {
-		super(builder);
-
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-		this.geometry = ApiTypeHelper.requireNonNull(builder.geometry, this, "geometry");
-
-	}
-
-	public static GeoLineAggregate of(Function<Builder, ObjectBuilder<GeoLineAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.GeoLine;
-	}
-
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * Required - API name: {@code geometry}
-	 */
-	public final GeoLine geometry() {
-		return this.geometry;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("type");
-		generator.write(this.type);
-
-		generator.writeKey("geometry");
-		this.geometry.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoLineAggregate}.
-	 */
-
-	public static class Builder extends AggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<GeoLineAggregate> {
-		private String type;
-
-		private GeoLine geometry;
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code geometry}
-		 */
-		public final Builder geometry(GeoLine value) {
-			this.geometry = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code geometry}
-		 */
-		public final Builder geometry(Function<GeoLine.Builder, ObjectBuilder<GeoLine>> fn) {
-			return this.geometry(fn.apply(new GeoLine.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoLineAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoLineAggregate build() {
-			_checkSingleUse();
-
-			return new GeoLineAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoLineAggregate}
-	 */
-	public static final JsonpDeserializer<GeoLineAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GeoLineAggregate::setupGeoLineAggregateDeserializer);
-
-	protected static void setupGeoLineAggregateDeserializer(ObjectDeserializer<GeoLineAggregate.Builder> op) {
-		AggregateBase.setupAggregateBaseDeserializer(op);
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-		op.add(Builder::geometry, GeoLine._DESERIALIZER, "geometry");
-
-	}
+    private final String type;
+
+    private final GeoLine geometry;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoLineAggregate(Builder builder) {
+        super(builder);
+
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.geometry = ApiTypeHelper.requireNonNull(builder.geometry, this, "geometry");
+
+    }
+
+    public static GeoLineAggregate of(Function<Builder, ObjectBuilder<GeoLineAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.GeoLine;
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * Required - API name: {@code geometry}
+     */
+    public final GeoLine geometry() {
+        return this.geometry;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("type");
+        generator.write(this.type);
+
+        generator.writeKey("geometry");
+        this.geometry.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoLineAggregate}.
+     */
+
+    public static class Builder extends AggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoLineAggregate> {
+        private String type;
+
+        private GeoLine geometry;
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code geometry}
+         */
+        public final Builder geometry(GeoLine value) {
+            this.geometry = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code geometry}
+         */
+        public final Builder geometry(Function<GeoLine.Builder, ObjectBuilder<GeoLine>> fn) {
+            return this.geometry(fn.apply(new GeoLine.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoLineAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoLineAggregate build() {
+            _checkSingleUse();
+
+            return new GeoLineAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoLineAggregate}
+     */
+    public static final JsonpDeserializer<GeoLineAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoLineAggregate::setupGeoLineAggregateDeserializer
+    );
+
+    protected static void setupGeoLineAggregateDeserializer(ObjectDeserializer<GeoLineAggregate.Builder> op) {
+        AggregateBase.setupAggregateBaseDeserializer(op);
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+        op.add(Builder::geometry, GeoLine._DESERIALIZER, "geometry");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoLineAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoLineAggregation.java
index 86cbd78c9c..37192388cc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoLineAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoLineAggregation.java
@@ -32,236 +32,238 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.SortOrder;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.SortOrder;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.GeoLineAggregation
 
 @JsonpDeserializable
 public class GeoLineAggregation implements AggregationVariant, JsonpSerializable {
-	private final GeoLinePoint point;
-
-	private final GeoLineSort sort;
-
-	@Nullable
-	private final Boolean includeSort;
-
-	@Nullable
-	private final SortOrder sortOrder;
-
-	@Nullable
-	private final Integer size;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoLineAggregation(Builder builder) {
-
-		this.point = ApiTypeHelper.requireNonNull(builder.point, this, "point");
-		this.sort = ApiTypeHelper.requireNonNull(builder.sort, this, "sort");
-		this.includeSort = builder.includeSort;
-		this.sortOrder = builder.sortOrder;
-		this.size = builder.size;
-
-	}
-
-	public static GeoLineAggregation of(Function<Builder, ObjectBuilder<GeoLineAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.GeoLine;
-	}
-
-	/**
-	 * Required - API name: {@code point}
-	 */
-	public final GeoLinePoint point() {
-		return this.point;
-	}
-
-	/**
-	 * Required - API name: {@code sort}
-	 */
-	public final GeoLineSort sort() {
-		return this.sort;
-	}
-
-	/**
-	 * API name: {@code include_sort}
-	 */
-	@Nullable
-	public final Boolean includeSort() {
-		return this.includeSort;
-	}
-
-	/**
-	 * API name: {@code sort_order}
-	 */
-	@Nullable
-	public final SortOrder sortOrder() {
-		return this.sortOrder;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("point");
-		this.point.serialize(generator, mapper);
-
-		generator.writeKey("sort");
-		this.sort.serialize(generator, mapper);
-
-		if (this.includeSort != null) {
-			generator.writeKey("include_sort");
-			generator.write(this.includeSort);
-
-		}
-		if (this.sortOrder != null) {
-			generator.writeKey("sort_order");
-			this.sortOrder.serialize(generator, mapper);
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoLineAggregation}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoLineAggregation> {
-		private GeoLinePoint point;
-
-		private GeoLineSort sort;
-
-		@Nullable
-		private Boolean includeSort;
-
-		@Nullable
-		private SortOrder sortOrder;
-
-		@Nullable
-		private Integer size;
-
-		/**
-		 * Required - API name: {@code point}
-		 */
-		public final Builder point(GeoLinePoint value) {
-			this.point = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code point}
-		 */
-		public final Builder point(Function<GeoLinePoint.Builder, ObjectBuilder<GeoLinePoint>> fn) {
-			return this.point(fn.apply(new GeoLinePoint.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code sort}
-		 */
-		public final Builder sort(GeoLineSort value) {
-			this.sort = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code sort}
-		 */
-		public final Builder sort(Function<GeoLineSort.Builder, ObjectBuilder<GeoLineSort>> fn) {
-			return this.sort(fn.apply(new GeoLineSort.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code include_sort}
-		 */
-		public final Builder includeSort(@Nullable Boolean value) {
-			this.includeSort = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort_order}
-		 */
-		public final Builder sortOrder(@Nullable SortOrder value) {
-			this.sortOrder = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Integer value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoLineAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoLineAggregation build() {
-			_checkSingleUse();
-
-			return new GeoLineAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoLineAggregation}
-	 */
-	public static final JsonpDeserializer<GeoLineAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GeoLineAggregation::setupGeoLineAggregationDeserializer);
-
-	protected static void setupGeoLineAggregationDeserializer(ObjectDeserializer<GeoLineAggregation.Builder> op) {
-
-		op.add(Builder::point, GeoLinePoint._DESERIALIZER, "point");
-		op.add(Builder::sort, GeoLineSort._DESERIALIZER, "sort");
-		op.add(Builder::includeSort, JsonpDeserializer.booleanDeserializer(), "include_sort");
-		op.add(Builder::sortOrder, SortOrder._DESERIALIZER, "sort_order");
-		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
-
-	}
+    private final GeoLinePoint point;
+
+    private final GeoLineSort sort;
+
+    @Nullable
+    private final Boolean includeSort;
+
+    @Nullable
+    private final SortOrder sortOrder;
+
+    @Nullable
+    private final Integer size;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoLineAggregation(Builder builder) {
+
+        this.point = ApiTypeHelper.requireNonNull(builder.point, this, "point");
+        this.sort = ApiTypeHelper.requireNonNull(builder.sort, this, "sort");
+        this.includeSort = builder.includeSort;
+        this.sortOrder = builder.sortOrder;
+        this.size = builder.size;
+
+    }
+
+    public static GeoLineAggregation of(Function<Builder, ObjectBuilder<GeoLineAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.GeoLine;
+    }
+
+    /**
+     * Required - API name: {@code point}
+     */
+    public final GeoLinePoint point() {
+        return this.point;
+    }
+
+    /**
+     * Required - API name: {@code sort}
+     */
+    public final GeoLineSort sort() {
+        return this.sort;
+    }
+
+    /**
+     * API name: {@code include_sort}
+     */
+    @Nullable
+    public final Boolean includeSort() {
+        return this.includeSort;
+    }
+
+    /**
+     * API name: {@code sort_order}
+     */
+    @Nullable
+    public final SortOrder sortOrder() {
+        return this.sortOrder;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("point");
+        this.point.serialize(generator, mapper);
+
+        generator.writeKey("sort");
+        this.sort.serialize(generator, mapper);
+
+        if (this.includeSort != null) {
+            generator.writeKey("include_sort");
+            generator.write(this.includeSort);
+
+        }
+        if (this.sortOrder != null) {
+            generator.writeKey("sort_order");
+            this.sortOrder.serialize(generator, mapper);
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoLineAggregation}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoLineAggregation> {
+        private GeoLinePoint point;
+
+        private GeoLineSort sort;
+
+        @Nullable
+        private Boolean includeSort;
+
+        @Nullable
+        private SortOrder sortOrder;
+
+        @Nullable
+        private Integer size;
+
+        /**
+         * Required - API name: {@code point}
+         */
+        public final Builder point(GeoLinePoint value) {
+            this.point = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code point}
+         */
+        public final Builder point(Function<GeoLinePoint.Builder, ObjectBuilder<GeoLinePoint>> fn) {
+            return this.point(fn.apply(new GeoLinePoint.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code sort}
+         */
+        public final Builder sort(GeoLineSort value) {
+            this.sort = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code sort}
+         */
+        public final Builder sort(Function<GeoLineSort.Builder, ObjectBuilder<GeoLineSort>> fn) {
+            return this.sort(fn.apply(new GeoLineSort.Builder()).build());
+        }
+
+        /**
+         * API name: {@code include_sort}
+         */
+        public final Builder includeSort(@Nullable Boolean value) {
+            this.includeSort = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code sort_order}
+         */
+        public final Builder sortOrder(@Nullable SortOrder value) {
+            this.sortOrder = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Integer value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoLineAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoLineAggregation build() {
+            _checkSingleUse();
+
+            return new GeoLineAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoLineAggregation}
+     */
+    public static final JsonpDeserializer<GeoLineAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoLineAggregation::setupGeoLineAggregationDeserializer
+    );
+
+    protected static void setupGeoLineAggregationDeserializer(ObjectDeserializer<GeoLineAggregation.Builder> op) {
+
+        op.add(Builder::point, GeoLinePoint._DESERIALIZER, "point");
+        op.add(Builder::sort, GeoLineSort._DESERIALIZER, "sort");
+        op.add(Builder::includeSort, JsonpDeserializer.booleanDeserializer(), "include_sort");
+        op.add(Builder::sortOrder, SortOrder._DESERIALIZER, "sort_order");
+        op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoLinePoint.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoLinePoint.java
index 6bfae2a3b7..5ee23e7d8d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoLinePoint.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoLinePoint.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,92 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.GeoLinePoint
 
 @JsonpDeserializable
 public class GeoLinePoint implements JsonpSerializable {
-	private final String field;
+    private final String field;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private GeoLinePoint(Builder builder) {
+    private GeoLinePoint(Builder builder) {
 
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
 
-	}
+    }
 
-	public static GeoLinePoint of(Function<Builder, ObjectBuilder<GeoLinePoint>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static GeoLinePoint of(Function<Builder, ObjectBuilder<GeoLinePoint>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("field");
-		generator.write(this.field);
+        generator.writeKey("field");
+        generator.write(this.field);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link GeoLinePoint}.
-	 */
+    /**
+     * Builder for {@link GeoLinePoint}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoLinePoint> {
-		private String field;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoLinePoint> {
+        private String field;
 
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link GeoLinePoint}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoLinePoint build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link GeoLinePoint}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoLinePoint build() {
+            _checkSingleUse();
 
-			return new GeoLinePoint(this);
-		}
-	}
+            return new GeoLinePoint(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link GeoLinePoint}
-	 */
-	public static final JsonpDeserializer<GeoLinePoint> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GeoLinePoint::setupGeoLinePointDeserializer);
+    /**
+     * Json deserializer for {@link GeoLinePoint}
+     */
+    public static final JsonpDeserializer<GeoLinePoint> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoLinePoint::setupGeoLinePointDeserializer
+    );
 
-	protected static void setupGeoLinePointDeserializer(ObjectDeserializer<GeoLinePoint.Builder> op) {
+    protected static void setupGeoLinePointDeserializer(ObjectDeserializer<GeoLinePoint.Builder> op) {
 
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoLineSort.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoLineSort.java
index ac3a02fbe1..713e3fcddc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoLineSort.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoLineSort.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,92 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.GeoLineSort
 
 @JsonpDeserializable
 public class GeoLineSort implements JsonpSerializable {
-	private final String field;
+    private final String field;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private GeoLineSort(Builder builder) {
+    private GeoLineSort(Builder builder) {
 
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
 
-	}
+    }
 
-	public static GeoLineSort of(Function<Builder, ObjectBuilder<GeoLineSort>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static GeoLineSort of(Function<Builder, ObjectBuilder<GeoLineSort>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("field");
-		generator.write(this.field);
+        generator.writeKey("field");
+        generator.write(this.field);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link GeoLineSort}.
-	 */
+    /**
+     * Builder for {@link GeoLineSort}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoLineSort> {
-		private String field;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoLineSort> {
+        private String field;
 
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link GeoLineSort}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoLineSort build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link GeoLineSort}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoLineSort build() {
+            _checkSingleUse();
 
-			return new GeoLineSort(this);
-		}
-	}
+            return new GeoLineSort(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link GeoLineSort}
-	 */
-	public static final JsonpDeserializer<GeoLineSort> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GeoLineSort::setupGeoLineSortDeserializer);
+    /**
+     * Json deserializer for {@link GeoLineSort}
+     */
+    public static final JsonpDeserializer<GeoLineSort> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoLineSort::setupGeoLineSortDeserializer
+    );
 
-	protected static void setupGeoLineSortDeserializer(ObjectDeserializer<GeoLineSort.Builder> op) {
+    protected static void setupGeoLineSortDeserializer(ObjectDeserializer<GeoLineSort.Builder> op) {
 
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoTileGridAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoTileGridAggregate.java
index 02327a8a95..6e8217b0d4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoTileGridAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoTileGridAggregate.java
@@ -32,76 +32,77 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.GeoTileGridAggregate
 
 @JsonpDeserializable
 public class GeoTileGridAggregate extends MultiBucketAggregateBase<GeoTileGridBucket> implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoTileGridAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static GeoTileGridAggregate of(Function<Builder, ObjectBuilder<GeoTileGridAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.GeotileGrid;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoTileGridAggregate}.
-	 */
-
-	public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<GeoTileGridBucket, Builder>
-			implements
-				ObjectBuilder<GeoTileGridAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoTileGridAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoTileGridAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new GeoTileGridAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoTileGridAggregate}
-	 */
-	public static final JsonpDeserializer<GeoTileGridAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GeoTileGridAggregate::setupGeoTileGridAggregateDeserializer);
-
-	protected static void setupGeoTileGridAggregateDeserializer(ObjectDeserializer<GeoTileGridAggregate.Builder> op) {
-		MultiBucketAggregateBase.setupMultiBucketAggregateBaseDeserializer(op, GeoTileGridBucket._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoTileGridAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static GeoTileGridAggregate of(Function<Builder, ObjectBuilder<GeoTileGridAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.GeotileGrid;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoTileGridAggregate}.
+     */
+
+    public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<GeoTileGridBucket, Builder>
+        implements
+            ObjectBuilder<GeoTileGridAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoTileGridAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoTileGridAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new GeoTileGridAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoTileGridAggregate}
+     */
+    public static final JsonpDeserializer<GeoTileGridAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoTileGridAggregate::setupGeoTileGridAggregateDeserializer
+    );
+
+    protected static void setupGeoTileGridAggregateDeserializer(ObjectDeserializer<GeoTileGridAggregate.Builder> op) {
+        MultiBucketAggregateBase.setupMultiBucketAggregateBaseDeserializer(op, GeoTileGridBucket._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoTileGridAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoTileGridAggregation.java
index b783989693..d984506d5a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoTileGridAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoTileGridAggregation.java
@@ -32,238 +32,237 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.GeoBounds;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.GeoBounds;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.GeoTileGridAggregation
 
 @JsonpDeserializable
 public class GeoTileGridAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final String field;
-
-	@Nullable
-	private final Number precision;
-
-	@Nullable
-	private final Integer shardSize;
-
-	@Nullable
-	private final Integer size;
-
-	@Nullable
-	private final GeoBounds bounds;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoTileGridAggregation(Builder builder) {
-		super(builder);
-
-		this.field = builder.field;
-		this.precision = builder.precision;
-		this.shardSize = builder.shardSize;
-		this.size = builder.size;
-		this.bounds = builder.bounds;
-
-	}
-
-	public static GeoTileGridAggregation of(Function<Builder, ObjectBuilder<GeoTileGridAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.GeotileGrid;
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code precision}
-	 */
-	@Nullable
-	public final Number precision() {
-		return this.precision;
-	}
-
-	/**
-	 * API name: {@code shard_size}
-	 */
-	@Nullable
-	public final Integer shardSize() {
-		return this.shardSize;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	/**
-	 * API name: {@code bounds}
-	 */
-	@Nullable
-	public final GeoBounds bounds() {
-		return this.bounds;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (this.precision != null) {
-			generator.writeKey("precision");
-			generator.write(this.precision.doubleValue());
-
-		}
-		if (this.shardSize != null) {
-			generator.writeKey("shard_size");
-			generator.write(this.shardSize);
-
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		if (this.bounds != null) {
-			generator.writeKey("bounds");
-			this.bounds.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoTileGridAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<GeoTileGridAggregation> {
-		@Nullable
-		private String field;
-
-		@Nullable
-		private Number precision;
-
-		@Nullable
-		private Integer shardSize;
-
-		@Nullable
-		private Integer size;
-
-		@Nullable
-		private GeoBounds bounds;
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code precision}
-		 */
-		public final Builder precision(@Nullable Number value) {
-			this.precision = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code shard_size}
-		 */
-		public final Builder shardSize(@Nullable Integer value) {
-			this.shardSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Integer value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code bounds}
-		 */
-		public final Builder bounds(@Nullable GeoBounds value) {
-			this.bounds = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code bounds}
-		 */
-		public final Builder bounds(Function<GeoBounds.Builder, ObjectBuilder<GeoBounds>> fn) {
-			return this.bounds(fn.apply(new GeoBounds.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoTileGridAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoTileGridAggregation build() {
-			_checkSingleUse();
-
-			return new GeoTileGridAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoTileGridAggregation}
-	 */
-	public static final JsonpDeserializer<GeoTileGridAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GeoTileGridAggregation::setupGeoTileGridAggregationDeserializer);
-
-	protected static void setupGeoTileGridAggregationDeserializer(
-			ObjectDeserializer<GeoTileGridAggregation.Builder> op) {
-		BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::precision, JsonpDeserializer.numberDeserializer(), "precision");
-		op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
-		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
-		op.add(Builder::bounds, GeoBounds._DESERIALIZER, "bounds");
-
-	}
+    @Nullable
+    private final String field;
+
+    @Nullable
+    private final Number precision;
+
+    @Nullable
+    private final Integer shardSize;
+
+    @Nullable
+    private final Integer size;
+
+    @Nullable
+    private final GeoBounds bounds;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoTileGridAggregation(Builder builder) {
+        super(builder);
+
+        this.field = builder.field;
+        this.precision = builder.precision;
+        this.shardSize = builder.shardSize;
+        this.size = builder.size;
+        this.bounds = builder.bounds;
+
+    }
+
+    public static GeoTileGridAggregation of(Function<Builder, ObjectBuilder<GeoTileGridAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.GeotileGrid;
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code precision}
+     */
+    @Nullable
+    public final Number precision() {
+        return this.precision;
+    }
+
+    /**
+     * API name: {@code shard_size}
+     */
+    @Nullable
+    public final Integer shardSize() {
+        return this.shardSize;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    /**
+     * API name: {@code bounds}
+     */
+    @Nullable
+    public final GeoBounds bounds() {
+        return this.bounds;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (this.precision != null) {
+            generator.writeKey("precision");
+            generator.write(this.precision.doubleValue());
+
+        }
+        if (this.shardSize != null) {
+            generator.writeKey("shard_size");
+            generator.write(this.shardSize);
+
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        if (this.bounds != null) {
+            generator.writeKey("bounds");
+            this.bounds.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoTileGridAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoTileGridAggregation> {
+        @Nullable
+        private String field;
+
+        @Nullable
+        private Number precision;
+
+        @Nullable
+        private Integer shardSize;
+
+        @Nullable
+        private Integer size;
+
+        @Nullable
+        private GeoBounds bounds;
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code precision}
+         */
+        public final Builder precision(@Nullable Number value) {
+            this.precision = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code shard_size}
+         */
+        public final Builder shardSize(@Nullable Integer value) {
+            this.shardSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Integer value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code bounds}
+         */
+        public final Builder bounds(@Nullable GeoBounds value) {
+            this.bounds = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code bounds}
+         */
+        public final Builder bounds(Function<GeoBounds.Builder, ObjectBuilder<GeoBounds>> fn) {
+            return this.bounds(fn.apply(new GeoBounds.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoTileGridAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoTileGridAggregation build() {
+            _checkSingleUse();
+
+            return new GeoTileGridAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoTileGridAggregation}
+     */
+    public static final JsonpDeserializer<GeoTileGridAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoTileGridAggregation::setupGeoTileGridAggregationDeserializer
+    );
+
+    protected static void setupGeoTileGridAggregationDeserializer(ObjectDeserializer<GeoTileGridAggregation.Builder> op) {
+        BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::precision, JsonpDeserializer.numberDeserializer(), "precision");
+        op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
+        op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
+        op.add(Builder::bounds, GeoBounds._DESERIALIZER, "bounds");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoTileGridBucket.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoTileGridBucket.java
index 3db0745d26..5783061377 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoTileGridBucket.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GeoTileGridBucket.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,93 +41,90 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.GeoTileGridBucket
 
-
 @JsonpDeserializable
 public class GeoTileGridBucket extends MultiBucketBase {
-	private final String key;
+    private final String key;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private GeoTileGridBucket(Builder builder) {
-		super(builder);
+    private GeoTileGridBucket(Builder builder) {
+        super(builder);
 
-		this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
+        this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
 
-	}
+    }
 
-	public static GeoTileGridBucket of(Function<Builder, ObjectBuilder<GeoTileGridBucket>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static GeoTileGridBucket of(Function<Builder, ObjectBuilder<GeoTileGridBucket>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code key}
-	 */
-	public final String key() {
-		return this.key;
-	}
+    /**
+     * Required - API name: {@code key}
+     */
+    public final String key() {
+        return this.key;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("key");
-		generator.write(this.key);
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("key");
+        generator.write(this.key);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link GeoTileGridBucket}.
-	 */
+    /**
+     * Builder for {@link GeoTileGridBucket}.
+     */
 
-	public static class Builder extends MultiBucketBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<GeoTileGridBucket> {
-		private String key;
+    public static class Builder extends MultiBucketBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoTileGridBucket> {
+        private String key;
 
-		/**
-		 * Required - API name: {@code key}
-		 */
-		public final Builder key(String value) {
-			this.key = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code key}
+         */
+        public final Builder key(String value) {
+            this.key = value;
+            return this;
+        }
 
-		@Override
-		protected Builder self() {
-			return this;
-		}
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link GeoTileGridBucket}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoTileGridBucket build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link GeoTileGridBucket}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoTileGridBucket build() {
+            _checkSingleUse();
 
-			return new GeoTileGridBucket(this);
-		}
-	}
+            return new GeoTileGridBucket(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link GeoTileGridBucket}
-	 */
-	public static final JsonpDeserializer<GeoTileGridBucket> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GeoTileGridBucket::setupGeoTileGridBucketDeserializer);
+    /**
+     * Json deserializer for {@link GeoTileGridBucket}
+     */
+    public static final JsonpDeserializer<GeoTileGridBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoTileGridBucket::setupGeoTileGridBucketDeserializer
+    );
 
-	protected static void setupGeoTileGridBucketDeserializer(ObjectDeserializer<GeoTileGridBucket.Builder> op) {
-		MultiBucketBase.setupMultiBucketBaseDeserializer(op);
-		op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
+    protected static void setupGeoTileGridBucketDeserializer(ObjectDeserializer<GeoTileGridBucket.Builder> op) {
+        MultiBucketBase.setupMultiBucketBaseDeserializer(op);
+        op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GlobalAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GlobalAggregate.java
index c03141da7f..6ce98ca75a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GlobalAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GlobalAggregate.java
@@ -32,76 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.GlobalAggregate
 
-
 @JsonpDeserializable
 public class GlobalAggregate extends SingleBucketAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private GlobalAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static GlobalAggregate of(Function<Builder, ObjectBuilder<GlobalAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Global;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GlobalAggregate}.
-	 */
-
-	public static class Builder extends SingleBucketAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<GlobalAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GlobalAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GlobalAggregate build() {
-			_checkSingleUse();
-
-			return new GlobalAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GlobalAggregate}
-	 */
-	public static final JsonpDeserializer<GlobalAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GlobalAggregate::setupGlobalAggregateDeserializer);
-
-	protected static void setupGlobalAggregateDeserializer(ObjectDeserializer<GlobalAggregate.Builder> op) {
-		setupSingleBucketAggregateBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private GlobalAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static GlobalAggregate of(Function<Builder, ObjectBuilder<GlobalAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Global;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GlobalAggregate}.
+     */
+
+    public static class Builder extends SingleBucketAggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<GlobalAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GlobalAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GlobalAggregate build() {
+            _checkSingleUse();
+
+            return new GlobalAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GlobalAggregate}
+     */
+    public static final JsonpDeserializer<GlobalAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GlobalAggregate::setupGlobalAggregateDeserializer
+    );
+
+    protected static void setupGlobalAggregateDeserializer(ObjectDeserializer<GlobalAggregate.Builder> op) {
+        setupSingleBucketAggregateBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GlobalAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GlobalAggregation.java
index 5b96a233b8..29c7e9c9ac 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GlobalAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GlobalAggregation.java
@@ -32,76 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.GlobalAggregation
 
-
 @JsonpDeserializable
 public class GlobalAggregation extends BucketAggregationBase implements AggregationVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private GlobalAggregation(Builder builder) {
-		super(builder);
-
-	}
-
-	public static GlobalAggregation of(Function<Builder, ObjectBuilder<GlobalAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Global;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GlobalAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<GlobalAggregation> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GlobalAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GlobalAggregation build() {
-			_checkSingleUse();
-
-			return new GlobalAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GlobalAggregation}
-	 */
-	public static final JsonpDeserializer<GlobalAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GlobalAggregation::setupGlobalAggregationDeserializer);
-
-	protected static void setupGlobalAggregationDeserializer(ObjectDeserializer<GlobalAggregation.Builder> op) {
-		setupBucketAggregationBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private GlobalAggregation(Builder builder) {
+        super(builder);
+
+    }
+
+    public static GlobalAggregation of(Function<Builder, ObjectBuilder<GlobalAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Global;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GlobalAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<GlobalAggregation> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GlobalAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GlobalAggregation build() {
+            _checkSingleUse();
+
+            return new GlobalAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GlobalAggregation}
+     */
+    public static final JsonpDeserializer<GlobalAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GlobalAggregation::setupGlobalAggregationDeserializer
+    );
+
+    protected static void setupGlobalAggregationDeserializer(ObjectDeserializer<GlobalAggregation.Builder> op) {
+        setupBucketAggregationBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GoogleNormalizedDistanceHeuristic.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GoogleNormalizedDistanceHeuristic.java
index 58f0e252f8..586bbefe8f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GoogleNormalizedDistanceHeuristic.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/GoogleNormalizedDistanceHeuristic.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,102 +43,100 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.GoogleNormalizedDistanceHeuristic
 
-
 @JsonpDeserializable
 public class GoogleNormalizedDistanceHeuristic implements JsonpSerializable {
-	@Nullable
-	private final Boolean backgroundIsSuperset;
+    @Nullable
+    private final Boolean backgroundIsSuperset;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private GoogleNormalizedDistanceHeuristic(Builder builder) {
+    private GoogleNormalizedDistanceHeuristic(Builder builder) {
 
-		this.backgroundIsSuperset = builder.backgroundIsSuperset;
+        this.backgroundIsSuperset = builder.backgroundIsSuperset;
 
-	}
+    }
 
-	public static GoogleNormalizedDistanceHeuristic of(
-			Function<Builder, ObjectBuilder<GoogleNormalizedDistanceHeuristic>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static GoogleNormalizedDistanceHeuristic of(Function<Builder, ObjectBuilder<GoogleNormalizedDistanceHeuristic>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * API name: {@code background_is_superset}
-	 */
-	@Nullable
-	public final Boolean backgroundIsSuperset() {
-		return this.backgroundIsSuperset;
-	}
+    /**
+     * API name: {@code background_is_superset}
+     */
+    @Nullable
+    public final Boolean backgroundIsSuperset() {
+        return this.backgroundIsSuperset;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		if (this.backgroundIsSuperset != null) {
-			generator.writeKey("background_is_superset");
-			generator.write(this.backgroundIsSuperset);
+        if (this.backgroundIsSuperset != null) {
+            generator.writeKey("background_is_superset");
+            generator.write(this.backgroundIsSuperset);
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link GoogleNormalizedDistanceHeuristic}.
-	 */
+    /**
+     * Builder for {@link GoogleNormalizedDistanceHeuristic}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GoogleNormalizedDistanceHeuristic> {
-		@Nullable
-		private Boolean backgroundIsSuperset;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GoogleNormalizedDistanceHeuristic> {
+        @Nullable
+        private Boolean backgroundIsSuperset;
 
-		/**
-		 * API name: {@code background_is_superset}
-		 */
-		public final Builder backgroundIsSuperset(@Nullable Boolean value) {
-			this.backgroundIsSuperset = value;
-			return this;
-		}
+        /**
+         * API name: {@code background_is_superset}
+         */
+        public final Builder backgroundIsSuperset(@Nullable Boolean value) {
+            this.backgroundIsSuperset = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link GoogleNormalizedDistanceHeuristic}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GoogleNormalizedDistanceHeuristic build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link GoogleNormalizedDistanceHeuristic}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GoogleNormalizedDistanceHeuristic build() {
+            _checkSingleUse();
 
-			return new GoogleNormalizedDistanceHeuristic(this);
-		}
-	}
+            return new GoogleNormalizedDistanceHeuristic(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link GoogleNormalizedDistanceHeuristic}
-	 */
-	public static final JsonpDeserializer<GoogleNormalizedDistanceHeuristic> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GoogleNormalizedDistanceHeuristic::setupGoogleNormalizedDistanceHeuristicDeserializer);
+    /**
+     * Json deserializer for {@link GoogleNormalizedDistanceHeuristic}
+     */
+    public static final JsonpDeserializer<GoogleNormalizedDistanceHeuristic> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GoogleNormalizedDistanceHeuristic::setupGoogleNormalizedDistanceHeuristicDeserializer
+    );
 
-	protected static void setupGoogleNormalizedDistanceHeuristicDeserializer(
-			ObjectDeserializer<GoogleNormalizedDistanceHeuristic.Builder> op) {
+    protected static void setupGoogleNormalizedDistanceHeuristicDeserializer(
+        ObjectDeserializer<GoogleNormalizedDistanceHeuristic.Builder> op
+    ) {
 
-		op.add(Builder::backgroundIsSuperset, JsonpDeserializer.booleanDeserializer(), "background_is_superset");
+        op.add(Builder::backgroundIsSuperset, JsonpDeserializer.booleanDeserializer(), "background_is_superset");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HdrMethod.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HdrMethod.java
index 1dd85b696a..30583cf6d0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HdrMethod.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HdrMethod.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,101 +43,98 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.HdrMethod
 
-
 @JsonpDeserializable
 public class HdrMethod implements JsonpSerializable {
-	@Nullable
-	private final Integer numberOfSignificantValueDigits;
+    @Nullable
+    private final Integer numberOfSignificantValueDigits;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private HdrMethod(Builder builder) {
+    private HdrMethod(Builder builder) {
 
-		this.numberOfSignificantValueDigits = builder.numberOfSignificantValueDigits;
+        this.numberOfSignificantValueDigits = builder.numberOfSignificantValueDigits;
 
-	}
+    }
 
-	public static HdrMethod of(Function<Builder, ObjectBuilder<HdrMethod>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static HdrMethod of(Function<Builder, ObjectBuilder<HdrMethod>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * API name: {@code number_of_significant_value_digits}
-	 */
-	@Nullable
-	public final Integer numberOfSignificantValueDigits() {
-		return this.numberOfSignificantValueDigits;
-	}
+    /**
+     * API name: {@code number_of_significant_value_digits}
+     */
+    @Nullable
+    public final Integer numberOfSignificantValueDigits() {
+        return this.numberOfSignificantValueDigits;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		if (this.numberOfSignificantValueDigits != null) {
-			generator.writeKey("number_of_significant_value_digits");
-			generator.write(this.numberOfSignificantValueDigits);
+        if (this.numberOfSignificantValueDigits != null) {
+            generator.writeKey("number_of_significant_value_digits");
+            generator.write(this.numberOfSignificantValueDigits);
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link HdrMethod}.
-	 */
+    /**
+     * Builder for {@link HdrMethod}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HdrMethod> {
-		@Nullable
-		private Integer numberOfSignificantValueDigits;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HdrMethod> {
+        @Nullable
+        private Integer numberOfSignificantValueDigits;
 
-		/**
-		 * API name: {@code number_of_significant_value_digits}
-		 */
-		public final Builder numberOfSignificantValueDigits(@Nullable Integer value) {
-			this.numberOfSignificantValueDigits = value;
-			return this;
-		}
+        /**
+         * API name: {@code number_of_significant_value_digits}
+         */
+        public final Builder numberOfSignificantValueDigits(@Nullable Integer value) {
+            this.numberOfSignificantValueDigits = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link HdrMethod}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HdrMethod build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link HdrMethod}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HdrMethod build() {
+            _checkSingleUse();
 
-			return new HdrMethod(this);
-		}
-	}
+            return new HdrMethod(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link HdrMethod}
-	 */
-	public static final JsonpDeserializer<HdrMethod> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			HdrMethod::setupHdrMethodDeserializer);
+    /**
+     * Json deserializer for {@link HdrMethod}
+     */
+    public static final JsonpDeserializer<HdrMethod> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HdrMethod::setupHdrMethodDeserializer
+    );
 
-	protected static void setupHdrMethodDeserializer(ObjectDeserializer<HdrMethod.Builder> op) {
+    protected static void setupHdrMethodDeserializer(ObjectDeserializer<HdrMethod.Builder> op) {
 
-		op.add(Builder::numberOfSignificantValueDigits, JsonpDeserializer.integerDeserializer(),
-				"number_of_significant_value_digits");
+        op.add(Builder::numberOfSignificantValueDigits, JsonpDeserializer.integerDeserializer(), "number_of_significant_value_digits");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HdrPercentileRanksAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HdrPercentileRanksAggregate.java
index f742b4e61c..c669870fbe 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HdrPercentileRanksAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HdrPercentileRanksAggregate.java
@@ -32,77 +32,76 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.HdrPercentileRanksAggregate
 
-
 @JsonpDeserializable
 public class HdrPercentileRanksAggregate extends PercentilesAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private HdrPercentileRanksAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static HdrPercentileRanksAggregate of(Function<Builder, ObjectBuilder<HdrPercentileRanksAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.HdrPercentileRanks;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HdrPercentileRanksAggregate}.
-	 */
-
-	public static class Builder extends PercentilesAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<HdrPercentileRanksAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HdrPercentileRanksAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HdrPercentileRanksAggregate build() {
-			_checkSingleUse();
-
-			return new HdrPercentileRanksAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HdrPercentileRanksAggregate}
-	 */
-	public static final JsonpDeserializer<HdrPercentileRanksAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, HdrPercentileRanksAggregate::setupHdrPercentileRanksAggregateDeserializer);
-
-	protected static void setupHdrPercentileRanksAggregateDeserializer(
-			ObjectDeserializer<HdrPercentileRanksAggregate.Builder> op) {
-		setupPercentilesAggregateBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private HdrPercentileRanksAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static HdrPercentileRanksAggregate of(Function<Builder, ObjectBuilder<HdrPercentileRanksAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.HdrPercentileRanks;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HdrPercentileRanksAggregate}.
+     */
+
+    public static class Builder extends PercentilesAggregateBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<HdrPercentileRanksAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link HdrPercentileRanksAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HdrPercentileRanksAggregate build() {
+            _checkSingleUse();
+
+            return new HdrPercentileRanksAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HdrPercentileRanksAggregate}
+     */
+    public static final JsonpDeserializer<HdrPercentileRanksAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HdrPercentileRanksAggregate::setupHdrPercentileRanksAggregateDeserializer
+    );
+
+    protected static void setupHdrPercentileRanksAggregateDeserializer(ObjectDeserializer<HdrPercentileRanksAggregate.Builder> op) {
+        setupPercentilesAggregateBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HdrPercentilesAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HdrPercentilesAggregate.java
index 216f13a826..38a4f450e8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HdrPercentilesAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HdrPercentilesAggregate.java
@@ -32,77 +32,76 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.HdrPercentilesAggregate
 
-
 @JsonpDeserializable
 public class HdrPercentilesAggregate extends PercentilesAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private HdrPercentilesAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static HdrPercentilesAggregate of(Function<Builder, ObjectBuilder<HdrPercentilesAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.HdrPercentiles;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HdrPercentilesAggregate}.
-	 */
-
-	public static class Builder extends PercentilesAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<HdrPercentilesAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HdrPercentilesAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HdrPercentilesAggregate build() {
-			_checkSingleUse();
-
-			return new HdrPercentilesAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HdrPercentilesAggregate}
-	 */
-	public static final JsonpDeserializer<HdrPercentilesAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, HdrPercentilesAggregate::setupHdrPercentilesAggregateDeserializer);
-
-	protected static void setupHdrPercentilesAggregateDeserializer(
-			ObjectDeserializer<HdrPercentilesAggregate.Builder> op) {
-		setupPercentilesAggregateBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private HdrPercentilesAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static HdrPercentilesAggregate of(Function<Builder, ObjectBuilder<HdrPercentilesAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.HdrPercentiles;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HdrPercentilesAggregate}.
+     */
+
+    public static class Builder extends PercentilesAggregateBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<HdrPercentilesAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link HdrPercentilesAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HdrPercentilesAggregate build() {
+            _checkSingleUse();
+
+            return new HdrPercentilesAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HdrPercentilesAggregate}
+     */
+    public static final JsonpDeserializer<HdrPercentilesAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HdrPercentilesAggregate::setupHdrPercentilesAggregateDeserializer
+    );
+
+    protected static void setupHdrPercentilesAggregateDeserializer(ObjectDeserializer<HdrPercentilesAggregate.Builder> op) {
+        setupPercentilesAggregateBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HistogramAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HistogramAggregate.java
index 3afeb8bbde..3a4300c029 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HistogramAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HistogramAggregate.java
@@ -32,77 +32,77 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.HistogramAggregate
 
-
 @JsonpDeserializable
 public class HistogramAggregate extends MultiBucketAggregateBase<HistogramBucket> implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private HistogramAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static HistogramAggregate of(Function<Builder, ObjectBuilder<HistogramAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Histogram;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HistogramAggregate}.
-	 */
-
-	public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<HistogramBucket, Builder>
-			implements
-				ObjectBuilder<HistogramAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HistogramAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HistogramAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new HistogramAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HistogramAggregate}
-	 */
-	public static final JsonpDeserializer<HistogramAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, HistogramAggregate::setupHistogramAggregateDeserializer);
-
-	protected static void setupHistogramAggregateDeserializer(ObjectDeserializer<HistogramAggregate.Builder> op) {
-		MultiBucketAggregateBase.setupMultiBucketAggregateBaseDeserializer(op, HistogramBucket._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private HistogramAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static HistogramAggregate of(Function<Builder, ObjectBuilder<HistogramAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Histogram;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HistogramAggregate}.
+     */
+
+    public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<HistogramBucket, Builder>
+        implements
+            ObjectBuilder<HistogramAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link HistogramAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HistogramAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new HistogramAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HistogramAggregate}
+     */
+    public static final JsonpDeserializer<HistogramAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HistogramAggregate::setupHistogramAggregateDeserializer
+    );
+
+    protected static void setupHistogramAggregateDeserializer(ObjectDeserializer<HistogramAggregate.Builder> op) {
+        MultiBucketAggregateBase.setupMultiBucketAggregateBaseDeserializer(op, HistogramBucket._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HistogramAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HistogramAggregation.java
index 3e78fb63b3..0c5603947b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HistogramAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HistogramAggregation.java
@@ -32,438 +32,436 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.HistogramAggregation
 
-
 @JsonpDeserializable
 public class HistogramAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final ExtendedBounds<Double> extendedBounds;
-
-	@Nullable
-	private final ExtendedBounds<Double> hardBounds;
-
-	@Nullable
-	private final String field;
-
-	@Nullable
-	private final Double interval;
-
-	@Nullable
-	private final Integer minDocCount;
-
-	@Nullable
-	private final Double missing;
-
-	@Nullable
-	private final Double offset;
-
-	@Nullable
-	private final HistogramOrder order;
-
-	@Nullable
-	private final Script script;
-
-	@Nullable
-	private final String format;
-
-	@Nullable
-	private final Boolean keyed;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HistogramAggregation(Builder builder) {
-		super(builder);
-
-		this.extendedBounds = builder.extendedBounds;
-		this.hardBounds = builder.hardBounds;
-		this.field = builder.field;
-		this.interval = builder.interval;
-		this.minDocCount = builder.minDocCount;
-		this.missing = builder.missing;
-		this.offset = builder.offset;
-		this.order = builder.order;
-		this.script = builder.script;
-		this.format = builder.format;
-		this.keyed = builder.keyed;
-
-	}
-
-	public static HistogramAggregation of(Function<Builder, ObjectBuilder<HistogramAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Histogram;
-	}
-
-	/**
-	 * API name: {@code extended_bounds}
-	 */
-	@Nullable
-	public final ExtendedBounds<Double> extendedBounds() {
-		return this.extendedBounds;
-	}
-
-	/**
-	 * API name: {@code hard_bounds}
-	 */
-	@Nullable
-	public final ExtendedBounds<Double> hardBounds() {
-		return this.hardBounds;
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code interval}
-	 */
-	@Nullable
-	public final Double interval() {
-		return this.interval;
-	}
-
-	/**
-	 * API name: {@code min_doc_count}
-	 */
-	@Nullable
-	public final Integer minDocCount() {
-		return this.minDocCount;
-	}
-
-	/**
-	 * API name: {@code missing}
-	 */
-	@Nullable
-	public final Double missing() {
-		return this.missing;
-	}
-
-	/**
-	 * API name: {@code offset}
-	 */
-	@Nullable
-	public final Double offset() {
-		return this.offset;
-	}
-
-	/**
-	 * API name: {@code order}
-	 */
-	@Nullable
-	public final HistogramOrder order() {
-		return this.order;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final Script script() {
-		return this.script;
-	}
-
-	/**
-	 * API name: {@code format}
-	 */
-	@Nullable
-	public final String format() {
-		return this.format;
-	}
-
-	/**
-	 * API name: {@code keyed}
-	 */
-	@Nullable
-	public final Boolean keyed() {
-		return this.keyed;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.extendedBounds != null) {
-			generator.writeKey("extended_bounds");
-			this.extendedBounds.serialize(generator, mapper);
-
-		}
-		if (this.hardBounds != null) {
-			generator.writeKey("hard_bounds");
-			this.hardBounds.serialize(generator, mapper);
-
-		}
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (this.interval != null) {
-			generator.writeKey("interval");
-			generator.write(this.interval);
-
-		}
-		if (this.minDocCount != null) {
-			generator.writeKey("min_doc_count");
-			generator.write(this.minDocCount);
-
-		}
-		if (this.missing != null) {
-			generator.writeKey("missing");
-			generator.write(this.missing);
-
-		}
-		if (this.offset != null) {
-			generator.writeKey("offset");
-			generator.write(this.offset);
-
-		}
-		if (this.order != null) {
-			generator.writeKey("order");
-			this.order.serialize(generator, mapper);
-
-		}
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-		if (this.format != null) {
-			generator.writeKey("format");
-			generator.write(this.format);
-
-		}
-		if (this.keyed != null) {
-			generator.writeKey("keyed");
-			generator.write(this.keyed);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HistogramAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<HistogramAggregation> {
-		@Nullable
-		private ExtendedBounds<Double> extendedBounds;
-
-		@Nullable
-		private ExtendedBounds<Double> hardBounds;
-
-		@Nullable
-		private String field;
-
-		@Nullable
-		private Double interval;
-
-		@Nullable
-		private Integer minDocCount;
-
-		@Nullable
-		private Double missing;
-
-		@Nullable
-		private Double offset;
-
-		@Nullable
-		private HistogramOrder order;
-
-		@Nullable
-		private Script script;
-
-		@Nullable
-		private String format;
-
-		@Nullable
-		private Boolean keyed;
-
-		/**
-		 * API name: {@code extended_bounds}
-		 */
-		public final Builder extendedBounds(@Nullable ExtendedBounds<Double> value) {
-			this.extendedBounds = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code extended_bounds}
-		 */
-		public final Builder extendedBounds(
-				Function<ExtendedBounds.Builder<Double>, ObjectBuilder<ExtendedBounds<Double>>> fn) {
-			return this.extendedBounds(fn.apply(new ExtendedBounds.Builder<Double>()).build());
-		}
-
-		/**
-		 * API name: {@code hard_bounds}
-		 */
-		public final Builder hardBounds(@Nullable ExtendedBounds<Double> value) {
-			this.hardBounds = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code hard_bounds}
-		 */
-		public final Builder hardBounds(
-				Function<ExtendedBounds.Builder<Double>, ObjectBuilder<ExtendedBounds<Double>>> fn) {
-			return this.hardBounds(fn.apply(new ExtendedBounds.Builder<Double>()).build());
-		}
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code interval}
-		 */
-		public final Builder interval(@Nullable Double value) {
-			this.interval = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_doc_count}
-		 */
-		public final Builder minDocCount(@Nullable Integer value) {
-			this.minDocCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code missing}
-		 */
-		public final Builder missing(@Nullable Double value) {
-			this.missing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code offset}
-		 */
-		public final Builder offset(@Nullable Double value) {
-			this.offset = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code order}
-		 */
-		public final Builder order(@Nullable HistogramOrder value) {
-			this.order = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code order}
-		 */
-		public final Builder order(Function<HistogramOrder.Builder, ObjectBuilder<HistogramOrder>> fn) {
-			return this.order(fn.apply(new HistogramOrder.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(@Nullable Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code format}
-		 */
-		public final Builder format(@Nullable String value) {
-			this.format = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code keyed}
-		 */
-		public final Builder keyed(@Nullable Boolean value) {
-			this.keyed = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HistogramAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HistogramAggregation build() {
-			_checkSingleUse();
-
-			return new HistogramAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HistogramAggregation}
-	 */
-	public static final JsonpDeserializer<HistogramAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, HistogramAggregation::setupHistogramAggregationDeserializer);
-
-	protected static void setupHistogramAggregationDeserializer(ObjectDeserializer<HistogramAggregation.Builder> op) {
-		setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::extendedBounds,
-				ExtendedBounds.createExtendedBoundsDeserializer(JsonpDeserializer.doubleDeserializer()),
-				"extended_bounds");
-		op.add(Builder::hardBounds,
-				ExtendedBounds.createExtendedBoundsDeserializer(JsonpDeserializer.doubleDeserializer()), "hard_bounds");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::interval, JsonpDeserializer.doubleDeserializer(), "interval");
-		op.add(Builder::minDocCount, JsonpDeserializer.integerDeserializer(), "min_doc_count");
-		op.add(Builder::missing, JsonpDeserializer.doubleDeserializer(), "missing");
-		op.add(Builder::offset, JsonpDeserializer.doubleDeserializer(), "offset");
-		op.add(Builder::order, HistogramOrder._DESERIALIZER, "order");
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-		op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
-		op.add(Builder::keyed, JsonpDeserializer.booleanDeserializer(), "keyed");
-
-	}
+    @Nullable
+    private final ExtendedBounds<Double> extendedBounds;
+
+    @Nullable
+    private final ExtendedBounds<Double> hardBounds;
+
+    @Nullable
+    private final String field;
+
+    @Nullable
+    private final Double interval;
+
+    @Nullable
+    private final Integer minDocCount;
+
+    @Nullable
+    private final Double missing;
+
+    @Nullable
+    private final Double offset;
+
+    @Nullable
+    private final HistogramOrder order;
+
+    @Nullable
+    private final Script script;
+
+    @Nullable
+    private final String format;
+
+    @Nullable
+    private final Boolean keyed;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HistogramAggregation(Builder builder) {
+        super(builder);
+
+        this.extendedBounds = builder.extendedBounds;
+        this.hardBounds = builder.hardBounds;
+        this.field = builder.field;
+        this.interval = builder.interval;
+        this.minDocCount = builder.minDocCount;
+        this.missing = builder.missing;
+        this.offset = builder.offset;
+        this.order = builder.order;
+        this.script = builder.script;
+        this.format = builder.format;
+        this.keyed = builder.keyed;
+
+    }
+
+    public static HistogramAggregation of(Function<Builder, ObjectBuilder<HistogramAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Histogram;
+    }
+
+    /**
+     * API name: {@code extended_bounds}
+     */
+    @Nullable
+    public final ExtendedBounds<Double> extendedBounds() {
+        return this.extendedBounds;
+    }
+
+    /**
+     * API name: {@code hard_bounds}
+     */
+    @Nullable
+    public final ExtendedBounds<Double> hardBounds() {
+        return this.hardBounds;
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code interval}
+     */
+    @Nullable
+    public final Double interval() {
+        return this.interval;
+    }
+
+    /**
+     * API name: {@code min_doc_count}
+     */
+    @Nullable
+    public final Integer minDocCount() {
+        return this.minDocCount;
+    }
+
+    /**
+     * API name: {@code missing}
+     */
+    @Nullable
+    public final Double missing() {
+        return this.missing;
+    }
+
+    /**
+     * API name: {@code offset}
+     */
+    @Nullable
+    public final Double offset() {
+        return this.offset;
+    }
+
+    /**
+     * API name: {@code order}
+     */
+    @Nullable
+    public final HistogramOrder order() {
+        return this.order;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final Script script() {
+        return this.script;
+    }
+
+    /**
+     * API name: {@code format}
+     */
+    @Nullable
+    public final String format() {
+        return this.format;
+    }
+
+    /**
+     * API name: {@code keyed}
+     */
+    @Nullable
+    public final Boolean keyed() {
+        return this.keyed;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.extendedBounds != null) {
+            generator.writeKey("extended_bounds");
+            this.extendedBounds.serialize(generator, mapper);
+
+        }
+        if (this.hardBounds != null) {
+            generator.writeKey("hard_bounds");
+            this.hardBounds.serialize(generator, mapper);
+
+        }
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (this.interval != null) {
+            generator.writeKey("interval");
+            generator.write(this.interval);
+
+        }
+        if (this.minDocCount != null) {
+            generator.writeKey("min_doc_count");
+            generator.write(this.minDocCount);
+
+        }
+        if (this.missing != null) {
+            generator.writeKey("missing");
+            generator.write(this.missing);
+
+        }
+        if (this.offset != null) {
+            generator.writeKey("offset");
+            generator.write(this.offset);
+
+        }
+        if (this.order != null) {
+            generator.writeKey("order");
+            this.order.serialize(generator, mapper);
+
+        }
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+        if (this.format != null) {
+            generator.writeKey("format");
+            generator.write(this.format);
+
+        }
+        if (this.keyed != null) {
+            generator.writeKey("keyed");
+            generator.write(this.keyed);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HistogramAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<HistogramAggregation> {
+        @Nullable
+        private ExtendedBounds<Double> extendedBounds;
+
+        @Nullable
+        private ExtendedBounds<Double> hardBounds;
+
+        @Nullable
+        private String field;
+
+        @Nullable
+        private Double interval;
+
+        @Nullable
+        private Integer minDocCount;
+
+        @Nullable
+        private Double missing;
+
+        @Nullable
+        private Double offset;
+
+        @Nullable
+        private HistogramOrder order;
+
+        @Nullable
+        private Script script;
+
+        @Nullable
+        private String format;
+
+        @Nullable
+        private Boolean keyed;
+
+        /**
+         * API name: {@code extended_bounds}
+         */
+        public final Builder extendedBounds(@Nullable ExtendedBounds<Double> value) {
+            this.extendedBounds = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code extended_bounds}
+         */
+        public final Builder extendedBounds(Function<ExtendedBounds.Builder<Double>, ObjectBuilder<ExtendedBounds<Double>>> fn) {
+            return this.extendedBounds(fn.apply(new ExtendedBounds.Builder<Double>()).build());
+        }
+
+        /**
+         * API name: {@code hard_bounds}
+         */
+        public final Builder hardBounds(@Nullable ExtendedBounds<Double> value) {
+            this.hardBounds = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code hard_bounds}
+         */
+        public final Builder hardBounds(Function<ExtendedBounds.Builder<Double>, ObjectBuilder<ExtendedBounds<Double>>> fn) {
+            return this.hardBounds(fn.apply(new ExtendedBounds.Builder<Double>()).build());
+        }
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code interval}
+         */
+        public final Builder interval(@Nullable Double value) {
+            this.interval = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code min_doc_count}
+         */
+        public final Builder minDocCount(@Nullable Integer value) {
+            this.minDocCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code missing}
+         */
+        public final Builder missing(@Nullable Double value) {
+            this.missing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code offset}
+         */
+        public final Builder offset(@Nullable Double value) {
+            this.offset = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code order}
+         */
+        public final Builder order(@Nullable HistogramOrder value) {
+            this.order = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code order}
+         */
+        public final Builder order(Function<HistogramOrder.Builder, ObjectBuilder<HistogramOrder>> fn) {
+            return this.order(fn.apply(new HistogramOrder.Builder()).build());
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(@Nullable Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * API name: {@code format}
+         */
+        public final Builder format(@Nullable String value) {
+            this.format = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code keyed}
+         */
+        public final Builder keyed(@Nullable Boolean value) {
+            this.keyed = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link HistogramAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HistogramAggregation build() {
+            _checkSingleUse();
+
+            return new HistogramAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HistogramAggregation}
+     */
+    public static final JsonpDeserializer<HistogramAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HistogramAggregation::setupHistogramAggregationDeserializer
+    );
+
+    protected static void setupHistogramAggregationDeserializer(ObjectDeserializer<HistogramAggregation.Builder> op) {
+        setupBucketAggregationBaseDeserializer(op);
+        op.add(
+            Builder::extendedBounds,
+            ExtendedBounds.createExtendedBoundsDeserializer(JsonpDeserializer.doubleDeserializer()),
+            "extended_bounds"
+        );
+        op.add(Builder::hardBounds, ExtendedBounds.createExtendedBoundsDeserializer(JsonpDeserializer.doubleDeserializer()), "hard_bounds");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::interval, JsonpDeserializer.doubleDeserializer(), "interval");
+        op.add(Builder::minDocCount, JsonpDeserializer.integerDeserializer(), "min_doc_count");
+        op.add(Builder::missing, JsonpDeserializer.doubleDeserializer(), "missing");
+        op.add(Builder::offset, JsonpDeserializer.doubleDeserializer(), "offset");
+        op.add(Builder::order, HistogramOrder._DESERIALIZER, "order");
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+        op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
+        op.add(Builder::keyed, JsonpDeserializer.booleanDeserializer(), "keyed");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HistogramBucket.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HistogramBucket.java
index ec75464438..c684c79f9f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HistogramBucket.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HistogramBucket.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,123 +42,119 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.HistogramBucket
 
-
 @JsonpDeserializable
 public class HistogramBucket extends MultiBucketBase {
-	@Nullable
-	private final String keyAsString;
-
-	private final double key;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HistogramBucket(Builder builder) {
-		super(builder);
-
-		this.keyAsString = builder.keyAsString;
-		this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
-
-	}
-
-	public static HistogramBucket of(Function<Builder, ObjectBuilder<HistogramBucket>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code key_as_string}
-	 */
-	@Nullable
-	public final String keyAsString() {
-		return this.keyAsString;
-	}
-
-	/**
-	 * Required - API name: {@code key}
-	 */
-	public final double key() {
-		return this.key;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.keyAsString != null) {
-			generator.writeKey("key_as_string");
-			generator.write(this.keyAsString);
-
-		}
-		generator.writeKey("key");
-		generator.write(this.key);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HistogramBucket}.
-	 */
-
-	public static class Builder extends MultiBucketBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<HistogramBucket> {
-		@Nullable
-		private String keyAsString;
-
-		private Double key;
-
-		/**
-		 * API name: {@code key_as_string}
-		 */
-		public final Builder keyAsString(@Nullable String value) {
-			this.keyAsString = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code key}
-		 */
-		public final Builder key(double value) {
-			this.key = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HistogramBucket}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HistogramBucket build() {
-			_checkSingleUse();
-
-			return new HistogramBucket(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HistogramBucket}
-	 */
-	public static final JsonpDeserializer<HistogramBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			HistogramBucket::setupHistogramBucketDeserializer);
-
-	protected static void setupHistogramBucketDeserializer(ObjectDeserializer<HistogramBucket.Builder> op) {
-		MultiBucketBase.setupMultiBucketBaseDeserializer(op);
-		op.add(Builder::keyAsString, JsonpDeserializer.stringDeserializer(), "key_as_string");
-		op.add(Builder::key, JsonpDeserializer.doubleDeserializer(), "key");
-
-	}
+    @Nullable
+    private final String keyAsString;
+
+    private final double key;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HistogramBucket(Builder builder) {
+        super(builder);
+
+        this.keyAsString = builder.keyAsString;
+        this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
+
+    }
+
+    public static HistogramBucket of(Function<Builder, ObjectBuilder<HistogramBucket>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code key_as_string}
+     */
+    @Nullable
+    public final String keyAsString() {
+        return this.keyAsString;
+    }
+
+    /**
+     * Required - API name: {@code key}
+     */
+    public final double key() {
+        return this.key;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.keyAsString != null) {
+            generator.writeKey("key_as_string");
+            generator.write(this.keyAsString);
+
+        }
+        generator.writeKey("key");
+        generator.write(this.key);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HistogramBucket}.
+     */
+
+    public static class Builder extends MultiBucketBase.AbstractBuilder<Builder> implements ObjectBuilder<HistogramBucket> {
+        @Nullable
+        private String keyAsString;
+
+        private Double key;
+
+        /**
+         * API name: {@code key_as_string}
+         */
+        public final Builder keyAsString(@Nullable String value) {
+            this.keyAsString = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code key}
+         */
+        public final Builder key(double value) {
+            this.key = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link HistogramBucket}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HistogramBucket build() {
+            _checkSingleUse();
+
+            return new HistogramBucket(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HistogramBucket}
+     */
+    public static final JsonpDeserializer<HistogramBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HistogramBucket::setupHistogramBucketDeserializer
+    );
+
+    protected static void setupHistogramBucketDeserializer(ObjectDeserializer<HistogramBucket.Builder> op) {
+        MultiBucketBase.setupMultiBucketBaseDeserializer(op);
+        op.add(Builder::keyAsString, JsonpDeserializer.stringDeserializer(), "key_as_string");
+        op.add(Builder::key, JsonpDeserializer.doubleDeserializer(), "key");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HistogramOrder.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HistogramOrder.java
index fbeb3664e5..4b316e057a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HistogramOrder.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HistogramOrder.java
@@ -32,137 +32,137 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.SortOrder;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.SortOrder;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.HistogramOrder
 
-
 @JsonpDeserializable
 public class HistogramOrder implements JsonpSerializable {
-	@Nullable
-	private final SortOrder count;
-
-	@Nullable
-	private final SortOrder key;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HistogramOrder(Builder builder) {
-
-		this.count = builder.count;
-		this.key = builder.key;
-
-	}
-
-	public static HistogramOrder of(Function<Builder, ObjectBuilder<HistogramOrder>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code _count}
-	 */
-	@Nullable
-	public final SortOrder count() {
-		return this.count;
-	}
-
-	/**
-	 * API name: {@code _key}
-	 */
-	@Nullable
-	public final SortOrder key() {
-		return this.key;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.count != null) {
-			generator.writeKey("_count");
-			this.count.serialize(generator, mapper);
-		}
-		if (this.key != null) {
-			generator.writeKey("_key");
-			this.key.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HistogramOrder}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HistogramOrder> {
-		@Nullable
-		private SortOrder count;
-
-		@Nullable
-		private SortOrder key;
-
-		/**
-		 * API name: {@code _count}
-		 */
-		public final Builder count(@Nullable SortOrder value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _key}
-		 */
-		public final Builder key(@Nullable SortOrder value) {
-			this.key = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HistogramOrder}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HistogramOrder build() {
-			_checkSingleUse();
-
-			return new HistogramOrder(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HistogramOrder}
-	 */
-	public static final JsonpDeserializer<HistogramOrder> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			HistogramOrder::setupHistogramOrderDeserializer);
-
-	protected static void setupHistogramOrderDeserializer(ObjectDeserializer<HistogramOrder.Builder> op) {
-
-		op.add(Builder::count, SortOrder._DESERIALIZER, "_count");
-		op.add(Builder::key, SortOrder._DESERIALIZER, "_key");
-
-	}
+    @Nullable
+    private final SortOrder count;
+
+    @Nullable
+    private final SortOrder key;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HistogramOrder(Builder builder) {
+
+        this.count = builder.count;
+        this.key = builder.key;
+
+    }
+
+    public static HistogramOrder of(Function<Builder, ObjectBuilder<HistogramOrder>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code _count}
+     */
+    @Nullable
+    public final SortOrder count() {
+        return this.count;
+    }
+
+    /**
+     * API name: {@code _key}
+     */
+    @Nullable
+    public final SortOrder key() {
+        return this.key;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.count != null) {
+            generator.writeKey("_count");
+            this.count.serialize(generator, mapper);
+        }
+        if (this.key != null) {
+            generator.writeKey("_key");
+            this.key.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HistogramOrder}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HistogramOrder> {
+        @Nullable
+        private SortOrder count;
+
+        @Nullable
+        private SortOrder key;
+
+        /**
+         * API name: {@code _count}
+         */
+        public final Builder count(@Nullable SortOrder value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _key}
+         */
+        public final Builder key(@Nullable SortOrder value) {
+            this.key = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link HistogramOrder}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HistogramOrder build() {
+            _checkSingleUse();
+
+            return new HistogramOrder(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HistogramOrder}
+     */
+    public static final JsonpDeserializer<HistogramOrder> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HistogramOrder::setupHistogramOrderDeserializer
+    );
+
+    protected static void setupHistogramOrderDeserializer(ObjectDeserializer<HistogramOrder.Builder> op) {
+
+        op.add(Builder::count, SortOrder._DESERIALIZER, "_count");
+        op.add(Builder::key, SortOrder._DESERIALIZER, "_key");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltLinearModelSettings.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltLinearModelSettings.java
index 15d214d48a..f362f6c42e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltLinearModelSettings.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltLinearModelSettings.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,130 +43,127 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.HoltLinearModelSettings
 
-
 @JsonpDeserializable
 public class HoltLinearModelSettings implements JsonpSerializable {
-	@Nullable
-	private final Float alpha;
-
-	@Nullable
-	private final Float beta;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HoltLinearModelSettings(Builder builder) {
-
-		this.alpha = builder.alpha;
-		this.beta = builder.beta;
-
-	}
-
-	public static HoltLinearModelSettings of(Function<Builder, ObjectBuilder<HoltLinearModelSettings>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code alpha}
-	 */
-	@Nullable
-	public final Float alpha() {
-		return this.alpha;
-	}
-
-	/**
-	 * API name: {@code beta}
-	 */
-	@Nullable
-	public final Float beta() {
-		return this.beta;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.alpha != null) {
-			generator.writeKey("alpha");
-			generator.write(this.alpha);
-
-		}
-		if (this.beta != null) {
-			generator.writeKey("beta");
-			generator.write(this.beta);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HoltLinearModelSettings}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HoltLinearModelSettings> {
-		@Nullable
-		private Float alpha;
-
-		@Nullable
-		private Float beta;
-
-		/**
-		 * API name: {@code alpha}
-		 */
-		public final Builder alpha(@Nullable Float value) {
-			this.alpha = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code beta}
-		 */
-		public final Builder beta(@Nullable Float value) {
-			this.beta = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HoltLinearModelSettings}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HoltLinearModelSettings build() {
-			_checkSingleUse();
-
-			return new HoltLinearModelSettings(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HoltLinearModelSettings}
-	 */
-	public static final JsonpDeserializer<HoltLinearModelSettings> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, HoltLinearModelSettings::setupHoltLinearModelSettingsDeserializer);
-
-	protected static void setupHoltLinearModelSettingsDeserializer(
-			ObjectDeserializer<HoltLinearModelSettings.Builder> op) {
-
-		op.add(Builder::alpha, JsonpDeserializer.floatDeserializer(), "alpha");
-		op.add(Builder::beta, JsonpDeserializer.floatDeserializer(), "beta");
-
-	}
+    @Nullable
+    private final Float alpha;
+
+    @Nullable
+    private final Float beta;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HoltLinearModelSettings(Builder builder) {
+
+        this.alpha = builder.alpha;
+        this.beta = builder.beta;
+
+    }
+
+    public static HoltLinearModelSettings of(Function<Builder, ObjectBuilder<HoltLinearModelSettings>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code alpha}
+     */
+    @Nullable
+    public final Float alpha() {
+        return this.alpha;
+    }
+
+    /**
+     * API name: {@code beta}
+     */
+    @Nullable
+    public final Float beta() {
+        return this.beta;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.alpha != null) {
+            generator.writeKey("alpha");
+            generator.write(this.alpha);
+
+        }
+        if (this.beta != null) {
+            generator.writeKey("beta");
+            generator.write(this.beta);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HoltLinearModelSettings}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HoltLinearModelSettings> {
+        @Nullable
+        private Float alpha;
+
+        @Nullable
+        private Float beta;
+
+        /**
+         * API name: {@code alpha}
+         */
+        public final Builder alpha(@Nullable Float value) {
+            this.alpha = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code beta}
+         */
+        public final Builder beta(@Nullable Float value) {
+            this.beta = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link HoltLinearModelSettings}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HoltLinearModelSettings build() {
+            _checkSingleUse();
+
+            return new HoltLinearModelSettings(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HoltLinearModelSettings}
+     */
+    public static final JsonpDeserializer<HoltLinearModelSettings> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HoltLinearModelSettings::setupHoltLinearModelSettingsDeserializer
+    );
+
+    protected static void setupHoltLinearModelSettingsDeserializer(ObjectDeserializer<HoltLinearModelSettings.Builder> op) {
+
+        op.add(Builder::alpha, JsonpDeserializer.floatDeserializer(), "alpha");
+        op.add(Builder::beta, JsonpDeserializer.floatDeserializer(), "beta");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltMovingAverageAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltMovingAverageAggregation.java
index b2e2caa17f..a08a176473 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltMovingAverageAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltMovingAverageAggregation.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,115 +41,109 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.aggregations.HoltMovingAverageAggregation
 
-
 @JsonpDeserializable
-public class HoltMovingAverageAggregation extends MovingAverageAggregationBase
-		implements
-			MovingAverageAggregationVariant {
-	private final HoltLinearModelSettings settings;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HoltMovingAverageAggregation(Builder builder) {
-		super(builder);
-
-		this.settings = ApiTypeHelper.requireNonNull(builder.settings, this, "settings");
-
-	}
-
-	public static HoltMovingAverageAggregation of(Function<Builder, ObjectBuilder<HoltMovingAverageAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * MovingAverageAggregation variant kind.
-	 */
-	@Override
-	public MovingAverageAggregation.Kind _movingAverageAggregationKind() {
-		return MovingAverageAggregation.Kind.Holt;
-	}
-
-	/**
-	 * Required - API name: {@code settings}
-	 */
-	public final HoltLinearModelSettings settings() {
-		return this.settings;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("model", "holt");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("settings");
-		this.settings.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HoltMovingAverageAggregation}.
-	 */
-
-	public static class Builder extends MovingAverageAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<HoltMovingAverageAggregation> {
-		private HoltLinearModelSettings settings;
-
-		/**
-		 * Required - API name: {@code settings}
-		 */
-		public final Builder settings(HoltLinearModelSettings value) {
-			this.settings = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code settings}
-		 */
-		public final Builder settings(
-				Function<HoltLinearModelSettings.Builder, ObjectBuilder<HoltLinearModelSettings>> fn) {
-			return this.settings(fn.apply(new HoltLinearModelSettings.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HoltMovingAverageAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HoltMovingAverageAggregation build() {
-			_checkSingleUse();
-
-			return new HoltMovingAverageAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HoltMovingAverageAggregation}
-	 */
-	public static final JsonpDeserializer<HoltMovingAverageAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, HoltMovingAverageAggregation::setupHoltMovingAverageAggregationDeserializer);
-
-	protected static void setupHoltMovingAverageAggregationDeserializer(
-			ObjectDeserializer<HoltMovingAverageAggregation.Builder> op) {
-		MovingAverageAggregationBase.setupMovingAverageAggregationBaseDeserializer(op);
-		op.add(Builder::settings, HoltLinearModelSettings._DESERIALIZER, "settings");
-
-		op.ignore("model");
-	}
+public class HoltMovingAverageAggregation extends MovingAverageAggregationBase implements MovingAverageAggregationVariant {
+    private final HoltLinearModelSettings settings;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HoltMovingAverageAggregation(Builder builder) {
+        super(builder);
+
+        this.settings = ApiTypeHelper.requireNonNull(builder.settings, this, "settings");
+
+    }
+
+    public static HoltMovingAverageAggregation of(Function<Builder, ObjectBuilder<HoltMovingAverageAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * MovingAverageAggregation variant kind.
+     */
+    @Override
+    public MovingAverageAggregation.Kind _movingAverageAggregationKind() {
+        return MovingAverageAggregation.Kind.Holt;
+    }
+
+    /**
+     * Required - API name: {@code settings}
+     */
+    public final HoltLinearModelSettings settings() {
+        return this.settings;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("model", "holt");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("settings");
+        this.settings.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HoltMovingAverageAggregation}.
+     */
+
+    public static class Builder extends MovingAverageAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<HoltMovingAverageAggregation> {
+        private HoltLinearModelSettings settings;
+
+        /**
+         * Required - API name: {@code settings}
+         */
+        public final Builder settings(HoltLinearModelSettings value) {
+            this.settings = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code settings}
+         */
+        public final Builder settings(Function<HoltLinearModelSettings.Builder, ObjectBuilder<HoltLinearModelSettings>> fn) {
+            return this.settings(fn.apply(new HoltLinearModelSettings.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link HoltMovingAverageAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HoltMovingAverageAggregation build() {
+            _checkSingleUse();
+
+            return new HoltMovingAverageAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HoltMovingAverageAggregation}
+     */
+    public static final JsonpDeserializer<HoltMovingAverageAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HoltMovingAverageAggregation::setupHoltMovingAverageAggregationDeserializer
+    );
+
+    protected static void setupHoltMovingAverageAggregationDeserializer(ObjectDeserializer<HoltMovingAverageAggregation.Builder> op) {
+        MovingAverageAggregationBase.setupMovingAverageAggregationBaseDeserializer(op);
+        op.add(Builder::settings, HoltLinearModelSettings._DESERIALIZER, "settings");
+
+        op.ignore("model");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltWintersModelSettings.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltWintersModelSettings.java
index c54c16f06b..b59ba41ed2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltWintersModelSettings.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltWintersModelSettings.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,245 +43,242 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.HoltWintersModelSettings
 
-
 @JsonpDeserializable
 public class HoltWintersModelSettings implements JsonpSerializable {
-	@Nullable
-	private final Float alpha;
-
-	@Nullable
-	private final Float beta;
-
-	@Nullable
-	private final Float gamma;
-
-	@Nullable
-	private final Boolean pad;
-
-	@Nullable
-	private final Integer period;
-
-	@Nullable
-	private final HoltWintersType type;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HoltWintersModelSettings(Builder builder) {
-
-		this.alpha = builder.alpha;
-		this.beta = builder.beta;
-		this.gamma = builder.gamma;
-		this.pad = builder.pad;
-		this.period = builder.period;
-		this.type = builder.type;
-
-	}
-
-	public static HoltWintersModelSettings of(Function<Builder, ObjectBuilder<HoltWintersModelSettings>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code alpha}
-	 */
-	@Nullable
-	public final Float alpha() {
-		return this.alpha;
-	}
-
-	/**
-	 * API name: {@code beta}
-	 */
-	@Nullable
-	public final Float beta() {
-		return this.beta;
-	}
-
-	/**
-	 * API name: {@code gamma}
-	 */
-	@Nullable
-	public final Float gamma() {
-		return this.gamma;
-	}
-
-	/**
-	 * API name: {@code pad}
-	 */
-	@Nullable
-	public final Boolean pad() {
-		return this.pad;
-	}
-
-	/**
-	 * API name: {@code period}
-	 */
-	@Nullable
-	public final Integer period() {
-		return this.period;
-	}
-
-	/**
-	 * API name: {@code type}
-	 */
-	@Nullable
-	public final HoltWintersType type() {
-		return this.type;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.alpha != null) {
-			generator.writeKey("alpha");
-			generator.write(this.alpha);
-
-		}
-		if (this.beta != null) {
-			generator.writeKey("beta");
-			generator.write(this.beta);
-
-		}
-		if (this.gamma != null) {
-			generator.writeKey("gamma");
-			generator.write(this.gamma);
-
-		}
-		if (this.pad != null) {
-			generator.writeKey("pad");
-			generator.write(this.pad);
-
-		}
-		if (this.period != null) {
-			generator.writeKey("period");
-			generator.write(this.period);
-
-		}
-		if (this.type != null) {
-			generator.writeKey("type");
-			this.type.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HoltWintersModelSettings}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HoltWintersModelSettings> {
-		@Nullable
-		private Float alpha;
-
-		@Nullable
-		private Float beta;
-
-		@Nullable
-		private Float gamma;
-
-		@Nullable
-		private Boolean pad;
-
-		@Nullable
-		private Integer period;
-
-		@Nullable
-		private HoltWintersType type;
-
-		/**
-		 * API name: {@code alpha}
-		 */
-		public final Builder alpha(@Nullable Float value) {
-			this.alpha = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code beta}
-		 */
-		public final Builder beta(@Nullable Float value) {
-			this.beta = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code gamma}
-		 */
-		public final Builder gamma(@Nullable Float value) {
-			this.gamma = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code pad}
-		 */
-		public final Builder pad(@Nullable Boolean value) {
-			this.pad = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code period}
-		 */
-		public final Builder period(@Nullable Integer value) {
-			this.period = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code type}
-		 */
-		public final Builder type(@Nullable HoltWintersType value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HoltWintersModelSettings}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HoltWintersModelSettings build() {
-			_checkSingleUse();
-
-			return new HoltWintersModelSettings(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HoltWintersModelSettings}
-	 */
-	public static final JsonpDeserializer<HoltWintersModelSettings> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, HoltWintersModelSettings::setupHoltWintersModelSettingsDeserializer);
-
-	protected static void setupHoltWintersModelSettingsDeserializer(
-			ObjectDeserializer<HoltWintersModelSettings.Builder> op) {
-
-		op.add(Builder::alpha, JsonpDeserializer.floatDeserializer(), "alpha");
-		op.add(Builder::beta, JsonpDeserializer.floatDeserializer(), "beta");
-		op.add(Builder::gamma, JsonpDeserializer.floatDeserializer(), "gamma");
-		op.add(Builder::pad, JsonpDeserializer.booleanDeserializer(), "pad");
-		op.add(Builder::period, JsonpDeserializer.integerDeserializer(), "period");
-		op.add(Builder::type, HoltWintersType._DESERIALIZER, "type");
-
-	}
+    @Nullable
+    private final Float alpha;
+
+    @Nullable
+    private final Float beta;
+
+    @Nullable
+    private final Float gamma;
+
+    @Nullable
+    private final Boolean pad;
+
+    @Nullable
+    private final Integer period;
+
+    @Nullable
+    private final HoltWintersType type;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HoltWintersModelSettings(Builder builder) {
+
+        this.alpha = builder.alpha;
+        this.beta = builder.beta;
+        this.gamma = builder.gamma;
+        this.pad = builder.pad;
+        this.period = builder.period;
+        this.type = builder.type;
+
+    }
+
+    public static HoltWintersModelSettings of(Function<Builder, ObjectBuilder<HoltWintersModelSettings>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code alpha}
+     */
+    @Nullable
+    public final Float alpha() {
+        return this.alpha;
+    }
+
+    /**
+     * API name: {@code beta}
+     */
+    @Nullable
+    public final Float beta() {
+        return this.beta;
+    }
+
+    /**
+     * API name: {@code gamma}
+     */
+    @Nullable
+    public final Float gamma() {
+        return this.gamma;
+    }
+
+    /**
+     * API name: {@code pad}
+     */
+    @Nullable
+    public final Boolean pad() {
+        return this.pad;
+    }
+
+    /**
+     * API name: {@code period}
+     */
+    @Nullable
+    public final Integer period() {
+        return this.period;
+    }
+
+    /**
+     * API name: {@code type}
+     */
+    @Nullable
+    public final HoltWintersType type() {
+        return this.type;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.alpha != null) {
+            generator.writeKey("alpha");
+            generator.write(this.alpha);
+
+        }
+        if (this.beta != null) {
+            generator.writeKey("beta");
+            generator.write(this.beta);
+
+        }
+        if (this.gamma != null) {
+            generator.writeKey("gamma");
+            generator.write(this.gamma);
+
+        }
+        if (this.pad != null) {
+            generator.writeKey("pad");
+            generator.write(this.pad);
+
+        }
+        if (this.period != null) {
+            generator.writeKey("period");
+            generator.write(this.period);
+
+        }
+        if (this.type != null) {
+            generator.writeKey("type");
+            this.type.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HoltWintersModelSettings}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HoltWintersModelSettings> {
+        @Nullable
+        private Float alpha;
+
+        @Nullable
+        private Float beta;
+
+        @Nullable
+        private Float gamma;
+
+        @Nullable
+        private Boolean pad;
+
+        @Nullable
+        private Integer period;
+
+        @Nullable
+        private HoltWintersType type;
+
+        /**
+         * API name: {@code alpha}
+         */
+        public final Builder alpha(@Nullable Float value) {
+            this.alpha = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code beta}
+         */
+        public final Builder beta(@Nullable Float value) {
+            this.beta = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code gamma}
+         */
+        public final Builder gamma(@Nullable Float value) {
+            this.gamma = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code pad}
+         */
+        public final Builder pad(@Nullable Boolean value) {
+            this.pad = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code period}
+         */
+        public final Builder period(@Nullable Integer value) {
+            this.period = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code type}
+         */
+        public final Builder type(@Nullable HoltWintersType value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link HoltWintersModelSettings}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HoltWintersModelSettings build() {
+            _checkSingleUse();
+
+            return new HoltWintersModelSettings(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HoltWintersModelSettings}
+     */
+    public static final JsonpDeserializer<HoltWintersModelSettings> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HoltWintersModelSettings::setupHoltWintersModelSettingsDeserializer
+    );
+
+    protected static void setupHoltWintersModelSettingsDeserializer(ObjectDeserializer<HoltWintersModelSettings.Builder> op) {
+
+        op.add(Builder::alpha, JsonpDeserializer.floatDeserializer(), "alpha");
+        op.add(Builder::beta, JsonpDeserializer.floatDeserializer(), "beta");
+        op.add(Builder::gamma, JsonpDeserializer.floatDeserializer(), "gamma");
+        op.add(Builder::pad, JsonpDeserializer.booleanDeserializer(), "pad");
+        op.add(Builder::period, JsonpDeserializer.integerDeserializer(), "period");
+        op.add(Builder::type, HoltWintersType._DESERIALIZER, "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltWintersMovingAverageAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltWintersMovingAverageAggregation.java
index 789cc525d2..2731f6e048 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltWintersMovingAverageAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltWintersMovingAverageAggregation.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,117 +41,111 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.aggregations.HoltWintersMovingAverageAggregation
 
-
 @JsonpDeserializable
-public class HoltWintersMovingAverageAggregation extends MovingAverageAggregationBase
-		implements
-			MovingAverageAggregationVariant {
-	private final HoltWintersModelSettings settings;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HoltWintersMovingAverageAggregation(Builder builder) {
-		super(builder);
-
-		this.settings = ApiTypeHelper.requireNonNull(builder.settings, this, "settings");
-
-	}
-
-	public static HoltWintersMovingAverageAggregation of(
-			Function<Builder, ObjectBuilder<HoltWintersMovingAverageAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * MovingAverageAggregation variant kind.
-	 */
-	@Override
-	public MovingAverageAggregation.Kind _movingAverageAggregationKind() {
-		return MovingAverageAggregation.Kind.HoltWinters;
-	}
-
-	/**
-	 * Required - API name: {@code settings}
-	 */
-	public final HoltWintersModelSettings settings() {
-		return this.settings;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("model", "holt_winters");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("settings");
-		this.settings.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HoltWintersMovingAverageAggregation}.
-	 */
-
-	public static class Builder extends MovingAverageAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<HoltWintersMovingAverageAggregation> {
-		private HoltWintersModelSettings settings;
-
-		/**
-		 * Required - API name: {@code settings}
-		 */
-		public final Builder settings(HoltWintersModelSettings value) {
-			this.settings = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code settings}
-		 */
-		public final Builder settings(
-				Function<HoltWintersModelSettings.Builder, ObjectBuilder<HoltWintersModelSettings>> fn) {
-			return this.settings(fn.apply(new HoltWintersModelSettings.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HoltWintersMovingAverageAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HoltWintersMovingAverageAggregation build() {
-			_checkSingleUse();
-
-			return new HoltWintersMovingAverageAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HoltWintersMovingAverageAggregation}
-	 */
-	public static final JsonpDeserializer<HoltWintersMovingAverageAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new,
-					HoltWintersMovingAverageAggregation::setupHoltWintersMovingAverageAggregationDeserializer);
-
-	protected static void setupHoltWintersMovingAverageAggregationDeserializer(
-			ObjectDeserializer<HoltWintersMovingAverageAggregation.Builder> op) {
-		MovingAverageAggregationBase.setupMovingAverageAggregationBaseDeserializer(op);
-		op.add(Builder::settings, HoltWintersModelSettings._DESERIALIZER, "settings");
-
-		op.ignore("model");
-	}
+public class HoltWintersMovingAverageAggregation extends MovingAverageAggregationBase implements MovingAverageAggregationVariant {
+    private final HoltWintersModelSettings settings;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HoltWintersMovingAverageAggregation(Builder builder) {
+        super(builder);
+
+        this.settings = ApiTypeHelper.requireNonNull(builder.settings, this, "settings");
+
+    }
+
+    public static HoltWintersMovingAverageAggregation of(Function<Builder, ObjectBuilder<HoltWintersMovingAverageAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * MovingAverageAggregation variant kind.
+     */
+    @Override
+    public MovingAverageAggregation.Kind _movingAverageAggregationKind() {
+        return MovingAverageAggregation.Kind.HoltWinters;
+    }
+
+    /**
+     * Required - API name: {@code settings}
+     */
+    public final HoltWintersModelSettings settings() {
+        return this.settings;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("model", "holt_winters");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("settings");
+        this.settings.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HoltWintersMovingAverageAggregation}.
+     */
+
+    public static class Builder extends MovingAverageAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<HoltWintersMovingAverageAggregation> {
+        private HoltWintersModelSettings settings;
+
+        /**
+         * Required - API name: {@code settings}
+         */
+        public final Builder settings(HoltWintersModelSettings value) {
+            this.settings = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code settings}
+         */
+        public final Builder settings(Function<HoltWintersModelSettings.Builder, ObjectBuilder<HoltWintersModelSettings>> fn) {
+            return this.settings(fn.apply(new HoltWintersModelSettings.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link HoltWintersMovingAverageAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HoltWintersMovingAverageAggregation build() {
+            _checkSingleUse();
+
+            return new HoltWintersMovingAverageAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HoltWintersMovingAverageAggregation}
+     */
+    public static final JsonpDeserializer<HoltWintersMovingAverageAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HoltWintersMovingAverageAggregation::setupHoltWintersMovingAverageAggregationDeserializer
+    );
+
+    protected static void setupHoltWintersMovingAverageAggregationDeserializer(
+        ObjectDeserializer<HoltWintersMovingAverageAggregation.Builder> op
+    ) {
+        MovingAverageAggregationBase.setupMovingAverageAggregationBaseDeserializer(op);
+        op.add(Builder::settings, HoltWintersModelSettings._DESERIALIZER, "settings");
+
+        op.ignore("model");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltWintersType.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltWintersType.java
index 4ea53ce435..77512c5017 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltWintersType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/HoltWintersType.java
@@ -35,25 +35,23 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum HoltWintersType implements JsonEnum {
-	Additive("add"),
+    Additive("add"),
 
-	Multiplicative("mult"),
+    Multiplicative("mult"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	HoltWintersType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    HoltWintersType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<HoltWintersType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			HoltWintersType.values());
+    public static final JsonEnum.Deserializer<HoltWintersType> _DESERIALIZER = new JsonEnum.Deserializer<>(HoltWintersType.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceAggregate.java
index 11f93db215..7fa4ac07fa 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceAggregate.java
@@ -32,311 +32,311 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.FieldValue;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.FieldValue;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.InferenceAggregate
 
 @JsonpDeserializable
 public class InferenceAggregate extends AggregateBase implements AggregateVariant {
-	private final Map<String, JsonData> data;
-
-	@Nullable
-	private final FieldValue value;
-
-	private final List<InferenceFeatureImportance> featureImportance;
-
-	private final List<InferenceTopClassEntry> topClasses;
-
-	@Nullable
-	private final String warning;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private InferenceAggregate(Builder builder) {
-		super(builder);
-		this.data = ApiTypeHelper.unmodifiable(builder.data);
-
-		this.value = builder.value;
-		this.featureImportance = ApiTypeHelper.unmodifiable(builder.featureImportance);
-		this.topClasses = ApiTypeHelper.unmodifiable(builder.topClasses);
-		this.warning = builder.warning;
-
-	}
-
-	public static InferenceAggregate of(Function<Builder, ObjectBuilder<InferenceAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Inference;
-	}
-
-	/**
-	 * Additional data
-	 */
-	public final Map<String, JsonData> data() {
-		return this.data;
-	}
-
-	/**
-	 * API name: {@code value}
-	 */
-	@Nullable
-	public final FieldValue value() {
-		return this.value;
-	}
-
-	/**
-	 * API name: {@code feature_importance}
-	 */
-	public final List<InferenceFeatureImportance> featureImportance() {
-		return this.featureImportance;
-	}
-
-	/**
-	 * API name: {@code top_classes}
-	 */
-	public final List<InferenceTopClassEntry> topClasses() {
-		return this.topClasses;
-	}
-
-	/**
-	 * API name: {@code warning}
-	 */
-	@Nullable
-	public final String warning() {
-		return this.warning;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		for (Map.Entry<String, JsonData> item0 : this.data.entrySet()) {
-			generator.writeKey(item0.getKey());
-			item0.getValue().serialize(generator, mapper);
-
-		}
-
-		super.serializeInternal(generator, mapper);
-		if (this.value != null) {
-			generator.writeKey("value");
-			this.value.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.featureImportance)) {
-			generator.writeKey("feature_importance");
-			generator.writeStartArray();
-			for (InferenceFeatureImportance item0 : this.featureImportance) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.topClasses)) {
-			generator.writeKey("top_classes");
-			generator.writeStartArray();
-			for (InferenceTopClassEntry item0 : this.topClasses) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.warning != null) {
-			generator.writeKey("warning");
-			generator.write(this.warning);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link InferenceAggregate}.
-	 */
-
-	public static class Builder extends AggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<InferenceAggregate> {
-		@Nullable
-		private Map<String, JsonData> data = new HashMap<>();
-
-		/**
-		 * Additional data
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>data</code>.
-		 */
-		public final Builder data(Map<String, JsonData> map) {
-			this.data = _mapPutAll(this.data, map);
-			return this;
-		}
-
-		/**
-		 * Additional data
-		 * <p>
-		 * Adds an entry to <code>data</code>.
-		 */
-		public final Builder data(String key, JsonData value) {
-			this.data = _mapPut(this.data, key, value);
-			return this;
-		}
-
-		@Nullable
-		private FieldValue value;
-
-		@Nullable
-		private List<InferenceFeatureImportance> featureImportance;
-
-		@Nullable
-		private List<InferenceTopClassEntry> topClasses;
-
-		@Nullable
-		private String warning;
-
-		/**
-		 * API name: {@code value}
-		 */
-		public final Builder value(@Nullable FieldValue value) {
-			this.value = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code value}
-		 */
-		public final Builder value(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
-			return this.value(fn.apply(new FieldValue.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code feature_importance}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>featureImportance</code>.
-		 */
-		public final Builder featureImportance(List<InferenceFeatureImportance> list) {
-			this.featureImportance = _listAddAll(this.featureImportance, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code feature_importance}
-		 * <p>
-		 * Adds one or more values to <code>featureImportance</code>.
-		 */
-		public final Builder featureImportance(InferenceFeatureImportance value, InferenceFeatureImportance... values) {
-			this.featureImportance = _listAdd(this.featureImportance, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code feature_importance}
-		 * <p>
-		 * Adds a value to <code>featureImportance</code> using a builder lambda.
-		 */
-		public final Builder featureImportance(
-				Function<InferenceFeatureImportance.Builder, ObjectBuilder<InferenceFeatureImportance>> fn) {
-			return featureImportance(fn.apply(new InferenceFeatureImportance.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code top_classes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>topClasses</code>.
-		 */
-		public final Builder topClasses(List<InferenceTopClassEntry> list) {
-			this.topClasses = _listAddAll(this.topClasses, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code top_classes}
-		 * <p>
-		 * Adds one or more values to <code>topClasses</code>.
-		 */
-		public final Builder topClasses(InferenceTopClassEntry value, InferenceTopClassEntry... values) {
-			this.topClasses = _listAdd(this.topClasses, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code top_classes}
-		 * <p>
-		 * Adds a value to <code>topClasses</code> using a builder lambda.
-		 */
-		public final Builder topClasses(
-				Function<InferenceTopClassEntry.Builder, ObjectBuilder<InferenceTopClassEntry>> fn) {
-			return topClasses(fn.apply(new InferenceTopClassEntry.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code warning}
-		 */
-		public final Builder warning(@Nullable String value) {
-			this.warning = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link InferenceAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public InferenceAggregate build() {
-			_checkSingleUse();
-
-			return new InferenceAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link InferenceAggregate}
-	 */
-	public static final JsonpDeserializer<InferenceAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, InferenceAggregate::setupInferenceAggregateDeserializer);
-
-	protected static void setupInferenceAggregateDeserializer(ObjectDeserializer<InferenceAggregate.Builder> op) {
-		AggregateBase.setupAggregateBaseDeserializer(op);
-		op.add(Builder::value, FieldValue._DESERIALIZER, "value");
-		op.add(Builder::featureImportance,
-				JsonpDeserializer.arrayDeserializer(InferenceFeatureImportance._DESERIALIZER), "feature_importance");
-		op.add(Builder::topClasses, JsonpDeserializer.arrayDeserializer(InferenceTopClassEntry._DESERIALIZER),
-				"top_classes");
-		op.add(Builder::warning, JsonpDeserializer.stringDeserializer(), "warning");
-
-		op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
-			if (builder.data == null) {
-				builder.data = new HashMap<>();
-			}
-			builder.data.put(name, JsonData._DESERIALIZER.deserialize(parser, mapper));
-		});
-
-	}
+    private final Map<String, JsonData> data;
+
+    @Nullable
+    private final FieldValue value;
+
+    private final List<InferenceFeatureImportance> featureImportance;
+
+    private final List<InferenceTopClassEntry> topClasses;
+
+    @Nullable
+    private final String warning;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private InferenceAggregate(Builder builder) {
+        super(builder);
+        this.data = ApiTypeHelper.unmodifiable(builder.data);
+
+        this.value = builder.value;
+        this.featureImportance = ApiTypeHelper.unmodifiable(builder.featureImportance);
+        this.topClasses = ApiTypeHelper.unmodifiable(builder.topClasses);
+        this.warning = builder.warning;
+
+    }
+
+    public static InferenceAggregate of(Function<Builder, ObjectBuilder<InferenceAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Inference;
+    }
+
+    /**
+     * Additional data
+     */
+    public final Map<String, JsonData> data() {
+        return this.data;
+    }
+
+    /**
+     * API name: {@code value}
+     */
+    @Nullable
+    public final FieldValue value() {
+        return this.value;
+    }
+
+    /**
+     * API name: {@code feature_importance}
+     */
+    public final List<InferenceFeatureImportance> featureImportance() {
+        return this.featureImportance;
+    }
+
+    /**
+     * API name: {@code top_classes}
+     */
+    public final List<InferenceTopClassEntry> topClasses() {
+        return this.topClasses;
+    }
+
+    /**
+     * API name: {@code warning}
+     */
+    @Nullable
+    public final String warning() {
+        return this.warning;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        for (Map.Entry<String, JsonData> item0 : this.data.entrySet()) {
+            generator.writeKey(item0.getKey());
+            item0.getValue().serialize(generator, mapper);
+
+        }
+
+        super.serializeInternal(generator, mapper);
+        if (this.value != null) {
+            generator.writeKey("value");
+            this.value.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.featureImportance)) {
+            generator.writeKey("feature_importance");
+            generator.writeStartArray();
+            for (InferenceFeatureImportance item0 : this.featureImportance) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.topClasses)) {
+            generator.writeKey("top_classes");
+            generator.writeStartArray();
+            for (InferenceTopClassEntry item0 : this.topClasses) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.warning != null) {
+            generator.writeKey("warning");
+            generator.write(this.warning);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link InferenceAggregate}.
+     */
+
+    public static class Builder extends AggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<InferenceAggregate> {
+        @Nullable
+        private Map<String, JsonData> data = new HashMap<>();
+
+        /**
+         * Additional data
+         * <p>
+         * Adds all entries of <code>map</code> to <code>data</code>.
+         */
+        public final Builder data(Map<String, JsonData> map) {
+            this.data = _mapPutAll(this.data, map);
+            return this;
+        }
+
+        /**
+         * Additional data
+         * <p>
+         * Adds an entry to <code>data</code>.
+         */
+        public final Builder data(String key, JsonData value) {
+            this.data = _mapPut(this.data, key, value);
+            return this;
+        }
+
+        @Nullable
+        private FieldValue value;
+
+        @Nullable
+        private List<InferenceFeatureImportance> featureImportance;
+
+        @Nullable
+        private List<InferenceTopClassEntry> topClasses;
+
+        @Nullable
+        private String warning;
+
+        /**
+         * API name: {@code value}
+         */
+        public final Builder value(@Nullable FieldValue value) {
+            this.value = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code value}
+         */
+        public final Builder value(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
+            return this.value(fn.apply(new FieldValue.Builder()).build());
+        }
+
+        /**
+         * API name: {@code feature_importance}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>featureImportance</code>.
+         */
+        public final Builder featureImportance(List<InferenceFeatureImportance> list) {
+            this.featureImportance = _listAddAll(this.featureImportance, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code feature_importance}
+         * <p>
+         * Adds one or more values to <code>featureImportance</code>.
+         */
+        public final Builder featureImportance(InferenceFeatureImportance value, InferenceFeatureImportance... values) {
+            this.featureImportance = _listAdd(this.featureImportance, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code feature_importance}
+         * <p>
+         * Adds a value to <code>featureImportance</code> using a builder lambda.
+         */
+        public final Builder featureImportance(Function<InferenceFeatureImportance.Builder, ObjectBuilder<InferenceFeatureImportance>> fn) {
+            return featureImportance(fn.apply(new InferenceFeatureImportance.Builder()).build());
+        }
+
+        /**
+         * API name: {@code top_classes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>topClasses</code>.
+         */
+        public final Builder topClasses(List<InferenceTopClassEntry> list) {
+            this.topClasses = _listAddAll(this.topClasses, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code top_classes}
+         * <p>
+         * Adds one or more values to <code>topClasses</code>.
+         */
+        public final Builder topClasses(InferenceTopClassEntry value, InferenceTopClassEntry... values) {
+            this.topClasses = _listAdd(this.topClasses, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code top_classes}
+         * <p>
+         * Adds a value to <code>topClasses</code> using a builder lambda.
+         */
+        public final Builder topClasses(Function<InferenceTopClassEntry.Builder, ObjectBuilder<InferenceTopClassEntry>> fn) {
+            return topClasses(fn.apply(new InferenceTopClassEntry.Builder()).build());
+        }
+
+        /**
+         * API name: {@code warning}
+         */
+        public final Builder warning(@Nullable String value) {
+            this.warning = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link InferenceAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public InferenceAggregate build() {
+            _checkSingleUse();
+
+            return new InferenceAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link InferenceAggregate}
+     */
+    public static final JsonpDeserializer<InferenceAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        InferenceAggregate::setupInferenceAggregateDeserializer
+    );
+
+    protected static void setupInferenceAggregateDeserializer(ObjectDeserializer<InferenceAggregate.Builder> op) {
+        AggregateBase.setupAggregateBaseDeserializer(op);
+        op.add(Builder::value, FieldValue._DESERIALIZER, "value");
+        op.add(
+            Builder::featureImportance,
+            JsonpDeserializer.arrayDeserializer(InferenceFeatureImportance._DESERIALIZER),
+            "feature_importance"
+        );
+        op.add(Builder::topClasses, JsonpDeserializer.arrayDeserializer(InferenceTopClassEntry._DESERIALIZER), "top_classes");
+        op.add(Builder::warning, JsonpDeserializer.stringDeserializer(), "warning");
+
+        op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
+            if (builder.data == null) {
+                builder.data = new HashMap<>();
+            }
+            builder.data.put(name, JsonData._DESERIALIZER.deserialize(parser, mapper));
+        });
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceAggregation.java
index 65ef63d6a7..089638fb3f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceAggregation.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,139 +42,135 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.InferenceAggregation
 
-
 @JsonpDeserializable
 public class InferenceAggregation extends PipelineAggregationBase implements AggregationVariant {
-	private final String modelId;
-
-	@Nullable
-	private final InferenceConfig inferenceConfig;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private InferenceAggregation(Builder builder) {
-		super(builder);
-
-		this.modelId = ApiTypeHelper.requireNonNull(builder.modelId, this, "modelId");
-		this.inferenceConfig = builder.inferenceConfig;
-
-	}
-
-	public static InferenceAggregation of(Function<Builder, ObjectBuilder<InferenceAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Inference;
-	}
-
-	/**
-	 * Required - API name: {@code model_id}
-	 */
-	public final String modelId() {
-		return this.modelId;
-	}
-
-	/**
-	 * API name: {@code inference_config}
-	 */
-	@Nullable
-	public final InferenceConfig inferenceConfig() {
-		return this.inferenceConfig;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("model_id");
-		generator.write(this.modelId);
-
-		if (this.inferenceConfig != null) {
-			generator.writeKey("inference_config");
-			this.inferenceConfig.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link InferenceAggregation}.
-	 */
-
-	public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<InferenceAggregation> {
-		private String modelId;
-
-		@Nullable
-		private InferenceConfig inferenceConfig;
-
-		/**
-		 * Required - API name: {@code model_id}
-		 */
-		public final Builder modelId(String value) {
-			this.modelId = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code inference_config}
-		 */
-		public final Builder inferenceConfig(@Nullable InferenceConfig value) {
-			this.inferenceConfig = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code inference_config}
-		 */
-		public final Builder inferenceConfig(Function<InferenceConfig.Builder, ObjectBuilder<InferenceConfig>> fn) {
-			return this.inferenceConfig(fn.apply(new InferenceConfig.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link InferenceAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public InferenceAggregation build() {
-			_checkSingleUse();
-
-			return new InferenceAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link InferenceAggregation}
-	 */
-	public static final JsonpDeserializer<InferenceAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, InferenceAggregation::setupInferenceAggregationDeserializer);
-
-	protected static void setupInferenceAggregationDeserializer(ObjectDeserializer<InferenceAggregation.Builder> op) {
-		PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
-		op.add(Builder::modelId, JsonpDeserializer.stringDeserializer(), "model_id");
-		op.add(Builder::inferenceConfig, InferenceConfig._DESERIALIZER, "inference_config");
-
-	}
+    private final String modelId;
+
+    @Nullable
+    private final InferenceConfig inferenceConfig;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private InferenceAggregation(Builder builder) {
+        super(builder);
+
+        this.modelId = ApiTypeHelper.requireNonNull(builder.modelId, this, "modelId");
+        this.inferenceConfig = builder.inferenceConfig;
+
+    }
+
+    public static InferenceAggregation of(Function<Builder, ObjectBuilder<InferenceAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Inference;
+    }
+
+    /**
+     * Required - API name: {@code model_id}
+     */
+    public final String modelId() {
+        return this.modelId;
+    }
+
+    /**
+     * API name: {@code inference_config}
+     */
+    @Nullable
+    public final InferenceConfig inferenceConfig() {
+        return this.inferenceConfig;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("model_id");
+        generator.write(this.modelId);
+
+        if (this.inferenceConfig != null) {
+            generator.writeKey("inference_config");
+            this.inferenceConfig.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link InferenceAggregation}.
+     */
+
+    public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<InferenceAggregation> {
+        private String modelId;
+
+        @Nullable
+        private InferenceConfig inferenceConfig;
+
+        /**
+         * Required - API name: {@code model_id}
+         */
+        public final Builder modelId(String value) {
+            this.modelId = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code inference_config}
+         */
+        public final Builder inferenceConfig(@Nullable InferenceConfig value) {
+            this.inferenceConfig = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code inference_config}
+         */
+        public final Builder inferenceConfig(Function<InferenceConfig.Builder, ObjectBuilder<InferenceConfig>> fn) {
+            return this.inferenceConfig(fn.apply(new InferenceConfig.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link InferenceAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public InferenceAggregation build() {
+            _checkSingleUse();
+
+            return new InferenceAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link InferenceAggregation}
+     */
+    public static final JsonpDeserializer<InferenceAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        InferenceAggregation::setupInferenceAggregationDeserializer
+    );
+
+    protected static void setupInferenceAggregationDeserializer(ObjectDeserializer<InferenceAggregation.Builder> op) {
+        PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
+        op.add(Builder::modelId, JsonpDeserializer.stringDeserializer(), "model_id");
+        op.add(Builder::inferenceConfig, InferenceConfig._DESERIALIZER, "inference_config");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceClassImportance.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceClassImportance.java
index 19d8107526..17a5101558 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceClassImportance.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceClassImportance.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,118 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.InferenceClassImportance
 
-
 @JsonpDeserializable
 public class InferenceClassImportance implements JsonpSerializable {
-	private final String className;
-
-	private final double importance;
-
-	// ---------------------------------------------------------------------------------------------
+    private final String className;
 
-	private InferenceClassImportance(Builder builder) {
+    private final double importance;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.className = ApiTypeHelper.requireNonNull(builder.className, this, "className");
-		this.importance = ApiTypeHelper.requireNonNull(builder.importance, this, "importance");
+    private InferenceClassImportance(Builder builder) {
 
-	}
+        this.className = ApiTypeHelper.requireNonNull(builder.className, this, "className");
+        this.importance = ApiTypeHelper.requireNonNull(builder.importance, this, "importance");
 
-	public static InferenceClassImportance of(Function<Builder, ObjectBuilder<InferenceClassImportance>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code class_name}
-	 */
-	public final String className() {
-		return this.className;
-	}
+    public static InferenceClassImportance of(Function<Builder, ObjectBuilder<InferenceClassImportance>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code importance}
-	 */
-	public final double importance() {
-		return this.importance;
-	}
+    /**
+     * Required - API name: {@code class_name}
+     */
+    public final String className() {
+        return this.className;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code importance}
+     */
+    public final double importance() {
+        return this.importance;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("class_name");
-		generator.write(this.className);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("importance");
-		generator.write(this.importance);
+        generator.writeKey("class_name");
+        generator.write(this.className);
 
-	}
+        generator.writeKey("importance");
+        generator.write(this.importance);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link InferenceClassImportance}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InferenceClassImportance> {
-		private String className;
+    /**
+     * Builder for {@link InferenceClassImportance}.
+     */
 
-		private Double importance;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InferenceClassImportance> {
+        private String className;
 
-		/**
-		 * Required - API name: {@code class_name}
-		 */
-		public final Builder className(String value) {
-			this.className = value;
-			return this;
-		}
+        private Double importance;
 
-		/**
-		 * Required - API name: {@code importance}
-		 */
-		public final Builder importance(double value) {
-			this.importance = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code class_name}
+         */
+        public final Builder className(String value) {
+            this.className = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link InferenceClassImportance}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public InferenceClassImportance build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code importance}
+         */
+        public final Builder importance(double value) {
+            this.importance = value;
+            return this;
+        }
 
-			return new InferenceClassImportance(this);
-		}
-	}
+        /**
+         * Builds a {@link InferenceClassImportance}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public InferenceClassImportance build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new InferenceClassImportance(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link InferenceClassImportance}
-	 */
-	public static final JsonpDeserializer<InferenceClassImportance> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, InferenceClassImportance::setupInferenceClassImportanceDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupInferenceClassImportanceDeserializer(
-			ObjectDeserializer<InferenceClassImportance.Builder> op) {
+    /**
+     * Json deserializer for {@link InferenceClassImportance}
+     */
+    public static final JsonpDeserializer<InferenceClassImportance> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        InferenceClassImportance::setupInferenceClassImportanceDeserializer
+    );
 
-		op.add(Builder::className, JsonpDeserializer.stringDeserializer(), "class_name");
-		op.add(Builder::importance, JsonpDeserializer.doubleDeserializer(), "importance");
+    protected static void setupInferenceClassImportanceDeserializer(ObjectDeserializer<InferenceClassImportance.Builder> op) {
 
-	}
+        op.add(Builder::className, JsonpDeserializer.stringDeserializer(), "class_name");
+        op.add(Builder::importance, JsonpDeserializer.doubleDeserializer(), "importance");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceConfig.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceConfig.java
index 7d123be36f..3a6b26772d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceConfig.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceConfig.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,158 +43,155 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.InferenceConfigContainer
 
-
 @JsonpDeserializable
 public class InferenceConfig implements JsonpSerializable {
-	@Nullable
-	private final RegressionInferenceOptions regression;
-
-	@Nullable
-	private final ClassificationInferenceOptions classification;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private InferenceConfig(Builder builder) {
-
-		this.regression = builder.regression;
-		this.classification = builder.classification;
-
-	}
-
-	public static InferenceConfig of(Function<Builder, ObjectBuilder<InferenceConfig>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Regression configuration for inference.
-	 * <p>
-	 * API name: {@code regression}
-	 */
-	@Nullable
-	public final RegressionInferenceOptions regression() {
-		return this.regression;
-	}
-
-	/**
-	 * Classification configuration for inference.
-	 * <p>
-	 * API name: {@code classification}
-	 */
-	@Nullable
-	public final ClassificationInferenceOptions classification() {
-		return this.classification;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.regression != null) {
-			generator.writeKey("regression");
-			this.regression.serialize(generator, mapper);
-
-		}
-		if (this.classification != null) {
-			generator.writeKey("classification");
-			this.classification.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link InferenceConfig}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InferenceConfig> {
-		@Nullable
-		private RegressionInferenceOptions regression;
-
-		@Nullable
-		private ClassificationInferenceOptions classification;
-
-		/**
-		 * Regression configuration for inference.
-		 * <p>
-		 * API name: {@code regression}
-		 */
-		public final Builder regression(@Nullable RegressionInferenceOptions value) {
-			this.regression = value;
-			return this;
-		}
-
-		/**
-		 * Regression configuration for inference.
-		 * <p>
-		 * API name: {@code regression}
-		 */
-		public final Builder regression(
-				Function<RegressionInferenceOptions.Builder, ObjectBuilder<RegressionInferenceOptions>> fn) {
-			return this.regression(fn.apply(new RegressionInferenceOptions.Builder()).build());
-		}
-
-		/**
-		 * Classification configuration for inference.
-		 * <p>
-		 * API name: {@code classification}
-		 */
-		public final Builder classification(@Nullable ClassificationInferenceOptions value) {
-			this.classification = value;
-			return this;
-		}
-
-		/**
-		 * Classification configuration for inference.
-		 * <p>
-		 * API name: {@code classification}
-		 */
-		public final Builder classification(
-				Function<ClassificationInferenceOptions.Builder, ObjectBuilder<ClassificationInferenceOptions>> fn) {
-			return this.classification(fn.apply(new ClassificationInferenceOptions.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link InferenceConfig}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public InferenceConfig build() {
-			_checkSingleUse();
-
-			return new InferenceConfig(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link InferenceConfig}
-	 */
-	public static final JsonpDeserializer<InferenceConfig> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			InferenceConfig::setupInferenceConfigDeserializer);
-
-	protected static void setupInferenceConfigDeserializer(ObjectDeserializer<InferenceConfig.Builder> op) {
-
-		op.add(Builder::regression, RegressionInferenceOptions._DESERIALIZER, "regression");
-		op.add(Builder::classification, ClassificationInferenceOptions._DESERIALIZER, "classification");
-
-	}
+    @Nullable
+    private final RegressionInferenceOptions regression;
+
+    @Nullable
+    private final ClassificationInferenceOptions classification;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private InferenceConfig(Builder builder) {
+
+        this.regression = builder.regression;
+        this.classification = builder.classification;
+
+    }
+
+    public static InferenceConfig of(Function<Builder, ObjectBuilder<InferenceConfig>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Regression configuration for inference.
+     * <p>
+     * API name: {@code regression}
+     */
+    @Nullable
+    public final RegressionInferenceOptions regression() {
+        return this.regression;
+    }
+
+    /**
+     * Classification configuration for inference.
+     * <p>
+     * API name: {@code classification}
+     */
+    @Nullable
+    public final ClassificationInferenceOptions classification() {
+        return this.classification;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.regression != null) {
+            generator.writeKey("regression");
+            this.regression.serialize(generator, mapper);
+
+        }
+        if (this.classification != null) {
+            generator.writeKey("classification");
+            this.classification.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link InferenceConfig}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InferenceConfig> {
+        @Nullable
+        private RegressionInferenceOptions regression;
+
+        @Nullable
+        private ClassificationInferenceOptions classification;
+
+        /**
+         * Regression configuration for inference.
+         * <p>
+         * API name: {@code regression}
+         */
+        public final Builder regression(@Nullable RegressionInferenceOptions value) {
+            this.regression = value;
+            return this;
+        }
+
+        /**
+         * Regression configuration for inference.
+         * <p>
+         * API name: {@code regression}
+         */
+        public final Builder regression(Function<RegressionInferenceOptions.Builder, ObjectBuilder<RegressionInferenceOptions>> fn) {
+            return this.regression(fn.apply(new RegressionInferenceOptions.Builder()).build());
+        }
+
+        /**
+         * Classification configuration for inference.
+         * <p>
+         * API name: {@code classification}
+         */
+        public final Builder classification(@Nullable ClassificationInferenceOptions value) {
+            this.classification = value;
+            return this;
+        }
+
+        /**
+         * Classification configuration for inference.
+         * <p>
+         * API name: {@code classification}
+         */
+        public final Builder classification(
+            Function<ClassificationInferenceOptions.Builder, ObjectBuilder<ClassificationInferenceOptions>> fn
+        ) {
+            return this.classification(fn.apply(new ClassificationInferenceOptions.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link InferenceConfig}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public InferenceConfig build() {
+            _checkSingleUse();
+
+            return new InferenceConfig(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link InferenceConfig}
+     */
+    public static final JsonpDeserializer<InferenceConfig> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        InferenceConfig::setupInferenceConfigDeserializer
+    );
+
+    protected static void setupInferenceConfigDeserializer(ObjectDeserializer<InferenceConfig.Builder> op) {
+
+        op.add(Builder::regression, RegressionInferenceOptions._DESERIALIZER, "regression");
+        op.add(Builder::classification, ClassificationInferenceOptions._DESERIALIZER, "classification");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceFeatureImportance.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceFeatureImportance.java
index 4794739066..caf2372fa0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceFeatureImportance.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceFeatureImportance.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,181 +45,175 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.InferenceFeatureImportance
 
-
 @JsonpDeserializable
 public class InferenceFeatureImportance implements JsonpSerializable {
-	private final String featureName;
+    private final String featureName;
 
-	@Nullable
-	private final Double importance;
-
-	private final List<InferenceClassImportance> classes;
+    @Nullable
+    private final Double importance;
+
+    private final List<InferenceClassImportance> classes;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private InferenceFeatureImportance(Builder builder) {
-
-		this.featureName = ApiTypeHelper.requireNonNull(builder.featureName, this, "featureName");
-		this.importance = builder.importance;
-		this.classes = ApiTypeHelper.unmodifiable(builder.classes);
-
-	}
-
-	public static InferenceFeatureImportance of(Function<Builder, ObjectBuilder<InferenceFeatureImportance>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code feature_name}
-	 */
-	public final String featureName() {
-		return this.featureName;
-	}
-
-	/**
-	 * API name: {@code importance}
-	 */
-	@Nullable
-	public final Double importance() {
-		return this.importance;
-	}
-
-	/**
-	 * API name: {@code classes}
-	 */
-	public final List<InferenceClassImportance> classes() {
-		return this.classes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("feature_name");
-		generator.write(this.featureName);
-
-		if (this.importance != null) {
-			generator.writeKey("importance");
-			generator.write(this.importance);
-
-		}
-		if (ApiTypeHelper.isDefined(this.classes)) {
-			generator.writeKey("classes");
-			generator.writeStartArray();
-			for (InferenceClassImportance item0 : this.classes) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link InferenceFeatureImportance}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InferenceFeatureImportance> {
-		private String featureName;
-
-		@Nullable
-		private Double importance;
-
-		@Nullable
-		private List<InferenceClassImportance> classes;
-
-		/**
-		 * Required - API name: {@code feature_name}
-		 */
-		public final Builder featureName(String value) {
-			this.featureName = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code importance}
-		 */
-		public final Builder importance(@Nullable Double value) {
-			this.importance = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code classes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>classes</code>.
-		 */
-		public final Builder classes(List<InferenceClassImportance> list) {
-			this.classes = _listAddAll(this.classes, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code classes}
-		 * <p>
-		 * Adds one or more values to <code>classes</code>.
-		 */
-		public final Builder classes(InferenceClassImportance value, InferenceClassImportance... values) {
-			this.classes = _listAdd(this.classes, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code classes}
-		 * <p>
-		 * Adds a value to <code>classes</code> using a builder lambda.
-		 */
-		public final Builder classes(
-				Function<InferenceClassImportance.Builder, ObjectBuilder<InferenceClassImportance>> fn) {
-			return classes(fn.apply(new InferenceClassImportance.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link InferenceFeatureImportance}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public InferenceFeatureImportance build() {
-			_checkSingleUse();
-
-			return new InferenceFeatureImportance(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link InferenceFeatureImportance}
-	 */
-	public static final JsonpDeserializer<InferenceFeatureImportance> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, InferenceFeatureImportance::setupInferenceFeatureImportanceDeserializer);
-
-	protected static void setupInferenceFeatureImportanceDeserializer(
-			ObjectDeserializer<InferenceFeatureImportance.Builder> op) {
-
-		op.add(Builder::featureName, JsonpDeserializer.stringDeserializer(), "feature_name");
-		op.add(Builder::importance, JsonpDeserializer.doubleDeserializer(), "importance");
-		op.add(Builder::classes, JsonpDeserializer.arrayDeserializer(InferenceClassImportance._DESERIALIZER),
-				"classes");
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private InferenceFeatureImportance(Builder builder) {
+
+        this.featureName = ApiTypeHelper.requireNonNull(builder.featureName, this, "featureName");
+        this.importance = builder.importance;
+        this.classes = ApiTypeHelper.unmodifiable(builder.classes);
+
+    }
+
+    public static InferenceFeatureImportance of(Function<Builder, ObjectBuilder<InferenceFeatureImportance>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code feature_name}
+     */
+    public final String featureName() {
+        return this.featureName;
+    }
+
+    /**
+     * API name: {@code importance}
+     */
+    @Nullable
+    public final Double importance() {
+        return this.importance;
+    }
+
+    /**
+     * API name: {@code classes}
+     */
+    public final List<InferenceClassImportance> classes() {
+        return this.classes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("feature_name");
+        generator.write(this.featureName);
+
+        if (this.importance != null) {
+            generator.writeKey("importance");
+            generator.write(this.importance);
+
+        }
+        if (ApiTypeHelper.isDefined(this.classes)) {
+            generator.writeKey("classes");
+            generator.writeStartArray();
+            for (InferenceClassImportance item0 : this.classes) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link InferenceFeatureImportance}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InferenceFeatureImportance> {
+        private String featureName;
+
+        @Nullable
+        private Double importance;
+
+        @Nullable
+        private List<InferenceClassImportance> classes;
+
+        /**
+         * Required - API name: {@code feature_name}
+         */
+        public final Builder featureName(String value) {
+            this.featureName = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code importance}
+         */
+        public final Builder importance(@Nullable Double value) {
+            this.importance = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code classes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>classes</code>.
+         */
+        public final Builder classes(List<InferenceClassImportance> list) {
+            this.classes = _listAddAll(this.classes, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code classes}
+         * <p>
+         * Adds one or more values to <code>classes</code>.
+         */
+        public final Builder classes(InferenceClassImportance value, InferenceClassImportance... values) {
+            this.classes = _listAdd(this.classes, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code classes}
+         * <p>
+         * Adds a value to <code>classes</code> using a builder lambda.
+         */
+        public final Builder classes(Function<InferenceClassImportance.Builder, ObjectBuilder<InferenceClassImportance>> fn) {
+            return classes(fn.apply(new InferenceClassImportance.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link InferenceFeatureImportance}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public InferenceFeatureImportance build() {
+            _checkSingleUse();
+
+            return new InferenceFeatureImportance(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link InferenceFeatureImportance}
+     */
+    public static final JsonpDeserializer<InferenceFeatureImportance> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        InferenceFeatureImportance::setupInferenceFeatureImportanceDeserializer
+    );
+
+    protected static void setupInferenceFeatureImportanceDeserializer(ObjectDeserializer<InferenceFeatureImportance.Builder> op) {
+
+        op.add(Builder::featureName, JsonpDeserializer.stringDeserializer(), "feature_name");
+        op.add(Builder::importance, JsonpDeserializer.doubleDeserializer(), "importance");
+        op.add(Builder::classes, JsonpDeserializer.arrayDeserializer(InferenceClassImportance._DESERIALIZER), "classes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceTopClassEntry.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceTopClassEntry.java
index b6f320f01e..4220fc8cfd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceTopClassEntry.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/InferenceTopClassEntry.java
@@ -32,159 +32,159 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.FieldValue;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.FieldValue;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.InferenceTopClassEntry
 
-
 @JsonpDeserializable
 public class InferenceTopClassEntry implements JsonpSerializable {
-	private final FieldValue className;
+    private final FieldValue className;
 
-	private final double classProbability;
-
-	private final double classScore;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private InferenceTopClassEntry(Builder builder) {
-
-		this.className = ApiTypeHelper.requireNonNull(builder.className, this, "className");
-		this.classProbability = ApiTypeHelper.requireNonNull(builder.classProbability, this, "classProbability");
-		this.classScore = ApiTypeHelper.requireNonNull(builder.classScore, this, "classScore");
-
-	}
-
-	public static InferenceTopClassEntry of(Function<Builder, ObjectBuilder<InferenceTopClassEntry>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code class_name}
-	 */
-	public final FieldValue className() {
-		return this.className;
-	}
-
-	/**
-	 * Required - API name: {@code class_probability}
-	 */
-	public final double classProbability() {
-		return this.classProbability;
-	}
-
-	/**
-	 * Required - API name: {@code class_score}
-	 */
-	public final double classScore() {
-		return this.classScore;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("class_name");
-		this.className.serialize(generator, mapper);
-
-		generator.writeKey("class_probability");
-		generator.write(this.classProbability);
-
-		generator.writeKey("class_score");
-		generator.write(this.classScore);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link InferenceTopClassEntry}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InferenceTopClassEntry> {
-		private FieldValue className;
-
-		private Double classProbability;
-
-		private Double classScore;
-
-		/**
-		 * Required - API name: {@code class_name}
-		 */
-		public final Builder className(FieldValue value) {
-			this.className = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code class_name}
-		 */
-		public final Builder className(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
-			return this.className(fn.apply(new FieldValue.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code class_probability}
-		 */
-		public final Builder classProbability(double value) {
-			this.classProbability = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code class_score}
-		 */
-		public final Builder classScore(double value) {
-			this.classScore = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link InferenceTopClassEntry}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public InferenceTopClassEntry build() {
-			_checkSingleUse();
-
-			return new InferenceTopClassEntry(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link InferenceTopClassEntry}
-	 */
-	public static final JsonpDeserializer<InferenceTopClassEntry> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, InferenceTopClassEntry::setupInferenceTopClassEntryDeserializer);
-
-	protected static void setupInferenceTopClassEntryDeserializer(
-			ObjectDeserializer<InferenceTopClassEntry.Builder> op) {
-
-		op.add(Builder::className, FieldValue._DESERIALIZER, "class_name");
-		op.add(Builder::classProbability, JsonpDeserializer.doubleDeserializer(), "class_probability");
-		op.add(Builder::classScore, JsonpDeserializer.doubleDeserializer(), "class_score");
-
-	}
+    private final double classProbability;
+
+    private final double classScore;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private InferenceTopClassEntry(Builder builder) {
+
+        this.className = ApiTypeHelper.requireNonNull(builder.className, this, "className");
+        this.classProbability = ApiTypeHelper.requireNonNull(builder.classProbability, this, "classProbability");
+        this.classScore = ApiTypeHelper.requireNonNull(builder.classScore, this, "classScore");
+
+    }
+
+    public static InferenceTopClassEntry of(Function<Builder, ObjectBuilder<InferenceTopClassEntry>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code class_name}
+     */
+    public final FieldValue className() {
+        return this.className;
+    }
+
+    /**
+     * Required - API name: {@code class_probability}
+     */
+    public final double classProbability() {
+        return this.classProbability;
+    }
+
+    /**
+     * Required - API name: {@code class_score}
+     */
+    public final double classScore() {
+        return this.classScore;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("class_name");
+        this.className.serialize(generator, mapper);
+
+        generator.writeKey("class_probability");
+        generator.write(this.classProbability);
+
+        generator.writeKey("class_score");
+        generator.write(this.classScore);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link InferenceTopClassEntry}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InferenceTopClassEntry> {
+        private FieldValue className;
+
+        private Double classProbability;
+
+        private Double classScore;
+
+        /**
+         * Required - API name: {@code class_name}
+         */
+        public final Builder className(FieldValue value) {
+            this.className = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code class_name}
+         */
+        public final Builder className(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
+            return this.className(fn.apply(new FieldValue.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code class_probability}
+         */
+        public final Builder classProbability(double value) {
+            this.classProbability = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code class_score}
+         */
+        public final Builder classScore(double value) {
+            this.classScore = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link InferenceTopClassEntry}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public InferenceTopClassEntry build() {
+            _checkSingleUse();
+
+            return new InferenceTopClassEntry(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link InferenceTopClassEntry}
+     */
+    public static final JsonpDeserializer<InferenceTopClassEntry> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        InferenceTopClassEntry::setupInferenceTopClassEntryDeserializer
+    );
+
+    protected static void setupInferenceTopClassEntryDeserializer(ObjectDeserializer<InferenceTopClassEntry.Builder> op) {
+
+        op.add(Builder::className, FieldValue._DESERIALIZER, "class_name");
+        op.add(Builder::classProbability, JsonpDeserializer.doubleDeserializer(), "class_probability");
+        op.add(Builder::classScore, JsonpDeserializer.doubleDeserializer(), "class_score");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/IpRangeAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/IpRangeAggregate.java
index 5e0b0aa915..88d0133122 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/IpRangeAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/IpRangeAggregate.java
@@ -32,77 +32,77 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.IpRangeAggregate
 
-
 @JsonpDeserializable
 public class IpRangeAggregate extends MultiBucketAggregateBase<IpRangeBucket> implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private IpRangeAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static IpRangeAggregate of(Function<Builder, ObjectBuilder<IpRangeAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.IpRange;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IpRangeAggregate}.
-	 */
-
-	public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<IpRangeBucket, Builder>
-			implements
-				ObjectBuilder<IpRangeAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IpRangeAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IpRangeAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new IpRangeAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IpRangeAggregate}
-	 */
-	public static final JsonpDeserializer<IpRangeAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IpRangeAggregate::setupIpRangeAggregateDeserializer);
-
-	protected static void setupIpRangeAggregateDeserializer(ObjectDeserializer<IpRangeAggregate.Builder> op) {
-		setupMultiBucketAggregateBaseDeserializer(op, IpRangeBucket._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private IpRangeAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static IpRangeAggregate of(Function<Builder, ObjectBuilder<IpRangeAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.IpRange;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IpRangeAggregate}.
+     */
+
+    public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<IpRangeBucket, Builder>
+        implements
+            ObjectBuilder<IpRangeAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link IpRangeAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IpRangeAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new IpRangeAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IpRangeAggregate}
+     */
+    public static final JsonpDeserializer<IpRangeAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IpRangeAggregate::setupIpRangeAggregateDeserializer
+    );
+
+    protected static void setupIpRangeAggregateDeserializer(ObjectDeserializer<IpRangeAggregate.Builder> op) {
+        setupMultiBucketAggregateBaseDeserializer(op, IpRangeBucket._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/IpRangeAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/IpRangeAggregation.java
index 5b75a44a7f..2a4326fd2e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/IpRangeAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/IpRangeAggregation.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,163 +43,157 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.IpRangeAggregation
 
-
 @JsonpDeserializable
 public class IpRangeAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final String field;
-
-	private final List<IpRangeAggregationRange> ranges;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IpRangeAggregation(Builder builder) {
-		super(builder);
-
-		this.field = builder.field;
-		this.ranges = ApiTypeHelper.unmodifiable(builder.ranges);
-
-	}
-
-	public static IpRangeAggregation of(Function<Builder, ObjectBuilder<IpRangeAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.IpRange;
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code ranges}
-	 */
-	public final List<IpRangeAggregationRange> ranges() {
-		return this.ranges;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (ApiTypeHelper.isDefined(this.ranges)) {
-			generator.writeKey("ranges");
-			generator.writeStartArray();
-			for (IpRangeAggregationRange item0 : this.ranges) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IpRangeAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<IpRangeAggregation> {
-		@Nullable
-		private String field;
-
-		@Nullable
-		private List<IpRangeAggregationRange> ranges;
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ranges}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>ranges</code>.
-		 */
-		public final Builder ranges(List<IpRangeAggregationRange> list) {
-			this.ranges = _listAddAll(this.ranges, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code ranges}
-		 * <p>
-		 * Adds one or more values to <code>ranges</code>.
-		 */
-		public final Builder ranges(IpRangeAggregationRange value, IpRangeAggregationRange... values) {
-			this.ranges = _listAdd(this.ranges, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code ranges}
-		 * <p>
-		 * Adds a value to <code>ranges</code> using a builder lambda.
-		 */
-		public final Builder ranges(
-				Function<IpRangeAggregationRange.Builder, ObjectBuilder<IpRangeAggregationRange>> fn) {
-			return ranges(fn.apply(new IpRangeAggregationRange.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IpRangeAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IpRangeAggregation build() {
-			_checkSingleUse();
-
-			return new IpRangeAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IpRangeAggregation}
-	 */
-	public static final JsonpDeserializer<IpRangeAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IpRangeAggregation::setupIpRangeAggregationDeserializer);
-
-	protected static void setupIpRangeAggregationDeserializer(ObjectDeserializer<IpRangeAggregation.Builder> op) {
-		BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::ranges, JsonpDeserializer.arrayDeserializer(IpRangeAggregationRange._DESERIALIZER), "ranges");
-
-	}
+    @Nullable
+    private final String field;
+
+    private final List<IpRangeAggregationRange> ranges;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IpRangeAggregation(Builder builder) {
+        super(builder);
+
+        this.field = builder.field;
+        this.ranges = ApiTypeHelper.unmodifiable(builder.ranges);
+
+    }
+
+    public static IpRangeAggregation of(Function<Builder, ObjectBuilder<IpRangeAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.IpRange;
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code ranges}
+     */
+    public final List<IpRangeAggregationRange> ranges() {
+        return this.ranges;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (ApiTypeHelper.isDefined(this.ranges)) {
+            generator.writeKey("ranges");
+            generator.writeStartArray();
+            for (IpRangeAggregationRange item0 : this.ranges) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IpRangeAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<IpRangeAggregation> {
+        @Nullable
+        private String field;
+
+        @Nullable
+        private List<IpRangeAggregationRange> ranges;
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ranges}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>ranges</code>.
+         */
+        public final Builder ranges(List<IpRangeAggregationRange> list) {
+            this.ranges = _listAddAll(this.ranges, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code ranges}
+         * <p>
+         * Adds one or more values to <code>ranges</code>.
+         */
+        public final Builder ranges(IpRangeAggregationRange value, IpRangeAggregationRange... values) {
+            this.ranges = _listAdd(this.ranges, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code ranges}
+         * <p>
+         * Adds a value to <code>ranges</code> using a builder lambda.
+         */
+        public final Builder ranges(Function<IpRangeAggregationRange.Builder, ObjectBuilder<IpRangeAggregationRange>> fn) {
+            return ranges(fn.apply(new IpRangeAggregationRange.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link IpRangeAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IpRangeAggregation build() {
+            _checkSingleUse();
+
+            return new IpRangeAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IpRangeAggregation}
+     */
+    public static final JsonpDeserializer<IpRangeAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IpRangeAggregation::setupIpRangeAggregationDeserializer
+    );
+
+    protected static void setupIpRangeAggregationDeserializer(ObjectDeserializer<IpRangeAggregation.Builder> op) {
+        BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::ranges, JsonpDeserializer.arrayDeserializer(IpRangeAggregationRange._DESERIALIZER), "ranges");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/IpRangeAggregationRange.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/IpRangeAggregationRange.java
index 0556d37aaf..bdd9d3beb7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/IpRangeAggregationRange.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/IpRangeAggregationRange.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,158 +43,156 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.IpRangeAggregationRange
 
 @JsonpDeserializable
 public class IpRangeAggregationRange implements JsonpSerializable {
-	@Nullable
-	private final String from;
-
-	@Nullable
-	private final String mask;
-
-	@Nullable
-	private final String to;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IpRangeAggregationRange(Builder builder) {
-
-		this.from = builder.from;
-		this.mask = builder.mask;
-		this.to = builder.to;
-
-	}
-
-	public static IpRangeAggregationRange of(Function<Builder, ObjectBuilder<IpRangeAggregationRange>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code from}
-	 */
-	@Nullable
-	public final String from() {
-		return this.from;
-	}
-
-	/**
-	 * API name: {@code mask}
-	 */
-	@Nullable
-	public final String mask() {
-		return this.mask;
-	}
-
-	/**
-	 * API name: {@code to}
-	 */
-	@Nullable
-	public final String to() {
-		return this.to;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.from != null) {
-			generator.writeKey("from");
-			generator.write(this.from);
-
-		}
-		if (this.mask != null) {
-			generator.writeKey("mask");
-			generator.write(this.mask);
-
-		}
-		if (this.to != null) {
-			generator.writeKey("to");
-			generator.write(this.to);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IpRangeAggregationRange}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IpRangeAggregationRange> {
-		@Nullable
-		private String from;
-
-		@Nullable
-		private String mask;
-
-		@Nullable
-		private String to;
-
-		/**
-		 * API name: {@code from}
-		 */
-		public final Builder from(@Nullable String value) {
-			this.from = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mask}
-		 */
-		public final Builder mask(@Nullable String value) {
-			this.mask = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code to}
-		 */
-		public final Builder to(@Nullable String value) {
-			this.to = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IpRangeAggregationRange}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IpRangeAggregationRange build() {
-			_checkSingleUse();
-
-			return new IpRangeAggregationRange(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IpRangeAggregationRange}
-	 */
-	public static final JsonpDeserializer<IpRangeAggregationRange> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IpRangeAggregationRange::setupIpRangeAggregationRangeDeserializer);
-
-	protected static void setupIpRangeAggregationRangeDeserializer(
-			ObjectDeserializer<IpRangeAggregationRange.Builder> op) {
-
-		op.add(Builder::from, JsonpDeserializer.stringDeserializer(), "from");
-		op.add(Builder::mask, JsonpDeserializer.stringDeserializer(), "mask");
-		op.add(Builder::to, JsonpDeserializer.stringDeserializer(), "to");
-
-	}
+    @Nullable
+    private final String from;
+
+    @Nullable
+    private final String mask;
+
+    @Nullable
+    private final String to;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IpRangeAggregationRange(Builder builder) {
+
+        this.from = builder.from;
+        this.mask = builder.mask;
+        this.to = builder.to;
+
+    }
+
+    public static IpRangeAggregationRange of(Function<Builder, ObjectBuilder<IpRangeAggregationRange>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code from}
+     */
+    @Nullable
+    public final String from() {
+        return this.from;
+    }
+
+    /**
+     * API name: {@code mask}
+     */
+    @Nullable
+    public final String mask() {
+        return this.mask;
+    }
+
+    /**
+     * API name: {@code to}
+     */
+    @Nullable
+    public final String to() {
+        return this.to;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.from != null) {
+            generator.writeKey("from");
+            generator.write(this.from);
+
+        }
+        if (this.mask != null) {
+            generator.writeKey("mask");
+            generator.write(this.mask);
+
+        }
+        if (this.to != null) {
+            generator.writeKey("to");
+            generator.write(this.to);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IpRangeAggregationRange}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IpRangeAggregationRange> {
+        @Nullable
+        private String from;
+
+        @Nullable
+        private String mask;
+
+        @Nullable
+        private String to;
+
+        /**
+         * API name: {@code from}
+         */
+        public final Builder from(@Nullable String value) {
+            this.from = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mask}
+         */
+        public final Builder mask(@Nullable String value) {
+            this.mask = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code to}
+         */
+        public final Builder to(@Nullable String value) {
+            this.to = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link IpRangeAggregationRange}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IpRangeAggregationRange build() {
+            _checkSingleUse();
+
+            return new IpRangeAggregationRange(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IpRangeAggregationRange}
+     */
+    public static final JsonpDeserializer<IpRangeAggregationRange> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IpRangeAggregationRange::setupIpRangeAggregationRangeDeserializer
+    );
+
+    protected static void setupIpRangeAggregationRangeDeserializer(ObjectDeserializer<IpRangeAggregationRange.Builder> op) {
+
+        op.add(Builder::from, JsonpDeserializer.stringDeserializer(), "from");
+        op.add(Builder::mask, JsonpDeserializer.stringDeserializer(), "mask");
+        op.add(Builder::to, JsonpDeserializer.stringDeserializer(), "to");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/IpRangeBucket.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/IpRangeBucket.java
index 0d869c0dcc..c4277f4299 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/IpRangeBucket.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/IpRangeBucket.java
@@ -32,135 +32,134 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.IpRangeBucket
 
-
 @JsonpDeserializable
 public class IpRangeBucket extends MultiBucketBase {
-	@Nullable
-	private final String from;
-
-	@Nullable
-	private final String to;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IpRangeBucket(Builder builder) {
-		super(builder);
-
-		this.from = builder.from;
-		this.to = builder.to;
-
-	}
-
-	public static IpRangeBucket of(Function<Builder, ObjectBuilder<IpRangeBucket>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code from}
-	 */
-	@Nullable
-	public final String from() {
-		return this.from;
-	}
-
-	/**
-	 * API name: {@code to}
-	 */
-	@Nullable
-	public final String to() {
-		return this.to;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.from != null) {
-			generator.writeKey("from");
-			generator.write(this.from);
-
-		}
-		if (this.to != null) {
-			generator.writeKey("to");
-			generator.write(this.to);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IpRangeBucket}.
-	 */
-
-	public static class Builder extends MultiBucketBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<IpRangeBucket> {
-		@Nullable
-		private String from;
-
-		@Nullable
-		private String to;
-
-		/**
-		 * API name: {@code from}
-		 */
-		public final Builder from(@Nullable String value) {
-			this.from = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code to}
-		 */
-		public final Builder to(@Nullable String value) {
-			this.to = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IpRangeBucket}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IpRangeBucket build() {
-			_checkSingleUse();
-
-			return new IpRangeBucket(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IpRangeBucket}
-	 */
-	public static final JsonpDeserializer<IpRangeBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IpRangeBucket::setupIpRangeBucketDeserializer);
-
-	protected static void setupIpRangeBucketDeserializer(ObjectDeserializer<IpRangeBucket.Builder> op) {
-		MultiBucketBase.setupMultiBucketBaseDeserializer(op);
-		op.add(Builder::from, JsonpDeserializer.stringDeserializer(), "from");
-		op.add(Builder::to, JsonpDeserializer.stringDeserializer(), "to");
-
-	}
+    @Nullable
+    private final String from;
+
+    @Nullable
+    private final String to;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IpRangeBucket(Builder builder) {
+        super(builder);
+
+        this.from = builder.from;
+        this.to = builder.to;
+
+    }
+
+    public static IpRangeBucket of(Function<Builder, ObjectBuilder<IpRangeBucket>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code from}
+     */
+    @Nullable
+    public final String from() {
+        return this.from;
+    }
+
+    /**
+     * API name: {@code to}
+     */
+    @Nullable
+    public final String to() {
+        return this.to;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.from != null) {
+            generator.writeKey("from");
+            generator.write(this.from);
+
+        }
+        if (this.to != null) {
+            generator.writeKey("to");
+            generator.write(this.to);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IpRangeBucket}.
+     */
+
+    public static class Builder extends MultiBucketBase.AbstractBuilder<Builder> implements ObjectBuilder<IpRangeBucket> {
+        @Nullable
+        private String from;
+
+        @Nullable
+        private String to;
+
+        /**
+         * API name: {@code from}
+         */
+        public final Builder from(@Nullable String value) {
+            this.from = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code to}
+         */
+        public final Builder to(@Nullable String value) {
+            this.to = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link IpRangeBucket}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IpRangeBucket build() {
+            _checkSingleUse();
+
+            return new IpRangeBucket(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IpRangeBucket}
+     */
+    public static final JsonpDeserializer<IpRangeBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IpRangeBucket::setupIpRangeBucketDeserializer
+    );
+
+    protected static void setupIpRangeBucketDeserializer(ObjectDeserializer<IpRangeBucket.Builder> op) {
+        MultiBucketBase.setupMultiBucketBaseDeserializer(op);
+        op.add(Builder::from, JsonpDeserializer.stringDeserializer(), "from");
+        op.add(Builder::to, JsonpDeserializer.stringDeserializer(), "to");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LinearMovingAverageAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LinearMovingAverageAggregation.java
index ef73da7011..9c3cda754a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LinearMovingAverageAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LinearMovingAverageAggregation.java
@@ -32,123 +32,119 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.EmptyObject;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.EmptyObject;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.aggregations.LinearMovingAverageAggregation
 
-
 @JsonpDeserializable
-public class LinearMovingAverageAggregation extends MovingAverageAggregationBase
-		implements
-			MovingAverageAggregationVariant {
-	private final EmptyObject settings;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private LinearMovingAverageAggregation(Builder builder) {
-		super(builder);
-
-		this.settings = ApiTypeHelper.requireNonNull(builder.settings, this, "settings");
-
-	}
-
-	public static LinearMovingAverageAggregation of(
-			Function<Builder, ObjectBuilder<LinearMovingAverageAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * MovingAverageAggregation variant kind.
-	 */
-	@Override
-	public MovingAverageAggregation.Kind _movingAverageAggregationKind() {
-		return MovingAverageAggregation.Kind.Linear;
-	}
-
-	/**
-	 * Required - API name: {@code settings}
-	 */
-	public final EmptyObject settings() {
-		return this.settings;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("model", "linear");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("settings");
-		this.settings.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link LinearMovingAverageAggregation}.
-	 */
-
-	public static class Builder extends MovingAverageAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<LinearMovingAverageAggregation> {
-		private EmptyObject settings;
-
-		/**
-		 * Required - API name: {@code settings}
-		 */
-		public final Builder settings(EmptyObject value) {
-			this.settings = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code settings}
-		 */
-		public final Builder settings(Function<EmptyObject.Builder, ObjectBuilder<EmptyObject>> fn) {
-			return this.settings(fn.apply(new EmptyObject.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link LinearMovingAverageAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LinearMovingAverageAggregation build() {
-			_checkSingleUse();
-
-			return new LinearMovingAverageAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link LinearMovingAverageAggregation}
-	 */
-	public static final JsonpDeserializer<LinearMovingAverageAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, LinearMovingAverageAggregation::setupLinearMovingAverageAggregationDeserializer);
-
-	protected static void setupLinearMovingAverageAggregationDeserializer(
-			ObjectDeserializer<LinearMovingAverageAggregation.Builder> op) {
-		MovingAverageAggregationBase.setupMovingAverageAggregationBaseDeserializer(op);
-		op.add(Builder::settings, EmptyObject._DESERIALIZER, "settings");
-
-		op.ignore("model");
-	}
+public class LinearMovingAverageAggregation extends MovingAverageAggregationBase implements MovingAverageAggregationVariant {
+    private final EmptyObject settings;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private LinearMovingAverageAggregation(Builder builder) {
+        super(builder);
+
+        this.settings = ApiTypeHelper.requireNonNull(builder.settings, this, "settings");
+
+    }
+
+    public static LinearMovingAverageAggregation of(Function<Builder, ObjectBuilder<LinearMovingAverageAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * MovingAverageAggregation variant kind.
+     */
+    @Override
+    public MovingAverageAggregation.Kind _movingAverageAggregationKind() {
+        return MovingAverageAggregation.Kind.Linear;
+    }
+
+    /**
+     * Required - API name: {@code settings}
+     */
+    public final EmptyObject settings() {
+        return this.settings;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("model", "linear");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("settings");
+        this.settings.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link LinearMovingAverageAggregation}.
+     */
+
+    public static class Builder extends MovingAverageAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<LinearMovingAverageAggregation> {
+        private EmptyObject settings;
+
+        /**
+         * Required - API name: {@code settings}
+         */
+        public final Builder settings(EmptyObject value) {
+            this.settings = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code settings}
+         */
+        public final Builder settings(Function<EmptyObject.Builder, ObjectBuilder<EmptyObject>> fn) {
+            return this.settings(fn.apply(new EmptyObject.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link LinearMovingAverageAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LinearMovingAverageAggregation build() {
+            _checkSingleUse();
+
+            return new LinearMovingAverageAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link LinearMovingAverageAggregation}
+     */
+    public static final JsonpDeserializer<LinearMovingAverageAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LinearMovingAverageAggregation::setupLinearMovingAverageAggregationDeserializer
+    );
+
+    protected static void setupLinearMovingAverageAggregationDeserializer(ObjectDeserializer<LinearMovingAverageAggregation.Builder> op) {
+        MovingAverageAggregationBase.setupMovingAverageAggregationBaseDeserializer(op);
+        op.add(Builder::settings, EmptyObject._DESERIALIZER, "settings");
+
+        op.ignore("model");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LongRareTermsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LongRareTermsAggregate.java
index 77ba96661b..e63cae310e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LongRareTermsAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LongRareTermsAggregate.java
@@ -32,14 +32,13 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.LongRareTermsAggregate
 
 /**
@@ -49,65 +48,66 @@
  */
 @JsonpDeserializable
 public class LongRareTermsAggregate extends MultiBucketAggregateBase<LongRareTermsBucket> implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private LongRareTermsAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static LongRareTermsAggregate of(Function<Builder, ObjectBuilder<LongRareTermsAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Lrareterms;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link LongRareTermsAggregate}.
-	 */
-
-	public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<LongRareTermsBucket, Builder>
-			implements
-				ObjectBuilder<LongRareTermsAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link LongRareTermsAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LongRareTermsAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new LongRareTermsAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link LongRareTermsAggregate}
-	 */
-	public static final JsonpDeserializer<LongRareTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, LongRareTermsAggregate::setupLongRareTermsAggregateDeserializer);
-
-	protected static void setupLongRareTermsAggregateDeserializer(
-			ObjectDeserializer<LongRareTermsAggregate.Builder> op) {
-		MultiBucketAggregateBase.setupMultiBucketAggregateBaseDeserializer(op, LongRareTermsBucket._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private LongRareTermsAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static LongRareTermsAggregate of(Function<Builder, ObjectBuilder<LongRareTermsAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Lrareterms;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link LongRareTermsAggregate}.
+     */
+
+    public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<LongRareTermsBucket, Builder>
+        implements
+            ObjectBuilder<LongRareTermsAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link LongRareTermsAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LongRareTermsAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new LongRareTermsAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link LongRareTermsAggregate}
+     */
+    public static final JsonpDeserializer<LongRareTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LongRareTermsAggregate::setupLongRareTermsAggregateDeserializer
+    );
+
+    protected static void setupLongRareTermsAggregateDeserializer(ObjectDeserializer<LongRareTermsAggregate.Builder> op) {
+        MultiBucketAggregateBase.setupMultiBucketAggregateBaseDeserializer(op, LongRareTermsBucket._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LongRareTermsBucket.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LongRareTermsBucket.java
index f52336f7d9..9d73725916 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LongRareTermsBucket.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LongRareTermsBucket.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,124 +42,120 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.LongRareTermsBucket
 
-
 @JsonpDeserializable
 public class LongRareTermsBucket extends MultiBucketBase {
-	private final long key;
-
-	@Nullable
-	private final String keyAsString;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private LongRareTermsBucket(Builder builder) {
-		super(builder);
-
-		this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
-		this.keyAsString = builder.keyAsString;
-
-	}
-
-	public static LongRareTermsBucket of(Function<Builder, ObjectBuilder<LongRareTermsBucket>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code key}
-	 */
-	public final long key() {
-		return this.key;
-	}
-
-	/**
-	 * API name: {@code key_as_string}
-	 */
-	@Nullable
-	public final String keyAsString() {
-		return this.keyAsString;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("key");
-		generator.write(this.key);
-
-		if (this.keyAsString != null) {
-			generator.writeKey("key_as_string");
-			generator.write(this.keyAsString);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link LongRareTermsBucket}.
-	 */
-
-	public static class Builder extends MultiBucketBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<LongRareTermsBucket> {
-		private Long key;
-
-		@Nullable
-		private String keyAsString;
-
-		/**
-		 * Required - API name: {@code key}
-		 */
-		public final Builder key(long value) {
-			this.key = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code key_as_string}
-		 */
-		public final Builder keyAsString(@Nullable String value) {
-			this.keyAsString = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link LongRareTermsBucket}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LongRareTermsBucket build() {
-			_checkSingleUse();
-
-			return new LongRareTermsBucket(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link LongRareTermsBucket}
-	 */
-	public static final JsonpDeserializer<LongRareTermsBucket> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, LongRareTermsBucket::setupLongRareTermsBucketDeserializer);
-
-	protected static void setupLongRareTermsBucketDeserializer(ObjectDeserializer<LongRareTermsBucket.Builder> op) {
-		setupMultiBucketBaseDeserializer(op);
-		op.add(Builder::key, JsonpDeserializer.longDeserializer(), "key");
-		op.add(Builder::keyAsString, JsonpDeserializer.stringDeserializer(), "key_as_string");
-
-	}
+    private final long key;
+
+    @Nullable
+    private final String keyAsString;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private LongRareTermsBucket(Builder builder) {
+        super(builder);
+
+        this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
+        this.keyAsString = builder.keyAsString;
+
+    }
+
+    public static LongRareTermsBucket of(Function<Builder, ObjectBuilder<LongRareTermsBucket>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code key}
+     */
+    public final long key() {
+        return this.key;
+    }
+
+    /**
+     * API name: {@code key_as_string}
+     */
+    @Nullable
+    public final String keyAsString() {
+        return this.keyAsString;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("key");
+        generator.write(this.key);
+
+        if (this.keyAsString != null) {
+            generator.writeKey("key_as_string");
+            generator.write(this.keyAsString);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link LongRareTermsBucket}.
+     */
+
+    public static class Builder extends MultiBucketBase.AbstractBuilder<Builder> implements ObjectBuilder<LongRareTermsBucket> {
+        private Long key;
+
+        @Nullable
+        private String keyAsString;
+
+        /**
+         * Required - API name: {@code key}
+         */
+        public final Builder key(long value) {
+            this.key = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code key_as_string}
+         */
+        public final Builder keyAsString(@Nullable String value) {
+            this.keyAsString = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link LongRareTermsBucket}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LongRareTermsBucket build() {
+            _checkSingleUse();
+
+            return new LongRareTermsBucket(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link LongRareTermsBucket}
+     */
+    public static final JsonpDeserializer<LongRareTermsBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LongRareTermsBucket::setupLongRareTermsBucketDeserializer
+    );
+
+    protected static void setupLongRareTermsBucketDeserializer(ObjectDeserializer<LongRareTermsBucket.Builder> op) {
+        setupMultiBucketBaseDeserializer(op);
+        op.add(Builder::key, JsonpDeserializer.longDeserializer(), "key");
+        op.add(Builder::keyAsString, JsonpDeserializer.stringDeserializer(), "key_as_string");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LongTermsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LongTermsAggregate.java
index 46048788d7..72cf7d4024 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LongTermsAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LongTermsAggregate.java
@@ -32,14 +32,13 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.LongTermsAggregate
 
 /**
@@ -49,64 +48,66 @@
  */
 @JsonpDeserializable
 public class LongTermsAggregate extends TermsAggregateBase<LongTermsBucket> implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private LongTermsAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static LongTermsAggregate of(Function<Builder, ObjectBuilder<LongTermsAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Lterms;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link LongTermsAggregate}.
-	 */
-
-	public static class Builder extends TermsAggregateBase.AbstractBuilder<LongTermsBucket, Builder>
-			implements
-				ObjectBuilder<LongTermsAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link LongTermsAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LongTermsAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new LongTermsAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link LongTermsAggregate}
-	 */
-	public static final JsonpDeserializer<LongTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, LongTermsAggregate::setupLongTermsAggregateDeserializer);
-
-	protected static void setupLongTermsAggregateDeserializer(ObjectDeserializer<LongTermsAggregate.Builder> op) {
-		setupTermsAggregateBaseDeserializer(op, LongTermsBucket._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private LongTermsAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static LongTermsAggregate of(Function<Builder, ObjectBuilder<LongTermsAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Lterms;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link LongTermsAggregate}.
+     */
+
+    public static class Builder extends TermsAggregateBase.AbstractBuilder<LongTermsBucket, Builder>
+        implements
+            ObjectBuilder<LongTermsAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link LongTermsAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LongTermsAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new LongTermsAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link LongTermsAggregate}
+     */
+    public static final JsonpDeserializer<LongTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LongTermsAggregate::setupLongTermsAggregateDeserializer
+    );
+
+    protected static void setupLongTermsAggregateDeserializer(ObjectDeserializer<LongTermsAggregate.Builder> op) {
+        setupTermsAggregateBaseDeserializer(op, LongTermsBucket._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LongTermsBucket.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LongTermsBucket.java
index 1db4640602..a76f2c3b58 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LongTermsBucket.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/LongTermsBucket.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,124 +42,120 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.LongTermsBucket
 
-
 @JsonpDeserializable
 public class LongTermsBucket extends TermsBucketBase {
-	private final String key;
-
-	@Nullable
-	private final String keyAsString;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private LongTermsBucket(Builder builder) {
-		super(builder);
-
-		this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
-		this.keyAsString = builder.keyAsString;
-
-	}
-
-	public static LongTermsBucket of(Function<Builder, ObjectBuilder<LongTermsBucket>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code key}
-	 */
-	public final String key() {
-		return this.key;
-	}
-
-	/**
-	 * API name: {@code key_as_string}
-	 */
-	@Nullable
-	public final String keyAsString() {
-		return this.keyAsString;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("key");
-		generator.write(this.key);
-
-		if (this.keyAsString != null) {
-			generator.writeKey("key_as_string");
-			generator.write(this.keyAsString);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link LongTermsBucket}.
-	 */
-
-	public static class Builder extends TermsBucketBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<LongTermsBucket> {
-		private String key;
-
-		@Nullable
-		private String keyAsString;
-
-		/**
-		 * Required - API name: {@code key}
-		 */
-		public final Builder key(String value) {
-			this.key = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code key_as_string}
-		 */
-		public final Builder keyAsString(@Nullable String value) {
-			this.keyAsString = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link LongTermsBucket}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LongTermsBucket build() {
-			_checkSingleUse();
-
-			return new LongTermsBucket(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link LongTermsBucket}
-	 */
-	public static final JsonpDeserializer<LongTermsBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			LongTermsBucket::setupLongTermsBucketDeserializer);
-
-	protected static void setupLongTermsBucketDeserializer(ObjectDeserializer<LongTermsBucket.Builder> op) {
-		TermsBucketBase.setupTermsBucketBaseDeserializer(op);
-		op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
-		op.add(Builder::keyAsString, JsonpDeserializer.stringDeserializer(), "key_as_string");
-
-	}
+    private final String key;
+
+    @Nullable
+    private final String keyAsString;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private LongTermsBucket(Builder builder) {
+        super(builder);
+
+        this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
+        this.keyAsString = builder.keyAsString;
+
+    }
+
+    public static LongTermsBucket of(Function<Builder, ObjectBuilder<LongTermsBucket>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code key}
+     */
+    public final String key() {
+        return this.key;
+    }
+
+    /**
+     * API name: {@code key_as_string}
+     */
+    @Nullable
+    public final String keyAsString() {
+        return this.keyAsString;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("key");
+        generator.write(this.key);
+
+        if (this.keyAsString != null) {
+            generator.writeKey("key_as_string");
+            generator.write(this.keyAsString);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link LongTermsBucket}.
+     */
+
+    public static class Builder extends TermsBucketBase.AbstractBuilder<Builder> implements ObjectBuilder<LongTermsBucket> {
+        private String key;
+
+        @Nullable
+        private String keyAsString;
+
+        /**
+         * Required - API name: {@code key}
+         */
+        public final Builder key(String value) {
+            this.key = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code key_as_string}
+         */
+        public final Builder keyAsString(@Nullable String value) {
+            this.keyAsString = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link LongTermsBucket}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LongTermsBucket build() {
+            _checkSingleUse();
+
+            return new LongTermsBucket(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link LongTermsBucket}
+     */
+    public static final JsonpDeserializer<LongTermsBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LongTermsBucket::setupLongTermsBucketDeserializer
+    );
+
+    protected static void setupLongTermsBucketDeserializer(ObjectDeserializer<LongTermsBucket.Builder> op) {
+        TermsBucketBase.setupTermsBucketBaseDeserializer(op);
+        op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
+        op.add(Builder::keyAsString, JsonpDeserializer.stringDeserializer(), "key_as_string");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MatrixAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MatrixAggregation.java
index 329982c9f4..e64504cb78 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MatrixAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MatrixAggregation.java
@@ -32,135 +32,129 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.json.JsonpDeserializer;
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.ObjectDeserializer;
-import org.opensearch.client.util.ApiTypeHelper;
 import jakarta.json.stream.JsonGenerator;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.util.ApiTypeHelper;
 
 // typedef: _types.aggregations.MatrixAggregation
 
-
-
 public abstract class MatrixAggregation extends AggregationBase {
-	private final List<String> fields;
-
-	private final Map<String, Double> missing;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected MatrixAggregation(AbstractBuilder<?> builder) {
-		super(builder);
-
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-		this.missing = ApiTypeHelper.unmodifiable(builder.missing);
-
-	}
-
-	/**
-	 * API name: {@code fields}
-	 */
-	public final List<String> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * API name: {@code missing}
-	 */
-	public final Map<String, Double> missing() {
-		return this.missing;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartArray();
-			for (String item0 : this.fields) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.missing)) {
-			generator.writeKey("missing");
-			generator.writeStartObject();
-			for (Map.Entry<String, Double> item0 : this.missing.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				AggregationBase.AbstractBuilder<BuilderT> {
-		@Nullable
-		private List<String> fields;
-
-		@Nullable
-		private Map<String, Double> missing;
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fields</code>.
-		 */
-		public final BuilderT fields(List<String> list) {
-			this.fields = _listAddAll(this.fields, list);
-			return self();
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds one or more values to <code>fields</code>.
-		 */
-		public final BuilderT fields(String value, String... values) {
-			this.fields = _listAdd(this.fields, value, values);
-			return self();
-		}
-
-		/**
-		 * API name: {@code missing}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>missing</code>.
-		 */
-		public final BuilderT missing(Map<String, Double> map) {
-			this.missing = _mapPutAll(this.missing, map);
-			return self();
-		}
-
-		/**
-		 * API name: {@code missing}
-		 * <p>
-		 * Adds an entry to <code>missing</code>.
-		 */
-		public final BuilderT missing(String key, Double value) {
-			this.missing = _mapPut(this.missing, key, value);
-			return self();
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupMatrixAggregationDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		setupAggregationBaseDeserializer(op);
-		op.add(AbstractBuilder::fields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"fields");
-		op.add(AbstractBuilder::missing,
-				JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.doubleDeserializer()), "missing");
-
-	}
+    private final List<String> fields;
+
+    private final Map<String, Double> missing;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected MatrixAggregation(AbstractBuilder<?> builder) {
+        super(builder);
+
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.missing = ApiTypeHelper.unmodifiable(builder.missing);
+
+    }
+
+    /**
+     * API name: {@code fields}
+     */
+    public final List<String> fields() {
+        return this.fields;
+    }
+
+    /**
+     * API name: {@code missing}
+     */
+    public final Map<String, Double> missing() {
+        return this.missing;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartArray();
+            for (String item0 : this.fields) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.missing)) {
+            generator.writeKey("missing");
+            generator.writeStartObject();
+            for (Map.Entry<String, Double> item0 : this.missing.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregationBase.AbstractBuilder<
+        BuilderT> {
+        @Nullable
+        private List<String> fields;
+
+        @Nullable
+        private Map<String, Double> missing;
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fields</code>.
+         */
+        public final BuilderT fields(List<String> list) {
+            this.fields = _listAddAll(this.fields, list);
+            return self();
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds one or more values to <code>fields</code>.
+         */
+        public final BuilderT fields(String value, String... values) {
+            this.fields = _listAdd(this.fields, value, values);
+            return self();
+        }
+
+        /**
+         * API name: {@code missing}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>missing</code>.
+         */
+        public final BuilderT missing(Map<String, Double> map) {
+            this.missing = _mapPutAll(this.missing, map);
+            return self();
+        }
+
+        /**
+         * API name: {@code missing}
+         * <p>
+         * Adds an entry to <code>missing</code>.
+         */
+        public final BuilderT missing(String key, Double value) {
+            this.missing = _mapPut(this.missing, key, value);
+            return self();
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupMatrixAggregationDeserializer(ObjectDeserializer<BuilderT> op) {
+        setupAggregationBaseDeserializer(op);
+        op.add(AbstractBuilder::fields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "fields");
+        op.add(AbstractBuilder::missing, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.doubleDeserializer()), "missing");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MatrixStatsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MatrixStatsAggregate.java
index 7488f2a0a0..c471c275bc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MatrixStatsAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MatrixStatsAggregate.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,154 +42,151 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.MatrixStatsAggregate
 
 @JsonpDeserializable
 public class MatrixStatsAggregate extends AggregateBase implements AggregateVariant {
-	private final long docCount;
-
-	private final List<MatrixStatsFields> fields;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MatrixStatsAggregate(Builder builder) {
-		super(builder);
-
-		this.docCount = ApiTypeHelper.requireNonNull(builder.docCount, this, "docCount");
-		this.fields = ApiTypeHelper.unmodifiableRequired(builder.fields, this, "fields");
-
-	}
-
-	public static MatrixStatsAggregate of(Function<Builder, ObjectBuilder<MatrixStatsAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.MatrixStats;
-	}
-
-	/**
-	 * Required - API name: {@code doc_count}
-	 */
-	public final long docCount() {
-		return this.docCount;
-	}
-
-	/**
-	 * Required - API name: {@code fields}
-	 */
-	public final List<MatrixStatsFields> fields() {
-		return this.fields;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("doc_count");
-		generator.write(this.docCount);
-
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartArray();
-			for (MatrixStatsFields item0 : this.fields) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MatrixStatsAggregate}.
-	 */
-
-	public static class Builder extends AggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MatrixStatsAggregate> {
-		private Long docCount;
-
-		private List<MatrixStatsFields> fields;
-
-		/**
-		 * Required - API name: {@code doc_count}
-		 */
-		public final Builder docCount(long value) {
-			this.docCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fields</code>.
-		 */
-		public final Builder fields(List<MatrixStatsFields> list) {
-			this.fields = _listAddAll(this.fields, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code fields}
-		 * <p>
-		 * Adds one or more values to <code>fields</code>.
-		 */
-		public final Builder fields(MatrixStatsFields value, MatrixStatsFields... values) {
-			this.fields = _listAdd(this.fields, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code fields}
-		 * <p>
-		 * Adds a value to <code>fields</code> using a builder lambda.
-		 */
-		public final Builder fields(Function<MatrixStatsFields.Builder, ObjectBuilder<MatrixStatsFields>> fn) {
-			return fields(fn.apply(new MatrixStatsFields.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MatrixStatsAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MatrixStatsAggregate build() {
-			_checkSingleUse();
-
-			return new MatrixStatsAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MatrixStatsAggregate}
-	 */
-	public static final JsonpDeserializer<MatrixStatsAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MatrixStatsAggregate::setupMatrixStatsAggregateDeserializer);
-
-	protected static void setupMatrixStatsAggregateDeserializer(ObjectDeserializer<MatrixStatsAggregate.Builder> op) {
-		setupAggregateBaseDeserializer(op);
-		op.add(Builder::docCount, JsonpDeserializer.longDeserializer(), "doc_count");
-		op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(MatrixStatsFields._DESERIALIZER), "fields");
-
-	}
+    private final long docCount;
+
+    private final List<MatrixStatsFields> fields;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MatrixStatsAggregate(Builder builder) {
+        super(builder);
+
+        this.docCount = ApiTypeHelper.requireNonNull(builder.docCount, this, "docCount");
+        this.fields = ApiTypeHelper.unmodifiableRequired(builder.fields, this, "fields");
+
+    }
+
+    public static MatrixStatsAggregate of(Function<Builder, ObjectBuilder<MatrixStatsAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.MatrixStats;
+    }
+
+    /**
+     * Required - API name: {@code doc_count}
+     */
+    public final long docCount() {
+        return this.docCount;
+    }
+
+    /**
+     * Required - API name: {@code fields}
+     */
+    public final List<MatrixStatsFields> fields() {
+        return this.fields;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("doc_count");
+        generator.write(this.docCount);
+
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartArray();
+            for (MatrixStatsFields item0 : this.fields) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MatrixStatsAggregate}.
+     */
+
+    public static class Builder extends AggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<MatrixStatsAggregate> {
+        private Long docCount;
+
+        private List<MatrixStatsFields> fields;
+
+        /**
+         * Required - API name: {@code doc_count}
+         */
+        public final Builder docCount(long value) {
+            this.docCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fields</code>.
+         */
+        public final Builder fields(List<MatrixStatsFields> list) {
+            this.fields = _listAddAll(this.fields, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code fields}
+         * <p>
+         * Adds one or more values to <code>fields</code>.
+         */
+        public final Builder fields(MatrixStatsFields value, MatrixStatsFields... values) {
+            this.fields = _listAdd(this.fields, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code fields}
+         * <p>
+         * Adds a value to <code>fields</code> using a builder lambda.
+         */
+        public final Builder fields(Function<MatrixStatsFields.Builder, ObjectBuilder<MatrixStatsFields>> fn) {
+            return fields(fn.apply(new MatrixStatsFields.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MatrixStatsAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MatrixStatsAggregate build() {
+            _checkSingleUse();
+
+            return new MatrixStatsAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MatrixStatsAggregate}
+     */
+    public static final JsonpDeserializer<MatrixStatsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MatrixStatsAggregate::setupMatrixStatsAggregateDeserializer
+    );
+
+    protected static void setupMatrixStatsAggregateDeserializer(ObjectDeserializer<MatrixStatsAggregate.Builder> op) {
+        setupAggregateBaseDeserializer(op);
+        op.add(Builder::docCount, JsonpDeserializer.longDeserializer(), "doc_count");
+        op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(MatrixStatsFields._DESERIALIZER), "fields");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MatrixStatsAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MatrixStatsAggregation.java
index 6dfabf48de..b66cd02d9a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MatrixStatsAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MatrixStatsAggregation.java
@@ -32,116 +32,113 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.SortMode;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.SortMode;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.MatrixStatsAggregation
 
-
 @JsonpDeserializable
 public class MatrixStatsAggregation extends MatrixAggregation implements AggregationVariant {
-	@Nullable
-	private final SortMode mode;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MatrixStatsAggregation(Builder builder) {
-		super(builder);
-
-		this.mode = builder.mode;
-
-	}
-
-	public static MatrixStatsAggregation of(Function<Builder, ObjectBuilder<MatrixStatsAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.MatrixStats;
-	}
-
-	/**
-	 * API name: {@code mode}
-	 */
-	@Nullable
-	public final SortMode mode() {
-		return this.mode;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.mode != null) {
-			generator.writeKey("mode");
-			this.mode.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MatrixStatsAggregation}.
-	 */
-
-	public static class Builder extends MatrixAggregation.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MatrixStatsAggregation> {
-		@Nullable
-		private SortMode mode;
-
-		/**
-		 * API name: {@code mode}
-		 */
-		public final Builder mode(@Nullable SortMode value) {
-			this.mode = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MatrixStatsAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MatrixStatsAggregation build() {
-			_checkSingleUse();
-
-			return new MatrixStatsAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MatrixStatsAggregation}
-	 */
-	public static final JsonpDeserializer<MatrixStatsAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MatrixStatsAggregation::setupMatrixStatsAggregationDeserializer);
-
-	protected static void setupMatrixStatsAggregationDeserializer(
-			ObjectDeserializer<MatrixStatsAggregation.Builder> op) {
-		MatrixAggregation.setupMatrixAggregationDeserializer(op);
-		op.add(Builder::mode, SortMode._DESERIALIZER, "mode");
-
-	}
+    @Nullable
+    private final SortMode mode;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MatrixStatsAggregation(Builder builder) {
+        super(builder);
+
+        this.mode = builder.mode;
+
+    }
+
+    public static MatrixStatsAggregation of(Function<Builder, ObjectBuilder<MatrixStatsAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.MatrixStats;
+    }
+
+    /**
+     * API name: {@code mode}
+     */
+    @Nullable
+    public final SortMode mode() {
+        return this.mode;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.mode != null) {
+            generator.writeKey("mode");
+            this.mode.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MatrixStatsAggregation}.
+     */
+
+    public static class Builder extends MatrixAggregation.AbstractBuilder<Builder> implements ObjectBuilder<MatrixStatsAggregation> {
+        @Nullable
+        private SortMode mode;
+
+        /**
+         * API name: {@code mode}
+         */
+        public final Builder mode(@Nullable SortMode value) {
+            this.mode = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MatrixStatsAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MatrixStatsAggregation build() {
+            _checkSingleUse();
+
+            return new MatrixStatsAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MatrixStatsAggregation}
+     */
+    public static final JsonpDeserializer<MatrixStatsAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MatrixStatsAggregation::setupMatrixStatsAggregationDeserializer
+    );
+
+    protected static void setupMatrixStatsAggregationDeserializer(ObjectDeserializer<MatrixStatsAggregation.Builder> op) {
+        MatrixAggregation.setupMatrixAggregationDeserializer(op);
+        op.add(Builder::mode, SortMode._DESERIALIZER, "mode");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MatrixStatsFields.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MatrixStatsFields.java
index b6bcd5e1d8..56feebd0cb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MatrixStatsFields.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MatrixStatsFields.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,305 +44,301 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.MatrixStatsFields
 
-
 @JsonpDeserializable
 public class MatrixStatsFields implements JsonpSerializable {
-	private final String name;
-
-	private final long count;
-
-	private final double mean;
-
-	private final double variance;
-
-	private final double skewness;
-
-	private final double kurtosis;
-
-	private final Map<String, Double> covariance;
-
-	private final Map<String, Double> correlation;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MatrixStatsFields(Builder builder) {
-
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.mean = ApiTypeHelper.requireNonNull(builder.mean, this, "mean");
-		this.variance = ApiTypeHelper.requireNonNull(builder.variance, this, "variance");
-		this.skewness = ApiTypeHelper.requireNonNull(builder.skewness, this, "skewness");
-		this.kurtosis = ApiTypeHelper.requireNonNull(builder.kurtosis, this, "kurtosis");
-		this.covariance = ApiTypeHelper.unmodifiableRequired(builder.covariance, this, "covariance");
-		this.correlation = ApiTypeHelper.unmodifiableRequired(builder.correlation, this, "correlation");
-
-	}
-
-	public static MatrixStatsFields of(Function<Builder, ObjectBuilder<MatrixStatsFields>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Required - API name: {@code count}
-	 */
-	public final long count() {
-		return this.count;
-	}
-
-	/**
-	 * Required - API name: {@code mean}
-	 */
-	public final double mean() {
-		return this.mean;
-	}
+    private final String name;
+
+    private final long count;
+
+    private final double mean;
+
+    private final double variance;
+
+    private final double skewness;
+
+    private final double kurtosis;
+
+    private final Map<String, Double> covariance;
+
+    private final Map<String, Double> correlation;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MatrixStatsFields(Builder builder) {
+
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.mean = ApiTypeHelper.requireNonNull(builder.mean, this, "mean");
+        this.variance = ApiTypeHelper.requireNonNull(builder.variance, this, "variance");
+        this.skewness = ApiTypeHelper.requireNonNull(builder.skewness, this, "skewness");
+        this.kurtosis = ApiTypeHelper.requireNonNull(builder.kurtosis, this, "kurtosis");
+        this.covariance = ApiTypeHelper.unmodifiableRequired(builder.covariance, this, "covariance");
+        this.correlation = ApiTypeHelper.unmodifiableRequired(builder.correlation, this, "correlation");
+
+    }
+
+    public static MatrixStatsFields of(Function<Builder, ObjectBuilder<MatrixStatsFields>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Required - API name: {@code count}
+     */
+    public final long count() {
+        return this.count;
+    }
+
+    /**
+     * Required - API name: {@code mean}
+     */
+    public final double mean() {
+        return this.mean;
+    }
 
-	/**
-	 * Required - API name: {@code variance}
-	 */
-	public final double variance() {
-		return this.variance;
-	}
+    /**
+     * Required - API name: {@code variance}
+     */
+    public final double variance() {
+        return this.variance;
+    }
 
-	/**
-	 * Required - API name: {@code skewness}
-	 */
-	public final double skewness() {
-		return this.skewness;
-	}
+    /**
+     * Required - API name: {@code skewness}
+     */
+    public final double skewness() {
+        return this.skewness;
+    }
 
-	/**
-	 * Required - API name: {@code kurtosis}
-	 */
-	public final double kurtosis() {
-		return this.kurtosis;
-	}
+    /**
+     * Required - API name: {@code kurtosis}
+     */
+    public final double kurtosis() {
+        return this.kurtosis;
+    }
 
-	/**
-	 * Required - API name: {@code covariance}
-	 */
-	public final Map<String, Double> covariance() {
-		return this.covariance;
-	}
+    /**
+     * Required - API name: {@code covariance}
+     */
+    public final Map<String, Double> covariance() {
+        return this.covariance;
+    }
 
-	/**
-	 * Required - API name: {@code correlation}
-	 */
-	public final Map<String, Double> correlation() {
-		return this.correlation;
-	}
+    /**
+     * Required - API name: {@code correlation}
+     */
+    public final Map<String, Double> correlation() {
+        return this.correlation;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		generator.writeKey("count");
-		generator.write(this.count);
-
-		generator.writeKey("mean");
-		generator.write(this.mean);
-
-		generator.writeKey("variance");
-		generator.write(this.variance);
-
-		generator.writeKey("skewness");
-		generator.write(this.skewness);
-
-		generator.writeKey("kurtosis");
-		generator.write(this.kurtosis);
-
-		if (ApiTypeHelper.isDefined(this.covariance)) {
-			generator.writeKey("covariance");
-			generator.writeStartObject();
-			for (Map.Entry<String, Double> item0 : this.covariance.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.correlation)) {
-			generator.writeKey("correlation");
-			generator.writeStartObject();
-			for (Map.Entry<String, Double> item0 : this.correlation.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MatrixStatsFields}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MatrixStatsFields> {
-		private String name;
-
-		private Long count;
-
-		private Double mean;
-
-		private Double variance;
-
-		private Double skewness;
-
-		private Double kurtosis;
-
-		private Map<String, Double> covariance;
-
-		private Map<String, Double> correlation;
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code count}
-		 */
-		public final Builder count(long value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mean}
-		 */
-		public final Builder mean(double value) {
-			this.mean = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code variance}
-		 */
-		public final Builder variance(double value) {
-			this.variance = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code skewness}
-		 */
-		public final Builder skewness(double value) {
-			this.skewness = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code kurtosis}
-		 */
-		public final Builder kurtosis(double value) {
-			this.kurtosis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code covariance}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>covariance</code>.
-		 */
-		public final Builder covariance(Map<String, Double> map) {
-			this.covariance = _mapPutAll(this.covariance, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code covariance}
-		 * <p>
-		 * Adds an entry to <code>covariance</code>.
-		 */
-		public final Builder covariance(String key, Double value) {
-			this.covariance = _mapPut(this.covariance, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code correlation}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>correlation</code>.
-		 */
-		public final Builder correlation(Map<String, Double> map) {
-			this.correlation = _mapPutAll(this.correlation, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code correlation}
-		 * <p>
-		 * Adds an entry to <code>correlation</code>.
-		 */
-		public final Builder correlation(String key, Double value) {
-			this.correlation = _mapPut(this.correlation, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MatrixStatsFields}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MatrixStatsFields build() {
-			_checkSingleUse();
-
-			return new MatrixStatsFields(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MatrixStatsFields}
-	 */
-	public static final JsonpDeserializer<MatrixStatsFields> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MatrixStatsFields::setupMatrixStatsFieldsDeserializer);
-
-	protected static void setupMatrixStatsFieldsDeserializer(ObjectDeserializer<MatrixStatsFields.Builder> op) {
-
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
-		op.add(Builder::mean, JsonpDeserializer.doubleDeserializer(), "mean");
-		op.add(Builder::variance, JsonpDeserializer.doubleDeserializer(), "variance");
-		op.add(Builder::skewness, JsonpDeserializer.doubleDeserializer(), "skewness");
-		op.add(Builder::kurtosis, JsonpDeserializer.doubleDeserializer(), "kurtosis");
-		op.add(Builder::covariance, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.doubleDeserializer()),
-				"covariance");
-		op.add(Builder::correlation, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.doubleDeserializer()),
-				"correlation");
-
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        generator.writeKey("count");
+        generator.write(this.count);
+
+        generator.writeKey("mean");
+        generator.write(this.mean);
+
+        generator.writeKey("variance");
+        generator.write(this.variance);
+
+        generator.writeKey("skewness");
+        generator.write(this.skewness);
+
+        generator.writeKey("kurtosis");
+        generator.write(this.kurtosis);
+
+        if (ApiTypeHelper.isDefined(this.covariance)) {
+            generator.writeKey("covariance");
+            generator.writeStartObject();
+            for (Map.Entry<String, Double> item0 : this.covariance.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.correlation)) {
+            generator.writeKey("correlation");
+            generator.writeStartObject();
+            for (Map.Entry<String, Double> item0 : this.correlation.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MatrixStatsFields}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MatrixStatsFields> {
+        private String name;
+
+        private Long count;
+
+        private Double mean;
+
+        private Double variance;
+
+        private Double skewness;
+
+        private Double kurtosis;
+
+        private Map<String, Double> covariance;
+
+        private Map<String, Double> correlation;
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code count}
+         */
+        public final Builder count(long value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mean}
+         */
+        public final Builder mean(double value) {
+            this.mean = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code variance}
+         */
+        public final Builder variance(double value) {
+            this.variance = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code skewness}
+         */
+        public final Builder skewness(double value) {
+            this.skewness = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code kurtosis}
+         */
+        public final Builder kurtosis(double value) {
+            this.kurtosis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code covariance}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>covariance</code>.
+         */
+        public final Builder covariance(Map<String, Double> map) {
+            this.covariance = _mapPutAll(this.covariance, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code covariance}
+         * <p>
+         * Adds an entry to <code>covariance</code>.
+         */
+        public final Builder covariance(String key, Double value) {
+            this.covariance = _mapPut(this.covariance, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code correlation}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>correlation</code>.
+         */
+        public final Builder correlation(Map<String, Double> map) {
+            this.correlation = _mapPutAll(this.correlation, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code correlation}
+         * <p>
+         * Adds an entry to <code>correlation</code>.
+         */
+        public final Builder correlation(String key, Double value) {
+            this.correlation = _mapPut(this.correlation, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link MatrixStatsFields}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MatrixStatsFields build() {
+            _checkSingleUse();
+
+            return new MatrixStatsFields(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MatrixStatsFields}
+     */
+    public static final JsonpDeserializer<MatrixStatsFields> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MatrixStatsFields::setupMatrixStatsFieldsDeserializer
+    );
+
+    protected static void setupMatrixStatsFieldsDeserializer(ObjectDeserializer<MatrixStatsFields.Builder> op) {
+
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
+        op.add(Builder::mean, JsonpDeserializer.doubleDeserializer(), "mean");
+        op.add(Builder::variance, JsonpDeserializer.doubleDeserializer(), "variance");
+        op.add(Builder::skewness, JsonpDeserializer.doubleDeserializer(), "skewness");
+        op.add(Builder::kurtosis, JsonpDeserializer.doubleDeserializer(), "kurtosis");
+        op.add(Builder::covariance, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.doubleDeserializer()), "covariance");
+        op.add(Builder::correlation, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.doubleDeserializer()), "correlation");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MaxAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MaxAggregate.java
index a7a71d83a5..089d843c57 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MaxAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MaxAggregate.java
@@ -32,76 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.MaxAggregate
 
-
 @JsonpDeserializable
 public class MaxAggregate extends SingleMetricAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private MaxAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static MaxAggregate of(Function<Builder, ObjectBuilder<MaxAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Max;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MaxAggregate}.
-	 */
-
-	public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MaxAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MaxAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MaxAggregate build() {
-			_checkSingleUse();
-
-			return new MaxAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MaxAggregate}
-	 */
-	public static final JsonpDeserializer<MaxAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			MaxAggregate::setupMaxAggregateDeserializer);
-
-	protected static void setupMaxAggregateDeserializer(ObjectDeserializer<MaxAggregate.Builder> op) {
-		setupSingleMetricAggregateBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private MaxAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static MaxAggregate of(Function<Builder, ObjectBuilder<MaxAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Max;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MaxAggregate}.
+     */
+
+    public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<MaxAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MaxAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MaxAggregate build() {
+            _checkSingleUse();
+
+            return new MaxAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MaxAggregate}
+     */
+    public static final JsonpDeserializer<MaxAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MaxAggregate::setupMaxAggregateDeserializer
+    );
+
+    protected static void setupMaxAggregateDeserializer(ObjectDeserializer<MaxAggregate.Builder> op) {
+        setupSingleMetricAggregateBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MaxAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MaxAggregation.java
index 196d8c09b6..deffa0ce2e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MaxAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MaxAggregation.java
@@ -32,76 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.MaxAggregation
 
-
 @JsonpDeserializable
 public class MaxAggregation extends FormatMetricAggregationBase implements AggregationVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private MaxAggregation(Builder builder) {
-		super(builder);
-
-	}
-
-	public static MaxAggregation of(Function<Builder, ObjectBuilder<MaxAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Max;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MaxAggregation}.
-	 */
-
-	public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MaxAggregation> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MaxAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MaxAggregation build() {
-			_checkSingleUse();
-
-			return new MaxAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MaxAggregation}
-	 */
-	public static final JsonpDeserializer<MaxAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			MaxAggregation::setupMaxAggregationDeserializer);
-
-	protected static void setupMaxAggregationDeserializer(ObjectDeserializer<MaxAggregation.Builder> op) {
-		setupFormatMetricAggregationBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private MaxAggregation(Builder builder) {
+        super(builder);
+
+    }
+
+    public static MaxAggregation of(Function<Builder, ObjectBuilder<MaxAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Max;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MaxAggregation}.
+     */
+
+    public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<MaxAggregation> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MaxAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MaxAggregation build() {
+            _checkSingleUse();
+
+            return new MaxAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MaxAggregation}
+     */
+    public static final JsonpDeserializer<MaxAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MaxAggregation::setupMaxAggregationDeserializer
+    );
+
+    protected static void setupMaxAggregationDeserializer(ObjectDeserializer<MaxAggregation.Builder> op) {
+        setupFormatMetricAggregationBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MaxBucketAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MaxBucketAggregation.java
index 27d5c18f81..be2a8bc812 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MaxBucketAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MaxBucketAggregation.java
@@ -32,76 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.MaxBucketAggregation
 
-
 @JsonpDeserializable
 public class MaxBucketAggregation extends PipelineAggregationBase implements AggregationVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private MaxBucketAggregation(Builder builder) {
-		super(builder);
-
-	}
-
-	public static MaxBucketAggregation of(Function<Builder, ObjectBuilder<MaxBucketAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.MaxBucket;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MaxBucketAggregation}.
-	 */
-
-	public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MaxBucketAggregation> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MaxBucketAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MaxBucketAggregation build() {
-			_checkSingleUse();
-
-			return new MaxBucketAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MaxBucketAggregation}
-	 */
-	public static final JsonpDeserializer<MaxBucketAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MaxBucketAggregation::setupMaxBucketAggregationDeserializer);
-
-	protected static void setupMaxBucketAggregationDeserializer(ObjectDeserializer<MaxBucketAggregation.Builder> op) {
-		PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private MaxBucketAggregation(Builder builder) {
+        super(builder);
+
+    }
+
+    public static MaxBucketAggregation of(Function<Builder, ObjectBuilder<MaxBucketAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.MaxBucket;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MaxBucketAggregation}.
+     */
+
+    public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<MaxBucketAggregation> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MaxBucketAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MaxBucketAggregation build() {
+            _checkSingleUse();
+
+            return new MaxBucketAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MaxBucketAggregation}
+     */
+    public static final JsonpDeserializer<MaxBucketAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MaxBucketAggregation::setupMaxBucketAggregationDeserializer
+    );
+
+    protected static void setupMaxBucketAggregationDeserializer(ObjectDeserializer<MaxBucketAggregation.Builder> op) {
+        PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MedianAbsoluteDeviationAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MedianAbsoluteDeviationAggregate.java
index 090f0ed7ff..f72d979574 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MedianAbsoluteDeviationAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MedianAbsoluteDeviationAggregate.java
@@ -32,78 +32,78 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.MedianAbsoluteDeviationAggregate
 
-
 @JsonpDeserializable
 public class MedianAbsoluteDeviationAggregate extends SingleMetricAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private MedianAbsoluteDeviationAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static MedianAbsoluteDeviationAggregate of(
-			Function<Builder, ObjectBuilder<MedianAbsoluteDeviationAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.MedianAbsoluteDeviation;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MedianAbsoluteDeviationAggregate}.
-	 */
-
-	public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MedianAbsoluteDeviationAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MedianAbsoluteDeviationAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MedianAbsoluteDeviationAggregate build() {
-			_checkSingleUse();
-
-			return new MedianAbsoluteDeviationAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MedianAbsoluteDeviationAggregate}
-	 */
-	public static final JsonpDeserializer<MedianAbsoluteDeviationAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MedianAbsoluteDeviationAggregate::setupMedianAbsoluteDeviationAggregateDeserializer);
-
-	protected static void setupMedianAbsoluteDeviationAggregateDeserializer(
-			ObjectDeserializer<MedianAbsoluteDeviationAggregate.Builder> op) {
-		setupSingleMetricAggregateBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private MedianAbsoluteDeviationAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static MedianAbsoluteDeviationAggregate of(Function<Builder, ObjectBuilder<MedianAbsoluteDeviationAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.MedianAbsoluteDeviation;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MedianAbsoluteDeviationAggregate}.
+     */
+
+    public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<MedianAbsoluteDeviationAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MedianAbsoluteDeviationAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MedianAbsoluteDeviationAggregate build() {
+            _checkSingleUse();
+
+            return new MedianAbsoluteDeviationAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MedianAbsoluteDeviationAggregate}
+     */
+    public static final JsonpDeserializer<MedianAbsoluteDeviationAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MedianAbsoluteDeviationAggregate::setupMedianAbsoluteDeviationAggregateDeserializer
+    );
+
+    protected static void setupMedianAbsoluteDeviationAggregateDeserializer(
+        ObjectDeserializer<MedianAbsoluteDeviationAggregate.Builder> op
+    ) {
+        setupSingleMetricAggregateBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MedianAbsoluteDeviationAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MedianAbsoluteDeviationAggregation.java
index d8854f03a2..322b5679b8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MedianAbsoluteDeviationAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MedianAbsoluteDeviationAggregation.java
@@ -32,116 +32,117 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.MedianAbsoluteDeviationAggregation
 
 @JsonpDeserializable
 public class MedianAbsoluteDeviationAggregation extends FormatMetricAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Double compression;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MedianAbsoluteDeviationAggregation(Builder builder) {
-		super(builder);
-
-		this.compression = builder.compression;
-
-	}
-
-	public static MedianAbsoluteDeviationAggregation of(
-			Function<Builder, ObjectBuilder<MedianAbsoluteDeviationAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.MedianAbsoluteDeviation;
-	}
-
-	/**
-	 * API name: {@code compression}
-	 */
-	@Nullable
-	public final Double compression() {
-		return this.compression;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.compression != null) {
-			generator.writeKey("compression");
-			generator.write(this.compression);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MedianAbsoluteDeviationAggregation}.
-	 */
-
-	public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MedianAbsoluteDeviationAggregation> {
-		@Nullable
-		private Double compression;
-
-		/**
-		 * API name: {@code compression}
-		 */
-		public final Builder compression(@Nullable Double value) {
-			this.compression = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MedianAbsoluteDeviationAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MedianAbsoluteDeviationAggregation build() {
-			_checkSingleUse();
-
-			return new MedianAbsoluteDeviationAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MedianAbsoluteDeviationAggregation}
-	 */
-	public static final JsonpDeserializer<MedianAbsoluteDeviationAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new,
-					MedianAbsoluteDeviationAggregation::setupMedianAbsoluteDeviationAggregationDeserializer);
-
-	protected static void setupMedianAbsoluteDeviationAggregationDeserializer(
-			ObjectDeserializer<MedianAbsoluteDeviationAggregation.Builder> op) {
-		setupFormatMetricAggregationBaseDeserializer(op);
-		op.add(Builder::compression, JsonpDeserializer.doubleDeserializer(), "compression");
-
-	}
+    @Nullable
+    private final Double compression;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MedianAbsoluteDeviationAggregation(Builder builder) {
+        super(builder);
+
+        this.compression = builder.compression;
+
+    }
+
+    public static MedianAbsoluteDeviationAggregation of(Function<Builder, ObjectBuilder<MedianAbsoluteDeviationAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.MedianAbsoluteDeviation;
+    }
+
+    /**
+     * API name: {@code compression}
+     */
+    @Nullable
+    public final Double compression() {
+        return this.compression;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.compression != null) {
+            generator.writeKey("compression");
+            generator.write(this.compression);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MedianAbsoluteDeviationAggregation}.
+     */
+
+    public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<MedianAbsoluteDeviationAggregation> {
+        @Nullable
+        private Double compression;
+
+        /**
+         * API name: {@code compression}
+         */
+        public final Builder compression(@Nullable Double value) {
+            this.compression = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MedianAbsoluteDeviationAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MedianAbsoluteDeviationAggregation build() {
+            _checkSingleUse();
+
+            return new MedianAbsoluteDeviationAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MedianAbsoluteDeviationAggregation}
+     */
+    public static final JsonpDeserializer<MedianAbsoluteDeviationAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MedianAbsoluteDeviationAggregation::setupMedianAbsoluteDeviationAggregationDeserializer
+    );
+
+    protected static void setupMedianAbsoluteDeviationAggregationDeserializer(
+        ObjectDeserializer<MedianAbsoluteDeviationAggregation.Builder> op
+    ) {
+        setupFormatMetricAggregationBaseDeserializer(op);
+        op.add(Builder::compression, JsonpDeserializer.doubleDeserializer(), "compression");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MetricAggregationBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MetricAggregationBase.java
index 280de3cad1..d512d1e962 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MetricAggregationBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MetricAggregationBase.java
@@ -32,156 +32,154 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.FieldValue;
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.FieldValue;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.MetricAggregationBase
 
-
 public abstract class MetricAggregationBase implements JsonpSerializable {
-	@Nullable
-	private final String field;
-
-	@Nullable
-	private final FieldValue missing;
-
-	@Nullable
-	private final Script script;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected MetricAggregationBase(AbstractBuilder<?> builder) {
-
-		this.field = builder.field;
-		this.missing = builder.missing;
-		this.script = builder.script;
-
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code missing}
-	 */
-	@Nullable
-	public final FieldValue missing() {
-		return this.missing;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final Script script() {
-		return this.script;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (this.missing != null) {
-			generator.writeKey("missing");
-			this.missing.serialize(generator, mapper);
-
-		}
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		@Nullable
-		private String field;
-
-		@Nullable
-		private FieldValue missing;
-
-		@Nullable
-		private Script script;
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final BuilderT field(@Nullable String value) {
-			this.field = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code missing}
-		 */
-		public final BuilderT missing(@Nullable FieldValue value) {
-			this.missing = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code missing}
-		 */
-		public final BuilderT missing(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
-			return this.missing(fn.apply(new FieldValue.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final BuilderT script(@Nullable Script value) {
-			this.script = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final BuilderT script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		protected abstract BuilderT self();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupMetricAggregationBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-
-		op.add(AbstractBuilder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(AbstractBuilder::missing, FieldValue._DESERIALIZER, "missing");
-		op.add(AbstractBuilder::script, Script._DESERIALIZER, "script");
-
-	}
+    @Nullable
+    private final String field;
+
+    @Nullable
+    private final FieldValue missing;
+
+    @Nullable
+    private final Script script;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected MetricAggregationBase(AbstractBuilder<?> builder) {
+
+        this.field = builder.field;
+        this.missing = builder.missing;
+        this.script = builder.script;
+
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code missing}
+     */
+    @Nullable
+    public final FieldValue missing() {
+        return this.missing;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final Script script() {
+        return this.script;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (this.missing != null) {
+            generator.writeKey("missing");
+            this.missing.serialize(generator, mapper);
+
+        }
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        @Nullable
+        private String field;
+
+        @Nullable
+        private FieldValue missing;
+
+        @Nullable
+        private Script script;
+
+        /**
+         * API name: {@code field}
+         */
+        public final BuilderT field(@Nullable String value) {
+            this.field = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code missing}
+         */
+        public final BuilderT missing(@Nullable FieldValue value) {
+            this.missing = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code missing}
+         */
+        public final BuilderT missing(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
+            return this.missing(fn.apply(new FieldValue.Builder()).build());
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final BuilderT script(@Nullable Script value) {
+            this.script = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final BuilderT script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        protected abstract BuilderT self();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupMetricAggregationBaseDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
+
+        op.add(AbstractBuilder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(AbstractBuilder::missing, FieldValue._DESERIALIZER, "missing");
+        op.add(AbstractBuilder::script, Script._DESERIALIZER, "script");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MinAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MinAggregate.java
index a554c4486c..dc0e2b4ed4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MinAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MinAggregate.java
@@ -32,75 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.MinAggregate
 
 @JsonpDeserializable
 public class MinAggregate extends SingleMetricAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private MinAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static MinAggregate of(Function<Builder, ObjectBuilder<MinAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Min;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MinAggregate}.
-	 */
-
-	public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MinAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MinAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MinAggregate build() {
-			_checkSingleUse();
-
-			return new MinAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MinAggregate}
-	 */
-	public static final JsonpDeserializer<MinAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			MinAggregate::setupMinAggregateDeserializer);
-
-	protected static void setupMinAggregateDeserializer(ObjectDeserializer<MinAggregate.Builder> op) {
-		setupSingleMetricAggregateBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private MinAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static MinAggregate of(Function<Builder, ObjectBuilder<MinAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Min;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MinAggregate}.
+     */
+
+    public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<MinAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MinAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MinAggregate build() {
+            _checkSingleUse();
+
+            return new MinAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MinAggregate}
+     */
+    public static final JsonpDeserializer<MinAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MinAggregate::setupMinAggregateDeserializer
+    );
+
+    protected static void setupMinAggregateDeserializer(ObjectDeserializer<MinAggregate.Builder> op) {
+        setupSingleMetricAggregateBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MinAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MinAggregation.java
index af57555363..9b6e6d6760 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MinAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MinAggregation.java
@@ -32,75 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.MinAggregation
 
 @JsonpDeserializable
 public class MinAggregation extends FormatMetricAggregationBase implements AggregationVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private MinAggregation(Builder builder) {
-		super(builder);
-
-	}
-
-	public static MinAggregation of(Function<Builder, ObjectBuilder<MinAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Min;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MinAggregation}.
-	 */
-
-	public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MinAggregation> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MinAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MinAggregation build() {
-			_checkSingleUse();
-
-			return new MinAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MinAggregation}
-	 */
-	public static final JsonpDeserializer<MinAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			MinAggregation::setupMinAggregationDeserializer);
-
-	protected static void setupMinAggregationDeserializer(ObjectDeserializer<MinAggregation.Builder> op) {
-		FormatMetricAggregationBase.setupFormatMetricAggregationBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private MinAggregation(Builder builder) {
+        super(builder);
+
+    }
+
+    public static MinAggregation of(Function<Builder, ObjectBuilder<MinAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Min;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MinAggregation}.
+     */
+
+    public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<MinAggregation> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MinAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MinAggregation build() {
+            _checkSingleUse();
+
+            return new MinAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MinAggregation}
+     */
+    public static final JsonpDeserializer<MinAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MinAggregation::setupMinAggregationDeserializer
+    );
+
+    protected static void setupMinAggregationDeserializer(ObjectDeserializer<MinAggregation.Builder> op) {
+        FormatMetricAggregationBase.setupFormatMetricAggregationBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MinBucketAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MinBucketAggregation.java
index 5d0b2a5d4e..b46b514810 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MinBucketAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MinBucketAggregation.java
@@ -32,75 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.MinBucketAggregation
 
 @JsonpDeserializable
 public class MinBucketAggregation extends PipelineAggregationBase implements AggregationVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private MinBucketAggregation(Builder builder) {
-		super(builder);
-
-	}
-
-	public static MinBucketAggregation of(Function<Builder, ObjectBuilder<MinBucketAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.MinBucket;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MinBucketAggregation}.
-	 */
-
-	public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MinBucketAggregation> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MinBucketAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MinBucketAggregation build() {
-			_checkSingleUse();
-
-			return new MinBucketAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MinBucketAggregation}
-	 */
-	public static final JsonpDeserializer<MinBucketAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MinBucketAggregation::setupMinBucketAggregationDeserializer);
-
-	protected static void setupMinBucketAggregationDeserializer(ObjectDeserializer<MinBucketAggregation.Builder> op) {
-		PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private MinBucketAggregation(Builder builder) {
+        super(builder);
+
+    }
+
+    public static MinBucketAggregation of(Function<Builder, ObjectBuilder<MinBucketAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.MinBucket;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MinBucketAggregation}.
+     */
+
+    public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<MinBucketAggregation> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MinBucketAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MinBucketAggregation build() {
+            _checkSingleUse();
+
+            return new MinBucketAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MinBucketAggregation}
+     */
+    public static final JsonpDeserializer<MinBucketAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MinBucketAggregation::setupMinBucketAggregationDeserializer
+    );
+
+    protected static void setupMinBucketAggregationDeserializer(ObjectDeserializer<MinBucketAggregation.Builder> op) {
+        PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MinimumInterval.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MinimumInterval.java
index 3eeed4f6b4..e8db6b0639 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MinimumInterval.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MinimumInterval.java
@@ -37,30 +37,29 @@
 
 @JsonpDeserializable
 public enum MinimumInterval implements JsonEnum {
-	Second("second"),
+    Second("second"),
 
-	Minute("minute"),
+    Minute("minute"),
 
-	Hour("hour"),
+    Hour("hour"),
 
-	Day("day"),
+    Day("day"),
 
-	Month("month"),
+    Month("month"),
 
-	Year("year"),
+    Year("year"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	MinimumInterval(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    MinimumInterval(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<MinimumInterval> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			MinimumInterval.values());
+    public static final JsonEnum.Deserializer<MinimumInterval> _DESERIALIZER = new JsonEnum.Deserializer<>(MinimumInterval.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MissingAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MissingAggregate.java
index 34b6705960..53b64befc2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MissingAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MissingAggregate.java
@@ -32,75 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.MissingAggregate
 
 @JsonpDeserializable
 public class MissingAggregate extends SingleBucketAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private MissingAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static MissingAggregate of(Function<Builder, ObjectBuilder<MissingAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Missing;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MissingAggregate}.
-	 */
-
-	public static class Builder extends SingleBucketAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MissingAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MissingAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MissingAggregate build() {
-			_checkSingleUse();
-
-			return new MissingAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MissingAggregate}
-	 */
-	public static final JsonpDeserializer<MissingAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			MissingAggregate::setupMissingAggregateDeserializer);
-
-	protected static void setupMissingAggregateDeserializer(ObjectDeserializer<MissingAggregate.Builder> op) {
-		setupSingleBucketAggregateBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private MissingAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static MissingAggregate of(Function<Builder, ObjectBuilder<MissingAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Missing;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MissingAggregate}.
+     */
+
+    public static class Builder extends SingleBucketAggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<MissingAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MissingAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MissingAggregate build() {
+            _checkSingleUse();
+
+            return new MissingAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MissingAggregate}
+     */
+    public static final JsonpDeserializer<MissingAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MissingAggregate::setupMissingAggregateDeserializer
+    );
+
+    protected static void setupMissingAggregateDeserializer(ObjectDeserializer<MissingAggregate.Builder> op) {
+        setupSingleBucketAggregateBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MissingAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MissingAggregation.java
index e8fef3b3b2..4773d0840a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MissingAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MissingAggregation.java
@@ -32,150 +32,150 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.FieldValue;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.FieldValue;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.MissingAggregation
 
 @JsonpDeserializable
 public class MissingAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final String field;
-
-	@Nullable
-	private final FieldValue missing;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MissingAggregation(Builder builder) {
-		super(builder);
-
-		this.field = builder.field;
-		this.missing = builder.missing;
-
-	}
-
-	public static MissingAggregation of(Function<Builder, ObjectBuilder<MissingAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Missing;
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code missing}
-	 */
-	@Nullable
-	public final FieldValue missing() {
-		return this.missing;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (this.missing != null) {
-			generator.writeKey("missing");
-			this.missing.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MissingAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MissingAggregation> {
-		@Nullable
-		private String field;
-
-		@Nullable
-		private FieldValue missing;
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code missing}
-		 */
-		public final Builder missing(@Nullable FieldValue value) {
-			this.missing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code missing}
-		 */
-		public final Builder missing(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
-			return this.missing(fn.apply(new FieldValue.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MissingAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MissingAggregation build() {
-			_checkSingleUse();
-
-			return new MissingAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MissingAggregation}
-	 */
-	public static final JsonpDeserializer<MissingAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MissingAggregation::setupMissingAggregationDeserializer);
-
-	protected static void setupMissingAggregationDeserializer(ObjectDeserializer<MissingAggregation.Builder> op) {
-		BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::missing, FieldValue._DESERIALIZER, "missing");
-
-	}
+    @Nullable
+    private final String field;
+
+    @Nullable
+    private final FieldValue missing;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MissingAggregation(Builder builder) {
+        super(builder);
+
+        this.field = builder.field;
+        this.missing = builder.missing;
+
+    }
+
+    public static MissingAggregation of(Function<Builder, ObjectBuilder<MissingAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Missing;
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code missing}
+     */
+    @Nullable
+    public final FieldValue missing() {
+        return this.missing;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (this.missing != null) {
+            generator.writeKey("missing");
+            this.missing.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MissingAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<MissingAggregation> {
+        @Nullable
+        private String field;
+
+        @Nullable
+        private FieldValue missing;
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code missing}
+         */
+        public final Builder missing(@Nullable FieldValue value) {
+            this.missing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code missing}
+         */
+        public final Builder missing(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
+            return this.missing(fn.apply(new FieldValue.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MissingAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MissingAggregation build() {
+            _checkSingleUse();
+
+            return new MissingAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MissingAggregation}
+     */
+    public static final JsonpDeserializer<MissingAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MissingAggregation::setupMissingAggregationDeserializer
+    );
+
+    protected static void setupMissingAggregationDeserializer(ObjectDeserializer<MissingAggregation.Builder> op) {
+        BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::missing, FieldValue._DESERIALIZER, "missing");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MissingOrder.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MissingOrder.java
index 7a1c8d8dd3..a8451e048d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MissingOrder.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MissingOrder.java
@@ -37,24 +37,23 @@
 
 @JsonpDeserializable
 public enum MissingOrder implements JsonEnum {
-	First("first"),
+    First("first"),
 
-	Last("last"),
+    Last("last"),
 
-	Default("default"),
+    Default("default"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	MissingOrder(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    MissingOrder(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<MissingOrder> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			MissingOrder.values());
+    public static final JsonEnum.Deserializer<MissingOrder> _DESERIALIZER = new JsonEnum.Deserializer<>(MissingOrder.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingAverageAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingAverageAggregation.java
index b3fa0e89cb..44555c8511 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingAverageAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingAverageAggregation.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -44,252 +46,256 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.aggregations.MovingAverageAggregation
 
 @JsonpDeserializable
 public class MovingAverageAggregation
-		implements
-			TaggedUnion<MovingAverageAggregation.Kind, MovingAverageAggregationVariant>,
-			JsonpSerializable {
+    implements
+        TaggedUnion<MovingAverageAggregation.Kind, MovingAverageAggregationVariant>,
+        JsonpSerializable {
 
-	/**
-	 * {@link MovingAverageAggregation} variant kinds.
-	 */
-	/**
-	 * {@link MovingAverageAggregation} variant kinds.
-	 */
+    /**
+     * {@link MovingAverageAggregation} variant kinds.
+     */
+    /**
+     * {@link MovingAverageAggregation} variant kinds.
+     */
 
-	public enum Kind implements JsonEnum {
-		Ewma("ewma"),
-
-		Holt("holt"),
-
-		HoltWinters("holt_winters"),
-
-		Linear("linear"),
-
-		Simple("simple"),
-
-		;
-
-		private final String jsonValue;
-
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
-
-		public String jsonValue() {
-			return this.jsonValue;
-		}
-
-	}
-
-	private final Kind _kind;
-	private final MovingAverageAggregationVariant _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final MovingAverageAggregationVariant _get() {
-		return _value;
-	}
-
-	public MovingAverageAggregation(MovingAverageAggregationVariant value) {
-
-		this._kind = ApiTypeHelper.requireNonNull(value._movingAverageAggregationKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
-
-	}
-
-	private MovingAverageAggregation(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static MovingAverageAggregation of(Function<Builder, ObjectBuilder<MovingAverageAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code ewma}?
-	 */
-	public boolean isEwma() {
-		return _kind == Kind.Ewma;
-	}
-
-	/**
-	 * Get the {@code ewma} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code ewma} kind.
-	 */
-	public EwmaMovingAverageAggregation ewma() {
-		return TaggedUnionUtils.get(this, Kind.Ewma);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code holt}?
-	 */
-	public boolean isHolt() {
-		return _kind == Kind.Holt;
-	}
-
-	/**
-	 * Get the {@code holt} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code holt} kind.
-	 */
-	public HoltMovingAverageAggregation holt() {
-		return TaggedUnionUtils.get(this, Kind.Holt);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code holt_winters}?
-	 */
-	public boolean isHoltWinters() {
-		return _kind == Kind.HoltWinters;
-	}
-
-	/**
-	 * Get the {@code holt_winters} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code holt_winters} kind.
-	 */
-	public HoltWintersMovingAverageAggregation holtWinters() {
-		return TaggedUnionUtils.get(this, Kind.HoltWinters);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code linear}?
-	 */
-	public boolean isLinear() {
-		return _kind == Kind.Linear;
-	}
-
-	/**
-	 * Get the {@code linear} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code linear} kind.
-	 */
-	public LinearMovingAverageAggregation linear() {
-		return TaggedUnionUtils.get(this, Kind.Linear);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code simple}?
-	 */
-	public boolean isSimple() {
-		return _kind == Kind.Simple;
-	}
-
-	/**
-	 * Get the {@code simple} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code simple} kind.
-	 */
-	public SimpleMovingAverageAggregation simple() {
-		return TaggedUnionUtils.get(this, Kind.Simple);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		mapper.serialize(_value, generator);
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MovingAverageAggregation> {
-		private Kind _kind;
-		private MovingAverageAggregationVariant _value;
-
-		public ObjectBuilder<MovingAverageAggregation> ewma(EwmaMovingAverageAggregation v) {
-			this._kind = Kind.Ewma;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<MovingAverageAggregation> ewma(
-				Function<EwmaMovingAverageAggregation.Builder, ObjectBuilder<EwmaMovingAverageAggregation>> fn) {
-			return this.ewma(fn.apply(new EwmaMovingAverageAggregation.Builder()).build());
-		}
-
-		public ObjectBuilder<MovingAverageAggregation> holt(HoltMovingAverageAggregation v) {
-			this._kind = Kind.Holt;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<MovingAverageAggregation> holt(
-				Function<HoltMovingAverageAggregation.Builder, ObjectBuilder<HoltMovingAverageAggregation>> fn) {
-			return this.holt(fn.apply(new HoltMovingAverageAggregation.Builder()).build());
-		}
-
-		public ObjectBuilder<MovingAverageAggregation> holtWinters(HoltWintersMovingAverageAggregation v) {
-			this._kind = Kind.HoltWinters;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<MovingAverageAggregation> holtWinters(
-				Function<HoltWintersMovingAverageAggregation.Builder,
-						ObjectBuilder<HoltWintersMovingAverageAggregation>> fn) {
-			return this.holtWinters(fn.apply(new HoltWintersMovingAverageAggregation.Builder()).build());
-		}
-
-		public ObjectBuilder<MovingAverageAggregation> linear(LinearMovingAverageAggregation v) {
-			this._kind = Kind.Linear;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<MovingAverageAggregation> linear(
-				Function<LinearMovingAverageAggregation.Builder, ObjectBuilder<LinearMovingAverageAggregation>> fn) {
-			return this.linear(fn.apply(new LinearMovingAverageAggregation.Builder()).build());
-		}
-
-		public ObjectBuilder<MovingAverageAggregation> simple(SimpleMovingAverageAggregation v) {
-			this._kind = Kind.Simple;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<MovingAverageAggregation> simple(
-				Function<SimpleMovingAverageAggregation.Builder, ObjectBuilder<SimpleMovingAverageAggregation>> fn) {
-			return this.simple(fn.apply(new SimpleMovingAverageAggregation.Builder()).build());
-		}
-
-		public MovingAverageAggregation build() {
-			_checkSingleUse();
-			return new MovingAverageAggregation(this);
-		}
-
-	}
-
-	protected static void setupMovingAverageAggregationDeserializer(ObjectDeserializer<Builder> op) {
-
-		op.add(Builder::ewma, EwmaMovingAverageAggregation._DESERIALIZER, "ewma");
-		op.add(Builder::holt, HoltMovingAverageAggregation._DESERIALIZER, "holt");
-		op.add(Builder::holtWinters, HoltWintersMovingAverageAggregation._DESERIALIZER, "holt_winters");
-		op.add(Builder::linear, LinearMovingAverageAggregation._DESERIALIZER, "linear");
-		op.add(Builder::simple, SimpleMovingAverageAggregation._DESERIALIZER, "simple");
-
-		op.setTypeProperty("model", null);
-
-	}
-
-	public static final JsonpDeserializer<MovingAverageAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MovingAverageAggregation::setupMovingAverageAggregationDeserializer, Builder::build);
+    public enum Kind implements JsonEnum {
+        Ewma("ewma"),
+
+        Holt("holt"),
+
+        HoltWinters("holt_winters"),
+
+        Linear("linear"),
+
+        Simple("simple"),
+
+        ;
+
+        private final String jsonValue;
+
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
+
+        public String jsonValue() {
+            return this.jsonValue;
+        }
+
+    }
+
+    private final Kind _kind;
+    private final MovingAverageAggregationVariant _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final MovingAverageAggregationVariant _get() {
+        return _value;
+    }
+
+    public MovingAverageAggregation(MovingAverageAggregationVariant value) {
+
+        this._kind = ApiTypeHelper.requireNonNull(value._movingAverageAggregationKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+
+    }
+
+    private MovingAverageAggregation(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static MovingAverageAggregation of(Function<Builder, ObjectBuilder<MovingAverageAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code ewma}?
+     */
+    public boolean isEwma() {
+        return _kind == Kind.Ewma;
+    }
+
+    /**
+     * Get the {@code ewma} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code ewma} kind.
+     */
+    public EwmaMovingAverageAggregation ewma() {
+        return TaggedUnionUtils.get(this, Kind.Ewma);
+    }
+
+    /**
+     * Is this variant instance of kind {@code holt}?
+     */
+    public boolean isHolt() {
+        return _kind == Kind.Holt;
+    }
+
+    /**
+     * Get the {@code holt} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code holt} kind.
+     */
+    public HoltMovingAverageAggregation holt() {
+        return TaggedUnionUtils.get(this, Kind.Holt);
+    }
+
+    /**
+     * Is this variant instance of kind {@code holt_winters}?
+     */
+    public boolean isHoltWinters() {
+        return _kind == Kind.HoltWinters;
+    }
+
+    /**
+     * Get the {@code holt_winters} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code holt_winters} kind.
+     */
+    public HoltWintersMovingAverageAggregation holtWinters() {
+        return TaggedUnionUtils.get(this, Kind.HoltWinters);
+    }
+
+    /**
+     * Is this variant instance of kind {@code linear}?
+     */
+    public boolean isLinear() {
+        return _kind == Kind.Linear;
+    }
+
+    /**
+     * Get the {@code linear} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code linear} kind.
+     */
+    public LinearMovingAverageAggregation linear() {
+        return TaggedUnionUtils.get(this, Kind.Linear);
+    }
+
+    /**
+     * Is this variant instance of kind {@code simple}?
+     */
+    public boolean isSimple() {
+        return _kind == Kind.Simple;
+    }
+
+    /**
+     * Get the {@code simple} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code simple} kind.
+     */
+    public SimpleMovingAverageAggregation simple() {
+        return TaggedUnionUtils.get(this, Kind.Simple);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        mapper.serialize(_value, generator);
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MovingAverageAggregation> {
+        private Kind _kind;
+        private MovingAverageAggregationVariant _value;
+
+        public ObjectBuilder<MovingAverageAggregation> ewma(EwmaMovingAverageAggregation v) {
+            this._kind = Kind.Ewma;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<MovingAverageAggregation> ewma(
+            Function<EwmaMovingAverageAggregation.Builder, ObjectBuilder<EwmaMovingAverageAggregation>> fn
+        ) {
+            return this.ewma(fn.apply(new EwmaMovingAverageAggregation.Builder()).build());
+        }
+
+        public ObjectBuilder<MovingAverageAggregation> holt(HoltMovingAverageAggregation v) {
+            this._kind = Kind.Holt;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<MovingAverageAggregation> holt(
+            Function<HoltMovingAverageAggregation.Builder, ObjectBuilder<HoltMovingAverageAggregation>> fn
+        ) {
+            return this.holt(fn.apply(new HoltMovingAverageAggregation.Builder()).build());
+        }
+
+        public ObjectBuilder<MovingAverageAggregation> holtWinters(HoltWintersMovingAverageAggregation v) {
+            this._kind = Kind.HoltWinters;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<MovingAverageAggregation> holtWinters(
+            Function<HoltWintersMovingAverageAggregation.Builder, ObjectBuilder<HoltWintersMovingAverageAggregation>> fn
+        ) {
+            return this.holtWinters(fn.apply(new HoltWintersMovingAverageAggregation.Builder()).build());
+        }
+
+        public ObjectBuilder<MovingAverageAggregation> linear(LinearMovingAverageAggregation v) {
+            this._kind = Kind.Linear;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<MovingAverageAggregation> linear(
+            Function<LinearMovingAverageAggregation.Builder, ObjectBuilder<LinearMovingAverageAggregation>> fn
+        ) {
+            return this.linear(fn.apply(new LinearMovingAverageAggregation.Builder()).build());
+        }
+
+        public ObjectBuilder<MovingAverageAggregation> simple(SimpleMovingAverageAggregation v) {
+            this._kind = Kind.Simple;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<MovingAverageAggregation> simple(
+            Function<SimpleMovingAverageAggregation.Builder, ObjectBuilder<SimpleMovingAverageAggregation>> fn
+        ) {
+            return this.simple(fn.apply(new SimpleMovingAverageAggregation.Builder()).build());
+        }
+
+        public MovingAverageAggregation build() {
+            _checkSingleUse();
+            return new MovingAverageAggregation(this);
+        }
+
+    }
+
+    protected static void setupMovingAverageAggregationDeserializer(ObjectDeserializer<Builder> op) {
+
+        op.add(Builder::ewma, EwmaMovingAverageAggregation._DESERIALIZER, "ewma");
+        op.add(Builder::holt, HoltMovingAverageAggregation._DESERIALIZER, "holt");
+        op.add(Builder::holtWinters, HoltWintersMovingAverageAggregation._DESERIALIZER, "holt_winters");
+        op.add(Builder::linear, LinearMovingAverageAggregation._DESERIALIZER, "linear");
+        op.add(Builder::simple, SimpleMovingAverageAggregation._DESERIALIZER, "simple");
+
+        op.setTypeProperty("model", null);
+
+    }
+
+    public static final JsonpDeserializer<MovingAverageAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MovingAverageAggregation::setupMovingAverageAggregationDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingAverageAggregationBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingAverageAggregationBase.java
index 3e3b5b705c..ae7dfff169 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingAverageAggregationBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingAverageAggregationBase.java
@@ -32,127 +32,126 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectDeserializer;
-import jakarta.json.stream.JsonGenerator;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.MovingAverageAggregationBase
 
-
 public abstract class MovingAverageAggregationBase extends PipelineAggregationBase {
-	@Nullable
-	private final Boolean minimize;
-
-	@Nullable
-	private final Integer predict;
-
-	@Nullable
-	private final Integer window;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected MovingAverageAggregationBase(AbstractBuilder<?> builder) {
-		super(builder);
-
-		this.minimize = builder.minimize;
-		this.predict = builder.predict;
-		this.window = builder.window;
-
-	}
-
-	/**
-	 * API name: {@code minimize}
-	 */
-	@Nullable
-	public final Boolean minimize() {
-		return this.minimize;
-	}
-
-	/**
-	 * API name: {@code predict}
-	 */
-	@Nullable
-	public final Integer predict() {
-		return this.predict;
-	}
-
-	/**
-	 * API name: {@code window}
-	 */
-	@Nullable
-	public final Integer window() {
-		return this.window;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.minimize != null) {
-			generator.writeKey("minimize");
-			generator.write(this.minimize);
-
-		}
-		if (this.predict != null) {
-			generator.writeKey("predict");
-			generator.write(this.predict);
-
-		}
-		if (this.window != null) {
-			generator.writeKey("window");
-			generator.write(this.window);
-
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				PipelineAggregationBase.AbstractBuilder<BuilderT> {
-		@Nullable
-		private Boolean minimize;
-
-		@Nullable
-		private Integer predict;
-
-		@Nullable
-		private Integer window;
-
-		/**
-		 * API name: {@code minimize}
-		 */
-		public final BuilderT minimize(@Nullable Boolean value) {
-			this.minimize = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code predict}
-		 */
-		public final BuilderT predict(@Nullable Integer value) {
-			this.predict = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code window}
-		 */
-		public final BuilderT window(@Nullable Integer value) {
-			this.window = value;
-			return self();
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupMovingAverageAggregationBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
-		op.add(AbstractBuilder::minimize, JsonpDeserializer.booleanDeserializer(), "minimize");
-		op.add(AbstractBuilder::predict, JsonpDeserializer.integerDeserializer(), "predict");
-		op.add(AbstractBuilder::window, JsonpDeserializer.integerDeserializer(), "window");
-
-	}
+    @Nullable
+    private final Boolean minimize;
+
+    @Nullable
+    private final Integer predict;
+
+    @Nullable
+    private final Integer window;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected MovingAverageAggregationBase(AbstractBuilder<?> builder) {
+        super(builder);
+
+        this.minimize = builder.minimize;
+        this.predict = builder.predict;
+        this.window = builder.window;
+
+    }
+
+    /**
+     * API name: {@code minimize}
+     */
+    @Nullable
+    public final Boolean minimize() {
+        return this.minimize;
+    }
+
+    /**
+     * API name: {@code predict}
+     */
+    @Nullable
+    public final Integer predict() {
+        return this.predict;
+    }
+
+    /**
+     * API name: {@code window}
+     */
+    @Nullable
+    public final Integer window() {
+        return this.window;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.minimize != null) {
+            generator.writeKey("minimize");
+            generator.write(this.minimize);
+
+        }
+        if (this.predict != null) {
+            generator.writeKey("predict");
+            generator.write(this.predict);
+
+        }
+        if (this.window != null) {
+            generator.writeKey("window");
+            generator.write(this.window);
+
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends
+        PipelineAggregationBase.AbstractBuilder<BuilderT> {
+        @Nullable
+        private Boolean minimize;
+
+        @Nullable
+        private Integer predict;
+
+        @Nullable
+        private Integer window;
+
+        /**
+         * API name: {@code minimize}
+         */
+        public final BuilderT minimize(@Nullable Boolean value) {
+            this.minimize = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code predict}
+         */
+        public final BuilderT predict(@Nullable Integer value) {
+            this.predict = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code window}
+         */
+        public final BuilderT window(@Nullable Integer value) {
+            this.window = value;
+            return self();
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupMovingAverageAggregationBaseDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
+        PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
+        op.add(AbstractBuilder::minimize, JsonpDeserializer.booleanDeserializer(), "minimize");
+        op.add(AbstractBuilder::predict, JsonpDeserializer.integerDeserializer(), "predict");
+        op.add(AbstractBuilder::window, JsonpDeserializer.integerDeserializer(), "window");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingAverageAggregationBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingAverageAggregationBuilders.java
index f3acacad2a..ef80469d4a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingAverageAggregationBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingAverageAggregationBuilders.java
@@ -36,47 +36,46 @@
  * Builders for {@link MovingAverageAggregation} variants.
  */
 public class MovingAverageAggregationBuilders {
-	private MovingAverageAggregationBuilders() {
-	}
+    private MovingAverageAggregationBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link EwmaMovingAverageAggregation ewma}
-	 * {@code MovingAverageAggregation} variant.
-	 */
-	public static EwmaMovingAverageAggregation.Builder ewma() {
-		return new EwmaMovingAverageAggregation.Builder();
-	}
+    /**
+     * Creates a builder for the {@link EwmaMovingAverageAggregation ewma}
+     * {@code MovingAverageAggregation} variant.
+     */
+    public static EwmaMovingAverageAggregation.Builder ewma() {
+        return new EwmaMovingAverageAggregation.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link HoltMovingAverageAggregation holt}
-	 * {@code MovingAverageAggregation} variant.
-	 */
-	public static HoltMovingAverageAggregation.Builder holt() {
-		return new HoltMovingAverageAggregation.Builder();
-	}
+    /**
+     * Creates a builder for the {@link HoltMovingAverageAggregation holt}
+     * {@code MovingAverageAggregation} variant.
+     */
+    public static HoltMovingAverageAggregation.Builder holt() {
+        return new HoltMovingAverageAggregation.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link HoltWintersMovingAverageAggregation
-	 * holt_winters} {@code MovingAverageAggregation} variant.
-	 */
-	public static HoltWintersMovingAverageAggregation.Builder holtWinters() {
-		return new HoltWintersMovingAverageAggregation.Builder();
-	}
+    /**
+     * Creates a builder for the {@link HoltWintersMovingAverageAggregation
+     * holt_winters} {@code MovingAverageAggregation} variant.
+     */
+    public static HoltWintersMovingAverageAggregation.Builder holtWinters() {
+        return new HoltWintersMovingAverageAggregation.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link LinearMovingAverageAggregation linear}
-	 * {@code MovingAverageAggregation} variant.
-	 */
-	public static LinearMovingAverageAggregation.Builder linear() {
-		return new LinearMovingAverageAggregation.Builder();
-	}
+    /**
+     * Creates a builder for the {@link LinearMovingAverageAggregation linear}
+     * {@code MovingAverageAggregation} variant.
+     */
+    public static LinearMovingAverageAggregation.Builder linear() {
+        return new LinearMovingAverageAggregation.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link SimpleMovingAverageAggregation simple}
-	 * {@code MovingAverageAggregation} variant.
-	 */
-	public static SimpleMovingAverageAggregation.Builder simple() {
-		return new SimpleMovingAverageAggregation.Builder();
-	}
+    /**
+     * Creates a builder for the {@link SimpleMovingAverageAggregation simple}
+     * {@code MovingAverageAggregation} variant.
+     */
+    public static SimpleMovingAverageAggregation.Builder simple() {
+        return new SimpleMovingAverageAggregation.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingAverageAggregationVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingAverageAggregationVariant.java
index 3e2f600c29..36995c7d5c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingAverageAggregationVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingAverageAggregationVariant.java
@@ -39,10 +39,10 @@
  */
 public interface MovingAverageAggregationVariant extends JsonpSerializable {
 
-	MovingAverageAggregation.Kind _movingAverageAggregationKind();
+    MovingAverageAggregation.Kind _movingAverageAggregationKind();
 
-	default MovingAverageAggregation _toMovingAverageAggregation() {
-		return new MovingAverageAggregation(this);
-	}
+    default MovingAverageAggregation _toMovingAverageAggregation() {
+        return new MovingAverageAggregation(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingFunctionAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingFunctionAggregation.java
index ba175bfcce..57ea720bc9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingFunctionAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingFunctionAggregation.java
@@ -32,172 +32,173 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.MovingFunctionAggregation
 
 @JsonpDeserializable
 public class MovingFunctionAggregation extends PipelineAggregationBase implements AggregationVariant {
-	@Nullable
-	private final String script;
-
-	@Nullable
-	private final Integer shift;
-
-	@Nullable
-	private final Integer window;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MovingFunctionAggregation(Builder builder) {
-		super(builder);
-
-		this.script = builder.script;
-		this.shift = builder.shift;
-		this.window = builder.window;
-
-	}
-
-	public static MovingFunctionAggregation of(Function<Builder, ObjectBuilder<MovingFunctionAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.MovingFn;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final String script() {
-		return this.script;
-	}
-
-	/**
-	 * API name: {@code shift}
-	 */
-	@Nullable
-	public final Integer shift() {
-		return this.shift;
-	}
-
-	/**
-	 * API name: {@code window}
-	 */
-	@Nullable
-	public final Integer window() {
-		return this.window;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.script != null) {
-			generator.writeKey("script");
-			generator.write(this.script);
-
-		}
-		if (this.shift != null) {
-			generator.writeKey("shift");
-			generator.write(this.shift);
-
-		}
-		if (this.window != null) {
-			generator.writeKey("window");
-			generator.write(this.window);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MovingFunctionAggregation}.
-	 */
-
-	public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MovingFunctionAggregation> {
-		@Nullable
-		private String script;
-
-		@Nullable
-		private Integer shift;
-
-		@Nullable
-		private Integer window;
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(@Nullable String value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code shift}
-		 */
-		public final Builder shift(@Nullable Integer value) {
-			this.shift = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code window}
-		 */
-		public final Builder window(@Nullable Integer value) {
-			this.window = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MovingFunctionAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MovingFunctionAggregation build() {
-			_checkSingleUse();
-
-			return new MovingFunctionAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MovingFunctionAggregation}
-	 */
-	public static final JsonpDeserializer<MovingFunctionAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MovingFunctionAggregation::setupMovingFunctionAggregationDeserializer);
-
-	protected static void setupMovingFunctionAggregationDeserializer(
-			ObjectDeserializer<MovingFunctionAggregation.Builder> op) {
-		PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
-		op.add(Builder::script, JsonpDeserializer.stringDeserializer(), "script");
-		op.add(Builder::shift, JsonpDeserializer.integerDeserializer(), "shift");
-		op.add(Builder::window, JsonpDeserializer.integerDeserializer(), "window");
-
-	}
+    @Nullable
+    private final String script;
+
+    @Nullable
+    private final Integer shift;
+
+    @Nullable
+    private final Integer window;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MovingFunctionAggregation(Builder builder) {
+        super(builder);
+
+        this.script = builder.script;
+        this.shift = builder.shift;
+        this.window = builder.window;
+
+    }
+
+    public static MovingFunctionAggregation of(Function<Builder, ObjectBuilder<MovingFunctionAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.MovingFn;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final String script() {
+        return this.script;
+    }
+
+    /**
+     * API name: {@code shift}
+     */
+    @Nullable
+    public final Integer shift() {
+        return this.shift;
+    }
+
+    /**
+     * API name: {@code window}
+     */
+    @Nullable
+    public final Integer window() {
+        return this.window;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.script != null) {
+            generator.writeKey("script");
+            generator.write(this.script);
+
+        }
+        if (this.shift != null) {
+            generator.writeKey("shift");
+            generator.write(this.shift);
+
+        }
+        if (this.window != null) {
+            generator.writeKey("window");
+            generator.write(this.window);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MovingFunctionAggregation}.
+     */
+
+    public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<MovingFunctionAggregation> {
+        @Nullable
+        private String script;
+
+        @Nullable
+        private Integer shift;
+
+        @Nullable
+        private Integer window;
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(@Nullable String value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code shift}
+         */
+        public final Builder shift(@Nullable Integer value) {
+            this.shift = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code window}
+         */
+        public final Builder window(@Nullable Integer value) {
+            this.window = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MovingFunctionAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MovingFunctionAggregation build() {
+            _checkSingleUse();
+
+            return new MovingFunctionAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MovingFunctionAggregation}
+     */
+    public static final JsonpDeserializer<MovingFunctionAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MovingFunctionAggregation::setupMovingFunctionAggregationDeserializer
+    );
+
+    protected static void setupMovingFunctionAggregationDeserializer(ObjectDeserializer<MovingFunctionAggregation.Builder> op) {
+        PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
+        op.add(Builder::script, JsonpDeserializer.stringDeserializer(), "script");
+        op.add(Builder::shift, JsonpDeserializer.integerDeserializer(), "shift");
+        op.add(Builder::window, JsonpDeserializer.integerDeserializer(), "window");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingPercentilesAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingPercentilesAggregation.java
index 205e2c7d6f..e00de44a51 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingPercentilesAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingPercentilesAggregation.java
@@ -32,172 +32,173 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.MovingPercentilesAggregation
 
 @JsonpDeserializable
 public class MovingPercentilesAggregation extends PipelineAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Integer window;
-
-	@Nullable
-	private final Integer shift;
-
-	@Nullable
-	private final Boolean keyed;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MovingPercentilesAggregation(Builder builder) {
-		super(builder);
-
-		this.window = builder.window;
-		this.shift = builder.shift;
-		this.keyed = builder.keyed;
-
-	}
-
-	public static MovingPercentilesAggregation of(Function<Builder, ObjectBuilder<MovingPercentilesAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.MovingPercentiles;
-	}
-
-	/**
-	 * API name: {@code window}
-	 */
-	@Nullable
-	public final Integer window() {
-		return this.window;
-	}
-
-	/**
-	 * API name: {@code shift}
-	 */
-	@Nullable
-	public final Integer shift() {
-		return this.shift;
-	}
-
-	/**
-	 * API name: {@code keyed}
-	 */
-	@Nullable
-	public final Boolean keyed() {
-		return this.keyed;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.window != null) {
-			generator.writeKey("window");
-			generator.write(this.window);
-
-		}
-		if (this.shift != null) {
-			generator.writeKey("shift");
-			generator.write(this.shift);
-
-		}
-		if (this.keyed != null) {
-			generator.writeKey("keyed");
-			generator.write(this.keyed);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MovingPercentilesAggregation}.
-	 */
-
-	public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MovingPercentilesAggregation> {
-		@Nullable
-		private Integer window;
-
-		@Nullable
-		private Integer shift;
-
-		@Nullable
-		private Boolean keyed;
-
-		/**
-		 * API name: {@code window}
-		 */
-		public final Builder window(@Nullable Integer value) {
-			this.window = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code shift}
-		 */
-		public final Builder shift(@Nullable Integer value) {
-			this.shift = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code keyed}
-		 */
-		public final Builder keyed(@Nullable Boolean value) {
-			this.keyed = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MovingPercentilesAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MovingPercentilesAggregation build() {
-			_checkSingleUse();
-
-			return new MovingPercentilesAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MovingPercentilesAggregation}
-	 */
-	public static final JsonpDeserializer<MovingPercentilesAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MovingPercentilesAggregation::setupMovingPercentilesAggregationDeserializer);
-
-	protected static void setupMovingPercentilesAggregationDeserializer(
-			ObjectDeserializer<MovingPercentilesAggregation.Builder> op) {
-		PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
-		op.add(Builder::window, JsonpDeserializer.integerDeserializer(), "window");
-		op.add(Builder::shift, JsonpDeserializer.integerDeserializer(), "shift");
-		op.add(Builder::keyed, JsonpDeserializer.booleanDeserializer(), "keyed");
-
-	}
+    @Nullable
+    private final Integer window;
+
+    @Nullable
+    private final Integer shift;
+
+    @Nullable
+    private final Boolean keyed;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MovingPercentilesAggregation(Builder builder) {
+        super(builder);
+
+        this.window = builder.window;
+        this.shift = builder.shift;
+        this.keyed = builder.keyed;
+
+    }
+
+    public static MovingPercentilesAggregation of(Function<Builder, ObjectBuilder<MovingPercentilesAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.MovingPercentiles;
+    }
+
+    /**
+     * API name: {@code window}
+     */
+    @Nullable
+    public final Integer window() {
+        return this.window;
+    }
+
+    /**
+     * API name: {@code shift}
+     */
+    @Nullable
+    public final Integer shift() {
+        return this.shift;
+    }
+
+    /**
+     * API name: {@code keyed}
+     */
+    @Nullable
+    public final Boolean keyed() {
+        return this.keyed;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.window != null) {
+            generator.writeKey("window");
+            generator.write(this.window);
+
+        }
+        if (this.shift != null) {
+            generator.writeKey("shift");
+            generator.write(this.shift);
+
+        }
+        if (this.keyed != null) {
+            generator.writeKey("keyed");
+            generator.write(this.keyed);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MovingPercentilesAggregation}.
+     */
+
+    public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<MovingPercentilesAggregation> {
+        @Nullable
+        private Integer window;
+
+        @Nullable
+        private Integer shift;
+
+        @Nullable
+        private Boolean keyed;
+
+        /**
+         * API name: {@code window}
+         */
+        public final Builder window(@Nullable Integer value) {
+            this.window = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code shift}
+         */
+        public final Builder shift(@Nullable Integer value) {
+            this.shift = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code keyed}
+         */
+        public final Builder keyed(@Nullable Boolean value) {
+            this.keyed = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MovingPercentilesAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MovingPercentilesAggregation build() {
+            _checkSingleUse();
+
+            return new MovingPercentilesAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MovingPercentilesAggregation}
+     */
+    public static final JsonpDeserializer<MovingPercentilesAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MovingPercentilesAggregation::setupMovingPercentilesAggregationDeserializer
+    );
+
+    protected static void setupMovingPercentilesAggregationDeserializer(ObjectDeserializer<MovingPercentilesAggregation.Builder> op) {
+        PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
+        op.add(Builder::window, JsonpDeserializer.integerDeserializer(), "window");
+        op.add(Builder::shift, JsonpDeserializer.integerDeserializer(), "shift");
+        op.add(Builder::keyed, JsonpDeserializer.booleanDeserializer(), "keyed");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiBucketAggregateBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiBucketAggregateBase.java
index 92e46b337b..6ab9da491b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiBucketAggregateBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiBucketAggregateBase.java
@@ -32,91 +32,90 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.MultiBucketAggregateBase
 
-
 public abstract class MultiBucketAggregateBase<TBucket> extends AggregateBase {
-	private final Buckets<TBucket> buckets;
-
-	@Nullable
-	private final JsonpSerializer<TBucket> tBucketSerializer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected MultiBucketAggregateBase(AbstractBuilder<TBucket, ?> builder) {
-		super(builder);
-
-		this.buckets = ApiTypeHelper.requireNonNull(builder.buckets, this, "buckets");
-		this.tBucketSerializer = builder.tBucketSerializer;
-
-	}
-
-	/**
-	 * Required - API name: {@code buckets}
-	 */
-	public final Buckets<TBucket> buckets() {
-		return this.buckets;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("buckets");
-		this.buckets.serialize(generator, mapper);
-
-	}
-
-	protected abstract static class AbstractBuilder<TBucket, BuilderT extends AbstractBuilder<TBucket, BuilderT>>
-			extends
-				AggregateBase.AbstractBuilder<BuilderT> {
-		private Buckets<TBucket> buckets;
-
-		@Nullable
-		private JsonpSerializer<TBucket> tBucketSerializer;
-
-		/**
-		 * Required - API name: {@code buckets}
-		 */
-		public final BuilderT buckets(Buckets<TBucket> value) {
-			this.buckets = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code buckets}
-		 */
-		public final BuilderT buckets(Function<Buckets.Builder<TBucket>, ObjectBuilder<Buckets<TBucket>>> fn) {
-			return this.buckets(fn.apply(new Buckets.Builder<TBucket>()).build());
-		}
-
-		/**
-		 * Serializer for TBucket. If not set, an attempt will be made to find a
-		 * serializer from the JSON context.
-		 */
-		public final BuilderT tBucketSerializer(@Nullable JsonpSerializer<TBucket> value) {
-			this.tBucketSerializer = value;
-			return self();
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <TBucket, BuilderT extends AbstractBuilder<TBucket, BuilderT>> void setupMultiBucketAggregateBaseDeserializer(
-			ObjectDeserializer<BuilderT> op, JsonpDeserializer<TBucket> tBucketDeserializer) {
-		AggregateBase.setupAggregateBaseDeserializer(op);
-		op.add(AbstractBuilder::buckets, Buckets.createBucketsDeserializer(tBucketDeserializer), "buckets");
-
-	}
+    private final Buckets<TBucket> buckets;
+
+    @Nullable
+    private final JsonpSerializer<TBucket> tBucketSerializer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected MultiBucketAggregateBase(AbstractBuilder<TBucket, ?> builder) {
+        super(builder);
+
+        this.buckets = ApiTypeHelper.requireNonNull(builder.buckets, this, "buckets");
+        this.tBucketSerializer = builder.tBucketSerializer;
+
+    }
+
+    /**
+     * Required - API name: {@code buckets}
+     */
+    public final Buckets<TBucket> buckets() {
+        return this.buckets;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("buckets");
+        this.buckets.serialize(generator, mapper);
+
+    }
+
+    protected abstract static class AbstractBuilder<TBucket, BuilderT extends AbstractBuilder<TBucket, BuilderT>> extends
+        AggregateBase.AbstractBuilder<BuilderT> {
+        private Buckets<TBucket> buckets;
+
+        @Nullable
+        private JsonpSerializer<TBucket> tBucketSerializer;
+
+        /**
+         * Required - API name: {@code buckets}
+         */
+        public final BuilderT buckets(Buckets<TBucket> value) {
+            this.buckets = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code buckets}
+         */
+        public final BuilderT buckets(Function<Buckets.Builder<TBucket>, ObjectBuilder<Buckets<TBucket>>> fn) {
+            return this.buckets(fn.apply(new Buckets.Builder<TBucket>()).build());
+        }
+
+        /**
+         * Serializer for TBucket. If not set, an attempt will be made to find a
+         * serializer from the JSON context.
+         */
+        public final BuilderT tBucketSerializer(@Nullable JsonpSerializer<TBucket> value) {
+            this.tBucketSerializer = value;
+            return self();
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <TBucket, BuilderT extends AbstractBuilder<TBucket, BuilderT>> void setupMultiBucketAggregateBaseDeserializer(
+        ObjectDeserializer<BuilderT> op,
+        JsonpDeserializer<TBucket> tBucketDeserializer
+    ) {
+        AggregateBase.setupAggregateBaseDeserializer(op);
+        op.add(AbstractBuilder::buckets, Buckets.createBucketsDeserializer(tBucketDeserializer), "buckets");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiBucketBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiBucketBase.java
index 47a4edfdaf..8a2e401303 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiBucketBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiBucketBase.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.ExternallyTaggedUnion;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,128 +45,120 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.MultiBucketBase
 
 /**
  * Base type for multi-bucket aggregation results that can hold sub-aggregations
  * results.
- * 
+ *
  */
 
 public abstract class MultiBucketBase implements JsonpSerializable {
-	private final Map<String, Aggregate> aggregations;
-
-	private final long docCount;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected MultiBucketBase(AbstractBuilder<?> builder) {
-
-		this.aggregations = ApiTypeHelper.unmodifiable(builder.aggregations);
-
-		this.docCount = ApiTypeHelper.requireNonNull(builder.docCount, this, "docCount");
-
-	}
-
-	/**
-	 * Nested aggregations
-	 */
-	public final Map<String, Aggregate> aggregations() {
-		return this.aggregations;
-	}
-
-	/**
-	 * Required - API name: {@code doc_count}
-	 */
-	public final long docCount() {
-		return this.docCount;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		ExternallyTaggedUnion.serializeTypedKeysInner(this.aggregations, generator, mapper);
-
-		generator.writeKey("doc_count");
-		generator.write(this.docCount);
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		@Nullable
-		protected Map<String, Aggregate> aggregations = new HashMap<>();
-
-		/**
-		 * Nested aggregations
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aggregations</code>.
-		 */
-		public final BuilderT aggregations(Map<String, Aggregate> map) {
-			this.aggregations = _mapPutAll(this.aggregations, map);
-			return self();
-		}
-
-		/**
-		 * Nested aggregations
-		 * <p>
-		 * Adds an entry to <code>aggregations</code>.
-		 */
-		public final BuilderT aggregations(String key, Aggregate value) {
-			this.aggregations = _mapPut(this.aggregations, key, value);
-			return self();
-		}
-
-		/**
-		 * Nested aggregations
-		 * <p>
-		 * Adds an entry to <code>aggregations</code> using a builder lambda.
-		 */
-		public final BuilderT aggregations(String key, Function<Aggregate.Builder, ObjectBuilder<Aggregate>> fn) {
-			return aggregations(key, fn.apply(new Aggregate.Builder()).build());
-		}
-
-		private Long docCount;
-
-		/**
-		 * Required - API name: {@code doc_count}
-		 */
-		public final BuilderT docCount(long value) {
-			this.docCount = value;
-			return self();
-		}
-
-		protected abstract BuilderT self();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupMultiBucketBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-
-		op.add(AbstractBuilder::docCount, JsonpDeserializer.longDeserializer(), "doc_count");
-
-		op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
-			if (builder.aggregations == null) {
-				builder.aggregations = new HashMap<>();
-			}
-			Aggregate._TYPED_KEYS_DESERIALIZER.deserializeEntry(name, parser, mapper, builder.aggregations);
-		});
-
-	}
+    private final Map<String, Aggregate> aggregations;
+
+    private final long docCount;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected MultiBucketBase(AbstractBuilder<?> builder) {
+
+        this.aggregations = ApiTypeHelper.unmodifiable(builder.aggregations);
+
+        this.docCount = ApiTypeHelper.requireNonNull(builder.docCount, this, "docCount");
+
+    }
+
+    /**
+     * Nested aggregations
+     */
+    public final Map<String, Aggregate> aggregations() {
+        return this.aggregations;
+    }
+
+    /**
+     * Required - API name: {@code doc_count}
+     */
+    public final long docCount() {
+        return this.docCount;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        ExternallyTaggedUnion.serializeTypedKeysInner(this.aggregations, generator, mapper);
+
+        generator.writeKey("doc_count");
+        generator.write(this.docCount);
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        @Nullable
+        protected Map<String, Aggregate> aggregations = new HashMap<>();
+
+        /**
+         * Nested aggregations
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aggregations</code>.
+         */
+        public final BuilderT aggregations(Map<String, Aggregate> map) {
+            this.aggregations = _mapPutAll(this.aggregations, map);
+            return self();
+        }
+
+        /**
+         * Nested aggregations
+         * <p>
+         * Adds an entry to <code>aggregations</code>.
+         */
+        public final BuilderT aggregations(String key, Aggregate value) {
+            this.aggregations = _mapPut(this.aggregations, key, value);
+            return self();
+        }
+
+        /**
+         * Nested aggregations
+         * <p>
+         * Adds an entry to <code>aggregations</code> using a builder lambda.
+         */
+        public final BuilderT aggregations(String key, Function<Aggregate.Builder, ObjectBuilder<Aggregate>> fn) {
+            return aggregations(key, fn.apply(new Aggregate.Builder()).build());
+        }
+
+        private Long docCount;
+
+        /**
+         * Required - API name: {@code doc_count}
+         */
+        public final BuilderT docCount(long value) {
+            this.docCount = value;
+            return self();
+        }
+
+        protected abstract BuilderT self();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupMultiBucketBaseDeserializer(ObjectDeserializer<BuilderT> op) {
+
+        op.add(AbstractBuilder::docCount, JsonpDeserializer.longDeserializer(), "doc_count");
+
+        op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
+            if (builder.aggregations == null) {
+                builder.aggregations = new HashMap<>();
+            }
+            Aggregate._TYPED_KEYS_DESERIALIZER.deserializeEntry(name, parser, mapper, builder.aggregations);
+        });
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiTermLookup.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiTermLookup.java
index 68e5aeb41f..524b2fb7ff 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiTermLookup.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiTermLookup.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,92 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.MultiTermLookup
 
 @JsonpDeserializable
 public class MultiTermLookup implements JsonpSerializable {
-	private final String field;
+    private final String field;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private MultiTermLookup(Builder builder) {
+    private MultiTermLookup(Builder builder) {
 
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
 
-	}
+    }
 
-	public static MultiTermLookup of(Function<Builder, ObjectBuilder<MultiTermLookup>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static MultiTermLookup of(Function<Builder, ObjectBuilder<MultiTermLookup>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("field");
-		generator.write(this.field);
+        generator.writeKey("field");
+        generator.write(this.field);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link MultiTermLookup}.
-	 */
+    /**
+     * Builder for {@link MultiTermLookup}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MultiTermLookup> {
-		private String field;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MultiTermLookup> {
+        private String field;
 
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link MultiTermLookup}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MultiTermLookup build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link MultiTermLookup}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MultiTermLookup build() {
+            _checkSingleUse();
 
-			return new MultiTermLookup(this);
-		}
-	}
+            return new MultiTermLookup(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link MultiTermLookup}
-	 */
-	public static final JsonpDeserializer<MultiTermLookup> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			MultiTermLookup::setupMultiTermLookupDeserializer);
+    /**
+     * Json deserializer for {@link MultiTermLookup}
+     */
+    public static final JsonpDeserializer<MultiTermLookup> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MultiTermLookup::setupMultiTermLookupDeserializer
+    );
 
-	protected static void setupMultiTermLookupDeserializer(ObjectDeserializer<MultiTermLookup.Builder> op) {
+    protected static void setupMultiTermLookupDeserializer(ObjectDeserializer<MultiTermLookup.Builder> op) {
 
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiTermsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiTermsAggregate.java
index e3a5707b92..b25517df29 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiTermsAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiTermsAggregate.java
@@ -32,76 +32,77 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.MultiTermsAggregate
 
 @JsonpDeserializable
 public class MultiTermsAggregate extends TermsAggregateBase<MultiTermsBucket> implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private MultiTermsAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static MultiTermsAggregate of(Function<Builder, ObjectBuilder<MultiTermsAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.MultiTerms;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MultiTermsAggregate}.
-	 */
-
-	public static class Builder extends TermsAggregateBase.AbstractBuilder<MultiTermsBucket, Builder>
-			implements
-				ObjectBuilder<MultiTermsAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MultiTermsAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MultiTermsAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new MultiTermsAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MultiTermsAggregate}
-	 */
-	public static final JsonpDeserializer<MultiTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MultiTermsAggregate::setupMultiTermsAggregateDeserializer);
-
-	protected static void setupMultiTermsAggregateDeserializer(ObjectDeserializer<MultiTermsAggregate.Builder> op) {
-		setupTermsAggregateBaseDeserializer(op, MultiTermsBucket._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private MultiTermsAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static MultiTermsAggregate of(Function<Builder, ObjectBuilder<MultiTermsAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.MultiTerms;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MultiTermsAggregate}.
+     */
+
+    public static class Builder extends TermsAggregateBase.AbstractBuilder<MultiTermsBucket, Builder>
+        implements
+            ObjectBuilder<MultiTermsAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MultiTermsAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MultiTermsAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new MultiTermsAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MultiTermsAggregate}
+     */
+    public static final JsonpDeserializer<MultiTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MultiTermsAggregate::setupMultiTermsAggregateDeserializer
+    );
+
+    protected static void setupMultiTermsAggregateDeserializer(ObjectDeserializer<MultiTermsAggregate.Builder> op) {
+        setupTermsAggregateBaseDeserializer(op, MultiTermsBucket._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiTermsAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiTermsAggregation.java
index a4b58fe966..e8079b0272 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiTermsAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiTermsAggregation.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,159 +43,154 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.MultiTermsAggregation
 
 @JsonpDeserializable
 public class MultiTermsAggregation extends BucketAggregationBase implements AggregationVariant {
-	private final List<MultiTermLookup> terms;
-
-	@Nullable
-	private final Integer size;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MultiTermsAggregation(Builder builder) {
-		super(builder);
-
-		this.terms = ApiTypeHelper.unmodifiableRequired(builder.terms, this, "terms");
-		this.size = builder.size;
-	}
-
-	public static MultiTermsAggregation of(Function<Builder, ObjectBuilder<MultiTermsAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.MultiTerms;
-	}
-
-	/**
-	 * Required - API name: {@code terms}
-	 */
-	public final List<MultiTermLookup> terms() {
-		return this.terms;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		if (ApiTypeHelper.isDefined(this.terms)) {
-			generator.writeKey("terms");
-			generator.writeStartArray();
-			for (MultiTermLookup item0 : this.terms) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MultiTermsAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MultiTermsAggregation> {
-		private List<MultiTermLookup> terms;
-
-		@Nullable
-		private Integer size;
-
-		/**
-		 * Required - API name: {@code terms}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>terms</code>.
-		 */
-		public final Builder terms(List<MultiTermLookup> list) {
-			this.terms = _listAddAll(this.terms, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code terms}
-		 * <p>
-		 * Adds one or more values to <code>terms</code>.
-		 */
-		public final Builder terms(MultiTermLookup value, MultiTermLookup... values) {
-			this.terms = _listAdd(this.terms, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code terms}
-		 * <p>
-		 * Adds a value to <code>terms</code> using a builder lambda.
-		 */
-		public final Builder terms(Function<MultiTermLookup.Builder, ObjectBuilder<MultiTermLookup>> fn) {
-			return terms(fn.apply(new MultiTermLookup.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Integer value) {
-			this.size = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MultiTermsAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MultiTermsAggregation build() {
-			_checkSingleUse();
-
-			return new MultiTermsAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MultiTermsAggregation}
-	 */
-	public static final JsonpDeserializer<MultiTermsAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MultiTermsAggregation::setupMultiTermsAggregationDeserializer);
-
-	protected static void setupMultiTermsAggregationDeserializer(ObjectDeserializer<MultiTermsAggregation.Builder> op) {
-		BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
-		op.add(Builder::terms, JsonpDeserializer.arrayDeserializer(MultiTermLookup._DESERIALIZER), "terms");
-	}
+    private final List<MultiTermLookup> terms;
+
+    @Nullable
+    private final Integer size;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MultiTermsAggregation(Builder builder) {
+        super(builder);
+
+        this.terms = ApiTypeHelper.unmodifiableRequired(builder.terms, this, "terms");
+        this.size = builder.size;
+    }
+
+    public static MultiTermsAggregation of(Function<Builder, ObjectBuilder<MultiTermsAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.MultiTerms;
+    }
+
+    /**
+     * Required - API name: {@code terms}
+     */
+    public final List<MultiTermLookup> terms() {
+        return this.terms;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        if (ApiTypeHelper.isDefined(this.terms)) {
+            generator.writeKey("terms");
+            generator.writeStartArray();
+            for (MultiTermLookup item0 : this.terms) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MultiTermsAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<MultiTermsAggregation> {
+        private List<MultiTermLookup> terms;
+
+        @Nullable
+        private Integer size;
+
+        /**
+         * Required - API name: {@code terms}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>terms</code>.
+         */
+        public final Builder terms(List<MultiTermLookup> list) {
+            this.terms = _listAddAll(this.terms, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code terms}
+         * <p>
+         * Adds one or more values to <code>terms</code>.
+         */
+        public final Builder terms(MultiTermLookup value, MultiTermLookup... values) {
+            this.terms = _listAdd(this.terms, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code terms}
+         * <p>
+         * Adds a value to <code>terms</code> using a builder lambda.
+         */
+        public final Builder terms(Function<MultiTermLookup.Builder, ObjectBuilder<MultiTermLookup>> fn) {
+            return terms(fn.apply(new MultiTermLookup.Builder()).build());
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Integer value) {
+            this.size = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MultiTermsAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MultiTermsAggregation build() {
+            _checkSingleUse();
+
+            return new MultiTermsAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MultiTermsAggregation}
+     */
+    public static final JsonpDeserializer<MultiTermsAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MultiTermsAggregation::setupMultiTermsAggregationDeserializer
+    );
+
+    protected static void setupMultiTermsAggregationDeserializer(ObjectDeserializer<MultiTermsAggregation.Builder> op) {
+        BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
+        op.add(Builder::terms, JsonpDeserializer.arrayDeserializer(MultiTermLookup._DESERIALIZER), "terms");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiTermsBucket.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiTermsBucket.java
index bcf57486fa..056f27a73e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiTermsBucket.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiTermsBucket.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,172 +43,168 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.MultiTermsBucket
 
 @JsonpDeserializable
 public class MultiTermsBucket extends MultiBucketBase {
-	private final List<String> key;
-
-	@Nullable
-	private final String keyAsString;
-
-	@Nullable
-	private final Long docCountErrorUpperBound;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MultiTermsBucket(Builder builder) {
-		super(builder);
-
-		this.key = ApiTypeHelper.unmodifiableRequired(builder.key, this, "key");
-		this.keyAsString = builder.keyAsString;
-		this.docCountErrorUpperBound = builder.docCountErrorUpperBound;
-
-	}
-
-	public static MultiTermsBucket of(Function<Builder, ObjectBuilder<MultiTermsBucket>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code key}
-	 */
-	public final List<String> key() {
-		return this.key;
-	}
-
-	/**
-	 * API name: {@code key_as_string}
-	 */
-	@Nullable
-	public final String keyAsString() {
-		return this.keyAsString;
-	}
-
-	/**
-	 * API name: {@code doc_count_error_upper_bound}
-	 */
-	@Nullable
-	public final Long docCountErrorUpperBound() {
-		return this.docCountErrorUpperBound;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.key)) {
-			generator.writeKey("key");
-			generator.writeStartArray();
-			for (String item0 : this.key) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.keyAsString != null) {
-			generator.writeKey("key_as_string");
-			generator.write(this.keyAsString);
-
-		}
-		if (this.docCountErrorUpperBound != null) {
-			generator.writeKey("doc_count_error_upper_bound");
-			generator.write(this.docCountErrorUpperBound);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MultiTermsBucket}.
-	 */
-
-	public static class Builder extends MultiBucketBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MultiTermsBucket> {
-		private List<String> key;
-
-		@Nullable
-		private String keyAsString;
-
-		@Nullable
-		private Long docCountErrorUpperBound;
-
-		/**
-		 * Required - API name: {@code key}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>key</code>.
-		 */
-		public final Builder key(List<String> list) {
-			this.key = _listAddAll(this.key, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code key}
-		 * <p>
-		 * Adds one or more values to <code>key</code>.
-		 */
-		public final Builder key(String value, String... values) {
-			this.key = _listAdd(this.key, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code key_as_string}
-		 */
-		public final Builder keyAsString(@Nullable String value) {
-			this.keyAsString = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code doc_count_error_upper_bound}
-		 */
-		public final Builder docCountErrorUpperBound(@Nullable Long value) {
-			this.docCountErrorUpperBound = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MultiTermsBucket}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MultiTermsBucket build() {
-			_checkSingleUse();
-
-			return new MultiTermsBucket(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MultiTermsBucket}
-	 */
-	public static final JsonpDeserializer<MultiTermsBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			MultiTermsBucket::setupMultiTermsBucketDeserializer);
-
-	protected static void setupMultiTermsBucketDeserializer(ObjectDeserializer<MultiTermsBucket.Builder> op) {
-		setupMultiBucketBaseDeserializer(op);
-		op.add(Builder::key, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "key");
-		op.add(Builder::keyAsString, JsonpDeserializer.stringDeserializer(), "key_as_string");
-		op.add(Builder::docCountErrorUpperBound, JsonpDeserializer.longDeserializer(), "doc_count_error_upper_bound");
-
-	}
+    private final List<String> key;
+
+    @Nullable
+    private final String keyAsString;
+
+    @Nullable
+    private final Long docCountErrorUpperBound;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MultiTermsBucket(Builder builder) {
+        super(builder);
+
+        this.key = ApiTypeHelper.unmodifiableRequired(builder.key, this, "key");
+        this.keyAsString = builder.keyAsString;
+        this.docCountErrorUpperBound = builder.docCountErrorUpperBound;
+
+    }
+
+    public static MultiTermsBucket of(Function<Builder, ObjectBuilder<MultiTermsBucket>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code key}
+     */
+    public final List<String> key() {
+        return this.key;
+    }
+
+    /**
+     * API name: {@code key_as_string}
+     */
+    @Nullable
+    public final String keyAsString() {
+        return this.keyAsString;
+    }
+
+    /**
+     * API name: {@code doc_count_error_upper_bound}
+     */
+    @Nullable
+    public final Long docCountErrorUpperBound() {
+        return this.docCountErrorUpperBound;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.key)) {
+            generator.writeKey("key");
+            generator.writeStartArray();
+            for (String item0 : this.key) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.keyAsString != null) {
+            generator.writeKey("key_as_string");
+            generator.write(this.keyAsString);
+
+        }
+        if (this.docCountErrorUpperBound != null) {
+            generator.writeKey("doc_count_error_upper_bound");
+            generator.write(this.docCountErrorUpperBound);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MultiTermsBucket}.
+     */
+
+    public static class Builder extends MultiBucketBase.AbstractBuilder<Builder> implements ObjectBuilder<MultiTermsBucket> {
+        private List<String> key;
+
+        @Nullable
+        private String keyAsString;
+
+        @Nullable
+        private Long docCountErrorUpperBound;
+
+        /**
+         * Required - API name: {@code key}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>key</code>.
+         */
+        public final Builder key(List<String> list) {
+            this.key = _listAddAll(this.key, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code key}
+         * <p>
+         * Adds one or more values to <code>key</code>.
+         */
+        public final Builder key(String value, String... values) {
+            this.key = _listAdd(this.key, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code key_as_string}
+         */
+        public final Builder keyAsString(@Nullable String value) {
+            this.keyAsString = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code doc_count_error_upper_bound}
+         */
+        public final Builder docCountErrorUpperBound(@Nullable Long value) {
+            this.docCountErrorUpperBound = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MultiTermsBucket}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MultiTermsBucket build() {
+            _checkSingleUse();
+
+            return new MultiTermsBucket(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MultiTermsBucket}
+     */
+    public static final JsonpDeserializer<MultiTermsBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MultiTermsBucket::setupMultiTermsBucketDeserializer
+    );
+
+    protected static void setupMultiTermsBucketDeserializer(ObjectDeserializer<MultiTermsBucket.Builder> op) {
+        setupMultiBucketBaseDeserializer(op);
+        op.add(Builder::key, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "key");
+        op.add(Builder::keyAsString, JsonpDeserializer.stringDeserializer(), "key_as_string");
+        op.add(Builder::docCountErrorUpperBound, JsonpDeserializer.longDeserializer(), "doc_count_error_upper_bound");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MutualInformationHeuristic.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MutualInformationHeuristic.java
index 0c76c76c89..2878ac7c06 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MutualInformationHeuristic.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MutualInformationHeuristic.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,129 +43,127 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.MutualInformationHeuristic
 
 @JsonpDeserializable
 public class MutualInformationHeuristic implements JsonpSerializable {
-	@Nullable
-	private final Boolean backgroundIsSuperset;
-
-	@Nullable
-	private final Boolean includeNegatives;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MutualInformationHeuristic(Builder builder) {
-
-		this.backgroundIsSuperset = builder.backgroundIsSuperset;
-		this.includeNegatives = builder.includeNegatives;
-
-	}
-
-	public static MutualInformationHeuristic of(Function<Builder, ObjectBuilder<MutualInformationHeuristic>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code background_is_superset}
-	 */
-	@Nullable
-	public final Boolean backgroundIsSuperset() {
-		return this.backgroundIsSuperset;
-	}
-
-	/**
-	 * API name: {@code include_negatives}
-	 */
-	@Nullable
-	public final Boolean includeNegatives() {
-		return this.includeNegatives;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.backgroundIsSuperset != null) {
-			generator.writeKey("background_is_superset");
-			generator.write(this.backgroundIsSuperset);
-
-		}
-		if (this.includeNegatives != null) {
-			generator.writeKey("include_negatives");
-			generator.write(this.includeNegatives);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MutualInformationHeuristic}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MutualInformationHeuristic> {
-		@Nullable
-		private Boolean backgroundIsSuperset;
-
-		@Nullable
-		private Boolean includeNegatives;
-
-		/**
-		 * API name: {@code background_is_superset}
-		 */
-		public final Builder backgroundIsSuperset(@Nullable Boolean value) {
-			this.backgroundIsSuperset = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code include_negatives}
-		 */
-		public final Builder includeNegatives(@Nullable Boolean value) {
-			this.includeNegatives = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MutualInformationHeuristic}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MutualInformationHeuristic build() {
-			_checkSingleUse();
-
-			return new MutualInformationHeuristic(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MutualInformationHeuristic}
-	 */
-	public static final JsonpDeserializer<MutualInformationHeuristic> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MutualInformationHeuristic::setupMutualInformationHeuristicDeserializer);
-
-	protected static void setupMutualInformationHeuristicDeserializer(
-			ObjectDeserializer<MutualInformationHeuristic.Builder> op) {
-
-		op.add(Builder::backgroundIsSuperset, JsonpDeserializer.booleanDeserializer(), "background_is_superset");
-		op.add(Builder::includeNegatives, JsonpDeserializer.booleanDeserializer(), "include_negatives");
-
-	}
+    @Nullable
+    private final Boolean backgroundIsSuperset;
+
+    @Nullable
+    private final Boolean includeNegatives;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MutualInformationHeuristic(Builder builder) {
+
+        this.backgroundIsSuperset = builder.backgroundIsSuperset;
+        this.includeNegatives = builder.includeNegatives;
+
+    }
+
+    public static MutualInformationHeuristic of(Function<Builder, ObjectBuilder<MutualInformationHeuristic>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code background_is_superset}
+     */
+    @Nullable
+    public final Boolean backgroundIsSuperset() {
+        return this.backgroundIsSuperset;
+    }
+
+    /**
+     * API name: {@code include_negatives}
+     */
+    @Nullable
+    public final Boolean includeNegatives() {
+        return this.includeNegatives;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.backgroundIsSuperset != null) {
+            generator.writeKey("background_is_superset");
+            generator.write(this.backgroundIsSuperset);
+
+        }
+        if (this.includeNegatives != null) {
+            generator.writeKey("include_negatives");
+            generator.write(this.includeNegatives);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MutualInformationHeuristic}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MutualInformationHeuristic> {
+        @Nullable
+        private Boolean backgroundIsSuperset;
+
+        @Nullable
+        private Boolean includeNegatives;
+
+        /**
+         * API name: {@code background_is_superset}
+         */
+        public final Builder backgroundIsSuperset(@Nullable Boolean value) {
+            this.backgroundIsSuperset = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code include_negatives}
+         */
+        public final Builder includeNegatives(@Nullable Boolean value) {
+            this.includeNegatives = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link MutualInformationHeuristic}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MutualInformationHeuristic build() {
+            _checkSingleUse();
+
+            return new MutualInformationHeuristic(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MutualInformationHeuristic}
+     */
+    public static final JsonpDeserializer<MutualInformationHeuristic> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MutualInformationHeuristic::setupMutualInformationHeuristicDeserializer
+    );
+
+    protected static void setupMutualInformationHeuristicDeserializer(ObjectDeserializer<MutualInformationHeuristic.Builder> op) {
+
+        op.add(Builder::backgroundIsSuperset, JsonpDeserializer.booleanDeserializer(), "background_is_superset");
+        op.add(Builder::includeNegatives, JsonpDeserializer.booleanDeserializer(), "include_negatives");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/NestedAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/NestedAggregate.java
index 4e5e6909cd..4d23ebab74 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/NestedAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/NestedAggregate.java
@@ -32,75 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.NestedAggregate
 
 @JsonpDeserializable
 public class NestedAggregate extends SingleBucketAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private NestedAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static NestedAggregate of(Function<Builder, ObjectBuilder<NestedAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Nested;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NestedAggregate}.
-	 */
-
-	public static class Builder extends SingleBucketAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<NestedAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NestedAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NestedAggregate build() {
-			_checkSingleUse();
-
-			return new NestedAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NestedAggregate}
-	 */
-	public static final JsonpDeserializer<NestedAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NestedAggregate::setupNestedAggregateDeserializer);
-
-	protected static void setupNestedAggregateDeserializer(ObjectDeserializer<NestedAggregate.Builder> op) {
-		setupSingleBucketAggregateBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private NestedAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static NestedAggregate of(Function<Builder, ObjectBuilder<NestedAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Nested;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NestedAggregate}.
+     */
+
+    public static class Builder extends SingleBucketAggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<NestedAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link NestedAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NestedAggregate build() {
+            _checkSingleUse();
+
+            return new NestedAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NestedAggregate}
+     */
+    public static final JsonpDeserializer<NestedAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NestedAggregate::setupNestedAggregateDeserializer
+    );
+
+    protected static void setupNestedAggregateDeserializer(ObjectDeserializer<NestedAggregate.Builder> op) {
+        setupSingleBucketAggregateBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/NestedAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/NestedAggregation.java
index 4425003716..c72cd9cd2f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/NestedAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/NestedAggregation.java
@@ -32,113 +32,113 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.NestedAggregation
 
 @JsonpDeserializable
 public class NestedAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final String path;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NestedAggregation(Builder builder) {
-		super(builder);
-
-		this.path = builder.path;
-
-	}
-
-	public static NestedAggregation of(Function<Builder, ObjectBuilder<NestedAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Nested;
-	}
-
-	/**
-	 * API name: {@code path}
-	 */
-	@Nullable
-	public final String path() {
-		return this.path;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.path != null) {
-			generator.writeKey("path");
-			generator.write(this.path);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NestedAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<NestedAggregation> {
-		@Nullable
-		private String path;
-
-		/**
-		 * API name: {@code path}
-		 */
-		public final Builder path(@Nullable String value) {
-			this.path = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NestedAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NestedAggregation build() {
-			_checkSingleUse();
-
-			return new NestedAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NestedAggregation}
-	 */
-	public static final JsonpDeserializer<NestedAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NestedAggregation::setupNestedAggregationDeserializer);
-
-	protected static void setupNestedAggregationDeserializer(ObjectDeserializer<NestedAggregation.Builder> op) {
-		setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
-
-	}
+    @Nullable
+    private final String path;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NestedAggregation(Builder builder) {
+        super(builder);
+
+        this.path = builder.path;
+
+    }
+
+    public static NestedAggregation of(Function<Builder, ObjectBuilder<NestedAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Nested;
+    }
+
+    /**
+     * API name: {@code path}
+     */
+    @Nullable
+    public final String path() {
+        return this.path;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.path != null) {
+            generator.writeKey("path");
+            generator.write(this.path);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NestedAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<NestedAggregation> {
+        @Nullable
+        private String path;
+
+        /**
+         * API name: {@code path}
+         */
+        public final Builder path(@Nullable String value) {
+            this.path = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link NestedAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NestedAggregation build() {
+            _checkSingleUse();
+
+            return new NestedAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NestedAggregation}
+     */
+    public static final JsonpDeserializer<NestedAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NestedAggregation::setupNestedAggregationDeserializer
+    );
+
+    protected static void setupNestedAggregationDeserializer(ObjectDeserializer<NestedAggregation.Builder> op) {
+        setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/NormalizeAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/NormalizeAggregation.java
index 61069fd53a..1fa646c8dd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/NormalizeAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/NormalizeAggregation.java
@@ -32,113 +32,112 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.NormalizeAggregation
 
 @JsonpDeserializable
 public class NormalizeAggregation extends PipelineAggregationBase implements AggregationVariant {
-	@Nullable
-	private final NormalizeMethod method;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NormalizeAggregation(Builder builder) {
-		super(builder);
-
-		this.method = builder.method;
-
-	}
-
-	public static NormalizeAggregation of(Function<Builder, ObjectBuilder<NormalizeAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Normalize;
-	}
-
-	/**
-	 * API name: {@code method}
-	 */
-	@Nullable
-	public final NormalizeMethod method() {
-		return this.method;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.method != null) {
-			generator.writeKey("method");
-			this.method.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NormalizeAggregation}.
-	 */
-
-	public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<NormalizeAggregation> {
-		@Nullable
-		private NormalizeMethod method;
-
-		/**
-		 * API name: {@code method}
-		 */
-		public final Builder method(@Nullable NormalizeMethod value) {
-			this.method = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NormalizeAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NormalizeAggregation build() {
-			_checkSingleUse();
-
-			return new NormalizeAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NormalizeAggregation}
-	 */
-	public static final JsonpDeserializer<NormalizeAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NormalizeAggregation::setupNormalizeAggregationDeserializer);
-
-	protected static void setupNormalizeAggregationDeserializer(ObjectDeserializer<NormalizeAggregation.Builder> op) {
-		PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
-		op.add(Builder::method, NormalizeMethod._DESERIALIZER, "method");
-
-	}
+    @Nullable
+    private final NormalizeMethod method;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NormalizeAggregation(Builder builder) {
+        super(builder);
+
+        this.method = builder.method;
+
+    }
+
+    public static NormalizeAggregation of(Function<Builder, ObjectBuilder<NormalizeAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Normalize;
+    }
+
+    /**
+     * API name: {@code method}
+     */
+    @Nullable
+    public final NormalizeMethod method() {
+        return this.method;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.method != null) {
+            generator.writeKey("method");
+            this.method.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NormalizeAggregation}.
+     */
+
+    public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<NormalizeAggregation> {
+        @Nullable
+        private NormalizeMethod method;
+
+        /**
+         * API name: {@code method}
+         */
+        public final Builder method(@Nullable NormalizeMethod value) {
+            this.method = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link NormalizeAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NormalizeAggregation build() {
+            _checkSingleUse();
+
+            return new NormalizeAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NormalizeAggregation}
+     */
+    public static final JsonpDeserializer<NormalizeAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NormalizeAggregation::setupNormalizeAggregationDeserializer
+    );
+
+    protected static void setupNormalizeAggregationDeserializer(ObjectDeserializer<NormalizeAggregation.Builder> op) {
+        PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
+        op.add(Builder::method, NormalizeMethod._DESERIALIZER, "method");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/NormalizeMethod.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/NormalizeMethod.java
index d6d58d8eff..f417015d9d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/NormalizeMethod.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/NormalizeMethod.java
@@ -37,30 +37,29 @@
 
 @JsonpDeserializable
 public enum NormalizeMethod implements JsonEnum {
-	Rescale_0_1("rescale_0_1"),
+    Rescale_0_1("rescale_0_1"),
 
-	Rescale_0_100("rescale_0_100"),
+    Rescale_0_100("rescale_0_100"),
 
-	PercentOfSum("percent_of_sum"),
+    PercentOfSum("percent_of_sum"),
 
-	Mean("mean"),
+    Mean("mean"),
 
-	ZScore("z-score"),
+    ZScore("z-score"),
 
-	Softmax("softmax"),
+    Softmax("softmax"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	NormalizeMethod(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    NormalizeMethod(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<NormalizeMethod> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			NormalizeMethod.values());
+    public static final JsonEnum.Deserializer<NormalizeMethod> _DESERIALIZER = new JsonEnum.Deserializer<>(NormalizeMethod.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ParentAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ParentAggregation.java
index b45dc549b2..317804fcd9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ParentAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ParentAggregation.java
@@ -32,113 +32,113 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.ParentAggregation
 
 @JsonpDeserializable
 public class ParentAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final String type;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ParentAggregation(Builder builder) {
-		super(builder);
-
-		this.type = builder.type;
-
-	}
-
-	public static ParentAggregation of(Function<Builder, ObjectBuilder<ParentAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Parent;
-	}
-
-	/**
-	 * API name: {@code type}
-	 */
-	@Nullable
-	public final String type() {
-		return this.type;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.type != null) {
-			generator.writeKey("type");
-			generator.write(this.type);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ParentAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ParentAggregation> {
-		@Nullable
-		private String type;
-
-		/**
-		 * API name: {@code type}
-		 */
-		public final Builder type(@Nullable String value) {
-			this.type = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ParentAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ParentAggregation build() {
-			_checkSingleUse();
-
-			return new ParentAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ParentAggregation}
-	 */
-	public static final JsonpDeserializer<ParentAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ParentAggregation::setupParentAggregationDeserializer);
-
-	protected static void setupParentAggregationDeserializer(ObjectDeserializer<ParentAggregation.Builder> op) {
-		setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-
-	}
+    @Nullable
+    private final String type;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ParentAggregation(Builder builder) {
+        super(builder);
+
+        this.type = builder.type;
+
+    }
+
+    public static ParentAggregation of(Function<Builder, ObjectBuilder<ParentAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Parent;
+    }
+
+    /**
+     * API name: {@code type}
+     */
+    @Nullable
+    public final String type() {
+        return this.type;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.type != null) {
+            generator.writeKey("type");
+            generator.write(this.type);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ParentAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<ParentAggregation> {
+        @Nullable
+        private String type;
+
+        /**
+         * API name: {@code type}
+         */
+        public final Builder type(@Nullable String value) {
+            this.type = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ParentAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ParentAggregation build() {
+            _checkSingleUse();
+
+            return new ParentAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ParentAggregation}
+     */
+    public static final JsonpDeserializer<ParentAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ParentAggregation::setupParentAggregationDeserializer
+    );
+
+    protected static void setupParentAggregationDeserializer(ObjectDeserializer<ParentAggregation.Builder> op) {
+        setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentageScoreHeuristic.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentageScoreHeuristic.java
index 267ddb6658..e76099f0ba 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentageScoreHeuristic.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentageScoreHeuristic.java
@@ -32,37 +32,38 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
 
 @JsonpDeserializable
 public class PercentageScoreHeuristic implements JsonpSerializable {
 
-	public static final class Builder implements ObjectBuilder<PercentageScoreHeuristic> {
-		@Override
-		public PercentageScoreHeuristic build() {
-			return PercentageScoreHeuristic._INSTANCE;
-		}
-	}
+    public static final class Builder implements ObjectBuilder<PercentageScoreHeuristic> {
+        @Override
+        public PercentageScoreHeuristic build() {
+            return PercentageScoreHeuristic._INSTANCE;
+        }
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        generator.writeEnd();
+    }
 
-	/**
-	 * Singleton instance for empty class {@link PercentageScoreHeuristic}.
-	 */
-	public static final PercentageScoreHeuristic _INSTANCE = new PercentageScoreHeuristic();
+    /**
+     * Singleton instance for empty class {@link PercentageScoreHeuristic}.
+     */
+    public static final PercentageScoreHeuristic _INSTANCE = new PercentageScoreHeuristic();
 
-	public static final JsonpDeserializer<PercentageScoreHeuristic> _DESERIALIZER = JsonpDeserializer
-			.emptyObject(PercentageScoreHeuristic._INSTANCE);
+    public static final JsonpDeserializer<PercentageScoreHeuristic> _DESERIALIZER = JsonpDeserializer.emptyObject(
+        PercentageScoreHeuristic._INSTANCE
+    );
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentileRanksAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentileRanksAggregation.java
index 9b0694c95e..672411e95d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentileRanksAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentileRanksAggregation.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,225 +43,222 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.PercentileRanksAggregation
 
 @JsonpDeserializable
 public class PercentileRanksAggregation extends FormatMetricAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Boolean keyed;
-
-	private final List<Double> values;
-
-	@Nullable
-	private final HdrMethod hdr;
-
-	@Nullable
-	private final TDigest tdigest;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PercentileRanksAggregation(Builder builder) {
-		super(builder);
-
-		this.keyed = builder.keyed;
-		this.values = ApiTypeHelper.unmodifiable(builder.values);
-		this.hdr = builder.hdr;
-		this.tdigest = builder.tdigest;
-
-	}
-
-	public static PercentileRanksAggregation of(Function<Builder, ObjectBuilder<PercentileRanksAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.PercentileRanks;
-	}
-
-	/**
-	 * API name: {@code keyed}
-	 */
-	@Nullable
-	public final Boolean keyed() {
-		return this.keyed;
-	}
-
-	/**
-	 * API name: {@code values}
-	 */
-	public final List<Double> values() {
-		return this.values;
-	}
-
-	/**
-	 * API name: {@code hdr}
-	 */
-	@Nullable
-	public final HdrMethod hdr() {
-		return this.hdr;
-	}
-
-	/**
-	 * API name: {@code tdigest}
-	 */
-	@Nullable
-	public final TDigest tdigest() {
-		return this.tdigest;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.keyed != null) {
-			generator.writeKey("keyed");
-			generator.write(this.keyed);
-
-		}
-		if (ApiTypeHelper.isDefined(this.values)) {
-			generator.writeKey("values");
-			generator.writeStartArray();
-			for (Double item0 : this.values) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.hdr != null) {
-			generator.writeKey("hdr");
-			this.hdr.serialize(generator, mapper);
-
-		}
-		if (this.tdigest != null) {
-			generator.writeKey("tdigest");
-			this.tdigest.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PercentileRanksAggregation}.
-	 */
-
-	public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PercentileRanksAggregation> {
-		@Nullable
-		private Boolean keyed;
-
-		@Nullable
-		private List<Double> values;
-
-		@Nullable
-		private HdrMethod hdr;
-
-		@Nullable
-		private TDigest tdigest;
-
-		/**
-		 * API name: {@code keyed}
-		 */
-		public final Builder keyed(@Nullable Boolean value) {
-			this.keyed = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code values}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>values</code>.
-		 */
-		public final Builder values(List<Double> list) {
-			this.values = _listAddAll(this.values, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code values}
-		 * <p>
-		 * Adds one or more values to <code>values</code>.
-		 */
-		public final Builder values(Double value, Double... values) {
-			this.values = _listAdd(this.values, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code hdr}
-		 */
-		public final Builder hdr(@Nullable HdrMethod value) {
-			this.hdr = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code hdr}
-		 */
-		public final Builder hdr(Function<HdrMethod.Builder, ObjectBuilder<HdrMethod>> fn) {
-			return this.hdr(fn.apply(new HdrMethod.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code tdigest}
-		 */
-		public final Builder tdigest(@Nullable TDigest value) {
-			this.tdigest = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code tdigest}
-		 */
-		public final Builder tdigest(Function<TDigest.Builder, ObjectBuilder<TDigest>> fn) {
-			return this.tdigest(fn.apply(new TDigest.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PercentileRanksAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PercentileRanksAggregation build() {
-			_checkSingleUse();
-
-			return new PercentileRanksAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PercentileRanksAggregation}
-	 */
-	public static final JsonpDeserializer<PercentileRanksAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PercentileRanksAggregation::setupPercentileRanksAggregationDeserializer);
-
-	protected static void setupPercentileRanksAggregationDeserializer(
-			ObjectDeserializer<PercentileRanksAggregation.Builder> op) {
-		setupFormatMetricAggregationBaseDeserializer(op);
-		op.add(Builder::keyed, JsonpDeserializer.booleanDeserializer(), "keyed");
-		op.add(Builder::values, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.doubleDeserializer()), "values");
-		op.add(Builder::hdr, HdrMethod._DESERIALIZER, "hdr");
-		op.add(Builder::tdigest, TDigest._DESERIALIZER, "tdigest");
-
-	}
+    @Nullable
+    private final Boolean keyed;
+
+    private final List<Double> values;
+
+    @Nullable
+    private final HdrMethod hdr;
+
+    @Nullable
+    private final TDigest tdigest;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PercentileRanksAggregation(Builder builder) {
+        super(builder);
+
+        this.keyed = builder.keyed;
+        this.values = ApiTypeHelper.unmodifiable(builder.values);
+        this.hdr = builder.hdr;
+        this.tdigest = builder.tdigest;
+
+    }
+
+    public static PercentileRanksAggregation of(Function<Builder, ObjectBuilder<PercentileRanksAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.PercentileRanks;
+    }
+
+    /**
+     * API name: {@code keyed}
+     */
+    @Nullable
+    public final Boolean keyed() {
+        return this.keyed;
+    }
+
+    /**
+     * API name: {@code values}
+     */
+    public final List<Double> values() {
+        return this.values;
+    }
+
+    /**
+     * API name: {@code hdr}
+     */
+    @Nullable
+    public final HdrMethod hdr() {
+        return this.hdr;
+    }
+
+    /**
+     * API name: {@code tdigest}
+     */
+    @Nullable
+    public final TDigest tdigest() {
+        return this.tdigest;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.keyed != null) {
+            generator.writeKey("keyed");
+            generator.write(this.keyed);
+
+        }
+        if (ApiTypeHelper.isDefined(this.values)) {
+            generator.writeKey("values");
+            generator.writeStartArray();
+            for (Double item0 : this.values) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.hdr != null) {
+            generator.writeKey("hdr");
+            this.hdr.serialize(generator, mapper);
+
+        }
+        if (this.tdigest != null) {
+            generator.writeKey("tdigest");
+            this.tdigest.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PercentileRanksAggregation}.
+     */
+
+    public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<PercentileRanksAggregation> {
+        @Nullable
+        private Boolean keyed;
+
+        @Nullable
+        private List<Double> values;
+
+        @Nullable
+        private HdrMethod hdr;
+
+        @Nullable
+        private TDigest tdigest;
+
+        /**
+         * API name: {@code keyed}
+         */
+        public final Builder keyed(@Nullable Boolean value) {
+            this.keyed = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code values}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>values</code>.
+         */
+        public final Builder values(List<Double> list) {
+            this.values = _listAddAll(this.values, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code values}
+         * <p>
+         * Adds one or more values to <code>values</code>.
+         */
+        public final Builder values(Double value, Double... values) {
+            this.values = _listAdd(this.values, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code hdr}
+         */
+        public final Builder hdr(@Nullable HdrMethod value) {
+            this.hdr = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code hdr}
+         */
+        public final Builder hdr(Function<HdrMethod.Builder, ObjectBuilder<HdrMethod>> fn) {
+            return this.hdr(fn.apply(new HdrMethod.Builder()).build());
+        }
+
+        /**
+         * API name: {@code tdigest}
+         */
+        public final Builder tdigest(@Nullable TDigest value) {
+            this.tdigest = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code tdigest}
+         */
+        public final Builder tdigest(Function<TDigest.Builder, ObjectBuilder<TDigest>> fn) {
+            return this.tdigest(fn.apply(new TDigest.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PercentileRanksAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PercentileRanksAggregation build() {
+            _checkSingleUse();
+
+            return new PercentileRanksAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PercentileRanksAggregation}
+     */
+    public static final JsonpDeserializer<PercentileRanksAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PercentileRanksAggregation::setupPercentileRanksAggregationDeserializer
+    );
+
+    protected static void setupPercentileRanksAggregationDeserializer(ObjectDeserializer<PercentileRanksAggregation.Builder> op) {
+        setupFormatMetricAggregationBaseDeserializer(op);
+        op.add(Builder::keyed, JsonpDeserializer.booleanDeserializer(), "keyed");
+        op.add(Builder::values, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.doubleDeserializer()), "values");
+        op.add(Builder::hdr, HdrMethod._DESERIALIZER, "hdr");
+        op.add(Builder::tdigest, TDigest._DESERIALIZER, "tdigest");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/Percentiles.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/Percentiles.java
index f44b55972b..97d685a34f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/Percentiles.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/Percentiles.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,144 +46,140 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.Percentiles
 
 @JsonpDeserializable
 public class Percentiles implements TaggedUnion<Percentiles.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Array, Keyed
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private Percentiles(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	private Percentiles(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static Percentiles of(Function<Builder, ObjectBuilder<Percentiles>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code array}?
-	 */
-	public boolean isArray() {
-		return _kind == Kind.Array;
-	}
-
-	/**
-	 * Get the {@code array} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code array} kind.
-	 */
-	public List<ArrayPercentilesItem> array() {
-		return TaggedUnionUtils.get(this, Kind.Array);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code keyed}?
-	 */
-	public boolean isKeyed() {
-		return _kind == Kind.Keyed;
-	}
-
-	/**
-	 * Get the {@code keyed} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code keyed} kind.
-	 */
-	public Map<String, String> keyed() {
-		return TaggedUnionUtils.get(this, Kind.Keyed);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Array :
-					generator.writeStartArray();
-					for (ArrayPercentilesItem item0 : ((List<ArrayPercentilesItem>) this._value)) {
-						item0.serialize(generator, mapper);
-
-					}
-					generator.writeEnd();
-
-					break;
-				case Keyed :
-					generator.writeStartObject();
-					for (Map.Entry<String, String> item0 : ((Map<String, String>) this._value).entrySet()) {
-						generator.writeKey(item0.getKey());
-						generator.write(item0.getValue());
-
-					}
-					generator.writeEnd();
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Percentiles> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<Percentiles> array(List<ArrayPercentilesItem> v) {
-			this._kind = Kind.Array;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Percentiles> keyed(Map<String, String> v) {
-			this._kind = Kind.Keyed;
-			this._value = v;
-			return this;
-		}
-
-		public Percentiles build() {
-			_checkSingleUse();
-			return new Percentiles(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<Percentiles> buildPercentilesDeserializer() {
-		return new UnionDeserializer.Builder<Percentiles, Kind, Object>(Percentiles::new, false)
-				.addMember(Kind.Array, JsonpDeserializer.arrayDeserializer(ArrayPercentilesItem._DESERIALIZER))
-				.addMember(Kind.Keyed, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()))
-				.build();
-	}
-
-	public static final JsonpDeserializer<Percentiles> _DESERIALIZER = JsonpDeserializer
-			.lazy(Percentiles::buildPercentilesDeserializer);
+    public enum Kind {
+        Array,
+        Keyed
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private Percentiles(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private Percentiles(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static Percentiles of(Function<Builder, ObjectBuilder<Percentiles>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code array}?
+     */
+    public boolean isArray() {
+        return _kind == Kind.Array;
+    }
+
+    /**
+     * Get the {@code array} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code array} kind.
+     */
+    public List<ArrayPercentilesItem> array() {
+        return TaggedUnionUtils.get(this, Kind.Array);
+    }
+
+    /**
+     * Is this variant instance of kind {@code keyed}?
+     */
+    public boolean isKeyed() {
+        return _kind == Kind.Keyed;
+    }
+
+    /**
+     * Get the {@code keyed} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code keyed} kind.
+     */
+    public Map<String, String> keyed() {
+        return TaggedUnionUtils.get(this, Kind.Keyed);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Array:
+                    generator.writeStartArray();
+                    for (ArrayPercentilesItem item0 : ((List<ArrayPercentilesItem>) this._value)) {
+                        item0.serialize(generator, mapper);
+
+                    }
+                    generator.writeEnd();
+
+                    break;
+                case Keyed:
+                    generator.writeStartObject();
+                    for (Map.Entry<String, String> item0 : ((Map<String, String>) this._value).entrySet()) {
+                        generator.writeKey(item0.getKey());
+                        generator.write(item0.getValue());
+
+                    }
+                    generator.writeEnd();
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Percentiles> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<Percentiles> array(List<ArrayPercentilesItem> v) {
+            this._kind = Kind.Array;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Percentiles> keyed(Map<String, String> v) {
+            this._kind = Kind.Keyed;
+            this._value = v;
+            return this;
+        }
+
+        public Percentiles build() {
+            _checkSingleUse();
+            return new Percentiles(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<Percentiles> buildPercentilesDeserializer() {
+        return new UnionDeserializer.Builder<Percentiles, Kind, Object>(Percentiles::new, false).addMember(
+            Kind.Array,
+            JsonpDeserializer.arrayDeserializer(ArrayPercentilesItem._DESERIALIZER)
+        ).addMember(Kind.Keyed, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer())).build();
+    }
+
+    public static final JsonpDeserializer<Percentiles> _DESERIALIZER = JsonpDeserializer.lazy(Percentiles::buildPercentilesDeserializer);
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesAggregateBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesAggregateBase.java
index fa55947bc9..87546d1be4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesAggregateBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesAggregateBase.java
@@ -32,72 +32,70 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.aggregations.PercentilesAggregateBase
 
-
 public abstract class PercentilesAggregateBase extends AggregateBase {
-	private final Percentiles values;
+    private final Percentiles values;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected PercentilesAggregateBase(AbstractBuilder<?> builder) {
-		super(builder);
+    protected PercentilesAggregateBase(AbstractBuilder<?> builder) {
+        super(builder);
 
-		this.values = ApiTypeHelper.requireNonNull(builder.values, this, "values");
+        this.values = ApiTypeHelper.requireNonNull(builder.values, this, "values");
 
-	}
+    }
 
-	/**
-	 * Required - API name: {@code values}
-	 */
-	public final Percentiles values() {
-		return this.values;
-	}
+    /**
+     * Required - API name: {@code values}
+     */
+    public final Percentiles values() {
+        return this.values;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("values");
-		this.values.serialize(generator, mapper);
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("values");
+        this.values.serialize(generator, mapper);
 
-	}
+    }
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				AggregateBase.AbstractBuilder<BuilderT> {
-		private Percentiles values;
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregateBase.AbstractBuilder<
+        BuilderT> {
+        private Percentiles values;
 
-		/**
-		 * Required - API name: {@code values}
-		 */
-		public final BuilderT values(Percentiles value) {
-			this.values = value;
-			return self();
-		}
+        /**
+         * Required - API name: {@code values}
+         */
+        public final BuilderT values(Percentiles value) {
+            this.values = value;
+            return self();
+        }
 
-		/**
-		 * Required - API name: {@code values}
-		 */
-		public final BuilderT values(Function<Percentiles.Builder, ObjectBuilder<Percentiles>> fn) {
-			return this.values(fn.apply(new Percentiles.Builder()).build());
-		}
+        /**
+         * Required - API name: {@code values}
+         */
+        public final BuilderT values(Function<Percentiles.Builder, ObjectBuilder<Percentiles>> fn) {
+            return this.values(fn.apply(new Percentiles.Builder()).build());
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupPercentilesAggregateBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		AggregateBase.setupAggregateBaseDeserializer(op);
-		op.add(AbstractBuilder::values, Percentiles._DESERIALIZER, "values");
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupPercentilesAggregateBaseDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
+        AggregateBase.setupAggregateBaseDeserializer(op);
+        op.add(AbstractBuilder::values, Percentiles._DESERIALIZER, "values");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesAggregation.java
index 3856ff4cb3..3e8d053aac 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesAggregation.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,226 +43,222 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.PercentilesAggregation
 
 @JsonpDeserializable
 public class PercentilesAggregation extends FormatMetricAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Boolean keyed;
-
-	private final List<Double> percents;
-
-	@Nullable
-	private final HdrMethod hdr;
-
-	@Nullable
-	private final TDigest tdigest;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PercentilesAggregation(Builder builder) {
-		super(builder);
-
-		this.keyed = builder.keyed;
-		this.percents = ApiTypeHelper.unmodifiable(builder.percents);
-		this.hdr = builder.hdr;
-		this.tdigest = builder.tdigest;
-
-	}
-
-	public static PercentilesAggregation of(Function<Builder, ObjectBuilder<PercentilesAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Percentiles;
-	}
-
-	/**
-	 * API name: {@code keyed}
-	 */
-	@Nullable
-	public final Boolean keyed() {
-		return this.keyed;
-	}
-
-	/**
-	 * API name: {@code percents}
-	 */
-	public final List<Double> percents() {
-		return this.percents;
-	}
-
-	/**
-	 * API name: {@code hdr}
-	 */
-	@Nullable
-	public final HdrMethod hdr() {
-		return this.hdr;
-	}
-
-	/**
-	 * API name: {@code tdigest}
-	 */
-	@Nullable
-	public final TDigest tdigest() {
-		return this.tdigest;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.keyed != null) {
-			generator.writeKey("keyed");
-			generator.write(this.keyed);
-
-		}
-		if (ApiTypeHelper.isDefined(this.percents)) {
-			generator.writeKey("percents");
-			generator.writeStartArray();
-			for (Double item0 : this.percents) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.hdr != null) {
-			generator.writeKey("hdr");
-			this.hdr.serialize(generator, mapper);
-
-		}
-		if (this.tdigest != null) {
-			generator.writeKey("tdigest");
-			this.tdigest.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PercentilesAggregation}.
-	 */
-
-	public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PercentilesAggregation> {
-		@Nullable
-		private Boolean keyed;
-
-		@Nullable
-		private List<Double> percents;
-
-		@Nullable
-		private HdrMethod hdr;
-
-		@Nullable
-		private TDigest tdigest;
-
-		/**
-		 * API name: {@code keyed}
-		 */
-		public final Builder keyed(@Nullable Boolean value) {
-			this.keyed = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code percents}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>percents</code>.
-		 */
-		public final Builder percents(List<Double> list) {
-			this.percents = _listAddAll(this.percents, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code percents}
-		 * <p>
-		 * Adds one or more values to <code>percents</code>.
-		 */
-		public final Builder percents(Double value, Double... values) {
-			this.percents = _listAdd(this.percents, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code hdr}
-		 */
-		public final Builder hdr(@Nullable HdrMethod value) {
-			this.hdr = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code hdr}
-		 */
-		public final Builder hdr(Function<HdrMethod.Builder, ObjectBuilder<HdrMethod>> fn) {
-			return this.hdr(fn.apply(new HdrMethod.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code tdigest}
-		 */
-		public final Builder tdigest(@Nullable TDigest value) {
-			this.tdigest = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code tdigest}
-		 */
-		public final Builder tdigest(Function<TDigest.Builder, ObjectBuilder<TDigest>> fn) {
-			return this.tdigest(fn.apply(new TDigest.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PercentilesAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PercentilesAggregation build() {
-			_checkSingleUse();
-
-			return new PercentilesAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PercentilesAggregation}
-	 */
-	public static final JsonpDeserializer<PercentilesAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PercentilesAggregation::setupPercentilesAggregationDeserializer);
-
-	protected static void setupPercentilesAggregationDeserializer(
-			ObjectDeserializer<PercentilesAggregation.Builder> op) {
-		setupFormatMetricAggregationBaseDeserializer(op);
-		op.add(Builder::keyed, JsonpDeserializer.booleanDeserializer(), "keyed");
-		op.add(Builder::percents, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.doubleDeserializer()),
-				"percents");
-		op.add(Builder::hdr, HdrMethod._DESERIALIZER, "hdr");
-		op.add(Builder::tdigest, TDigest._DESERIALIZER, "tdigest");
-
-	}
+    @Nullable
+    private final Boolean keyed;
+
+    private final List<Double> percents;
+
+    @Nullable
+    private final HdrMethod hdr;
+
+    @Nullable
+    private final TDigest tdigest;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PercentilesAggregation(Builder builder) {
+        super(builder);
+
+        this.keyed = builder.keyed;
+        this.percents = ApiTypeHelper.unmodifiable(builder.percents);
+        this.hdr = builder.hdr;
+        this.tdigest = builder.tdigest;
+
+    }
+
+    public static PercentilesAggregation of(Function<Builder, ObjectBuilder<PercentilesAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Percentiles;
+    }
+
+    /**
+     * API name: {@code keyed}
+     */
+    @Nullable
+    public final Boolean keyed() {
+        return this.keyed;
+    }
+
+    /**
+     * API name: {@code percents}
+     */
+    public final List<Double> percents() {
+        return this.percents;
+    }
+
+    /**
+     * API name: {@code hdr}
+     */
+    @Nullable
+    public final HdrMethod hdr() {
+        return this.hdr;
+    }
+
+    /**
+     * API name: {@code tdigest}
+     */
+    @Nullable
+    public final TDigest tdigest() {
+        return this.tdigest;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.keyed != null) {
+            generator.writeKey("keyed");
+            generator.write(this.keyed);
+
+        }
+        if (ApiTypeHelper.isDefined(this.percents)) {
+            generator.writeKey("percents");
+            generator.writeStartArray();
+            for (Double item0 : this.percents) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.hdr != null) {
+            generator.writeKey("hdr");
+            this.hdr.serialize(generator, mapper);
+
+        }
+        if (this.tdigest != null) {
+            generator.writeKey("tdigest");
+            this.tdigest.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PercentilesAggregation}.
+     */
+
+    public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<PercentilesAggregation> {
+        @Nullable
+        private Boolean keyed;
+
+        @Nullable
+        private List<Double> percents;
+
+        @Nullable
+        private HdrMethod hdr;
+
+        @Nullable
+        private TDigest tdigest;
+
+        /**
+         * API name: {@code keyed}
+         */
+        public final Builder keyed(@Nullable Boolean value) {
+            this.keyed = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code percents}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>percents</code>.
+         */
+        public final Builder percents(List<Double> list) {
+            this.percents = _listAddAll(this.percents, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code percents}
+         * <p>
+         * Adds one or more values to <code>percents</code>.
+         */
+        public final Builder percents(Double value, Double... values) {
+            this.percents = _listAdd(this.percents, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code hdr}
+         */
+        public final Builder hdr(@Nullable HdrMethod value) {
+            this.hdr = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code hdr}
+         */
+        public final Builder hdr(Function<HdrMethod.Builder, ObjectBuilder<HdrMethod>> fn) {
+            return this.hdr(fn.apply(new HdrMethod.Builder()).build());
+        }
+
+        /**
+         * API name: {@code tdigest}
+         */
+        public final Builder tdigest(@Nullable TDigest value) {
+            this.tdigest = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code tdigest}
+         */
+        public final Builder tdigest(Function<TDigest.Builder, ObjectBuilder<TDigest>> fn) {
+            return this.tdigest(fn.apply(new TDigest.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PercentilesAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PercentilesAggregation build() {
+            _checkSingleUse();
+
+            return new PercentilesAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PercentilesAggregation}
+     */
+    public static final JsonpDeserializer<PercentilesAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PercentilesAggregation::setupPercentilesAggregationDeserializer
+    );
+
+    protected static void setupPercentilesAggregationDeserializer(ObjectDeserializer<PercentilesAggregation.Builder> op) {
+        setupFormatMetricAggregationBaseDeserializer(op);
+        op.add(Builder::keyed, JsonpDeserializer.booleanDeserializer(), "keyed");
+        op.add(Builder::percents, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.doubleDeserializer()), "percents");
+        op.add(Builder::hdr, HdrMethod._DESERIALIZER, "hdr");
+        op.add(Builder::tdigest, TDigest._DESERIALIZER, "tdigest");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesBucketAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesBucketAggregate.java
index 908de2f1c2..8aafead61a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesBucketAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesBucketAggregate.java
@@ -32,76 +32,76 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.PercentilesBucketAggregate
 
 @JsonpDeserializable
 public class PercentilesBucketAggregate extends PercentilesAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private PercentilesBucketAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static PercentilesBucketAggregate of(Function<Builder, ObjectBuilder<PercentilesBucketAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.PercentilesBucket;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PercentilesBucketAggregate}.
-	 */
-
-	public static class Builder extends PercentilesAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PercentilesBucketAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PercentilesBucketAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PercentilesBucketAggregate build() {
-			_checkSingleUse();
-
-			return new PercentilesBucketAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PercentilesBucketAggregate}
-	 */
-	public static final JsonpDeserializer<PercentilesBucketAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PercentilesBucketAggregate::setupPercentilesBucketAggregateDeserializer);
-
-	protected static void setupPercentilesBucketAggregateDeserializer(
-			ObjectDeserializer<PercentilesBucketAggregate.Builder> op) {
-		PercentilesAggregateBase.setupPercentilesAggregateBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private PercentilesBucketAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static PercentilesBucketAggregate of(Function<Builder, ObjectBuilder<PercentilesBucketAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.PercentilesBucket;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PercentilesBucketAggregate}.
+     */
+
+    public static class Builder extends PercentilesAggregateBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<PercentilesBucketAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PercentilesBucketAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PercentilesBucketAggregate build() {
+            _checkSingleUse();
+
+            return new PercentilesBucketAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PercentilesBucketAggregate}
+     */
+    public static final JsonpDeserializer<PercentilesBucketAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PercentilesBucketAggregate::setupPercentilesBucketAggregateDeserializer
+    );
+
+    protected static void setupPercentilesBucketAggregateDeserializer(ObjectDeserializer<PercentilesBucketAggregate.Builder> op) {
+        PercentilesAggregateBase.setupPercentilesAggregateBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesBucketAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesBucketAggregation.java
index ba899bdb41..1bcb629719 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesBucketAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesBucketAggregation.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,125 +43,121 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.PercentilesBucketAggregation
 
 @JsonpDeserializable
 public class PercentilesBucketAggregation extends PipelineAggregationBase implements AggregationVariant {
-	private final List<Double> percents;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PercentilesBucketAggregation(Builder builder) {
-		super(builder);
-
-		this.percents = ApiTypeHelper.unmodifiable(builder.percents);
-
-	}
-
-	public static PercentilesBucketAggregation of(Function<Builder, ObjectBuilder<PercentilesBucketAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.PercentilesBucket;
-	}
-
-	/**
-	 * API name: {@code percents}
-	 */
-	public final List<Double> percents() {
-		return this.percents;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.percents)) {
-			generator.writeKey("percents");
-			generator.writeStartArray();
-			for (Double item0 : this.percents) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PercentilesBucketAggregation}.
-	 */
-
-	public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PercentilesBucketAggregation> {
-		@Nullable
-		private List<Double> percents;
-
-		/**
-		 * API name: {@code percents}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>percents</code>.
-		 */
-		public final Builder percents(List<Double> list) {
-			this.percents = _listAddAll(this.percents, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code percents}
-		 * <p>
-		 * Adds one or more values to <code>percents</code>.
-		 */
-		public final Builder percents(Double value, Double... values) {
-			this.percents = _listAdd(this.percents, value, values);
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PercentilesBucketAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PercentilesBucketAggregation build() {
-			_checkSingleUse();
-
-			return new PercentilesBucketAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PercentilesBucketAggregation}
-	 */
-	public static final JsonpDeserializer<PercentilesBucketAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PercentilesBucketAggregation::setupPercentilesBucketAggregationDeserializer);
-
-	protected static void setupPercentilesBucketAggregationDeserializer(
-			ObjectDeserializer<PercentilesBucketAggregation.Builder> op) {
-		PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
-		op.add(Builder::percents, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.doubleDeserializer()),
-				"percents");
-
-	}
+    private final List<Double> percents;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PercentilesBucketAggregation(Builder builder) {
+        super(builder);
+
+        this.percents = ApiTypeHelper.unmodifiable(builder.percents);
+
+    }
+
+    public static PercentilesBucketAggregation of(Function<Builder, ObjectBuilder<PercentilesBucketAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.PercentilesBucket;
+    }
+
+    /**
+     * API name: {@code percents}
+     */
+    public final List<Double> percents() {
+        return this.percents;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.percents)) {
+            generator.writeKey("percents");
+            generator.writeStartArray();
+            for (Double item0 : this.percents) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PercentilesBucketAggregation}.
+     */
+
+    public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<PercentilesBucketAggregation> {
+        @Nullable
+        private List<Double> percents;
+
+        /**
+         * API name: {@code percents}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>percents</code>.
+         */
+        public final Builder percents(List<Double> list) {
+            this.percents = _listAddAll(this.percents, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code percents}
+         * <p>
+         * Adds one or more values to <code>percents</code>.
+         */
+        public final Builder percents(Double value, Double... values) {
+            this.percents = _listAdd(this.percents, value, values);
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PercentilesBucketAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PercentilesBucketAggregation build() {
+            _checkSingleUse();
+
+            return new PercentilesBucketAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PercentilesBucketAggregation}
+     */
+    public static final JsonpDeserializer<PercentilesBucketAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PercentilesBucketAggregation::setupPercentilesBucketAggregationDeserializer
+    );
+
+    protected static void setupPercentilesBucketAggregationDeserializer(ObjectDeserializer<PercentilesBucketAggregation.Builder> op) {
+        PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
+        op.add(Builder::percents, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.doubleDeserializer()), "percents");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesBuilders.java
index c812b490ec..22f4e1bfd3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesBuilders.java
@@ -38,10 +38,9 @@
  * Variants <code>array</code>, <code>keyed</code> are not available here as
  * they don't have a dedicated class. Use {@link Percentiles}'s builder for
  * these.
- * 
+ *
  */
 public class PercentilesBuilders {
-	private PercentilesBuilders() {
-	}
+    private PercentilesBuilders() {}
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PipelineAggregationBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PipelineAggregationBase.java
index ded1ffb232..367c548c5a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PipelineAggregationBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PipelineAggregationBase.java
@@ -32,135 +32,134 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.PipelineAggregationBase
 
-
 public abstract class PipelineAggregationBase extends AggregationBase {
-	@Nullable
-	private final BucketsPath bucketsPath;
-
-	@Nullable
-	private final String format;
-
-	@Nullable
-	private final GapPolicy gapPolicy;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected PipelineAggregationBase(AbstractBuilder<?> builder) {
-		super(builder);
-
-		this.bucketsPath = builder.bucketsPath;
-		this.format = builder.format;
-		this.gapPolicy = builder.gapPolicy;
-
-	}
-
-	/**
-	 * API name: {@code buckets_path}
-	 */
-	@Nullable
-	public final BucketsPath bucketsPath() {
-		return this.bucketsPath;
-	}
-
-	/**
-	 * API name: {@code format}
-	 */
-	@Nullable
-	public final String format() {
-		return this.format;
-	}
-
-	/**
-	 * API name: {@code gap_policy}
-	 */
-	@Nullable
-	public final GapPolicy gapPolicy() {
-		return this.gapPolicy;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.bucketsPath != null) {
-			generator.writeKey("buckets_path");
-			this.bucketsPath.serialize(generator, mapper);
-
-		}
-		if (this.format != null) {
-			generator.writeKey("format");
-			generator.write(this.format);
-
-		}
-		if (this.gapPolicy != null) {
-			generator.writeKey("gap_policy");
-			this.gapPolicy.serialize(generator, mapper);
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				AggregationBase.AbstractBuilder<BuilderT> {
-		@Nullable
-		private BucketsPath bucketsPath;
-
-		@Nullable
-		private String format;
-
-		@Nullable
-		private GapPolicy gapPolicy;
-
-		/**
-		 * API name: {@code buckets_path}
-		 */
-		public final BuilderT bucketsPath(@Nullable BucketsPath value) {
-			this.bucketsPath = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code buckets_path}
-		 */
-		public final BuilderT bucketsPath(Function<BucketsPath.Builder, ObjectBuilder<BucketsPath>> fn) {
-			return this.bucketsPath(fn.apply(new BucketsPath.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code format}
-		 */
-		public final BuilderT format(@Nullable String value) {
-			this.format = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code gap_policy}
-		 */
-		public final BuilderT gapPolicy(@Nullable GapPolicy value) {
-			this.gapPolicy = value;
-			return self();
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupPipelineAggregationBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		setupAggregationBaseDeserializer(op);
-		op.add(AbstractBuilder::bucketsPath, BucketsPath._DESERIALIZER, "buckets_path");
-		op.add(AbstractBuilder::format, JsonpDeserializer.stringDeserializer(), "format");
-		op.add(AbstractBuilder::gapPolicy, GapPolicy._DESERIALIZER, "gap_policy");
-
-	}
+    @Nullable
+    private final BucketsPath bucketsPath;
+
+    @Nullable
+    private final String format;
+
+    @Nullable
+    private final GapPolicy gapPolicy;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected PipelineAggregationBase(AbstractBuilder<?> builder) {
+        super(builder);
+
+        this.bucketsPath = builder.bucketsPath;
+        this.format = builder.format;
+        this.gapPolicy = builder.gapPolicy;
+
+    }
+
+    /**
+     * API name: {@code buckets_path}
+     */
+    @Nullable
+    public final BucketsPath bucketsPath() {
+        return this.bucketsPath;
+    }
+
+    /**
+     * API name: {@code format}
+     */
+    @Nullable
+    public final String format() {
+        return this.format;
+    }
+
+    /**
+     * API name: {@code gap_policy}
+     */
+    @Nullable
+    public final GapPolicy gapPolicy() {
+        return this.gapPolicy;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.bucketsPath != null) {
+            generator.writeKey("buckets_path");
+            this.bucketsPath.serialize(generator, mapper);
+
+        }
+        if (this.format != null) {
+            generator.writeKey("format");
+            generator.write(this.format);
+
+        }
+        if (this.gapPolicy != null) {
+            generator.writeKey("gap_policy");
+            this.gapPolicy.serialize(generator, mapper);
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregationBase.AbstractBuilder<
+        BuilderT> {
+        @Nullable
+        private BucketsPath bucketsPath;
+
+        @Nullable
+        private String format;
+
+        @Nullable
+        private GapPolicy gapPolicy;
+
+        /**
+         * API name: {@code buckets_path}
+         */
+        public final BuilderT bucketsPath(@Nullable BucketsPath value) {
+            this.bucketsPath = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code buckets_path}
+         */
+        public final BuilderT bucketsPath(Function<BucketsPath.Builder, ObjectBuilder<BucketsPath>> fn) {
+            return this.bucketsPath(fn.apply(new BucketsPath.Builder()).build());
+        }
+
+        /**
+         * API name: {@code format}
+         */
+        public final BuilderT format(@Nullable String value) {
+            this.format = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code gap_policy}
+         */
+        public final BuilderT gapPolicy(@Nullable GapPolicy value) {
+            this.gapPolicy = value;
+            return self();
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupPipelineAggregationBaseDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
+        setupAggregationBaseDeserializer(op);
+        op.add(AbstractBuilder::bucketsPath, BucketsPath._DESERIALIZER, "buckets_path");
+        op.add(AbstractBuilder::format, JsonpDeserializer.stringDeserializer(), "format");
+        op.add(AbstractBuilder::gapPolicy, GapPolicy._DESERIALIZER, "gap_policy");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RangeAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RangeAggregate.java
index 6943a658ca..24af0f0e87 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RangeAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RangeAggregate.java
@@ -32,83 +32,78 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.RangeAggregate
 
-
 @JsonpDeserializable
 public class RangeAggregate extends MultiBucketAggregateBase<RangeBucket> implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	protected RangeAggregate(AbstractBuilder<?> builder) {
-		super(builder);
-
-	}
-
-	public static RangeAggregate rangeAggregateOf(Function<Builder, ObjectBuilder<RangeAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Range;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RangeAggregate}.
-	 */
-
-	public static class Builder extends RangeAggregate.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<RangeAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RangeAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RangeAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new RangeAggregate(this);
-		}
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				MultiBucketAggregateBase.AbstractBuilder<RangeBucket, BuilderT> {
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RangeAggregate}
-	 */
-	public static final JsonpDeserializer<RangeAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RangeAggregate::setupRangeAggregateDeserializer);
-
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupRangeAggregateDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		setupMultiBucketAggregateBaseDeserializer(op, RangeBucket._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    protected RangeAggregate(AbstractBuilder<?> builder) {
+        super(builder);
+
+    }
+
+    public static RangeAggregate rangeAggregateOf(Function<Builder, ObjectBuilder<RangeAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Range;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RangeAggregate}.
+     */
+
+    public static class Builder extends RangeAggregate.AbstractBuilder<Builder> implements ObjectBuilder<RangeAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RangeAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RangeAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new RangeAggregate(this);
+        }
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends
+        MultiBucketAggregateBase.AbstractBuilder<RangeBucket, BuilderT> {}
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RangeAggregate}
+     */
+    public static final JsonpDeserializer<RangeAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RangeAggregate::setupRangeAggregateDeserializer
+    );
+
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupRangeAggregateDeserializer(ObjectDeserializer<BuilderT> op) {
+        setupMultiBucketAggregateBaseDeserializer(op, RangeBucket._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RangeAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RangeAggregation.java
index 8defc797a9..0d58ddb6da 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RangeAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RangeAggregation.java
@@ -32,264 +32,263 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.RangeAggregation
 
-
 @JsonpDeserializable
 public class RangeAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final String field;
-
-	@Nullable
-	private final Integer missing;
-
-	private final List<AggregationRange> ranges;
-
-	@Nullable
-	private final Script script;
-
-	@Nullable
-	private final Boolean keyed;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RangeAggregation(Builder builder) {
-		super(builder);
-
-		this.field = builder.field;
-		this.missing = builder.missing;
-		this.ranges = ApiTypeHelper.unmodifiable(builder.ranges);
-		this.script = builder.script;
-		this.keyed = builder.keyed;
-
-	}
-
-	public static RangeAggregation of(Function<Builder, ObjectBuilder<RangeAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Range;
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code missing}
-	 */
-	@Nullable
-	public final Integer missing() {
-		return this.missing;
-	}
-
-	/**
-	 * API name: {@code ranges}
-	 */
-	public final List<AggregationRange> ranges() {
-		return this.ranges;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final Script script() {
-		return this.script;
-	}
-
-	/**
-	 * API name: {@code keyed}
-	 */
-	@Nullable
-	public final Boolean keyed() {
-		return this.keyed;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (this.missing != null) {
-			generator.writeKey("missing");
-			generator.write(this.missing);
-
-		}
-		if (ApiTypeHelper.isDefined(this.ranges)) {
-			generator.writeKey("ranges");
-			generator.writeStartArray();
-			for (AggregationRange item0 : this.ranges) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-		if (this.keyed != null) {
-			generator.writeKey("keyed");
-			generator.write(this.keyed);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RangeAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<RangeAggregation> {
-		@Nullable
-		private String field;
-
-		@Nullable
-		private Integer missing;
-
-		@Nullable
-		private List<AggregationRange> ranges;
-
-		@Nullable
-		private Script script;
-
-		@Nullable
-		private Boolean keyed;
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code missing}
-		 */
-		public final Builder missing(@Nullable Integer value) {
-			this.missing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ranges}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>ranges</code>.
-		 */
-		public final Builder ranges(List<AggregationRange> list) {
-			this.ranges = _listAddAll(this.ranges, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code ranges}
-		 * <p>
-		 * Adds one or more values to <code>ranges</code>.
-		 */
-		public final Builder ranges(AggregationRange value, AggregationRange... values) {
-			this.ranges = _listAdd(this.ranges, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code ranges}
-		 * <p>
-		 * Adds a value to <code>ranges</code> using a builder lambda.
-		 */
-		public final Builder ranges(Function<AggregationRange.Builder, ObjectBuilder<AggregationRange>> fn) {
-			return ranges(fn.apply(new AggregationRange.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(@Nullable Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code keyed}
-		 */
-		public final Builder keyed(@Nullable Boolean value) {
-			this.keyed = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RangeAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RangeAggregation build() {
-			_checkSingleUse();
-
-			return new RangeAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RangeAggregation}
-	 */
-	public static final JsonpDeserializer<RangeAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RangeAggregation::setupRangeAggregationDeserializer);
-
-	protected static void setupRangeAggregationDeserializer(ObjectDeserializer<RangeAggregation.Builder> op) {
-		setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::missing, JsonpDeserializer.integerDeserializer(), "missing");
-		op.add(Builder::ranges, JsonpDeserializer.arrayDeserializer(AggregationRange._DESERIALIZER), "ranges");
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-		op.add(Builder::keyed, JsonpDeserializer.booleanDeserializer(), "keyed");
-
-	}
+    @Nullable
+    private final String field;
+
+    @Nullable
+    private final Integer missing;
+
+    private final List<AggregationRange> ranges;
+
+    @Nullable
+    private final Script script;
+
+    @Nullable
+    private final Boolean keyed;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RangeAggregation(Builder builder) {
+        super(builder);
+
+        this.field = builder.field;
+        this.missing = builder.missing;
+        this.ranges = ApiTypeHelper.unmodifiable(builder.ranges);
+        this.script = builder.script;
+        this.keyed = builder.keyed;
+
+    }
+
+    public static RangeAggregation of(Function<Builder, ObjectBuilder<RangeAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Range;
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code missing}
+     */
+    @Nullable
+    public final Integer missing() {
+        return this.missing;
+    }
+
+    /**
+     * API name: {@code ranges}
+     */
+    public final List<AggregationRange> ranges() {
+        return this.ranges;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final Script script() {
+        return this.script;
+    }
+
+    /**
+     * API name: {@code keyed}
+     */
+    @Nullable
+    public final Boolean keyed() {
+        return this.keyed;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (this.missing != null) {
+            generator.writeKey("missing");
+            generator.write(this.missing);
+
+        }
+        if (ApiTypeHelper.isDefined(this.ranges)) {
+            generator.writeKey("ranges");
+            generator.writeStartArray();
+            for (AggregationRange item0 : this.ranges) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+        if (this.keyed != null) {
+            generator.writeKey("keyed");
+            generator.write(this.keyed);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RangeAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<RangeAggregation> {
+        @Nullable
+        private String field;
+
+        @Nullable
+        private Integer missing;
+
+        @Nullable
+        private List<AggregationRange> ranges;
+
+        @Nullable
+        private Script script;
+
+        @Nullable
+        private Boolean keyed;
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code missing}
+         */
+        public final Builder missing(@Nullable Integer value) {
+            this.missing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ranges}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>ranges</code>.
+         */
+        public final Builder ranges(List<AggregationRange> list) {
+            this.ranges = _listAddAll(this.ranges, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code ranges}
+         * <p>
+         * Adds one or more values to <code>ranges</code>.
+         */
+        public final Builder ranges(AggregationRange value, AggregationRange... values) {
+            this.ranges = _listAdd(this.ranges, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code ranges}
+         * <p>
+         * Adds a value to <code>ranges</code> using a builder lambda.
+         */
+        public final Builder ranges(Function<AggregationRange.Builder, ObjectBuilder<AggregationRange>> fn) {
+            return ranges(fn.apply(new AggregationRange.Builder()).build());
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(@Nullable Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * API name: {@code keyed}
+         */
+        public final Builder keyed(@Nullable Boolean value) {
+            this.keyed = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RangeAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RangeAggregation build() {
+            _checkSingleUse();
+
+            return new RangeAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RangeAggregation}
+     */
+    public static final JsonpDeserializer<RangeAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RangeAggregation::setupRangeAggregationDeserializer
+    );
+
+    protected static void setupRangeAggregationDeserializer(ObjectDeserializer<RangeAggregation.Builder> op) {
+        setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::missing, JsonpDeserializer.integerDeserializer(), "missing");
+        op.add(Builder::ranges, JsonpDeserializer.arrayDeserializer(AggregationRange._DESERIALIZER), "ranges");
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+        op.add(Builder::keyed, JsonpDeserializer.booleanDeserializer(), "keyed");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RangeBucket.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RangeBucket.java
index 228e984757..d9dcbef6bd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RangeBucket.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RangeBucket.java
@@ -32,220 +32,221 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.RangeBucket
 
-
 @JsonpDeserializable
 public class RangeBucket extends MultiBucketBase {
 
-	@Nullable
-	private final String key;
-	@Nullable
-	private final Double from;
-
-	@Nullable
-	private final Double to;
-
-	@Nullable
-	private final String fromAsString;
-
-	@Nullable
-	private final String toAsString;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RangeBucket(Builder builder) {
-		super(builder);
-
-		this.key = builder.key;
-		this.from = builder.from;
-		this.to = builder.to;
-		this.fromAsString = builder.fromAsString;
-		this.toAsString = builder.toAsString;
-
-	}
-
-	public static RangeBucket of(Function<Builder, ObjectBuilder<RangeBucket>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code key}
-	 */
-	@Nullable
-	public final String key() {
-		return this.key;
-	}
-
-	/**
-	 * API name: {@code from}
-	 */
-	@Nullable
-	public final Double from() {
-		return this.from;
-	}
-
-	/**
-	 * API name: {@code to}
-	 */
-	@Nullable
-	public final Double to() {
-		return this.to;
-	}
-
-	/**
-	 * API name: {@code from_as_string}
-	 */
-	@Nullable
-	public final String fromAsString() {
-		return this.fromAsString;
-	}
-
-	/**
-	 * API name: {@code to_as_string}
-	 */
-	@Nullable
-	public final String toAsString() {
-		return this.toAsString;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.key != null) {
-			generator.writeKey("key");
-			generator.write(this.key);
-
-		}
-		if (this.from != null) {
-			generator.writeKey("from");
-			generator.write(this.from);
-
-		}
-		if (this.to != null) {
-			generator.writeKey("to");
-			generator.write(this.to);
-
-		}
-		if (this.fromAsString != null) {
-			generator.writeKey("from_as_string");
-			generator.write(this.fromAsString);
-
-		}
-		if (this.toAsString != null) {
-			generator.writeKey("to_as_string");
-			generator.write(this.toAsString);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RangeBucket}.
-	 */
-
-	public static class Builder extends MultiBucketBase.AbstractBuilder<Builder> implements ObjectBuilder<RangeBucket> {
-
-		@Nullable
-		private String key;
-		@Nullable
-		private Double from;
-
-		@Nullable
-		private Double to;
-
-		@Nullable
-		private String fromAsString;
-
-		@Nullable
-		private String toAsString;
-
-		/**
-		 * API name: {@code key}
-		 */
-		public final Builder key(String value) {
-			this.key = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code from}
-		 */
-		public final Builder from(@Nullable Double value) {
-			this.from = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code to}
-		 */
-		public final Builder to(@Nullable Double value) {
-			this.to = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code from_as_string}
-		 */
-		public final Builder fromAsString(@Nullable String value) {
-			this.fromAsString = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code to_as_string}
-		 */
-		public final Builder toAsString(@Nullable String value) {
-			this.toAsString = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RangeBucket}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RangeBucket build() {
-			_checkSingleUse();
-
-			return new RangeBucket(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RangeBucket}
-	 */
-	public static final JsonpDeserializer<RangeBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RangeBucket::setupRangeBucketDeserializer);
-
-	protected static void setupRangeBucketDeserializer(ObjectDeserializer<RangeBucket.Builder> op) {
-		setupMultiBucketBaseDeserializer(op);
-		op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
-		op.add(Builder::from, JsonpDeserializer.doubleDeserializer(), "from");
-		op.add(Builder::to, JsonpDeserializer.doubleDeserializer(), "to");
-		op.add(Builder::fromAsString, JsonpDeserializer.stringDeserializer(), "from_as_string");
-		op.add(Builder::toAsString, JsonpDeserializer.stringDeserializer(), "to_as_string");
-
-	}
+    @Nullable
+    private final String key;
+    @Nullable
+    private final Double from;
+
+    @Nullable
+    private final Double to;
+
+    @Nullable
+    private final String fromAsString;
+
+    @Nullable
+    private final String toAsString;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RangeBucket(Builder builder) {
+        super(builder);
+
+        this.key = builder.key;
+        this.from = builder.from;
+        this.to = builder.to;
+        this.fromAsString = builder.fromAsString;
+        this.toAsString = builder.toAsString;
+
+    }
+
+    public static RangeBucket of(Function<Builder, ObjectBuilder<RangeBucket>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code key}
+     */
+    @Nullable
+    public final String key() {
+        return this.key;
+    }
+
+    /**
+     * API name: {@code from}
+     */
+    @Nullable
+    public final Double from() {
+        return this.from;
+    }
+
+    /**
+     * API name: {@code to}
+     */
+    @Nullable
+    public final Double to() {
+        return this.to;
+    }
+
+    /**
+     * API name: {@code from_as_string}
+     */
+    @Nullable
+    public final String fromAsString() {
+        return this.fromAsString;
+    }
+
+    /**
+     * API name: {@code to_as_string}
+     */
+    @Nullable
+    public final String toAsString() {
+        return this.toAsString;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.key != null) {
+            generator.writeKey("key");
+            generator.write(this.key);
+
+        }
+        if (this.from != null) {
+            generator.writeKey("from");
+            generator.write(this.from);
+
+        }
+        if (this.to != null) {
+            generator.writeKey("to");
+            generator.write(this.to);
+
+        }
+        if (this.fromAsString != null) {
+            generator.writeKey("from_as_string");
+            generator.write(this.fromAsString);
+
+        }
+        if (this.toAsString != null) {
+            generator.writeKey("to_as_string");
+            generator.write(this.toAsString);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RangeBucket}.
+     */
+
+    public static class Builder extends MultiBucketBase.AbstractBuilder<Builder> implements ObjectBuilder<RangeBucket> {
+
+        @Nullable
+        private String key;
+        @Nullable
+        private Double from;
+
+        @Nullable
+        private Double to;
+
+        @Nullable
+        private String fromAsString;
+
+        @Nullable
+        private String toAsString;
+
+        /**
+         * API name: {@code key}
+         */
+        public final Builder key(String value) {
+            this.key = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code from}
+         */
+        public final Builder from(@Nullable Double value) {
+            this.from = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code to}
+         */
+        public final Builder to(@Nullable Double value) {
+            this.to = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code from_as_string}
+         */
+        public final Builder fromAsString(@Nullable String value) {
+            this.fromAsString = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code to_as_string}
+         */
+        public final Builder toAsString(@Nullable String value) {
+            this.toAsString = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RangeBucket}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RangeBucket build() {
+            _checkSingleUse();
+
+            return new RangeBucket(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RangeBucket}
+     */
+    public static final JsonpDeserializer<RangeBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RangeBucket::setupRangeBucketDeserializer
+    );
+
+    protected static void setupRangeBucketDeserializer(ObjectDeserializer<RangeBucket.Builder> op) {
+        setupMultiBucketBaseDeserializer(op);
+        op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
+        op.add(Builder::from, JsonpDeserializer.doubleDeserializer(), "from");
+        op.add(Builder::to, JsonpDeserializer.doubleDeserializer(), "to");
+        op.add(Builder::fromAsString, JsonpDeserializer.stringDeserializer(), "from_as_string");
+        op.add(Builder::toAsString, JsonpDeserializer.stringDeserializer(), "to_as_string");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RareTermsAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RareTermsAggregation.java
index 05804ff9fd..3aa4de2486 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RareTermsAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RareTermsAggregation.java
@@ -32,310 +32,309 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.FieldValue;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.FieldValue;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.RareTermsAggregation
 
-
 @JsonpDeserializable
 public class RareTermsAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final TermsExclude exclude;
-
-	@Nullable
-	private final String field;
-
-	@Nullable
-	private final TermsInclude include;
-
-	@Nullable
-	private final Long maxDocCount;
-
-	@Nullable
-	private final FieldValue missing;
-
-	@Nullable
-	private final Double precision;
-
-	@Nullable
-	private final String valueType;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RareTermsAggregation(Builder builder) {
-		super(builder);
-
-		this.exclude = builder.exclude;
-		this.field = builder.field;
-		this.include = builder.include;
-		this.maxDocCount = builder.maxDocCount;
-		this.missing = builder.missing;
-		this.precision = builder.precision;
-		this.valueType = builder.valueType;
-
-	}
-
-	public static RareTermsAggregation of(Function<Builder, ObjectBuilder<RareTermsAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.RareTerms;
-	}
-
-	/**
-	 * API name: {@code exclude}
-	 */
-	@Nullable
-	public final TermsExclude exclude() {
-		return this.exclude;
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code include}
-	 */
-	@Nullable
-	public final TermsInclude include() {
-		return this.include;
-	}
-
-	/**
-	 * API name: {@code max_doc_count}
-	 */
-	@Nullable
-	public final Long maxDocCount() {
-		return this.maxDocCount;
-	}
-
-	/**
-	 * API name: {@code missing}
-	 */
-	@Nullable
-	public final FieldValue missing() {
-		return this.missing;
-	}
-
-	/**
-	 * API name: {@code precision}
-	 */
-	@Nullable
-	public final Double precision() {
-		return this.precision;
-	}
-
-	/**
-	 * API name: {@code value_type}
-	 */
-	@Nullable
-	public final String valueType() {
-		return this.valueType;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.exclude != null) {
-			generator.writeKey("exclude");
-			this.exclude.serialize(generator, mapper);
-
-		}
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (this.include != null) {
-			generator.writeKey("include");
-			this.include.serialize(generator, mapper);
-
-		}
-		if (this.maxDocCount != null) {
-			generator.writeKey("max_doc_count");
-			generator.write(this.maxDocCount);
-
-		}
-		if (this.missing != null) {
-			generator.writeKey("missing");
-			this.missing.serialize(generator, mapper);
-
-		}
-		if (this.precision != null) {
-			generator.writeKey("precision");
-			generator.write(this.precision);
-
-		}
-		if (this.valueType != null) {
-			generator.writeKey("value_type");
-			generator.write(this.valueType);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RareTermsAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<RareTermsAggregation> {
-		@Nullable
-		private TermsExclude exclude;
-
-		@Nullable
-		private String field;
-
-		@Nullable
-		private TermsInclude include;
-
-		@Nullable
-		private Long maxDocCount;
-
-		@Nullable
-		private FieldValue missing;
-
-		@Nullable
-		private Double precision;
-
-		@Nullable
-		private String valueType;
-
-		/**
-		 * API name: {@code exclude}
-		 */
-		public final Builder exclude(@Nullable TermsExclude value) {
-			this.exclude = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code exclude}
-		 */
-		public final Builder exclude(Function<TermsExclude.Builder, ObjectBuilder<TermsExclude>> fn) {
-			return this.exclude(fn.apply(new TermsExclude.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code include}
-		 */
-		public final Builder include(@Nullable TermsInclude value) {
-			this.include = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code include}
-		 */
-		public final Builder include(Function<TermsInclude.Builder, ObjectBuilder<TermsInclude>> fn) {
-			return this.include(fn.apply(new TermsInclude.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code max_doc_count}
-		 */
-		public final Builder maxDocCount(@Nullable Long value) {
-			this.maxDocCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code missing}
-		 */
-		public final Builder missing(@Nullable FieldValue value) {
-			this.missing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code missing}
-		 */
-		public final Builder missing(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
-			return this.missing(fn.apply(new FieldValue.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code precision}
-		 */
-		public final Builder precision(@Nullable Double value) {
-			this.precision = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code value_type}
-		 */
-		public final Builder valueType(@Nullable String value) {
-			this.valueType = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RareTermsAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RareTermsAggregation build() {
-			_checkSingleUse();
-
-			return new RareTermsAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RareTermsAggregation}
-	 */
-	public static final JsonpDeserializer<RareTermsAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RareTermsAggregation::setupRareTermsAggregationDeserializer);
-
-	protected static void setupRareTermsAggregationDeserializer(ObjectDeserializer<RareTermsAggregation.Builder> op) {
-		BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::exclude, TermsExclude._DESERIALIZER, "exclude");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::include, TermsInclude._DESERIALIZER, "include");
-		op.add(Builder::maxDocCount, JsonpDeserializer.longDeserializer(), "max_doc_count");
-		op.add(Builder::missing, FieldValue._DESERIALIZER, "missing");
-		op.add(Builder::precision, JsonpDeserializer.doubleDeserializer(), "precision");
-		op.add(Builder::valueType, JsonpDeserializer.stringDeserializer(), "value_type");
-
-	}
+    @Nullable
+    private final TermsExclude exclude;
+
+    @Nullable
+    private final String field;
+
+    @Nullable
+    private final TermsInclude include;
+
+    @Nullable
+    private final Long maxDocCount;
+
+    @Nullable
+    private final FieldValue missing;
+
+    @Nullable
+    private final Double precision;
+
+    @Nullable
+    private final String valueType;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RareTermsAggregation(Builder builder) {
+        super(builder);
+
+        this.exclude = builder.exclude;
+        this.field = builder.field;
+        this.include = builder.include;
+        this.maxDocCount = builder.maxDocCount;
+        this.missing = builder.missing;
+        this.precision = builder.precision;
+        this.valueType = builder.valueType;
+
+    }
+
+    public static RareTermsAggregation of(Function<Builder, ObjectBuilder<RareTermsAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.RareTerms;
+    }
+
+    /**
+     * API name: {@code exclude}
+     */
+    @Nullable
+    public final TermsExclude exclude() {
+        return this.exclude;
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code include}
+     */
+    @Nullable
+    public final TermsInclude include() {
+        return this.include;
+    }
+
+    /**
+     * API name: {@code max_doc_count}
+     */
+    @Nullable
+    public final Long maxDocCount() {
+        return this.maxDocCount;
+    }
+
+    /**
+     * API name: {@code missing}
+     */
+    @Nullable
+    public final FieldValue missing() {
+        return this.missing;
+    }
+
+    /**
+     * API name: {@code precision}
+     */
+    @Nullable
+    public final Double precision() {
+        return this.precision;
+    }
+
+    /**
+     * API name: {@code value_type}
+     */
+    @Nullable
+    public final String valueType() {
+        return this.valueType;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.exclude != null) {
+            generator.writeKey("exclude");
+            this.exclude.serialize(generator, mapper);
+
+        }
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (this.include != null) {
+            generator.writeKey("include");
+            this.include.serialize(generator, mapper);
+
+        }
+        if (this.maxDocCount != null) {
+            generator.writeKey("max_doc_count");
+            generator.write(this.maxDocCount);
+
+        }
+        if (this.missing != null) {
+            generator.writeKey("missing");
+            this.missing.serialize(generator, mapper);
+
+        }
+        if (this.precision != null) {
+            generator.writeKey("precision");
+            generator.write(this.precision);
+
+        }
+        if (this.valueType != null) {
+            generator.writeKey("value_type");
+            generator.write(this.valueType);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RareTermsAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<RareTermsAggregation> {
+        @Nullable
+        private TermsExclude exclude;
+
+        @Nullable
+        private String field;
+
+        @Nullable
+        private TermsInclude include;
+
+        @Nullable
+        private Long maxDocCount;
+
+        @Nullable
+        private FieldValue missing;
+
+        @Nullable
+        private Double precision;
+
+        @Nullable
+        private String valueType;
+
+        /**
+         * API name: {@code exclude}
+         */
+        public final Builder exclude(@Nullable TermsExclude value) {
+            this.exclude = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code exclude}
+         */
+        public final Builder exclude(Function<TermsExclude.Builder, ObjectBuilder<TermsExclude>> fn) {
+            return this.exclude(fn.apply(new TermsExclude.Builder()).build());
+        }
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code include}
+         */
+        public final Builder include(@Nullable TermsInclude value) {
+            this.include = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code include}
+         */
+        public final Builder include(Function<TermsInclude.Builder, ObjectBuilder<TermsInclude>> fn) {
+            return this.include(fn.apply(new TermsInclude.Builder()).build());
+        }
+
+        /**
+         * API name: {@code max_doc_count}
+         */
+        public final Builder maxDocCount(@Nullable Long value) {
+            this.maxDocCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code missing}
+         */
+        public final Builder missing(@Nullable FieldValue value) {
+            this.missing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code missing}
+         */
+        public final Builder missing(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
+            return this.missing(fn.apply(new FieldValue.Builder()).build());
+        }
+
+        /**
+         * API name: {@code precision}
+         */
+        public final Builder precision(@Nullable Double value) {
+            this.precision = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code value_type}
+         */
+        public final Builder valueType(@Nullable String value) {
+            this.valueType = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RareTermsAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RareTermsAggregation build() {
+            _checkSingleUse();
+
+            return new RareTermsAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RareTermsAggregation}
+     */
+    public static final JsonpDeserializer<RareTermsAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RareTermsAggregation::setupRareTermsAggregationDeserializer
+    );
+
+    protected static void setupRareTermsAggregationDeserializer(ObjectDeserializer<RareTermsAggregation.Builder> op) {
+        BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::exclude, TermsExclude._DESERIALIZER, "exclude");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::include, TermsInclude._DESERIALIZER, "include");
+        op.add(Builder::maxDocCount, JsonpDeserializer.longDeserializer(), "max_doc_count");
+        op.add(Builder::missing, FieldValue._DESERIALIZER, "missing");
+        op.add(Builder::precision, JsonpDeserializer.doubleDeserializer(), "precision");
+        op.add(Builder::valueType, JsonpDeserializer.stringDeserializer(), "value_type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RateAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RateAggregate.java
index 2d6a8f5342..349df72bfe 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RateAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RateAggregate.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,130 +42,128 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.RateAggregate
 
-
 @JsonpDeserializable
 public class RateAggregate extends AggregateBase implements AggregateVariant {
-	private final double value;
-
-	@Nullable
-	private final String valueAsString;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RateAggregate(Builder builder) {
-		super(builder);
-
-		this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
-		this.valueAsString = builder.valueAsString;
-
-	}
-
-	public static RateAggregate of(Function<Builder, ObjectBuilder<RateAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Rate;
-	}
-
-	/**
-	 * Required - API name: {@code value}
-	 */
-	public final double value() {
-		return this.value;
-	}
-
-	/**
-	 * API name: {@code value_as_string}
-	 */
-	@Nullable
-	public final String valueAsString() {
-		return this.valueAsString;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("value");
-		generator.write(this.value);
-
-		if (this.valueAsString != null) {
-			generator.writeKey("value_as_string");
-			generator.write(this.valueAsString);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RateAggregate}.
-	 */
-
-	public static class Builder extends AggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<RateAggregate> {
-		private Double value;
-
-		@Nullable
-		private String valueAsString;
-
-		/**
-		 * Required - API name: {@code value}
-		 */
-		public final Builder value(double value) {
-			this.value = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code value_as_string}
-		 */
-		public final Builder valueAsString(@Nullable String value) {
-			this.valueAsString = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RateAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RateAggregate build() {
-			_checkSingleUse();
-
-			return new RateAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RateAggregate}
-	 */
-	public static final JsonpDeserializer<RateAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RateAggregate::setupRateAggregateDeserializer);
-
-	protected static void setupRateAggregateDeserializer(ObjectDeserializer<RateAggregate.Builder> op) {
-		setupAggregateBaseDeserializer(op);
-		op.add(Builder::value, JsonpDeserializer.doubleDeserializer(), "value");
-		op.add(Builder::valueAsString, JsonpDeserializer.stringDeserializer(), "value_as_string");
-
-	}
+    private final double value;
+
+    @Nullable
+    private final String valueAsString;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RateAggregate(Builder builder) {
+        super(builder);
+
+        this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
+        this.valueAsString = builder.valueAsString;
+
+    }
+
+    public static RateAggregate of(Function<Builder, ObjectBuilder<RateAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Rate;
+    }
+
+    /**
+     * Required - API name: {@code value}
+     */
+    public final double value() {
+        return this.value;
+    }
+
+    /**
+     * API name: {@code value_as_string}
+     */
+    @Nullable
+    public final String valueAsString() {
+        return this.valueAsString;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("value");
+        generator.write(this.value);
+
+        if (this.valueAsString != null) {
+            generator.writeKey("value_as_string");
+            generator.write(this.valueAsString);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RateAggregate}.
+     */
+
+    public static class Builder extends AggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<RateAggregate> {
+        private Double value;
+
+        @Nullable
+        private String valueAsString;
+
+        /**
+         * Required - API name: {@code value}
+         */
+        public final Builder value(double value) {
+            this.value = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code value_as_string}
+         */
+        public final Builder valueAsString(@Nullable String value) {
+            this.valueAsString = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RateAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RateAggregate build() {
+            _checkSingleUse();
+
+            return new RateAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RateAggregate}
+     */
+    public static final JsonpDeserializer<RateAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RateAggregate::setupRateAggregateDeserializer
+    );
+
+    protected static void setupRateAggregateDeserializer(ObjectDeserializer<RateAggregate.Builder> op) {
+        setupAggregateBaseDeserializer(op);
+        op.add(Builder::value, JsonpDeserializer.doubleDeserializer(), "value");
+        op.add(Builder::valueAsString, JsonpDeserializer.stringDeserializer(), "value_as_string");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RateAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RateAggregation.java
index 0bf685605f..306ebf7770 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RateAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RateAggregation.java
@@ -32,142 +32,140 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.RateAggregation
 
-
 @JsonpDeserializable
 public class RateAggregation extends FormatMetricAggregationBase implements AggregationVariant {
-	@Nullable
-	private final CalendarInterval unit;
-
-	@Nullable
-	private final RateMode mode;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RateAggregation(Builder builder) {
-		super(builder);
-
-		this.unit = builder.unit;
-		this.mode = builder.mode;
-
-	}
-
-	public static RateAggregation of(Function<Builder, ObjectBuilder<RateAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Rate;
-	}
-
-	/**
-	 * API name: {@code unit}
-	 */
-	@Nullable
-	public final CalendarInterval unit() {
-		return this.unit;
-	}
-
-	/**
-	 * API name: {@code mode}
-	 */
-	@Nullable
-	public final RateMode mode() {
-		return this.mode;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.unit != null) {
-			generator.writeKey("unit");
-			this.unit.serialize(generator, mapper);
-		}
-		if (this.mode != null) {
-			generator.writeKey("mode");
-			this.mode.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RateAggregation}.
-	 */
-
-	public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<RateAggregation> {
-		@Nullable
-		private CalendarInterval unit;
-
-		@Nullable
-		private RateMode mode;
-
-		/**
-		 * API name: {@code unit}
-		 */
-		public final Builder unit(@Nullable CalendarInterval value) {
-			this.unit = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mode}
-		 */
-		public final Builder mode(@Nullable RateMode value) {
-			this.mode = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RateAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RateAggregation build() {
-			_checkSingleUse();
-
-			return new RateAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RateAggregation}
-	 */
-	public static final JsonpDeserializer<RateAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RateAggregation::setupRateAggregationDeserializer);
-
-	protected static void setupRateAggregationDeserializer(ObjectDeserializer<RateAggregation.Builder> op) {
-		setupFormatMetricAggregationBaseDeserializer(op);
-		op.add(Builder::unit, CalendarInterval._DESERIALIZER, "unit");
-		op.add(Builder::mode, RateMode._DESERIALIZER, "mode");
-
-	}
+    @Nullable
+    private final CalendarInterval unit;
+
+    @Nullable
+    private final RateMode mode;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RateAggregation(Builder builder) {
+        super(builder);
+
+        this.unit = builder.unit;
+        this.mode = builder.mode;
+
+    }
+
+    public static RateAggregation of(Function<Builder, ObjectBuilder<RateAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Rate;
+    }
+
+    /**
+     * API name: {@code unit}
+     */
+    @Nullable
+    public final CalendarInterval unit() {
+        return this.unit;
+    }
+
+    /**
+     * API name: {@code mode}
+     */
+    @Nullable
+    public final RateMode mode() {
+        return this.mode;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.unit != null) {
+            generator.writeKey("unit");
+            this.unit.serialize(generator, mapper);
+        }
+        if (this.mode != null) {
+            generator.writeKey("mode");
+            this.mode.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RateAggregation}.
+     */
+
+    public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<RateAggregation> {
+        @Nullable
+        private CalendarInterval unit;
+
+        @Nullable
+        private RateMode mode;
+
+        /**
+         * API name: {@code unit}
+         */
+        public final Builder unit(@Nullable CalendarInterval value) {
+            this.unit = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mode}
+         */
+        public final Builder mode(@Nullable RateMode value) {
+            this.mode = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RateAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RateAggregation build() {
+            _checkSingleUse();
+
+            return new RateAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RateAggregation}
+     */
+    public static final JsonpDeserializer<RateAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RateAggregation::setupRateAggregationDeserializer
+    );
+
+    protected static void setupRateAggregationDeserializer(ObjectDeserializer<RateAggregation.Builder> op) {
+        setupFormatMetricAggregationBaseDeserializer(op);
+        op.add(Builder::unit, CalendarInterval._DESERIALIZER, "unit");
+        op.add(Builder::mode, RateMode._DESERIALIZER, "mode");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RateMode.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RateMode.java
index 93b4e0aa0b..5bf0394cf7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RateMode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RateMode.java
@@ -35,24 +35,23 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum RateMode implements JsonEnum {
-	Sum("sum"),
+    Sum("sum"),
 
-	ValueCount("value_count"),
+    ValueCount("value_count"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	RateMode(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    RateMode(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<RateMode> _DESERIALIZER = new JsonEnum.Deserializer<>(RateMode.values());
+    public static final JsonEnum.Deserializer<RateMode> _DESERIALIZER = new JsonEnum.Deserializer<>(RateMode.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RegressionInferenceOptions.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RegressionInferenceOptions.java
index 4354f3e19e..bd2e3dc1b4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RegressionInferenceOptions.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RegressionInferenceOptions.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,143 +43,139 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.RegressionInferenceOptions
 
-
 @JsonpDeserializable
 public class RegressionInferenceOptions implements JsonpSerializable {
-	@Nullable
-	private final String resultsField;
-
-	@Nullable
-	private final Integer numTopFeatureImportanceValues;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RegressionInferenceOptions(Builder builder) {
-
-		this.resultsField = builder.resultsField;
-		this.numTopFeatureImportanceValues = builder.numTopFeatureImportanceValues;
-
-	}
-
-	public static RegressionInferenceOptions of(Function<Builder, ObjectBuilder<RegressionInferenceOptions>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * The field that is added to incoming documents to contain the inference
-	 * prediction. Defaults to predicted_value.
-	 * <p>
-	 * API name: {@code results_field}
-	 */
-	@Nullable
-	public final String resultsField() {
-		return this.resultsField;
-	}
-
-	/**
-	 * Specifies the maximum number of feature importance values per document. By
-	 * default, it is zero and no feature importance calculation occurs.
-	 * <p>
-	 * API name: {@code num_top_feature_importance_values}
-	 */
-	@Nullable
-	public final Integer numTopFeatureImportanceValues() {
-		return this.numTopFeatureImportanceValues;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.resultsField != null) {
-			generator.writeKey("results_field");
-			generator.write(this.resultsField);
-
-		}
-		if (this.numTopFeatureImportanceValues != null) {
-			generator.writeKey("num_top_feature_importance_values");
-			generator.write(this.numTopFeatureImportanceValues);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RegressionInferenceOptions}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RegressionInferenceOptions> {
-		@Nullable
-		private String resultsField;
-
-		@Nullable
-		private Integer numTopFeatureImportanceValues;
-
-		/**
-		 * The field that is added to incoming documents to contain the inference
-		 * prediction. Defaults to predicted_value.
-		 * <p>
-		 * API name: {@code results_field}
-		 */
-		public final Builder resultsField(@Nullable String value) {
-			this.resultsField = value;
-			return this;
-		}
-
-		/**
-		 * Specifies the maximum number of feature importance values per document. By
-		 * default, it is zero and no feature importance calculation occurs.
-		 * <p>
-		 * API name: {@code num_top_feature_importance_values}
-		 */
-		public final Builder numTopFeatureImportanceValues(@Nullable Integer value) {
-			this.numTopFeatureImportanceValues = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RegressionInferenceOptions}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RegressionInferenceOptions build() {
-			_checkSingleUse();
-
-			return new RegressionInferenceOptions(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RegressionInferenceOptions}
-	 */
-	public static final JsonpDeserializer<RegressionInferenceOptions> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RegressionInferenceOptions::setupRegressionInferenceOptionsDeserializer);
-
-	protected static void setupRegressionInferenceOptionsDeserializer(
-			ObjectDeserializer<RegressionInferenceOptions.Builder> op) {
-
-		op.add(Builder::resultsField, JsonpDeserializer.stringDeserializer(), "results_field");
-		op.add(Builder::numTopFeatureImportanceValues, JsonpDeserializer.integerDeserializer(),
-				"num_top_feature_importance_values");
-
-	}
+    @Nullable
+    private final String resultsField;
+
+    @Nullable
+    private final Integer numTopFeatureImportanceValues;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RegressionInferenceOptions(Builder builder) {
+
+        this.resultsField = builder.resultsField;
+        this.numTopFeatureImportanceValues = builder.numTopFeatureImportanceValues;
+
+    }
+
+    public static RegressionInferenceOptions of(Function<Builder, ObjectBuilder<RegressionInferenceOptions>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * The field that is added to incoming documents to contain the inference
+     * prediction. Defaults to predicted_value.
+     * <p>
+     * API name: {@code results_field}
+     */
+    @Nullable
+    public final String resultsField() {
+        return this.resultsField;
+    }
+
+    /**
+     * Specifies the maximum number of feature importance values per document. By
+     * default, it is zero and no feature importance calculation occurs.
+     * <p>
+     * API name: {@code num_top_feature_importance_values}
+     */
+    @Nullable
+    public final Integer numTopFeatureImportanceValues() {
+        return this.numTopFeatureImportanceValues;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.resultsField != null) {
+            generator.writeKey("results_field");
+            generator.write(this.resultsField);
+
+        }
+        if (this.numTopFeatureImportanceValues != null) {
+            generator.writeKey("num_top_feature_importance_values");
+            generator.write(this.numTopFeatureImportanceValues);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RegressionInferenceOptions}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RegressionInferenceOptions> {
+        @Nullable
+        private String resultsField;
+
+        @Nullable
+        private Integer numTopFeatureImportanceValues;
+
+        /**
+         * The field that is added to incoming documents to contain the inference
+         * prediction. Defaults to predicted_value.
+         * <p>
+         * API name: {@code results_field}
+         */
+        public final Builder resultsField(@Nullable String value) {
+            this.resultsField = value;
+            return this;
+        }
+
+        /**
+         * Specifies the maximum number of feature importance values per document. By
+         * default, it is zero and no feature importance calculation occurs.
+         * <p>
+         * API name: {@code num_top_feature_importance_values}
+         */
+        public final Builder numTopFeatureImportanceValues(@Nullable Integer value) {
+            this.numTopFeatureImportanceValues = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RegressionInferenceOptions}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RegressionInferenceOptions build() {
+            _checkSingleUse();
+
+            return new RegressionInferenceOptions(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RegressionInferenceOptions}
+     */
+    public static final JsonpDeserializer<RegressionInferenceOptions> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RegressionInferenceOptions::setupRegressionInferenceOptionsDeserializer
+    );
+
+    protected static void setupRegressionInferenceOptionsDeserializer(ObjectDeserializer<RegressionInferenceOptions.Builder> op) {
+
+        op.add(Builder::resultsField, JsonpDeserializer.stringDeserializer(), "results_field");
+        op.add(Builder::numTopFeatureImportanceValues, JsonpDeserializer.integerDeserializer(), "num_top_feature_importance_values");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ReverseNestedAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ReverseNestedAggregate.java
index b65d7ecd63..0281a8c625 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ReverseNestedAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ReverseNestedAggregate.java
@@ -32,77 +32,76 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.ReverseNestedAggregate
 
-
 @JsonpDeserializable
 public class ReverseNestedAggregate extends SingleBucketAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private ReverseNestedAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static ReverseNestedAggregate of(Function<Builder, ObjectBuilder<ReverseNestedAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.ReverseNested;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ReverseNestedAggregate}.
-	 */
-
-	public static class Builder extends SingleBucketAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ReverseNestedAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ReverseNestedAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ReverseNestedAggregate build() {
-			_checkSingleUse();
-
-			return new ReverseNestedAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ReverseNestedAggregate}
-	 */
-	public static final JsonpDeserializer<ReverseNestedAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ReverseNestedAggregate::setupReverseNestedAggregateDeserializer);
-
-	protected static void setupReverseNestedAggregateDeserializer(
-			ObjectDeserializer<ReverseNestedAggregate.Builder> op) {
-		setupSingleBucketAggregateBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private ReverseNestedAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static ReverseNestedAggregate of(Function<Builder, ObjectBuilder<ReverseNestedAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.ReverseNested;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ReverseNestedAggregate}.
+     */
+
+    public static class Builder extends SingleBucketAggregateBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<ReverseNestedAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ReverseNestedAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ReverseNestedAggregate build() {
+            _checkSingleUse();
+
+            return new ReverseNestedAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ReverseNestedAggregate}
+     */
+    public static final JsonpDeserializer<ReverseNestedAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ReverseNestedAggregate::setupReverseNestedAggregateDeserializer
+    );
+
+    protected static void setupReverseNestedAggregateDeserializer(ObjectDeserializer<ReverseNestedAggregate.Builder> op) {
+        setupSingleBucketAggregateBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ReverseNestedAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ReverseNestedAggregation.java
index 7fb6df084b..a567b9e1e8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ReverseNestedAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ReverseNestedAggregation.java
@@ -32,115 +32,113 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.ReverseNestedAggregation
 
-
 @JsonpDeserializable
 public class ReverseNestedAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final String path;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ReverseNestedAggregation(Builder builder) {
-		super(builder);
-
-		this.path = builder.path;
-
-	}
-
-	public static ReverseNestedAggregation of(Function<Builder, ObjectBuilder<ReverseNestedAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.ReverseNested;
-	}
-
-	/**
-	 * API name: {@code path}
-	 */
-	@Nullable
-	public final String path() {
-		return this.path;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.path != null) {
-			generator.writeKey("path");
-			generator.write(this.path);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ReverseNestedAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ReverseNestedAggregation> {
-		@Nullable
-		private String path;
-
-		/**
-		 * API name: {@code path}
-		 */
-		public final Builder path(@Nullable String value) {
-			this.path = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ReverseNestedAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ReverseNestedAggregation build() {
-			_checkSingleUse();
-
-			return new ReverseNestedAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ReverseNestedAggregation}
-	 */
-	public static final JsonpDeserializer<ReverseNestedAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ReverseNestedAggregation::setupReverseNestedAggregationDeserializer);
-
-	protected static void setupReverseNestedAggregationDeserializer(
-			ObjectDeserializer<ReverseNestedAggregation.Builder> op) {
-		setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
-
-	}
+    @Nullable
+    private final String path;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ReverseNestedAggregation(Builder builder) {
+        super(builder);
+
+        this.path = builder.path;
+
+    }
+
+    public static ReverseNestedAggregation of(Function<Builder, ObjectBuilder<ReverseNestedAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.ReverseNested;
+    }
+
+    /**
+     * API name: {@code path}
+     */
+    @Nullable
+    public final String path() {
+        return this.path;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.path != null) {
+            generator.writeKey("path");
+            generator.write(this.path);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ReverseNestedAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<ReverseNestedAggregation> {
+        @Nullable
+        private String path;
+
+        /**
+         * API name: {@code path}
+         */
+        public final Builder path(@Nullable String value) {
+            this.path = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ReverseNestedAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ReverseNestedAggregation build() {
+            _checkSingleUse();
+
+            return new ReverseNestedAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ReverseNestedAggregation}
+     */
+    public static final JsonpDeserializer<ReverseNestedAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ReverseNestedAggregation::setupReverseNestedAggregationDeserializer
+    );
+
+    protected static void setupReverseNestedAggregationDeserializer(ObjectDeserializer<ReverseNestedAggregation.Builder> op) {
+        setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SamplerAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SamplerAggregate.java
index 872c19f57a..2a8ad22a7e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SamplerAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SamplerAggregate.java
@@ -32,76 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.SamplerAggregate
 
-
 @JsonpDeserializable
 public class SamplerAggregate extends SingleBucketAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private SamplerAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static SamplerAggregate of(Function<Builder, ObjectBuilder<SamplerAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Sampler;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SamplerAggregate}.
-	 */
-
-	public static class Builder extends SingleBucketAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SamplerAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SamplerAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SamplerAggregate build() {
-			_checkSingleUse();
-
-			return new SamplerAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SamplerAggregate}
-	 */
-	public static final JsonpDeserializer<SamplerAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SamplerAggregate::setupSamplerAggregateDeserializer);
-
-	protected static void setupSamplerAggregateDeserializer(ObjectDeserializer<SamplerAggregate.Builder> op) {
-		setupSingleBucketAggregateBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private SamplerAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static SamplerAggregate of(Function<Builder, ObjectBuilder<SamplerAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Sampler;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SamplerAggregate}.
+     */
+
+    public static class Builder extends SingleBucketAggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<SamplerAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SamplerAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SamplerAggregate build() {
+            _checkSingleUse();
+
+            return new SamplerAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SamplerAggregate}
+     */
+    public static final JsonpDeserializer<SamplerAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SamplerAggregate::setupSamplerAggregateDeserializer
+    );
+
+    protected static void setupSamplerAggregateDeserializer(ObjectDeserializer<SamplerAggregate.Builder> op) {
+        setupSingleBucketAggregateBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SamplerAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SamplerAggregation.java
index 5e9ab372bb..3cdb3a762d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SamplerAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SamplerAggregation.java
@@ -32,114 +32,113 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.SamplerAggregation
 
-
 @JsonpDeserializable
 public class SamplerAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Integer shardSize;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SamplerAggregation(Builder builder) {
-		super(builder);
-
-		this.shardSize = builder.shardSize;
-
-	}
-
-	public static SamplerAggregation of(Function<Builder, ObjectBuilder<SamplerAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Sampler;
-	}
-
-	/**
-	 * API name: {@code shard_size}
-	 */
-	@Nullable
-	public final Integer shardSize() {
-		return this.shardSize;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.shardSize != null) {
-			generator.writeKey("shard_size");
-			generator.write(this.shardSize);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SamplerAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SamplerAggregation> {
-		@Nullable
-		private Integer shardSize;
-
-		/**
-		 * API name: {@code shard_size}
-		 */
-		public final Builder shardSize(@Nullable Integer value) {
-			this.shardSize = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SamplerAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SamplerAggregation build() {
-			_checkSingleUse();
-
-			return new SamplerAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SamplerAggregation}
-	 */
-	public static final JsonpDeserializer<SamplerAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SamplerAggregation::setupSamplerAggregationDeserializer);
-
-	protected static void setupSamplerAggregationDeserializer(ObjectDeserializer<SamplerAggregation.Builder> op) {
-		BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
-
-	}
+    @Nullable
+    private final Integer shardSize;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SamplerAggregation(Builder builder) {
+        super(builder);
+
+        this.shardSize = builder.shardSize;
+
+    }
+
+    public static SamplerAggregation of(Function<Builder, ObjectBuilder<SamplerAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Sampler;
+    }
+
+    /**
+     * API name: {@code shard_size}
+     */
+    @Nullable
+    public final Integer shardSize() {
+        return this.shardSize;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.shardSize != null) {
+            generator.writeKey("shard_size");
+            generator.write(this.shardSize);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SamplerAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<SamplerAggregation> {
+        @Nullable
+        private Integer shardSize;
+
+        /**
+         * API name: {@code shard_size}
+         */
+        public final Builder shardSize(@Nullable Integer value) {
+            this.shardSize = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SamplerAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SamplerAggregation build() {
+            _checkSingleUse();
+
+            return new SamplerAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SamplerAggregation}
+     */
+    public static final JsonpDeserializer<SamplerAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SamplerAggregation::setupSamplerAggregationDeserializer
+    );
+
+    protected static void setupSamplerAggregationDeserializer(ObjectDeserializer<SamplerAggregation.Builder> op) {
+        BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SamplerAggregationExecutionHint.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SamplerAggregationExecutionHint.java
index 56543e7bbc..198dc72554 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SamplerAggregationExecutionHint.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SamplerAggregationExecutionHint.java
@@ -35,27 +35,27 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum SamplerAggregationExecutionHint implements JsonEnum {
-	Map("map"),
+    Map("map"),
 
-	GlobalOrdinals("global_ordinals"),
+    GlobalOrdinals("global_ordinals"),
 
-	BytesHash("bytes_hash"),
+    BytesHash("bytes_hash"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	SamplerAggregationExecutionHint(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    SamplerAggregationExecutionHint(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<SamplerAggregationExecutionHint> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			SamplerAggregationExecutionHint.values());
+    public static final JsonEnum.Deserializer<SamplerAggregationExecutionHint> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        SamplerAggregationExecutionHint.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ScriptedHeuristic.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ScriptedHeuristic.java
index 8b6d6a9400..a242a2f2a7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ScriptedHeuristic.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ScriptedHeuristic.java
@@ -32,111 +32,111 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.aggregations.ScriptedHeuristic
 
-
 @JsonpDeserializable
 public class ScriptedHeuristic implements JsonpSerializable {
-	private final Script script;
+    private final Script script;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ScriptedHeuristic(Builder builder) {
+    private ScriptedHeuristic(Builder builder) {
 
-		this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
+        this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
 
-	}
+    }
 
-	public static ScriptedHeuristic of(Function<Builder, ObjectBuilder<ScriptedHeuristic>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ScriptedHeuristic of(Function<Builder, ObjectBuilder<ScriptedHeuristic>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code script}
-	 */
-	public final Script script() {
-		return this.script;
-	}
+    /**
+     * Required - API name: {@code script}
+     */
+    public final Script script() {
+        return this.script;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("script");
-		this.script.serialize(generator, mapper);
+        generator.writeKey("script");
+        this.script.serialize(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link ScriptedHeuristic}.
-	 */
+    /**
+     * Builder for {@link ScriptedHeuristic}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ScriptedHeuristic> {
-		private Script script;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ScriptedHeuristic> {
+        private Script script;
 
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(Script value) {
-			this.script = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(Script value) {
+            this.script = value;
+            return this;
+        }
 
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
 
-		/**
-		 * Builds a {@link ScriptedHeuristic}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ScriptedHeuristic build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link ScriptedHeuristic}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ScriptedHeuristic build() {
+            _checkSingleUse();
 
-			return new ScriptedHeuristic(this);
-		}
-	}
+            return new ScriptedHeuristic(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link ScriptedHeuristic}
-	 */
-	public static final JsonpDeserializer<ScriptedHeuristic> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ScriptedHeuristic::setupScriptedHeuristicDeserializer);
+    /**
+     * Json deserializer for {@link ScriptedHeuristic}
+     */
+    public static final JsonpDeserializer<ScriptedHeuristic> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ScriptedHeuristic::setupScriptedHeuristicDeserializer
+    );
 
-	protected static void setupScriptedHeuristicDeserializer(ObjectDeserializer<ScriptedHeuristic.Builder> op) {
+    protected static void setupScriptedHeuristicDeserializer(ObjectDeserializer<ScriptedHeuristic.Builder> op) {
 
-		op.add(Builder::script, Script._DESERIALIZER, "script");
+        op.add(Builder::script, Script._DESERIALIZER, "script");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ScriptedMetricAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ScriptedMetricAggregate.java
index 9b765656e0..ed5021556a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ScriptedMetricAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ScriptedMetricAggregate.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,103 +42,98 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.aggregations.ScriptedMetricAggregate
 
-
 @JsonpDeserializable
 public class ScriptedMetricAggregate extends AggregateBase implements AggregateVariant {
-	private final JsonData value;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ScriptedMetricAggregate(Builder builder) {
-		super(builder);
-
-		this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
-
-	}
-
-	public static ScriptedMetricAggregate of(Function<Builder, ObjectBuilder<ScriptedMetricAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.ScriptedMetric;
-	}
-
-	/**
-	 * Required - API name: {@code value}
-	 */
-	public final JsonData value() {
-		return this.value;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("value");
-		this.value.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ScriptedMetricAggregate}.
-	 */
-
-	public static class Builder extends AggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ScriptedMetricAggregate> {
-		private JsonData value;
-
-		/**
-		 * Required - API name: {@code value}
-		 */
-		public final Builder value(JsonData value) {
-			this.value = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ScriptedMetricAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ScriptedMetricAggregate build() {
-			_checkSingleUse();
-
-			return new ScriptedMetricAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ScriptedMetricAggregate}
-	 */
-	public static final JsonpDeserializer<ScriptedMetricAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ScriptedMetricAggregate::setupScriptedMetricAggregateDeserializer);
-
-	protected static void setupScriptedMetricAggregateDeserializer(
-			ObjectDeserializer<ScriptedMetricAggregate.Builder> op) {
-		setupAggregateBaseDeserializer(op);
-		op.add(Builder::value, JsonData._DESERIALIZER, "value");
-
-	}
+    private final JsonData value;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ScriptedMetricAggregate(Builder builder) {
+        super(builder);
+
+        this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
+
+    }
+
+    public static ScriptedMetricAggregate of(Function<Builder, ObjectBuilder<ScriptedMetricAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.ScriptedMetric;
+    }
+
+    /**
+     * Required - API name: {@code value}
+     */
+    public final JsonData value() {
+        return this.value;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("value");
+        this.value.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ScriptedMetricAggregate}.
+     */
+
+    public static class Builder extends AggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<ScriptedMetricAggregate> {
+        private JsonData value;
+
+        /**
+         * Required - API name: {@code value}
+         */
+        public final Builder value(JsonData value) {
+            this.value = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ScriptedMetricAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ScriptedMetricAggregate build() {
+            _checkSingleUse();
+
+            return new ScriptedMetricAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ScriptedMetricAggregate}
+     */
+    public static final JsonpDeserializer<ScriptedMetricAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ScriptedMetricAggregate::setupScriptedMetricAggregateDeserializer
+    );
+
+    protected static void setupScriptedMetricAggregateDeserializer(ObjectDeserializer<ScriptedMetricAggregate.Builder> op) {
+        setupAggregateBaseDeserializer(op);
+        op.add(Builder::value, JsonData._DESERIALIZER, "value");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ScriptedMetricAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ScriptedMetricAggregation.java
index 4256e4909a..0e4adc192d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ScriptedMetricAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ScriptedMetricAggregation.java
@@ -32,279 +32,277 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.ScriptedMetricAggregation
 
-
 @JsonpDeserializable
 public class ScriptedMetricAggregation extends MetricAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Script combineScript;
-
-	@Nullable
-	private final Script initScript;
-
-	@Nullable
-	private final Script mapScript;
-
-	private final Map<String, JsonData> params;
-
-	@Nullable
-	private final Script reduceScript;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ScriptedMetricAggregation(Builder builder) {
-		super(builder);
-
-		this.combineScript = builder.combineScript;
-		this.initScript = builder.initScript;
-		this.mapScript = builder.mapScript;
-		this.params = ApiTypeHelper.unmodifiable(builder.params);
-		this.reduceScript = builder.reduceScript;
-
-	}
-
-	public static ScriptedMetricAggregation of(Function<Builder, ObjectBuilder<ScriptedMetricAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.ScriptedMetric;
-	}
-
-	/**
-	 * API name: {@code combine_script}
-	 */
-	@Nullable
-	public final Script combineScript() {
-		return this.combineScript;
-	}
-
-	/**
-	 * API name: {@code init_script}
-	 */
-	@Nullable
-	public final Script initScript() {
-		return this.initScript;
-	}
-
-	/**
-	 * API name: {@code map_script}
-	 */
-	@Nullable
-	public final Script mapScript() {
-		return this.mapScript;
-	}
-
-	/**
-	 * API name: {@code params}
-	 */
-	public final Map<String, JsonData> params() {
-		return this.params;
-	}
-
-	/**
-	 * API name: {@code reduce_script}
-	 */
-	@Nullable
-	public final Script reduceScript() {
-		return this.reduceScript;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.combineScript != null) {
-			generator.writeKey("combine_script");
-			this.combineScript.serialize(generator, mapper);
-
-		}
-		if (this.initScript != null) {
-			generator.writeKey("init_script");
-			this.initScript.serialize(generator, mapper);
-
-		}
-		if (this.mapScript != null) {
-			generator.writeKey("map_script");
-			this.mapScript.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.params)) {
-			generator.writeKey("params");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.reduceScript != null) {
-			generator.writeKey("reduce_script");
-			this.reduceScript.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ScriptedMetricAggregation}.
-	 */
-
-	public static class Builder extends MetricAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ScriptedMetricAggregation> {
-		@Nullable
-		private Script combineScript;
-
-		@Nullable
-		private Script initScript;
-
-		@Nullable
-		private Script mapScript;
-
-		@Nullable
-		private Map<String, JsonData> params;
-
-		@Nullable
-		private Script reduceScript;
-
-		/**
-		 * API name: {@code combine_script}
-		 */
-		public final Builder combineScript(@Nullable Script value) {
-			this.combineScript = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code combine_script}
-		 */
-		public final Builder combineScript(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.combineScript(fn.apply(new Script.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code init_script}
-		 */
-		public final Builder initScript(@Nullable Script value) {
-			this.initScript = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code init_script}
-		 */
-		public final Builder initScript(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.initScript(fn.apply(new Script.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code map_script}
-		 */
-		public final Builder mapScript(@Nullable Script value) {
-			this.mapScript = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code map_script}
-		 */
-		public final Builder mapScript(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.mapScript(fn.apply(new Script.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code params}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>params</code>.
-		 */
-		public final Builder params(Map<String, JsonData> map) {
-			this.params = _mapPutAll(this.params, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code params}
-		 * <p>
-		 * Adds an entry to <code>params</code>.
-		 */
-		public final Builder params(String key, JsonData value) {
-			this.params = _mapPut(this.params, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code reduce_script}
-		 */
-		public final Builder reduceScript(@Nullable Script value) {
-			this.reduceScript = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code reduce_script}
-		 */
-		public final Builder reduceScript(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.reduceScript(fn.apply(new Script.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ScriptedMetricAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ScriptedMetricAggregation build() {
-			_checkSingleUse();
-
-			return new ScriptedMetricAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ScriptedMetricAggregation}
-	 */
-	public static final JsonpDeserializer<ScriptedMetricAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ScriptedMetricAggregation::setupScriptedMetricAggregationDeserializer);
-
-	protected static void setupScriptedMetricAggregationDeserializer(
-			ObjectDeserializer<ScriptedMetricAggregation.Builder> op) {
-		MetricAggregationBase.setupMetricAggregationBaseDeserializer(op);
-		op.add(Builder::combineScript, Script._DESERIALIZER, "combine_script");
-		op.add(Builder::initScript, Script._DESERIALIZER, "init_script");
-		op.add(Builder::mapScript, Script._DESERIALIZER, "map_script");
-		op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
-		op.add(Builder::reduceScript, Script._DESERIALIZER, "reduce_script");
-
-	}
+    @Nullable
+    private final Script combineScript;
+
+    @Nullable
+    private final Script initScript;
+
+    @Nullable
+    private final Script mapScript;
+
+    private final Map<String, JsonData> params;
+
+    @Nullable
+    private final Script reduceScript;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ScriptedMetricAggregation(Builder builder) {
+        super(builder);
+
+        this.combineScript = builder.combineScript;
+        this.initScript = builder.initScript;
+        this.mapScript = builder.mapScript;
+        this.params = ApiTypeHelper.unmodifiable(builder.params);
+        this.reduceScript = builder.reduceScript;
+
+    }
+
+    public static ScriptedMetricAggregation of(Function<Builder, ObjectBuilder<ScriptedMetricAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.ScriptedMetric;
+    }
+
+    /**
+     * API name: {@code combine_script}
+     */
+    @Nullable
+    public final Script combineScript() {
+        return this.combineScript;
+    }
+
+    /**
+     * API name: {@code init_script}
+     */
+    @Nullable
+    public final Script initScript() {
+        return this.initScript;
+    }
+
+    /**
+     * API name: {@code map_script}
+     */
+    @Nullable
+    public final Script mapScript() {
+        return this.mapScript;
+    }
+
+    /**
+     * API name: {@code params}
+     */
+    public final Map<String, JsonData> params() {
+        return this.params;
+    }
+
+    /**
+     * API name: {@code reduce_script}
+     */
+    @Nullable
+    public final Script reduceScript() {
+        return this.reduceScript;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.combineScript != null) {
+            generator.writeKey("combine_script");
+            this.combineScript.serialize(generator, mapper);
+
+        }
+        if (this.initScript != null) {
+            generator.writeKey("init_script");
+            this.initScript.serialize(generator, mapper);
+
+        }
+        if (this.mapScript != null) {
+            generator.writeKey("map_script");
+            this.mapScript.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.params)) {
+            generator.writeKey("params");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.reduceScript != null) {
+            generator.writeKey("reduce_script");
+            this.reduceScript.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ScriptedMetricAggregation}.
+     */
+
+    public static class Builder extends MetricAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<ScriptedMetricAggregation> {
+        @Nullable
+        private Script combineScript;
+
+        @Nullable
+        private Script initScript;
+
+        @Nullable
+        private Script mapScript;
+
+        @Nullable
+        private Map<String, JsonData> params;
+
+        @Nullable
+        private Script reduceScript;
+
+        /**
+         * API name: {@code combine_script}
+         */
+        public final Builder combineScript(@Nullable Script value) {
+            this.combineScript = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code combine_script}
+         */
+        public final Builder combineScript(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.combineScript(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * API name: {@code init_script}
+         */
+        public final Builder initScript(@Nullable Script value) {
+            this.initScript = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code init_script}
+         */
+        public final Builder initScript(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.initScript(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * API name: {@code map_script}
+         */
+        public final Builder mapScript(@Nullable Script value) {
+            this.mapScript = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code map_script}
+         */
+        public final Builder mapScript(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.mapScript(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * API name: {@code params}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>params</code>.
+         */
+        public final Builder params(Map<String, JsonData> map) {
+            this.params = _mapPutAll(this.params, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code params}
+         * <p>
+         * Adds an entry to <code>params</code>.
+         */
+        public final Builder params(String key, JsonData value) {
+            this.params = _mapPut(this.params, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code reduce_script}
+         */
+        public final Builder reduceScript(@Nullable Script value) {
+            this.reduceScript = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code reduce_script}
+         */
+        public final Builder reduceScript(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.reduceScript(fn.apply(new Script.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ScriptedMetricAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ScriptedMetricAggregation build() {
+            _checkSingleUse();
+
+            return new ScriptedMetricAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ScriptedMetricAggregation}
+     */
+    public static final JsonpDeserializer<ScriptedMetricAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ScriptedMetricAggregation::setupScriptedMetricAggregationDeserializer
+    );
+
+    protected static void setupScriptedMetricAggregationDeserializer(ObjectDeserializer<ScriptedMetricAggregation.Builder> op) {
+        MetricAggregationBase.setupMetricAggregationBaseDeserializer(op);
+        op.add(Builder::combineScript, Script._DESERIALIZER, "combine_script");
+        op.add(Builder::initScript, Script._DESERIALIZER, "init_script");
+        op.add(Builder::mapScript, Script._DESERIALIZER, "map_script");
+        op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
+        op.add(Builder::reduceScript, Script._DESERIALIZER, "reduce_script");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SerialDifferencingAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SerialDifferencingAggregation.java
index 8d773826ca..2e68643910 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SerialDifferencingAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SerialDifferencingAggregation.java
@@ -32,115 +32,115 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.SerialDifferencingAggregation
 
-
 @JsonpDeserializable
 public class SerialDifferencingAggregation extends PipelineAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Integer lag;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SerialDifferencingAggregation(Builder builder) {
-		super(builder);
-
-		this.lag = builder.lag;
-
-	}
-
-	public static SerialDifferencingAggregation of(Function<Builder, ObjectBuilder<SerialDifferencingAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.SerialDiff;
-	}
-
-	/**
-	 * API name: {@code lag}
-	 */
-	@Nullable
-	public final Integer lag() {
-		return this.lag;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.lag != null) {
-			generator.writeKey("lag");
-			generator.write(this.lag);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SerialDifferencingAggregation}.
-	 */
-
-	public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SerialDifferencingAggregation> {
-		@Nullable
-		private Integer lag;
-
-		/**
-		 * API name: {@code lag}
-		 */
-		public final Builder lag(@Nullable Integer value) {
-			this.lag = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SerialDifferencingAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SerialDifferencingAggregation build() {
-			_checkSingleUse();
-
-			return new SerialDifferencingAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SerialDifferencingAggregation}
-	 */
-	public static final JsonpDeserializer<SerialDifferencingAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SerialDifferencingAggregation::setupSerialDifferencingAggregationDeserializer);
-
-	protected static void setupSerialDifferencingAggregationDeserializer(
-			ObjectDeserializer<SerialDifferencingAggregation.Builder> op) {
-		setupPipelineAggregationBaseDeserializer(op);
-		op.add(Builder::lag, JsonpDeserializer.integerDeserializer(), "lag");
-
-	}
+    @Nullable
+    private final Integer lag;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SerialDifferencingAggregation(Builder builder) {
+        super(builder);
+
+        this.lag = builder.lag;
+
+    }
+
+    public static SerialDifferencingAggregation of(Function<Builder, ObjectBuilder<SerialDifferencingAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.SerialDiff;
+    }
+
+    /**
+     * API name: {@code lag}
+     */
+    @Nullable
+    public final Integer lag() {
+        return this.lag;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.lag != null) {
+            generator.writeKey("lag");
+            generator.write(this.lag);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SerialDifferencingAggregation}.
+     */
+
+    public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<SerialDifferencingAggregation> {
+        @Nullable
+        private Integer lag;
+
+        /**
+         * API name: {@code lag}
+         */
+        public final Builder lag(@Nullable Integer value) {
+            this.lag = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SerialDifferencingAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SerialDifferencingAggregation build() {
+            _checkSingleUse();
+
+            return new SerialDifferencingAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SerialDifferencingAggregation}
+     */
+    public static final JsonpDeserializer<SerialDifferencingAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SerialDifferencingAggregation::setupSerialDifferencingAggregationDeserializer
+    );
+
+    protected static void setupSerialDifferencingAggregationDeserializer(ObjectDeserializer<SerialDifferencingAggregation.Builder> op) {
+        setupPipelineAggregationBaseDeserializer(op);
+        op.add(Builder::lag, JsonpDeserializer.integerDeserializer(), "lag");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantLongTermsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantLongTermsAggregate.java
index a3489480af..bead9ff701 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantLongTermsAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantLongTermsAggregate.java
@@ -32,81 +32,77 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.SignificantLongTermsAggregate
 
-
 @JsonpDeserializable
-public class SignificantLongTermsAggregate extends MultiBucketAggregateBase<SignificantLongTermsBucket>
-		implements
-			AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private SignificantLongTermsAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static SignificantLongTermsAggregate of(Function<Builder, ObjectBuilder<SignificantLongTermsAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Siglterms;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SignificantLongTermsAggregate}.
-	 */
-
-	public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<SignificantLongTermsBucket, Builder>
-			implements
-				ObjectBuilder<SignificantLongTermsAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SignificantLongTermsAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SignificantLongTermsAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new SignificantLongTermsAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SignificantLongTermsAggregate}
-	 */
-	public static final JsonpDeserializer<SignificantLongTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SignificantLongTermsAggregate::setupSignificantLongTermsAggregateDeserializer);
-
-	protected static void setupSignificantLongTermsAggregateDeserializer(
-			ObjectDeserializer<SignificantLongTermsAggregate.Builder> op) {
-		setupMultiBucketAggregateBaseDeserializer(op,
-				SignificantLongTermsBucket._DESERIALIZER);
-
-	}
+public class SignificantLongTermsAggregate extends MultiBucketAggregateBase<SignificantLongTermsBucket> implements AggregateVariant {
+    // ---------------------------------------------------------------------------------------------
+
+    private SignificantLongTermsAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static SignificantLongTermsAggregate of(Function<Builder, ObjectBuilder<SignificantLongTermsAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Siglterms;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SignificantLongTermsAggregate}.
+     */
+
+    public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<SignificantLongTermsBucket, Builder>
+        implements
+            ObjectBuilder<SignificantLongTermsAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SignificantLongTermsAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SignificantLongTermsAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new SignificantLongTermsAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SignificantLongTermsAggregate}
+     */
+    public static final JsonpDeserializer<SignificantLongTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SignificantLongTermsAggregate::setupSignificantLongTermsAggregateDeserializer
+    );
+
+    protected static void setupSignificantLongTermsAggregateDeserializer(ObjectDeserializer<SignificantLongTermsAggregate.Builder> op) {
+        setupMultiBucketAggregateBaseDeserializer(op, SignificantLongTermsBucket._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantLongTermsBucket.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantLongTermsBucket.java
index 38b485c699..469c7dc4b2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantLongTermsBucket.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantLongTermsBucket.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,125 +42,122 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.SignificantLongTermsBucket
 
-
 @JsonpDeserializable
 public class SignificantLongTermsBucket extends SignificantTermsBucketBase {
-	private final long key;
-
-	@Nullable
-	private final String keyAsString;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SignificantLongTermsBucket(Builder builder) {
-		super(builder);
-
-		this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
-		this.keyAsString = builder.keyAsString;
-
-	}
-
-	public static SignificantLongTermsBucket of(Function<Builder, ObjectBuilder<SignificantLongTermsBucket>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code key}
-	 */
-	public final long key() {
-		return this.key;
-	}
-
-	/**
-	 * API name: {@code key_as_string}
-	 */
-	@Nullable
-	public final String keyAsString() {
-		return this.keyAsString;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("key");
-		generator.write(this.key);
-
-		if (this.keyAsString != null) {
-			generator.writeKey("key_as_string");
-			generator.write(this.keyAsString);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SignificantLongTermsBucket}.
-	 */
-
-	public static class Builder extends SignificantTermsBucketBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SignificantLongTermsBucket> {
-		private Long key;
-
-		@Nullable
-		private String keyAsString;
-
-		/**
-		 * Required - API name: {@code key}
-		 */
-		public final Builder key(long value) {
-			this.key = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code key_as_string}
-		 */
-		public final Builder keyAsString(@Nullable String value) {
-			this.keyAsString = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SignificantLongTermsBucket}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SignificantLongTermsBucket build() {
-			_checkSingleUse();
-
-			return new SignificantLongTermsBucket(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SignificantLongTermsBucket}
-	 */
-	public static final JsonpDeserializer<SignificantLongTermsBucket> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SignificantLongTermsBucket::setupSignificantLongTermsBucketDeserializer);
-
-	protected static void setupSignificantLongTermsBucketDeserializer(
-			ObjectDeserializer<SignificantLongTermsBucket.Builder> op) {
-		setupSignificantTermsBucketBaseDeserializer(op);
-		op.add(Builder::key, JsonpDeserializer.longDeserializer(), "key");
-		op.add(Builder::keyAsString, JsonpDeserializer.stringDeserializer(), "key_as_string");
-
-	}
+    private final long key;
+
+    @Nullable
+    private final String keyAsString;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SignificantLongTermsBucket(Builder builder) {
+        super(builder);
+
+        this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
+        this.keyAsString = builder.keyAsString;
+
+    }
+
+    public static SignificantLongTermsBucket of(Function<Builder, ObjectBuilder<SignificantLongTermsBucket>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code key}
+     */
+    public final long key() {
+        return this.key;
+    }
+
+    /**
+     * API name: {@code key_as_string}
+     */
+    @Nullable
+    public final String keyAsString() {
+        return this.keyAsString;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("key");
+        generator.write(this.key);
+
+        if (this.keyAsString != null) {
+            generator.writeKey("key_as_string");
+            generator.write(this.keyAsString);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SignificantLongTermsBucket}.
+     */
+
+    public static class Builder extends SignificantTermsBucketBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<SignificantLongTermsBucket> {
+        private Long key;
+
+        @Nullable
+        private String keyAsString;
+
+        /**
+         * Required - API name: {@code key}
+         */
+        public final Builder key(long value) {
+            this.key = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code key_as_string}
+         */
+        public final Builder keyAsString(@Nullable String value) {
+            this.keyAsString = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SignificantLongTermsBucket}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SignificantLongTermsBucket build() {
+            _checkSingleUse();
+
+            return new SignificantLongTermsBucket(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SignificantLongTermsBucket}
+     */
+    public static final JsonpDeserializer<SignificantLongTermsBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SignificantLongTermsBucket::setupSignificantLongTermsBucketDeserializer
+    );
+
+    protected static void setupSignificantLongTermsBucketDeserializer(ObjectDeserializer<SignificantLongTermsBucket.Builder> op) {
+        setupSignificantTermsBucketBaseDeserializer(op);
+        op.add(Builder::key, JsonpDeserializer.longDeserializer(), "key");
+        op.add(Builder::keyAsString, JsonpDeserializer.stringDeserializer(), "key_as_string");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantStringTermsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantStringTermsAggregate.java
index 01227679c7..d1618fd78e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantStringTermsAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantStringTermsAggregate.java
@@ -32,82 +32,77 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.SignificantStringTermsAggregate
 
-
 @JsonpDeserializable
-public class SignificantStringTermsAggregate extends MultiBucketAggregateBase<SignificantStringTermsBucket>
-		implements
-			AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private SignificantStringTermsAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static SignificantStringTermsAggregate of(
-			Function<Builder, ObjectBuilder<SignificantStringTermsAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Sigsterms;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SignificantStringTermsAggregate}.
-	 */
-
-	public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<SignificantStringTermsBucket, Builder>
-			implements
-				ObjectBuilder<SignificantStringTermsAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SignificantStringTermsAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SignificantStringTermsAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new SignificantStringTermsAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SignificantStringTermsAggregate}
-	 */
-	public static final JsonpDeserializer<SignificantStringTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SignificantStringTermsAggregate::setupSignificantStringTermsAggregateDeserializer);
-
-	protected static void setupSignificantStringTermsAggregateDeserializer(
-			ObjectDeserializer<SignificantStringTermsAggregate.Builder> op) {
-		setupMultiBucketAggregateBaseDeserializer(op,
-				SignificantStringTermsBucket._DESERIALIZER);
-
-	}
+public class SignificantStringTermsAggregate extends MultiBucketAggregateBase<SignificantStringTermsBucket> implements AggregateVariant {
+    // ---------------------------------------------------------------------------------------------
+
+    private SignificantStringTermsAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static SignificantStringTermsAggregate of(Function<Builder, ObjectBuilder<SignificantStringTermsAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Sigsterms;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SignificantStringTermsAggregate}.
+     */
+
+    public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<SignificantStringTermsBucket, Builder>
+        implements
+            ObjectBuilder<SignificantStringTermsAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SignificantStringTermsAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SignificantStringTermsAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new SignificantStringTermsAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SignificantStringTermsAggregate}
+     */
+    public static final JsonpDeserializer<SignificantStringTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SignificantStringTermsAggregate::setupSignificantStringTermsAggregateDeserializer
+    );
+
+    protected static void setupSignificantStringTermsAggregateDeserializer(ObjectDeserializer<SignificantStringTermsAggregate.Builder> op) {
+        setupMultiBucketAggregateBaseDeserializer(op, SignificantStringTermsBucket._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantStringTermsBucket.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantStringTermsBucket.java
index 738aff8a16..57311060cd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantStringTermsBucket.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantStringTermsBucket.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,94 +41,92 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.SignificantStringTermsBucket
 
-
 @JsonpDeserializable
 public class SignificantStringTermsBucket extends SignificantTermsBucketBase {
-	private final String key;
+    private final String key;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private SignificantStringTermsBucket(Builder builder) {
-		super(builder);
+    private SignificantStringTermsBucket(Builder builder) {
+        super(builder);
 
-		this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
+        this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
 
-	}
+    }
 
-	public static SignificantStringTermsBucket of(Function<Builder, ObjectBuilder<SignificantStringTermsBucket>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static SignificantStringTermsBucket of(Function<Builder, ObjectBuilder<SignificantStringTermsBucket>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code key}
-	 */
-	public final String key() {
-		return this.key;
-	}
+    /**
+     * Required - API name: {@code key}
+     */
+    public final String key() {
+        return this.key;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("key");
-		generator.write(this.key);
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("key");
+        generator.write(this.key);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link SignificantStringTermsBucket}.
-	 */
+    /**
+     * Builder for {@link SignificantStringTermsBucket}.
+     */
 
-	public static class Builder extends SignificantTermsBucketBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SignificantStringTermsBucket> {
-		private String key;
+    public static class Builder extends SignificantTermsBucketBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<SignificantStringTermsBucket> {
+        private String key;
 
-		/**
-		 * Required - API name: {@code key}
-		 */
-		public final Builder key(String value) {
-			this.key = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code key}
+         */
+        public final Builder key(String value) {
+            this.key = value;
+            return this;
+        }
 
-		@Override
-		protected Builder self() {
-			return this;
-		}
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link SignificantStringTermsBucket}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SignificantStringTermsBucket build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link SignificantStringTermsBucket}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SignificantStringTermsBucket build() {
+            _checkSingleUse();
 
-			return new SignificantStringTermsBucket(this);
-		}
-	}
+            return new SignificantStringTermsBucket(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link SignificantStringTermsBucket}
-	 */
-	public static final JsonpDeserializer<SignificantStringTermsBucket> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SignificantStringTermsBucket::setupSignificantStringTermsBucketDeserializer);
+    /**
+     * Json deserializer for {@link SignificantStringTermsBucket}
+     */
+    public static final JsonpDeserializer<SignificantStringTermsBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SignificantStringTermsBucket::setupSignificantStringTermsBucketDeserializer
+    );
 
-	protected static void setupSignificantStringTermsBucketDeserializer(
-			ObjectDeserializer<SignificantStringTermsBucket.Builder> op) {
-		setupSignificantTermsBucketBaseDeserializer(op);
-		op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
+    protected static void setupSignificantStringTermsBucketDeserializer(ObjectDeserializer<SignificantStringTermsBucket.Builder> op) {
+        setupSignificantTermsBucketBaseDeserializer(op);
+        op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantTermsAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantTermsAggregation.java
index 803175b794..c12ae7aa05 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantTermsAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantTermsAggregation.java
@@ -32,562 +32,558 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.SignificantTermsAggregation
 
-
 @JsonpDeserializable
 public class SignificantTermsAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Query backgroundFilter;
-
-	@Nullable
-	private final ChiSquareHeuristic chiSquare;
-
-	@Nullable
-	private final TermsExclude exclude;
-
-	@Nullable
-	private final TermsAggregationExecutionHint executionHint;
-
-	@Nullable
-	private final String field;
-
-	@Nullable
-	private final GoogleNormalizedDistanceHeuristic gnd;
-
-	private final List<String> include;
-
-	@Nullable
-	private final Long minDocCount;
-
-	@Nullable
-	private final MutualInformationHeuristic mutualInformation;
-
-	@Nullable
-	private final PercentageScoreHeuristic percentage;
-
-	@Nullable
-	private final ScriptedHeuristic scriptHeuristic;
-
-	@Nullable
-	private final Long shardMinDocCount;
-
-	@Nullable
-	private final Integer shardSize;
-
-	@Nullable
-	private final Integer size;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SignificantTermsAggregation(Builder builder) {
-		super(builder);
-
-		this.backgroundFilter = builder.backgroundFilter;
-		this.chiSquare = builder.chiSquare;
-		this.exclude = builder.exclude;
-		this.executionHint = builder.executionHint;
-		this.field = builder.field;
-		this.gnd = builder.gnd;
-		this.include = ApiTypeHelper.unmodifiable(builder.include);
-		this.minDocCount = builder.minDocCount;
-		this.mutualInformation = builder.mutualInformation;
-		this.percentage = builder.percentage;
-		this.scriptHeuristic = builder.scriptHeuristic;
-		this.shardMinDocCount = builder.shardMinDocCount;
-		this.shardSize = builder.shardSize;
-		this.size = builder.size;
-
-	}
-
-	public static SignificantTermsAggregation of(Function<Builder, ObjectBuilder<SignificantTermsAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.SignificantTerms;
-	}
-
-	/**
-	 * API name: {@code background_filter}
-	 */
-	@Nullable
-	public final Query backgroundFilter() {
-		return this.backgroundFilter;
-	}
-
-	/**
-	 * API name: {@code chi_square}
-	 */
-	@Nullable
-	public final ChiSquareHeuristic chiSquare() {
-		return this.chiSquare;
-	}
-
-	/**
-	 * API name: {@code exclude}
-	 */
-	@Nullable
-	public final TermsExclude exclude() {
-		return this.exclude;
-	}
-
-	/**
-	 * API name: {@code execution_hint}
-	 */
-	@Nullable
-	public final TermsAggregationExecutionHint executionHint() {
-		return this.executionHint;
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code gnd}
-	 */
-	@Nullable
-	public final GoogleNormalizedDistanceHeuristic gnd() {
-		return this.gnd;
-	}
-
-	/**
-	 * API name: {@code include}
-	 */
-	public final List<String> include() {
-		return this.include;
-	}
-
-	/**
-	 * API name: {@code min_doc_count}
-	 */
-	@Nullable
-	public final Long minDocCount() {
-		return this.minDocCount;
-	}
-
-	/**
-	 * API name: {@code mutual_information}
-	 */
-	@Nullable
-	public final MutualInformationHeuristic mutualInformation() {
-		return this.mutualInformation;
-	}
-
-	/**
-	 * API name: {@code percentage}
-	 */
-	@Nullable
-	public final PercentageScoreHeuristic percentage() {
-		return this.percentage;
-	}
-
-	/**
-	 * API name: {@code script_heuristic}
-	 */
-	@Nullable
-	public final ScriptedHeuristic scriptHeuristic() {
-		return this.scriptHeuristic;
-	}
-
-	/**
-	 * API name: {@code shard_min_doc_count}
-	 */
-	@Nullable
-	public final Long shardMinDocCount() {
-		return this.shardMinDocCount;
-	}
-
-	/**
-	 * API name: {@code shard_size}
-	 */
-	@Nullable
-	public final Integer shardSize() {
-		return this.shardSize;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.backgroundFilter != null) {
-			generator.writeKey("background_filter");
-			this.backgroundFilter.serialize(generator, mapper);
-
-		}
-		if (this.chiSquare != null) {
-			generator.writeKey("chi_square");
-			this.chiSquare.serialize(generator, mapper);
-
-		}
-		if (this.exclude != null) {
-			generator.writeKey("exclude");
-			this.exclude.serialize(generator, mapper);
-
-		}
-		if (this.executionHint != null) {
-			generator.writeKey("execution_hint");
-			this.executionHint.serialize(generator, mapper);
-		}
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (this.gnd != null) {
-			generator.writeKey("gnd");
-			this.gnd.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.include)) {
-			generator.writeKey("include");
-			generator.writeStartArray();
-			for (String item0 : this.include) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.minDocCount != null) {
-			generator.writeKey("min_doc_count");
-			generator.write(this.minDocCount);
-
-		}
-		if (this.mutualInformation != null) {
-			generator.writeKey("mutual_information");
-			this.mutualInformation.serialize(generator, mapper);
-
-		}
-		if (this.percentage != null) {
-			generator.writeKey("percentage");
-			this.percentage.serialize(generator, mapper);
-
-		}
-		if (this.scriptHeuristic != null) {
-			generator.writeKey("script_heuristic");
-			this.scriptHeuristic.serialize(generator, mapper);
-
-		}
-		if (this.shardMinDocCount != null) {
-			generator.writeKey("shard_min_doc_count");
-			generator.write(this.shardMinDocCount);
-
-		}
-		if (this.shardSize != null) {
-			generator.writeKey("shard_size");
-			generator.write(this.shardSize);
-
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SignificantTermsAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SignificantTermsAggregation> {
-		@Nullable
-		private Query backgroundFilter;
-
-		@Nullable
-		private ChiSquareHeuristic chiSquare;
-
-		@Nullable
-		private TermsExclude exclude;
-
-		@Nullable
-		private TermsAggregationExecutionHint executionHint;
-
-		@Nullable
-		private String field;
-
-		@Nullable
-		private GoogleNormalizedDistanceHeuristic gnd;
-
-		@Nullable
-		private List<String> include;
-
-		@Nullable
-		private Long minDocCount;
-
-		@Nullable
-		private MutualInformationHeuristic mutualInformation;
-
-		@Nullable
-		private PercentageScoreHeuristic percentage;
-
-		@Nullable
-		private ScriptedHeuristic scriptHeuristic;
-
-		@Nullable
-		private Long shardMinDocCount;
-
-		@Nullable
-		private Integer shardSize;
-
-		@Nullable
-		private Integer size;
-
-		/**
-		 * API name: {@code background_filter}
-		 */
-		public final Builder backgroundFilter(@Nullable Query value) {
-			this.backgroundFilter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code background_filter}
-		 */
-		public final Builder backgroundFilter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.backgroundFilter(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code chi_square}
-		 */
-		public final Builder chiSquare(@Nullable ChiSquareHeuristic value) {
-			this.chiSquare = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code chi_square}
-		 */
-		public final Builder chiSquare(Function<ChiSquareHeuristic.Builder, ObjectBuilder<ChiSquareHeuristic>> fn) {
-			return this.chiSquare(fn.apply(new ChiSquareHeuristic.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code exclude}
-		 */
-		public final Builder exclude(@Nullable TermsExclude value) {
-			this.exclude = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code exclude}
-		 */
-		public final Builder exclude(Function<TermsExclude.Builder, ObjectBuilder<TermsExclude>> fn) {
-			return this.exclude(fn.apply(new TermsExclude.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code execution_hint}
-		 */
-		public final Builder executionHint(@Nullable TermsAggregationExecutionHint value) {
-			this.executionHint = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code gnd}
-		 */
-		public final Builder gnd(@Nullable GoogleNormalizedDistanceHeuristic value) {
-			this.gnd = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code gnd}
-		 */
-		public final Builder gnd(
-				Function<GoogleNormalizedDistanceHeuristic.Builder, ObjectBuilder<GoogleNormalizedDistanceHeuristic>> fn) {
-			return this.gnd(fn.apply(new GoogleNormalizedDistanceHeuristic.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code include}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>include</code>.
-		 */
-		public final Builder include(List<String> list) {
-			this.include = _listAddAll(this.include, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code include}
-		 * <p>
-		 * Adds one or more values to <code>include</code>.
-		 */
-		public final Builder include(String value, String... values) {
-			this.include = _listAdd(this.include, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_doc_count}
-		 */
-		public final Builder minDocCount(@Nullable Long value) {
-			this.minDocCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mutual_information}
-		 */
-		public final Builder mutualInformation(@Nullable MutualInformationHeuristic value) {
-			this.mutualInformation = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mutual_information}
-		 */
-		public final Builder mutualInformation(
-				Function<MutualInformationHeuristic.Builder, ObjectBuilder<MutualInformationHeuristic>> fn) {
-			return this.mutualInformation(fn.apply(new MutualInformationHeuristic.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code percentage}
-		 */
-		public final Builder percentage(@Nullable PercentageScoreHeuristic value) {
-			this.percentage = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code percentage}
-		 */
-		public final Builder percentage(
-				Function<PercentageScoreHeuristic.Builder, ObjectBuilder<PercentageScoreHeuristic>> fn) {
-			return this.percentage(fn.apply(new PercentageScoreHeuristic.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code script_heuristic}
-		 */
-		public final Builder scriptHeuristic(@Nullable ScriptedHeuristic value) {
-			this.scriptHeuristic = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script_heuristic}
-		 */
-		public final Builder scriptHeuristic(Function<ScriptedHeuristic.Builder, ObjectBuilder<ScriptedHeuristic>> fn) {
-			return this.scriptHeuristic(fn.apply(new ScriptedHeuristic.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code shard_min_doc_count}
-		 */
-		public final Builder shardMinDocCount(@Nullable Long value) {
-			this.shardMinDocCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code shard_size}
-		 */
-		public final Builder shardSize(@Nullable Integer value) {
-			this.shardSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Integer value) {
-			this.size = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SignificantTermsAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SignificantTermsAggregation build() {
-			_checkSingleUse();
-
-			return new SignificantTermsAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SignificantTermsAggregation}
-	 */
-	public static final JsonpDeserializer<SignificantTermsAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SignificantTermsAggregation::setupSignificantTermsAggregationDeserializer);
-
-	protected static void setupSignificantTermsAggregationDeserializer(
-			ObjectDeserializer<SignificantTermsAggregation.Builder> op) {
-		BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::backgroundFilter, Query._DESERIALIZER, "background_filter");
-		op.add(Builder::chiSquare, ChiSquareHeuristic._DESERIALIZER, "chi_square");
-		op.add(Builder::exclude, TermsExclude._DESERIALIZER, "exclude");
-		op.add(Builder::executionHint, TermsAggregationExecutionHint._DESERIALIZER, "execution_hint");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::gnd, GoogleNormalizedDistanceHeuristic._DESERIALIZER, "gnd");
-		op.add(Builder::include, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"include");
-		op.add(Builder::minDocCount, JsonpDeserializer.longDeserializer(), "min_doc_count");
-		op.add(Builder::mutualInformation, MutualInformationHeuristic._DESERIALIZER, "mutual_information");
-		op.add(Builder::percentage, PercentageScoreHeuristic._DESERIALIZER, "percentage");
-		op.add(Builder::scriptHeuristic, ScriptedHeuristic._DESERIALIZER, "script_heuristic");
-		op.add(Builder::shardMinDocCount, JsonpDeserializer.longDeserializer(), "shard_min_doc_count");
-		op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
-		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
-
-	}
+    @Nullable
+    private final Query backgroundFilter;
+
+    @Nullable
+    private final ChiSquareHeuristic chiSquare;
+
+    @Nullable
+    private final TermsExclude exclude;
+
+    @Nullable
+    private final TermsAggregationExecutionHint executionHint;
+
+    @Nullable
+    private final String field;
+
+    @Nullable
+    private final GoogleNormalizedDistanceHeuristic gnd;
+
+    private final List<String> include;
+
+    @Nullable
+    private final Long minDocCount;
+
+    @Nullable
+    private final MutualInformationHeuristic mutualInformation;
+
+    @Nullable
+    private final PercentageScoreHeuristic percentage;
+
+    @Nullable
+    private final ScriptedHeuristic scriptHeuristic;
+
+    @Nullable
+    private final Long shardMinDocCount;
+
+    @Nullable
+    private final Integer shardSize;
+
+    @Nullable
+    private final Integer size;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SignificantTermsAggregation(Builder builder) {
+        super(builder);
+
+        this.backgroundFilter = builder.backgroundFilter;
+        this.chiSquare = builder.chiSquare;
+        this.exclude = builder.exclude;
+        this.executionHint = builder.executionHint;
+        this.field = builder.field;
+        this.gnd = builder.gnd;
+        this.include = ApiTypeHelper.unmodifiable(builder.include);
+        this.minDocCount = builder.minDocCount;
+        this.mutualInformation = builder.mutualInformation;
+        this.percentage = builder.percentage;
+        this.scriptHeuristic = builder.scriptHeuristic;
+        this.shardMinDocCount = builder.shardMinDocCount;
+        this.shardSize = builder.shardSize;
+        this.size = builder.size;
+
+    }
+
+    public static SignificantTermsAggregation of(Function<Builder, ObjectBuilder<SignificantTermsAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.SignificantTerms;
+    }
+
+    /**
+     * API name: {@code background_filter}
+     */
+    @Nullable
+    public final Query backgroundFilter() {
+        return this.backgroundFilter;
+    }
+
+    /**
+     * API name: {@code chi_square}
+     */
+    @Nullable
+    public final ChiSquareHeuristic chiSquare() {
+        return this.chiSquare;
+    }
+
+    /**
+     * API name: {@code exclude}
+     */
+    @Nullable
+    public final TermsExclude exclude() {
+        return this.exclude;
+    }
+
+    /**
+     * API name: {@code execution_hint}
+     */
+    @Nullable
+    public final TermsAggregationExecutionHint executionHint() {
+        return this.executionHint;
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code gnd}
+     */
+    @Nullable
+    public final GoogleNormalizedDistanceHeuristic gnd() {
+        return this.gnd;
+    }
+
+    /**
+     * API name: {@code include}
+     */
+    public final List<String> include() {
+        return this.include;
+    }
+
+    /**
+     * API name: {@code min_doc_count}
+     */
+    @Nullable
+    public final Long minDocCount() {
+        return this.minDocCount;
+    }
+
+    /**
+     * API name: {@code mutual_information}
+     */
+    @Nullable
+    public final MutualInformationHeuristic mutualInformation() {
+        return this.mutualInformation;
+    }
+
+    /**
+     * API name: {@code percentage}
+     */
+    @Nullable
+    public final PercentageScoreHeuristic percentage() {
+        return this.percentage;
+    }
+
+    /**
+     * API name: {@code script_heuristic}
+     */
+    @Nullable
+    public final ScriptedHeuristic scriptHeuristic() {
+        return this.scriptHeuristic;
+    }
+
+    /**
+     * API name: {@code shard_min_doc_count}
+     */
+    @Nullable
+    public final Long shardMinDocCount() {
+        return this.shardMinDocCount;
+    }
+
+    /**
+     * API name: {@code shard_size}
+     */
+    @Nullable
+    public final Integer shardSize() {
+        return this.shardSize;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.backgroundFilter != null) {
+            generator.writeKey("background_filter");
+            this.backgroundFilter.serialize(generator, mapper);
+
+        }
+        if (this.chiSquare != null) {
+            generator.writeKey("chi_square");
+            this.chiSquare.serialize(generator, mapper);
+
+        }
+        if (this.exclude != null) {
+            generator.writeKey("exclude");
+            this.exclude.serialize(generator, mapper);
+
+        }
+        if (this.executionHint != null) {
+            generator.writeKey("execution_hint");
+            this.executionHint.serialize(generator, mapper);
+        }
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (this.gnd != null) {
+            generator.writeKey("gnd");
+            this.gnd.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.include)) {
+            generator.writeKey("include");
+            generator.writeStartArray();
+            for (String item0 : this.include) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.minDocCount != null) {
+            generator.writeKey("min_doc_count");
+            generator.write(this.minDocCount);
+
+        }
+        if (this.mutualInformation != null) {
+            generator.writeKey("mutual_information");
+            this.mutualInformation.serialize(generator, mapper);
+
+        }
+        if (this.percentage != null) {
+            generator.writeKey("percentage");
+            this.percentage.serialize(generator, mapper);
+
+        }
+        if (this.scriptHeuristic != null) {
+            generator.writeKey("script_heuristic");
+            this.scriptHeuristic.serialize(generator, mapper);
+
+        }
+        if (this.shardMinDocCount != null) {
+            generator.writeKey("shard_min_doc_count");
+            generator.write(this.shardMinDocCount);
+
+        }
+        if (this.shardSize != null) {
+            generator.writeKey("shard_size");
+            generator.write(this.shardSize);
+
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SignificantTermsAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<SignificantTermsAggregation> {
+        @Nullable
+        private Query backgroundFilter;
+
+        @Nullable
+        private ChiSquareHeuristic chiSquare;
+
+        @Nullable
+        private TermsExclude exclude;
+
+        @Nullable
+        private TermsAggregationExecutionHint executionHint;
+
+        @Nullable
+        private String field;
+
+        @Nullable
+        private GoogleNormalizedDistanceHeuristic gnd;
+
+        @Nullable
+        private List<String> include;
+
+        @Nullable
+        private Long minDocCount;
+
+        @Nullable
+        private MutualInformationHeuristic mutualInformation;
+
+        @Nullable
+        private PercentageScoreHeuristic percentage;
+
+        @Nullable
+        private ScriptedHeuristic scriptHeuristic;
+
+        @Nullable
+        private Long shardMinDocCount;
+
+        @Nullable
+        private Integer shardSize;
+
+        @Nullable
+        private Integer size;
+
+        /**
+         * API name: {@code background_filter}
+         */
+        public final Builder backgroundFilter(@Nullable Query value) {
+            this.backgroundFilter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code background_filter}
+         */
+        public final Builder backgroundFilter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.backgroundFilter(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code chi_square}
+         */
+        public final Builder chiSquare(@Nullable ChiSquareHeuristic value) {
+            this.chiSquare = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code chi_square}
+         */
+        public final Builder chiSquare(Function<ChiSquareHeuristic.Builder, ObjectBuilder<ChiSquareHeuristic>> fn) {
+            return this.chiSquare(fn.apply(new ChiSquareHeuristic.Builder()).build());
+        }
+
+        /**
+         * API name: {@code exclude}
+         */
+        public final Builder exclude(@Nullable TermsExclude value) {
+            this.exclude = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code exclude}
+         */
+        public final Builder exclude(Function<TermsExclude.Builder, ObjectBuilder<TermsExclude>> fn) {
+            return this.exclude(fn.apply(new TermsExclude.Builder()).build());
+        }
+
+        /**
+         * API name: {@code execution_hint}
+         */
+        public final Builder executionHint(@Nullable TermsAggregationExecutionHint value) {
+            this.executionHint = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code gnd}
+         */
+        public final Builder gnd(@Nullable GoogleNormalizedDistanceHeuristic value) {
+            this.gnd = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code gnd}
+         */
+        public final Builder gnd(Function<GoogleNormalizedDistanceHeuristic.Builder, ObjectBuilder<GoogleNormalizedDistanceHeuristic>> fn) {
+            return this.gnd(fn.apply(new GoogleNormalizedDistanceHeuristic.Builder()).build());
+        }
+
+        /**
+         * API name: {@code include}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>include</code>.
+         */
+        public final Builder include(List<String> list) {
+            this.include = _listAddAll(this.include, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code include}
+         * <p>
+         * Adds one or more values to <code>include</code>.
+         */
+        public final Builder include(String value, String... values) {
+            this.include = _listAdd(this.include, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code min_doc_count}
+         */
+        public final Builder minDocCount(@Nullable Long value) {
+            this.minDocCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mutual_information}
+         */
+        public final Builder mutualInformation(@Nullable MutualInformationHeuristic value) {
+            this.mutualInformation = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mutual_information}
+         */
+        public final Builder mutualInformation(Function<MutualInformationHeuristic.Builder, ObjectBuilder<MutualInformationHeuristic>> fn) {
+            return this.mutualInformation(fn.apply(new MutualInformationHeuristic.Builder()).build());
+        }
+
+        /**
+         * API name: {@code percentage}
+         */
+        public final Builder percentage(@Nullable PercentageScoreHeuristic value) {
+            this.percentage = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code percentage}
+         */
+        public final Builder percentage(Function<PercentageScoreHeuristic.Builder, ObjectBuilder<PercentageScoreHeuristic>> fn) {
+            return this.percentage(fn.apply(new PercentageScoreHeuristic.Builder()).build());
+        }
+
+        /**
+         * API name: {@code script_heuristic}
+         */
+        public final Builder scriptHeuristic(@Nullable ScriptedHeuristic value) {
+            this.scriptHeuristic = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script_heuristic}
+         */
+        public final Builder scriptHeuristic(Function<ScriptedHeuristic.Builder, ObjectBuilder<ScriptedHeuristic>> fn) {
+            return this.scriptHeuristic(fn.apply(new ScriptedHeuristic.Builder()).build());
+        }
+
+        /**
+         * API name: {@code shard_min_doc_count}
+         */
+        public final Builder shardMinDocCount(@Nullable Long value) {
+            this.shardMinDocCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code shard_size}
+         */
+        public final Builder shardSize(@Nullable Integer value) {
+            this.shardSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Integer value) {
+            this.size = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SignificantTermsAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SignificantTermsAggregation build() {
+            _checkSingleUse();
+
+            return new SignificantTermsAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SignificantTermsAggregation}
+     */
+    public static final JsonpDeserializer<SignificantTermsAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SignificantTermsAggregation::setupSignificantTermsAggregationDeserializer
+    );
+
+    protected static void setupSignificantTermsAggregationDeserializer(ObjectDeserializer<SignificantTermsAggregation.Builder> op) {
+        BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::backgroundFilter, Query._DESERIALIZER, "background_filter");
+        op.add(Builder::chiSquare, ChiSquareHeuristic._DESERIALIZER, "chi_square");
+        op.add(Builder::exclude, TermsExclude._DESERIALIZER, "exclude");
+        op.add(Builder::executionHint, TermsAggregationExecutionHint._DESERIALIZER, "execution_hint");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::gnd, GoogleNormalizedDistanceHeuristic._DESERIALIZER, "gnd");
+        op.add(Builder::include, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "include");
+        op.add(Builder::minDocCount, JsonpDeserializer.longDeserializer(), "min_doc_count");
+        op.add(Builder::mutualInformation, MutualInformationHeuristic._DESERIALIZER, "mutual_information");
+        op.add(Builder::percentage, PercentageScoreHeuristic._DESERIALIZER, "percentage");
+        op.add(Builder::scriptHeuristic, ScriptedHeuristic._DESERIALIZER, "script_heuristic");
+        op.add(Builder::shardMinDocCount, JsonpDeserializer.longDeserializer(), "shard_min_doc_count");
+        op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
+        op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantTermsBucketBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantTermsBucketBase.java
index c02505bfd1..6c35771eee 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantTermsBucketBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantTermsBucketBase.java
@@ -32,88 +32,86 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
-import jakarta.json.stream.JsonGenerator;
 
 // typedef: _types.aggregations.SignificantTermsBucketBase
 
-
-
 public abstract class SignificantTermsBucketBase extends MultiBucketBase {
-	private final double score;
+    private final double score;
 
-	private final long bgCount;
+    private final long bgCount;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected SignificantTermsBucketBase(AbstractBuilder<?> builder) {
-		super(builder);
+    protected SignificantTermsBucketBase(AbstractBuilder<?> builder) {
+        super(builder);
 
-		this.score = ApiTypeHelper.requireNonNull(builder.score, this, "score");
-		this.bgCount = ApiTypeHelper.requireNonNull(builder.bgCount, this, "bgCount");
+        this.score = ApiTypeHelper.requireNonNull(builder.score, this, "score");
+        this.bgCount = ApiTypeHelper.requireNonNull(builder.bgCount, this, "bgCount");
 
-	}
+    }
 
-	/**
-	 * Required - API name: {@code score}
-	 */
-	public final double score() {
-		return this.score;
-	}
+    /**
+     * Required - API name: {@code score}
+     */
+    public final double score() {
+        return this.score;
+    }
 
-	/**
-	 * Required - API name: {@code bg_count}
-	 */
-	public final long bgCount() {
-		return this.bgCount;
-	}
+    /**
+     * Required - API name: {@code bg_count}
+     */
+    public final long bgCount() {
+        return this.bgCount;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("score");
-		generator.write(this.score);
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("score");
+        generator.write(this.score);
 
-		generator.writeKey("bg_count");
-		generator.write(this.bgCount);
+        generator.writeKey("bg_count");
+        generator.write(this.bgCount);
 
-	}
+    }
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				MultiBucketBase.AbstractBuilder<BuilderT> {
-		private Double score;
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends MultiBucketBase.AbstractBuilder<
+        BuilderT> {
+        private Double score;
 
-		private Long bgCount;
+        private Long bgCount;
 
-		/**
-		 * Required - API name: {@code score}
-		 */
-		public final BuilderT score(double value) {
-			this.score = value;
-			return self();
-		}
+        /**
+         * Required - API name: {@code score}
+         */
+        public final BuilderT score(double value) {
+            this.score = value;
+            return self();
+        }
 
-		/**
-		 * Required - API name: {@code bg_count}
-		 */
-		public final BuilderT bgCount(long value) {
-			this.bgCount = value;
-			return self();
-		}
+        /**
+         * Required - API name: {@code bg_count}
+         */
+        public final BuilderT bgCount(long value) {
+            this.bgCount = value;
+            return self();
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupSignificantTermsBucketBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		setupMultiBucketBaseDeserializer(op);
-		op.add(AbstractBuilder::score, JsonpDeserializer.doubleDeserializer(), "score");
-		op.add(AbstractBuilder::bgCount, JsonpDeserializer.longDeserializer(), "bg_count");
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupSignificantTermsBucketBaseDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
+        setupMultiBucketBaseDeserializer(op);
+        op.add(AbstractBuilder::score, JsonpDeserializer.doubleDeserializer(), "score");
+        op.add(AbstractBuilder::bgCount, JsonpDeserializer.longDeserializer(), "bg_count");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantTextAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantTextAggregation.java
index de2b9e9dba..656c9f5f73 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantTextAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantTextAggregation.java
@@ -32,636 +32,631 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.SignificantTextAggregation
 
-
 @JsonpDeserializable
 public class SignificantTextAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Query backgroundFilter;
-
-	@Nullable
-	private final ChiSquareHeuristic chiSquare;
-
-	@Nullable
-	private final TermsExclude exclude;
-
-	@Nullable
-	private final TermsAggregationExecutionHint executionHint;
-
-	@Nullable
-	private final String field;
-
-	@Nullable
-	private final Boolean filterDuplicateText;
-
-	@Nullable
-	private final GoogleNormalizedDistanceHeuristic gnd;
-
-	private final List<String> include;
-
-	@Nullable
-	private final Long minDocCount;
-
-	@Nullable
-	private final MutualInformationHeuristic mutualInformation;
-
-	@Nullable
-	private final PercentageScoreHeuristic percentage;
-
-	@Nullable
-	private final ScriptedHeuristic scriptHeuristic;
-
-	@Nullable
-	private final Long shardMinDocCount;
-
-	@Nullable
-	private final Integer shardSize;
-
-	@Nullable
-	private final Integer size;
-
-	private final List<String> sourceFields;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SignificantTextAggregation(Builder builder) {
-		super(builder);
-
-		this.backgroundFilter = builder.backgroundFilter;
-		this.chiSquare = builder.chiSquare;
-		this.exclude = builder.exclude;
-		this.executionHint = builder.executionHint;
-		this.field = builder.field;
-		this.filterDuplicateText = builder.filterDuplicateText;
-		this.gnd = builder.gnd;
-		this.include = ApiTypeHelper.unmodifiable(builder.include);
-		this.minDocCount = builder.minDocCount;
-		this.mutualInformation = builder.mutualInformation;
-		this.percentage = builder.percentage;
-		this.scriptHeuristic = builder.scriptHeuristic;
-		this.shardMinDocCount = builder.shardMinDocCount;
-		this.shardSize = builder.shardSize;
-		this.size = builder.size;
-		this.sourceFields = ApiTypeHelper.unmodifiable(builder.sourceFields);
-
-	}
-
-	public static SignificantTextAggregation of(Function<Builder, ObjectBuilder<SignificantTextAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.SignificantText;
-	}
-
-	/**
-	 * API name: {@code background_filter}
-	 */
-	@Nullable
-	public final Query backgroundFilter() {
-		return this.backgroundFilter;
-	}
-
-	/**
-	 * API name: {@code chi_square}
-	 */
-	@Nullable
-	public final ChiSquareHeuristic chiSquare() {
-		return this.chiSquare;
-	}
-
-	/**
-	 * API name: {@code exclude}
-	 */
-	@Nullable
-	public final TermsExclude exclude() {
-		return this.exclude;
-	}
-
-	/**
-	 * API name: {@code execution_hint}
-	 */
-	@Nullable
-	public final TermsAggregationExecutionHint executionHint() {
-		return this.executionHint;
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code filter_duplicate_text}
-	 */
-	@Nullable
-	public final Boolean filterDuplicateText() {
-		return this.filterDuplicateText;
-	}
-
-	/**
-	 * API name: {@code gnd}
-	 */
-	@Nullable
-	public final GoogleNormalizedDistanceHeuristic gnd() {
-		return this.gnd;
-	}
-
-	/**
-	 * API name: {@code include}
-	 */
-	public final List<String> include() {
-		return this.include;
-	}
-
-	/**
-	 * API name: {@code min_doc_count}
-	 */
-	@Nullable
-	public final Long minDocCount() {
-		return this.minDocCount;
-	}
-
-	/**
-	 * API name: {@code mutual_information}
-	 */
-	@Nullable
-	public final MutualInformationHeuristic mutualInformation() {
-		return this.mutualInformation;
-	}
-
-	/**
-	 * API name: {@code percentage}
-	 */
-	@Nullable
-	public final PercentageScoreHeuristic percentage() {
-		return this.percentage;
-	}
-
-	/**
-	 * API name: {@code script_heuristic}
-	 */
-	@Nullable
-	public final ScriptedHeuristic scriptHeuristic() {
-		return this.scriptHeuristic;
-	}
-
-	/**
-	 * API name: {@code shard_min_doc_count}
-	 */
-	@Nullable
-	public final Long shardMinDocCount() {
-		return this.shardMinDocCount;
-	}
-
-	/**
-	 * API name: {@code shard_size}
-	 */
-	@Nullable
-	public final Integer shardSize() {
-		return this.shardSize;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	/**
-	 * API name: {@code source_fields}
-	 */
-	public final List<String> sourceFields() {
-		return this.sourceFields;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.backgroundFilter != null) {
-			generator.writeKey("background_filter");
-			this.backgroundFilter.serialize(generator, mapper);
-
-		}
-		if (this.chiSquare != null) {
-			generator.writeKey("chi_square");
-			this.chiSquare.serialize(generator, mapper);
-
-		}
-		if (this.exclude != null) {
-			generator.writeKey("exclude");
-			this.exclude.serialize(generator, mapper);
-
-		}
-		if (this.executionHint != null) {
-			generator.writeKey("execution_hint");
-			this.executionHint.serialize(generator, mapper);
-		}
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (this.filterDuplicateText != null) {
-			generator.writeKey("filter_duplicate_text");
-			generator.write(this.filterDuplicateText);
-
-		}
-		if (this.gnd != null) {
-			generator.writeKey("gnd");
-			this.gnd.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.include)) {
-			generator.writeKey("include");
-			generator.writeStartArray();
-			for (String item0 : this.include) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.minDocCount != null) {
-			generator.writeKey("min_doc_count");
-			generator.write(this.minDocCount);
-
-		}
-		if (this.mutualInformation != null) {
-			generator.writeKey("mutual_information");
-			this.mutualInformation.serialize(generator, mapper);
-
-		}
-		if (this.percentage != null) {
-			generator.writeKey("percentage");
-			this.percentage.serialize(generator, mapper);
-
-		}
-		if (this.scriptHeuristic != null) {
-			generator.writeKey("script_heuristic");
-			this.scriptHeuristic.serialize(generator, mapper);
-
-		}
-		if (this.shardMinDocCount != null) {
-			generator.writeKey("shard_min_doc_count");
-			generator.write(this.shardMinDocCount);
-
-		}
-		if (this.shardSize != null) {
-			generator.writeKey("shard_size");
-			generator.write(this.shardSize);
-
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		if (ApiTypeHelper.isDefined(this.sourceFields)) {
-			generator.writeKey("source_fields");
-			generator.writeStartArray();
-			for (String item0 : this.sourceFields) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SignificantTextAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SignificantTextAggregation> {
-		@Nullable
-		private Query backgroundFilter;
-
-		@Nullable
-		private ChiSquareHeuristic chiSquare;
-
-		@Nullable
-		private TermsExclude exclude;
-
-		@Nullable
-		private TermsAggregationExecutionHint executionHint;
-
-		@Nullable
-		private String field;
-
-		@Nullable
-		private Boolean filterDuplicateText;
-
-		@Nullable
-		private GoogleNormalizedDistanceHeuristic gnd;
-
-		@Nullable
-		private List<String> include;
-
-		@Nullable
-		private Long minDocCount;
-
-		@Nullable
-		private MutualInformationHeuristic mutualInformation;
-
-		@Nullable
-		private PercentageScoreHeuristic percentage;
-
-		@Nullable
-		private ScriptedHeuristic scriptHeuristic;
-
-		@Nullable
-		private Long shardMinDocCount;
-
-		@Nullable
-		private Integer shardSize;
-
-		@Nullable
-		private Integer size;
-
-		@Nullable
-		private List<String> sourceFields;
-
-		/**
-		 * API name: {@code background_filter}
-		 */
-		public final Builder backgroundFilter(@Nullable Query value) {
-			this.backgroundFilter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code background_filter}
-		 */
-		public final Builder backgroundFilter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.backgroundFilter(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code chi_square}
-		 */
-		public final Builder chiSquare(@Nullable ChiSquareHeuristic value) {
-			this.chiSquare = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code chi_square}
-		 */
-		public final Builder chiSquare(Function<ChiSquareHeuristic.Builder, ObjectBuilder<ChiSquareHeuristic>> fn) {
-			return this.chiSquare(fn.apply(new ChiSquareHeuristic.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code exclude}
-		 */
-		public final Builder exclude(@Nullable TermsExclude value) {
-			this.exclude = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code exclude}
-		 */
-		public final Builder exclude(Function<TermsExclude.Builder, ObjectBuilder<TermsExclude>> fn) {
-			return this.exclude(fn.apply(new TermsExclude.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code execution_hint}
-		 */
-		public final Builder executionHint(@Nullable TermsAggregationExecutionHint value) {
-			this.executionHint = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter_duplicate_text}
-		 */
-		public final Builder filterDuplicateText(@Nullable Boolean value) {
-			this.filterDuplicateText = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code gnd}
-		 */
-		public final Builder gnd(@Nullable GoogleNormalizedDistanceHeuristic value) {
-			this.gnd = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code gnd}
-		 */
-		public final Builder gnd(
-				Function<GoogleNormalizedDistanceHeuristic.Builder, ObjectBuilder<GoogleNormalizedDistanceHeuristic>> fn) {
-			return this.gnd(fn.apply(new GoogleNormalizedDistanceHeuristic.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code include}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>include</code>.
-		 */
-		public final Builder include(List<String> list) {
-			this.include = _listAddAll(this.include, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code include}
-		 * <p>
-		 * Adds one or more values to <code>include</code>.
-		 */
-		public final Builder include(String value, String... values) {
-			this.include = _listAdd(this.include, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_doc_count}
-		 */
-		public final Builder minDocCount(@Nullable Long value) {
-			this.minDocCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mutual_information}
-		 */
-		public final Builder mutualInformation(@Nullable MutualInformationHeuristic value) {
-			this.mutualInformation = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mutual_information}
-		 */
-		public final Builder mutualInformation(
-				Function<MutualInformationHeuristic.Builder, ObjectBuilder<MutualInformationHeuristic>> fn) {
-			return this.mutualInformation(fn.apply(new MutualInformationHeuristic.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code percentage}
-		 */
-		public final Builder percentage(@Nullable PercentageScoreHeuristic value) {
-			this.percentage = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code percentage}
-		 */
-		public final Builder percentage(
-				Function<PercentageScoreHeuristic.Builder, ObjectBuilder<PercentageScoreHeuristic>> fn) {
-			return this.percentage(fn.apply(new PercentageScoreHeuristic.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code script_heuristic}
-		 */
-		public final Builder scriptHeuristic(@Nullable ScriptedHeuristic value) {
-			this.scriptHeuristic = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script_heuristic}
-		 */
-		public final Builder scriptHeuristic(Function<ScriptedHeuristic.Builder, ObjectBuilder<ScriptedHeuristic>> fn) {
-			return this.scriptHeuristic(fn.apply(new ScriptedHeuristic.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code shard_min_doc_count}
-		 */
-		public final Builder shardMinDocCount(@Nullable Long value) {
-			this.shardMinDocCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code shard_size}
-		 */
-		public final Builder shardSize(@Nullable Integer value) {
-			this.shardSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Integer value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code source_fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceFields</code>.
-		 */
-		public final Builder sourceFields(List<String> list) {
-			this.sourceFields = _listAddAll(this.sourceFields, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code source_fields}
-		 * <p>
-		 * Adds one or more values to <code>sourceFields</code>.
-		 */
-		public final Builder sourceFields(String value, String... values) {
-			this.sourceFields = _listAdd(this.sourceFields, value, values);
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SignificantTextAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SignificantTextAggregation build() {
-			_checkSingleUse();
-
-			return new SignificantTextAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SignificantTextAggregation}
-	 */
-	public static final JsonpDeserializer<SignificantTextAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SignificantTextAggregation::setupSignificantTextAggregationDeserializer);
-
-	protected static void setupSignificantTextAggregationDeserializer(
-			ObjectDeserializer<SignificantTextAggregation.Builder> op) {
-		BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::backgroundFilter, Query._DESERIALIZER, "background_filter");
-		op.add(Builder::chiSquare, ChiSquareHeuristic._DESERIALIZER, "chi_square");
-		op.add(Builder::exclude, TermsExclude._DESERIALIZER, "exclude");
-		op.add(Builder::executionHint, TermsAggregationExecutionHint._DESERIALIZER, "execution_hint");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::filterDuplicateText, JsonpDeserializer.booleanDeserializer(), "filter_duplicate_text");
-		op.add(Builder::gnd, GoogleNormalizedDistanceHeuristic._DESERIALIZER, "gnd");
-		op.add(Builder::include, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"include");
-		op.add(Builder::minDocCount, JsonpDeserializer.longDeserializer(), "min_doc_count");
-		op.add(Builder::mutualInformation, MutualInformationHeuristic._DESERIALIZER, "mutual_information");
-		op.add(Builder::percentage, PercentageScoreHeuristic._DESERIALIZER, "percentage");
-		op.add(Builder::scriptHeuristic, ScriptedHeuristic._DESERIALIZER, "script_heuristic");
-		op.add(Builder::shardMinDocCount, JsonpDeserializer.longDeserializer(), "shard_min_doc_count");
-		op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
-		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
-		op.add(Builder::sourceFields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"source_fields");
-
-	}
+    @Nullable
+    private final Query backgroundFilter;
+
+    @Nullable
+    private final ChiSquareHeuristic chiSquare;
+
+    @Nullable
+    private final TermsExclude exclude;
+
+    @Nullable
+    private final TermsAggregationExecutionHint executionHint;
+
+    @Nullable
+    private final String field;
+
+    @Nullable
+    private final Boolean filterDuplicateText;
+
+    @Nullable
+    private final GoogleNormalizedDistanceHeuristic gnd;
+
+    private final List<String> include;
+
+    @Nullable
+    private final Long minDocCount;
+
+    @Nullable
+    private final MutualInformationHeuristic mutualInformation;
+
+    @Nullable
+    private final PercentageScoreHeuristic percentage;
+
+    @Nullable
+    private final ScriptedHeuristic scriptHeuristic;
+
+    @Nullable
+    private final Long shardMinDocCount;
+
+    @Nullable
+    private final Integer shardSize;
+
+    @Nullable
+    private final Integer size;
+
+    private final List<String> sourceFields;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SignificantTextAggregation(Builder builder) {
+        super(builder);
+
+        this.backgroundFilter = builder.backgroundFilter;
+        this.chiSquare = builder.chiSquare;
+        this.exclude = builder.exclude;
+        this.executionHint = builder.executionHint;
+        this.field = builder.field;
+        this.filterDuplicateText = builder.filterDuplicateText;
+        this.gnd = builder.gnd;
+        this.include = ApiTypeHelper.unmodifiable(builder.include);
+        this.minDocCount = builder.minDocCount;
+        this.mutualInformation = builder.mutualInformation;
+        this.percentage = builder.percentage;
+        this.scriptHeuristic = builder.scriptHeuristic;
+        this.shardMinDocCount = builder.shardMinDocCount;
+        this.shardSize = builder.shardSize;
+        this.size = builder.size;
+        this.sourceFields = ApiTypeHelper.unmodifiable(builder.sourceFields);
+
+    }
+
+    public static SignificantTextAggregation of(Function<Builder, ObjectBuilder<SignificantTextAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.SignificantText;
+    }
+
+    /**
+     * API name: {@code background_filter}
+     */
+    @Nullable
+    public final Query backgroundFilter() {
+        return this.backgroundFilter;
+    }
+
+    /**
+     * API name: {@code chi_square}
+     */
+    @Nullable
+    public final ChiSquareHeuristic chiSquare() {
+        return this.chiSquare;
+    }
+
+    /**
+     * API name: {@code exclude}
+     */
+    @Nullable
+    public final TermsExclude exclude() {
+        return this.exclude;
+    }
+
+    /**
+     * API name: {@code execution_hint}
+     */
+    @Nullable
+    public final TermsAggregationExecutionHint executionHint() {
+        return this.executionHint;
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code filter_duplicate_text}
+     */
+    @Nullable
+    public final Boolean filterDuplicateText() {
+        return this.filterDuplicateText;
+    }
+
+    /**
+     * API name: {@code gnd}
+     */
+    @Nullable
+    public final GoogleNormalizedDistanceHeuristic gnd() {
+        return this.gnd;
+    }
+
+    /**
+     * API name: {@code include}
+     */
+    public final List<String> include() {
+        return this.include;
+    }
+
+    /**
+     * API name: {@code min_doc_count}
+     */
+    @Nullable
+    public final Long minDocCount() {
+        return this.minDocCount;
+    }
+
+    /**
+     * API name: {@code mutual_information}
+     */
+    @Nullable
+    public final MutualInformationHeuristic mutualInformation() {
+        return this.mutualInformation;
+    }
+
+    /**
+     * API name: {@code percentage}
+     */
+    @Nullable
+    public final PercentageScoreHeuristic percentage() {
+        return this.percentage;
+    }
+
+    /**
+     * API name: {@code script_heuristic}
+     */
+    @Nullable
+    public final ScriptedHeuristic scriptHeuristic() {
+        return this.scriptHeuristic;
+    }
+
+    /**
+     * API name: {@code shard_min_doc_count}
+     */
+    @Nullable
+    public final Long shardMinDocCount() {
+        return this.shardMinDocCount;
+    }
+
+    /**
+     * API name: {@code shard_size}
+     */
+    @Nullable
+    public final Integer shardSize() {
+        return this.shardSize;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    /**
+     * API name: {@code source_fields}
+     */
+    public final List<String> sourceFields() {
+        return this.sourceFields;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.backgroundFilter != null) {
+            generator.writeKey("background_filter");
+            this.backgroundFilter.serialize(generator, mapper);
+
+        }
+        if (this.chiSquare != null) {
+            generator.writeKey("chi_square");
+            this.chiSquare.serialize(generator, mapper);
+
+        }
+        if (this.exclude != null) {
+            generator.writeKey("exclude");
+            this.exclude.serialize(generator, mapper);
+
+        }
+        if (this.executionHint != null) {
+            generator.writeKey("execution_hint");
+            this.executionHint.serialize(generator, mapper);
+        }
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (this.filterDuplicateText != null) {
+            generator.writeKey("filter_duplicate_text");
+            generator.write(this.filterDuplicateText);
+
+        }
+        if (this.gnd != null) {
+            generator.writeKey("gnd");
+            this.gnd.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.include)) {
+            generator.writeKey("include");
+            generator.writeStartArray();
+            for (String item0 : this.include) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.minDocCount != null) {
+            generator.writeKey("min_doc_count");
+            generator.write(this.minDocCount);
+
+        }
+        if (this.mutualInformation != null) {
+            generator.writeKey("mutual_information");
+            this.mutualInformation.serialize(generator, mapper);
+
+        }
+        if (this.percentage != null) {
+            generator.writeKey("percentage");
+            this.percentage.serialize(generator, mapper);
+
+        }
+        if (this.scriptHeuristic != null) {
+            generator.writeKey("script_heuristic");
+            this.scriptHeuristic.serialize(generator, mapper);
+
+        }
+        if (this.shardMinDocCount != null) {
+            generator.writeKey("shard_min_doc_count");
+            generator.write(this.shardMinDocCount);
+
+        }
+        if (this.shardSize != null) {
+            generator.writeKey("shard_size");
+            generator.write(this.shardSize);
+
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        if (ApiTypeHelper.isDefined(this.sourceFields)) {
+            generator.writeKey("source_fields");
+            generator.writeStartArray();
+            for (String item0 : this.sourceFields) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SignificantTextAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<SignificantTextAggregation> {
+        @Nullable
+        private Query backgroundFilter;
+
+        @Nullable
+        private ChiSquareHeuristic chiSquare;
+
+        @Nullable
+        private TermsExclude exclude;
+
+        @Nullable
+        private TermsAggregationExecutionHint executionHint;
+
+        @Nullable
+        private String field;
+
+        @Nullable
+        private Boolean filterDuplicateText;
+
+        @Nullable
+        private GoogleNormalizedDistanceHeuristic gnd;
+
+        @Nullable
+        private List<String> include;
+
+        @Nullable
+        private Long minDocCount;
+
+        @Nullable
+        private MutualInformationHeuristic mutualInformation;
+
+        @Nullable
+        private PercentageScoreHeuristic percentage;
+
+        @Nullable
+        private ScriptedHeuristic scriptHeuristic;
+
+        @Nullable
+        private Long shardMinDocCount;
+
+        @Nullable
+        private Integer shardSize;
+
+        @Nullable
+        private Integer size;
+
+        @Nullable
+        private List<String> sourceFields;
+
+        /**
+         * API name: {@code background_filter}
+         */
+        public final Builder backgroundFilter(@Nullable Query value) {
+            this.backgroundFilter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code background_filter}
+         */
+        public final Builder backgroundFilter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.backgroundFilter(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code chi_square}
+         */
+        public final Builder chiSquare(@Nullable ChiSquareHeuristic value) {
+            this.chiSquare = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code chi_square}
+         */
+        public final Builder chiSquare(Function<ChiSquareHeuristic.Builder, ObjectBuilder<ChiSquareHeuristic>> fn) {
+            return this.chiSquare(fn.apply(new ChiSquareHeuristic.Builder()).build());
+        }
+
+        /**
+         * API name: {@code exclude}
+         */
+        public final Builder exclude(@Nullable TermsExclude value) {
+            this.exclude = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code exclude}
+         */
+        public final Builder exclude(Function<TermsExclude.Builder, ObjectBuilder<TermsExclude>> fn) {
+            return this.exclude(fn.apply(new TermsExclude.Builder()).build());
+        }
+
+        /**
+         * API name: {@code execution_hint}
+         */
+        public final Builder executionHint(@Nullable TermsAggregationExecutionHint value) {
+            this.executionHint = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code filter_duplicate_text}
+         */
+        public final Builder filterDuplicateText(@Nullable Boolean value) {
+            this.filterDuplicateText = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code gnd}
+         */
+        public final Builder gnd(@Nullable GoogleNormalizedDistanceHeuristic value) {
+            this.gnd = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code gnd}
+         */
+        public final Builder gnd(Function<GoogleNormalizedDistanceHeuristic.Builder, ObjectBuilder<GoogleNormalizedDistanceHeuristic>> fn) {
+            return this.gnd(fn.apply(new GoogleNormalizedDistanceHeuristic.Builder()).build());
+        }
+
+        /**
+         * API name: {@code include}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>include</code>.
+         */
+        public final Builder include(List<String> list) {
+            this.include = _listAddAll(this.include, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code include}
+         * <p>
+         * Adds one or more values to <code>include</code>.
+         */
+        public final Builder include(String value, String... values) {
+            this.include = _listAdd(this.include, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code min_doc_count}
+         */
+        public final Builder minDocCount(@Nullable Long value) {
+            this.minDocCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mutual_information}
+         */
+        public final Builder mutualInformation(@Nullable MutualInformationHeuristic value) {
+            this.mutualInformation = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mutual_information}
+         */
+        public final Builder mutualInformation(Function<MutualInformationHeuristic.Builder, ObjectBuilder<MutualInformationHeuristic>> fn) {
+            return this.mutualInformation(fn.apply(new MutualInformationHeuristic.Builder()).build());
+        }
+
+        /**
+         * API name: {@code percentage}
+         */
+        public final Builder percentage(@Nullable PercentageScoreHeuristic value) {
+            this.percentage = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code percentage}
+         */
+        public final Builder percentage(Function<PercentageScoreHeuristic.Builder, ObjectBuilder<PercentageScoreHeuristic>> fn) {
+            return this.percentage(fn.apply(new PercentageScoreHeuristic.Builder()).build());
+        }
+
+        /**
+         * API name: {@code script_heuristic}
+         */
+        public final Builder scriptHeuristic(@Nullable ScriptedHeuristic value) {
+            this.scriptHeuristic = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script_heuristic}
+         */
+        public final Builder scriptHeuristic(Function<ScriptedHeuristic.Builder, ObjectBuilder<ScriptedHeuristic>> fn) {
+            return this.scriptHeuristic(fn.apply(new ScriptedHeuristic.Builder()).build());
+        }
+
+        /**
+         * API name: {@code shard_min_doc_count}
+         */
+        public final Builder shardMinDocCount(@Nullable Long value) {
+            this.shardMinDocCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code shard_size}
+         */
+        public final Builder shardSize(@Nullable Integer value) {
+            this.shardSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Integer value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code source_fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceFields</code>.
+         */
+        public final Builder sourceFields(List<String> list) {
+            this.sourceFields = _listAddAll(this.sourceFields, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code source_fields}
+         * <p>
+         * Adds one or more values to <code>sourceFields</code>.
+         */
+        public final Builder sourceFields(String value, String... values) {
+            this.sourceFields = _listAdd(this.sourceFields, value, values);
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SignificantTextAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SignificantTextAggregation build() {
+            _checkSingleUse();
+
+            return new SignificantTextAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SignificantTextAggregation}
+     */
+    public static final JsonpDeserializer<SignificantTextAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SignificantTextAggregation::setupSignificantTextAggregationDeserializer
+    );
+
+    protected static void setupSignificantTextAggregationDeserializer(ObjectDeserializer<SignificantTextAggregation.Builder> op) {
+        BucketAggregationBase.setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::backgroundFilter, Query._DESERIALIZER, "background_filter");
+        op.add(Builder::chiSquare, ChiSquareHeuristic._DESERIALIZER, "chi_square");
+        op.add(Builder::exclude, TermsExclude._DESERIALIZER, "exclude");
+        op.add(Builder::executionHint, TermsAggregationExecutionHint._DESERIALIZER, "execution_hint");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::filterDuplicateText, JsonpDeserializer.booleanDeserializer(), "filter_duplicate_text");
+        op.add(Builder::gnd, GoogleNormalizedDistanceHeuristic._DESERIALIZER, "gnd");
+        op.add(Builder::include, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "include");
+        op.add(Builder::minDocCount, JsonpDeserializer.longDeserializer(), "min_doc_count");
+        op.add(Builder::mutualInformation, MutualInformationHeuristic._DESERIALIZER, "mutual_information");
+        op.add(Builder::percentage, PercentageScoreHeuristic._DESERIALIZER, "percentage");
+        op.add(Builder::scriptHeuristic, ScriptedHeuristic._DESERIALIZER, "script_heuristic");
+        op.add(Builder::shardMinDocCount, JsonpDeserializer.longDeserializer(), "shard_min_doc_count");
+        op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
+        op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
+        op.add(Builder::sourceFields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "source_fields");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SimpleMovingAverageAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SimpleMovingAverageAggregation.java
index 915144b6f7..ce868f20c1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SimpleMovingAverageAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SimpleMovingAverageAggregation.java
@@ -32,123 +32,119 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.EmptyObject;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.EmptyObject;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.aggregations.SimpleMovingAverageAggregation
 
-
 @JsonpDeserializable
-public class SimpleMovingAverageAggregation extends MovingAverageAggregationBase
-		implements
-			MovingAverageAggregationVariant {
-	private final EmptyObject settings;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SimpleMovingAverageAggregation(Builder builder) {
-		super(builder);
-
-		this.settings = ApiTypeHelper.requireNonNull(builder.settings, this, "settings");
-
-	}
-
-	public static SimpleMovingAverageAggregation of(
-			Function<Builder, ObjectBuilder<SimpleMovingAverageAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * MovingAverageAggregation variant kind.
-	 */
-	@Override
-	public MovingAverageAggregation.Kind _movingAverageAggregationKind() {
-		return MovingAverageAggregation.Kind.Simple;
-	}
-
-	/**
-	 * Required - API name: {@code settings}
-	 */
-	public final EmptyObject settings() {
-		return this.settings;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("model", "simple");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("settings");
-		this.settings.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SimpleMovingAverageAggregation}.
-	 */
-
-	public static class Builder extends MovingAverageAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SimpleMovingAverageAggregation> {
-		private EmptyObject settings;
-
-		/**
-		 * Required - API name: {@code settings}
-		 */
-		public final Builder settings(EmptyObject value) {
-			this.settings = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code settings}
-		 */
-		public final Builder settings(Function<EmptyObject.Builder, ObjectBuilder<EmptyObject>> fn) {
-			return this.settings(fn.apply(new EmptyObject.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SimpleMovingAverageAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SimpleMovingAverageAggregation build() {
-			_checkSingleUse();
-
-			return new SimpleMovingAverageAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SimpleMovingAverageAggregation}
-	 */
-	public static final JsonpDeserializer<SimpleMovingAverageAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SimpleMovingAverageAggregation::setupSimpleMovingAverageAggregationDeserializer);
-
-	protected static void setupSimpleMovingAverageAggregationDeserializer(
-			ObjectDeserializer<SimpleMovingAverageAggregation.Builder> op) {
-		MovingAverageAggregationBase.setupMovingAverageAggregationBaseDeserializer(op);
-		op.add(Builder::settings, EmptyObject._DESERIALIZER, "settings");
-
-		op.ignore("model");
-	}
+public class SimpleMovingAverageAggregation extends MovingAverageAggregationBase implements MovingAverageAggregationVariant {
+    private final EmptyObject settings;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SimpleMovingAverageAggregation(Builder builder) {
+        super(builder);
+
+        this.settings = ApiTypeHelper.requireNonNull(builder.settings, this, "settings");
+
+    }
+
+    public static SimpleMovingAverageAggregation of(Function<Builder, ObjectBuilder<SimpleMovingAverageAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * MovingAverageAggregation variant kind.
+     */
+    @Override
+    public MovingAverageAggregation.Kind _movingAverageAggregationKind() {
+        return MovingAverageAggregation.Kind.Simple;
+    }
+
+    /**
+     * Required - API name: {@code settings}
+     */
+    public final EmptyObject settings() {
+        return this.settings;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("model", "simple");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("settings");
+        this.settings.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SimpleMovingAverageAggregation}.
+     */
+
+    public static class Builder extends MovingAverageAggregationBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<SimpleMovingAverageAggregation> {
+        private EmptyObject settings;
+
+        /**
+         * Required - API name: {@code settings}
+         */
+        public final Builder settings(EmptyObject value) {
+            this.settings = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code settings}
+         */
+        public final Builder settings(Function<EmptyObject.Builder, ObjectBuilder<EmptyObject>> fn) {
+            return this.settings(fn.apply(new EmptyObject.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SimpleMovingAverageAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SimpleMovingAverageAggregation build() {
+            _checkSingleUse();
+
+            return new SimpleMovingAverageAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SimpleMovingAverageAggregation}
+     */
+    public static final JsonpDeserializer<SimpleMovingAverageAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SimpleMovingAverageAggregation::setupSimpleMovingAverageAggregationDeserializer
+    );
+
+    protected static void setupSimpleMovingAverageAggregationDeserializer(ObjectDeserializer<SimpleMovingAverageAggregation.Builder> op) {
+        MovingAverageAggregationBase.setupMovingAverageAggregationBaseDeserializer(op);
+        op.add(Builder::settings, EmptyObject._DESERIALIZER, "settings");
+
+        op.ignore("model");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SimpleValueAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SimpleValueAggregate.java
index 5c1b763a43..5a7312c211 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SimpleValueAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SimpleValueAggregate.java
@@ -32,76 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.SimpleValueAggregate
 
-
 @JsonpDeserializable
 public class SimpleValueAggregate extends SingleMetricAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private SimpleValueAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static SimpleValueAggregate of(Function<Builder, ObjectBuilder<SimpleValueAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.SimpleValue;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SimpleValueAggregate}.
-	 */
-
-	public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SimpleValueAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SimpleValueAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SimpleValueAggregate build() {
-			_checkSingleUse();
-
-			return new SimpleValueAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SimpleValueAggregate}
-	 */
-	public static final JsonpDeserializer<SimpleValueAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SimpleValueAggregate::setupSimpleValueAggregateDeserializer);
-
-	protected static void setupSimpleValueAggregateDeserializer(ObjectDeserializer<SimpleValueAggregate.Builder> op) {
-		setupSingleMetricAggregateBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private SimpleValueAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static SimpleValueAggregate of(Function<Builder, ObjectBuilder<SimpleValueAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.SimpleValue;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SimpleValueAggregate}.
+     */
+
+    public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<SimpleValueAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SimpleValueAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SimpleValueAggregate build() {
+            _checkSingleUse();
+
+            return new SimpleValueAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SimpleValueAggregate}
+     */
+    public static final JsonpDeserializer<SimpleValueAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SimpleValueAggregate::setupSimpleValueAggregateDeserializer
+    );
+
+    protected static void setupSimpleValueAggregateDeserializer(ObjectDeserializer<SimpleValueAggregate.Builder> op) {
+        setupSingleMetricAggregateBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SingleBucketAggregateBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SingleBucketAggregateBase.java
index 1bd286d88f..35ade2fbb9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SingleBucketAggregateBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SingleBucketAggregateBase.java
@@ -32,95 +32,92 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
-import jakarta.json.stream.JsonGenerator;
 import org.opensearch.client.util.ObjectBuilder;
 
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-
 // typedef: _types.aggregations.SingleBucketAggregateBase
 
-
-
 public abstract class SingleBucketAggregateBase extends AggregateBase {
-	private final Map<String, Aggregate> aggregations;
-	private final long docCount;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected SingleBucketAggregateBase(AbstractBuilder<?> builder) {
-		super(builder);
-		this.aggregations = ApiTypeHelper.unmodifiable(builder.aggregations);
-
-		this.docCount = ApiTypeHelper.requireNonNull(builder.docCount, this, "docCount");
-
-	}
-
-	public final Map<String, Aggregate> aggregations() {
-		return this.aggregations;
-	}
-
-	/**
-	 * Required - API name: {@code doc_count}
-	 */
-	public final long docCount() {
-		return this.docCount;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("doc_count");
-		generator.write(this.docCount);
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				AggregateBase.AbstractBuilder<BuilderT> {
-		@Nullable
-		protected Map<String, Aggregate> aggregations = new HashMap<>();
-		private Long docCount;
-
-		public final BuilderT aggregations(Map<String, Aggregate> aggregateMap) {
-			this.aggregations = _mapPutAll(this.aggregations, aggregateMap);
-			return self();
-		}
-
-		public final BuilderT aggregations(String key, Aggregate value) {
-			this.aggregations = _mapPut(this.aggregations, key, value);
-			return self();
-		}
-
-		public final BuilderT aggregations(String key, Function<Aggregate.Builder, ObjectBuilder<Aggregate>> function) {
-			return aggregations(key, function.apply(new Aggregate.Builder()).build());
-		}
-
-		public final BuilderT docCount(long value) {
-			this.docCount = value;
-			return self();
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupSingleBucketAggregateBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		AggregateBase.setupAggregateBaseDeserializer(op);
-		op.add(AbstractBuilder::docCount, JsonpDeserializer.longDeserializer(), "doc_count");
-
-		op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
-			if (builder.aggregations == null) {
-				builder.aggregations = new HashMap<>();
-			}
-			Aggregate._TYPED_KEYS_DESERIALIZER.deserializeEntry(name, parser, mapper, builder.aggregations);
-		});
-	}
+    private final Map<String, Aggregate> aggregations;
+    private final long docCount;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected SingleBucketAggregateBase(AbstractBuilder<?> builder) {
+        super(builder);
+        this.aggregations = ApiTypeHelper.unmodifiable(builder.aggregations);
+
+        this.docCount = ApiTypeHelper.requireNonNull(builder.docCount, this, "docCount");
+
+    }
+
+    public final Map<String, Aggregate> aggregations() {
+        return this.aggregations;
+    }
+
+    /**
+     * Required - API name: {@code doc_count}
+     */
+    public final long docCount() {
+        return this.docCount;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("doc_count");
+        generator.write(this.docCount);
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregateBase.AbstractBuilder<
+        BuilderT> {
+        @Nullable
+        protected Map<String, Aggregate> aggregations = new HashMap<>();
+        private Long docCount;
+
+        public final BuilderT aggregations(Map<String, Aggregate> aggregateMap) {
+            this.aggregations = _mapPutAll(this.aggregations, aggregateMap);
+            return self();
+        }
+
+        public final BuilderT aggregations(String key, Aggregate value) {
+            this.aggregations = _mapPut(this.aggregations, key, value);
+            return self();
+        }
+
+        public final BuilderT aggregations(String key, Function<Aggregate.Builder, ObjectBuilder<Aggregate>> function) {
+            return aggregations(key, function.apply(new Aggregate.Builder()).build());
+        }
+
+        public final BuilderT docCount(long value) {
+            this.docCount = value;
+            return self();
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupSingleBucketAggregateBaseDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
+        AggregateBase.setupAggregateBaseDeserializer(op);
+        op.add(AbstractBuilder::docCount, JsonpDeserializer.longDeserializer(), "doc_count");
+
+        op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
+            if (builder.aggregations == null) {
+                builder.aggregations = new HashMap<>();
+            }
+            Aggregate._TYPED_KEYS_DESERIALIZER.deserializeEntry(name, parser, mapper, builder.aggregations);
+        });
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SingleMetricAggregateBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SingleMetricAggregateBase.java
index 308f82579c..a5af09284a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SingleMetricAggregateBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SingleMetricAggregateBase.java
@@ -32,104 +32,103 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpUtils;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
-import jakarta.json.stream.JsonGenerator;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.SingleMetricAggregateBase
 
-
 public abstract class SingleMetricAggregateBase extends AggregateBase {
-	private final double value;
-
-	@Nullable
-	private final String valueAsString;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected SingleMetricAggregateBase(AbstractBuilder<?> builder) {
-		super(builder);
-
-		this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
-		this.valueAsString = builder.valueAsString;
-
-	}
-
-	/**
-	 * Required - The metric value. A missing value generally means that there was
-	 * no data to aggregate, unless specified otherwise.
-	 * <p>
-	 * API name: {@code value}
-	 * <p>
-	 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-	 */
-	public final double value() {
-		return this.value;
-	}
-
-	/**
-	 * API name: {@code value_as_string}
-	 */
-	@Nullable
-	public final String valueAsString() {
-		return this.valueAsString;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("value");
-		JsonpUtils.serializeDoubleOrNull(generator, this.value, 0);
-		if (this.valueAsString != null) {
-			generator.writeKey("value_as_string");
-			generator.write(this.valueAsString);
-
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				AggregateBase.AbstractBuilder<BuilderT> {
-		private Double value;
-
-		@Nullable
-		private String valueAsString;
-
-		/**
-		 * Required - The metric value. A missing value generally means that there was
-		 * no data to aggregate, unless specified otherwise.
-		 * <p>
-		 * API name: {@code value}
-		 * <p>
-		 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-		 */
-		public final BuilderT value(double value) {
-			this.value = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code value_as_string}
-		 */
-		public final BuilderT valueAsString(@Nullable String value) {
-			this.valueAsString = value;
-			return self();
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupSingleMetricAggregateBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		AggregateBase.setupAggregateBaseDeserializer(op);
-		op.add(AbstractBuilder::value, JsonpDeserializer.doubleOrNullDeserializer(0), "value");
-		op.add(AbstractBuilder::valueAsString, JsonpDeserializer.stringDeserializer(), "value_as_string");
-
-	}
+    private final double value;
+
+    @Nullable
+    private final String valueAsString;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected SingleMetricAggregateBase(AbstractBuilder<?> builder) {
+        super(builder);
+
+        this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
+        this.valueAsString = builder.valueAsString;
+
+    }
+
+    /**
+     * Required - The metric value. A missing value generally means that there was
+     * no data to aggregate, unless specified otherwise.
+     * <p>
+     * API name: {@code value}
+     * <p>
+     * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+     */
+    public final double value() {
+        return this.value;
+    }
+
+    /**
+     * API name: {@code value_as_string}
+     */
+    @Nullable
+    public final String valueAsString() {
+        return this.valueAsString;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("value");
+        JsonpUtils.serializeDoubleOrNull(generator, this.value, 0);
+        if (this.valueAsString != null) {
+            generator.writeKey("value_as_string");
+            generator.write(this.valueAsString);
+
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregateBase.AbstractBuilder<
+        BuilderT> {
+        private Double value;
+
+        @Nullable
+        private String valueAsString;
+
+        /**
+         * Required - The metric value. A missing value generally means that there was
+         * no data to aggregate, unless specified otherwise.
+         * <p>
+         * API name: {@code value}
+         * <p>
+         * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+         */
+        public final BuilderT value(double value) {
+            this.value = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code value_as_string}
+         */
+        public final BuilderT valueAsString(@Nullable String value) {
+            this.valueAsString = value;
+            return self();
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupSingleMetricAggregateBaseDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
+        AggregateBase.setupAggregateBaseDeserializer(op);
+        op.add(AbstractBuilder::value, JsonpDeserializer.doubleOrNullDeserializer(0), "value");
+        op.add(AbstractBuilder::valueAsString, JsonpDeserializer.stringDeserializer(), "value_as_string");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StandardDeviationBounds.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StandardDeviationBounds.java
index 344ad654db..45b00862e6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StandardDeviationBounds.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StandardDeviationBounds.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,232 +44,231 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.StandardDeviationBounds
 
 @JsonpDeserializable
 public class StandardDeviationBounds implements JsonpSerializable {
-	private final double upper;
-
-	private final double lower;
-
-	private final double upperPopulation;
-
-	private final double lowerPopulation;
-
-	private final double upperSampling;
-
-	private final double lowerSampling;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private StandardDeviationBounds(Builder builder) {
-
-		this.upper = ApiTypeHelper.requireNonNull(builder.upper, this, "upper");
-		this.lower = ApiTypeHelper.requireNonNull(builder.lower, this, "lower");
-		this.upperPopulation = ApiTypeHelper.requireNonNull(builder.upperPopulation, this, "upperPopulation");
-		this.lowerPopulation = ApiTypeHelper.requireNonNull(builder.lowerPopulation, this, "lowerPopulation");
-		this.upperSampling = ApiTypeHelper.requireNonNull(builder.upperSampling, this, "upperSampling");
-		this.lowerSampling = ApiTypeHelper.requireNonNull(builder.lowerSampling, this, "lowerSampling");
-
-	}
-
-	public static StandardDeviationBounds of(Function<Builder, ObjectBuilder<StandardDeviationBounds>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code upper}
-	 * <p>
-	 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-	 */
-	public final double upper() {
-		return this.upper;
-	}
-
-	/**
-	 * Required - API name: {@code lower}
-	 * <p>
-	 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-	 */
-	public final double lower() {
-		return this.lower;
-	}
-
-	/**
-	 * Required - API name: {@code upper_population}
-	 * <p>
-	 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-	 */
-	public final double upperPopulation() {
-		return this.upperPopulation;
-	}
-
-	/**
-	 * Required - API name: {@code lower_population}
-	 * <p>
-	 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-	 */
-	public final double lowerPopulation() {
-		return this.lowerPopulation;
-	}
-
-	/**
-	 * Required - API name: {@code upper_sampling}
-	 * <p>
-	 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-	 */
-	public final double upperSampling() {
-		return this.upperSampling;
-	}
-
-	/**
-	 * Required - API name: {@code lower_sampling}
-	 * <p>
-	 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-	 */
-	public final double lowerSampling() {
-		return this.lowerSampling;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("upper");
-		JsonpUtils.serializeDoubleOrNull(generator, this.upper, 0);
-		generator.writeKey("lower");
-		JsonpUtils.serializeDoubleOrNull(generator, this.lower, 0);
-		generator.writeKey("upper_population");
-		JsonpUtils.serializeDoubleOrNull(generator, this.upperPopulation, 0);
-		generator.writeKey("lower_population");
-		JsonpUtils.serializeDoubleOrNull(generator, this.lowerPopulation, 0);
-		generator.writeKey("upper_sampling");
-		JsonpUtils.serializeDoubleOrNull(generator, this.upperSampling, 0);
-		generator.writeKey("lower_sampling");
-		JsonpUtils.serializeDoubleOrNull(generator, this.lowerSampling, 0);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link StandardDeviationBounds}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<StandardDeviationBounds> {
-		private Double upper;
-
-		private Double lower;
-
-		private Double upperPopulation;
-
-		private Double lowerPopulation;
-
-		private Double upperSampling;
-
-		private Double lowerSampling;
-
-		/**
-		 * Required - API name: {@code upper}
-		 * <p>
-		 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-		 */
-		public final Builder upper(double value) {
-			this.upper = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code lower}
-		 * <p>
-		 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-		 */
-		public final Builder lower(double value) {
-			this.lower = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code upper_population}
-		 * <p>
-		 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-		 */
-		public final Builder upperPopulation(double value) {
-			this.upperPopulation = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code lower_population}
-		 * <p>
-		 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-		 */
-		public final Builder lowerPopulation(double value) {
-			this.lowerPopulation = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code upper_sampling}
-		 * <p>
-		 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-		 */
-		public final Builder upperSampling(double value) {
-			this.upperSampling = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code lower_sampling}
-		 * <p>
-		 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-		 */
-		public final Builder lowerSampling(double value) {
-			this.lowerSampling = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link StandardDeviationBounds}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StandardDeviationBounds build() {
-			_checkSingleUse();
-
-			return new StandardDeviationBounds(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link StandardDeviationBounds}
-	 */
-	public static final JsonpDeserializer<StandardDeviationBounds> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, StandardDeviationBounds::setupStandardDeviationBoundsDeserializer);
-
-	protected static void setupStandardDeviationBoundsDeserializer(
-			ObjectDeserializer<StandardDeviationBounds.Builder> op) {
-
-		op.add(Builder::upper, JsonpDeserializer.doubleOrNullDeserializer(0), "upper");
-		op.add(Builder::lower, JsonpDeserializer.doubleOrNullDeserializer(0), "lower");
-		op.add(Builder::upperPopulation, JsonpDeserializer.doubleOrNullDeserializer(0), "upper_population");
-		op.add(Builder::lowerPopulation, JsonpDeserializer.doubleOrNullDeserializer(0), "lower_population");
-		op.add(Builder::upperSampling, JsonpDeserializer.doubleOrNullDeserializer(0), "upper_sampling");
-		op.add(Builder::lowerSampling, JsonpDeserializer.doubleOrNullDeserializer(0), "lower_sampling");
-
-	}
+    private final double upper;
+
+    private final double lower;
+
+    private final double upperPopulation;
+
+    private final double lowerPopulation;
+
+    private final double upperSampling;
+
+    private final double lowerSampling;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private StandardDeviationBounds(Builder builder) {
+
+        this.upper = ApiTypeHelper.requireNonNull(builder.upper, this, "upper");
+        this.lower = ApiTypeHelper.requireNonNull(builder.lower, this, "lower");
+        this.upperPopulation = ApiTypeHelper.requireNonNull(builder.upperPopulation, this, "upperPopulation");
+        this.lowerPopulation = ApiTypeHelper.requireNonNull(builder.lowerPopulation, this, "lowerPopulation");
+        this.upperSampling = ApiTypeHelper.requireNonNull(builder.upperSampling, this, "upperSampling");
+        this.lowerSampling = ApiTypeHelper.requireNonNull(builder.lowerSampling, this, "lowerSampling");
+
+    }
+
+    public static StandardDeviationBounds of(Function<Builder, ObjectBuilder<StandardDeviationBounds>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code upper}
+     * <p>
+     * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+     */
+    public final double upper() {
+        return this.upper;
+    }
+
+    /**
+     * Required - API name: {@code lower}
+     * <p>
+     * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+     */
+    public final double lower() {
+        return this.lower;
+    }
+
+    /**
+     * Required - API name: {@code upper_population}
+     * <p>
+     * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+     */
+    public final double upperPopulation() {
+        return this.upperPopulation;
+    }
+
+    /**
+     * Required - API name: {@code lower_population}
+     * <p>
+     * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+     */
+    public final double lowerPopulation() {
+        return this.lowerPopulation;
+    }
+
+    /**
+     * Required - API name: {@code upper_sampling}
+     * <p>
+     * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+     */
+    public final double upperSampling() {
+        return this.upperSampling;
+    }
+
+    /**
+     * Required - API name: {@code lower_sampling}
+     * <p>
+     * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+     */
+    public final double lowerSampling() {
+        return this.lowerSampling;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("upper");
+        JsonpUtils.serializeDoubleOrNull(generator, this.upper, 0);
+        generator.writeKey("lower");
+        JsonpUtils.serializeDoubleOrNull(generator, this.lower, 0);
+        generator.writeKey("upper_population");
+        JsonpUtils.serializeDoubleOrNull(generator, this.upperPopulation, 0);
+        generator.writeKey("lower_population");
+        JsonpUtils.serializeDoubleOrNull(generator, this.lowerPopulation, 0);
+        generator.writeKey("upper_sampling");
+        JsonpUtils.serializeDoubleOrNull(generator, this.upperSampling, 0);
+        generator.writeKey("lower_sampling");
+        JsonpUtils.serializeDoubleOrNull(generator, this.lowerSampling, 0);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link StandardDeviationBounds}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<StandardDeviationBounds> {
+        private Double upper;
+
+        private Double lower;
+
+        private Double upperPopulation;
+
+        private Double lowerPopulation;
+
+        private Double upperSampling;
+
+        private Double lowerSampling;
+
+        /**
+         * Required - API name: {@code upper}
+         * <p>
+         * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+         */
+        public final Builder upper(double value) {
+            this.upper = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code lower}
+         * <p>
+         * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+         */
+        public final Builder lower(double value) {
+            this.lower = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code upper_population}
+         * <p>
+         * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+         */
+        public final Builder upperPopulation(double value) {
+            this.upperPopulation = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code lower_population}
+         * <p>
+         * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+         */
+        public final Builder lowerPopulation(double value) {
+            this.lowerPopulation = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code upper_sampling}
+         * <p>
+         * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+         */
+        public final Builder upperSampling(double value) {
+            this.upperSampling = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code lower_sampling}
+         * <p>
+         * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+         */
+        public final Builder lowerSampling(double value) {
+            this.lowerSampling = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link StandardDeviationBounds}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StandardDeviationBounds build() {
+            _checkSingleUse();
+
+            return new StandardDeviationBounds(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link StandardDeviationBounds}
+     */
+    public static final JsonpDeserializer<StandardDeviationBounds> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StandardDeviationBounds::setupStandardDeviationBoundsDeserializer
+    );
+
+    protected static void setupStandardDeviationBoundsDeserializer(ObjectDeserializer<StandardDeviationBounds.Builder> op) {
+
+        op.add(Builder::upper, JsonpDeserializer.doubleOrNullDeserializer(0), "upper");
+        op.add(Builder::lower, JsonpDeserializer.doubleOrNullDeserializer(0), "lower");
+        op.add(Builder::upperPopulation, JsonpDeserializer.doubleOrNullDeserializer(0), "upper_population");
+        op.add(Builder::lowerPopulation, JsonpDeserializer.doubleOrNullDeserializer(0), "lower_population");
+        op.add(Builder::upperSampling, JsonpDeserializer.doubleOrNullDeserializer(0), "upper_sampling");
+        op.add(Builder::lowerSampling, JsonpDeserializer.doubleOrNullDeserializer(0), "lower_sampling");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StandardDeviationBoundsAsString.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StandardDeviationBoundsAsString.java
index 1aefb7b7c9..74fb21b311 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StandardDeviationBoundsAsString.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StandardDeviationBoundsAsString.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,215 +43,212 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.StandardDeviationBoundsAsString
 
-
 @JsonpDeserializable
 public class StandardDeviationBoundsAsString implements JsonpSerializable {
-	private final String upper;
+    private final String upper;
 
-	private final String lower;
+    private final String lower;
 
-	private final String upperPopulation;
+    private final String upperPopulation;
 
-	private final String lowerPopulation;
+    private final String lowerPopulation;
 
-	private final String upperSampling;
+    private final String upperSampling;
 
-	private final String lowerSampling;
+    private final String lowerSampling;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private StandardDeviationBoundsAsString(Builder builder) {
+    private StandardDeviationBoundsAsString(Builder builder) {
 
-		this.upper = ApiTypeHelper.requireNonNull(builder.upper, this, "upper");
-		this.lower = ApiTypeHelper.requireNonNull(builder.lower, this, "lower");
-		this.upperPopulation = ApiTypeHelper.requireNonNull(builder.upperPopulation, this, "upperPopulation");
-		this.lowerPopulation = ApiTypeHelper.requireNonNull(builder.lowerPopulation, this, "lowerPopulation");
-		this.upperSampling = ApiTypeHelper.requireNonNull(builder.upperSampling, this, "upperSampling");
-		this.lowerSampling = ApiTypeHelper.requireNonNull(builder.lowerSampling, this, "lowerSampling");
+        this.upper = ApiTypeHelper.requireNonNull(builder.upper, this, "upper");
+        this.lower = ApiTypeHelper.requireNonNull(builder.lower, this, "lower");
+        this.upperPopulation = ApiTypeHelper.requireNonNull(builder.upperPopulation, this, "upperPopulation");
+        this.lowerPopulation = ApiTypeHelper.requireNonNull(builder.lowerPopulation, this, "lowerPopulation");
+        this.upperSampling = ApiTypeHelper.requireNonNull(builder.upperSampling, this, "upperSampling");
+        this.lowerSampling = ApiTypeHelper.requireNonNull(builder.lowerSampling, this, "lowerSampling");
 
-	}
+    }
 
-	public static StandardDeviationBoundsAsString of(
-			Function<Builder, ObjectBuilder<StandardDeviationBoundsAsString>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static StandardDeviationBoundsAsString of(Function<Builder, ObjectBuilder<StandardDeviationBoundsAsString>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code upper}
-	 */
-	public final String upper() {
-		return this.upper;
-	}
+    /**
+     * Required - API name: {@code upper}
+     */
+    public final String upper() {
+        return this.upper;
+    }
 
-	/**
-	 * Required - API name: {@code lower}
-	 */
-	public final String lower() {
-		return this.lower;
-	}
+    /**
+     * Required - API name: {@code lower}
+     */
+    public final String lower() {
+        return this.lower;
+    }
 
-	/**
-	 * Required - API name: {@code upper_population}
-	 */
-	public final String upperPopulation() {
-		return this.upperPopulation;
-	}
+    /**
+     * Required - API name: {@code upper_population}
+     */
+    public final String upperPopulation() {
+        return this.upperPopulation;
+    }
 
-	/**
-	 * Required - API name: {@code lower_population}
-	 */
-	public final String lowerPopulation() {
-		return this.lowerPopulation;
-	}
-
-	/**
-	 * Required - API name: {@code upper_sampling}
-	 */
-	public final String upperSampling() {
-		return this.upperSampling;
-	}
-
-	/**
-	 * Required - API name: {@code lower_sampling}
-	 */
-	public final String lowerSampling() {
-		return this.lowerSampling;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("upper");
-		generator.write(this.upper);
-
-		generator.writeKey("lower");
-		generator.write(this.lower);
-
-		generator.writeKey("upper_population");
-		generator.write(this.upperPopulation);
-
-		generator.writeKey("lower_population");
-		generator.write(this.lowerPopulation);
-
-		generator.writeKey("upper_sampling");
-		generator.write(this.upperSampling);
-
-		generator.writeKey("lower_sampling");
-		generator.write(this.lowerSampling);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link StandardDeviationBoundsAsString}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<StandardDeviationBoundsAsString> {
-		private String upper;
-
-		private String lower;
-
-		private String upperPopulation;
-
-		private String lowerPopulation;
-
-		private String upperSampling;
-
-		private String lowerSampling;
-
-		/**
-		 * Required - API name: {@code upper}
-		 */
-		public final Builder upper(String value) {
-			this.upper = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code lower}
-		 */
-		public final Builder lower(String value) {
-			this.lower = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code upper_population}
-		 */
-		public final Builder upperPopulation(String value) {
-			this.upperPopulation = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code lower_population}
-		 */
-		public final Builder lowerPopulation(String value) {
-			this.lowerPopulation = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code upper_sampling}
-		 */
-		public final Builder upperSampling(String value) {
-			this.upperSampling = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code lower_sampling}
-		 */
-		public final Builder lowerSampling(String value) {
-			this.lowerSampling = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link StandardDeviationBoundsAsString}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StandardDeviationBoundsAsString build() {
-			_checkSingleUse();
-
-			return new StandardDeviationBoundsAsString(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link StandardDeviationBoundsAsString}
-	 */
-	public static final JsonpDeserializer<StandardDeviationBoundsAsString> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, StandardDeviationBoundsAsString::setupStandardDeviationBoundsAsStringDeserializer);
-
-	protected static void setupStandardDeviationBoundsAsStringDeserializer(
-			ObjectDeserializer<StandardDeviationBoundsAsString.Builder> op) {
-
-		op.add(Builder::upper, JsonpDeserializer.stringDeserializer(), "upper");
-		op.add(Builder::lower, JsonpDeserializer.stringDeserializer(), "lower");
-		op.add(Builder::upperPopulation, JsonpDeserializer.stringDeserializer(), "upper_population");
-		op.add(Builder::lowerPopulation, JsonpDeserializer.stringDeserializer(), "lower_population");
-		op.add(Builder::upperSampling, JsonpDeserializer.stringDeserializer(), "upper_sampling");
-		op.add(Builder::lowerSampling, JsonpDeserializer.stringDeserializer(), "lower_sampling");
-
-	}
+    /**
+     * Required - API name: {@code lower_population}
+     */
+    public final String lowerPopulation() {
+        return this.lowerPopulation;
+    }
+
+    /**
+     * Required - API name: {@code upper_sampling}
+     */
+    public final String upperSampling() {
+        return this.upperSampling;
+    }
+
+    /**
+     * Required - API name: {@code lower_sampling}
+     */
+    public final String lowerSampling() {
+        return this.lowerSampling;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("upper");
+        generator.write(this.upper);
+
+        generator.writeKey("lower");
+        generator.write(this.lower);
+
+        generator.writeKey("upper_population");
+        generator.write(this.upperPopulation);
+
+        generator.writeKey("lower_population");
+        generator.write(this.lowerPopulation);
+
+        generator.writeKey("upper_sampling");
+        generator.write(this.upperSampling);
+
+        generator.writeKey("lower_sampling");
+        generator.write(this.lowerSampling);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link StandardDeviationBoundsAsString}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<StandardDeviationBoundsAsString> {
+        private String upper;
+
+        private String lower;
+
+        private String upperPopulation;
+
+        private String lowerPopulation;
+
+        private String upperSampling;
+
+        private String lowerSampling;
+
+        /**
+         * Required - API name: {@code upper}
+         */
+        public final Builder upper(String value) {
+            this.upper = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code lower}
+         */
+        public final Builder lower(String value) {
+            this.lower = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code upper_population}
+         */
+        public final Builder upperPopulation(String value) {
+            this.upperPopulation = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code lower_population}
+         */
+        public final Builder lowerPopulation(String value) {
+            this.lowerPopulation = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code upper_sampling}
+         */
+        public final Builder upperSampling(String value) {
+            this.upperSampling = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code lower_sampling}
+         */
+        public final Builder lowerSampling(String value) {
+            this.lowerSampling = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link StandardDeviationBoundsAsString}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StandardDeviationBoundsAsString build() {
+            _checkSingleUse();
+
+            return new StandardDeviationBoundsAsString(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link StandardDeviationBoundsAsString}
+     */
+    public static final JsonpDeserializer<StandardDeviationBoundsAsString> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StandardDeviationBoundsAsString::setupStandardDeviationBoundsAsStringDeserializer
+    );
+
+    protected static void setupStandardDeviationBoundsAsStringDeserializer(ObjectDeserializer<StandardDeviationBoundsAsString.Builder> op) {
+
+        op.add(Builder::upper, JsonpDeserializer.stringDeserializer(), "upper");
+        op.add(Builder::lower, JsonpDeserializer.stringDeserializer(), "lower");
+        op.add(Builder::upperPopulation, JsonpDeserializer.stringDeserializer(), "upper_population");
+        op.add(Builder::lowerPopulation, JsonpDeserializer.stringDeserializer(), "lower_population");
+        op.add(Builder::upperSampling, JsonpDeserializer.stringDeserializer(), "upper_sampling");
+        op.add(Builder::lowerSampling, JsonpDeserializer.stringDeserializer(), "lower_sampling");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StatsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StatsAggregate.java
index 73a6562098..3d4a6769de 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StatsAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StatsAggregate.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,9 +43,6 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.StatsAggregate
 
@@ -54,325 +54,323 @@
  */
 @JsonpDeserializable
 public class StatsAggregate extends AggregateBase implements AggregateVariant {
-	private final long count;
-
-	private final double min;
-
-	private final double max;
-
-	private final double avg;
-
-	private final double sum;
-
-	@Nullable
-	private final String minAsString;
-
-	@Nullable
-	private final String maxAsString;
-
-	@Nullable
-	private final String avgAsString;
-
-	@Nullable
-	private final String sumAsString;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected StatsAggregate(AbstractBuilder<?> builder) {
-		super(builder);
-
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.min = ApiTypeHelper.requireNonNull(builder.min, this, "min");
-		this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
-		this.avg = ApiTypeHelper.requireNonNull(builder.avg, this, "avg");
-		this.sum = ApiTypeHelper.requireNonNull(builder.sum, this, "sum");
-		this.minAsString = builder.minAsString;
-		this.maxAsString = builder.maxAsString;
-		this.avgAsString = builder.avgAsString;
-		this.sumAsString = builder.sumAsString;
-
-	}
-
-	public static StatsAggregate statsAggregateOf(Function<Builder, ObjectBuilder<StatsAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Stats;
-	}
-
-	/**
-	 * Required - API name: {@code count}
-	 */
-	public final long count() {
-		return this.count;
-	}
-
-	/**
-	 * Required - API name: {@code min}
-	 * <p>
-	 * Defaults to {@code Double.POSITIVE_INFINITY} if parsed from a JSON
-	 * {@code null} value.
-	 */
-	public final double min() {
-		return this.min;
-	}
-
-	/**
-	 * Required - API name: {@code max}
-	 * <p>
-	 * Defaults to {@code Double.NEGATIVE_INFINITY} if parsed from a JSON
-	 * {@code null} value.
-	 */
-	public final double max() {
-		return this.max;
-	}
-
-	/**
-	 * Required - API name: {@code avg}
-	 * <p>
-	 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-	 */
-	public final double avg() {
-		return this.avg;
-	}
-
-	/**
-	 * Required - API name: {@code sum}
-	 */
-	public final double sum() {
-		return this.sum;
-	}
-
-	/**
-	 * API name: {@code min_as_string}
-	 */
-	@Nullable
-	public final String minAsString() {
-		return this.minAsString;
-	}
-
-	/**
-	 * API name: {@code max_as_string}
-	 */
-	@Nullable
-	public final String maxAsString() {
-		return this.maxAsString;
-	}
-
-	/**
-	 * API name: {@code avg_as_string}
-	 */
-	@Nullable
-	public final String avgAsString() {
-		return this.avgAsString;
-	}
-
-	/**
-	 * API name: {@code sum_as_string}
-	 */
-	@Nullable
-	public final String sumAsString() {
-		return this.sumAsString;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("count");
-		generator.write(this.count);
-
-		generator.writeKey("min");
-		JsonpUtils.serializeDoubleOrNull(generator, this.min, Double.POSITIVE_INFINITY);
-		generator.writeKey("max");
-		JsonpUtils.serializeDoubleOrNull(generator, this.max, Double.NEGATIVE_INFINITY);
-		generator.writeKey("avg");
-		JsonpUtils.serializeDoubleOrNull(generator, this.avg, 0);
-		generator.writeKey("sum");
-		generator.write(this.sum);
-
-		if (this.minAsString != null) {
-			generator.writeKey("min_as_string");
-			generator.write(this.minAsString);
-
-		}
-		if (this.maxAsString != null) {
-			generator.writeKey("max_as_string");
-			generator.write(this.maxAsString);
-
-		}
-		if (this.avgAsString != null) {
-			generator.writeKey("avg_as_string");
-			generator.write(this.avgAsString);
-
-		}
-		if (this.sumAsString != null) {
-			generator.writeKey("sum_as_string");
-			generator.write(this.sumAsString);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link StatsAggregate}.
-	 */
-
-	public static class Builder extends StatsAggregate.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<StatsAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link StatsAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StatsAggregate build() {
-			_checkSingleUse();
-
-			return new StatsAggregate(this);
-		}
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				AggregateBase.AbstractBuilder<BuilderT> {
-		private Long count;
-
-		private Double min;
-
-		private Double max;
-
-		private Double avg;
-
-		private Double sum;
-
-		@Nullable
-		private String minAsString;
-
-		@Nullable
-		private String maxAsString;
-
-		@Nullable
-		private String avgAsString;
-
-		@Nullable
-		private String sumAsString;
-
-		/**
-		 * Required - API name: {@code count}
-		 */
-		public final BuilderT count(long value) {
-			this.count = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code min}
-		 * <p>
-		 * Defaults to {@code Double.POSITIVE_INFINITY} if parsed from a JSON
-		 * {@code null} value.
-		 */
-		public final BuilderT min(double value) {
-			this.min = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code max}
-		 * <p>
-		 * Defaults to {@code Double.NEGATIVE_INFINITY} if parsed from a JSON
-		 * {@code null} value.
-		 */
-		public final BuilderT max(double value) {
-			this.max = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code avg}
-		 * <p>
-		 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-		 */
-		public final BuilderT avg(double value) {
-			this.avg = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code sum}
-		 */
-		public final BuilderT sum(double value) {
-			this.sum = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code min_as_string}
-		 */
-		public final BuilderT minAsString(@Nullable String value) {
-			this.minAsString = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code max_as_string}
-		 */
-		public final BuilderT maxAsString(@Nullable String value) {
-			this.maxAsString = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code avg_as_string}
-		 */
-		public final BuilderT avgAsString(@Nullable String value) {
-			this.avgAsString = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code sum_as_string}
-		 */
-		public final BuilderT sumAsString(@Nullable String value) {
-			this.sumAsString = value;
-			return self();
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link StatsAggregate}
-	 */
-	public static final JsonpDeserializer<StatsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			StatsAggregate::setupStatsAggregateDeserializer);
-
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupStatsAggregateDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		setupAggregateBaseDeserializer(op);
-		op.add(AbstractBuilder::count, JsonpDeserializer.longDeserializer(), "count");
-		op.add(AbstractBuilder::min, JsonpDeserializer.doubleOrNullDeserializer(Double.POSITIVE_INFINITY), "min");
-		op.add(AbstractBuilder::max, JsonpDeserializer.doubleOrNullDeserializer(Double.NEGATIVE_INFINITY), "max");
-		op.add(AbstractBuilder::avg, JsonpDeserializer.doubleOrNullDeserializer(0), "avg");
-		op.add(AbstractBuilder::sum, JsonpDeserializer.doubleDeserializer(), "sum");
-		op.add(AbstractBuilder::minAsString, JsonpDeserializer.stringDeserializer(), "min_as_string");
-		op.add(AbstractBuilder::maxAsString, JsonpDeserializer.stringDeserializer(), "max_as_string");
-		op.add(AbstractBuilder::avgAsString, JsonpDeserializer.stringDeserializer(), "avg_as_string");
-		op.add(AbstractBuilder::sumAsString, JsonpDeserializer.stringDeserializer(), "sum_as_string");
-
-	}
+    private final long count;
+
+    private final double min;
+
+    private final double max;
+
+    private final double avg;
+
+    private final double sum;
+
+    @Nullable
+    private final String minAsString;
+
+    @Nullable
+    private final String maxAsString;
+
+    @Nullable
+    private final String avgAsString;
+
+    @Nullable
+    private final String sumAsString;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected StatsAggregate(AbstractBuilder<?> builder) {
+        super(builder);
+
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.min = ApiTypeHelper.requireNonNull(builder.min, this, "min");
+        this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
+        this.avg = ApiTypeHelper.requireNonNull(builder.avg, this, "avg");
+        this.sum = ApiTypeHelper.requireNonNull(builder.sum, this, "sum");
+        this.minAsString = builder.minAsString;
+        this.maxAsString = builder.maxAsString;
+        this.avgAsString = builder.avgAsString;
+        this.sumAsString = builder.sumAsString;
+
+    }
+
+    public static StatsAggregate statsAggregateOf(Function<Builder, ObjectBuilder<StatsAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Stats;
+    }
+
+    /**
+     * Required - API name: {@code count}
+     */
+    public final long count() {
+        return this.count;
+    }
+
+    /**
+     * Required - API name: {@code min}
+     * <p>
+     * Defaults to {@code Double.POSITIVE_INFINITY} if parsed from a JSON
+     * {@code null} value.
+     */
+    public final double min() {
+        return this.min;
+    }
+
+    /**
+     * Required - API name: {@code max}
+     * <p>
+     * Defaults to {@code Double.NEGATIVE_INFINITY} if parsed from a JSON
+     * {@code null} value.
+     */
+    public final double max() {
+        return this.max;
+    }
+
+    /**
+     * Required - API name: {@code avg}
+     * <p>
+     * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+     */
+    public final double avg() {
+        return this.avg;
+    }
+
+    /**
+     * Required - API name: {@code sum}
+     */
+    public final double sum() {
+        return this.sum;
+    }
+
+    /**
+     * API name: {@code min_as_string}
+     */
+    @Nullable
+    public final String minAsString() {
+        return this.minAsString;
+    }
+
+    /**
+     * API name: {@code max_as_string}
+     */
+    @Nullable
+    public final String maxAsString() {
+        return this.maxAsString;
+    }
+
+    /**
+     * API name: {@code avg_as_string}
+     */
+    @Nullable
+    public final String avgAsString() {
+        return this.avgAsString;
+    }
+
+    /**
+     * API name: {@code sum_as_string}
+     */
+    @Nullable
+    public final String sumAsString() {
+        return this.sumAsString;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("count");
+        generator.write(this.count);
+
+        generator.writeKey("min");
+        JsonpUtils.serializeDoubleOrNull(generator, this.min, Double.POSITIVE_INFINITY);
+        generator.writeKey("max");
+        JsonpUtils.serializeDoubleOrNull(generator, this.max, Double.NEGATIVE_INFINITY);
+        generator.writeKey("avg");
+        JsonpUtils.serializeDoubleOrNull(generator, this.avg, 0);
+        generator.writeKey("sum");
+        generator.write(this.sum);
+
+        if (this.minAsString != null) {
+            generator.writeKey("min_as_string");
+            generator.write(this.minAsString);
+
+        }
+        if (this.maxAsString != null) {
+            generator.writeKey("max_as_string");
+            generator.write(this.maxAsString);
+
+        }
+        if (this.avgAsString != null) {
+            generator.writeKey("avg_as_string");
+            generator.write(this.avgAsString);
+
+        }
+        if (this.sumAsString != null) {
+            generator.writeKey("sum_as_string");
+            generator.write(this.sumAsString);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link StatsAggregate}.
+     */
+
+    public static class Builder extends StatsAggregate.AbstractBuilder<Builder> implements ObjectBuilder<StatsAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link StatsAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StatsAggregate build() {
+            _checkSingleUse();
+
+            return new StatsAggregate(this);
+        }
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregateBase.AbstractBuilder<
+        BuilderT> {
+        private Long count;
+
+        private Double min;
+
+        private Double max;
+
+        private Double avg;
+
+        private Double sum;
+
+        @Nullable
+        private String minAsString;
+
+        @Nullable
+        private String maxAsString;
+
+        @Nullable
+        private String avgAsString;
+
+        @Nullable
+        private String sumAsString;
+
+        /**
+         * Required - API name: {@code count}
+         */
+        public final BuilderT count(long value) {
+            this.count = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code min}
+         * <p>
+         * Defaults to {@code Double.POSITIVE_INFINITY} if parsed from a JSON
+         * {@code null} value.
+         */
+        public final BuilderT min(double value) {
+            this.min = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code max}
+         * <p>
+         * Defaults to {@code Double.NEGATIVE_INFINITY} if parsed from a JSON
+         * {@code null} value.
+         */
+        public final BuilderT max(double value) {
+            this.max = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code avg}
+         * <p>
+         * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+         */
+        public final BuilderT avg(double value) {
+            this.avg = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code sum}
+         */
+        public final BuilderT sum(double value) {
+            this.sum = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code min_as_string}
+         */
+        public final BuilderT minAsString(@Nullable String value) {
+            this.minAsString = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code max_as_string}
+         */
+        public final BuilderT maxAsString(@Nullable String value) {
+            this.maxAsString = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code avg_as_string}
+         */
+        public final BuilderT avgAsString(@Nullable String value) {
+            this.avgAsString = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code sum_as_string}
+         */
+        public final BuilderT sumAsString(@Nullable String value) {
+            this.sumAsString = value;
+            return self();
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link StatsAggregate}
+     */
+    public static final JsonpDeserializer<StatsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StatsAggregate::setupStatsAggregateDeserializer
+    );
+
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupStatsAggregateDeserializer(ObjectDeserializer<BuilderT> op) {
+        setupAggregateBaseDeserializer(op);
+        op.add(AbstractBuilder::count, JsonpDeserializer.longDeserializer(), "count");
+        op.add(AbstractBuilder::min, JsonpDeserializer.doubleOrNullDeserializer(Double.POSITIVE_INFINITY), "min");
+        op.add(AbstractBuilder::max, JsonpDeserializer.doubleOrNullDeserializer(Double.NEGATIVE_INFINITY), "max");
+        op.add(AbstractBuilder::avg, JsonpDeserializer.doubleOrNullDeserializer(0), "avg");
+        op.add(AbstractBuilder::sum, JsonpDeserializer.doubleDeserializer(), "sum");
+        op.add(AbstractBuilder::minAsString, JsonpDeserializer.stringDeserializer(), "min_as_string");
+        op.add(AbstractBuilder::maxAsString, JsonpDeserializer.stringDeserializer(), "max_as_string");
+        op.add(AbstractBuilder::avgAsString, JsonpDeserializer.stringDeserializer(), "avg_as_string");
+        op.add(AbstractBuilder::sumAsString, JsonpDeserializer.stringDeserializer(), "sum_as_string");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StatsAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StatsAggregation.java
index 0301225886..db04ddfc4c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StatsAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StatsAggregation.java
@@ -32,75 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.StatsAggregation
 
 @JsonpDeserializable
 public class StatsAggregation extends FormatMetricAggregationBase implements AggregationVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private StatsAggregation(Builder builder) {
-		super(builder);
-
-	}
-
-	public static StatsAggregation of(Function<Builder, ObjectBuilder<StatsAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Stats;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link StatsAggregation}.
-	 */
-
-	public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<StatsAggregation> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link StatsAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StatsAggregation build() {
-			_checkSingleUse();
-
-			return new StatsAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link StatsAggregation}
-	 */
-	public static final JsonpDeserializer<StatsAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			StatsAggregation::setupStatsAggregationDeserializer);
-
-	protected static void setupStatsAggregationDeserializer(ObjectDeserializer<StatsAggregation.Builder> op) {
-		FormatMetricAggregationBase.setupFormatMetricAggregationBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private StatsAggregation(Builder builder) {
+        super(builder);
+
+    }
+
+    public static StatsAggregation of(Function<Builder, ObjectBuilder<StatsAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Stats;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link StatsAggregation}.
+     */
+
+    public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<StatsAggregation> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link StatsAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StatsAggregation build() {
+            _checkSingleUse();
+
+            return new StatsAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link StatsAggregation}
+     */
+    public static final JsonpDeserializer<StatsAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StatsAggregation::setupStatsAggregationDeserializer
+    );
+
+    protected static void setupStatsAggregationDeserializer(ObjectDeserializer<StatsAggregation.Builder> op) {
+        FormatMetricAggregationBase.setupFormatMetricAggregationBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StatsBucketAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StatsBucketAggregate.java
index 5e50885da1..c7e7534fee 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StatsBucketAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StatsBucketAggregate.java
@@ -32,76 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.StatsBucketAggregate
 
-
 @JsonpDeserializable
 public class StatsBucketAggregate extends StatsAggregate implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private StatsBucketAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static StatsBucketAggregate of(Function<Builder, ObjectBuilder<StatsBucketAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.StatsBucket;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link StatsBucketAggregate}.
-	 */
-
-	public static class Builder extends StatsAggregate.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<StatsBucketAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link StatsBucketAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StatsBucketAggregate build() {
-			_checkSingleUse();
-
-			return new StatsBucketAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link StatsBucketAggregate}
-	 */
-	public static final JsonpDeserializer<StatsBucketAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, StatsBucketAggregate::setupStatsBucketAggregateDeserializer);
-
-	protected static void setupStatsBucketAggregateDeserializer(ObjectDeserializer<StatsBucketAggregate.Builder> op) {
-		StatsAggregate.setupStatsAggregateDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private StatsBucketAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static StatsBucketAggregate of(Function<Builder, ObjectBuilder<StatsBucketAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.StatsBucket;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link StatsBucketAggregate}.
+     */
+
+    public static class Builder extends StatsAggregate.AbstractBuilder<Builder> implements ObjectBuilder<StatsBucketAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link StatsBucketAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StatsBucketAggregate build() {
+            _checkSingleUse();
+
+            return new StatsBucketAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link StatsBucketAggregate}
+     */
+    public static final JsonpDeserializer<StatsBucketAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StatsBucketAggregate::setupStatsBucketAggregateDeserializer
+    );
+
+    protected static void setupStatsBucketAggregateDeserializer(ObjectDeserializer<StatsBucketAggregate.Builder> op) {
+        StatsAggregate.setupStatsAggregateDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StatsBucketAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StatsBucketAggregation.java
index 11e8392a2d..a189ecdf51 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StatsBucketAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StatsBucketAggregation.java
@@ -32,77 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.StatsBucketAggregation
 
-
 @JsonpDeserializable
 public class StatsBucketAggregation extends PipelineAggregationBase implements AggregationVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private StatsBucketAggregation(Builder builder) {
-		super(builder);
-
-	}
-
-	public static StatsBucketAggregation of(Function<Builder, ObjectBuilder<StatsBucketAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.StatsBucket;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link StatsBucketAggregation}.
-	 */
-
-	public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<StatsBucketAggregation> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link StatsBucketAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StatsBucketAggregation build() {
-			_checkSingleUse();
-
-			return new StatsBucketAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link StatsBucketAggregation}
-	 */
-	public static final JsonpDeserializer<StatsBucketAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, StatsBucketAggregation::setupStatsBucketAggregationDeserializer);
-
-	protected static void setupStatsBucketAggregationDeserializer(
-			ObjectDeserializer<StatsBucketAggregation.Builder> op) {
-		PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private StatsBucketAggregation(Builder builder) {
+        super(builder);
+
+    }
+
+    public static StatsBucketAggregation of(Function<Builder, ObjectBuilder<StatsBucketAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.StatsBucket;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link StatsBucketAggregation}.
+     */
+
+    public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<StatsBucketAggregation> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link StatsBucketAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StatsBucketAggregation build() {
+            _checkSingleUse();
+
+            return new StatsBucketAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link StatsBucketAggregation}
+     */
+    public static final JsonpDeserializer<StatsBucketAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StatsBucketAggregation::setupStatsBucketAggregationDeserializer
+    );
+
+    protected static void setupStatsBucketAggregationDeserializer(ObjectDeserializer<StatsBucketAggregation.Builder> op) {
+        PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringRareTermsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringRareTermsAggregate.java
index 8901fe1732..28ee203ec1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringRareTermsAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringRareTermsAggregate.java
@@ -32,14 +32,13 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.StringRareTermsAggregate
 
 /**
@@ -47,68 +46,67 @@
  *
  */
 @JsonpDeserializable
-public class StringRareTermsAggregate extends MultiBucketAggregateBase<StringRareTermsBucket>
-		implements
-			AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private StringRareTermsAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static StringRareTermsAggregate of(Function<Builder, ObjectBuilder<StringRareTermsAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Srareterms;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link StringRareTermsAggregate}.
-	 */
-
-	public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<StringRareTermsBucket, Builder>
-			implements
-				ObjectBuilder<StringRareTermsAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link StringRareTermsAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StringRareTermsAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new StringRareTermsAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link StringRareTermsAggregate}
-	 */
-	public static final JsonpDeserializer<StringRareTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, StringRareTermsAggregate::setupStringRareTermsAggregateDeserializer);
-
-	protected static void setupStringRareTermsAggregateDeserializer(
-			ObjectDeserializer<StringRareTermsAggregate.Builder> op) {
-		setupMultiBucketAggregateBaseDeserializer(op, StringRareTermsBucket._DESERIALIZER);
-
-	}
+public class StringRareTermsAggregate extends MultiBucketAggregateBase<StringRareTermsBucket> implements AggregateVariant {
+    // ---------------------------------------------------------------------------------------------
+
+    private StringRareTermsAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static StringRareTermsAggregate of(Function<Builder, ObjectBuilder<StringRareTermsAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Srareterms;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link StringRareTermsAggregate}.
+     */
+
+    public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<StringRareTermsBucket, Builder>
+        implements
+            ObjectBuilder<StringRareTermsAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link StringRareTermsAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StringRareTermsAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new StringRareTermsAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link StringRareTermsAggregate}
+     */
+    public static final JsonpDeserializer<StringRareTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StringRareTermsAggregate::setupStringRareTermsAggregateDeserializer
+    );
+
+    protected static void setupStringRareTermsAggregateDeserializer(ObjectDeserializer<StringRareTermsAggregate.Builder> op) {
+        setupMultiBucketAggregateBaseDeserializer(op, StringRareTermsBucket._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringRareTermsBucket.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringRareTermsBucket.java
index e70b86cfb2..a76cbdf984 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringRareTermsBucket.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringRareTermsBucket.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,93 +41,90 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.StringRareTermsBucket
 
-
 @JsonpDeserializable
 public class StringRareTermsBucket extends MultiBucketBase {
-	private final String key;
+    private final String key;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private StringRareTermsBucket(Builder builder) {
-		super(builder);
+    private StringRareTermsBucket(Builder builder) {
+        super(builder);
 
-		this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
+        this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
 
-	}
+    }
 
-	public static StringRareTermsBucket of(Function<Builder, ObjectBuilder<StringRareTermsBucket>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static StringRareTermsBucket of(Function<Builder, ObjectBuilder<StringRareTermsBucket>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code key}
-	 */
-	public final String key() {
-		return this.key;
-	}
+    /**
+     * Required - API name: {@code key}
+     */
+    public final String key() {
+        return this.key;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("key");
-		generator.write(this.key);
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("key");
+        generator.write(this.key);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link StringRareTermsBucket}.
-	 */
+    /**
+     * Builder for {@link StringRareTermsBucket}.
+     */
 
-	public static class Builder extends MultiBucketBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<StringRareTermsBucket> {
-		private String key;
+    public static class Builder extends MultiBucketBase.AbstractBuilder<Builder> implements ObjectBuilder<StringRareTermsBucket> {
+        private String key;
 
-		/**
-		 * Required - API name: {@code key}
-		 */
-		public final Builder key(String value) {
-			this.key = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code key}
+         */
+        public final Builder key(String value) {
+            this.key = value;
+            return this;
+        }
 
-		@Override
-		protected Builder self() {
-			return this;
-		}
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link StringRareTermsBucket}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StringRareTermsBucket build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link StringRareTermsBucket}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StringRareTermsBucket build() {
+            _checkSingleUse();
 
-			return new StringRareTermsBucket(this);
-		}
-	}
+            return new StringRareTermsBucket(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link StringRareTermsBucket}
-	 */
-	public static final JsonpDeserializer<StringRareTermsBucket> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, StringRareTermsBucket::setupStringRareTermsBucketDeserializer);
+    /**
+     * Json deserializer for {@link StringRareTermsBucket}
+     */
+    public static final JsonpDeserializer<StringRareTermsBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StringRareTermsBucket::setupStringRareTermsBucketDeserializer
+    );
 
-	protected static void setupStringRareTermsBucketDeserializer(ObjectDeserializer<StringRareTermsBucket.Builder> op) {
-		MultiBucketBase.setupMultiBucketBaseDeserializer(op);
-		op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
+    protected static void setupStringRareTermsBucketDeserializer(ObjectDeserializer<StringRareTermsBucket.Builder> op) {
+        MultiBucketBase.setupMultiBucketBaseDeserializer(op);
+        op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringStatsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringStatsAggregate.java
index d948aeea06..c6c3c2d3d1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringStatsAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringStatsAggregate.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,327 +43,323 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.StringStatsAggregate
 
-
 @JsonpDeserializable
 public class StringStatsAggregate extends AggregateBase implements AggregateVariant {
-	private final long count;
-
-	private final int minLength;
-
-	private final int maxLength;
-
-	private final double avgLength;
-
-	private final double entropy;
-
-	@Nullable
-	private final String distribution;
-
-	@Nullable
-	private final String minLengthAsString;
-
-	@Nullable
-	private final String maxLengthAsString;
-
-	@Nullable
-	private final String avgLengthAsString;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private StringStatsAggregate(Builder builder) {
-		super(builder);
-
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.minLength = ApiTypeHelper.requireNonNull(builder.minLength, this, "minLength");
-		this.maxLength = ApiTypeHelper.requireNonNull(builder.maxLength, this, "maxLength");
-		this.avgLength = ApiTypeHelper.requireNonNull(builder.avgLength, this, "avgLength");
-		this.entropy = ApiTypeHelper.requireNonNull(builder.entropy, this, "entropy");
-		this.distribution = builder.distribution;
-		this.minLengthAsString = builder.minLengthAsString;
-		this.maxLengthAsString = builder.maxLengthAsString;
-		this.avgLengthAsString = builder.avgLengthAsString;
-
-	}
-
-	public static StringStatsAggregate of(Function<Builder, ObjectBuilder<StringStatsAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.StringStats;
-	}
-
-	/**
-	 * Required - API name: {@code count}
-	 */
-	public final long count() {
-		return this.count;
-	}
-
-	/**
-	 * Required - API name: {@code min_length}
-	 * <p>
-	 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-	 */
-	public final int minLength() {
-		return this.minLength;
-	}
-
-	/**
-	 * Required - API name: {@code max_length}
-	 * <p>
-	 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-	 */
-	public final int maxLength() {
-		return this.maxLength;
-	}
-
-	/**
-	 * Required - API name: {@code avg_length}
-	 * <p>
-	 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-	 */
-	public final double avgLength() {
-		return this.avgLength;
-	}
-
-	/**
-	 * Required - API name: {@code entropy}
-	 * <p>
-	 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-	 */
-	public final double entropy() {
-		return this.entropy;
-	}
-
-	/**
-	 * API name: {@code distribution}
-	 */
-	@Nullable
-	public final String distribution() {
-		return this.distribution;
-	}
-
-	/**
-	 * API name: {@code min_length_as_string}
-	 */
-	@Nullable
-	public final String minLengthAsString() {
-		return this.minLengthAsString;
-	}
-
-	/**
-	 * API name: {@code max_length_as_string}
-	 */
-	@Nullable
-	public final String maxLengthAsString() {
-		return this.maxLengthAsString;
-	}
-
-	/**
-	 * API name: {@code avg_length_as_string}
-	 */
-	@Nullable
-	public final String avgLengthAsString() {
-		return this.avgLengthAsString;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("count");
-		generator.write(this.count);
-
-		generator.writeKey("min_length");
-		JsonpUtils.serializeIntOrNull(generator, this.minLength, 0);
-		generator.writeKey("max_length");
-		JsonpUtils.serializeIntOrNull(generator, this.maxLength, 0);
-		generator.writeKey("avg_length");
-		JsonpUtils.serializeDoubleOrNull(generator, this.avgLength, 0);
-		generator.writeKey("entropy");
-		JsonpUtils.serializeDoubleOrNull(generator, this.entropy, 0);
-		if (this.distribution != null) {
-			generator.writeKey("distribution");
-			generator.write(this.distribution);
-
-		}
-		if (this.minLengthAsString != null) {
-			generator.writeKey("min_length_as_string");
-			generator.write(this.minLengthAsString);
-
-		}
-		if (this.maxLengthAsString != null) {
-			generator.writeKey("max_length_as_string");
-			generator.write(this.maxLengthAsString);
-
-		}
-		if (this.avgLengthAsString != null) {
-			generator.writeKey("avg_length_as_string");
-			generator.write(this.avgLengthAsString);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link StringStatsAggregate}.
-	 */
-
-	public static class Builder extends AggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<StringStatsAggregate> {
-		private Long count;
-
-		private Integer minLength;
-
-		private Integer maxLength;
-
-		private Double avgLength;
-
-		private Double entropy;
-
-		@Nullable
-		private String distribution;
-
-		@Nullable
-		private String minLengthAsString;
-
-		@Nullable
-		private String maxLengthAsString;
-
-		@Nullable
-		private String avgLengthAsString;
-
-		/**
-		 * Required - API name: {@code count}
-		 */
-		public final Builder count(long value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code min_length}
-		 * <p>
-		 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-		 */
-		public final Builder minLength(int value) {
-			this.minLength = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code max_length}
-		 * <p>
-		 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-		 */
-		public final Builder maxLength(int value) {
-			this.maxLength = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code avg_length}
-		 * <p>
-		 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-		 */
-		public final Builder avgLength(double value) {
-			this.avgLength = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code entropy}
-		 * <p>
-		 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-		 */
-		public final Builder entropy(double value) {
-			this.entropy = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code distribution}
-		 */
-		public final Builder distribution(@Nullable String value) {
-			this.distribution = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_length_as_string}
-		 */
-		public final Builder minLengthAsString(@Nullable String value) {
-			this.minLengthAsString = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_length_as_string}
-		 */
-		public final Builder maxLengthAsString(@Nullable String value) {
-			this.maxLengthAsString = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code avg_length_as_string}
-		 */
-		public final Builder avgLengthAsString(@Nullable String value) {
-			this.avgLengthAsString = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link StringStatsAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StringStatsAggregate build() {
-			_checkSingleUse();
-
-			return new StringStatsAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link StringStatsAggregate}
-	 */
-	public static final JsonpDeserializer<StringStatsAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, StringStatsAggregate::setupStringStatsAggregateDeserializer);
-
-	protected static void setupStringStatsAggregateDeserializer(ObjectDeserializer<StringStatsAggregate.Builder> op) {
-		setupAggregateBaseDeserializer(op);
-		op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
-		op.add(Builder::minLength, JsonpDeserializer.intOrNullDeserializer(0), "min_length");
-		op.add(Builder::maxLength, JsonpDeserializer.intOrNullDeserializer(0), "max_length");
-		op.add(Builder::avgLength, JsonpDeserializer.doubleOrNullDeserializer(0), "avg_length");
-		op.add(Builder::entropy, JsonpDeserializer.doubleOrNullDeserializer(0), "entropy");
-		op.add(Builder::distribution, JsonpDeserializer.stringDeserializer(), "distribution");
-		op.add(Builder::minLengthAsString, JsonpDeserializer.stringDeserializer(), "min_length_as_string");
-		op.add(Builder::maxLengthAsString, JsonpDeserializer.stringDeserializer(), "max_length_as_string");
-		op.add(Builder::avgLengthAsString, JsonpDeserializer.stringDeserializer(), "avg_length_as_string");
-
-	}
+    private final long count;
+
+    private final int minLength;
+
+    private final int maxLength;
+
+    private final double avgLength;
+
+    private final double entropy;
+
+    @Nullable
+    private final String distribution;
+
+    @Nullable
+    private final String minLengthAsString;
+
+    @Nullable
+    private final String maxLengthAsString;
+
+    @Nullable
+    private final String avgLengthAsString;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private StringStatsAggregate(Builder builder) {
+        super(builder);
+
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.minLength = ApiTypeHelper.requireNonNull(builder.minLength, this, "minLength");
+        this.maxLength = ApiTypeHelper.requireNonNull(builder.maxLength, this, "maxLength");
+        this.avgLength = ApiTypeHelper.requireNonNull(builder.avgLength, this, "avgLength");
+        this.entropy = ApiTypeHelper.requireNonNull(builder.entropy, this, "entropy");
+        this.distribution = builder.distribution;
+        this.minLengthAsString = builder.minLengthAsString;
+        this.maxLengthAsString = builder.maxLengthAsString;
+        this.avgLengthAsString = builder.avgLengthAsString;
+
+    }
+
+    public static StringStatsAggregate of(Function<Builder, ObjectBuilder<StringStatsAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.StringStats;
+    }
+
+    /**
+     * Required - API name: {@code count}
+     */
+    public final long count() {
+        return this.count;
+    }
+
+    /**
+     * Required - API name: {@code min_length}
+     * <p>
+     * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+     */
+    public final int minLength() {
+        return this.minLength;
+    }
+
+    /**
+     * Required - API name: {@code max_length}
+     * <p>
+     * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+     */
+    public final int maxLength() {
+        return this.maxLength;
+    }
+
+    /**
+     * Required - API name: {@code avg_length}
+     * <p>
+     * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+     */
+    public final double avgLength() {
+        return this.avgLength;
+    }
+
+    /**
+     * Required - API name: {@code entropy}
+     * <p>
+     * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+     */
+    public final double entropy() {
+        return this.entropy;
+    }
+
+    /**
+     * API name: {@code distribution}
+     */
+    @Nullable
+    public final String distribution() {
+        return this.distribution;
+    }
+
+    /**
+     * API name: {@code min_length_as_string}
+     */
+    @Nullable
+    public final String minLengthAsString() {
+        return this.minLengthAsString;
+    }
+
+    /**
+     * API name: {@code max_length_as_string}
+     */
+    @Nullable
+    public final String maxLengthAsString() {
+        return this.maxLengthAsString;
+    }
+
+    /**
+     * API name: {@code avg_length_as_string}
+     */
+    @Nullable
+    public final String avgLengthAsString() {
+        return this.avgLengthAsString;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("count");
+        generator.write(this.count);
+
+        generator.writeKey("min_length");
+        JsonpUtils.serializeIntOrNull(generator, this.minLength, 0);
+        generator.writeKey("max_length");
+        JsonpUtils.serializeIntOrNull(generator, this.maxLength, 0);
+        generator.writeKey("avg_length");
+        JsonpUtils.serializeDoubleOrNull(generator, this.avgLength, 0);
+        generator.writeKey("entropy");
+        JsonpUtils.serializeDoubleOrNull(generator, this.entropy, 0);
+        if (this.distribution != null) {
+            generator.writeKey("distribution");
+            generator.write(this.distribution);
+
+        }
+        if (this.minLengthAsString != null) {
+            generator.writeKey("min_length_as_string");
+            generator.write(this.minLengthAsString);
+
+        }
+        if (this.maxLengthAsString != null) {
+            generator.writeKey("max_length_as_string");
+            generator.write(this.maxLengthAsString);
+
+        }
+        if (this.avgLengthAsString != null) {
+            generator.writeKey("avg_length_as_string");
+            generator.write(this.avgLengthAsString);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link StringStatsAggregate}.
+     */
+
+    public static class Builder extends AggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<StringStatsAggregate> {
+        private Long count;
+
+        private Integer minLength;
+
+        private Integer maxLength;
+
+        private Double avgLength;
+
+        private Double entropy;
+
+        @Nullable
+        private String distribution;
+
+        @Nullable
+        private String minLengthAsString;
+
+        @Nullable
+        private String maxLengthAsString;
+
+        @Nullable
+        private String avgLengthAsString;
+
+        /**
+         * Required - API name: {@code count}
+         */
+        public final Builder count(long value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code min_length}
+         * <p>
+         * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+         */
+        public final Builder minLength(int value) {
+            this.minLength = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code max_length}
+         * <p>
+         * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+         */
+        public final Builder maxLength(int value) {
+            this.maxLength = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code avg_length}
+         * <p>
+         * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+         */
+        public final Builder avgLength(double value) {
+            this.avgLength = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code entropy}
+         * <p>
+         * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+         */
+        public final Builder entropy(double value) {
+            this.entropy = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code distribution}
+         */
+        public final Builder distribution(@Nullable String value) {
+            this.distribution = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code min_length_as_string}
+         */
+        public final Builder minLengthAsString(@Nullable String value) {
+            this.minLengthAsString = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_length_as_string}
+         */
+        public final Builder maxLengthAsString(@Nullable String value) {
+            this.maxLengthAsString = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code avg_length_as_string}
+         */
+        public final Builder avgLengthAsString(@Nullable String value) {
+            this.avgLengthAsString = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link StringStatsAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StringStatsAggregate build() {
+            _checkSingleUse();
+
+            return new StringStatsAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link StringStatsAggregate}
+     */
+    public static final JsonpDeserializer<StringStatsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StringStatsAggregate::setupStringStatsAggregateDeserializer
+    );
+
+    protected static void setupStringStatsAggregateDeserializer(ObjectDeserializer<StringStatsAggregate.Builder> op) {
+        setupAggregateBaseDeserializer(op);
+        op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
+        op.add(Builder::minLength, JsonpDeserializer.intOrNullDeserializer(0), "min_length");
+        op.add(Builder::maxLength, JsonpDeserializer.intOrNullDeserializer(0), "max_length");
+        op.add(Builder::avgLength, JsonpDeserializer.doubleOrNullDeserializer(0), "avg_length");
+        op.add(Builder::entropy, JsonpDeserializer.doubleOrNullDeserializer(0), "entropy");
+        op.add(Builder::distribution, JsonpDeserializer.stringDeserializer(), "distribution");
+        op.add(Builder::minLengthAsString, JsonpDeserializer.stringDeserializer(), "min_length_as_string");
+        op.add(Builder::maxLengthAsString, JsonpDeserializer.stringDeserializer(), "max_length_as_string");
+        op.add(Builder::avgLengthAsString, JsonpDeserializer.stringDeserializer(), "avg_length_as_string");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringStatsAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringStatsAggregation.java
index f4232fd90b..3c4d0255c2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringStatsAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringStatsAggregation.java
@@ -32,114 +32,113 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.StringStatsAggregation
 
 @JsonpDeserializable
 public class StringStatsAggregation extends MetricAggregationBase implements AggregationVariant {
-	@Nullable
-	private final Boolean showDistribution;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private StringStatsAggregation(Builder builder) {
-		super(builder);
-
-		this.showDistribution = builder.showDistribution;
-
-	}
-
-	public static StringStatsAggregation of(Function<Builder, ObjectBuilder<StringStatsAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.StringStats;
-	}
-
-	/**
-	 * API name: {@code show_distribution}
-	 */
-	@Nullable
-	public final Boolean showDistribution() {
-		return this.showDistribution;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.showDistribution != null) {
-			generator.writeKey("show_distribution");
-			generator.write(this.showDistribution);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link StringStatsAggregation}.
-	 */
-
-	public static class Builder extends MetricAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<StringStatsAggregation> {
-		@Nullable
-		private Boolean showDistribution;
-
-		/**
-		 * API name: {@code show_distribution}
-		 */
-		public final Builder showDistribution(@Nullable Boolean value) {
-			this.showDistribution = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link StringStatsAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StringStatsAggregation build() {
-			_checkSingleUse();
-
-			return new StringStatsAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link StringStatsAggregation}
-	 */
-	public static final JsonpDeserializer<StringStatsAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, StringStatsAggregation::setupStringStatsAggregationDeserializer);
-
-	protected static void setupStringStatsAggregationDeserializer(
-			ObjectDeserializer<StringStatsAggregation.Builder> op) {
-		setupMetricAggregationBaseDeserializer(op);
-		op.add(Builder::showDistribution, JsonpDeserializer.booleanDeserializer(), "show_distribution");
-
-	}
+    @Nullable
+    private final Boolean showDistribution;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private StringStatsAggregation(Builder builder) {
+        super(builder);
+
+        this.showDistribution = builder.showDistribution;
+
+    }
+
+    public static StringStatsAggregation of(Function<Builder, ObjectBuilder<StringStatsAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.StringStats;
+    }
+
+    /**
+     * API name: {@code show_distribution}
+     */
+    @Nullable
+    public final Boolean showDistribution() {
+        return this.showDistribution;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.showDistribution != null) {
+            generator.writeKey("show_distribution");
+            generator.write(this.showDistribution);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link StringStatsAggregation}.
+     */
+
+    public static class Builder extends MetricAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<StringStatsAggregation> {
+        @Nullable
+        private Boolean showDistribution;
+
+        /**
+         * API name: {@code show_distribution}
+         */
+        public final Builder showDistribution(@Nullable Boolean value) {
+            this.showDistribution = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link StringStatsAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StringStatsAggregation build() {
+            _checkSingleUse();
+
+            return new StringStatsAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link StringStatsAggregation}
+     */
+    public static final JsonpDeserializer<StringStatsAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StringStatsAggregation::setupStringStatsAggregationDeserializer
+    );
+
+    protected static void setupStringStatsAggregationDeserializer(ObjectDeserializer<StringStatsAggregation.Builder> op) {
+        setupMetricAggregationBaseDeserializer(op);
+        op.add(Builder::showDistribution, JsonpDeserializer.booleanDeserializer(), "show_distribution");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringTermsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringTermsAggregate.java
index 479114d513..b571d4a8d7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringTermsAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringTermsAggregate.java
@@ -32,14 +32,13 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.StringTermsAggregate
 
 /**
@@ -48,64 +47,66 @@
  */
 @JsonpDeserializable
 public class StringTermsAggregate extends TermsAggregateBase<StringTermsBucket> implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private StringTermsAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static StringTermsAggregate of(Function<Builder, ObjectBuilder<StringTermsAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Sterms;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link StringTermsAggregate}.
-	 */
-
-	public static class Builder extends TermsAggregateBase.AbstractBuilder<StringTermsBucket, Builder>
-			implements
-				ObjectBuilder<StringTermsAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link StringTermsAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StringTermsAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new StringTermsAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link StringTermsAggregate}
-	 */
-	public static final JsonpDeserializer<StringTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, StringTermsAggregate::setupStringTermsAggregateDeserializer);
-
-	protected static void setupStringTermsAggregateDeserializer(ObjectDeserializer<StringTermsAggregate.Builder> op) {
-		setupTermsAggregateBaseDeserializer(op, StringTermsBucket._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private StringTermsAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static StringTermsAggregate of(Function<Builder, ObjectBuilder<StringTermsAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Sterms;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link StringTermsAggregate}.
+     */
+
+    public static class Builder extends TermsAggregateBase.AbstractBuilder<StringTermsBucket, Builder>
+        implements
+            ObjectBuilder<StringTermsAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link StringTermsAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StringTermsAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new StringTermsAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link StringTermsAggregate}
+     */
+    public static final JsonpDeserializer<StringTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StringTermsAggregate::setupStringTermsAggregateDeserializer
+    );
+
+    protected static void setupStringTermsAggregateDeserializer(ObjectDeserializer<StringTermsAggregate.Builder> op) {
+        setupTermsAggregateBaseDeserializer(op, StringTermsBucket._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringTermsBucket.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringTermsBucket.java
index d57383dc08..8a6aa2ba48 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringTermsBucket.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StringTermsBucket.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,93 +41,90 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.StringTermsBucket
 
-
 @JsonpDeserializable
 public class StringTermsBucket extends TermsBucketBase {
-	private final String key;
+    private final String key;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private StringTermsBucket(Builder builder) {
-		super(builder);
+    private StringTermsBucket(Builder builder) {
+        super(builder);
 
-		this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
+        this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
 
-	}
+    }
 
-	public static StringTermsBucket of(Function<Builder, ObjectBuilder<StringTermsBucket>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static StringTermsBucket of(Function<Builder, ObjectBuilder<StringTermsBucket>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code key}
-	 */
-	public final String key() {
-		return this.key;
-	}
+    /**
+     * Required - API name: {@code key}
+     */
+    public final String key() {
+        return this.key;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("key");
-		generator.write(this.key);
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("key");
+        generator.write(this.key);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link StringTermsBucket}.
-	 */
+    /**
+     * Builder for {@link StringTermsBucket}.
+     */
 
-	public static class Builder extends TermsBucketBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<StringTermsBucket> {
-		private String key;
+    public static class Builder extends TermsBucketBase.AbstractBuilder<Builder> implements ObjectBuilder<StringTermsBucket> {
+        private String key;
 
-		/**
-		 * Required - API name: {@code key}
-		 */
-		public final Builder key(String value) {
-			this.key = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code key}
+         */
+        public final Builder key(String value) {
+            this.key = value;
+            return this;
+        }
 
-		@Override
-		protected Builder self() {
-			return this;
-		}
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link StringTermsBucket}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StringTermsBucket build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link StringTermsBucket}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StringTermsBucket build() {
+            _checkSingleUse();
 
-			return new StringTermsBucket(this);
-		}
-	}
+            return new StringTermsBucket(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link StringTermsBucket}
-	 */
-	public static final JsonpDeserializer<StringTermsBucket> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, StringTermsBucket::setupStringTermsBucketDeserializer);
+    /**
+     * Json deserializer for {@link StringTermsBucket}
+     */
+    public static final JsonpDeserializer<StringTermsBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StringTermsBucket::setupStringTermsBucketDeserializer
+    );
 
-	protected static void setupStringTermsBucketDeserializer(ObjectDeserializer<StringTermsBucket.Builder> op) {
-		setupTermsBucketBaseDeserializer(op);
-		op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
+    protected static void setupStringTermsBucketDeserializer(ObjectDeserializer<StringTermsBucket.Builder> op) {
+        setupTermsBucketBaseDeserializer(op);
+        op.add(Builder::key, JsonpDeserializer.stringDeserializer(), "key");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SumAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SumAggregate.java
index 2bc701db80..44879a8685 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SumAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SumAggregate.java
@@ -32,14 +32,13 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.SumAggregate
 
 /**
@@ -49,63 +48,63 @@
  */
 @JsonpDeserializable
 public class SumAggregate extends SingleMetricAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private SumAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static SumAggregate of(Function<Builder, ObjectBuilder<SumAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Sum;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SumAggregate}.
-	 */
-
-	public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SumAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SumAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SumAggregate build() {
-			_checkSingleUse();
-
-			return new SumAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SumAggregate}
-	 */
-	public static final JsonpDeserializer<SumAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SumAggregate::setupSumAggregateDeserializer);
-
-	protected static void setupSumAggregateDeserializer(ObjectDeserializer<SumAggregate.Builder> op) {
-		setupSingleMetricAggregateBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private SumAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static SumAggregate of(Function<Builder, ObjectBuilder<SumAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Sum;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SumAggregate}.
+     */
+
+    public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<SumAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SumAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SumAggregate build() {
+            _checkSingleUse();
+
+            return new SumAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SumAggregate}
+     */
+    public static final JsonpDeserializer<SumAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SumAggregate::setupSumAggregateDeserializer
+    );
+
+    protected static void setupSumAggregateDeserializer(ObjectDeserializer<SumAggregate.Builder> op) {
+        setupSingleMetricAggregateBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SumAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SumAggregation.java
index 27ed3ee0a2..b982937929 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SumAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SumAggregation.java
@@ -32,76 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.SumAggregation
 
-
 @JsonpDeserializable
 public class SumAggregation extends FormatMetricAggregationBase implements AggregationVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private SumAggregation(Builder builder) {
-		super(builder);
-
-	}
-
-	public static SumAggregation of(Function<Builder, ObjectBuilder<SumAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Sum;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SumAggregation}.
-	 */
-
-	public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SumAggregation> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SumAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SumAggregation build() {
-			_checkSingleUse();
-
-			return new SumAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SumAggregation}
-	 */
-	public static final JsonpDeserializer<SumAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SumAggregation::setupSumAggregationDeserializer);
-
-	protected static void setupSumAggregationDeserializer(ObjectDeserializer<SumAggregation.Builder> op) {
-		setupFormatMetricAggregationBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private SumAggregation(Builder builder) {
+        super(builder);
+
+    }
+
+    public static SumAggregation of(Function<Builder, ObjectBuilder<SumAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Sum;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SumAggregation}.
+     */
+
+    public static class Builder extends FormatMetricAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<SumAggregation> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SumAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SumAggregation build() {
+            _checkSingleUse();
+
+            return new SumAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SumAggregation}
+     */
+    public static final JsonpDeserializer<SumAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SumAggregation::setupSumAggregationDeserializer
+    );
+
+    protected static void setupSumAggregationDeserializer(ObjectDeserializer<SumAggregation.Builder> op) {
+        setupFormatMetricAggregationBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SumBucketAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SumBucketAggregation.java
index 417ea33de5..422508d74e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SumBucketAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SumBucketAggregation.java
@@ -32,76 +32,74 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.SumBucketAggregation
 
-
 @JsonpDeserializable
 public class SumBucketAggregation extends PipelineAggregationBase implements AggregationVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private SumBucketAggregation(Builder builder) {
-		super(builder);
-
-	}
-
-	public static SumBucketAggregation of(Function<Builder, ObjectBuilder<SumBucketAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.SumBucket;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SumBucketAggregation}.
-	 */
-
-	public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SumBucketAggregation> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SumBucketAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SumBucketAggregation build() {
-			_checkSingleUse();
-
-			return new SumBucketAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SumBucketAggregation}
-	 */
-	public static final JsonpDeserializer<SumBucketAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SumBucketAggregation::setupSumBucketAggregationDeserializer);
-
-	protected static void setupSumBucketAggregationDeserializer(ObjectDeserializer<SumBucketAggregation.Builder> op) {
-		PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private SumBucketAggregation(Builder builder) {
+        super(builder);
+
+    }
+
+    public static SumBucketAggregation of(Function<Builder, ObjectBuilder<SumBucketAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.SumBucket;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SumBucketAggregation}.
+     */
+
+    public static class Builder extends PipelineAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<SumBucketAggregation> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SumBucketAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SumBucketAggregation build() {
+            _checkSingleUse();
+
+            return new SumBucketAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SumBucketAggregation}
+     */
+    public static final JsonpDeserializer<SumBucketAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SumBucketAggregation::setupSumBucketAggregationDeserializer
+    );
+
+    protected static void setupSumBucketAggregationDeserializer(ObjectDeserializer<SumBucketAggregation.Builder> op) {
+        PipelineAggregationBase.setupPipelineAggregationBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TDigest.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TDigest.java
index 2e22d15b5c..50218c8ff0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TDigest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TDigest.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,100 +43,98 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.TDigest
 
-
 @JsonpDeserializable
 public class TDigest implements JsonpSerializable {
-	@Nullable
-	private final Integer compression;
+    @Nullable
+    private final Integer compression;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private TDigest(Builder builder) {
+    private TDigest(Builder builder) {
 
-		this.compression = builder.compression;
+        this.compression = builder.compression;
 
-	}
+    }
 
-	public static TDigest of(Function<Builder, ObjectBuilder<TDigest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static TDigest of(Function<Builder, ObjectBuilder<TDigest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * API name: {@code compression}
-	 */
-	@Nullable
-	public final Integer compression() {
-		return this.compression;
-	}
+    /**
+     * API name: {@code compression}
+     */
+    @Nullable
+    public final Integer compression() {
+        return this.compression;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		if (this.compression != null) {
-			generator.writeKey("compression");
-			generator.write(this.compression);
+        if (this.compression != null) {
+            generator.writeKey("compression");
+            generator.write(this.compression);
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link TDigest}.
-	 */
+    /**
+     * Builder for {@link TDigest}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TDigest> {
-		@Nullable
-		private Integer compression;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TDigest> {
+        @Nullable
+        private Integer compression;
 
-		/**
-		 * API name: {@code compression}
-		 */
-		public final Builder compression(@Nullable Integer value) {
-			this.compression = value;
-			return this;
-		}
+        /**
+         * API name: {@code compression}
+         */
+        public final Builder compression(@Nullable Integer value) {
+            this.compression = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link TDigest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TDigest build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link TDigest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TDigest build() {
+            _checkSingleUse();
 
-			return new TDigest(this);
-		}
-	}
+            return new TDigest(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link TDigest}
-	 */
-	public static final JsonpDeserializer<TDigest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TDigest::setupTDigestDeserializer);
+    /**
+     * Json deserializer for {@link TDigest}
+     */
+    public static final JsonpDeserializer<TDigest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TDigest::setupTDigestDeserializer
+    );
 
-	protected static void setupTDigestDeserializer(ObjectDeserializer<TDigest.Builder> op) {
+    protected static void setupTDigestDeserializer(ObjectDeserializer<TDigest.Builder> op) {
 
-		op.add(Builder::compression, JsonpDeserializer.integerDeserializer(), "compression");
+        op.add(Builder::compression, JsonpDeserializer.integerDeserializer(), "compression");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TDigestPercentileRanksAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TDigestPercentileRanksAggregate.java
index 734aeb42cd..9f25af18bb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TDigestPercentileRanksAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TDigestPercentileRanksAggregate.java
@@ -32,78 +32,76 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.TDigestPercentileRanksAggregate
 
-
 @JsonpDeserializable
 public class TDigestPercentileRanksAggregate extends PercentilesAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private TDigestPercentileRanksAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static TDigestPercentileRanksAggregate of(
-			Function<Builder, ObjectBuilder<TDigestPercentileRanksAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.TdigestPercentileRanks;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TDigestPercentileRanksAggregate}.
-	 */
-
-	public static class Builder extends PercentilesAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<TDigestPercentileRanksAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TDigestPercentileRanksAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TDigestPercentileRanksAggregate build() {
-			_checkSingleUse();
-
-			return new TDigestPercentileRanksAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TDigestPercentileRanksAggregate}
-	 */
-	public static final JsonpDeserializer<TDigestPercentileRanksAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, TDigestPercentileRanksAggregate::setupTDigestPercentileRanksAggregateDeserializer);
-
-	protected static void setupTDigestPercentileRanksAggregateDeserializer(
-			ObjectDeserializer<TDigestPercentileRanksAggregate.Builder> op) {
-		PercentilesAggregateBase.setupPercentilesAggregateBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private TDigestPercentileRanksAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static TDigestPercentileRanksAggregate of(Function<Builder, ObjectBuilder<TDigestPercentileRanksAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.TdigestPercentileRanks;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TDigestPercentileRanksAggregate}.
+     */
+
+    public static class Builder extends PercentilesAggregateBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<TDigestPercentileRanksAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TDigestPercentileRanksAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TDigestPercentileRanksAggregate build() {
+            _checkSingleUse();
+
+            return new TDigestPercentileRanksAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TDigestPercentileRanksAggregate}
+     */
+    public static final JsonpDeserializer<TDigestPercentileRanksAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TDigestPercentileRanksAggregate::setupTDigestPercentileRanksAggregateDeserializer
+    );
+
+    protected static void setupTDigestPercentileRanksAggregateDeserializer(ObjectDeserializer<TDigestPercentileRanksAggregate.Builder> op) {
+        PercentilesAggregateBase.setupPercentilesAggregateBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TDigestPercentilesAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TDigestPercentilesAggregate.java
index d77f418f3f..4d6a6644fe 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TDigestPercentilesAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TDigestPercentilesAggregate.java
@@ -32,77 +32,76 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.TDigestPercentilesAggregate
 
-
 @JsonpDeserializable
 public class TDigestPercentilesAggregate extends PercentilesAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private TDigestPercentilesAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static TDigestPercentilesAggregate of(Function<Builder, ObjectBuilder<TDigestPercentilesAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.TdigestPercentiles;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TDigestPercentilesAggregate}.
-	 */
-
-	public static class Builder extends PercentilesAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<TDigestPercentilesAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TDigestPercentilesAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TDigestPercentilesAggregate build() {
-			_checkSingleUse();
-
-			return new TDigestPercentilesAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TDigestPercentilesAggregate}
-	 */
-	public static final JsonpDeserializer<TDigestPercentilesAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, TDigestPercentilesAggregate::setupTDigestPercentilesAggregateDeserializer);
-
-	protected static void setupTDigestPercentilesAggregateDeserializer(
-			ObjectDeserializer<TDigestPercentilesAggregate.Builder> op) {
-		setupPercentilesAggregateBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private TDigestPercentilesAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static TDigestPercentilesAggregate of(Function<Builder, ObjectBuilder<TDigestPercentilesAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.TdigestPercentiles;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TDigestPercentilesAggregate}.
+     */
+
+    public static class Builder extends PercentilesAggregateBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<TDigestPercentilesAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TDigestPercentilesAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TDigestPercentilesAggregate build() {
+            _checkSingleUse();
+
+            return new TDigestPercentilesAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TDigestPercentilesAggregate}
+     */
+    public static final JsonpDeserializer<TDigestPercentilesAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TDigestPercentilesAggregate::setupTDigestPercentilesAggregateDeserializer
+    );
+
+    protected static void setupTDigestPercentilesAggregateDeserializer(ObjectDeserializer<TDigestPercentilesAggregate.Builder> op) {
+        setupPercentilesAggregateBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TTestAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TTestAggregate.java
index 6984ba686a..8ee6e1630d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TTestAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TTestAggregate.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,135 +43,131 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.TTestAggregate
 
-
 @JsonpDeserializable
 public class TTestAggregate extends AggregateBase implements AggregateVariant {
-	private final double value;
-
-	@Nullable
-	private final String valueAsString;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TTestAggregate(Builder builder) {
-		super(builder);
-
-		this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
-		this.valueAsString = builder.valueAsString;
-
-	}
-
-	public static TTestAggregate of(Function<Builder, ObjectBuilder<TTestAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.TTest;
-	}
-
-	/**
-	 * Required - API name: {@code value}
-	 * <p>
-	 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-	 */
-	public final double value() {
-		return this.value;
-	}
-
-	/**
-	 * API name: {@code value_as_string}
-	 */
-	@Nullable
-	public final String valueAsString() {
-		return this.valueAsString;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("value");
-		JsonpUtils.serializeDoubleOrNull(generator, this.value, 0);
-		if (this.valueAsString != null) {
-			generator.writeKey("value_as_string");
-			generator.write(this.valueAsString);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TTestAggregate}.
-	 */
-
-	public static class Builder extends AggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<TTestAggregate> {
-		private Double value;
-
-		@Nullable
-		private String valueAsString;
-
-		/**
-		 * Required - API name: {@code value}
-		 * <p>
-		 * Defaults to {@code 0} if parsed from a JSON {@code null} value.
-		 */
-		public final Builder value(double value) {
-			this.value = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code value_as_string}
-		 */
-		public final Builder valueAsString(@Nullable String value) {
-			this.valueAsString = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TTestAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TTestAggregate build() {
-			_checkSingleUse();
-
-			return new TTestAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TTestAggregate}
-	 */
-	public static final JsonpDeserializer<TTestAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TTestAggregate::setupTTestAggregateDeserializer);
-
-	protected static void setupTTestAggregateDeserializer(ObjectDeserializer<TTestAggregate.Builder> op) {
-		AggregateBase.setupAggregateBaseDeserializer(op);
-		op.add(Builder::value, JsonpDeserializer.doubleOrNullDeserializer(0), "value");
-		op.add(Builder::valueAsString, JsonpDeserializer.stringDeserializer(), "value_as_string");
-
-	}
+    private final double value;
+
+    @Nullable
+    private final String valueAsString;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TTestAggregate(Builder builder) {
+        super(builder);
+
+        this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
+        this.valueAsString = builder.valueAsString;
+
+    }
+
+    public static TTestAggregate of(Function<Builder, ObjectBuilder<TTestAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.TTest;
+    }
+
+    /**
+     * Required - API name: {@code value}
+     * <p>
+     * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+     */
+    public final double value() {
+        return this.value;
+    }
+
+    /**
+     * API name: {@code value_as_string}
+     */
+    @Nullable
+    public final String valueAsString() {
+        return this.valueAsString;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("value");
+        JsonpUtils.serializeDoubleOrNull(generator, this.value, 0);
+        if (this.valueAsString != null) {
+            generator.writeKey("value_as_string");
+            generator.write(this.valueAsString);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TTestAggregate}.
+     */
+
+    public static class Builder extends AggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<TTestAggregate> {
+        private Double value;
+
+        @Nullable
+        private String valueAsString;
+
+        /**
+         * Required - API name: {@code value}
+         * <p>
+         * Defaults to {@code 0} if parsed from a JSON {@code null} value.
+         */
+        public final Builder value(double value) {
+            this.value = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code value_as_string}
+         */
+        public final Builder valueAsString(@Nullable String value) {
+            this.valueAsString = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TTestAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TTestAggregate build() {
+            _checkSingleUse();
+
+            return new TTestAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TTestAggregate}
+     */
+    public static final JsonpDeserializer<TTestAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TTestAggregate::setupTTestAggregateDeserializer
+    );
+
+    protected static void setupTTestAggregateDeserializer(ObjectDeserializer<TTestAggregate.Builder> op) {
+        AggregateBase.setupAggregateBaseDeserializer(op);
+        op.add(Builder::value, JsonpDeserializer.doubleOrNullDeserializer(0), "value");
+        op.add(Builder::valueAsString, JsonpDeserializer.stringDeserializer(), "value_as_string");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TTestAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TTestAggregation.java
index c04e7ac8f0..418b5ecf26 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TTestAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TTestAggregation.java
@@ -32,186 +32,184 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.TTestAggregation
 
-
 @JsonpDeserializable
 public class TTestAggregation extends AggregationBase implements AggregationVariant {
-	@Nullable
-	private final TestPopulation a;
-
-	@Nullable
-	private final TestPopulation b;
-
-	@Nullable
-	private final TTestType type;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TTestAggregation(Builder builder) {
-		super(builder);
-
-		this.a = builder.a;
-		this.b = builder.b;
-		this.type = builder.type;
-
-	}
-
-	public static TTestAggregation of(Function<Builder, ObjectBuilder<TTestAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.TTest;
-	}
-
-	/**
-	 * API name: {@code a}
-	 */
-	@Nullable
-	public final TestPopulation a() {
-		return this.a;
-	}
-
-	/**
-	 * API name: {@code b}
-	 */
-	@Nullable
-	public final TestPopulation b() {
-		return this.b;
-	}
-
-	/**
-	 * API name: {@code type}
-	 */
-	@Nullable
-	public final TTestType type() {
-		return this.type;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.a != null) {
-			generator.writeKey("a");
-			this.a.serialize(generator, mapper);
-
-		}
-		if (this.b != null) {
-			generator.writeKey("b");
-			this.b.serialize(generator, mapper);
-
-		}
-		if (this.type != null) {
-			generator.writeKey("type");
-			this.type.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TTestAggregation}.
-	 */
-
-	public static class Builder extends AggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<TTestAggregation> {
-		@Nullable
-		private TestPopulation a;
-
-		@Nullable
-		private TestPopulation b;
-
-		@Nullable
-		private TTestType type;
-
-		/**
-		 * API name: {@code a}
-		 */
-		public final Builder a(@Nullable TestPopulation value) {
-			this.a = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code a}
-		 */
-		public final Builder a(Function<TestPopulation.Builder, ObjectBuilder<TestPopulation>> fn) {
-			return this.a(fn.apply(new TestPopulation.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code b}
-		 */
-		public final Builder b(@Nullable TestPopulation value) {
-			this.b = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code b}
-		 */
-		public final Builder b(Function<TestPopulation.Builder, ObjectBuilder<TestPopulation>> fn) {
-			return this.b(fn.apply(new TestPopulation.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code type}
-		 */
-		public final Builder type(@Nullable TTestType value) {
-			this.type = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TTestAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TTestAggregation build() {
-			_checkSingleUse();
-
-			return new TTestAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TTestAggregation}
-	 */
-	public static final JsonpDeserializer<TTestAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TTestAggregation::setupTTestAggregationDeserializer);
-
-	protected static void setupTTestAggregationDeserializer(ObjectDeserializer<TTestAggregation.Builder> op) {
-		setupAggregationBaseDeserializer(op);
-		op.add(Builder::a, TestPopulation._DESERIALIZER, "a");
-		op.add(Builder::b, TestPopulation._DESERIALIZER, "b");
-		op.add(Builder::type, TTestType._DESERIALIZER, "type");
-
-	}
+    @Nullable
+    private final TestPopulation a;
+
+    @Nullable
+    private final TestPopulation b;
+
+    @Nullable
+    private final TTestType type;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TTestAggregation(Builder builder) {
+        super(builder);
+
+        this.a = builder.a;
+        this.b = builder.b;
+        this.type = builder.type;
+
+    }
+
+    public static TTestAggregation of(Function<Builder, ObjectBuilder<TTestAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.TTest;
+    }
+
+    /**
+     * API name: {@code a}
+     */
+    @Nullable
+    public final TestPopulation a() {
+        return this.a;
+    }
+
+    /**
+     * API name: {@code b}
+     */
+    @Nullable
+    public final TestPopulation b() {
+        return this.b;
+    }
+
+    /**
+     * API name: {@code type}
+     */
+    @Nullable
+    public final TTestType type() {
+        return this.type;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.a != null) {
+            generator.writeKey("a");
+            this.a.serialize(generator, mapper);
+
+        }
+        if (this.b != null) {
+            generator.writeKey("b");
+            this.b.serialize(generator, mapper);
+
+        }
+        if (this.type != null) {
+            generator.writeKey("type");
+            this.type.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TTestAggregation}.
+     */
+
+    public static class Builder extends AggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<TTestAggregation> {
+        @Nullable
+        private TestPopulation a;
+
+        @Nullable
+        private TestPopulation b;
+
+        @Nullable
+        private TTestType type;
+
+        /**
+         * API name: {@code a}
+         */
+        public final Builder a(@Nullable TestPopulation value) {
+            this.a = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code a}
+         */
+        public final Builder a(Function<TestPopulation.Builder, ObjectBuilder<TestPopulation>> fn) {
+            return this.a(fn.apply(new TestPopulation.Builder()).build());
+        }
+
+        /**
+         * API name: {@code b}
+         */
+        public final Builder b(@Nullable TestPopulation value) {
+            this.b = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code b}
+         */
+        public final Builder b(Function<TestPopulation.Builder, ObjectBuilder<TestPopulation>> fn) {
+            return this.b(fn.apply(new TestPopulation.Builder()).build());
+        }
+
+        /**
+         * API name: {@code type}
+         */
+        public final Builder type(@Nullable TTestType value) {
+            this.type = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TTestAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TTestAggregation build() {
+            _checkSingleUse();
+
+            return new TTestAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TTestAggregation}
+     */
+    public static final JsonpDeserializer<TTestAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TTestAggregation::setupTTestAggregationDeserializer
+    );
+
+    protected static void setupTTestAggregationDeserializer(ObjectDeserializer<TTestAggregation.Builder> op) {
+        setupAggregationBaseDeserializer(op);
+        op.add(Builder::a, TestPopulation._DESERIALIZER, "a");
+        op.add(Builder::b, TestPopulation._DESERIALIZER, "b");
+        op.add(Builder::type, TTestType._DESERIALIZER, "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TTestType.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TTestType.java
index 6ed9e7a111..9f9aedcdbd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TTestType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TTestType.java
@@ -35,27 +35,25 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum TTestType implements JsonEnum {
-	Paired("paired"),
+    Paired("paired"),
 
-	Homoscedastic("homoscedastic"),
+    Homoscedastic("homoscedastic"),
 
-	Heteroscedastic("heteroscedastic"),
+    Heteroscedastic("heteroscedastic"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	TTestType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    TTestType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<TTestType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			TTestType.values());
+    public static final JsonEnum.Deserializer<TTestType> _DESERIALIZER = new JsonEnum.Deserializer<>(TTestType.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsAggregateBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsAggregateBase.java
index dd07c99abc..0b91a4ea7f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsAggregateBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsAggregateBase.java
@@ -32,95 +32,93 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
-import jakarta.json.stream.JsonGenerator;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.TermsAggregateBase
 
-
-
 public abstract class TermsAggregateBase<TBucket> extends MultiBucketAggregateBase<TBucket> {
-	@Nullable
-	private final Long docCountErrorUpperBound;
-
-	private final long sumOtherDocCount;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected TermsAggregateBase(AbstractBuilder<TBucket, ?> builder) {
-		super(builder);
-
-		this.docCountErrorUpperBound = builder.docCountErrorUpperBound;
-		this.sumOtherDocCount = ApiTypeHelper.requireNonNull(builder.sumOtherDocCount, this, "sumOtherDocCount");
-
-	}
-
-	/**
-	 * API name: {@code doc_count_error_upper_bound}
-	 */
-	@Nullable
-	public final Long docCountErrorUpperBound() {
-		return this.docCountErrorUpperBound;
-	}
-
-	/**
-	 * Required - API name: {@code sum_other_doc_count}
-	 */
-	public final long sumOtherDocCount() {
-		return this.sumOtherDocCount;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.docCountErrorUpperBound != null) {
-			generator.writeKey("doc_count_error_upper_bound");
-			generator.write(this.docCountErrorUpperBound);
-
-		}
-		generator.writeKey("sum_other_doc_count");
-		generator.write(this.sumOtherDocCount);
-
-	}
-
-	protected abstract static class AbstractBuilder<TBucket, BuilderT extends AbstractBuilder<TBucket, BuilderT>>
-			extends
-				MultiBucketAggregateBase.AbstractBuilder<TBucket, BuilderT> {
-		@Nullable
-		private Long docCountErrorUpperBound;
-
-		private Long sumOtherDocCount;
-
-		/**
-		 * API name: {@code doc_count_error_upper_bound}
-		 */
-		public final BuilderT docCountErrorUpperBound(@Nullable Long value) {
-			this.docCountErrorUpperBound = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code sum_other_doc_count}
-		 */
-		public final BuilderT sumOtherDocCount(long value) {
-			this.sumOtherDocCount = value;
-			return self();
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <TBucket, BuilderT extends AbstractBuilder<TBucket, BuilderT>> void setupTermsAggregateBaseDeserializer(
-			ObjectDeserializer<BuilderT> op, JsonpDeserializer<TBucket> tBucketDeserializer) {
-		MultiBucketAggregateBase.setupMultiBucketAggregateBaseDeserializer(op, tBucketDeserializer);
-		op.add(AbstractBuilder::docCountErrorUpperBound, JsonpDeserializer.longDeserializer(),
-				"doc_count_error_upper_bound");
-		op.add(AbstractBuilder::sumOtherDocCount, JsonpDeserializer.longDeserializer(), "sum_other_doc_count");
-
-	}
+    @Nullable
+    private final Long docCountErrorUpperBound;
+
+    private final long sumOtherDocCount;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected TermsAggregateBase(AbstractBuilder<TBucket, ?> builder) {
+        super(builder);
+
+        this.docCountErrorUpperBound = builder.docCountErrorUpperBound;
+        this.sumOtherDocCount = ApiTypeHelper.requireNonNull(builder.sumOtherDocCount, this, "sumOtherDocCount");
+
+    }
+
+    /**
+     * API name: {@code doc_count_error_upper_bound}
+     */
+    @Nullable
+    public final Long docCountErrorUpperBound() {
+        return this.docCountErrorUpperBound;
+    }
+
+    /**
+     * Required - API name: {@code sum_other_doc_count}
+     */
+    public final long sumOtherDocCount() {
+        return this.sumOtherDocCount;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.docCountErrorUpperBound != null) {
+            generator.writeKey("doc_count_error_upper_bound");
+            generator.write(this.docCountErrorUpperBound);
+
+        }
+        generator.writeKey("sum_other_doc_count");
+        generator.write(this.sumOtherDocCount);
+
+    }
+
+    protected abstract static class AbstractBuilder<TBucket, BuilderT extends AbstractBuilder<TBucket, BuilderT>> extends
+        MultiBucketAggregateBase.AbstractBuilder<TBucket, BuilderT> {
+        @Nullable
+        private Long docCountErrorUpperBound;
+
+        private Long sumOtherDocCount;
+
+        /**
+         * API name: {@code doc_count_error_upper_bound}
+         */
+        public final BuilderT docCountErrorUpperBound(@Nullable Long value) {
+            this.docCountErrorUpperBound = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code sum_other_doc_count}
+         */
+        public final BuilderT sumOtherDocCount(long value) {
+            this.sumOtherDocCount = value;
+            return self();
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <TBucket, BuilderT extends AbstractBuilder<TBucket, BuilderT>> void setupTermsAggregateBaseDeserializer(
+        ObjectDeserializer<BuilderT> op,
+        JsonpDeserializer<TBucket> tBucketDeserializer
+    ) {
+        MultiBucketAggregateBase.setupMultiBucketAggregateBaseDeserializer(op, tBucketDeserializer);
+        op.add(AbstractBuilder::docCountErrorUpperBound, JsonpDeserializer.longDeserializer(), "doc_count_error_upper_bound");
+        op.add(AbstractBuilder::sumOtherDocCount, JsonpDeserializer.longDeserializer(), "sum_other_doc_count");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsAggregation.java
index a6e6967fdf..94797253a9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsAggregation.java
@@ -32,575 +32,576 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.FieldValue;
-import org.opensearch.client.opensearch._types.Script;
-import org.opensearch.client.opensearch._types.SortOrder;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.FieldValue;
+import org.opensearch.client.opensearch._types.Script;
+import org.opensearch.client.opensearch._types.SortOrder;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.TermsAggregation
 
-
 @JsonpDeserializable
 public class TermsAggregation extends BucketAggregationBase implements AggregationVariant {
-	@Nullable
-	private final TermsAggregationCollectMode collectMode;
-
-	@Nullable
-	private final TermsExclude exclude;
-
-	@Nullable
-	private final TermsAggregationExecutionHint executionHint;
-
-	@Nullable
-	private final String field;
-
-	@Nullable
-	private final TermsInclude include;
-
-	@Nullable
-	private final Integer minDocCount;
-
-	@Nullable
-	private final FieldValue missing;
-
-	@Nullable
-	private final MissingOrder missingOrder;
-
-	@Nullable
-	private final Boolean missingBucket;
-
-	@Nullable
-	private final String valueType;
-
-	private final List<Map<String, SortOrder>> order;
-
-	@Nullable
-	private final Script script;
-
-	@Nullable
-	private final Integer shardSize;
-
-	@Nullable
-	private final Boolean showTermDocCountError;
-
-	@Nullable
-	private final Integer size;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TermsAggregation(Builder builder) {
-		super(builder);
-
-		this.collectMode = builder.collectMode;
-		this.exclude = builder.exclude;
-		this.executionHint = builder.executionHint;
-		this.field = builder.field;
-		this.include = builder.include;
-		this.minDocCount = builder.minDocCount;
-		this.missing = builder.missing;
-		this.missingOrder = builder.missingOrder;
-		this.missingBucket = builder.missingBucket;
-		this.valueType = builder.valueType;
-		this.order = ApiTypeHelper.unmodifiable(builder.order);
-		this.script = builder.script;
-		this.shardSize = builder.shardSize;
-		this.showTermDocCountError = builder.showTermDocCountError;
-		this.size = builder.size;
-
-	}
-
-	public static TermsAggregation of(Function<Builder, ObjectBuilder<TermsAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Terms;
-	}
-
-	/**
-	 * API name: {@code collect_mode}
-	 */
-	@Nullable
-	public final TermsAggregationCollectMode collectMode() {
-		return this.collectMode;
-	}
-
-	/**
-	 * API name: {@code exclude}
-	 */
-	@Nullable
-	public final TermsExclude exclude() {
-		return this.exclude;
-	}
-
-	/**
-	 * API name: {@code execution_hint}
-	 */
-	@Nullable
-	public final TermsAggregationExecutionHint executionHint() {
-		return this.executionHint;
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code include}
-	 */
-	@Nullable
-	public final TermsInclude include() {
-		return this.include;
-	}
-
-	/**
-	 * API name: {@code min_doc_count}
-	 */
-	@Nullable
-	public final Integer minDocCount() {
-		return this.minDocCount;
-	}
-
-	/**
-	 * API name: {@code missing}
-	 */
-	@Nullable
-	public final FieldValue missing() {
-		return this.missing;
-	}
-
-	/**
-	 * API name: {@code missing_order}
-	 */
-	@Nullable
-	public final MissingOrder missingOrder() {
-		return this.missingOrder;
-	}
-
-	/**
-	 * API name: {@code missing_bucket}
-	 */
-	@Nullable
-	public final Boolean missingBucket() {
-		return this.missingBucket;
-	}
-
-	/**
-	 * API name: {@code value_type}
-	 */
-	@Nullable
-	public final String valueType() {
-		return this.valueType;
-	}
-
-	/**
-	 * API name: {@code order}
-	 */
-	public final List<Map<String, SortOrder>> order() {
-		return this.order;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final Script script() {
-		return this.script;
-	}
-
-	/**
-	 * API name: {@code shard_size}
-	 */
-	@Nullable
-	public final Integer shardSize() {
-		return this.shardSize;
-	}
-
-	/**
-	 * API name: {@code show_term_doc_count_error}
-	 */
-	@Nullable
-	public final Boolean showTermDocCountError() {
-		return this.showTermDocCountError;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.collectMode != null) {
-			generator.writeKey("collect_mode");
-			this.collectMode.serialize(generator, mapper);
-		}
-		if (this.exclude != null) {
-			generator.writeKey("exclude");
-			this.exclude.serialize(generator, mapper);
-
-		}
-		if (this.executionHint != null) {
-			generator.writeKey("execution_hint");
-			this.executionHint.serialize(generator, mapper);
-		}
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (this.include != null) {
-			generator.writeKey("include");
-			this.include.serialize(generator, mapper);
-
-		}
-		if (this.minDocCount != null) {
-			generator.writeKey("min_doc_count");
-			generator.write(this.minDocCount);
-
-		}
-		if (this.missing != null) {
-			generator.writeKey("missing");
-			this.missing.serialize(generator, mapper);
-
-		}
-		if (this.missingOrder != null) {
-			generator.writeKey("missing_order");
-			this.missingOrder.serialize(generator, mapper);
-		}
-		if (this.missingBucket != null) {
-			generator.writeKey("missing_bucket");
-			generator.write(this.missingBucket);
-
-		}
-		if (this.valueType != null) {
-			generator.writeKey("value_type");
-			generator.write(this.valueType);
-
-		}
-		if (ApiTypeHelper.isDefined(this.order)) {
-			generator.writeKey("order");
-			generator.writeStartArray();
-			for (Map<String, SortOrder> item0 : this.order) {
-				generator.writeStartObject();
-				if (item0 != null) {
-					for (Map.Entry<String, SortOrder> item1 : item0.entrySet()) {
-						generator.writeKey(item1.getKey());
-						item1.getValue().serialize(generator, mapper);
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-		if (this.shardSize != null) {
-			generator.writeKey("shard_size");
-			generator.write(this.shardSize);
-
-		}
-		if (this.showTermDocCountError != null) {
-			generator.writeKey("show_term_doc_count_error");
-			generator.write(this.showTermDocCountError);
-
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TermsAggregation}.
-	 */
-
-	public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<TermsAggregation> {
-		@Nullable
-		private TermsAggregationCollectMode collectMode;
-
-		@Nullable
-		private TermsExclude exclude;
-
-		@Nullable
-		private TermsAggregationExecutionHint executionHint;
-
-		@Nullable
-		private String field;
-
-		@Nullable
-		private TermsInclude include;
-
-		@Nullable
-		private Integer minDocCount;
-
-		@Nullable
-		private FieldValue missing;
-
-		@Nullable
-		private MissingOrder missingOrder;
-
-		@Nullable
-		private Boolean missingBucket;
-
-		@Nullable
-		private String valueType;
-
-		@Nullable
-		private List<Map<String, SortOrder>> order;
-
-		@Nullable
-		private Script script;
-
-		@Nullable
-		private Integer shardSize;
-
-		@Nullable
-		private Boolean showTermDocCountError;
-
-		@Nullable
-		private Integer size;
-
-		/**
-		 * API name: {@code collect_mode}
-		 */
-		public final Builder collectMode(@Nullable TermsAggregationCollectMode value) {
-			this.collectMode = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code exclude}
-		 */
-		public final Builder exclude(@Nullable TermsExclude value) {
-			this.exclude = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code exclude}
-		 */
-		public final Builder exclude(Function<TermsExclude.Builder, ObjectBuilder<TermsExclude>> fn) {
-			return this.exclude(fn.apply(new TermsExclude.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code execution_hint}
-		 */
-		public final Builder executionHint(@Nullable TermsAggregationExecutionHint value) {
-			this.executionHint = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code include}
-		 */
-		public final Builder include(@Nullable TermsInclude value) {
-			this.include = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code include}
-		 */
-		public final Builder include(Function<TermsInclude.Builder, ObjectBuilder<TermsInclude>> fn) {
-			return this.include(fn.apply(new TermsInclude.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code min_doc_count}
-		 */
-		public final Builder minDocCount(@Nullable Integer value) {
-			this.minDocCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code missing}
-		 */
-		public final Builder missing(@Nullable FieldValue value) {
-			this.missing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code missing}
-		 */
-		public final Builder missing(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
-			return this.missing(fn.apply(new FieldValue.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code missing_order}
-		 */
-		public final Builder missingOrder(@Nullable MissingOrder value) {
-			this.missingOrder = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code missing_bucket}
-		 */
-		public final Builder missingBucket(@Nullable Boolean value) {
-			this.missingBucket = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code value_type}
-		 */
-		public final Builder valueType(@Nullable String value) {
-			this.valueType = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code order}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>order</code>.
-		 */
-		public final Builder order(List<Map<String, SortOrder>> list) {
-			this.order = _listAddAll(this.order, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code order}
-		 * <p>
-		 * Adds one or more values to <code>order</code>.
-		 */
-		public final Builder order(Map<String, SortOrder> value, Map<String, SortOrder>... values) {
-			this.order = _listAdd(this.order, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(@Nullable Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code shard_size}
-		 */
-		public final Builder shardSize(@Nullable Integer value) {
-			this.shardSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code show_term_doc_count_error}
-		 */
-		public final Builder showTermDocCountError(@Nullable Boolean value) {
-			this.showTermDocCountError = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Integer value) {
-			this.size = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TermsAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TermsAggregation build() {
-			_checkSingleUse();
-
-			return new TermsAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TermsAggregation}
-	 */
-	public static final JsonpDeserializer<TermsAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TermsAggregation::setupTermsAggregationDeserializer);
-
-	protected static void setupTermsAggregationDeserializer(ObjectDeserializer<TermsAggregation.Builder> op) {
-		setupBucketAggregationBaseDeserializer(op);
-		op.add(Builder::collectMode, TermsAggregationCollectMode._DESERIALIZER, "collect_mode");
-		op.add(Builder::exclude, TermsExclude._DESERIALIZER, "exclude");
-		op.add(Builder::executionHint, TermsAggregationExecutionHint._DESERIALIZER, "execution_hint");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::include, TermsInclude._DESERIALIZER, "include");
-		op.add(Builder::minDocCount, JsonpDeserializer.integerDeserializer(), "min_doc_count");
-		op.add(Builder::missing, FieldValue._DESERIALIZER, "missing");
-		op.add(Builder::missingOrder, MissingOrder._DESERIALIZER, "missing_order");
-		op.add(Builder::missingBucket, JsonpDeserializer.booleanDeserializer(), "missing_bucket");
-		op.add(Builder::valueType, JsonpDeserializer.stringDeserializer(), "value_type");
-		op.add(Builder::order,
-				JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringMapDeserializer(SortOrder._DESERIALIZER)),
-				"order");
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-		op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
-		op.add(Builder::showTermDocCountError, JsonpDeserializer.booleanDeserializer(), "show_term_doc_count_error");
-		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
-
-	}
+    @Nullable
+    private final TermsAggregationCollectMode collectMode;
+
+    @Nullable
+    private final TermsExclude exclude;
+
+    @Nullable
+    private final TermsAggregationExecutionHint executionHint;
+
+    @Nullable
+    private final String field;
+
+    @Nullable
+    private final TermsInclude include;
+
+    @Nullable
+    private final Integer minDocCount;
+
+    @Nullable
+    private final FieldValue missing;
+
+    @Nullable
+    private final MissingOrder missingOrder;
+
+    @Nullable
+    private final Boolean missingBucket;
+
+    @Nullable
+    private final String valueType;
+
+    private final List<Map<String, SortOrder>> order;
+
+    @Nullable
+    private final Script script;
+
+    @Nullable
+    private final Integer shardSize;
+
+    @Nullable
+    private final Boolean showTermDocCountError;
+
+    @Nullable
+    private final Integer size;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TermsAggregation(Builder builder) {
+        super(builder);
+
+        this.collectMode = builder.collectMode;
+        this.exclude = builder.exclude;
+        this.executionHint = builder.executionHint;
+        this.field = builder.field;
+        this.include = builder.include;
+        this.minDocCount = builder.minDocCount;
+        this.missing = builder.missing;
+        this.missingOrder = builder.missingOrder;
+        this.missingBucket = builder.missingBucket;
+        this.valueType = builder.valueType;
+        this.order = ApiTypeHelper.unmodifiable(builder.order);
+        this.script = builder.script;
+        this.shardSize = builder.shardSize;
+        this.showTermDocCountError = builder.showTermDocCountError;
+        this.size = builder.size;
+
+    }
+
+    public static TermsAggregation of(Function<Builder, ObjectBuilder<TermsAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Terms;
+    }
+
+    /**
+     * API name: {@code collect_mode}
+     */
+    @Nullable
+    public final TermsAggregationCollectMode collectMode() {
+        return this.collectMode;
+    }
+
+    /**
+     * API name: {@code exclude}
+     */
+    @Nullable
+    public final TermsExclude exclude() {
+        return this.exclude;
+    }
+
+    /**
+     * API name: {@code execution_hint}
+     */
+    @Nullable
+    public final TermsAggregationExecutionHint executionHint() {
+        return this.executionHint;
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code include}
+     */
+    @Nullable
+    public final TermsInclude include() {
+        return this.include;
+    }
+
+    /**
+     * API name: {@code min_doc_count}
+     */
+    @Nullable
+    public final Integer minDocCount() {
+        return this.minDocCount;
+    }
+
+    /**
+     * API name: {@code missing}
+     */
+    @Nullable
+    public final FieldValue missing() {
+        return this.missing;
+    }
+
+    /**
+     * API name: {@code missing_order}
+     */
+    @Nullable
+    public final MissingOrder missingOrder() {
+        return this.missingOrder;
+    }
+
+    /**
+     * API name: {@code missing_bucket}
+     */
+    @Nullable
+    public final Boolean missingBucket() {
+        return this.missingBucket;
+    }
+
+    /**
+     * API name: {@code value_type}
+     */
+    @Nullable
+    public final String valueType() {
+        return this.valueType;
+    }
+
+    /**
+     * API name: {@code order}
+     */
+    public final List<Map<String, SortOrder>> order() {
+        return this.order;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final Script script() {
+        return this.script;
+    }
+
+    /**
+     * API name: {@code shard_size}
+     */
+    @Nullable
+    public final Integer shardSize() {
+        return this.shardSize;
+    }
+
+    /**
+     * API name: {@code show_term_doc_count_error}
+     */
+    @Nullable
+    public final Boolean showTermDocCountError() {
+        return this.showTermDocCountError;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.collectMode != null) {
+            generator.writeKey("collect_mode");
+            this.collectMode.serialize(generator, mapper);
+        }
+        if (this.exclude != null) {
+            generator.writeKey("exclude");
+            this.exclude.serialize(generator, mapper);
+
+        }
+        if (this.executionHint != null) {
+            generator.writeKey("execution_hint");
+            this.executionHint.serialize(generator, mapper);
+        }
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (this.include != null) {
+            generator.writeKey("include");
+            this.include.serialize(generator, mapper);
+
+        }
+        if (this.minDocCount != null) {
+            generator.writeKey("min_doc_count");
+            generator.write(this.minDocCount);
+
+        }
+        if (this.missing != null) {
+            generator.writeKey("missing");
+            this.missing.serialize(generator, mapper);
+
+        }
+        if (this.missingOrder != null) {
+            generator.writeKey("missing_order");
+            this.missingOrder.serialize(generator, mapper);
+        }
+        if (this.missingBucket != null) {
+            generator.writeKey("missing_bucket");
+            generator.write(this.missingBucket);
+
+        }
+        if (this.valueType != null) {
+            generator.writeKey("value_type");
+            generator.write(this.valueType);
+
+        }
+        if (ApiTypeHelper.isDefined(this.order)) {
+            generator.writeKey("order");
+            generator.writeStartArray();
+            for (Map<String, SortOrder> item0 : this.order) {
+                generator.writeStartObject();
+                if (item0 != null) {
+                    for (Map.Entry<String, SortOrder> item1 : item0.entrySet()) {
+                        generator.writeKey(item1.getKey());
+                        item1.getValue().serialize(generator, mapper);
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+        if (this.shardSize != null) {
+            generator.writeKey("shard_size");
+            generator.write(this.shardSize);
+
+        }
+        if (this.showTermDocCountError != null) {
+            generator.writeKey("show_term_doc_count_error");
+            generator.write(this.showTermDocCountError);
+
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TermsAggregation}.
+     */
+
+    public static class Builder extends BucketAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<TermsAggregation> {
+        @Nullable
+        private TermsAggregationCollectMode collectMode;
+
+        @Nullable
+        private TermsExclude exclude;
+
+        @Nullable
+        private TermsAggregationExecutionHint executionHint;
+
+        @Nullable
+        private String field;
+
+        @Nullable
+        private TermsInclude include;
+
+        @Nullable
+        private Integer minDocCount;
+
+        @Nullable
+        private FieldValue missing;
+
+        @Nullable
+        private MissingOrder missingOrder;
+
+        @Nullable
+        private Boolean missingBucket;
+
+        @Nullable
+        private String valueType;
+
+        @Nullable
+        private List<Map<String, SortOrder>> order;
+
+        @Nullable
+        private Script script;
+
+        @Nullable
+        private Integer shardSize;
+
+        @Nullable
+        private Boolean showTermDocCountError;
+
+        @Nullable
+        private Integer size;
+
+        /**
+         * API name: {@code collect_mode}
+         */
+        public final Builder collectMode(@Nullable TermsAggregationCollectMode value) {
+            this.collectMode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code exclude}
+         */
+        public final Builder exclude(@Nullable TermsExclude value) {
+            this.exclude = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code exclude}
+         */
+        public final Builder exclude(Function<TermsExclude.Builder, ObjectBuilder<TermsExclude>> fn) {
+            return this.exclude(fn.apply(new TermsExclude.Builder()).build());
+        }
+
+        /**
+         * API name: {@code execution_hint}
+         */
+        public final Builder executionHint(@Nullable TermsAggregationExecutionHint value) {
+            this.executionHint = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code include}
+         */
+        public final Builder include(@Nullable TermsInclude value) {
+            this.include = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code include}
+         */
+        public final Builder include(Function<TermsInclude.Builder, ObjectBuilder<TermsInclude>> fn) {
+            return this.include(fn.apply(new TermsInclude.Builder()).build());
+        }
+
+        /**
+         * API name: {@code min_doc_count}
+         */
+        public final Builder minDocCount(@Nullable Integer value) {
+            this.minDocCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code missing}
+         */
+        public final Builder missing(@Nullable FieldValue value) {
+            this.missing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code missing}
+         */
+        public final Builder missing(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
+            return this.missing(fn.apply(new FieldValue.Builder()).build());
+        }
+
+        /**
+         * API name: {@code missing_order}
+         */
+        public final Builder missingOrder(@Nullable MissingOrder value) {
+            this.missingOrder = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code missing_bucket}
+         */
+        public final Builder missingBucket(@Nullable Boolean value) {
+            this.missingBucket = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code value_type}
+         */
+        public final Builder valueType(@Nullable String value) {
+            this.valueType = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code order}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>order</code>.
+         */
+        public final Builder order(List<Map<String, SortOrder>> list) {
+            this.order = _listAddAll(this.order, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code order}
+         * <p>
+         * Adds one or more values to <code>order</code>.
+         */
+        public final Builder order(Map<String, SortOrder> value, Map<String, SortOrder>... values) {
+            this.order = _listAdd(this.order, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(@Nullable Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * API name: {@code shard_size}
+         */
+        public final Builder shardSize(@Nullable Integer value) {
+            this.shardSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code show_term_doc_count_error}
+         */
+        public final Builder showTermDocCountError(@Nullable Boolean value) {
+            this.showTermDocCountError = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Integer value) {
+            this.size = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TermsAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TermsAggregation build() {
+            _checkSingleUse();
+
+            return new TermsAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TermsAggregation}
+     */
+    public static final JsonpDeserializer<TermsAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TermsAggregation::setupTermsAggregationDeserializer
+    );
+
+    protected static void setupTermsAggregationDeserializer(ObjectDeserializer<TermsAggregation.Builder> op) {
+        setupBucketAggregationBaseDeserializer(op);
+        op.add(Builder::collectMode, TermsAggregationCollectMode._DESERIALIZER, "collect_mode");
+        op.add(Builder::exclude, TermsExclude._DESERIALIZER, "exclude");
+        op.add(Builder::executionHint, TermsAggregationExecutionHint._DESERIALIZER, "execution_hint");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::include, TermsInclude._DESERIALIZER, "include");
+        op.add(Builder::minDocCount, JsonpDeserializer.integerDeserializer(), "min_doc_count");
+        op.add(Builder::missing, FieldValue._DESERIALIZER, "missing");
+        op.add(Builder::missingOrder, MissingOrder._DESERIALIZER, "missing_order");
+        op.add(Builder::missingBucket, JsonpDeserializer.booleanDeserializer(), "missing_bucket");
+        op.add(Builder::valueType, JsonpDeserializer.stringDeserializer(), "value_type");
+        op.add(
+            Builder::order,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringMapDeserializer(SortOrder._DESERIALIZER)),
+            "order"
+        );
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+        op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
+        op.add(Builder::showTermDocCountError, JsonpDeserializer.booleanDeserializer(), "show_term_doc_count_error");
+        op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsAggregationCollectMode.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsAggregationCollectMode.java
index 7dbeb74546..7ac786efae 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsAggregationCollectMode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsAggregationCollectMode.java
@@ -35,25 +35,25 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum TermsAggregationCollectMode implements JsonEnum {
-	DepthFirst("depth_first"),
+    DepthFirst("depth_first"),
 
-	BreadthFirst("breadth_first"),
+    BreadthFirst("breadth_first"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	TermsAggregationCollectMode(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    TermsAggregationCollectMode(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<TermsAggregationCollectMode> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			TermsAggregationCollectMode.values());
+    public static final JsonEnum.Deserializer<TermsAggregationCollectMode> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        TermsAggregationCollectMode.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsAggregationExecutionHint.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsAggregationExecutionHint.java
index 767f06a2f5..afa512e81e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsAggregationExecutionHint.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsAggregationExecutionHint.java
@@ -35,29 +35,29 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum TermsAggregationExecutionHint implements JsonEnum {
-	Map("map"),
+    Map("map"),
 
-	GlobalOrdinals("global_ordinals"),
+    GlobalOrdinals("global_ordinals"),
 
-	GlobalOrdinalsHash("global_ordinals_hash"),
+    GlobalOrdinalsHash("global_ordinals_hash"),
 
-	GlobalOrdinalsLowCardinality("global_ordinals_low_cardinality"),
+    GlobalOrdinalsLowCardinality("global_ordinals_low_cardinality"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	TermsAggregationExecutionHint(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    TermsAggregationExecutionHint(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<TermsAggregationExecutionHint> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			TermsAggregationExecutionHint.values());
+    public static final JsonEnum.Deserializer<TermsAggregationExecutionHint> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        TermsAggregationExecutionHint.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsBucketBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsBucketBase.java
index 03424e5de3..bc057b2bc7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsBucketBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsBucketBase.java
@@ -32,70 +32,66 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectDeserializer;
-import jakarta.json.stream.JsonGenerator;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.TermsBucketBase
 
-
-
 public abstract class TermsBucketBase extends MultiBucketBase {
-	@Nullable
-	private final Long docCountError;
+    @Nullable
+    private final Long docCountError;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected TermsBucketBase(AbstractBuilder<?> builder) {
-		super(builder);
+    protected TermsBucketBase(AbstractBuilder<?> builder) {
+        super(builder);
 
-		this.docCountError = builder.docCountError;
+        this.docCountError = builder.docCountError;
 
-	}
+    }
 
-	/**
-	 * API name: {@code doc_count_error}
-	 */
-	@Nullable
-	public final Long docCountError() {
-		return this.docCountError;
-	}
+    /**
+     * API name: {@code doc_count_error}
+     */
+    @Nullable
+    public final Long docCountError() {
+        return this.docCountError;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		super.serializeInternal(generator, mapper);
-		if (this.docCountError != null) {
-			generator.writeKey("doc_count_error");
-			generator.write(this.docCountError);
+        super.serializeInternal(generator, mapper);
+        if (this.docCountError != null) {
+            generator.writeKey("doc_count_error");
+            generator.write(this.docCountError);
 
-		}
+        }
 
-	}
+    }
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				MultiBucketBase.AbstractBuilder<BuilderT> {
-		@Nullable
-		private Long docCountError;
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends MultiBucketBase.AbstractBuilder<
+        BuilderT> {
+        @Nullable
+        private Long docCountError;
 
-		/**
-		 * API name: {@code doc_count_error}
-		 */
-		public final BuilderT docCountError(@Nullable Long value) {
-			this.docCountError = value;
-			return self();
-		}
+        /**
+         * API name: {@code doc_count_error}
+         */
+        public final BuilderT docCountError(@Nullable Long value) {
+            this.docCountError = value;
+            return self();
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupTermsBucketBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		MultiBucketBase.setupMultiBucketBaseDeserializer(op);
-		op.add(AbstractBuilder::docCountError, JsonpDeserializer.longDeserializer(), "doc_count_error");
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupTermsBucketBaseDeserializer(ObjectDeserializer<BuilderT> op) {
+        MultiBucketBase.setupMultiBucketBaseDeserializer(op);
+        op.add(AbstractBuilder::docCountError, JsonpDeserializer.longDeserializer(), "doc_count_error");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsExclude.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsExclude.java
index 84b22377fc..800fa5694f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsExclude.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsExclude.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,150 +46,146 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 // typedef: _types.aggregations.TermsExclude
 
-
 @JsonpDeserializable
 public class TermsExclude implements TaggedUnion<TermsExclude.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Terms, Regexp
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private TermsExclude(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	public String _toJsonString() {
-		switch (_kind) {
-			case Terms :
-				return this.terms().stream().map(v -> v).collect(Collectors.joining(","));
-			case Regexp :
-				return this.regexp();
-
-			default :
-				throw new IllegalStateException("Unknown kind " + _kind);
-		}
-	}
-
-	private TermsExclude(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static TermsExclude of(Function<Builder, ObjectBuilder<TermsExclude>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code terms}?
-	 */
-	public boolean isTerms() {
-		return _kind == Kind.Terms;
-	}
-
-	/**
-	 * Get the {@code terms} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code terms} kind.
-	 */
-	public List<String> terms() {
-		return TaggedUnionUtils.get(this, Kind.Terms);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code regexp}?
-	 */
-	public boolean isRegexp() {
-		return _kind == Kind.Regexp;
-	}
-
-	/**
-	 * Get the {@code regexp} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code regexp} kind.
-	 */
-	public String regexp() {
-		return TaggedUnionUtils.get(this, Kind.Regexp);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Terms :
-					generator.writeStartArray();
-					for (String item0 : ((List<String>) this._value)) {
-						generator.write(item0);
-
-					}
-					generator.writeEnd();
-
-					break;
-				case Regexp :
-					generator.write(((String) this._value));
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermsExclude> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<TermsExclude> terms(List<String> v) {
-			this._kind = Kind.Terms;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TermsExclude> regexp(String v) {
-			this._kind = Kind.Regexp;
-			this._value = v;
-			return this;
-		}
-
-		public TermsExclude build() {
-			_checkSingleUse();
-			return new TermsExclude(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<TermsExclude> buildTermsExcludeDeserializer() {
-		return new UnionDeserializer.Builder<TermsExclude, Kind, Object>(TermsExclude::new, false)
-				.addMember(Kind.Terms, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()))
-				.addMember(Kind.Regexp, JsonpDeserializer.stringDeserializer()).build();
-	}
-
-	public static final JsonpDeserializer<TermsExclude> _DESERIALIZER = JsonpDeserializer
-			.lazy(TermsExclude::buildTermsExcludeDeserializer);
+    public enum Kind {
+        Terms,
+        Regexp
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private TermsExclude(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    public String _toJsonString() {
+        switch (_kind) {
+            case Terms:
+                return this.terms().stream().map(v -> v).collect(Collectors.joining(","));
+            case Regexp:
+                return this.regexp();
+
+            default:
+                throw new IllegalStateException("Unknown kind " + _kind);
+        }
+    }
+
+    private TermsExclude(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static TermsExclude of(Function<Builder, ObjectBuilder<TermsExclude>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code terms}?
+     */
+    public boolean isTerms() {
+        return _kind == Kind.Terms;
+    }
+
+    /**
+     * Get the {@code terms} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code terms} kind.
+     */
+    public List<String> terms() {
+        return TaggedUnionUtils.get(this, Kind.Terms);
+    }
+
+    /**
+     * Is this variant instance of kind {@code regexp}?
+     */
+    public boolean isRegexp() {
+        return _kind == Kind.Regexp;
+    }
+
+    /**
+     * Get the {@code regexp} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code regexp} kind.
+     */
+    public String regexp() {
+        return TaggedUnionUtils.get(this, Kind.Regexp);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Terms:
+                    generator.writeStartArray();
+                    for (String item0 : ((List<String>) this._value)) {
+                        generator.write(item0);
+
+                    }
+                    generator.writeEnd();
+
+                    break;
+                case Regexp:
+                    generator.write(((String) this._value));
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermsExclude> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<TermsExclude> terms(List<String> v) {
+            this._kind = Kind.Terms;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TermsExclude> regexp(String v) {
+            this._kind = Kind.Regexp;
+            this._value = v;
+            return this;
+        }
+
+        public TermsExclude build() {
+            _checkSingleUse();
+            return new TermsExclude(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<TermsExclude> buildTermsExcludeDeserializer() {
+        return new UnionDeserializer.Builder<TermsExclude, Kind, Object>(TermsExclude::new, false).addMember(
+            Kind.Terms,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer())
+        ).addMember(Kind.Regexp, JsonpDeserializer.stringDeserializer()).build();
+    }
+
+    public static final JsonpDeserializer<TermsExclude> _DESERIALIZER = JsonpDeserializer.lazy(TermsExclude::buildTermsExcludeDeserializer);
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsExcludeBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsExcludeBuilders.java
index 7aab77cb08..0ff7633d56 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsExcludeBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsExcludeBuilders.java
@@ -38,10 +38,9 @@
  * Variants <code>terms</code>, <code>regexp</code> are not available here as
  * they don't have a dedicated class. Use {@link TermsExclude}'s builder for
  * these.
- * 
+ *
  */
 public class TermsExcludeBuilders {
-	private TermsExcludeBuilders() {
-	}
+    private TermsExcludeBuilders() {}
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsInclude.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsInclude.java
index 28c727b320..376b748cba 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsInclude.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsInclude.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,165 +45,162 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.TermsInclude
 
 @JsonpDeserializable
 public class TermsInclude implements TaggedUnion<TermsInclude.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Terms, Partition, Regexp
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private TermsInclude(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	private TermsInclude(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static TermsInclude of(Function<Builder, ObjectBuilder<TermsInclude>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code terms}?
-	 */
-	public boolean isTerms() {
-		return _kind == Kind.Terms;
-	}
-
-	/**
-	 * Get the {@code terms} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code terms} kind.
-	 */
-	public List<String> terms() {
-		return TaggedUnionUtils.get(this, Kind.Terms);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code partition}?
-	 */
-	public boolean isPartition() {
-		return _kind == Kind.Partition;
-	}
-
-	/**
-	 * Get the {@code partition} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code partition} kind.
-	 */
-	public TermsPartition partition() {
-		return TaggedUnionUtils.get(this, Kind.Partition);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code regexp}?
-	 */
-	public boolean isRegexp() {
-		return _kind == Kind.Regexp;
-	}
-
-	/**
-	 * Get the {@code regexp} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code regexp} kind.
-	 */
-	public String regexp() {
-		return TaggedUnionUtils.get(this, Kind.Regexp);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Terms :
-					generator.writeStartArray();
-					for (String item0 : ((List<String>) this._value)) {
-						generator.write(item0);
-
-					}
-					generator.writeEnd();
-
-					break;
-				case Regexp :
-					generator.write(((String) this._value));
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermsInclude> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<TermsInclude> terms(List<String> v) {
-			this._kind = Kind.Terms;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TermsInclude> partition(TermsPartition v) {
-			this._kind = Kind.Partition;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TermsInclude> partition(
-				Function<TermsPartition.Builder, ObjectBuilder<TermsPartition>> fn) {
-			return this.partition(fn.apply(new TermsPartition.Builder()).build());
-		}
-
-		public ObjectBuilder<TermsInclude> regexp(String v) {
-			this._kind = Kind.Regexp;
-			this._value = v;
-			return this;
-		}
-
-		public TermsInclude build() {
-			_checkSingleUse();
-			return new TermsInclude(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<TermsInclude> buildTermsIncludeDeserializer() {
-		return new UnionDeserializer.Builder<TermsInclude, Kind, Object>(TermsInclude::new, false)
-				.addMember(Kind.Terms, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()))
-				.addMember(Kind.Partition, TermsPartition._DESERIALIZER)
-				.addMember(Kind.Regexp, JsonpDeserializer.stringDeserializer()).build();
-	}
-
-	public static final JsonpDeserializer<TermsInclude> _DESERIALIZER = JsonpDeserializer
-			.lazy(TermsInclude::buildTermsIncludeDeserializer);
+    public enum Kind {
+        Terms,
+        Partition,
+        Regexp
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private TermsInclude(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private TermsInclude(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static TermsInclude of(Function<Builder, ObjectBuilder<TermsInclude>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code terms}?
+     */
+    public boolean isTerms() {
+        return _kind == Kind.Terms;
+    }
+
+    /**
+     * Get the {@code terms} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code terms} kind.
+     */
+    public List<String> terms() {
+        return TaggedUnionUtils.get(this, Kind.Terms);
+    }
+
+    /**
+     * Is this variant instance of kind {@code partition}?
+     */
+    public boolean isPartition() {
+        return _kind == Kind.Partition;
+    }
+
+    /**
+     * Get the {@code partition} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code partition} kind.
+     */
+    public TermsPartition partition() {
+        return TaggedUnionUtils.get(this, Kind.Partition);
+    }
+
+    /**
+     * Is this variant instance of kind {@code regexp}?
+     */
+    public boolean isRegexp() {
+        return _kind == Kind.Regexp;
+    }
+
+    /**
+     * Get the {@code regexp} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code regexp} kind.
+     */
+    public String regexp() {
+        return TaggedUnionUtils.get(this, Kind.Regexp);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Terms:
+                    generator.writeStartArray();
+                    for (String item0 : ((List<String>) this._value)) {
+                        generator.write(item0);
+
+                    }
+                    generator.writeEnd();
+
+                    break;
+                case Regexp:
+                    generator.write(((String) this._value));
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermsInclude> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<TermsInclude> terms(List<String> v) {
+            this._kind = Kind.Terms;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TermsInclude> partition(TermsPartition v) {
+            this._kind = Kind.Partition;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TermsInclude> partition(Function<TermsPartition.Builder, ObjectBuilder<TermsPartition>> fn) {
+            return this.partition(fn.apply(new TermsPartition.Builder()).build());
+        }
+
+        public ObjectBuilder<TermsInclude> regexp(String v) {
+            this._kind = Kind.Regexp;
+            this._value = v;
+            return this;
+        }
+
+        public TermsInclude build() {
+            _checkSingleUse();
+            return new TermsInclude(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<TermsInclude> buildTermsIncludeDeserializer() {
+        return new UnionDeserializer.Builder<TermsInclude, Kind, Object>(TermsInclude::new, false).addMember(
+            Kind.Terms,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer())
+        ).addMember(Kind.Partition, TermsPartition._DESERIALIZER).addMember(Kind.Regexp, JsonpDeserializer.stringDeserializer()).build();
+    }
+
+    public static final JsonpDeserializer<TermsInclude> _DESERIALIZER = JsonpDeserializer.lazy(TermsInclude::buildTermsIncludeDeserializer);
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsIncludeBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsIncludeBuilders.java
index d81e73a6a2..e456f8fd9f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsIncludeBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsIncludeBuilders.java
@@ -38,18 +38,17 @@
  * Variants <code>terms</code>, <code>regexp</code> are not available here as
  * they don't have a dedicated class. Use {@link TermsInclude}'s builder for
  * these.
- * 
+ *
  */
 public class TermsIncludeBuilders {
-	private TermsIncludeBuilders() {
-	}
+    private TermsIncludeBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link TermsPartition partition}
-	 * {@code TermsInclude} variant.
-	 */
-	public static TermsPartition.Builder partition() {
-		return new TermsPartition.Builder();
-	}
+    /**
+     * Creates a builder for the {@link TermsPartition partition}
+     * {@code TermsInclude} variant.
+     */
+    public static TermsPartition.Builder partition() {
+        return new TermsPartition.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsPartition.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsPartition.java
index 457bd5dccf..cb0165bc67 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsPartition.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsPartition.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,117 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.TermsPartition
 
-
 @JsonpDeserializable
 public class TermsPartition implements JsonpSerializable {
-	private final long numPartitions;
-
-	private final long partition;
-
-	// ---------------------------------------------------------------------------------------------
+    private final long numPartitions;
 
-	private TermsPartition(Builder builder) {
+    private final long partition;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.numPartitions = ApiTypeHelper.requireNonNull(builder.numPartitions, this, "numPartitions");
-		this.partition = ApiTypeHelper.requireNonNull(builder.partition, this, "partition");
+    private TermsPartition(Builder builder) {
 
-	}
+        this.numPartitions = ApiTypeHelper.requireNonNull(builder.numPartitions, this, "numPartitions");
+        this.partition = ApiTypeHelper.requireNonNull(builder.partition, this, "partition");
 
-	public static TermsPartition of(Function<Builder, ObjectBuilder<TermsPartition>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code num_partitions}
-	 */
-	public final long numPartitions() {
-		return this.numPartitions;
-	}
+    public static TermsPartition of(Function<Builder, ObjectBuilder<TermsPartition>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code partition}
-	 */
-	public final long partition() {
-		return this.partition;
-	}
+    /**
+     * Required - API name: {@code num_partitions}
+     */
+    public final long numPartitions() {
+        return this.numPartitions;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code partition}
+     */
+    public final long partition() {
+        return this.partition;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("num_partitions");
-		generator.write(this.numPartitions);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("partition");
-		generator.write(this.partition);
+        generator.writeKey("num_partitions");
+        generator.write(this.numPartitions);
 
-	}
+        generator.writeKey("partition");
+        generator.write(this.partition);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link TermsPartition}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermsPartition> {
-		private Long numPartitions;
+    /**
+     * Builder for {@link TermsPartition}.
+     */
 
-		private Long partition;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermsPartition> {
+        private Long numPartitions;
 
-		/**
-		 * Required - API name: {@code num_partitions}
-		 */
-		public final Builder numPartitions(long value) {
-			this.numPartitions = value;
-			return this;
-		}
+        private Long partition;
 
-		/**
-		 * Required - API name: {@code partition}
-		 */
-		public final Builder partition(long value) {
-			this.partition = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code num_partitions}
+         */
+        public final Builder numPartitions(long value) {
+            this.numPartitions = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link TermsPartition}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TermsPartition build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code partition}
+         */
+        public final Builder partition(long value) {
+            this.partition = value;
+            return this;
+        }
 
-			return new TermsPartition(this);
-		}
-	}
+        /**
+         * Builds a {@link TermsPartition}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TermsPartition build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new TermsPartition(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link TermsPartition}
-	 */
-	public static final JsonpDeserializer<TermsPartition> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TermsPartition::setupTermsPartitionDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupTermsPartitionDeserializer(ObjectDeserializer<TermsPartition.Builder> op) {
+    /**
+     * Json deserializer for {@link TermsPartition}
+     */
+    public static final JsonpDeserializer<TermsPartition> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TermsPartition::setupTermsPartitionDeserializer
+    );
 
-		op.add(Builder::numPartitions, JsonpDeserializer.longDeserializer(), "num_partitions");
-		op.add(Builder::partition, JsonpDeserializer.longDeserializer(), "partition");
+    protected static void setupTermsPartitionDeserializer(ObjectDeserializer<TermsPartition.Builder> op) {
 
-	}
+        op.add(Builder::numPartitions, JsonpDeserializer.longDeserializer(), "num_partitions");
+        op.add(Builder::partition, JsonpDeserializer.longDeserializer(), "partition");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TestPopulation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TestPopulation.java
index 03d08f2f2d..2f6e7c8299 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TestPopulation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TestPopulation.java
@@ -32,178 +32,179 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.Script;
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.TestPopulation
 
-
 @JsonpDeserializable
 public class TestPopulation implements JsonpSerializable {
-	private final String field;
-
-	@Nullable
-	private final Script script;
-
-	@Nullable
-	private final Query filter;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TestPopulation(Builder builder) {
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.script = builder.script;
-		this.filter = builder.filter;
-
-	}
-
-	public static TestPopulation of(Function<Builder, ObjectBuilder<TestPopulation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final Script script() {
-		return this.script;
-	}
-
-	/**
-	 * API name: {@code filter}
-	 */
-	@Nullable
-	public final Query filter() {
-		return this.filter;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-		if (this.filter != null) {
-			generator.writeKey("filter");
-			this.filter.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TestPopulation}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TestPopulation> {
-		private String field;
-
-		@Nullable
-		private Script script;
-
-		@Nullable
-		private Query filter;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(@Nullable Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(@Nullable Query value) {
-			this.filter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.filter(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link TestPopulation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TestPopulation build() {
-			_checkSingleUse();
-
-			return new TestPopulation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TestPopulation}
-	 */
-	public static final JsonpDeserializer<TestPopulation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TestPopulation::setupTestPopulationDeserializer);
-
-	protected static void setupTestPopulationDeserializer(ObjectDeserializer<TestPopulation.Builder> op) {
-
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-		op.add(Builder::filter, Query._DESERIALIZER, "filter");
-
-	}
+    private final String field;
+
+    @Nullable
+    private final Script script;
+
+    @Nullable
+    private final Query filter;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TestPopulation(Builder builder) {
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.script = builder.script;
+        this.filter = builder.filter;
+
+    }
+
+    public static TestPopulation of(Function<Builder, ObjectBuilder<TestPopulation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final Script script() {
+        return this.script;
+    }
+
+    /**
+     * API name: {@code filter}
+     */
+    @Nullable
+    public final Query filter() {
+        return this.filter;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+        if (this.filter != null) {
+            generator.writeKey("filter");
+            this.filter.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TestPopulation}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TestPopulation> {
+        private String field;
+
+        @Nullable
+        private Script script;
+
+        @Nullable
+        private Query filter;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(@Nullable Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(@Nullable Query value) {
+            this.filter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.filter(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link TestPopulation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TestPopulation build() {
+            _checkSingleUse();
+
+            return new TestPopulation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TestPopulation}
+     */
+    public static final JsonpDeserializer<TestPopulation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TestPopulation::setupTestPopulationDeserializer
+    );
+
+    protected static void setupTestPopulationDeserializer(ObjectDeserializer<TestPopulation.Builder> op) {
+
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+        op.add(Builder::filter, Query._DESERIALIZER, "filter");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopHitsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopHitsAggregate.java
index 7e36f0af4a..daa05dce56 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopHitsAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopHitsAggregate.java
@@ -32,118 +32,116 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch.core.search.HitsMetadata;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.search.HitsMetadata;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.aggregations.TopHitsAggregate
 
-
 @JsonpDeserializable
 public class TopHitsAggregate extends AggregateBase implements AggregateVariant {
-	private final HitsMetadata<JsonData> hits;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TopHitsAggregate(Builder builder) {
-		super(builder);
-
-		this.hits = ApiTypeHelper.requireNonNull(builder.hits, this, "hits");
-
-	}
-
-	public static TopHitsAggregate of(Function<Builder, ObjectBuilder<TopHitsAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.TopHits;
-	}
-
-	/**
-	 * Required - API name: {@code hits}
-	 */
-	public final HitsMetadata<JsonData> hits() {
-		return this.hits;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("hits");
-		this.hits.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TopHitsAggregate}.
-	 */
-
-	public static class Builder extends AggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<TopHitsAggregate> {
-		private HitsMetadata<JsonData> hits;
-
-		/**
-		 * Required - API name: {@code hits}
-		 */
-		public final Builder hits(HitsMetadata<JsonData> value) {
-			this.hits = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code hits}
-		 */
-		public final Builder hits(Function<HitsMetadata.Builder<JsonData>, ObjectBuilder<HitsMetadata<JsonData>>> fn) {
-			return this.hits(fn.apply(new HitsMetadata.Builder<JsonData>()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TopHitsAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TopHitsAggregate build() {
-			_checkSingleUse();
-
-			return new TopHitsAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TopHitsAggregate}
-	 */
-	public static final JsonpDeserializer<TopHitsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TopHitsAggregate::setupTopHitsAggregateDeserializer);
-
-	protected static void setupTopHitsAggregateDeserializer(ObjectDeserializer<TopHitsAggregate.Builder> op) {
-		AggregateBase.setupAggregateBaseDeserializer(op);
-		op.add(Builder::hits, HitsMetadata.createHitsMetadataDeserializer(JsonData._DESERIALIZER), "hits");
-
-	}
+    private final HitsMetadata<JsonData> hits;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TopHitsAggregate(Builder builder) {
+        super(builder);
+
+        this.hits = ApiTypeHelper.requireNonNull(builder.hits, this, "hits");
+
+    }
+
+    public static TopHitsAggregate of(Function<Builder, ObjectBuilder<TopHitsAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.TopHits;
+    }
+
+    /**
+     * Required - API name: {@code hits}
+     */
+    public final HitsMetadata<JsonData> hits() {
+        return this.hits;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("hits");
+        this.hits.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TopHitsAggregate}.
+     */
+
+    public static class Builder extends AggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<TopHitsAggregate> {
+        private HitsMetadata<JsonData> hits;
+
+        /**
+         * Required - API name: {@code hits}
+         */
+        public final Builder hits(HitsMetadata<JsonData> value) {
+            this.hits = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code hits}
+         */
+        public final Builder hits(Function<HitsMetadata.Builder<JsonData>, ObjectBuilder<HitsMetadata<JsonData>>> fn) {
+            return this.hits(fn.apply(new HitsMetadata.Builder<JsonData>()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TopHitsAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TopHitsAggregate build() {
+            _checkSingleUse();
+
+            return new TopHitsAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TopHitsAggregate}
+     */
+    public static final JsonpDeserializer<TopHitsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TopHitsAggregate::setupTopHitsAggregateDeserializer
+    );
+
+    protected static void setupTopHitsAggregateDeserializer(ObjectDeserializer<TopHitsAggregate.Builder> op) {
+        AggregateBase.setupAggregateBaseDeserializer(op);
+        op.add(Builder::hits, HitsMetadata.createHitsMetadataDeserializer(JsonData._DESERIALIZER), "hits");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopHitsAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopHitsAggregation.java
index ee3dd81154..b914ebf161 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopHitsAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopHitsAggregation.java
@@ -32,536 +32,532 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.ScriptField;
-import org.opensearch.client.opensearch._types.SortOptions;
-import org.opensearch.client.opensearch.core.search.Highlight;
-import org.opensearch.client.opensearch.core.search.SourceConfig;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ScriptField;
+import org.opensearch.client.opensearch._types.SortOptions;
+import org.opensearch.client.opensearch.core.search.Highlight;
+import org.opensearch.client.opensearch.core.search.SourceConfig;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.TopHitsAggregation
 
-
 @JsonpDeserializable
 public class TopHitsAggregation extends MetricAggregationBase implements AggregationVariant {
-	private final List<String> docvalueFields;
-
-	@Nullable
-	private final Boolean explain;
-
-	@Nullable
-	private final Integer from;
-
-	@Nullable
-	private final Highlight highlight;
-
-	private final Map<String, ScriptField> scriptFields;
-
-	@Nullable
-	private final Integer size;
-
-	private final List<SortOptions> sort;
-
-	@Nullable
-	private final SourceConfig source;
-
-	private final List<String> storedFields;
-
-	@Nullable
-	private final Boolean trackScores;
-
-	@Nullable
-	private final Boolean version;
-
-	@Nullable
-	private final Boolean seqNoPrimaryTerm;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TopHitsAggregation(Builder builder) {
-		super(builder);
-
-		this.docvalueFields = ApiTypeHelper.unmodifiable(builder.docvalueFields);
-		this.explain = builder.explain;
-		this.from = builder.from;
-		this.highlight = builder.highlight;
-		this.scriptFields = ApiTypeHelper.unmodifiable(builder.scriptFields);
-		this.size = builder.size;
-		this.sort = ApiTypeHelper.unmodifiable(builder.sort);
-		this.source = builder.source;
-		this.storedFields = ApiTypeHelper.unmodifiable(builder.storedFields);
-		this.trackScores = builder.trackScores;
-		this.version = builder.version;
-		this.seqNoPrimaryTerm = builder.seqNoPrimaryTerm;
-
-	}
-
-	public static TopHitsAggregation of(Function<Builder, ObjectBuilder<TopHitsAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.TopHits;
-	}
-
-	/**
-	 * API name: {@code docvalue_fields}
-	 */
-	public final List<String> docvalueFields() {
-		return this.docvalueFields;
-	}
-
-	/**
-	 * API name: {@code explain}
-	 */
-	@Nullable
-	public final Boolean explain() {
-		return this.explain;
-	}
-
-	/**
-	 * API name: {@code from}
-	 */
-	@Nullable
-	public final Integer from() {
-		return this.from;
-	}
-
-	/**
-	 * API name: {@code highlight}
-	 */
-	@Nullable
-	public final Highlight highlight() {
-		return this.highlight;
-	}
-
-	/**
-	 * API name: {@code script_fields}
-	 */
-	public final Map<String, ScriptField> scriptFields() {
-		return this.scriptFields;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	/**
-	 * API name: {@code sort}
-	 */
-	public final List<SortOptions> sort() {
-		return this.sort;
-	}
-
-	/**
-	 * API name: {@code _source}
-	 */
-	@Nullable
-	public final SourceConfig source() {
-		return this.source;
-	}
-
-	/**
-	 * API name: {@code stored_fields}
-	 */
-	public final List<String> storedFields() {
-		return this.storedFields;
-	}
-
-	/**
-	 * API name: {@code track_scores}
-	 */
-	@Nullable
-	public final Boolean trackScores() {
-		return this.trackScores;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Boolean version() {
-		return this.version;
-	}
-
-	/**
-	 * API name: {@code seq_no_primary_term}
-	 */
-	@Nullable
-	public final Boolean seqNoPrimaryTerm() {
-		return this.seqNoPrimaryTerm;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.docvalueFields)) {
-			generator.writeKey("docvalue_fields");
-			generator.writeStartArray();
-			for (String item0 : this.docvalueFields) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.explain != null) {
-			generator.writeKey("explain");
-			generator.write(this.explain);
-
-		}
-		if (this.from != null) {
-			generator.writeKey("from");
-			generator.write(this.from);
-
-		}
-		if (this.highlight != null) {
-			generator.writeKey("highlight");
-			this.highlight.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.scriptFields)) {
-			generator.writeKey("script_fields");
-			generator.writeStartObject();
-			for (Map.Entry<String, ScriptField> item0 : this.scriptFields.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		if (ApiTypeHelper.isDefined(this.sort)) {
-			generator.writeKey("sort");
-			generator.writeStartArray();
-			for (SortOptions item0 : this.sort) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.source != null) {
-			generator.writeKey("_source");
-			this.source.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.storedFields)) {
-			generator.writeKey("stored_fields");
-			generator.writeStartArray();
-			for (String item0 : this.storedFields) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.trackScores != null) {
-			generator.writeKey("track_scores");
-			generator.write(this.trackScores);
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		if (this.seqNoPrimaryTerm != null) {
-			generator.writeKey("seq_no_primary_term");
-			generator.write(this.seqNoPrimaryTerm);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TopHitsAggregation}.
-	 */
-
-	public static class Builder extends MetricAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<TopHitsAggregation> {
-		@Nullable
-		private List<String> docvalueFields;
-
-		@Nullable
-		private Boolean explain;
-
-		@Nullable
-		private Integer from;
-
-		@Nullable
-		private Highlight highlight;
-
-		@Nullable
-		private Map<String, ScriptField> scriptFields;
-
-		@Nullable
-		private Integer size;
-
-		@Nullable
-		private List<SortOptions> sort;
-
-		@Nullable
-		private SourceConfig source;
-
-		@Nullable
-		private List<String> storedFields;
-
-		@Nullable
-		private Boolean trackScores;
-
-		@Nullable
-		private Boolean version;
-
-		@Nullable
-		private Boolean seqNoPrimaryTerm;
-
-		/**
-		 * API name: {@code docvalue_fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>docvalueFields</code>.
-		 */
-		public final Builder docvalueFields(List<String> list) {
-			this.docvalueFields = _listAddAll(this.docvalueFields, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code docvalue_fields}
-		 * <p>
-		 * Adds one or more values to <code>docvalueFields</code>.
-		 */
-		public final Builder docvalueFields(String value, String... values) {
-			this.docvalueFields = _listAdd(this.docvalueFields, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code explain}
-		 */
-		public final Builder explain(@Nullable Boolean value) {
-			this.explain = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code from}
-		 */
-		public final Builder from(@Nullable Integer value) {
-			this.from = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code highlight}
-		 */
-		public final Builder highlight(@Nullable Highlight value) {
-			this.highlight = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code highlight}
-		 */
-		public final Builder highlight(Function<Highlight.Builder, ObjectBuilder<Highlight>> fn) {
-			return this.highlight(fn.apply(new Highlight.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code script_fields}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>scriptFields</code>.
-		 */
-		public final Builder scriptFields(Map<String, ScriptField> map) {
-			this.scriptFields = _mapPutAll(this.scriptFields, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code script_fields}
-		 * <p>
-		 * Adds an entry to <code>scriptFields</code>.
-		 */
-		public final Builder scriptFields(String key, ScriptField value) {
-			this.scriptFields = _mapPut(this.scriptFields, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code script_fields}
-		 * <p>
-		 * Adds an entry to <code>scriptFields</code> using a builder lambda.
-		 */
-		public final Builder scriptFields(String key, Function<ScriptField.Builder, ObjectBuilder<ScriptField>> fn) {
-			return scriptFields(key, fn.apply(new ScriptField.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Integer value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sort</code>.
-		 */
-		public final Builder sort(List<SortOptions> list) {
-			this.sort = _listAddAll(this.sort, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds one or more values to <code>sort</code>.
-		 */
-		public final Builder sort(SortOptions value, SortOptions... values) {
-			this.sort = _listAdd(this.sort, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds a value to <code>sort</code> using a builder lambda.
-		 */
-		public final Builder sort(Function<SortOptions.Builder, ObjectBuilder<SortOptions>> fn) {
-			return sort(fn.apply(new SortOptions.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code _source}
-		 */
-		public final Builder source(@Nullable SourceConfig value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _source}
-		 */
-		public final Builder source(Function<SourceConfig.Builder, ObjectBuilder<SourceConfig>> fn) {
-			return this.source(fn.apply(new SourceConfig.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code stored_fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>storedFields</code>.
-		 */
-		public final Builder storedFields(List<String> list) {
-			this.storedFields = _listAddAll(this.storedFields, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stored_fields}
-		 * <p>
-		 * Adds one or more values to <code>storedFields</code>.
-		 */
-		public final Builder storedFields(String value, String... values) {
-			this.storedFields = _listAdd(this.storedFields, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code track_scores}
-		 */
-		public final Builder trackScores(@Nullable Boolean value) {
-			this.trackScores = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Boolean value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code seq_no_primary_term}
-		 */
-		public final Builder seqNoPrimaryTerm(@Nullable Boolean value) {
-			this.seqNoPrimaryTerm = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TopHitsAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TopHitsAggregation build() {
-			_checkSingleUse();
-
-			return new TopHitsAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TopHitsAggregation}
-	 */
-	public static final JsonpDeserializer<TopHitsAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, TopHitsAggregation::setupTopHitsAggregationDeserializer);
-
-	protected static void setupTopHitsAggregationDeserializer(ObjectDeserializer<TopHitsAggregation.Builder> op) {
-		MetricAggregationBase.setupMetricAggregationBaseDeserializer(op);
-		op.add(Builder::docvalueFields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"docvalue_fields");
-		op.add(Builder::explain, JsonpDeserializer.booleanDeserializer(), "explain");
-		op.add(Builder::from, JsonpDeserializer.integerDeserializer(), "from");
-		op.add(Builder::highlight, Highlight._DESERIALIZER, "highlight");
-		op.add(Builder::scriptFields, JsonpDeserializer.stringMapDeserializer(ScriptField._DESERIALIZER),
-				"script_fields");
-		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
-		op.add(Builder::sort, JsonpDeserializer.arrayDeserializer(SortOptions._DESERIALIZER), "sort");
-		op.add(Builder::source, SourceConfig._DESERIALIZER, "_source");
-		op.add(Builder::storedFields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"stored_fields");
-		op.add(Builder::trackScores, JsonpDeserializer.booleanDeserializer(), "track_scores");
-		op.add(Builder::version, JsonpDeserializer.booleanDeserializer(), "version");
-		op.add(Builder::seqNoPrimaryTerm, JsonpDeserializer.booleanDeserializer(), "seq_no_primary_term");
-
-	}
+    private final List<String> docvalueFields;
+
+    @Nullable
+    private final Boolean explain;
+
+    @Nullable
+    private final Integer from;
+
+    @Nullable
+    private final Highlight highlight;
+
+    private final Map<String, ScriptField> scriptFields;
+
+    @Nullable
+    private final Integer size;
+
+    private final List<SortOptions> sort;
+
+    @Nullable
+    private final SourceConfig source;
+
+    private final List<String> storedFields;
+
+    @Nullable
+    private final Boolean trackScores;
+
+    @Nullable
+    private final Boolean version;
+
+    @Nullable
+    private final Boolean seqNoPrimaryTerm;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TopHitsAggregation(Builder builder) {
+        super(builder);
+
+        this.docvalueFields = ApiTypeHelper.unmodifiable(builder.docvalueFields);
+        this.explain = builder.explain;
+        this.from = builder.from;
+        this.highlight = builder.highlight;
+        this.scriptFields = ApiTypeHelper.unmodifiable(builder.scriptFields);
+        this.size = builder.size;
+        this.sort = ApiTypeHelper.unmodifiable(builder.sort);
+        this.source = builder.source;
+        this.storedFields = ApiTypeHelper.unmodifiable(builder.storedFields);
+        this.trackScores = builder.trackScores;
+        this.version = builder.version;
+        this.seqNoPrimaryTerm = builder.seqNoPrimaryTerm;
+
+    }
+
+    public static TopHitsAggregation of(Function<Builder, ObjectBuilder<TopHitsAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.TopHits;
+    }
+
+    /**
+     * API name: {@code docvalue_fields}
+     */
+    public final List<String> docvalueFields() {
+        return this.docvalueFields;
+    }
+
+    /**
+     * API name: {@code explain}
+     */
+    @Nullable
+    public final Boolean explain() {
+        return this.explain;
+    }
+
+    /**
+     * API name: {@code from}
+     */
+    @Nullable
+    public final Integer from() {
+        return this.from;
+    }
+
+    /**
+     * API name: {@code highlight}
+     */
+    @Nullable
+    public final Highlight highlight() {
+        return this.highlight;
+    }
+
+    /**
+     * API name: {@code script_fields}
+     */
+    public final Map<String, ScriptField> scriptFields() {
+        return this.scriptFields;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    /**
+     * API name: {@code sort}
+     */
+    public final List<SortOptions> sort() {
+        return this.sort;
+    }
+
+    /**
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final SourceConfig source() {
+        return this.source;
+    }
+
+    /**
+     * API name: {@code stored_fields}
+     */
+    public final List<String> storedFields() {
+        return this.storedFields;
+    }
+
+    /**
+     * API name: {@code track_scores}
+     */
+    @Nullable
+    public final Boolean trackScores() {
+        return this.trackScores;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Boolean version() {
+        return this.version;
+    }
+
+    /**
+     * API name: {@code seq_no_primary_term}
+     */
+    @Nullable
+    public final Boolean seqNoPrimaryTerm() {
+        return this.seqNoPrimaryTerm;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.docvalueFields)) {
+            generator.writeKey("docvalue_fields");
+            generator.writeStartArray();
+            for (String item0 : this.docvalueFields) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.explain != null) {
+            generator.writeKey("explain");
+            generator.write(this.explain);
+
+        }
+        if (this.from != null) {
+            generator.writeKey("from");
+            generator.write(this.from);
+
+        }
+        if (this.highlight != null) {
+            generator.writeKey("highlight");
+            this.highlight.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.scriptFields)) {
+            generator.writeKey("script_fields");
+            generator.writeStartObject();
+            for (Map.Entry<String, ScriptField> item0 : this.scriptFields.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        if (ApiTypeHelper.isDefined(this.sort)) {
+            generator.writeKey("sort");
+            generator.writeStartArray();
+            for (SortOptions item0 : this.sort) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.source != null) {
+            generator.writeKey("_source");
+            this.source.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.storedFields)) {
+            generator.writeKey("stored_fields");
+            generator.writeStartArray();
+            for (String item0 : this.storedFields) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.trackScores != null) {
+            generator.writeKey("track_scores");
+            generator.write(this.trackScores);
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        if (this.seqNoPrimaryTerm != null) {
+            generator.writeKey("seq_no_primary_term");
+            generator.write(this.seqNoPrimaryTerm);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TopHitsAggregation}.
+     */
+
+    public static class Builder extends MetricAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<TopHitsAggregation> {
+        @Nullable
+        private List<String> docvalueFields;
+
+        @Nullable
+        private Boolean explain;
+
+        @Nullable
+        private Integer from;
+
+        @Nullable
+        private Highlight highlight;
+
+        @Nullable
+        private Map<String, ScriptField> scriptFields;
+
+        @Nullable
+        private Integer size;
+
+        @Nullable
+        private List<SortOptions> sort;
+
+        @Nullable
+        private SourceConfig source;
+
+        @Nullable
+        private List<String> storedFields;
+
+        @Nullable
+        private Boolean trackScores;
+
+        @Nullable
+        private Boolean version;
+
+        @Nullable
+        private Boolean seqNoPrimaryTerm;
+
+        /**
+         * API name: {@code docvalue_fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>docvalueFields</code>.
+         */
+        public final Builder docvalueFields(List<String> list) {
+            this.docvalueFields = _listAddAll(this.docvalueFields, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code docvalue_fields}
+         * <p>
+         * Adds one or more values to <code>docvalueFields</code>.
+         */
+        public final Builder docvalueFields(String value, String... values) {
+            this.docvalueFields = _listAdd(this.docvalueFields, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code explain}
+         */
+        public final Builder explain(@Nullable Boolean value) {
+            this.explain = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code from}
+         */
+        public final Builder from(@Nullable Integer value) {
+            this.from = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code highlight}
+         */
+        public final Builder highlight(@Nullable Highlight value) {
+            this.highlight = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code highlight}
+         */
+        public final Builder highlight(Function<Highlight.Builder, ObjectBuilder<Highlight>> fn) {
+            return this.highlight(fn.apply(new Highlight.Builder()).build());
+        }
+
+        /**
+         * API name: {@code script_fields}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>scriptFields</code>.
+         */
+        public final Builder scriptFields(Map<String, ScriptField> map) {
+            this.scriptFields = _mapPutAll(this.scriptFields, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code script_fields}
+         * <p>
+         * Adds an entry to <code>scriptFields</code>.
+         */
+        public final Builder scriptFields(String key, ScriptField value) {
+            this.scriptFields = _mapPut(this.scriptFields, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code script_fields}
+         * <p>
+         * Adds an entry to <code>scriptFields</code> using a builder lambda.
+         */
+        public final Builder scriptFields(String key, Function<ScriptField.Builder, ObjectBuilder<ScriptField>> fn) {
+            return scriptFields(key, fn.apply(new ScriptField.Builder()).build());
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Integer value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sort</code>.
+         */
+        public final Builder sort(List<SortOptions> list) {
+            this.sort = _listAddAll(this.sort, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds one or more values to <code>sort</code>.
+         */
+        public final Builder sort(SortOptions value, SortOptions... values) {
+            this.sort = _listAdd(this.sort, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds a value to <code>sort</code> using a builder lambda.
+         */
+        public final Builder sort(Function<SortOptions.Builder, ObjectBuilder<SortOptions>> fn) {
+            return sort(fn.apply(new SortOptions.Builder()).build());
+        }
+
+        /**
+         * API name: {@code _source}
+         */
+        public final Builder source(@Nullable SourceConfig value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _source}
+         */
+        public final Builder source(Function<SourceConfig.Builder, ObjectBuilder<SourceConfig>> fn) {
+            return this.source(fn.apply(new SourceConfig.Builder()).build());
+        }
+
+        /**
+         * API name: {@code stored_fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>storedFields</code>.
+         */
+        public final Builder storedFields(List<String> list) {
+            this.storedFields = _listAddAll(this.storedFields, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code stored_fields}
+         * <p>
+         * Adds one or more values to <code>storedFields</code>.
+         */
+        public final Builder storedFields(String value, String... values) {
+            this.storedFields = _listAdd(this.storedFields, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code track_scores}
+         */
+        public final Builder trackScores(@Nullable Boolean value) {
+            this.trackScores = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Boolean value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code seq_no_primary_term}
+         */
+        public final Builder seqNoPrimaryTerm(@Nullable Boolean value) {
+            this.seqNoPrimaryTerm = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TopHitsAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TopHitsAggregation build() {
+            _checkSingleUse();
+
+            return new TopHitsAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TopHitsAggregation}
+     */
+    public static final JsonpDeserializer<TopHitsAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TopHitsAggregation::setupTopHitsAggregationDeserializer
+    );
+
+    protected static void setupTopHitsAggregationDeserializer(ObjectDeserializer<TopHitsAggregation.Builder> op) {
+        MetricAggregationBase.setupMetricAggregationBaseDeserializer(op);
+        op.add(Builder::docvalueFields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "docvalue_fields");
+        op.add(Builder::explain, JsonpDeserializer.booleanDeserializer(), "explain");
+        op.add(Builder::from, JsonpDeserializer.integerDeserializer(), "from");
+        op.add(Builder::highlight, Highlight._DESERIALIZER, "highlight");
+        op.add(Builder::scriptFields, JsonpDeserializer.stringMapDeserializer(ScriptField._DESERIALIZER), "script_fields");
+        op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
+        op.add(Builder::sort, JsonpDeserializer.arrayDeserializer(SortOptions._DESERIALIZER), "sort");
+        op.add(Builder::source, SourceConfig._DESERIALIZER, "_source");
+        op.add(Builder::storedFields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stored_fields");
+        op.add(Builder::trackScores, JsonpDeserializer.booleanDeserializer(), "track_scores");
+        op.add(Builder::version, JsonpDeserializer.booleanDeserializer(), "version");
+        op.add(Builder::seqNoPrimaryTerm, JsonpDeserializer.booleanDeserializer(), "seq_no_primary_term");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetrics.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetrics.java
index f6b4e67e2b..2136f643df 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetrics.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetrics.java
@@ -32,187 +32,188 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.FieldValue;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.FieldValue;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.TopMetrics
 
-
 @JsonpDeserializable
 public class TopMetrics implements JsonpSerializable {
-	private final List<FieldValue> sort;
-
-	private final Map<String, FieldValue> metrics;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TopMetrics(Builder builder) {
-
-		this.sort = ApiTypeHelper.unmodifiableRequired(builder.sort, this, "sort");
-		this.metrics = ApiTypeHelper.unmodifiableRequired(builder.metrics, this, "metrics");
-
-	}
-
-	public static TopMetrics of(Function<Builder, ObjectBuilder<TopMetrics>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code sort}
-	 */
-	public final List<FieldValue> sort() {
-		return this.sort;
-	}
-
-	/**
-	 * Required - API name: {@code metrics}
-	 */
-	public final Map<String, FieldValue> metrics() {
-		return this.metrics;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.sort)) {
-			generator.writeKey("sort");
-			generator.writeStartArray();
-			for (FieldValue item0 : this.sort) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.metrics)) {
-			generator.writeKey("metrics");
-			generator.writeStartObject();
-			for (Map.Entry<String, FieldValue> item0 : this.metrics.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TopMetrics}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TopMetrics> {
-		private List<FieldValue> sort;
-
-		private Map<String, FieldValue> metrics;
-
-		/**
-		 * Required - API name: {@code sort}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sort</code>.
-		 */
-		public final Builder sort(List<FieldValue> list) {
-			this.sort = _listAddAll(this.sort, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code sort}
-		 * <p>
-		 * Adds one or more values to <code>sort</code>.
-		 */
-		public final Builder sort(FieldValue value, FieldValue... values) {
-			this.sort = _listAdd(this.sort, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code sort}
-		 * <p>
-		 * Adds a value to <code>sort</code> using a builder lambda.
-		 */
-		public final Builder sort(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
-			return sort(fn.apply(new FieldValue.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code metrics}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>metrics</code>.
-		 */
-		public final Builder metrics(Map<String, FieldValue> map) {
-			this.metrics = _mapPutAll(this.metrics, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code metrics}
-		 * <p>
-		 * Adds an entry to <code>metrics</code>.
-		 */
-		public final Builder metrics(String key, FieldValue value) {
-			this.metrics = _mapPut(this.metrics, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code metrics}
-		 * <p>
-		 * Adds an entry to <code>metrics</code> using a builder lambda.
-		 */
-		public final Builder metrics(String key, Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
-			return metrics(key, fn.apply(new FieldValue.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link TopMetrics}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TopMetrics build() {
-			_checkSingleUse();
-
-			return new TopMetrics(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TopMetrics}
-	 */
-	public static final JsonpDeserializer<TopMetrics> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TopMetrics::setupTopMetricsDeserializer);
-
-	protected static void setupTopMetricsDeserializer(ObjectDeserializer<TopMetrics.Builder> op) {
-
-		op.add(Builder::sort, JsonpDeserializer.arrayDeserializer(FieldValue._DESERIALIZER), "sort");
-		op.add(Builder::metrics, JsonpDeserializer.stringMapDeserializer(FieldValue._DESERIALIZER), "metrics");
-
-	}
+    private final List<FieldValue> sort;
+
+    private final Map<String, FieldValue> metrics;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TopMetrics(Builder builder) {
+
+        this.sort = ApiTypeHelper.unmodifiableRequired(builder.sort, this, "sort");
+        this.metrics = ApiTypeHelper.unmodifiableRequired(builder.metrics, this, "metrics");
+
+    }
+
+    public static TopMetrics of(Function<Builder, ObjectBuilder<TopMetrics>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code sort}
+     */
+    public final List<FieldValue> sort() {
+        return this.sort;
+    }
+
+    /**
+     * Required - API name: {@code metrics}
+     */
+    public final Map<String, FieldValue> metrics() {
+        return this.metrics;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.sort)) {
+            generator.writeKey("sort");
+            generator.writeStartArray();
+            for (FieldValue item0 : this.sort) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.metrics)) {
+            generator.writeKey("metrics");
+            generator.writeStartObject();
+            for (Map.Entry<String, FieldValue> item0 : this.metrics.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TopMetrics}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TopMetrics> {
+        private List<FieldValue> sort;
+
+        private Map<String, FieldValue> metrics;
+
+        /**
+         * Required - API name: {@code sort}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sort</code>.
+         */
+        public final Builder sort(List<FieldValue> list) {
+            this.sort = _listAddAll(this.sort, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code sort}
+         * <p>
+         * Adds one or more values to <code>sort</code>.
+         */
+        public final Builder sort(FieldValue value, FieldValue... values) {
+            this.sort = _listAdd(this.sort, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code sort}
+         * <p>
+         * Adds a value to <code>sort</code> using a builder lambda.
+         */
+        public final Builder sort(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
+            return sort(fn.apply(new FieldValue.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code metrics}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>metrics</code>.
+         */
+        public final Builder metrics(Map<String, FieldValue> map) {
+            this.metrics = _mapPutAll(this.metrics, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code metrics}
+         * <p>
+         * Adds an entry to <code>metrics</code>.
+         */
+        public final Builder metrics(String key, FieldValue value) {
+            this.metrics = _mapPut(this.metrics, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code metrics}
+         * <p>
+         * Adds an entry to <code>metrics</code> using a builder lambda.
+         */
+        public final Builder metrics(String key, Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
+            return metrics(key, fn.apply(new FieldValue.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link TopMetrics}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TopMetrics build() {
+            _checkSingleUse();
+
+            return new TopMetrics(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TopMetrics}
+     */
+    public static final JsonpDeserializer<TopMetrics> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TopMetrics::setupTopMetricsDeserializer
+    );
+
+    protected static void setupTopMetricsDeserializer(ObjectDeserializer<TopMetrics.Builder> op) {
+
+        op.add(Builder::sort, JsonpDeserializer.arrayDeserializer(FieldValue._DESERIALIZER), "sort");
+        op.add(Builder::metrics, JsonpDeserializer.stringMapDeserializer(FieldValue._DESERIALIZER), "metrics");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetricsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetricsAggregate.java
index b1c300d469..160211a144 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetricsAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetricsAggregate.java
@@ -32,77 +32,77 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.TopMetricsAggregate
 
-
 @JsonpDeserializable
 public class TopMetricsAggregate extends MultiBucketAggregateBase<TopMetricsBucket> implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private TopMetricsAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static TopMetricsAggregate of(Function<Builder, ObjectBuilder<TopMetricsAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.TopMetrics;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TopMetricsAggregate}.
-	 */
-
-	public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<TopMetricsBucket, Builder>
-			implements
-				ObjectBuilder<TopMetricsAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TopMetricsAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TopMetricsAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new TopMetricsAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TopMetricsAggregate}
-	 */
-	public static final JsonpDeserializer<TopMetricsAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, TopMetricsAggregate::setupTopMetricsAggregateDeserializer);
-
-	protected static void setupTopMetricsAggregateDeserializer(ObjectDeserializer<TopMetricsAggregate.Builder> op) {
-		MultiBucketAggregateBase.setupMultiBucketAggregateBaseDeserializer(op, TopMetricsBucket._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private TopMetricsAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static TopMetricsAggregate of(Function<Builder, ObjectBuilder<TopMetricsAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.TopMetrics;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TopMetricsAggregate}.
+     */
+
+    public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<TopMetricsBucket, Builder>
+        implements
+            ObjectBuilder<TopMetricsAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TopMetricsAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TopMetricsAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new TopMetricsAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TopMetricsAggregate}
+     */
+    public static final JsonpDeserializer<TopMetricsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TopMetricsAggregate::setupTopMetricsAggregateDeserializer
+    );
+
+    protected static void setupTopMetricsAggregateDeserializer(ObjectDeserializer<TopMetricsAggregate.Builder> op) {
+        MultiBucketAggregateBase.setupMultiBucketAggregateBaseDeserializer(op, TopMetricsBucket._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetricsAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetricsAggregation.java
index 2fd9c519ba..06181dc039 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetricsAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetricsAggregation.java
@@ -32,223 +32,222 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.SortOptions;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.SortOptions;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.TopMetricsAggregation
 
-
 @JsonpDeserializable
 public class TopMetricsAggregation extends MetricAggregationBase implements AggregationVariant {
-	private final List<TopMetricsValue> metrics;
+    private final List<TopMetricsValue> metrics;
 
-	@Nullable
-	private final Integer size;
-
-	private final List<SortOptions> sort;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TopMetricsAggregation(Builder builder) {
-		super(builder);
-
-		this.metrics = ApiTypeHelper.unmodifiable(builder.metrics);
-		this.size = builder.size;
-		this.sort = ApiTypeHelper.unmodifiable(builder.sort);
-
-	}
-
-	public static TopMetricsAggregation of(Function<Builder, ObjectBuilder<TopMetricsAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.TopMetrics;
-	}
-
-	/**
-	 * API name: {@code metrics}
-	 */
-	public final List<TopMetricsValue> metrics() {
-		return this.metrics;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	/**
-	 * API name: {@code sort}
-	 */
-	public final List<SortOptions> sort() {
-		return this.sort;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.metrics)) {
-			generator.writeKey("metrics");
-			generator.writeStartArray();
-			for (TopMetricsValue item0 : this.metrics) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		if (ApiTypeHelper.isDefined(this.sort)) {
-			generator.writeKey("sort");
-			generator.writeStartArray();
-			for (SortOptions item0 : this.sort) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TopMetricsAggregation}.
-	 */
-
-	public static class Builder extends MetricAggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<TopMetricsAggregation> {
-		@Nullable
-		private List<TopMetricsValue> metrics;
-
-		@Nullable
-		private Integer size;
-
-		@Nullable
-		private List<SortOptions> sort;
-
-		/**
-		 * API name: {@code metrics}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>metrics</code>.
-		 */
-		public final Builder metrics(List<TopMetricsValue> list) {
-			this.metrics = _listAddAll(this.metrics, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code metrics}
-		 * <p>
-		 * Adds one or more values to <code>metrics</code>.
-		 */
-		public final Builder metrics(TopMetricsValue value, TopMetricsValue... values) {
-			this.metrics = _listAdd(this.metrics, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code metrics}
-		 * <p>
-		 * Adds a value to <code>metrics</code> using a builder lambda.
-		 */
-		public final Builder metrics(Function<TopMetricsValue.Builder, ObjectBuilder<TopMetricsValue>> fn) {
-			return metrics(fn.apply(new TopMetricsValue.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Integer value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sort</code>.
-		 */
-		public final Builder sort(List<SortOptions> list) {
-			this.sort = _listAddAll(this.sort, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds one or more values to <code>sort</code>.
-		 */
-		public final Builder sort(SortOptions value, SortOptions... values) {
-			this.sort = _listAdd(this.sort, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds a value to <code>sort</code> using a builder lambda.
-		 */
-		public final Builder sort(Function<SortOptions.Builder, ObjectBuilder<SortOptions>> fn) {
-			return sort(fn.apply(new SortOptions.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TopMetricsAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TopMetricsAggregation build() {
-			_checkSingleUse();
-
-			return new TopMetricsAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TopMetricsAggregation}
-	 */
-	public static final JsonpDeserializer<TopMetricsAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, TopMetricsAggregation::setupTopMetricsAggregationDeserializer);
-
-	protected static void setupTopMetricsAggregationDeserializer(ObjectDeserializer<TopMetricsAggregation.Builder> op) {
-		MetricAggregationBase.setupMetricAggregationBaseDeserializer(op);
-		op.add(Builder::metrics, JsonpDeserializer.arrayDeserializer(TopMetricsValue._DESERIALIZER), "metrics");
-		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
-		op.add(Builder::sort, JsonpDeserializer.arrayDeserializer(SortOptions._DESERIALIZER), "sort");
-
-	}
+    @Nullable
+    private final Integer size;
+
+    private final List<SortOptions> sort;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TopMetricsAggregation(Builder builder) {
+        super(builder);
+
+        this.metrics = ApiTypeHelper.unmodifiable(builder.metrics);
+        this.size = builder.size;
+        this.sort = ApiTypeHelper.unmodifiable(builder.sort);
+
+    }
+
+    public static TopMetricsAggregation of(Function<Builder, ObjectBuilder<TopMetricsAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.TopMetrics;
+    }
+
+    /**
+     * API name: {@code metrics}
+     */
+    public final List<TopMetricsValue> metrics() {
+        return this.metrics;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    /**
+     * API name: {@code sort}
+     */
+    public final List<SortOptions> sort() {
+        return this.sort;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.metrics)) {
+            generator.writeKey("metrics");
+            generator.writeStartArray();
+            for (TopMetricsValue item0 : this.metrics) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        if (ApiTypeHelper.isDefined(this.sort)) {
+            generator.writeKey("sort");
+            generator.writeStartArray();
+            for (SortOptions item0 : this.sort) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TopMetricsAggregation}.
+     */
+
+    public static class Builder extends MetricAggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<TopMetricsAggregation> {
+        @Nullable
+        private List<TopMetricsValue> metrics;
+
+        @Nullable
+        private Integer size;
+
+        @Nullable
+        private List<SortOptions> sort;
+
+        /**
+         * API name: {@code metrics}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>metrics</code>.
+         */
+        public final Builder metrics(List<TopMetricsValue> list) {
+            this.metrics = _listAddAll(this.metrics, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code metrics}
+         * <p>
+         * Adds one or more values to <code>metrics</code>.
+         */
+        public final Builder metrics(TopMetricsValue value, TopMetricsValue... values) {
+            this.metrics = _listAdd(this.metrics, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code metrics}
+         * <p>
+         * Adds a value to <code>metrics</code> using a builder lambda.
+         */
+        public final Builder metrics(Function<TopMetricsValue.Builder, ObjectBuilder<TopMetricsValue>> fn) {
+            return metrics(fn.apply(new TopMetricsValue.Builder()).build());
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Integer value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sort</code>.
+         */
+        public final Builder sort(List<SortOptions> list) {
+            this.sort = _listAddAll(this.sort, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds one or more values to <code>sort</code>.
+         */
+        public final Builder sort(SortOptions value, SortOptions... values) {
+            this.sort = _listAdd(this.sort, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds a value to <code>sort</code> using a builder lambda.
+         */
+        public final Builder sort(Function<SortOptions.Builder, ObjectBuilder<SortOptions>> fn) {
+            return sort(fn.apply(new SortOptions.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TopMetricsAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TopMetricsAggregation build() {
+            _checkSingleUse();
+
+            return new TopMetricsAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TopMetricsAggregation}
+     */
+    public static final JsonpDeserializer<TopMetricsAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TopMetricsAggregation::setupTopMetricsAggregationDeserializer
+    );
+
+    protected static void setupTopMetricsAggregationDeserializer(ObjectDeserializer<TopMetricsAggregation.Builder> op) {
+        MetricAggregationBase.setupMetricAggregationBaseDeserializer(op);
+        op.add(Builder::metrics, JsonpDeserializer.arrayDeserializer(TopMetricsValue._DESERIALIZER), "metrics");
+        op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
+        op.add(Builder::sort, JsonpDeserializer.arrayDeserializer(SortOptions._DESERIALIZER), "sort");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetricsBucket.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetricsBucket.java
index 7d79bbe808..df84090585 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetricsBucket.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetricsBucket.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,123 +42,119 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.TopMetricsBucket
 
-
 @JsonpDeserializable
 public class TopMetricsBucket extends MultiBucketBase {
-	private final List<TopMetrics> top;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TopMetricsBucket(Builder builder) {
-		super(builder);
-
-		this.top = ApiTypeHelper.unmodifiableRequired(builder.top, this, "top");
-
-	}
-
-	public static TopMetricsBucket of(Function<Builder, ObjectBuilder<TopMetricsBucket>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code top}
-	 */
-	public final List<TopMetrics> top() {
-		return this.top;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.top)) {
-			generator.writeKey("top");
-			generator.writeStartArray();
-			for (TopMetrics item0 : this.top) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TopMetricsBucket}.
-	 */
-
-	public static class Builder extends MultiBucketBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<TopMetricsBucket> {
-		private List<TopMetrics> top;
-
-		/**
-		 * Required - API name: {@code top}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>top</code>.
-		 */
-		public final Builder top(List<TopMetrics> list) {
-			this.top = _listAddAll(this.top, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code top}
-		 * <p>
-		 * Adds one or more values to <code>top</code>.
-		 */
-		public final Builder top(TopMetrics value, TopMetrics... values) {
-			this.top = _listAdd(this.top, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code top}
-		 * <p>
-		 * Adds a value to <code>top</code> using a builder lambda.
-		 */
-		public final Builder top(Function<TopMetrics.Builder, ObjectBuilder<TopMetrics>> fn) {
-			return top(fn.apply(new TopMetrics.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TopMetricsBucket}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TopMetricsBucket build() {
-			_checkSingleUse();
-
-			return new TopMetricsBucket(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TopMetricsBucket}
-	 */
-	public static final JsonpDeserializer<TopMetricsBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TopMetricsBucket::setupTopMetricsBucketDeserializer);
-
-	protected static void setupTopMetricsBucketDeserializer(ObjectDeserializer<TopMetricsBucket.Builder> op) {
-		setupMultiBucketBaseDeserializer(op);
-		op.add(Builder::top, JsonpDeserializer.arrayDeserializer(TopMetrics._DESERIALIZER), "top");
-
-	}
+    private final List<TopMetrics> top;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TopMetricsBucket(Builder builder) {
+        super(builder);
+
+        this.top = ApiTypeHelper.unmodifiableRequired(builder.top, this, "top");
+
+    }
+
+    public static TopMetricsBucket of(Function<Builder, ObjectBuilder<TopMetricsBucket>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code top}
+     */
+    public final List<TopMetrics> top() {
+        return this.top;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.top)) {
+            generator.writeKey("top");
+            generator.writeStartArray();
+            for (TopMetrics item0 : this.top) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TopMetricsBucket}.
+     */
+
+    public static class Builder extends MultiBucketBase.AbstractBuilder<Builder> implements ObjectBuilder<TopMetricsBucket> {
+        private List<TopMetrics> top;
+
+        /**
+         * Required - API name: {@code top}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>top</code>.
+         */
+        public final Builder top(List<TopMetrics> list) {
+            this.top = _listAddAll(this.top, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code top}
+         * <p>
+         * Adds one or more values to <code>top</code>.
+         */
+        public final Builder top(TopMetrics value, TopMetrics... values) {
+            this.top = _listAdd(this.top, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code top}
+         * <p>
+         * Adds a value to <code>top</code> using a builder lambda.
+         */
+        public final Builder top(Function<TopMetrics.Builder, ObjectBuilder<TopMetrics>> fn) {
+            return top(fn.apply(new TopMetrics.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TopMetricsBucket}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TopMetricsBucket build() {
+            _checkSingleUse();
+
+            return new TopMetricsBucket(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TopMetricsBucket}
+     */
+    public static final JsonpDeserializer<TopMetricsBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TopMetricsBucket::setupTopMetricsBucketDeserializer
+    );
+
+    protected static void setupTopMetricsBucketDeserializer(ObjectDeserializer<TopMetricsBucket.Builder> op) {
+        setupMultiBucketBaseDeserializer(op);
+        op.add(Builder::top, JsonpDeserializer.arrayDeserializer(TopMetrics._DESERIALIZER), "top");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetricsValue.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetricsValue.java
index 95b3c7b4ce..b9028cf9f4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetricsValue.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TopMetricsValue.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,93 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.aggregations.TopMetricsValue
 
-
 @JsonpDeserializable
 public class TopMetricsValue implements JsonpSerializable {
-	private final String field;
+    private final String field;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private TopMetricsValue(Builder builder) {
+    private TopMetricsValue(Builder builder) {
 
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
 
-	}
+    }
 
-	public static TopMetricsValue of(Function<Builder, ObjectBuilder<TopMetricsValue>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static TopMetricsValue of(Function<Builder, ObjectBuilder<TopMetricsValue>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("field");
-		generator.write(this.field);
+        generator.writeKey("field");
+        generator.write(this.field);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link TopMetricsValue}.
-	 */
+    /**
+     * Builder for {@link TopMetricsValue}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TopMetricsValue> {
-		private String field;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TopMetricsValue> {
+        private String field;
 
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link TopMetricsValue}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TopMetricsValue build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link TopMetricsValue}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TopMetricsValue build() {
+            _checkSingleUse();
 
-			return new TopMetricsValue(this);
-		}
-	}
+            return new TopMetricsValue(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link TopMetricsValue}
-	 */
-	public static final JsonpDeserializer<TopMetricsValue> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TopMetricsValue::setupTopMetricsValueDeserializer);
+    /**
+     * Json deserializer for {@link TopMetricsValue}
+     */
+    public static final JsonpDeserializer<TopMetricsValue> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TopMetricsValue::setupTopMetricsValueDeserializer
+    );
 
-	protected static void setupTopMetricsValueDeserializer(ObjectDeserializer<TopMetricsValue.Builder> op) {
+    protected static void setupTopMetricsValueDeserializer(ObjectDeserializer<TopMetricsValue.Builder> op) {
 
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/UnmappedRareTermsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/UnmappedRareTermsAggregate.java
index 16f69a9a0e..563f96d457 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/UnmappedRareTermsAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/UnmappedRareTermsAggregate.java
@@ -32,14 +32,13 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.UnmappedRareTermsAggregate
 
 /**
@@ -49,65 +48,66 @@
  */
 @JsonpDeserializable
 public class UnmappedRareTermsAggregate extends MultiBucketAggregateBase<Void> implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private UnmappedRareTermsAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static UnmappedRareTermsAggregate of(Function<Builder, ObjectBuilder<UnmappedRareTermsAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Umrareterms;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UnmappedRareTermsAggregate}.
-	 */
-
-	public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<Void, Builder>
-			implements
-				ObjectBuilder<UnmappedRareTermsAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link UnmappedRareTermsAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UnmappedRareTermsAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new UnmappedRareTermsAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link UnmappedRareTermsAggregate}
-	 */
-	public static final JsonpDeserializer<UnmappedRareTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, UnmappedRareTermsAggregate::setupUnmappedRareTermsAggregateDeserializer);
-
-	protected static void setupUnmappedRareTermsAggregateDeserializer(
-			ObjectDeserializer<UnmappedRareTermsAggregate.Builder> op) {
-		setupMultiBucketAggregateBaseDeserializer(op, JsonpDeserializer.voidDeserializer());
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private UnmappedRareTermsAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static UnmappedRareTermsAggregate of(Function<Builder, ObjectBuilder<UnmappedRareTermsAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Umrareterms;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UnmappedRareTermsAggregate}.
+     */
+
+    public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<Void, Builder>
+        implements
+            ObjectBuilder<UnmappedRareTermsAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link UnmappedRareTermsAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UnmappedRareTermsAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new UnmappedRareTermsAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link UnmappedRareTermsAggregate}
+     */
+    public static final JsonpDeserializer<UnmappedRareTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        UnmappedRareTermsAggregate::setupUnmappedRareTermsAggregateDeserializer
+    );
+
+    protected static void setupUnmappedRareTermsAggregateDeserializer(ObjectDeserializer<UnmappedRareTermsAggregate.Builder> op) {
+        setupMultiBucketAggregateBaseDeserializer(op, JsonpDeserializer.voidDeserializer());
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/UnmappedSignificantTermsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/UnmappedSignificantTermsAggregate.java
index b2949c7f5c..c918057940 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/UnmappedSignificantTermsAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/UnmappedSignificantTermsAggregate.java
@@ -32,14 +32,13 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.UnmappedSignificantTermsAggregate
 
 /**
@@ -49,66 +48,68 @@
  */
 @JsonpDeserializable
 public class UnmappedSignificantTermsAggregate extends MultiBucketAggregateBase<Void> implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private UnmappedSignificantTermsAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static UnmappedSignificantTermsAggregate of(
-			Function<Builder, ObjectBuilder<UnmappedSignificantTermsAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Umsigterms;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UnmappedSignificantTermsAggregate}.
-	 */
-
-	public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<Void, Builder>
-			implements
-				ObjectBuilder<UnmappedSignificantTermsAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link UnmappedSignificantTermsAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UnmappedSignificantTermsAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new UnmappedSignificantTermsAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link UnmappedSignificantTermsAggregate}
-	 */
-	public static final JsonpDeserializer<UnmappedSignificantTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, UnmappedSignificantTermsAggregate::setupUnmappedSignificantTermsAggregateDeserializer);
-
-	protected static void setupUnmappedSignificantTermsAggregateDeserializer(
-			ObjectDeserializer<UnmappedSignificantTermsAggregate.Builder> op) {
-		MultiBucketAggregateBase.setupMultiBucketAggregateBaseDeserializer(op, JsonpDeserializer.voidDeserializer());
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private UnmappedSignificantTermsAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static UnmappedSignificantTermsAggregate of(Function<Builder, ObjectBuilder<UnmappedSignificantTermsAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Umsigterms;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UnmappedSignificantTermsAggregate}.
+     */
+
+    public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<Void, Builder>
+        implements
+            ObjectBuilder<UnmappedSignificantTermsAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link UnmappedSignificantTermsAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UnmappedSignificantTermsAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new UnmappedSignificantTermsAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link UnmappedSignificantTermsAggregate}
+     */
+    public static final JsonpDeserializer<UnmappedSignificantTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        UnmappedSignificantTermsAggregate::setupUnmappedSignificantTermsAggregateDeserializer
+    );
+
+    protected static void setupUnmappedSignificantTermsAggregateDeserializer(
+        ObjectDeserializer<UnmappedSignificantTermsAggregate.Builder> op
+    ) {
+        MultiBucketAggregateBase.setupMultiBucketAggregateBaseDeserializer(op, JsonpDeserializer.voidDeserializer());
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/UnmappedTermsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/UnmappedTermsAggregate.java
index 7b3538d718..1b762dad92 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/UnmappedTermsAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/UnmappedTermsAggregate.java
@@ -32,14 +32,13 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.UnmappedTermsAggregate
 
 /**
@@ -49,65 +48,64 @@
  */
 @JsonpDeserializable
 public class UnmappedTermsAggregate extends TermsAggregateBase<Void> implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private UnmappedTermsAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static UnmappedTermsAggregate of(Function<Builder, ObjectBuilder<UnmappedTermsAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.Umterms;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UnmappedTermsAggregate}.
-	 */
-
-	public static class Builder extends TermsAggregateBase.AbstractBuilder<Void, Builder>
-			implements
-				ObjectBuilder<UnmappedTermsAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link UnmappedTermsAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UnmappedTermsAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new UnmappedTermsAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link UnmappedTermsAggregate}
-	 */
-	public static final JsonpDeserializer<UnmappedTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, UnmappedTermsAggregate::setupUnmappedTermsAggregateDeserializer);
-
-	protected static void setupUnmappedTermsAggregateDeserializer(
-			ObjectDeserializer<UnmappedTermsAggregate.Builder> op) {
-		setupTermsAggregateBaseDeserializer(op, JsonpDeserializer.voidDeserializer());
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private UnmappedTermsAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static UnmappedTermsAggregate of(Function<Builder, ObjectBuilder<UnmappedTermsAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.Umterms;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UnmappedTermsAggregate}.
+     */
+
+    public static class Builder extends TermsAggregateBase.AbstractBuilder<Void, Builder> implements ObjectBuilder<UnmappedTermsAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link UnmappedTermsAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UnmappedTermsAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new UnmappedTermsAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link UnmappedTermsAggregate}
+     */
+    public static final JsonpDeserializer<UnmappedTermsAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        UnmappedTermsAggregate::setupUnmappedTermsAggregateDeserializer
+    );
+
+    protected static void setupUnmappedTermsAggregateDeserializer(ObjectDeserializer<UnmappedTermsAggregate.Builder> op) {
+        setupTermsAggregateBaseDeserializer(op, JsonpDeserializer.voidDeserializer());
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ValueCountAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ValueCountAggregate.java
index 1d6571f754..aa20aa3fbe 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ValueCountAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ValueCountAggregate.java
@@ -32,14 +32,13 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.ValueCountAggregate
 
 /**
@@ -48,63 +47,63 @@
  */
 @JsonpDeserializable
 public class ValueCountAggregate extends SingleMetricAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private ValueCountAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static ValueCountAggregate of(Function<Builder, ObjectBuilder<ValueCountAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.ValueCount;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ValueCountAggregate}.
-	 */
-
-	public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ValueCountAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ValueCountAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ValueCountAggregate build() {
-			_checkSingleUse();
-
-			return new ValueCountAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ValueCountAggregate}
-	 */
-	public static final JsonpDeserializer<ValueCountAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ValueCountAggregate::setupValueCountAggregateDeserializer);
-
-	protected static void setupValueCountAggregateDeserializer(ObjectDeserializer<ValueCountAggregate.Builder> op) {
-		setupSingleMetricAggregateBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private ValueCountAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static ValueCountAggregate of(Function<Builder, ObjectBuilder<ValueCountAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.ValueCount;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ValueCountAggregate}.
+     */
+
+    public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<ValueCountAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ValueCountAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ValueCountAggregate build() {
+            _checkSingleUse();
+
+            return new ValueCountAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ValueCountAggregate}
+     */
+    public static final JsonpDeserializer<ValueCountAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ValueCountAggregate::setupValueCountAggregateDeserializer
+    );
+
+    protected static void setupValueCountAggregateDeserializer(ObjectDeserializer<ValueCountAggregate.Builder> op) {
+        setupSingleMetricAggregateBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ValueCountAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ValueCountAggregation.java
index d939c8c590..3c56538b0c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ValueCountAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ValueCountAggregation.java
@@ -32,76 +32,76 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.ValueCountAggregation
 
-
 @JsonpDeserializable
 public class ValueCountAggregation extends FormattableMetricAggregation implements AggregationVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private ValueCountAggregation(Builder builder) {
-		super(builder);
-
-	}
-
-	public static ValueCountAggregation of(Function<Builder, ObjectBuilder<ValueCountAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.ValueCount;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ValueCountAggregation}.
-	 */
-
-	public static class Builder extends FormattableMetricAggregation.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ValueCountAggregation> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ValueCountAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ValueCountAggregation build() {
-			_checkSingleUse();
-
-			return new ValueCountAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ValueCountAggregation}
-	 */
-	public static final JsonpDeserializer<ValueCountAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ValueCountAggregation::setupValueCountAggregationDeserializer);
-
-	protected static void setupValueCountAggregationDeserializer(ObjectDeserializer<ValueCountAggregation.Builder> op) {
-		FormattableMetricAggregation.setupFormattableMetricAggregationDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private ValueCountAggregation(Builder builder) {
+        super(builder);
+
+    }
+
+    public static ValueCountAggregation of(Function<Builder, ObjectBuilder<ValueCountAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.ValueCount;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ValueCountAggregation}.
+     */
+
+    public static class Builder extends FormattableMetricAggregation.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<ValueCountAggregation> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ValueCountAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ValueCountAggregation build() {
+            _checkSingleUse();
+
+            return new ValueCountAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ValueCountAggregation}
+     */
+    public static final JsonpDeserializer<ValueCountAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ValueCountAggregation::setupValueCountAggregationDeserializer
+    );
+
+    protected static void setupValueCountAggregationDeserializer(ObjectDeserializer<ValueCountAggregation.Builder> op) {
+        FormattableMetricAggregation.setupFormattableMetricAggregationDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ValueType.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ValueType.java
index 7232db4844..a056bb9c03 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ValueType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ValueType.java
@@ -35,41 +35,39 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum ValueType implements JsonEnum {
-	String("string"),
+    String("string"),
 
-	Long("long"),
+    Long("long"),
 
-	Double("double"),
+    Double("double"),
 
-	Number("number"),
+    Number("number"),
 
-	Date("date"),
+    Date("date"),
 
-	DateNanos("date_nanos"),
+    DateNanos("date_nanos"),
 
-	Ip("ip"),
+    Ip("ip"),
 
-	Numeric("numeric"),
+    Numeric("numeric"),
 
-	GeoPoint("geo_point"),
+    GeoPoint("geo_point"),
 
-	Boolean("boolean"),
+    Boolean("boolean"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	ValueType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    ValueType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<ValueType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			ValueType.values());
+    public static final JsonEnum.Deserializer<ValueType> _DESERIALIZER = new JsonEnum.Deserializer<>(ValueType.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/VariableWidthHistogramAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/VariableWidthHistogramAggregate.java
index 1c42ab0100..856a817fb3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/VariableWidthHistogramAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/VariableWidthHistogramAggregate.java
@@ -32,82 +32,77 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.VariableWidthHistogramAggregate
 
-
 @JsonpDeserializable
-public class VariableWidthHistogramAggregate extends MultiBucketAggregateBase<VariableWidthHistogramBucket>
-		implements
-			AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private VariableWidthHistogramAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static VariableWidthHistogramAggregate of(
-			Function<Builder, ObjectBuilder<VariableWidthHistogramAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.VariableWidthHistogram;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link VariableWidthHistogramAggregate}.
-	 */
-
-	public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<VariableWidthHistogramBucket, Builder>
-			implements
-				ObjectBuilder<VariableWidthHistogramAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link VariableWidthHistogramAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public VariableWidthHistogramAggregate build() {
-			_checkSingleUse();
-			super.tBucketSerializer(null);
-
-			return new VariableWidthHistogramAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link VariableWidthHistogramAggregate}
-	 */
-	public static final JsonpDeserializer<VariableWidthHistogramAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, VariableWidthHistogramAggregate::setupVariableWidthHistogramAggregateDeserializer);
-
-	protected static void setupVariableWidthHistogramAggregateDeserializer(
-			ObjectDeserializer<VariableWidthHistogramAggregate.Builder> op) {
-		MultiBucketAggregateBase.setupMultiBucketAggregateBaseDeserializer(op,
-				VariableWidthHistogramBucket._DESERIALIZER);
-
-	}
+public class VariableWidthHistogramAggregate extends MultiBucketAggregateBase<VariableWidthHistogramBucket> implements AggregateVariant {
+    // ---------------------------------------------------------------------------------------------
+
+    private VariableWidthHistogramAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static VariableWidthHistogramAggregate of(Function<Builder, ObjectBuilder<VariableWidthHistogramAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.VariableWidthHistogram;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link VariableWidthHistogramAggregate}.
+     */
+
+    public static class Builder extends MultiBucketAggregateBase.AbstractBuilder<VariableWidthHistogramBucket, Builder>
+        implements
+            ObjectBuilder<VariableWidthHistogramAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link VariableWidthHistogramAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public VariableWidthHistogramAggregate build() {
+            _checkSingleUse();
+            super.tBucketSerializer(null);
+
+            return new VariableWidthHistogramAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link VariableWidthHistogramAggregate}
+     */
+    public static final JsonpDeserializer<VariableWidthHistogramAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        VariableWidthHistogramAggregate::setupVariableWidthHistogramAggregateDeserializer
+    );
+
+    protected static void setupVariableWidthHistogramAggregateDeserializer(ObjectDeserializer<VariableWidthHistogramAggregate.Builder> op) {
+        MultiBucketAggregateBase.setupMultiBucketAggregateBaseDeserializer(op, VariableWidthHistogramBucket._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/VariableWidthHistogramAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/VariableWidthHistogramAggregation.java
index dbf12935a5..6f7bf6e7e9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/VariableWidthHistogramAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/VariableWidthHistogramAggregation.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,196 +43,195 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.VariableWidthHistogramAggregation
 
 @JsonpDeserializable
 public class VariableWidthHistogramAggregation implements AggregationVariant, JsonpSerializable {
-	@Nullable
-	private final String field;
-
-	@Nullable
-	private final Integer buckets;
-
-	@Nullable
-	private final Integer shardSize;
-
-	@Nullable
-	private final Integer initialBuffer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private VariableWidthHistogramAggregation(Builder builder) {
-
-		this.field = builder.field;
-		this.buckets = builder.buckets;
-		this.shardSize = builder.shardSize;
-		this.initialBuffer = builder.initialBuffer;
-
-	}
-
-	public static VariableWidthHistogramAggregation of(
-			Function<Builder, ObjectBuilder<VariableWidthHistogramAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.VariableWidthHistogram;
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code buckets}
-	 */
-	@Nullable
-	public final Integer buckets() {
-		return this.buckets;
-	}
-
-	/**
-	 * API name: {@code shard_size}
-	 */
-	@Nullable
-	public final Integer shardSize() {
-		return this.shardSize;
-	}
-
-	/**
-	 * API name: {@code initial_buffer}
-	 */
-	@Nullable
-	public final Integer initialBuffer() {
-		return this.initialBuffer;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (this.buckets != null) {
-			generator.writeKey("buckets");
-			generator.write(this.buckets);
-
-		}
-		if (this.shardSize != null) {
-			generator.writeKey("shard_size");
-			generator.write(this.shardSize);
-
-		}
-		if (this.initialBuffer != null) {
-			generator.writeKey("initial_buffer");
-			generator.write(this.initialBuffer);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link VariableWidthHistogramAggregation}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<VariableWidthHistogramAggregation> {
-		@Nullable
-		private String field;
-
-		@Nullable
-		private Integer buckets;
-
-		@Nullable
-		private Integer shardSize;
-
-		@Nullable
-		private Integer initialBuffer;
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code buckets}
-		 */
-		public final Builder buckets(@Nullable Integer value) {
-			this.buckets = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code shard_size}
-		 */
-		public final Builder shardSize(@Nullable Integer value) {
-			this.shardSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code initial_buffer}
-		 */
-		public final Builder initialBuffer(@Nullable Integer value) {
-			this.initialBuffer = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link VariableWidthHistogramAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public VariableWidthHistogramAggregation build() {
-			_checkSingleUse();
-
-			return new VariableWidthHistogramAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link VariableWidthHistogramAggregation}
-	 */
-	public static final JsonpDeserializer<VariableWidthHistogramAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, VariableWidthHistogramAggregation::setupVariableWidthHistogramAggregationDeserializer);
-
-	protected static void setupVariableWidthHistogramAggregationDeserializer(
-			ObjectDeserializer<VariableWidthHistogramAggregation.Builder> op) {
-
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::buckets, JsonpDeserializer.integerDeserializer(), "buckets");
-		op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
-		op.add(Builder::initialBuffer, JsonpDeserializer.integerDeserializer(), "initial_buffer");
-
-	}
+    @Nullable
+    private final String field;
+
+    @Nullable
+    private final Integer buckets;
+
+    @Nullable
+    private final Integer shardSize;
+
+    @Nullable
+    private final Integer initialBuffer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private VariableWidthHistogramAggregation(Builder builder) {
+
+        this.field = builder.field;
+        this.buckets = builder.buckets;
+        this.shardSize = builder.shardSize;
+        this.initialBuffer = builder.initialBuffer;
+
+    }
+
+    public static VariableWidthHistogramAggregation of(Function<Builder, ObjectBuilder<VariableWidthHistogramAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.VariableWidthHistogram;
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code buckets}
+     */
+    @Nullable
+    public final Integer buckets() {
+        return this.buckets;
+    }
+
+    /**
+     * API name: {@code shard_size}
+     */
+    @Nullable
+    public final Integer shardSize() {
+        return this.shardSize;
+    }
+
+    /**
+     * API name: {@code initial_buffer}
+     */
+    @Nullable
+    public final Integer initialBuffer() {
+        return this.initialBuffer;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (this.buckets != null) {
+            generator.writeKey("buckets");
+            generator.write(this.buckets);
+
+        }
+        if (this.shardSize != null) {
+            generator.writeKey("shard_size");
+            generator.write(this.shardSize);
+
+        }
+        if (this.initialBuffer != null) {
+            generator.writeKey("initial_buffer");
+            generator.write(this.initialBuffer);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link VariableWidthHistogramAggregation}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<VariableWidthHistogramAggregation> {
+        @Nullable
+        private String field;
+
+        @Nullable
+        private Integer buckets;
+
+        @Nullable
+        private Integer shardSize;
+
+        @Nullable
+        private Integer initialBuffer;
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code buckets}
+         */
+        public final Builder buckets(@Nullable Integer value) {
+            this.buckets = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code shard_size}
+         */
+        public final Builder shardSize(@Nullable Integer value) {
+            this.shardSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code initial_buffer}
+         */
+        public final Builder initialBuffer(@Nullable Integer value) {
+            this.initialBuffer = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link VariableWidthHistogramAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public VariableWidthHistogramAggregation build() {
+            _checkSingleUse();
+
+            return new VariableWidthHistogramAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link VariableWidthHistogramAggregation}
+     */
+    public static final JsonpDeserializer<VariableWidthHistogramAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        VariableWidthHistogramAggregation::setupVariableWidthHistogramAggregationDeserializer
+    );
+
+    protected static void setupVariableWidthHistogramAggregationDeserializer(
+        ObjectDeserializer<VariableWidthHistogramAggregation.Builder> op
+    ) {
+
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::buckets, JsonpDeserializer.integerDeserializer(), "buckets");
+        op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
+        op.add(Builder::initialBuffer, JsonpDeserializer.integerDeserializer(), "initial_buffer");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/VariableWidthHistogramBucket.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/VariableWidthHistogramBucket.java
index bb51a645e8..3dc3de77b0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/VariableWidthHistogramBucket.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/VariableWidthHistogramBucket.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,231 +42,226 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.VariableWidthHistogramBucket
 
-
 @JsonpDeserializable
 public class VariableWidthHistogramBucket extends MultiBucketBase {
-	private final double min;
-
-	private final double key;
-
-	private final double max;
-
-	@Nullable
-	private final String minAsString;
-
-	@Nullable
-	private final String keyAsString;
-
-	@Nullable
-	private final String maxAsString;
+    private final double min;
+
+    private final double key;
+
+    private final double max;
+
+    @Nullable
+    private final String minAsString;
+
+    @Nullable
+    private final String keyAsString;
+
+    @Nullable
+    private final String maxAsString;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private VariableWidthHistogramBucket(Builder builder) {
+        super(builder);
+
+        this.min = ApiTypeHelper.requireNonNull(builder.min, this, "min");
+        this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
+        this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
+        this.minAsString = builder.minAsString;
+        this.keyAsString = builder.keyAsString;
+        this.maxAsString = builder.maxAsString;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private VariableWidthHistogramBucket(Builder builder) {
-		super(builder);
-
-		this.min = ApiTypeHelper.requireNonNull(builder.min, this, "min");
-		this.key = ApiTypeHelper.requireNonNull(builder.key, this, "key");
-		this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
-		this.minAsString = builder.minAsString;
-		this.keyAsString = builder.keyAsString;
-		this.maxAsString = builder.maxAsString;
+    }
 
-	}
+    public static VariableWidthHistogramBucket of(Function<Builder, ObjectBuilder<VariableWidthHistogramBucket>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	public static VariableWidthHistogramBucket of(Function<Builder, ObjectBuilder<VariableWidthHistogramBucket>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    /**
+     * Required - API name: {@code min}
+     */
+    public final double min() {
+        return this.min;
+    }
 
-	/**
-	 * Required - API name: {@code min}
-	 */
-	public final double min() {
-		return this.min;
-	}
+    /**
+     * Required - API name: {@code key}
+     */
+    public final double key() {
+        return this.key;
+    }
 
-	/**
-	 * Required - API name: {@code key}
-	 */
-	public final double key() {
-		return this.key;
-	}
-
-	/**
-	 * Required - API name: {@code max}
-	 */
-	public final double max() {
-		return this.max;
-	}
-
-	/**
-	 * API name: {@code min_as_string}
-	 */
-	@Nullable
-	public final String minAsString() {
-		return this.minAsString;
-	}
-
-	/**
-	 * API name: {@code key_as_string}
-	 */
-	@Nullable
-	public final String keyAsString() {
-		return this.keyAsString;
-	}
-
-	/**
-	 * API name: {@code max_as_string}
-	 */
-	@Nullable
-	public final String maxAsString() {
-		return this.maxAsString;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("min");
-		generator.write(this.min);
-
-		generator.writeKey("key");
-		generator.write(this.key);
-
-		generator.writeKey("max");
-		generator.write(this.max);
-
-		if (this.minAsString != null) {
-			generator.writeKey("min_as_string");
-			generator.write(this.minAsString);
-
-		}
-		if (this.keyAsString != null) {
-			generator.writeKey("key_as_string");
-			generator.write(this.keyAsString);
-
-		}
-		if (this.maxAsString != null) {
-			generator.writeKey("max_as_string");
-			generator.write(this.maxAsString);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link VariableWidthHistogramBucket}.
-	 */
-
-	public static class Builder extends MultiBucketBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<VariableWidthHistogramBucket> {
-		private Double min;
-
-		private Double key;
-
-		private Double max;
-
-		@Nullable
-		private String minAsString;
-
-		@Nullable
-		private String keyAsString;
-
-		@Nullable
-		private String maxAsString;
-
-		/**
-		 * Required - API name: {@code min}
-		 */
-		public final Builder min(double value) {
-			this.min = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code key}
-		 */
-		public final Builder key(double value) {
-			this.key = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code max}
-		 */
-		public final Builder max(double value) {
-			this.max = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_as_string}
-		 */
-		public final Builder minAsString(@Nullable String value) {
-			this.minAsString = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code key_as_string}
-		 */
-		public final Builder keyAsString(@Nullable String value) {
-			this.keyAsString = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_as_string}
-		 */
-		public final Builder maxAsString(@Nullable String value) {
-			this.maxAsString = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link VariableWidthHistogramBucket}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public VariableWidthHistogramBucket build() {
-			_checkSingleUse();
-
-			return new VariableWidthHistogramBucket(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link VariableWidthHistogramBucket}
-	 */
-	public static final JsonpDeserializer<VariableWidthHistogramBucket> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, VariableWidthHistogramBucket::setupVariableWidthHistogramBucketDeserializer);
-
-	protected static void setupVariableWidthHistogramBucketDeserializer(
-			ObjectDeserializer<VariableWidthHistogramBucket.Builder> op) {
-		MultiBucketBase.setupMultiBucketBaseDeserializer(op);
-		op.add(Builder::min, JsonpDeserializer.doubleDeserializer(), "min");
-		op.add(Builder::key, JsonpDeserializer.doubleDeserializer(), "key");
-		op.add(Builder::max, JsonpDeserializer.doubleDeserializer(), "max");
-		op.add(Builder::minAsString, JsonpDeserializer.stringDeserializer(), "min_as_string");
-		op.add(Builder::keyAsString, JsonpDeserializer.stringDeserializer(), "key_as_string");
-		op.add(Builder::maxAsString, JsonpDeserializer.stringDeserializer(), "max_as_string");
-
-	}
+    /**
+     * Required - API name: {@code max}
+     */
+    public final double max() {
+        return this.max;
+    }
+
+    /**
+     * API name: {@code min_as_string}
+     */
+    @Nullable
+    public final String minAsString() {
+        return this.minAsString;
+    }
+
+    /**
+     * API name: {@code key_as_string}
+     */
+    @Nullable
+    public final String keyAsString() {
+        return this.keyAsString;
+    }
+
+    /**
+     * API name: {@code max_as_string}
+     */
+    @Nullable
+    public final String maxAsString() {
+        return this.maxAsString;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("min");
+        generator.write(this.min);
+
+        generator.writeKey("key");
+        generator.write(this.key);
+
+        generator.writeKey("max");
+        generator.write(this.max);
+
+        if (this.minAsString != null) {
+            generator.writeKey("min_as_string");
+            generator.write(this.minAsString);
+
+        }
+        if (this.keyAsString != null) {
+            generator.writeKey("key_as_string");
+            generator.write(this.keyAsString);
+
+        }
+        if (this.maxAsString != null) {
+            generator.writeKey("max_as_string");
+            generator.write(this.maxAsString);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link VariableWidthHistogramBucket}.
+     */
+
+    public static class Builder extends MultiBucketBase.AbstractBuilder<Builder> implements ObjectBuilder<VariableWidthHistogramBucket> {
+        private Double min;
+
+        private Double key;
+
+        private Double max;
+
+        @Nullable
+        private String minAsString;
+
+        @Nullable
+        private String keyAsString;
+
+        @Nullable
+        private String maxAsString;
+
+        /**
+         * Required - API name: {@code min}
+         */
+        public final Builder min(double value) {
+            this.min = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code key}
+         */
+        public final Builder key(double value) {
+            this.key = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code max}
+         */
+        public final Builder max(double value) {
+            this.max = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code min_as_string}
+         */
+        public final Builder minAsString(@Nullable String value) {
+            this.minAsString = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code key_as_string}
+         */
+        public final Builder keyAsString(@Nullable String value) {
+            this.keyAsString = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_as_string}
+         */
+        public final Builder maxAsString(@Nullable String value) {
+            this.maxAsString = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link VariableWidthHistogramBucket}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public VariableWidthHistogramBucket build() {
+            _checkSingleUse();
+
+            return new VariableWidthHistogramBucket(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link VariableWidthHistogramBucket}
+     */
+    public static final JsonpDeserializer<VariableWidthHistogramBucket> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        VariableWidthHistogramBucket::setupVariableWidthHistogramBucketDeserializer
+    );
+
+    protected static void setupVariableWidthHistogramBucketDeserializer(ObjectDeserializer<VariableWidthHistogramBucket.Builder> op) {
+        MultiBucketBase.setupMultiBucketBaseDeserializer(op);
+        op.add(Builder::min, JsonpDeserializer.doubleDeserializer(), "min");
+        op.add(Builder::key, JsonpDeserializer.doubleDeserializer(), "key");
+        op.add(Builder::max, JsonpDeserializer.doubleDeserializer(), "max");
+        op.add(Builder::minAsString, JsonpDeserializer.stringDeserializer(), "min_as_string");
+        op.add(Builder::keyAsString, JsonpDeserializer.stringDeserializer(), "key_as_string");
+        op.add(Builder::maxAsString, JsonpDeserializer.stringDeserializer(), "max_as_string");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/WeightedAverageAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/WeightedAverageAggregation.java
index 6d17c00ca7..3459a723bb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/WeightedAverageAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/WeightedAverageAggregation.java
@@ -32,215 +32,213 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.WeightedAverageAggregation
 
-
 @JsonpDeserializable
 public class WeightedAverageAggregation extends AggregationBase implements AggregationVariant {
-	@Nullable
-	private final String format;
-
-	@Nullable
-	private final WeightedAverageValue value;
-
-	@Nullable
-	private final ValueType valueType;
-
-	@Nullable
-	private final WeightedAverageValue weight;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private WeightedAverageAggregation(Builder builder) {
-		super(builder);
-
-		this.format = builder.format;
-		this.value = builder.value;
-		this.valueType = builder.valueType;
-		this.weight = builder.weight;
-
-	}
-
-	public static WeightedAverageAggregation of(Function<Builder, ObjectBuilder<WeightedAverageAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.WeightedAvg;
-	}
-
-	/**
-	 * API name: {@code format}
-	 */
-	@Nullable
-	public final String format() {
-		return this.format;
-	}
-
-	/**
-	 * API name: {@code value}
-	 */
-	@Nullable
-	public final WeightedAverageValue value() {
-		return this.value;
-	}
-
-	/**
-	 * API name: {@code value_type}
-	 */
-	@Nullable
-	public final ValueType valueType() {
-		return this.valueType;
-	}
-
-	/**
-	 * API name: {@code weight}
-	 */
-	@Nullable
-	public final WeightedAverageValue weight() {
-		return this.weight;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.format != null) {
-			generator.writeKey("format");
-			generator.write(this.format);
-
-		}
-		if (this.value != null) {
-			generator.writeKey("value");
-			this.value.serialize(generator, mapper);
-
-		}
-		if (this.valueType != null) {
-			generator.writeKey("value_type");
-			this.valueType.serialize(generator, mapper);
-		}
-		if (this.weight != null) {
-			generator.writeKey("weight");
-			this.weight.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link WeightedAverageAggregation}.
-	 */
-
-	public static class Builder extends AggregationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<WeightedAverageAggregation> {
-		@Nullable
-		private String format;
-
-		@Nullable
-		private WeightedAverageValue value;
-
-		@Nullable
-		private ValueType valueType;
-
-		@Nullable
-		private WeightedAverageValue weight;
-
-		/**
-		 * API name: {@code format}
-		 */
-		public final Builder format(@Nullable String value) {
-			this.format = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code value}
-		 */
-		public final Builder value(@Nullable WeightedAverageValue value) {
-			this.value = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code value}
-		 */
-		public final Builder value(Function<WeightedAverageValue.Builder, ObjectBuilder<WeightedAverageValue>> fn) {
-			return this.value(fn.apply(new WeightedAverageValue.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code value_type}
-		 */
-		public final Builder valueType(@Nullable ValueType value) {
-			this.valueType = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code weight}
-		 */
-		public final Builder weight(@Nullable WeightedAverageValue value) {
-			this.weight = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code weight}
-		 */
-		public final Builder weight(Function<WeightedAverageValue.Builder, ObjectBuilder<WeightedAverageValue>> fn) {
-			return this.weight(fn.apply(new WeightedAverageValue.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link WeightedAverageAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public WeightedAverageAggregation build() {
-			_checkSingleUse();
-
-			return new WeightedAverageAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link WeightedAverageAggregation}
-	 */
-	public static final JsonpDeserializer<WeightedAverageAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, WeightedAverageAggregation::setupWeightedAverageAggregationDeserializer);
-
-	protected static void setupWeightedAverageAggregationDeserializer(
-			ObjectDeserializer<WeightedAverageAggregation.Builder> op) {
-		setupAggregationBaseDeserializer(op);
-		op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
-		op.add(Builder::value, WeightedAverageValue._DESERIALIZER, "value");
-		op.add(Builder::valueType, ValueType._DESERIALIZER, "value_type");
-		op.add(Builder::weight, WeightedAverageValue._DESERIALIZER, "weight");
-
-	}
+    @Nullable
+    private final String format;
+
+    @Nullable
+    private final WeightedAverageValue value;
+
+    @Nullable
+    private final ValueType valueType;
+
+    @Nullable
+    private final WeightedAverageValue weight;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private WeightedAverageAggregation(Builder builder) {
+        super(builder);
+
+        this.format = builder.format;
+        this.value = builder.value;
+        this.valueType = builder.valueType;
+        this.weight = builder.weight;
+
+    }
+
+    public static WeightedAverageAggregation of(Function<Builder, ObjectBuilder<WeightedAverageAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.WeightedAvg;
+    }
+
+    /**
+     * API name: {@code format}
+     */
+    @Nullable
+    public final String format() {
+        return this.format;
+    }
+
+    /**
+     * API name: {@code value}
+     */
+    @Nullable
+    public final WeightedAverageValue value() {
+        return this.value;
+    }
+
+    /**
+     * API name: {@code value_type}
+     */
+    @Nullable
+    public final ValueType valueType() {
+        return this.valueType;
+    }
+
+    /**
+     * API name: {@code weight}
+     */
+    @Nullable
+    public final WeightedAverageValue weight() {
+        return this.weight;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.format != null) {
+            generator.writeKey("format");
+            generator.write(this.format);
+
+        }
+        if (this.value != null) {
+            generator.writeKey("value");
+            this.value.serialize(generator, mapper);
+
+        }
+        if (this.valueType != null) {
+            generator.writeKey("value_type");
+            this.valueType.serialize(generator, mapper);
+        }
+        if (this.weight != null) {
+            generator.writeKey("weight");
+            this.weight.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link WeightedAverageAggregation}.
+     */
+
+    public static class Builder extends AggregationBase.AbstractBuilder<Builder> implements ObjectBuilder<WeightedAverageAggregation> {
+        @Nullable
+        private String format;
+
+        @Nullable
+        private WeightedAverageValue value;
+
+        @Nullable
+        private ValueType valueType;
+
+        @Nullable
+        private WeightedAverageValue weight;
+
+        /**
+         * API name: {@code format}
+         */
+        public final Builder format(@Nullable String value) {
+            this.format = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code value}
+         */
+        public final Builder value(@Nullable WeightedAverageValue value) {
+            this.value = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code value}
+         */
+        public final Builder value(Function<WeightedAverageValue.Builder, ObjectBuilder<WeightedAverageValue>> fn) {
+            return this.value(fn.apply(new WeightedAverageValue.Builder()).build());
+        }
+
+        /**
+         * API name: {@code value_type}
+         */
+        public final Builder valueType(@Nullable ValueType value) {
+            this.valueType = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code weight}
+         */
+        public final Builder weight(@Nullable WeightedAverageValue value) {
+            this.weight = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code weight}
+         */
+        public final Builder weight(Function<WeightedAverageValue.Builder, ObjectBuilder<WeightedAverageValue>> fn) {
+            return this.weight(fn.apply(new WeightedAverageValue.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link WeightedAverageAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public WeightedAverageAggregation build() {
+            _checkSingleUse();
+
+            return new WeightedAverageAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link WeightedAverageAggregation}
+     */
+    public static final JsonpDeserializer<WeightedAverageAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        WeightedAverageAggregation::setupWeightedAverageAggregationDeserializer
+    );
+
+    protected static void setupWeightedAverageAggregationDeserializer(ObjectDeserializer<WeightedAverageAggregation.Builder> op) {
+        setupAggregationBaseDeserializer(op);
+        op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
+        op.add(Builder::value, WeightedAverageValue._DESERIALIZER, "value");
+        op.add(Builder::valueType, ValueType._DESERIALIZER, "value_type");
+        op.add(Builder::weight, WeightedAverageValue._DESERIALIZER, "weight");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/WeightedAverageValue.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/WeightedAverageValue.java
index 9bd1ca4d2d..c69e11f2c5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/WeightedAverageValue.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/WeightedAverageValue.java
@@ -32,174 +32,175 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.aggregations.WeightedAverageValue
 
-
 @JsonpDeserializable
 public class WeightedAverageValue implements JsonpSerializable {
-	@Nullable
-	private final String field;
-
-	@Nullable
-	private final Double missing;
-
-	@Nullable
-	private final Script script;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private WeightedAverageValue(Builder builder) {
-
-		this.field = builder.field;
-		this.missing = builder.missing;
-		this.script = builder.script;
-
-	}
-
-	public static WeightedAverageValue of(Function<Builder, ObjectBuilder<WeightedAverageValue>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code missing}
-	 */
-	@Nullable
-	public final Double missing() {
-		return this.missing;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final Script script() {
-		return this.script;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (this.missing != null) {
-			generator.writeKey("missing");
-			generator.write(this.missing);
-
-		}
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link WeightedAverageValue}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<WeightedAverageValue> {
-		@Nullable
-		private String field;
-
-		@Nullable
-		private Double missing;
-
-		@Nullable
-		private Script script;
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code missing}
-		 */
-		public final Builder missing(@Nullable Double value) {
-			this.missing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(@Nullable Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link WeightedAverageValue}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public WeightedAverageValue build() {
-			_checkSingleUse();
-
-			return new WeightedAverageValue(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link WeightedAverageValue}
-	 */
-	public static final JsonpDeserializer<WeightedAverageValue> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, WeightedAverageValue::setupWeightedAverageValueDeserializer);
-
-	protected static void setupWeightedAverageValueDeserializer(ObjectDeserializer<WeightedAverageValue.Builder> op) {
-
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::missing, JsonpDeserializer.doubleDeserializer(), "missing");
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-
-	}
+    @Nullable
+    private final String field;
+
+    @Nullable
+    private final Double missing;
+
+    @Nullable
+    private final Script script;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private WeightedAverageValue(Builder builder) {
+
+        this.field = builder.field;
+        this.missing = builder.missing;
+        this.script = builder.script;
+
+    }
+
+    public static WeightedAverageValue of(Function<Builder, ObjectBuilder<WeightedAverageValue>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code missing}
+     */
+    @Nullable
+    public final Double missing() {
+        return this.missing;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final Script script() {
+        return this.script;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (this.missing != null) {
+            generator.writeKey("missing");
+            generator.write(this.missing);
+
+        }
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link WeightedAverageValue}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<WeightedAverageValue> {
+        @Nullable
+        private String field;
+
+        @Nullable
+        private Double missing;
+
+        @Nullable
+        private Script script;
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code missing}
+         */
+        public final Builder missing(@Nullable Double value) {
+            this.missing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(@Nullable Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link WeightedAverageValue}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public WeightedAverageValue build() {
+            _checkSingleUse();
+
+            return new WeightedAverageValue(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link WeightedAverageValue}
+     */
+    public static final JsonpDeserializer<WeightedAverageValue> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        WeightedAverageValue::setupWeightedAverageValueDeserializer
+    );
+
+    protected static void setupWeightedAverageValueDeserializer(ObjectDeserializer<WeightedAverageValue.Builder> op) {
+
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::missing, JsonpDeserializer.doubleDeserializer(), "missing");
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/WeightedAvgAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/WeightedAvgAggregate.java
index 965346d41e..c67503bd16 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/WeightedAvgAggregate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/WeightedAvgAggregate.java
@@ -32,14 +32,13 @@
 
 package org.opensearch.client.opensearch._types.aggregations;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.aggregations.WeightedAvgAggregate
 
 /**
@@ -49,63 +48,63 @@
  */
 @JsonpDeserializable
 public class WeightedAvgAggregate extends SingleMetricAggregateBase implements AggregateVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private WeightedAvgAggregate(Builder builder) {
-		super(builder);
-
-	}
-
-	public static WeightedAvgAggregate of(Function<Builder, ObjectBuilder<WeightedAvgAggregate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aggregate variant kind.
-	 */
-	@Override
-	public Aggregate.Kind _aggregateKind() {
-		return Aggregate.Kind.WeightedAvg;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link WeightedAvgAggregate}.
-	 */
-
-	public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<WeightedAvgAggregate> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link WeightedAvgAggregate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public WeightedAvgAggregate build() {
-			_checkSingleUse();
-
-			return new WeightedAvgAggregate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link WeightedAvgAggregate}
-	 */
-	public static final JsonpDeserializer<WeightedAvgAggregate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, WeightedAvgAggregate::setupWeightedAvgAggregateDeserializer);
-
-	protected static void setupWeightedAvgAggregateDeserializer(ObjectDeserializer<WeightedAvgAggregate.Builder> op) {
-		setupSingleMetricAggregateBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private WeightedAvgAggregate(Builder builder) {
+        super(builder);
+
+    }
+
+    public static WeightedAvgAggregate of(Function<Builder, ObjectBuilder<WeightedAvgAggregate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aggregate variant kind.
+     */
+    @Override
+    public Aggregate.Kind _aggregateKind() {
+        return Aggregate.Kind.WeightedAvg;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link WeightedAvgAggregate}.
+     */
+
+    public static class Builder extends SingleMetricAggregateBase.AbstractBuilder<Builder> implements ObjectBuilder<WeightedAvgAggregate> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link WeightedAvgAggregate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public WeightedAvgAggregate build() {
+            _checkSingleUse();
+
+            return new WeightedAvgAggregate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link WeightedAvgAggregate}
+     */
+    public static final JsonpDeserializer<WeightedAvgAggregate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        WeightedAvgAggregate::setupWeightedAvgAggregateDeserializer
+    );
+
+    protected static void setupWeightedAvgAggregateDeserializer(ObjectDeserializer<WeightedAvgAggregate.Builder> op) {
+        setupSingleMetricAggregateBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/Analyzer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/Analyzer.java
index 7ae36f4dcc..3a60a8daf7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/Analyzer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/Analyzer.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -44,338 +46,334 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.Analyzer
 
-
 @JsonpDeserializable
 public class Analyzer implements TaggedUnion<Analyzer.Kind, AnalyzerVariant>, JsonpSerializable {
 
-	/**
-	 * {@link Analyzer} variant kinds.
-	 */
-	/**
-	 * {@link Analyzer} variant kinds.
-	 */
+    /**
+     * {@link Analyzer} variant kinds.
+     */
+    /**
+     * {@link Analyzer} variant kinds.
+     */
+
+    public enum Kind implements JsonEnum {
+        Custom("custom"),
+
+        Dutch("dutch"),
+
+        Fingerprint("fingerprint"),
+
+        IcuAnalyzer("icu_analyzer"),
+
+        Keyword("keyword"),
+
+        Kuromoji("kuromoji"),
+
+        Language("language"),
+
+        Nori("nori"),
+
+        Pattern("pattern"),
+
+        Simple("simple"),
+
+        Snowball("snowball"),
+
+        Standard("standard"),
+
+        Stop("stop"),
+
+        Whitespace("whitespace"),
+
+        Smartcn("smartcn"),
+
+        Cjk("cjk"),
+
+        ;
+
+        private final String jsonValue;
+
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
+
+        public String jsonValue() {
+            return this.jsonValue;
+        }
+
+    }
+
+    private final Kind _kind;
+    private final AnalyzerVariant _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final AnalyzerVariant _get() {
+        return _value;
+    }
+
+    public Analyzer(AnalyzerVariant value) {
+
+        this._kind = ApiTypeHelper.requireNonNull(value._analyzerKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+
+    }
+
+    private Analyzer(Builder builder) {
 
-	public enum Kind implements JsonEnum {
-		Custom("custom"),
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
 
-		Dutch("dutch"),
+    }
+
+    public static Analyzer of(Function<Builder, ObjectBuilder<Analyzer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code custom}?
+     */
+    public boolean isCustom() {
+        return _kind == Kind.Custom;
+    }
+
+    /**
+     * Get the {@code custom} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code custom} kind.
+     */
+    public CustomAnalyzer custom() {
+        return TaggedUnionUtils.get(this, Kind.Custom);
+    }
 
-		Fingerprint("fingerprint"),
+    /**
+     * Is this variant instance of kind {@code dutch}?
+     */
+    public boolean isDutch() {
+        return _kind == Kind.Dutch;
+    }
 
-		IcuAnalyzer("icu_analyzer"),
+    /**
+     * Get the {@code dutch} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code dutch} kind.
+     */
+    public DutchAnalyzer dutch() {
+        return TaggedUnionUtils.get(this, Kind.Dutch);
+    }
 
-		Keyword("keyword"),
+    /**
+     * Is this variant instance of kind {@code fingerprint}?
+     */
+    public boolean isFingerprint() {
+        return _kind == Kind.Fingerprint;
+    }
 
-		Kuromoji("kuromoji"),
+    /**
+     * Get the {@code fingerprint} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code fingerprint} kind.
+     */
+    public FingerprintAnalyzer fingerprint() {
+        return TaggedUnionUtils.get(this, Kind.Fingerprint);
+    }
 
-		Language("language"),
+    /**
+     * Is this variant instance of kind {@code icu_analyzer}?
+     */
+    public boolean isIcuAnalyzer() {
+        return _kind == Kind.IcuAnalyzer;
+    }
 
-		Nori("nori"),
+    /**
+     * Get the {@code icu_analyzer} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code icu_analyzer} kind.
+     */
+    public IcuAnalyzer icuAnalyzer() {
+        return TaggedUnionUtils.get(this, Kind.IcuAnalyzer);
+    }
 
-		Pattern("pattern"),
+    /**
+     * Is this variant instance of kind {@code keyword}?
+     */
+    public boolean isKeyword() {
+        return _kind == Kind.Keyword;
+    }
 
-		Simple("simple"),
+    /**
+     * Get the {@code keyword} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code keyword} kind.
+     */
+    public KeywordAnalyzer keyword() {
+        return TaggedUnionUtils.get(this, Kind.Keyword);
+    }
 
-		Snowball("snowball"),
+    /**
+     * Is this variant instance of kind {@code kuromoji}?
+     */
+    public boolean isKuromoji() {
+        return _kind == Kind.Kuromoji;
+    }
 
-		Standard("standard"),
+    /**
+     * Get the {@code kuromoji} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code kuromoji} kind.
+     */
+    public KuromojiAnalyzer kuromoji() {
+        return TaggedUnionUtils.get(this, Kind.Kuromoji);
+    }
 
-		Stop("stop"),
+    /**
+     * Is this variant instance of kind {@code language}?
+     */
+    public boolean isLanguage() {
+        return _kind == Kind.Language;
+    }
 
-		Whitespace("whitespace"),
+    /**
+     * Get the {@code language} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code language} kind.
+     */
+    public LanguageAnalyzer language() {
+        return TaggedUnionUtils.get(this, Kind.Language);
+    }
 
-		Smartcn("smartcn"),
+    /**
+     * Is this variant instance of kind {@code nori}?
+     */
+    public boolean isNori() {
+        return _kind == Kind.Nori;
+    }
 
-		Cjk("cjk"),
+    /**
+     * Get the {@code nori} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code nori} kind.
+     */
+    public NoriAnalyzer nori() {
+        return TaggedUnionUtils.get(this, Kind.Nori);
+    }
 
-		;
+    /**
+     * Is this variant instance of kind {@code pattern}?
+     */
+    public boolean isPattern() {
+        return _kind == Kind.Pattern;
+    }
 
-		private final String jsonValue;
+    /**
+     * Get the {@code pattern} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code pattern} kind.
+     */
+    public PatternAnalyzer pattern() {
+        return TaggedUnionUtils.get(this, Kind.Pattern);
+    }
 
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
+    /**
+     * Is this variant instance of kind {@code simple}?
+     */
+    public boolean isSimple() {
+        return _kind == Kind.Simple;
+    }
 
-		public String jsonValue() {
-			return this.jsonValue;
-		}
+    /**
+     * Get the {@code simple} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code simple} kind.
+     */
+    public SimpleAnalyzer simple() {
+        return TaggedUnionUtils.get(this, Kind.Simple);
+    }
 
-	}
+    /**
+     * Is this variant instance of kind {@code snowball}?
+     */
+    public boolean isSnowball() {
+        return _kind == Kind.Snowball;
+    }
 
-	private final Kind _kind;
-	private final AnalyzerVariant _value;
+    /**
+     * Get the {@code snowball} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code snowball} kind.
+     */
+    public SnowballAnalyzer snowball() {
+        return TaggedUnionUtils.get(this, Kind.Snowball);
+    }
 
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
+    /**
+     * Is this variant instance of kind {@code standard}?
+     */
+    public boolean isStandard() {
+        return _kind == Kind.Standard;
+    }
 
-	@Override
-	public final AnalyzerVariant _get() {
-		return _value;
-	}
+    /**
+     * Get the {@code standard} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code standard} kind.
+     */
+    public StandardAnalyzer standard() {
+        return TaggedUnionUtils.get(this, Kind.Standard);
+    }
 
-	public Analyzer(AnalyzerVariant value) {
+    /**
+     * Is this variant instance of kind {@code stop}?
+     */
+    public boolean isStop() {
+        return _kind == Kind.Stop;
+    }
 
-		this._kind = ApiTypeHelper.requireNonNull(value._analyzerKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+    /**
+     * Get the {@code stop} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code stop} kind.
+     */
+    public StopAnalyzer stop() {
+        return TaggedUnionUtils.get(this, Kind.Stop);
+    }
 
-	}
+    /**
+     * Is this variant instance of kind {@code whitespace}?
+     */
+    public boolean isWhitespace() {
+        return _kind == Kind.Whitespace;
+    }
 
-	private Analyzer(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static Analyzer of(Function<Builder, ObjectBuilder<Analyzer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code custom}?
-	 */
-	public boolean isCustom() {
-		return _kind == Kind.Custom;
-	}
-
-	/**
-	 * Get the {@code custom} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code custom} kind.
-	 */
-	public CustomAnalyzer custom() {
-		return TaggedUnionUtils.get(this, Kind.Custom);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code dutch}?
-	 */
-	public boolean isDutch() {
-		return _kind == Kind.Dutch;
-	}
-
-	/**
-	 * Get the {@code dutch} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code dutch} kind.
-	 */
-	public DutchAnalyzer dutch() {
-		return TaggedUnionUtils.get(this, Kind.Dutch);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code fingerprint}?
-	 */
-	public boolean isFingerprint() {
-		return _kind == Kind.Fingerprint;
-	}
-
-	/**
-	 * Get the {@code fingerprint} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code fingerprint} kind.
-	 */
-	public FingerprintAnalyzer fingerprint() {
-		return TaggedUnionUtils.get(this, Kind.Fingerprint);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code icu_analyzer}?
-	 */
-	public boolean isIcuAnalyzer() {
-		return _kind == Kind.IcuAnalyzer;
-	}
-
-	/**
-	 * Get the {@code icu_analyzer} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code icu_analyzer} kind.
-	 */
-	public IcuAnalyzer icuAnalyzer() {
-		return TaggedUnionUtils.get(this, Kind.IcuAnalyzer);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code keyword}?
-	 */
-	public boolean isKeyword() {
-		return _kind == Kind.Keyword;
-	}
-
-	/**
-	 * Get the {@code keyword} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code keyword} kind.
-	 */
-	public KeywordAnalyzer keyword() {
-		return TaggedUnionUtils.get(this, Kind.Keyword);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code kuromoji}?
-	 */
-	public boolean isKuromoji() {
-		return _kind == Kind.Kuromoji;
-	}
-
-	/**
-	 * Get the {@code kuromoji} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code kuromoji} kind.
-	 */
-	public KuromojiAnalyzer kuromoji() {
-		return TaggedUnionUtils.get(this, Kind.Kuromoji);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code language}?
-	 */
-	public boolean isLanguage() {
-		return _kind == Kind.Language;
-	}
-
-	/**
-	 * Get the {@code language} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code language} kind.
-	 */
-	public LanguageAnalyzer language() {
-		return TaggedUnionUtils.get(this, Kind.Language);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code nori}?
-	 */
-	public boolean isNori() {
-		return _kind == Kind.Nori;
-	}
-
-	/**
-	 * Get the {@code nori} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code nori} kind.
-	 */
-	public NoriAnalyzer nori() {
-		return TaggedUnionUtils.get(this, Kind.Nori);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code pattern}?
-	 */
-	public boolean isPattern() {
-		return _kind == Kind.Pattern;
-	}
-
-	/**
-	 * Get the {@code pattern} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code pattern} kind.
-	 */
-	public PatternAnalyzer pattern() {
-		return TaggedUnionUtils.get(this, Kind.Pattern);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code simple}?
-	 */
-	public boolean isSimple() {
-		return _kind == Kind.Simple;
-	}
-
-	/**
-	 * Get the {@code simple} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code simple} kind.
-	 */
-	public SimpleAnalyzer simple() {
-		return TaggedUnionUtils.get(this, Kind.Simple);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code snowball}?
-	 */
-	public boolean isSnowball() {
-		return _kind == Kind.Snowball;
-	}
-
-	/**
-	 * Get the {@code snowball} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code snowball} kind.
-	 */
-	public SnowballAnalyzer snowball() {
-		return TaggedUnionUtils.get(this, Kind.Snowball);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code standard}?
-	 */
-	public boolean isStandard() {
-		return _kind == Kind.Standard;
-	}
-
-	/**
-	 * Get the {@code standard} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code standard} kind.
-	 */
-	public StandardAnalyzer standard() {
-		return TaggedUnionUtils.get(this, Kind.Standard);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code stop}?
-	 */
-	public boolean isStop() {
-		return _kind == Kind.Stop;
-	}
-
-	/**
-	 * Get the {@code stop} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code stop} kind.
-	 */
-	public StopAnalyzer stop() {
-		return TaggedUnionUtils.get(this, Kind.Stop);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code whitespace}?
-	 */
-	public boolean isWhitespace() {
-		return _kind == Kind.Whitespace;
-	}
-
-	/**
-	 * Get the {@code whitespace} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code whitespace} kind.
-	 */
-	public WhitespaceAnalyzer whitespace() {
-		return TaggedUnionUtils.get(this, Kind.Whitespace);
-	}
+    /**
+     * Get the {@code whitespace} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code whitespace} kind.
+     */
+    public WhitespaceAnalyzer whitespace() {
+        return TaggedUnionUtils.get(this, Kind.Whitespace);
+    }
 
     /**
      * Is this variant instance of kind {@code cjk}?
@@ -394,7 +392,6 @@ public SmartcnAnalyzer smartcn() {
         return TaggedUnionUtils.get(this, Kind.Smartcn);
     }
 
-
     /**
      * Is this variant instance of kind {@code cjk}?
      */
@@ -412,215 +409,210 @@ public CjkAnalyzer cjk() {
         return TaggedUnionUtils.get(this, Kind.Cjk);
     }
 
-
     @Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		mapper.serialize(_value, generator);
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Analyzer> {
-		private Kind _kind;
-		private AnalyzerVariant _value;
-
-		public ObjectBuilder<Analyzer> custom(CustomAnalyzer v) {
-			this._kind = Kind.Custom;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Analyzer> custom(Function<CustomAnalyzer.Builder, ObjectBuilder<CustomAnalyzer>> fn) {
-			return this.custom(fn.apply(new CustomAnalyzer.Builder()).build());
-		}
-
-		public ObjectBuilder<Analyzer> dutch(DutchAnalyzer v) {
-			this._kind = Kind.Dutch;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Analyzer> dutch(Function<DutchAnalyzer.Builder, ObjectBuilder<DutchAnalyzer>> fn) {
-			return this.dutch(fn.apply(new DutchAnalyzer.Builder()).build());
-		}
-
-		public ObjectBuilder<Analyzer> fingerprint(FingerprintAnalyzer v) {
-			this._kind = Kind.Fingerprint;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Analyzer> fingerprint(
-				Function<FingerprintAnalyzer.Builder, ObjectBuilder<FingerprintAnalyzer>> fn) {
-			return this.fingerprint(fn.apply(new FingerprintAnalyzer.Builder()).build());
-		}
-
-		public ObjectBuilder<Analyzer> icuAnalyzer(IcuAnalyzer v) {
-			this._kind = Kind.IcuAnalyzer;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Analyzer> icuAnalyzer(Function<IcuAnalyzer.Builder, ObjectBuilder<IcuAnalyzer>> fn) {
-			return this.icuAnalyzer(fn.apply(new IcuAnalyzer.Builder()).build());
-		}
-
-		public ObjectBuilder<Analyzer> keyword(KeywordAnalyzer v) {
-			this._kind = Kind.Keyword;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Analyzer> keyword(Function<KeywordAnalyzer.Builder, ObjectBuilder<KeywordAnalyzer>> fn) {
-			return this.keyword(fn.apply(new KeywordAnalyzer.Builder()).build());
-		}
-
-		public ObjectBuilder<Analyzer> kuromoji(KuromojiAnalyzer v) {
-			this._kind = Kind.Kuromoji;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Analyzer> kuromoji(
-				Function<KuromojiAnalyzer.Builder, ObjectBuilder<KuromojiAnalyzer>> fn) {
-			return this.kuromoji(fn.apply(new KuromojiAnalyzer.Builder()).build());
-		}
-
-		public ObjectBuilder<Analyzer> language(LanguageAnalyzer v) {
-			this._kind = Kind.Language;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Analyzer> language(
-				Function<LanguageAnalyzer.Builder, ObjectBuilder<LanguageAnalyzer>> fn) {
-			return this.language(fn.apply(new LanguageAnalyzer.Builder()).build());
-		}
-
-		public ObjectBuilder<Analyzer> nori(NoriAnalyzer v) {
-			this._kind = Kind.Nori;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Analyzer> nori(Function<NoriAnalyzer.Builder, ObjectBuilder<NoriAnalyzer>> fn) {
-			return this.nori(fn.apply(new NoriAnalyzer.Builder()).build());
-		}
-
-		public ObjectBuilder<Analyzer> pattern(PatternAnalyzer v) {
-			this._kind = Kind.Pattern;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Analyzer> pattern(Function<PatternAnalyzer.Builder, ObjectBuilder<PatternAnalyzer>> fn) {
-			return this.pattern(fn.apply(new PatternAnalyzer.Builder()).build());
-		}
-
-		public ObjectBuilder<Analyzer> simple(SimpleAnalyzer v) {
-			this._kind = Kind.Simple;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Analyzer> simple(Function<SimpleAnalyzer.Builder, ObjectBuilder<SimpleAnalyzer>> fn) {
-			return this.simple(fn.apply(new SimpleAnalyzer.Builder()).build());
-		}
-
-		public ObjectBuilder<Analyzer> snowball(SnowballAnalyzer v) {
-			this._kind = Kind.Snowball;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Analyzer> snowball(
-				Function<SnowballAnalyzer.Builder, ObjectBuilder<SnowballAnalyzer>> fn) {
-			return this.snowball(fn.apply(new SnowballAnalyzer.Builder()).build());
-		}
-
-		public ObjectBuilder<Analyzer> standard(StandardAnalyzer v) {
-			this._kind = Kind.Standard;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Analyzer> standard(
-				Function<StandardAnalyzer.Builder, ObjectBuilder<StandardAnalyzer>> fn) {
-			return this.standard(fn.apply(new StandardAnalyzer.Builder()).build());
-		}
-
-		public ObjectBuilder<Analyzer> stop(StopAnalyzer v) {
-			this._kind = Kind.Stop;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Analyzer> stop(Function<StopAnalyzer.Builder, ObjectBuilder<StopAnalyzer>> fn) {
-			return this.stop(fn.apply(new StopAnalyzer.Builder()).build());
-		}
-
-		public ObjectBuilder<Analyzer> whitespace(WhitespaceAnalyzer v) {
-			this._kind = Kind.Whitespace;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Analyzer> whitespace(
-				Function<WhitespaceAnalyzer.Builder, ObjectBuilder<WhitespaceAnalyzer>> fn) {
-			return this.whitespace(fn.apply(new WhitespaceAnalyzer.Builder()).build());
-		}
-
-		public ObjectBuilder<Analyzer> smartcn(SmartcnAnalyzer v) {
-			this._kind = Kind.Smartcn;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Analyzer> smartcn() {
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        mapper.serialize(_value, generator);
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Analyzer> {
+        private Kind _kind;
+        private AnalyzerVariant _value;
+
+        public ObjectBuilder<Analyzer> custom(CustomAnalyzer v) {
+            this._kind = Kind.Custom;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Analyzer> custom(Function<CustomAnalyzer.Builder, ObjectBuilder<CustomAnalyzer>> fn) {
+            return this.custom(fn.apply(new CustomAnalyzer.Builder()).build());
+        }
+
+        public ObjectBuilder<Analyzer> dutch(DutchAnalyzer v) {
+            this._kind = Kind.Dutch;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Analyzer> dutch(Function<DutchAnalyzer.Builder, ObjectBuilder<DutchAnalyzer>> fn) {
+            return this.dutch(fn.apply(new DutchAnalyzer.Builder()).build());
+        }
+
+        public ObjectBuilder<Analyzer> fingerprint(FingerprintAnalyzer v) {
+            this._kind = Kind.Fingerprint;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Analyzer> fingerprint(Function<FingerprintAnalyzer.Builder, ObjectBuilder<FingerprintAnalyzer>> fn) {
+            return this.fingerprint(fn.apply(new FingerprintAnalyzer.Builder()).build());
+        }
+
+        public ObjectBuilder<Analyzer> icuAnalyzer(IcuAnalyzer v) {
+            this._kind = Kind.IcuAnalyzer;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Analyzer> icuAnalyzer(Function<IcuAnalyzer.Builder, ObjectBuilder<IcuAnalyzer>> fn) {
+            return this.icuAnalyzer(fn.apply(new IcuAnalyzer.Builder()).build());
+        }
+
+        public ObjectBuilder<Analyzer> keyword(KeywordAnalyzer v) {
+            this._kind = Kind.Keyword;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Analyzer> keyword(Function<KeywordAnalyzer.Builder, ObjectBuilder<KeywordAnalyzer>> fn) {
+            return this.keyword(fn.apply(new KeywordAnalyzer.Builder()).build());
+        }
+
+        public ObjectBuilder<Analyzer> kuromoji(KuromojiAnalyzer v) {
+            this._kind = Kind.Kuromoji;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Analyzer> kuromoji(Function<KuromojiAnalyzer.Builder, ObjectBuilder<KuromojiAnalyzer>> fn) {
+            return this.kuromoji(fn.apply(new KuromojiAnalyzer.Builder()).build());
+        }
+
+        public ObjectBuilder<Analyzer> language(LanguageAnalyzer v) {
+            this._kind = Kind.Language;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Analyzer> language(Function<LanguageAnalyzer.Builder, ObjectBuilder<LanguageAnalyzer>> fn) {
+            return this.language(fn.apply(new LanguageAnalyzer.Builder()).build());
+        }
+
+        public ObjectBuilder<Analyzer> nori(NoriAnalyzer v) {
+            this._kind = Kind.Nori;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Analyzer> nori(Function<NoriAnalyzer.Builder, ObjectBuilder<NoriAnalyzer>> fn) {
+            return this.nori(fn.apply(new NoriAnalyzer.Builder()).build());
+        }
+
+        public ObjectBuilder<Analyzer> pattern(PatternAnalyzer v) {
+            this._kind = Kind.Pattern;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Analyzer> pattern(Function<PatternAnalyzer.Builder, ObjectBuilder<PatternAnalyzer>> fn) {
+            return this.pattern(fn.apply(new PatternAnalyzer.Builder()).build());
+        }
+
+        public ObjectBuilder<Analyzer> simple(SimpleAnalyzer v) {
+            this._kind = Kind.Simple;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Analyzer> simple(Function<SimpleAnalyzer.Builder, ObjectBuilder<SimpleAnalyzer>> fn) {
+            return this.simple(fn.apply(new SimpleAnalyzer.Builder()).build());
+        }
+
+        public ObjectBuilder<Analyzer> snowball(SnowballAnalyzer v) {
+            this._kind = Kind.Snowball;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Analyzer> snowball(Function<SnowballAnalyzer.Builder, ObjectBuilder<SnowballAnalyzer>> fn) {
+            return this.snowball(fn.apply(new SnowballAnalyzer.Builder()).build());
+        }
+
+        public ObjectBuilder<Analyzer> standard(StandardAnalyzer v) {
+            this._kind = Kind.Standard;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Analyzer> standard(Function<StandardAnalyzer.Builder, ObjectBuilder<StandardAnalyzer>> fn) {
+            return this.standard(fn.apply(new StandardAnalyzer.Builder()).build());
+        }
+
+        public ObjectBuilder<Analyzer> stop(StopAnalyzer v) {
+            this._kind = Kind.Stop;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Analyzer> stop(Function<StopAnalyzer.Builder, ObjectBuilder<StopAnalyzer>> fn) {
+            return this.stop(fn.apply(new StopAnalyzer.Builder()).build());
+        }
+
+        public ObjectBuilder<Analyzer> whitespace(WhitespaceAnalyzer v) {
+            this._kind = Kind.Whitespace;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Analyzer> whitespace(Function<WhitespaceAnalyzer.Builder, ObjectBuilder<WhitespaceAnalyzer>> fn) {
+            return this.whitespace(fn.apply(new WhitespaceAnalyzer.Builder()).build());
+        }
+
+        public ObjectBuilder<Analyzer> smartcn(SmartcnAnalyzer v) {
+            this._kind = Kind.Smartcn;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Analyzer> smartcn() {
             return this.smartcn(new SmartcnAnalyzer.Builder().build());
-		}
-
-		public ObjectBuilder<Analyzer> cjk(CjkAnalyzer v) {
-			this._kind = Kind.Cjk;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Analyzer> cjk(
-				Function<CjkAnalyzer.Builder, ObjectBuilder<CjkAnalyzer>> fn) {
-			return this.cjk(fn.apply(new CjkAnalyzer.Builder()).build());
-		}
-
-		public Analyzer build() {
-			_checkSingleUse();
-			return new Analyzer(this);
-		}
-
-	}
-
-	protected static void setupAnalyzerDeserializer(ObjectDeserializer<Builder> op) {
-
-		op.add(Builder::custom, CustomAnalyzer._DESERIALIZER, "custom");
-		op.add(Builder::dutch, DutchAnalyzer._DESERIALIZER, "dutch");
-		op.add(Builder::fingerprint, FingerprintAnalyzer._DESERIALIZER, "fingerprint");
-		op.add(Builder::icuAnalyzer, IcuAnalyzer._DESERIALIZER, "icu_analyzer");
-		op.add(Builder::keyword, KeywordAnalyzer._DESERIALIZER, "keyword");
-		op.add(Builder::kuromoji, KuromojiAnalyzer._DESERIALIZER, "kuromoji");
-		op.add(Builder::language, LanguageAnalyzer._DESERIALIZER, "language");
-		op.add(Builder::nori, NoriAnalyzer._DESERIALIZER, "nori");
-		op.add(Builder::pattern, PatternAnalyzer._DESERIALIZER, "pattern");
-		op.add(Builder::simple, SimpleAnalyzer._DESERIALIZER, "simple");
-		op.add(Builder::snowball, SnowballAnalyzer._DESERIALIZER, "snowball");
-		op.add(Builder::standard, StandardAnalyzer._DESERIALIZER, "standard");
-		op.add(Builder::stop, StopAnalyzer._DESERIALIZER, "stop");
-		op.add(Builder::whitespace, WhitespaceAnalyzer._DESERIALIZER, "whitespace");
-		op.add(Builder::smartcn, SmartcnAnalyzer._DESERIALIZER, Kind.Smartcn.jsonValue());
-		op.add(Builder::cjk, CjkAnalyzer._DESERIALIZER, Kind.Cjk.jsonValue());
-
-		op.setTypeProperty("type", null);
-
-	}
-
-	public static final JsonpDeserializer<Analyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Analyzer::setupAnalyzerDeserializer, Builder::build);
+        }
+
+        public ObjectBuilder<Analyzer> cjk(CjkAnalyzer v) {
+            this._kind = Kind.Cjk;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Analyzer> cjk(Function<CjkAnalyzer.Builder, ObjectBuilder<CjkAnalyzer>> fn) {
+            return this.cjk(fn.apply(new CjkAnalyzer.Builder()).build());
+        }
+
+        public Analyzer build() {
+            _checkSingleUse();
+            return new Analyzer(this);
+        }
+
+    }
+
+    protected static void setupAnalyzerDeserializer(ObjectDeserializer<Builder> op) {
+
+        op.add(Builder::custom, CustomAnalyzer._DESERIALIZER, "custom");
+        op.add(Builder::dutch, DutchAnalyzer._DESERIALIZER, "dutch");
+        op.add(Builder::fingerprint, FingerprintAnalyzer._DESERIALIZER, "fingerprint");
+        op.add(Builder::icuAnalyzer, IcuAnalyzer._DESERIALIZER, "icu_analyzer");
+        op.add(Builder::keyword, KeywordAnalyzer._DESERIALIZER, "keyword");
+        op.add(Builder::kuromoji, KuromojiAnalyzer._DESERIALIZER, "kuromoji");
+        op.add(Builder::language, LanguageAnalyzer._DESERIALIZER, "language");
+        op.add(Builder::nori, NoriAnalyzer._DESERIALIZER, "nori");
+        op.add(Builder::pattern, PatternAnalyzer._DESERIALIZER, "pattern");
+        op.add(Builder::simple, SimpleAnalyzer._DESERIALIZER, "simple");
+        op.add(Builder::snowball, SnowballAnalyzer._DESERIALIZER, "snowball");
+        op.add(Builder::standard, StandardAnalyzer._DESERIALIZER, "standard");
+        op.add(Builder::stop, StopAnalyzer._DESERIALIZER, "stop");
+        op.add(Builder::whitespace, WhitespaceAnalyzer._DESERIALIZER, "whitespace");
+        op.add(Builder::smartcn, SmartcnAnalyzer._DESERIALIZER, Kind.Smartcn.jsonValue());
+        op.add(Builder::cjk, CjkAnalyzer._DESERIALIZER, Kind.Cjk.jsonValue());
+
+        op.setTypeProperty("type", null);
+
+    }
+
+    public static final JsonpDeserializer<Analyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Analyzer::setupAnalyzerDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/AnalyzerBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/AnalyzerBuilders.java
index 8c4bcbd1b9..a721a52b9c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/AnalyzerBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/AnalyzerBuilders.java
@@ -36,117 +36,116 @@
  * Builders for {@link Analyzer} variants.
  */
 public class AnalyzerBuilders {
-	private AnalyzerBuilders() {
-	}
-
-	/**
-	 * Creates a builder for the {@link CustomAnalyzer custom} {@code Analyzer}
-	 * variant.
-	 */
-	public static CustomAnalyzer.Builder custom() {
-		return new CustomAnalyzer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DutchAnalyzer dutch} {@code Analyzer}
-	 * variant.
-	 */
-	public static DutchAnalyzer.Builder dutch() {
-		return new DutchAnalyzer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link FingerprintAnalyzer fingerprint}
-	 * {@code Analyzer} variant.
-	 */
-	public static FingerprintAnalyzer.Builder fingerprint() {
-		return new FingerprintAnalyzer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link IcuAnalyzer icu_analyzer} {@code Analyzer}
-	 * variant.
-	 */
-	public static IcuAnalyzer.Builder icuAnalyzer() {
-		return new IcuAnalyzer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link KeywordAnalyzer keyword} {@code Analyzer}
-	 * variant.
-	 */
-	public static KeywordAnalyzer.Builder keyword() {
-		return new KeywordAnalyzer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link KuromojiAnalyzer kuromoji} {@code Analyzer}
-	 * variant.
-	 */
-	public static KuromojiAnalyzer.Builder kuromoji() {
-		return new KuromojiAnalyzer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link LanguageAnalyzer language} {@code Analyzer}
-	 * variant.
-	 */
-	public static LanguageAnalyzer.Builder language() {
-		return new LanguageAnalyzer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link NoriAnalyzer nori} {@code Analyzer} variant.
-	 */
-	public static NoriAnalyzer.Builder nori() {
-		return new NoriAnalyzer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link PatternAnalyzer pattern} {@code Analyzer}
-	 * variant.
-	 */
-	public static PatternAnalyzer.Builder pattern() {
-		return new PatternAnalyzer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SimpleAnalyzer simple} {@code Analyzer}
-	 * variant.
-	 */
-	public static SimpleAnalyzer.Builder simple() {
-		return new SimpleAnalyzer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SnowballAnalyzer snowball} {@code Analyzer}
-	 * variant.
-	 */
-	public static SnowballAnalyzer.Builder snowball() {
-		return new SnowballAnalyzer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link StandardAnalyzer standard} {@code Analyzer}
-	 * variant.
-	 */
-	public static StandardAnalyzer.Builder standard() {
-		return new StandardAnalyzer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link StopAnalyzer stop} {@code Analyzer} variant.
-	 */
-	public static StopAnalyzer.Builder stop() {
-		return new StopAnalyzer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link WhitespaceAnalyzer whitespace}
-	 * {@code Analyzer} variant.
-	 */
-	public static WhitespaceAnalyzer.Builder whitespace() {
-		return new WhitespaceAnalyzer.Builder();
-	}
+    private AnalyzerBuilders() {}
+
+    /**
+     * Creates a builder for the {@link CustomAnalyzer custom} {@code Analyzer}
+     * variant.
+     */
+    public static CustomAnalyzer.Builder custom() {
+        return new CustomAnalyzer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DutchAnalyzer dutch} {@code Analyzer}
+     * variant.
+     */
+    public static DutchAnalyzer.Builder dutch() {
+        return new DutchAnalyzer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link FingerprintAnalyzer fingerprint}
+     * {@code Analyzer} variant.
+     */
+    public static FingerprintAnalyzer.Builder fingerprint() {
+        return new FingerprintAnalyzer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link IcuAnalyzer icu_analyzer} {@code Analyzer}
+     * variant.
+     */
+    public static IcuAnalyzer.Builder icuAnalyzer() {
+        return new IcuAnalyzer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link KeywordAnalyzer keyword} {@code Analyzer}
+     * variant.
+     */
+    public static KeywordAnalyzer.Builder keyword() {
+        return new KeywordAnalyzer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link KuromojiAnalyzer kuromoji} {@code Analyzer}
+     * variant.
+     */
+    public static KuromojiAnalyzer.Builder kuromoji() {
+        return new KuromojiAnalyzer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link LanguageAnalyzer language} {@code Analyzer}
+     * variant.
+     */
+    public static LanguageAnalyzer.Builder language() {
+        return new LanguageAnalyzer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link NoriAnalyzer nori} {@code Analyzer} variant.
+     */
+    public static NoriAnalyzer.Builder nori() {
+        return new NoriAnalyzer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link PatternAnalyzer pattern} {@code Analyzer}
+     * variant.
+     */
+    public static PatternAnalyzer.Builder pattern() {
+        return new PatternAnalyzer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SimpleAnalyzer simple} {@code Analyzer}
+     * variant.
+     */
+    public static SimpleAnalyzer.Builder simple() {
+        return new SimpleAnalyzer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SnowballAnalyzer snowball} {@code Analyzer}
+     * variant.
+     */
+    public static SnowballAnalyzer.Builder snowball() {
+        return new SnowballAnalyzer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link StandardAnalyzer standard} {@code Analyzer}
+     * variant.
+     */
+    public static StandardAnalyzer.Builder standard() {
+        return new StandardAnalyzer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link StopAnalyzer stop} {@code Analyzer} variant.
+     */
+    public static StopAnalyzer.Builder stop() {
+        return new StopAnalyzer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link WhitespaceAnalyzer whitespace}
+     * {@code Analyzer} variant.
+     */
+    public static WhitespaceAnalyzer.Builder whitespace() {
+        return new WhitespaceAnalyzer.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/AnalyzerVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/AnalyzerVariant.java
index 986ff487df..9ce68c2c19 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/AnalyzerVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/AnalyzerVariant.java
@@ -39,10 +39,10 @@
  */
 public interface AnalyzerVariant extends JsonpSerializable {
 
-	Analyzer.Kind _analyzerKind();
+    Analyzer.Kind _analyzerKind();
 
-	default Analyzer _toAnalyzer() {
-		return new Analyzer(this);
-	}
+    default Analyzer _toAnalyzer() {
+        return new Analyzer(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/AsciiFoldingTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/AsciiFoldingTokenFilter.java
index 4a1da45fcf..674a4c953a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/AsciiFoldingTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/AsciiFoldingTokenFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,104 +41,100 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.AsciiFoldingTokenFilter
 
-
 @JsonpDeserializable
 public class AsciiFoldingTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final boolean preserveOriginal;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AsciiFoldingTokenFilter(Builder builder) {
-		super(builder);
-
-		this.preserveOriginal = ApiTypeHelper.requireNonNull(builder.preserveOriginal, this, "preserveOriginal");
-
-	}
-
-	public static AsciiFoldingTokenFilter of(Function<Builder, ObjectBuilder<AsciiFoldingTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Asciifolding;
-	}
-
-	/**
-	 * Required - API name: {@code preserve_original}
-	 */
-	public final boolean preserveOriginal() {
-		return this.preserveOriginal;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "asciifolding");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("preserve_original");
-		generator.write(this.preserveOriginal);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AsciiFoldingTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<AsciiFoldingTokenFilter> {
-		private Boolean preserveOriginal;
-
-		/**
-		 * Required - API name: {@code preserve_original}
-		 */
-		public final Builder preserveOriginal(boolean value) {
-			this.preserveOriginal = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AsciiFoldingTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AsciiFoldingTokenFilter build() {
-			_checkSingleUse();
-
-			return new AsciiFoldingTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AsciiFoldingTokenFilter}
-	 */
-	public static final JsonpDeserializer<AsciiFoldingTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, AsciiFoldingTokenFilter::setupAsciiFoldingTokenFilterDeserializer);
-
-	protected static void setupAsciiFoldingTokenFilterDeserializer(
-			ObjectDeserializer<AsciiFoldingTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
-
-		op.ignore("type");
-	}
+    private final boolean preserveOriginal;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AsciiFoldingTokenFilter(Builder builder) {
+        super(builder);
+
+        this.preserveOriginal = ApiTypeHelper.requireNonNull(builder.preserveOriginal, this, "preserveOriginal");
+
+    }
+
+    public static AsciiFoldingTokenFilter of(Function<Builder, ObjectBuilder<AsciiFoldingTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Asciifolding;
+    }
+
+    /**
+     * Required - API name: {@code preserve_original}
+     */
+    public final boolean preserveOriginal() {
+        return this.preserveOriginal;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "asciifolding");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("preserve_original");
+        generator.write(this.preserveOriginal);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AsciiFoldingTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<AsciiFoldingTokenFilter> {
+        private Boolean preserveOriginal;
+
+        /**
+         * Required - API name: {@code preserve_original}
+         */
+        public final Builder preserveOriginal(boolean value) {
+            this.preserveOriginal = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link AsciiFoldingTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AsciiFoldingTokenFilter build() {
+            _checkSingleUse();
+
+            return new AsciiFoldingTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AsciiFoldingTokenFilter}
+     */
+    public static final JsonpDeserializer<AsciiFoldingTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AsciiFoldingTokenFilter::setupAsciiFoldingTokenFilterDeserializer
+    );
+
+    protected static void setupAsciiFoldingTokenFilterDeserializer(ObjectDeserializer<AsciiFoldingTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilter.java
index 6e989d15c7..2bda7e61b6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,132 +44,129 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.CharFilter
 
-
 @JsonpDeserializable
 public class CharFilter implements TaggedUnion<CharFilter.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Definition, Name
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private CharFilter(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	private CharFilter(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static CharFilter of(Function<Builder, ObjectBuilder<CharFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code definition}?
-	 */
-	public boolean isDefinition() {
-		return _kind == Kind.Definition;
-	}
-
-	/**
-	 * Get the {@code definition} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code definition} kind.
-	 */
-	public CharFilterDefinition definition() {
-		return TaggedUnionUtils.get(this, Kind.Definition);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code name}?
-	 */
-	public boolean isName() {
-		return _kind == Kind.Name;
-	}
-
-	/**
-	 * Get the {@code name} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code name} kind.
-	 */
-	public String name() {
-		return TaggedUnionUtils.get(this, Kind.Name);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Name :
-					generator.write(((String) this._value));
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CharFilter> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<CharFilter> definition(CharFilterDefinition v) {
-			this._kind = Kind.Definition;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<CharFilter> definition(
-				Function<CharFilterDefinition.Builder, ObjectBuilder<CharFilterDefinition>> fn) {
-			return this.definition(fn.apply(new CharFilterDefinition.Builder()).build());
-		}
-
-		public ObjectBuilder<CharFilter> name(String v) {
-			this._kind = Kind.Name;
-			this._value = v;
-			return this;
-		}
-
-		public CharFilter build() {
-			_checkSingleUse();
-			return new CharFilter(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<CharFilter> buildCharFilterDeserializer() {
-		return new UnionDeserializer.Builder<CharFilter, Kind, Object>(CharFilter::new, false)
-				.addMember(Kind.Definition, CharFilterDefinition._DESERIALIZER)
-				.addMember(Kind.Name, JsonpDeserializer.stringDeserializer()).build();
-	}
-
-	public static final JsonpDeserializer<CharFilter> _DESERIALIZER = JsonpDeserializer
-			.lazy(CharFilter::buildCharFilterDeserializer);
+    public enum Kind {
+        Definition,
+        Name
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private CharFilter(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private CharFilter(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static CharFilter of(Function<Builder, ObjectBuilder<CharFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code definition}?
+     */
+    public boolean isDefinition() {
+        return _kind == Kind.Definition;
+    }
+
+    /**
+     * Get the {@code definition} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code definition} kind.
+     */
+    public CharFilterDefinition definition() {
+        return TaggedUnionUtils.get(this, Kind.Definition);
+    }
+
+    /**
+     * Is this variant instance of kind {@code name}?
+     */
+    public boolean isName() {
+        return _kind == Kind.Name;
+    }
+
+    /**
+     * Get the {@code name} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code name} kind.
+     */
+    public String name() {
+        return TaggedUnionUtils.get(this, Kind.Name);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Name:
+                    generator.write(((String) this._value));
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CharFilter> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<CharFilter> definition(CharFilterDefinition v) {
+            this._kind = Kind.Definition;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<CharFilter> definition(Function<CharFilterDefinition.Builder, ObjectBuilder<CharFilterDefinition>> fn) {
+            return this.definition(fn.apply(new CharFilterDefinition.Builder()).build());
+        }
+
+        public ObjectBuilder<CharFilter> name(String v) {
+            this._kind = Kind.Name;
+            this._value = v;
+            return this;
+        }
+
+        public CharFilter build() {
+            _checkSingleUse();
+            return new CharFilter(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<CharFilter> buildCharFilterDeserializer() {
+        return new UnionDeserializer.Builder<CharFilter, Kind, Object>(CharFilter::new, false).addMember(
+            Kind.Definition,
+            CharFilterDefinition._DESERIALIZER
+        ).addMember(Kind.Name, JsonpDeserializer.stringDeserializer()).build();
+    }
+
+    public static final JsonpDeserializer<CharFilter> _DESERIALIZER = JsonpDeserializer.lazy(CharFilter::buildCharFilterDeserializer);
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterBase.java
index eec31bd227..e8a386a88b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterBase.java
@@ -32,80 +32,76 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.CharFilterBase
 
-
 public abstract class CharFilterBase implements JsonpSerializable {
-	@Nullable
-	private final String version;
+    @Nullable
+    private final String version;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected CharFilterBase(AbstractBuilder<?> builder) {
+    protected CharFilterBase(AbstractBuilder<?> builder) {
 
-		this.version = builder.version;
+        this.version = builder.version;
 
-	}
+    }
 
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final String version() {
-		return this.version;
-	}
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final String version() {
+        return this.version;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
 
-		}
+        }
 
-	}
+    }
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		@Nullable
-		private String version;
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        @Nullable
+        private String version;
 
-		/**
-		 * API name: {@code version}
-		 */
-		public final BuilderT version(@Nullable String value) {
-			this.version = value;
-			return self();
-		}
+        /**
+         * API name: {@code version}
+         */
+        public final BuilderT version(@Nullable String value) {
+            this.version = value;
+            return self();
+        }
 
-		protected abstract BuilderT self();
+        protected abstract BuilderT self();
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupCharFilterBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupCharFilterBaseDeserializer(ObjectDeserializer<BuilderT> op) {
 
-		op.add(AbstractBuilder::version, JsonpDeserializer.stringDeserializer(), "version");
+        op.add(AbstractBuilder::version, JsonpDeserializer.stringDeserializer(), "version");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterBuilders.java
index b22c744768..977e4fe4fe 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterBuilders.java
@@ -37,18 +37,17 @@
  * <p>
  * Variants <code>name</code> are not available here as they don't have a
  * dedicated class. Use {@link CharFilter}'s builder for these.
- * 
+ *
  */
 public class CharFilterBuilders {
-	private CharFilterBuilders() {
-	}
+    private CharFilterBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link CharFilterDefinition definition}
-	 * {@code CharFilter} variant.
-	 */
-	public static CharFilterDefinition.Builder definition() {
-		return new CharFilterDefinition.Builder();
-	}
+    /**
+     * Creates a builder for the {@link CharFilterDefinition definition}
+     * {@code CharFilter} variant.
+     */
+    public static CharFilterDefinition.Builder definition() {
+        return new CharFilterDefinition.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterDefinition.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterDefinition.java
index 995a18d387..d5b440a81b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterDefinition.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterDefinition.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -44,255 +46,251 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.CharFilterDefinition
 
-
 @JsonpDeserializable
-public class CharFilterDefinition
-		implements
-			TaggedUnion<CharFilterDefinition.Kind, CharFilterDefinitionVariant>,
-			JsonpSerializable {
+public class CharFilterDefinition implements TaggedUnion<CharFilterDefinition.Kind, CharFilterDefinitionVariant>, JsonpSerializable {
+
+    /**
+     * {@link CharFilterDefinition} variant kinds.
+     */
+    /**
+     * {@link CharFilterDefinition} variant kinds.
+     */
 
-	/**
-	 * {@link CharFilterDefinition} variant kinds.
-	 */
-	/**
-	 * {@link CharFilterDefinition} variant kinds.
-	 */
-
-	public enum Kind implements JsonEnum {
-		HtmlStrip("html_strip"),
-
-		IcuNormalizer("icu_normalizer"),
-
-		KuromojiIterationMark("kuromoji_iteration_mark"),
-
-		Mapping("mapping"),
-
-		PatternReplace("pattern_replace"),
-
-		;
-
-		private final String jsonValue;
-
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
-
-		public String jsonValue() {
-			return this.jsonValue;
-		}
-
-	}
-
-	private final Kind _kind;
-	private final CharFilterDefinitionVariant _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final CharFilterDefinitionVariant _get() {
-		return _value;
-	}
-
-	public CharFilterDefinition(CharFilterDefinitionVariant value) {
-
-		this._kind = ApiTypeHelper.requireNonNull(value._charFilterDefinitionKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
-
-	}
-
-	private CharFilterDefinition(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static CharFilterDefinition of(Function<Builder, ObjectBuilder<CharFilterDefinition>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code html_strip}?
-	 */
-	public boolean isHtmlStrip() {
-		return _kind == Kind.HtmlStrip;
-	}
-
-	/**
-	 * Get the {@code html_strip} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code html_strip} kind.
-	 */
-	public HtmlStripCharFilter htmlStrip() {
-		return TaggedUnionUtils.get(this, Kind.HtmlStrip);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code icu_normalizer}?
-	 */
-	public boolean isIcuNormalizer() {
-		return _kind == Kind.IcuNormalizer;
-	}
-
-	/**
-	 * Get the {@code icu_normalizer} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code icu_normalizer} kind.
-	 */
-	public IcuNormalizationCharFilter icuNormalizer() {
-		return TaggedUnionUtils.get(this, Kind.IcuNormalizer);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code kuromoji_iteration_mark}?
-	 */
-	public boolean isKuromojiIterationMark() {
-		return _kind == Kind.KuromojiIterationMark;
-	}
-
-	/**
-	 * Get the {@code kuromoji_iteration_mark} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the
-	 *             {@code kuromoji_iteration_mark} kind.
-	 */
-	public KuromojiIterationMarkCharFilter kuromojiIterationMark() {
-		return TaggedUnionUtils.get(this, Kind.KuromojiIterationMark);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code mapping}?
-	 */
-	public boolean isMapping() {
-		return _kind == Kind.Mapping;
-	}
-
-	/**
-	 * Get the {@code mapping} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code mapping} kind.
-	 */
-	public MappingCharFilter mapping() {
-		return TaggedUnionUtils.get(this, Kind.Mapping);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code pattern_replace}?
-	 */
-	public boolean isPatternReplace() {
-		return _kind == Kind.PatternReplace;
-	}
-
-	/**
-	 * Get the {@code pattern_replace} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code pattern_replace}
-	 *             kind.
-	 */
-	public PatternReplaceCharFilter patternReplace() {
-		return TaggedUnionUtils.get(this, Kind.PatternReplace);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		mapper.serialize(_value, generator);
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CharFilterDefinition> {
-		private Kind _kind;
-		private CharFilterDefinitionVariant _value;
-
-		public ObjectBuilder<CharFilterDefinition> htmlStrip(HtmlStripCharFilter v) {
-			this._kind = Kind.HtmlStrip;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<CharFilterDefinition> htmlStrip(
-				Function<HtmlStripCharFilter.Builder, ObjectBuilder<HtmlStripCharFilter>> fn) {
-			return this.htmlStrip(fn.apply(new HtmlStripCharFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<CharFilterDefinition> icuNormalizer(IcuNormalizationCharFilter v) {
-			this._kind = Kind.IcuNormalizer;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<CharFilterDefinition> icuNormalizer(
-				Function<IcuNormalizationCharFilter.Builder, ObjectBuilder<IcuNormalizationCharFilter>> fn) {
-			return this.icuNormalizer(fn.apply(new IcuNormalizationCharFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<CharFilterDefinition> kuromojiIterationMark(KuromojiIterationMarkCharFilter v) {
-			this._kind = Kind.KuromojiIterationMark;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<CharFilterDefinition> kuromojiIterationMark(
-				Function<KuromojiIterationMarkCharFilter.Builder, ObjectBuilder<KuromojiIterationMarkCharFilter>> fn) {
-			return this.kuromojiIterationMark(fn.apply(new KuromojiIterationMarkCharFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<CharFilterDefinition> mapping(MappingCharFilter v) {
-			this._kind = Kind.Mapping;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<CharFilterDefinition> mapping(
-				Function<MappingCharFilter.Builder, ObjectBuilder<MappingCharFilter>> fn) {
-			return this.mapping(fn.apply(new MappingCharFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<CharFilterDefinition> patternReplace(PatternReplaceCharFilter v) {
-			this._kind = Kind.PatternReplace;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<CharFilterDefinition> patternReplace(
-				Function<PatternReplaceCharFilter.Builder, ObjectBuilder<PatternReplaceCharFilter>> fn) {
-			return this.patternReplace(fn.apply(new PatternReplaceCharFilter.Builder()).build());
-		}
-
-		public CharFilterDefinition build() {
-			_checkSingleUse();
-			return new CharFilterDefinition(this);
-		}
-
-	}
-
-	protected static void setupCharFilterDefinitionDeserializer(ObjectDeserializer<Builder> op) {
-
-		op.add(Builder::htmlStrip, HtmlStripCharFilter._DESERIALIZER, "html_strip");
-		op.add(Builder::icuNormalizer, IcuNormalizationCharFilter._DESERIALIZER, "icu_normalizer");
-		op.add(Builder::kuromojiIterationMark, KuromojiIterationMarkCharFilter._DESERIALIZER,
-				"kuromoji_iteration_mark");
-		op.add(Builder::mapping, MappingCharFilter._DESERIALIZER, "mapping");
-		op.add(Builder::patternReplace, PatternReplaceCharFilter._DESERIALIZER, "pattern_replace");
-
-		op.setTypeProperty("type", null);
-
-	}
-
-	public static final JsonpDeserializer<CharFilterDefinition> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CharFilterDefinition::setupCharFilterDefinitionDeserializer, Builder::build);
+    public enum Kind implements JsonEnum {
+        HtmlStrip("html_strip"),
+
+        IcuNormalizer("icu_normalizer"),
+
+        KuromojiIterationMark("kuromoji_iteration_mark"),
+
+        Mapping("mapping"),
+
+        PatternReplace("pattern_replace"),
+
+        ;
+
+        private final String jsonValue;
+
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
+
+        public String jsonValue() {
+            return this.jsonValue;
+        }
+
+    }
+
+    private final Kind _kind;
+    private final CharFilterDefinitionVariant _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final CharFilterDefinitionVariant _get() {
+        return _value;
+    }
+
+    public CharFilterDefinition(CharFilterDefinitionVariant value) {
+
+        this._kind = ApiTypeHelper.requireNonNull(value._charFilterDefinitionKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+
+    }
+
+    private CharFilterDefinition(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static CharFilterDefinition of(Function<Builder, ObjectBuilder<CharFilterDefinition>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code html_strip}?
+     */
+    public boolean isHtmlStrip() {
+        return _kind == Kind.HtmlStrip;
+    }
+
+    /**
+     * Get the {@code html_strip} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code html_strip} kind.
+     */
+    public HtmlStripCharFilter htmlStrip() {
+        return TaggedUnionUtils.get(this, Kind.HtmlStrip);
+    }
+
+    /**
+     * Is this variant instance of kind {@code icu_normalizer}?
+     */
+    public boolean isIcuNormalizer() {
+        return _kind == Kind.IcuNormalizer;
+    }
+
+    /**
+     * Get the {@code icu_normalizer} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code icu_normalizer} kind.
+     */
+    public IcuNormalizationCharFilter icuNormalizer() {
+        return TaggedUnionUtils.get(this, Kind.IcuNormalizer);
+    }
+
+    /**
+     * Is this variant instance of kind {@code kuromoji_iteration_mark}?
+     */
+    public boolean isKuromojiIterationMark() {
+        return _kind == Kind.KuromojiIterationMark;
+    }
+
+    /**
+     * Get the {@code kuromoji_iteration_mark} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the
+     *             {@code kuromoji_iteration_mark} kind.
+     */
+    public KuromojiIterationMarkCharFilter kuromojiIterationMark() {
+        return TaggedUnionUtils.get(this, Kind.KuromojiIterationMark);
+    }
+
+    /**
+     * Is this variant instance of kind {@code mapping}?
+     */
+    public boolean isMapping() {
+        return _kind == Kind.Mapping;
+    }
+
+    /**
+     * Get the {@code mapping} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code mapping} kind.
+     */
+    public MappingCharFilter mapping() {
+        return TaggedUnionUtils.get(this, Kind.Mapping);
+    }
+
+    /**
+     * Is this variant instance of kind {@code pattern_replace}?
+     */
+    public boolean isPatternReplace() {
+        return _kind == Kind.PatternReplace;
+    }
+
+    /**
+     * Get the {@code pattern_replace} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code pattern_replace}
+     *             kind.
+     */
+    public PatternReplaceCharFilter patternReplace() {
+        return TaggedUnionUtils.get(this, Kind.PatternReplace);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        mapper.serialize(_value, generator);
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CharFilterDefinition> {
+        private Kind _kind;
+        private CharFilterDefinitionVariant _value;
+
+        public ObjectBuilder<CharFilterDefinition> htmlStrip(HtmlStripCharFilter v) {
+            this._kind = Kind.HtmlStrip;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<CharFilterDefinition> htmlStrip(Function<HtmlStripCharFilter.Builder, ObjectBuilder<HtmlStripCharFilter>> fn) {
+            return this.htmlStrip(fn.apply(new HtmlStripCharFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<CharFilterDefinition> icuNormalizer(IcuNormalizationCharFilter v) {
+            this._kind = Kind.IcuNormalizer;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<CharFilterDefinition> icuNormalizer(
+            Function<IcuNormalizationCharFilter.Builder, ObjectBuilder<IcuNormalizationCharFilter>> fn
+        ) {
+            return this.icuNormalizer(fn.apply(new IcuNormalizationCharFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<CharFilterDefinition> kuromojiIterationMark(KuromojiIterationMarkCharFilter v) {
+            this._kind = Kind.KuromojiIterationMark;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<CharFilterDefinition> kuromojiIterationMark(
+            Function<KuromojiIterationMarkCharFilter.Builder, ObjectBuilder<KuromojiIterationMarkCharFilter>> fn
+        ) {
+            return this.kuromojiIterationMark(fn.apply(new KuromojiIterationMarkCharFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<CharFilterDefinition> mapping(MappingCharFilter v) {
+            this._kind = Kind.Mapping;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<CharFilterDefinition> mapping(Function<MappingCharFilter.Builder, ObjectBuilder<MappingCharFilter>> fn) {
+            return this.mapping(fn.apply(new MappingCharFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<CharFilterDefinition> patternReplace(PatternReplaceCharFilter v) {
+            this._kind = Kind.PatternReplace;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<CharFilterDefinition> patternReplace(
+            Function<PatternReplaceCharFilter.Builder, ObjectBuilder<PatternReplaceCharFilter>> fn
+        ) {
+            return this.patternReplace(fn.apply(new PatternReplaceCharFilter.Builder()).build());
+        }
+
+        public CharFilterDefinition build() {
+            _checkSingleUse();
+            return new CharFilterDefinition(this);
+        }
+
+    }
+
+    protected static void setupCharFilterDefinitionDeserializer(ObjectDeserializer<Builder> op) {
+
+        op.add(Builder::htmlStrip, HtmlStripCharFilter._DESERIALIZER, "html_strip");
+        op.add(Builder::icuNormalizer, IcuNormalizationCharFilter._DESERIALIZER, "icu_normalizer");
+        op.add(Builder::kuromojiIterationMark, KuromojiIterationMarkCharFilter._DESERIALIZER, "kuromoji_iteration_mark");
+        op.add(Builder::mapping, MappingCharFilter._DESERIALIZER, "mapping");
+        op.add(Builder::patternReplace, PatternReplaceCharFilter._DESERIALIZER, "pattern_replace");
+
+        op.setTypeProperty("type", null);
+
+    }
+
+    public static final JsonpDeserializer<CharFilterDefinition> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CharFilterDefinition::setupCharFilterDefinitionDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterDefinitionBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterDefinitionBuilders.java
index 0ea20278ce..3d699758e4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterDefinitionBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterDefinitionBuilders.java
@@ -36,47 +36,46 @@
  * Builders for {@link CharFilterDefinition} variants.
  */
 public class CharFilterDefinitionBuilders {
-	private CharFilterDefinitionBuilders() {
-	}
+    private CharFilterDefinitionBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link HtmlStripCharFilter html_strip}
-	 * {@code CharFilterDefinition} variant.
-	 */
-	public static HtmlStripCharFilter.Builder htmlStrip() {
-		return new HtmlStripCharFilter.Builder();
-	}
+    /**
+     * Creates a builder for the {@link HtmlStripCharFilter html_strip}
+     * {@code CharFilterDefinition} variant.
+     */
+    public static HtmlStripCharFilter.Builder htmlStrip() {
+        return new HtmlStripCharFilter.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link IcuNormalizationCharFilter icu_normalizer}
-	 * {@code CharFilterDefinition} variant.
-	 */
-	public static IcuNormalizationCharFilter.Builder icuNormalizer() {
-		return new IcuNormalizationCharFilter.Builder();
-	}
+    /**
+     * Creates a builder for the {@link IcuNormalizationCharFilter icu_normalizer}
+     * {@code CharFilterDefinition} variant.
+     */
+    public static IcuNormalizationCharFilter.Builder icuNormalizer() {
+        return new IcuNormalizationCharFilter.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link KuromojiIterationMarkCharFilter
-	 * kuromoji_iteration_mark} {@code CharFilterDefinition} variant.
-	 */
-	public static KuromojiIterationMarkCharFilter.Builder kuromojiIterationMark() {
-		return new KuromojiIterationMarkCharFilter.Builder();
-	}
+    /**
+     * Creates a builder for the {@link KuromojiIterationMarkCharFilter
+     * kuromoji_iteration_mark} {@code CharFilterDefinition} variant.
+     */
+    public static KuromojiIterationMarkCharFilter.Builder kuromojiIterationMark() {
+        return new KuromojiIterationMarkCharFilter.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link MappingCharFilter mapping}
-	 * {@code CharFilterDefinition} variant.
-	 */
-	public static MappingCharFilter.Builder mapping() {
-		return new MappingCharFilter.Builder();
-	}
+    /**
+     * Creates a builder for the {@link MappingCharFilter mapping}
+     * {@code CharFilterDefinition} variant.
+     */
+    public static MappingCharFilter.Builder mapping() {
+        return new MappingCharFilter.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link PatternReplaceCharFilter pattern_replace}
-	 * {@code CharFilterDefinition} variant.
-	 */
-	public static PatternReplaceCharFilter.Builder patternReplace() {
-		return new PatternReplaceCharFilter.Builder();
-	}
+    /**
+     * Creates a builder for the {@link PatternReplaceCharFilter pattern_replace}
+     * {@code CharFilterDefinition} variant.
+     */
+    public static PatternReplaceCharFilter.Builder patternReplace() {
+        return new PatternReplaceCharFilter.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterDefinitionVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterDefinitionVariant.java
index 40e9d2ec80..89295f73ae 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterDefinitionVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterDefinitionVariant.java
@@ -39,10 +39,10 @@
  */
 public interface CharFilterDefinitionVariant extends JsonpSerializable {
 
-	CharFilterDefinition.Kind _charFilterDefinitionKind();
+    CharFilterDefinition.Kind _charFilterDefinitionKind();
 
-	default CharFilterDefinition _toCharFilterDefinition() {
-		return new CharFilterDefinition(this);
-	}
+    default CharFilterDefinition _toCharFilterDefinition() {
+        return new CharFilterDefinition(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharGroupTokenizer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharGroupTokenizer.java
index ca2731406d..829d175617 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharGroupTokenizer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharGroupTokenizer.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,154 +43,149 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.CharGroupTokenizer
 
 @JsonpDeserializable
 public class CharGroupTokenizer extends TokenizerBase implements TokenizerDefinitionVariant {
-	private final List<String> tokenizeOnChars;
-
-	@Nullable
-	private final Integer maxTokenLength;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CharGroupTokenizer(Builder builder) {
-		super(builder);
-
-		this.tokenizeOnChars = ApiTypeHelper.unmodifiableRequired(builder.tokenizeOnChars, this, "tokenizeOnChars");
-		this.maxTokenLength = builder.maxTokenLength;
-
-	}
-
-	public static CharGroupTokenizer of(Function<Builder, ObjectBuilder<CharGroupTokenizer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenizerDefinition variant kind.
-	 */
-	@Override
-	public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
-		return TokenizerDefinition.Kind.CharGroup;
-	}
-
-	/**
-	 * Required - API name: {@code tokenize_on_chars}
-	 */
-	public final List<String> tokenizeOnChars() {
-		return this.tokenizeOnChars;
-	}
-
-	/**
-	 * API name: {@code max_token_length}
-	 */
-	@Nullable
-	public final Integer maxTokenLength() {
-		return this.maxTokenLength;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "char_group");
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.tokenizeOnChars)) {
-			generator.writeKey("tokenize_on_chars");
-			generator.writeStartArray();
-			for (String item0 : this.tokenizeOnChars) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.maxTokenLength != null) {
-			generator.writeKey("max_token_length");
-			generator.write(this.maxTokenLength);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CharGroupTokenizer}.
-	 */
-
-	public static class Builder extends TokenizerBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<CharGroupTokenizer> {
-		private List<String> tokenizeOnChars;
-
-		@Nullable
-		private Integer maxTokenLength;
-
-		/**
-		 * Required - API name: {@code tokenize_on_chars}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>tokenizeOnChars</code>.
-		 */
-		public final Builder tokenizeOnChars(List<String> list) {
-			this.tokenizeOnChars = _listAddAll(this.tokenizeOnChars, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tokenize_on_chars}
-		 * <p>
-		 * Adds one or more values to <code>tokenizeOnChars</code>.
-		 */
-		public final Builder tokenizeOnChars(String value, String... values) {
-			this.tokenizeOnChars = _listAdd(this.tokenizeOnChars, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_token_length}
-		 */
-		public final Builder maxTokenLength(@Nullable Integer value) {
-			this.maxTokenLength = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CharGroupTokenizer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CharGroupTokenizer build() {
-			_checkSingleUse();
-
-			return new CharGroupTokenizer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CharGroupTokenizer}
-	 */
-	public static final JsonpDeserializer<CharGroupTokenizer> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CharGroupTokenizer::setupCharGroupTokenizerDeserializer);
-
-	protected static void setupCharGroupTokenizerDeserializer(ObjectDeserializer<CharGroupTokenizer.Builder> op) {
-		TokenizerBase.setupTokenizerBaseDeserializer(op);
-		op.add(Builder::tokenizeOnChars, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"tokenize_on_chars");
-		op.add(Builder::maxTokenLength, JsonpDeserializer.integerDeserializer(), "max_token_length");
-
-		op.ignore("type");
-	}
+    private final List<String> tokenizeOnChars;
+
+    @Nullable
+    private final Integer maxTokenLength;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CharGroupTokenizer(Builder builder) {
+        super(builder);
+
+        this.tokenizeOnChars = ApiTypeHelper.unmodifiableRequired(builder.tokenizeOnChars, this, "tokenizeOnChars");
+        this.maxTokenLength = builder.maxTokenLength;
+
+    }
+
+    public static CharGroupTokenizer of(Function<Builder, ObjectBuilder<CharGroupTokenizer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenizerDefinition variant kind.
+     */
+    @Override
+    public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
+        return TokenizerDefinition.Kind.CharGroup;
+    }
+
+    /**
+     * Required - API name: {@code tokenize_on_chars}
+     */
+    public final List<String> tokenizeOnChars() {
+        return this.tokenizeOnChars;
+    }
+
+    /**
+     * API name: {@code max_token_length}
+     */
+    @Nullable
+    public final Integer maxTokenLength() {
+        return this.maxTokenLength;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "char_group");
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.tokenizeOnChars)) {
+            generator.writeKey("tokenize_on_chars");
+            generator.writeStartArray();
+            for (String item0 : this.tokenizeOnChars) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.maxTokenLength != null) {
+            generator.writeKey("max_token_length");
+            generator.write(this.maxTokenLength);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CharGroupTokenizer}.
+     */
+
+    public static class Builder extends TokenizerBase.AbstractBuilder<Builder> implements ObjectBuilder<CharGroupTokenizer> {
+        private List<String> tokenizeOnChars;
+
+        @Nullable
+        private Integer maxTokenLength;
+
+        /**
+         * Required - API name: {@code tokenize_on_chars}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>tokenizeOnChars</code>.
+         */
+        public final Builder tokenizeOnChars(List<String> list) {
+            this.tokenizeOnChars = _listAddAll(this.tokenizeOnChars, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tokenize_on_chars}
+         * <p>
+         * Adds one or more values to <code>tokenizeOnChars</code>.
+         */
+        public final Builder tokenizeOnChars(String value, String... values) {
+            this.tokenizeOnChars = _listAdd(this.tokenizeOnChars, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code max_token_length}
+         */
+        public final Builder maxTokenLength(@Nullable Integer value) {
+            this.maxTokenLength = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CharGroupTokenizer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CharGroupTokenizer build() {
+            _checkSingleUse();
+
+            return new CharGroupTokenizer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CharGroupTokenizer}
+     */
+    public static final JsonpDeserializer<CharGroupTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CharGroupTokenizer::setupCharGroupTokenizerDeserializer
+    );
+
+    protected static void setupCharGroupTokenizerDeserializer(ObjectDeserializer<CharGroupTokenizer.Builder> op) {
+        TokenizerBase.setupTokenizerBaseDeserializer(op);
+        op.add(Builder::tokenizeOnChars, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "tokenize_on_chars");
+        op.add(Builder::maxTokenLength, JsonpDeserializer.integerDeserializer(), "max_token_length");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CjkAnalyzer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CjkAnalyzer.java
index 421f6c4dd3..d653cbdfea 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CjkAnalyzer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CjkAnalyzer.java
@@ -13,11 +13,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
 import java.util.List;
 import java.util.function.Function;
-
 import javax.annotation.Nullable;
-
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -28,155 +27,153 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import jakarta.json.stream.JsonGenerator;
-
 // typedef: _types.analysis.LanguageAnalyzer
 
 @JsonpDeserializable
 public class CjkAnalyzer implements AnalyzerVariant, JsonpSerializable {
-	@Nullable
-	private final List<String> stopwords;
-
-	@Nullable
-	private final String stopwordsPath;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CjkAnalyzer(Builder builder) {
-
-		this.stopwords = ApiTypeHelper.unmodifiable(builder.stopwords);
-		this.stopwordsPath = builder.stopwordsPath;
-
-	}
-
-	public static CjkAnalyzer of(Function<Builder, ObjectBuilder<CjkAnalyzer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Analyzer variant kind.
-	 */
-	@Override
-	public Analyzer.Kind _analyzerKind() {
-		return Analyzer.Kind.Cjk;
-	}
-
-	/**
-	 * API name: {@code stopwords}
-	 */
-	public final List<String> stopwords() {
-		return this.stopwords;
-	}
-
-	/**
-	 * API name: {@code stopwords_path}
-	 */
-	@Nullable
-	public final String stopwordsPath() {
-		return this.stopwordsPath;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", Analyzer.Kind.Cjk.jsonValue());
-
-
-		if (ApiTypeHelper.isDefined(this.stopwords)) {
-			generator.writeKey("stopwords");
-			generator.writeStartArray();
-			for (String item0 : this.stopwords) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.stopwordsPath != null) {
-			generator.writeKey("stopwords_path");
-			generator.write(this.stopwordsPath);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CjkAnalyzer}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CjkAnalyzer> {
-		@Nullable
-		private List<String> stopwords;
-
-		@Nullable
-		private String stopwordsPath;
-
-		/**
-		 * API name: {@code stopwords}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>stopwords</code>.
-		 */
-		public final Builder stopwords(List<String> list) {
-			this.stopwords = _listAddAll(this.stopwords, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stopwords}
-		 * <p>
-		 * Adds one or more values to <code>stopwords</code>.
-		 */
-		public final Builder stopwords(String value, String... values) {
-			this.stopwords = _listAdd(this.stopwords, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stopwords_path}
-		 */
-		public final Builder stopwordsPath(@Nullable String value) {
-			this.stopwordsPath = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CjkAnalyzer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some required fields are null.
-		 */
-		public CjkAnalyzer build() {
-			_checkSingleUse();
-
-			return new CjkAnalyzer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CjkAnalyzer}
-	 */
-	public static final JsonpDeserializer<CjkAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CjkAnalyzer::setupLanguageAnalyzerDeserializer);
-
-	protected static void setupLanguageAnalyzerDeserializer(ObjectDeserializer<CjkAnalyzer.Builder> op) {
-
-		op.add(Builder::stopwords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"stopwords");
-		op.add(Builder::stopwordsPath, JsonpDeserializer.stringDeserializer(), "stopwords_path");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final List<String> stopwords;
+
+    @Nullable
+    private final String stopwordsPath;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CjkAnalyzer(Builder builder) {
+
+        this.stopwords = ApiTypeHelper.unmodifiable(builder.stopwords);
+        this.stopwordsPath = builder.stopwordsPath;
+
+    }
+
+    public static CjkAnalyzer of(Function<Builder, ObjectBuilder<CjkAnalyzer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Analyzer variant kind.
+     */
+    @Override
+    public Analyzer.Kind _analyzerKind() {
+        return Analyzer.Kind.Cjk;
+    }
+
+    /**
+     * API name: {@code stopwords}
+     */
+    public final List<String> stopwords() {
+        return this.stopwords;
+    }
+
+    /**
+     * API name: {@code stopwords_path}
+     */
+    @Nullable
+    public final String stopwordsPath() {
+        return this.stopwordsPath;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", Analyzer.Kind.Cjk.jsonValue());
+
+        if (ApiTypeHelper.isDefined(this.stopwords)) {
+            generator.writeKey("stopwords");
+            generator.writeStartArray();
+            for (String item0 : this.stopwords) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.stopwordsPath != null) {
+            generator.writeKey("stopwords_path");
+            generator.write(this.stopwordsPath);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CjkAnalyzer}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CjkAnalyzer> {
+        @Nullable
+        private List<String> stopwords;
+
+        @Nullable
+        private String stopwordsPath;
+
+        /**
+         * API name: {@code stopwords}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>stopwords</code>.
+         */
+        public final Builder stopwords(List<String> list) {
+            this.stopwords = _listAddAll(this.stopwords, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code stopwords}
+         * <p>
+         * Adds one or more values to <code>stopwords</code>.
+         */
+        public final Builder stopwords(String value, String... values) {
+            this.stopwords = _listAdd(this.stopwords, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code stopwords_path}
+         */
+        public final Builder stopwordsPath(@Nullable String value) {
+            this.stopwordsPath = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link CjkAnalyzer}.
+         *
+         * @throws NullPointerException
+         *             if some required fields are null.
+         */
+        public CjkAnalyzer build() {
+            _checkSingleUse();
+
+            return new CjkAnalyzer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CjkAnalyzer}
+     */
+    public static final JsonpDeserializer<CjkAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CjkAnalyzer::setupLanguageAnalyzerDeserializer
+    );
+
+    protected static void setupLanguageAnalyzerDeserializer(ObjectDeserializer<CjkAnalyzer.Builder> op) {
+
+        op.add(Builder::stopwords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stopwords");
+        op.add(Builder::stopwordsPath, JsonpDeserializer.stringDeserializer(), "stopwords_path");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CommonGramsTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CommonGramsTokenFilter.java
index ea7e623b2a..1eac5b33ce 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CommonGramsTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CommonGramsTokenFilter.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,215 +43,208 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.CommonGramsTokenFilter
 
-
 @JsonpDeserializable
 public class CommonGramsTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final List<String> commonWords;
-
-	@Nullable
-	private final String commonWordsPath;
-
-	@Nullable
-	private final Boolean ignoreCase;
-
-	@Nullable
-	private final Boolean queryMode;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CommonGramsTokenFilter(Builder builder) {
-		super(builder);
-
-		this.commonWords = ApiTypeHelper.unmodifiable(builder.commonWords);
-		this.commonWordsPath = builder.commonWordsPath;
-		this.ignoreCase = builder.ignoreCase;
-		this.queryMode = builder.queryMode;
-
-	}
-
-	public static CommonGramsTokenFilter of(Function<Builder, ObjectBuilder<CommonGramsTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.CommonGrams;
-	}
-
-	/**
-	 * API name: {@code common_words}
-	 */
-	public final List<String> commonWords() {
-		return this.commonWords;
-	}
-
-	/**
-	 * API name: {@code common_words_path}
-	 */
-	@Nullable
-	public final String commonWordsPath() {
-		return this.commonWordsPath;
-	}
-
-	/**
-	 * API name: {@code ignore_case}
-	 */
-	@Nullable
-	public final Boolean ignoreCase() {
-		return this.ignoreCase;
-	}
-
-	/**
-	 * API name: {@code query_mode}
-	 */
-	@Nullable
-	public final Boolean queryMode() {
-		return this.queryMode;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "common_grams");
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.commonWords)) {
-			generator.writeKey("common_words");
-			generator.writeStartArray();
-			for (String item0 : this.commonWords) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.commonWordsPath != null) {
-			generator.writeKey("common_words_path");
-			generator.write(this.commonWordsPath);
-
-		}
-		if (this.ignoreCase != null) {
-			generator.writeKey("ignore_case");
-			generator.write(this.ignoreCase);
-
-		}
-		if (this.queryMode != null) {
-			generator.writeKey("query_mode");
-			generator.write(this.queryMode);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CommonGramsTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<CommonGramsTokenFilter> {
-		@Nullable
-		private List<String> commonWords;
-
-		@Nullable
-		private String commonWordsPath;
-
-		@Nullable
-		private Boolean ignoreCase;
-
-		@Nullable
-		private Boolean queryMode;
-
-		/**
-		 * API name: {@code common_words}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>commonWords</code>.
-		 */
-		public final Builder commonWords(List<String> list) {
-			this.commonWords = _listAddAll(this.commonWords, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code common_words}
-		 * <p>
-		 * Adds one or more values to <code>commonWords</code>.
-		 */
-		public final Builder commonWords(String value, String... values) {
-			this.commonWords = _listAdd(this.commonWords, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code common_words_path}
-		 */
-		public final Builder commonWordsPath(@Nullable String value) {
-			this.commonWordsPath = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_case}
-		 */
-		public final Builder ignoreCase(@Nullable Boolean value) {
-			this.ignoreCase = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code query_mode}
-		 */
-		public final Builder queryMode(@Nullable Boolean value) {
-			this.queryMode = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CommonGramsTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CommonGramsTokenFilter build() {
-			_checkSingleUse();
-
-			return new CommonGramsTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CommonGramsTokenFilter}
-	 */
-	public static final JsonpDeserializer<CommonGramsTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CommonGramsTokenFilter::setupCommonGramsTokenFilterDeserializer);
-
-	protected static void setupCommonGramsTokenFilterDeserializer(
-			ObjectDeserializer<CommonGramsTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::commonWords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"common_words");
-		op.add(Builder::commonWordsPath, JsonpDeserializer.stringDeserializer(), "common_words_path");
-		op.add(Builder::ignoreCase, JsonpDeserializer.booleanDeserializer(), "ignore_case");
-		op.add(Builder::queryMode, JsonpDeserializer.booleanDeserializer(), "query_mode");
-
-		op.ignore("type");
-	}
+    private final List<String> commonWords;
+
+    @Nullable
+    private final String commonWordsPath;
+
+    @Nullable
+    private final Boolean ignoreCase;
+
+    @Nullable
+    private final Boolean queryMode;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CommonGramsTokenFilter(Builder builder) {
+        super(builder);
+
+        this.commonWords = ApiTypeHelper.unmodifiable(builder.commonWords);
+        this.commonWordsPath = builder.commonWordsPath;
+        this.ignoreCase = builder.ignoreCase;
+        this.queryMode = builder.queryMode;
+
+    }
+
+    public static CommonGramsTokenFilter of(Function<Builder, ObjectBuilder<CommonGramsTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.CommonGrams;
+    }
+
+    /**
+     * API name: {@code common_words}
+     */
+    public final List<String> commonWords() {
+        return this.commonWords;
+    }
+
+    /**
+     * API name: {@code common_words_path}
+     */
+    @Nullable
+    public final String commonWordsPath() {
+        return this.commonWordsPath;
+    }
+
+    /**
+     * API name: {@code ignore_case}
+     */
+    @Nullable
+    public final Boolean ignoreCase() {
+        return this.ignoreCase;
+    }
+
+    /**
+     * API name: {@code query_mode}
+     */
+    @Nullable
+    public final Boolean queryMode() {
+        return this.queryMode;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "common_grams");
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.commonWords)) {
+            generator.writeKey("common_words");
+            generator.writeStartArray();
+            for (String item0 : this.commonWords) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.commonWordsPath != null) {
+            generator.writeKey("common_words_path");
+            generator.write(this.commonWordsPath);
+
+        }
+        if (this.ignoreCase != null) {
+            generator.writeKey("ignore_case");
+            generator.write(this.ignoreCase);
+
+        }
+        if (this.queryMode != null) {
+            generator.writeKey("query_mode");
+            generator.write(this.queryMode);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CommonGramsTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<CommonGramsTokenFilter> {
+        @Nullable
+        private List<String> commonWords;
+
+        @Nullable
+        private String commonWordsPath;
+
+        @Nullable
+        private Boolean ignoreCase;
+
+        @Nullable
+        private Boolean queryMode;
+
+        /**
+         * API name: {@code common_words}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>commonWords</code>.
+         */
+        public final Builder commonWords(List<String> list) {
+            this.commonWords = _listAddAll(this.commonWords, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code common_words}
+         * <p>
+         * Adds one or more values to <code>commonWords</code>.
+         */
+        public final Builder commonWords(String value, String... values) {
+            this.commonWords = _listAdd(this.commonWords, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code common_words_path}
+         */
+        public final Builder commonWordsPath(@Nullable String value) {
+            this.commonWordsPath = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_case}
+         */
+        public final Builder ignoreCase(@Nullable Boolean value) {
+            this.ignoreCase = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code query_mode}
+         */
+        public final Builder queryMode(@Nullable Boolean value) {
+            this.queryMode = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CommonGramsTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CommonGramsTokenFilter build() {
+            _checkSingleUse();
+
+            return new CommonGramsTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CommonGramsTokenFilter}
+     */
+    public static final JsonpDeserializer<CommonGramsTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CommonGramsTokenFilter::setupCommonGramsTokenFilterDeserializer
+    );
+
+    protected static void setupCommonGramsTokenFilterDeserializer(ObjectDeserializer<CommonGramsTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::commonWords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "common_words");
+        op.add(Builder::commonWordsPath, JsonpDeserializer.stringDeserializer(), "common_words_path");
+        op.add(Builder::ignoreCase, JsonpDeserializer.booleanDeserializer(), "ignore_case");
+        op.add(Builder::queryMode, JsonpDeserializer.booleanDeserializer(), "query_mode");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CompoundWordTokenFilterBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CompoundWordTokenFilterBase.java
index 9a0ceab48d..16be6f05a3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CompoundWordTokenFilterBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CompoundWordTokenFilterBase.java
@@ -32,262 +32,259 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.CompoundWordTokenFilterBase
 
-
 public abstract class CompoundWordTokenFilterBase extends TokenFilterBase {
-	@Nullable
-	private final String hyphenationPatternsPath;
-
-	@Nullable
-	private final Integer maxSubwordSize;
-
-	@Nullable
-	private final Integer minSubwordSize;
-
-	@Nullable
-	private final Integer minWordSize;
-
-	@Nullable
-	private final Boolean onlyLongestMatch;
-
-	private final List<String> wordList;
-
-	@Nullable
-	private final String wordListPath;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected CompoundWordTokenFilterBase(AbstractBuilder<?> builder) {
-		super(builder);
-
-		this.hyphenationPatternsPath = builder.hyphenationPatternsPath;
-		this.maxSubwordSize = builder.maxSubwordSize;
-		this.minSubwordSize = builder.minSubwordSize;
-		this.minWordSize = builder.minWordSize;
-		this.onlyLongestMatch = builder.onlyLongestMatch;
-		this.wordList = ApiTypeHelper.unmodifiable(builder.wordList);
-		this.wordListPath = builder.wordListPath;
-
-	}
-
-	/**
-	 * API name: {@code hyphenation_patterns_path}
-	 */
-	@Nullable
-	public final String hyphenationPatternsPath() {
-		return this.hyphenationPatternsPath;
-	}
-
-	/**
-	 * API name: {@code max_subword_size}
-	 */
-	@Nullable
-	public final Integer maxSubwordSize() {
-		return this.maxSubwordSize;
-	}
-
-	/**
-	 * API name: {@code min_subword_size}
-	 */
-	@Nullable
-	public final Integer minSubwordSize() {
-		return this.minSubwordSize;
-	}
-
-	/**
-	 * API name: {@code min_word_size}
-	 */
-	@Nullable
-	public final Integer minWordSize() {
-		return this.minWordSize;
-	}
-
-	/**
-	 * API name: {@code only_longest_match}
-	 */
-	@Nullable
-	public final Boolean onlyLongestMatch() {
-		return this.onlyLongestMatch;
-	}
-
-	/**
-	 * API name: {@code word_list}
-	 */
-	public final List<String> wordList() {
-		return this.wordList;
-	}
-
-	/**
-	 * API name: {@code word_list_path}
-	 */
-	@Nullable
-	public final String wordListPath() {
-		return this.wordListPath;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.hyphenationPatternsPath != null) {
-			generator.writeKey("hyphenation_patterns_path");
-			generator.write(this.hyphenationPatternsPath);
-
-		}
-		if (this.maxSubwordSize != null) {
-			generator.writeKey("max_subword_size");
-			generator.write(this.maxSubwordSize);
-
-		}
-		if (this.minSubwordSize != null) {
-			generator.writeKey("min_subword_size");
-			generator.write(this.minSubwordSize);
-
-		}
-		if (this.minWordSize != null) {
-			generator.writeKey("min_word_size");
-			generator.write(this.minWordSize);
-
-		}
-		if (this.onlyLongestMatch != null) {
-			generator.writeKey("only_longest_match");
-			generator.write(this.onlyLongestMatch);
-
-		}
-		if (ApiTypeHelper.isDefined(this.wordList)) {
-			generator.writeKey("word_list");
-			generator.writeStartArray();
-			for (String item0 : this.wordList) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.wordListPath != null) {
-			generator.writeKey("word_list_path");
-			generator.write(this.wordListPath);
-
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				TokenFilterBase.AbstractBuilder<BuilderT> {
-		@Nullable
-		private String hyphenationPatternsPath;
-
-		@Nullable
-		private Integer maxSubwordSize;
-
-		@Nullable
-		private Integer minSubwordSize;
-
-		@Nullable
-		private Integer minWordSize;
-
-		@Nullable
-		private Boolean onlyLongestMatch;
-
-		@Nullable
-		private List<String> wordList;
-
-		@Nullable
-		private String wordListPath;
-
-		/**
-		 * API name: {@code hyphenation_patterns_path}
-		 */
-		public final BuilderT hyphenationPatternsPath(@Nullable String value) {
-			this.hyphenationPatternsPath = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code max_subword_size}
-		 */
-		public final BuilderT maxSubwordSize(@Nullable Integer value) {
-			this.maxSubwordSize = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code min_subword_size}
-		 */
-		public final BuilderT minSubwordSize(@Nullable Integer value) {
-			this.minSubwordSize = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code min_word_size}
-		 */
-		public final BuilderT minWordSize(@Nullable Integer value) {
-			this.minWordSize = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code only_longest_match}
-		 */
-		public final BuilderT onlyLongestMatch(@Nullable Boolean value) {
-			this.onlyLongestMatch = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code word_list}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>wordList</code>.
-		 */
-		public final BuilderT wordList(List<String> list) {
-			this.wordList = _listAddAll(this.wordList, list);
-			return self();
-		}
-
-		/**
-		 * API name: {@code word_list}
-		 * <p>
-		 * Adds one or more values to <code>wordList</code>.
-		 */
-		public final BuilderT wordList(String value, String... values) {
-			this.wordList = _listAdd(this.wordList, value, values);
-			return self();
-		}
-
-		/**
-		 * API name: {@code word_list_path}
-		 */
-		public final BuilderT wordListPath(@Nullable String value) {
-			this.wordListPath = value;
-			return self();
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupCompoundWordTokenFilterBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(AbstractBuilder::hyphenationPatternsPath, JsonpDeserializer.stringDeserializer(),
-				"hyphenation_patterns_path");
-		op.add(AbstractBuilder::maxSubwordSize, JsonpDeserializer.integerDeserializer(), "max_subword_size");
-		op.add(AbstractBuilder::minSubwordSize, JsonpDeserializer.integerDeserializer(), "min_subword_size");
-		op.add(AbstractBuilder::minWordSize, JsonpDeserializer.integerDeserializer(), "min_word_size");
-		op.add(AbstractBuilder::onlyLongestMatch, JsonpDeserializer.booleanDeserializer(), "only_longest_match");
-		op.add(AbstractBuilder::wordList, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"word_list");
-		op.add(AbstractBuilder::wordListPath, JsonpDeserializer.stringDeserializer(), "word_list_path");
-
-	}
+    @Nullable
+    private final String hyphenationPatternsPath;
+
+    @Nullable
+    private final Integer maxSubwordSize;
+
+    @Nullable
+    private final Integer minSubwordSize;
+
+    @Nullable
+    private final Integer minWordSize;
+
+    @Nullable
+    private final Boolean onlyLongestMatch;
+
+    private final List<String> wordList;
+
+    @Nullable
+    private final String wordListPath;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected CompoundWordTokenFilterBase(AbstractBuilder<?> builder) {
+        super(builder);
+
+        this.hyphenationPatternsPath = builder.hyphenationPatternsPath;
+        this.maxSubwordSize = builder.maxSubwordSize;
+        this.minSubwordSize = builder.minSubwordSize;
+        this.minWordSize = builder.minWordSize;
+        this.onlyLongestMatch = builder.onlyLongestMatch;
+        this.wordList = ApiTypeHelper.unmodifiable(builder.wordList);
+        this.wordListPath = builder.wordListPath;
+
+    }
+
+    /**
+     * API name: {@code hyphenation_patterns_path}
+     */
+    @Nullable
+    public final String hyphenationPatternsPath() {
+        return this.hyphenationPatternsPath;
+    }
+
+    /**
+     * API name: {@code max_subword_size}
+     */
+    @Nullable
+    public final Integer maxSubwordSize() {
+        return this.maxSubwordSize;
+    }
+
+    /**
+     * API name: {@code min_subword_size}
+     */
+    @Nullable
+    public final Integer minSubwordSize() {
+        return this.minSubwordSize;
+    }
+
+    /**
+     * API name: {@code min_word_size}
+     */
+    @Nullable
+    public final Integer minWordSize() {
+        return this.minWordSize;
+    }
+
+    /**
+     * API name: {@code only_longest_match}
+     */
+    @Nullable
+    public final Boolean onlyLongestMatch() {
+        return this.onlyLongestMatch;
+    }
+
+    /**
+     * API name: {@code word_list}
+     */
+    public final List<String> wordList() {
+        return this.wordList;
+    }
+
+    /**
+     * API name: {@code word_list_path}
+     */
+    @Nullable
+    public final String wordListPath() {
+        return this.wordListPath;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.hyphenationPatternsPath != null) {
+            generator.writeKey("hyphenation_patterns_path");
+            generator.write(this.hyphenationPatternsPath);
+
+        }
+        if (this.maxSubwordSize != null) {
+            generator.writeKey("max_subword_size");
+            generator.write(this.maxSubwordSize);
+
+        }
+        if (this.minSubwordSize != null) {
+            generator.writeKey("min_subword_size");
+            generator.write(this.minSubwordSize);
+
+        }
+        if (this.minWordSize != null) {
+            generator.writeKey("min_word_size");
+            generator.write(this.minWordSize);
+
+        }
+        if (this.onlyLongestMatch != null) {
+            generator.writeKey("only_longest_match");
+            generator.write(this.onlyLongestMatch);
+
+        }
+        if (ApiTypeHelper.isDefined(this.wordList)) {
+            generator.writeKey("word_list");
+            generator.writeStartArray();
+            for (String item0 : this.wordList) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.wordListPath != null) {
+            generator.writeKey("word_list_path");
+            generator.write(this.wordListPath);
+
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends TokenFilterBase.AbstractBuilder<
+        BuilderT> {
+        @Nullable
+        private String hyphenationPatternsPath;
+
+        @Nullable
+        private Integer maxSubwordSize;
+
+        @Nullable
+        private Integer minSubwordSize;
+
+        @Nullable
+        private Integer minWordSize;
+
+        @Nullable
+        private Boolean onlyLongestMatch;
+
+        @Nullable
+        private List<String> wordList;
+
+        @Nullable
+        private String wordListPath;
+
+        /**
+         * API name: {@code hyphenation_patterns_path}
+         */
+        public final BuilderT hyphenationPatternsPath(@Nullable String value) {
+            this.hyphenationPatternsPath = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code max_subword_size}
+         */
+        public final BuilderT maxSubwordSize(@Nullable Integer value) {
+            this.maxSubwordSize = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code min_subword_size}
+         */
+        public final BuilderT minSubwordSize(@Nullable Integer value) {
+            this.minSubwordSize = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code min_word_size}
+         */
+        public final BuilderT minWordSize(@Nullable Integer value) {
+            this.minWordSize = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code only_longest_match}
+         */
+        public final BuilderT onlyLongestMatch(@Nullable Boolean value) {
+            this.onlyLongestMatch = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code word_list}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>wordList</code>.
+         */
+        public final BuilderT wordList(List<String> list) {
+            this.wordList = _listAddAll(this.wordList, list);
+            return self();
+        }
+
+        /**
+         * API name: {@code word_list}
+         * <p>
+         * Adds one or more values to <code>wordList</code>.
+         */
+        public final BuilderT wordList(String value, String... values) {
+            this.wordList = _listAdd(this.wordList, value, values);
+            return self();
+        }
+
+        /**
+         * API name: {@code word_list_path}
+         */
+        public final BuilderT wordListPath(@Nullable String value) {
+            this.wordListPath = value;
+            return self();
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupCompoundWordTokenFilterBaseDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(AbstractBuilder::hyphenationPatternsPath, JsonpDeserializer.stringDeserializer(), "hyphenation_patterns_path");
+        op.add(AbstractBuilder::maxSubwordSize, JsonpDeserializer.integerDeserializer(), "max_subword_size");
+        op.add(AbstractBuilder::minSubwordSize, JsonpDeserializer.integerDeserializer(), "min_subword_size");
+        op.add(AbstractBuilder::minWordSize, JsonpDeserializer.integerDeserializer(), "min_word_size");
+        op.add(AbstractBuilder::onlyLongestMatch, JsonpDeserializer.booleanDeserializer(), "only_longest_match");
+        op.add(AbstractBuilder::wordList, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "word_list");
+        op.add(AbstractBuilder::wordListPath, JsonpDeserializer.stringDeserializer(), "word_list_path");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ConditionTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ConditionTokenFilter.java
index 61b8cb7e5a..0f282f8a17 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ConditionTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ConditionTokenFilter.java
@@ -32,161 +32,161 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _types.analysis.ConditionTokenFilter
 
 @JsonpDeserializable
 public class ConditionTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final List<String> filter;
-
-	private final Script script;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ConditionTokenFilter(Builder builder) {
-		super(builder);
-
-		this.filter = ApiTypeHelper.unmodifiableRequired(builder.filter, this, "filter");
-		this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
-
-	}
-
-	public static ConditionTokenFilter of(Function<Builder, ObjectBuilder<ConditionTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Condition;
-	}
-
-	/**
-	 * Required - API name: {@code filter}
-	 */
-	public final List<String> filter() {
-		return this.filter;
-	}
-
-	/**
-	 * Required - API name: {@code script}
-	 */
-	public final Script script() {
-		return this.script;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "condition");
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.filter)) {
-			generator.writeKey("filter");
-			generator.writeStartArray();
-			for (String item0 : this.filter) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("script");
-		this.script.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ConditionTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ConditionTokenFilter> {
-		private List<String> filter;
-
-		private Script script;
-
-		/**
-		 * Required - API name: {@code filter}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>filter</code>.
-		 */
-		public final Builder filter(List<String> list) {
-			this.filter = _listAddAll(this.filter, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code filter}
-		 * <p>
-		 * Adds one or more values to <code>filter</code>.
-		 */
-		public final Builder filter(String value, String... values) {
-			this.filter = _listAdd(this.filter, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ConditionTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ConditionTokenFilter build() {
-			_checkSingleUse();
-
-			return new ConditionTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ConditionTokenFilter}
-	 */
-	public static final JsonpDeserializer<ConditionTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ConditionTokenFilter::setupConditionTokenFilterDeserializer);
-
-	protected static void setupConditionTokenFilterDeserializer(ObjectDeserializer<ConditionTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::filter, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "filter");
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-
-		op.ignore("type");
-	}
+    private final List<String> filter;
+
+    private final Script script;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ConditionTokenFilter(Builder builder) {
+        super(builder);
+
+        this.filter = ApiTypeHelper.unmodifiableRequired(builder.filter, this, "filter");
+        this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
+
+    }
+
+    public static ConditionTokenFilter of(Function<Builder, ObjectBuilder<ConditionTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Condition;
+    }
+
+    /**
+     * Required - API name: {@code filter}
+     */
+    public final List<String> filter() {
+        return this.filter;
+    }
+
+    /**
+     * Required - API name: {@code script}
+     */
+    public final Script script() {
+        return this.script;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "condition");
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.filter)) {
+            generator.writeKey("filter");
+            generator.writeStartArray();
+            for (String item0 : this.filter) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("script");
+        this.script.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ConditionTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<ConditionTokenFilter> {
+        private List<String> filter;
+
+        private Script script;
+
+        /**
+         * Required - API name: {@code filter}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>filter</code>.
+         */
+        public final Builder filter(List<String> list) {
+            this.filter = _listAddAll(this.filter, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code filter}
+         * <p>
+         * Adds one or more values to <code>filter</code>.
+         */
+        public final Builder filter(String value, String... values) {
+            this.filter = _listAdd(this.filter, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ConditionTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ConditionTokenFilter build() {
+            _checkSingleUse();
+
+            return new ConditionTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ConditionTokenFilter}
+     */
+    public static final JsonpDeserializer<ConditionTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ConditionTokenFilter::setupConditionTokenFilterDeserializer
+    );
+
+    protected static void setupConditionTokenFilterDeserializer(ObjectDeserializer<ConditionTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::filter, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "filter");
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CustomAnalyzer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CustomAnalyzer.java
index d82712b019..4d038b8e71 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CustomAnalyzer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CustomAnalyzer.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,252 +45,249 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.CustomAnalyzer
 
 @JsonpDeserializable
 public class CustomAnalyzer implements AnalyzerVariant, JsonpSerializable {
-	private final List<String> charFilter;
-
-	private final List<String> filter;
-
-	@Nullable
-	private final Integer positionIncrementGap;
-
-	@Nullable
-	private final Integer positionOffsetGap;
-
-	private final String tokenizer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CustomAnalyzer(Builder builder) {
-
-		this.charFilter = ApiTypeHelper.unmodifiable(builder.charFilter);
-		this.filter = ApiTypeHelper.unmodifiable(builder.filter);
-		this.positionIncrementGap = builder.positionIncrementGap;
-		this.positionOffsetGap = builder.positionOffsetGap;
-		this.tokenizer = ApiTypeHelper.requireNonNull(builder.tokenizer, this, "tokenizer");
-
-	}
-
-	public static CustomAnalyzer of(Function<Builder, ObjectBuilder<CustomAnalyzer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Analyzer variant kind.
-	 */
-	@Override
-	public Analyzer.Kind _analyzerKind() {
-		return Analyzer.Kind.Custom;
-	}
-
-	/**
-	 * API name: {@code char_filter}
-	 */
-	public final List<String> charFilter() {
-		return this.charFilter;
-	}
-
-	/**
-	 * API name: {@code filter}
-	 */
-	public final List<String> filter() {
-		return this.filter;
-	}
-
-	/**
-	 * API name: {@code position_increment_gap}
-	 */
-	@Nullable
-	public final Integer positionIncrementGap() {
-		return this.positionIncrementGap;
-	}
-
-	/**
-	 * API name: {@code position_offset_gap}
-	 */
-	@Nullable
-	public final Integer positionOffsetGap() {
-		return this.positionOffsetGap;
-	}
-
-	/**
-	 * Required - API name: {@code tokenizer}
-	 */
-	public final String tokenizer() {
-		return this.tokenizer;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "custom");
-
-		if (ApiTypeHelper.isDefined(this.charFilter)) {
-			generator.writeKey("char_filter");
-			generator.writeStartArray();
-			for (String item0 : this.charFilter) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.filter)) {
-			generator.writeKey("filter");
-			generator.writeStartArray();
-			for (String item0 : this.filter) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.positionIncrementGap != null) {
-			generator.writeKey("position_increment_gap");
-			generator.write(this.positionIncrementGap);
-
-		}
-		if (this.positionOffsetGap != null) {
-			generator.writeKey("position_offset_gap");
-			generator.write(this.positionOffsetGap);
-
-		}
-		generator.writeKey("tokenizer");
-		generator.write(this.tokenizer);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CustomAnalyzer}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CustomAnalyzer> {
-		@Nullable
-		private List<String> charFilter;
-
-		@Nullable
-		private List<String> filter;
-
-		@Nullable
-		private Integer positionIncrementGap;
-
-		@Nullable
-		private Integer positionOffsetGap;
-
-		private String tokenizer;
-
-		/**
-		 * API name: {@code char_filter}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>charFilter</code>.
-		 */
-		public final Builder charFilter(List<String> list) {
-			this.charFilter = _listAddAll(this.charFilter, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code char_filter}
-		 * <p>
-		 * Adds one or more values to <code>charFilter</code>.
-		 */
-		public final Builder charFilter(String value, String... values) {
-			this.charFilter = _listAdd(this.charFilter, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>filter</code>.
-		 */
-		public final Builder filter(List<String> list) {
-			this.filter = _listAddAll(this.filter, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 * <p>
-		 * Adds one or more values to <code>filter</code>.
-		 */
-		public final Builder filter(String value, String... values) {
-			this.filter = _listAdd(this.filter, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code position_increment_gap}
-		 */
-		public final Builder positionIncrementGap(@Nullable Integer value) {
-			this.positionIncrementGap = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code position_offset_gap}
-		 */
-		public final Builder positionOffsetGap(@Nullable Integer value) {
-			this.positionOffsetGap = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tokenizer}
-		 */
-		public final Builder tokenizer(String value) {
-			this.tokenizer = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CustomAnalyzer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CustomAnalyzer build() {
-			_checkSingleUse();
-
-			return new CustomAnalyzer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CustomAnalyzer}
-	 */
-	public static final JsonpDeserializer<CustomAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CustomAnalyzer::setupCustomAnalyzerDeserializer);
-
-	protected static void setupCustomAnalyzerDeserializer(ObjectDeserializer<CustomAnalyzer.Builder> op) {
-
-		op.add(Builder::charFilter, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"char_filter");
-		op.add(Builder::filter, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "filter");
-		op.add(Builder::positionIncrementGap, JsonpDeserializer.integerDeserializer(), "position_increment_gap");
-		op.add(Builder::positionOffsetGap, JsonpDeserializer.integerDeserializer(), "position_offset_gap");
-		op.add(Builder::tokenizer, JsonpDeserializer.stringDeserializer(), "tokenizer");
-
-		op.ignore("type");
-	}
+    private final List<String> charFilter;
+
+    private final List<String> filter;
+
+    @Nullable
+    private final Integer positionIncrementGap;
+
+    @Nullable
+    private final Integer positionOffsetGap;
+
+    private final String tokenizer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CustomAnalyzer(Builder builder) {
+
+        this.charFilter = ApiTypeHelper.unmodifiable(builder.charFilter);
+        this.filter = ApiTypeHelper.unmodifiable(builder.filter);
+        this.positionIncrementGap = builder.positionIncrementGap;
+        this.positionOffsetGap = builder.positionOffsetGap;
+        this.tokenizer = ApiTypeHelper.requireNonNull(builder.tokenizer, this, "tokenizer");
+
+    }
+
+    public static CustomAnalyzer of(Function<Builder, ObjectBuilder<CustomAnalyzer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Analyzer variant kind.
+     */
+    @Override
+    public Analyzer.Kind _analyzerKind() {
+        return Analyzer.Kind.Custom;
+    }
+
+    /**
+     * API name: {@code char_filter}
+     */
+    public final List<String> charFilter() {
+        return this.charFilter;
+    }
+
+    /**
+     * API name: {@code filter}
+     */
+    public final List<String> filter() {
+        return this.filter;
+    }
+
+    /**
+     * API name: {@code position_increment_gap}
+     */
+    @Nullable
+    public final Integer positionIncrementGap() {
+        return this.positionIncrementGap;
+    }
+
+    /**
+     * API name: {@code position_offset_gap}
+     */
+    @Nullable
+    public final Integer positionOffsetGap() {
+        return this.positionOffsetGap;
+    }
+
+    /**
+     * Required - API name: {@code tokenizer}
+     */
+    public final String tokenizer() {
+        return this.tokenizer;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "custom");
+
+        if (ApiTypeHelper.isDefined(this.charFilter)) {
+            generator.writeKey("char_filter");
+            generator.writeStartArray();
+            for (String item0 : this.charFilter) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.filter)) {
+            generator.writeKey("filter");
+            generator.writeStartArray();
+            for (String item0 : this.filter) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.positionIncrementGap != null) {
+            generator.writeKey("position_increment_gap");
+            generator.write(this.positionIncrementGap);
+
+        }
+        if (this.positionOffsetGap != null) {
+            generator.writeKey("position_offset_gap");
+            generator.write(this.positionOffsetGap);
+
+        }
+        generator.writeKey("tokenizer");
+        generator.write(this.tokenizer);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CustomAnalyzer}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CustomAnalyzer> {
+        @Nullable
+        private List<String> charFilter;
+
+        @Nullable
+        private List<String> filter;
+
+        @Nullable
+        private Integer positionIncrementGap;
+
+        @Nullable
+        private Integer positionOffsetGap;
+
+        private String tokenizer;
+
+        /**
+         * API name: {@code char_filter}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>charFilter</code>.
+         */
+        public final Builder charFilter(List<String> list) {
+            this.charFilter = _listAddAll(this.charFilter, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code char_filter}
+         * <p>
+         * Adds one or more values to <code>charFilter</code>.
+         */
+        public final Builder charFilter(String value, String... values) {
+            this.charFilter = _listAdd(this.charFilter, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>filter</code>.
+         */
+        public final Builder filter(List<String> list) {
+            this.filter = _listAddAll(this.filter, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         * <p>
+         * Adds one or more values to <code>filter</code>.
+         */
+        public final Builder filter(String value, String... values) {
+            this.filter = _listAdd(this.filter, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code position_increment_gap}
+         */
+        public final Builder positionIncrementGap(@Nullable Integer value) {
+            this.positionIncrementGap = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code position_offset_gap}
+         */
+        public final Builder positionOffsetGap(@Nullable Integer value) {
+            this.positionOffsetGap = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tokenizer}
+         */
+        public final Builder tokenizer(String value) {
+            this.tokenizer = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link CustomAnalyzer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CustomAnalyzer build() {
+            _checkSingleUse();
+
+            return new CustomAnalyzer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CustomAnalyzer}
+     */
+    public static final JsonpDeserializer<CustomAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CustomAnalyzer::setupCustomAnalyzerDeserializer
+    );
+
+    protected static void setupCustomAnalyzerDeserializer(ObjectDeserializer<CustomAnalyzer.Builder> op) {
+
+        op.add(Builder::charFilter, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "char_filter");
+        op.add(Builder::filter, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "filter");
+        op.add(Builder::positionIncrementGap, JsonpDeserializer.integerDeserializer(), "position_increment_gap");
+        op.add(Builder::positionOffsetGap, JsonpDeserializer.integerDeserializer(), "position_offset_gap");
+        op.add(Builder::tokenizer, JsonpDeserializer.stringDeserializer(), "tokenizer");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CustomNormalizer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CustomNormalizer.java
index bb686d1625..2cba975bef 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CustomNormalizer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CustomNormalizer.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,172 +45,168 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.CustomNormalizer
 
-
 @JsonpDeserializable
 public class CustomNormalizer implements NormalizerVariant, JsonpSerializable {
-	private final List<String> charFilter;
-
-	private final List<String> filter;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CustomNormalizer(Builder builder) {
-
-		this.charFilter = ApiTypeHelper.unmodifiable(builder.charFilter);
-		this.filter = ApiTypeHelper.unmodifiable(builder.filter);
-
-	}
-
-	public static CustomNormalizer of(Function<Builder, ObjectBuilder<CustomNormalizer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Normalizer variant kind.
-	 */
-	@Override
-	public Normalizer.Kind _normalizerKind() {
-		return Normalizer.Kind.Custom;
-	}
-
-	/**
-	 * API name: {@code char_filter}
-	 */
-	public final List<String> charFilter() {
-		return this.charFilter;
-	}
-
-	/**
-	 * API name: {@code filter}
-	 */
-	public final List<String> filter() {
-		return this.filter;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "custom");
-
-		if (ApiTypeHelper.isDefined(this.charFilter)) {
-			generator.writeKey("char_filter");
-			generator.writeStartArray();
-			for (String item0 : this.charFilter) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.filter)) {
-			generator.writeKey("filter");
-			generator.writeStartArray();
-			for (String item0 : this.filter) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CustomNormalizer}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CustomNormalizer> {
-		@Nullable
-		private List<String> charFilter;
-
-		@Nullable
-		private List<String> filter;
-
-		/**
-		 * API name: {@code char_filter}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>charFilter</code>.
-		 */
-		public final Builder charFilter(List<String> list) {
-			this.charFilter = _listAddAll(this.charFilter, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code char_filter}
-		 * <p>
-		 * Adds one or more values to <code>charFilter</code>.
-		 */
-		public final Builder charFilter(String value, String... values) {
-			this.charFilter = _listAdd(this.charFilter, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>filter</code>.
-		 */
-		public final Builder filter(List<String> list) {
-			this.filter = _listAddAll(this.filter, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 * <p>
-		 * Adds one or more values to <code>filter</code>.
-		 */
-		public final Builder filter(String value, String... values) {
-			this.filter = _listAdd(this.filter, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CustomNormalizer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CustomNormalizer build() {
-			_checkSingleUse();
-
-			return new CustomNormalizer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CustomNormalizer}
-	 */
-	public static final JsonpDeserializer<CustomNormalizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CustomNormalizer::setupCustomNormalizerDeserializer);
-
-	protected static void setupCustomNormalizerDeserializer(ObjectDeserializer<CustomNormalizer.Builder> op) {
-
-		op.add(Builder::charFilter, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"char_filter");
-		op.add(Builder::filter, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "filter");
-
-		op.ignore("type");
-	}
+    private final List<String> charFilter;
+
+    private final List<String> filter;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CustomNormalizer(Builder builder) {
+
+        this.charFilter = ApiTypeHelper.unmodifiable(builder.charFilter);
+        this.filter = ApiTypeHelper.unmodifiable(builder.filter);
+
+    }
+
+    public static CustomNormalizer of(Function<Builder, ObjectBuilder<CustomNormalizer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Normalizer variant kind.
+     */
+    @Override
+    public Normalizer.Kind _normalizerKind() {
+        return Normalizer.Kind.Custom;
+    }
+
+    /**
+     * API name: {@code char_filter}
+     */
+    public final List<String> charFilter() {
+        return this.charFilter;
+    }
+
+    /**
+     * API name: {@code filter}
+     */
+    public final List<String> filter() {
+        return this.filter;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "custom");
+
+        if (ApiTypeHelper.isDefined(this.charFilter)) {
+            generator.writeKey("char_filter");
+            generator.writeStartArray();
+            for (String item0 : this.charFilter) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.filter)) {
+            generator.writeKey("filter");
+            generator.writeStartArray();
+            for (String item0 : this.filter) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CustomNormalizer}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CustomNormalizer> {
+        @Nullable
+        private List<String> charFilter;
+
+        @Nullable
+        private List<String> filter;
+
+        /**
+         * API name: {@code char_filter}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>charFilter</code>.
+         */
+        public final Builder charFilter(List<String> list) {
+            this.charFilter = _listAddAll(this.charFilter, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code char_filter}
+         * <p>
+         * Adds one or more values to <code>charFilter</code>.
+         */
+        public final Builder charFilter(String value, String... values) {
+            this.charFilter = _listAdd(this.charFilter, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>filter</code>.
+         */
+        public final Builder filter(List<String> list) {
+            this.filter = _listAddAll(this.filter, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         * <p>
+         * Adds one or more values to <code>filter</code>.
+         */
+        public final Builder filter(String value, String... values) {
+            this.filter = _listAdd(this.filter, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link CustomNormalizer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CustomNormalizer build() {
+            _checkSingleUse();
+
+            return new CustomNormalizer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CustomNormalizer}
+     */
+    public static final JsonpDeserializer<CustomNormalizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CustomNormalizer::setupCustomNormalizerDeserializer
+    );
+
+    protected static void setupCustomNormalizerDeserializer(ObjectDeserializer<CustomNormalizer.Builder> op) {
+
+        op.add(Builder::charFilter, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "char_filter");
+        op.add(Builder::filter, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "filter");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadEncoding.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadEncoding.java
index 5095c440d5..545fe0e141 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadEncoding.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadEncoding.java
@@ -35,27 +35,27 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum DelimitedPayloadEncoding implements JsonEnum {
-	Int("int"),
+    Int("int"),
 
-	Float("float"),
+    Float("float"),
 
-	Identity("identity"),
+    Identity("identity"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	DelimitedPayloadEncoding(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    DelimitedPayloadEncoding(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<DelimitedPayloadEncoding> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			DelimitedPayloadEncoding.values());
+    public static final JsonEnum.Deserializer<DelimitedPayloadEncoding> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        DelimitedPayloadEncoding.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadTokenFilter.java
index 81ff09b574..7f33d4cea0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DelimitedPayloadTokenFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,127 +41,124 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.DelimitedPayloadTokenFilter
 
 @JsonpDeserializable
 public class DelimitedPayloadTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final String delimiter;
-
-	private final DelimitedPayloadEncoding encoding;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DelimitedPayloadTokenFilter(Builder builder) {
-		super(builder);
-
-		this.delimiter = ApiTypeHelper.requireNonNull(builder.delimiter, this, "delimiter");
-		this.encoding = ApiTypeHelper.requireNonNull(builder.encoding, this, "encoding");
-
-	}
-
-	public static DelimitedPayloadTokenFilter of(Function<Builder, ObjectBuilder<DelimitedPayloadTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.DelimitedPayload;
-	}
-
-	/**
-	 * Required - API name: {@code delimiter}
-	 */
-	public final String delimiter() {
-		return this.delimiter;
-	}
-
-	/**
-	 * Required - API name: {@code encoding}
-	 */
-	public final DelimitedPayloadEncoding encoding() {
-		return this.encoding;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "delimited_payload");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("delimiter");
-		generator.write(this.delimiter);
-
-		generator.writeKey("encoding");
-		this.encoding.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DelimitedPayloadTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DelimitedPayloadTokenFilter> {
-		private String delimiter;
-
-		private DelimitedPayloadEncoding encoding;
-
-		/**
-		 * Required - API name: {@code delimiter}
-		 */
-		public final Builder delimiter(String value) {
-			this.delimiter = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code encoding}
-		 */
-		public final Builder encoding(DelimitedPayloadEncoding value) {
-			this.encoding = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DelimitedPayloadTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DelimitedPayloadTokenFilter build() {
-			_checkSingleUse();
-
-			return new DelimitedPayloadTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DelimitedPayloadTokenFilter}
-	 */
-	public static final JsonpDeserializer<DelimitedPayloadTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DelimitedPayloadTokenFilter::setupDelimitedPayloadTokenFilterDeserializer);
-
-	protected static void setupDelimitedPayloadTokenFilterDeserializer(
-			ObjectDeserializer<DelimitedPayloadTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::delimiter, JsonpDeserializer.stringDeserializer(), "delimiter");
-		op.add(Builder::encoding, DelimitedPayloadEncoding._DESERIALIZER, "encoding");
-
-		op.ignore("type");
-	}
+    private final String delimiter;
+
+    private final DelimitedPayloadEncoding encoding;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DelimitedPayloadTokenFilter(Builder builder) {
+        super(builder);
+
+        this.delimiter = ApiTypeHelper.requireNonNull(builder.delimiter, this, "delimiter");
+        this.encoding = ApiTypeHelper.requireNonNull(builder.encoding, this, "encoding");
+
+    }
+
+    public static DelimitedPayloadTokenFilter of(Function<Builder, ObjectBuilder<DelimitedPayloadTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.DelimitedPayload;
+    }
+
+    /**
+     * Required - API name: {@code delimiter}
+     */
+    public final String delimiter() {
+        return this.delimiter;
+    }
+
+    /**
+     * Required - API name: {@code encoding}
+     */
+    public final DelimitedPayloadEncoding encoding() {
+        return this.encoding;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "delimited_payload");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("delimiter");
+        generator.write(this.delimiter);
+
+        generator.writeKey("encoding");
+        this.encoding.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DelimitedPayloadTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<DelimitedPayloadTokenFilter> {
+        private String delimiter;
+
+        private DelimitedPayloadEncoding encoding;
+
+        /**
+         * Required - API name: {@code delimiter}
+         */
+        public final Builder delimiter(String value) {
+            this.delimiter = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code encoding}
+         */
+        public final Builder encoding(DelimitedPayloadEncoding value) {
+            this.encoding = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DelimitedPayloadTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DelimitedPayloadTokenFilter build() {
+            _checkSingleUse();
+
+            return new DelimitedPayloadTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DelimitedPayloadTokenFilter}
+     */
+    public static final JsonpDeserializer<DelimitedPayloadTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DelimitedPayloadTokenFilter::setupDelimitedPayloadTokenFilterDeserializer
+    );
+
+    protected static void setupDelimitedPayloadTokenFilterDeserializer(ObjectDeserializer<DelimitedPayloadTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::delimiter, JsonpDeserializer.stringDeserializer(), "delimiter");
+        op.add(Builder::encoding, DelimitedPayloadEncoding._DESERIALIZER, "encoding");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DictionaryDecompounderTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DictionaryDecompounderTokenFilter.java
index 63f08d3845..763ea7c919 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DictionaryDecompounderTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DictionaryDecompounderTokenFilter.java
@@ -32,90 +32,88 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.DictionaryDecompounderTokenFilter
 
-
 @JsonpDeserializable
-public class DictionaryDecompounderTokenFilter extends CompoundWordTokenFilterBase
-		implements
-			TokenFilterDefinitionVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private DictionaryDecompounderTokenFilter(Builder builder) {
-		super(builder);
-
-	}
-
-	public static DictionaryDecompounderTokenFilter of(
-			Function<Builder, ObjectBuilder<DictionaryDecompounderTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.DictionaryDecompounder;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "dictionary_decompounder");
-		super.serializeInternal(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DictionaryDecompounderTokenFilter}.
-	 */
-
-	public static class Builder extends CompoundWordTokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DictionaryDecompounderTokenFilter> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DictionaryDecompounderTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DictionaryDecompounderTokenFilter build() {
-			_checkSingleUse();
-
-			return new DictionaryDecompounderTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DictionaryDecompounderTokenFilter}
-	 */
-	public static final JsonpDeserializer<DictionaryDecompounderTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DictionaryDecompounderTokenFilter::setupDictionaryDecompounderTokenFilterDeserializer);
-
-	protected static void setupDictionaryDecompounderTokenFilterDeserializer(
-			ObjectDeserializer<DictionaryDecompounderTokenFilter.Builder> op) {
-		setupCompoundWordTokenFilterBaseDeserializer(op);
-
-		op.ignore("type");
-	}
+public class DictionaryDecompounderTokenFilter extends CompoundWordTokenFilterBase implements TokenFilterDefinitionVariant {
+    // ---------------------------------------------------------------------------------------------
+
+    private DictionaryDecompounderTokenFilter(Builder builder) {
+        super(builder);
+
+    }
+
+    public static DictionaryDecompounderTokenFilter of(Function<Builder, ObjectBuilder<DictionaryDecompounderTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.DictionaryDecompounder;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "dictionary_decompounder");
+        super.serializeInternal(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DictionaryDecompounderTokenFilter}.
+     */
+
+    public static class Builder extends CompoundWordTokenFilterBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<DictionaryDecompounderTokenFilter> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DictionaryDecompounderTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DictionaryDecompounderTokenFilter build() {
+            _checkSingleUse();
+
+            return new DictionaryDecompounderTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DictionaryDecompounderTokenFilter}
+     */
+    public static final JsonpDeserializer<DictionaryDecompounderTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DictionaryDecompounderTokenFilter::setupDictionaryDecompounderTokenFilterDeserializer
+    );
+
+    protected static void setupDictionaryDecompounderTokenFilterDeserializer(
+        ObjectDeserializer<DictionaryDecompounderTokenFilter.Builder> op
+    ) {
+        setupCompoundWordTokenFilterBaseDeserializer(op);
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DutchAnalyzer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DutchAnalyzer.java
index 24be4138fd..bcaa49f64d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DutchAnalyzer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/DutchAnalyzer.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,127 +45,124 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.DutchAnalyzer
 
 @JsonpDeserializable
 public class DutchAnalyzer implements AnalyzerVariant, JsonpSerializable {
-	private final List<String> stopwords;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DutchAnalyzer(Builder builder) {
-
-		this.stopwords = ApiTypeHelper.unmodifiable(builder.stopwords);
-
-	}
-
-	public static DutchAnalyzer of(Function<Builder, ObjectBuilder<DutchAnalyzer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Analyzer variant kind.
-	 */
-	@Override
-	public Analyzer.Kind _analyzerKind() {
-		return Analyzer.Kind.Dutch;
-	}
-
-	/**
-	 * API name: {@code stopwords}
-	 */
-	public final List<String> stopwords() {
-		return this.stopwords;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "dutch");
-
-		if (ApiTypeHelper.isDefined(this.stopwords)) {
-			generator.writeKey("stopwords");
-			generator.writeStartArray();
-			for (String item0 : this.stopwords) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DutchAnalyzer}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DutchAnalyzer> {
-		@Nullable
-		private List<String> stopwords;
-
-		/**
-		 * API name: {@code stopwords}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>stopwords</code>.
-		 */
-		public final Builder stopwords(List<String> list) {
-			this.stopwords = _listAddAll(this.stopwords, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stopwords}
-		 * <p>
-		 * Adds one or more values to <code>stopwords</code>.
-		 */
-		public final Builder stopwords(String value, String... values) {
-			this.stopwords = _listAdd(this.stopwords, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DutchAnalyzer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DutchAnalyzer build() {
-			_checkSingleUse();
-
-			return new DutchAnalyzer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DutchAnalyzer}
-	 */
-	public static final JsonpDeserializer<DutchAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			DutchAnalyzer::setupDutchAnalyzerDeserializer);
-
-	protected static void setupDutchAnalyzerDeserializer(ObjectDeserializer<DutchAnalyzer.Builder> op) {
-
-		op.add(Builder::stopwords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"stopwords");
-
-		op.ignore("type");
-	}
+    private final List<String> stopwords;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DutchAnalyzer(Builder builder) {
+
+        this.stopwords = ApiTypeHelper.unmodifiable(builder.stopwords);
+
+    }
+
+    public static DutchAnalyzer of(Function<Builder, ObjectBuilder<DutchAnalyzer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Analyzer variant kind.
+     */
+    @Override
+    public Analyzer.Kind _analyzerKind() {
+        return Analyzer.Kind.Dutch;
+    }
+
+    /**
+     * API name: {@code stopwords}
+     */
+    public final List<String> stopwords() {
+        return this.stopwords;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "dutch");
+
+        if (ApiTypeHelper.isDefined(this.stopwords)) {
+            generator.writeKey("stopwords");
+            generator.writeStartArray();
+            for (String item0 : this.stopwords) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DutchAnalyzer}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DutchAnalyzer> {
+        @Nullable
+        private List<String> stopwords;
+
+        /**
+         * API name: {@code stopwords}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>stopwords</code>.
+         */
+        public final Builder stopwords(List<String> list) {
+            this.stopwords = _listAddAll(this.stopwords, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code stopwords}
+         * <p>
+         * Adds one or more values to <code>stopwords</code>.
+         */
+        public final Builder stopwords(String value, String... values) {
+            this.stopwords = _listAdd(this.stopwords, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link DutchAnalyzer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DutchAnalyzer build() {
+            _checkSingleUse();
+
+            return new DutchAnalyzer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DutchAnalyzer}
+     */
+    public static final JsonpDeserializer<DutchAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DutchAnalyzer::setupDutchAnalyzerDeserializer
+    );
+
+    protected static void setupDutchAnalyzerDeserializer(ObjectDeserializer<DutchAnalyzer.Builder> op) {
+
+        op.add(Builder::stopwords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stopwords");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramSide.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramSide.java
index 3c952bbde9..893f6d4f12 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramSide.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramSide.java
@@ -37,22 +37,21 @@
 
 @JsonpDeserializable
 public enum EdgeNGramSide implements JsonEnum {
-	Front("front"),
+    Front("front"),
 
-	Back("back"),
+    Back("back"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	EdgeNGramSide(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    EdgeNGramSide(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<EdgeNGramSide> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			EdgeNGramSide.values());
+    public static final JsonEnum.Deserializer<EdgeNGramSide> _DESERIALIZER = new JsonEnum.Deserializer<>(EdgeNGramSide.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramTokenFilter.java
index def5cd9960..1a81208441 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramTokenFilter.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,186 +42,182 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.EdgeNGramTokenFilter
 
-
 @JsonpDeserializable
 public class EdgeNGramTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final int maxGram;
+    private final int maxGram;
+
+    private final int minGram;
 
-	private final int minGram;
-
-	@Nullable
-	private final EdgeNGramSide side;
+    @Nullable
+    private final EdgeNGramSide side;
 
-	@Nullable
-	private final Boolean preserveOriginal;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private EdgeNGramTokenFilter(Builder builder) {
-		super(builder);
-
-		this.maxGram = ApiTypeHelper.requireNonNull(builder.maxGram, this, "maxGram");
-		this.minGram = ApiTypeHelper.requireNonNull(builder.minGram, this, "minGram");
-		this.side = builder.side;
-		this.preserveOriginal = builder.preserveOriginal;
-
-	}
-
-	public static EdgeNGramTokenFilter of(Function<Builder, ObjectBuilder<EdgeNGramTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.EdgeNgram;
-	}
-
-	/**
-	 * Required - API name: {@code max_gram}
-	 */
-	public final int maxGram() {
-		return this.maxGram;
-	}
-
-	/**
-	 * Required - API name: {@code min_gram}
-	 */
-	public final int minGram() {
-		return this.minGram;
-	}
-
-	/**
-	 * API name: {@code side}
-	 */
-	@Nullable
-	public final EdgeNGramSide side() {
-		return this.side;
-	}
-
-	/**
-	 * API name: {@code preserve_original}
-	 */
-	@Nullable
-	public final Boolean preserveOriginal() {
-		return this.preserveOriginal;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "edge_ngram");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("max_gram");
-		generator.write(this.maxGram);
-
-		generator.writeKey("min_gram");
-		generator.write(this.minGram);
-
-		if (this.side != null) {
-			generator.writeKey("side");
-			this.side.serialize(generator, mapper);
-		}
-		if (this.preserveOriginal != null) {
-			generator.writeKey("preserve_original");
-			generator.write(this.preserveOriginal);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link EdgeNGramTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<EdgeNGramTokenFilter> {
-		private Integer maxGram;
-
-		private Integer minGram;
-
-		@Nullable
-		private EdgeNGramSide side;
-
-		@Nullable
-		private Boolean preserveOriginal;
-
-		/**
-		 * Required - API name: {@code max_gram}
-		 */
-		public final Builder maxGram(int value) {
-			this.maxGram = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code min_gram}
-		 */
-		public final Builder minGram(int value) {
-			this.minGram = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code side}
-		 */
-		public final Builder side(@Nullable EdgeNGramSide value) {
-			this.side = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code preserve_original}
-		 */
-		public final Builder preserveOriginal(@Nullable Boolean value) {
-			this.preserveOriginal = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link EdgeNGramTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public EdgeNGramTokenFilter build() {
-			_checkSingleUse();
-
-			return new EdgeNGramTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link EdgeNGramTokenFilter}
-	 */
-	public static final JsonpDeserializer<EdgeNGramTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, EdgeNGramTokenFilter::setupEdgeNGramTokenFilterDeserializer);
-
-	protected static void setupEdgeNGramTokenFilterDeserializer(ObjectDeserializer<EdgeNGramTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::maxGram, JsonpDeserializer.integerDeserializer(), "max_gram");
-		op.add(Builder::minGram, JsonpDeserializer.integerDeserializer(), "min_gram");
-		op.add(Builder::side, EdgeNGramSide._DESERIALIZER, "side");
-		op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Boolean preserveOriginal;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private EdgeNGramTokenFilter(Builder builder) {
+        super(builder);
+
+        this.maxGram = ApiTypeHelper.requireNonNull(builder.maxGram, this, "maxGram");
+        this.minGram = ApiTypeHelper.requireNonNull(builder.minGram, this, "minGram");
+        this.side = builder.side;
+        this.preserveOriginal = builder.preserveOriginal;
+
+    }
+
+    public static EdgeNGramTokenFilter of(Function<Builder, ObjectBuilder<EdgeNGramTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.EdgeNgram;
+    }
+
+    /**
+     * Required - API name: {@code max_gram}
+     */
+    public final int maxGram() {
+        return this.maxGram;
+    }
+
+    /**
+     * Required - API name: {@code min_gram}
+     */
+    public final int minGram() {
+        return this.minGram;
+    }
+
+    /**
+     * API name: {@code side}
+     */
+    @Nullable
+    public final EdgeNGramSide side() {
+        return this.side;
+    }
+
+    /**
+     * API name: {@code preserve_original}
+     */
+    @Nullable
+    public final Boolean preserveOriginal() {
+        return this.preserveOriginal;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "edge_ngram");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("max_gram");
+        generator.write(this.maxGram);
+
+        generator.writeKey("min_gram");
+        generator.write(this.minGram);
+
+        if (this.side != null) {
+            generator.writeKey("side");
+            this.side.serialize(generator, mapper);
+        }
+        if (this.preserveOriginal != null) {
+            generator.writeKey("preserve_original");
+            generator.write(this.preserveOriginal);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link EdgeNGramTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<EdgeNGramTokenFilter> {
+        private Integer maxGram;
+
+        private Integer minGram;
+
+        @Nullable
+        private EdgeNGramSide side;
+
+        @Nullable
+        private Boolean preserveOriginal;
+
+        /**
+         * Required - API name: {@code max_gram}
+         */
+        public final Builder maxGram(int value) {
+            this.maxGram = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code min_gram}
+         */
+        public final Builder minGram(int value) {
+            this.minGram = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code side}
+         */
+        public final Builder side(@Nullable EdgeNGramSide value) {
+            this.side = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code preserve_original}
+         */
+        public final Builder preserveOriginal(@Nullable Boolean value) {
+            this.preserveOriginal = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link EdgeNGramTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public EdgeNGramTokenFilter build() {
+            _checkSingleUse();
+
+            return new EdgeNGramTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link EdgeNGramTokenFilter}
+     */
+    public static final JsonpDeserializer<EdgeNGramTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        EdgeNGramTokenFilter::setupEdgeNGramTokenFilterDeserializer
+    );
+
+    protected static void setupEdgeNGramTokenFilterDeserializer(ObjectDeserializer<EdgeNGramTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::maxGram, JsonpDeserializer.integerDeserializer(), "max_gram");
+        op.add(Builder::minGram, JsonpDeserializer.integerDeserializer(), "min_gram");
+        op.add(Builder::side, EdgeNGramSide._DESERIALIZER, "side");
+        op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramTokenizer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramTokenizer.java
index 7f44552de2..0cd81a7228 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramTokenizer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/EdgeNGramTokenizer.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,200 +43,196 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.EdgeNGramTokenizer
 
 @JsonpDeserializable
 public class EdgeNGramTokenizer extends TokenizerBase implements TokenizerDefinitionVariant {
-	@Nullable
-	private final String customTokenChars;
+    @Nullable
+    private final String customTokenChars;
+
+    private final int maxGram;
 
-	private final int maxGram;
+    private final int minGram;
 
-	private final int minGram;
+    private final List<TokenChar> tokenChars;
 
-	private final List<TokenChar> tokenChars;
+    // ---------------------------------------------------------------------------------------------
 
-	// ---------------------------------------------------------------------------------------------
+    private EdgeNGramTokenizer(Builder builder) {
+        super(builder);
 
-	private EdgeNGramTokenizer(Builder builder) {
-		super(builder);
-
-		this.customTokenChars = builder.customTokenChars;
-		this.maxGram = ApiTypeHelper.requireNonNull(builder.maxGram, this, "maxGram");
-		this.minGram = ApiTypeHelper.requireNonNull(builder.minGram, this, "minGram");
-		this.tokenChars = ApiTypeHelper.unmodifiableRequired(builder.tokenChars, this, "tokenChars");
-
-	}
-
-	public static EdgeNGramTokenizer of(Function<Builder, ObjectBuilder<EdgeNGramTokenizer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenizerDefinition variant kind.
-	 */
-	@Override
-	public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
-		return TokenizerDefinition.Kind.EdgeNgram;
-	}
-
-	/**
-	 * API name: {@code custom_token_chars}
-	 */
-	@Nullable
-	public final String customTokenChars() {
-		return this.customTokenChars;
-	}
-
-	/**
-	 * Required - API name: {@code max_gram}
-	 */
-	public final int maxGram() {
-		return this.maxGram;
-	}
-
-	/**
-	 * Required - API name: {@code min_gram}
-	 */
-	public final int minGram() {
-		return this.minGram;
-	}
-
-	/**
-	 * Required - API name: {@code token_chars}
-	 */
-	public final List<TokenChar> tokenChars() {
-		return this.tokenChars;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "edge_ngram");
-		super.serializeInternal(generator, mapper);
-		if (this.customTokenChars != null) {
-			generator.writeKey("custom_token_chars");
-			generator.write(this.customTokenChars);
-
-		}
-		generator.writeKey("max_gram");
-		generator.write(this.maxGram);
-
-		generator.writeKey("min_gram");
-		generator.write(this.minGram);
-
-		if (ApiTypeHelper.isDefined(this.tokenChars)) {
-			generator.writeKey("token_chars");
-			generator.writeStartArray();
-			for (TokenChar item0 : this.tokenChars) {
-				item0.serialize(generator, mapper);
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link EdgeNGramTokenizer}.
-	 */
-
-	public static class Builder extends TokenizerBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<EdgeNGramTokenizer> {
-		@Nullable
-		private String customTokenChars;
-
-		private Integer maxGram;
-
-		private Integer minGram;
-
-		private List<TokenChar> tokenChars;
-
-		/**
-		 * API name: {@code custom_token_chars}
-		 */
-		public final Builder customTokenChars(@Nullable String value) {
-			this.customTokenChars = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code max_gram}
-		 */
-		public final Builder maxGram(int value) {
-			this.maxGram = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code min_gram}
-		 */
-		public final Builder minGram(int value) {
-			this.minGram = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code token_chars}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>tokenChars</code>.
-		 */
-		public final Builder tokenChars(List<TokenChar> list) {
-			this.tokenChars = _listAddAll(this.tokenChars, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code token_chars}
-		 * <p>
-		 * Adds one or more values to <code>tokenChars</code>.
-		 */
-		public final Builder tokenChars(TokenChar value, TokenChar... values) {
-			this.tokenChars = _listAdd(this.tokenChars, value, values);
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link EdgeNGramTokenizer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public EdgeNGramTokenizer build() {
-			_checkSingleUse();
-
-			return new EdgeNGramTokenizer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link EdgeNGramTokenizer}
-	 */
-	public static final JsonpDeserializer<EdgeNGramTokenizer> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, EdgeNGramTokenizer::setupEdgeNGramTokenizerDeserializer);
-
-	protected static void setupEdgeNGramTokenizerDeserializer(ObjectDeserializer<EdgeNGramTokenizer.Builder> op) {
-		TokenizerBase.setupTokenizerBaseDeserializer(op);
-		op.add(Builder::customTokenChars, JsonpDeserializer.stringDeserializer(), "custom_token_chars");
-		op.add(Builder::maxGram, JsonpDeserializer.integerDeserializer(), "max_gram");
-		op.add(Builder::minGram, JsonpDeserializer.integerDeserializer(), "min_gram");
-		op.add(Builder::tokenChars, JsonpDeserializer.arrayDeserializer(TokenChar._DESERIALIZER), "token_chars");
-
-		op.ignore("type");
-	}
+        this.customTokenChars = builder.customTokenChars;
+        this.maxGram = ApiTypeHelper.requireNonNull(builder.maxGram, this, "maxGram");
+        this.minGram = ApiTypeHelper.requireNonNull(builder.minGram, this, "minGram");
+        this.tokenChars = ApiTypeHelper.unmodifiableRequired(builder.tokenChars, this, "tokenChars");
+
+    }
+
+    public static EdgeNGramTokenizer of(Function<Builder, ObjectBuilder<EdgeNGramTokenizer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenizerDefinition variant kind.
+     */
+    @Override
+    public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
+        return TokenizerDefinition.Kind.EdgeNgram;
+    }
+
+    /**
+     * API name: {@code custom_token_chars}
+     */
+    @Nullable
+    public final String customTokenChars() {
+        return this.customTokenChars;
+    }
+
+    /**
+     * Required - API name: {@code max_gram}
+     */
+    public final int maxGram() {
+        return this.maxGram;
+    }
+
+    /**
+     * Required - API name: {@code min_gram}
+     */
+    public final int minGram() {
+        return this.minGram;
+    }
+
+    /**
+     * Required - API name: {@code token_chars}
+     */
+    public final List<TokenChar> tokenChars() {
+        return this.tokenChars;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "edge_ngram");
+        super.serializeInternal(generator, mapper);
+        if (this.customTokenChars != null) {
+            generator.writeKey("custom_token_chars");
+            generator.write(this.customTokenChars);
+
+        }
+        generator.writeKey("max_gram");
+        generator.write(this.maxGram);
+
+        generator.writeKey("min_gram");
+        generator.write(this.minGram);
+
+        if (ApiTypeHelper.isDefined(this.tokenChars)) {
+            generator.writeKey("token_chars");
+            generator.writeStartArray();
+            for (TokenChar item0 : this.tokenChars) {
+                item0.serialize(generator, mapper);
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link EdgeNGramTokenizer}.
+     */
+
+    public static class Builder extends TokenizerBase.AbstractBuilder<Builder> implements ObjectBuilder<EdgeNGramTokenizer> {
+        @Nullable
+        private String customTokenChars;
+
+        private Integer maxGram;
+
+        private Integer minGram;
+
+        private List<TokenChar> tokenChars;
+
+        /**
+         * API name: {@code custom_token_chars}
+         */
+        public final Builder customTokenChars(@Nullable String value) {
+            this.customTokenChars = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code max_gram}
+         */
+        public final Builder maxGram(int value) {
+            this.maxGram = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code min_gram}
+         */
+        public final Builder minGram(int value) {
+            this.minGram = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code token_chars}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>tokenChars</code>.
+         */
+        public final Builder tokenChars(List<TokenChar> list) {
+            this.tokenChars = _listAddAll(this.tokenChars, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code token_chars}
+         * <p>
+         * Adds one or more values to <code>tokenChars</code>.
+         */
+        public final Builder tokenChars(TokenChar value, TokenChar... values) {
+            this.tokenChars = _listAdd(this.tokenChars, value, values);
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link EdgeNGramTokenizer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public EdgeNGramTokenizer build() {
+            _checkSingleUse();
+
+            return new EdgeNGramTokenizer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link EdgeNGramTokenizer}
+     */
+    public static final JsonpDeserializer<EdgeNGramTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        EdgeNGramTokenizer::setupEdgeNGramTokenizerDeserializer
+    );
+
+    protected static void setupEdgeNGramTokenizerDeserializer(ObjectDeserializer<EdgeNGramTokenizer.Builder> op) {
+        TokenizerBase.setupTokenizerBaseDeserializer(op);
+        op.add(Builder::customTokenChars, JsonpDeserializer.stringDeserializer(), "custom_token_chars");
+        op.add(Builder::maxGram, JsonpDeserializer.integerDeserializer(), "max_gram");
+        op.add(Builder::minGram, JsonpDeserializer.integerDeserializer(), "min_gram");
+        op.add(Builder::tokenChars, JsonpDeserializer.arrayDeserializer(TokenChar._DESERIALIZER), "token_chars");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ElisionTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ElisionTokenFilter.java
index e8e726fec6..01e27ae8e5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ElisionTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ElisionTokenFilter.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,148 +42,143 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _types.analysis.ElisionTokenFilter
 
-
 @JsonpDeserializable
 public class ElisionTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final List<String> articles;
-
-	private final boolean articlesCase;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ElisionTokenFilter(Builder builder) {
-		super(builder);
-
-		this.articles = ApiTypeHelper.unmodifiableRequired(builder.articles, this, "articles");
-		this.articlesCase = ApiTypeHelper.requireNonNull(builder.articlesCase, this, "articlesCase");
-
-	}
-
-	public static ElisionTokenFilter of(Function<Builder, ObjectBuilder<ElisionTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Elision;
-	}
-
-	/**
-	 * Required - API name: {@code articles}
-	 */
-	public final List<String> articles() {
-		return this.articles;
-	}
-
-	/**
-	 * Required - API name: {@code articles_case}
-	 */
-	public final boolean articlesCase() {
-		return this.articlesCase;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "elision");
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.articles)) {
-			generator.writeKey("articles");
-			generator.writeStartArray();
-			for (String item0 : this.articles) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("articles_case");
-		generator.write(this.articlesCase);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ElisionTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ElisionTokenFilter> {
-		private List<String> articles;
-
-		private Boolean articlesCase;
-
-		/**
-		 * Required - API name: {@code articles}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>articles</code>.
-		 */
-		public final Builder articles(List<String> list) {
-			this.articles = _listAddAll(this.articles, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code articles}
-		 * <p>
-		 * Adds one or more values to <code>articles</code>.
-		 */
-		public final Builder articles(String value, String... values) {
-			this.articles = _listAdd(this.articles, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code articles_case}
-		 */
-		public final Builder articlesCase(boolean value) {
-			this.articlesCase = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ElisionTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ElisionTokenFilter build() {
-			_checkSingleUse();
-
-			return new ElisionTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ElisionTokenFilter}
-	 */
-	public static final JsonpDeserializer<ElisionTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ElisionTokenFilter::setupElisionTokenFilterDeserializer);
-
-	protected static void setupElisionTokenFilterDeserializer(ObjectDeserializer<ElisionTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::articles, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"articles");
-		op.add(Builder::articlesCase, JsonpDeserializer.booleanDeserializer(), "articles_case");
-
-		op.ignore("type");
-	}
+    private final List<String> articles;
+
+    private final boolean articlesCase;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ElisionTokenFilter(Builder builder) {
+        super(builder);
+
+        this.articles = ApiTypeHelper.unmodifiableRequired(builder.articles, this, "articles");
+        this.articlesCase = ApiTypeHelper.requireNonNull(builder.articlesCase, this, "articlesCase");
+
+    }
+
+    public static ElisionTokenFilter of(Function<Builder, ObjectBuilder<ElisionTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Elision;
+    }
+
+    /**
+     * Required - API name: {@code articles}
+     */
+    public final List<String> articles() {
+        return this.articles;
+    }
+
+    /**
+     * Required - API name: {@code articles_case}
+     */
+    public final boolean articlesCase() {
+        return this.articlesCase;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "elision");
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.articles)) {
+            generator.writeKey("articles");
+            generator.writeStartArray();
+            for (String item0 : this.articles) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("articles_case");
+        generator.write(this.articlesCase);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ElisionTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<ElisionTokenFilter> {
+        private List<String> articles;
+
+        private Boolean articlesCase;
+
+        /**
+         * Required - API name: {@code articles}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>articles</code>.
+         */
+        public final Builder articles(List<String> list) {
+            this.articles = _listAddAll(this.articles, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code articles}
+         * <p>
+         * Adds one or more values to <code>articles</code>.
+         */
+        public final Builder articles(String value, String... values) {
+            this.articles = _listAdd(this.articles, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code articles_case}
+         */
+        public final Builder articlesCase(boolean value) {
+            this.articlesCase = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ElisionTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ElisionTokenFilter build() {
+            _checkSingleUse();
+
+            return new ElisionTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ElisionTokenFilter}
+     */
+    public static final JsonpDeserializer<ElisionTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ElisionTokenFilter::setupElisionTokenFilterDeserializer
+    );
+
+    protected static void setupElisionTokenFilterDeserializer(ObjectDeserializer<ElisionTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::articles, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "articles");
+        op.add(Builder::articlesCase, JsonpDeserializer.booleanDeserializer(), "articles_case");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/FingerprintAnalyzer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/FingerprintAnalyzer.java
index c4710252e4..7aa510dee8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/FingerprintAnalyzer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/FingerprintAnalyzer.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,257 +45,254 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.FingerprintAnalyzer
 
 @JsonpDeserializable
 public class FingerprintAnalyzer implements AnalyzerVariant, JsonpSerializable {
-	@Nullable
-	private final String version;
-
-	private final int maxOutputSize;
-
-	private final boolean preserveOriginal;
-
-	private final String separator;
-
-	private final List<String> stopwords;
-
-	@Nullable
-	private final String stopwordsPath;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FingerprintAnalyzer(Builder builder) {
-
-		this.version = builder.version;
-		this.maxOutputSize = ApiTypeHelper.requireNonNull(builder.maxOutputSize, this, "maxOutputSize");
-		this.preserveOriginal = ApiTypeHelper.requireNonNull(builder.preserveOriginal, this, "preserveOriginal");
-		this.separator = ApiTypeHelper.requireNonNull(builder.separator, this, "separator");
-		this.stopwords = ApiTypeHelper.unmodifiable(builder.stopwords);
-		this.stopwordsPath = builder.stopwordsPath;
-
-	}
-
-	public static FingerprintAnalyzer of(Function<Builder, ObjectBuilder<FingerprintAnalyzer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Analyzer variant kind.
-	 */
-	@Override
-	public Analyzer.Kind _analyzerKind() {
-		return Analyzer.Kind.Fingerprint;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final String version() {
-		return this.version;
-	}
+    @Nullable
+    private final String version;
+
+    private final int maxOutputSize;
+
+    private final boolean preserveOriginal;
+
+    private final String separator;
+
+    private final List<String> stopwords;
+
+    @Nullable
+    private final String stopwordsPath;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FingerprintAnalyzer(Builder builder) {
+
+        this.version = builder.version;
+        this.maxOutputSize = ApiTypeHelper.requireNonNull(builder.maxOutputSize, this, "maxOutputSize");
+        this.preserveOriginal = ApiTypeHelper.requireNonNull(builder.preserveOriginal, this, "preserveOriginal");
+        this.separator = ApiTypeHelper.requireNonNull(builder.separator, this, "separator");
+        this.stopwords = ApiTypeHelper.unmodifiable(builder.stopwords);
+        this.stopwordsPath = builder.stopwordsPath;
+
+    }
+
+    public static FingerprintAnalyzer of(Function<Builder, ObjectBuilder<FingerprintAnalyzer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Analyzer variant kind.
+     */
+    @Override
+    public Analyzer.Kind _analyzerKind() {
+        return Analyzer.Kind.Fingerprint;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final String version() {
+        return this.version;
+    }
 
-	/**
-	 * Required - API name: {@code max_output_size}
-	 */
-	public final int maxOutputSize() {
-		return this.maxOutputSize;
-	}
+    /**
+     * Required - API name: {@code max_output_size}
+     */
+    public final int maxOutputSize() {
+        return this.maxOutputSize;
+    }
 
-	/**
-	 * Required - API name: {@code preserve_original}
-	 */
-	public final boolean preserveOriginal() {
-		return this.preserveOriginal;
-	}
-
-	/**
-	 * Required - API name: {@code separator}
-	 */
-	public final String separator() {
-		return this.separator;
-	}
-
-	/**
-	 * API name: {@code stopwords}
-	 */
-	public final List<String> stopwords() {
-		return this.stopwords;
-	}
-
-	/**
-	 * API name: {@code stopwords_path}
-	 */
-	@Nullable
-	public final String stopwordsPath() {
-		return this.stopwordsPath;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "fingerprint");
-
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		generator.writeKey("max_output_size");
-		generator.write(this.maxOutputSize);
-
-		generator.writeKey("preserve_original");
-		generator.write(this.preserveOriginal);
-
-		generator.writeKey("separator");
-		generator.write(this.separator);
-
-		if (ApiTypeHelper.isDefined(this.stopwords)) {
-			generator.writeKey("stopwords");
-			generator.writeStartArray();
-			for (String item0 : this.stopwords) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.stopwordsPath != null) {
-			generator.writeKey("stopwords_path");
-			generator.write(this.stopwordsPath);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FingerprintAnalyzer}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FingerprintAnalyzer> {
-		@Nullable
-		private String version;
-
-		private Integer maxOutputSize;
-
-		private Boolean preserveOriginal;
-
-		private String separator;
-
-		@Nullable
-		private List<String> stopwords;
-
-		@Nullable
-		private String stopwordsPath;
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code max_output_size}
-		 */
-		public final Builder maxOutputSize(int value) {
-			this.maxOutputSize = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code preserve_original}
-		 */
-		public final Builder preserveOriginal(boolean value) {
-			this.preserveOriginal = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code separator}
-		 */
-		public final Builder separator(String value) {
-			this.separator = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code stopwords}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>stopwords</code>.
-		 */
-		public final Builder stopwords(List<String> list) {
-			this.stopwords = _listAddAll(this.stopwords, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stopwords}
-		 * <p>
-		 * Adds one or more values to <code>stopwords</code>.
-		 */
-		public final Builder stopwords(String value, String... values) {
-			this.stopwords = _listAdd(this.stopwords, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stopwords_path}
-		 */
-		public final Builder stopwordsPath(@Nullable String value) {
-			this.stopwordsPath = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FingerprintAnalyzer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FingerprintAnalyzer build() {
-			_checkSingleUse();
-
-			return new FingerprintAnalyzer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FingerprintAnalyzer}
-	 */
-	public static final JsonpDeserializer<FingerprintAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, FingerprintAnalyzer::setupFingerprintAnalyzerDeserializer);
-
-	protected static void setupFingerprintAnalyzerDeserializer(ObjectDeserializer<FingerprintAnalyzer.Builder> op) {
-
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
-		op.add(Builder::maxOutputSize, JsonpDeserializer.integerDeserializer(), "max_output_size");
-		op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
-		op.add(Builder::separator, JsonpDeserializer.stringDeserializer(), "separator");
-		op.add(Builder::stopwords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"stopwords");
-		op.add(Builder::stopwordsPath, JsonpDeserializer.stringDeserializer(), "stopwords_path");
-
-		op.ignore("type");
-	}
+    /**
+     * Required - API name: {@code preserve_original}
+     */
+    public final boolean preserveOriginal() {
+        return this.preserveOriginal;
+    }
+
+    /**
+     * Required - API name: {@code separator}
+     */
+    public final String separator() {
+        return this.separator;
+    }
+
+    /**
+     * API name: {@code stopwords}
+     */
+    public final List<String> stopwords() {
+        return this.stopwords;
+    }
+
+    /**
+     * API name: {@code stopwords_path}
+     */
+    @Nullable
+    public final String stopwordsPath() {
+        return this.stopwordsPath;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "fingerprint");
+
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        generator.writeKey("max_output_size");
+        generator.write(this.maxOutputSize);
+
+        generator.writeKey("preserve_original");
+        generator.write(this.preserveOriginal);
+
+        generator.writeKey("separator");
+        generator.write(this.separator);
+
+        if (ApiTypeHelper.isDefined(this.stopwords)) {
+            generator.writeKey("stopwords");
+            generator.writeStartArray();
+            for (String item0 : this.stopwords) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.stopwordsPath != null) {
+            generator.writeKey("stopwords_path");
+            generator.write(this.stopwordsPath);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FingerprintAnalyzer}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FingerprintAnalyzer> {
+        @Nullable
+        private String version;
+
+        private Integer maxOutputSize;
+
+        private Boolean preserveOriginal;
+
+        private String separator;
+
+        @Nullable
+        private List<String> stopwords;
+
+        @Nullable
+        private String stopwordsPath;
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code max_output_size}
+         */
+        public final Builder maxOutputSize(int value) {
+            this.maxOutputSize = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code preserve_original}
+         */
+        public final Builder preserveOriginal(boolean value) {
+            this.preserveOriginal = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code separator}
+         */
+        public final Builder separator(String value) {
+            this.separator = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code stopwords}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>stopwords</code>.
+         */
+        public final Builder stopwords(List<String> list) {
+            this.stopwords = _listAddAll(this.stopwords, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code stopwords}
+         * <p>
+         * Adds one or more values to <code>stopwords</code>.
+         */
+        public final Builder stopwords(String value, String... values) {
+            this.stopwords = _listAdd(this.stopwords, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code stopwords_path}
+         */
+        public final Builder stopwordsPath(@Nullable String value) {
+            this.stopwordsPath = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link FingerprintAnalyzer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FingerprintAnalyzer build() {
+            _checkSingleUse();
+
+            return new FingerprintAnalyzer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FingerprintAnalyzer}
+     */
+    public static final JsonpDeserializer<FingerprintAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FingerprintAnalyzer::setupFingerprintAnalyzerDeserializer
+    );
+
+    protected static void setupFingerprintAnalyzerDeserializer(ObjectDeserializer<FingerprintAnalyzer.Builder> op) {
+
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
+        op.add(Builder::maxOutputSize, JsonpDeserializer.integerDeserializer(), "max_output_size");
+        op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
+        op.add(Builder::separator, JsonpDeserializer.stringDeserializer(), "separator");
+        op.add(Builder::stopwords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stopwords");
+        op.add(Builder::stopwordsPath, JsonpDeserializer.stringDeserializer(), "stopwords_path");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/FingerprintTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/FingerprintTokenFilter.java
index 1c677de1d1..424ef79821 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/FingerprintTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/FingerprintTokenFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,127 +41,124 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.FingerprintTokenFilter
 
 @JsonpDeserializable
 public class FingerprintTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final int maxOutputSize;
-
-	private final String separator;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FingerprintTokenFilter(Builder builder) {
-		super(builder);
-
-		this.maxOutputSize = ApiTypeHelper.requireNonNull(builder.maxOutputSize, this, "maxOutputSize");
-		this.separator = ApiTypeHelper.requireNonNull(builder.separator, this, "separator");
-
-	}
-
-	public static FingerprintTokenFilter of(Function<Builder, ObjectBuilder<FingerprintTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Fingerprint;
-	}
-
-	/**
-	 * Required - API name: {@code max_output_size}
-	 */
-	public final int maxOutputSize() {
-		return this.maxOutputSize;
-	}
-
-	/**
-	 * Required - API name: {@code separator}
-	 */
-	public final String separator() {
-		return this.separator;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "fingerprint");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("max_output_size");
-		generator.write(this.maxOutputSize);
-
-		generator.writeKey("separator");
-		generator.write(this.separator);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FingerprintTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<FingerprintTokenFilter> {
-		private Integer maxOutputSize;
-
-		private String separator;
-
-		/**
-		 * Required - API name: {@code max_output_size}
-		 */
-		public final Builder maxOutputSize(int value) {
-			this.maxOutputSize = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code separator}
-		 */
-		public final Builder separator(String value) {
-			this.separator = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FingerprintTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FingerprintTokenFilter build() {
-			_checkSingleUse();
-
-			return new FingerprintTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FingerprintTokenFilter}
-	 */
-	public static final JsonpDeserializer<FingerprintTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, FingerprintTokenFilter::setupFingerprintTokenFilterDeserializer);
-
-	protected static void setupFingerprintTokenFilterDeserializer(
-			ObjectDeserializer<FingerprintTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::maxOutputSize, JsonpDeserializer.integerDeserializer(), "max_output_size");
-		op.add(Builder::separator, JsonpDeserializer.stringDeserializer(), "separator");
-
-		op.ignore("type");
-	}
+    private final int maxOutputSize;
+
+    private final String separator;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FingerprintTokenFilter(Builder builder) {
+        super(builder);
+
+        this.maxOutputSize = ApiTypeHelper.requireNonNull(builder.maxOutputSize, this, "maxOutputSize");
+        this.separator = ApiTypeHelper.requireNonNull(builder.separator, this, "separator");
+
+    }
+
+    public static FingerprintTokenFilter of(Function<Builder, ObjectBuilder<FingerprintTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Fingerprint;
+    }
+
+    /**
+     * Required - API name: {@code max_output_size}
+     */
+    public final int maxOutputSize() {
+        return this.maxOutputSize;
+    }
+
+    /**
+     * Required - API name: {@code separator}
+     */
+    public final String separator() {
+        return this.separator;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "fingerprint");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("max_output_size");
+        generator.write(this.maxOutputSize);
+
+        generator.writeKey("separator");
+        generator.write(this.separator);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FingerprintTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<FingerprintTokenFilter> {
+        private Integer maxOutputSize;
+
+        private String separator;
+
+        /**
+         * Required - API name: {@code max_output_size}
+         */
+        public final Builder maxOutputSize(int value) {
+            this.maxOutputSize = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code separator}
+         */
+        public final Builder separator(String value) {
+            this.separator = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link FingerprintTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FingerprintTokenFilter build() {
+            _checkSingleUse();
+
+            return new FingerprintTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FingerprintTokenFilter}
+     */
+    public static final JsonpDeserializer<FingerprintTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FingerprintTokenFilter::setupFingerprintTokenFilterDeserializer
+    );
+
+    protected static void setupFingerprintTokenFilterDeserializer(ObjectDeserializer<FingerprintTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::maxOutputSize, JsonpDeserializer.integerDeserializer(), "max_output_size");
+        op.add(Builder::separator, JsonpDeserializer.stringDeserializer(), "separator");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/HtmlStripCharFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/HtmlStripCharFilter.java
index ff40f1aa17..f393286ea2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/HtmlStripCharFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/HtmlStripCharFilter.java
@@ -32,85 +32,84 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.HtmlStripCharFilter
 
 @JsonpDeserializable
 public class HtmlStripCharFilter extends CharFilterBase implements CharFilterDefinitionVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private HtmlStripCharFilter(Builder builder) {
-		super(builder);
+    private HtmlStripCharFilter(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static HtmlStripCharFilter of(Function<Builder, ObjectBuilder<HtmlStripCharFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static HtmlStripCharFilter of(Function<Builder, ObjectBuilder<HtmlStripCharFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * CharFilterDefinition variant kind.
-	 */
-	@Override
-	public CharFilterDefinition.Kind _charFilterDefinitionKind() {
-		return CharFilterDefinition.Kind.HtmlStrip;
-	}
+    /**
+     * CharFilterDefinition variant kind.
+     */
+    @Override
+    public CharFilterDefinition.Kind _charFilterDefinitionKind() {
+        return CharFilterDefinition.Kind.HtmlStrip;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "html_strip");
-		super.serializeInternal(generator, mapper);
+        generator.write("type", "html_strip");
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link HtmlStripCharFilter}.
-	 */
+    /**
+     * Builder for {@link HtmlStripCharFilter}.
+     */
 
-	public static class Builder extends CharFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<HtmlStripCharFilter> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends CharFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<HtmlStripCharFilter> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link HtmlStripCharFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HtmlStripCharFilter build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link HtmlStripCharFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HtmlStripCharFilter build() {
+            _checkSingleUse();
 
-			return new HtmlStripCharFilter(this);
-		}
-	}
+            return new HtmlStripCharFilter(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link HtmlStripCharFilter}
-	 */
-	public static final JsonpDeserializer<HtmlStripCharFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, HtmlStripCharFilter::setupHtmlStripCharFilterDeserializer);
+    /**
+     * Json deserializer for {@link HtmlStripCharFilter}
+     */
+    public static final JsonpDeserializer<HtmlStripCharFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HtmlStripCharFilter::setupHtmlStripCharFilterDeserializer
+    );
 
-	protected static void setupHtmlStripCharFilterDeserializer(ObjectDeserializer<HtmlStripCharFilter.Builder> op) {
-		setupCharFilterBaseDeserializer(op);
+    protected static void setupHtmlStripCharFilterDeserializer(ObjectDeserializer<HtmlStripCharFilter.Builder> op) {
+        setupCharFilterBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/HunspellTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/HunspellTokenFilter.java
index df8c45344f..4f6330bb30 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/HunspellTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/HunspellTokenFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,175 +41,172 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.HunspellTokenFilter
 
-
 @JsonpDeserializable
 public class HunspellTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final boolean dedup;
+    private final boolean dedup;
+
+    private final String dictionary;
 
-	private final String dictionary;
+    private final String locale;
 
-	private final String locale;
+    private final boolean longestOnly;
 
-	private final boolean longestOnly;
+    // ---------------------------------------------------------------------------------------------
 
-	// ---------------------------------------------------------------------------------------------
+    private HunspellTokenFilter(Builder builder) {
+        super(builder);
 
-	private HunspellTokenFilter(Builder builder) {
-		super(builder);
+        this.dedup = ApiTypeHelper.requireNonNull(builder.dedup, this, "dedup");
+        this.dictionary = ApiTypeHelper.requireNonNull(builder.dictionary, this, "dictionary");
+        this.locale = ApiTypeHelper.requireNonNull(builder.locale, this, "locale");
+        this.longestOnly = ApiTypeHelper.requireNonNull(builder.longestOnly, this, "longestOnly");
 
-		this.dedup = ApiTypeHelper.requireNonNull(builder.dedup, this, "dedup");
-		this.dictionary = ApiTypeHelper.requireNonNull(builder.dictionary, this, "dictionary");
-		this.locale = ApiTypeHelper.requireNonNull(builder.locale, this, "locale");
-		this.longestOnly = ApiTypeHelper.requireNonNull(builder.longestOnly, this, "longestOnly");
-
-	}
-
-	public static HunspellTokenFilter of(Function<Builder, ObjectBuilder<HunspellTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Hunspell;
-	}
-
-	/**
-	 * Required - API name: {@code dedup}
-	 */
-	public final boolean dedup() {
-		return this.dedup;
-	}
-
-	/**
-	 * Required - API name: {@code dictionary}
-	 */
-	public final String dictionary() {
-		return this.dictionary;
-	}
-
-	/**
-	 * Required - API name: {@code locale}
-	 */
-	public final String locale() {
-		return this.locale;
-	}
-
-	/**
-	 * Required - API name: {@code longest_only}
-	 */
-	public final boolean longestOnly() {
-		return this.longestOnly;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "hunspell");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("dedup");
-		generator.write(this.dedup);
-
-		generator.writeKey("dictionary");
-		generator.write(this.dictionary);
-
-		generator.writeKey("locale");
-		generator.write(this.locale);
-
-		generator.writeKey("longest_only");
-		generator.write(this.longestOnly);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HunspellTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<HunspellTokenFilter> {
-		private Boolean dedup;
-
-		private String dictionary;
-
-		private String locale;
-
-		private Boolean longestOnly;
-
-		/**
-		 * Required - API name: {@code dedup}
-		 */
-		public final Builder dedup(boolean value) {
-			this.dedup = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code dictionary}
-		 */
-		public final Builder dictionary(String value) {
-			this.dictionary = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code locale}
-		 */
-		public final Builder locale(String value) {
-			this.locale = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code longest_only}
-		 */
-		public final Builder longestOnly(boolean value) {
-			this.longestOnly = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HunspellTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HunspellTokenFilter build() {
-			_checkSingleUse();
-
-			return new HunspellTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HunspellTokenFilter}
-	 */
-	public static final JsonpDeserializer<HunspellTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, HunspellTokenFilter::setupHunspellTokenFilterDeserializer);
-
-	protected static void setupHunspellTokenFilterDeserializer(ObjectDeserializer<HunspellTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::dedup, JsonpDeserializer.booleanDeserializer(), "dedup");
-		op.add(Builder::dictionary, JsonpDeserializer.stringDeserializer(), "dictionary");
-		op.add(Builder::locale, JsonpDeserializer.stringDeserializer(), "locale");
-		op.add(Builder::longestOnly, JsonpDeserializer.booleanDeserializer(), "longest_only");
-
-		op.ignore("type");
-	}
+    }
+
+    public static HunspellTokenFilter of(Function<Builder, ObjectBuilder<HunspellTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Hunspell;
+    }
+
+    /**
+     * Required - API name: {@code dedup}
+     */
+    public final boolean dedup() {
+        return this.dedup;
+    }
+
+    /**
+     * Required - API name: {@code dictionary}
+     */
+    public final String dictionary() {
+        return this.dictionary;
+    }
+
+    /**
+     * Required - API name: {@code locale}
+     */
+    public final String locale() {
+        return this.locale;
+    }
+
+    /**
+     * Required - API name: {@code longest_only}
+     */
+    public final boolean longestOnly() {
+        return this.longestOnly;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "hunspell");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("dedup");
+        generator.write(this.dedup);
+
+        generator.writeKey("dictionary");
+        generator.write(this.dictionary);
+
+        generator.writeKey("locale");
+        generator.write(this.locale);
+
+        generator.writeKey("longest_only");
+        generator.write(this.longestOnly);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HunspellTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<HunspellTokenFilter> {
+        private Boolean dedup;
+
+        private String dictionary;
+
+        private String locale;
+
+        private Boolean longestOnly;
+
+        /**
+         * Required - API name: {@code dedup}
+         */
+        public final Builder dedup(boolean value) {
+            this.dedup = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code dictionary}
+         */
+        public final Builder dictionary(String value) {
+            this.dictionary = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code locale}
+         */
+        public final Builder locale(String value) {
+            this.locale = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code longest_only}
+         */
+        public final Builder longestOnly(boolean value) {
+            this.longestOnly = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link HunspellTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HunspellTokenFilter build() {
+            _checkSingleUse();
+
+            return new HunspellTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HunspellTokenFilter}
+     */
+    public static final JsonpDeserializer<HunspellTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HunspellTokenFilter::setupHunspellTokenFilterDeserializer
+    );
+
+    protected static void setupHunspellTokenFilterDeserializer(ObjectDeserializer<HunspellTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::dedup, JsonpDeserializer.booleanDeserializer(), "dedup");
+        op.add(Builder::dictionary, JsonpDeserializer.stringDeserializer(), "dictionary");
+        op.add(Builder::locale, JsonpDeserializer.stringDeserializer(), "locale");
+        op.add(Builder::longestOnly, JsonpDeserializer.booleanDeserializer(), "longest_only");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/HyphenationDecompounderTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/HyphenationDecompounderTokenFilter.java
index 7e6cd5c41c..4b996643aa 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/HyphenationDecompounderTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/HyphenationDecompounderTokenFilter.java
@@ -32,91 +32,88 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.HyphenationDecompounderTokenFilter
 
-
 @JsonpDeserializable
-public class HyphenationDecompounderTokenFilter extends CompoundWordTokenFilterBase
-		implements
-			TokenFilterDefinitionVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private HyphenationDecompounderTokenFilter(Builder builder) {
-		super(builder);
-
-	}
-
-	public static HyphenationDecompounderTokenFilter of(
-			Function<Builder, ObjectBuilder<HyphenationDecompounderTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.HyphenationDecompounder;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "hyphenation_decompounder");
-		super.serializeInternal(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HyphenationDecompounderTokenFilter}.
-	 */
-
-	public static class Builder extends CompoundWordTokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<HyphenationDecompounderTokenFilter> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HyphenationDecompounderTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HyphenationDecompounderTokenFilter build() {
-			_checkSingleUse();
-
-			return new HyphenationDecompounderTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HyphenationDecompounderTokenFilter}
-	 */
-	public static final JsonpDeserializer<HyphenationDecompounderTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new,
-					HyphenationDecompounderTokenFilter::setupHyphenationDecompounderTokenFilterDeserializer);
-
-	protected static void setupHyphenationDecompounderTokenFilterDeserializer(
-			ObjectDeserializer<HyphenationDecompounderTokenFilter.Builder> op) {
-		setupCompoundWordTokenFilterBaseDeserializer(op);
-
-		op.ignore("type");
-	}
+public class HyphenationDecompounderTokenFilter extends CompoundWordTokenFilterBase implements TokenFilterDefinitionVariant {
+    // ---------------------------------------------------------------------------------------------
+
+    private HyphenationDecompounderTokenFilter(Builder builder) {
+        super(builder);
+
+    }
+
+    public static HyphenationDecompounderTokenFilter of(Function<Builder, ObjectBuilder<HyphenationDecompounderTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.HyphenationDecompounder;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "hyphenation_decompounder");
+        super.serializeInternal(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HyphenationDecompounderTokenFilter}.
+     */
+
+    public static class Builder extends CompoundWordTokenFilterBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<HyphenationDecompounderTokenFilter> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link HyphenationDecompounderTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HyphenationDecompounderTokenFilter build() {
+            _checkSingleUse();
+
+            return new HyphenationDecompounderTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HyphenationDecompounderTokenFilter}
+     */
+    public static final JsonpDeserializer<HyphenationDecompounderTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HyphenationDecompounderTokenFilter::setupHyphenationDecompounderTokenFilterDeserializer
+    );
+
+    protected static void setupHyphenationDecompounderTokenFilterDeserializer(
+        ObjectDeserializer<HyphenationDecompounderTokenFilter.Builder> op
+    ) {
+        setupCompoundWordTokenFilterBaseDeserializer(op);
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuAnalyzer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuAnalyzer.java
index b81e88c5fa..a93c09dc1b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuAnalyzer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuAnalyzer.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,128 +43,126 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.IcuAnalyzer
 
-
 @JsonpDeserializable
 public class IcuAnalyzer implements AnalyzerVariant, JsonpSerializable {
-	private final IcuNormalizationType method;
-
-	private final IcuNormalizationMode mode;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IcuAnalyzer(Builder builder) {
-
-		this.method = ApiTypeHelper.requireNonNull(builder.method, this, "method");
-		this.mode = ApiTypeHelper.requireNonNull(builder.mode, this, "mode");
-
-	}
-
-	public static IcuAnalyzer of(Function<Builder, ObjectBuilder<IcuAnalyzer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Analyzer variant kind.
-	 */
-	@Override
-	public Analyzer.Kind _analyzerKind() {
-		return Analyzer.Kind.IcuAnalyzer;
-	}
-
-	/**
-	 * Required - API name: {@code method}
-	 */
-	public final IcuNormalizationType method() {
-		return this.method;
-	}
-
-	/**
-	 * Required - API name: {@code mode}
-	 */
-	public final IcuNormalizationMode mode() {
-		return this.mode;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "icu_analyzer");
-
-		generator.writeKey("method");
-		this.method.serialize(generator, mapper);
-		generator.writeKey("mode");
-		this.mode.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IcuAnalyzer}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IcuAnalyzer> {
-		private IcuNormalizationType method;
-
-		private IcuNormalizationMode mode;
-
-		/**
-		 * Required - API name: {@code method}
-		 */
-		public final Builder method(IcuNormalizationType value) {
-			this.method = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mode}
-		 */
-		public final Builder mode(IcuNormalizationMode value) {
-			this.mode = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IcuAnalyzer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IcuAnalyzer build() {
-			_checkSingleUse();
-
-			return new IcuAnalyzer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IcuAnalyzer}
-	 */
-	public static final JsonpDeserializer<IcuAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IcuAnalyzer::setupIcuAnalyzerDeserializer);
-
-	protected static void setupIcuAnalyzerDeserializer(ObjectDeserializer<IcuAnalyzer.Builder> op) {
-
-		op.add(Builder::method, IcuNormalizationType._DESERIALIZER, "method");
-		op.add(Builder::mode, IcuNormalizationMode._DESERIALIZER, "mode");
-
-		op.ignore("type");
-	}
+    private final IcuNormalizationType method;
+
+    private final IcuNormalizationMode mode;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IcuAnalyzer(Builder builder) {
+
+        this.method = ApiTypeHelper.requireNonNull(builder.method, this, "method");
+        this.mode = ApiTypeHelper.requireNonNull(builder.mode, this, "mode");
+
+    }
+
+    public static IcuAnalyzer of(Function<Builder, ObjectBuilder<IcuAnalyzer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Analyzer variant kind.
+     */
+    @Override
+    public Analyzer.Kind _analyzerKind() {
+        return Analyzer.Kind.IcuAnalyzer;
+    }
+
+    /**
+     * Required - API name: {@code method}
+     */
+    public final IcuNormalizationType method() {
+        return this.method;
+    }
+
+    /**
+     * Required - API name: {@code mode}
+     */
+    public final IcuNormalizationMode mode() {
+        return this.mode;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "icu_analyzer");
+
+        generator.writeKey("method");
+        this.method.serialize(generator, mapper);
+        generator.writeKey("mode");
+        this.mode.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IcuAnalyzer}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IcuAnalyzer> {
+        private IcuNormalizationType method;
+
+        private IcuNormalizationMode mode;
+
+        /**
+         * Required - API name: {@code method}
+         */
+        public final Builder method(IcuNormalizationType value) {
+            this.method = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mode}
+         */
+        public final Builder mode(IcuNormalizationMode value) {
+            this.mode = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link IcuAnalyzer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IcuAnalyzer build() {
+            _checkSingleUse();
+
+            return new IcuAnalyzer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IcuAnalyzer}
+     */
+    public static final JsonpDeserializer<IcuAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IcuAnalyzer::setupIcuAnalyzerDeserializer
+    );
+
+    protected static void setupIcuAnalyzerDeserializer(ObjectDeserializer<IcuAnalyzer.Builder> op) {
+
+        op.add(Builder::method, IcuNormalizationType._DESERIALIZER, "method");
+        op.add(Builder::mode, IcuNormalizationMode._DESERIALIZER, "mode");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationAlternate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationAlternate.java
index e7400b4bd3..21f8aa37a8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationAlternate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationAlternate.java
@@ -37,22 +37,23 @@
 
 @JsonpDeserializable
 public enum IcuCollationAlternate implements JsonEnum {
-	Shifted("shifted"),
+    Shifted("shifted"),
 
-	NonIgnorable("non-ignorable"),
+    NonIgnorable("non-ignorable"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	IcuCollationAlternate(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    IcuCollationAlternate(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<IcuCollationAlternate> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			IcuCollationAlternate.values());
+    public static final JsonEnum.Deserializer<IcuCollationAlternate> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        IcuCollationAlternate.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationCaseFirst.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationCaseFirst.java
index aafbfaa7ed..ed01016a18 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationCaseFirst.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationCaseFirst.java
@@ -37,22 +37,23 @@
 
 @JsonpDeserializable
 public enum IcuCollationCaseFirst implements JsonEnum {
-	Lower("lower"),
+    Lower("lower"),
 
-	Upper("upper"),
+    Upper("upper"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	IcuCollationCaseFirst(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    IcuCollationCaseFirst(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<IcuCollationCaseFirst> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			IcuCollationCaseFirst.values());
+    public static final JsonEnum.Deserializer<IcuCollationCaseFirst> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        IcuCollationCaseFirst.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationDecomposition.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationDecomposition.java
index e926dce81b..a6b5e0cfc4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationDecomposition.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationDecomposition.java
@@ -35,25 +35,25 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum IcuCollationDecomposition implements JsonEnum {
-	No("no"),
+    No("no"),
 
-	Identical("identical"),
+    Identical("identical"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	IcuCollationDecomposition(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    IcuCollationDecomposition(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<IcuCollationDecomposition> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			IcuCollationDecomposition.values());
+    public static final JsonEnum.Deserializer<IcuCollationDecomposition> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        IcuCollationDecomposition.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationStrength.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationStrength.java
index 1ef23d9506..bca73489cd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationStrength.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationStrength.java
@@ -37,28 +37,29 @@
 
 @JsonpDeserializable
 public enum IcuCollationStrength implements JsonEnum {
-	Primary("primary"),
+    Primary("primary"),
 
-	Secondary("secondary"),
+    Secondary("secondary"),
 
-	Tertiary("tertiary"),
+    Tertiary("tertiary"),
 
-	Quaternary("quaternary"),
+    Quaternary("quaternary"),
 
-	Identical("identical"),
+    Identical("identical"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	IcuCollationStrength(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    IcuCollationStrength(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<IcuCollationStrength> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			IcuCollationStrength.values());
+    public static final JsonEnum.Deserializer<IcuCollationStrength> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        IcuCollationStrength.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationTokenFilter.java
index 0396ad5122..f12d7343e3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuCollationTokenFilter.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,346 +42,341 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.IcuCollationTokenFilter
 
 @JsonpDeserializable
 public class IcuCollationTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final IcuCollationAlternate alternate;
-
-	private final IcuCollationCaseFirst casefirst;
-
-	private final boolean caselevel;
-
-	private final String country;
-
-	private final IcuCollationDecomposition decomposition;
-
-	private final boolean hiraganaquaternarymode;
-
-	private final String language;
-
-	private final boolean numeric;
-
-	private final IcuCollationStrength strength;
-
-	@Nullable
-	private final String variabletop;
-
-	private final String variant;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IcuCollationTokenFilter(Builder builder) {
-		super(builder);
-
-		this.alternate = ApiTypeHelper.requireNonNull(builder.alternate, this, "alternate");
-		this.casefirst = ApiTypeHelper.requireNonNull(builder.casefirst, this, "casefirst");
-		this.caselevel = ApiTypeHelper.requireNonNull(builder.caselevel, this, "caselevel");
-		this.country = ApiTypeHelper.requireNonNull(builder.country, this, "country");
-		this.decomposition = ApiTypeHelper.requireNonNull(builder.decomposition, this, "decomposition");
-		this.hiraganaquaternarymode = ApiTypeHelper.requireNonNull(builder.hiraganaquaternarymode, this,
-				"hiraganaquaternarymode");
-		this.language = ApiTypeHelper.requireNonNull(builder.language, this, "language");
-		this.numeric = ApiTypeHelper.requireNonNull(builder.numeric, this, "numeric");
-		this.strength = ApiTypeHelper.requireNonNull(builder.strength, this, "strength");
-		this.variabletop = builder.variabletop;
-		this.variant = ApiTypeHelper.requireNonNull(builder.variant, this, "variant");
-
-	}
-
-	public static IcuCollationTokenFilter of(Function<Builder, ObjectBuilder<IcuCollationTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.IcuCollation;
-	}
-
-	/**
-	 * Required - API name: {@code alternate}
-	 */
-	public final IcuCollationAlternate alternate() {
-		return this.alternate;
-	}
-
-	/**
-	 * Required - API name: {@code caseFirst}
-	 */
-	public final IcuCollationCaseFirst casefirst() {
-		return this.casefirst;
-	}
-
-	/**
-	 * Required - API name: {@code caseLevel}
-	 */
-	public final boolean caselevel() {
-		return this.caselevel;
-	}
-
-	/**
-	 * Required - API name: {@code country}
-	 */
-	public final String country() {
-		return this.country;
-	}
-
-	/**
-	 * Required - API name: {@code decomposition}
-	 */
-	public final IcuCollationDecomposition decomposition() {
-		return this.decomposition;
-	}
-
-	/**
-	 * Required - API name: {@code hiraganaQuaternaryMode}
-	 */
-	public final boolean hiraganaquaternarymode() {
-		return this.hiraganaquaternarymode;
-	}
-
-	/**
-	 * Required - API name: {@code language}
-	 */
-	public final String language() {
-		return this.language;
-	}
-
-	/**
-	 * Required - API name: {@code numeric}
-	 */
-	public final boolean numeric() {
-		return this.numeric;
-	}
-
-	/**
-	 * Required - API name: {@code strength}
-	 */
-	public final IcuCollationStrength strength() {
-		return this.strength;
-	}
-
-	/**
-	 * API name: {@code variableTop}
-	 */
-	@Nullable
-	public final String variabletop() {
-		return this.variabletop;
-	}
-
-	/**
-	 * Required - API name: {@code variant}
-	 */
-	public final String variant() {
-		return this.variant;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "icu_collation");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("alternate");
-		this.alternate.serialize(generator, mapper);
-		generator.writeKey("caseFirst");
-		this.casefirst.serialize(generator, mapper);
-		generator.writeKey("caseLevel");
-		generator.write(this.caselevel);
-
-		generator.writeKey("country");
-		generator.write(this.country);
-
-		generator.writeKey("decomposition");
-		this.decomposition.serialize(generator, mapper);
-		generator.writeKey("hiraganaQuaternaryMode");
-		generator.write(this.hiraganaquaternarymode);
-
-		generator.writeKey("language");
-		generator.write(this.language);
-
-		generator.writeKey("numeric");
-		generator.write(this.numeric);
-
-		generator.writeKey("strength");
-		this.strength.serialize(generator, mapper);
-		if (this.variabletop != null) {
-			generator.writeKey("variableTop");
-			generator.write(this.variabletop);
-
-		}
-		generator.writeKey("variant");
-		generator.write(this.variant);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IcuCollationTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<IcuCollationTokenFilter> {
-		private IcuCollationAlternate alternate;
-
-		private IcuCollationCaseFirst casefirst;
-
-		private Boolean caselevel;
-
-		private String country;
-
-		private IcuCollationDecomposition decomposition;
-
-		private Boolean hiraganaquaternarymode;
-
-		private String language;
-
-		private Boolean numeric;
-
-		private IcuCollationStrength strength;
-
-		@Nullable
-		private String variabletop;
-
-		private String variant;
-
-		/**
-		 * Required - API name: {@code alternate}
-		 */
-		public final Builder alternate(IcuCollationAlternate value) {
-			this.alternate = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code caseFirst}
-		 */
-		public final Builder casefirst(IcuCollationCaseFirst value) {
-			this.casefirst = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code caseLevel}
-		 */
-		public final Builder caselevel(boolean value) {
-			this.caselevel = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code country}
-		 */
-		public final Builder country(String value) {
-			this.country = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code decomposition}
-		 */
-		public final Builder decomposition(IcuCollationDecomposition value) {
-			this.decomposition = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code hiraganaQuaternaryMode}
-		 */
-		public final Builder hiraganaquaternarymode(boolean value) {
-			this.hiraganaquaternarymode = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code language}
-		 */
-		public final Builder language(String value) {
-			this.language = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code numeric}
-		 */
-		public final Builder numeric(boolean value) {
-			this.numeric = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code strength}
-		 */
-		public final Builder strength(IcuCollationStrength value) {
-			this.strength = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code variableTop}
-		 */
-		public final Builder variabletop(@Nullable String value) {
-			this.variabletop = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code variant}
-		 */
-		public final Builder variant(String value) {
-			this.variant = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IcuCollationTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IcuCollationTokenFilter build() {
-			_checkSingleUse();
-
-			return new IcuCollationTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IcuCollationTokenFilter}
-	 */
-	public static final JsonpDeserializer<IcuCollationTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IcuCollationTokenFilter::setupIcuCollationTokenFilterDeserializer);
-
-	protected static void setupIcuCollationTokenFilterDeserializer(
-			ObjectDeserializer<IcuCollationTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::alternate, IcuCollationAlternate._DESERIALIZER, "alternate");
-		op.add(Builder::casefirst, IcuCollationCaseFirst._DESERIALIZER, "caseFirst");
-		op.add(Builder::caselevel, JsonpDeserializer.booleanDeserializer(), "caseLevel");
-		op.add(Builder::country, JsonpDeserializer.stringDeserializer(), "country");
-		op.add(Builder::decomposition, IcuCollationDecomposition._DESERIALIZER, "decomposition");
-		op.add(Builder::hiraganaquaternarymode, JsonpDeserializer.booleanDeserializer(), "hiraganaQuaternaryMode");
-		op.add(Builder::language, JsonpDeserializer.stringDeserializer(), "language");
-		op.add(Builder::numeric, JsonpDeserializer.booleanDeserializer(), "numeric");
-		op.add(Builder::strength, IcuCollationStrength._DESERIALIZER, "strength");
-		op.add(Builder::variabletop, JsonpDeserializer.stringDeserializer(), "variableTop");
-		op.add(Builder::variant, JsonpDeserializer.stringDeserializer(), "variant");
-
-		op.ignore("type");
-	}
+    private final IcuCollationAlternate alternate;
+
+    private final IcuCollationCaseFirst casefirst;
+
+    private final boolean caselevel;
+
+    private final String country;
+
+    private final IcuCollationDecomposition decomposition;
+
+    private final boolean hiraganaquaternarymode;
+
+    private final String language;
+
+    private final boolean numeric;
+
+    private final IcuCollationStrength strength;
+
+    @Nullable
+    private final String variabletop;
+
+    private final String variant;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IcuCollationTokenFilter(Builder builder) {
+        super(builder);
+
+        this.alternate = ApiTypeHelper.requireNonNull(builder.alternate, this, "alternate");
+        this.casefirst = ApiTypeHelper.requireNonNull(builder.casefirst, this, "casefirst");
+        this.caselevel = ApiTypeHelper.requireNonNull(builder.caselevel, this, "caselevel");
+        this.country = ApiTypeHelper.requireNonNull(builder.country, this, "country");
+        this.decomposition = ApiTypeHelper.requireNonNull(builder.decomposition, this, "decomposition");
+        this.hiraganaquaternarymode = ApiTypeHelper.requireNonNull(builder.hiraganaquaternarymode, this, "hiraganaquaternarymode");
+        this.language = ApiTypeHelper.requireNonNull(builder.language, this, "language");
+        this.numeric = ApiTypeHelper.requireNonNull(builder.numeric, this, "numeric");
+        this.strength = ApiTypeHelper.requireNonNull(builder.strength, this, "strength");
+        this.variabletop = builder.variabletop;
+        this.variant = ApiTypeHelper.requireNonNull(builder.variant, this, "variant");
+
+    }
+
+    public static IcuCollationTokenFilter of(Function<Builder, ObjectBuilder<IcuCollationTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.IcuCollation;
+    }
+
+    /**
+     * Required - API name: {@code alternate}
+     */
+    public final IcuCollationAlternate alternate() {
+        return this.alternate;
+    }
+
+    /**
+     * Required - API name: {@code caseFirst}
+     */
+    public final IcuCollationCaseFirst casefirst() {
+        return this.casefirst;
+    }
+
+    /**
+     * Required - API name: {@code caseLevel}
+     */
+    public final boolean caselevel() {
+        return this.caselevel;
+    }
+
+    /**
+     * Required - API name: {@code country}
+     */
+    public final String country() {
+        return this.country;
+    }
+
+    /**
+     * Required - API name: {@code decomposition}
+     */
+    public final IcuCollationDecomposition decomposition() {
+        return this.decomposition;
+    }
+
+    /**
+     * Required - API name: {@code hiraganaQuaternaryMode}
+     */
+    public final boolean hiraganaquaternarymode() {
+        return this.hiraganaquaternarymode;
+    }
+
+    /**
+     * Required - API name: {@code language}
+     */
+    public final String language() {
+        return this.language;
+    }
+
+    /**
+     * Required - API name: {@code numeric}
+     */
+    public final boolean numeric() {
+        return this.numeric;
+    }
+
+    /**
+     * Required - API name: {@code strength}
+     */
+    public final IcuCollationStrength strength() {
+        return this.strength;
+    }
+
+    /**
+     * API name: {@code variableTop}
+     */
+    @Nullable
+    public final String variabletop() {
+        return this.variabletop;
+    }
+
+    /**
+     * Required - API name: {@code variant}
+     */
+    public final String variant() {
+        return this.variant;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "icu_collation");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("alternate");
+        this.alternate.serialize(generator, mapper);
+        generator.writeKey("caseFirst");
+        this.casefirst.serialize(generator, mapper);
+        generator.writeKey("caseLevel");
+        generator.write(this.caselevel);
+
+        generator.writeKey("country");
+        generator.write(this.country);
+
+        generator.writeKey("decomposition");
+        this.decomposition.serialize(generator, mapper);
+        generator.writeKey("hiraganaQuaternaryMode");
+        generator.write(this.hiraganaquaternarymode);
+
+        generator.writeKey("language");
+        generator.write(this.language);
+
+        generator.writeKey("numeric");
+        generator.write(this.numeric);
+
+        generator.writeKey("strength");
+        this.strength.serialize(generator, mapper);
+        if (this.variabletop != null) {
+            generator.writeKey("variableTop");
+            generator.write(this.variabletop);
+
+        }
+        generator.writeKey("variant");
+        generator.write(this.variant);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IcuCollationTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<IcuCollationTokenFilter> {
+        private IcuCollationAlternate alternate;
+
+        private IcuCollationCaseFirst casefirst;
+
+        private Boolean caselevel;
+
+        private String country;
+
+        private IcuCollationDecomposition decomposition;
+
+        private Boolean hiraganaquaternarymode;
+
+        private String language;
+
+        private Boolean numeric;
+
+        private IcuCollationStrength strength;
+
+        @Nullable
+        private String variabletop;
+
+        private String variant;
+
+        /**
+         * Required - API name: {@code alternate}
+         */
+        public final Builder alternate(IcuCollationAlternate value) {
+            this.alternate = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code caseFirst}
+         */
+        public final Builder casefirst(IcuCollationCaseFirst value) {
+            this.casefirst = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code caseLevel}
+         */
+        public final Builder caselevel(boolean value) {
+            this.caselevel = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code country}
+         */
+        public final Builder country(String value) {
+            this.country = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code decomposition}
+         */
+        public final Builder decomposition(IcuCollationDecomposition value) {
+            this.decomposition = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code hiraganaQuaternaryMode}
+         */
+        public final Builder hiraganaquaternarymode(boolean value) {
+            this.hiraganaquaternarymode = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code language}
+         */
+        public final Builder language(String value) {
+            this.language = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code numeric}
+         */
+        public final Builder numeric(boolean value) {
+            this.numeric = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code strength}
+         */
+        public final Builder strength(IcuCollationStrength value) {
+            this.strength = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code variableTop}
+         */
+        public final Builder variabletop(@Nullable String value) {
+            this.variabletop = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code variant}
+         */
+        public final Builder variant(String value) {
+            this.variant = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link IcuCollationTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IcuCollationTokenFilter build() {
+            _checkSingleUse();
+
+            return new IcuCollationTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IcuCollationTokenFilter}
+     */
+    public static final JsonpDeserializer<IcuCollationTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IcuCollationTokenFilter::setupIcuCollationTokenFilterDeserializer
+    );
+
+    protected static void setupIcuCollationTokenFilterDeserializer(ObjectDeserializer<IcuCollationTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::alternate, IcuCollationAlternate._DESERIALIZER, "alternate");
+        op.add(Builder::casefirst, IcuCollationCaseFirst._DESERIALIZER, "caseFirst");
+        op.add(Builder::caselevel, JsonpDeserializer.booleanDeserializer(), "caseLevel");
+        op.add(Builder::country, JsonpDeserializer.stringDeserializer(), "country");
+        op.add(Builder::decomposition, IcuCollationDecomposition._DESERIALIZER, "decomposition");
+        op.add(Builder::hiraganaquaternarymode, JsonpDeserializer.booleanDeserializer(), "hiraganaQuaternaryMode");
+        op.add(Builder::language, JsonpDeserializer.stringDeserializer(), "language");
+        op.add(Builder::numeric, JsonpDeserializer.booleanDeserializer(), "numeric");
+        op.add(Builder::strength, IcuCollationStrength._DESERIALIZER, "strength");
+        op.add(Builder::variabletop, JsonpDeserializer.stringDeserializer(), "variableTop");
+        op.add(Builder::variant, JsonpDeserializer.stringDeserializer(), "variant");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuFoldingTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuFoldingTokenFilter.java
index d802a2ac6d..92bf1cb336 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuFoldingTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuFoldingTokenFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,102 +41,100 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.IcuFoldingTokenFilter
 
 @JsonpDeserializable
 public class IcuFoldingTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final String unicodeSetFilter;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IcuFoldingTokenFilter(Builder builder) {
-		super(builder);
-
-		this.unicodeSetFilter = ApiTypeHelper.requireNonNull(builder.unicodeSetFilter, this, "unicodeSetFilter");
-
-	}
-
-	public static IcuFoldingTokenFilter of(Function<Builder, ObjectBuilder<IcuFoldingTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.IcuFolding;
-	}
-
-	/**
-	 * Required - API name: {@code unicode_set_filter}
-	 */
-	public final String unicodeSetFilter() {
-		return this.unicodeSetFilter;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "icu_folding");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("unicode_set_filter");
-		generator.write(this.unicodeSetFilter);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IcuFoldingTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<IcuFoldingTokenFilter> {
-		private String unicodeSetFilter;
-
-		/**
-		 * Required - API name: {@code unicode_set_filter}
-		 */
-		public final Builder unicodeSetFilter(String value) {
-			this.unicodeSetFilter = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IcuFoldingTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IcuFoldingTokenFilter build() {
-			_checkSingleUse();
-
-			return new IcuFoldingTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IcuFoldingTokenFilter}
-	 */
-	public static final JsonpDeserializer<IcuFoldingTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IcuFoldingTokenFilter::setupIcuFoldingTokenFilterDeserializer);
-
-	protected static void setupIcuFoldingTokenFilterDeserializer(ObjectDeserializer<IcuFoldingTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::unicodeSetFilter, JsonpDeserializer.stringDeserializer(), "unicode_set_filter");
-
-		op.ignore("type");
-	}
+    private final String unicodeSetFilter;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IcuFoldingTokenFilter(Builder builder) {
+        super(builder);
+
+        this.unicodeSetFilter = ApiTypeHelper.requireNonNull(builder.unicodeSetFilter, this, "unicodeSetFilter");
+
+    }
+
+    public static IcuFoldingTokenFilter of(Function<Builder, ObjectBuilder<IcuFoldingTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.IcuFolding;
+    }
+
+    /**
+     * Required - API name: {@code unicode_set_filter}
+     */
+    public final String unicodeSetFilter() {
+        return this.unicodeSetFilter;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "icu_folding");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("unicode_set_filter");
+        generator.write(this.unicodeSetFilter);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IcuFoldingTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<IcuFoldingTokenFilter> {
+        private String unicodeSetFilter;
+
+        /**
+         * Required - API name: {@code unicode_set_filter}
+         */
+        public final Builder unicodeSetFilter(String value) {
+            this.unicodeSetFilter = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link IcuFoldingTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IcuFoldingTokenFilter build() {
+            _checkSingleUse();
+
+            return new IcuFoldingTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IcuFoldingTokenFilter}
+     */
+    public static final JsonpDeserializer<IcuFoldingTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IcuFoldingTokenFilter::setupIcuFoldingTokenFilterDeserializer
+    );
+
+    protected static void setupIcuFoldingTokenFilterDeserializer(ObjectDeserializer<IcuFoldingTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::unicodeSetFilter, JsonpDeserializer.stringDeserializer(), "unicode_set_filter");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationCharFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationCharFilter.java
index e79c103c6b..944d4e294e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationCharFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationCharFilter.java
@@ -32,144 +32,142 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.IcuNormalizationCharFilter
 
 @JsonpDeserializable
 public class IcuNormalizationCharFilter extends CharFilterBase implements CharFilterDefinitionVariant {
-	@Nullable
-	private final IcuNormalizationMode mode;
-
-	@Nullable
-	private final IcuNormalizationType name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IcuNormalizationCharFilter(Builder builder) {
-		super(builder);
-
-		this.mode = builder.mode;
-		this.name = builder.name;
-
-	}
-
-	public static IcuNormalizationCharFilter of(Function<Builder, ObjectBuilder<IcuNormalizationCharFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * CharFilterDefinition variant kind.
-	 */
-	@Override
-	public CharFilterDefinition.Kind _charFilterDefinitionKind() {
-		return CharFilterDefinition.Kind.IcuNormalizer;
-	}
-
-	/**
-	 * API name: {@code mode}
-	 */
-	@Nullable
-	public final IcuNormalizationMode mode() {
-		return this.mode;
-	}
-
-	/**
-	 * API name: {@code name}
-	 */
-	@Nullable
-	public final IcuNormalizationType name() {
-		return this.name;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "icu_normalizer");
-		super.serializeInternal(generator, mapper);
-		if (this.mode != null) {
-			generator.writeKey("mode");
-			this.mode.serialize(generator, mapper);
-		}
-		if (this.name != null) {
-			generator.writeKey("name");
-			this.name.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IcuNormalizationCharFilter}.
-	 */
-
-	public static class Builder extends CharFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<IcuNormalizationCharFilter> {
-		@Nullable
-		private IcuNormalizationMode mode;
-
-		@Nullable
-		private IcuNormalizationType name;
-
-		/**
-		 * API name: {@code mode}
-		 */
-		public final Builder mode(@Nullable IcuNormalizationMode value) {
-			this.mode = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code name}
-		 */
-		public final Builder name(@Nullable IcuNormalizationType value) {
-			this.name = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IcuNormalizationCharFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IcuNormalizationCharFilter build() {
-			_checkSingleUse();
-
-			return new IcuNormalizationCharFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IcuNormalizationCharFilter}
-	 */
-	public static final JsonpDeserializer<IcuNormalizationCharFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IcuNormalizationCharFilter::setupIcuNormalizationCharFilterDeserializer);
-
-	protected static void setupIcuNormalizationCharFilterDeserializer(
-			ObjectDeserializer<IcuNormalizationCharFilter.Builder> op) {
-		setupCharFilterBaseDeserializer(op);
-		op.add(Builder::mode, IcuNormalizationMode._DESERIALIZER, "mode");
-		op.add(Builder::name, IcuNormalizationType._DESERIALIZER, "name");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final IcuNormalizationMode mode;
+
+    @Nullable
+    private final IcuNormalizationType name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IcuNormalizationCharFilter(Builder builder) {
+        super(builder);
+
+        this.mode = builder.mode;
+        this.name = builder.name;
+
+    }
+
+    public static IcuNormalizationCharFilter of(Function<Builder, ObjectBuilder<IcuNormalizationCharFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * CharFilterDefinition variant kind.
+     */
+    @Override
+    public CharFilterDefinition.Kind _charFilterDefinitionKind() {
+        return CharFilterDefinition.Kind.IcuNormalizer;
+    }
+
+    /**
+     * API name: {@code mode}
+     */
+    @Nullable
+    public final IcuNormalizationMode mode() {
+        return this.mode;
+    }
+
+    /**
+     * API name: {@code name}
+     */
+    @Nullable
+    public final IcuNormalizationType name() {
+        return this.name;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "icu_normalizer");
+        super.serializeInternal(generator, mapper);
+        if (this.mode != null) {
+            generator.writeKey("mode");
+            this.mode.serialize(generator, mapper);
+        }
+        if (this.name != null) {
+            generator.writeKey("name");
+            this.name.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IcuNormalizationCharFilter}.
+     */
+
+    public static class Builder extends CharFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<IcuNormalizationCharFilter> {
+        @Nullable
+        private IcuNormalizationMode mode;
+
+        @Nullable
+        private IcuNormalizationType name;
+
+        /**
+         * API name: {@code mode}
+         */
+        public final Builder mode(@Nullable IcuNormalizationMode value) {
+            this.mode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code name}
+         */
+        public final Builder name(@Nullable IcuNormalizationType value) {
+            this.name = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link IcuNormalizationCharFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IcuNormalizationCharFilter build() {
+            _checkSingleUse();
+
+            return new IcuNormalizationCharFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IcuNormalizationCharFilter}
+     */
+    public static final JsonpDeserializer<IcuNormalizationCharFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IcuNormalizationCharFilter::setupIcuNormalizationCharFilterDeserializer
+    );
+
+    protected static void setupIcuNormalizationCharFilterDeserializer(ObjectDeserializer<IcuNormalizationCharFilter.Builder> op) {
+        setupCharFilterBaseDeserializer(op);
+        op.add(Builder::mode, IcuNormalizationMode._DESERIALIZER, "mode");
+        op.add(Builder::name, IcuNormalizationType._DESERIALIZER, "name");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationMode.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationMode.java
index f875c5ba96..bde114d68f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationMode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationMode.java
@@ -35,25 +35,25 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum IcuNormalizationMode implements JsonEnum {
-	Decompose("decompose"),
+    Decompose("decompose"),
 
-	Compose("compose"),
+    Compose("compose"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	IcuNormalizationMode(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    IcuNormalizationMode(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<IcuNormalizationMode> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			IcuNormalizationMode.values());
+    public static final JsonEnum.Deserializer<IcuNormalizationMode> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        IcuNormalizationMode.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationTokenFilter.java
index a13b360c9a..89ecf236dc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationTokenFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,104 +41,100 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.IcuNormalizationTokenFilter
 
 @JsonpDeserializable
 public class IcuNormalizationTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final IcuNormalizationType name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IcuNormalizationTokenFilter(Builder builder) {
-		super(builder);
-
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-
-	}
-
-	public static IcuNormalizationTokenFilter of(Function<Builder, ObjectBuilder<IcuNormalizationTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.IcuNormalizer;
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final IcuNormalizationType name() {
-		return this.name;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "icu_normalizer");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("name");
-		this.name.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IcuNormalizationTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<IcuNormalizationTokenFilter> {
-		private IcuNormalizationType name;
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(IcuNormalizationType value) {
-			this.name = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IcuNormalizationTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IcuNormalizationTokenFilter build() {
-			_checkSingleUse();
-
-			return new IcuNormalizationTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IcuNormalizationTokenFilter}
-	 */
-	public static final JsonpDeserializer<IcuNormalizationTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IcuNormalizationTokenFilter::setupIcuNormalizationTokenFilterDeserializer);
-
-	protected static void setupIcuNormalizationTokenFilterDeserializer(
-			ObjectDeserializer<IcuNormalizationTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::name, IcuNormalizationType._DESERIALIZER, "name");
-
-		op.ignore("type");
-	}
+    private final IcuNormalizationType name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IcuNormalizationTokenFilter(Builder builder) {
+        super(builder);
+
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+
+    }
+
+    public static IcuNormalizationTokenFilter of(Function<Builder, ObjectBuilder<IcuNormalizationTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.IcuNormalizer;
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final IcuNormalizationType name() {
+        return this.name;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "icu_normalizer");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("name");
+        this.name.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IcuNormalizationTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<IcuNormalizationTokenFilter> {
+        private IcuNormalizationType name;
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(IcuNormalizationType value) {
+            this.name = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link IcuNormalizationTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IcuNormalizationTokenFilter build() {
+            _checkSingleUse();
+
+            return new IcuNormalizationTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IcuNormalizationTokenFilter}
+     */
+    public static final JsonpDeserializer<IcuNormalizationTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IcuNormalizationTokenFilter::setupIcuNormalizationTokenFilterDeserializer
+    );
+
+    protected static void setupIcuNormalizationTokenFilterDeserializer(ObjectDeserializer<IcuNormalizationTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::name, IcuNormalizationType._DESERIALIZER, "name");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationType.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationType.java
index d452d8a5ef..71d6b496f8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuNormalizationType.java
@@ -35,27 +35,27 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum IcuNormalizationType implements JsonEnum {
-	Nfc("nfc"),
+    Nfc("nfc"),
 
-	Nfkc("nfkc"),
+    Nfkc("nfkc"),
 
-	NfkcCf("nfkc_cf"),
+    NfkcCf("nfkc_cf"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	IcuNormalizationType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    IcuNormalizationType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<IcuNormalizationType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			IcuNormalizationType.values());
+    public static final JsonEnum.Deserializer<IcuNormalizationType> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        IcuNormalizationType.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTokenizer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTokenizer.java
index 11e1d8c5cd..17bdf812f4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTokenizer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTokenizer.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,109 +41,108 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.IcuTokenizer
 
-
 @JsonpDeserializable
 public class IcuTokenizer extends TokenizerBase implements TokenizerDefinitionVariant, TokenFilterDefinitionVariant {
-	private final String ruleFiles;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IcuTokenizer(Builder builder) {
-		super(builder);
-
-		this.ruleFiles = ApiTypeHelper.requireNonNull(builder.ruleFiles, this, "ruleFiles");
-
-	}
-
-	public static IcuTokenizer of(Function<Builder, ObjectBuilder<IcuTokenizer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenizerDefinition variant kind.
-	 */
-	@Override
-	public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
-		return TokenizerDefinition.Kind.IcuTokenizer;
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.IcuTokenizer;
-	}
-
-	/**
-	 * Required - API name: {@code rule_files}
-	 */
-	public final String ruleFiles() {
-		return this.ruleFiles;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "icu_tokenizer");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("rule_files");
-		generator.write(this.ruleFiles);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IcuTokenizer}.
-	 */
-
-	public static class Builder extends TokenizerBase.AbstractBuilder<Builder> implements ObjectBuilder<IcuTokenizer> {
-		private String ruleFiles;
-
-		/**
-		 * Required - API name: {@code rule_files}
-		 */
-		public final Builder ruleFiles(String value) {
-			this.ruleFiles = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IcuTokenizer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IcuTokenizer build() {
-			_checkSingleUse();
-
-			return new IcuTokenizer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IcuTokenizer}
-	 */
-	public static final JsonpDeserializer<IcuTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IcuTokenizer::setupIcuTokenizerDeserializer);
-
-	protected static void setupIcuTokenizerDeserializer(ObjectDeserializer<IcuTokenizer.Builder> op) {
-		TokenizerBase.setupTokenizerBaseDeserializer(op);
-		op.add(Builder::ruleFiles, JsonpDeserializer.stringDeserializer(), "rule_files");
-
-		op.ignore("type");
-	}
+    private final String ruleFiles;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IcuTokenizer(Builder builder) {
+        super(builder);
+
+        this.ruleFiles = ApiTypeHelper.requireNonNull(builder.ruleFiles, this, "ruleFiles");
+
+    }
+
+    public static IcuTokenizer of(Function<Builder, ObjectBuilder<IcuTokenizer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenizerDefinition variant kind.
+     */
+    @Override
+    public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
+        return TokenizerDefinition.Kind.IcuTokenizer;
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.IcuTokenizer;
+    }
+
+    /**
+     * Required - API name: {@code rule_files}
+     */
+    public final String ruleFiles() {
+        return this.ruleFiles;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "icu_tokenizer");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("rule_files");
+        generator.write(this.ruleFiles);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IcuTokenizer}.
+     */
+
+    public static class Builder extends TokenizerBase.AbstractBuilder<Builder> implements ObjectBuilder<IcuTokenizer> {
+        private String ruleFiles;
+
+        /**
+         * Required - API name: {@code rule_files}
+         */
+        public final Builder ruleFiles(String value) {
+            this.ruleFiles = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link IcuTokenizer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IcuTokenizer build() {
+            _checkSingleUse();
+
+            return new IcuTokenizer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IcuTokenizer}
+     */
+    public static final JsonpDeserializer<IcuTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IcuTokenizer::setupIcuTokenizerDeserializer
+    );
+
+    protected static void setupIcuTokenizerDeserializer(ObjectDeserializer<IcuTokenizer.Builder> op) {
+        TokenizerBase.setupTokenizerBaseDeserializer(op);
+        op.add(Builder::ruleFiles, JsonpDeserializer.stringDeserializer(), "rule_files");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformDirection.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformDirection.java
index 073e12c87d..3b61b8b04d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformDirection.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformDirection.java
@@ -35,25 +35,25 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum IcuTransformDirection implements JsonEnum {
-	Forward("forward"),
+    Forward("forward"),
 
-	Reverse("reverse"),
+    Reverse("reverse"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	IcuTransformDirection(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    IcuTransformDirection(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<IcuTransformDirection> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			IcuTransformDirection.values());
+    public static final JsonEnum.Deserializer<IcuTransformDirection> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        IcuTransformDirection.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformTokenFilter.java
index 970e14ae4c..903a044ba0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/IcuTransformTokenFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,126 +41,123 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.IcuTransformTokenFilter
 
 @JsonpDeserializable
 public class IcuTransformTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final IcuTransformDirection dir;
-
-	private final String id;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IcuTransformTokenFilter(Builder builder) {
-		super(builder);
-
-		this.dir = ApiTypeHelper.requireNonNull(builder.dir, this, "dir");
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-
-	}
-
-	public static IcuTransformTokenFilter of(Function<Builder, ObjectBuilder<IcuTransformTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.IcuTransform;
-	}
-
-	/**
-	 * Required - API name: {@code dir}
-	 */
-	public final IcuTransformDirection dir() {
-		return this.dir;
-	}
-
-	/**
-	 * Required - API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "icu_transform");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("dir");
-		this.dir.serialize(generator, mapper);
-		generator.writeKey("id");
-		generator.write(this.id);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IcuTransformTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<IcuTransformTokenFilter> {
-		private IcuTransformDirection dir;
-
-		private String id;
-
-		/**
-		 * Required - API name: {@code dir}
-		 */
-		public final Builder dir(IcuTransformDirection value) {
-			this.dir = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IcuTransformTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IcuTransformTokenFilter build() {
-			_checkSingleUse();
-
-			return new IcuTransformTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IcuTransformTokenFilter}
-	 */
-	public static final JsonpDeserializer<IcuTransformTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IcuTransformTokenFilter::setupIcuTransformTokenFilterDeserializer);
-
-	protected static void setupIcuTransformTokenFilterDeserializer(
-			ObjectDeserializer<IcuTransformTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::dir, IcuTransformDirection._DESERIALIZER, "dir");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-
-		op.ignore("type");
-	}
+    private final IcuTransformDirection dir;
+
+    private final String id;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IcuTransformTokenFilter(Builder builder) {
+        super(builder);
+
+        this.dir = ApiTypeHelper.requireNonNull(builder.dir, this, "dir");
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+
+    }
+
+    public static IcuTransformTokenFilter of(Function<Builder, ObjectBuilder<IcuTransformTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.IcuTransform;
+    }
+
+    /**
+     * Required - API name: {@code dir}
+     */
+    public final IcuTransformDirection dir() {
+        return this.dir;
+    }
+
+    /**
+     * Required - API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "icu_transform");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("dir");
+        this.dir.serialize(generator, mapper);
+        generator.writeKey("id");
+        generator.write(this.id);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IcuTransformTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<IcuTransformTokenFilter> {
+        private IcuTransformDirection dir;
+
+        private String id;
+
+        /**
+         * Required - API name: {@code dir}
+         */
+        public final Builder dir(IcuTransformDirection value) {
+            this.dir = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link IcuTransformTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IcuTransformTokenFilter build() {
+            _checkSingleUse();
+
+            return new IcuTransformTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IcuTransformTokenFilter}
+     */
+    public static final JsonpDeserializer<IcuTransformTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IcuTransformTokenFilter::setupIcuTransformTokenFilterDeserializer
+    );
+
+    protected static void setupIcuTransformTokenFilterDeserializer(ObjectDeserializer<IcuTransformTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::dir, IcuTransformDirection._DESERIALIZER, "dir");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KStemTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KStemTokenFilter.java
index 9ae9f70d00..e9a792bd33 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KStemTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KStemTokenFilter.java
@@ -32,85 +32,84 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.KStemTokenFilter
 
 @JsonpDeserializable
 public class KStemTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private KStemTokenFilter(Builder builder) {
-		super(builder);
+    private KStemTokenFilter(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static KStemTokenFilter of(Function<Builder, ObjectBuilder<KStemTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static KStemTokenFilter of(Function<Builder, ObjectBuilder<KStemTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Kstem;
-	}
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Kstem;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "kstem");
-		super.serializeInternal(generator, mapper);
+        generator.write("type", "kstem");
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link KStemTokenFilter}.
-	 */
+    /**
+     * Builder for {@link KStemTokenFilter}.
+     */
 
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<KStemTokenFilter> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<KStemTokenFilter> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link KStemTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public KStemTokenFilter build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link KStemTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public KStemTokenFilter build() {
+            _checkSingleUse();
 
-			return new KStemTokenFilter(this);
-		}
-	}
+            return new KStemTokenFilter(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link KStemTokenFilter}
-	 */
-	public static final JsonpDeserializer<KStemTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			KStemTokenFilter::setupKStemTokenFilterDeserializer);
+    /**
+     * Json deserializer for {@link KStemTokenFilter}
+     */
+    public static final JsonpDeserializer<KStemTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        KStemTokenFilter::setupKStemTokenFilterDeserializer
+    );
 
-	protected static void setupKStemTokenFilterDeserializer(ObjectDeserializer<KStemTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+    protected static void setupKStemTokenFilterDeserializer(ObjectDeserializer<KStemTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesMode.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesMode.java
index 3fe0368602..29f5447d1d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesMode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesMode.java
@@ -37,22 +37,21 @@
 
 @JsonpDeserializable
 public enum KeepTypesMode implements JsonEnum {
-	Include("include"),
+    Include("include"),
 
-	Exclude("exclude"),
+    Exclude("exclude"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	KeepTypesMode(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    KeepTypesMode(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<KeepTypesMode> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			KeepTypesMode.values());
+    public static final JsonEnum.Deserializer<KeepTypesMode> _DESERIALIZER = new JsonEnum.Deserializer<>(KeepTypesMode.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesTokenFilter.java
index 5ede68d803..5f9518e586 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepTypesTokenFilter.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,154 +43,149 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.KeepTypesTokenFilter
 
-
 @JsonpDeserializable
 public class KeepTypesTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	@Nullable
-	private final KeepTypesMode mode;
-
-	private final List<String> types;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private KeepTypesTokenFilter(Builder builder) {
-		super(builder);
-
-		this.mode = builder.mode;
-		this.types = ApiTypeHelper.unmodifiable(builder.types);
-
-	}
-
-	public static KeepTypesTokenFilter of(Function<Builder, ObjectBuilder<KeepTypesTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.KeepTypes;
-	}
-
-	/**
-	 * API name: {@code mode}
-	 */
-	@Nullable
-	public final KeepTypesMode mode() {
-		return this.mode;
-	}
-
-	/**
-	 * API name: {@code types}
-	 */
-	public final List<String> types() {
-		return this.types;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "keep_types");
-		super.serializeInternal(generator, mapper);
-		if (this.mode != null) {
-			generator.writeKey("mode");
-			this.mode.serialize(generator, mapper);
-		}
-		if (ApiTypeHelper.isDefined(this.types)) {
-			generator.writeKey("types");
-			generator.writeStartArray();
-			for (String item0 : this.types) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link KeepTypesTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<KeepTypesTokenFilter> {
-		@Nullable
-		private KeepTypesMode mode;
-
-		@Nullable
-		private List<String> types;
-
-		/**
-		 * API name: {@code mode}
-		 */
-		public final Builder mode(@Nullable KeepTypesMode value) {
-			this.mode = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code types}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>types</code>.
-		 */
-		public final Builder types(List<String> list) {
-			this.types = _listAddAll(this.types, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code types}
-		 * <p>
-		 * Adds one or more values to <code>types</code>.
-		 */
-		public final Builder types(String value, String... values) {
-			this.types = _listAdd(this.types, value, values);
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link KeepTypesTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public KeepTypesTokenFilter build() {
-			_checkSingleUse();
-
-			return new KeepTypesTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link KeepTypesTokenFilter}
-	 */
-	public static final JsonpDeserializer<KeepTypesTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, KeepTypesTokenFilter::setupKeepTypesTokenFilterDeserializer);
-
-	protected static void setupKeepTypesTokenFilterDeserializer(ObjectDeserializer<KeepTypesTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::mode, KeepTypesMode._DESERIALIZER, "mode");
-		op.add(Builder::types, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "types");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final KeepTypesMode mode;
+
+    private final List<String> types;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private KeepTypesTokenFilter(Builder builder) {
+        super(builder);
+
+        this.mode = builder.mode;
+        this.types = ApiTypeHelper.unmodifiable(builder.types);
+
+    }
+
+    public static KeepTypesTokenFilter of(Function<Builder, ObjectBuilder<KeepTypesTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.KeepTypes;
+    }
+
+    /**
+     * API name: {@code mode}
+     */
+    @Nullable
+    public final KeepTypesMode mode() {
+        return this.mode;
+    }
+
+    /**
+     * API name: {@code types}
+     */
+    public final List<String> types() {
+        return this.types;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "keep_types");
+        super.serializeInternal(generator, mapper);
+        if (this.mode != null) {
+            generator.writeKey("mode");
+            this.mode.serialize(generator, mapper);
+        }
+        if (ApiTypeHelper.isDefined(this.types)) {
+            generator.writeKey("types");
+            generator.writeStartArray();
+            for (String item0 : this.types) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link KeepTypesTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<KeepTypesTokenFilter> {
+        @Nullable
+        private KeepTypesMode mode;
+
+        @Nullable
+        private List<String> types;
+
+        /**
+         * API name: {@code mode}
+         */
+        public final Builder mode(@Nullable KeepTypesMode value) {
+            this.mode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code types}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>types</code>.
+         */
+        public final Builder types(List<String> list) {
+            this.types = _listAddAll(this.types, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code types}
+         * <p>
+         * Adds one or more values to <code>types</code>.
+         */
+        public final Builder types(String value, String... values) {
+            this.types = _listAdd(this.types, value, values);
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link KeepTypesTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public KeepTypesTokenFilter build() {
+            _checkSingleUse();
+
+            return new KeepTypesTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link KeepTypesTokenFilter}
+     */
+    public static final JsonpDeserializer<KeepTypesTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        KeepTypesTokenFilter::setupKeepTypesTokenFilterDeserializer
+    );
+
+    protected static void setupKeepTypesTokenFilterDeserializer(ObjectDeserializer<KeepTypesTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::mode, KeepTypesMode._DESERIALIZER, "mode");
+        op.add(Builder::types, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "types");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepWordsTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepWordsTokenFilter.java
index 21c4af12d9..0448d71475 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepWordsTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeepWordsTokenFilter.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,185 +43,179 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.KeepWordsTokenFilter
 
-
 @JsonpDeserializable
 public class KeepWordsTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final List<String> keepWords;
-
-	@Nullable
-	private final Boolean keepWordsCase;
-
-	@Nullable
-	private final String keepWordsPath;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private KeepWordsTokenFilter(Builder builder) {
-		super(builder);
-
-		this.keepWords = ApiTypeHelper.unmodifiable(builder.keepWords);
-		this.keepWordsCase = builder.keepWordsCase;
-		this.keepWordsPath = builder.keepWordsPath;
-
-	}
-
-	public static KeepWordsTokenFilter of(Function<Builder, ObjectBuilder<KeepWordsTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Keep;
-	}
-
-	/**
-	 * API name: {@code keep_words}
-	 */
-	public final List<String> keepWords() {
-		return this.keepWords;
-	}
-
-	/**
-	 * API name: {@code keep_words_case}
-	 */
-	@Nullable
-	public final Boolean keepWordsCase() {
-		return this.keepWordsCase;
-	}
-
-	/**
-	 * API name: {@code keep_words_path}
-	 */
-	@Nullable
-	public final String keepWordsPath() {
-		return this.keepWordsPath;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "keep");
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.keepWords)) {
-			generator.writeKey("keep_words");
-			generator.writeStartArray();
-			for (String item0 : this.keepWords) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.keepWordsCase != null) {
-			generator.writeKey("keep_words_case");
-			generator.write(this.keepWordsCase);
-
-		}
-		if (this.keepWordsPath != null) {
-			generator.writeKey("keep_words_path");
-			generator.write(this.keepWordsPath);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link KeepWordsTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<KeepWordsTokenFilter> {
-		@Nullable
-		private List<String> keepWords;
-
-		@Nullable
-		private Boolean keepWordsCase;
-
-		@Nullable
-		private String keepWordsPath;
-
-		/**
-		 * API name: {@code keep_words}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>keepWords</code>.
-		 */
-		public final Builder keepWords(List<String> list) {
-			this.keepWords = _listAddAll(this.keepWords, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code keep_words}
-		 * <p>
-		 * Adds one or more values to <code>keepWords</code>.
-		 */
-		public final Builder keepWords(String value, String... values) {
-			this.keepWords = _listAdd(this.keepWords, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code keep_words_case}
-		 */
-		public final Builder keepWordsCase(@Nullable Boolean value) {
-			this.keepWordsCase = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code keep_words_path}
-		 */
-		public final Builder keepWordsPath(@Nullable String value) {
-			this.keepWordsPath = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link KeepWordsTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public KeepWordsTokenFilter build() {
-			_checkSingleUse();
-
-			return new KeepWordsTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link KeepWordsTokenFilter}
-	 */
-	public static final JsonpDeserializer<KeepWordsTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, KeepWordsTokenFilter::setupKeepWordsTokenFilterDeserializer);
-
-	protected static void setupKeepWordsTokenFilterDeserializer(ObjectDeserializer<KeepWordsTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::keepWords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"keep_words");
-		op.add(Builder::keepWordsCase, JsonpDeserializer.booleanDeserializer(), "keep_words_case");
-		op.add(Builder::keepWordsPath, JsonpDeserializer.stringDeserializer(), "keep_words_path");
-
-		op.ignore("type");
-	}
+    private final List<String> keepWords;
+
+    @Nullable
+    private final Boolean keepWordsCase;
+
+    @Nullable
+    private final String keepWordsPath;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private KeepWordsTokenFilter(Builder builder) {
+        super(builder);
+
+        this.keepWords = ApiTypeHelper.unmodifiable(builder.keepWords);
+        this.keepWordsCase = builder.keepWordsCase;
+        this.keepWordsPath = builder.keepWordsPath;
+
+    }
+
+    public static KeepWordsTokenFilter of(Function<Builder, ObjectBuilder<KeepWordsTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Keep;
+    }
+
+    /**
+     * API name: {@code keep_words}
+     */
+    public final List<String> keepWords() {
+        return this.keepWords;
+    }
+
+    /**
+     * API name: {@code keep_words_case}
+     */
+    @Nullable
+    public final Boolean keepWordsCase() {
+        return this.keepWordsCase;
+    }
+
+    /**
+     * API name: {@code keep_words_path}
+     */
+    @Nullable
+    public final String keepWordsPath() {
+        return this.keepWordsPath;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "keep");
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.keepWords)) {
+            generator.writeKey("keep_words");
+            generator.writeStartArray();
+            for (String item0 : this.keepWords) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.keepWordsCase != null) {
+            generator.writeKey("keep_words_case");
+            generator.write(this.keepWordsCase);
+
+        }
+        if (this.keepWordsPath != null) {
+            generator.writeKey("keep_words_path");
+            generator.write(this.keepWordsPath);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link KeepWordsTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<KeepWordsTokenFilter> {
+        @Nullable
+        private List<String> keepWords;
+
+        @Nullable
+        private Boolean keepWordsCase;
+
+        @Nullable
+        private String keepWordsPath;
+
+        /**
+         * API name: {@code keep_words}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>keepWords</code>.
+         */
+        public final Builder keepWords(List<String> list) {
+            this.keepWords = _listAddAll(this.keepWords, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code keep_words}
+         * <p>
+         * Adds one or more values to <code>keepWords</code>.
+         */
+        public final Builder keepWords(String value, String... values) {
+            this.keepWords = _listAdd(this.keepWords, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code keep_words_case}
+         */
+        public final Builder keepWordsCase(@Nullable Boolean value) {
+            this.keepWordsCase = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code keep_words_path}
+         */
+        public final Builder keepWordsPath(@Nullable String value) {
+            this.keepWordsPath = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link KeepWordsTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public KeepWordsTokenFilter build() {
+            _checkSingleUse();
+
+            return new KeepWordsTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link KeepWordsTokenFilter}
+     */
+    public static final JsonpDeserializer<KeepWordsTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        KeepWordsTokenFilter::setupKeepWordsTokenFilterDeserializer
+    );
+
+    protected static void setupKeepWordsTokenFilterDeserializer(ObjectDeserializer<KeepWordsTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::keepWords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "keep_words");
+        op.add(Builder::keepWordsCase, JsonpDeserializer.booleanDeserializer(), "keep_words_case");
+        op.add(Builder::keepWordsPath, JsonpDeserializer.stringDeserializer(), "keep_words_path");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeywordAnalyzer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeywordAnalyzer.java
index 5cd44c0591..5469ebb2b2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeywordAnalyzer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeywordAnalyzer.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,111 +43,109 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.KeywordAnalyzer
 
-
 @JsonpDeserializable
 public class KeywordAnalyzer implements AnalyzerVariant, JsonpSerializable {
-	@Nullable
-	private final String version;
+    @Nullable
+    private final String version;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private KeywordAnalyzer(Builder builder) {
+    private KeywordAnalyzer(Builder builder) {
 
-		this.version = builder.version;
+        this.version = builder.version;
 
-	}
+    }
 
-	public static KeywordAnalyzer of(Function<Builder, ObjectBuilder<KeywordAnalyzer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static KeywordAnalyzer of(Function<Builder, ObjectBuilder<KeywordAnalyzer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Analyzer variant kind.
-	 */
-	@Override
-	public Analyzer.Kind _analyzerKind() {
-		return Analyzer.Kind.Keyword;
-	}
+    /**
+     * Analyzer variant kind.
+     */
+    @Override
+    public Analyzer.Kind _analyzerKind() {
+        return Analyzer.Kind.Keyword;
+    }
 
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final String version() {
-		return this.version;
-	}
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final String version() {
+        return this.version;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "keyword");
+        generator.write("type", "keyword");
 
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link KeywordAnalyzer}.
-	 */
+    /**
+     * Builder for {@link KeywordAnalyzer}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<KeywordAnalyzer> {
-		@Nullable
-		private String version;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<KeywordAnalyzer> {
+        @Nullable
+        private String version;
 
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable String value) {
-			this.version = value;
-			return this;
-		}
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable String value) {
+            this.version = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link KeywordAnalyzer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public KeywordAnalyzer build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link KeywordAnalyzer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public KeywordAnalyzer build() {
+            _checkSingleUse();
 
-			return new KeywordAnalyzer(this);
-		}
-	}
+            return new KeywordAnalyzer(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link KeywordAnalyzer}
-	 */
-	public static final JsonpDeserializer<KeywordAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			KeywordAnalyzer::setupKeywordAnalyzerDeserializer);
+    /**
+     * Json deserializer for {@link KeywordAnalyzer}
+     */
+    public static final JsonpDeserializer<KeywordAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        KeywordAnalyzer::setupKeywordAnalyzerDeserializer
+    );
 
-	protected static void setupKeywordAnalyzerDeserializer(ObjectDeserializer<KeywordAnalyzer.Builder> op) {
+    protected static void setupKeywordAnalyzerDeserializer(ObjectDeserializer<KeywordAnalyzer.Builder> op) {
 
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeywordMarkerTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeywordMarkerTokenFilter.java
index d17e56d90e..81028c91de 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeywordMarkerTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeywordMarkerTokenFilter.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,214 +43,208 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.KeywordMarkerTokenFilter
 
 @JsonpDeserializable
 public class KeywordMarkerTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	@Nullable
-	private final Boolean ignoreCase;
-
-	private final List<String> keywords;
-
-	@Nullable
-	private final String keywordsPath;
-
-	@Nullable
-	private final String keywordsPattern;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private KeywordMarkerTokenFilter(Builder builder) {
-		super(builder);
-
-		this.ignoreCase = builder.ignoreCase;
-		this.keywords = ApiTypeHelper.unmodifiable(builder.keywords);
-		this.keywordsPath = builder.keywordsPath;
-		this.keywordsPattern = builder.keywordsPattern;
-
-	}
-
-	public static KeywordMarkerTokenFilter of(Function<Builder, ObjectBuilder<KeywordMarkerTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.KeywordMarker;
-	}
-
-	/**
-	 * API name: {@code ignore_case}
-	 */
-	@Nullable
-	public final Boolean ignoreCase() {
-		return this.ignoreCase;
-	}
-
-	/**
-	 * API name: {@code keywords}
-	 */
-	public final List<String> keywords() {
-		return this.keywords;
-	}
-
-	/**
-	 * API name: {@code keywords_path}
-	 */
-	@Nullable
-	public final String keywordsPath() {
-		return this.keywordsPath;
-	}
-
-	/**
-	 * API name: {@code keywords_pattern}
-	 */
-	@Nullable
-	public final String keywordsPattern() {
-		return this.keywordsPattern;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "keyword_marker");
-		super.serializeInternal(generator, mapper);
-		if (this.ignoreCase != null) {
-			generator.writeKey("ignore_case");
-			generator.write(this.ignoreCase);
-
-		}
-		if (ApiTypeHelper.isDefined(this.keywords)) {
-			generator.writeKey("keywords");
-			generator.writeStartArray();
-			for (String item0 : this.keywords) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.keywordsPath != null) {
-			generator.writeKey("keywords_path");
-			generator.write(this.keywordsPath);
-
-		}
-		if (this.keywordsPattern != null) {
-			generator.writeKey("keywords_pattern");
-			generator.write(this.keywordsPattern);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link KeywordMarkerTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<KeywordMarkerTokenFilter> {
-		@Nullable
-		private Boolean ignoreCase;
-
-		@Nullable
-		private List<String> keywords;
-
-		@Nullable
-		private String keywordsPath;
-
-		@Nullable
-		private String keywordsPattern;
-
-		/**
-		 * API name: {@code ignore_case}
-		 */
-		public final Builder ignoreCase(@Nullable Boolean value) {
-			this.ignoreCase = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code keywords}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>keywords</code>.
-		 */
-		public final Builder keywords(List<String> list) {
-			this.keywords = _listAddAll(this.keywords, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code keywords}
-		 * <p>
-		 * Adds one or more values to <code>keywords</code>.
-		 */
-		public final Builder keywords(String value, String... values) {
-			this.keywords = _listAdd(this.keywords, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code keywords_path}
-		 */
-		public final Builder keywordsPath(@Nullable String value) {
-			this.keywordsPath = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code keywords_pattern}
-		 */
-		public final Builder keywordsPattern(@Nullable String value) {
-			this.keywordsPattern = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link KeywordMarkerTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public KeywordMarkerTokenFilter build() {
-			_checkSingleUse();
-
-			return new KeywordMarkerTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link KeywordMarkerTokenFilter}
-	 */
-	public static final JsonpDeserializer<KeywordMarkerTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, KeywordMarkerTokenFilter::setupKeywordMarkerTokenFilterDeserializer);
-
-	protected static void setupKeywordMarkerTokenFilterDeserializer(
-			ObjectDeserializer<KeywordMarkerTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::ignoreCase, JsonpDeserializer.booleanDeserializer(), "ignore_case");
-		op.add(Builder::keywords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"keywords");
-		op.add(Builder::keywordsPath, JsonpDeserializer.stringDeserializer(), "keywords_path");
-		op.add(Builder::keywordsPattern, JsonpDeserializer.stringDeserializer(), "keywords_pattern");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Boolean ignoreCase;
+
+    private final List<String> keywords;
+
+    @Nullable
+    private final String keywordsPath;
+
+    @Nullable
+    private final String keywordsPattern;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private KeywordMarkerTokenFilter(Builder builder) {
+        super(builder);
+
+        this.ignoreCase = builder.ignoreCase;
+        this.keywords = ApiTypeHelper.unmodifiable(builder.keywords);
+        this.keywordsPath = builder.keywordsPath;
+        this.keywordsPattern = builder.keywordsPattern;
+
+    }
+
+    public static KeywordMarkerTokenFilter of(Function<Builder, ObjectBuilder<KeywordMarkerTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.KeywordMarker;
+    }
+
+    /**
+     * API name: {@code ignore_case}
+     */
+    @Nullable
+    public final Boolean ignoreCase() {
+        return this.ignoreCase;
+    }
+
+    /**
+     * API name: {@code keywords}
+     */
+    public final List<String> keywords() {
+        return this.keywords;
+    }
+
+    /**
+     * API name: {@code keywords_path}
+     */
+    @Nullable
+    public final String keywordsPath() {
+        return this.keywordsPath;
+    }
+
+    /**
+     * API name: {@code keywords_pattern}
+     */
+    @Nullable
+    public final String keywordsPattern() {
+        return this.keywordsPattern;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "keyword_marker");
+        super.serializeInternal(generator, mapper);
+        if (this.ignoreCase != null) {
+            generator.writeKey("ignore_case");
+            generator.write(this.ignoreCase);
+
+        }
+        if (ApiTypeHelper.isDefined(this.keywords)) {
+            generator.writeKey("keywords");
+            generator.writeStartArray();
+            for (String item0 : this.keywords) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.keywordsPath != null) {
+            generator.writeKey("keywords_path");
+            generator.write(this.keywordsPath);
+
+        }
+        if (this.keywordsPattern != null) {
+            generator.writeKey("keywords_pattern");
+            generator.write(this.keywordsPattern);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link KeywordMarkerTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<KeywordMarkerTokenFilter> {
+        @Nullable
+        private Boolean ignoreCase;
+
+        @Nullable
+        private List<String> keywords;
+
+        @Nullable
+        private String keywordsPath;
+
+        @Nullable
+        private String keywordsPattern;
+
+        /**
+         * API name: {@code ignore_case}
+         */
+        public final Builder ignoreCase(@Nullable Boolean value) {
+            this.ignoreCase = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code keywords}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>keywords</code>.
+         */
+        public final Builder keywords(List<String> list) {
+            this.keywords = _listAddAll(this.keywords, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code keywords}
+         * <p>
+         * Adds one or more values to <code>keywords</code>.
+         */
+        public final Builder keywords(String value, String... values) {
+            this.keywords = _listAdd(this.keywords, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code keywords_path}
+         */
+        public final Builder keywordsPath(@Nullable String value) {
+            this.keywordsPath = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code keywords_pattern}
+         */
+        public final Builder keywordsPattern(@Nullable String value) {
+            this.keywordsPattern = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link KeywordMarkerTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public KeywordMarkerTokenFilter build() {
+            _checkSingleUse();
+
+            return new KeywordMarkerTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link KeywordMarkerTokenFilter}
+     */
+    public static final JsonpDeserializer<KeywordMarkerTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        KeywordMarkerTokenFilter::setupKeywordMarkerTokenFilterDeserializer
+    );
+
+    protected static void setupKeywordMarkerTokenFilterDeserializer(ObjectDeserializer<KeywordMarkerTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::ignoreCase, JsonpDeserializer.booleanDeserializer(), "ignore_case");
+        op.add(Builder::keywords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "keywords");
+        op.add(Builder::keywordsPath, JsonpDeserializer.stringDeserializer(), "keywords_path");
+        op.add(Builder::keywordsPattern, JsonpDeserializer.stringDeserializer(), "keywords_pattern");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeywordTokenizer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeywordTokenizer.java
index 3132a1a258..69df0984b3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeywordTokenizer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KeywordTokenizer.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,103 +41,100 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.KeywordTokenizer
 
-
 @JsonpDeserializable
 public class KeywordTokenizer extends TokenizerBase implements TokenizerDefinitionVariant {
-	private final int bufferSize;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private KeywordTokenizer(Builder builder) {
-		super(builder);
-
-		this.bufferSize = ApiTypeHelper.requireNonNull(builder.bufferSize, this, "bufferSize");
-
-	}
-
-	public static KeywordTokenizer of(Function<Builder, ObjectBuilder<KeywordTokenizer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenizerDefinition variant kind.
-	 */
-	@Override
-	public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
-		return TokenizerDefinition.Kind.Keyword;
-	}
-
-	/**
-	 * Required - API name: {@code buffer_size}
-	 */
-	public final int bufferSize() {
-		return this.bufferSize;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "keyword");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("buffer_size");
-		generator.write(this.bufferSize);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link KeywordTokenizer}.
-	 */
-
-	public static class Builder extends TokenizerBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<KeywordTokenizer> {
-		private Integer bufferSize;
-
-		/**
-		 * Required - API name: {@code buffer_size}
-		 */
-		public final Builder bufferSize(int value) {
-			this.bufferSize = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link KeywordTokenizer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public KeywordTokenizer build() {
-			_checkSingleUse();
-
-			return new KeywordTokenizer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link KeywordTokenizer}
-	 */
-	public static final JsonpDeserializer<KeywordTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			KeywordTokenizer::setupKeywordTokenizerDeserializer);
-
-	protected static void setupKeywordTokenizerDeserializer(ObjectDeserializer<KeywordTokenizer.Builder> op) {
-		TokenizerBase.setupTokenizerBaseDeserializer(op);
-		op.add(Builder::bufferSize, JsonpDeserializer.integerDeserializer(), "buffer_size");
-
-		op.ignore("type");
-	}
+    private final int bufferSize;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private KeywordTokenizer(Builder builder) {
+        super(builder);
+
+        this.bufferSize = ApiTypeHelper.requireNonNull(builder.bufferSize, this, "bufferSize");
+
+    }
+
+    public static KeywordTokenizer of(Function<Builder, ObjectBuilder<KeywordTokenizer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenizerDefinition variant kind.
+     */
+    @Override
+    public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
+        return TokenizerDefinition.Kind.Keyword;
+    }
+
+    /**
+     * Required - API name: {@code buffer_size}
+     */
+    public final int bufferSize() {
+        return this.bufferSize;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "keyword");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("buffer_size");
+        generator.write(this.bufferSize);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link KeywordTokenizer}.
+     */
+
+    public static class Builder extends TokenizerBase.AbstractBuilder<Builder> implements ObjectBuilder<KeywordTokenizer> {
+        private Integer bufferSize;
+
+        /**
+         * Required - API name: {@code buffer_size}
+         */
+        public final Builder bufferSize(int value) {
+            this.bufferSize = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link KeywordTokenizer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public KeywordTokenizer build() {
+            _checkSingleUse();
+
+            return new KeywordTokenizer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link KeywordTokenizer}
+     */
+    public static final JsonpDeserializer<KeywordTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        KeywordTokenizer::setupKeywordTokenizerDeserializer
+    );
+
+    protected static void setupKeywordTokenizerDeserializer(ObjectDeserializer<KeywordTokenizer.Builder> op) {
+        TokenizerBase.setupTokenizerBaseDeserializer(op);
+        op.add(Builder::bufferSize, JsonpDeserializer.integerDeserializer(), "buffer_size");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiAnalyzer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiAnalyzer.java
index e016db6001..21200f3b7b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiAnalyzer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiAnalyzer.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,134 +44,132 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.KuromojiAnalyzer
 
-
 @JsonpDeserializable
 public class KuromojiAnalyzer implements AnalyzerVariant, JsonpSerializable {
-	private final KuromojiTokenizationMode mode;
-
-	@Nullable
-	private final String userDictionary;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private KuromojiAnalyzer(Builder builder) {
-
-		this.mode = ApiTypeHelper.requireNonNull(builder.mode, this, "mode");
-		this.userDictionary = builder.userDictionary;
-
-	}
-
-	public static KuromojiAnalyzer of(Function<Builder, ObjectBuilder<KuromojiAnalyzer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Analyzer variant kind.
-	 */
-	@Override
-	public Analyzer.Kind _analyzerKind() {
-		return Analyzer.Kind.Kuromoji;
-	}
-
-	/**
-	 * Required - API name: {@code mode}
-	 */
-	public final KuromojiTokenizationMode mode() {
-		return this.mode;
-	}
-
-	/**
-	 * API name: {@code user_dictionary}
-	 */
-	@Nullable
-	public final String userDictionary() {
-		return this.userDictionary;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "kuromoji");
-
-		generator.writeKey("mode");
-		this.mode.serialize(generator, mapper);
-		if (this.userDictionary != null) {
-			generator.writeKey("user_dictionary");
-			generator.write(this.userDictionary);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link KuromojiAnalyzer}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<KuromojiAnalyzer> {
-		private KuromojiTokenizationMode mode;
-
-		@Nullable
-		private String userDictionary;
-
-		/**
-		 * Required - API name: {@code mode}
-		 */
-		public final Builder mode(KuromojiTokenizationMode value) {
-			this.mode = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code user_dictionary}
-		 */
-		public final Builder userDictionary(@Nullable String value) {
-			this.userDictionary = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link KuromojiAnalyzer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public KuromojiAnalyzer build() {
-			_checkSingleUse();
-
-			return new KuromojiAnalyzer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link KuromojiAnalyzer}
-	 */
-	public static final JsonpDeserializer<KuromojiAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			KuromojiAnalyzer::setupKuromojiAnalyzerDeserializer);
-
-	protected static void setupKuromojiAnalyzerDeserializer(ObjectDeserializer<KuromojiAnalyzer.Builder> op) {
-
-		op.add(Builder::mode, KuromojiTokenizationMode._DESERIALIZER, "mode");
-		op.add(Builder::userDictionary, JsonpDeserializer.stringDeserializer(), "user_dictionary");
-
-		op.ignore("type");
-	}
+    private final KuromojiTokenizationMode mode;
+
+    @Nullable
+    private final String userDictionary;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private KuromojiAnalyzer(Builder builder) {
+
+        this.mode = ApiTypeHelper.requireNonNull(builder.mode, this, "mode");
+        this.userDictionary = builder.userDictionary;
+
+    }
+
+    public static KuromojiAnalyzer of(Function<Builder, ObjectBuilder<KuromojiAnalyzer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Analyzer variant kind.
+     */
+    @Override
+    public Analyzer.Kind _analyzerKind() {
+        return Analyzer.Kind.Kuromoji;
+    }
+
+    /**
+     * Required - API name: {@code mode}
+     */
+    public final KuromojiTokenizationMode mode() {
+        return this.mode;
+    }
+
+    /**
+     * API name: {@code user_dictionary}
+     */
+    @Nullable
+    public final String userDictionary() {
+        return this.userDictionary;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "kuromoji");
+
+        generator.writeKey("mode");
+        this.mode.serialize(generator, mapper);
+        if (this.userDictionary != null) {
+            generator.writeKey("user_dictionary");
+            generator.write(this.userDictionary);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link KuromojiAnalyzer}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<KuromojiAnalyzer> {
+        private KuromojiTokenizationMode mode;
+
+        @Nullable
+        private String userDictionary;
+
+        /**
+         * Required - API name: {@code mode}
+         */
+        public final Builder mode(KuromojiTokenizationMode value) {
+            this.mode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code user_dictionary}
+         */
+        public final Builder userDictionary(@Nullable String value) {
+            this.userDictionary = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link KuromojiAnalyzer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public KuromojiAnalyzer build() {
+            _checkSingleUse();
+
+            return new KuromojiAnalyzer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link KuromojiAnalyzer}
+     */
+    public static final JsonpDeserializer<KuromojiAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        KuromojiAnalyzer::setupKuromojiAnalyzerDeserializer
+    );
+
+    protected static void setupKuromojiAnalyzerDeserializer(ObjectDeserializer<KuromojiAnalyzer.Builder> op) {
+
+        op.add(Builder::mode, KuromojiTokenizationMode._DESERIALIZER, "mode");
+        op.add(Builder::userDictionary, JsonpDeserializer.stringDeserializer(), "user_dictionary");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiIterationMarkCharFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiIterationMarkCharFilter.java
index a897406a32..70e8dff88f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiIterationMarkCharFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiIterationMarkCharFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,129 +41,124 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.KuromojiIterationMarkCharFilter
 
-
 @JsonpDeserializable
 public class KuromojiIterationMarkCharFilter extends CharFilterBase implements CharFilterDefinitionVariant {
-	private final boolean normalizeKana;
-
-	private final boolean normalizeKanji;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private KuromojiIterationMarkCharFilter(Builder builder) {
-		super(builder);
-
-		this.normalizeKana = ApiTypeHelper.requireNonNull(builder.normalizeKana, this, "normalizeKana");
-		this.normalizeKanji = ApiTypeHelper.requireNonNull(builder.normalizeKanji, this, "normalizeKanji");
-
-	}
-
-	public static KuromojiIterationMarkCharFilter of(
-			Function<Builder, ObjectBuilder<KuromojiIterationMarkCharFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * CharFilterDefinition variant kind.
-	 */
-	@Override
-	public CharFilterDefinition.Kind _charFilterDefinitionKind() {
-		return CharFilterDefinition.Kind.KuromojiIterationMark;
-	}
-
-	/**
-	 * Required - API name: {@code normalize_kana}
-	 */
-	public final boolean normalizeKana() {
-		return this.normalizeKana;
-	}
-
-	/**
-	 * Required - API name: {@code normalize_kanji}
-	 */
-	public final boolean normalizeKanji() {
-		return this.normalizeKanji;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "kuromoji_iteration_mark");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("normalize_kana");
-		generator.write(this.normalizeKana);
-
-		generator.writeKey("normalize_kanji");
-		generator.write(this.normalizeKanji);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link KuromojiIterationMarkCharFilter}.
-	 */
-
-	public static class Builder extends CharFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<KuromojiIterationMarkCharFilter> {
-		private Boolean normalizeKana;
-
-		private Boolean normalizeKanji;
-
-		/**
-		 * Required - API name: {@code normalize_kana}
-		 */
-		public final Builder normalizeKana(boolean value) {
-			this.normalizeKana = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code normalize_kanji}
-		 */
-		public final Builder normalizeKanji(boolean value) {
-			this.normalizeKanji = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link KuromojiIterationMarkCharFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public KuromojiIterationMarkCharFilter build() {
-			_checkSingleUse();
-
-			return new KuromojiIterationMarkCharFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link KuromojiIterationMarkCharFilter}
-	 */
-	public static final JsonpDeserializer<KuromojiIterationMarkCharFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, KuromojiIterationMarkCharFilter::setupKuromojiIterationMarkCharFilterDeserializer);
-
-	protected static void setupKuromojiIterationMarkCharFilterDeserializer(
-			ObjectDeserializer<KuromojiIterationMarkCharFilter.Builder> op) {
-		CharFilterBase.setupCharFilterBaseDeserializer(op);
-		op.add(Builder::normalizeKana, JsonpDeserializer.booleanDeserializer(), "normalize_kana");
-		op.add(Builder::normalizeKanji, JsonpDeserializer.booleanDeserializer(), "normalize_kanji");
-
-		op.ignore("type");
-	}
+    private final boolean normalizeKana;
+
+    private final boolean normalizeKanji;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private KuromojiIterationMarkCharFilter(Builder builder) {
+        super(builder);
+
+        this.normalizeKana = ApiTypeHelper.requireNonNull(builder.normalizeKana, this, "normalizeKana");
+        this.normalizeKanji = ApiTypeHelper.requireNonNull(builder.normalizeKanji, this, "normalizeKanji");
+
+    }
+
+    public static KuromojiIterationMarkCharFilter of(Function<Builder, ObjectBuilder<KuromojiIterationMarkCharFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * CharFilterDefinition variant kind.
+     */
+    @Override
+    public CharFilterDefinition.Kind _charFilterDefinitionKind() {
+        return CharFilterDefinition.Kind.KuromojiIterationMark;
+    }
+
+    /**
+     * Required - API name: {@code normalize_kana}
+     */
+    public final boolean normalizeKana() {
+        return this.normalizeKana;
+    }
+
+    /**
+     * Required - API name: {@code normalize_kanji}
+     */
+    public final boolean normalizeKanji() {
+        return this.normalizeKanji;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "kuromoji_iteration_mark");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("normalize_kana");
+        generator.write(this.normalizeKana);
+
+        generator.writeKey("normalize_kanji");
+        generator.write(this.normalizeKanji);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link KuromojiIterationMarkCharFilter}.
+     */
+
+    public static class Builder extends CharFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<KuromojiIterationMarkCharFilter> {
+        private Boolean normalizeKana;
+
+        private Boolean normalizeKanji;
+
+        /**
+         * Required - API name: {@code normalize_kana}
+         */
+        public final Builder normalizeKana(boolean value) {
+            this.normalizeKana = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code normalize_kanji}
+         */
+        public final Builder normalizeKanji(boolean value) {
+            this.normalizeKanji = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link KuromojiIterationMarkCharFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public KuromojiIterationMarkCharFilter build() {
+            _checkSingleUse();
+
+            return new KuromojiIterationMarkCharFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link KuromojiIterationMarkCharFilter}
+     */
+    public static final JsonpDeserializer<KuromojiIterationMarkCharFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        KuromojiIterationMarkCharFilter::setupKuromojiIterationMarkCharFilterDeserializer
+    );
+
+    protected static void setupKuromojiIterationMarkCharFilterDeserializer(ObjectDeserializer<KuromojiIterationMarkCharFilter.Builder> op) {
+        CharFilterBase.setupCharFilterBaseDeserializer(op);
+        op.add(Builder::normalizeKana, JsonpDeserializer.booleanDeserializer(), "normalize_kana");
+        op.add(Builder::normalizeKanji, JsonpDeserializer.booleanDeserializer(), "normalize_kanji");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiPartOfSpeechTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiPartOfSpeechTokenFilter.java
index d89086616f..dfa552c057 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiPartOfSpeechTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiPartOfSpeechTokenFilter.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,127 +42,120 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _types.analysis.KuromojiPartOfSpeechTokenFilter
 
-
 @JsonpDeserializable
 public class KuromojiPartOfSpeechTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final List<String> stoptags;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private KuromojiPartOfSpeechTokenFilter(Builder builder) {
-		super(builder);
-
-		this.stoptags = ApiTypeHelper.unmodifiableRequired(builder.stoptags, this, "stoptags");
-
-	}
-
-	public static KuromojiPartOfSpeechTokenFilter of(
-			Function<Builder, ObjectBuilder<KuromojiPartOfSpeechTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.KuromojiPartOfSpeech;
-	}
-
-	/**
-	 * Required - API name: {@code stoptags}
-	 */
-	public final List<String> stoptags() {
-		return this.stoptags;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "kuromoji_part_of_speech");
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.stoptags)) {
-			generator.writeKey("stoptags");
-			generator.writeStartArray();
-			for (String item0 : this.stoptags) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link KuromojiPartOfSpeechTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<KuromojiPartOfSpeechTokenFilter> {
-		private List<String> stoptags;
-
-		/**
-		 * Required - API name: {@code stoptags}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>stoptags</code>.
-		 */
-		public final Builder stoptags(List<String> list) {
-			this.stoptags = _listAddAll(this.stoptags, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code stoptags}
-		 * <p>
-		 * Adds one or more values to <code>stoptags</code>.
-		 */
-		public final Builder stoptags(String value, String... values) {
-			this.stoptags = _listAdd(this.stoptags, value, values);
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link KuromojiPartOfSpeechTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public KuromojiPartOfSpeechTokenFilter build() {
-			_checkSingleUse();
-
-			return new KuromojiPartOfSpeechTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link KuromojiPartOfSpeechTokenFilter}
-	 */
-	public static final JsonpDeserializer<KuromojiPartOfSpeechTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, KuromojiPartOfSpeechTokenFilter::setupKuromojiPartOfSpeechTokenFilterDeserializer);
-
-	protected static void setupKuromojiPartOfSpeechTokenFilterDeserializer(
-			ObjectDeserializer<KuromojiPartOfSpeechTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::stoptags, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"stoptags");
-
-		op.ignore("type");
-	}
+    private final List<String> stoptags;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private KuromojiPartOfSpeechTokenFilter(Builder builder) {
+        super(builder);
+
+        this.stoptags = ApiTypeHelper.unmodifiableRequired(builder.stoptags, this, "stoptags");
+
+    }
+
+    public static KuromojiPartOfSpeechTokenFilter of(Function<Builder, ObjectBuilder<KuromojiPartOfSpeechTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.KuromojiPartOfSpeech;
+    }
+
+    /**
+     * Required - API name: {@code stoptags}
+     */
+    public final List<String> stoptags() {
+        return this.stoptags;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "kuromoji_part_of_speech");
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.stoptags)) {
+            generator.writeKey("stoptags");
+            generator.writeStartArray();
+            for (String item0 : this.stoptags) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link KuromojiPartOfSpeechTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<KuromojiPartOfSpeechTokenFilter> {
+        private List<String> stoptags;
+
+        /**
+         * Required - API name: {@code stoptags}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>stoptags</code>.
+         */
+        public final Builder stoptags(List<String> list) {
+            this.stoptags = _listAddAll(this.stoptags, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code stoptags}
+         * <p>
+         * Adds one or more values to <code>stoptags</code>.
+         */
+        public final Builder stoptags(String value, String... values) {
+            this.stoptags = _listAdd(this.stoptags, value, values);
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link KuromojiPartOfSpeechTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public KuromojiPartOfSpeechTokenFilter build() {
+            _checkSingleUse();
+
+            return new KuromojiPartOfSpeechTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link KuromojiPartOfSpeechTokenFilter}
+     */
+    public static final JsonpDeserializer<KuromojiPartOfSpeechTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        KuromojiPartOfSpeechTokenFilter::setupKuromojiPartOfSpeechTokenFilterDeserializer
+    );
+
+    protected static void setupKuromojiPartOfSpeechTokenFilterDeserializer(ObjectDeserializer<KuromojiPartOfSpeechTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::stoptags, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stoptags");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiReadingFormTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiReadingFormTokenFilter.java
index c215c3cdeb..5b8758b120 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiReadingFormTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiReadingFormTokenFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,104 +41,100 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.KuromojiReadingFormTokenFilter
 
 @JsonpDeserializable
 public class KuromojiReadingFormTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final boolean useRomaji;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private KuromojiReadingFormTokenFilter(Builder builder) {
-		super(builder);
-
-		this.useRomaji = ApiTypeHelper.requireNonNull(builder.useRomaji, this, "useRomaji");
-
-	}
-
-	public static KuromojiReadingFormTokenFilter of(
-			Function<Builder, ObjectBuilder<KuromojiReadingFormTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.KuromojiReadingform;
-	}
-
-	/**
-	 * Required - API name: {@code use_romaji}
-	 */
-	public final boolean useRomaji() {
-		return this.useRomaji;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "kuromoji_readingform");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("use_romaji");
-		generator.write(this.useRomaji);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link KuromojiReadingFormTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<KuromojiReadingFormTokenFilter> {
-		private Boolean useRomaji;
-
-		/**
-		 * Required - API name: {@code use_romaji}
-		 */
-		public final Builder useRomaji(boolean value) {
-			this.useRomaji = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link KuromojiReadingFormTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public KuromojiReadingFormTokenFilter build() {
-			_checkSingleUse();
-
-			return new KuromojiReadingFormTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link KuromojiReadingFormTokenFilter}
-	 */
-	public static final JsonpDeserializer<KuromojiReadingFormTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, KuromojiReadingFormTokenFilter::setupKuromojiReadingFormTokenFilterDeserializer);
-
-	protected static void setupKuromojiReadingFormTokenFilterDeserializer(
-			ObjectDeserializer<KuromojiReadingFormTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::useRomaji, JsonpDeserializer.booleanDeserializer(), "use_romaji");
-
-		op.ignore("type");
-	}
+    private final boolean useRomaji;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private KuromojiReadingFormTokenFilter(Builder builder) {
+        super(builder);
+
+        this.useRomaji = ApiTypeHelper.requireNonNull(builder.useRomaji, this, "useRomaji");
+
+    }
+
+    public static KuromojiReadingFormTokenFilter of(Function<Builder, ObjectBuilder<KuromojiReadingFormTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.KuromojiReadingform;
+    }
+
+    /**
+     * Required - API name: {@code use_romaji}
+     */
+    public final boolean useRomaji() {
+        return this.useRomaji;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "kuromoji_readingform");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("use_romaji");
+        generator.write(this.useRomaji);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link KuromojiReadingFormTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<KuromojiReadingFormTokenFilter> {
+        private Boolean useRomaji;
+
+        /**
+         * Required - API name: {@code use_romaji}
+         */
+        public final Builder useRomaji(boolean value) {
+            this.useRomaji = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link KuromojiReadingFormTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public KuromojiReadingFormTokenFilter build() {
+            _checkSingleUse();
+
+            return new KuromojiReadingFormTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link KuromojiReadingFormTokenFilter}
+     */
+    public static final JsonpDeserializer<KuromojiReadingFormTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        KuromojiReadingFormTokenFilter::setupKuromojiReadingFormTokenFilterDeserializer
+    );
+
+    protected static void setupKuromojiReadingFormTokenFilterDeserializer(ObjectDeserializer<KuromojiReadingFormTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::useRomaji, JsonpDeserializer.booleanDeserializer(), "use_romaji");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiStemmerTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiStemmerTokenFilter.java
index 7d8baa606c..4d8165a28b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiStemmerTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiStemmerTokenFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,103 +41,100 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.KuromojiStemmerTokenFilter
 
 @JsonpDeserializable
 public class KuromojiStemmerTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final int minimumLength;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private KuromojiStemmerTokenFilter(Builder builder) {
-		super(builder);
-
-		this.minimumLength = ApiTypeHelper.requireNonNull(builder.minimumLength, this, "minimumLength");
-
-	}
-
-	public static KuromojiStemmerTokenFilter of(Function<Builder, ObjectBuilder<KuromojiStemmerTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.KuromojiStemmer;
-	}
-
-	/**
-	 * Required - API name: {@code minimum_length}
-	 */
-	public final int minimumLength() {
-		return this.minimumLength;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "kuromoji_stemmer");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("minimum_length");
-		generator.write(this.minimumLength);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link KuromojiStemmerTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<KuromojiStemmerTokenFilter> {
-		private Integer minimumLength;
-
-		/**
-		 * Required - API name: {@code minimum_length}
-		 */
-		public final Builder minimumLength(int value) {
-			this.minimumLength = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link KuromojiStemmerTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public KuromojiStemmerTokenFilter build() {
-			_checkSingleUse();
-
-			return new KuromojiStemmerTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link KuromojiStemmerTokenFilter}
-	 */
-	public static final JsonpDeserializer<KuromojiStemmerTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, KuromojiStemmerTokenFilter::setupKuromojiStemmerTokenFilterDeserializer);
-
-	protected static void setupKuromojiStemmerTokenFilterDeserializer(
-			ObjectDeserializer<KuromojiStemmerTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::minimumLength, JsonpDeserializer.integerDeserializer(), "minimum_length");
-
-		op.ignore("type");
-	}
+    private final int minimumLength;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private KuromojiStemmerTokenFilter(Builder builder) {
+        super(builder);
+
+        this.minimumLength = ApiTypeHelper.requireNonNull(builder.minimumLength, this, "minimumLength");
+
+    }
+
+    public static KuromojiStemmerTokenFilter of(Function<Builder, ObjectBuilder<KuromojiStemmerTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.KuromojiStemmer;
+    }
+
+    /**
+     * Required - API name: {@code minimum_length}
+     */
+    public final int minimumLength() {
+        return this.minimumLength;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "kuromoji_stemmer");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("minimum_length");
+        generator.write(this.minimumLength);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link KuromojiStemmerTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<KuromojiStemmerTokenFilter> {
+        private Integer minimumLength;
+
+        /**
+         * Required - API name: {@code minimum_length}
+         */
+        public final Builder minimumLength(int value) {
+            this.minimumLength = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link KuromojiStemmerTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public KuromojiStemmerTokenFilter build() {
+            _checkSingleUse();
+
+            return new KuromojiStemmerTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link KuromojiStemmerTokenFilter}
+     */
+    public static final JsonpDeserializer<KuromojiStemmerTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        KuromojiStemmerTokenFilter::setupKuromojiStemmerTokenFilterDeserializer
+    );
+
+    protected static void setupKuromojiStemmerTokenFilterDeserializer(ObjectDeserializer<KuromojiStemmerTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::minimumLength, JsonpDeserializer.integerDeserializer(), "minimum_length");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiTokenizationMode.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiTokenizationMode.java
index 0dd6e824f1..4f1002f8f9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiTokenizationMode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiTokenizationMode.java
@@ -35,27 +35,27 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum KuromojiTokenizationMode implements JsonEnum {
-	Normal("normal"),
+    Normal("normal"),
 
-	Search("search"),
+    Search("search"),
 
-	Extended("extended"),
+    Extended("extended"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	KuromojiTokenizationMode(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    KuromojiTokenizationMode(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<KuromojiTokenizationMode> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			KuromojiTokenizationMode.values());
+    public static final JsonEnum.Deserializer<KuromojiTokenizationMode> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        KuromojiTokenizationMode.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiTokenizer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiTokenizer.java
index 4eefb18d17..d968d64339 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiTokenizer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/KuromojiTokenizer.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,295 +43,293 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.KuromojiTokenizer
 
-
 @JsonpDeserializable
 public class KuromojiTokenizer extends TokenizerBase implements TokenizerDefinitionVariant {
-	@Nullable
-	private final Boolean discardPunctuation;
-
-	private final KuromojiTokenizationMode mode;
-
-	@Nullable
-	private final Integer nbestCost;
-
-	@Nullable
-	private final String nbestExamples;
-
-	@Nullable
-	private final String userDictionary;
-
-	private final List<String> userDictionaryRules;
-
-	@Nullable
-	private final Boolean discardCompoundToken;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private KuromojiTokenizer(Builder builder) {
-		super(builder);
-
-		this.discardPunctuation = builder.discardPunctuation;
-		this.mode = ApiTypeHelper.requireNonNull(builder.mode, this, "mode");
-		this.nbestCost = builder.nbestCost;
-		this.nbestExamples = builder.nbestExamples;
-		this.userDictionary = builder.userDictionary;
-		this.userDictionaryRules = ApiTypeHelper.unmodifiable(builder.userDictionaryRules);
-		this.discardCompoundToken = builder.discardCompoundToken;
-
-	}
-
-	public static KuromojiTokenizer of(Function<Builder, ObjectBuilder<KuromojiTokenizer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenizerDefinition variant kind.
-	 */
-	@Override
-	public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
-		return TokenizerDefinition.Kind.KuromojiTokenizer;
-	}
-
-	/**
-	 * API name: {@code discard_punctuation}
-	 */
-	@Nullable
-	public final Boolean discardPunctuation() {
-		return this.discardPunctuation;
-	}
-
-	/**
-	 * Required - API name: {@code mode}
-	 */
-	public final KuromojiTokenizationMode mode() {
-		return this.mode;
-	}
-
-	/**
-	 * API name: {@code nbest_cost}
-	 */
-	@Nullable
-	public final Integer nbestCost() {
-		return this.nbestCost;
-	}
-
-	/**
-	 * API name: {@code nbest_examples}
-	 */
-	@Nullable
-	public final String nbestExamples() {
-		return this.nbestExamples;
-	}
-
-	/**
-	 * API name: {@code user_dictionary}
-	 */
-	@Nullable
-	public final String userDictionary() {
-		return this.userDictionary;
-	}
-
-	/**
-	 * API name: {@code user_dictionary_rules}
-	 */
-	public final List<String> userDictionaryRules() {
-		return this.userDictionaryRules;
-	}
-
-	/**
-	 * API name: {@code discard_compound_token}
-	 */
-	@Nullable
-	public final Boolean discardCompoundToken() {
-		return this.discardCompoundToken;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "kuromoji_tokenizer");
-		super.serializeInternal(generator, mapper);
-		if (this.discardPunctuation != null) {
-			generator.writeKey("discard_punctuation");
-			generator.write(this.discardPunctuation);
-
-		}
-		generator.writeKey("mode");
-		this.mode.serialize(generator, mapper);
-		if (this.nbestCost != null) {
-			generator.writeKey("nbest_cost");
-			generator.write(this.nbestCost);
-
-		}
-		if (this.nbestExamples != null) {
-			generator.writeKey("nbest_examples");
-			generator.write(this.nbestExamples);
-
-		}
-		if (this.userDictionary != null) {
-			generator.writeKey("user_dictionary");
-			generator.write(this.userDictionary);
-
-		}
-		if (ApiTypeHelper.isDefined(this.userDictionaryRules)) {
-			generator.writeKey("user_dictionary_rules");
-			generator.writeStartArray();
-			for (String item0 : this.userDictionaryRules) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.discardCompoundToken != null) {
-			generator.writeKey("discard_compound_token");
-			generator.write(this.discardCompoundToken);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link KuromojiTokenizer}.
-	 */
-
-	public static class Builder extends TokenizerBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<KuromojiTokenizer> {
-		@Nullable
-		private Boolean discardPunctuation;
-
-		private KuromojiTokenizationMode mode;
-
-		@Nullable
-		private Integer nbestCost;
-
-		@Nullable
-		private String nbestExamples;
-
-		@Nullable
-		private String userDictionary;
-
-		@Nullable
-		private List<String> userDictionaryRules;
-
-		@Nullable
-		private Boolean discardCompoundToken;
-
-		/**
-		 * API name: {@code discard_punctuation}
-		 */
-		public final Builder discardPunctuation(@Nullable Boolean value) {
-			this.discardPunctuation = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mode}
-		 */
-		public final Builder mode(KuromojiTokenizationMode value) {
-			this.mode = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code nbest_cost}
-		 */
-		public final Builder nbestCost(@Nullable Integer value) {
-			this.nbestCost = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code nbest_examples}
-		 */
-		public final Builder nbestExamples(@Nullable String value) {
-			this.nbestExamples = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code user_dictionary}
-		 */
-		public final Builder userDictionary(@Nullable String value) {
-			this.userDictionary = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code user_dictionary_rules}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>userDictionaryRules</code>.
-		 */
-		public final Builder userDictionaryRules(List<String> list) {
-			this.userDictionaryRules = _listAddAll(this.userDictionaryRules, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code user_dictionary_rules}
-		 * <p>
-		 * Adds one or more values to <code>userDictionaryRules</code>.
-		 */
-		public final Builder userDictionaryRules(String value, String... values) {
-			this.userDictionaryRules = _listAdd(this.userDictionaryRules, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code discard_compound_token}
-		 */
-		public final Builder discardCompoundToken(@Nullable Boolean value) {
-			this.discardCompoundToken = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link KuromojiTokenizer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public KuromojiTokenizer build() {
-			_checkSingleUse();
-
-			return new KuromojiTokenizer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link KuromojiTokenizer}
-	 */
-	public static final JsonpDeserializer<KuromojiTokenizer> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, KuromojiTokenizer::setupKuromojiTokenizerDeserializer);
-
-	protected static void setupKuromojiTokenizerDeserializer(ObjectDeserializer<KuromojiTokenizer.Builder> op) {
-		TokenizerBase.setupTokenizerBaseDeserializer(op);
-		op.add(Builder::discardPunctuation, JsonpDeserializer.booleanDeserializer(), "discard_punctuation");
-		op.add(Builder::mode, KuromojiTokenizationMode._DESERIALIZER, "mode");
-		op.add(Builder::nbestCost, JsonpDeserializer.integerDeserializer(), "nbest_cost");
-		op.add(Builder::nbestExamples, JsonpDeserializer.stringDeserializer(), "nbest_examples");
-		op.add(Builder::userDictionary, JsonpDeserializer.stringDeserializer(), "user_dictionary");
-		op.add(Builder::userDictionaryRules,
-				JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "user_dictionary_rules");
-		op.add(Builder::discardCompoundToken, JsonpDeserializer.booleanDeserializer(), "discard_compound_token");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Boolean discardPunctuation;
+
+    private final KuromojiTokenizationMode mode;
+
+    @Nullable
+    private final Integer nbestCost;
+
+    @Nullable
+    private final String nbestExamples;
+
+    @Nullable
+    private final String userDictionary;
+
+    private final List<String> userDictionaryRules;
+
+    @Nullable
+    private final Boolean discardCompoundToken;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private KuromojiTokenizer(Builder builder) {
+        super(builder);
+
+        this.discardPunctuation = builder.discardPunctuation;
+        this.mode = ApiTypeHelper.requireNonNull(builder.mode, this, "mode");
+        this.nbestCost = builder.nbestCost;
+        this.nbestExamples = builder.nbestExamples;
+        this.userDictionary = builder.userDictionary;
+        this.userDictionaryRules = ApiTypeHelper.unmodifiable(builder.userDictionaryRules);
+        this.discardCompoundToken = builder.discardCompoundToken;
+
+    }
+
+    public static KuromojiTokenizer of(Function<Builder, ObjectBuilder<KuromojiTokenizer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenizerDefinition variant kind.
+     */
+    @Override
+    public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
+        return TokenizerDefinition.Kind.KuromojiTokenizer;
+    }
+
+    /**
+     * API name: {@code discard_punctuation}
+     */
+    @Nullable
+    public final Boolean discardPunctuation() {
+        return this.discardPunctuation;
+    }
+
+    /**
+     * Required - API name: {@code mode}
+     */
+    public final KuromojiTokenizationMode mode() {
+        return this.mode;
+    }
+
+    /**
+     * API name: {@code nbest_cost}
+     */
+    @Nullable
+    public final Integer nbestCost() {
+        return this.nbestCost;
+    }
+
+    /**
+     * API name: {@code nbest_examples}
+     */
+    @Nullable
+    public final String nbestExamples() {
+        return this.nbestExamples;
+    }
+
+    /**
+     * API name: {@code user_dictionary}
+     */
+    @Nullable
+    public final String userDictionary() {
+        return this.userDictionary;
+    }
+
+    /**
+     * API name: {@code user_dictionary_rules}
+     */
+    public final List<String> userDictionaryRules() {
+        return this.userDictionaryRules;
+    }
+
+    /**
+     * API name: {@code discard_compound_token}
+     */
+    @Nullable
+    public final Boolean discardCompoundToken() {
+        return this.discardCompoundToken;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "kuromoji_tokenizer");
+        super.serializeInternal(generator, mapper);
+        if (this.discardPunctuation != null) {
+            generator.writeKey("discard_punctuation");
+            generator.write(this.discardPunctuation);
+
+        }
+        generator.writeKey("mode");
+        this.mode.serialize(generator, mapper);
+        if (this.nbestCost != null) {
+            generator.writeKey("nbest_cost");
+            generator.write(this.nbestCost);
+
+        }
+        if (this.nbestExamples != null) {
+            generator.writeKey("nbest_examples");
+            generator.write(this.nbestExamples);
+
+        }
+        if (this.userDictionary != null) {
+            generator.writeKey("user_dictionary");
+            generator.write(this.userDictionary);
+
+        }
+        if (ApiTypeHelper.isDefined(this.userDictionaryRules)) {
+            generator.writeKey("user_dictionary_rules");
+            generator.writeStartArray();
+            for (String item0 : this.userDictionaryRules) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.discardCompoundToken != null) {
+            generator.writeKey("discard_compound_token");
+            generator.write(this.discardCompoundToken);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link KuromojiTokenizer}.
+     */
+
+    public static class Builder extends TokenizerBase.AbstractBuilder<Builder> implements ObjectBuilder<KuromojiTokenizer> {
+        @Nullable
+        private Boolean discardPunctuation;
+
+        private KuromojiTokenizationMode mode;
+
+        @Nullable
+        private Integer nbestCost;
+
+        @Nullable
+        private String nbestExamples;
+
+        @Nullable
+        private String userDictionary;
+
+        @Nullable
+        private List<String> userDictionaryRules;
+
+        @Nullable
+        private Boolean discardCompoundToken;
+
+        /**
+         * API name: {@code discard_punctuation}
+         */
+        public final Builder discardPunctuation(@Nullable Boolean value) {
+            this.discardPunctuation = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mode}
+         */
+        public final Builder mode(KuromojiTokenizationMode value) {
+            this.mode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code nbest_cost}
+         */
+        public final Builder nbestCost(@Nullable Integer value) {
+            this.nbestCost = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code nbest_examples}
+         */
+        public final Builder nbestExamples(@Nullable String value) {
+            this.nbestExamples = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code user_dictionary}
+         */
+        public final Builder userDictionary(@Nullable String value) {
+            this.userDictionary = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code user_dictionary_rules}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>userDictionaryRules</code>.
+         */
+        public final Builder userDictionaryRules(List<String> list) {
+            this.userDictionaryRules = _listAddAll(this.userDictionaryRules, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code user_dictionary_rules}
+         * <p>
+         * Adds one or more values to <code>userDictionaryRules</code>.
+         */
+        public final Builder userDictionaryRules(String value, String... values) {
+            this.userDictionaryRules = _listAdd(this.userDictionaryRules, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code discard_compound_token}
+         */
+        public final Builder discardCompoundToken(@Nullable Boolean value) {
+            this.discardCompoundToken = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link KuromojiTokenizer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public KuromojiTokenizer build() {
+            _checkSingleUse();
+
+            return new KuromojiTokenizer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link KuromojiTokenizer}
+     */
+    public static final JsonpDeserializer<KuromojiTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        KuromojiTokenizer::setupKuromojiTokenizerDeserializer
+    );
+
+    protected static void setupKuromojiTokenizerDeserializer(ObjectDeserializer<KuromojiTokenizer.Builder> op) {
+        TokenizerBase.setupTokenizerBaseDeserializer(op);
+        op.add(Builder::discardPunctuation, JsonpDeserializer.booleanDeserializer(), "discard_punctuation");
+        op.add(Builder::mode, KuromojiTokenizationMode._DESERIALIZER, "mode");
+        op.add(Builder::nbestCost, JsonpDeserializer.integerDeserializer(), "nbest_cost");
+        op.add(Builder::nbestExamples, JsonpDeserializer.stringDeserializer(), "nbest_examples");
+        op.add(Builder::userDictionary, JsonpDeserializer.stringDeserializer(), "user_dictionary");
+        op.add(
+            Builder::userDictionaryRules,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
+            "user_dictionary_rules"
+        );
+        op.add(Builder::discardCompoundToken, JsonpDeserializer.booleanDeserializer(), "discard_compound_token");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/Language.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/Language.java
index 33798cb163..c90e4eeec3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/Language.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/Language.java
@@ -37,85 +37,85 @@
 
 @JsonpDeserializable
 public enum Language implements JsonEnum {
-	Arabic("Arabic"),
+    Arabic("Arabic"),
 
-	Armenian("Armenian"),
+    Armenian("Armenian"),
 
-	Basque("Basque"),
+    Basque("Basque"),
 
-	Brazilian("Brazilian"),
+    Brazilian("Brazilian"),
 
-	Bulgarian("Bulgarian"),
+    Bulgarian("Bulgarian"),
 
-	Catalan("Catalan"),
+    Catalan("Catalan"),
 
-	Chinese("Chinese"),
+    Chinese("Chinese"),
 
-	Cjk("Cjk"),
+    Cjk("Cjk"),
 
-	Czech("Czech"),
+    Czech("Czech"),
 
-	Danish("Danish"),
+    Danish("Danish"),
 
-	Dutch("Dutch"),
+    Dutch("Dutch"),
 
-	English("English"),
+    English("English"),
 
-	Estonian("Estonian"),
+    Estonian("Estonian"),
 
-	Finnish("Finnish"),
+    Finnish("Finnish"),
 
-	French("French"),
+    French("French"),
 
-	Galician("Galician"),
+    Galician("Galician"),
 
-	German("German"),
+    German("German"),
 
-	Greek("Greek"),
+    Greek("Greek"),
 
-	Hindi("Hindi"),
+    Hindi("Hindi"),
 
-	Hungarian("Hungarian"),
+    Hungarian("Hungarian"),
 
-	Indonesian("Indonesian"),
+    Indonesian("Indonesian"),
 
-	Irish("Irish"),
+    Irish("Irish"),
 
-	Italian("Italian"),
+    Italian("Italian"),
 
-	Latvian("Latvian"),
+    Latvian("Latvian"),
 
-	Norwegian("Norwegian"),
+    Norwegian("Norwegian"),
 
-	Persian("Persian"),
+    Persian("Persian"),
 
-	Portuguese("Portuguese"),
+    Portuguese("Portuguese"),
 
-	Romanian("Romanian"),
+    Romanian("Romanian"),
 
-	Russian("Russian"),
+    Russian("Russian"),
 
-	Sorani("Sorani"),
+    Sorani("Sorani"),
 
-	Spanish("Spanish"),
+    Spanish("Spanish"),
 
-	Swedish("Swedish"),
+    Swedish("Swedish"),
 
-	Turkish("Turkish"),
+    Turkish("Turkish"),
 
-	Thai("Thai"),
+    Thai("Thai"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	Language(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    Language(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<Language> _DESERIALIZER = new JsonEnum.Deserializer<>(Language.values());
+    public static final JsonEnum.Deserializer<Language> _DESERIALIZER = new JsonEnum.Deserializer<>(Language.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LanguageAnalyzer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LanguageAnalyzer.java
index e62f248321..d2684dc242 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LanguageAnalyzer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LanguageAnalyzer.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,253 +45,248 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.LanguageAnalyzer
 
-
 @JsonpDeserializable
 public class LanguageAnalyzer implements AnalyzerVariant, JsonpSerializable {
-	@Nullable
-	private final String version;
-
-	private final Language language;
-
-	private final List<String> stemExclusion;
-
-	private final List<String> stopwords;
-
-	@Nullable
-	private final String stopwordsPath;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private LanguageAnalyzer(Builder builder) {
-
-		this.version = builder.version;
-		this.language = ApiTypeHelper.requireNonNull(builder.language, this, "language");
-		this.stemExclusion = ApiTypeHelper.unmodifiableRequired(builder.stemExclusion, this, "stemExclusion");
-		this.stopwords = ApiTypeHelper.unmodifiable(builder.stopwords);
-		this.stopwordsPath = builder.stopwordsPath;
-
-	}
-
-	public static LanguageAnalyzer of(Function<Builder, ObjectBuilder<LanguageAnalyzer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Analyzer variant kind.
-	 */
-	@Override
-	public Analyzer.Kind _analyzerKind() {
-		return Analyzer.Kind.Language;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final String version() {
-		return this.version;
-	}
-
-	/**
-	 * Required - API name: {@code language}
-	 */
-	public final Language language() {
-		return this.language;
-	}
-
-	/**
-	 * Required - API name: {@code stem_exclusion}
-	 */
-	public final List<String> stemExclusion() {
-		return this.stemExclusion;
-	}
-
-	/**
-	 * API name: {@code stopwords}
-	 */
-	public final List<String> stopwords() {
-		return this.stopwords;
-	}
-
-	/**
-	 * API name: {@code stopwords_path}
-	 */
-	@Nullable
-	public final String stopwordsPath() {
-		return this.stopwordsPath;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "language");
-
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		generator.writeKey("language");
-		this.language.serialize(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.stemExclusion)) {
-			generator.writeKey("stem_exclusion");
-			generator.writeStartArray();
-			for (String item0 : this.stemExclusion) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.stopwords)) {
-			generator.writeKey("stopwords");
-			generator.writeStartArray();
-			for (String item0 : this.stopwords) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.stopwordsPath != null) {
-			generator.writeKey("stopwords_path");
-			generator.write(this.stopwordsPath);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link LanguageAnalyzer}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<LanguageAnalyzer> {
-		@Nullable
-		private String version;
-
-		private Language language;
-
-		private List<String> stemExclusion;
-
-		@Nullable
-		private List<String> stopwords;
-
-		@Nullable
-		private String stopwordsPath;
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code language}
-		 */
-		public final Builder language(Language value) {
-			this.language = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code stem_exclusion}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>stemExclusion</code>.
-		 */
-		public final Builder stemExclusion(List<String> list) {
-			this.stemExclusion = _listAddAll(this.stemExclusion, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code stem_exclusion}
-		 * <p>
-		 * Adds one or more values to <code>stemExclusion</code>.
-		 */
-		public final Builder stemExclusion(String value, String... values) {
-			this.stemExclusion = _listAdd(this.stemExclusion, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stopwords}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>stopwords</code>.
-		 */
-		public final Builder stopwords(List<String> list) {
-			this.stopwords = _listAddAll(this.stopwords, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stopwords}
-		 * <p>
-		 * Adds one or more values to <code>stopwords</code>.
-		 */
-		public final Builder stopwords(String value, String... values) {
-			this.stopwords = _listAdd(this.stopwords, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stopwords_path}
-		 */
-		public final Builder stopwordsPath(@Nullable String value) {
-			this.stopwordsPath = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link LanguageAnalyzer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LanguageAnalyzer build() {
-			_checkSingleUse();
-
-			return new LanguageAnalyzer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link LanguageAnalyzer}
-	 */
-	public static final JsonpDeserializer<LanguageAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			LanguageAnalyzer::setupLanguageAnalyzerDeserializer);
-
-	protected static void setupLanguageAnalyzerDeserializer(ObjectDeserializer<LanguageAnalyzer.Builder> op) {
-
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
-		op.add(Builder::language, Language._DESERIALIZER, "language");
-		op.add(Builder::stemExclusion, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"stem_exclusion");
-		op.add(Builder::stopwords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"stopwords");
-		op.add(Builder::stopwordsPath, JsonpDeserializer.stringDeserializer(), "stopwords_path");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final String version;
+
+    private final Language language;
+
+    private final List<String> stemExclusion;
+
+    private final List<String> stopwords;
+
+    @Nullable
+    private final String stopwordsPath;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private LanguageAnalyzer(Builder builder) {
+
+        this.version = builder.version;
+        this.language = ApiTypeHelper.requireNonNull(builder.language, this, "language");
+        this.stemExclusion = ApiTypeHelper.unmodifiableRequired(builder.stemExclusion, this, "stemExclusion");
+        this.stopwords = ApiTypeHelper.unmodifiable(builder.stopwords);
+        this.stopwordsPath = builder.stopwordsPath;
+
+    }
+
+    public static LanguageAnalyzer of(Function<Builder, ObjectBuilder<LanguageAnalyzer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Analyzer variant kind.
+     */
+    @Override
+    public Analyzer.Kind _analyzerKind() {
+        return Analyzer.Kind.Language;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final String version() {
+        return this.version;
+    }
+
+    /**
+     * Required - API name: {@code language}
+     */
+    public final Language language() {
+        return this.language;
+    }
+
+    /**
+     * Required - API name: {@code stem_exclusion}
+     */
+    public final List<String> stemExclusion() {
+        return this.stemExclusion;
+    }
+
+    /**
+     * API name: {@code stopwords}
+     */
+    public final List<String> stopwords() {
+        return this.stopwords;
+    }
+
+    /**
+     * API name: {@code stopwords_path}
+     */
+    @Nullable
+    public final String stopwordsPath() {
+        return this.stopwordsPath;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "language");
+
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        generator.writeKey("language");
+        this.language.serialize(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.stemExclusion)) {
+            generator.writeKey("stem_exclusion");
+            generator.writeStartArray();
+            for (String item0 : this.stemExclusion) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.stopwords)) {
+            generator.writeKey("stopwords");
+            generator.writeStartArray();
+            for (String item0 : this.stopwords) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.stopwordsPath != null) {
+            generator.writeKey("stopwords_path");
+            generator.write(this.stopwordsPath);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link LanguageAnalyzer}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<LanguageAnalyzer> {
+        @Nullable
+        private String version;
+
+        private Language language;
+
+        private List<String> stemExclusion;
+
+        @Nullable
+        private List<String> stopwords;
+
+        @Nullable
+        private String stopwordsPath;
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code language}
+         */
+        public final Builder language(Language value) {
+            this.language = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code stem_exclusion}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>stemExclusion</code>.
+         */
+        public final Builder stemExclusion(List<String> list) {
+            this.stemExclusion = _listAddAll(this.stemExclusion, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code stem_exclusion}
+         * <p>
+         * Adds one or more values to <code>stemExclusion</code>.
+         */
+        public final Builder stemExclusion(String value, String... values) {
+            this.stemExclusion = _listAdd(this.stemExclusion, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code stopwords}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>stopwords</code>.
+         */
+        public final Builder stopwords(List<String> list) {
+            this.stopwords = _listAddAll(this.stopwords, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code stopwords}
+         * <p>
+         * Adds one or more values to <code>stopwords</code>.
+         */
+        public final Builder stopwords(String value, String... values) {
+            this.stopwords = _listAdd(this.stopwords, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code stopwords_path}
+         */
+        public final Builder stopwordsPath(@Nullable String value) {
+            this.stopwordsPath = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link LanguageAnalyzer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LanguageAnalyzer build() {
+            _checkSingleUse();
+
+            return new LanguageAnalyzer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link LanguageAnalyzer}
+     */
+    public static final JsonpDeserializer<LanguageAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LanguageAnalyzer::setupLanguageAnalyzerDeserializer
+    );
+
+    protected static void setupLanguageAnalyzerDeserializer(ObjectDeserializer<LanguageAnalyzer.Builder> op) {
+
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
+        op.add(Builder::language, Language._DESERIALIZER, "language");
+        op.add(Builder::stemExclusion, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stem_exclusion");
+        op.add(Builder::stopwords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stopwords");
+        op.add(Builder::stopwordsPath, JsonpDeserializer.stringDeserializer(), "stopwords_path");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LengthTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LengthTokenFilter.java
index c3361d4098..8715876bad 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LengthTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LengthTokenFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,126 +41,124 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.LengthTokenFilter
 
 @JsonpDeserializable
 public class LengthTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final int max;
-
-	private final int min;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private LengthTokenFilter(Builder builder) {
-		super(builder);
-
-		this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
-		this.min = ApiTypeHelper.requireNonNull(builder.min, this, "min");
-
-	}
-
-	public static LengthTokenFilter of(Function<Builder, ObjectBuilder<LengthTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Length;
-	}
-
-	/**
-	 * Required - API name: {@code max}
-	 */
-	public final int max() {
-		return this.max;
-	}
-
-	/**
-	 * Required - API name: {@code min}
-	 */
-	public final int min() {
-		return this.min;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "length");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("max");
-		generator.write(this.max);
-
-		generator.writeKey("min");
-		generator.write(this.min);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link LengthTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<LengthTokenFilter> {
-		private Integer max;
-
-		private Integer min;
-
-		/**
-		 * Required - API name: {@code max}
-		 */
-		public final Builder max(int value) {
-			this.max = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code min}
-		 */
-		public final Builder min(int value) {
-			this.min = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link LengthTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LengthTokenFilter build() {
-			_checkSingleUse();
-
-			return new LengthTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link LengthTokenFilter}
-	 */
-	public static final JsonpDeserializer<LengthTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, LengthTokenFilter::setupLengthTokenFilterDeserializer);
-
-	protected static void setupLengthTokenFilterDeserializer(ObjectDeserializer<LengthTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::max, JsonpDeserializer.integerDeserializer(), "max");
-		op.add(Builder::min, JsonpDeserializer.integerDeserializer(), "min");
-
-		op.ignore("type");
-	}
+    private final int max;
+
+    private final int min;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private LengthTokenFilter(Builder builder) {
+        super(builder);
+
+        this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
+        this.min = ApiTypeHelper.requireNonNull(builder.min, this, "min");
+
+    }
+
+    public static LengthTokenFilter of(Function<Builder, ObjectBuilder<LengthTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Length;
+    }
+
+    /**
+     * Required - API name: {@code max}
+     */
+    public final int max() {
+        return this.max;
+    }
+
+    /**
+     * Required - API name: {@code min}
+     */
+    public final int min() {
+        return this.min;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "length");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("max");
+        generator.write(this.max);
+
+        generator.writeKey("min");
+        generator.write(this.min);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link LengthTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<LengthTokenFilter> {
+        private Integer max;
+
+        private Integer min;
+
+        /**
+         * Required - API name: {@code max}
+         */
+        public final Builder max(int value) {
+            this.max = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code min}
+         */
+        public final Builder min(int value) {
+            this.min = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link LengthTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LengthTokenFilter build() {
+            _checkSingleUse();
+
+            return new LengthTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link LengthTokenFilter}
+     */
+    public static final JsonpDeserializer<LengthTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LengthTokenFilter::setupLengthTokenFilterDeserializer
+    );
+
+    protected static void setupLengthTokenFilterDeserializer(ObjectDeserializer<LengthTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::max, JsonpDeserializer.integerDeserializer(), "max");
+        op.add(Builder::min, JsonpDeserializer.integerDeserializer(), "min");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LetterTokenizer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LetterTokenizer.java
index 842e14bbff..cba1c56955 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LetterTokenizer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LetterTokenizer.java
@@ -32,86 +32,84 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.LetterTokenizer
 
-
 @JsonpDeserializable
 public class LetterTokenizer extends TokenizerBase implements TokenizerDefinitionVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private LetterTokenizer(Builder builder) {
-		super(builder);
+    private LetterTokenizer(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static LetterTokenizer of(Function<Builder, ObjectBuilder<LetterTokenizer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static LetterTokenizer of(Function<Builder, ObjectBuilder<LetterTokenizer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * TokenizerDefinition variant kind.
-	 */
-	@Override
-	public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
-		return TokenizerDefinition.Kind.Letter;
-	}
+    /**
+     * TokenizerDefinition variant kind.
+     */
+    @Override
+    public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
+        return TokenizerDefinition.Kind.Letter;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "letter");
-		super.serializeInternal(generator, mapper);
+        generator.write("type", "letter");
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link LetterTokenizer}.
-	 */
+    /**
+     * Builder for {@link LetterTokenizer}.
+     */
 
-	public static class Builder extends TokenizerBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<LetterTokenizer> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends TokenizerBase.AbstractBuilder<Builder> implements ObjectBuilder<LetterTokenizer> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link LetterTokenizer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LetterTokenizer build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link LetterTokenizer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LetterTokenizer build() {
+            _checkSingleUse();
 
-			return new LetterTokenizer(this);
-		}
-	}
+            return new LetterTokenizer(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link LetterTokenizer}
-	 */
-	public static final JsonpDeserializer<LetterTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			LetterTokenizer::setupLetterTokenizerDeserializer);
+    /**
+     * Json deserializer for {@link LetterTokenizer}
+     */
+    public static final JsonpDeserializer<LetterTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LetterTokenizer::setupLetterTokenizerDeserializer
+    );
 
-	protected static void setupLetterTokenizerDeserializer(ObjectDeserializer<LetterTokenizer.Builder> op) {
-		TokenizerBase.setupTokenizerBaseDeserializer(op);
+    protected static void setupLetterTokenizerDeserializer(ObjectDeserializer<LetterTokenizer.Builder> op) {
+        TokenizerBase.setupTokenizerBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LimitTokenCountTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LimitTokenCountTokenFilter.java
index 8a1d655bfa..381663fe28 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LimitTokenCountTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LimitTokenCountTokenFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,128 +41,124 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.LimitTokenCountTokenFilter
 
-
 @JsonpDeserializable
 public class LimitTokenCountTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final boolean consumeAllTokens;
-
-	private final int maxTokenCount;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private LimitTokenCountTokenFilter(Builder builder) {
-		super(builder);
-
-		this.consumeAllTokens = ApiTypeHelper.requireNonNull(builder.consumeAllTokens, this, "consumeAllTokens");
-		this.maxTokenCount = ApiTypeHelper.requireNonNull(builder.maxTokenCount, this, "maxTokenCount");
-
-	}
-
-	public static LimitTokenCountTokenFilter of(Function<Builder, ObjectBuilder<LimitTokenCountTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Limit;
-	}
-
-	/**
-	 * Required - API name: {@code consume_all_tokens}
-	 */
-	public final boolean consumeAllTokens() {
-		return this.consumeAllTokens;
-	}
-
-	/**
-	 * Required - API name: {@code max_token_count}
-	 */
-	public final int maxTokenCount() {
-		return this.maxTokenCount;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "limit");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("consume_all_tokens");
-		generator.write(this.consumeAllTokens);
-
-		generator.writeKey("max_token_count");
-		generator.write(this.maxTokenCount);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link LimitTokenCountTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<LimitTokenCountTokenFilter> {
-		private Boolean consumeAllTokens;
-
-		private Integer maxTokenCount;
-
-		/**
-		 * Required - API name: {@code consume_all_tokens}
-		 */
-		public final Builder consumeAllTokens(boolean value) {
-			this.consumeAllTokens = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code max_token_count}
-		 */
-		public final Builder maxTokenCount(int value) {
-			this.maxTokenCount = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link LimitTokenCountTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LimitTokenCountTokenFilter build() {
-			_checkSingleUse();
-
-			return new LimitTokenCountTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link LimitTokenCountTokenFilter}
-	 */
-	public static final JsonpDeserializer<LimitTokenCountTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, LimitTokenCountTokenFilter::setupLimitTokenCountTokenFilterDeserializer);
-
-	protected static void setupLimitTokenCountTokenFilterDeserializer(
-			ObjectDeserializer<LimitTokenCountTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::consumeAllTokens, JsonpDeserializer.booleanDeserializer(), "consume_all_tokens");
-		op.add(Builder::maxTokenCount, JsonpDeserializer.integerDeserializer(), "max_token_count");
-
-		op.ignore("type");
-	}
+    private final boolean consumeAllTokens;
+
+    private final int maxTokenCount;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private LimitTokenCountTokenFilter(Builder builder) {
+        super(builder);
+
+        this.consumeAllTokens = ApiTypeHelper.requireNonNull(builder.consumeAllTokens, this, "consumeAllTokens");
+        this.maxTokenCount = ApiTypeHelper.requireNonNull(builder.maxTokenCount, this, "maxTokenCount");
+
+    }
+
+    public static LimitTokenCountTokenFilter of(Function<Builder, ObjectBuilder<LimitTokenCountTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Limit;
+    }
+
+    /**
+     * Required - API name: {@code consume_all_tokens}
+     */
+    public final boolean consumeAllTokens() {
+        return this.consumeAllTokens;
+    }
+
+    /**
+     * Required - API name: {@code max_token_count}
+     */
+    public final int maxTokenCount() {
+        return this.maxTokenCount;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "limit");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("consume_all_tokens");
+        generator.write(this.consumeAllTokens);
+
+        generator.writeKey("max_token_count");
+        generator.write(this.maxTokenCount);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link LimitTokenCountTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<LimitTokenCountTokenFilter> {
+        private Boolean consumeAllTokens;
+
+        private Integer maxTokenCount;
+
+        /**
+         * Required - API name: {@code consume_all_tokens}
+         */
+        public final Builder consumeAllTokens(boolean value) {
+            this.consumeAllTokens = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code max_token_count}
+         */
+        public final Builder maxTokenCount(int value) {
+            this.maxTokenCount = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link LimitTokenCountTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LimitTokenCountTokenFilter build() {
+            _checkSingleUse();
+
+            return new LimitTokenCountTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link LimitTokenCountTokenFilter}
+     */
+    public static final JsonpDeserializer<LimitTokenCountTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LimitTokenCountTokenFilter::setupLimitTokenCountTokenFilterDeserializer
+    );
+
+    protected static void setupLimitTokenCountTokenFilterDeserializer(ObjectDeserializer<LimitTokenCountTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::consumeAllTokens, JsonpDeserializer.booleanDeserializer(), "consume_all_tokens");
+        op.add(Builder::maxTokenCount, JsonpDeserializer.integerDeserializer(), "max_token_count");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LowercaseNormalizer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LowercaseNormalizer.java
index b56b618026..694214fc32 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LowercaseNormalizer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LowercaseNormalizer.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,79 +42,78 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.LowercaseNormalizer
 
 @JsonpDeserializable
 public class LowercaseNormalizer implements NormalizerVariant, JsonpSerializable {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private LowercaseNormalizer(Builder builder) {
+    private LowercaseNormalizer(Builder builder) {
 
-	}
+    }
 
-	public static LowercaseNormalizer of(Function<Builder, ObjectBuilder<LowercaseNormalizer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static LowercaseNormalizer of(Function<Builder, ObjectBuilder<LowercaseNormalizer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Normalizer variant kind.
-	 */
-	@Override
-	public Normalizer.Kind _normalizerKind() {
-		return Normalizer.Kind.Lowercase;
-	}
+    /**
+     * Normalizer variant kind.
+     */
+    @Override
+    public Normalizer.Kind _normalizerKind() {
+        return Normalizer.Kind.Lowercase;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "lowercase");
+        generator.write("type", "lowercase");
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link LowercaseNormalizer}.
-	 */
+    /**
+     * Builder for {@link LowercaseNormalizer}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<LowercaseNormalizer> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<LowercaseNormalizer> {
 
-		/**
-		 * Builds a {@link LowercaseNormalizer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LowercaseNormalizer build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link LowercaseNormalizer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LowercaseNormalizer build() {
+            _checkSingleUse();
 
-			return new LowercaseNormalizer(this);
-		}
-	}
+            return new LowercaseNormalizer(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link LowercaseNormalizer}
-	 */
-	public static final JsonpDeserializer<LowercaseNormalizer> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, LowercaseNormalizer::setupLowercaseNormalizerDeserializer);
+    /**
+     * Json deserializer for {@link LowercaseNormalizer}
+     */
+    public static final JsonpDeserializer<LowercaseNormalizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LowercaseNormalizer::setupLowercaseNormalizerDeserializer
+    );
 
-	protected static void setupLowercaseNormalizerDeserializer(ObjectDeserializer<LowercaseNormalizer.Builder> op) {
+    protected static void setupLowercaseNormalizerDeserializer(ObjectDeserializer<LowercaseNormalizer.Builder> op) {
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LowercaseTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LowercaseTokenFilter.java
index cb59eb0345..de2f1d898e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LowercaseTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LowercaseTokenFilter.java
@@ -32,116 +32,115 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.LowercaseTokenFilter
 
-
 @JsonpDeserializable
 public class LowercaseTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	@Nullable
-	private final String language;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private LowercaseTokenFilter(Builder builder) {
-		super(builder);
-
-		this.language = builder.language;
-
-	}
-
-	public static LowercaseTokenFilter of(Function<Builder, ObjectBuilder<LowercaseTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Lowercase;
-	}
-
-	/**
-	 * API name: {@code language}
-	 */
-	@Nullable
-	public final String language() {
-		return this.language;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "lowercase");
-		super.serializeInternal(generator, mapper);
-		if (this.language != null) {
-			generator.writeKey("language");
-			generator.write(this.language);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link LowercaseTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<LowercaseTokenFilter> {
-		@Nullable
-		private String language;
-
-		/**
-		 * API name: {@code language}
-		 */
-		public final Builder language(@Nullable String value) {
-			this.language = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link LowercaseTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LowercaseTokenFilter build() {
-			_checkSingleUse();
-
-			return new LowercaseTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link LowercaseTokenFilter}
-	 */
-	public static final JsonpDeserializer<LowercaseTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, LowercaseTokenFilter::setupLowercaseTokenFilterDeserializer);
-
-	protected static void setupLowercaseTokenFilterDeserializer(ObjectDeserializer<LowercaseTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::language, JsonpDeserializer.stringDeserializer(), "language");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final String language;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private LowercaseTokenFilter(Builder builder) {
+        super(builder);
+
+        this.language = builder.language;
+
+    }
+
+    public static LowercaseTokenFilter of(Function<Builder, ObjectBuilder<LowercaseTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Lowercase;
+    }
+
+    /**
+     * API name: {@code language}
+     */
+    @Nullable
+    public final String language() {
+        return this.language;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "lowercase");
+        super.serializeInternal(generator, mapper);
+        if (this.language != null) {
+            generator.writeKey("language");
+            generator.write(this.language);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link LowercaseTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<LowercaseTokenFilter> {
+        @Nullable
+        private String language;
+
+        /**
+         * API name: {@code language}
+         */
+        public final Builder language(@Nullable String value) {
+            this.language = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link LowercaseTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LowercaseTokenFilter build() {
+            _checkSingleUse();
+
+            return new LowercaseTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link LowercaseTokenFilter}
+     */
+    public static final JsonpDeserializer<LowercaseTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LowercaseTokenFilter::setupLowercaseTokenFilterDeserializer
+    );
+
+    protected static void setupLowercaseTokenFilterDeserializer(ObjectDeserializer<LowercaseTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::language, JsonpDeserializer.stringDeserializer(), "language");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LowercaseTokenizer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LowercaseTokenizer.java
index 66fab00359..866aa79c29 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LowercaseTokenizer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/LowercaseTokenizer.java
@@ -32,86 +32,84 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.LowercaseTokenizer
 
-
 @JsonpDeserializable
 public class LowercaseTokenizer extends TokenizerBase implements TokenizerDefinitionVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private LowercaseTokenizer(Builder builder) {
-		super(builder);
+    private LowercaseTokenizer(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static LowercaseTokenizer of(Function<Builder, ObjectBuilder<LowercaseTokenizer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static LowercaseTokenizer of(Function<Builder, ObjectBuilder<LowercaseTokenizer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * TokenizerDefinition variant kind.
-	 */
-	@Override
-	public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
-		return TokenizerDefinition.Kind.Lowercase;
-	}
+    /**
+     * TokenizerDefinition variant kind.
+     */
+    @Override
+    public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
+        return TokenizerDefinition.Kind.Lowercase;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "lowercase");
-		super.serializeInternal(generator, mapper);
+        generator.write("type", "lowercase");
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link LowercaseTokenizer}.
-	 */
+    /**
+     * Builder for {@link LowercaseTokenizer}.
+     */
 
-	public static class Builder extends TokenizerBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<LowercaseTokenizer> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends TokenizerBase.AbstractBuilder<Builder> implements ObjectBuilder<LowercaseTokenizer> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link LowercaseTokenizer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LowercaseTokenizer build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link LowercaseTokenizer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LowercaseTokenizer build() {
+            _checkSingleUse();
 
-			return new LowercaseTokenizer(this);
-		}
-	}
+            return new LowercaseTokenizer(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link LowercaseTokenizer}
-	 */
-	public static final JsonpDeserializer<LowercaseTokenizer> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, LowercaseTokenizer::setupLowercaseTokenizerDeserializer);
+    /**
+     * Json deserializer for {@link LowercaseTokenizer}
+     */
+    public static final JsonpDeserializer<LowercaseTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LowercaseTokenizer::setupLowercaseTokenizerDeserializer
+    );
 
-	protected static void setupLowercaseTokenizerDeserializer(ObjectDeserializer<LowercaseTokenizer.Builder> op) {
-		setupTokenizerBaseDeserializer(op);
+    protected static void setupLowercaseTokenizerDeserializer(ObjectDeserializer<LowercaseTokenizer.Builder> op) {
+        setupTokenizerBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/MappingCharFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/MappingCharFilter.java
index bc48a6706e..78cc3c312f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/MappingCharFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/MappingCharFilter.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,155 +43,149 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.MappingCharFilter
 
-
 @JsonpDeserializable
 public class MappingCharFilter extends CharFilterBase implements CharFilterDefinitionVariant {
-	private final List<String> mappings;
-
-	@Nullable
-	private final String mappingsPath;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MappingCharFilter(Builder builder) {
-		super(builder);
-
-		this.mappings = ApiTypeHelper.unmodifiableRequired(builder.mappings, this, "mappings");
-		this.mappingsPath = builder.mappingsPath;
-
-	}
-
-	public static MappingCharFilter of(Function<Builder, ObjectBuilder<MappingCharFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * CharFilterDefinition variant kind.
-	 */
-	@Override
-	public CharFilterDefinition.Kind _charFilterDefinitionKind() {
-		return CharFilterDefinition.Kind.Mapping;
-	}
-
-	/**
-	 * Required - API name: {@code mappings}
-	 */
-	public final List<String> mappings() {
-		return this.mappings;
-	}
-
-	/**
-	 * API name: {@code mappings_path}
-	 */
-	@Nullable
-	public final String mappingsPath() {
-		return this.mappingsPath;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "mapping");
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.mappings)) {
-			generator.writeKey("mappings");
-			generator.writeStartArray();
-			for (String item0 : this.mappings) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.mappingsPath != null) {
-			generator.writeKey("mappings_path");
-			generator.write(this.mappingsPath);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MappingCharFilter}.
-	 */
-
-	public static class Builder extends CharFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MappingCharFilter> {
-		private List<String> mappings;
-
-		@Nullable
-		private String mappingsPath;
-
-		/**
-		 * Required - API name: {@code mappings}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>mappings</code>.
-		 */
-		public final Builder mappings(List<String> list) {
-			this.mappings = _listAddAll(this.mappings, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mappings}
-		 * <p>
-		 * Adds one or more values to <code>mappings</code>.
-		 */
-		public final Builder mappings(String value, String... values) {
-			this.mappings = _listAdd(this.mappings, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code mappings_path}
-		 */
-		public final Builder mappingsPath(@Nullable String value) {
-			this.mappingsPath = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MappingCharFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MappingCharFilter build() {
-			_checkSingleUse();
-
-			return new MappingCharFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MappingCharFilter}
-	 */
-	public static final JsonpDeserializer<MappingCharFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MappingCharFilter::setupMappingCharFilterDeserializer);
-
-	protected static void setupMappingCharFilterDeserializer(ObjectDeserializer<MappingCharFilter.Builder> op) {
-		setupCharFilterBaseDeserializer(op);
-		op.add(Builder::mappings, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"mappings");
-		op.add(Builder::mappingsPath, JsonpDeserializer.stringDeserializer(), "mappings_path");
-
-		op.ignore("type");
-	}
+    private final List<String> mappings;
+
+    @Nullable
+    private final String mappingsPath;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MappingCharFilter(Builder builder) {
+        super(builder);
+
+        this.mappings = ApiTypeHelper.unmodifiableRequired(builder.mappings, this, "mappings");
+        this.mappingsPath = builder.mappingsPath;
+
+    }
+
+    public static MappingCharFilter of(Function<Builder, ObjectBuilder<MappingCharFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * CharFilterDefinition variant kind.
+     */
+    @Override
+    public CharFilterDefinition.Kind _charFilterDefinitionKind() {
+        return CharFilterDefinition.Kind.Mapping;
+    }
+
+    /**
+     * Required - API name: {@code mappings}
+     */
+    public final List<String> mappings() {
+        return this.mappings;
+    }
+
+    /**
+     * API name: {@code mappings_path}
+     */
+    @Nullable
+    public final String mappingsPath() {
+        return this.mappingsPath;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "mapping");
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.mappings)) {
+            generator.writeKey("mappings");
+            generator.writeStartArray();
+            for (String item0 : this.mappings) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.mappingsPath != null) {
+            generator.writeKey("mappings_path");
+            generator.write(this.mappingsPath);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MappingCharFilter}.
+     */
+
+    public static class Builder extends CharFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<MappingCharFilter> {
+        private List<String> mappings;
+
+        @Nullable
+        private String mappingsPath;
+
+        /**
+         * Required - API name: {@code mappings}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>mappings</code>.
+         */
+        public final Builder mappings(List<String> list) {
+            this.mappings = _listAddAll(this.mappings, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mappings}
+         * <p>
+         * Adds one or more values to <code>mappings</code>.
+         */
+        public final Builder mappings(String value, String... values) {
+            this.mappings = _listAdd(this.mappings, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code mappings_path}
+         */
+        public final Builder mappingsPath(@Nullable String value) {
+            this.mappingsPath = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MappingCharFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MappingCharFilter build() {
+            _checkSingleUse();
+
+            return new MappingCharFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MappingCharFilter}
+     */
+    public static final JsonpDeserializer<MappingCharFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MappingCharFilter::setupMappingCharFilterDeserializer
+    );
+
+    protected static void setupMappingCharFilterDeserializer(ObjectDeserializer<MappingCharFilter.Builder> op) {
+        setupCharFilterBaseDeserializer(op);
+        op.add(Builder::mappings, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "mappings");
+        op.add(Builder::mappingsPath, JsonpDeserializer.stringDeserializer(), "mappings_path");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/MultiplexerTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/MultiplexerTokenFilter.java
index b250cc3ceb..179aa01d61 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/MultiplexerTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/MultiplexerTokenFilter.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,149 +42,143 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _types.analysis.MultiplexerTokenFilter
 
-
 @JsonpDeserializable
 public class MultiplexerTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final List<String> filters;
-
-	private final boolean preserveOriginal;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MultiplexerTokenFilter(Builder builder) {
-		super(builder);
-
-		this.filters = ApiTypeHelper.unmodifiableRequired(builder.filters, this, "filters");
-		this.preserveOriginal = ApiTypeHelper.requireNonNull(builder.preserveOriginal, this, "preserveOriginal");
-
-	}
-
-	public static MultiplexerTokenFilter of(Function<Builder, ObjectBuilder<MultiplexerTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Multiplexer;
-	}
-
-	/**
-	 * Required - API name: {@code filters}
-	 */
-	public final List<String> filters() {
-		return this.filters;
-	}
-
-	/**
-	 * Required - API name: {@code preserve_original}
-	 */
-	public final boolean preserveOriginal() {
-		return this.preserveOriginal;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "multiplexer");
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.filters)) {
-			generator.writeKey("filters");
-			generator.writeStartArray();
-			for (String item0 : this.filters) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("preserve_original");
-		generator.write(this.preserveOriginal);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MultiplexerTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MultiplexerTokenFilter> {
-		private List<String> filters;
-
-		private Boolean preserveOriginal;
-
-		/**
-		 * Required - API name: {@code filters}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>filters</code>.
-		 */
-		public final Builder filters(List<String> list) {
-			this.filters = _listAddAll(this.filters, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code filters}
-		 * <p>
-		 * Adds one or more values to <code>filters</code>.
-		 */
-		public final Builder filters(String value, String... values) {
-			this.filters = _listAdd(this.filters, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code preserve_original}
-		 */
-		public final Builder preserveOriginal(boolean value) {
-			this.preserveOriginal = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MultiplexerTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MultiplexerTokenFilter build() {
-			_checkSingleUse();
-
-			return new MultiplexerTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MultiplexerTokenFilter}
-	 */
-	public static final JsonpDeserializer<MultiplexerTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MultiplexerTokenFilter::setupMultiplexerTokenFilterDeserializer);
-
-	protected static void setupMultiplexerTokenFilterDeserializer(
-			ObjectDeserializer<MultiplexerTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::filters, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"filters");
-		op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
-
-		op.ignore("type");
-	}
+    private final List<String> filters;
+
+    private final boolean preserveOriginal;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MultiplexerTokenFilter(Builder builder) {
+        super(builder);
+
+        this.filters = ApiTypeHelper.unmodifiableRequired(builder.filters, this, "filters");
+        this.preserveOriginal = ApiTypeHelper.requireNonNull(builder.preserveOriginal, this, "preserveOriginal");
+
+    }
+
+    public static MultiplexerTokenFilter of(Function<Builder, ObjectBuilder<MultiplexerTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Multiplexer;
+    }
+
+    /**
+     * Required - API name: {@code filters}
+     */
+    public final List<String> filters() {
+        return this.filters;
+    }
+
+    /**
+     * Required - API name: {@code preserve_original}
+     */
+    public final boolean preserveOriginal() {
+        return this.preserveOriginal;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "multiplexer");
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.filters)) {
+            generator.writeKey("filters");
+            generator.writeStartArray();
+            for (String item0 : this.filters) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("preserve_original");
+        generator.write(this.preserveOriginal);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MultiplexerTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<MultiplexerTokenFilter> {
+        private List<String> filters;
+
+        private Boolean preserveOriginal;
+
+        /**
+         * Required - API name: {@code filters}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>filters</code>.
+         */
+        public final Builder filters(List<String> list) {
+            this.filters = _listAddAll(this.filters, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code filters}
+         * <p>
+         * Adds one or more values to <code>filters</code>.
+         */
+        public final Builder filters(String value, String... values) {
+            this.filters = _listAdd(this.filters, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code preserve_original}
+         */
+        public final Builder preserveOriginal(boolean value) {
+            this.preserveOriginal = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MultiplexerTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MultiplexerTokenFilter build() {
+            _checkSingleUse();
+
+            return new MultiplexerTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MultiplexerTokenFilter}
+     */
+    public static final JsonpDeserializer<MultiplexerTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MultiplexerTokenFilter::setupMultiplexerTokenFilterDeserializer
+    );
+
+    protected static void setupMultiplexerTokenFilterDeserializer(ObjectDeserializer<MultiplexerTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::filters, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "filters");
+        op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NGramTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NGramTokenFilter.java
index 50907149a7..b03bdf579f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NGramTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NGramTokenFilter.java
@@ -32,173 +32,173 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.NGramTokenFilter
 
 @JsonpDeserializable
 public class NGramTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	@Nullable
-	private final Integer maxGram;
-
-	@Nullable
-	private final Integer minGram;
-
-	@Nullable
-	private final Boolean preserveOriginal;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NGramTokenFilter(Builder builder) {
-		super(builder);
-
-		this.maxGram = builder.maxGram;
-		this.minGram = builder.minGram;
-		this.preserveOriginal = builder.preserveOriginal;
-
-	}
-
-	public static NGramTokenFilter of(Function<Builder, ObjectBuilder<NGramTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Ngram;
-	}
-
-	/**
-	 * API name: {@code max_gram}
-	 */
-	@Nullable
-	public final Integer maxGram() {
-		return this.maxGram;
-	}
-
-	/**
-	 * API name: {@code min_gram}
-	 */
-	@Nullable
-	public final Integer minGram() {
-		return this.minGram;
-	}
-
-	/**
-	 * API name: {@code preserve_original}
-	 */
-	@Nullable
-	public final Boolean preserveOriginal() {
-		return this.preserveOriginal;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "ngram");
-		super.serializeInternal(generator, mapper);
-		if (this.maxGram != null) {
-			generator.writeKey("max_gram");
-			generator.write(this.maxGram);
-
-		}
-		if (this.minGram != null) {
-			generator.writeKey("min_gram");
-			generator.write(this.minGram);
-
-		}
-		if (this.preserveOriginal != null) {
-			generator.writeKey("preserve_original");
-			generator.write(this.preserveOriginal);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NGramTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<NGramTokenFilter> {
-		@Nullable
-		private Integer maxGram;
-
-		@Nullable
-		private Integer minGram;
-
-		@Nullable
-		private Boolean preserveOriginal;
-
-		/**
-		 * API name: {@code max_gram}
-		 */
-		public final Builder maxGram(@Nullable Integer value) {
-			this.maxGram = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_gram}
-		 */
-		public final Builder minGram(@Nullable Integer value) {
-			this.minGram = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code preserve_original}
-		 */
-		public final Builder preserveOriginal(@Nullable Boolean value) {
-			this.preserveOriginal = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NGramTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NGramTokenFilter build() {
-			_checkSingleUse();
-
-			return new NGramTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NGramTokenFilter}
-	 */
-	public static final JsonpDeserializer<NGramTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NGramTokenFilter::setupNGramTokenFilterDeserializer);
-
-	protected static void setupNGramTokenFilterDeserializer(ObjectDeserializer<NGramTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::maxGram, JsonpDeserializer.integerDeserializer(), "max_gram");
-		op.add(Builder::minGram, JsonpDeserializer.integerDeserializer(), "min_gram");
-		op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Integer maxGram;
+
+    @Nullable
+    private final Integer minGram;
+
+    @Nullable
+    private final Boolean preserveOriginal;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NGramTokenFilter(Builder builder) {
+        super(builder);
+
+        this.maxGram = builder.maxGram;
+        this.minGram = builder.minGram;
+        this.preserveOriginal = builder.preserveOriginal;
+
+    }
+
+    public static NGramTokenFilter of(Function<Builder, ObjectBuilder<NGramTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Ngram;
+    }
+
+    /**
+     * API name: {@code max_gram}
+     */
+    @Nullable
+    public final Integer maxGram() {
+        return this.maxGram;
+    }
+
+    /**
+     * API name: {@code min_gram}
+     */
+    @Nullable
+    public final Integer minGram() {
+        return this.minGram;
+    }
+
+    /**
+     * API name: {@code preserve_original}
+     */
+    @Nullable
+    public final Boolean preserveOriginal() {
+        return this.preserveOriginal;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "ngram");
+        super.serializeInternal(generator, mapper);
+        if (this.maxGram != null) {
+            generator.writeKey("max_gram");
+            generator.write(this.maxGram);
+
+        }
+        if (this.minGram != null) {
+            generator.writeKey("min_gram");
+            generator.write(this.minGram);
+
+        }
+        if (this.preserveOriginal != null) {
+            generator.writeKey("preserve_original");
+            generator.write(this.preserveOriginal);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NGramTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<NGramTokenFilter> {
+        @Nullable
+        private Integer maxGram;
+
+        @Nullable
+        private Integer minGram;
+
+        @Nullable
+        private Boolean preserveOriginal;
+
+        /**
+         * API name: {@code max_gram}
+         */
+        public final Builder maxGram(@Nullable Integer value) {
+            this.maxGram = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code min_gram}
+         */
+        public final Builder minGram(@Nullable Integer value) {
+            this.minGram = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code preserve_original}
+         */
+        public final Builder preserveOriginal(@Nullable Boolean value) {
+            this.preserveOriginal = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link NGramTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NGramTokenFilter build() {
+            _checkSingleUse();
+
+            return new NGramTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NGramTokenFilter}
+     */
+    public static final JsonpDeserializer<NGramTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NGramTokenFilter::setupNGramTokenFilterDeserializer
+    );
+
+    protected static void setupNGramTokenFilterDeserializer(ObjectDeserializer<NGramTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::maxGram, JsonpDeserializer.integerDeserializer(), "max_gram");
+        op.add(Builder::minGram, JsonpDeserializer.integerDeserializer(), "min_gram");
+        op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NGramTokenizer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NGramTokenizer.java
index 91cfb7de5c..2b5ecd56c8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NGramTokenizer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NGramTokenizer.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,201 +43,196 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.NGramTokenizer
 
-
 @JsonpDeserializable
 public class NGramTokenizer extends TokenizerBase implements TokenizerDefinitionVariant {
-	@Nullable
-	private final String customTokenChars;
+    @Nullable
+    private final String customTokenChars;
+
+    private final int maxGram;
 
-	private final int maxGram;
+    private final int minGram;
 
-	private final int minGram;
+    private final List<TokenChar> tokenChars;
 
-	private final List<TokenChar> tokenChars;
+    // ---------------------------------------------------------------------------------------------
 
-	// ---------------------------------------------------------------------------------------------
+    private NGramTokenizer(Builder builder) {
+        super(builder);
 
-	private NGramTokenizer(Builder builder) {
-		super(builder);
-
-		this.customTokenChars = builder.customTokenChars;
-		this.maxGram = ApiTypeHelper.requireNonNull(builder.maxGram, this, "maxGram");
-		this.minGram = ApiTypeHelper.requireNonNull(builder.minGram, this, "minGram");
-		this.tokenChars = ApiTypeHelper.unmodifiableRequired(builder.tokenChars, this, "tokenChars");
-
-	}
-
-	public static NGramTokenizer of(Function<Builder, ObjectBuilder<NGramTokenizer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenizerDefinition variant kind.
-	 */
-	@Override
-	public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
-		return TokenizerDefinition.Kind.Ngram;
-	}
-
-	/**
-	 * API name: {@code custom_token_chars}
-	 */
-	@Nullable
-	public final String customTokenChars() {
-		return this.customTokenChars;
-	}
-
-	/**
-	 * Required - API name: {@code max_gram}
-	 */
-	public final int maxGram() {
-		return this.maxGram;
-	}
-
-	/**
-	 * Required - API name: {@code min_gram}
-	 */
-	public final int minGram() {
-		return this.minGram;
-	}
-
-	/**
-	 * Required - API name: {@code token_chars}
-	 */
-	public final List<TokenChar> tokenChars() {
-		return this.tokenChars;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "ngram");
-		super.serializeInternal(generator, mapper);
-		if (this.customTokenChars != null) {
-			generator.writeKey("custom_token_chars");
-			generator.write(this.customTokenChars);
-
-		}
-		generator.writeKey("max_gram");
-		generator.write(this.maxGram);
-
-		generator.writeKey("min_gram");
-		generator.write(this.minGram);
-
-		if (ApiTypeHelper.isDefined(this.tokenChars)) {
-			generator.writeKey("token_chars");
-			generator.writeStartArray();
-			for (TokenChar item0 : this.tokenChars) {
-				item0.serialize(generator, mapper);
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NGramTokenizer}.
-	 */
-
-	public static class Builder extends TokenizerBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<NGramTokenizer> {
-		@Nullable
-		private String customTokenChars;
-
-		private Integer maxGram;
-
-		private Integer minGram;
-
-		private List<TokenChar> tokenChars;
-
-		/**
-		 * API name: {@code custom_token_chars}
-		 */
-		public final Builder customTokenChars(@Nullable String value) {
-			this.customTokenChars = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code max_gram}
-		 */
-		public final Builder maxGram(int value) {
-			this.maxGram = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code min_gram}
-		 */
-		public final Builder minGram(int value) {
-			this.minGram = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code token_chars}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>tokenChars</code>.
-		 */
-		public final Builder tokenChars(List<TokenChar> list) {
-			this.tokenChars = _listAddAll(this.tokenChars, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code token_chars}
-		 * <p>
-		 * Adds one or more values to <code>tokenChars</code>.
-		 */
-		public final Builder tokenChars(TokenChar value, TokenChar... values) {
-			this.tokenChars = _listAdd(this.tokenChars, value, values);
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NGramTokenizer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NGramTokenizer build() {
-			_checkSingleUse();
-
-			return new NGramTokenizer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NGramTokenizer}
-	 */
-	public static final JsonpDeserializer<NGramTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NGramTokenizer::setupNGramTokenizerDeserializer);
-
-	protected static void setupNGramTokenizerDeserializer(ObjectDeserializer<NGramTokenizer.Builder> op) {
-		TokenizerBase.setupTokenizerBaseDeserializer(op);
-		op.add(Builder::customTokenChars, JsonpDeserializer.stringDeserializer(), "custom_token_chars");
-		op.add(Builder::maxGram, JsonpDeserializer.integerDeserializer(), "max_gram");
-		op.add(Builder::minGram, JsonpDeserializer.integerDeserializer(), "min_gram");
-		op.add(Builder::tokenChars, JsonpDeserializer.arrayDeserializer(TokenChar._DESERIALIZER), "token_chars");
-
-		op.ignore("type");
-	}
+        this.customTokenChars = builder.customTokenChars;
+        this.maxGram = ApiTypeHelper.requireNonNull(builder.maxGram, this, "maxGram");
+        this.minGram = ApiTypeHelper.requireNonNull(builder.minGram, this, "minGram");
+        this.tokenChars = ApiTypeHelper.unmodifiableRequired(builder.tokenChars, this, "tokenChars");
+
+    }
+
+    public static NGramTokenizer of(Function<Builder, ObjectBuilder<NGramTokenizer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenizerDefinition variant kind.
+     */
+    @Override
+    public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
+        return TokenizerDefinition.Kind.Ngram;
+    }
+
+    /**
+     * API name: {@code custom_token_chars}
+     */
+    @Nullable
+    public final String customTokenChars() {
+        return this.customTokenChars;
+    }
+
+    /**
+     * Required - API name: {@code max_gram}
+     */
+    public final int maxGram() {
+        return this.maxGram;
+    }
+
+    /**
+     * Required - API name: {@code min_gram}
+     */
+    public final int minGram() {
+        return this.minGram;
+    }
+
+    /**
+     * Required - API name: {@code token_chars}
+     */
+    public final List<TokenChar> tokenChars() {
+        return this.tokenChars;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "ngram");
+        super.serializeInternal(generator, mapper);
+        if (this.customTokenChars != null) {
+            generator.writeKey("custom_token_chars");
+            generator.write(this.customTokenChars);
+
+        }
+        generator.writeKey("max_gram");
+        generator.write(this.maxGram);
+
+        generator.writeKey("min_gram");
+        generator.write(this.minGram);
+
+        if (ApiTypeHelper.isDefined(this.tokenChars)) {
+            generator.writeKey("token_chars");
+            generator.writeStartArray();
+            for (TokenChar item0 : this.tokenChars) {
+                item0.serialize(generator, mapper);
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NGramTokenizer}.
+     */
+
+    public static class Builder extends TokenizerBase.AbstractBuilder<Builder> implements ObjectBuilder<NGramTokenizer> {
+        @Nullable
+        private String customTokenChars;
+
+        private Integer maxGram;
+
+        private Integer minGram;
+
+        private List<TokenChar> tokenChars;
+
+        /**
+         * API name: {@code custom_token_chars}
+         */
+        public final Builder customTokenChars(@Nullable String value) {
+            this.customTokenChars = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code max_gram}
+         */
+        public final Builder maxGram(int value) {
+            this.maxGram = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code min_gram}
+         */
+        public final Builder minGram(int value) {
+            this.minGram = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code token_chars}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>tokenChars</code>.
+         */
+        public final Builder tokenChars(List<TokenChar> list) {
+            this.tokenChars = _listAddAll(this.tokenChars, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code token_chars}
+         * <p>
+         * Adds one or more values to <code>tokenChars</code>.
+         */
+        public final Builder tokenChars(TokenChar value, TokenChar... values) {
+            this.tokenChars = _listAdd(this.tokenChars, value, values);
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link NGramTokenizer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NGramTokenizer build() {
+            _checkSingleUse();
+
+            return new NGramTokenizer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NGramTokenizer}
+     */
+    public static final JsonpDeserializer<NGramTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NGramTokenizer::setupNGramTokenizerDeserializer
+    );
+
+    protected static void setupNGramTokenizerDeserializer(ObjectDeserializer<NGramTokenizer.Builder> op) {
+        TokenizerBase.setupTokenizerBaseDeserializer(op);
+        op.add(Builder::customTokenChars, JsonpDeserializer.stringDeserializer(), "custom_token_chars");
+        op.add(Builder::maxGram, JsonpDeserializer.integerDeserializer(), "max_gram");
+        op.add(Builder::minGram, JsonpDeserializer.integerDeserializer(), "min_gram");
+        op.add(Builder::tokenChars, JsonpDeserializer.arrayDeserializer(TokenChar._DESERIALIZER), "token_chars");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NoriAnalyzer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NoriAnalyzer.java
index 24ea4b1ab3..3835207d85 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NoriAnalyzer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NoriAnalyzer.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,214 +45,210 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.NoriAnalyzer
 
-
 @JsonpDeserializable
 public class NoriAnalyzer implements AnalyzerVariant, JsonpSerializable {
-	@Nullable
-	private final String version;
-
-	@Nullable
-	private final NoriDecompoundMode decompoundMode;
-
-	private final List<String> stoptags;
-
-	@Nullable
-	private final String userDictionary;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NoriAnalyzer(Builder builder) {
-
-		this.version = builder.version;
-		this.decompoundMode = builder.decompoundMode;
-		this.stoptags = ApiTypeHelper.unmodifiable(builder.stoptags);
-		this.userDictionary = builder.userDictionary;
-
-	}
-
-	public static NoriAnalyzer of(Function<Builder, ObjectBuilder<NoriAnalyzer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Analyzer variant kind.
-	 */
-	@Override
-	public Analyzer.Kind _analyzerKind() {
-		return Analyzer.Kind.Nori;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final String version() {
-		return this.version;
-	}
-
-	/**
-	 * API name: {@code decompound_mode}
-	 */
-	@Nullable
-	public final NoriDecompoundMode decompoundMode() {
-		return this.decompoundMode;
-	}
-
-	/**
-	 * API name: {@code stoptags}
-	 */
-	public final List<String> stoptags() {
-		return this.stoptags;
-	}
-
-	/**
-	 * API name: {@code user_dictionary}
-	 */
-	@Nullable
-	public final String userDictionary() {
-		return this.userDictionary;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "nori");
-
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		if (this.decompoundMode != null) {
-			generator.writeKey("decompound_mode");
-			this.decompoundMode.serialize(generator, mapper);
-		}
-		if (ApiTypeHelper.isDefined(this.stoptags)) {
-			generator.writeKey("stoptags");
-			generator.writeStartArray();
-			for (String item0 : this.stoptags) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.userDictionary != null) {
-			generator.writeKey("user_dictionary");
-			generator.write(this.userDictionary);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NoriAnalyzer}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NoriAnalyzer> {
-		@Nullable
-		private String version;
-
-		@Nullable
-		private NoriDecompoundMode decompoundMode;
-
-		@Nullable
-		private List<String> stoptags;
-
-		@Nullable
-		private String userDictionary;
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code decompound_mode}
-		 */
-		public final Builder decompoundMode(@Nullable NoriDecompoundMode value) {
-			this.decompoundMode = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code stoptags}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>stoptags</code>.
-		 */
-		public final Builder stoptags(List<String> list) {
-			this.stoptags = _listAddAll(this.stoptags, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stoptags}
-		 * <p>
-		 * Adds one or more values to <code>stoptags</code>.
-		 */
-		public final Builder stoptags(String value, String... values) {
-			this.stoptags = _listAdd(this.stoptags, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code user_dictionary}
-		 */
-		public final Builder userDictionary(@Nullable String value) {
-			this.userDictionary = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NoriAnalyzer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NoriAnalyzer build() {
-			_checkSingleUse();
-
-			return new NoriAnalyzer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NoriAnalyzer}
-	 */
-	public static final JsonpDeserializer<NoriAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NoriAnalyzer::setupNoriAnalyzerDeserializer);
-
-	protected static void setupNoriAnalyzerDeserializer(ObjectDeserializer<NoriAnalyzer.Builder> op) {
-
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
-		op.add(Builder::decompoundMode, NoriDecompoundMode._DESERIALIZER, "decompound_mode");
-		op.add(Builder::stoptags, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"stoptags");
-		op.add(Builder::userDictionary, JsonpDeserializer.stringDeserializer(), "user_dictionary");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final String version;
+
+    @Nullable
+    private final NoriDecompoundMode decompoundMode;
+
+    private final List<String> stoptags;
+
+    @Nullable
+    private final String userDictionary;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NoriAnalyzer(Builder builder) {
+
+        this.version = builder.version;
+        this.decompoundMode = builder.decompoundMode;
+        this.stoptags = ApiTypeHelper.unmodifiable(builder.stoptags);
+        this.userDictionary = builder.userDictionary;
+
+    }
+
+    public static NoriAnalyzer of(Function<Builder, ObjectBuilder<NoriAnalyzer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Analyzer variant kind.
+     */
+    @Override
+    public Analyzer.Kind _analyzerKind() {
+        return Analyzer.Kind.Nori;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final String version() {
+        return this.version;
+    }
+
+    /**
+     * API name: {@code decompound_mode}
+     */
+    @Nullable
+    public final NoriDecompoundMode decompoundMode() {
+        return this.decompoundMode;
+    }
+
+    /**
+     * API name: {@code stoptags}
+     */
+    public final List<String> stoptags() {
+        return this.stoptags;
+    }
+
+    /**
+     * API name: {@code user_dictionary}
+     */
+    @Nullable
+    public final String userDictionary() {
+        return this.userDictionary;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "nori");
+
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        if (this.decompoundMode != null) {
+            generator.writeKey("decompound_mode");
+            this.decompoundMode.serialize(generator, mapper);
+        }
+        if (ApiTypeHelper.isDefined(this.stoptags)) {
+            generator.writeKey("stoptags");
+            generator.writeStartArray();
+            for (String item0 : this.stoptags) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.userDictionary != null) {
+            generator.writeKey("user_dictionary");
+            generator.write(this.userDictionary);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NoriAnalyzer}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NoriAnalyzer> {
+        @Nullable
+        private String version;
+
+        @Nullable
+        private NoriDecompoundMode decompoundMode;
+
+        @Nullable
+        private List<String> stoptags;
+
+        @Nullable
+        private String userDictionary;
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code decompound_mode}
+         */
+        public final Builder decompoundMode(@Nullable NoriDecompoundMode value) {
+            this.decompoundMode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code stoptags}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>stoptags</code>.
+         */
+        public final Builder stoptags(List<String> list) {
+            this.stoptags = _listAddAll(this.stoptags, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code stoptags}
+         * <p>
+         * Adds one or more values to <code>stoptags</code>.
+         */
+        public final Builder stoptags(String value, String... values) {
+            this.stoptags = _listAdd(this.stoptags, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code user_dictionary}
+         */
+        public final Builder userDictionary(@Nullable String value) {
+            this.userDictionary = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NoriAnalyzer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NoriAnalyzer build() {
+            _checkSingleUse();
+
+            return new NoriAnalyzer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NoriAnalyzer}
+     */
+    public static final JsonpDeserializer<NoriAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NoriAnalyzer::setupNoriAnalyzerDeserializer
+    );
+
+    protected static void setupNoriAnalyzerDeserializer(ObjectDeserializer<NoriAnalyzer.Builder> op) {
+
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
+        op.add(Builder::decompoundMode, NoriDecompoundMode._DESERIALIZER, "decompound_mode");
+        op.add(Builder::stoptags, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stoptags");
+        op.add(Builder::userDictionary, JsonpDeserializer.stringDeserializer(), "user_dictionary");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NoriDecompoundMode.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NoriDecompoundMode.java
index 3e4bfcfef2..66a3736b05 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NoriDecompoundMode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NoriDecompoundMode.java
@@ -35,27 +35,25 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum NoriDecompoundMode implements JsonEnum {
-	Discard("discard"),
+    Discard("discard"),
 
-	None("none"),
+    None("none"),
 
-	Mixed("mixed"),
+    Mixed("mixed"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	NoriDecompoundMode(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    NoriDecompoundMode(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<NoriDecompoundMode> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			NoriDecompoundMode.values());
+    public static final JsonEnum.Deserializer<NoriDecompoundMode> _DESERIALIZER = new JsonEnum.Deserializer<>(NoriDecompoundMode.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NoriPartOfSpeechTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NoriPartOfSpeechTokenFilter.java
index 6c4476f0ec..88db943e03 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NoriPartOfSpeechTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NoriPartOfSpeechTokenFilter.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,126 +42,120 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _types.analysis.NoriPartOfSpeechTokenFilter
 
-
 @JsonpDeserializable
 public class NoriPartOfSpeechTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final List<String> stoptags;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NoriPartOfSpeechTokenFilter(Builder builder) {
-		super(builder);
-
-		this.stoptags = ApiTypeHelper.unmodifiableRequired(builder.stoptags, this, "stoptags");
-
-	}
-
-	public static NoriPartOfSpeechTokenFilter of(Function<Builder, ObjectBuilder<NoriPartOfSpeechTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.NoriPartOfSpeech;
-	}
-
-	/**
-	 * Required - API name: {@code stoptags}
-	 */
-	public final List<String> stoptags() {
-		return this.stoptags;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "nori_part_of_speech");
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.stoptags)) {
-			generator.writeKey("stoptags");
-			generator.writeStartArray();
-			for (String item0 : this.stoptags) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NoriPartOfSpeechTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<NoriPartOfSpeechTokenFilter> {
-		private List<String> stoptags;
-
-		/**
-		 * Required - API name: {@code stoptags}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>stoptags</code>.
-		 */
-		public final Builder stoptags(List<String> list) {
-			this.stoptags = _listAddAll(this.stoptags, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code stoptags}
-		 * <p>
-		 * Adds one or more values to <code>stoptags</code>.
-		 */
-		public final Builder stoptags(String value, String... values) {
-			this.stoptags = _listAdd(this.stoptags, value, values);
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NoriPartOfSpeechTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NoriPartOfSpeechTokenFilter build() {
-			_checkSingleUse();
-
-			return new NoriPartOfSpeechTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NoriPartOfSpeechTokenFilter}
-	 */
-	public static final JsonpDeserializer<NoriPartOfSpeechTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NoriPartOfSpeechTokenFilter::setupNoriPartOfSpeechTokenFilterDeserializer);
-
-	protected static void setupNoriPartOfSpeechTokenFilterDeserializer(
-			ObjectDeserializer<NoriPartOfSpeechTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::stoptags, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"stoptags");
-
-		op.ignore("type");
-	}
+    private final List<String> stoptags;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NoriPartOfSpeechTokenFilter(Builder builder) {
+        super(builder);
+
+        this.stoptags = ApiTypeHelper.unmodifiableRequired(builder.stoptags, this, "stoptags");
+
+    }
+
+    public static NoriPartOfSpeechTokenFilter of(Function<Builder, ObjectBuilder<NoriPartOfSpeechTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.NoriPartOfSpeech;
+    }
+
+    /**
+     * Required - API name: {@code stoptags}
+     */
+    public final List<String> stoptags() {
+        return this.stoptags;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "nori_part_of_speech");
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.stoptags)) {
+            generator.writeKey("stoptags");
+            generator.writeStartArray();
+            for (String item0 : this.stoptags) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NoriPartOfSpeechTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<NoriPartOfSpeechTokenFilter> {
+        private List<String> stoptags;
+
+        /**
+         * Required - API name: {@code stoptags}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>stoptags</code>.
+         */
+        public final Builder stoptags(List<String> list) {
+            this.stoptags = _listAddAll(this.stoptags, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code stoptags}
+         * <p>
+         * Adds one or more values to <code>stoptags</code>.
+         */
+        public final Builder stoptags(String value, String... values) {
+            this.stoptags = _listAdd(this.stoptags, value, values);
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link NoriPartOfSpeechTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NoriPartOfSpeechTokenFilter build() {
+            _checkSingleUse();
+
+            return new NoriPartOfSpeechTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NoriPartOfSpeechTokenFilter}
+     */
+    public static final JsonpDeserializer<NoriPartOfSpeechTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NoriPartOfSpeechTokenFilter::setupNoriPartOfSpeechTokenFilterDeserializer
+    );
+
+    protected static void setupNoriPartOfSpeechTokenFilterDeserializer(ObjectDeserializer<NoriPartOfSpeechTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::stoptags, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stoptags");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NoriTokenizer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NoriTokenizer.java
index 6f9d0e6eda..ee6cfa42b7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NoriTokenizer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NoriTokenizer.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,211 +43,211 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.NoriTokenizer
 
-
 @JsonpDeserializable
 public class NoriTokenizer extends TokenizerBase implements TokenizerDefinitionVariant {
-	@Nullable
-	private final NoriDecompoundMode decompoundMode;
-
-	@Nullable
-	private final Boolean discardPunctuation;
-
-	@Nullable
-	private final String userDictionary;
-
-	private final List<String> userDictionaryRules;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NoriTokenizer(Builder builder) {
-		super(builder);
-
-		this.decompoundMode = builder.decompoundMode;
-		this.discardPunctuation = builder.discardPunctuation;
-		this.userDictionary = builder.userDictionary;
-		this.userDictionaryRules = ApiTypeHelper.unmodifiable(builder.userDictionaryRules);
-
-	}
-
-	public static NoriTokenizer of(Function<Builder, ObjectBuilder<NoriTokenizer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenizerDefinition variant kind.
-	 */
-	@Override
-	public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
-		return TokenizerDefinition.Kind.NoriTokenizer;
-	}
-
-	/**
-	 * API name: {@code decompound_mode}
-	 */
-	@Nullable
-	public final NoriDecompoundMode decompoundMode() {
-		return this.decompoundMode;
-	}
-
-	/**
-	 * API name: {@code discard_punctuation}
-	 */
-	@Nullable
-	public final Boolean discardPunctuation() {
-		return this.discardPunctuation;
-	}
-
-	/**
-	 * API name: {@code user_dictionary}
-	 */
-	@Nullable
-	public final String userDictionary() {
-		return this.userDictionary;
-	}
-
-	/**
-	 * API name: {@code user_dictionary_rules}
-	 */
-	public final List<String> userDictionaryRules() {
-		return this.userDictionaryRules;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "nori_tokenizer");
-		super.serializeInternal(generator, mapper);
-		if (this.decompoundMode != null) {
-			generator.writeKey("decompound_mode");
-			this.decompoundMode.serialize(generator, mapper);
-		}
-		if (this.discardPunctuation != null) {
-			generator.writeKey("discard_punctuation");
-			generator.write(this.discardPunctuation);
-
-		}
-		if (this.userDictionary != null) {
-			generator.writeKey("user_dictionary");
-			generator.write(this.userDictionary);
-
-		}
-		if (ApiTypeHelper.isDefined(this.userDictionaryRules)) {
-			generator.writeKey("user_dictionary_rules");
-			generator.writeStartArray();
-			for (String item0 : this.userDictionaryRules) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NoriTokenizer}.
-	 */
-
-	public static class Builder extends TokenizerBase.AbstractBuilder<Builder> implements ObjectBuilder<NoriTokenizer> {
-		@Nullable
-		private NoriDecompoundMode decompoundMode;
-
-		@Nullable
-		private Boolean discardPunctuation;
-
-		@Nullable
-		private String userDictionary;
-
-		@Nullable
-		private List<String> userDictionaryRules;
-
-		/**
-		 * API name: {@code decompound_mode}
-		 */
-		public final Builder decompoundMode(@Nullable NoriDecompoundMode value) {
-			this.decompoundMode = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code discard_punctuation}
-		 */
-		public final Builder discardPunctuation(@Nullable Boolean value) {
-			this.discardPunctuation = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code user_dictionary}
-		 */
-		public final Builder userDictionary(@Nullable String value) {
-			this.userDictionary = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code user_dictionary_rules}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>userDictionaryRules</code>.
-		 */
-		public final Builder userDictionaryRules(List<String> list) {
-			this.userDictionaryRules = _listAddAll(this.userDictionaryRules, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code user_dictionary_rules}
-		 * <p>
-		 * Adds one or more values to <code>userDictionaryRules</code>.
-		 */
-		public final Builder userDictionaryRules(String value, String... values) {
-			this.userDictionaryRules = _listAdd(this.userDictionaryRules, value, values);
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NoriTokenizer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NoriTokenizer build() {
-			_checkSingleUse();
-
-			return new NoriTokenizer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NoriTokenizer}
-	 */
-	public static final JsonpDeserializer<NoriTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NoriTokenizer::setupNoriTokenizerDeserializer);
-
-	protected static void setupNoriTokenizerDeserializer(ObjectDeserializer<NoriTokenizer.Builder> op) {
-		TokenizerBase.setupTokenizerBaseDeserializer(op);
-		op.add(Builder::decompoundMode, NoriDecompoundMode._DESERIALIZER, "decompound_mode");
-		op.add(Builder::discardPunctuation, JsonpDeserializer.booleanDeserializer(), "discard_punctuation");
-		op.add(Builder::userDictionary, JsonpDeserializer.stringDeserializer(), "user_dictionary");
-		op.add(Builder::userDictionaryRules,
-				JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "user_dictionary_rules");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final NoriDecompoundMode decompoundMode;
+
+    @Nullable
+    private final Boolean discardPunctuation;
+
+    @Nullable
+    private final String userDictionary;
+
+    private final List<String> userDictionaryRules;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NoriTokenizer(Builder builder) {
+        super(builder);
+
+        this.decompoundMode = builder.decompoundMode;
+        this.discardPunctuation = builder.discardPunctuation;
+        this.userDictionary = builder.userDictionary;
+        this.userDictionaryRules = ApiTypeHelper.unmodifiable(builder.userDictionaryRules);
+
+    }
+
+    public static NoriTokenizer of(Function<Builder, ObjectBuilder<NoriTokenizer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenizerDefinition variant kind.
+     */
+    @Override
+    public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
+        return TokenizerDefinition.Kind.NoriTokenizer;
+    }
+
+    /**
+     * API name: {@code decompound_mode}
+     */
+    @Nullable
+    public final NoriDecompoundMode decompoundMode() {
+        return this.decompoundMode;
+    }
+
+    /**
+     * API name: {@code discard_punctuation}
+     */
+    @Nullable
+    public final Boolean discardPunctuation() {
+        return this.discardPunctuation;
+    }
+
+    /**
+     * API name: {@code user_dictionary}
+     */
+    @Nullable
+    public final String userDictionary() {
+        return this.userDictionary;
+    }
+
+    /**
+     * API name: {@code user_dictionary_rules}
+     */
+    public final List<String> userDictionaryRules() {
+        return this.userDictionaryRules;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "nori_tokenizer");
+        super.serializeInternal(generator, mapper);
+        if (this.decompoundMode != null) {
+            generator.writeKey("decompound_mode");
+            this.decompoundMode.serialize(generator, mapper);
+        }
+        if (this.discardPunctuation != null) {
+            generator.writeKey("discard_punctuation");
+            generator.write(this.discardPunctuation);
+
+        }
+        if (this.userDictionary != null) {
+            generator.writeKey("user_dictionary");
+            generator.write(this.userDictionary);
+
+        }
+        if (ApiTypeHelper.isDefined(this.userDictionaryRules)) {
+            generator.writeKey("user_dictionary_rules");
+            generator.writeStartArray();
+            for (String item0 : this.userDictionaryRules) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NoriTokenizer}.
+     */
+
+    public static class Builder extends TokenizerBase.AbstractBuilder<Builder> implements ObjectBuilder<NoriTokenizer> {
+        @Nullable
+        private NoriDecompoundMode decompoundMode;
+
+        @Nullable
+        private Boolean discardPunctuation;
+
+        @Nullable
+        private String userDictionary;
+
+        @Nullable
+        private List<String> userDictionaryRules;
+
+        /**
+         * API name: {@code decompound_mode}
+         */
+        public final Builder decompoundMode(@Nullable NoriDecompoundMode value) {
+            this.decompoundMode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code discard_punctuation}
+         */
+        public final Builder discardPunctuation(@Nullable Boolean value) {
+            this.discardPunctuation = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code user_dictionary}
+         */
+        public final Builder userDictionary(@Nullable String value) {
+            this.userDictionary = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code user_dictionary_rules}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>userDictionaryRules</code>.
+         */
+        public final Builder userDictionaryRules(List<String> list) {
+            this.userDictionaryRules = _listAddAll(this.userDictionaryRules, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code user_dictionary_rules}
+         * <p>
+         * Adds one or more values to <code>userDictionaryRules</code>.
+         */
+        public final Builder userDictionaryRules(String value, String... values) {
+            this.userDictionaryRules = _listAdd(this.userDictionaryRules, value, values);
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link NoriTokenizer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NoriTokenizer build() {
+            _checkSingleUse();
+
+            return new NoriTokenizer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NoriTokenizer}
+     */
+    public static final JsonpDeserializer<NoriTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NoriTokenizer::setupNoriTokenizerDeserializer
+    );
+
+    protected static void setupNoriTokenizerDeserializer(ObjectDeserializer<NoriTokenizer.Builder> op) {
+        TokenizerBase.setupTokenizerBaseDeserializer(op);
+        op.add(Builder::decompoundMode, NoriDecompoundMode._DESERIALIZER, "decompound_mode");
+        op.add(Builder::discardPunctuation, JsonpDeserializer.booleanDeserializer(), "discard_punctuation");
+        op.add(Builder::userDictionary, JsonpDeserializer.stringDeserializer(), "user_dictionary");
+        op.add(
+            Builder::userDictionaryRules,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
+            "user_dictionary_rules"
+        );
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/Normalizer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/Normalizer.java
index a38b737fac..de7342afcd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/Normalizer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/Normalizer.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -44,155 +46,153 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.Normalizer
 
 @JsonpDeserializable
 public class Normalizer implements TaggedUnion<Normalizer.Kind, NormalizerVariant>, JsonpSerializable {
 
-	/**
-	 * {@link Normalizer} variant kinds.
-	 */
-	/**
-	 * {@link Normalizer} variant kinds.
-	 */
-
-	public enum Kind implements JsonEnum {
-		Custom("custom"),
-
-		Lowercase("lowercase"),
+    /**
+     * {@link Normalizer} variant kinds.
+     */
+    /**
+     * {@link Normalizer} variant kinds.
+     */
 
-		;
+    public enum Kind implements JsonEnum {
+        Custom("custom"),
 
-		private final String jsonValue;
+        Lowercase("lowercase"),
 
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
+        ;
 
-		public String jsonValue() {
-			return this.jsonValue;
-		}
+        private final String jsonValue;
 
-	}
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
 
-	private final Kind _kind;
-	private final NormalizerVariant _value;
+        public String jsonValue() {
+            return this.jsonValue;
+        }
 
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
+    }
 
-	@Override
-	public final NormalizerVariant _get() {
-		return _value;
-	}
+    private final Kind _kind;
+    private final NormalizerVariant _value;
 
-	public Normalizer(NormalizerVariant value) {
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
 
-		this._kind = ApiTypeHelper.requireNonNull(value._normalizerKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+    @Override
+    public final NormalizerVariant _get() {
+        return _value;
+    }
 
-	}
+    public Normalizer(NormalizerVariant value) {
 
-	private Normalizer(Builder builder) {
+        this._kind = ApiTypeHelper.requireNonNull(value._normalizerKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
 
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+    }
 
-	}
+    private Normalizer(Builder builder) {
 
-	public static Normalizer of(Function<Builder, ObjectBuilder<Normalizer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
 
-	/**
-	 * Is this variant instance of kind {@code custom}?
-	 */
-	public boolean isCustom() {
-		return _kind == Kind.Custom;
-	}
+    }
 
-	/**
-	 * Get the {@code custom} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code custom} kind.
-	 */
-	public CustomNormalizer custom() {
-		return TaggedUnionUtils.get(this, Kind.Custom);
-	}
+    public static Normalizer of(Function<Builder, ObjectBuilder<Normalizer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Is this variant instance of kind {@code lowercase}?
-	 */
-	public boolean isLowercase() {
-		return _kind == Kind.Lowercase;
-	}
+    /**
+     * Is this variant instance of kind {@code custom}?
+     */
+    public boolean isCustom() {
+        return _kind == Kind.Custom;
+    }
 
-	/**
-	 * Get the {@code lowercase} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code lowercase} kind.
-	 */
-	public LowercaseNormalizer lowercase() {
-		return TaggedUnionUtils.get(this, Kind.Lowercase);
-	}
+    /**
+     * Get the {@code custom} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code custom} kind.
+     */
+    public CustomNormalizer custom() {
+        return TaggedUnionUtils.get(this, Kind.Custom);
+    }
 
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Is this variant instance of kind {@code lowercase}?
+     */
+    public boolean isLowercase() {
+        return _kind == Kind.Lowercase;
+    }
 
-		mapper.serialize(_value, generator);
+    /**
+     * Get the {@code lowercase} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code lowercase} kind.
+     */
+    public LowercaseNormalizer lowercase() {
+        return TaggedUnionUtils.get(this, Kind.Lowercase);
+    }
 
-	}
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Normalizer> {
-		private Kind _kind;
-		private NormalizerVariant _value;
+        mapper.serialize(_value, generator);
 
-		public ObjectBuilder<Normalizer> custom(CustomNormalizer v) {
-			this._kind = Kind.Custom;
-			this._value = v;
-			return this;
-		}
+    }
 
-		public ObjectBuilder<Normalizer> custom(
-				Function<CustomNormalizer.Builder, ObjectBuilder<CustomNormalizer>> fn) {
-			return this.custom(fn.apply(new CustomNormalizer.Builder()).build());
-		}
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Normalizer> {
+        private Kind _kind;
+        private NormalizerVariant _value;
 
-		public ObjectBuilder<Normalizer> lowercase(LowercaseNormalizer v) {
-			this._kind = Kind.Lowercase;
-			this._value = v;
-			return this;
-		}
+        public ObjectBuilder<Normalizer> custom(CustomNormalizer v) {
+            this._kind = Kind.Custom;
+            this._value = v;
+            return this;
+        }
 
-		public ObjectBuilder<Normalizer> lowercase(
-				Function<LowercaseNormalizer.Builder, ObjectBuilder<LowercaseNormalizer>> fn) {
-			return this.lowercase(fn.apply(new LowercaseNormalizer.Builder()).build());
-		}
+        public ObjectBuilder<Normalizer> custom(Function<CustomNormalizer.Builder, ObjectBuilder<CustomNormalizer>> fn) {
+            return this.custom(fn.apply(new CustomNormalizer.Builder()).build());
+        }
 
-		public Normalizer build() {
-			_checkSingleUse();
-			return new Normalizer(this);
-		}
+        public ObjectBuilder<Normalizer> lowercase(LowercaseNormalizer v) {
+            this._kind = Kind.Lowercase;
+            this._value = v;
+            return this;
+        }
 
-	}
-
-	protected static void setupNormalizerDeserializer(ObjectDeserializer<Builder> op) {
+        public ObjectBuilder<Normalizer> lowercase(Function<LowercaseNormalizer.Builder, ObjectBuilder<LowercaseNormalizer>> fn) {
+            return this.lowercase(fn.apply(new LowercaseNormalizer.Builder()).build());
+        }
 
-		op.add(Builder::custom, CustomNormalizer._DESERIALIZER, "custom");
-		op.add(Builder::lowercase, LowercaseNormalizer._DESERIALIZER, "lowercase");
+        public Normalizer build() {
+            _checkSingleUse();
+            return new Normalizer(this);
+        }
+
+    }
 
-		op.setTypeProperty("type", null);
+    protected static void setupNormalizerDeserializer(ObjectDeserializer<Builder> op) {
+
+        op.add(Builder::custom, CustomNormalizer._DESERIALIZER, "custom");
+        op.add(Builder::lowercase, LowercaseNormalizer._DESERIALIZER, "lowercase");
 
-	}
+        op.setTypeProperty("type", null);
+
+    }
 
-	public static final JsonpDeserializer<Normalizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Normalizer::setupNormalizerDeserializer, Builder::build);
+    public static final JsonpDeserializer<Normalizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Normalizer::setupNormalizerDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NormalizerBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NormalizerBuilders.java
index a3c5e6d6a1..34cde81982 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NormalizerBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NormalizerBuilders.java
@@ -36,23 +36,22 @@
  * Builders for {@link Normalizer} variants.
  */
 public class NormalizerBuilders {
-	private NormalizerBuilders() {
-	}
+    private NormalizerBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link CustomNormalizer custom} {@code Normalizer}
-	 * variant.
-	 */
-	public static CustomNormalizer.Builder custom() {
-		return new CustomNormalizer.Builder();
-	}
+    /**
+     * Creates a builder for the {@link CustomNormalizer custom} {@code Normalizer}
+     * variant.
+     */
+    public static CustomNormalizer.Builder custom() {
+        return new CustomNormalizer.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link LowercaseNormalizer lowercase}
-	 * {@code Normalizer} variant.
-	 */
-	public static LowercaseNormalizer.Builder lowercase() {
-		return new LowercaseNormalizer.Builder();
-	}
+    /**
+     * Creates a builder for the {@link LowercaseNormalizer lowercase}
+     * {@code Normalizer} variant.
+     */
+    public static LowercaseNormalizer.Builder lowercase() {
+        return new LowercaseNormalizer.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NormalizerVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NormalizerVariant.java
index 742bfc28d3..a40b421918 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NormalizerVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/NormalizerVariant.java
@@ -39,10 +39,10 @@
  */
 public interface NormalizerVariant extends JsonpSerializable {
 
-	Normalizer.Kind _normalizerKind();
+    Normalizer.Kind _normalizerKind();
 
-	default Normalizer _toNormalizer() {
-		return new Normalizer(this);
-	}
+    default Normalizer _toNormalizer() {
+        return new Normalizer(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PathHierarchyTokenizer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PathHierarchyTokenizer.java
index 29f09e0d13..f193b74566 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PathHierarchyTokenizer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PathHierarchyTokenizer.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,200 +41,196 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.PathHierarchyTokenizer
 
-
 @JsonpDeserializable
 public class PathHierarchyTokenizer extends TokenizerBase implements TokenizerDefinitionVariant {
-	private final int bufferSize;
+    private final int bufferSize;
 
-	private final String delimiter;
+    private final String delimiter;
 
-	private final String replacement;
+    private final String replacement;
 
-	private final boolean reverse;
+    private final boolean reverse;
 
-	private final int skip;
+    private final int skip;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private PathHierarchyTokenizer(Builder builder) {
-		super(builder);
+    private PathHierarchyTokenizer(Builder builder) {
+        super(builder);
 
-		this.bufferSize = ApiTypeHelper.requireNonNull(builder.bufferSize, this, "bufferSize");
-		this.delimiter = ApiTypeHelper.requireNonNull(builder.delimiter, this, "delimiter");
-		this.replacement = ApiTypeHelper.requireNonNull(builder.replacement, this, "replacement");
-		this.reverse = ApiTypeHelper.requireNonNull(builder.reverse, this, "reverse");
-		this.skip = ApiTypeHelper.requireNonNull(builder.skip, this, "skip");
+        this.bufferSize = ApiTypeHelper.requireNonNull(builder.bufferSize, this, "bufferSize");
+        this.delimiter = ApiTypeHelper.requireNonNull(builder.delimiter, this, "delimiter");
+        this.replacement = ApiTypeHelper.requireNonNull(builder.replacement, this, "replacement");
+        this.reverse = ApiTypeHelper.requireNonNull(builder.reverse, this, "reverse");
+        this.skip = ApiTypeHelper.requireNonNull(builder.skip, this, "skip");
 
-	}
+    }
 
-	public static PathHierarchyTokenizer of(Function<Builder, ObjectBuilder<PathHierarchyTokenizer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static PathHierarchyTokenizer of(Function<Builder, ObjectBuilder<PathHierarchyTokenizer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * TokenizerDefinition variant kind.
-	 */
-	@Override
-	public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
-		return TokenizerDefinition.Kind.PathHierarchy;
-	}
+    /**
+     * TokenizerDefinition variant kind.
+     */
+    @Override
+    public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
+        return TokenizerDefinition.Kind.PathHierarchy;
+    }
 
-	/**
-	 * Required - API name: {@code buffer_size}
-	 */
-	public final int bufferSize() {
-		return this.bufferSize;
-	}
-
-	/**
-	 * Required - API name: {@code delimiter}
-	 */
-	public final String delimiter() {
-		return this.delimiter;
-	}
-
-	/**
-	 * Required - API name: {@code replacement}
-	 */
-	public final String replacement() {
-		return this.replacement;
-	}
-
-	/**
-	 * Required - API name: {@code reverse}
-	 */
-	public final boolean reverse() {
-		return this.reverse;
-	}
-
-	/**
-	 * Required - API name: {@code skip}
-	 */
-	public final int skip() {
-		return this.skip;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "path_hierarchy");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("buffer_size");
-		generator.write(this.bufferSize);
-
-		generator.writeKey("delimiter");
-		generator.write(this.delimiter);
-
-		generator.writeKey("replacement");
-		generator.write(this.replacement);
-
-		generator.writeKey("reverse");
-		generator.write(this.reverse);
-
-		generator.writeKey("skip");
-		generator.write(this.skip);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PathHierarchyTokenizer}.
-	 */
-
-	public static class Builder extends TokenizerBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PathHierarchyTokenizer> {
-		private Integer bufferSize;
-
-		private String delimiter;
-
-		private String replacement;
-
-		private Boolean reverse;
-
-		private Integer skip;
-
-		/**
-		 * Required - API name: {@code buffer_size}
-		 */
-		public final Builder bufferSize(int value) {
-			this.bufferSize = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code delimiter}
-		 */
-		public final Builder delimiter(String value) {
-			this.delimiter = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code replacement}
-		 */
-		public final Builder replacement(String value) {
-			this.replacement = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code reverse}
-		 */
-		public final Builder reverse(boolean value) {
-			this.reverse = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code skip}
-		 */
-		public final Builder skip(int value) {
-			this.skip = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PathHierarchyTokenizer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PathHierarchyTokenizer build() {
-			_checkSingleUse();
-
-			return new PathHierarchyTokenizer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PathHierarchyTokenizer}
-	 */
-	public static final JsonpDeserializer<PathHierarchyTokenizer> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PathHierarchyTokenizer::setupPathHierarchyTokenizerDeserializer);
-
-	protected static void setupPathHierarchyTokenizerDeserializer(
-			ObjectDeserializer<PathHierarchyTokenizer.Builder> op) {
-		TokenizerBase.setupTokenizerBaseDeserializer(op);
-		op.add(Builder::bufferSize, JsonpDeserializer.integerDeserializer(), "buffer_size");
-		op.add(Builder::delimiter, JsonpDeserializer.stringDeserializer(), "delimiter");
-		op.add(Builder::replacement, JsonpDeserializer.stringDeserializer(), "replacement");
-		op.add(Builder::reverse, JsonpDeserializer.booleanDeserializer(), "reverse");
-		op.add(Builder::skip, JsonpDeserializer.integerDeserializer(), "skip");
-
-		op.ignore("type");
-	}
+    /**
+     * Required - API name: {@code buffer_size}
+     */
+    public final int bufferSize() {
+        return this.bufferSize;
+    }
+
+    /**
+     * Required - API name: {@code delimiter}
+     */
+    public final String delimiter() {
+        return this.delimiter;
+    }
+
+    /**
+     * Required - API name: {@code replacement}
+     */
+    public final String replacement() {
+        return this.replacement;
+    }
+
+    /**
+     * Required - API name: {@code reverse}
+     */
+    public final boolean reverse() {
+        return this.reverse;
+    }
+
+    /**
+     * Required - API name: {@code skip}
+     */
+    public final int skip() {
+        return this.skip;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "path_hierarchy");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("buffer_size");
+        generator.write(this.bufferSize);
+
+        generator.writeKey("delimiter");
+        generator.write(this.delimiter);
+
+        generator.writeKey("replacement");
+        generator.write(this.replacement);
+
+        generator.writeKey("reverse");
+        generator.write(this.reverse);
+
+        generator.writeKey("skip");
+        generator.write(this.skip);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PathHierarchyTokenizer}.
+     */
+
+    public static class Builder extends TokenizerBase.AbstractBuilder<Builder> implements ObjectBuilder<PathHierarchyTokenizer> {
+        private Integer bufferSize;
+
+        private String delimiter;
+
+        private String replacement;
+
+        private Boolean reverse;
+
+        private Integer skip;
+
+        /**
+         * Required - API name: {@code buffer_size}
+         */
+        public final Builder bufferSize(int value) {
+            this.bufferSize = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code delimiter}
+         */
+        public final Builder delimiter(String value) {
+            this.delimiter = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code replacement}
+         */
+        public final Builder replacement(String value) {
+            this.replacement = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code reverse}
+         */
+        public final Builder reverse(boolean value) {
+            this.reverse = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code skip}
+         */
+        public final Builder skip(int value) {
+            this.skip = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PathHierarchyTokenizer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PathHierarchyTokenizer build() {
+            _checkSingleUse();
+
+            return new PathHierarchyTokenizer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PathHierarchyTokenizer}
+     */
+    public static final JsonpDeserializer<PathHierarchyTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PathHierarchyTokenizer::setupPathHierarchyTokenizerDeserializer
+    );
+
+    protected static void setupPathHierarchyTokenizerDeserializer(ObjectDeserializer<PathHierarchyTokenizer.Builder> op) {
+        TokenizerBase.setupTokenizerBaseDeserializer(op);
+        op.add(Builder::bufferSize, JsonpDeserializer.integerDeserializer(), "buffer_size");
+        op.add(Builder::delimiter, JsonpDeserializer.stringDeserializer(), "delimiter");
+        op.add(Builder::replacement, JsonpDeserializer.stringDeserializer(), "replacement");
+        op.add(Builder::reverse, JsonpDeserializer.booleanDeserializer(), "reverse");
+        op.add(Builder::skip, JsonpDeserializer.integerDeserializer(), "skip");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternAnalyzer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternAnalyzer.java
index 3ec16156e7..084249bb3f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternAnalyzer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternAnalyzer.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,238 +45,235 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.PatternAnalyzer
 
 @JsonpDeserializable
 public class PatternAnalyzer implements AnalyzerVariant, JsonpSerializable {
-	@Nullable
-	private final String version;
-
-	@Nullable
-	private final String flags;
-
-	@Nullable
-	private final Boolean lowercase;
-
-	private final String pattern;
-
-	private final List<String> stopwords;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PatternAnalyzer(Builder builder) {
-
-		this.version = builder.version;
-		this.flags = builder.flags;
-		this.lowercase = builder.lowercase;
-		this.pattern = ApiTypeHelper.requireNonNull(builder.pattern, this, "pattern");
-		this.stopwords = ApiTypeHelper.unmodifiable(builder.stopwords);
-
-	}
-
-	public static PatternAnalyzer of(Function<Builder, ObjectBuilder<PatternAnalyzer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Analyzer variant kind.
-	 */
-	@Override
-	public Analyzer.Kind _analyzerKind() {
-		return Analyzer.Kind.Pattern;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final String version() {
-		return this.version;
-	}
-
-	/**
-	 * API name: {@code flags}
-	 */
-	@Nullable
-	public final String flags() {
-		return this.flags;
-	}
-
-	/**
-	 * API name: {@code lowercase}
-	 */
-	@Nullable
-	public final Boolean lowercase() {
-		return this.lowercase;
-	}
-
-	/**
-	 * Required - API name: {@code pattern}
-	 */
-	public final String pattern() {
-		return this.pattern;
-	}
-
-	/**
-	 * API name: {@code stopwords}
-	 */
-	public final List<String> stopwords() {
-		return this.stopwords;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "pattern");
-
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		if (this.flags != null) {
-			generator.writeKey("flags");
-			generator.write(this.flags);
-
-		}
-		if (this.lowercase != null) {
-			generator.writeKey("lowercase");
-			generator.write(this.lowercase);
-
-		}
-		generator.writeKey("pattern");
-		generator.write(this.pattern);
-
-		if (ApiTypeHelper.isDefined(this.stopwords)) {
-			generator.writeKey("stopwords");
-			generator.writeStartArray();
-			for (String item0 : this.stopwords) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PatternAnalyzer}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PatternAnalyzer> {
-		@Nullable
-		private String version;
-
-		@Nullable
-		private String flags;
-
-		@Nullable
-		private Boolean lowercase;
-
-		private String pattern;
-
-		@Nullable
-		private List<String> stopwords;
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code flags}
-		 */
-		public final Builder flags(@Nullable String value) {
-			this.flags = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code lowercase}
-		 */
-		public final Builder lowercase(@Nullable Boolean value) {
-			this.lowercase = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code pattern}
-		 */
-		public final Builder pattern(String value) {
-			this.pattern = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code stopwords}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>stopwords</code>.
-		 */
-		public final Builder stopwords(List<String> list) {
-			this.stopwords = _listAddAll(this.stopwords, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stopwords}
-		 * <p>
-		 * Adds one or more values to <code>stopwords</code>.
-		 */
-		public final Builder stopwords(String value, String... values) {
-			this.stopwords = _listAdd(this.stopwords, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PatternAnalyzer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PatternAnalyzer build() {
-			_checkSingleUse();
-
-			return new PatternAnalyzer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PatternAnalyzer}
-	 */
-	public static final JsonpDeserializer<PatternAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			PatternAnalyzer::setupPatternAnalyzerDeserializer);
-
-	protected static void setupPatternAnalyzerDeserializer(ObjectDeserializer<PatternAnalyzer.Builder> op) {
-
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
-		op.add(Builder::flags, JsonpDeserializer.stringDeserializer(), "flags");
-		op.add(Builder::lowercase, JsonpDeserializer.booleanDeserializer(), "lowercase");
-		op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
-		op.add(Builder::stopwords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"stopwords");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final String version;
+
+    @Nullable
+    private final String flags;
+
+    @Nullable
+    private final Boolean lowercase;
+
+    private final String pattern;
+
+    private final List<String> stopwords;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PatternAnalyzer(Builder builder) {
+
+        this.version = builder.version;
+        this.flags = builder.flags;
+        this.lowercase = builder.lowercase;
+        this.pattern = ApiTypeHelper.requireNonNull(builder.pattern, this, "pattern");
+        this.stopwords = ApiTypeHelper.unmodifiable(builder.stopwords);
+
+    }
+
+    public static PatternAnalyzer of(Function<Builder, ObjectBuilder<PatternAnalyzer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Analyzer variant kind.
+     */
+    @Override
+    public Analyzer.Kind _analyzerKind() {
+        return Analyzer.Kind.Pattern;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final String version() {
+        return this.version;
+    }
+
+    /**
+     * API name: {@code flags}
+     */
+    @Nullable
+    public final String flags() {
+        return this.flags;
+    }
+
+    /**
+     * API name: {@code lowercase}
+     */
+    @Nullable
+    public final Boolean lowercase() {
+        return this.lowercase;
+    }
+
+    /**
+     * Required - API name: {@code pattern}
+     */
+    public final String pattern() {
+        return this.pattern;
+    }
+
+    /**
+     * API name: {@code stopwords}
+     */
+    public final List<String> stopwords() {
+        return this.stopwords;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "pattern");
+
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        if (this.flags != null) {
+            generator.writeKey("flags");
+            generator.write(this.flags);
+
+        }
+        if (this.lowercase != null) {
+            generator.writeKey("lowercase");
+            generator.write(this.lowercase);
+
+        }
+        generator.writeKey("pattern");
+        generator.write(this.pattern);
+
+        if (ApiTypeHelper.isDefined(this.stopwords)) {
+            generator.writeKey("stopwords");
+            generator.writeStartArray();
+            for (String item0 : this.stopwords) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PatternAnalyzer}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PatternAnalyzer> {
+        @Nullable
+        private String version;
+
+        @Nullable
+        private String flags;
+
+        @Nullable
+        private Boolean lowercase;
+
+        private String pattern;
+
+        @Nullable
+        private List<String> stopwords;
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code flags}
+         */
+        public final Builder flags(@Nullable String value) {
+            this.flags = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code lowercase}
+         */
+        public final Builder lowercase(@Nullable Boolean value) {
+            this.lowercase = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code pattern}
+         */
+        public final Builder pattern(String value) {
+            this.pattern = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code stopwords}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>stopwords</code>.
+         */
+        public final Builder stopwords(List<String> list) {
+            this.stopwords = _listAddAll(this.stopwords, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code stopwords}
+         * <p>
+         * Adds one or more values to <code>stopwords</code>.
+         */
+        public final Builder stopwords(String value, String... values) {
+            this.stopwords = _listAdd(this.stopwords, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link PatternAnalyzer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PatternAnalyzer build() {
+            _checkSingleUse();
+
+            return new PatternAnalyzer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PatternAnalyzer}
+     */
+    public static final JsonpDeserializer<PatternAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PatternAnalyzer::setupPatternAnalyzerDeserializer
+    );
+
+    protected static void setupPatternAnalyzerDeserializer(ObjectDeserializer<PatternAnalyzer.Builder> op) {
+
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
+        op.add(Builder::flags, JsonpDeserializer.stringDeserializer(), "flags");
+        op.add(Builder::lowercase, JsonpDeserializer.booleanDeserializer(), "lowercase");
+        op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
+        op.add(Builder::stopwords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stopwords");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternCaptureTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternCaptureTokenFilter.java
index 753d9b3707..6f02fca0e8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternCaptureTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternCaptureTokenFilter.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,148 +42,143 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _types.analysis.PatternCaptureTokenFilter
 
 @JsonpDeserializable
 public class PatternCaptureTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final List<String> patterns;
-
-	private final boolean preserveOriginal;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PatternCaptureTokenFilter(Builder builder) {
-		super(builder);
-
-		this.patterns = ApiTypeHelper.unmodifiableRequired(builder.patterns, this, "patterns");
-		this.preserveOriginal = ApiTypeHelper.requireNonNull(builder.preserveOriginal, this, "preserveOriginal");
-
-	}
-
-	public static PatternCaptureTokenFilter of(Function<Builder, ObjectBuilder<PatternCaptureTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.PatternCapture;
-	}
-
-	/**
-	 * Required - API name: {@code patterns}
-	 */
-	public final List<String> patterns() {
-		return this.patterns;
-	}
-
-	/**
-	 * Required - API name: {@code preserve_original}
-	 */
-	public final boolean preserveOriginal() {
-		return this.preserveOriginal;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "pattern_capture");
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.patterns)) {
-			generator.writeKey("patterns");
-			generator.writeStartArray();
-			for (String item0 : this.patterns) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("preserve_original");
-		generator.write(this.preserveOriginal);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PatternCaptureTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PatternCaptureTokenFilter> {
-		private List<String> patterns;
-
-		private Boolean preserveOriginal;
-
-		/**
-		 * Required - API name: {@code patterns}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>patterns</code>.
-		 */
-		public final Builder patterns(List<String> list) {
-			this.patterns = _listAddAll(this.patterns, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code patterns}
-		 * <p>
-		 * Adds one or more values to <code>patterns</code>.
-		 */
-		public final Builder patterns(String value, String... values) {
-			this.patterns = _listAdd(this.patterns, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code preserve_original}
-		 */
-		public final Builder preserveOriginal(boolean value) {
-			this.preserveOriginal = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PatternCaptureTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PatternCaptureTokenFilter build() {
-			_checkSingleUse();
-
-			return new PatternCaptureTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PatternCaptureTokenFilter}
-	 */
-	public static final JsonpDeserializer<PatternCaptureTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PatternCaptureTokenFilter::setupPatternCaptureTokenFilterDeserializer);
-
-	protected static void setupPatternCaptureTokenFilterDeserializer(
-			ObjectDeserializer<PatternCaptureTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::patterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"patterns");
-		op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
-
-		op.ignore("type");
-	}
+    private final List<String> patterns;
+
+    private final boolean preserveOriginal;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PatternCaptureTokenFilter(Builder builder) {
+        super(builder);
+
+        this.patterns = ApiTypeHelper.unmodifiableRequired(builder.patterns, this, "patterns");
+        this.preserveOriginal = ApiTypeHelper.requireNonNull(builder.preserveOriginal, this, "preserveOriginal");
+
+    }
+
+    public static PatternCaptureTokenFilter of(Function<Builder, ObjectBuilder<PatternCaptureTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.PatternCapture;
+    }
+
+    /**
+     * Required - API name: {@code patterns}
+     */
+    public final List<String> patterns() {
+        return this.patterns;
+    }
+
+    /**
+     * Required - API name: {@code preserve_original}
+     */
+    public final boolean preserveOriginal() {
+        return this.preserveOriginal;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "pattern_capture");
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.patterns)) {
+            generator.writeKey("patterns");
+            generator.writeStartArray();
+            for (String item0 : this.patterns) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("preserve_original");
+        generator.write(this.preserveOriginal);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PatternCaptureTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<PatternCaptureTokenFilter> {
+        private List<String> patterns;
+
+        private Boolean preserveOriginal;
+
+        /**
+         * Required - API name: {@code patterns}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>patterns</code>.
+         */
+        public final Builder patterns(List<String> list) {
+            this.patterns = _listAddAll(this.patterns, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code patterns}
+         * <p>
+         * Adds one or more values to <code>patterns</code>.
+         */
+        public final Builder patterns(String value, String... values) {
+            this.patterns = _listAdd(this.patterns, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code preserve_original}
+         */
+        public final Builder preserveOriginal(boolean value) {
+            this.preserveOriginal = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PatternCaptureTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PatternCaptureTokenFilter build() {
+            _checkSingleUse();
+
+            return new PatternCaptureTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PatternCaptureTokenFilter}
+     */
+    public static final JsonpDeserializer<PatternCaptureTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PatternCaptureTokenFilter::setupPatternCaptureTokenFilterDeserializer
+    );
+
+    protected static void setupPatternCaptureTokenFilterDeserializer(ObjectDeserializer<PatternCaptureTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::patterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "patterns");
+        op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternReplaceCharFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternReplaceCharFilter.java
index a0ac6f883f..af7112de91 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternReplaceCharFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternReplaceCharFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,151 +41,148 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.PatternReplaceCharFilter
 
 @JsonpDeserializable
 public class PatternReplaceCharFilter extends CharFilterBase implements CharFilterDefinitionVariant {
-	private final String flags;
-
-	private final String pattern;
-
-	private final String replacement;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PatternReplaceCharFilter(Builder builder) {
-		super(builder);
-
-		this.flags = ApiTypeHelper.requireNonNull(builder.flags, this, "flags");
-		this.pattern = ApiTypeHelper.requireNonNull(builder.pattern, this, "pattern");
-		this.replacement = ApiTypeHelper.requireNonNull(builder.replacement, this, "replacement");
-
-	}
-
-	public static PatternReplaceCharFilter of(Function<Builder, ObjectBuilder<PatternReplaceCharFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * CharFilterDefinition variant kind.
-	 */
-	@Override
-	public CharFilterDefinition.Kind _charFilterDefinitionKind() {
-		return CharFilterDefinition.Kind.PatternReplace;
-	}
-
-	/**
-	 * Required - API name: {@code flags}
-	 */
-	public final String flags() {
-		return this.flags;
-	}
-
-	/**
-	 * Required - API name: {@code pattern}
-	 */
-	public final String pattern() {
-		return this.pattern;
-	}
-
-	/**
-	 * Required - API name: {@code replacement}
-	 */
-	public final String replacement() {
-		return this.replacement;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "pattern_replace");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("flags");
-		generator.write(this.flags);
-
-		generator.writeKey("pattern");
-		generator.write(this.pattern);
-
-		generator.writeKey("replacement");
-		generator.write(this.replacement);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PatternReplaceCharFilter}.
-	 */
-
-	public static class Builder extends CharFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PatternReplaceCharFilter> {
-		private String flags;
-
-		private String pattern;
-
-		private String replacement;
-
-		/**
-		 * Required - API name: {@code flags}
-		 */
-		public final Builder flags(String value) {
-			this.flags = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code pattern}
-		 */
-		public final Builder pattern(String value) {
-			this.pattern = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code replacement}
-		 */
-		public final Builder replacement(String value) {
-			this.replacement = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PatternReplaceCharFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PatternReplaceCharFilter build() {
-			_checkSingleUse();
-
-			return new PatternReplaceCharFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PatternReplaceCharFilter}
-	 */
-	public static final JsonpDeserializer<PatternReplaceCharFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PatternReplaceCharFilter::setupPatternReplaceCharFilterDeserializer);
-
-	protected static void setupPatternReplaceCharFilterDeserializer(
-			ObjectDeserializer<PatternReplaceCharFilter.Builder> op) {
-		CharFilterBase.setupCharFilterBaseDeserializer(op);
-		op.add(Builder::flags, JsonpDeserializer.stringDeserializer(), "flags");
-		op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
-		op.add(Builder::replacement, JsonpDeserializer.stringDeserializer(), "replacement");
-
-		op.ignore("type");
-	}
+    private final String flags;
+
+    private final String pattern;
+
+    private final String replacement;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PatternReplaceCharFilter(Builder builder) {
+        super(builder);
+
+        this.flags = ApiTypeHelper.requireNonNull(builder.flags, this, "flags");
+        this.pattern = ApiTypeHelper.requireNonNull(builder.pattern, this, "pattern");
+        this.replacement = ApiTypeHelper.requireNonNull(builder.replacement, this, "replacement");
+
+    }
+
+    public static PatternReplaceCharFilter of(Function<Builder, ObjectBuilder<PatternReplaceCharFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * CharFilterDefinition variant kind.
+     */
+    @Override
+    public CharFilterDefinition.Kind _charFilterDefinitionKind() {
+        return CharFilterDefinition.Kind.PatternReplace;
+    }
+
+    /**
+     * Required - API name: {@code flags}
+     */
+    public final String flags() {
+        return this.flags;
+    }
+
+    /**
+     * Required - API name: {@code pattern}
+     */
+    public final String pattern() {
+        return this.pattern;
+    }
+
+    /**
+     * Required - API name: {@code replacement}
+     */
+    public final String replacement() {
+        return this.replacement;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "pattern_replace");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("flags");
+        generator.write(this.flags);
+
+        generator.writeKey("pattern");
+        generator.write(this.pattern);
+
+        generator.writeKey("replacement");
+        generator.write(this.replacement);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PatternReplaceCharFilter}.
+     */
+
+    public static class Builder extends CharFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<PatternReplaceCharFilter> {
+        private String flags;
+
+        private String pattern;
+
+        private String replacement;
+
+        /**
+         * Required - API name: {@code flags}
+         */
+        public final Builder flags(String value) {
+            this.flags = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code pattern}
+         */
+        public final Builder pattern(String value) {
+            this.pattern = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code replacement}
+         */
+        public final Builder replacement(String value) {
+            this.replacement = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PatternReplaceCharFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PatternReplaceCharFilter build() {
+            _checkSingleUse();
+
+            return new PatternReplaceCharFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PatternReplaceCharFilter}
+     */
+    public static final JsonpDeserializer<PatternReplaceCharFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PatternReplaceCharFilter::setupPatternReplaceCharFilterDeserializer
+    );
+
+    protected static void setupPatternReplaceCharFilterDeserializer(ObjectDeserializer<PatternReplaceCharFilter.Builder> op) {
+        CharFilterBase.setupCharFilterBaseDeserializer(op);
+        op.add(Builder::flags, JsonpDeserializer.stringDeserializer(), "flags");
+        op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
+        op.add(Builder::replacement, JsonpDeserializer.stringDeserializer(), "replacement");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternReplaceTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternReplaceTokenFilter.java
index 70e3700ce7..9bf3754197 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternReplaceTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternReplaceTokenFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,152 +41,148 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.PatternReplaceTokenFilter
 
-
 @JsonpDeserializable
 public class PatternReplaceTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final String flags;
-
-	private final String pattern;
-
-	private final String replacement;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PatternReplaceTokenFilter(Builder builder) {
-		super(builder);
-
-		this.flags = ApiTypeHelper.requireNonNull(builder.flags, this, "flags");
-		this.pattern = ApiTypeHelper.requireNonNull(builder.pattern, this, "pattern");
-		this.replacement = ApiTypeHelper.requireNonNull(builder.replacement, this, "replacement");
-
-	}
-
-	public static PatternReplaceTokenFilter of(Function<Builder, ObjectBuilder<PatternReplaceTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.PatternReplace;
-	}
-
-	/**
-	 * Required - API name: {@code flags}
-	 */
-	public final String flags() {
-		return this.flags;
-	}
-
-	/**
-	 * Required - API name: {@code pattern}
-	 */
-	public final String pattern() {
-		return this.pattern;
-	}
-
-	/**
-	 * Required - API name: {@code replacement}
-	 */
-	public final String replacement() {
-		return this.replacement;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "pattern_replace");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("flags");
-		generator.write(this.flags);
-
-		generator.writeKey("pattern");
-		generator.write(this.pattern);
-
-		generator.writeKey("replacement");
-		generator.write(this.replacement);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PatternReplaceTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PatternReplaceTokenFilter> {
-		private String flags;
-
-		private String pattern;
-
-		private String replacement;
-
-		/**
-		 * Required - API name: {@code flags}
-		 */
-		public final Builder flags(String value) {
-			this.flags = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code pattern}
-		 */
-		public final Builder pattern(String value) {
-			this.pattern = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code replacement}
-		 */
-		public final Builder replacement(String value) {
-			this.replacement = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PatternReplaceTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PatternReplaceTokenFilter build() {
-			_checkSingleUse();
-
-			return new PatternReplaceTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PatternReplaceTokenFilter}
-	 */
-	public static final JsonpDeserializer<PatternReplaceTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PatternReplaceTokenFilter::setupPatternReplaceTokenFilterDeserializer);
-
-	protected static void setupPatternReplaceTokenFilterDeserializer(
-			ObjectDeserializer<PatternReplaceTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::flags, JsonpDeserializer.stringDeserializer(), "flags");
-		op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
-		op.add(Builder::replacement, JsonpDeserializer.stringDeserializer(), "replacement");
-
-		op.ignore("type");
-	}
+    private final String flags;
+
+    private final String pattern;
+
+    private final String replacement;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PatternReplaceTokenFilter(Builder builder) {
+        super(builder);
+
+        this.flags = ApiTypeHelper.requireNonNull(builder.flags, this, "flags");
+        this.pattern = ApiTypeHelper.requireNonNull(builder.pattern, this, "pattern");
+        this.replacement = ApiTypeHelper.requireNonNull(builder.replacement, this, "replacement");
+
+    }
+
+    public static PatternReplaceTokenFilter of(Function<Builder, ObjectBuilder<PatternReplaceTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.PatternReplace;
+    }
+
+    /**
+     * Required - API name: {@code flags}
+     */
+    public final String flags() {
+        return this.flags;
+    }
+
+    /**
+     * Required - API name: {@code pattern}
+     */
+    public final String pattern() {
+        return this.pattern;
+    }
+
+    /**
+     * Required - API name: {@code replacement}
+     */
+    public final String replacement() {
+        return this.replacement;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "pattern_replace");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("flags");
+        generator.write(this.flags);
+
+        generator.writeKey("pattern");
+        generator.write(this.pattern);
+
+        generator.writeKey("replacement");
+        generator.write(this.replacement);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PatternReplaceTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<PatternReplaceTokenFilter> {
+        private String flags;
+
+        private String pattern;
+
+        private String replacement;
+
+        /**
+         * Required - API name: {@code flags}
+         */
+        public final Builder flags(String value) {
+            this.flags = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code pattern}
+         */
+        public final Builder pattern(String value) {
+            this.pattern = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code replacement}
+         */
+        public final Builder replacement(String value) {
+            this.replacement = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PatternReplaceTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PatternReplaceTokenFilter build() {
+            _checkSingleUse();
+
+            return new PatternReplaceTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PatternReplaceTokenFilter}
+     */
+    public static final JsonpDeserializer<PatternReplaceTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PatternReplaceTokenFilter::setupPatternReplaceTokenFilterDeserializer
+    );
+
+    protected static void setupPatternReplaceTokenFilterDeserializer(ObjectDeserializer<PatternReplaceTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::flags, JsonpDeserializer.stringDeserializer(), "flags");
+        op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
+        op.add(Builder::replacement, JsonpDeserializer.stringDeserializer(), "replacement");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternTokenizer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternTokenizer.java
index 85489f1486..722b9e7a76 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternTokenizer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PatternTokenizer.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,151 +41,148 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.PatternTokenizer
 
-
 @JsonpDeserializable
 public class PatternTokenizer extends TokenizerBase implements TokenizerDefinitionVariant {
-	private final String flags;
-
-	private final int group;
-
-	private final String pattern;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PatternTokenizer(Builder builder) {
-		super(builder);
-
-		this.flags = ApiTypeHelper.requireNonNull(builder.flags, this, "flags");
-		this.group = ApiTypeHelper.requireNonNull(builder.group, this, "group");
-		this.pattern = ApiTypeHelper.requireNonNull(builder.pattern, this, "pattern");
-
-	}
-
-	public static PatternTokenizer of(Function<Builder, ObjectBuilder<PatternTokenizer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenizerDefinition variant kind.
-	 */
-	@Override
-	public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
-		return TokenizerDefinition.Kind.Pattern;
-	}
-
-	/**
-	 * Required - API name: {@code flags}
-	 */
-	public final String flags() {
-		return this.flags;
-	}
-
-	/**
-	 * Required - API name: {@code group}
-	 */
-	public final int group() {
-		return this.group;
-	}
-
-	/**
-	 * Required - API name: {@code pattern}
-	 */
-	public final String pattern() {
-		return this.pattern;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "pattern");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("flags");
-		generator.write(this.flags);
-
-		generator.writeKey("group");
-		generator.write(this.group);
-
-		generator.writeKey("pattern");
-		generator.write(this.pattern);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PatternTokenizer}.
-	 */
-
-	public static class Builder extends TokenizerBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PatternTokenizer> {
-		private String flags;
-
-		private Integer group;
-
-		private String pattern;
-
-		/**
-		 * Required - API name: {@code flags}
-		 */
-		public final Builder flags(String value) {
-			this.flags = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code group}
-		 */
-		public final Builder group(int value) {
-			this.group = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code pattern}
-		 */
-		public final Builder pattern(String value) {
-			this.pattern = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PatternTokenizer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PatternTokenizer build() {
-			_checkSingleUse();
-
-			return new PatternTokenizer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PatternTokenizer}
-	 */
-	public static final JsonpDeserializer<PatternTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			PatternTokenizer::setupPatternTokenizerDeserializer);
-
-	protected static void setupPatternTokenizerDeserializer(ObjectDeserializer<PatternTokenizer.Builder> op) {
-		setupTokenizerBaseDeserializer(op);
-		op.add(Builder::flags, JsonpDeserializer.stringDeserializer(), "flags");
-		op.add(Builder::group, JsonpDeserializer.integerDeserializer(), "group");
-		op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
-
-		op.ignore("type");
-	}
+    private final String flags;
+
+    private final int group;
+
+    private final String pattern;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PatternTokenizer(Builder builder) {
+        super(builder);
+
+        this.flags = ApiTypeHelper.requireNonNull(builder.flags, this, "flags");
+        this.group = ApiTypeHelper.requireNonNull(builder.group, this, "group");
+        this.pattern = ApiTypeHelper.requireNonNull(builder.pattern, this, "pattern");
+
+    }
+
+    public static PatternTokenizer of(Function<Builder, ObjectBuilder<PatternTokenizer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenizerDefinition variant kind.
+     */
+    @Override
+    public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
+        return TokenizerDefinition.Kind.Pattern;
+    }
+
+    /**
+     * Required - API name: {@code flags}
+     */
+    public final String flags() {
+        return this.flags;
+    }
+
+    /**
+     * Required - API name: {@code group}
+     */
+    public final int group() {
+        return this.group;
+    }
+
+    /**
+     * Required - API name: {@code pattern}
+     */
+    public final String pattern() {
+        return this.pattern;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "pattern");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("flags");
+        generator.write(this.flags);
+
+        generator.writeKey("group");
+        generator.write(this.group);
+
+        generator.writeKey("pattern");
+        generator.write(this.pattern);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PatternTokenizer}.
+     */
+
+    public static class Builder extends TokenizerBase.AbstractBuilder<Builder> implements ObjectBuilder<PatternTokenizer> {
+        private String flags;
+
+        private Integer group;
+
+        private String pattern;
+
+        /**
+         * Required - API name: {@code flags}
+         */
+        public final Builder flags(String value) {
+            this.flags = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code group}
+         */
+        public final Builder group(int value) {
+            this.group = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code pattern}
+         */
+        public final Builder pattern(String value) {
+            this.pattern = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PatternTokenizer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PatternTokenizer build() {
+            _checkSingleUse();
+
+            return new PatternTokenizer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PatternTokenizer}
+     */
+    public static final JsonpDeserializer<PatternTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PatternTokenizer::setupPatternTokenizerDeserializer
+    );
+
+    protected static void setupPatternTokenizerDeserializer(ObjectDeserializer<PatternTokenizer.Builder> op) {
+        setupTokenizerBaseDeserializer(op);
+        op.add(Builder::flags, JsonpDeserializer.stringDeserializer(), "flags");
+        op.add(Builder::group, JsonpDeserializer.integerDeserializer(), "group");
+        op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticEncoder.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticEncoder.java
index 83d6488c0e..87ff80c95a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticEncoder.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticEncoder.java
@@ -37,42 +37,41 @@
 
 @JsonpDeserializable
 public enum PhoneticEncoder implements JsonEnum {
-	Metaphone("metaphone"),
+    Metaphone("metaphone"),
 
-	DoubleMetaphone("double_metaphone"),
+    DoubleMetaphone("double_metaphone"),
 
-	Soundex("soundex"),
+    Soundex("soundex"),
 
-	RefinedSoundex("refined_soundex"),
+    RefinedSoundex("refined_soundex"),
 
-	Caverphone1("caverphone1"),
+    Caverphone1("caverphone1"),
 
-	Caverphone2("caverphone2"),
+    Caverphone2("caverphone2"),
 
-	Cologne("cologne"),
+    Cologne("cologne"),
 
-	Nysiis("nysiis"),
+    Nysiis("nysiis"),
 
-	Koelnerphonetik("koelnerphonetik"),
+    Koelnerphonetik("koelnerphonetik"),
 
-	Haasephonetik("haasephonetik"),
+    Haasephonetik("haasephonetik"),
 
-	BeiderMorse("beider_morse"),
+    BeiderMorse("beider_morse"),
 
-	DaitchMokotoff("daitch_mokotoff"),
+    DaitchMokotoff("daitch_mokotoff"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	PhoneticEncoder(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    PhoneticEncoder(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<PhoneticEncoder> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			PhoneticEncoder.values());
+    public static final JsonEnum.Deserializer<PhoneticEncoder> _DESERIALIZER = new JsonEnum.Deserializer<>(PhoneticEncoder.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticLanguage.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticLanguage.java
index 2e326ffa0f..1f910ab781 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticLanguage.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticLanguage.java
@@ -35,45 +35,43 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum PhoneticLanguage implements JsonEnum {
-	Any("any"),
+    Any("any"),
 
-	Common("common"),
+    Common("common"),
 
-	Cyrillic("cyrillic"),
+    Cyrillic("cyrillic"),
 
-	English("english"),
+    English("english"),
 
-	French("french"),
+    French("french"),
 
-	German("german"),
+    German("german"),
 
-	Hebrew("hebrew"),
+    Hebrew("hebrew"),
 
-	Hungarian("hungarian"),
+    Hungarian("hungarian"),
 
-	Polish("polish"),
+    Polish("polish"),
 
-	Romanian("romanian"),
+    Romanian("romanian"),
 
-	Russian("russian"),
+    Russian("russian"),
 
-	Spanish("spanish"),
+    Spanish("spanish"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	PhoneticLanguage(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    PhoneticLanguage(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<PhoneticLanguage> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			PhoneticLanguage.values());
+    public static final JsonEnum.Deserializer<PhoneticLanguage> _DESERIALIZER = new JsonEnum.Deserializer<>(PhoneticLanguage.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticNameType.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticNameType.java
index 1a8c2c7234..e5aafbf73d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticNameType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticNameType.java
@@ -35,27 +35,25 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum PhoneticNameType implements JsonEnum {
-	Generic("generic"),
+    Generic("generic"),
 
-	Ashkenazi("ashkenazi"),
+    Ashkenazi("ashkenazi"),
 
-	Sephardic("sephardic"),
+    Sephardic("sephardic"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	PhoneticNameType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    PhoneticNameType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<PhoneticNameType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			PhoneticNameType.values());
+    public static final JsonEnum.Deserializer<PhoneticNameType> _DESERIALIZER = new JsonEnum.Deserializer<>(PhoneticNameType.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticRuleType.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticRuleType.java
index b2da10b289..ead1a82194 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticRuleType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticRuleType.java
@@ -35,25 +35,23 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum PhoneticRuleType implements JsonEnum {
-	Approx("approx"),
+    Approx("approx"),
 
-	Exact("exact"),
+    Exact("exact"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	PhoneticRuleType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    PhoneticRuleType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<PhoneticRuleType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			PhoneticRuleType.values());
+    public static final JsonEnum.Deserializer<PhoneticRuleType> _DESERIALIZER = new JsonEnum.Deserializer<>(PhoneticRuleType.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticTokenFilter.java
index df13bff4ce..558ba93330 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PhoneticTokenFilter.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,252 +43,246 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.PhoneticTokenFilter
 
-
 @JsonpDeserializable
 public class PhoneticTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final PhoneticEncoder encoder;
-
-	private final List<PhoneticLanguage> languageset;
-
-	@Nullable
-	private final Integer maxCodeLen;
-
-	private final PhoneticNameType nameType;
-
-	@Nullable
-	private final Boolean replace;
-
-	private final PhoneticRuleType ruleType;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PhoneticTokenFilter(Builder builder) {
-		super(builder);
-
-		this.encoder = ApiTypeHelper.requireNonNull(builder.encoder, this, "encoder");
-		this.languageset = ApiTypeHelper.unmodifiableRequired(builder.languageset, this, "languageset");
-		this.maxCodeLen = builder.maxCodeLen;
-		this.nameType = ApiTypeHelper.requireNonNull(builder.nameType, this, "nameType");
-		this.replace = builder.replace;
-		this.ruleType = ApiTypeHelper.requireNonNull(builder.ruleType, this, "ruleType");
-
-	}
-
-	public static PhoneticTokenFilter of(Function<Builder, ObjectBuilder<PhoneticTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Phonetic;
-	}
-
-	/**
-	 * Required - API name: {@code encoder}
-	 */
-	public final PhoneticEncoder encoder() {
-		return this.encoder;
-	}
-
-	/**
-	 * Required - API name: {@code languageset}
-	 */
-	public final List<PhoneticLanguage> languageset() {
-		return this.languageset;
-	}
-
-	/**
-	 * API name: {@code max_code_len}
-	 */
-	@Nullable
-	public final Integer maxCodeLen() {
-		return this.maxCodeLen;
-	}
-
-	/**
-	 * Required - API name: {@code name_type}
-	 */
-	public final PhoneticNameType nameType() {
-		return this.nameType;
-	}
-
-	/**
-	 * API name: {@code replace}
-	 */
-	@Nullable
-	public final Boolean replace() {
-		return this.replace;
-	}
-
-	/**
-	 * Required - API name: {@code rule_type}
-	 */
-	public final PhoneticRuleType ruleType() {
-		return this.ruleType;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "phonetic");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("encoder");
-		this.encoder.serialize(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.languageset)) {
-			generator.writeKey("languageset");
-			generator.writeStartArray();
-			for (PhoneticLanguage item0 : this.languageset) {
-				item0.serialize(generator, mapper);
-			}
-			generator.writeEnd();
-
-		}
-		if (this.maxCodeLen != null) {
-			generator.writeKey("max_code_len");
-			generator.write(this.maxCodeLen);
-
-		}
-		generator.writeKey("name_type");
-		this.nameType.serialize(generator, mapper);
-		if (this.replace != null) {
-			generator.writeKey("replace");
-			generator.write(this.replace);
-
-		}
-		generator.writeKey("rule_type");
-		this.ruleType.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PhoneticTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PhoneticTokenFilter> {
-		private PhoneticEncoder encoder;
-
-		private List<PhoneticLanguage> languageset;
-
-		@Nullable
-		private Integer maxCodeLen;
-
-		private PhoneticNameType nameType;
-
-		@Nullable
-		private Boolean replace;
-
-		private PhoneticRuleType ruleType;
-
-		/**
-		 * Required - API name: {@code encoder}
-		 */
-		public final Builder encoder(PhoneticEncoder value) {
-			this.encoder = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code languageset}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>languageset</code>.
-		 */
-		public final Builder languageset(List<PhoneticLanguage> list) {
-			this.languageset = _listAddAll(this.languageset, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code languageset}
-		 * <p>
-		 * Adds one or more values to <code>languageset</code>.
-		 */
-		public final Builder languageset(PhoneticLanguage value, PhoneticLanguage... values) {
-			this.languageset = _listAdd(this.languageset, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_code_len}
-		 */
-		public final Builder maxCodeLen(@Nullable Integer value) {
-			this.maxCodeLen = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code name_type}
-		 */
-		public final Builder nameType(PhoneticNameType value) {
-			this.nameType = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code replace}
-		 */
-		public final Builder replace(@Nullable Boolean value) {
-			this.replace = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code rule_type}
-		 */
-		public final Builder ruleType(PhoneticRuleType value) {
-			this.ruleType = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PhoneticTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PhoneticTokenFilter build() {
-			_checkSingleUse();
-
-			return new PhoneticTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PhoneticTokenFilter}
-	 */
-	public static final JsonpDeserializer<PhoneticTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PhoneticTokenFilter::setupPhoneticTokenFilterDeserializer);
-
-	protected static void setupPhoneticTokenFilterDeserializer(ObjectDeserializer<PhoneticTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::encoder, PhoneticEncoder._DESERIALIZER, "encoder");
-		op.add(Builder::languageset, JsonpDeserializer.arrayDeserializer(PhoneticLanguage._DESERIALIZER),
-				"languageset");
-		op.add(Builder::maxCodeLen, JsonpDeserializer.integerDeserializer(), "max_code_len");
-		op.add(Builder::nameType, PhoneticNameType._DESERIALIZER, "name_type");
-		op.add(Builder::replace, JsonpDeserializer.booleanDeserializer(), "replace");
-		op.add(Builder::ruleType, PhoneticRuleType._DESERIALIZER, "rule_type");
-
-		op.ignore("type");
-	}
+    private final PhoneticEncoder encoder;
+
+    private final List<PhoneticLanguage> languageset;
+
+    @Nullable
+    private final Integer maxCodeLen;
+
+    private final PhoneticNameType nameType;
+
+    @Nullable
+    private final Boolean replace;
+
+    private final PhoneticRuleType ruleType;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PhoneticTokenFilter(Builder builder) {
+        super(builder);
+
+        this.encoder = ApiTypeHelper.requireNonNull(builder.encoder, this, "encoder");
+        this.languageset = ApiTypeHelper.unmodifiableRequired(builder.languageset, this, "languageset");
+        this.maxCodeLen = builder.maxCodeLen;
+        this.nameType = ApiTypeHelper.requireNonNull(builder.nameType, this, "nameType");
+        this.replace = builder.replace;
+        this.ruleType = ApiTypeHelper.requireNonNull(builder.ruleType, this, "ruleType");
+
+    }
+
+    public static PhoneticTokenFilter of(Function<Builder, ObjectBuilder<PhoneticTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Phonetic;
+    }
+
+    /**
+     * Required - API name: {@code encoder}
+     */
+    public final PhoneticEncoder encoder() {
+        return this.encoder;
+    }
+
+    /**
+     * Required - API name: {@code languageset}
+     */
+    public final List<PhoneticLanguage> languageset() {
+        return this.languageset;
+    }
+
+    /**
+     * API name: {@code max_code_len}
+     */
+    @Nullable
+    public final Integer maxCodeLen() {
+        return this.maxCodeLen;
+    }
+
+    /**
+     * Required - API name: {@code name_type}
+     */
+    public final PhoneticNameType nameType() {
+        return this.nameType;
+    }
+
+    /**
+     * API name: {@code replace}
+     */
+    @Nullable
+    public final Boolean replace() {
+        return this.replace;
+    }
+
+    /**
+     * Required - API name: {@code rule_type}
+     */
+    public final PhoneticRuleType ruleType() {
+        return this.ruleType;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "phonetic");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("encoder");
+        this.encoder.serialize(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.languageset)) {
+            generator.writeKey("languageset");
+            generator.writeStartArray();
+            for (PhoneticLanguage item0 : this.languageset) {
+                item0.serialize(generator, mapper);
+            }
+            generator.writeEnd();
+
+        }
+        if (this.maxCodeLen != null) {
+            generator.writeKey("max_code_len");
+            generator.write(this.maxCodeLen);
+
+        }
+        generator.writeKey("name_type");
+        this.nameType.serialize(generator, mapper);
+        if (this.replace != null) {
+            generator.writeKey("replace");
+            generator.write(this.replace);
+
+        }
+        generator.writeKey("rule_type");
+        this.ruleType.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PhoneticTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<PhoneticTokenFilter> {
+        private PhoneticEncoder encoder;
+
+        private List<PhoneticLanguage> languageset;
+
+        @Nullable
+        private Integer maxCodeLen;
+
+        private PhoneticNameType nameType;
+
+        @Nullable
+        private Boolean replace;
+
+        private PhoneticRuleType ruleType;
+
+        /**
+         * Required - API name: {@code encoder}
+         */
+        public final Builder encoder(PhoneticEncoder value) {
+            this.encoder = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code languageset}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>languageset</code>.
+         */
+        public final Builder languageset(List<PhoneticLanguage> list) {
+            this.languageset = _listAddAll(this.languageset, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code languageset}
+         * <p>
+         * Adds one or more values to <code>languageset</code>.
+         */
+        public final Builder languageset(PhoneticLanguage value, PhoneticLanguage... values) {
+            this.languageset = _listAdd(this.languageset, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code max_code_len}
+         */
+        public final Builder maxCodeLen(@Nullable Integer value) {
+            this.maxCodeLen = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code name_type}
+         */
+        public final Builder nameType(PhoneticNameType value) {
+            this.nameType = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code replace}
+         */
+        public final Builder replace(@Nullable Boolean value) {
+            this.replace = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code rule_type}
+         */
+        public final Builder ruleType(PhoneticRuleType value) {
+            this.ruleType = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PhoneticTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PhoneticTokenFilter build() {
+            _checkSingleUse();
+
+            return new PhoneticTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PhoneticTokenFilter}
+     */
+    public static final JsonpDeserializer<PhoneticTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PhoneticTokenFilter::setupPhoneticTokenFilterDeserializer
+    );
+
+    protected static void setupPhoneticTokenFilterDeserializer(ObjectDeserializer<PhoneticTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::encoder, PhoneticEncoder._DESERIALIZER, "encoder");
+        op.add(Builder::languageset, JsonpDeserializer.arrayDeserializer(PhoneticLanguage._DESERIALIZER), "languageset");
+        op.add(Builder::maxCodeLen, JsonpDeserializer.integerDeserializer(), "max_code_len");
+        op.add(Builder::nameType, PhoneticNameType._DESERIALIZER, "name_type");
+        op.add(Builder::replace, JsonpDeserializer.booleanDeserializer(), "replace");
+        op.add(Builder::ruleType, PhoneticRuleType._DESERIALIZER, "rule_type");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PorterStemTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PorterStemTokenFilter.java
index afccc9667b..8a5a986ba8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PorterStemTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PorterStemTokenFilter.java
@@ -32,86 +32,84 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.PorterStemTokenFilter
 
-
 @JsonpDeserializable
 public class PorterStemTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private PorterStemTokenFilter(Builder builder) {
-		super(builder);
+    private PorterStemTokenFilter(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static PorterStemTokenFilter of(Function<Builder, ObjectBuilder<PorterStemTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static PorterStemTokenFilter of(Function<Builder, ObjectBuilder<PorterStemTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.PorterStem;
-	}
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.PorterStem;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "porter_stem");
-		super.serializeInternal(generator, mapper);
+        generator.write("type", "porter_stem");
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link PorterStemTokenFilter}.
-	 */
+    /**
+     * Builder for {@link PorterStemTokenFilter}.
+     */
 
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PorterStemTokenFilter> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<PorterStemTokenFilter> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link PorterStemTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PorterStemTokenFilter build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link PorterStemTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PorterStemTokenFilter build() {
+            _checkSingleUse();
 
-			return new PorterStemTokenFilter(this);
-		}
-	}
+            return new PorterStemTokenFilter(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link PorterStemTokenFilter}
-	 */
-	public static final JsonpDeserializer<PorterStemTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PorterStemTokenFilter::setupPorterStemTokenFilterDeserializer);
+    /**
+     * Json deserializer for {@link PorterStemTokenFilter}
+     */
+    public static final JsonpDeserializer<PorterStemTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PorterStemTokenFilter::setupPorterStemTokenFilterDeserializer
+    );
 
-	protected static void setupPorterStemTokenFilterDeserializer(ObjectDeserializer<PorterStemTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
+    protected static void setupPorterStemTokenFilterDeserializer(ObjectDeserializer<PorterStemTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PredicateTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PredicateTokenFilter.java
index 2bf9dfc5c3..de4983ce4a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PredicateTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/PredicateTokenFilter.java
@@ -32,119 +32,117 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.PredicateTokenFilter
 
-
 @JsonpDeserializable
 public class PredicateTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final Script script;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PredicateTokenFilter(Builder builder) {
-		super(builder);
-
-		this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
-
-	}
-
-	public static PredicateTokenFilter of(Function<Builder, ObjectBuilder<PredicateTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.PredicateTokenFilter;
-	}
-
-	/**
-	 * Required - API name: {@code script}
-	 */
-	public final Script script() {
-		return this.script;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "predicate_token_filter");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("script");
-		this.script.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PredicateTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PredicateTokenFilter> {
-		private Script script;
-
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PredicateTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PredicateTokenFilter build() {
-			_checkSingleUse();
-
-			return new PredicateTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PredicateTokenFilter}
-	 */
-	public static final JsonpDeserializer<PredicateTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PredicateTokenFilter::setupPredicateTokenFilterDeserializer);
-
-	protected static void setupPredicateTokenFilterDeserializer(ObjectDeserializer<PredicateTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-
-		op.ignore("type");
-	}
+    private final Script script;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PredicateTokenFilter(Builder builder) {
+        super(builder);
+
+        this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
+
+    }
+
+    public static PredicateTokenFilter of(Function<Builder, ObjectBuilder<PredicateTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.PredicateTokenFilter;
+    }
+
+    /**
+     * Required - API name: {@code script}
+     */
+    public final Script script() {
+        return this.script;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "predicate_token_filter");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("script");
+        this.script.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PredicateTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<PredicateTokenFilter> {
+        private Script script;
+
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PredicateTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PredicateTokenFilter build() {
+            _checkSingleUse();
+
+            return new PredicateTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PredicateTokenFilter}
+     */
+    public static final JsonpDeserializer<PredicateTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PredicateTokenFilter::setupPredicateTokenFilterDeserializer
+    );
+
+    protected static void setupPredicateTokenFilterDeserializer(ObjectDeserializer<PredicateTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/RemoveDuplicatesTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/RemoveDuplicatesTokenFilter.java
index d68715fd59..a4578d99d9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/RemoveDuplicatesTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/RemoveDuplicatesTokenFilter.java
@@ -32,87 +32,84 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.RemoveDuplicatesTokenFilter
 
-
 @JsonpDeserializable
 public class RemoveDuplicatesTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private RemoveDuplicatesTokenFilter(Builder builder) {
-		super(builder);
+    private RemoveDuplicatesTokenFilter(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static RemoveDuplicatesTokenFilter of(Function<Builder, ObjectBuilder<RemoveDuplicatesTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static RemoveDuplicatesTokenFilter of(Function<Builder, ObjectBuilder<RemoveDuplicatesTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.RemoveDuplicates;
-	}
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.RemoveDuplicates;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "remove_duplicates");
-		super.serializeInternal(generator, mapper);
+        generator.write("type", "remove_duplicates");
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link RemoveDuplicatesTokenFilter}.
-	 */
+    /**
+     * Builder for {@link RemoveDuplicatesTokenFilter}.
+     */
 
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<RemoveDuplicatesTokenFilter> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<RemoveDuplicatesTokenFilter> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link RemoveDuplicatesTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RemoveDuplicatesTokenFilter build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link RemoveDuplicatesTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RemoveDuplicatesTokenFilter build() {
+            _checkSingleUse();
 
-			return new RemoveDuplicatesTokenFilter(this);
-		}
-	}
+            return new RemoveDuplicatesTokenFilter(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link RemoveDuplicatesTokenFilter}
-	 */
-	public static final JsonpDeserializer<RemoveDuplicatesTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RemoveDuplicatesTokenFilter::setupRemoveDuplicatesTokenFilterDeserializer);
+    /**
+     * Json deserializer for {@link RemoveDuplicatesTokenFilter}
+     */
+    public static final JsonpDeserializer<RemoveDuplicatesTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RemoveDuplicatesTokenFilter::setupRemoveDuplicatesTokenFilterDeserializer
+    );
 
-	protected static void setupRemoveDuplicatesTokenFilterDeserializer(
-			ObjectDeserializer<RemoveDuplicatesTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+    protected static void setupRemoveDuplicatesTokenFilterDeserializer(ObjectDeserializer<RemoveDuplicatesTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ReverseTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ReverseTokenFilter.java
index c6f12b2b30..2d2948ee83 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ReverseTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ReverseTokenFilter.java
@@ -32,86 +32,84 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.ReverseTokenFilter
 
-
 @JsonpDeserializable
 public class ReverseTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ReverseTokenFilter(Builder builder) {
-		super(builder);
+    private ReverseTokenFilter(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static ReverseTokenFilter of(Function<Builder, ObjectBuilder<ReverseTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ReverseTokenFilter of(Function<Builder, ObjectBuilder<ReverseTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Reverse;
-	}
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Reverse;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "reverse");
-		super.serializeInternal(generator, mapper);
+        generator.write("type", "reverse");
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link ReverseTokenFilter}.
-	 */
+    /**
+     * Builder for {@link ReverseTokenFilter}.
+     */
 
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ReverseTokenFilter> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<ReverseTokenFilter> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link ReverseTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ReverseTokenFilter build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link ReverseTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ReverseTokenFilter build() {
+            _checkSingleUse();
 
-			return new ReverseTokenFilter(this);
-		}
-	}
+            return new ReverseTokenFilter(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link ReverseTokenFilter}
-	 */
-	public static final JsonpDeserializer<ReverseTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ReverseTokenFilter::setupReverseTokenFilterDeserializer);
+    /**
+     * Json deserializer for {@link ReverseTokenFilter}
+     */
+    public static final JsonpDeserializer<ReverseTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ReverseTokenFilter::setupReverseTokenFilterDeserializer
+    );
 
-	protected static void setupReverseTokenFilterDeserializer(ObjectDeserializer<ReverseTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
+    protected static void setupReverseTokenFilterDeserializer(ObjectDeserializer<ReverseTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ShingleTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ShingleTokenFilter.java
index 8fed3e3a26..7222faf2d6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ShingleTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/ShingleTokenFilter.java
@@ -32,261 +32,260 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.ShingleTokenFilter
 
 @JsonpDeserializable
 public class ShingleTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	@Nullable
-	private final String fillerToken;
-
-	@Nullable
-	private final String maxShingleSize;
-
-	@Nullable
-	private final String minShingleSize;
-
-	@Nullable
-	private final Boolean outputUnigrams;
-
-	@Nullable
-	private final Boolean outputUnigramsIfNoShingles;
-
-	@Nullable
-	private final String tokenSeparator;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShingleTokenFilter(Builder builder) {
-		super(builder);
-
-		this.fillerToken = builder.fillerToken;
-		this.maxShingleSize = builder.maxShingleSize;
-		this.minShingleSize = builder.minShingleSize;
-		this.outputUnigrams = builder.outputUnigrams;
-		this.outputUnigramsIfNoShingles = builder.outputUnigramsIfNoShingles;
-		this.tokenSeparator = builder.tokenSeparator;
-
-	}
-
-	public static ShingleTokenFilter of(Function<Builder, ObjectBuilder<ShingleTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Shingle;
-	}
-
-	/**
-	 * API name: {@code filler_token}
-	 */
-	@Nullable
-	public final String fillerToken() {
-		return this.fillerToken;
-	}
-
-	/**
-	 * API name: {@code max_shingle_size}
-	 */
-	@Nullable
-	public final String maxShingleSize() {
-		return this.maxShingleSize;
-	}
-
-	/**
-	 * API name: {@code min_shingle_size}
-	 */
-	@Nullable
-	public final String minShingleSize() {
-		return this.minShingleSize;
-	}
-
-	/**
-	 * API name: {@code output_unigrams}
-	 */
-	@Nullable
-	public final Boolean outputUnigrams() {
-		return this.outputUnigrams;
-	}
-
-	/**
-	 * API name: {@code output_unigrams_if_no_shingles}
-	 */
-	@Nullable
-	public final Boolean outputUnigramsIfNoShingles() {
-		return this.outputUnigramsIfNoShingles;
-	}
-
-	/**
-	 * API name: {@code token_separator}
-	 */
-	@Nullable
-	public final String tokenSeparator() {
-		return this.tokenSeparator;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "shingle");
-		super.serializeInternal(generator, mapper);
-		if (this.fillerToken != null) {
-			generator.writeKey("filler_token");
-			generator.write(this.fillerToken);
-
-		}
-		if (this.maxShingleSize != null) {
-			generator.writeKey("max_shingle_size");
-			generator.write(this.maxShingleSize);
-
-		}
-		if (this.minShingleSize != null) {
-			generator.writeKey("min_shingle_size");
-			generator.write(this.minShingleSize);
-
-		}
-		if (this.outputUnigrams != null) {
-			generator.writeKey("output_unigrams");
-			generator.write(this.outputUnigrams);
-
-		}
-		if (this.outputUnigramsIfNoShingles != null) {
-			generator.writeKey("output_unigrams_if_no_shingles");
-			generator.write(this.outputUnigramsIfNoShingles);
-
-		}
-		if (this.tokenSeparator != null) {
-			generator.writeKey("token_separator");
-			generator.write(this.tokenSeparator);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShingleTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ShingleTokenFilter> {
-		@Nullable
-		private String fillerToken;
-
-		@Nullable
-		private String maxShingleSize;
-
-		@Nullable
-		private String minShingleSize;
-
-		@Nullable
-		private Boolean outputUnigrams;
-
-		@Nullable
-		private Boolean outputUnigramsIfNoShingles;
-
-		@Nullable
-		private String tokenSeparator;
-
-		/**
-		 * API name: {@code filler_token}
-		 */
-		public final Builder fillerToken(@Nullable String value) {
-			this.fillerToken = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_shingle_size}
-		 */
-		public final Builder maxShingleSize(@Nullable String value) {
-			this.maxShingleSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_shingle_size}
-		 */
-		public final Builder minShingleSize(@Nullable String value) {
-			this.minShingleSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code output_unigrams}
-		 */
-		public final Builder outputUnigrams(@Nullable Boolean value) {
-			this.outputUnigrams = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code output_unigrams_if_no_shingles}
-		 */
-		public final Builder outputUnigramsIfNoShingles(@Nullable Boolean value) {
-			this.outputUnigramsIfNoShingles = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code token_separator}
-		 */
-		public final Builder tokenSeparator(@Nullable String value) {
-			this.tokenSeparator = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShingleTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShingleTokenFilter build() {
-			_checkSingleUse();
-
-			return new ShingleTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShingleTokenFilter}
-	 */
-	public static final JsonpDeserializer<ShingleTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ShingleTokenFilter::setupShingleTokenFilterDeserializer);
-
-	protected static void setupShingleTokenFilterDeserializer(ObjectDeserializer<ShingleTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::fillerToken, JsonpDeserializer.stringDeserializer(), "filler_token");
-		op.add(Builder::maxShingleSize, JsonpDeserializer.stringDeserializer(), "max_shingle_size");
-		op.add(Builder::minShingleSize, JsonpDeserializer.stringDeserializer(), "min_shingle_size");
-		op.add(Builder::outputUnigrams, JsonpDeserializer.booleanDeserializer(), "output_unigrams");
-		op.add(Builder::outputUnigramsIfNoShingles, JsonpDeserializer.booleanDeserializer(),
-				"output_unigrams_if_no_shingles");
-		op.add(Builder::tokenSeparator, JsonpDeserializer.stringDeserializer(), "token_separator");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final String fillerToken;
+
+    @Nullable
+    private final String maxShingleSize;
+
+    @Nullable
+    private final String minShingleSize;
+
+    @Nullable
+    private final Boolean outputUnigrams;
+
+    @Nullable
+    private final Boolean outputUnigramsIfNoShingles;
+
+    @Nullable
+    private final String tokenSeparator;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShingleTokenFilter(Builder builder) {
+        super(builder);
+
+        this.fillerToken = builder.fillerToken;
+        this.maxShingleSize = builder.maxShingleSize;
+        this.minShingleSize = builder.minShingleSize;
+        this.outputUnigrams = builder.outputUnigrams;
+        this.outputUnigramsIfNoShingles = builder.outputUnigramsIfNoShingles;
+        this.tokenSeparator = builder.tokenSeparator;
+
+    }
+
+    public static ShingleTokenFilter of(Function<Builder, ObjectBuilder<ShingleTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Shingle;
+    }
+
+    /**
+     * API name: {@code filler_token}
+     */
+    @Nullable
+    public final String fillerToken() {
+        return this.fillerToken;
+    }
+
+    /**
+     * API name: {@code max_shingle_size}
+     */
+    @Nullable
+    public final String maxShingleSize() {
+        return this.maxShingleSize;
+    }
+
+    /**
+     * API name: {@code min_shingle_size}
+     */
+    @Nullable
+    public final String minShingleSize() {
+        return this.minShingleSize;
+    }
+
+    /**
+     * API name: {@code output_unigrams}
+     */
+    @Nullable
+    public final Boolean outputUnigrams() {
+        return this.outputUnigrams;
+    }
+
+    /**
+     * API name: {@code output_unigrams_if_no_shingles}
+     */
+    @Nullable
+    public final Boolean outputUnigramsIfNoShingles() {
+        return this.outputUnigramsIfNoShingles;
+    }
+
+    /**
+     * API name: {@code token_separator}
+     */
+    @Nullable
+    public final String tokenSeparator() {
+        return this.tokenSeparator;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "shingle");
+        super.serializeInternal(generator, mapper);
+        if (this.fillerToken != null) {
+            generator.writeKey("filler_token");
+            generator.write(this.fillerToken);
+
+        }
+        if (this.maxShingleSize != null) {
+            generator.writeKey("max_shingle_size");
+            generator.write(this.maxShingleSize);
+
+        }
+        if (this.minShingleSize != null) {
+            generator.writeKey("min_shingle_size");
+            generator.write(this.minShingleSize);
+
+        }
+        if (this.outputUnigrams != null) {
+            generator.writeKey("output_unigrams");
+            generator.write(this.outputUnigrams);
+
+        }
+        if (this.outputUnigramsIfNoShingles != null) {
+            generator.writeKey("output_unigrams_if_no_shingles");
+            generator.write(this.outputUnigramsIfNoShingles);
+
+        }
+        if (this.tokenSeparator != null) {
+            generator.writeKey("token_separator");
+            generator.write(this.tokenSeparator);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShingleTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<ShingleTokenFilter> {
+        @Nullable
+        private String fillerToken;
+
+        @Nullable
+        private String maxShingleSize;
+
+        @Nullable
+        private String minShingleSize;
+
+        @Nullable
+        private Boolean outputUnigrams;
+
+        @Nullable
+        private Boolean outputUnigramsIfNoShingles;
+
+        @Nullable
+        private String tokenSeparator;
+
+        /**
+         * API name: {@code filler_token}
+         */
+        public final Builder fillerToken(@Nullable String value) {
+            this.fillerToken = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_shingle_size}
+         */
+        public final Builder maxShingleSize(@Nullable String value) {
+            this.maxShingleSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code min_shingle_size}
+         */
+        public final Builder minShingleSize(@Nullable String value) {
+            this.minShingleSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code output_unigrams}
+         */
+        public final Builder outputUnigrams(@Nullable Boolean value) {
+            this.outputUnigrams = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code output_unigrams_if_no_shingles}
+         */
+        public final Builder outputUnigramsIfNoShingles(@Nullable Boolean value) {
+            this.outputUnigramsIfNoShingles = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code token_separator}
+         */
+        public final Builder tokenSeparator(@Nullable String value) {
+            this.tokenSeparator = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShingleTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShingleTokenFilter build() {
+            _checkSingleUse();
+
+            return new ShingleTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShingleTokenFilter}
+     */
+    public static final JsonpDeserializer<ShingleTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShingleTokenFilter::setupShingleTokenFilterDeserializer
+    );
+
+    protected static void setupShingleTokenFilterDeserializer(ObjectDeserializer<ShingleTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::fillerToken, JsonpDeserializer.stringDeserializer(), "filler_token");
+        op.add(Builder::maxShingleSize, JsonpDeserializer.stringDeserializer(), "max_shingle_size");
+        op.add(Builder::minShingleSize, JsonpDeserializer.stringDeserializer(), "min_shingle_size");
+        op.add(Builder::outputUnigrams, JsonpDeserializer.booleanDeserializer(), "output_unigrams");
+        op.add(Builder::outputUnigramsIfNoShingles, JsonpDeserializer.booleanDeserializer(), "output_unigrams_if_no_shingles");
+        op.add(Builder::tokenSeparator, JsonpDeserializer.stringDeserializer(), "token_separator");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SimpleAnalyzer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SimpleAnalyzer.java
index 10e56b96aa..bf37c3ce30 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SimpleAnalyzer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SimpleAnalyzer.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,111 +43,109 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.SimpleAnalyzer
 
-
 @JsonpDeserializable
 public class SimpleAnalyzer implements AnalyzerVariant, JsonpSerializable {
-	@Nullable
-	private final String version;
+    @Nullable
+    private final String version;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private SimpleAnalyzer(Builder builder) {
+    private SimpleAnalyzer(Builder builder) {
 
-		this.version = builder.version;
+        this.version = builder.version;
 
-	}
+    }
 
-	public static SimpleAnalyzer of(Function<Builder, ObjectBuilder<SimpleAnalyzer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static SimpleAnalyzer of(Function<Builder, ObjectBuilder<SimpleAnalyzer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Analyzer variant kind.
-	 */
-	@Override
-	public Analyzer.Kind _analyzerKind() {
-		return Analyzer.Kind.Simple;
-	}
+    /**
+     * Analyzer variant kind.
+     */
+    @Override
+    public Analyzer.Kind _analyzerKind() {
+        return Analyzer.Kind.Simple;
+    }
 
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final String version() {
-		return this.version;
-	}
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final String version() {
+        return this.version;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "simple");
+        generator.write("type", "simple");
 
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link SimpleAnalyzer}.
-	 */
+    /**
+     * Builder for {@link SimpleAnalyzer}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SimpleAnalyzer> {
-		@Nullable
-		private String version;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SimpleAnalyzer> {
+        @Nullable
+        private String version;
 
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable String value) {
-			this.version = value;
-			return this;
-		}
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable String value) {
+            this.version = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link SimpleAnalyzer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SimpleAnalyzer build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link SimpleAnalyzer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SimpleAnalyzer build() {
+            _checkSingleUse();
 
-			return new SimpleAnalyzer(this);
-		}
-	}
+            return new SimpleAnalyzer(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link SimpleAnalyzer}
-	 */
-	public static final JsonpDeserializer<SimpleAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SimpleAnalyzer::setupSimpleAnalyzerDeserializer);
+    /**
+     * Json deserializer for {@link SimpleAnalyzer}
+     */
+    public static final JsonpDeserializer<SimpleAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SimpleAnalyzer::setupSimpleAnalyzerDeserializer
+    );
 
-	protected static void setupSimpleAnalyzerDeserializer(ObjectDeserializer<SimpleAnalyzer.Builder> op) {
+    protected static void setupSimpleAnalyzerDeserializer(ObjectDeserializer<SimpleAnalyzer.Builder> op) {
 
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SmartcnAnalyzer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SmartcnAnalyzer.java
index 11cee498cf..985ab8d8b3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SmartcnAnalyzer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SmartcnAnalyzer.java
@@ -13,8 +13,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
-
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -24,78 +24,78 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import jakarta.json.stream.JsonGenerator;
-
 // typedef: _types.analysis.LanguageAnalyzer
 
 @JsonpDeserializable
 public class SmartcnAnalyzer implements AnalyzerVariant, JsonpSerializable {
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private SmartcnAnalyzer(Builder builder) {
+    private SmartcnAnalyzer(Builder builder) {
 
-	}
+    }
 
-	public static SmartcnAnalyzer of(Function<Builder, ObjectBuilder<SmartcnAnalyzer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static SmartcnAnalyzer of(Function<Builder, ObjectBuilder<SmartcnAnalyzer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Analyzer variant kind.
-	 */
-	@Override
-	public Analyzer.Kind _analyzerKind() {
-		return Analyzer.Kind.Smartcn;
-	}
+    /**
+     * Analyzer variant kind.
+     */
+    @Override
+    public Analyzer.Kind _analyzerKind() {
+        return Analyzer.Kind.Smartcn;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", Analyzer.Kind.Smartcn.jsonValue());
+        generator.write("type", Analyzer.Kind.Smartcn.jsonValue());
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link SmartcnAnalyzer}.
-	 */
+    /**
+     * Builder for {@link SmartcnAnalyzer}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SmartcnAnalyzer> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SmartcnAnalyzer> {
 
-		/**
-		 * Builds a {@link SmartcnAnalyzer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some required fields are null.
-		 */
-		public SmartcnAnalyzer build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link SmartcnAnalyzer}.
+         *
+         * @throws NullPointerException
+         *             if some required fields are null.
+         */
+        public SmartcnAnalyzer build() {
+            _checkSingleUse();
 
-			return new SmartcnAnalyzer(this);
-		}
-	}
+            return new SmartcnAnalyzer(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link SmartcnAnalyzer}
-	 */
-	public static final JsonpDeserializer<SmartcnAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SmartcnAnalyzer::setupLanguageAnalyzerDeserializer);
+    /**
+     * Json deserializer for {@link SmartcnAnalyzer}
+     */
+    public static final JsonpDeserializer<SmartcnAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SmartcnAnalyzer::setupLanguageAnalyzerDeserializer
+    );
 
-	protected static void setupLanguageAnalyzerDeserializer(ObjectDeserializer<SmartcnAnalyzer.Builder> op) {
+    protected static void setupLanguageAnalyzerDeserializer(ObjectDeserializer<SmartcnAnalyzer.Builder> op) {
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SmartcnStopTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SmartcnStopTokenFilter.java
index 7e47454ec0..9b42cd186d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SmartcnStopTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SmartcnStopTokenFilter.java
@@ -13,8 +13,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
-
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -22,77 +22,75 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 
-import jakarta.json.stream.JsonGenerator;
-
 // typedef: _types.analysis.ReverseTokenFilter
 
 @JsonpDeserializable
 public class SmartcnStopTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private SmartcnStopTokenFilter(Builder builder) {
-		super(builder);
+    private SmartcnStopTokenFilter(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static SmartcnStopTokenFilter of(Function<Builder, ObjectBuilder<SmartcnStopTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static SmartcnStopTokenFilter of(Function<Builder, ObjectBuilder<SmartcnStopTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.SmartcnStop;
-	}
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.SmartcnStop;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", TokenFilterDefinition.Kind.SmartcnStop.jsonValue());
-		super.serializeInternal(generator, mapper);
+        generator.write("type", TokenFilterDefinition.Kind.SmartcnStop.jsonValue());
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link SmartcnStopTokenFilter}.
-	 */
+    /**
+     * Builder for {@link SmartcnStopTokenFilter}.
+     */
 
-	public static class Builder extends AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SmartcnStopTokenFilter> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends AbstractBuilder<Builder> implements ObjectBuilder<SmartcnStopTokenFilter> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link SmartcnStopTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some required fields are null.
-		 */
-		public SmartcnStopTokenFilter build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link SmartcnStopTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some required fields are null.
+         */
+        public SmartcnStopTokenFilter build() {
+            _checkSingleUse();
 
-			return new SmartcnStopTokenFilter(this);
-		}
-	}
+            return new SmartcnStopTokenFilter(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link SmartcnStopTokenFilter}
-	 */
-	public static final JsonpDeserializer<SmartcnStopTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SmartcnStopTokenFilter::setupSmartcnStopTokenFilterDeserializer);
+    /**
+     * Json deserializer for {@link SmartcnStopTokenFilter}
+     */
+    public static final JsonpDeserializer<SmartcnStopTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SmartcnStopTokenFilter::setupSmartcnStopTokenFilterDeserializer
+    );
 
-	protected static void setupSmartcnStopTokenFilterDeserializer(ObjectDeserializer<SmartcnStopTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
+    protected static void setupSmartcnStopTokenFilterDeserializer(ObjectDeserializer<SmartcnStopTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SmartcnTokenizer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SmartcnTokenizer.java
index f8d37e1bc7..3ab04702e0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SmartcnTokenizer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SmartcnTokenizer.java
@@ -13,8 +13,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
-
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -22,76 +22,76 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 
-import jakarta.json.stream.JsonGenerator;
-
 // typedef: _types.analysis.IcuTokenizer
 
 @JsonpDeserializable
 public class SmartcnTokenizer extends TokenizerBase implements TokenizerDefinitionVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private SmartcnTokenizer(Builder builder) {
-		super(builder);
+    private SmartcnTokenizer(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static SmartcnTokenizer of(Function<Builder, ObjectBuilder<SmartcnTokenizer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static SmartcnTokenizer of(Function<Builder, ObjectBuilder<SmartcnTokenizer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * TokenizerDefinition variant kind.
-	 */
-	@Override
-	public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
-		return TokenizerDefinition.Kind.SmartcnTokenizer;
-	}
+    /**
+     * TokenizerDefinition variant kind.
+     */
+    @Override
+    public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
+        return TokenizerDefinition.Kind.SmartcnTokenizer;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", TokenizerDefinition.Kind.SmartcnTokenizer.jsonValue());
-		super.serializeInternal(generator, mapper);
+        generator.write("type", TokenizerDefinition.Kind.SmartcnTokenizer.jsonValue());
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link SmartcnTokenizer}.
-	 */
+    /**
+     * Builder for {@link SmartcnTokenizer}.
+     */
 
-	public static class Builder extends AbstractBuilder<Builder> implements ObjectBuilder<SmartcnTokenizer> {
+    public static class Builder extends AbstractBuilder<Builder> implements ObjectBuilder<SmartcnTokenizer> {
 
-		@Override
-		protected Builder self() {
-			return this;
-		}
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link SmartcnTokenizer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some required fields are null.
-		 */
-		public SmartcnTokenizer build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link SmartcnTokenizer}.
+         *
+         * @throws NullPointerException
+         *             if some required fields are null.
+         */
+        public SmartcnTokenizer build() {
+            _checkSingleUse();
 
-			return new SmartcnTokenizer(this);
-		}
-	}
+            return new SmartcnTokenizer(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link SmartcnTokenizer}
-	 */
-	public static final JsonpDeserializer<SmartcnTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SmartcnTokenizer::setupSmartcnTokenizerDeserializer);
+    /**
+     * Json deserializer for {@link SmartcnTokenizer}
+     */
+    public static final JsonpDeserializer<SmartcnTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SmartcnTokenizer::setupSmartcnTokenizerDeserializer
+    );
 
-	protected static void setupSmartcnTokenizerDeserializer(ObjectDeserializer<SmartcnTokenizer.Builder> op) {
-		TokenizerBase.setupTokenizerBaseDeserializer(op);
+    protected static void setupSmartcnTokenizerDeserializer(ObjectDeserializer<SmartcnTokenizer.Builder> op) {
+        TokenizerBase.setupTokenizerBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SnowballAnalyzer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SnowballAnalyzer.java
index b613c95260..b4e519bfac 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SnowballAnalyzer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SnowballAnalyzer.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,180 +45,176 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.SnowballAnalyzer
 
-
 @JsonpDeserializable
 public class SnowballAnalyzer implements AnalyzerVariant, JsonpSerializable {
-	@Nullable
-	private final String version;
+    @Nullable
+    private final String version;
 
-	private final SnowballLanguage language;
-
-	private final List<String> stopwords;
+    private final SnowballLanguage language;
+
+    private final List<String> stopwords;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private SnowballAnalyzer(Builder builder) {
-
-		this.version = builder.version;
-		this.language = ApiTypeHelper.requireNonNull(builder.language, this, "language");
-		this.stopwords = ApiTypeHelper.unmodifiable(builder.stopwords);
-
-	}
-
-	public static SnowballAnalyzer of(Function<Builder, ObjectBuilder<SnowballAnalyzer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Analyzer variant kind.
-	 */
-	@Override
-	public Analyzer.Kind _analyzerKind() {
-		return Analyzer.Kind.Snowball;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final String version() {
-		return this.version;
-	}
-
-	/**
-	 * Required - API name: {@code language}
-	 */
-	public final SnowballLanguage language() {
-		return this.language;
-	}
-
-	/**
-	 * API name: {@code stopwords}
-	 */
-	public final List<String> stopwords() {
-		return this.stopwords;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "snowball");
-
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		generator.writeKey("language");
-		this.language.serialize(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.stopwords)) {
-			generator.writeKey("stopwords");
-			generator.writeStartArray();
-			for (String item0 : this.stopwords) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SnowballAnalyzer}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnowballAnalyzer> {
-		@Nullable
-		private String version;
-
-		private SnowballLanguage language;
-
-		@Nullable
-		private List<String> stopwords;
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code language}
-		 */
-		public final Builder language(SnowballLanguage value) {
-			this.language = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code stopwords}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>stopwords</code>.
-		 */
-		public final Builder stopwords(List<String> list) {
-			this.stopwords = _listAddAll(this.stopwords, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stopwords}
-		 * <p>
-		 * Adds one or more values to <code>stopwords</code>.
-		 */
-		public final Builder stopwords(String value, String... values) {
-			this.stopwords = _listAdd(this.stopwords, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SnowballAnalyzer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SnowballAnalyzer build() {
-			_checkSingleUse();
-
-			return new SnowballAnalyzer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SnowballAnalyzer}
-	 */
-	public static final JsonpDeserializer<SnowballAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SnowballAnalyzer::setupSnowballAnalyzerDeserializer);
-
-	protected static void setupSnowballAnalyzerDeserializer(ObjectDeserializer<SnowballAnalyzer.Builder> op) {
-
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
-		op.add(Builder::language, SnowballLanguage._DESERIALIZER, "language");
-		op.add(Builder::stopwords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"stopwords");
-
-		op.ignore("type");
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private SnowballAnalyzer(Builder builder) {
+
+        this.version = builder.version;
+        this.language = ApiTypeHelper.requireNonNull(builder.language, this, "language");
+        this.stopwords = ApiTypeHelper.unmodifiable(builder.stopwords);
+
+    }
+
+    public static SnowballAnalyzer of(Function<Builder, ObjectBuilder<SnowballAnalyzer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Analyzer variant kind.
+     */
+    @Override
+    public Analyzer.Kind _analyzerKind() {
+        return Analyzer.Kind.Snowball;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final String version() {
+        return this.version;
+    }
+
+    /**
+     * Required - API name: {@code language}
+     */
+    public final SnowballLanguage language() {
+        return this.language;
+    }
+
+    /**
+     * API name: {@code stopwords}
+     */
+    public final List<String> stopwords() {
+        return this.stopwords;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "snowball");
+
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        generator.writeKey("language");
+        this.language.serialize(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.stopwords)) {
+            generator.writeKey("stopwords");
+            generator.writeStartArray();
+            for (String item0 : this.stopwords) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SnowballAnalyzer}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnowballAnalyzer> {
+        @Nullable
+        private String version;
+
+        private SnowballLanguage language;
+
+        @Nullable
+        private List<String> stopwords;
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code language}
+         */
+        public final Builder language(SnowballLanguage value) {
+            this.language = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code stopwords}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>stopwords</code>.
+         */
+        public final Builder stopwords(List<String> list) {
+            this.stopwords = _listAddAll(this.stopwords, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code stopwords}
+         * <p>
+         * Adds one or more values to <code>stopwords</code>.
+         */
+        public final Builder stopwords(String value, String... values) {
+            this.stopwords = _listAdd(this.stopwords, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link SnowballAnalyzer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SnowballAnalyzer build() {
+            _checkSingleUse();
+
+            return new SnowballAnalyzer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SnowballAnalyzer}
+     */
+    public static final JsonpDeserializer<SnowballAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SnowballAnalyzer::setupSnowballAnalyzerDeserializer
+    );
+
+    protected static void setupSnowballAnalyzerDeserializer(ObjectDeserializer<SnowballAnalyzer.Builder> op) {
+
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
+        op.add(Builder::language, SnowballLanguage._DESERIALIZER, "language");
+        op.add(Builder::stopwords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stopwords");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SnowballLanguage.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SnowballLanguage.java
index da541a1cb1..ed15871ce2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SnowballLanguage.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SnowballLanguage.java
@@ -35,65 +35,63 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum SnowballLanguage implements JsonEnum {
-	Armenian("Armenian"),
+    Armenian("Armenian"),
 
-	Basque("Basque"),
+    Basque("Basque"),
 
-	Catalan("Catalan"),
+    Catalan("Catalan"),
 
-	Danish("Danish"),
+    Danish("Danish"),
 
-	Dutch("Dutch"),
+    Dutch("Dutch"),
 
-	English("English"),
+    English("English"),
 
-	Finnish("Finnish"),
+    Finnish("Finnish"),
 
-	French("French"),
+    French("French"),
 
-	German("German"),
+    German("German"),
 
-	German2("German2"),
+    German2("German2"),
 
-	Hungarian("Hungarian"),
+    Hungarian("Hungarian"),
 
-	Italian("Italian"),
+    Italian("Italian"),
 
-	Kp("Kp"),
+    Kp("Kp"),
 
-	Lovins("Lovins"),
+    Lovins("Lovins"),
 
-	Norwegian("Norwegian"),
+    Norwegian("Norwegian"),
 
-	Porter("Porter"),
+    Porter("Porter"),
 
-	Portuguese("Portuguese"),
+    Portuguese("Portuguese"),
 
-	Romanian("Romanian"),
+    Romanian("Romanian"),
 
-	Russian("Russian"),
+    Russian("Russian"),
 
-	Spanish("Spanish"),
+    Spanish("Spanish"),
 
-	Swedish("Swedish"),
+    Swedish("Swedish"),
 
-	Turkish("Turkish"),
+    Turkish("Turkish"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	SnowballLanguage(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    SnowballLanguage(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<SnowballLanguage> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			SnowballLanguage.values());
+    public static final JsonEnum.Deserializer<SnowballLanguage> _DESERIALIZER = new JsonEnum.Deserializer<>(SnowballLanguage.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SnowballTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SnowballTokenFilter.java
index 79e768aeab..ad245b1c82 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SnowballTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SnowballTokenFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,104 +41,100 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.SnowballTokenFilter
 
-
 @JsonpDeserializable
 public class SnowballTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final SnowballLanguage language;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SnowballTokenFilter(Builder builder) {
-		super(builder);
-
-		this.language = ApiTypeHelper.requireNonNull(builder.language, this, "language");
-
-	}
-
-	public static SnowballTokenFilter of(Function<Builder, ObjectBuilder<SnowballTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Snowball;
-	}
-
-	/**
-	 * Required - API name: {@code language}
-	 */
-	public final SnowballLanguage language() {
-		return this.language;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "snowball");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("language");
-		this.language.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SnowballTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SnowballTokenFilter> {
-		private SnowballLanguage language;
-
-		/**
-		 * Required - API name: {@code language}
-		 */
-		public final Builder language(SnowballLanguage value) {
-			this.language = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SnowballTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SnowballTokenFilter build() {
-			_checkSingleUse();
-
-			return new SnowballTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SnowballTokenFilter}
-	 */
-	public static final JsonpDeserializer<SnowballTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SnowballTokenFilter::setupSnowballTokenFilterDeserializer);
-
-	protected static void setupSnowballTokenFilterDeserializer(ObjectDeserializer<SnowballTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::language, SnowballLanguage._DESERIALIZER, "language");
-
-		op.ignore("type");
-	}
+    private final SnowballLanguage language;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SnowballTokenFilter(Builder builder) {
+        super(builder);
+
+        this.language = ApiTypeHelper.requireNonNull(builder.language, this, "language");
+
+    }
+
+    public static SnowballTokenFilter of(Function<Builder, ObjectBuilder<SnowballTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Snowball;
+    }
+
+    /**
+     * Required - API name: {@code language}
+     */
+    public final SnowballLanguage language() {
+        return this.language;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "snowball");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("language");
+        this.language.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SnowballTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<SnowballTokenFilter> {
+        private SnowballLanguage language;
+
+        /**
+         * Required - API name: {@code language}
+         */
+        public final Builder language(SnowballLanguage value) {
+            this.language = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SnowballTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SnowballTokenFilter build() {
+            _checkSingleUse();
+
+            return new SnowballTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SnowballTokenFilter}
+     */
+    public static final JsonpDeserializer<SnowballTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SnowballTokenFilter::setupSnowballTokenFilterDeserializer
+    );
+
+    protected static void setupSnowballTokenFilterDeserializer(ObjectDeserializer<SnowballTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::language, SnowballLanguage._DESERIALIZER, "language");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StandardAnalyzer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StandardAnalyzer.java
index 2ad8aaf503..75b20be78b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StandardAnalyzer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StandardAnalyzer.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,157 +45,153 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.StandardAnalyzer
 
-
 @JsonpDeserializable
 public class StandardAnalyzer implements AnalyzerVariant, JsonpSerializable {
-	@Nullable
-	private final Integer maxTokenLength;
-
-	private final List<String> stopwords;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private StandardAnalyzer(Builder builder) {
-
-		this.maxTokenLength = builder.maxTokenLength;
-		this.stopwords = ApiTypeHelper.unmodifiable(builder.stopwords);
-
-	}
-
-	public static StandardAnalyzer of(Function<Builder, ObjectBuilder<StandardAnalyzer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Analyzer variant kind.
-	 */
-	@Override
-	public Analyzer.Kind _analyzerKind() {
-		return Analyzer.Kind.Standard;
-	}
-
-	/**
-	 * API name: {@code max_token_length}
-	 */
-	@Nullable
-	public final Integer maxTokenLength() {
-		return this.maxTokenLength;
-	}
-
-	/**
-	 * API name: {@code stopwords}
-	 */
-	public final List<String> stopwords() {
-		return this.stopwords;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "standard");
-
-		if (this.maxTokenLength != null) {
-			generator.writeKey("max_token_length");
-			generator.write(this.maxTokenLength);
-
-		}
-		if (ApiTypeHelper.isDefined(this.stopwords)) {
-			generator.writeKey("stopwords");
-			generator.writeStartArray();
-			for (String item0 : this.stopwords) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link StandardAnalyzer}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<StandardAnalyzer> {
-		@Nullable
-		private Integer maxTokenLength;
-
-		@Nullable
-		private List<String> stopwords;
-
-		/**
-		 * API name: {@code max_token_length}
-		 */
-		public final Builder maxTokenLength(@Nullable Integer value) {
-			this.maxTokenLength = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code stopwords}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>stopwords</code>.
-		 */
-		public final Builder stopwords(List<String> list) {
-			this.stopwords = _listAddAll(this.stopwords, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stopwords}
-		 * <p>
-		 * Adds one or more values to <code>stopwords</code>.
-		 */
-		public final Builder stopwords(String value, String... values) {
-			this.stopwords = _listAdd(this.stopwords, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link StandardAnalyzer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StandardAnalyzer build() {
-			_checkSingleUse();
-
-			return new StandardAnalyzer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link StandardAnalyzer}
-	 */
-	public static final JsonpDeserializer<StandardAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			StandardAnalyzer::setupStandardAnalyzerDeserializer);
-
-	protected static void setupStandardAnalyzerDeserializer(ObjectDeserializer<StandardAnalyzer.Builder> op) {
-
-		op.add(Builder::maxTokenLength, JsonpDeserializer.integerDeserializer(), "max_token_length");
-		op.add(Builder::stopwords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"stopwords");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Integer maxTokenLength;
+
+    private final List<String> stopwords;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private StandardAnalyzer(Builder builder) {
+
+        this.maxTokenLength = builder.maxTokenLength;
+        this.stopwords = ApiTypeHelper.unmodifiable(builder.stopwords);
+
+    }
+
+    public static StandardAnalyzer of(Function<Builder, ObjectBuilder<StandardAnalyzer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Analyzer variant kind.
+     */
+    @Override
+    public Analyzer.Kind _analyzerKind() {
+        return Analyzer.Kind.Standard;
+    }
+
+    /**
+     * API name: {@code max_token_length}
+     */
+    @Nullable
+    public final Integer maxTokenLength() {
+        return this.maxTokenLength;
+    }
+
+    /**
+     * API name: {@code stopwords}
+     */
+    public final List<String> stopwords() {
+        return this.stopwords;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "standard");
+
+        if (this.maxTokenLength != null) {
+            generator.writeKey("max_token_length");
+            generator.write(this.maxTokenLength);
+
+        }
+        if (ApiTypeHelper.isDefined(this.stopwords)) {
+            generator.writeKey("stopwords");
+            generator.writeStartArray();
+            for (String item0 : this.stopwords) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link StandardAnalyzer}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<StandardAnalyzer> {
+        @Nullable
+        private Integer maxTokenLength;
+
+        @Nullable
+        private List<String> stopwords;
+
+        /**
+         * API name: {@code max_token_length}
+         */
+        public final Builder maxTokenLength(@Nullable Integer value) {
+            this.maxTokenLength = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code stopwords}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>stopwords</code>.
+         */
+        public final Builder stopwords(List<String> list) {
+            this.stopwords = _listAddAll(this.stopwords, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code stopwords}
+         * <p>
+         * Adds one or more values to <code>stopwords</code>.
+         */
+        public final Builder stopwords(String value, String... values) {
+            this.stopwords = _listAdd(this.stopwords, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link StandardAnalyzer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StandardAnalyzer build() {
+            _checkSingleUse();
+
+            return new StandardAnalyzer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link StandardAnalyzer}
+     */
+    public static final JsonpDeserializer<StandardAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StandardAnalyzer::setupStandardAnalyzerDeserializer
+    );
+
+    protected static void setupStandardAnalyzerDeserializer(ObjectDeserializer<StandardAnalyzer.Builder> op) {
+
+        op.add(Builder::maxTokenLength, JsonpDeserializer.integerDeserializer(), "max_token_length");
+        op.add(Builder::stopwords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stopwords");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StandardTokenizer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StandardTokenizer.java
index 376da1d1a1..39674e011d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StandardTokenizer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StandardTokenizer.java
@@ -32,116 +32,115 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.StandardTokenizer
 
-
 @JsonpDeserializable
 public class StandardTokenizer extends TokenizerBase implements TokenizerDefinitionVariant {
-	@Nullable
-	private final Integer maxTokenLength;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private StandardTokenizer(Builder builder) {
-		super(builder);
-
-		this.maxTokenLength = builder.maxTokenLength;
-
-	}
-
-	public static StandardTokenizer of(Function<Builder, ObjectBuilder<StandardTokenizer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenizerDefinition variant kind.
-	 */
-	@Override
-	public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
-		return TokenizerDefinition.Kind.Standard;
-	}
-
-	/**
-	 * API name: {@code max_token_length}
-	 */
-	@Nullable
-	public final Integer maxTokenLength() {
-		return this.maxTokenLength;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "standard");
-		super.serializeInternal(generator, mapper);
-		if (this.maxTokenLength != null) {
-			generator.writeKey("max_token_length");
-			generator.write(this.maxTokenLength);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link StandardTokenizer}.
-	 */
-
-	public static class Builder extends TokenizerBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<StandardTokenizer> {
-		@Nullable
-		private Integer maxTokenLength;
-
-		/**
-		 * API name: {@code max_token_length}
-		 */
-		public final Builder maxTokenLength(@Nullable Integer value) {
-			this.maxTokenLength = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link StandardTokenizer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StandardTokenizer build() {
-			_checkSingleUse();
-
-			return new StandardTokenizer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link StandardTokenizer}
-	 */
-	public static final JsonpDeserializer<StandardTokenizer> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, StandardTokenizer::setupStandardTokenizerDeserializer);
-
-	protected static void setupStandardTokenizerDeserializer(ObjectDeserializer<StandardTokenizer.Builder> op) {
-		TokenizerBase.setupTokenizerBaseDeserializer(op);
-		op.add(Builder::maxTokenLength, JsonpDeserializer.integerDeserializer(), "max_token_length");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Integer maxTokenLength;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private StandardTokenizer(Builder builder) {
+        super(builder);
+
+        this.maxTokenLength = builder.maxTokenLength;
+
+    }
+
+    public static StandardTokenizer of(Function<Builder, ObjectBuilder<StandardTokenizer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenizerDefinition variant kind.
+     */
+    @Override
+    public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
+        return TokenizerDefinition.Kind.Standard;
+    }
+
+    /**
+     * API name: {@code max_token_length}
+     */
+    @Nullable
+    public final Integer maxTokenLength() {
+        return this.maxTokenLength;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "standard");
+        super.serializeInternal(generator, mapper);
+        if (this.maxTokenLength != null) {
+            generator.writeKey("max_token_length");
+            generator.write(this.maxTokenLength);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link StandardTokenizer}.
+     */
+
+    public static class Builder extends TokenizerBase.AbstractBuilder<Builder> implements ObjectBuilder<StandardTokenizer> {
+        @Nullable
+        private Integer maxTokenLength;
+
+        /**
+         * API name: {@code max_token_length}
+         */
+        public final Builder maxTokenLength(@Nullable Integer value) {
+            this.maxTokenLength = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link StandardTokenizer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StandardTokenizer build() {
+            _checkSingleUse();
+
+            return new StandardTokenizer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link StandardTokenizer}
+     */
+    public static final JsonpDeserializer<StandardTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StandardTokenizer::setupStandardTokenizerDeserializer
+    );
+
+    protected static void setupStandardTokenizerDeserializer(ObjectDeserializer<StandardTokenizer.Builder> op) {
+        TokenizerBase.setupTokenizerBaseDeserializer(op);
+        op.add(Builder::maxTokenLength, JsonpDeserializer.integerDeserializer(), "max_token_length");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StemmerOverrideTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StemmerOverrideTokenFilter.java
index f964e54f38..b48e6d91ef 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StemmerOverrideTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StemmerOverrideTokenFilter.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,156 +43,150 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.StemmerOverrideTokenFilter
 
-
 @JsonpDeserializable
 public class StemmerOverrideTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final List<String> rules;
-
-	@Nullable
-	private final String rulesPath;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private StemmerOverrideTokenFilter(Builder builder) {
-		super(builder);
-
-		this.rules = ApiTypeHelper.unmodifiable(builder.rules);
-		this.rulesPath = builder.rulesPath;
-
-	}
-
-	public static StemmerOverrideTokenFilter of(Function<Builder, ObjectBuilder<StemmerOverrideTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.StemmerOverride;
-	}
-
-	/**
-	 * API name: {@code rules}
-	 */
-	public final List<String> rules() {
-		return this.rules;
-	}
-
-	/**
-	 * API name: {@code rules_path}
-	 */
-	@Nullable
-	public final String rulesPath() {
-		return this.rulesPath;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "stemmer_override");
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.rules)) {
-			generator.writeKey("rules");
-			generator.writeStartArray();
-			for (String item0 : this.rules) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.rulesPath != null) {
-			generator.writeKey("rules_path");
-			generator.write(this.rulesPath);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link StemmerOverrideTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<StemmerOverrideTokenFilter> {
-		@Nullable
-		private List<String> rules;
-
-		@Nullable
-		private String rulesPath;
-
-		/**
-		 * API name: {@code rules}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>rules</code>.
-		 */
-		public final Builder rules(List<String> list) {
-			this.rules = _listAddAll(this.rules, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code rules}
-		 * <p>
-		 * Adds one or more values to <code>rules</code>.
-		 */
-		public final Builder rules(String value, String... values) {
-			this.rules = _listAdd(this.rules, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code rules_path}
-		 */
-		public final Builder rulesPath(@Nullable String value) {
-			this.rulesPath = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link StemmerOverrideTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StemmerOverrideTokenFilter build() {
-			_checkSingleUse();
-
-			return new StemmerOverrideTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link StemmerOverrideTokenFilter}
-	 */
-	public static final JsonpDeserializer<StemmerOverrideTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, StemmerOverrideTokenFilter::setupStemmerOverrideTokenFilterDeserializer);
-
-	protected static void setupStemmerOverrideTokenFilterDeserializer(
-			ObjectDeserializer<StemmerOverrideTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::rules, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "rules");
-		op.add(Builder::rulesPath, JsonpDeserializer.stringDeserializer(), "rules_path");
-
-		op.ignore("type");
-	}
+    private final List<String> rules;
+
+    @Nullable
+    private final String rulesPath;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private StemmerOverrideTokenFilter(Builder builder) {
+        super(builder);
+
+        this.rules = ApiTypeHelper.unmodifiable(builder.rules);
+        this.rulesPath = builder.rulesPath;
+
+    }
+
+    public static StemmerOverrideTokenFilter of(Function<Builder, ObjectBuilder<StemmerOverrideTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.StemmerOverride;
+    }
+
+    /**
+     * API name: {@code rules}
+     */
+    public final List<String> rules() {
+        return this.rules;
+    }
+
+    /**
+     * API name: {@code rules_path}
+     */
+    @Nullable
+    public final String rulesPath() {
+        return this.rulesPath;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "stemmer_override");
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.rules)) {
+            generator.writeKey("rules");
+            generator.writeStartArray();
+            for (String item0 : this.rules) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.rulesPath != null) {
+            generator.writeKey("rules_path");
+            generator.write(this.rulesPath);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link StemmerOverrideTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<StemmerOverrideTokenFilter> {
+        @Nullable
+        private List<String> rules;
+
+        @Nullable
+        private String rulesPath;
+
+        /**
+         * API name: {@code rules}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>rules</code>.
+         */
+        public final Builder rules(List<String> list) {
+            this.rules = _listAddAll(this.rules, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code rules}
+         * <p>
+         * Adds one or more values to <code>rules</code>.
+         */
+        public final Builder rules(String value, String... values) {
+            this.rules = _listAdd(this.rules, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code rules_path}
+         */
+        public final Builder rulesPath(@Nullable String value) {
+            this.rulesPath = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link StemmerOverrideTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StemmerOverrideTokenFilter build() {
+            _checkSingleUse();
+
+            return new StemmerOverrideTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link StemmerOverrideTokenFilter}
+     */
+    public static final JsonpDeserializer<StemmerOverrideTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StemmerOverrideTokenFilter::setupStemmerOverrideTokenFilterDeserializer
+    );
+
+    protected static void setupStemmerOverrideTokenFilterDeserializer(ObjectDeserializer<StemmerOverrideTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::rules, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "rules");
+        op.add(Builder::rulesPath, JsonpDeserializer.stringDeserializer(), "rules_path");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StemmerTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StemmerTokenFilter.java
index f011bfc452..d07fa7940b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StemmerTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StemmerTokenFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,102 +41,100 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.StemmerTokenFilter
 
 @JsonpDeserializable
 public class StemmerTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final String language;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private StemmerTokenFilter(Builder builder) {
-		super(builder);
-
-		this.language = ApiTypeHelper.requireNonNull(builder.language, this, "language");
-
-	}
-
-	public static StemmerTokenFilter of(Function<Builder, ObjectBuilder<StemmerTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Stemmer;
-	}
-
-	/**
-	 * Required - API name: {@code language}
-	 */
-	public final String language() {
-		return this.language;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "stemmer");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("language");
-		generator.write(this.language);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link StemmerTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<StemmerTokenFilter> {
-		private String language;
-
-		/**
-		 * Required - API name: {@code language}
-		 */
-		public final Builder language(String value) {
-			this.language = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link StemmerTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StemmerTokenFilter build() {
-			_checkSingleUse();
-
-			return new StemmerTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link StemmerTokenFilter}
-	 */
-	public static final JsonpDeserializer<StemmerTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, StemmerTokenFilter::setupStemmerTokenFilterDeserializer);
-
-	protected static void setupStemmerTokenFilterDeserializer(ObjectDeserializer<StemmerTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::language, JsonpDeserializer.stringDeserializer(), "language");
-
-		op.ignore("type");
-	}
+    private final String language;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private StemmerTokenFilter(Builder builder) {
+        super(builder);
+
+        this.language = ApiTypeHelper.requireNonNull(builder.language, this, "language");
+
+    }
+
+    public static StemmerTokenFilter of(Function<Builder, ObjectBuilder<StemmerTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Stemmer;
+    }
+
+    /**
+     * Required - API name: {@code language}
+     */
+    public final String language() {
+        return this.language;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "stemmer");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("language");
+        generator.write(this.language);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link StemmerTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<StemmerTokenFilter> {
+        private String language;
+
+        /**
+         * Required - API name: {@code language}
+         */
+        public final Builder language(String value) {
+            this.language = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link StemmerTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StemmerTokenFilter build() {
+            _checkSingleUse();
+
+            return new StemmerTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link StemmerTokenFilter}
+     */
+    public static final JsonpDeserializer<StemmerTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StemmerTokenFilter::setupStemmerTokenFilterDeserializer
+    );
+
+    protected static void setupStemmerTokenFilterDeserializer(ObjectDeserializer<StemmerTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::language, JsonpDeserializer.stringDeserializer(), "language");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StopAnalyzer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StopAnalyzer.java
index a4e085c86c..31fed1d9c4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StopAnalyzer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StopAnalyzer.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,185 +45,182 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.StopAnalyzer
 
 @JsonpDeserializable
 public class StopAnalyzer implements AnalyzerVariant, JsonpSerializable {
-	@Nullable
-	private final String version;
+    @Nullable
+    private final String version;
 
-	private final List<String> stopwords;
+    private final List<String> stopwords;
 
-	@Nullable
-	private final String stopwordsPath;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private StopAnalyzer(Builder builder) {
-
-		this.version = builder.version;
-		this.stopwords = ApiTypeHelper.unmodifiable(builder.stopwords);
-		this.stopwordsPath = builder.stopwordsPath;
-
-	}
-
-	public static StopAnalyzer of(Function<Builder, ObjectBuilder<StopAnalyzer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Analyzer variant kind.
-	 */
-	@Override
-	public Analyzer.Kind _analyzerKind() {
-		return Analyzer.Kind.Stop;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final String version() {
-		return this.version;
-	}
-
-	/**
-	 * API name: {@code stopwords}
-	 */
-	public final List<String> stopwords() {
-		return this.stopwords;
-	}
-
-	/**
-	 * API name: {@code stopwords_path}
-	 */
-	@Nullable
-	public final String stopwordsPath() {
-		return this.stopwordsPath;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "stop");
-
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		if (ApiTypeHelper.isDefined(this.stopwords)) {
-			generator.writeKey("stopwords");
-			generator.writeStartArray();
-			for (String item0 : this.stopwords) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.stopwordsPath != null) {
-			generator.writeKey("stopwords_path");
-			generator.write(this.stopwordsPath);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link StopAnalyzer}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<StopAnalyzer> {
-		@Nullable
-		private String version;
-
-		@Nullable
-		private List<String> stopwords;
-
-		@Nullable
-		private String stopwordsPath;
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code stopwords}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>stopwords</code>.
-		 */
-		public final Builder stopwords(List<String> list) {
-			this.stopwords = _listAddAll(this.stopwords, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stopwords}
-		 * <p>
-		 * Adds one or more values to <code>stopwords</code>.
-		 */
-		public final Builder stopwords(String value, String... values) {
-			this.stopwords = _listAdd(this.stopwords, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stopwords_path}
-		 */
-		public final Builder stopwordsPath(@Nullable String value) {
-			this.stopwordsPath = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link StopAnalyzer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StopAnalyzer build() {
-			_checkSingleUse();
-
-			return new StopAnalyzer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link StopAnalyzer}
-	 */
-	public static final JsonpDeserializer<StopAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			StopAnalyzer::setupStopAnalyzerDeserializer);
-
-	protected static void setupStopAnalyzerDeserializer(ObjectDeserializer<StopAnalyzer.Builder> op) {
-
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
-		op.add(Builder::stopwords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"stopwords");
-		op.add(Builder::stopwordsPath, JsonpDeserializer.stringDeserializer(), "stopwords_path");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final String stopwordsPath;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private StopAnalyzer(Builder builder) {
+
+        this.version = builder.version;
+        this.stopwords = ApiTypeHelper.unmodifiable(builder.stopwords);
+        this.stopwordsPath = builder.stopwordsPath;
+
+    }
+
+    public static StopAnalyzer of(Function<Builder, ObjectBuilder<StopAnalyzer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Analyzer variant kind.
+     */
+    @Override
+    public Analyzer.Kind _analyzerKind() {
+        return Analyzer.Kind.Stop;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final String version() {
+        return this.version;
+    }
+
+    /**
+     * API name: {@code stopwords}
+     */
+    public final List<String> stopwords() {
+        return this.stopwords;
+    }
+
+    /**
+     * API name: {@code stopwords_path}
+     */
+    @Nullable
+    public final String stopwordsPath() {
+        return this.stopwordsPath;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "stop");
+
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        if (ApiTypeHelper.isDefined(this.stopwords)) {
+            generator.writeKey("stopwords");
+            generator.writeStartArray();
+            for (String item0 : this.stopwords) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.stopwordsPath != null) {
+            generator.writeKey("stopwords_path");
+            generator.write(this.stopwordsPath);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link StopAnalyzer}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<StopAnalyzer> {
+        @Nullable
+        private String version;
+
+        @Nullable
+        private List<String> stopwords;
+
+        @Nullable
+        private String stopwordsPath;
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code stopwords}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>stopwords</code>.
+         */
+        public final Builder stopwords(List<String> list) {
+            this.stopwords = _listAddAll(this.stopwords, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code stopwords}
+         * <p>
+         * Adds one or more values to <code>stopwords</code>.
+         */
+        public final Builder stopwords(String value, String... values) {
+            this.stopwords = _listAdd(this.stopwords, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code stopwords_path}
+         */
+        public final Builder stopwordsPath(@Nullable String value) {
+            this.stopwordsPath = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link StopAnalyzer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StopAnalyzer build() {
+            _checkSingleUse();
+
+            return new StopAnalyzer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link StopAnalyzer}
+     */
+    public static final JsonpDeserializer<StopAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StopAnalyzer::setupStopAnalyzerDeserializer
+    );
+
+    protected static void setupStopAnalyzerDeserializer(ObjectDeserializer<StopAnalyzer.Builder> op) {
+
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
+        op.add(Builder::stopwords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stopwords");
+        op.add(Builder::stopwordsPath, JsonpDeserializer.stringDeserializer(), "stopwords_path");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StopTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StopTokenFilter.java
index 6f61d1cc3e..5a0dd858ce 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StopTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/StopTokenFilter.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,212 +43,207 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.StopTokenFilter
 
 @JsonpDeserializable
 public class StopTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	@Nullable
-	private final Boolean ignoreCase;
-
-	@Nullable
-	private final Boolean removeTrailing;
-
-	private final List<String> stopwords;
-
-	@Nullable
-	private final String stopwordsPath;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private StopTokenFilter(Builder builder) {
-		super(builder);
-
-		this.ignoreCase = builder.ignoreCase;
-		this.removeTrailing = builder.removeTrailing;
-		this.stopwords = ApiTypeHelper.unmodifiableRequired(builder.stopwords, this, "stopwords");
-		this.stopwordsPath = builder.stopwordsPath;
-
-	}
-
-	public static StopTokenFilter of(Function<Builder, ObjectBuilder<StopTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Stop;
-	}
-
-	/**
-	 * API name: {@code ignore_case}
-	 */
-	@Nullable
-	public final Boolean ignoreCase() {
-		return this.ignoreCase;
-	}
-
-	/**
-	 * API name: {@code remove_trailing}
-	 */
-	@Nullable
-	public final Boolean removeTrailing() {
-		return this.removeTrailing;
-	}
-
-	/**
-	 * Required - API name: {@code stopwords}
-	 */
-	public final List<String> stopwords() {
-		return this.stopwords;
-	}
-
-	/**
-	 * API name: {@code stopwords_path}
-	 */
-	@Nullable
-	public final String stopwordsPath() {
-		return this.stopwordsPath;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "stop");
-		super.serializeInternal(generator, mapper);
-		if (this.ignoreCase != null) {
-			generator.writeKey("ignore_case");
-			generator.write(this.ignoreCase);
-
-		}
-		if (this.removeTrailing != null) {
-			generator.writeKey("remove_trailing");
-			generator.write(this.removeTrailing);
-
-		}
-		if (ApiTypeHelper.isDefined(this.stopwords)) {
-			generator.writeKey("stopwords");
-			generator.writeStartArray();
-			for (String item0 : this.stopwords) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.stopwordsPath != null) {
-			generator.writeKey("stopwords_path");
-			generator.write(this.stopwordsPath);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link StopTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<StopTokenFilter> {
-		@Nullable
-		private Boolean ignoreCase;
-
-		@Nullable
-		private Boolean removeTrailing;
-
-		private List<String> stopwords;
-
-		@Nullable
-		private String stopwordsPath;
-
-		/**
-		 * API name: {@code ignore_case}
-		 */
-		public final Builder ignoreCase(@Nullable Boolean value) {
-			this.ignoreCase = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code remove_trailing}
-		 */
-		public final Builder removeTrailing(@Nullable Boolean value) {
-			this.removeTrailing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code stopwords}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>stopwords</code>.
-		 */
-		public final Builder stopwords(List<String> list) {
-			this.stopwords = _listAddAll(this.stopwords, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code stopwords}
-		 * <p>
-		 * Adds one or more values to <code>stopwords</code>.
-		 */
-		public final Builder stopwords(String value, String... values) {
-			this.stopwords = _listAdd(this.stopwords, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stopwords_path}
-		 */
-		public final Builder stopwordsPath(@Nullable String value) {
-			this.stopwordsPath = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link StopTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StopTokenFilter build() {
-			_checkSingleUse();
-
-			return new StopTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link StopTokenFilter}
-	 */
-	public static final JsonpDeserializer<StopTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			StopTokenFilter::setupStopTokenFilterDeserializer);
-
-	protected static void setupStopTokenFilterDeserializer(ObjectDeserializer<StopTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::ignoreCase, JsonpDeserializer.booleanDeserializer(), "ignore_case");
-		op.add(Builder::removeTrailing, JsonpDeserializer.booleanDeserializer(), "remove_trailing");
-		op.add(Builder::stopwords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"stopwords");
-		op.add(Builder::stopwordsPath, JsonpDeserializer.stringDeserializer(), "stopwords_path");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Boolean ignoreCase;
+
+    @Nullable
+    private final Boolean removeTrailing;
+
+    private final List<String> stopwords;
+
+    @Nullable
+    private final String stopwordsPath;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private StopTokenFilter(Builder builder) {
+        super(builder);
+
+        this.ignoreCase = builder.ignoreCase;
+        this.removeTrailing = builder.removeTrailing;
+        this.stopwords = ApiTypeHelper.unmodifiableRequired(builder.stopwords, this, "stopwords");
+        this.stopwordsPath = builder.stopwordsPath;
+
+    }
+
+    public static StopTokenFilter of(Function<Builder, ObjectBuilder<StopTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Stop;
+    }
+
+    /**
+     * API name: {@code ignore_case}
+     */
+    @Nullable
+    public final Boolean ignoreCase() {
+        return this.ignoreCase;
+    }
+
+    /**
+     * API name: {@code remove_trailing}
+     */
+    @Nullable
+    public final Boolean removeTrailing() {
+        return this.removeTrailing;
+    }
+
+    /**
+     * Required - API name: {@code stopwords}
+     */
+    public final List<String> stopwords() {
+        return this.stopwords;
+    }
+
+    /**
+     * API name: {@code stopwords_path}
+     */
+    @Nullable
+    public final String stopwordsPath() {
+        return this.stopwordsPath;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "stop");
+        super.serializeInternal(generator, mapper);
+        if (this.ignoreCase != null) {
+            generator.writeKey("ignore_case");
+            generator.write(this.ignoreCase);
+
+        }
+        if (this.removeTrailing != null) {
+            generator.writeKey("remove_trailing");
+            generator.write(this.removeTrailing);
+
+        }
+        if (ApiTypeHelper.isDefined(this.stopwords)) {
+            generator.writeKey("stopwords");
+            generator.writeStartArray();
+            for (String item0 : this.stopwords) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.stopwordsPath != null) {
+            generator.writeKey("stopwords_path");
+            generator.write(this.stopwordsPath);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link StopTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<StopTokenFilter> {
+        @Nullable
+        private Boolean ignoreCase;
+
+        @Nullable
+        private Boolean removeTrailing;
+
+        private List<String> stopwords;
+
+        @Nullable
+        private String stopwordsPath;
+
+        /**
+         * API name: {@code ignore_case}
+         */
+        public final Builder ignoreCase(@Nullable Boolean value) {
+            this.ignoreCase = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code remove_trailing}
+         */
+        public final Builder removeTrailing(@Nullable Boolean value) {
+            this.removeTrailing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code stopwords}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>stopwords</code>.
+         */
+        public final Builder stopwords(List<String> list) {
+            this.stopwords = _listAddAll(this.stopwords, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code stopwords}
+         * <p>
+         * Adds one or more values to <code>stopwords</code>.
+         */
+        public final Builder stopwords(String value, String... values) {
+            this.stopwords = _listAdd(this.stopwords, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code stopwords_path}
+         */
+        public final Builder stopwordsPath(@Nullable String value) {
+            this.stopwordsPath = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link StopTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StopTokenFilter build() {
+            _checkSingleUse();
+
+            return new StopTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link StopTokenFilter}
+     */
+    public static final JsonpDeserializer<StopTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StopTokenFilter::setupStopTokenFilterDeserializer
+    );
+
+    protected static void setupStopTokenFilterDeserializer(ObjectDeserializer<StopTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::ignoreCase, JsonpDeserializer.booleanDeserializer(), "ignore_case");
+        op.add(Builder::removeTrailing, JsonpDeserializer.booleanDeserializer(), "remove_trailing");
+        op.add(Builder::stopwords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stopwords");
+        op.add(Builder::stopwordsPath, JsonpDeserializer.stringDeserializer(), "stopwords_path");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymFormat.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymFormat.java
index f02efd9267..f8f13184cc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymFormat.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymFormat.java
@@ -37,22 +37,21 @@
 
 @JsonpDeserializable
 public enum SynonymFormat implements JsonEnum {
-	Solr("solr"),
+    Solr("solr"),
 
-	Wordnet("wordnet"),
+    Wordnet("wordnet"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	SynonymFormat(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    SynonymFormat(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<SynonymFormat> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			SynonymFormat.values());
+    public static final JsonEnum.Deserializer<SynonymFormat> _DESERIALIZER = new JsonEnum.Deserializer<>(SynonymFormat.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymGraphTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymGraphTokenFilter.java
index 6820562535..9ae8fb60fd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymGraphTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymGraphTokenFilter.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,300 +43,294 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.SynonymGraphTokenFilter
 
 @JsonpDeserializable
 public class SynonymGraphTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	@Nullable
-	private final Boolean expand;
-
-	@Nullable
-	private final SynonymFormat format;
-
-	@Nullable
-	private final Boolean lenient;
-
-	private final List<String> synonyms;
-
-	@Nullable
-	private final String synonymsPath;
-
-	@Nullable
-	private final String tokenizer;
-
-	@Nullable
-	private final Boolean updateable;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SynonymGraphTokenFilter(Builder builder) {
-		super(builder);
-
-		this.expand = builder.expand;
-		this.format = builder.format;
-		this.lenient = builder.lenient;
-		this.synonyms = ApiTypeHelper.unmodifiable(builder.synonyms);
-		this.synonymsPath = builder.synonymsPath;
-		this.tokenizer = builder.tokenizer;
-		this.updateable = builder.updateable;
-
-	}
-
-	public static SynonymGraphTokenFilter of(Function<Builder, ObjectBuilder<SynonymGraphTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.SynonymGraph;
-	}
-
-	/**
-	 * API name: {@code expand}
-	 */
-	@Nullable
-	public final Boolean expand() {
-		return this.expand;
-	}
-
-	/**
-	 * API name: {@code format}
-	 */
-	@Nullable
-	public final SynonymFormat format() {
-		return this.format;
-	}
-
-	/**
-	 * API name: {@code lenient}
-	 */
-	@Nullable
-	public final Boolean lenient() {
-		return this.lenient;
-	}
-
-	/**
-	 * API name: {@code synonyms}
-	 */
-	public final List<String> synonyms() {
-		return this.synonyms;
-	}
-
-	/**
-	 * API name: {@code synonyms_path}
-	 */
-	@Nullable
-	public final String synonymsPath() {
-		return this.synonymsPath;
-	}
-
-	/**
-	 * API name: {@code tokenizer}
-	 */
-	@Nullable
-	public final String tokenizer() {
-		return this.tokenizer;
-	}
-
-	/**
-	 * API name: {@code updateable}
-	 */
-	@Nullable
-	public final Boolean updateable() {
-		return this.updateable;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "synonym_graph");
-		super.serializeInternal(generator, mapper);
-		if (this.expand != null) {
-			generator.writeKey("expand");
-			generator.write(this.expand);
-
-		}
-		if (this.format != null) {
-			generator.writeKey("format");
-			this.format.serialize(generator, mapper);
-		}
-		if (this.lenient != null) {
-			generator.writeKey("lenient");
-			generator.write(this.lenient);
-
-		}
-		if (ApiTypeHelper.isDefined(this.synonyms)) {
-			generator.writeKey("synonyms");
-			generator.writeStartArray();
-			for (String item0 : this.synonyms) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.synonymsPath != null) {
-			generator.writeKey("synonyms_path");
-			generator.write(this.synonymsPath);
-
-		}
-		if (this.tokenizer != null) {
-			generator.writeKey("tokenizer");
-			generator.write(this.tokenizer);
-
-		}
-		if (this.updateable != null) {
-			generator.writeKey("updateable");
-			generator.write(this.updateable);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SynonymGraphTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SynonymGraphTokenFilter> {
-		@Nullable
-		private Boolean expand;
-
-		@Nullable
-		private SynonymFormat format;
-
-		@Nullable
-		private Boolean lenient;
-
-		@Nullable
-		private List<String> synonyms;
-
-		@Nullable
-		private String synonymsPath;
-
-		@Nullable
-		private String tokenizer;
-
-		@Nullable
-		private Boolean updateable;
-
-		/**
-		 * API name: {@code expand}
-		 */
-		public final Builder expand(@Nullable Boolean value) {
-			this.expand = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code format}
-		 */
-		public final Builder format(@Nullable SynonymFormat value) {
-			this.format = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code lenient}
-		 */
-		public final Builder lenient(@Nullable Boolean value) {
-			this.lenient = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code synonyms}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>synonyms</code>.
-		 */
-		public final Builder synonyms(List<String> list) {
-			this.synonyms = _listAddAll(this.synonyms, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code synonyms}
-		 * <p>
-		 * Adds one or more values to <code>synonyms</code>.
-		 */
-		public final Builder synonyms(String value, String... values) {
-			this.synonyms = _listAdd(this.synonyms, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code synonyms_path}
-		 */
-		public final Builder synonymsPath(@Nullable String value) {
-			this.synonymsPath = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code tokenizer}
-		 */
-		public final Builder tokenizer(@Nullable String value) {
-			this.tokenizer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code updateable}
-		 */
-		public final Builder updateable(@Nullable Boolean value) {
-			this.updateable = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SynonymGraphTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SynonymGraphTokenFilter build() {
-			_checkSingleUse();
-
-			return new SynonymGraphTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SynonymGraphTokenFilter}
-	 */
-	public static final JsonpDeserializer<SynonymGraphTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SynonymGraphTokenFilter::setupSynonymGraphTokenFilterDeserializer);
-
-	protected static void setupSynonymGraphTokenFilterDeserializer(
-			ObjectDeserializer<SynonymGraphTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::expand, JsonpDeserializer.booleanDeserializer(), "expand");
-		op.add(Builder::format, SynonymFormat._DESERIALIZER, "format");
-		op.add(Builder::lenient, JsonpDeserializer.booleanDeserializer(), "lenient");
-		op.add(Builder::synonyms, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"synonyms");
-		op.add(Builder::synonymsPath, JsonpDeserializer.stringDeserializer(), "synonyms_path");
-		op.add(Builder::tokenizer, JsonpDeserializer.stringDeserializer(), "tokenizer");
-		op.add(Builder::updateable, JsonpDeserializer.booleanDeserializer(), "updateable");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Boolean expand;
+
+    @Nullable
+    private final SynonymFormat format;
+
+    @Nullable
+    private final Boolean lenient;
+
+    private final List<String> synonyms;
+
+    @Nullable
+    private final String synonymsPath;
+
+    @Nullable
+    private final String tokenizer;
+
+    @Nullable
+    private final Boolean updateable;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SynonymGraphTokenFilter(Builder builder) {
+        super(builder);
+
+        this.expand = builder.expand;
+        this.format = builder.format;
+        this.lenient = builder.lenient;
+        this.synonyms = ApiTypeHelper.unmodifiable(builder.synonyms);
+        this.synonymsPath = builder.synonymsPath;
+        this.tokenizer = builder.tokenizer;
+        this.updateable = builder.updateable;
+
+    }
+
+    public static SynonymGraphTokenFilter of(Function<Builder, ObjectBuilder<SynonymGraphTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.SynonymGraph;
+    }
+
+    /**
+     * API name: {@code expand}
+     */
+    @Nullable
+    public final Boolean expand() {
+        return this.expand;
+    }
+
+    /**
+     * API name: {@code format}
+     */
+    @Nullable
+    public final SynonymFormat format() {
+        return this.format;
+    }
+
+    /**
+     * API name: {@code lenient}
+     */
+    @Nullable
+    public final Boolean lenient() {
+        return this.lenient;
+    }
+
+    /**
+     * API name: {@code synonyms}
+     */
+    public final List<String> synonyms() {
+        return this.synonyms;
+    }
+
+    /**
+     * API name: {@code synonyms_path}
+     */
+    @Nullable
+    public final String synonymsPath() {
+        return this.synonymsPath;
+    }
+
+    /**
+     * API name: {@code tokenizer}
+     */
+    @Nullable
+    public final String tokenizer() {
+        return this.tokenizer;
+    }
+
+    /**
+     * API name: {@code updateable}
+     */
+    @Nullable
+    public final Boolean updateable() {
+        return this.updateable;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "synonym_graph");
+        super.serializeInternal(generator, mapper);
+        if (this.expand != null) {
+            generator.writeKey("expand");
+            generator.write(this.expand);
+
+        }
+        if (this.format != null) {
+            generator.writeKey("format");
+            this.format.serialize(generator, mapper);
+        }
+        if (this.lenient != null) {
+            generator.writeKey("lenient");
+            generator.write(this.lenient);
+
+        }
+        if (ApiTypeHelper.isDefined(this.synonyms)) {
+            generator.writeKey("synonyms");
+            generator.writeStartArray();
+            for (String item0 : this.synonyms) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.synonymsPath != null) {
+            generator.writeKey("synonyms_path");
+            generator.write(this.synonymsPath);
+
+        }
+        if (this.tokenizer != null) {
+            generator.writeKey("tokenizer");
+            generator.write(this.tokenizer);
+
+        }
+        if (this.updateable != null) {
+            generator.writeKey("updateable");
+            generator.write(this.updateable);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SynonymGraphTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<SynonymGraphTokenFilter> {
+        @Nullable
+        private Boolean expand;
+
+        @Nullable
+        private SynonymFormat format;
+
+        @Nullable
+        private Boolean lenient;
+
+        @Nullable
+        private List<String> synonyms;
+
+        @Nullable
+        private String synonymsPath;
+
+        @Nullable
+        private String tokenizer;
+
+        @Nullable
+        private Boolean updateable;
+
+        /**
+         * API name: {@code expand}
+         */
+        public final Builder expand(@Nullable Boolean value) {
+            this.expand = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code format}
+         */
+        public final Builder format(@Nullable SynonymFormat value) {
+            this.format = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code lenient}
+         */
+        public final Builder lenient(@Nullable Boolean value) {
+            this.lenient = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code synonyms}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>synonyms</code>.
+         */
+        public final Builder synonyms(List<String> list) {
+            this.synonyms = _listAddAll(this.synonyms, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code synonyms}
+         * <p>
+         * Adds one or more values to <code>synonyms</code>.
+         */
+        public final Builder synonyms(String value, String... values) {
+            this.synonyms = _listAdd(this.synonyms, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code synonyms_path}
+         */
+        public final Builder synonymsPath(@Nullable String value) {
+            this.synonymsPath = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code tokenizer}
+         */
+        public final Builder tokenizer(@Nullable String value) {
+            this.tokenizer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code updateable}
+         */
+        public final Builder updateable(@Nullable Boolean value) {
+            this.updateable = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SynonymGraphTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SynonymGraphTokenFilter build() {
+            _checkSingleUse();
+
+            return new SynonymGraphTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SynonymGraphTokenFilter}
+     */
+    public static final JsonpDeserializer<SynonymGraphTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SynonymGraphTokenFilter::setupSynonymGraphTokenFilterDeserializer
+    );
+
+    protected static void setupSynonymGraphTokenFilterDeserializer(ObjectDeserializer<SynonymGraphTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::expand, JsonpDeserializer.booleanDeserializer(), "expand");
+        op.add(Builder::format, SynonymFormat._DESERIALIZER, "format");
+        op.add(Builder::lenient, JsonpDeserializer.booleanDeserializer(), "lenient");
+        op.add(Builder::synonyms, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "synonyms");
+        op.add(Builder::synonymsPath, JsonpDeserializer.stringDeserializer(), "synonyms_path");
+        op.add(Builder::tokenizer, JsonpDeserializer.stringDeserializer(), "tokenizer");
+        op.add(Builder::updateable, JsonpDeserializer.booleanDeserializer(), "updateable");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymTokenFilter.java
index d0e26d29be..055e7f92de 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/SynonymTokenFilter.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,299 +43,294 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.SynonymTokenFilter
 
 @JsonpDeserializable
 public class SynonymTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	@Nullable
-	private final Boolean expand;
-
-	@Nullable
-	private final SynonymFormat format;
-
-	@Nullable
-	private final Boolean lenient;
-
-	private final List<String> synonyms;
-
-	@Nullable
-	private final String synonymsPath;
-
-	@Nullable
-	private final String tokenizer;
-
-	@Nullable
-	private final Boolean updateable;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SynonymTokenFilter(Builder builder) {
-		super(builder);
-
-		this.expand = builder.expand;
-		this.format = builder.format;
-		this.lenient = builder.lenient;
-		this.synonyms = ApiTypeHelper.unmodifiable(builder.synonyms);
-		this.synonymsPath = builder.synonymsPath;
-		this.tokenizer = builder.tokenizer;
-		this.updateable = builder.updateable;
-
-	}
-
-	public static SynonymTokenFilter of(Function<Builder, ObjectBuilder<SynonymTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Synonym;
-	}
-
-	/**
-	 * API name: {@code expand}
-	 */
-	@Nullable
-	public final Boolean expand() {
-		return this.expand;
-	}
-
-	/**
-	 * API name: {@code format}
-	 */
-	@Nullable
-	public final SynonymFormat format() {
-		return this.format;
-	}
-
-	/**
-	 * API name: {@code lenient}
-	 */
-	@Nullable
-	public final Boolean lenient() {
-		return this.lenient;
-	}
-
-	/**
-	 * API name: {@code synonyms}
-	 */
-	public final List<String> synonyms() {
-		return this.synonyms;
-	}
-
-	/**
-	 * API name: {@code synonyms_path}
-	 */
-	@Nullable
-	public final String synonymsPath() {
-		return this.synonymsPath;
-	}
-
-	/**
-	 * API name: {@code tokenizer}
-	 */
-	@Nullable
-	public final String tokenizer() {
-		return this.tokenizer;
-	}
-
-	/**
-	 * API name: {@code updateable}
-	 */
-	@Nullable
-	public final Boolean updateable() {
-		return this.updateable;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "synonym");
-		super.serializeInternal(generator, mapper);
-		if (this.expand != null) {
-			generator.writeKey("expand");
-			generator.write(this.expand);
-
-		}
-		if (this.format != null) {
-			generator.writeKey("format");
-			this.format.serialize(generator, mapper);
-		}
-		if (this.lenient != null) {
-			generator.writeKey("lenient");
-			generator.write(this.lenient);
-
-		}
-		if (ApiTypeHelper.isDefined(this.synonyms)) {
-			generator.writeKey("synonyms");
-			generator.writeStartArray();
-			for (String item0 : this.synonyms) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.synonymsPath != null) {
-			generator.writeKey("synonyms_path");
-			generator.write(this.synonymsPath);
-
-		}
-		if (this.tokenizer != null) {
-			generator.writeKey("tokenizer");
-			generator.write(this.tokenizer);
-
-		}
-		if (this.updateable != null) {
-			generator.writeKey("updateable");
-			generator.write(this.updateable);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SynonymTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SynonymTokenFilter> {
-		@Nullable
-		private Boolean expand;
-
-		@Nullable
-		private SynonymFormat format;
-
-		@Nullable
-		private Boolean lenient;
-
-		@Nullable
-		private List<String> synonyms;
-
-		@Nullable
-		private String synonymsPath;
-
-		@Nullable
-		private String tokenizer;
-
-		@Nullable
-		private Boolean updateable;
-
-		/**
-		 * API name: {@code expand}
-		 */
-		public final Builder expand(@Nullable Boolean value) {
-			this.expand = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code format}
-		 */
-		public final Builder format(@Nullable SynonymFormat value) {
-			this.format = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code lenient}
-		 */
-		public final Builder lenient(@Nullable Boolean value) {
-			this.lenient = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code synonyms}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>synonyms</code>.
-		 */
-		public final Builder synonyms(List<String> list) {
-			this.synonyms = _listAddAll(this.synonyms, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code synonyms}
-		 * <p>
-		 * Adds one or more values to <code>synonyms</code>.
-		 */
-		public final Builder synonyms(String value, String... values) {
-			this.synonyms = _listAdd(this.synonyms, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code synonyms_path}
-		 */
-		public final Builder synonymsPath(@Nullable String value) {
-			this.synonymsPath = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code tokenizer}
-		 */
-		public final Builder tokenizer(@Nullable String value) {
-			this.tokenizer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code updateable}
-		 */
-		public final Builder updateable(@Nullable Boolean value) {
-			this.updateable = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SynonymTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SynonymTokenFilter build() {
-			_checkSingleUse();
-
-			return new SynonymTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SynonymTokenFilter}
-	 */
-	public static final JsonpDeserializer<SynonymTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SynonymTokenFilter::setupSynonymTokenFilterDeserializer);
-
-	protected static void setupSynonymTokenFilterDeserializer(ObjectDeserializer<SynonymTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::expand, JsonpDeserializer.booleanDeserializer(), "expand");
-		op.add(Builder::format, SynonymFormat._DESERIALIZER, "format");
-		op.add(Builder::lenient, JsonpDeserializer.booleanDeserializer(), "lenient");
-		op.add(Builder::synonyms, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"synonyms");
-		op.add(Builder::synonymsPath, JsonpDeserializer.stringDeserializer(), "synonyms_path");
-		op.add(Builder::tokenizer, JsonpDeserializer.stringDeserializer(), "tokenizer");
-		op.add(Builder::updateable, JsonpDeserializer.booleanDeserializer(), "updateable");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Boolean expand;
+
+    @Nullable
+    private final SynonymFormat format;
+
+    @Nullable
+    private final Boolean lenient;
+
+    private final List<String> synonyms;
+
+    @Nullable
+    private final String synonymsPath;
+
+    @Nullable
+    private final String tokenizer;
+
+    @Nullable
+    private final Boolean updateable;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SynonymTokenFilter(Builder builder) {
+        super(builder);
+
+        this.expand = builder.expand;
+        this.format = builder.format;
+        this.lenient = builder.lenient;
+        this.synonyms = ApiTypeHelper.unmodifiable(builder.synonyms);
+        this.synonymsPath = builder.synonymsPath;
+        this.tokenizer = builder.tokenizer;
+        this.updateable = builder.updateable;
+
+    }
+
+    public static SynonymTokenFilter of(Function<Builder, ObjectBuilder<SynonymTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Synonym;
+    }
+
+    /**
+     * API name: {@code expand}
+     */
+    @Nullable
+    public final Boolean expand() {
+        return this.expand;
+    }
+
+    /**
+     * API name: {@code format}
+     */
+    @Nullable
+    public final SynonymFormat format() {
+        return this.format;
+    }
+
+    /**
+     * API name: {@code lenient}
+     */
+    @Nullable
+    public final Boolean lenient() {
+        return this.lenient;
+    }
+
+    /**
+     * API name: {@code synonyms}
+     */
+    public final List<String> synonyms() {
+        return this.synonyms;
+    }
+
+    /**
+     * API name: {@code synonyms_path}
+     */
+    @Nullable
+    public final String synonymsPath() {
+        return this.synonymsPath;
+    }
+
+    /**
+     * API name: {@code tokenizer}
+     */
+    @Nullable
+    public final String tokenizer() {
+        return this.tokenizer;
+    }
+
+    /**
+     * API name: {@code updateable}
+     */
+    @Nullable
+    public final Boolean updateable() {
+        return this.updateable;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "synonym");
+        super.serializeInternal(generator, mapper);
+        if (this.expand != null) {
+            generator.writeKey("expand");
+            generator.write(this.expand);
+
+        }
+        if (this.format != null) {
+            generator.writeKey("format");
+            this.format.serialize(generator, mapper);
+        }
+        if (this.lenient != null) {
+            generator.writeKey("lenient");
+            generator.write(this.lenient);
+
+        }
+        if (ApiTypeHelper.isDefined(this.synonyms)) {
+            generator.writeKey("synonyms");
+            generator.writeStartArray();
+            for (String item0 : this.synonyms) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.synonymsPath != null) {
+            generator.writeKey("synonyms_path");
+            generator.write(this.synonymsPath);
+
+        }
+        if (this.tokenizer != null) {
+            generator.writeKey("tokenizer");
+            generator.write(this.tokenizer);
+
+        }
+        if (this.updateable != null) {
+            generator.writeKey("updateable");
+            generator.write(this.updateable);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SynonymTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<SynonymTokenFilter> {
+        @Nullable
+        private Boolean expand;
+
+        @Nullable
+        private SynonymFormat format;
+
+        @Nullable
+        private Boolean lenient;
+
+        @Nullable
+        private List<String> synonyms;
+
+        @Nullable
+        private String synonymsPath;
+
+        @Nullable
+        private String tokenizer;
+
+        @Nullable
+        private Boolean updateable;
+
+        /**
+         * API name: {@code expand}
+         */
+        public final Builder expand(@Nullable Boolean value) {
+            this.expand = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code format}
+         */
+        public final Builder format(@Nullable SynonymFormat value) {
+            this.format = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code lenient}
+         */
+        public final Builder lenient(@Nullable Boolean value) {
+            this.lenient = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code synonyms}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>synonyms</code>.
+         */
+        public final Builder synonyms(List<String> list) {
+            this.synonyms = _listAddAll(this.synonyms, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code synonyms}
+         * <p>
+         * Adds one or more values to <code>synonyms</code>.
+         */
+        public final Builder synonyms(String value, String... values) {
+            this.synonyms = _listAdd(this.synonyms, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code synonyms_path}
+         */
+        public final Builder synonymsPath(@Nullable String value) {
+            this.synonymsPath = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code tokenizer}
+         */
+        public final Builder tokenizer(@Nullable String value) {
+            this.tokenizer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code updateable}
+         */
+        public final Builder updateable(@Nullable Boolean value) {
+            this.updateable = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SynonymTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SynonymTokenFilter build() {
+            _checkSingleUse();
+
+            return new SynonymTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SynonymTokenFilter}
+     */
+    public static final JsonpDeserializer<SynonymTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SynonymTokenFilter::setupSynonymTokenFilterDeserializer
+    );
+
+    protected static void setupSynonymTokenFilterDeserializer(ObjectDeserializer<SynonymTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::expand, JsonpDeserializer.booleanDeserializer(), "expand");
+        op.add(Builder::format, SynonymFormat._DESERIALIZER, "format");
+        op.add(Builder::lenient, JsonpDeserializer.booleanDeserializer(), "lenient");
+        op.add(Builder::synonyms, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "synonyms");
+        op.add(Builder::synonymsPath, JsonpDeserializer.stringDeserializer(), "synonyms_path");
+        op.add(Builder::tokenizer, JsonpDeserializer.stringDeserializer(), "tokenizer");
+        op.add(Builder::updateable, JsonpDeserializer.booleanDeserializer(), "updateable");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenChar.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenChar.java
index c25bfe4384..7352af54a9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenChar.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenChar.java
@@ -35,33 +35,31 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum TokenChar implements JsonEnum {
-	Letter("letter"),
+    Letter("letter"),
 
-	Digit("digit"),
+    Digit("digit"),
 
-	Whitespace("whitespace"),
+    Whitespace("whitespace"),
 
-	Punctuation("punctuation"),
+    Punctuation("punctuation"),
 
-	Symbol("symbol"),
+    Symbol("symbol"),
 
-	Custom("custom"),
+    Custom("custom"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	TokenChar(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    TokenChar(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<TokenChar> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			TokenChar.values());
+    public static final JsonEnum.Deserializer<TokenChar> _DESERIALIZER = new JsonEnum.Deserializer<>(TokenChar.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilter.java
index 34bb5f00e1..9edbc9ab2b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,131 +44,129 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.TokenFilter
 
 @JsonpDeserializable
 public class TokenFilter implements TaggedUnion<TokenFilter.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Definition, Name
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private TokenFilter(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	private TokenFilter(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static TokenFilter of(Function<Builder, ObjectBuilder<TokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code definition}?
-	 */
-	public boolean isDefinition() {
-		return _kind == Kind.Definition;
-	}
-
-	/**
-	 * Get the {@code definition} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code definition} kind.
-	 */
-	public TokenFilterDefinition definition() {
-		return TaggedUnionUtils.get(this, Kind.Definition);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code name}?
-	 */
-	public boolean isName() {
-		return _kind == Kind.Name;
-	}
-
-	/**
-	 * Get the {@code name} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code name} kind.
-	 */
-	public String name() {
-		return TaggedUnionUtils.get(this, Kind.Name);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Name :
-					generator.write(((String) this._value));
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TokenFilter> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<TokenFilter> definition(TokenFilterDefinition v) {
-			this._kind = Kind.Definition;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilter> definition(
-				Function<TokenFilterDefinition.Builder, ObjectBuilder<TokenFilterDefinition>> fn) {
-			return this.definition(fn.apply(new TokenFilterDefinition.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilter> name(String v) {
-			this._kind = Kind.Name;
-			this._value = v;
-			return this;
-		}
-
-		public TokenFilter build() {
-			_checkSingleUse();
-			return new TokenFilter(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<TokenFilter> buildTokenFilterDeserializer() {
-		return new UnionDeserializer.Builder<TokenFilter, Kind, Object>(TokenFilter::new, false)
-				.addMember(Kind.Definition, TokenFilterDefinition._DESERIALIZER)
-				.addMember(Kind.Name, JsonpDeserializer.stringDeserializer()).build();
-	}
-
-	public static final JsonpDeserializer<TokenFilter> _DESERIALIZER = JsonpDeserializer
-			.lazy(TokenFilter::buildTokenFilterDeserializer);
+    public enum Kind {
+        Definition,
+        Name
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private TokenFilter(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private TokenFilter(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static TokenFilter of(Function<Builder, ObjectBuilder<TokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code definition}?
+     */
+    public boolean isDefinition() {
+        return _kind == Kind.Definition;
+    }
+
+    /**
+     * Get the {@code definition} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code definition} kind.
+     */
+    public TokenFilterDefinition definition() {
+        return TaggedUnionUtils.get(this, Kind.Definition);
+    }
+
+    /**
+     * Is this variant instance of kind {@code name}?
+     */
+    public boolean isName() {
+        return _kind == Kind.Name;
+    }
+
+    /**
+     * Get the {@code name} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code name} kind.
+     */
+    public String name() {
+        return TaggedUnionUtils.get(this, Kind.Name);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Name:
+                    generator.write(((String) this._value));
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TokenFilter> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<TokenFilter> definition(TokenFilterDefinition v) {
+            this._kind = Kind.Definition;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilter> definition(Function<TokenFilterDefinition.Builder, ObjectBuilder<TokenFilterDefinition>> fn) {
+            return this.definition(fn.apply(new TokenFilterDefinition.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilter> name(String v) {
+            this._kind = Kind.Name;
+            this._value = v;
+            return this;
+        }
+
+        public TokenFilter build() {
+            _checkSingleUse();
+            return new TokenFilter(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<TokenFilter> buildTokenFilterDeserializer() {
+        return new UnionDeserializer.Builder<TokenFilter, Kind, Object>(TokenFilter::new, false).addMember(
+            Kind.Definition,
+            TokenFilterDefinition._DESERIALIZER
+        ).addMember(Kind.Name, JsonpDeserializer.stringDeserializer()).build();
+    }
+
+    public static final JsonpDeserializer<TokenFilter> _DESERIALIZER = JsonpDeserializer.lazy(TokenFilter::buildTokenFilterDeserializer);
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBase.java
index a7fec52ea7..d4d0c1e81e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBase.java
@@ -32,80 +32,76 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.TokenFilterBase
 
-
 public abstract class TokenFilterBase implements JsonpSerializable {
-	@Nullable
-	private final String version;
+    @Nullable
+    private final String version;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected TokenFilterBase(AbstractBuilder<?> builder) {
+    protected TokenFilterBase(AbstractBuilder<?> builder) {
 
-		this.version = builder.version;
+        this.version = builder.version;
 
-	}
+    }
 
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final String version() {
-		return this.version;
-	}
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final String version() {
+        return this.version;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
 
-		}
+        }
 
-	}
+    }
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		@Nullable
-		private String version;
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        @Nullable
+        private String version;
 
-		/**
-		 * API name: {@code version}
-		 */
-		public final BuilderT version(@Nullable String value) {
-			this.version = value;
-			return self();
-		}
+        /**
+         * API name: {@code version}
+         */
+        public final BuilderT version(@Nullable String value) {
+            this.version = value;
+            return self();
+        }
 
-		protected abstract BuilderT self();
+        protected abstract BuilderT self();
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupTokenFilterBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupTokenFilterBaseDeserializer(ObjectDeserializer<BuilderT> op) {
 
-		op.add(AbstractBuilder::version, JsonpDeserializer.stringDeserializer(), "version");
+        op.add(AbstractBuilder::version, JsonpDeserializer.stringDeserializer(), "version");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBuilders.java
index db37c853bf..86b60160cd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBuilders.java
@@ -37,18 +37,17 @@
  * <p>
  * Variants <code>name</code> are not available here as they don't have a
  * dedicated class. Use {@link TokenFilter}'s builder for these.
- * 
+ *
  */
 public class TokenFilterBuilders {
-	private TokenFilterBuilders() {
-	}
+    private TokenFilterBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link TokenFilterDefinition definition}
-	 * {@code TokenFilter} variant.
-	 */
-	public static TokenFilterDefinition.Builder definition() {
-		return new TokenFilterDefinition.Builder();
-	}
+    /**
+     * Creates a builder for the {@link TokenFilterDefinition definition}
+     * {@code TokenFilter} variant.
+     */
+    public static TokenFilterDefinition.Builder definition() {
+        return new TokenFilterDefinition.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinition.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinition.java
index fd2b08558f..3eb564c476 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinition.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinition.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -44,1538 +46,1544 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.TokenFilterDefinition
 
-
 @JsonpDeserializable
-public class TokenFilterDefinition
-		implements
-			TaggedUnion<TokenFilterDefinition.Kind, TokenFilterDefinitionVariant>,
-			JsonpSerializable {
+public class TokenFilterDefinition implements TaggedUnion<TokenFilterDefinition.Kind, TokenFilterDefinitionVariant>, JsonpSerializable {
 
-	/**
-	 * {@link TokenFilterDefinition} variant kinds.
-	 */
-	/**
-	 * {@link TokenFilterDefinition} variant kinds.
-	 */
+    /**
+     * {@link TokenFilterDefinition} variant kinds.
+     */
+    /**
+     * {@link TokenFilterDefinition} variant kinds.
+     */
 
-	public enum Kind implements JsonEnum {
-		Asciifolding("asciifolding"),
+    public enum Kind implements JsonEnum {
+        Asciifolding("asciifolding"),
 
-		CommonGrams("common_grams"),
+        CommonGrams("common_grams"),
 
-		Condition("condition"),
+        Condition("condition"),
 
-		DelimitedPayload("delimited_payload"),
+        DelimitedPayload("delimited_payload"),
 
-		DictionaryDecompounder("dictionary_decompounder"),
+        DictionaryDecompounder("dictionary_decompounder"),
 
-		EdgeNgram("edge_ngram"),
+        EdgeNgram("edge_ngram"),
 
-		Elision("elision"),
+        Elision("elision"),
 
-		Fingerprint("fingerprint"),
+        Fingerprint("fingerprint"),
 
-		Hunspell("hunspell"),
+        Hunspell("hunspell"),
 
-		HyphenationDecompounder("hyphenation_decompounder"),
+        HyphenationDecompounder("hyphenation_decompounder"),
 
-		IcuCollation("icu_collation"),
+        IcuCollation("icu_collation"),
 
-		IcuFolding("icu_folding"),
+        IcuFolding("icu_folding"),
 
-		IcuNormalizer("icu_normalizer"),
+        IcuNormalizer("icu_normalizer"),
 
-		IcuTokenizer("icu_tokenizer"),
+        IcuTokenizer("icu_tokenizer"),
 
-		IcuTransform("icu_transform"),
+        IcuTransform("icu_transform"),
 
-		Kstem("kstem"),
+        Kstem("kstem"),
 
-		KeepTypes("keep_types"),
+        KeepTypes("keep_types"),
 
-		Keep("keep"),
+        Keep("keep"),
 
-		KeywordMarker("keyword_marker"),
+        KeywordMarker("keyword_marker"),
 
-		KuromojiPartOfSpeech("kuromoji_part_of_speech"),
+        KuromojiPartOfSpeech("kuromoji_part_of_speech"),
 
-		KuromojiReadingform("kuromoji_readingform"),
+        KuromojiReadingform("kuromoji_readingform"),
 
-		KuromojiStemmer("kuromoji_stemmer"),
+        KuromojiStemmer("kuromoji_stemmer"),
 
-		Length("length"),
+        Length("length"),
 
-		Limit("limit"),
+        Limit("limit"),
 
-		Lowercase("lowercase"),
+        Lowercase("lowercase"),
 
-		Multiplexer("multiplexer"),
+        Multiplexer("multiplexer"),
 
-		Ngram("ngram"),
+        Ngram("ngram"),
 
-		NoriPartOfSpeech("nori_part_of_speech"),
+        NoriPartOfSpeech("nori_part_of_speech"),
 
-		PatternCapture("pattern_capture"),
+        PatternCapture("pattern_capture"),
 
-		PatternReplace("pattern_replace"),
+        PatternReplace("pattern_replace"),
 
-		Phonetic("phonetic"),
+        Phonetic("phonetic"),
 
-		PorterStem("porter_stem"),
+        PorterStem("porter_stem"),
 
-		PredicateTokenFilter("predicate_token_filter"),
+        PredicateTokenFilter("predicate_token_filter"),
 
-		RemoveDuplicates("remove_duplicates"),
+        RemoveDuplicates("remove_duplicates"),
 
-		Reverse("reverse"),
+        Reverse("reverse"),
 
-		Shingle("shingle"),
+        Shingle("shingle"),
 
-		Snowball("snowball"),
+        Snowball("snowball"),
 
-		StemmerOverride("stemmer_override"),
+        StemmerOverride("stemmer_override"),
 
-		Stemmer("stemmer"),
+        Stemmer("stemmer"),
 
-		Stop("stop"),
+        Stop("stop"),
 
-		SynonymGraph("synonym_graph"),
+        SynonymGraph("synonym_graph"),
 
-		Synonym("synonym"),
+        Synonym("synonym"),
 
-		Trim("trim"),
+        Trim("trim"),
 
-		Truncate("truncate"),
+        Truncate("truncate"),
 
-		Unique("unique"),
+        Unique("unique"),
 
-		Uppercase("uppercase"),
+        Uppercase("uppercase"),
 
-		WordDelimiterGraph("word_delimiter_graph"),
+        WordDelimiterGraph("word_delimiter_graph"),
 
-		WordDelimiter("word_delimiter"),
+        WordDelimiter("word_delimiter"),
 
         SmartcnStop("smartcn_stop"),
 
-		;
-
-		private final String jsonValue;
-
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
-
-		public String jsonValue() {
-			return this.jsonValue;
-		}
-
-	}
-
-	private final Kind _kind;
-	private final TokenFilterDefinitionVariant _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final TokenFilterDefinitionVariant _get() {
-		return _value;
-	}
-
-	public TokenFilterDefinition(TokenFilterDefinitionVariant value) {
-
-		this._kind = ApiTypeHelper.requireNonNull(value._tokenFilterDefinitionKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
-
-	}
-
-	private TokenFilterDefinition(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static TokenFilterDefinition of(Function<Builder, ObjectBuilder<TokenFilterDefinition>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code asciifolding}?
-	 */
-	public boolean isAsciifolding() {
-		return _kind == Kind.Asciifolding;
-	}
-
-	/**
-	 * Get the {@code asciifolding} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code asciifolding} kind.
-	 */
-	public AsciiFoldingTokenFilter asciifolding() {
-		return TaggedUnionUtils.get(this, Kind.Asciifolding);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code common_grams}?
-	 */
-	public boolean isCommonGrams() {
-		return _kind == Kind.CommonGrams;
-	}
-
-	/**
-	 * Get the {@code common_grams} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code common_grams} kind.
-	 */
-	public CommonGramsTokenFilter commonGrams() {
-		return TaggedUnionUtils.get(this, Kind.CommonGrams);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code condition}?
-	 */
-	public boolean isCondition() {
-		return _kind == Kind.Condition;
-	}
-
-	/**
-	 * Get the {@code condition} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code condition} kind.
-	 */
-	public ConditionTokenFilter condition() {
-		return TaggedUnionUtils.get(this, Kind.Condition);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code delimited_payload}?
-	 */
-	public boolean isDelimitedPayload() {
-		return _kind == Kind.DelimitedPayload;
-	}
-
-	/**
-	 * Get the {@code delimited_payload} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code delimited_payload}
-	 *             kind.
-	 */
-	public DelimitedPayloadTokenFilter delimitedPayload() {
-		return TaggedUnionUtils.get(this, Kind.DelimitedPayload);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code dictionary_decompounder}?
-	 */
-	public boolean isDictionaryDecompounder() {
-		return _kind == Kind.DictionaryDecompounder;
-	}
-
-	/**
-	 * Get the {@code dictionary_decompounder} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the
-	 *             {@code dictionary_decompounder} kind.
-	 */
-	public DictionaryDecompounderTokenFilter dictionaryDecompounder() {
-		return TaggedUnionUtils.get(this, Kind.DictionaryDecompounder);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code edge_ngram}?
-	 */
-	public boolean isEdgeNgram() {
-		return _kind == Kind.EdgeNgram;
-	}
-
-	/**
-	 * Get the {@code edge_ngram} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code edge_ngram} kind.
-	 */
-	public EdgeNGramTokenFilter edgeNgram() {
-		return TaggedUnionUtils.get(this, Kind.EdgeNgram);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code elision}?
-	 */
-	public boolean isElision() {
-		return _kind == Kind.Elision;
-	}
-
-	/**
-	 * Get the {@code elision} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code elision} kind.
-	 */
-	public ElisionTokenFilter elision() {
-		return TaggedUnionUtils.get(this, Kind.Elision);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code fingerprint}?
-	 */
-	public boolean isFingerprint() {
-		return _kind == Kind.Fingerprint;
-	}
-
-	/**
-	 * Get the {@code fingerprint} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code fingerprint} kind.
-	 */
-	public FingerprintTokenFilter fingerprint() {
-		return TaggedUnionUtils.get(this, Kind.Fingerprint);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code hunspell}?
-	 */
-	public boolean isHunspell() {
-		return _kind == Kind.Hunspell;
-	}
-
-	/**
-	 * Get the {@code hunspell} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code hunspell} kind.
-	 */
-	public HunspellTokenFilter hunspell() {
-		return TaggedUnionUtils.get(this, Kind.Hunspell);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code hyphenation_decompounder}?
-	 */
-	public boolean isHyphenationDecompounder() {
-		return _kind == Kind.HyphenationDecompounder;
-	}
-
-	/**
-	 * Get the {@code hyphenation_decompounder} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the
-	 *             {@code hyphenation_decompounder} kind.
-	 */
-	public HyphenationDecompounderTokenFilter hyphenationDecompounder() {
-		return TaggedUnionUtils.get(this, Kind.HyphenationDecompounder);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code icu_collation}?
-	 */
-	public boolean isIcuCollation() {
-		return _kind == Kind.IcuCollation;
-	}
-
-	/**
-	 * Get the {@code icu_collation} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code icu_collation} kind.
-	 */
-	public IcuCollationTokenFilter icuCollation() {
-		return TaggedUnionUtils.get(this, Kind.IcuCollation);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code icu_folding}?
-	 */
-	public boolean isIcuFolding() {
-		return _kind == Kind.IcuFolding;
-	}
-
-	/**
-	 * Get the {@code icu_folding} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code icu_folding} kind.
-	 */
-	public IcuFoldingTokenFilter icuFolding() {
-		return TaggedUnionUtils.get(this, Kind.IcuFolding);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code icu_normalizer}?
-	 */
-	public boolean isIcuNormalizer() {
-		return _kind == Kind.IcuNormalizer;
-	}
-
-	/**
-	 * Get the {@code icu_normalizer} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code icu_normalizer} kind.
-	 */
-	public IcuNormalizationTokenFilter icuNormalizer() {
-		return TaggedUnionUtils.get(this, Kind.IcuNormalizer);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code icu_tokenizer}?
-	 */
-	public boolean isIcuTokenizer() {
-		return _kind == Kind.IcuTokenizer;
-	}
-
-	/**
-	 * Get the {@code icu_tokenizer} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code icu_tokenizer} kind.
-	 */
-	public IcuTokenizer icuTokenizer() {
-		return TaggedUnionUtils.get(this, Kind.IcuTokenizer);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code icu_transform}?
-	 */
-	public boolean isIcuTransform() {
-		return _kind == Kind.IcuTransform;
-	}
-
-	/**
-	 * Get the {@code icu_transform} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code icu_transform} kind.
-	 */
-	public IcuTransformTokenFilter icuTransform() {
-		return TaggedUnionUtils.get(this, Kind.IcuTransform);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code kstem}?
-	 */
-	public boolean isKstem() {
-		return _kind == Kind.Kstem;
-	}
-
-	/**
-	 * Get the {@code kstem} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code kstem} kind.
-	 */
-	public KStemTokenFilter kstem() {
-		return TaggedUnionUtils.get(this, Kind.Kstem);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code keep_types}?
-	 */
-	public boolean isKeepTypes() {
-		return _kind == Kind.KeepTypes;
-	}
-
-	/**
-	 * Get the {@code keep_types} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code keep_types} kind.
-	 */
-	public KeepTypesTokenFilter keepTypes() {
-		return TaggedUnionUtils.get(this, Kind.KeepTypes);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code keep}?
-	 */
-	public boolean isKeep() {
-		return _kind == Kind.Keep;
-	}
-
-	/**
-	 * Get the {@code keep} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code keep} kind.
-	 */
-	public KeepWordsTokenFilter keep() {
-		return TaggedUnionUtils.get(this, Kind.Keep);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code keyword_marker}?
-	 */
-	public boolean isKeywordMarker() {
-		return _kind == Kind.KeywordMarker;
-	}
-
-	/**
-	 * Get the {@code keyword_marker} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code keyword_marker} kind.
-	 */
-	public KeywordMarkerTokenFilter keywordMarker() {
-		return TaggedUnionUtils.get(this, Kind.KeywordMarker);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code kuromoji_part_of_speech}?
-	 */
-	public boolean isKuromojiPartOfSpeech() {
-		return _kind == Kind.KuromojiPartOfSpeech;
-	}
-
-	/**
-	 * Get the {@code kuromoji_part_of_speech} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the
-	 *             {@code kuromoji_part_of_speech} kind.
-	 */
-	public KuromojiPartOfSpeechTokenFilter kuromojiPartOfSpeech() {
-		return TaggedUnionUtils.get(this, Kind.KuromojiPartOfSpeech);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code kuromoji_readingform}?
-	 */
-	public boolean isKuromojiReadingform() {
-		return _kind == Kind.KuromojiReadingform;
-	}
-
-	/**
-	 * Get the {@code kuromoji_readingform} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code kuromoji_readingform}
-	 *             kind.
-	 */
-	public KuromojiReadingFormTokenFilter kuromojiReadingform() {
-		return TaggedUnionUtils.get(this, Kind.KuromojiReadingform);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code kuromoji_stemmer}?
-	 */
-	public boolean isKuromojiStemmer() {
-		return _kind == Kind.KuromojiStemmer;
-	}
-
-	/**
-	 * Get the {@code kuromoji_stemmer} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code kuromoji_stemmer}
-	 *             kind.
-	 */
-	public KuromojiStemmerTokenFilter kuromojiStemmer() {
-		return TaggedUnionUtils.get(this, Kind.KuromojiStemmer);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code length}?
-	 */
-	public boolean isLength() {
-		return _kind == Kind.Length;
-	}
-
-	/**
-	 * Get the {@code length} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code length} kind.
-	 */
-	public LengthTokenFilter length() {
-		return TaggedUnionUtils.get(this, Kind.Length);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code limit}?
-	 */
-	public boolean isLimit() {
-		return _kind == Kind.Limit;
-	}
-
-	/**
-	 * Get the {@code limit} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code limit} kind.
-	 */
-	public LimitTokenCountTokenFilter limit() {
-		return TaggedUnionUtils.get(this, Kind.Limit);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code lowercase}?
-	 */
-	public boolean isLowercase() {
-		return _kind == Kind.Lowercase;
-	}
-
-	/**
-	 * Get the {@code lowercase} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code lowercase} kind.
-	 */
-	public LowercaseTokenFilter lowercase() {
-		return TaggedUnionUtils.get(this, Kind.Lowercase);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code multiplexer}?
-	 */
-	public boolean isMultiplexer() {
-		return _kind == Kind.Multiplexer;
-	}
-
-	/**
-	 * Get the {@code multiplexer} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code multiplexer} kind.
-	 */
-	public MultiplexerTokenFilter multiplexer() {
-		return TaggedUnionUtils.get(this, Kind.Multiplexer);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code ngram}?
-	 */
-	public boolean isNgram() {
-		return _kind == Kind.Ngram;
-	}
-
-	/**
-	 * Get the {@code ngram} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code ngram} kind.
-	 */
-	public NGramTokenFilter ngram() {
-		return TaggedUnionUtils.get(this, Kind.Ngram);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code nori_part_of_speech}?
-	 */
-	public boolean isNoriPartOfSpeech() {
-		return _kind == Kind.NoriPartOfSpeech;
-	}
-
-	/**
-	 * Get the {@code nori_part_of_speech} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code nori_part_of_speech}
-	 *             kind.
-	 */
-	public NoriPartOfSpeechTokenFilter noriPartOfSpeech() {
-		return TaggedUnionUtils.get(this, Kind.NoriPartOfSpeech);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code pattern_capture}?
-	 */
-	public boolean isPatternCapture() {
-		return _kind == Kind.PatternCapture;
-	}
-
-	/**
-	 * Get the {@code pattern_capture} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code pattern_capture}
-	 *             kind.
-	 */
-	public PatternCaptureTokenFilter patternCapture() {
-		return TaggedUnionUtils.get(this, Kind.PatternCapture);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code pattern_replace}?
-	 */
-	public boolean isPatternReplace() {
-		return _kind == Kind.PatternReplace;
-	}
-
-	/**
-	 * Get the {@code pattern_replace} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code pattern_replace}
-	 *             kind.
-	 */
-	public PatternReplaceTokenFilter patternReplace() {
-		return TaggedUnionUtils.get(this, Kind.PatternReplace);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code phonetic}?
-	 */
-	public boolean isPhonetic() {
-		return _kind == Kind.Phonetic;
-	}
-
-	/**
-	 * Get the {@code phonetic} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code phonetic} kind.
-	 */
-	public PhoneticTokenFilter phonetic() {
-		return TaggedUnionUtils.get(this, Kind.Phonetic);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code porter_stem}?
-	 */
-	public boolean isPorterStem() {
-		return _kind == Kind.PorterStem;
-	}
-
-	/**
-	 * Get the {@code porter_stem} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code porter_stem} kind.
-	 */
-	public PorterStemTokenFilter porterStem() {
-		return TaggedUnionUtils.get(this, Kind.PorterStem);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code predicate_token_filter}?
-	 */
-	public boolean isPredicateTokenFilter() {
-		return _kind == Kind.PredicateTokenFilter;
-	}
-
-	/**
-	 * Get the {@code predicate_token_filter} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the
-	 *             {@code predicate_token_filter} kind.
-	 */
-	public PredicateTokenFilter predicateTokenFilter() {
-		return TaggedUnionUtils.get(this, Kind.PredicateTokenFilter);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code remove_duplicates}?
-	 */
-	public boolean isRemoveDuplicates() {
-		return _kind == Kind.RemoveDuplicates;
-	}
-
-	/**
-	 * Get the {@code remove_duplicates} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code remove_duplicates}
-	 *             kind.
-	 */
-	public RemoveDuplicatesTokenFilter removeDuplicates() {
-		return TaggedUnionUtils.get(this, Kind.RemoveDuplicates);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code reverse}?
-	 */
-	public boolean isReverse() {
-		return _kind == Kind.Reverse;
-	}
-
-	/**
-	 * Get the {@code reverse} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code reverse} kind.
-	 */
-	public ReverseTokenFilter reverse() {
-		return TaggedUnionUtils.get(this, Kind.Reverse);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code shingle}?
-	 */
-	public boolean isShingle() {
-		return _kind == Kind.Shingle;
-	}
-
-	/**
-	 * Get the {@code shingle} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code shingle} kind.
-	 */
-	public ShingleTokenFilter shingle() {
-		return TaggedUnionUtils.get(this, Kind.Shingle);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code snowball}?
-	 */
-	public boolean isSnowball() {
-		return _kind == Kind.Snowball;
-	}
-
-	/**
-	 * Get the {@code snowball} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code snowball} kind.
-	 */
-	public SnowballTokenFilter snowball() {
-		return TaggedUnionUtils.get(this, Kind.Snowball);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code stemmer_override}?
-	 */
-	public boolean isStemmerOverride() {
-		return _kind == Kind.StemmerOverride;
-	}
-
-	/**
-	 * Get the {@code stemmer_override} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code stemmer_override}
-	 *             kind.
-	 */
-	public StemmerOverrideTokenFilter stemmerOverride() {
-		return TaggedUnionUtils.get(this, Kind.StemmerOverride);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code stemmer}?
-	 */
-	public boolean isStemmer() {
-		return _kind == Kind.Stemmer;
-	}
-
-	/**
-	 * Get the {@code stemmer} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code stemmer} kind.
-	 */
-	public StemmerTokenFilter stemmer() {
-		return TaggedUnionUtils.get(this, Kind.Stemmer);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code stop}?
-	 */
-	public boolean isStop() {
-		return _kind == Kind.Stop;
-	}
-
-	/**
-	 * Get the {@code stop} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code stop} kind.
-	 */
-	public StopTokenFilter stop() {
-		return TaggedUnionUtils.get(this, Kind.Stop);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code synonym_graph}?
-	 */
-	public boolean isSynonymGraph() {
-		return _kind == Kind.SynonymGraph;
-	}
-
-	/**
-	 * Get the {@code synonym_graph} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code synonym_graph} kind.
-	 */
-	public SynonymGraphTokenFilter synonymGraph() {
-		return TaggedUnionUtils.get(this, Kind.SynonymGraph);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code synonym}?
-	 */
-	public boolean isSynonym() {
-		return _kind == Kind.Synonym;
-	}
-
-	/**
-	 * Get the {@code synonym} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code synonym} kind.
-	 */
-	public SynonymTokenFilter synonym() {
-		return TaggedUnionUtils.get(this, Kind.Synonym);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code trim}?
-	 */
-	public boolean isTrim() {
-		return _kind == Kind.Trim;
-	}
-
-	/**
-	 * Get the {@code trim} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code trim} kind.
-	 */
-	public TrimTokenFilter trim() {
-		return TaggedUnionUtils.get(this, Kind.Trim);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code truncate}?
-	 */
-	public boolean isTruncate() {
-		return _kind == Kind.Truncate;
-	}
-
-	/**
-	 * Get the {@code truncate} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code truncate} kind.
-	 */
-	public TruncateTokenFilter truncate() {
-		return TaggedUnionUtils.get(this, Kind.Truncate);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code unique}?
-	 */
-	public boolean isUnique() {
-		return _kind == Kind.Unique;
-	}
-
-	/**
-	 * Get the {@code unique} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code unique} kind.
-	 */
-	public UniqueTokenFilter unique() {
-		return TaggedUnionUtils.get(this, Kind.Unique);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code uppercase}?
-	 */
-	public boolean isUppercase() {
-		return _kind == Kind.Uppercase;
-	}
-
-	/**
-	 * Get the {@code uppercase} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code uppercase} kind.
-	 */
-	public UppercaseTokenFilter uppercase() {
-		return TaggedUnionUtils.get(this, Kind.Uppercase);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code word_delimiter_graph}?
-	 */
-	public boolean isWordDelimiterGraph() {
-		return _kind == Kind.WordDelimiterGraph;
-	}
-
-	/**
-	 * Get the {@code word_delimiter_graph} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code word_delimiter_graph}
-	 *             kind.
-	 */
-	public WordDelimiterGraphTokenFilter wordDelimiterGraph() {
-		return TaggedUnionUtils.get(this, Kind.WordDelimiterGraph);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code word_delimiter}?
-	 */
-	public boolean isWordDelimiter() {
-		return _kind == Kind.WordDelimiter;
-	}
-
-	/**
-	 * Get the {@code word_delimiter} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code word_delimiter} kind.
-	 */
-	public WordDelimiterTokenFilter wordDelimiter() {
-		return TaggedUnionUtils.get(this, Kind.WordDelimiter);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		mapper.serialize(_value, generator);
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TokenFilterDefinition> {
-		private Kind _kind;
-		private TokenFilterDefinitionVariant _value;
-
-		public ObjectBuilder<TokenFilterDefinition> asciifolding(AsciiFoldingTokenFilter v) {
-			this._kind = Kind.Asciifolding;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> asciifolding(
-				Function<AsciiFoldingTokenFilter.Builder, ObjectBuilder<AsciiFoldingTokenFilter>> fn) {
-			return this.asciifolding(fn.apply(new AsciiFoldingTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> commonGrams(CommonGramsTokenFilter v) {
-			this._kind = Kind.CommonGrams;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> commonGrams(
-				Function<CommonGramsTokenFilter.Builder, ObjectBuilder<CommonGramsTokenFilter>> fn) {
-			return this.commonGrams(fn.apply(new CommonGramsTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> condition(ConditionTokenFilter v) {
-			this._kind = Kind.Condition;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> condition(
-				Function<ConditionTokenFilter.Builder, ObjectBuilder<ConditionTokenFilter>> fn) {
-			return this.condition(fn.apply(new ConditionTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> delimitedPayload(DelimitedPayloadTokenFilter v) {
-			this._kind = Kind.DelimitedPayload;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> delimitedPayload(
-				Function<DelimitedPayloadTokenFilter.Builder, ObjectBuilder<DelimitedPayloadTokenFilter>> fn) {
-			return this.delimitedPayload(fn.apply(new DelimitedPayloadTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> dictionaryDecompounder(DictionaryDecompounderTokenFilter v) {
-			this._kind = Kind.DictionaryDecompounder;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> dictionaryDecompounder(
-				Function<DictionaryDecompounderTokenFilter.Builder, ObjectBuilder<DictionaryDecompounderTokenFilter>> fn) {
-			return this.dictionaryDecompounder(fn.apply(new DictionaryDecompounderTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> edgeNgram(EdgeNGramTokenFilter v) {
-			this._kind = Kind.EdgeNgram;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> edgeNgram(
-				Function<EdgeNGramTokenFilter.Builder, ObjectBuilder<EdgeNGramTokenFilter>> fn) {
-			return this.edgeNgram(fn.apply(new EdgeNGramTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> elision(ElisionTokenFilter v) {
-			this._kind = Kind.Elision;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> elision(
-				Function<ElisionTokenFilter.Builder, ObjectBuilder<ElisionTokenFilter>> fn) {
-			return this.elision(fn.apply(new ElisionTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> fingerprint(FingerprintTokenFilter v) {
-			this._kind = Kind.Fingerprint;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> fingerprint(
-				Function<FingerprintTokenFilter.Builder, ObjectBuilder<FingerprintTokenFilter>> fn) {
-			return this.fingerprint(fn.apply(new FingerprintTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> hunspell(HunspellTokenFilter v) {
-			this._kind = Kind.Hunspell;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> hunspell(
-				Function<HunspellTokenFilter.Builder, ObjectBuilder<HunspellTokenFilter>> fn) {
-			return this.hunspell(fn.apply(new HunspellTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> hyphenationDecompounder(HyphenationDecompounderTokenFilter v) {
-			this._kind = Kind.HyphenationDecompounder;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> hyphenationDecompounder(
-				Function<HyphenationDecompounderTokenFilter.Builder,
-						ObjectBuilder<HyphenationDecompounderTokenFilter>> fn) {
-			return this.hyphenationDecompounder(fn.apply(new HyphenationDecompounderTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> icuCollation(IcuCollationTokenFilter v) {
-			this._kind = Kind.IcuCollation;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> icuCollation(
-				Function<IcuCollationTokenFilter.Builder, ObjectBuilder<IcuCollationTokenFilter>> fn) {
-			return this.icuCollation(fn.apply(new IcuCollationTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> icuFolding(IcuFoldingTokenFilter v) {
-			this._kind = Kind.IcuFolding;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> icuFolding(
-				Function<IcuFoldingTokenFilter.Builder, ObjectBuilder<IcuFoldingTokenFilter>> fn) {
-			return this.icuFolding(fn.apply(new IcuFoldingTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> icuNormalizer(IcuNormalizationTokenFilter v) {
-			this._kind = Kind.IcuNormalizer;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> icuNormalizer(
-				Function<IcuNormalizationTokenFilter.Builder, ObjectBuilder<IcuNormalizationTokenFilter>> fn) {
-			return this.icuNormalizer(fn.apply(new IcuNormalizationTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> icuTokenizer(IcuTokenizer v) {
-			this._kind = Kind.IcuTokenizer;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> icuTokenizer(
-				Function<IcuTokenizer.Builder, ObjectBuilder<IcuTokenizer>> fn) {
-			return this.icuTokenizer(fn.apply(new IcuTokenizer.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> icuTransform(IcuTransformTokenFilter v) {
-			this._kind = Kind.IcuTransform;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> icuTransform(
-				Function<IcuTransformTokenFilter.Builder, ObjectBuilder<IcuTransformTokenFilter>> fn) {
-			return this.icuTransform(fn.apply(new IcuTransformTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> kstem(KStemTokenFilter v) {
-			this._kind = Kind.Kstem;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> kstem(
-				Function<KStemTokenFilter.Builder, ObjectBuilder<KStemTokenFilter>> fn) {
-			return this.kstem(fn.apply(new KStemTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> keepTypes(KeepTypesTokenFilter v) {
-			this._kind = Kind.KeepTypes;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> keepTypes(
-				Function<KeepTypesTokenFilter.Builder, ObjectBuilder<KeepTypesTokenFilter>> fn) {
-			return this.keepTypes(fn.apply(new KeepTypesTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> keep(KeepWordsTokenFilter v) {
-			this._kind = Kind.Keep;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> keep(
-				Function<KeepWordsTokenFilter.Builder, ObjectBuilder<KeepWordsTokenFilter>> fn) {
-			return this.keep(fn.apply(new KeepWordsTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> keywordMarker(KeywordMarkerTokenFilter v) {
-			this._kind = Kind.KeywordMarker;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> keywordMarker(
-				Function<KeywordMarkerTokenFilter.Builder, ObjectBuilder<KeywordMarkerTokenFilter>> fn) {
-			return this.keywordMarker(fn.apply(new KeywordMarkerTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> kuromojiPartOfSpeech(KuromojiPartOfSpeechTokenFilter v) {
-			this._kind = Kind.KuromojiPartOfSpeech;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> kuromojiPartOfSpeech(
-				Function<KuromojiPartOfSpeechTokenFilter.Builder, ObjectBuilder<KuromojiPartOfSpeechTokenFilter>> fn) {
-			return this.kuromojiPartOfSpeech(fn.apply(new KuromojiPartOfSpeechTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> kuromojiReadingform(KuromojiReadingFormTokenFilter v) {
-			this._kind = Kind.KuromojiReadingform;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> kuromojiReadingform(
-				Function<KuromojiReadingFormTokenFilter.Builder, ObjectBuilder<KuromojiReadingFormTokenFilter>> fn) {
-			return this.kuromojiReadingform(fn.apply(new KuromojiReadingFormTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> kuromojiStemmer(KuromojiStemmerTokenFilter v) {
-			this._kind = Kind.KuromojiStemmer;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> kuromojiStemmer(
-				Function<KuromojiStemmerTokenFilter.Builder, ObjectBuilder<KuromojiStemmerTokenFilter>> fn) {
-			return this.kuromojiStemmer(fn.apply(new KuromojiStemmerTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> length(LengthTokenFilter v) {
-			this._kind = Kind.Length;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> length(
-				Function<LengthTokenFilter.Builder, ObjectBuilder<LengthTokenFilter>> fn) {
-			return this.length(fn.apply(new LengthTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> limit(LimitTokenCountTokenFilter v) {
-			this._kind = Kind.Limit;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> limit(
-				Function<LimitTokenCountTokenFilter.Builder, ObjectBuilder<LimitTokenCountTokenFilter>> fn) {
-			return this.limit(fn.apply(new LimitTokenCountTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> lowercase(LowercaseTokenFilter v) {
-			this._kind = Kind.Lowercase;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> lowercase(
-				Function<LowercaseTokenFilter.Builder, ObjectBuilder<LowercaseTokenFilter>> fn) {
-			return this.lowercase(fn.apply(new LowercaseTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> multiplexer(MultiplexerTokenFilter v) {
-			this._kind = Kind.Multiplexer;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> multiplexer(
-				Function<MultiplexerTokenFilter.Builder, ObjectBuilder<MultiplexerTokenFilter>> fn) {
-			return this.multiplexer(fn.apply(new MultiplexerTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> ngram(NGramTokenFilter v) {
-			this._kind = Kind.Ngram;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> ngram(
-				Function<NGramTokenFilter.Builder, ObjectBuilder<NGramTokenFilter>> fn) {
-			return this.ngram(fn.apply(new NGramTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> noriPartOfSpeech(NoriPartOfSpeechTokenFilter v) {
-			this._kind = Kind.NoriPartOfSpeech;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> noriPartOfSpeech(
-				Function<NoriPartOfSpeechTokenFilter.Builder, ObjectBuilder<NoriPartOfSpeechTokenFilter>> fn) {
-			return this.noriPartOfSpeech(fn.apply(new NoriPartOfSpeechTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> patternCapture(PatternCaptureTokenFilter v) {
-			this._kind = Kind.PatternCapture;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> patternCapture(
-				Function<PatternCaptureTokenFilter.Builder, ObjectBuilder<PatternCaptureTokenFilter>> fn) {
-			return this.patternCapture(fn.apply(new PatternCaptureTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> patternReplace(PatternReplaceTokenFilter v) {
-			this._kind = Kind.PatternReplace;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> patternReplace(
-				Function<PatternReplaceTokenFilter.Builder, ObjectBuilder<PatternReplaceTokenFilter>> fn) {
-			return this.patternReplace(fn.apply(new PatternReplaceTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> phonetic(PhoneticTokenFilter v) {
-			this._kind = Kind.Phonetic;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> phonetic(
-				Function<PhoneticTokenFilter.Builder, ObjectBuilder<PhoneticTokenFilter>> fn) {
-			return this.phonetic(fn.apply(new PhoneticTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> porterStem(PorterStemTokenFilter v) {
-			this._kind = Kind.PorterStem;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> porterStem(
-				Function<PorterStemTokenFilter.Builder, ObjectBuilder<PorterStemTokenFilter>> fn) {
-			return this.porterStem(fn.apply(new PorterStemTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> predicateTokenFilter(PredicateTokenFilter v) {
-			this._kind = Kind.PredicateTokenFilter;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> predicateTokenFilter(
-				Function<PredicateTokenFilter.Builder, ObjectBuilder<PredicateTokenFilter>> fn) {
-			return this.predicateTokenFilter(fn.apply(new PredicateTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> removeDuplicates(RemoveDuplicatesTokenFilter v) {
-			this._kind = Kind.RemoveDuplicates;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> removeDuplicates(
-				Function<RemoveDuplicatesTokenFilter.Builder, ObjectBuilder<RemoveDuplicatesTokenFilter>> fn) {
-			return this.removeDuplicates(fn.apply(new RemoveDuplicatesTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> reverse(ReverseTokenFilter v) {
-			this._kind = Kind.Reverse;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> reverse(
-				Function<ReverseTokenFilter.Builder, ObjectBuilder<ReverseTokenFilter>> fn) {
-			return this.reverse(fn.apply(new ReverseTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> shingle(ShingleTokenFilter v) {
-			this._kind = Kind.Shingle;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> shingle(
-				Function<ShingleTokenFilter.Builder, ObjectBuilder<ShingleTokenFilter>> fn) {
-			return this.shingle(fn.apply(new ShingleTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> snowball(SnowballTokenFilter v) {
-			this._kind = Kind.Snowball;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> snowball(
-				Function<SnowballTokenFilter.Builder, ObjectBuilder<SnowballTokenFilter>> fn) {
-			return this.snowball(fn.apply(new SnowballTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> stemmerOverride(StemmerOverrideTokenFilter v) {
-			this._kind = Kind.StemmerOverride;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> stemmerOverride(
-				Function<StemmerOverrideTokenFilter.Builder, ObjectBuilder<StemmerOverrideTokenFilter>> fn) {
-			return this.stemmerOverride(fn.apply(new StemmerOverrideTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> stemmer(StemmerTokenFilter v) {
-			this._kind = Kind.Stemmer;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> stemmer(
-				Function<StemmerTokenFilter.Builder, ObjectBuilder<StemmerTokenFilter>> fn) {
-			return this.stemmer(fn.apply(new StemmerTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> stop(StopTokenFilter v) {
-			this._kind = Kind.Stop;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> stop(
-				Function<StopTokenFilter.Builder, ObjectBuilder<StopTokenFilter>> fn) {
-			return this.stop(fn.apply(new StopTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> synonymGraph(SynonymGraphTokenFilter v) {
-			this._kind = Kind.SynonymGraph;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> synonymGraph(
-				Function<SynonymGraphTokenFilter.Builder, ObjectBuilder<SynonymGraphTokenFilter>> fn) {
-			return this.synonymGraph(fn.apply(new SynonymGraphTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> synonym(SynonymTokenFilter v) {
-			this._kind = Kind.Synonym;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> synonym(
-				Function<SynonymTokenFilter.Builder, ObjectBuilder<SynonymTokenFilter>> fn) {
-			return this.synonym(fn.apply(new SynonymTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> trim(TrimTokenFilter v) {
-			this._kind = Kind.Trim;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> trim(
-				Function<TrimTokenFilter.Builder, ObjectBuilder<TrimTokenFilter>> fn) {
-			return this.trim(fn.apply(new TrimTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> truncate(TruncateTokenFilter v) {
-			this._kind = Kind.Truncate;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> truncate(
-				Function<TruncateTokenFilter.Builder, ObjectBuilder<TruncateTokenFilter>> fn) {
-			return this.truncate(fn.apply(new TruncateTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> unique(UniqueTokenFilter v) {
-			this._kind = Kind.Unique;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> unique(
-				Function<UniqueTokenFilter.Builder, ObjectBuilder<UniqueTokenFilter>> fn) {
-			return this.unique(fn.apply(new UniqueTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> uppercase(UppercaseTokenFilter v) {
-			this._kind = Kind.Uppercase;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> uppercase(
-				Function<UppercaseTokenFilter.Builder, ObjectBuilder<UppercaseTokenFilter>> fn) {
-			return this.uppercase(fn.apply(new UppercaseTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> wordDelimiterGraph(WordDelimiterGraphTokenFilter v) {
-			this._kind = Kind.WordDelimiterGraph;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> wordDelimiterGraph(
-				Function<WordDelimiterGraphTokenFilter.Builder, ObjectBuilder<WordDelimiterGraphTokenFilter>> fn) {
-			return this.wordDelimiterGraph(fn.apply(new WordDelimiterGraphTokenFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> wordDelimiter(WordDelimiterTokenFilter v) {
-			this._kind = Kind.WordDelimiter;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenFilterDefinition> wordDelimiter(
-				Function<WordDelimiterTokenFilter.Builder, ObjectBuilder<WordDelimiterTokenFilter>> fn) {
-			return this.wordDelimiter(fn.apply(new WordDelimiterTokenFilter.Builder()).build());
-		}
+        ;
+
+        private final String jsonValue;
+
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
+
+        public String jsonValue() {
+            return this.jsonValue;
+        }
+
+    }
+
+    private final Kind _kind;
+    private final TokenFilterDefinitionVariant _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final TokenFilterDefinitionVariant _get() {
+        return _value;
+    }
+
+    public TokenFilterDefinition(TokenFilterDefinitionVariant value) {
+
+        this._kind = ApiTypeHelper.requireNonNull(value._tokenFilterDefinitionKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+
+    }
+
+    private TokenFilterDefinition(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static TokenFilterDefinition of(Function<Builder, ObjectBuilder<TokenFilterDefinition>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code asciifolding}?
+     */
+    public boolean isAsciifolding() {
+        return _kind == Kind.Asciifolding;
+    }
+
+    /**
+     * Get the {@code asciifolding} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code asciifolding} kind.
+     */
+    public AsciiFoldingTokenFilter asciifolding() {
+        return TaggedUnionUtils.get(this, Kind.Asciifolding);
+    }
+
+    /**
+     * Is this variant instance of kind {@code common_grams}?
+     */
+    public boolean isCommonGrams() {
+        return _kind == Kind.CommonGrams;
+    }
+
+    /**
+     * Get the {@code common_grams} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code common_grams} kind.
+     */
+    public CommonGramsTokenFilter commonGrams() {
+        return TaggedUnionUtils.get(this, Kind.CommonGrams);
+    }
+
+    /**
+     * Is this variant instance of kind {@code condition}?
+     */
+    public boolean isCondition() {
+        return _kind == Kind.Condition;
+    }
+
+    /**
+     * Get the {@code condition} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code condition} kind.
+     */
+    public ConditionTokenFilter condition() {
+        return TaggedUnionUtils.get(this, Kind.Condition);
+    }
+
+    /**
+     * Is this variant instance of kind {@code delimited_payload}?
+     */
+    public boolean isDelimitedPayload() {
+        return _kind == Kind.DelimitedPayload;
+    }
+
+    /**
+     * Get the {@code delimited_payload} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code delimited_payload}
+     *             kind.
+     */
+    public DelimitedPayloadTokenFilter delimitedPayload() {
+        return TaggedUnionUtils.get(this, Kind.DelimitedPayload);
+    }
+
+    /**
+     * Is this variant instance of kind {@code dictionary_decompounder}?
+     */
+    public boolean isDictionaryDecompounder() {
+        return _kind == Kind.DictionaryDecompounder;
+    }
+
+    /**
+     * Get the {@code dictionary_decompounder} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the
+     *             {@code dictionary_decompounder} kind.
+     */
+    public DictionaryDecompounderTokenFilter dictionaryDecompounder() {
+        return TaggedUnionUtils.get(this, Kind.DictionaryDecompounder);
+    }
+
+    /**
+     * Is this variant instance of kind {@code edge_ngram}?
+     */
+    public boolean isEdgeNgram() {
+        return _kind == Kind.EdgeNgram;
+    }
+
+    /**
+     * Get the {@code edge_ngram} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code edge_ngram} kind.
+     */
+    public EdgeNGramTokenFilter edgeNgram() {
+        return TaggedUnionUtils.get(this, Kind.EdgeNgram);
+    }
+
+    /**
+     * Is this variant instance of kind {@code elision}?
+     */
+    public boolean isElision() {
+        return _kind == Kind.Elision;
+    }
+
+    /**
+     * Get the {@code elision} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code elision} kind.
+     */
+    public ElisionTokenFilter elision() {
+        return TaggedUnionUtils.get(this, Kind.Elision);
+    }
+
+    /**
+     * Is this variant instance of kind {@code fingerprint}?
+     */
+    public boolean isFingerprint() {
+        return _kind == Kind.Fingerprint;
+    }
+
+    /**
+     * Get the {@code fingerprint} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code fingerprint} kind.
+     */
+    public FingerprintTokenFilter fingerprint() {
+        return TaggedUnionUtils.get(this, Kind.Fingerprint);
+    }
+
+    /**
+     * Is this variant instance of kind {@code hunspell}?
+     */
+    public boolean isHunspell() {
+        return _kind == Kind.Hunspell;
+    }
+
+    /**
+     * Get the {@code hunspell} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code hunspell} kind.
+     */
+    public HunspellTokenFilter hunspell() {
+        return TaggedUnionUtils.get(this, Kind.Hunspell);
+    }
+
+    /**
+     * Is this variant instance of kind {@code hyphenation_decompounder}?
+     */
+    public boolean isHyphenationDecompounder() {
+        return _kind == Kind.HyphenationDecompounder;
+    }
+
+    /**
+     * Get the {@code hyphenation_decompounder} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the
+     *             {@code hyphenation_decompounder} kind.
+     */
+    public HyphenationDecompounderTokenFilter hyphenationDecompounder() {
+        return TaggedUnionUtils.get(this, Kind.HyphenationDecompounder);
+    }
+
+    /**
+     * Is this variant instance of kind {@code icu_collation}?
+     */
+    public boolean isIcuCollation() {
+        return _kind == Kind.IcuCollation;
+    }
+
+    /**
+     * Get the {@code icu_collation} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code icu_collation} kind.
+     */
+    public IcuCollationTokenFilter icuCollation() {
+        return TaggedUnionUtils.get(this, Kind.IcuCollation);
+    }
+
+    /**
+     * Is this variant instance of kind {@code icu_folding}?
+     */
+    public boolean isIcuFolding() {
+        return _kind == Kind.IcuFolding;
+    }
+
+    /**
+     * Get the {@code icu_folding} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code icu_folding} kind.
+     */
+    public IcuFoldingTokenFilter icuFolding() {
+        return TaggedUnionUtils.get(this, Kind.IcuFolding);
+    }
+
+    /**
+     * Is this variant instance of kind {@code icu_normalizer}?
+     */
+    public boolean isIcuNormalizer() {
+        return _kind == Kind.IcuNormalizer;
+    }
+
+    /**
+     * Get the {@code icu_normalizer} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code icu_normalizer} kind.
+     */
+    public IcuNormalizationTokenFilter icuNormalizer() {
+        return TaggedUnionUtils.get(this, Kind.IcuNormalizer);
+    }
+
+    /**
+     * Is this variant instance of kind {@code icu_tokenizer}?
+     */
+    public boolean isIcuTokenizer() {
+        return _kind == Kind.IcuTokenizer;
+    }
+
+    /**
+     * Get the {@code icu_tokenizer} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code icu_tokenizer} kind.
+     */
+    public IcuTokenizer icuTokenizer() {
+        return TaggedUnionUtils.get(this, Kind.IcuTokenizer);
+    }
+
+    /**
+     * Is this variant instance of kind {@code icu_transform}?
+     */
+    public boolean isIcuTransform() {
+        return _kind == Kind.IcuTransform;
+    }
+
+    /**
+     * Get the {@code icu_transform} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code icu_transform} kind.
+     */
+    public IcuTransformTokenFilter icuTransform() {
+        return TaggedUnionUtils.get(this, Kind.IcuTransform);
+    }
+
+    /**
+     * Is this variant instance of kind {@code kstem}?
+     */
+    public boolean isKstem() {
+        return _kind == Kind.Kstem;
+    }
+
+    /**
+     * Get the {@code kstem} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code kstem} kind.
+     */
+    public KStemTokenFilter kstem() {
+        return TaggedUnionUtils.get(this, Kind.Kstem);
+    }
+
+    /**
+     * Is this variant instance of kind {@code keep_types}?
+     */
+    public boolean isKeepTypes() {
+        return _kind == Kind.KeepTypes;
+    }
+
+    /**
+     * Get the {@code keep_types} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code keep_types} kind.
+     */
+    public KeepTypesTokenFilter keepTypes() {
+        return TaggedUnionUtils.get(this, Kind.KeepTypes);
+    }
+
+    /**
+     * Is this variant instance of kind {@code keep}?
+     */
+    public boolean isKeep() {
+        return _kind == Kind.Keep;
+    }
+
+    /**
+     * Get the {@code keep} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code keep} kind.
+     */
+    public KeepWordsTokenFilter keep() {
+        return TaggedUnionUtils.get(this, Kind.Keep);
+    }
+
+    /**
+     * Is this variant instance of kind {@code keyword_marker}?
+     */
+    public boolean isKeywordMarker() {
+        return _kind == Kind.KeywordMarker;
+    }
+
+    /**
+     * Get the {@code keyword_marker} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code keyword_marker} kind.
+     */
+    public KeywordMarkerTokenFilter keywordMarker() {
+        return TaggedUnionUtils.get(this, Kind.KeywordMarker);
+    }
+
+    /**
+     * Is this variant instance of kind {@code kuromoji_part_of_speech}?
+     */
+    public boolean isKuromojiPartOfSpeech() {
+        return _kind == Kind.KuromojiPartOfSpeech;
+    }
+
+    /**
+     * Get the {@code kuromoji_part_of_speech} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the
+     *             {@code kuromoji_part_of_speech} kind.
+     */
+    public KuromojiPartOfSpeechTokenFilter kuromojiPartOfSpeech() {
+        return TaggedUnionUtils.get(this, Kind.KuromojiPartOfSpeech);
+    }
+
+    /**
+     * Is this variant instance of kind {@code kuromoji_readingform}?
+     */
+    public boolean isKuromojiReadingform() {
+        return _kind == Kind.KuromojiReadingform;
+    }
+
+    /**
+     * Get the {@code kuromoji_readingform} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code kuromoji_readingform}
+     *             kind.
+     */
+    public KuromojiReadingFormTokenFilter kuromojiReadingform() {
+        return TaggedUnionUtils.get(this, Kind.KuromojiReadingform);
+    }
+
+    /**
+     * Is this variant instance of kind {@code kuromoji_stemmer}?
+     */
+    public boolean isKuromojiStemmer() {
+        return _kind == Kind.KuromojiStemmer;
+    }
+
+    /**
+     * Get the {@code kuromoji_stemmer} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code kuromoji_stemmer}
+     *             kind.
+     */
+    public KuromojiStemmerTokenFilter kuromojiStemmer() {
+        return TaggedUnionUtils.get(this, Kind.KuromojiStemmer);
+    }
+
+    /**
+     * Is this variant instance of kind {@code length}?
+     */
+    public boolean isLength() {
+        return _kind == Kind.Length;
+    }
+
+    /**
+     * Get the {@code length} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code length} kind.
+     */
+    public LengthTokenFilter length() {
+        return TaggedUnionUtils.get(this, Kind.Length);
+    }
+
+    /**
+     * Is this variant instance of kind {@code limit}?
+     */
+    public boolean isLimit() {
+        return _kind == Kind.Limit;
+    }
+
+    /**
+     * Get the {@code limit} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code limit} kind.
+     */
+    public LimitTokenCountTokenFilter limit() {
+        return TaggedUnionUtils.get(this, Kind.Limit);
+    }
+
+    /**
+     * Is this variant instance of kind {@code lowercase}?
+     */
+    public boolean isLowercase() {
+        return _kind == Kind.Lowercase;
+    }
+
+    /**
+     * Get the {@code lowercase} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code lowercase} kind.
+     */
+    public LowercaseTokenFilter lowercase() {
+        return TaggedUnionUtils.get(this, Kind.Lowercase);
+    }
+
+    /**
+     * Is this variant instance of kind {@code multiplexer}?
+     */
+    public boolean isMultiplexer() {
+        return _kind == Kind.Multiplexer;
+    }
+
+    /**
+     * Get the {@code multiplexer} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code multiplexer} kind.
+     */
+    public MultiplexerTokenFilter multiplexer() {
+        return TaggedUnionUtils.get(this, Kind.Multiplexer);
+    }
+
+    /**
+     * Is this variant instance of kind {@code ngram}?
+     */
+    public boolean isNgram() {
+        return _kind == Kind.Ngram;
+    }
+
+    /**
+     * Get the {@code ngram} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code ngram} kind.
+     */
+    public NGramTokenFilter ngram() {
+        return TaggedUnionUtils.get(this, Kind.Ngram);
+    }
+
+    /**
+     * Is this variant instance of kind {@code nori_part_of_speech}?
+     */
+    public boolean isNoriPartOfSpeech() {
+        return _kind == Kind.NoriPartOfSpeech;
+    }
+
+    /**
+     * Get the {@code nori_part_of_speech} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code nori_part_of_speech}
+     *             kind.
+     */
+    public NoriPartOfSpeechTokenFilter noriPartOfSpeech() {
+        return TaggedUnionUtils.get(this, Kind.NoriPartOfSpeech);
+    }
+
+    /**
+     * Is this variant instance of kind {@code pattern_capture}?
+     */
+    public boolean isPatternCapture() {
+        return _kind == Kind.PatternCapture;
+    }
+
+    /**
+     * Get the {@code pattern_capture} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code pattern_capture}
+     *             kind.
+     */
+    public PatternCaptureTokenFilter patternCapture() {
+        return TaggedUnionUtils.get(this, Kind.PatternCapture);
+    }
+
+    /**
+     * Is this variant instance of kind {@code pattern_replace}?
+     */
+    public boolean isPatternReplace() {
+        return _kind == Kind.PatternReplace;
+    }
+
+    /**
+     * Get the {@code pattern_replace} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code pattern_replace}
+     *             kind.
+     */
+    public PatternReplaceTokenFilter patternReplace() {
+        return TaggedUnionUtils.get(this, Kind.PatternReplace);
+    }
+
+    /**
+     * Is this variant instance of kind {@code phonetic}?
+     */
+    public boolean isPhonetic() {
+        return _kind == Kind.Phonetic;
+    }
+
+    /**
+     * Get the {@code phonetic} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code phonetic} kind.
+     */
+    public PhoneticTokenFilter phonetic() {
+        return TaggedUnionUtils.get(this, Kind.Phonetic);
+    }
+
+    /**
+     * Is this variant instance of kind {@code porter_stem}?
+     */
+    public boolean isPorterStem() {
+        return _kind == Kind.PorterStem;
+    }
+
+    /**
+     * Get the {@code porter_stem} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code porter_stem} kind.
+     */
+    public PorterStemTokenFilter porterStem() {
+        return TaggedUnionUtils.get(this, Kind.PorterStem);
+    }
+
+    /**
+     * Is this variant instance of kind {@code predicate_token_filter}?
+     */
+    public boolean isPredicateTokenFilter() {
+        return _kind == Kind.PredicateTokenFilter;
+    }
+
+    /**
+     * Get the {@code predicate_token_filter} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the
+     *             {@code predicate_token_filter} kind.
+     */
+    public PredicateTokenFilter predicateTokenFilter() {
+        return TaggedUnionUtils.get(this, Kind.PredicateTokenFilter);
+    }
+
+    /**
+     * Is this variant instance of kind {@code remove_duplicates}?
+     */
+    public boolean isRemoveDuplicates() {
+        return _kind == Kind.RemoveDuplicates;
+    }
+
+    /**
+     * Get the {@code remove_duplicates} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code remove_duplicates}
+     *             kind.
+     */
+    public RemoveDuplicatesTokenFilter removeDuplicates() {
+        return TaggedUnionUtils.get(this, Kind.RemoveDuplicates);
+    }
+
+    /**
+     * Is this variant instance of kind {@code reverse}?
+     */
+    public boolean isReverse() {
+        return _kind == Kind.Reverse;
+    }
+
+    /**
+     * Get the {@code reverse} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code reverse} kind.
+     */
+    public ReverseTokenFilter reverse() {
+        return TaggedUnionUtils.get(this, Kind.Reverse);
+    }
+
+    /**
+     * Is this variant instance of kind {@code shingle}?
+     */
+    public boolean isShingle() {
+        return _kind == Kind.Shingle;
+    }
+
+    /**
+     * Get the {@code shingle} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code shingle} kind.
+     */
+    public ShingleTokenFilter shingle() {
+        return TaggedUnionUtils.get(this, Kind.Shingle);
+    }
+
+    /**
+     * Is this variant instance of kind {@code snowball}?
+     */
+    public boolean isSnowball() {
+        return _kind == Kind.Snowball;
+    }
+
+    /**
+     * Get the {@code snowball} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code snowball} kind.
+     */
+    public SnowballTokenFilter snowball() {
+        return TaggedUnionUtils.get(this, Kind.Snowball);
+    }
+
+    /**
+     * Is this variant instance of kind {@code stemmer_override}?
+     */
+    public boolean isStemmerOverride() {
+        return _kind == Kind.StemmerOverride;
+    }
+
+    /**
+     * Get the {@code stemmer_override} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code stemmer_override}
+     *             kind.
+     */
+    public StemmerOverrideTokenFilter stemmerOverride() {
+        return TaggedUnionUtils.get(this, Kind.StemmerOverride);
+    }
+
+    /**
+     * Is this variant instance of kind {@code stemmer}?
+     */
+    public boolean isStemmer() {
+        return _kind == Kind.Stemmer;
+    }
+
+    /**
+     * Get the {@code stemmer} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code stemmer} kind.
+     */
+    public StemmerTokenFilter stemmer() {
+        return TaggedUnionUtils.get(this, Kind.Stemmer);
+    }
+
+    /**
+     * Is this variant instance of kind {@code stop}?
+     */
+    public boolean isStop() {
+        return _kind == Kind.Stop;
+    }
+
+    /**
+     * Get the {@code stop} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code stop} kind.
+     */
+    public StopTokenFilter stop() {
+        return TaggedUnionUtils.get(this, Kind.Stop);
+    }
+
+    /**
+     * Is this variant instance of kind {@code synonym_graph}?
+     */
+    public boolean isSynonymGraph() {
+        return _kind == Kind.SynonymGraph;
+    }
+
+    /**
+     * Get the {@code synonym_graph} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code synonym_graph} kind.
+     */
+    public SynonymGraphTokenFilter synonymGraph() {
+        return TaggedUnionUtils.get(this, Kind.SynonymGraph);
+    }
+
+    /**
+     * Is this variant instance of kind {@code synonym}?
+     */
+    public boolean isSynonym() {
+        return _kind == Kind.Synonym;
+    }
+
+    /**
+     * Get the {@code synonym} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code synonym} kind.
+     */
+    public SynonymTokenFilter synonym() {
+        return TaggedUnionUtils.get(this, Kind.Synonym);
+    }
+
+    /**
+     * Is this variant instance of kind {@code trim}?
+     */
+    public boolean isTrim() {
+        return _kind == Kind.Trim;
+    }
+
+    /**
+     * Get the {@code trim} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code trim} kind.
+     */
+    public TrimTokenFilter trim() {
+        return TaggedUnionUtils.get(this, Kind.Trim);
+    }
+
+    /**
+     * Is this variant instance of kind {@code truncate}?
+     */
+    public boolean isTruncate() {
+        return _kind == Kind.Truncate;
+    }
+
+    /**
+     * Get the {@code truncate} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code truncate} kind.
+     */
+    public TruncateTokenFilter truncate() {
+        return TaggedUnionUtils.get(this, Kind.Truncate);
+    }
+
+    /**
+     * Is this variant instance of kind {@code unique}?
+     */
+    public boolean isUnique() {
+        return _kind == Kind.Unique;
+    }
+
+    /**
+     * Get the {@code unique} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code unique} kind.
+     */
+    public UniqueTokenFilter unique() {
+        return TaggedUnionUtils.get(this, Kind.Unique);
+    }
+
+    /**
+     * Is this variant instance of kind {@code uppercase}?
+     */
+    public boolean isUppercase() {
+        return _kind == Kind.Uppercase;
+    }
+
+    /**
+     * Get the {@code uppercase} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code uppercase} kind.
+     */
+    public UppercaseTokenFilter uppercase() {
+        return TaggedUnionUtils.get(this, Kind.Uppercase);
+    }
+
+    /**
+     * Is this variant instance of kind {@code word_delimiter_graph}?
+     */
+    public boolean isWordDelimiterGraph() {
+        return _kind == Kind.WordDelimiterGraph;
+    }
+
+    /**
+     * Get the {@code word_delimiter_graph} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code word_delimiter_graph}
+     *             kind.
+     */
+    public WordDelimiterGraphTokenFilter wordDelimiterGraph() {
+        return TaggedUnionUtils.get(this, Kind.WordDelimiterGraph);
+    }
+
+    /**
+     * Is this variant instance of kind {@code word_delimiter}?
+     */
+    public boolean isWordDelimiter() {
+        return _kind == Kind.WordDelimiter;
+    }
+
+    /**
+     * Get the {@code word_delimiter} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code word_delimiter} kind.
+     */
+    public WordDelimiterTokenFilter wordDelimiter() {
+        return TaggedUnionUtils.get(this, Kind.WordDelimiter);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        mapper.serialize(_value, generator);
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TokenFilterDefinition> {
+        private Kind _kind;
+        private TokenFilterDefinitionVariant _value;
+
+        public ObjectBuilder<TokenFilterDefinition> asciifolding(AsciiFoldingTokenFilter v) {
+            this._kind = Kind.Asciifolding;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> asciifolding(
+            Function<AsciiFoldingTokenFilter.Builder, ObjectBuilder<AsciiFoldingTokenFilter>> fn
+        ) {
+            return this.asciifolding(fn.apply(new AsciiFoldingTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> commonGrams(CommonGramsTokenFilter v) {
+            this._kind = Kind.CommonGrams;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> commonGrams(
+            Function<CommonGramsTokenFilter.Builder, ObjectBuilder<CommonGramsTokenFilter>> fn
+        ) {
+            return this.commonGrams(fn.apply(new CommonGramsTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> condition(ConditionTokenFilter v) {
+            this._kind = Kind.Condition;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> condition(
+            Function<ConditionTokenFilter.Builder, ObjectBuilder<ConditionTokenFilter>> fn
+        ) {
+            return this.condition(fn.apply(new ConditionTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> delimitedPayload(DelimitedPayloadTokenFilter v) {
+            this._kind = Kind.DelimitedPayload;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> delimitedPayload(
+            Function<DelimitedPayloadTokenFilter.Builder, ObjectBuilder<DelimitedPayloadTokenFilter>> fn
+        ) {
+            return this.delimitedPayload(fn.apply(new DelimitedPayloadTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> dictionaryDecompounder(DictionaryDecompounderTokenFilter v) {
+            this._kind = Kind.DictionaryDecompounder;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> dictionaryDecompounder(
+            Function<DictionaryDecompounderTokenFilter.Builder, ObjectBuilder<DictionaryDecompounderTokenFilter>> fn
+        ) {
+            return this.dictionaryDecompounder(fn.apply(new DictionaryDecompounderTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> edgeNgram(EdgeNGramTokenFilter v) {
+            this._kind = Kind.EdgeNgram;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> edgeNgram(
+            Function<EdgeNGramTokenFilter.Builder, ObjectBuilder<EdgeNGramTokenFilter>> fn
+        ) {
+            return this.edgeNgram(fn.apply(new EdgeNGramTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> elision(ElisionTokenFilter v) {
+            this._kind = Kind.Elision;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> elision(Function<ElisionTokenFilter.Builder, ObjectBuilder<ElisionTokenFilter>> fn) {
+            return this.elision(fn.apply(new ElisionTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> fingerprint(FingerprintTokenFilter v) {
+            this._kind = Kind.Fingerprint;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> fingerprint(
+            Function<FingerprintTokenFilter.Builder, ObjectBuilder<FingerprintTokenFilter>> fn
+        ) {
+            return this.fingerprint(fn.apply(new FingerprintTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> hunspell(HunspellTokenFilter v) {
+            this._kind = Kind.Hunspell;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> hunspell(Function<HunspellTokenFilter.Builder, ObjectBuilder<HunspellTokenFilter>> fn) {
+            return this.hunspell(fn.apply(new HunspellTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> hyphenationDecompounder(HyphenationDecompounderTokenFilter v) {
+            this._kind = Kind.HyphenationDecompounder;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> hyphenationDecompounder(
+            Function<HyphenationDecompounderTokenFilter.Builder, ObjectBuilder<HyphenationDecompounderTokenFilter>> fn
+        ) {
+            return this.hyphenationDecompounder(fn.apply(new HyphenationDecompounderTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> icuCollation(IcuCollationTokenFilter v) {
+            this._kind = Kind.IcuCollation;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> icuCollation(
+            Function<IcuCollationTokenFilter.Builder, ObjectBuilder<IcuCollationTokenFilter>> fn
+        ) {
+            return this.icuCollation(fn.apply(new IcuCollationTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> icuFolding(IcuFoldingTokenFilter v) {
+            this._kind = Kind.IcuFolding;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> icuFolding(
+            Function<IcuFoldingTokenFilter.Builder, ObjectBuilder<IcuFoldingTokenFilter>> fn
+        ) {
+            return this.icuFolding(fn.apply(new IcuFoldingTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> icuNormalizer(IcuNormalizationTokenFilter v) {
+            this._kind = Kind.IcuNormalizer;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> icuNormalizer(
+            Function<IcuNormalizationTokenFilter.Builder, ObjectBuilder<IcuNormalizationTokenFilter>> fn
+        ) {
+            return this.icuNormalizer(fn.apply(new IcuNormalizationTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> icuTokenizer(IcuTokenizer v) {
+            this._kind = Kind.IcuTokenizer;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> icuTokenizer(Function<IcuTokenizer.Builder, ObjectBuilder<IcuTokenizer>> fn) {
+            return this.icuTokenizer(fn.apply(new IcuTokenizer.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> icuTransform(IcuTransformTokenFilter v) {
+            this._kind = Kind.IcuTransform;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> icuTransform(
+            Function<IcuTransformTokenFilter.Builder, ObjectBuilder<IcuTransformTokenFilter>> fn
+        ) {
+            return this.icuTransform(fn.apply(new IcuTransformTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> kstem(KStemTokenFilter v) {
+            this._kind = Kind.Kstem;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> kstem(Function<KStemTokenFilter.Builder, ObjectBuilder<KStemTokenFilter>> fn) {
+            return this.kstem(fn.apply(new KStemTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> keepTypes(KeepTypesTokenFilter v) {
+            this._kind = Kind.KeepTypes;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> keepTypes(
+            Function<KeepTypesTokenFilter.Builder, ObjectBuilder<KeepTypesTokenFilter>> fn
+        ) {
+            return this.keepTypes(fn.apply(new KeepTypesTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> keep(KeepWordsTokenFilter v) {
+            this._kind = Kind.Keep;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> keep(Function<KeepWordsTokenFilter.Builder, ObjectBuilder<KeepWordsTokenFilter>> fn) {
+            return this.keep(fn.apply(new KeepWordsTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> keywordMarker(KeywordMarkerTokenFilter v) {
+            this._kind = Kind.KeywordMarker;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> keywordMarker(
+            Function<KeywordMarkerTokenFilter.Builder, ObjectBuilder<KeywordMarkerTokenFilter>> fn
+        ) {
+            return this.keywordMarker(fn.apply(new KeywordMarkerTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> kuromojiPartOfSpeech(KuromojiPartOfSpeechTokenFilter v) {
+            this._kind = Kind.KuromojiPartOfSpeech;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> kuromojiPartOfSpeech(
+            Function<KuromojiPartOfSpeechTokenFilter.Builder, ObjectBuilder<KuromojiPartOfSpeechTokenFilter>> fn
+        ) {
+            return this.kuromojiPartOfSpeech(fn.apply(new KuromojiPartOfSpeechTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> kuromojiReadingform(KuromojiReadingFormTokenFilter v) {
+            this._kind = Kind.KuromojiReadingform;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> kuromojiReadingform(
+            Function<KuromojiReadingFormTokenFilter.Builder, ObjectBuilder<KuromojiReadingFormTokenFilter>> fn
+        ) {
+            return this.kuromojiReadingform(fn.apply(new KuromojiReadingFormTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> kuromojiStemmer(KuromojiStemmerTokenFilter v) {
+            this._kind = Kind.KuromojiStemmer;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> kuromojiStemmer(
+            Function<KuromojiStemmerTokenFilter.Builder, ObjectBuilder<KuromojiStemmerTokenFilter>> fn
+        ) {
+            return this.kuromojiStemmer(fn.apply(new KuromojiStemmerTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> length(LengthTokenFilter v) {
+            this._kind = Kind.Length;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> length(Function<LengthTokenFilter.Builder, ObjectBuilder<LengthTokenFilter>> fn) {
+            return this.length(fn.apply(new LengthTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> limit(LimitTokenCountTokenFilter v) {
+            this._kind = Kind.Limit;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> limit(
+            Function<LimitTokenCountTokenFilter.Builder, ObjectBuilder<LimitTokenCountTokenFilter>> fn
+        ) {
+            return this.limit(fn.apply(new LimitTokenCountTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> lowercase(LowercaseTokenFilter v) {
+            this._kind = Kind.Lowercase;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> lowercase(
+            Function<LowercaseTokenFilter.Builder, ObjectBuilder<LowercaseTokenFilter>> fn
+        ) {
+            return this.lowercase(fn.apply(new LowercaseTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> multiplexer(MultiplexerTokenFilter v) {
+            this._kind = Kind.Multiplexer;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> multiplexer(
+            Function<MultiplexerTokenFilter.Builder, ObjectBuilder<MultiplexerTokenFilter>> fn
+        ) {
+            return this.multiplexer(fn.apply(new MultiplexerTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> ngram(NGramTokenFilter v) {
+            this._kind = Kind.Ngram;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> ngram(Function<NGramTokenFilter.Builder, ObjectBuilder<NGramTokenFilter>> fn) {
+            return this.ngram(fn.apply(new NGramTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> noriPartOfSpeech(NoriPartOfSpeechTokenFilter v) {
+            this._kind = Kind.NoriPartOfSpeech;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> noriPartOfSpeech(
+            Function<NoriPartOfSpeechTokenFilter.Builder, ObjectBuilder<NoriPartOfSpeechTokenFilter>> fn
+        ) {
+            return this.noriPartOfSpeech(fn.apply(new NoriPartOfSpeechTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> patternCapture(PatternCaptureTokenFilter v) {
+            this._kind = Kind.PatternCapture;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> patternCapture(
+            Function<PatternCaptureTokenFilter.Builder, ObjectBuilder<PatternCaptureTokenFilter>> fn
+        ) {
+            return this.patternCapture(fn.apply(new PatternCaptureTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> patternReplace(PatternReplaceTokenFilter v) {
+            this._kind = Kind.PatternReplace;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> patternReplace(
+            Function<PatternReplaceTokenFilter.Builder, ObjectBuilder<PatternReplaceTokenFilter>> fn
+        ) {
+            return this.patternReplace(fn.apply(new PatternReplaceTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> phonetic(PhoneticTokenFilter v) {
+            this._kind = Kind.Phonetic;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> phonetic(Function<PhoneticTokenFilter.Builder, ObjectBuilder<PhoneticTokenFilter>> fn) {
+            return this.phonetic(fn.apply(new PhoneticTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> porterStem(PorterStemTokenFilter v) {
+            this._kind = Kind.PorterStem;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> porterStem(
+            Function<PorterStemTokenFilter.Builder, ObjectBuilder<PorterStemTokenFilter>> fn
+        ) {
+            return this.porterStem(fn.apply(new PorterStemTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> predicateTokenFilter(PredicateTokenFilter v) {
+            this._kind = Kind.PredicateTokenFilter;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> predicateTokenFilter(
+            Function<PredicateTokenFilter.Builder, ObjectBuilder<PredicateTokenFilter>> fn
+        ) {
+            return this.predicateTokenFilter(fn.apply(new PredicateTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> removeDuplicates(RemoveDuplicatesTokenFilter v) {
+            this._kind = Kind.RemoveDuplicates;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> removeDuplicates(
+            Function<RemoveDuplicatesTokenFilter.Builder, ObjectBuilder<RemoveDuplicatesTokenFilter>> fn
+        ) {
+            return this.removeDuplicates(fn.apply(new RemoveDuplicatesTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> reverse(ReverseTokenFilter v) {
+            this._kind = Kind.Reverse;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> reverse(Function<ReverseTokenFilter.Builder, ObjectBuilder<ReverseTokenFilter>> fn) {
+            return this.reverse(fn.apply(new ReverseTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> shingle(ShingleTokenFilter v) {
+            this._kind = Kind.Shingle;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> shingle(Function<ShingleTokenFilter.Builder, ObjectBuilder<ShingleTokenFilter>> fn) {
+            return this.shingle(fn.apply(new ShingleTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> snowball(SnowballTokenFilter v) {
+            this._kind = Kind.Snowball;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> snowball(Function<SnowballTokenFilter.Builder, ObjectBuilder<SnowballTokenFilter>> fn) {
+            return this.snowball(fn.apply(new SnowballTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> stemmerOverride(StemmerOverrideTokenFilter v) {
+            this._kind = Kind.StemmerOverride;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> stemmerOverride(
+            Function<StemmerOverrideTokenFilter.Builder, ObjectBuilder<StemmerOverrideTokenFilter>> fn
+        ) {
+            return this.stemmerOverride(fn.apply(new StemmerOverrideTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> stemmer(StemmerTokenFilter v) {
+            this._kind = Kind.Stemmer;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> stemmer(Function<StemmerTokenFilter.Builder, ObjectBuilder<StemmerTokenFilter>> fn) {
+            return this.stemmer(fn.apply(new StemmerTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> stop(StopTokenFilter v) {
+            this._kind = Kind.Stop;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> stop(Function<StopTokenFilter.Builder, ObjectBuilder<StopTokenFilter>> fn) {
+            return this.stop(fn.apply(new StopTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> synonymGraph(SynonymGraphTokenFilter v) {
+            this._kind = Kind.SynonymGraph;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> synonymGraph(
+            Function<SynonymGraphTokenFilter.Builder, ObjectBuilder<SynonymGraphTokenFilter>> fn
+        ) {
+            return this.synonymGraph(fn.apply(new SynonymGraphTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> synonym(SynonymTokenFilter v) {
+            this._kind = Kind.Synonym;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> synonym(Function<SynonymTokenFilter.Builder, ObjectBuilder<SynonymTokenFilter>> fn) {
+            return this.synonym(fn.apply(new SynonymTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> trim(TrimTokenFilter v) {
+            this._kind = Kind.Trim;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> trim(Function<TrimTokenFilter.Builder, ObjectBuilder<TrimTokenFilter>> fn) {
+            return this.trim(fn.apply(new TrimTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> truncate(TruncateTokenFilter v) {
+            this._kind = Kind.Truncate;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> truncate(Function<TruncateTokenFilter.Builder, ObjectBuilder<TruncateTokenFilter>> fn) {
+            return this.truncate(fn.apply(new TruncateTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> unique(UniqueTokenFilter v) {
+            this._kind = Kind.Unique;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> unique(Function<UniqueTokenFilter.Builder, ObjectBuilder<UniqueTokenFilter>> fn) {
+            return this.unique(fn.apply(new UniqueTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> uppercase(UppercaseTokenFilter v) {
+            this._kind = Kind.Uppercase;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> uppercase(
+            Function<UppercaseTokenFilter.Builder, ObjectBuilder<UppercaseTokenFilter>> fn
+        ) {
+            return this.uppercase(fn.apply(new UppercaseTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> wordDelimiterGraph(WordDelimiterGraphTokenFilter v) {
+            this._kind = Kind.WordDelimiterGraph;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> wordDelimiterGraph(
+            Function<WordDelimiterGraphTokenFilter.Builder, ObjectBuilder<WordDelimiterGraphTokenFilter>> fn
+        ) {
+            return this.wordDelimiterGraph(fn.apply(new WordDelimiterGraphTokenFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> wordDelimiter(WordDelimiterTokenFilter v) {
+            this._kind = Kind.WordDelimiter;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenFilterDefinition> wordDelimiter(
+            Function<WordDelimiterTokenFilter.Builder, ObjectBuilder<WordDelimiterTokenFilter>> fn
+        ) {
+            return this.wordDelimiter(fn.apply(new WordDelimiterTokenFilter.Builder()).build());
+        }
 
         public ObjectBuilder<TokenFilterDefinition> smartcn_stop(SmartcnStopTokenFilter v) {
             this._kind = Kind.IcuTokenizer;
@@ -1584,75 +1592,77 @@ public ObjectBuilder<TokenFilterDefinition> smartcn_stop(SmartcnStopTokenFilter
         }
 
         public ObjectBuilder<TokenFilterDefinition> smartcn_stop(
-            Function<SmartcnStopTokenFilter.Builder, ObjectBuilder<SmartcnStopTokenFilter>> fn) {
+            Function<SmartcnStopTokenFilter.Builder, ObjectBuilder<SmartcnStopTokenFilter>> fn
+        ) {
             return this.smartcn_stop(fn.apply(new SmartcnStopTokenFilter.Builder()).build());
         }
 
         public TokenFilterDefinition build() {
-			_checkSingleUse();
-			return new TokenFilterDefinition(this);
-		}
-
-	}
-
-	protected static void setupTokenFilterDefinitionDeserializer(ObjectDeserializer<Builder> op) {
-
-		op.add(Builder::asciifolding, AsciiFoldingTokenFilter._DESERIALIZER, "asciifolding");
-		op.add(Builder::commonGrams, CommonGramsTokenFilter._DESERIALIZER, "common_grams");
-		op.add(Builder::condition, ConditionTokenFilter._DESERIALIZER, "condition");
-		op.add(Builder::delimitedPayload, DelimitedPayloadTokenFilter._DESERIALIZER, "delimited_payload");
-		op.add(Builder::dictionaryDecompounder, DictionaryDecompounderTokenFilter._DESERIALIZER,
-				"dictionary_decompounder");
-		op.add(Builder::edgeNgram, EdgeNGramTokenFilter._DESERIALIZER, "edge_ngram");
-		op.add(Builder::elision, ElisionTokenFilter._DESERIALIZER, "elision");
-		op.add(Builder::fingerprint, FingerprintTokenFilter._DESERIALIZER, "fingerprint");
-		op.add(Builder::hunspell, HunspellTokenFilter._DESERIALIZER, "hunspell");
-		op.add(Builder::hyphenationDecompounder, HyphenationDecompounderTokenFilter._DESERIALIZER,
-				"hyphenation_decompounder");
-		op.add(Builder::icuCollation, IcuCollationTokenFilter._DESERIALIZER, "icu_collation");
-		op.add(Builder::icuFolding, IcuFoldingTokenFilter._DESERIALIZER, "icu_folding");
-		op.add(Builder::icuNormalizer, IcuNormalizationTokenFilter._DESERIALIZER, "icu_normalizer");
-		op.add(Builder::icuTokenizer, IcuTokenizer._DESERIALIZER, "icu_tokenizer");
-		op.add(Builder::icuTransform, IcuTransformTokenFilter._DESERIALIZER, "icu_transform");
-		op.add(Builder::kstem, KStemTokenFilter._DESERIALIZER, "kstem");
-		op.add(Builder::keepTypes, KeepTypesTokenFilter._DESERIALIZER, "keep_types");
-		op.add(Builder::keep, KeepWordsTokenFilter._DESERIALIZER, "keep");
-		op.add(Builder::keywordMarker, KeywordMarkerTokenFilter._DESERIALIZER, "keyword_marker");
-		op.add(Builder::kuromojiPartOfSpeech, KuromojiPartOfSpeechTokenFilter._DESERIALIZER, "kuromoji_part_of_speech");
-		op.add(Builder::kuromojiReadingform, KuromojiReadingFormTokenFilter._DESERIALIZER, "kuromoji_readingform");
-		op.add(Builder::kuromojiStemmer, KuromojiStemmerTokenFilter._DESERIALIZER, "kuromoji_stemmer");
-		op.add(Builder::length, LengthTokenFilter._DESERIALIZER, "length");
-		op.add(Builder::limit, LimitTokenCountTokenFilter._DESERIALIZER, "limit");
-		op.add(Builder::lowercase, LowercaseTokenFilter._DESERIALIZER, "lowercase");
-		op.add(Builder::multiplexer, MultiplexerTokenFilter._DESERIALIZER, "multiplexer");
-		op.add(Builder::ngram, NGramTokenFilter._DESERIALIZER, "ngram");
-		op.add(Builder::noriPartOfSpeech, NoriPartOfSpeechTokenFilter._DESERIALIZER, "nori_part_of_speech");
-		op.add(Builder::patternCapture, PatternCaptureTokenFilter._DESERIALIZER, "pattern_capture");
-		op.add(Builder::patternReplace, PatternReplaceTokenFilter._DESERIALIZER, "pattern_replace");
-		op.add(Builder::phonetic, PhoneticTokenFilter._DESERIALIZER, "phonetic");
-		op.add(Builder::porterStem, PorterStemTokenFilter._DESERIALIZER, "porter_stem");
-		op.add(Builder::predicateTokenFilter, PredicateTokenFilter._DESERIALIZER, "predicate_token_filter");
-		op.add(Builder::removeDuplicates, RemoveDuplicatesTokenFilter._DESERIALIZER, "remove_duplicates");
-		op.add(Builder::reverse, ReverseTokenFilter._DESERIALIZER, "reverse");
-		op.add(Builder::shingle, ShingleTokenFilter._DESERIALIZER, "shingle");
-		op.add(Builder::snowball, SnowballTokenFilter._DESERIALIZER, "snowball");
-		op.add(Builder::stemmerOverride, StemmerOverrideTokenFilter._DESERIALIZER, "stemmer_override");
-		op.add(Builder::stemmer, StemmerTokenFilter._DESERIALIZER, "stemmer");
-		op.add(Builder::stop, StopTokenFilter._DESERIALIZER, "stop");
-		op.add(Builder::synonymGraph, SynonymGraphTokenFilter._DESERIALIZER, "synonym_graph");
-		op.add(Builder::synonym, SynonymTokenFilter._DESERIALIZER, "synonym");
-		op.add(Builder::trim, TrimTokenFilter._DESERIALIZER, "trim");
-		op.add(Builder::truncate, TruncateTokenFilter._DESERIALIZER, "truncate");
-		op.add(Builder::unique, UniqueTokenFilter._DESERIALIZER, "unique");
-		op.add(Builder::uppercase, UppercaseTokenFilter._DESERIALIZER, "uppercase");
-		op.add(Builder::wordDelimiterGraph, WordDelimiterGraphTokenFilter._DESERIALIZER, "word_delimiter_graph");
-		op.add(Builder::wordDelimiter, WordDelimiterTokenFilter._DESERIALIZER, "word_delimiter");
-		op.add(Builder::smartcn_stop, SmartcnStopTokenFilter._DESERIALIZER, Kind.SmartcnStop.jsonValue());
-
-		op.setTypeProperty("type", null);
-
-	}
-
-	public static final JsonpDeserializer<TokenFilterDefinition> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, TokenFilterDefinition::setupTokenFilterDefinitionDeserializer, Builder::build);
+            _checkSingleUse();
+            return new TokenFilterDefinition(this);
+        }
+
+    }
+
+    protected static void setupTokenFilterDefinitionDeserializer(ObjectDeserializer<Builder> op) {
+
+        op.add(Builder::asciifolding, AsciiFoldingTokenFilter._DESERIALIZER, "asciifolding");
+        op.add(Builder::commonGrams, CommonGramsTokenFilter._DESERIALIZER, "common_grams");
+        op.add(Builder::condition, ConditionTokenFilter._DESERIALIZER, "condition");
+        op.add(Builder::delimitedPayload, DelimitedPayloadTokenFilter._DESERIALIZER, "delimited_payload");
+        op.add(Builder::dictionaryDecompounder, DictionaryDecompounderTokenFilter._DESERIALIZER, "dictionary_decompounder");
+        op.add(Builder::edgeNgram, EdgeNGramTokenFilter._DESERIALIZER, "edge_ngram");
+        op.add(Builder::elision, ElisionTokenFilter._DESERIALIZER, "elision");
+        op.add(Builder::fingerprint, FingerprintTokenFilter._DESERIALIZER, "fingerprint");
+        op.add(Builder::hunspell, HunspellTokenFilter._DESERIALIZER, "hunspell");
+        op.add(Builder::hyphenationDecompounder, HyphenationDecompounderTokenFilter._DESERIALIZER, "hyphenation_decompounder");
+        op.add(Builder::icuCollation, IcuCollationTokenFilter._DESERIALIZER, "icu_collation");
+        op.add(Builder::icuFolding, IcuFoldingTokenFilter._DESERIALIZER, "icu_folding");
+        op.add(Builder::icuNormalizer, IcuNormalizationTokenFilter._DESERIALIZER, "icu_normalizer");
+        op.add(Builder::icuTokenizer, IcuTokenizer._DESERIALIZER, "icu_tokenizer");
+        op.add(Builder::icuTransform, IcuTransformTokenFilter._DESERIALIZER, "icu_transform");
+        op.add(Builder::kstem, KStemTokenFilter._DESERIALIZER, "kstem");
+        op.add(Builder::keepTypes, KeepTypesTokenFilter._DESERIALIZER, "keep_types");
+        op.add(Builder::keep, KeepWordsTokenFilter._DESERIALIZER, "keep");
+        op.add(Builder::keywordMarker, KeywordMarkerTokenFilter._DESERIALIZER, "keyword_marker");
+        op.add(Builder::kuromojiPartOfSpeech, KuromojiPartOfSpeechTokenFilter._DESERIALIZER, "kuromoji_part_of_speech");
+        op.add(Builder::kuromojiReadingform, KuromojiReadingFormTokenFilter._DESERIALIZER, "kuromoji_readingform");
+        op.add(Builder::kuromojiStemmer, KuromojiStemmerTokenFilter._DESERIALIZER, "kuromoji_stemmer");
+        op.add(Builder::length, LengthTokenFilter._DESERIALIZER, "length");
+        op.add(Builder::limit, LimitTokenCountTokenFilter._DESERIALIZER, "limit");
+        op.add(Builder::lowercase, LowercaseTokenFilter._DESERIALIZER, "lowercase");
+        op.add(Builder::multiplexer, MultiplexerTokenFilter._DESERIALIZER, "multiplexer");
+        op.add(Builder::ngram, NGramTokenFilter._DESERIALIZER, "ngram");
+        op.add(Builder::noriPartOfSpeech, NoriPartOfSpeechTokenFilter._DESERIALIZER, "nori_part_of_speech");
+        op.add(Builder::patternCapture, PatternCaptureTokenFilter._DESERIALIZER, "pattern_capture");
+        op.add(Builder::patternReplace, PatternReplaceTokenFilter._DESERIALIZER, "pattern_replace");
+        op.add(Builder::phonetic, PhoneticTokenFilter._DESERIALIZER, "phonetic");
+        op.add(Builder::porterStem, PorterStemTokenFilter._DESERIALIZER, "porter_stem");
+        op.add(Builder::predicateTokenFilter, PredicateTokenFilter._DESERIALIZER, "predicate_token_filter");
+        op.add(Builder::removeDuplicates, RemoveDuplicatesTokenFilter._DESERIALIZER, "remove_duplicates");
+        op.add(Builder::reverse, ReverseTokenFilter._DESERIALIZER, "reverse");
+        op.add(Builder::shingle, ShingleTokenFilter._DESERIALIZER, "shingle");
+        op.add(Builder::snowball, SnowballTokenFilter._DESERIALIZER, "snowball");
+        op.add(Builder::stemmerOverride, StemmerOverrideTokenFilter._DESERIALIZER, "stemmer_override");
+        op.add(Builder::stemmer, StemmerTokenFilter._DESERIALIZER, "stemmer");
+        op.add(Builder::stop, StopTokenFilter._DESERIALIZER, "stop");
+        op.add(Builder::synonymGraph, SynonymGraphTokenFilter._DESERIALIZER, "synonym_graph");
+        op.add(Builder::synonym, SynonymTokenFilter._DESERIALIZER, "synonym");
+        op.add(Builder::trim, TrimTokenFilter._DESERIALIZER, "trim");
+        op.add(Builder::truncate, TruncateTokenFilter._DESERIALIZER, "truncate");
+        op.add(Builder::unique, UniqueTokenFilter._DESERIALIZER, "unique");
+        op.add(Builder::uppercase, UppercaseTokenFilter._DESERIALIZER, "uppercase");
+        op.add(Builder::wordDelimiterGraph, WordDelimiterGraphTokenFilter._DESERIALIZER, "word_delimiter_graph");
+        op.add(Builder::wordDelimiter, WordDelimiterTokenFilter._DESERIALIZER, "word_delimiter");
+        op.add(Builder::smartcn_stop, SmartcnStopTokenFilter._DESERIALIZER, Kind.SmartcnStop.jsonValue());
+
+        op.setTypeProperty("type", null);
+
+    }
+
+    public static final JsonpDeserializer<TokenFilterDefinition> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TokenFilterDefinition::setupTokenFilterDefinitionDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionBuilders.java
index 0bf54cab65..0eda693af2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionBuilders.java
@@ -36,391 +36,390 @@
  * Builders for {@link TokenFilterDefinition} variants.
  */
 public class TokenFilterDefinitionBuilders {
-	private TokenFilterDefinitionBuilders() {
-	}
-
-	/**
-	 * Creates a builder for the {@link AsciiFoldingTokenFilter asciifolding}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static AsciiFoldingTokenFilter.Builder asciifolding() {
-		return new AsciiFoldingTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link CommonGramsTokenFilter common_grams}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static CommonGramsTokenFilter.Builder commonGrams() {
-		return new CommonGramsTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ConditionTokenFilter condition}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static ConditionTokenFilter.Builder condition() {
-		return new ConditionTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DelimitedPayloadTokenFilter
-	 * delimited_payload} {@code TokenFilterDefinition} variant.
-	 */
-	public static DelimitedPayloadTokenFilter.Builder delimitedPayload() {
-		return new DelimitedPayloadTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DictionaryDecompounderTokenFilter
-	 * dictionary_decompounder} {@code TokenFilterDefinition} variant.
-	 */
-	public static DictionaryDecompounderTokenFilter.Builder dictionaryDecompounder() {
-		return new DictionaryDecompounderTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link EdgeNGramTokenFilter edge_ngram}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static EdgeNGramTokenFilter.Builder edgeNgram() {
-		return new EdgeNGramTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ElisionTokenFilter elision}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static ElisionTokenFilter.Builder elision() {
-		return new ElisionTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link FingerprintTokenFilter fingerprint}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static FingerprintTokenFilter.Builder fingerprint() {
-		return new FingerprintTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link HunspellTokenFilter hunspell}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static HunspellTokenFilter.Builder hunspell() {
-		return new HunspellTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link HyphenationDecompounderTokenFilter
-	 * hyphenation_decompounder} {@code TokenFilterDefinition} variant.
-	 */
-	public static HyphenationDecompounderTokenFilter.Builder hyphenationDecompounder() {
-		return new HyphenationDecompounderTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link IcuCollationTokenFilter icu_collation}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static IcuCollationTokenFilter.Builder icuCollation() {
-		return new IcuCollationTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link IcuFoldingTokenFilter icu_folding}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static IcuFoldingTokenFilter.Builder icuFolding() {
-		return new IcuFoldingTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link IcuNormalizationTokenFilter icu_normalizer}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static IcuNormalizationTokenFilter.Builder icuNormalizer() {
-		return new IcuNormalizationTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link IcuTokenizer icu_tokenizer}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static IcuTokenizer.Builder icuTokenizer() {
-		return new IcuTokenizer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link IcuTransformTokenFilter icu_transform}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static IcuTransformTokenFilter.Builder icuTransform() {
-		return new IcuTransformTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link KStemTokenFilter kstem}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static KStemTokenFilter.Builder kstem() {
-		return new KStemTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link KeepTypesTokenFilter keep_types}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static KeepTypesTokenFilter.Builder keepTypes() {
-		return new KeepTypesTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link KeepWordsTokenFilter keep}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static KeepWordsTokenFilter.Builder keep() {
-		return new KeepWordsTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link KeywordMarkerTokenFilter keyword_marker}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static KeywordMarkerTokenFilter.Builder keywordMarker() {
-		return new KeywordMarkerTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link KuromojiPartOfSpeechTokenFilter
-	 * kuromoji_part_of_speech} {@code TokenFilterDefinition} variant.
-	 */
-	public static KuromojiPartOfSpeechTokenFilter.Builder kuromojiPartOfSpeech() {
-		return new KuromojiPartOfSpeechTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link KuromojiReadingFormTokenFilter
-	 * kuromoji_readingform} {@code TokenFilterDefinition} variant.
-	 */
-	public static KuromojiReadingFormTokenFilter.Builder kuromojiReadingform() {
-		return new KuromojiReadingFormTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link KuromojiStemmerTokenFilter kuromoji_stemmer}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static KuromojiStemmerTokenFilter.Builder kuromojiStemmer() {
-		return new KuromojiStemmerTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link LengthTokenFilter length}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static LengthTokenFilter.Builder length() {
-		return new LengthTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link LimitTokenCountTokenFilter limit}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static LimitTokenCountTokenFilter.Builder limit() {
-		return new LimitTokenCountTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link LowercaseTokenFilter lowercase}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static LowercaseTokenFilter.Builder lowercase() {
-		return new LowercaseTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MultiplexerTokenFilter multiplexer}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static MultiplexerTokenFilter.Builder multiplexer() {
-		return new MultiplexerTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link NGramTokenFilter ngram}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static NGramTokenFilter.Builder ngram() {
-		return new NGramTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link NoriPartOfSpeechTokenFilter
-	 * nori_part_of_speech} {@code TokenFilterDefinition} variant.
-	 */
-	public static NoriPartOfSpeechTokenFilter.Builder noriPartOfSpeech() {
-		return new NoriPartOfSpeechTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link PatternCaptureTokenFilter pattern_capture}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static PatternCaptureTokenFilter.Builder patternCapture() {
-		return new PatternCaptureTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link PatternReplaceTokenFilter pattern_replace}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static PatternReplaceTokenFilter.Builder patternReplace() {
-		return new PatternReplaceTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link PhoneticTokenFilter phonetic}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static PhoneticTokenFilter.Builder phonetic() {
-		return new PhoneticTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link PorterStemTokenFilter porter_stem}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static PorterStemTokenFilter.Builder porterStem() {
-		return new PorterStemTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link PredicateTokenFilter predicate_token_filter}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static PredicateTokenFilter.Builder predicateTokenFilter() {
-		return new PredicateTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link RemoveDuplicatesTokenFilter
-	 * remove_duplicates} {@code TokenFilterDefinition} variant.
-	 */
-	public static RemoveDuplicatesTokenFilter.Builder removeDuplicates() {
-		return new RemoveDuplicatesTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ReverseTokenFilter reverse}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static ReverseTokenFilter.Builder reverse() {
-		return new ReverseTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ShingleTokenFilter shingle}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static ShingleTokenFilter.Builder shingle() {
-		return new ShingleTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SnowballTokenFilter snowball}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static SnowballTokenFilter.Builder snowball() {
-		return new SnowballTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link StemmerOverrideTokenFilter stemmer_override}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static StemmerOverrideTokenFilter.Builder stemmerOverride() {
-		return new StemmerOverrideTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link StemmerTokenFilter stemmer}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static StemmerTokenFilter.Builder stemmer() {
-		return new StemmerTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link StopTokenFilter stop}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static StopTokenFilter.Builder stop() {
-		return new StopTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SynonymGraphTokenFilter synonym_graph}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static SynonymGraphTokenFilter.Builder synonymGraph() {
-		return new SynonymGraphTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SynonymTokenFilter synonym}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static SynonymTokenFilter.Builder synonym() {
-		return new SynonymTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link TrimTokenFilter trim}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static TrimTokenFilter.Builder trim() {
-		return new TrimTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link TruncateTokenFilter truncate}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static TruncateTokenFilter.Builder truncate() {
-		return new TruncateTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link UniqueTokenFilter unique}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static UniqueTokenFilter.Builder unique() {
-		return new UniqueTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link UppercaseTokenFilter uppercase}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static UppercaseTokenFilter.Builder uppercase() {
-		return new UppercaseTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link WordDelimiterGraphTokenFilter
-	 * word_delimiter_graph} {@code TokenFilterDefinition} variant.
-	 */
-	public static WordDelimiterGraphTokenFilter.Builder wordDelimiterGraph() {
-		return new WordDelimiterGraphTokenFilter.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link WordDelimiterTokenFilter word_delimiter}
-	 * {@code TokenFilterDefinition} variant.
-	 */
-	public static WordDelimiterTokenFilter.Builder wordDelimiter() {
-		return new WordDelimiterTokenFilter.Builder();
-	}
+    private TokenFilterDefinitionBuilders() {}
+
+    /**
+     * Creates a builder for the {@link AsciiFoldingTokenFilter asciifolding}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static AsciiFoldingTokenFilter.Builder asciifolding() {
+        return new AsciiFoldingTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link CommonGramsTokenFilter common_grams}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static CommonGramsTokenFilter.Builder commonGrams() {
+        return new CommonGramsTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ConditionTokenFilter condition}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static ConditionTokenFilter.Builder condition() {
+        return new ConditionTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DelimitedPayloadTokenFilter
+     * delimited_payload} {@code TokenFilterDefinition} variant.
+     */
+    public static DelimitedPayloadTokenFilter.Builder delimitedPayload() {
+        return new DelimitedPayloadTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DictionaryDecompounderTokenFilter
+     * dictionary_decompounder} {@code TokenFilterDefinition} variant.
+     */
+    public static DictionaryDecompounderTokenFilter.Builder dictionaryDecompounder() {
+        return new DictionaryDecompounderTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link EdgeNGramTokenFilter edge_ngram}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static EdgeNGramTokenFilter.Builder edgeNgram() {
+        return new EdgeNGramTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ElisionTokenFilter elision}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static ElisionTokenFilter.Builder elision() {
+        return new ElisionTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link FingerprintTokenFilter fingerprint}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static FingerprintTokenFilter.Builder fingerprint() {
+        return new FingerprintTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link HunspellTokenFilter hunspell}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static HunspellTokenFilter.Builder hunspell() {
+        return new HunspellTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link HyphenationDecompounderTokenFilter
+     * hyphenation_decompounder} {@code TokenFilterDefinition} variant.
+     */
+    public static HyphenationDecompounderTokenFilter.Builder hyphenationDecompounder() {
+        return new HyphenationDecompounderTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link IcuCollationTokenFilter icu_collation}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static IcuCollationTokenFilter.Builder icuCollation() {
+        return new IcuCollationTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link IcuFoldingTokenFilter icu_folding}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static IcuFoldingTokenFilter.Builder icuFolding() {
+        return new IcuFoldingTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link IcuNormalizationTokenFilter icu_normalizer}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static IcuNormalizationTokenFilter.Builder icuNormalizer() {
+        return new IcuNormalizationTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link IcuTokenizer icu_tokenizer}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static IcuTokenizer.Builder icuTokenizer() {
+        return new IcuTokenizer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link IcuTransformTokenFilter icu_transform}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static IcuTransformTokenFilter.Builder icuTransform() {
+        return new IcuTransformTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link KStemTokenFilter kstem}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static KStemTokenFilter.Builder kstem() {
+        return new KStemTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link KeepTypesTokenFilter keep_types}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static KeepTypesTokenFilter.Builder keepTypes() {
+        return new KeepTypesTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link KeepWordsTokenFilter keep}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static KeepWordsTokenFilter.Builder keep() {
+        return new KeepWordsTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link KeywordMarkerTokenFilter keyword_marker}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static KeywordMarkerTokenFilter.Builder keywordMarker() {
+        return new KeywordMarkerTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link KuromojiPartOfSpeechTokenFilter
+     * kuromoji_part_of_speech} {@code TokenFilterDefinition} variant.
+     */
+    public static KuromojiPartOfSpeechTokenFilter.Builder kuromojiPartOfSpeech() {
+        return new KuromojiPartOfSpeechTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link KuromojiReadingFormTokenFilter
+     * kuromoji_readingform} {@code TokenFilterDefinition} variant.
+     */
+    public static KuromojiReadingFormTokenFilter.Builder kuromojiReadingform() {
+        return new KuromojiReadingFormTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link KuromojiStemmerTokenFilter kuromoji_stemmer}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static KuromojiStemmerTokenFilter.Builder kuromojiStemmer() {
+        return new KuromojiStemmerTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link LengthTokenFilter length}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static LengthTokenFilter.Builder length() {
+        return new LengthTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link LimitTokenCountTokenFilter limit}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static LimitTokenCountTokenFilter.Builder limit() {
+        return new LimitTokenCountTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link LowercaseTokenFilter lowercase}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static LowercaseTokenFilter.Builder lowercase() {
+        return new LowercaseTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MultiplexerTokenFilter multiplexer}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static MultiplexerTokenFilter.Builder multiplexer() {
+        return new MultiplexerTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link NGramTokenFilter ngram}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static NGramTokenFilter.Builder ngram() {
+        return new NGramTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link NoriPartOfSpeechTokenFilter
+     * nori_part_of_speech} {@code TokenFilterDefinition} variant.
+     */
+    public static NoriPartOfSpeechTokenFilter.Builder noriPartOfSpeech() {
+        return new NoriPartOfSpeechTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link PatternCaptureTokenFilter pattern_capture}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static PatternCaptureTokenFilter.Builder patternCapture() {
+        return new PatternCaptureTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link PatternReplaceTokenFilter pattern_replace}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static PatternReplaceTokenFilter.Builder patternReplace() {
+        return new PatternReplaceTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link PhoneticTokenFilter phonetic}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static PhoneticTokenFilter.Builder phonetic() {
+        return new PhoneticTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link PorterStemTokenFilter porter_stem}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static PorterStemTokenFilter.Builder porterStem() {
+        return new PorterStemTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link PredicateTokenFilter predicate_token_filter}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static PredicateTokenFilter.Builder predicateTokenFilter() {
+        return new PredicateTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link RemoveDuplicatesTokenFilter
+     * remove_duplicates} {@code TokenFilterDefinition} variant.
+     */
+    public static RemoveDuplicatesTokenFilter.Builder removeDuplicates() {
+        return new RemoveDuplicatesTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ReverseTokenFilter reverse}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static ReverseTokenFilter.Builder reverse() {
+        return new ReverseTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ShingleTokenFilter shingle}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static ShingleTokenFilter.Builder shingle() {
+        return new ShingleTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SnowballTokenFilter snowball}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static SnowballTokenFilter.Builder snowball() {
+        return new SnowballTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link StemmerOverrideTokenFilter stemmer_override}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static StemmerOverrideTokenFilter.Builder stemmerOverride() {
+        return new StemmerOverrideTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link StemmerTokenFilter stemmer}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static StemmerTokenFilter.Builder stemmer() {
+        return new StemmerTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link StopTokenFilter stop}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static StopTokenFilter.Builder stop() {
+        return new StopTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SynonymGraphTokenFilter synonym_graph}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static SynonymGraphTokenFilter.Builder synonymGraph() {
+        return new SynonymGraphTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SynonymTokenFilter synonym}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static SynonymTokenFilter.Builder synonym() {
+        return new SynonymTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link TrimTokenFilter trim}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static TrimTokenFilter.Builder trim() {
+        return new TrimTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link TruncateTokenFilter truncate}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static TruncateTokenFilter.Builder truncate() {
+        return new TruncateTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link UniqueTokenFilter unique}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static UniqueTokenFilter.Builder unique() {
+        return new UniqueTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link UppercaseTokenFilter uppercase}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static UppercaseTokenFilter.Builder uppercase() {
+        return new UppercaseTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link WordDelimiterGraphTokenFilter
+     * word_delimiter_graph} {@code TokenFilterDefinition} variant.
+     */
+    public static WordDelimiterGraphTokenFilter.Builder wordDelimiterGraph() {
+        return new WordDelimiterGraphTokenFilter.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link WordDelimiterTokenFilter word_delimiter}
+     * {@code TokenFilterDefinition} variant.
+     */
+    public static WordDelimiterTokenFilter.Builder wordDelimiter() {
+        return new WordDelimiterTokenFilter.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionVariant.java
index bde136ddbf..ad351b6535 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterDefinitionVariant.java
@@ -39,10 +39,10 @@
  */
 public interface TokenFilterDefinitionVariant extends JsonpSerializable {
 
-	TokenFilterDefinition.Kind _tokenFilterDefinitionKind();
+    TokenFilterDefinition.Kind _tokenFilterDefinitionKind();
 
-	default TokenFilterDefinition _toTokenFilterDefinition() {
-		return new TokenFilterDefinition(this);
-	}
+    default TokenFilterDefinition _toTokenFilterDefinition() {
+        return new TokenFilterDefinition(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/Tokenizer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/Tokenizer.java
index 0e1c5b5161..4d7bc81639 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/Tokenizer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/Tokenizer.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,131 +44,129 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.Tokenizer
 
 @JsonpDeserializable
 public class Tokenizer implements TaggedUnion<Tokenizer.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Definition, Name
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private Tokenizer(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	private Tokenizer(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static Tokenizer of(Function<Builder, ObjectBuilder<Tokenizer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code definition}?
-	 */
-	public boolean isDefinition() {
-		return _kind == Kind.Definition;
-	}
-
-	/**
-	 * Get the {@code definition} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code definition} kind.
-	 */
-	public TokenizerDefinition definition() {
-		return TaggedUnionUtils.get(this, Kind.Definition);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code name}?
-	 */
-	public boolean isName() {
-		return _kind == Kind.Name;
-	}
-
-	/**
-	 * Get the {@code name} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code name} kind.
-	 */
-	public String name() {
-		return TaggedUnionUtils.get(this, Kind.Name);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Name :
-					generator.write(((String) this._value));
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Tokenizer> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<Tokenizer> definition(TokenizerDefinition v) {
-			this._kind = Kind.Definition;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Tokenizer> definition(
-				Function<TokenizerDefinition.Builder, ObjectBuilder<TokenizerDefinition>> fn) {
-			return this.definition(fn.apply(new TokenizerDefinition.Builder()).build());
-		}
-
-		public ObjectBuilder<Tokenizer> name(String v) {
-			this._kind = Kind.Name;
-			this._value = v;
-			return this;
-		}
-
-		public Tokenizer build() {
-			_checkSingleUse();
-			return new Tokenizer(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<Tokenizer> buildTokenizerDeserializer() {
-		return new UnionDeserializer.Builder<Tokenizer, Kind, Object>(Tokenizer::new, false)
-				.addMember(Kind.Definition, TokenizerDefinition._DESERIALIZER)
-				.addMember(Kind.Name, JsonpDeserializer.stringDeserializer()).build();
-	}
-
-	public static final JsonpDeserializer<Tokenizer> _DESERIALIZER = JsonpDeserializer
-			.lazy(Tokenizer::buildTokenizerDeserializer);
+    public enum Kind {
+        Definition,
+        Name
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private Tokenizer(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private Tokenizer(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static Tokenizer of(Function<Builder, ObjectBuilder<Tokenizer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code definition}?
+     */
+    public boolean isDefinition() {
+        return _kind == Kind.Definition;
+    }
+
+    /**
+     * Get the {@code definition} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code definition} kind.
+     */
+    public TokenizerDefinition definition() {
+        return TaggedUnionUtils.get(this, Kind.Definition);
+    }
+
+    /**
+     * Is this variant instance of kind {@code name}?
+     */
+    public boolean isName() {
+        return _kind == Kind.Name;
+    }
+
+    /**
+     * Get the {@code name} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code name} kind.
+     */
+    public String name() {
+        return TaggedUnionUtils.get(this, Kind.Name);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Name:
+                    generator.write(((String) this._value));
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Tokenizer> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<Tokenizer> definition(TokenizerDefinition v) {
+            this._kind = Kind.Definition;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Tokenizer> definition(Function<TokenizerDefinition.Builder, ObjectBuilder<TokenizerDefinition>> fn) {
+            return this.definition(fn.apply(new TokenizerDefinition.Builder()).build());
+        }
+
+        public ObjectBuilder<Tokenizer> name(String v) {
+            this._kind = Kind.Name;
+            this._value = v;
+            return this;
+        }
+
+        public Tokenizer build() {
+            _checkSingleUse();
+            return new Tokenizer(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<Tokenizer> buildTokenizerDeserializer() {
+        return new UnionDeserializer.Builder<Tokenizer, Kind, Object>(Tokenizer::new, false).addMember(
+            Kind.Definition,
+            TokenizerDefinition._DESERIALIZER
+        ).addMember(Kind.Name, JsonpDeserializer.stringDeserializer()).build();
+    }
+
+    public static final JsonpDeserializer<Tokenizer> _DESERIALIZER = JsonpDeserializer.lazy(Tokenizer::buildTokenizerDeserializer);
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerBase.java
index efe1040431..10ff21a4cc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerBase.java
@@ -32,81 +32,76 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.TokenizerBase
 
-
-
 public abstract class TokenizerBase implements JsonpSerializable {
-	@Nullable
-	private final String version;
+    @Nullable
+    private final String version;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected TokenizerBase(AbstractBuilder<?> builder) {
+    protected TokenizerBase(AbstractBuilder<?> builder) {
 
-		this.version = builder.version;
+        this.version = builder.version;
 
-	}
+    }
 
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final String version() {
-		return this.version;
-	}
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final String version() {
+        return this.version;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
 
-		}
+        }
 
-	}
+    }
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		@Nullable
-		private String version;
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        @Nullable
+        private String version;
 
-		/**
-		 * API name: {@code version}
-		 */
-		public final BuilderT version(@Nullable String value) {
-			this.version = value;
-			return self();
-		}
+        /**
+         * API name: {@code version}
+         */
+        public final BuilderT version(@Nullable String value) {
+            this.version = value;
+            return self();
+        }
 
-		protected abstract BuilderT self();
+        protected abstract BuilderT self();
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupTokenizerBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupTokenizerBaseDeserializer(ObjectDeserializer<BuilderT> op) {
 
-		op.add(AbstractBuilder::version, JsonpDeserializer.stringDeserializer(), "version");
+        op.add(AbstractBuilder::version, JsonpDeserializer.stringDeserializer(), "version");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerBuilders.java
index ae70e9486c..33f84d09a9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerBuilders.java
@@ -37,18 +37,17 @@
  * <p>
  * Variants <code>name</code> are not available here as they don't have a
  * dedicated class. Use {@link Tokenizer}'s builder for these.
- * 
+ *
  */
 public class TokenizerBuilders {
-	private TokenizerBuilders() {
-	}
+    private TokenizerBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link TokenizerDefinition definition}
-	 * {@code Tokenizer} variant.
-	 */
-	public static TokenizerDefinition.Builder definition() {
-		return new TokenizerDefinition.Builder();
-	}
+    /**
+     * Creates a builder for the {@link TokenizerDefinition definition}
+     * {@code Tokenizer} variant.
+     */
+    public static TokenizerDefinition.Builder definition() {
+        return new TokenizerDefinition.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerDefinition.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerDefinition.java
index 2a8b2f0dde..4e10b8b30d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerDefinition.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerDefinition.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -44,505 +46,490 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.TokenizerDefinition
 
-
 @JsonpDeserializable
-public class TokenizerDefinition
-		implements
-			TaggedUnion<TokenizerDefinition.Kind, TokenizerDefinitionVariant>,
-			JsonpSerializable {
+public class TokenizerDefinition implements TaggedUnion<TokenizerDefinition.Kind, TokenizerDefinitionVariant>, JsonpSerializable {
 
-	/**
-	 * {@link TokenizerDefinition} variant kinds.
-	 */
-	/**
-	 * {@link TokenizerDefinition} variant kinds.
-	 */
+    /**
+     * {@link TokenizerDefinition} variant kinds.
+     */
+    /**
+     * {@link TokenizerDefinition} variant kinds.
+     */
 
-	public enum Kind implements JsonEnum {
-		CharGroup("char_group"),
+    public enum Kind implements JsonEnum {
+        CharGroup("char_group"),
 
-		EdgeNgram("edge_ngram"),
+        EdgeNgram("edge_ngram"),
 
-		IcuTokenizer("icu_tokenizer"),
+        IcuTokenizer("icu_tokenizer"),
 
-		Keyword("keyword"),
+        Keyword("keyword"),
 
-		KuromojiTokenizer("kuromoji_tokenizer"),
+        KuromojiTokenizer("kuromoji_tokenizer"),
 
-		Letter("letter"),
+        Letter("letter"),
 
-		Lowercase("lowercase"),
+        Lowercase("lowercase"),
 
-		Ngram("ngram"),
+        Ngram("ngram"),
 
-		NoriTokenizer("nori_tokenizer"),
+        NoriTokenizer("nori_tokenizer"),
 
-		PathHierarchy("path_hierarchy"),
+        PathHierarchy("path_hierarchy"),
 
-		Pattern("pattern"),
+        Pattern("pattern"),
 
-		Standard("standard"),
+        Standard("standard"),
 
-		UaxUrlEmail("uax_url_email"),
+        UaxUrlEmail("uax_url_email"),
 
-		Whitespace("whitespace"),
+        Whitespace("whitespace"),
 
         SmartcnTokenizer("smartcn_tokenizer"),
 
-		;
-
-		private final String jsonValue;
-
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
-
-		public String jsonValue() {
-			return this.jsonValue;
-		}
-
-	}
-
-	private final Kind _kind;
-	private final TokenizerDefinitionVariant _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final TokenizerDefinitionVariant _get() {
-		return _value;
-	}
-
-	public TokenizerDefinition(TokenizerDefinitionVariant value) {
-
-		this._kind = ApiTypeHelper.requireNonNull(value._tokenizerDefinitionKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
-
-	}
-
-	private TokenizerDefinition(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static TokenizerDefinition of(Function<Builder, ObjectBuilder<TokenizerDefinition>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code char_group}?
-	 */
-	public boolean isCharGroup() {
-		return _kind == Kind.CharGroup;
-	}
-
-	/**
-	 * Get the {@code char_group} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code char_group} kind.
-	 */
-	public CharGroupTokenizer charGroup() {
-		return TaggedUnionUtils.get(this, Kind.CharGroup);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code edge_ngram}?
-	 */
-	public boolean isEdgeNgram() {
-		return _kind == Kind.EdgeNgram;
-	}
-
-	/**
-	 * Get the {@code edge_ngram} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code edge_ngram} kind.
-	 */
-	public EdgeNGramTokenizer edgeNgram() {
-		return TaggedUnionUtils.get(this, Kind.EdgeNgram);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code icu_tokenizer}?
-	 */
-	public boolean isIcuTokenizer() {
-		return _kind == Kind.IcuTokenizer;
-	}
-
-	/**
-	 * Get the {@code icu_tokenizer} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code icu_tokenizer} kind.
-	 */
-	public IcuTokenizer icuTokenizer() {
-		return TaggedUnionUtils.get(this, Kind.IcuTokenizer);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code keyword}?
-	 */
-	public boolean isKeyword() {
-		return _kind == Kind.Keyword;
-	}
-
-	/**
-	 * Get the {@code keyword} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code keyword} kind.
-	 */
-	public KeywordTokenizer keyword() {
-		return TaggedUnionUtils.get(this, Kind.Keyword);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code kuromoji_tokenizer}?
-	 */
-	public boolean isKuromojiTokenizer() {
-		return _kind == Kind.KuromojiTokenizer;
-	}
-
-	/**
-	 * Get the {@code kuromoji_tokenizer} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code kuromoji_tokenizer}
-	 *             kind.
-	 */
-	public KuromojiTokenizer kuromojiTokenizer() {
-		return TaggedUnionUtils.get(this, Kind.KuromojiTokenizer);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code letter}?
-	 */
-	public boolean isLetter() {
-		return _kind == Kind.Letter;
-	}
-
-	/**
-	 * Get the {@code letter} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code letter} kind.
-	 */
-	public LetterTokenizer letter() {
-		return TaggedUnionUtils.get(this, Kind.Letter);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code lowercase}?
-	 */
-	public boolean isLowercase() {
-		return _kind == Kind.Lowercase;
-	}
-
-	/**
-	 * Get the {@code lowercase} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code lowercase} kind.
-	 */
-	public LowercaseTokenizer lowercase() {
-		return TaggedUnionUtils.get(this, Kind.Lowercase);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code ngram}?
-	 */
-	public boolean isNgram() {
-		return _kind == Kind.Ngram;
-	}
-
-	/**
-	 * Get the {@code ngram} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code ngram} kind.
-	 */
-	public NGramTokenizer ngram() {
-		return TaggedUnionUtils.get(this, Kind.Ngram);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code nori_tokenizer}?
-	 */
-	public boolean isNoriTokenizer() {
-		return _kind == Kind.NoriTokenizer;
-	}
-
-	/**
-	 * Get the {@code nori_tokenizer} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code nori_tokenizer} kind.
-	 */
-	public NoriTokenizer noriTokenizer() {
-		return TaggedUnionUtils.get(this, Kind.NoriTokenizer);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code path_hierarchy}?
-	 */
-	public boolean isPathHierarchy() {
-		return _kind == Kind.PathHierarchy;
-	}
-
-	/**
-	 * Get the {@code path_hierarchy} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code path_hierarchy} kind.
-	 */
-	public PathHierarchyTokenizer pathHierarchy() {
-		return TaggedUnionUtils.get(this, Kind.PathHierarchy);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code pattern}?
-	 */
-	public boolean isPattern() {
-		return _kind == Kind.Pattern;
-	}
-
-	/**
-	 * Get the {@code pattern} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code pattern} kind.
-	 */
-	public PatternTokenizer pattern() {
-		return TaggedUnionUtils.get(this, Kind.Pattern);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code standard}?
-	 */
-	public boolean isStandard() {
-		return _kind == Kind.Standard;
-	}
-
-	/**
-	 * Get the {@code standard} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code standard} kind.
-	 */
-	public StandardTokenizer standard() {
-		return TaggedUnionUtils.get(this, Kind.Standard);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code uax_url_email}?
-	 */
-	public boolean isUaxUrlEmail() {
-		return _kind == Kind.UaxUrlEmail;
-	}
-
-	/**
-	 * Get the {@code uax_url_email} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code uax_url_email} kind.
-	 */
-	public UaxEmailUrlTokenizer uaxUrlEmail() {
-		return TaggedUnionUtils.get(this, Kind.UaxUrlEmail);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code whitespace}?
-	 */
-	public boolean isWhitespace() {
-		return _kind == Kind.Whitespace;
-	}
-
-	/**
-	 * Get the {@code whitespace} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code whitespace} kind.
-	 */
-	public WhitespaceTokenizer whitespace() {
-		return TaggedUnionUtils.get(this, Kind.Whitespace);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		mapper.serialize(_value, generator);
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TokenizerDefinition> {
-		private Kind _kind;
-		private TokenizerDefinitionVariant _value;
-
-		public ObjectBuilder<TokenizerDefinition> charGroup(CharGroupTokenizer v) {
-			this._kind = Kind.CharGroup;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenizerDefinition> charGroup(
-				Function<CharGroupTokenizer.Builder, ObjectBuilder<CharGroupTokenizer>> fn) {
-			return this.charGroup(fn.apply(new CharGroupTokenizer.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenizerDefinition> edgeNgram(EdgeNGramTokenizer v) {
-			this._kind = Kind.EdgeNgram;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenizerDefinition> edgeNgram(
-				Function<EdgeNGramTokenizer.Builder, ObjectBuilder<EdgeNGramTokenizer>> fn) {
-			return this.edgeNgram(fn.apply(new EdgeNGramTokenizer.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenizerDefinition> icuTokenizer(IcuTokenizer v) {
-			this._kind = Kind.IcuTokenizer;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenizerDefinition> icuTokenizer(
-				Function<IcuTokenizer.Builder, ObjectBuilder<IcuTokenizer>> fn) {
-			return this.icuTokenizer(fn.apply(new IcuTokenizer.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenizerDefinition> keyword(KeywordTokenizer v) {
-			this._kind = Kind.Keyword;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenizerDefinition> keyword(
-				Function<KeywordTokenizer.Builder, ObjectBuilder<KeywordTokenizer>> fn) {
-			return this.keyword(fn.apply(new KeywordTokenizer.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenizerDefinition> kuromojiTokenizer(KuromojiTokenizer v) {
-			this._kind = Kind.KuromojiTokenizer;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenizerDefinition> kuromojiTokenizer(
-				Function<KuromojiTokenizer.Builder, ObjectBuilder<KuromojiTokenizer>> fn) {
-			return this.kuromojiTokenizer(fn.apply(new KuromojiTokenizer.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenizerDefinition> letter(LetterTokenizer v) {
-			this._kind = Kind.Letter;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenizerDefinition> letter(
-				Function<LetterTokenizer.Builder, ObjectBuilder<LetterTokenizer>> fn) {
-			return this.letter(fn.apply(new LetterTokenizer.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenizerDefinition> lowercase(LowercaseTokenizer v) {
-			this._kind = Kind.Lowercase;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenizerDefinition> lowercase(
-				Function<LowercaseTokenizer.Builder, ObjectBuilder<LowercaseTokenizer>> fn) {
-			return this.lowercase(fn.apply(new LowercaseTokenizer.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenizerDefinition> ngram(NGramTokenizer v) {
-			this._kind = Kind.Ngram;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenizerDefinition> ngram(
-				Function<NGramTokenizer.Builder, ObjectBuilder<NGramTokenizer>> fn) {
-			return this.ngram(fn.apply(new NGramTokenizer.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenizerDefinition> noriTokenizer(NoriTokenizer v) {
-			this._kind = Kind.NoriTokenizer;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenizerDefinition> noriTokenizer(
-				Function<NoriTokenizer.Builder, ObjectBuilder<NoriTokenizer>> fn) {
-			return this.noriTokenizer(fn.apply(new NoriTokenizer.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenizerDefinition> pathHierarchy(PathHierarchyTokenizer v) {
-			this._kind = Kind.PathHierarchy;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenizerDefinition> pathHierarchy(
-				Function<PathHierarchyTokenizer.Builder, ObjectBuilder<PathHierarchyTokenizer>> fn) {
-			return this.pathHierarchy(fn.apply(new PathHierarchyTokenizer.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenizerDefinition> pattern(PatternTokenizer v) {
-			this._kind = Kind.Pattern;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenizerDefinition> pattern(
-				Function<PatternTokenizer.Builder, ObjectBuilder<PatternTokenizer>> fn) {
-			return this.pattern(fn.apply(new PatternTokenizer.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenizerDefinition> standard(StandardTokenizer v) {
-			this._kind = Kind.Standard;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenizerDefinition> standard(
-				Function<StandardTokenizer.Builder, ObjectBuilder<StandardTokenizer>> fn) {
-			return this.standard(fn.apply(new StandardTokenizer.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenizerDefinition> uaxUrlEmail(UaxEmailUrlTokenizer v) {
-			this._kind = Kind.UaxUrlEmail;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenizerDefinition> uaxUrlEmail(
-				Function<UaxEmailUrlTokenizer.Builder, ObjectBuilder<UaxEmailUrlTokenizer>> fn) {
-			return this.uaxUrlEmail(fn.apply(new UaxEmailUrlTokenizer.Builder()).build());
-		}
-
-		public ObjectBuilder<TokenizerDefinition> whitespace(WhitespaceTokenizer v) {
-			this._kind = Kind.Whitespace;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TokenizerDefinition> whitespace(
-				Function<WhitespaceTokenizer.Builder, ObjectBuilder<WhitespaceTokenizer>> fn) {
-			return this.whitespace(fn.apply(new WhitespaceTokenizer.Builder()).build());
-		}
+        ;
+
+        private final String jsonValue;
+
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
+
+        public String jsonValue() {
+            return this.jsonValue;
+        }
+
+    }
+
+    private final Kind _kind;
+    private final TokenizerDefinitionVariant _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final TokenizerDefinitionVariant _get() {
+        return _value;
+    }
+
+    public TokenizerDefinition(TokenizerDefinitionVariant value) {
+
+        this._kind = ApiTypeHelper.requireNonNull(value._tokenizerDefinitionKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+
+    }
+
+    private TokenizerDefinition(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static TokenizerDefinition of(Function<Builder, ObjectBuilder<TokenizerDefinition>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code char_group}?
+     */
+    public boolean isCharGroup() {
+        return _kind == Kind.CharGroup;
+    }
+
+    /**
+     * Get the {@code char_group} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code char_group} kind.
+     */
+    public CharGroupTokenizer charGroup() {
+        return TaggedUnionUtils.get(this, Kind.CharGroup);
+    }
+
+    /**
+     * Is this variant instance of kind {@code edge_ngram}?
+     */
+    public boolean isEdgeNgram() {
+        return _kind == Kind.EdgeNgram;
+    }
+
+    /**
+     * Get the {@code edge_ngram} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code edge_ngram} kind.
+     */
+    public EdgeNGramTokenizer edgeNgram() {
+        return TaggedUnionUtils.get(this, Kind.EdgeNgram);
+    }
+
+    /**
+     * Is this variant instance of kind {@code icu_tokenizer}?
+     */
+    public boolean isIcuTokenizer() {
+        return _kind == Kind.IcuTokenizer;
+    }
+
+    /**
+     * Get the {@code icu_tokenizer} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code icu_tokenizer} kind.
+     */
+    public IcuTokenizer icuTokenizer() {
+        return TaggedUnionUtils.get(this, Kind.IcuTokenizer);
+    }
+
+    /**
+     * Is this variant instance of kind {@code keyword}?
+     */
+    public boolean isKeyword() {
+        return _kind == Kind.Keyword;
+    }
+
+    /**
+     * Get the {@code keyword} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code keyword} kind.
+     */
+    public KeywordTokenizer keyword() {
+        return TaggedUnionUtils.get(this, Kind.Keyword);
+    }
+
+    /**
+     * Is this variant instance of kind {@code kuromoji_tokenizer}?
+     */
+    public boolean isKuromojiTokenizer() {
+        return _kind == Kind.KuromojiTokenizer;
+    }
+
+    /**
+     * Get the {@code kuromoji_tokenizer} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code kuromoji_tokenizer}
+     *             kind.
+     */
+    public KuromojiTokenizer kuromojiTokenizer() {
+        return TaggedUnionUtils.get(this, Kind.KuromojiTokenizer);
+    }
+
+    /**
+     * Is this variant instance of kind {@code letter}?
+     */
+    public boolean isLetter() {
+        return _kind == Kind.Letter;
+    }
+
+    /**
+     * Get the {@code letter} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code letter} kind.
+     */
+    public LetterTokenizer letter() {
+        return TaggedUnionUtils.get(this, Kind.Letter);
+    }
+
+    /**
+     * Is this variant instance of kind {@code lowercase}?
+     */
+    public boolean isLowercase() {
+        return _kind == Kind.Lowercase;
+    }
+
+    /**
+     * Get the {@code lowercase} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code lowercase} kind.
+     */
+    public LowercaseTokenizer lowercase() {
+        return TaggedUnionUtils.get(this, Kind.Lowercase);
+    }
+
+    /**
+     * Is this variant instance of kind {@code ngram}?
+     */
+    public boolean isNgram() {
+        return _kind == Kind.Ngram;
+    }
+
+    /**
+     * Get the {@code ngram} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code ngram} kind.
+     */
+    public NGramTokenizer ngram() {
+        return TaggedUnionUtils.get(this, Kind.Ngram);
+    }
+
+    /**
+     * Is this variant instance of kind {@code nori_tokenizer}?
+     */
+    public boolean isNoriTokenizer() {
+        return _kind == Kind.NoriTokenizer;
+    }
+
+    /**
+     * Get the {@code nori_tokenizer} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code nori_tokenizer} kind.
+     */
+    public NoriTokenizer noriTokenizer() {
+        return TaggedUnionUtils.get(this, Kind.NoriTokenizer);
+    }
+
+    /**
+     * Is this variant instance of kind {@code path_hierarchy}?
+     */
+    public boolean isPathHierarchy() {
+        return _kind == Kind.PathHierarchy;
+    }
+
+    /**
+     * Get the {@code path_hierarchy} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code path_hierarchy} kind.
+     */
+    public PathHierarchyTokenizer pathHierarchy() {
+        return TaggedUnionUtils.get(this, Kind.PathHierarchy);
+    }
+
+    /**
+     * Is this variant instance of kind {@code pattern}?
+     */
+    public boolean isPattern() {
+        return _kind == Kind.Pattern;
+    }
+
+    /**
+     * Get the {@code pattern} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code pattern} kind.
+     */
+    public PatternTokenizer pattern() {
+        return TaggedUnionUtils.get(this, Kind.Pattern);
+    }
+
+    /**
+     * Is this variant instance of kind {@code standard}?
+     */
+    public boolean isStandard() {
+        return _kind == Kind.Standard;
+    }
+
+    /**
+     * Get the {@code standard} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code standard} kind.
+     */
+    public StandardTokenizer standard() {
+        return TaggedUnionUtils.get(this, Kind.Standard);
+    }
+
+    /**
+     * Is this variant instance of kind {@code uax_url_email}?
+     */
+    public boolean isUaxUrlEmail() {
+        return _kind == Kind.UaxUrlEmail;
+    }
+
+    /**
+     * Get the {@code uax_url_email} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code uax_url_email} kind.
+     */
+    public UaxEmailUrlTokenizer uaxUrlEmail() {
+        return TaggedUnionUtils.get(this, Kind.UaxUrlEmail);
+    }
+
+    /**
+     * Is this variant instance of kind {@code whitespace}?
+     */
+    public boolean isWhitespace() {
+        return _kind == Kind.Whitespace;
+    }
+
+    /**
+     * Get the {@code whitespace} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code whitespace} kind.
+     */
+    public WhitespaceTokenizer whitespace() {
+        return TaggedUnionUtils.get(this, Kind.Whitespace);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        mapper.serialize(_value, generator);
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TokenizerDefinition> {
+        private Kind _kind;
+        private TokenizerDefinitionVariant _value;
+
+        public ObjectBuilder<TokenizerDefinition> charGroup(CharGroupTokenizer v) {
+            this._kind = Kind.CharGroup;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenizerDefinition> charGroup(Function<CharGroupTokenizer.Builder, ObjectBuilder<CharGroupTokenizer>> fn) {
+            return this.charGroup(fn.apply(new CharGroupTokenizer.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenizerDefinition> edgeNgram(EdgeNGramTokenizer v) {
+            this._kind = Kind.EdgeNgram;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenizerDefinition> edgeNgram(Function<EdgeNGramTokenizer.Builder, ObjectBuilder<EdgeNGramTokenizer>> fn) {
+            return this.edgeNgram(fn.apply(new EdgeNGramTokenizer.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenizerDefinition> icuTokenizer(IcuTokenizer v) {
+            this._kind = Kind.IcuTokenizer;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenizerDefinition> icuTokenizer(Function<IcuTokenizer.Builder, ObjectBuilder<IcuTokenizer>> fn) {
+            return this.icuTokenizer(fn.apply(new IcuTokenizer.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenizerDefinition> keyword(KeywordTokenizer v) {
+            this._kind = Kind.Keyword;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenizerDefinition> keyword(Function<KeywordTokenizer.Builder, ObjectBuilder<KeywordTokenizer>> fn) {
+            return this.keyword(fn.apply(new KeywordTokenizer.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenizerDefinition> kuromojiTokenizer(KuromojiTokenizer v) {
+            this._kind = Kind.KuromojiTokenizer;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenizerDefinition> kuromojiTokenizer(
+            Function<KuromojiTokenizer.Builder, ObjectBuilder<KuromojiTokenizer>> fn
+        ) {
+            return this.kuromojiTokenizer(fn.apply(new KuromojiTokenizer.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenizerDefinition> letter(LetterTokenizer v) {
+            this._kind = Kind.Letter;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenizerDefinition> letter(Function<LetterTokenizer.Builder, ObjectBuilder<LetterTokenizer>> fn) {
+            return this.letter(fn.apply(new LetterTokenizer.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenizerDefinition> lowercase(LowercaseTokenizer v) {
+            this._kind = Kind.Lowercase;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenizerDefinition> lowercase(Function<LowercaseTokenizer.Builder, ObjectBuilder<LowercaseTokenizer>> fn) {
+            return this.lowercase(fn.apply(new LowercaseTokenizer.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenizerDefinition> ngram(NGramTokenizer v) {
+            this._kind = Kind.Ngram;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenizerDefinition> ngram(Function<NGramTokenizer.Builder, ObjectBuilder<NGramTokenizer>> fn) {
+            return this.ngram(fn.apply(new NGramTokenizer.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenizerDefinition> noriTokenizer(NoriTokenizer v) {
+            this._kind = Kind.NoriTokenizer;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenizerDefinition> noriTokenizer(Function<NoriTokenizer.Builder, ObjectBuilder<NoriTokenizer>> fn) {
+            return this.noriTokenizer(fn.apply(new NoriTokenizer.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenizerDefinition> pathHierarchy(PathHierarchyTokenizer v) {
+            this._kind = Kind.PathHierarchy;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenizerDefinition> pathHierarchy(
+            Function<PathHierarchyTokenizer.Builder, ObjectBuilder<PathHierarchyTokenizer>> fn
+        ) {
+            return this.pathHierarchy(fn.apply(new PathHierarchyTokenizer.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenizerDefinition> pattern(PatternTokenizer v) {
+            this._kind = Kind.Pattern;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenizerDefinition> pattern(Function<PatternTokenizer.Builder, ObjectBuilder<PatternTokenizer>> fn) {
+            return this.pattern(fn.apply(new PatternTokenizer.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenizerDefinition> standard(StandardTokenizer v) {
+            this._kind = Kind.Standard;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenizerDefinition> standard(Function<StandardTokenizer.Builder, ObjectBuilder<StandardTokenizer>> fn) {
+            return this.standard(fn.apply(new StandardTokenizer.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenizerDefinition> uaxUrlEmail(UaxEmailUrlTokenizer v) {
+            this._kind = Kind.UaxUrlEmail;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenizerDefinition> uaxUrlEmail(
+            Function<UaxEmailUrlTokenizer.Builder, ObjectBuilder<UaxEmailUrlTokenizer>> fn
+        ) {
+            return this.uaxUrlEmail(fn.apply(new UaxEmailUrlTokenizer.Builder()).build());
+        }
+
+        public ObjectBuilder<TokenizerDefinition> whitespace(WhitespaceTokenizer v) {
+            this._kind = Kind.Whitespace;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TokenizerDefinition> whitespace(Function<WhitespaceTokenizer.Builder, ObjectBuilder<WhitespaceTokenizer>> fn) {
+            return this.whitespace(fn.apply(new WhitespaceTokenizer.Builder()).build());
+        }
 
         public ObjectBuilder<TokenizerDefinition> smartcn(SmartcnTokenizer v) {
             this._kind = Kind.SmartcnTokenizer;
@@ -550,40 +537,42 @@ public ObjectBuilder<TokenizerDefinition> smartcn(SmartcnTokenizer v) {
             return this;
         }
 
-        public ObjectBuilder<TokenizerDefinition> smartcn(
-            Function<SmartcnTokenizer.Builder, ObjectBuilder<SmartcnTokenizer>> fn) {
+        public ObjectBuilder<TokenizerDefinition> smartcn(Function<SmartcnTokenizer.Builder, ObjectBuilder<SmartcnTokenizer>> fn) {
             return this.smartcn(fn.apply(new SmartcnTokenizer.Builder()).build());
         }
 
         public TokenizerDefinition build() {
-			_checkSingleUse();
-			return new TokenizerDefinition(this);
-		}
-
-	}
-
-	protected static void setupTokenizerDefinitionDeserializer(ObjectDeserializer<Builder> op) {
-
-		op.add(Builder::charGroup, CharGroupTokenizer._DESERIALIZER, "char_group");
-		op.add(Builder::edgeNgram, EdgeNGramTokenizer._DESERIALIZER, "edge_ngram");
-		op.add(Builder::icuTokenizer, IcuTokenizer._DESERIALIZER, "icu_tokenizer");
-		op.add(Builder::keyword, KeywordTokenizer._DESERIALIZER, "keyword");
-		op.add(Builder::kuromojiTokenizer, KuromojiTokenizer._DESERIALIZER, "kuromoji_tokenizer");
-		op.add(Builder::letter, LetterTokenizer._DESERIALIZER, "letter");
-		op.add(Builder::lowercase, LowercaseTokenizer._DESERIALIZER, "lowercase");
-		op.add(Builder::ngram, NGramTokenizer._DESERIALIZER, "ngram");
-		op.add(Builder::noriTokenizer, NoriTokenizer._DESERIALIZER, "nori_tokenizer");
-		op.add(Builder::pathHierarchy, PathHierarchyTokenizer._DESERIALIZER, "path_hierarchy");
-		op.add(Builder::pattern, PatternTokenizer._DESERIALIZER, "pattern");
-		op.add(Builder::standard, StandardTokenizer._DESERIALIZER, "standard");
-		op.add(Builder::uaxUrlEmail, UaxEmailUrlTokenizer._DESERIALIZER, "uax_url_email");
-		op.add(Builder::whitespace, WhitespaceTokenizer._DESERIALIZER, "whitespace");
-		op.add(Builder::smartcn, SmartcnTokenizer._DESERIALIZER, Kind.SmartcnTokenizer.jsonValue());
-
-		op.setTypeProperty("type", null);
-
-	}
-
-	public static final JsonpDeserializer<TokenizerDefinition> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, TokenizerDefinition::setupTokenizerDefinitionDeserializer, Builder::build);
+            _checkSingleUse();
+            return new TokenizerDefinition(this);
+        }
+
+    }
+
+    protected static void setupTokenizerDefinitionDeserializer(ObjectDeserializer<Builder> op) {
+
+        op.add(Builder::charGroup, CharGroupTokenizer._DESERIALIZER, "char_group");
+        op.add(Builder::edgeNgram, EdgeNGramTokenizer._DESERIALIZER, "edge_ngram");
+        op.add(Builder::icuTokenizer, IcuTokenizer._DESERIALIZER, "icu_tokenizer");
+        op.add(Builder::keyword, KeywordTokenizer._DESERIALIZER, "keyword");
+        op.add(Builder::kuromojiTokenizer, KuromojiTokenizer._DESERIALIZER, "kuromoji_tokenizer");
+        op.add(Builder::letter, LetterTokenizer._DESERIALIZER, "letter");
+        op.add(Builder::lowercase, LowercaseTokenizer._DESERIALIZER, "lowercase");
+        op.add(Builder::ngram, NGramTokenizer._DESERIALIZER, "ngram");
+        op.add(Builder::noriTokenizer, NoriTokenizer._DESERIALIZER, "nori_tokenizer");
+        op.add(Builder::pathHierarchy, PathHierarchyTokenizer._DESERIALIZER, "path_hierarchy");
+        op.add(Builder::pattern, PatternTokenizer._DESERIALIZER, "pattern");
+        op.add(Builder::standard, StandardTokenizer._DESERIALIZER, "standard");
+        op.add(Builder::uaxUrlEmail, UaxEmailUrlTokenizer._DESERIALIZER, "uax_url_email");
+        op.add(Builder::whitespace, WhitespaceTokenizer._DESERIALIZER, "whitespace");
+        op.add(Builder::smartcn, SmartcnTokenizer._DESERIALIZER, Kind.SmartcnTokenizer.jsonValue());
+
+        op.setTypeProperty("type", null);
+
+    }
+
+    public static final JsonpDeserializer<TokenizerDefinition> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TokenizerDefinition::setupTokenizerDefinitionDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerDefinitionBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerDefinitionBuilders.java
index a2d29379ae..da55226bf4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerDefinitionBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerDefinitionBuilders.java
@@ -36,119 +36,118 @@
  * Builders for {@link TokenizerDefinition} variants.
  */
 public class TokenizerDefinitionBuilders {
-	private TokenizerDefinitionBuilders() {
-	}
-
-	/**
-	 * Creates a builder for the {@link CharGroupTokenizer char_group}
-	 * {@code TokenizerDefinition} variant.
-	 */
-	public static CharGroupTokenizer.Builder charGroup() {
-		return new CharGroupTokenizer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link EdgeNGramTokenizer edge_ngram}
-	 * {@code TokenizerDefinition} variant.
-	 */
-	public static EdgeNGramTokenizer.Builder edgeNgram() {
-		return new EdgeNGramTokenizer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link IcuTokenizer icu_tokenizer}
-	 * {@code TokenizerDefinition} variant.
-	 */
-	public static IcuTokenizer.Builder icuTokenizer() {
-		return new IcuTokenizer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link KeywordTokenizer keyword}
-	 * {@code TokenizerDefinition} variant.
-	 */
-	public static KeywordTokenizer.Builder keyword() {
-		return new KeywordTokenizer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link KuromojiTokenizer kuromoji_tokenizer}
-	 * {@code TokenizerDefinition} variant.
-	 */
-	public static KuromojiTokenizer.Builder kuromojiTokenizer() {
-		return new KuromojiTokenizer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link LetterTokenizer letter}
-	 * {@code TokenizerDefinition} variant.
-	 */
-	public static LetterTokenizer.Builder letter() {
-		return new LetterTokenizer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link LowercaseTokenizer lowercase}
-	 * {@code TokenizerDefinition} variant.
-	 */
-	public static LowercaseTokenizer.Builder lowercase() {
-		return new LowercaseTokenizer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link NGramTokenizer ngram}
-	 * {@code TokenizerDefinition} variant.
-	 */
-	public static NGramTokenizer.Builder ngram() {
-		return new NGramTokenizer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link NoriTokenizer nori_tokenizer}
-	 * {@code TokenizerDefinition} variant.
-	 */
-	public static NoriTokenizer.Builder noriTokenizer() {
-		return new NoriTokenizer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link PathHierarchyTokenizer path_hierarchy}
-	 * {@code TokenizerDefinition} variant.
-	 */
-	public static PathHierarchyTokenizer.Builder pathHierarchy() {
-		return new PathHierarchyTokenizer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link PatternTokenizer pattern}
-	 * {@code TokenizerDefinition} variant.
-	 */
-	public static PatternTokenizer.Builder pattern() {
-		return new PatternTokenizer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link StandardTokenizer standard}
-	 * {@code TokenizerDefinition} variant.
-	 */
-	public static StandardTokenizer.Builder standard() {
-		return new StandardTokenizer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link UaxEmailUrlTokenizer uax_url_email}
-	 * {@code TokenizerDefinition} variant.
-	 */
-	public static UaxEmailUrlTokenizer.Builder uaxUrlEmail() {
-		return new UaxEmailUrlTokenizer.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link WhitespaceTokenizer whitespace}
-	 * {@code TokenizerDefinition} variant.
-	 */
-	public static WhitespaceTokenizer.Builder whitespace() {
-		return new WhitespaceTokenizer.Builder();
-	}
+    private TokenizerDefinitionBuilders() {}
+
+    /**
+     * Creates a builder for the {@link CharGroupTokenizer char_group}
+     * {@code TokenizerDefinition} variant.
+     */
+    public static CharGroupTokenizer.Builder charGroup() {
+        return new CharGroupTokenizer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link EdgeNGramTokenizer edge_ngram}
+     * {@code TokenizerDefinition} variant.
+     */
+    public static EdgeNGramTokenizer.Builder edgeNgram() {
+        return new EdgeNGramTokenizer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link IcuTokenizer icu_tokenizer}
+     * {@code TokenizerDefinition} variant.
+     */
+    public static IcuTokenizer.Builder icuTokenizer() {
+        return new IcuTokenizer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link KeywordTokenizer keyword}
+     * {@code TokenizerDefinition} variant.
+     */
+    public static KeywordTokenizer.Builder keyword() {
+        return new KeywordTokenizer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link KuromojiTokenizer kuromoji_tokenizer}
+     * {@code TokenizerDefinition} variant.
+     */
+    public static KuromojiTokenizer.Builder kuromojiTokenizer() {
+        return new KuromojiTokenizer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link LetterTokenizer letter}
+     * {@code TokenizerDefinition} variant.
+     */
+    public static LetterTokenizer.Builder letter() {
+        return new LetterTokenizer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link LowercaseTokenizer lowercase}
+     * {@code TokenizerDefinition} variant.
+     */
+    public static LowercaseTokenizer.Builder lowercase() {
+        return new LowercaseTokenizer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link NGramTokenizer ngram}
+     * {@code TokenizerDefinition} variant.
+     */
+    public static NGramTokenizer.Builder ngram() {
+        return new NGramTokenizer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link NoriTokenizer nori_tokenizer}
+     * {@code TokenizerDefinition} variant.
+     */
+    public static NoriTokenizer.Builder noriTokenizer() {
+        return new NoriTokenizer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link PathHierarchyTokenizer path_hierarchy}
+     * {@code TokenizerDefinition} variant.
+     */
+    public static PathHierarchyTokenizer.Builder pathHierarchy() {
+        return new PathHierarchyTokenizer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link PatternTokenizer pattern}
+     * {@code TokenizerDefinition} variant.
+     */
+    public static PatternTokenizer.Builder pattern() {
+        return new PatternTokenizer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link StandardTokenizer standard}
+     * {@code TokenizerDefinition} variant.
+     */
+    public static StandardTokenizer.Builder standard() {
+        return new StandardTokenizer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link UaxEmailUrlTokenizer uax_url_email}
+     * {@code TokenizerDefinition} variant.
+     */
+    public static UaxEmailUrlTokenizer.Builder uaxUrlEmail() {
+        return new UaxEmailUrlTokenizer.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link WhitespaceTokenizer whitespace}
+     * {@code TokenizerDefinition} variant.
+     */
+    public static WhitespaceTokenizer.Builder whitespace() {
+        return new WhitespaceTokenizer.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerDefinitionVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerDefinitionVariant.java
index 06203d5af0..93a68ea4df 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerDefinitionVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenizerDefinitionVariant.java
@@ -39,10 +39,10 @@
  */
 public interface TokenizerDefinitionVariant extends JsonpSerializable {
 
-	TokenizerDefinition.Kind _tokenizerDefinitionKind();
+    TokenizerDefinition.Kind _tokenizerDefinitionKind();
 
-	default TokenizerDefinition _toTokenizerDefinition() {
-		return new TokenizerDefinition(this);
-	}
+    default TokenizerDefinition _toTokenizerDefinition() {
+        return new TokenizerDefinition(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TrimTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TrimTokenFilter.java
index 411443ab29..9a1f20b3bd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TrimTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TrimTokenFilter.java
@@ -32,85 +32,84 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.TrimTokenFilter
 
 @JsonpDeserializable
 public class TrimTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private TrimTokenFilter(Builder builder) {
-		super(builder);
+    private TrimTokenFilter(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static TrimTokenFilter of(Function<Builder, ObjectBuilder<TrimTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static TrimTokenFilter of(Function<Builder, ObjectBuilder<TrimTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Trim;
-	}
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Trim;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "trim");
-		super.serializeInternal(generator, mapper);
+        generator.write("type", "trim");
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link TrimTokenFilter}.
-	 */
+    /**
+     * Builder for {@link TrimTokenFilter}.
+     */
 
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<TrimTokenFilter> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<TrimTokenFilter> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link TrimTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TrimTokenFilter build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link TrimTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TrimTokenFilter build() {
+            _checkSingleUse();
 
-			return new TrimTokenFilter(this);
-		}
-	}
+            return new TrimTokenFilter(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link TrimTokenFilter}
-	 */
-	public static final JsonpDeserializer<TrimTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TrimTokenFilter::setupTrimTokenFilterDeserializer);
+    /**
+     * Json deserializer for {@link TrimTokenFilter}
+     */
+    public static final JsonpDeserializer<TrimTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TrimTokenFilter::setupTrimTokenFilterDeserializer
+    );
 
-	protected static void setupTrimTokenFilterDeserializer(ObjectDeserializer<TrimTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+    protected static void setupTrimTokenFilterDeserializer(ObjectDeserializer<TrimTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TruncateTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TruncateTokenFilter.java
index cee441441e..a8f0dbfa36 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TruncateTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TruncateTokenFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,103 +41,100 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.analysis.TruncateTokenFilter
 
-
 @JsonpDeserializable
 public class TruncateTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	private final int length;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TruncateTokenFilter(Builder builder) {
-		super(builder);
-
-		this.length = ApiTypeHelper.requireNonNull(builder.length, this, "length");
-
-	}
-
-	public static TruncateTokenFilter of(Function<Builder, ObjectBuilder<TruncateTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Truncate;
-	}
-
-	/**
-	 * Required - API name: {@code length}
-	 */
-	public final int length() {
-		return this.length;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "truncate");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("length");
-		generator.write(this.length);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TruncateTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<TruncateTokenFilter> {
-		private Integer length;
-
-		/**
-		 * Required - API name: {@code length}
-		 */
-		public final Builder length(int value) {
-			this.length = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TruncateTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TruncateTokenFilter build() {
-			_checkSingleUse();
-
-			return new TruncateTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TruncateTokenFilter}
-	 */
-	public static final JsonpDeserializer<TruncateTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, TruncateTokenFilter::setupTruncateTokenFilterDeserializer);
-
-	protected static void setupTruncateTokenFilterDeserializer(ObjectDeserializer<TruncateTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::length, JsonpDeserializer.integerDeserializer(), "length");
-
-		op.ignore("type");
-	}
+    private final int length;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TruncateTokenFilter(Builder builder) {
+        super(builder);
+
+        this.length = ApiTypeHelper.requireNonNull(builder.length, this, "length");
+
+    }
+
+    public static TruncateTokenFilter of(Function<Builder, ObjectBuilder<TruncateTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Truncate;
+    }
+
+    /**
+     * Required - API name: {@code length}
+     */
+    public final int length() {
+        return this.length;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "truncate");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("length");
+        generator.write(this.length);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TruncateTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<TruncateTokenFilter> {
+        private Integer length;
+
+        /**
+         * Required - API name: {@code length}
+         */
+        public final Builder length(int value) {
+            this.length = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TruncateTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TruncateTokenFilter build() {
+            _checkSingleUse();
+
+            return new TruncateTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TruncateTokenFilter}
+     */
+    public static final JsonpDeserializer<TruncateTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TruncateTokenFilter::setupTruncateTokenFilterDeserializer
+    );
+
+    protected static void setupTruncateTokenFilterDeserializer(ObjectDeserializer<TruncateTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::length, JsonpDeserializer.integerDeserializer(), "length");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/UaxEmailUrlTokenizer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/UaxEmailUrlTokenizer.java
index 89c632ab5a..56a0b378a7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/UaxEmailUrlTokenizer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/UaxEmailUrlTokenizer.java
@@ -32,115 +32,115 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.UaxEmailUrlTokenizer
 
 @JsonpDeserializable
 public class UaxEmailUrlTokenizer extends TokenizerBase implements TokenizerDefinitionVariant {
-	@Nullable
-	private final Integer maxTokenLength;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private UaxEmailUrlTokenizer(Builder builder) {
-		super(builder);
-
-		this.maxTokenLength = builder.maxTokenLength;
-
-	}
-
-	public static UaxEmailUrlTokenizer of(Function<Builder, ObjectBuilder<UaxEmailUrlTokenizer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenizerDefinition variant kind.
-	 */
-	@Override
-	public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
-		return TokenizerDefinition.Kind.UaxUrlEmail;
-	}
-
-	/**
-	 * API name: {@code max_token_length}
-	 */
-	@Nullable
-	public final Integer maxTokenLength() {
-		return this.maxTokenLength;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "uax_url_email");
-		super.serializeInternal(generator, mapper);
-		if (this.maxTokenLength != null) {
-			generator.writeKey("max_token_length");
-			generator.write(this.maxTokenLength);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UaxEmailUrlTokenizer}.
-	 */
-
-	public static class Builder extends TokenizerBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<UaxEmailUrlTokenizer> {
-		@Nullable
-		private Integer maxTokenLength;
-
-		/**
-		 * API name: {@code max_token_length}
-		 */
-		public final Builder maxTokenLength(@Nullable Integer value) {
-			this.maxTokenLength = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link UaxEmailUrlTokenizer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UaxEmailUrlTokenizer build() {
-			_checkSingleUse();
-
-			return new UaxEmailUrlTokenizer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link UaxEmailUrlTokenizer}
-	 */
-	public static final JsonpDeserializer<UaxEmailUrlTokenizer> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, UaxEmailUrlTokenizer::setupUaxEmailUrlTokenizerDeserializer);
-
-	protected static void setupUaxEmailUrlTokenizerDeserializer(ObjectDeserializer<UaxEmailUrlTokenizer.Builder> op) {
-		TokenizerBase.setupTokenizerBaseDeserializer(op);
-		op.add(Builder::maxTokenLength, JsonpDeserializer.integerDeserializer(), "max_token_length");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Integer maxTokenLength;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private UaxEmailUrlTokenizer(Builder builder) {
+        super(builder);
+
+        this.maxTokenLength = builder.maxTokenLength;
+
+    }
+
+    public static UaxEmailUrlTokenizer of(Function<Builder, ObjectBuilder<UaxEmailUrlTokenizer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenizerDefinition variant kind.
+     */
+    @Override
+    public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
+        return TokenizerDefinition.Kind.UaxUrlEmail;
+    }
+
+    /**
+     * API name: {@code max_token_length}
+     */
+    @Nullable
+    public final Integer maxTokenLength() {
+        return this.maxTokenLength;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "uax_url_email");
+        super.serializeInternal(generator, mapper);
+        if (this.maxTokenLength != null) {
+            generator.writeKey("max_token_length");
+            generator.write(this.maxTokenLength);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UaxEmailUrlTokenizer}.
+     */
+
+    public static class Builder extends TokenizerBase.AbstractBuilder<Builder> implements ObjectBuilder<UaxEmailUrlTokenizer> {
+        @Nullable
+        private Integer maxTokenLength;
+
+        /**
+         * API name: {@code max_token_length}
+         */
+        public final Builder maxTokenLength(@Nullable Integer value) {
+            this.maxTokenLength = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link UaxEmailUrlTokenizer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UaxEmailUrlTokenizer build() {
+            _checkSingleUse();
+
+            return new UaxEmailUrlTokenizer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link UaxEmailUrlTokenizer}
+     */
+    public static final JsonpDeserializer<UaxEmailUrlTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        UaxEmailUrlTokenizer::setupUaxEmailUrlTokenizerDeserializer
+    );
+
+    protected static void setupUaxEmailUrlTokenizerDeserializer(ObjectDeserializer<UaxEmailUrlTokenizer.Builder> op) {
+        TokenizerBase.setupTokenizerBaseDeserializer(op);
+        op.add(Builder::maxTokenLength, JsonpDeserializer.integerDeserializer(), "max_token_length");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/UniqueTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/UniqueTokenFilter.java
index eeae463a75..90f714e78d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/UniqueTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/UniqueTokenFilter.java
@@ -32,115 +32,115 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.UniqueTokenFilter
 
 @JsonpDeserializable
 public class UniqueTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	@Nullable
-	private final Boolean onlyOnSamePosition;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private UniqueTokenFilter(Builder builder) {
-		super(builder);
-
-		this.onlyOnSamePosition = builder.onlyOnSamePosition;
-
-	}
-
-	public static UniqueTokenFilter of(Function<Builder, ObjectBuilder<UniqueTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Unique;
-	}
-
-	/**
-	 * API name: {@code only_on_same_position}
-	 */
-	@Nullable
-	public final Boolean onlyOnSamePosition() {
-		return this.onlyOnSamePosition;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "unique");
-		super.serializeInternal(generator, mapper);
-		if (this.onlyOnSamePosition != null) {
-			generator.writeKey("only_on_same_position");
-			generator.write(this.onlyOnSamePosition);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UniqueTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<UniqueTokenFilter> {
-		@Nullable
-		private Boolean onlyOnSamePosition;
-
-		/**
-		 * API name: {@code only_on_same_position}
-		 */
-		public final Builder onlyOnSamePosition(@Nullable Boolean value) {
-			this.onlyOnSamePosition = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link UniqueTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UniqueTokenFilter build() {
-			_checkSingleUse();
-
-			return new UniqueTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link UniqueTokenFilter}
-	 */
-	public static final JsonpDeserializer<UniqueTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, UniqueTokenFilter::setupUniqueTokenFilterDeserializer);
-
-	protected static void setupUniqueTokenFilterDeserializer(ObjectDeserializer<UniqueTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::onlyOnSamePosition, JsonpDeserializer.booleanDeserializer(), "only_on_same_position");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Boolean onlyOnSamePosition;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private UniqueTokenFilter(Builder builder) {
+        super(builder);
+
+        this.onlyOnSamePosition = builder.onlyOnSamePosition;
+
+    }
+
+    public static UniqueTokenFilter of(Function<Builder, ObjectBuilder<UniqueTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Unique;
+    }
+
+    /**
+     * API name: {@code only_on_same_position}
+     */
+    @Nullable
+    public final Boolean onlyOnSamePosition() {
+        return this.onlyOnSamePosition;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "unique");
+        super.serializeInternal(generator, mapper);
+        if (this.onlyOnSamePosition != null) {
+            generator.writeKey("only_on_same_position");
+            generator.write(this.onlyOnSamePosition);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UniqueTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<UniqueTokenFilter> {
+        @Nullable
+        private Boolean onlyOnSamePosition;
+
+        /**
+         * API name: {@code only_on_same_position}
+         */
+        public final Builder onlyOnSamePosition(@Nullable Boolean value) {
+            this.onlyOnSamePosition = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link UniqueTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UniqueTokenFilter build() {
+            _checkSingleUse();
+
+            return new UniqueTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link UniqueTokenFilter}
+     */
+    public static final JsonpDeserializer<UniqueTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        UniqueTokenFilter::setupUniqueTokenFilterDeserializer
+    );
+
+    protected static void setupUniqueTokenFilterDeserializer(ObjectDeserializer<UniqueTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::onlyOnSamePosition, JsonpDeserializer.booleanDeserializer(), "only_on_same_position");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/UppercaseTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/UppercaseTokenFilter.java
index 066c9787ac..cbfea5eb74 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/UppercaseTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/UppercaseTokenFilter.java
@@ -32,86 +32,84 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.analysis.UppercaseTokenFilter
 
-
 @JsonpDeserializable
 public class UppercaseTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private UppercaseTokenFilter(Builder builder) {
-		super(builder);
+    private UppercaseTokenFilter(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static UppercaseTokenFilter of(Function<Builder, ObjectBuilder<UppercaseTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static UppercaseTokenFilter of(Function<Builder, ObjectBuilder<UppercaseTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.Uppercase;
-	}
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.Uppercase;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "uppercase");
-		super.serializeInternal(generator, mapper);
+        generator.write("type", "uppercase");
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link UppercaseTokenFilter}.
-	 */
+    /**
+     * Builder for {@link UppercaseTokenFilter}.
+     */
 
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<UppercaseTokenFilter> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<UppercaseTokenFilter> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link UppercaseTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UppercaseTokenFilter build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link UppercaseTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UppercaseTokenFilter build() {
+            _checkSingleUse();
 
-			return new UppercaseTokenFilter(this);
-		}
-	}
+            return new UppercaseTokenFilter(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link UppercaseTokenFilter}
-	 */
-	public static final JsonpDeserializer<UppercaseTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, UppercaseTokenFilter::setupUppercaseTokenFilterDeserializer);
+    /**
+     * Json deserializer for {@link UppercaseTokenFilter}
+     */
+    public static final JsonpDeserializer<UppercaseTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        UppercaseTokenFilter::setupUppercaseTokenFilterDeserializer
+    );
 
-	protected static void setupUppercaseTokenFilterDeserializer(ObjectDeserializer<UppercaseTokenFilter.Builder> op) {
-		setupTokenFilterBaseDeserializer(op);
+    protected static void setupUppercaseTokenFilterDeserializer(ObjectDeserializer<UppercaseTokenFilter.Builder> op) {
+        setupTokenFilterBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WhitespaceAnalyzer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WhitespaceAnalyzer.java
index 56d7e9a98b..b76c5ac4f4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WhitespaceAnalyzer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WhitespaceAnalyzer.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,110 +43,109 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.WhitespaceAnalyzer
 
 @JsonpDeserializable
 public class WhitespaceAnalyzer implements AnalyzerVariant, JsonpSerializable {
-	@Nullable
-	private final String version;
+    @Nullable
+    private final String version;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private WhitespaceAnalyzer(Builder builder) {
+    private WhitespaceAnalyzer(Builder builder) {
 
-		this.version = builder.version;
+        this.version = builder.version;
 
-	}
+    }
 
-	public static WhitespaceAnalyzer of(Function<Builder, ObjectBuilder<WhitespaceAnalyzer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static WhitespaceAnalyzer of(Function<Builder, ObjectBuilder<WhitespaceAnalyzer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Analyzer variant kind.
-	 */
-	@Override
-	public Analyzer.Kind _analyzerKind() {
-		return Analyzer.Kind.Whitespace;
-	}
+    /**
+     * Analyzer variant kind.
+     */
+    @Override
+    public Analyzer.Kind _analyzerKind() {
+        return Analyzer.Kind.Whitespace;
+    }
 
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final String version() {
-		return this.version;
-	}
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final String version() {
+        return this.version;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "whitespace");
+        generator.write("type", "whitespace");
 
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link WhitespaceAnalyzer}.
-	 */
+    /**
+     * Builder for {@link WhitespaceAnalyzer}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<WhitespaceAnalyzer> {
-		@Nullable
-		private String version;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<WhitespaceAnalyzer> {
+        @Nullable
+        private String version;
 
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable String value) {
-			this.version = value;
-			return this;
-		}
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable String value) {
+            this.version = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link WhitespaceAnalyzer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public WhitespaceAnalyzer build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link WhitespaceAnalyzer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public WhitespaceAnalyzer build() {
+            _checkSingleUse();
 
-			return new WhitespaceAnalyzer(this);
-		}
-	}
+            return new WhitespaceAnalyzer(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link WhitespaceAnalyzer}
-	 */
-	public static final JsonpDeserializer<WhitespaceAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, WhitespaceAnalyzer::setupWhitespaceAnalyzerDeserializer);
+    /**
+     * Json deserializer for {@link WhitespaceAnalyzer}
+     */
+    public static final JsonpDeserializer<WhitespaceAnalyzer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        WhitespaceAnalyzer::setupWhitespaceAnalyzerDeserializer
+    );
 
-	protected static void setupWhitespaceAnalyzerDeserializer(ObjectDeserializer<WhitespaceAnalyzer.Builder> op) {
+    protected static void setupWhitespaceAnalyzerDeserializer(ObjectDeserializer<WhitespaceAnalyzer.Builder> op) {
 
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WhitespaceTokenizer.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WhitespaceTokenizer.java
index 2c34489d9d..1b5cb2fa4a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WhitespaceTokenizer.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WhitespaceTokenizer.java
@@ -32,115 +32,115 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.WhitespaceTokenizer
 
 @JsonpDeserializable
 public class WhitespaceTokenizer extends TokenizerBase implements TokenizerDefinitionVariant {
-	@Nullable
-	private final Integer maxTokenLength;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private WhitespaceTokenizer(Builder builder) {
-		super(builder);
-
-		this.maxTokenLength = builder.maxTokenLength;
-
-	}
-
-	public static WhitespaceTokenizer of(Function<Builder, ObjectBuilder<WhitespaceTokenizer>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenizerDefinition variant kind.
-	 */
-	@Override
-	public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
-		return TokenizerDefinition.Kind.Whitespace;
-	}
-
-	/**
-	 * API name: {@code max_token_length}
-	 */
-	@Nullable
-	public final Integer maxTokenLength() {
-		return this.maxTokenLength;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "whitespace");
-		super.serializeInternal(generator, mapper);
-		if (this.maxTokenLength != null) {
-			generator.writeKey("max_token_length");
-			generator.write(this.maxTokenLength);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link WhitespaceTokenizer}.
-	 */
-
-	public static class Builder extends TokenizerBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<WhitespaceTokenizer> {
-		@Nullable
-		private Integer maxTokenLength;
-
-		/**
-		 * API name: {@code max_token_length}
-		 */
-		public final Builder maxTokenLength(@Nullable Integer value) {
-			this.maxTokenLength = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link WhitespaceTokenizer}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public WhitespaceTokenizer build() {
-			_checkSingleUse();
-
-			return new WhitespaceTokenizer(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link WhitespaceTokenizer}
-	 */
-	public static final JsonpDeserializer<WhitespaceTokenizer> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, WhitespaceTokenizer::setupWhitespaceTokenizerDeserializer);
-
-	protected static void setupWhitespaceTokenizerDeserializer(ObjectDeserializer<WhitespaceTokenizer.Builder> op) {
-		setupTokenizerBaseDeserializer(op);
-		op.add(Builder::maxTokenLength, JsonpDeserializer.integerDeserializer(), "max_token_length");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Integer maxTokenLength;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private WhitespaceTokenizer(Builder builder) {
+        super(builder);
+
+        this.maxTokenLength = builder.maxTokenLength;
+
+    }
+
+    public static WhitespaceTokenizer of(Function<Builder, ObjectBuilder<WhitespaceTokenizer>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenizerDefinition variant kind.
+     */
+    @Override
+    public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
+        return TokenizerDefinition.Kind.Whitespace;
+    }
+
+    /**
+     * API name: {@code max_token_length}
+     */
+    @Nullable
+    public final Integer maxTokenLength() {
+        return this.maxTokenLength;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "whitespace");
+        super.serializeInternal(generator, mapper);
+        if (this.maxTokenLength != null) {
+            generator.writeKey("max_token_length");
+            generator.write(this.maxTokenLength);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link WhitespaceTokenizer}.
+     */
+
+    public static class Builder extends TokenizerBase.AbstractBuilder<Builder> implements ObjectBuilder<WhitespaceTokenizer> {
+        @Nullable
+        private Integer maxTokenLength;
+
+        /**
+         * API name: {@code max_token_length}
+         */
+        public final Builder maxTokenLength(@Nullable Integer value) {
+            this.maxTokenLength = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link WhitespaceTokenizer}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public WhitespaceTokenizer build() {
+            _checkSingleUse();
+
+            return new WhitespaceTokenizer(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link WhitespaceTokenizer}
+     */
+    public static final JsonpDeserializer<WhitespaceTokenizer> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        WhitespaceTokenizer::setupWhitespaceTokenizerDeserializer
+    );
+
+    protected static void setupWhitespaceTokenizerDeserializer(ObjectDeserializer<WhitespaceTokenizer.Builder> op) {
+        setupTokenizerBaseDeserializer(op);
+        op.add(Builder::maxTokenLength, JsonpDeserializer.integerDeserializer(), "max_token_length");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterGraphTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterGraphTokenFilter.java
index 5a973cf768..adc3f85ec5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterGraphTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterGraphTokenFilter.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,549 +43,542 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.WordDelimiterGraphTokenFilter
 
 @JsonpDeserializable
 public class WordDelimiterGraphTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	@Nullable
-	private final Boolean adjustOffsets;
-
-	@Nullable
-	private final Boolean catenateAll;
-
-	@Nullable
-	private final Boolean catenateNumbers;
-
-	@Nullable
-	private final Boolean catenateWords;
-
-	@Nullable
-	private final Boolean generateNumberParts;
-
-	@Nullable
-	private final Boolean generateWordParts;
-
-	@Nullable
-	private final Boolean ignoreKeywords;
-
-	@Nullable
-	private final Boolean preserveOriginal;
-
-	private final List<String> protectedWords;
-
-	@Nullable
-	private final String protectedWordsPath;
-
-	@Nullable
-	private final Boolean splitOnCaseChange;
-
-	@Nullable
-	private final Boolean splitOnNumerics;
-
-	@Nullable
-	private final Boolean stemEnglishPossessive;
-
-	private final List<String> typeTable;
-
-	@Nullable
-	private final String typeTablePath;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private WordDelimiterGraphTokenFilter(Builder builder) {
-		super(builder);
-
-		this.adjustOffsets = builder.adjustOffsets;
-		this.catenateAll = builder.catenateAll;
-		this.catenateNumbers = builder.catenateNumbers;
-		this.catenateWords = builder.catenateWords;
-		this.generateNumberParts = builder.generateNumberParts;
-		this.generateWordParts = builder.generateWordParts;
-		this.ignoreKeywords = builder.ignoreKeywords;
-		this.preserveOriginal = builder.preserveOriginal;
-		this.protectedWords = ApiTypeHelper.unmodifiable(builder.protectedWords);
-		this.protectedWordsPath = builder.protectedWordsPath;
-		this.splitOnCaseChange = builder.splitOnCaseChange;
-		this.splitOnNumerics = builder.splitOnNumerics;
-		this.stemEnglishPossessive = builder.stemEnglishPossessive;
-		this.typeTable = ApiTypeHelper.unmodifiable(builder.typeTable);
-		this.typeTablePath = builder.typeTablePath;
-
-	}
-
-	public static WordDelimiterGraphTokenFilter of(Function<Builder, ObjectBuilder<WordDelimiterGraphTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.WordDelimiterGraph;
-	}
-
-	/**
-	 * API name: {@code adjust_offsets}
-	 */
-	@Nullable
-	public final Boolean adjustOffsets() {
-		return this.adjustOffsets;
-	}
-
-	/**
-	 * API name: {@code catenate_all}
-	 */
-	@Nullable
-	public final Boolean catenateAll() {
-		return this.catenateAll;
-	}
-
-	/**
-	 * API name: {@code catenate_numbers}
-	 */
-	@Nullable
-	public final Boolean catenateNumbers() {
-		return this.catenateNumbers;
-	}
-
-	/**
-	 * API name: {@code catenate_words}
-	 */
-	@Nullable
-	public final Boolean catenateWords() {
-		return this.catenateWords;
-	}
-
-	/**
-	 * API name: {@code generate_number_parts}
-	 */
-	@Nullable
-	public final Boolean generateNumberParts() {
-		return this.generateNumberParts;
-	}
-
-	/**
-	 * API name: {@code generate_word_parts}
-	 */
-	@Nullable
-	public final Boolean generateWordParts() {
-		return this.generateWordParts;
-	}
-
-	/**
-	 * API name: {@code ignore_keywords}
-	 */
-	@Nullable
-	public final Boolean ignoreKeywords() {
-		return this.ignoreKeywords;
-	}
-
-	/**
-	 * API name: {@code preserve_original}
-	 */
-	@Nullable
-	public final Boolean preserveOriginal() {
-		return this.preserveOriginal;
-	}
-
-	/**
-	 * API name: {@code protected_words}
-	 */
-	public final List<String> protectedWords() {
-		return this.protectedWords;
-	}
-
-	/**
-	 * API name: {@code protected_words_path}
-	 */
-	@Nullable
-	public final String protectedWordsPath() {
-		return this.protectedWordsPath;
-	}
-
-	/**
-	 * API name: {@code split_on_case_change}
-	 */
-	@Nullable
-	public final Boolean splitOnCaseChange() {
-		return this.splitOnCaseChange;
-	}
-
-	/**
-	 * API name: {@code split_on_numerics}
-	 */
-	@Nullable
-	public final Boolean splitOnNumerics() {
-		return this.splitOnNumerics;
-	}
-
-	/**
-	 * API name: {@code stem_english_possessive}
-	 */
-	@Nullable
-	public final Boolean stemEnglishPossessive() {
-		return this.stemEnglishPossessive;
-	}
-
-	/**
-	 * API name: {@code type_table}
-	 */
-	public final List<String> typeTable() {
-		return this.typeTable;
-	}
-
-	/**
-	 * API name: {@code type_table_path}
-	 */
-	@Nullable
-	public final String typeTablePath() {
-		return this.typeTablePath;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "word_delimiter_graph");
-		super.serializeInternal(generator, mapper);
-		if (this.adjustOffsets != null) {
-			generator.writeKey("adjust_offsets");
-			generator.write(this.adjustOffsets);
-
-		}
-		if (this.catenateAll != null) {
-			generator.writeKey("catenate_all");
-			generator.write(this.catenateAll);
-
-		}
-		if (this.catenateNumbers != null) {
-			generator.writeKey("catenate_numbers");
-			generator.write(this.catenateNumbers);
-
-		}
-		if (this.catenateWords != null) {
-			generator.writeKey("catenate_words");
-			generator.write(this.catenateWords);
-
-		}
-		if (this.generateNumberParts != null) {
-			generator.writeKey("generate_number_parts");
-			generator.write(this.generateNumberParts);
-
-		}
-		if (this.generateWordParts != null) {
-			generator.writeKey("generate_word_parts");
-			generator.write(this.generateWordParts);
-
-		}
-		if (this.ignoreKeywords != null) {
-			generator.writeKey("ignore_keywords");
-			generator.write(this.ignoreKeywords);
-
-		}
-		if (this.preserveOriginal != null) {
-			generator.writeKey("preserve_original");
-			generator.write(this.preserveOriginal);
-
-		}
-		if (ApiTypeHelper.isDefined(this.protectedWords)) {
-			generator.writeKey("protected_words");
-			generator.writeStartArray();
-			for (String item0 : this.protectedWords) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.protectedWordsPath != null) {
-			generator.writeKey("protected_words_path");
-			generator.write(this.protectedWordsPath);
-
-		}
-		if (this.splitOnCaseChange != null) {
-			generator.writeKey("split_on_case_change");
-			generator.write(this.splitOnCaseChange);
-
-		}
-		if (this.splitOnNumerics != null) {
-			generator.writeKey("split_on_numerics");
-			generator.write(this.splitOnNumerics);
-
-		}
-		if (this.stemEnglishPossessive != null) {
-			generator.writeKey("stem_english_possessive");
-			generator.write(this.stemEnglishPossessive);
-
-		}
-		if (ApiTypeHelper.isDefined(this.typeTable)) {
-			generator.writeKey("type_table");
-			generator.writeStartArray();
-			for (String item0 : this.typeTable) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.typeTablePath != null) {
-			generator.writeKey("type_table_path");
-			generator.write(this.typeTablePath);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link WordDelimiterGraphTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<WordDelimiterGraphTokenFilter> {
-		@Nullable
-		private Boolean adjustOffsets;
-
-		@Nullable
-		private Boolean catenateAll;
-
-		@Nullable
-		private Boolean catenateNumbers;
-
-		@Nullable
-		private Boolean catenateWords;
-
-		@Nullable
-		private Boolean generateNumberParts;
-
-		@Nullable
-		private Boolean generateWordParts;
-
-		@Nullable
-		private Boolean ignoreKeywords;
-
-		@Nullable
-		private Boolean preserveOriginal;
-
-		@Nullable
-		private List<String> protectedWords;
-
-		@Nullable
-		private String protectedWordsPath;
-
-		@Nullable
-		private Boolean splitOnCaseChange;
-
-		@Nullable
-		private Boolean splitOnNumerics;
-
-		@Nullable
-		private Boolean stemEnglishPossessive;
-
-		@Nullable
-		private List<String> typeTable;
-
-		@Nullable
-		private String typeTablePath;
-
-		/**
-		 * API name: {@code adjust_offsets}
-		 */
-		public final Builder adjustOffsets(@Nullable Boolean value) {
-			this.adjustOffsets = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code catenate_all}
-		 */
-		public final Builder catenateAll(@Nullable Boolean value) {
-			this.catenateAll = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code catenate_numbers}
-		 */
-		public final Builder catenateNumbers(@Nullable Boolean value) {
-			this.catenateNumbers = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code catenate_words}
-		 */
-		public final Builder catenateWords(@Nullable Boolean value) {
-			this.catenateWords = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code generate_number_parts}
-		 */
-		public final Builder generateNumberParts(@Nullable Boolean value) {
-			this.generateNumberParts = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code generate_word_parts}
-		 */
-		public final Builder generateWordParts(@Nullable Boolean value) {
-			this.generateWordParts = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_keywords}
-		 */
-		public final Builder ignoreKeywords(@Nullable Boolean value) {
-			this.ignoreKeywords = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code preserve_original}
-		 */
-		public final Builder preserveOriginal(@Nullable Boolean value) {
-			this.preserveOriginal = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code protected_words}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>protectedWords</code>.
-		 */
-		public final Builder protectedWords(List<String> list) {
-			this.protectedWords = _listAddAll(this.protectedWords, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code protected_words}
-		 * <p>
-		 * Adds one or more values to <code>protectedWords</code>.
-		 */
-		public final Builder protectedWords(String value, String... values) {
-			this.protectedWords = _listAdd(this.protectedWords, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code protected_words_path}
-		 */
-		public final Builder protectedWordsPath(@Nullable String value) {
-			this.protectedWordsPath = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code split_on_case_change}
-		 */
-		public final Builder splitOnCaseChange(@Nullable Boolean value) {
-			this.splitOnCaseChange = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code split_on_numerics}
-		 */
-		public final Builder splitOnNumerics(@Nullable Boolean value) {
-			this.splitOnNumerics = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code stem_english_possessive}
-		 */
-		public final Builder stemEnglishPossessive(@Nullable Boolean value) {
-			this.stemEnglishPossessive = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code type_table}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>typeTable</code>.
-		 */
-		public final Builder typeTable(List<String> list) {
-			this.typeTable = _listAddAll(this.typeTable, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code type_table}
-		 * <p>
-		 * Adds one or more values to <code>typeTable</code>.
-		 */
-		public final Builder typeTable(String value, String... values) {
-			this.typeTable = _listAdd(this.typeTable, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code type_table_path}
-		 */
-		public final Builder typeTablePath(@Nullable String value) {
-			this.typeTablePath = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link WordDelimiterGraphTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public WordDelimiterGraphTokenFilter build() {
-			_checkSingleUse();
-
-			return new WordDelimiterGraphTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link WordDelimiterGraphTokenFilter}
-	 */
-	public static final JsonpDeserializer<WordDelimiterGraphTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, WordDelimiterGraphTokenFilter::setupWordDelimiterGraphTokenFilterDeserializer);
-
-	protected static void setupWordDelimiterGraphTokenFilterDeserializer(
-			ObjectDeserializer<WordDelimiterGraphTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::adjustOffsets, JsonpDeserializer.booleanDeserializer(), "adjust_offsets");
-		op.add(Builder::catenateAll, JsonpDeserializer.booleanDeserializer(), "catenate_all");
-		op.add(Builder::catenateNumbers, JsonpDeserializer.booleanDeserializer(), "catenate_numbers");
-		op.add(Builder::catenateWords, JsonpDeserializer.booleanDeserializer(), "catenate_words");
-		op.add(Builder::generateNumberParts, JsonpDeserializer.booleanDeserializer(), "generate_number_parts");
-		op.add(Builder::generateWordParts, JsonpDeserializer.booleanDeserializer(), "generate_word_parts");
-		op.add(Builder::ignoreKeywords, JsonpDeserializer.booleanDeserializer(), "ignore_keywords");
-		op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
-		op.add(Builder::protectedWords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"protected_words");
-		op.add(Builder::protectedWordsPath, JsonpDeserializer.stringDeserializer(), "protected_words_path");
-		op.add(Builder::splitOnCaseChange, JsonpDeserializer.booleanDeserializer(), "split_on_case_change");
-		op.add(Builder::splitOnNumerics, JsonpDeserializer.booleanDeserializer(), "split_on_numerics");
-		op.add(Builder::stemEnglishPossessive, JsonpDeserializer.booleanDeserializer(), "stem_english_possessive");
-		op.add(Builder::typeTable, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"type_table");
-		op.add(Builder::typeTablePath, JsonpDeserializer.stringDeserializer(), "type_table_path");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Boolean adjustOffsets;
+
+    @Nullable
+    private final Boolean catenateAll;
+
+    @Nullable
+    private final Boolean catenateNumbers;
+
+    @Nullable
+    private final Boolean catenateWords;
+
+    @Nullable
+    private final Boolean generateNumberParts;
+
+    @Nullable
+    private final Boolean generateWordParts;
+
+    @Nullable
+    private final Boolean ignoreKeywords;
+
+    @Nullable
+    private final Boolean preserveOriginal;
+
+    private final List<String> protectedWords;
+
+    @Nullable
+    private final String protectedWordsPath;
+
+    @Nullable
+    private final Boolean splitOnCaseChange;
+
+    @Nullable
+    private final Boolean splitOnNumerics;
+
+    @Nullable
+    private final Boolean stemEnglishPossessive;
+
+    private final List<String> typeTable;
+
+    @Nullable
+    private final String typeTablePath;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private WordDelimiterGraphTokenFilter(Builder builder) {
+        super(builder);
+
+        this.adjustOffsets = builder.adjustOffsets;
+        this.catenateAll = builder.catenateAll;
+        this.catenateNumbers = builder.catenateNumbers;
+        this.catenateWords = builder.catenateWords;
+        this.generateNumberParts = builder.generateNumberParts;
+        this.generateWordParts = builder.generateWordParts;
+        this.ignoreKeywords = builder.ignoreKeywords;
+        this.preserveOriginal = builder.preserveOriginal;
+        this.protectedWords = ApiTypeHelper.unmodifiable(builder.protectedWords);
+        this.protectedWordsPath = builder.protectedWordsPath;
+        this.splitOnCaseChange = builder.splitOnCaseChange;
+        this.splitOnNumerics = builder.splitOnNumerics;
+        this.stemEnglishPossessive = builder.stemEnglishPossessive;
+        this.typeTable = ApiTypeHelper.unmodifiable(builder.typeTable);
+        this.typeTablePath = builder.typeTablePath;
+
+    }
+
+    public static WordDelimiterGraphTokenFilter of(Function<Builder, ObjectBuilder<WordDelimiterGraphTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.WordDelimiterGraph;
+    }
+
+    /**
+     * API name: {@code adjust_offsets}
+     */
+    @Nullable
+    public final Boolean adjustOffsets() {
+        return this.adjustOffsets;
+    }
+
+    /**
+     * API name: {@code catenate_all}
+     */
+    @Nullable
+    public final Boolean catenateAll() {
+        return this.catenateAll;
+    }
+
+    /**
+     * API name: {@code catenate_numbers}
+     */
+    @Nullable
+    public final Boolean catenateNumbers() {
+        return this.catenateNumbers;
+    }
+
+    /**
+     * API name: {@code catenate_words}
+     */
+    @Nullable
+    public final Boolean catenateWords() {
+        return this.catenateWords;
+    }
+
+    /**
+     * API name: {@code generate_number_parts}
+     */
+    @Nullable
+    public final Boolean generateNumberParts() {
+        return this.generateNumberParts;
+    }
+
+    /**
+     * API name: {@code generate_word_parts}
+     */
+    @Nullable
+    public final Boolean generateWordParts() {
+        return this.generateWordParts;
+    }
+
+    /**
+     * API name: {@code ignore_keywords}
+     */
+    @Nullable
+    public final Boolean ignoreKeywords() {
+        return this.ignoreKeywords;
+    }
+
+    /**
+     * API name: {@code preserve_original}
+     */
+    @Nullable
+    public final Boolean preserveOriginal() {
+        return this.preserveOriginal;
+    }
+
+    /**
+     * API name: {@code protected_words}
+     */
+    public final List<String> protectedWords() {
+        return this.protectedWords;
+    }
+
+    /**
+     * API name: {@code protected_words_path}
+     */
+    @Nullable
+    public final String protectedWordsPath() {
+        return this.protectedWordsPath;
+    }
+
+    /**
+     * API name: {@code split_on_case_change}
+     */
+    @Nullable
+    public final Boolean splitOnCaseChange() {
+        return this.splitOnCaseChange;
+    }
+
+    /**
+     * API name: {@code split_on_numerics}
+     */
+    @Nullable
+    public final Boolean splitOnNumerics() {
+        return this.splitOnNumerics;
+    }
+
+    /**
+     * API name: {@code stem_english_possessive}
+     */
+    @Nullable
+    public final Boolean stemEnglishPossessive() {
+        return this.stemEnglishPossessive;
+    }
+
+    /**
+     * API name: {@code type_table}
+     */
+    public final List<String> typeTable() {
+        return this.typeTable;
+    }
+
+    /**
+     * API name: {@code type_table_path}
+     */
+    @Nullable
+    public final String typeTablePath() {
+        return this.typeTablePath;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "word_delimiter_graph");
+        super.serializeInternal(generator, mapper);
+        if (this.adjustOffsets != null) {
+            generator.writeKey("adjust_offsets");
+            generator.write(this.adjustOffsets);
+
+        }
+        if (this.catenateAll != null) {
+            generator.writeKey("catenate_all");
+            generator.write(this.catenateAll);
+
+        }
+        if (this.catenateNumbers != null) {
+            generator.writeKey("catenate_numbers");
+            generator.write(this.catenateNumbers);
+
+        }
+        if (this.catenateWords != null) {
+            generator.writeKey("catenate_words");
+            generator.write(this.catenateWords);
+
+        }
+        if (this.generateNumberParts != null) {
+            generator.writeKey("generate_number_parts");
+            generator.write(this.generateNumberParts);
+
+        }
+        if (this.generateWordParts != null) {
+            generator.writeKey("generate_word_parts");
+            generator.write(this.generateWordParts);
+
+        }
+        if (this.ignoreKeywords != null) {
+            generator.writeKey("ignore_keywords");
+            generator.write(this.ignoreKeywords);
+
+        }
+        if (this.preserveOriginal != null) {
+            generator.writeKey("preserve_original");
+            generator.write(this.preserveOriginal);
+
+        }
+        if (ApiTypeHelper.isDefined(this.protectedWords)) {
+            generator.writeKey("protected_words");
+            generator.writeStartArray();
+            for (String item0 : this.protectedWords) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.protectedWordsPath != null) {
+            generator.writeKey("protected_words_path");
+            generator.write(this.protectedWordsPath);
+
+        }
+        if (this.splitOnCaseChange != null) {
+            generator.writeKey("split_on_case_change");
+            generator.write(this.splitOnCaseChange);
+
+        }
+        if (this.splitOnNumerics != null) {
+            generator.writeKey("split_on_numerics");
+            generator.write(this.splitOnNumerics);
+
+        }
+        if (this.stemEnglishPossessive != null) {
+            generator.writeKey("stem_english_possessive");
+            generator.write(this.stemEnglishPossessive);
+
+        }
+        if (ApiTypeHelper.isDefined(this.typeTable)) {
+            generator.writeKey("type_table");
+            generator.writeStartArray();
+            for (String item0 : this.typeTable) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.typeTablePath != null) {
+            generator.writeKey("type_table_path");
+            generator.write(this.typeTablePath);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link WordDelimiterGraphTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<WordDelimiterGraphTokenFilter> {
+        @Nullable
+        private Boolean adjustOffsets;
+
+        @Nullable
+        private Boolean catenateAll;
+
+        @Nullable
+        private Boolean catenateNumbers;
+
+        @Nullable
+        private Boolean catenateWords;
+
+        @Nullable
+        private Boolean generateNumberParts;
+
+        @Nullable
+        private Boolean generateWordParts;
+
+        @Nullable
+        private Boolean ignoreKeywords;
+
+        @Nullable
+        private Boolean preserveOriginal;
+
+        @Nullable
+        private List<String> protectedWords;
+
+        @Nullable
+        private String protectedWordsPath;
+
+        @Nullable
+        private Boolean splitOnCaseChange;
+
+        @Nullable
+        private Boolean splitOnNumerics;
+
+        @Nullable
+        private Boolean stemEnglishPossessive;
+
+        @Nullable
+        private List<String> typeTable;
+
+        @Nullable
+        private String typeTablePath;
+
+        /**
+         * API name: {@code adjust_offsets}
+         */
+        public final Builder adjustOffsets(@Nullable Boolean value) {
+            this.adjustOffsets = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code catenate_all}
+         */
+        public final Builder catenateAll(@Nullable Boolean value) {
+            this.catenateAll = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code catenate_numbers}
+         */
+        public final Builder catenateNumbers(@Nullable Boolean value) {
+            this.catenateNumbers = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code catenate_words}
+         */
+        public final Builder catenateWords(@Nullable Boolean value) {
+            this.catenateWords = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code generate_number_parts}
+         */
+        public final Builder generateNumberParts(@Nullable Boolean value) {
+            this.generateNumberParts = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code generate_word_parts}
+         */
+        public final Builder generateWordParts(@Nullable Boolean value) {
+            this.generateWordParts = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_keywords}
+         */
+        public final Builder ignoreKeywords(@Nullable Boolean value) {
+            this.ignoreKeywords = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code preserve_original}
+         */
+        public final Builder preserveOriginal(@Nullable Boolean value) {
+            this.preserveOriginal = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code protected_words}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>protectedWords</code>.
+         */
+        public final Builder protectedWords(List<String> list) {
+            this.protectedWords = _listAddAll(this.protectedWords, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code protected_words}
+         * <p>
+         * Adds one or more values to <code>protectedWords</code>.
+         */
+        public final Builder protectedWords(String value, String... values) {
+            this.protectedWords = _listAdd(this.protectedWords, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code protected_words_path}
+         */
+        public final Builder protectedWordsPath(@Nullable String value) {
+            this.protectedWordsPath = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code split_on_case_change}
+         */
+        public final Builder splitOnCaseChange(@Nullable Boolean value) {
+            this.splitOnCaseChange = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code split_on_numerics}
+         */
+        public final Builder splitOnNumerics(@Nullable Boolean value) {
+            this.splitOnNumerics = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code stem_english_possessive}
+         */
+        public final Builder stemEnglishPossessive(@Nullable Boolean value) {
+            this.stemEnglishPossessive = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code type_table}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>typeTable</code>.
+         */
+        public final Builder typeTable(List<String> list) {
+            this.typeTable = _listAddAll(this.typeTable, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code type_table}
+         * <p>
+         * Adds one or more values to <code>typeTable</code>.
+         */
+        public final Builder typeTable(String value, String... values) {
+            this.typeTable = _listAdd(this.typeTable, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code type_table_path}
+         */
+        public final Builder typeTablePath(@Nullable String value) {
+            this.typeTablePath = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link WordDelimiterGraphTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public WordDelimiterGraphTokenFilter build() {
+            _checkSingleUse();
+
+            return new WordDelimiterGraphTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link WordDelimiterGraphTokenFilter}
+     */
+    public static final JsonpDeserializer<WordDelimiterGraphTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        WordDelimiterGraphTokenFilter::setupWordDelimiterGraphTokenFilterDeserializer
+    );
+
+    protected static void setupWordDelimiterGraphTokenFilterDeserializer(ObjectDeserializer<WordDelimiterGraphTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::adjustOffsets, JsonpDeserializer.booleanDeserializer(), "adjust_offsets");
+        op.add(Builder::catenateAll, JsonpDeserializer.booleanDeserializer(), "catenate_all");
+        op.add(Builder::catenateNumbers, JsonpDeserializer.booleanDeserializer(), "catenate_numbers");
+        op.add(Builder::catenateWords, JsonpDeserializer.booleanDeserializer(), "catenate_words");
+        op.add(Builder::generateNumberParts, JsonpDeserializer.booleanDeserializer(), "generate_number_parts");
+        op.add(Builder::generateWordParts, JsonpDeserializer.booleanDeserializer(), "generate_word_parts");
+        op.add(Builder::ignoreKeywords, JsonpDeserializer.booleanDeserializer(), "ignore_keywords");
+        op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
+        op.add(Builder::protectedWords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "protected_words");
+        op.add(Builder::protectedWordsPath, JsonpDeserializer.stringDeserializer(), "protected_words_path");
+        op.add(Builder::splitOnCaseChange, JsonpDeserializer.booleanDeserializer(), "split_on_case_change");
+        op.add(Builder::splitOnNumerics, JsonpDeserializer.booleanDeserializer(), "split_on_numerics");
+        op.add(Builder::stemEnglishPossessive, JsonpDeserializer.booleanDeserializer(), "stem_english_possessive");
+        op.add(Builder::typeTable, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "type_table");
+        op.add(Builder::typeTablePath, JsonpDeserializer.stringDeserializer(), "type_table_path");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterTokenFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterTokenFilter.java
index 3319540bf6..c12e56f279 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterTokenFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/WordDelimiterTokenFilter.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.analysis;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,492 +43,484 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.analysis.WordDelimiterTokenFilter
 
-
 @JsonpDeserializable
 public class WordDelimiterTokenFilter extends TokenFilterBase implements TokenFilterDefinitionVariant {
-	@Nullable
-	private final Boolean catenateAll;
-
-	@Nullable
-	private final Boolean catenateNumbers;
-
-	@Nullable
-	private final Boolean catenateWords;
-
-	@Nullable
-	private final Boolean generateNumberParts;
-
-	@Nullable
-	private final Boolean generateWordParts;
-
-	@Nullable
-	private final Boolean preserveOriginal;
-
-	private final List<String> protectedWords;
-
-	@Nullable
-	private final String protectedWordsPath;
-
-	@Nullable
-	private final Boolean splitOnCaseChange;
-
-	@Nullable
-	private final Boolean splitOnNumerics;
-
-	@Nullable
-	private final Boolean stemEnglishPossessive;
-
-	private final List<String> typeTable;
-
-	@Nullable
-	private final String typeTablePath;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private WordDelimiterTokenFilter(Builder builder) {
-		super(builder);
-
-		this.catenateAll = builder.catenateAll;
-		this.catenateNumbers = builder.catenateNumbers;
-		this.catenateWords = builder.catenateWords;
-		this.generateNumberParts = builder.generateNumberParts;
-		this.generateWordParts = builder.generateWordParts;
-		this.preserveOriginal = builder.preserveOriginal;
-		this.protectedWords = ApiTypeHelper.unmodifiable(builder.protectedWords);
-		this.protectedWordsPath = builder.protectedWordsPath;
-		this.splitOnCaseChange = builder.splitOnCaseChange;
-		this.splitOnNumerics = builder.splitOnNumerics;
-		this.stemEnglishPossessive = builder.stemEnglishPossessive;
-		this.typeTable = ApiTypeHelper.unmodifiable(builder.typeTable);
-		this.typeTablePath = builder.typeTablePath;
-
-	}
-
-	public static WordDelimiterTokenFilter of(Function<Builder, ObjectBuilder<WordDelimiterTokenFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * TokenFilterDefinition variant kind.
-	 */
-	@Override
-	public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
-		return TokenFilterDefinition.Kind.WordDelimiter;
-	}
-
-	/**
-	 * API name: {@code catenate_all}
-	 */
-	@Nullable
-	public final Boolean catenateAll() {
-		return this.catenateAll;
-	}
-
-	/**
-	 * API name: {@code catenate_numbers}
-	 */
-	@Nullable
-	public final Boolean catenateNumbers() {
-		return this.catenateNumbers;
-	}
-
-	/**
-	 * API name: {@code catenate_words}
-	 */
-	@Nullable
-	public final Boolean catenateWords() {
-		return this.catenateWords;
-	}
-
-	/**
-	 * API name: {@code generate_number_parts}
-	 */
-	@Nullable
-	public final Boolean generateNumberParts() {
-		return this.generateNumberParts;
-	}
-
-	/**
-	 * API name: {@code generate_word_parts}
-	 */
-	@Nullable
-	public final Boolean generateWordParts() {
-		return this.generateWordParts;
-	}
-
-	/**
-	 * API name: {@code preserve_original}
-	 */
-	@Nullable
-	public final Boolean preserveOriginal() {
-		return this.preserveOriginal;
-	}
-
-	/**
-	 * API name: {@code protected_words}
-	 */
-	public final List<String> protectedWords() {
-		return this.protectedWords;
-	}
-
-	/**
-	 * API name: {@code protected_words_path}
-	 */
-	@Nullable
-	public final String protectedWordsPath() {
-		return this.protectedWordsPath;
-	}
-
-	/**
-	 * API name: {@code split_on_case_change}
-	 */
-	@Nullable
-	public final Boolean splitOnCaseChange() {
-		return this.splitOnCaseChange;
-	}
-
-	/**
-	 * API name: {@code split_on_numerics}
-	 */
-	@Nullable
-	public final Boolean splitOnNumerics() {
-		return this.splitOnNumerics;
-	}
-
-	/**
-	 * API name: {@code stem_english_possessive}
-	 */
-	@Nullable
-	public final Boolean stemEnglishPossessive() {
-		return this.stemEnglishPossessive;
-	}
-
-	/**
-	 * API name: {@code type_table}
-	 */
-	public final List<String> typeTable() {
-		return this.typeTable;
-	}
-
-	/**
-	 * API name: {@code type_table_path}
-	 */
-	@Nullable
-	public final String typeTablePath() {
-		return this.typeTablePath;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "word_delimiter");
-		super.serializeInternal(generator, mapper);
-		if (this.catenateAll != null) {
-			generator.writeKey("catenate_all");
-			generator.write(this.catenateAll);
-
-		}
-		if (this.catenateNumbers != null) {
-			generator.writeKey("catenate_numbers");
-			generator.write(this.catenateNumbers);
-
-		}
-		if (this.catenateWords != null) {
-			generator.writeKey("catenate_words");
-			generator.write(this.catenateWords);
-
-		}
-		if (this.generateNumberParts != null) {
-			generator.writeKey("generate_number_parts");
-			generator.write(this.generateNumberParts);
-
-		}
-		if (this.generateWordParts != null) {
-			generator.writeKey("generate_word_parts");
-			generator.write(this.generateWordParts);
-
-		}
-		if (this.preserveOriginal != null) {
-			generator.writeKey("preserve_original");
-			generator.write(this.preserveOriginal);
-
-		}
-		if (ApiTypeHelper.isDefined(this.protectedWords)) {
-			generator.writeKey("protected_words");
-			generator.writeStartArray();
-			for (String item0 : this.protectedWords) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.protectedWordsPath != null) {
-			generator.writeKey("protected_words_path");
-			generator.write(this.protectedWordsPath);
-
-		}
-		if (this.splitOnCaseChange != null) {
-			generator.writeKey("split_on_case_change");
-			generator.write(this.splitOnCaseChange);
-
-		}
-		if (this.splitOnNumerics != null) {
-			generator.writeKey("split_on_numerics");
-			generator.write(this.splitOnNumerics);
-
-		}
-		if (this.stemEnglishPossessive != null) {
-			generator.writeKey("stem_english_possessive");
-			generator.write(this.stemEnglishPossessive);
-
-		}
-		if (ApiTypeHelper.isDefined(this.typeTable)) {
-			generator.writeKey("type_table");
-			generator.writeStartArray();
-			for (String item0 : this.typeTable) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.typeTablePath != null) {
-			generator.writeKey("type_table_path");
-			generator.write(this.typeTablePath);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link WordDelimiterTokenFilter}.
-	 */
-
-	public static class Builder extends TokenFilterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<WordDelimiterTokenFilter> {
-		@Nullable
-		private Boolean catenateAll;
-
-		@Nullable
-		private Boolean catenateNumbers;
-
-		@Nullable
-		private Boolean catenateWords;
-
-		@Nullable
-		private Boolean generateNumberParts;
-
-		@Nullable
-		private Boolean generateWordParts;
-
-		@Nullable
-		private Boolean preserveOriginal;
-
-		@Nullable
-		private List<String> protectedWords;
-
-		@Nullable
-		private String protectedWordsPath;
-
-		@Nullable
-		private Boolean splitOnCaseChange;
-
-		@Nullable
-		private Boolean splitOnNumerics;
-
-		@Nullable
-		private Boolean stemEnglishPossessive;
-
-		@Nullable
-		private List<String> typeTable;
-
-		@Nullable
-		private String typeTablePath;
-
-		/**
-		 * API name: {@code catenate_all}
-		 */
-		public final Builder catenateAll(@Nullable Boolean value) {
-			this.catenateAll = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code catenate_numbers}
-		 */
-		public final Builder catenateNumbers(@Nullable Boolean value) {
-			this.catenateNumbers = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code catenate_words}
-		 */
-		public final Builder catenateWords(@Nullable Boolean value) {
-			this.catenateWords = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code generate_number_parts}
-		 */
-		public final Builder generateNumberParts(@Nullable Boolean value) {
-			this.generateNumberParts = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code generate_word_parts}
-		 */
-		public final Builder generateWordParts(@Nullable Boolean value) {
-			this.generateWordParts = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code preserve_original}
-		 */
-		public final Builder preserveOriginal(@Nullable Boolean value) {
-			this.preserveOriginal = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code protected_words}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>protectedWords</code>.
-		 */
-		public final Builder protectedWords(List<String> list) {
-			this.protectedWords = _listAddAll(this.protectedWords, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code protected_words}
-		 * <p>
-		 * Adds one or more values to <code>protectedWords</code>.
-		 */
-		public final Builder protectedWords(String value, String... values) {
-			this.protectedWords = _listAdd(this.protectedWords, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code protected_words_path}
-		 */
-		public final Builder protectedWordsPath(@Nullable String value) {
-			this.protectedWordsPath = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code split_on_case_change}
-		 */
-		public final Builder splitOnCaseChange(@Nullable Boolean value) {
-			this.splitOnCaseChange = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code split_on_numerics}
-		 */
-		public final Builder splitOnNumerics(@Nullable Boolean value) {
-			this.splitOnNumerics = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code stem_english_possessive}
-		 */
-		public final Builder stemEnglishPossessive(@Nullable Boolean value) {
-			this.stemEnglishPossessive = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code type_table}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>typeTable</code>.
-		 */
-		public final Builder typeTable(List<String> list) {
-			this.typeTable = _listAddAll(this.typeTable, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code type_table}
-		 * <p>
-		 * Adds one or more values to <code>typeTable</code>.
-		 */
-		public final Builder typeTable(String value, String... values) {
-			this.typeTable = _listAdd(this.typeTable, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code type_table_path}
-		 */
-		public final Builder typeTablePath(@Nullable String value) {
-			this.typeTablePath = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link WordDelimiterTokenFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public WordDelimiterTokenFilter build() {
-			_checkSingleUse();
-
-			return new WordDelimiterTokenFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link WordDelimiterTokenFilter}
-	 */
-	public static final JsonpDeserializer<WordDelimiterTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, WordDelimiterTokenFilter::setupWordDelimiterTokenFilterDeserializer);
-
-	protected static void setupWordDelimiterTokenFilterDeserializer(
-			ObjectDeserializer<WordDelimiterTokenFilter.Builder> op) {
-		TokenFilterBase.setupTokenFilterBaseDeserializer(op);
-		op.add(Builder::catenateAll, JsonpDeserializer.booleanDeserializer(), "catenate_all");
-		op.add(Builder::catenateNumbers, JsonpDeserializer.booleanDeserializer(), "catenate_numbers");
-		op.add(Builder::catenateWords, JsonpDeserializer.booleanDeserializer(), "catenate_words");
-		op.add(Builder::generateNumberParts, JsonpDeserializer.booleanDeserializer(), "generate_number_parts");
-		op.add(Builder::generateWordParts, JsonpDeserializer.booleanDeserializer(), "generate_word_parts");
-		op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
-		op.add(Builder::protectedWords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"protected_words");
-		op.add(Builder::protectedWordsPath, JsonpDeserializer.stringDeserializer(), "protected_words_path");
-		op.add(Builder::splitOnCaseChange, JsonpDeserializer.booleanDeserializer(), "split_on_case_change");
-		op.add(Builder::splitOnNumerics, JsonpDeserializer.booleanDeserializer(), "split_on_numerics");
-		op.add(Builder::stemEnglishPossessive, JsonpDeserializer.booleanDeserializer(), "stem_english_possessive");
-		op.add(Builder::typeTable, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"type_table");
-		op.add(Builder::typeTablePath, JsonpDeserializer.stringDeserializer(), "type_table_path");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Boolean catenateAll;
+
+    @Nullable
+    private final Boolean catenateNumbers;
+
+    @Nullable
+    private final Boolean catenateWords;
+
+    @Nullable
+    private final Boolean generateNumberParts;
+
+    @Nullable
+    private final Boolean generateWordParts;
+
+    @Nullable
+    private final Boolean preserveOriginal;
+
+    private final List<String> protectedWords;
+
+    @Nullable
+    private final String protectedWordsPath;
+
+    @Nullable
+    private final Boolean splitOnCaseChange;
+
+    @Nullable
+    private final Boolean splitOnNumerics;
+
+    @Nullable
+    private final Boolean stemEnglishPossessive;
+
+    private final List<String> typeTable;
+
+    @Nullable
+    private final String typeTablePath;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private WordDelimiterTokenFilter(Builder builder) {
+        super(builder);
+
+        this.catenateAll = builder.catenateAll;
+        this.catenateNumbers = builder.catenateNumbers;
+        this.catenateWords = builder.catenateWords;
+        this.generateNumberParts = builder.generateNumberParts;
+        this.generateWordParts = builder.generateWordParts;
+        this.preserveOriginal = builder.preserveOriginal;
+        this.protectedWords = ApiTypeHelper.unmodifiable(builder.protectedWords);
+        this.protectedWordsPath = builder.protectedWordsPath;
+        this.splitOnCaseChange = builder.splitOnCaseChange;
+        this.splitOnNumerics = builder.splitOnNumerics;
+        this.stemEnglishPossessive = builder.stemEnglishPossessive;
+        this.typeTable = ApiTypeHelper.unmodifiable(builder.typeTable);
+        this.typeTablePath = builder.typeTablePath;
+
+    }
+
+    public static WordDelimiterTokenFilter of(Function<Builder, ObjectBuilder<WordDelimiterTokenFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * TokenFilterDefinition variant kind.
+     */
+    @Override
+    public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
+        return TokenFilterDefinition.Kind.WordDelimiter;
+    }
+
+    /**
+     * API name: {@code catenate_all}
+     */
+    @Nullable
+    public final Boolean catenateAll() {
+        return this.catenateAll;
+    }
+
+    /**
+     * API name: {@code catenate_numbers}
+     */
+    @Nullable
+    public final Boolean catenateNumbers() {
+        return this.catenateNumbers;
+    }
+
+    /**
+     * API name: {@code catenate_words}
+     */
+    @Nullable
+    public final Boolean catenateWords() {
+        return this.catenateWords;
+    }
+
+    /**
+     * API name: {@code generate_number_parts}
+     */
+    @Nullable
+    public final Boolean generateNumberParts() {
+        return this.generateNumberParts;
+    }
+
+    /**
+     * API name: {@code generate_word_parts}
+     */
+    @Nullable
+    public final Boolean generateWordParts() {
+        return this.generateWordParts;
+    }
+
+    /**
+     * API name: {@code preserve_original}
+     */
+    @Nullable
+    public final Boolean preserveOriginal() {
+        return this.preserveOriginal;
+    }
+
+    /**
+     * API name: {@code protected_words}
+     */
+    public final List<String> protectedWords() {
+        return this.protectedWords;
+    }
+
+    /**
+     * API name: {@code protected_words_path}
+     */
+    @Nullable
+    public final String protectedWordsPath() {
+        return this.protectedWordsPath;
+    }
+
+    /**
+     * API name: {@code split_on_case_change}
+     */
+    @Nullable
+    public final Boolean splitOnCaseChange() {
+        return this.splitOnCaseChange;
+    }
+
+    /**
+     * API name: {@code split_on_numerics}
+     */
+    @Nullable
+    public final Boolean splitOnNumerics() {
+        return this.splitOnNumerics;
+    }
+
+    /**
+     * API name: {@code stem_english_possessive}
+     */
+    @Nullable
+    public final Boolean stemEnglishPossessive() {
+        return this.stemEnglishPossessive;
+    }
+
+    /**
+     * API name: {@code type_table}
+     */
+    public final List<String> typeTable() {
+        return this.typeTable;
+    }
+
+    /**
+     * API name: {@code type_table_path}
+     */
+    @Nullable
+    public final String typeTablePath() {
+        return this.typeTablePath;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "word_delimiter");
+        super.serializeInternal(generator, mapper);
+        if (this.catenateAll != null) {
+            generator.writeKey("catenate_all");
+            generator.write(this.catenateAll);
+
+        }
+        if (this.catenateNumbers != null) {
+            generator.writeKey("catenate_numbers");
+            generator.write(this.catenateNumbers);
+
+        }
+        if (this.catenateWords != null) {
+            generator.writeKey("catenate_words");
+            generator.write(this.catenateWords);
+
+        }
+        if (this.generateNumberParts != null) {
+            generator.writeKey("generate_number_parts");
+            generator.write(this.generateNumberParts);
+
+        }
+        if (this.generateWordParts != null) {
+            generator.writeKey("generate_word_parts");
+            generator.write(this.generateWordParts);
+
+        }
+        if (this.preserveOriginal != null) {
+            generator.writeKey("preserve_original");
+            generator.write(this.preserveOriginal);
+
+        }
+        if (ApiTypeHelper.isDefined(this.protectedWords)) {
+            generator.writeKey("protected_words");
+            generator.writeStartArray();
+            for (String item0 : this.protectedWords) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.protectedWordsPath != null) {
+            generator.writeKey("protected_words_path");
+            generator.write(this.protectedWordsPath);
+
+        }
+        if (this.splitOnCaseChange != null) {
+            generator.writeKey("split_on_case_change");
+            generator.write(this.splitOnCaseChange);
+
+        }
+        if (this.splitOnNumerics != null) {
+            generator.writeKey("split_on_numerics");
+            generator.write(this.splitOnNumerics);
+
+        }
+        if (this.stemEnglishPossessive != null) {
+            generator.writeKey("stem_english_possessive");
+            generator.write(this.stemEnglishPossessive);
+
+        }
+        if (ApiTypeHelper.isDefined(this.typeTable)) {
+            generator.writeKey("type_table");
+            generator.writeStartArray();
+            for (String item0 : this.typeTable) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.typeTablePath != null) {
+            generator.writeKey("type_table_path");
+            generator.write(this.typeTablePath);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link WordDelimiterTokenFilter}.
+     */
+
+    public static class Builder extends TokenFilterBase.AbstractBuilder<Builder> implements ObjectBuilder<WordDelimiterTokenFilter> {
+        @Nullable
+        private Boolean catenateAll;
+
+        @Nullable
+        private Boolean catenateNumbers;
+
+        @Nullable
+        private Boolean catenateWords;
+
+        @Nullable
+        private Boolean generateNumberParts;
+
+        @Nullable
+        private Boolean generateWordParts;
+
+        @Nullable
+        private Boolean preserveOriginal;
+
+        @Nullable
+        private List<String> protectedWords;
+
+        @Nullable
+        private String protectedWordsPath;
+
+        @Nullable
+        private Boolean splitOnCaseChange;
+
+        @Nullable
+        private Boolean splitOnNumerics;
+
+        @Nullable
+        private Boolean stemEnglishPossessive;
+
+        @Nullable
+        private List<String> typeTable;
+
+        @Nullable
+        private String typeTablePath;
+
+        /**
+         * API name: {@code catenate_all}
+         */
+        public final Builder catenateAll(@Nullable Boolean value) {
+            this.catenateAll = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code catenate_numbers}
+         */
+        public final Builder catenateNumbers(@Nullable Boolean value) {
+            this.catenateNumbers = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code catenate_words}
+         */
+        public final Builder catenateWords(@Nullable Boolean value) {
+            this.catenateWords = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code generate_number_parts}
+         */
+        public final Builder generateNumberParts(@Nullable Boolean value) {
+            this.generateNumberParts = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code generate_word_parts}
+         */
+        public final Builder generateWordParts(@Nullable Boolean value) {
+            this.generateWordParts = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code preserve_original}
+         */
+        public final Builder preserveOriginal(@Nullable Boolean value) {
+            this.preserveOriginal = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code protected_words}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>protectedWords</code>.
+         */
+        public final Builder protectedWords(List<String> list) {
+            this.protectedWords = _listAddAll(this.protectedWords, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code protected_words}
+         * <p>
+         * Adds one or more values to <code>protectedWords</code>.
+         */
+        public final Builder protectedWords(String value, String... values) {
+            this.protectedWords = _listAdd(this.protectedWords, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code protected_words_path}
+         */
+        public final Builder protectedWordsPath(@Nullable String value) {
+            this.protectedWordsPath = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code split_on_case_change}
+         */
+        public final Builder splitOnCaseChange(@Nullable Boolean value) {
+            this.splitOnCaseChange = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code split_on_numerics}
+         */
+        public final Builder splitOnNumerics(@Nullable Boolean value) {
+            this.splitOnNumerics = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code stem_english_possessive}
+         */
+        public final Builder stemEnglishPossessive(@Nullable Boolean value) {
+            this.stemEnglishPossessive = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code type_table}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>typeTable</code>.
+         */
+        public final Builder typeTable(List<String> list) {
+            this.typeTable = _listAddAll(this.typeTable, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code type_table}
+         * <p>
+         * Adds one or more values to <code>typeTable</code>.
+         */
+        public final Builder typeTable(String value, String... values) {
+            this.typeTable = _listAdd(this.typeTable, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code type_table_path}
+         */
+        public final Builder typeTablePath(@Nullable String value) {
+            this.typeTablePath = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link WordDelimiterTokenFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public WordDelimiterTokenFilter build() {
+            _checkSingleUse();
+
+            return new WordDelimiterTokenFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link WordDelimiterTokenFilter}
+     */
+    public static final JsonpDeserializer<WordDelimiterTokenFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        WordDelimiterTokenFilter::setupWordDelimiterTokenFilterDeserializer
+    );
+
+    protected static void setupWordDelimiterTokenFilterDeserializer(ObjectDeserializer<WordDelimiterTokenFilter.Builder> op) {
+        TokenFilterBase.setupTokenFilterBaseDeserializer(op);
+        op.add(Builder::catenateAll, JsonpDeserializer.booleanDeserializer(), "catenate_all");
+        op.add(Builder::catenateNumbers, JsonpDeserializer.booleanDeserializer(), "catenate_numbers");
+        op.add(Builder::catenateWords, JsonpDeserializer.booleanDeserializer(), "catenate_words");
+        op.add(Builder::generateNumberParts, JsonpDeserializer.booleanDeserializer(), "generate_number_parts");
+        op.add(Builder::generateWordParts, JsonpDeserializer.booleanDeserializer(), "generate_word_parts");
+        op.add(Builder::preserveOriginal, JsonpDeserializer.booleanDeserializer(), "preserve_original");
+        op.add(Builder::protectedWords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "protected_words");
+        op.add(Builder::protectedWordsPath, JsonpDeserializer.stringDeserializer(), "protected_words_path");
+        op.add(Builder::splitOnCaseChange, JsonpDeserializer.booleanDeserializer(), "split_on_case_change");
+        op.add(Builder::splitOnNumerics, JsonpDeserializer.booleanDeserializer(), "split_on_numerics");
+        op.add(Builder::stemEnglishPossessive, JsonpDeserializer.booleanDeserializer(), "stem_english_possessive");
+        op.add(Builder::typeTable, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "type_table");
+        op.add(Builder::typeTablePath, JsonpDeserializer.stringDeserializer(), "type_table_path");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/AggregateMetricDoubleProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/AggregateMetricDoubleProperty.java
index 2d864d3a3c..d61da6dfd3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/AggregateMetricDoubleProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/AggregateMetricDoubleProperty.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,150 +42,144 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _types.mapping.AggregateMetricDoubleProperty
 
-
 @JsonpDeserializable
 public class AggregateMetricDoubleProperty extends PropertyBase implements PropertyVariant {
-	private final String defaultMetric;
-
-	private final List<String> metrics;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AggregateMetricDoubleProperty(Builder builder) {
-		super(builder);
-
-		this.defaultMetric = ApiTypeHelper.requireNonNull(builder.defaultMetric, this, "defaultMetric");
-		this.metrics = ApiTypeHelper.unmodifiableRequired(builder.metrics, this, "metrics");
-
-	}
-
-	public static AggregateMetricDoubleProperty of(Function<Builder, ObjectBuilder<AggregateMetricDoubleProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.AggregateMetricDouble;
-	}
-
-	/**
-	 * Required - API name: {@code default_metric}
-	 */
-	public final String defaultMetric() {
-		return this.defaultMetric;
-	}
-
-	/**
-	 * Required - API name: {@code metrics}
-	 */
-	public final List<String> metrics() {
-		return this.metrics;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "aggregate_metric_double");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("default_metric");
-		generator.write(this.defaultMetric);
-
-		if (ApiTypeHelper.isDefined(this.metrics)) {
-			generator.writeKey("metrics");
-			generator.writeStartArray();
-			for (String item0 : this.metrics) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AggregateMetricDoubleProperty}.
-	 */
-
-	public static class Builder extends PropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<AggregateMetricDoubleProperty> {
-		private String defaultMetric;
-
-		private List<String> metrics;
-
-		/**
-		 * Required - API name: {@code default_metric}
-		 */
-		public final Builder defaultMetric(String value) {
-			this.defaultMetric = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code metrics}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>metrics</code>.
-		 */
-		public final Builder metrics(List<String> list) {
-			this.metrics = _listAddAll(this.metrics, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code metrics}
-		 * <p>
-		 * Adds one or more values to <code>metrics</code>.
-		 */
-		public final Builder metrics(String value, String... values) {
-			this.metrics = _listAdd(this.metrics, value, values);
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AggregateMetricDoubleProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AggregateMetricDoubleProperty build() {
-			_checkSingleUse();
-
-			return new AggregateMetricDoubleProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AggregateMetricDoubleProperty}
-	 */
-	public static final JsonpDeserializer<AggregateMetricDoubleProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, AggregateMetricDoubleProperty::setupAggregateMetricDoublePropertyDeserializer);
-
-	protected static void setupAggregateMetricDoublePropertyDeserializer(
-			ObjectDeserializer<AggregateMetricDoubleProperty.Builder> op) {
-		PropertyBase.setupPropertyBaseDeserializer(op);
-		op.add(Builder::defaultMetric, JsonpDeserializer.stringDeserializer(), "default_metric");
-		op.add(Builder::metrics, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"metrics");
-
-		op.ignore("type");
-	}
+    private final String defaultMetric;
+
+    private final List<String> metrics;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AggregateMetricDoubleProperty(Builder builder) {
+        super(builder);
+
+        this.defaultMetric = ApiTypeHelper.requireNonNull(builder.defaultMetric, this, "defaultMetric");
+        this.metrics = ApiTypeHelper.unmodifiableRequired(builder.metrics, this, "metrics");
+
+    }
+
+    public static AggregateMetricDoubleProperty of(Function<Builder, ObjectBuilder<AggregateMetricDoubleProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.AggregateMetricDouble;
+    }
+
+    /**
+     * Required - API name: {@code default_metric}
+     */
+    public final String defaultMetric() {
+        return this.defaultMetric;
+    }
+
+    /**
+     * Required - API name: {@code metrics}
+     */
+    public final List<String> metrics() {
+        return this.metrics;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "aggregate_metric_double");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("default_metric");
+        generator.write(this.defaultMetric);
+
+        if (ApiTypeHelper.isDefined(this.metrics)) {
+            generator.writeKey("metrics");
+            generator.writeStartArray();
+            for (String item0 : this.metrics) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AggregateMetricDoubleProperty}.
+     */
+
+    public static class Builder extends PropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<AggregateMetricDoubleProperty> {
+        private String defaultMetric;
+
+        private List<String> metrics;
+
+        /**
+         * Required - API name: {@code default_metric}
+         */
+        public final Builder defaultMetric(String value) {
+            this.defaultMetric = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code metrics}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>metrics</code>.
+         */
+        public final Builder metrics(List<String> list) {
+            this.metrics = _listAddAll(this.metrics, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code metrics}
+         * <p>
+         * Adds one or more values to <code>metrics</code>.
+         */
+        public final Builder metrics(String value, String... values) {
+            this.metrics = _listAdd(this.metrics, value, values);
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link AggregateMetricDoubleProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AggregateMetricDoubleProperty build() {
+            _checkSingleUse();
+
+            return new AggregateMetricDoubleProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AggregateMetricDoubleProperty}
+     */
+    public static final JsonpDeserializer<AggregateMetricDoubleProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AggregateMetricDoubleProperty::setupAggregateMetricDoublePropertyDeserializer
+    );
+
+    protected static void setupAggregateMetricDoublePropertyDeserializer(ObjectDeserializer<AggregateMetricDoubleProperty.Builder> op) {
+        PropertyBase.setupPropertyBaseDeserializer(op);
+        op.add(Builder::defaultMetric, JsonpDeserializer.stringDeserializer(), "default_metric");
+        op.add(Builder::metrics, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "metrics");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/AllField.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/AllField.java
index ce169cda46..f9b930c234 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/AllField.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/AllField.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,313 +43,308 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.mapping.AllField
 
-
 @JsonpDeserializable
 public class AllField implements JsonpSerializable {
-	private final String analyzer;
-
-	private final boolean enabled;
-
-	private final boolean omitNorms;
-
-	private final String searchAnalyzer;
-
-	private final String similarity;
-
-	private final boolean store;
-
-	private final boolean storeTermVectorOffsets;
-
-	private final boolean storeTermVectorPayloads;
-
-	private final boolean storeTermVectorPositions;
-
-	private final boolean storeTermVectors;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AllField(Builder builder) {
-
-		this.analyzer = ApiTypeHelper.requireNonNull(builder.analyzer, this, "analyzer");
-		this.enabled = ApiTypeHelper.requireNonNull(builder.enabled, this, "enabled");
-		this.omitNorms = ApiTypeHelper.requireNonNull(builder.omitNorms, this, "omitNorms");
-		this.searchAnalyzer = ApiTypeHelper.requireNonNull(builder.searchAnalyzer, this, "searchAnalyzer");
-		this.similarity = ApiTypeHelper.requireNonNull(builder.similarity, this, "similarity");
-		this.store = ApiTypeHelper.requireNonNull(builder.store, this, "store");
-		this.storeTermVectorOffsets = ApiTypeHelper.requireNonNull(builder.storeTermVectorOffsets, this,
-				"storeTermVectorOffsets");
-		this.storeTermVectorPayloads = ApiTypeHelper.requireNonNull(builder.storeTermVectorPayloads, this,
-				"storeTermVectorPayloads");
-		this.storeTermVectorPositions = ApiTypeHelper.requireNonNull(builder.storeTermVectorPositions, this,
-				"storeTermVectorPositions");
-		this.storeTermVectors = ApiTypeHelper.requireNonNull(builder.storeTermVectors, this, "storeTermVectors");
-
-	}
-
-	public static AllField of(Function<Builder, ObjectBuilder<AllField>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code analyzer}
-	 */
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * Required - API name: {@code enabled}
-	 */
-	public final boolean enabled() {
-		return this.enabled;
-	}
-
-	/**
-	 * Required - API name: {@code omit_norms}
-	 */
-	public final boolean omitNorms() {
-		return this.omitNorms;
-	}
-
-	/**
-	 * Required - API name: {@code search_analyzer}
-	 */
-	public final String searchAnalyzer() {
-		return this.searchAnalyzer;
-	}
+    private final String analyzer;
+
+    private final boolean enabled;
+
+    private final boolean omitNorms;
+
+    private final String searchAnalyzer;
+
+    private final String similarity;
+
+    private final boolean store;
+
+    private final boolean storeTermVectorOffsets;
+
+    private final boolean storeTermVectorPayloads;
+
+    private final boolean storeTermVectorPositions;
+
+    private final boolean storeTermVectors;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AllField(Builder builder) {
+
+        this.analyzer = ApiTypeHelper.requireNonNull(builder.analyzer, this, "analyzer");
+        this.enabled = ApiTypeHelper.requireNonNull(builder.enabled, this, "enabled");
+        this.omitNorms = ApiTypeHelper.requireNonNull(builder.omitNorms, this, "omitNorms");
+        this.searchAnalyzer = ApiTypeHelper.requireNonNull(builder.searchAnalyzer, this, "searchAnalyzer");
+        this.similarity = ApiTypeHelper.requireNonNull(builder.similarity, this, "similarity");
+        this.store = ApiTypeHelper.requireNonNull(builder.store, this, "store");
+        this.storeTermVectorOffsets = ApiTypeHelper.requireNonNull(builder.storeTermVectorOffsets, this, "storeTermVectorOffsets");
+        this.storeTermVectorPayloads = ApiTypeHelper.requireNonNull(builder.storeTermVectorPayloads, this, "storeTermVectorPayloads");
+        this.storeTermVectorPositions = ApiTypeHelper.requireNonNull(builder.storeTermVectorPositions, this, "storeTermVectorPositions");
+        this.storeTermVectors = ApiTypeHelper.requireNonNull(builder.storeTermVectors, this, "storeTermVectors");
+
+    }
+
+    public static AllField of(Function<Builder, ObjectBuilder<AllField>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code analyzer}
+     */
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * Required - API name: {@code enabled}
+     */
+    public final boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Required - API name: {@code omit_norms}
+     */
+    public final boolean omitNorms() {
+        return this.omitNorms;
+    }
+
+    /**
+     * Required - API name: {@code search_analyzer}
+     */
+    public final String searchAnalyzer() {
+        return this.searchAnalyzer;
+    }
+
+    /**
+     * Required - API name: {@code similarity}
+     */
+    public final String similarity() {
+        return this.similarity;
+    }
 
-	/**
-	 * Required - API name: {@code similarity}
-	 */
-	public final String similarity() {
-		return this.similarity;
-	}
+    /**
+     * Required - API name: {@code store}
+     */
+    public final boolean store() {
+        return this.store;
+    }
 
-	/**
-	 * Required - API name: {@code store}
-	 */
-	public final boolean store() {
-		return this.store;
-	}
+    /**
+     * Required - API name: {@code store_term_vector_offsets}
+     */
+    public final boolean storeTermVectorOffsets() {
+        return this.storeTermVectorOffsets;
+    }
 
-	/**
-	 * Required - API name: {@code store_term_vector_offsets}
-	 */
-	public final boolean storeTermVectorOffsets() {
-		return this.storeTermVectorOffsets;
-	}
+    /**
+     * Required - API name: {@code store_term_vector_payloads}
+     */
+    public final boolean storeTermVectorPayloads() {
+        return this.storeTermVectorPayloads;
+    }
 
-	/**
-	 * Required - API name: {@code store_term_vector_payloads}
-	 */
-	public final boolean storeTermVectorPayloads() {
-		return this.storeTermVectorPayloads;
-	}
+    /**
+     * Required - API name: {@code store_term_vector_positions}
+     */
+    public final boolean storeTermVectorPositions() {
+        return this.storeTermVectorPositions;
+    }
 
-	/**
-	 * Required - API name: {@code store_term_vector_positions}
-	 */
-	public final boolean storeTermVectorPositions() {
-		return this.storeTermVectorPositions;
-	}
-
-	/**
-	 * Required - API name: {@code store_term_vectors}
-	 */
-	public final boolean storeTermVectors() {
-		return this.storeTermVectors;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("analyzer");
-		generator.write(this.analyzer);
-
-		generator.writeKey("enabled");
-		generator.write(this.enabled);
-
-		generator.writeKey("omit_norms");
-		generator.write(this.omitNorms);
-
-		generator.writeKey("search_analyzer");
-		generator.write(this.searchAnalyzer);
-
-		generator.writeKey("similarity");
-		generator.write(this.similarity);
-
-		generator.writeKey("store");
-		generator.write(this.store);
-
-		generator.writeKey("store_term_vector_offsets");
-		generator.write(this.storeTermVectorOffsets);
-
-		generator.writeKey("store_term_vector_payloads");
-		generator.write(this.storeTermVectorPayloads);
-
-		generator.writeKey("store_term_vector_positions");
-		generator.write(this.storeTermVectorPositions);
-
-		generator.writeKey("store_term_vectors");
-		generator.write(this.storeTermVectors);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AllField}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AllField> {
-		private String analyzer;
-
-		private Boolean enabled;
-
-		private Boolean omitNorms;
-
-		private String searchAnalyzer;
-
-		private String similarity;
-
-		private Boolean store;
-
-		private Boolean storeTermVectorOffsets;
-
-		private Boolean storeTermVectorPayloads;
-
-		private Boolean storeTermVectorPositions;
-
-		private Boolean storeTermVectors;
-
-		/**
-		 * Required - API name: {@code analyzer}
-		 */
-		public final Builder analyzer(String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code enabled}
-		 */
-		public final Builder enabled(boolean value) {
-			this.enabled = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code omit_norms}
-		 */
-		public final Builder omitNorms(boolean value) {
-			this.omitNorms = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code search_analyzer}
-		 */
-		public final Builder searchAnalyzer(String value) {
-			this.searchAnalyzer = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code similarity}
-		 */
-		public final Builder similarity(String value) {
-			this.similarity = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code store}
-		 */
-		public final Builder store(boolean value) {
-			this.store = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code store_term_vector_offsets}
-		 */
-		public final Builder storeTermVectorOffsets(boolean value) {
-			this.storeTermVectorOffsets = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code store_term_vector_payloads}
-		 */
-		public final Builder storeTermVectorPayloads(boolean value) {
-			this.storeTermVectorPayloads = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code store_term_vector_positions}
-		 */
-		public final Builder storeTermVectorPositions(boolean value) {
-			this.storeTermVectorPositions = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code store_term_vectors}
-		 */
-		public final Builder storeTermVectors(boolean value) {
-			this.storeTermVectors = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AllField}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AllField build() {
-			_checkSingleUse();
-
-			return new AllField(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AllField}
-	 */
-	public static final JsonpDeserializer<AllField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			AllField::setupAllFieldDeserializer);
-
-	protected static void setupAllFieldDeserializer(ObjectDeserializer<AllField.Builder> op) {
-
-		op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
-		op.add(Builder::omitNorms, JsonpDeserializer.booleanDeserializer(), "omit_norms");
-		op.add(Builder::searchAnalyzer, JsonpDeserializer.stringDeserializer(), "search_analyzer");
-		op.add(Builder::similarity, JsonpDeserializer.stringDeserializer(), "similarity");
-		op.add(Builder::store, JsonpDeserializer.booleanDeserializer(), "store");
-		op.add(Builder::storeTermVectorOffsets, JsonpDeserializer.booleanDeserializer(), "store_term_vector_offsets");
-		op.add(Builder::storeTermVectorPayloads, JsonpDeserializer.booleanDeserializer(), "store_term_vector_payloads");
-		op.add(Builder::storeTermVectorPositions, JsonpDeserializer.booleanDeserializer(),
-				"store_term_vector_positions");
-		op.add(Builder::storeTermVectors, JsonpDeserializer.booleanDeserializer(), "store_term_vectors");
-
-	}
+    /**
+     * Required - API name: {@code store_term_vectors}
+     */
+    public final boolean storeTermVectors() {
+        return this.storeTermVectors;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("analyzer");
+        generator.write(this.analyzer);
+
+        generator.writeKey("enabled");
+        generator.write(this.enabled);
+
+        generator.writeKey("omit_norms");
+        generator.write(this.omitNorms);
+
+        generator.writeKey("search_analyzer");
+        generator.write(this.searchAnalyzer);
+
+        generator.writeKey("similarity");
+        generator.write(this.similarity);
+
+        generator.writeKey("store");
+        generator.write(this.store);
+
+        generator.writeKey("store_term_vector_offsets");
+        generator.write(this.storeTermVectorOffsets);
+
+        generator.writeKey("store_term_vector_payloads");
+        generator.write(this.storeTermVectorPayloads);
+
+        generator.writeKey("store_term_vector_positions");
+        generator.write(this.storeTermVectorPositions);
+
+        generator.writeKey("store_term_vectors");
+        generator.write(this.storeTermVectors);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AllField}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AllField> {
+        private String analyzer;
+
+        private Boolean enabled;
+
+        private Boolean omitNorms;
+
+        private String searchAnalyzer;
+
+        private String similarity;
+
+        private Boolean store;
+
+        private Boolean storeTermVectorOffsets;
+
+        private Boolean storeTermVectorPayloads;
+
+        private Boolean storeTermVectorPositions;
+
+        private Boolean storeTermVectors;
+
+        /**
+         * Required - API name: {@code analyzer}
+         */
+        public final Builder analyzer(String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code enabled}
+         */
+        public final Builder enabled(boolean value) {
+            this.enabled = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code omit_norms}
+         */
+        public final Builder omitNorms(boolean value) {
+            this.omitNorms = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code search_analyzer}
+         */
+        public final Builder searchAnalyzer(String value) {
+            this.searchAnalyzer = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code similarity}
+         */
+        public final Builder similarity(String value) {
+            this.similarity = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code store}
+         */
+        public final Builder store(boolean value) {
+            this.store = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code store_term_vector_offsets}
+         */
+        public final Builder storeTermVectorOffsets(boolean value) {
+            this.storeTermVectorOffsets = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code store_term_vector_payloads}
+         */
+        public final Builder storeTermVectorPayloads(boolean value) {
+            this.storeTermVectorPayloads = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code store_term_vector_positions}
+         */
+        public final Builder storeTermVectorPositions(boolean value) {
+            this.storeTermVectorPositions = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code store_term_vectors}
+         */
+        public final Builder storeTermVectors(boolean value) {
+            this.storeTermVectors = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link AllField}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AllField build() {
+            _checkSingleUse();
+
+            return new AllField(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AllField}
+     */
+    public static final JsonpDeserializer<AllField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AllField::setupAllFieldDeserializer
+    );
+
+    protected static void setupAllFieldDeserializer(ObjectDeserializer<AllField.Builder> op) {
+
+        op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
+        op.add(Builder::omitNorms, JsonpDeserializer.booleanDeserializer(), "omit_norms");
+        op.add(Builder::searchAnalyzer, JsonpDeserializer.stringDeserializer(), "search_analyzer");
+        op.add(Builder::similarity, JsonpDeserializer.stringDeserializer(), "similarity");
+        op.add(Builder::store, JsonpDeserializer.booleanDeserializer(), "store");
+        op.add(Builder::storeTermVectorOffsets, JsonpDeserializer.booleanDeserializer(), "store_term_vector_offsets");
+        op.add(Builder::storeTermVectorPayloads, JsonpDeserializer.booleanDeserializer(), "store_term_vector_payloads");
+        op.add(Builder::storeTermVectorPositions, JsonpDeserializer.booleanDeserializer(), "store_term_vector_positions");
+        op.add(Builder::storeTermVectors, JsonpDeserializer.booleanDeserializer(), "store_term_vectors");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/BinaryProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/BinaryProperty.java
index d218b84917..32737e3edc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/BinaryProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/BinaryProperty.java
@@ -32,86 +32,84 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.mapping.BinaryProperty
 
-
 @JsonpDeserializable
 public class BinaryProperty extends DocValuesPropertyBase implements PropertyVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private BinaryProperty(Builder builder) {
-		super(builder);
+    private BinaryProperty(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static BinaryProperty of(Function<Builder, ObjectBuilder<BinaryProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static BinaryProperty of(Function<Builder, ObjectBuilder<BinaryProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Binary;
-	}
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Binary;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "binary");
-		super.serializeInternal(generator, mapper);
+        generator.write("type", "binary");
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link BinaryProperty}.
-	 */
+    /**
+     * Builder for {@link BinaryProperty}.
+     */
 
-	public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<BinaryProperty> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<BinaryProperty> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link BinaryProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public BinaryProperty build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link BinaryProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public BinaryProperty build() {
+            _checkSingleUse();
 
-			return new BinaryProperty(this);
-		}
-	}
+            return new BinaryProperty(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link BinaryProperty}
-	 */
-	public static final JsonpDeserializer<BinaryProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			BinaryProperty::setupBinaryPropertyDeserializer);
+    /**
+     * Json deserializer for {@link BinaryProperty}
+     */
+    public static final JsonpDeserializer<BinaryProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        BinaryProperty::setupBinaryPropertyDeserializer
+    );
 
-	protected static void setupBinaryPropertyDeserializer(ObjectDeserializer<BinaryProperty.Builder> op) {
-		setupDocValuesPropertyBaseDeserializer(op);
+    protected static void setupBinaryPropertyDeserializer(ObjectDeserializer<BinaryProperty.Builder> op) {
+        setupDocValuesPropertyBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/BooleanProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/BooleanProperty.java
index c264e133ea..5560a1516b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/BooleanProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/BooleanProperty.java
@@ -32,211 +32,210 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
-import org.opensearch.client.opensearch.indices.NumericFielddata;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.indices.NumericFielddata;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.BooleanProperty
 
-
 @JsonpDeserializable
 public class BooleanProperty extends DocValuesPropertyBase implements PropertyVariant {
-	@Nullable
-	private final Double boost;
-
-	@Nullable
-	private final NumericFielddata fielddata;
-
-	@Nullable
-	private final Boolean index;
-
-	@Nullable
-	private final Boolean nullValue;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private BooleanProperty(Builder builder) {
-		super(builder);
-
-		this.boost = builder.boost;
-		this.fielddata = builder.fielddata;
-		this.index = builder.index;
-		this.nullValue = builder.nullValue;
-
-	}
-
-	public static BooleanProperty of(Function<Builder, ObjectBuilder<BooleanProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Boolean;
-	}
-
-	/**
-	 * API name: {@code boost}
-	 */
-	@Nullable
-	public final Double boost() {
-		return this.boost;
-	}
-
-	/**
-	 * API name: {@code fielddata}
-	 */
-	@Nullable
-	public final NumericFielddata fielddata() {
-		return this.fielddata;
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final Boolean index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code null_value}
-	 */
-	@Nullable
-	public final Boolean nullValue() {
-		return this.nullValue;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "boolean");
-		super.serializeInternal(generator, mapper);
-		if (this.boost != null) {
-			generator.writeKey("boost");
-			generator.write(this.boost);
-
-		}
-		if (this.fielddata != null) {
-			generator.writeKey("fielddata");
-			this.fielddata.serialize(generator, mapper);
-
-		}
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.nullValue != null) {
-			generator.writeKey("null_value");
-			generator.write(this.nullValue);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link BooleanProperty}.
-	 */
-
-	public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<BooleanProperty> {
-		@Nullable
-		private Double boost;
-
-		@Nullable
-		private NumericFielddata fielddata;
-
-		@Nullable
-		private Boolean index;
-
-		@Nullable
-		private Boolean nullValue;
-
-		/**
-		 * API name: {@code boost}
-		 */
-		public final Builder boost(@Nullable Double value) {
-			this.boost = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fielddata}
-		 */
-		public final Builder fielddata(@Nullable NumericFielddata value) {
-			this.fielddata = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fielddata}
-		 */
-		public final Builder fielddata(Function<NumericFielddata.Builder, ObjectBuilder<NumericFielddata>> fn) {
-			return this.fielddata(fn.apply(new NumericFielddata.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable Boolean value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(@Nullable Boolean value) {
-			this.nullValue = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link BooleanProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public BooleanProperty build() {
-			_checkSingleUse();
-
-			return new BooleanProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link BooleanProperty}
-	 */
-	public static final JsonpDeserializer<BooleanProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			BooleanProperty::setupBooleanPropertyDeserializer);
-
-	protected static void setupBooleanPropertyDeserializer(ObjectDeserializer<BooleanProperty.Builder> op) {
-		setupDocValuesPropertyBaseDeserializer(op);
-		op.add(Builder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
-		op.add(Builder::fielddata, NumericFielddata._DESERIALIZER, "fielddata");
-		op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
-		op.add(Builder::nullValue, JsonpDeserializer.booleanDeserializer(), "null_value");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Double boost;
+
+    @Nullable
+    private final NumericFielddata fielddata;
+
+    @Nullable
+    private final Boolean index;
+
+    @Nullable
+    private final Boolean nullValue;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private BooleanProperty(Builder builder) {
+        super(builder);
+
+        this.boost = builder.boost;
+        this.fielddata = builder.fielddata;
+        this.index = builder.index;
+        this.nullValue = builder.nullValue;
+
+    }
+
+    public static BooleanProperty of(Function<Builder, ObjectBuilder<BooleanProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Boolean;
+    }
+
+    /**
+     * API name: {@code boost}
+     */
+    @Nullable
+    public final Double boost() {
+        return this.boost;
+    }
+
+    /**
+     * API name: {@code fielddata}
+     */
+    @Nullable
+    public final NumericFielddata fielddata() {
+        return this.fielddata;
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    @Nullable
+    public final Boolean index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code null_value}
+     */
+    @Nullable
+    public final Boolean nullValue() {
+        return this.nullValue;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "boolean");
+        super.serializeInternal(generator, mapper);
+        if (this.boost != null) {
+            generator.writeKey("boost");
+            generator.write(this.boost);
+
+        }
+        if (this.fielddata != null) {
+            generator.writeKey("fielddata");
+            this.fielddata.serialize(generator, mapper);
+
+        }
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.nullValue != null) {
+            generator.writeKey("null_value");
+            generator.write(this.nullValue);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link BooleanProperty}.
+     */
+
+    public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<BooleanProperty> {
+        @Nullable
+        private Double boost;
+
+        @Nullable
+        private NumericFielddata fielddata;
+
+        @Nullable
+        private Boolean index;
+
+        @Nullable
+        private Boolean nullValue;
+
+        /**
+         * API name: {@code boost}
+         */
+        public final Builder boost(@Nullable Double value) {
+            this.boost = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fielddata}
+         */
+        public final Builder fielddata(@Nullable NumericFielddata value) {
+            this.fielddata = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fielddata}
+         */
+        public final Builder fielddata(Function<NumericFielddata.Builder, ObjectBuilder<NumericFielddata>> fn) {
+            return this.fielddata(fn.apply(new NumericFielddata.Builder()).build());
+        }
+
+        /**
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable Boolean value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(@Nullable Boolean value) {
+            this.nullValue = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link BooleanProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public BooleanProperty build() {
+            _checkSingleUse();
+
+            return new BooleanProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link BooleanProperty}
+     */
+    public static final JsonpDeserializer<BooleanProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        BooleanProperty::setupBooleanPropertyDeserializer
+    );
+
+    protected static void setupBooleanPropertyDeserializer(ObjectDeserializer<BooleanProperty.Builder> op) {
+        setupDocValuesPropertyBaseDeserializer(op);
+        op.add(Builder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
+        op.add(Builder::fielddata, NumericFielddata._DESERIALIZER, "fielddata");
+        op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
+        op.add(Builder::nullValue, JsonpDeserializer.booleanDeserializer(), "null_value");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ByteNumberProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ByteNumberProperty.java
index 715b5d7fe9..bb7177864d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ByteNumberProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ByteNumberProperty.java
@@ -32,116 +32,115 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.ByteNumberProperty
 
-
 @JsonpDeserializable
 public class ByteNumberProperty extends StandardNumberProperty implements PropertyVariant {
-	@Nullable
-	private final Number nullValue;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ByteNumberProperty(Builder builder) {
-		super(builder);
-
-		this.nullValue = builder.nullValue;
-
-	}
-
-	public static ByteNumberProperty of(Function<Builder, ObjectBuilder<ByteNumberProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Byte;
-	}
-
-	/**
-	 * API name: {@code null_value}
-	 */
-	@Nullable
-	public final Number nullValue() {
-		return this.nullValue;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "byte");
-		super.serializeInternal(generator, mapper);
-		if (this.nullValue != null) {
-			generator.writeKey("null_value");
-			generator.write(this.nullValue.doubleValue());
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ByteNumberProperty}.
-	 */
-
-	public static class Builder extends StandardNumberProperty.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ByteNumberProperty> {
-		@Nullable
-		private Number nullValue;
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(@Nullable Number value) {
-			this.nullValue = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ByteNumberProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ByteNumberProperty build() {
-			_checkSingleUse();
-
-			return new ByteNumberProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ByteNumberProperty}
-	 */
-	public static final JsonpDeserializer<ByteNumberProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ByteNumberProperty::setupByteNumberPropertyDeserializer);
-
-	protected static void setupByteNumberPropertyDeserializer(ObjectDeserializer<ByteNumberProperty.Builder> op) {
-		setupStandardNumberPropertyDeserializer(op);
-		op.add(Builder::nullValue, JsonpDeserializer.numberDeserializer(), "null_value");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Number nullValue;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ByteNumberProperty(Builder builder) {
+        super(builder);
+
+        this.nullValue = builder.nullValue;
+
+    }
+
+    public static ByteNumberProperty of(Function<Builder, ObjectBuilder<ByteNumberProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Byte;
+    }
+
+    /**
+     * API name: {@code null_value}
+     */
+    @Nullable
+    public final Number nullValue() {
+        return this.nullValue;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "byte");
+        super.serializeInternal(generator, mapper);
+        if (this.nullValue != null) {
+            generator.writeKey("null_value");
+            generator.write(this.nullValue.doubleValue());
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ByteNumberProperty}.
+     */
+
+    public static class Builder extends StandardNumberProperty.AbstractBuilder<Builder> implements ObjectBuilder<ByteNumberProperty> {
+        @Nullable
+        private Number nullValue;
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(@Nullable Number value) {
+            this.nullValue = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ByteNumberProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ByteNumberProperty build() {
+            _checkSingleUse();
+
+            return new ByteNumberProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ByteNumberProperty}
+     */
+    public static final JsonpDeserializer<ByteNumberProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ByteNumberProperty::setupByteNumberPropertyDeserializer
+    );
+
+    protected static void setupByteNumberPropertyDeserializer(ObjectDeserializer<ByteNumberProperty.Builder> op) {
+        setupStandardNumberPropertyDeserializer(op);
+        op.add(Builder::nullValue, JsonpDeserializer.numberDeserializer(), "null_value");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/CompletionProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/CompletionProperty.java
index e8b7a2e05d..0ca2678268 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/CompletionProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/CompletionProperty.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,281 +43,275 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.CompletionProperty
 
-
 @JsonpDeserializable
 public class CompletionProperty extends DocValuesPropertyBase implements PropertyVariant {
-	@Nullable
-	private final String analyzer;
-
-	private final List<SuggestContext> contexts;
-
-	@Nullable
-	private final Integer maxInputLength;
-
-	@Nullable
-	private final Boolean preservePositionIncrements;
-
-	@Nullable
-	private final Boolean preserveSeparators;
-
-	@Nullable
-	private final String searchAnalyzer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CompletionProperty(Builder builder) {
-		super(builder);
-
-		this.analyzer = builder.analyzer;
-		this.contexts = ApiTypeHelper.unmodifiable(builder.contexts);
-		this.maxInputLength = builder.maxInputLength;
-		this.preservePositionIncrements = builder.preservePositionIncrements;
-		this.preserveSeparators = builder.preserveSeparators;
-		this.searchAnalyzer = builder.searchAnalyzer;
-
-	}
-
-	public static CompletionProperty of(Function<Builder, ObjectBuilder<CompletionProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Completion;
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * API name: {@code contexts}
-	 */
-	public final List<SuggestContext> contexts() {
-		return this.contexts;
-	}
-
-	/**
-	 * API name: {@code max_input_length}
-	 */
-	@Nullable
-	public final Integer maxInputLength() {
-		return this.maxInputLength;
-	}
-
-	/**
-	 * API name: {@code preserve_position_increments}
-	 */
-	@Nullable
-	public final Boolean preservePositionIncrements() {
-		return this.preservePositionIncrements;
-	}
-
-	/**
-	 * API name: {@code preserve_separators}
-	 */
-	@Nullable
-	public final Boolean preserveSeparators() {
-		return this.preserveSeparators;
-	}
-
-	/**
-	 * API name: {@code search_analyzer}
-	 */
-	@Nullable
-	public final String searchAnalyzer() {
-		return this.searchAnalyzer;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "completion");
-		super.serializeInternal(generator, mapper);
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			generator.write(this.analyzer);
-
-		}
-		if (ApiTypeHelper.isDefined(this.contexts)) {
-			generator.writeKey("contexts");
-			generator.writeStartArray();
-			for (SuggestContext item0 : this.contexts) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.maxInputLength != null) {
-			generator.writeKey("max_input_length");
-			generator.write(this.maxInputLength);
-
-		}
-		if (this.preservePositionIncrements != null) {
-			generator.writeKey("preserve_position_increments");
-			generator.write(this.preservePositionIncrements);
-
-		}
-		if (this.preserveSeparators != null) {
-			generator.writeKey("preserve_separators");
-			generator.write(this.preserveSeparators);
-
-		}
-		if (this.searchAnalyzer != null) {
-			generator.writeKey("search_analyzer");
-			generator.write(this.searchAnalyzer);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CompletionProperty}.
-	 */
-
-	public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<CompletionProperty> {
-		@Nullable
-		private String analyzer;
-
-		@Nullable
-		private List<SuggestContext> contexts;
-
-		@Nullable
-		private Integer maxInputLength;
-
-		@Nullable
-		private Boolean preservePositionIncrements;
-
-		@Nullable
-		private Boolean preserveSeparators;
-
-		@Nullable
-		private String searchAnalyzer;
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code contexts}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>contexts</code>.
-		 */
-		public final Builder contexts(List<SuggestContext> list) {
-			this.contexts = _listAddAll(this.contexts, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code contexts}
-		 * <p>
-		 * Adds one or more values to <code>contexts</code>.
-		 */
-		public final Builder contexts(SuggestContext value, SuggestContext... values) {
-			this.contexts = _listAdd(this.contexts, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code contexts}
-		 * <p>
-		 * Adds a value to <code>contexts</code> using a builder lambda.
-		 */
-		public final Builder contexts(Function<SuggestContext.Builder, ObjectBuilder<SuggestContext>> fn) {
-			return contexts(fn.apply(new SuggestContext.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code max_input_length}
-		 */
-		public final Builder maxInputLength(@Nullable Integer value) {
-			this.maxInputLength = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code preserve_position_increments}
-		 */
-		public final Builder preservePositionIncrements(@Nullable Boolean value) {
-			this.preservePositionIncrements = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code preserve_separators}
-		 */
-		public final Builder preserveSeparators(@Nullable Boolean value) {
-			this.preserveSeparators = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code search_analyzer}
-		 */
-		public final Builder searchAnalyzer(@Nullable String value) {
-			this.searchAnalyzer = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CompletionProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CompletionProperty build() {
-			_checkSingleUse();
-
-			return new CompletionProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CompletionProperty}
-	 */
-	public static final JsonpDeserializer<CompletionProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CompletionProperty::setupCompletionPropertyDeserializer);
-
-	protected static void setupCompletionPropertyDeserializer(ObjectDeserializer<CompletionProperty.Builder> op) {
-		DocValuesPropertyBase.setupDocValuesPropertyBaseDeserializer(op);
-		op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(Builder::contexts, JsonpDeserializer.arrayDeserializer(SuggestContext._DESERIALIZER), "contexts");
-		op.add(Builder::maxInputLength, JsonpDeserializer.integerDeserializer(), "max_input_length");
-		op.add(Builder::preservePositionIncrements, JsonpDeserializer.booleanDeserializer(),
-				"preserve_position_increments");
-		op.add(Builder::preserveSeparators, JsonpDeserializer.booleanDeserializer(), "preserve_separators");
-		op.add(Builder::searchAnalyzer, JsonpDeserializer.stringDeserializer(), "search_analyzer");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final String analyzer;
+
+    private final List<SuggestContext> contexts;
+
+    @Nullable
+    private final Integer maxInputLength;
+
+    @Nullable
+    private final Boolean preservePositionIncrements;
+
+    @Nullable
+    private final Boolean preserveSeparators;
+
+    @Nullable
+    private final String searchAnalyzer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CompletionProperty(Builder builder) {
+        super(builder);
+
+        this.analyzer = builder.analyzer;
+        this.contexts = ApiTypeHelper.unmodifiable(builder.contexts);
+        this.maxInputLength = builder.maxInputLength;
+        this.preservePositionIncrements = builder.preservePositionIncrements;
+        this.preserveSeparators = builder.preserveSeparators;
+        this.searchAnalyzer = builder.searchAnalyzer;
+
+    }
+
+    public static CompletionProperty of(Function<Builder, ObjectBuilder<CompletionProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Completion;
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * API name: {@code contexts}
+     */
+    public final List<SuggestContext> contexts() {
+        return this.contexts;
+    }
+
+    /**
+     * API name: {@code max_input_length}
+     */
+    @Nullable
+    public final Integer maxInputLength() {
+        return this.maxInputLength;
+    }
+
+    /**
+     * API name: {@code preserve_position_increments}
+     */
+    @Nullable
+    public final Boolean preservePositionIncrements() {
+        return this.preservePositionIncrements;
+    }
+
+    /**
+     * API name: {@code preserve_separators}
+     */
+    @Nullable
+    public final Boolean preserveSeparators() {
+        return this.preserveSeparators;
+    }
+
+    /**
+     * API name: {@code search_analyzer}
+     */
+    @Nullable
+    public final String searchAnalyzer() {
+        return this.searchAnalyzer;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "completion");
+        super.serializeInternal(generator, mapper);
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            generator.write(this.analyzer);
+
+        }
+        if (ApiTypeHelper.isDefined(this.contexts)) {
+            generator.writeKey("contexts");
+            generator.writeStartArray();
+            for (SuggestContext item0 : this.contexts) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.maxInputLength != null) {
+            generator.writeKey("max_input_length");
+            generator.write(this.maxInputLength);
+
+        }
+        if (this.preservePositionIncrements != null) {
+            generator.writeKey("preserve_position_increments");
+            generator.write(this.preservePositionIncrements);
+
+        }
+        if (this.preserveSeparators != null) {
+            generator.writeKey("preserve_separators");
+            generator.write(this.preserveSeparators);
+
+        }
+        if (this.searchAnalyzer != null) {
+            generator.writeKey("search_analyzer");
+            generator.write(this.searchAnalyzer);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CompletionProperty}.
+     */
+
+    public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<CompletionProperty> {
+        @Nullable
+        private String analyzer;
+
+        @Nullable
+        private List<SuggestContext> contexts;
+
+        @Nullable
+        private Integer maxInputLength;
+
+        @Nullable
+        private Boolean preservePositionIncrements;
+
+        @Nullable
+        private Boolean preserveSeparators;
+
+        @Nullable
+        private String searchAnalyzer;
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code contexts}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>contexts</code>.
+         */
+        public final Builder contexts(List<SuggestContext> list) {
+            this.contexts = _listAddAll(this.contexts, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code contexts}
+         * <p>
+         * Adds one or more values to <code>contexts</code>.
+         */
+        public final Builder contexts(SuggestContext value, SuggestContext... values) {
+            this.contexts = _listAdd(this.contexts, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code contexts}
+         * <p>
+         * Adds a value to <code>contexts</code> using a builder lambda.
+         */
+        public final Builder contexts(Function<SuggestContext.Builder, ObjectBuilder<SuggestContext>> fn) {
+            return contexts(fn.apply(new SuggestContext.Builder()).build());
+        }
+
+        /**
+         * API name: {@code max_input_length}
+         */
+        public final Builder maxInputLength(@Nullable Integer value) {
+            this.maxInputLength = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code preserve_position_increments}
+         */
+        public final Builder preservePositionIncrements(@Nullable Boolean value) {
+            this.preservePositionIncrements = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code preserve_separators}
+         */
+        public final Builder preserveSeparators(@Nullable Boolean value) {
+            this.preserveSeparators = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code search_analyzer}
+         */
+        public final Builder searchAnalyzer(@Nullable String value) {
+            this.searchAnalyzer = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CompletionProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CompletionProperty build() {
+            _checkSingleUse();
+
+            return new CompletionProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CompletionProperty}
+     */
+    public static final JsonpDeserializer<CompletionProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CompletionProperty::setupCompletionPropertyDeserializer
+    );
+
+    protected static void setupCompletionPropertyDeserializer(ObjectDeserializer<CompletionProperty.Builder> op) {
+        DocValuesPropertyBase.setupDocValuesPropertyBaseDeserializer(op);
+        op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(Builder::contexts, JsonpDeserializer.arrayDeserializer(SuggestContext._DESERIALIZER), "contexts");
+        op.add(Builder::maxInputLength, JsonpDeserializer.integerDeserializer(), "max_input_length");
+        op.add(Builder::preservePositionIncrements, JsonpDeserializer.booleanDeserializer(), "preserve_position_increments");
+        op.add(Builder::preserveSeparators, JsonpDeserializer.booleanDeserializer(), "preserve_separators");
+        op.add(Builder::searchAnalyzer, JsonpDeserializer.stringDeserializer(), "search_analyzer");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ConstantKeywordProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ConstantKeywordProperty.java
index dfa0bc3865..b67f132f0d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ConstantKeywordProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ConstantKeywordProperty.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -39,112 +42,106 @@
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.ConstantKeywordProperty
 
-
 @JsonpDeserializable
 public class ConstantKeywordProperty extends PropertyBase implements PropertyVariant {
-	@Nullable
-	private final JsonData value;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ConstantKeywordProperty(Builder builder) {
-		super(builder);
-
-		this.value = builder.value;
-
-	}
-
-	public static ConstantKeywordProperty of(Function<Builder, ObjectBuilder<ConstantKeywordProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.ConstantKeyword;
-	}
-
-	/**
-	 * API name: {@code value}
-	 */
-	@Nullable
-	public final JsonData value() {
-		return this.value;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "constant_keyword");
-		super.serializeInternal(generator, mapper);
-		if (this.value != null) {
-			generator.writeKey("value");
-			this.value.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ConstantKeywordProperty}.
-	 */
-
-	public static class Builder extends PropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ConstantKeywordProperty> {
-		@Nullable
-		private JsonData value;
-
-		/**
-		 * API name: {@code value}
-		 */
-		public final Builder value(@Nullable JsonData value) {
-			this.value = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ConstantKeywordProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ConstantKeywordProperty build() {
-			_checkSingleUse();
-
-			return new ConstantKeywordProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ConstantKeywordProperty}
-	 */
-	public static final JsonpDeserializer<ConstantKeywordProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ConstantKeywordProperty::setupConstantKeywordPropertyDeserializer);
-
-	protected static void setupConstantKeywordPropertyDeserializer(
-			ObjectDeserializer<ConstantKeywordProperty.Builder> op) {
-		PropertyBase.setupPropertyBaseDeserializer(op);
-		op.add(Builder::value, JsonData._DESERIALIZER, "value");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final JsonData value;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ConstantKeywordProperty(Builder builder) {
+        super(builder);
+
+        this.value = builder.value;
+
+    }
+
+    public static ConstantKeywordProperty of(Function<Builder, ObjectBuilder<ConstantKeywordProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.ConstantKeyword;
+    }
+
+    /**
+     * API name: {@code value}
+     */
+    @Nullable
+    public final JsonData value() {
+        return this.value;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "constant_keyword");
+        super.serializeInternal(generator, mapper);
+        if (this.value != null) {
+            generator.writeKey("value");
+            this.value.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ConstantKeywordProperty}.
+     */
+
+    public static class Builder extends PropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<ConstantKeywordProperty> {
+        @Nullable
+        private JsonData value;
+
+        /**
+         * API name: {@code value}
+         */
+        public final Builder value(@Nullable JsonData value) {
+            this.value = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ConstantKeywordProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ConstantKeywordProperty build() {
+            _checkSingleUse();
+
+            return new ConstantKeywordProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ConstantKeywordProperty}
+     */
+    public static final JsonpDeserializer<ConstantKeywordProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ConstantKeywordProperty::setupConstantKeywordPropertyDeserializer
+    );
+
+    protected static void setupConstantKeywordPropertyDeserializer(ObjectDeserializer<ConstantKeywordProperty.Builder> op) {
+        PropertyBase.setupPropertyBaseDeserializer(op);
+        op.add(Builder::value, JsonData._DESERIALIZER, "value");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/CorePropertyBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/CorePropertyBase.java
index 8c7e3a87e6..cc14e499e4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/CorePropertyBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/CorePropertyBase.java
@@ -32,146 +32,141 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.CorePropertyBase
 
-
-
 public abstract class CorePropertyBase extends PropertyBase {
-	private final List<String> copyTo;
-
-	@Nullable
-	private final String similarity;
-
-	@Nullable
-	private final Boolean store;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected CorePropertyBase(AbstractBuilder<?> builder) {
-		super(builder);
-
-		this.copyTo = ApiTypeHelper.unmodifiable(builder.copyTo);
-		this.similarity = builder.similarity;
-		this.store = builder.store;
-
-	}
-
-	/**
-	 * API name: {@code copy_to}
-	 */
-	public final List<String> copyTo() {
-		return this.copyTo;
-	}
-
-	/**
-	 * API name: {@code similarity}
-	 */
-	@Nullable
-	public final String similarity() {
-		return this.similarity;
-	}
-
-	/**
-	 * API name: {@code store}
-	 */
-	@Nullable
-	public final Boolean store() {
-		return this.store;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.copyTo)) {
-			generator.writeKey("copy_to");
-			generator.writeStartArray();
-			for (String item0 : this.copyTo) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.similarity != null) {
-			generator.writeKey("similarity");
-			generator.write(this.similarity);
-
-		}
-		if (this.store != null) {
-			generator.writeKey("store");
-			generator.write(this.store);
-
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				PropertyBase.AbstractBuilder<BuilderT> {
-		@Nullable
-		private List<String> copyTo;
-
-		@Nullable
-		private String similarity;
-
-		@Nullable
-		private Boolean store;
-
-		/**
-		 * API name: {@code copy_to}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>copyTo</code>.
-		 */
-		public final BuilderT copyTo(List<String> list) {
-			this.copyTo = _listAddAll(this.copyTo, list);
-			return self();
-		}
-
-		/**
-		 * API name: {@code copy_to}
-		 * <p>
-		 * Adds one or more values to <code>copyTo</code>.
-		 */
-		public final BuilderT copyTo(String value, String... values) {
-			this.copyTo = _listAdd(this.copyTo, value, values);
-			return self();
-		}
-
-		/**
-		 * API name: {@code similarity}
-		 */
-		public final BuilderT similarity(@Nullable String value) {
-			this.similarity = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code store}
-		 */
-		public final BuilderT store(@Nullable Boolean value) {
-			this.store = value;
-			return self();
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupCorePropertyBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		PropertyBase.setupPropertyBaseDeserializer(op);
-		op.add(AbstractBuilder::copyTo, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"copy_to");
-		op.add(AbstractBuilder::similarity, JsonpDeserializer.stringDeserializer(), "similarity");
-		op.add(AbstractBuilder::store, JsonpDeserializer.booleanDeserializer(), "store");
-
-	}
+    private final List<String> copyTo;
+
+    @Nullable
+    private final String similarity;
+
+    @Nullable
+    private final Boolean store;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected CorePropertyBase(AbstractBuilder<?> builder) {
+        super(builder);
+
+        this.copyTo = ApiTypeHelper.unmodifiable(builder.copyTo);
+        this.similarity = builder.similarity;
+        this.store = builder.store;
+
+    }
+
+    /**
+     * API name: {@code copy_to}
+     */
+    public final List<String> copyTo() {
+        return this.copyTo;
+    }
+
+    /**
+     * API name: {@code similarity}
+     */
+    @Nullable
+    public final String similarity() {
+        return this.similarity;
+    }
+
+    /**
+     * API name: {@code store}
+     */
+    @Nullable
+    public final Boolean store() {
+        return this.store;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.copyTo)) {
+            generator.writeKey("copy_to");
+            generator.writeStartArray();
+            for (String item0 : this.copyTo) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.similarity != null) {
+            generator.writeKey("similarity");
+            generator.write(this.similarity);
+
+        }
+        if (this.store != null) {
+            generator.writeKey("store");
+            generator.write(this.store);
+
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends PropertyBase.AbstractBuilder<
+        BuilderT> {
+        @Nullable
+        private List<String> copyTo;
+
+        @Nullable
+        private String similarity;
+
+        @Nullable
+        private Boolean store;
+
+        /**
+         * API name: {@code copy_to}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>copyTo</code>.
+         */
+        public final BuilderT copyTo(List<String> list) {
+            this.copyTo = _listAddAll(this.copyTo, list);
+            return self();
+        }
+
+        /**
+         * API name: {@code copy_to}
+         * <p>
+         * Adds one or more values to <code>copyTo</code>.
+         */
+        public final BuilderT copyTo(String value, String... values) {
+            this.copyTo = _listAdd(this.copyTo, value, values);
+            return self();
+        }
+
+        /**
+         * API name: {@code similarity}
+         */
+        public final BuilderT similarity(@Nullable String value) {
+            this.similarity = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code store}
+         */
+        public final BuilderT store(@Nullable Boolean value) {
+            this.store = value;
+            return self();
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupCorePropertyBaseDeserializer(ObjectDeserializer<BuilderT> op) {
+        PropertyBase.setupPropertyBaseDeserializer(op);
+        op.add(AbstractBuilder::copyTo, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "copy_to");
+        op.add(AbstractBuilder::similarity, JsonpDeserializer.stringDeserializer(), "similarity");
+        op.add(AbstractBuilder::store, JsonpDeserializer.booleanDeserializer(), "store");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DateNanosProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DateNanosProperty.java
index 1a50b9621f..5fa50ad933 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DateNanosProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DateNanosProperty.java
@@ -32,261 +32,260 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.DateNanosProperty
 
-
 @JsonpDeserializable
 public class DateNanosProperty extends DocValuesPropertyBase implements PropertyVariant {
-	@Nullable
-	private final Double boost;
-
-	@Nullable
-	private final String format;
-
-	@Nullable
-	private final Boolean ignoreMalformed;
-
-	@Nullable
-	private final Boolean index;
-
-	@Nullable
-	private final String nullValue;
-
-	@Nullable
-	private final Integer precisionStep;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DateNanosProperty(Builder builder) {
-		super(builder);
-
-		this.boost = builder.boost;
-		this.format = builder.format;
-		this.ignoreMalformed = builder.ignoreMalformed;
-		this.index = builder.index;
-		this.nullValue = builder.nullValue;
-		this.precisionStep = builder.precisionStep;
-
-	}
-
-	public static DateNanosProperty of(Function<Builder, ObjectBuilder<DateNanosProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.DateNanos;
-	}
-
-	/**
-	 * API name: {@code boost}
-	 */
-	@Nullable
-	public final Double boost() {
-		return this.boost;
-	}
-
-	/**
-	 * API name: {@code format}
-	 */
-	@Nullable
-	public final String format() {
-		return this.format;
-	}
-
-	/**
-	 * API name: {@code ignore_malformed}
-	 */
-	@Nullable
-	public final Boolean ignoreMalformed() {
-		return this.ignoreMalformed;
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final Boolean index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code null_value}
-	 */
-	@Nullable
-	public final String nullValue() {
-		return this.nullValue;
-	}
-
-	/**
-	 * API name: {@code precision_step}
-	 */
-	@Nullable
-	public final Integer precisionStep() {
-		return this.precisionStep;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "date_nanos");
-		super.serializeInternal(generator, mapper);
-		if (this.boost != null) {
-			generator.writeKey("boost");
-			generator.write(this.boost);
-
-		}
-		if (this.format != null) {
-			generator.writeKey("format");
-			generator.write(this.format);
-
-		}
-		if (this.ignoreMalformed != null) {
-			generator.writeKey("ignore_malformed");
-			generator.write(this.ignoreMalformed);
-
-		}
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.nullValue != null) {
-			generator.writeKey("null_value");
-			generator.write(this.nullValue);
-
-		}
-		if (this.precisionStep != null) {
-			generator.writeKey("precision_step");
-			generator.write(this.precisionStep);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DateNanosProperty}.
-	 */
-
-	public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DateNanosProperty> {
-		@Nullable
-		private Double boost;
-
-		@Nullable
-		private String format;
-
-		@Nullable
-		private Boolean ignoreMalformed;
-
-		@Nullable
-		private Boolean index;
-
-		@Nullable
-		private String nullValue;
-
-		@Nullable
-		private Integer precisionStep;
-
-		/**
-		 * API name: {@code boost}
-		 */
-		public final Builder boost(@Nullable Double value) {
-			this.boost = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code format}
-		 */
-		public final Builder format(@Nullable String value) {
-			this.format = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_malformed}
-		 */
-		public final Builder ignoreMalformed(@Nullable Boolean value) {
-			this.ignoreMalformed = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable Boolean value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(@Nullable String value) {
-			this.nullValue = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code precision_step}
-		 */
-		public final Builder precisionStep(@Nullable Integer value) {
-			this.precisionStep = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DateNanosProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DateNanosProperty build() {
-			_checkSingleUse();
-
-			return new DateNanosProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DateNanosProperty}
-	 */
-	public static final JsonpDeserializer<DateNanosProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DateNanosProperty::setupDateNanosPropertyDeserializer);
-
-	protected static void setupDateNanosPropertyDeserializer(ObjectDeserializer<DateNanosProperty.Builder> op) {
-		setupDocValuesPropertyBaseDeserializer(op);
-		op.add(Builder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
-		op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
-		op.add(Builder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
-		op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
-		op.add(Builder::nullValue, JsonpDeserializer.stringDeserializer(), "null_value");
-		op.add(Builder::precisionStep, JsonpDeserializer.integerDeserializer(), "precision_step");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Double boost;
+
+    @Nullable
+    private final String format;
+
+    @Nullable
+    private final Boolean ignoreMalformed;
+
+    @Nullable
+    private final Boolean index;
+
+    @Nullable
+    private final String nullValue;
+
+    @Nullable
+    private final Integer precisionStep;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DateNanosProperty(Builder builder) {
+        super(builder);
+
+        this.boost = builder.boost;
+        this.format = builder.format;
+        this.ignoreMalformed = builder.ignoreMalformed;
+        this.index = builder.index;
+        this.nullValue = builder.nullValue;
+        this.precisionStep = builder.precisionStep;
+
+    }
+
+    public static DateNanosProperty of(Function<Builder, ObjectBuilder<DateNanosProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.DateNanos;
+    }
+
+    /**
+     * API name: {@code boost}
+     */
+    @Nullable
+    public final Double boost() {
+        return this.boost;
+    }
+
+    /**
+     * API name: {@code format}
+     */
+    @Nullable
+    public final String format() {
+        return this.format;
+    }
+
+    /**
+     * API name: {@code ignore_malformed}
+     */
+    @Nullable
+    public final Boolean ignoreMalformed() {
+        return this.ignoreMalformed;
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    @Nullable
+    public final Boolean index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code null_value}
+     */
+    @Nullable
+    public final String nullValue() {
+        return this.nullValue;
+    }
+
+    /**
+     * API name: {@code precision_step}
+     */
+    @Nullable
+    public final Integer precisionStep() {
+        return this.precisionStep;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "date_nanos");
+        super.serializeInternal(generator, mapper);
+        if (this.boost != null) {
+            generator.writeKey("boost");
+            generator.write(this.boost);
+
+        }
+        if (this.format != null) {
+            generator.writeKey("format");
+            generator.write(this.format);
+
+        }
+        if (this.ignoreMalformed != null) {
+            generator.writeKey("ignore_malformed");
+            generator.write(this.ignoreMalformed);
+
+        }
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.nullValue != null) {
+            generator.writeKey("null_value");
+            generator.write(this.nullValue);
+
+        }
+        if (this.precisionStep != null) {
+            generator.writeKey("precision_step");
+            generator.write(this.precisionStep);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DateNanosProperty}.
+     */
+
+    public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<DateNanosProperty> {
+        @Nullable
+        private Double boost;
+
+        @Nullable
+        private String format;
+
+        @Nullable
+        private Boolean ignoreMalformed;
+
+        @Nullable
+        private Boolean index;
+
+        @Nullable
+        private String nullValue;
+
+        @Nullable
+        private Integer precisionStep;
+
+        /**
+         * API name: {@code boost}
+         */
+        public final Builder boost(@Nullable Double value) {
+            this.boost = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code format}
+         */
+        public final Builder format(@Nullable String value) {
+            this.format = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_malformed}
+         */
+        public final Builder ignoreMalformed(@Nullable Boolean value) {
+            this.ignoreMalformed = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable Boolean value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(@Nullable String value) {
+            this.nullValue = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code precision_step}
+         */
+        public final Builder precisionStep(@Nullable Integer value) {
+            this.precisionStep = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DateNanosProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DateNanosProperty build() {
+            _checkSingleUse();
+
+            return new DateNanosProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DateNanosProperty}
+     */
+    public static final JsonpDeserializer<DateNanosProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DateNanosProperty::setupDateNanosPropertyDeserializer
+    );
+
+    protected static void setupDateNanosPropertyDeserializer(ObjectDeserializer<DateNanosProperty.Builder> op) {
+        setupDocValuesPropertyBaseDeserializer(op);
+        op.add(Builder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
+        op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
+        op.add(Builder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
+        op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
+        op.add(Builder::nullValue, JsonpDeserializer.stringDeserializer(), "null_value");
+        op.add(Builder::precisionStep, JsonpDeserializer.integerDeserializer(), "precision_step");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DateProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DateProperty.java
index 54e4fbe831..40726d9280 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DateProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DateProperty.java
@@ -32,327 +32,326 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
-import org.opensearch.client.opensearch.indices.NumericFielddata;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.indices.NumericFielddata;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.DateProperty
 
-
 @JsonpDeserializable
 public class DateProperty extends DocValuesPropertyBase implements PropertyVariant {
-	@Nullable
-	private final Double boost;
-
-	@Nullable
-	private final NumericFielddata fielddata;
-
-	@Nullable
-	private final String format;
-
-	@Nullable
-	private final Boolean ignoreMalformed;
-
-	@Nullable
-	private final Boolean index;
-
-	@Nullable
-	private final String nullValue;
-
-	@Nullable
-	private final Integer precisionStep;
-
-	@Nullable
-	private final String locale;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DateProperty(Builder builder) {
-		super(builder);
-
-		this.boost = builder.boost;
-		this.fielddata = builder.fielddata;
-		this.format = builder.format;
-		this.ignoreMalformed = builder.ignoreMalformed;
-		this.index = builder.index;
-		this.nullValue = builder.nullValue;
-		this.precisionStep = builder.precisionStep;
-		this.locale = builder.locale;
-
-	}
-
-	public static DateProperty of(Function<Builder, ObjectBuilder<DateProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Date;
-	}
-
-	/**
-	 * API name: {@code boost}
-	 */
-	@Nullable
-	public final Double boost() {
-		return this.boost;
-	}
-
-	/**
-	 * API name: {@code fielddata}
-	 */
-	@Nullable
-	public final NumericFielddata fielddata() {
-		return this.fielddata;
-	}
-
-	/**
-	 * API name: {@code format}
-	 */
-	@Nullable
-	public final String format() {
-		return this.format;
-	}
-
-	/**
-	 * API name: {@code ignore_malformed}
-	 */
-	@Nullable
-	public final Boolean ignoreMalformed() {
-		return this.ignoreMalformed;
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final Boolean index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code null_value}
-	 */
-	@Nullable
-	public final String nullValue() {
-		return this.nullValue;
-	}
-
-	/**
-	 * API name: {@code precision_step}
-	 */
-	@Nullable
-	public final Integer precisionStep() {
-		return this.precisionStep;
-	}
-
-	/**
-	 * API name: {@code locale}
-	 */
-	@Nullable
-	public final String locale() {
-		return this.locale;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "date");
-		super.serializeInternal(generator, mapper);
-		if (this.boost != null) {
-			generator.writeKey("boost");
-			generator.write(this.boost);
-
-		}
-		if (this.fielddata != null) {
-			generator.writeKey("fielddata");
-			this.fielddata.serialize(generator, mapper);
-
-		}
-		if (this.format != null) {
-			generator.writeKey("format");
-			generator.write(this.format);
-
-		}
-		if (this.ignoreMalformed != null) {
-			generator.writeKey("ignore_malformed");
-			generator.write(this.ignoreMalformed);
-
-		}
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.nullValue != null) {
-			generator.writeKey("null_value");
-			generator.write(this.nullValue);
-
-		}
-		if (this.precisionStep != null) {
-			generator.writeKey("precision_step");
-			generator.write(this.precisionStep);
-
-		}
-		if (this.locale != null) {
-			generator.writeKey("locale");
-			generator.write(this.locale);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DateProperty}.
-	 */
-
-	public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DateProperty> {
-		@Nullable
-		private Double boost;
-
-		@Nullable
-		private NumericFielddata fielddata;
-
-		@Nullable
-		private String format;
-
-		@Nullable
-		private Boolean ignoreMalformed;
-
-		@Nullable
-		private Boolean index;
-
-		@Nullable
-		private String nullValue;
-
-		@Nullable
-		private Integer precisionStep;
-
-		@Nullable
-		private String locale;
-
-		/**
-		 * API name: {@code boost}
-		 */
-		public final Builder boost(@Nullable Double value) {
-			this.boost = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fielddata}
-		 */
-		public final Builder fielddata(@Nullable NumericFielddata value) {
-			this.fielddata = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fielddata}
-		 */
-		public final Builder fielddata(Function<NumericFielddata.Builder, ObjectBuilder<NumericFielddata>> fn) {
-			return this.fielddata(fn.apply(new NumericFielddata.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code format}
-		 */
-		public final Builder format(@Nullable String value) {
-			this.format = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_malformed}
-		 */
-		public final Builder ignoreMalformed(@Nullable Boolean value) {
-			this.ignoreMalformed = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable Boolean value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(@Nullable String value) {
-			this.nullValue = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code precision_step}
-		 */
-		public final Builder precisionStep(@Nullable Integer value) {
-			this.precisionStep = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code locale}
-		 */
-		public final Builder locale(@Nullable String value) {
-			this.locale = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DateProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DateProperty build() {
-			_checkSingleUse();
-
-			return new DateProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DateProperty}
-	 */
-	public static final JsonpDeserializer<DateProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			DateProperty::setupDatePropertyDeserializer);
-
-	protected static void setupDatePropertyDeserializer(ObjectDeserializer<DateProperty.Builder> op) {
-		DocValuesPropertyBase.setupDocValuesPropertyBaseDeserializer(op);
-		op.add(Builder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
-		op.add(Builder::fielddata, NumericFielddata._DESERIALIZER, "fielddata");
-		op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
-		op.add(Builder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
-		op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
-		op.add(Builder::nullValue, JsonpDeserializer.stringDeserializer(), "null_value");
-		op.add(Builder::precisionStep, JsonpDeserializer.integerDeserializer(), "precision_step");
-		op.add(Builder::locale, JsonpDeserializer.stringDeserializer(), "locale");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Double boost;
+
+    @Nullable
+    private final NumericFielddata fielddata;
+
+    @Nullable
+    private final String format;
+
+    @Nullable
+    private final Boolean ignoreMalformed;
+
+    @Nullable
+    private final Boolean index;
+
+    @Nullable
+    private final String nullValue;
+
+    @Nullable
+    private final Integer precisionStep;
+
+    @Nullable
+    private final String locale;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DateProperty(Builder builder) {
+        super(builder);
+
+        this.boost = builder.boost;
+        this.fielddata = builder.fielddata;
+        this.format = builder.format;
+        this.ignoreMalformed = builder.ignoreMalformed;
+        this.index = builder.index;
+        this.nullValue = builder.nullValue;
+        this.precisionStep = builder.precisionStep;
+        this.locale = builder.locale;
+
+    }
+
+    public static DateProperty of(Function<Builder, ObjectBuilder<DateProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Date;
+    }
+
+    /**
+     * API name: {@code boost}
+     */
+    @Nullable
+    public final Double boost() {
+        return this.boost;
+    }
+
+    /**
+     * API name: {@code fielddata}
+     */
+    @Nullable
+    public final NumericFielddata fielddata() {
+        return this.fielddata;
+    }
+
+    /**
+     * API name: {@code format}
+     */
+    @Nullable
+    public final String format() {
+        return this.format;
+    }
+
+    /**
+     * API name: {@code ignore_malformed}
+     */
+    @Nullable
+    public final Boolean ignoreMalformed() {
+        return this.ignoreMalformed;
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    @Nullable
+    public final Boolean index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code null_value}
+     */
+    @Nullable
+    public final String nullValue() {
+        return this.nullValue;
+    }
+
+    /**
+     * API name: {@code precision_step}
+     */
+    @Nullable
+    public final Integer precisionStep() {
+        return this.precisionStep;
+    }
+
+    /**
+     * API name: {@code locale}
+     */
+    @Nullable
+    public final String locale() {
+        return this.locale;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "date");
+        super.serializeInternal(generator, mapper);
+        if (this.boost != null) {
+            generator.writeKey("boost");
+            generator.write(this.boost);
+
+        }
+        if (this.fielddata != null) {
+            generator.writeKey("fielddata");
+            this.fielddata.serialize(generator, mapper);
+
+        }
+        if (this.format != null) {
+            generator.writeKey("format");
+            generator.write(this.format);
+
+        }
+        if (this.ignoreMalformed != null) {
+            generator.writeKey("ignore_malformed");
+            generator.write(this.ignoreMalformed);
+
+        }
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.nullValue != null) {
+            generator.writeKey("null_value");
+            generator.write(this.nullValue);
+
+        }
+        if (this.precisionStep != null) {
+            generator.writeKey("precision_step");
+            generator.write(this.precisionStep);
+
+        }
+        if (this.locale != null) {
+            generator.writeKey("locale");
+            generator.write(this.locale);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DateProperty}.
+     */
+
+    public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<DateProperty> {
+        @Nullable
+        private Double boost;
+
+        @Nullable
+        private NumericFielddata fielddata;
+
+        @Nullable
+        private String format;
+
+        @Nullable
+        private Boolean ignoreMalformed;
+
+        @Nullable
+        private Boolean index;
+
+        @Nullable
+        private String nullValue;
+
+        @Nullable
+        private Integer precisionStep;
+
+        @Nullable
+        private String locale;
+
+        /**
+         * API name: {@code boost}
+         */
+        public final Builder boost(@Nullable Double value) {
+            this.boost = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fielddata}
+         */
+        public final Builder fielddata(@Nullable NumericFielddata value) {
+            this.fielddata = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fielddata}
+         */
+        public final Builder fielddata(Function<NumericFielddata.Builder, ObjectBuilder<NumericFielddata>> fn) {
+            return this.fielddata(fn.apply(new NumericFielddata.Builder()).build());
+        }
+
+        /**
+         * API name: {@code format}
+         */
+        public final Builder format(@Nullable String value) {
+            this.format = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_malformed}
+         */
+        public final Builder ignoreMalformed(@Nullable Boolean value) {
+            this.ignoreMalformed = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable Boolean value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(@Nullable String value) {
+            this.nullValue = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code precision_step}
+         */
+        public final Builder precisionStep(@Nullable Integer value) {
+            this.precisionStep = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code locale}
+         */
+        public final Builder locale(@Nullable String value) {
+            this.locale = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DateProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DateProperty build() {
+            _checkSingleUse();
+
+            return new DateProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DateProperty}
+     */
+    public static final JsonpDeserializer<DateProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DateProperty::setupDatePropertyDeserializer
+    );
+
+    protected static void setupDatePropertyDeserializer(ObjectDeserializer<DateProperty.Builder> op) {
+        DocValuesPropertyBase.setupDocValuesPropertyBaseDeserializer(op);
+        op.add(Builder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
+        op.add(Builder::fielddata, NumericFielddata._DESERIALIZER, "fielddata");
+        op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
+        op.add(Builder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
+        op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
+        op.add(Builder::nullValue, JsonpDeserializer.stringDeserializer(), "null_value");
+        op.add(Builder::precisionStep, JsonpDeserializer.integerDeserializer(), "precision_step");
+        op.add(Builder::locale, JsonpDeserializer.stringDeserializer(), "locale");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DateRangeProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DateRangeProperty.java
index 6c38ce8645..323e175750 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DateRangeProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DateRangeProperty.java
@@ -32,116 +32,115 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.DateRangeProperty
 
-
 @JsonpDeserializable
 public class DateRangeProperty extends RangePropertyBase implements PropertyVariant {
-	@Nullable
-	private final String format;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DateRangeProperty(Builder builder) {
-		super(builder);
-
-		this.format = builder.format;
-
-	}
-
-	public static DateRangeProperty of(Function<Builder, ObjectBuilder<DateRangeProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.DateRange;
-	}
-
-	/**
-	 * API name: {@code format}
-	 */
-	@Nullable
-	public final String format() {
-		return this.format;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "date_range");
-		super.serializeInternal(generator, mapper);
-		if (this.format != null) {
-			generator.writeKey("format");
-			generator.write(this.format);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DateRangeProperty}.
-	 */
-
-	public static class Builder extends RangePropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DateRangeProperty> {
-		@Nullable
-		private String format;
-
-		/**
-		 * API name: {@code format}
-		 */
-		public final Builder format(@Nullable String value) {
-			this.format = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DateRangeProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DateRangeProperty build() {
-			_checkSingleUse();
-
-			return new DateRangeProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DateRangeProperty}
-	 */
-	public static final JsonpDeserializer<DateRangeProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DateRangeProperty::setupDateRangePropertyDeserializer);
-
-	protected static void setupDateRangePropertyDeserializer(ObjectDeserializer<DateRangeProperty.Builder> op) {
-		setupRangePropertyBaseDeserializer(op);
-		op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final String format;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DateRangeProperty(Builder builder) {
+        super(builder);
+
+        this.format = builder.format;
+
+    }
+
+    public static DateRangeProperty of(Function<Builder, ObjectBuilder<DateRangeProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.DateRange;
+    }
+
+    /**
+     * API name: {@code format}
+     */
+    @Nullable
+    public final String format() {
+        return this.format;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "date_range");
+        super.serializeInternal(generator, mapper);
+        if (this.format != null) {
+            generator.writeKey("format");
+            generator.write(this.format);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DateRangeProperty}.
+     */
+
+    public static class Builder extends RangePropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<DateRangeProperty> {
+        @Nullable
+        private String format;
+
+        /**
+         * API name: {@code format}
+         */
+        public final Builder format(@Nullable String value) {
+            this.format = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DateRangeProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DateRangeProperty build() {
+            _checkSingleUse();
+
+            return new DateRangeProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DateRangeProperty}
+     */
+    public static final JsonpDeserializer<DateRangeProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DateRangeProperty::setupDateRangePropertyDeserializer
+    );
+
+    protected static void setupDateRangePropertyDeserializer(ObjectDeserializer<DateRangeProperty.Builder> op) {
+        setupRangePropertyBaseDeserializer(op);
+        op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DocValuesPropertyBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DocValuesPropertyBase.java
index 70777dbbaa..8ffe566ebb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DocValuesPropertyBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DocValuesPropertyBase.java
@@ -32,70 +32,68 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectDeserializer;
-import jakarta.json.stream.JsonGenerator;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.DocValuesPropertyBase
 
-
-
 public abstract class DocValuesPropertyBase extends CorePropertyBase {
-	@Nullable
-	private final Boolean docValues;
+    @Nullable
+    private final Boolean docValues;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected DocValuesPropertyBase(AbstractBuilder<?> builder) {
-		super(builder);
+    protected DocValuesPropertyBase(AbstractBuilder<?> builder) {
+        super(builder);
 
-		this.docValues = builder.docValues;
+        this.docValues = builder.docValues;
 
-	}
+    }
 
-	/**
-	 * API name: {@code doc_values}
-	 */
-	@Nullable
-	public final Boolean docValues() {
-		return this.docValues;
-	}
+    /**
+     * API name: {@code doc_values}
+     */
+    @Nullable
+    public final Boolean docValues() {
+        return this.docValues;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		super.serializeInternal(generator, mapper);
-		if (this.docValues != null) {
-			generator.writeKey("doc_values");
-			generator.write(this.docValues);
+        super.serializeInternal(generator, mapper);
+        if (this.docValues != null) {
+            generator.writeKey("doc_values");
+            generator.write(this.docValues);
 
-		}
+        }
 
-	}
+    }
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				CorePropertyBase.AbstractBuilder<BuilderT> {
-		@Nullable
-		private Boolean docValues;
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends CorePropertyBase.AbstractBuilder<
+        BuilderT> {
+        @Nullable
+        private Boolean docValues;
 
-		/**
-		 * API name: {@code doc_values}
-		 */
-		public final BuilderT docValues(@Nullable Boolean value) {
-			this.docValues = value;
-			return self();
-		}
+        /**
+         * API name: {@code doc_values}
+         */
+        public final BuilderT docValues(@Nullable Boolean value) {
+            this.docValues = value;
+            return self();
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupDocValuesPropertyBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		setupCorePropertyBaseDeserializer(op);
-		op.add(AbstractBuilder::docValues, JsonpDeserializer.booleanDeserializer(), "doc_values");
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupDocValuesPropertyBaseDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
+        setupCorePropertyBaseDeserializer(op);
+        op.add(AbstractBuilder::docValues, JsonpDeserializer.booleanDeserializer(), "doc_values");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DoubleNumberProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DoubleNumberProperty.java
index eb42a77a40..ba6dbe0686 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DoubleNumberProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DoubleNumberProperty.java
@@ -32,116 +32,115 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.DoubleNumberProperty
 
-
 @JsonpDeserializable
 public class DoubleNumberProperty extends StandardNumberProperty implements PropertyVariant {
-	@Nullable
-	private final Double nullValue;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DoubleNumberProperty(Builder builder) {
-		super(builder);
-
-		this.nullValue = builder.nullValue;
-
-	}
-
-	public static DoubleNumberProperty of(Function<Builder, ObjectBuilder<DoubleNumberProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Double;
-	}
-
-	/**
-	 * API name: {@code null_value}
-	 */
-	@Nullable
-	public final Double nullValue() {
-		return this.nullValue;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "double");
-		super.serializeInternal(generator, mapper);
-		if (this.nullValue != null) {
-			generator.writeKey("null_value");
-			generator.write(this.nullValue);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DoubleNumberProperty}.
-	 */
-
-	public static class Builder extends StandardNumberProperty.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DoubleNumberProperty> {
-		@Nullable
-		private Double nullValue;
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(@Nullable Double value) {
-			this.nullValue = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DoubleNumberProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DoubleNumberProperty build() {
-			_checkSingleUse();
-
-			return new DoubleNumberProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DoubleNumberProperty}
-	 */
-	public static final JsonpDeserializer<DoubleNumberProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DoubleNumberProperty::setupDoubleNumberPropertyDeserializer);
-
-	protected static void setupDoubleNumberPropertyDeserializer(ObjectDeserializer<DoubleNumberProperty.Builder> op) {
-		StandardNumberProperty.setupStandardNumberPropertyDeserializer(op);
-		op.add(Builder::nullValue, JsonpDeserializer.doubleDeserializer(), "null_value");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Double nullValue;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DoubleNumberProperty(Builder builder) {
+        super(builder);
+
+        this.nullValue = builder.nullValue;
+
+    }
+
+    public static DoubleNumberProperty of(Function<Builder, ObjectBuilder<DoubleNumberProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Double;
+    }
+
+    /**
+     * API name: {@code null_value}
+     */
+    @Nullable
+    public final Double nullValue() {
+        return this.nullValue;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "double");
+        super.serializeInternal(generator, mapper);
+        if (this.nullValue != null) {
+            generator.writeKey("null_value");
+            generator.write(this.nullValue);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DoubleNumberProperty}.
+     */
+
+    public static class Builder extends StandardNumberProperty.AbstractBuilder<Builder> implements ObjectBuilder<DoubleNumberProperty> {
+        @Nullable
+        private Double nullValue;
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(@Nullable Double value) {
+            this.nullValue = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DoubleNumberProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DoubleNumberProperty build() {
+            _checkSingleUse();
+
+            return new DoubleNumberProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DoubleNumberProperty}
+     */
+    public static final JsonpDeserializer<DoubleNumberProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DoubleNumberProperty::setupDoubleNumberPropertyDeserializer
+    );
+
+    protected static void setupDoubleNumberPropertyDeserializer(ObjectDeserializer<DoubleNumberProperty.Builder> op) {
+        StandardNumberProperty.setupStandardNumberPropertyDeserializer(op);
+        op.add(Builder::nullValue, JsonpDeserializer.doubleDeserializer(), "null_value");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DoubleRangeProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DoubleRangeProperty.java
index 008f844cfe..314fce2ea8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DoubleRangeProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DoubleRangeProperty.java
@@ -32,86 +32,84 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.mapping.DoubleRangeProperty
 
-
 @JsonpDeserializable
 public class DoubleRangeProperty extends RangePropertyBase implements PropertyVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private DoubleRangeProperty(Builder builder) {
-		super(builder);
+    private DoubleRangeProperty(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static DoubleRangeProperty of(Function<Builder, ObjectBuilder<DoubleRangeProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static DoubleRangeProperty of(Function<Builder, ObjectBuilder<DoubleRangeProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.DoubleRange;
-	}
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.DoubleRange;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "double_range");
-		super.serializeInternal(generator, mapper);
+        generator.write("type", "double_range");
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link DoubleRangeProperty}.
-	 */
+    /**
+     * Builder for {@link DoubleRangeProperty}.
+     */
 
-	public static class Builder extends RangePropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DoubleRangeProperty> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends RangePropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<DoubleRangeProperty> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link DoubleRangeProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DoubleRangeProperty build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link DoubleRangeProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DoubleRangeProperty build() {
+            _checkSingleUse();
 
-			return new DoubleRangeProperty(this);
-		}
-	}
+            return new DoubleRangeProperty(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link DoubleRangeProperty}
-	 */
-	public static final JsonpDeserializer<DoubleRangeProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DoubleRangeProperty::setupDoubleRangePropertyDeserializer);
+    /**
+     * Json deserializer for {@link DoubleRangeProperty}
+     */
+    public static final JsonpDeserializer<DoubleRangeProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DoubleRangeProperty::setupDoubleRangePropertyDeserializer
+    );
 
-	protected static void setupDoubleRangePropertyDeserializer(ObjectDeserializer<DoubleRangeProperty.Builder> op) {
-		RangePropertyBase.setupRangePropertyBaseDeserializer(op);
+    protected static void setupDoubleRangePropertyDeserializer(ObjectDeserializer<DoubleRangeProperty.Builder> op) {
+        RangePropertyBase.setupRangePropertyBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DynamicMapping.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DynamicMapping.java
index 05a79d604d..0fe589b4c6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DynamicMapping.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DynamicMapping.java
@@ -35,29 +35,27 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum DynamicMapping implements JsonEnum {
-	Strict("strict"),
+    Strict("strict"),
 
-	Runtime("runtime"),
+    Runtime("runtime"),
 
-	True("true"),
+    True("true"),
 
-	False("false"),
+    False("false"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	DynamicMapping(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    DynamicMapping(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<DynamicMapping> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			DynamicMapping.values());
+    public static final JsonEnum.Deserializer<DynamicMapping> _DESERIALIZER = new JsonEnum.Deserializer<>(DynamicMapping.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DynamicTemplate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DynamicTemplate.java
index a9839d88a0..8ba7139a21 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DynamicTemplate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/DynamicTemplate.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,280 +43,278 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.DynamicTemplate
 
-
 @JsonpDeserializable
 public class DynamicTemplate implements JsonpSerializable {
-	@Nullable
-	private final Property mapping;
-
-	@Nullable
-	private final String match;
-
-	@Nullable
-	private final String matchMappingType;
-
-	@Nullable
-	private final MatchType matchPattern;
-
-	@Nullable
-	private final String pathMatch;
-
-	@Nullable
-	private final String pathUnmatch;
-
-	@Nullable
-	private final String unmatch;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DynamicTemplate(Builder builder) {
-
-		this.mapping = builder.mapping;
-		this.match = builder.match;
-		this.matchMappingType = builder.matchMappingType;
-		this.matchPattern = builder.matchPattern;
-		this.pathMatch = builder.pathMatch;
-		this.pathUnmatch = builder.pathUnmatch;
-		this.unmatch = builder.unmatch;
-
-	}
-
-	public static DynamicTemplate of(Function<Builder, ObjectBuilder<DynamicTemplate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code mapping}
-	 */
-	@Nullable
-	public final Property mapping() {
-		return this.mapping;
-	}
-
-	/**
-	 * API name: {@code match}
-	 */
-	@Nullable
-	public final String match() {
-		return this.match;
-	}
-
-	/**
-	 * API name: {@code match_mapping_type}
-	 */
-	@Nullable
-	public final String matchMappingType() {
-		return this.matchMappingType;
-	}
-
-	/**
-	 * API name: {@code match_pattern}
-	 */
-	@Nullable
-	public final MatchType matchPattern() {
-		return this.matchPattern;
-	}
-
-	/**
-	 * API name: {@code path_match}
-	 */
-	@Nullable
-	public final String pathMatch() {
-		return this.pathMatch;
-	}
-
-	/**
-	 * API name: {@code path_unmatch}
-	 */
-	@Nullable
-	public final String pathUnmatch() {
-		return this.pathUnmatch;
-	}
-
-	/**
-	 * API name: {@code unmatch}
-	 */
-	@Nullable
-	public final String unmatch() {
-		return this.unmatch;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.mapping != null) {
-			generator.writeKey("mapping");
-			this.mapping.serialize(generator, mapper);
-
-		}
-		if (this.match != null) {
-			generator.writeKey("match");
-			generator.write(this.match);
-
-		}
-		if (this.matchMappingType != null) {
-			generator.writeKey("match_mapping_type");
-			generator.write(this.matchMappingType);
-
-		}
-		if (this.matchPattern != null) {
-			generator.writeKey("match_pattern");
-			this.matchPattern.serialize(generator, mapper);
-		}
-		if (this.pathMatch != null) {
-			generator.writeKey("path_match");
-			generator.write(this.pathMatch);
-
-		}
-		if (this.pathUnmatch != null) {
-			generator.writeKey("path_unmatch");
-			generator.write(this.pathUnmatch);
-
-		}
-		if (this.unmatch != null) {
-			generator.writeKey("unmatch");
-			generator.write(this.unmatch);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DynamicTemplate}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DynamicTemplate> {
-		@Nullable
-		private Property mapping;
-
-		@Nullable
-		private String match;
-
-		@Nullable
-		private String matchMappingType;
-
-		@Nullable
-		private MatchType matchPattern;
-
-		@Nullable
-		private String pathMatch;
-
-		@Nullable
-		private String pathUnmatch;
-
-		@Nullable
-		private String unmatch;
-
-		/**
-		 * API name: {@code mapping}
-		 */
-		public final Builder mapping(@Nullable Property value) {
-			this.mapping = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mapping}
-		 */
-		public final Builder mapping(Function<Property.Builder, ObjectBuilder<Property>> fn) {
-			return this.mapping(fn.apply(new Property.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code match}
-		 */
-		public final Builder match(@Nullable String value) {
-			this.match = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code match_mapping_type}
-		 */
-		public final Builder matchMappingType(@Nullable String value) {
-			this.matchMappingType = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code match_pattern}
-		 */
-		public final Builder matchPattern(@Nullable MatchType value) {
-			this.matchPattern = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code path_match}
-		 */
-		public final Builder pathMatch(@Nullable String value) {
-			this.pathMatch = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code path_unmatch}
-		 */
-		public final Builder pathUnmatch(@Nullable String value) {
-			this.pathUnmatch = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code unmatch}
-		 */
-		public final Builder unmatch(@Nullable String value) {
-			this.unmatch = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DynamicTemplate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DynamicTemplate build() {
-			_checkSingleUse();
-
-			return new DynamicTemplate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DynamicTemplate}
-	 */
-	public static final JsonpDeserializer<DynamicTemplate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			DynamicTemplate::setupDynamicTemplateDeserializer);
-
-	protected static void setupDynamicTemplateDeserializer(ObjectDeserializer<DynamicTemplate.Builder> op) {
-
-		op.add(Builder::mapping, Property._DESERIALIZER, "mapping");
-		op.add(Builder::match, JsonpDeserializer.stringDeserializer(), "match");
-		op.add(Builder::matchMappingType, JsonpDeserializer.stringDeserializer(), "match_mapping_type");
-		op.add(Builder::matchPattern, MatchType._DESERIALIZER, "match_pattern");
-		op.add(Builder::pathMatch, JsonpDeserializer.stringDeserializer(), "path_match");
-		op.add(Builder::pathUnmatch, JsonpDeserializer.stringDeserializer(), "path_unmatch");
-		op.add(Builder::unmatch, JsonpDeserializer.stringDeserializer(), "unmatch");
-
-	}
+    @Nullable
+    private final Property mapping;
+
+    @Nullable
+    private final String match;
+
+    @Nullable
+    private final String matchMappingType;
+
+    @Nullable
+    private final MatchType matchPattern;
+
+    @Nullable
+    private final String pathMatch;
+
+    @Nullable
+    private final String pathUnmatch;
+
+    @Nullable
+    private final String unmatch;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DynamicTemplate(Builder builder) {
+
+        this.mapping = builder.mapping;
+        this.match = builder.match;
+        this.matchMappingType = builder.matchMappingType;
+        this.matchPattern = builder.matchPattern;
+        this.pathMatch = builder.pathMatch;
+        this.pathUnmatch = builder.pathUnmatch;
+        this.unmatch = builder.unmatch;
+
+    }
+
+    public static DynamicTemplate of(Function<Builder, ObjectBuilder<DynamicTemplate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code mapping}
+     */
+    @Nullable
+    public final Property mapping() {
+        return this.mapping;
+    }
+
+    /**
+     * API name: {@code match}
+     */
+    @Nullable
+    public final String match() {
+        return this.match;
+    }
+
+    /**
+     * API name: {@code match_mapping_type}
+     */
+    @Nullable
+    public final String matchMappingType() {
+        return this.matchMappingType;
+    }
+
+    /**
+     * API name: {@code match_pattern}
+     */
+    @Nullable
+    public final MatchType matchPattern() {
+        return this.matchPattern;
+    }
+
+    /**
+     * API name: {@code path_match}
+     */
+    @Nullable
+    public final String pathMatch() {
+        return this.pathMatch;
+    }
+
+    /**
+     * API name: {@code path_unmatch}
+     */
+    @Nullable
+    public final String pathUnmatch() {
+        return this.pathUnmatch;
+    }
+
+    /**
+     * API name: {@code unmatch}
+     */
+    @Nullable
+    public final String unmatch() {
+        return this.unmatch;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.mapping != null) {
+            generator.writeKey("mapping");
+            this.mapping.serialize(generator, mapper);
+
+        }
+        if (this.match != null) {
+            generator.writeKey("match");
+            generator.write(this.match);
+
+        }
+        if (this.matchMappingType != null) {
+            generator.writeKey("match_mapping_type");
+            generator.write(this.matchMappingType);
+
+        }
+        if (this.matchPattern != null) {
+            generator.writeKey("match_pattern");
+            this.matchPattern.serialize(generator, mapper);
+        }
+        if (this.pathMatch != null) {
+            generator.writeKey("path_match");
+            generator.write(this.pathMatch);
+
+        }
+        if (this.pathUnmatch != null) {
+            generator.writeKey("path_unmatch");
+            generator.write(this.pathUnmatch);
+
+        }
+        if (this.unmatch != null) {
+            generator.writeKey("unmatch");
+            generator.write(this.unmatch);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DynamicTemplate}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DynamicTemplate> {
+        @Nullable
+        private Property mapping;
+
+        @Nullable
+        private String match;
+
+        @Nullable
+        private String matchMappingType;
+
+        @Nullable
+        private MatchType matchPattern;
+
+        @Nullable
+        private String pathMatch;
+
+        @Nullable
+        private String pathUnmatch;
+
+        @Nullable
+        private String unmatch;
+
+        /**
+         * API name: {@code mapping}
+         */
+        public final Builder mapping(@Nullable Property value) {
+            this.mapping = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mapping}
+         */
+        public final Builder mapping(Function<Property.Builder, ObjectBuilder<Property>> fn) {
+            return this.mapping(fn.apply(new Property.Builder()).build());
+        }
+
+        /**
+         * API name: {@code match}
+         */
+        public final Builder match(@Nullable String value) {
+            this.match = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code match_mapping_type}
+         */
+        public final Builder matchMappingType(@Nullable String value) {
+            this.matchMappingType = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code match_pattern}
+         */
+        public final Builder matchPattern(@Nullable MatchType value) {
+            this.matchPattern = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code path_match}
+         */
+        public final Builder pathMatch(@Nullable String value) {
+            this.pathMatch = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code path_unmatch}
+         */
+        public final Builder pathUnmatch(@Nullable String value) {
+            this.pathUnmatch = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code unmatch}
+         */
+        public final Builder unmatch(@Nullable String value) {
+            this.unmatch = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link DynamicTemplate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DynamicTemplate build() {
+            _checkSingleUse();
+
+            return new DynamicTemplate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DynamicTemplate}
+     */
+    public static final JsonpDeserializer<DynamicTemplate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DynamicTemplate::setupDynamicTemplateDeserializer
+    );
+
+    protected static void setupDynamicTemplateDeserializer(ObjectDeserializer<DynamicTemplate.Builder> op) {
+
+        op.add(Builder::mapping, Property._DESERIALIZER, "mapping");
+        op.add(Builder::match, JsonpDeserializer.stringDeserializer(), "match");
+        op.add(Builder::matchMappingType, JsonpDeserializer.stringDeserializer(), "match_mapping_type");
+        op.add(Builder::matchPattern, MatchType._DESERIALIZER, "match_pattern");
+        op.add(Builder::pathMatch, JsonpDeserializer.stringDeserializer(), "path_match");
+        op.add(Builder::pathUnmatch, JsonpDeserializer.stringDeserializer(), "path_unmatch");
+        op.add(Builder::unmatch, JsonpDeserializer.stringDeserializer(), "unmatch");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FieldAliasProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FieldAliasProperty.java
index abab821b03..88eebbe79b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FieldAliasProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FieldAliasProperty.java
@@ -32,116 +32,115 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.FieldAliasProperty
 
-
 @JsonpDeserializable
 public class FieldAliasProperty extends PropertyBase implements PropertyVariant {
-	@Nullable
-	private final String path;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FieldAliasProperty(Builder builder) {
-		super(builder);
-
-		this.path = builder.path;
-
-	}
-
-	public static FieldAliasProperty of(Function<Builder, ObjectBuilder<FieldAliasProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Alias;
-	}
-
-	/**
-	 * API name: {@code path}
-	 */
-	@Nullable
-	public final String path() {
-		return this.path;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "alias");
-		super.serializeInternal(generator, mapper);
-		if (this.path != null) {
-			generator.writeKey("path");
-			generator.write(this.path);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FieldAliasProperty}.
-	 */
-
-	public static class Builder extends PropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<FieldAliasProperty> {
-		@Nullable
-		private String path;
-
-		/**
-		 * API name: {@code path}
-		 */
-		public final Builder path(@Nullable String value) {
-			this.path = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FieldAliasProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FieldAliasProperty build() {
-			_checkSingleUse();
-
-			return new FieldAliasProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FieldAliasProperty}
-	 */
-	public static final JsonpDeserializer<FieldAliasProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, FieldAliasProperty::setupFieldAliasPropertyDeserializer);
-
-	protected static void setupFieldAliasPropertyDeserializer(ObjectDeserializer<FieldAliasProperty.Builder> op) {
-		PropertyBase.setupPropertyBaseDeserializer(op);
-		op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final String path;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FieldAliasProperty(Builder builder) {
+        super(builder);
+
+        this.path = builder.path;
+
+    }
+
+    public static FieldAliasProperty of(Function<Builder, ObjectBuilder<FieldAliasProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Alias;
+    }
+
+    /**
+     * API name: {@code path}
+     */
+    @Nullable
+    public final String path() {
+        return this.path;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "alias");
+        super.serializeInternal(generator, mapper);
+        if (this.path != null) {
+            generator.writeKey("path");
+            generator.write(this.path);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FieldAliasProperty}.
+     */
+
+    public static class Builder extends PropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<FieldAliasProperty> {
+        @Nullable
+        private String path;
+
+        /**
+         * API name: {@code path}
+         */
+        public final Builder path(@Nullable String value) {
+            this.path = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link FieldAliasProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FieldAliasProperty build() {
+            _checkSingleUse();
+
+            return new FieldAliasProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FieldAliasProperty}
+     */
+    public static final JsonpDeserializer<FieldAliasProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FieldAliasProperty::setupFieldAliasPropertyDeserializer
+    );
+
+    protected static void setupFieldAliasPropertyDeserializer(ObjectDeserializer<FieldAliasProperty.Builder> op) {
+        PropertyBase.setupPropertyBaseDeserializer(op);
+        op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FieldMapping.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FieldMapping.java
index 7c0b75828a..85a3ed6ca8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FieldMapping.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FieldMapping.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,148 +44,146 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _types.mapping.FieldMapping
 
-
 @JsonpDeserializable
 public class FieldMapping implements JsonpSerializable {
-	private final String fullName;
-
-	private final Map<String, Property> mapping;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FieldMapping(Builder builder) {
-
-		this.fullName = ApiTypeHelper.requireNonNull(builder.fullName, this, "fullName");
-		this.mapping = ApiTypeHelper.unmodifiableRequired(builder.mapping, this, "mapping");
-
-	}
-
-	public static FieldMapping of(Function<Builder, ObjectBuilder<FieldMapping>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code full_name}
-	 */
-	public final String fullName() {
-		return this.fullName;
-	}
-
-	/**
-	 * Required - API name: {@code mapping}
-	 */
-	public final Map<String, Property> mapping() {
-		return this.mapping;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeKey("full_name");
-		generator.write(this.fullName);
-
-		if (ApiTypeHelper.isDefined(this.mapping)) {
-			generator.writeKey("mapping");
-			generator.writeStartObject();
-			for (Map.Entry<String, Property> item0 : this.mapping.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FieldMapping}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldMapping> {
-
-		private String fullName;
-
-		private Map<String, Property> mapping;
-
-		/**
-		 * Required - API name: {@code full_name}
-		 */
-		public final Builder fullName(String value) {
-			this.fullName = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mapping}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>mapping</code>.
-		 */
-		public final Builder mapping(Map<String, Property> map) {
-			this.mapping = _mapPutAll(this.mapping, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mapping}
-		 * <p>
-		 * Adds an entry to <code>mapping</code>.
-		 */
-		public final Builder mapping(String key, Property value) {
-			this.mapping = _mapPut(this.mapping, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mapping}
-		 * <p>
-		 * Adds an entry to <code>mapping</code> using a builder lambda.
-		 */
-		public final Builder mapping(String key, Function<Property.Builder, ObjectBuilder<Property>> fn) {
-			return mapping(key, fn.apply(new Property.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link FieldMapping}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FieldMapping build() {
-			_checkSingleUse();
-
-			return new FieldMapping(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FieldMapping}
-	 */
-	public static final JsonpDeserializer<FieldMapping> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FieldMapping::setupFieldMappingDeserializer);
-
-	protected static void setupFieldMappingDeserializer(ObjectDeserializer<FieldMapping.Builder> op) {
-
-		op.add(Builder::fullName, JsonpDeserializer.stringDeserializer(), "full_name");
-		op.add(Builder::mapping, JsonpDeserializer.stringMapDeserializer(Property._DESERIALIZER), "mapping");
-
-	}
+    private final String fullName;
+
+    private final Map<String, Property> mapping;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FieldMapping(Builder builder) {
+
+        this.fullName = ApiTypeHelper.requireNonNull(builder.fullName, this, "fullName");
+        this.mapping = ApiTypeHelper.unmodifiableRequired(builder.mapping, this, "mapping");
+
+    }
+
+    public static FieldMapping of(Function<Builder, ObjectBuilder<FieldMapping>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code full_name}
+     */
+    public final String fullName() {
+        return this.fullName;
+    }
+
+    /**
+     * Required - API name: {@code mapping}
+     */
+    public final Map<String, Property> mapping() {
+        return this.mapping;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeKey("full_name");
+        generator.write(this.fullName);
+
+        if (ApiTypeHelper.isDefined(this.mapping)) {
+            generator.writeKey("mapping");
+            generator.writeStartObject();
+            for (Map.Entry<String, Property> item0 : this.mapping.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FieldMapping}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldMapping> {
+
+        private String fullName;
+
+        private Map<String, Property> mapping;
+
+        /**
+         * Required - API name: {@code full_name}
+         */
+        public final Builder fullName(String value) {
+            this.fullName = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mapping}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>mapping</code>.
+         */
+        public final Builder mapping(Map<String, Property> map) {
+            this.mapping = _mapPutAll(this.mapping, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mapping}
+         * <p>
+         * Adds an entry to <code>mapping</code>.
+         */
+        public final Builder mapping(String key, Property value) {
+            this.mapping = _mapPut(this.mapping, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mapping}
+         * <p>
+         * Adds an entry to <code>mapping</code> using a builder lambda.
+         */
+        public final Builder mapping(String key, Function<Property.Builder, ObjectBuilder<Property>> fn) {
+            return mapping(key, fn.apply(new Property.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link FieldMapping}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FieldMapping build() {
+            _checkSingleUse();
+
+            return new FieldMapping(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FieldMapping}
+     */
+    public static final JsonpDeserializer<FieldMapping> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FieldMapping::setupFieldMappingDeserializer
+    );
+
+    protected static void setupFieldMappingDeserializer(ObjectDeserializer<FieldMapping.Builder> op) {
+
+        op.add(Builder::fullName, JsonpDeserializer.stringDeserializer(), "full_name");
+        op.add(Builder::mapping, JsonpDeserializer.stringMapDeserializer(Property._DESERIALIZER), "mapping");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FieldNamesField.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FieldNamesField.java
index aeb5bc9e15..ec4068d0fe 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FieldNamesField.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FieldNamesField.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,93 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.mapping.FieldNamesField
 
-
 @JsonpDeserializable
 public class FieldNamesField implements JsonpSerializable {
-	private final boolean enabled;
+    private final boolean enabled;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private FieldNamesField(Builder builder) {
+    private FieldNamesField(Builder builder) {
 
-		this.enabled = ApiTypeHelper.requireNonNull(builder.enabled, this, "enabled");
+        this.enabled = ApiTypeHelper.requireNonNull(builder.enabled, this, "enabled");
 
-	}
+    }
 
-	public static FieldNamesField of(Function<Builder, ObjectBuilder<FieldNamesField>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static FieldNamesField of(Function<Builder, ObjectBuilder<FieldNamesField>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code enabled}
-	 */
-	public final boolean enabled() {
-		return this.enabled;
-	}
+    /**
+     * Required - API name: {@code enabled}
+     */
+    public final boolean enabled() {
+        return this.enabled;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("enabled");
-		generator.write(this.enabled);
+        generator.writeKey("enabled");
+        generator.write(this.enabled);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link FieldNamesField}.
-	 */
+    /**
+     * Builder for {@link FieldNamesField}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldNamesField> {
-		private Boolean enabled;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldNamesField> {
+        private Boolean enabled;
 
-		/**
-		 * Required - API name: {@code enabled}
-		 */
-		public final Builder enabled(boolean value) {
-			this.enabled = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code enabled}
+         */
+        public final Builder enabled(boolean value) {
+            this.enabled = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link FieldNamesField}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FieldNamesField build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link FieldNamesField}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FieldNamesField build() {
+            _checkSingleUse();
 
-			return new FieldNamesField(this);
-		}
-	}
+            return new FieldNamesField(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link FieldNamesField}
-	 */
-	public static final JsonpDeserializer<FieldNamesField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FieldNamesField::setupFieldNamesFieldDeserializer);
+    /**
+     * Json deserializer for {@link FieldNamesField}
+     */
+    public static final JsonpDeserializer<FieldNamesField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FieldNamesField::setupFieldNamesFieldDeserializer
+    );
 
-	protected static void setupFieldNamesFieldDeserializer(ObjectDeserializer<FieldNamesField.Builder> op) {
+    protected static void setupFieldNamesFieldDeserializer(ObjectDeserializer<FieldNamesField.Builder> op) {
 
-		op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
+        op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FieldType.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FieldType.java
index 7538bae57e..ee1b6e052b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FieldType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FieldType.java
@@ -35,102 +35,99 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum FieldType implements JsonEnum {
-	None("none"),
+    None("none"),
 
-	GeoPoint("geo_point"),
+    GeoPoint("geo_point"),
 
-	GeoShape("geo_shape"),
+    GeoShape("geo_shape"),
 
-	Ip("ip"),
+    Ip("ip"),
 
-	Binary("binary"),
+    Binary("binary"),
 
-	Keyword("keyword"),
+    Keyword("keyword"),
 
-	Text("text"),
+    Text("text"),
 
-	SearchAsYouType("search_as_you_type"),
+    SearchAsYouType("search_as_you_type"),
 
-	Date("date"),
+    Date("date"),
 
-	DateNanos("date_nanos"),
+    DateNanos("date_nanos"),
 
-	Boolean("boolean"),
+    Boolean("boolean"),
 
-	Completion("completion"),
+    Completion("completion"),
 
-	Nested("nested"),
+    Nested("nested"),
 
-	Object("object"),
+    Object("object"),
 
-	Murmur3("murmur3"),
+    Murmur3("murmur3"),
 
-	TokenCount("token_count"),
+    TokenCount("token_count"),
 
-	Percolator("percolator"),
+    Percolator("percolator"),
 
-	Integer("integer"),
+    Integer("integer"),
 
-	Long("long"),
+    Long("long"),
 
-	Short("short"),
+    Short("short"),
 
-	Byte("byte"),
+    Byte("byte"),
 
-	Float("float"),
+    Float("float"),
 
-	HalfFloat("half_float"),
+    HalfFloat("half_float"),
 
-	ScaledFloat("scaled_float"),
+    ScaledFloat("scaled_float"),
 
-	Double("double"),
+    Double("double"),
 
-	IntegerRange("integer_range"),
+    IntegerRange("integer_range"),
 
-	FloatRange("float_range"),
+    FloatRange("float_range"),
 
-	LongRange("long_range"),
+    LongRange("long_range"),
 
-	DoubleRange("double_range"),
+    DoubleRange("double_range"),
 
-	DateRange("date_range"),
+    DateRange("date_range"),
 
-	IpRange("ip_range"),
+    IpRange("ip_range"),
 
-	Alias("alias"),
+    Alias("alias"),
 
-	Join("join"),
+    Join("join"),
 
-	RankFeature("rank_feature"),
+    RankFeature("rank_feature"),
 
-	RankFeatures("rank_features"),
+    RankFeatures("rank_features"),
 
-	Flattened("flattened"),
+    Flattened("flattened"),
 
-	Shape("shape"),
+    Shape("shape"),
 
-	Histogram("histogram"),
+    Histogram("histogram"),
 
-	ConstantKeyword("constant_keyword"),
+    ConstantKeyword("constant_keyword"),
 
-	AggregateMetricDouble("aggregate_metric_double"),
+    AggregateMetricDouble("aggregate_metric_double"),
 
-	KnnVector("knn_vector"),
-	;
+    KnnVector("knn_vector"),;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	FieldType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    FieldType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<FieldType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			FieldType.values());
+    public static final JsonEnum.Deserializer<FieldType> _DESERIALIZER = new JsonEnum.Deserializer<>(FieldType.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FlattenedProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FlattenedProperty.java
index 24cb6d2ba5..f683b158a1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FlattenedProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FlattenedProperty.java
@@ -32,348 +32,346 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.FlattenedProperty
 
-
 @JsonpDeserializable
 public class FlattenedProperty extends PropertyBase implements PropertyVariant {
-	@Nullable
-	private final Double boost;
-
-	@Nullable
-	private final Integer depthLimit;
-
-	@Nullable
-	private final Boolean docValues;
-
-	@Nullable
-	private final Boolean eagerGlobalOrdinals;
-
-	@Nullable
-	private final Boolean index;
-
-	@Nullable
-	private final IndexOptions indexOptions;
-
-	@Nullable
-	private final String nullValue;
-
-	@Nullable
-	private final String similarity;
-
-	@Nullable
-	private final Boolean splitQueriesOnWhitespace;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FlattenedProperty(Builder builder) {
-		super(builder);
-
-		this.boost = builder.boost;
-		this.depthLimit = builder.depthLimit;
-		this.docValues = builder.docValues;
-		this.eagerGlobalOrdinals = builder.eagerGlobalOrdinals;
-		this.index = builder.index;
-		this.indexOptions = builder.indexOptions;
-		this.nullValue = builder.nullValue;
-		this.similarity = builder.similarity;
-		this.splitQueriesOnWhitespace = builder.splitQueriesOnWhitespace;
-
-	}
-
-	public static FlattenedProperty of(Function<Builder, ObjectBuilder<FlattenedProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Flattened;
-	}
-
-	/**
-	 * API name: {@code boost}
-	 */
-	@Nullable
-	public final Double boost() {
-		return this.boost;
-	}
-
-	/**
-	 * API name: {@code depth_limit}
-	 */
-	@Nullable
-	public final Integer depthLimit() {
-		return this.depthLimit;
-	}
-
-	/**
-	 * API name: {@code doc_values}
-	 */
-	@Nullable
-	public final Boolean docValues() {
-		return this.docValues;
-	}
-
-	/**
-	 * API name: {@code eager_global_ordinals}
-	 */
-	@Nullable
-	public final Boolean eagerGlobalOrdinals() {
-		return this.eagerGlobalOrdinals;
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final Boolean index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code index_options}
-	 */
-	@Nullable
-	public final IndexOptions indexOptions() {
-		return this.indexOptions;
-	}
-
-	/**
-	 * API name: {@code null_value}
-	 */
-	@Nullable
-	public final String nullValue() {
-		return this.nullValue;
-	}
-
-	/**
-	 * API name: {@code similarity}
-	 */
-	@Nullable
-	public final String similarity() {
-		return this.similarity;
-	}
-
-	/**
-	 * API name: {@code split_queries_on_whitespace}
-	 */
-	@Nullable
-	public final Boolean splitQueriesOnWhitespace() {
-		return this.splitQueriesOnWhitespace;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "flattened");
-		super.serializeInternal(generator, mapper);
-		if (this.boost != null) {
-			generator.writeKey("boost");
-			generator.write(this.boost);
-
-		}
-		if (this.depthLimit != null) {
-			generator.writeKey("depth_limit");
-			generator.write(this.depthLimit);
-
-		}
-		if (this.docValues != null) {
-			generator.writeKey("doc_values");
-			generator.write(this.docValues);
-
-		}
-		if (this.eagerGlobalOrdinals != null) {
-			generator.writeKey("eager_global_ordinals");
-			generator.write(this.eagerGlobalOrdinals);
-
-		}
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.indexOptions != null) {
-			generator.writeKey("index_options");
-			this.indexOptions.serialize(generator, mapper);
-		}
-		if (this.nullValue != null) {
-			generator.writeKey("null_value");
-			generator.write(this.nullValue);
-
-		}
-		if (this.similarity != null) {
-			generator.writeKey("similarity");
-			generator.write(this.similarity);
-
-		}
-		if (this.splitQueriesOnWhitespace != null) {
-			generator.writeKey("split_queries_on_whitespace");
-			generator.write(this.splitQueriesOnWhitespace);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FlattenedProperty}.
-	 */
-
-	public static class Builder extends PropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<FlattenedProperty> {
-		@Nullable
-		private Double boost;
-
-		@Nullable
-		private Integer depthLimit;
-
-		@Nullable
-		private Boolean docValues;
-
-		@Nullable
-		private Boolean eagerGlobalOrdinals;
-
-		@Nullable
-		private Boolean index;
-
-		@Nullable
-		private IndexOptions indexOptions;
-
-		@Nullable
-		private String nullValue;
-
-		@Nullable
-		private String similarity;
-
-		@Nullable
-		private Boolean splitQueriesOnWhitespace;
-
-		/**
-		 * API name: {@code boost}
-		 */
-		public final Builder boost(@Nullable Double value) {
-			this.boost = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code depth_limit}
-		 */
-		public final Builder depthLimit(@Nullable Integer value) {
-			this.depthLimit = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code doc_values}
-		 */
-		public final Builder docValues(@Nullable Boolean value) {
-			this.docValues = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code eager_global_ordinals}
-		 */
-		public final Builder eagerGlobalOrdinals(@Nullable Boolean value) {
-			this.eagerGlobalOrdinals = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable Boolean value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_options}
-		 */
-		public final Builder indexOptions(@Nullable IndexOptions value) {
-			this.indexOptions = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(@Nullable String value) {
-			this.nullValue = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code similarity}
-		 */
-		public final Builder similarity(@Nullable String value) {
-			this.similarity = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code split_queries_on_whitespace}
-		 */
-		public final Builder splitQueriesOnWhitespace(@Nullable Boolean value) {
-			this.splitQueriesOnWhitespace = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FlattenedProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FlattenedProperty build() {
-			_checkSingleUse();
-
-			return new FlattenedProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FlattenedProperty}
-	 */
-	public static final JsonpDeserializer<FlattenedProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, FlattenedProperty::setupFlattenedPropertyDeserializer);
-
-	protected static void setupFlattenedPropertyDeserializer(ObjectDeserializer<FlattenedProperty.Builder> op) {
-		PropertyBase.setupPropertyBaseDeserializer(op);
-		op.add(Builder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
-		op.add(Builder::depthLimit, JsonpDeserializer.integerDeserializer(), "depth_limit");
-		op.add(Builder::docValues, JsonpDeserializer.booleanDeserializer(), "doc_values");
-		op.add(Builder::eagerGlobalOrdinals, JsonpDeserializer.booleanDeserializer(), "eager_global_ordinals");
-		op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
-		op.add(Builder::indexOptions, IndexOptions._DESERIALIZER, "index_options");
-		op.add(Builder::nullValue, JsonpDeserializer.stringDeserializer(), "null_value");
-		op.add(Builder::similarity, JsonpDeserializer.stringDeserializer(), "similarity");
-		op.add(Builder::splitQueriesOnWhitespace, JsonpDeserializer.booleanDeserializer(),
-				"split_queries_on_whitespace");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Double boost;
+
+    @Nullable
+    private final Integer depthLimit;
+
+    @Nullable
+    private final Boolean docValues;
+
+    @Nullable
+    private final Boolean eagerGlobalOrdinals;
+
+    @Nullable
+    private final Boolean index;
+
+    @Nullable
+    private final IndexOptions indexOptions;
+
+    @Nullable
+    private final String nullValue;
+
+    @Nullable
+    private final String similarity;
+
+    @Nullable
+    private final Boolean splitQueriesOnWhitespace;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FlattenedProperty(Builder builder) {
+        super(builder);
+
+        this.boost = builder.boost;
+        this.depthLimit = builder.depthLimit;
+        this.docValues = builder.docValues;
+        this.eagerGlobalOrdinals = builder.eagerGlobalOrdinals;
+        this.index = builder.index;
+        this.indexOptions = builder.indexOptions;
+        this.nullValue = builder.nullValue;
+        this.similarity = builder.similarity;
+        this.splitQueriesOnWhitespace = builder.splitQueriesOnWhitespace;
+
+    }
+
+    public static FlattenedProperty of(Function<Builder, ObjectBuilder<FlattenedProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Flattened;
+    }
+
+    /**
+     * API name: {@code boost}
+     */
+    @Nullable
+    public final Double boost() {
+        return this.boost;
+    }
+
+    /**
+     * API name: {@code depth_limit}
+     */
+    @Nullable
+    public final Integer depthLimit() {
+        return this.depthLimit;
+    }
+
+    /**
+     * API name: {@code doc_values}
+     */
+    @Nullable
+    public final Boolean docValues() {
+        return this.docValues;
+    }
+
+    /**
+     * API name: {@code eager_global_ordinals}
+     */
+    @Nullable
+    public final Boolean eagerGlobalOrdinals() {
+        return this.eagerGlobalOrdinals;
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    @Nullable
+    public final Boolean index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code index_options}
+     */
+    @Nullable
+    public final IndexOptions indexOptions() {
+        return this.indexOptions;
+    }
+
+    /**
+     * API name: {@code null_value}
+     */
+    @Nullable
+    public final String nullValue() {
+        return this.nullValue;
+    }
+
+    /**
+     * API name: {@code similarity}
+     */
+    @Nullable
+    public final String similarity() {
+        return this.similarity;
+    }
+
+    /**
+     * API name: {@code split_queries_on_whitespace}
+     */
+    @Nullable
+    public final Boolean splitQueriesOnWhitespace() {
+        return this.splitQueriesOnWhitespace;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "flattened");
+        super.serializeInternal(generator, mapper);
+        if (this.boost != null) {
+            generator.writeKey("boost");
+            generator.write(this.boost);
+
+        }
+        if (this.depthLimit != null) {
+            generator.writeKey("depth_limit");
+            generator.write(this.depthLimit);
+
+        }
+        if (this.docValues != null) {
+            generator.writeKey("doc_values");
+            generator.write(this.docValues);
+
+        }
+        if (this.eagerGlobalOrdinals != null) {
+            generator.writeKey("eager_global_ordinals");
+            generator.write(this.eagerGlobalOrdinals);
+
+        }
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.indexOptions != null) {
+            generator.writeKey("index_options");
+            this.indexOptions.serialize(generator, mapper);
+        }
+        if (this.nullValue != null) {
+            generator.writeKey("null_value");
+            generator.write(this.nullValue);
+
+        }
+        if (this.similarity != null) {
+            generator.writeKey("similarity");
+            generator.write(this.similarity);
+
+        }
+        if (this.splitQueriesOnWhitespace != null) {
+            generator.writeKey("split_queries_on_whitespace");
+            generator.write(this.splitQueriesOnWhitespace);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FlattenedProperty}.
+     */
+
+    public static class Builder extends PropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<FlattenedProperty> {
+        @Nullable
+        private Double boost;
+
+        @Nullable
+        private Integer depthLimit;
+
+        @Nullable
+        private Boolean docValues;
+
+        @Nullable
+        private Boolean eagerGlobalOrdinals;
+
+        @Nullable
+        private Boolean index;
+
+        @Nullable
+        private IndexOptions indexOptions;
+
+        @Nullable
+        private String nullValue;
+
+        @Nullable
+        private String similarity;
+
+        @Nullable
+        private Boolean splitQueriesOnWhitespace;
+
+        /**
+         * API name: {@code boost}
+         */
+        public final Builder boost(@Nullable Double value) {
+            this.boost = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code depth_limit}
+         */
+        public final Builder depthLimit(@Nullable Integer value) {
+            this.depthLimit = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code doc_values}
+         */
+        public final Builder docValues(@Nullable Boolean value) {
+            this.docValues = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code eager_global_ordinals}
+         */
+        public final Builder eagerGlobalOrdinals(@Nullable Boolean value) {
+            this.eagerGlobalOrdinals = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable Boolean value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index_options}
+         */
+        public final Builder indexOptions(@Nullable IndexOptions value) {
+            this.indexOptions = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(@Nullable String value) {
+            this.nullValue = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code similarity}
+         */
+        public final Builder similarity(@Nullable String value) {
+            this.similarity = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code split_queries_on_whitespace}
+         */
+        public final Builder splitQueriesOnWhitespace(@Nullable Boolean value) {
+            this.splitQueriesOnWhitespace = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link FlattenedProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FlattenedProperty build() {
+            _checkSingleUse();
+
+            return new FlattenedProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FlattenedProperty}
+     */
+    public static final JsonpDeserializer<FlattenedProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FlattenedProperty::setupFlattenedPropertyDeserializer
+    );
+
+    protected static void setupFlattenedPropertyDeserializer(ObjectDeserializer<FlattenedProperty.Builder> op) {
+        PropertyBase.setupPropertyBaseDeserializer(op);
+        op.add(Builder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
+        op.add(Builder::depthLimit, JsonpDeserializer.integerDeserializer(), "depth_limit");
+        op.add(Builder::docValues, JsonpDeserializer.booleanDeserializer(), "doc_values");
+        op.add(Builder::eagerGlobalOrdinals, JsonpDeserializer.booleanDeserializer(), "eager_global_ordinals");
+        op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
+        op.add(Builder::indexOptions, IndexOptions._DESERIALIZER, "index_options");
+        op.add(Builder::nullValue, JsonpDeserializer.stringDeserializer(), "null_value");
+        op.add(Builder::similarity, JsonpDeserializer.stringDeserializer(), "similarity");
+        op.add(Builder::splitQueriesOnWhitespace, JsonpDeserializer.booleanDeserializer(), "split_queries_on_whitespace");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FloatNumberProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FloatNumberProperty.java
index 633d958dcd..32677797db 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FloatNumberProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FloatNumberProperty.java
@@ -32,116 +32,115 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.FloatNumberProperty
 
-
 @JsonpDeserializable
 public class FloatNumberProperty extends StandardNumberProperty implements PropertyVariant {
-	@Nullable
-	private final Float nullValue;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FloatNumberProperty(Builder builder) {
-		super(builder);
-
-		this.nullValue = builder.nullValue;
-
-	}
-
-	public static FloatNumberProperty of(Function<Builder, ObjectBuilder<FloatNumberProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Float;
-	}
-
-	/**
-	 * API name: {@code null_value}
-	 */
-	@Nullable
-	public final Float nullValue() {
-		return this.nullValue;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "float");
-		super.serializeInternal(generator, mapper);
-		if (this.nullValue != null) {
-			generator.writeKey("null_value");
-			generator.write(this.nullValue);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FloatNumberProperty}.
-	 */
-
-	public static class Builder extends StandardNumberProperty.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<FloatNumberProperty> {
-		@Nullable
-		private Float nullValue;
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(@Nullable Float value) {
-			this.nullValue = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FloatNumberProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FloatNumberProperty build() {
-			_checkSingleUse();
-
-			return new FloatNumberProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FloatNumberProperty}
-	 */
-	public static final JsonpDeserializer<FloatNumberProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, FloatNumberProperty::setupFloatNumberPropertyDeserializer);
-
-	protected static void setupFloatNumberPropertyDeserializer(ObjectDeserializer<FloatNumberProperty.Builder> op) {
-		StandardNumberProperty.setupStandardNumberPropertyDeserializer(op);
-		op.add(Builder::nullValue, JsonpDeserializer.floatDeserializer(), "null_value");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Float nullValue;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FloatNumberProperty(Builder builder) {
+        super(builder);
+
+        this.nullValue = builder.nullValue;
+
+    }
+
+    public static FloatNumberProperty of(Function<Builder, ObjectBuilder<FloatNumberProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Float;
+    }
+
+    /**
+     * API name: {@code null_value}
+     */
+    @Nullable
+    public final Float nullValue() {
+        return this.nullValue;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "float");
+        super.serializeInternal(generator, mapper);
+        if (this.nullValue != null) {
+            generator.writeKey("null_value");
+            generator.write(this.nullValue);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FloatNumberProperty}.
+     */
+
+    public static class Builder extends StandardNumberProperty.AbstractBuilder<Builder> implements ObjectBuilder<FloatNumberProperty> {
+        @Nullable
+        private Float nullValue;
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(@Nullable Float value) {
+            this.nullValue = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link FloatNumberProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FloatNumberProperty build() {
+            _checkSingleUse();
+
+            return new FloatNumberProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FloatNumberProperty}
+     */
+    public static final JsonpDeserializer<FloatNumberProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FloatNumberProperty::setupFloatNumberPropertyDeserializer
+    );
+
+    protected static void setupFloatNumberPropertyDeserializer(ObjectDeserializer<FloatNumberProperty.Builder> op) {
+        StandardNumberProperty.setupStandardNumberPropertyDeserializer(op);
+        op.add(Builder::nullValue, JsonpDeserializer.floatDeserializer(), "null_value");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FloatRangeProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FloatRangeProperty.java
index 062fa53cc3..9029afe952 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FloatRangeProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/FloatRangeProperty.java
@@ -32,86 +32,84 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.mapping.FloatRangeProperty
 
-
 @JsonpDeserializable
 public class FloatRangeProperty extends RangePropertyBase implements PropertyVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private FloatRangeProperty(Builder builder) {
-		super(builder);
+    private FloatRangeProperty(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static FloatRangeProperty of(Function<Builder, ObjectBuilder<FloatRangeProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static FloatRangeProperty of(Function<Builder, ObjectBuilder<FloatRangeProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.FloatRange;
-	}
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.FloatRange;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "float_range");
-		super.serializeInternal(generator, mapper);
+        generator.write("type", "float_range");
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link FloatRangeProperty}.
-	 */
+    /**
+     * Builder for {@link FloatRangeProperty}.
+     */
 
-	public static class Builder extends RangePropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<FloatRangeProperty> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends RangePropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<FloatRangeProperty> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link FloatRangeProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FloatRangeProperty build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link FloatRangeProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FloatRangeProperty build() {
+            _checkSingleUse();
 
-			return new FloatRangeProperty(this);
-		}
-	}
+            return new FloatRangeProperty(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link FloatRangeProperty}
-	 */
-	public static final JsonpDeserializer<FloatRangeProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, FloatRangeProperty::setupFloatRangePropertyDeserializer);
+    /**
+     * Json deserializer for {@link FloatRangeProperty}
+     */
+    public static final JsonpDeserializer<FloatRangeProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FloatRangeProperty::setupFloatRangePropertyDeserializer
+    );
 
-	protected static void setupFloatRangePropertyDeserializer(ObjectDeserializer<FloatRangeProperty.Builder> op) {
-		RangePropertyBase.setupRangePropertyBaseDeserializer(op);
+    protected static void setupFloatRangePropertyDeserializer(ObjectDeserializer<FloatRangeProperty.Builder> op) {
+        RangePropertyBase.setupRangePropertyBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/GeoOrientation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/GeoOrientation.java
index da195a386b..fe98fcc151 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/GeoOrientation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/GeoOrientation.java
@@ -35,31 +35,29 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum GeoOrientation implements JsonEnum {
-	Right("right", "RIGHT", "counterclockwise", "ccw"),
+    Right("right", "RIGHT", "counterclockwise", "ccw"),
 
-	Left("left", "LEFT", "clockwise", "cw"),
+    Left("left", "LEFT", "clockwise", "cw"),
 
-	;
+    ;
 
-	private final String jsonValue;
-	private final String[] aliases;
+    private final String jsonValue;
+    private final String[] aliases;
 
-	GeoOrientation(String jsonValue, String... aliases) {
-		this.jsonValue = jsonValue;
-		this.aliases = aliases;
-	}
+    GeoOrientation(String jsonValue, String... aliases) {
+        this.jsonValue = jsonValue;
+        this.aliases = aliases;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public String[] aliases() {
-		return this.aliases;
-	}
+    public String[] aliases() {
+        return this.aliases;
+    }
 
-	public static final JsonEnum.Deserializer<GeoOrientation> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			GeoOrientation.values());
+    public static final JsonEnum.Deserializer<GeoOrientation> _DESERIALIZER = new JsonEnum.Deserializer<>(GeoOrientation.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/GeoPointProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/GeoPointProperty.java
index c57d677e40..42af866e16 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/GeoPointProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/GeoPointProperty.java
@@ -32,182 +32,181 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
-import org.opensearch.client.opensearch._types.GeoLocation;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.GeoLocation;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.GeoPointProperty
 
-
 @JsonpDeserializable
 public class GeoPointProperty extends DocValuesPropertyBase implements PropertyVariant {
-	@Nullable
-	private final Boolean ignoreMalformed;
-
-	@Nullable
-	private final Boolean ignoreZValue;
-
-	@Nullable
-	private final GeoLocation nullValue;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoPointProperty(Builder builder) {
-		super(builder);
-
-		this.ignoreMalformed = builder.ignoreMalformed;
-		this.ignoreZValue = builder.ignoreZValue;
-		this.nullValue = builder.nullValue;
-
-	}
-
-	public static GeoPointProperty of(Function<Builder, ObjectBuilder<GeoPointProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.GeoPoint;
-	}
-
-	/**
-	 * API name: {@code ignore_malformed}
-	 */
-	@Nullable
-	public final Boolean ignoreMalformed() {
-		return this.ignoreMalformed;
-	}
-
-	/**
-	 * API name: {@code ignore_z_value}
-	 */
-	@Nullable
-	public final Boolean ignoreZValue() {
-		return this.ignoreZValue;
-	}
-
-	/**
-	 * API name: {@code null_value}
-	 */
-	@Nullable
-	public final GeoLocation nullValue() {
-		return this.nullValue;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "geo_point");
-		super.serializeInternal(generator, mapper);
-		if (this.ignoreMalformed != null) {
-			generator.writeKey("ignore_malformed");
-			generator.write(this.ignoreMalformed);
-
-		}
-		if (this.ignoreZValue != null) {
-			generator.writeKey("ignore_z_value");
-			generator.write(this.ignoreZValue);
-
-		}
-		if (this.nullValue != null) {
-			generator.writeKey("null_value");
-			this.nullValue.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoPointProperty}.
-	 */
-
-	public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<GeoPointProperty> {
-		@Nullable
-		private Boolean ignoreMalformed;
-
-		@Nullable
-		private Boolean ignoreZValue;
-
-		@Nullable
-		private GeoLocation nullValue;
-
-		/**
-		 * API name: {@code ignore_malformed}
-		 */
-		public final Builder ignoreMalformed(@Nullable Boolean value) {
-			this.ignoreMalformed = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_z_value}
-		 */
-		public final Builder ignoreZValue(@Nullable Boolean value) {
-			this.ignoreZValue = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(@Nullable GeoLocation value) {
-			this.nullValue = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
-			return this.nullValue(fn.apply(new GeoLocation.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoPointProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoPointProperty build() {
-			_checkSingleUse();
-
-			return new GeoPointProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoPointProperty}
-	 */
-	public static final JsonpDeserializer<GeoPointProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GeoPointProperty::setupGeoPointPropertyDeserializer);
-
-	protected static void setupGeoPointPropertyDeserializer(ObjectDeserializer<GeoPointProperty.Builder> op) {
-		setupDocValuesPropertyBaseDeserializer(op);
-		op.add(Builder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
-		op.add(Builder::ignoreZValue, JsonpDeserializer.booleanDeserializer(), "ignore_z_value");
-		op.add(Builder::nullValue, GeoLocation._DESERIALIZER, "null_value");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Boolean ignoreMalformed;
+
+    @Nullable
+    private final Boolean ignoreZValue;
+
+    @Nullable
+    private final GeoLocation nullValue;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoPointProperty(Builder builder) {
+        super(builder);
+
+        this.ignoreMalformed = builder.ignoreMalformed;
+        this.ignoreZValue = builder.ignoreZValue;
+        this.nullValue = builder.nullValue;
+
+    }
+
+    public static GeoPointProperty of(Function<Builder, ObjectBuilder<GeoPointProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.GeoPoint;
+    }
+
+    /**
+     * API name: {@code ignore_malformed}
+     */
+    @Nullable
+    public final Boolean ignoreMalformed() {
+        return this.ignoreMalformed;
+    }
+
+    /**
+     * API name: {@code ignore_z_value}
+     */
+    @Nullable
+    public final Boolean ignoreZValue() {
+        return this.ignoreZValue;
+    }
+
+    /**
+     * API name: {@code null_value}
+     */
+    @Nullable
+    public final GeoLocation nullValue() {
+        return this.nullValue;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "geo_point");
+        super.serializeInternal(generator, mapper);
+        if (this.ignoreMalformed != null) {
+            generator.writeKey("ignore_malformed");
+            generator.write(this.ignoreMalformed);
+
+        }
+        if (this.ignoreZValue != null) {
+            generator.writeKey("ignore_z_value");
+            generator.write(this.ignoreZValue);
+
+        }
+        if (this.nullValue != null) {
+            generator.writeKey("null_value");
+            this.nullValue.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoPointProperty}.
+     */
+
+    public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoPointProperty> {
+        @Nullable
+        private Boolean ignoreMalformed;
+
+        @Nullable
+        private Boolean ignoreZValue;
+
+        @Nullable
+        private GeoLocation nullValue;
+
+        /**
+         * API name: {@code ignore_malformed}
+         */
+        public final Builder ignoreMalformed(@Nullable Boolean value) {
+            this.ignoreMalformed = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_z_value}
+         */
+        public final Builder ignoreZValue(@Nullable Boolean value) {
+            this.ignoreZValue = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(@Nullable GeoLocation value) {
+            this.nullValue = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
+            return this.nullValue(fn.apply(new GeoLocation.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoPointProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoPointProperty build() {
+            _checkSingleUse();
+
+            return new GeoPointProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoPointProperty}
+     */
+    public static final JsonpDeserializer<GeoPointProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoPointProperty::setupGeoPointPropertyDeserializer
+    );
+
+    protected static void setupGeoPointPropertyDeserializer(ObjectDeserializer<GeoPointProperty.Builder> op) {
+        setupDocValuesPropertyBaseDeserializer(op);
+        op.add(Builder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
+        op.add(Builder::ignoreZValue, JsonpDeserializer.booleanDeserializer(), "ignore_z_value");
+        op.add(Builder::nullValue, GeoLocation._DESERIALIZER, "null_value");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/GeoShapeProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/GeoShapeProperty.java
index e12ecace69..c356213908 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/GeoShapeProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/GeoShapeProperty.java
@@ -32,234 +32,234 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.GeoShapeProperty
 
 /**
  * The <code>geo_shape</code> data type facilitates the indexing of and
  * searching with arbitrary geo shapes such as rectangles and polygons.
- * 
+ *
  */
 @JsonpDeserializable
 public class GeoShapeProperty extends DocValuesPropertyBase implements PropertyVariant {
-	@Nullable
-	private final Boolean coerce;
-
-	@Nullable
-	private final Boolean ignoreMalformed;
-
-	@Nullable
-	private final Boolean ignoreZValue;
-
-	@Nullable
-	private final GeoOrientation orientation;
-
-	@Nullable
-	private final GeoStrategy strategy;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoShapeProperty(Builder builder) {
-		super(builder);
-
-		this.coerce = builder.coerce;
-		this.ignoreMalformed = builder.ignoreMalformed;
-		this.ignoreZValue = builder.ignoreZValue;
-		this.orientation = builder.orientation;
-		this.strategy = builder.strategy;
-
-	}
-
-	public static GeoShapeProperty of(Function<Builder, ObjectBuilder<GeoShapeProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.GeoShape;
-	}
-
-	/**
-	 * API name: {@code coerce}
-	 */
-	@Nullable
-	public final Boolean coerce() {
-		return this.coerce;
-	}
-
-	/**
-	 * API name: {@code ignore_malformed}
-	 */
-	@Nullable
-	public final Boolean ignoreMalformed() {
-		return this.ignoreMalformed;
-	}
-
-	/**
-	 * API name: {@code ignore_z_value}
-	 */
-	@Nullable
-	public final Boolean ignoreZValue() {
-		return this.ignoreZValue;
-	}
-
-	/**
-	 * API name: {@code orientation}
-	 */
-	@Nullable
-	public final GeoOrientation orientation() {
-		return this.orientation;
-	}
-
-	/**
-	 * API name: {@code strategy}
-	 */
-	@Nullable
-	public final GeoStrategy strategy() {
-		return this.strategy;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "geo_shape");
-		super.serializeInternal(generator, mapper);
-		if (this.coerce != null) {
-			generator.writeKey("coerce");
-			generator.write(this.coerce);
-
-		}
-		if (this.ignoreMalformed != null) {
-			generator.writeKey("ignore_malformed");
-			generator.write(this.ignoreMalformed);
-
-		}
-		if (this.ignoreZValue != null) {
-			generator.writeKey("ignore_z_value");
-			generator.write(this.ignoreZValue);
-
-		}
-		if (this.orientation != null) {
-			generator.writeKey("orientation");
-			this.orientation.serialize(generator, mapper);
-		}
-		if (this.strategy != null) {
-			generator.writeKey("strategy");
-			this.strategy.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoShapeProperty}.
-	 */
-
-	public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<GeoShapeProperty> {
-		@Nullable
-		private Boolean coerce;
-
-		@Nullable
-		private Boolean ignoreMalformed;
-
-		@Nullable
-		private Boolean ignoreZValue;
-
-		@Nullable
-		private GeoOrientation orientation;
-
-		@Nullable
-		private GeoStrategy strategy;
-
-		/**
-		 * API name: {@code coerce}
-		 */
-		public final Builder coerce(@Nullable Boolean value) {
-			this.coerce = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_malformed}
-		 */
-		public final Builder ignoreMalformed(@Nullable Boolean value) {
-			this.ignoreMalformed = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_z_value}
-		 */
-		public final Builder ignoreZValue(@Nullable Boolean value) {
-			this.ignoreZValue = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code orientation}
-		 */
-		public final Builder orientation(@Nullable GeoOrientation value) {
-			this.orientation = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code strategy}
-		 */
-		public final Builder strategy(@Nullable GeoStrategy value) {
-			this.strategy = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoShapeProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoShapeProperty build() {
-			_checkSingleUse();
-
-			return new GeoShapeProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoShapeProperty}
-	 */
-	public static final JsonpDeserializer<GeoShapeProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GeoShapeProperty::setupGeoShapePropertyDeserializer);
-
-	protected static void setupGeoShapePropertyDeserializer(ObjectDeserializer<GeoShapeProperty.Builder> op) {
-		setupDocValuesPropertyBaseDeserializer(op);
-		op.add(Builder::coerce, JsonpDeserializer.booleanDeserializer(), "coerce");
-		op.add(Builder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
-		op.add(Builder::ignoreZValue, JsonpDeserializer.booleanDeserializer(), "ignore_z_value");
-		op.add(Builder::orientation, GeoOrientation._DESERIALIZER, "orientation");
-		op.add(Builder::strategy, GeoStrategy._DESERIALIZER, "strategy");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Boolean coerce;
+
+    @Nullable
+    private final Boolean ignoreMalformed;
+
+    @Nullable
+    private final Boolean ignoreZValue;
+
+    @Nullable
+    private final GeoOrientation orientation;
+
+    @Nullable
+    private final GeoStrategy strategy;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoShapeProperty(Builder builder) {
+        super(builder);
+
+        this.coerce = builder.coerce;
+        this.ignoreMalformed = builder.ignoreMalformed;
+        this.ignoreZValue = builder.ignoreZValue;
+        this.orientation = builder.orientation;
+        this.strategy = builder.strategy;
+
+    }
+
+    public static GeoShapeProperty of(Function<Builder, ObjectBuilder<GeoShapeProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.GeoShape;
+    }
+
+    /**
+     * API name: {@code coerce}
+     */
+    @Nullable
+    public final Boolean coerce() {
+        return this.coerce;
+    }
+
+    /**
+     * API name: {@code ignore_malformed}
+     */
+    @Nullable
+    public final Boolean ignoreMalformed() {
+        return this.ignoreMalformed;
+    }
+
+    /**
+     * API name: {@code ignore_z_value}
+     */
+    @Nullable
+    public final Boolean ignoreZValue() {
+        return this.ignoreZValue;
+    }
+
+    /**
+     * API name: {@code orientation}
+     */
+    @Nullable
+    public final GeoOrientation orientation() {
+        return this.orientation;
+    }
+
+    /**
+     * API name: {@code strategy}
+     */
+    @Nullable
+    public final GeoStrategy strategy() {
+        return this.strategy;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "geo_shape");
+        super.serializeInternal(generator, mapper);
+        if (this.coerce != null) {
+            generator.writeKey("coerce");
+            generator.write(this.coerce);
+
+        }
+        if (this.ignoreMalformed != null) {
+            generator.writeKey("ignore_malformed");
+            generator.write(this.ignoreMalformed);
+
+        }
+        if (this.ignoreZValue != null) {
+            generator.writeKey("ignore_z_value");
+            generator.write(this.ignoreZValue);
+
+        }
+        if (this.orientation != null) {
+            generator.writeKey("orientation");
+            this.orientation.serialize(generator, mapper);
+        }
+        if (this.strategy != null) {
+            generator.writeKey("strategy");
+            this.strategy.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoShapeProperty}.
+     */
+
+    public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoShapeProperty> {
+        @Nullable
+        private Boolean coerce;
+
+        @Nullable
+        private Boolean ignoreMalformed;
+
+        @Nullable
+        private Boolean ignoreZValue;
+
+        @Nullable
+        private GeoOrientation orientation;
+
+        @Nullable
+        private GeoStrategy strategy;
+
+        /**
+         * API name: {@code coerce}
+         */
+        public final Builder coerce(@Nullable Boolean value) {
+            this.coerce = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_malformed}
+         */
+        public final Builder ignoreMalformed(@Nullable Boolean value) {
+            this.ignoreMalformed = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_z_value}
+         */
+        public final Builder ignoreZValue(@Nullable Boolean value) {
+            this.ignoreZValue = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code orientation}
+         */
+        public final Builder orientation(@Nullable GeoOrientation value) {
+            this.orientation = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code strategy}
+         */
+        public final Builder strategy(@Nullable GeoStrategy value) {
+            this.strategy = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoShapeProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoShapeProperty build() {
+            _checkSingleUse();
+
+            return new GeoShapeProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoShapeProperty}
+     */
+    public static final JsonpDeserializer<GeoShapeProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoShapeProperty::setupGeoShapePropertyDeserializer
+    );
+
+    protected static void setupGeoShapePropertyDeserializer(ObjectDeserializer<GeoShapeProperty.Builder> op) {
+        setupDocValuesPropertyBaseDeserializer(op);
+        op.add(Builder::coerce, JsonpDeserializer.booleanDeserializer(), "coerce");
+        op.add(Builder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
+        op.add(Builder::ignoreZValue, JsonpDeserializer.booleanDeserializer(), "ignore_z_value");
+        op.add(Builder::orientation, GeoOrientation._DESERIALIZER, "orientation");
+        op.add(Builder::strategy, GeoStrategy._DESERIALIZER, "strategy");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/GeoStrategy.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/GeoStrategy.java
index 04c6e7d00b..cf185ff3fd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/GeoStrategy.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/GeoStrategy.java
@@ -35,25 +35,23 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum GeoStrategy implements JsonEnum {
-	Recursive("recursive"),
+    Recursive("recursive"),
 
-	Term("term"),
+    Term("term"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	GeoStrategy(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    GeoStrategy(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<GeoStrategy> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			GeoStrategy.values());
+    public static final JsonEnum.Deserializer<GeoStrategy> _DESERIALIZER = new JsonEnum.Deserializer<>(GeoStrategy.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/HalfFloatNumberProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/HalfFloatNumberProperty.java
index 5e99b735b0..3905f9648f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/HalfFloatNumberProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/HalfFloatNumberProperty.java
@@ -32,116 +32,115 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.HalfFloatNumberProperty
 
 @JsonpDeserializable
 public class HalfFloatNumberProperty extends StandardNumberProperty implements PropertyVariant {
-	@Nullable
-	private final Float nullValue;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HalfFloatNumberProperty(Builder builder) {
-		super(builder);
-
-		this.nullValue = builder.nullValue;
-
-	}
-
-	public static HalfFloatNumberProperty of(Function<Builder, ObjectBuilder<HalfFloatNumberProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.HalfFloat;
-	}
-
-	/**
-	 * API name: {@code null_value}
-	 */
-	@Nullable
-	public final Float nullValue() {
-		return this.nullValue;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "half_float");
-		super.serializeInternal(generator, mapper);
-		if (this.nullValue != null) {
-			generator.writeKey("null_value");
-			generator.write(this.nullValue);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HalfFloatNumberProperty}.
-	 */
-
-	public static class Builder extends StandardNumberProperty.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<HalfFloatNumberProperty> {
-		@Nullable
-		private Float nullValue;
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(@Nullable Float value) {
-			this.nullValue = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HalfFloatNumberProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HalfFloatNumberProperty build() {
-			_checkSingleUse();
-
-			return new HalfFloatNumberProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HalfFloatNumberProperty}
-	 */
-	public static final JsonpDeserializer<HalfFloatNumberProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, HalfFloatNumberProperty::setupHalfFloatNumberPropertyDeserializer);
-
-	protected static void setupHalfFloatNumberPropertyDeserializer(
-			ObjectDeserializer<HalfFloatNumberProperty.Builder> op) {
-		StandardNumberProperty.setupStandardNumberPropertyDeserializer(op);
-		op.add(Builder::nullValue, JsonpDeserializer.floatDeserializer(), "null_value");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Float nullValue;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HalfFloatNumberProperty(Builder builder) {
+        super(builder);
+
+        this.nullValue = builder.nullValue;
+
+    }
+
+    public static HalfFloatNumberProperty of(Function<Builder, ObjectBuilder<HalfFloatNumberProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.HalfFloat;
+    }
+
+    /**
+     * API name: {@code null_value}
+     */
+    @Nullable
+    public final Float nullValue() {
+        return this.nullValue;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "half_float");
+        super.serializeInternal(generator, mapper);
+        if (this.nullValue != null) {
+            generator.writeKey("null_value");
+            generator.write(this.nullValue);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HalfFloatNumberProperty}.
+     */
+
+    public static class Builder extends StandardNumberProperty.AbstractBuilder<Builder> implements ObjectBuilder<HalfFloatNumberProperty> {
+        @Nullable
+        private Float nullValue;
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(@Nullable Float value) {
+            this.nullValue = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link HalfFloatNumberProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HalfFloatNumberProperty build() {
+            _checkSingleUse();
+
+            return new HalfFloatNumberProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HalfFloatNumberProperty}
+     */
+    public static final JsonpDeserializer<HalfFloatNumberProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HalfFloatNumberProperty::setupHalfFloatNumberPropertyDeserializer
+    );
+
+    protected static void setupHalfFloatNumberPropertyDeserializer(ObjectDeserializer<HalfFloatNumberProperty.Builder> op) {
+        StandardNumberProperty.setupStandardNumberPropertyDeserializer(op);
+        op.add(Builder::nullValue, JsonpDeserializer.floatDeserializer(), "null_value");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/HistogramProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/HistogramProperty.java
index bd0b2722fe..dd21c257cc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/HistogramProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/HistogramProperty.java
@@ -32,116 +32,115 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.HistogramProperty
 
-
 @JsonpDeserializable
 public class HistogramProperty extends PropertyBase implements PropertyVariant {
-	@Nullable
-	private final Boolean ignoreMalformed;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HistogramProperty(Builder builder) {
-		super(builder);
-
-		this.ignoreMalformed = builder.ignoreMalformed;
-
-	}
-
-	public static HistogramProperty of(Function<Builder, ObjectBuilder<HistogramProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Histogram;
-	}
-
-	/**
-	 * API name: {@code ignore_malformed}
-	 */
-	@Nullable
-	public final Boolean ignoreMalformed() {
-		return this.ignoreMalformed;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "histogram");
-		super.serializeInternal(generator, mapper);
-		if (this.ignoreMalformed != null) {
-			generator.writeKey("ignore_malformed");
-			generator.write(this.ignoreMalformed);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HistogramProperty}.
-	 */
-
-	public static class Builder extends PropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<HistogramProperty> {
-		@Nullable
-		private Boolean ignoreMalformed;
-
-		/**
-		 * API name: {@code ignore_malformed}
-		 */
-		public final Builder ignoreMalformed(@Nullable Boolean value) {
-			this.ignoreMalformed = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HistogramProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HistogramProperty build() {
-			_checkSingleUse();
-
-			return new HistogramProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HistogramProperty}
-	 */
-	public static final JsonpDeserializer<HistogramProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, HistogramProperty::setupHistogramPropertyDeserializer);
-
-	protected static void setupHistogramPropertyDeserializer(ObjectDeserializer<HistogramProperty.Builder> op) {
-		PropertyBase.setupPropertyBaseDeserializer(op);
-		op.add(Builder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Boolean ignoreMalformed;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HistogramProperty(Builder builder) {
+        super(builder);
+
+        this.ignoreMalformed = builder.ignoreMalformed;
+
+    }
+
+    public static HistogramProperty of(Function<Builder, ObjectBuilder<HistogramProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Histogram;
+    }
+
+    /**
+     * API name: {@code ignore_malformed}
+     */
+    @Nullable
+    public final Boolean ignoreMalformed() {
+        return this.ignoreMalformed;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "histogram");
+        super.serializeInternal(generator, mapper);
+        if (this.ignoreMalformed != null) {
+            generator.writeKey("ignore_malformed");
+            generator.write(this.ignoreMalformed);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HistogramProperty}.
+     */
+
+    public static class Builder extends PropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<HistogramProperty> {
+        @Nullable
+        private Boolean ignoreMalformed;
+
+        /**
+         * API name: {@code ignore_malformed}
+         */
+        public final Builder ignoreMalformed(@Nullable Boolean value) {
+            this.ignoreMalformed = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link HistogramProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HistogramProperty build() {
+            _checkSingleUse();
+
+            return new HistogramProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HistogramProperty}
+     */
+    public static final JsonpDeserializer<HistogramProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HistogramProperty::setupHistogramPropertyDeserializer
+    );
+
+    protected static void setupHistogramPropertyDeserializer(ObjectDeserializer<HistogramProperty.Builder> op) {
+        PropertyBase.setupPropertyBaseDeserializer(op);
+        op.add(Builder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IndexField.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IndexField.java
index 7d9015c04d..2c2ecd4058 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IndexField.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IndexField.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,93 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.mapping.IndexField
 
-
 @JsonpDeserializable
 public class IndexField implements JsonpSerializable {
-	private final boolean enabled;
+    private final boolean enabled;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private IndexField(Builder builder) {
+    private IndexField(Builder builder) {
 
-		this.enabled = ApiTypeHelper.requireNonNull(builder.enabled, this, "enabled");
+        this.enabled = ApiTypeHelper.requireNonNull(builder.enabled, this, "enabled");
 
-	}
+    }
 
-	public static IndexField of(Function<Builder, ObjectBuilder<IndexField>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static IndexField of(Function<Builder, ObjectBuilder<IndexField>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code enabled}
-	 */
-	public final boolean enabled() {
-		return this.enabled;
-	}
+    /**
+     * Required - API name: {@code enabled}
+     */
+    public final boolean enabled() {
+        return this.enabled;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("enabled");
-		generator.write(this.enabled);
+        generator.writeKey("enabled");
+        generator.write(this.enabled);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link IndexField}.
-	 */
+    /**
+     * Builder for {@link IndexField}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexField> {
-		private Boolean enabled;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexField> {
+        private Boolean enabled;
 
-		/**
-		 * Required - API name: {@code enabled}
-		 */
-		public final Builder enabled(boolean value) {
-			this.enabled = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code enabled}
+         */
+        public final Builder enabled(boolean value) {
+            this.enabled = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link IndexField}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexField build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link IndexField}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexField build() {
+            _checkSingleUse();
 
-			return new IndexField(this);
-		}
-	}
+            return new IndexField(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link IndexField}
-	 */
-	public static final JsonpDeserializer<IndexField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IndexField::setupIndexFieldDeserializer);
+    /**
+     * Json deserializer for {@link IndexField}
+     */
+    public static final JsonpDeserializer<IndexField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexField::setupIndexFieldDeserializer
+    );
 
-	protected static void setupIndexFieldDeserializer(ObjectDeserializer<IndexField.Builder> op) {
+    protected static void setupIndexFieldDeserializer(ObjectDeserializer<IndexField.Builder> op) {
 
-		op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
+        op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IndexOptions.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IndexOptions.java
index edcff2e48c..1ff1ff07cb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IndexOptions.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IndexOptions.java
@@ -35,29 +35,27 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum IndexOptions implements JsonEnum {
-	Docs("docs"),
+    Docs("docs"),
 
-	Freqs("freqs"),
+    Freqs("freqs"),
 
-	Positions("positions"),
+    Positions("positions"),
 
-	Offsets("offsets"),
+    Offsets("offsets"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	IndexOptions(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    IndexOptions(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<IndexOptions> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			IndexOptions.values());
+    public static final JsonEnum.Deserializer<IndexOptions> _DESERIALIZER = new JsonEnum.Deserializer<>(IndexOptions.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IntegerNumberProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IntegerNumberProperty.java
index f6f8817c7f..72113c162e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IntegerNumberProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IntegerNumberProperty.java
@@ -32,116 +32,115 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.IntegerNumberProperty
 
-
 @JsonpDeserializable
 public class IntegerNumberProperty extends StandardNumberProperty implements PropertyVariant {
-	@Nullable
-	private final Integer nullValue;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IntegerNumberProperty(Builder builder) {
-		super(builder);
-
-		this.nullValue = builder.nullValue;
-
-	}
-
-	public static IntegerNumberProperty of(Function<Builder, ObjectBuilder<IntegerNumberProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Integer;
-	}
-
-	/**
-	 * API name: {@code null_value}
-	 */
-	@Nullable
-	public final Integer nullValue() {
-		return this.nullValue;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "integer");
-		super.serializeInternal(generator, mapper);
-		if (this.nullValue != null) {
-			generator.writeKey("null_value");
-			generator.write(this.nullValue);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IntegerNumberProperty}.
-	 */
-
-	public static class Builder extends StandardNumberProperty.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<IntegerNumberProperty> {
-		@Nullable
-		private Integer nullValue;
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(@Nullable Integer value) {
-			this.nullValue = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IntegerNumberProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IntegerNumberProperty build() {
-			_checkSingleUse();
-
-			return new IntegerNumberProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IntegerNumberProperty}
-	 */
-	public static final JsonpDeserializer<IntegerNumberProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IntegerNumberProperty::setupIntegerNumberPropertyDeserializer);
-
-	protected static void setupIntegerNumberPropertyDeserializer(ObjectDeserializer<IntegerNumberProperty.Builder> op) {
-		StandardNumberProperty.setupStandardNumberPropertyDeserializer(op);
-		op.add(Builder::nullValue, JsonpDeserializer.integerDeserializer(), "null_value");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Integer nullValue;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IntegerNumberProperty(Builder builder) {
+        super(builder);
+
+        this.nullValue = builder.nullValue;
+
+    }
+
+    public static IntegerNumberProperty of(Function<Builder, ObjectBuilder<IntegerNumberProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Integer;
+    }
+
+    /**
+     * API name: {@code null_value}
+     */
+    @Nullable
+    public final Integer nullValue() {
+        return this.nullValue;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "integer");
+        super.serializeInternal(generator, mapper);
+        if (this.nullValue != null) {
+            generator.writeKey("null_value");
+            generator.write(this.nullValue);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IntegerNumberProperty}.
+     */
+
+    public static class Builder extends StandardNumberProperty.AbstractBuilder<Builder> implements ObjectBuilder<IntegerNumberProperty> {
+        @Nullable
+        private Integer nullValue;
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(@Nullable Integer value) {
+            this.nullValue = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link IntegerNumberProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IntegerNumberProperty build() {
+            _checkSingleUse();
+
+            return new IntegerNumberProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IntegerNumberProperty}
+     */
+    public static final JsonpDeserializer<IntegerNumberProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IntegerNumberProperty::setupIntegerNumberPropertyDeserializer
+    );
+
+    protected static void setupIntegerNumberPropertyDeserializer(ObjectDeserializer<IntegerNumberProperty.Builder> op) {
+        StandardNumberProperty.setupStandardNumberPropertyDeserializer(op);
+        op.add(Builder::nullValue, JsonpDeserializer.integerDeserializer(), "null_value");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IntegerRangeProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IntegerRangeProperty.java
index 11adecff87..d69382b37f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IntegerRangeProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IntegerRangeProperty.java
@@ -32,86 +32,84 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.mapping.IntegerRangeProperty
 
-
 @JsonpDeserializable
 public class IntegerRangeProperty extends RangePropertyBase implements PropertyVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private IntegerRangeProperty(Builder builder) {
-		super(builder);
+    private IntegerRangeProperty(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static IntegerRangeProperty of(Function<Builder, ObjectBuilder<IntegerRangeProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static IntegerRangeProperty of(Function<Builder, ObjectBuilder<IntegerRangeProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.IntegerRange;
-	}
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.IntegerRange;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "integer_range");
-		super.serializeInternal(generator, mapper);
+        generator.write("type", "integer_range");
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link IntegerRangeProperty}.
-	 */
+    /**
+     * Builder for {@link IntegerRangeProperty}.
+     */
 
-	public static class Builder extends RangePropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<IntegerRangeProperty> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends RangePropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<IntegerRangeProperty> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link IntegerRangeProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IntegerRangeProperty build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link IntegerRangeProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IntegerRangeProperty build() {
+            _checkSingleUse();
 
-			return new IntegerRangeProperty(this);
-		}
-	}
+            return new IntegerRangeProperty(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link IntegerRangeProperty}
-	 */
-	public static final JsonpDeserializer<IntegerRangeProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IntegerRangeProperty::setupIntegerRangePropertyDeserializer);
+    /**
+     * Json deserializer for {@link IntegerRangeProperty}
+     */
+    public static final JsonpDeserializer<IntegerRangeProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IntegerRangeProperty::setupIntegerRangePropertyDeserializer
+    );
 
-	protected static void setupIntegerRangePropertyDeserializer(ObjectDeserializer<IntegerRangeProperty.Builder> op) {
-		RangePropertyBase.setupRangePropertyBaseDeserializer(op);
+    protected static void setupIntegerRangePropertyDeserializer(ObjectDeserializer<IntegerRangeProperty.Builder> op) {
+        RangePropertyBase.setupRangePropertyBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IpProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IpProperty.java
index 24f6675831..797d6a1e7e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IpProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IpProperty.java
@@ -32,203 +32,202 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.IpProperty
 
-
 @JsonpDeserializable
 public class IpProperty extends DocValuesPropertyBase implements PropertyVariant {
-	@Nullable
-	private final Double boost;
-
-	@Nullable
-	private final Boolean index;
-
-	@Nullable
-	private final String nullValue;
-
-	@Nullable
-	private final Boolean ignoreMalformed;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IpProperty(Builder builder) {
-		super(builder);
-
-		this.boost = builder.boost;
-		this.index = builder.index;
-		this.nullValue = builder.nullValue;
-		this.ignoreMalformed = builder.ignoreMalformed;
-
-	}
-
-	public static IpProperty of(Function<Builder, ObjectBuilder<IpProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Ip;
-	}
-
-	/**
-	 * API name: {@code boost}
-	 */
-	@Nullable
-	public final Double boost() {
-		return this.boost;
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final Boolean index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code null_value}
-	 */
-	@Nullable
-	public final String nullValue() {
-		return this.nullValue;
-	}
-
-	/**
-	 * API name: {@code ignore_malformed}
-	 */
-	@Nullable
-	public final Boolean ignoreMalformed() {
-		return this.ignoreMalformed;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "ip");
-		super.serializeInternal(generator, mapper);
-		if (this.boost != null) {
-			generator.writeKey("boost");
-			generator.write(this.boost);
-
-		}
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.nullValue != null) {
-			generator.writeKey("null_value");
-			generator.write(this.nullValue);
-
-		}
-		if (this.ignoreMalformed != null) {
-			generator.writeKey("ignore_malformed");
-			generator.write(this.ignoreMalformed);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IpProperty}.
-	 */
-
-	public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<IpProperty> {
-		@Nullable
-		private Double boost;
-
-		@Nullable
-		private Boolean index;
-
-		@Nullable
-		private String nullValue;
-
-		@Nullable
-		private Boolean ignoreMalformed;
-
-		/**
-		 * API name: {@code boost}
-		 */
-		public final Builder boost(@Nullable Double value) {
-			this.boost = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable Boolean value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(@Nullable String value) {
-			this.nullValue = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_malformed}
-		 */
-		public final Builder ignoreMalformed(@Nullable Boolean value) {
-			this.ignoreMalformed = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IpProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IpProperty build() {
-			_checkSingleUse();
-
-			return new IpProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IpProperty}
-	 */
-	public static final JsonpDeserializer<IpProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IpProperty::setupIpPropertyDeserializer);
-
-	protected static void setupIpPropertyDeserializer(ObjectDeserializer<IpProperty.Builder> op) {
-		DocValuesPropertyBase.setupDocValuesPropertyBaseDeserializer(op);
-		op.add(Builder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
-		op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
-		op.add(Builder::nullValue, JsonpDeserializer.stringDeserializer(), "null_value");
-		op.add(Builder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Double boost;
+
+    @Nullable
+    private final Boolean index;
+
+    @Nullable
+    private final String nullValue;
+
+    @Nullable
+    private final Boolean ignoreMalformed;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IpProperty(Builder builder) {
+        super(builder);
+
+        this.boost = builder.boost;
+        this.index = builder.index;
+        this.nullValue = builder.nullValue;
+        this.ignoreMalformed = builder.ignoreMalformed;
+
+    }
+
+    public static IpProperty of(Function<Builder, ObjectBuilder<IpProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Ip;
+    }
+
+    /**
+     * API name: {@code boost}
+     */
+    @Nullable
+    public final Double boost() {
+        return this.boost;
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    @Nullable
+    public final Boolean index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code null_value}
+     */
+    @Nullable
+    public final String nullValue() {
+        return this.nullValue;
+    }
+
+    /**
+     * API name: {@code ignore_malformed}
+     */
+    @Nullable
+    public final Boolean ignoreMalformed() {
+        return this.ignoreMalformed;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "ip");
+        super.serializeInternal(generator, mapper);
+        if (this.boost != null) {
+            generator.writeKey("boost");
+            generator.write(this.boost);
+
+        }
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.nullValue != null) {
+            generator.writeKey("null_value");
+            generator.write(this.nullValue);
+
+        }
+        if (this.ignoreMalformed != null) {
+            generator.writeKey("ignore_malformed");
+            generator.write(this.ignoreMalformed);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IpProperty}.
+     */
+
+    public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<IpProperty> {
+        @Nullable
+        private Double boost;
+
+        @Nullable
+        private Boolean index;
+
+        @Nullable
+        private String nullValue;
+
+        @Nullable
+        private Boolean ignoreMalformed;
+
+        /**
+         * API name: {@code boost}
+         */
+        public final Builder boost(@Nullable Double value) {
+            this.boost = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable Boolean value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(@Nullable String value) {
+            this.nullValue = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_malformed}
+         */
+        public final Builder ignoreMalformed(@Nullable Boolean value) {
+            this.ignoreMalformed = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link IpProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IpProperty build() {
+            _checkSingleUse();
+
+            return new IpProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IpProperty}
+     */
+    public static final JsonpDeserializer<IpProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IpProperty::setupIpPropertyDeserializer
+    );
+
+    protected static void setupIpPropertyDeserializer(ObjectDeserializer<IpProperty.Builder> op) {
+        DocValuesPropertyBase.setupDocValuesPropertyBaseDeserializer(op);
+        op.add(Builder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
+        op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
+        op.add(Builder::nullValue, JsonpDeserializer.stringDeserializer(), "null_value");
+        op.add(Builder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IpRangeProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IpRangeProperty.java
index 44dd5ee755..481d550cb1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IpRangeProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/IpRangeProperty.java
@@ -32,86 +32,84 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.mapping.IpRangeProperty
 
-
 @JsonpDeserializable
 public class IpRangeProperty extends RangePropertyBase implements PropertyVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private IpRangeProperty(Builder builder) {
-		super(builder);
+    private IpRangeProperty(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static IpRangeProperty of(Function<Builder, ObjectBuilder<IpRangeProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static IpRangeProperty of(Function<Builder, ObjectBuilder<IpRangeProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.IpRange;
-	}
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.IpRange;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "ip_range");
-		super.serializeInternal(generator, mapper);
+        generator.write("type", "ip_range");
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link IpRangeProperty}.
-	 */
+    /**
+     * Builder for {@link IpRangeProperty}.
+     */
 
-	public static class Builder extends RangePropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<IpRangeProperty> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends RangePropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<IpRangeProperty> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link IpRangeProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IpRangeProperty build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link IpRangeProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IpRangeProperty build() {
+            _checkSingleUse();
 
-			return new IpRangeProperty(this);
-		}
-	}
+            return new IpRangeProperty(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link IpRangeProperty}
-	 */
-	public static final JsonpDeserializer<IpRangeProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IpRangeProperty::setupIpRangePropertyDeserializer);
+    /**
+     * Json deserializer for {@link IpRangeProperty}
+     */
+    public static final JsonpDeserializer<IpRangeProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IpRangeProperty::setupIpRangePropertyDeserializer
+    );
 
-	protected static void setupIpRangePropertyDeserializer(ObjectDeserializer<IpRangeProperty.Builder> op) {
-		setupRangePropertyBaseDeserializer(op);
+    protected static void setupIpRangePropertyDeserializer(ObjectDeserializer<IpRangeProperty.Builder> op) {
+        setupRangePropertyBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/JoinProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/JoinProperty.java
index 37decd0fdf..b4aa05a2ab 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/JoinProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/JoinProperty.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,134 +44,133 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.JoinProperty
 
-
 @JsonpDeserializable
 public class JoinProperty extends PropertyBase implements PropertyVariant {
-	private final Map<String, List<String>> relations;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private JoinProperty(Builder builder) {
-		super(builder);
-
-		this.relations = ApiTypeHelper.unmodifiable(builder.relations);
-
-	}
-
-	public static JoinProperty of(Function<Builder, ObjectBuilder<JoinProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Join;
-	}
-
-	/**
-	 * API name: {@code relations}
-	 */
-	public final Map<String, List<String>> relations() {
-		return this.relations;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "join");
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.relations)) {
-			generator.writeKey("relations");
-			generator.writeStartObject();
-			for (Map.Entry<String, List<String>> item0 : this.relations.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.writeStartArray();
-				if (item0.getValue() != null) {
-					for (String item1 : item0.getValue()) {
-						generator.write(item1);
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link JoinProperty}.
-	 */
-
-	public static class Builder extends PropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<JoinProperty> {
-		@Nullable
-		private Map<String, List<String>> relations;
-
-		/**
-		 * API name: {@code relations}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>relations</code>.
-		 */
-		public final Builder relations(Map<String, List<String>> map) {
-			this.relations = _mapPutAll(this.relations, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code relations}
-		 * <p>
-		 * Adds an entry to <code>relations</code>.
-		 */
-		public final Builder relations(String key, List<String> value) {
-			this.relations = _mapPut(this.relations, key, value);
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link JoinProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public JoinProperty build() {
-			_checkSingleUse();
-
-			return new JoinProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link JoinProperty}
-	 */
-	public static final JsonpDeserializer<JoinProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			JoinProperty::setupJoinPropertyDeserializer);
-
-	protected static void setupJoinPropertyDeserializer(ObjectDeserializer<JoinProperty.Builder> op) {
-		PropertyBase.setupPropertyBaseDeserializer(op);
-		op.add(Builder::relations, JsonpDeserializer.stringMapDeserializer(
-				JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer())), "relations");
-
-		op.ignore("type");
-	}
+    private final Map<String, List<String>> relations;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private JoinProperty(Builder builder) {
+        super(builder);
+
+        this.relations = ApiTypeHelper.unmodifiable(builder.relations);
+
+    }
+
+    public static JoinProperty of(Function<Builder, ObjectBuilder<JoinProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Join;
+    }
+
+    /**
+     * API name: {@code relations}
+     */
+    public final Map<String, List<String>> relations() {
+        return this.relations;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "join");
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.relations)) {
+            generator.writeKey("relations");
+            generator.writeStartObject();
+            for (Map.Entry<String, List<String>> item0 : this.relations.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.writeStartArray();
+                if (item0.getValue() != null) {
+                    for (String item1 : item0.getValue()) {
+                        generator.write(item1);
+
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link JoinProperty}.
+     */
+
+    public static class Builder extends PropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<JoinProperty> {
+        @Nullable
+        private Map<String, List<String>> relations;
+
+        /**
+         * API name: {@code relations}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>relations</code>.
+         */
+        public final Builder relations(Map<String, List<String>> map) {
+            this.relations = _mapPutAll(this.relations, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code relations}
+         * <p>
+         * Adds an entry to <code>relations</code>.
+         */
+        public final Builder relations(String key, List<String> value) {
+            this.relations = _mapPut(this.relations, key, value);
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link JoinProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public JoinProperty build() {
+            _checkSingleUse();
+
+            return new JoinProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link JoinProperty}
+     */
+    public static final JsonpDeserializer<JoinProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        JoinProperty::setupJoinPropertyDeserializer
+    );
+
+    protected static void setupJoinPropertyDeserializer(ObjectDeserializer<JoinProperty.Builder> op) {
+        PropertyBase.setupPropertyBaseDeserializer(op);
+        op.add(
+            Builder::relations,
+            JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer())),
+            "relations"
+        );
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/KeywordProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/KeywordProperty.java
index f561737d7f..b05a20b438 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/KeywordProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/KeywordProperty.java
@@ -32,319 +32,317 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.KeywordProperty
 
-
 @JsonpDeserializable
 public class KeywordProperty extends DocValuesPropertyBase implements PropertyVariant {
-	@Nullable
-	private final Double boost;
-
-	@Nullable
-	private final Boolean eagerGlobalOrdinals;
-
-	@Nullable
-	private final Boolean index;
-
-	@Nullable
-	private final IndexOptions indexOptions;
-
-	@Nullable
-	private final String normalizer;
-
-	@Nullable
-	private final Boolean norms;
-
-	@Nullable
-	private final String nullValue;
-
-	@Nullable
-	private final Boolean splitQueriesOnWhitespace;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private KeywordProperty(Builder builder) {
-		super(builder);
-
-		this.boost = builder.boost;
-		this.eagerGlobalOrdinals = builder.eagerGlobalOrdinals;
-		this.index = builder.index;
-		this.indexOptions = builder.indexOptions;
-		this.normalizer = builder.normalizer;
-		this.norms = builder.norms;
-		this.nullValue = builder.nullValue;
-		this.splitQueriesOnWhitespace = builder.splitQueriesOnWhitespace;
-
-	}
-
-	public static KeywordProperty of(Function<Builder, ObjectBuilder<KeywordProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Keyword;
-	}
-
-	/**
-	 * API name: {@code boost}
-	 */
-	@Nullable
-	public final Double boost() {
-		return this.boost;
-	}
-
-	/**
-	 * API name: {@code eager_global_ordinals}
-	 */
-	@Nullable
-	public final Boolean eagerGlobalOrdinals() {
-		return this.eagerGlobalOrdinals;
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final Boolean index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code index_options}
-	 */
-	@Nullable
-	public final IndexOptions indexOptions() {
-		return this.indexOptions;
-	}
-
-	/**
-	 * API name: {@code normalizer}
-	 */
-	@Nullable
-	public final String normalizer() {
-		return this.normalizer;
-	}
-
-	/**
-	 * API name: {@code norms}
-	 */
-	@Nullable
-	public final Boolean norms() {
-		return this.norms;
-	}
-
-	/**
-	 * API name: {@code null_value}
-	 */
-	@Nullable
-	public final String nullValue() {
-		return this.nullValue;
-	}
-
-	/**
-	 * API name: {@code split_queries_on_whitespace}
-	 */
-	@Nullable
-	public final Boolean splitQueriesOnWhitespace() {
-		return this.splitQueriesOnWhitespace;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "keyword");
-		super.serializeInternal(generator, mapper);
-		if (this.boost != null) {
-			generator.writeKey("boost");
-			generator.write(this.boost);
-
-		}
-		if (this.eagerGlobalOrdinals != null) {
-			generator.writeKey("eager_global_ordinals");
-			generator.write(this.eagerGlobalOrdinals);
-
-		}
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.indexOptions != null) {
-			generator.writeKey("index_options");
-			this.indexOptions.serialize(generator, mapper);
-		}
-		if (this.normalizer != null) {
-			generator.writeKey("normalizer");
-			generator.write(this.normalizer);
-
-		}
-		if (this.norms != null) {
-			generator.writeKey("norms");
-			generator.write(this.norms);
-
-		}
-		if (this.nullValue != null) {
-			generator.writeKey("null_value");
-			generator.write(this.nullValue);
-
-		}
-		if (this.splitQueriesOnWhitespace != null) {
-			generator.writeKey("split_queries_on_whitespace");
-			generator.write(this.splitQueriesOnWhitespace);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link KeywordProperty}.
-	 */
-
-	public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<KeywordProperty> {
-		@Nullable
-		private Double boost;
-
-		@Nullable
-		private Boolean eagerGlobalOrdinals;
-
-		@Nullable
-		private Boolean index;
-
-		@Nullable
-		private IndexOptions indexOptions;
-
-		@Nullable
-		private String normalizer;
-
-		@Nullable
-		private Boolean norms;
-
-		@Nullable
-		private String nullValue;
-
-		@Nullable
-		private Boolean splitQueriesOnWhitespace;
-
-		/**
-		 * API name: {@code boost}
-		 */
-		public final Builder boost(@Nullable Double value) {
-			this.boost = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code eager_global_ordinals}
-		 */
-		public final Builder eagerGlobalOrdinals(@Nullable Boolean value) {
-			this.eagerGlobalOrdinals = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable Boolean value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_options}
-		 */
-		public final Builder indexOptions(@Nullable IndexOptions value) {
-			this.indexOptions = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code normalizer}
-		 */
-		public final Builder normalizer(@Nullable String value) {
-			this.normalizer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code norms}
-		 */
-		public final Builder norms(@Nullable Boolean value) {
-			this.norms = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(@Nullable String value) {
-			this.nullValue = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code split_queries_on_whitespace}
-		 */
-		public final Builder splitQueriesOnWhitespace(@Nullable Boolean value) {
-			this.splitQueriesOnWhitespace = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link KeywordProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public KeywordProperty build() {
-			_checkSingleUse();
-
-			return new KeywordProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link KeywordProperty}
-	 */
-	public static final JsonpDeserializer<KeywordProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			KeywordProperty::setupKeywordPropertyDeserializer);
-
-	protected static void setupKeywordPropertyDeserializer(ObjectDeserializer<KeywordProperty.Builder> op) {
-		DocValuesPropertyBase.setupDocValuesPropertyBaseDeserializer(op);
-		op.add(Builder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
-		op.add(Builder::eagerGlobalOrdinals, JsonpDeserializer.booleanDeserializer(), "eager_global_ordinals");
-		op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
-		op.add(Builder::indexOptions, IndexOptions._DESERIALIZER, "index_options");
-		op.add(Builder::normalizer, JsonpDeserializer.stringDeserializer(), "normalizer");
-		op.add(Builder::norms, JsonpDeserializer.booleanDeserializer(), "norms");
-		op.add(Builder::nullValue, JsonpDeserializer.stringDeserializer(), "null_value");
-		op.add(Builder::splitQueriesOnWhitespace, JsonpDeserializer.booleanDeserializer(),
-				"split_queries_on_whitespace");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Double boost;
+
+    @Nullable
+    private final Boolean eagerGlobalOrdinals;
+
+    @Nullable
+    private final Boolean index;
+
+    @Nullable
+    private final IndexOptions indexOptions;
+
+    @Nullable
+    private final String normalizer;
+
+    @Nullable
+    private final Boolean norms;
+
+    @Nullable
+    private final String nullValue;
+
+    @Nullable
+    private final Boolean splitQueriesOnWhitespace;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private KeywordProperty(Builder builder) {
+        super(builder);
+
+        this.boost = builder.boost;
+        this.eagerGlobalOrdinals = builder.eagerGlobalOrdinals;
+        this.index = builder.index;
+        this.indexOptions = builder.indexOptions;
+        this.normalizer = builder.normalizer;
+        this.norms = builder.norms;
+        this.nullValue = builder.nullValue;
+        this.splitQueriesOnWhitespace = builder.splitQueriesOnWhitespace;
+
+    }
+
+    public static KeywordProperty of(Function<Builder, ObjectBuilder<KeywordProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Keyword;
+    }
+
+    /**
+     * API name: {@code boost}
+     */
+    @Nullable
+    public final Double boost() {
+        return this.boost;
+    }
+
+    /**
+     * API name: {@code eager_global_ordinals}
+     */
+    @Nullable
+    public final Boolean eagerGlobalOrdinals() {
+        return this.eagerGlobalOrdinals;
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    @Nullable
+    public final Boolean index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code index_options}
+     */
+    @Nullable
+    public final IndexOptions indexOptions() {
+        return this.indexOptions;
+    }
+
+    /**
+     * API name: {@code normalizer}
+     */
+    @Nullable
+    public final String normalizer() {
+        return this.normalizer;
+    }
+
+    /**
+     * API name: {@code norms}
+     */
+    @Nullable
+    public final Boolean norms() {
+        return this.norms;
+    }
+
+    /**
+     * API name: {@code null_value}
+     */
+    @Nullable
+    public final String nullValue() {
+        return this.nullValue;
+    }
+
+    /**
+     * API name: {@code split_queries_on_whitespace}
+     */
+    @Nullable
+    public final Boolean splitQueriesOnWhitespace() {
+        return this.splitQueriesOnWhitespace;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "keyword");
+        super.serializeInternal(generator, mapper);
+        if (this.boost != null) {
+            generator.writeKey("boost");
+            generator.write(this.boost);
+
+        }
+        if (this.eagerGlobalOrdinals != null) {
+            generator.writeKey("eager_global_ordinals");
+            generator.write(this.eagerGlobalOrdinals);
+
+        }
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.indexOptions != null) {
+            generator.writeKey("index_options");
+            this.indexOptions.serialize(generator, mapper);
+        }
+        if (this.normalizer != null) {
+            generator.writeKey("normalizer");
+            generator.write(this.normalizer);
+
+        }
+        if (this.norms != null) {
+            generator.writeKey("norms");
+            generator.write(this.norms);
+
+        }
+        if (this.nullValue != null) {
+            generator.writeKey("null_value");
+            generator.write(this.nullValue);
+
+        }
+        if (this.splitQueriesOnWhitespace != null) {
+            generator.writeKey("split_queries_on_whitespace");
+            generator.write(this.splitQueriesOnWhitespace);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link KeywordProperty}.
+     */
+
+    public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<KeywordProperty> {
+        @Nullable
+        private Double boost;
+
+        @Nullable
+        private Boolean eagerGlobalOrdinals;
+
+        @Nullable
+        private Boolean index;
+
+        @Nullable
+        private IndexOptions indexOptions;
+
+        @Nullable
+        private String normalizer;
+
+        @Nullable
+        private Boolean norms;
+
+        @Nullable
+        private String nullValue;
+
+        @Nullable
+        private Boolean splitQueriesOnWhitespace;
+
+        /**
+         * API name: {@code boost}
+         */
+        public final Builder boost(@Nullable Double value) {
+            this.boost = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code eager_global_ordinals}
+         */
+        public final Builder eagerGlobalOrdinals(@Nullable Boolean value) {
+            this.eagerGlobalOrdinals = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable Boolean value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index_options}
+         */
+        public final Builder indexOptions(@Nullable IndexOptions value) {
+            this.indexOptions = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code normalizer}
+         */
+        public final Builder normalizer(@Nullable String value) {
+            this.normalizer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code norms}
+         */
+        public final Builder norms(@Nullable Boolean value) {
+            this.norms = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(@Nullable String value) {
+            this.nullValue = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code split_queries_on_whitespace}
+         */
+        public final Builder splitQueriesOnWhitespace(@Nullable Boolean value) {
+            this.splitQueriesOnWhitespace = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link KeywordProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public KeywordProperty build() {
+            _checkSingleUse();
+
+            return new KeywordProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link KeywordProperty}
+     */
+    public static final JsonpDeserializer<KeywordProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        KeywordProperty::setupKeywordPropertyDeserializer
+    );
+
+    protected static void setupKeywordPropertyDeserializer(ObjectDeserializer<KeywordProperty.Builder> op) {
+        DocValuesPropertyBase.setupDocValuesPropertyBaseDeserializer(op);
+        op.add(Builder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
+        op.add(Builder::eagerGlobalOrdinals, JsonpDeserializer.booleanDeserializer(), "eager_global_ordinals");
+        op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
+        op.add(Builder::indexOptions, IndexOptions._DESERIALIZER, "index_options");
+        op.add(Builder::normalizer, JsonpDeserializer.stringDeserializer(), "normalizer");
+        op.add(Builder::norms, JsonpDeserializer.booleanDeserializer(), "norms");
+        op.add(Builder::nullValue, JsonpDeserializer.stringDeserializer(), "null_value");
+        op.add(Builder::splitQueriesOnWhitespace, JsonpDeserializer.booleanDeserializer(), "split_queries_on_whitespace");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorMethod.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorMethod.java
index 5bf4786523..5d1aae66c6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorMethod.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorMethod.java
@@ -8,11 +8,10 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
 import java.util.Map;
 import java.util.function.Function;
-
 import javax.annotation.Nullable;
-
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -24,8 +23,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import jakarta.json.stream.JsonGenerator;
-
 // typedef: _types.mapping.KnnVectorMethod
 
 @JsonpDeserializable
@@ -102,15 +99,16 @@ public KnnVectorMethod build() {
     /**
      * Json deserializer for {@link KnnVectorMethod}
      */
-    public static final JsonpDeserializer<KnnVectorMethod> _DESERIALIZER = ObjectBuilderDeserializer
-            .lazy(Builder::new, KnnVectorMethod::setupKnnVectorMethodDeserializer);
+    public static final JsonpDeserializer<KnnVectorMethod> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        KnnVectorMethod::setupKnnVectorMethodDeserializer
+    );
 
     public static KnnVectorMethod of(Function<Builder, ObjectBuilder<KnnVectorMethod>> fn) {
         return fn.apply(new Builder()).build();
     }
 
-    protected static void setupKnnVectorMethodDeserializer(
-            ObjectDeserializer<KnnVectorMethod.Builder> op) {
+    protected static void setupKnnVectorMethodDeserializer(ObjectDeserializer<KnnVectorMethod.Builder> op) {
 
         op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
         op.add(Builder::spaceType, JsonpDeserializer.stringDeserializer(), "space_type");
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorProperty.java
index 0f931e7ffe..6a1261c5dd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorProperty.java
@@ -8,10 +8,9 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
-
 import javax.annotation.Nullable;
-
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -20,170 +19,168 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
-import jakarta.json.stream.JsonGenerator;
-
 // typedef: _types.mapping.KnnVectorProperty
 
 @JsonpDeserializable
 public class KnnVectorProperty extends PropertyBase implements PropertyVariant {
-	/**
-	 * Builder for {@link KnnVectorProperty}.
-	 */
-
-	public static class Builder extends PropertyBase.AbstractBuilder<Builder>
-			implements
-			ObjectBuilder<KnnVectorProperty> {
-		private Integer dimension;
-
-		@Nullable
-		private String modelId;
-
-		@Nullable
-		private KnnVectorMethod method;
-
-		/**
-		 * Required - API name: {@code dimension}
-		 */
-		public final Builder dimension(int value) {
-			this.dimension = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code model_id}
-		 */
-		public final Builder modelId(@Nullable String value) {
-			this.modelId = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code method}
-		 */
-		public final Builder method(@Nullable KnnVectorMethod value) {
-			this.method = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code method}
-		 */
-		public final Builder method(Function<KnnVectorMethod.Builder, ObjectBuilder<KnnVectorMethod>> fn) {
-			return this.method(fn.apply(new KnnVectorMethod.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link KnnVectorProperty}.
-		 *
-		 * @throws NullPointerException
-		 *                              if some of the required fields are null.
-		 */
-		public KnnVectorProperty build() {
-			_checkSingleUse();
-
-			return new KnnVectorProperty(this);
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-	}
-
-	/**
-	 * Json deserializer for {@link KnnVectorProperty}
-	 */
-	public static final JsonpDeserializer<KnnVectorProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, KnnVectorProperty::setupKnnVectorPropertyDeserializer);
-
-	public static KnnVectorProperty of(Function<Builder, ObjectBuilder<KnnVectorProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected static void setupKnnVectorPropertyDeserializer(ObjectDeserializer<KnnVectorProperty.Builder> op) {
-		PropertyBase.setupPropertyBaseDeserializer(op);
-		op.add(Builder::dimension, JsonpDeserializer.integerDeserializer(), "dimension");
-		op.add(Builder::modelId, JsonpDeserializer.stringDeserializer(), "model_id");
-		op.add(Builder::method, KnnVectorMethod._DESERIALIZER, "method");
-
-		op.ignore("type");
-	}
-
-	private final int dimension;
-
-	@Nullable
-	private final String modelId;
-
-	@Nullable
-	private final KnnVectorMethod method;
-
-	private KnnVectorProperty(Builder builder) {
-		super(builder);
-
-		this.dimension = ApiTypeHelper.requireNonNull(builder.dimension, this, "dimension");
-		this.modelId = builder.modelId;
-		this.method = builder.method;
-
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.KnnVector;
-	}
-
-	/**
-	 * Required - API name: {@code dimension}
-	 */
-	public final int dimension() {
-		return this.dimension;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * API name: {@code model_id}
-	 */
-	@Nullable
-	public final String modelId() {
-		return this.modelId;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * API name: {@code method}
-	 */
-	@Nullable
-	public final KnnVectorMethod method() {
-		return this.method;
-	}
-
-	@Override
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "knn_vector");
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("dimension");
-		generator.write(this.dimension);
-
-		if (this.modelId != null) {
-
-			generator.writeKey("model_id");
-			generator.write(this.modelId);
+    /**
+     * Builder for {@link KnnVectorProperty}.
+     */
+
+    public static class Builder extends PropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<KnnVectorProperty> {
+        private Integer dimension;
+
+        @Nullable
+        private String modelId;
+
+        @Nullable
+        private KnnVectorMethod method;
+
+        /**
+         * Required - API name: {@code dimension}
+         */
+        public final Builder dimension(int value) {
+            this.dimension = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code model_id}
+         */
+        public final Builder modelId(@Nullable String value) {
+            this.modelId = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code method}
+         */
+        public final Builder method(@Nullable KnnVectorMethod value) {
+            this.method = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code method}
+         */
+        public final Builder method(Function<KnnVectorMethod.Builder, ObjectBuilder<KnnVectorMethod>> fn) {
+            return this.method(fn.apply(new KnnVectorMethod.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link KnnVectorProperty}.
+         *
+         * @throws NullPointerException
+         *                              if some of the required fields are null.
+         */
+        public KnnVectorProperty build() {
+            _checkSingleUse();
+
+            return new KnnVectorProperty(this);
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+    }
+
+    /**
+     * Json deserializer for {@link KnnVectorProperty}
+     */
+    public static final JsonpDeserializer<KnnVectorProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        KnnVectorProperty::setupKnnVectorPropertyDeserializer
+    );
+
+    public static KnnVectorProperty of(Function<Builder, ObjectBuilder<KnnVectorProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected static void setupKnnVectorPropertyDeserializer(ObjectDeserializer<KnnVectorProperty.Builder> op) {
+        PropertyBase.setupPropertyBaseDeserializer(op);
+        op.add(Builder::dimension, JsonpDeserializer.integerDeserializer(), "dimension");
+        op.add(Builder::modelId, JsonpDeserializer.stringDeserializer(), "model_id");
+        op.add(Builder::method, KnnVectorMethod._DESERIALIZER, "method");
+
+        op.ignore("type");
+    }
+
+    private final int dimension;
+
+    @Nullable
+    private final String modelId;
+
+    @Nullable
+    private final KnnVectorMethod method;
+
+    private KnnVectorProperty(Builder builder) {
+        super(builder);
+
+        this.dimension = ApiTypeHelper.requireNonNull(builder.dimension, this, "dimension");
+        this.modelId = builder.modelId;
+        this.method = builder.method;
+
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.KnnVector;
+    }
+
+    /**
+     * Required - API name: {@code dimension}
+     */
+    public final int dimension() {
+        return this.dimension;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * API name: {@code model_id}
+     */
+    @Nullable
+    public final String modelId() {
+        return this.modelId;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * API name: {@code method}
+     */
+    @Nullable
+    public final KnnVectorMethod method() {
+        return this.method;
+    }
+
+    @Override
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "knn_vector");
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("dimension");
+        generator.write(this.dimension);
+
+        if (this.modelId != null) {
+
+            generator.writeKey("model_id");
+            generator.write(this.modelId);
 
-		}
+        }
 
-		if (this.method != null) {
+        if (this.method != null) {
 
-			generator.writeKey("method");
-			this.method.serialize(generator, mapper);
-		}
+            generator.writeKey("method");
+            this.method.serialize(generator, mapper);
+        }
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/LongNumberProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/LongNumberProperty.java
index ec54875a19..9d4194a9a6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/LongNumberProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/LongNumberProperty.java
@@ -32,116 +32,115 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.LongNumberProperty
 
-
 @JsonpDeserializable
 public class LongNumberProperty extends StandardNumberProperty implements PropertyVariant {
-	@Nullable
-	private final Long nullValue;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private LongNumberProperty(Builder builder) {
-		super(builder);
-
-		this.nullValue = builder.nullValue;
-
-	}
-
-	public static LongNumberProperty of(Function<Builder, ObjectBuilder<LongNumberProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Long;
-	}
-
-	/**
-	 * API name: {@code null_value}
-	 */
-	@Nullable
-	public final Long nullValue() {
-		return this.nullValue;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "long");
-		super.serializeInternal(generator, mapper);
-		if (this.nullValue != null) {
-			generator.writeKey("null_value");
-			generator.write(this.nullValue);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link LongNumberProperty}.
-	 */
-
-	public static class Builder extends StandardNumberProperty.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<LongNumberProperty> {
-		@Nullable
-		private Long nullValue;
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(@Nullable Long value) {
-			this.nullValue = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link LongNumberProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LongNumberProperty build() {
-			_checkSingleUse();
-
-			return new LongNumberProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link LongNumberProperty}
-	 */
-	public static final JsonpDeserializer<LongNumberProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, LongNumberProperty::setupLongNumberPropertyDeserializer);
-
-	protected static void setupLongNumberPropertyDeserializer(ObjectDeserializer<LongNumberProperty.Builder> op) {
-		StandardNumberProperty.setupStandardNumberPropertyDeserializer(op);
-		op.add(Builder::nullValue, JsonpDeserializer.longDeserializer(), "null_value");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Long nullValue;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private LongNumberProperty(Builder builder) {
+        super(builder);
+
+        this.nullValue = builder.nullValue;
+
+    }
+
+    public static LongNumberProperty of(Function<Builder, ObjectBuilder<LongNumberProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Long;
+    }
+
+    /**
+     * API name: {@code null_value}
+     */
+    @Nullable
+    public final Long nullValue() {
+        return this.nullValue;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "long");
+        super.serializeInternal(generator, mapper);
+        if (this.nullValue != null) {
+            generator.writeKey("null_value");
+            generator.write(this.nullValue);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link LongNumberProperty}.
+     */
+
+    public static class Builder extends StandardNumberProperty.AbstractBuilder<Builder> implements ObjectBuilder<LongNumberProperty> {
+        @Nullable
+        private Long nullValue;
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(@Nullable Long value) {
+            this.nullValue = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link LongNumberProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LongNumberProperty build() {
+            _checkSingleUse();
+
+            return new LongNumberProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link LongNumberProperty}
+     */
+    public static final JsonpDeserializer<LongNumberProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LongNumberProperty::setupLongNumberPropertyDeserializer
+    );
+
+    protected static void setupLongNumberPropertyDeserializer(ObjectDeserializer<LongNumberProperty.Builder> op) {
+        StandardNumberProperty.setupStandardNumberPropertyDeserializer(op);
+        op.add(Builder::nullValue, JsonpDeserializer.longDeserializer(), "null_value");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/LongRangeProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/LongRangeProperty.java
index 677df17bf1..41ddd90286 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/LongRangeProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/LongRangeProperty.java
@@ -32,86 +32,84 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.mapping.LongRangeProperty
 
-
 @JsonpDeserializable
 public class LongRangeProperty extends RangePropertyBase implements PropertyVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private LongRangeProperty(Builder builder) {
-		super(builder);
+    private LongRangeProperty(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static LongRangeProperty of(Function<Builder, ObjectBuilder<LongRangeProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static LongRangeProperty of(Function<Builder, ObjectBuilder<LongRangeProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.LongRange;
-	}
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.LongRange;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "long_range");
-		super.serializeInternal(generator, mapper);
+        generator.write("type", "long_range");
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link LongRangeProperty}.
-	 */
+    /**
+     * Builder for {@link LongRangeProperty}.
+     */
 
-	public static class Builder extends RangePropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<LongRangeProperty> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends RangePropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<LongRangeProperty> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link LongRangeProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LongRangeProperty build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link LongRangeProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LongRangeProperty build() {
+            _checkSingleUse();
 
-			return new LongRangeProperty(this);
-		}
-	}
+            return new LongRangeProperty(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link LongRangeProperty}
-	 */
-	public static final JsonpDeserializer<LongRangeProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, LongRangeProperty::setupLongRangePropertyDeserializer);
+    /**
+     * Json deserializer for {@link LongRangeProperty}
+     */
+    public static final JsonpDeserializer<LongRangeProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LongRangeProperty::setupLongRangePropertyDeserializer
+    );
 
-	protected static void setupLongRangePropertyDeserializer(ObjectDeserializer<LongRangeProperty.Builder> op) {
-		RangePropertyBase.setupRangePropertyBaseDeserializer(op);
+    protected static void setupLongRangePropertyDeserializer(ObjectDeserializer<LongRangeProperty.Builder> op) {
+        RangePropertyBase.setupRangePropertyBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/MatchType.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/MatchType.java
index e751cd52fb..b4a3f1330b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/MatchType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/MatchType.java
@@ -35,25 +35,23 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum MatchType implements JsonEnum {
-	Simple("simple"),
+    Simple("simple"),
 
-	Regex("regex"),
+    Regex("regex"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	MatchType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    MatchType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<MatchType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			MatchType.values());
+    public static final JsonEnum.Deserializer<MatchType> _DESERIALIZER = new JsonEnum.Deserializer<>(MatchType.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/Murmur3HashProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/Murmur3HashProperty.java
index c8616bef37..deb3e3651a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/Murmur3HashProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/Murmur3HashProperty.java
@@ -32,86 +32,84 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.mapping.Murmur3HashProperty
 
-
 @JsonpDeserializable
 public class Murmur3HashProperty extends DocValuesPropertyBase implements PropertyVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private Murmur3HashProperty(Builder builder) {
-		super(builder);
+    private Murmur3HashProperty(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static Murmur3HashProperty of(Function<Builder, ObjectBuilder<Murmur3HashProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static Murmur3HashProperty of(Function<Builder, ObjectBuilder<Murmur3HashProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Murmur3;
-	}
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Murmur3;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "murmur3");
-		super.serializeInternal(generator, mapper);
+        generator.write("type", "murmur3");
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link Murmur3HashProperty}.
-	 */
+    /**
+     * Builder for {@link Murmur3HashProperty}.
+     */
 
-	public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<Murmur3HashProperty> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<Murmur3HashProperty> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link Murmur3HashProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Murmur3HashProperty build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link Murmur3HashProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Murmur3HashProperty build() {
+            _checkSingleUse();
 
-			return new Murmur3HashProperty(this);
-		}
-	}
+            return new Murmur3HashProperty(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link Murmur3HashProperty}
-	 */
-	public static final JsonpDeserializer<Murmur3HashProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, Murmur3HashProperty::setupMurmur3HashPropertyDeserializer);
+    /**
+     * Json deserializer for {@link Murmur3HashProperty}
+     */
+    public static final JsonpDeserializer<Murmur3HashProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Murmur3HashProperty::setupMurmur3HashPropertyDeserializer
+    );
 
-	protected static void setupMurmur3HashPropertyDeserializer(ObjectDeserializer<Murmur3HashProperty.Builder> op) {
-		DocValuesPropertyBase.setupDocValuesPropertyBaseDeserializer(op);
+    protected static void setupMurmur3HashPropertyDeserializer(ObjectDeserializer<Murmur3HashProperty.Builder> op) {
+        DocValuesPropertyBase.setupDocValuesPropertyBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/NestedProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/NestedProperty.java
index 8d02f71a23..507d9169d8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/NestedProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/NestedProperty.java
@@ -32,174 +32,173 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.NestedProperty
 
-
 @JsonpDeserializable
 public class NestedProperty extends CorePropertyBase implements PropertyVariant {
-	@Nullable
-	private final Boolean enabled;
-
-	@Nullable
-	private final Boolean includeInParent;
-
-	@Nullable
-	private final Boolean includeInRoot;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NestedProperty(Builder builder) {
-		super(builder);
-
-		this.enabled = builder.enabled;
-		this.includeInParent = builder.includeInParent;
-		this.includeInRoot = builder.includeInRoot;
-
-	}
-
-	public static NestedProperty of(Function<Builder, ObjectBuilder<NestedProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Nested;
-	}
-
-	/**
-	 * API name: {@code enabled}
-	 */
-	@Nullable
-	public final Boolean enabled() {
-		return this.enabled;
-	}
-
-	/**
-	 * API name: {@code include_in_parent}
-	 */
-	@Nullable
-	public final Boolean includeInParent() {
-		return this.includeInParent;
-	}
-
-	/**
-	 * API name: {@code include_in_root}
-	 */
-	@Nullable
-	public final Boolean includeInRoot() {
-		return this.includeInRoot;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "nested");
-		super.serializeInternal(generator, mapper);
-		if (this.enabled != null) {
-			generator.writeKey("enabled");
-			generator.write(this.enabled);
-
-		}
-		if (this.includeInParent != null) {
-			generator.writeKey("include_in_parent");
-			generator.write(this.includeInParent);
-
-		}
-		if (this.includeInRoot != null) {
-			generator.writeKey("include_in_root");
-			generator.write(this.includeInRoot);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NestedProperty}.
-	 */
-
-	public static class Builder extends CorePropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<NestedProperty> {
-		@Nullable
-		private Boolean enabled;
-
-		@Nullable
-		private Boolean includeInParent;
-
-		@Nullable
-		private Boolean includeInRoot;
-
-		/**
-		 * API name: {@code enabled}
-		 */
-		public final Builder enabled(@Nullable Boolean value) {
-			this.enabled = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code include_in_parent}
-		 */
-		public final Builder includeInParent(@Nullable Boolean value) {
-			this.includeInParent = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code include_in_root}
-		 */
-		public final Builder includeInRoot(@Nullable Boolean value) {
-			this.includeInRoot = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NestedProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NestedProperty build() {
-			_checkSingleUse();
-
-			return new NestedProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NestedProperty}
-	 */
-	public static final JsonpDeserializer<NestedProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NestedProperty::setupNestedPropertyDeserializer);
-
-	protected static void setupNestedPropertyDeserializer(ObjectDeserializer<NestedProperty.Builder> op) {
-		setupCorePropertyBaseDeserializer(op);
-		op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
-		op.add(Builder::includeInParent, JsonpDeserializer.booleanDeserializer(), "include_in_parent");
-		op.add(Builder::includeInRoot, JsonpDeserializer.booleanDeserializer(), "include_in_root");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Boolean enabled;
+
+    @Nullable
+    private final Boolean includeInParent;
+
+    @Nullable
+    private final Boolean includeInRoot;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NestedProperty(Builder builder) {
+        super(builder);
+
+        this.enabled = builder.enabled;
+        this.includeInParent = builder.includeInParent;
+        this.includeInRoot = builder.includeInRoot;
+
+    }
+
+    public static NestedProperty of(Function<Builder, ObjectBuilder<NestedProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Nested;
+    }
+
+    /**
+     * API name: {@code enabled}
+     */
+    @Nullable
+    public final Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * API name: {@code include_in_parent}
+     */
+    @Nullable
+    public final Boolean includeInParent() {
+        return this.includeInParent;
+    }
+
+    /**
+     * API name: {@code include_in_root}
+     */
+    @Nullable
+    public final Boolean includeInRoot() {
+        return this.includeInRoot;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "nested");
+        super.serializeInternal(generator, mapper);
+        if (this.enabled != null) {
+            generator.writeKey("enabled");
+            generator.write(this.enabled);
+
+        }
+        if (this.includeInParent != null) {
+            generator.writeKey("include_in_parent");
+            generator.write(this.includeInParent);
+
+        }
+        if (this.includeInRoot != null) {
+            generator.writeKey("include_in_root");
+            generator.write(this.includeInRoot);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NestedProperty}.
+     */
+
+    public static class Builder extends CorePropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<NestedProperty> {
+        @Nullable
+        private Boolean enabled;
+
+        @Nullable
+        private Boolean includeInParent;
+
+        @Nullable
+        private Boolean includeInRoot;
+
+        /**
+         * API name: {@code enabled}
+         */
+        public final Builder enabled(@Nullable Boolean value) {
+            this.enabled = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code include_in_parent}
+         */
+        public final Builder includeInParent(@Nullable Boolean value) {
+            this.includeInParent = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code include_in_root}
+         */
+        public final Builder includeInRoot(@Nullable Boolean value) {
+            this.includeInRoot = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link NestedProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NestedProperty build() {
+            _checkSingleUse();
+
+            return new NestedProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NestedProperty}
+     */
+    public static final JsonpDeserializer<NestedProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NestedProperty::setupNestedPropertyDeserializer
+    );
+
+    protected static void setupNestedPropertyDeserializer(ObjectDeserializer<NestedProperty.Builder> op) {
+        setupCorePropertyBaseDeserializer(op);
+        op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
+        op.add(Builder::includeInParent, JsonpDeserializer.booleanDeserializer(), "include_in_parent");
+        op.add(Builder::includeInRoot, JsonpDeserializer.booleanDeserializer(), "include_in_root");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/NumberPropertyBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/NumberPropertyBase.java
index 053975b969..3e2a04ec3b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/NumberPropertyBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/NumberPropertyBase.java
@@ -32,99 +32,97 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectDeserializer;
-import jakarta.json.stream.JsonGenerator;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.NumberPropertyBase
 
-
-
 public abstract class NumberPropertyBase extends DocValuesPropertyBase {
-	@Nullable
-	private final Boolean index;
-
-	@Nullable
-	private final Boolean ignoreMalformed;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected NumberPropertyBase(AbstractBuilder<?> builder) {
-		super(builder);
-
-		this.index = builder.index;
-		this.ignoreMalformed = builder.ignoreMalformed;
-
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final Boolean index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code ignore_malformed}
-	 */
-	@Nullable
-	public final Boolean ignoreMalformed() {
-		return this.ignoreMalformed;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.ignoreMalformed != null) {
-			generator.writeKey("ignore_malformed");
-			generator.write(this.ignoreMalformed);
-
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				DocValuesPropertyBase.AbstractBuilder<BuilderT> {
-		@Nullable
-		private Boolean index;
-
-		@Nullable
-		private Boolean ignoreMalformed;
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final BuilderT index(@Nullable Boolean value) {
-			this.index = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code ignore_malformed}
-		 */
-		public final BuilderT ignoreMalformed(@Nullable Boolean value) {
-			this.ignoreMalformed = value;
-			return self();
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupNumberPropertyBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		DocValuesPropertyBase.setupDocValuesPropertyBaseDeserializer(op);
-		op.add(AbstractBuilder::index, JsonpDeserializer.booleanDeserializer(), "index");
-		op.add(AbstractBuilder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
-
-	}
+    @Nullable
+    private final Boolean index;
+
+    @Nullable
+    private final Boolean ignoreMalformed;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected NumberPropertyBase(AbstractBuilder<?> builder) {
+        super(builder);
+
+        this.index = builder.index;
+        this.ignoreMalformed = builder.ignoreMalformed;
+
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    @Nullable
+    public final Boolean index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code ignore_malformed}
+     */
+    @Nullable
+    public final Boolean ignoreMalformed() {
+        return this.ignoreMalformed;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.ignoreMalformed != null) {
+            generator.writeKey("ignore_malformed");
+            generator.write(this.ignoreMalformed);
+
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends
+        DocValuesPropertyBase.AbstractBuilder<BuilderT> {
+        @Nullable
+        private Boolean index;
+
+        @Nullable
+        private Boolean ignoreMalformed;
+
+        /**
+         * API name: {@code index}
+         */
+        public final BuilderT index(@Nullable Boolean value) {
+            this.index = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code ignore_malformed}
+         */
+        public final BuilderT ignoreMalformed(@Nullable Boolean value) {
+            this.ignoreMalformed = value;
+            return self();
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupNumberPropertyBaseDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
+        DocValuesPropertyBase.setupDocValuesPropertyBaseDeserializer(op);
+        op.add(AbstractBuilder::index, JsonpDeserializer.booleanDeserializer(), "index");
+        op.add(AbstractBuilder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ObjectProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ObjectProperty.java
index 38e8e74d2f..02f15c3cf4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ObjectProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ObjectProperty.java
@@ -32,116 +32,115 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.ObjectProperty
 
-
 @JsonpDeserializable
 public class ObjectProperty extends CorePropertyBase implements PropertyVariant {
-	@Nullable
-	private final Boolean enabled;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ObjectProperty(Builder builder) {
-		super(builder);
-
-		this.enabled = builder.enabled;
-
-	}
-
-	public static ObjectProperty of(Function<Builder, ObjectBuilder<ObjectProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Object;
-	}
-
-	/**
-	 * API name: {@code enabled}
-	 */
-	@Nullable
-	public final Boolean enabled() {
-		return this.enabled;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "object");
-		super.serializeInternal(generator, mapper);
-		if (this.enabled != null) {
-			generator.writeKey("enabled");
-			generator.write(this.enabled);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ObjectProperty}.
-	 */
-
-	public static class Builder extends CorePropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ObjectProperty> {
-		@Nullable
-		private Boolean enabled;
-
-		/**
-		 * API name: {@code enabled}
-		 */
-		public final Builder enabled(@Nullable Boolean value) {
-			this.enabled = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ObjectProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ObjectProperty build() {
-			_checkSingleUse();
-
-			return new ObjectProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ObjectProperty}
-	 */
-	public static final JsonpDeserializer<ObjectProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ObjectProperty::setupObjectPropertyDeserializer);
-
-	protected static void setupObjectPropertyDeserializer(ObjectDeserializer<ObjectProperty.Builder> op) {
-		setupCorePropertyBaseDeserializer(op);
-		op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Boolean enabled;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ObjectProperty(Builder builder) {
+        super(builder);
+
+        this.enabled = builder.enabled;
+
+    }
+
+    public static ObjectProperty of(Function<Builder, ObjectBuilder<ObjectProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Object;
+    }
+
+    /**
+     * API name: {@code enabled}
+     */
+    @Nullable
+    public final Boolean enabled() {
+        return this.enabled;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "object");
+        super.serializeInternal(generator, mapper);
+        if (this.enabled != null) {
+            generator.writeKey("enabled");
+            generator.write(this.enabled);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ObjectProperty}.
+     */
+
+    public static class Builder extends CorePropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<ObjectProperty> {
+        @Nullable
+        private Boolean enabled;
+
+        /**
+         * API name: {@code enabled}
+         */
+        public final Builder enabled(@Nullable Boolean value) {
+            this.enabled = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ObjectProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ObjectProperty build() {
+            _checkSingleUse();
+
+            return new ObjectProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ObjectProperty}
+     */
+    public static final JsonpDeserializer<ObjectProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ObjectProperty::setupObjectPropertyDeserializer
+    );
+
+    protected static void setupObjectPropertyDeserializer(ObjectDeserializer<ObjectProperty.Builder> op) {
+        setupCorePropertyBaseDeserializer(op);
+        op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/OnScriptError.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/OnScriptError.java
index aed26732f8..779fe1c8d1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/OnScriptError.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/OnScriptError.java
@@ -35,25 +35,23 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum OnScriptError implements JsonEnum {
-	Fail("fail"),
+    Fail("fail"),
 
-	Continue("continue"),
+    Continue("continue"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	OnScriptError(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    OnScriptError(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<OnScriptError> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			OnScriptError.values());
+    public static final JsonEnum.Deserializer<OnScriptError> _DESERIALIZER = new JsonEnum.Deserializer<>(OnScriptError.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PercolatorProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PercolatorProperty.java
index 17be05b966..4c66b95e7f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PercolatorProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PercolatorProperty.java
@@ -32,86 +32,84 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.mapping.PercolatorProperty
 
-
 @JsonpDeserializable
 public class PercolatorProperty extends PropertyBase implements PropertyVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private PercolatorProperty(Builder builder) {
-		super(builder);
+    private PercolatorProperty(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static PercolatorProperty of(Function<Builder, ObjectBuilder<PercolatorProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static PercolatorProperty of(Function<Builder, ObjectBuilder<PercolatorProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Percolator;
-	}
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Percolator;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "percolator");
-		super.serializeInternal(generator, mapper);
+        generator.write("type", "percolator");
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link PercolatorProperty}.
-	 */
+    /**
+     * Builder for {@link PercolatorProperty}.
+     */
 
-	public static class Builder extends PropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PercolatorProperty> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends PropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<PercolatorProperty> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link PercolatorProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PercolatorProperty build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link PercolatorProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PercolatorProperty build() {
+            _checkSingleUse();
 
-			return new PercolatorProperty(this);
-		}
-	}
+            return new PercolatorProperty(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link PercolatorProperty}
-	 */
-	public static final JsonpDeserializer<PercolatorProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PercolatorProperty::setupPercolatorPropertyDeserializer);
+    /**
+     * Json deserializer for {@link PercolatorProperty}
+     */
+    public static final JsonpDeserializer<PercolatorProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PercolatorProperty::setupPercolatorPropertyDeserializer
+    );
 
-	protected static void setupPercolatorPropertyDeserializer(ObjectDeserializer<PercolatorProperty.Builder> op) {
-		PropertyBase.setupPropertyBaseDeserializer(op);
+    protected static void setupPercolatorPropertyDeserializer(ObjectDeserializer<PercolatorProperty.Builder> op) {
+        PropertyBase.setupPropertyBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PointProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PointProperty.java
index 6fac0375a5..e0c9b0b320 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PointProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PointProperty.java
@@ -32,174 +32,173 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.PointProperty
 
-
 @JsonpDeserializable
 public class PointProperty extends DocValuesPropertyBase implements PropertyVariant {
-	@Nullable
-	private final Boolean ignoreMalformed;
-
-	@Nullable
-	private final Boolean ignoreZValue;
-
-	@Nullable
-	private final String nullValue;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PointProperty(Builder builder) {
-		super(builder);
-
-		this.ignoreMalformed = builder.ignoreMalformed;
-		this.ignoreZValue = builder.ignoreZValue;
-		this.nullValue = builder.nullValue;
-
-	}
-
-	public static PointProperty of(Function<Builder, ObjectBuilder<PointProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Point;
-	}
-
-	/**
-	 * API name: {@code ignore_malformed}
-	 */
-	@Nullable
-	public final Boolean ignoreMalformed() {
-		return this.ignoreMalformed;
-	}
-
-	/**
-	 * API name: {@code ignore_z_value}
-	 */
-	@Nullable
-	public final Boolean ignoreZValue() {
-		return this.ignoreZValue;
-	}
-
-	/**
-	 * API name: {@code null_value}
-	 */
-	@Nullable
-	public final String nullValue() {
-		return this.nullValue;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "point");
-		super.serializeInternal(generator, mapper);
-		if (this.ignoreMalformed != null) {
-			generator.writeKey("ignore_malformed");
-			generator.write(this.ignoreMalformed);
-
-		}
-		if (this.ignoreZValue != null) {
-			generator.writeKey("ignore_z_value");
-			generator.write(this.ignoreZValue);
-
-		}
-		if (this.nullValue != null) {
-			generator.writeKey("null_value");
-			generator.write(this.nullValue);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PointProperty}.
-	 */
-
-	public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PointProperty> {
-		@Nullable
-		private Boolean ignoreMalformed;
-
-		@Nullable
-		private Boolean ignoreZValue;
-
-		@Nullable
-		private String nullValue;
-
-		/**
-		 * API name: {@code ignore_malformed}
-		 */
-		public final Builder ignoreMalformed(@Nullable Boolean value) {
-			this.ignoreMalformed = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_z_value}
-		 */
-		public final Builder ignoreZValue(@Nullable Boolean value) {
-			this.ignoreZValue = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(@Nullable String value) {
-			this.nullValue = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PointProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PointProperty build() {
-			_checkSingleUse();
-
-			return new PointProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PointProperty}
-	 */
-	public static final JsonpDeserializer<PointProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			PointProperty::setupPointPropertyDeserializer);
-
-	protected static void setupPointPropertyDeserializer(ObjectDeserializer<PointProperty.Builder> op) {
-		setupDocValuesPropertyBaseDeserializer(op);
-		op.add(Builder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
-		op.add(Builder::ignoreZValue, JsonpDeserializer.booleanDeserializer(), "ignore_z_value");
-		op.add(Builder::nullValue, JsonpDeserializer.stringDeserializer(), "null_value");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Boolean ignoreMalformed;
+
+    @Nullable
+    private final Boolean ignoreZValue;
+
+    @Nullable
+    private final String nullValue;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PointProperty(Builder builder) {
+        super(builder);
+
+        this.ignoreMalformed = builder.ignoreMalformed;
+        this.ignoreZValue = builder.ignoreZValue;
+        this.nullValue = builder.nullValue;
+
+    }
+
+    public static PointProperty of(Function<Builder, ObjectBuilder<PointProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Point;
+    }
+
+    /**
+     * API name: {@code ignore_malformed}
+     */
+    @Nullable
+    public final Boolean ignoreMalformed() {
+        return this.ignoreMalformed;
+    }
+
+    /**
+     * API name: {@code ignore_z_value}
+     */
+    @Nullable
+    public final Boolean ignoreZValue() {
+        return this.ignoreZValue;
+    }
+
+    /**
+     * API name: {@code null_value}
+     */
+    @Nullable
+    public final String nullValue() {
+        return this.nullValue;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "point");
+        super.serializeInternal(generator, mapper);
+        if (this.ignoreMalformed != null) {
+            generator.writeKey("ignore_malformed");
+            generator.write(this.ignoreMalformed);
+
+        }
+        if (this.ignoreZValue != null) {
+            generator.writeKey("ignore_z_value");
+            generator.write(this.ignoreZValue);
+
+        }
+        if (this.nullValue != null) {
+            generator.writeKey("null_value");
+            generator.write(this.nullValue);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PointProperty}.
+     */
+
+    public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<PointProperty> {
+        @Nullable
+        private Boolean ignoreMalformed;
+
+        @Nullable
+        private Boolean ignoreZValue;
+
+        @Nullable
+        private String nullValue;
+
+        /**
+         * API name: {@code ignore_malformed}
+         */
+        public final Builder ignoreMalformed(@Nullable Boolean value) {
+            this.ignoreMalformed = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_z_value}
+         */
+        public final Builder ignoreZValue(@Nullable Boolean value) {
+            this.ignoreZValue = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(@Nullable String value) {
+            this.nullValue = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PointProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PointProperty build() {
+            _checkSingleUse();
+
+            return new PointProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PointProperty}
+     */
+    public static final JsonpDeserializer<PointProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PointProperty::setupPointPropertyDeserializer
+    );
+
+    protected static void setupPointPropertyDeserializer(ObjectDeserializer<PointProperty.Builder> op) {
+        setupDocValuesPropertyBaseDeserializer(op);
+        op.add(Builder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
+        op.add(Builder::ignoreZValue, JsonpDeserializer.booleanDeserializer(), "ignore_z_value");
+        op.add(Builder::nullValue, JsonpDeserializer.stringDeserializer(), "null_value");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/Property.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/Property.java
index 10c23d2cff..827c0551f0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/Property.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/Property.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -44,1443 +46,1426 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.mapping.Property
 
-
 @JsonpDeserializable
 public class Property implements TaggedUnion<Property.Kind, PropertyVariant>, JsonpSerializable {
 
-	/**
-	 * {@link Property} variant kinds.
-	 */
-	/**
-	 * {@link Property} variant kinds.
-	 */
+    /**
+     * {@link Property} variant kinds.
+     */
+    /**
+     * {@link Property} variant kinds.
+     */
 
-	public enum Kind implements JsonEnum {
-		AggregateMetricDouble("aggregate_metric_double"),
+    public enum Kind implements JsonEnum {
+        AggregateMetricDouble("aggregate_metric_double"),
 
-		Binary("binary"),
+        Binary("binary"),
 
-		Boolean("boolean"),
+        Boolean("boolean"),
 
-		Byte("byte"),
+        Byte("byte"),
 
-		Completion("completion"),
+        Completion("completion"),
 
-		ConstantKeyword("constant_keyword"),
+        ConstantKeyword("constant_keyword"),
 
-		DateNanos("date_nanos"),
+        DateNanos("date_nanos"),
 
-		Date("date"),
+        Date("date"),
 
-		DateRange("date_range"),
+        DateRange("date_range"),
 
-		Double("double"),
+        Double("double"),
 
-		DoubleRange("double_range"),
+        DoubleRange("double_range"),
 
-		Alias("alias"),
+        Alias("alias"),
 
-		Flattened("flattened"),
+        Flattened("flattened"),
 
-		Float("float"),
+        Float("float"),
 
-		FloatRange("float_range"),
+        FloatRange("float_range"),
 
-		GeoPoint("geo_point"),
+        GeoPoint("geo_point"),
 
-		GeoShape("geo_shape"),
+        GeoShape("geo_shape"),
 
-		HalfFloat("half_float"),
+        HalfFloat("half_float"),
 
-		Histogram("histogram"),
+        Histogram("histogram"),
 
-		Integer("integer"),
+        Integer("integer"),
 
-		IntegerRange("integer_range"),
+        IntegerRange("integer_range"),
 
-		Ip("ip"),
+        Ip("ip"),
 
-		IpRange("ip_range"),
+        IpRange("ip_range"),
 
-		Join("join"),
+        Join("join"),
 
-		Keyword("keyword"),
+        Keyword("keyword"),
 
-		KnnVector("knn_vector"),
+        KnnVector("knn_vector"),
 
-		Long("long"),
+        Long("long"),
 
-		LongRange("long_range"),
+        LongRange("long_range"),
 
-		Murmur3("murmur3"),
+        Murmur3("murmur3"),
 
-		Nested("nested"),
+        Nested("nested"),
 
-		Object("object"),
+        Object("object"),
 
-		Percolator("percolator"),
+        Percolator("percolator"),
 
-		Point("point"),
+        Point("point"),
 
-		RankFeature("rank_feature"),
+        RankFeature("rank_feature"),
 
-		RankFeatures("rank_features"),
+        RankFeatures("rank_features"),
 
-		ScaledFloat("scaled_float"),
+        ScaledFloat("scaled_float"),
 
-		SearchAsYouType("search_as_you_type"),
+        SearchAsYouType("search_as_you_type"),
 
-		Shape("shape"),
+        Shape("shape"),
 
-		Short("short"),
+        Short("short"),
 
-		Text("text"),
+        Text("text"),
 
-		TokenCount("token_count"),
+        TokenCount("token_count"),
 
-		UnsignedLong("unsigned_long"),
+        UnsignedLong("unsigned_long"),
 
-		Version("version"),
+        Version("version"),
 
-		Wildcard("wildcard"),
+        Wildcard("wildcard"),
 
-		;
+        ;
 
-		private final String jsonValue;
+        private final String jsonValue;
 
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
 
-		public String jsonValue() {
-			return this.jsonValue;
-		}
+        public String jsonValue() {
+            return this.jsonValue;
+        }
 
-	}
+    }
 
-	private final Kind _kind;
-	private final PropertyVariant _value;
+    private final Kind _kind;
+    private final PropertyVariant _value;
 
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
 
-	@Override
-	public final PropertyVariant _get() {
-		return _value;
-	}
+    @Override
+    public final PropertyVariant _get() {
+        return _value;
+    }
 
-	public Property(PropertyVariant value) {
+    public Property(PropertyVariant value) {
 
-		this._kind = ApiTypeHelper.requireNonNull(value._propertyKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+        this._kind = ApiTypeHelper.requireNonNull(value._propertyKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
 
-	}
+    }
 
-	private Property(Builder builder) {
+    private Property(Builder builder) {
 
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
 
-	}
+    }
 
-	public static Property of(Function<Builder, ObjectBuilder<Property>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static Property of(Function<Builder, ObjectBuilder<Property>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Is this variant instance of kind {@code aggregate_metric_double}?
-	 */
-	public boolean isAggregateMetricDouble() {
-		return _kind == Kind.AggregateMetricDouble;
-	}
+    /**
+     * Is this variant instance of kind {@code aggregate_metric_double}?
+     */
+    public boolean isAggregateMetricDouble() {
+        return _kind == Kind.AggregateMetricDouble;
+    }
 
-	/**
-	 * Get the {@code aggregate_metric_double} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the
-	 *             {@code aggregate_metric_double} kind.
-	 */
-	public AggregateMetricDoubleProperty aggregateMetricDouble() {
-		return TaggedUnionUtils.get(this, Kind.AggregateMetricDouble);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code binary}?
-	 */
-	public boolean isBinary() {
-		return _kind == Kind.Binary;
-	}
-
-	/**
-	 * Get the {@code binary} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code binary} kind.
-	 */
-	public BinaryProperty binary() {
-		return TaggedUnionUtils.get(this, Kind.Binary);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code boolean}?
-	 */
-	public boolean isBoolean() {
-		return _kind == Kind.Boolean;
-	}
-
-	/**
-	 * Get the {@code boolean} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code boolean} kind.
-	 */
-	public BooleanProperty boolean_() {
-		return TaggedUnionUtils.get(this, Kind.Boolean);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code byte}?
-	 */
-	public boolean isByte() {
-		return _kind == Kind.Byte;
-	}
-
-	/**
-	 * Get the {@code byte} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code byte} kind.
-	 */
-	public ByteNumberProperty byte_() {
-		return TaggedUnionUtils.get(this, Kind.Byte);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code completion}?
-	 */
-	public boolean isCompletion() {
-		return _kind == Kind.Completion;
-	}
-
-	/**
-	 * Get the {@code completion} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code completion} kind.
-	 */
-	public CompletionProperty completion() {
-		return TaggedUnionUtils.get(this, Kind.Completion);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code constant_keyword}?
-	 */
-	public boolean isConstantKeyword() {
-		return _kind == Kind.ConstantKeyword;
-	}
-
-	/**
-	 * Get the {@code constant_keyword} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code constant_keyword}
-	 *             kind.
-	 */
-	public ConstantKeywordProperty constantKeyword() {
-		return TaggedUnionUtils.get(this, Kind.ConstantKeyword);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code date_nanos}?
-	 */
-	public boolean isDateNanos() {
-		return _kind == Kind.DateNanos;
-	}
-
-	/**
-	 * Get the {@code date_nanos} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code date_nanos} kind.
-	 */
-	public DateNanosProperty dateNanos() {
-		return TaggedUnionUtils.get(this, Kind.DateNanos);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code date}?
-	 */
-	public boolean isDate() {
-		return _kind == Kind.Date;
-	}
-
-	/**
-	 * Get the {@code date} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code date} kind.
-	 */
-	public DateProperty date() {
-		return TaggedUnionUtils.get(this, Kind.Date);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code date_range}?
-	 */
-	public boolean isDateRange() {
-		return _kind == Kind.DateRange;
-	}
-
-	/**
-	 * Get the {@code date_range} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code date_range} kind.
-	 */
-	public DateRangeProperty dateRange() {
-		return TaggedUnionUtils.get(this, Kind.DateRange);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code double}?
-	 */
-	public boolean isDouble() {
-		return _kind == Kind.Double;
-	}
-
-	/**
-	 * Get the {@code double} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code double} kind.
-	 */
-	public DoubleNumberProperty double_() {
-		return TaggedUnionUtils.get(this, Kind.Double);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code double_range}?
-	 */
-	public boolean isDoubleRange() {
-		return _kind == Kind.DoubleRange;
-	}
-
-	/**
-	 * Get the {@code double_range} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code double_range} kind.
-	 */
-	public DoubleRangeProperty doubleRange() {
-		return TaggedUnionUtils.get(this, Kind.DoubleRange);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code alias}?
-	 */
-	public boolean isAlias() {
-		return _kind == Kind.Alias;
-	}
-
-	/**
-	 * Get the {@code alias} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code alias} kind.
-	 */
-	public FieldAliasProperty alias() {
-		return TaggedUnionUtils.get(this, Kind.Alias);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code flattened}?
-	 */
-	public boolean isFlattened() {
-		return _kind == Kind.Flattened;
-	}
-
-	/**
-	 * Get the {@code flattened} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code flattened} kind.
-	 */
-	public FlattenedProperty flattened() {
-		return TaggedUnionUtils.get(this, Kind.Flattened);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code float}?
-	 */
-	public boolean isFloat() {
-		return _kind == Kind.Float;
-	}
-
-	/**
-	 * Get the {@code float} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code float} kind.
-	 */
-	public FloatNumberProperty float_() {
-		return TaggedUnionUtils.get(this, Kind.Float);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code float_range}?
-	 */
-	public boolean isFloatRange() {
-		return _kind == Kind.FloatRange;
-	}
-
-	/**
-	 * Get the {@code float_range} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code float_range} kind.
-	 */
-	public FloatRangeProperty floatRange() {
-		return TaggedUnionUtils.get(this, Kind.FloatRange);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geo_point}?
-	 */
-	public boolean isGeoPoint() {
-		return _kind == Kind.GeoPoint;
-	}
-
-	/**
-	 * Get the {@code geo_point} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geo_point} kind.
-	 */
-	public GeoPointProperty geoPoint() {
-		return TaggedUnionUtils.get(this, Kind.GeoPoint);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geo_shape}?
-	 */
-	public boolean isGeoShape() {
-		return _kind == Kind.GeoShape;
-	}
-
-	/**
-	 * Get the {@code geo_shape} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geo_shape} kind.
-	 */
-	public GeoShapeProperty geoShape() {
-		return TaggedUnionUtils.get(this, Kind.GeoShape);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code half_float}?
-	 */
-	public boolean isHalfFloat() {
-		return _kind == Kind.HalfFloat;
-	}
-
-	/**
-	 * Get the {@code half_float} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code half_float} kind.
-	 */
-	public HalfFloatNumberProperty halfFloat() {
-		return TaggedUnionUtils.get(this, Kind.HalfFloat);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code histogram}?
-	 */
-	public boolean isHistogram() {
-		return _kind == Kind.Histogram;
-	}
-
-	/**
-	 * Get the {@code histogram} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code histogram} kind.
-	 */
-	public HistogramProperty histogram() {
-		return TaggedUnionUtils.get(this, Kind.Histogram);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code integer}?
-	 */
-	public boolean isInteger() {
-		return _kind == Kind.Integer;
-	}
-
-	/**
-	 * Get the {@code integer} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code integer} kind.
-	 */
-	public IntegerNumberProperty integer() {
-		return TaggedUnionUtils.get(this, Kind.Integer);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code integer_range}?
-	 */
-	public boolean isIntegerRange() {
-		return _kind == Kind.IntegerRange;
-	}
-
-	/**
-	 * Get the {@code integer_range} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code integer_range} kind.
-	 */
-	public IntegerRangeProperty integerRange() {
-		return TaggedUnionUtils.get(this, Kind.IntegerRange);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code ip}?
-	 */
-	public boolean isIp() {
-		return _kind == Kind.Ip;
-	}
-
-	/**
-	 * Get the {@code ip} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code ip} kind.
-	 */
-	public IpProperty ip() {
-		return TaggedUnionUtils.get(this, Kind.Ip);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code ip_range}?
-	 */
-	public boolean isIpRange() {
-		return _kind == Kind.IpRange;
-	}
-
-	/**
-	 * Get the {@code ip_range} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code ip_range} kind.
-	 */
-	public IpRangeProperty ipRange() {
-		return TaggedUnionUtils.get(this, Kind.IpRange);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code join}?
-	 */
-	public boolean isJoin() {
-		return _kind == Kind.Join;
-	}
-
-	/**
-	 * Get the {@code join} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code join} kind.
-	 */
-	public JoinProperty join() {
-		return TaggedUnionUtils.get(this, Kind.Join);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code keyword}?
-	 */
-	public boolean isKeyword() {
-		return _kind == Kind.Keyword;
-	}
-
-	/**
-	 * Get the {@code keyword} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code keyword} kind.
-	 */
-	public KeywordProperty keyword() {
-		return TaggedUnionUtils.get(this, Kind.Keyword);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code knn_vector}?
-	 */
-	public boolean isKnnVector() { return _kind == Kind.KnnVector; }
-
-	/**
-	 * Get the {@code knn_vector} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code knn_vector} kind.
-	 */
-	public KnnVectorProperty knnVector() { return TaggedUnionUtils.get(this, Kind.KnnVector); }
-
-	/**
-	 * Is this variant instance of kind {@code long}?
-	 */
-	public boolean isLong() {
-		return _kind == Kind.Long;
-	}
-
-	/**
-	 * Get the {@code long} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code long} kind.
-	 */
-	public LongNumberProperty long_() {
-		return TaggedUnionUtils.get(this, Kind.Long);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code long_range}?
-	 */
-	public boolean isLongRange() {
-		return _kind == Kind.LongRange;
-	}
-
-	/**
-	 * Get the {@code long_range} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code long_range} kind.
-	 */
-	public LongRangeProperty longRange() {
-		return TaggedUnionUtils.get(this, Kind.LongRange);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code murmur3}?
-	 */
-	public boolean isMurmur3() {
-		return _kind == Kind.Murmur3;
-	}
-
-	/**
-	 * Get the {@code murmur3} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code murmur3} kind.
-	 */
-	public Murmur3HashProperty murmur3() {
-		return TaggedUnionUtils.get(this, Kind.Murmur3);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code nested}?
-	 */
-	public boolean isNested() {
-		return _kind == Kind.Nested;
-	}
-
-	/**
-	 * Get the {@code nested} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code nested} kind.
-	 */
-	public NestedProperty nested() {
-		return TaggedUnionUtils.get(this, Kind.Nested);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code object}?
-	 */
-	public boolean isObject() {
-		return _kind == Kind.Object;
-	}
-
-	/**
-	 * Get the {@code object} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code object} kind.
-	 */
-	public ObjectProperty object() {
-		return TaggedUnionUtils.get(this, Kind.Object);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code percolator}?
-	 */
-	public boolean isPercolator() {
-		return _kind == Kind.Percolator;
-	}
-
-	/**
-	 * Get the {@code percolator} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code percolator} kind.
-	 */
-	public PercolatorProperty percolator() {
-		return TaggedUnionUtils.get(this, Kind.Percolator);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code point}?
-	 */
-	public boolean isPoint() {
-		return _kind == Kind.Point;
-	}
-
-	/**
-	 * Get the {@code point} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code point} kind.
-	 */
-	public PointProperty point() {
-		return TaggedUnionUtils.get(this, Kind.Point);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code rank_feature}?
-	 */
-	public boolean isRankFeature() {
-		return _kind == Kind.RankFeature;
-	}
-
-	/**
-	 * Get the {@code rank_feature} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code rank_feature} kind.
-	 */
-	public RankFeatureProperty rankFeature() {
-		return TaggedUnionUtils.get(this, Kind.RankFeature);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code rank_features}?
-	 */
-	public boolean isRankFeatures() {
-		return _kind == Kind.RankFeatures;
-	}
-
-	/**
-	 * Get the {@code rank_features} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code rank_features} kind.
-	 */
-	public RankFeaturesProperty rankFeatures() {
-		return TaggedUnionUtils.get(this, Kind.RankFeatures);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code scaled_float}?
-	 */
-	public boolean isScaledFloat() {
-		return _kind == Kind.ScaledFloat;
-	}
-
-	/**
-	 * Get the {@code scaled_float} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code scaled_float} kind.
-	 */
-	public ScaledFloatNumberProperty scaledFloat() {
-		return TaggedUnionUtils.get(this, Kind.ScaledFloat);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code search_as_you_type}?
-	 */
-	public boolean isSearchAsYouType() {
-		return _kind == Kind.SearchAsYouType;
-	}
-
-	/**
-	 * Get the {@code search_as_you_type} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code search_as_you_type}
-	 *             kind.
-	 */
-	public SearchAsYouTypeProperty searchAsYouType() {
-		return TaggedUnionUtils.get(this, Kind.SearchAsYouType);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code shape}?
-	 */
-	public boolean isShape() {
-		return _kind == Kind.Shape;
-	}
-
-	/**
-	 * Get the {@code shape} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code shape} kind.
-	 */
-	public ShapeProperty shape() {
-		return TaggedUnionUtils.get(this, Kind.Shape);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code short}?
-	 */
-	public boolean isShort() {
-		return _kind == Kind.Short;
-	}
-
-	/**
-	 * Get the {@code short} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code short} kind.
-	 */
-	public ShortNumberProperty short_() {
-		return TaggedUnionUtils.get(this, Kind.Short);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code text}?
-	 */
-	public boolean isText() {
-		return _kind == Kind.Text;
-	}
-
-	/**
-	 * Get the {@code text} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code text} kind.
-	 */
-	public TextProperty text() {
-		return TaggedUnionUtils.get(this, Kind.Text);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code token_count}?
-	 */
-	public boolean isTokenCount() {
-		return _kind == Kind.TokenCount;
-	}
-
-	/**
-	 * Get the {@code token_count} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code token_count} kind.
-	 */
-	public TokenCountProperty tokenCount() {
-		return TaggedUnionUtils.get(this, Kind.TokenCount);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code unsigned_long}?
-	 */
-	public boolean isUnsignedLong() {
-		return _kind == Kind.UnsignedLong;
-	}
-
-	/**
-	 * Get the {@code unsigned_long} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code unsigned_long} kind.
-	 */
-	public UnsignedLongNumberProperty unsignedLong() {
-		return TaggedUnionUtils.get(this, Kind.UnsignedLong);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code version}?
-	 */
-	public boolean isVersion() {
-		return _kind == Kind.Version;
-	}
-
-	/**
-	 * Get the {@code version} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code version} kind.
-	 */
-	public VersionProperty version() {
-		return TaggedUnionUtils.get(this, Kind.Version);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code wildcard}?
-	 */
-	public boolean isWildcard() {
-		return _kind == Kind.Wildcard;
-	}
-
-	/**
-	 * Get the {@code wildcard} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code wildcard} kind.
-	 */
-	public WildcardProperty wildcard() {
-		return TaggedUnionUtils.get(this, Kind.Wildcard);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		mapper.serialize(_value, generator);
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Property> {
-		private Kind _kind;
-		private PropertyVariant _value;
-
-		public ObjectBuilder<Property> aggregateMetricDouble(AggregateMetricDoubleProperty v) {
-			this._kind = Kind.AggregateMetricDouble;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> aggregateMetricDouble(
-				Function<AggregateMetricDoubleProperty.Builder, ObjectBuilder<AggregateMetricDoubleProperty>> fn) {
-			return this.aggregateMetricDouble(fn.apply(new AggregateMetricDoubleProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> binary(BinaryProperty v) {
-			this._kind = Kind.Binary;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> binary(Function<BinaryProperty.Builder, ObjectBuilder<BinaryProperty>> fn) {
-			return this.binary(fn.apply(new BinaryProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> boolean_(BooleanProperty v) {
-			this._kind = Kind.Boolean;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> boolean_(Function<BooleanProperty.Builder, ObjectBuilder<BooleanProperty>> fn) {
-			return this.boolean_(fn.apply(new BooleanProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> byte_(ByteNumberProperty v) {
-			this._kind = Kind.Byte;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> byte_(
-				Function<ByteNumberProperty.Builder, ObjectBuilder<ByteNumberProperty>> fn) {
-			return this.byte_(fn.apply(new ByteNumberProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> completion(CompletionProperty v) {
-			this._kind = Kind.Completion;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> completion(
-				Function<CompletionProperty.Builder, ObjectBuilder<CompletionProperty>> fn) {
-			return this.completion(fn.apply(new CompletionProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> constantKeyword(ConstantKeywordProperty v) {
-			this._kind = Kind.ConstantKeyword;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> constantKeyword(
-				Function<ConstantKeywordProperty.Builder, ObjectBuilder<ConstantKeywordProperty>> fn) {
-			return this.constantKeyword(fn.apply(new ConstantKeywordProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> dateNanos(DateNanosProperty v) {
-			this._kind = Kind.DateNanos;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> dateNanos(
-				Function<DateNanosProperty.Builder, ObjectBuilder<DateNanosProperty>> fn) {
-			return this.dateNanos(fn.apply(new DateNanosProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> date(DateProperty v) {
-			this._kind = Kind.Date;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> date(Function<DateProperty.Builder, ObjectBuilder<DateProperty>> fn) {
-			return this.date(fn.apply(new DateProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> dateRange(DateRangeProperty v) {
-			this._kind = Kind.DateRange;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> dateRange(
-				Function<DateRangeProperty.Builder, ObjectBuilder<DateRangeProperty>> fn) {
-			return this.dateRange(fn.apply(new DateRangeProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> double_(DoubleNumberProperty v) {
-			this._kind = Kind.Double;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> double_(
-				Function<DoubleNumberProperty.Builder, ObjectBuilder<DoubleNumberProperty>> fn) {
-			return this.double_(fn.apply(new DoubleNumberProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> doubleRange(DoubleRangeProperty v) {
-			this._kind = Kind.DoubleRange;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> doubleRange(
-				Function<DoubleRangeProperty.Builder, ObjectBuilder<DoubleRangeProperty>> fn) {
-			return this.doubleRange(fn.apply(new DoubleRangeProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> alias(FieldAliasProperty v) {
-			this._kind = Kind.Alias;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> alias(
-				Function<FieldAliasProperty.Builder, ObjectBuilder<FieldAliasProperty>> fn) {
-			return this.alias(fn.apply(new FieldAliasProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> flattened(FlattenedProperty v) {
-			this._kind = Kind.Flattened;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> flattened(
-				Function<FlattenedProperty.Builder, ObjectBuilder<FlattenedProperty>> fn) {
-			return this.flattened(fn.apply(new FlattenedProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> float_(FloatNumberProperty v) {
-			this._kind = Kind.Float;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> float_(
-				Function<FloatNumberProperty.Builder, ObjectBuilder<FloatNumberProperty>> fn) {
-			return this.float_(fn.apply(new FloatNumberProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> floatRange(FloatRangeProperty v) {
-			this._kind = Kind.FloatRange;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> floatRange(
-				Function<FloatRangeProperty.Builder, ObjectBuilder<FloatRangeProperty>> fn) {
-			return this.floatRange(fn.apply(new FloatRangeProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> geoPoint(GeoPointProperty v) {
-			this._kind = Kind.GeoPoint;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> geoPoint(
-				Function<GeoPointProperty.Builder, ObjectBuilder<GeoPointProperty>> fn) {
-			return this.geoPoint(fn.apply(new GeoPointProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> geoShape(GeoShapeProperty v) {
-			this._kind = Kind.GeoShape;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> geoShape(
-				Function<GeoShapeProperty.Builder, ObjectBuilder<GeoShapeProperty>> fn) {
-			return this.geoShape(fn.apply(new GeoShapeProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> halfFloat(HalfFloatNumberProperty v) {
-			this._kind = Kind.HalfFloat;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> halfFloat(
-				Function<HalfFloatNumberProperty.Builder, ObjectBuilder<HalfFloatNumberProperty>> fn) {
-			return this.halfFloat(fn.apply(new HalfFloatNumberProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> histogram(HistogramProperty v) {
-			this._kind = Kind.Histogram;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> histogram(
-				Function<HistogramProperty.Builder, ObjectBuilder<HistogramProperty>> fn) {
-			return this.histogram(fn.apply(new HistogramProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> integer(IntegerNumberProperty v) {
-			this._kind = Kind.Integer;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> integer(
-				Function<IntegerNumberProperty.Builder, ObjectBuilder<IntegerNumberProperty>> fn) {
-			return this.integer(fn.apply(new IntegerNumberProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> integerRange(IntegerRangeProperty v) {
-			this._kind = Kind.IntegerRange;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> integerRange(
-				Function<IntegerRangeProperty.Builder, ObjectBuilder<IntegerRangeProperty>> fn) {
-			return this.integerRange(fn.apply(new IntegerRangeProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> ip(IpProperty v) {
-			this._kind = Kind.Ip;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> ip(Function<IpProperty.Builder, ObjectBuilder<IpProperty>> fn) {
-			return this.ip(fn.apply(new IpProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> ipRange(IpRangeProperty v) {
-			this._kind = Kind.IpRange;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> ipRange(Function<IpRangeProperty.Builder, ObjectBuilder<IpRangeProperty>> fn) {
-			return this.ipRange(fn.apply(new IpRangeProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> join(JoinProperty v) {
-			this._kind = Kind.Join;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> join(Function<JoinProperty.Builder, ObjectBuilder<JoinProperty>> fn) {
-			return this.join(fn.apply(new JoinProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> keyword(KeywordProperty v) {
-			this._kind = Kind.Keyword;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> keyword(Function<KeywordProperty.Builder, ObjectBuilder<KeywordProperty>> fn) {
-			return this.keyword(fn.apply(new KeywordProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> knnVector(KnnVectorProperty v) {
-			this._kind = Kind.KnnVector;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> knnVector(Function<KnnVectorProperty.Builder, ObjectBuilder<KnnVectorProperty>> fn) {
-			return this.knnVector(fn.apply(new KnnVectorProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> long_(LongNumberProperty v) {
-			this._kind = Kind.Long;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> long_(
-				Function<LongNumberProperty.Builder, ObjectBuilder<LongNumberProperty>> fn) {
-			return this.long_(fn.apply(new LongNumberProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> longRange(LongRangeProperty v) {
-			this._kind = Kind.LongRange;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> longRange(
-				Function<LongRangeProperty.Builder, ObjectBuilder<LongRangeProperty>> fn) {
-			return this.longRange(fn.apply(new LongRangeProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> murmur3(Murmur3HashProperty v) {
-			this._kind = Kind.Murmur3;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> murmur3(
-				Function<Murmur3HashProperty.Builder, ObjectBuilder<Murmur3HashProperty>> fn) {
-			return this.murmur3(fn.apply(new Murmur3HashProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> nested(NestedProperty v) {
-			this._kind = Kind.Nested;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> nested(Function<NestedProperty.Builder, ObjectBuilder<NestedProperty>> fn) {
-			return this.nested(fn.apply(new NestedProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> object(ObjectProperty v) {
-			this._kind = Kind.Object;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> object(Function<ObjectProperty.Builder, ObjectBuilder<ObjectProperty>> fn) {
-			return this.object(fn.apply(new ObjectProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> percolator(PercolatorProperty v) {
-			this._kind = Kind.Percolator;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> percolator(
-				Function<PercolatorProperty.Builder, ObjectBuilder<PercolatorProperty>> fn) {
-			return this.percolator(fn.apply(new PercolatorProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> point(PointProperty v) {
-			this._kind = Kind.Point;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> point(Function<PointProperty.Builder, ObjectBuilder<PointProperty>> fn) {
-			return this.point(fn.apply(new PointProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> rankFeature(RankFeatureProperty v) {
-			this._kind = Kind.RankFeature;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> rankFeature(
-				Function<RankFeatureProperty.Builder, ObjectBuilder<RankFeatureProperty>> fn) {
-			return this.rankFeature(fn.apply(new RankFeatureProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> rankFeatures(RankFeaturesProperty v) {
-			this._kind = Kind.RankFeatures;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> rankFeatures(
-				Function<RankFeaturesProperty.Builder, ObjectBuilder<RankFeaturesProperty>> fn) {
-			return this.rankFeatures(fn.apply(new RankFeaturesProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> scaledFloat(ScaledFloatNumberProperty v) {
-			this._kind = Kind.ScaledFloat;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> scaledFloat(
-				Function<ScaledFloatNumberProperty.Builder, ObjectBuilder<ScaledFloatNumberProperty>> fn) {
-			return this.scaledFloat(fn.apply(new ScaledFloatNumberProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> searchAsYouType(SearchAsYouTypeProperty v) {
-			this._kind = Kind.SearchAsYouType;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> searchAsYouType(
-				Function<SearchAsYouTypeProperty.Builder, ObjectBuilder<SearchAsYouTypeProperty>> fn) {
-			return this.searchAsYouType(fn.apply(new SearchAsYouTypeProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> shape(ShapeProperty v) {
-			this._kind = Kind.Shape;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> shape(Function<ShapeProperty.Builder, ObjectBuilder<ShapeProperty>> fn) {
-			return this.shape(fn.apply(new ShapeProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> short_(ShortNumberProperty v) {
-			this._kind = Kind.Short;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> short_(
-				Function<ShortNumberProperty.Builder, ObjectBuilder<ShortNumberProperty>> fn) {
-			return this.short_(fn.apply(new ShortNumberProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> text(TextProperty v) {
-			this._kind = Kind.Text;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> text(Function<TextProperty.Builder, ObjectBuilder<TextProperty>> fn) {
-			return this.text(fn.apply(new TextProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> tokenCount(TokenCountProperty v) {
-			this._kind = Kind.TokenCount;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> tokenCount(
-				Function<TokenCountProperty.Builder, ObjectBuilder<TokenCountProperty>> fn) {
-			return this.tokenCount(fn.apply(new TokenCountProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> unsignedLong(UnsignedLongNumberProperty v) {
-			this._kind = Kind.UnsignedLong;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> unsignedLong(
-				Function<UnsignedLongNumberProperty.Builder, ObjectBuilder<UnsignedLongNumberProperty>> fn) {
-			return this.unsignedLong(fn.apply(new UnsignedLongNumberProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> version(VersionProperty v) {
-			this._kind = Kind.Version;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> version(Function<VersionProperty.Builder, ObjectBuilder<VersionProperty>> fn) {
-			return this.version(fn.apply(new VersionProperty.Builder()).build());
-		}
-
-		public ObjectBuilder<Property> wildcard(WildcardProperty v) {
-			this._kind = Kind.Wildcard;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Property> wildcard(
-				Function<WildcardProperty.Builder, ObjectBuilder<WildcardProperty>> fn) {
-			return this.wildcard(fn.apply(new WildcardProperty.Builder()).build());
-		}
-
-		public Property build() {
-			_checkSingleUse();
-			return new Property(this);
-		}
-
-	}
-
-	protected static void setupPropertyDeserializer(ObjectDeserializer<Builder> op) {
-
-		op.add(Builder::aggregateMetricDouble, AggregateMetricDoubleProperty._DESERIALIZER, "aggregate_metric_double");
-		op.add(Builder::binary, BinaryProperty._DESERIALIZER, "binary");
-		op.add(Builder::boolean_, BooleanProperty._DESERIALIZER, "boolean");
-		op.add(Builder::byte_, ByteNumberProperty._DESERIALIZER, "byte");
-		op.add(Builder::completion, CompletionProperty._DESERIALIZER, "completion");
-		op.add(Builder::constantKeyword, ConstantKeywordProperty._DESERIALIZER, "constant_keyword");
-		op.add(Builder::dateNanos, DateNanosProperty._DESERIALIZER, "date_nanos");
-		op.add(Builder::date, DateProperty._DESERIALIZER, "date");
-		op.add(Builder::dateRange, DateRangeProperty._DESERIALIZER, "date_range");
-		op.add(Builder::double_, DoubleNumberProperty._DESERIALIZER, "double");
-		op.add(Builder::doubleRange, DoubleRangeProperty._DESERIALIZER, "double_range");
-		op.add(Builder::alias, FieldAliasProperty._DESERIALIZER, "alias");
-		op.add(Builder::flattened, FlattenedProperty._DESERIALIZER, "flattened");
-		op.add(Builder::float_, FloatNumberProperty._DESERIALIZER, "float");
-		op.add(Builder::floatRange, FloatRangeProperty._DESERIALIZER, "float_range");
-		op.add(Builder::geoPoint, GeoPointProperty._DESERIALIZER, "geo_point");
-		op.add(Builder::geoShape, GeoShapeProperty._DESERIALIZER, "geo_shape");
-		op.add(Builder::halfFloat, HalfFloatNumberProperty._DESERIALIZER, "half_float");
-		op.add(Builder::histogram, HistogramProperty._DESERIALIZER, "histogram");
-		op.add(Builder::integer, IntegerNumberProperty._DESERIALIZER, "integer");
-		op.add(Builder::integerRange, IntegerRangeProperty._DESERIALIZER, "integer_range");
-		op.add(Builder::ip, IpProperty._DESERIALIZER, "ip");
-		op.add(Builder::ipRange, IpRangeProperty._DESERIALIZER, "ip_range");
-		op.add(Builder::join, JoinProperty._DESERIALIZER, "join");
-		op.add(Builder::keyword, KeywordProperty._DESERIALIZER, "keyword");
-		op.add(Builder::knnVector, KnnVectorProperty._DESERIALIZER, "knn_vector");
-		op.add(Builder::long_, LongNumberProperty._DESERIALIZER, "long");
-		op.add(Builder::longRange, LongRangeProperty._DESERIALIZER, "long_range");
-		op.add(Builder::murmur3, Murmur3HashProperty._DESERIALIZER, "murmur3");
-		op.add(Builder::nested, NestedProperty._DESERIALIZER, "nested");
-		op.add(Builder::object, ObjectProperty._DESERIALIZER, "object");
-		op.add(Builder::percolator, PercolatorProperty._DESERIALIZER, "percolator");
-		op.add(Builder::point, PointProperty._DESERIALIZER, "point");
-		op.add(Builder::rankFeature, RankFeatureProperty._DESERIALIZER, "rank_feature");
-		op.add(Builder::rankFeatures, RankFeaturesProperty._DESERIALIZER, "rank_features");
-		op.add(Builder::scaledFloat, ScaledFloatNumberProperty._DESERIALIZER, "scaled_float");
-		op.add(Builder::searchAsYouType, SearchAsYouTypeProperty._DESERIALIZER, "search_as_you_type");
-		op.add(Builder::shape, ShapeProperty._DESERIALIZER, "shape");
-		op.add(Builder::short_, ShortNumberProperty._DESERIALIZER, "short");
-		op.add(Builder::text, TextProperty._DESERIALIZER, "text");
-		op.add(Builder::tokenCount, TokenCountProperty._DESERIALIZER, "token_count");
-		op.add(Builder::unsignedLong, UnsignedLongNumberProperty._DESERIALIZER, "unsigned_long");
-		op.add(Builder::version, VersionProperty._DESERIALIZER, "version");
-		op.add(Builder::wildcard, WildcardProperty._DESERIALIZER, "wildcard");
-
-		op.setTypeProperty("type", "object");
-
-	}
-
-	public static final JsonpDeserializer<Property> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Property::setupPropertyDeserializer, Builder::build);
+    /**
+     * Get the {@code aggregate_metric_double} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the
+     *             {@code aggregate_metric_double} kind.
+     */
+    public AggregateMetricDoubleProperty aggregateMetricDouble() {
+        return TaggedUnionUtils.get(this, Kind.AggregateMetricDouble);
+    }
+
+    /**
+     * Is this variant instance of kind {@code binary}?
+     */
+    public boolean isBinary() {
+        return _kind == Kind.Binary;
+    }
+
+    /**
+     * Get the {@code binary} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code binary} kind.
+     */
+    public BinaryProperty binary() {
+        return TaggedUnionUtils.get(this, Kind.Binary);
+    }
+
+    /**
+     * Is this variant instance of kind {@code boolean}?
+     */
+    public boolean isBoolean() {
+        return _kind == Kind.Boolean;
+    }
+
+    /**
+     * Get the {@code boolean} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code boolean} kind.
+     */
+    public BooleanProperty boolean_() {
+        return TaggedUnionUtils.get(this, Kind.Boolean);
+    }
+
+    /**
+     * Is this variant instance of kind {@code byte}?
+     */
+    public boolean isByte() {
+        return _kind == Kind.Byte;
+    }
+
+    /**
+     * Get the {@code byte} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code byte} kind.
+     */
+    public ByteNumberProperty byte_() {
+        return TaggedUnionUtils.get(this, Kind.Byte);
+    }
+
+    /**
+     * Is this variant instance of kind {@code completion}?
+     */
+    public boolean isCompletion() {
+        return _kind == Kind.Completion;
+    }
+
+    /**
+     * Get the {@code completion} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code completion} kind.
+     */
+    public CompletionProperty completion() {
+        return TaggedUnionUtils.get(this, Kind.Completion);
+    }
+
+    /**
+     * Is this variant instance of kind {@code constant_keyword}?
+     */
+    public boolean isConstantKeyword() {
+        return _kind == Kind.ConstantKeyword;
+    }
+
+    /**
+     * Get the {@code constant_keyword} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code constant_keyword}
+     *             kind.
+     */
+    public ConstantKeywordProperty constantKeyword() {
+        return TaggedUnionUtils.get(this, Kind.ConstantKeyword);
+    }
+
+    /**
+     * Is this variant instance of kind {@code date_nanos}?
+     */
+    public boolean isDateNanos() {
+        return _kind == Kind.DateNanos;
+    }
+
+    /**
+     * Get the {@code date_nanos} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code date_nanos} kind.
+     */
+    public DateNanosProperty dateNanos() {
+        return TaggedUnionUtils.get(this, Kind.DateNanos);
+    }
+
+    /**
+     * Is this variant instance of kind {@code date}?
+     */
+    public boolean isDate() {
+        return _kind == Kind.Date;
+    }
+
+    /**
+     * Get the {@code date} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code date} kind.
+     */
+    public DateProperty date() {
+        return TaggedUnionUtils.get(this, Kind.Date);
+    }
+
+    /**
+     * Is this variant instance of kind {@code date_range}?
+     */
+    public boolean isDateRange() {
+        return _kind == Kind.DateRange;
+    }
+
+    /**
+     * Get the {@code date_range} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code date_range} kind.
+     */
+    public DateRangeProperty dateRange() {
+        return TaggedUnionUtils.get(this, Kind.DateRange);
+    }
+
+    /**
+     * Is this variant instance of kind {@code double}?
+     */
+    public boolean isDouble() {
+        return _kind == Kind.Double;
+    }
+
+    /**
+     * Get the {@code double} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code double} kind.
+     */
+    public DoubleNumberProperty double_() {
+        return TaggedUnionUtils.get(this, Kind.Double);
+    }
+
+    /**
+     * Is this variant instance of kind {@code double_range}?
+     */
+    public boolean isDoubleRange() {
+        return _kind == Kind.DoubleRange;
+    }
+
+    /**
+     * Get the {@code double_range} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code double_range} kind.
+     */
+    public DoubleRangeProperty doubleRange() {
+        return TaggedUnionUtils.get(this, Kind.DoubleRange);
+    }
+
+    /**
+     * Is this variant instance of kind {@code alias}?
+     */
+    public boolean isAlias() {
+        return _kind == Kind.Alias;
+    }
+
+    /**
+     * Get the {@code alias} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code alias} kind.
+     */
+    public FieldAliasProperty alias() {
+        return TaggedUnionUtils.get(this, Kind.Alias);
+    }
+
+    /**
+     * Is this variant instance of kind {@code flattened}?
+     */
+    public boolean isFlattened() {
+        return _kind == Kind.Flattened;
+    }
+
+    /**
+     * Get the {@code flattened} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code flattened} kind.
+     */
+    public FlattenedProperty flattened() {
+        return TaggedUnionUtils.get(this, Kind.Flattened);
+    }
+
+    /**
+     * Is this variant instance of kind {@code float}?
+     */
+    public boolean isFloat() {
+        return _kind == Kind.Float;
+    }
+
+    /**
+     * Get the {@code float} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code float} kind.
+     */
+    public FloatNumberProperty float_() {
+        return TaggedUnionUtils.get(this, Kind.Float);
+    }
+
+    /**
+     * Is this variant instance of kind {@code float_range}?
+     */
+    public boolean isFloatRange() {
+        return _kind == Kind.FloatRange;
+    }
+
+    /**
+     * Get the {@code float_range} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code float_range} kind.
+     */
+    public FloatRangeProperty floatRange() {
+        return TaggedUnionUtils.get(this, Kind.FloatRange);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geo_point}?
+     */
+    public boolean isGeoPoint() {
+        return _kind == Kind.GeoPoint;
+    }
+
+    /**
+     * Get the {@code geo_point} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geo_point} kind.
+     */
+    public GeoPointProperty geoPoint() {
+        return TaggedUnionUtils.get(this, Kind.GeoPoint);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geo_shape}?
+     */
+    public boolean isGeoShape() {
+        return _kind == Kind.GeoShape;
+    }
+
+    /**
+     * Get the {@code geo_shape} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geo_shape} kind.
+     */
+    public GeoShapeProperty geoShape() {
+        return TaggedUnionUtils.get(this, Kind.GeoShape);
+    }
+
+    /**
+     * Is this variant instance of kind {@code half_float}?
+     */
+    public boolean isHalfFloat() {
+        return _kind == Kind.HalfFloat;
+    }
+
+    /**
+     * Get the {@code half_float} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code half_float} kind.
+     */
+    public HalfFloatNumberProperty halfFloat() {
+        return TaggedUnionUtils.get(this, Kind.HalfFloat);
+    }
+
+    /**
+     * Is this variant instance of kind {@code histogram}?
+     */
+    public boolean isHistogram() {
+        return _kind == Kind.Histogram;
+    }
+
+    /**
+     * Get the {@code histogram} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code histogram} kind.
+     */
+    public HistogramProperty histogram() {
+        return TaggedUnionUtils.get(this, Kind.Histogram);
+    }
+
+    /**
+     * Is this variant instance of kind {@code integer}?
+     */
+    public boolean isInteger() {
+        return _kind == Kind.Integer;
+    }
+
+    /**
+     * Get the {@code integer} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code integer} kind.
+     */
+    public IntegerNumberProperty integer() {
+        return TaggedUnionUtils.get(this, Kind.Integer);
+    }
+
+    /**
+     * Is this variant instance of kind {@code integer_range}?
+     */
+    public boolean isIntegerRange() {
+        return _kind == Kind.IntegerRange;
+    }
+
+    /**
+     * Get the {@code integer_range} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code integer_range} kind.
+     */
+    public IntegerRangeProperty integerRange() {
+        return TaggedUnionUtils.get(this, Kind.IntegerRange);
+    }
+
+    /**
+     * Is this variant instance of kind {@code ip}?
+     */
+    public boolean isIp() {
+        return _kind == Kind.Ip;
+    }
+
+    /**
+     * Get the {@code ip} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code ip} kind.
+     */
+    public IpProperty ip() {
+        return TaggedUnionUtils.get(this, Kind.Ip);
+    }
+
+    /**
+     * Is this variant instance of kind {@code ip_range}?
+     */
+    public boolean isIpRange() {
+        return _kind == Kind.IpRange;
+    }
+
+    /**
+     * Get the {@code ip_range} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code ip_range} kind.
+     */
+    public IpRangeProperty ipRange() {
+        return TaggedUnionUtils.get(this, Kind.IpRange);
+    }
+
+    /**
+     * Is this variant instance of kind {@code join}?
+     */
+    public boolean isJoin() {
+        return _kind == Kind.Join;
+    }
+
+    /**
+     * Get the {@code join} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code join} kind.
+     */
+    public JoinProperty join() {
+        return TaggedUnionUtils.get(this, Kind.Join);
+    }
+
+    /**
+     * Is this variant instance of kind {@code keyword}?
+     */
+    public boolean isKeyword() {
+        return _kind == Kind.Keyword;
+    }
+
+    /**
+     * Get the {@code keyword} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code keyword} kind.
+     */
+    public KeywordProperty keyword() {
+        return TaggedUnionUtils.get(this, Kind.Keyword);
+    }
+
+    /**
+     * Is this variant instance of kind {@code knn_vector}?
+     */
+    public boolean isKnnVector() {
+        return _kind == Kind.KnnVector;
+    }
+
+    /**
+     * Get the {@code knn_vector} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code knn_vector} kind.
+     */
+    public KnnVectorProperty knnVector() {
+        return TaggedUnionUtils.get(this, Kind.KnnVector);
+    }
+
+    /**
+     * Is this variant instance of kind {@code long}?
+     */
+    public boolean isLong() {
+        return _kind == Kind.Long;
+    }
+
+    /**
+     * Get the {@code long} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code long} kind.
+     */
+    public LongNumberProperty long_() {
+        return TaggedUnionUtils.get(this, Kind.Long);
+    }
+
+    /**
+     * Is this variant instance of kind {@code long_range}?
+     */
+    public boolean isLongRange() {
+        return _kind == Kind.LongRange;
+    }
+
+    /**
+     * Get the {@code long_range} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code long_range} kind.
+     */
+    public LongRangeProperty longRange() {
+        return TaggedUnionUtils.get(this, Kind.LongRange);
+    }
+
+    /**
+     * Is this variant instance of kind {@code murmur3}?
+     */
+    public boolean isMurmur3() {
+        return _kind == Kind.Murmur3;
+    }
+
+    /**
+     * Get the {@code murmur3} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code murmur3} kind.
+     */
+    public Murmur3HashProperty murmur3() {
+        return TaggedUnionUtils.get(this, Kind.Murmur3);
+    }
+
+    /**
+     * Is this variant instance of kind {@code nested}?
+     */
+    public boolean isNested() {
+        return _kind == Kind.Nested;
+    }
+
+    /**
+     * Get the {@code nested} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code nested} kind.
+     */
+    public NestedProperty nested() {
+        return TaggedUnionUtils.get(this, Kind.Nested);
+    }
+
+    /**
+     * Is this variant instance of kind {@code object}?
+     */
+    public boolean isObject() {
+        return _kind == Kind.Object;
+    }
+
+    /**
+     * Get the {@code object} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code object} kind.
+     */
+    public ObjectProperty object() {
+        return TaggedUnionUtils.get(this, Kind.Object);
+    }
+
+    /**
+     * Is this variant instance of kind {@code percolator}?
+     */
+    public boolean isPercolator() {
+        return _kind == Kind.Percolator;
+    }
+
+    /**
+     * Get the {@code percolator} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code percolator} kind.
+     */
+    public PercolatorProperty percolator() {
+        return TaggedUnionUtils.get(this, Kind.Percolator);
+    }
+
+    /**
+     * Is this variant instance of kind {@code point}?
+     */
+    public boolean isPoint() {
+        return _kind == Kind.Point;
+    }
+
+    /**
+     * Get the {@code point} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code point} kind.
+     */
+    public PointProperty point() {
+        return TaggedUnionUtils.get(this, Kind.Point);
+    }
+
+    /**
+     * Is this variant instance of kind {@code rank_feature}?
+     */
+    public boolean isRankFeature() {
+        return _kind == Kind.RankFeature;
+    }
+
+    /**
+     * Get the {@code rank_feature} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code rank_feature} kind.
+     */
+    public RankFeatureProperty rankFeature() {
+        return TaggedUnionUtils.get(this, Kind.RankFeature);
+    }
+
+    /**
+     * Is this variant instance of kind {@code rank_features}?
+     */
+    public boolean isRankFeatures() {
+        return _kind == Kind.RankFeatures;
+    }
+
+    /**
+     * Get the {@code rank_features} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code rank_features} kind.
+     */
+    public RankFeaturesProperty rankFeatures() {
+        return TaggedUnionUtils.get(this, Kind.RankFeatures);
+    }
+
+    /**
+     * Is this variant instance of kind {@code scaled_float}?
+     */
+    public boolean isScaledFloat() {
+        return _kind == Kind.ScaledFloat;
+    }
+
+    /**
+     * Get the {@code scaled_float} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code scaled_float} kind.
+     */
+    public ScaledFloatNumberProperty scaledFloat() {
+        return TaggedUnionUtils.get(this, Kind.ScaledFloat);
+    }
+
+    /**
+     * Is this variant instance of kind {@code search_as_you_type}?
+     */
+    public boolean isSearchAsYouType() {
+        return _kind == Kind.SearchAsYouType;
+    }
+
+    /**
+     * Get the {@code search_as_you_type} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code search_as_you_type}
+     *             kind.
+     */
+    public SearchAsYouTypeProperty searchAsYouType() {
+        return TaggedUnionUtils.get(this, Kind.SearchAsYouType);
+    }
+
+    /**
+     * Is this variant instance of kind {@code shape}?
+     */
+    public boolean isShape() {
+        return _kind == Kind.Shape;
+    }
+
+    /**
+     * Get the {@code shape} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code shape} kind.
+     */
+    public ShapeProperty shape() {
+        return TaggedUnionUtils.get(this, Kind.Shape);
+    }
+
+    /**
+     * Is this variant instance of kind {@code short}?
+     */
+    public boolean isShort() {
+        return _kind == Kind.Short;
+    }
+
+    /**
+     * Get the {@code short} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code short} kind.
+     */
+    public ShortNumberProperty short_() {
+        return TaggedUnionUtils.get(this, Kind.Short);
+    }
+
+    /**
+     * Is this variant instance of kind {@code text}?
+     */
+    public boolean isText() {
+        return _kind == Kind.Text;
+    }
+
+    /**
+     * Get the {@code text} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code text} kind.
+     */
+    public TextProperty text() {
+        return TaggedUnionUtils.get(this, Kind.Text);
+    }
+
+    /**
+     * Is this variant instance of kind {@code token_count}?
+     */
+    public boolean isTokenCount() {
+        return _kind == Kind.TokenCount;
+    }
+
+    /**
+     * Get the {@code token_count} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code token_count} kind.
+     */
+    public TokenCountProperty tokenCount() {
+        return TaggedUnionUtils.get(this, Kind.TokenCount);
+    }
+
+    /**
+     * Is this variant instance of kind {@code unsigned_long}?
+     */
+    public boolean isUnsignedLong() {
+        return _kind == Kind.UnsignedLong;
+    }
+
+    /**
+     * Get the {@code unsigned_long} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code unsigned_long} kind.
+     */
+    public UnsignedLongNumberProperty unsignedLong() {
+        return TaggedUnionUtils.get(this, Kind.UnsignedLong);
+    }
+
+    /**
+     * Is this variant instance of kind {@code version}?
+     */
+    public boolean isVersion() {
+        return _kind == Kind.Version;
+    }
+
+    /**
+     * Get the {@code version} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code version} kind.
+     */
+    public VersionProperty version() {
+        return TaggedUnionUtils.get(this, Kind.Version);
+    }
+
+    /**
+     * Is this variant instance of kind {@code wildcard}?
+     */
+    public boolean isWildcard() {
+        return _kind == Kind.Wildcard;
+    }
+
+    /**
+     * Get the {@code wildcard} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code wildcard} kind.
+     */
+    public WildcardProperty wildcard() {
+        return TaggedUnionUtils.get(this, Kind.Wildcard);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        mapper.serialize(_value, generator);
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Property> {
+        private Kind _kind;
+        private PropertyVariant _value;
+
+        public ObjectBuilder<Property> aggregateMetricDouble(AggregateMetricDoubleProperty v) {
+            this._kind = Kind.AggregateMetricDouble;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> aggregateMetricDouble(
+            Function<AggregateMetricDoubleProperty.Builder, ObjectBuilder<AggregateMetricDoubleProperty>> fn
+        ) {
+            return this.aggregateMetricDouble(fn.apply(new AggregateMetricDoubleProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> binary(BinaryProperty v) {
+            this._kind = Kind.Binary;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> binary(Function<BinaryProperty.Builder, ObjectBuilder<BinaryProperty>> fn) {
+            return this.binary(fn.apply(new BinaryProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> boolean_(BooleanProperty v) {
+            this._kind = Kind.Boolean;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> boolean_(Function<BooleanProperty.Builder, ObjectBuilder<BooleanProperty>> fn) {
+            return this.boolean_(fn.apply(new BooleanProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> byte_(ByteNumberProperty v) {
+            this._kind = Kind.Byte;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> byte_(Function<ByteNumberProperty.Builder, ObjectBuilder<ByteNumberProperty>> fn) {
+            return this.byte_(fn.apply(new ByteNumberProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> completion(CompletionProperty v) {
+            this._kind = Kind.Completion;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> completion(Function<CompletionProperty.Builder, ObjectBuilder<CompletionProperty>> fn) {
+            return this.completion(fn.apply(new CompletionProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> constantKeyword(ConstantKeywordProperty v) {
+            this._kind = Kind.ConstantKeyword;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> constantKeyword(
+            Function<ConstantKeywordProperty.Builder, ObjectBuilder<ConstantKeywordProperty>> fn
+        ) {
+            return this.constantKeyword(fn.apply(new ConstantKeywordProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> dateNanos(DateNanosProperty v) {
+            this._kind = Kind.DateNanos;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> dateNanos(Function<DateNanosProperty.Builder, ObjectBuilder<DateNanosProperty>> fn) {
+            return this.dateNanos(fn.apply(new DateNanosProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> date(DateProperty v) {
+            this._kind = Kind.Date;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> date(Function<DateProperty.Builder, ObjectBuilder<DateProperty>> fn) {
+            return this.date(fn.apply(new DateProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> dateRange(DateRangeProperty v) {
+            this._kind = Kind.DateRange;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> dateRange(Function<DateRangeProperty.Builder, ObjectBuilder<DateRangeProperty>> fn) {
+            return this.dateRange(fn.apply(new DateRangeProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> double_(DoubleNumberProperty v) {
+            this._kind = Kind.Double;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> double_(Function<DoubleNumberProperty.Builder, ObjectBuilder<DoubleNumberProperty>> fn) {
+            return this.double_(fn.apply(new DoubleNumberProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> doubleRange(DoubleRangeProperty v) {
+            this._kind = Kind.DoubleRange;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> doubleRange(Function<DoubleRangeProperty.Builder, ObjectBuilder<DoubleRangeProperty>> fn) {
+            return this.doubleRange(fn.apply(new DoubleRangeProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> alias(FieldAliasProperty v) {
+            this._kind = Kind.Alias;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> alias(Function<FieldAliasProperty.Builder, ObjectBuilder<FieldAliasProperty>> fn) {
+            return this.alias(fn.apply(new FieldAliasProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> flattened(FlattenedProperty v) {
+            this._kind = Kind.Flattened;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> flattened(Function<FlattenedProperty.Builder, ObjectBuilder<FlattenedProperty>> fn) {
+            return this.flattened(fn.apply(new FlattenedProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> float_(FloatNumberProperty v) {
+            this._kind = Kind.Float;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> float_(Function<FloatNumberProperty.Builder, ObjectBuilder<FloatNumberProperty>> fn) {
+            return this.float_(fn.apply(new FloatNumberProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> floatRange(FloatRangeProperty v) {
+            this._kind = Kind.FloatRange;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> floatRange(Function<FloatRangeProperty.Builder, ObjectBuilder<FloatRangeProperty>> fn) {
+            return this.floatRange(fn.apply(new FloatRangeProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> geoPoint(GeoPointProperty v) {
+            this._kind = Kind.GeoPoint;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> geoPoint(Function<GeoPointProperty.Builder, ObjectBuilder<GeoPointProperty>> fn) {
+            return this.geoPoint(fn.apply(new GeoPointProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> geoShape(GeoShapeProperty v) {
+            this._kind = Kind.GeoShape;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> geoShape(Function<GeoShapeProperty.Builder, ObjectBuilder<GeoShapeProperty>> fn) {
+            return this.geoShape(fn.apply(new GeoShapeProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> halfFloat(HalfFloatNumberProperty v) {
+            this._kind = Kind.HalfFloat;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> halfFloat(Function<HalfFloatNumberProperty.Builder, ObjectBuilder<HalfFloatNumberProperty>> fn) {
+            return this.halfFloat(fn.apply(new HalfFloatNumberProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> histogram(HistogramProperty v) {
+            this._kind = Kind.Histogram;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> histogram(Function<HistogramProperty.Builder, ObjectBuilder<HistogramProperty>> fn) {
+            return this.histogram(fn.apply(new HistogramProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> integer(IntegerNumberProperty v) {
+            this._kind = Kind.Integer;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> integer(Function<IntegerNumberProperty.Builder, ObjectBuilder<IntegerNumberProperty>> fn) {
+            return this.integer(fn.apply(new IntegerNumberProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> integerRange(IntegerRangeProperty v) {
+            this._kind = Kind.IntegerRange;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> integerRange(Function<IntegerRangeProperty.Builder, ObjectBuilder<IntegerRangeProperty>> fn) {
+            return this.integerRange(fn.apply(new IntegerRangeProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> ip(IpProperty v) {
+            this._kind = Kind.Ip;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> ip(Function<IpProperty.Builder, ObjectBuilder<IpProperty>> fn) {
+            return this.ip(fn.apply(new IpProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> ipRange(IpRangeProperty v) {
+            this._kind = Kind.IpRange;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> ipRange(Function<IpRangeProperty.Builder, ObjectBuilder<IpRangeProperty>> fn) {
+            return this.ipRange(fn.apply(new IpRangeProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> join(JoinProperty v) {
+            this._kind = Kind.Join;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> join(Function<JoinProperty.Builder, ObjectBuilder<JoinProperty>> fn) {
+            return this.join(fn.apply(new JoinProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> keyword(KeywordProperty v) {
+            this._kind = Kind.Keyword;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> keyword(Function<KeywordProperty.Builder, ObjectBuilder<KeywordProperty>> fn) {
+            return this.keyword(fn.apply(new KeywordProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> knnVector(KnnVectorProperty v) {
+            this._kind = Kind.KnnVector;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> knnVector(Function<KnnVectorProperty.Builder, ObjectBuilder<KnnVectorProperty>> fn) {
+            return this.knnVector(fn.apply(new KnnVectorProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> long_(LongNumberProperty v) {
+            this._kind = Kind.Long;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> long_(Function<LongNumberProperty.Builder, ObjectBuilder<LongNumberProperty>> fn) {
+            return this.long_(fn.apply(new LongNumberProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> longRange(LongRangeProperty v) {
+            this._kind = Kind.LongRange;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> longRange(Function<LongRangeProperty.Builder, ObjectBuilder<LongRangeProperty>> fn) {
+            return this.longRange(fn.apply(new LongRangeProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> murmur3(Murmur3HashProperty v) {
+            this._kind = Kind.Murmur3;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> murmur3(Function<Murmur3HashProperty.Builder, ObjectBuilder<Murmur3HashProperty>> fn) {
+            return this.murmur3(fn.apply(new Murmur3HashProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> nested(NestedProperty v) {
+            this._kind = Kind.Nested;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> nested(Function<NestedProperty.Builder, ObjectBuilder<NestedProperty>> fn) {
+            return this.nested(fn.apply(new NestedProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> object(ObjectProperty v) {
+            this._kind = Kind.Object;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> object(Function<ObjectProperty.Builder, ObjectBuilder<ObjectProperty>> fn) {
+            return this.object(fn.apply(new ObjectProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> percolator(PercolatorProperty v) {
+            this._kind = Kind.Percolator;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> percolator(Function<PercolatorProperty.Builder, ObjectBuilder<PercolatorProperty>> fn) {
+            return this.percolator(fn.apply(new PercolatorProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> point(PointProperty v) {
+            this._kind = Kind.Point;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> point(Function<PointProperty.Builder, ObjectBuilder<PointProperty>> fn) {
+            return this.point(fn.apply(new PointProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> rankFeature(RankFeatureProperty v) {
+            this._kind = Kind.RankFeature;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> rankFeature(Function<RankFeatureProperty.Builder, ObjectBuilder<RankFeatureProperty>> fn) {
+            return this.rankFeature(fn.apply(new RankFeatureProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> rankFeatures(RankFeaturesProperty v) {
+            this._kind = Kind.RankFeatures;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> rankFeatures(Function<RankFeaturesProperty.Builder, ObjectBuilder<RankFeaturesProperty>> fn) {
+            return this.rankFeatures(fn.apply(new RankFeaturesProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> scaledFloat(ScaledFloatNumberProperty v) {
+            this._kind = Kind.ScaledFloat;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> scaledFloat(
+            Function<ScaledFloatNumberProperty.Builder, ObjectBuilder<ScaledFloatNumberProperty>> fn
+        ) {
+            return this.scaledFloat(fn.apply(new ScaledFloatNumberProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> searchAsYouType(SearchAsYouTypeProperty v) {
+            this._kind = Kind.SearchAsYouType;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> searchAsYouType(
+            Function<SearchAsYouTypeProperty.Builder, ObjectBuilder<SearchAsYouTypeProperty>> fn
+        ) {
+            return this.searchAsYouType(fn.apply(new SearchAsYouTypeProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> shape(ShapeProperty v) {
+            this._kind = Kind.Shape;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> shape(Function<ShapeProperty.Builder, ObjectBuilder<ShapeProperty>> fn) {
+            return this.shape(fn.apply(new ShapeProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> short_(ShortNumberProperty v) {
+            this._kind = Kind.Short;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> short_(Function<ShortNumberProperty.Builder, ObjectBuilder<ShortNumberProperty>> fn) {
+            return this.short_(fn.apply(new ShortNumberProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> text(TextProperty v) {
+            this._kind = Kind.Text;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> text(Function<TextProperty.Builder, ObjectBuilder<TextProperty>> fn) {
+            return this.text(fn.apply(new TextProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> tokenCount(TokenCountProperty v) {
+            this._kind = Kind.TokenCount;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> tokenCount(Function<TokenCountProperty.Builder, ObjectBuilder<TokenCountProperty>> fn) {
+            return this.tokenCount(fn.apply(new TokenCountProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> unsignedLong(UnsignedLongNumberProperty v) {
+            this._kind = Kind.UnsignedLong;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> unsignedLong(
+            Function<UnsignedLongNumberProperty.Builder, ObjectBuilder<UnsignedLongNumberProperty>> fn
+        ) {
+            return this.unsignedLong(fn.apply(new UnsignedLongNumberProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> version(VersionProperty v) {
+            this._kind = Kind.Version;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> version(Function<VersionProperty.Builder, ObjectBuilder<VersionProperty>> fn) {
+            return this.version(fn.apply(new VersionProperty.Builder()).build());
+        }
+
+        public ObjectBuilder<Property> wildcard(WildcardProperty v) {
+            this._kind = Kind.Wildcard;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Property> wildcard(Function<WildcardProperty.Builder, ObjectBuilder<WildcardProperty>> fn) {
+            return this.wildcard(fn.apply(new WildcardProperty.Builder()).build());
+        }
+
+        public Property build() {
+            _checkSingleUse();
+            return new Property(this);
+        }
+
+    }
+
+    protected static void setupPropertyDeserializer(ObjectDeserializer<Builder> op) {
+
+        op.add(Builder::aggregateMetricDouble, AggregateMetricDoubleProperty._DESERIALIZER, "aggregate_metric_double");
+        op.add(Builder::binary, BinaryProperty._DESERIALIZER, "binary");
+        op.add(Builder::boolean_, BooleanProperty._DESERIALIZER, "boolean");
+        op.add(Builder::byte_, ByteNumberProperty._DESERIALIZER, "byte");
+        op.add(Builder::completion, CompletionProperty._DESERIALIZER, "completion");
+        op.add(Builder::constantKeyword, ConstantKeywordProperty._DESERIALIZER, "constant_keyword");
+        op.add(Builder::dateNanos, DateNanosProperty._DESERIALIZER, "date_nanos");
+        op.add(Builder::date, DateProperty._DESERIALIZER, "date");
+        op.add(Builder::dateRange, DateRangeProperty._DESERIALIZER, "date_range");
+        op.add(Builder::double_, DoubleNumberProperty._DESERIALIZER, "double");
+        op.add(Builder::doubleRange, DoubleRangeProperty._DESERIALIZER, "double_range");
+        op.add(Builder::alias, FieldAliasProperty._DESERIALIZER, "alias");
+        op.add(Builder::flattened, FlattenedProperty._DESERIALIZER, "flattened");
+        op.add(Builder::float_, FloatNumberProperty._DESERIALIZER, "float");
+        op.add(Builder::floatRange, FloatRangeProperty._DESERIALIZER, "float_range");
+        op.add(Builder::geoPoint, GeoPointProperty._DESERIALIZER, "geo_point");
+        op.add(Builder::geoShape, GeoShapeProperty._DESERIALIZER, "geo_shape");
+        op.add(Builder::halfFloat, HalfFloatNumberProperty._DESERIALIZER, "half_float");
+        op.add(Builder::histogram, HistogramProperty._DESERIALIZER, "histogram");
+        op.add(Builder::integer, IntegerNumberProperty._DESERIALIZER, "integer");
+        op.add(Builder::integerRange, IntegerRangeProperty._DESERIALIZER, "integer_range");
+        op.add(Builder::ip, IpProperty._DESERIALIZER, "ip");
+        op.add(Builder::ipRange, IpRangeProperty._DESERIALIZER, "ip_range");
+        op.add(Builder::join, JoinProperty._DESERIALIZER, "join");
+        op.add(Builder::keyword, KeywordProperty._DESERIALIZER, "keyword");
+        op.add(Builder::knnVector, KnnVectorProperty._DESERIALIZER, "knn_vector");
+        op.add(Builder::long_, LongNumberProperty._DESERIALIZER, "long");
+        op.add(Builder::longRange, LongRangeProperty._DESERIALIZER, "long_range");
+        op.add(Builder::murmur3, Murmur3HashProperty._DESERIALIZER, "murmur3");
+        op.add(Builder::nested, NestedProperty._DESERIALIZER, "nested");
+        op.add(Builder::object, ObjectProperty._DESERIALIZER, "object");
+        op.add(Builder::percolator, PercolatorProperty._DESERIALIZER, "percolator");
+        op.add(Builder::point, PointProperty._DESERIALIZER, "point");
+        op.add(Builder::rankFeature, RankFeatureProperty._DESERIALIZER, "rank_feature");
+        op.add(Builder::rankFeatures, RankFeaturesProperty._DESERIALIZER, "rank_features");
+        op.add(Builder::scaledFloat, ScaledFloatNumberProperty._DESERIALIZER, "scaled_float");
+        op.add(Builder::searchAsYouType, SearchAsYouTypeProperty._DESERIALIZER, "search_as_you_type");
+        op.add(Builder::shape, ShapeProperty._DESERIALIZER, "shape");
+        op.add(Builder::short_, ShortNumberProperty._DESERIALIZER, "short");
+        op.add(Builder::text, TextProperty._DESERIALIZER, "text");
+        op.add(Builder::tokenCount, TokenCountProperty._DESERIALIZER, "token_count");
+        op.add(Builder::unsignedLong, UnsignedLongNumberProperty._DESERIALIZER, "unsigned_long");
+        op.add(Builder::version, VersionProperty._DESERIALIZER, "version");
+        op.add(Builder::wildcard, WildcardProperty._DESERIALIZER, "wildcard");
+
+        op.setTypeProperty("type", "object");
+
+    }
+
+    public static final JsonpDeserializer<Property> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Property::setupPropertyDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PropertyBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PropertyBase.java
index acab20535c..7995dc6137 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PropertyBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PropertyBase.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,336 +44,324 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.PropertyBase
 
-
-
 public abstract class PropertyBase implements JsonpSerializable {
-	private final Map<String, JsonData> localMetadata;
-
-	private final Map<String, String> meta;
-
-	@Nullable
-	private final String name;
-
-	private final Map<String, Property> properties;
-
-	@Nullable
-	private final Integer ignoreAbove;
-
-	@Nullable
-	private final DynamicMapping dynamic;
-
-	private final Map<String, Property> fields;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected PropertyBase(AbstractBuilder<?> builder) {
-
-		this.localMetadata = ApiTypeHelper.unmodifiable(builder.localMetadata);
-		this.meta = ApiTypeHelper.unmodifiable(builder.meta);
-		this.name = builder.name;
-		this.properties = ApiTypeHelper.unmodifiable(builder.properties);
-		this.ignoreAbove = builder.ignoreAbove;
-		this.dynamic = builder.dynamic;
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-
-	}
-
-	/**
-	 * API name: {@code local_metadata}
-	 */
-	public final Map<String, JsonData> localMetadata() {
-		return this.localMetadata;
-	}
-
-	/**
-	 * API name: {@code meta}
-	 */
-	public final Map<String, String> meta() {
-		return this.meta;
-	}
-
-	/**
-	 * API name: {@code name}
-	 */
-	@Nullable
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * API name: {@code properties}
-	 */
-	public final Map<String, Property> properties() {
-		return this.properties;
-	}
-
-	/**
-	 * API name: {@code ignore_above}
-	 */
-	@Nullable
-	public final Integer ignoreAbove() {
-		return this.ignoreAbove;
-	}
-
-	/**
-	 * API name: {@code dynamic}
-	 */
-	@Nullable
-	public final DynamicMapping dynamic() {
-		return this.dynamic;
-	}
-
-	/**
-	 * API name: {@code fields}
-	 */
-	public final Map<String, Property> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.localMetadata)) {
-			generator.writeKey("local_metadata");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.localMetadata.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.meta)) {
-			generator.writeKey("meta");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.meta.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.name != null) {
-			generator.writeKey("name");
-			generator.write(this.name);
-
-		}
-		if (ApiTypeHelper.isDefined(this.properties)) {
-			generator.writeKey("properties");
-			generator.writeStartObject();
-			for (Map.Entry<String, Property> item0 : this.properties.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.ignoreAbove != null) {
-			generator.writeKey("ignore_above");
-			generator.write(this.ignoreAbove);
-
-		}
-		if (this.dynamic != null) {
-			generator.writeKey("dynamic");
-			this.dynamic.serialize(generator, mapper);
-		}
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartObject();
-			for (Map.Entry<String, Property> item0 : this.fields.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		@Nullable
-		private Map<String, JsonData> localMetadata;
-
-		@Nullable
-		private Map<String, String> meta;
-
-		@Nullable
-		private String name;
-
-		@Nullable
-		private Map<String, Property> properties;
-
-		@Nullable
-		private Integer ignoreAbove;
-
-		@Nullable
-		private DynamicMapping dynamic;
-
-		@Nullable
-		private Map<String, Property> fields;
-
-		/**
-		 * API name: {@code local_metadata}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>localMetadata</code>.
-		 */
-		public final BuilderT localMetadata(Map<String, JsonData> map) {
-			this.localMetadata = _mapPutAll(this.localMetadata, map);
-			return self();
-		}
-
-		/**
-		 * API name: {@code local_metadata}
-		 * <p>
-		 * Adds an entry to <code>localMetadata</code>.
-		 */
-		public final BuilderT localMetadata(String key, JsonData value) {
-			this.localMetadata = _mapPut(this.localMetadata, key, value);
-			return self();
-		}
-
-		/**
-		 * API name: {@code meta}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>meta</code>.
-		 */
-		public final BuilderT meta(Map<String, String> map) {
-			this.meta = _mapPutAll(this.meta, map);
-			return self();
-		}
-
-		/**
-		 * API name: {@code meta}
-		 * <p>
-		 * Adds an entry to <code>meta</code>.
-		 */
-		public final BuilderT meta(String key, String value) {
-			this.meta = _mapPut(this.meta, key, value);
-			return self();
-		}
-
-		/**
-		 * API name: {@code name}
-		 */
-		public final BuilderT name(@Nullable String value) {
-			this.name = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code properties}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>properties</code>.
-		 */
-		public final BuilderT properties(Map<String, Property> map) {
-			this.properties = _mapPutAll(this.properties, map);
-			return self();
-		}
-
-		/**
-		 * API name: {@code properties}
-		 * <p>
-		 * Adds an entry to <code>properties</code>.
-		 */
-		public final BuilderT properties(String key, Property value) {
-			this.properties = _mapPut(this.properties, key, value);
-			return self();
-		}
-
-		/**
-		 * API name: {@code properties}
-		 * <p>
-		 * Adds an entry to <code>properties</code> using a builder lambda.
-		 */
-		public final BuilderT properties(String key, Function<Property.Builder, ObjectBuilder<Property>> fn) {
-			return properties(key, fn.apply(new Property.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code ignore_above}
-		 */
-		public final BuilderT ignoreAbove(@Nullable Integer value) {
-			this.ignoreAbove = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code dynamic}
-		 */
-		public final BuilderT dynamic(@Nullable DynamicMapping value) {
-			this.dynamic = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>fields</code>.
-		 */
-		public final BuilderT fields(Map<String, Property> map) {
-			this.fields = _mapPutAll(this.fields, map);
-			return self();
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds an entry to <code>fields</code>.
-		 */
-		public final BuilderT fields(String key, Property value) {
-			this.fields = _mapPut(this.fields, key, value);
-			return self();
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds an entry to <code>fields</code> using a builder lambda.
-		 */
-		public final BuilderT fields(String key, Function<Property.Builder, ObjectBuilder<Property>> fn) {
-			return fields(key, fn.apply(new Property.Builder()).build());
-		}
-
-		protected abstract BuilderT self();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupPropertyBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-
-		op.add(AbstractBuilder::localMetadata, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER),
-				"local_metadata");
-		op.add(AbstractBuilder::meta, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
-				"meta");
-		op.add(AbstractBuilder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(AbstractBuilder::properties, JsonpDeserializer.stringMapDeserializer(Property._DESERIALIZER),
-				"properties");
-		op.add(AbstractBuilder::ignoreAbove, JsonpDeserializer.integerDeserializer(), "ignore_above");
-		op.add(AbstractBuilder::dynamic, DynamicMapping._DESERIALIZER, "dynamic");
-		op.add(AbstractBuilder::fields, JsonpDeserializer.stringMapDeserializer(Property._DESERIALIZER), "fields");
-
-	}
+    private final Map<String, JsonData> localMetadata;
+
+    private final Map<String, String> meta;
+
+    @Nullable
+    private final String name;
+
+    private final Map<String, Property> properties;
+
+    @Nullable
+    private final Integer ignoreAbove;
+
+    @Nullable
+    private final DynamicMapping dynamic;
+
+    private final Map<String, Property> fields;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected PropertyBase(AbstractBuilder<?> builder) {
+
+        this.localMetadata = ApiTypeHelper.unmodifiable(builder.localMetadata);
+        this.meta = ApiTypeHelper.unmodifiable(builder.meta);
+        this.name = builder.name;
+        this.properties = ApiTypeHelper.unmodifiable(builder.properties);
+        this.ignoreAbove = builder.ignoreAbove;
+        this.dynamic = builder.dynamic;
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+
+    }
+
+    /**
+     * API name: {@code local_metadata}
+     */
+    public final Map<String, JsonData> localMetadata() {
+        return this.localMetadata;
+    }
+
+    /**
+     * API name: {@code meta}
+     */
+    public final Map<String, String> meta() {
+        return this.meta;
+    }
+
+    /**
+     * API name: {@code name}
+     */
+    @Nullable
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * API name: {@code properties}
+     */
+    public final Map<String, Property> properties() {
+        return this.properties;
+    }
+
+    /**
+     * API name: {@code ignore_above}
+     */
+    @Nullable
+    public final Integer ignoreAbove() {
+        return this.ignoreAbove;
+    }
+
+    /**
+     * API name: {@code dynamic}
+     */
+    @Nullable
+    public final DynamicMapping dynamic() {
+        return this.dynamic;
+    }
+
+    /**
+     * API name: {@code fields}
+     */
+    public final Map<String, Property> fields() {
+        return this.fields;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.localMetadata)) {
+            generator.writeKey("local_metadata");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.localMetadata.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.meta)) {
+            generator.writeKey("meta");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.meta.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.name != null) {
+            generator.writeKey("name");
+            generator.write(this.name);
+
+        }
+        if (ApiTypeHelper.isDefined(this.properties)) {
+            generator.writeKey("properties");
+            generator.writeStartObject();
+            for (Map.Entry<String, Property> item0 : this.properties.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.ignoreAbove != null) {
+            generator.writeKey("ignore_above");
+            generator.write(this.ignoreAbove);
+
+        }
+        if (this.dynamic != null) {
+            generator.writeKey("dynamic");
+            this.dynamic.serialize(generator, mapper);
+        }
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartObject();
+            for (Map.Entry<String, Property> item0 : this.fields.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        @Nullable
+        private Map<String, JsonData> localMetadata;
+
+        @Nullable
+        private Map<String, String> meta;
+
+        @Nullable
+        private String name;
+
+        @Nullable
+        private Map<String, Property> properties;
+
+        @Nullable
+        private Integer ignoreAbove;
+
+        @Nullable
+        private DynamicMapping dynamic;
+
+        @Nullable
+        private Map<String, Property> fields;
+
+        /**
+         * API name: {@code local_metadata}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>localMetadata</code>.
+         */
+        public final BuilderT localMetadata(Map<String, JsonData> map) {
+            this.localMetadata = _mapPutAll(this.localMetadata, map);
+            return self();
+        }
+
+        /**
+         * API name: {@code local_metadata}
+         * <p>
+         * Adds an entry to <code>localMetadata</code>.
+         */
+        public final BuilderT localMetadata(String key, JsonData value) {
+            this.localMetadata = _mapPut(this.localMetadata, key, value);
+            return self();
+        }
+
+        /**
+         * API name: {@code meta}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>meta</code>.
+         */
+        public final BuilderT meta(Map<String, String> map) {
+            this.meta = _mapPutAll(this.meta, map);
+            return self();
+        }
+
+        /**
+         * API name: {@code meta}
+         * <p>
+         * Adds an entry to <code>meta</code>.
+         */
+        public final BuilderT meta(String key, String value) {
+            this.meta = _mapPut(this.meta, key, value);
+            return self();
+        }
+
+        /**
+         * API name: {@code name}
+         */
+        public final BuilderT name(@Nullable String value) {
+            this.name = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code properties}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>properties</code>.
+         */
+        public final BuilderT properties(Map<String, Property> map) {
+            this.properties = _mapPutAll(this.properties, map);
+            return self();
+        }
+
+        /**
+         * API name: {@code properties}
+         * <p>
+         * Adds an entry to <code>properties</code>.
+         */
+        public final BuilderT properties(String key, Property value) {
+            this.properties = _mapPut(this.properties, key, value);
+            return self();
+        }
+
+        /**
+         * API name: {@code properties}
+         * <p>
+         * Adds an entry to <code>properties</code> using a builder lambda.
+         */
+        public final BuilderT properties(String key, Function<Property.Builder, ObjectBuilder<Property>> fn) {
+            return properties(key, fn.apply(new Property.Builder()).build());
+        }
+
+        /**
+         * API name: {@code ignore_above}
+         */
+        public final BuilderT ignoreAbove(@Nullable Integer value) {
+            this.ignoreAbove = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code dynamic}
+         */
+        public final BuilderT dynamic(@Nullable DynamicMapping value) {
+            this.dynamic = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>fields</code>.
+         */
+        public final BuilderT fields(Map<String, Property> map) {
+            this.fields = _mapPutAll(this.fields, map);
+            return self();
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds an entry to <code>fields</code>.
+         */
+        public final BuilderT fields(String key, Property value) {
+            this.fields = _mapPut(this.fields, key, value);
+            return self();
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds an entry to <code>fields</code> using a builder lambda.
+         */
+        public final BuilderT fields(String key, Function<Property.Builder, ObjectBuilder<Property>> fn) {
+            return fields(key, fn.apply(new Property.Builder()).build());
+        }
+
+        protected abstract BuilderT self();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupPropertyBaseDeserializer(ObjectDeserializer<BuilderT> op) {
+
+        op.add(AbstractBuilder::localMetadata, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "local_metadata");
+        op.add(AbstractBuilder::meta, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "meta");
+        op.add(AbstractBuilder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(AbstractBuilder::properties, JsonpDeserializer.stringMapDeserializer(Property._DESERIALIZER), "properties");
+        op.add(AbstractBuilder::ignoreAbove, JsonpDeserializer.integerDeserializer(), "ignore_above");
+        op.add(AbstractBuilder::dynamic, DynamicMapping._DESERIALIZER, "dynamic");
+        op.add(AbstractBuilder::fields, JsonpDeserializer.stringMapDeserializer(Property._DESERIALIZER), "fields");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PropertyBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PropertyBuilders.java
index 5ebec1f4dd..c519d4afc4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PropertyBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PropertyBuilders.java
@@ -36,355 +36,354 @@
  * Builders for {@link Property} variants.
  */
 public class PropertyBuilders {
-	private PropertyBuilders() {
-	}
-
-	/**
-	 * Creates a builder for the {@link AggregateMetricDoubleProperty
-	 * aggregate_metric_double} {@code Property} variant.
-	 */
-	public static AggregateMetricDoubleProperty.Builder aggregateMetricDouble() {
-		return new AggregateMetricDoubleProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link BinaryProperty binary} {@code Property}
-	 * variant.
-	 */
-	public static BinaryProperty.Builder binary() {
-		return new BinaryProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link BooleanProperty boolean} {@code Property}
-	 * variant.
-	 */
-	public static BooleanProperty.Builder boolean_() {
-		return new BooleanProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ByteNumberProperty byte} {@code Property}
-	 * variant.
-	 */
-	public static ByteNumberProperty.Builder byte_() {
-		return new ByteNumberProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link CompletionProperty completion}
-	 * {@code Property} variant.
-	 */
-	public static CompletionProperty.Builder completion() {
-		return new CompletionProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ConstantKeywordProperty constant_keyword}
-	 * {@code Property} variant.
-	 */
-	public static ConstantKeywordProperty.Builder constantKeyword() {
-		return new ConstantKeywordProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DateNanosProperty date_nanos}
-	 * {@code Property} variant.
-	 */
-	public static DateNanosProperty.Builder dateNanos() {
-		return new DateNanosProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DateProperty date} {@code Property} variant.
-	 */
-	public static DateProperty.Builder date() {
-		return new DateProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DateRangeProperty date_range}
-	 * {@code Property} variant.
-	 */
-	public static DateRangeProperty.Builder dateRange() {
-		return new DateRangeProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DoubleNumberProperty double}
-	 * {@code Property} variant.
-	 */
-	public static DoubleNumberProperty.Builder double_() {
-		return new DoubleNumberProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DoubleRangeProperty double_range}
-	 * {@code Property} variant.
-	 */
-	public static DoubleRangeProperty.Builder doubleRange() {
-		return new DoubleRangeProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link FieldAliasProperty alias} {@code Property}
-	 * variant.
-	 */
-	public static FieldAliasProperty.Builder alias() {
-		return new FieldAliasProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link FlattenedProperty flattened}
-	 * {@code Property} variant.
-	 */
-	public static FlattenedProperty.Builder flattened() {
-		return new FlattenedProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link FloatNumberProperty float} {@code Property}
-	 * variant.
-	 */
-	public static FloatNumberProperty.Builder float_() {
-		return new FloatNumberProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link FloatRangeProperty float_range}
-	 * {@code Property} variant.
-	 */
-	public static FloatRangeProperty.Builder floatRange() {
-		return new FloatRangeProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GeoPointProperty geo_point} {@code Property}
-	 * variant.
-	 */
-	public static GeoPointProperty.Builder geoPoint() {
-		return new GeoPointProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GeoShapeProperty geo_shape} {@code Property}
-	 * variant.
-	 */
-	public static GeoShapeProperty.Builder geoShape() {
-		return new GeoShapeProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link HalfFloatNumberProperty half_float}
-	 * {@code Property} variant.
-	 */
-	public static HalfFloatNumberProperty.Builder halfFloat() {
-		return new HalfFloatNumberProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link HistogramProperty histogram}
-	 * {@code Property} variant.
-	 */
-	public static HistogramProperty.Builder histogram() {
-		return new HistogramProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link IntegerNumberProperty integer}
-	 * {@code Property} variant.
-	 */
-	public static IntegerNumberProperty.Builder integer() {
-		return new IntegerNumberProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link IntegerRangeProperty integer_range}
-	 * {@code Property} variant.
-	 */
-	public static IntegerRangeProperty.Builder integerRange() {
-		return new IntegerRangeProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link IpProperty ip} {@code Property} variant.
-	 */
-	public static IpProperty.Builder ip() {
-		return new IpProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link IpRangeProperty ip_range} {@code Property}
-	 * variant.
-	 */
-	public static IpRangeProperty.Builder ipRange() {
-		return new IpRangeProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link JoinProperty join} {@code Property} variant.
-	 */
-	public static JoinProperty.Builder join() {
-		return new JoinProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link KeywordProperty keyword} {@code Property}
-	 * variant.
-	 */
-	public static KeywordProperty.Builder keyword() {
-		return new KeywordProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link KnnVectorProperty long} {@code Property}
-	 * variant.
-	 */
-	public static KnnVectorProperty.Builder knnVector() {
-		return new KnnVectorProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link LongNumberProperty long} {@code Property}
-	 * variant.
-	 */
-	public static LongNumberProperty.Builder long_() {
-		return new LongNumberProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link LongRangeProperty long_range}
-	 * {@code Property} variant.
-	 */
-	public static LongRangeProperty.Builder longRange() {
-		return new LongRangeProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link Murmur3HashProperty murmur3}
-	 * {@code Property} variant.
-	 */
-	public static Murmur3HashProperty.Builder murmur3() {
-		return new Murmur3HashProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link NestedProperty nested} {@code Property}
-	 * variant.
-	 */
-	public static NestedProperty.Builder nested() {
-		return new NestedProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ObjectProperty object} {@code Property}
-	 * variant.
-	 */
-	public static ObjectProperty.Builder object() {
-		return new ObjectProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link PercolatorProperty percolator}
-	 * {@code Property} variant.
-	 */
-	public static PercolatorProperty.Builder percolator() {
-		return new PercolatorProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link PointProperty point} {@code Property}
-	 * variant.
-	 */
-	public static PointProperty.Builder point() {
-		return new PointProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link RankFeatureProperty rank_feature}
-	 * {@code Property} variant.
-	 */
-	public static RankFeatureProperty.Builder rankFeature() {
-		return new RankFeatureProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link RankFeaturesProperty rank_features}
-	 * {@code Property} variant.
-	 */
-	public static RankFeaturesProperty.Builder rankFeatures() {
-		return new RankFeaturesProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ScaledFloatNumberProperty scaled_float}
-	 * {@code Property} variant.
-	 */
-	public static ScaledFloatNumberProperty.Builder scaledFloat() {
-		return new ScaledFloatNumberProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SearchAsYouTypeProperty search_as_you_type}
-	 * {@code Property} variant.
-	 */
-	public static SearchAsYouTypeProperty.Builder searchAsYouType() {
-		return new SearchAsYouTypeProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ShapeProperty shape} {@code Property}
-	 * variant.
-	 */
-	public static ShapeProperty.Builder shape() {
-		return new ShapeProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ShortNumberProperty short} {@code Property}
-	 * variant.
-	 */
-	public static ShortNumberProperty.Builder short_() {
-		return new ShortNumberProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link TextProperty text} {@code Property} variant.
-	 */
-	public static TextProperty.Builder text() {
-		return new TextProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link TokenCountProperty token_count}
-	 * {@code Property} variant.
-	 */
-	public static TokenCountProperty.Builder tokenCount() {
-		return new TokenCountProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link UnsignedLongNumberProperty unsigned_long}
-	 * {@code Property} variant.
-	 */
-	public static UnsignedLongNumberProperty.Builder unsignedLong() {
-		return new UnsignedLongNumberProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link VersionProperty version} {@code Property}
-	 * variant.
-	 */
-	public static VersionProperty.Builder version() {
-		return new VersionProperty.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link WildcardProperty wildcard} {@code Property}
-	 * variant.
-	 */
-	public static WildcardProperty.Builder wildcard() {
-		return new WildcardProperty.Builder();
-	}
+    private PropertyBuilders() {}
+
+    /**
+     * Creates a builder for the {@link AggregateMetricDoubleProperty
+     * aggregate_metric_double} {@code Property} variant.
+     */
+    public static AggregateMetricDoubleProperty.Builder aggregateMetricDouble() {
+        return new AggregateMetricDoubleProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link BinaryProperty binary} {@code Property}
+     * variant.
+     */
+    public static BinaryProperty.Builder binary() {
+        return new BinaryProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link BooleanProperty boolean} {@code Property}
+     * variant.
+     */
+    public static BooleanProperty.Builder boolean_() {
+        return new BooleanProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ByteNumberProperty byte} {@code Property}
+     * variant.
+     */
+    public static ByteNumberProperty.Builder byte_() {
+        return new ByteNumberProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link CompletionProperty completion}
+     * {@code Property} variant.
+     */
+    public static CompletionProperty.Builder completion() {
+        return new CompletionProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ConstantKeywordProperty constant_keyword}
+     * {@code Property} variant.
+     */
+    public static ConstantKeywordProperty.Builder constantKeyword() {
+        return new ConstantKeywordProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DateNanosProperty date_nanos}
+     * {@code Property} variant.
+     */
+    public static DateNanosProperty.Builder dateNanos() {
+        return new DateNanosProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DateProperty date} {@code Property} variant.
+     */
+    public static DateProperty.Builder date() {
+        return new DateProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DateRangeProperty date_range}
+     * {@code Property} variant.
+     */
+    public static DateRangeProperty.Builder dateRange() {
+        return new DateRangeProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DoubleNumberProperty double}
+     * {@code Property} variant.
+     */
+    public static DoubleNumberProperty.Builder double_() {
+        return new DoubleNumberProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DoubleRangeProperty double_range}
+     * {@code Property} variant.
+     */
+    public static DoubleRangeProperty.Builder doubleRange() {
+        return new DoubleRangeProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link FieldAliasProperty alias} {@code Property}
+     * variant.
+     */
+    public static FieldAliasProperty.Builder alias() {
+        return new FieldAliasProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link FlattenedProperty flattened}
+     * {@code Property} variant.
+     */
+    public static FlattenedProperty.Builder flattened() {
+        return new FlattenedProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link FloatNumberProperty float} {@code Property}
+     * variant.
+     */
+    public static FloatNumberProperty.Builder float_() {
+        return new FloatNumberProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link FloatRangeProperty float_range}
+     * {@code Property} variant.
+     */
+    public static FloatRangeProperty.Builder floatRange() {
+        return new FloatRangeProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GeoPointProperty geo_point} {@code Property}
+     * variant.
+     */
+    public static GeoPointProperty.Builder geoPoint() {
+        return new GeoPointProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GeoShapeProperty geo_shape} {@code Property}
+     * variant.
+     */
+    public static GeoShapeProperty.Builder geoShape() {
+        return new GeoShapeProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link HalfFloatNumberProperty half_float}
+     * {@code Property} variant.
+     */
+    public static HalfFloatNumberProperty.Builder halfFloat() {
+        return new HalfFloatNumberProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link HistogramProperty histogram}
+     * {@code Property} variant.
+     */
+    public static HistogramProperty.Builder histogram() {
+        return new HistogramProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link IntegerNumberProperty integer}
+     * {@code Property} variant.
+     */
+    public static IntegerNumberProperty.Builder integer() {
+        return new IntegerNumberProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link IntegerRangeProperty integer_range}
+     * {@code Property} variant.
+     */
+    public static IntegerRangeProperty.Builder integerRange() {
+        return new IntegerRangeProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link IpProperty ip} {@code Property} variant.
+     */
+    public static IpProperty.Builder ip() {
+        return new IpProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link IpRangeProperty ip_range} {@code Property}
+     * variant.
+     */
+    public static IpRangeProperty.Builder ipRange() {
+        return new IpRangeProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link JoinProperty join} {@code Property} variant.
+     */
+    public static JoinProperty.Builder join() {
+        return new JoinProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link KeywordProperty keyword} {@code Property}
+     * variant.
+     */
+    public static KeywordProperty.Builder keyword() {
+        return new KeywordProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link KnnVectorProperty long} {@code Property}
+     * variant.
+     */
+    public static KnnVectorProperty.Builder knnVector() {
+        return new KnnVectorProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link LongNumberProperty long} {@code Property}
+     * variant.
+     */
+    public static LongNumberProperty.Builder long_() {
+        return new LongNumberProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link LongRangeProperty long_range}
+     * {@code Property} variant.
+     */
+    public static LongRangeProperty.Builder longRange() {
+        return new LongRangeProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link Murmur3HashProperty murmur3}
+     * {@code Property} variant.
+     */
+    public static Murmur3HashProperty.Builder murmur3() {
+        return new Murmur3HashProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link NestedProperty nested} {@code Property}
+     * variant.
+     */
+    public static NestedProperty.Builder nested() {
+        return new NestedProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ObjectProperty object} {@code Property}
+     * variant.
+     */
+    public static ObjectProperty.Builder object() {
+        return new ObjectProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link PercolatorProperty percolator}
+     * {@code Property} variant.
+     */
+    public static PercolatorProperty.Builder percolator() {
+        return new PercolatorProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link PointProperty point} {@code Property}
+     * variant.
+     */
+    public static PointProperty.Builder point() {
+        return new PointProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link RankFeatureProperty rank_feature}
+     * {@code Property} variant.
+     */
+    public static RankFeatureProperty.Builder rankFeature() {
+        return new RankFeatureProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link RankFeaturesProperty rank_features}
+     * {@code Property} variant.
+     */
+    public static RankFeaturesProperty.Builder rankFeatures() {
+        return new RankFeaturesProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ScaledFloatNumberProperty scaled_float}
+     * {@code Property} variant.
+     */
+    public static ScaledFloatNumberProperty.Builder scaledFloat() {
+        return new ScaledFloatNumberProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SearchAsYouTypeProperty search_as_you_type}
+     * {@code Property} variant.
+     */
+    public static SearchAsYouTypeProperty.Builder searchAsYouType() {
+        return new SearchAsYouTypeProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ShapeProperty shape} {@code Property}
+     * variant.
+     */
+    public static ShapeProperty.Builder shape() {
+        return new ShapeProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ShortNumberProperty short} {@code Property}
+     * variant.
+     */
+    public static ShortNumberProperty.Builder short_() {
+        return new ShortNumberProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link TextProperty text} {@code Property} variant.
+     */
+    public static TextProperty.Builder text() {
+        return new TextProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link TokenCountProperty token_count}
+     * {@code Property} variant.
+     */
+    public static TokenCountProperty.Builder tokenCount() {
+        return new TokenCountProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link UnsignedLongNumberProperty unsigned_long}
+     * {@code Property} variant.
+     */
+    public static UnsignedLongNumberProperty.Builder unsignedLong() {
+        return new UnsignedLongNumberProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link VersionProperty version} {@code Property}
+     * variant.
+     */
+    public static VersionProperty.Builder version() {
+        return new VersionProperty.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link WildcardProperty wildcard} {@code Property}
+     * variant.
+     */
+    public static WildcardProperty.Builder wildcard() {
+        return new WildcardProperty.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PropertyVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PropertyVariant.java
index 4ac268e305..389f1e07f3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PropertyVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PropertyVariant.java
@@ -39,10 +39,10 @@
  */
 public interface PropertyVariant extends JsonpSerializable {
 
-	Property.Kind _propertyKind();
+    Property.Kind _propertyKind();
 
-	default Property _toProperty() {
-		return new Property(this);
-	}
+    default Property _toProperty() {
+        return new Property(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RangePropertyBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RangePropertyBase.java
index 65c92ff925..26bbd76d0e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RangePropertyBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RangePropertyBase.java
@@ -32,128 +32,124 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectDeserializer;
-import jakarta.json.stream.JsonGenerator;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.RangePropertyBase
 
-
-
 public abstract class RangePropertyBase extends DocValuesPropertyBase {
-	@Nullable
-	private final Double boost;
-
-	@Nullable
-	private final Boolean coerce;
-
-	@Nullable
-	private final Boolean index;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected RangePropertyBase(AbstractBuilder<?> builder) {
-		super(builder);
-
-		this.boost = builder.boost;
-		this.coerce = builder.coerce;
-		this.index = builder.index;
-
-	}
-
-	/**
-	 * API name: {@code boost}
-	 */
-	@Nullable
-	public final Double boost() {
-		return this.boost;
-	}
-
-	/**
-	 * API name: {@code coerce}
-	 */
-	@Nullable
-	public final Boolean coerce() {
-		return this.coerce;
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final Boolean index() {
-		return this.index;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.boost != null) {
-			generator.writeKey("boost");
-			generator.write(this.boost);
-
-		}
-		if (this.coerce != null) {
-			generator.writeKey("coerce");
-			generator.write(this.coerce);
-
-		}
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				DocValuesPropertyBase.AbstractBuilder<BuilderT> {
-		@Nullable
-		private Double boost;
-
-		@Nullable
-		private Boolean coerce;
-
-		@Nullable
-		private Boolean index;
-
-		/**
-		 * API name: {@code boost}
-		 */
-		public final BuilderT boost(@Nullable Double value) {
-			this.boost = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code coerce}
-		 */
-		public final BuilderT coerce(@Nullable Boolean value) {
-			this.coerce = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final BuilderT index(@Nullable Boolean value) {
-			this.index = value;
-			return self();
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupRangePropertyBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		setupDocValuesPropertyBaseDeserializer(op);
-		op.add(AbstractBuilder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
-		op.add(AbstractBuilder::coerce, JsonpDeserializer.booleanDeserializer(), "coerce");
-		op.add(AbstractBuilder::index, JsonpDeserializer.booleanDeserializer(), "index");
-
-	}
+    @Nullable
+    private final Double boost;
+
+    @Nullable
+    private final Boolean coerce;
+
+    @Nullable
+    private final Boolean index;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected RangePropertyBase(AbstractBuilder<?> builder) {
+        super(builder);
+
+        this.boost = builder.boost;
+        this.coerce = builder.coerce;
+        this.index = builder.index;
+
+    }
+
+    /**
+     * API name: {@code boost}
+     */
+    @Nullable
+    public final Double boost() {
+        return this.boost;
+    }
+
+    /**
+     * API name: {@code coerce}
+     */
+    @Nullable
+    public final Boolean coerce() {
+        return this.coerce;
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    @Nullable
+    public final Boolean index() {
+        return this.index;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.boost != null) {
+            generator.writeKey("boost");
+            generator.write(this.boost);
+
+        }
+        if (this.coerce != null) {
+            generator.writeKey("coerce");
+            generator.write(this.coerce);
+
+        }
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends
+        DocValuesPropertyBase.AbstractBuilder<BuilderT> {
+        @Nullable
+        private Double boost;
+
+        @Nullable
+        private Boolean coerce;
+
+        @Nullable
+        private Boolean index;
+
+        /**
+         * API name: {@code boost}
+         */
+        public final BuilderT boost(@Nullable Double value) {
+            this.boost = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code coerce}
+         */
+        public final BuilderT coerce(@Nullable Boolean value) {
+            this.coerce = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code index}
+         */
+        public final BuilderT index(@Nullable Boolean value) {
+            this.index = value;
+            return self();
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupRangePropertyBaseDeserializer(ObjectDeserializer<BuilderT> op) {
+        setupDocValuesPropertyBaseDeserializer(op);
+        op.add(AbstractBuilder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
+        op.add(AbstractBuilder::coerce, JsonpDeserializer.booleanDeserializer(), "coerce");
+        op.add(AbstractBuilder::index, JsonpDeserializer.booleanDeserializer(), "index");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RankFeatureProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RankFeatureProperty.java
index 52d03831ea..a92318c6e0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RankFeatureProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RankFeatureProperty.java
@@ -32,116 +32,115 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.RankFeatureProperty
 
-
 @JsonpDeserializable
 public class RankFeatureProperty extends PropertyBase implements PropertyVariant {
-	@Nullable
-	private final Boolean positiveScoreImpact;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RankFeatureProperty(Builder builder) {
-		super(builder);
-
-		this.positiveScoreImpact = builder.positiveScoreImpact;
-
-	}
-
-	public static RankFeatureProperty of(Function<Builder, ObjectBuilder<RankFeatureProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.RankFeature;
-	}
-
-	/**
-	 * API name: {@code positive_score_impact}
-	 */
-	@Nullable
-	public final Boolean positiveScoreImpact() {
-		return this.positiveScoreImpact;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "rank_feature");
-		super.serializeInternal(generator, mapper);
-		if (this.positiveScoreImpact != null) {
-			generator.writeKey("positive_score_impact");
-			generator.write(this.positiveScoreImpact);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RankFeatureProperty}.
-	 */
-
-	public static class Builder extends PropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<RankFeatureProperty> {
-		@Nullable
-		private Boolean positiveScoreImpact;
-
-		/**
-		 * API name: {@code positive_score_impact}
-		 */
-		public final Builder positiveScoreImpact(@Nullable Boolean value) {
-			this.positiveScoreImpact = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RankFeatureProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RankFeatureProperty build() {
-			_checkSingleUse();
-
-			return new RankFeatureProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RankFeatureProperty}
-	 */
-	public static final JsonpDeserializer<RankFeatureProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RankFeatureProperty::setupRankFeaturePropertyDeserializer);
-
-	protected static void setupRankFeaturePropertyDeserializer(ObjectDeserializer<RankFeatureProperty.Builder> op) {
-		PropertyBase.setupPropertyBaseDeserializer(op);
-		op.add(Builder::positiveScoreImpact, JsonpDeserializer.booleanDeserializer(), "positive_score_impact");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Boolean positiveScoreImpact;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RankFeatureProperty(Builder builder) {
+        super(builder);
+
+        this.positiveScoreImpact = builder.positiveScoreImpact;
+
+    }
+
+    public static RankFeatureProperty of(Function<Builder, ObjectBuilder<RankFeatureProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.RankFeature;
+    }
+
+    /**
+     * API name: {@code positive_score_impact}
+     */
+    @Nullable
+    public final Boolean positiveScoreImpact() {
+        return this.positiveScoreImpact;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "rank_feature");
+        super.serializeInternal(generator, mapper);
+        if (this.positiveScoreImpact != null) {
+            generator.writeKey("positive_score_impact");
+            generator.write(this.positiveScoreImpact);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RankFeatureProperty}.
+     */
+
+    public static class Builder extends PropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<RankFeatureProperty> {
+        @Nullable
+        private Boolean positiveScoreImpact;
+
+        /**
+         * API name: {@code positive_score_impact}
+         */
+        public final Builder positiveScoreImpact(@Nullable Boolean value) {
+            this.positiveScoreImpact = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RankFeatureProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RankFeatureProperty build() {
+            _checkSingleUse();
+
+            return new RankFeatureProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RankFeatureProperty}
+     */
+    public static final JsonpDeserializer<RankFeatureProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RankFeatureProperty::setupRankFeaturePropertyDeserializer
+    );
+
+    protected static void setupRankFeaturePropertyDeserializer(ObjectDeserializer<RankFeatureProperty.Builder> op) {
+        PropertyBase.setupPropertyBaseDeserializer(op);
+        op.add(Builder::positiveScoreImpact, JsonpDeserializer.booleanDeserializer(), "positive_score_impact");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RankFeaturesProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RankFeaturesProperty.java
index 00aa9ae3a5..5cc98be480 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RankFeaturesProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RankFeaturesProperty.java
@@ -32,86 +32,84 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.mapping.RankFeaturesProperty
 
-
 @JsonpDeserializable
 public class RankFeaturesProperty extends PropertyBase implements PropertyVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private RankFeaturesProperty(Builder builder) {
-		super(builder);
+    private RankFeaturesProperty(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static RankFeaturesProperty of(Function<Builder, ObjectBuilder<RankFeaturesProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static RankFeaturesProperty of(Function<Builder, ObjectBuilder<RankFeaturesProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.RankFeatures;
-	}
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.RankFeatures;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "rank_features");
-		super.serializeInternal(generator, mapper);
+        generator.write("type", "rank_features");
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link RankFeaturesProperty}.
-	 */
+    /**
+     * Builder for {@link RankFeaturesProperty}.
+     */
 
-	public static class Builder extends PropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<RankFeaturesProperty> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends PropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<RankFeaturesProperty> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link RankFeaturesProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RankFeaturesProperty build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link RankFeaturesProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RankFeaturesProperty build() {
+            _checkSingleUse();
 
-			return new RankFeaturesProperty(this);
-		}
-	}
+            return new RankFeaturesProperty(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link RankFeaturesProperty}
-	 */
-	public static final JsonpDeserializer<RankFeaturesProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RankFeaturesProperty::setupRankFeaturesPropertyDeserializer);
+    /**
+     * Json deserializer for {@link RankFeaturesProperty}
+     */
+    public static final JsonpDeserializer<RankFeaturesProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RankFeaturesProperty::setupRankFeaturesPropertyDeserializer
+    );
 
-	protected static void setupRankFeaturesPropertyDeserializer(ObjectDeserializer<RankFeaturesProperty.Builder> op) {
-		PropertyBase.setupPropertyBaseDeserializer(op);
+    protected static void setupRankFeaturesPropertyDeserializer(ObjectDeserializer<RankFeaturesProperty.Builder> op) {
+        PropertyBase.setupPropertyBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RoutingField.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RoutingField.java
index 018fc7fcbd..de915186ea 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RoutingField.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RoutingField.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,93 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.mapping.RoutingField
 
-
 @JsonpDeserializable
 public class RoutingField implements JsonpSerializable {
-	private final boolean required;
+    private final boolean required;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private RoutingField(Builder builder) {
+    private RoutingField(Builder builder) {
 
-		this.required = ApiTypeHelper.requireNonNull(builder.required, this, "required");
+        this.required = ApiTypeHelper.requireNonNull(builder.required, this, "required");
 
-	}
+    }
 
-	public static RoutingField of(Function<Builder, ObjectBuilder<RoutingField>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static RoutingField of(Function<Builder, ObjectBuilder<RoutingField>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code required}
-	 */
-	public final boolean required() {
-		return this.required;
-	}
+    /**
+     * Required - API name: {@code required}
+     */
+    public final boolean required() {
+        return this.required;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("required");
-		generator.write(this.required);
+        generator.writeKey("required");
+        generator.write(this.required);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link RoutingField}.
-	 */
+    /**
+     * Builder for {@link RoutingField}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RoutingField> {
-		private Boolean required;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RoutingField> {
+        private Boolean required;
 
-		/**
-		 * Required - API name: {@code required}
-		 */
-		public final Builder required(boolean value) {
-			this.required = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code required}
+         */
+        public final Builder required(boolean value) {
+            this.required = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link RoutingField}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RoutingField build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link RoutingField}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RoutingField build() {
+            _checkSingleUse();
 
-			return new RoutingField(this);
-		}
-	}
+            return new RoutingField(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link RoutingField}
-	 */
-	public static final JsonpDeserializer<RoutingField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RoutingField::setupRoutingFieldDeserializer);
+    /**
+     * Json deserializer for {@link RoutingField}
+     */
+    public static final JsonpDeserializer<RoutingField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RoutingField::setupRoutingFieldDeserializer
+    );
 
-	protected static void setupRoutingFieldDeserializer(ObjectDeserializer<RoutingField.Builder> op) {
+    protected static void setupRoutingFieldDeserializer(ObjectDeserializer<RoutingField.Builder> op) {
 
-		op.add(Builder::required, JsonpDeserializer.booleanDeserializer(), "required");
+        op.add(Builder::required, JsonpDeserializer.booleanDeserializer(), "required");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RuntimeField.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RuntimeField.java
index cecd490d1e..5c8b090cd4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RuntimeField.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RuntimeField.java
@@ -32,169 +32,170 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.RuntimeField
 
-
 @JsonpDeserializable
 public class RuntimeField implements JsonpSerializable {
-	@Nullable
-	private final String format;
-
-	@Nullable
-	private final Script script;
-
-	private final RuntimeFieldType type;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RuntimeField(Builder builder) {
-
-		this.format = builder.format;
-		this.script = builder.script;
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-
-	}
-
-	public static RuntimeField of(Function<Builder, ObjectBuilder<RuntimeField>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code format}
-	 */
-	@Nullable
-	public final String format() {
-		return this.format;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final Script script() {
-		return this.script;
-	}
-
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final RuntimeFieldType type() {
-		return this.type;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.format != null) {
-			generator.writeKey("format");
-			generator.write(this.format);
-
-		}
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-		generator.writeKey("type");
-		this.type.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RuntimeField}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RuntimeField> {
-		@Nullable
-		private String format;
-
-		@Nullable
-		private Script script;
-
-		private RuntimeFieldType type;
-
-		/**
-		 * API name: {@code format}
-		 */
-		public final Builder format(@Nullable String value) {
-			this.format = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(@Nullable Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(RuntimeFieldType value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RuntimeField}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RuntimeField build() {
-			_checkSingleUse();
-
-			return new RuntimeField(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RuntimeField}
-	 */
-	public static final JsonpDeserializer<RuntimeField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RuntimeField::setupRuntimeFieldDeserializer);
-
-	protected static void setupRuntimeFieldDeserializer(ObjectDeserializer<RuntimeField.Builder> op) {
-
-		op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-		op.add(Builder::type, RuntimeFieldType._DESERIALIZER, "type");
-
-	}
+    @Nullable
+    private final String format;
+
+    @Nullable
+    private final Script script;
+
+    private final RuntimeFieldType type;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RuntimeField(Builder builder) {
+
+        this.format = builder.format;
+        this.script = builder.script;
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+
+    }
+
+    public static RuntimeField of(Function<Builder, ObjectBuilder<RuntimeField>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code format}
+     */
+    @Nullable
+    public final String format() {
+        return this.format;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final Script script() {
+        return this.script;
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    public final RuntimeFieldType type() {
+        return this.type;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.format != null) {
+            generator.writeKey("format");
+            generator.write(this.format);
+
+        }
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+        generator.writeKey("type");
+        this.type.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RuntimeField}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RuntimeField> {
+        @Nullable
+        private String format;
+
+        @Nullable
+        private Script script;
+
+        private RuntimeFieldType type;
+
+        /**
+         * API name: {@code format}
+         */
+        public final Builder format(@Nullable String value) {
+            this.format = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(@Nullable Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(RuntimeFieldType value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RuntimeField}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RuntimeField build() {
+            _checkSingleUse();
+
+            return new RuntimeField(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RuntimeField}
+     */
+    public static final JsonpDeserializer<RuntimeField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RuntimeField::setupRuntimeFieldDeserializer
+    );
+
+    protected static void setupRuntimeFieldDeserializer(ObjectDeserializer<RuntimeField.Builder> op) {
+
+        op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+        op.add(Builder::type, RuntimeFieldType._DESERIALIZER, "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RuntimeFieldType.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RuntimeFieldType.java
index 8e7d653bfb..d71067ca2e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RuntimeFieldType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RuntimeFieldType.java
@@ -35,35 +35,33 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum RuntimeFieldType implements JsonEnum {
-	Boolean("boolean"),
+    Boolean("boolean"),
 
-	Date("date"),
+    Date("date"),
 
-	Double("double"),
+    Double("double"),
 
-	GeoPoint("geo_point"),
+    GeoPoint("geo_point"),
 
-	Ip("ip"),
+    Ip("ip"),
 
-	Keyword("keyword"),
+    Keyword("keyword"),
 
-	Long("long"),
+    Long("long"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	RuntimeFieldType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    RuntimeFieldType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<RuntimeFieldType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			RuntimeFieldType.values());
+    public static final JsonEnum.Deserializer<RuntimeFieldType> _DESERIALIZER = new JsonEnum.Deserializer<>(RuntimeFieldType.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ScaledFloatNumberProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ScaledFloatNumberProperty.java
index b76d597ab1..1772f41644 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ScaledFloatNumberProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ScaledFloatNumberProperty.java
@@ -32,175 +32,173 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.ScaledFloatNumberProperty
 
-
 @JsonpDeserializable
 public class ScaledFloatNumberProperty extends NumberPropertyBase implements PropertyVariant {
-	@Nullable
-	private final Boolean coerce;
-
-	@Nullable
-	private final Double nullValue;
-
-	@Nullable
-	private final Double scalingFactor;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ScaledFloatNumberProperty(Builder builder) {
-		super(builder);
-
-		this.coerce = builder.coerce;
-		this.nullValue = builder.nullValue;
-		this.scalingFactor = builder.scalingFactor;
-
-	}
-
-	public static ScaledFloatNumberProperty of(Function<Builder, ObjectBuilder<ScaledFloatNumberProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.ScaledFloat;
-	}
-
-	/**
-	 * API name: {@code coerce}
-	 */
-	@Nullable
-	public final Boolean coerce() {
-		return this.coerce;
-	}
-
-	/**
-	 * API name: {@code null_value}
-	 */
-	@Nullable
-	public final Double nullValue() {
-		return this.nullValue;
-	}
-
-	/**
-	 * API name: {@code scaling_factor}
-	 */
-	@Nullable
-	public final Double scalingFactor() {
-		return this.scalingFactor;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "scaled_float");
-		super.serializeInternal(generator, mapper);
-		if (this.coerce != null) {
-			generator.writeKey("coerce");
-			generator.write(this.coerce);
-
-		}
-		if (this.nullValue != null) {
-			generator.writeKey("null_value");
-			generator.write(this.nullValue);
-
-		}
-		if (this.scalingFactor != null) {
-			generator.writeKey("scaling_factor");
-			generator.write(this.scalingFactor);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ScaledFloatNumberProperty}.
-	 */
-
-	public static class Builder extends NumberPropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ScaledFloatNumberProperty> {
-		@Nullable
-		private Boolean coerce;
-
-		@Nullable
-		private Double nullValue;
-
-		@Nullable
-		private Double scalingFactor;
-
-		/**
-		 * API name: {@code coerce}
-		 */
-		public final Builder coerce(@Nullable Boolean value) {
-			this.coerce = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(@Nullable Double value) {
-			this.nullValue = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code scaling_factor}
-		 */
-		public final Builder scalingFactor(@Nullable Double value) {
-			this.scalingFactor = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ScaledFloatNumberProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ScaledFloatNumberProperty build() {
-			_checkSingleUse();
-
-			return new ScaledFloatNumberProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ScaledFloatNumberProperty}
-	 */
-	public static final JsonpDeserializer<ScaledFloatNumberProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ScaledFloatNumberProperty::setupScaledFloatNumberPropertyDeserializer);
-
-	protected static void setupScaledFloatNumberPropertyDeserializer(
-			ObjectDeserializer<ScaledFloatNumberProperty.Builder> op) {
-		setupNumberPropertyBaseDeserializer(op);
-		op.add(Builder::coerce, JsonpDeserializer.booleanDeserializer(), "coerce");
-		op.add(Builder::nullValue, JsonpDeserializer.doubleDeserializer(), "null_value");
-		op.add(Builder::scalingFactor, JsonpDeserializer.doubleDeserializer(), "scaling_factor");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Boolean coerce;
+
+    @Nullable
+    private final Double nullValue;
+
+    @Nullable
+    private final Double scalingFactor;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ScaledFloatNumberProperty(Builder builder) {
+        super(builder);
+
+        this.coerce = builder.coerce;
+        this.nullValue = builder.nullValue;
+        this.scalingFactor = builder.scalingFactor;
+
+    }
+
+    public static ScaledFloatNumberProperty of(Function<Builder, ObjectBuilder<ScaledFloatNumberProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.ScaledFloat;
+    }
+
+    /**
+     * API name: {@code coerce}
+     */
+    @Nullable
+    public final Boolean coerce() {
+        return this.coerce;
+    }
+
+    /**
+     * API name: {@code null_value}
+     */
+    @Nullable
+    public final Double nullValue() {
+        return this.nullValue;
+    }
+
+    /**
+     * API name: {@code scaling_factor}
+     */
+    @Nullable
+    public final Double scalingFactor() {
+        return this.scalingFactor;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "scaled_float");
+        super.serializeInternal(generator, mapper);
+        if (this.coerce != null) {
+            generator.writeKey("coerce");
+            generator.write(this.coerce);
+
+        }
+        if (this.nullValue != null) {
+            generator.writeKey("null_value");
+            generator.write(this.nullValue);
+
+        }
+        if (this.scalingFactor != null) {
+            generator.writeKey("scaling_factor");
+            generator.write(this.scalingFactor);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ScaledFloatNumberProperty}.
+     */
+
+    public static class Builder extends NumberPropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<ScaledFloatNumberProperty> {
+        @Nullable
+        private Boolean coerce;
+
+        @Nullable
+        private Double nullValue;
+
+        @Nullable
+        private Double scalingFactor;
+
+        /**
+         * API name: {@code coerce}
+         */
+        public final Builder coerce(@Nullable Boolean value) {
+            this.coerce = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(@Nullable Double value) {
+            this.nullValue = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code scaling_factor}
+         */
+        public final Builder scalingFactor(@Nullable Double value) {
+            this.scalingFactor = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ScaledFloatNumberProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ScaledFloatNumberProperty build() {
+            _checkSingleUse();
+
+            return new ScaledFloatNumberProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ScaledFloatNumberProperty}
+     */
+    public static final JsonpDeserializer<ScaledFloatNumberProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ScaledFloatNumberProperty::setupScaledFloatNumberPropertyDeserializer
+    );
+
+    protected static void setupScaledFloatNumberPropertyDeserializer(ObjectDeserializer<ScaledFloatNumberProperty.Builder> op) {
+        setupNumberPropertyBaseDeserializer(op);
+        op.add(Builder::coerce, JsonpDeserializer.booleanDeserializer(), "coerce");
+        op.add(Builder::nullValue, JsonpDeserializer.doubleDeserializer(), "null_value");
+        op.add(Builder::scalingFactor, JsonpDeserializer.doubleDeserializer(), "scaling_factor");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SearchAsYouTypeProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SearchAsYouTypeProperty.java
index 7a051ca15c..9fc685f8d3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SearchAsYouTypeProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SearchAsYouTypeProperty.java
@@ -32,318 +32,316 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.SearchAsYouTypeProperty
 
-
 @JsonpDeserializable
 public class SearchAsYouTypeProperty extends CorePropertyBase implements PropertyVariant {
-	@Nullable
-	private final String analyzer;
-
-	@Nullable
-	private final Boolean index;
-
-	@Nullable
-	private final IndexOptions indexOptions;
-
-	@Nullable
-	private final Integer maxShingleSize;
-
-	@Nullable
-	private final Boolean norms;
-
-	@Nullable
-	private final String searchAnalyzer;
-
-	@Nullable
-	private final String searchQuoteAnalyzer;
-
-	@Nullable
-	private final TermVectorOption termVector;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SearchAsYouTypeProperty(Builder builder) {
-		super(builder);
-
-		this.analyzer = builder.analyzer;
-		this.index = builder.index;
-		this.indexOptions = builder.indexOptions;
-		this.maxShingleSize = builder.maxShingleSize;
-		this.norms = builder.norms;
-		this.searchAnalyzer = builder.searchAnalyzer;
-		this.searchQuoteAnalyzer = builder.searchQuoteAnalyzer;
-		this.termVector = builder.termVector;
-
-	}
-
-	public static SearchAsYouTypeProperty of(Function<Builder, ObjectBuilder<SearchAsYouTypeProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.SearchAsYouType;
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final Boolean index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code index_options}
-	 */
-	@Nullable
-	public final IndexOptions indexOptions() {
-		return this.indexOptions;
-	}
-
-	/**
-	 * API name: {@code max_shingle_size}
-	 */
-	@Nullable
-	public final Integer maxShingleSize() {
-		return this.maxShingleSize;
-	}
-
-	/**
-	 * API name: {@code norms}
-	 */
-	@Nullable
-	public final Boolean norms() {
-		return this.norms;
-	}
-
-	/**
-	 * API name: {@code search_analyzer}
-	 */
-	@Nullable
-	public final String searchAnalyzer() {
-		return this.searchAnalyzer;
-	}
-
-	/**
-	 * API name: {@code search_quote_analyzer}
-	 */
-	@Nullable
-	public final String searchQuoteAnalyzer() {
-		return this.searchQuoteAnalyzer;
-	}
-
-	/**
-	 * API name: {@code term_vector}
-	 */
-	@Nullable
-	public final TermVectorOption termVector() {
-		return this.termVector;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "search_as_you_type");
-		super.serializeInternal(generator, mapper);
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			generator.write(this.analyzer);
-
-		}
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.indexOptions != null) {
-			generator.writeKey("index_options");
-			this.indexOptions.serialize(generator, mapper);
-		}
-		if (this.maxShingleSize != null) {
-			generator.writeKey("max_shingle_size");
-			generator.write(this.maxShingleSize);
-
-		}
-		if (this.norms != null) {
-			generator.writeKey("norms");
-			generator.write(this.norms);
-
-		}
-		if (this.searchAnalyzer != null) {
-			generator.writeKey("search_analyzer");
-			generator.write(this.searchAnalyzer);
-
-		}
-		if (this.searchQuoteAnalyzer != null) {
-			generator.writeKey("search_quote_analyzer");
-			generator.write(this.searchQuoteAnalyzer);
-
-		}
-		if (this.termVector != null) {
-			generator.writeKey("term_vector");
-			this.termVector.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SearchAsYouTypeProperty}.
-	 */
-
-	public static class Builder extends CorePropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SearchAsYouTypeProperty> {
-		@Nullable
-		private String analyzer;
-
-		@Nullable
-		private Boolean index;
-
-		@Nullable
-		private IndexOptions indexOptions;
-
-		@Nullable
-		private Integer maxShingleSize;
-
-		@Nullable
-		private Boolean norms;
-
-		@Nullable
-		private String searchAnalyzer;
-
-		@Nullable
-		private String searchQuoteAnalyzer;
-
-		@Nullable
-		private TermVectorOption termVector;
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable Boolean value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_options}
-		 */
-		public final Builder indexOptions(@Nullable IndexOptions value) {
-			this.indexOptions = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_shingle_size}
-		 */
-		public final Builder maxShingleSize(@Nullable Integer value) {
-			this.maxShingleSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code norms}
-		 */
-		public final Builder norms(@Nullable Boolean value) {
-			this.norms = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code search_analyzer}
-		 */
-		public final Builder searchAnalyzer(@Nullable String value) {
-			this.searchAnalyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code search_quote_analyzer}
-		 */
-		public final Builder searchQuoteAnalyzer(@Nullable String value) {
-			this.searchQuoteAnalyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code term_vector}
-		 */
-		public final Builder termVector(@Nullable TermVectorOption value) {
-			this.termVector = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SearchAsYouTypeProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SearchAsYouTypeProperty build() {
-			_checkSingleUse();
-
-			return new SearchAsYouTypeProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SearchAsYouTypeProperty}
-	 */
-	public static final JsonpDeserializer<SearchAsYouTypeProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SearchAsYouTypeProperty::setupSearchAsYouTypePropertyDeserializer);
-
-	protected static void setupSearchAsYouTypePropertyDeserializer(
-			ObjectDeserializer<SearchAsYouTypeProperty.Builder> op) {
-		setupCorePropertyBaseDeserializer(op);
-		op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
-		op.add(Builder::indexOptions, IndexOptions._DESERIALIZER, "index_options");
-		op.add(Builder::maxShingleSize, JsonpDeserializer.integerDeserializer(), "max_shingle_size");
-		op.add(Builder::norms, JsonpDeserializer.booleanDeserializer(), "norms");
-		op.add(Builder::searchAnalyzer, JsonpDeserializer.stringDeserializer(), "search_analyzer");
-		op.add(Builder::searchQuoteAnalyzer, JsonpDeserializer.stringDeserializer(), "search_quote_analyzer");
-		op.add(Builder::termVector, TermVectorOption._DESERIALIZER, "term_vector");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final String analyzer;
+
+    @Nullable
+    private final Boolean index;
+
+    @Nullable
+    private final IndexOptions indexOptions;
+
+    @Nullable
+    private final Integer maxShingleSize;
+
+    @Nullable
+    private final Boolean norms;
+
+    @Nullable
+    private final String searchAnalyzer;
+
+    @Nullable
+    private final String searchQuoteAnalyzer;
+
+    @Nullable
+    private final TermVectorOption termVector;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SearchAsYouTypeProperty(Builder builder) {
+        super(builder);
+
+        this.analyzer = builder.analyzer;
+        this.index = builder.index;
+        this.indexOptions = builder.indexOptions;
+        this.maxShingleSize = builder.maxShingleSize;
+        this.norms = builder.norms;
+        this.searchAnalyzer = builder.searchAnalyzer;
+        this.searchQuoteAnalyzer = builder.searchQuoteAnalyzer;
+        this.termVector = builder.termVector;
+
+    }
+
+    public static SearchAsYouTypeProperty of(Function<Builder, ObjectBuilder<SearchAsYouTypeProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.SearchAsYouType;
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    @Nullable
+    public final Boolean index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code index_options}
+     */
+    @Nullable
+    public final IndexOptions indexOptions() {
+        return this.indexOptions;
+    }
+
+    /**
+     * API name: {@code max_shingle_size}
+     */
+    @Nullable
+    public final Integer maxShingleSize() {
+        return this.maxShingleSize;
+    }
+
+    /**
+     * API name: {@code norms}
+     */
+    @Nullable
+    public final Boolean norms() {
+        return this.norms;
+    }
+
+    /**
+     * API name: {@code search_analyzer}
+     */
+    @Nullable
+    public final String searchAnalyzer() {
+        return this.searchAnalyzer;
+    }
+
+    /**
+     * API name: {@code search_quote_analyzer}
+     */
+    @Nullable
+    public final String searchQuoteAnalyzer() {
+        return this.searchQuoteAnalyzer;
+    }
+
+    /**
+     * API name: {@code term_vector}
+     */
+    @Nullable
+    public final TermVectorOption termVector() {
+        return this.termVector;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "search_as_you_type");
+        super.serializeInternal(generator, mapper);
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            generator.write(this.analyzer);
+
+        }
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.indexOptions != null) {
+            generator.writeKey("index_options");
+            this.indexOptions.serialize(generator, mapper);
+        }
+        if (this.maxShingleSize != null) {
+            generator.writeKey("max_shingle_size");
+            generator.write(this.maxShingleSize);
+
+        }
+        if (this.norms != null) {
+            generator.writeKey("norms");
+            generator.write(this.norms);
+
+        }
+        if (this.searchAnalyzer != null) {
+            generator.writeKey("search_analyzer");
+            generator.write(this.searchAnalyzer);
+
+        }
+        if (this.searchQuoteAnalyzer != null) {
+            generator.writeKey("search_quote_analyzer");
+            generator.write(this.searchQuoteAnalyzer);
+
+        }
+        if (this.termVector != null) {
+            generator.writeKey("term_vector");
+            this.termVector.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SearchAsYouTypeProperty}.
+     */
+
+    public static class Builder extends CorePropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<SearchAsYouTypeProperty> {
+        @Nullable
+        private String analyzer;
+
+        @Nullable
+        private Boolean index;
+
+        @Nullable
+        private IndexOptions indexOptions;
+
+        @Nullable
+        private Integer maxShingleSize;
+
+        @Nullable
+        private Boolean norms;
+
+        @Nullable
+        private String searchAnalyzer;
+
+        @Nullable
+        private String searchQuoteAnalyzer;
+
+        @Nullable
+        private TermVectorOption termVector;
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable Boolean value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index_options}
+         */
+        public final Builder indexOptions(@Nullable IndexOptions value) {
+            this.indexOptions = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_shingle_size}
+         */
+        public final Builder maxShingleSize(@Nullable Integer value) {
+            this.maxShingleSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code norms}
+         */
+        public final Builder norms(@Nullable Boolean value) {
+            this.norms = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code search_analyzer}
+         */
+        public final Builder searchAnalyzer(@Nullable String value) {
+            this.searchAnalyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code search_quote_analyzer}
+         */
+        public final Builder searchQuoteAnalyzer(@Nullable String value) {
+            this.searchQuoteAnalyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code term_vector}
+         */
+        public final Builder termVector(@Nullable TermVectorOption value) {
+            this.termVector = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SearchAsYouTypeProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SearchAsYouTypeProperty build() {
+            _checkSingleUse();
+
+            return new SearchAsYouTypeProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SearchAsYouTypeProperty}
+     */
+    public static final JsonpDeserializer<SearchAsYouTypeProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SearchAsYouTypeProperty::setupSearchAsYouTypePropertyDeserializer
+    );
+
+    protected static void setupSearchAsYouTypePropertyDeserializer(ObjectDeserializer<SearchAsYouTypeProperty.Builder> op) {
+        setupCorePropertyBaseDeserializer(op);
+        op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
+        op.add(Builder::indexOptions, IndexOptions._DESERIALIZER, "index_options");
+        op.add(Builder::maxShingleSize, JsonpDeserializer.integerDeserializer(), "max_shingle_size");
+        op.add(Builder::norms, JsonpDeserializer.booleanDeserializer(), "norms");
+        op.add(Builder::searchAnalyzer, JsonpDeserializer.stringDeserializer(), "search_analyzer");
+        op.add(Builder::searchQuoteAnalyzer, JsonpDeserializer.stringDeserializer(), "search_quote_analyzer");
+        op.add(Builder::termVector, TermVectorOption._DESERIALIZER, "term_vector");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ShapeProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ShapeProperty.java
index 250ef87b6e..46df0cefad 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ShapeProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ShapeProperty.java
@@ -32,15 +32,15 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.ShapeProperty
 
@@ -48,191 +48,191 @@
  * The <code>shape</code> data type facilitates the indexing of and searching
  * with arbitrary <code>x, y</code> cartesian shapes such as rectangles and
  * polygons.
- * 
+ *
  */
 @JsonpDeserializable
 public class ShapeProperty extends DocValuesPropertyBase implements PropertyVariant {
-	@Nullable
-	private final Boolean coerce;
-
-	@Nullable
-	private final Boolean ignoreMalformed;
-
-	@Nullable
-	private final Boolean ignoreZValue;
-
-	@Nullable
-	private final GeoOrientation orientation;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShapeProperty(Builder builder) {
-		super(builder);
-
-		this.coerce = builder.coerce;
-		this.ignoreMalformed = builder.ignoreMalformed;
-		this.ignoreZValue = builder.ignoreZValue;
-		this.orientation = builder.orientation;
-
-	}
-
-	public static ShapeProperty of(Function<Builder, ObjectBuilder<ShapeProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Shape;
-	}
-
-	/**
-	 * API name: {@code coerce}
-	 */
-	@Nullable
-	public final Boolean coerce() {
-		return this.coerce;
-	}
-
-	/**
-	 * API name: {@code ignore_malformed}
-	 */
-	@Nullable
-	public final Boolean ignoreMalformed() {
-		return this.ignoreMalformed;
-	}
-
-	/**
-	 * API name: {@code ignore_z_value}
-	 */
-	@Nullable
-	public final Boolean ignoreZValue() {
-		return this.ignoreZValue;
-	}
-
-	/**
-	 * API name: {@code orientation}
-	 */
-	@Nullable
-	public final GeoOrientation orientation() {
-		return this.orientation;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "shape");
-		super.serializeInternal(generator, mapper);
-		if (this.coerce != null) {
-			generator.writeKey("coerce");
-			generator.write(this.coerce);
-
-		}
-		if (this.ignoreMalformed != null) {
-			generator.writeKey("ignore_malformed");
-			generator.write(this.ignoreMalformed);
-
-		}
-		if (this.ignoreZValue != null) {
-			generator.writeKey("ignore_z_value");
-			generator.write(this.ignoreZValue);
-
-		}
-		if (this.orientation != null) {
-			generator.writeKey("orientation");
-			this.orientation.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShapeProperty}.
-	 */
-
-	public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ShapeProperty> {
-		@Nullable
-		private Boolean coerce;
-
-		@Nullable
-		private Boolean ignoreMalformed;
-
-		@Nullable
-		private Boolean ignoreZValue;
-
-		@Nullable
-		private GeoOrientation orientation;
-
-		/**
-		 * API name: {@code coerce}
-		 */
-		public final Builder coerce(@Nullable Boolean value) {
-			this.coerce = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_malformed}
-		 */
-		public final Builder ignoreMalformed(@Nullable Boolean value) {
-			this.ignoreMalformed = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_z_value}
-		 */
-		public final Builder ignoreZValue(@Nullable Boolean value) {
-			this.ignoreZValue = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code orientation}
-		 */
-		public final Builder orientation(@Nullable GeoOrientation value) {
-			this.orientation = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShapeProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShapeProperty build() {
-			_checkSingleUse();
-
-			return new ShapeProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShapeProperty}
-	 */
-	public static final JsonpDeserializer<ShapeProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShapeProperty::setupShapePropertyDeserializer);
-
-	protected static void setupShapePropertyDeserializer(ObjectDeserializer<ShapeProperty.Builder> op) {
-		DocValuesPropertyBase.setupDocValuesPropertyBaseDeserializer(op);
-		op.add(Builder::coerce, JsonpDeserializer.booleanDeserializer(), "coerce");
-		op.add(Builder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
-		op.add(Builder::ignoreZValue, JsonpDeserializer.booleanDeserializer(), "ignore_z_value");
-		op.add(Builder::orientation, GeoOrientation._DESERIALIZER, "orientation");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Boolean coerce;
+
+    @Nullable
+    private final Boolean ignoreMalformed;
+
+    @Nullable
+    private final Boolean ignoreZValue;
+
+    @Nullable
+    private final GeoOrientation orientation;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShapeProperty(Builder builder) {
+        super(builder);
+
+        this.coerce = builder.coerce;
+        this.ignoreMalformed = builder.ignoreMalformed;
+        this.ignoreZValue = builder.ignoreZValue;
+        this.orientation = builder.orientation;
+
+    }
+
+    public static ShapeProperty of(Function<Builder, ObjectBuilder<ShapeProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Shape;
+    }
+
+    /**
+     * API name: {@code coerce}
+     */
+    @Nullable
+    public final Boolean coerce() {
+        return this.coerce;
+    }
+
+    /**
+     * API name: {@code ignore_malformed}
+     */
+    @Nullable
+    public final Boolean ignoreMalformed() {
+        return this.ignoreMalformed;
+    }
+
+    /**
+     * API name: {@code ignore_z_value}
+     */
+    @Nullable
+    public final Boolean ignoreZValue() {
+        return this.ignoreZValue;
+    }
+
+    /**
+     * API name: {@code orientation}
+     */
+    @Nullable
+    public final GeoOrientation orientation() {
+        return this.orientation;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "shape");
+        super.serializeInternal(generator, mapper);
+        if (this.coerce != null) {
+            generator.writeKey("coerce");
+            generator.write(this.coerce);
+
+        }
+        if (this.ignoreMalformed != null) {
+            generator.writeKey("ignore_malformed");
+            generator.write(this.ignoreMalformed);
+
+        }
+        if (this.ignoreZValue != null) {
+            generator.writeKey("ignore_z_value");
+            generator.write(this.ignoreZValue);
+
+        }
+        if (this.orientation != null) {
+            generator.writeKey("orientation");
+            this.orientation.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShapeProperty}.
+     */
+
+    public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<ShapeProperty> {
+        @Nullable
+        private Boolean coerce;
+
+        @Nullable
+        private Boolean ignoreMalformed;
+
+        @Nullable
+        private Boolean ignoreZValue;
+
+        @Nullable
+        private GeoOrientation orientation;
+
+        /**
+         * API name: {@code coerce}
+         */
+        public final Builder coerce(@Nullable Boolean value) {
+            this.coerce = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_malformed}
+         */
+        public final Builder ignoreMalformed(@Nullable Boolean value) {
+            this.ignoreMalformed = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_z_value}
+         */
+        public final Builder ignoreZValue(@Nullable Boolean value) {
+            this.ignoreZValue = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code orientation}
+         */
+        public final Builder orientation(@Nullable GeoOrientation value) {
+            this.orientation = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShapeProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShapeProperty build() {
+            _checkSingleUse();
+
+            return new ShapeProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShapeProperty}
+     */
+    public static final JsonpDeserializer<ShapeProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShapeProperty::setupShapePropertyDeserializer
+    );
+
+    protected static void setupShapePropertyDeserializer(ObjectDeserializer<ShapeProperty.Builder> op) {
+        DocValuesPropertyBase.setupDocValuesPropertyBaseDeserializer(op);
+        op.add(Builder::coerce, JsonpDeserializer.booleanDeserializer(), "coerce");
+        op.add(Builder::ignoreMalformed, JsonpDeserializer.booleanDeserializer(), "ignore_malformed");
+        op.add(Builder::ignoreZValue, JsonpDeserializer.booleanDeserializer(), "ignore_z_value");
+        op.add(Builder::orientation, GeoOrientation._DESERIALIZER, "orientation");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ShortNumberProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ShortNumberProperty.java
index 62870479d5..fd9e1694c8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ShortNumberProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/ShortNumberProperty.java
@@ -32,116 +32,115 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.ShortNumberProperty
 
-
 @JsonpDeserializable
 public class ShortNumberProperty extends StandardNumberProperty implements PropertyVariant {
-	@Nullable
-	private final Number nullValue;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShortNumberProperty(Builder builder) {
-		super(builder);
-
-		this.nullValue = builder.nullValue;
-
-	}
-
-	public static ShortNumberProperty of(Function<Builder, ObjectBuilder<ShortNumberProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Short;
-	}
-
-	/**
-	 * API name: {@code null_value}
-	 */
-	@Nullable
-	public final Number nullValue() {
-		return this.nullValue;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "short");
-		super.serializeInternal(generator, mapper);
-		if (this.nullValue != null) {
-			generator.writeKey("null_value");
-			generator.write(this.nullValue.doubleValue());
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShortNumberProperty}.
-	 */
-
-	public static class Builder extends StandardNumberProperty.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ShortNumberProperty> {
-		@Nullable
-		private Number nullValue;
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(@Nullable Number value) {
-			this.nullValue = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShortNumberProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShortNumberProperty build() {
-			_checkSingleUse();
-
-			return new ShortNumberProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShortNumberProperty}
-	 */
-	public static final JsonpDeserializer<ShortNumberProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ShortNumberProperty::setupShortNumberPropertyDeserializer);
-
-	protected static void setupShortNumberPropertyDeserializer(ObjectDeserializer<ShortNumberProperty.Builder> op) {
-		StandardNumberProperty.setupStandardNumberPropertyDeserializer(op);
-		op.add(Builder::nullValue, JsonpDeserializer.numberDeserializer(), "null_value");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Number nullValue;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShortNumberProperty(Builder builder) {
+        super(builder);
+
+        this.nullValue = builder.nullValue;
+
+    }
+
+    public static ShortNumberProperty of(Function<Builder, ObjectBuilder<ShortNumberProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Short;
+    }
+
+    /**
+     * API name: {@code null_value}
+     */
+    @Nullable
+    public final Number nullValue() {
+        return this.nullValue;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "short");
+        super.serializeInternal(generator, mapper);
+        if (this.nullValue != null) {
+            generator.writeKey("null_value");
+            generator.write(this.nullValue.doubleValue());
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShortNumberProperty}.
+     */
+
+    public static class Builder extends StandardNumberProperty.AbstractBuilder<Builder> implements ObjectBuilder<ShortNumberProperty> {
+        @Nullable
+        private Number nullValue;
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(@Nullable Number value) {
+            this.nullValue = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShortNumberProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShortNumberProperty build() {
+            _checkSingleUse();
+
+            return new ShortNumberProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShortNumberProperty}
+     */
+    public static final JsonpDeserializer<ShortNumberProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShortNumberProperty::setupShortNumberPropertyDeserializer
+    );
+
+    protected static void setupShortNumberPropertyDeserializer(ObjectDeserializer<ShortNumberProperty.Builder> op) {
+        StandardNumberProperty.setupStandardNumberPropertyDeserializer(op);
+        op.add(Builder::nullValue, JsonpDeserializer.numberDeserializer(), "null_value");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SizeField.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SizeField.java
index 38767bf7db..e3cca8d5e0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SizeField.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SizeField.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,93 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.mapping.SizeField
 
-
 @JsonpDeserializable
 public class SizeField implements JsonpSerializable {
-	private final boolean enabled;
+    private final boolean enabled;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private SizeField(Builder builder) {
+    private SizeField(Builder builder) {
 
-		this.enabled = ApiTypeHelper.requireNonNull(builder.enabled, this, "enabled");
+        this.enabled = ApiTypeHelper.requireNonNull(builder.enabled, this, "enabled");
 
-	}
+    }
 
-	public static SizeField of(Function<Builder, ObjectBuilder<SizeField>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static SizeField of(Function<Builder, ObjectBuilder<SizeField>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code enabled}
-	 */
-	public final boolean enabled() {
-		return this.enabled;
-	}
+    /**
+     * Required - API name: {@code enabled}
+     */
+    public final boolean enabled() {
+        return this.enabled;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("enabled");
-		generator.write(this.enabled);
+        generator.writeKey("enabled");
+        generator.write(this.enabled);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link SizeField}.
-	 */
+    /**
+     * Builder for {@link SizeField}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SizeField> {
-		private Boolean enabled;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SizeField> {
+        private Boolean enabled;
 
-		/**
-		 * Required - API name: {@code enabled}
-		 */
-		public final Builder enabled(boolean value) {
-			this.enabled = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code enabled}
+         */
+        public final Builder enabled(boolean value) {
+            this.enabled = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link SizeField}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SizeField build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link SizeField}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SizeField build() {
+            _checkSingleUse();
 
-			return new SizeField(this);
-		}
-	}
+            return new SizeField(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link SizeField}
-	 */
-	public static final JsonpDeserializer<SizeField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SizeField::setupSizeFieldDeserializer);
+    /**
+     * Json deserializer for {@link SizeField}
+     */
+    public static final JsonpDeserializer<SizeField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SizeField::setupSizeFieldDeserializer
+    );
 
-	protected static void setupSizeFieldDeserializer(ObjectDeserializer<SizeField.Builder> op) {
+    protected static void setupSizeFieldDeserializer(ObjectDeserializer<SizeField.Builder> op) {
 
-		op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
+        op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SourceField.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SourceField.java
index 53b4057ce0..8bad7f6f84 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SourceField.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SourceField.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,249 +45,244 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.SourceField
 
-
 @JsonpDeserializable
 public class SourceField implements JsonpSerializable {
-	@Nullable
-	private final Boolean compress;
-
-	@Nullable
-	private final String compressThreshold;
-
-	@Nullable
-	private final Boolean enabled;
-
-	private final List<String> excludes;
-
-	private final List<String> includes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SourceField(Builder builder) {
-
-		this.compress = builder.compress;
-		this.compressThreshold = builder.compressThreshold;
-		this.enabled = builder.enabled;
-		this.excludes = ApiTypeHelper.unmodifiable(builder.excludes);
-		this.includes = ApiTypeHelper.unmodifiable(builder.includes);
-
-	}
-
-	public static SourceField of(Function<Builder, ObjectBuilder<SourceField>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code compress}
-	 */
-	@Nullable
-	public final Boolean compress() {
-		return this.compress;
-	}
-
-	/**
-	 * API name: {@code compress_threshold}
-	 */
-	@Nullable
-	public final String compressThreshold() {
-		return this.compressThreshold;
-	}
-
-	/**
-	 * API name: {@code enabled}
-	 */
-	@Nullable
-	public final Boolean enabled() {
-		return this.enabled;
-	}
-
-	/**
-	 * API name: {@code excludes}
-	 */
-	public final List<String> excludes() {
-		return this.excludes;
-	}
-
-	/**
-	 * API name: {@code includes}
-	 */
-	public final List<String> includes() {
-		return this.includes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.compress != null) {
-			generator.writeKey("compress");
-			generator.write(this.compress);
-
-		}
-		if (this.compressThreshold != null) {
-			generator.writeKey("compress_threshold");
-			generator.write(this.compressThreshold);
-
-		}
-		if (this.enabled != null) {
-			generator.writeKey("enabled");
-			generator.write(this.enabled);
-
-		}
-		if (ApiTypeHelper.isDefined(this.excludes)) {
-			generator.writeKey("excludes");
-			generator.writeStartArray();
-			for (String item0 : this.excludes) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.includes)) {
-			generator.writeKey("includes");
-			generator.writeStartArray();
-			for (String item0 : this.includes) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SourceField}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SourceField> {
-		@Nullable
-		private Boolean compress;
-
-		@Nullable
-		private String compressThreshold;
-
-		@Nullable
-		private Boolean enabled;
-
-		@Nullable
-		private List<String> excludes;
-
-		@Nullable
-		private List<String> includes;
-
-		/**
-		 * API name: {@code compress}
-		 */
-		public final Builder compress(@Nullable Boolean value) {
-			this.compress = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code compress_threshold}
-		 */
-		public final Builder compressThreshold(@Nullable String value) {
-			this.compressThreshold = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code enabled}
-		 */
-		public final Builder enabled(@Nullable Boolean value) {
-			this.enabled = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code excludes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>excludes</code>.
-		 */
-		public final Builder excludes(List<String> list) {
-			this.excludes = _listAddAll(this.excludes, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code excludes}
-		 * <p>
-		 * Adds one or more values to <code>excludes</code>.
-		 */
-		public final Builder excludes(String value, String... values) {
-			this.excludes = _listAdd(this.excludes, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code includes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>includes</code>.
-		 */
-		public final Builder includes(List<String> list) {
-			this.includes = _listAddAll(this.includes, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code includes}
-		 * <p>
-		 * Adds one or more values to <code>includes</code>.
-		 */
-		public final Builder includes(String value, String... values) {
-			this.includes = _listAdd(this.includes, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SourceField}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SourceField build() {
-			_checkSingleUse();
-
-			return new SourceField(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SourceField}
-	 */
-	public static final JsonpDeserializer<SourceField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SourceField::setupSourceFieldDeserializer);
-
-	protected static void setupSourceFieldDeserializer(ObjectDeserializer<SourceField.Builder> op) {
-
-		op.add(Builder::compress, JsonpDeserializer.booleanDeserializer(), "compress");
-		op.add(Builder::compressThreshold, JsonpDeserializer.stringDeserializer(), "compress_threshold");
-		op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
-		op.add(Builder::excludes, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"excludes");
-		op.add(Builder::includes, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"includes");
-
-	}
+    @Nullable
+    private final Boolean compress;
+
+    @Nullable
+    private final String compressThreshold;
+
+    @Nullable
+    private final Boolean enabled;
+
+    private final List<String> excludes;
+
+    private final List<String> includes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SourceField(Builder builder) {
+
+        this.compress = builder.compress;
+        this.compressThreshold = builder.compressThreshold;
+        this.enabled = builder.enabled;
+        this.excludes = ApiTypeHelper.unmodifiable(builder.excludes);
+        this.includes = ApiTypeHelper.unmodifiable(builder.includes);
+
+    }
+
+    public static SourceField of(Function<Builder, ObjectBuilder<SourceField>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code compress}
+     */
+    @Nullable
+    public final Boolean compress() {
+        return this.compress;
+    }
+
+    /**
+     * API name: {@code compress_threshold}
+     */
+    @Nullable
+    public final String compressThreshold() {
+        return this.compressThreshold;
+    }
+
+    /**
+     * API name: {@code enabled}
+     */
+    @Nullable
+    public final Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * API name: {@code excludes}
+     */
+    public final List<String> excludes() {
+        return this.excludes;
+    }
+
+    /**
+     * API name: {@code includes}
+     */
+    public final List<String> includes() {
+        return this.includes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.compress != null) {
+            generator.writeKey("compress");
+            generator.write(this.compress);
+
+        }
+        if (this.compressThreshold != null) {
+            generator.writeKey("compress_threshold");
+            generator.write(this.compressThreshold);
+
+        }
+        if (this.enabled != null) {
+            generator.writeKey("enabled");
+            generator.write(this.enabled);
+
+        }
+        if (ApiTypeHelper.isDefined(this.excludes)) {
+            generator.writeKey("excludes");
+            generator.writeStartArray();
+            for (String item0 : this.excludes) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.includes)) {
+            generator.writeKey("includes");
+            generator.writeStartArray();
+            for (String item0 : this.includes) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SourceField}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SourceField> {
+        @Nullable
+        private Boolean compress;
+
+        @Nullable
+        private String compressThreshold;
+
+        @Nullable
+        private Boolean enabled;
+
+        @Nullable
+        private List<String> excludes;
+
+        @Nullable
+        private List<String> includes;
+
+        /**
+         * API name: {@code compress}
+         */
+        public final Builder compress(@Nullable Boolean value) {
+            this.compress = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code compress_threshold}
+         */
+        public final Builder compressThreshold(@Nullable String value) {
+            this.compressThreshold = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code enabled}
+         */
+        public final Builder enabled(@Nullable Boolean value) {
+            this.enabled = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code excludes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>excludes</code>.
+         */
+        public final Builder excludes(List<String> list) {
+            this.excludes = _listAddAll(this.excludes, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code excludes}
+         * <p>
+         * Adds one or more values to <code>excludes</code>.
+         */
+        public final Builder excludes(String value, String... values) {
+            this.excludes = _listAdd(this.excludes, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code includes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>includes</code>.
+         */
+        public final Builder includes(List<String> list) {
+            this.includes = _listAddAll(this.includes, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code includes}
+         * <p>
+         * Adds one or more values to <code>includes</code>.
+         */
+        public final Builder includes(String value, String... values) {
+            this.includes = _listAdd(this.includes, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link SourceField}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SourceField build() {
+            _checkSingleUse();
+
+            return new SourceField(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SourceField}
+     */
+    public static final JsonpDeserializer<SourceField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SourceField::setupSourceFieldDeserializer
+    );
+
+    protected static void setupSourceFieldDeserializer(ObjectDeserializer<SourceField.Builder> op) {
+
+        op.add(Builder::compress, JsonpDeserializer.booleanDeserializer(), "compress");
+        op.add(Builder::compressThreshold, JsonpDeserializer.stringDeserializer(), "compress_threshold");
+        op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
+        op.add(Builder::excludes, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "excludes");
+        op.add(Builder::includes, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "includes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/StandardNumberProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/StandardNumberProperty.java
index 9d053f201c..62293a7574 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/StandardNumberProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/StandardNumberProperty.java
@@ -32,137 +32,135 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.StandardNumberProperty
 
-
-
 public abstract class StandardNumberProperty extends NumberPropertyBase {
-	@Nullable
-	private final Boolean coerce;
-
-	@Nullable
-	private final Script script;
-
-	@Nullable
-	private final OnScriptError onScriptError;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected StandardNumberProperty(AbstractBuilder<?> builder) {
-		super(builder);
-
-		this.coerce = builder.coerce;
-		this.script = builder.script;
-		this.onScriptError = builder.onScriptError;
-
-	}
-
-	/**
-	 * API name: {@code coerce}
-	 */
-	@Nullable
-	public final Boolean coerce() {
-		return this.coerce;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final Script script() {
-		return this.script;
-	}
-
-	/**
-	 * API name: {@code on_script_error}
-	 */
-	@Nullable
-	public final OnScriptError onScriptError() {
-		return this.onScriptError;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.coerce != null) {
-			generator.writeKey("coerce");
-			generator.write(this.coerce);
-
-		}
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-		if (this.onScriptError != null) {
-			generator.writeKey("on_script_error");
-			this.onScriptError.serialize(generator, mapper);
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				NumberPropertyBase.AbstractBuilder<BuilderT> {
-		@Nullable
-		private Boolean coerce;
-
-		@Nullable
-		private Script script;
-
-		@Nullable
-		private OnScriptError onScriptError;
-
-		/**
-		 * API name: {@code coerce}
-		 */
-		public final BuilderT coerce(@Nullable Boolean value) {
-			this.coerce = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final BuilderT script(@Nullable Script value) {
-			this.script = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final BuilderT script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code on_script_error}
-		 */
-		public final BuilderT onScriptError(@Nullable OnScriptError value) {
-			this.onScriptError = value;
-			return self();
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupStandardNumberPropertyDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		setupNumberPropertyBaseDeserializer(op);
-		op.add(AbstractBuilder::coerce, JsonpDeserializer.booleanDeserializer(), "coerce");
-		op.add(AbstractBuilder::script, Script._DESERIALIZER, "script");
-		op.add(AbstractBuilder::onScriptError, OnScriptError._DESERIALIZER, "on_script_error");
-
-	}
+    @Nullable
+    private final Boolean coerce;
+
+    @Nullable
+    private final Script script;
+
+    @Nullable
+    private final OnScriptError onScriptError;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected StandardNumberProperty(AbstractBuilder<?> builder) {
+        super(builder);
+
+        this.coerce = builder.coerce;
+        this.script = builder.script;
+        this.onScriptError = builder.onScriptError;
+
+    }
+
+    /**
+     * API name: {@code coerce}
+     */
+    @Nullable
+    public final Boolean coerce() {
+        return this.coerce;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final Script script() {
+        return this.script;
+    }
+
+    /**
+     * API name: {@code on_script_error}
+     */
+    @Nullable
+    public final OnScriptError onScriptError() {
+        return this.onScriptError;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.coerce != null) {
+            generator.writeKey("coerce");
+            generator.write(this.coerce);
+
+        }
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+        if (this.onScriptError != null) {
+            generator.writeKey("on_script_error");
+            this.onScriptError.serialize(generator, mapper);
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends NumberPropertyBase.AbstractBuilder<
+        BuilderT> {
+        @Nullable
+        private Boolean coerce;
+
+        @Nullable
+        private Script script;
+
+        @Nullable
+        private OnScriptError onScriptError;
+
+        /**
+         * API name: {@code coerce}
+         */
+        public final BuilderT coerce(@Nullable Boolean value) {
+            this.coerce = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final BuilderT script(@Nullable Script value) {
+            this.script = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final BuilderT script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * API name: {@code on_script_error}
+         */
+        public final BuilderT onScriptError(@Nullable OnScriptError value) {
+            this.onScriptError = value;
+            return self();
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupStandardNumberPropertyDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
+        setupNumberPropertyBaseDeserializer(op);
+        op.add(AbstractBuilder::coerce, JsonpDeserializer.booleanDeserializer(), "coerce");
+        op.add(AbstractBuilder::script, Script._DESERIALIZER, "script");
+        op.add(AbstractBuilder::onScriptError, OnScriptError._DESERIALIZER, "on_script_error");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SuggestContext.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SuggestContext.java
index 2a413854c2..865b45a05d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SuggestContext.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SuggestContext.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,177 +44,175 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.SuggestContext
 
-
 @JsonpDeserializable
 public class SuggestContext implements JsonpSerializable {
-	private final String name;
+    private final String name;
 
-	@Nullable
-	private final String path;
+    @Nullable
+    private final String path;
 
-	private final String type;
+    private final String type;
 
-	@Nullable
-	private final String precision;
+    @Nullable
+    private final String precision;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private SuggestContext(Builder builder) {
+    private SuggestContext(Builder builder) {
 
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.path = builder.path;
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-		this.precision = builder.precision;
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.path = builder.path;
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.precision = builder.precision;
 
-	}
-
-	public static SuggestContext of(Function<Builder, ObjectBuilder<SuggestContext>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * API name: {@code path}
-	 */
-	@Nullable
-	public final String path() {
-		return this.path;
-	}
-
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * API name: {@code precision}
-	 */
-	@Nullable
-	public final String precision() {
-		return this.precision;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		if (this.path != null) {
-			generator.writeKey("path");
-			generator.write(this.path);
-
-		}
-		generator.writeKey("type");
-		generator.write(this.type);
-
-		if (this.precision != null) {
-			generator.writeKey("precision");
-			generator.write(this.precision);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SuggestContext}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SuggestContext> {
-		private String name;
-
-		@Nullable
-		private String path;
-
-		private String type;
-
-		@Nullable
-		private String precision;
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code path}
-		 */
-		public final Builder path(@Nullable String value) {
-			this.path = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code precision}
-		 */
-		public final Builder precision(@Nullable String value) {
-			this.precision = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SuggestContext}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SuggestContext build() {
-			_checkSingleUse();
-
-			return new SuggestContext(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SuggestContext}
-	 */
-	public static final JsonpDeserializer<SuggestContext> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SuggestContext::setupSuggestContextDeserializer);
-
-	protected static void setupSuggestContextDeserializer(ObjectDeserializer<SuggestContext.Builder> op) {
-
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-		op.add(Builder::precision, JsonpDeserializer.stringDeserializer(), "precision");
-
-	}
+    }
+
+    public static SuggestContext of(Function<Builder, ObjectBuilder<SuggestContext>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * API name: {@code path}
+     */
+    @Nullable
+    public final String path() {
+        return this.path;
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * API name: {@code precision}
+     */
+    @Nullable
+    public final String precision() {
+        return this.precision;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        if (this.path != null) {
+            generator.writeKey("path");
+            generator.write(this.path);
+
+        }
+        generator.writeKey("type");
+        generator.write(this.type);
+
+        if (this.precision != null) {
+            generator.writeKey("precision");
+            generator.write(this.precision);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SuggestContext}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SuggestContext> {
+        private String name;
+
+        @Nullable
+        private String path;
+
+        private String type;
+
+        @Nullable
+        private String precision;
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code path}
+         */
+        public final Builder path(@Nullable String value) {
+            this.path = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code precision}
+         */
+        public final Builder precision(@Nullable String value) {
+            this.precision = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link SuggestContext}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SuggestContext build() {
+            _checkSingleUse();
+
+            return new SuggestContext(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SuggestContext}
+     */
+    public static final JsonpDeserializer<SuggestContext> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SuggestContext::setupSuggestContextDeserializer
+    );
+
+    protected static void setupSuggestContextDeserializer(ObjectDeserializer<SuggestContext.Builder> op) {
+
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+        op.add(Builder::precision, JsonpDeserializer.stringDeserializer(), "precision");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TermVectorOption.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TermVectorOption.java
index 29bb13ec54..be87835d1b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TermVectorOption.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TermVectorOption.java
@@ -35,35 +35,33 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum TermVectorOption implements JsonEnum {
-	No("no"),
+    No("no"),
 
-	Yes("yes"),
+    Yes("yes"),
 
-	WithOffsets("with_offsets"),
+    WithOffsets("with_offsets"),
 
-	WithPositions("with_positions"),
+    WithPositions("with_positions"),
 
-	WithPositionsOffsets("with_positions_offsets"),
+    WithPositionsOffsets("with_positions_offsets"),
 
-	WithPositionsOffsetsPayloads("with_positions_offsets_payloads"),
+    WithPositionsOffsetsPayloads("with_positions_offsets_payloads"),
 
-	WithPositionsPayloads("with_positions_payloads"),
+    WithPositionsPayloads("with_positions_payloads"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	TermVectorOption(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    TermVectorOption(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<TermVectorOption> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			TermVectorOption.values());
+    public static final JsonEnum.Deserializer<TermVectorOption> _DESERIALIZER = new JsonEnum.Deserializer<>(TermVectorOption.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TextIndexPrefixes.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TextIndexPrefixes.java
index db582c1ac9..9a1c7efa6f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TextIndexPrefixes.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TextIndexPrefixes.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,117 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.mapping.TextIndexPrefixes
 
-
 @JsonpDeserializable
 public class TextIndexPrefixes implements JsonpSerializable {
-	private final int maxChars;
-
-	private final int minChars;
-
-	// ---------------------------------------------------------------------------------------------
+    private final int maxChars;
 
-	private TextIndexPrefixes(Builder builder) {
+    private final int minChars;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.maxChars = ApiTypeHelper.requireNonNull(builder.maxChars, this, "maxChars");
-		this.minChars = ApiTypeHelper.requireNonNull(builder.minChars, this, "minChars");
+    private TextIndexPrefixes(Builder builder) {
 
-	}
+        this.maxChars = ApiTypeHelper.requireNonNull(builder.maxChars, this, "maxChars");
+        this.minChars = ApiTypeHelper.requireNonNull(builder.minChars, this, "minChars");
 
-	public static TextIndexPrefixes of(Function<Builder, ObjectBuilder<TextIndexPrefixes>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code max_chars}
-	 */
-	public final int maxChars() {
-		return this.maxChars;
-	}
+    public static TextIndexPrefixes of(Function<Builder, ObjectBuilder<TextIndexPrefixes>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code min_chars}
-	 */
-	public final int minChars() {
-		return this.minChars;
-	}
+    /**
+     * Required - API name: {@code max_chars}
+     */
+    public final int maxChars() {
+        return this.maxChars;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code min_chars}
+     */
+    public final int minChars() {
+        return this.minChars;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("max_chars");
-		generator.write(this.maxChars);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("min_chars");
-		generator.write(this.minChars);
+        generator.writeKey("max_chars");
+        generator.write(this.maxChars);
 
-	}
+        generator.writeKey("min_chars");
+        generator.write(this.minChars);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link TextIndexPrefixes}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TextIndexPrefixes> {
-		private Integer maxChars;
+    /**
+     * Builder for {@link TextIndexPrefixes}.
+     */
 
-		private Integer minChars;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TextIndexPrefixes> {
+        private Integer maxChars;
 
-		/**
-		 * Required - API name: {@code max_chars}
-		 */
-		public final Builder maxChars(int value) {
-			this.maxChars = value;
-			return this;
-		}
+        private Integer minChars;
 
-		/**
-		 * Required - API name: {@code min_chars}
-		 */
-		public final Builder minChars(int value) {
-			this.minChars = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code max_chars}
+         */
+        public final Builder maxChars(int value) {
+            this.maxChars = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link TextIndexPrefixes}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TextIndexPrefixes build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code min_chars}
+         */
+        public final Builder minChars(int value) {
+            this.minChars = value;
+            return this;
+        }
 
-			return new TextIndexPrefixes(this);
-		}
-	}
+        /**
+         * Builds a {@link TextIndexPrefixes}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TextIndexPrefixes build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new TextIndexPrefixes(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link TextIndexPrefixes}
-	 */
-	public static final JsonpDeserializer<TextIndexPrefixes> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, TextIndexPrefixes::setupTextIndexPrefixesDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupTextIndexPrefixesDeserializer(ObjectDeserializer<TextIndexPrefixes.Builder> op) {
+    /**
+     * Json deserializer for {@link TextIndexPrefixes}
+     */
+    public static final JsonpDeserializer<TextIndexPrefixes> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TextIndexPrefixes::setupTextIndexPrefixesDeserializer
+    );
 
-		op.add(Builder::maxChars, JsonpDeserializer.integerDeserializer(), "max_chars");
-		op.add(Builder::minChars, JsonpDeserializer.integerDeserializer(), "min_chars");
+    protected static void setupTextIndexPrefixesDeserializer(ObjectDeserializer<TextIndexPrefixes.Builder> op) {
 
-	}
+        op.add(Builder::maxChars, JsonpDeserializer.integerDeserializer(), "max_chars");
+        op.add(Builder::minChars, JsonpDeserializer.integerDeserializer(), "min_chars");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TextProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TextProperty.java
index d0b83ecf0e..50fa3f6923 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TextProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TextProperty.java
@@ -32,507 +32,507 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
-import org.opensearch.client.opensearch.indices.FielddataFrequencyFilter;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.indices.FielddataFrequencyFilter;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.TextProperty
 
-
 @JsonpDeserializable
 public class TextProperty extends CorePropertyBase implements PropertyVariant {
-	@Nullable
-	private final String analyzer;
-
-	@Nullable
-	private final Double boost;
-
-	@Nullable
-	private final Boolean eagerGlobalOrdinals;
-
-	@Nullable
-	private final Boolean fielddata;
-
-	@Nullable
-	private final FielddataFrequencyFilter fielddataFrequencyFilter;
-
-	@Nullable
-	private final Boolean index;
-
-	@Nullable
-	private final IndexOptions indexOptions;
-
-	@Nullable
-	private final Boolean indexPhrases;
-
-	@Nullable
-	private final TextIndexPrefixes indexPrefixes;
-
-	@Nullable
-	private final Boolean norms;
-
-	@Nullable
-	private final Integer positionIncrementGap;
-
-	@Nullable
-	private final String searchAnalyzer;
-
-	@Nullable
-	private final String searchQuoteAnalyzer;
-
-	@Nullable
-	private final TermVectorOption termVector;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TextProperty(Builder builder) {
-		super(builder);
-
-		this.analyzer = builder.analyzer;
-		this.boost = builder.boost;
-		this.eagerGlobalOrdinals = builder.eagerGlobalOrdinals;
-		this.fielddata = builder.fielddata;
-		this.fielddataFrequencyFilter = builder.fielddataFrequencyFilter;
-		this.index = builder.index;
-		this.indexOptions = builder.indexOptions;
-		this.indexPhrases = builder.indexPhrases;
-		this.indexPrefixes = builder.indexPrefixes;
-		this.norms = builder.norms;
-		this.positionIncrementGap = builder.positionIncrementGap;
-		this.searchAnalyzer = builder.searchAnalyzer;
-		this.searchQuoteAnalyzer = builder.searchQuoteAnalyzer;
-		this.termVector = builder.termVector;
-
-	}
-
-	public static TextProperty of(Function<Builder, ObjectBuilder<TextProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Text;
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * API name: {@code boost}
-	 */
-	@Nullable
-	public final Double boost() {
-		return this.boost;
-	}
-
-	/**
-	 * API name: {@code eager_global_ordinals}
-	 */
-	@Nullable
-	public final Boolean eagerGlobalOrdinals() {
-		return this.eagerGlobalOrdinals;
-	}
-
-	/**
-	 * API name: {@code fielddata}
-	 */
-	@Nullable
-	public final Boolean fielddata() {
-		return this.fielddata;
-	}
-
-	/**
-	 * API name: {@code fielddata_frequency_filter}
-	 */
-	@Nullable
-	public final FielddataFrequencyFilter fielddataFrequencyFilter() {
-		return this.fielddataFrequencyFilter;
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final Boolean index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code index_options}
-	 */
-	@Nullable
-	public final IndexOptions indexOptions() {
-		return this.indexOptions;
-	}
-
-	/**
-	 * API name: {@code index_phrases}
-	 */
-	@Nullable
-	public final Boolean indexPhrases() {
-		return this.indexPhrases;
-	}
-
-	/**
-	 * API name: {@code index_prefixes}
-	 */
-	@Nullable
-	public final TextIndexPrefixes indexPrefixes() {
-		return this.indexPrefixes;
-	}
-
-	/**
-	 * API name: {@code norms}
-	 */
-	@Nullable
-	public final Boolean norms() {
-		return this.norms;
-	}
-
-	/**
-	 * API name: {@code position_increment_gap}
-	 */
-	@Nullable
-	public final Integer positionIncrementGap() {
-		return this.positionIncrementGap;
-	}
-
-	/**
-	 * API name: {@code search_analyzer}
-	 */
-	@Nullable
-	public final String searchAnalyzer() {
-		return this.searchAnalyzer;
-	}
-
-	/**
-	 * API name: {@code search_quote_analyzer}
-	 */
-	@Nullable
-	public final String searchQuoteAnalyzer() {
-		return this.searchQuoteAnalyzer;
-	}
-
-	/**
-	 * API name: {@code term_vector}
-	 */
-	@Nullable
-	public final TermVectorOption termVector() {
-		return this.termVector;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "text");
-		super.serializeInternal(generator, mapper);
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			generator.write(this.analyzer);
-
-		}
-		if (this.boost != null) {
-			generator.writeKey("boost");
-			generator.write(this.boost);
-
-		}
-		if (this.eagerGlobalOrdinals != null) {
-			generator.writeKey("eager_global_ordinals");
-			generator.write(this.eagerGlobalOrdinals);
-
-		}
-		if (this.fielddata != null) {
-			generator.writeKey("fielddata");
-			generator.write(this.fielddata);
-
-		}
-		if (this.fielddataFrequencyFilter != null) {
-			generator.writeKey("fielddata_frequency_filter");
-			this.fielddataFrequencyFilter.serialize(generator, mapper);
-
-		}
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.indexOptions != null) {
-			generator.writeKey("index_options");
-			this.indexOptions.serialize(generator, mapper);
-		}
-		if (this.indexPhrases != null) {
-			generator.writeKey("index_phrases");
-			generator.write(this.indexPhrases);
-
-		}
-		if (this.indexPrefixes != null) {
-			generator.writeKey("index_prefixes");
-			this.indexPrefixes.serialize(generator, mapper);
-
-		}
-		if (this.norms != null) {
-			generator.writeKey("norms");
-			generator.write(this.norms);
-
-		}
-		if (this.positionIncrementGap != null) {
-			generator.writeKey("position_increment_gap");
-			generator.write(this.positionIncrementGap);
-
-		}
-		if (this.searchAnalyzer != null) {
-			generator.writeKey("search_analyzer");
-			generator.write(this.searchAnalyzer);
-
-		}
-		if (this.searchQuoteAnalyzer != null) {
-			generator.writeKey("search_quote_analyzer");
-			generator.write(this.searchQuoteAnalyzer);
-
-		}
-		if (this.termVector != null) {
-			generator.writeKey("term_vector");
-			this.termVector.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TextProperty}.
-	 */
-
-	public static class Builder extends CorePropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<TextProperty> {
-		@Nullable
-		private String analyzer;
-
-		@Nullable
-		private Double boost;
-
-		@Nullable
-		private Boolean eagerGlobalOrdinals;
-
-		@Nullable
-		private Boolean fielddata;
-
-		@Nullable
-		private FielddataFrequencyFilter fielddataFrequencyFilter;
-
-		@Nullable
-		private Boolean index;
-
-		@Nullable
-		private IndexOptions indexOptions;
-
-		@Nullable
-		private Boolean indexPhrases;
-
-		@Nullable
-		private TextIndexPrefixes indexPrefixes;
-
-		@Nullable
-		private Boolean norms;
-
-		@Nullable
-		private Integer positionIncrementGap;
-
-		@Nullable
-		private String searchAnalyzer;
-
-		@Nullable
-		private String searchQuoteAnalyzer;
-
-		@Nullable
-		private TermVectorOption termVector;
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code boost}
-		 */
-		public final Builder boost(@Nullable Double value) {
-			this.boost = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code eager_global_ordinals}
-		 */
-		public final Builder eagerGlobalOrdinals(@Nullable Boolean value) {
-			this.eagerGlobalOrdinals = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fielddata}
-		 */
-		public final Builder fielddata(@Nullable Boolean value) {
-			this.fielddata = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fielddata_frequency_filter}
-		 */
-		public final Builder fielddataFrequencyFilter(@Nullable FielddataFrequencyFilter value) {
-			this.fielddataFrequencyFilter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fielddata_frequency_filter}
-		 */
-		public final Builder fielddataFrequencyFilter(
-				Function<FielddataFrequencyFilter.Builder, ObjectBuilder<FielddataFrequencyFilter>> fn) {
-			return this.fielddataFrequencyFilter(fn.apply(new FielddataFrequencyFilter.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable Boolean value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_options}
-		 */
-		public final Builder indexOptions(@Nullable IndexOptions value) {
-			this.indexOptions = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_phrases}
-		 */
-		public final Builder indexPhrases(@Nullable Boolean value) {
-			this.indexPhrases = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_prefixes}
-		 */
-		public final Builder indexPrefixes(@Nullable TextIndexPrefixes value) {
-			this.indexPrefixes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_prefixes}
-		 */
-		public final Builder indexPrefixes(Function<TextIndexPrefixes.Builder, ObjectBuilder<TextIndexPrefixes>> fn) {
-			return this.indexPrefixes(fn.apply(new TextIndexPrefixes.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code norms}
-		 */
-		public final Builder norms(@Nullable Boolean value) {
-			this.norms = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code position_increment_gap}
-		 */
-		public final Builder positionIncrementGap(@Nullable Integer value) {
-			this.positionIncrementGap = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code search_analyzer}
-		 */
-		public final Builder searchAnalyzer(@Nullable String value) {
-			this.searchAnalyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code search_quote_analyzer}
-		 */
-		public final Builder searchQuoteAnalyzer(@Nullable String value) {
-			this.searchQuoteAnalyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code term_vector}
-		 */
-		public final Builder termVector(@Nullable TermVectorOption value) {
-			this.termVector = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TextProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TextProperty build() {
-			_checkSingleUse();
-
-			return new TextProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TextProperty}
-	 */
-	public static final JsonpDeserializer<TextProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TextProperty::setupTextPropertyDeserializer);
-
-	protected static void setupTextPropertyDeserializer(ObjectDeserializer<TextProperty.Builder> op) {
-		CorePropertyBase.setupCorePropertyBaseDeserializer(op);
-		op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(Builder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
-		op.add(Builder::eagerGlobalOrdinals, JsonpDeserializer.booleanDeserializer(), "eager_global_ordinals");
-		op.add(Builder::fielddata, JsonpDeserializer.booleanDeserializer(), "fielddata");
-		op.add(Builder::fielddataFrequencyFilter, FielddataFrequencyFilter._DESERIALIZER, "fielddata_frequency_filter");
-		op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
-		op.add(Builder::indexOptions, IndexOptions._DESERIALIZER, "index_options");
-		op.add(Builder::indexPhrases, JsonpDeserializer.booleanDeserializer(), "index_phrases");
-		op.add(Builder::indexPrefixes, TextIndexPrefixes._DESERIALIZER, "index_prefixes");
-		op.add(Builder::norms, JsonpDeserializer.booleanDeserializer(), "norms");
-		op.add(Builder::positionIncrementGap, JsonpDeserializer.integerDeserializer(), "position_increment_gap");
-		op.add(Builder::searchAnalyzer, JsonpDeserializer.stringDeserializer(), "search_analyzer");
-		op.add(Builder::searchQuoteAnalyzer, JsonpDeserializer.stringDeserializer(), "search_quote_analyzer");
-		op.add(Builder::termVector, TermVectorOption._DESERIALIZER, "term_vector");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final String analyzer;
+
+    @Nullable
+    private final Double boost;
+
+    @Nullable
+    private final Boolean eagerGlobalOrdinals;
+
+    @Nullable
+    private final Boolean fielddata;
+
+    @Nullable
+    private final FielddataFrequencyFilter fielddataFrequencyFilter;
+
+    @Nullable
+    private final Boolean index;
+
+    @Nullable
+    private final IndexOptions indexOptions;
+
+    @Nullable
+    private final Boolean indexPhrases;
+
+    @Nullable
+    private final TextIndexPrefixes indexPrefixes;
+
+    @Nullable
+    private final Boolean norms;
+
+    @Nullable
+    private final Integer positionIncrementGap;
+
+    @Nullable
+    private final String searchAnalyzer;
+
+    @Nullable
+    private final String searchQuoteAnalyzer;
+
+    @Nullable
+    private final TermVectorOption termVector;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TextProperty(Builder builder) {
+        super(builder);
+
+        this.analyzer = builder.analyzer;
+        this.boost = builder.boost;
+        this.eagerGlobalOrdinals = builder.eagerGlobalOrdinals;
+        this.fielddata = builder.fielddata;
+        this.fielddataFrequencyFilter = builder.fielddataFrequencyFilter;
+        this.index = builder.index;
+        this.indexOptions = builder.indexOptions;
+        this.indexPhrases = builder.indexPhrases;
+        this.indexPrefixes = builder.indexPrefixes;
+        this.norms = builder.norms;
+        this.positionIncrementGap = builder.positionIncrementGap;
+        this.searchAnalyzer = builder.searchAnalyzer;
+        this.searchQuoteAnalyzer = builder.searchQuoteAnalyzer;
+        this.termVector = builder.termVector;
+
+    }
+
+    public static TextProperty of(Function<Builder, ObjectBuilder<TextProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Text;
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * API name: {@code boost}
+     */
+    @Nullable
+    public final Double boost() {
+        return this.boost;
+    }
+
+    /**
+     * API name: {@code eager_global_ordinals}
+     */
+    @Nullable
+    public final Boolean eagerGlobalOrdinals() {
+        return this.eagerGlobalOrdinals;
+    }
+
+    /**
+     * API name: {@code fielddata}
+     */
+    @Nullable
+    public final Boolean fielddata() {
+        return this.fielddata;
+    }
+
+    /**
+     * API name: {@code fielddata_frequency_filter}
+     */
+    @Nullable
+    public final FielddataFrequencyFilter fielddataFrequencyFilter() {
+        return this.fielddataFrequencyFilter;
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    @Nullable
+    public final Boolean index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code index_options}
+     */
+    @Nullable
+    public final IndexOptions indexOptions() {
+        return this.indexOptions;
+    }
+
+    /**
+     * API name: {@code index_phrases}
+     */
+    @Nullable
+    public final Boolean indexPhrases() {
+        return this.indexPhrases;
+    }
+
+    /**
+     * API name: {@code index_prefixes}
+     */
+    @Nullable
+    public final TextIndexPrefixes indexPrefixes() {
+        return this.indexPrefixes;
+    }
+
+    /**
+     * API name: {@code norms}
+     */
+    @Nullable
+    public final Boolean norms() {
+        return this.norms;
+    }
+
+    /**
+     * API name: {@code position_increment_gap}
+     */
+    @Nullable
+    public final Integer positionIncrementGap() {
+        return this.positionIncrementGap;
+    }
+
+    /**
+     * API name: {@code search_analyzer}
+     */
+    @Nullable
+    public final String searchAnalyzer() {
+        return this.searchAnalyzer;
+    }
+
+    /**
+     * API name: {@code search_quote_analyzer}
+     */
+    @Nullable
+    public final String searchQuoteAnalyzer() {
+        return this.searchQuoteAnalyzer;
+    }
+
+    /**
+     * API name: {@code term_vector}
+     */
+    @Nullable
+    public final TermVectorOption termVector() {
+        return this.termVector;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "text");
+        super.serializeInternal(generator, mapper);
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            generator.write(this.analyzer);
+
+        }
+        if (this.boost != null) {
+            generator.writeKey("boost");
+            generator.write(this.boost);
+
+        }
+        if (this.eagerGlobalOrdinals != null) {
+            generator.writeKey("eager_global_ordinals");
+            generator.write(this.eagerGlobalOrdinals);
+
+        }
+        if (this.fielddata != null) {
+            generator.writeKey("fielddata");
+            generator.write(this.fielddata);
+
+        }
+        if (this.fielddataFrequencyFilter != null) {
+            generator.writeKey("fielddata_frequency_filter");
+            this.fielddataFrequencyFilter.serialize(generator, mapper);
+
+        }
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.indexOptions != null) {
+            generator.writeKey("index_options");
+            this.indexOptions.serialize(generator, mapper);
+        }
+        if (this.indexPhrases != null) {
+            generator.writeKey("index_phrases");
+            generator.write(this.indexPhrases);
+
+        }
+        if (this.indexPrefixes != null) {
+            generator.writeKey("index_prefixes");
+            this.indexPrefixes.serialize(generator, mapper);
+
+        }
+        if (this.norms != null) {
+            generator.writeKey("norms");
+            generator.write(this.norms);
+
+        }
+        if (this.positionIncrementGap != null) {
+            generator.writeKey("position_increment_gap");
+            generator.write(this.positionIncrementGap);
+
+        }
+        if (this.searchAnalyzer != null) {
+            generator.writeKey("search_analyzer");
+            generator.write(this.searchAnalyzer);
+
+        }
+        if (this.searchQuoteAnalyzer != null) {
+            generator.writeKey("search_quote_analyzer");
+            generator.write(this.searchQuoteAnalyzer);
+
+        }
+        if (this.termVector != null) {
+            generator.writeKey("term_vector");
+            this.termVector.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TextProperty}.
+     */
+
+    public static class Builder extends CorePropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<TextProperty> {
+        @Nullable
+        private String analyzer;
+
+        @Nullable
+        private Double boost;
+
+        @Nullable
+        private Boolean eagerGlobalOrdinals;
+
+        @Nullable
+        private Boolean fielddata;
+
+        @Nullable
+        private FielddataFrequencyFilter fielddataFrequencyFilter;
+
+        @Nullable
+        private Boolean index;
+
+        @Nullable
+        private IndexOptions indexOptions;
+
+        @Nullable
+        private Boolean indexPhrases;
+
+        @Nullable
+        private TextIndexPrefixes indexPrefixes;
+
+        @Nullable
+        private Boolean norms;
+
+        @Nullable
+        private Integer positionIncrementGap;
+
+        @Nullable
+        private String searchAnalyzer;
+
+        @Nullable
+        private String searchQuoteAnalyzer;
+
+        @Nullable
+        private TermVectorOption termVector;
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code boost}
+         */
+        public final Builder boost(@Nullable Double value) {
+            this.boost = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code eager_global_ordinals}
+         */
+        public final Builder eagerGlobalOrdinals(@Nullable Boolean value) {
+            this.eagerGlobalOrdinals = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fielddata}
+         */
+        public final Builder fielddata(@Nullable Boolean value) {
+            this.fielddata = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fielddata_frequency_filter}
+         */
+        public final Builder fielddataFrequencyFilter(@Nullable FielddataFrequencyFilter value) {
+            this.fielddataFrequencyFilter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fielddata_frequency_filter}
+         */
+        public final Builder fielddataFrequencyFilter(
+            Function<FielddataFrequencyFilter.Builder, ObjectBuilder<FielddataFrequencyFilter>> fn
+        ) {
+            return this.fielddataFrequencyFilter(fn.apply(new FielddataFrequencyFilter.Builder()).build());
+        }
+
+        /**
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable Boolean value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index_options}
+         */
+        public final Builder indexOptions(@Nullable IndexOptions value) {
+            this.indexOptions = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index_phrases}
+         */
+        public final Builder indexPhrases(@Nullable Boolean value) {
+            this.indexPhrases = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index_prefixes}
+         */
+        public final Builder indexPrefixes(@Nullable TextIndexPrefixes value) {
+            this.indexPrefixes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index_prefixes}
+         */
+        public final Builder indexPrefixes(Function<TextIndexPrefixes.Builder, ObjectBuilder<TextIndexPrefixes>> fn) {
+            return this.indexPrefixes(fn.apply(new TextIndexPrefixes.Builder()).build());
+        }
+
+        /**
+         * API name: {@code norms}
+         */
+        public final Builder norms(@Nullable Boolean value) {
+            this.norms = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code position_increment_gap}
+         */
+        public final Builder positionIncrementGap(@Nullable Integer value) {
+            this.positionIncrementGap = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code search_analyzer}
+         */
+        public final Builder searchAnalyzer(@Nullable String value) {
+            this.searchAnalyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code search_quote_analyzer}
+         */
+        public final Builder searchQuoteAnalyzer(@Nullable String value) {
+            this.searchQuoteAnalyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code term_vector}
+         */
+        public final Builder termVector(@Nullable TermVectorOption value) {
+            this.termVector = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TextProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TextProperty build() {
+            _checkSingleUse();
+
+            return new TextProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TextProperty}
+     */
+    public static final JsonpDeserializer<TextProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TextProperty::setupTextPropertyDeserializer
+    );
+
+    protected static void setupTextPropertyDeserializer(ObjectDeserializer<TextProperty.Builder> op) {
+        CorePropertyBase.setupCorePropertyBaseDeserializer(op);
+        op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(Builder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
+        op.add(Builder::eagerGlobalOrdinals, JsonpDeserializer.booleanDeserializer(), "eager_global_ordinals");
+        op.add(Builder::fielddata, JsonpDeserializer.booleanDeserializer(), "fielddata");
+        op.add(Builder::fielddataFrequencyFilter, FielddataFrequencyFilter._DESERIALIZER, "fielddata_frequency_filter");
+        op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
+        op.add(Builder::indexOptions, IndexOptions._DESERIALIZER, "index_options");
+        op.add(Builder::indexPhrases, JsonpDeserializer.booleanDeserializer(), "index_phrases");
+        op.add(Builder::indexPrefixes, TextIndexPrefixes._DESERIALIZER, "index_prefixes");
+        op.add(Builder::norms, JsonpDeserializer.booleanDeserializer(), "norms");
+        op.add(Builder::positionIncrementGap, JsonpDeserializer.integerDeserializer(), "position_increment_gap");
+        op.add(Builder::searchAnalyzer, JsonpDeserializer.stringDeserializer(), "search_analyzer");
+        op.add(Builder::searchQuoteAnalyzer, JsonpDeserializer.stringDeserializer(), "search_quote_analyzer");
+        op.add(Builder::termVector, TermVectorOption._DESERIALIZER, "term_vector");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TokenCountProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TokenCountProperty.java
index a89df1e83f..594010db18 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TokenCountProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TokenCountProperty.java
@@ -32,233 +32,231 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.TokenCountProperty
 
-
 @JsonpDeserializable
 public class TokenCountProperty extends DocValuesPropertyBase implements PropertyVariant {
-	@Nullable
-	private final String analyzer;
-
-	@Nullable
-	private final Double boost;
-
-	@Nullable
-	private final Boolean index;
-
-	@Nullable
-	private final Double nullValue;
-
-	@Nullable
-	private final Boolean enablePositionIncrements;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TokenCountProperty(Builder builder) {
-		super(builder);
-
-		this.analyzer = builder.analyzer;
-		this.boost = builder.boost;
-		this.index = builder.index;
-		this.nullValue = builder.nullValue;
-		this.enablePositionIncrements = builder.enablePositionIncrements;
-
-	}
-
-	public static TokenCountProperty of(Function<Builder, ObjectBuilder<TokenCountProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.TokenCount;
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * API name: {@code boost}
-	 */
-	@Nullable
-	public final Double boost() {
-		return this.boost;
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final Boolean index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code null_value}
-	 */
-	@Nullable
-	public final Double nullValue() {
-		return this.nullValue;
-	}
-
-	/**
-	 * API name: {@code enable_position_increments}
-	 */
-	@Nullable
-	public final Boolean enablePositionIncrements() {
-		return this.enablePositionIncrements;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "token_count");
-		super.serializeInternal(generator, mapper);
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			generator.write(this.analyzer);
-
-		}
-		if (this.boost != null) {
-			generator.writeKey("boost");
-			generator.write(this.boost);
-
-		}
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.nullValue != null) {
-			generator.writeKey("null_value");
-			generator.write(this.nullValue);
-
-		}
-		if (this.enablePositionIncrements != null) {
-			generator.writeKey("enable_position_increments");
-			generator.write(this.enablePositionIncrements);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TokenCountProperty}.
-	 */
-
-	public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<TokenCountProperty> {
-		@Nullable
-		private String analyzer;
-
-		@Nullable
-		private Double boost;
-
-		@Nullable
-		private Boolean index;
-
-		@Nullable
-		private Double nullValue;
-
-		@Nullable
-		private Boolean enablePositionIncrements;
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code boost}
-		 */
-		public final Builder boost(@Nullable Double value) {
-			this.boost = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable Boolean value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(@Nullable Double value) {
-			this.nullValue = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code enable_position_increments}
-		 */
-		public final Builder enablePositionIncrements(@Nullable Boolean value) {
-			this.enablePositionIncrements = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TokenCountProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TokenCountProperty build() {
-			_checkSingleUse();
-
-			return new TokenCountProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TokenCountProperty}
-	 */
-	public static final JsonpDeserializer<TokenCountProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, TokenCountProperty::setupTokenCountPropertyDeserializer);
-
-	protected static void setupTokenCountPropertyDeserializer(ObjectDeserializer<TokenCountProperty.Builder> op) {
-		DocValuesPropertyBase.setupDocValuesPropertyBaseDeserializer(op);
-		op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(Builder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
-		op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
-		op.add(Builder::nullValue, JsonpDeserializer.doubleDeserializer(), "null_value");
-		op.add(Builder::enablePositionIncrements, JsonpDeserializer.booleanDeserializer(),
-				"enable_position_increments");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final String analyzer;
+
+    @Nullable
+    private final Double boost;
+
+    @Nullable
+    private final Boolean index;
+
+    @Nullable
+    private final Double nullValue;
+
+    @Nullable
+    private final Boolean enablePositionIncrements;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TokenCountProperty(Builder builder) {
+        super(builder);
+
+        this.analyzer = builder.analyzer;
+        this.boost = builder.boost;
+        this.index = builder.index;
+        this.nullValue = builder.nullValue;
+        this.enablePositionIncrements = builder.enablePositionIncrements;
+
+    }
+
+    public static TokenCountProperty of(Function<Builder, ObjectBuilder<TokenCountProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.TokenCount;
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * API name: {@code boost}
+     */
+    @Nullable
+    public final Double boost() {
+        return this.boost;
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    @Nullable
+    public final Boolean index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code null_value}
+     */
+    @Nullable
+    public final Double nullValue() {
+        return this.nullValue;
+    }
+
+    /**
+     * API name: {@code enable_position_increments}
+     */
+    @Nullable
+    public final Boolean enablePositionIncrements() {
+        return this.enablePositionIncrements;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "token_count");
+        super.serializeInternal(generator, mapper);
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            generator.write(this.analyzer);
+
+        }
+        if (this.boost != null) {
+            generator.writeKey("boost");
+            generator.write(this.boost);
+
+        }
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.nullValue != null) {
+            generator.writeKey("null_value");
+            generator.write(this.nullValue);
+
+        }
+        if (this.enablePositionIncrements != null) {
+            generator.writeKey("enable_position_increments");
+            generator.write(this.enablePositionIncrements);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TokenCountProperty}.
+     */
+
+    public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<TokenCountProperty> {
+        @Nullable
+        private String analyzer;
+
+        @Nullable
+        private Double boost;
+
+        @Nullable
+        private Boolean index;
+
+        @Nullable
+        private Double nullValue;
+
+        @Nullable
+        private Boolean enablePositionIncrements;
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code boost}
+         */
+        public final Builder boost(@Nullable Double value) {
+            this.boost = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable Boolean value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(@Nullable Double value) {
+            this.nullValue = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code enable_position_increments}
+         */
+        public final Builder enablePositionIncrements(@Nullable Boolean value) {
+            this.enablePositionIncrements = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TokenCountProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TokenCountProperty build() {
+            _checkSingleUse();
+
+            return new TokenCountProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TokenCountProperty}
+     */
+    public static final JsonpDeserializer<TokenCountProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TokenCountProperty::setupTokenCountPropertyDeserializer
+    );
+
+    protected static void setupTokenCountPropertyDeserializer(ObjectDeserializer<TokenCountProperty.Builder> op) {
+        DocValuesPropertyBase.setupDocValuesPropertyBaseDeserializer(op);
+        op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(Builder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
+        op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
+        op.add(Builder::nullValue, JsonpDeserializer.doubleDeserializer(), "null_value");
+        op.add(Builder::enablePositionIncrements, JsonpDeserializer.booleanDeserializer(), "enable_position_increments");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TypeMapping.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TypeMapping.java
index aa0a8d9444..066316f890 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TypeMapping.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/TypeMapping.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,656 +47,657 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.TypeMapping
 
-
 @JsonpDeserializable
 public class TypeMapping implements JsonpSerializable {
-	@Nullable
-	private final AllField allField;
-
-	@Nullable
-	private final Boolean dateDetection;
-
-	@Nullable
-	private final DynamicMapping dynamic;
-
-	private final List<String> dynamicDateFormats;
-
-	private final List<Map<String, DynamicTemplate>> dynamicTemplates;
-
-	@Nullable
-	private final FieldNamesField fieldNames;
-
-	@Nullable
-	private final IndexField indexField;
-
-	private final Map<String, JsonData> meta;
-
-	@Nullable
-	private final Boolean numericDetection;
-
-	private final Map<String, Property> properties;
-
-	@Nullable
-	private final RoutingField routing;
-
-	@Nullable
-	private final SizeField size;
-
-	@Nullable
-	private final SourceField source;
-
-	private final Map<String, RuntimeField> runtime;
-
-	@Nullable
-	private final Boolean enabled;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TypeMapping(Builder builder) {
-
-		this.allField = builder.allField;
-		this.dateDetection = builder.dateDetection;
-		this.dynamic = builder.dynamic;
-		this.dynamicDateFormats = ApiTypeHelper.unmodifiable(builder.dynamicDateFormats);
-		this.dynamicTemplates = ApiTypeHelper.unmodifiable(builder.dynamicTemplates);
-		this.fieldNames = builder.fieldNames;
-		this.indexField = builder.indexField;
-		this.meta = ApiTypeHelper.unmodifiable(builder.meta);
-		this.numericDetection = builder.numericDetection;
-		this.properties = ApiTypeHelper.unmodifiable(builder.properties);
-		this.routing = builder.routing;
-		this.size = builder.size;
-		this.source = builder.source;
-		this.runtime = ApiTypeHelper.unmodifiable(builder.runtime);
-		this.enabled = builder.enabled;
-
-	}
-
-	public static TypeMapping of(Function<Builder, ObjectBuilder<TypeMapping>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code all_field}
-	 */
-	@Nullable
-	public final AllField allField() {
-		return this.allField;
-	}
-
-	/**
-	 * API name: {@code date_detection}
-	 */
-	@Nullable
-	public final Boolean dateDetection() {
-		return this.dateDetection;
-	}
-
-	/**
-	 * API name: {@code dynamic}
-	 */
-	@Nullable
-	public final DynamicMapping dynamic() {
-		return this.dynamic;
-	}
-
-	/**
-	 * API name: {@code dynamic_date_formats}
-	 */
-	public final List<String> dynamicDateFormats() {
-		return this.dynamicDateFormats;
-	}
-
-	/**
-	 * API name: {@code dynamic_templates}
-	 */
-	public final List<Map<String, DynamicTemplate>> dynamicTemplates() {
-		return this.dynamicTemplates;
-	}
-
-	/**
-	 * API name: {@code _field_names}
-	 */
-	@Nullable
-	public final FieldNamesField fieldNames() {
-		return this.fieldNames;
-	}
-
-	/**
-	 * API name: {@code index_field}
-	 */
-	@Nullable
-	public final IndexField indexField() {
-		return this.indexField;
-	}
-
-	/**
-	 * API name: {@code _meta}
-	 */
-	public final Map<String, JsonData> meta() {
-		return this.meta;
-	}
-
-	/**
-	 * API name: {@code numeric_detection}
-	 */
-	@Nullable
-	public final Boolean numericDetection() {
-		return this.numericDetection;
-	}
-
-	/**
-	 * API name: {@code properties}
-	 */
-	public final Map<String, Property> properties() {
-		return this.properties;
-	}
-
-	/**
-	 * API name: {@code _routing}
-	 */
-	@Nullable
-	public final RoutingField routing() {
-		return this.routing;
-	}
-
-	/**
-	 * API name: {@code _size}
-	 */
-	@Nullable
-	public final SizeField size() {
-		return this.size;
-	}
-
-	/**
-	 * API name: {@code _source}
-	 */
-	@Nullable
-	public final SourceField source() {
-		return this.source;
-	}
-
-	/**
-	 * API name: {@code runtime}
-	 */
-	public final Map<String, RuntimeField> runtime() {
-		return this.runtime;
-	}
-
-	/**
-	 * API name: {@code enabled}
-	 */
-	@Nullable
-	public final Boolean enabled() {
-		return this.enabled;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.allField != null) {
-			generator.writeKey("all_field");
-			this.allField.serialize(generator, mapper);
-
-		}
-		if (this.dateDetection != null) {
-			generator.writeKey("date_detection");
-			generator.write(this.dateDetection);
-
-		}
-		if (this.dynamic != null) {
-			generator.writeKey("dynamic");
-			this.dynamic.serialize(generator, mapper);
-		}
-		if (ApiTypeHelper.isDefined(this.dynamicDateFormats)) {
-			generator.writeKey("dynamic_date_formats");
-			generator.writeStartArray();
-			for (String item0 : this.dynamicDateFormats) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.dynamicTemplates)) {
-			generator.writeKey("dynamic_templates");
-			generator.writeStartArray();
-			for (Map<String, DynamicTemplate> item0 : this.dynamicTemplates) {
-				generator.writeStartObject();
-				if (item0 != null) {
-					for (Map.Entry<String, DynamicTemplate> item1 : item0.entrySet()) {
-						generator.writeKey(item1.getKey());
-						item1.getValue().serialize(generator, mapper);
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.fieldNames != null) {
-			generator.writeKey("_field_names");
-			this.fieldNames.serialize(generator, mapper);
-
-		}
-		if (this.indexField != null) {
-			generator.writeKey("index_field");
-			this.indexField.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.meta)) {
-			generator.writeKey("_meta");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.numericDetection != null) {
-			generator.writeKey("numeric_detection");
-			generator.write(this.numericDetection);
-
-		}
-		if (ApiTypeHelper.isDefined(this.properties)) {
-			generator.writeKey("properties");
-			generator.writeStartObject();
-			for (Map.Entry<String, Property> item0 : this.properties.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.routing != null) {
-			generator.writeKey("_routing");
-			this.routing.serialize(generator, mapper);
-
-		}
-		if (this.size != null) {
-			generator.writeKey("_size");
-			this.size.serialize(generator, mapper);
-
-		}
-		if (this.source != null) {
-			generator.writeKey("_source");
-			this.source.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.runtime)) {
-			generator.writeKey("runtime");
-			generator.writeStartObject();
-			for (Map.Entry<String, RuntimeField> item0 : this.runtime.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.enabled != null) {
-			generator.writeKey("enabled");
-			generator.write(this.enabled);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TypeMapping}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TypeMapping> {
-		@Nullable
-		private AllField allField;
-
-		@Nullable
-		private Boolean dateDetection;
-
-		@Nullable
-		private DynamicMapping dynamic;
-
-		@Nullable
-		private List<String> dynamicDateFormats;
-
-		@Nullable
-		private List<Map<String, DynamicTemplate>> dynamicTemplates;
-
-		@Nullable
-		private FieldNamesField fieldNames;
-
-		@Nullable
-		private IndexField indexField;
-
-		@Nullable
-		private Map<String, JsonData> meta;
-
-		@Nullable
-		private Boolean numericDetection;
-
-		@Nullable
-		private Map<String, Property> properties;
-
-		@Nullable
-		private RoutingField routing;
-
-		@Nullable
-		private SizeField size;
-
-		@Nullable
-		private SourceField source;
-
-		@Nullable
-		private Map<String, RuntimeField> runtime;
-
-		@Nullable
-		private Boolean enabled;
-
-		/**
-		 * API name: {@code all_field}
-		 */
-		public final Builder allField(@Nullable AllField value) {
-			this.allField = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code all_field}
-		 */
-		public final Builder allField(Function<AllField.Builder, ObjectBuilder<AllField>> fn) {
-			return this.allField(fn.apply(new AllField.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code date_detection}
-		 */
-		public final Builder dateDetection(@Nullable Boolean value) {
-			this.dateDetection = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code dynamic}
-		 */
-		public final Builder dynamic(@Nullable DynamicMapping value) {
-			this.dynamic = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code dynamic_date_formats}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>dynamicDateFormats</code>.
-		 */
-		public final Builder dynamicDateFormats(List<String> list) {
-			this.dynamicDateFormats = _listAddAll(this.dynamicDateFormats, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code dynamic_date_formats}
-		 * <p>
-		 * Adds one or more values to <code>dynamicDateFormats</code>.
-		 */
-		public final Builder dynamicDateFormats(String value, String... values) {
-			this.dynamicDateFormats = _listAdd(this.dynamicDateFormats, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code dynamic_templates}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>dynamicTemplates</code>.
-		 */
-		public final Builder dynamicTemplates(List<Map<String, DynamicTemplate>> list) {
-			this.dynamicTemplates = _listAddAll(this.dynamicTemplates, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code dynamic_templates}
-		 * <p>
-		 * Adds one or more values to <code>dynamicTemplates</code>.
-		 */
-		public final Builder dynamicTemplates(Map<String, DynamicTemplate> value,
-				Map<String, DynamicTemplate>... values) {
-			this.dynamicTemplates = _listAdd(this.dynamicTemplates, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code _field_names}
-		 */
-		public final Builder fieldNames(@Nullable FieldNamesField value) {
-			this.fieldNames = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _field_names}
-		 */
-		public final Builder fieldNames(Function<FieldNamesField.Builder, ObjectBuilder<FieldNamesField>> fn) {
-			return this.fieldNames(fn.apply(new FieldNamesField.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code index_field}
-		 */
-		public final Builder indexField(@Nullable IndexField value) {
-			this.indexField = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_field}
-		 */
-		public final Builder indexField(Function<IndexField.Builder, ObjectBuilder<IndexField>> fn) {
-			return this.indexField(fn.apply(new IndexField.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code _meta}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>meta</code>.
-		 */
-		public final Builder meta(Map<String, JsonData> map) {
-			this.meta = _mapPutAll(this.meta, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code _meta}
-		 * <p>
-		 * Adds an entry to <code>meta</code>.
-		 */
-		public final Builder meta(String key, JsonData value) {
-			this.meta = _mapPut(this.meta, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code numeric_detection}
-		 */
-		public final Builder numericDetection(@Nullable Boolean value) {
-			this.numericDetection = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code properties}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>properties</code>.
-		 */
-		public final Builder properties(Map<String, Property> map) {
-			this.properties = _mapPutAll(this.properties, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code properties}
-		 * <p>
-		 * Adds an entry to <code>properties</code>.
-		 */
-		public final Builder properties(String key, Property value) {
-			this.properties = _mapPut(this.properties, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code properties}
-		 * <p>
-		 * Adds an entry to <code>properties</code> using a builder lambda.
-		 */
-		public final Builder properties(String key, Function<Property.Builder, ObjectBuilder<Property>> fn) {
-			return properties(key, fn.apply(new Property.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code _routing}
-		 */
-		public final Builder routing(@Nullable RoutingField value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _routing}
-		 */
-		public final Builder routing(Function<RoutingField.Builder, ObjectBuilder<RoutingField>> fn) {
-			return this.routing(fn.apply(new RoutingField.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code _size}
-		 */
-		public final Builder size(@Nullable SizeField value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _size}
-		 */
-		public final Builder size(Function<SizeField.Builder, ObjectBuilder<SizeField>> fn) {
-			return this.size(fn.apply(new SizeField.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code _source}
-		 */
-		public final Builder source(@Nullable SourceField value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _source}
-		 */
-		public final Builder source(Function<SourceField.Builder, ObjectBuilder<SourceField>> fn) {
-			return this.source(fn.apply(new SourceField.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code runtime}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>runtime</code>.
-		 */
-		public final Builder runtime(Map<String, RuntimeField> map) {
-			this.runtime = _mapPutAll(this.runtime, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code runtime}
-		 * <p>
-		 * Adds an entry to <code>runtime</code>.
-		 */
-		public final Builder runtime(String key, RuntimeField value) {
-			this.runtime = _mapPut(this.runtime, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code runtime}
-		 * <p>
-		 * Adds an entry to <code>runtime</code> using a builder lambda.
-		 */
-		public final Builder runtime(String key, Function<RuntimeField.Builder, ObjectBuilder<RuntimeField>> fn) {
-			return runtime(key, fn.apply(new RuntimeField.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code enabled}
-		 */
-		public final Builder enabled(@Nullable Boolean value) {
-			this.enabled = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TypeMapping}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TypeMapping build() {
-			_checkSingleUse();
-
-			return new TypeMapping(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TypeMapping}
-	 */
-	public static final JsonpDeserializer<TypeMapping> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TypeMapping::setupTypeMappingDeserializer);
-
-	protected static void setupTypeMappingDeserializer(ObjectDeserializer<TypeMapping.Builder> op) {
-
-		op.add(Builder::allField, AllField._DESERIALIZER, "all_field");
-		op.add(Builder::dateDetection, JsonpDeserializer.booleanDeserializer(), "date_detection");
-		op.add(Builder::dynamic, DynamicMapping._DESERIALIZER, "dynamic");
-		op.add(Builder::dynamicDateFormats, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"dynamic_date_formats");
-		op.add(Builder::dynamicTemplates, JsonpDeserializer.arrayDeserializer(
-				JsonpDeserializer.stringMapDeserializer(DynamicTemplate._DESERIALIZER)), "dynamic_templates");
-		op.add(Builder::fieldNames, FieldNamesField._DESERIALIZER, "_field_names");
-		op.add(Builder::indexField, IndexField._DESERIALIZER, "index_field");
-		op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
-		op.add(Builder::numericDetection, JsonpDeserializer.booleanDeserializer(), "numeric_detection");
-		op.add(Builder::properties, JsonpDeserializer.stringMapDeserializer(Property._DESERIALIZER), "properties");
-		op.add(Builder::routing, RoutingField._DESERIALIZER, "_routing");
-		op.add(Builder::size, SizeField._DESERIALIZER, "_size");
-		op.add(Builder::source, SourceField._DESERIALIZER, "_source");
-		op.add(Builder::runtime, JsonpDeserializer.stringMapDeserializer(RuntimeField._DESERIALIZER), "runtime");
-		op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
-
-	}
+    @Nullable
+    private final AllField allField;
+
+    @Nullable
+    private final Boolean dateDetection;
+
+    @Nullable
+    private final DynamicMapping dynamic;
+
+    private final List<String> dynamicDateFormats;
+
+    private final List<Map<String, DynamicTemplate>> dynamicTemplates;
+
+    @Nullable
+    private final FieldNamesField fieldNames;
+
+    @Nullable
+    private final IndexField indexField;
+
+    private final Map<String, JsonData> meta;
+
+    @Nullable
+    private final Boolean numericDetection;
+
+    private final Map<String, Property> properties;
+
+    @Nullable
+    private final RoutingField routing;
+
+    @Nullable
+    private final SizeField size;
+
+    @Nullable
+    private final SourceField source;
+
+    private final Map<String, RuntimeField> runtime;
+
+    @Nullable
+    private final Boolean enabled;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TypeMapping(Builder builder) {
+
+        this.allField = builder.allField;
+        this.dateDetection = builder.dateDetection;
+        this.dynamic = builder.dynamic;
+        this.dynamicDateFormats = ApiTypeHelper.unmodifiable(builder.dynamicDateFormats);
+        this.dynamicTemplates = ApiTypeHelper.unmodifiable(builder.dynamicTemplates);
+        this.fieldNames = builder.fieldNames;
+        this.indexField = builder.indexField;
+        this.meta = ApiTypeHelper.unmodifiable(builder.meta);
+        this.numericDetection = builder.numericDetection;
+        this.properties = ApiTypeHelper.unmodifiable(builder.properties);
+        this.routing = builder.routing;
+        this.size = builder.size;
+        this.source = builder.source;
+        this.runtime = ApiTypeHelper.unmodifiable(builder.runtime);
+        this.enabled = builder.enabled;
+
+    }
+
+    public static TypeMapping of(Function<Builder, ObjectBuilder<TypeMapping>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code all_field}
+     */
+    @Nullable
+    public final AllField allField() {
+        return this.allField;
+    }
+
+    /**
+     * API name: {@code date_detection}
+     */
+    @Nullable
+    public final Boolean dateDetection() {
+        return this.dateDetection;
+    }
+
+    /**
+     * API name: {@code dynamic}
+     */
+    @Nullable
+    public final DynamicMapping dynamic() {
+        return this.dynamic;
+    }
+
+    /**
+     * API name: {@code dynamic_date_formats}
+     */
+    public final List<String> dynamicDateFormats() {
+        return this.dynamicDateFormats;
+    }
+
+    /**
+     * API name: {@code dynamic_templates}
+     */
+    public final List<Map<String, DynamicTemplate>> dynamicTemplates() {
+        return this.dynamicTemplates;
+    }
+
+    /**
+     * API name: {@code _field_names}
+     */
+    @Nullable
+    public final FieldNamesField fieldNames() {
+        return this.fieldNames;
+    }
+
+    /**
+     * API name: {@code index_field}
+     */
+    @Nullable
+    public final IndexField indexField() {
+        return this.indexField;
+    }
+
+    /**
+     * API name: {@code _meta}
+     */
+    public final Map<String, JsonData> meta() {
+        return this.meta;
+    }
+
+    /**
+     * API name: {@code numeric_detection}
+     */
+    @Nullable
+    public final Boolean numericDetection() {
+        return this.numericDetection;
+    }
+
+    /**
+     * API name: {@code properties}
+     */
+    public final Map<String, Property> properties() {
+        return this.properties;
+    }
+
+    /**
+     * API name: {@code _routing}
+     */
+    @Nullable
+    public final RoutingField routing() {
+        return this.routing;
+    }
+
+    /**
+     * API name: {@code _size}
+     */
+    @Nullable
+    public final SizeField size() {
+        return this.size;
+    }
+
+    /**
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final SourceField source() {
+        return this.source;
+    }
+
+    /**
+     * API name: {@code runtime}
+     */
+    public final Map<String, RuntimeField> runtime() {
+        return this.runtime;
+    }
+
+    /**
+     * API name: {@code enabled}
+     */
+    @Nullable
+    public final Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.allField != null) {
+            generator.writeKey("all_field");
+            this.allField.serialize(generator, mapper);
+
+        }
+        if (this.dateDetection != null) {
+            generator.writeKey("date_detection");
+            generator.write(this.dateDetection);
+
+        }
+        if (this.dynamic != null) {
+            generator.writeKey("dynamic");
+            this.dynamic.serialize(generator, mapper);
+        }
+        if (ApiTypeHelper.isDefined(this.dynamicDateFormats)) {
+            generator.writeKey("dynamic_date_formats");
+            generator.writeStartArray();
+            for (String item0 : this.dynamicDateFormats) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.dynamicTemplates)) {
+            generator.writeKey("dynamic_templates");
+            generator.writeStartArray();
+            for (Map<String, DynamicTemplate> item0 : this.dynamicTemplates) {
+                generator.writeStartObject();
+                if (item0 != null) {
+                    for (Map.Entry<String, DynamicTemplate> item1 : item0.entrySet()) {
+                        generator.writeKey(item1.getKey());
+                        item1.getValue().serialize(generator, mapper);
+
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.fieldNames != null) {
+            generator.writeKey("_field_names");
+            this.fieldNames.serialize(generator, mapper);
+
+        }
+        if (this.indexField != null) {
+            generator.writeKey("index_field");
+            this.indexField.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.meta)) {
+            generator.writeKey("_meta");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.numericDetection != null) {
+            generator.writeKey("numeric_detection");
+            generator.write(this.numericDetection);
+
+        }
+        if (ApiTypeHelper.isDefined(this.properties)) {
+            generator.writeKey("properties");
+            generator.writeStartObject();
+            for (Map.Entry<String, Property> item0 : this.properties.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.routing != null) {
+            generator.writeKey("_routing");
+            this.routing.serialize(generator, mapper);
+
+        }
+        if (this.size != null) {
+            generator.writeKey("_size");
+            this.size.serialize(generator, mapper);
+
+        }
+        if (this.source != null) {
+            generator.writeKey("_source");
+            this.source.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.runtime)) {
+            generator.writeKey("runtime");
+            generator.writeStartObject();
+            for (Map.Entry<String, RuntimeField> item0 : this.runtime.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.enabled != null) {
+            generator.writeKey("enabled");
+            generator.write(this.enabled);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TypeMapping}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TypeMapping> {
+        @Nullable
+        private AllField allField;
+
+        @Nullable
+        private Boolean dateDetection;
+
+        @Nullable
+        private DynamicMapping dynamic;
+
+        @Nullable
+        private List<String> dynamicDateFormats;
+
+        @Nullable
+        private List<Map<String, DynamicTemplate>> dynamicTemplates;
+
+        @Nullable
+        private FieldNamesField fieldNames;
+
+        @Nullable
+        private IndexField indexField;
+
+        @Nullable
+        private Map<String, JsonData> meta;
+
+        @Nullable
+        private Boolean numericDetection;
+
+        @Nullable
+        private Map<String, Property> properties;
+
+        @Nullable
+        private RoutingField routing;
+
+        @Nullable
+        private SizeField size;
+
+        @Nullable
+        private SourceField source;
+
+        @Nullable
+        private Map<String, RuntimeField> runtime;
+
+        @Nullable
+        private Boolean enabled;
+
+        /**
+         * API name: {@code all_field}
+         */
+        public final Builder allField(@Nullable AllField value) {
+            this.allField = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code all_field}
+         */
+        public final Builder allField(Function<AllField.Builder, ObjectBuilder<AllField>> fn) {
+            return this.allField(fn.apply(new AllField.Builder()).build());
+        }
+
+        /**
+         * API name: {@code date_detection}
+         */
+        public final Builder dateDetection(@Nullable Boolean value) {
+            this.dateDetection = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code dynamic}
+         */
+        public final Builder dynamic(@Nullable DynamicMapping value) {
+            this.dynamic = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code dynamic_date_formats}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>dynamicDateFormats</code>.
+         */
+        public final Builder dynamicDateFormats(List<String> list) {
+            this.dynamicDateFormats = _listAddAll(this.dynamicDateFormats, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code dynamic_date_formats}
+         * <p>
+         * Adds one or more values to <code>dynamicDateFormats</code>.
+         */
+        public final Builder dynamicDateFormats(String value, String... values) {
+            this.dynamicDateFormats = _listAdd(this.dynamicDateFormats, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code dynamic_templates}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>dynamicTemplates</code>.
+         */
+        public final Builder dynamicTemplates(List<Map<String, DynamicTemplate>> list) {
+            this.dynamicTemplates = _listAddAll(this.dynamicTemplates, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code dynamic_templates}
+         * <p>
+         * Adds one or more values to <code>dynamicTemplates</code>.
+         */
+        public final Builder dynamicTemplates(Map<String, DynamicTemplate> value, Map<String, DynamicTemplate>... values) {
+            this.dynamicTemplates = _listAdd(this.dynamicTemplates, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code _field_names}
+         */
+        public final Builder fieldNames(@Nullable FieldNamesField value) {
+            this.fieldNames = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _field_names}
+         */
+        public final Builder fieldNames(Function<FieldNamesField.Builder, ObjectBuilder<FieldNamesField>> fn) {
+            return this.fieldNames(fn.apply(new FieldNamesField.Builder()).build());
+        }
+
+        /**
+         * API name: {@code index_field}
+         */
+        public final Builder indexField(@Nullable IndexField value) {
+            this.indexField = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index_field}
+         */
+        public final Builder indexField(Function<IndexField.Builder, ObjectBuilder<IndexField>> fn) {
+            return this.indexField(fn.apply(new IndexField.Builder()).build());
+        }
+
+        /**
+         * API name: {@code _meta}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>meta</code>.
+         */
+        public final Builder meta(Map<String, JsonData> map) {
+            this.meta = _mapPutAll(this.meta, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code _meta}
+         * <p>
+         * Adds an entry to <code>meta</code>.
+         */
+        public final Builder meta(String key, JsonData value) {
+            this.meta = _mapPut(this.meta, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code numeric_detection}
+         */
+        public final Builder numericDetection(@Nullable Boolean value) {
+            this.numericDetection = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code properties}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>properties</code>.
+         */
+        public final Builder properties(Map<String, Property> map) {
+            this.properties = _mapPutAll(this.properties, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code properties}
+         * <p>
+         * Adds an entry to <code>properties</code>.
+         */
+        public final Builder properties(String key, Property value) {
+            this.properties = _mapPut(this.properties, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code properties}
+         * <p>
+         * Adds an entry to <code>properties</code> using a builder lambda.
+         */
+        public final Builder properties(String key, Function<Property.Builder, ObjectBuilder<Property>> fn) {
+            return properties(key, fn.apply(new Property.Builder()).build());
+        }
+
+        /**
+         * API name: {@code _routing}
+         */
+        public final Builder routing(@Nullable RoutingField value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _routing}
+         */
+        public final Builder routing(Function<RoutingField.Builder, ObjectBuilder<RoutingField>> fn) {
+            return this.routing(fn.apply(new RoutingField.Builder()).build());
+        }
+
+        /**
+         * API name: {@code _size}
+         */
+        public final Builder size(@Nullable SizeField value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _size}
+         */
+        public final Builder size(Function<SizeField.Builder, ObjectBuilder<SizeField>> fn) {
+            return this.size(fn.apply(new SizeField.Builder()).build());
+        }
+
+        /**
+         * API name: {@code _source}
+         */
+        public final Builder source(@Nullable SourceField value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _source}
+         */
+        public final Builder source(Function<SourceField.Builder, ObjectBuilder<SourceField>> fn) {
+            return this.source(fn.apply(new SourceField.Builder()).build());
+        }
+
+        /**
+         * API name: {@code runtime}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>runtime</code>.
+         */
+        public final Builder runtime(Map<String, RuntimeField> map) {
+            this.runtime = _mapPutAll(this.runtime, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code runtime}
+         * <p>
+         * Adds an entry to <code>runtime</code>.
+         */
+        public final Builder runtime(String key, RuntimeField value) {
+            this.runtime = _mapPut(this.runtime, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code runtime}
+         * <p>
+         * Adds an entry to <code>runtime</code> using a builder lambda.
+         */
+        public final Builder runtime(String key, Function<RuntimeField.Builder, ObjectBuilder<RuntimeField>> fn) {
+            return runtime(key, fn.apply(new RuntimeField.Builder()).build());
+        }
+
+        /**
+         * API name: {@code enabled}
+         */
+        public final Builder enabled(@Nullable Boolean value) {
+            this.enabled = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link TypeMapping}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TypeMapping build() {
+            _checkSingleUse();
+
+            return new TypeMapping(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TypeMapping}
+     */
+    public static final JsonpDeserializer<TypeMapping> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TypeMapping::setupTypeMappingDeserializer
+    );
+
+    protected static void setupTypeMappingDeserializer(ObjectDeserializer<TypeMapping.Builder> op) {
+
+        op.add(Builder::allField, AllField._DESERIALIZER, "all_field");
+        op.add(Builder::dateDetection, JsonpDeserializer.booleanDeserializer(), "date_detection");
+        op.add(Builder::dynamic, DynamicMapping._DESERIALIZER, "dynamic");
+        op.add(
+            Builder::dynamicDateFormats,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
+            "dynamic_date_formats"
+        );
+        op.add(
+            Builder::dynamicTemplates,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringMapDeserializer(DynamicTemplate._DESERIALIZER)),
+            "dynamic_templates"
+        );
+        op.add(Builder::fieldNames, FieldNamesField._DESERIALIZER, "_field_names");
+        op.add(Builder::indexField, IndexField._DESERIALIZER, "index_field");
+        op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
+        op.add(Builder::numericDetection, JsonpDeserializer.booleanDeserializer(), "numeric_detection");
+        op.add(Builder::properties, JsonpDeserializer.stringMapDeserializer(Property._DESERIALIZER), "properties");
+        op.add(Builder::routing, RoutingField._DESERIALIZER, "_routing");
+        op.add(Builder::size, SizeField._DESERIALIZER, "_size");
+        op.add(Builder::source, SourceField._DESERIALIZER, "_source");
+        op.add(Builder::runtime, JsonpDeserializer.stringMapDeserializer(RuntimeField._DESERIALIZER), "runtime");
+        op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/UnsignedLongNumberProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/UnsignedLongNumberProperty.java
index 2eff6519e0..447c267e94 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/UnsignedLongNumberProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/UnsignedLongNumberProperty.java
@@ -32,117 +32,115 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.UnsignedLongNumberProperty
 
-
 @JsonpDeserializable
 public class UnsignedLongNumberProperty extends NumberPropertyBase implements PropertyVariant {
-	@Nullable
-	private final Number nullValue;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private UnsignedLongNumberProperty(Builder builder) {
-		super(builder);
-
-		this.nullValue = builder.nullValue;
-
-	}
-
-	public static UnsignedLongNumberProperty of(Function<Builder, ObjectBuilder<UnsignedLongNumberProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.UnsignedLong;
-	}
-
-	/**
-	 * API name: {@code null_value}
-	 */
-	@Nullable
-	public final Number nullValue() {
-		return this.nullValue;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "unsigned_long");
-		super.serializeInternal(generator, mapper);
-		if (this.nullValue != null) {
-			generator.writeKey("null_value");
-			generator.write(this.nullValue.doubleValue());
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UnsignedLongNumberProperty}.
-	 */
-
-	public static class Builder extends NumberPropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<UnsignedLongNumberProperty> {
-		@Nullable
-		private Number nullValue;
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(@Nullable Number value) {
-			this.nullValue = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link UnsignedLongNumberProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UnsignedLongNumberProperty build() {
-			_checkSingleUse();
-
-			return new UnsignedLongNumberProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link UnsignedLongNumberProperty}
-	 */
-	public static final JsonpDeserializer<UnsignedLongNumberProperty> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, UnsignedLongNumberProperty::setupUnsignedLongNumberPropertyDeserializer);
-
-	protected static void setupUnsignedLongNumberPropertyDeserializer(
-			ObjectDeserializer<UnsignedLongNumberProperty.Builder> op) {
-		setupNumberPropertyBaseDeserializer(op);
-		op.add(Builder::nullValue, JsonpDeserializer.numberDeserializer(), "null_value");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final Number nullValue;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private UnsignedLongNumberProperty(Builder builder) {
+        super(builder);
+
+        this.nullValue = builder.nullValue;
+
+    }
+
+    public static UnsignedLongNumberProperty of(Function<Builder, ObjectBuilder<UnsignedLongNumberProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.UnsignedLong;
+    }
+
+    /**
+     * API name: {@code null_value}
+     */
+    @Nullable
+    public final Number nullValue() {
+        return this.nullValue;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "unsigned_long");
+        super.serializeInternal(generator, mapper);
+        if (this.nullValue != null) {
+            generator.writeKey("null_value");
+            generator.write(this.nullValue.doubleValue());
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UnsignedLongNumberProperty}.
+     */
+
+    public static class Builder extends NumberPropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<UnsignedLongNumberProperty> {
+        @Nullable
+        private Number nullValue;
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(@Nullable Number value) {
+            this.nullValue = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link UnsignedLongNumberProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UnsignedLongNumberProperty build() {
+            _checkSingleUse();
+
+            return new UnsignedLongNumberProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link UnsignedLongNumberProperty}
+     */
+    public static final JsonpDeserializer<UnsignedLongNumberProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        UnsignedLongNumberProperty::setupUnsignedLongNumberPropertyDeserializer
+    );
+
+    protected static void setupUnsignedLongNumberPropertyDeserializer(ObjectDeserializer<UnsignedLongNumberProperty.Builder> op) {
+        setupNumberPropertyBaseDeserializer(op);
+        op.add(Builder::nullValue, JsonpDeserializer.numberDeserializer(), "null_value");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/VersionProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/VersionProperty.java
index 8eb8d3ee74..862bcbd009 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/VersionProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/VersionProperty.java
@@ -32,86 +32,84 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.mapping.VersionProperty
 
-
 @JsonpDeserializable
 public class VersionProperty extends DocValuesPropertyBase implements PropertyVariant {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private VersionProperty(Builder builder) {
-		super(builder);
+    private VersionProperty(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static VersionProperty of(Function<Builder, ObjectBuilder<VersionProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static VersionProperty of(Function<Builder, ObjectBuilder<VersionProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Version;
-	}
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Version;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.write("type", "version");
-		super.serializeInternal(generator, mapper);
+        generator.write("type", "version");
+        super.serializeInternal(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link VersionProperty}.
-	 */
+    /**
+     * Builder for {@link VersionProperty}.
+     */
 
-	public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<VersionProperty> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<VersionProperty> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link VersionProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public VersionProperty build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link VersionProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public VersionProperty build() {
+            _checkSingleUse();
 
-			return new VersionProperty(this);
-		}
-	}
+            return new VersionProperty(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link VersionProperty}
-	 */
-	public static final JsonpDeserializer<VersionProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			VersionProperty::setupVersionPropertyDeserializer);
+    /**
+     * Json deserializer for {@link VersionProperty}
+     */
+    public static final JsonpDeserializer<VersionProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        VersionProperty::setupVersionPropertyDeserializer
+    );
 
-	protected static void setupVersionPropertyDeserializer(ObjectDeserializer<VersionProperty.Builder> op) {
-		DocValuesPropertyBase.setupDocValuesPropertyBaseDeserializer(op);
+    protected static void setupVersionPropertyDeserializer(ObjectDeserializer<VersionProperty.Builder> op) {
+        DocValuesPropertyBase.setupDocValuesPropertyBaseDeserializer(op);
 
-		op.ignore("type");
-	}
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/WildcardProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/WildcardProperty.java
index febc56e766..1eea6a21f2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/WildcardProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/WildcardProperty.java
@@ -32,116 +32,115 @@
 
 package org.opensearch.client.opensearch._types.mapping;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.mapping.WildcardProperty
 
-
 @JsonpDeserializable
 public class WildcardProperty extends DocValuesPropertyBase implements PropertyVariant {
-	@Nullable
-	private final String nullValue;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private WildcardProperty(Builder builder) {
-		super(builder);
-
-		this.nullValue = builder.nullValue;
-
-	}
-
-	public static WildcardProperty of(Function<Builder, ObjectBuilder<WildcardProperty>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Property variant kind.
-	 */
-	@Override
-	public Property.Kind _propertyKind() {
-		return Property.Kind.Wildcard;
-	}
-
-	/**
-	 * API name: {@code null_value}
-	 */
-	@Nullable
-	public final String nullValue() {
-		return this.nullValue;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("type", "wildcard");
-		super.serializeInternal(generator, mapper);
-		if (this.nullValue != null) {
-			generator.writeKey("null_value");
-			generator.write(this.nullValue);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link WildcardProperty}.
-	 */
-
-	public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<WildcardProperty> {
-		@Nullable
-		private String nullValue;
-
-		/**
-		 * API name: {@code null_value}
-		 */
-		public final Builder nullValue(@Nullable String value) {
-			this.nullValue = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link WildcardProperty}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public WildcardProperty build() {
-			_checkSingleUse();
-
-			return new WildcardProperty(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link WildcardProperty}
-	 */
-	public static final JsonpDeserializer<WildcardProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			WildcardProperty::setupWildcardPropertyDeserializer);
-
-	protected static void setupWildcardPropertyDeserializer(ObjectDeserializer<WildcardProperty.Builder> op) {
-		setupDocValuesPropertyBaseDeserializer(op);
-		op.add(Builder::nullValue, JsonpDeserializer.stringDeserializer(), "null_value");
-
-		op.ignore("type");
-	}
+    @Nullable
+    private final String nullValue;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private WildcardProperty(Builder builder) {
+        super(builder);
+
+        this.nullValue = builder.nullValue;
+
+    }
+
+    public static WildcardProperty of(Function<Builder, ObjectBuilder<WildcardProperty>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Property variant kind.
+     */
+    @Override
+    public Property.Kind _propertyKind() {
+        return Property.Kind.Wildcard;
+    }
+
+    /**
+     * API name: {@code null_value}
+     */
+    @Nullable
+    public final String nullValue() {
+        return this.nullValue;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("type", "wildcard");
+        super.serializeInternal(generator, mapper);
+        if (this.nullValue != null) {
+            generator.writeKey("null_value");
+            generator.write(this.nullValue);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link WildcardProperty}.
+     */
+
+    public static class Builder extends DocValuesPropertyBase.AbstractBuilder<Builder> implements ObjectBuilder<WildcardProperty> {
+        @Nullable
+        private String nullValue;
+
+        /**
+         * API name: {@code null_value}
+         */
+        public final Builder nullValue(@Nullable String value) {
+            this.nullValue = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link WildcardProperty}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public WildcardProperty build() {
+            _checkSingleUse();
+
+            return new WildcardProperty(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link WildcardProperty}
+     */
+    public static final JsonpDeserializer<WildcardProperty> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        WildcardProperty::setupWildcardPropertyDeserializer
+    );
+
+    protected static void setupWildcardPropertyDeserializer(ObjectDeserializer<WildcardProperty.Builder> op) {
+        setupDocValuesPropertyBaseDeserializer(op);
+        op.add(Builder::nullValue, JsonpDeserializer.stringDeserializer(), "null_value");
+
+        op.ignore("type");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/BoolQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/BoolQuery.java
index ffce43d3c9..d99810d495 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/BoolQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/BoolQuery.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,319 +43,316 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.BoolQuery
 
-
 @JsonpDeserializable
 public class BoolQuery extends QueryBase implements QueryVariant {
-	private final List<Query> filter;
-
-	@Nullable
-	private final String minimumShouldMatch;
-
-	private final List<Query> must;
-
-	private final List<Query> mustNot;
-
-	private final List<Query> should;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private BoolQuery(Builder builder) {
-		super(builder);
-
-		this.filter = ApiTypeHelper.unmodifiable(builder.filter);
-		this.minimumShouldMatch = builder.minimumShouldMatch;
-		this.must = ApiTypeHelper.unmodifiable(builder.must);
-		this.mustNot = ApiTypeHelper.unmodifiable(builder.mustNot);
-		this.should = ApiTypeHelper.unmodifiable(builder.should);
-
-	}
-
-	public static BoolQuery of(Function<Builder, ObjectBuilder<BoolQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Bool;
-	}
-
-	/**
-	 * API name: {@code filter}
-	 */
-	public final List<Query> filter() {
-		return this.filter;
-	}
-
-	/**
-	 * API name: {@code minimum_should_match}
-	 */
-	@Nullable
-	public final String minimumShouldMatch() {
-		return this.minimumShouldMatch;
-	}
-
-	/**
-	 * API name: {@code must}
-	 */
-	public final List<Query> must() {
-		return this.must;
-	}
-
-	/**
-	 * API name: {@code must_not}
-	 */
-	public final List<Query> mustNot() {
-		return this.mustNot;
-	}
-
-	/**
-	 * API name: {@code should}
-	 */
-	public final List<Query> should() {
-		return this.should;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.filter)) {
-			generator.writeKey("filter");
-			generator.writeStartArray();
-			for (Query item0 : this.filter) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.minimumShouldMatch != null) {
-			generator.writeKey("minimum_should_match");
-			generator.write(this.minimumShouldMatch);
-
-		}
-		if (ApiTypeHelper.isDefined(this.must)) {
-			generator.writeKey("must");
-			generator.writeStartArray();
-			for (Query item0 : this.must) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.mustNot)) {
-			generator.writeKey("must_not");
-			generator.writeStartArray();
-			for (Query item0 : this.mustNot) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.should)) {
-			generator.writeKey("should");
-			generator.writeStartArray();
-			for (Query item0 : this.should) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link BoolQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<BoolQuery> {
-		@Nullable
-		private List<Query> filter;
-
-		@Nullable
-		private String minimumShouldMatch;
-
-		@Nullable
-		private List<Query> must;
-
-		@Nullable
-		private List<Query> mustNot;
-
-		@Nullable
-		private List<Query> should;
-
-		/**
-		 * API name: {@code filter}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>filter</code>.
-		 */
-		public final Builder filter(List<Query> list) {
-			this.filter = _listAddAll(this.filter, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 * <p>
-		 * Adds one or more values to <code>filter</code>.
-		 */
-		public final Builder filter(Query value, Query... values) {
-			this.filter = _listAdd(this.filter, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 * <p>
-		 * Adds a value to <code>filter</code> using a builder lambda.
-		 */
-		public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return filter(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code minimum_should_match}
-		 */
-		public final Builder minimumShouldMatch(@Nullable String value) {
-			this.minimumShouldMatch = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code must}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>must</code>.
-		 */
-		public final Builder must(List<Query> list) {
-			this.must = _listAddAll(this.must, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code must}
-		 * <p>
-		 * Adds one or more values to <code>must</code>.
-		 */
-		public final Builder must(Query value, Query... values) {
-			this.must = _listAdd(this.must, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code must}
-		 * <p>
-		 * Adds a value to <code>must</code> using a builder lambda.
-		 */
-		public final Builder must(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return must(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code must_not}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>mustNot</code>.
-		 */
-		public final Builder mustNot(List<Query> list) {
-			this.mustNot = _listAddAll(this.mustNot, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code must_not}
-		 * <p>
-		 * Adds one or more values to <code>mustNot</code>.
-		 */
-		public final Builder mustNot(Query value, Query... values) {
-			this.mustNot = _listAdd(this.mustNot, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code must_not}
-		 * <p>
-		 * Adds a value to <code>mustNot</code> using a builder lambda.
-		 */
-		public final Builder mustNot(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return mustNot(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code should}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>should</code>.
-		 */
-		public final Builder should(List<Query> list) {
-			this.should = _listAddAll(this.should, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code should}
-		 * <p>
-		 * Adds one or more values to <code>should</code>.
-		 */
-		public final Builder should(Query value, Query... values) {
-			this.should = _listAdd(this.should, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code should}
-		 * <p>
-		 * Adds a value to <code>should</code> using a builder lambda.
-		 */
-		public final Builder should(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return should(fn.apply(new Query.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link BoolQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public BoolQuery build() {
-			_checkSingleUse();
-
-			return new BoolQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link BoolQuery}
-	 */
-	public static final JsonpDeserializer<BoolQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			BoolQuery::setupBoolQueryDeserializer);
-
-	protected static void setupBoolQueryDeserializer(ObjectDeserializer<BoolQuery.Builder> op) {
-		setupQueryBaseDeserializer(op);
-		op.add(Builder::filter, JsonpDeserializer.arrayDeserializer(Query._DESERIALIZER), "filter");
-		op.add(Builder::minimumShouldMatch, JsonpDeserializer.stringDeserializer(), "minimum_should_match");
-		op.add(Builder::must, JsonpDeserializer.arrayDeserializer(Query._DESERIALIZER), "must");
-		op.add(Builder::mustNot, JsonpDeserializer.arrayDeserializer(Query._DESERIALIZER), "must_not");
-		op.add(Builder::should, JsonpDeserializer.arrayDeserializer(Query._DESERIALIZER), "should");
-
-	}
+    private final List<Query> filter;
+
+    @Nullable
+    private final String minimumShouldMatch;
+
+    private final List<Query> must;
+
+    private final List<Query> mustNot;
+
+    private final List<Query> should;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private BoolQuery(Builder builder) {
+        super(builder);
+
+        this.filter = ApiTypeHelper.unmodifiable(builder.filter);
+        this.minimumShouldMatch = builder.minimumShouldMatch;
+        this.must = ApiTypeHelper.unmodifiable(builder.must);
+        this.mustNot = ApiTypeHelper.unmodifiable(builder.mustNot);
+        this.should = ApiTypeHelper.unmodifiable(builder.should);
+
+    }
+
+    public static BoolQuery of(Function<Builder, ObjectBuilder<BoolQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Bool;
+    }
+
+    /**
+     * API name: {@code filter}
+     */
+    public final List<Query> filter() {
+        return this.filter;
+    }
+
+    /**
+     * API name: {@code minimum_should_match}
+     */
+    @Nullable
+    public final String minimumShouldMatch() {
+        return this.minimumShouldMatch;
+    }
+
+    /**
+     * API name: {@code must}
+     */
+    public final List<Query> must() {
+        return this.must;
+    }
+
+    /**
+     * API name: {@code must_not}
+     */
+    public final List<Query> mustNot() {
+        return this.mustNot;
+    }
+
+    /**
+     * API name: {@code should}
+     */
+    public final List<Query> should() {
+        return this.should;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.filter)) {
+            generator.writeKey("filter");
+            generator.writeStartArray();
+            for (Query item0 : this.filter) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.minimumShouldMatch != null) {
+            generator.writeKey("minimum_should_match");
+            generator.write(this.minimumShouldMatch);
+
+        }
+        if (ApiTypeHelper.isDefined(this.must)) {
+            generator.writeKey("must");
+            generator.writeStartArray();
+            for (Query item0 : this.must) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.mustNot)) {
+            generator.writeKey("must_not");
+            generator.writeStartArray();
+            for (Query item0 : this.mustNot) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.should)) {
+            generator.writeKey("should");
+            generator.writeStartArray();
+            for (Query item0 : this.should) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link BoolQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<BoolQuery> {
+        @Nullable
+        private List<Query> filter;
+
+        @Nullable
+        private String minimumShouldMatch;
+
+        @Nullable
+        private List<Query> must;
+
+        @Nullable
+        private List<Query> mustNot;
+
+        @Nullable
+        private List<Query> should;
+
+        /**
+         * API name: {@code filter}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>filter</code>.
+         */
+        public final Builder filter(List<Query> list) {
+            this.filter = _listAddAll(this.filter, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         * <p>
+         * Adds one or more values to <code>filter</code>.
+         */
+        public final Builder filter(Query value, Query... values) {
+            this.filter = _listAdd(this.filter, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         * <p>
+         * Adds a value to <code>filter</code> using a builder lambda.
+         */
+        public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return filter(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code minimum_should_match}
+         */
+        public final Builder minimumShouldMatch(@Nullable String value) {
+            this.minimumShouldMatch = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code must}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>must</code>.
+         */
+        public final Builder must(List<Query> list) {
+            this.must = _listAddAll(this.must, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code must}
+         * <p>
+         * Adds one or more values to <code>must</code>.
+         */
+        public final Builder must(Query value, Query... values) {
+            this.must = _listAdd(this.must, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code must}
+         * <p>
+         * Adds a value to <code>must</code> using a builder lambda.
+         */
+        public final Builder must(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return must(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code must_not}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>mustNot</code>.
+         */
+        public final Builder mustNot(List<Query> list) {
+            this.mustNot = _listAddAll(this.mustNot, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code must_not}
+         * <p>
+         * Adds one or more values to <code>mustNot</code>.
+         */
+        public final Builder mustNot(Query value, Query... values) {
+            this.mustNot = _listAdd(this.mustNot, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code must_not}
+         * <p>
+         * Adds a value to <code>mustNot</code> using a builder lambda.
+         */
+        public final Builder mustNot(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return mustNot(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code should}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>should</code>.
+         */
+        public final Builder should(List<Query> list) {
+            this.should = _listAddAll(this.should, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code should}
+         * <p>
+         * Adds one or more values to <code>should</code>.
+         */
+        public final Builder should(Query value, Query... values) {
+            this.should = _listAdd(this.should, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code should}
+         * <p>
+         * Adds a value to <code>should</code> using a builder lambda.
+         */
+        public final Builder should(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return should(fn.apply(new Query.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link BoolQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public BoolQuery build() {
+            _checkSingleUse();
+
+            return new BoolQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link BoolQuery}
+     */
+    public static final JsonpDeserializer<BoolQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        BoolQuery::setupBoolQueryDeserializer
+    );
+
+    protected static void setupBoolQueryDeserializer(ObjectDeserializer<BoolQuery.Builder> op) {
+        setupQueryBaseDeserializer(op);
+        op.add(Builder::filter, JsonpDeserializer.arrayDeserializer(Query._DESERIALIZER), "filter");
+        op.add(Builder::minimumShouldMatch, JsonpDeserializer.stringDeserializer(), "minimum_should_match");
+        op.add(Builder::must, JsonpDeserializer.arrayDeserializer(Query._DESERIALIZER), "must");
+        op.add(Builder::mustNot, JsonpDeserializer.arrayDeserializer(Query._DESERIALIZER), "must_not");
+        op.add(Builder::should, JsonpDeserializer.arrayDeserializer(Query._DESERIALIZER), "should");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/BoostingQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/BoostingQuery.java
index ea509d9a98..aba9ae8b22 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/BoostingQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/BoostingQuery.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,161 +41,160 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.BoostingQuery
 
-
 @JsonpDeserializable
 public class BoostingQuery extends QueryBase implements QueryVariant {
-	private final double negativeBoost;
+    private final double negativeBoost;
 
-	private final Query negative;
-
-	private final Query positive;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private BoostingQuery(Builder builder) {
-		super(builder);
-
-		this.negativeBoost = ApiTypeHelper.requireNonNull(builder.negativeBoost, this, "negativeBoost");
-		this.negative = ApiTypeHelper.requireNonNull(builder.negative, this, "negative");
-		this.positive = ApiTypeHelper.requireNonNull(builder.positive, this, "positive");
-
-	}
-
-	public static BoostingQuery of(Function<Builder, ObjectBuilder<BoostingQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Boosting;
-	}
-
-	/**
-	 * Required - API name: {@code negative_boost}
-	 */
-	public final double negativeBoost() {
-		return this.negativeBoost;
-	}
-
-	/**
-	 * Required - API name: {@code negative}
-	 */
-	public final Query negative() {
-		return this.negative;
-	}
-
-	/**
-	 * Required - API name: {@code positive}
-	 */
-	public final Query positive() {
-		return this.positive;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("negative_boost");
-		generator.write(this.negativeBoost);
-
-		generator.writeKey("negative");
-		this.negative.serialize(generator, mapper);
-
-		generator.writeKey("positive");
-		this.positive.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link BoostingQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<BoostingQuery> {
-		private Double negativeBoost;
-
-		private Query negative;
-
-		private Query positive;
-
-		/**
-		 * Required - API name: {@code negative_boost}
-		 */
-		public final Builder negativeBoost(double value) {
-			this.negativeBoost = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code negative}
-		 */
-		public final Builder negative(Query value) {
-			this.negative = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code negative}
-		 */
-		public final Builder negative(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.negative(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code positive}
-		 */
-		public final Builder positive(Query value) {
-			this.positive = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code positive}
-		 */
-		public final Builder positive(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.positive(fn.apply(new Query.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link BoostingQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public BoostingQuery build() {
-			_checkSingleUse();
-
-			return new BoostingQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link BoostingQuery}
-	 */
-	public static final JsonpDeserializer<BoostingQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			BoostingQuery::setupBoostingQueryDeserializer);
-
-	protected static void setupBoostingQueryDeserializer(ObjectDeserializer<BoostingQuery.Builder> op) {
-		setupQueryBaseDeserializer(op);
-		op.add(Builder::negativeBoost, JsonpDeserializer.doubleDeserializer(), "negative_boost");
-		op.add(Builder::negative, Query._DESERIALIZER, "negative");
-		op.add(Builder::positive, Query._DESERIALIZER, "positive");
-
-	}
+    private final Query negative;
+
+    private final Query positive;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private BoostingQuery(Builder builder) {
+        super(builder);
+
+        this.negativeBoost = ApiTypeHelper.requireNonNull(builder.negativeBoost, this, "negativeBoost");
+        this.negative = ApiTypeHelper.requireNonNull(builder.negative, this, "negative");
+        this.positive = ApiTypeHelper.requireNonNull(builder.positive, this, "positive");
+
+    }
+
+    public static BoostingQuery of(Function<Builder, ObjectBuilder<BoostingQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Boosting;
+    }
+
+    /**
+     * Required - API name: {@code negative_boost}
+     */
+    public final double negativeBoost() {
+        return this.negativeBoost;
+    }
+
+    /**
+     * Required - API name: {@code negative}
+     */
+    public final Query negative() {
+        return this.negative;
+    }
+
+    /**
+     * Required - API name: {@code positive}
+     */
+    public final Query positive() {
+        return this.positive;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("negative_boost");
+        generator.write(this.negativeBoost);
+
+        generator.writeKey("negative");
+        this.negative.serialize(generator, mapper);
+
+        generator.writeKey("positive");
+        this.positive.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link BoostingQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<BoostingQuery> {
+        private Double negativeBoost;
+
+        private Query negative;
+
+        private Query positive;
+
+        /**
+         * Required - API name: {@code negative_boost}
+         */
+        public final Builder negativeBoost(double value) {
+            this.negativeBoost = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code negative}
+         */
+        public final Builder negative(Query value) {
+            this.negative = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code negative}
+         */
+        public final Builder negative(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.negative(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code positive}
+         */
+        public final Builder positive(Query value) {
+            this.positive = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code positive}
+         */
+        public final Builder positive(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.positive(fn.apply(new Query.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link BoostingQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public BoostingQuery build() {
+            _checkSingleUse();
+
+            return new BoostingQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link BoostingQuery}
+     */
+    public static final JsonpDeserializer<BoostingQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        BoostingQuery::setupBoostingQueryDeserializer
+    );
+
+    protected static void setupBoostingQueryDeserializer(ObjectDeserializer<BoostingQuery.Builder> op) {
+        setupQueryBaseDeserializer(op);
+        op.add(Builder::negativeBoost, JsonpDeserializer.doubleDeserializer(), "negative_boost");
+        op.add(Builder::negative, Query._DESERIALIZER, "negative");
+        op.add(Builder::positive, Query._DESERIALIZER, "positive");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ChildScoreMode.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ChildScoreMode.java
index a8ad49e6e0..4eeac77cc9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ChildScoreMode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ChildScoreMode.java
@@ -35,31 +35,29 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum ChildScoreMode implements JsonEnum {
-	None("none"),
+    None("none"),
 
-	Avg("avg"),
+    Avg("avg"),
 
-	Sum("sum"),
+    Sum("sum"),
 
-	Max("max"),
+    Max("max"),
 
-	Min("min"),
+    Min("min"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	ChildScoreMode(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    ChildScoreMode(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<ChildScoreMode> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			ChildScoreMode.values());
+    public static final JsonEnum.Deserializer<ChildScoreMode> _DESERIALIZER = new JsonEnum.Deserializer<>(ChildScoreMode.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/CombinedFieldsOperator.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/CombinedFieldsOperator.java
index 1c56d1cc92..bd0b507789 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/CombinedFieldsOperator.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/CombinedFieldsOperator.java
@@ -35,25 +35,25 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum CombinedFieldsOperator implements JsonEnum {
-	Or("or"),
+    Or("or"),
 
-	And("and"),
+    And("and"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	CombinedFieldsOperator(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    CombinedFieldsOperator(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<CombinedFieldsOperator> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			CombinedFieldsOperator.values());
+    public static final JsonEnum.Deserializer<CombinedFieldsOperator> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        CombinedFieldsOperator.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/CombinedFieldsQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/CombinedFieldsQuery.java
index 42a077a152..24d58587a6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/CombinedFieldsQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/CombinedFieldsQuery.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,262 +43,256 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.CombinedFieldsQuery
 
-
 @JsonpDeserializable
 public class CombinedFieldsQuery extends QueryBase implements QueryVariant {
-	private final List<String> fields;
-
-	private final String query;
-
-	@Nullable
-	private final Boolean autoGenerateSynonymsPhraseQuery;
-
-	@Nullable
-	private final CombinedFieldsOperator operator;
-
-	@Nullable
-	private final String mimimumShouldMatch;
-
-	@Nullable
-	private final CombinedFieldsZeroTerms zeroTermsQuery;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CombinedFieldsQuery(Builder builder) {
-		super(builder);
-
-		this.fields = ApiTypeHelper.unmodifiableRequired(builder.fields, this, "fields");
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-		this.autoGenerateSynonymsPhraseQuery = builder.autoGenerateSynonymsPhraseQuery;
-		this.operator = builder.operator;
-		this.mimimumShouldMatch = builder.mimimumShouldMatch;
-		this.zeroTermsQuery = builder.zeroTermsQuery;
-
-	}
-
-	public static CombinedFieldsQuery of(Function<Builder, ObjectBuilder<CombinedFieldsQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.CombinedFields;
-	}
-
-	/**
-	 * Required - API name: {@code fields}
-	 */
-	public final List<String> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final String query() {
-		return this.query;
-	}
-
-	/**
-	 * API name: {@code auto_generate_synonyms_phrase_query}
-	 */
-	@Nullable
-	public final Boolean autoGenerateSynonymsPhraseQuery() {
-		return this.autoGenerateSynonymsPhraseQuery;
-	}
-
-	/**
-	 * API name: {@code operator}
-	 */
-	@Nullable
-	public final CombinedFieldsOperator operator() {
-		return this.operator;
-	}
-
-	/**
-	 * API name: {@code mimimum_should_match}
-	 */
-	@Nullable
-	public final String mimimumShouldMatch() {
-		return this.mimimumShouldMatch;
-	}
-
-	/**
-	 * API name: {@code zero_terms_query}
-	 */
-	@Nullable
-	public final CombinedFieldsZeroTerms zeroTermsQuery() {
-		return this.zeroTermsQuery;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartArray();
-			for (String item0 : this.fields) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("query");
-		generator.write(this.query);
-
-		if (this.autoGenerateSynonymsPhraseQuery != null) {
-			generator.writeKey("auto_generate_synonyms_phrase_query");
-			generator.write(this.autoGenerateSynonymsPhraseQuery);
-
-		}
-		if (this.operator != null) {
-			generator.writeKey("operator");
-			this.operator.serialize(generator, mapper);
-		}
-		if (this.mimimumShouldMatch != null) {
-			generator.writeKey("mimimum_should_match");
-			generator.write(this.mimimumShouldMatch);
-
-		}
-		if (this.zeroTermsQuery != null) {
-			generator.writeKey("zero_terms_query");
-			this.zeroTermsQuery.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CombinedFieldsQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<CombinedFieldsQuery> {
-		private List<String> fields;
-
-		private String query;
-
-		@Nullable
-		private Boolean autoGenerateSynonymsPhraseQuery;
-
-		@Nullable
-		private CombinedFieldsOperator operator;
-
-		@Nullable
-		private String mimimumShouldMatch;
-
-		@Nullable
-		private CombinedFieldsZeroTerms zeroTermsQuery;
-
-		/**
-		 * Required - API name: {@code fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fields</code>.
-		 */
-		public final Builder fields(List<String> list) {
-			this.fields = _listAddAll(this.fields, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code fields}
-		 * <p>
-		 * Adds one or more values to <code>fields</code>.
-		 */
-		public final Builder fields(String value, String... values) {
-			this.fields = _listAdd(this.fields, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(String value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code auto_generate_synonyms_phrase_query}
-		 */
-		public final Builder autoGenerateSynonymsPhraseQuery(@Nullable Boolean value) {
-			this.autoGenerateSynonymsPhraseQuery = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code operator}
-		 */
-		public final Builder operator(@Nullable CombinedFieldsOperator value) {
-			this.operator = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mimimum_should_match}
-		 */
-		public final Builder mimimumShouldMatch(@Nullable String value) {
-			this.mimimumShouldMatch = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code zero_terms_query}
-		 */
-		public final Builder zeroTermsQuery(@Nullable CombinedFieldsZeroTerms value) {
-			this.zeroTermsQuery = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CombinedFieldsQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CombinedFieldsQuery build() {
-			_checkSingleUse();
-
-			return new CombinedFieldsQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CombinedFieldsQuery}
-	 */
-	public static final JsonpDeserializer<CombinedFieldsQuery> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CombinedFieldsQuery::setupCombinedFieldsQueryDeserializer);
-
-	protected static void setupCombinedFieldsQueryDeserializer(ObjectDeserializer<CombinedFieldsQuery.Builder> op) {
-		setupQueryBaseDeserializer(op);
-		op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "fields");
-		op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
-		op.add(Builder::autoGenerateSynonymsPhraseQuery, JsonpDeserializer.booleanDeserializer(),
-				"auto_generate_synonyms_phrase_query");
-		op.add(Builder::operator, CombinedFieldsOperator._DESERIALIZER, "operator");
-		op.add(Builder::mimimumShouldMatch, JsonpDeserializer.stringDeserializer(), "mimimum_should_match");
-		op.add(Builder::zeroTermsQuery, CombinedFieldsZeroTerms._DESERIALIZER, "zero_terms_query");
-
-	}
+    private final List<String> fields;
+
+    private final String query;
+
+    @Nullable
+    private final Boolean autoGenerateSynonymsPhraseQuery;
+
+    @Nullable
+    private final CombinedFieldsOperator operator;
+
+    @Nullable
+    private final String mimimumShouldMatch;
+
+    @Nullable
+    private final CombinedFieldsZeroTerms zeroTermsQuery;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CombinedFieldsQuery(Builder builder) {
+        super(builder);
+
+        this.fields = ApiTypeHelper.unmodifiableRequired(builder.fields, this, "fields");
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+        this.autoGenerateSynonymsPhraseQuery = builder.autoGenerateSynonymsPhraseQuery;
+        this.operator = builder.operator;
+        this.mimimumShouldMatch = builder.mimimumShouldMatch;
+        this.zeroTermsQuery = builder.zeroTermsQuery;
+
+    }
+
+    public static CombinedFieldsQuery of(Function<Builder, ObjectBuilder<CombinedFieldsQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.CombinedFields;
+    }
+
+    /**
+     * Required - API name: {@code fields}
+     */
+    public final List<String> fields() {
+        return this.fields;
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final String query() {
+        return this.query;
+    }
+
+    /**
+     * API name: {@code auto_generate_synonyms_phrase_query}
+     */
+    @Nullable
+    public final Boolean autoGenerateSynonymsPhraseQuery() {
+        return this.autoGenerateSynonymsPhraseQuery;
+    }
+
+    /**
+     * API name: {@code operator}
+     */
+    @Nullable
+    public final CombinedFieldsOperator operator() {
+        return this.operator;
+    }
+
+    /**
+     * API name: {@code mimimum_should_match}
+     */
+    @Nullable
+    public final String mimimumShouldMatch() {
+        return this.mimimumShouldMatch;
+    }
+
+    /**
+     * API name: {@code zero_terms_query}
+     */
+    @Nullable
+    public final CombinedFieldsZeroTerms zeroTermsQuery() {
+        return this.zeroTermsQuery;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartArray();
+            for (String item0 : this.fields) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("query");
+        generator.write(this.query);
+
+        if (this.autoGenerateSynonymsPhraseQuery != null) {
+            generator.writeKey("auto_generate_synonyms_phrase_query");
+            generator.write(this.autoGenerateSynonymsPhraseQuery);
+
+        }
+        if (this.operator != null) {
+            generator.writeKey("operator");
+            this.operator.serialize(generator, mapper);
+        }
+        if (this.mimimumShouldMatch != null) {
+            generator.writeKey("mimimum_should_match");
+            generator.write(this.mimimumShouldMatch);
+
+        }
+        if (this.zeroTermsQuery != null) {
+            generator.writeKey("zero_terms_query");
+            this.zeroTermsQuery.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CombinedFieldsQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<CombinedFieldsQuery> {
+        private List<String> fields;
+
+        private String query;
+
+        @Nullable
+        private Boolean autoGenerateSynonymsPhraseQuery;
+
+        @Nullable
+        private CombinedFieldsOperator operator;
+
+        @Nullable
+        private String mimimumShouldMatch;
+
+        @Nullable
+        private CombinedFieldsZeroTerms zeroTermsQuery;
+
+        /**
+         * Required - API name: {@code fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fields</code>.
+         */
+        public final Builder fields(List<String> list) {
+            this.fields = _listAddAll(this.fields, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code fields}
+         * <p>
+         * Adds one or more values to <code>fields</code>.
+         */
+        public final Builder fields(String value, String... values) {
+            this.fields = _listAdd(this.fields, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(String value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code auto_generate_synonyms_phrase_query}
+         */
+        public final Builder autoGenerateSynonymsPhraseQuery(@Nullable Boolean value) {
+            this.autoGenerateSynonymsPhraseQuery = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code operator}
+         */
+        public final Builder operator(@Nullable CombinedFieldsOperator value) {
+            this.operator = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mimimum_should_match}
+         */
+        public final Builder mimimumShouldMatch(@Nullable String value) {
+            this.mimimumShouldMatch = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code zero_terms_query}
+         */
+        public final Builder zeroTermsQuery(@Nullable CombinedFieldsZeroTerms value) {
+            this.zeroTermsQuery = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CombinedFieldsQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CombinedFieldsQuery build() {
+            _checkSingleUse();
+
+            return new CombinedFieldsQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CombinedFieldsQuery}
+     */
+    public static final JsonpDeserializer<CombinedFieldsQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CombinedFieldsQuery::setupCombinedFieldsQueryDeserializer
+    );
+
+    protected static void setupCombinedFieldsQueryDeserializer(ObjectDeserializer<CombinedFieldsQuery.Builder> op) {
+        setupQueryBaseDeserializer(op);
+        op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "fields");
+        op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
+        op.add(Builder::autoGenerateSynonymsPhraseQuery, JsonpDeserializer.booleanDeserializer(), "auto_generate_synonyms_phrase_query");
+        op.add(Builder::operator, CombinedFieldsOperator._DESERIALIZER, "operator");
+        op.add(Builder::mimimumShouldMatch, JsonpDeserializer.stringDeserializer(), "mimimum_should_match");
+        op.add(Builder::zeroTermsQuery, CombinedFieldsZeroTerms._DESERIALIZER, "zero_terms_query");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/CombinedFieldsZeroTerms.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/CombinedFieldsZeroTerms.java
index a4c38d17d1..f098ace24b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/CombinedFieldsZeroTerms.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/CombinedFieldsZeroTerms.java
@@ -35,25 +35,25 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum CombinedFieldsZeroTerms implements JsonEnum {
-	None("none"),
+    None("none"),
 
-	All("all"),
+    All("all"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	CombinedFieldsZeroTerms(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    CombinedFieldsZeroTerms(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<CombinedFieldsZeroTerms> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			CombinedFieldsZeroTerms.values());
+    public static final JsonEnum.Deserializer<CombinedFieldsZeroTerms> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        CombinedFieldsZeroTerms.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/CommonTermsQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/CommonTermsQuery.java
index 995c3d85e1..98dccc2b33 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/CommonTermsQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/CommonTermsQuery.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,270 +42,268 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.CommonTermsQuery
 
-
 @JsonpDeserializable
 public class CommonTermsQuery extends QueryBase implements QueryVariant {
-	// Single key dictionary
-	private final String field;
-
-	@Nullable
-	private final String analyzer;
-
-	@Nullable
-	private final Double cutoffFrequency;
-
-	@Nullable
-	private final Operator highFreqOperator;
-
-	@Nullable
-	private final Operator lowFreqOperator;
-
-	@Nullable
-	private final String minimumShouldMatch;
-
-	private final String query;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CommonTermsQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-
-		this.analyzer = builder.analyzer;
-		this.cutoffFrequency = builder.cutoffFrequency;
-		this.highFreqOperator = builder.highFreqOperator;
-		this.lowFreqOperator = builder.lowFreqOperator;
-		this.minimumShouldMatch = builder.minimumShouldMatch;
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-
-	}
-
-	public static CommonTermsQuery of(Function<Builder, ObjectBuilder<CommonTermsQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Common;
-	}
-
-	/**
-	 * Required - The target field
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * API name: {@code cutoff_frequency}
-	 */
-	@Nullable
-	public final Double cutoffFrequency() {
-		return this.cutoffFrequency;
-	}
-
-	/**
-	 * API name: {@code high_freq_operator}
-	 */
-	@Nullable
-	public final Operator highFreqOperator() {
-		return this.highFreqOperator;
-	}
-
-	/**
-	 * API name: {@code low_freq_operator}
-	 */
-	@Nullable
-	public final Operator lowFreqOperator() {
-		return this.lowFreqOperator;
-	}
-
-	/**
-	 * API name: {@code minimum_should_match}
-	 */
-	@Nullable
-	public final String minimumShouldMatch() {
-		return this.minimumShouldMatch;
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final String query() {
-		return this.query;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject(this.field);
-
-		super.serializeInternal(generator, mapper);
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			generator.write(this.analyzer);
-
-		}
-		if (this.cutoffFrequency != null) {
-			generator.writeKey("cutoff_frequency");
-			generator.write(this.cutoffFrequency);
-
-		}
-		if (this.highFreqOperator != null) {
-			generator.writeKey("high_freq_operator");
-			this.highFreqOperator.serialize(generator, mapper);
-		}
-		if (this.lowFreqOperator != null) {
-			generator.writeKey("low_freq_operator");
-			this.lowFreqOperator.serialize(generator, mapper);
-		}
-		if (this.minimumShouldMatch != null) {
-			generator.writeKey("minimum_should_match");
-			generator.write(this.minimumShouldMatch);
-
-		}
-		generator.writeKey("query");
-		generator.write(this.query);
-
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CommonTermsQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<CommonTermsQuery> {
-		private String field;
-
-		/**
-		 * Required - The target field
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		@Nullable
-		private String analyzer;
-
-		@Nullable
-		private Double cutoffFrequency;
-
-		@Nullable
-		private Operator highFreqOperator;
-
-		@Nullable
-		private Operator lowFreqOperator;
-
-		@Nullable
-		private String minimumShouldMatch;
-
-		private String query;
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code cutoff_frequency}
-		 */
-		public final Builder cutoffFrequency(@Nullable Double value) {
-			this.cutoffFrequency = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code high_freq_operator}
-		 */
-		public final Builder highFreqOperator(@Nullable Operator value) {
-			this.highFreqOperator = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code low_freq_operator}
-		 */
-		public final Builder lowFreqOperator(@Nullable Operator value) {
-			this.lowFreqOperator = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code minimum_should_match}
-		 */
-		public final Builder minimumShouldMatch(@Nullable String value) {
-			this.minimumShouldMatch = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(String value) {
-			this.query = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CommonTermsQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CommonTermsQuery build() {
-			_checkSingleUse();
-
-			return new CommonTermsQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CommonTermsQuery}
-	 */
-	public static final JsonpDeserializer<CommonTermsQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CommonTermsQuery::setupCommonTermsQueryDeserializer);
-
-	protected static void setupCommonTermsQueryDeserializer(ObjectDeserializer<CommonTermsQuery.Builder> op) {
-		setupQueryBaseDeserializer(op);
-		op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(Builder::cutoffFrequency, JsonpDeserializer.doubleDeserializer(), "cutoff_frequency");
-		op.add(Builder::highFreqOperator, Operator._DESERIALIZER, "high_freq_operator");
-		op.add(Builder::lowFreqOperator, Operator._DESERIALIZER, "low_freq_operator");
-		op.add(Builder::minimumShouldMatch, JsonpDeserializer.stringDeserializer(), "minimum_should_match");
-		op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
-
-		op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
-		op.shortcutProperty("query");
-
-	}
+    // Single key dictionary
+    private final String field;
+
+    @Nullable
+    private final String analyzer;
+
+    @Nullable
+    private final Double cutoffFrequency;
+
+    @Nullable
+    private final Operator highFreqOperator;
+
+    @Nullable
+    private final Operator lowFreqOperator;
+
+    @Nullable
+    private final String minimumShouldMatch;
+
+    private final String query;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CommonTermsQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+
+        this.analyzer = builder.analyzer;
+        this.cutoffFrequency = builder.cutoffFrequency;
+        this.highFreqOperator = builder.highFreqOperator;
+        this.lowFreqOperator = builder.lowFreqOperator;
+        this.minimumShouldMatch = builder.minimumShouldMatch;
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+
+    }
+
+    public static CommonTermsQuery of(Function<Builder, ObjectBuilder<CommonTermsQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Common;
+    }
+
+    /**
+     * Required - The target field
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * API name: {@code cutoff_frequency}
+     */
+    @Nullable
+    public final Double cutoffFrequency() {
+        return this.cutoffFrequency;
+    }
+
+    /**
+     * API name: {@code high_freq_operator}
+     */
+    @Nullable
+    public final Operator highFreqOperator() {
+        return this.highFreqOperator;
+    }
+
+    /**
+     * API name: {@code low_freq_operator}
+     */
+    @Nullable
+    public final Operator lowFreqOperator() {
+        return this.lowFreqOperator;
+    }
+
+    /**
+     * API name: {@code minimum_should_match}
+     */
+    @Nullable
+    public final String minimumShouldMatch() {
+        return this.minimumShouldMatch;
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final String query() {
+        return this.query;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject(this.field);
+
+        super.serializeInternal(generator, mapper);
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            generator.write(this.analyzer);
+
+        }
+        if (this.cutoffFrequency != null) {
+            generator.writeKey("cutoff_frequency");
+            generator.write(this.cutoffFrequency);
+
+        }
+        if (this.highFreqOperator != null) {
+            generator.writeKey("high_freq_operator");
+            this.highFreqOperator.serialize(generator, mapper);
+        }
+        if (this.lowFreqOperator != null) {
+            generator.writeKey("low_freq_operator");
+            this.lowFreqOperator.serialize(generator, mapper);
+        }
+        if (this.minimumShouldMatch != null) {
+            generator.writeKey("minimum_should_match");
+            generator.write(this.minimumShouldMatch);
+
+        }
+        generator.writeKey("query");
+        generator.write(this.query);
+
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CommonTermsQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<CommonTermsQuery> {
+        private String field;
+
+        /**
+         * Required - The target field
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        @Nullable
+        private String analyzer;
+
+        @Nullable
+        private Double cutoffFrequency;
+
+        @Nullable
+        private Operator highFreqOperator;
+
+        @Nullable
+        private Operator lowFreqOperator;
+
+        @Nullable
+        private String minimumShouldMatch;
+
+        private String query;
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code cutoff_frequency}
+         */
+        public final Builder cutoffFrequency(@Nullable Double value) {
+            this.cutoffFrequency = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code high_freq_operator}
+         */
+        public final Builder highFreqOperator(@Nullable Operator value) {
+            this.highFreqOperator = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code low_freq_operator}
+         */
+        public final Builder lowFreqOperator(@Nullable Operator value) {
+            this.lowFreqOperator = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code minimum_should_match}
+         */
+        public final Builder minimumShouldMatch(@Nullable String value) {
+            this.minimumShouldMatch = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(String value) {
+            this.query = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CommonTermsQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CommonTermsQuery build() {
+            _checkSingleUse();
+
+            return new CommonTermsQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CommonTermsQuery}
+     */
+    public static final JsonpDeserializer<CommonTermsQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CommonTermsQuery::setupCommonTermsQueryDeserializer
+    );
+
+    protected static void setupCommonTermsQueryDeserializer(ObjectDeserializer<CommonTermsQuery.Builder> op) {
+        setupQueryBaseDeserializer(op);
+        op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(Builder::cutoffFrequency, JsonpDeserializer.doubleDeserializer(), "cutoff_frequency");
+        op.add(Builder::highFreqOperator, Operator._DESERIALIZER, "high_freq_operator");
+        op.add(Builder::lowFreqOperator, Operator._DESERIALIZER, "low_freq_operator");
+        op.add(Builder::minimumShouldMatch, JsonpDeserializer.stringDeserializer(), "minimum_should_match");
+        op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
+
+        op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
+        op.shortcutProperty("query");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ConstantScoreQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ConstantScoreQuery.java
index 5ada920bc3..aa5a104b32 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ConstantScoreQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ConstantScoreQuery.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,109 +41,105 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.ConstantScoreQuery
 
-
 @JsonpDeserializable
 public class ConstantScoreQuery extends QueryBase implements QueryVariant {
-	private final Query filter;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ConstantScoreQuery(Builder builder) {
-		super(builder);
-
-		this.filter = ApiTypeHelper.requireNonNull(builder.filter, this, "filter");
-
-	}
-
-	public static ConstantScoreQuery of(Function<Builder, ObjectBuilder<ConstantScoreQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.ConstantScore;
-	}
-
-	/**
-	 * Required - API name: {@code filter}
-	 */
-	public final Query filter() {
-		return this.filter;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("filter");
-		this.filter.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ConstantScoreQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ConstantScoreQuery> {
-		private Query filter;
-
-		/**
-		 * Required - API name: {@code filter}
-		 */
-		public final Builder filter(Query value) {
-			this.filter = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code filter}
-		 */
-		public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.filter(fn.apply(new Query.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ConstantScoreQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ConstantScoreQuery build() {
-			_checkSingleUse();
-
-			return new ConstantScoreQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ConstantScoreQuery}
-	 */
-	public static final JsonpDeserializer<ConstantScoreQuery> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ConstantScoreQuery::setupConstantScoreQueryDeserializer);
-
-	protected static void setupConstantScoreQueryDeserializer(ObjectDeserializer<ConstantScoreQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::filter, Query._DESERIALIZER, "filter");
-
-	}
+    private final Query filter;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ConstantScoreQuery(Builder builder) {
+        super(builder);
+
+        this.filter = ApiTypeHelper.requireNonNull(builder.filter, this, "filter");
+
+    }
+
+    public static ConstantScoreQuery of(Function<Builder, ObjectBuilder<ConstantScoreQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.ConstantScore;
+    }
+
+    /**
+     * Required - API name: {@code filter}
+     */
+    public final Query filter() {
+        return this.filter;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("filter");
+        this.filter.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ConstantScoreQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<ConstantScoreQuery> {
+        private Query filter;
+
+        /**
+         * Required - API name: {@code filter}
+         */
+        public final Builder filter(Query value) {
+            this.filter = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code filter}
+         */
+        public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.filter(fn.apply(new Query.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ConstantScoreQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ConstantScoreQuery build() {
+            _checkSingleUse();
+
+            return new ConstantScoreQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ConstantScoreQuery}
+     */
+    public static final JsonpDeserializer<ConstantScoreQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ConstantScoreQuery::setupConstantScoreQueryDeserializer
+    );
+
+    protected static void setupConstantScoreQueryDeserializer(ObjectDeserializer<ConstantScoreQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::filter, Query._DESERIALIZER, "filter");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DecayFunction.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DecayFunction.java
index e91eee71d6..5233e1a035 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DecayFunction.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DecayFunction.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,131 +41,128 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.DecayFunction
 
-
 @JsonpDeserializable
 public class DecayFunction extends DecayFunctionBase implements FunctionScoreVariant {
-	private final String field;
-
-	private final DecayPlacement placement;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DecayFunction(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.placement = ApiTypeHelper.requireNonNull(builder.placement, this, "placement");
-
-	}
-
-	public static DecayFunction of(Function<Builder, ObjectBuilder<DecayFunction>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * FunctionScore variant kind.
-	 */
-	@Override
-	public FunctionScore.Kind _functionScoreKind() {
-		return FunctionScore.Kind.Linear;
-	}
-
-	/**
-	 * Required -
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required -
-	 */
-	public final DecayPlacement placement() {
-		return this.placement;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeKey(this.field);
-		this.placement.serialize(generator, mapper);
-
-		super.serializeInternal(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DecayFunction}.
-	 */
-
-	public static class Builder extends DecayFunctionBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DecayFunction> {
-		private String field;
-
-		private DecayPlacement placement;
-
-		/**
-		 * Required -
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required -
-		 */
-		public final Builder placement(DecayPlacement value) {
-			this.placement = value;
-			return this;
-		}
-
-		/**
-		 * Required -
-		 */
-		public final Builder placement(Function<DecayPlacement.Builder, ObjectBuilder<DecayPlacement>> fn) {
-			return this.placement(fn.apply(new DecayPlacement.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DecayFunction}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DecayFunction build() {
-			_checkSingleUse();
-
-			return new DecayFunction(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DecayFunction}
-	 */
-	public static final JsonpDeserializer<DecayFunction> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			DecayFunction::setupDecayFunctionDeserializer);
-
-	protected static void setupDecayFunctionDeserializer(ObjectDeserializer<DecayFunction.Builder> op) {
-		setupDecayFunctionBaseDeserializer(op);
-
-		op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
-			builder.field(name);
-			builder.placement(DecayPlacement._DESERIALIZER.deserialize(parser, mapper));
-		});
-
-	}
+    private final String field;
+
+    private final DecayPlacement placement;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DecayFunction(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.placement = ApiTypeHelper.requireNonNull(builder.placement, this, "placement");
+
+    }
+
+    public static DecayFunction of(Function<Builder, ObjectBuilder<DecayFunction>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * FunctionScore variant kind.
+     */
+    @Override
+    public FunctionScore.Kind _functionScoreKind() {
+        return FunctionScore.Kind.Linear;
+    }
+
+    /**
+     * Required -
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required -
+     */
+    public final DecayPlacement placement() {
+        return this.placement;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeKey(this.field);
+        this.placement.serialize(generator, mapper);
+
+        super.serializeInternal(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DecayFunction}.
+     */
+
+    public static class Builder extends DecayFunctionBase.AbstractBuilder<Builder> implements ObjectBuilder<DecayFunction> {
+        private String field;
+
+        private DecayPlacement placement;
+
+        /**
+         * Required -
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required -
+         */
+        public final Builder placement(DecayPlacement value) {
+            this.placement = value;
+            return this;
+        }
+
+        /**
+         * Required -
+         */
+        public final Builder placement(Function<DecayPlacement.Builder, ObjectBuilder<DecayPlacement>> fn) {
+            return this.placement(fn.apply(new DecayPlacement.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DecayFunction}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DecayFunction build() {
+            _checkSingleUse();
+
+            return new DecayFunction(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DecayFunction}
+     */
+    public static final JsonpDeserializer<DecayFunction> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DecayFunction::setupDecayFunctionDeserializer
+    );
+
+    protected static void setupDecayFunctionDeserializer(ObjectDeserializer<DecayFunction.Builder> op) {
+        setupDecayFunctionBaseDeserializer(op);
+
+        op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
+            builder.field(name);
+            builder.placement(DecayPlacement._DESERIALIZER.deserialize(parser, mapper));
+        });
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DecayFunctionBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DecayFunctionBase.java
index e038f2a960..425d1857c1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DecayFunctionBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DecayFunctionBase.java
@@ -32,69 +32,64 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.ObjectDeserializer;
 import jakarta.json.stream.JsonGenerator;
-
 import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.ObjectDeserializer;
 
 // typedef: _types.query_dsl.DecayFunctionBase
 
-
-
 public abstract class DecayFunctionBase extends ScoreFunctionBase {
-	@Nullable
-	private final MultiValueMode multiValueMode;
+    @Nullable
+    private final MultiValueMode multiValueMode;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected DecayFunctionBase(AbstractBuilder<?> builder) {
-		super(builder);
+    protected DecayFunctionBase(AbstractBuilder<?> builder) {
+        super(builder);
 
-		this.multiValueMode = builder.multiValueMode;
+        this.multiValueMode = builder.multiValueMode;
 
-	}
+    }
 
-	/**
-	 * API name: {@code multi_value_mode}
-	 */
-	@Nullable
-	public final MultiValueMode multiValueMode() {
-		return this.multiValueMode;
-	}
+    /**
+     * API name: {@code multi_value_mode}
+     */
+    @Nullable
+    public final MultiValueMode multiValueMode() {
+        return this.multiValueMode;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		super.serializeInternal(generator, mapper);
-		if (this.multiValueMode != null) {
-			generator.writeKey("multi_value_mode");
-			this.multiValueMode.serialize(generator, mapper);
-		}
+        super.serializeInternal(generator, mapper);
+        if (this.multiValueMode != null) {
+            generator.writeKey("multi_value_mode");
+            this.multiValueMode.serialize(generator, mapper);
+        }
 
-	}
+    }
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ScoreFunctionBase.AbstractBuilder<BuilderT> {
-		@Nullable
-		private MultiValueMode multiValueMode;
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ScoreFunctionBase.AbstractBuilder<
+        BuilderT> {
+        @Nullable
+        private MultiValueMode multiValueMode;
 
-		/**
-		 * API name: {@code multi_value_mode}
-		 */
-		public final BuilderT multiValueMode(@Nullable MultiValueMode value) {
-			this.multiValueMode = value;
-			return self();
-		}
+        /**
+         * API name: {@code multi_value_mode}
+         */
+        public final BuilderT multiValueMode(@Nullable MultiValueMode value) {
+            this.multiValueMode = value;
+            return self();
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupDecayFunctionBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		ScoreFunctionBase.setupScoreFunctionBaseDeserializer(op);
-		op.add(AbstractBuilder::multiValueMode, MultiValueMode._DESERIALIZER, "multi_value_mode");
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupDecayFunctionBaseDeserializer(ObjectDeserializer<BuilderT> op) {
+        ScoreFunctionBase.setupScoreFunctionBaseDeserializer(op);
+        op.add(AbstractBuilder::multiValueMode, MultiValueMode._DESERIALIZER, "multi_value_mode");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DecayPlacement.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DecayPlacement.java
index 3299731444..aedd520c8e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DecayPlacement.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DecayPlacement.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -41,187 +44,185 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.DecayPlacement
 
-
 @JsonpDeserializable
 public class DecayPlacement implements JsonpSerializable {
-	@Nullable
-	private final Double decay;
-
-	@Nullable
-	private final JsonData offset;
-
-	@Nullable
-	private final JsonData scale;
-
-	@Nullable
-	private final JsonData origin;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DecayPlacement(Builder builder) {
-
-		this.decay = builder.decay;
-		this.offset = builder.offset;
-		this.scale = builder.scale;
-		this.origin = builder.origin;
-
-	}
-
-	public static DecayPlacement of(Function<Builder, ObjectBuilder<DecayPlacement>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code decay}
-	 */
-	@Nullable
-	public final Double decay() {
-		return this.decay;
-	}
-
-	/**
-	 * API name: {@code offset}
-	 */
-	@Nullable
-	public final JsonData offset() {
-		return this.offset;
-	}
-
-	/**
-	 * API name: {@code scale}
-	 */
-	@Nullable
-	public final JsonData scale() {
-		return this.scale;
-	}
-
-	/**
-	 * API name: {@code origin}
-	 */
-	@Nullable
-	public final JsonData origin() {
-		return this.origin;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.decay != null) {
-			generator.writeKey("decay");
-			generator.write(this.decay);
-
-		}
-		if (this.offset != null) {
-			generator.writeKey("offset");
-			this.offset.serialize(generator, mapper);
-
-		}
-		if (this.scale != null) {
-			generator.writeKey("scale");
-			this.scale.serialize(generator, mapper);
-
-		}
-		if (this.origin != null) {
-			generator.writeKey("origin");
-			this.origin.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DecayPlacement}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DecayPlacement> {
-		@Nullable
-		private Double decay;
-
-		@Nullable
-		private JsonData offset;
-
-		@Nullable
-		private JsonData scale;
-
-		@Nullable
-		private JsonData origin;
-
-		/**
-		 * API name: {@code decay}
-		 */
-		public final Builder decay(@Nullable Double value) {
-			this.decay = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code offset}
-		 */
-		public final Builder offset(@Nullable JsonData value) {
-			this.offset = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code scale}
-		 */
-		public final Builder scale(@Nullable JsonData value) {
-			this.scale = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code origin}
-		 */
-		public final Builder origin(@Nullable JsonData value) {
-			this.origin = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DecayPlacement}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DecayPlacement build() {
-			_checkSingleUse();
-
-			return new DecayPlacement(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DecayPlacement}
-	 */
-	public static final JsonpDeserializer<DecayPlacement> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			DecayPlacement::setupDecayPlacementDeserializer);
-
-	protected static void setupDecayPlacementDeserializer(ObjectDeserializer<DecayPlacement.Builder> op) {
-
-		op.add(Builder::decay, JsonpDeserializer.doubleDeserializer(), "decay");
-		op.add(Builder::offset, JsonData._DESERIALIZER, "offset");
-		op.add(Builder::scale, JsonData._DESERIALIZER, "scale");
-		op.add(Builder::origin, JsonData._DESERIALIZER, "origin");
-
-	}
+    @Nullable
+    private final Double decay;
+
+    @Nullable
+    private final JsonData offset;
+
+    @Nullable
+    private final JsonData scale;
+
+    @Nullable
+    private final JsonData origin;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DecayPlacement(Builder builder) {
+
+        this.decay = builder.decay;
+        this.offset = builder.offset;
+        this.scale = builder.scale;
+        this.origin = builder.origin;
+
+    }
+
+    public static DecayPlacement of(Function<Builder, ObjectBuilder<DecayPlacement>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code decay}
+     */
+    @Nullable
+    public final Double decay() {
+        return this.decay;
+    }
+
+    /**
+     * API name: {@code offset}
+     */
+    @Nullable
+    public final JsonData offset() {
+        return this.offset;
+    }
+
+    /**
+     * API name: {@code scale}
+     */
+    @Nullable
+    public final JsonData scale() {
+        return this.scale;
+    }
+
+    /**
+     * API name: {@code origin}
+     */
+    @Nullable
+    public final JsonData origin() {
+        return this.origin;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.decay != null) {
+            generator.writeKey("decay");
+            generator.write(this.decay);
+
+        }
+        if (this.offset != null) {
+            generator.writeKey("offset");
+            this.offset.serialize(generator, mapper);
+
+        }
+        if (this.scale != null) {
+            generator.writeKey("scale");
+            this.scale.serialize(generator, mapper);
+
+        }
+        if (this.origin != null) {
+            generator.writeKey("origin");
+            this.origin.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DecayPlacement}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DecayPlacement> {
+        @Nullable
+        private Double decay;
+
+        @Nullable
+        private JsonData offset;
+
+        @Nullable
+        private JsonData scale;
+
+        @Nullable
+        private JsonData origin;
+
+        /**
+         * API name: {@code decay}
+         */
+        public final Builder decay(@Nullable Double value) {
+            this.decay = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code offset}
+         */
+        public final Builder offset(@Nullable JsonData value) {
+            this.offset = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code scale}
+         */
+        public final Builder scale(@Nullable JsonData value) {
+            this.scale = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code origin}
+         */
+        public final Builder origin(@Nullable JsonData value) {
+            this.origin = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link DecayPlacement}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DecayPlacement build() {
+            _checkSingleUse();
+
+            return new DecayPlacement(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DecayPlacement}
+     */
+    public static final JsonpDeserializer<DecayPlacement> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DecayPlacement::setupDecayPlacementDeserializer
+    );
+
+    protected static void setupDecayPlacementDeserializer(ObjectDeserializer<DecayPlacement.Builder> op) {
+
+        op.add(Builder::decay, JsonpDeserializer.doubleDeserializer(), "decay");
+        op.add(Builder::offset, JsonData._DESERIALIZER, "offset");
+        op.add(Builder::scale, JsonData._DESERIALIZER, "scale");
+        op.add(Builder::origin, JsonData._DESERIALIZER, "origin");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DisMaxQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DisMaxQuery.java
index 9d30a071f2..b10fca96da 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DisMaxQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DisMaxQuery.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,159 +43,156 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.DisMaxQuery
 
-
 @JsonpDeserializable
 public class DisMaxQuery extends QueryBase implements QueryVariant {
-	private final List<Query> queries;
-
-	@Nullable
-	private final Double tieBreaker;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DisMaxQuery(Builder builder) {
-		super(builder);
-
-		this.queries = ApiTypeHelper.unmodifiableRequired(builder.queries, this, "queries");
-		this.tieBreaker = builder.tieBreaker;
-
-	}
-
-	public static DisMaxQuery of(Function<Builder, ObjectBuilder<DisMaxQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.DisMax;
-	}
-
-	/**
-	 * Required - API name: {@code queries}
-	 */
-	public final List<Query> queries() {
-		return this.queries;
-	}
-
-	/**
-	 * API name: {@code tie_breaker}
-	 */
-	@Nullable
-	public final Double tieBreaker() {
-		return this.tieBreaker;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.queries)) {
-			generator.writeKey("queries");
-			generator.writeStartArray();
-			for (Query item0 : this.queries) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.tieBreaker != null) {
-			generator.writeKey("tie_breaker");
-			generator.write(this.tieBreaker);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DisMaxQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<DisMaxQuery> {
-		private List<Query> queries;
-
-		@Nullable
-		private Double tieBreaker;
-
-		/**
-		 * Required - API name: {@code queries}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>queries</code>.
-		 */
-		public final Builder queries(List<Query> list) {
-			this.queries = _listAddAll(this.queries, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code queries}
-		 * <p>
-		 * Adds one or more values to <code>queries</code>.
-		 */
-		public final Builder queries(Query value, Query... values) {
-			this.queries = _listAdd(this.queries, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code queries}
-		 * <p>
-		 * Adds a value to <code>queries</code> using a builder lambda.
-		 */
-		public final Builder queries(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return queries(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code tie_breaker}
-		 */
-		public final Builder tieBreaker(@Nullable Double value) {
-			this.tieBreaker = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DisMaxQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DisMaxQuery build() {
-			_checkSingleUse();
-
-			return new DisMaxQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DisMaxQuery}
-	 */
-	public static final JsonpDeserializer<DisMaxQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			DisMaxQuery::setupDisMaxQueryDeserializer);
-
-	protected static void setupDisMaxQueryDeserializer(ObjectDeserializer<DisMaxQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::queries, JsonpDeserializer.arrayDeserializer(Query._DESERIALIZER), "queries");
-		op.add(Builder::tieBreaker, JsonpDeserializer.doubleDeserializer(), "tie_breaker");
-
-	}
+    private final List<Query> queries;
+
+    @Nullable
+    private final Double tieBreaker;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DisMaxQuery(Builder builder) {
+        super(builder);
+
+        this.queries = ApiTypeHelper.unmodifiableRequired(builder.queries, this, "queries");
+        this.tieBreaker = builder.tieBreaker;
+
+    }
+
+    public static DisMaxQuery of(Function<Builder, ObjectBuilder<DisMaxQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.DisMax;
+    }
+
+    /**
+     * Required - API name: {@code queries}
+     */
+    public final List<Query> queries() {
+        return this.queries;
+    }
+
+    /**
+     * API name: {@code tie_breaker}
+     */
+    @Nullable
+    public final Double tieBreaker() {
+        return this.tieBreaker;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.queries)) {
+            generator.writeKey("queries");
+            generator.writeStartArray();
+            for (Query item0 : this.queries) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.tieBreaker != null) {
+            generator.writeKey("tie_breaker");
+            generator.write(this.tieBreaker);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DisMaxQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<DisMaxQuery> {
+        private List<Query> queries;
+
+        @Nullable
+        private Double tieBreaker;
+
+        /**
+         * Required - API name: {@code queries}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>queries</code>.
+         */
+        public final Builder queries(List<Query> list) {
+            this.queries = _listAddAll(this.queries, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code queries}
+         * <p>
+         * Adds one or more values to <code>queries</code>.
+         */
+        public final Builder queries(Query value, Query... values) {
+            this.queries = _listAdd(this.queries, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code queries}
+         * <p>
+         * Adds a value to <code>queries</code> using a builder lambda.
+         */
+        public final Builder queries(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return queries(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code tie_breaker}
+         */
+        public final Builder tieBreaker(@Nullable Double value) {
+            this.tieBreaker = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DisMaxQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DisMaxQuery build() {
+            _checkSingleUse();
+
+            return new DisMaxQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DisMaxQuery}
+     */
+    public static final JsonpDeserializer<DisMaxQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DisMaxQuery::setupDisMaxQueryDeserializer
+    );
+
+    protected static void setupDisMaxQueryDeserializer(ObjectDeserializer<DisMaxQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::queries, JsonpDeserializer.arrayDeserializer(Query._DESERIALIZER), "queries");
+        op.add(Builder::tieBreaker, JsonpDeserializer.doubleDeserializer(), "tie_breaker");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DistanceFeatureQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DistanceFeatureQuery.java
index 0ed91d34fd..f63fc7008f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DistanceFeatureQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DistanceFeatureQuery.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,149 +42,146 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.DistanceFeatureQuery
 
-
 @JsonpDeserializable
 public class DistanceFeatureQuery extends QueryBase implements QueryVariant {
-	private final JsonData origin;
-
-	private final JsonData pivot;
-
-	private final String field;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DistanceFeatureQuery(Builder builder) {
-		super(builder);
-
-		this.origin = ApiTypeHelper.requireNonNull(builder.origin, this, "origin");
-		this.pivot = ApiTypeHelper.requireNonNull(builder.pivot, this, "pivot");
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-
-	}
-
-	public static DistanceFeatureQuery of(Function<Builder, ObjectBuilder<DistanceFeatureQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.DistanceFeature;
-	}
-
-	/**
-	 * Required - API name: {@code origin}
-	 */
-	public final JsonData origin() {
-		return this.origin;
-	}
-
-	/**
-	 * Required - API name: {@code pivot}
-	 */
-	public final JsonData pivot() {
-		return this.pivot;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("origin");
-		this.origin.serialize(generator, mapper);
-
-		generator.writeKey("pivot");
-		this.pivot.serialize(generator, mapper);
-
-		generator.writeKey("field");
-		generator.write(this.field);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DistanceFeatureQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DistanceFeatureQuery> {
-		private JsonData origin;
-
-		private JsonData pivot;
-
-		private String field;
-
-		/**
-		 * Required - API name: {@code origin}
-		 */
-		public final Builder origin(JsonData value) {
-			this.origin = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code pivot}
-		 */
-		public final Builder pivot(JsonData value) {
-			this.pivot = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DistanceFeatureQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DistanceFeatureQuery build() {
-			_checkSingleUse();
-
-			return new DistanceFeatureQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DistanceFeatureQuery}
-	 */
-	public static final JsonpDeserializer<DistanceFeatureQuery> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DistanceFeatureQuery::setupDistanceFeatureQueryDeserializer);
-
-	protected static void setupDistanceFeatureQueryDeserializer(ObjectDeserializer<DistanceFeatureQuery.Builder> op) {
-		setupQueryBaseDeserializer(op);
-		op.add(Builder::origin, JsonData._DESERIALIZER, "origin");
-		op.add(Builder::pivot, JsonData._DESERIALIZER, "pivot");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-
-	}
+    private final JsonData origin;
+
+    private final JsonData pivot;
+
+    private final String field;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DistanceFeatureQuery(Builder builder) {
+        super(builder);
+
+        this.origin = ApiTypeHelper.requireNonNull(builder.origin, this, "origin");
+        this.pivot = ApiTypeHelper.requireNonNull(builder.pivot, this, "pivot");
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+
+    }
+
+    public static DistanceFeatureQuery of(Function<Builder, ObjectBuilder<DistanceFeatureQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.DistanceFeature;
+    }
+
+    /**
+     * Required - API name: {@code origin}
+     */
+    public final JsonData origin() {
+        return this.origin;
+    }
+
+    /**
+     * Required - API name: {@code pivot}
+     */
+    public final JsonData pivot() {
+        return this.pivot;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("origin");
+        this.origin.serialize(generator, mapper);
+
+        generator.writeKey("pivot");
+        this.pivot.serialize(generator, mapper);
+
+        generator.writeKey("field");
+        generator.write(this.field);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DistanceFeatureQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<DistanceFeatureQuery> {
+        private JsonData origin;
+
+        private JsonData pivot;
+
+        private String field;
+
+        /**
+         * Required - API name: {@code origin}
+         */
+        public final Builder origin(JsonData value) {
+            this.origin = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code pivot}
+         */
+        public final Builder pivot(JsonData value) {
+            this.pivot = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DistanceFeatureQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DistanceFeatureQuery build() {
+            _checkSingleUse();
+
+            return new DistanceFeatureQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DistanceFeatureQuery}
+     */
+    public static final JsonpDeserializer<DistanceFeatureQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DistanceFeatureQuery::setupDistanceFeatureQueryDeserializer
+    );
+
+    protected static void setupDistanceFeatureQueryDeserializer(ObjectDeserializer<DistanceFeatureQuery.Builder> op) {
+        setupQueryBaseDeserializer(op);
+        op.add(Builder::origin, JsonData._DESERIALIZER, "origin");
+        op.add(Builder::pivot, JsonData._DESERIALIZER, "pivot");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ExistsQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ExistsQuery.java
index 3969444d16..ce288566c3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ExistsQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ExistsQuery.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,99 +41,98 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.ExistsQuery
 
-
 @JsonpDeserializable
 public class ExistsQuery extends QueryBase implements QueryVariant {
-	private final String field;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ExistsQuery(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-
-	}
-
-	public static ExistsQuery of(Function<Builder, ObjectBuilder<ExistsQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Exists;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ExistsQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<ExistsQuery> {
-		private String field;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ExistsQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ExistsQuery build() {
-			_checkSingleUse();
-
-			return new ExistsQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ExistsQuery}
-	 */
-	public static final JsonpDeserializer<ExistsQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ExistsQuery::setupExistsQueryDeserializer);
-
-	protected static void setupExistsQueryDeserializer(ObjectDeserializer<ExistsQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-
-	}
+    private final String field;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ExistsQuery(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+
+    }
+
+    public static ExistsQuery of(Function<Builder, ObjectBuilder<ExistsQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Exists;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ExistsQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<ExistsQuery> {
+        private String field;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ExistsQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ExistsQuery build() {
+            _checkSingleUse();
+
+            return new ExistsQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ExistsQuery}
+     */
+    public static final JsonpDeserializer<ExistsQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ExistsQuery::setupExistsQueryDeserializer
+    );
+
+    protected static void setupExistsQueryDeserializer(ObjectDeserializer<ExistsQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FieldAndFormat.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FieldAndFormat.java
index 08ce136914..c8a4e32afe 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FieldAndFormat.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FieldAndFormat.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,9 +44,6 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.FieldAndFormat
 
@@ -54,156 +54,158 @@
  */
 @JsonpDeserializable
 public class FieldAndFormat implements JsonpSerializable {
-	private final String field;
-
-	@Nullable
-	private final String format;
-
-	@Nullable
-	private final Boolean includeUnmapped;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FieldAndFormat(Builder builder) {
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.format = builder.format;
-		this.includeUnmapped = builder.includeUnmapped;
-
-	}
-
-	public static FieldAndFormat of(Function<Builder, ObjectBuilder<FieldAndFormat>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Wildcard pattern. The request returns values for field names
-	 * matching this pattern.
-	 * <p>
-	 * API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Format in which the values are returned.
-	 * <p>
-	 * API name: {@code format}
-	 */
-	@Nullable
-	public final String format() {
-		return this.format;
-	}
-
-	/**
-	 * API name: {@code include_unmapped}
-	 */
-	@Nullable
-	public final Boolean includeUnmapped() {
-		return this.includeUnmapped;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.format != null) {
-			generator.writeKey("format");
-			generator.write(this.format);
-
-		}
-		if (this.includeUnmapped != null) {
-			generator.writeKey("include_unmapped");
-			generator.write(this.includeUnmapped);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FieldAndFormat}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldAndFormat> {
-		private String field;
-
-		@Nullable
-		private String format;
-
-		@Nullable
-		private Boolean includeUnmapped;
-
-		/**
-		 * Required - Wildcard pattern. The request returns values for field names
-		 * matching this pattern.
-		 * <p>
-		 * API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Format in which the values are returned.
-		 * <p>
-		 * API name: {@code format}
-		 */
-		public final Builder format(@Nullable String value) {
-			this.format = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code include_unmapped}
-		 */
-		public final Builder includeUnmapped(@Nullable Boolean value) {
-			this.includeUnmapped = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FieldAndFormat}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FieldAndFormat build() {
-			_checkSingleUse();
-
-			return new FieldAndFormat(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FieldAndFormat}
-	 */
-	public static final JsonpDeserializer<FieldAndFormat> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FieldAndFormat::setupFieldAndFormatDeserializer);
-
-	protected static void setupFieldAndFormatDeserializer(ObjectDeserializer<FieldAndFormat.Builder> op) {
-
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
-		op.add(Builder::includeUnmapped, JsonpDeserializer.booleanDeserializer(), "include_unmapped");
-
-		op.shortcutProperty("field");
-
-	}
+    private final String field;
+
+    @Nullable
+    private final String format;
+
+    @Nullable
+    private final Boolean includeUnmapped;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FieldAndFormat(Builder builder) {
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.format = builder.format;
+        this.includeUnmapped = builder.includeUnmapped;
+
+    }
+
+    public static FieldAndFormat of(Function<Builder, ObjectBuilder<FieldAndFormat>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Wildcard pattern. The request returns values for field names
+     * matching this pattern.
+     * <p>
+     * API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Format in which the values are returned.
+     * <p>
+     * API name: {@code format}
+     */
+    @Nullable
+    public final String format() {
+        return this.format;
+    }
+
+    /**
+     * API name: {@code include_unmapped}
+     */
+    @Nullable
+    public final Boolean includeUnmapped() {
+        return this.includeUnmapped;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.format != null) {
+            generator.writeKey("format");
+            generator.write(this.format);
+
+        }
+        if (this.includeUnmapped != null) {
+            generator.writeKey("include_unmapped");
+            generator.write(this.includeUnmapped);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FieldAndFormat}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldAndFormat> {
+        private String field;
+
+        @Nullable
+        private String format;
+
+        @Nullable
+        private Boolean includeUnmapped;
+
+        /**
+         * Required - Wildcard pattern. The request returns values for field names
+         * matching this pattern.
+         * <p>
+         * API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Format in which the values are returned.
+         * <p>
+         * API name: {@code format}
+         */
+        public final Builder format(@Nullable String value) {
+            this.format = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code include_unmapped}
+         */
+        public final Builder includeUnmapped(@Nullable Boolean value) {
+            this.includeUnmapped = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link FieldAndFormat}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FieldAndFormat build() {
+            _checkSingleUse();
+
+            return new FieldAndFormat(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FieldAndFormat}
+     */
+    public static final JsonpDeserializer<FieldAndFormat> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FieldAndFormat::setupFieldAndFormatDeserializer
+    );
+
+    protected static void setupFieldAndFormatDeserializer(ObjectDeserializer<FieldAndFormat.Builder> op) {
+
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
+        op.add(Builder::includeUnmapped, JsonpDeserializer.booleanDeserializer(), "include_unmapped");
+
+        op.shortcutProperty("field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FieldLookup.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FieldLookup.java
index 6687cbc979..d8ab381cc7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FieldLookup.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FieldLookup.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,182 +44,180 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.FieldLookup
 
-
 @JsonpDeserializable
 public class FieldLookup implements JsonpSerializable {
-	private final String id;
+    private final String id;
 
-	@Nullable
-	private final String index;
+    @Nullable
+    private final String index;
 
-	@Nullable
-	private final String path;
+    @Nullable
+    private final String path;
 
-	@Nullable
-	private final String routing;
+    @Nullable
+    private final String routing;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private FieldLookup(Builder builder) {
+    // ---------------------------------------------------------------------------------------------
+
+    private FieldLookup(Builder builder) {
 
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = builder.index;
-		this.path = builder.path;
-		this.routing = builder.routing;
-
-	}
-
-	public static FieldLookup of(Function<Builder, ObjectBuilder<FieldLookup>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code path}
-	 */
-	@Nullable
-	public final String path() {
-		return this.path;
-	}
-
-	/**
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("id");
-		generator.write(this.id);
-
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.path != null) {
-			generator.writeKey("path");
-			generator.write(this.path);
-
-		}
-		if (this.routing != null) {
-			generator.writeKey("routing");
-			generator.write(this.routing);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FieldLookup}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldLookup> {
-		private String id;
-
-		@Nullable
-		private String index;
-
-		@Nullable
-		private String path;
-
-		@Nullable
-		private String routing;
-
-		/**
-		 * Required - API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code path}
-		 */
-		public final Builder path(@Nullable String value) {
-			this.path = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FieldLookup}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FieldLookup build() {
-			_checkSingleUse();
-
-			return new FieldLookup(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FieldLookup}
-	 */
-	public static final JsonpDeserializer<FieldLookup> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FieldLookup::setupFieldLookupDeserializer);
-
-	protected static void setupFieldLookupDeserializer(ObjectDeserializer<FieldLookup.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
-		op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
-
-	}
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = builder.index;
+        this.path = builder.path;
+        this.routing = builder.routing;
+
+    }
+
+    public static FieldLookup of(Function<Builder, ObjectBuilder<FieldLookup>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code path}
+     */
+    @Nullable
+    public final String path() {
+        return this.path;
+    }
+
+    /**
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("id");
+        generator.write(this.id);
+
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.path != null) {
+            generator.writeKey("path");
+            generator.write(this.path);
+
+        }
+        if (this.routing != null) {
+            generator.writeKey("routing");
+            generator.write(this.routing);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FieldLookup}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldLookup> {
+        private String id;
+
+        @Nullable
+        private String index;
+
+        @Nullable
+        private String path;
+
+        @Nullable
+        private String routing;
+
+        /**
+         * Required - API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code path}
+         */
+        public final Builder path(@Nullable String value) {
+            this.path = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link FieldLookup}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FieldLookup build() {
+            _checkSingleUse();
+
+            return new FieldLookup(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FieldLookup}
+     */
+    public static final JsonpDeserializer<FieldLookup> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FieldLookup::setupFieldLookupDeserializer
+    );
+
+    protected static void setupFieldLookupDeserializer(ObjectDeserializer<FieldLookup.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
+        op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FieldValueFactorModifier.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FieldValueFactorModifier.java
index e784147b4c..8f052041fe 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FieldValueFactorModifier.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FieldValueFactorModifier.java
@@ -35,41 +35,41 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum FieldValueFactorModifier implements JsonEnum {
-	None("none"),
+    None("none"),
 
-	Log("log"),
+    Log("log"),
 
-	Log1p("log1p"),
+    Log1p("log1p"),
 
-	Log2p("log2p"),
+    Log2p("log2p"),
 
-	Ln("ln"),
+    Ln("ln"),
 
-	Ln1p("ln1p"),
+    Ln1p("ln1p"),
 
-	Ln2p("ln2p"),
+    Ln2p("ln2p"),
 
-	Square("square"),
+    Square("square"),
 
-	Sqrt("sqrt"),
+    Sqrt("sqrt"),
 
-	Reciprocal("reciprocal"),
+    Reciprocal("reciprocal"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	FieldValueFactorModifier(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    FieldValueFactorModifier(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<FieldValueFactorModifier> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			FieldValueFactorModifier.values());
+    public static final JsonEnum.Deserializer<FieldValueFactorModifier> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        FieldValueFactorModifier.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FieldValueFactorScoreFunction.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FieldValueFactorScoreFunction.java
index 083359f3d9..c2fe192096 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FieldValueFactorScoreFunction.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FieldValueFactorScoreFunction.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,190 +42,185 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.FieldValueFactorScoreFunction
 
-
 @JsonpDeserializable
 public class FieldValueFactorScoreFunction extends ScoreFunctionBase implements FunctionScoreVariant {
-	private final String field;
-
-	@Nullable
-	private final Double factor;
-
-	@Nullable
-	private final Double missing;
-
-	@Nullable
-	private final FieldValueFactorModifier modifier;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FieldValueFactorScoreFunction(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.factor = builder.factor;
-		this.missing = builder.missing;
-		this.modifier = builder.modifier;
-
-	}
-
-	public static FieldValueFactorScoreFunction of(Function<Builder, ObjectBuilder<FieldValueFactorScoreFunction>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * FunctionScore variant kind.
-	 */
-	@Override
-	public FunctionScore.Kind _functionScoreKind() {
-		return FunctionScore.Kind.FieldValueFactor;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code factor}
-	 */
-	@Nullable
-	public final Double factor() {
-		return this.factor;
-	}
-
-	/**
-	 * API name: {@code missing}
-	 */
-	@Nullable
-	public final Double missing() {
-		return this.missing;
-	}
-
-	/**
-	 * API name: {@code modifier}
-	 */
-	@Nullable
-	public final FieldValueFactorModifier modifier() {
-		return this.modifier;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.factor != null) {
-			generator.writeKey("factor");
-			generator.write(this.factor);
-
-		}
-		if (this.missing != null) {
-			generator.writeKey("missing");
-			generator.write(this.missing);
-
-		}
-		if (this.modifier != null) {
-			generator.writeKey("modifier");
-			this.modifier.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FieldValueFactorScoreFunction}.
-	 */
-
-	public static class Builder extends ScoreFunctionBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<FieldValueFactorScoreFunction> {
-		private String field;
-
-		@Nullable
-		private Double factor;
-
-		@Nullable
-		private Double missing;
-
-		@Nullable
-		private FieldValueFactorModifier modifier;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code factor}
-		 */
-		public final Builder factor(@Nullable Double value) {
-			this.factor = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code missing}
-		 */
-		public final Builder missing(@Nullable Double value) {
-			this.missing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code modifier}
-		 */
-		public final Builder modifier(@Nullable FieldValueFactorModifier value) {
-			this.modifier = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FieldValueFactorScoreFunction}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FieldValueFactorScoreFunction build() {
-			_checkSingleUse();
-
-			return new FieldValueFactorScoreFunction(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FieldValueFactorScoreFunction}
-	 */
-	public static final JsonpDeserializer<FieldValueFactorScoreFunction> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, FieldValueFactorScoreFunction::setupFieldValueFactorScoreFunctionDeserializer);
-
-	protected static void setupFieldValueFactorScoreFunctionDeserializer(
-			ObjectDeserializer<FieldValueFactorScoreFunction.Builder> op) {
-		ScoreFunctionBase.setupScoreFunctionBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::factor, JsonpDeserializer.doubleDeserializer(), "factor");
-		op.add(Builder::missing, JsonpDeserializer.doubleDeserializer(), "missing");
-		op.add(Builder::modifier, FieldValueFactorModifier._DESERIALIZER, "modifier");
-
-	}
+    private final String field;
+
+    @Nullable
+    private final Double factor;
+
+    @Nullable
+    private final Double missing;
+
+    @Nullable
+    private final FieldValueFactorModifier modifier;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FieldValueFactorScoreFunction(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.factor = builder.factor;
+        this.missing = builder.missing;
+        this.modifier = builder.modifier;
+
+    }
+
+    public static FieldValueFactorScoreFunction of(Function<Builder, ObjectBuilder<FieldValueFactorScoreFunction>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * FunctionScore variant kind.
+     */
+    @Override
+    public FunctionScore.Kind _functionScoreKind() {
+        return FunctionScore.Kind.FieldValueFactor;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code factor}
+     */
+    @Nullable
+    public final Double factor() {
+        return this.factor;
+    }
+
+    /**
+     * API name: {@code missing}
+     */
+    @Nullable
+    public final Double missing() {
+        return this.missing;
+    }
+
+    /**
+     * API name: {@code modifier}
+     */
+    @Nullable
+    public final FieldValueFactorModifier modifier() {
+        return this.modifier;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.factor != null) {
+            generator.writeKey("factor");
+            generator.write(this.factor);
+
+        }
+        if (this.missing != null) {
+            generator.writeKey("missing");
+            generator.write(this.missing);
+
+        }
+        if (this.modifier != null) {
+            generator.writeKey("modifier");
+            this.modifier.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FieldValueFactorScoreFunction}.
+     */
+
+    public static class Builder extends ScoreFunctionBase.AbstractBuilder<Builder> implements ObjectBuilder<FieldValueFactorScoreFunction> {
+        private String field;
+
+        @Nullable
+        private Double factor;
+
+        @Nullable
+        private Double missing;
+
+        @Nullable
+        private FieldValueFactorModifier modifier;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code factor}
+         */
+        public final Builder factor(@Nullable Double value) {
+            this.factor = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code missing}
+         */
+        public final Builder missing(@Nullable Double value) {
+            this.missing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code modifier}
+         */
+        public final Builder modifier(@Nullable FieldValueFactorModifier value) {
+            this.modifier = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link FieldValueFactorScoreFunction}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FieldValueFactorScoreFunction build() {
+            _checkSingleUse();
+
+            return new FieldValueFactorScoreFunction(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FieldValueFactorScoreFunction}
+     */
+    public static final JsonpDeserializer<FieldValueFactorScoreFunction> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FieldValueFactorScoreFunction::setupFieldValueFactorScoreFunctionDeserializer
+    );
+
+    protected static void setupFieldValueFactorScoreFunctionDeserializer(ObjectDeserializer<FieldValueFactorScoreFunction.Builder> op) {
+        ScoreFunctionBase.setupScoreFunctionBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::factor, JsonpDeserializer.doubleDeserializer(), "factor");
+        op.add(Builder::missing, JsonpDeserializer.doubleDeserializer(), "missing");
+        op.add(Builder::modifier, FieldValueFactorModifier._DESERIALIZER, "modifier");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionBoostMode.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionBoostMode.java
index e4a2fa5f49..4b7b33d698 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionBoostMode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionBoostMode.java
@@ -35,33 +35,31 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum FunctionBoostMode implements JsonEnum {
-	Multiply("multiply"),
+    Multiply("multiply"),
 
-	Replace("replace"),
+    Replace("replace"),
 
-	Sum("sum"),
+    Sum("sum"),
 
-	Avg("avg"),
+    Avg("avg"),
 
-	Max("max"),
+    Max("max"),
 
-	Min("min"),
+    Min("min"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	FunctionBoostMode(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    FunctionBoostMode(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<FunctionBoostMode> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			FunctionBoostMode.values());
+    public static final JsonEnum.Deserializer<FunctionBoostMode> _DESERIALIZER = new JsonEnum.Deserializer<>(FunctionBoostMode.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScore.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScore.java
index e939e248a1..5874ca2a81 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScore.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScore.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -44,383 +47,381 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.FunctionScoreContainer
 
-
 @JsonpDeserializable
 public class FunctionScore implements TaggedUnion<FunctionScore.Kind, Object>, JsonpSerializable {
 
-	/**
-	 * {@link FunctionScore} variant kinds.
-	 */
-	/**
-	 * {@link FunctionScore} variant kinds.
-	 */
+    /**
+     * {@link FunctionScore} variant kinds.
+     */
+    /**
+     * {@link FunctionScore} variant kinds.
+     */
 
-	public enum Kind implements JsonEnum {
-		Exp("exp"),
+    public enum Kind implements JsonEnum {
+        Exp("exp"),
 
-		Gauss("gauss"),
+        Gauss("gauss"),
 
-		Linear("linear"),
+        Linear("linear"),
 
-		FieldValueFactor("field_value_factor"),
+        FieldValueFactor("field_value_factor"),
 
-		RandomScore("random_score"),
+        RandomScore("random_score"),
 
-		ScriptScore("script_score"),
+        ScriptScore("script_score"),
 
-		;
+        ;
 
-		private final String jsonValue;
+        private final String jsonValue;
 
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
 
-		public String jsonValue() {
-			return this.jsonValue;
-		}
+        public String jsonValue() {
+            return this.jsonValue;
+        }
 
-	}
+    }
 
-	private final Kind _kind;
-	private final Object _value;
+    private final Kind _kind;
+    private final Object _value;
 
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	@Nullable
-	private final Query filter;
-
-	@Nullable
-	private final Double weight;
-
-	public FunctionScore(FunctionScoreVariant value) {
-
-		this._kind = ApiTypeHelper.requireNonNull(value._functionScoreKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
-
-		this.filter = null;
-		this.weight = null;
-
-	}
-
-	private FunctionScore(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-		this.filter = builder.filter;
-		this.weight = builder.weight;
-
-	}
-
-	public static FunctionScore of(Function<Builder, ObjectBuilder<FunctionScore>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code filter}
-	 */
-	@Nullable
-	public final Query filter() {
-		return this.filter;
-	}
-
-	/**
-	 * API name: {@code weight}
-	 */
-	@Nullable
-	public final Double weight() {
-		return this.weight;
-	}
-
-	/**
-	 * Is this variant instance of kind {@code exp}?
-	 */
-	public boolean isExp() {
-		return _kind == Kind.Exp;
-	}
-
-	/**
-	 * Get the {@code exp} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code exp} kind.
-	 */
-	public DecayFunction exp() {
-		return TaggedUnionUtils.get(this, Kind.Exp);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code gauss}?
-	 */
-	public boolean isGauss() {
-		return _kind == Kind.Gauss;
-	}
-
-	/**
-	 * Get the {@code gauss} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code gauss} kind.
-	 */
-	public DecayFunction gauss() {
-		return TaggedUnionUtils.get(this, Kind.Gauss);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code linear}?
-	 */
-	public boolean isLinear() {
-		return _kind == Kind.Linear;
-	}
-
-	/**
-	 * Get the {@code linear} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code linear} kind.
-	 */
-	public DecayFunction linear() {
-		return TaggedUnionUtils.get(this, Kind.Linear);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code field_value_factor}?
-	 */
-	public boolean isFieldValueFactor() {
-		return _kind == Kind.FieldValueFactor;
-	}
-
-	/**
-	 * Get the {@code field_value_factor} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code field_value_factor}
-	 *             kind.
-	 */
-	public FieldValueFactorScoreFunction fieldValueFactor() {
-		return TaggedUnionUtils.get(this, Kind.FieldValueFactor);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code random_score}?
-	 */
-	public boolean isRandomScore() {
-		return _kind == Kind.RandomScore;
-	}
-
-	/**
-	 * Get the {@code random_score} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code random_score} kind.
-	 */
-	public RandomScoreFunction randomScore() {
-		return TaggedUnionUtils.get(this, Kind.RandomScore);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code script_score}?
-	 */
-	public boolean isScriptScore() {
-		return _kind == Kind.ScriptScore;
-	}
-
-	/**
-	 * Get the {@code script_score} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code script_score} kind.
-	 */
-	public ScriptScoreFunction scriptScore() {
-		return TaggedUnionUtils.get(this, Kind.ScriptScore);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeStartObject();
-
-		if (this.filter != null) {
-			generator.writeKey("filter");
-			this.filter.serialize(generator, mapper);
-
-		}
-		if (this.weight != null) {
-			generator.writeKey("weight");
-			generator.write(this.weight);
-
-		}
-
-		generator.writeKey(_kind.jsonValue());
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		}
-
-		generator.writeEnd();
-
-	}
-
-	public static class Builder extends ObjectBuilderBase {
-		private Kind _kind;
-		private Object _value;
-
-		@Nullable
-		private Query filter;
-
-		@Nullable
-		private Double weight;
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(@Nullable Query value) {
-			this.filter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.filter(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code weight}
-		 */
-		public final Builder weight(@Nullable Double value) {
-			this.weight = value;
-			return this;
-		}
-
-		public ContainerBuilder exp(DecayFunction v) {
-			this._kind = Kind.Exp;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder exp(Function<DecayFunction.Builder, ObjectBuilder<DecayFunction>> fn) {
-			return this.exp(fn.apply(new DecayFunction.Builder()).build());
-		}
-
-		public ContainerBuilder gauss(DecayFunction v) {
-			this._kind = Kind.Gauss;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder gauss(Function<DecayFunction.Builder, ObjectBuilder<DecayFunction>> fn) {
-			return this.gauss(fn.apply(new DecayFunction.Builder()).build());
-		}
-
-		public ContainerBuilder linear(DecayFunction v) {
-			this._kind = Kind.Linear;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder linear(Function<DecayFunction.Builder, ObjectBuilder<DecayFunction>> fn) {
-			return this.linear(fn.apply(new DecayFunction.Builder()).build());
-		}
-
-		public ContainerBuilder fieldValueFactor(FieldValueFactorScoreFunction v) {
-			this._kind = Kind.FieldValueFactor;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder fieldValueFactor(
-				Function<FieldValueFactorScoreFunction.Builder, ObjectBuilder<FieldValueFactorScoreFunction>> fn) {
-			return this.fieldValueFactor(fn.apply(new FieldValueFactorScoreFunction.Builder()).build());
-		}
-
-		public ContainerBuilder randomScore(RandomScoreFunction v) {
-			this._kind = Kind.RandomScore;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder randomScore(
-				Function<RandomScoreFunction.Builder, ObjectBuilder<RandomScoreFunction>> fn) {
-			return this.randomScore(fn.apply(new RandomScoreFunction.Builder()).build());
-		}
-
-		public ContainerBuilder scriptScore(ScriptScoreFunction v) {
-			this._kind = Kind.ScriptScore;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder scriptScore(
-				Function<ScriptScoreFunction.Builder, ObjectBuilder<ScriptScoreFunction>> fn) {
-			return this.scriptScore(fn.apply(new ScriptScoreFunction.Builder()).build());
-		}
-
-		protected FunctionScore build() {
-			_checkSingleUse();
-			return new FunctionScore(this);
-		}
-
-		public class ContainerBuilder implements ObjectBuilder<FunctionScore> {
-
-			/**
-			 * API name: {@code filter}
-			 */
-			public final ContainerBuilder filter(@Nullable Query value) {
-				Builder.this.filter = value;
-				return this;
-			}
-
-			/**
-			 * API name: {@code filter}
-			 */
-			public final ContainerBuilder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-				return this.filter(fn.apply(new Query.Builder()).build());
-			}
-
-			/**
-			 * API name: {@code weight}
-			 */
-			public final ContainerBuilder weight(@Nullable Double value) {
-				Builder.this.weight = value;
-				return this;
-			}
-
-			public FunctionScore build() {
-				return Builder.this.build();
-			}
-		}
-	}
-
-	protected static void setupFunctionScoreDeserializer(ObjectDeserializer<Builder> op) {
-
-		op.add(Builder::exp, DecayFunction._DESERIALIZER, "exp");
-		op.add(Builder::gauss, DecayFunction._DESERIALIZER, "gauss");
-		op.add(Builder::linear, DecayFunction._DESERIALIZER, "linear");
-		op.add(Builder::fieldValueFactor, FieldValueFactorScoreFunction._DESERIALIZER, "field_value_factor");
-		op.add(Builder::randomScore, RandomScoreFunction._DESERIALIZER, "random_score");
-		op.add(Builder::scriptScore, ScriptScoreFunction._DESERIALIZER, "script_score");
-		op.add(Builder::filter, Query._DESERIALIZER, "filter");
-		op.add(Builder::weight, JsonpDeserializer.doubleDeserializer(), "weight");
-
-	}
-
-	public static final JsonpDeserializer<FunctionScore> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FunctionScore::setupFunctionScoreDeserializer, Builder::build);
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    @Nullable
+    private final Query filter;
+
+    @Nullable
+    private final Double weight;
+
+    public FunctionScore(FunctionScoreVariant value) {
+
+        this._kind = ApiTypeHelper.requireNonNull(value._functionScoreKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+
+        this.filter = null;
+        this.weight = null;
+
+    }
+
+    private FunctionScore(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+        this.filter = builder.filter;
+        this.weight = builder.weight;
+
+    }
+
+    public static FunctionScore of(Function<Builder, ObjectBuilder<FunctionScore>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code filter}
+     */
+    @Nullable
+    public final Query filter() {
+        return this.filter;
+    }
+
+    /**
+     * API name: {@code weight}
+     */
+    @Nullable
+    public final Double weight() {
+        return this.weight;
+    }
+
+    /**
+     * Is this variant instance of kind {@code exp}?
+     */
+    public boolean isExp() {
+        return _kind == Kind.Exp;
+    }
+
+    /**
+     * Get the {@code exp} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code exp} kind.
+     */
+    public DecayFunction exp() {
+        return TaggedUnionUtils.get(this, Kind.Exp);
+    }
+
+    /**
+     * Is this variant instance of kind {@code gauss}?
+     */
+    public boolean isGauss() {
+        return _kind == Kind.Gauss;
+    }
+
+    /**
+     * Get the {@code gauss} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code gauss} kind.
+     */
+    public DecayFunction gauss() {
+        return TaggedUnionUtils.get(this, Kind.Gauss);
+    }
+
+    /**
+     * Is this variant instance of kind {@code linear}?
+     */
+    public boolean isLinear() {
+        return _kind == Kind.Linear;
+    }
+
+    /**
+     * Get the {@code linear} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code linear} kind.
+     */
+    public DecayFunction linear() {
+        return TaggedUnionUtils.get(this, Kind.Linear);
+    }
+
+    /**
+     * Is this variant instance of kind {@code field_value_factor}?
+     */
+    public boolean isFieldValueFactor() {
+        return _kind == Kind.FieldValueFactor;
+    }
+
+    /**
+     * Get the {@code field_value_factor} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code field_value_factor}
+     *             kind.
+     */
+    public FieldValueFactorScoreFunction fieldValueFactor() {
+        return TaggedUnionUtils.get(this, Kind.FieldValueFactor);
+    }
+
+    /**
+     * Is this variant instance of kind {@code random_score}?
+     */
+    public boolean isRandomScore() {
+        return _kind == Kind.RandomScore;
+    }
+
+    /**
+     * Get the {@code random_score} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code random_score} kind.
+     */
+    public RandomScoreFunction randomScore() {
+        return TaggedUnionUtils.get(this, Kind.RandomScore);
+    }
+
+    /**
+     * Is this variant instance of kind {@code script_score}?
+     */
+    public boolean isScriptScore() {
+        return _kind == Kind.ScriptScore;
+    }
+
+    /**
+     * Get the {@code script_score} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code script_score} kind.
+     */
+    public ScriptScoreFunction scriptScore() {
+        return TaggedUnionUtils.get(this, Kind.ScriptScore);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeStartObject();
+
+        if (this.filter != null) {
+            generator.writeKey("filter");
+            this.filter.serialize(generator, mapper);
+
+        }
+        if (this.weight != null) {
+            generator.writeKey("weight");
+            generator.write(this.weight);
+
+        }
+
+        generator.writeKey(_kind.jsonValue());
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        }
+
+        generator.writeEnd();
+
+    }
+
+    public static class Builder extends ObjectBuilderBase {
+        private Kind _kind;
+        private Object _value;
+
+        @Nullable
+        private Query filter;
+
+        @Nullable
+        private Double weight;
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(@Nullable Query value) {
+            this.filter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.filter(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code weight}
+         */
+        public final Builder weight(@Nullable Double value) {
+            this.weight = value;
+            return this;
+        }
+
+        public ContainerBuilder exp(DecayFunction v) {
+            this._kind = Kind.Exp;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder exp(Function<DecayFunction.Builder, ObjectBuilder<DecayFunction>> fn) {
+            return this.exp(fn.apply(new DecayFunction.Builder()).build());
+        }
+
+        public ContainerBuilder gauss(DecayFunction v) {
+            this._kind = Kind.Gauss;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder gauss(Function<DecayFunction.Builder, ObjectBuilder<DecayFunction>> fn) {
+            return this.gauss(fn.apply(new DecayFunction.Builder()).build());
+        }
+
+        public ContainerBuilder linear(DecayFunction v) {
+            this._kind = Kind.Linear;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder linear(Function<DecayFunction.Builder, ObjectBuilder<DecayFunction>> fn) {
+            return this.linear(fn.apply(new DecayFunction.Builder()).build());
+        }
+
+        public ContainerBuilder fieldValueFactor(FieldValueFactorScoreFunction v) {
+            this._kind = Kind.FieldValueFactor;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder fieldValueFactor(
+            Function<FieldValueFactorScoreFunction.Builder, ObjectBuilder<FieldValueFactorScoreFunction>> fn
+        ) {
+            return this.fieldValueFactor(fn.apply(new FieldValueFactorScoreFunction.Builder()).build());
+        }
+
+        public ContainerBuilder randomScore(RandomScoreFunction v) {
+            this._kind = Kind.RandomScore;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder randomScore(Function<RandomScoreFunction.Builder, ObjectBuilder<RandomScoreFunction>> fn) {
+            return this.randomScore(fn.apply(new RandomScoreFunction.Builder()).build());
+        }
+
+        public ContainerBuilder scriptScore(ScriptScoreFunction v) {
+            this._kind = Kind.ScriptScore;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder scriptScore(Function<ScriptScoreFunction.Builder, ObjectBuilder<ScriptScoreFunction>> fn) {
+            return this.scriptScore(fn.apply(new ScriptScoreFunction.Builder()).build());
+        }
+
+        protected FunctionScore build() {
+            _checkSingleUse();
+            return new FunctionScore(this);
+        }
+
+        public class ContainerBuilder implements ObjectBuilder<FunctionScore> {
+
+            /**
+             * API name: {@code filter}
+             */
+            public final ContainerBuilder filter(@Nullable Query value) {
+                Builder.this.filter = value;
+                return this;
+            }
+
+            /**
+             * API name: {@code filter}
+             */
+            public final ContainerBuilder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+                return this.filter(fn.apply(new Query.Builder()).build());
+            }
+
+            /**
+             * API name: {@code weight}
+             */
+            public final ContainerBuilder weight(@Nullable Double value) {
+                Builder.this.weight = value;
+                return this;
+            }
+
+            public FunctionScore build() {
+                return Builder.this.build();
+            }
+        }
+    }
+
+    protected static void setupFunctionScoreDeserializer(ObjectDeserializer<Builder> op) {
+
+        op.add(Builder::exp, DecayFunction._DESERIALIZER, "exp");
+        op.add(Builder::gauss, DecayFunction._DESERIALIZER, "gauss");
+        op.add(Builder::linear, DecayFunction._DESERIALIZER, "linear");
+        op.add(Builder::fieldValueFactor, FieldValueFactorScoreFunction._DESERIALIZER, "field_value_factor");
+        op.add(Builder::randomScore, RandomScoreFunction._DESERIALIZER, "random_score");
+        op.add(Builder::scriptScore, ScriptScoreFunction._DESERIALIZER, "script_score");
+        op.add(Builder::filter, Query._DESERIALIZER, "filter");
+        op.add(Builder::weight, JsonpDeserializer.doubleDeserializer(), "weight");
+
+    }
+
+    public static final JsonpDeserializer<FunctionScore> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FunctionScore::setupFunctionScoreDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScoreBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScoreBuilders.java
index e582cd13f9..ec631e9c2e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScoreBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScoreBuilders.java
@@ -36,55 +36,54 @@
  * Builders for {@link FunctionScore} variants.
  */
 public class FunctionScoreBuilders {
-	private FunctionScoreBuilders() {
-	}
+    private FunctionScoreBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link DecayFunction exp} {@code FunctionScore}
-	 * variant.
-	 */
-	public static DecayFunction.Builder exp() {
-		return new DecayFunction.Builder();
-	}
+    /**
+     * Creates a builder for the {@link DecayFunction exp} {@code FunctionScore}
+     * variant.
+     */
+    public static DecayFunction.Builder exp() {
+        return new DecayFunction.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link DecayFunction gauss} {@code FunctionScore}
-	 * variant.
-	 */
-	public static DecayFunction.Builder gauss() {
-		return new DecayFunction.Builder();
-	}
+    /**
+     * Creates a builder for the {@link DecayFunction gauss} {@code FunctionScore}
+     * variant.
+     */
+    public static DecayFunction.Builder gauss() {
+        return new DecayFunction.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link DecayFunction linear} {@code FunctionScore}
-	 * variant.
-	 */
-	public static DecayFunction.Builder linear() {
-		return new DecayFunction.Builder();
-	}
+    /**
+     * Creates a builder for the {@link DecayFunction linear} {@code FunctionScore}
+     * variant.
+     */
+    public static DecayFunction.Builder linear() {
+        return new DecayFunction.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link FieldValueFactorScoreFunction
-	 * field_value_factor} {@code FunctionScore} variant.
-	 */
-	public static FieldValueFactorScoreFunction.Builder fieldValueFactor() {
-		return new FieldValueFactorScoreFunction.Builder();
-	}
+    /**
+     * Creates a builder for the {@link FieldValueFactorScoreFunction
+     * field_value_factor} {@code FunctionScore} variant.
+     */
+    public static FieldValueFactorScoreFunction.Builder fieldValueFactor() {
+        return new FieldValueFactorScoreFunction.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link RandomScoreFunction random_score}
-	 * {@code FunctionScore} variant.
-	 */
-	public static RandomScoreFunction.Builder randomScore() {
-		return new RandomScoreFunction.Builder();
-	}
+    /**
+     * Creates a builder for the {@link RandomScoreFunction random_score}
+     * {@code FunctionScore} variant.
+     */
+    public static RandomScoreFunction.Builder randomScore() {
+        return new RandomScoreFunction.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link ScriptScoreFunction script_score}
-	 * {@code FunctionScore} variant.
-	 */
-	public static ScriptScoreFunction.Builder scriptScore() {
-		return new ScriptScoreFunction.Builder();
-	}
+    /**
+     * Creates a builder for the {@link ScriptScoreFunction script_score}
+     * {@code FunctionScore} variant.
+     */
+    public static ScriptScoreFunction.Builder scriptScore() {
+        return new ScriptScoreFunction.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScoreMode.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScoreMode.java
index 02f93e8d20..3ccbc7c263 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScoreMode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScoreMode.java
@@ -35,33 +35,31 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum FunctionScoreMode implements JsonEnum {
-	Multiply("multiply"),
+    Multiply("multiply"),
 
-	Sum("sum"),
+    Sum("sum"),
 
-	Avg("avg"),
+    Avg("avg"),
 
-	First("first"),
+    First("first"),
 
-	Max("max"),
+    Max("max"),
 
-	Min("min"),
+    Min("min"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	FunctionScoreMode(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    FunctionScoreMode(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<FunctionScoreMode> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			FunctionScoreMode.values());
+    public static final JsonEnum.Deserializer<FunctionScoreMode> _DESERIALIZER = new JsonEnum.Deserializer<>(FunctionScoreMode.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScoreQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScoreQuery.java
index 99d804d019..415fb9bec1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScoreQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScoreQuery.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,283 +43,278 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.FunctionScoreQuery
 
-
 @JsonpDeserializable
 public class FunctionScoreQuery extends QueryBase implements QueryVariant {
-	@Nullable
-	private final FunctionBoostMode boostMode;
-
-	private final List<FunctionScore> functions;
-
-	@Nullable
-	private final Double maxBoost;
-
-	@Nullable
-	private final Double minScore;
-
-	@Nullable
-	private final Query query;
-
-	@Nullable
-	private final FunctionScoreMode scoreMode;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FunctionScoreQuery(Builder builder) {
-		super(builder);
-
-		this.boostMode = builder.boostMode;
-		this.functions = ApiTypeHelper.unmodifiable(builder.functions);
-		this.maxBoost = builder.maxBoost;
-		this.minScore = builder.minScore;
-		this.query = builder.query;
-		this.scoreMode = builder.scoreMode;
-
-	}
-
-	public static FunctionScoreQuery of(Function<Builder, ObjectBuilder<FunctionScoreQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.FunctionScore;
-	}
-
-	/**
-	 * API name: {@code boost_mode}
-	 */
-	@Nullable
-	public final FunctionBoostMode boostMode() {
-		return this.boostMode;
-	}
-
-	/**
-	 * API name: {@code functions}
-	 */
-	public final List<FunctionScore> functions() {
-		return this.functions;
-	}
-
-	/**
-	 * API name: {@code max_boost}
-	 */
-	@Nullable
-	public final Double maxBoost() {
-		return this.maxBoost;
-	}
-
-	/**
-	 * API name: {@code min_score}
-	 */
-	@Nullable
-	public final Double minScore() {
-		return this.minScore;
-	}
-
-	/**
-	 * API name: {@code query}
-	 */
-	@Nullable
-	public final Query query() {
-		return this.query;
-	}
-
-	/**
-	 * API name: {@code score_mode}
-	 */
-	@Nullable
-	public final FunctionScoreMode scoreMode() {
-		return this.scoreMode;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.boostMode != null) {
-			generator.writeKey("boost_mode");
-			this.boostMode.serialize(generator, mapper);
-		}
-		if (ApiTypeHelper.isDefined(this.functions)) {
-			generator.writeKey("functions");
-			generator.writeStartArray();
-			for (FunctionScore item0 : this.functions) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.maxBoost != null) {
-			generator.writeKey("max_boost");
-			generator.write(this.maxBoost);
-
-		}
-		if (this.minScore != null) {
-			generator.writeKey("min_score");
-			generator.write(this.minScore);
-
-		}
-		if (this.query != null) {
-			generator.writeKey("query");
-			this.query.serialize(generator, mapper);
-
-		}
-		if (this.scoreMode != null) {
-			generator.writeKey("score_mode");
-			this.scoreMode.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FunctionScoreQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<FunctionScoreQuery> {
-		@Nullable
-		private FunctionBoostMode boostMode;
-
-		@Nullable
-		private List<FunctionScore> functions;
-
-		@Nullable
-		private Double maxBoost;
-
-		@Nullable
-		private Double minScore;
-
-		@Nullable
-		private Query query;
-
-		@Nullable
-		private FunctionScoreMode scoreMode;
-
-		/**
-		 * API name: {@code boost_mode}
-		 */
-		public final Builder boostMode(@Nullable FunctionBoostMode value) {
-			this.boostMode = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code functions}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>functions</code>.
-		 */
-		public final Builder functions(List<FunctionScore> list) {
-			this.functions = _listAddAll(this.functions, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code functions}
-		 * <p>
-		 * Adds one or more values to <code>functions</code>.
-		 */
-		public final Builder functions(FunctionScore value, FunctionScore... values) {
-			this.functions = _listAdd(this.functions, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code functions}
-		 * <p>
-		 * Adds a value to <code>functions</code> using a builder lambda.
-		 */
-		public final Builder functions(Function<FunctionScore.Builder, ObjectBuilder<FunctionScore>> fn) {
-			return functions(fn.apply(new FunctionScore.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code max_boost}
-		 */
-		public final Builder maxBoost(@Nullable Double value) {
-			this.maxBoost = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_score}
-		 */
-		public final Builder minScore(@Nullable Double value) {
-			this.minScore = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code query}
-		 */
-		public final Builder query(@Nullable Query value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code query}
-		 */
-		public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.query(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code score_mode}
-		 */
-		public final Builder scoreMode(@Nullable FunctionScoreMode value) {
-			this.scoreMode = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FunctionScoreQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FunctionScoreQuery build() {
-			_checkSingleUse();
-
-			return new FunctionScoreQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FunctionScoreQuery}
-	 */
-	public static final JsonpDeserializer<FunctionScoreQuery> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, FunctionScoreQuery::setupFunctionScoreQueryDeserializer);
-
-	protected static void setupFunctionScoreQueryDeserializer(ObjectDeserializer<FunctionScoreQuery.Builder> op) {
-		setupQueryBaseDeserializer(op);
-		op.add(Builder::boostMode, FunctionBoostMode._DESERIALIZER, "boost_mode");
-		op.add(Builder::functions, JsonpDeserializer.arrayDeserializer(FunctionScore._DESERIALIZER), "functions");
-		op.add(Builder::maxBoost, JsonpDeserializer.doubleDeserializer(), "max_boost");
-		op.add(Builder::minScore, JsonpDeserializer.doubleDeserializer(), "min_score");
-		op.add(Builder::query, Query._DESERIALIZER, "query");
-		op.add(Builder::scoreMode, FunctionScoreMode._DESERIALIZER, "score_mode");
-
-	}
+    @Nullable
+    private final FunctionBoostMode boostMode;
+
+    private final List<FunctionScore> functions;
+
+    @Nullable
+    private final Double maxBoost;
+
+    @Nullable
+    private final Double minScore;
+
+    @Nullable
+    private final Query query;
+
+    @Nullable
+    private final FunctionScoreMode scoreMode;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FunctionScoreQuery(Builder builder) {
+        super(builder);
+
+        this.boostMode = builder.boostMode;
+        this.functions = ApiTypeHelper.unmodifiable(builder.functions);
+        this.maxBoost = builder.maxBoost;
+        this.minScore = builder.minScore;
+        this.query = builder.query;
+        this.scoreMode = builder.scoreMode;
+
+    }
+
+    public static FunctionScoreQuery of(Function<Builder, ObjectBuilder<FunctionScoreQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.FunctionScore;
+    }
+
+    /**
+     * API name: {@code boost_mode}
+     */
+    @Nullable
+    public final FunctionBoostMode boostMode() {
+        return this.boostMode;
+    }
+
+    /**
+     * API name: {@code functions}
+     */
+    public final List<FunctionScore> functions() {
+        return this.functions;
+    }
+
+    /**
+     * API name: {@code max_boost}
+     */
+    @Nullable
+    public final Double maxBoost() {
+        return this.maxBoost;
+    }
+
+    /**
+     * API name: {@code min_score}
+     */
+    @Nullable
+    public final Double minScore() {
+        return this.minScore;
+    }
+
+    /**
+     * API name: {@code query}
+     */
+    @Nullable
+    public final Query query() {
+        return this.query;
+    }
+
+    /**
+     * API name: {@code score_mode}
+     */
+    @Nullable
+    public final FunctionScoreMode scoreMode() {
+        return this.scoreMode;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.boostMode != null) {
+            generator.writeKey("boost_mode");
+            this.boostMode.serialize(generator, mapper);
+        }
+        if (ApiTypeHelper.isDefined(this.functions)) {
+            generator.writeKey("functions");
+            generator.writeStartArray();
+            for (FunctionScore item0 : this.functions) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.maxBoost != null) {
+            generator.writeKey("max_boost");
+            generator.write(this.maxBoost);
+
+        }
+        if (this.minScore != null) {
+            generator.writeKey("min_score");
+            generator.write(this.minScore);
+
+        }
+        if (this.query != null) {
+            generator.writeKey("query");
+            this.query.serialize(generator, mapper);
+
+        }
+        if (this.scoreMode != null) {
+            generator.writeKey("score_mode");
+            this.scoreMode.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FunctionScoreQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<FunctionScoreQuery> {
+        @Nullable
+        private FunctionBoostMode boostMode;
+
+        @Nullable
+        private List<FunctionScore> functions;
+
+        @Nullable
+        private Double maxBoost;
+
+        @Nullable
+        private Double minScore;
+
+        @Nullable
+        private Query query;
+
+        @Nullable
+        private FunctionScoreMode scoreMode;
+
+        /**
+         * API name: {@code boost_mode}
+         */
+        public final Builder boostMode(@Nullable FunctionBoostMode value) {
+            this.boostMode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code functions}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>functions</code>.
+         */
+        public final Builder functions(List<FunctionScore> list) {
+            this.functions = _listAddAll(this.functions, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code functions}
+         * <p>
+         * Adds one or more values to <code>functions</code>.
+         */
+        public final Builder functions(FunctionScore value, FunctionScore... values) {
+            this.functions = _listAdd(this.functions, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code functions}
+         * <p>
+         * Adds a value to <code>functions</code> using a builder lambda.
+         */
+        public final Builder functions(Function<FunctionScore.Builder, ObjectBuilder<FunctionScore>> fn) {
+            return functions(fn.apply(new FunctionScore.Builder()).build());
+        }
+
+        /**
+         * API name: {@code max_boost}
+         */
+        public final Builder maxBoost(@Nullable Double value) {
+            this.maxBoost = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code min_score}
+         */
+        public final Builder minScore(@Nullable Double value) {
+            this.minScore = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code query}
+         */
+        public final Builder query(@Nullable Query value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code query}
+         */
+        public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.query(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code score_mode}
+         */
+        public final Builder scoreMode(@Nullable FunctionScoreMode value) {
+            this.scoreMode = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link FunctionScoreQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FunctionScoreQuery build() {
+            _checkSingleUse();
+
+            return new FunctionScoreQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FunctionScoreQuery}
+     */
+    public static final JsonpDeserializer<FunctionScoreQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FunctionScoreQuery::setupFunctionScoreQueryDeserializer
+    );
+
+    protected static void setupFunctionScoreQueryDeserializer(ObjectDeserializer<FunctionScoreQuery.Builder> op) {
+        setupQueryBaseDeserializer(op);
+        op.add(Builder::boostMode, FunctionBoostMode._DESERIALIZER, "boost_mode");
+        op.add(Builder::functions, JsonpDeserializer.arrayDeserializer(FunctionScore._DESERIALIZER), "functions");
+        op.add(Builder::maxBoost, JsonpDeserializer.doubleDeserializer(), "max_boost");
+        op.add(Builder::minScore, JsonpDeserializer.doubleDeserializer(), "min_score");
+        op.add(Builder::query, Query._DESERIALIZER, "query");
+        op.add(Builder::scoreMode, FunctionScoreMode._DESERIALIZER, "score_mode");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScoreVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScoreVariant.java
index bec7cdaba9..16cc8c2356 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScoreVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FunctionScoreVariant.java
@@ -37,10 +37,10 @@
  */
 public interface FunctionScoreVariant {
 
-	FunctionScore.Kind _functionScoreKind();
+    FunctionScore.Kind _functionScoreKind();
 
-	default FunctionScore _toFunctionScore() {
-		return new FunctionScore(this);
-	}
+    default FunctionScore _toFunctionScore() {
+        return new FunctionScore(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FuzzyQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FuzzyQuery.java
index 4376c57422..58c5777a38 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FuzzyQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/FuzzyQuery.java
@@ -32,287 +32,288 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch._types.FieldValue;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.FieldValue;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.FuzzyQuery
 
-
 @JsonpDeserializable
 public class FuzzyQuery extends QueryBase implements QueryVariant {
-	// Single key dictionary
-	private final String field;
-
-	@Nullable
-	private final Integer maxExpansions;
-
-	@Nullable
-	private final Integer prefixLength;
-
-	@Nullable
-	private final String rewrite;
-
-	@Nullable
-	private final Boolean transpositions;
-
-	@Nullable
-	private final String fuzziness;
-
-	private final FieldValue value;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FuzzyQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-
-		this.maxExpansions = builder.maxExpansions;
-		this.prefixLength = builder.prefixLength;
-		this.rewrite = builder.rewrite;
-		this.transpositions = builder.transpositions;
-		this.fuzziness = builder.fuzziness;
-		this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
-
-	}
-
-	public static FuzzyQuery of(Function<Builder, ObjectBuilder<FuzzyQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Fuzzy;
-	}
-
-	/**
-	 * Required - The target field
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code max_expansions}
-	 */
-	@Nullable
-	public final Integer maxExpansions() {
-		return this.maxExpansions;
-	}
-
-	/**
-	 * API name: {@code prefix_length}
-	 */
-	@Nullable
-	public final Integer prefixLength() {
-		return this.prefixLength;
-	}
-
-	/**
-	 * API name: {@code rewrite}
-	 */
-	@Nullable
-	public final String rewrite() {
-		return this.rewrite;
-	}
-
-	/**
-	 * API name: {@code transpositions}
-	 */
-	@Nullable
-	public final Boolean transpositions() {
-		return this.transpositions;
-	}
-
-	/**
-	 * API name: {@code fuzziness}
-	 */
-	@Nullable
-	public final String fuzziness() {
-		return this.fuzziness;
-	}
-
-	/**
-	 * Required - API name: {@code value}
-	 */
-	public final FieldValue value() {
-		return this.value;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject(this.field);
-
-		super.serializeInternal(generator, mapper);
-		if (this.maxExpansions != null) {
-			generator.writeKey("max_expansions");
-			generator.write(this.maxExpansions);
-
-		}
-		if (this.prefixLength != null) {
-			generator.writeKey("prefix_length");
-			generator.write(this.prefixLength);
-
-		}
-		if (this.rewrite != null) {
-			generator.writeKey("rewrite");
-			generator.write(this.rewrite);
-
-		}
-		if (this.transpositions != null) {
-			generator.writeKey("transpositions");
-			generator.write(this.transpositions);
-
-		}
-		if (this.fuzziness != null) {
-			generator.writeKey("fuzziness");
-			generator.write(this.fuzziness);
-
-		}
-		generator.writeKey("value");
-		this.value.serialize(generator, mapper);
-
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FuzzyQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<FuzzyQuery> {
-		private String field;
-
-		/**
-		 * Required - The target field
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		@Nullable
-		private Integer maxExpansions;
-
-		@Nullable
-		private Integer prefixLength;
-
-		@Nullable
-		private String rewrite;
-
-		@Nullable
-		private Boolean transpositions;
-
-		@Nullable
-		private String fuzziness;
-
-		private FieldValue value;
-
-		/**
-		 * API name: {@code max_expansions}
-		 */
-		public final Builder maxExpansions(@Nullable Integer value) {
-			this.maxExpansions = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code prefix_length}
-		 */
-		public final Builder prefixLength(@Nullable Integer value) {
-			this.prefixLength = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code rewrite}
-		 */
-		public final Builder rewrite(@Nullable String value) {
-			this.rewrite = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code transpositions}
-		 */
-		public final Builder transpositions(@Nullable Boolean value) {
-			this.transpositions = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzziness}
-		 */
-		public final Builder fuzziness(@Nullable String value) {
-			this.fuzziness = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code value}
-		 */
-		public final Builder value(FieldValue value) {
-			this.value = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code value}
-		 */
-		public final Builder value(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
-			return this.value(fn.apply(new FieldValue.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FuzzyQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FuzzyQuery build() {
-			_checkSingleUse();
-
-			return new FuzzyQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FuzzyQuery}
-	 */
-	public static final JsonpDeserializer<FuzzyQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FuzzyQuery::setupFuzzyQueryDeserializer);
-
-	protected static void setupFuzzyQueryDeserializer(ObjectDeserializer<FuzzyQuery.Builder> op) {
-		setupQueryBaseDeserializer(op);
-		op.add(Builder::maxExpansions, JsonpDeserializer.integerDeserializer(), "max_expansions");
-		op.add(Builder::prefixLength, JsonpDeserializer.integerDeserializer(), "prefix_length");
-		op.add(Builder::rewrite, JsonpDeserializer.stringDeserializer(), "rewrite");
-		op.add(Builder::transpositions, JsonpDeserializer.booleanDeserializer(), "transpositions");
-		op.add(Builder::fuzziness, JsonpDeserializer.stringDeserializer(), "fuzziness");
-		op.add(Builder::value, FieldValue._DESERIALIZER, "value");
-
-		op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
-		op.shortcutProperty("value");
-
-	}
+    // Single key dictionary
+    private final String field;
+
+    @Nullable
+    private final Integer maxExpansions;
+
+    @Nullable
+    private final Integer prefixLength;
+
+    @Nullable
+    private final String rewrite;
+
+    @Nullable
+    private final Boolean transpositions;
+
+    @Nullable
+    private final String fuzziness;
+
+    private final FieldValue value;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FuzzyQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+
+        this.maxExpansions = builder.maxExpansions;
+        this.prefixLength = builder.prefixLength;
+        this.rewrite = builder.rewrite;
+        this.transpositions = builder.transpositions;
+        this.fuzziness = builder.fuzziness;
+        this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
+
+    }
+
+    public static FuzzyQuery of(Function<Builder, ObjectBuilder<FuzzyQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Fuzzy;
+    }
+
+    /**
+     * Required - The target field
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code max_expansions}
+     */
+    @Nullable
+    public final Integer maxExpansions() {
+        return this.maxExpansions;
+    }
+
+    /**
+     * API name: {@code prefix_length}
+     */
+    @Nullable
+    public final Integer prefixLength() {
+        return this.prefixLength;
+    }
+
+    /**
+     * API name: {@code rewrite}
+     */
+    @Nullable
+    public final String rewrite() {
+        return this.rewrite;
+    }
+
+    /**
+     * API name: {@code transpositions}
+     */
+    @Nullable
+    public final Boolean transpositions() {
+        return this.transpositions;
+    }
+
+    /**
+     * API name: {@code fuzziness}
+     */
+    @Nullable
+    public final String fuzziness() {
+        return this.fuzziness;
+    }
+
+    /**
+     * Required - API name: {@code value}
+     */
+    public final FieldValue value() {
+        return this.value;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject(this.field);
+
+        super.serializeInternal(generator, mapper);
+        if (this.maxExpansions != null) {
+            generator.writeKey("max_expansions");
+            generator.write(this.maxExpansions);
+
+        }
+        if (this.prefixLength != null) {
+            generator.writeKey("prefix_length");
+            generator.write(this.prefixLength);
+
+        }
+        if (this.rewrite != null) {
+            generator.writeKey("rewrite");
+            generator.write(this.rewrite);
+
+        }
+        if (this.transpositions != null) {
+            generator.writeKey("transpositions");
+            generator.write(this.transpositions);
+
+        }
+        if (this.fuzziness != null) {
+            generator.writeKey("fuzziness");
+            generator.write(this.fuzziness);
+
+        }
+        generator.writeKey("value");
+        this.value.serialize(generator, mapper);
+
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FuzzyQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<FuzzyQuery> {
+        private String field;
+
+        /**
+         * Required - The target field
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        @Nullable
+        private Integer maxExpansions;
+
+        @Nullable
+        private Integer prefixLength;
+
+        @Nullable
+        private String rewrite;
+
+        @Nullable
+        private Boolean transpositions;
+
+        @Nullable
+        private String fuzziness;
+
+        private FieldValue value;
+
+        /**
+         * API name: {@code max_expansions}
+         */
+        public final Builder maxExpansions(@Nullable Integer value) {
+            this.maxExpansions = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code prefix_length}
+         */
+        public final Builder prefixLength(@Nullable Integer value) {
+            this.prefixLength = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code rewrite}
+         */
+        public final Builder rewrite(@Nullable String value) {
+            this.rewrite = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code transpositions}
+         */
+        public final Builder transpositions(@Nullable Boolean value) {
+            this.transpositions = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzziness}
+         */
+        public final Builder fuzziness(@Nullable String value) {
+            this.fuzziness = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code value}
+         */
+        public final Builder value(FieldValue value) {
+            this.value = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code value}
+         */
+        public final Builder value(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
+            return this.value(fn.apply(new FieldValue.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link FuzzyQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FuzzyQuery build() {
+            _checkSingleUse();
+
+            return new FuzzyQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FuzzyQuery}
+     */
+    public static final JsonpDeserializer<FuzzyQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FuzzyQuery::setupFuzzyQueryDeserializer
+    );
+
+    protected static void setupFuzzyQueryDeserializer(ObjectDeserializer<FuzzyQuery.Builder> op) {
+        setupQueryBaseDeserializer(op);
+        op.add(Builder::maxExpansions, JsonpDeserializer.integerDeserializer(), "max_expansions");
+        op.add(Builder::prefixLength, JsonpDeserializer.integerDeserializer(), "prefix_length");
+        op.add(Builder::rewrite, JsonpDeserializer.stringDeserializer(), "rewrite");
+        op.add(Builder::transpositions, JsonpDeserializer.booleanDeserializer(), "transpositions");
+        op.add(Builder::fuzziness, JsonpDeserializer.stringDeserializer(), "fuzziness");
+        op.add(Builder::value, FieldValue._DESERIALIZER, "value");
+
+        op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
+        op.shortcutProperty("value");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoBoundingBoxQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoBoundingBoxQuery.java
index 1089be45e9..6fda8cc768 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoBoundingBoxQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoBoundingBoxQuery.java
@@ -32,232 +32,231 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch._types.GeoBounds;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.GeoBounds;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.GeoBoundingBoxQuery
 
-
 @JsonpDeserializable
 public class GeoBoundingBoxQuery extends QueryBase implements QueryVariant {
-	private final String field;
-
-	private final GeoBounds boundingBox;
-
-	@Nullable
-	private final GeoExecution type;
-
-	@Nullable
-	private final GeoValidationMethod validationMethod;
-
-	@Nullable
-	private final Boolean ignoreUnmapped;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoBoundingBoxQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.boundingBox = ApiTypeHelper.requireNonNull(builder.boundingBox, this, "boundingBox");
-
-		this.type = builder.type;
-		this.validationMethod = builder.validationMethod;
-		this.ignoreUnmapped = builder.ignoreUnmapped;
-
-	}
-
-	public static GeoBoundingBoxQuery of(Function<Builder, ObjectBuilder<GeoBoundingBoxQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.GeoBoundingBox;
-	}
-
-	/**
-	 * Required -
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required -
-	 */
-	public final GeoBounds boundingBox() {
-		return this.boundingBox;
-	}
-
-	/**
-	 * API name: {@code type}
-	 * 
-	 * @deprecated 7.14.0
-	 */
-	@Deprecated
-	@Nullable
-	public final GeoExecution type() {
-		return this.type;
-	}
-
-	/**
-	 * API name: {@code validation_method}
-	 */
-	@Nullable
-	public final GeoValidationMethod validationMethod() {
-		return this.validationMethod;
-	}
-
-	/**
-	 * API name: {@code ignore_unmapped}
-	 */
-	@Nullable
-	public final Boolean ignoreUnmapped() {
-		return this.ignoreUnmapped;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeKey(this.field);
-		this.boundingBox.serialize(generator, mapper);
-
-		super.serializeInternal(generator, mapper);
-		if (this.type != null) {
-			generator.writeKey("type");
-			this.type.serialize(generator, mapper);
-		}
-		if (this.validationMethod != null) {
-			generator.writeKey("validation_method");
-			this.validationMethod.serialize(generator, mapper);
-		}
-		if (this.ignoreUnmapped != null) {
-			generator.writeKey("ignore_unmapped");
-			generator.write(this.ignoreUnmapped);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoBoundingBoxQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<GeoBoundingBoxQuery> {
-		private String field;
-
-		private GeoBounds boundingBox;
-
-		/**
-		 * Required -
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required -
-		 */
-		public final Builder boundingBox(GeoBounds value) {
-			this.boundingBox = value;
-			return this;
-		}
-
-		/**
-		 * Required -
-		 */
-		public final Builder boundingBox(Function<GeoBounds.Builder, ObjectBuilder<GeoBounds>> fn) {
-			return this.boundingBox(fn.apply(new GeoBounds.Builder()).build());
-		}
-
-		@Nullable
-		private GeoExecution type;
-
-		@Nullable
-		private GeoValidationMethod validationMethod;
-
-		@Nullable
-		private Boolean ignoreUnmapped;
-
-		/**
-		 * API name: {@code type}
-		 * 
-		 * @deprecated 7.14.0
-		 */
-		@Deprecated
-		public final Builder type(@Nullable GeoExecution value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code validation_method}
-		 */
-		public final Builder validationMethod(@Nullable GeoValidationMethod value) {
-			this.validationMethod = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_unmapped}
-		 */
-		public final Builder ignoreUnmapped(@Nullable Boolean value) {
-			this.ignoreUnmapped = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoBoundingBoxQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoBoundingBoxQuery build() {
-			_checkSingleUse();
-
-			return new GeoBoundingBoxQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoBoundingBoxQuery}
-	 */
-	public static final JsonpDeserializer<GeoBoundingBoxQuery> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GeoBoundingBoxQuery::setupGeoBoundingBoxQueryDeserializer);
-
-	protected static void setupGeoBoundingBoxQueryDeserializer(ObjectDeserializer<GeoBoundingBoxQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::type, GeoExecution._DESERIALIZER, "type");
-		op.add(Builder::validationMethod, GeoValidationMethod._DESERIALIZER, "validation_method");
-		op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
-
-		op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
-			builder.field(name);
-			builder.boundingBox(GeoBounds._DESERIALIZER.deserialize(parser, mapper));
-		});
-
-	}
+    private final String field;
+
+    private final GeoBounds boundingBox;
+
+    @Nullable
+    private final GeoExecution type;
+
+    @Nullable
+    private final GeoValidationMethod validationMethod;
+
+    @Nullable
+    private final Boolean ignoreUnmapped;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoBoundingBoxQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.boundingBox = ApiTypeHelper.requireNonNull(builder.boundingBox, this, "boundingBox");
+
+        this.type = builder.type;
+        this.validationMethod = builder.validationMethod;
+        this.ignoreUnmapped = builder.ignoreUnmapped;
+
+    }
+
+    public static GeoBoundingBoxQuery of(Function<Builder, ObjectBuilder<GeoBoundingBoxQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.GeoBoundingBox;
+    }
+
+    /**
+     * Required -
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required -
+     */
+    public final GeoBounds boundingBox() {
+        return this.boundingBox;
+    }
+
+    /**
+     * API name: {@code type}
+     *
+     * @deprecated 7.14.0
+     */
+    @Deprecated
+    @Nullable
+    public final GeoExecution type() {
+        return this.type;
+    }
+
+    /**
+     * API name: {@code validation_method}
+     */
+    @Nullable
+    public final GeoValidationMethod validationMethod() {
+        return this.validationMethod;
+    }
+
+    /**
+     * API name: {@code ignore_unmapped}
+     */
+    @Nullable
+    public final Boolean ignoreUnmapped() {
+        return this.ignoreUnmapped;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeKey(this.field);
+        this.boundingBox.serialize(generator, mapper);
+
+        super.serializeInternal(generator, mapper);
+        if (this.type != null) {
+            generator.writeKey("type");
+            this.type.serialize(generator, mapper);
+        }
+        if (this.validationMethod != null) {
+            generator.writeKey("validation_method");
+            this.validationMethod.serialize(generator, mapper);
+        }
+        if (this.ignoreUnmapped != null) {
+            generator.writeKey("ignore_unmapped");
+            generator.write(this.ignoreUnmapped);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoBoundingBoxQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoBoundingBoxQuery> {
+        private String field;
+
+        private GeoBounds boundingBox;
+
+        /**
+         * Required -
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required -
+         */
+        public final Builder boundingBox(GeoBounds value) {
+            this.boundingBox = value;
+            return this;
+        }
+
+        /**
+         * Required -
+         */
+        public final Builder boundingBox(Function<GeoBounds.Builder, ObjectBuilder<GeoBounds>> fn) {
+            return this.boundingBox(fn.apply(new GeoBounds.Builder()).build());
+        }
+
+        @Nullable
+        private GeoExecution type;
+
+        @Nullable
+        private GeoValidationMethod validationMethod;
+
+        @Nullable
+        private Boolean ignoreUnmapped;
+
+        /**
+         * API name: {@code type}
+         *
+         * @deprecated 7.14.0
+         */
+        @Deprecated
+        public final Builder type(@Nullable GeoExecution value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code validation_method}
+         */
+        public final Builder validationMethod(@Nullable GeoValidationMethod value) {
+            this.validationMethod = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_unmapped}
+         */
+        public final Builder ignoreUnmapped(@Nullable Boolean value) {
+            this.ignoreUnmapped = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoBoundingBoxQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoBoundingBoxQuery build() {
+            _checkSingleUse();
+
+            return new GeoBoundingBoxQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoBoundingBoxQuery}
+     */
+    public static final JsonpDeserializer<GeoBoundingBoxQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoBoundingBoxQuery::setupGeoBoundingBoxQueryDeserializer
+    );
+
+    protected static void setupGeoBoundingBoxQueryDeserializer(ObjectDeserializer<GeoBoundingBoxQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::type, GeoExecution._DESERIALIZER, "type");
+        op.add(Builder::validationMethod, GeoValidationMethod._DESERIALIZER, "validation_method");
+        op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
+
+        op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
+            builder.field(name);
+            builder.boundingBox(GeoBounds._DESERIALIZER.deserialize(parser, mapper));
+        });
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoDistanceQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoDistanceQuery.java
index 3354ca7efb..440d0b5697 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoDistanceQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoDistanceQuery.java
@@ -32,225 +32,226 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch._types.GeoDistanceType;
-import org.opensearch.client.opensearch._types.GeoLocation;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.GeoDistanceType;
+import org.opensearch.client.opensearch._types.GeoLocation;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.GeoDistanceQuery
 
-
 @JsonpDeserializable
 public class GeoDistanceQuery extends QueryBase implements QueryVariant {
-	private final String field;
-
-	private final GeoLocation location;
-
-	@Nullable
-	private final String distance;
-
-	@Nullable
-	private final GeoDistanceType distanceType;
-
-	@Nullable
-	private final GeoValidationMethod validationMethod;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoDistanceQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.location = ApiTypeHelper.requireNonNull(builder.location, this, "location");
-
-		this.distance = builder.distance;
-		this.distanceType = builder.distanceType;
-		this.validationMethod = builder.validationMethod;
-
-	}
-
-	public static GeoDistanceQuery of(Function<Builder, ObjectBuilder<GeoDistanceQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.GeoDistance;
-	}
-
-	/**
-	 * Required -
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required -
-	 */
-	public final GeoLocation location() {
-		return this.location;
-	}
-
-	/**
-	 * API name: {@code distance}
-	 */
-	@Nullable
-	public final String distance() {
-		return this.distance;
-	}
-
-	/**
-	 * API name: {@code distance_type}
-	 */
-	@Nullable
-	public final GeoDistanceType distanceType() {
-		return this.distanceType;
-	}
-
-	/**
-	 * API name: {@code validation_method}
-	 */
-	@Nullable
-	public final GeoValidationMethod validationMethod() {
-		return this.validationMethod;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeKey(this.field);
-		this.location.serialize(generator, mapper);
-
-		super.serializeInternal(generator, mapper);
-		if (this.distance != null) {
-			generator.writeKey("distance");
-			generator.write(this.distance);
-
-		}
-		if (this.distanceType != null) {
-			generator.writeKey("distance_type");
-			this.distanceType.serialize(generator, mapper);
-		}
-		if (this.validationMethod != null) {
-			generator.writeKey("validation_method");
-			this.validationMethod.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoDistanceQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoDistanceQuery> {
-		private String field;
-
-		private GeoLocation location;
-
-		/**
-		 * Required -
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required -
-		 */
-		public final Builder location(GeoLocation value) {
-			this.location = value;
-			return this;
-		}
-
-		/**
-		 * Required -
-		 */
-		public final Builder location(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
-			return this.location(fn.apply(new GeoLocation.Builder()).build());
-		}
-
-		@Nullable
-		private String distance;
-
-		@Nullable
-		private GeoDistanceType distanceType;
-
-		@Nullable
-		private GeoValidationMethod validationMethod;
-
-		/**
-		 * API name: {@code distance}
-		 */
-		public final Builder distance(@Nullable String value) {
-			this.distance = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code distance_type}
-		 */
-		public final Builder distanceType(@Nullable GeoDistanceType value) {
-			this.distanceType = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code validation_method}
-		 */
-		public final Builder validationMethod(@Nullable GeoValidationMethod value) {
-			this.validationMethod = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoDistanceQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoDistanceQuery build() {
-			_checkSingleUse();
-
-			return new GeoDistanceQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoDistanceQuery}
-	 */
-	public static final JsonpDeserializer<GeoDistanceQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GeoDistanceQuery::setupGeoDistanceQueryDeserializer);
-
-	protected static void setupGeoDistanceQueryDeserializer(ObjectDeserializer<GeoDistanceQuery.Builder> op) {
-		setupQueryBaseDeserializer(op);
-		op.add(Builder::distance, JsonpDeserializer.stringDeserializer(), "distance");
-		op.add(Builder::distanceType, GeoDistanceType._DESERIALIZER, "distance_type");
-		op.add(Builder::validationMethod, GeoValidationMethod._DESERIALIZER, "validation_method");
-
-		op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
-			builder.field(name);
-			builder.location(GeoLocation._DESERIALIZER.deserialize(parser, mapper));
-		});
-
-	}
+    private final String field;
+
+    private final GeoLocation location;
+
+    @Nullable
+    private final String distance;
+
+    @Nullable
+    private final GeoDistanceType distanceType;
+
+    @Nullable
+    private final GeoValidationMethod validationMethod;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoDistanceQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.location = ApiTypeHelper.requireNonNull(builder.location, this, "location");
+
+        this.distance = builder.distance;
+        this.distanceType = builder.distanceType;
+        this.validationMethod = builder.validationMethod;
+
+    }
+
+    public static GeoDistanceQuery of(Function<Builder, ObjectBuilder<GeoDistanceQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.GeoDistance;
+    }
+
+    /**
+     * Required -
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required -
+     */
+    public final GeoLocation location() {
+        return this.location;
+    }
+
+    /**
+     * API name: {@code distance}
+     */
+    @Nullable
+    public final String distance() {
+        return this.distance;
+    }
+
+    /**
+     * API name: {@code distance_type}
+     */
+    @Nullable
+    public final GeoDistanceType distanceType() {
+        return this.distanceType;
+    }
+
+    /**
+     * API name: {@code validation_method}
+     */
+    @Nullable
+    public final GeoValidationMethod validationMethod() {
+        return this.validationMethod;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeKey(this.field);
+        this.location.serialize(generator, mapper);
+
+        super.serializeInternal(generator, mapper);
+        if (this.distance != null) {
+            generator.writeKey("distance");
+            generator.write(this.distance);
+
+        }
+        if (this.distanceType != null) {
+            generator.writeKey("distance_type");
+            this.distanceType.serialize(generator, mapper);
+        }
+        if (this.validationMethod != null) {
+            generator.writeKey("validation_method");
+            this.validationMethod.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoDistanceQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoDistanceQuery> {
+        private String field;
+
+        private GeoLocation location;
+
+        /**
+         * Required -
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required -
+         */
+        public final Builder location(GeoLocation value) {
+            this.location = value;
+            return this;
+        }
+
+        /**
+         * Required -
+         */
+        public final Builder location(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
+            return this.location(fn.apply(new GeoLocation.Builder()).build());
+        }
+
+        @Nullable
+        private String distance;
+
+        @Nullable
+        private GeoDistanceType distanceType;
+
+        @Nullable
+        private GeoValidationMethod validationMethod;
+
+        /**
+         * API name: {@code distance}
+         */
+        public final Builder distance(@Nullable String value) {
+            this.distance = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code distance_type}
+         */
+        public final Builder distanceType(@Nullable GeoDistanceType value) {
+            this.distanceType = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code validation_method}
+         */
+        public final Builder validationMethod(@Nullable GeoValidationMethod value) {
+            this.validationMethod = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoDistanceQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoDistanceQuery build() {
+            _checkSingleUse();
+
+            return new GeoDistanceQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoDistanceQuery}
+     */
+    public static final JsonpDeserializer<GeoDistanceQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoDistanceQuery::setupGeoDistanceQueryDeserializer
+    );
+
+    protected static void setupGeoDistanceQueryDeserializer(ObjectDeserializer<GeoDistanceQuery.Builder> op) {
+        setupQueryBaseDeserializer(op);
+        op.add(Builder::distance, JsonpDeserializer.stringDeserializer(), "distance");
+        op.add(Builder::distanceType, GeoDistanceType._DESERIALIZER, "distance_type");
+        op.add(Builder::validationMethod, GeoValidationMethod._DESERIALIZER, "validation_method");
+
+        op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
+            builder.field(name);
+            builder.location(GeoLocation._DESERIALIZER.deserialize(parser, mapper));
+        });
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoExecution.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoExecution.java
index b8b20f5095..91151936e1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoExecution.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoExecution.java
@@ -35,25 +35,23 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum GeoExecution implements JsonEnum {
-	Memory("memory"),
+    Memory("memory"),
 
-	Indexed("indexed"),
+    Indexed("indexed"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	GeoExecution(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    GeoExecution(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<GeoExecution> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			GeoExecution.values());
+    public static final JsonEnum.Deserializer<GeoExecution> _DESERIALIZER = new JsonEnum.Deserializer<>(GeoExecution.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoPolygonPoints.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoPolygonPoints.java
index b39362db58..83303760bd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoPolygonPoints.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoPolygonPoints.java
@@ -32,133 +32,134 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch._types.GeoLocation;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.GeoLocation;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.GeoPolygonPoints
 
-
 @JsonpDeserializable
 public class GeoPolygonPoints implements JsonpSerializable {
-	private final List<GeoLocation> points;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoPolygonPoints(Builder builder) {
-
-		this.points = ApiTypeHelper.unmodifiableRequired(builder.points, this, "points");
-
-	}
-
-	public static GeoPolygonPoints of(Function<Builder, ObjectBuilder<GeoPolygonPoints>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code points}
-	 */
-	public final List<GeoLocation> points() {
-		return this.points;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.points)) {
-			generator.writeKey("points");
-			generator.writeStartArray();
-			for (GeoLocation item0 : this.points) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoPolygonPoints}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoPolygonPoints> {
-		private List<GeoLocation> points;
-
-		/**
-		 * Required - API name: {@code points}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>points</code>.
-		 */
-		public final Builder points(List<GeoLocation> list) {
-			this.points = _listAddAll(this.points, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code points}
-		 * <p>
-		 * Adds one or more values to <code>points</code>.
-		 */
-		public final Builder points(GeoLocation value, GeoLocation... values) {
-			this.points = _listAdd(this.points, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code points}
-		 * <p>
-		 * Adds a value to <code>points</code> using a builder lambda.
-		 */
-		public final Builder points(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
-			return points(fn.apply(new GeoLocation.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link GeoPolygonPoints}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoPolygonPoints build() {
-			_checkSingleUse();
-
-			return new GeoPolygonPoints(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoPolygonPoints}
-	 */
-	public static final JsonpDeserializer<GeoPolygonPoints> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GeoPolygonPoints::setupGeoPolygonPointsDeserializer);
-
-	protected static void setupGeoPolygonPointsDeserializer(ObjectDeserializer<GeoPolygonPoints.Builder> op) {
-
-		op.add(Builder::points, JsonpDeserializer.arrayDeserializer(GeoLocation._DESERIALIZER), "points");
-
-	}
+    private final List<GeoLocation> points;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoPolygonPoints(Builder builder) {
+
+        this.points = ApiTypeHelper.unmodifiableRequired(builder.points, this, "points");
+
+    }
+
+    public static GeoPolygonPoints of(Function<Builder, ObjectBuilder<GeoPolygonPoints>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code points}
+     */
+    public final List<GeoLocation> points() {
+        return this.points;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.points)) {
+            generator.writeKey("points");
+            generator.writeStartArray();
+            for (GeoLocation item0 : this.points) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoPolygonPoints}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoPolygonPoints> {
+        private List<GeoLocation> points;
+
+        /**
+         * Required - API name: {@code points}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>points</code>.
+         */
+        public final Builder points(List<GeoLocation> list) {
+            this.points = _listAddAll(this.points, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code points}
+         * <p>
+         * Adds one or more values to <code>points</code>.
+         */
+        public final Builder points(GeoLocation value, GeoLocation... values) {
+            this.points = _listAdd(this.points, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code points}
+         * <p>
+         * Adds a value to <code>points</code> using a builder lambda.
+         */
+        public final Builder points(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
+            return points(fn.apply(new GeoLocation.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link GeoPolygonPoints}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoPolygonPoints build() {
+            _checkSingleUse();
+
+            return new GeoPolygonPoints(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoPolygonPoints}
+     */
+    public static final JsonpDeserializer<GeoPolygonPoints> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoPolygonPoints::setupGeoPolygonPointsDeserializer
+    );
+
+    protected static void setupGeoPolygonPointsDeserializer(ObjectDeserializer<GeoPolygonPoints.Builder> op) {
+
+        op.add(Builder::points, JsonpDeserializer.arrayDeserializer(GeoLocation._DESERIALIZER), "points");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoPolygonQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoPolygonQuery.java
index 0fee640cfc..cf702a501d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoPolygonQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoPolygonQuery.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,9 +42,6 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.GeoPolygonQuery
 
@@ -52,179 +52,181 @@
 @Deprecated
 @JsonpDeserializable
 public class GeoPolygonQuery extends QueryBase implements QueryVariant {
-	private final String field;
-
-	private final GeoPolygonPoints polygon;
-
-	@Nullable
-	private final GeoValidationMethod validationMethod;
-
-	@Nullable
-	private final Boolean ignoreUnmapped;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoPolygonQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.polygon = ApiTypeHelper.requireNonNull(builder.polygon, this, "polygon");
-
-		this.validationMethod = builder.validationMethod;
-		this.ignoreUnmapped = builder.ignoreUnmapped;
-
-	}
-
-	public static GeoPolygonQuery of(Function<Builder, ObjectBuilder<GeoPolygonQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.GeoPolygon;
-	}
-
-	/**
-	 * Required -
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required -
-	 */
-	public final GeoPolygonPoints polygon() {
-		return this.polygon;
-	}
-
-	/**
-	 * API name: {@code validation_method}
-	 */
-	@Nullable
-	public final GeoValidationMethod validationMethod() {
-		return this.validationMethod;
-	}
-
-	/**
-	 * API name: {@code ignore_unmapped}
-	 */
-	@Nullable
-	public final Boolean ignoreUnmapped() {
-		return this.ignoreUnmapped;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeKey(this.field);
-		this.polygon.serialize(generator, mapper);
-
-		super.serializeInternal(generator, mapper);
-		if (this.validationMethod != null) {
-			generator.writeKey("validation_method");
-			this.validationMethod.serialize(generator, mapper);
-		}
-		if (this.ignoreUnmapped != null) {
-			generator.writeKey("ignore_unmapped");
-			generator.write(this.ignoreUnmapped);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoPolygonQuery}.
-	 */
-	@Deprecated
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoPolygonQuery> {
-		private String field;
-
-		private GeoPolygonPoints polygon;
-
-		/**
-		 * Required -
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required -
-		 */
-		public final Builder polygon(GeoPolygonPoints value) {
-			this.polygon = value;
-			return this;
-		}
-
-		/**
-		 * Required -
-		 */
-		public final Builder polygon(Function<GeoPolygonPoints.Builder, ObjectBuilder<GeoPolygonPoints>> fn) {
-			return this.polygon(fn.apply(new GeoPolygonPoints.Builder()).build());
-		}
-
-		@Nullable
-		private GeoValidationMethod validationMethod;
-
-		@Nullable
-		private Boolean ignoreUnmapped;
-
-		/**
-		 * API name: {@code validation_method}
-		 */
-		public final Builder validationMethod(@Nullable GeoValidationMethod value) {
-			this.validationMethod = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_unmapped}
-		 */
-		public final Builder ignoreUnmapped(@Nullable Boolean value) {
-			this.ignoreUnmapped = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoPolygonQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoPolygonQuery build() {
-			_checkSingleUse();
-
-			return new GeoPolygonQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoPolygonQuery}
-	 */
-	public static final JsonpDeserializer<GeoPolygonQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GeoPolygonQuery::setupGeoPolygonQueryDeserializer);
-
-	protected static void setupGeoPolygonQueryDeserializer(ObjectDeserializer<GeoPolygonQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::validationMethod, GeoValidationMethod._DESERIALIZER, "validation_method");
-		op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
-
-		op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
-			builder.field(name);
-			builder.polygon(GeoPolygonPoints._DESERIALIZER.deserialize(parser, mapper));
-		});
-
-	}
+    private final String field;
+
+    private final GeoPolygonPoints polygon;
+
+    @Nullable
+    private final GeoValidationMethod validationMethod;
+
+    @Nullable
+    private final Boolean ignoreUnmapped;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoPolygonQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.polygon = ApiTypeHelper.requireNonNull(builder.polygon, this, "polygon");
+
+        this.validationMethod = builder.validationMethod;
+        this.ignoreUnmapped = builder.ignoreUnmapped;
+
+    }
+
+    public static GeoPolygonQuery of(Function<Builder, ObjectBuilder<GeoPolygonQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.GeoPolygon;
+    }
+
+    /**
+     * Required -
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required -
+     */
+    public final GeoPolygonPoints polygon() {
+        return this.polygon;
+    }
+
+    /**
+     * API name: {@code validation_method}
+     */
+    @Nullable
+    public final GeoValidationMethod validationMethod() {
+        return this.validationMethod;
+    }
+
+    /**
+     * API name: {@code ignore_unmapped}
+     */
+    @Nullable
+    public final Boolean ignoreUnmapped() {
+        return this.ignoreUnmapped;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeKey(this.field);
+        this.polygon.serialize(generator, mapper);
+
+        super.serializeInternal(generator, mapper);
+        if (this.validationMethod != null) {
+            generator.writeKey("validation_method");
+            this.validationMethod.serialize(generator, mapper);
+        }
+        if (this.ignoreUnmapped != null) {
+            generator.writeKey("ignore_unmapped");
+            generator.write(this.ignoreUnmapped);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoPolygonQuery}.
+     */
+    @Deprecated
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoPolygonQuery> {
+        private String field;
+
+        private GeoPolygonPoints polygon;
+
+        /**
+         * Required -
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required -
+         */
+        public final Builder polygon(GeoPolygonPoints value) {
+            this.polygon = value;
+            return this;
+        }
+
+        /**
+         * Required -
+         */
+        public final Builder polygon(Function<GeoPolygonPoints.Builder, ObjectBuilder<GeoPolygonPoints>> fn) {
+            return this.polygon(fn.apply(new GeoPolygonPoints.Builder()).build());
+        }
+
+        @Nullable
+        private GeoValidationMethod validationMethod;
+
+        @Nullable
+        private Boolean ignoreUnmapped;
+
+        /**
+         * API name: {@code validation_method}
+         */
+        public final Builder validationMethod(@Nullable GeoValidationMethod value) {
+            this.validationMethod = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_unmapped}
+         */
+        public final Builder ignoreUnmapped(@Nullable Boolean value) {
+            this.ignoreUnmapped = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoPolygonQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoPolygonQuery build() {
+            _checkSingleUse();
+
+            return new GeoPolygonQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoPolygonQuery}
+     */
+    public static final JsonpDeserializer<GeoPolygonQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoPolygonQuery::setupGeoPolygonQueryDeserializer
+    );
+
+    protected static void setupGeoPolygonQueryDeserializer(ObjectDeserializer<GeoPolygonQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::validationMethod, GeoValidationMethod._DESERIALIZER, "validation_method");
+        op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
+
+        op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
+            builder.field(name);
+            builder.polygon(GeoPolygonPoints._DESERIALIZER.deserialize(parser, mapper));
+        });
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoShapeFieldQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoShapeFieldQuery.java
index 6a23413d1a..35d1d37053 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoShapeFieldQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoShapeFieldQuery.java
@@ -32,7 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch._types.GeoShapeRelation;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,167 +42,165 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.GeoShapeRelation;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.GeoShapeFieldQuery
 
-
 @JsonpDeserializable
 public class GeoShapeFieldQuery implements JsonpSerializable {
-	@Nullable
-	private final JsonData shape;
-
-	@Nullable
-	private final FieldLookup indexedShape;
-
-	@Nullable
-	private final GeoShapeRelation relation;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoShapeFieldQuery(Builder builder) {
-
-		this.shape = builder.shape;
-		this.indexedShape = builder.indexedShape;
-		this.relation = builder.relation;
-
-	}
-
-	public static GeoShapeFieldQuery of(Function<Builder, ObjectBuilder<GeoShapeFieldQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code shape}
-	 */
-	@Nullable
-	public final JsonData shape() {
-		return this.shape;
-	}
-
-	/**
-	 * API name: {@code indexed_shape}
-	 */
-	@Nullable
-	public final FieldLookup indexedShape() {
-		return this.indexedShape;
-	}
-
-	/**
-	 * API name: {@code relation}
-	 */
-	@Nullable
-	public final GeoShapeRelation relation() {
-		return this.relation;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.shape != null) {
-			generator.writeKey("shape");
-			this.shape.serialize(generator, mapper);
-
-		}
-		if (this.indexedShape != null) {
-			generator.writeKey("indexed_shape");
-			this.indexedShape.serialize(generator, mapper);
-
-		}
-		if (this.relation != null) {
-			generator.writeKey("relation");
-			this.relation.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoShapeFieldQuery}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoShapeFieldQuery> {
-		@Nullable
-		private JsonData shape;
-
-		@Nullable
-		private FieldLookup indexedShape;
-
-		@Nullable
-		private GeoShapeRelation relation;
-
-		/**
-		 * API name: {@code shape}
-		 */
-		public final Builder shape(@Nullable JsonData value) {
-			this.shape = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code indexed_shape}
-		 */
-		public final Builder indexedShape(@Nullable FieldLookup value) {
-			this.indexedShape = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code indexed_shape}
-		 */
-		public final Builder indexedShape(Function<FieldLookup.Builder, ObjectBuilder<FieldLookup>> fn) {
-			return this.indexedShape(fn.apply(new FieldLookup.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code relation}
-		 */
-		public final Builder relation(@Nullable GeoShapeRelation value) {
-			this.relation = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoShapeFieldQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoShapeFieldQuery build() {
-			_checkSingleUse();
-
-			return new GeoShapeFieldQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoShapeFieldQuery}
-	 */
-	public static final JsonpDeserializer<GeoShapeFieldQuery> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GeoShapeFieldQuery::setupGeoShapeFieldQueryDeserializer);
-
-	protected static void setupGeoShapeFieldQueryDeserializer(ObjectDeserializer<GeoShapeFieldQuery.Builder> op) {
-
-		op.add(Builder::shape, JsonData._DESERIALIZER, "shape");
-		op.add(Builder::indexedShape, FieldLookup._DESERIALIZER, "indexed_shape");
-		op.add(Builder::relation, GeoShapeRelation._DESERIALIZER, "relation");
-
-	}
+    @Nullable
+    private final JsonData shape;
+
+    @Nullable
+    private final FieldLookup indexedShape;
+
+    @Nullable
+    private final GeoShapeRelation relation;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoShapeFieldQuery(Builder builder) {
+
+        this.shape = builder.shape;
+        this.indexedShape = builder.indexedShape;
+        this.relation = builder.relation;
+
+    }
+
+    public static GeoShapeFieldQuery of(Function<Builder, ObjectBuilder<GeoShapeFieldQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code shape}
+     */
+    @Nullable
+    public final JsonData shape() {
+        return this.shape;
+    }
+
+    /**
+     * API name: {@code indexed_shape}
+     */
+    @Nullable
+    public final FieldLookup indexedShape() {
+        return this.indexedShape;
+    }
+
+    /**
+     * API name: {@code relation}
+     */
+    @Nullable
+    public final GeoShapeRelation relation() {
+        return this.relation;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.shape != null) {
+            generator.writeKey("shape");
+            this.shape.serialize(generator, mapper);
+
+        }
+        if (this.indexedShape != null) {
+            generator.writeKey("indexed_shape");
+            this.indexedShape.serialize(generator, mapper);
+
+        }
+        if (this.relation != null) {
+            generator.writeKey("relation");
+            this.relation.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoShapeFieldQuery}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoShapeFieldQuery> {
+        @Nullable
+        private JsonData shape;
+
+        @Nullable
+        private FieldLookup indexedShape;
+
+        @Nullable
+        private GeoShapeRelation relation;
+
+        /**
+         * API name: {@code shape}
+         */
+        public final Builder shape(@Nullable JsonData value) {
+            this.shape = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code indexed_shape}
+         */
+        public final Builder indexedShape(@Nullable FieldLookup value) {
+            this.indexedShape = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code indexed_shape}
+         */
+        public final Builder indexedShape(Function<FieldLookup.Builder, ObjectBuilder<FieldLookup>> fn) {
+            return this.indexedShape(fn.apply(new FieldLookup.Builder()).build());
+        }
+
+        /**
+         * API name: {@code relation}
+         */
+        public final Builder relation(@Nullable GeoShapeRelation value) {
+            this.relation = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoShapeFieldQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoShapeFieldQuery build() {
+            _checkSingleUse();
+
+            return new GeoShapeFieldQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoShapeFieldQuery}
+     */
+    public static final JsonpDeserializer<GeoShapeFieldQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoShapeFieldQuery::setupGeoShapeFieldQueryDeserializer
+    );
+
+    protected static void setupGeoShapeFieldQueryDeserializer(ObjectDeserializer<GeoShapeFieldQuery.Builder> op) {
+
+        op.add(Builder::shape, JsonData._DESERIALIZER, "shape");
+        op.add(Builder::indexedShape, FieldLookup._DESERIALIZER, "indexed_shape");
+        op.add(Builder::relation, GeoShapeRelation._DESERIALIZER, "relation");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoShapeQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoShapeQuery.java
index 197abdf074..b8d024d018 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoShapeQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoShapeQuery.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,160 +42,158 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.GeoShapeQuery
 
-
 @JsonpDeserializable
 public class GeoShapeQuery extends QueryBase implements QueryVariant {
-	private final String field;
-
-	private final GeoShapeFieldQuery shape;
-
-	@Nullable
-	private final Boolean ignoreUnmapped;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoShapeQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.shape = ApiTypeHelper.requireNonNull(builder.shape, this, "shape");
-
-		this.ignoreUnmapped = builder.ignoreUnmapped;
-
-	}
-
-	public static GeoShapeQuery of(Function<Builder, ObjectBuilder<GeoShapeQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.GeoShape;
-	}
-
-	/**
-	 * Required -
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required -
-	 */
-	public final GeoShapeFieldQuery shape() {
-		return this.shape;
-	}
-
-	/**
-	 * API name: {@code ignore_unmapped}
-	 */
-	@Nullable
-	public final Boolean ignoreUnmapped() {
-		return this.ignoreUnmapped;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeKey(this.field);
-		this.shape.serialize(generator, mapper);
-
-		super.serializeInternal(generator, mapper);
-		if (this.ignoreUnmapped != null) {
-			generator.writeKey("ignore_unmapped");
-			generator.write(this.ignoreUnmapped);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoShapeQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoShapeQuery> {
-		private String field;
-
-		private GeoShapeFieldQuery shape;
-
-		/**
-		 * Required -
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required -
-		 */
-		public final Builder shape(GeoShapeFieldQuery value) {
-			this.shape = value;
-			return this;
-		}
-
-		/**
-		 * Required -
-		 */
-		public final Builder shape(Function<GeoShapeFieldQuery.Builder, ObjectBuilder<GeoShapeFieldQuery>> fn) {
-			return this.shape(fn.apply(new GeoShapeFieldQuery.Builder()).build());
-		}
-
-		@Nullable
-		private Boolean ignoreUnmapped;
-
-		/**
-		 * API name: {@code ignore_unmapped}
-		 */
-		public final Builder ignoreUnmapped(@Nullable Boolean value) {
-			this.ignoreUnmapped = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoShapeQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoShapeQuery build() {
-			_checkSingleUse();
-
-			return new GeoShapeQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoShapeQuery}
-	 */
-	public static final JsonpDeserializer<GeoShapeQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GeoShapeQuery::setupGeoShapeQueryDeserializer);
-
-	protected static void setupGeoShapeQueryDeserializer(ObjectDeserializer<GeoShapeQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
-
-		op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
-			builder.field(name);
-			builder.shape(GeoShapeFieldQuery._DESERIALIZER.deserialize(parser, mapper));
-		});
-
-	}
+    private final String field;
+
+    private final GeoShapeFieldQuery shape;
+
+    @Nullable
+    private final Boolean ignoreUnmapped;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoShapeQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.shape = ApiTypeHelper.requireNonNull(builder.shape, this, "shape");
+
+        this.ignoreUnmapped = builder.ignoreUnmapped;
+
+    }
+
+    public static GeoShapeQuery of(Function<Builder, ObjectBuilder<GeoShapeQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.GeoShape;
+    }
+
+    /**
+     * Required -
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required -
+     */
+    public final GeoShapeFieldQuery shape() {
+        return this.shape;
+    }
+
+    /**
+     * API name: {@code ignore_unmapped}
+     */
+    @Nullable
+    public final Boolean ignoreUnmapped() {
+        return this.ignoreUnmapped;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeKey(this.field);
+        this.shape.serialize(generator, mapper);
+
+        super.serializeInternal(generator, mapper);
+        if (this.ignoreUnmapped != null) {
+            generator.writeKey("ignore_unmapped");
+            generator.write(this.ignoreUnmapped);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoShapeQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoShapeQuery> {
+        private String field;
+
+        private GeoShapeFieldQuery shape;
+
+        /**
+         * Required -
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required -
+         */
+        public final Builder shape(GeoShapeFieldQuery value) {
+            this.shape = value;
+            return this;
+        }
+
+        /**
+         * Required -
+         */
+        public final Builder shape(Function<GeoShapeFieldQuery.Builder, ObjectBuilder<GeoShapeFieldQuery>> fn) {
+            return this.shape(fn.apply(new GeoShapeFieldQuery.Builder()).build());
+        }
+
+        @Nullable
+        private Boolean ignoreUnmapped;
+
+        /**
+         * API name: {@code ignore_unmapped}
+         */
+        public final Builder ignoreUnmapped(@Nullable Boolean value) {
+            this.ignoreUnmapped = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoShapeQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoShapeQuery build() {
+            _checkSingleUse();
+
+            return new GeoShapeQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoShapeQuery}
+     */
+    public static final JsonpDeserializer<GeoShapeQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoShapeQuery::setupGeoShapeQueryDeserializer
+    );
+
+    protected static void setupGeoShapeQueryDeserializer(ObjectDeserializer<GeoShapeQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
+
+        op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
+            builder.field(name);
+            builder.shape(GeoShapeFieldQuery._DESERIALIZER.deserialize(parser, mapper));
+        });
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoValidationMethod.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoValidationMethod.java
index 669faaac0d..809998060d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoValidationMethod.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/GeoValidationMethod.java
@@ -35,27 +35,27 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum GeoValidationMethod implements JsonEnum {
-	Coerce("coerce"),
+    Coerce("coerce"),
 
-	IgnoreMalformed("ignore_malformed"),
+    IgnoreMalformed("ignore_malformed"),
 
-	Strict("strict"),
+    Strict("strict"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	GeoValidationMethod(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    GeoValidationMethod(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<GeoValidationMethod> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			GeoValidationMethod.values());
+    public static final JsonEnum.Deserializer<GeoValidationMethod> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        GeoValidationMethod.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/HasChildQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/HasChildQuery.java
index 5afd58cb56..aade331876 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/HasChildQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/HasChildQuery.java
@@ -32,290 +32,291 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch.core.search.InnerHits;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.search.InnerHits;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.HasChildQuery
 
-
 @JsonpDeserializable
 public class HasChildQuery extends QueryBase implements QueryVariant {
-	@Nullable
-	private final Boolean ignoreUnmapped;
-
-	@Nullable
-	private final InnerHits innerHits;
-
-	@Nullable
-	private final Integer maxChildren;
-
-	@Nullable
-	private final Integer minChildren;
-
-	private final Query query;
-
-	@Nullable
-	private final ChildScoreMode scoreMode;
-
-	private final String type;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HasChildQuery(Builder builder) {
-		super(builder);
-
-		this.ignoreUnmapped = builder.ignoreUnmapped;
-		this.innerHits = builder.innerHits;
-		this.maxChildren = builder.maxChildren;
-		this.minChildren = builder.minChildren;
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-		this.scoreMode = builder.scoreMode;
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-
-	}
-
-	public static HasChildQuery of(Function<Builder, ObjectBuilder<HasChildQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.HasChild;
-	}
-
-	/**
-	 * API name: {@code ignore_unmapped}
-	 */
-	@Nullable
-	public final Boolean ignoreUnmapped() {
-		return this.ignoreUnmapped;
-	}
-
-	/**
-	 * API name: {@code inner_hits}
-	 */
-	@Nullable
-	public final InnerHits innerHits() {
-		return this.innerHits;
-	}
-
-	/**
-	 * API name: {@code max_children}
-	 */
-	@Nullable
-	public final Integer maxChildren() {
-		return this.maxChildren;
-	}
-
-	/**
-	 * API name: {@code min_children}
-	 */
-	@Nullable
-	public final Integer minChildren() {
-		return this.minChildren;
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final Query query() {
-		return this.query;
-	}
-
-	/**
-	 * API name: {@code score_mode}
-	 */
-	@Nullable
-	public final ChildScoreMode scoreMode() {
-		return this.scoreMode;
-	}
-
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.ignoreUnmapped != null) {
-			generator.writeKey("ignore_unmapped");
-			generator.write(this.ignoreUnmapped);
-
-		}
-		if (this.innerHits != null) {
-			generator.writeKey("inner_hits");
-			this.innerHits.serialize(generator, mapper);
-
-		}
-		if (this.maxChildren != null) {
-			generator.writeKey("max_children");
-			generator.write(this.maxChildren);
-
-		}
-		if (this.minChildren != null) {
-			generator.writeKey("min_children");
-			generator.write(this.minChildren);
-
-		}
-		generator.writeKey("query");
-		this.query.serialize(generator, mapper);
-
-		if (this.scoreMode != null) {
-			generator.writeKey("score_mode");
-			this.scoreMode.serialize(generator, mapper);
-		}
-		generator.writeKey("type");
-		generator.write(this.type);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HasChildQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<HasChildQuery> {
-		@Nullable
-		private Boolean ignoreUnmapped;
-
-		@Nullable
-		private InnerHits innerHits;
-
-		@Nullable
-		private Integer maxChildren;
-
-		@Nullable
-		private Integer minChildren;
-
-		private Query query;
-
-		@Nullable
-		private ChildScoreMode scoreMode;
-
-		private String type;
-
-		/**
-		 * API name: {@code ignore_unmapped}
-		 */
-		public final Builder ignoreUnmapped(@Nullable Boolean value) {
-			this.ignoreUnmapped = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code inner_hits}
-		 */
-		public final Builder innerHits(@Nullable InnerHits value) {
-			this.innerHits = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code inner_hits}
-		 */
-		public final Builder innerHits(Function<InnerHits.Builder, ObjectBuilder<InnerHits>> fn) {
-			return this.innerHits(fn.apply(new InnerHits.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code max_children}
-		 */
-		public final Builder maxChildren(@Nullable Integer value) {
-			this.maxChildren = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_children}
-		 */
-		public final Builder minChildren(@Nullable Integer value) {
-			this.minChildren = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(Query value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.query(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code score_mode}
-		 */
-		public final Builder scoreMode(@Nullable ChildScoreMode value) {
-			this.scoreMode = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HasChildQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HasChildQuery build() {
-			_checkSingleUse();
-
-			return new HasChildQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HasChildQuery}
-	 */
-	public static final JsonpDeserializer<HasChildQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			HasChildQuery::setupHasChildQueryDeserializer);
-
-	protected static void setupHasChildQueryDeserializer(ObjectDeserializer<HasChildQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
-		op.add(Builder::innerHits, InnerHits._DESERIALIZER, "inner_hits");
-		op.add(Builder::maxChildren, JsonpDeserializer.integerDeserializer(), "max_children");
-		op.add(Builder::minChildren, JsonpDeserializer.integerDeserializer(), "min_children");
-		op.add(Builder::query, Query._DESERIALIZER, "query");
-		op.add(Builder::scoreMode, ChildScoreMode._DESERIALIZER, "score_mode");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-
-	}
+    @Nullable
+    private final Boolean ignoreUnmapped;
+
+    @Nullable
+    private final InnerHits innerHits;
+
+    @Nullable
+    private final Integer maxChildren;
+
+    @Nullable
+    private final Integer minChildren;
+
+    private final Query query;
+
+    @Nullable
+    private final ChildScoreMode scoreMode;
+
+    private final String type;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HasChildQuery(Builder builder) {
+        super(builder);
+
+        this.ignoreUnmapped = builder.ignoreUnmapped;
+        this.innerHits = builder.innerHits;
+        this.maxChildren = builder.maxChildren;
+        this.minChildren = builder.minChildren;
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+        this.scoreMode = builder.scoreMode;
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+
+    }
+
+    public static HasChildQuery of(Function<Builder, ObjectBuilder<HasChildQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.HasChild;
+    }
+
+    /**
+     * API name: {@code ignore_unmapped}
+     */
+    @Nullable
+    public final Boolean ignoreUnmapped() {
+        return this.ignoreUnmapped;
+    }
+
+    /**
+     * API name: {@code inner_hits}
+     */
+    @Nullable
+    public final InnerHits innerHits() {
+        return this.innerHits;
+    }
+
+    /**
+     * API name: {@code max_children}
+     */
+    @Nullable
+    public final Integer maxChildren() {
+        return this.maxChildren;
+    }
+
+    /**
+     * API name: {@code min_children}
+     */
+    @Nullable
+    public final Integer minChildren() {
+        return this.minChildren;
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final Query query() {
+        return this.query;
+    }
+
+    /**
+     * API name: {@code score_mode}
+     */
+    @Nullable
+    public final ChildScoreMode scoreMode() {
+        return this.scoreMode;
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.ignoreUnmapped != null) {
+            generator.writeKey("ignore_unmapped");
+            generator.write(this.ignoreUnmapped);
+
+        }
+        if (this.innerHits != null) {
+            generator.writeKey("inner_hits");
+            this.innerHits.serialize(generator, mapper);
+
+        }
+        if (this.maxChildren != null) {
+            generator.writeKey("max_children");
+            generator.write(this.maxChildren);
+
+        }
+        if (this.minChildren != null) {
+            generator.writeKey("min_children");
+            generator.write(this.minChildren);
+
+        }
+        generator.writeKey("query");
+        this.query.serialize(generator, mapper);
+
+        if (this.scoreMode != null) {
+            generator.writeKey("score_mode");
+            this.scoreMode.serialize(generator, mapper);
+        }
+        generator.writeKey("type");
+        generator.write(this.type);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HasChildQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<HasChildQuery> {
+        @Nullable
+        private Boolean ignoreUnmapped;
+
+        @Nullable
+        private InnerHits innerHits;
+
+        @Nullable
+        private Integer maxChildren;
+
+        @Nullable
+        private Integer minChildren;
+
+        private Query query;
+
+        @Nullable
+        private ChildScoreMode scoreMode;
+
+        private String type;
+
+        /**
+         * API name: {@code ignore_unmapped}
+         */
+        public final Builder ignoreUnmapped(@Nullable Boolean value) {
+            this.ignoreUnmapped = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code inner_hits}
+         */
+        public final Builder innerHits(@Nullable InnerHits value) {
+            this.innerHits = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code inner_hits}
+         */
+        public final Builder innerHits(Function<InnerHits.Builder, ObjectBuilder<InnerHits>> fn) {
+            return this.innerHits(fn.apply(new InnerHits.Builder()).build());
+        }
+
+        /**
+         * API name: {@code max_children}
+         */
+        public final Builder maxChildren(@Nullable Integer value) {
+            this.maxChildren = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code min_children}
+         */
+        public final Builder minChildren(@Nullable Integer value) {
+            this.minChildren = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(Query value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.query(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code score_mode}
+         */
+        public final Builder scoreMode(@Nullable ChildScoreMode value) {
+            this.scoreMode = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link HasChildQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HasChildQuery build() {
+            _checkSingleUse();
+
+            return new HasChildQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HasChildQuery}
+     */
+    public static final JsonpDeserializer<HasChildQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HasChildQuery::setupHasChildQueryDeserializer
+    );
+
+    protected static void setupHasChildQueryDeserializer(ObjectDeserializer<HasChildQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
+        op.add(Builder::innerHits, InnerHits._DESERIALIZER, "inner_hits");
+        op.add(Builder::maxChildren, JsonpDeserializer.integerDeserializer(), "max_children");
+        op.add(Builder::minChildren, JsonpDeserializer.integerDeserializer(), "min_children");
+        op.add(Builder::query, Query._DESERIALIZER, "query");
+        op.add(Builder::scoreMode, ChildScoreMode._DESERIALIZER, "score_mode");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/HasParentQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/HasParentQuery.java
index a10613b34a..cd00095534 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/HasParentQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/HasParentQuery.java
@@ -32,234 +32,235 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch.core.search.InnerHits;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.search.InnerHits;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.HasParentQuery
 
-
 @JsonpDeserializable
 public class HasParentQuery extends QueryBase implements QueryVariant {
-	@Nullable
-	private final Boolean ignoreUnmapped;
-
-	@Nullable
-	private final InnerHits innerHits;
-
-	private final String parentType;
-
-	private final Query query;
-
-	@Nullable
-	private final Boolean score;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HasParentQuery(Builder builder) {
-		super(builder);
+    @Nullable
+    private final Boolean ignoreUnmapped;
+
+    @Nullable
+    private final InnerHits innerHits;
+
+    private final String parentType;
+
+    private final Query query;
+
+    @Nullable
+    private final Boolean score;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HasParentQuery(Builder builder) {
+        super(builder);
 
-		this.ignoreUnmapped = builder.ignoreUnmapped;
-		this.innerHits = builder.innerHits;
-		this.parentType = ApiTypeHelper.requireNonNull(builder.parentType, this, "parentType");
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-		this.score = builder.score;
+        this.ignoreUnmapped = builder.ignoreUnmapped;
+        this.innerHits = builder.innerHits;
+        this.parentType = ApiTypeHelper.requireNonNull(builder.parentType, this, "parentType");
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+        this.score = builder.score;
 
-	}
+    }
 
-	public static HasParentQuery of(Function<Builder, ObjectBuilder<HasParentQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.HasParent;
-	}
-
-	/**
-	 * API name: {@code ignore_unmapped}
-	 */
-	@Nullable
-	public final Boolean ignoreUnmapped() {
-		return this.ignoreUnmapped;
-	}
-
-	/**
-	 * API name: {@code inner_hits}
-	 */
-	@Nullable
-	public final InnerHits innerHits() {
-		return this.innerHits;
-	}
-
-	/**
-	 * Required - API name: {@code parent_type}
-	 */
-	public final String parentType() {
-		return this.parentType;
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final Query query() {
-		return this.query;
-	}
-
-	/**
-	 * API name: {@code score}
-	 */
-	@Nullable
-	public final Boolean score() {
-		return this.score;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.ignoreUnmapped != null) {
-			generator.writeKey("ignore_unmapped");
-			generator.write(this.ignoreUnmapped);
-
-		}
-		if (this.innerHits != null) {
-			generator.writeKey("inner_hits");
-			this.innerHits.serialize(generator, mapper);
-
-		}
-		generator.writeKey("parent_type");
-		generator.write(this.parentType);
-
-		generator.writeKey("query");
-		this.query.serialize(generator, mapper);
-
-		if (this.score != null) {
-			generator.writeKey("score");
-			generator.write(this.score);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HasParentQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<HasParentQuery> {
-		@Nullable
-		private Boolean ignoreUnmapped;
-
-		@Nullable
-		private InnerHits innerHits;
-
-		private String parentType;
-
-		private Query query;
-
-		@Nullable
-		private Boolean score;
-
-		/**
-		 * API name: {@code ignore_unmapped}
-		 */
-		public final Builder ignoreUnmapped(@Nullable Boolean value) {
-			this.ignoreUnmapped = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code inner_hits}
-		 */
-		public final Builder innerHits(@Nullable InnerHits value) {
-			this.innerHits = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code inner_hits}
-		 */
-		public final Builder innerHits(Function<InnerHits.Builder, ObjectBuilder<InnerHits>> fn) {
-			return this.innerHits(fn.apply(new InnerHits.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code parent_type}
-		 */
-		public final Builder parentType(String value) {
-			this.parentType = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(Query value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.query(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code score}
-		 */
-		public final Builder score(@Nullable Boolean value) {
-			this.score = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HasParentQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HasParentQuery build() {
-			_checkSingleUse();
-
-			return new HasParentQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HasParentQuery}
-	 */
-	public static final JsonpDeserializer<HasParentQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			HasParentQuery::setupHasParentQueryDeserializer);
-
-	protected static void setupHasParentQueryDeserializer(ObjectDeserializer<HasParentQuery.Builder> op) {
-		setupQueryBaseDeserializer(op);
-		op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
-		op.add(Builder::innerHits, InnerHits._DESERIALIZER, "inner_hits");
-		op.add(Builder::parentType, JsonpDeserializer.stringDeserializer(), "parent_type");
-		op.add(Builder::query, Query._DESERIALIZER, "query");
-		op.add(Builder::score, JsonpDeserializer.booleanDeserializer(), "score");
-
-	}
+    public static HasParentQuery of(Function<Builder, ObjectBuilder<HasParentQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.HasParent;
+    }
+
+    /**
+     * API name: {@code ignore_unmapped}
+     */
+    @Nullable
+    public final Boolean ignoreUnmapped() {
+        return this.ignoreUnmapped;
+    }
+
+    /**
+     * API name: {@code inner_hits}
+     */
+    @Nullable
+    public final InnerHits innerHits() {
+        return this.innerHits;
+    }
+
+    /**
+     * Required - API name: {@code parent_type}
+     */
+    public final String parentType() {
+        return this.parentType;
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final Query query() {
+        return this.query;
+    }
+
+    /**
+     * API name: {@code score}
+     */
+    @Nullable
+    public final Boolean score() {
+        return this.score;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.ignoreUnmapped != null) {
+            generator.writeKey("ignore_unmapped");
+            generator.write(this.ignoreUnmapped);
+
+        }
+        if (this.innerHits != null) {
+            generator.writeKey("inner_hits");
+            this.innerHits.serialize(generator, mapper);
+
+        }
+        generator.writeKey("parent_type");
+        generator.write(this.parentType);
+
+        generator.writeKey("query");
+        this.query.serialize(generator, mapper);
+
+        if (this.score != null) {
+            generator.writeKey("score");
+            generator.write(this.score);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HasParentQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<HasParentQuery> {
+        @Nullable
+        private Boolean ignoreUnmapped;
+
+        @Nullable
+        private InnerHits innerHits;
+
+        private String parentType;
+
+        private Query query;
+
+        @Nullable
+        private Boolean score;
+
+        /**
+         * API name: {@code ignore_unmapped}
+         */
+        public final Builder ignoreUnmapped(@Nullable Boolean value) {
+            this.ignoreUnmapped = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code inner_hits}
+         */
+        public final Builder innerHits(@Nullable InnerHits value) {
+            this.innerHits = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code inner_hits}
+         */
+        public final Builder innerHits(Function<InnerHits.Builder, ObjectBuilder<InnerHits>> fn) {
+            return this.innerHits(fn.apply(new InnerHits.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code parent_type}
+         */
+        public final Builder parentType(String value) {
+            this.parentType = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(Query value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.query(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code score}
+         */
+        public final Builder score(@Nullable Boolean value) {
+            this.score = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link HasParentQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HasParentQuery build() {
+            _checkSingleUse();
+
+            return new HasParentQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HasParentQuery}
+     */
+    public static final JsonpDeserializer<HasParentQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HasParentQuery::setupHasParentQueryDeserializer
+    );
+
+    protected static void setupHasParentQueryDeserializer(ObjectDeserializer<HasParentQuery.Builder> op) {
+        setupQueryBaseDeserializer(op);
+        op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
+        op.add(Builder::innerHits, InnerHits._DESERIALIZER, "inner_hits");
+        op.add(Builder::parentType, JsonpDeserializer.stringDeserializer(), "parent_type");
+        op.add(Builder::query, Query._DESERIALIZER, "query");
+        op.add(Builder::score, JsonpDeserializer.booleanDeserializer(), "score");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IdsQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IdsQuery.java
index 7eb7de5a56..49945073b4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IdsQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IdsQuery.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,122 +43,119 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.IdsQuery
 
-
 @JsonpDeserializable
 public class IdsQuery extends QueryBase implements QueryVariant {
-	private final List<String> values;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IdsQuery(Builder builder) {
-		super(builder);
-
-		this.values = ApiTypeHelper.unmodifiable(builder.values);
-
-	}
-
-	public static IdsQuery of(Function<Builder, ObjectBuilder<IdsQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Ids;
-	}
-
-	/**
-	 * API name: {@code values}
-	 */
-	public final List<String> values() {
-		return this.values;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.values)) {
-			generator.writeKey("values");
-			generator.writeStartArray();
-			for (String item0 : this.values) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IdsQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<IdsQuery> {
-		@Nullable
-		private List<String> values;
-
-		/**
-		 * API name: {@code values}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>values</code>.
-		 */
-		public final Builder values(List<String> list) {
-			this.values = _listAddAll(this.values, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code values}
-		 * <p>
-		 * Adds one or more values to <code>values</code>.
-		 */
-		public final Builder values(String value, String... values) {
-			this.values = _listAdd(this.values, value, values);
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IdsQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IdsQuery build() {
-			_checkSingleUse();
-
-			return new IdsQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IdsQuery}
-	 */
-	public static final JsonpDeserializer<IdsQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IdsQuery::setupIdsQueryDeserializer);
-
-	protected static void setupIdsQueryDeserializer(ObjectDeserializer<IdsQuery.Builder> op) {
-		setupQueryBaseDeserializer(op);
-		op.add(Builder::values, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "values");
-
-	}
+    private final List<String> values;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IdsQuery(Builder builder) {
+        super(builder);
+
+        this.values = ApiTypeHelper.unmodifiable(builder.values);
+
+    }
+
+    public static IdsQuery of(Function<Builder, ObjectBuilder<IdsQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Ids;
+    }
+
+    /**
+     * API name: {@code values}
+     */
+    public final List<String> values() {
+        return this.values;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.values)) {
+            generator.writeKey("values");
+            generator.writeStartArray();
+            for (String item0 : this.values) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IdsQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<IdsQuery> {
+        @Nullable
+        private List<String> values;
+
+        /**
+         * API name: {@code values}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>values</code>.
+         */
+        public final Builder values(List<String> list) {
+            this.values = _listAddAll(this.values, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code values}
+         * <p>
+         * Adds one or more values to <code>values</code>.
+         */
+        public final Builder values(String value, String... values) {
+            this.values = _listAdd(this.values, value, values);
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link IdsQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IdsQuery build() {
+            _checkSingleUse();
+
+            return new IdsQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IdsQuery}
+     */
+    public static final JsonpDeserializer<IdsQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IdsQuery::setupIdsQueryDeserializer
+    );
+
+    protected static void setupIdsQueryDeserializer(ObjectDeserializer<IdsQuery.Builder> op) {
+        setupQueryBaseDeserializer(op);
+        op.add(Builder::values, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "values");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/Intervals.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/Intervals.java
index 55664fdcb5..84f4afe841 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/Intervals.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/Intervals.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -44,288 +46,287 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.IntervalsContainer
 
-
 @JsonpDeserializable
 public class Intervals implements TaggedUnion<Intervals.Kind, Object>, IntervalsFilterVariant, JsonpSerializable {
 
-	/**
-	 * {@link Intervals} variant kinds.
-	 */
-	/**
-	 * {@link Intervals} variant kinds.
-	 */
+    /**
+     * {@link Intervals} variant kinds.
+     */
+    /**
+     * {@link Intervals} variant kinds.
+     */
 
-	public enum Kind implements JsonEnum {
-		AllOf("all_of"),
+    public enum Kind implements JsonEnum {
+        AllOf("all_of"),
 
-		AnyOf("any_of"),
+        AnyOf("any_of"),
 
-		Fuzzy("fuzzy"),
+        Fuzzy("fuzzy"),
 
-		Match("match"),
+        Match("match"),
 
-		Prefix("prefix"),
+        Prefix("prefix"),
 
-		Wildcard("wildcard"),
-
-		;
-
-		private final String jsonValue;
-
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
-
-		public String jsonValue() {
-			return this.jsonValue;
-		}
-
-	}
-
-	/**
-	 * IntervalsFilter variant kind.
-	 */
-	@Override
-	public IntervalsFilter.Kind _intervalsFilterKind() {
-		return IntervalsFilter.Kind.Overlapping;
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	public Intervals(IntervalsVariant value) {
-
-		this._kind = ApiTypeHelper.requireNonNull(value._intervalsKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
-
-	}
-
-	private Intervals(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static Intervals of(Function<Builder, ObjectBuilder<Intervals>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code all_of}?
-	 */
-	public boolean isAllOf() {
-		return _kind == Kind.AllOf;
-	}
-
-	/**
-	 * Get the {@code all_of} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code all_of} kind.
-	 */
-	public IntervalsAllOf allOf() {
-		return TaggedUnionUtils.get(this, Kind.AllOf);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code any_of}?
-	 */
-	public boolean isAnyOf() {
-		return _kind == Kind.AnyOf;
-	}
-
-	/**
-	 * Get the {@code any_of} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code any_of} kind.
-	 */
-	public IntervalsAnyOf anyOf() {
-		return TaggedUnionUtils.get(this, Kind.AnyOf);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code fuzzy}?
-	 */
-	public boolean isFuzzy() {
-		return _kind == Kind.Fuzzy;
-	}
-
-	/**
-	 * Get the {@code fuzzy} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code fuzzy} kind.
-	 */
-	public IntervalsFuzzy fuzzy() {
-		return TaggedUnionUtils.get(this, Kind.Fuzzy);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code match}?
-	 */
-	public boolean isMatch() {
-		return _kind == Kind.Match;
-	}
-
-	/**
-	 * Get the {@code match} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code match} kind.
-	 */
-	public IntervalsMatch match() {
-		return TaggedUnionUtils.get(this, Kind.Match);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code prefix}?
-	 */
-	public boolean isPrefix() {
-		return _kind == Kind.Prefix;
-	}
-
-	/**
-	 * Get the {@code prefix} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code prefix} kind.
-	 */
-	public IntervalsPrefix prefix() {
-		return TaggedUnionUtils.get(this, Kind.Prefix);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code wildcard}?
-	 */
-	public boolean isWildcard() {
-		return _kind == Kind.Wildcard;
-	}
-
-	/**
-	 * Get the {@code wildcard} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code wildcard} kind.
-	 */
-	public IntervalsWildcard wildcard() {
-		return TaggedUnionUtils.get(this, Kind.Wildcard);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeStartObject();
-
-		generator.writeKey(_kind.jsonValue());
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		}
-
-		generator.writeEnd();
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Intervals> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<Intervals> allOf(IntervalsAllOf v) {
-			this._kind = Kind.AllOf;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Intervals> allOf(Function<IntervalsAllOf.Builder, ObjectBuilder<IntervalsAllOf>> fn) {
-			return this.allOf(fn.apply(new IntervalsAllOf.Builder()).build());
-		}
-
-		public ObjectBuilder<Intervals> anyOf(IntervalsAnyOf v) {
-			this._kind = Kind.AnyOf;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Intervals> anyOf(Function<IntervalsAnyOf.Builder, ObjectBuilder<IntervalsAnyOf>> fn) {
-			return this.anyOf(fn.apply(new IntervalsAnyOf.Builder()).build());
-		}
-
-		public ObjectBuilder<Intervals> fuzzy(IntervalsFuzzy v) {
-			this._kind = Kind.Fuzzy;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Intervals> fuzzy(Function<IntervalsFuzzy.Builder, ObjectBuilder<IntervalsFuzzy>> fn) {
-			return this.fuzzy(fn.apply(new IntervalsFuzzy.Builder()).build());
-		}
-
-		public ObjectBuilder<Intervals> match(IntervalsMatch v) {
-			this._kind = Kind.Match;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Intervals> match(Function<IntervalsMatch.Builder, ObjectBuilder<IntervalsMatch>> fn) {
-			return this.match(fn.apply(new IntervalsMatch.Builder()).build());
-		}
-
-		public ObjectBuilder<Intervals> prefix(IntervalsPrefix v) {
-			this._kind = Kind.Prefix;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Intervals> prefix(Function<IntervalsPrefix.Builder, ObjectBuilder<IntervalsPrefix>> fn) {
-			return this.prefix(fn.apply(new IntervalsPrefix.Builder()).build());
-		}
-
-		public ObjectBuilder<Intervals> wildcard(IntervalsWildcard v) {
-			this._kind = Kind.Wildcard;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Intervals> wildcard(
-				Function<IntervalsWildcard.Builder, ObjectBuilder<IntervalsWildcard>> fn) {
-			return this.wildcard(fn.apply(new IntervalsWildcard.Builder()).build());
-		}
-
-		public Intervals build() {
-			_checkSingleUse();
-			return new Intervals(this);
-		}
-
-	}
-
-	protected static void setupIntervalsDeserializer(ObjectDeserializer<Builder> op) {
-
-		op.add(Builder::allOf, IntervalsAllOf._DESERIALIZER, "all_of");
-		op.add(Builder::anyOf, IntervalsAnyOf._DESERIALIZER, "any_of");
-		op.add(Builder::fuzzy, IntervalsFuzzy._DESERIALIZER, "fuzzy");
-		op.add(Builder::match, IntervalsMatch._DESERIALIZER, "match");
-		op.add(Builder::prefix, IntervalsPrefix._DESERIALIZER, "prefix");
-		op.add(Builder::wildcard, IntervalsWildcard._DESERIALIZER, "wildcard");
-
-	}
-
-	public static final JsonpDeserializer<Intervals> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Intervals::setupIntervalsDeserializer, Builder::build);
+        Wildcard("wildcard"),
+
+        ;
+
+        private final String jsonValue;
+
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
+
+        public String jsonValue() {
+            return this.jsonValue;
+        }
+
+    }
+
+    /**
+     * IntervalsFilter variant kind.
+     */
+    @Override
+    public IntervalsFilter.Kind _intervalsFilterKind() {
+        return IntervalsFilter.Kind.Overlapping;
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    public Intervals(IntervalsVariant value) {
+
+        this._kind = ApiTypeHelper.requireNonNull(value._intervalsKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+
+    }
+
+    private Intervals(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static Intervals of(Function<Builder, ObjectBuilder<Intervals>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code all_of}?
+     */
+    public boolean isAllOf() {
+        return _kind == Kind.AllOf;
+    }
+
+    /**
+     * Get the {@code all_of} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code all_of} kind.
+     */
+    public IntervalsAllOf allOf() {
+        return TaggedUnionUtils.get(this, Kind.AllOf);
+    }
+
+    /**
+     * Is this variant instance of kind {@code any_of}?
+     */
+    public boolean isAnyOf() {
+        return _kind == Kind.AnyOf;
+    }
+
+    /**
+     * Get the {@code any_of} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code any_of} kind.
+     */
+    public IntervalsAnyOf anyOf() {
+        return TaggedUnionUtils.get(this, Kind.AnyOf);
+    }
+
+    /**
+     * Is this variant instance of kind {@code fuzzy}?
+     */
+    public boolean isFuzzy() {
+        return _kind == Kind.Fuzzy;
+    }
+
+    /**
+     * Get the {@code fuzzy} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code fuzzy} kind.
+     */
+    public IntervalsFuzzy fuzzy() {
+        return TaggedUnionUtils.get(this, Kind.Fuzzy);
+    }
+
+    /**
+     * Is this variant instance of kind {@code match}?
+     */
+    public boolean isMatch() {
+        return _kind == Kind.Match;
+    }
+
+    /**
+     * Get the {@code match} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code match} kind.
+     */
+    public IntervalsMatch match() {
+        return TaggedUnionUtils.get(this, Kind.Match);
+    }
+
+    /**
+     * Is this variant instance of kind {@code prefix}?
+     */
+    public boolean isPrefix() {
+        return _kind == Kind.Prefix;
+    }
+
+    /**
+     * Get the {@code prefix} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code prefix} kind.
+     */
+    public IntervalsPrefix prefix() {
+        return TaggedUnionUtils.get(this, Kind.Prefix);
+    }
+
+    /**
+     * Is this variant instance of kind {@code wildcard}?
+     */
+    public boolean isWildcard() {
+        return _kind == Kind.Wildcard;
+    }
+
+    /**
+     * Get the {@code wildcard} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code wildcard} kind.
+     */
+    public IntervalsWildcard wildcard() {
+        return TaggedUnionUtils.get(this, Kind.Wildcard);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeStartObject();
+
+        generator.writeKey(_kind.jsonValue());
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        }
+
+        generator.writeEnd();
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Intervals> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<Intervals> allOf(IntervalsAllOf v) {
+            this._kind = Kind.AllOf;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Intervals> allOf(Function<IntervalsAllOf.Builder, ObjectBuilder<IntervalsAllOf>> fn) {
+            return this.allOf(fn.apply(new IntervalsAllOf.Builder()).build());
+        }
+
+        public ObjectBuilder<Intervals> anyOf(IntervalsAnyOf v) {
+            this._kind = Kind.AnyOf;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Intervals> anyOf(Function<IntervalsAnyOf.Builder, ObjectBuilder<IntervalsAnyOf>> fn) {
+            return this.anyOf(fn.apply(new IntervalsAnyOf.Builder()).build());
+        }
+
+        public ObjectBuilder<Intervals> fuzzy(IntervalsFuzzy v) {
+            this._kind = Kind.Fuzzy;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Intervals> fuzzy(Function<IntervalsFuzzy.Builder, ObjectBuilder<IntervalsFuzzy>> fn) {
+            return this.fuzzy(fn.apply(new IntervalsFuzzy.Builder()).build());
+        }
+
+        public ObjectBuilder<Intervals> match(IntervalsMatch v) {
+            this._kind = Kind.Match;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Intervals> match(Function<IntervalsMatch.Builder, ObjectBuilder<IntervalsMatch>> fn) {
+            return this.match(fn.apply(new IntervalsMatch.Builder()).build());
+        }
+
+        public ObjectBuilder<Intervals> prefix(IntervalsPrefix v) {
+            this._kind = Kind.Prefix;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Intervals> prefix(Function<IntervalsPrefix.Builder, ObjectBuilder<IntervalsPrefix>> fn) {
+            return this.prefix(fn.apply(new IntervalsPrefix.Builder()).build());
+        }
+
+        public ObjectBuilder<Intervals> wildcard(IntervalsWildcard v) {
+            this._kind = Kind.Wildcard;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Intervals> wildcard(Function<IntervalsWildcard.Builder, ObjectBuilder<IntervalsWildcard>> fn) {
+            return this.wildcard(fn.apply(new IntervalsWildcard.Builder()).build());
+        }
+
+        public Intervals build() {
+            _checkSingleUse();
+            return new Intervals(this);
+        }
+
+    }
+
+    protected static void setupIntervalsDeserializer(ObjectDeserializer<Builder> op) {
+
+        op.add(Builder::allOf, IntervalsAllOf._DESERIALIZER, "all_of");
+        op.add(Builder::anyOf, IntervalsAnyOf._DESERIALIZER, "any_of");
+        op.add(Builder::fuzzy, IntervalsFuzzy._DESERIALIZER, "fuzzy");
+        op.add(Builder::match, IntervalsMatch._DESERIALIZER, "match");
+        op.add(Builder::prefix, IntervalsPrefix._DESERIALIZER, "prefix");
+        op.add(Builder::wildcard, IntervalsWildcard._DESERIALIZER, "wildcard");
+
+    }
+
+    public static final JsonpDeserializer<Intervals> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Intervals::setupIntervalsDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsAllOf.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsAllOf.java
index 657408c68f..2f6689caab 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsAllOf.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsAllOf.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,234 +45,231 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.IntervalsAllOf
 
-
 @JsonpDeserializable
 public class IntervalsAllOf implements IntervalsQueryVariant, IntervalsVariant, JsonpSerializable {
-	private final List<Intervals> intervals;
-
-	@Nullable
-	private final Integer maxGaps;
-
-	@Nullable
-	private final Boolean ordered;
-
-	@Nullable
-	private final IntervalsFilter filter;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IntervalsAllOf(Builder builder) {
-
-		this.intervals = ApiTypeHelper.unmodifiableRequired(builder.intervals, this, "intervals");
-		this.maxGaps = builder.maxGaps;
-		this.ordered = builder.ordered;
-		this.filter = builder.filter;
-
-	}
-
-	public static IntervalsAllOf of(Function<Builder, ObjectBuilder<IntervalsAllOf>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * IntervalsQuery variant kind.
-	 */
-	@Override
-	public IntervalsQuery.Kind _intervalsQueryKind() {
-		return IntervalsQuery.Kind.AllOf;
-	}
-
-	/**
-	 * Intervals variant kind.
-	 */
-	@Override
-	public Intervals.Kind _intervalsKind() {
-		return Intervals.Kind.AllOf;
-	}
-
-	/**
-	 * Required - API name: {@code intervals}
-	 */
-	public final List<Intervals> intervals() {
-		return this.intervals;
-	}
-
-	/**
-	 * API name: {@code max_gaps}
-	 */
-	@Nullable
-	public final Integer maxGaps() {
-		return this.maxGaps;
-	}
-
-	/**
-	 * API name: {@code ordered}
-	 */
-	@Nullable
-	public final Boolean ordered() {
-		return this.ordered;
-	}
-
-	/**
-	 * API name: {@code filter}
-	 */
-	@Nullable
-	public final IntervalsFilter filter() {
-		return this.filter;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.intervals)) {
-			generator.writeKey("intervals");
-			generator.writeStartArray();
-			for (Intervals item0 : this.intervals) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.maxGaps != null) {
-			generator.writeKey("max_gaps");
-			generator.write(this.maxGaps);
-
-		}
-		if (this.ordered != null) {
-			generator.writeKey("ordered");
-			generator.write(this.ordered);
-
-		}
-		if (this.filter != null) {
-			generator.writeKey("filter");
-			this.filter.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IntervalsAllOf}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IntervalsAllOf> {
-		private List<Intervals> intervals;
-
-		@Nullable
-		private Integer maxGaps;
-
-		@Nullable
-		private Boolean ordered;
-
-		@Nullable
-		private IntervalsFilter filter;
-
-		/**
-		 * Required - API name: {@code intervals}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>intervals</code>.
-		 */
-		public final Builder intervals(List<Intervals> list) {
-			this.intervals = _listAddAll(this.intervals, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code intervals}
-		 * <p>
-		 * Adds one or more values to <code>intervals</code>.
-		 */
-		public final Builder intervals(Intervals value, Intervals... values) {
-			this.intervals = _listAdd(this.intervals, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code intervals}
-		 * <p>
-		 * Adds a value to <code>intervals</code> using a builder lambda.
-		 */
-		public final Builder intervals(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
-			return intervals(fn.apply(new Intervals.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code max_gaps}
-		 */
-		public final Builder maxGaps(@Nullable Integer value) {
-			this.maxGaps = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ordered}
-		 */
-		public final Builder ordered(@Nullable Boolean value) {
-			this.ordered = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(@Nullable IntervalsFilter value) {
-			this.filter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(Function<IntervalsFilter.Builder, ObjectBuilder<IntervalsFilter>> fn) {
-			return this.filter(fn.apply(new IntervalsFilter.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link IntervalsAllOf}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IntervalsAllOf build() {
-			_checkSingleUse();
-
-			return new IntervalsAllOf(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IntervalsAllOf}
-	 */
-	public static final JsonpDeserializer<IntervalsAllOf> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IntervalsAllOf::setupIntervalsAllOfDeserializer);
-
-	protected static void setupIntervalsAllOfDeserializer(ObjectDeserializer<IntervalsAllOf.Builder> op) {
-
-		op.add(Builder::intervals, JsonpDeserializer.arrayDeserializer(Intervals._DESERIALIZER), "intervals");
-		op.add(Builder::maxGaps, JsonpDeserializer.integerDeserializer(), "max_gaps");
-		op.add(Builder::ordered, JsonpDeserializer.booleanDeserializer(), "ordered");
-		op.add(Builder::filter, IntervalsFilter._DESERIALIZER, "filter");
-
-	}
+    private final List<Intervals> intervals;
+
+    @Nullable
+    private final Integer maxGaps;
+
+    @Nullable
+    private final Boolean ordered;
+
+    @Nullable
+    private final IntervalsFilter filter;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IntervalsAllOf(Builder builder) {
+
+        this.intervals = ApiTypeHelper.unmodifiableRequired(builder.intervals, this, "intervals");
+        this.maxGaps = builder.maxGaps;
+        this.ordered = builder.ordered;
+        this.filter = builder.filter;
+
+    }
+
+    public static IntervalsAllOf of(Function<Builder, ObjectBuilder<IntervalsAllOf>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * IntervalsQuery variant kind.
+     */
+    @Override
+    public IntervalsQuery.Kind _intervalsQueryKind() {
+        return IntervalsQuery.Kind.AllOf;
+    }
+
+    /**
+     * Intervals variant kind.
+     */
+    @Override
+    public Intervals.Kind _intervalsKind() {
+        return Intervals.Kind.AllOf;
+    }
+
+    /**
+     * Required - API name: {@code intervals}
+     */
+    public final List<Intervals> intervals() {
+        return this.intervals;
+    }
+
+    /**
+     * API name: {@code max_gaps}
+     */
+    @Nullable
+    public final Integer maxGaps() {
+        return this.maxGaps;
+    }
+
+    /**
+     * API name: {@code ordered}
+     */
+    @Nullable
+    public final Boolean ordered() {
+        return this.ordered;
+    }
+
+    /**
+     * API name: {@code filter}
+     */
+    @Nullable
+    public final IntervalsFilter filter() {
+        return this.filter;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.intervals)) {
+            generator.writeKey("intervals");
+            generator.writeStartArray();
+            for (Intervals item0 : this.intervals) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.maxGaps != null) {
+            generator.writeKey("max_gaps");
+            generator.write(this.maxGaps);
+
+        }
+        if (this.ordered != null) {
+            generator.writeKey("ordered");
+            generator.write(this.ordered);
+
+        }
+        if (this.filter != null) {
+            generator.writeKey("filter");
+            this.filter.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IntervalsAllOf}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IntervalsAllOf> {
+        private List<Intervals> intervals;
+
+        @Nullable
+        private Integer maxGaps;
+
+        @Nullable
+        private Boolean ordered;
+
+        @Nullable
+        private IntervalsFilter filter;
+
+        /**
+         * Required - API name: {@code intervals}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>intervals</code>.
+         */
+        public final Builder intervals(List<Intervals> list) {
+            this.intervals = _listAddAll(this.intervals, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code intervals}
+         * <p>
+         * Adds one or more values to <code>intervals</code>.
+         */
+        public final Builder intervals(Intervals value, Intervals... values) {
+            this.intervals = _listAdd(this.intervals, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code intervals}
+         * <p>
+         * Adds a value to <code>intervals</code> using a builder lambda.
+         */
+        public final Builder intervals(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
+            return intervals(fn.apply(new Intervals.Builder()).build());
+        }
+
+        /**
+         * API name: {@code max_gaps}
+         */
+        public final Builder maxGaps(@Nullable Integer value) {
+            this.maxGaps = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ordered}
+         */
+        public final Builder ordered(@Nullable Boolean value) {
+            this.ordered = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(@Nullable IntervalsFilter value) {
+            this.filter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(Function<IntervalsFilter.Builder, ObjectBuilder<IntervalsFilter>> fn) {
+            return this.filter(fn.apply(new IntervalsFilter.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link IntervalsAllOf}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IntervalsAllOf build() {
+            _checkSingleUse();
+
+            return new IntervalsAllOf(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IntervalsAllOf}
+     */
+    public static final JsonpDeserializer<IntervalsAllOf> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IntervalsAllOf::setupIntervalsAllOfDeserializer
+    );
+
+    protected static void setupIntervalsAllOfDeserializer(ObjectDeserializer<IntervalsAllOf.Builder> op) {
+
+        op.add(Builder::intervals, JsonpDeserializer.arrayDeserializer(Intervals._DESERIALIZER), "intervals");
+        op.add(Builder::maxGaps, JsonpDeserializer.integerDeserializer(), "max_gaps");
+        op.add(Builder::ordered, JsonpDeserializer.booleanDeserializer(), "ordered");
+        op.add(Builder::filter, IntervalsFilter._DESERIALIZER, "filter");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsAnyOf.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsAnyOf.java
index ebb250ec9a..07033d268d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsAnyOf.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsAnyOf.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,176 +45,173 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.IntervalsAnyOf
 
-
 @JsonpDeserializable
 public class IntervalsAnyOf implements IntervalsQueryVariant, IntervalsVariant, JsonpSerializable {
-	private final List<Intervals> intervals;
-
-	@Nullable
-	private final IntervalsFilter filter;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IntervalsAnyOf(Builder builder) {
-
-		this.intervals = ApiTypeHelper.unmodifiableRequired(builder.intervals, this, "intervals");
-		this.filter = builder.filter;
-
-	}
-
-	public static IntervalsAnyOf of(Function<Builder, ObjectBuilder<IntervalsAnyOf>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * IntervalsQuery variant kind.
-	 */
-	@Override
-	public IntervalsQuery.Kind _intervalsQueryKind() {
-		return IntervalsQuery.Kind.AnyOf;
-	}
-
-	/**
-	 * Intervals variant kind.
-	 */
-	@Override
-	public Intervals.Kind _intervalsKind() {
-		return Intervals.Kind.AnyOf;
-	}
-
-	/**
-	 * Required - API name: {@code intervals}
-	 */
-	public final List<Intervals> intervals() {
-		return this.intervals;
-	}
-
-	/**
-	 * API name: {@code filter}
-	 */
-	@Nullable
-	public final IntervalsFilter filter() {
-		return this.filter;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.intervals)) {
-			generator.writeKey("intervals");
-			generator.writeStartArray();
-			for (Intervals item0 : this.intervals) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.filter != null) {
-			generator.writeKey("filter");
-			this.filter.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IntervalsAnyOf}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IntervalsAnyOf> {
-		private List<Intervals> intervals;
-
-		@Nullable
-		private IntervalsFilter filter;
-
-		/**
-		 * Required - API name: {@code intervals}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>intervals</code>.
-		 */
-		public final Builder intervals(List<Intervals> list) {
-			this.intervals = _listAddAll(this.intervals, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code intervals}
-		 * <p>
-		 * Adds one or more values to <code>intervals</code>.
-		 */
-		public final Builder intervals(Intervals value, Intervals... values) {
-			this.intervals = _listAdd(this.intervals, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code intervals}
-		 * <p>
-		 * Adds a value to <code>intervals</code> using a builder lambda.
-		 */
-		public final Builder intervals(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
-			return intervals(fn.apply(new Intervals.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(@Nullable IntervalsFilter value) {
-			this.filter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(Function<IntervalsFilter.Builder, ObjectBuilder<IntervalsFilter>> fn) {
-			return this.filter(fn.apply(new IntervalsFilter.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link IntervalsAnyOf}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IntervalsAnyOf build() {
-			_checkSingleUse();
-
-			return new IntervalsAnyOf(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IntervalsAnyOf}
-	 */
-	public static final JsonpDeserializer<IntervalsAnyOf> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IntervalsAnyOf::setupIntervalsAnyOfDeserializer);
-
-	protected static void setupIntervalsAnyOfDeserializer(ObjectDeserializer<IntervalsAnyOf.Builder> op) {
-
-		op.add(Builder::intervals, JsonpDeserializer.arrayDeserializer(Intervals._DESERIALIZER), "intervals");
-		op.add(Builder::filter, IntervalsFilter._DESERIALIZER, "filter");
-
-	}
+    private final List<Intervals> intervals;
+
+    @Nullable
+    private final IntervalsFilter filter;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IntervalsAnyOf(Builder builder) {
+
+        this.intervals = ApiTypeHelper.unmodifiableRequired(builder.intervals, this, "intervals");
+        this.filter = builder.filter;
+
+    }
+
+    public static IntervalsAnyOf of(Function<Builder, ObjectBuilder<IntervalsAnyOf>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * IntervalsQuery variant kind.
+     */
+    @Override
+    public IntervalsQuery.Kind _intervalsQueryKind() {
+        return IntervalsQuery.Kind.AnyOf;
+    }
+
+    /**
+     * Intervals variant kind.
+     */
+    @Override
+    public Intervals.Kind _intervalsKind() {
+        return Intervals.Kind.AnyOf;
+    }
+
+    /**
+     * Required - API name: {@code intervals}
+     */
+    public final List<Intervals> intervals() {
+        return this.intervals;
+    }
+
+    /**
+     * API name: {@code filter}
+     */
+    @Nullable
+    public final IntervalsFilter filter() {
+        return this.filter;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.intervals)) {
+            generator.writeKey("intervals");
+            generator.writeStartArray();
+            for (Intervals item0 : this.intervals) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.filter != null) {
+            generator.writeKey("filter");
+            this.filter.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IntervalsAnyOf}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IntervalsAnyOf> {
+        private List<Intervals> intervals;
+
+        @Nullable
+        private IntervalsFilter filter;
+
+        /**
+         * Required - API name: {@code intervals}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>intervals</code>.
+         */
+        public final Builder intervals(List<Intervals> list) {
+            this.intervals = _listAddAll(this.intervals, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code intervals}
+         * <p>
+         * Adds one or more values to <code>intervals</code>.
+         */
+        public final Builder intervals(Intervals value, Intervals... values) {
+            this.intervals = _listAdd(this.intervals, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code intervals}
+         * <p>
+         * Adds a value to <code>intervals</code> using a builder lambda.
+         */
+        public final Builder intervals(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
+            return intervals(fn.apply(new Intervals.Builder()).build());
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(@Nullable IntervalsFilter value) {
+            this.filter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(Function<IntervalsFilter.Builder, ObjectBuilder<IntervalsFilter>> fn) {
+            return this.filter(fn.apply(new IntervalsFilter.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link IntervalsAnyOf}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IntervalsAnyOf build() {
+            _checkSingleUse();
+
+            return new IntervalsAnyOf(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IntervalsAnyOf}
+     */
+    public static final JsonpDeserializer<IntervalsAnyOf> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IntervalsAnyOf::setupIntervalsAnyOfDeserializer
+    );
+
+    protected static void setupIntervalsAnyOfDeserializer(ObjectDeserializer<IntervalsAnyOf.Builder> op) {
+
+        op.add(Builder::intervals, JsonpDeserializer.arrayDeserializer(Intervals._DESERIALIZER), "intervals");
+        op.add(Builder::filter, IntervalsFilter._DESERIALIZER, "filter");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsBuilders.java
index fddc8deedc..a659cb0e96 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsBuilders.java
@@ -36,55 +36,54 @@
  * Builders for {@link Intervals} variants.
  */
 public class IntervalsBuilders {
-	private IntervalsBuilders() {
-	}
+    private IntervalsBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link IntervalsAllOf all_of} {@code Intervals}
-	 * variant.
-	 */
-	public static IntervalsAllOf.Builder allOf() {
-		return new IntervalsAllOf.Builder();
-	}
+    /**
+     * Creates a builder for the {@link IntervalsAllOf all_of} {@code Intervals}
+     * variant.
+     */
+    public static IntervalsAllOf.Builder allOf() {
+        return new IntervalsAllOf.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link IntervalsAnyOf any_of} {@code Intervals}
-	 * variant.
-	 */
-	public static IntervalsAnyOf.Builder anyOf() {
-		return new IntervalsAnyOf.Builder();
-	}
+    /**
+     * Creates a builder for the {@link IntervalsAnyOf any_of} {@code Intervals}
+     * variant.
+     */
+    public static IntervalsAnyOf.Builder anyOf() {
+        return new IntervalsAnyOf.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link IntervalsFuzzy fuzzy} {@code Intervals}
-	 * variant.
-	 */
-	public static IntervalsFuzzy.Builder fuzzy() {
-		return new IntervalsFuzzy.Builder();
-	}
+    /**
+     * Creates a builder for the {@link IntervalsFuzzy fuzzy} {@code Intervals}
+     * variant.
+     */
+    public static IntervalsFuzzy.Builder fuzzy() {
+        return new IntervalsFuzzy.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link IntervalsMatch match} {@code Intervals}
-	 * variant.
-	 */
-	public static IntervalsMatch.Builder match() {
-		return new IntervalsMatch.Builder();
-	}
+    /**
+     * Creates a builder for the {@link IntervalsMatch match} {@code Intervals}
+     * variant.
+     */
+    public static IntervalsMatch.Builder match() {
+        return new IntervalsMatch.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link IntervalsPrefix prefix} {@code Intervals}
-	 * variant.
-	 */
-	public static IntervalsPrefix.Builder prefix() {
-		return new IntervalsPrefix.Builder();
-	}
+    /**
+     * Creates a builder for the {@link IntervalsPrefix prefix} {@code Intervals}
+     * variant.
+     */
+    public static IntervalsPrefix.Builder prefix() {
+        return new IntervalsPrefix.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link IntervalsWildcard wildcard}
-	 * {@code Intervals} variant.
-	 */
-	public static IntervalsWildcard.Builder wildcard() {
-		return new IntervalsWildcard.Builder();
-	}
+    /**
+     * Creates a builder for the {@link IntervalsWildcard wildcard}
+     * {@code Intervals} variant.
+     */
+    public static IntervalsWildcard.Builder wildcard() {
+        return new IntervalsWildcard.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsFilter.java
index b079764593..d0594b822f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsFilter.java
@@ -32,7 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,376 +41,377 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.IntervalsFilter
 
-
 @JsonpDeserializable
 public class IntervalsFilter implements TaggedUnion<IntervalsFilter.Kind, Object>, JsonpSerializable {
 
-	/**
-	 * {@link IntervalsFilter} variant kinds.
-	 */
-	/**
-	 * {@link IntervalsFilter} variant kinds.
-	 */
+    /**
+     * {@link IntervalsFilter} variant kinds.
+     */
+    /**
+     * {@link IntervalsFilter} variant kinds.
+     */
 
-	public enum Kind implements JsonEnum {
-		After("after"),
+    public enum Kind implements JsonEnum {
+        After("after"),
 
-		Before("before"),
+        Before("before"),
 
-		ContainedBy("contained_by"),
+        ContainedBy("contained_by"),
 
-		Containing("containing"),
+        Containing("containing"),
 
-		NotContainedBy("not_contained_by"),
+        NotContainedBy("not_contained_by"),
 
-		NotContaining("not_containing"),
+        NotContaining("not_containing"),
 
-		NotOverlapping("not_overlapping"),
+        NotOverlapping("not_overlapping"),
 
-		Overlapping("overlapping"),
+        Overlapping("overlapping"),
 
-		Script("script"),
+        Script("script"),
 
-		;
+        ;
 
-		private final String jsonValue;
+        private final String jsonValue;
 
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
 
-		public String jsonValue() {
-			return this.jsonValue;
-		}
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	public IntervalsFilter(IntervalsFilterVariant value) {
-
-		this._kind = ApiTypeHelper.requireNonNull(value._intervalsFilterKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
-
-	}
-
-	private IntervalsFilter(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static IntervalsFilter of(Function<Builder, ObjectBuilder<IntervalsFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code after}?
-	 */
-	public boolean isAfter() {
-		return _kind == Kind.After;
-	}
-
-	/**
-	 * Get the {@code after} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code after} kind.
-	 */
-	public Intervals after() {
-		return TaggedUnionUtils.get(this, Kind.After);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code before}?
-	 */
-	public boolean isBefore() {
-		return _kind == Kind.Before;
-	}
-
-	/**
-	 * Get the {@code before} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code before} kind.
-	 */
-	public Intervals before() {
-		return TaggedUnionUtils.get(this, Kind.Before);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code contained_by}?
-	 */
-	public boolean isContainedBy() {
-		return _kind == Kind.ContainedBy;
-	}
-
-	/**
-	 * Get the {@code contained_by} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code contained_by} kind.
-	 */
-	public Intervals containedBy() {
-		return TaggedUnionUtils.get(this, Kind.ContainedBy);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code containing}?
-	 */
-	public boolean isContaining() {
-		return _kind == Kind.Containing;
-	}
-
-	/**
-	 * Get the {@code containing} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code containing} kind.
-	 */
-	public Intervals containing() {
-		return TaggedUnionUtils.get(this, Kind.Containing);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code not_contained_by}?
-	 */
-	public boolean isNotContainedBy() {
-		return _kind == Kind.NotContainedBy;
-	}
-
-	/**
-	 * Get the {@code not_contained_by} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code not_contained_by}
-	 *             kind.
-	 */
-	public Intervals notContainedBy() {
-		return TaggedUnionUtils.get(this, Kind.NotContainedBy);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code not_containing}?
-	 */
-	public boolean isNotContaining() {
-		return _kind == Kind.NotContaining;
-	}
-
-	/**
-	 * Get the {@code not_containing} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code not_containing} kind.
-	 */
-	public Intervals notContaining() {
-		return TaggedUnionUtils.get(this, Kind.NotContaining);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code not_overlapping}?
-	 */
-	public boolean isNotOverlapping() {
-		return _kind == Kind.NotOverlapping;
-	}
-
-	/**
-	 * Get the {@code not_overlapping} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code not_overlapping}
-	 *             kind.
-	 */
-	public Intervals notOverlapping() {
-		return TaggedUnionUtils.get(this, Kind.NotOverlapping);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code overlapping}?
-	 */
-	public boolean isOverlapping() {
-		return _kind == Kind.Overlapping;
-	}
-
-	/**
-	 * Get the {@code overlapping} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code overlapping} kind.
-	 */
-	public Intervals overlapping() {
-		return TaggedUnionUtils.get(this, Kind.Overlapping);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code script}?
-	 */
-	public boolean isScript() {
-		return _kind == Kind.Script;
-	}
-
-	/**
-	 * Get the {@code script} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code script} kind.
-	 */
-	public Script script() {
-		return TaggedUnionUtils.get(this, Kind.Script);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeStartObject();
-
-		generator.writeKey(_kind.jsonValue());
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		}
-
-		generator.writeEnd();
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IntervalsFilter> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<IntervalsFilter> after(Intervals v) {
-			this._kind = Kind.After;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<IntervalsFilter> after(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
-			return this.after(fn.apply(new Intervals.Builder()).build());
-		}
-
-		public ObjectBuilder<IntervalsFilter> before(Intervals v) {
-			this._kind = Kind.Before;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<IntervalsFilter> before(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
-			return this.before(fn.apply(new Intervals.Builder()).build());
-		}
-
-		public ObjectBuilder<IntervalsFilter> containedBy(Intervals v) {
-			this._kind = Kind.ContainedBy;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<IntervalsFilter> containedBy(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
-			return this.containedBy(fn.apply(new Intervals.Builder()).build());
-		}
-
-		public ObjectBuilder<IntervalsFilter> containing(Intervals v) {
-			this._kind = Kind.Containing;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<IntervalsFilter> containing(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
-			return this.containing(fn.apply(new Intervals.Builder()).build());
-		}
-
-		public ObjectBuilder<IntervalsFilter> notContainedBy(Intervals v) {
-			this._kind = Kind.NotContainedBy;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<IntervalsFilter> notContainedBy(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
-			return this.notContainedBy(fn.apply(new Intervals.Builder()).build());
-		}
-
-		public ObjectBuilder<IntervalsFilter> notContaining(Intervals v) {
-			this._kind = Kind.NotContaining;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<IntervalsFilter> notContaining(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
-			return this.notContaining(fn.apply(new Intervals.Builder()).build());
-		}
-
-		public ObjectBuilder<IntervalsFilter> notOverlapping(Intervals v) {
-			this._kind = Kind.NotOverlapping;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<IntervalsFilter> notOverlapping(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
-			return this.notOverlapping(fn.apply(new Intervals.Builder()).build());
-		}
-
-		public ObjectBuilder<IntervalsFilter> overlapping(Intervals v) {
-			this._kind = Kind.Overlapping;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<IntervalsFilter> overlapping(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
-			return this.overlapping(fn.apply(new Intervals.Builder()).build());
-		}
-
-		public ObjectBuilder<IntervalsFilter> script(Script v) {
-			this._kind = Kind.Script;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<IntervalsFilter> script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		public IntervalsFilter build() {
-			_checkSingleUse();
-			return new IntervalsFilter(this);
-		}
-
-	}
-
-	protected static void setupIntervalsFilterDeserializer(ObjectDeserializer<Builder> op) {
-
-		op.add(Builder::after, Intervals._DESERIALIZER, "after");
-		op.add(Builder::before, Intervals._DESERIALIZER, "before");
-		op.add(Builder::containedBy, Intervals._DESERIALIZER, "contained_by");
-		op.add(Builder::containing, Intervals._DESERIALIZER, "containing");
-		op.add(Builder::notContainedBy, Intervals._DESERIALIZER, "not_contained_by");
-		op.add(Builder::notContaining, Intervals._DESERIALIZER, "not_containing");
-		op.add(Builder::notOverlapping, Intervals._DESERIALIZER, "not_overlapping");
-		op.add(Builder::overlapping, Intervals._DESERIALIZER, "overlapping");
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-
-	}
-
-	public static final JsonpDeserializer<IntervalsFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IntervalsFilter::setupIntervalsFilterDeserializer, Builder::build);
+        public String jsonValue() {
+            return this.jsonValue;
+        }
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    public IntervalsFilter(IntervalsFilterVariant value) {
+
+        this._kind = ApiTypeHelper.requireNonNull(value._intervalsFilterKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+
+    }
+
+    private IntervalsFilter(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static IntervalsFilter of(Function<Builder, ObjectBuilder<IntervalsFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code after}?
+     */
+    public boolean isAfter() {
+        return _kind == Kind.After;
+    }
+
+    /**
+     * Get the {@code after} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code after} kind.
+     */
+    public Intervals after() {
+        return TaggedUnionUtils.get(this, Kind.After);
+    }
+
+    /**
+     * Is this variant instance of kind {@code before}?
+     */
+    public boolean isBefore() {
+        return _kind == Kind.Before;
+    }
+
+    /**
+     * Get the {@code before} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code before} kind.
+     */
+    public Intervals before() {
+        return TaggedUnionUtils.get(this, Kind.Before);
+    }
+
+    /**
+     * Is this variant instance of kind {@code contained_by}?
+     */
+    public boolean isContainedBy() {
+        return _kind == Kind.ContainedBy;
+    }
+
+    /**
+     * Get the {@code contained_by} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code contained_by} kind.
+     */
+    public Intervals containedBy() {
+        return TaggedUnionUtils.get(this, Kind.ContainedBy);
+    }
+
+    /**
+     * Is this variant instance of kind {@code containing}?
+     */
+    public boolean isContaining() {
+        return _kind == Kind.Containing;
+    }
+
+    /**
+     * Get the {@code containing} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code containing} kind.
+     */
+    public Intervals containing() {
+        return TaggedUnionUtils.get(this, Kind.Containing);
+    }
+
+    /**
+     * Is this variant instance of kind {@code not_contained_by}?
+     */
+    public boolean isNotContainedBy() {
+        return _kind == Kind.NotContainedBy;
+    }
+
+    /**
+     * Get the {@code not_contained_by} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code not_contained_by}
+     *             kind.
+     */
+    public Intervals notContainedBy() {
+        return TaggedUnionUtils.get(this, Kind.NotContainedBy);
+    }
+
+    /**
+     * Is this variant instance of kind {@code not_containing}?
+     */
+    public boolean isNotContaining() {
+        return _kind == Kind.NotContaining;
+    }
+
+    /**
+     * Get the {@code not_containing} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code not_containing} kind.
+     */
+    public Intervals notContaining() {
+        return TaggedUnionUtils.get(this, Kind.NotContaining);
+    }
+
+    /**
+     * Is this variant instance of kind {@code not_overlapping}?
+     */
+    public boolean isNotOverlapping() {
+        return _kind == Kind.NotOverlapping;
+    }
+
+    /**
+     * Get the {@code not_overlapping} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code not_overlapping}
+     *             kind.
+     */
+    public Intervals notOverlapping() {
+        return TaggedUnionUtils.get(this, Kind.NotOverlapping);
+    }
+
+    /**
+     * Is this variant instance of kind {@code overlapping}?
+     */
+    public boolean isOverlapping() {
+        return _kind == Kind.Overlapping;
+    }
+
+    /**
+     * Get the {@code overlapping} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code overlapping} kind.
+     */
+    public Intervals overlapping() {
+        return TaggedUnionUtils.get(this, Kind.Overlapping);
+    }
+
+    /**
+     * Is this variant instance of kind {@code script}?
+     */
+    public boolean isScript() {
+        return _kind == Kind.Script;
+    }
+
+    /**
+     * Get the {@code script} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code script} kind.
+     */
+    public Script script() {
+        return TaggedUnionUtils.get(this, Kind.Script);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeStartObject();
+
+        generator.writeKey(_kind.jsonValue());
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        }
+
+        generator.writeEnd();
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IntervalsFilter> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<IntervalsFilter> after(Intervals v) {
+            this._kind = Kind.After;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<IntervalsFilter> after(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
+            return this.after(fn.apply(new Intervals.Builder()).build());
+        }
+
+        public ObjectBuilder<IntervalsFilter> before(Intervals v) {
+            this._kind = Kind.Before;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<IntervalsFilter> before(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
+            return this.before(fn.apply(new Intervals.Builder()).build());
+        }
+
+        public ObjectBuilder<IntervalsFilter> containedBy(Intervals v) {
+            this._kind = Kind.ContainedBy;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<IntervalsFilter> containedBy(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
+            return this.containedBy(fn.apply(new Intervals.Builder()).build());
+        }
+
+        public ObjectBuilder<IntervalsFilter> containing(Intervals v) {
+            this._kind = Kind.Containing;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<IntervalsFilter> containing(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
+            return this.containing(fn.apply(new Intervals.Builder()).build());
+        }
+
+        public ObjectBuilder<IntervalsFilter> notContainedBy(Intervals v) {
+            this._kind = Kind.NotContainedBy;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<IntervalsFilter> notContainedBy(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
+            return this.notContainedBy(fn.apply(new Intervals.Builder()).build());
+        }
+
+        public ObjectBuilder<IntervalsFilter> notContaining(Intervals v) {
+            this._kind = Kind.NotContaining;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<IntervalsFilter> notContaining(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
+            return this.notContaining(fn.apply(new Intervals.Builder()).build());
+        }
+
+        public ObjectBuilder<IntervalsFilter> notOverlapping(Intervals v) {
+            this._kind = Kind.NotOverlapping;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<IntervalsFilter> notOverlapping(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
+            return this.notOverlapping(fn.apply(new Intervals.Builder()).build());
+        }
+
+        public ObjectBuilder<IntervalsFilter> overlapping(Intervals v) {
+            this._kind = Kind.Overlapping;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<IntervalsFilter> overlapping(Function<Intervals.Builder, ObjectBuilder<Intervals>> fn) {
+            return this.overlapping(fn.apply(new Intervals.Builder()).build());
+        }
+
+        public ObjectBuilder<IntervalsFilter> script(Script v) {
+            this._kind = Kind.Script;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<IntervalsFilter> script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        public IntervalsFilter build() {
+            _checkSingleUse();
+            return new IntervalsFilter(this);
+        }
+
+    }
+
+    protected static void setupIntervalsFilterDeserializer(ObjectDeserializer<Builder> op) {
+
+        op.add(Builder::after, Intervals._DESERIALIZER, "after");
+        op.add(Builder::before, Intervals._DESERIALIZER, "before");
+        op.add(Builder::containedBy, Intervals._DESERIALIZER, "contained_by");
+        op.add(Builder::containing, Intervals._DESERIALIZER, "containing");
+        op.add(Builder::notContainedBy, Intervals._DESERIALIZER, "not_contained_by");
+        op.add(Builder::notContaining, Intervals._DESERIALIZER, "not_containing");
+        op.add(Builder::notOverlapping, Intervals._DESERIALIZER, "not_overlapping");
+        op.add(Builder::overlapping, Intervals._DESERIALIZER, "overlapping");
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+
+    }
+
+    public static final JsonpDeserializer<IntervalsFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IntervalsFilter::setupIntervalsFilterDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsFilterBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsFilterBuilders.java
index 51e763ef5e..b99e06ee29 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsFilterBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsFilterBuilders.java
@@ -38,79 +38,78 @@
  * Builders for {@link IntervalsFilter} variants.
  */
 public class IntervalsFilterBuilders {
-	private IntervalsFilterBuilders() {
-	}
+    private IntervalsFilterBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link Intervals after} {@code IntervalsFilter}
-	 * variant.
-	 */
-	public static Intervals.Builder after() {
-		return new Intervals.Builder();
-	}
+    /**
+     * Creates a builder for the {@link Intervals after} {@code IntervalsFilter}
+     * variant.
+     */
+    public static Intervals.Builder after() {
+        return new Intervals.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link Intervals before} {@code IntervalsFilter}
-	 * variant.
-	 */
-	public static Intervals.Builder before() {
-		return new Intervals.Builder();
-	}
+    /**
+     * Creates a builder for the {@link Intervals before} {@code IntervalsFilter}
+     * variant.
+     */
+    public static Intervals.Builder before() {
+        return new Intervals.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link Intervals contained_by}
-	 * {@code IntervalsFilter} variant.
-	 */
-	public static Intervals.Builder containedBy() {
-		return new Intervals.Builder();
-	}
+    /**
+     * Creates a builder for the {@link Intervals contained_by}
+     * {@code IntervalsFilter} variant.
+     */
+    public static Intervals.Builder containedBy() {
+        return new Intervals.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link Intervals containing}
-	 * {@code IntervalsFilter} variant.
-	 */
-	public static Intervals.Builder containing() {
-		return new Intervals.Builder();
-	}
+    /**
+     * Creates a builder for the {@link Intervals containing}
+     * {@code IntervalsFilter} variant.
+     */
+    public static Intervals.Builder containing() {
+        return new Intervals.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link Intervals not_contained_by}
-	 * {@code IntervalsFilter} variant.
-	 */
-	public static Intervals.Builder notContainedBy() {
-		return new Intervals.Builder();
-	}
+    /**
+     * Creates a builder for the {@link Intervals not_contained_by}
+     * {@code IntervalsFilter} variant.
+     */
+    public static Intervals.Builder notContainedBy() {
+        return new Intervals.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link Intervals not_containing}
-	 * {@code IntervalsFilter} variant.
-	 */
-	public static Intervals.Builder notContaining() {
-		return new Intervals.Builder();
-	}
+    /**
+     * Creates a builder for the {@link Intervals not_containing}
+     * {@code IntervalsFilter} variant.
+     */
+    public static Intervals.Builder notContaining() {
+        return new Intervals.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link Intervals not_overlapping}
-	 * {@code IntervalsFilter} variant.
-	 */
-	public static Intervals.Builder notOverlapping() {
-		return new Intervals.Builder();
-	}
+    /**
+     * Creates a builder for the {@link Intervals not_overlapping}
+     * {@code IntervalsFilter} variant.
+     */
+    public static Intervals.Builder notOverlapping() {
+        return new Intervals.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link Intervals overlapping}
-	 * {@code IntervalsFilter} variant.
-	 */
-	public static Intervals.Builder overlapping() {
-		return new Intervals.Builder();
-	}
+    /**
+     * Creates a builder for the {@link Intervals overlapping}
+     * {@code IntervalsFilter} variant.
+     */
+    public static Intervals.Builder overlapping() {
+        return new Intervals.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link Script script} {@code IntervalsFilter}
-	 * variant.
-	 */
-	public static Script.Builder script() {
-		return new Script.Builder();
-	}
+    /**
+     * Creates a builder for the {@link Script script} {@code IntervalsFilter}
+     * variant.
+     */
+    public static Script.Builder script() {
+        return new Script.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsFilterVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsFilterVariant.java
index b1e838eb23..5c7bd47879 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsFilterVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsFilterVariant.java
@@ -37,10 +37,10 @@
  */
 public interface IntervalsFilterVariant {
 
-	IntervalsFilter.Kind _intervalsFilterKind();
+    IntervalsFilter.Kind _intervalsFilterKind();
 
-	default IntervalsFilter _toIntervalsFilter() {
-		return new IntervalsFilter(this);
-	}
+    default IntervalsFilter _toIntervalsFilter() {
+        return new IntervalsFilter(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsFuzzy.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsFuzzy.java
index e6db2282e8..82c155a5a6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsFuzzy.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsFuzzy.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,256 +44,254 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.IntervalsFuzzy
 
-
 @JsonpDeserializable
 public class IntervalsFuzzy implements IntervalsQueryVariant, IntervalsVariant, JsonpSerializable {
-	@Nullable
-	private final String analyzer;
-
-	@Nullable
-	private final String fuzziness;
-
-	@Nullable
-	private final Integer prefixLength;
-
-	private final String term;
-
-	@Nullable
-	private final Boolean transpositions;
-
-	@Nullable
-	private final String useField;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IntervalsFuzzy(Builder builder) {
-
-		this.analyzer = builder.analyzer;
-		this.fuzziness = builder.fuzziness;
-		this.prefixLength = builder.prefixLength;
-		this.term = ApiTypeHelper.requireNonNull(builder.term, this, "term");
-		this.transpositions = builder.transpositions;
-		this.useField = builder.useField;
-
-	}
-
-	public static IntervalsFuzzy of(Function<Builder, ObjectBuilder<IntervalsFuzzy>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * IntervalsQuery variant kind.
-	 */
-	@Override
-	public IntervalsQuery.Kind _intervalsQueryKind() {
-		return IntervalsQuery.Kind.Fuzzy;
-	}
-
-	/**
-	 * Intervals variant kind.
-	 */
-	@Override
-	public Intervals.Kind _intervalsKind() {
-		return Intervals.Kind.Fuzzy;
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * API name: {@code fuzziness}
-	 */
-	@Nullable
-	public final String fuzziness() {
-		return this.fuzziness;
-	}
-
-	/**
-	 * API name: {@code prefix_length}
-	 */
-	@Nullable
-	public final Integer prefixLength() {
-		return this.prefixLength;
-	}
-
-	/**
-	 * Required - API name: {@code term}
-	 */
-	public final String term() {
-		return this.term;
-	}
-
-	/**
-	 * API name: {@code transpositions}
-	 */
-	@Nullable
-	public final Boolean transpositions() {
-		return this.transpositions;
-	}
-
-	/**
-	 * API name: {@code use_field}
-	 */
-	@Nullable
-	public final String useField() {
-		return this.useField;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			generator.write(this.analyzer);
-
-		}
-		if (this.fuzziness != null) {
-			generator.writeKey("fuzziness");
-			generator.write(this.fuzziness);
-
-		}
-		if (this.prefixLength != null) {
-			generator.writeKey("prefix_length");
-			generator.write(this.prefixLength);
-
-		}
-		generator.writeKey("term");
-		generator.write(this.term);
-
-		if (this.transpositions != null) {
-			generator.writeKey("transpositions");
-			generator.write(this.transpositions);
-
-		}
-		if (this.useField != null) {
-			generator.writeKey("use_field");
-			generator.write(this.useField);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IntervalsFuzzy}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IntervalsFuzzy> {
-		@Nullable
-		private String analyzer;
-
-		@Nullable
-		private String fuzziness;
-
-		@Nullable
-		private Integer prefixLength;
-
-		private String term;
-
-		@Nullable
-		private Boolean transpositions;
-
-		@Nullable
-		private String useField;
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzziness}
-		 */
-		public final Builder fuzziness(@Nullable String value) {
-			this.fuzziness = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code prefix_length}
-		 */
-		public final Builder prefixLength(@Nullable Integer value) {
-			this.prefixLength = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code term}
-		 */
-		public final Builder term(String value) {
-			this.term = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code transpositions}
-		 */
-		public final Builder transpositions(@Nullable Boolean value) {
-			this.transpositions = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code use_field}
-		 */
-		public final Builder useField(@Nullable String value) {
-			this.useField = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IntervalsFuzzy}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IntervalsFuzzy build() {
-			_checkSingleUse();
-
-			return new IntervalsFuzzy(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IntervalsFuzzy}
-	 */
-	public static final JsonpDeserializer<IntervalsFuzzy> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IntervalsFuzzy::setupIntervalsFuzzyDeserializer);
-
-	protected static void setupIntervalsFuzzyDeserializer(ObjectDeserializer<IntervalsFuzzy.Builder> op) {
-
-		op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(Builder::fuzziness, JsonpDeserializer.stringDeserializer(), "fuzziness");
-		op.add(Builder::prefixLength, JsonpDeserializer.integerDeserializer(), "prefix_length");
-		op.add(Builder::term, JsonpDeserializer.stringDeserializer(), "term");
-		op.add(Builder::transpositions, JsonpDeserializer.booleanDeserializer(), "transpositions");
-		op.add(Builder::useField, JsonpDeserializer.stringDeserializer(), "use_field");
-
-	}
+    @Nullable
+    private final String analyzer;
+
+    @Nullable
+    private final String fuzziness;
+
+    @Nullable
+    private final Integer prefixLength;
+
+    private final String term;
+
+    @Nullable
+    private final Boolean transpositions;
+
+    @Nullable
+    private final String useField;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IntervalsFuzzy(Builder builder) {
+
+        this.analyzer = builder.analyzer;
+        this.fuzziness = builder.fuzziness;
+        this.prefixLength = builder.prefixLength;
+        this.term = ApiTypeHelper.requireNonNull(builder.term, this, "term");
+        this.transpositions = builder.transpositions;
+        this.useField = builder.useField;
+
+    }
+
+    public static IntervalsFuzzy of(Function<Builder, ObjectBuilder<IntervalsFuzzy>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * IntervalsQuery variant kind.
+     */
+    @Override
+    public IntervalsQuery.Kind _intervalsQueryKind() {
+        return IntervalsQuery.Kind.Fuzzy;
+    }
+
+    /**
+     * Intervals variant kind.
+     */
+    @Override
+    public Intervals.Kind _intervalsKind() {
+        return Intervals.Kind.Fuzzy;
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * API name: {@code fuzziness}
+     */
+    @Nullable
+    public final String fuzziness() {
+        return this.fuzziness;
+    }
+
+    /**
+     * API name: {@code prefix_length}
+     */
+    @Nullable
+    public final Integer prefixLength() {
+        return this.prefixLength;
+    }
+
+    /**
+     * Required - API name: {@code term}
+     */
+    public final String term() {
+        return this.term;
+    }
+
+    /**
+     * API name: {@code transpositions}
+     */
+    @Nullable
+    public final Boolean transpositions() {
+        return this.transpositions;
+    }
+
+    /**
+     * API name: {@code use_field}
+     */
+    @Nullable
+    public final String useField() {
+        return this.useField;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            generator.write(this.analyzer);
+
+        }
+        if (this.fuzziness != null) {
+            generator.writeKey("fuzziness");
+            generator.write(this.fuzziness);
+
+        }
+        if (this.prefixLength != null) {
+            generator.writeKey("prefix_length");
+            generator.write(this.prefixLength);
+
+        }
+        generator.writeKey("term");
+        generator.write(this.term);
+
+        if (this.transpositions != null) {
+            generator.writeKey("transpositions");
+            generator.write(this.transpositions);
+
+        }
+        if (this.useField != null) {
+            generator.writeKey("use_field");
+            generator.write(this.useField);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IntervalsFuzzy}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IntervalsFuzzy> {
+        @Nullable
+        private String analyzer;
+
+        @Nullable
+        private String fuzziness;
+
+        @Nullable
+        private Integer prefixLength;
+
+        private String term;
+
+        @Nullable
+        private Boolean transpositions;
+
+        @Nullable
+        private String useField;
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzziness}
+         */
+        public final Builder fuzziness(@Nullable String value) {
+            this.fuzziness = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code prefix_length}
+         */
+        public final Builder prefixLength(@Nullable Integer value) {
+            this.prefixLength = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code term}
+         */
+        public final Builder term(String value) {
+            this.term = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code transpositions}
+         */
+        public final Builder transpositions(@Nullable Boolean value) {
+            this.transpositions = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code use_field}
+         */
+        public final Builder useField(@Nullable String value) {
+            this.useField = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link IntervalsFuzzy}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IntervalsFuzzy build() {
+            _checkSingleUse();
+
+            return new IntervalsFuzzy(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IntervalsFuzzy}
+     */
+    public static final JsonpDeserializer<IntervalsFuzzy> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IntervalsFuzzy::setupIntervalsFuzzyDeserializer
+    );
+
+    protected static void setupIntervalsFuzzyDeserializer(ObjectDeserializer<IntervalsFuzzy.Builder> op) {
+
+        op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(Builder::fuzziness, JsonpDeserializer.stringDeserializer(), "fuzziness");
+        op.add(Builder::prefixLength, JsonpDeserializer.integerDeserializer(), "prefix_length");
+        op.add(Builder::term, JsonpDeserializer.stringDeserializer(), "term");
+        op.add(Builder::transpositions, JsonpDeserializer.booleanDeserializer(), "transpositions");
+        op.add(Builder::useField, JsonpDeserializer.stringDeserializer(), "use_field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsMatch.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsMatch.java
index 99c8ed1fe2..c4da1a6b68 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsMatch.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsMatch.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,263 +44,261 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.IntervalsMatch
 
-
 @JsonpDeserializable
 public class IntervalsMatch implements IntervalsQueryVariant, IntervalsVariant, JsonpSerializable {
-	@Nullable
-	private final String analyzer;
-
-	@Nullable
-	private final Integer maxGaps;
-
-	@Nullable
-	private final Boolean ordered;
-
-	private final String query;
-
-	@Nullable
-	private final String useField;
-
-	@Nullable
-	private final IntervalsFilter filter;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IntervalsMatch(Builder builder) {
-
-		this.analyzer = builder.analyzer;
-		this.maxGaps = builder.maxGaps;
-		this.ordered = builder.ordered;
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-		this.useField = builder.useField;
-		this.filter = builder.filter;
-
-	}
-
-	public static IntervalsMatch of(Function<Builder, ObjectBuilder<IntervalsMatch>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * IntervalsQuery variant kind.
-	 */
-	@Override
-	public IntervalsQuery.Kind _intervalsQueryKind() {
-		return IntervalsQuery.Kind.Match;
-	}
-
-	/**
-	 * Intervals variant kind.
-	 */
-	@Override
-	public Intervals.Kind _intervalsKind() {
-		return Intervals.Kind.Match;
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * API name: {@code max_gaps}
-	 */
-	@Nullable
-	public final Integer maxGaps() {
-		return this.maxGaps;
-	}
-
-	/**
-	 * API name: {@code ordered}
-	 */
-	@Nullable
-	public final Boolean ordered() {
-		return this.ordered;
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final String query() {
-		return this.query;
-	}
-
-	/**
-	 * API name: {@code use_field}
-	 */
-	@Nullable
-	public final String useField() {
-		return this.useField;
-	}
-
-	/**
-	 * API name: {@code filter}
-	 */
-	@Nullable
-	public final IntervalsFilter filter() {
-		return this.filter;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			generator.write(this.analyzer);
-
-		}
-		if (this.maxGaps != null) {
-			generator.writeKey("max_gaps");
-			generator.write(this.maxGaps);
-
-		}
-		if (this.ordered != null) {
-			generator.writeKey("ordered");
-			generator.write(this.ordered);
-
-		}
-		generator.writeKey("query");
-		generator.write(this.query);
-
-		if (this.useField != null) {
-			generator.writeKey("use_field");
-			generator.write(this.useField);
-
-		}
-		if (this.filter != null) {
-			generator.writeKey("filter");
-			this.filter.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IntervalsMatch}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IntervalsMatch> {
-		@Nullable
-		private String analyzer;
-
-		@Nullable
-		private Integer maxGaps;
-
-		@Nullable
-		private Boolean ordered;
-
-		private String query;
-
-		@Nullable
-		private String useField;
-
-		@Nullable
-		private IntervalsFilter filter;
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_gaps}
-		 */
-		public final Builder maxGaps(@Nullable Integer value) {
-			this.maxGaps = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ordered}
-		 */
-		public final Builder ordered(@Nullable Boolean value) {
-			this.ordered = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(String value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code use_field}
-		 */
-		public final Builder useField(@Nullable String value) {
-			this.useField = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(@Nullable IntervalsFilter value) {
-			this.filter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(Function<IntervalsFilter.Builder, ObjectBuilder<IntervalsFilter>> fn) {
-			return this.filter(fn.apply(new IntervalsFilter.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link IntervalsMatch}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IntervalsMatch build() {
-			_checkSingleUse();
-
-			return new IntervalsMatch(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IntervalsMatch}
-	 */
-	public static final JsonpDeserializer<IntervalsMatch> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IntervalsMatch::setupIntervalsMatchDeserializer);
-
-	protected static void setupIntervalsMatchDeserializer(ObjectDeserializer<IntervalsMatch.Builder> op) {
-
-		op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(Builder::maxGaps, JsonpDeserializer.integerDeserializer(), "max_gaps");
-		op.add(Builder::ordered, JsonpDeserializer.booleanDeserializer(), "ordered");
-		op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
-		op.add(Builder::useField, JsonpDeserializer.stringDeserializer(), "use_field");
-		op.add(Builder::filter, IntervalsFilter._DESERIALIZER, "filter");
-
-	}
+    @Nullable
+    private final String analyzer;
+
+    @Nullable
+    private final Integer maxGaps;
+
+    @Nullable
+    private final Boolean ordered;
+
+    private final String query;
+
+    @Nullable
+    private final String useField;
+
+    @Nullable
+    private final IntervalsFilter filter;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IntervalsMatch(Builder builder) {
+
+        this.analyzer = builder.analyzer;
+        this.maxGaps = builder.maxGaps;
+        this.ordered = builder.ordered;
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+        this.useField = builder.useField;
+        this.filter = builder.filter;
+
+    }
+
+    public static IntervalsMatch of(Function<Builder, ObjectBuilder<IntervalsMatch>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * IntervalsQuery variant kind.
+     */
+    @Override
+    public IntervalsQuery.Kind _intervalsQueryKind() {
+        return IntervalsQuery.Kind.Match;
+    }
+
+    /**
+     * Intervals variant kind.
+     */
+    @Override
+    public Intervals.Kind _intervalsKind() {
+        return Intervals.Kind.Match;
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * API name: {@code max_gaps}
+     */
+    @Nullable
+    public final Integer maxGaps() {
+        return this.maxGaps;
+    }
+
+    /**
+     * API name: {@code ordered}
+     */
+    @Nullable
+    public final Boolean ordered() {
+        return this.ordered;
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final String query() {
+        return this.query;
+    }
+
+    /**
+     * API name: {@code use_field}
+     */
+    @Nullable
+    public final String useField() {
+        return this.useField;
+    }
+
+    /**
+     * API name: {@code filter}
+     */
+    @Nullable
+    public final IntervalsFilter filter() {
+        return this.filter;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            generator.write(this.analyzer);
+
+        }
+        if (this.maxGaps != null) {
+            generator.writeKey("max_gaps");
+            generator.write(this.maxGaps);
+
+        }
+        if (this.ordered != null) {
+            generator.writeKey("ordered");
+            generator.write(this.ordered);
+
+        }
+        generator.writeKey("query");
+        generator.write(this.query);
+
+        if (this.useField != null) {
+            generator.writeKey("use_field");
+            generator.write(this.useField);
+
+        }
+        if (this.filter != null) {
+            generator.writeKey("filter");
+            this.filter.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IntervalsMatch}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IntervalsMatch> {
+        @Nullable
+        private String analyzer;
+
+        @Nullable
+        private Integer maxGaps;
+
+        @Nullable
+        private Boolean ordered;
+
+        private String query;
+
+        @Nullable
+        private String useField;
+
+        @Nullable
+        private IntervalsFilter filter;
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_gaps}
+         */
+        public final Builder maxGaps(@Nullable Integer value) {
+            this.maxGaps = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ordered}
+         */
+        public final Builder ordered(@Nullable Boolean value) {
+            this.ordered = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(String value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code use_field}
+         */
+        public final Builder useField(@Nullable String value) {
+            this.useField = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(@Nullable IntervalsFilter value) {
+            this.filter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(Function<IntervalsFilter.Builder, ObjectBuilder<IntervalsFilter>> fn) {
+            return this.filter(fn.apply(new IntervalsFilter.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link IntervalsMatch}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IntervalsMatch build() {
+            _checkSingleUse();
+
+            return new IntervalsMatch(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IntervalsMatch}
+     */
+    public static final JsonpDeserializer<IntervalsMatch> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IntervalsMatch::setupIntervalsMatchDeserializer
+    );
+
+    protected static void setupIntervalsMatchDeserializer(ObjectDeserializer<IntervalsMatch.Builder> op) {
+
+        op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(Builder::maxGaps, JsonpDeserializer.integerDeserializer(), "max_gaps");
+        op.add(Builder::ordered, JsonpDeserializer.booleanDeserializer(), "ordered");
+        op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
+        op.add(Builder::useField, JsonpDeserializer.stringDeserializer(), "use_field");
+        op.add(Builder::filter, IntervalsFilter._DESERIALIZER, "filter");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsPrefix.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsPrefix.java
index ea1079df0b..eba3c81be4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsPrefix.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsPrefix.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,169 +44,167 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.IntervalsPrefix
 
-
 @JsonpDeserializable
 public class IntervalsPrefix implements IntervalsQueryVariant, IntervalsVariant, JsonpSerializable {
-	@Nullable
-	private final String analyzer;
+    @Nullable
+    private final String analyzer;
 
-	private final String prefix;
-
-	@Nullable
-	private final String useField;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IntervalsPrefix(Builder builder) {
-
-		this.analyzer = builder.analyzer;
-		this.prefix = ApiTypeHelper.requireNonNull(builder.prefix, this, "prefix");
-		this.useField = builder.useField;
-
-	}
-
-	public static IntervalsPrefix of(Function<Builder, ObjectBuilder<IntervalsPrefix>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * IntervalsQuery variant kind.
-	 */
-	@Override
-	public IntervalsQuery.Kind _intervalsQueryKind() {
-		return IntervalsQuery.Kind.Prefix;
-	}
-
-	/**
-	 * Intervals variant kind.
-	 */
-	@Override
-	public Intervals.Kind _intervalsKind() {
-		return Intervals.Kind.Prefix;
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * Required - API name: {@code prefix}
-	 */
-	public final String prefix() {
-		return this.prefix;
-	}
-
-	/**
-	 * API name: {@code use_field}
-	 */
-	@Nullable
-	public final String useField() {
-		return this.useField;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			generator.write(this.analyzer);
-
-		}
-		generator.writeKey("prefix");
-		generator.write(this.prefix);
-
-		if (this.useField != null) {
-			generator.writeKey("use_field");
-			generator.write(this.useField);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IntervalsPrefix}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IntervalsPrefix> {
-		@Nullable
-		private String analyzer;
-
-		private String prefix;
-
-		@Nullable
-		private String useField;
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code prefix}
-		 */
-		public final Builder prefix(String value) {
-			this.prefix = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code use_field}
-		 */
-		public final Builder useField(@Nullable String value) {
-			this.useField = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IntervalsPrefix}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IntervalsPrefix build() {
-			_checkSingleUse();
-
-			return new IntervalsPrefix(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IntervalsPrefix}
-	 */
-	public static final JsonpDeserializer<IntervalsPrefix> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IntervalsPrefix::setupIntervalsPrefixDeserializer);
-
-	protected static void setupIntervalsPrefixDeserializer(ObjectDeserializer<IntervalsPrefix.Builder> op) {
-
-		op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(Builder::prefix, JsonpDeserializer.stringDeserializer(), "prefix");
-		op.add(Builder::useField, JsonpDeserializer.stringDeserializer(), "use_field");
-
-	}
+    private final String prefix;
+
+    @Nullable
+    private final String useField;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IntervalsPrefix(Builder builder) {
+
+        this.analyzer = builder.analyzer;
+        this.prefix = ApiTypeHelper.requireNonNull(builder.prefix, this, "prefix");
+        this.useField = builder.useField;
+
+    }
+
+    public static IntervalsPrefix of(Function<Builder, ObjectBuilder<IntervalsPrefix>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * IntervalsQuery variant kind.
+     */
+    @Override
+    public IntervalsQuery.Kind _intervalsQueryKind() {
+        return IntervalsQuery.Kind.Prefix;
+    }
+
+    /**
+     * Intervals variant kind.
+     */
+    @Override
+    public Intervals.Kind _intervalsKind() {
+        return Intervals.Kind.Prefix;
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * Required - API name: {@code prefix}
+     */
+    public final String prefix() {
+        return this.prefix;
+    }
+
+    /**
+     * API name: {@code use_field}
+     */
+    @Nullable
+    public final String useField() {
+        return this.useField;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            generator.write(this.analyzer);
+
+        }
+        generator.writeKey("prefix");
+        generator.write(this.prefix);
+
+        if (this.useField != null) {
+            generator.writeKey("use_field");
+            generator.write(this.useField);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IntervalsPrefix}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IntervalsPrefix> {
+        @Nullable
+        private String analyzer;
+
+        private String prefix;
+
+        @Nullable
+        private String useField;
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code prefix}
+         */
+        public final Builder prefix(String value) {
+            this.prefix = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code use_field}
+         */
+        public final Builder useField(@Nullable String value) {
+            this.useField = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link IntervalsPrefix}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IntervalsPrefix build() {
+            _checkSingleUse();
+
+            return new IntervalsPrefix(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IntervalsPrefix}
+     */
+    public static final JsonpDeserializer<IntervalsPrefix> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IntervalsPrefix::setupIntervalsPrefixDeserializer
+    );
+
+    protected static void setupIntervalsPrefixDeserializer(ObjectDeserializer<IntervalsPrefix.Builder> op) {
+
+        op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(Builder::prefix, JsonpDeserializer.stringDeserializer(), "prefix");
+        op.add(Builder::useField, JsonpDeserializer.stringDeserializer(), "use_field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsQuery.java
index 1d377801cc..2b241325c7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsQuery.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -43,319 +45,314 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.IntervalsQuery
 
-
 @JsonpDeserializable
-public class IntervalsQuery extends QueryBase
-		implements
-			TaggedUnion<IntervalsQuery.Kind, Object>,
-			QueryVariant,
-			JsonpSerializable {
-
-	/**
-	 * {@link IntervalsQuery} variant kinds.
-	 */
-	/**
-	 * {@link IntervalsQuery} variant kinds.
-	 */
-
-	public enum Kind implements JsonEnum {
-		AllOf("all_of"),
-
-		AnyOf("any_of"),
-
-		Fuzzy("fuzzy"),
-
-		Match("match"),
-
-		Prefix("prefix"),
-
-		Wildcard("wildcard"),
-
-		;
-
-		private final String jsonValue;
-
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
-
-		public String jsonValue() {
-			return this.jsonValue;
-		}
-
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Intervals;
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	// Single key dictionary
-	private final String field;
-
-	private IntervalsQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static IntervalsQuery of(Function<Builder, ObjectBuilder<IntervalsQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - The target field
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Is this variant instance of kind {@code all_of}?
-	 */
-	public boolean isAllOf() {
-		return _kind == Kind.AllOf;
-	}
-
-	/**
-	 * Get the {@code all_of} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code all_of} kind.
-	 */
-	public IntervalsAllOf allOf() {
-		return TaggedUnionUtils.get(this, Kind.AllOf);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code any_of}?
-	 */
-	public boolean isAnyOf() {
-		return _kind == Kind.AnyOf;
-	}
-
-	/**
-	 * Get the {@code any_of} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code any_of} kind.
-	 */
-	public IntervalsAnyOf anyOf() {
-		return TaggedUnionUtils.get(this, Kind.AnyOf);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code fuzzy}?
-	 */
-	public boolean isFuzzy() {
-		return _kind == Kind.Fuzzy;
-	}
-
-	/**
-	 * Get the {@code fuzzy} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code fuzzy} kind.
-	 */
-	public IntervalsFuzzy fuzzy() {
-		return TaggedUnionUtils.get(this, Kind.Fuzzy);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code match}?
-	 */
-	public boolean isMatch() {
-		return _kind == Kind.Match;
-	}
-
-	/**
-	 * Get the {@code match} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code match} kind.
-	 */
-	public IntervalsMatch match() {
-		return TaggedUnionUtils.get(this, Kind.Match);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code prefix}?
-	 */
-	public boolean isPrefix() {
-		return _kind == Kind.Prefix;
-	}
-
-	/**
-	 * Get the {@code prefix} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code prefix} kind.
-	 */
-	public IntervalsPrefix prefix() {
-		return TaggedUnionUtils.get(this, Kind.Prefix);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code wildcard}?
-	 */
-	public boolean isWildcard() {
-		return _kind == Kind.Wildcard;
-	}
-
-	/**
-	 * Get the {@code wildcard} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code wildcard} kind.
-	 */
-	public IntervalsWildcard wildcard() {
-		return TaggedUnionUtils.get(this, Kind.Wildcard);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeStartObject();
-		generator.writeStartObject(this.field);
-
-		super.serializeInternal(generator, mapper);
-
-		generator.writeKey(_kind.jsonValue());
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		}
-
-		generator.writeEnd();
-
-		generator.writeEnd();
-
-	}
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<IntervalsQuery> {
-		private Kind _kind;
-		private Object _value;
-
-		private String field;
-
-		/**
-		 * Required - The target field
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-		public ObjectBuilder<IntervalsQuery> allOf(IntervalsAllOf v) {
-			this._kind = Kind.AllOf;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<IntervalsQuery> allOf(Function<IntervalsAllOf.Builder, ObjectBuilder<IntervalsAllOf>> fn) {
-			return this.allOf(fn.apply(new IntervalsAllOf.Builder()).build());
-		}
-
-		public ObjectBuilder<IntervalsQuery> anyOf(IntervalsAnyOf v) {
-			this._kind = Kind.AnyOf;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<IntervalsQuery> anyOf(Function<IntervalsAnyOf.Builder, ObjectBuilder<IntervalsAnyOf>> fn) {
-			return this.anyOf(fn.apply(new IntervalsAnyOf.Builder()).build());
-		}
-
-		public ObjectBuilder<IntervalsQuery> fuzzy(IntervalsFuzzy v) {
-			this._kind = Kind.Fuzzy;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<IntervalsQuery> fuzzy(Function<IntervalsFuzzy.Builder, ObjectBuilder<IntervalsFuzzy>> fn) {
-			return this.fuzzy(fn.apply(new IntervalsFuzzy.Builder()).build());
-		}
-
-		public ObjectBuilder<IntervalsQuery> match(IntervalsMatch v) {
-			this._kind = Kind.Match;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<IntervalsQuery> match(Function<IntervalsMatch.Builder, ObjectBuilder<IntervalsMatch>> fn) {
-			return this.match(fn.apply(new IntervalsMatch.Builder()).build());
-		}
-
-		public ObjectBuilder<IntervalsQuery> prefix(IntervalsPrefix v) {
-			this._kind = Kind.Prefix;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<IntervalsQuery> prefix(
-				Function<IntervalsPrefix.Builder, ObjectBuilder<IntervalsPrefix>> fn) {
-			return this.prefix(fn.apply(new IntervalsPrefix.Builder()).build());
-		}
-
-		public ObjectBuilder<IntervalsQuery> wildcard(IntervalsWildcard v) {
-			this._kind = Kind.Wildcard;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<IntervalsQuery> wildcard(
-				Function<IntervalsWildcard.Builder, ObjectBuilder<IntervalsWildcard>> fn) {
-			return this.wildcard(fn.apply(new IntervalsWildcard.Builder()).build());
-		}
-
-		public IntervalsQuery build() {
-			_checkSingleUse();
-			return new IntervalsQuery(this);
-		}
-
-	}
-
-	protected static void setupIntervalsQueryDeserializer(ObjectDeserializer<Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::allOf, IntervalsAllOf._DESERIALIZER, "all_of");
-		op.add(Builder::anyOf, IntervalsAnyOf._DESERIALIZER, "any_of");
-		op.add(Builder::fuzzy, IntervalsFuzzy._DESERIALIZER, "fuzzy");
-		op.add(Builder::match, IntervalsMatch._DESERIALIZER, "match");
-		op.add(Builder::prefix, IntervalsPrefix._DESERIALIZER, "prefix");
-		op.add(Builder::wildcard, IntervalsWildcard._DESERIALIZER, "wildcard");
-
-		op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
-
-	}
-
-	public static final JsonpDeserializer<IntervalsQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IntervalsQuery::setupIntervalsQueryDeserializer, Builder::build);
+public class IntervalsQuery extends QueryBase implements TaggedUnion<IntervalsQuery.Kind, Object>, QueryVariant, JsonpSerializable {
+
+    /**
+     * {@link IntervalsQuery} variant kinds.
+     */
+    /**
+     * {@link IntervalsQuery} variant kinds.
+     */
+
+    public enum Kind implements JsonEnum {
+        AllOf("all_of"),
+
+        AnyOf("any_of"),
+
+        Fuzzy("fuzzy"),
+
+        Match("match"),
+
+        Prefix("prefix"),
+
+        Wildcard("wildcard"),
+
+        ;
+
+        private final String jsonValue;
+
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
+
+        public String jsonValue() {
+            return this.jsonValue;
+        }
+
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Intervals;
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    // Single key dictionary
+    private final String field;
+
+    private IntervalsQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static IntervalsQuery of(Function<Builder, ObjectBuilder<IntervalsQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - The target field
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Is this variant instance of kind {@code all_of}?
+     */
+    public boolean isAllOf() {
+        return _kind == Kind.AllOf;
+    }
+
+    /**
+     * Get the {@code all_of} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code all_of} kind.
+     */
+    public IntervalsAllOf allOf() {
+        return TaggedUnionUtils.get(this, Kind.AllOf);
+    }
+
+    /**
+     * Is this variant instance of kind {@code any_of}?
+     */
+    public boolean isAnyOf() {
+        return _kind == Kind.AnyOf;
+    }
+
+    /**
+     * Get the {@code any_of} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code any_of} kind.
+     */
+    public IntervalsAnyOf anyOf() {
+        return TaggedUnionUtils.get(this, Kind.AnyOf);
+    }
+
+    /**
+     * Is this variant instance of kind {@code fuzzy}?
+     */
+    public boolean isFuzzy() {
+        return _kind == Kind.Fuzzy;
+    }
+
+    /**
+     * Get the {@code fuzzy} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code fuzzy} kind.
+     */
+    public IntervalsFuzzy fuzzy() {
+        return TaggedUnionUtils.get(this, Kind.Fuzzy);
+    }
+
+    /**
+     * Is this variant instance of kind {@code match}?
+     */
+    public boolean isMatch() {
+        return _kind == Kind.Match;
+    }
+
+    /**
+     * Get the {@code match} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code match} kind.
+     */
+    public IntervalsMatch match() {
+        return TaggedUnionUtils.get(this, Kind.Match);
+    }
+
+    /**
+     * Is this variant instance of kind {@code prefix}?
+     */
+    public boolean isPrefix() {
+        return _kind == Kind.Prefix;
+    }
+
+    /**
+     * Get the {@code prefix} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code prefix} kind.
+     */
+    public IntervalsPrefix prefix() {
+        return TaggedUnionUtils.get(this, Kind.Prefix);
+    }
+
+    /**
+     * Is this variant instance of kind {@code wildcard}?
+     */
+    public boolean isWildcard() {
+        return _kind == Kind.Wildcard;
+    }
+
+    /**
+     * Get the {@code wildcard} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code wildcard} kind.
+     */
+    public IntervalsWildcard wildcard() {
+        return TaggedUnionUtils.get(this, Kind.Wildcard);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeStartObject();
+        generator.writeStartObject(this.field);
+
+        super.serializeInternal(generator, mapper);
+
+        generator.writeKey(_kind.jsonValue());
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        }
+
+        generator.writeEnd();
+
+        generator.writeEnd();
+
+    }
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<IntervalsQuery> {
+        private Kind _kind;
+        private Object _value;
+
+        private String field;
+
+        /**
+         * Required - The target field
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        public ObjectBuilder<IntervalsQuery> allOf(IntervalsAllOf v) {
+            this._kind = Kind.AllOf;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<IntervalsQuery> allOf(Function<IntervalsAllOf.Builder, ObjectBuilder<IntervalsAllOf>> fn) {
+            return this.allOf(fn.apply(new IntervalsAllOf.Builder()).build());
+        }
+
+        public ObjectBuilder<IntervalsQuery> anyOf(IntervalsAnyOf v) {
+            this._kind = Kind.AnyOf;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<IntervalsQuery> anyOf(Function<IntervalsAnyOf.Builder, ObjectBuilder<IntervalsAnyOf>> fn) {
+            return this.anyOf(fn.apply(new IntervalsAnyOf.Builder()).build());
+        }
+
+        public ObjectBuilder<IntervalsQuery> fuzzy(IntervalsFuzzy v) {
+            this._kind = Kind.Fuzzy;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<IntervalsQuery> fuzzy(Function<IntervalsFuzzy.Builder, ObjectBuilder<IntervalsFuzzy>> fn) {
+            return this.fuzzy(fn.apply(new IntervalsFuzzy.Builder()).build());
+        }
+
+        public ObjectBuilder<IntervalsQuery> match(IntervalsMatch v) {
+            this._kind = Kind.Match;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<IntervalsQuery> match(Function<IntervalsMatch.Builder, ObjectBuilder<IntervalsMatch>> fn) {
+            return this.match(fn.apply(new IntervalsMatch.Builder()).build());
+        }
+
+        public ObjectBuilder<IntervalsQuery> prefix(IntervalsPrefix v) {
+            this._kind = Kind.Prefix;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<IntervalsQuery> prefix(Function<IntervalsPrefix.Builder, ObjectBuilder<IntervalsPrefix>> fn) {
+            return this.prefix(fn.apply(new IntervalsPrefix.Builder()).build());
+        }
+
+        public ObjectBuilder<IntervalsQuery> wildcard(IntervalsWildcard v) {
+            this._kind = Kind.Wildcard;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<IntervalsQuery> wildcard(Function<IntervalsWildcard.Builder, ObjectBuilder<IntervalsWildcard>> fn) {
+            return this.wildcard(fn.apply(new IntervalsWildcard.Builder()).build());
+        }
+
+        public IntervalsQuery build() {
+            _checkSingleUse();
+            return new IntervalsQuery(this);
+        }
+
+    }
+
+    protected static void setupIntervalsQueryDeserializer(ObjectDeserializer<Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::allOf, IntervalsAllOf._DESERIALIZER, "all_of");
+        op.add(Builder::anyOf, IntervalsAnyOf._DESERIALIZER, "any_of");
+        op.add(Builder::fuzzy, IntervalsFuzzy._DESERIALIZER, "fuzzy");
+        op.add(Builder::match, IntervalsMatch._DESERIALIZER, "match");
+        op.add(Builder::prefix, IntervalsPrefix._DESERIALIZER, "prefix");
+        op.add(Builder::wildcard, IntervalsWildcard._DESERIALIZER, "wildcard");
+
+        op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
+
+    }
+
+    public static final JsonpDeserializer<IntervalsQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IntervalsQuery::setupIntervalsQueryDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsQueryBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsQueryBuilders.java
index b6a64aa8db..2de3159919 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsQueryBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsQueryBuilders.java
@@ -36,55 +36,54 @@
  * Builders for {@link IntervalsQuery} variants.
  */
 public class IntervalsQueryBuilders {
-	private IntervalsQueryBuilders() {
-	}
+    private IntervalsQueryBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link IntervalsAllOf all_of}
-	 * {@code IntervalsQuery} variant.
-	 */
-	public static IntervalsAllOf.Builder allOf() {
-		return new IntervalsAllOf.Builder();
-	}
+    /**
+     * Creates a builder for the {@link IntervalsAllOf all_of}
+     * {@code IntervalsQuery} variant.
+     */
+    public static IntervalsAllOf.Builder allOf() {
+        return new IntervalsAllOf.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link IntervalsAnyOf any_of}
-	 * {@code IntervalsQuery} variant.
-	 */
-	public static IntervalsAnyOf.Builder anyOf() {
-		return new IntervalsAnyOf.Builder();
-	}
+    /**
+     * Creates a builder for the {@link IntervalsAnyOf any_of}
+     * {@code IntervalsQuery} variant.
+     */
+    public static IntervalsAnyOf.Builder anyOf() {
+        return new IntervalsAnyOf.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link IntervalsFuzzy fuzzy} {@code IntervalsQuery}
-	 * variant.
-	 */
-	public static IntervalsFuzzy.Builder fuzzy() {
-		return new IntervalsFuzzy.Builder();
-	}
+    /**
+     * Creates a builder for the {@link IntervalsFuzzy fuzzy} {@code IntervalsQuery}
+     * variant.
+     */
+    public static IntervalsFuzzy.Builder fuzzy() {
+        return new IntervalsFuzzy.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link IntervalsMatch match} {@code IntervalsQuery}
-	 * variant.
-	 */
-	public static IntervalsMatch.Builder match() {
-		return new IntervalsMatch.Builder();
-	}
+    /**
+     * Creates a builder for the {@link IntervalsMatch match} {@code IntervalsQuery}
+     * variant.
+     */
+    public static IntervalsMatch.Builder match() {
+        return new IntervalsMatch.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link IntervalsPrefix prefix}
-	 * {@code IntervalsQuery} variant.
-	 */
-	public static IntervalsPrefix.Builder prefix() {
-		return new IntervalsPrefix.Builder();
-	}
+    /**
+     * Creates a builder for the {@link IntervalsPrefix prefix}
+     * {@code IntervalsQuery} variant.
+     */
+    public static IntervalsPrefix.Builder prefix() {
+        return new IntervalsPrefix.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link IntervalsWildcard wildcard}
-	 * {@code IntervalsQuery} variant.
-	 */
-	public static IntervalsWildcard.Builder wildcard() {
-		return new IntervalsWildcard.Builder();
-	}
+    /**
+     * Creates a builder for the {@link IntervalsWildcard wildcard}
+     * {@code IntervalsQuery} variant.
+     */
+    public static IntervalsWildcard.Builder wildcard() {
+        return new IntervalsWildcard.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsQueryVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsQueryVariant.java
index b2d3c4acfa..66d66f811a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsQueryVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsQueryVariant.java
@@ -37,6 +37,6 @@
  */
 public interface IntervalsQueryVariant {
 
-	IntervalsQuery.Kind _intervalsQueryKind();
+    IntervalsQuery.Kind _intervalsQueryKind();
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsVariant.java
index b7776458d7..3405c6ac20 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsVariant.java
@@ -37,10 +37,10 @@
  */
 public interface IntervalsVariant {
 
-	Intervals.Kind _intervalsKind();
+    Intervals.Kind _intervalsKind();
 
-	default Intervals _toIntervals() {
-		return new Intervals(this);
-	}
+    default Intervals _toIntervals() {
+        return new Intervals(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsWildcard.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsWildcard.java
index dad54c5063..23eb571b37 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsWildcard.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/IntervalsWildcard.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,169 +44,167 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.IntervalsWildcard
 
-
 @JsonpDeserializable
 public class IntervalsWildcard implements IntervalsQueryVariant, IntervalsVariant, JsonpSerializable {
-	@Nullable
-	private final String analyzer;
+    @Nullable
+    private final String analyzer;
 
-	private final String pattern;
-
-	@Nullable
-	private final String useField;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IntervalsWildcard(Builder builder) {
-
-		this.analyzer = builder.analyzer;
-		this.pattern = ApiTypeHelper.requireNonNull(builder.pattern, this, "pattern");
-		this.useField = builder.useField;
-
-	}
-
-	public static IntervalsWildcard of(Function<Builder, ObjectBuilder<IntervalsWildcard>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * IntervalsQuery variant kind.
-	 */
-	@Override
-	public IntervalsQuery.Kind _intervalsQueryKind() {
-		return IntervalsQuery.Kind.Wildcard;
-	}
-
-	/**
-	 * Intervals variant kind.
-	 */
-	@Override
-	public Intervals.Kind _intervalsKind() {
-		return Intervals.Kind.Wildcard;
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * Required - API name: {@code pattern}
-	 */
-	public final String pattern() {
-		return this.pattern;
-	}
-
-	/**
-	 * API name: {@code use_field}
-	 */
-	@Nullable
-	public final String useField() {
-		return this.useField;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			generator.write(this.analyzer);
-
-		}
-		generator.writeKey("pattern");
-		generator.write(this.pattern);
-
-		if (this.useField != null) {
-			generator.writeKey("use_field");
-			generator.write(this.useField);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IntervalsWildcard}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IntervalsWildcard> {
-		@Nullable
-		private String analyzer;
-
-		private String pattern;
-
-		@Nullable
-		private String useField;
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code pattern}
-		 */
-		public final Builder pattern(String value) {
-			this.pattern = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code use_field}
-		 */
-		public final Builder useField(@Nullable String value) {
-			this.useField = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IntervalsWildcard}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IntervalsWildcard build() {
-			_checkSingleUse();
-
-			return new IntervalsWildcard(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IntervalsWildcard}
-	 */
-	public static final JsonpDeserializer<IntervalsWildcard> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IntervalsWildcard::setupIntervalsWildcardDeserializer);
-
-	protected static void setupIntervalsWildcardDeserializer(ObjectDeserializer<IntervalsWildcard.Builder> op) {
-
-		op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
-		op.add(Builder::useField, JsonpDeserializer.stringDeserializer(), "use_field");
-
-	}
+    private final String pattern;
+
+    @Nullable
+    private final String useField;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IntervalsWildcard(Builder builder) {
+
+        this.analyzer = builder.analyzer;
+        this.pattern = ApiTypeHelper.requireNonNull(builder.pattern, this, "pattern");
+        this.useField = builder.useField;
+
+    }
+
+    public static IntervalsWildcard of(Function<Builder, ObjectBuilder<IntervalsWildcard>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * IntervalsQuery variant kind.
+     */
+    @Override
+    public IntervalsQuery.Kind _intervalsQueryKind() {
+        return IntervalsQuery.Kind.Wildcard;
+    }
+
+    /**
+     * Intervals variant kind.
+     */
+    @Override
+    public Intervals.Kind _intervalsKind() {
+        return Intervals.Kind.Wildcard;
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * Required - API name: {@code pattern}
+     */
+    public final String pattern() {
+        return this.pattern;
+    }
+
+    /**
+     * API name: {@code use_field}
+     */
+    @Nullable
+    public final String useField() {
+        return this.useField;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            generator.write(this.analyzer);
+
+        }
+        generator.writeKey("pattern");
+        generator.write(this.pattern);
+
+        if (this.useField != null) {
+            generator.writeKey("use_field");
+            generator.write(this.useField);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IntervalsWildcard}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IntervalsWildcard> {
+        @Nullable
+        private String analyzer;
+
+        private String pattern;
+
+        @Nullable
+        private String useField;
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code pattern}
+         */
+        public final Builder pattern(String value) {
+            this.pattern = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code use_field}
+         */
+        public final Builder useField(@Nullable String value) {
+            this.useField = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link IntervalsWildcard}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IntervalsWildcard build() {
+            _checkSingleUse();
+
+            return new IntervalsWildcard(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IntervalsWildcard}
+     */
+    public static final JsonpDeserializer<IntervalsWildcard> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IntervalsWildcard::setupIntervalsWildcardDeserializer
+    );
+
+    protected static void setupIntervalsWildcardDeserializer(ObjectDeserializer<IntervalsWildcard.Builder> op) {
+
+        op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
+        op.add(Builder::useField, JsonpDeserializer.stringDeserializer(), "use_field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/KnnQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/KnnQuery.java
index 91beeec75b..025e764f0d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/KnnQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/KnnQuery.java
@@ -181,8 +181,10 @@ public KnnQuery build() {
         }
     }
 
-    public static final JsonpDeserializer<KnnQuery> _DESERIALIZER = ObjectBuilderDeserializer
-            .lazy(Builder::new, KnnQuery::setupKnnQueryDeserializer);
+    public static final JsonpDeserializer<KnnQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        KnnQuery::setupKnnQueryDeserializer
+    );
 
     protected static void setupKnnQueryDeserializer(ObjectDeserializer<Builder> op) {
         setupQueryBaseDeserializer(op);
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/Like.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/Like.java
index eca33e2035..685cc56c75 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/Like.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/Like.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,134 +44,133 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.Like
 
 /**
  * Text that we want similar documents for or a lookup to a document's field for
  * the text.
- * 
+ *
  */
 @JsonpDeserializable
 public class Like implements TaggedUnion<Like.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Document, Text
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private Like(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	private Like(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static Like of(Function<Builder, ObjectBuilder<Like>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code document}?
-	 */
-	public boolean isDocument() {
-		return _kind == Kind.Document;
-	}
-
-	/**
-	 * Get the {@code document} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code document} kind.
-	 */
-	public LikeDocument document() {
-		return TaggedUnionUtils.get(this, Kind.Document);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code text}?
-	 */
-	public boolean isText() {
-		return _kind == Kind.Text;
-	}
-
-	/**
-	 * Get the {@code text} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code text} kind.
-	 */
-	public String text() {
-		return TaggedUnionUtils.get(this, Kind.Text);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Text :
-					generator.write(((String) this._value));
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Like> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<Like> document(LikeDocument v) {
-			this._kind = Kind.Document;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Like> document(Function<LikeDocument.Builder, ObjectBuilder<LikeDocument>> fn) {
-			return this.document(fn.apply(new LikeDocument.Builder()).build());
-		}
-
-		public ObjectBuilder<Like> text(String v) {
-			this._kind = Kind.Text;
-			this._value = v;
-			return this;
-		}
-
-		public Like build() {
-			_checkSingleUse();
-			return new Like(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<Like> buildLikeDeserializer() {
-		return new UnionDeserializer.Builder<Like, Kind, Object>(Like::new, false)
-				.addMember(Kind.Document, LikeDocument._DESERIALIZER)
-				.addMember(Kind.Text, JsonpDeserializer.stringDeserializer()).build();
-	}
-
-	public static final JsonpDeserializer<Like> _DESERIALIZER = JsonpDeserializer.lazy(Like::buildLikeDeserializer);
+    public enum Kind {
+        Document,
+        Text
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private Like(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private Like(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static Like of(Function<Builder, ObjectBuilder<Like>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code document}?
+     */
+    public boolean isDocument() {
+        return _kind == Kind.Document;
+    }
+
+    /**
+     * Get the {@code document} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code document} kind.
+     */
+    public LikeDocument document() {
+        return TaggedUnionUtils.get(this, Kind.Document);
+    }
+
+    /**
+     * Is this variant instance of kind {@code text}?
+     */
+    public boolean isText() {
+        return _kind == Kind.Text;
+    }
+
+    /**
+     * Get the {@code text} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code text} kind.
+     */
+    public String text() {
+        return TaggedUnionUtils.get(this, Kind.Text);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Text:
+                    generator.write(((String) this._value));
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Like> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<Like> document(LikeDocument v) {
+            this._kind = Kind.Document;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Like> document(Function<LikeDocument.Builder, ObjectBuilder<LikeDocument>> fn) {
+            return this.document(fn.apply(new LikeDocument.Builder()).build());
+        }
+
+        public ObjectBuilder<Like> text(String v) {
+            this._kind = Kind.Text;
+            this._value = v;
+            return this;
+        }
+
+        public Like build() {
+            _checkSingleUse();
+            return new Like(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<Like> buildLikeDeserializer() {
+        return new UnionDeserializer.Builder<Like, Kind, Object>(Like::new, false).addMember(Kind.Document, LikeDocument._DESERIALIZER)
+            .addMember(Kind.Text, JsonpDeserializer.stringDeserializer())
+            .build();
+    }
+
+    public static final JsonpDeserializer<Like> _DESERIALIZER = JsonpDeserializer.lazy(Like::buildLikeDeserializer);
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/LikeBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/LikeBuilders.java
index 8bbc3afe8d..6867e4a36c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/LikeBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/LikeBuilders.java
@@ -37,17 +37,16 @@
  * <p>
  * Variants <code>text</code> are not available here as they don't have a
  * dedicated class. Use {@link Like}'s builder for these.
- * 
+ *
  */
 public class LikeBuilders {
-	private LikeBuilders() {
-	}
+    private LikeBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link LikeDocument document} {@code Like} variant.
-	 */
-	public static LikeDocument.Builder document() {
-		return new LikeDocument.Builder();
-	}
+    /**
+     * Creates a builder for the {@link LikeDocument document} {@code Like} variant.
+     */
+    public static LikeDocument.Builder document() {
+        return new LikeDocument.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/LikeDocument.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/LikeDocument.java
index 0917721c0a..26bd3f2621 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/LikeDocument.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/LikeDocument.java
@@ -32,7 +32,11 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch._types.VersionType;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,368 +44,368 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.VersionType;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.LikeDocument
 
-
 @JsonpDeserializable
 public class LikeDocument implements JsonpSerializable {
-	@Nullable
-	private final JsonData doc;
-
-	private final List<String> fields;
-
-	@Nullable
-	private final String id;
-
-	@Nullable
-	private final String type;
-
-	@Nullable
-	private final String index;
-
-	private final Map<String, String> perFieldAnalyzer;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final Long version;
-
-	@Nullable
-	private final VersionType versionType;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private LikeDocument(Builder builder) {
-
-		this.doc = builder.doc;
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-		this.id = builder.id;
-		this.type = builder.type;
-		this.index = builder.index;
-		this.perFieldAnalyzer = ApiTypeHelper.unmodifiable(builder.perFieldAnalyzer);
-		this.routing = builder.routing;
-		this.version = builder.version;
-		this.versionType = builder.versionType;
-
-	}
-
-	public static LikeDocument of(Function<Builder, ObjectBuilder<LikeDocument>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code doc}
-	 */
-	@Nullable
-	public final JsonData doc() {
-		return this.doc;
-	}
-
-	/**
-	 * API name: {@code fields}
-	 */
-	public final List<String> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * API name: {@code _id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * API name: {@code _type}
-	 */
-	@Nullable
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * API name: {@code _index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code per_field_analyzer}
-	 */
-	public final Map<String, String> perFieldAnalyzer() {
-		return this.perFieldAnalyzer;
-	}
-
-	/**
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * API name: {@code version_type}
-	 */
-	@Nullable
-	public final VersionType versionType() {
-		return this.versionType;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.doc != null) {
-			generator.writeKey("doc");
-			this.doc.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartArray();
-			for (String item0 : this.fields) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.id != null) {
-			generator.writeKey("_id");
-			generator.write(this.id);
-
-		}
-		if (this.type != null) {
-			generator.writeKey("_type");
-			generator.write(this.type);
-
-		}
-		if (this.index != null) {
-			generator.writeKey("_index");
-			generator.write(this.index);
-
-		}
-		if (ApiTypeHelper.isDefined(this.perFieldAnalyzer)) {
-			generator.writeKey("per_field_analyzer");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.perFieldAnalyzer.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.routing != null) {
-			generator.writeKey("routing");
-			generator.write(this.routing);
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		if (this.versionType != null) {
-			generator.writeKey("version_type");
-			this.versionType.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link LikeDocument}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<LikeDocument> {
-		@Nullable
-		private JsonData doc;
-
-		@Nullable
-		private List<String> fields;
-
-		@Nullable
-		private String id;
-
-		@Nullable
-		private String type;
-
-		@Nullable
-		private String index;
-
-		@Nullable
-		private Map<String, String> perFieldAnalyzer;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private Long version;
-
-		@Nullable
-		private VersionType versionType;
-
-		/**
-		 * API name: {@code doc}
-		 */
-		public final Builder doc(@Nullable JsonData value) {
-			this.doc = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fields</code>.
-		 */
-		public final Builder fields(List<String> list) {
-			this.fields = _listAddAll(this.fields, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds one or more values to <code>fields</code>.
-		 */
-		public final Builder fields(String value, String... values) {
-			this.fields = _listAdd(this.fields, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code _id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _type}
-		 */
-		public final Builder type(@Nullable String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code per_field_analyzer}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>perFieldAnalyzer</code>.
-		 */
-		public final Builder perFieldAnalyzer(Map<String, String> map) {
-			this.perFieldAnalyzer = _mapPutAll(this.perFieldAnalyzer, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code per_field_analyzer}
-		 * <p>
-		 * Adds an entry to <code>perFieldAnalyzer</code>.
-		 */
-		public final Builder perFieldAnalyzer(String key, String value) {
-			this.perFieldAnalyzer = _mapPut(this.perFieldAnalyzer, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code version_type}
-		 */
-		public final Builder versionType(@Nullable VersionType value) {
-			this.versionType = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link LikeDocument}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LikeDocument build() {
-			_checkSingleUse();
-
-			return new LikeDocument(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link LikeDocument}
-	 */
-	public static final JsonpDeserializer<LikeDocument> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			LikeDocument::setupLikeDocumentDeserializer);
-
-	protected static void setupLikeDocumentDeserializer(ObjectDeserializer<LikeDocument.Builder> op) {
-
-		op.add(Builder::doc, JsonData._DESERIALIZER, "doc");
-		op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "fields");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "_type");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
-		op.add(Builder::perFieldAnalyzer,
-				JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "per_field_analyzer");
-		op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
-		op.add(Builder::versionType, VersionType._DESERIALIZER, "version_type");
-
-	}
+    @Nullable
+    private final JsonData doc;
+
+    private final List<String> fields;
+
+    @Nullable
+    private final String id;
+
+    @Nullable
+    private final String type;
+
+    @Nullable
+    private final String index;
+
+    private final Map<String, String> perFieldAnalyzer;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final Long version;
+
+    @Nullable
+    private final VersionType versionType;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private LikeDocument(Builder builder) {
+
+        this.doc = builder.doc;
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.id = builder.id;
+        this.type = builder.type;
+        this.index = builder.index;
+        this.perFieldAnalyzer = ApiTypeHelper.unmodifiable(builder.perFieldAnalyzer);
+        this.routing = builder.routing;
+        this.version = builder.version;
+        this.versionType = builder.versionType;
+
+    }
+
+    public static LikeDocument of(Function<Builder, ObjectBuilder<LikeDocument>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code doc}
+     */
+    @Nullable
+    public final JsonData doc() {
+        return this.doc;
+    }
+
+    /**
+     * API name: {@code fields}
+     */
+    public final List<String> fields() {
+        return this.fields;
+    }
+
+    /**
+     * API name: {@code _id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * API name: {@code _type}
+     */
+    @Nullable
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * API name: {@code _index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code per_field_analyzer}
+     */
+    public final Map<String, String> perFieldAnalyzer() {
+        return this.perFieldAnalyzer;
+    }
+
+    /**
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * API name: {@code version_type}
+     */
+    @Nullable
+    public final VersionType versionType() {
+        return this.versionType;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.doc != null) {
+            generator.writeKey("doc");
+            this.doc.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartArray();
+            for (String item0 : this.fields) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.id != null) {
+            generator.writeKey("_id");
+            generator.write(this.id);
+
+        }
+        if (this.type != null) {
+            generator.writeKey("_type");
+            generator.write(this.type);
+
+        }
+        if (this.index != null) {
+            generator.writeKey("_index");
+            generator.write(this.index);
+
+        }
+        if (ApiTypeHelper.isDefined(this.perFieldAnalyzer)) {
+            generator.writeKey("per_field_analyzer");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.perFieldAnalyzer.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.routing != null) {
+            generator.writeKey("routing");
+            generator.write(this.routing);
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        if (this.versionType != null) {
+            generator.writeKey("version_type");
+            this.versionType.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link LikeDocument}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<LikeDocument> {
+        @Nullable
+        private JsonData doc;
+
+        @Nullable
+        private List<String> fields;
+
+        @Nullable
+        private String id;
+
+        @Nullable
+        private String type;
+
+        @Nullable
+        private String index;
+
+        @Nullable
+        private Map<String, String> perFieldAnalyzer;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private Long version;
+
+        @Nullable
+        private VersionType versionType;
+
+        /**
+         * API name: {@code doc}
+         */
+        public final Builder doc(@Nullable JsonData value) {
+            this.doc = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fields</code>.
+         */
+        public final Builder fields(List<String> list) {
+            this.fields = _listAddAll(this.fields, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds one or more values to <code>fields</code>.
+         */
+        public final Builder fields(String value, String... values) {
+            this.fields = _listAdd(this.fields, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code _id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _type}
+         */
+        public final Builder type(@Nullable String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code per_field_analyzer}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>perFieldAnalyzer</code>.
+         */
+        public final Builder perFieldAnalyzer(Map<String, String> map) {
+            this.perFieldAnalyzer = _mapPutAll(this.perFieldAnalyzer, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code per_field_analyzer}
+         * <p>
+         * Adds an entry to <code>perFieldAnalyzer</code>.
+         */
+        public final Builder perFieldAnalyzer(String key, String value) {
+            this.perFieldAnalyzer = _mapPut(this.perFieldAnalyzer, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code version_type}
+         */
+        public final Builder versionType(@Nullable VersionType value) {
+            this.versionType = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link LikeDocument}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LikeDocument build() {
+            _checkSingleUse();
+
+            return new LikeDocument(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link LikeDocument}
+     */
+    public static final JsonpDeserializer<LikeDocument> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LikeDocument::setupLikeDocumentDeserializer
+    );
+
+    protected static void setupLikeDocumentDeserializer(ObjectDeserializer<LikeDocument.Builder> op) {
+
+        op.add(Builder::doc, JsonData._DESERIALIZER, "doc");
+        op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "fields");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "_type");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
+        op.add(
+            Builder::perFieldAnalyzer,
+            JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
+            "per_field_analyzer"
+        );
+        op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
+        op.add(Builder::versionType, VersionType._DESERIALIZER, "version_type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchAllQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchAllQuery.java
index 5b032e13d0..a5ac7b5d7f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchAllQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchAllQuery.java
@@ -32,74 +32,74 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.query_dsl.MatchAllQuery
 
-
 @JsonpDeserializable
 public class MatchAllQuery extends QueryBase implements QueryVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private MatchAllQuery(Builder builder) {
-		super(builder);
-
-	}
-
-	public static MatchAllQuery of(Function<Builder, ObjectBuilder<MatchAllQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.MatchAll;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MatchAllQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<MatchAllQuery> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MatchAllQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MatchAllQuery build() {
-			_checkSingleUse();
-
-			return new MatchAllQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MatchAllQuery}
-	 */
-	public static final JsonpDeserializer<MatchAllQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			MatchAllQuery::setupMatchAllQueryDeserializer);
-
-	protected static void setupMatchAllQueryDeserializer(ObjectDeserializer<MatchAllQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private MatchAllQuery(Builder builder) {
+        super(builder);
+
+    }
+
+    public static MatchAllQuery of(Function<Builder, ObjectBuilder<MatchAllQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.MatchAll;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MatchAllQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<MatchAllQuery> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MatchAllQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MatchAllQuery build() {
+            _checkSingleUse();
+
+            return new MatchAllQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MatchAllQuery}
+     */
+    public static final JsonpDeserializer<MatchAllQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MatchAllQuery::setupMatchAllQueryDeserializer
+    );
+
+    protected static void setupMatchAllQueryDeserializer(ObjectDeserializer<MatchAllQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchBoolPrefixQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchBoolPrefixQuery.java
index 6ccde60dfc..56ff2e0264 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchBoolPrefixQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchBoolPrefixQuery.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,360 +42,356 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.MatchBoolPrefixQuery
 
-
 @JsonpDeserializable
 public class MatchBoolPrefixQuery extends QueryBase implements QueryVariant {
-	// Single key dictionary
-	private final String field;
-
-	@Nullable
-	private final String analyzer;
-
-	@Nullable
-	private final String fuzziness;
-
-	@Nullable
-	private final String fuzzyRewrite;
-
-	@Nullable
-	private final Boolean fuzzyTranspositions;
-
-	@Nullable
-	private final Integer maxExpansions;
-
-	@Nullable
-	private final String minimumShouldMatch;
-
-	@Nullable
-	private final Operator operator;
-
-	@Nullable
-	private final Integer prefixLength;
-
-	private final String query;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MatchBoolPrefixQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-
-		this.analyzer = builder.analyzer;
-		this.fuzziness = builder.fuzziness;
-		this.fuzzyRewrite = builder.fuzzyRewrite;
-		this.fuzzyTranspositions = builder.fuzzyTranspositions;
-		this.maxExpansions = builder.maxExpansions;
-		this.minimumShouldMatch = builder.minimumShouldMatch;
-		this.operator = builder.operator;
-		this.prefixLength = builder.prefixLength;
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-
-	}
-
-	public static MatchBoolPrefixQuery of(Function<Builder, ObjectBuilder<MatchBoolPrefixQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.MatchBoolPrefix;
-	}
-
-	/**
-	 * Required - The target field
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * API name: {@code fuzziness}
-	 */
-	@Nullable
-	public final String fuzziness() {
-		return this.fuzziness;
-	}
-
-	/**
-	 * API name: {@code fuzzy_rewrite}
-	 */
-	@Nullable
-	public final String fuzzyRewrite() {
-		return this.fuzzyRewrite;
-	}
-
-	/**
-	 * API name: {@code fuzzy_transpositions}
-	 */
-	@Nullable
-	public final Boolean fuzzyTranspositions() {
-		return this.fuzzyTranspositions;
-	}
-
-	/**
-	 * API name: {@code max_expansions}
-	 */
-	@Nullable
-	public final Integer maxExpansions() {
-		return this.maxExpansions;
-	}
-
-	/**
-	 * API name: {@code minimum_should_match}
-	 */
-	@Nullable
-	public final String minimumShouldMatch() {
-		return this.minimumShouldMatch;
-	}
-
-	/**
-	 * API name: {@code operator}
-	 */
-	@Nullable
-	public final Operator operator() {
-		return this.operator;
-	}
-
-	/**
-	 * API name: {@code prefix_length}
-	 */
-	@Nullable
-	public final Integer prefixLength() {
-		return this.prefixLength;
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final String query() {
-		return this.query;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject(this.field);
-
-		super.serializeInternal(generator, mapper);
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			generator.write(this.analyzer);
-
-		}
-		if (this.fuzziness != null) {
-			generator.writeKey("fuzziness");
-			generator.write(this.fuzziness);
-
-		}
-		if (this.fuzzyRewrite != null) {
-			generator.writeKey("fuzzy_rewrite");
-			generator.write(this.fuzzyRewrite);
-
-		}
-		if (this.fuzzyTranspositions != null) {
-			generator.writeKey("fuzzy_transpositions");
-			generator.write(this.fuzzyTranspositions);
-
-		}
-		if (this.maxExpansions != null) {
-			generator.writeKey("max_expansions");
-			generator.write(this.maxExpansions);
-
-		}
-		if (this.minimumShouldMatch != null) {
-			generator.writeKey("minimum_should_match");
-			generator.write(this.minimumShouldMatch);
-
-		}
-		if (this.operator != null) {
-			generator.writeKey("operator");
-			this.operator.serialize(generator, mapper);
-		}
-		if (this.prefixLength != null) {
-			generator.writeKey("prefix_length");
-			generator.write(this.prefixLength);
-
-		}
-		generator.writeKey("query");
-		generator.write(this.query);
-
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MatchBoolPrefixQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MatchBoolPrefixQuery> {
-		private String field;
-
-		/**
-		 * Required - The target field
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		@Nullable
-		private String analyzer;
-
-		@Nullable
-		private String fuzziness;
-
-		@Nullable
-		private String fuzzyRewrite;
-
-		@Nullable
-		private Boolean fuzzyTranspositions;
-
-		@Nullable
-		private Integer maxExpansions;
-
-		@Nullable
-		private String minimumShouldMatch;
-
-		@Nullable
-		private Operator operator;
-
-		@Nullable
-		private Integer prefixLength;
-
-		private String query;
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzziness}
-		 */
-		public final Builder fuzziness(@Nullable String value) {
-			this.fuzziness = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzzy_rewrite}
-		 */
-		public final Builder fuzzyRewrite(@Nullable String value) {
-			this.fuzzyRewrite = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzzy_transpositions}
-		 */
-		public final Builder fuzzyTranspositions(@Nullable Boolean value) {
-			this.fuzzyTranspositions = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_expansions}
-		 */
-		public final Builder maxExpansions(@Nullable Integer value) {
-			this.maxExpansions = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code minimum_should_match}
-		 */
-		public final Builder minimumShouldMatch(@Nullable String value) {
-			this.minimumShouldMatch = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code operator}
-		 */
-		public final Builder operator(@Nullable Operator value) {
-			this.operator = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code prefix_length}
-		 */
-		public final Builder prefixLength(@Nullable Integer value) {
-			this.prefixLength = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(String value) {
-			this.query = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MatchBoolPrefixQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MatchBoolPrefixQuery build() {
-			_checkSingleUse();
-
-			return new MatchBoolPrefixQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MatchBoolPrefixQuery}
-	 */
-	public static final JsonpDeserializer<MatchBoolPrefixQuery> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MatchBoolPrefixQuery::setupMatchBoolPrefixQueryDeserializer);
-
-	protected static void setupMatchBoolPrefixQueryDeserializer(ObjectDeserializer<MatchBoolPrefixQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(Builder::fuzziness, JsonpDeserializer.stringDeserializer(), "fuzziness");
-		op.add(Builder::fuzzyRewrite, JsonpDeserializer.stringDeserializer(), "fuzzy_rewrite");
-		op.add(Builder::fuzzyTranspositions, JsonpDeserializer.booleanDeserializer(), "fuzzy_transpositions");
-		op.add(Builder::maxExpansions, JsonpDeserializer.integerDeserializer(), "max_expansions");
-		op.add(Builder::minimumShouldMatch, JsonpDeserializer.stringDeserializer(), "minimum_should_match");
-		op.add(Builder::operator, Operator._DESERIALIZER, "operator");
-		op.add(Builder::prefixLength, JsonpDeserializer.integerDeserializer(), "prefix_length");
-		op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
-
-		op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
-		op.shortcutProperty("query");
-
-	}
+    // Single key dictionary
+    private final String field;
+
+    @Nullable
+    private final String analyzer;
+
+    @Nullable
+    private final String fuzziness;
+
+    @Nullable
+    private final String fuzzyRewrite;
+
+    @Nullable
+    private final Boolean fuzzyTranspositions;
+
+    @Nullable
+    private final Integer maxExpansions;
+
+    @Nullable
+    private final String minimumShouldMatch;
+
+    @Nullable
+    private final Operator operator;
+
+    @Nullable
+    private final Integer prefixLength;
+
+    private final String query;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MatchBoolPrefixQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+
+        this.analyzer = builder.analyzer;
+        this.fuzziness = builder.fuzziness;
+        this.fuzzyRewrite = builder.fuzzyRewrite;
+        this.fuzzyTranspositions = builder.fuzzyTranspositions;
+        this.maxExpansions = builder.maxExpansions;
+        this.minimumShouldMatch = builder.minimumShouldMatch;
+        this.operator = builder.operator;
+        this.prefixLength = builder.prefixLength;
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+
+    }
+
+    public static MatchBoolPrefixQuery of(Function<Builder, ObjectBuilder<MatchBoolPrefixQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.MatchBoolPrefix;
+    }
+
+    /**
+     * Required - The target field
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * API name: {@code fuzziness}
+     */
+    @Nullable
+    public final String fuzziness() {
+        return this.fuzziness;
+    }
+
+    /**
+     * API name: {@code fuzzy_rewrite}
+     */
+    @Nullable
+    public final String fuzzyRewrite() {
+        return this.fuzzyRewrite;
+    }
+
+    /**
+     * API name: {@code fuzzy_transpositions}
+     */
+    @Nullable
+    public final Boolean fuzzyTranspositions() {
+        return this.fuzzyTranspositions;
+    }
+
+    /**
+     * API name: {@code max_expansions}
+     */
+    @Nullable
+    public final Integer maxExpansions() {
+        return this.maxExpansions;
+    }
+
+    /**
+     * API name: {@code minimum_should_match}
+     */
+    @Nullable
+    public final String minimumShouldMatch() {
+        return this.minimumShouldMatch;
+    }
+
+    /**
+     * API name: {@code operator}
+     */
+    @Nullable
+    public final Operator operator() {
+        return this.operator;
+    }
+
+    /**
+     * API name: {@code prefix_length}
+     */
+    @Nullable
+    public final Integer prefixLength() {
+        return this.prefixLength;
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final String query() {
+        return this.query;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject(this.field);
+
+        super.serializeInternal(generator, mapper);
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            generator.write(this.analyzer);
+
+        }
+        if (this.fuzziness != null) {
+            generator.writeKey("fuzziness");
+            generator.write(this.fuzziness);
+
+        }
+        if (this.fuzzyRewrite != null) {
+            generator.writeKey("fuzzy_rewrite");
+            generator.write(this.fuzzyRewrite);
+
+        }
+        if (this.fuzzyTranspositions != null) {
+            generator.writeKey("fuzzy_transpositions");
+            generator.write(this.fuzzyTranspositions);
+
+        }
+        if (this.maxExpansions != null) {
+            generator.writeKey("max_expansions");
+            generator.write(this.maxExpansions);
+
+        }
+        if (this.minimumShouldMatch != null) {
+            generator.writeKey("minimum_should_match");
+            generator.write(this.minimumShouldMatch);
+
+        }
+        if (this.operator != null) {
+            generator.writeKey("operator");
+            this.operator.serialize(generator, mapper);
+        }
+        if (this.prefixLength != null) {
+            generator.writeKey("prefix_length");
+            generator.write(this.prefixLength);
+
+        }
+        generator.writeKey("query");
+        generator.write(this.query);
+
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MatchBoolPrefixQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<MatchBoolPrefixQuery> {
+        private String field;
+
+        /**
+         * Required - The target field
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        @Nullable
+        private String analyzer;
+
+        @Nullable
+        private String fuzziness;
+
+        @Nullable
+        private String fuzzyRewrite;
+
+        @Nullable
+        private Boolean fuzzyTranspositions;
+
+        @Nullable
+        private Integer maxExpansions;
+
+        @Nullable
+        private String minimumShouldMatch;
+
+        @Nullable
+        private Operator operator;
+
+        @Nullable
+        private Integer prefixLength;
+
+        private String query;
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzziness}
+         */
+        public final Builder fuzziness(@Nullable String value) {
+            this.fuzziness = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzzy_rewrite}
+         */
+        public final Builder fuzzyRewrite(@Nullable String value) {
+            this.fuzzyRewrite = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzzy_transpositions}
+         */
+        public final Builder fuzzyTranspositions(@Nullable Boolean value) {
+            this.fuzzyTranspositions = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_expansions}
+         */
+        public final Builder maxExpansions(@Nullable Integer value) {
+            this.maxExpansions = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code minimum_should_match}
+         */
+        public final Builder minimumShouldMatch(@Nullable String value) {
+            this.minimumShouldMatch = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code operator}
+         */
+        public final Builder operator(@Nullable Operator value) {
+            this.operator = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code prefix_length}
+         */
+        public final Builder prefixLength(@Nullable Integer value) {
+            this.prefixLength = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(String value) {
+            this.query = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MatchBoolPrefixQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MatchBoolPrefixQuery build() {
+            _checkSingleUse();
+
+            return new MatchBoolPrefixQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MatchBoolPrefixQuery}
+     */
+    public static final JsonpDeserializer<MatchBoolPrefixQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MatchBoolPrefixQuery::setupMatchBoolPrefixQueryDeserializer
+    );
+
+    protected static void setupMatchBoolPrefixQueryDeserializer(ObjectDeserializer<MatchBoolPrefixQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(Builder::fuzziness, JsonpDeserializer.stringDeserializer(), "fuzziness");
+        op.add(Builder::fuzzyRewrite, JsonpDeserializer.stringDeserializer(), "fuzzy_rewrite");
+        op.add(Builder::fuzzyTranspositions, JsonpDeserializer.booleanDeserializer(), "fuzzy_transpositions");
+        op.add(Builder::maxExpansions, JsonpDeserializer.integerDeserializer(), "max_expansions");
+        op.add(Builder::minimumShouldMatch, JsonpDeserializer.stringDeserializer(), "minimum_should_match");
+        op.add(Builder::operator, Operator._DESERIALIZER, "operator");
+        op.add(Builder::prefixLength, JsonpDeserializer.integerDeserializer(), "prefix_length");
+        op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
+
+        op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
+        op.shortcutProperty("query");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchNoneQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchNoneQuery.java
index babc93d065..23cd95a694 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchNoneQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchNoneQuery.java
@@ -32,74 +32,74 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _types.query_dsl.MatchNoneQuery
 
-
 @JsonpDeserializable
 public class MatchNoneQuery extends QueryBase implements QueryVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private MatchNoneQuery(Builder builder) {
-		super(builder);
-
-	}
-
-	public static MatchNoneQuery of(Function<Builder, ObjectBuilder<MatchNoneQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.MatchNone;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MatchNoneQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<MatchNoneQuery> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MatchNoneQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MatchNoneQuery build() {
-			_checkSingleUse();
-
-			return new MatchNoneQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MatchNoneQuery}
-	 */
-	public static final JsonpDeserializer<MatchNoneQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			MatchNoneQuery::setupMatchNoneQueryDeserializer);
-
-	protected static void setupMatchNoneQueryDeserializer(ObjectDeserializer<MatchNoneQuery.Builder> op) {
-		setupQueryBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private MatchNoneQuery(Builder builder) {
+        super(builder);
+
+    }
+
+    public static MatchNoneQuery of(Function<Builder, ObjectBuilder<MatchNoneQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.MatchNone;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MatchNoneQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<MatchNoneQuery> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MatchNoneQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MatchNoneQuery build() {
+            _checkSingleUse();
+
+            return new MatchNoneQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MatchNoneQuery}
+     */
+    public static final JsonpDeserializer<MatchNoneQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MatchNoneQuery::setupMatchNoneQueryDeserializer
+    );
+
+    protected static void setupMatchNoneQueryDeserializer(ObjectDeserializer<MatchNoneQuery.Builder> op) {
+        setupQueryBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchPhrasePrefixQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchPhrasePrefixQuery.java
index 0b3b710c8d..b46d9f09d3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchPhrasePrefixQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchPhrasePrefixQuery.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,246 +42,241 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.MatchPhrasePrefixQuery
 
-
 @JsonpDeserializable
 public class MatchPhrasePrefixQuery extends QueryBase implements QueryVariant {
-	// Single key dictionary
-	private final String field;
-
-	@Nullable
-	private final String analyzer;
-
-	@Nullable
-	private final Integer maxExpansions;
-
-	private final String query;
-
-	@Nullable
-	private final Integer slop;
-
-	@Nullable
-	private final ZeroTermsQuery zeroTermsQuery;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MatchPhrasePrefixQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-
-		this.analyzer = builder.analyzer;
-		this.maxExpansions = builder.maxExpansions;
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-		this.slop = builder.slop;
-		this.zeroTermsQuery = builder.zeroTermsQuery;
-
-	}
-
-	public static MatchPhrasePrefixQuery of(Function<Builder, ObjectBuilder<MatchPhrasePrefixQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.MatchPhrasePrefix;
-	}
-
-	/**
-	 * Required - The target field
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * API name: {@code max_expansions}
-	 */
-	@Nullable
-	public final Integer maxExpansions() {
-		return this.maxExpansions;
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final String query() {
-		return this.query;
-	}
-
-	/**
-	 * API name: {@code slop}
-	 */
-	@Nullable
-	public final Integer slop() {
-		return this.slop;
-	}
-
-	/**
-	 * API name: {@code zero_terms_query}
-	 */
-	@Nullable
-	public final ZeroTermsQuery zeroTermsQuery() {
-		return this.zeroTermsQuery;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject(this.field);
-
-		super.serializeInternal(generator, mapper);
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			generator.write(this.analyzer);
-
-		}
-		if (this.maxExpansions != null) {
-			generator.writeKey("max_expansions");
-			generator.write(this.maxExpansions);
-
-		}
-		generator.writeKey("query");
-		generator.write(this.query);
-
-		if (this.slop != null) {
-			generator.writeKey("slop");
-			generator.write(this.slop);
-
-		}
-		if (this.zeroTermsQuery != null) {
-			generator.writeKey("zero_terms_query");
-			this.zeroTermsQuery.serialize(generator, mapper);
-		}
-
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MatchPhrasePrefixQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<MatchPhrasePrefixQuery> {
-		private String field;
-
-		/**
-		 * Required - The target field
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		@Nullable
-		private String analyzer;
-
-		@Nullable
-		private Integer maxExpansions;
-
-		private String query;
-
-		@Nullable
-		private Integer slop;
-
-		@Nullable
-		private ZeroTermsQuery zeroTermsQuery;
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_expansions}
-		 */
-		public final Builder maxExpansions(@Nullable Integer value) {
-			this.maxExpansions = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(String value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code slop}
-		 */
-		public final Builder slop(@Nullable Integer value) {
-			this.slop = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code zero_terms_query}
-		 */
-		public final Builder zeroTermsQuery(@Nullable ZeroTermsQuery value) {
-			this.zeroTermsQuery = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MatchPhrasePrefixQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MatchPhrasePrefixQuery build() {
-			_checkSingleUse();
-
-			return new MatchPhrasePrefixQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MatchPhrasePrefixQuery}
-	 */
-	public static final JsonpDeserializer<MatchPhrasePrefixQuery> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MatchPhrasePrefixQuery::setupMatchPhrasePrefixQueryDeserializer);
-
-	protected static void setupMatchPhrasePrefixQueryDeserializer(
-			ObjectDeserializer<MatchPhrasePrefixQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(Builder::maxExpansions, JsonpDeserializer.integerDeserializer(), "max_expansions");
-		op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
-		op.add(Builder::slop, JsonpDeserializer.integerDeserializer(), "slop");
-		op.add(Builder::zeroTermsQuery, ZeroTermsQuery._DESERIALIZER, "zero_terms_query");
-
-		op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
-		op.shortcutProperty("query");
-
-	}
+    // Single key dictionary
+    private final String field;
+
+    @Nullable
+    private final String analyzer;
+
+    @Nullable
+    private final Integer maxExpansions;
+
+    private final String query;
+
+    @Nullable
+    private final Integer slop;
+
+    @Nullable
+    private final ZeroTermsQuery zeroTermsQuery;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MatchPhrasePrefixQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+
+        this.analyzer = builder.analyzer;
+        this.maxExpansions = builder.maxExpansions;
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+        this.slop = builder.slop;
+        this.zeroTermsQuery = builder.zeroTermsQuery;
+
+    }
+
+    public static MatchPhrasePrefixQuery of(Function<Builder, ObjectBuilder<MatchPhrasePrefixQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.MatchPhrasePrefix;
+    }
+
+    /**
+     * Required - The target field
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * API name: {@code max_expansions}
+     */
+    @Nullable
+    public final Integer maxExpansions() {
+        return this.maxExpansions;
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final String query() {
+        return this.query;
+    }
+
+    /**
+     * API name: {@code slop}
+     */
+    @Nullable
+    public final Integer slop() {
+        return this.slop;
+    }
+
+    /**
+     * API name: {@code zero_terms_query}
+     */
+    @Nullable
+    public final ZeroTermsQuery zeroTermsQuery() {
+        return this.zeroTermsQuery;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject(this.field);
+
+        super.serializeInternal(generator, mapper);
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            generator.write(this.analyzer);
+
+        }
+        if (this.maxExpansions != null) {
+            generator.writeKey("max_expansions");
+            generator.write(this.maxExpansions);
+
+        }
+        generator.writeKey("query");
+        generator.write(this.query);
+
+        if (this.slop != null) {
+            generator.writeKey("slop");
+            generator.write(this.slop);
+
+        }
+        if (this.zeroTermsQuery != null) {
+            generator.writeKey("zero_terms_query");
+            this.zeroTermsQuery.serialize(generator, mapper);
+        }
+
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MatchPhrasePrefixQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<MatchPhrasePrefixQuery> {
+        private String field;
+
+        /**
+         * Required - The target field
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        @Nullable
+        private String analyzer;
+
+        @Nullable
+        private Integer maxExpansions;
+
+        private String query;
+
+        @Nullable
+        private Integer slop;
+
+        @Nullable
+        private ZeroTermsQuery zeroTermsQuery;
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_expansions}
+         */
+        public final Builder maxExpansions(@Nullable Integer value) {
+            this.maxExpansions = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(String value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code slop}
+         */
+        public final Builder slop(@Nullable Integer value) {
+            this.slop = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code zero_terms_query}
+         */
+        public final Builder zeroTermsQuery(@Nullable ZeroTermsQuery value) {
+            this.zeroTermsQuery = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MatchPhrasePrefixQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MatchPhrasePrefixQuery build() {
+            _checkSingleUse();
+
+            return new MatchPhrasePrefixQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MatchPhrasePrefixQuery}
+     */
+    public static final JsonpDeserializer<MatchPhrasePrefixQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MatchPhrasePrefixQuery::setupMatchPhrasePrefixQueryDeserializer
+    );
+
+    protected static void setupMatchPhrasePrefixQueryDeserializer(ObjectDeserializer<MatchPhrasePrefixQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(Builder::maxExpansions, JsonpDeserializer.integerDeserializer(), "max_expansions");
+        op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
+        op.add(Builder::slop, JsonpDeserializer.integerDeserializer(), "slop");
+        op.add(Builder::zeroTermsQuery, ZeroTermsQuery._DESERIALIZER, "zero_terms_query");
+
+        op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
+        op.shortcutProperty("query");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchPhraseQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchPhraseQuery.java
index 82840fc4fb..dab890c26a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchPhraseQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchPhraseQuery.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,214 +42,212 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.MatchPhraseQuery
 
-
 @JsonpDeserializable
 public class MatchPhraseQuery extends QueryBase implements QueryVariant {
-	// Single key dictionary
-	private final String field;
-
-	@Nullable
-	private final String analyzer;
-
-	private final String query;
-
-	@Nullable
-	private final Integer slop;
-
-	@Nullable
-	private final ZeroTermsQuery zeroTermsQuery;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MatchPhraseQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-
-		this.analyzer = builder.analyzer;
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-		this.slop = builder.slop;
-		this.zeroTermsQuery = builder.zeroTermsQuery;
-
-	}
-
-	public static MatchPhraseQuery of(Function<Builder, ObjectBuilder<MatchPhraseQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.MatchPhrase;
-	}
-
-	/**
-	 * Required - The target field
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final String query() {
-		return this.query;
-	}
-
-	/**
-	 * API name: {@code slop}
-	 */
-	@Nullable
-	public final Integer slop() {
-		return this.slop;
-	}
-
-	/**
-	 * API name: {@code zero_terms_query}
-	 */
-	@Nullable
-	public final ZeroTermsQuery zeroTermsQuery() {
-		return this.zeroTermsQuery;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject(this.field);
-
-		super.serializeInternal(generator, mapper);
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			generator.write(this.analyzer);
-
-		}
-		generator.writeKey("query");
-		generator.write(this.query);
-
-		if (this.slop != null) {
-			generator.writeKey("slop");
-			generator.write(this.slop);
-
-		}
-		if (this.zeroTermsQuery != null) {
-			generator.writeKey("zero_terms_query");
-			this.zeroTermsQuery.serialize(generator, mapper);
-		}
-
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MatchPhraseQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<MatchPhraseQuery> {
-		private String field;
-
-		/**
-		 * Required - The target field
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		@Nullable
-		private String analyzer;
-
-		private String query;
-
-		@Nullable
-		private Integer slop;
-
-		@Nullable
-		private ZeroTermsQuery zeroTermsQuery;
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(String value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code slop}
-		 */
-		public final Builder slop(@Nullable Integer value) {
-			this.slop = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code zero_terms_query}
-		 */
-		public final Builder zeroTermsQuery(@Nullable ZeroTermsQuery value) {
-			this.zeroTermsQuery = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MatchPhraseQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MatchPhraseQuery build() {
-			_checkSingleUse();
-
-			return new MatchPhraseQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MatchPhraseQuery}
-	 */
-	public static final JsonpDeserializer<MatchPhraseQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			MatchPhraseQuery::setupMatchPhraseQueryDeserializer);
-
-	protected static void setupMatchPhraseQueryDeserializer(ObjectDeserializer<MatchPhraseQuery.Builder> op) {
-		setupQueryBaseDeserializer(op);
-		op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
-		op.add(Builder::slop, JsonpDeserializer.integerDeserializer(), "slop");
-		op.add(Builder::zeroTermsQuery, ZeroTermsQuery._DESERIALIZER, "zero_terms_query");
-
-		op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
-		op.shortcutProperty("query");
-
-	}
+    // Single key dictionary
+    private final String field;
+
+    @Nullable
+    private final String analyzer;
+
+    private final String query;
+
+    @Nullable
+    private final Integer slop;
+
+    @Nullable
+    private final ZeroTermsQuery zeroTermsQuery;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MatchPhraseQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+
+        this.analyzer = builder.analyzer;
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+        this.slop = builder.slop;
+        this.zeroTermsQuery = builder.zeroTermsQuery;
+
+    }
+
+    public static MatchPhraseQuery of(Function<Builder, ObjectBuilder<MatchPhraseQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.MatchPhrase;
+    }
+
+    /**
+     * Required - The target field
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final String query() {
+        return this.query;
+    }
+
+    /**
+     * API name: {@code slop}
+     */
+    @Nullable
+    public final Integer slop() {
+        return this.slop;
+    }
+
+    /**
+     * API name: {@code zero_terms_query}
+     */
+    @Nullable
+    public final ZeroTermsQuery zeroTermsQuery() {
+        return this.zeroTermsQuery;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject(this.field);
+
+        super.serializeInternal(generator, mapper);
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            generator.write(this.analyzer);
+
+        }
+        generator.writeKey("query");
+        generator.write(this.query);
+
+        if (this.slop != null) {
+            generator.writeKey("slop");
+            generator.write(this.slop);
+
+        }
+        if (this.zeroTermsQuery != null) {
+            generator.writeKey("zero_terms_query");
+            this.zeroTermsQuery.serialize(generator, mapper);
+        }
+
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MatchPhraseQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<MatchPhraseQuery> {
+        private String field;
+
+        /**
+         * Required - The target field
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        @Nullable
+        private String analyzer;
+
+        private String query;
+
+        @Nullable
+        private Integer slop;
+
+        @Nullable
+        private ZeroTermsQuery zeroTermsQuery;
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(String value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code slop}
+         */
+        public final Builder slop(@Nullable Integer value) {
+            this.slop = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code zero_terms_query}
+         */
+        public final Builder zeroTermsQuery(@Nullable ZeroTermsQuery value) {
+            this.zeroTermsQuery = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MatchPhraseQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MatchPhraseQuery build() {
+            _checkSingleUse();
+
+            return new MatchPhraseQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MatchPhraseQuery}
+     */
+    public static final JsonpDeserializer<MatchPhraseQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MatchPhraseQuery::setupMatchPhraseQueryDeserializer
+    );
+
+    protected static void setupMatchPhraseQueryDeserializer(ObjectDeserializer<MatchPhraseQuery.Builder> op) {
+        setupQueryBaseDeserializer(op);
+        op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
+        op.add(Builder::slop, JsonpDeserializer.integerDeserializer(), "slop");
+        op.add(Builder::zeroTermsQuery, ZeroTermsQuery._DESERIALIZER, "zero_terms_query");
+
+        op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
+        op.shortcutProperty("query");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchQuery.java
index ff89318fef..2379d2f25d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MatchQuery.java
@@ -32,496 +32,496 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch._types.FieldValue;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.FieldValue;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.MatchQuery
 
-
 @JsonpDeserializable
 public class MatchQuery extends QueryBase implements QueryVariant {
-	// Single key dictionary
-	private final String field;
-
-	@Nullable
-	private final String analyzer;
-
-	@Nullable
-	private final Boolean autoGenerateSynonymsPhraseQuery;
-
-	@Nullable
-	private final Double cutoffFrequency;
-
-	@Nullable
-	private final String fuzziness;
-
-	@Nullable
-	private final String fuzzyRewrite;
-
-	@Nullable
-	private final Boolean fuzzyTranspositions;
-
-	@Nullable
-	private final Boolean lenient;
-
-	@Nullable
-	private final Integer maxExpansions;
-
-	@Nullable
-	private final String minimumShouldMatch;
-
-	@Nullable
-	private final Operator operator;
-
-	@Nullable
-	private final Integer prefixLength;
-
-	private final FieldValue query;
-
-	@Nullable
-	private final ZeroTermsQuery zeroTermsQuery;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MatchQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-
-		this.analyzer = builder.analyzer;
-		this.autoGenerateSynonymsPhraseQuery = builder.autoGenerateSynonymsPhraseQuery;
-		this.cutoffFrequency = builder.cutoffFrequency;
-		this.fuzziness = builder.fuzziness;
-		this.fuzzyRewrite = builder.fuzzyRewrite;
-		this.fuzzyTranspositions = builder.fuzzyTranspositions;
-		this.lenient = builder.lenient;
-		this.maxExpansions = builder.maxExpansions;
-		this.minimumShouldMatch = builder.minimumShouldMatch;
-		this.operator = builder.operator;
-		this.prefixLength = builder.prefixLength;
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-		this.zeroTermsQuery = builder.zeroTermsQuery;
-
-	}
-
-	public static MatchQuery of(Function<Builder, ObjectBuilder<MatchQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Match;
-	}
-
-	/**
-	 * Required - The target field
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * API name: {@code auto_generate_synonyms_phrase_query}
-	 */
-	@Nullable
-	public final Boolean autoGenerateSynonymsPhraseQuery() {
-		return this.autoGenerateSynonymsPhraseQuery;
-	}
-
-	/**
-	 * API name: {@code cutoff_frequency}
-	 * 
-	 * @deprecated 7.3.0
-	 */
-	@Deprecated
-	@Nullable
-	public final Double cutoffFrequency() {
-		return this.cutoffFrequency;
-	}
-
-	/**
-	 * API name: {@code fuzziness}
-	 */
-	@Nullable
-	public final String fuzziness() {
-		return this.fuzziness;
-	}
-
-	/**
-	 * API name: {@code fuzzy_rewrite}
-	 */
-	@Nullable
-	public final String fuzzyRewrite() {
-		return this.fuzzyRewrite;
-	}
-
-	/**
-	 * API name: {@code fuzzy_transpositions}
-	 */
-	@Nullable
-	public final Boolean fuzzyTranspositions() {
-		return this.fuzzyTranspositions;
-	}
-
-	/**
-	 * API name: {@code lenient}
-	 */
-	@Nullable
-	public final Boolean lenient() {
-		return this.lenient;
-	}
-
-	/**
-	 * API name: {@code max_expansions}
-	 */
-	@Nullable
-	public final Integer maxExpansions() {
-		return this.maxExpansions;
-	}
-
-	/**
-	 * API name: {@code minimum_should_match}
-	 */
-	@Nullable
-	public final String minimumShouldMatch() {
-		return this.minimumShouldMatch;
-	}
-
-	/**
-	 * API name: {@code operator}
-	 */
-	@Nullable
-	public final Operator operator() {
-		return this.operator;
-	}
-
-	/**
-	 * API name: {@code prefix_length}
-	 */
-	@Nullable
-	public final Integer prefixLength() {
-		return this.prefixLength;
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final FieldValue query() {
-		return this.query;
-	}
-
-	/**
-	 * API name: {@code zero_terms_query}
-	 */
-	@Nullable
-	public final ZeroTermsQuery zeroTermsQuery() {
-		return this.zeroTermsQuery;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject(this.field);
-
-		super.serializeInternal(generator, mapper);
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			generator.write(this.analyzer);
-
-		}
-		if (this.autoGenerateSynonymsPhraseQuery != null) {
-			generator.writeKey("auto_generate_synonyms_phrase_query");
-			generator.write(this.autoGenerateSynonymsPhraseQuery);
-
-		}
-		if (this.cutoffFrequency != null) {
-			generator.writeKey("cutoff_frequency");
-			generator.write(this.cutoffFrequency);
-
-		}
-		if (this.fuzziness != null) {
-			generator.writeKey("fuzziness");
-			generator.write(this.fuzziness);
-
-		}
-		if (this.fuzzyRewrite != null) {
-			generator.writeKey("fuzzy_rewrite");
-			generator.write(this.fuzzyRewrite);
-
-		}
-		if (this.fuzzyTranspositions != null) {
-			generator.writeKey("fuzzy_transpositions");
-			generator.write(this.fuzzyTranspositions);
-
-		}
-		if (this.lenient != null) {
-			generator.writeKey("lenient");
-			generator.write(this.lenient);
-
-		}
-		if (this.maxExpansions != null) {
-			generator.writeKey("max_expansions");
-			generator.write(this.maxExpansions);
-
-		}
-		if (this.minimumShouldMatch != null) {
-			generator.writeKey("minimum_should_match");
-			generator.write(this.minimumShouldMatch);
-
-		}
-		if (this.operator != null) {
-			generator.writeKey("operator");
-			this.operator.serialize(generator, mapper);
-		}
-		if (this.prefixLength != null) {
-			generator.writeKey("prefix_length");
-			generator.write(this.prefixLength);
-
-		}
-		generator.writeKey("query");
-		this.query.serialize(generator, mapper);
-
-		if (this.zeroTermsQuery != null) {
-			generator.writeKey("zero_terms_query");
-			this.zeroTermsQuery.serialize(generator, mapper);
-		}
-
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MatchQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<MatchQuery> {
-		private String field;
-
-		/**
-		 * Required - The target field
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		@Nullable
-		private String analyzer;
-
-		@Nullable
-		private Boolean autoGenerateSynonymsPhraseQuery;
-
-		@Nullable
-		private Double cutoffFrequency;
-
-		@Nullable
-		private String fuzziness;
-
-		@Nullable
-		private String fuzzyRewrite;
-
-		@Nullable
-		private Boolean fuzzyTranspositions;
-
-		@Nullable
-		private Boolean lenient;
-
-		@Nullable
-		private Integer maxExpansions;
-
-		@Nullable
-		private String minimumShouldMatch;
-
-		@Nullable
-		private Operator operator;
-
-		@Nullable
-		private Integer prefixLength;
-
-		private FieldValue query;
-
-		@Nullable
-		private ZeroTermsQuery zeroTermsQuery;
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code auto_generate_synonyms_phrase_query}
-		 */
-		public final Builder autoGenerateSynonymsPhraseQuery(@Nullable Boolean value) {
-			this.autoGenerateSynonymsPhraseQuery = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code cutoff_frequency}
-		 * 
-		 * @deprecated 7.3.0
-		 */
-		@Deprecated
-		public final Builder cutoffFrequency(@Nullable Double value) {
-			this.cutoffFrequency = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzziness}
-		 */
-		public final Builder fuzziness(@Nullable String value) {
-			this.fuzziness = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzzy_rewrite}
-		 */
-		public final Builder fuzzyRewrite(@Nullable String value) {
-			this.fuzzyRewrite = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzzy_transpositions}
-		 */
-		public final Builder fuzzyTranspositions(@Nullable Boolean value) {
-			this.fuzzyTranspositions = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code lenient}
-		 */
-		public final Builder lenient(@Nullable Boolean value) {
-			this.lenient = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_expansions}
-		 */
-		public final Builder maxExpansions(@Nullable Integer value) {
-			this.maxExpansions = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code minimum_should_match}
-		 */
-		public final Builder minimumShouldMatch(@Nullable String value) {
-			this.minimumShouldMatch = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code operator}
-		 */
-		public final Builder operator(@Nullable Operator value) {
-			this.operator = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code prefix_length}
-		 */
-		public final Builder prefixLength(@Nullable Integer value) {
-			this.prefixLength = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(FieldValue value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
-			return this.query(fn.apply(new FieldValue.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code zero_terms_query}
-		 */
-		public final Builder zeroTermsQuery(@Nullable ZeroTermsQuery value) {
-			this.zeroTermsQuery = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MatchQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MatchQuery build() {
-			_checkSingleUse();
-
-			return new MatchQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MatchQuery}
-	 */
-	public static final JsonpDeserializer<MatchQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			MatchQuery::setupMatchQueryDeserializer);
-
-	protected static void setupMatchQueryDeserializer(ObjectDeserializer<MatchQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(Builder::autoGenerateSynonymsPhraseQuery, JsonpDeserializer.booleanDeserializer(),
-				"auto_generate_synonyms_phrase_query");
-		op.add(Builder::cutoffFrequency, JsonpDeserializer.doubleDeserializer(), "cutoff_frequency");
-		op.add(Builder::fuzziness, JsonpDeserializer.stringDeserializer(), "fuzziness");
-		op.add(Builder::fuzzyRewrite, JsonpDeserializer.stringDeserializer(), "fuzzy_rewrite");
-		op.add(Builder::fuzzyTranspositions, JsonpDeserializer.booleanDeserializer(), "fuzzy_transpositions");
-		op.add(Builder::lenient, JsonpDeserializer.booleanDeserializer(), "lenient");
-		op.add(Builder::maxExpansions, JsonpDeserializer.integerDeserializer(), "max_expansions");
-		op.add(Builder::minimumShouldMatch, JsonpDeserializer.stringDeserializer(), "minimum_should_match");
-		op.add(Builder::operator, Operator._DESERIALIZER, "operator");
-		op.add(Builder::prefixLength, JsonpDeserializer.integerDeserializer(), "prefix_length");
-		op.add(Builder::query, FieldValue._DESERIALIZER, "query");
-		op.add(Builder::zeroTermsQuery, ZeroTermsQuery._DESERIALIZER, "zero_terms_query");
-
-		op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
-		op.shortcutProperty("query");
-
-	}
+    // Single key dictionary
+    private final String field;
+
+    @Nullable
+    private final String analyzer;
+
+    @Nullable
+    private final Boolean autoGenerateSynonymsPhraseQuery;
+
+    @Nullable
+    private final Double cutoffFrequency;
+
+    @Nullable
+    private final String fuzziness;
+
+    @Nullable
+    private final String fuzzyRewrite;
+
+    @Nullable
+    private final Boolean fuzzyTranspositions;
+
+    @Nullable
+    private final Boolean lenient;
+
+    @Nullable
+    private final Integer maxExpansions;
+
+    @Nullable
+    private final String minimumShouldMatch;
+
+    @Nullable
+    private final Operator operator;
+
+    @Nullable
+    private final Integer prefixLength;
+
+    private final FieldValue query;
+
+    @Nullable
+    private final ZeroTermsQuery zeroTermsQuery;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MatchQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+
+        this.analyzer = builder.analyzer;
+        this.autoGenerateSynonymsPhraseQuery = builder.autoGenerateSynonymsPhraseQuery;
+        this.cutoffFrequency = builder.cutoffFrequency;
+        this.fuzziness = builder.fuzziness;
+        this.fuzzyRewrite = builder.fuzzyRewrite;
+        this.fuzzyTranspositions = builder.fuzzyTranspositions;
+        this.lenient = builder.lenient;
+        this.maxExpansions = builder.maxExpansions;
+        this.minimumShouldMatch = builder.minimumShouldMatch;
+        this.operator = builder.operator;
+        this.prefixLength = builder.prefixLength;
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+        this.zeroTermsQuery = builder.zeroTermsQuery;
+
+    }
+
+    public static MatchQuery of(Function<Builder, ObjectBuilder<MatchQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Match;
+    }
+
+    /**
+     * Required - The target field
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * API name: {@code auto_generate_synonyms_phrase_query}
+     */
+    @Nullable
+    public final Boolean autoGenerateSynonymsPhraseQuery() {
+        return this.autoGenerateSynonymsPhraseQuery;
+    }
+
+    /**
+     * API name: {@code cutoff_frequency}
+     *
+     * @deprecated 7.3.0
+     */
+    @Deprecated
+    @Nullable
+    public final Double cutoffFrequency() {
+        return this.cutoffFrequency;
+    }
+
+    /**
+     * API name: {@code fuzziness}
+     */
+    @Nullable
+    public final String fuzziness() {
+        return this.fuzziness;
+    }
+
+    /**
+     * API name: {@code fuzzy_rewrite}
+     */
+    @Nullable
+    public final String fuzzyRewrite() {
+        return this.fuzzyRewrite;
+    }
+
+    /**
+     * API name: {@code fuzzy_transpositions}
+     */
+    @Nullable
+    public final Boolean fuzzyTranspositions() {
+        return this.fuzzyTranspositions;
+    }
+
+    /**
+     * API name: {@code lenient}
+     */
+    @Nullable
+    public final Boolean lenient() {
+        return this.lenient;
+    }
+
+    /**
+     * API name: {@code max_expansions}
+     */
+    @Nullable
+    public final Integer maxExpansions() {
+        return this.maxExpansions;
+    }
+
+    /**
+     * API name: {@code minimum_should_match}
+     */
+    @Nullable
+    public final String minimumShouldMatch() {
+        return this.minimumShouldMatch;
+    }
+
+    /**
+     * API name: {@code operator}
+     */
+    @Nullable
+    public final Operator operator() {
+        return this.operator;
+    }
+
+    /**
+     * API name: {@code prefix_length}
+     */
+    @Nullable
+    public final Integer prefixLength() {
+        return this.prefixLength;
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final FieldValue query() {
+        return this.query;
+    }
+
+    /**
+     * API name: {@code zero_terms_query}
+     */
+    @Nullable
+    public final ZeroTermsQuery zeroTermsQuery() {
+        return this.zeroTermsQuery;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject(this.field);
+
+        super.serializeInternal(generator, mapper);
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            generator.write(this.analyzer);
+
+        }
+        if (this.autoGenerateSynonymsPhraseQuery != null) {
+            generator.writeKey("auto_generate_synonyms_phrase_query");
+            generator.write(this.autoGenerateSynonymsPhraseQuery);
+
+        }
+        if (this.cutoffFrequency != null) {
+            generator.writeKey("cutoff_frequency");
+            generator.write(this.cutoffFrequency);
+
+        }
+        if (this.fuzziness != null) {
+            generator.writeKey("fuzziness");
+            generator.write(this.fuzziness);
+
+        }
+        if (this.fuzzyRewrite != null) {
+            generator.writeKey("fuzzy_rewrite");
+            generator.write(this.fuzzyRewrite);
+
+        }
+        if (this.fuzzyTranspositions != null) {
+            generator.writeKey("fuzzy_transpositions");
+            generator.write(this.fuzzyTranspositions);
+
+        }
+        if (this.lenient != null) {
+            generator.writeKey("lenient");
+            generator.write(this.lenient);
+
+        }
+        if (this.maxExpansions != null) {
+            generator.writeKey("max_expansions");
+            generator.write(this.maxExpansions);
+
+        }
+        if (this.minimumShouldMatch != null) {
+            generator.writeKey("minimum_should_match");
+            generator.write(this.minimumShouldMatch);
+
+        }
+        if (this.operator != null) {
+            generator.writeKey("operator");
+            this.operator.serialize(generator, mapper);
+        }
+        if (this.prefixLength != null) {
+            generator.writeKey("prefix_length");
+            generator.write(this.prefixLength);
+
+        }
+        generator.writeKey("query");
+        this.query.serialize(generator, mapper);
+
+        if (this.zeroTermsQuery != null) {
+            generator.writeKey("zero_terms_query");
+            this.zeroTermsQuery.serialize(generator, mapper);
+        }
+
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MatchQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<MatchQuery> {
+        private String field;
+
+        /**
+         * Required - The target field
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        @Nullable
+        private String analyzer;
+
+        @Nullable
+        private Boolean autoGenerateSynonymsPhraseQuery;
+
+        @Nullable
+        private Double cutoffFrequency;
+
+        @Nullable
+        private String fuzziness;
+
+        @Nullable
+        private String fuzzyRewrite;
+
+        @Nullable
+        private Boolean fuzzyTranspositions;
+
+        @Nullable
+        private Boolean lenient;
+
+        @Nullable
+        private Integer maxExpansions;
+
+        @Nullable
+        private String minimumShouldMatch;
+
+        @Nullable
+        private Operator operator;
+
+        @Nullable
+        private Integer prefixLength;
+
+        private FieldValue query;
+
+        @Nullable
+        private ZeroTermsQuery zeroTermsQuery;
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code auto_generate_synonyms_phrase_query}
+         */
+        public final Builder autoGenerateSynonymsPhraseQuery(@Nullable Boolean value) {
+            this.autoGenerateSynonymsPhraseQuery = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code cutoff_frequency}
+         *
+         * @deprecated 7.3.0
+         */
+        @Deprecated
+        public final Builder cutoffFrequency(@Nullable Double value) {
+            this.cutoffFrequency = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzziness}
+         */
+        public final Builder fuzziness(@Nullable String value) {
+            this.fuzziness = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzzy_rewrite}
+         */
+        public final Builder fuzzyRewrite(@Nullable String value) {
+            this.fuzzyRewrite = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzzy_transpositions}
+         */
+        public final Builder fuzzyTranspositions(@Nullable Boolean value) {
+            this.fuzzyTranspositions = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code lenient}
+         */
+        public final Builder lenient(@Nullable Boolean value) {
+            this.lenient = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_expansions}
+         */
+        public final Builder maxExpansions(@Nullable Integer value) {
+            this.maxExpansions = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code minimum_should_match}
+         */
+        public final Builder minimumShouldMatch(@Nullable String value) {
+            this.minimumShouldMatch = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code operator}
+         */
+        public final Builder operator(@Nullable Operator value) {
+            this.operator = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code prefix_length}
+         */
+        public final Builder prefixLength(@Nullable Integer value) {
+            this.prefixLength = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(FieldValue value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
+            return this.query(fn.apply(new FieldValue.Builder()).build());
+        }
+
+        /**
+         * API name: {@code zero_terms_query}
+         */
+        public final Builder zeroTermsQuery(@Nullable ZeroTermsQuery value) {
+            this.zeroTermsQuery = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MatchQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MatchQuery build() {
+            _checkSingleUse();
+
+            return new MatchQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MatchQuery}
+     */
+    public static final JsonpDeserializer<MatchQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MatchQuery::setupMatchQueryDeserializer
+    );
+
+    protected static void setupMatchQueryDeserializer(ObjectDeserializer<MatchQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(Builder::autoGenerateSynonymsPhraseQuery, JsonpDeserializer.booleanDeserializer(), "auto_generate_synonyms_phrase_query");
+        op.add(Builder::cutoffFrequency, JsonpDeserializer.doubleDeserializer(), "cutoff_frequency");
+        op.add(Builder::fuzziness, JsonpDeserializer.stringDeserializer(), "fuzziness");
+        op.add(Builder::fuzzyRewrite, JsonpDeserializer.stringDeserializer(), "fuzzy_rewrite");
+        op.add(Builder::fuzzyTranspositions, JsonpDeserializer.booleanDeserializer(), "fuzzy_transpositions");
+        op.add(Builder::lenient, JsonpDeserializer.booleanDeserializer(), "lenient");
+        op.add(Builder::maxExpansions, JsonpDeserializer.integerDeserializer(), "max_expansions");
+        op.add(Builder::minimumShouldMatch, JsonpDeserializer.stringDeserializer(), "minimum_should_match");
+        op.add(Builder::operator, Operator._DESERIALIZER, "operator");
+        op.add(Builder::prefixLength, JsonpDeserializer.integerDeserializer(), "prefix_length");
+        op.add(Builder::query, FieldValue._DESERIALIZER, "query");
+        op.add(Builder::zeroTermsQuery, ZeroTermsQuery._DESERIALIZER, "zero_terms_query");
+
+        op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
+        op.shortcutProperty("query");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MoreLikeThisQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MoreLikeThisQuery.java
index e8c8d9bdf8..9bc0a945b5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MoreLikeThisQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MoreLikeThisQuery.java
@@ -32,731 +32,735 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch._types.VersionType;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.VersionType;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.MoreLikeThisQuery
 
 @JsonpDeserializable
 public class MoreLikeThisQuery extends QueryBase implements QueryVariant {
-	@Nullable
-	private final String analyzer;
+    @Nullable
+    private final String analyzer;
 
-	@Nullable
-	private final Double boostTerms;
+    @Nullable
+    private final Double boostTerms;
 
-	@Nullable
-	private final Boolean failOnUnsupportedField;
+    @Nullable
+    private final Boolean failOnUnsupportedField;
 
-	private final List<String> fields;
+    private final List<String> fields;
 
-	@Nullable
-	private final Boolean include;
-
-	private final List<Like> like;
-
-	@Nullable
-	private final Integer maxDocFreq;
-
-	@Nullable
-	private final Integer maxQueryTerms;
-
-	@Nullable
-	private final Integer maxWordLength;
-
-	@Nullable
-	private final Integer minDocFreq;
-
-	@Nullable
-	private final String minimumShouldMatch;
-
-	@Nullable
-	private final Integer minTermFreq;
-
-	@Nullable
-	private final Integer minWordLength;
-
-	private final Map<String, String> perFieldAnalyzer;
-
-	@Nullable
-	private final String routing;
-
-	private final List<String> stopWords;
-
-	private final List<Like> unlike;
-
-	@Nullable
-	private final Long version;
-
-	@Nullable
-	private final VersionType versionType;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MoreLikeThisQuery(Builder builder) {
-		super(builder);
-
-		this.analyzer = builder.analyzer;
-		this.boostTerms = builder.boostTerms;
-		this.failOnUnsupportedField = builder.failOnUnsupportedField;
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-		this.include = builder.include;
-		this.like = ApiTypeHelper.unmodifiableRequired(builder.like, this, "like");
-		this.maxDocFreq = builder.maxDocFreq;
-		this.maxQueryTerms = builder.maxQueryTerms;
-		this.maxWordLength = builder.maxWordLength;
-		this.minDocFreq = builder.minDocFreq;
-		this.minimumShouldMatch = builder.minimumShouldMatch;
-		this.minTermFreq = builder.minTermFreq;
-		this.minWordLength = builder.minWordLength;
-		this.perFieldAnalyzer = ApiTypeHelper.unmodifiable(builder.perFieldAnalyzer);
-		this.routing = builder.routing;
-		this.stopWords = ApiTypeHelper.unmodifiable(builder.stopWords);
-		this.unlike = ApiTypeHelper.unmodifiable(builder.unlike);
-		this.version = builder.version;
-		this.versionType = builder.versionType;
-
-	}
-
-	public static MoreLikeThisQuery of(Function<Builder, ObjectBuilder<MoreLikeThisQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.MoreLikeThis;
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * API name: {@code boost_terms}
-	 */
-	@Nullable
-	public final Double boostTerms() {
-		return this.boostTerms;
-	}
-
-	/**
-	 * API name: {@code fail_on_unsupported_field}
-	 */
-	@Nullable
-	public final Boolean failOnUnsupportedField() {
-		return this.failOnUnsupportedField;
-	}
-
-	/**
-	 * API name: {@code fields}
-	 */
-	public final List<String> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * API name: {@code include}
-	 */
-	@Nullable
-	public final Boolean include() {
-		return this.include;
-	}
-
-	/**
-	 * Required - API name: {@code like}
-	 */
-	public final List<Like> like() {
-		return this.like;
-	}
-
-	/**
-	 * API name: {@code max_doc_freq}
-	 */
-	@Nullable
-	public final Integer maxDocFreq() {
-		return this.maxDocFreq;
-	}
-
-	/**
-	 * API name: {@code max_query_terms}
-	 */
-	@Nullable
-	public final Integer maxQueryTerms() {
-		return this.maxQueryTerms;
-	}
-
-	/**
-	 * API name: {@code max_word_length}
-	 */
-	@Nullable
-	public final Integer maxWordLength() {
-		return this.maxWordLength;
-	}
-
-	/**
-	 * API name: {@code min_doc_freq}
-	 */
-	@Nullable
-	public final Integer minDocFreq() {
-		return this.minDocFreq;
-	}
-
-	/**
-	 * API name: {@code minimum_should_match}
-	 */
-	@Nullable
-	public final String minimumShouldMatch() {
-		return this.minimumShouldMatch;
-	}
-
-	/**
-	 * API name: {@code min_term_freq}
-	 */
-	@Nullable
-	public final Integer minTermFreq() {
-		return this.minTermFreq;
-	}
-
-	/**
-	 * API name: {@code min_word_length}
-	 */
-	@Nullable
-	public final Integer minWordLength() {
-		return this.minWordLength;
-	}
-
-	/**
-	 * API name: {@code per_field_analyzer}
-	 */
-	public final Map<String, String> perFieldAnalyzer() {
-		return this.perFieldAnalyzer;
-	}
-
-	/**
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * API name: {@code stop_words}
-	 */
-	public final List<String> stopWords() {
-		return this.stopWords;
-	}
-
-	/**
-	 * API name: {@code unlike}
-	 */
-	public final List<Like> unlike() {
-		return this.unlike;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * API name: {@code version_type}
-	 */
-	@Nullable
-	public final VersionType versionType() {
-		return this.versionType;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			generator.write(this.analyzer);
-
-		}
-		if (this.boostTerms != null) {
-			generator.writeKey("boost_terms");
-			generator.write(this.boostTerms);
-
-		}
-		if (this.failOnUnsupportedField != null) {
-			generator.writeKey("fail_on_unsupported_field");
-			generator.write(this.failOnUnsupportedField);
-
-		}
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartArray();
-			for (String item0 : this.fields) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.include != null) {
-			generator.writeKey("include");
-			generator.write(this.include);
-
-		}
-		if (ApiTypeHelper.isDefined(this.like)) {
-			generator.writeKey("like");
-			generator.writeStartArray();
-			for (Like item0 : this.like) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.maxDocFreq != null) {
-			generator.writeKey("max_doc_freq");
-			generator.write(this.maxDocFreq);
-
-		}
-		if (this.maxQueryTerms != null) {
-			generator.writeKey("max_query_terms");
-			generator.write(this.maxQueryTerms);
-
-		}
-		if (this.maxWordLength != null) {
-			generator.writeKey("max_word_length");
-			generator.write(this.maxWordLength);
-
-		}
-		if (this.minDocFreq != null) {
-			generator.writeKey("min_doc_freq");
-			generator.write(this.minDocFreq);
-
-		}
-		if (this.minimumShouldMatch != null) {
-			generator.writeKey("minimum_should_match");
-			generator.write(this.minimumShouldMatch);
-
-		}
-		if (this.minTermFreq != null) {
-			generator.writeKey("min_term_freq");
-			generator.write(this.minTermFreq);
-
-		}
-		if (this.minWordLength != null) {
-			generator.writeKey("min_word_length");
-			generator.write(this.minWordLength);
-
-		}
-		if (ApiTypeHelper.isDefined(this.perFieldAnalyzer)) {
-			generator.writeKey("per_field_analyzer");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.perFieldAnalyzer.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.routing != null) {
-			generator.writeKey("routing");
-			generator.write(this.routing);
-
-		}
-		if (ApiTypeHelper.isDefined(this.stopWords)) {
-			generator.writeKey("stop_words");
-			generator.writeStartArray();
-			for (String item0 : this.stopWords) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.unlike)) {
-			generator.writeKey("unlike");
-			generator.writeStartArray();
-			for (Like item0 : this.unlike) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		if (this.versionType != null) {
-			generator.writeKey("version_type");
-			this.versionType.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MoreLikeThisQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<MoreLikeThisQuery> {
-		@Nullable
-		private String analyzer;
-
-		@Nullable
-		private Double boostTerms;
-
-		@Nullable
-		private Boolean failOnUnsupportedField;
-
-		@Nullable
-		private List<String> fields;
-
-		@Nullable
-		private Boolean include;
-
-		private List<Like> like;
-
-		@Nullable
-		private Integer maxDocFreq;
-
-		@Nullable
-		private Integer maxQueryTerms;
-
-		@Nullable
-		private Integer maxWordLength;
-
-		@Nullable
-		private Integer minDocFreq;
-
-		@Nullable
-		private String minimumShouldMatch;
-
-		@Nullable
-		private Integer minTermFreq;
-
-		@Nullable
-		private Integer minWordLength;
-
-		@Nullable
-		private Map<String, String> perFieldAnalyzer;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private List<String> stopWords;
-
-		@Nullable
-		private List<Like> unlike;
-
-		@Nullable
-		private Long version;
-
-		@Nullable
-		private VersionType versionType;
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code boost_terms}
-		 */
-		public final Builder boostTerms(@Nullable Double value) {
-			this.boostTerms = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fail_on_unsupported_field}
-		 */
-		public final Builder failOnUnsupportedField(@Nullable Boolean value) {
-			this.failOnUnsupportedField = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fields</code>.
-		 */
-		public final Builder fields(List<String> list) {
-			this.fields = _listAddAll(this.fields, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds one or more values to <code>fields</code>.
-		 */
-		public final Builder fields(String value, String... values) {
-			this.fields = _listAdd(this.fields, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code include}
-		 */
-		public final Builder include(@Nullable Boolean value) {
-			this.include = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code like}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>like</code>.
-		 */
-		public final Builder like(List<Like> list) {
-			this.like = _listAddAll(this.like, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code like}
-		 * <p>
-		 * Adds one or more values to <code>like</code>.
-		 */
-		public final Builder like(Like value, Like... values) {
-			this.like = _listAdd(this.like, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code like}
-		 * <p>
-		 * Adds a value to <code>like</code> using a builder lambda.
-		 */
-		public final Builder like(Function<Like.Builder, ObjectBuilder<Like>> fn) {
-			return like(fn.apply(new Like.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code max_doc_freq}
-		 */
-		public final Builder maxDocFreq(@Nullable Integer value) {
-			this.maxDocFreq = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_query_terms}
-		 */
-		public final Builder maxQueryTerms(@Nullable Integer value) {
-			this.maxQueryTerms = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_word_length}
-		 */
-		public final Builder maxWordLength(@Nullable Integer value) {
-			this.maxWordLength = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_doc_freq}
-		 */
-		public final Builder minDocFreq(@Nullable Integer value) {
-			this.minDocFreq = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code minimum_should_match}
-		 */
-		public final Builder minimumShouldMatch(@Nullable String value) {
-			this.minimumShouldMatch = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_term_freq}
-		 */
-		public final Builder minTermFreq(@Nullable Integer value) {
-			this.minTermFreq = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_word_length}
-		 */
-		public final Builder minWordLength(@Nullable Integer value) {
-			this.minWordLength = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code per_field_analyzer}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>perFieldAnalyzer</code>.
-		 */
-		public final Builder perFieldAnalyzer(Map<String, String> map) {
-			this.perFieldAnalyzer = _mapPutAll(this.perFieldAnalyzer, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code per_field_analyzer}
-		 * <p>
-		 * Adds an entry to <code>perFieldAnalyzer</code>.
-		 */
-		public final Builder perFieldAnalyzer(String key, String value) {
-			this.perFieldAnalyzer = _mapPut(this.perFieldAnalyzer, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code stop_words}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>stopWords</code>.
-		 */
-		public final Builder stopWords(List<String> list) {
-			this.stopWords = _listAddAll(this.stopWords, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stop_words}
-		 * <p>
-		 * Adds one or more values to <code>stopWords</code>.
-		 */
-		public final Builder stopWords(String value, String... values) {
-			this.stopWords = _listAdd(this.stopWords, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code unlike}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>unlike</code>.
-		 */
-		public final Builder unlike(List<Like> list) {
-			this.unlike = _listAddAll(this.unlike, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code unlike}
-		 * <p>
-		 * Adds one or more values to <code>unlike</code>.
-		 */
-		public final Builder unlike(Like value, Like... values) {
-			this.unlike = _listAdd(this.unlike, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code unlike}
-		 * <p>
-		 * Adds a value to <code>unlike</code> using a builder lambda.
-		 */
-		public final Builder unlike(Function<Like.Builder, ObjectBuilder<Like>> fn) {
-			return unlike(fn.apply(new Like.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code version_type}
-		 */
-		public final Builder versionType(@Nullable VersionType value) {
-			this.versionType = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MoreLikeThisQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MoreLikeThisQuery build() {
-			_checkSingleUse();
-
-			return new MoreLikeThisQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MoreLikeThisQuery}
-	 */
-	public static final JsonpDeserializer<MoreLikeThisQuery> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MoreLikeThisQuery::setupMoreLikeThisQueryDeserializer);
-
-	protected static void setupMoreLikeThisQueryDeserializer(ObjectDeserializer<MoreLikeThisQuery.Builder> op) {
-		setupQueryBaseDeserializer(op);
-		op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(Builder::boostTerms, JsonpDeserializer.doubleDeserializer(), "boost_terms");
-		op.add(Builder::failOnUnsupportedField, JsonpDeserializer.booleanDeserializer(), "fail_on_unsupported_field");
-		op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "fields");
-		op.add(Builder::include, JsonpDeserializer.booleanDeserializer(), "include");
-		op.add(Builder::like, JsonpDeserializer.arrayDeserializer(Like._DESERIALIZER), "like");
-		op.add(Builder::maxDocFreq, JsonpDeserializer.integerDeserializer(), "max_doc_freq");
-		op.add(Builder::maxQueryTerms, JsonpDeserializer.integerDeserializer(), "max_query_terms");
-		op.add(Builder::maxWordLength, JsonpDeserializer.integerDeserializer(), "max_word_length");
-		op.add(Builder::minDocFreq, JsonpDeserializer.integerDeserializer(), "min_doc_freq");
-		op.add(Builder::minimumShouldMatch, JsonpDeserializer.stringDeserializer(), "minimum_should_match");
-		op.add(Builder::minTermFreq, JsonpDeserializer.integerDeserializer(), "min_term_freq");
-		op.add(Builder::minWordLength, JsonpDeserializer.integerDeserializer(), "min_word_length");
-		op.add(Builder::perFieldAnalyzer,
-				JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "per_field_analyzer");
-		op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
-		op.add(Builder::stopWords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"stop_words");
-		op.add(Builder::unlike, JsonpDeserializer.arrayDeserializer(Like._DESERIALIZER), "unlike");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
-		op.add(Builder::versionType, VersionType._DESERIALIZER, "version_type");
-
-	}
+    @Nullable
+    private final Boolean include;
+
+    private final List<Like> like;
+
+    @Nullable
+    private final Integer maxDocFreq;
+
+    @Nullable
+    private final Integer maxQueryTerms;
+
+    @Nullable
+    private final Integer maxWordLength;
+
+    @Nullable
+    private final Integer minDocFreq;
+
+    @Nullable
+    private final String minimumShouldMatch;
+
+    @Nullable
+    private final Integer minTermFreq;
+
+    @Nullable
+    private final Integer minWordLength;
+
+    private final Map<String, String> perFieldAnalyzer;
+
+    @Nullable
+    private final String routing;
+
+    private final List<String> stopWords;
+
+    private final List<Like> unlike;
+
+    @Nullable
+    private final Long version;
+
+    @Nullable
+    private final VersionType versionType;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MoreLikeThisQuery(Builder builder) {
+        super(builder);
+
+        this.analyzer = builder.analyzer;
+        this.boostTerms = builder.boostTerms;
+        this.failOnUnsupportedField = builder.failOnUnsupportedField;
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.include = builder.include;
+        this.like = ApiTypeHelper.unmodifiableRequired(builder.like, this, "like");
+        this.maxDocFreq = builder.maxDocFreq;
+        this.maxQueryTerms = builder.maxQueryTerms;
+        this.maxWordLength = builder.maxWordLength;
+        this.minDocFreq = builder.minDocFreq;
+        this.minimumShouldMatch = builder.minimumShouldMatch;
+        this.minTermFreq = builder.minTermFreq;
+        this.minWordLength = builder.minWordLength;
+        this.perFieldAnalyzer = ApiTypeHelper.unmodifiable(builder.perFieldAnalyzer);
+        this.routing = builder.routing;
+        this.stopWords = ApiTypeHelper.unmodifiable(builder.stopWords);
+        this.unlike = ApiTypeHelper.unmodifiable(builder.unlike);
+        this.version = builder.version;
+        this.versionType = builder.versionType;
+
+    }
+
+    public static MoreLikeThisQuery of(Function<Builder, ObjectBuilder<MoreLikeThisQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.MoreLikeThis;
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * API name: {@code boost_terms}
+     */
+    @Nullable
+    public final Double boostTerms() {
+        return this.boostTerms;
+    }
+
+    /**
+     * API name: {@code fail_on_unsupported_field}
+     */
+    @Nullable
+    public final Boolean failOnUnsupportedField() {
+        return this.failOnUnsupportedField;
+    }
+
+    /**
+     * API name: {@code fields}
+     */
+    public final List<String> fields() {
+        return this.fields;
+    }
+
+    /**
+     * API name: {@code include}
+     */
+    @Nullable
+    public final Boolean include() {
+        return this.include;
+    }
+
+    /**
+     * Required - API name: {@code like}
+     */
+    public final List<Like> like() {
+        return this.like;
+    }
+
+    /**
+     * API name: {@code max_doc_freq}
+     */
+    @Nullable
+    public final Integer maxDocFreq() {
+        return this.maxDocFreq;
+    }
+
+    /**
+     * API name: {@code max_query_terms}
+     */
+    @Nullable
+    public final Integer maxQueryTerms() {
+        return this.maxQueryTerms;
+    }
+
+    /**
+     * API name: {@code max_word_length}
+     */
+    @Nullable
+    public final Integer maxWordLength() {
+        return this.maxWordLength;
+    }
+
+    /**
+     * API name: {@code min_doc_freq}
+     */
+    @Nullable
+    public final Integer minDocFreq() {
+        return this.minDocFreq;
+    }
+
+    /**
+     * API name: {@code minimum_should_match}
+     */
+    @Nullable
+    public final String minimumShouldMatch() {
+        return this.minimumShouldMatch;
+    }
+
+    /**
+     * API name: {@code min_term_freq}
+     */
+    @Nullable
+    public final Integer minTermFreq() {
+        return this.minTermFreq;
+    }
+
+    /**
+     * API name: {@code min_word_length}
+     */
+    @Nullable
+    public final Integer minWordLength() {
+        return this.minWordLength;
+    }
+
+    /**
+     * API name: {@code per_field_analyzer}
+     */
+    public final Map<String, String> perFieldAnalyzer() {
+        return this.perFieldAnalyzer;
+    }
+
+    /**
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * API name: {@code stop_words}
+     */
+    public final List<String> stopWords() {
+        return this.stopWords;
+    }
+
+    /**
+     * API name: {@code unlike}
+     */
+    public final List<Like> unlike() {
+        return this.unlike;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * API name: {@code version_type}
+     */
+    @Nullable
+    public final VersionType versionType() {
+        return this.versionType;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            generator.write(this.analyzer);
+
+        }
+        if (this.boostTerms != null) {
+            generator.writeKey("boost_terms");
+            generator.write(this.boostTerms);
+
+        }
+        if (this.failOnUnsupportedField != null) {
+            generator.writeKey("fail_on_unsupported_field");
+            generator.write(this.failOnUnsupportedField);
+
+        }
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartArray();
+            for (String item0 : this.fields) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.include != null) {
+            generator.writeKey("include");
+            generator.write(this.include);
+
+        }
+        if (ApiTypeHelper.isDefined(this.like)) {
+            generator.writeKey("like");
+            generator.writeStartArray();
+            for (Like item0 : this.like) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.maxDocFreq != null) {
+            generator.writeKey("max_doc_freq");
+            generator.write(this.maxDocFreq);
+
+        }
+        if (this.maxQueryTerms != null) {
+            generator.writeKey("max_query_terms");
+            generator.write(this.maxQueryTerms);
+
+        }
+        if (this.maxWordLength != null) {
+            generator.writeKey("max_word_length");
+            generator.write(this.maxWordLength);
+
+        }
+        if (this.minDocFreq != null) {
+            generator.writeKey("min_doc_freq");
+            generator.write(this.minDocFreq);
+
+        }
+        if (this.minimumShouldMatch != null) {
+            generator.writeKey("minimum_should_match");
+            generator.write(this.minimumShouldMatch);
+
+        }
+        if (this.minTermFreq != null) {
+            generator.writeKey("min_term_freq");
+            generator.write(this.minTermFreq);
+
+        }
+        if (this.minWordLength != null) {
+            generator.writeKey("min_word_length");
+            generator.write(this.minWordLength);
+
+        }
+        if (ApiTypeHelper.isDefined(this.perFieldAnalyzer)) {
+            generator.writeKey("per_field_analyzer");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.perFieldAnalyzer.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.routing != null) {
+            generator.writeKey("routing");
+            generator.write(this.routing);
+
+        }
+        if (ApiTypeHelper.isDefined(this.stopWords)) {
+            generator.writeKey("stop_words");
+            generator.writeStartArray();
+            for (String item0 : this.stopWords) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.unlike)) {
+            generator.writeKey("unlike");
+            generator.writeStartArray();
+            for (Like item0 : this.unlike) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        if (this.versionType != null) {
+            generator.writeKey("version_type");
+            this.versionType.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MoreLikeThisQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<MoreLikeThisQuery> {
+        @Nullable
+        private String analyzer;
+
+        @Nullable
+        private Double boostTerms;
+
+        @Nullable
+        private Boolean failOnUnsupportedField;
+
+        @Nullable
+        private List<String> fields;
+
+        @Nullable
+        private Boolean include;
+
+        private List<Like> like;
+
+        @Nullable
+        private Integer maxDocFreq;
+
+        @Nullable
+        private Integer maxQueryTerms;
+
+        @Nullable
+        private Integer maxWordLength;
+
+        @Nullable
+        private Integer minDocFreq;
+
+        @Nullable
+        private String minimumShouldMatch;
+
+        @Nullable
+        private Integer minTermFreq;
+
+        @Nullable
+        private Integer minWordLength;
+
+        @Nullable
+        private Map<String, String> perFieldAnalyzer;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private List<String> stopWords;
+
+        @Nullable
+        private List<Like> unlike;
+
+        @Nullable
+        private Long version;
+
+        @Nullable
+        private VersionType versionType;
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code boost_terms}
+         */
+        public final Builder boostTerms(@Nullable Double value) {
+            this.boostTerms = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fail_on_unsupported_field}
+         */
+        public final Builder failOnUnsupportedField(@Nullable Boolean value) {
+            this.failOnUnsupportedField = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fields</code>.
+         */
+        public final Builder fields(List<String> list) {
+            this.fields = _listAddAll(this.fields, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds one or more values to <code>fields</code>.
+         */
+        public final Builder fields(String value, String... values) {
+            this.fields = _listAdd(this.fields, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code include}
+         */
+        public final Builder include(@Nullable Boolean value) {
+            this.include = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code like}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>like</code>.
+         */
+        public final Builder like(List<Like> list) {
+            this.like = _listAddAll(this.like, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code like}
+         * <p>
+         * Adds one or more values to <code>like</code>.
+         */
+        public final Builder like(Like value, Like... values) {
+            this.like = _listAdd(this.like, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code like}
+         * <p>
+         * Adds a value to <code>like</code> using a builder lambda.
+         */
+        public final Builder like(Function<Like.Builder, ObjectBuilder<Like>> fn) {
+            return like(fn.apply(new Like.Builder()).build());
+        }
+
+        /**
+         * API name: {@code max_doc_freq}
+         */
+        public final Builder maxDocFreq(@Nullable Integer value) {
+            this.maxDocFreq = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_query_terms}
+         */
+        public final Builder maxQueryTerms(@Nullable Integer value) {
+            this.maxQueryTerms = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_word_length}
+         */
+        public final Builder maxWordLength(@Nullable Integer value) {
+            this.maxWordLength = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code min_doc_freq}
+         */
+        public final Builder minDocFreq(@Nullable Integer value) {
+            this.minDocFreq = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code minimum_should_match}
+         */
+        public final Builder minimumShouldMatch(@Nullable String value) {
+            this.minimumShouldMatch = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code min_term_freq}
+         */
+        public final Builder minTermFreq(@Nullable Integer value) {
+            this.minTermFreq = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code min_word_length}
+         */
+        public final Builder minWordLength(@Nullable Integer value) {
+            this.minWordLength = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code per_field_analyzer}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>perFieldAnalyzer</code>.
+         */
+        public final Builder perFieldAnalyzer(Map<String, String> map) {
+            this.perFieldAnalyzer = _mapPutAll(this.perFieldAnalyzer, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code per_field_analyzer}
+         * <p>
+         * Adds an entry to <code>perFieldAnalyzer</code>.
+         */
+        public final Builder perFieldAnalyzer(String key, String value) {
+            this.perFieldAnalyzer = _mapPut(this.perFieldAnalyzer, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code stop_words}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>stopWords</code>.
+         */
+        public final Builder stopWords(List<String> list) {
+            this.stopWords = _listAddAll(this.stopWords, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code stop_words}
+         * <p>
+         * Adds one or more values to <code>stopWords</code>.
+         */
+        public final Builder stopWords(String value, String... values) {
+            this.stopWords = _listAdd(this.stopWords, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code unlike}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>unlike</code>.
+         */
+        public final Builder unlike(List<Like> list) {
+            this.unlike = _listAddAll(this.unlike, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code unlike}
+         * <p>
+         * Adds one or more values to <code>unlike</code>.
+         */
+        public final Builder unlike(Like value, Like... values) {
+            this.unlike = _listAdd(this.unlike, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code unlike}
+         * <p>
+         * Adds a value to <code>unlike</code> using a builder lambda.
+         */
+        public final Builder unlike(Function<Like.Builder, ObjectBuilder<Like>> fn) {
+            return unlike(fn.apply(new Like.Builder()).build());
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code version_type}
+         */
+        public final Builder versionType(@Nullable VersionType value) {
+            this.versionType = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MoreLikeThisQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MoreLikeThisQuery build() {
+            _checkSingleUse();
+
+            return new MoreLikeThisQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MoreLikeThisQuery}
+     */
+    public static final JsonpDeserializer<MoreLikeThisQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MoreLikeThisQuery::setupMoreLikeThisQueryDeserializer
+    );
+
+    protected static void setupMoreLikeThisQueryDeserializer(ObjectDeserializer<MoreLikeThisQuery.Builder> op) {
+        setupQueryBaseDeserializer(op);
+        op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(Builder::boostTerms, JsonpDeserializer.doubleDeserializer(), "boost_terms");
+        op.add(Builder::failOnUnsupportedField, JsonpDeserializer.booleanDeserializer(), "fail_on_unsupported_field");
+        op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "fields");
+        op.add(Builder::include, JsonpDeserializer.booleanDeserializer(), "include");
+        op.add(Builder::like, JsonpDeserializer.arrayDeserializer(Like._DESERIALIZER), "like");
+        op.add(Builder::maxDocFreq, JsonpDeserializer.integerDeserializer(), "max_doc_freq");
+        op.add(Builder::maxQueryTerms, JsonpDeserializer.integerDeserializer(), "max_query_terms");
+        op.add(Builder::maxWordLength, JsonpDeserializer.integerDeserializer(), "max_word_length");
+        op.add(Builder::minDocFreq, JsonpDeserializer.integerDeserializer(), "min_doc_freq");
+        op.add(Builder::minimumShouldMatch, JsonpDeserializer.stringDeserializer(), "minimum_should_match");
+        op.add(Builder::minTermFreq, JsonpDeserializer.integerDeserializer(), "min_term_freq");
+        op.add(Builder::minWordLength, JsonpDeserializer.integerDeserializer(), "min_word_length");
+        op.add(
+            Builder::perFieldAnalyzer,
+            JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
+            "per_field_analyzer"
+        );
+        op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
+        op.add(Builder::stopWords, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stop_words");
+        op.add(Builder::unlike, JsonpDeserializer.arrayDeserializer(Like._DESERIALIZER), "unlike");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
+        op.add(Builder::versionType, VersionType._DESERIALIZER, "version_type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MultiMatchQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MultiMatchQuery.java
index 9319e480d4..ff2b6b76b0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MultiMatchQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MultiMatchQuery.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,585 +43,581 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.MultiMatchQuery
 
-
 @JsonpDeserializable
 public class MultiMatchQuery extends QueryBase implements QueryVariant {
-	@Nullable
-	private final String analyzer;
+    @Nullable
+    private final String analyzer;
 
-	@Nullable
-	private final Boolean autoGenerateSynonymsPhraseQuery;
-
-	@Nullable
-	private final Double cutoffFrequency;
-
-	private final List<String> fields;
-
-	@Nullable
-	private final String fuzziness;
-
-	@Nullable
-	private final String fuzzyRewrite;
-
-	@Nullable
-	private final Boolean fuzzyTranspositions;
-
-	@Nullable
-	private final Boolean lenient;
-
-	@Nullable
-	private final Integer maxExpansions;
-
-	@Nullable
-	private final String minimumShouldMatch;
-
-	@Nullable
-	private final Operator operator;
-
-	@Nullable
-	private final Integer prefixLength;
-
-	private final String query;
-
-	@Nullable
-	private final Integer slop;
-
-	@Nullable
-	private final Double tieBreaker;
-
-	@Nullable
-	private final TextQueryType type;
-
-	@Nullable
-	private final ZeroTermsQuery zeroTermsQuery;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MultiMatchQuery(Builder builder) {
-		super(builder);
-
-		this.analyzer = builder.analyzer;
-		this.autoGenerateSynonymsPhraseQuery = builder.autoGenerateSynonymsPhraseQuery;
-		this.cutoffFrequency = builder.cutoffFrequency;
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-		this.fuzziness = builder.fuzziness;
-		this.fuzzyRewrite = builder.fuzzyRewrite;
-		this.fuzzyTranspositions = builder.fuzzyTranspositions;
-		this.lenient = builder.lenient;
-		this.maxExpansions = builder.maxExpansions;
-		this.minimumShouldMatch = builder.minimumShouldMatch;
-		this.operator = builder.operator;
-		this.prefixLength = builder.prefixLength;
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-		this.slop = builder.slop;
-		this.tieBreaker = builder.tieBreaker;
-		this.type = builder.type;
-		this.zeroTermsQuery = builder.zeroTermsQuery;
-
-	}
-
-	public static MultiMatchQuery of(Function<Builder, ObjectBuilder<MultiMatchQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.MultiMatch;
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * API name: {@code auto_generate_synonyms_phrase_query}
-	 */
-	@Nullable
-	public final Boolean autoGenerateSynonymsPhraseQuery() {
-		return this.autoGenerateSynonymsPhraseQuery;
-	}
-
-	/**
-	 * API name: {@code cutoff_frequency}
-	 * 
-	 * @deprecated 7.3.0
-	 */
-	@Deprecated
-	@Nullable
-	public final Double cutoffFrequency() {
-		return this.cutoffFrequency;
-	}
-
-	/**
-	 * API name: {@code fields}
-	 */
-	public final List<String> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * API name: {@code fuzziness}
-	 */
-	@Nullable
-	public final String fuzziness() {
-		return this.fuzziness;
-	}
-
-	/**
-	 * API name: {@code fuzzy_rewrite}
-	 */
-	@Nullable
-	public final String fuzzyRewrite() {
-		return this.fuzzyRewrite;
-	}
-
-	/**
-	 * API name: {@code fuzzy_transpositions}
-	 */
-	@Nullable
-	public final Boolean fuzzyTranspositions() {
-		return this.fuzzyTranspositions;
-	}
-
-	/**
-	 * API name: {@code lenient}
-	 */
-	@Nullable
-	public final Boolean lenient() {
-		return this.lenient;
-	}
-
-	/**
-	 * API name: {@code max_expansions}
-	 */
-	@Nullable
-	public final Integer maxExpansions() {
-		return this.maxExpansions;
-	}
-
-	/**
-	 * API name: {@code minimum_should_match}
-	 */
-	@Nullable
-	public final String minimumShouldMatch() {
-		return this.minimumShouldMatch;
-	}
-
-	/**
-	 * API name: {@code operator}
-	 */
-	@Nullable
-	public final Operator operator() {
-		return this.operator;
-	}
-
-	/**
-	 * API name: {@code prefix_length}
-	 */
-	@Nullable
-	public final Integer prefixLength() {
-		return this.prefixLength;
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final String query() {
-		return this.query;
-	}
-
-	/**
-	 * API name: {@code slop}
-	 */
-	@Nullable
-	public final Integer slop() {
-		return this.slop;
-	}
-
-	/**
-	 * API name: {@code tie_breaker}
-	 */
-	@Nullable
-	public final Double tieBreaker() {
-		return this.tieBreaker;
-	}
-
-	/**
-	 * API name: {@code type}
-	 */
-	@Nullable
-	public final TextQueryType type() {
-		return this.type;
-	}
-
-	/**
-	 * API name: {@code zero_terms_query}
-	 */
-	@Nullable
-	public final ZeroTermsQuery zeroTermsQuery() {
-		return this.zeroTermsQuery;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			generator.write(this.analyzer);
-
-		}
-		if (this.autoGenerateSynonymsPhraseQuery != null) {
-			generator.writeKey("auto_generate_synonyms_phrase_query");
-			generator.write(this.autoGenerateSynonymsPhraseQuery);
-
-		}
-		if (this.cutoffFrequency != null) {
-			generator.writeKey("cutoff_frequency");
-			generator.write(this.cutoffFrequency);
-
-		}
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartArray();
-			for (String item0 : this.fields) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.fuzziness != null) {
-			generator.writeKey("fuzziness");
-			generator.write(this.fuzziness);
-
-		}
-		if (this.fuzzyRewrite != null) {
-			generator.writeKey("fuzzy_rewrite");
-			generator.write(this.fuzzyRewrite);
-
-		}
-		if (this.fuzzyTranspositions != null) {
-			generator.writeKey("fuzzy_transpositions");
-			generator.write(this.fuzzyTranspositions);
-
-		}
-		if (this.lenient != null) {
-			generator.writeKey("lenient");
-			generator.write(this.lenient);
-
-		}
-		if (this.maxExpansions != null) {
-			generator.writeKey("max_expansions");
-			generator.write(this.maxExpansions);
-
-		}
-		if (this.minimumShouldMatch != null) {
-			generator.writeKey("minimum_should_match");
-			generator.write(this.minimumShouldMatch);
-
-		}
-		if (this.operator != null) {
-			generator.writeKey("operator");
-			this.operator.serialize(generator, mapper);
-		}
-		if (this.prefixLength != null) {
-			generator.writeKey("prefix_length");
-			generator.write(this.prefixLength);
-
-		}
-		generator.writeKey("query");
-		generator.write(this.query);
-
-		if (this.slop != null) {
-			generator.writeKey("slop");
-			generator.write(this.slop);
-
-		}
-		if (this.tieBreaker != null) {
-			generator.writeKey("tie_breaker");
-			generator.write(this.tieBreaker);
-
-		}
-		if (this.type != null) {
-			generator.writeKey("type");
-			this.type.serialize(generator, mapper);
-		}
-		if (this.zeroTermsQuery != null) {
-			generator.writeKey("zero_terms_query");
-			this.zeroTermsQuery.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MultiMatchQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<MultiMatchQuery> {
-		@Nullable
-		private String analyzer;
-
-		@Nullable
-		private Boolean autoGenerateSynonymsPhraseQuery;
-
-		@Nullable
-		private Double cutoffFrequency;
-
-		@Nullable
-		private List<String> fields;
-
-		@Nullable
-		private String fuzziness;
-
-		@Nullable
-		private String fuzzyRewrite;
-
-		@Nullable
-		private Boolean fuzzyTranspositions;
-
-		@Nullable
-		private Boolean lenient;
-
-		@Nullable
-		private Integer maxExpansions;
-
-		@Nullable
-		private String minimumShouldMatch;
-
-		@Nullable
-		private Operator operator;
-
-		@Nullable
-		private Integer prefixLength;
-
-		private String query;
-
-		@Nullable
-		private Integer slop;
-
-		@Nullable
-		private Double tieBreaker;
-
-		@Nullable
-		private TextQueryType type;
-
-		@Nullable
-		private ZeroTermsQuery zeroTermsQuery;
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code auto_generate_synonyms_phrase_query}
-		 */
-		public final Builder autoGenerateSynonymsPhraseQuery(@Nullable Boolean value) {
-			this.autoGenerateSynonymsPhraseQuery = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code cutoff_frequency}
-		 * 
-		 * @deprecated 7.3.0
-		 */
-		@Deprecated
-		public final Builder cutoffFrequency(@Nullable Double value) {
-			this.cutoffFrequency = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fields</code>.
-		 */
-		public final Builder fields(List<String> list) {
-			this.fields = _listAddAll(this.fields, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds one or more values to <code>fields</code>.
-		 */
-		public final Builder fields(String value, String... values) {
-			this.fields = _listAdd(this.fields, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzziness}
-		 */
-		public final Builder fuzziness(@Nullable String value) {
-			this.fuzziness = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzzy_rewrite}
-		 */
-		public final Builder fuzzyRewrite(@Nullable String value) {
-			this.fuzzyRewrite = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzzy_transpositions}
-		 */
-		public final Builder fuzzyTranspositions(@Nullable Boolean value) {
-			this.fuzzyTranspositions = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code lenient}
-		 */
-		public final Builder lenient(@Nullable Boolean value) {
-			this.lenient = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_expansions}
-		 */
-		public final Builder maxExpansions(@Nullable Integer value) {
-			this.maxExpansions = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code minimum_should_match}
-		 */
-		public final Builder minimumShouldMatch(@Nullable String value) {
-			this.minimumShouldMatch = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code operator}
-		 */
-		public final Builder operator(@Nullable Operator value) {
-			this.operator = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code prefix_length}
-		 */
-		public final Builder prefixLength(@Nullable Integer value) {
-			this.prefixLength = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(String value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code slop}
-		 */
-		public final Builder slop(@Nullable Integer value) {
-			this.slop = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code tie_breaker}
-		 */
-		public final Builder tieBreaker(@Nullable Double value) {
-			this.tieBreaker = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code type}
-		 */
-		public final Builder type(@Nullable TextQueryType value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code zero_terms_query}
-		 */
-		public final Builder zeroTermsQuery(@Nullable ZeroTermsQuery value) {
-			this.zeroTermsQuery = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MultiMatchQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MultiMatchQuery build() {
-			_checkSingleUse();
-
-			return new MultiMatchQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MultiMatchQuery}
-	 */
-	public static final JsonpDeserializer<MultiMatchQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			MultiMatchQuery::setupMultiMatchQueryDeserializer);
-
-	protected static void setupMultiMatchQueryDeserializer(ObjectDeserializer<MultiMatchQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(Builder::autoGenerateSynonymsPhraseQuery, JsonpDeserializer.booleanDeserializer(),
-				"auto_generate_synonyms_phrase_query");
-		op.add(Builder::cutoffFrequency, JsonpDeserializer.doubleDeserializer(), "cutoff_frequency");
-		op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "fields");
-		op.add(Builder::fuzziness, JsonpDeserializer.stringDeserializer(), "fuzziness");
-		op.add(Builder::fuzzyRewrite, JsonpDeserializer.stringDeserializer(), "fuzzy_rewrite");
-		op.add(Builder::fuzzyTranspositions, JsonpDeserializer.booleanDeserializer(), "fuzzy_transpositions");
-		op.add(Builder::lenient, JsonpDeserializer.booleanDeserializer(), "lenient");
-		op.add(Builder::maxExpansions, JsonpDeserializer.integerDeserializer(), "max_expansions");
-		op.add(Builder::minimumShouldMatch, JsonpDeserializer.stringDeserializer(), "minimum_should_match");
-		op.add(Builder::operator, Operator._DESERIALIZER, "operator");
-		op.add(Builder::prefixLength, JsonpDeserializer.integerDeserializer(), "prefix_length");
-		op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
-		op.add(Builder::slop, JsonpDeserializer.integerDeserializer(), "slop");
-		op.add(Builder::tieBreaker, JsonpDeserializer.doubleDeserializer(), "tie_breaker");
-		op.add(Builder::type, TextQueryType._DESERIALIZER, "type");
-		op.add(Builder::zeroTermsQuery, ZeroTermsQuery._DESERIALIZER, "zero_terms_query");
-
-	}
+    @Nullable
+    private final Boolean autoGenerateSynonymsPhraseQuery;
+
+    @Nullable
+    private final Double cutoffFrequency;
+
+    private final List<String> fields;
+
+    @Nullable
+    private final String fuzziness;
+
+    @Nullable
+    private final String fuzzyRewrite;
+
+    @Nullable
+    private final Boolean fuzzyTranspositions;
+
+    @Nullable
+    private final Boolean lenient;
+
+    @Nullable
+    private final Integer maxExpansions;
+
+    @Nullable
+    private final String minimumShouldMatch;
+
+    @Nullable
+    private final Operator operator;
+
+    @Nullable
+    private final Integer prefixLength;
+
+    private final String query;
+
+    @Nullable
+    private final Integer slop;
+
+    @Nullable
+    private final Double tieBreaker;
+
+    @Nullable
+    private final TextQueryType type;
+
+    @Nullable
+    private final ZeroTermsQuery zeroTermsQuery;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MultiMatchQuery(Builder builder) {
+        super(builder);
+
+        this.analyzer = builder.analyzer;
+        this.autoGenerateSynonymsPhraseQuery = builder.autoGenerateSynonymsPhraseQuery;
+        this.cutoffFrequency = builder.cutoffFrequency;
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.fuzziness = builder.fuzziness;
+        this.fuzzyRewrite = builder.fuzzyRewrite;
+        this.fuzzyTranspositions = builder.fuzzyTranspositions;
+        this.lenient = builder.lenient;
+        this.maxExpansions = builder.maxExpansions;
+        this.minimumShouldMatch = builder.minimumShouldMatch;
+        this.operator = builder.operator;
+        this.prefixLength = builder.prefixLength;
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+        this.slop = builder.slop;
+        this.tieBreaker = builder.tieBreaker;
+        this.type = builder.type;
+        this.zeroTermsQuery = builder.zeroTermsQuery;
+
+    }
+
+    public static MultiMatchQuery of(Function<Builder, ObjectBuilder<MultiMatchQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.MultiMatch;
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * API name: {@code auto_generate_synonyms_phrase_query}
+     */
+    @Nullable
+    public final Boolean autoGenerateSynonymsPhraseQuery() {
+        return this.autoGenerateSynonymsPhraseQuery;
+    }
+
+    /**
+     * API name: {@code cutoff_frequency}
+     *
+     * @deprecated 7.3.0
+     */
+    @Deprecated
+    @Nullable
+    public final Double cutoffFrequency() {
+        return this.cutoffFrequency;
+    }
+
+    /**
+     * API name: {@code fields}
+     */
+    public final List<String> fields() {
+        return this.fields;
+    }
+
+    /**
+     * API name: {@code fuzziness}
+     */
+    @Nullable
+    public final String fuzziness() {
+        return this.fuzziness;
+    }
+
+    /**
+     * API name: {@code fuzzy_rewrite}
+     */
+    @Nullable
+    public final String fuzzyRewrite() {
+        return this.fuzzyRewrite;
+    }
+
+    /**
+     * API name: {@code fuzzy_transpositions}
+     */
+    @Nullable
+    public final Boolean fuzzyTranspositions() {
+        return this.fuzzyTranspositions;
+    }
+
+    /**
+     * API name: {@code lenient}
+     */
+    @Nullable
+    public final Boolean lenient() {
+        return this.lenient;
+    }
+
+    /**
+     * API name: {@code max_expansions}
+     */
+    @Nullable
+    public final Integer maxExpansions() {
+        return this.maxExpansions;
+    }
+
+    /**
+     * API name: {@code minimum_should_match}
+     */
+    @Nullable
+    public final String minimumShouldMatch() {
+        return this.minimumShouldMatch;
+    }
+
+    /**
+     * API name: {@code operator}
+     */
+    @Nullable
+    public final Operator operator() {
+        return this.operator;
+    }
+
+    /**
+     * API name: {@code prefix_length}
+     */
+    @Nullable
+    public final Integer prefixLength() {
+        return this.prefixLength;
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final String query() {
+        return this.query;
+    }
+
+    /**
+     * API name: {@code slop}
+     */
+    @Nullable
+    public final Integer slop() {
+        return this.slop;
+    }
+
+    /**
+     * API name: {@code tie_breaker}
+     */
+    @Nullable
+    public final Double tieBreaker() {
+        return this.tieBreaker;
+    }
+
+    /**
+     * API name: {@code type}
+     */
+    @Nullable
+    public final TextQueryType type() {
+        return this.type;
+    }
+
+    /**
+     * API name: {@code zero_terms_query}
+     */
+    @Nullable
+    public final ZeroTermsQuery zeroTermsQuery() {
+        return this.zeroTermsQuery;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            generator.write(this.analyzer);
+
+        }
+        if (this.autoGenerateSynonymsPhraseQuery != null) {
+            generator.writeKey("auto_generate_synonyms_phrase_query");
+            generator.write(this.autoGenerateSynonymsPhraseQuery);
+
+        }
+        if (this.cutoffFrequency != null) {
+            generator.writeKey("cutoff_frequency");
+            generator.write(this.cutoffFrequency);
+
+        }
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartArray();
+            for (String item0 : this.fields) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.fuzziness != null) {
+            generator.writeKey("fuzziness");
+            generator.write(this.fuzziness);
+
+        }
+        if (this.fuzzyRewrite != null) {
+            generator.writeKey("fuzzy_rewrite");
+            generator.write(this.fuzzyRewrite);
+
+        }
+        if (this.fuzzyTranspositions != null) {
+            generator.writeKey("fuzzy_transpositions");
+            generator.write(this.fuzzyTranspositions);
+
+        }
+        if (this.lenient != null) {
+            generator.writeKey("lenient");
+            generator.write(this.lenient);
+
+        }
+        if (this.maxExpansions != null) {
+            generator.writeKey("max_expansions");
+            generator.write(this.maxExpansions);
+
+        }
+        if (this.minimumShouldMatch != null) {
+            generator.writeKey("minimum_should_match");
+            generator.write(this.minimumShouldMatch);
+
+        }
+        if (this.operator != null) {
+            generator.writeKey("operator");
+            this.operator.serialize(generator, mapper);
+        }
+        if (this.prefixLength != null) {
+            generator.writeKey("prefix_length");
+            generator.write(this.prefixLength);
+
+        }
+        generator.writeKey("query");
+        generator.write(this.query);
+
+        if (this.slop != null) {
+            generator.writeKey("slop");
+            generator.write(this.slop);
+
+        }
+        if (this.tieBreaker != null) {
+            generator.writeKey("tie_breaker");
+            generator.write(this.tieBreaker);
+
+        }
+        if (this.type != null) {
+            generator.writeKey("type");
+            this.type.serialize(generator, mapper);
+        }
+        if (this.zeroTermsQuery != null) {
+            generator.writeKey("zero_terms_query");
+            this.zeroTermsQuery.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MultiMatchQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<MultiMatchQuery> {
+        @Nullable
+        private String analyzer;
+
+        @Nullable
+        private Boolean autoGenerateSynonymsPhraseQuery;
+
+        @Nullable
+        private Double cutoffFrequency;
+
+        @Nullable
+        private List<String> fields;
+
+        @Nullable
+        private String fuzziness;
+
+        @Nullable
+        private String fuzzyRewrite;
+
+        @Nullable
+        private Boolean fuzzyTranspositions;
+
+        @Nullable
+        private Boolean lenient;
+
+        @Nullable
+        private Integer maxExpansions;
+
+        @Nullable
+        private String minimumShouldMatch;
+
+        @Nullable
+        private Operator operator;
+
+        @Nullable
+        private Integer prefixLength;
+
+        private String query;
+
+        @Nullable
+        private Integer slop;
+
+        @Nullable
+        private Double tieBreaker;
+
+        @Nullable
+        private TextQueryType type;
+
+        @Nullable
+        private ZeroTermsQuery zeroTermsQuery;
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code auto_generate_synonyms_phrase_query}
+         */
+        public final Builder autoGenerateSynonymsPhraseQuery(@Nullable Boolean value) {
+            this.autoGenerateSynonymsPhraseQuery = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code cutoff_frequency}
+         *
+         * @deprecated 7.3.0
+         */
+        @Deprecated
+        public final Builder cutoffFrequency(@Nullable Double value) {
+            this.cutoffFrequency = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fields</code>.
+         */
+        public final Builder fields(List<String> list) {
+            this.fields = _listAddAll(this.fields, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds one or more values to <code>fields</code>.
+         */
+        public final Builder fields(String value, String... values) {
+            this.fields = _listAdd(this.fields, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzziness}
+         */
+        public final Builder fuzziness(@Nullable String value) {
+            this.fuzziness = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzzy_rewrite}
+         */
+        public final Builder fuzzyRewrite(@Nullable String value) {
+            this.fuzzyRewrite = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzzy_transpositions}
+         */
+        public final Builder fuzzyTranspositions(@Nullable Boolean value) {
+            this.fuzzyTranspositions = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code lenient}
+         */
+        public final Builder lenient(@Nullable Boolean value) {
+            this.lenient = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_expansions}
+         */
+        public final Builder maxExpansions(@Nullable Integer value) {
+            this.maxExpansions = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code minimum_should_match}
+         */
+        public final Builder minimumShouldMatch(@Nullable String value) {
+            this.minimumShouldMatch = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code operator}
+         */
+        public final Builder operator(@Nullable Operator value) {
+            this.operator = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code prefix_length}
+         */
+        public final Builder prefixLength(@Nullable Integer value) {
+            this.prefixLength = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(String value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code slop}
+         */
+        public final Builder slop(@Nullable Integer value) {
+            this.slop = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code tie_breaker}
+         */
+        public final Builder tieBreaker(@Nullable Double value) {
+            this.tieBreaker = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code type}
+         */
+        public final Builder type(@Nullable TextQueryType value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code zero_terms_query}
+         */
+        public final Builder zeroTermsQuery(@Nullable ZeroTermsQuery value) {
+            this.zeroTermsQuery = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MultiMatchQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MultiMatchQuery build() {
+            _checkSingleUse();
+
+            return new MultiMatchQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MultiMatchQuery}
+     */
+    public static final JsonpDeserializer<MultiMatchQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MultiMatchQuery::setupMultiMatchQueryDeserializer
+    );
+
+    protected static void setupMultiMatchQueryDeserializer(ObjectDeserializer<MultiMatchQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(Builder::autoGenerateSynonymsPhraseQuery, JsonpDeserializer.booleanDeserializer(), "auto_generate_synonyms_phrase_query");
+        op.add(Builder::cutoffFrequency, JsonpDeserializer.doubleDeserializer(), "cutoff_frequency");
+        op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "fields");
+        op.add(Builder::fuzziness, JsonpDeserializer.stringDeserializer(), "fuzziness");
+        op.add(Builder::fuzzyRewrite, JsonpDeserializer.stringDeserializer(), "fuzzy_rewrite");
+        op.add(Builder::fuzzyTranspositions, JsonpDeserializer.booleanDeserializer(), "fuzzy_transpositions");
+        op.add(Builder::lenient, JsonpDeserializer.booleanDeserializer(), "lenient");
+        op.add(Builder::maxExpansions, JsonpDeserializer.integerDeserializer(), "max_expansions");
+        op.add(Builder::minimumShouldMatch, JsonpDeserializer.stringDeserializer(), "minimum_should_match");
+        op.add(Builder::operator, Operator._DESERIALIZER, "operator");
+        op.add(Builder::prefixLength, JsonpDeserializer.integerDeserializer(), "prefix_length");
+        op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
+        op.add(Builder::slop, JsonpDeserializer.integerDeserializer(), "slop");
+        op.add(Builder::tieBreaker, JsonpDeserializer.doubleDeserializer(), "tie_breaker");
+        op.add(Builder::type, TextQueryType._DESERIALIZER, "type");
+        op.add(Builder::zeroTermsQuery, ZeroTermsQuery._DESERIALIZER, "zero_terms_query");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MultiValueMode.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MultiValueMode.java
index 7386cb877c..8e661b35ed 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MultiValueMode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/MultiValueMode.java
@@ -35,29 +35,27 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum MultiValueMode implements JsonEnum {
-	Min("min"),
+    Min("min"),
 
-	Max("max"),
+    Max("max"),
 
-	Avg("avg"),
+    Avg("avg"),
 
-	Sum("sum"),
+    Sum("sum"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	MultiValueMode(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    MultiValueMode(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<MultiValueMode> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			MultiValueMode.values());
+    public static final JsonEnum.Deserializer<MultiValueMode> _DESERIALIZER = new JsonEnum.Deserializer<>(MultiValueMode.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/NestedQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/NestedQuery.java
index c98c2861bd..ce3f8cf3d0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/NestedQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/NestedQuery.java
@@ -32,233 +32,234 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch.core.search.InnerHits;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.search.InnerHits;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.NestedQuery
 
-
 @JsonpDeserializable
 public class NestedQuery extends QueryBase implements QueryVariant {
-	@Nullable
-	private final Boolean ignoreUnmapped;
-
-	@Nullable
-	private final InnerHits innerHits;
-
-	private final String path;
-
-	private final Query query;
-
-	@Nullable
-	private final ChildScoreMode scoreMode;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NestedQuery(Builder builder) {
-		super(builder);
-
-		this.ignoreUnmapped = builder.ignoreUnmapped;
-		this.innerHits = builder.innerHits;
-		this.path = ApiTypeHelper.requireNonNull(builder.path, this, "path");
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-		this.scoreMode = builder.scoreMode;
-
-	}
-
-	public static NestedQuery of(Function<Builder, ObjectBuilder<NestedQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Nested;
-	}
-
-	/**
-	 * API name: {@code ignore_unmapped}
-	 */
-	@Nullable
-	public final Boolean ignoreUnmapped() {
-		return this.ignoreUnmapped;
-	}
-
-	/**
-	 * API name: {@code inner_hits}
-	 */
-	@Nullable
-	public final InnerHits innerHits() {
-		return this.innerHits;
-	}
-
-	/**
-	 * Required - API name: {@code path}
-	 */
-	public final String path() {
-		return this.path;
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final Query query() {
-		return this.query;
-	}
-
-	/**
-	 * API name: {@code score_mode}
-	 */
-	@Nullable
-	public final ChildScoreMode scoreMode() {
-		return this.scoreMode;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.ignoreUnmapped != null) {
-			generator.writeKey("ignore_unmapped");
-			generator.write(this.ignoreUnmapped);
-
-		}
-		if (this.innerHits != null) {
-			generator.writeKey("inner_hits");
-			this.innerHits.serialize(generator, mapper);
-
-		}
-		generator.writeKey("path");
-		generator.write(this.path);
-
-		generator.writeKey("query");
-		this.query.serialize(generator, mapper);
-
-		if (this.scoreMode != null) {
-			generator.writeKey("score_mode");
-			this.scoreMode.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NestedQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<NestedQuery> {
-		@Nullable
-		private Boolean ignoreUnmapped;
-
-		@Nullable
-		private InnerHits innerHits;
-
-		private String path;
-
-		private Query query;
-
-		@Nullable
-		private ChildScoreMode scoreMode;
-
-		/**
-		 * API name: {@code ignore_unmapped}
-		 */
-		public final Builder ignoreUnmapped(@Nullable Boolean value) {
-			this.ignoreUnmapped = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code inner_hits}
-		 */
-		public final Builder innerHits(@Nullable InnerHits value) {
-			this.innerHits = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code inner_hits}
-		 */
-		public final Builder innerHits(Function<InnerHits.Builder, ObjectBuilder<InnerHits>> fn) {
-			return this.innerHits(fn.apply(new InnerHits.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code path}
-		 */
-		public final Builder path(String value) {
-			this.path = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(Query value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.query(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code score_mode}
-		 */
-		public final Builder scoreMode(@Nullable ChildScoreMode value) {
-			this.scoreMode = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NestedQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NestedQuery build() {
-			_checkSingleUse();
-
-			return new NestedQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NestedQuery}
-	 */
-	public static final JsonpDeserializer<NestedQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NestedQuery::setupNestedQueryDeserializer);
-
-	protected static void setupNestedQueryDeserializer(ObjectDeserializer<NestedQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
-		op.add(Builder::innerHits, InnerHits._DESERIALIZER, "inner_hits");
-		op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
-		op.add(Builder::query, Query._DESERIALIZER, "query");
-		op.add(Builder::scoreMode, ChildScoreMode._DESERIALIZER, "score_mode");
-
-	}
+    @Nullable
+    private final Boolean ignoreUnmapped;
+
+    @Nullable
+    private final InnerHits innerHits;
+
+    private final String path;
+
+    private final Query query;
+
+    @Nullable
+    private final ChildScoreMode scoreMode;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NestedQuery(Builder builder) {
+        super(builder);
+
+        this.ignoreUnmapped = builder.ignoreUnmapped;
+        this.innerHits = builder.innerHits;
+        this.path = ApiTypeHelper.requireNonNull(builder.path, this, "path");
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+        this.scoreMode = builder.scoreMode;
+
+    }
+
+    public static NestedQuery of(Function<Builder, ObjectBuilder<NestedQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Nested;
+    }
+
+    /**
+     * API name: {@code ignore_unmapped}
+     */
+    @Nullable
+    public final Boolean ignoreUnmapped() {
+        return this.ignoreUnmapped;
+    }
+
+    /**
+     * API name: {@code inner_hits}
+     */
+    @Nullable
+    public final InnerHits innerHits() {
+        return this.innerHits;
+    }
+
+    /**
+     * Required - API name: {@code path}
+     */
+    public final String path() {
+        return this.path;
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final Query query() {
+        return this.query;
+    }
+
+    /**
+     * API name: {@code score_mode}
+     */
+    @Nullable
+    public final ChildScoreMode scoreMode() {
+        return this.scoreMode;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.ignoreUnmapped != null) {
+            generator.writeKey("ignore_unmapped");
+            generator.write(this.ignoreUnmapped);
+
+        }
+        if (this.innerHits != null) {
+            generator.writeKey("inner_hits");
+            this.innerHits.serialize(generator, mapper);
+
+        }
+        generator.writeKey("path");
+        generator.write(this.path);
+
+        generator.writeKey("query");
+        this.query.serialize(generator, mapper);
+
+        if (this.scoreMode != null) {
+            generator.writeKey("score_mode");
+            this.scoreMode.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NestedQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<NestedQuery> {
+        @Nullable
+        private Boolean ignoreUnmapped;
+
+        @Nullable
+        private InnerHits innerHits;
+
+        private String path;
+
+        private Query query;
+
+        @Nullable
+        private ChildScoreMode scoreMode;
+
+        /**
+         * API name: {@code ignore_unmapped}
+         */
+        public final Builder ignoreUnmapped(@Nullable Boolean value) {
+            this.ignoreUnmapped = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code inner_hits}
+         */
+        public final Builder innerHits(@Nullable InnerHits value) {
+            this.innerHits = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code inner_hits}
+         */
+        public final Builder innerHits(Function<InnerHits.Builder, ObjectBuilder<InnerHits>> fn) {
+            return this.innerHits(fn.apply(new InnerHits.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code path}
+         */
+        public final Builder path(String value) {
+            this.path = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(Query value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.query(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code score_mode}
+         */
+        public final Builder scoreMode(@Nullable ChildScoreMode value) {
+            this.scoreMode = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link NestedQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NestedQuery build() {
+            _checkSingleUse();
+
+            return new NestedQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NestedQuery}
+     */
+    public static final JsonpDeserializer<NestedQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NestedQuery::setupNestedQueryDeserializer
+    );
+
+    protected static void setupNestedQueryDeserializer(ObjectDeserializer<NestedQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
+        op.add(Builder::innerHits, InnerHits._DESERIALIZER, "inner_hits");
+        op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
+        op.add(Builder::query, Query._DESERIALIZER, "query");
+        op.add(Builder::scoreMode, ChildScoreMode._DESERIALIZER, "score_mode");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/Operator.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/Operator.java
index 4b19e32d32..1d5891ef78 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/Operator.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/Operator.java
@@ -35,30 +35,29 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum Operator implements JsonEnum {
-	And("and", "AND"),
+    And("and", "AND"),
 
-	Or("or", "OR"),
+    Or("or", "OR"),
 
-	;
+    ;
 
-	private final String jsonValue;
-	private final String[] aliases;
+    private final String jsonValue;
+    private final String[] aliases;
 
-	Operator(String jsonValue, String... aliases) {
-		this.jsonValue = jsonValue;
-		this.aliases = aliases;
-	}
+    Operator(String jsonValue, String... aliases) {
+        this.jsonValue = jsonValue;
+        this.aliases = aliases;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public String[] aliases() {
-		return this.aliases;
-	}
+    public String[] aliases() {
+        return this.aliases;
+    }
 
-	public static final JsonEnum.Deserializer<Operator> _DESERIALIZER = new JsonEnum.Deserializer<>(Operator.values());
+    public static final JsonEnum.Deserializer<Operator> _DESERIALIZER = new JsonEnum.Deserializer<>(Operator.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ParentIdQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ParentIdQuery.java
index 1b70d9b6cd..198932a774 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ParentIdQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ParentIdQuery.java
@@ -32,170 +32,171 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.ParentIdQuery
 
-
 @JsonpDeserializable
 public class ParentIdQuery extends QueryBase implements QueryVariant {
-	@Nullable
-	private final String id;
-
-	@Nullable
-	private final Boolean ignoreUnmapped;
-
-	@Nullable
-	private final String type;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ParentIdQuery(Builder builder) {
-		super(builder);
-
-		this.id = builder.id;
-		this.ignoreUnmapped = builder.ignoreUnmapped;
-		this.type = builder.type;
-
-	}
-
-	public static ParentIdQuery of(Function<Builder, ObjectBuilder<ParentIdQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.ParentId;
-	}
-
-	/**
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * API name: {@code ignore_unmapped}
-	 */
-	@Nullable
-	public final Boolean ignoreUnmapped() {
-		return this.ignoreUnmapped;
-	}
-
-	/**
-	 * API name: {@code type}
-	 */
-	@Nullable
-	public final String type() {
-		return this.type;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.id != null) {
-			generator.writeKey("id");
-			generator.write(this.id);
-
-		}
-		if (this.ignoreUnmapped != null) {
-			generator.writeKey("ignore_unmapped");
-			generator.write(this.ignoreUnmapped);
-
-		}
-		if (this.type != null) {
-			generator.writeKey("type");
-			generator.write(this.type);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ParentIdQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<ParentIdQuery> {
-		@Nullable
-		private String id;
-
-		@Nullable
-		private Boolean ignoreUnmapped;
-
-		@Nullable
-		private String type;
-
-		/**
-		 * API name: {@code id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_unmapped}
-		 */
-		public final Builder ignoreUnmapped(@Nullable Boolean value) {
-			this.ignoreUnmapped = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code type}
-		 */
-		public final Builder type(@Nullable String value) {
-			this.type = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ParentIdQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ParentIdQuery build() {
-			_checkSingleUse();
-
-			return new ParentIdQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ParentIdQuery}
-	 */
-	public static final JsonpDeserializer<ParentIdQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ParentIdQuery::setupParentIdQueryDeserializer);
-
-	protected static void setupParentIdQueryDeserializer(ObjectDeserializer<ParentIdQuery.Builder> op) {
-		setupQueryBaseDeserializer(op);
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-
-	}
+    @Nullable
+    private final String id;
+
+    @Nullable
+    private final Boolean ignoreUnmapped;
+
+    @Nullable
+    private final String type;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ParentIdQuery(Builder builder) {
+        super(builder);
+
+        this.id = builder.id;
+        this.ignoreUnmapped = builder.ignoreUnmapped;
+        this.type = builder.type;
+
+    }
+
+    public static ParentIdQuery of(Function<Builder, ObjectBuilder<ParentIdQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.ParentId;
+    }
+
+    /**
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * API name: {@code ignore_unmapped}
+     */
+    @Nullable
+    public final Boolean ignoreUnmapped() {
+        return this.ignoreUnmapped;
+    }
+
+    /**
+     * API name: {@code type}
+     */
+    @Nullable
+    public final String type() {
+        return this.type;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.id != null) {
+            generator.writeKey("id");
+            generator.write(this.id);
+
+        }
+        if (this.ignoreUnmapped != null) {
+            generator.writeKey("ignore_unmapped");
+            generator.write(this.ignoreUnmapped);
+
+        }
+        if (this.type != null) {
+            generator.writeKey("type");
+            generator.write(this.type);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ParentIdQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<ParentIdQuery> {
+        @Nullable
+        private String id;
+
+        @Nullable
+        private Boolean ignoreUnmapped;
+
+        @Nullable
+        private String type;
+
+        /**
+         * API name: {@code id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_unmapped}
+         */
+        public final Builder ignoreUnmapped(@Nullable Boolean value) {
+            this.ignoreUnmapped = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code type}
+         */
+        public final Builder type(@Nullable String value) {
+            this.type = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ParentIdQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ParentIdQuery build() {
+            _checkSingleUse();
+
+            return new ParentIdQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ParentIdQuery}
+     */
+    public static final JsonpDeserializer<ParentIdQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ParentIdQuery::setupParentIdQueryDeserializer
+    );
+
+    protected static void setupParentIdQueryDeserializer(ObjectDeserializer<ParentIdQuery.Builder> op) {
+        setupQueryBaseDeserializer(op);
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PercolateQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PercolateQuery.java
index aa80de575e..10098952f6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PercolateQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PercolateQuery.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,349 +44,346 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.PercolateQuery
 
-
 @JsonpDeserializable
 public class PercolateQuery extends QueryBase implements QueryVariant {
-	@Nullable
-	private final JsonData document;
-
-	private final List<JsonData> documents;
-
-	private final String field;
-
-	@Nullable
-	private final String id;
-
-	@Nullable
-	private final String index;
-
-	@Nullable
-	private final String name;
-
-	@Nullable
-	private final String preference;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final Long version;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PercolateQuery(Builder builder) {
-		super(builder);
-
-		this.document = builder.document;
-		this.documents = ApiTypeHelper.unmodifiable(builder.documents);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.id = builder.id;
-		this.index = builder.index;
-		this.name = builder.name;
-		this.preference = builder.preference;
-		this.routing = builder.routing;
-		this.version = builder.version;
-
-	}
-
-	public static PercolateQuery of(Function<Builder, ObjectBuilder<PercolateQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Percolate;
-	}
-
-	/**
-	 * API name: {@code document}
-	 */
-	@Nullable
-	public final JsonData document() {
-		return this.document;
-	}
-
-	/**
-	 * API name: {@code documents}
-	 */
-	public final List<JsonData> documents() {
-		return this.documents;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code name}
-	 */
-	@Nullable
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * API name: {@code preference}
-	 */
-	@Nullable
-	public final String preference() {
-		return this.preference;
-	}
-
-	/**
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.document != null) {
-			generator.writeKey("document");
-			this.document.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.documents)) {
-			generator.writeKey("documents");
-			generator.writeStartArray();
-			for (JsonData item0 : this.documents) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.id != null) {
-			generator.writeKey("id");
-			generator.write(this.id);
-
-		}
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.name != null) {
-			generator.writeKey("name");
-			generator.write(this.name);
-
-		}
-		if (this.preference != null) {
-			generator.writeKey("preference");
-			generator.write(this.preference);
-
-		}
-		if (this.routing != null) {
-			generator.writeKey("routing");
-			generator.write(this.routing);
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PercolateQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<PercolateQuery> {
-		@Nullable
-		private JsonData document;
-
-		@Nullable
-		private List<JsonData> documents;
-
-		private String field;
-
-		@Nullable
-		private String id;
-
-		@Nullable
-		private String index;
-
-		@Nullable
-		private String name;
-
-		@Nullable
-		private String preference;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private Long version;
-
-		/**
-		 * API name: {@code document}
-		 */
-		public final Builder document(@Nullable JsonData value) {
-			this.document = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code documents}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>documents</code>.
-		 */
-		public final Builder documents(List<JsonData> list) {
-			this.documents = _listAddAll(this.documents, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code documents}
-		 * <p>
-		 * Adds one or more values to <code>documents</code>.
-		 */
-		public final Builder documents(JsonData value, JsonData... values) {
-			this.documents = _listAdd(this.documents, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code name}
-		 */
-		public final Builder name(@Nullable String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code preference}
-		 */
-		public final Builder preference(@Nullable String value) {
-			this.preference = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PercolateQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PercolateQuery build() {
-			_checkSingleUse();
-
-			return new PercolateQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PercolateQuery}
-	 */
-	public static final JsonpDeserializer<PercolateQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			PercolateQuery::setupPercolateQueryDeserializer);
-
-	protected static void setupPercolateQueryDeserializer(ObjectDeserializer<PercolateQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::document, JsonData._DESERIALIZER, "document");
-		op.add(Builder::documents, JsonpDeserializer.arrayDeserializer(JsonData._DESERIALIZER), "documents");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::preference, JsonpDeserializer.stringDeserializer(), "preference");
-		op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
-
-	}
+    @Nullable
+    private final JsonData document;
+
+    private final List<JsonData> documents;
+
+    private final String field;
+
+    @Nullable
+    private final String id;
+
+    @Nullable
+    private final String index;
+
+    @Nullable
+    private final String name;
+
+    @Nullable
+    private final String preference;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final Long version;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PercolateQuery(Builder builder) {
+        super(builder);
+
+        this.document = builder.document;
+        this.documents = ApiTypeHelper.unmodifiable(builder.documents);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.id = builder.id;
+        this.index = builder.index;
+        this.name = builder.name;
+        this.preference = builder.preference;
+        this.routing = builder.routing;
+        this.version = builder.version;
+
+    }
+
+    public static PercolateQuery of(Function<Builder, ObjectBuilder<PercolateQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Percolate;
+    }
+
+    /**
+     * API name: {@code document}
+     */
+    @Nullable
+    public final JsonData document() {
+        return this.document;
+    }
+
+    /**
+     * API name: {@code documents}
+     */
+    public final List<JsonData> documents() {
+        return this.documents;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code name}
+     */
+    @Nullable
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * API name: {@code preference}
+     */
+    @Nullable
+    public final String preference() {
+        return this.preference;
+    }
+
+    /**
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.document != null) {
+            generator.writeKey("document");
+            this.document.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.documents)) {
+            generator.writeKey("documents");
+            generator.writeStartArray();
+            for (JsonData item0 : this.documents) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.id != null) {
+            generator.writeKey("id");
+            generator.write(this.id);
+
+        }
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.name != null) {
+            generator.writeKey("name");
+            generator.write(this.name);
+
+        }
+        if (this.preference != null) {
+            generator.writeKey("preference");
+            generator.write(this.preference);
+
+        }
+        if (this.routing != null) {
+            generator.writeKey("routing");
+            generator.write(this.routing);
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PercolateQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<PercolateQuery> {
+        @Nullable
+        private JsonData document;
+
+        @Nullable
+        private List<JsonData> documents;
+
+        private String field;
+
+        @Nullable
+        private String id;
+
+        @Nullable
+        private String index;
+
+        @Nullable
+        private String name;
+
+        @Nullable
+        private String preference;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private Long version;
+
+        /**
+         * API name: {@code document}
+         */
+        public final Builder document(@Nullable JsonData value) {
+            this.document = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code documents}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>documents</code>.
+         */
+        public final Builder documents(List<JsonData> list) {
+            this.documents = _listAddAll(this.documents, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code documents}
+         * <p>
+         * Adds one or more values to <code>documents</code>.
+         */
+        public final Builder documents(JsonData value, JsonData... values) {
+            this.documents = _listAdd(this.documents, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code name}
+         */
+        public final Builder name(@Nullable String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code preference}
+         */
+        public final Builder preference(@Nullable String value) {
+            this.preference = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PercolateQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PercolateQuery build() {
+            _checkSingleUse();
+
+            return new PercolateQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PercolateQuery}
+     */
+    public static final JsonpDeserializer<PercolateQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PercolateQuery::setupPercolateQueryDeserializer
+    );
+
+    protected static void setupPercolateQueryDeserializer(ObjectDeserializer<PercolateQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::document, JsonData._DESERIALIZER, "document");
+        op.add(Builder::documents, JsonpDeserializer.arrayDeserializer(JsonData._DESERIALIZER), "documents");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::preference, JsonpDeserializer.stringDeserializer(), "preference");
+        op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PinnedDoc.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PinnedDoc.java
index bd2d9be137..4fb7e7b956 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PinnedDoc.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PinnedDoc.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,117 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.PinnedDoc
 
-
 @JsonpDeserializable
 public class PinnedDoc implements JsonpSerializable {
-	private final String id;
-
-	private final String index;
-
-	// ---------------------------------------------------------------------------------------------
+    private final String id;
 
-	private PinnedDoc(Builder builder) {
+    private final String index;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+    private PinnedDoc(Builder builder) {
 
-	}
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
 
-	public static PinnedDoc of(Function<Builder, ObjectBuilder<PinnedDoc>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code _id}
-	 */
-	public final String id() {
-		return this.id;
-	}
+    public static PinnedDoc of(Function<Builder, ObjectBuilder<PinnedDoc>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code _index}
-	 */
-	public final String index() {
-		return this.index;
-	}
+    /**
+     * Required - API name: {@code _id}
+     */
+    public final String id() {
+        return this.id;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code _index}
+     */
+    public final String index() {
+        return this.index;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("_id");
-		generator.write(this.id);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("_index");
-		generator.write(this.index);
+        generator.writeKey("_id");
+        generator.write(this.id);
 
-	}
+        generator.writeKey("_index");
+        generator.write(this.index);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link PinnedDoc}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PinnedDoc> {
-		private String id;
+    /**
+     * Builder for {@link PinnedDoc}.
+     */
 
-		private String index;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PinnedDoc> {
+        private String id;
 
-		/**
-		 * Required - API name: {@code _id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
+        private String index;
 
-		/**
-		 * Required - API name: {@code _index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code _id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link PinnedDoc}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PinnedDoc build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code _index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
 
-			return new PinnedDoc(this);
-		}
-	}
+        /**
+         * Builds a {@link PinnedDoc}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PinnedDoc build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new PinnedDoc(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link PinnedDoc}
-	 */
-	public static final JsonpDeserializer<PinnedDoc> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			PinnedDoc::setupPinnedDocDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupPinnedDocDeserializer(ObjectDeserializer<PinnedDoc.Builder> op) {
+    /**
+     * Json deserializer for {@link PinnedDoc}
+     */
+    public static final JsonpDeserializer<PinnedDoc> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PinnedDoc::setupPinnedDocDeserializer
+    );
 
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
+    protected static void setupPinnedDocDeserializer(ObjectDeserializer<PinnedDoc.Builder> op) {
 
-	}
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PinnedQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PinnedQuery.java
index a7df859311..7c1d29ec7f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PinnedQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PinnedQuery.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -43,237 +46,233 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.PinnedQuery
 
-
 @JsonpDeserializable
-public class PinnedQuery extends QueryBase
-		implements
-			TaggedUnion<PinnedQuery.Kind, Object>,
-			QueryVariant,
-			JsonpSerializable {
-
-	/**
-	 * {@link PinnedQuery} variant kinds.
-	 */
-	/**
-	 * {@link PinnedQuery} variant kinds.
-	 */
-
-	public enum Kind implements JsonEnum {
-		Ids("ids"),
-
-		Docs("docs"),
-
-		;
-
-		private final String jsonValue;
-
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
-
-		public String jsonValue() {
-			return this.jsonValue;
-		}
-
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Pinned;
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private final Query organic;
-
-	private PinnedQuery(Builder builder) {
-		super(builder);
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-		this.organic = ApiTypeHelper.requireNonNull(builder.organic, this, "organic");
-
-	}
-
-	public static PinnedQuery of(Function<Builder, ObjectBuilder<PinnedQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code organic}
-	 */
-	public final Query organic() {
-		return this.organic;
-	}
-
-	/**
-	 * Is this variant instance of kind {@code ids}?
-	 */
-	public boolean isIds() {
-		return _kind == Kind.Ids;
-	}
-
-	/**
-	 * Get the {@code ids} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code ids} kind.
-	 */
-	public List<String> ids() {
-		return TaggedUnionUtils.get(this, Kind.Ids);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code docs}?
-	 */
-	public boolean isDocs() {
-		return _kind == Kind.Docs;
-	}
-
-	/**
-	 * Get the {@code docs} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code docs} kind.
-	 */
-	public List<PinnedDoc> docs() {
-		return TaggedUnionUtils.get(this, Kind.Docs);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeStartObject();
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("organic");
-		this.organic.serialize(generator, mapper);
-
-		generator.writeKey(_kind.jsonValue());
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Ids :
-					generator.writeStartArray();
-					for (String item0 : ((List<String>) this._value)) {
-						generator.write(item0);
-
-					}
-					generator.writeEnd();
-
-					break;
-				case Docs :
-					generator.writeStartArray();
-					for (PinnedDoc item0 : ((List<PinnedDoc>) this._value)) {
-						item0.serialize(generator, mapper);
-
-					}
-					generator.writeEnd();
-
-					break;
-			}
-		}
-
-		generator.writeEnd();
-
-	}
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> {
-		private Kind _kind;
-		private Object _value;
-
-		private Query organic;
-
-		/**
-		 * Required - API name: {@code organic}
-		 */
-		public final Builder organic(Query value) {
-			this.organic = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code organic}
-		 */
-		public final Builder organic(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.organic(fn.apply(new Query.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-		public ContainerBuilder ids(List<String> v) {
-			this._kind = Kind.Ids;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		public ContainerBuilder docs(List<PinnedDoc> v) {
-			this._kind = Kind.Docs;
-			this._value = v;
-			return new ContainerBuilder();
-		}
-
-		protected PinnedQuery build() {
-			_checkSingleUse();
-			return new PinnedQuery(this);
-		}
-
-		public class ContainerBuilder implements ObjectBuilder<PinnedQuery> {
-
-			/**
-			 * Required - API name: {@code organic}
-			 */
-			public final ContainerBuilder organic(Query value) {
-				Builder.this.organic = value;
-				return this;
-			}
-
-			/**
-			 * Required - API name: {@code organic}
-			 */
-			public final ContainerBuilder organic(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-				return this.organic(fn.apply(new Query.Builder()).build());
-			}
-
-			public PinnedQuery build() {
-				return Builder.this.build();
-			}
-		}
-	}
-
-	protected static void setupPinnedQueryDeserializer(ObjectDeserializer<Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::organic, Query._DESERIALIZER, "organic");
-		op.add(Builder::ids, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "ids");
-		op.add(Builder::docs, JsonpDeserializer.arrayDeserializer(PinnedDoc._DESERIALIZER), "docs");
-
-	}
-
-	public static final JsonpDeserializer<PinnedQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			PinnedQuery::setupPinnedQueryDeserializer, Builder::build);
+public class PinnedQuery extends QueryBase implements TaggedUnion<PinnedQuery.Kind, Object>, QueryVariant, JsonpSerializable {
+
+    /**
+     * {@link PinnedQuery} variant kinds.
+     */
+    /**
+     * {@link PinnedQuery} variant kinds.
+     */
+
+    public enum Kind implements JsonEnum {
+        Ids("ids"),
+
+        Docs("docs"),
+
+        ;
+
+        private final String jsonValue;
+
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
+
+        public String jsonValue() {
+            return this.jsonValue;
+        }
+
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Pinned;
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private final Query organic;
+
+    private PinnedQuery(Builder builder) {
+        super(builder);
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+        this.organic = ApiTypeHelper.requireNonNull(builder.organic, this, "organic");
+
+    }
+
+    public static PinnedQuery of(Function<Builder, ObjectBuilder<PinnedQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code organic}
+     */
+    public final Query organic() {
+        return this.organic;
+    }
+
+    /**
+     * Is this variant instance of kind {@code ids}?
+     */
+    public boolean isIds() {
+        return _kind == Kind.Ids;
+    }
+
+    /**
+     * Get the {@code ids} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code ids} kind.
+     */
+    public List<String> ids() {
+        return TaggedUnionUtils.get(this, Kind.Ids);
+    }
+
+    /**
+     * Is this variant instance of kind {@code docs}?
+     */
+    public boolean isDocs() {
+        return _kind == Kind.Docs;
+    }
+
+    /**
+     * Get the {@code docs} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code docs} kind.
+     */
+    public List<PinnedDoc> docs() {
+        return TaggedUnionUtils.get(this, Kind.Docs);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeStartObject();
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("organic");
+        this.organic.serialize(generator, mapper);
+
+        generator.writeKey(_kind.jsonValue());
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Ids:
+                    generator.writeStartArray();
+                    for (String item0 : ((List<String>) this._value)) {
+                        generator.write(item0);
+
+                    }
+                    generator.writeEnd();
+
+                    break;
+                case Docs:
+                    generator.writeStartArray();
+                    for (PinnedDoc item0 : ((List<PinnedDoc>) this._value)) {
+                        item0.serialize(generator, mapper);
+
+                    }
+                    generator.writeEnd();
+
+                    break;
+            }
+        }
+
+        generator.writeEnd();
+
+    }
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> {
+        private Kind _kind;
+        private Object _value;
+
+        private Query organic;
+
+        /**
+         * Required - API name: {@code organic}
+         */
+        public final Builder organic(Query value) {
+            this.organic = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code organic}
+         */
+        public final Builder organic(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.organic(fn.apply(new Query.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        public ContainerBuilder ids(List<String> v) {
+            this._kind = Kind.Ids;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        public ContainerBuilder docs(List<PinnedDoc> v) {
+            this._kind = Kind.Docs;
+            this._value = v;
+            return new ContainerBuilder();
+        }
+
+        protected PinnedQuery build() {
+            _checkSingleUse();
+            return new PinnedQuery(this);
+        }
+
+        public class ContainerBuilder implements ObjectBuilder<PinnedQuery> {
+
+            /**
+             * Required - API name: {@code organic}
+             */
+            public final ContainerBuilder organic(Query value) {
+                Builder.this.organic = value;
+                return this;
+            }
+
+            /**
+             * Required - API name: {@code organic}
+             */
+            public final ContainerBuilder organic(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+                return this.organic(fn.apply(new Query.Builder()).build());
+            }
+
+            public PinnedQuery build() {
+                return Builder.this.build();
+            }
+        }
+    }
+
+    protected static void setupPinnedQueryDeserializer(ObjectDeserializer<Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::organic, Query._DESERIALIZER, "organic");
+        op.add(Builder::ids, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "ids");
+        op.add(Builder::docs, JsonpDeserializer.arrayDeserializer(PinnedDoc._DESERIALIZER), "docs");
+
+    }
+
+    public static final JsonpDeserializer<PinnedQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PinnedQuery::setupPinnedQueryDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PinnedQueryBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PinnedQueryBuilders.java
index 58c8c1ef8c..b6a05c1cbf 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PinnedQueryBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PinnedQueryBuilders.java
@@ -37,10 +37,9 @@
  * <p>
  * Variants <code>ids</code>, <code>docs</code> are not available here as they
  * don't have a dedicated class. Use {@link PinnedQuery}'s builder for these.
- * 
+ *
  */
 public class PinnedQueryBuilders {
-	private PinnedQueryBuilders() {
-	}
+    private PinnedQueryBuilders() {}
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PinnedQueryVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PinnedQueryVariant.java
index eb46fd7e94..79ddb4b3b1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PinnedQueryVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PinnedQueryVariant.java
@@ -37,6 +37,6 @@
  */
 public interface PinnedQueryVariant {
 
-	PinnedQuery.Kind _pinnedQueryKind();
+    PinnedQuery.Kind _pinnedQueryKind();
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PrefixQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PrefixQuery.java
index 6d63afe06d..f34545c757 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PrefixQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/PrefixQuery.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,186 +42,184 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.PrefixQuery
 
-
 @JsonpDeserializable
 public class PrefixQuery extends QueryBase implements QueryVariant {
-	// Single key dictionary
-	private final String field;
-
-	@Nullable
-	private final String rewrite;
-
-	private final String value;
-
-	@Nullable
-	private final Boolean caseInsensitive;
+    // Single key dictionary
+    private final String field;
+
+    @Nullable
+    private final String rewrite;
+
+    private final String value;
+
+    @Nullable
+    private final Boolean caseInsensitive;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private PrefixQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-
-		this.rewrite = builder.rewrite;
-		this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
-		this.caseInsensitive = builder.caseInsensitive;
-
-	}
-
-	public static PrefixQuery of(Function<Builder, ObjectBuilder<PrefixQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Prefix;
-	}
-
-	/**
-	 * Required - The target field
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code rewrite}
-	 */
-	@Nullable
-	public final String rewrite() {
-		return this.rewrite;
-	}
-
-	/**
-	 * Required - API name: {@code value}
-	 */
-	public final String value() {
-		return this.value;
-	}
-
-	/**
-	 * API name: {@code case_insensitive}
-	 */
-	@Nullable
-	public final Boolean caseInsensitive() {
-		return this.caseInsensitive;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject(this.field);
-
-		super.serializeInternal(generator, mapper);
-		if (this.rewrite != null) {
-			generator.writeKey("rewrite");
-			generator.write(this.rewrite);
-
-		}
-		generator.writeKey("value");
-		generator.write(this.value);
-
-		if (this.caseInsensitive != null) {
-			generator.writeKey("case_insensitive");
-			generator.write(this.caseInsensitive);
-
-		}
-
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PrefixQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<PrefixQuery> {
-		private String field;
-
-		/**
-		 * Required - The target field
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		@Nullable
-		private String rewrite;
-
-		private String value;
-
-		@Nullable
-		private Boolean caseInsensitive;
-
-		/**
-		 * API name: {@code rewrite}
-		 */
-		public final Builder rewrite(@Nullable String value) {
-			this.rewrite = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code value}
-		 */
-		public final Builder value(String value) {
-			this.value = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code case_insensitive}
-		 */
-		public final Builder caseInsensitive(@Nullable Boolean value) {
-			this.caseInsensitive = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PrefixQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PrefixQuery build() {
-			_checkSingleUse();
-
-			return new PrefixQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PrefixQuery}
-	 */
-	public static final JsonpDeserializer<PrefixQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			PrefixQuery::setupPrefixQueryDeserializer);
-
-	protected static void setupPrefixQueryDeserializer(ObjectDeserializer<PrefixQuery.Builder> op) {
-		setupQueryBaseDeserializer(op);
-		op.add(Builder::rewrite, JsonpDeserializer.stringDeserializer(), "rewrite");
-		op.add(Builder::value, JsonpDeserializer.stringDeserializer(), "value");
-		op.add(Builder::caseInsensitive, JsonpDeserializer.booleanDeserializer(), "case_insensitive");
-
-		op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
-		op.shortcutProperty("value");
-
-	}
+    private PrefixQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+
+        this.rewrite = builder.rewrite;
+        this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
+        this.caseInsensitive = builder.caseInsensitive;
+
+    }
+
+    public static PrefixQuery of(Function<Builder, ObjectBuilder<PrefixQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Prefix;
+    }
+
+    /**
+     * Required - The target field
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code rewrite}
+     */
+    @Nullable
+    public final String rewrite() {
+        return this.rewrite;
+    }
+
+    /**
+     * Required - API name: {@code value}
+     */
+    public final String value() {
+        return this.value;
+    }
+
+    /**
+     * API name: {@code case_insensitive}
+     */
+    @Nullable
+    public final Boolean caseInsensitive() {
+        return this.caseInsensitive;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject(this.field);
+
+        super.serializeInternal(generator, mapper);
+        if (this.rewrite != null) {
+            generator.writeKey("rewrite");
+            generator.write(this.rewrite);
+
+        }
+        generator.writeKey("value");
+        generator.write(this.value);
+
+        if (this.caseInsensitive != null) {
+            generator.writeKey("case_insensitive");
+            generator.write(this.caseInsensitive);
+
+        }
+
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PrefixQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<PrefixQuery> {
+        private String field;
+
+        /**
+         * Required - The target field
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        @Nullable
+        private String rewrite;
+
+        private String value;
+
+        @Nullable
+        private Boolean caseInsensitive;
+
+        /**
+         * API name: {@code rewrite}
+         */
+        public final Builder rewrite(@Nullable String value) {
+            this.rewrite = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code value}
+         */
+        public final Builder value(String value) {
+            this.value = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code case_insensitive}
+         */
+        public final Builder caseInsensitive(@Nullable Boolean value) {
+            this.caseInsensitive = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PrefixQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PrefixQuery build() {
+            _checkSingleUse();
+
+            return new PrefixQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PrefixQuery}
+     */
+    public static final JsonpDeserializer<PrefixQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PrefixQuery::setupPrefixQueryDeserializer
+    );
+
+    protected static void setupPrefixQueryDeserializer(ObjectDeserializer<PrefixQuery.Builder> op) {
+        setupQueryBaseDeserializer(op);
+        op.add(Builder::rewrite, JsonpDeserializer.stringDeserializer(), "rewrite");
+        op.add(Builder::value, JsonpDeserializer.stringDeserializer(), "value");
+        op.add(Builder::caseInsensitive, JsonpDeserializer.booleanDeserializer(), "case_insensitive");
+
+        op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
+        op.shortcutProperty("value");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/Query.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/Query.java
index 280637acf7..b1d39da0a3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/Query.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/Query.java
@@ -32,8 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch._types.aggregations.Aggregation;
-import org.opensearch.client.opensearch._types.aggregations.AggregationVariant;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -41,1759 +41,1744 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.aggregations.Aggregation;
+import org.opensearch.client.opensearch._types.aggregations.AggregationVariant;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.QueryContainer
 
 @JsonpDeserializable
 public class Query implements TaggedUnion<Query.Kind, Object>, AggregationVariant, JsonpSerializable {
 
-	/**
-	 * {@link Query} variant kinds.
-	 */
-	/**
-	 * {@link Query} variant kinds.
-	 */
+    /**
+     * {@link Query} variant kinds.
+     */
+    /**
+     * {@link Query} variant kinds.
+     */
 
-	public enum Kind implements JsonEnum {
-		Bool("bool"),
+    public enum Kind implements JsonEnum {
+        Bool("bool"),
 
-		Boosting("boosting"),
+        Boosting("boosting"),
 
-		Common("common"),
+        Common("common"),
 
-		CombinedFields("combined_fields"),
+        CombinedFields("combined_fields"),
 
-		ConstantScore("constant_score"),
+        ConstantScore("constant_score"),
 
-		DisMax("dis_max"),
+        DisMax("dis_max"),
 
-		DistanceFeature("distance_feature"),
+        DistanceFeature("distance_feature"),
 
-		Exists("exists"),
+        Exists("exists"),
 
-		FunctionScore("function_score"),
+        FunctionScore("function_score"),
 
-		Fuzzy("fuzzy"),
+        Fuzzy("fuzzy"),
 
-		GeoBoundingBox("geo_bounding_box"),
+        GeoBoundingBox("geo_bounding_box"),
 
-		GeoDistance("geo_distance"),
+        GeoDistance("geo_distance"),
 
-		GeoPolygon("geo_polygon"),
+        GeoPolygon("geo_polygon"),
 
-		GeoShape("geo_shape"),
+        GeoShape("geo_shape"),
 
-		HasChild("has_child"),
+        HasChild("has_child"),
 
-		HasParent("has_parent"),
+        HasParent("has_parent"),
 
-		Ids("ids"),
+        Ids("ids"),
 
-		Intervals("intervals"),
+        Intervals("intervals"),
 
-		Knn("knn"),
+        Knn("knn"),
 
-		Match("match"),
+        Match("match"),
 
-		MatchAll("match_all"),
+        MatchAll("match_all"),
 
-		MatchBoolPrefix("match_bool_prefix"),
+        MatchBoolPrefix("match_bool_prefix"),
 
-		MatchNone("match_none"),
+        MatchNone("match_none"),
 
-		MatchPhrase("match_phrase"),
+        MatchPhrase("match_phrase"),
 
-		MatchPhrasePrefix("match_phrase_prefix"),
+        MatchPhrasePrefix("match_phrase_prefix"),
 
-		MoreLikeThis("more_like_this"),
+        MoreLikeThis("more_like_this"),
 
-		MultiMatch("multi_match"),
+        MultiMatch("multi_match"),
 
-		Nested("nested"),
+        Nested("nested"),
 
-		ParentId("parent_id"),
+        ParentId("parent_id"),
 
-		Percolate("percolate"),
+        Percolate("percolate"),
 
-		Pinned("pinned"),
+        Pinned("pinned"),
 
-		Prefix("prefix"),
+        Prefix("prefix"),
 
-		QueryString("query_string"),
+        QueryString("query_string"),
 
-		Range("range"),
+        Range("range"),
 
-		RankFeature("rank_feature"),
+        RankFeature("rank_feature"),
 
-		Regexp("regexp"),
+        Regexp("regexp"),
 
-		Script("script"),
+        Script("script"),
 
-		ScriptScore("script_score"),
+        ScriptScore("script_score"),
 
-		Shape("shape"),
+        Shape("shape"),
 
-		SimpleQueryString("simple_query_string"),
+        SimpleQueryString("simple_query_string"),
 
-		SpanContaining("span_containing"),
+        SpanContaining("span_containing"),
 
-		FieldMaskingSpan("field_masking_span"),
+        FieldMaskingSpan("field_masking_span"),
 
-		SpanFirst("span_first"),
+        SpanFirst("span_first"),
 
-		SpanMulti("span_multi"),
+        SpanMulti("span_multi"),
 
-		SpanNear("span_near"),
+        SpanNear("span_near"),
 
-		SpanNot("span_not"),
+        SpanNot("span_not"),
 
-		SpanOr("span_or"),
+        SpanOr("span_or"),
 
-		SpanTerm("span_term"),
+        SpanTerm("span_term"),
 
-		SpanWithin("span_within"),
+        SpanWithin("span_within"),
 
-		Term("term"),
+        Term("term"),
 
-		Terms("terms"),
+        Terms("terms"),
 
-		TermsSet("terms_set"),
+        TermsSet("terms_set"),
 
-		Wildcard("wildcard"),
+        Wildcard("wildcard"),
 
-		Wrapper("wrapper"),
+        Wrapper("wrapper"),
 
-		Type("type"),
+        Type("type"),
 
-		;
+        ;
 
-		private final String jsonValue;
+        private final String jsonValue;
 
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
 
-		public String jsonValue() {
-			return this.jsonValue;
-		}
+        public String jsonValue() {
+            return this.jsonValue;
+        }
 
-	}
+    }
 
-	/**
-	 * Aggregation variant kind.
-	 */
-	@Override
-	public Aggregation.Kind _aggregationKind() {
-		return Aggregation.Kind.Filter;
-	}
+    /**
+     * Aggregation variant kind.
+     */
+    @Override
+    public Aggregation.Kind _aggregationKind() {
+        return Aggregation.Kind.Filter;
+    }
 
-	private final Kind _kind;
-	private final Object _value;
+    private final Kind _kind;
+    private final Object _value;
 
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
 
-	@Override
-	public final Object _get() {
-		return _value;
-	}
+    @Override
+    public final Object _get() {
+        return _value;
+    }
 
-	public Query(QueryVariant value) {
+    public Query(QueryVariant value) {
 
-		this._kind = ApiTypeHelper.requireNonNull(value._queryKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+        this._kind = ApiTypeHelper.requireNonNull(value._queryKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
 
-	}
+    }
 
-	private Query(Builder builder) {
+    private Query(Builder builder) {
 
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
 
-	}
+    }
 
-	public static Query of(Function<Builder, ObjectBuilder<Query>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static Query of(Function<Builder, ObjectBuilder<Query>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Is this variant instance of kind {@code bool}?
-	 */
-	public boolean isBool() {
-		return _kind == Kind.Bool;
-	}
-
-	/**
-	 * Get the {@code bool} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code bool} kind.
-	 */
-	public BoolQuery bool() {
-		return TaggedUnionUtils.get(this, Kind.Bool);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code boosting}?
-	 */
-	public boolean isBoosting() {
-		return _kind == Kind.Boosting;
-	}
-
-	/**
-	 * Get the {@code boosting} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code boosting} kind.
-	 */
-	public BoostingQuery boosting() {
-		return TaggedUnionUtils.get(this, Kind.Boosting);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code common}?
-	 */
-	public boolean isCommon() {
-		return _kind == Kind.Common;
-	}
-
-	/**
-	 * Get the {@code common} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code common} kind.
-	 */
-	public CommonTermsQuery common() {
-		return TaggedUnionUtils.get(this, Kind.Common);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code combined_fields}?
-	 */
-	public boolean isCombinedFields() {
-		return _kind == Kind.CombinedFields;
-	}
-
-	/**
-	 * Get the {@code combined_fields} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code combined_fields}
-	 *             kind.
-	 */
-	public CombinedFieldsQuery combinedFields() {
-		return TaggedUnionUtils.get(this, Kind.CombinedFields);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code constant_score}?
-	 */
-	public boolean isConstantScore() {
-		return _kind == Kind.ConstantScore;
-	}
-
-	/**
-	 * Get the {@code constant_score} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code constant_score} kind.
-	 */
-	public ConstantScoreQuery constantScore() {
-		return TaggedUnionUtils.get(this, Kind.ConstantScore);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code dis_max}?
-	 */
-	public boolean isDisMax() {
-		return _kind == Kind.DisMax;
-	}
-
-	/**
-	 * Get the {@code dis_max} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code dis_max} kind.
-	 */
-	public DisMaxQuery disMax() {
-		return TaggedUnionUtils.get(this, Kind.DisMax);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code distance_feature}?
-	 */
-	public boolean isDistanceFeature() {
-		return _kind == Kind.DistanceFeature;
-	}
-
-	/**
-	 * Get the {@code distance_feature} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code distance_feature}
-	 *             kind.
-	 */
-	public DistanceFeatureQuery distanceFeature() {
-		return TaggedUnionUtils.get(this, Kind.DistanceFeature);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code exists}?
-	 */
-	public boolean isExists() {
-		return _kind == Kind.Exists;
-	}
-
-	/**
-	 * Get the {@code exists} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code exists} kind.
-	 */
-	public ExistsQuery exists() {
-		return TaggedUnionUtils.get(this, Kind.Exists);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code function_score}?
-	 */
-	public boolean isFunctionScore() {
-		return _kind == Kind.FunctionScore;
-	}
-
-	/**
-	 * Get the {@code function_score} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code function_score} kind.
-	 */
-	public FunctionScoreQuery functionScore() {
-		return TaggedUnionUtils.get(this, Kind.FunctionScore);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code fuzzy}?
-	 */
-	public boolean isFuzzy() {
-		return _kind == Kind.Fuzzy;
-	}
-
-	/**
-	 * Get the {@code fuzzy} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code fuzzy} kind.
-	 */
-	public FuzzyQuery fuzzy() {
-		return TaggedUnionUtils.get(this, Kind.Fuzzy);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geo_bounding_box}?
-	 */
-	public boolean isGeoBoundingBox() {
-		return _kind == Kind.GeoBoundingBox;
-	}
-
-	/**
-	 * Get the {@code geo_bounding_box} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geo_bounding_box}
-	 *             kind.
-	 */
-	public GeoBoundingBoxQuery geoBoundingBox() {
-		return TaggedUnionUtils.get(this, Kind.GeoBoundingBox);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geo_distance}?
-	 */
-	public boolean isGeoDistance() {
-		return _kind == Kind.GeoDistance;
-	}
-
-	/**
-	 * Get the {@code geo_distance} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geo_distance} kind.
-	 */
-	public GeoDistanceQuery geoDistance() {
-		return TaggedUnionUtils.get(this, Kind.GeoDistance);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geo_polygon}?
-	 */
-	public boolean isGeoPolygon() {
-		return _kind == Kind.GeoPolygon;
-	}
-
-	/**
-	 * Get the {@code geo_polygon} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geo_polygon} kind.
-	 */
-	public GeoPolygonQuery geoPolygon() {
-		return TaggedUnionUtils.get(this, Kind.GeoPolygon);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geo_shape}?
-	 */
-	public boolean isGeoShape() {
-		return _kind == Kind.GeoShape;
-	}
-
-	/**
-	 * Get the {@code geo_shape} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geo_shape} kind.
-	 */
-	public GeoShapeQuery geoShape() {
-		return TaggedUnionUtils.get(this, Kind.GeoShape);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code has_child}?
-	 */
-	public boolean isHasChild() {
-		return _kind == Kind.HasChild;
-	}
-
-	/**
-	 * Get the {@code has_child} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code has_child} kind.
-	 */
-	public HasChildQuery hasChild() {
-		return TaggedUnionUtils.get(this, Kind.HasChild);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code has_parent}?
-	 */
-	public boolean isHasParent() {
-		return _kind == Kind.HasParent;
-	}
-
-	/**
-	 * Get the {@code has_parent} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code has_parent} kind.
-	 */
-	public HasParentQuery hasParent() {
-		return TaggedUnionUtils.get(this, Kind.HasParent);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code ids}?
-	 */
-	public boolean isIds() {
-		return _kind == Kind.Ids;
-	}
-
-	/**
-	 * Get the {@code ids} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code ids} kind.
-	 */
-	public IdsQuery ids() {
-		return TaggedUnionUtils.get(this, Kind.Ids);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code intervals}?
-	 */
-	public boolean isIntervals() {
-		return _kind == Kind.Intervals;
-	}
-
-	/**
-	 * Get the {@code intervals} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code intervals} kind.
-	 */
-	public IntervalsQuery intervals() {
-		return TaggedUnionUtils.get(this, Kind.Intervals);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code knn}?
-	 */
-	public boolean isKnn() {
-		return _kind == Kind.Knn;
-	}
-
-	/**
-	 * Get the {@code knn} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code knn} kind.
-	 */
-	public KnnQuery knn() {
-		return TaggedUnionUtils.get(this, Kind.Knn);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code match}?
-	 */
-	public boolean isMatch() {
-		return _kind == Kind.Match;
-	}
-
-	/**
-	 * Get the {@code match} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code match} kind.
-	 */
-	public MatchQuery match() {
-		return TaggedUnionUtils.get(this, Kind.Match);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code match_all}?
-	 */
-	public boolean isMatchAll() {
-		return _kind == Kind.MatchAll;
-	}
-
-	/**
-	 * Get the {@code match_all} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code match_all} kind.
-	 */
-	public MatchAllQuery matchAll() {
-		return TaggedUnionUtils.get(this, Kind.MatchAll);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code match_bool_prefix}?
-	 */
-	public boolean isMatchBoolPrefix() {
-		return _kind == Kind.MatchBoolPrefix;
-	}
-
-	/**
-	 * Get the {@code match_bool_prefix} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code match_bool_prefix}
-	 *             kind.
-	 */
-	public MatchBoolPrefixQuery matchBoolPrefix() {
-		return TaggedUnionUtils.get(this, Kind.MatchBoolPrefix);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code match_none}?
-	 */
-	public boolean isMatchNone() {
-		return _kind == Kind.MatchNone;
-	}
-
-	/**
-	 * Get the {@code match_none} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code match_none} kind.
-	 */
-	public MatchNoneQuery matchNone() {
-		return TaggedUnionUtils.get(this, Kind.MatchNone);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code match_phrase}?
-	 */
-	public boolean isMatchPhrase() {
-		return _kind == Kind.MatchPhrase;
-	}
-
-	/**
-	 * Get the {@code match_phrase} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code match_phrase} kind.
-	 */
-	public MatchPhraseQuery matchPhrase() {
-		return TaggedUnionUtils.get(this, Kind.MatchPhrase);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code match_phrase_prefix}?
-	 */
-	public boolean isMatchPhrasePrefix() {
-		return _kind == Kind.MatchPhrasePrefix;
-	}
-
-	/**
-	 * Get the {@code match_phrase_prefix} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code match_phrase_prefix}
-	 *             kind.
-	 */
-	public MatchPhrasePrefixQuery matchPhrasePrefix() {
-		return TaggedUnionUtils.get(this, Kind.MatchPhrasePrefix);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code more_like_this}?
-	 */
-	public boolean isMoreLikeThis() {
-		return _kind == Kind.MoreLikeThis;
-	}
-
-	/**
-	 * Get the {@code more_like_this} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code more_like_this} kind.
-	 */
-	public MoreLikeThisQuery moreLikeThis() {
-		return TaggedUnionUtils.get(this, Kind.MoreLikeThis);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code multi_match}?
-	 */
-	public boolean isMultiMatch() {
-		return _kind == Kind.MultiMatch;
-	}
-
-	/**
-	 * Get the {@code multi_match} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code multi_match} kind.
-	 */
-	public MultiMatchQuery multiMatch() {
-		return TaggedUnionUtils.get(this, Kind.MultiMatch);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code nested}?
-	 */
-	public boolean isNested() {
-		return _kind == Kind.Nested;
-	}
-
-	/**
-	 * Get the {@code nested} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code nested} kind.
-	 */
-	public NestedQuery nested() {
-		return TaggedUnionUtils.get(this, Kind.Nested);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code parent_id}?
-	 */
-	public boolean isParentId() {
-		return _kind == Kind.ParentId;
-	}
-
-	/**
-	 * Get the {@code parent_id} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code parent_id} kind.
-	 */
-	public ParentIdQuery parentId() {
-		return TaggedUnionUtils.get(this, Kind.ParentId);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code percolate}?
-	 */
-	public boolean isPercolate() {
-		return _kind == Kind.Percolate;
-	}
-
-	/**
-	 * Get the {@code percolate} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code percolate} kind.
-	 */
-	public PercolateQuery percolate() {
-		return TaggedUnionUtils.get(this, Kind.Percolate);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code pinned}?
-	 */
-	public boolean isPinned() {
-		return _kind == Kind.Pinned;
-	}
-
-	/**
-	 * Get the {@code pinned} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code pinned} kind.
-	 */
-	public PinnedQuery pinned() {
-		return TaggedUnionUtils.get(this, Kind.Pinned);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code prefix}?
-	 */
-	public boolean isPrefix() {
-		return _kind == Kind.Prefix;
-	}
-
-	/**
-	 * Get the {@code prefix} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code prefix} kind.
-	 */
-	public PrefixQuery prefix() {
-		return TaggedUnionUtils.get(this, Kind.Prefix);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code query_string}?
-	 */
-	public boolean isQueryString() {
-		return _kind == Kind.QueryString;
-	}
-
-	/**
-	 * Get the {@code query_string} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code query_string} kind.
-	 */
-	public QueryStringQuery queryString() {
-		return TaggedUnionUtils.get(this, Kind.QueryString);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code range}?
-	 */
-	public boolean isRange() {
-		return _kind == Kind.Range;
-	}
-
-	/**
-	 * Get the {@code range} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code range} kind.
-	 */
-	public RangeQuery range() {
-		return TaggedUnionUtils.get(this, Kind.Range);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code rank_feature}?
-	 */
-	public boolean isRankFeature() {
-		return _kind == Kind.RankFeature;
-	}
-
-	/**
-	 * Get the {@code rank_feature} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code rank_feature} kind.
-	 */
-	public RankFeatureQuery rankFeature() {
-		return TaggedUnionUtils.get(this, Kind.RankFeature);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code regexp}?
-	 */
-	public boolean isRegexp() {
-		return _kind == Kind.Regexp;
-	}
-
-	/**
-	 * Get the {@code regexp} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code regexp} kind.
-	 */
-	public RegexpQuery regexp() {
-		return TaggedUnionUtils.get(this, Kind.Regexp);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code script}?
-	 */
-	public boolean isScript() {
-		return _kind == Kind.Script;
-	}
-
-	/**
-	 * Get the {@code script} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code script} kind.
-	 */
-	public ScriptQuery script() {
-		return TaggedUnionUtils.get(this, Kind.Script);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code script_score}?
-	 */
-	public boolean isScriptScore() {
-		return _kind == Kind.ScriptScore;
-	}
-
-	/**
-	 * Get the {@code script_score} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code script_score} kind.
-	 */
-	public ScriptScoreQuery scriptScore() {
-		return TaggedUnionUtils.get(this, Kind.ScriptScore);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code shape}?
-	 */
-	public boolean isShape() {
-		return _kind == Kind.Shape;
-	}
-
-	/**
-	 * Get the {@code shape} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code shape} kind.
-	 */
-	public ShapeQuery shape() {
-		return TaggedUnionUtils.get(this, Kind.Shape);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code simple_query_string}?
-	 */
-	public boolean isSimpleQueryString() {
-		return _kind == Kind.SimpleQueryString;
-	}
-
-	/**
-	 * Get the {@code simple_query_string} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code simple_query_string}
-	 *             kind.
-	 */
-	public SimpleQueryStringQuery simpleQueryString() {
-		return TaggedUnionUtils.get(this, Kind.SimpleQueryString);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code span_containing}?
-	 */
-	public boolean isSpanContaining() {
-		return _kind == Kind.SpanContaining;
-	}
-
-	/**
-	 * Get the {@code span_containing} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code span_containing}
-	 *             kind.
-	 */
-	public SpanContainingQuery spanContaining() {
-		return TaggedUnionUtils.get(this, Kind.SpanContaining);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code field_masking_span}?
-	 */
-	public boolean isFieldMaskingSpan() {
-		return _kind == Kind.FieldMaskingSpan;
-	}
-
-	/**
-	 * Get the {@code field_masking_span} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code field_masking_span}
-	 *             kind.
-	 */
-	public SpanFieldMaskingQuery fieldMaskingSpan() {
-		return TaggedUnionUtils.get(this, Kind.FieldMaskingSpan);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code span_first}?
-	 */
-	public boolean isSpanFirst() {
-		return _kind == Kind.SpanFirst;
-	}
-
-	/**
-	 * Get the {@code span_first} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code span_first} kind.
-	 */
-	public SpanFirstQuery spanFirst() {
-		return TaggedUnionUtils.get(this, Kind.SpanFirst);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code span_multi}?
-	 */
-	public boolean isSpanMulti() {
-		return _kind == Kind.SpanMulti;
-	}
-
-	/**
-	 * Get the {@code span_multi} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code span_multi} kind.
-	 */
-	public SpanMultiTermQuery spanMulti() {
-		return TaggedUnionUtils.get(this, Kind.SpanMulti);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code span_near}?
-	 */
-	public boolean isSpanNear() {
-		return _kind == Kind.SpanNear;
-	}
-
-	/**
-	 * Get the {@code span_near} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code span_near} kind.
-	 */
-	public SpanNearQuery spanNear() {
-		return TaggedUnionUtils.get(this, Kind.SpanNear);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code span_not}?
-	 */
-	public boolean isSpanNot() {
-		return _kind == Kind.SpanNot;
-	}
-
-	/**
-	 * Get the {@code span_not} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code span_not} kind.
-	 */
-	public SpanNotQuery spanNot() {
-		return TaggedUnionUtils.get(this, Kind.SpanNot);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code span_or}?
-	 */
-	public boolean isSpanOr() {
-		return _kind == Kind.SpanOr;
-	}
-
-	/**
-	 * Get the {@code span_or} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code span_or} kind.
-	 */
-	public SpanOrQuery spanOr() {
-		return TaggedUnionUtils.get(this, Kind.SpanOr);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code span_term}?
-	 */
-	public boolean isSpanTerm() {
-		return _kind == Kind.SpanTerm;
-	}
-
-	/**
-	 * Get the {@code span_term} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code span_term} kind.
-	 */
-	public SpanTermQuery spanTerm() {
-		return TaggedUnionUtils.get(this, Kind.SpanTerm);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code span_within}?
-	 */
-	public boolean isSpanWithin() {
-		return _kind == Kind.SpanWithin;
-	}
-
-	/**
-	 * Get the {@code span_within} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code span_within} kind.
-	 */
-	public SpanWithinQuery spanWithin() {
-		return TaggedUnionUtils.get(this, Kind.SpanWithin);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code term}?
-	 */
-	public boolean isTerm() {
-		return _kind == Kind.Term;
-	}
-
-	/**
-	 * Get the {@code term} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code term} kind.
-	 */
-	public TermQuery term() {
-		return TaggedUnionUtils.get(this, Kind.Term);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code terms}?
-	 */
-	public boolean isTerms() {
-		return _kind == Kind.Terms;
-	}
-
-	/**
-	 * Get the {@code terms} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code terms} kind.
-	 */
-	public TermsQuery terms() {
-		return TaggedUnionUtils.get(this, Kind.Terms);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code terms_set}?
-	 */
-	public boolean isTermsSet() {
-		return _kind == Kind.TermsSet;
-	}
-
-	/**
-	 * Get the {@code terms_set} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code terms_set} kind.
-	 */
-	public TermsSetQuery termsSet() {
-		return TaggedUnionUtils.get(this, Kind.TermsSet);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code wildcard}?
-	 */
-	public boolean isWildcard() {
-		return _kind == Kind.Wildcard;
-	}
-
-	/**
-	 * Get the {@code wildcard} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code wildcard} kind.
-	 */
-	public WildcardQuery wildcard() {
-		return TaggedUnionUtils.get(this, Kind.Wildcard);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code type}?
-	 */
-	public boolean isType() {
-		return _kind == Kind.Type;
-	}
-
-	/**
-	 * Get the {@code type} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code type} kind.
-	 */
-	public TypeQuery type() {
-		return TaggedUnionUtils.get(this, Kind.Type);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeStartObject();
-
-		generator.writeKey(_kind.jsonValue());
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		}
-
-		generator.writeEnd();
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Query> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<Query> bool(BoolQuery v) {
-			this._kind = Kind.Bool;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> bool(Function<BoolQuery.Builder, ObjectBuilder<BoolQuery>> fn) {
-			return this.bool(fn.apply(new BoolQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> boosting(BoostingQuery v) {
-			this._kind = Kind.Boosting;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> boosting(Function<BoostingQuery.Builder, ObjectBuilder<BoostingQuery>> fn) {
-			return this.boosting(fn.apply(new BoostingQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> common(CommonTermsQuery v) {
-			this._kind = Kind.Common;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> common(Function<CommonTermsQuery.Builder, ObjectBuilder<CommonTermsQuery>> fn) {
-			return this.common(fn.apply(new CommonTermsQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> combinedFields(CombinedFieldsQuery v) {
-			this._kind = Kind.CombinedFields;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> combinedFields(
-				Function<CombinedFieldsQuery.Builder, ObjectBuilder<CombinedFieldsQuery>> fn) {
-			return this.combinedFields(fn.apply(new CombinedFieldsQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> constantScore(ConstantScoreQuery v) {
-			this._kind = Kind.ConstantScore;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> constantScore(
-				Function<ConstantScoreQuery.Builder, ObjectBuilder<ConstantScoreQuery>> fn) {
-			return this.constantScore(fn.apply(new ConstantScoreQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> disMax(DisMaxQuery v) {
-			this._kind = Kind.DisMax;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> disMax(Function<DisMaxQuery.Builder, ObjectBuilder<DisMaxQuery>> fn) {
-			return this.disMax(fn.apply(new DisMaxQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> distanceFeature(DistanceFeatureQuery v) {
-			this._kind = Kind.DistanceFeature;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> distanceFeature(
-				Function<DistanceFeatureQuery.Builder, ObjectBuilder<DistanceFeatureQuery>> fn) {
-			return this.distanceFeature(fn.apply(new DistanceFeatureQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> exists(ExistsQuery v) {
-			this._kind = Kind.Exists;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> exists(Function<ExistsQuery.Builder, ObjectBuilder<ExistsQuery>> fn) {
-			return this.exists(fn.apply(new ExistsQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> functionScore(FunctionScoreQuery v) {
-			this._kind = Kind.FunctionScore;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> functionScore(
-				Function<FunctionScoreQuery.Builder, ObjectBuilder<FunctionScoreQuery>> fn) {
-			return this.functionScore(fn.apply(new FunctionScoreQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> fuzzy(FuzzyQuery v) {
-			this._kind = Kind.Fuzzy;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> fuzzy(Function<FuzzyQuery.Builder, ObjectBuilder<FuzzyQuery>> fn) {
-			return this.fuzzy(fn.apply(new FuzzyQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> geoBoundingBox(GeoBoundingBoxQuery v) {
-			this._kind = Kind.GeoBoundingBox;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> geoBoundingBox(
-				Function<GeoBoundingBoxQuery.Builder, ObjectBuilder<GeoBoundingBoxQuery>> fn) {
-			return this.geoBoundingBox(fn.apply(new GeoBoundingBoxQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> geoDistance(GeoDistanceQuery v) {
-			this._kind = Kind.GeoDistance;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> geoDistance(
-				Function<GeoDistanceQuery.Builder, ObjectBuilder<GeoDistanceQuery>> fn) {
-			return this.geoDistance(fn.apply(new GeoDistanceQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> geoPolygon(GeoPolygonQuery v) {
-			this._kind = Kind.GeoPolygon;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> geoPolygon(Function<GeoPolygonQuery.Builder, ObjectBuilder<GeoPolygonQuery>> fn) {
-			return this.geoPolygon(fn.apply(new GeoPolygonQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> geoShape(GeoShapeQuery v) {
-			this._kind = Kind.GeoShape;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> geoShape(Function<GeoShapeQuery.Builder, ObjectBuilder<GeoShapeQuery>> fn) {
-			return this.geoShape(fn.apply(new GeoShapeQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> hasChild(HasChildQuery v) {
-			this._kind = Kind.HasChild;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> hasChild(Function<HasChildQuery.Builder, ObjectBuilder<HasChildQuery>> fn) {
-			return this.hasChild(fn.apply(new HasChildQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> hasParent(HasParentQuery v) {
-			this._kind = Kind.HasParent;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> hasParent(Function<HasParentQuery.Builder, ObjectBuilder<HasParentQuery>> fn) {
-			return this.hasParent(fn.apply(new HasParentQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> ids(IdsQuery v) {
-			this._kind = Kind.Ids;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> ids(Function<IdsQuery.Builder, ObjectBuilder<IdsQuery>> fn) {
-			return this.ids(fn.apply(new IdsQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> intervals(IntervalsQuery v) {
-			this._kind = Kind.Intervals;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> intervals(Function<IntervalsQuery.Builder, ObjectBuilder<IntervalsQuery>> fn) {
-			return this.intervals(fn.apply(new IntervalsQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> knn(KnnQuery v) {
-			this._kind = Kind.Knn;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> knn(Function<KnnQuery.Builder, ObjectBuilder<KnnQuery>> fn) {
-			return this.knn(fn.apply(new KnnQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> match(MatchQuery v) {
-			this._kind = Kind.Match;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> match(Function<MatchQuery.Builder, ObjectBuilder<MatchQuery>> fn) {
-			return this.match(fn.apply(new MatchQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> matchAll(MatchAllQuery v) {
-			this._kind = Kind.MatchAll;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> matchAll(Function<MatchAllQuery.Builder, ObjectBuilder<MatchAllQuery>> fn) {
-			return this.matchAll(fn.apply(new MatchAllQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> matchBoolPrefix(MatchBoolPrefixQuery v) {
-			this._kind = Kind.MatchBoolPrefix;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> matchBoolPrefix(
-				Function<MatchBoolPrefixQuery.Builder, ObjectBuilder<MatchBoolPrefixQuery>> fn) {
-			return this.matchBoolPrefix(fn.apply(new MatchBoolPrefixQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> matchNone(MatchNoneQuery v) {
-			this._kind = Kind.MatchNone;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> matchNone(Function<MatchNoneQuery.Builder, ObjectBuilder<MatchNoneQuery>> fn) {
-			return this.matchNone(fn.apply(new MatchNoneQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> matchPhrase(MatchPhraseQuery v) {
-			this._kind = Kind.MatchPhrase;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> matchPhrase(
-				Function<MatchPhraseQuery.Builder, ObjectBuilder<MatchPhraseQuery>> fn) {
-			return this.matchPhrase(fn.apply(new MatchPhraseQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> matchPhrasePrefix(MatchPhrasePrefixQuery v) {
-			this._kind = Kind.MatchPhrasePrefix;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> matchPhrasePrefix(
-				Function<MatchPhrasePrefixQuery.Builder, ObjectBuilder<MatchPhrasePrefixQuery>> fn) {
-			return this.matchPhrasePrefix(fn.apply(new MatchPhrasePrefixQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> moreLikeThis(MoreLikeThisQuery v) {
-			this._kind = Kind.MoreLikeThis;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> moreLikeThis(
-				Function<MoreLikeThisQuery.Builder, ObjectBuilder<MoreLikeThisQuery>> fn) {
-			return this.moreLikeThis(fn.apply(new MoreLikeThisQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> multiMatch(MultiMatchQuery v) {
-			this._kind = Kind.MultiMatch;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> multiMatch(Function<MultiMatchQuery.Builder, ObjectBuilder<MultiMatchQuery>> fn) {
-			return this.multiMatch(fn.apply(new MultiMatchQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> nested(NestedQuery v) {
-			this._kind = Kind.Nested;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> nested(Function<NestedQuery.Builder, ObjectBuilder<NestedQuery>> fn) {
-			return this.nested(fn.apply(new NestedQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> parentId(ParentIdQuery v) {
-			this._kind = Kind.ParentId;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> parentId(Function<ParentIdQuery.Builder, ObjectBuilder<ParentIdQuery>> fn) {
-			return this.parentId(fn.apply(new ParentIdQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> percolate(PercolateQuery v) {
-			this._kind = Kind.Percolate;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> percolate(Function<PercolateQuery.Builder, ObjectBuilder<PercolateQuery>> fn) {
-			return this.percolate(fn.apply(new PercolateQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> pinned(PinnedQuery v) {
-			this._kind = Kind.Pinned;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> pinned(Function<PinnedQuery.Builder, ObjectBuilder<PinnedQuery>> fn) {
-			return this.pinned(fn.apply(new PinnedQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> prefix(PrefixQuery v) {
-			this._kind = Kind.Prefix;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> prefix(Function<PrefixQuery.Builder, ObjectBuilder<PrefixQuery>> fn) {
-			return this.prefix(fn.apply(new PrefixQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> queryString(QueryStringQuery v) {
-			this._kind = Kind.QueryString;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> queryString(
-				Function<QueryStringQuery.Builder, ObjectBuilder<QueryStringQuery>> fn) {
-			return this.queryString(fn.apply(new QueryStringQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> range(RangeQuery v) {
-			this._kind = Kind.Range;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> range(Function<RangeQuery.Builder, ObjectBuilder<RangeQuery>> fn) {
-			return this.range(fn.apply(new RangeQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> rankFeature(RankFeatureQuery v) {
-			this._kind = Kind.RankFeature;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> rankFeature(
-				Function<RankFeatureQuery.Builder, ObjectBuilder<RankFeatureQuery>> fn) {
-			return this.rankFeature(fn.apply(new RankFeatureQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> regexp(RegexpQuery v) {
-			this._kind = Kind.Regexp;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> regexp(Function<RegexpQuery.Builder, ObjectBuilder<RegexpQuery>> fn) {
-			return this.regexp(fn.apply(new RegexpQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> script(ScriptQuery v) {
-			this._kind = Kind.Script;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> script(Function<ScriptQuery.Builder, ObjectBuilder<ScriptQuery>> fn) {
-			return this.script(fn.apply(new ScriptQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> scriptScore(ScriptScoreQuery v) {
-			this._kind = Kind.ScriptScore;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> scriptScore(
-				Function<ScriptScoreQuery.Builder, ObjectBuilder<ScriptScoreQuery>> fn) {
-			return this.scriptScore(fn.apply(new ScriptScoreQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> shape(ShapeQuery v) {
-			this._kind = Kind.Shape;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> shape(Function<ShapeQuery.Builder, ObjectBuilder<ShapeQuery>> fn) {
-			return this.shape(fn.apply(new ShapeQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> simpleQueryString(SimpleQueryStringQuery v) {
-			this._kind = Kind.SimpleQueryString;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> simpleQueryString(
-				Function<SimpleQueryStringQuery.Builder, ObjectBuilder<SimpleQueryStringQuery>> fn) {
-			return this.simpleQueryString(fn.apply(new SimpleQueryStringQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> spanContaining(SpanContainingQuery v) {
-			this._kind = Kind.SpanContaining;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> spanContaining(
-				Function<SpanContainingQuery.Builder, ObjectBuilder<SpanContainingQuery>> fn) {
-			return this.spanContaining(fn.apply(new SpanContainingQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> fieldMaskingSpan(SpanFieldMaskingQuery v) {
-			this._kind = Kind.FieldMaskingSpan;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> fieldMaskingSpan(
-				Function<SpanFieldMaskingQuery.Builder, ObjectBuilder<SpanFieldMaskingQuery>> fn) {
-			return this.fieldMaskingSpan(fn.apply(new SpanFieldMaskingQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> spanFirst(SpanFirstQuery v) {
-			this._kind = Kind.SpanFirst;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> spanFirst(Function<SpanFirstQuery.Builder, ObjectBuilder<SpanFirstQuery>> fn) {
-			return this.spanFirst(fn.apply(new SpanFirstQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> spanMulti(SpanMultiTermQuery v) {
-			this._kind = Kind.SpanMulti;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> spanMulti(
-				Function<SpanMultiTermQuery.Builder, ObjectBuilder<SpanMultiTermQuery>> fn) {
-			return this.spanMulti(fn.apply(new SpanMultiTermQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> spanNear(SpanNearQuery v) {
-			this._kind = Kind.SpanNear;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> spanNear(Function<SpanNearQuery.Builder, ObjectBuilder<SpanNearQuery>> fn) {
-			return this.spanNear(fn.apply(new SpanNearQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> spanNot(SpanNotQuery v) {
-			this._kind = Kind.SpanNot;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> spanNot(Function<SpanNotQuery.Builder, ObjectBuilder<SpanNotQuery>> fn) {
-			return this.spanNot(fn.apply(new SpanNotQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> spanOr(SpanOrQuery v) {
-			this._kind = Kind.SpanOr;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> spanOr(Function<SpanOrQuery.Builder, ObjectBuilder<SpanOrQuery>> fn) {
-			return this.spanOr(fn.apply(new SpanOrQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> spanTerm(SpanTermQuery v) {
-			this._kind = Kind.SpanTerm;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> spanTerm(Function<SpanTermQuery.Builder, ObjectBuilder<SpanTermQuery>> fn) {
-			return this.spanTerm(fn.apply(new SpanTermQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> spanWithin(SpanWithinQuery v) {
-			this._kind = Kind.SpanWithin;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> spanWithin(Function<SpanWithinQuery.Builder, ObjectBuilder<SpanWithinQuery>> fn) {
-			return this.spanWithin(fn.apply(new SpanWithinQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> term(TermQuery v) {
-			this._kind = Kind.Term;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> term(Function<TermQuery.Builder, ObjectBuilder<TermQuery>> fn) {
-			return this.term(fn.apply(new TermQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> terms(TermsQuery v) {
-			this._kind = Kind.Terms;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> terms(Function<TermsQuery.Builder, ObjectBuilder<TermsQuery>> fn) {
-			return this.terms(fn.apply(new TermsQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> termsSet(TermsSetQuery v) {
-			this._kind = Kind.TermsSet;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> termsSet(Function<TermsSetQuery.Builder, ObjectBuilder<TermsSetQuery>> fn) {
-			return this.termsSet(fn.apply(new TermsSetQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> wildcard(WildcardQuery v) {
-			this._kind = Kind.Wildcard;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> wildcard(Function<WildcardQuery.Builder, ObjectBuilder<WildcardQuery>> fn) {
-			return this.wildcard(fn.apply(new WildcardQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<Query> type(TypeQuery v) {
-			this._kind = Kind.Type;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Query> type(Function<TypeQuery.Builder, ObjectBuilder<TypeQuery>> fn) {
-			return this.type(fn.apply(new TypeQuery.Builder()).build());
-		}
-
-		public Query build() {
-			_checkSingleUse();
-			return new Query(this);
-		}
-
-	}
-
-	protected static void setupQueryDeserializer(ObjectDeserializer<Builder> op) {
-
-		op.add(Builder::bool, BoolQuery._DESERIALIZER, "bool");
-		op.add(Builder::boosting, BoostingQuery._DESERIALIZER, "boosting");
-		op.add(Builder::common, CommonTermsQuery._DESERIALIZER, "common");
-		op.add(Builder::combinedFields, CombinedFieldsQuery._DESERIALIZER, "combined_fields");
-		op.add(Builder::constantScore, ConstantScoreQuery._DESERIALIZER, "constant_score");
-		op.add(Builder::disMax, DisMaxQuery._DESERIALIZER, "dis_max");
-		op.add(Builder::distanceFeature, DistanceFeatureQuery._DESERIALIZER, "distance_feature");
-		op.add(Builder::exists, ExistsQuery._DESERIALIZER, "exists");
-		op.add(Builder::functionScore, FunctionScoreQuery._DESERIALIZER, "function_score");
-		op.add(Builder::fuzzy, FuzzyQuery._DESERIALIZER, "fuzzy");
-		op.add(Builder::geoBoundingBox, GeoBoundingBoxQuery._DESERIALIZER, "geo_bounding_box");
-		op.add(Builder::geoDistance, GeoDistanceQuery._DESERIALIZER, "geo_distance");
-		op.add(Builder::geoPolygon, GeoPolygonQuery._DESERIALIZER, "geo_polygon");
-		op.add(Builder::geoShape, GeoShapeQuery._DESERIALIZER, "geo_shape");
-		op.add(Builder::hasChild, HasChildQuery._DESERIALIZER, "has_child");
-		op.add(Builder::hasParent, HasParentQuery._DESERIALIZER, "has_parent");
-		op.add(Builder::ids, IdsQuery._DESERIALIZER, "ids");
-		op.add(Builder::intervals, IntervalsQuery._DESERIALIZER, "intervals");
-		op.add(Builder::knn, KnnQuery._DESERIALIZER, "knn");
-		op.add(Builder::match, MatchQuery._DESERIALIZER, "match");
-		op.add(Builder::matchAll, MatchAllQuery._DESERIALIZER, "match_all");
-		op.add(Builder::matchBoolPrefix, MatchBoolPrefixQuery._DESERIALIZER, "match_bool_prefix");
-		op.add(Builder::matchNone, MatchNoneQuery._DESERIALIZER, "match_none");
-		op.add(Builder::matchPhrase, MatchPhraseQuery._DESERIALIZER, "match_phrase");
-		op.add(Builder::matchPhrasePrefix, MatchPhrasePrefixQuery._DESERIALIZER, "match_phrase_prefix");
-		op.add(Builder::moreLikeThis, MoreLikeThisQuery._DESERIALIZER, "more_like_this");
-		op.add(Builder::multiMatch, MultiMatchQuery._DESERIALIZER, "multi_match");
-		op.add(Builder::nested, NestedQuery._DESERIALIZER, "nested");
-		op.add(Builder::parentId, ParentIdQuery._DESERIALIZER, "parent_id");
-		op.add(Builder::percolate, PercolateQuery._DESERIALIZER, "percolate");
-		op.add(Builder::pinned, PinnedQuery._DESERIALIZER, "pinned");
-		op.add(Builder::prefix, PrefixQuery._DESERIALIZER, "prefix");
-		op.add(Builder::queryString, QueryStringQuery._DESERIALIZER, "query_string");
-		op.add(Builder::range, RangeQuery._DESERIALIZER, "range");
-		op.add(Builder::rankFeature, RankFeatureQuery._DESERIALIZER, "rank_feature");
-		op.add(Builder::regexp, RegexpQuery._DESERIALIZER, "regexp");
-		op.add(Builder::script, ScriptQuery._DESERIALIZER, "script");
-		op.add(Builder::scriptScore, ScriptScoreQuery._DESERIALIZER, "script_score");
-		op.add(Builder::shape, ShapeQuery._DESERIALIZER, "shape");
-		op.add(Builder::simpleQueryString, SimpleQueryStringQuery._DESERIALIZER, "simple_query_string");
-		op.add(Builder::spanContaining, SpanContainingQuery._DESERIALIZER, "span_containing");
-		op.add(Builder::fieldMaskingSpan, SpanFieldMaskingQuery._DESERIALIZER, "field_masking_span");
-		op.add(Builder::spanFirst, SpanFirstQuery._DESERIALIZER, "span_first");
-		op.add(Builder::spanMulti, SpanMultiTermQuery._DESERIALIZER, "span_multi");
-		op.add(Builder::spanNear, SpanNearQuery._DESERIALIZER, "span_near");
-		op.add(Builder::spanNot, SpanNotQuery._DESERIALIZER, "span_not");
-		op.add(Builder::spanOr, SpanOrQuery._DESERIALIZER, "span_or");
-		op.add(Builder::spanTerm, SpanTermQuery._DESERIALIZER, "span_term");
-		op.add(Builder::spanWithin, SpanWithinQuery._DESERIALIZER, "span_within");
-		op.add(Builder::term, TermQuery._DESERIALIZER, "term");
-		op.add(Builder::terms, TermsQuery._DESERIALIZER, "terms");
-		op.add(Builder::termsSet, TermsSetQuery._DESERIALIZER, "terms_set");
-		op.add(Builder::wildcard, WildcardQuery._DESERIALIZER, "wildcard");
-		op.add(Builder::type, TypeQuery._DESERIALIZER, "type");
-
-	}
-
-	public static final JsonpDeserializer<Query> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Query::setupQueryDeserializer, Builder::build);
+    /**
+     * Is this variant instance of kind {@code bool}?
+     */
+    public boolean isBool() {
+        return _kind == Kind.Bool;
+    }
+
+    /**
+     * Get the {@code bool} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code bool} kind.
+     */
+    public BoolQuery bool() {
+        return TaggedUnionUtils.get(this, Kind.Bool);
+    }
+
+    /**
+     * Is this variant instance of kind {@code boosting}?
+     */
+    public boolean isBoosting() {
+        return _kind == Kind.Boosting;
+    }
+
+    /**
+     * Get the {@code boosting} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code boosting} kind.
+     */
+    public BoostingQuery boosting() {
+        return TaggedUnionUtils.get(this, Kind.Boosting);
+    }
+
+    /**
+     * Is this variant instance of kind {@code common}?
+     */
+    public boolean isCommon() {
+        return _kind == Kind.Common;
+    }
+
+    /**
+     * Get the {@code common} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code common} kind.
+     */
+    public CommonTermsQuery common() {
+        return TaggedUnionUtils.get(this, Kind.Common);
+    }
+
+    /**
+     * Is this variant instance of kind {@code combined_fields}?
+     */
+    public boolean isCombinedFields() {
+        return _kind == Kind.CombinedFields;
+    }
+
+    /**
+     * Get the {@code combined_fields} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code combined_fields}
+     *             kind.
+     */
+    public CombinedFieldsQuery combinedFields() {
+        return TaggedUnionUtils.get(this, Kind.CombinedFields);
+    }
+
+    /**
+     * Is this variant instance of kind {@code constant_score}?
+     */
+    public boolean isConstantScore() {
+        return _kind == Kind.ConstantScore;
+    }
+
+    /**
+     * Get the {@code constant_score} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code constant_score} kind.
+     */
+    public ConstantScoreQuery constantScore() {
+        return TaggedUnionUtils.get(this, Kind.ConstantScore);
+    }
+
+    /**
+     * Is this variant instance of kind {@code dis_max}?
+     */
+    public boolean isDisMax() {
+        return _kind == Kind.DisMax;
+    }
+
+    /**
+     * Get the {@code dis_max} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code dis_max} kind.
+     */
+    public DisMaxQuery disMax() {
+        return TaggedUnionUtils.get(this, Kind.DisMax);
+    }
+
+    /**
+     * Is this variant instance of kind {@code distance_feature}?
+     */
+    public boolean isDistanceFeature() {
+        return _kind == Kind.DistanceFeature;
+    }
+
+    /**
+     * Get the {@code distance_feature} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code distance_feature}
+     *             kind.
+     */
+    public DistanceFeatureQuery distanceFeature() {
+        return TaggedUnionUtils.get(this, Kind.DistanceFeature);
+    }
+
+    /**
+     * Is this variant instance of kind {@code exists}?
+     */
+    public boolean isExists() {
+        return _kind == Kind.Exists;
+    }
+
+    /**
+     * Get the {@code exists} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code exists} kind.
+     */
+    public ExistsQuery exists() {
+        return TaggedUnionUtils.get(this, Kind.Exists);
+    }
+
+    /**
+     * Is this variant instance of kind {@code function_score}?
+     */
+    public boolean isFunctionScore() {
+        return _kind == Kind.FunctionScore;
+    }
+
+    /**
+     * Get the {@code function_score} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code function_score} kind.
+     */
+    public FunctionScoreQuery functionScore() {
+        return TaggedUnionUtils.get(this, Kind.FunctionScore);
+    }
+
+    /**
+     * Is this variant instance of kind {@code fuzzy}?
+     */
+    public boolean isFuzzy() {
+        return _kind == Kind.Fuzzy;
+    }
+
+    /**
+     * Get the {@code fuzzy} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code fuzzy} kind.
+     */
+    public FuzzyQuery fuzzy() {
+        return TaggedUnionUtils.get(this, Kind.Fuzzy);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geo_bounding_box}?
+     */
+    public boolean isGeoBoundingBox() {
+        return _kind == Kind.GeoBoundingBox;
+    }
+
+    /**
+     * Get the {@code geo_bounding_box} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geo_bounding_box}
+     *             kind.
+     */
+    public GeoBoundingBoxQuery geoBoundingBox() {
+        return TaggedUnionUtils.get(this, Kind.GeoBoundingBox);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geo_distance}?
+     */
+    public boolean isGeoDistance() {
+        return _kind == Kind.GeoDistance;
+    }
+
+    /**
+     * Get the {@code geo_distance} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geo_distance} kind.
+     */
+    public GeoDistanceQuery geoDistance() {
+        return TaggedUnionUtils.get(this, Kind.GeoDistance);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geo_polygon}?
+     */
+    public boolean isGeoPolygon() {
+        return _kind == Kind.GeoPolygon;
+    }
+
+    /**
+     * Get the {@code geo_polygon} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geo_polygon} kind.
+     */
+    public GeoPolygonQuery geoPolygon() {
+        return TaggedUnionUtils.get(this, Kind.GeoPolygon);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geo_shape}?
+     */
+    public boolean isGeoShape() {
+        return _kind == Kind.GeoShape;
+    }
+
+    /**
+     * Get the {@code geo_shape} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geo_shape} kind.
+     */
+    public GeoShapeQuery geoShape() {
+        return TaggedUnionUtils.get(this, Kind.GeoShape);
+    }
+
+    /**
+     * Is this variant instance of kind {@code has_child}?
+     */
+    public boolean isHasChild() {
+        return _kind == Kind.HasChild;
+    }
+
+    /**
+     * Get the {@code has_child} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code has_child} kind.
+     */
+    public HasChildQuery hasChild() {
+        return TaggedUnionUtils.get(this, Kind.HasChild);
+    }
+
+    /**
+     * Is this variant instance of kind {@code has_parent}?
+     */
+    public boolean isHasParent() {
+        return _kind == Kind.HasParent;
+    }
+
+    /**
+     * Get the {@code has_parent} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code has_parent} kind.
+     */
+    public HasParentQuery hasParent() {
+        return TaggedUnionUtils.get(this, Kind.HasParent);
+    }
+
+    /**
+     * Is this variant instance of kind {@code ids}?
+     */
+    public boolean isIds() {
+        return _kind == Kind.Ids;
+    }
+
+    /**
+     * Get the {@code ids} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code ids} kind.
+     */
+    public IdsQuery ids() {
+        return TaggedUnionUtils.get(this, Kind.Ids);
+    }
+
+    /**
+     * Is this variant instance of kind {@code intervals}?
+     */
+    public boolean isIntervals() {
+        return _kind == Kind.Intervals;
+    }
+
+    /**
+     * Get the {@code intervals} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code intervals} kind.
+     */
+    public IntervalsQuery intervals() {
+        return TaggedUnionUtils.get(this, Kind.Intervals);
+    }
+
+    /**
+     * Is this variant instance of kind {@code knn}?
+     */
+    public boolean isKnn() {
+        return _kind == Kind.Knn;
+    }
+
+    /**
+     * Get the {@code knn} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code knn} kind.
+     */
+    public KnnQuery knn() {
+        return TaggedUnionUtils.get(this, Kind.Knn);
+    }
+
+    /**
+     * Is this variant instance of kind {@code match}?
+     */
+    public boolean isMatch() {
+        return _kind == Kind.Match;
+    }
+
+    /**
+     * Get the {@code match} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code match} kind.
+     */
+    public MatchQuery match() {
+        return TaggedUnionUtils.get(this, Kind.Match);
+    }
+
+    /**
+     * Is this variant instance of kind {@code match_all}?
+     */
+    public boolean isMatchAll() {
+        return _kind == Kind.MatchAll;
+    }
+
+    /**
+     * Get the {@code match_all} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code match_all} kind.
+     */
+    public MatchAllQuery matchAll() {
+        return TaggedUnionUtils.get(this, Kind.MatchAll);
+    }
+
+    /**
+     * Is this variant instance of kind {@code match_bool_prefix}?
+     */
+    public boolean isMatchBoolPrefix() {
+        return _kind == Kind.MatchBoolPrefix;
+    }
+
+    /**
+     * Get the {@code match_bool_prefix} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code match_bool_prefix}
+     *             kind.
+     */
+    public MatchBoolPrefixQuery matchBoolPrefix() {
+        return TaggedUnionUtils.get(this, Kind.MatchBoolPrefix);
+    }
+
+    /**
+     * Is this variant instance of kind {@code match_none}?
+     */
+    public boolean isMatchNone() {
+        return _kind == Kind.MatchNone;
+    }
+
+    /**
+     * Get the {@code match_none} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code match_none} kind.
+     */
+    public MatchNoneQuery matchNone() {
+        return TaggedUnionUtils.get(this, Kind.MatchNone);
+    }
+
+    /**
+     * Is this variant instance of kind {@code match_phrase}?
+     */
+    public boolean isMatchPhrase() {
+        return _kind == Kind.MatchPhrase;
+    }
+
+    /**
+     * Get the {@code match_phrase} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code match_phrase} kind.
+     */
+    public MatchPhraseQuery matchPhrase() {
+        return TaggedUnionUtils.get(this, Kind.MatchPhrase);
+    }
+
+    /**
+     * Is this variant instance of kind {@code match_phrase_prefix}?
+     */
+    public boolean isMatchPhrasePrefix() {
+        return _kind == Kind.MatchPhrasePrefix;
+    }
+
+    /**
+     * Get the {@code match_phrase_prefix} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code match_phrase_prefix}
+     *             kind.
+     */
+    public MatchPhrasePrefixQuery matchPhrasePrefix() {
+        return TaggedUnionUtils.get(this, Kind.MatchPhrasePrefix);
+    }
+
+    /**
+     * Is this variant instance of kind {@code more_like_this}?
+     */
+    public boolean isMoreLikeThis() {
+        return _kind == Kind.MoreLikeThis;
+    }
+
+    /**
+     * Get the {@code more_like_this} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code more_like_this} kind.
+     */
+    public MoreLikeThisQuery moreLikeThis() {
+        return TaggedUnionUtils.get(this, Kind.MoreLikeThis);
+    }
+
+    /**
+     * Is this variant instance of kind {@code multi_match}?
+     */
+    public boolean isMultiMatch() {
+        return _kind == Kind.MultiMatch;
+    }
+
+    /**
+     * Get the {@code multi_match} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code multi_match} kind.
+     */
+    public MultiMatchQuery multiMatch() {
+        return TaggedUnionUtils.get(this, Kind.MultiMatch);
+    }
+
+    /**
+     * Is this variant instance of kind {@code nested}?
+     */
+    public boolean isNested() {
+        return _kind == Kind.Nested;
+    }
+
+    /**
+     * Get the {@code nested} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code nested} kind.
+     */
+    public NestedQuery nested() {
+        return TaggedUnionUtils.get(this, Kind.Nested);
+    }
+
+    /**
+     * Is this variant instance of kind {@code parent_id}?
+     */
+    public boolean isParentId() {
+        return _kind == Kind.ParentId;
+    }
+
+    /**
+     * Get the {@code parent_id} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code parent_id} kind.
+     */
+    public ParentIdQuery parentId() {
+        return TaggedUnionUtils.get(this, Kind.ParentId);
+    }
+
+    /**
+     * Is this variant instance of kind {@code percolate}?
+     */
+    public boolean isPercolate() {
+        return _kind == Kind.Percolate;
+    }
+
+    /**
+     * Get the {@code percolate} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code percolate} kind.
+     */
+    public PercolateQuery percolate() {
+        return TaggedUnionUtils.get(this, Kind.Percolate);
+    }
+
+    /**
+     * Is this variant instance of kind {@code pinned}?
+     */
+    public boolean isPinned() {
+        return _kind == Kind.Pinned;
+    }
+
+    /**
+     * Get the {@code pinned} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code pinned} kind.
+     */
+    public PinnedQuery pinned() {
+        return TaggedUnionUtils.get(this, Kind.Pinned);
+    }
+
+    /**
+     * Is this variant instance of kind {@code prefix}?
+     */
+    public boolean isPrefix() {
+        return _kind == Kind.Prefix;
+    }
+
+    /**
+     * Get the {@code prefix} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code prefix} kind.
+     */
+    public PrefixQuery prefix() {
+        return TaggedUnionUtils.get(this, Kind.Prefix);
+    }
+
+    /**
+     * Is this variant instance of kind {@code query_string}?
+     */
+    public boolean isQueryString() {
+        return _kind == Kind.QueryString;
+    }
+
+    /**
+     * Get the {@code query_string} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code query_string} kind.
+     */
+    public QueryStringQuery queryString() {
+        return TaggedUnionUtils.get(this, Kind.QueryString);
+    }
+
+    /**
+     * Is this variant instance of kind {@code range}?
+     */
+    public boolean isRange() {
+        return _kind == Kind.Range;
+    }
+
+    /**
+     * Get the {@code range} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code range} kind.
+     */
+    public RangeQuery range() {
+        return TaggedUnionUtils.get(this, Kind.Range);
+    }
+
+    /**
+     * Is this variant instance of kind {@code rank_feature}?
+     */
+    public boolean isRankFeature() {
+        return _kind == Kind.RankFeature;
+    }
+
+    /**
+     * Get the {@code rank_feature} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code rank_feature} kind.
+     */
+    public RankFeatureQuery rankFeature() {
+        return TaggedUnionUtils.get(this, Kind.RankFeature);
+    }
+
+    /**
+     * Is this variant instance of kind {@code regexp}?
+     */
+    public boolean isRegexp() {
+        return _kind == Kind.Regexp;
+    }
+
+    /**
+     * Get the {@code regexp} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code regexp} kind.
+     */
+    public RegexpQuery regexp() {
+        return TaggedUnionUtils.get(this, Kind.Regexp);
+    }
+
+    /**
+     * Is this variant instance of kind {@code script}?
+     */
+    public boolean isScript() {
+        return _kind == Kind.Script;
+    }
+
+    /**
+     * Get the {@code script} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code script} kind.
+     */
+    public ScriptQuery script() {
+        return TaggedUnionUtils.get(this, Kind.Script);
+    }
+
+    /**
+     * Is this variant instance of kind {@code script_score}?
+     */
+    public boolean isScriptScore() {
+        return _kind == Kind.ScriptScore;
+    }
+
+    /**
+     * Get the {@code script_score} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code script_score} kind.
+     */
+    public ScriptScoreQuery scriptScore() {
+        return TaggedUnionUtils.get(this, Kind.ScriptScore);
+    }
+
+    /**
+     * Is this variant instance of kind {@code shape}?
+     */
+    public boolean isShape() {
+        return _kind == Kind.Shape;
+    }
+
+    /**
+     * Get the {@code shape} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code shape} kind.
+     */
+    public ShapeQuery shape() {
+        return TaggedUnionUtils.get(this, Kind.Shape);
+    }
+
+    /**
+     * Is this variant instance of kind {@code simple_query_string}?
+     */
+    public boolean isSimpleQueryString() {
+        return _kind == Kind.SimpleQueryString;
+    }
+
+    /**
+     * Get the {@code simple_query_string} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code simple_query_string}
+     *             kind.
+     */
+    public SimpleQueryStringQuery simpleQueryString() {
+        return TaggedUnionUtils.get(this, Kind.SimpleQueryString);
+    }
+
+    /**
+     * Is this variant instance of kind {@code span_containing}?
+     */
+    public boolean isSpanContaining() {
+        return _kind == Kind.SpanContaining;
+    }
+
+    /**
+     * Get the {@code span_containing} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code span_containing}
+     *             kind.
+     */
+    public SpanContainingQuery spanContaining() {
+        return TaggedUnionUtils.get(this, Kind.SpanContaining);
+    }
+
+    /**
+     * Is this variant instance of kind {@code field_masking_span}?
+     */
+    public boolean isFieldMaskingSpan() {
+        return _kind == Kind.FieldMaskingSpan;
+    }
+
+    /**
+     * Get the {@code field_masking_span} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code field_masking_span}
+     *             kind.
+     */
+    public SpanFieldMaskingQuery fieldMaskingSpan() {
+        return TaggedUnionUtils.get(this, Kind.FieldMaskingSpan);
+    }
+
+    /**
+     * Is this variant instance of kind {@code span_first}?
+     */
+    public boolean isSpanFirst() {
+        return _kind == Kind.SpanFirst;
+    }
+
+    /**
+     * Get the {@code span_first} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code span_first} kind.
+     */
+    public SpanFirstQuery spanFirst() {
+        return TaggedUnionUtils.get(this, Kind.SpanFirst);
+    }
+
+    /**
+     * Is this variant instance of kind {@code span_multi}?
+     */
+    public boolean isSpanMulti() {
+        return _kind == Kind.SpanMulti;
+    }
+
+    /**
+     * Get the {@code span_multi} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code span_multi} kind.
+     */
+    public SpanMultiTermQuery spanMulti() {
+        return TaggedUnionUtils.get(this, Kind.SpanMulti);
+    }
+
+    /**
+     * Is this variant instance of kind {@code span_near}?
+     */
+    public boolean isSpanNear() {
+        return _kind == Kind.SpanNear;
+    }
+
+    /**
+     * Get the {@code span_near} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code span_near} kind.
+     */
+    public SpanNearQuery spanNear() {
+        return TaggedUnionUtils.get(this, Kind.SpanNear);
+    }
+
+    /**
+     * Is this variant instance of kind {@code span_not}?
+     */
+    public boolean isSpanNot() {
+        return _kind == Kind.SpanNot;
+    }
+
+    /**
+     * Get the {@code span_not} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code span_not} kind.
+     */
+    public SpanNotQuery spanNot() {
+        return TaggedUnionUtils.get(this, Kind.SpanNot);
+    }
+
+    /**
+     * Is this variant instance of kind {@code span_or}?
+     */
+    public boolean isSpanOr() {
+        return _kind == Kind.SpanOr;
+    }
+
+    /**
+     * Get the {@code span_or} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code span_or} kind.
+     */
+    public SpanOrQuery spanOr() {
+        return TaggedUnionUtils.get(this, Kind.SpanOr);
+    }
+
+    /**
+     * Is this variant instance of kind {@code span_term}?
+     */
+    public boolean isSpanTerm() {
+        return _kind == Kind.SpanTerm;
+    }
+
+    /**
+     * Get the {@code span_term} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code span_term} kind.
+     */
+    public SpanTermQuery spanTerm() {
+        return TaggedUnionUtils.get(this, Kind.SpanTerm);
+    }
+
+    /**
+     * Is this variant instance of kind {@code span_within}?
+     */
+    public boolean isSpanWithin() {
+        return _kind == Kind.SpanWithin;
+    }
+
+    /**
+     * Get the {@code span_within} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code span_within} kind.
+     */
+    public SpanWithinQuery spanWithin() {
+        return TaggedUnionUtils.get(this, Kind.SpanWithin);
+    }
+
+    /**
+     * Is this variant instance of kind {@code term}?
+     */
+    public boolean isTerm() {
+        return _kind == Kind.Term;
+    }
+
+    /**
+     * Get the {@code term} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code term} kind.
+     */
+    public TermQuery term() {
+        return TaggedUnionUtils.get(this, Kind.Term);
+    }
+
+    /**
+     * Is this variant instance of kind {@code terms}?
+     */
+    public boolean isTerms() {
+        return _kind == Kind.Terms;
+    }
+
+    /**
+     * Get the {@code terms} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code terms} kind.
+     */
+    public TermsQuery terms() {
+        return TaggedUnionUtils.get(this, Kind.Terms);
+    }
+
+    /**
+     * Is this variant instance of kind {@code terms_set}?
+     */
+    public boolean isTermsSet() {
+        return _kind == Kind.TermsSet;
+    }
+
+    /**
+     * Get the {@code terms_set} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code terms_set} kind.
+     */
+    public TermsSetQuery termsSet() {
+        return TaggedUnionUtils.get(this, Kind.TermsSet);
+    }
+
+    /**
+     * Is this variant instance of kind {@code wildcard}?
+     */
+    public boolean isWildcard() {
+        return _kind == Kind.Wildcard;
+    }
+
+    /**
+     * Get the {@code wildcard} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code wildcard} kind.
+     */
+    public WildcardQuery wildcard() {
+        return TaggedUnionUtils.get(this, Kind.Wildcard);
+    }
+
+    /**
+     * Is this variant instance of kind {@code type}?
+     */
+    public boolean isType() {
+        return _kind == Kind.Type;
+    }
+
+    /**
+     * Get the {@code type} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code type} kind.
+     */
+    public TypeQuery type() {
+        return TaggedUnionUtils.get(this, Kind.Type);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeStartObject();
+
+        generator.writeKey(_kind.jsonValue());
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        }
+
+        generator.writeEnd();
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Query> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<Query> bool(BoolQuery v) {
+            this._kind = Kind.Bool;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> bool(Function<BoolQuery.Builder, ObjectBuilder<BoolQuery>> fn) {
+            return this.bool(fn.apply(new BoolQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> boosting(BoostingQuery v) {
+            this._kind = Kind.Boosting;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> boosting(Function<BoostingQuery.Builder, ObjectBuilder<BoostingQuery>> fn) {
+            return this.boosting(fn.apply(new BoostingQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> common(CommonTermsQuery v) {
+            this._kind = Kind.Common;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> common(Function<CommonTermsQuery.Builder, ObjectBuilder<CommonTermsQuery>> fn) {
+            return this.common(fn.apply(new CommonTermsQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> combinedFields(CombinedFieldsQuery v) {
+            this._kind = Kind.CombinedFields;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> combinedFields(Function<CombinedFieldsQuery.Builder, ObjectBuilder<CombinedFieldsQuery>> fn) {
+            return this.combinedFields(fn.apply(new CombinedFieldsQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> constantScore(ConstantScoreQuery v) {
+            this._kind = Kind.ConstantScore;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> constantScore(Function<ConstantScoreQuery.Builder, ObjectBuilder<ConstantScoreQuery>> fn) {
+            return this.constantScore(fn.apply(new ConstantScoreQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> disMax(DisMaxQuery v) {
+            this._kind = Kind.DisMax;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> disMax(Function<DisMaxQuery.Builder, ObjectBuilder<DisMaxQuery>> fn) {
+            return this.disMax(fn.apply(new DisMaxQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> distanceFeature(DistanceFeatureQuery v) {
+            this._kind = Kind.DistanceFeature;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> distanceFeature(Function<DistanceFeatureQuery.Builder, ObjectBuilder<DistanceFeatureQuery>> fn) {
+            return this.distanceFeature(fn.apply(new DistanceFeatureQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> exists(ExistsQuery v) {
+            this._kind = Kind.Exists;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> exists(Function<ExistsQuery.Builder, ObjectBuilder<ExistsQuery>> fn) {
+            return this.exists(fn.apply(new ExistsQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> functionScore(FunctionScoreQuery v) {
+            this._kind = Kind.FunctionScore;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> functionScore(Function<FunctionScoreQuery.Builder, ObjectBuilder<FunctionScoreQuery>> fn) {
+            return this.functionScore(fn.apply(new FunctionScoreQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> fuzzy(FuzzyQuery v) {
+            this._kind = Kind.Fuzzy;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> fuzzy(Function<FuzzyQuery.Builder, ObjectBuilder<FuzzyQuery>> fn) {
+            return this.fuzzy(fn.apply(new FuzzyQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> geoBoundingBox(GeoBoundingBoxQuery v) {
+            this._kind = Kind.GeoBoundingBox;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> geoBoundingBox(Function<GeoBoundingBoxQuery.Builder, ObjectBuilder<GeoBoundingBoxQuery>> fn) {
+            return this.geoBoundingBox(fn.apply(new GeoBoundingBoxQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> geoDistance(GeoDistanceQuery v) {
+            this._kind = Kind.GeoDistance;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> geoDistance(Function<GeoDistanceQuery.Builder, ObjectBuilder<GeoDistanceQuery>> fn) {
+            return this.geoDistance(fn.apply(new GeoDistanceQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> geoPolygon(GeoPolygonQuery v) {
+            this._kind = Kind.GeoPolygon;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> geoPolygon(Function<GeoPolygonQuery.Builder, ObjectBuilder<GeoPolygonQuery>> fn) {
+            return this.geoPolygon(fn.apply(new GeoPolygonQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> geoShape(GeoShapeQuery v) {
+            this._kind = Kind.GeoShape;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> geoShape(Function<GeoShapeQuery.Builder, ObjectBuilder<GeoShapeQuery>> fn) {
+            return this.geoShape(fn.apply(new GeoShapeQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> hasChild(HasChildQuery v) {
+            this._kind = Kind.HasChild;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> hasChild(Function<HasChildQuery.Builder, ObjectBuilder<HasChildQuery>> fn) {
+            return this.hasChild(fn.apply(new HasChildQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> hasParent(HasParentQuery v) {
+            this._kind = Kind.HasParent;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> hasParent(Function<HasParentQuery.Builder, ObjectBuilder<HasParentQuery>> fn) {
+            return this.hasParent(fn.apply(new HasParentQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> ids(IdsQuery v) {
+            this._kind = Kind.Ids;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> ids(Function<IdsQuery.Builder, ObjectBuilder<IdsQuery>> fn) {
+            return this.ids(fn.apply(new IdsQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> intervals(IntervalsQuery v) {
+            this._kind = Kind.Intervals;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> intervals(Function<IntervalsQuery.Builder, ObjectBuilder<IntervalsQuery>> fn) {
+            return this.intervals(fn.apply(new IntervalsQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> knn(KnnQuery v) {
+            this._kind = Kind.Knn;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> knn(Function<KnnQuery.Builder, ObjectBuilder<KnnQuery>> fn) {
+            return this.knn(fn.apply(new KnnQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> match(MatchQuery v) {
+            this._kind = Kind.Match;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> match(Function<MatchQuery.Builder, ObjectBuilder<MatchQuery>> fn) {
+            return this.match(fn.apply(new MatchQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> matchAll(MatchAllQuery v) {
+            this._kind = Kind.MatchAll;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> matchAll(Function<MatchAllQuery.Builder, ObjectBuilder<MatchAllQuery>> fn) {
+            return this.matchAll(fn.apply(new MatchAllQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> matchBoolPrefix(MatchBoolPrefixQuery v) {
+            this._kind = Kind.MatchBoolPrefix;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> matchBoolPrefix(Function<MatchBoolPrefixQuery.Builder, ObjectBuilder<MatchBoolPrefixQuery>> fn) {
+            return this.matchBoolPrefix(fn.apply(new MatchBoolPrefixQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> matchNone(MatchNoneQuery v) {
+            this._kind = Kind.MatchNone;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> matchNone(Function<MatchNoneQuery.Builder, ObjectBuilder<MatchNoneQuery>> fn) {
+            return this.matchNone(fn.apply(new MatchNoneQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> matchPhrase(MatchPhraseQuery v) {
+            this._kind = Kind.MatchPhrase;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> matchPhrase(Function<MatchPhraseQuery.Builder, ObjectBuilder<MatchPhraseQuery>> fn) {
+            return this.matchPhrase(fn.apply(new MatchPhraseQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> matchPhrasePrefix(MatchPhrasePrefixQuery v) {
+            this._kind = Kind.MatchPhrasePrefix;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> matchPhrasePrefix(Function<MatchPhrasePrefixQuery.Builder, ObjectBuilder<MatchPhrasePrefixQuery>> fn) {
+            return this.matchPhrasePrefix(fn.apply(new MatchPhrasePrefixQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> moreLikeThis(MoreLikeThisQuery v) {
+            this._kind = Kind.MoreLikeThis;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> moreLikeThis(Function<MoreLikeThisQuery.Builder, ObjectBuilder<MoreLikeThisQuery>> fn) {
+            return this.moreLikeThis(fn.apply(new MoreLikeThisQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> multiMatch(MultiMatchQuery v) {
+            this._kind = Kind.MultiMatch;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> multiMatch(Function<MultiMatchQuery.Builder, ObjectBuilder<MultiMatchQuery>> fn) {
+            return this.multiMatch(fn.apply(new MultiMatchQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> nested(NestedQuery v) {
+            this._kind = Kind.Nested;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> nested(Function<NestedQuery.Builder, ObjectBuilder<NestedQuery>> fn) {
+            return this.nested(fn.apply(new NestedQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> parentId(ParentIdQuery v) {
+            this._kind = Kind.ParentId;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> parentId(Function<ParentIdQuery.Builder, ObjectBuilder<ParentIdQuery>> fn) {
+            return this.parentId(fn.apply(new ParentIdQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> percolate(PercolateQuery v) {
+            this._kind = Kind.Percolate;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> percolate(Function<PercolateQuery.Builder, ObjectBuilder<PercolateQuery>> fn) {
+            return this.percolate(fn.apply(new PercolateQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> pinned(PinnedQuery v) {
+            this._kind = Kind.Pinned;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> pinned(Function<PinnedQuery.Builder, ObjectBuilder<PinnedQuery>> fn) {
+            return this.pinned(fn.apply(new PinnedQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> prefix(PrefixQuery v) {
+            this._kind = Kind.Prefix;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> prefix(Function<PrefixQuery.Builder, ObjectBuilder<PrefixQuery>> fn) {
+            return this.prefix(fn.apply(new PrefixQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> queryString(QueryStringQuery v) {
+            this._kind = Kind.QueryString;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> queryString(Function<QueryStringQuery.Builder, ObjectBuilder<QueryStringQuery>> fn) {
+            return this.queryString(fn.apply(new QueryStringQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> range(RangeQuery v) {
+            this._kind = Kind.Range;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> range(Function<RangeQuery.Builder, ObjectBuilder<RangeQuery>> fn) {
+            return this.range(fn.apply(new RangeQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> rankFeature(RankFeatureQuery v) {
+            this._kind = Kind.RankFeature;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> rankFeature(Function<RankFeatureQuery.Builder, ObjectBuilder<RankFeatureQuery>> fn) {
+            return this.rankFeature(fn.apply(new RankFeatureQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> regexp(RegexpQuery v) {
+            this._kind = Kind.Regexp;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> regexp(Function<RegexpQuery.Builder, ObjectBuilder<RegexpQuery>> fn) {
+            return this.regexp(fn.apply(new RegexpQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> script(ScriptQuery v) {
+            this._kind = Kind.Script;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> script(Function<ScriptQuery.Builder, ObjectBuilder<ScriptQuery>> fn) {
+            return this.script(fn.apply(new ScriptQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> scriptScore(ScriptScoreQuery v) {
+            this._kind = Kind.ScriptScore;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> scriptScore(Function<ScriptScoreQuery.Builder, ObjectBuilder<ScriptScoreQuery>> fn) {
+            return this.scriptScore(fn.apply(new ScriptScoreQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> shape(ShapeQuery v) {
+            this._kind = Kind.Shape;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> shape(Function<ShapeQuery.Builder, ObjectBuilder<ShapeQuery>> fn) {
+            return this.shape(fn.apply(new ShapeQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> simpleQueryString(SimpleQueryStringQuery v) {
+            this._kind = Kind.SimpleQueryString;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> simpleQueryString(Function<SimpleQueryStringQuery.Builder, ObjectBuilder<SimpleQueryStringQuery>> fn) {
+            return this.simpleQueryString(fn.apply(new SimpleQueryStringQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> spanContaining(SpanContainingQuery v) {
+            this._kind = Kind.SpanContaining;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> spanContaining(Function<SpanContainingQuery.Builder, ObjectBuilder<SpanContainingQuery>> fn) {
+            return this.spanContaining(fn.apply(new SpanContainingQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> fieldMaskingSpan(SpanFieldMaskingQuery v) {
+            this._kind = Kind.FieldMaskingSpan;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> fieldMaskingSpan(Function<SpanFieldMaskingQuery.Builder, ObjectBuilder<SpanFieldMaskingQuery>> fn) {
+            return this.fieldMaskingSpan(fn.apply(new SpanFieldMaskingQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> spanFirst(SpanFirstQuery v) {
+            this._kind = Kind.SpanFirst;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> spanFirst(Function<SpanFirstQuery.Builder, ObjectBuilder<SpanFirstQuery>> fn) {
+            return this.spanFirst(fn.apply(new SpanFirstQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> spanMulti(SpanMultiTermQuery v) {
+            this._kind = Kind.SpanMulti;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> spanMulti(Function<SpanMultiTermQuery.Builder, ObjectBuilder<SpanMultiTermQuery>> fn) {
+            return this.spanMulti(fn.apply(new SpanMultiTermQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> spanNear(SpanNearQuery v) {
+            this._kind = Kind.SpanNear;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> spanNear(Function<SpanNearQuery.Builder, ObjectBuilder<SpanNearQuery>> fn) {
+            return this.spanNear(fn.apply(new SpanNearQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> spanNot(SpanNotQuery v) {
+            this._kind = Kind.SpanNot;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> spanNot(Function<SpanNotQuery.Builder, ObjectBuilder<SpanNotQuery>> fn) {
+            return this.spanNot(fn.apply(new SpanNotQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> spanOr(SpanOrQuery v) {
+            this._kind = Kind.SpanOr;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> spanOr(Function<SpanOrQuery.Builder, ObjectBuilder<SpanOrQuery>> fn) {
+            return this.spanOr(fn.apply(new SpanOrQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> spanTerm(SpanTermQuery v) {
+            this._kind = Kind.SpanTerm;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> spanTerm(Function<SpanTermQuery.Builder, ObjectBuilder<SpanTermQuery>> fn) {
+            return this.spanTerm(fn.apply(new SpanTermQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> spanWithin(SpanWithinQuery v) {
+            this._kind = Kind.SpanWithin;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> spanWithin(Function<SpanWithinQuery.Builder, ObjectBuilder<SpanWithinQuery>> fn) {
+            return this.spanWithin(fn.apply(new SpanWithinQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> term(TermQuery v) {
+            this._kind = Kind.Term;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> term(Function<TermQuery.Builder, ObjectBuilder<TermQuery>> fn) {
+            return this.term(fn.apply(new TermQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> terms(TermsQuery v) {
+            this._kind = Kind.Terms;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> terms(Function<TermsQuery.Builder, ObjectBuilder<TermsQuery>> fn) {
+            return this.terms(fn.apply(new TermsQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> termsSet(TermsSetQuery v) {
+            this._kind = Kind.TermsSet;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> termsSet(Function<TermsSetQuery.Builder, ObjectBuilder<TermsSetQuery>> fn) {
+            return this.termsSet(fn.apply(new TermsSetQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> wildcard(WildcardQuery v) {
+            this._kind = Kind.Wildcard;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> wildcard(Function<WildcardQuery.Builder, ObjectBuilder<WildcardQuery>> fn) {
+            return this.wildcard(fn.apply(new WildcardQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<Query> type(TypeQuery v) {
+            this._kind = Kind.Type;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Query> type(Function<TypeQuery.Builder, ObjectBuilder<TypeQuery>> fn) {
+            return this.type(fn.apply(new TypeQuery.Builder()).build());
+        }
+
+        public Query build() {
+            _checkSingleUse();
+            return new Query(this);
+        }
+
+    }
+
+    protected static void setupQueryDeserializer(ObjectDeserializer<Builder> op) {
+
+        op.add(Builder::bool, BoolQuery._DESERIALIZER, "bool");
+        op.add(Builder::boosting, BoostingQuery._DESERIALIZER, "boosting");
+        op.add(Builder::common, CommonTermsQuery._DESERIALIZER, "common");
+        op.add(Builder::combinedFields, CombinedFieldsQuery._DESERIALIZER, "combined_fields");
+        op.add(Builder::constantScore, ConstantScoreQuery._DESERIALIZER, "constant_score");
+        op.add(Builder::disMax, DisMaxQuery._DESERIALIZER, "dis_max");
+        op.add(Builder::distanceFeature, DistanceFeatureQuery._DESERIALIZER, "distance_feature");
+        op.add(Builder::exists, ExistsQuery._DESERIALIZER, "exists");
+        op.add(Builder::functionScore, FunctionScoreQuery._DESERIALIZER, "function_score");
+        op.add(Builder::fuzzy, FuzzyQuery._DESERIALIZER, "fuzzy");
+        op.add(Builder::geoBoundingBox, GeoBoundingBoxQuery._DESERIALIZER, "geo_bounding_box");
+        op.add(Builder::geoDistance, GeoDistanceQuery._DESERIALIZER, "geo_distance");
+        op.add(Builder::geoPolygon, GeoPolygonQuery._DESERIALIZER, "geo_polygon");
+        op.add(Builder::geoShape, GeoShapeQuery._DESERIALIZER, "geo_shape");
+        op.add(Builder::hasChild, HasChildQuery._DESERIALIZER, "has_child");
+        op.add(Builder::hasParent, HasParentQuery._DESERIALIZER, "has_parent");
+        op.add(Builder::ids, IdsQuery._DESERIALIZER, "ids");
+        op.add(Builder::intervals, IntervalsQuery._DESERIALIZER, "intervals");
+        op.add(Builder::knn, KnnQuery._DESERIALIZER, "knn");
+        op.add(Builder::match, MatchQuery._DESERIALIZER, "match");
+        op.add(Builder::matchAll, MatchAllQuery._DESERIALIZER, "match_all");
+        op.add(Builder::matchBoolPrefix, MatchBoolPrefixQuery._DESERIALIZER, "match_bool_prefix");
+        op.add(Builder::matchNone, MatchNoneQuery._DESERIALIZER, "match_none");
+        op.add(Builder::matchPhrase, MatchPhraseQuery._DESERIALIZER, "match_phrase");
+        op.add(Builder::matchPhrasePrefix, MatchPhrasePrefixQuery._DESERIALIZER, "match_phrase_prefix");
+        op.add(Builder::moreLikeThis, MoreLikeThisQuery._DESERIALIZER, "more_like_this");
+        op.add(Builder::multiMatch, MultiMatchQuery._DESERIALIZER, "multi_match");
+        op.add(Builder::nested, NestedQuery._DESERIALIZER, "nested");
+        op.add(Builder::parentId, ParentIdQuery._DESERIALIZER, "parent_id");
+        op.add(Builder::percolate, PercolateQuery._DESERIALIZER, "percolate");
+        op.add(Builder::pinned, PinnedQuery._DESERIALIZER, "pinned");
+        op.add(Builder::prefix, PrefixQuery._DESERIALIZER, "prefix");
+        op.add(Builder::queryString, QueryStringQuery._DESERIALIZER, "query_string");
+        op.add(Builder::range, RangeQuery._DESERIALIZER, "range");
+        op.add(Builder::rankFeature, RankFeatureQuery._DESERIALIZER, "rank_feature");
+        op.add(Builder::regexp, RegexpQuery._DESERIALIZER, "regexp");
+        op.add(Builder::script, ScriptQuery._DESERIALIZER, "script");
+        op.add(Builder::scriptScore, ScriptScoreQuery._DESERIALIZER, "script_score");
+        op.add(Builder::shape, ShapeQuery._DESERIALIZER, "shape");
+        op.add(Builder::simpleQueryString, SimpleQueryStringQuery._DESERIALIZER, "simple_query_string");
+        op.add(Builder::spanContaining, SpanContainingQuery._DESERIALIZER, "span_containing");
+        op.add(Builder::fieldMaskingSpan, SpanFieldMaskingQuery._DESERIALIZER, "field_masking_span");
+        op.add(Builder::spanFirst, SpanFirstQuery._DESERIALIZER, "span_first");
+        op.add(Builder::spanMulti, SpanMultiTermQuery._DESERIALIZER, "span_multi");
+        op.add(Builder::spanNear, SpanNearQuery._DESERIALIZER, "span_near");
+        op.add(Builder::spanNot, SpanNotQuery._DESERIALIZER, "span_not");
+        op.add(Builder::spanOr, SpanOrQuery._DESERIALIZER, "span_or");
+        op.add(Builder::spanTerm, SpanTermQuery._DESERIALIZER, "span_term");
+        op.add(Builder::spanWithin, SpanWithinQuery._DESERIALIZER, "span_within");
+        op.add(Builder::term, TermQuery._DESERIALIZER, "term");
+        op.add(Builder::terms, TermsQuery._DESERIALIZER, "terms");
+        op.add(Builder::termsSet, TermsSetQuery._DESERIALIZER, "terms_set");
+        op.add(Builder::wildcard, WildcardQuery._DESERIALIZER, "wildcard");
+        op.add(Builder::type, TypeQuery._DESERIALIZER, "type");
+
+    }
+
+    public static final JsonpDeserializer<Query> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Query::setupQueryDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryBase.java
index 970235215e..c700d6f541 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryBase.java
@@ -32,110 +32,105 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.QueryBase
 
+public abstract class QueryBase implements JsonpSerializable {
+    @Nullable
+    private final Float boost;
 
+    @Nullable
+    private final String queryName;
 
-public abstract class QueryBase implements JsonpSerializable {
-	@Nullable
-	private final Float boost;
-
-	@Nullable
-	private final String queryName;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected QueryBase(AbstractBuilder<?> builder) {
-
-		this.boost = builder.boost;
-		this.queryName = builder.queryName;
-
-	}
-
-	/**
-	 * API name: {@code boost}
-	 */
-	@Nullable
-	public final Float boost() {
-		return this.boost;
-	}
-
-	/**
-	 * API name: {@code _name}
-	 */
-	@Nullable
-	public final String queryName() {
-		return this.queryName;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.boost != null) {
-			generator.writeKey("boost");
-			generator.write(this.boost);
-
-		}
-		if (this.queryName != null) {
-			generator.writeKey("_name");
-			generator.write(this.queryName);
-
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		@Nullable
-		private Float boost;
-
-		@Nullable
-		private String queryName;
-
-		/**
-		 * API name: {@code boost}
-		 */
-		public final BuilderT boost(@Nullable Float value) {
-			this.boost = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code _name}
-		 */
-		public final BuilderT queryName(@Nullable String value) {
-			this.queryName = value;
-			return self();
-		}
-
-		protected abstract BuilderT self();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupQueryBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-
-		op.add(AbstractBuilder::boost, JsonpDeserializer.floatDeserializer(), "boost");
-		op.add(AbstractBuilder::queryName, JsonpDeserializer.stringDeserializer(), "_name");
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    protected QueryBase(AbstractBuilder<?> builder) {
+
+        this.boost = builder.boost;
+        this.queryName = builder.queryName;
+
+    }
+
+    /**
+     * API name: {@code boost}
+     */
+    @Nullable
+    public final Float boost() {
+        return this.boost;
+    }
+
+    /**
+     * API name: {@code _name}
+     */
+    @Nullable
+    public final String queryName() {
+        return this.queryName;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.boost != null) {
+            generator.writeKey("boost");
+            generator.write(this.boost);
+
+        }
+        if (this.queryName != null) {
+            generator.writeKey("_name");
+            generator.write(this.queryName);
+
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        @Nullable
+        private Float boost;
+
+        @Nullable
+        private String queryName;
+
+        /**
+         * API name: {@code boost}
+         */
+        public final BuilderT boost(@Nullable Float value) {
+            this.boost = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code _name}
+         */
+        public final BuilderT queryName(@Nullable String value) {
+            this.queryName = value;
+            return self();
+        }
+
+        protected abstract BuilderT self();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupQueryBaseDeserializer(ObjectDeserializer<BuilderT> op) {
+
+        op.add(AbstractBuilder::boost, JsonpDeserializer.floatDeserializer(), "boost");
+        op.add(AbstractBuilder::queryName, JsonpDeserializer.stringDeserializer(), "_name");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryBuilders.java
index 90227a52cd..dc6db50515 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryBuilders.java
@@ -36,429 +36,428 @@
  * Builders for {@link Query} variants.
  */
 public class QueryBuilders {
-	private QueryBuilders() {
-	}
-
-	/**
-	 * Creates a builder for the {@link BoolQuery bool} {@code Query} variant.
-	 */
-	public static BoolQuery.Builder bool() {
-		return new BoolQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link BoostingQuery boosting} {@code Query}
-	 * variant.
-	 */
-	public static BoostingQuery.Builder boosting() {
-		return new BoostingQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link CommonTermsQuery common} {@code Query}
-	 * variant.
-	 */
-	public static CommonTermsQuery.Builder common() {
-		return new CommonTermsQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link CombinedFieldsQuery combined_fields}
-	 * {@code Query} variant.
-	 */
-	public static CombinedFieldsQuery.Builder combinedFields() {
-		return new CombinedFieldsQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ConstantScoreQuery constant_score}
-	 * {@code Query} variant.
-	 */
-	public static ConstantScoreQuery.Builder constantScore() {
-		return new ConstantScoreQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DisMaxQuery dis_max} {@code Query} variant.
-	 */
-	public static DisMaxQuery.Builder disMax() {
-		return new DisMaxQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DistanceFeatureQuery distance_feature}
-	 * {@code Query} variant.
-	 */
-	public static DistanceFeatureQuery.Builder distanceFeature() {
-		return new DistanceFeatureQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ExistsQuery exists} {@code Query} variant.
-	 */
-	public static ExistsQuery.Builder exists() {
-		return new ExistsQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link FunctionScoreQuery function_score}
-	 * {@code Query} variant.
-	 */
-	public static FunctionScoreQuery.Builder functionScore() {
-		return new FunctionScoreQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link FuzzyQuery fuzzy} {@code Query} variant.
-	 */
-	public static FuzzyQuery.Builder fuzzy() {
-		return new FuzzyQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GeoBoundingBoxQuery geo_bounding_box}
-	 * {@code Query} variant.
-	 */
-	public static GeoBoundingBoxQuery.Builder geoBoundingBox() {
-		return new GeoBoundingBoxQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GeoDistanceQuery geo_distance} {@code Query}
-	 * variant.
-	 */
-	public static GeoDistanceQuery.Builder geoDistance() {
-		return new GeoDistanceQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GeoPolygonQuery geo_polygon} {@code Query}
-	 * variant.
-	 */
-	public static GeoPolygonQuery.Builder geoPolygon() {
-		return new GeoPolygonQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GeoShapeQuery geo_shape} {@code Query}
-	 * variant.
-	 */
-	public static GeoShapeQuery.Builder geoShape() {
-		return new GeoShapeQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link HasChildQuery has_child} {@code Query}
-	 * variant.
-	 */
-	public static HasChildQuery.Builder hasChild() {
-		return new HasChildQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link HasParentQuery has_parent} {@code Query}
-	 * variant.
-	 */
-	public static HasParentQuery.Builder hasParent() {
-		return new HasParentQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link IdsQuery ids} {@code Query} variant.
-	 */
-	public static IdsQuery.Builder ids() {
-		return new IdsQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link IntervalsQuery intervals} {@code Query}
-	 * variant.
-	 */
-	public static IntervalsQuery.Builder intervals() {
-		return new IntervalsQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link KnnQuery knn} {@code Query} variant.
-	 */
-	public static KnnQuery.Builder knn() {
-		return new KnnQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MatchQuery match} {@code Query} variant.
-	 */
-	public static MatchQuery.Builder match() {
-		return new MatchQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MatchAllQuery match_all} {@code Query}
-	 * variant.
-	 */
-	public static MatchAllQuery.Builder matchAll() {
-		return new MatchAllQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MatchBoolPrefixQuery match_bool_prefix}
-	 * {@code Query} variant.
-	 */
-	public static MatchBoolPrefixQuery.Builder matchBoolPrefix() {
-		return new MatchBoolPrefixQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MatchNoneQuery match_none} {@code Query}
-	 * variant.
-	 */
-	public static MatchNoneQuery.Builder matchNone() {
-		return new MatchNoneQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MatchPhraseQuery match_phrase} {@code Query}
-	 * variant.
-	 */
-	public static MatchPhraseQuery.Builder matchPhrase() {
-		return new MatchPhraseQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MatchPhrasePrefixQuery match_phrase_prefix}
-	 * {@code Query} variant.
-	 */
-	public static MatchPhrasePrefixQuery.Builder matchPhrasePrefix() {
-		return new MatchPhrasePrefixQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MoreLikeThisQuery more_like_this}
-	 * {@code Query} variant.
-	 */
-	public static MoreLikeThisQuery.Builder moreLikeThis() {
-		return new MoreLikeThisQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link MultiMatchQuery multi_match} {@code Query}
-	 * variant.
-	 */
-	public static MultiMatchQuery.Builder multiMatch() {
-		return new MultiMatchQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link NestedQuery nested} {@code Query} variant.
-	 */
-	public static NestedQuery.Builder nested() {
-		return new NestedQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ParentIdQuery parent_id} {@code Query}
-	 * variant.
-	 */
-	public static ParentIdQuery.Builder parentId() {
-		return new ParentIdQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link PercolateQuery percolate} {@code Query}
-	 * variant.
-	 */
-	public static PercolateQuery.Builder percolate() {
-		return new PercolateQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link PinnedQuery pinned} {@code Query} variant.
-	 */
-	public static PinnedQuery.Builder pinned() {
-		return new PinnedQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link PrefixQuery prefix} {@code Query} variant.
-	 */
-	public static PrefixQuery.Builder prefix() {
-		return new PrefixQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link QueryStringQuery query_string} {@code Query}
-	 * variant.
-	 */
-	public static QueryStringQuery.Builder queryString() {
-		return new QueryStringQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link RangeQuery range} {@code Query} variant.
-	 */
-	public static RangeQuery.Builder range() {
-		return new RangeQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link RankFeatureQuery rank_feature} {@code Query}
-	 * variant.
-	 */
-	public static RankFeatureQuery.Builder rankFeature() {
-		return new RankFeatureQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link RegexpQuery regexp} {@code Query} variant.
-	 */
-	public static RegexpQuery.Builder regexp() {
-		return new RegexpQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ScriptQuery script} {@code Query} variant.
-	 */
-	public static ScriptQuery.Builder script() {
-		return new ScriptQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ScriptScoreQuery script_score} {@code Query}
-	 * variant.
-	 */
-	public static ScriptScoreQuery.Builder scriptScore() {
-		return new ScriptScoreQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ShapeQuery shape} {@code Query} variant.
-	 */
-	public static ShapeQuery.Builder shape() {
-		return new ShapeQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SimpleQueryStringQuery simple_query_string}
-	 * {@code Query} variant.
-	 */
-	public static SimpleQueryStringQuery.Builder simpleQueryString() {
-		return new SimpleQueryStringQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SpanContainingQuery span_containing}
-	 * {@code Query} variant.
-	 */
-	public static SpanContainingQuery.Builder spanContaining() {
-		return new SpanContainingQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SpanFieldMaskingQuery field_masking_span}
-	 * {@code Query} variant.
-	 */
-	public static SpanFieldMaskingQuery.Builder fieldMaskingSpan() {
-		return new SpanFieldMaskingQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SpanFirstQuery span_first} {@code Query}
-	 * variant.
-	 */
-	public static SpanFirstQuery.Builder spanFirst() {
-		return new SpanFirstQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SpanMultiTermQuery span_multi} {@code Query}
-	 * variant.
-	 */
-	public static SpanMultiTermQuery.Builder spanMulti() {
-		return new SpanMultiTermQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SpanNearQuery span_near} {@code Query}
-	 * variant.
-	 */
-	public static SpanNearQuery.Builder spanNear() {
-		return new SpanNearQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SpanNotQuery span_not} {@code Query}
-	 * variant.
-	 */
-	public static SpanNotQuery.Builder spanNot() {
-		return new SpanNotQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SpanOrQuery span_or} {@code Query} variant.
-	 */
-	public static SpanOrQuery.Builder spanOr() {
-		return new SpanOrQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SpanTermQuery span_term} {@code Query}
-	 * variant.
-	 */
-	public static SpanTermQuery.Builder spanTerm() {
-		return new SpanTermQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SpanWithinQuery span_within} {@code Query}
-	 * variant.
-	 */
-	public static SpanWithinQuery.Builder spanWithin() {
-		return new SpanWithinQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link TermQuery term} {@code Query} variant.
-	 */
-	public static TermQuery.Builder term() {
-		return new TermQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link TermsQuery terms} {@code Query} variant.
-	 */
-	public static TermsQuery.Builder terms() {
-		return new TermsQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link TermsSetQuery terms_set} {@code Query}
-	 * variant.
-	 */
-	public static TermsSetQuery.Builder termsSet() {
-		return new TermsSetQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link WildcardQuery wildcard} {@code Query}
-	 * variant.
-	 */
-	public static WildcardQuery.Builder wildcard() {
-		return new WildcardQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link WrapperQuery wrapper} {@code Query}
-	 * variant.
-	 */
-	public static WrapperQuery.Builder wrapper() {
-		return new WrapperQuery.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link TypeQuery type} {@code Query} variant.
-	 */
-	public static TypeQuery.Builder type() {
-		return new TypeQuery.Builder();
-	}
+    private QueryBuilders() {}
+
+    /**
+     * Creates a builder for the {@link BoolQuery bool} {@code Query} variant.
+     */
+    public static BoolQuery.Builder bool() {
+        return new BoolQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link BoostingQuery boosting} {@code Query}
+     * variant.
+     */
+    public static BoostingQuery.Builder boosting() {
+        return new BoostingQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link CommonTermsQuery common} {@code Query}
+     * variant.
+     */
+    public static CommonTermsQuery.Builder common() {
+        return new CommonTermsQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link CombinedFieldsQuery combined_fields}
+     * {@code Query} variant.
+     */
+    public static CombinedFieldsQuery.Builder combinedFields() {
+        return new CombinedFieldsQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ConstantScoreQuery constant_score}
+     * {@code Query} variant.
+     */
+    public static ConstantScoreQuery.Builder constantScore() {
+        return new ConstantScoreQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DisMaxQuery dis_max} {@code Query} variant.
+     */
+    public static DisMaxQuery.Builder disMax() {
+        return new DisMaxQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DistanceFeatureQuery distance_feature}
+     * {@code Query} variant.
+     */
+    public static DistanceFeatureQuery.Builder distanceFeature() {
+        return new DistanceFeatureQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ExistsQuery exists} {@code Query} variant.
+     */
+    public static ExistsQuery.Builder exists() {
+        return new ExistsQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link FunctionScoreQuery function_score}
+     * {@code Query} variant.
+     */
+    public static FunctionScoreQuery.Builder functionScore() {
+        return new FunctionScoreQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link FuzzyQuery fuzzy} {@code Query} variant.
+     */
+    public static FuzzyQuery.Builder fuzzy() {
+        return new FuzzyQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GeoBoundingBoxQuery geo_bounding_box}
+     * {@code Query} variant.
+     */
+    public static GeoBoundingBoxQuery.Builder geoBoundingBox() {
+        return new GeoBoundingBoxQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GeoDistanceQuery geo_distance} {@code Query}
+     * variant.
+     */
+    public static GeoDistanceQuery.Builder geoDistance() {
+        return new GeoDistanceQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GeoPolygonQuery geo_polygon} {@code Query}
+     * variant.
+     */
+    public static GeoPolygonQuery.Builder geoPolygon() {
+        return new GeoPolygonQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GeoShapeQuery geo_shape} {@code Query}
+     * variant.
+     */
+    public static GeoShapeQuery.Builder geoShape() {
+        return new GeoShapeQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link HasChildQuery has_child} {@code Query}
+     * variant.
+     */
+    public static HasChildQuery.Builder hasChild() {
+        return new HasChildQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link HasParentQuery has_parent} {@code Query}
+     * variant.
+     */
+    public static HasParentQuery.Builder hasParent() {
+        return new HasParentQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link IdsQuery ids} {@code Query} variant.
+     */
+    public static IdsQuery.Builder ids() {
+        return new IdsQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link IntervalsQuery intervals} {@code Query}
+     * variant.
+     */
+    public static IntervalsQuery.Builder intervals() {
+        return new IntervalsQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link KnnQuery knn} {@code Query} variant.
+     */
+    public static KnnQuery.Builder knn() {
+        return new KnnQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MatchQuery match} {@code Query} variant.
+     */
+    public static MatchQuery.Builder match() {
+        return new MatchQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MatchAllQuery match_all} {@code Query}
+     * variant.
+     */
+    public static MatchAllQuery.Builder matchAll() {
+        return new MatchAllQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MatchBoolPrefixQuery match_bool_prefix}
+     * {@code Query} variant.
+     */
+    public static MatchBoolPrefixQuery.Builder matchBoolPrefix() {
+        return new MatchBoolPrefixQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MatchNoneQuery match_none} {@code Query}
+     * variant.
+     */
+    public static MatchNoneQuery.Builder matchNone() {
+        return new MatchNoneQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MatchPhraseQuery match_phrase} {@code Query}
+     * variant.
+     */
+    public static MatchPhraseQuery.Builder matchPhrase() {
+        return new MatchPhraseQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MatchPhrasePrefixQuery match_phrase_prefix}
+     * {@code Query} variant.
+     */
+    public static MatchPhrasePrefixQuery.Builder matchPhrasePrefix() {
+        return new MatchPhrasePrefixQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MoreLikeThisQuery more_like_this}
+     * {@code Query} variant.
+     */
+    public static MoreLikeThisQuery.Builder moreLikeThis() {
+        return new MoreLikeThisQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link MultiMatchQuery multi_match} {@code Query}
+     * variant.
+     */
+    public static MultiMatchQuery.Builder multiMatch() {
+        return new MultiMatchQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link NestedQuery nested} {@code Query} variant.
+     */
+    public static NestedQuery.Builder nested() {
+        return new NestedQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ParentIdQuery parent_id} {@code Query}
+     * variant.
+     */
+    public static ParentIdQuery.Builder parentId() {
+        return new ParentIdQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link PercolateQuery percolate} {@code Query}
+     * variant.
+     */
+    public static PercolateQuery.Builder percolate() {
+        return new PercolateQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link PinnedQuery pinned} {@code Query} variant.
+     */
+    public static PinnedQuery.Builder pinned() {
+        return new PinnedQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link PrefixQuery prefix} {@code Query} variant.
+     */
+    public static PrefixQuery.Builder prefix() {
+        return new PrefixQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link QueryStringQuery query_string} {@code Query}
+     * variant.
+     */
+    public static QueryStringQuery.Builder queryString() {
+        return new QueryStringQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link RangeQuery range} {@code Query} variant.
+     */
+    public static RangeQuery.Builder range() {
+        return new RangeQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link RankFeatureQuery rank_feature} {@code Query}
+     * variant.
+     */
+    public static RankFeatureQuery.Builder rankFeature() {
+        return new RankFeatureQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link RegexpQuery regexp} {@code Query} variant.
+     */
+    public static RegexpQuery.Builder regexp() {
+        return new RegexpQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ScriptQuery script} {@code Query} variant.
+     */
+    public static ScriptQuery.Builder script() {
+        return new ScriptQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ScriptScoreQuery script_score} {@code Query}
+     * variant.
+     */
+    public static ScriptScoreQuery.Builder scriptScore() {
+        return new ScriptScoreQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ShapeQuery shape} {@code Query} variant.
+     */
+    public static ShapeQuery.Builder shape() {
+        return new ShapeQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SimpleQueryStringQuery simple_query_string}
+     * {@code Query} variant.
+     */
+    public static SimpleQueryStringQuery.Builder simpleQueryString() {
+        return new SimpleQueryStringQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SpanContainingQuery span_containing}
+     * {@code Query} variant.
+     */
+    public static SpanContainingQuery.Builder spanContaining() {
+        return new SpanContainingQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SpanFieldMaskingQuery field_masking_span}
+     * {@code Query} variant.
+     */
+    public static SpanFieldMaskingQuery.Builder fieldMaskingSpan() {
+        return new SpanFieldMaskingQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SpanFirstQuery span_first} {@code Query}
+     * variant.
+     */
+    public static SpanFirstQuery.Builder spanFirst() {
+        return new SpanFirstQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SpanMultiTermQuery span_multi} {@code Query}
+     * variant.
+     */
+    public static SpanMultiTermQuery.Builder spanMulti() {
+        return new SpanMultiTermQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SpanNearQuery span_near} {@code Query}
+     * variant.
+     */
+    public static SpanNearQuery.Builder spanNear() {
+        return new SpanNearQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SpanNotQuery span_not} {@code Query}
+     * variant.
+     */
+    public static SpanNotQuery.Builder spanNot() {
+        return new SpanNotQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SpanOrQuery span_or} {@code Query} variant.
+     */
+    public static SpanOrQuery.Builder spanOr() {
+        return new SpanOrQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SpanTermQuery span_term} {@code Query}
+     * variant.
+     */
+    public static SpanTermQuery.Builder spanTerm() {
+        return new SpanTermQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SpanWithinQuery span_within} {@code Query}
+     * variant.
+     */
+    public static SpanWithinQuery.Builder spanWithin() {
+        return new SpanWithinQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link TermQuery term} {@code Query} variant.
+     */
+    public static TermQuery.Builder term() {
+        return new TermQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link TermsQuery terms} {@code Query} variant.
+     */
+    public static TermsQuery.Builder terms() {
+        return new TermsQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link TermsSetQuery terms_set} {@code Query}
+     * variant.
+     */
+    public static TermsSetQuery.Builder termsSet() {
+        return new TermsSetQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link WildcardQuery wildcard} {@code Query}
+     * variant.
+     */
+    public static WildcardQuery.Builder wildcard() {
+        return new WildcardQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link WrapperQuery wrapper} {@code Query}
+     * variant.
+     */
+    public static WrapperQuery.Builder wrapper() {
+        return new WrapperQuery.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link TypeQuery type} {@code Query} variant.
+     */
+    public static TypeQuery.Builder type() {
+        return new TypeQuery.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryStringQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryStringQuery.java
index 0b48fc3c00..c152ba0baa 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryStringQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryStringQuery.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,813 +43,808 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.QueryStringQuery
 
-
 @JsonpDeserializable
 public class QueryStringQuery extends QueryBase implements QueryVariant {
-	@Nullable
-	private final Boolean allowLeadingWildcard;
+    @Nullable
+    private final Boolean allowLeadingWildcard;
 
-	@Nullable
-	private final String analyzer;
+    @Nullable
+    private final String analyzer;
 
-	@Nullable
-	private final Boolean analyzeWildcard;
+    @Nullable
+    private final Boolean analyzeWildcard;
 
-	@Nullable
-	private final Boolean autoGenerateSynonymsPhraseQuery;
+    @Nullable
+    private final Boolean autoGenerateSynonymsPhraseQuery;
 
-	@Nullable
-	private final String defaultField;
+    @Nullable
+    private final String defaultField;
 
-	@Nullable
-	private final Operator defaultOperator;
+    @Nullable
+    private final Operator defaultOperator;
 
-	@Nullable
-	private final Boolean enablePositionIncrements;
+    @Nullable
+    private final Boolean enablePositionIncrements;
 
-	@Nullable
-	private final Boolean escape;
+    @Nullable
+    private final Boolean escape;
 
-	private final List<String> fields;
+    private final List<String> fields;
 
-	@Nullable
-	private final String fuzziness;
+    @Nullable
+    private final String fuzziness;
 
-	@Nullable
-	private final Integer fuzzyMaxExpansions;
-
-	@Nullable
-	private final Integer fuzzyPrefixLength;
+    @Nullable
+    private final Integer fuzzyMaxExpansions;
+
+    @Nullable
+    private final Integer fuzzyPrefixLength;
 
-	@Nullable
-	private final String fuzzyRewrite;
-
-	@Nullable
-	private final Boolean fuzzyTranspositions;
-
-	@Nullable
-	private final Boolean lenient;
-
-	@Nullable
-	private final Integer maxDeterminizedStates;
-
-	@Nullable
-	private final String minimumShouldMatch;
-
-	@Nullable
-	private final Double phraseSlop;
-
-	private final String query;
-
-	@Nullable
-	private final String quoteAnalyzer;
-
-	@Nullable
-	private final String quoteFieldSuffix;
-
-	@Nullable
-	private final String rewrite;
-
-	@Nullable
-	private final Double tieBreaker;
-
-	@Nullable
-	private final String timeZone;
-
-	@Nullable
-	private final TextQueryType type;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private QueryStringQuery(Builder builder) {
-		super(builder);
-
-		this.allowLeadingWildcard = builder.allowLeadingWildcard;
-		this.analyzer = builder.analyzer;
-		this.analyzeWildcard = builder.analyzeWildcard;
-		this.autoGenerateSynonymsPhraseQuery = builder.autoGenerateSynonymsPhraseQuery;
-		this.defaultField = builder.defaultField;
-		this.defaultOperator = builder.defaultOperator;
-		this.enablePositionIncrements = builder.enablePositionIncrements;
-		this.escape = builder.escape;
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-		this.fuzziness = builder.fuzziness;
-		this.fuzzyMaxExpansions = builder.fuzzyMaxExpansions;
-		this.fuzzyPrefixLength = builder.fuzzyPrefixLength;
-		this.fuzzyRewrite = builder.fuzzyRewrite;
-		this.fuzzyTranspositions = builder.fuzzyTranspositions;
-		this.lenient = builder.lenient;
-		this.maxDeterminizedStates = builder.maxDeterminizedStates;
-		this.minimumShouldMatch = builder.minimumShouldMatch;
-		this.phraseSlop = builder.phraseSlop;
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-		this.quoteAnalyzer = builder.quoteAnalyzer;
-		this.quoteFieldSuffix = builder.quoteFieldSuffix;
-		this.rewrite = builder.rewrite;
-		this.tieBreaker = builder.tieBreaker;
-		this.timeZone = builder.timeZone;
-		this.type = builder.type;
-
-	}
-
-	public static QueryStringQuery of(Function<Builder, ObjectBuilder<QueryStringQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.QueryString;
-	}
-
-	/**
-	 * API name: {@code allow_leading_wildcard}
-	 */
-	@Nullable
-	public final Boolean allowLeadingWildcard() {
-		return this.allowLeadingWildcard;
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * API name: {@code analyze_wildcard}
-	 */
-	@Nullable
-	public final Boolean analyzeWildcard() {
-		return this.analyzeWildcard;
-	}
-
-	/**
-	 * API name: {@code auto_generate_synonyms_phrase_query}
-	 */
-	@Nullable
-	public final Boolean autoGenerateSynonymsPhraseQuery() {
-		return this.autoGenerateSynonymsPhraseQuery;
-	}
-
-	/**
-	 * API name: {@code default_field}
-	 */
-	@Nullable
-	public final String defaultField() {
-		return this.defaultField;
-	}
-
-	/**
-	 * API name: {@code default_operator}
-	 */
-	@Nullable
-	public final Operator defaultOperator() {
-		return this.defaultOperator;
-	}
-
-	/**
-	 * API name: {@code enable_position_increments}
-	 */
-	@Nullable
-	public final Boolean enablePositionIncrements() {
-		return this.enablePositionIncrements;
-	}
-
-	/**
-	 * API name: {@code escape}
-	 */
-	@Nullable
-	public final Boolean escape() {
-		return this.escape;
-	}
-
-	/**
-	 * API name: {@code fields}
-	 */
-	public final List<String> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * API name: {@code fuzziness}
-	 */
-	@Nullable
-	public final String fuzziness() {
-		return this.fuzziness;
-	}
-
-	/**
-	 * API name: {@code fuzzy_max_expansions}
-	 */
-	@Nullable
-	public final Integer fuzzyMaxExpansions() {
-		return this.fuzzyMaxExpansions;
-	}
-
-	/**
-	 * API name: {@code fuzzy_prefix_length}
-	 */
-	@Nullable
-	public final Integer fuzzyPrefixLength() {
-		return this.fuzzyPrefixLength;
-	}
-
-	/**
-	 * API name: {@code fuzzy_rewrite}
-	 */
-	@Nullable
-	public final String fuzzyRewrite() {
-		return this.fuzzyRewrite;
-	}
-
-	/**
-	 * API name: {@code fuzzy_transpositions}
-	 */
-	@Nullable
-	public final Boolean fuzzyTranspositions() {
-		return this.fuzzyTranspositions;
-	}
-
-	/**
-	 * API name: {@code lenient}
-	 */
-	@Nullable
-	public final Boolean lenient() {
-		return this.lenient;
-	}
-
-	/**
-	 * API name: {@code max_determinized_states}
-	 */
-	@Nullable
-	public final Integer maxDeterminizedStates() {
-		return this.maxDeterminizedStates;
-	}
-
-	/**
-	 * API name: {@code minimum_should_match}
-	 */
-	@Nullable
-	public final String minimumShouldMatch() {
-		return this.minimumShouldMatch;
-	}
-
-	/**
-	 * API name: {@code phrase_slop}
-	 */
-	@Nullable
-	public final Double phraseSlop() {
-		return this.phraseSlop;
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final String query() {
-		return this.query;
-	}
-
-	/**
-	 * API name: {@code quote_analyzer}
-	 */
-	@Nullable
-	public final String quoteAnalyzer() {
-		return this.quoteAnalyzer;
-	}
-
-	/**
-	 * API name: {@code quote_field_suffix}
-	 */
-	@Nullable
-	public final String quoteFieldSuffix() {
-		return this.quoteFieldSuffix;
-	}
-
-	/**
-	 * API name: {@code rewrite}
-	 */
-	@Nullable
-	public final String rewrite() {
-		return this.rewrite;
-	}
-
-	/**
-	 * API name: {@code tie_breaker}
-	 */
-	@Nullable
-	public final Double tieBreaker() {
-		return this.tieBreaker;
-	}
-
-	/**
-	 * API name: {@code time_zone}
-	 */
-	@Nullable
-	public final String timeZone() {
-		return this.timeZone;
-	}
-
-	/**
-	 * API name: {@code type}
-	 */
-	@Nullable
-	public final TextQueryType type() {
-		return this.type;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.allowLeadingWildcard != null) {
-			generator.writeKey("allow_leading_wildcard");
-			generator.write(this.allowLeadingWildcard);
-
-		}
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			generator.write(this.analyzer);
-
-		}
-		if (this.analyzeWildcard != null) {
-			generator.writeKey("analyze_wildcard");
-			generator.write(this.analyzeWildcard);
-
-		}
-		if (this.autoGenerateSynonymsPhraseQuery != null) {
-			generator.writeKey("auto_generate_synonyms_phrase_query");
-			generator.write(this.autoGenerateSynonymsPhraseQuery);
-
-		}
-		if (this.defaultField != null) {
-			generator.writeKey("default_field");
-			generator.write(this.defaultField);
-
-		}
-		if (this.defaultOperator != null) {
-			generator.writeKey("default_operator");
-			this.defaultOperator.serialize(generator, mapper);
-		}
-		if (this.enablePositionIncrements != null) {
-			generator.writeKey("enable_position_increments");
-			generator.write(this.enablePositionIncrements);
-
-		}
-		if (this.escape != null) {
-			generator.writeKey("escape");
-			generator.write(this.escape);
-
-		}
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartArray();
-			for (String item0 : this.fields) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.fuzziness != null) {
-			generator.writeKey("fuzziness");
-			generator.write(this.fuzziness);
-
-		}
-		if (this.fuzzyMaxExpansions != null) {
-			generator.writeKey("fuzzy_max_expansions");
-			generator.write(this.fuzzyMaxExpansions);
-
-		}
-		if (this.fuzzyPrefixLength != null) {
-			generator.writeKey("fuzzy_prefix_length");
-			generator.write(this.fuzzyPrefixLength);
-
-		}
-		if (this.fuzzyRewrite != null) {
-			generator.writeKey("fuzzy_rewrite");
-			generator.write(this.fuzzyRewrite);
-
-		}
-		if (this.fuzzyTranspositions != null) {
-			generator.writeKey("fuzzy_transpositions");
-			generator.write(this.fuzzyTranspositions);
-
-		}
-		if (this.lenient != null) {
-			generator.writeKey("lenient");
-			generator.write(this.lenient);
-
-		}
-		if (this.maxDeterminizedStates != null) {
-			generator.writeKey("max_determinized_states");
-			generator.write(this.maxDeterminizedStates);
-
-		}
-		if (this.minimumShouldMatch != null) {
-			generator.writeKey("minimum_should_match");
-			generator.write(this.minimumShouldMatch);
-
-		}
-		if (this.phraseSlop != null) {
-			generator.writeKey("phrase_slop");
-			generator.write(this.phraseSlop);
-
-		}
-		generator.writeKey("query");
-		generator.write(this.query);
+    @Nullable
+    private final String fuzzyRewrite;
+
+    @Nullable
+    private final Boolean fuzzyTranspositions;
+
+    @Nullable
+    private final Boolean lenient;
+
+    @Nullable
+    private final Integer maxDeterminizedStates;
+
+    @Nullable
+    private final String minimumShouldMatch;
+
+    @Nullable
+    private final Double phraseSlop;
+
+    private final String query;
+
+    @Nullable
+    private final String quoteAnalyzer;
+
+    @Nullable
+    private final String quoteFieldSuffix;
+
+    @Nullable
+    private final String rewrite;
+
+    @Nullable
+    private final Double tieBreaker;
+
+    @Nullable
+    private final String timeZone;
+
+    @Nullable
+    private final TextQueryType type;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private QueryStringQuery(Builder builder) {
+        super(builder);
+
+        this.allowLeadingWildcard = builder.allowLeadingWildcard;
+        this.analyzer = builder.analyzer;
+        this.analyzeWildcard = builder.analyzeWildcard;
+        this.autoGenerateSynonymsPhraseQuery = builder.autoGenerateSynonymsPhraseQuery;
+        this.defaultField = builder.defaultField;
+        this.defaultOperator = builder.defaultOperator;
+        this.enablePositionIncrements = builder.enablePositionIncrements;
+        this.escape = builder.escape;
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.fuzziness = builder.fuzziness;
+        this.fuzzyMaxExpansions = builder.fuzzyMaxExpansions;
+        this.fuzzyPrefixLength = builder.fuzzyPrefixLength;
+        this.fuzzyRewrite = builder.fuzzyRewrite;
+        this.fuzzyTranspositions = builder.fuzzyTranspositions;
+        this.lenient = builder.lenient;
+        this.maxDeterminizedStates = builder.maxDeterminizedStates;
+        this.minimumShouldMatch = builder.minimumShouldMatch;
+        this.phraseSlop = builder.phraseSlop;
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+        this.quoteAnalyzer = builder.quoteAnalyzer;
+        this.quoteFieldSuffix = builder.quoteFieldSuffix;
+        this.rewrite = builder.rewrite;
+        this.tieBreaker = builder.tieBreaker;
+        this.timeZone = builder.timeZone;
+        this.type = builder.type;
+
+    }
+
+    public static QueryStringQuery of(Function<Builder, ObjectBuilder<QueryStringQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.QueryString;
+    }
+
+    /**
+     * API name: {@code allow_leading_wildcard}
+     */
+    @Nullable
+    public final Boolean allowLeadingWildcard() {
+        return this.allowLeadingWildcard;
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * API name: {@code analyze_wildcard}
+     */
+    @Nullable
+    public final Boolean analyzeWildcard() {
+        return this.analyzeWildcard;
+    }
+
+    /**
+     * API name: {@code auto_generate_synonyms_phrase_query}
+     */
+    @Nullable
+    public final Boolean autoGenerateSynonymsPhraseQuery() {
+        return this.autoGenerateSynonymsPhraseQuery;
+    }
+
+    /**
+     * API name: {@code default_field}
+     */
+    @Nullable
+    public final String defaultField() {
+        return this.defaultField;
+    }
+
+    /**
+     * API name: {@code default_operator}
+     */
+    @Nullable
+    public final Operator defaultOperator() {
+        return this.defaultOperator;
+    }
+
+    /**
+     * API name: {@code enable_position_increments}
+     */
+    @Nullable
+    public final Boolean enablePositionIncrements() {
+        return this.enablePositionIncrements;
+    }
+
+    /**
+     * API name: {@code escape}
+     */
+    @Nullable
+    public final Boolean escape() {
+        return this.escape;
+    }
+
+    /**
+     * API name: {@code fields}
+     */
+    public final List<String> fields() {
+        return this.fields;
+    }
+
+    /**
+     * API name: {@code fuzziness}
+     */
+    @Nullable
+    public final String fuzziness() {
+        return this.fuzziness;
+    }
+
+    /**
+     * API name: {@code fuzzy_max_expansions}
+     */
+    @Nullable
+    public final Integer fuzzyMaxExpansions() {
+        return this.fuzzyMaxExpansions;
+    }
+
+    /**
+     * API name: {@code fuzzy_prefix_length}
+     */
+    @Nullable
+    public final Integer fuzzyPrefixLength() {
+        return this.fuzzyPrefixLength;
+    }
+
+    /**
+     * API name: {@code fuzzy_rewrite}
+     */
+    @Nullable
+    public final String fuzzyRewrite() {
+        return this.fuzzyRewrite;
+    }
+
+    /**
+     * API name: {@code fuzzy_transpositions}
+     */
+    @Nullable
+    public final Boolean fuzzyTranspositions() {
+        return this.fuzzyTranspositions;
+    }
+
+    /**
+     * API name: {@code lenient}
+     */
+    @Nullable
+    public final Boolean lenient() {
+        return this.lenient;
+    }
+
+    /**
+     * API name: {@code max_determinized_states}
+     */
+    @Nullable
+    public final Integer maxDeterminizedStates() {
+        return this.maxDeterminizedStates;
+    }
+
+    /**
+     * API name: {@code minimum_should_match}
+     */
+    @Nullable
+    public final String minimumShouldMatch() {
+        return this.minimumShouldMatch;
+    }
+
+    /**
+     * API name: {@code phrase_slop}
+     */
+    @Nullable
+    public final Double phraseSlop() {
+        return this.phraseSlop;
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final String query() {
+        return this.query;
+    }
+
+    /**
+     * API name: {@code quote_analyzer}
+     */
+    @Nullable
+    public final String quoteAnalyzer() {
+        return this.quoteAnalyzer;
+    }
+
+    /**
+     * API name: {@code quote_field_suffix}
+     */
+    @Nullable
+    public final String quoteFieldSuffix() {
+        return this.quoteFieldSuffix;
+    }
+
+    /**
+     * API name: {@code rewrite}
+     */
+    @Nullable
+    public final String rewrite() {
+        return this.rewrite;
+    }
+
+    /**
+     * API name: {@code tie_breaker}
+     */
+    @Nullable
+    public final Double tieBreaker() {
+        return this.tieBreaker;
+    }
+
+    /**
+     * API name: {@code time_zone}
+     */
+    @Nullable
+    public final String timeZone() {
+        return this.timeZone;
+    }
+
+    /**
+     * API name: {@code type}
+     */
+    @Nullable
+    public final TextQueryType type() {
+        return this.type;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.allowLeadingWildcard != null) {
+            generator.writeKey("allow_leading_wildcard");
+            generator.write(this.allowLeadingWildcard);
+
+        }
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            generator.write(this.analyzer);
+
+        }
+        if (this.analyzeWildcard != null) {
+            generator.writeKey("analyze_wildcard");
+            generator.write(this.analyzeWildcard);
+
+        }
+        if (this.autoGenerateSynonymsPhraseQuery != null) {
+            generator.writeKey("auto_generate_synonyms_phrase_query");
+            generator.write(this.autoGenerateSynonymsPhraseQuery);
+
+        }
+        if (this.defaultField != null) {
+            generator.writeKey("default_field");
+            generator.write(this.defaultField);
+
+        }
+        if (this.defaultOperator != null) {
+            generator.writeKey("default_operator");
+            this.defaultOperator.serialize(generator, mapper);
+        }
+        if (this.enablePositionIncrements != null) {
+            generator.writeKey("enable_position_increments");
+            generator.write(this.enablePositionIncrements);
+
+        }
+        if (this.escape != null) {
+            generator.writeKey("escape");
+            generator.write(this.escape);
+
+        }
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartArray();
+            for (String item0 : this.fields) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.fuzziness != null) {
+            generator.writeKey("fuzziness");
+            generator.write(this.fuzziness);
+
+        }
+        if (this.fuzzyMaxExpansions != null) {
+            generator.writeKey("fuzzy_max_expansions");
+            generator.write(this.fuzzyMaxExpansions);
+
+        }
+        if (this.fuzzyPrefixLength != null) {
+            generator.writeKey("fuzzy_prefix_length");
+            generator.write(this.fuzzyPrefixLength);
+
+        }
+        if (this.fuzzyRewrite != null) {
+            generator.writeKey("fuzzy_rewrite");
+            generator.write(this.fuzzyRewrite);
+
+        }
+        if (this.fuzzyTranspositions != null) {
+            generator.writeKey("fuzzy_transpositions");
+            generator.write(this.fuzzyTranspositions);
+
+        }
+        if (this.lenient != null) {
+            generator.writeKey("lenient");
+            generator.write(this.lenient);
+
+        }
+        if (this.maxDeterminizedStates != null) {
+            generator.writeKey("max_determinized_states");
+            generator.write(this.maxDeterminizedStates);
+
+        }
+        if (this.minimumShouldMatch != null) {
+            generator.writeKey("minimum_should_match");
+            generator.write(this.minimumShouldMatch);
+
+        }
+        if (this.phraseSlop != null) {
+            generator.writeKey("phrase_slop");
+            generator.write(this.phraseSlop);
+
+        }
+        generator.writeKey("query");
+        generator.write(this.query);
 
-		if (this.quoteAnalyzer != null) {
-			generator.writeKey("quote_analyzer");
-			generator.write(this.quoteAnalyzer);
+        if (this.quoteAnalyzer != null) {
+            generator.writeKey("quote_analyzer");
+            generator.write(this.quoteAnalyzer);
 
-		}
-		if (this.quoteFieldSuffix != null) {
-			generator.writeKey("quote_field_suffix");
-			generator.write(this.quoteFieldSuffix);
+        }
+        if (this.quoteFieldSuffix != null) {
+            generator.writeKey("quote_field_suffix");
+            generator.write(this.quoteFieldSuffix);
 
-		}
-		if (this.rewrite != null) {
-			generator.writeKey("rewrite");
-			generator.write(this.rewrite);
+        }
+        if (this.rewrite != null) {
+            generator.writeKey("rewrite");
+            generator.write(this.rewrite);
 
-		}
-		if (this.tieBreaker != null) {
-			generator.writeKey("tie_breaker");
-			generator.write(this.tieBreaker);
+        }
+        if (this.tieBreaker != null) {
+            generator.writeKey("tie_breaker");
+            generator.write(this.tieBreaker);
 
-		}
-		if (this.timeZone != null) {
-			generator.writeKey("time_zone");
-			generator.write(this.timeZone);
+        }
+        if (this.timeZone != null) {
+            generator.writeKey("time_zone");
+            generator.write(this.timeZone);
 
-		}
-		if (this.type != null) {
-			generator.writeKey("type");
-			this.type.serialize(generator, mapper);
-		}
+        }
+        if (this.type != null) {
+            generator.writeKey("type");
+            this.type.serialize(generator, mapper);
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link QueryStringQuery}.
-	 */
+    /**
+     * Builder for {@link QueryStringQuery}.
+     */
 
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<QueryStringQuery> {
-		@Nullable
-		private Boolean allowLeadingWildcard;
-
-		@Nullable
-		private String analyzer;
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<QueryStringQuery> {
+        @Nullable
+        private Boolean allowLeadingWildcard;
+
+        @Nullable
+        private String analyzer;
 
-		@Nullable
-		private Boolean analyzeWildcard;
+        @Nullable
+        private Boolean analyzeWildcard;
 
-		@Nullable
-		private Boolean autoGenerateSynonymsPhraseQuery;
-
-		@Nullable
-		private String defaultField;
-
-		@Nullable
-		private Operator defaultOperator;
-
-		@Nullable
-		private Boolean enablePositionIncrements;
-
-		@Nullable
-		private Boolean escape;
-
-		@Nullable
-		private List<String> fields;
-
-		@Nullable
-		private String fuzziness;
-
-		@Nullable
-		private Integer fuzzyMaxExpansions;
-
-		@Nullable
-		private Integer fuzzyPrefixLength;
-
-		@Nullable
-		private String fuzzyRewrite;
-
-		@Nullable
-		private Boolean fuzzyTranspositions;
-
-		@Nullable
-		private Boolean lenient;
-
-		@Nullable
-		private Integer maxDeterminizedStates;
-
-		@Nullable
-		private String minimumShouldMatch;
-
-		@Nullable
-		private Double phraseSlop;
-
-		private String query;
-
-		@Nullable
-		private String quoteAnalyzer;
-
-		@Nullable
-		private String quoteFieldSuffix;
-
-		@Nullable
-		private String rewrite;
-
-		@Nullable
-		private Double tieBreaker;
-
-		@Nullable
-		private String timeZone;
-
-		@Nullable
-		private TextQueryType type;
-
-		/**
-		 * API name: {@code allow_leading_wildcard}
-		 */
-		public final Builder allowLeadingWildcard(@Nullable Boolean value) {
-			this.allowLeadingWildcard = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code analyze_wildcard}
-		 */
-		public final Builder analyzeWildcard(@Nullable Boolean value) {
-			this.analyzeWildcard = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code auto_generate_synonyms_phrase_query}
-		 */
-		public final Builder autoGenerateSynonymsPhraseQuery(@Nullable Boolean value) {
-			this.autoGenerateSynonymsPhraseQuery = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code default_field}
-		 */
-		public final Builder defaultField(@Nullable String value) {
-			this.defaultField = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code default_operator}
-		 */
-		public final Builder defaultOperator(@Nullable Operator value) {
-			this.defaultOperator = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code enable_position_increments}
-		 */
-		public final Builder enablePositionIncrements(@Nullable Boolean value) {
-			this.enablePositionIncrements = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code escape}
-		 */
-		public final Builder escape(@Nullable Boolean value) {
-			this.escape = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fields</code>.
-		 */
-		public final Builder fields(List<String> list) {
-			this.fields = _listAddAll(this.fields, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds one or more values to <code>fields</code>.
-		 */
-		public final Builder fields(String value, String... values) {
-			this.fields = _listAdd(this.fields, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzziness}
-		 */
-		public final Builder fuzziness(@Nullable String value) {
-			this.fuzziness = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzzy_max_expansions}
-		 */
-		public final Builder fuzzyMaxExpansions(@Nullable Integer value) {
-			this.fuzzyMaxExpansions = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzzy_prefix_length}
-		 */
-		public final Builder fuzzyPrefixLength(@Nullable Integer value) {
-			this.fuzzyPrefixLength = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzzy_rewrite}
-		 */
-		public final Builder fuzzyRewrite(@Nullable String value) {
-			this.fuzzyRewrite = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzzy_transpositions}
-		 */
-		public final Builder fuzzyTranspositions(@Nullable Boolean value) {
-			this.fuzzyTranspositions = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code lenient}
-		 */
-		public final Builder lenient(@Nullable Boolean value) {
-			this.lenient = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_determinized_states}
-		 */
-		public final Builder maxDeterminizedStates(@Nullable Integer value) {
-			this.maxDeterminizedStates = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code minimum_should_match}
-		 */
-		public final Builder minimumShouldMatch(@Nullable String value) {
-			this.minimumShouldMatch = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code phrase_slop}
-		 */
-		public final Builder phraseSlop(@Nullable Double value) {
-			this.phraseSlop = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(String value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code quote_analyzer}
-		 */
-		public final Builder quoteAnalyzer(@Nullable String value) {
-			this.quoteAnalyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code quote_field_suffix}
-		 */
-		public final Builder quoteFieldSuffix(@Nullable String value) {
-			this.quoteFieldSuffix = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code rewrite}
-		 */
-		public final Builder rewrite(@Nullable String value) {
-			this.rewrite = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code tie_breaker}
-		 */
-		public final Builder tieBreaker(@Nullable Double value) {
-			this.tieBreaker = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code time_zone}
-		 */
-		public final Builder timeZone(@Nullable String value) {
-			this.timeZone = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code type}
-		 */
-		public final Builder type(@Nullable TextQueryType value) {
-			this.type = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link QueryStringQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public QueryStringQuery build() {
-			_checkSingleUse();
-
-			return new QueryStringQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link QueryStringQuery}
-	 */
-	public static final JsonpDeserializer<QueryStringQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			QueryStringQuery::setupQueryStringQueryDeserializer);
-
-	protected static void setupQueryStringQueryDeserializer(ObjectDeserializer<QueryStringQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::allowLeadingWildcard, JsonpDeserializer.booleanDeserializer(), "allow_leading_wildcard");
-		op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(Builder::analyzeWildcard, JsonpDeserializer.booleanDeserializer(), "analyze_wildcard");
-		op.add(Builder::autoGenerateSynonymsPhraseQuery, JsonpDeserializer.booleanDeserializer(),
-				"auto_generate_synonyms_phrase_query");
-		op.add(Builder::defaultField, JsonpDeserializer.stringDeserializer(), "default_field");
-		op.add(Builder::defaultOperator, Operator._DESERIALIZER, "default_operator");
-		op.add(Builder::enablePositionIncrements, JsonpDeserializer.booleanDeserializer(),
-				"enable_position_increments");
-		op.add(Builder::escape, JsonpDeserializer.booleanDeserializer(), "escape");
-		op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "fields");
-		op.add(Builder::fuzziness, JsonpDeserializer.stringDeserializer(), "fuzziness");
-		op.add(Builder::fuzzyMaxExpansions, JsonpDeserializer.integerDeserializer(), "fuzzy_max_expansions");
-		op.add(Builder::fuzzyPrefixLength, JsonpDeserializer.integerDeserializer(), "fuzzy_prefix_length");
-		op.add(Builder::fuzzyRewrite, JsonpDeserializer.stringDeserializer(), "fuzzy_rewrite");
-		op.add(Builder::fuzzyTranspositions, JsonpDeserializer.booleanDeserializer(), "fuzzy_transpositions");
-		op.add(Builder::lenient, JsonpDeserializer.booleanDeserializer(), "lenient");
-		op.add(Builder::maxDeterminizedStates, JsonpDeserializer.integerDeserializer(), "max_determinized_states");
-		op.add(Builder::minimumShouldMatch, JsonpDeserializer.stringDeserializer(), "minimum_should_match");
-		op.add(Builder::phraseSlop, JsonpDeserializer.doubleDeserializer(), "phrase_slop");
-		op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
-		op.add(Builder::quoteAnalyzer, JsonpDeserializer.stringDeserializer(), "quote_analyzer");
-		op.add(Builder::quoteFieldSuffix, JsonpDeserializer.stringDeserializer(), "quote_field_suffix");
-		op.add(Builder::rewrite, JsonpDeserializer.stringDeserializer(), "rewrite");
-		op.add(Builder::tieBreaker, JsonpDeserializer.doubleDeserializer(), "tie_breaker");
-		op.add(Builder::timeZone, JsonpDeserializer.stringDeserializer(), "time_zone");
-		op.add(Builder::type, TextQueryType._DESERIALIZER, "type");
-
-	}
+        @Nullable
+        private Boolean autoGenerateSynonymsPhraseQuery;
+
+        @Nullable
+        private String defaultField;
+
+        @Nullable
+        private Operator defaultOperator;
+
+        @Nullable
+        private Boolean enablePositionIncrements;
+
+        @Nullable
+        private Boolean escape;
+
+        @Nullable
+        private List<String> fields;
+
+        @Nullable
+        private String fuzziness;
+
+        @Nullable
+        private Integer fuzzyMaxExpansions;
+
+        @Nullable
+        private Integer fuzzyPrefixLength;
+
+        @Nullable
+        private String fuzzyRewrite;
+
+        @Nullable
+        private Boolean fuzzyTranspositions;
+
+        @Nullable
+        private Boolean lenient;
+
+        @Nullable
+        private Integer maxDeterminizedStates;
+
+        @Nullable
+        private String minimumShouldMatch;
+
+        @Nullable
+        private Double phraseSlop;
+
+        private String query;
+
+        @Nullable
+        private String quoteAnalyzer;
+
+        @Nullable
+        private String quoteFieldSuffix;
+
+        @Nullable
+        private String rewrite;
+
+        @Nullable
+        private Double tieBreaker;
+
+        @Nullable
+        private String timeZone;
+
+        @Nullable
+        private TextQueryType type;
+
+        /**
+         * API name: {@code allow_leading_wildcard}
+         */
+        public final Builder allowLeadingWildcard(@Nullable Boolean value) {
+            this.allowLeadingWildcard = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code analyze_wildcard}
+         */
+        public final Builder analyzeWildcard(@Nullable Boolean value) {
+            this.analyzeWildcard = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code auto_generate_synonyms_phrase_query}
+         */
+        public final Builder autoGenerateSynonymsPhraseQuery(@Nullable Boolean value) {
+            this.autoGenerateSynonymsPhraseQuery = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code default_field}
+         */
+        public final Builder defaultField(@Nullable String value) {
+            this.defaultField = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code default_operator}
+         */
+        public final Builder defaultOperator(@Nullable Operator value) {
+            this.defaultOperator = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code enable_position_increments}
+         */
+        public final Builder enablePositionIncrements(@Nullable Boolean value) {
+            this.enablePositionIncrements = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code escape}
+         */
+        public final Builder escape(@Nullable Boolean value) {
+            this.escape = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fields</code>.
+         */
+        public final Builder fields(List<String> list) {
+            this.fields = _listAddAll(this.fields, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds one or more values to <code>fields</code>.
+         */
+        public final Builder fields(String value, String... values) {
+            this.fields = _listAdd(this.fields, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzziness}
+         */
+        public final Builder fuzziness(@Nullable String value) {
+            this.fuzziness = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzzy_max_expansions}
+         */
+        public final Builder fuzzyMaxExpansions(@Nullable Integer value) {
+            this.fuzzyMaxExpansions = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzzy_prefix_length}
+         */
+        public final Builder fuzzyPrefixLength(@Nullable Integer value) {
+            this.fuzzyPrefixLength = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzzy_rewrite}
+         */
+        public final Builder fuzzyRewrite(@Nullable String value) {
+            this.fuzzyRewrite = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzzy_transpositions}
+         */
+        public final Builder fuzzyTranspositions(@Nullable Boolean value) {
+            this.fuzzyTranspositions = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code lenient}
+         */
+        public final Builder lenient(@Nullable Boolean value) {
+            this.lenient = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_determinized_states}
+         */
+        public final Builder maxDeterminizedStates(@Nullable Integer value) {
+            this.maxDeterminizedStates = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code minimum_should_match}
+         */
+        public final Builder minimumShouldMatch(@Nullable String value) {
+            this.minimumShouldMatch = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code phrase_slop}
+         */
+        public final Builder phraseSlop(@Nullable Double value) {
+            this.phraseSlop = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(String value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code quote_analyzer}
+         */
+        public final Builder quoteAnalyzer(@Nullable String value) {
+            this.quoteAnalyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code quote_field_suffix}
+         */
+        public final Builder quoteFieldSuffix(@Nullable String value) {
+            this.quoteFieldSuffix = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code rewrite}
+         */
+        public final Builder rewrite(@Nullable String value) {
+            this.rewrite = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code tie_breaker}
+         */
+        public final Builder tieBreaker(@Nullable Double value) {
+            this.tieBreaker = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code time_zone}
+         */
+        public final Builder timeZone(@Nullable String value) {
+            this.timeZone = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code type}
+         */
+        public final Builder type(@Nullable TextQueryType value) {
+            this.type = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link QueryStringQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public QueryStringQuery build() {
+            _checkSingleUse();
+
+            return new QueryStringQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link QueryStringQuery}
+     */
+    public static final JsonpDeserializer<QueryStringQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        QueryStringQuery::setupQueryStringQueryDeserializer
+    );
+
+    protected static void setupQueryStringQueryDeserializer(ObjectDeserializer<QueryStringQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::allowLeadingWildcard, JsonpDeserializer.booleanDeserializer(), "allow_leading_wildcard");
+        op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(Builder::analyzeWildcard, JsonpDeserializer.booleanDeserializer(), "analyze_wildcard");
+        op.add(Builder::autoGenerateSynonymsPhraseQuery, JsonpDeserializer.booleanDeserializer(), "auto_generate_synonyms_phrase_query");
+        op.add(Builder::defaultField, JsonpDeserializer.stringDeserializer(), "default_field");
+        op.add(Builder::defaultOperator, Operator._DESERIALIZER, "default_operator");
+        op.add(Builder::enablePositionIncrements, JsonpDeserializer.booleanDeserializer(), "enable_position_increments");
+        op.add(Builder::escape, JsonpDeserializer.booleanDeserializer(), "escape");
+        op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "fields");
+        op.add(Builder::fuzziness, JsonpDeserializer.stringDeserializer(), "fuzziness");
+        op.add(Builder::fuzzyMaxExpansions, JsonpDeserializer.integerDeserializer(), "fuzzy_max_expansions");
+        op.add(Builder::fuzzyPrefixLength, JsonpDeserializer.integerDeserializer(), "fuzzy_prefix_length");
+        op.add(Builder::fuzzyRewrite, JsonpDeserializer.stringDeserializer(), "fuzzy_rewrite");
+        op.add(Builder::fuzzyTranspositions, JsonpDeserializer.booleanDeserializer(), "fuzzy_transpositions");
+        op.add(Builder::lenient, JsonpDeserializer.booleanDeserializer(), "lenient");
+        op.add(Builder::maxDeterminizedStates, JsonpDeserializer.integerDeserializer(), "max_determinized_states");
+        op.add(Builder::minimumShouldMatch, JsonpDeserializer.stringDeserializer(), "minimum_should_match");
+        op.add(Builder::phraseSlop, JsonpDeserializer.doubleDeserializer(), "phrase_slop");
+        op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
+        op.add(Builder::quoteAnalyzer, JsonpDeserializer.stringDeserializer(), "quote_analyzer");
+        op.add(Builder::quoteFieldSuffix, JsonpDeserializer.stringDeserializer(), "quote_field_suffix");
+        op.add(Builder::rewrite, JsonpDeserializer.stringDeserializer(), "rewrite");
+        op.add(Builder::tieBreaker, JsonpDeserializer.doubleDeserializer(), "tie_breaker");
+        op.add(Builder::timeZone, JsonpDeserializer.stringDeserializer(), "time_zone");
+        op.add(Builder::type, TextQueryType._DESERIALIZER, "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryVariant.java
index 771fbc86af..16db07a1ab 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryVariant.java
@@ -37,10 +37,10 @@
  */
 public interface QueryVariant {
 
-	Query.Kind _queryKind();
+    Query.Kind _queryKind();
 
-	default Query _toQuery() {
-		return new Query(this);
-	}
+    default Query _toQuery() {
+        return new Query(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RandomScoreFunction.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RandomScoreFunction.java
index 7c2d6efdad..b61a9d6d5d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RandomScoreFunction.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RandomScoreFunction.java
@@ -32,143 +32,142 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.RandomScoreFunction
 
-
 @JsonpDeserializable
 public class RandomScoreFunction extends ScoreFunctionBase implements FunctionScoreVariant {
-	@Nullable
-	private final String field;
-
-	@Nullable
-	private final String seed;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RandomScoreFunction(Builder builder) {
-		super(builder);
-
-		this.field = builder.field;
-		this.seed = builder.seed;
-
-	}
-
-	public static RandomScoreFunction of(Function<Builder, ObjectBuilder<RandomScoreFunction>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * FunctionScore variant kind.
-	 */
-	@Override
-	public FunctionScore.Kind _functionScoreKind() {
-		return FunctionScore.Kind.RandomScore;
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code seed}
-	 */
-	@Nullable
-	public final String seed() {
-		return this.seed;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (this.seed != null) {
-			generator.writeKey("seed");
-			generator.write(this.seed);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RandomScoreFunction}.
-	 */
-
-	public static class Builder extends ScoreFunctionBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<RandomScoreFunction> {
-		@Nullable
-		private String field;
-
-		@Nullable
-		private String seed;
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code seed}
-		 */
-		public final Builder seed(@Nullable String value) {
-			this.seed = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RandomScoreFunction}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RandomScoreFunction build() {
-			_checkSingleUse();
-
-			return new RandomScoreFunction(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RandomScoreFunction}
-	 */
-	public static final JsonpDeserializer<RandomScoreFunction> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RandomScoreFunction::setupRandomScoreFunctionDeserializer);
-
-	protected static void setupRandomScoreFunctionDeserializer(ObjectDeserializer<RandomScoreFunction.Builder> op) {
-		setupScoreFunctionBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::seed, JsonpDeserializer.stringDeserializer(), "seed");
-
-	}
+    @Nullable
+    private final String field;
+
+    @Nullable
+    private final String seed;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RandomScoreFunction(Builder builder) {
+        super(builder);
+
+        this.field = builder.field;
+        this.seed = builder.seed;
+
+    }
+
+    public static RandomScoreFunction of(Function<Builder, ObjectBuilder<RandomScoreFunction>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * FunctionScore variant kind.
+     */
+    @Override
+    public FunctionScore.Kind _functionScoreKind() {
+        return FunctionScore.Kind.RandomScore;
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code seed}
+     */
+    @Nullable
+    public final String seed() {
+        return this.seed;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (this.seed != null) {
+            generator.writeKey("seed");
+            generator.write(this.seed);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RandomScoreFunction}.
+     */
+
+    public static class Builder extends ScoreFunctionBase.AbstractBuilder<Builder> implements ObjectBuilder<RandomScoreFunction> {
+        @Nullable
+        private String field;
+
+        @Nullable
+        private String seed;
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code seed}
+         */
+        public final Builder seed(@Nullable String value) {
+            this.seed = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RandomScoreFunction}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RandomScoreFunction build() {
+            _checkSingleUse();
+
+            return new RandomScoreFunction(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RandomScoreFunction}
+     */
+    public static final JsonpDeserializer<RandomScoreFunction> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RandomScoreFunction::setupRandomScoreFunctionDeserializer
+    );
+
+    protected static void setupRandomScoreFunctionDeserializer(ObjectDeserializer<RandomScoreFunction.Builder> op) {
+        setupScoreFunctionBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::seed, JsonpDeserializer.stringDeserializer(), "seed");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RangeQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RangeQuery.java
index 3bd0a81ca6..7116f6e480 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RangeQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RangeQuery.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,335 +43,333 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.RangeQuery
 
-
 @JsonpDeserializable
 public class RangeQuery extends RangeQueryBase implements QueryVariant {
-	// Single key dictionary
-	private final String field;
-
-	@Nullable
-	private final JsonData gt;
-
-	@Nullable
-	private final JsonData gte;
-
-	@Nullable
-	private final JsonData lt;
-
-	@Nullable
-	private final JsonData lte;
-
-	@Nullable
-	private final JsonData from;
-
-	@Nullable
-	private final JsonData to;
-
-	@Nullable
-	private final String format;
-
-	@Nullable
-	private final String timeZone;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RangeQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-
-		this.gt = builder.gt;
-		this.gte = builder.gte;
-		this.lt = builder.lt;
-		this.lte = builder.lte;
-		this.from = builder.from;
-		this.to = builder.to;
-		this.format = builder.format;
-		this.timeZone = builder.timeZone;
-
-	}
-
-	public static RangeQuery of(Function<Builder, ObjectBuilder<RangeQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Range;
-	}
-
-	/**
-	 * Required - The target field
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code gt}
-	 */
-	@Nullable
-	public final JsonData gt() {
-		return this.gt;
-	}
-
-	/**
-	 * API name: {@code gte}
-	 */
-	@Nullable
-	public final JsonData gte() {
-		return this.gte;
-	}
-
-	/**
-	 * API name: {@code lt}
-	 */
-	@Nullable
-	public final JsonData lt() {
-		return this.lt;
-	}
-
-	/**
-	 * API name: {@code lte}
-	 */
-	@Nullable
-	public final JsonData lte() {
-		return this.lte;
-	}
-
-	/**
-	 * API name: {@code from}
-	 */
-	@Nullable
-	public final JsonData from() {
-		return this.from;
-	}
-
-	/**
-	 * API name: {@code to}
-	 */
-	@Nullable
-	public final JsonData to() {
-		return this.to;
-	}
-
-	/**
-	 * API name: {@code format}
-	 */
-	@Nullable
-	public final String format() {
-		return this.format;
-	}
-
-	/**
-	 * API name: {@code time_zone}
-	 */
-	@Nullable
-	public final String timeZone() {
-		return this.timeZone;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject(this.field);
-
-		super.serializeInternal(generator, mapper);
-		if (this.gt != null) {
-			generator.writeKey("gt");
-			this.gt.serialize(generator, mapper);
-
-		}
-		if (this.gte != null) {
-			generator.writeKey("gte");
-			this.gte.serialize(generator, mapper);
-
-		}
-		if (this.lt != null) {
-			generator.writeKey("lt");
-			this.lt.serialize(generator, mapper);
-
-		}
-		if (this.lte != null) {
-			generator.writeKey("lte");
-			this.lte.serialize(generator, mapper);
-
-		}
-		if (this.from != null) {
-			generator.writeKey("from");
-			this.from.serialize(generator, mapper);
-
-		}
-		if (this.to != null) {
-			generator.writeKey("to");
-			this.to.serialize(generator, mapper);
-
-		}
-		if (this.format != null) {
-			generator.writeKey("format");
-			generator.write(this.format);
-
-		}
-		if (this.timeZone != null) {
-			generator.writeKey("time_zone");
-			generator.write(this.timeZone);
-
-		}
-
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RangeQuery}.
-	 */
-
-	public static class Builder extends RangeQueryBase.AbstractBuilder<Builder> implements ObjectBuilder<RangeQuery> {
-		private String field;
-
-		/**
-		 * Required - The target field
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		@Nullable
-		private JsonData gt;
-
-		@Nullable
-		private JsonData gte;
-
-		@Nullable
-		private JsonData lt;
-
-		@Nullable
-		private JsonData lte;
-
-		@Nullable
-		private JsonData from;
-
-		@Nullable
-		private JsonData to;
-
-		@Nullable
-		private String format;
-
-		@Nullable
-		private String timeZone;
-
-		/**
-		 * API name: {@code gt}
-		 */
-		public final Builder gt(@Nullable JsonData value) {
-			this.gt = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code gte}
-		 */
-		public final Builder gte(@Nullable JsonData value) {
-			this.gte = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code lt}
-		 */
-		public final Builder lt(@Nullable JsonData value) {
-			this.lt = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code lte}
-		 */
-		public final Builder lte(@Nullable JsonData value) {
-			this.lte = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code from}
-		 */
-		public final Builder from(@Nullable JsonData value) {
-			this.from = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code to}
-		 */
-		public final Builder to(@Nullable JsonData value) {
-			this.to = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code format}
-		 */
-		public final Builder format(@Nullable String value) {
-			this.format = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code time_zone}
-		 */
-		public final Builder timeZone(@Nullable String value) {
-			this.timeZone = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RangeQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RangeQuery build() {
-			_checkSingleUse();
-
-			return new RangeQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RangeQuery}
-	 */
-	public static final JsonpDeserializer<RangeQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RangeQuery::setupRangeQueryDeserializer);
-
-	protected static void setupRangeQueryDeserializer(ObjectDeserializer<RangeQuery.Builder> op) {
-		RangeQueryBase.setupRangeQueryBaseDeserializer(op);
-		op.add(Builder::gt, JsonData._DESERIALIZER, "gt");
-		op.add(Builder::gte, JsonData._DESERIALIZER, "gte");
-		op.add(Builder::lt, JsonData._DESERIALIZER, "lt");
-		op.add(Builder::lte, JsonData._DESERIALIZER, "lte");
-		op.add(Builder::from, JsonData._DESERIALIZER, "from");
-		op.add(Builder::to, JsonData._DESERIALIZER, "to");
-		op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
-		op.add(Builder::timeZone, JsonpDeserializer.stringDeserializer(), "time_zone");
-
-		op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
-
-	}
+    // Single key dictionary
+    private final String field;
+
+    @Nullable
+    private final JsonData gt;
+
+    @Nullable
+    private final JsonData gte;
+
+    @Nullable
+    private final JsonData lt;
+
+    @Nullable
+    private final JsonData lte;
+
+    @Nullable
+    private final JsonData from;
+
+    @Nullable
+    private final JsonData to;
+
+    @Nullable
+    private final String format;
+
+    @Nullable
+    private final String timeZone;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RangeQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+
+        this.gt = builder.gt;
+        this.gte = builder.gte;
+        this.lt = builder.lt;
+        this.lte = builder.lte;
+        this.from = builder.from;
+        this.to = builder.to;
+        this.format = builder.format;
+        this.timeZone = builder.timeZone;
+
+    }
+
+    public static RangeQuery of(Function<Builder, ObjectBuilder<RangeQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Range;
+    }
+
+    /**
+     * Required - The target field
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code gt}
+     */
+    @Nullable
+    public final JsonData gt() {
+        return this.gt;
+    }
+
+    /**
+     * API name: {@code gte}
+     */
+    @Nullable
+    public final JsonData gte() {
+        return this.gte;
+    }
+
+    /**
+     * API name: {@code lt}
+     */
+    @Nullable
+    public final JsonData lt() {
+        return this.lt;
+    }
+
+    /**
+     * API name: {@code lte}
+     */
+    @Nullable
+    public final JsonData lte() {
+        return this.lte;
+    }
+
+    /**
+     * API name: {@code from}
+     */
+    @Nullable
+    public final JsonData from() {
+        return this.from;
+    }
+
+    /**
+     * API name: {@code to}
+     */
+    @Nullable
+    public final JsonData to() {
+        return this.to;
+    }
+
+    /**
+     * API name: {@code format}
+     */
+    @Nullable
+    public final String format() {
+        return this.format;
+    }
+
+    /**
+     * API name: {@code time_zone}
+     */
+    @Nullable
+    public final String timeZone() {
+        return this.timeZone;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject(this.field);
+
+        super.serializeInternal(generator, mapper);
+        if (this.gt != null) {
+            generator.writeKey("gt");
+            this.gt.serialize(generator, mapper);
+
+        }
+        if (this.gte != null) {
+            generator.writeKey("gte");
+            this.gte.serialize(generator, mapper);
+
+        }
+        if (this.lt != null) {
+            generator.writeKey("lt");
+            this.lt.serialize(generator, mapper);
+
+        }
+        if (this.lte != null) {
+            generator.writeKey("lte");
+            this.lte.serialize(generator, mapper);
+
+        }
+        if (this.from != null) {
+            generator.writeKey("from");
+            this.from.serialize(generator, mapper);
+
+        }
+        if (this.to != null) {
+            generator.writeKey("to");
+            this.to.serialize(generator, mapper);
+
+        }
+        if (this.format != null) {
+            generator.writeKey("format");
+            generator.write(this.format);
+
+        }
+        if (this.timeZone != null) {
+            generator.writeKey("time_zone");
+            generator.write(this.timeZone);
+
+        }
+
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RangeQuery}.
+     */
+
+    public static class Builder extends RangeQueryBase.AbstractBuilder<Builder> implements ObjectBuilder<RangeQuery> {
+        private String field;
+
+        /**
+         * Required - The target field
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        @Nullable
+        private JsonData gt;
+
+        @Nullable
+        private JsonData gte;
+
+        @Nullable
+        private JsonData lt;
+
+        @Nullable
+        private JsonData lte;
+
+        @Nullable
+        private JsonData from;
+
+        @Nullable
+        private JsonData to;
+
+        @Nullable
+        private String format;
+
+        @Nullable
+        private String timeZone;
+
+        /**
+         * API name: {@code gt}
+         */
+        public final Builder gt(@Nullable JsonData value) {
+            this.gt = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code gte}
+         */
+        public final Builder gte(@Nullable JsonData value) {
+            this.gte = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code lt}
+         */
+        public final Builder lt(@Nullable JsonData value) {
+            this.lt = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code lte}
+         */
+        public final Builder lte(@Nullable JsonData value) {
+            this.lte = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code from}
+         */
+        public final Builder from(@Nullable JsonData value) {
+            this.from = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code to}
+         */
+        public final Builder to(@Nullable JsonData value) {
+            this.to = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code format}
+         */
+        public final Builder format(@Nullable String value) {
+            this.format = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code time_zone}
+         */
+        public final Builder timeZone(@Nullable String value) {
+            this.timeZone = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RangeQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RangeQuery build() {
+            _checkSingleUse();
+
+            return new RangeQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RangeQuery}
+     */
+    public static final JsonpDeserializer<RangeQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RangeQuery::setupRangeQueryDeserializer
+    );
+
+    protected static void setupRangeQueryDeserializer(ObjectDeserializer<RangeQuery.Builder> op) {
+        RangeQueryBase.setupRangeQueryBaseDeserializer(op);
+        op.add(Builder::gt, JsonData._DESERIALIZER, "gt");
+        op.add(Builder::gte, JsonData._DESERIALIZER, "gte");
+        op.add(Builder::lt, JsonData._DESERIALIZER, "lt");
+        op.add(Builder::lte, JsonData._DESERIALIZER, "lte");
+        op.add(Builder::from, JsonData._DESERIALIZER, "from");
+        op.add(Builder::to, JsonData._DESERIALIZER, "to");
+        op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format");
+        op.add(Builder::timeZone, JsonpDeserializer.stringDeserializer(), "time_zone");
+
+        op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RangeQueryBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RangeQueryBase.java
index ee8dcdb30f..1280ea75fb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RangeQueryBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RangeQueryBase.java
@@ -32,69 +32,64 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.ObjectDeserializer;
 import jakarta.json.stream.JsonGenerator;
-
 import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.ObjectDeserializer;
 
 // typedef: _types.query_dsl.RangeQueryBase
 
-
-
 public abstract class RangeQueryBase extends QueryBase {
-	@Nullable
-	private final RangeRelation relation;
+    @Nullable
+    private final RangeRelation relation;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected RangeQueryBase(AbstractBuilder<?> builder) {
-		super(builder);
+    protected RangeQueryBase(AbstractBuilder<?> builder) {
+        super(builder);
 
-		this.relation = builder.relation;
+        this.relation = builder.relation;
 
-	}
+    }
 
-	/**
-	 * API name: {@code relation}
-	 */
-	@Nullable
-	public final RangeRelation relation() {
-		return this.relation;
-	}
+    /**
+     * API name: {@code relation}
+     */
+    @Nullable
+    public final RangeRelation relation() {
+        return this.relation;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		super.serializeInternal(generator, mapper);
-		if (this.relation != null) {
-			generator.writeKey("relation");
-			this.relation.serialize(generator, mapper);
-		}
+        super.serializeInternal(generator, mapper);
+        if (this.relation != null) {
+            generator.writeKey("relation");
+            this.relation.serialize(generator, mapper);
+        }
 
-	}
+    }
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				QueryBase.AbstractBuilder<BuilderT> {
-		@Nullable
-		private RangeRelation relation;
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends QueryBase.AbstractBuilder<
+        BuilderT> {
+        @Nullable
+        private RangeRelation relation;
 
-		/**
-		 * API name: {@code relation}
-		 */
-		public final BuilderT relation(@Nullable RangeRelation value) {
-			this.relation = value;
-			return self();
-		}
+        /**
+         * API name: {@code relation}
+         */
+        public final BuilderT relation(@Nullable RangeRelation value) {
+            this.relation = value;
+            return self();
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupRangeQueryBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		setupQueryBaseDeserializer(op);
-		op.add(AbstractBuilder::relation, RangeRelation._DESERIALIZER, "relation");
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupRangeQueryBaseDeserializer(ObjectDeserializer<BuilderT> op) {
+        setupQueryBaseDeserializer(op);
+        op.add(AbstractBuilder::relation, RangeRelation._DESERIALIZER, "relation");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RangeRelation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RangeRelation.java
index 9b3de19330..bd8a2f1bc6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RangeRelation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RangeRelation.java
@@ -35,27 +35,25 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum RangeRelation implements JsonEnum {
-	Within("within"),
+    Within("within"),
 
-	Contains("contains"),
+    Contains("contains"),
 
-	Intersects("intersects"),
+    Intersects("intersects"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	RangeRelation(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    RangeRelation(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<RangeRelation> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			RangeRelation.values());
+    public static final JsonEnum.Deserializer<RangeRelation> _DESERIALIZER = new JsonEnum.Deserializer<>(RangeRelation.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunction.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunction.java
index 33ddf26495..3440cf12bf 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunction.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunction.java
@@ -36,17 +36,12 @@
 
 // typedef: _types.query_dsl.RankFeatureFunction
 
-
-
 public abstract class RankFeatureFunction {
-	public RankFeatureFunction() {
-	}
+    public RankFeatureFunction() {}
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		protected abstract BuilderT self();
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        protected abstract BuilderT self();
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunctionLinear.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunctionLinear.java
index 7e44fcf5a9..c3ac825a98 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunctionLinear.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunctionLinear.java
@@ -32,38 +32,38 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
 
 @JsonpDeserializable
 public class RankFeatureFunctionLinear extends RankFeatureFunction implements JsonpSerializable {
 
-	public static final class Builder implements ObjectBuilder<RankFeatureFunctionLinear> {
-		@Override
-		public RankFeatureFunctionLinear build() {
-			return RankFeatureFunctionLinear._INSTANCE;
-		}
-	}
+    public static final class Builder implements ObjectBuilder<RankFeatureFunctionLinear> {
+        @Override
+        public RankFeatureFunctionLinear build() {
+            return RankFeatureFunctionLinear._INSTANCE;
+        }
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        generator.writeEnd();
+    }
 
-	/**
-	 * Singleton instance for empty class {@link RankFeatureFunctionLinear}.
-	 */
-	public static final RankFeatureFunctionLinear _INSTANCE = new RankFeatureFunctionLinear();
+    /**
+     * Singleton instance for empty class {@link RankFeatureFunctionLinear}.
+     */
+    public static final RankFeatureFunctionLinear _INSTANCE = new RankFeatureFunctionLinear();
 
-	public static final JsonpDeserializer<RankFeatureFunctionLinear> _DESERIALIZER = JsonpDeserializer
-			.emptyObject(RankFeatureFunctionLinear._INSTANCE);
+    public static final JsonpDeserializer<RankFeatureFunctionLinear> _DESERIALIZER = JsonpDeserializer.emptyObject(
+        RankFeatureFunctionLinear._INSTANCE
+    );
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunctionLogarithm.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunctionLogarithm.java
index fce4e44d19..d53591f854 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunctionLogarithm.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunctionLogarithm.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,94 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.RankFeatureFunctionLogarithm
 
-
 @JsonpDeserializable
 public class RankFeatureFunctionLogarithm extends RankFeatureFunction implements JsonpSerializable {
-	private final float scalingFactor;
+    private final float scalingFactor;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private RankFeatureFunctionLogarithm(Builder builder) {
+    private RankFeatureFunctionLogarithm(Builder builder) {
 
-		this.scalingFactor = ApiTypeHelper.requireNonNull(builder.scalingFactor, this, "scalingFactor");
+        this.scalingFactor = ApiTypeHelper.requireNonNull(builder.scalingFactor, this, "scalingFactor");
 
-	}
+    }
 
-	public static RankFeatureFunctionLogarithm of(Function<Builder, ObjectBuilder<RankFeatureFunctionLogarithm>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static RankFeatureFunctionLogarithm of(Function<Builder, ObjectBuilder<RankFeatureFunctionLogarithm>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code scaling_factor}
-	 */
-	public final float scalingFactor() {
-		return this.scalingFactor;
-	}
+    /**
+     * Required - API name: {@code scaling_factor}
+     */
+    public final float scalingFactor() {
+        return this.scalingFactor;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("scaling_factor");
-		generator.write(this.scalingFactor);
+        generator.writeKey("scaling_factor");
+        generator.write(this.scalingFactor);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link RankFeatureFunctionLogarithm}.
-	 */
+    /**
+     * Builder for {@link RankFeatureFunctionLogarithm}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankFeatureFunctionLogarithm> {
-		private Float scalingFactor;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankFeatureFunctionLogarithm> {
+        private Float scalingFactor;
 
-		/**
-		 * Required - API name: {@code scaling_factor}
-		 */
-		public final Builder scalingFactor(float value) {
-			this.scalingFactor = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code scaling_factor}
+         */
+        public final Builder scalingFactor(float value) {
+            this.scalingFactor = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link RankFeatureFunctionLogarithm}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RankFeatureFunctionLogarithm build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link RankFeatureFunctionLogarithm}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RankFeatureFunctionLogarithm build() {
+            _checkSingleUse();
 
-			return new RankFeatureFunctionLogarithm(this);
-		}
-	}
+            return new RankFeatureFunctionLogarithm(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link RankFeatureFunctionLogarithm}
-	 */
-	public static final JsonpDeserializer<RankFeatureFunctionLogarithm> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RankFeatureFunctionLogarithm::setupRankFeatureFunctionLogarithmDeserializer);
+    /**
+     * Json deserializer for {@link RankFeatureFunctionLogarithm}
+     */
+    public static final JsonpDeserializer<RankFeatureFunctionLogarithm> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RankFeatureFunctionLogarithm::setupRankFeatureFunctionLogarithmDeserializer
+    );
 
-	protected static void setupRankFeatureFunctionLogarithmDeserializer(
-			ObjectDeserializer<RankFeatureFunctionLogarithm.Builder> op) {
+    protected static void setupRankFeatureFunctionLogarithmDeserializer(ObjectDeserializer<RankFeatureFunctionLogarithm.Builder> op) {
 
-		op.add(Builder::scalingFactor, JsonpDeserializer.floatDeserializer(), "scaling_factor");
+        op.add(Builder::scalingFactor, JsonpDeserializer.floatDeserializer(), "scaling_factor");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunctionSaturation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunctionSaturation.java
index 7b32e7474b..6fb48c86cf 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunctionSaturation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunctionSaturation.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,101 +43,98 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.RankFeatureFunctionSaturation
 
-
 @JsonpDeserializable
 public class RankFeatureFunctionSaturation extends RankFeatureFunction implements JsonpSerializable {
-	@Nullable
-	private final Float pivot;
+    @Nullable
+    private final Float pivot;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private RankFeatureFunctionSaturation(Builder builder) {
+    private RankFeatureFunctionSaturation(Builder builder) {
 
-		this.pivot = builder.pivot;
+        this.pivot = builder.pivot;
 
-	}
+    }
 
-	public static RankFeatureFunctionSaturation of(Function<Builder, ObjectBuilder<RankFeatureFunctionSaturation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static RankFeatureFunctionSaturation of(Function<Builder, ObjectBuilder<RankFeatureFunctionSaturation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * API name: {@code pivot}
-	 */
-	@Nullable
-	public final Float pivot() {
-		return this.pivot;
-	}
+    /**
+     * API name: {@code pivot}
+     */
+    @Nullable
+    public final Float pivot() {
+        return this.pivot;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		if (this.pivot != null) {
-			generator.writeKey("pivot");
-			generator.write(this.pivot);
+        if (this.pivot != null) {
+            generator.writeKey("pivot");
+            generator.write(this.pivot);
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link RankFeatureFunctionSaturation}.
-	 */
+    /**
+     * Builder for {@link RankFeatureFunctionSaturation}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankFeatureFunctionSaturation> {
-		@Nullable
-		private Float pivot;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankFeatureFunctionSaturation> {
+        @Nullable
+        private Float pivot;
 
-		/**
-		 * API name: {@code pivot}
-		 */
-		public final Builder pivot(@Nullable Float value) {
-			this.pivot = value;
-			return this;
-		}
+        /**
+         * API name: {@code pivot}
+         */
+        public final Builder pivot(@Nullable Float value) {
+            this.pivot = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link RankFeatureFunctionSaturation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RankFeatureFunctionSaturation build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link RankFeatureFunctionSaturation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RankFeatureFunctionSaturation build() {
+            _checkSingleUse();
 
-			return new RankFeatureFunctionSaturation(this);
-		}
-	}
+            return new RankFeatureFunctionSaturation(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link RankFeatureFunctionSaturation}
-	 */
-	public static final JsonpDeserializer<RankFeatureFunctionSaturation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RankFeatureFunctionSaturation::setupRankFeatureFunctionSaturationDeserializer);
+    /**
+     * Json deserializer for {@link RankFeatureFunctionSaturation}
+     */
+    public static final JsonpDeserializer<RankFeatureFunctionSaturation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RankFeatureFunctionSaturation::setupRankFeatureFunctionSaturationDeserializer
+    );
 
-	protected static void setupRankFeatureFunctionSaturationDeserializer(
-			ObjectDeserializer<RankFeatureFunctionSaturation.Builder> op) {
+    protected static void setupRankFeatureFunctionSaturationDeserializer(ObjectDeserializer<RankFeatureFunctionSaturation.Builder> op) {
 
-		op.add(Builder::pivot, JsonpDeserializer.floatDeserializer(), "pivot");
+        op.add(Builder::pivot, JsonpDeserializer.floatDeserializer(), "pivot");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunctionSigmoid.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunctionSigmoid.java
index d26ed584e8..f580cc97a7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunctionSigmoid.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunctionSigmoid.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,117 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.RankFeatureFunctionSigmoid
 
 @JsonpDeserializable
 public class RankFeatureFunctionSigmoid extends RankFeatureFunction implements JsonpSerializable {
-	private final float pivot;
-
-	private final float exponent;
-
-	// ---------------------------------------------------------------------------------------------
+    private final float pivot;
 
-	private RankFeatureFunctionSigmoid(Builder builder) {
+    private final float exponent;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.pivot = ApiTypeHelper.requireNonNull(builder.pivot, this, "pivot");
-		this.exponent = ApiTypeHelper.requireNonNull(builder.exponent, this, "exponent");
+    private RankFeatureFunctionSigmoid(Builder builder) {
 
-	}
+        this.pivot = ApiTypeHelper.requireNonNull(builder.pivot, this, "pivot");
+        this.exponent = ApiTypeHelper.requireNonNull(builder.exponent, this, "exponent");
 
-	public static RankFeatureFunctionSigmoid of(Function<Builder, ObjectBuilder<RankFeatureFunctionSigmoid>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code pivot}
-	 */
-	public final float pivot() {
-		return this.pivot;
-	}
+    public static RankFeatureFunctionSigmoid of(Function<Builder, ObjectBuilder<RankFeatureFunctionSigmoid>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code exponent}
-	 */
-	public final float exponent() {
-		return this.exponent;
-	}
+    /**
+     * Required - API name: {@code pivot}
+     */
+    public final float pivot() {
+        return this.pivot;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code exponent}
+     */
+    public final float exponent() {
+        return this.exponent;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("pivot");
-		generator.write(this.pivot);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("exponent");
-		generator.write(this.exponent);
+        generator.writeKey("pivot");
+        generator.write(this.pivot);
 
-	}
+        generator.writeKey("exponent");
+        generator.write(this.exponent);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link RankFeatureFunctionSigmoid}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankFeatureFunctionSigmoid> {
-		private Float pivot;
+    /**
+     * Builder for {@link RankFeatureFunctionSigmoid}.
+     */
 
-		private Float exponent;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankFeatureFunctionSigmoid> {
+        private Float pivot;
 
-		/**
-		 * Required - API name: {@code pivot}
-		 */
-		public final Builder pivot(float value) {
-			this.pivot = value;
-			return this;
-		}
+        private Float exponent;
 
-		/**
-		 * Required - API name: {@code exponent}
-		 */
-		public final Builder exponent(float value) {
-			this.exponent = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code pivot}
+         */
+        public final Builder pivot(float value) {
+            this.pivot = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link RankFeatureFunctionSigmoid}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RankFeatureFunctionSigmoid build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code exponent}
+         */
+        public final Builder exponent(float value) {
+            this.exponent = value;
+            return this;
+        }
 
-			return new RankFeatureFunctionSigmoid(this);
-		}
-	}
+        /**
+         * Builds a {@link RankFeatureFunctionSigmoid}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RankFeatureFunctionSigmoid build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new RankFeatureFunctionSigmoid(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link RankFeatureFunctionSigmoid}
-	 */
-	public static final JsonpDeserializer<RankFeatureFunctionSigmoid> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RankFeatureFunctionSigmoid::setupRankFeatureFunctionSigmoidDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupRankFeatureFunctionSigmoidDeserializer(
-			ObjectDeserializer<RankFeatureFunctionSigmoid.Builder> op) {
+    /**
+     * Json deserializer for {@link RankFeatureFunctionSigmoid}
+     */
+    public static final JsonpDeserializer<RankFeatureFunctionSigmoid> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RankFeatureFunctionSigmoid::setupRankFeatureFunctionSigmoidDeserializer
+    );
 
-		op.add(Builder::pivot, JsonpDeserializer.floatDeserializer(), "pivot");
-		op.add(Builder::exponent, JsonpDeserializer.floatDeserializer(), "exponent");
+    protected static void setupRankFeatureFunctionSigmoidDeserializer(ObjectDeserializer<RankFeatureFunctionSigmoid.Builder> op) {
 
-	}
+        op.add(Builder::pivot, JsonpDeserializer.floatDeserializer(), "pivot");
+        op.add(Builder::exponent, JsonpDeserializer.floatDeserializer(), "exponent");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureQuery.java
index bb6ef8cfc8..4cd2e42fba 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureQuery.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,249 +42,243 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.RankFeatureQuery
 
-
 @JsonpDeserializable
 public class RankFeatureQuery extends QueryBase implements QueryVariant {
-	private final String field;
-
-	@Nullable
-	private final RankFeatureFunctionSaturation saturation;
-
-	@Nullable
-	private final RankFeatureFunctionLogarithm log;
-
-	@Nullable
-	private final RankFeatureFunctionLinear linear;
-
-	@Nullable
-	private final RankFeatureFunctionSigmoid sigmoid;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RankFeatureQuery(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.saturation = builder.saturation;
-		this.log = builder.log;
-		this.linear = builder.linear;
-		this.sigmoid = builder.sigmoid;
-
-	}
-
-	public static RankFeatureQuery of(Function<Builder, ObjectBuilder<RankFeatureQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.RankFeature;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code saturation}
-	 */
-	@Nullable
-	public final RankFeatureFunctionSaturation saturation() {
-		return this.saturation;
-	}
-
-	/**
-	 * API name: {@code log}
-	 */
-	@Nullable
-	public final RankFeatureFunctionLogarithm log() {
-		return this.log;
-	}
-
-	/**
-	 * API name: {@code linear}
-	 */
-	@Nullable
-	public final RankFeatureFunctionLinear linear() {
-		return this.linear;
-	}
-
-	/**
-	 * API name: {@code sigmoid}
-	 */
-	@Nullable
-	public final RankFeatureFunctionSigmoid sigmoid() {
-		return this.sigmoid;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.saturation != null) {
-			generator.writeKey("saturation");
-			this.saturation.serialize(generator, mapper);
-
-		}
-		if (this.log != null) {
-			generator.writeKey("log");
-			this.log.serialize(generator, mapper);
-
-		}
-		if (this.linear != null) {
-			generator.writeKey("linear");
-			this.linear.serialize(generator, mapper);
-
-		}
-		if (this.sigmoid != null) {
-			generator.writeKey("sigmoid");
-			this.sigmoid.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RankFeatureQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<RankFeatureQuery> {
-		private String field;
-
-		@Nullable
-		private RankFeatureFunctionSaturation saturation;
-
-		@Nullable
-		private RankFeatureFunctionLogarithm log;
-
-		@Nullable
-		private RankFeatureFunctionLinear linear;
-
-		@Nullable
-		private RankFeatureFunctionSigmoid sigmoid;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code saturation}
-		 */
-		public final Builder saturation(@Nullable RankFeatureFunctionSaturation value) {
-			this.saturation = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code saturation}
-		 */
-		public final Builder saturation(
-				Function<RankFeatureFunctionSaturation.Builder, ObjectBuilder<RankFeatureFunctionSaturation>> fn) {
-			return this.saturation(fn.apply(new RankFeatureFunctionSaturation.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code log}
-		 */
-		public final Builder log(@Nullable RankFeatureFunctionLogarithm value) {
-			this.log = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code log}
-		 */
-		public final Builder log(
-				Function<RankFeatureFunctionLogarithm.Builder, ObjectBuilder<RankFeatureFunctionLogarithm>> fn) {
-			return this.log(fn.apply(new RankFeatureFunctionLogarithm.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code linear}
-		 */
-		public final Builder linear(@Nullable RankFeatureFunctionLinear value) {
-			this.linear = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code linear}
-		 */
-		public final Builder linear(
-				Function<RankFeatureFunctionLinear.Builder, ObjectBuilder<RankFeatureFunctionLinear>> fn) {
-			return this.linear(fn.apply(new RankFeatureFunctionLinear.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code sigmoid}
-		 */
-		public final Builder sigmoid(@Nullable RankFeatureFunctionSigmoid value) {
-			this.sigmoid = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code sigmoid}
-		 */
-		public final Builder sigmoid(
-				Function<RankFeatureFunctionSigmoid.Builder, ObjectBuilder<RankFeatureFunctionSigmoid>> fn) {
-			return this.sigmoid(fn.apply(new RankFeatureFunctionSigmoid.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RankFeatureQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RankFeatureQuery build() {
-			_checkSingleUse();
-
-			return new RankFeatureQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RankFeatureQuery}
-	 */
-	public static final JsonpDeserializer<RankFeatureQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RankFeatureQuery::setupRankFeatureQueryDeserializer);
-
-	protected static void setupRankFeatureQueryDeserializer(ObjectDeserializer<RankFeatureQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::saturation, RankFeatureFunctionSaturation._DESERIALIZER, "saturation");
-		op.add(Builder::log, RankFeatureFunctionLogarithm._DESERIALIZER, "log");
-		op.add(Builder::linear, RankFeatureFunctionLinear._DESERIALIZER, "linear");
-		op.add(Builder::sigmoid, RankFeatureFunctionSigmoid._DESERIALIZER, "sigmoid");
-
-	}
+    private final String field;
+
+    @Nullable
+    private final RankFeatureFunctionSaturation saturation;
+
+    @Nullable
+    private final RankFeatureFunctionLogarithm log;
+
+    @Nullable
+    private final RankFeatureFunctionLinear linear;
+
+    @Nullable
+    private final RankFeatureFunctionSigmoid sigmoid;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RankFeatureQuery(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.saturation = builder.saturation;
+        this.log = builder.log;
+        this.linear = builder.linear;
+        this.sigmoid = builder.sigmoid;
+
+    }
+
+    public static RankFeatureQuery of(Function<Builder, ObjectBuilder<RankFeatureQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.RankFeature;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code saturation}
+     */
+    @Nullable
+    public final RankFeatureFunctionSaturation saturation() {
+        return this.saturation;
+    }
+
+    /**
+     * API name: {@code log}
+     */
+    @Nullable
+    public final RankFeatureFunctionLogarithm log() {
+        return this.log;
+    }
+
+    /**
+     * API name: {@code linear}
+     */
+    @Nullable
+    public final RankFeatureFunctionLinear linear() {
+        return this.linear;
+    }
+
+    /**
+     * API name: {@code sigmoid}
+     */
+    @Nullable
+    public final RankFeatureFunctionSigmoid sigmoid() {
+        return this.sigmoid;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.saturation != null) {
+            generator.writeKey("saturation");
+            this.saturation.serialize(generator, mapper);
+
+        }
+        if (this.log != null) {
+            generator.writeKey("log");
+            this.log.serialize(generator, mapper);
+
+        }
+        if (this.linear != null) {
+            generator.writeKey("linear");
+            this.linear.serialize(generator, mapper);
+
+        }
+        if (this.sigmoid != null) {
+            generator.writeKey("sigmoid");
+            this.sigmoid.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RankFeatureQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<RankFeatureQuery> {
+        private String field;
+
+        @Nullable
+        private RankFeatureFunctionSaturation saturation;
+
+        @Nullable
+        private RankFeatureFunctionLogarithm log;
+
+        @Nullable
+        private RankFeatureFunctionLinear linear;
+
+        @Nullable
+        private RankFeatureFunctionSigmoid sigmoid;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code saturation}
+         */
+        public final Builder saturation(@Nullable RankFeatureFunctionSaturation value) {
+            this.saturation = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code saturation}
+         */
+        public final Builder saturation(Function<RankFeatureFunctionSaturation.Builder, ObjectBuilder<RankFeatureFunctionSaturation>> fn) {
+            return this.saturation(fn.apply(new RankFeatureFunctionSaturation.Builder()).build());
+        }
+
+        /**
+         * API name: {@code log}
+         */
+        public final Builder log(@Nullable RankFeatureFunctionLogarithm value) {
+            this.log = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code log}
+         */
+        public final Builder log(Function<RankFeatureFunctionLogarithm.Builder, ObjectBuilder<RankFeatureFunctionLogarithm>> fn) {
+            return this.log(fn.apply(new RankFeatureFunctionLogarithm.Builder()).build());
+        }
+
+        /**
+         * API name: {@code linear}
+         */
+        public final Builder linear(@Nullable RankFeatureFunctionLinear value) {
+            this.linear = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code linear}
+         */
+        public final Builder linear(Function<RankFeatureFunctionLinear.Builder, ObjectBuilder<RankFeatureFunctionLinear>> fn) {
+            return this.linear(fn.apply(new RankFeatureFunctionLinear.Builder()).build());
+        }
+
+        /**
+         * API name: {@code sigmoid}
+         */
+        public final Builder sigmoid(@Nullable RankFeatureFunctionSigmoid value) {
+            this.sigmoid = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code sigmoid}
+         */
+        public final Builder sigmoid(Function<RankFeatureFunctionSigmoid.Builder, ObjectBuilder<RankFeatureFunctionSigmoid>> fn) {
+            return this.sigmoid(fn.apply(new RankFeatureFunctionSigmoid.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RankFeatureQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RankFeatureQuery build() {
+            _checkSingleUse();
+
+            return new RankFeatureQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RankFeatureQuery}
+     */
+    public static final JsonpDeserializer<RankFeatureQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RankFeatureQuery::setupRankFeatureQueryDeserializer
+    );
+
+    protected static void setupRankFeatureQueryDeserializer(ObjectDeserializer<RankFeatureQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::saturation, RankFeatureFunctionSaturation._DESERIALIZER, "saturation");
+        op.add(Builder::log, RankFeatureFunctionLogarithm._DESERIALIZER, "log");
+        op.add(Builder::linear, RankFeatureFunctionLinear._DESERIALIZER, "linear");
+        op.add(Builder::sigmoid, RankFeatureFunctionSigmoid._DESERIALIZER, "sigmoid");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RegexpQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RegexpQuery.java
index 67b368992a..6dc48ce92c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RegexpQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RegexpQuery.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,243 +42,241 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.RegexpQuery
 
-
 @JsonpDeserializable
 public class RegexpQuery extends QueryBase implements QueryVariant {
-	// Single key dictionary
-	private final String field;
-
-	@Nullable
-	private final Boolean caseInsensitive;
-
-	@Nullable
-	private final String flags;
-
-	@Nullable
-	private final Integer maxDeterminizedStates;
-
-	@Nullable
-	private final String rewrite;
-
-	private final String value;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RegexpQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-
-		this.caseInsensitive = builder.caseInsensitive;
-		this.flags = builder.flags;
-		this.maxDeterminizedStates = builder.maxDeterminizedStates;
-		this.rewrite = builder.rewrite;
-		this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
-
-	}
-
-	public static RegexpQuery of(Function<Builder, ObjectBuilder<RegexpQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Regexp;
-	}
-
-	/**
-	 * Required - The target field
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code case_insensitive}
-	 */
-	@Nullable
-	public final Boolean caseInsensitive() {
-		return this.caseInsensitive;
-	}
-
-	/**
-	 * API name: {@code flags}
-	 */
-	@Nullable
-	public final String flags() {
-		return this.flags;
-	}
-
-	/**
-	 * API name: {@code max_determinized_states}
-	 */
-	@Nullable
-	public final Integer maxDeterminizedStates() {
-		return this.maxDeterminizedStates;
-	}
-
-	/**
-	 * API name: {@code rewrite}
-	 */
-	@Nullable
-	public final String rewrite() {
-		return this.rewrite;
-	}
-
-	/**
-	 * Required - API name: {@code value}
-	 */
-	public final String value() {
-		return this.value;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject(this.field);
-
-		super.serializeInternal(generator, mapper);
-		if (this.caseInsensitive != null) {
-			generator.writeKey("case_insensitive");
-			generator.write(this.caseInsensitive);
-
-		}
-		if (this.flags != null) {
-			generator.writeKey("flags");
-			generator.write(this.flags);
-
-		}
-		if (this.maxDeterminizedStates != null) {
-			generator.writeKey("max_determinized_states");
-			generator.write(this.maxDeterminizedStates);
-
-		}
-		if (this.rewrite != null) {
-			generator.writeKey("rewrite");
-			generator.write(this.rewrite);
-
-		}
-		generator.writeKey("value");
-		generator.write(this.value);
-
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RegexpQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<RegexpQuery> {
-		private String field;
-
-		/**
-		 * Required - The target field
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		@Nullable
-		private Boolean caseInsensitive;
-
-		@Nullable
-		private String flags;
-
-		@Nullable
-		private Integer maxDeterminizedStates;
-
-		@Nullable
-		private String rewrite;
-
-		private String value;
-
-		/**
-		 * API name: {@code case_insensitive}
-		 */
-		public final Builder caseInsensitive(@Nullable Boolean value) {
-			this.caseInsensitive = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code flags}
-		 */
-		public final Builder flags(@Nullable String value) {
-			this.flags = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_determinized_states}
-		 */
-		public final Builder maxDeterminizedStates(@Nullable Integer value) {
-			this.maxDeterminizedStates = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code rewrite}
-		 */
-		public final Builder rewrite(@Nullable String value) {
-			this.rewrite = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code value}
-		 */
-		public final Builder value(String value) {
-			this.value = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RegexpQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RegexpQuery build() {
-			_checkSingleUse();
-
-			return new RegexpQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RegexpQuery}
-	 */
-	public static final JsonpDeserializer<RegexpQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RegexpQuery::setupRegexpQueryDeserializer);
-
-	protected static void setupRegexpQueryDeserializer(ObjectDeserializer<RegexpQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::caseInsensitive, JsonpDeserializer.booleanDeserializer(), "case_insensitive");
-		op.add(Builder::flags, JsonpDeserializer.stringDeserializer(), "flags");
-		op.add(Builder::maxDeterminizedStates, JsonpDeserializer.integerDeserializer(), "max_determinized_states");
-		op.add(Builder::rewrite, JsonpDeserializer.stringDeserializer(), "rewrite");
-		op.add(Builder::value, JsonpDeserializer.stringDeserializer(), "value");
-
-		op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
-		op.shortcutProperty("value");
-
-	}
+    // Single key dictionary
+    private final String field;
+
+    @Nullable
+    private final Boolean caseInsensitive;
+
+    @Nullable
+    private final String flags;
+
+    @Nullable
+    private final Integer maxDeterminizedStates;
+
+    @Nullable
+    private final String rewrite;
+
+    private final String value;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RegexpQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+
+        this.caseInsensitive = builder.caseInsensitive;
+        this.flags = builder.flags;
+        this.maxDeterminizedStates = builder.maxDeterminizedStates;
+        this.rewrite = builder.rewrite;
+        this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
+
+    }
+
+    public static RegexpQuery of(Function<Builder, ObjectBuilder<RegexpQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Regexp;
+    }
+
+    /**
+     * Required - The target field
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code case_insensitive}
+     */
+    @Nullable
+    public final Boolean caseInsensitive() {
+        return this.caseInsensitive;
+    }
+
+    /**
+     * API name: {@code flags}
+     */
+    @Nullable
+    public final String flags() {
+        return this.flags;
+    }
+
+    /**
+     * API name: {@code max_determinized_states}
+     */
+    @Nullable
+    public final Integer maxDeterminizedStates() {
+        return this.maxDeterminizedStates;
+    }
+
+    /**
+     * API name: {@code rewrite}
+     */
+    @Nullable
+    public final String rewrite() {
+        return this.rewrite;
+    }
+
+    /**
+     * Required - API name: {@code value}
+     */
+    public final String value() {
+        return this.value;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject(this.field);
+
+        super.serializeInternal(generator, mapper);
+        if (this.caseInsensitive != null) {
+            generator.writeKey("case_insensitive");
+            generator.write(this.caseInsensitive);
+
+        }
+        if (this.flags != null) {
+            generator.writeKey("flags");
+            generator.write(this.flags);
+
+        }
+        if (this.maxDeterminizedStates != null) {
+            generator.writeKey("max_determinized_states");
+            generator.write(this.maxDeterminizedStates);
+
+        }
+        if (this.rewrite != null) {
+            generator.writeKey("rewrite");
+            generator.write(this.rewrite);
+
+        }
+        generator.writeKey("value");
+        generator.write(this.value);
+
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RegexpQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<RegexpQuery> {
+        private String field;
+
+        /**
+         * Required - The target field
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        @Nullable
+        private Boolean caseInsensitive;
+
+        @Nullable
+        private String flags;
+
+        @Nullable
+        private Integer maxDeterminizedStates;
+
+        @Nullable
+        private String rewrite;
+
+        private String value;
+
+        /**
+         * API name: {@code case_insensitive}
+         */
+        public final Builder caseInsensitive(@Nullable Boolean value) {
+            this.caseInsensitive = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code flags}
+         */
+        public final Builder flags(@Nullable String value) {
+            this.flags = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_determinized_states}
+         */
+        public final Builder maxDeterminizedStates(@Nullable Integer value) {
+            this.maxDeterminizedStates = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code rewrite}
+         */
+        public final Builder rewrite(@Nullable String value) {
+            this.rewrite = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code value}
+         */
+        public final Builder value(String value) {
+            this.value = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RegexpQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RegexpQuery build() {
+            _checkSingleUse();
+
+            return new RegexpQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RegexpQuery}
+     */
+    public static final JsonpDeserializer<RegexpQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RegexpQuery::setupRegexpQueryDeserializer
+    );
+
+    protected static void setupRegexpQueryDeserializer(ObjectDeserializer<RegexpQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::caseInsensitive, JsonpDeserializer.booleanDeserializer(), "case_insensitive");
+        op.add(Builder::flags, JsonpDeserializer.stringDeserializer(), "flags");
+        op.add(Builder::maxDeterminizedStates, JsonpDeserializer.integerDeserializer(), "max_determinized_states");
+        op.add(Builder::rewrite, JsonpDeserializer.stringDeserializer(), "rewrite");
+        op.add(Builder::value, JsonpDeserializer.stringDeserializer(), "value");
+
+        op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
+        op.shortcutProperty("value");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ScoreFunctionBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ScoreFunctionBase.java
index 3820ead406..3f81cbe6af 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ScoreFunctionBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ScoreFunctionBase.java
@@ -32,119 +32,114 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.ScoreFunctionBase
 
-
-
 public abstract class ScoreFunctionBase implements JsonpSerializable {
-	@Nullable
-	private final Query filter;
-
-	@Nullable
-	private final Double weight;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected ScoreFunctionBase(AbstractBuilder<?> builder) {
-
-		this.filter = builder.filter;
-		this.weight = builder.weight;
-
-	}
-
-	/**
-	 * API name: {@code filter}
-	 */
-	@Nullable
-	public final Query filter() {
-		return this.filter;
-	}
-
-	/**
-	 * API name: {@code weight}
-	 */
-	@Nullable
-	public final Double weight() {
-		return this.weight;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.filter != null) {
-			generator.writeKey("filter");
-			this.filter.serialize(generator, mapper);
-
-		}
-		if (this.weight != null) {
-			generator.writeKey("weight");
-			generator.write(this.weight);
-
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		@Nullable
-		private Query filter;
-
-		@Nullable
-		private Double weight;
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final BuilderT filter(@Nullable Query value) {
-			this.filter = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final BuilderT filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.filter(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code weight}
-		 */
-		public final BuilderT weight(@Nullable Double value) {
-			this.weight = value;
-			return self();
-		}
-
-		protected abstract BuilderT self();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupScoreFunctionBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-
-		op.add(AbstractBuilder::filter, Query._DESERIALIZER, "filter");
-		op.add(AbstractBuilder::weight, JsonpDeserializer.doubleDeserializer(), "weight");
-
-	}
+    @Nullable
+    private final Query filter;
+
+    @Nullable
+    private final Double weight;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected ScoreFunctionBase(AbstractBuilder<?> builder) {
+
+        this.filter = builder.filter;
+        this.weight = builder.weight;
+
+    }
+
+    /**
+     * API name: {@code filter}
+     */
+    @Nullable
+    public final Query filter() {
+        return this.filter;
+    }
+
+    /**
+     * API name: {@code weight}
+     */
+    @Nullable
+    public final Double weight() {
+        return this.weight;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.filter != null) {
+            generator.writeKey("filter");
+            this.filter.serialize(generator, mapper);
+
+        }
+        if (this.weight != null) {
+            generator.writeKey("weight");
+            generator.write(this.weight);
+
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        @Nullable
+        private Query filter;
+
+        @Nullable
+        private Double weight;
+
+        /**
+         * API name: {@code filter}
+         */
+        public final BuilderT filter(@Nullable Query value) {
+            this.filter = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final BuilderT filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.filter(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code weight}
+         */
+        public final BuilderT weight(@Nullable Double value) {
+            this.weight = value;
+            return self();
+        }
+
+        protected abstract BuilderT self();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupScoreFunctionBaseDeserializer(ObjectDeserializer<BuilderT> op) {
+
+        op.add(AbstractBuilder::filter, Query._DESERIALIZER, "filter");
+        op.add(AbstractBuilder::weight, JsonpDeserializer.doubleDeserializer(), "weight");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ScriptQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ScriptQuery.java
index 37dd24f925..b50f253c4f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ScriptQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ScriptQuery.java
@@ -32,115 +32,115 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.ScriptQuery
 
-
 @JsonpDeserializable
 public class ScriptQuery extends QueryBase implements QueryVariant {
-	private final Script script;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ScriptQuery(Builder builder) {
-		super(builder);
-
-		this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
-
-	}
-
-	public static ScriptQuery of(Function<Builder, ObjectBuilder<ScriptQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Script;
-	}
-
-	/**
-	 * Required - API name: {@code script}
-	 */
-	public final Script script() {
-		return this.script;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("script");
-		this.script.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ScriptQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<ScriptQuery> {
-		private Script script;
-
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ScriptQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ScriptQuery build() {
-			_checkSingleUse();
-
-			return new ScriptQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ScriptQuery}
-	 */
-	public static final JsonpDeserializer<ScriptQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ScriptQuery::setupScriptQueryDeserializer);
-
-	protected static void setupScriptQueryDeserializer(ObjectDeserializer<ScriptQuery.Builder> op) {
-		setupQueryBaseDeserializer(op);
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-
-	}
+    private final Script script;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ScriptQuery(Builder builder) {
+        super(builder);
+
+        this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
+
+    }
+
+    public static ScriptQuery of(Function<Builder, ObjectBuilder<ScriptQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Script;
+    }
+
+    /**
+     * Required - API name: {@code script}
+     */
+    public final Script script() {
+        return this.script;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("script");
+        this.script.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ScriptQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<ScriptQuery> {
+        private Script script;
+
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ScriptQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ScriptQuery build() {
+            _checkSingleUse();
+
+            return new ScriptQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ScriptQuery}
+     */
+    public static final JsonpDeserializer<ScriptQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ScriptQuery::setupScriptQueryDeserializer
+    );
+
+    protected static void setupScriptQueryDeserializer(ObjectDeserializer<ScriptQuery.Builder> op) {
+        setupQueryBaseDeserializer(op);
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ScriptScoreFunction.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ScriptScoreFunction.java
index 244a9da8b7..d69900c913 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ScriptScoreFunction.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ScriptScoreFunction.java
@@ -32,117 +32,115 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.ScriptScoreFunction
 
-
 @JsonpDeserializable
 public class ScriptScoreFunction extends ScoreFunctionBase implements FunctionScoreVariant {
-	private final Script script;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ScriptScoreFunction(Builder builder) {
-		super(builder);
-
-		this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
-
-	}
-
-	public static ScriptScoreFunction of(Function<Builder, ObjectBuilder<ScriptScoreFunction>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * FunctionScore variant kind.
-	 */
-	@Override
-	public FunctionScore.Kind _functionScoreKind() {
-		return FunctionScore.Kind.ScriptScore;
-	}
-
-	/**
-	 * Required - API name: {@code script}
-	 */
-	public final Script script() {
-		return this.script;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("script");
-		this.script.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ScriptScoreFunction}.
-	 */
-
-	public static class Builder extends ScoreFunctionBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ScriptScoreFunction> {
-		private Script script;
-
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ScriptScoreFunction}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ScriptScoreFunction build() {
-			_checkSingleUse();
-
-			return new ScriptScoreFunction(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ScriptScoreFunction}
-	 */
-	public static final JsonpDeserializer<ScriptScoreFunction> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ScriptScoreFunction::setupScriptScoreFunctionDeserializer);
-
-	protected static void setupScriptScoreFunctionDeserializer(ObjectDeserializer<ScriptScoreFunction.Builder> op) {
-		setupScoreFunctionBaseDeserializer(op);
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-
-	}
+    private final Script script;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ScriptScoreFunction(Builder builder) {
+        super(builder);
+
+        this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
+
+    }
+
+    public static ScriptScoreFunction of(Function<Builder, ObjectBuilder<ScriptScoreFunction>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * FunctionScore variant kind.
+     */
+    @Override
+    public FunctionScore.Kind _functionScoreKind() {
+        return FunctionScore.Kind.ScriptScore;
+    }
+
+    /**
+     * Required - API name: {@code script}
+     */
+    public final Script script() {
+        return this.script;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("script");
+        this.script.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ScriptScoreFunction}.
+     */
+
+    public static class Builder extends ScoreFunctionBase.AbstractBuilder<Builder> implements ObjectBuilder<ScriptScoreFunction> {
+        private Script script;
+
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ScriptScoreFunction}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ScriptScoreFunction build() {
+            _checkSingleUse();
+
+            return new ScriptScoreFunction(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ScriptScoreFunction}
+     */
+    public static final JsonpDeserializer<ScriptScoreFunction> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ScriptScoreFunction::setupScriptScoreFunctionDeserializer
+    );
+
+    protected static void setupScriptScoreFunctionDeserializer(ObjectDeserializer<ScriptScoreFunction.Builder> op) {
+        setupScoreFunctionBaseDeserializer(op);
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ScriptScoreQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ScriptScoreQuery.java
index 7d50874fa6..65e5a89eb4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ScriptScoreQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ScriptScoreQuery.java
@@ -32,175 +32,176 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.ScriptScoreQuery
 
-
 @JsonpDeserializable
 public class ScriptScoreQuery extends QueryBase implements QueryVariant {
-	@Nullable
-	private final Float minScore;
-
-	private final Query query;
-
-	private final Script script;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ScriptScoreQuery(Builder builder) {
-		super(builder);
-
-		this.minScore = builder.minScore;
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-		this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
-
-	}
-
-	public static ScriptScoreQuery of(Function<Builder, ObjectBuilder<ScriptScoreQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.ScriptScore;
-	}
-
-	/**
-	 * API name: {@code min_score}
-	 */
-	@Nullable
-	public final Float minScore() {
-		return this.minScore;
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final Query query() {
-		return this.query;
-	}
-
-	/**
-	 * Required - API name: {@code script}
-	 */
-	public final Script script() {
-		return this.script;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.minScore != null) {
-			generator.writeKey("min_score");
-			generator.write(this.minScore);
-
-		}
-		generator.writeKey("query");
-		this.query.serialize(generator, mapper);
-
-		generator.writeKey("script");
-		this.script.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ScriptScoreQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<ScriptScoreQuery> {
-		@Nullable
-		private Float minScore;
-
-		private Query query;
-
-		private Script script;
-
-		/**
-		 * API name: {@code min_score}
-		 */
-		public final Builder minScore(@Nullable Float value) {
-			this.minScore = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(Query value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.query(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ScriptScoreQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ScriptScoreQuery build() {
-			_checkSingleUse();
-
-			return new ScriptScoreQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ScriptScoreQuery}
-	 */
-	public static final JsonpDeserializer<ScriptScoreQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ScriptScoreQuery::setupScriptScoreQueryDeserializer);
-
-	protected static void setupScriptScoreQueryDeserializer(ObjectDeserializer<ScriptScoreQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::minScore, JsonpDeserializer.floatDeserializer(), "min_score");
-		op.add(Builder::query, Query._DESERIALIZER, "query");
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-
-	}
+    @Nullable
+    private final Float minScore;
+
+    private final Query query;
+
+    private final Script script;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ScriptScoreQuery(Builder builder) {
+        super(builder);
+
+        this.minScore = builder.minScore;
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+        this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
+
+    }
+
+    public static ScriptScoreQuery of(Function<Builder, ObjectBuilder<ScriptScoreQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.ScriptScore;
+    }
+
+    /**
+     * API name: {@code min_score}
+     */
+    @Nullable
+    public final Float minScore() {
+        return this.minScore;
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final Query query() {
+        return this.query;
+    }
+
+    /**
+     * Required - API name: {@code script}
+     */
+    public final Script script() {
+        return this.script;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.minScore != null) {
+            generator.writeKey("min_score");
+            generator.write(this.minScore);
+
+        }
+        generator.writeKey("query");
+        this.query.serialize(generator, mapper);
+
+        generator.writeKey("script");
+        this.script.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ScriptScoreQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<ScriptScoreQuery> {
+        @Nullable
+        private Float minScore;
+
+        private Query query;
+
+        private Script script;
+
+        /**
+         * API name: {@code min_score}
+         */
+        public final Builder minScore(@Nullable Float value) {
+            this.minScore = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(Query value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.query(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ScriptScoreQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ScriptScoreQuery build() {
+            _checkSingleUse();
+
+            return new ScriptScoreQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ScriptScoreQuery}
+     */
+    public static final JsonpDeserializer<ScriptScoreQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ScriptScoreQuery::setupScriptScoreQueryDeserializer
+    );
+
+    protected static void setupScriptScoreQueryDeserializer(ObjectDeserializer<ScriptScoreQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::minScore, JsonpDeserializer.floatDeserializer(), "min_score");
+        op.add(Builder::query, Query._DESERIALIZER, "query");
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ShapeFieldQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ShapeFieldQuery.java
index 0dc9ef7276..cfb1aeffd7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ShapeFieldQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ShapeFieldQuery.java
@@ -32,7 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch._types.GeoShapeRelation;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,167 +42,165 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.GeoShapeRelation;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.ShapeFieldQuery
 
-
 @JsonpDeserializable
 public class ShapeFieldQuery implements JsonpSerializable {
-	@Nullable
-	private final FieldLookup indexedShape;
-
-	@Nullable
-	private final GeoShapeRelation relation;
-
-	@Nullable
-	private final JsonData shape;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShapeFieldQuery(Builder builder) {
-
-		this.indexedShape = builder.indexedShape;
-		this.relation = builder.relation;
-		this.shape = builder.shape;
-
-	}
-
-	public static ShapeFieldQuery of(Function<Builder, ObjectBuilder<ShapeFieldQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code indexed_shape}
-	 */
-	@Nullable
-	public final FieldLookup indexedShape() {
-		return this.indexedShape;
-	}
-
-	/**
-	 * API name: {@code relation}
-	 */
-	@Nullable
-	public final GeoShapeRelation relation() {
-		return this.relation;
-	}
-
-	/**
-	 * API name: {@code shape}
-	 */
-	@Nullable
-	public final JsonData shape() {
-		return this.shape;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.indexedShape != null) {
-			generator.writeKey("indexed_shape");
-			this.indexedShape.serialize(generator, mapper);
-
-		}
-		if (this.relation != null) {
-			generator.writeKey("relation");
-			this.relation.serialize(generator, mapper);
-		}
-		if (this.shape != null) {
-			generator.writeKey("shape");
-			this.shape.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShapeFieldQuery}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShapeFieldQuery> {
-		@Nullable
-		private FieldLookup indexedShape;
-
-		@Nullable
-		private GeoShapeRelation relation;
-
-		@Nullable
-		private JsonData shape;
-
-		/**
-		 * API name: {@code indexed_shape}
-		 */
-		public final Builder indexedShape(@Nullable FieldLookup value) {
-			this.indexedShape = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code indexed_shape}
-		 */
-		public final Builder indexedShape(Function<FieldLookup.Builder, ObjectBuilder<FieldLookup>> fn) {
-			return this.indexedShape(fn.apply(new FieldLookup.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code relation}
-		 */
-		public final Builder relation(@Nullable GeoShapeRelation value) {
-			this.relation = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code shape}
-		 */
-		public final Builder shape(@Nullable JsonData value) {
-			this.shape = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShapeFieldQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShapeFieldQuery build() {
-			_checkSingleUse();
-
-			return new ShapeFieldQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShapeFieldQuery}
-	 */
-	public static final JsonpDeserializer<ShapeFieldQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShapeFieldQuery::setupShapeFieldQueryDeserializer);
-
-	protected static void setupShapeFieldQueryDeserializer(ObjectDeserializer<ShapeFieldQuery.Builder> op) {
-
-		op.add(Builder::indexedShape, FieldLookup._DESERIALIZER, "indexed_shape");
-		op.add(Builder::relation, GeoShapeRelation._DESERIALIZER, "relation");
-		op.add(Builder::shape, JsonData._DESERIALIZER, "shape");
-
-	}
+    @Nullable
+    private final FieldLookup indexedShape;
+
+    @Nullable
+    private final GeoShapeRelation relation;
+
+    @Nullable
+    private final JsonData shape;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShapeFieldQuery(Builder builder) {
+
+        this.indexedShape = builder.indexedShape;
+        this.relation = builder.relation;
+        this.shape = builder.shape;
+
+    }
+
+    public static ShapeFieldQuery of(Function<Builder, ObjectBuilder<ShapeFieldQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code indexed_shape}
+     */
+    @Nullable
+    public final FieldLookup indexedShape() {
+        return this.indexedShape;
+    }
+
+    /**
+     * API name: {@code relation}
+     */
+    @Nullable
+    public final GeoShapeRelation relation() {
+        return this.relation;
+    }
+
+    /**
+     * API name: {@code shape}
+     */
+    @Nullable
+    public final JsonData shape() {
+        return this.shape;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.indexedShape != null) {
+            generator.writeKey("indexed_shape");
+            this.indexedShape.serialize(generator, mapper);
+
+        }
+        if (this.relation != null) {
+            generator.writeKey("relation");
+            this.relation.serialize(generator, mapper);
+        }
+        if (this.shape != null) {
+            generator.writeKey("shape");
+            this.shape.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShapeFieldQuery}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShapeFieldQuery> {
+        @Nullable
+        private FieldLookup indexedShape;
+
+        @Nullable
+        private GeoShapeRelation relation;
+
+        @Nullable
+        private JsonData shape;
+
+        /**
+         * API name: {@code indexed_shape}
+         */
+        public final Builder indexedShape(@Nullable FieldLookup value) {
+            this.indexedShape = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code indexed_shape}
+         */
+        public final Builder indexedShape(Function<FieldLookup.Builder, ObjectBuilder<FieldLookup>> fn) {
+            return this.indexedShape(fn.apply(new FieldLookup.Builder()).build());
+        }
+
+        /**
+         * API name: {@code relation}
+         */
+        public final Builder relation(@Nullable GeoShapeRelation value) {
+            this.relation = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code shape}
+         */
+        public final Builder shape(@Nullable JsonData value) {
+            this.shape = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShapeFieldQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShapeFieldQuery build() {
+            _checkSingleUse();
+
+            return new ShapeFieldQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShapeFieldQuery}
+     */
+    public static final JsonpDeserializer<ShapeFieldQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShapeFieldQuery::setupShapeFieldQueryDeserializer
+    );
+
+    protected static void setupShapeFieldQueryDeserializer(ObjectDeserializer<ShapeFieldQuery.Builder> op) {
+
+        op.add(Builder::indexedShape, FieldLookup._DESERIALIZER, "indexed_shape");
+        op.add(Builder::relation, GeoShapeRelation._DESERIALIZER, "relation");
+        op.add(Builder::shape, JsonData._DESERIALIZER, "shape");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ShapeQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ShapeQuery.java
index 2a3806f559..e4e483888d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ShapeQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ShapeQuery.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,160 +42,158 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.ShapeQuery
 
-
 @JsonpDeserializable
 public class ShapeQuery extends QueryBase implements QueryVariant {
-	private final String field;
-
-	private final ShapeFieldQuery shape;
-
-	@Nullable
-	private final Boolean ignoreUnmapped;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShapeQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.shape = ApiTypeHelper.requireNonNull(builder.shape, this, "shape");
-
-		this.ignoreUnmapped = builder.ignoreUnmapped;
-
-	}
-
-	public static ShapeQuery of(Function<Builder, ObjectBuilder<ShapeQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Shape;
-	}
-
-	/**
-	 * Required -
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required -
-	 */
-	public final ShapeFieldQuery shape() {
-		return this.shape;
-	}
-
-	/**
-	 * API name: {@code ignore_unmapped}
-	 */
-	@Nullable
-	public final Boolean ignoreUnmapped() {
-		return this.ignoreUnmapped;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeKey(this.field);
-		this.shape.serialize(generator, mapper);
-
-		super.serializeInternal(generator, mapper);
-		if (this.ignoreUnmapped != null) {
-			generator.writeKey("ignore_unmapped");
-			generator.write(this.ignoreUnmapped);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShapeQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<ShapeQuery> {
-		private String field;
-
-		private ShapeFieldQuery shape;
-
-		/**
-		 * Required -
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required -
-		 */
-		public final Builder shape(ShapeFieldQuery value) {
-			this.shape = value;
-			return this;
-		}
-
-		/**
-		 * Required -
-		 */
-		public final Builder shape(Function<ShapeFieldQuery.Builder, ObjectBuilder<ShapeFieldQuery>> fn) {
-			return this.shape(fn.apply(new ShapeFieldQuery.Builder()).build());
-		}
-
-		@Nullable
-		private Boolean ignoreUnmapped;
-
-		/**
-		 * API name: {@code ignore_unmapped}
-		 */
-		public final Builder ignoreUnmapped(@Nullable Boolean value) {
-			this.ignoreUnmapped = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShapeQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShapeQuery build() {
-			_checkSingleUse();
-
-			return new ShapeQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShapeQuery}
-	 */
-	public static final JsonpDeserializer<ShapeQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShapeQuery::setupShapeQueryDeserializer);
-
-	protected static void setupShapeQueryDeserializer(ObjectDeserializer<ShapeQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
-
-		op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
-			builder.field(name);
-			builder.shape(ShapeFieldQuery._DESERIALIZER.deserialize(parser, mapper));
-		});
-
-	}
+    private final String field;
+
+    private final ShapeFieldQuery shape;
+
+    @Nullable
+    private final Boolean ignoreUnmapped;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShapeQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.shape = ApiTypeHelper.requireNonNull(builder.shape, this, "shape");
+
+        this.ignoreUnmapped = builder.ignoreUnmapped;
+
+    }
+
+    public static ShapeQuery of(Function<Builder, ObjectBuilder<ShapeQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Shape;
+    }
+
+    /**
+     * Required -
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required -
+     */
+    public final ShapeFieldQuery shape() {
+        return this.shape;
+    }
+
+    /**
+     * API name: {@code ignore_unmapped}
+     */
+    @Nullable
+    public final Boolean ignoreUnmapped() {
+        return this.ignoreUnmapped;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeKey(this.field);
+        this.shape.serialize(generator, mapper);
+
+        super.serializeInternal(generator, mapper);
+        if (this.ignoreUnmapped != null) {
+            generator.writeKey("ignore_unmapped");
+            generator.write(this.ignoreUnmapped);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShapeQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<ShapeQuery> {
+        private String field;
+
+        private ShapeFieldQuery shape;
+
+        /**
+         * Required -
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required -
+         */
+        public final Builder shape(ShapeFieldQuery value) {
+            this.shape = value;
+            return this;
+        }
+
+        /**
+         * Required -
+         */
+        public final Builder shape(Function<ShapeFieldQuery.Builder, ObjectBuilder<ShapeFieldQuery>> fn) {
+            return this.shape(fn.apply(new ShapeFieldQuery.Builder()).build());
+        }
+
+        @Nullable
+        private Boolean ignoreUnmapped;
+
+        /**
+         * API name: {@code ignore_unmapped}
+         */
+        public final Builder ignoreUnmapped(@Nullable Boolean value) {
+            this.ignoreUnmapped = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShapeQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShapeQuery build() {
+            _checkSingleUse();
+
+            return new ShapeQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShapeQuery}
+     */
+    public static final JsonpDeserializer<ShapeQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShapeQuery::setupShapeQueryDeserializer
+    );
+
+    protected static void setupShapeQueryDeserializer(ObjectDeserializer<ShapeQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
+
+        op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
+            builder.field(name);
+            builder.shape(ShapeFieldQuery._DESERIALIZER.deserialize(parser, mapper));
+        });
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SimpleQueryStringFlag.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SimpleQueryStringFlag.java
index 6d4f3d7915..03a1d14847 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SimpleQueryStringFlag.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SimpleQueryStringFlag.java
@@ -35,47 +35,47 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum SimpleQueryStringFlag implements JsonEnum {
-	None("NONE"),
+    None("NONE"),
 
-	And("AND"),
+    And("AND"),
 
-	Or("OR"),
+    Or("OR"),
 
-	Not("NOT"),
+    Not("NOT"),
 
-	Prefix("PREFIX"),
+    Prefix("PREFIX"),
 
-	Phrase("PHRASE"),
+    Phrase("PHRASE"),
 
-	Precedence("PRECEDENCE"),
+    Precedence("PRECEDENCE"),
 
-	Escape("ESCAPE"),
+    Escape("ESCAPE"),
 
-	Whitespace("WHITESPACE"),
+    Whitespace("WHITESPACE"),
 
-	Fuzzy("FUZZY"),
+    Fuzzy("FUZZY"),
 
-	Near("NEAR"),
+    Near("NEAR"),
 
-	Slop("SLOP"),
+    Slop("SLOP"),
 
-	All("ALL"),
+    All("ALL"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	SimpleQueryStringFlag(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    SimpleQueryStringFlag(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<SimpleQueryStringFlag> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			SimpleQueryStringFlag.values());
+    public static final JsonEnum.Deserializer<SimpleQueryStringFlag> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        SimpleQueryStringFlag.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SimpleQueryStringFlags.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SimpleQueryStringFlags.java
index 58169d1c24..93e1c3e558 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SimpleQueryStringFlags.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SimpleQueryStringFlags.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,8 +44,6 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.SimpleQueryStringFlags
 
@@ -54,130 +54,133 @@
 @JsonpDeserializable
 public class SimpleQueryStringFlags implements TaggedUnion<SimpleQueryStringFlags.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Single, Multiple
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private SimpleQueryStringFlags(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	public String _toJsonString() {
-		switch (_kind) {
-			case Single :
-				return this.single().jsonValue();
-			case Multiple :
-				return this.multiple();
-
-			default :
-				throw new IllegalStateException("Unknown kind " + _kind);
-		}
-	}
-
-	private SimpleQueryStringFlags(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static SimpleQueryStringFlags of(Function<Builder, ObjectBuilder<SimpleQueryStringFlags>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code single}?
-	 */
-	public boolean isSingle() {
-		return _kind == Kind.Single;
-	}
-
-	/**
-	 * Get the {@code single} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code single} kind.
-	 */
-	public SimpleQueryStringFlag single() {
-		return TaggedUnionUtils.get(this, Kind.Single);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code multiple}?
-	 */
-	public boolean isMultiple() {
-		return _kind == Kind.Multiple;
-	}
-
-	/**
-	 * Get the {@code multiple} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code multiple} kind.
-	 */
-	public String multiple() {
-		return TaggedUnionUtils.get(this, Kind.Multiple);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Multiple :
-					generator.write(((String) this._value));
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SimpleQueryStringFlags> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<SimpleQueryStringFlags> single(SimpleQueryStringFlag v) {
-			this._kind = Kind.Single;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SimpleQueryStringFlags> multiple(String v) {
-			this._kind = Kind.Multiple;
-			this._value = v;
-			return this;
-		}
-
-		public SimpleQueryStringFlags build() {
-			_checkSingleUse();
-			return new SimpleQueryStringFlags(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<SimpleQueryStringFlags> buildSimpleQueryStringFlagsDeserializer() {
-		return new UnionDeserializer.Builder<SimpleQueryStringFlags, Kind, Object>(SimpleQueryStringFlags::new, true)
-				.addMember(Kind.Single, SimpleQueryStringFlag._DESERIALIZER)
-				.addMember(Kind.Multiple, JsonpDeserializer.stringDeserializer()).build();
-	}
-
-	public static final JsonpDeserializer<SimpleQueryStringFlags> _DESERIALIZER = JsonpDeserializer
-			.lazy(SimpleQueryStringFlags::buildSimpleQueryStringFlagsDeserializer);
+    public enum Kind {
+        Single,
+        Multiple
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private SimpleQueryStringFlags(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    public String _toJsonString() {
+        switch (_kind) {
+            case Single:
+                return this.single().jsonValue();
+            case Multiple:
+                return this.multiple();
+
+            default:
+                throw new IllegalStateException("Unknown kind " + _kind);
+        }
+    }
+
+    private SimpleQueryStringFlags(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static SimpleQueryStringFlags of(Function<Builder, ObjectBuilder<SimpleQueryStringFlags>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code single}?
+     */
+    public boolean isSingle() {
+        return _kind == Kind.Single;
+    }
+
+    /**
+     * Get the {@code single} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code single} kind.
+     */
+    public SimpleQueryStringFlag single() {
+        return TaggedUnionUtils.get(this, Kind.Single);
+    }
+
+    /**
+     * Is this variant instance of kind {@code multiple}?
+     */
+    public boolean isMultiple() {
+        return _kind == Kind.Multiple;
+    }
+
+    /**
+     * Get the {@code multiple} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code multiple} kind.
+     */
+    public String multiple() {
+        return TaggedUnionUtils.get(this, Kind.Multiple);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Multiple:
+                    generator.write(((String) this._value));
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SimpleQueryStringFlags> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<SimpleQueryStringFlags> single(SimpleQueryStringFlag v) {
+            this._kind = Kind.Single;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SimpleQueryStringFlags> multiple(String v) {
+            this._kind = Kind.Multiple;
+            this._value = v;
+            return this;
+        }
+
+        public SimpleQueryStringFlags build() {
+            _checkSingleUse();
+            return new SimpleQueryStringFlags(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<SimpleQueryStringFlags> buildSimpleQueryStringFlagsDeserializer() {
+        return new UnionDeserializer.Builder<SimpleQueryStringFlags, Kind, Object>(SimpleQueryStringFlags::new, true).addMember(
+            Kind.Single,
+            SimpleQueryStringFlag._DESERIALIZER
+        ).addMember(Kind.Multiple, JsonpDeserializer.stringDeserializer()).build();
+    }
+
+    public static final JsonpDeserializer<SimpleQueryStringFlags> _DESERIALIZER = JsonpDeserializer.lazy(
+        SimpleQueryStringFlags::buildSimpleQueryStringFlagsDeserializer
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SimpleQueryStringFlagsBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SimpleQueryStringFlagsBuilders.java
index 095e45e543..04ae6d5ac7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SimpleQueryStringFlagsBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SimpleQueryStringFlagsBuilders.java
@@ -38,10 +38,9 @@
  * Variants <code>single</code>, <code>multiple</code> are not available here as
  * they don't have a dedicated class. Use {@link SimpleQueryStringFlags}'s
  * builder for these.
- * 
+ *
  */
 public class SimpleQueryStringFlagsBuilders {
-	private SimpleQueryStringFlagsBuilders() {
-	}
+    private SimpleQueryStringFlagsBuilders() {}
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SimpleQueryStringQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SimpleQueryStringQuery.java
index 9b2ee600e8..59baa794eb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SimpleQueryStringQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SimpleQueryStringQuery.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,475 +43,468 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.SimpleQueryStringQuery
 
-
 @JsonpDeserializable
 public class SimpleQueryStringQuery extends QueryBase implements QueryVariant {
-	@Nullable
-	private final String analyzer;
-
-	@Nullable
-	private final Boolean analyzeWildcard;
-
-	@Nullable
-	private final Boolean autoGenerateSynonymsPhraseQuery;
-
-	@Nullable
-	private final Operator defaultOperator;
-
-	private final List<String> fields;
-
-	@Nullable
-	private final SimpleQueryStringFlags flags;
-
-	@Nullable
-	private final Integer fuzzyMaxExpansions;
-
-	@Nullable
-	private final Integer fuzzyPrefixLength;
-
-	@Nullable
-	private final Boolean fuzzyTranspositions;
-
-	@Nullable
-	private final Boolean lenient;
-
-	@Nullable
-	private final String minimumShouldMatch;
-
-	private final String query;
-
-	@Nullable
-	private final String quoteFieldSuffix;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SimpleQueryStringQuery(Builder builder) {
-		super(builder);
-
-		this.analyzer = builder.analyzer;
-		this.analyzeWildcard = builder.analyzeWildcard;
-		this.autoGenerateSynonymsPhraseQuery = builder.autoGenerateSynonymsPhraseQuery;
-		this.defaultOperator = builder.defaultOperator;
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-		this.flags = builder.flags;
-		this.fuzzyMaxExpansions = builder.fuzzyMaxExpansions;
-		this.fuzzyPrefixLength = builder.fuzzyPrefixLength;
-		this.fuzzyTranspositions = builder.fuzzyTranspositions;
-		this.lenient = builder.lenient;
-		this.minimumShouldMatch = builder.minimumShouldMatch;
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-		this.quoteFieldSuffix = builder.quoteFieldSuffix;
-
-	}
-
-	public static SimpleQueryStringQuery of(Function<Builder, ObjectBuilder<SimpleQueryStringQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.SimpleQueryString;
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * API name: {@code analyze_wildcard}
-	 */
-	@Nullable
-	public final Boolean analyzeWildcard() {
-		return this.analyzeWildcard;
-	}
-
-	/**
-	 * API name: {@code auto_generate_synonyms_phrase_query}
-	 */
-	@Nullable
-	public final Boolean autoGenerateSynonymsPhraseQuery() {
-		return this.autoGenerateSynonymsPhraseQuery;
-	}
-
-	/**
-	 * API name: {@code default_operator}
-	 */
-	@Nullable
-	public final Operator defaultOperator() {
-		return this.defaultOperator;
-	}
-
-	/**
-	 * API name: {@code fields}
-	 */
-	public final List<String> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * API name: {@code flags}
-	 */
-	@Nullable
-	public final SimpleQueryStringFlags flags() {
-		return this.flags;
-	}
-
-	/**
-	 * API name: {@code fuzzy_max_expansions}
-	 */
-	@Nullable
-	public final Integer fuzzyMaxExpansions() {
-		return this.fuzzyMaxExpansions;
-	}
-
-	/**
-	 * API name: {@code fuzzy_prefix_length}
-	 */
-	@Nullable
-	public final Integer fuzzyPrefixLength() {
-		return this.fuzzyPrefixLength;
-	}
-
-	/**
-	 * API name: {@code fuzzy_transpositions}
-	 */
-	@Nullable
-	public final Boolean fuzzyTranspositions() {
-		return this.fuzzyTranspositions;
-	}
-
-	/**
-	 * API name: {@code lenient}
-	 */
-	@Nullable
-	public final Boolean lenient() {
-		return this.lenient;
-	}
-
-	/**
-	 * API name: {@code minimum_should_match}
-	 */
-	@Nullable
-	public final String minimumShouldMatch() {
-		return this.minimumShouldMatch;
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final String query() {
-		return this.query;
-	}
-
-	/**
-	 * API name: {@code quote_field_suffix}
-	 */
-	@Nullable
-	public final String quoteFieldSuffix() {
-		return this.quoteFieldSuffix;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			generator.write(this.analyzer);
-
-		}
-		if (this.analyzeWildcard != null) {
-			generator.writeKey("analyze_wildcard");
-			generator.write(this.analyzeWildcard);
-
-		}
-		if (this.autoGenerateSynonymsPhraseQuery != null) {
-			generator.writeKey("auto_generate_synonyms_phrase_query");
-			generator.write(this.autoGenerateSynonymsPhraseQuery);
-
-		}
-		if (this.defaultOperator != null) {
-			generator.writeKey("default_operator");
-			this.defaultOperator.serialize(generator, mapper);
-		}
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartArray();
-			for (String item0 : this.fields) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.flags != null) {
-			generator.writeKey("flags");
-			this.flags.serialize(generator, mapper);
-
-		}
-		if (this.fuzzyMaxExpansions != null) {
-			generator.writeKey("fuzzy_max_expansions");
-			generator.write(this.fuzzyMaxExpansions);
-
-		}
-		if (this.fuzzyPrefixLength != null) {
-			generator.writeKey("fuzzy_prefix_length");
-			generator.write(this.fuzzyPrefixLength);
-
-		}
-		if (this.fuzzyTranspositions != null) {
-			generator.writeKey("fuzzy_transpositions");
-			generator.write(this.fuzzyTranspositions);
-
-		}
-		if (this.lenient != null) {
-			generator.writeKey("lenient");
-			generator.write(this.lenient);
-
-		}
-		if (this.minimumShouldMatch != null) {
-			generator.writeKey("minimum_should_match");
-			generator.write(this.minimumShouldMatch);
-
-		}
-		generator.writeKey("query");
-		generator.write(this.query);
-
-		if (this.quoteFieldSuffix != null) {
-			generator.writeKey("quote_field_suffix");
-			generator.write(this.quoteFieldSuffix);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SimpleQueryStringQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SimpleQueryStringQuery> {
-		@Nullable
-		private String analyzer;
-
-		@Nullable
-		private Boolean analyzeWildcard;
-
-		@Nullable
-		private Boolean autoGenerateSynonymsPhraseQuery;
-
-		@Nullable
-		private Operator defaultOperator;
-
-		@Nullable
-		private List<String> fields;
-
-		@Nullable
-		private SimpleQueryStringFlags flags;
-
-		@Nullable
-		private Integer fuzzyMaxExpansions;
-
-		@Nullable
-		private Integer fuzzyPrefixLength;
-
-		@Nullable
-		private Boolean fuzzyTranspositions;
-
-		@Nullable
-		private Boolean lenient;
-
-		@Nullable
-		private String minimumShouldMatch;
-
-		private String query;
-
-		@Nullable
-		private String quoteFieldSuffix;
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code analyze_wildcard}
-		 */
-		public final Builder analyzeWildcard(@Nullable Boolean value) {
-			this.analyzeWildcard = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code auto_generate_synonyms_phrase_query}
-		 */
-		public final Builder autoGenerateSynonymsPhraseQuery(@Nullable Boolean value) {
-			this.autoGenerateSynonymsPhraseQuery = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code default_operator}
-		 */
-		public final Builder defaultOperator(@Nullable Operator value) {
-			this.defaultOperator = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fields</code>.
-		 */
-		public final Builder fields(List<String> list) {
-			this.fields = _listAddAll(this.fields, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds one or more values to <code>fields</code>.
-		 */
-		public final Builder fields(String value, String... values) {
-			this.fields = _listAdd(this.fields, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code flags}
-		 */
-		public final Builder flags(@Nullable SimpleQueryStringFlags value) {
-			this.flags = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code flags}
-		 */
-		public final Builder flags(Function<SimpleQueryStringFlags.Builder, ObjectBuilder<SimpleQueryStringFlags>> fn) {
-			return this.flags(fn.apply(new SimpleQueryStringFlags.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code fuzzy_max_expansions}
-		 */
-		public final Builder fuzzyMaxExpansions(@Nullable Integer value) {
-			this.fuzzyMaxExpansions = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzzy_prefix_length}
-		 */
-		public final Builder fuzzyPrefixLength(@Nullable Integer value) {
-			this.fuzzyPrefixLength = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzzy_transpositions}
-		 */
-		public final Builder fuzzyTranspositions(@Nullable Boolean value) {
-			this.fuzzyTranspositions = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code lenient}
-		 */
-		public final Builder lenient(@Nullable Boolean value) {
-			this.lenient = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code minimum_should_match}
-		 */
-		public final Builder minimumShouldMatch(@Nullable String value) {
-			this.minimumShouldMatch = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(String value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code quote_field_suffix}
-		 */
-		public final Builder quoteFieldSuffix(@Nullable String value) {
-			this.quoteFieldSuffix = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SimpleQueryStringQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SimpleQueryStringQuery build() {
-			_checkSingleUse();
-
-			return new SimpleQueryStringQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SimpleQueryStringQuery}
-	 */
-	public static final JsonpDeserializer<SimpleQueryStringQuery> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SimpleQueryStringQuery::setupSimpleQueryStringQueryDeserializer);
-
-	protected static void setupSimpleQueryStringQueryDeserializer(
-			ObjectDeserializer<SimpleQueryStringQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(Builder::analyzeWildcard, JsonpDeserializer.booleanDeserializer(), "analyze_wildcard");
-		op.add(Builder::autoGenerateSynonymsPhraseQuery, JsonpDeserializer.booleanDeserializer(),
-				"auto_generate_synonyms_phrase_query");
-		op.add(Builder::defaultOperator, Operator._DESERIALIZER, "default_operator");
-		op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "fields");
-		op.add(Builder::flags, SimpleQueryStringFlags._DESERIALIZER, "flags");
-		op.add(Builder::fuzzyMaxExpansions, JsonpDeserializer.integerDeserializer(), "fuzzy_max_expansions");
-		op.add(Builder::fuzzyPrefixLength, JsonpDeserializer.integerDeserializer(), "fuzzy_prefix_length");
-		op.add(Builder::fuzzyTranspositions, JsonpDeserializer.booleanDeserializer(), "fuzzy_transpositions");
-		op.add(Builder::lenient, JsonpDeserializer.booleanDeserializer(), "lenient");
-		op.add(Builder::minimumShouldMatch, JsonpDeserializer.stringDeserializer(), "minimum_should_match");
-		op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
-		op.add(Builder::quoteFieldSuffix, JsonpDeserializer.stringDeserializer(), "quote_field_suffix");
-
-	}
+    @Nullable
+    private final String analyzer;
+
+    @Nullable
+    private final Boolean analyzeWildcard;
+
+    @Nullable
+    private final Boolean autoGenerateSynonymsPhraseQuery;
+
+    @Nullable
+    private final Operator defaultOperator;
+
+    private final List<String> fields;
+
+    @Nullable
+    private final SimpleQueryStringFlags flags;
+
+    @Nullable
+    private final Integer fuzzyMaxExpansions;
+
+    @Nullable
+    private final Integer fuzzyPrefixLength;
+
+    @Nullable
+    private final Boolean fuzzyTranspositions;
+
+    @Nullable
+    private final Boolean lenient;
+
+    @Nullable
+    private final String minimumShouldMatch;
+
+    private final String query;
+
+    @Nullable
+    private final String quoteFieldSuffix;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SimpleQueryStringQuery(Builder builder) {
+        super(builder);
+
+        this.analyzer = builder.analyzer;
+        this.analyzeWildcard = builder.analyzeWildcard;
+        this.autoGenerateSynonymsPhraseQuery = builder.autoGenerateSynonymsPhraseQuery;
+        this.defaultOperator = builder.defaultOperator;
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.flags = builder.flags;
+        this.fuzzyMaxExpansions = builder.fuzzyMaxExpansions;
+        this.fuzzyPrefixLength = builder.fuzzyPrefixLength;
+        this.fuzzyTranspositions = builder.fuzzyTranspositions;
+        this.lenient = builder.lenient;
+        this.minimumShouldMatch = builder.minimumShouldMatch;
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+        this.quoteFieldSuffix = builder.quoteFieldSuffix;
+
+    }
+
+    public static SimpleQueryStringQuery of(Function<Builder, ObjectBuilder<SimpleQueryStringQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.SimpleQueryString;
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * API name: {@code analyze_wildcard}
+     */
+    @Nullable
+    public final Boolean analyzeWildcard() {
+        return this.analyzeWildcard;
+    }
+
+    /**
+     * API name: {@code auto_generate_synonyms_phrase_query}
+     */
+    @Nullable
+    public final Boolean autoGenerateSynonymsPhraseQuery() {
+        return this.autoGenerateSynonymsPhraseQuery;
+    }
+
+    /**
+     * API name: {@code default_operator}
+     */
+    @Nullable
+    public final Operator defaultOperator() {
+        return this.defaultOperator;
+    }
+
+    /**
+     * API name: {@code fields}
+     */
+    public final List<String> fields() {
+        return this.fields;
+    }
+
+    /**
+     * API name: {@code flags}
+     */
+    @Nullable
+    public final SimpleQueryStringFlags flags() {
+        return this.flags;
+    }
+
+    /**
+     * API name: {@code fuzzy_max_expansions}
+     */
+    @Nullable
+    public final Integer fuzzyMaxExpansions() {
+        return this.fuzzyMaxExpansions;
+    }
+
+    /**
+     * API name: {@code fuzzy_prefix_length}
+     */
+    @Nullable
+    public final Integer fuzzyPrefixLength() {
+        return this.fuzzyPrefixLength;
+    }
+
+    /**
+     * API name: {@code fuzzy_transpositions}
+     */
+    @Nullable
+    public final Boolean fuzzyTranspositions() {
+        return this.fuzzyTranspositions;
+    }
+
+    /**
+     * API name: {@code lenient}
+     */
+    @Nullable
+    public final Boolean lenient() {
+        return this.lenient;
+    }
+
+    /**
+     * API name: {@code minimum_should_match}
+     */
+    @Nullable
+    public final String minimumShouldMatch() {
+        return this.minimumShouldMatch;
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final String query() {
+        return this.query;
+    }
+
+    /**
+     * API name: {@code quote_field_suffix}
+     */
+    @Nullable
+    public final String quoteFieldSuffix() {
+        return this.quoteFieldSuffix;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            generator.write(this.analyzer);
+
+        }
+        if (this.analyzeWildcard != null) {
+            generator.writeKey("analyze_wildcard");
+            generator.write(this.analyzeWildcard);
+
+        }
+        if (this.autoGenerateSynonymsPhraseQuery != null) {
+            generator.writeKey("auto_generate_synonyms_phrase_query");
+            generator.write(this.autoGenerateSynonymsPhraseQuery);
+
+        }
+        if (this.defaultOperator != null) {
+            generator.writeKey("default_operator");
+            this.defaultOperator.serialize(generator, mapper);
+        }
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartArray();
+            for (String item0 : this.fields) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.flags != null) {
+            generator.writeKey("flags");
+            this.flags.serialize(generator, mapper);
+
+        }
+        if (this.fuzzyMaxExpansions != null) {
+            generator.writeKey("fuzzy_max_expansions");
+            generator.write(this.fuzzyMaxExpansions);
+
+        }
+        if (this.fuzzyPrefixLength != null) {
+            generator.writeKey("fuzzy_prefix_length");
+            generator.write(this.fuzzyPrefixLength);
+
+        }
+        if (this.fuzzyTranspositions != null) {
+            generator.writeKey("fuzzy_transpositions");
+            generator.write(this.fuzzyTranspositions);
+
+        }
+        if (this.lenient != null) {
+            generator.writeKey("lenient");
+            generator.write(this.lenient);
+
+        }
+        if (this.minimumShouldMatch != null) {
+            generator.writeKey("minimum_should_match");
+            generator.write(this.minimumShouldMatch);
+
+        }
+        generator.writeKey("query");
+        generator.write(this.query);
+
+        if (this.quoteFieldSuffix != null) {
+            generator.writeKey("quote_field_suffix");
+            generator.write(this.quoteFieldSuffix);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SimpleQueryStringQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<SimpleQueryStringQuery> {
+        @Nullable
+        private String analyzer;
+
+        @Nullable
+        private Boolean analyzeWildcard;
+
+        @Nullable
+        private Boolean autoGenerateSynonymsPhraseQuery;
+
+        @Nullable
+        private Operator defaultOperator;
+
+        @Nullable
+        private List<String> fields;
+
+        @Nullable
+        private SimpleQueryStringFlags flags;
+
+        @Nullable
+        private Integer fuzzyMaxExpansions;
+
+        @Nullable
+        private Integer fuzzyPrefixLength;
+
+        @Nullable
+        private Boolean fuzzyTranspositions;
+
+        @Nullable
+        private Boolean lenient;
+
+        @Nullable
+        private String minimumShouldMatch;
+
+        private String query;
+
+        @Nullable
+        private String quoteFieldSuffix;
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code analyze_wildcard}
+         */
+        public final Builder analyzeWildcard(@Nullable Boolean value) {
+            this.analyzeWildcard = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code auto_generate_synonyms_phrase_query}
+         */
+        public final Builder autoGenerateSynonymsPhraseQuery(@Nullable Boolean value) {
+            this.autoGenerateSynonymsPhraseQuery = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code default_operator}
+         */
+        public final Builder defaultOperator(@Nullable Operator value) {
+            this.defaultOperator = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fields</code>.
+         */
+        public final Builder fields(List<String> list) {
+            this.fields = _listAddAll(this.fields, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds one or more values to <code>fields</code>.
+         */
+        public final Builder fields(String value, String... values) {
+            this.fields = _listAdd(this.fields, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code flags}
+         */
+        public final Builder flags(@Nullable SimpleQueryStringFlags value) {
+            this.flags = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code flags}
+         */
+        public final Builder flags(Function<SimpleQueryStringFlags.Builder, ObjectBuilder<SimpleQueryStringFlags>> fn) {
+            return this.flags(fn.apply(new SimpleQueryStringFlags.Builder()).build());
+        }
+
+        /**
+         * API name: {@code fuzzy_max_expansions}
+         */
+        public final Builder fuzzyMaxExpansions(@Nullable Integer value) {
+            this.fuzzyMaxExpansions = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzzy_prefix_length}
+         */
+        public final Builder fuzzyPrefixLength(@Nullable Integer value) {
+            this.fuzzyPrefixLength = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzzy_transpositions}
+         */
+        public final Builder fuzzyTranspositions(@Nullable Boolean value) {
+            this.fuzzyTranspositions = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code lenient}
+         */
+        public final Builder lenient(@Nullable Boolean value) {
+            this.lenient = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code minimum_should_match}
+         */
+        public final Builder minimumShouldMatch(@Nullable String value) {
+            this.minimumShouldMatch = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(String value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code quote_field_suffix}
+         */
+        public final Builder quoteFieldSuffix(@Nullable String value) {
+            this.quoteFieldSuffix = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SimpleQueryStringQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SimpleQueryStringQuery build() {
+            _checkSingleUse();
+
+            return new SimpleQueryStringQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SimpleQueryStringQuery}
+     */
+    public static final JsonpDeserializer<SimpleQueryStringQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SimpleQueryStringQuery::setupSimpleQueryStringQueryDeserializer
+    );
+
+    protected static void setupSimpleQueryStringQueryDeserializer(ObjectDeserializer<SimpleQueryStringQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(Builder::analyzeWildcard, JsonpDeserializer.booleanDeserializer(), "analyze_wildcard");
+        op.add(Builder::autoGenerateSynonymsPhraseQuery, JsonpDeserializer.booleanDeserializer(), "auto_generate_synonyms_phrase_query");
+        op.add(Builder::defaultOperator, Operator._DESERIALIZER, "default_operator");
+        op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "fields");
+        op.add(Builder::flags, SimpleQueryStringFlags._DESERIALIZER, "flags");
+        op.add(Builder::fuzzyMaxExpansions, JsonpDeserializer.integerDeserializer(), "fuzzy_max_expansions");
+        op.add(Builder::fuzzyPrefixLength, JsonpDeserializer.integerDeserializer(), "fuzzy_prefix_length");
+        op.add(Builder::fuzzyTranspositions, JsonpDeserializer.booleanDeserializer(), "fuzzy_transpositions");
+        op.add(Builder::lenient, JsonpDeserializer.booleanDeserializer(), "lenient");
+        op.add(Builder::minimumShouldMatch, JsonpDeserializer.stringDeserializer(), "minimum_should_match");
+        op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
+        op.add(Builder::quoteFieldSuffix, JsonpDeserializer.stringDeserializer(), "quote_field_suffix");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanContainingQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanContainingQuery.java
index 6ad9b7dc7f..0993356830 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanContainingQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanContainingQuery.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,148 +41,144 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.SpanContainingQuery
 
-
 @JsonpDeserializable
 public class SpanContainingQuery extends QueryBase implements SpanQueryVariant, QueryVariant {
-	private final SpanQuery big;
-
-	private final SpanQuery little;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SpanContainingQuery(Builder builder) {
-		super(builder);
-
-		this.big = ApiTypeHelper.requireNonNull(builder.big, this, "big");
-		this.little = ApiTypeHelper.requireNonNull(builder.little, this, "little");
-
-	}
-
-	public static SpanContainingQuery of(Function<Builder, ObjectBuilder<SpanContainingQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * SpanQuery variant kind.
-	 */
-	@Override
-	public SpanQuery.Kind _spanQueryKind() {
-		return SpanQuery.Kind.SpanContaining;
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.SpanContaining;
-	}
-
-	/**
-	 * Required - API name: {@code big}
-	 */
-	public final SpanQuery big() {
-		return this.big;
-	}
-
-	/**
-	 * Required - API name: {@code little}
-	 */
-	public final SpanQuery little() {
-		return this.little;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("big");
-		this.big.serialize(generator, mapper);
-
-		generator.writeKey("little");
-		this.little.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SpanContainingQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SpanContainingQuery> {
-		private SpanQuery big;
-
-		private SpanQuery little;
-
-		/**
-		 * Required - API name: {@code big}
-		 */
-		public final Builder big(SpanQuery value) {
-			this.big = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code big}
-		 */
-		public final Builder big(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
-			return this.big(fn.apply(new SpanQuery.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code little}
-		 */
-		public final Builder little(SpanQuery value) {
-			this.little = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code little}
-		 */
-		public final Builder little(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
-			return this.little(fn.apply(new SpanQuery.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SpanContainingQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SpanContainingQuery build() {
-			_checkSingleUse();
-
-			return new SpanContainingQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SpanContainingQuery}
-	 */
-	public static final JsonpDeserializer<SpanContainingQuery> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SpanContainingQuery::setupSpanContainingQueryDeserializer);
-
-	protected static void setupSpanContainingQueryDeserializer(ObjectDeserializer<SpanContainingQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::big, SpanQuery._DESERIALIZER, "big");
-		op.add(Builder::little, SpanQuery._DESERIALIZER, "little");
-
-	}
+    private final SpanQuery big;
+
+    private final SpanQuery little;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SpanContainingQuery(Builder builder) {
+        super(builder);
+
+        this.big = ApiTypeHelper.requireNonNull(builder.big, this, "big");
+        this.little = ApiTypeHelper.requireNonNull(builder.little, this, "little");
+
+    }
+
+    public static SpanContainingQuery of(Function<Builder, ObjectBuilder<SpanContainingQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * SpanQuery variant kind.
+     */
+    @Override
+    public SpanQuery.Kind _spanQueryKind() {
+        return SpanQuery.Kind.SpanContaining;
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.SpanContaining;
+    }
+
+    /**
+     * Required - API name: {@code big}
+     */
+    public final SpanQuery big() {
+        return this.big;
+    }
+
+    /**
+     * Required - API name: {@code little}
+     */
+    public final SpanQuery little() {
+        return this.little;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("big");
+        this.big.serialize(generator, mapper);
+
+        generator.writeKey("little");
+        this.little.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SpanContainingQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<SpanContainingQuery> {
+        private SpanQuery big;
+
+        private SpanQuery little;
+
+        /**
+         * Required - API name: {@code big}
+         */
+        public final Builder big(SpanQuery value) {
+            this.big = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code big}
+         */
+        public final Builder big(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
+            return this.big(fn.apply(new SpanQuery.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code little}
+         */
+        public final Builder little(SpanQuery value) {
+            this.little = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code little}
+         */
+        public final Builder little(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
+            return this.little(fn.apply(new SpanQuery.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SpanContainingQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SpanContainingQuery build() {
+            _checkSingleUse();
+
+            return new SpanContainingQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SpanContainingQuery}
+     */
+    public static final JsonpDeserializer<SpanContainingQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SpanContainingQuery::setupSpanContainingQueryDeserializer
+    );
+
+    protected static void setupSpanContainingQueryDeserializer(ObjectDeserializer<SpanContainingQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::big, SpanQuery._DESERIALIZER, "big");
+        op.add(Builder::little, SpanQuery._DESERIALIZER, "little");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanFieldMaskingQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanFieldMaskingQuery.java
index 5ab1e3bcca..ea6c30ed44 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanFieldMaskingQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanFieldMaskingQuery.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,140 +41,137 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.SpanFieldMaskingQuery
 
-
 @JsonpDeserializable
 public class SpanFieldMaskingQuery extends QueryBase implements SpanQueryVariant, QueryVariant {
-	private final String field;
-
-	private final SpanQuery query;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SpanFieldMaskingQuery(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-
-	}
-
-	public static SpanFieldMaskingQuery of(Function<Builder, ObjectBuilder<SpanFieldMaskingQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * SpanQuery variant kind.
-	 */
-	@Override
-	public SpanQuery.Kind _spanQueryKind() {
-		return SpanQuery.Kind.FieldMaskingSpan;
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.FieldMaskingSpan;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final SpanQuery query() {
-		return this.query;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		generator.writeKey("query");
-		this.query.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SpanFieldMaskingQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SpanFieldMaskingQuery> {
-		private String field;
-
-		private SpanQuery query;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(SpanQuery value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
-			return this.query(fn.apply(new SpanQuery.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SpanFieldMaskingQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SpanFieldMaskingQuery build() {
-			_checkSingleUse();
-
-			return new SpanFieldMaskingQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SpanFieldMaskingQuery}
-	 */
-	public static final JsonpDeserializer<SpanFieldMaskingQuery> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SpanFieldMaskingQuery::setupSpanFieldMaskingQueryDeserializer);
-
-	protected static void setupSpanFieldMaskingQueryDeserializer(ObjectDeserializer<SpanFieldMaskingQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::query, SpanQuery._DESERIALIZER, "query");
-
-	}
+    private final String field;
+
+    private final SpanQuery query;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SpanFieldMaskingQuery(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+
+    }
+
+    public static SpanFieldMaskingQuery of(Function<Builder, ObjectBuilder<SpanFieldMaskingQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * SpanQuery variant kind.
+     */
+    @Override
+    public SpanQuery.Kind _spanQueryKind() {
+        return SpanQuery.Kind.FieldMaskingSpan;
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.FieldMaskingSpan;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final SpanQuery query() {
+        return this.query;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        generator.writeKey("query");
+        this.query.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SpanFieldMaskingQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<SpanFieldMaskingQuery> {
+        private String field;
+
+        private SpanQuery query;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(SpanQuery value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
+            return this.query(fn.apply(new SpanQuery.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SpanFieldMaskingQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SpanFieldMaskingQuery build() {
+            _checkSingleUse();
+
+            return new SpanFieldMaskingQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SpanFieldMaskingQuery}
+     */
+    public static final JsonpDeserializer<SpanFieldMaskingQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SpanFieldMaskingQuery::setupSpanFieldMaskingQueryDeserializer
+    );
+
+    protected static void setupSpanFieldMaskingQueryDeserializer(ObjectDeserializer<SpanFieldMaskingQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::query, SpanQuery._DESERIALIZER, "query");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanFirstQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanFirstQuery.java
index 8c44a2c378..e9b03a590d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanFirstQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanFirstQuery.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,138 +41,137 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.SpanFirstQuery
 
-
 @JsonpDeserializable
 public class SpanFirstQuery extends QueryBase implements SpanQueryVariant, QueryVariant {
-	private final int end;
-
-	private final SpanQuery match;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SpanFirstQuery(Builder builder) {
-		super(builder);
-
-		this.end = ApiTypeHelper.requireNonNull(builder.end, this, "end");
-		this.match = ApiTypeHelper.requireNonNull(builder.match, this, "match");
-
-	}
-
-	public static SpanFirstQuery of(Function<Builder, ObjectBuilder<SpanFirstQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * SpanQuery variant kind.
-	 */
-	@Override
-	public SpanQuery.Kind _spanQueryKind() {
-		return SpanQuery.Kind.SpanFirst;
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.SpanFirst;
-	}
-
-	/**
-	 * Required - API name: {@code end}
-	 */
-	public final int end() {
-		return this.end;
-	}
-
-	/**
-	 * Required - API name: {@code match}
-	 */
-	public final SpanQuery match() {
-		return this.match;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("end");
-		generator.write(this.end);
-
-		generator.writeKey("match");
-		this.match.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SpanFirstQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<SpanFirstQuery> {
-		private Integer end;
-
-		private SpanQuery match;
-
-		/**
-		 * Required - API name: {@code end}
-		 */
-		public final Builder end(int value) {
-			this.end = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code match}
-		 */
-		public final Builder match(SpanQuery value) {
-			this.match = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code match}
-		 */
-		public final Builder match(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
-			return this.match(fn.apply(new SpanQuery.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SpanFirstQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SpanFirstQuery build() {
-			_checkSingleUse();
-
-			return new SpanFirstQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SpanFirstQuery}
-	 */
-	public static final JsonpDeserializer<SpanFirstQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SpanFirstQuery::setupSpanFirstQueryDeserializer);
-
-	protected static void setupSpanFirstQueryDeserializer(ObjectDeserializer<SpanFirstQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::end, JsonpDeserializer.integerDeserializer(), "end");
-		op.add(Builder::match, SpanQuery._DESERIALIZER, "match");
-
-	}
+    private final int end;
+
+    private final SpanQuery match;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SpanFirstQuery(Builder builder) {
+        super(builder);
+
+        this.end = ApiTypeHelper.requireNonNull(builder.end, this, "end");
+        this.match = ApiTypeHelper.requireNonNull(builder.match, this, "match");
+
+    }
+
+    public static SpanFirstQuery of(Function<Builder, ObjectBuilder<SpanFirstQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * SpanQuery variant kind.
+     */
+    @Override
+    public SpanQuery.Kind _spanQueryKind() {
+        return SpanQuery.Kind.SpanFirst;
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.SpanFirst;
+    }
+
+    /**
+     * Required - API name: {@code end}
+     */
+    public final int end() {
+        return this.end;
+    }
+
+    /**
+     * Required - API name: {@code match}
+     */
+    public final SpanQuery match() {
+        return this.match;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("end");
+        generator.write(this.end);
+
+        generator.writeKey("match");
+        this.match.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SpanFirstQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<SpanFirstQuery> {
+        private Integer end;
+
+        private SpanQuery match;
+
+        /**
+         * Required - API name: {@code end}
+         */
+        public final Builder end(int value) {
+            this.end = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code match}
+         */
+        public final Builder match(SpanQuery value) {
+            this.match = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code match}
+         */
+        public final Builder match(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
+            return this.match(fn.apply(new SpanQuery.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SpanFirstQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SpanFirstQuery build() {
+            _checkSingleUse();
+
+            return new SpanFirstQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SpanFirstQuery}
+     */
+    public static final JsonpDeserializer<SpanFirstQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SpanFirstQuery::setupSpanFirstQueryDeserializer
+    );
+
+    protected static void setupSpanFirstQueryDeserializer(ObjectDeserializer<SpanFirstQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::end, JsonpDeserializer.integerDeserializer(), "end");
+        op.add(Builder::match, SpanQuery._DESERIALIZER, "match");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanGapQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanGapQuery.java
index 08e05352ca..6ecdaccd4c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanGapQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanGapQuery.java
@@ -32,100 +32,101 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonParser;
+import java.util.EnumSet;
+import java.util.Objects;
+import java.util.function.Consumer;
+import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.JsonpUtils;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import jakarta.json.stream.JsonParser;
-
-import java.util.EnumSet;
-import java.util.Objects;
-import java.util.function.Consumer;
 
 @JsonpDeserializable
 public class SpanGapQuery implements SpanQueryVariant, JsonpSerializable {
 
-	private final String field;
-
-	private final int spanWidth;
-
-	@Override
-	public SpanQuery.Kind _spanQueryKind() {
-		return SpanQuery.Kind.SpanGap;
-	}
-
-	private SpanGapQuery(SpanGapQuery.Builder builder) {
-		this.field = Objects.requireNonNull(builder.field, "field");
-		this.spanWidth = Objects.requireNonNull(builder.spanWidth, "span_width");
-	}
-
-	public static SpanGapQuery of(Consumer<SpanGapQuery.Builder> fn) {
-		Builder builder = new Builder();
-		fn.accept(builder);
-		return builder.build();
-	}
-
-	public final String field() {
-		return this.field;
-	}
-
-	public final int spanWidth() {
-		return this.spanWidth;
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		generator.write(this.field, this.spanWidth);
-		generator.writeEnd();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SpanGapQuery}.
-	 */
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SpanGapQuery> {
-
-		private String field;
-		private Integer spanWidth;
-
-		public final SpanGapQuery.Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		public final SpanGapQuery.Builder spanWidth(int value) {
-			this.spanWidth = value;
-			return this;
-		}
-
-		@Override
-		public SpanGapQuery build() {
-			_checkSingleUse();
-			return new SpanGapQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SpanGapQuery}
-	 */
-	public static final JsonpDeserializer<SpanGapQuery> _DESERIALIZER = JsonpDeserializer
-			.of(EnumSet.of(JsonParser.Event.START_OBJECT), (parser, mapper) -> {
-				JsonpUtils.expectNextEvent(parser, JsonParser.Event.START_OBJECT);
-				String name = JsonpUtils.expectKeyName(parser, parser.next());
-
-				JsonpUtils.expectNextEvent(parser, JsonParser.Event.VALUE_NUMBER);
-				int spanWidth = parser.getInt();
-
-				JsonpUtils.expectNextEvent(parser, JsonParser.Event.END_OBJECT);
-
-				return new Builder().field(name).spanWidth(spanWidth).build();
-			});
+    private final String field;
+
+    private final int spanWidth;
+
+    @Override
+    public SpanQuery.Kind _spanQueryKind() {
+        return SpanQuery.Kind.SpanGap;
+    }
+
+    private SpanGapQuery(SpanGapQuery.Builder builder) {
+        this.field = Objects.requireNonNull(builder.field, "field");
+        this.spanWidth = Objects.requireNonNull(builder.spanWidth, "span_width");
+    }
+
+    public static SpanGapQuery of(Consumer<SpanGapQuery.Builder> fn) {
+        Builder builder = new Builder();
+        fn.accept(builder);
+        return builder.build();
+    }
+
+    public final String field() {
+        return this.field;
+    }
+
+    public final int spanWidth() {
+        return this.spanWidth;
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        generator.write(this.field, this.spanWidth);
+        generator.writeEnd();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SpanGapQuery}.
+     */
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SpanGapQuery> {
+
+        private String field;
+        private Integer spanWidth;
+
+        public final SpanGapQuery.Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        public final SpanGapQuery.Builder spanWidth(int value) {
+            this.spanWidth = value;
+            return this;
+        }
+
+        @Override
+        public SpanGapQuery build() {
+            _checkSingleUse();
+            return new SpanGapQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SpanGapQuery}
+     */
+    public static final JsonpDeserializer<SpanGapQuery> _DESERIALIZER = JsonpDeserializer.of(
+        EnumSet.of(JsonParser.Event.START_OBJECT),
+        (parser, mapper) -> {
+            JsonpUtils.expectNextEvent(parser, JsonParser.Event.START_OBJECT);
+            String name = JsonpUtils.expectKeyName(parser, parser.next());
+
+            JsonpUtils.expectNextEvent(parser, JsonParser.Event.VALUE_NUMBER);
+            int spanWidth = parser.getInt();
+
+            JsonpUtils.expectNextEvent(parser, JsonParser.Event.END_OBJECT);
+
+            return new Builder().field(name).spanWidth(spanWidth).build();
+        }
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanMultiTermQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanMultiTermQuery.java
index 8bd7a95c67..6e8bd4f383 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanMultiTermQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanMultiTermQuery.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,126 +41,122 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.SpanMultiTermQuery
 
-
 @JsonpDeserializable
 public class SpanMultiTermQuery extends QueryBase implements SpanQueryVariant, QueryVariant {
-	private final Query match;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SpanMultiTermQuery(Builder builder) {
-		super(builder);
-
-		this.match = ApiTypeHelper.requireNonNull(builder.match, this, "match");
-
-	}
-
-	public static SpanMultiTermQuery of(Function<Builder, ObjectBuilder<SpanMultiTermQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * SpanQuery variant kind.
-	 */
-	@Override
-	public SpanQuery.Kind _spanQueryKind() {
-		return SpanQuery.Kind.SpanMulti;
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.SpanMulti;
-	}
-
-	/**
-	 * Required - Should be a multi term query (one of wildcard, fuzzy, prefix,
-	 * range or regexp query)
-	 * <p>
-	 * API name: {@code match}
-	 */
-	public final Query match() {
-		return this.match;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("match");
-		this.match.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SpanMultiTermQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SpanMultiTermQuery> {
-		private Query match;
-
-		/**
-		 * Required - Should be a multi term query (one of wildcard, fuzzy, prefix,
-		 * range or regexp query)
-		 * <p>
-		 * API name: {@code match}
-		 */
-		public final Builder match(Query value) {
-			this.match = value;
-			return this;
-		}
-
-		/**
-		 * Required - Should be a multi term query (one of wildcard, fuzzy, prefix,
-		 * range or regexp query)
-		 * <p>
-		 * API name: {@code match}
-		 */
-		public final Builder match(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.match(fn.apply(new Query.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SpanMultiTermQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SpanMultiTermQuery build() {
-			_checkSingleUse();
-
-			return new SpanMultiTermQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SpanMultiTermQuery}
-	 */
-	public static final JsonpDeserializer<SpanMultiTermQuery> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SpanMultiTermQuery::setupSpanMultiTermQueryDeserializer);
-
-	protected static void setupSpanMultiTermQueryDeserializer(ObjectDeserializer<SpanMultiTermQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::match, Query._DESERIALIZER, "match");
-
-	}
+    private final Query match;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SpanMultiTermQuery(Builder builder) {
+        super(builder);
+
+        this.match = ApiTypeHelper.requireNonNull(builder.match, this, "match");
+
+    }
+
+    public static SpanMultiTermQuery of(Function<Builder, ObjectBuilder<SpanMultiTermQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * SpanQuery variant kind.
+     */
+    @Override
+    public SpanQuery.Kind _spanQueryKind() {
+        return SpanQuery.Kind.SpanMulti;
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.SpanMulti;
+    }
+
+    /**
+     * Required - Should be a multi term query (one of wildcard, fuzzy, prefix,
+     * range or regexp query)
+     * <p>
+     * API name: {@code match}
+     */
+    public final Query match() {
+        return this.match;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("match");
+        this.match.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SpanMultiTermQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<SpanMultiTermQuery> {
+        private Query match;
+
+        /**
+         * Required - Should be a multi term query (one of wildcard, fuzzy, prefix,
+         * range or regexp query)
+         * <p>
+         * API name: {@code match}
+         */
+        public final Builder match(Query value) {
+            this.match = value;
+            return this;
+        }
+
+        /**
+         * Required - Should be a multi term query (one of wildcard, fuzzy, prefix,
+         * range or regexp query)
+         * <p>
+         * API name: {@code match}
+         */
+        public final Builder match(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.match(fn.apply(new Query.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SpanMultiTermQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SpanMultiTermQuery build() {
+            _checkSingleUse();
+
+            return new SpanMultiTermQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SpanMultiTermQuery}
+     */
+    public static final JsonpDeserializer<SpanMultiTermQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SpanMultiTermQuery::setupSpanMultiTermQueryDeserializer
+    );
+
+    protected static void setupSpanMultiTermQueryDeserializer(ObjectDeserializer<SpanMultiTermQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::match, Query._DESERIALIZER, "match");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanNearQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanNearQuery.java
index 8db0410797..d0eeda0362 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanNearQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanNearQuery.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,196 +43,193 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.SpanNearQuery
 
-
 @JsonpDeserializable
 public class SpanNearQuery extends QueryBase implements SpanQueryVariant, QueryVariant {
-	private final List<SpanQuery> clauses;
-
-	@Nullable
-	private final Boolean inOrder;
-
-	@Nullable
-	private final Integer slop;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SpanNearQuery(Builder builder) {
-		super(builder);
-
-		this.clauses = ApiTypeHelper.unmodifiableRequired(builder.clauses, this, "clauses");
-		this.inOrder = builder.inOrder;
-		this.slop = builder.slop;
-
-	}
-
-	public static SpanNearQuery of(Function<Builder, ObjectBuilder<SpanNearQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * SpanQuery variant kind.
-	 */
-	@Override
-	public SpanQuery.Kind _spanQueryKind() {
-		return SpanQuery.Kind.SpanNear;
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.SpanNear;
-	}
-
-	/**
-	 * Required - API name: {@code clauses}
-	 */
-	public final List<SpanQuery> clauses() {
-		return this.clauses;
-	}
-
-	/**
-	 * API name: {@code in_order}
-	 */
-	@Nullable
-	public final Boolean inOrder() {
-		return this.inOrder;
-	}
-
-	/**
-	 * API name: {@code slop}
-	 */
-	@Nullable
-	public final Integer slop() {
-		return this.slop;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.clauses)) {
-			generator.writeKey("clauses");
-			generator.writeStartArray();
-			for (SpanQuery item0 : this.clauses) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.inOrder != null) {
-			generator.writeKey("in_order");
-			generator.write(this.inOrder);
-
-		}
-		if (this.slop != null) {
-			generator.writeKey("slop");
-			generator.write(this.slop);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SpanNearQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<SpanNearQuery> {
-		private List<SpanQuery> clauses;
-
-		@Nullable
-		private Boolean inOrder;
-
-		@Nullable
-		private Integer slop;
-
-		/**
-		 * Required - API name: {@code clauses}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>clauses</code>.
-		 */
-		public final Builder clauses(List<SpanQuery> list) {
-			this.clauses = _listAddAll(this.clauses, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code clauses}
-		 * <p>
-		 * Adds one or more values to <code>clauses</code>.
-		 */
-		public final Builder clauses(SpanQuery value, SpanQuery... values) {
-			this.clauses = _listAdd(this.clauses, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code clauses}
-		 * <p>
-		 * Adds a value to <code>clauses</code> using a builder lambda.
-		 */
-		public final Builder clauses(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
-			return clauses(fn.apply(new SpanQuery.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code in_order}
-		 */
-		public final Builder inOrder(@Nullable Boolean value) {
-			this.inOrder = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code slop}
-		 */
-		public final Builder slop(@Nullable Integer value) {
-			this.slop = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SpanNearQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SpanNearQuery build() {
-			_checkSingleUse();
-
-			return new SpanNearQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SpanNearQuery}
-	 */
-	public static final JsonpDeserializer<SpanNearQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SpanNearQuery::setupSpanNearQueryDeserializer);
-
-	protected static void setupSpanNearQueryDeserializer(ObjectDeserializer<SpanNearQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::clauses, JsonpDeserializer.arrayDeserializer(SpanQuery._DESERIALIZER), "clauses");
-		op.add(Builder::inOrder, JsonpDeserializer.booleanDeserializer(), "in_order");
-		op.add(Builder::slop, JsonpDeserializer.integerDeserializer(), "slop");
-
-	}
+    private final List<SpanQuery> clauses;
+
+    @Nullable
+    private final Boolean inOrder;
+
+    @Nullable
+    private final Integer slop;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SpanNearQuery(Builder builder) {
+        super(builder);
+
+        this.clauses = ApiTypeHelper.unmodifiableRequired(builder.clauses, this, "clauses");
+        this.inOrder = builder.inOrder;
+        this.slop = builder.slop;
+
+    }
+
+    public static SpanNearQuery of(Function<Builder, ObjectBuilder<SpanNearQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * SpanQuery variant kind.
+     */
+    @Override
+    public SpanQuery.Kind _spanQueryKind() {
+        return SpanQuery.Kind.SpanNear;
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.SpanNear;
+    }
+
+    /**
+     * Required - API name: {@code clauses}
+     */
+    public final List<SpanQuery> clauses() {
+        return this.clauses;
+    }
+
+    /**
+     * API name: {@code in_order}
+     */
+    @Nullable
+    public final Boolean inOrder() {
+        return this.inOrder;
+    }
+
+    /**
+     * API name: {@code slop}
+     */
+    @Nullable
+    public final Integer slop() {
+        return this.slop;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.clauses)) {
+            generator.writeKey("clauses");
+            generator.writeStartArray();
+            for (SpanQuery item0 : this.clauses) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.inOrder != null) {
+            generator.writeKey("in_order");
+            generator.write(this.inOrder);
+
+        }
+        if (this.slop != null) {
+            generator.writeKey("slop");
+            generator.write(this.slop);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SpanNearQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<SpanNearQuery> {
+        private List<SpanQuery> clauses;
+
+        @Nullable
+        private Boolean inOrder;
+
+        @Nullable
+        private Integer slop;
+
+        /**
+         * Required - API name: {@code clauses}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>clauses</code>.
+         */
+        public final Builder clauses(List<SpanQuery> list) {
+            this.clauses = _listAddAll(this.clauses, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code clauses}
+         * <p>
+         * Adds one or more values to <code>clauses</code>.
+         */
+        public final Builder clauses(SpanQuery value, SpanQuery... values) {
+            this.clauses = _listAdd(this.clauses, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code clauses}
+         * <p>
+         * Adds a value to <code>clauses</code> using a builder lambda.
+         */
+        public final Builder clauses(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
+            return clauses(fn.apply(new SpanQuery.Builder()).build());
+        }
+
+        /**
+         * API name: {@code in_order}
+         */
+        public final Builder inOrder(@Nullable Boolean value) {
+            this.inOrder = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code slop}
+         */
+        public final Builder slop(@Nullable Integer value) {
+            this.slop = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SpanNearQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SpanNearQuery build() {
+            _checkSingleUse();
+
+            return new SpanNearQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SpanNearQuery}
+     */
+    public static final JsonpDeserializer<SpanNearQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SpanNearQuery::setupSpanNearQueryDeserializer
+    );
+
+    protected static void setupSpanNearQueryDeserializer(ObjectDeserializer<SpanNearQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::clauses, JsonpDeserializer.arrayDeserializer(SpanQuery._DESERIALIZER), "clauses");
+        op.add(Builder::inOrder, JsonpDeserializer.booleanDeserializer(), "in_order");
+        op.add(Builder::slop, JsonpDeserializer.integerDeserializer(), "slop");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanNotQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanNotQuery.java
index 4040ca83cd..9b31dbf61e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanNotQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanNotQuery.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,234 +42,232 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.SpanNotQuery
 
-
 @JsonpDeserializable
 public class SpanNotQuery extends QueryBase implements SpanQueryVariant, QueryVariant {
-	@Nullable
-	private final Integer dist;
-
-	private final SpanQuery exclude;
-
-	private final SpanQuery include;
-
-	@Nullable
-	private final Integer post;
-
-	@Nullable
-	private final Integer pre;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SpanNotQuery(Builder builder) {
-		super(builder);
-
-		this.dist = builder.dist;
-		this.exclude = ApiTypeHelper.requireNonNull(builder.exclude, this, "exclude");
-		this.include = ApiTypeHelper.requireNonNull(builder.include, this, "include");
-		this.post = builder.post;
-		this.pre = builder.pre;
-
-	}
-
-	public static SpanNotQuery of(Function<Builder, ObjectBuilder<SpanNotQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * SpanQuery variant kind.
-	 */
-	@Override
-	public SpanQuery.Kind _spanQueryKind() {
-		return SpanQuery.Kind.SpanNot;
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.SpanNot;
-	}
-
-	/**
-	 * API name: {@code dist}
-	 */
-	@Nullable
-	public final Integer dist() {
-		return this.dist;
-	}
-
-	/**
-	 * Required - API name: {@code exclude}
-	 */
-	public final SpanQuery exclude() {
-		return this.exclude;
-	}
-
-	/**
-	 * Required - API name: {@code include}
-	 */
-	public final SpanQuery include() {
-		return this.include;
-	}
-
-	/**
-	 * API name: {@code post}
-	 */
-	@Nullable
-	public final Integer post() {
-		return this.post;
-	}
-
-	/**
-	 * API name: {@code pre}
-	 */
-	@Nullable
-	public final Integer pre() {
-		return this.pre;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.dist != null) {
-			generator.writeKey("dist");
-			generator.write(this.dist);
-
-		}
-		generator.writeKey("exclude");
-		this.exclude.serialize(generator, mapper);
-
-		generator.writeKey("include");
-		this.include.serialize(generator, mapper);
-
-		if (this.post != null) {
-			generator.writeKey("post");
-			generator.write(this.post);
-
-		}
-		if (this.pre != null) {
-			generator.writeKey("pre");
-			generator.write(this.pre);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SpanNotQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<SpanNotQuery> {
-		@Nullable
-		private Integer dist;
-
-		private SpanQuery exclude;
-
-		private SpanQuery include;
-
-		@Nullable
-		private Integer post;
-
-		@Nullable
-		private Integer pre;
-
-		/**
-		 * API name: {@code dist}
-		 */
-		public final Builder dist(@Nullable Integer value) {
-			this.dist = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code exclude}
-		 */
-		public final Builder exclude(SpanQuery value) {
-			this.exclude = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code exclude}
-		 */
-		public final Builder exclude(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
-			return this.exclude(fn.apply(new SpanQuery.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code include}
-		 */
-		public final Builder include(SpanQuery value) {
-			this.include = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code include}
-		 */
-		public final Builder include(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
-			return this.include(fn.apply(new SpanQuery.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code post}
-		 */
-		public final Builder post(@Nullable Integer value) {
-			this.post = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code pre}
-		 */
-		public final Builder pre(@Nullable Integer value) {
-			this.pre = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SpanNotQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SpanNotQuery build() {
-			_checkSingleUse();
-
-			return new SpanNotQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SpanNotQuery}
-	 */
-	public static final JsonpDeserializer<SpanNotQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SpanNotQuery::setupSpanNotQueryDeserializer);
-
-	protected static void setupSpanNotQueryDeserializer(ObjectDeserializer<SpanNotQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::dist, JsonpDeserializer.integerDeserializer(), "dist");
-		op.add(Builder::exclude, SpanQuery._DESERIALIZER, "exclude");
-		op.add(Builder::include, SpanQuery._DESERIALIZER, "include");
-		op.add(Builder::post, JsonpDeserializer.integerDeserializer(), "post");
-		op.add(Builder::pre, JsonpDeserializer.integerDeserializer(), "pre");
-
-	}
+    @Nullable
+    private final Integer dist;
+
+    private final SpanQuery exclude;
+
+    private final SpanQuery include;
+
+    @Nullable
+    private final Integer post;
+
+    @Nullable
+    private final Integer pre;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SpanNotQuery(Builder builder) {
+        super(builder);
+
+        this.dist = builder.dist;
+        this.exclude = ApiTypeHelper.requireNonNull(builder.exclude, this, "exclude");
+        this.include = ApiTypeHelper.requireNonNull(builder.include, this, "include");
+        this.post = builder.post;
+        this.pre = builder.pre;
+
+    }
+
+    public static SpanNotQuery of(Function<Builder, ObjectBuilder<SpanNotQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * SpanQuery variant kind.
+     */
+    @Override
+    public SpanQuery.Kind _spanQueryKind() {
+        return SpanQuery.Kind.SpanNot;
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.SpanNot;
+    }
+
+    /**
+     * API name: {@code dist}
+     */
+    @Nullable
+    public final Integer dist() {
+        return this.dist;
+    }
+
+    /**
+     * Required - API name: {@code exclude}
+     */
+    public final SpanQuery exclude() {
+        return this.exclude;
+    }
+
+    /**
+     * Required - API name: {@code include}
+     */
+    public final SpanQuery include() {
+        return this.include;
+    }
+
+    /**
+     * API name: {@code post}
+     */
+    @Nullable
+    public final Integer post() {
+        return this.post;
+    }
+
+    /**
+     * API name: {@code pre}
+     */
+    @Nullable
+    public final Integer pre() {
+        return this.pre;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.dist != null) {
+            generator.writeKey("dist");
+            generator.write(this.dist);
+
+        }
+        generator.writeKey("exclude");
+        this.exclude.serialize(generator, mapper);
+
+        generator.writeKey("include");
+        this.include.serialize(generator, mapper);
+
+        if (this.post != null) {
+            generator.writeKey("post");
+            generator.write(this.post);
+
+        }
+        if (this.pre != null) {
+            generator.writeKey("pre");
+            generator.write(this.pre);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SpanNotQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<SpanNotQuery> {
+        @Nullable
+        private Integer dist;
+
+        private SpanQuery exclude;
+
+        private SpanQuery include;
+
+        @Nullable
+        private Integer post;
+
+        @Nullable
+        private Integer pre;
+
+        /**
+         * API name: {@code dist}
+         */
+        public final Builder dist(@Nullable Integer value) {
+            this.dist = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code exclude}
+         */
+        public final Builder exclude(SpanQuery value) {
+            this.exclude = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code exclude}
+         */
+        public final Builder exclude(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
+            return this.exclude(fn.apply(new SpanQuery.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code include}
+         */
+        public final Builder include(SpanQuery value) {
+            this.include = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code include}
+         */
+        public final Builder include(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
+            return this.include(fn.apply(new SpanQuery.Builder()).build());
+        }
+
+        /**
+         * API name: {@code post}
+         */
+        public final Builder post(@Nullable Integer value) {
+            this.post = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code pre}
+         */
+        public final Builder pre(@Nullable Integer value) {
+            this.pre = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SpanNotQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SpanNotQuery build() {
+            _checkSingleUse();
+
+            return new SpanNotQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SpanNotQuery}
+     */
+    public static final JsonpDeserializer<SpanNotQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SpanNotQuery::setupSpanNotQueryDeserializer
+    );
+
+    protected static void setupSpanNotQueryDeserializer(ObjectDeserializer<SpanNotQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::dist, JsonpDeserializer.integerDeserializer(), "dist");
+        op.add(Builder::exclude, SpanQuery._DESERIALIZER, "exclude");
+        op.add(Builder::include, SpanQuery._DESERIALIZER, "include");
+        op.add(Builder::post, JsonpDeserializer.integerDeserializer(), "post");
+        op.add(Builder::pre, JsonpDeserializer.integerDeserializer(), "pre");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanOrQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanOrQuery.java
index e240c5c993..90b9403f6e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanOrQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanOrQuery.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,137 +42,135 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.SpanOrQuery
 
-
 @JsonpDeserializable
 public class SpanOrQuery extends QueryBase implements SpanQueryVariant, QueryVariant {
-	private final List<SpanQuery> clauses;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SpanOrQuery(Builder builder) {
-		super(builder);
-
-		this.clauses = ApiTypeHelper.unmodifiableRequired(builder.clauses, this, "clauses");
-
-	}
-
-	public static SpanOrQuery of(Function<Builder, ObjectBuilder<SpanOrQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * SpanQuery variant kind.
-	 */
-	@Override
-	public SpanQuery.Kind _spanQueryKind() {
-		return SpanQuery.Kind.SpanOr;
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.SpanOr;
-	}
-
-	/**
-	 * Required - API name: {@code clauses}
-	 */
-	public final List<SpanQuery> clauses() {
-		return this.clauses;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.clauses)) {
-			generator.writeKey("clauses");
-			generator.writeStartArray();
-			for (SpanQuery item0 : this.clauses) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SpanOrQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<SpanOrQuery> {
-		private List<SpanQuery> clauses;
-
-		/**
-		 * Required - API name: {@code clauses}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>clauses</code>.
-		 */
-		public final Builder clauses(List<SpanQuery> list) {
-			this.clauses = _listAddAll(this.clauses, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code clauses}
-		 * <p>
-		 * Adds one or more values to <code>clauses</code>.
-		 */
-		public final Builder clauses(SpanQuery value, SpanQuery... values) {
-			this.clauses = _listAdd(this.clauses, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code clauses}
-		 * <p>
-		 * Adds a value to <code>clauses</code> using a builder lambda.
-		 */
-		public final Builder clauses(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
-			return clauses(fn.apply(new SpanQuery.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SpanOrQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SpanOrQuery build() {
-			_checkSingleUse();
-
-			return new SpanOrQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SpanOrQuery}
-	 */
-	public static final JsonpDeserializer<SpanOrQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SpanOrQuery::setupSpanOrQueryDeserializer);
-
-	protected static void setupSpanOrQueryDeserializer(ObjectDeserializer<SpanOrQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::clauses, JsonpDeserializer.arrayDeserializer(SpanQuery._DESERIALIZER), "clauses");
-
-	}
+    private final List<SpanQuery> clauses;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SpanOrQuery(Builder builder) {
+        super(builder);
+
+        this.clauses = ApiTypeHelper.unmodifiableRequired(builder.clauses, this, "clauses");
+
+    }
+
+    public static SpanOrQuery of(Function<Builder, ObjectBuilder<SpanOrQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * SpanQuery variant kind.
+     */
+    @Override
+    public SpanQuery.Kind _spanQueryKind() {
+        return SpanQuery.Kind.SpanOr;
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.SpanOr;
+    }
+
+    /**
+     * Required - API name: {@code clauses}
+     */
+    public final List<SpanQuery> clauses() {
+        return this.clauses;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.clauses)) {
+            generator.writeKey("clauses");
+            generator.writeStartArray();
+            for (SpanQuery item0 : this.clauses) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SpanOrQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<SpanOrQuery> {
+        private List<SpanQuery> clauses;
+
+        /**
+         * Required - API name: {@code clauses}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>clauses</code>.
+         */
+        public final Builder clauses(List<SpanQuery> list) {
+            this.clauses = _listAddAll(this.clauses, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code clauses}
+         * <p>
+         * Adds one or more values to <code>clauses</code>.
+         */
+        public final Builder clauses(SpanQuery value, SpanQuery... values) {
+            this.clauses = _listAdd(this.clauses, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code clauses}
+         * <p>
+         * Adds a value to <code>clauses</code> using a builder lambda.
+         */
+        public final Builder clauses(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
+            return clauses(fn.apply(new SpanQuery.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SpanOrQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SpanOrQuery build() {
+            _checkSingleUse();
+
+            return new SpanOrQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SpanOrQuery}
+     */
+    public static final JsonpDeserializer<SpanOrQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SpanOrQuery::setupSpanOrQueryDeserializer
+    );
+
+    protected static void setupSpanOrQueryDeserializer(ObjectDeserializer<SpanOrQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::clauses, JsonpDeserializer.arrayDeserializer(SpanQuery._DESERIALIZER), "clauses");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanQuery.java
index 8141f35dd9..a83956560f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanQuery.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -44,405 +46,401 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.SpanQuery
 
-
 @JsonpDeserializable
 public class SpanQuery implements TaggedUnion<SpanQuery.Kind, Object>, JsonpSerializable {
 
-	/**
-	 * {@link SpanQuery} variant kinds.
-	 */
-	/**
-	 * {@link SpanQuery} variant kinds.
-	 */
+    /**
+     * {@link SpanQuery} variant kinds.
+     */
+    /**
+     * {@link SpanQuery} variant kinds.
+     */
 
-	public enum Kind implements JsonEnum {
-		SpanContaining("span_containing"),
+    public enum Kind implements JsonEnum {
+        SpanContaining("span_containing"),
 
-		FieldMaskingSpan("field_masking_span"),
+        FieldMaskingSpan("field_masking_span"),
 
-		SpanFirst("span_first"),
+        SpanFirst("span_first"),
 
-		SpanGap("span_gap"),
+        SpanGap("span_gap"),
 
-		SpanMulti("span_multi"),
+        SpanMulti("span_multi"),
 
-		SpanNear("span_near"),
+        SpanNear("span_near"),
 
-		SpanNot("span_not"),
+        SpanNot("span_not"),
 
-		SpanOr("span_or"),
+        SpanOr("span_or"),
 
-		SpanTerm("span_term"),
+        SpanTerm("span_term"),
 
-		SpanWithin("span_within"),
+        SpanWithin("span_within"),
 
-		;
+        ;
 
-		private final String jsonValue;
+        private final String jsonValue;
 
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
 
-		public String jsonValue() {
-			return this.jsonValue;
-		}
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	public SpanQuery(SpanQueryVariant value) {
-
-		this._kind = ApiTypeHelper.requireNonNull(value._spanQueryKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
-
-	}
-
-	private SpanQuery(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static SpanQuery of(Function<Builder, ObjectBuilder<SpanQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code span_containing}?
-	 */
-	public boolean isSpanContaining() {
-		return _kind == Kind.SpanContaining;
-	}
-
-	/**
-	 * Get the {@code span_containing} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code span_containing}
-	 *             kind.
-	 */
-	public SpanContainingQuery spanContaining() {
-		return TaggedUnionUtils.get(this, Kind.SpanContaining);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code field_masking_span}?
-	 */
-	public boolean isFieldMaskingSpan() {
-		return _kind == Kind.FieldMaskingSpan;
-	}
-
-	/**
-	 * Get the {@code field_masking_span} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code field_masking_span}
-	 *             kind.
-	 */
-	public SpanFieldMaskingQuery fieldMaskingSpan() {
-		return TaggedUnionUtils.get(this, Kind.FieldMaskingSpan);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code span_first}?
-	 */
-	public boolean isSpanFirst() {
-		return _kind == Kind.SpanFirst;
-	}
-
-	/**
-	 * Get the {@code span_first} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code span_first} kind.
-	 */
-	public SpanFirstQuery spanFirst() {
-		return TaggedUnionUtils.get(this, Kind.SpanFirst);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code span_gap}?
-	 */
-	public boolean isSpanGap() {
-		return _kind == Kind.SpanGap;
-	}
-
-	/**
-	 * Get the {@code span_gap} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code span_gap} kind.
-	 */
-	public SpanGapQuery spanGap() {
-		return TaggedUnionUtils.get(this, Kind.SpanGap);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code span_multi}?
-	 */
-	public boolean isSpanMulti() {
-		return _kind == Kind.SpanMulti;
-	}
-
-	/**
-	 * Get the {@code span_multi} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code span_multi} kind.
-	 */
-	public SpanMultiTermQuery spanMulti() {
-		return TaggedUnionUtils.get(this, Kind.SpanMulti);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code span_near}?
-	 */
-	public boolean isSpanNear() {
-		return _kind == Kind.SpanNear;
-	}
-
-	/**
-	 * Get the {@code span_near} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code span_near} kind.
-	 */
-	public SpanNearQuery spanNear() {
-		return TaggedUnionUtils.get(this, Kind.SpanNear);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code span_not}?
-	 */
-	public boolean isSpanNot() {
-		return _kind == Kind.SpanNot;
-	}
-
-	/**
-	 * Get the {@code span_not} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code span_not} kind.
-	 */
-	public SpanNotQuery spanNot() {
-		return TaggedUnionUtils.get(this, Kind.SpanNot);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code span_or}?
-	 */
-	public boolean isSpanOr() {
-		return _kind == Kind.SpanOr;
-	}
-
-	/**
-	 * Get the {@code span_or} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code span_or} kind.
-	 */
-	public SpanOrQuery spanOr() {
-		return TaggedUnionUtils.get(this, Kind.SpanOr);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code span_term}?
-	 */
-	public boolean isSpanTerm() {
-		return _kind == Kind.SpanTerm;
-	}
-
-	/**
-	 * Get the {@code span_term} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code span_term} kind.
-	 */
-	public SpanTermQuery spanTerm() {
-		return TaggedUnionUtils.get(this, Kind.SpanTerm);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code span_within}?
-	 */
-	public boolean isSpanWithin() {
-		return _kind == Kind.SpanWithin;
-	}
-
-	/**
-	 * Get the {@code span_within} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code span_within} kind.
-	 */
-	public SpanWithinQuery spanWithin() {
-		return TaggedUnionUtils.get(this, Kind.SpanWithin);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeStartObject();
-
-		generator.writeKey(_kind.jsonValue());
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		}
-
-		generator.writeEnd();
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SpanQuery> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<SpanQuery> spanContaining(SpanContainingQuery v) {
-			this._kind = Kind.SpanContaining;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SpanQuery> spanContaining(
-				Function<SpanContainingQuery.Builder, ObjectBuilder<SpanContainingQuery>> fn) {
-			return this.spanContaining(fn.apply(new SpanContainingQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<SpanQuery> fieldMaskingSpan(SpanFieldMaskingQuery v) {
-			this._kind = Kind.FieldMaskingSpan;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SpanQuery> fieldMaskingSpan(
-				Function<SpanFieldMaskingQuery.Builder, ObjectBuilder<SpanFieldMaskingQuery>> fn) {
-			return this.fieldMaskingSpan(fn.apply(new SpanFieldMaskingQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<SpanQuery> spanFirst(SpanFirstQuery v) {
-			this._kind = Kind.SpanFirst;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SpanQuery> spanFirst(Function<SpanFirstQuery.Builder, ObjectBuilder<SpanFirstQuery>> fn) {
-			return this.spanFirst(fn.apply(new SpanFirstQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<SpanQuery> spanGap(SpanGapQuery v) {
-			this._kind = Kind.SpanGap;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SpanQuery> spanGap(Function<SpanGapQuery.Builder, ObjectBuilder<SpanGapQuery>> fn) {
-			return this.spanGap(fn.apply(new SpanGapQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<SpanQuery> spanMulti(SpanMultiTermQuery v) {
-			this._kind = Kind.SpanMulti;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SpanQuery> spanMulti(
-				Function<SpanMultiTermQuery.Builder, ObjectBuilder<SpanMultiTermQuery>> fn) {
-			return this.spanMulti(fn.apply(new SpanMultiTermQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<SpanQuery> spanNear(SpanNearQuery v) {
-			this._kind = Kind.SpanNear;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SpanQuery> spanNear(Function<SpanNearQuery.Builder, ObjectBuilder<SpanNearQuery>> fn) {
-			return this.spanNear(fn.apply(new SpanNearQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<SpanQuery> spanNot(SpanNotQuery v) {
-			this._kind = Kind.SpanNot;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SpanQuery> spanNot(Function<SpanNotQuery.Builder, ObjectBuilder<SpanNotQuery>> fn) {
-			return this.spanNot(fn.apply(new SpanNotQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<SpanQuery> spanOr(SpanOrQuery v) {
-			this._kind = Kind.SpanOr;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SpanQuery> spanOr(Function<SpanOrQuery.Builder, ObjectBuilder<SpanOrQuery>> fn) {
-			return this.spanOr(fn.apply(new SpanOrQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<SpanQuery> spanTerm(SpanTermQuery v) {
-			this._kind = Kind.SpanTerm;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SpanQuery> spanTerm(Function<SpanTermQuery.Builder, ObjectBuilder<SpanTermQuery>> fn) {
-			return this.spanTerm(fn.apply(new SpanTermQuery.Builder()).build());
-		}
-
-		public ObjectBuilder<SpanQuery> spanWithin(SpanWithinQuery v) {
-			this._kind = Kind.SpanWithin;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SpanQuery> spanWithin(
-				Function<SpanWithinQuery.Builder, ObjectBuilder<SpanWithinQuery>> fn) {
-			return this.spanWithin(fn.apply(new SpanWithinQuery.Builder()).build());
-		}
-
-		public SpanQuery build() {
-			_checkSingleUse();
-			return new SpanQuery(this);
-		}
-
-	}
-
-	protected static void setupSpanQueryDeserializer(ObjectDeserializer<Builder> op) {
-
-		op.add(Builder::spanContaining, SpanContainingQuery._DESERIALIZER, "span_containing");
-		op.add(Builder::fieldMaskingSpan, SpanFieldMaskingQuery._DESERIALIZER, "field_masking_span");
-		op.add(Builder::spanFirst, SpanFirstQuery._DESERIALIZER, "span_first");
-		op.add(Builder::spanGap, SpanGapQuery._DESERIALIZER, "span_gap");
-		op.add(Builder::spanMulti, SpanMultiTermQuery._DESERIALIZER, "span_multi");
-		op.add(Builder::spanNear, SpanNearQuery._DESERIALIZER, "span_near");
-		op.add(Builder::spanNot, SpanNotQuery._DESERIALIZER, "span_not");
-		op.add(Builder::spanOr, SpanOrQuery._DESERIALIZER, "span_or");
-		op.add(Builder::spanTerm, SpanTermQuery._DESERIALIZER, "span_term");
-		op.add(Builder::spanWithin, SpanWithinQuery._DESERIALIZER, "span_within");
-
-	}
-
-	public static final JsonpDeserializer<SpanQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SpanQuery::setupSpanQueryDeserializer, Builder::build);
+        public String jsonValue() {
+            return this.jsonValue;
+        }
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    public SpanQuery(SpanQueryVariant value) {
+
+        this._kind = ApiTypeHelper.requireNonNull(value._spanQueryKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+
+    }
+
+    private SpanQuery(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static SpanQuery of(Function<Builder, ObjectBuilder<SpanQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code span_containing}?
+     */
+    public boolean isSpanContaining() {
+        return _kind == Kind.SpanContaining;
+    }
+
+    /**
+     * Get the {@code span_containing} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code span_containing}
+     *             kind.
+     */
+    public SpanContainingQuery spanContaining() {
+        return TaggedUnionUtils.get(this, Kind.SpanContaining);
+    }
+
+    /**
+     * Is this variant instance of kind {@code field_masking_span}?
+     */
+    public boolean isFieldMaskingSpan() {
+        return _kind == Kind.FieldMaskingSpan;
+    }
+
+    /**
+     * Get the {@code field_masking_span} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code field_masking_span}
+     *             kind.
+     */
+    public SpanFieldMaskingQuery fieldMaskingSpan() {
+        return TaggedUnionUtils.get(this, Kind.FieldMaskingSpan);
+    }
+
+    /**
+     * Is this variant instance of kind {@code span_first}?
+     */
+    public boolean isSpanFirst() {
+        return _kind == Kind.SpanFirst;
+    }
+
+    /**
+     * Get the {@code span_first} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code span_first} kind.
+     */
+    public SpanFirstQuery spanFirst() {
+        return TaggedUnionUtils.get(this, Kind.SpanFirst);
+    }
+
+    /**
+     * Is this variant instance of kind {@code span_gap}?
+     */
+    public boolean isSpanGap() {
+        return _kind == Kind.SpanGap;
+    }
+
+    /**
+     * Get the {@code span_gap} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code span_gap} kind.
+     */
+    public SpanGapQuery spanGap() {
+        return TaggedUnionUtils.get(this, Kind.SpanGap);
+    }
+
+    /**
+     * Is this variant instance of kind {@code span_multi}?
+     */
+    public boolean isSpanMulti() {
+        return _kind == Kind.SpanMulti;
+    }
+
+    /**
+     * Get the {@code span_multi} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code span_multi} kind.
+     */
+    public SpanMultiTermQuery spanMulti() {
+        return TaggedUnionUtils.get(this, Kind.SpanMulti);
+    }
+
+    /**
+     * Is this variant instance of kind {@code span_near}?
+     */
+    public boolean isSpanNear() {
+        return _kind == Kind.SpanNear;
+    }
+
+    /**
+     * Get the {@code span_near} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code span_near} kind.
+     */
+    public SpanNearQuery spanNear() {
+        return TaggedUnionUtils.get(this, Kind.SpanNear);
+    }
+
+    /**
+     * Is this variant instance of kind {@code span_not}?
+     */
+    public boolean isSpanNot() {
+        return _kind == Kind.SpanNot;
+    }
+
+    /**
+     * Get the {@code span_not} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code span_not} kind.
+     */
+    public SpanNotQuery spanNot() {
+        return TaggedUnionUtils.get(this, Kind.SpanNot);
+    }
+
+    /**
+     * Is this variant instance of kind {@code span_or}?
+     */
+    public boolean isSpanOr() {
+        return _kind == Kind.SpanOr;
+    }
+
+    /**
+     * Get the {@code span_or} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code span_or} kind.
+     */
+    public SpanOrQuery spanOr() {
+        return TaggedUnionUtils.get(this, Kind.SpanOr);
+    }
+
+    /**
+     * Is this variant instance of kind {@code span_term}?
+     */
+    public boolean isSpanTerm() {
+        return _kind == Kind.SpanTerm;
+    }
+
+    /**
+     * Get the {@code span_term} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code span_term} kind.
+     */
+    public SpanTermQuery spanTerm() {
+        return TaggedUnionUtils.get(this, Kind.SpanTerm);
+    }
+
+    /**
+     * Is this variant instance of kind {@code span_within}?
+     */
+    public boolean isSpanWithin() {
+        return _kind == Kind.SpanWithin;
+    }
+
+    /**
+     * Get the {@code span_within} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code span_within} kind.
+     */
+    public SpanWithinQuery spanWithin() {
+        return TaggedUnionUtils.get(this, Kind.SpanWithin);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeStartObject();
+
+        generator.writeKey(_kind.jsonValue());
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        }
+
+        generator.writeEnd();
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SpanQuery> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<SpanQuery> spanContaining(SpanContainingQuery v) {
+            this._kind = Kind.SpanContaining;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SpanQuery> spanContaining(Function<SpanContainingQuery.Builder, ObjectBuilder<SpanContainingQuery>> fn) {
+            return this.spanContaining(fn.apply(new SpanContainingQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<SpanQuery> fieldMaskingSpan(SpanFieldMaskingQuery v) {
+            this._kind = Kind.FieldMaskingSpan;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SpanQuery> fieldMaskingSpan(Function<SpanFieldMaskingQuery.Builder, ObjectBuilder<SpanFieldMaskingQuery>> fn) {
+            return this.fieldMaskingSpan(fn.apply(new SpanFieldMaskingQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<SpanQuery> spanFirst(SpanFirstQuery v) {
+            this._kind = Kind.SpanFirst;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SpanQuery> spanFirst(Function<SpanFirstQuery.Builder, ObjectBuilder<SpanFirstQuery>> fn) {
+            return this.spanFirst(fn.apply(new SpanFirstQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<SpanQuery> spanGap(SpanGapQuery v) {
+            this._kind = Kind.SpanGap;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SpanQuery> spanGap(Function<SpanGapQuery.Builder, ObjectBuilder<SpanGapQuery>> fn) {
+            return this.spanGap(fn.apply(new SpanGapQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<SpanQuery> spanMulti(SpanMultiTermQuery v) {
+            this._kind = Kind.SpanMulti;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SpanQuery> spanMulti(Function<SpanMultiTermQuery.Builder, ObjectBuilder<SpanMultiTermQuery>> fn) {
+            return this.spanMulti(fn.apply(new SpanMultiTermQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<SpanQuery> spanNear(SpanNearQuery v) {
+            this._kind = Kind.SpanNear;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SpanQuery> spanNear(Function<SpanNearQuery.Builder, ObjectBuilder<SpanNearQuery>> fn) {
+            return this.spanNear(fn.apply(new SpanNearQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<SpanQuery> spanNot(SpanNotQuery v) {
+            this._kind = Kind.SpanNot;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SpanQuery> spanNot(Function<SpanNotQuery.Builder, ObjectBuilder<SpanNotQuery>> fn) {
+            return this.spanNot(fn.apply(new SpanNotQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<SpanQuery> spanOr(SpanOrQuery v) {
+            this._kind = Kind.SpanOr;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SpanQuery> spanOr(Function<SpanOrQuery.Builder, ObjectBuilder<SpanOrQuery>> fn) {
+            return this.spanOr(fn.apply(new SpanOrQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<SpanQuery> spanTerm(SpanTermQuery v) {
+            this._kind = Kind.SpanTerm;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SpanQuery> spanTerm(Function<SpanTermQuery.Builder, ObjectBuilder<SpanTermQuery>> fn) {
+            return this.spanTerm(fn.apply(new SpanTermQuery.Builder()).build());
+        }
+
+        public ObjectBuilder<SpanQuery> spanWithin(SpanWithinQuery v) {
+            this._kind = Kind.SpanWithin;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SpanQuery> spanWithin(Function<SpanWithinQuery.Builder, ObjectBuilder<SpanWithinQuery>> fn) {
+            return this.spanWithin(fn.apply(new SpanWithinQuery.Builder()).build());
+        }
+
+        public SpanQuery build() {
+            _checkSingleUse();
+            return new SpanQuery(this);
+        }
+
+    }
+
+    protected static void setupSpanQueryDeserializer(ObjectDeserializer<Builder> op) {
+
+        op.add(Builder::spanContaining, SpanContainingQuery._DESERIALIZER, "span_containing");
+        op.add(Builder::fieldMaskingSpan, SpanFieldMaskingQuery._DESERIALIZER, "field_masking_span");
+        op.add(Builder::spanFirst, SpanFirstQuery._DESERIALIZER, "span_first");
+        op.add(Builder::spanGap, SpanGapQuery._DESERIALIZER, "span_gap");
+        op.add(Builder::spanMulti, SpanMultiTermQuery._DESERIALIZER, "span_multi");
+        op.add(Builder::spanNear, SpanNearQuery._DESERIALIZER, "span_near");
+        op.add(Builder::spanNot, SpanNotQuery._DESERIALIZER, "span_not");
+        op.add(Builder::spanOr, SpanOrQuery._DESERIALIZER, "span_or");
+        op.add(Builder::spanTerm, SpanTermQuery._DESERIALIZER, "span_term");
+        op.add(Builder::spanWithin, SpanWithinQuery._DESERIALIZER, "span_within");
+
+    }
+
+    public static final JsonpDeserializer<SpanQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SpanQuery::setupSpanQueryDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanQueryBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanQueryBuilders.java
index 069421213b..461caab33f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanQueryBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanQueryBuilders.java
@@ -36,87 +36,86 @@
  * Builders for {@link SpanQuery} variants.
  */
 public class SpanQueryBuilders {
-	private SpanQueryBuilders() {
-	}
+    private SpanQueryBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link SpanContainingQuery span_containing}
-	 * {@code SpanQuery} variant.
-	 */
-	public static SpanContainingQuery.Builder spanContaining() {
-		return new SpanContainingQuery.Builder();
-	}
+    /**
+     * Creates a builder for the {@link SpanContainingQuery span_containing}
+     * {@code SpanQuery} variant.
+     */
+    public static SpanContainingQuery.Builder spanContaining() {
+        return new SpanContainingQuery.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link SpanFieldMaskingQuery field_masking_span}
-	 * {@code SpanQuery} variant.
-	 */
-	public static SpanFieldMaskingQuery.Builder fieldMaskingSpan() {
-		return new SpanFieldMaskingQuery.Builder();
-	}
+    /**
+     * Creates a builder for the {@link SpanFieldMaskingQuery field_masking_span}
+     * {@code SpanQuery} variant.
+     */
+    public static SpanFieldMaskingQuery.Builder fieldMaskingSpan() {
+        return new SpanFieldMaskingQuery.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link SpanFirstQuery span_first} {@code SpanQuery}
-	 * variant.
-	 */
-	public static SpanFirstQuery.Builder spanFirst() {
-		return new SpanFirstQuery.Builder();
-	}
+    /**
+     * Creates a builder for the {@link SpanFirstQuery span_first} {@code SpanQuery}
+     * variant.
+     */
+    public static SpanFirstQuery.Builder spanFirst() {
+        return new SpanFirstQuery.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link SpanGapQuery span_gap} {@code SpanQuery}
-	 * variant.
-	 */
-	public static SpanGapQuery.Builder spanGap() {
-		return new SpanGapQuery.Builder();
-	}
+    /**
+     * Creates a builder for the {@link SpanGapQuery span_gap} {@code SpanQuery}
+     * variant.
+     */
+    public static SpanGapQuery.Builder spanGap() {
+        return new SpanGapQuery.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link SpanMultiTermQuery span_multi}
-	 * {@code SpanQuery} variant.
-	 */
-	public static SpanMultiTermQuery.Builder spanMulti() {
-		return new SpanMultiTermQuery.Builder();
-	}
+    /**
+     * Creates a builder for the {@link SpanMultiTermQuery span_multi}
+     * {@code SpanQuery} variant.
+     */
+    public static SpanMultiTermQuery.Builder spanMulti() {
+        return new SpanMultiTermQuery.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link SpanNearQuery span_near} {@code SpanQuery}
-	 * variant.
-	 */
-	public static SpanNearQuery.Builder spanNear() {
-		return new SpanNearQuery.Builder();
-	}
+    /**
+     * Creates a builder for the {@link SpanNearQuery span_near} {@code SpanQuery}
+     * variant.
+     */
+    public static SpanNearQuery.Builder spanNear() {
+        return new SpanNearQuery.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link SpanNotQuery span_not} {@code SpanQuery}
-	 * variant.
-	 */
-	public static SpanNotQuery.Builder spanNot() {
-		return new SpanNotQuery.Builder();
-	}
+    /**
+     * Creates a builder for the {@link SpanNotQuery span_not} {@code SpanQuery}
+     * variant.
+     */
+    public static SpanNotQuery.Builder spanNot() {
+        return new SpanNotQuery.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link SpanOrQuery span_or} {@code SpanQuery}
-	 * variant.
-	 */
-	public static SpanOrQuery.Builder spanOr() {
-		return new SpanOrQuery.Builder();
-	}
+    /**
+     * Creates a builder for the {@link SpanOrQuery span_or} {@code SpanQuery}
+     * variant.
+     */
+    public static SpanOrQuery.Builder spanOr() {
+        return new SpanOrQuery.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link SpanTermQuery span_term} {@code SpanQuery}
-	 * variant.
-	 */
-	public static SpanTermQuery.Builder spanTerm() {
-		return new SpanTermQuery.Builder();
-	}
+    /**
+     * Creates a builder for the {@link SpanTermQuery span_term} {@code SpanQuery}
+     * variant.
+     */
+    public static SpanTermQuery.Builder spanTerm() {
+        return new SpanTermQuery.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link SpanWithinQuery span_within}
-	 * {@code SpanQuery} variant.
-	 */
-	public static SpanWithinQuery.Builder spanWithin() {
-		return new SpanWithinQuery.Builder();
-	}
+    /**
+     * Creates a builder for the {@link SpanWithinQuery span_within}
+     * {@code SpanQuery} variant.
+     */
+    public static SpanWithinQuery.Builder spanWithin() {
+        return new SpanWithinQuery.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanQueryVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanQueryVariant.java
index f791a910fd..cb4a6dcd0e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanQueryVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanQueryVariant.java
@@ -37,10 +37,10 @@
  */
 public interface SpanQueryVariant {
 
-	SpanQuery.Kind _spanQueryKind();
+    SpanQuery.Kind _spanQueryKind();
 
-	default SpanQuery _toSpanQuery() {
-		return new SpanQuery(this);
-	}
+    default SpanQuery _toSpanQuery() {
+        return new SpanQuery(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanTermQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanTermQuery.java
index 8be679f74f..d76e10593d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanTermQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanTermQuery.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,134 +41,133 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.SpanTermQuery
 
-
 @JsonpDeserializable
 public class SpanTermQuery extends QueryBase implements SpanQueryVariant, QueryVariant {
-	// Single key dictionary
-	private final String field;
-
-	private final String value;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SpanTermQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-
-		this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
-
-	}
-
-	public static SpanTermQuery of(Function<Builder, ObjectBuilder<SpanTermQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * SpanQuery variant kind.
-	 */
-	@Override
-	public SpanQuery.Kind _spanQueryKind() {
-		return SpanQuery.Kind.SpanTerm;
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.SpanTerm;
-	}
-
-	/**
-	 * Required - The target field
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required - API name: {@code value}
-	 */
-	public final String value() {
-		return this.value;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject(this.field);
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("value");
-		generator.write(this.value);
-
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SpanTermQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<SpanTermQuery> {
-		private String field;
-
-		/**
-		 * Required - The target field
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		private String value;
-
-		/**
-		 * Required - API name: {@code value}
-		 */
-		public final Builder value(String value) {
-			this.value = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SpanTermQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SpanTermQuery build() {
-			_checkSingleUse();
-
-			return new SpanTermQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SpanTermQuery}
-	 */
-	public static final JsonpDeserializer<SpanTermQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SpanTermQuery::setupSpanTermQueryDeserializer);
-
-	protected static void setupSpanTermQueryDeserializer(ObjectDeserializer<SpanTermQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::value, JsonpDeserializer.stringDeserializer(), "value");
-
-		op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
-		op.shortcutProperty("value");
-
-	}
+    // Single key dictionary
+    private final String field;
+
+    private final String value;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SpanTermQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+
+        this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
+
+    }
+
+    public static SpanTermQuery of(Function<Builder, ObjectBuilder<SpanTermQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * SpanQuery variant kind.
+     */
+    @Override
+    public SpanQuery.Kind _spanQueryKind() {
+        return SpanQuery.Kind.SpanTerm;
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.SpanTerm;
+    }
+
+    /**
+     * Required - The target field
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required - API name: {@code value}
+     */
+    public final String value() {
+        return this.value;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject(this.field);
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("value");
+        generator.write(this.value);
+
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SpanTermQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<SpanTermQuery> {
+        private String field;
+
+        /**
+         * Required - The target field
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        private String value;
+
+        /**
+         * Required - API name: {@code value}
+         */
+        public final Builder value(String value) {
+            this.value = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SpanTermQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SpanTermQuery build() {
+            _checkSingleUse();
+
+            return new SpanTermQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SpanTermQuery}
+     */
+    public static final JsonpDeserializer<SpanTermQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SpanTermQuery::setupSpanTermQueryDeserializer
+    );
+
+    protected static void setupSpanTermQueryDeserializer(ObjectDeserializer<SpanTermQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::value, JsonpDeserializer.stringDeserializer(), "value");
+
+        op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
+        op.shortcutProperty("value");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanWithinQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanWithinQuery.java
index 2a570f5911..34dbe6e97f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanWithinQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/SpanWithinQuery.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,146 +41,144 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.SpanWithinQuery
 
-
 @JsonpDeserializable
 public class SpanWithinQuery extends QueryBase implements SpanQueryVariant, QueryVariant {
-	private final SpanQuery big;
-
-	private final SpanQuery little;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SpanWithinQuery(Builder builder) {
-		super(builder);
-
-		this.big = ApiTypeHelper.requireNonNull(builder.big, this, "big");
-		this.little = ApiTypeHelper.requireNonNull(builder.little, this, "little");
-
-	}
-
-	public static SpanWithinQuery of(Function<Builder, ObjectBuilder<SpanWithinQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * SpanQuery variant kind.
-	 */
-	@Override
-	public SpanQuery.Kind _spanQueryKind() {
-		return SpanQuery.Kind.SpanWithin;
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.SpanWithin;
-	}
-
-	/**
-	 * Required - API name: {@code big}
-	 */
-	public final SpanQuery big() {
-		return this.big;
-	}
-
-	/**
-	 * Required - API name: {@code little}
-	 */
-	public final SpanQuery little() {
-		return this.little;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("big");
-		this.big.serialize(generator, mapper);
-
-		generator.writeKey("little");
-		this.little.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SpanWithinQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<SpanWithinQuery> {
-		private SpanQuery big;
-
-		private SpanQuery little;
-
-		/**
-		 * Required - API name: {@code big}
-		 */
-		public final Builder big(SpanQuery value) {
-			this.big = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code big}
-		 */
-		public final Builder big(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
-			return this.big(fn.apply(new SpanQuery.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code little}
-		 */
-		public final Builder little(SpanQuery value) {
-			this.little = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code little}
-		 */
-		public final Builder little(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
-			return this.little(fn.apply(new SpanQuery.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SpanWithinQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SpanWithinQuery build() {
-			_checkSingleUse();
-
-			return new SpanWithinQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SpanWithinQuery}
-	 */
-	public static final JsonpDeserializer<SpanWithinQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SpanWithinQuery::setupSpanWithinQueryDeserializer);
-
-	protected static void setupSpanWithinQueryDeserializer(ObjectDeserializer<SpanWithinQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::big, SpanQuery._DESERIALIZER, "big");
-		op.add(Builder::little, SpanQuery._DESERIALIZER, "little");
-
-	}
+    private final SpanQuery big;
+
+    private final SpanQuery little;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SpanWithinQuery(Builder builder) {
+        super(builder);
+
+        this.big = ApiTypeHelper.requireNonNull(builder.big, this, "big");
+        this.little = ApiTypeHelper.requireNonNull(builder.little, this, "little");
+
+    }
+
+    public static SpanWithinQuery of(Function<Builder, ObjectBuilder<SpanWithinQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * SpanQuery variant kind.
+     */
+    @Override
+    public SpanQuery.Kind _spanQueryKind() {
+        return SpanQuery.Kind.SpanWithin;
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.SpanWithin;
+    }
+
+    /**
+     * Required - API name: {@code big}
+     */
+    public final SpanQuery big() {
+        return this.big;
+    }
+
+    /**
+     * Required - API name: {@code little}
+     */
+    public final SpanQuery little() {
+        return this.little;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("big");
+        this.big.serialize(generator, mapper);
+
+        generator.writeKey("little");
+        this.little.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SpanWithinQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<SpanWithinQuery> {
+        private SpanQuery big;
+
+        private SpanQuery little;
+
+        /**
+         * Required - API name: {@code big}
+         */
+        public final Builder big(SpanQuery value) {
+            this.big = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code big}
+         */
+        public final Builder big(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
+            return this.big(fn.apply(new SpanQuery.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code little}
+         */
+        public final Builder little(SpanQuery value) {
+            this.little = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code little}
+         */
+        public final Builder little(Function<SpanQuery.Builder, ObjectBuilder<SpanQuery>> fn) {
+            return this.little(fn.apply(new SpanQuery.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SpanWithinQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SpanWithinQuery build() {
+            _checkSingleUse();
+
+            return new SpanWithinQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SpanWithinQuery}
+     */
+    public static final JsonpDeserializer<SpanWithinQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SpanWithinQuery::setupSpanWithinQueryDeserializer
+    );
+
+    protected static void setupSpanWithinQueryDeserializer(ObjectDeserializer<SpanWithinQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::big, SpanQuery._DESERIALIZER, "big");
+        op.add(Builder::little, SpanQuery._DESERIALIZER, "little");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermQuery.java
index cd69d224d7..cb7a6c31fd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermQuery.java
@@ -32,172 +32,173 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch._types.FieldValue;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.FieldValue;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.TermQuery
 
-
 @JsonpDeserializable
 public class TermQuery extends QueryBase implements QueryVariant {
-	// Single key dictionary
-	private final String field;
+    // Single key dictionary
+    private final String field;
 
-	private final FieldValue value;
-
-	@Nullable
-	private final Boolean caseInsensitive;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TermQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-
-		this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
-		this.caseInsensitive = builder.caseInsensitive;
-
-	}
-
-	public static TermQuery of(Function<Builder, ObjectBuilder<TermQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Term;
-	}
-
-	/**
-	 * Required - The target field
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required - API name: {@code value}
-	 */
-	public final FieldValue value() {
-		return this.value;
-	}
-
-	/**
-	 * API name: {@code case_insensitive}
-	 */
-	@Nullable
-	public final Boolean caseInsensitive() {
-		return this.caseInsensitive;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject(this.field);
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("value");
-		this.value.serialize(generator, mapper);
-
-		if (this.caseInsensitive != null) {
-			generator.writeKey("case_insensitive");
-			generator.write(this.caseInsensitive);
-
-		}
-
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TermQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<TermQuery> {
-		private String field;
-
-		/**
-		 * Required - The target field
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		private FieldValue value;
-
-		@Nullable
-		private Boolean caseInsensitive;
-
-		/**
-		 * Required - API name: {@code value}
-		 */
-		public final Builder value(FieldValue value) {
-			this.value = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code value}
-		 */
-		public final Builder value(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
-			return this.value(fn.apply(new FieldValue.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code case_insensitive}
-		 */
-		public final Builder caseInsensitive(@Nullable Boolean value) {
-			this.caseInsensitive = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TermQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TermQuery build() {
-			_checkSingleUse();
-
-			return new TermQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TermQuery}
-	 */
-	public static final JsonpDeserializer<TermQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TermQuery::setupTermQueryDeserializer);
-
-	protected static void setupTermQueryDeserializer(ObjectDeserializer<TermQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::value, FieldValue._DESERIALIZER, "value");
-		op.add(Builder::caseInsensitive, JsonpDeserializer.booleanDeserializer(), "case_insensitive");
-
-		op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
-		op.shortcutProperty("value");
-
-	}
+    private final FieldValue value;
+
+    @Nullable
+    private final Boolean caseInsensitive;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TermQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+
+        this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
+        this.caseInsensitive = builder.caseInsensitive;
+
+    }
+
+    public static TermQuery of(Function<Builder, ObjectBuilder<TermQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Term;
+    }
+
+    /**
+     * Required - The target field
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required - API name: {@code value}
+     */
+    public final FieldValue value() {
+        return this.value;
+    }
+
+    /**
+     * API name: {@code case_insensitive}
+     */
+    @Nullable
+    public final Boolean caseInsensitive() {
+        return this.caseInsensitive;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject(this.field);
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("value");
+        this.value.serialize(generator, mapper);
+
+        if (this.caseInsensitive != null) {
+            generator.writeKey("case_insensitive");
+            generator.write(this.caseInsensitive);
+
+        }
+
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TermQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<TermQuery> {
+        private String field;
+
+        /**
+         * Required - The target field
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        private FieldValue value;
+
+        @Nullable
+        private Boolean caseInsensitive;
+
+        /**
+         * Required - API name: {@code value}
+         */
+        public final Builder value(FieldValue value) {
+            this.value = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code value}
+         */
+        public final Builder value(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
+            return this.value(fn.apply(new FieldValue.Builder()).build());
+        }
+
+        /**
+         * API name: {@code case_insensitive}
+         */
+        public final Builder caseInsensitive(@Nullable Boolean value) {
+            this.caseInsensitive = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TermQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TermQuery build() {
+            _checkSingleUse();
+
+            return new TermQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TermQuery}
+     */
+    public static final JsonpDeserializer<TermQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TermQuery::setupTermQueryDeserializer
+    );
+
+    protected static void setupTermQueryDeserializer(ObjectDeserializer<TermQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::value, FieldValue._DESERIALIZER, "value");
+        op.add(Builder::caseInsensitive, JsonpDeserializer.booleanDeserializer(), "case_insensitive");
+
+        op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
+        op.shortcutProperty("value");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsLookup.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsLookup.java
index 2fd693ffc1..d3a00d286a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsLookup.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsLookup.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,172 +44,170 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.TermsLookup
 
-
 @JsonpDeserializable
 public class TermsLookup implements JsonpSerializable {
-	private final String index;
+    private final String index;
 
-	private final String id;
+    private final String id;
 
-	private final String path;
+    private final String path;
 
-	@Nullable
-	private final String routing;
+    @Nullable
+    private final String routing;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private TermsLookup(Builder builder) {
+    private TermsLookup(Builder builder) {
 
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.path = ApiTypeHelper.requireNonNull(builder.path, this, "path");
-		this.routing = builder.routing;
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.path = ApiTypeHelper.requireNonNull(builder.path, this, "path");
+        this.routing = builder.routing;
 
-	}
-
-	public static TermsLookup of(Function<Builder, ObjectBuilder<TermsLookup>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Required - API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - API name: {@code path}
-	 */
-	public final String path() {
-		return this.path;
-	}
-
-	/**
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("index");
-		generator.write(this.index);
-
-		generator.writeKey("id");
-		generator.write(this.id);
-
-		generator.writeKey("path");
-		generator.write(this.path);
-
-		if (this.routing != null) {
-			generator.writeKey("routing");
-			generator.write(this.routing);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TermsLookup}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermsLookup> {
-		private String index;
-
-		private String id;
-
-		private String path;
-
-		@Nullable
-		private String routing;
-
-		/**
-		 * Required - API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code path}
-		 */
-		public final Builder path(String value) {
-			this.path = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TermsLookup}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TermsLookup build() {
-			_checkSingleUse();
-
-			return new TermsLookup(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TermsLookup}
-	 */
-	public static final JsonpDeserializer<TermsLookup> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TermsLookup::setupTermsLookupDeserializer);
-
-	protected static void setupTermsLookupDeserializer(ObjectDeserializer<TermsLookup.Builder> op) {
-
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
-		op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
-
-	}
+    }
+
+    public static TermsLookup of(Function<Builder, ObjectBuilder<TermsLookup>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Required - API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - API name: {@code path}
+     */
+    public final String path() {
+        return this.path;
+    }
+
+    /**
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("index");
+        generator.write(this.index);
+
+        generator.writeKey("id");
+        generator.write(this.id);
+
+        generator.writeKey("path");
+        generator.write(this.path);
+
+        if (this.routing != null) {
+            generator.writeKey("routing");
+            generator.write(this.routing);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TermsLookup}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermsLookup> {
+        private String index;
+
+        private String id;
+
+        private String path;
+
+        @Nullable
+        private String routing;
+
+        /**
+         * Required - API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code path}
+         */
+        public final Builder path(String value) {
+            this.path = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link TermsLookup}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TermsLookup build() {
+            _checkSingleUse();
+
+            return new TermsLookup(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TermsLookup}
+     */
+    public static final JsonpDeserializer<TermsLookup> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TermsLookup::setupTermsLookupDeserializer
+    );
+
+    protected static void setupTermsLookupDeserializer(ObjectDeserializer<TermsLookup.Builder> op) {
+
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
+        op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsQuery.java
index 46ac45162b..94440e190a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsQuery.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,129 +41,128 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.TermsQuery
 
-
 @JsonpDeserializable
 public class TermsQuery extends QueryBase implements QueryVariant {
-	private final String field;
-
-	private final TermsQueryField terms;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TermsQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.terms = ApiTypeHelper.requireNonNull(builder.terms, this, "terms");
-
-	}
-
-	public static TermsQuery of(Function<Builder, ObjectBuilder<TermsQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Terms;
-	}
-
-	/**
-	 * Required -
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required -
-	 */
-	public final TermsQueryField terms() {
-		return this.terms;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeKey(this.field);
-		this.terms.serialize(generator, mapper);
-
-		super.serializeInternal(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TermsQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<TermsQuery> {
-		private String field;
-
-		private TermsQueryField terms;
-
-		/**
-		 * Required -
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required -
-		 */
-		public final Builder terms(TermsQueryField value) {
-			this.terms = value;
-			return this;
-		}
-
-		/**
-		 * Required -
-		 */
-		public final Builder terms(Function<TermsQueryField.Builder, ObjectBuilder<TermsQueryField>> fn) {
-			return this.terms(fn.apply(new TermsQueryField.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TermsQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TermsQuery build() {
-			_checkSingleUse();
-
-			return new TermsQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TermsQuery}
-	 */
-	public static final JsonpDeserializer<TermsQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TermsQuery::setupTermsQueryDeserializer);
-
-	protected static void setupTermsQueryDeserializer(ObjectDeserializer<TermsQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-
-		op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
-			builder.field(name);
-			builder.terms(TermsQueryField._DESERIALIZER.deserialize(parser, mapper));
-		});
-
-	}
+    private final String field;
+
+    private final TermsQueryField terms;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TermsQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.terms = ApiTypeHelper.requireNonNull(builder.terms, this, "terms");
+
+    }
+
+    public static TermsQuery of(Function<Builder, ObjectBuilder<TermsQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Terms;
+    }
+
+    /**
+     * Required -
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required -
+     */
+    public final TermsQueryField terms() {
+        return this.terms;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeKey(this.field);
+        this.terms.serialize(generator, mapper);
+
+        super.serializeInternal(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TermsQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<TermsQuery> {
+        private String field;
+
+        private TermsQueryField terms;
+
+        /**
+         * Required -
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required -
+         */
+        public final Builder terms(TermsQueryField value) {
+            this.terms = value;
+            return this;
+        }
+
+        /**
+         * Required -
+         */
+        public final Builder terms(Function<TermsQueryField.Builder, ObjectBuilder<TermsQueryField>> fn) {
+            return this.terms(fn.apply(new TermsQueryField.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TermsQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TermsQuery build() {
+            _checkSingleUse();
+
+            return new TermsQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TermsQuery}
+     */
+    public static final JsonpDeserializer<TermsQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TermsQuery::setupTermsQueryDeserializer
+    );
+
+    protected static void setupTermsQueryDeserializer(ObjectDeserializer<TermsQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+
+        op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
+            builder.field(name);
+            builder.terms(TermsQueryField._DESERIALIZER.deserialize(parser, mapper));
+        });
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsQueryField.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsQueryField.java
index 9eeccc3bdc..75d9379820 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsQueryField.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsQueryField.java
@@ -32,148 +32,150 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch._types.FieldValue;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.UnionDeserializer;
+import org.opensearch.client.opensearch._types.FieldValue;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.TermsQueryField
 
-
 @JsonpDeserializable
 public class TermsQueryField implements TaggedUnion<TermsQueryField.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Value, Lookup
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private TermsQueryField(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	private TermsQueryField(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static TermsQueryField of(Function<Builder, ObjectBuilder<TermsQueryField>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code value}?
-	 */
-	public boolean isValue() {
-		return _kind == Kind.Value;
-	}
-
-	/**
-	 * Get the {@code value} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code value} kind.
-	 */
-	public List<FieldValue> value() {
-		return TaggedUnionUtils.get(this, Kind.Value);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code lookup}?
-	 */
-	public boolean isLookup() {
-		return _kind == Kind.Lookup;
-	}
-
-	/**
-	 * Get the {@code lookup} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code lookup} kind.
-	 */
-	public TermsLookup lookup() {
-		return TaggedUnionUtils.get(this, Kind.Lookup);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Value :
-					generator.writeStartArray();
-					for (FieldValue item0 : ((List<FieldValue>) this._value)) {
-						item0.serialize(generator, mapper);
-
-					}
-					generator.writeEnd();
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermsQueryField> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<TermsQueryField> value(List<FieldValue> v) {
-			this._kind = Kind.Value;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TermsQueryField> lookup(TermsLookup v) {
-			this._kind = Kind.Lookup;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TermsQueryField> lookup(Function<TermsLookup.Builder, ObjectBuilder<TermsLookup>> fn) {
-			return this.lookup(fn.apply(new TermsLookup.Builder()).build());
-		}
-
-		public TermsQueryField build() {
-			_checkSingleUse();
-			return new TermsQueryField(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<TermsQueryField> buildTermsQueryFieldDeserializer() {
-		return new UnionDeserializer.Builder<TermsQueryField, Kind, Object>(TermsQueryField::new, false)
-				.addMember(Kind.Value, JsonpDeserializer.arrayDeserializer(FieldValue._DESERIALIZER))
-				.addMember(Kind.Lookup, TermsLookup._DESERIALIZER).build();
-	}
-
-	public static final JsonpDeserializer<TermsQueryField> _DESERIALIZER = JsonpDeserializer
-			.lazy(TermsQueryField::buildTermsQueryFieldDeserializer);
+    public enum Kind {
+        Value,
+        Lookup
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private TermsQueryField(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private TermsQueryField(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static TermsQueryField of(Function<Builder, ObjectBuilder<TermsQueryField>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code value}?
+     */
+    public boolean isValue() {
+        return _kind == Kind.Value;
+    }
+
+    /**
+     * Get the {@code value} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code value} kind.
+     */
+    public List<FieldValue> value() {
+        return TaggedUnionUtils.get(this, Kind.Value);
+    }
+
+    /**
+     * Is this variant instance of kind {@code lookup}?
+     */
+    public boolean isLookup() {
+        return _kind == Kind.Lookup;
+    }
+
+    /**
+     * Get the {@code lookup} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code lookup} kind.
+     */
+    public TermsLookup lookup() {
+        return TaggedUnionUtils.get(this, Kind.Lookup);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Value:
+                    generator.writeStartArray();
+                    for (FieldValue item0 : ((List<FieldValue>) this._value)) {
+                        item0.serialize(generator, mapper);
+
+                    }
+                    generator.writeEnd();
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermsQueryField> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<TermsQueryField> value(List<FieldValue> v) {
+            this._kind = Kind.Value;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TermsQueryField> lookup(TermsLookup v) {
+            this._kind = Kind.Lookup;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TermsQueryField> lookup(Function<TermsLookup.Builder, ObjectBuilder<TermsLookup>> fn) {
+            return this.lookup(fn.apply(new TermsLookup.Builder()).build());
+        }
+
+        public TermsQueryField build() {
+            _checkSingleUse();
+            return new TermsQueryField(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<TermsQueryField> buildTermsQueryFieldDeserializer() {
+        return new UnionDeserializer.Builder<TermsQueryField, Kind, Object>(TermsQueryField::new, false).addMember(
+            Kind.Value,
+            JsonpDeserializer.arrayDeserializer(FieldValue._DESERIALIZER)
+        ).addMember(Kind.Lookup, TermsLookup._DESERIALIZER).build();
+    }
+
+    public static final JsonpDeserializer<TermsQueryField> _DESERIALIZER = JsonpDeserializer.lazy(
+        TermsQueryField::buildTermsQueryFieldDeserializer
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsQueryFieldBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsQueryFieldBuilders.java
index 5a9dcd0592..1f162d8a78 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsQueryFieldBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsQueryFieldBuilders.java
@@ -37,18 +37,17 @@
  * <p>
  * Variants <code>value</code> are not available here as they don't have a
  * dedicated class. Use {@link TermsQueryField}'s builder for these.
- * 
+ *
  */
 public class TermsQueryFieldBuilders {
-	private TermsQueryFieldBuilders() {
-	}
+    private TermsQueryFieldBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link TermsLookup lookup} {@code TermsQueryField}
-	 * variant.
-	 */
-	public static TermsLookup.Builder lookup() {
-		return new TermsLookup.Builder();
-	}
+    /**
+     * Creates a builder for the {@link TermsLookup lookup} {@code TermsQueryField}
+     * variant.
+     */
+    public static TermsLookup.Builder lookup() {
+        return new TermsLookup.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsSetQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsSetQuery.java
index 5e4500f414..c6eb8c1a03 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsSetQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TermsSetQuery.java
@@ -32,220 +32,221 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.TermsSetQuery
 
-
 @JsonpDeserializable
 public class TermsSetQuery extends QueryBase implements QueryVariant {
-	// Single key dictionary
-	private final String field;
+    // Single key dictionary
+    private final String field;
 
-	@Nullable
-	private final String minimumShouldMatchField;
-
-	@Nullable
-	private final Script minimumShouldMatchScript;
-
-	private final List<String> terms;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TermsSetQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-
-		this.minimumShouldMatchField = builder.minimumShouldMatchField;
-		this.minimumShouldMatchScript = builder.minimumShouldMatchScript;
-		this.terms = ApiTypeHelper.unmodifiableRequired(builder.terms, this, "terms");
-
-	}
-
-	public static TermsSetQuery of(Function<Builder, ObjectBuilder<TermsSetQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.TermsSet;
-	}
-
-	/**
-	 * Required - The target field
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code minimum_should_match_field}
-	 */
-	@Nullable
-	public final String minimumShouldMatchField() {
-		return this.minimumShouldMatchField;
-	}
-
-	/**
-	 * API name: {@code minimum_should_match_script}
-	 */
-	@Nullable
-	public final Script minimumShouldMatchScript() {
-		return this.minimumShouldMatchScript;
-	}
-
-	/**
-	 * Required - API name: {@code terms}
-	 */
-	public final List<String> terms() {
-		return this.terms;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject(this.field);
-
-		super.serializeInternal(generator, mapper);
-		if (this.minimumShouldMatchField != null) {
-			generator.writeKey("minimum_should_match_field");
-			generator.write(this.minimumShouldMatchField);
-
-		}
-		if (this.minimumShouldMatchScript != null) {
-			generator.writeKey("minimum_should_match_script");
-			this.minimumShouldMatchScript.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.terms)) {
-			generator.writeKey("terms");
-			generator.writeStartArray();
-			for (String item0 : this.terms) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TermsSetQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<TermsSetQuery> {
-		private String field;
-
-		/**
-		 * Required - The target field
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		@Nullable
-		private String minimumShouldMatchField;
-
-		@Nullable
-		private Script minimumShouldMatchScript;
-
-		private List<String> terms;
-
-		/**
-		 * API name: {@code minimum_should_match_field}
-		 */
-		public final Builder minimumShouldMatchField(@Nullable String value) {
-			this.minimumShouldMatchField = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code minimum_should_match_script}
-		 */
-		public final Builder minimumShouldMatchScript(@Nullable Script value) {
-			this.minimumShouldMatchScript = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code minimum_should_match_script}
-		 */
-		public final Builder minimumShouldMatchScript(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.minimumShouldMatchScript(fn.apply(new Script.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code terms}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>terms</code>.
-		 */
-		public final Builder terms(List<String> list) {
-			this.terms = _listAddAll(this.terms, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code terms}
-		 * <p>
-		 * Adds one or more values to <code>terms</code>.
-		 */
-		public final Builder terms(String value, String... values) {
-			this.terms = _listAdd(this.terms, value, values);
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TermsSetQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TermsSetQuery build() {
-			_checkSingleUse();
-
-			return new TermsSetQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TermsSetQuery}
-	 */
-	public static final JsonpDeserializer<TermsSetQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TermsSetQuery::setupTermsSetQueryDeserializer);
-
-	protected static void setupTermsSetQueryDeserializer(ObjectDeserializer<TermsSetQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::minimumShouldMatchField, JsonpDeserializer.stringDeserializer(), "minimum_should_match_field");
-		op.add(Builder::minimumShouldMatchScript, Script._DESERIALIZER, "minimum_should_match_script");
-		op.add(Builder::terms, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "terms");
-
-		op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
-
-	}
+    @Nullable
+    private final String minimumShouldMatchField;
+
+    @Nullable
+    private final Script minimumShouldMatchScript;
+
+    private final List<String> terms;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TermsSetQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+
+        this.minimumShouldMatchField = builder.minimumShouldMatchField;
+        this.minimumShouldMatchScript = builder.minimumShouldMatchScript;
+        this.terms = ApiTypeHelper.unmodifiableRequired(builder.terms, this, "terms");
+
+    }
+
+    public static TermsSetQuery of(Function<Builder, ObjectBuilder<TermsSetQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.TermsSet;
+    }
+
+    /**
+     * Required - The target field
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code minimum_should_match_field}
+     */
+    @Nullable
+    public final String minimumShouldMatchField() {
+        return this.minimumShouldMatchField;
+    }
+
+    /**
+     * API name: {@code minimum_should_match_script}
+     */
+    @Nullable
+    public final Script minimumShouldMatchScript() {
+        return this.minimumShouldMatchScript;
+    }
+
+    /**
+     * Required - API name: {@code terms}
+     */
+    public final List<String> terms() {
+        return this.terms;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject(this.field);
+
+        super.serializeInternal(generator, mapper);
+        if (this.minimumShouldMatchField != null) {
+            generator.writeKey("minimum_should_match_field");
+            generator.write(this.minimumShouldMatchField);
+
+        }
+        if (this.minimumShouldMatchScript != null) {
+            generator.writeKey("minimum_should_match_script");
+            this.minimumShouldMatchScript.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.terms)) {
+            generator.writeKey("terms");
+            generator.writeStartArray();
+            for (String item0 : this.terms) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TermsSetQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<TermsSetQuery> {
+        private String field;
+
+        /**
+         * Required - The target field
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        @Nullable
+        private String minimumShouldMatchField;
+
+        @Nullable
+        private Script minimumShouldMatchScript;
+
+        private List<String> terms;
+
+        /**
+         * API name: {@code minimum_should_match_field}
+         */
+        public final Builder minimumShouldMatchField(@Nullable String value) {
+            this.minimumShouldMatchField = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code minimum_should_match_script}
+         */
+        public final Builder minimumShouldMatchScript(@Nullable Script value) {
+            this.minimumShouldMatchScript = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code minimum_should_match_script}
+         */
+        public final Builder minimumShouldMatchScript(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.minimumShouldMatchScript(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code terms}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>terms</code>.
+         */
+        public final Builder terms(List<String> list) {
+            this.terms = _listAddAll(this.terms, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code terms}
+         * <p>
+         * Adds one or more values to <code>terms</code>.
+         */
+        public final Builder terms(String value, String... values) {
+            this.terms = _listAdd(this.terms, value, values);
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TermsSetQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TermsSetQuery build() {
+            _checkSingleUse();
+
+            return new TermsSetQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TermsSetQuery}
+     */
+    public static final JsonpDeserializer<TermsSetQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TermsSetQuery::setupTermsSetQueryDeserializer
+    );
+
+    protected static void setupTermsSetQueryDeserializer(ObjectDeserializer<TermsSetQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::minimumShouldMatchField, JsonpDeserializer.stringDeserializer(), "minimum_should_match_field");
+        op.add(Builder::minimumShouldMatchScript, Script._DESERIALIZER, "minimum_should_match_script");
+        op.add(Builder::terms, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "terms");
+
+        op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TextQueryType.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TextQueryType.java
index aea1e5ac05..ab9acefea8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TextQueryType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TextQueryType.java
@@ -35,33 +35,31 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum TextQueryType implements JsonEnum {
-	BestFields("best_fields"),
+    BestFields("best_fields"),
 
-	MostFields("most_fields"),
+    MostFields("most_fields"),
 
-	CrossFields("cross_fields"),
+    CrossFields("cross_fields"),
 
-	Phrase("phrase"),
+    Phrase("phrase"),
 
-	PhrasePrefix("phrase_prefix"),
+    PhrasePrefix("phrase_prefix"),
 
-	BoolPrefix("bool_prefix"),
+    BoolPrefix("bool_prefix"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	TextQueryType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    TextQueryType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<TextQueryType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			TextQueryType.values());
+    public static final JsonEnum.Deserializer<TextQueryType> _DESERIALIZER = new JsonEnum.Deserializer<>(TextQueryType.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TypeQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TypeQuery.java
index 5c268ddec7..ff69276fa6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TypeQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/TypeQuery.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,99 +41,98 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.TypeQuery
 
-
 @JsonpDeserializable
 public class TypeQuery extends QueryBase implements QueryVariant {
-	private final String value;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TypeQuery(Builder builder) {
-		super(builder);
-
-		this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
-
-	}
-
-	public static TypeQuery of(Function<Builder, ObjectBuilder<TypeQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Type;
-	}
-
-	/**
-	 * Required - API name: {@code value}
-	 */
-	public final String value() {
-		return this.value;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("value");
-		generator.write(this.value);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TypeQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<TypeQuery> {
-		private String value;
-
-		/**
-		 * Required - API name: {@code value}
-		 */
-		public final Builder value(String value) {
-			this.value = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TypeQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TypeQuery build() {
-			_checkSingleUse();
-
-			return new TypeQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TypeQuery}
-	 */
-	public static final JsonpDeserializer<TypeQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TypeQuery::setupTypeQueryDeserializer);
-
-	protected static void setupTypeQueryDeserializer(ObjectDeserializer<TypeQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::value, JsonpDeserializer.stringDeserializer(), "value");
-
-	}
+    private final String value;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TypeQuery(Builder builder) {
+        super(builder);
+
+        this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
+
+    }
+
+    public static TypeQuery of(Function<Builder, ObjectBuilder<TypeQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Type;
+    }
+
+    /**
+     * Required - API name: {@code value}
+     */
+    public final String value() {
+        return this.value;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("value");
+        generator.write(this.value);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TypeQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<TypeQuery> {
+        private String value;
+
+        /**
+         * Required - API name: {@code value}
+         */
+        public final Builder value(String value) {
+            this.value = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TypeQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TypeQuery build() {
+            _checkSingleUse();
+
+            return new TypeQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TypeQuery}
+     */
+    public static final JsonpDeserializer<TypeQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TypeQuery::setupTypeQueryDeserializer
+    );
+
+    protected static void setupTypeQueryDeserializer(ObjectDeserializer<TypeQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::value, JsonpDeserializer.stringDeserializer(), "value");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/WildcardQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/WildcardQuery.java
index e037bb4339..30463a4f43 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/WildcardQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/WildcardQuery.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,244 +42,242 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _types.query_dsl.WildcardQuery
 
-
 @JsonpDeserializable
 public class WildcardQuery extends QueryBase implements QueryVariant {
-	// Single key dictionary
-	private final String field;
-
-	@Nullable
-	private final Boolean caseInsensitive;
-
-	@Nullable
-	private final String rewrite;
-
-	@Nullable
-	private final String value;
-
-	@Nullable
-	private final String wildcard;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private WildcardQuery(Builder builder) {
-		super(builder);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-
-		this.caseInsensitive = builder.caseInsensitive;
-		this.rewrite = builder.rewrite;
-		this.value = builder.value;
-		this.wildcard = builder.wildcard;
-
-	}
-
-	public static WildcardQuery of(Function<Builder, ObjectBuilder<WildcardQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Query variant kind.
-	 */
-	@Override
-	public Query.Kind _queryKind() {
-		return Query.Kind.Wildcard;
-	}
-
-	/**
-	 * Required - The target field
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Allows case insensitive matching of the pattern with the indexed field values
-	 * when set to true. Default is false which means the case sensitivity of
-	 * matching depends on the underlying field's mapping.
-	 * <p>
-	 * API name: {@code case_insensitive}
-	 */
-	@Nullable
-	public final Boolean caseInsensitive() {
-		return this.caseInsensitive;
-	}
-
-	/**
-	 * Method used to rewrite the query
-	 * <p>
-	 * API name: {@code rewrite}
-	 */
-	@Nullable
-	public final String rewrite() {
-		return this.rewrite;
-	}
-
-	/**
-	 * Wildcard pattern for terms you wish to find in the provided field. Required,
-	 * when wildcard is not set.
-	 * <p>
-	 * API name: {@code value}
-	 */
-	@Nullable
-	public final String value() {
-		return this.value;
-	}
-
-	/**
-	 * Wildcard pattern for terms you wish to find in the provided field. Required,
-	 * when value is not set.
-	 * <p>
-	 * API name: {@code wildcard}
-	 */
-	@Nullable
-	public final String wildcard() {
-		return this.wildcard;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject(this.field);
-
-		super.serializeInternal(generator, mapper);
-		if (this.caseInsensitive != null) {
-			generator.writeKey("case_insensitive");
-			generator.write(this.caseInsensitive);
-
-		}
-		if (this.rewrite != null) {
-			generator.writeKey("rewrite");
-			generator.write(this.rewrite);
-
-		}
-		if (this.value != null) {
-			generator.writeKey("value");
-			generator.write(this.value);
-
-		}
-		if (this.wildcard != null) {
-			generator.writeKey("wildcard");
-			generator.write(this.wildcard);
-
-		}
-
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link WildcardQuery}.
-	 */
-
-	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<WildcardQuery> {
-		private String field;
-
-		/**
-		 * Required - The target field
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		@Nullable
-		private Boolean caseInsensitive;
-
-		@Nullable
-		private String rewrite;
-
-		@Nullable
-		private String value;
-
-		@Nullable
-		private String wildcard;
-
-		/**
-		 * Allows case insensitive matching of the pattern with the indexed field values
-		 * when set to true. Default is false which means the case sensitivity of
-		 * matching depends on the underlying field's mapping.
-		 * <p>
-		 * API name: {@code case_insensitive}
-		 */
-		public final Builder caseInsensitive(@Nullable Boolean value) {
-			this.caseInsensitive = value;
-			return this;
-		}
-
-		/**
-		 * Method used to rewrite the query
-		 * <p>
-		 * API name: {@code rewrite}
-		 */
-		public final Builder rewrite(@Nullable String value) {
-			this.rewrite = value;
-			return this;
-		}
-
-		/**
-		 * Wildcard pattern for terms you wish to find in the provided field. Required,
-		 * when wildcard is not set.
-		 * <p>
-		 * API name: {@code value}
-		 */
-		public final Builder value(@Nullable String value) {
-			this.value = value;
-			return this;
-		}
-
-		/**
-		 * Wildcard pattern for terms you wish to find in the provided field. Required,
-		 * when value is not set.
-		 * <p>
-		 * API name: {@code wildcard}
-		 */
-		public final Builder wildcard(@Nullable String value) {
-			this.wildcard = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link WildcardQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public WildcardQuery build() {
-			_checkSingleUse();
-
-			return new WildcardQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link WildcardQuery}
-	 */
-	public static final JsonpDeserializer<WildcardQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			WildcardQuery::setupWildcardQueryDeserializer);
-
-	protected static void setupWildcardQueryDeserializer(ObjectDeserializer<WildcardQuery.Builder> op) {
-		QueryBase.setupQueryBaseDeserializer(op);
-		op.add(Builder::caseInsensitive, JsonpDeserializer.booleanDeserializer(), "case_insensitive");
-		op.add(Builder::rewrite, JsonpDeserializer.stringDeserializer(), "rewrite");
-		op.add(Builder::value, JsonpDeserializer.stringDeserializer(), "value");
-		op.add(Builder::wildcard, JsonpDeserializer.stringDeserializer(), "wildcard");
-
-		op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
-		op.shortcutProperty("value");
-
-	}
+    // Single key dictionary
+    private final String field;
+
+    @Nullable
+    private final Boolean caseInsensitive;
+
+    @Nullable
+    private final String rewrite;
+
+    @Nullable
+    private final String value;
+
+    @Nullable
+    private final String wildcard;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private WildcardQuery(Builder builder) {
+        super(builder);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+
+        this.caseInsensitive = builder.caseInsensitive;
+        this.rewrite = builder.rewrite;
+        this.value = builder.value;
+        this.wildcard = builder.wildcard;
+
+    }
+
+    public static WildcardQuery of(Function<Builder, ObjectBuilder<WildcardQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Query variant kind.
+     */
+    @Override
+    public Query.Kind _queryKind() {
+        return Query.Kind.Wildcard;
+    }
+
+    /**
+     * Required - The target field
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Allows case insensitive matching of the pattern with the indexed field values
+     * when set to true. Default is false which means the case sensitivity of
+     * matching depends on the underlying field's mapping.
+     * <p>
+     * API name: {@code case_insensitive}
+     */
+    @Nullable
+    public final Boolean caseInsensitive() {
+        return this.caseInsensitive;
+    }
+
+    /**
+     * Method used to rewrite the query
+     * <p>
+     * API name: {@code rewrite}
+     */
+    @Nullable
+    public final String rewrite() {
+        return this.rewrite;
+    }
+
+    /**
+     * Wildcard pattern for terms you wish to find in the provided field. Required,
+     * when wildcard is not set.
+     * <p>
+     * API name: {@code value}
+     */
+    @Nullable
+    public final String value() {
+        return this.value;
+    }
+
+    /**
+     * Wildcard pattern for terms you wish to find in the provided field. Required,
+     * when value is not set.
+     * <p>
+     * API name: {@code wildcard}
+     */
+    @Nullable
+    public final String wildcard() {
+        return this.wildcard;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject(this.field);
+
+        super.serializeInternal(generator, mapper);
+        if (this.caseInsensitive != null) {
+            generator.writeKey("case_insensitive");
+            generator.write(this.caseInsensitive);
+
+        }
+        if (this.rewrite != null) {
+            generator.writeKey("rewrite");
+            generator.write(this.rewrite);
+
+        }
+        if (this.value != null) {
+            generator.writeKey("value");
+            generator.write(this.value);
+
+        }
+        if (this.wildcard != null) {
+            generator.writeKey("wildcard");
+            generator.write(this.wildcard);
+
+        }
+
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link WildcardQuery}.
+     */
+
+    public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<WildcardQuery> {
+        private String field;
+
+        /**
+         * Required - The target field
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        @Nullable
+        private Boolean caseInsensitive;
+
+        @Nullable
+        private String rewrite;
+
+        @Nullable
+        private String value;
+
+        @Nullable
+        private String wildcard;
+
+        /**
+         * Allows case insensitive matching of the pattern with the indexed field values
+         * when set to true. Default is false which means the case sensitivity of
+         * matching depends on the underlying field's mapping.
+         * <p>
+         * API name: {@code case_insensitive}
+         */
+        public final Builder caseInsensitive(@Nullable Boolean value) {
+            this.caseInsensitive = value;
+            return this;
+        }
+
+        /**
+         * Method used to rewrite the query
+         * <p>
+         * API name: {@code rewrite}
+         */
+        public final Builder rewrite(@Nullable String value) {
+            this.rewrite = value;
+            return this;
+        }
+
+        /**
+         * Wildcard pattern for terms you wish to find in the provided field. Required,
+         * when wildcard is not set.
+         * <p>
+         * API name: {@code value}
+         */
+        public final Builder value(@Nullable String value) {
+            this.value = value;
+            return this;
+        }
+
+        /**
+         * Wildcard pattern for terms you wish to find in the provided field. Required,
+         * when value is not set.
+         * <p>
+         * API name: {@code wildcard}
+         */
+        public final Builder wildcard(@Nullable String value) {
+            this.wildcard = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link WildcardQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public WildcardQuery build() {
+            _checkSingleUse();
+
+            return new WildcardQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link WildcardQuery}
+     */
+    public static final JsonpDeserializer<WildcardQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        WildcardQuery::setupWildcardQueryDeserializer
+    );
+
+    protected static void setupWildcardQueryDeserializer(ObjectDeserializer<WildcardQuery.Builder> op) {
+        QueryBase.setupQueryBaseDeserializer(op);
+        op.add(Builder::caseInsensitive, JsonpDeserializer.booleanDeserializer(), "case_insensitive");
+        op.add(Builder::rewrite, JsonpDeserializer.stringDeserializer(), "rewrite");
+        op.add(Builder::value, JsonpDeserializer.stringDeserializer(), "value");
+        op.add(Builder::wildcard, JsonpDeserializer.stringDeserializer(), "wildcard");
+
+        op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
+        op.shortcutProperty("value");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/WrapperQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/WrapperQuery.java
index 391278b080..9ca6ab49fd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/WrapperQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/WrapperQuery.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch._types.query_dsl;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,13 +41,9 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.lang.String;
-import java.util.function.Function;
 
 // typedef: _types.query_dsl.WrapperQuery
 
-
 @JsonpDeserializable
 public class WrapperQuery extends QueryBase implements QueryVariant {
     private final String query;
@@ -132,8 +130,10 @@ public WrapperQuery build() {
     /**
      * Json deserializer for {@link WrapperQuery}
      */
-    public static final JsonpDeserializer<WrapperQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-            WrapperQuery::setupWrapperQueryDeserializer);
+    public static final JsonpDeserializer<WrapperQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        WrapperQuery::setupWrapperQueryDeserializer
+    );
 
     protected static void setupWrapperQueryDeserializer(ObjectDeserializer<WrapperQuery.Builder> op) {
         QueryBase.setupQueryBaseDeserializer(op);
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ZeroTermsQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ZeroTermsQuery.java
index 872632a214..03feba5dcc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ZeroTermsQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ZeroTermsQuery.java
@@ -35,25 +35,23 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum ZeroTermsQuery implements JsonEnum {
-	All("all"),
+    All("all"),
 
-	None("none"),
+    None("none"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	ZeroTermsQuery(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    ZeroTermsQuery(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<ZeroTermsQuery> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			ZeroTermsQuery.values());
+    public static final JsonEnum.Deserializer<ZeroTermsQuery> _DESERIALIZER = new JsonEnum.Deserializer<>(ZeroTermsQuery.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/AliasesRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/AliasesRequest.java
index 467b9d049b..8a8c226c8c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/AliasesRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/AliasesRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.transport.Endpoint;
@@ -39,188 +45,182 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 // typedef: cat.aliases.Request
 
 /**
  * Shows information about currently configured aliases to indices including
  * filter and routing infos.
- * 
+ *
  */
 
 public class AliasesRequest extends CatRequestBase {
-	private final List<ExpandWildcard> expandWildcards;
-
-	private final List<String> name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AliasesRequest(Builder builder) {
-		super(builder);
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.name = ApiTypeHelper.unmodifiable(builder.name);
-
-	}
-
-	public static AliasesRequest of(Function<Builder, ObjectBuilder<AliasesRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * A comma-separated list of alias names to return
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final List<String> name() {
-		return this.name;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AliasesRequest}.
-	 */
-
-	public static class Builder extends CatRequestBaseBuilder<AliasesRequest.Builder> {
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private List<String> name;
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of alias names to return
-		 * <p>
-		 * API name: {@code name}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>name</code>.
-		 */
-		public final Builder name(List<String> list) {
-			this.name = _listAddAll(this.name, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of alias names to return
-		 * <p>
-		 * API name: {@code name}
-		 * <p>
-		 * Adds one or more values to <code>name</code>.
-		 */
-		public final Builder name(String value, String... values) {
-			this.name = _listAdd(this.name, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AliasesRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AliasesRequest build() {
-			_checkSingleUse();
-
-			return new AliasesRequest(this);
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cat.aliases}".
-	 */
-	public static final Endpoint<AliasesRequest, AliasesResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.name()))
-					propsSet |= _name;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cat");
-					buf.append("/aliases");
-					return buf.toString();
-				}
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cat");
-					buf.append("/aliases");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>(request.queryParameters());
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, AliasesResponse._DESERIALIZER);
+    private final List<ExpandWildcard> expandWildcards;
+
+    private final List<String> name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AliasesRequest(Builder builder) {
+        super(builder);
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.name = ApiTypeHelper.unmodifiable(builder.name);
+
+    }
+
+    public static AliasesRequest of(Function<Builder, ObjectBuilder<AliasesRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * A comma-separated list of alias names to return
+     * <p>
+     * API name: {@code name}
+     */
+    public final List<String> name() {
+        return this.name;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AliasesRequest}.
+     */
+
+    public static class Builder extends CatRequestBaseBuilder<AliasesRequest.Builder> {
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private List<String> name;
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of alias names to return
+         * <p>
+         * API name: {@code name}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>name</code>.
+         */
+        public final Builder name(List<String> list) {
+            this.name = _listAddAll(this.name, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of alias names to return
+         * <p>
+         * API name: {@code name}
+         * <p>
+         * Adds one or more values to <code>name</code>.
+         */
+        public final Builder name(String value, String... values) {
+            this.name = _listAdd(this.name, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link AliasesRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AliasesRequest build() {
+            _checkSingleUse();
+
+            return new AliasesRequest(this);
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cat.aliases}".
+     */
+    public static final Endpoint<AliasesRequest, AliasesResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.name())) propsSet |= _name;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/aliases");
+                return buf.toString();
+            }
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/aliases");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>(request.queryParameters());
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        AliasesResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/AliasesResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/AliasesResponse.java
index eaa8ef8921..a3ea02448a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/AliasesResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/AliasesResponse.java
@@ -32,125 +32,125 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch.cat.aliases.AliasesRecord;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch.cat.aliases.AliasesRecord;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.aliases.Response
 
-
 @JsonpDeserializable
 public class AliasesResponse implements JsonpSerializable {
-	private final List<AliasesRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AliasesResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static AliasesResponse of(Function<Builder, ObjectBuilder<AliasesResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<AliasesRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (AliasesRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AliasesResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AliasesResponse> {
-		private List<AliasesRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<AliasesRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(AliasesRecord value, AliasesRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<AliasesRecord.Builder, ObjectBuilder<AliasesRecord>> fn) {
-			return valueBody(fn.apply(new AliasesRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link AliasesResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AliasesResponse build() {
-			_checkSingleUse();
-
-			return new AliasesResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<AliasesResponse> _DESERIALIZER = createAliasesResponseDeserializer();
-	protected static JsonpDeserializer<AliasesResponse> createAliasesResponseDeserializer() {
-
-		JsonpDeserializer<List<AliasesRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(AliasesRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<AliasesRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AliasesResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static AliasesResponse of(Function<Builder, ObjectBuilder<AliasesResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<AliasesRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (AliasesRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AliasesResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AliasesResponse> {
+        private List<AliasesRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<AliasesRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(AliasesRecord value, AliasesRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<AliasesRecord.Builder, ObjectBuilder<AliasesRecord>> fn) {
+            return valueBody(fn.apply(new AliasesRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link AliasesResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AliasesResponse build() {
+            _checkSingleUse();
+
+            return new AliasesResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<AliasesResponse> _DESERIALIZER = createAliasesResponseDeserializer();
+
+    protected static JsonpDeserializer<AliasesResponse> createAliasesResponseDeserializer() {
+
+        JsonpDeserializer<List<AliasesRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(AliasesRecord._DESERIALIZER);
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/AllocationRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/AllocationRequest.java
index e6147f0cfd..515322e0e5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/AllocationRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/AllocationRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.Bytes;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.transport.Endpoint;
@@ -39,172 +45,167 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 // typedef: cat.allocation.Request
 
 /**
  * Provides a snapshot of how many shards are allocated to each data node and
  * how much disk space they are using.
- * 
+ *
  */
 
 public class AllocationRequest extends CatRequestBase {
-	@Nullable
-	private final Bytes bytes;
-
-	private final List<String> nodeId;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AllocationRequest(Builder builder) {
-		super(builder);
-		this.bytes = builder.bytes;
-		this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
-
-	}
-
-	public static AllocationRequest of(Function<Builder, ObjectBuilder<AllocationRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * The unit in which to display byte values
-	 * <p>
-	 * API name: {@code bytes}
-	 */
-	@Nullable
-	public final Bytes bytes() {
-		return this.bytes;
-	}
-
-	/**
-	 * A comma-separated list of node IDs or names to limit the returned information
-	 * <p>
-	 * API name: {@code node_id}
-	 */
-	public final List<String> nodeId() {
-		return this.nodeId;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AllocationRequest}.
-	 */
-
-	public static class Builder extends CatRequestBaseBuilder<AllocationRequest.Builder> {
-		@Nullable
-		private Bytes bytes;
-
-		@Nullable
-		private List<String> nodeId;
-
-		/**
-		 * The unit in which to display byte values
-		 * <p>
-		 * API name: {@code bytes}
-		 */
-		public final Builder bytes(@Nullable Bytes value) {
-			this.bytes = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of node IDs or names to limit the returned information
-		 * <p>
-		 * API name: {@code node_id}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>nodeId</code>.
-		 */
-		public final Builder nodeId(List<String> list) {
-			this.nodeId = _listAddAll(this.nodeId, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of node IDs or names to limit the returned information
-		 * <p>
-		 * API name: {@code node_id}
-		 * <p>
-		 * Adds one or more values to <code>nodeId</code>.
-		 */
-		public final Builder nodeId(String value, String... values) {
-			this.nodeId = _listAdd(this.nodeId, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AllocationRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AllocationRequest build() {
-			_checkSingleUse();
-
-			return new AllocationRequest(this);
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cat.allocation}".
-	 */
-	public static final Endpoint<AllocationRequest, AllocationResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _nodeId = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.nodeId()))
-					propsSet |= _nodeId;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cat");
-					buf.append("/allocation");
-					return buf.toString();
-				}
-				if (propsSet == (_nodeId)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cat");
-					buf.append("/allocation");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>(request.queryParameters());
-				if (request.bytes != null) {
-					params.put("bytes", request.bytes.jsonValue());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, AllocationResponse._DESERIALIZER);
+    @Nullable
+    private final Bytes bytes;
+
+    private final List<String> nodeId;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AllocationRequest(Builder builder) {
+        super(builder);
+        this.bytes = builder.bytes;
+        this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
+
+    }
+
+    public static AllocationRequest of(Function<Builder, ObjectBuilder<AllocationRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * The unit in which to display byte values
+     * <p>
+     * API name: {@code bytes}
+     */
+    @Nullable
+    public final Bytes bytes() {
+        return this.bytes;
+    }
+
+    /**
+     * A comma-separated list of node IDs or names to limit the returned information
+     * <p>
+     * API name: {@code node_id}
+     */
+    public final List<String> nodeId() {
+        return this.nodeId;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AllocationRequest}.
+     */
+
+    public static class Builder extends CatRequestBaseBuilder<AllocationRequest.Builder> {
+        @Nullable
+        private Bytes bytes;
+
+        @Nullable
+        private List<String> nodeId;
+
+        /**
+         * The unit in which to display byte values
+         * <p>
+         * API name: {@code bytes}
+         */
+        public final Builder bytes(@Nullable Bytes value) {
+            this.bytes = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of node IDs or names to limit the returned information
+         * <p>
+         * API name: {@code node_id}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>nodeId</code>.
+         */
+        public final Builder nodeId(List<String> list) {
+            this.nodeId = _listAddAll(this.nodeId, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of node IDs or names to limit the returned information
+         * <p>
+         * API name: {@code node_id}
+         * <p>
+         * Adds one or more values to <code>nodeId</code>.
+         */
+        public final Builder nodeId(String value, String... values) {
+            this.nodeId = _listAdd(this.nodeId, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link AllocationRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AllocationRequest build() {
+            _checkSingleUse();
+
+            return new AllocationRequest(this);
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cat.allocation}".
+     */
+    public static final Endpoint<AllocationRequest, AllocationResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _nodeId = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.nodeId())) propsSet |= _nodeId;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/allocation");
+                return buf.toString();
+            }
+            if (propsSet == (_nodeId)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/allocation");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>(request.queryParameters());
+            if (request.bytes != null) {
+                params.put("bytes", request.bytes.jsonValue());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        AllocationResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/AllocationResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/AllocationResponse.java
index 880a825e06..750219a18b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/AllocationResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/AllocationResponse.java
@@ -32,124 +32,125 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch.cat.allocation.AllocationRecord;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch.cat.allocation.AllocationRecord;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.allocation.Response
 
 @JsonpDeserializable
 public class AllocationResponse implements JsonpSerializable {
-	private final List<AllocationRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AllocationResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static AllocationResponse of(Function<Builder, ObjectBuilder<AllocationResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<AllocationRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (AllocationRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AllocationResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AllocationResponse> {
-		private List<AllocationRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<AllocationRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(AllocationRecord value, AllocationRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<AllocationRecord.Builder, ObjectBuilder<AllocationRecord>> fn) {
-			return valueBody(fn.apply(new AllocationRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link AllocationResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AllocationResponse build() {
-			_checkSingleUse();
-
-			return new AllocationResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<AllocationResponse> _DESERIALIZER = createAllocationResponseDeserializer();
-	protected static JsonpDeserializer<AllocationResponse> createAllocationResponseDeserializer() {
-
-		JsonpDeserializer<List<AllocationRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(AllocationRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<AllocationRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AllocationResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static AllocationResponse of(Function<Builder, ObjectBuilder<AllocationResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<AllocationRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (AllocationRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AllocationResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AllocationResponse> {
+        private List<AllocationRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<AllocationRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(AllocationRecord value, AllocationRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<AllocationRecord.Builder, ObjectBuilder<AllocationRecord>> fn) {
+            return valueBody(fn.apply(new AllocationRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link AllocationResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AllocationResponse build() {
+            _checkSingleUse();
+
+            return new AllocationResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<AllocationResponse> _DESERIALIZER = createAllocationResponseDeserializer();
+
+    protected static JsonpDeserializer<AllocationResponse> createAllocationResponseDeserializer() {
+
+        JsonpDeserializer<List<AllocationRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(AllocationRecord._DESERIALIZER);
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/CatRequestBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/CatRequestBase.java
index 707d958eec..92372d2693 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/CatRequestBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/CatRequestBase.java
@@ -32,17 +32,15 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.Map;
-
 // typedef: cat._types.CatRequestBase
 
-
 public abstract class CatRequestBase extends RequestBase {
 
     @Nullable
@@ -66,14 +64,13 @@ protected final Map<String, String> queryParameters() {
         if (headers != null && !headers.isBlank()) {
             params.put("h", headers);
         }
-        if(sort != null && !sort.isBlank()) {
+        if (sort != null && !sort.isBlank()) {
             params.put("s", sort);
         }
         params.put("format", "json");
         return params;
     }
 
-
     /**
      * A comma-separated list of headers to limit the returned information
      * <p>
@@ -93,8 +90,9 @@ public final String sort() {
         return this.sort;
     }
 
-
-    protected abstract static class CatRequestBaseBuilder<BuilderT extends CatRequestBaseBuilder> extends ObjectBuilderBase implements ObjectBuilder {
+    protected abstract static class CatRequestBaseBuilder<BuilderT extends CatRequestBaseBuilder> extends ObjectBuilderBase
+        implements
+            ObjectBuilder {
 
         @Nullable
         protected String headers;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/ClusterManagerRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/ClusterManagerRequest.java
index 57534e4d26..155bac91f4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/ClusterManagerRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/ClusterManagerRequest.java
@@ -32,12 +32,11 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.util.HashMap;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 
-import java.util.HashMap;
-
 // typedef: cat.cluster_manager.Request
 
 /**
@@ -45,54 +44,61 @@
  *
  */
 public class ClusterManagerRequest extends CatRequestBase {
-	public ClusterManagerRequest() {
-	}
+    public ClusterManagerRequest() {}
 
-	/**
-	 * Singleton instance for {@link ClusterManagerRequest}.
-	 */
-	public static final ClusterManagerRequest _INSTANCE = new ClusterManagerRequest();
+    /**
+     * Singleton instance for {@link ClusterManagerRequest}.
+     */
+    public static final ClusterManagerRequest _INSTANCE = new ClusterManagerRequest();
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Endpoint "{@code cat.master}".
-	 */
-	@Deprecated
-	public static final Endpoint<ClusterManagerRequest, ClusterManagerResponse, ErrorResponse> _DEPRECATED_ENDPOINT = new SimpleEndpoint<>(
+    /**
+     * Endpoint "{@code cat.master}".
+     */
+    @Deprecated
+    public static final Endpoint<ClusterManagerRequest, ClusterManagerResponse, ErrorResponse> _DEPRECATED_ENDPOINT = new SimpleEndpoint<>(
 
-			// Request method
-			request -> {
-				return "GET";
+        // Request method
+        request -> {
+            return "GET";
 
-			},
+        },
 
-			// Request path
-			request -> {
-				return "/_cat/master";
+        // Request path
+        request -> {
+            return "/_cat/master";
 
-			},
+        },
 
-			// Request parameters
-			request -> new HashMap<>(request.queryParameters()), SimpleEndpoint.emptyMap(), false, ClusterManagerResponse._DESERIALIZER);
+        // Request parameters
+        request -> new HashMap<>(request.queryParameters()),
+        SimpleEndpoint.emptyMap(),
+        false,
+        ClusterManagerResponse._DESERIALIZER
+    );
 
-	/**
-	 * Endpoint "{@code cat.cluster_manager}".
-	 */
-	public static final Endpoint<ClusterManagerRequest, ClusterManagerResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+    /**
+     * Endpoint "{@code cat.cluster_manager}".
+     */
+    public static final Endpoint<ClusterManagerRequest, ClusterManagerResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
 
-			// Request method
-			request -> {
-				return "GET";
+        // Request method
+        request -> {
+            return "GET";
 
-			},
+        },
 
-			// Request path
-			request -> {
-				return "/_cat/cluster_manager";
+        // Request path
+        request -> {
+            return "/_cat/cluster_manager";
 
-			},
+        },
 
-			// Request parameters
-			request -> new HashMap<>(request.queryParameters()), SimpleEndpoint.emptyMap(), false, ClusterManagerResponse._DESERIALIZER);
+        // Request parameters
+        request -> new HashMap<>(request.queryParameters()),
+        SimpleEndpoint.emptyMap(),
+        false,
+        ClusterManagerResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/ClusterManagerResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/ClusterManagerResponse.java
index d62171d802..9843696aeb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/ClusterManagerResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/ClusterManagerResponse.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,116 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.cluster_manager.Response
 
 @JsonpDeserializable
 public class ClusterManagerResponse implements JsonpSerializable {
-	private final List<ClusterManagerRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterManagerResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static ClusterManagerResponse of(Function<Builder, ObjectBuilder<ClusterManagerResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<ClusterManagerRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (ClusterManagerRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterManagerResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterManagerResponse> {
-		private List<ClusterManagerRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<ClusterManagerRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(ClusterManagerRecord value, ClusterManagerRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<ClusterManagerRecord.Builder, ObjectBuilder<ClusterManagerRecord>> fn) {
-			return valueBody(fn.apply(new ClusterManagerRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ClusterManagerResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterManagerResponse build() {
-			_checkSingleUse();
-
-			return new ClusterManagerResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<ClusterManagerResponse> _DESERIALIZER = createClusterManagerResponseDeserializer();
-	protected static JsonpDeserializer<ClusterManagerResponse> createClusterManagerResponseDeserializer() {
-
-		JsonpDeserializer<List<ClusterManagerRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(ClusterManagerRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<ClusterManagerRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterManagerResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static ClusterManagerResponse of(Function<Builder, ObjectBuilder<ClusterManagerResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<ClusterManagerRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (ClusterManagerRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterManagerResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterManagerResponse> {
+        private List<ClusterManagerRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<ClusterManagerRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(ClusterManagerRecord value, ClusterManagerRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<ClusterManagerRecord.Builder, ObjectBuilder<ClusterManagerRecord>> fn) {
+            return valueBody(fn.apply(new ClusterManagerRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ClusterManagerResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterManagerResponse build() {
+            _checkSingleUse();
+
+            return new ClusterManagerResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<ClusterManagerResponse> _DESERIALIZER = createClusterManagerResponseDeserializer();
+
+    protected static JsonpDeserializer<ClusterManagerResponse> createClusterManagerResponseDeserializer() {
+
+        JsonpDeserializer<List<ClusterManagerRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(
+            ClusterManagerRecord._DESERIALIZER
+        );
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/CountRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/CountRequest.java
index c116027615..bd6879f747 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/CountRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/CountRequest.java
@@ -32,18 +32,17 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 // typedef: cat.count.Request
 
 /**
@@ -53,121 +52,124 @@
  */
 
 public class CountRequest extends CatRequestBase {
-	private final List<String> index;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CountRequest(Builder builder) {
-		super(builder);
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-
-	}
-
-	public static CountRequest of(Function<Builder, ObjectBuilder<CountRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * A comma-separated list of index names to limit the returned information
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CountRequest}.
-	 */
-
-	public static class Builder extends CatRequestBaseBuilder<CountRequest.Builder> {
-		@Nullable
-		private List<String> index;
-
-		/**
-		 * A comma-separated list of index names to limit the returned information
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names to limit the returned information
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CountRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CountRequest build() {
-			_checkSingleUse();
-
-			return new CountRequest(this);
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cat.count}".
-	 */
-	public static final Endpoint<CountRequest, CountResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cat");
-					buf.append("/count");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cat");
-					buf.append("/count");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> new HashMap<>(request.queryParameters()), SimpleEndpoint.emptyMap(), false, CountResponse._DESERIALIZER);
+    private final List<String> index;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CountRequest(Builder builder) {
+        super(builder);
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+
+    }
+
+    public static CountRequest of(Function<Builder, ObjectBuilder<CountRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * A comma-separated list of index names to limit the returned information
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CountRequest}.
+     */
+
+    public static class Builder extends CatRequestBaseBuilder<CountRequest.Builder> {
+        @Nullable
+        private List<String> index;
+
+        /**
+         * A comma-separated list of index names to limit the returned information
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names to limit the returned information
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link CountRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CountRequest build() {
+            _checkSingleUse();
+
+            return new CountRequest(this);
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cat.count}".
+     */
+    public static final Endpoint<CountRequest, CountResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/count");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/count");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> new HashMap<>(request.queryParameters()),
+        SimpleEndpoint.emptyMap(),
+        false,
+        CountResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/CountResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/CountResponse.java
index 0d9718d5fd..6e6009a8e2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/CountResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/CountResponse.java
@@ -32,125 +32,125 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch.cat.count.CountRecord;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch.cat.count.CountRecord;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.count.Response
 
-
 @JsonpDeserializable
 public class CountResponse implements JsonpSerializable {
-	private final List<CountRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CountResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static CountResponse of(Function<Builder, ObjectBuilder<CountResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<CountRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (CountRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CountResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CountResponse> {
-		private List<CountRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<CountRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(CountRecord value, CountRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<CountRecord.Builder, ObjectBuilder<CountRecord>> fn) {
-			return valueBody(fn.apply(new CountRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link CountResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CountResponse build() {
-			_checkSingleUse();
-
-			return new CountResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<CountResponse> _DESERIALIZER = createCountResponseDeserializer();
-	protected static JsonpDeserializer<CountResponse> createCountResponseDeserializer() {
-
-		JsonpDeserializer<List<CountRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(CountRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<CountRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CountResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static CountResponse of(Function<Builder, ObjectBuilder<CountResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<CountRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (CountRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CountResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CountResponse> {
+        private List<CountRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<CountRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(CountRecord value, CountRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<CountRecord.Builder, ObjectBuilder<CountRecord>> fn) {
+            return valueBody(fn.apply(new CountRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link CountResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CountResponse build() {
+            _checkSingleUse();
+
+            return new CountResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<CountResponse> _DESERIALIZER = createCountResponseDeserializer();
+
+    protected static JsonpDeserializer<CountResponse> createCountResponseDeserializer() {
+
+        JsonpDeserializer<List<CountRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(CountRecord._DESERIALIZER);
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/FielddataRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/FielddataRequest.java
index 29ffe82728..9ff5497bc4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/FielddataRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/FielddataRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.Bytes;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.transport.Endpoint;
@@ -39,13 +45,6 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 // typedef: cat.fielddata.Request
 
 /**
@@ -55,156 +54,158 @@
  */
 
 public class FielddataRequest extends CatRequestBase {
-	@Nullable
-	private final Bytes bytes;
-
-	private final List<String> fields;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FielddataRequest(Builder builder) {
-		super(builder);
-		this.bytes = builder.bytes;
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-
-	}
-
-	public static FielddataRequest of(Function<Builder, ObjectBuilder<FielddataRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * The unit in which to display byte values
-	 * <p>
-	 * API name: {@code bytes}
-	 */
-	@Nullable
-	public final Bytes bytes() {
-		return this.bytes;
-	}
-
-	/**
-	 * A comma-separated list of fields to return the fielddata size
-	 * <p>
-	 * API name: {@code fields}
-	 */
-	public final List<String> fields() {
-		return this.fields;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FielddataRequest}.
-	 */
-
-	public static class Builder extends CatRequestBaseBuilder<FielddataRequest.Builder> {
-		@Nullable
-		private Bytes bytes;
-
-		@Nullable
-		private List<String> fields;
-
-		/**
-		 * The unit in which to display byte values
-		 * <p>
-		 * API name: {@code bytes}
-		 */
-		public final Builder bytes(@Nullable Bytes value) {
-			this.bytes = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of fields to return the fielddata size
-		 * <p>
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fields</code>.
-		 */
-		public final Builder fields(List<String> list) {
-			this.fields = _listAddAll(this.fields, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of fields to return the fielddata size
-		 * <p>
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds one or more values to <code>fields</code>.
-		 */
-		public final Builder fields(String value, String... values) {
-			this.fields = _listAdd(this.fields, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FielddataRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FielddataRequest build() {
-			_checkSingleUse();
-
-			return new FielddataRequest(this);
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cat.fielddata}".
-	 */
-	public static final Endpoint<FielddataRequest, FielddataResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _fields = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.fields()))
-					propsSet |= _fields;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cat");
-					buf.append("/fielddata");
-					return buf.toString();
-				}
-				if (propsSet == (_fields)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cat");
-					buf.append("/fielddata");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.fields.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>(request.queryParameters());
-				if (request.bytes != null) {
-					params.put("bytes", request.bytes.jsonValue());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, FielddataResponse._DESERIALIZER);
+    @Nullable
+    private final Bytes bytes;
+
+    private final List<String> fields;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FielddataRequest(Builder builder) {
+        super(builder);
+        this.bytes = builder.bytes;
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+
+    }
+
+    public static FielddataRequest of(Function<Builder, ObjectBuilder<FielddataRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * The unit in which to display byte values
+     * <p>
+     * API name: {@code bytes}
+     */
+    @Nullable
+    public final Bytes bytes() {
+        return this.bytes;
+    }
+
+    /**
+     * A comma-separated list of fields to return the fielddata size
+     * <p>
+     * API name: {@code fields}
+     */
+    public final List<String> fields() {
+        return this.fields;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FielddataRequest}.
+     */
+
+    public static class Builder extends CatRequestBaseBuilder<FielddataRequest.Builder> {
+        @Nullable
+        private Bytes bytes;
+
+        @Nullable
+        private List<String> fields;
+
+        /**
+         * The unit in which to display byte values
+         * <p>
+         * API name: {@code bytes}
+         */
+        public final Builder bytes(@Nullable Bytes value) {
+            this.bytes = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of fields to return the fielddata size
+         * <p>
+         * API name: {@code fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fields</code>.
+         */
+        public final Builder fields(List<String> list) {
+            this.fields = _listAddAll(this.fields, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of fields to return the fielddata size
+         * <p>
+         * API name: {@code fields}
+         * <p>
+         * Adds one or more values to <code>fields</code>.
+         */
+        public final Builder fields(String value, String... values) {
+            this.fields = _listAdd(this.fields, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link FielddataRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FielddataRequest build() {
+            _checkSingleUse();
+
+            return new FielddataRequest(this);
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cat.fielddata}".
+     */
+    public static final Endpoint<FielddataRequest, FielddataResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _fields = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.fields())) propsSet |= _fields;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/fielddata");
+                return buf.toString();
+            }
+            if (propsSet == (_fields)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/fielddata");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.fields.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>(request.queryParameters());
+            if (request.bytes != null) {
+                params.put("bytes", request.bytes.jsonValue());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        FielddataResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/FielddataResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/FielddataResponse.java
index fe8637ba78..88299a0100 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/FielddataResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/FielddataResponse.java
@@ -32,124 +32,125 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch.cat.fielddata.FielddataRecord;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch.cat.fielddata.FielddataRecord;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.fielddata.Response
 
 @JsonpDeserializable
 public class FielddataResponse implements JsonpSerializable {
-	private final List<FielddataRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FielddataResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static FielddataResponse of(Function<Builder, ObjectBuilder<FielddataResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<FielddataRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (FielddataRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FielddataResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FielddataResponse> {
-		private List<FielddataRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<FielddataRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(FielddataRecord value, FielddataRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<FielddataRecord.Builder, ObjectBuilder<FielddataRecord>> fn) {
-			return valueBody(fn.apply(new FielddataRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link FielddataResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FielddataResponse build() {
-			_checkSingleUse();
-
-			return new FielddataResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<FielddataResponse> _DESERIALIZER = createFielddataResponseDeserializer();
-	protected static JsonpDeserializer<FielddataResponse> createFielddataResponseDeserializer() {
-
-		JsonpDeserializer<List<FielddataRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(FielddataRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<FielddataRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FielddataResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static FielddataResponse of(Function<Builder, ObjectBuilder<FielddataResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<FielddataRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (FielddataRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FielddataResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FielddataResponse> {
+        private List<FielddataRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<FielddataRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(FielddataRecord value, FielddataRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<FielddataRecord.Builder, ObjectBuilder<FielddataRecord>> fn) {
+            return valueBody(fn.apply(new FielddataRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link FielddataResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FielddataResponse build() {
+            _checkSingleUse();
+
+            return new FielddataResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<FielddataResponse> _DESERIALIZER = createFielddataResponseDeserializer();
+
+    protected static JsonpDeserializer<FielddataResponse> createFielddataResponseDeserializer() {
+
+        JsonpDeserializer<List<FielddataRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(FielddataRecord._DESERIALIZER);
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/HealthRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/HealthRequest.java
index 72dfa367b1..86071c4ad1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/HealthRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/HealthRequest.java
@@ -32,113 +32,116 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ObjectBuilder;
 
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-
 // typedef: cat.health.Request
 
 /**
  * Returns a concise representation of the cluster health.
- * 
+ *
  */
 
 public class HealthRequest extends CatRequestBase {
-	@Nullable
-	private final Boolean ts;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HealthRequest(Builder builder) {
-		super(builder);
-		this.ts = builder.ts;
-
-	}
-
-	public static HealthRequest of(Function<Builder, ObjectBuilder<HealthRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Set to false to disable timestamping
-	 * <p>
-	 * API name: {@code ts}
-	 */
-	@Nullable
-	public final Boolean ts() {
-		return this.ts;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HealthRequest}.
-	 */
-
-	public static class Builder extends CatRequestBaseBuilder<HealthRequest.Builder> {
-		@Nullable
-		private Boolean ts;
-
-		/**
-		 * Set to false to disable timestamping
-		 * <p>
-		 * API name: {@code ts}
-		 */
-		public final Builder ts(@Nullable Boolean value) {
-			this.ts = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HealthRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HealthRequest build() {
-			_checkSingleUse();
-
-			return new HealthRequest(this);
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cat.health}".
-	 */
-	public static final Endpoint<HealthRequest, HealthResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				return "/_cat/health";
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>(request.queryParameters());
-				if (request.ts != null) {
-					params.put("ts", String.valueOf(request.ts));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, HealthResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean ts;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HealthRequest(Builder builder) {
+        super(builder);
+        this.ts = builder.ts;
+
+    }
+
+    public static HealthRequest of(Function<Builder, ObjectBuilder<HealthRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Set to false to disable timestamping
+     * <p>
+     * API name: {@code ts}
+     */
+    @Nullable
+    public final Boolean ts() {
+        return this.ts;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HealthRequest}.
+     */
+
+    public static class Builder extends CatRequestBaseBuilder<HealthRequest.Builder> {
+        @Nullable
+        private Boolean ts;
+
+        /**
+         * Set to false to disable timestamping
+         * <p>
+         * API name: {@code ts}
+         */
+        public final Builder ts(@Nullable Boolean value) {
+            this.ts = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link HealthRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HealthRequest build() {
+            _checkSingleUse();
+
+            return new HealthRequest(this);
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cat.health}".
+     */
+    public static final Endpoint<HealthRequest, HealthResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            return "/_cat/health";
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>(request.queryParameters());
+            if (request.ts != null) {
+                params.put("ts", String.valueOf(request.ts));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        HealthResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/HealthResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/HealthResponse.java
index 8f395d216c..f3c5fa6e28 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/HealthResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/HealthResponse.java
@@ -32,125 +32,125 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch.cat.health.HealthRecord;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch.cat.health.HealthRecord;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.health.Response
 
-
 @JsonpDeserializable
 public class HealthResponse implements JsonpSerializable {
-	private final List<HealthRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HealthResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static HealthResponse of(Function<Builder, ObjectBuilder<HealthResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<HealthRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (HealthRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HealthResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HealthResponse> {
-		private List<HealthRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<HealthRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(HealthRecord value, HealthRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<HealthRecord.Builder, ObjectBuilder<HealthRecord>> fn) {
-			return valueBody(fn.apply(new HealthRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link HealthResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HealthResponse build() {
-			_checkSingleUse();
-
-			return new HealthResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<HealthResponse> _DESERIALIZER = createHealthResponseDeserializer();
-	protected static JsonpDeserializer<HealthResponse> createHealthResponseDeserializer() {
-
-		JsonpDeserializer<List<HealthRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(HealthRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<HealthRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HealthResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static HealthResponse of(Function<Builder, ObjectBuilder<HealthResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<HealthRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (HealthRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HealthResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HealthResponse> {
+        private List<HealthRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<HealthRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(HealthRecord value, HealthRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<HealthRecord.Builder, ObjectBuilder<HealthRecord>> fn) {
+            return valueBody(fn.apply(new HealthRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link HealthResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HealthResponse build() {
+            _checkSingleUse();
+
+            return new HealthResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<HealthResponse> _DESERIALIZER = createHealthResponseDeserializer();
+
+    protected static JsonpDeserializer<HealthResponse> createHealthResponseDeserializer() {
+
+        JsonpDeserializer<List<HealthRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(HealthRecord._DESERIALIZER);
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/HelpRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/HelpRequest.java
index d1d65d5af8..6233c3661c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/HelpRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/HelpRequest.java
@@ -32,12 +32,11 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.util.HashMap;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 
-import java.util.HashMap;
-
 // typedef: cat.help.Request
 
 /**
@@ -45,8 +44,7 @@
  */
 
 public class HelpRequest extends CatRequestBase {
-    public HelpRequest() {
-    }
+    public HelpRequest() {}
 
     /**
      * Singleton instance for {@link HelpRequest}.
@@ -60,18 +58,22 @@ public HelpRequest() {
      */
     public static final Endpoint<HelpRequest, HelpResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
 
-            // Request method
-            request -> {
-                return "GET";
+        // Request method
+        request -> {
+            return "GET";
 
-            },
+        },
 
-            // Request path
-            request -> {
-                return "/_cat";
+        // Request path
+        request -> {
+            return "/_cat";
 
-            },
+        },
 
-            // Request parameters
-            request -> new HashMap<>(request.queryParameters()), SimpleEndpoint.emptyMap(), false, HelpResponse._DESERIALIZER);
+        // Request parameters
+        request -> new HashMap<>(request.queryParameters()),
+        SimpleEndpoint.emptyMap(),
+        false,
+        HelpResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/HelpResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/HelpResponse.java
index e4f2ff298b..0b075024c6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/HelpResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/HelpResponse.java
@@ -32,125 +32,125 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch.cat.help.HelpRecord;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch.cat.help.HelpRecord;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.help.Response
 
-
 @JsonpDeserializable
 public class HelpResponse implements JsonpSerializable {
-	private final List<HelpRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HelpResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static HelpResponse of(Function<Builder, ObjectBuilder<HelpResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<HelpRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (HelpRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HelpResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HelpResponse> {
-		private List<HelpRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<HelpRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(HelpRecord value, HelpRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<HelpRecord.Builder, ObjectBuilder<HelpRecord>> fn) {
-			return valueBody(fn.apply(new HelpRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link HelpResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HelpResponse build() {
-			_checkSingleUse();
-
-			return new HelpResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<HelpResponse> _DESERIALIZER = createHelpResponseDeserializer();
-	protected static JsonpDeserializer<HelpResponse> createHelpResponseDeserializer() {
-
-		JsonpDeserializer<List<HelpRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(HelpRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<HelpRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HelpResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static HelpResponse of(Function<Builder, ObjectBuilder<HelpResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<HelpRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (HelpRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HelpResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HelpResponse> {
+        private List<HelpRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<HelpRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(HelpRecord value, HelpRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<HelpRecord.Builder, ObjectBuilder<HelpRecord>> fn) {
+            return valueBody(fn.apply(new HelpRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link HelpResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HelpResponse build() {
+            _checkSingleUse();
+
+            return new HelpResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<HelpResponse> _DESERIALIZER = createHelpResponseDeserializer();
+
+    protected static JsonpDeserializer<HelpResponse> createHelpResponseDeserializer() {
+
+        JsonpDeserializer<List<HelpRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(HelpRecord._DESERIALIZER);
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/IndicesRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/IndicesRequest.java
index 0db5a5a4c6..e2020e6070 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/IndicesRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/IndicesRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.Bytes;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
@@ -41,13 +47,6 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 // typedef: cat.indices.Request
 
 /**
@@ -72,7 +71,6 @@ public class IndicesRequest extends CatRequestBase {
     @Nullable
     private final Boolean pri;
 
-
     // ---------------------------------------------------------------------------------------------
 
     private IndicesRequest(Builder builder) {
@@ -150,7 +148,6 @@ public final Boolean pri() {
         return this.pri;
     }
 
-
     // ---------------------------------------------------------------------------------------------
 
     /**
@@ -292,60 +289,61 @@ public IndicesRequest build() {
      */
     public static final Endpoint<IndicesRequest, IndicesResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
 
-            // Request method
-            request -> {
-                return "GET";
-
-            },
-
-            // Request path
-            request -> {
-                final int _index = 1 << 0;
-
-                int propsSet = 0;
-
-                if (ApiTypeHelper.isDefined(request.index()))
-                    propsSet |= _index;
-
-                if (propsSet == 0) {
-                    StringBuilder buf = new StringBuilder();
-                    buf.append("/_cat");
-                    buf.append("/indices");
-                    return buf.toString();
-                }
-                if (propsSet == (_index)) {
-                    StringBuilder buf = new StringBuilder();
-                    buf.append("/_cat");
-                    buf.append("/indices");
-                    buf.append("/");
-                    SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-                    return buf.toString();
-                }
-                throw SimpleEndpoint.noPathTemplateFound("path");
-
-            },
-
-            // Request parameters
-            request -> {
-                Map<String, String> params =  new HashMap<>(request.queryParameters());
-                if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-                    params.put("expand_wildcards",
-                            request.expandWildcards.stream()
-                                    .map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-                }
-                if (request.bytes != null) {
-                    params.put("bytes", request.bytes.jsonValue());
-                }
-                if (request.pri != null) {
-                    params.put("pri", String.valueOf(request.pri));
-                }
-                if (request.health != null) {
-                    params.put("health", request.health.jsonValue());
-                }
-                if (request.includeUnloadedSegments != null) {
-                    params.put("include_unloaded_segments", String.valueOf(request.includeUnloadedSegments));
-                }
-                return params;
-
-            }, SimpleEndpoint.emptyMap(), false, IndicesResponse._DESERIALIZER);
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/indices");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/indices");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>(request.queryParameters());
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.bytes != null) {
+                params.put("bytes", request.bytes.jsonValue());
+            }
+            if (request.pri != null) {
+                params.put("pri", String.valueOf(request.pri));
+            }
+            if (request.health != null) {
+                params.put("health", request.health.jsonValue());
+            }
+            if (request.includeUnloadedSegments != null) {
+                params.put("include_unloaded_segments", String.valueOf(request.includeUnloadedSegments));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        IndicesResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/IndicesResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/IndicesResponse.java
index c90f352439..d95eeeaab6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/IndicesResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/IndicesResponse.java
@@ -32,125 +32,125 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch.cat.indices.IndicesRecord;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch.cat.indices.IndicesRecord;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.indices.Response
 
-
 @JsonpDeserializable
 public class IndicesResponse implements JsonpSerializable {
-	private final List<IndicesRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndicesResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static IndicesResponse of(Function<Builder, ObjectBuilder<IndicesResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<IndicesRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (IndicesRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndicesResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesResponse> {
-		private List<IndicesRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<IndicesRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(IndicesRecord value, IndicesRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<IndicesRecord.Builder, ObjectBuilder<IndicesRecord>> fn) {
-			return valueBody(fn.apply(new IndicesRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link IndicesResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndicesResponse build() {
-			_checkSingleUse();
-
-			return new IndicesResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<IndicesResponse> _DESERIALIZER = createIndicesResponseDeserializer();
-	protected static JsonpDeserializer<IndicesResponse> createIndicesResponseDeserializer() {
-
-		JsonpDeserializer<List<IndicesRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(IndicesRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<IndicesRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndicesResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static IndicesResponse of(Function<Builder, ObjectBuilder<IndicesResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<IndicesRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (IndicesRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndicesResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesResponse> {
+        private List<IndicesRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<IndicesRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(IndicesRecord value, IndicesRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<IndicesRecord.Builder, ObjectBuilder<IndicesRecord>> fn) {
+            return valueBody(fn.apply(new IndicesRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link IndicesResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndicesResponse build() {
+            _checkSingleUse();
+
+            return new IndicesResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<IndicesResponse> _DESERIALIZER = createIndicesResponseDeserializer();
+
+    protected static JsonpDeserializer<IndicesResponse> createIndicesResponseDeserializer() {
+
+        JsonpDeserializer<List<IndicesRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(IndicesRecord._DESERIALIZER);
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/NodeattrsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/NodeattrsRequest.java
index f173d4bcaf..eb4ce34115 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/NodeattrsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/NodeattrsRequest.java
@@ -32,12 +32,11 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.util.HashMap;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 
-import java.util.HashMap;
-
 // typedef: cat.nodeattrs.Request
 
 /**
@@ -45,8 +44,7 @@
  */
 
 public class NodeattrsRequest extends CatRequestBase {
-    public NodeattrsRequest() {
-    }
+    public NodeattrsRequest() {}
 
     /**
      * Singleton instance for {@link NodeattrsRequest}.
@@ -60,18 +58,22 @@ public NodeattrsRequest() {
      */
     public static final Endpoint<NodeattrsRequest, NodeattrsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
 
-            // Request method
-            request -> {
-                return "GET";
+        // Request method
+        request -> {
+            return "GET";
 
-            },
+        },
 
-            // Request path
-            request -> {
-                return "/_cat/nodeattrs";
+        // Request path
+        request -> {
+            return "/_cat/nodeattrs";
 
-            },
+        },
 
-            // Request parameters
-            request -> new HashMap<>(request.queryParameters()), SimpleEndpoint.emptyMap(), false, NodeattrsResponse._DESERIALIZER);
+        // Request parameters
+        request -> new HashMap<>(request.queryParameters()),
+        SimpleEndpoint.emptyMap(),
+        false,
+        NodeattrsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/NodeattrsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/NodeattrsResponse.java
index 20bcafbb2b..e58f09e794 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/NodeattrsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/NodeattrsResponse.java
@@ -32,124 +32,127 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch.cat.nodeattrs.NodeAttributesRecord;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch.cat.nodeattrs.NodeAttributesRecord;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.nodeattrs.Response
 
 @JsonpDeserializable
 public class NodeattrsResponse implements JsonpSerializable {
-	private final List<NodeAttributesRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeattrsResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static NodeattrsResponse of(Function<Builder, ObjectBuilder<NodeattrsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<NodeAttributesRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (NodeAttributesRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeattrsResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeattrsResponse> {
-		private List<NodeAttributesRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<NodeAttributesRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(NodeAttributesRecord value, NodeAttributesRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<NodeAttributesRecord.Builder, ObjectBuilder<NodeAttributesRecord>> fn) {
-			return valueBody(fn.apply(new NodeAttributesRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link NodeattrsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeattrsResponse build() {
-			_checkSingleUse();
-
-			return new NodeattrsResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<NodeattrsResponse> _DESERIALIZER = createNodeattrsResponseDeserializer();
-	protected static JsonpDeserializer<NodeattrsResponse> createNodeattrsResponseDeserializer() {
-
-		JsonpDeserializer<List<NodeAttributesRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(NodeAttributesRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<NodeAttributesRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeattrsResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static NodeattrsResponse of(Function<Builder, ObjectBuilder<NodeattrsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<NodeAttributesRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (NodeAttributesRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeattrsResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeattrsResponse> {
+        private List<NodeAttributesRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<NodeAttributesRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(NodeAttributesRecord value, NodeAttributesRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<NodeAttributesRecord.Builder, ObjectBuilder<NodeAttributesRecord>> fn) {
+            return valueBody(fn.apply(new NodeAttributesRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link NodeattrsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeattrsResponse build() {
+            _checkSingleUse();
+
+            return new NodeattrsResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<NodeattrsResponse> _DESERIALIZER = createNodeattrsResponseDeserializer();
+
+    protected static JsonpDeserializer<NodeattrsResponse> createNodeattrsResponseDeserializer() {
+
+        JsonpDeserializer<List<NodeAttributesRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(
+            NodeAttributesRecord._DESERIALIZER
+        );
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/NodesRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/NodesRequest.java
index 29252ca0f0..f6aa649809 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/NodesRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/NodesRequest.java
@@ -32,17 +32,16 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.Bytes;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ObjectBuilder;
 
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-
 // typedef: cat.nodes.Request
 
 /**
@@ -146,28 +145,32 @@ protected Builder self() {
      */
     public static final Endpoint<NodesRequest, NodesResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
 
-            // Request method
-            request -> {
-                return "GET";
-
-            },
-
-            // Request path
-            request -> {
-                return "/_cat/nodes";
-
-            },
-
-            // Request parameters
-            request -> {
-                Map<String, String> params = new HashMap<>(request.queryParameters());
-                if (request.bytes != null) {
-                    params.put("bytes", request.bytes.jsonValue());
-                }
-                if (request.fullId != null) {
-                    params.put("full_id", String.valueOf(request.fullId));
-                }
-                return params;
-
-            }, SimpleEndpoint.emptyMap(), false, NodesResponse._DESERIALIZER);
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            return "/_cat/nodes";
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>(request.queryParameters());
+            if (request.bytes != null) {
+                params.put("bytes", request.bytes.jsonValue());
+            }
+            if (request.fullId != null) {
+                params.put("full_id", String.valueOf(request.fullId));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        NodesResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/NodesResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/NodesResponse.java
index ed6df418a0..e1646136f1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/NodesResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/NodesResponse.java
@@ -32,125 +32,125 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch.cat.nodes.NodesRecord;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch.cat.nodes.NodesRecord;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.nodes.Response
 
-
 @JsonpDeserializable
 public class NodesResponse implements JsonpSerializable {
-	private final List<NodesRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodesResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static NodesResponse of(Function<Builder, ObjectBuilder<NodesResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<NodesRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (NodesRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodesResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodesResponse> {
-		private List<NodesRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<NodesRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(NodesRecord value, NodesRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<NodesRecord.Builder, ObjectBuilder<NodesRecord>> fn) {
-			return valueBody(fn.apply(new NodesRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link NodesResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodesResponse build() {
-			_checkSingleUse();
-
-			return new NodesResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<NodesResponse> _DESERIALIZER = createNodesResponseDeserializer();
-	protected static JsonpDeserializer<NodesResponse> createNodesResponseDeserializer() {
-
-		JsonpDeserializer<List<NodesRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(NodesRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<NodesRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodesResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static NodesResponse of(Function<Builder, ObjectBuilder<NodesResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<NodesRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (NodesRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodesResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodesResponse> {
+        private List<NodesRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<NodesRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(NodesRecord value, NodesRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<NodesRecord.Builder, ObjectBuilder<NodesRecord>> fn) {
+            return valueBody(fn.apply(new NodesRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link NodesResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodesResponse build() {
+            _checkSingleUse();
+
+            return new NodesResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<NodesResponse> _DESERIALIZER = createNodesResponseDeserializer();
+
+    protected static JsonpDeserializer<NodesResponse> createNodesResponseDeserializer() {
+
+        JsonpDeserializer<List<NodesRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(NodesRecord._DESERIALIZER);
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/OpenSearchCatAsyncClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/OpenSearchCatAsyncClient.java
index 16590f2a3a..f7d4a2720a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/OpenSearchCatAsyncClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/OpenSearchCatAsyncClient.java
@@ -32,748 +32,761 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
+import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.TransportOptions;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.io.IOException;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 /**
  * Client for the cat namespace.
  */
 public class OpenSearchCatAsyncClient extends ApiClient<OpenSearchTransport, OpenSearchCatAsyncClient> {
 
-	public OpenSearchCatAsyncClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchCatAsyncClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchCatAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchCatAsyncClient(this.transport, transportOptions);
-	}
-
-	// ----- Endpoint: cat.aliases
-
-	/**
-	 * Shows information about currently configured aliases to indices including
-	 * filter and routing infos.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<AliasesResponse> aliases(AliasesRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<AliasesRequest, AliasesResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<AliasesRequest, AliasesResponse, ErrorResponse>) AliasesRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Shows information about currently configured aliases to indices including
-	 * filter and routing infos.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link AliasesRequest}
-	 *
-	 */
-
-	public final CompletableFuture<AliasesResponse> aliases(
-			Function<AliasesRequest.Builder, ObjectBuilder<AliasesRequest>> fn)
-			throws IOException, OpenSearchException {
-		return aliases(fn.apply(new AliasesRequest.Builder()).build());
-	}
-
-	/**
-	 * Shows information about currently configured aliases to indices including
-	 * filter and routing infos.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<AliasesResponse> aliases() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new AliasesRequest.Builder().build(), AliasesRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.allocation
-
-	/**
-	 * Provides a snapshot of how many shards are allocated to each data node and
-	 * how much disk space they are using.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<AllocationResponse> allocation(AllocationRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<AllocationRequest, AllocationResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<AllocationRequest, AllocationResponse, ErrorResponse>) AllocationRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Provides a snapshot of how many shards are allocated to each data node and
-	 * how much disk space they are using.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link AllocationRequest}
-	 *
-	 */
-
-	public final CompletableFuture<AllocationResponse> allocation(
-			Function<AllocationRequest.Builder, ObjectBuilder<AllocationRequest>> fn)
-			throws IOException, OpenSearchException {
-		return allocation(fn.apply(new AllocationRequest.Builder()).build());
-	}
-
-	/**
-	 * Provides a snapshot of how many shards are allocated to each data node and
-	 * how much disk space they are using.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<AllocationResponse> allocation() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new AllocationRequest.Builder().build(), AllocationRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.count
-
-	/**
-	 * Provides quick access to the document count of the entire cluster, or
-	 * individual indices.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<CountResponse> count(CountRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CountRequest, CountResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CountRequest, CountResponse, ErrorResponse>) CountRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Provides quick access to the document count of the entire cluster, or
-	 * individual indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CountRequest}
-	 *
-	 */
-
-	public final CompletableFuture<CountResponse> count(Function<CountRequest.Builder, ObjectBuilder<CountRequest>> fn)
-			throws IOException, OpenSearchException {
-		return count(fn.apply(new CountRequest.Builder()).build());
-	}
-
-	/**
-	 * Provides quick access to the document count of the entire cluster, or
-	 * individual indices.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<CountResponse> count() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new CountRequest.Builder().build(), CountRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.fielddata
-
-	/**
-	 * Shows how much heap memory is currently being used by fielddata on every data
-	 * node in the cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<FielddataResponse> fielddata(FielddataRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<FielddataRequest, FielddataResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<FielddataRequest, FielddataResponse, ErrorResponse>) FielddataRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Shows how much heap memory is currently being used by fielddata on every data
-	 * node in the cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link FielddataRequest}
-	 *
-	 */
-
-	public final CompletableFuture<FielddataResponse> fielddata(
-			Function<FielddataRequest.Builder, ObjectBuilder<FielddataRequest>> fn)
-			throws IOException, OpenSearchException {
-		return fielddata(fn.apply(new FielddataRequest.Builder()).build());
-	}
-
-	/**
-	 * Shows how much heap memory is currently being used by fielddata on every data
-	 * node in the cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<FielddataResponse> fielddata() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new FielddataRequest.Builder().build(), FielddataRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.health
-
-	/**
-	 * Returns a concise representation of the cluster health.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<HealthResponse> health(HealthRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<HealthRequest, HealthResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<HealthRequest, HealthResponse, ErrorResponse>) HealthRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns a concise representation of the cluster health.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link HealthRequest}
-	 *
-	 */
-
-	public final CompletableFuture<HealthResponse> health(
-			Function<HealthRequest.Builder, ObjectBuilder<HealthRequest>> fn)
-			throws IOException, OpenSearchException {
-		return health(fn.apply(new HealthRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns a concise representation of the cluster health.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<HealthResponse> health() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new HealthRequest.Builder().build(), HealthRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.help
-
-	/**
-	 * Returns help for the Cat APIs.
-	 * 
-	 *
-	 */
-	public CompletableFuture<HelpResponse> help() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(HelpRequest._INSTANCE, HelpRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.indices
-
-	/**
-	 * Returns information about indices: number of primaries and replicas, document
-	 * counts, disk size, ...
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<IndicesResponse> indices(IndicesRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<IndicesRequest, IndicesResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<IndicesRequest, IndicesResponse, ErrorResponse>) IndicesRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about indices: number of primaries and replicas, document
-	 * counts, disk size, ...
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link IndicesRequest}
-	 *
-	 */
-
-	public final CompletableFuture<IndicesResponse> indices(
-			Function<IndicesRequest.Builder, ObjectBuilder<IndicesRequest>> fn)
-			throws IOException, OpenSearchException {
-		return indices(fn.apply(new IndicesRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about indices: number of primaries and replicas, document
-	 * counts, disk size, ...
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<IndicesResponse> indices() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new IndicesRequest.Builder().build(), IndicesRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.master
-
-	/**
-	 * Returns information about the master node.
-	 * 
-	 *
-	 */
-	@Deprecated
-	public CompletableFuture<ClusterManagerResponse> master() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(ClusterManagerRequest._INSTANCE, ClusterManagerRequest._DEPRECATED_ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.cluster_manager
-
-	/**
-	 * Returns information about the cluster-manager node.
-	 * 
-	 *
-	 */
-	public CompletableFuture<ClusterManagerResponse> clusterManager() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(ClusterManagerRequest._INSTANCE, ClusterManagerRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.nodeattrs
-
-	/**
-	 * Returns information about custom node attributes.
-	 * 
-	 *
-	 */
-	public CompletableFuture<NodeattrsResponse> nodeattrs() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(NodeattrsRequest._INSTANCE, NodeattrsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.nodes
-
-	/**
-	 * Returns basic statistics about performance of cluster nodes.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<NodesResponse> nodes(NodesRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<NodesRequest, NodesResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<NodesRequest, NodesResponse, ErrorResponse>) NodesRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns basic statistics about performance of cluster nodes.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link NodesRequest}
-	 *
-	 */
-
-	public final CompletableFuture<NodesResponse> nodes(Function<NodesRequest.Builder, ObjectBuilder<NodesRequest>> fn)
-			throws IOException, OpenSearchException {
-		return nodes(fn.apply(new NodesRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns basic statistics about performance of cluster nodes.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<NodesResponse> nodes() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new NodesRequest.Builder().build(), NodesRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.point_in_time_segments
-
-	/**
-	 * Provides low-level information about the disk utilization of a PIT by
-	 * describing its Lucene segments.
-	 * 
-	 *
-	 */
-	public CompletableFuture<SegmentsResponse> pitSegments() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new PitSegmentsRequest.Builder().build(),
-				PitSegmentsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.pending_tasks
-
-	/**
-	 * Returns a concise representation of the cluster pending tasks.
-	 * 
-	 *
-	 */
-	public CompletableFuture<PendingTasksResponse> pendingTasks() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(PendingTasksRequest._INSTANCE, PendingTasksRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.plugins
-
-	/**
-	 * Returns information about installed plugins across nodes node.
-	 * 
-	 *
-	 */
-	public CompletableFuture<PluginsResponse> plugins() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(PluginsRequest._INSTANCE, PluginsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.recovery
-
-	/**
-	 * Returns information about index shard recoveries, both on-going completed.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<RecoveryResponse> recovery(RecoveryRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<RecoveryRequest, RecoveryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<RecoveryRequest, RecoveryResponse, ErrorResponse>) RecoveryRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about index shard recoveries, both on-going completed.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link RecoveryRequest}
-	 *
-	 */
-
-	public final CompletableFuture<RecoveryResponse> recovery(
-			Function<RecoveryRequest.Builder, ObjectBuilder<RecoveryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return recovery(fn.apply(new RecoveryRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about index shard recoveries, both on-going completed.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<RecoveryResponse> recovery() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new RecoveryRequest.Builder().build(), RecoveryRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.repositories
-
-	/**
-	 * Returns information about snapshot repositories registered in the cluster.
-	 * 
-	 *
-	 */
-	public CompletableFuture<RepositoriesResponse> repositories() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(RepositoriesRequest._INSTANCE, RepositoriesRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.segments
-
-	/**
-	 * Provides low-level information about the segments in the shards of an index.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<SegmentsResponse> segments(SegmentsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SegmentsRequest, SegmentsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<SegmentsRequest, SegmentsResponse, ErrorResponse>) SegmentsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Provides low-level information about the segments in the shards of an index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SegmentsRequest}
-	 *
-	 */
-
-	public final CompletableFuture<SegmentsResponse> segments(
-			Function<SegmentsRequest.Builder, ObjectBuilder<SegmentsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return segments(fn.apply(new SegmentsRequest.Builder()).build());
-	}
-
-	/**
-	 * Provides low-level information about the segments in the shards of an index.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<SegmentsResponse> segments() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new SegmentsRequest.Builder().build(), SegmentsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.shards
-
-	/**
-	 * Provides a detailed view of shard allocation on nodes.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ShardsResponse> shards(ShardsRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ShardsRequest, ShardsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ShardsRequest, ShardsResponse, ErrorResponse>) ShardsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Provides a detailed view of shard allocation on nodes.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ShardsRequest}
-	 *
-	 */
-
-	public final CompletableFuture<ShardsResponse> shards(
-			Function<ShardsRequest.Builder, ObjectBuilder<ShardsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return shards(fn.apply(new ShardsRequest.Builder()).build());
-	}
-
-	/**
-	 * Provides a detailed view of shard allocation on nodes.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ShardsResponse> shards() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new ShardsRequest.Builder().build(), ShardsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.snapshots
-
-	/**
-	 * Returns all snapshots in a specific repository.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<SnapshotsResponse> snapshots(SnapshotsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SnapshotsRequest, SnapshotsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<SnapshotsRequest, SnapshotsResponse, ErrorResponse>) SnapshotsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns all snapshots in a specific repository.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SnapshotsRequest}
-	 *
-	 */
-
-	public final CompletableFuture<SnapshotsResponse> snapshots(
-			Function<SnapshotsRequest.Builder, ObjectBuilder<SnapshotsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return snapshots(fn.apply(new SnapshotsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns all snapshots in a specific repository.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<SnapshotsResponse> snapshots() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new SnapshotsRequest.Builder().build(), SnapshotsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.tasks
-
-	/**
-	 * Returns information about the tasks currently executing on one or more nodes
-	 * in the cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<TasksResponse> tasks(TasksRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<TasksRequest, TasksResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<TasksRequest, TasksResponse, ErrorResponse>) TasksRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about the tasks currently executing on one or more nodes
-	 * in the cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link TasksRequest}
-	 *
-	 */
-
-	public final CompletableFuture<TasksResponse> tasks(Function<TasksRequest.Builder, ObjectBuilder<TasksRequest>> fn)
-			throws IOException, OpenSearchException {
-		return tasks(fn.apply(new TasksRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about the tasks currently executing on one or more nodes
-	 * in the cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<TasksResponse> tasks() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new TasksRequest.Builder().build(), TasksRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.templates
-
-	/**
-	 * Returns information about existing templates.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<TemplatesResponse> templates(TemplatesRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<TemplatesRequest, TemplatesResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<TemplatesRequest, TemplatesResponse, ErrorResponse>) TemplatesRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about existing templates.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link TemplatesRequest}
-	 *
-	 */
-
-	public final CompletableFuture<TemplatesResponse> templates(
-			Function<TemplatesRequest.Builder, ObjectBuilder<TemplatesRequest>> fn)
-			throws IOException, OpenSearchException {
-		return templates(fn.apply(new TemplatesRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about existing templates.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<TemplatesResponse> templates() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new TemplatesRequest.Builder().build(), TemplatesRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.thread_pool
-
-	/**
-	 * Returns cluster-wide thread pool statistics per node. By default the active,
-	 * queue and rejected statistics are returned for all thread pools.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ThreadPoolResponse> threadPool(ThreadPoolRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ThreadPoolRequest, ThreadPoolResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ThreadPoolRequest, ThreadPoolResponse, ErrorResponse>) ThreadPoolRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns cluster-wide thread pool statistics per node. By default the active,
-	 * queue and rejected statistics are returned for all thread pools.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ThreadPoolRequest}
-	 *
-	 */
-
-	public final CompletableFuture<ThreadPoolResponse> threadPool(
-			Function<ThreadPoolRequest.Builder, ObjectBuilder<ThreadPoolRequest>> fn)
-			throws IOException, OpenSearchException {
-		return threadPool(fn.apply(new ThreadPoolRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns cluster-wide thread pool statistics per node. By default the active,
-	 * queue and rejected statistics are returned for all thread pools.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ThreadPoolResponse> threadPool() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new ThreadPoolRequest.Builder().build(), ThreadPoolRequest._ENDPOINT,
-				this.transportOptions);
-	}
+    public OpenSearchCatAsyncClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchCatAsyncClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchCatAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchCatAsyncClient(this.transport, transportOptions);
+    }
+
+    // ----- Endpoint: cat.aliases
+
+    /**
+     * Shows information about currently configured aliases to indices including
+     * filter and routing infos.
+     *
+     *
+     */
+
+    public CompletableFuture<AliasesResponse> aliases(AliasesRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<AliasesRequest, AliasesResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            AliasesRequest,
+            AliasesResponse,
+            ErrorResponse>) AliasesRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Shows information about currently configured aliases to indices including
+     * filter and routing infos.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link AliasesRequest}
+     *
+     */
+
+    public final CompletableFuture<AliasesResponse> aliases(Function<AliasesRequest.Builder, ObjectBuilder<AliasesRequest>> fn)
+        throws IOException, OpenSearchException {
+        return aliases(fn.apply(new AliasesRequest.Builder()).build());
+    }
+
+    /**
+     * Shows information about currently configured aliases to indices including
+     * filter and routing infos.
+     *
+     *
+     */
+
+    public CompletableFuture<AliasesResponse> aliases() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new AliasesRequest.Builder().build(), AliasesRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.allocation
+
+    /**
+     * Provides a snapshot of how many shards are allocated to each data node and
+     * how much disk space they are using.
+     *
+     *
+     */
+
+    public CompletableFuture<AllocationResponse> allocation(AllocationRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<AllocationRequest, AllocationResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            AllocationRequest,
+            AllocationResponse,
+            ErrorResponse>) AllocationRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Provides a snapshot of how many shards are allocated to each data node and
+     * how much disk space they are using.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link AllocationRequest}
+     *
+     */
+
+    public final CompletableFuture<AllocationResponse> allocation(Function<AllocationRequest.Builder, ObjectBuilder<AllocationRequest>> fn)
+        throws IOException, OpenSearchException {
+        return allocation(fn.apply(new AllocationRequest.Builder()).build());
+    }
+
+    /**
+     * Provides a snapshot of how many shards are allocated to each data node and
+     * how much disk space they are using.
+     *
+     *
+     */
+
+    public CompletableFuture<AllocationResponse> allocation() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new AllocationRequest.Builder().build(),
+            AllocationRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cat.count
+
+    /**
+     * Provides quick access to the document count of the entire cluster, or
+     * individual indices.
+     *
+     *
+     */
+
+    public CompletableFuture<CountResponse> count(CountRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CountRequest, CountResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CountRequest,
+            CountResponse,
+            ErrorResponse>) CountRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Provides quick access to the document count of the entire cluster, or
+     * individual indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CountRequest}
+     *
+     */
+
+    public final CompletableFuture<CountResponse> count(Function<CountRequest.Builder, ObjectBuilder<CountRequest>> fn) throws IOException,
+        OpenSearchException {
+        return count(fn.apply(new CountRequest.Builder()).build());
+    }
+
+    /**
+     * Provides quick access to the document count of the entire cluster, or
+     * individual indices.
+     *
+     *
+     */
+
+    public CompletableFuture<CountResponse> count() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new CountRequest.Builder().build(), CountRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.fielddata
+
+    /**
+     * Shows how much heap memory is currently being used by fielddata on every data
+     * node in the cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<FielddataResponse> fielddata(FielddataRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<FielddataRequest, FielddataResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            FielddataRequest,
+            FielddataResponse,
+            ErrorResponse>) FielddataRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Shows how much heap memory is currently being used by fielddata on every data
+     * node in the cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link FielddataRequest}
+     *
+     */
+
+    public final CompletableFuture<FielddataResponse> fielddata(Function<FielddataRequest.Builder, ObjectBuilder<FielddataRequest>> fn)
+        throws IOException, OpenSearchException {
+        return fielddata(fn.apply(new FielddataRequest.Builder()).build());
+    }
+
+    /**
+     * Shows how much heap memory is currently being used by fielddata on every data
+     * node in the cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<FielddataResponse> fielddata() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new FielddataRequest.Builder().build(),
+            FielddataRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cat.health
+
+    /**
+     * Returns a concise representation of the cluster health.
+     *
+     *
+     */
+
+    public CompletableFuture<HealthResponse> health(HealthRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<HealthRequest, HealthResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            HealthRequest,
+            HealthResponse,
+            ErrorResponse>) HealthRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns a concise representation of the cluster health.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link HealthRequest}
+     *
+     */
+
+    public final CompletableFuture<HealthResponse> health(Function<HealthRequest.Builder, ObjectBuilder<HealthRequest>> fn)
+        throws IOException, OpenSearchException {
+        return health(fn.apply(new HealthRequest.Builder()).build());
+    }
+
+    /**
+     * Returns a concise representation of the cluster health.
+     *
+     *
+     */
+
+    public CompletableFuture<HealthResponse> health() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new HealthRequest.Builder().build(), HealthRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.help
+
+    /**
+     * Returns help for the Cat APIs.
+     *
+     *
+     */
+    public CompletableFuture<HelpResponse> help() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(HelpRequest._INSTANCE, HelpRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.indices
+
+    /**
+     * Returns information about indices: number of primaries and replicas, document
+     * counts, disk size, ...
+     *
+     *
+     */
+
+    public CompletableFuture<IndicesResponse> indices(IndicesRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<IndicesRequest, IndicesResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            IndicesRequest,
+            IndicesResponse,
+            ErrorResponse>) IndicesRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about indices: number of primaries and replicas, document
+     * counts, disk size, ...
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link IndicesRequest}
+     *
+     */
+
+    public final CompletableFuture<IndicesResponse> indices(Function<IndicesRequest.Builder, ObjectBuilder<IndicesRequest>> fn)
+        throws IOException, OpenSearchException {
+        return indices(fn.apply(new IndicesRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about indices: number of primaries and replicas, document
+     * counts, disk size, ...
+     *
+     *
+     */
+
+    public CompletableFuture<IndicesResponse> indices() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new IndicesRequest.Builder().build(), IndicesRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.master
+
+    /**
+     * Returns information about the master node.
+     *
+     *
+     */
+    @Deprecated
+    public CompletableFuture<ClusterManagerResponse> master() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            ClusterManagerRequest._INSTANCE,
+            ClusterManagerRequest._DEPRECATED_ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cat.cluster_manager
+
+    /**
+     * Returns information about the cluster-manager node.
+     *
+     *
+     */
+    public CompletableFuture<ClusterManagerResponse> clusterManager() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(ClusterManagerRequest._INSTANCE, ClusterManagerRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.nodeattrs
+
+    /**
+     * Returns information about custom node attributes.
+     *
+     *
+     */
+    public CompletableFuture<NodeattrsResponse> nodeattrs() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(NodeattrsRequest._INSTANCE, NodeattrsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.nodes
+
+    /**
+     * Returns basic statistics about performance of cluster nodes.
+     *
+     *
+     */
+
+    public CompletableFuture<NodesResponse> nodes(NodesRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<NodesRequest, NodesResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            NodesRequest,
+            NodesResponse,
+            ErrorResponse>) NodesRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns basic statistics about performance of cluster nodes.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link NodesRequest}
+     *
+     */
+
+    public final CompletableFuture<NodesResponse> nodes(Function<NodesRequest.Builder, ObjectBuilder<NodesRequest>> fn) throws IOException,
+        OpenSearchException {
+        return nodes(fn.apply(new NodesRequest.Builder()).build());
+    }
+
+    /**
+     * Returns basic statistics about performance of cluster nodes.
+     *
+     *
+     */
+
+    public CompletableFuture<NodesResponse> nodes() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new NodesRequest.Builder().build(), NodesRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.point_in_time_segments
+
+    /**
+     * Provides low-level information about the disk utilization of a PIT by
+     * describing its Lucene segments.
+     *
+     *
+     */
+    public CompletableFuture<SegmentsResponse> pitSegments() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new PitSegmentsRequest.Builder().build(),
+            PitSegmentsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cat.pending_tasks
+
+    /**
+     * Returns a concise representation of the cluster pending tasks.
+     *
+     *
+     */
+    public CompletableFuture<PendingTasksResponse> pendingTasks() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(PendingTasksRequest._INSTANCE, PendingTasksRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.plugins
+
+    /**
+     * Returns information about installed plugins across nodes node.
+     *
+     *
+     */
+    public CompletableFuture<PluginsResponse> plugins() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(PluginsRequest._INSTANCE, PluginsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.recovery
+
+    /**
+     * Returns information about index shard recoveries, both on-going completed.
+     *
+     *
+     */
+
+    public CompletableFuture<RecoveryResponse> recovery(RecoveryRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<RecoveryRequest, RecoveryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            RecoveryRequest,
+            RecoveryResponse,
+            ErrorResponse>) RecoveryRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about index shard recoveries, both on-going completed.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link RecoveryRequest}
+     *
+     */
+
+    public final CompletableFuture<RecoveryResponse> recovery(Function<RecoveryRequest.Builder, ObjectBuilder<RecoveryRequest>> fn)
+        throws IOException, OpenSearchException {
+        return recovery(fn.apply(new RecoveryRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about index shard recoveries, both on-going completed.
+     *
+     *
+     */
+
+    public CompletableFuture<RecoveryResponse> recovery() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new RecoveryRequest.Builder().build(), RecoveryRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.repositories
+
+    /**
+     * Returns information about snapshot repositories registered in the cluster.
+     *
+     *
+     */
+    public CompletableFuture<RepositoriesResponse> repositories() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(RepositoriesRequest._INSTANCE, RepositoriesRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.segments
+
+    /**
+     * Provides low-level information about the segments in the shards of an index.
+     *
+     *
+     */
+
+    public CompletableFuture<SegmentsResponse> segments(SegmentsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SegmentsRequest, SegmentsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            SegmentsRequest,
+            SegmentsResponse,
+            ErrorResponse>) SegmentsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Provides low-level information about the segments in the shards of an index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SegmentsRequest}
+     *
+     */
+
+    public final CompletableFuture<SegmentsResponse> segments(Function<SegmentsRequest.Builder, ObjectBuilder<SegmentsRequest>> fn)
+        throws IOException, OpenSearchException {
+        return segments(fn.apply(new SegmentsRequest.Builder()).build());
+    }
+
+    /**
+     * Provides low-level information about the segments in the shards of an index.
+     *
+     *
+     */
+
+    public CompletableFuture<SegmentsResponse> segments() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new SegmentsRequest.Builder().build(), SegmentsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.shards
+
+    /**
+     * Provides a detailed view of shard allocation on nodes.
+     *
+     *
+     */
+
+    public CompletableFuture<ShardsResponse> shards(ShardsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ShardsRequest, ShardsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ShardsRequest,
+            ShardsResponse,
+            ErrorResponse>) ShardsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Provides a detailed view of shard allocation on nodes.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ShardsRequest}
+     *
+     */
+
+    public final CompletableFuture<ShardsResponse> shards(Function<ShardsRequest.Builder, ObjectBuilder<ShardsRequest>> fn)
+        throws IOException, OpenSearchException {
+        return shards(fn.apply(new ShardsRequest.Builder()).build());
+    }
+
+    /**
+     * Provides a detailed view of shard allocation on nodes.
+     *
+     *
+     */
+
+    public CompletableFuture<ShardsResponse> shards() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new ShardsRequest.Builder().build(), ShardsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.snapshots
+
+    /**
+     * Returns all snapshots in a specific repository.
+     *
+     *
+     */
+
+    public CompletableFuture<SnapshotsResponse> snapshots(SnapshotsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SnapshotsRequest, SnapshotsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            SnapshotsRequest,
+            SnapshotsResponse,
+            ErrorResponse>) SnapshotsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns all snapshots in a specific repository.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SnapshotsRequest}
+     *
+     */
+
+    public final CompletableFuture<SnapshotsResponse> snapshots(Function<SnapshotsRequest.Builder, ObjectBuilder<SnapshotsRequest>> fn)
+        throws IOException, OpenSearchException {
+        return snapshots(fn.apply(new SnapshotsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns all snapshots in a specific repository.
+     *
+     *
+     */
+
+    public CompletableFuture<SnapshotsResponse> snapshots() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new SnapshotsRequest.Builder().build(),
+            SnapshotsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cat.tasks
+
+    /**
+     * Returns information about the tasks currently executing on one or more nodes
+     * in the cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<TasksResponse> tasks(TasksRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<TasksRequest, TasksResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            TasksRequest,
+            TasksResponse,
+            ErrorResponse>) TasksRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about the tasks currently executing on one or more nodes
+     * in the cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link TasksRequest}
+     *
+     */
+
+    public final CompletableFuture<TasksResponse> tasks(Function<TasksRequest.Builder, ObjectBuilder<TasksRequest>> fn) throws IOException,
+        OpenSearchException {
+        return tasks(fn.apply(new TasksRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about the tasks currently executing on one or more nodes
+     * in the cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<TasksResponse> tasks() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new TasksRequest.Builder().build(), TasksRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.templates
+
+    /**
+     * Returns information about existing templates.
+     *
+     *
+     */
+
+    public CompletableFuture<TemplatesResponse> templates(TemplatesRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<TemplatesRequest, TemplatesResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            TemplatesRequest,
+            TemplatesResponse,
+            ErrorResponse>) TemplatesRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about existing templates.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link TemplatesRequest}
+     *
+     */
+
+    public final CompletableFuture<TemplatesResponse> templates(Function<TemplatesRequest.Builder, ObjectBuilder<TemplatesRequest>> fn)
+        throws IOException, OpenSearchException {
+        return templates(fn.apply(new TemplatesRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about existing templates.
+     *
+     *
+     */
+
+    public CompletableFuture<TemplatesResponse> templates() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new TemplatesRequest.Builder().build(),
+            TemplatesRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cat.thread_pool
+
+    /**
+     * Returns cluster-wide thread pool statistics per node. By default the active,
+     * queue and rejected statistics are returned for all thread pools.
+     *
+     *
+     */
+
+    public CompletableFuture<ThreadPoolResponse> threadPool(ThreadPoolRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ThreadPoolRequest, ThreadPoolResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ThreadPoolRequest,
+            ThreadPoolResponse,
+            ErrorResponse>) ThreadPoolRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns cluster-wide thread pool statistics per node. By default the active,
+     * queue and rejected statistics are returned for all thread pools.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ThreadPoolRequest}
+     *
+     */
+
+    public final CompletableFuture<ThreadPoolResponse> threadPool(Function<ThreadPoolRequest.Builder, ObjectBuilder<ThreadPoolRequest>> fn)
+        throws IOException, OpenSearchException {
+        return threadPool(fn.apply(new ThreadPoolRequest.Builder()).build());
+    }
+
+    /**
+     * Returns cluster-wide thread pool statistics per node. By default the active,
+     * queue and rejected statistics are returned for all thread pools.
+     *
+     *
+     */
+
+    public CompletableFuture<ThreadPoolResponse> threadPool() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new ThreadPoolRequest.Builder().build(),
+            ThreadPoolRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/OpenSearchCatClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/OpenSearchCatClient.java
index a3c32b1e64..e26653bae8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/OpenSearchCatClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/OpenSearchCatClient.java
@@ -32,751 +32,765 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.io.IOException;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
+import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.TransportOptions;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.io.IOException;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 /**
  * Client for the cat namespace.
  */
 public class OpenSearchCatClient extends ApiClient<OpenSearchTransport, OpenSearchCatClient> {
 
-	public OpenSearchCatClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchCatClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchCatClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchCatClient(this.transport, transportOptions);
-	}
-
-	// ----- Endpoint: cat.aliases
-
-	/**
-	 * Shows information about currently configured aliases to indices including
-	 * filter and routing infos.
-	 * 
-	 *
-	 */
-
-	public AliasesResponse aliases(AliasesRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<AliasesRequest, AliasesResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<AliasesRequest, AliasesResponse, ErrorResponse>) AliasesRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Shows information about currently configured aliases to indices including
-	 * filter and routing infos.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link AliasesRequest}
-	 *
-	 */
-
-	public final AliasesResponse aliases(Function<AliasesRequest.Builder, ObjectBuilder<AliasesRequest>> fn)
-			throws IOException, OpenSearchException {
-		return aliases(fn.apply(new AliasesRequest.Builder()).build());
-	}
-
-	/**
-	 * Shows information about currently configured aliases to indices including
-	 * filter and routing infos.
-	 * 
-	 *
-	 */
-
-	public AliasesResponse aliases() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new AliasesRequest.Builder().build(), AliasesRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.allocation
-
-	/**
-	 * Provides a snapshot of how many shards are allocated to each data node and
-	 * how much disk space they are using.
-	 * 
-	 *
-	 */
-
-	public AllocationResponse allocation(AllocationRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<AllocationRequest, AllocationResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<AllocationRequest, AllocationResponse, ErrorResponse>) AllocationRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Provides a snapshot of how many shards are allocated to each data node and
-	 * how much disk space they are using.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link AllocationRequest}
-	 *
-	 */
-
-	public final AllocationResponse allocation(Function<AllocationRequest.Builder, ObjectBuilder<AllocationRequest>> fn)
-			throws IOException, OpenSearchException {
-		return allocation(fn.apply(new AllocationRequest.Builder()).build());
-	}
-
-	/**
-	 * Provides a snapshot of how many shards are allocated to each data node and
-	 * how much disk space they are using.
-	 * 
-	 *
-	 */
-
-	public AllocationResponse allocation() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new AllocationRequest.Builder().build(), AllocationRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.count
-
-	/**
-	 * Provides quick access to the document count of the entire cluster, or
-	 * individual indices.
-	 * 
-	 *
-	 */
-
-	public CountResponse count(CountRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CountRequest, CountResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CountRequest, CountResponse, ErrorResponse>) CountRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Provides quick access to the document count of the entire cluster, or
-	 * individual indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CountRequest}
-	 *
-	 */
-
-	public final CountResponse count(Function<CountRequest.Builder, ObjectBuilder<CountRequest>> fn)
-			throws IOException, OpenSearchException {
-		return count(fn.apply(new CountRequest.Builder()).build());
-	}
-
-	/**
-	 * Provides quick access to the document count of the entire cluster, or
-	 * individual indices.
-	 * 
-	 *
-	 */
-
-	public CountResponse count() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new CountRequest.Builder().build(), CountRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.fielddata
-
-	/**
-	 * Shows how much heap memory is currently being used by fielddata on every data
-	 * node in the cluster.
-	 * 
-	 *
-	 */
-
-	public FielddataResponse fielddata(FielddataRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<FielddataRequest, FielddataResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<FielddataRequest, FielddataResponse, ErrorResponse>) FielddataRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Shows how much heap memory is currently being used by fielddata on every data
-	 * node in the cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link FielddataRequest}
-	 *
-	 */
-
-	public final FielddataResponse fielddata(Function<FielddataRequest.Builder, ObjectBuilder<FielddataRequest>> fn)
-			throws IOException, OpenSearchException {
-		return fielddata(fn.apply(new FielddataRequest.Builder()).build());
-	}
-
-	/**
-	 * Shows how much heap memory is currently being used by fielddata on every data
-	 * node in the cluster.
-	 * 
-	 *
-	 */
-
-	public FielddataResponse fielddata() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new FielddataRequest.Builder().build(), FielddataRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.health
-
-	/**
-	 * Returns a concise representation of the cluster health.
-	 * 
-	 *
-	 */
-
-	public HealthResponse health(HealthRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<HealthRequest, HealthResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<HealthRequest, HealthResponse, ErrorResponse>) HealthRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns a concise representation of the cluster health.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link HealthRequest}
-	 *
-	 */
-
-	public final HealthResponse health(Function<HealthRequest.Builder, ObjectBuilder<HealthRequest>> fn)
-			throws IOException, OpenSearchException {
-		return health(fn.apply(new HealthRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns a concise representation of the cluster health.
-	 * 
-	 *
-	 */
-
-	public HealthResponse health() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new HealthRequest.Builder().build(), HealthRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.help
-
-	/**
-	 * Returns help for the Cat APIs.
-	 * 
-	 *
-	 */
-	public HelpResponse help() throws IOException, OpenSearchException {
-		return this.transport.performRequest(HelpRequest._INSTANCE, HelpRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.indices
-
-	/**
-	 * Returns information about indices: number of primaries and replicas, document
-	 * counts, disk size, ...
-	 * 
-	 *
-	 */
-
-	public IndicesResponse indices(IndicesRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<IndicesRequest, IndicesResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<IndicesRequest, IndicesResponse, ErrorResponse>) IndicesRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about indices: number of primaries and replicas, document
-	 * counts, disk size, ...
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link IndicesRequest}
-	 *
-	 */
-
-	public final IndicesResponse indices(Function<IndicesRequest.Builder, ObjectBuilder<IndicesRequest>> fn)
-			throws IOException, OpenSearchException {
-		return indices(fn.apply(new IndicesRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about indices: number of primaries and replicas, document
-	 * counts, disk size, ...
-	 * 
-	 *
-	 */
-
-	public IndicesResponse indices() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new IndicesRequest.Builder().build(), IndicesRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.master
-
-	/**
-	 * Returns information about the master node.
-	 * 
-	 *
-	 */
-	@Deprecated
-	public ClusterManagerResponse master() throws IOException, OpenSearchException {
-		return this.transport.performRequest(ClusterManagerRequest._INSTANCE, ClusterManagerRequest._DEPRECATED_ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.cluster_manager
-
-	/**
-	 * Returns information about the cluster-manager node.
-	 * 
-	 *
-	 */
-	public ClusterManagerResponse clusterManager() throws IOException, OpenSearchException {
-		return this.transport.performRequest(ClusterManagerRequest._INSTANCE, ClusterManagerRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.nodeattrs
-
-	/**
-	 * Returns information about custom node attributes.
-	 * 
-	 *
-	 */
-	public NodeattrsResponse nodeattrs() throws IOException, OpenSearchException {
-		return this.transport.performRequest(NodeattrsRequest._INSTANCE, NodeattrsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.nodes
-
-	/**
-	 * Returns basic statistics about performance of cluster nodes.
-	 * 
-	 *
-	 */
-
-	public NodesResponse nodes(NodesRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<NodesRequest, NodesResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<NodesRequest, NodesResponse, ErrorResponse>) NodesRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns basic statistics about performance of cluster nodes.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link NodesRequest}
-	 *
-	 */
-
-	public final NodesResponse nodes(Function<NodesRequest.Builder, ObjectBuilder<NodesRequest>> fn)
-			throws IOException, OpenSearchException {
-		return nodes(fn.apply(new NodesRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns basic statistics about performance of cluster nodes.
-	 * 
-	 *
-	 */
-
-	public NodesResponse nodes() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new NodesRequest.Builder().build(), NodesRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.point_in_time_segments
-
-	/**
-	 * Provides low-level information about the disk utilization of a PIT by
-	 * describing its Lucene segments.
-	 * 
-	 *
-	 */
-	public SegmentsResponse pitSegments(PitSegmentsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PitSegmentsRequest, SegmentsResponse, ErrorResponse> endpoint = (JsonEndpoint<PitSegmentsRequest, SegmentsResponse, ErrorResponse>) PitSegmentsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-	
-	/**
-	 * Provides low-level information about the disk utilization of a PIT by
-	 * describing its Lucene segments.
-	 * 
-	 * * @param fn
-	 * a function that initializes a builder to create the
-	 * {@link PitSegmentsRequest}
-	 */
-
-	public final SegmentsResponse pitSegments(Function<PitSegmentsRequest.Builder, ObjectBuilder<PitSegmentsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return pitSegments(fn.apply(new PitSegmentsRequest.Builder()).build());
-	}
-
-	/**
-	 * Provides low-level information about the disk utilization of a PIT by
-	 * describing its Lucene segments.
-	 * 
-	 */
-	public SegmentsResponse pitSegments() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new PitSegmentsRequest.Builder().build(), 
-				PitSegmentsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.pending_tasks
-
-	/**
-	 * Returns a concise representation of the cluster pending tasks.
-	 * 
-	 *
-	 */
-	public PendingTasksResponse pendingTasks() throws IOException, OpenSearchException {
-		return this.transport.performRequest(PendingTasksRequest._INSTANCE, PendingTasksRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.plugins
-
-	/**
-	 * Returns information about installed plugins across nodes node.
-	 * 
-	 *
-	 */
-	public PluginsResponse plugins() throws IOException, OpenSearchException {
-		return this.transport.performRequest(PluginsRequest._INSTANCE, PluginsRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.recovery
-
-	/**
-	 * Returns information about index shard recoveries, both on-going completed.
-	 * 
-	 *
-	 */
-
-	public RecoveryResponse recovery(RecoveryRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<RecoveryRequest, RecoveryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<RecoveryRequest, RecoveryResponse, ErrorResponse>) RecoveryRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about index shard recoveries, both on-going completed.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link RecoveryRequest}
-	 *
-	 */
-
-	public final RecoveryResponse recovery(Function<RecoveryRequest.Builder, ObjectBuilder<RecoveryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return recovery(fn.apply(new RecoveryRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about index shard recoveries, both on-going completed.
-	 * 
-	 *
-	 */
-
-	public RecoveryResponse recovery() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new RecoveryRequest.Builder().build(), RecoveryRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.repositories
-
-	/**
-	 * Returns information about snapshot repositories registered in the cluster.
-	 * 
-	 *
-	 */
-	public RepositoriesResponse repositories() throws IOException, OpenSearchException {
-		return this.transport.performRequest(RepositoriesRequest._INSTANCE, RepositoriesRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.segments
-
-	/**
-	 * Provides low-level information about the segments in the shards of an index.
-	 * 
-	 *
-	 */
-
-	public SegmentsResponse segments(SegmentsRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SegmentsRequest, SegmentsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<SegmentsRequest, SegmentsResponse, ErrorResponse>) SegmentsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Provides low-level information about the segments in the shards of an index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SegmentsRequest}
-	 *
-	 */
-
-	public final SegmentsResponse segments(Function<SegmentsRequest.Builder, ObjectBuilder<SegmentsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return segments(fn.apply(new SegmentsRequest.Builder()).build());
-	}
-
-	/**
-	 * Provides low-level information about the segments in the shards of an index.
-	 * 
-	 *
-	 */
-
-	public SegmentsResponse segments() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new SegmentsRequest.Builder().build(), SegmentsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.shards
-
-	/**
-	 * Provides a detailed view of shard allocation on nodes.
-	 * 
-	 *
-	 */
-
-	public ShardsResponse shards(ShardsRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ShardsRequest, ShardsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ShardsRequest, ShardsResponse, ErrorResponse>) ShardsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Provides a detailed view of shard allocation on nodes.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ShardsRequest}
-	 *
-	 */
-
-	public final ShardsResponse shards(Function<ShardsRequest.Builder, ObjectBuilder<ShardsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return shards(fn.apply(new ShardsRequest.Builder()).build());
-	}
-
-	/**
-	 * Provides a detailed view of shard allocation on nodes.
-	 * 
-	 *
-	 */
-
-	public ShardsResponse shards() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new ShardsRequest.Builder().build(), ShardsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.snapshots
-
-	/**
-	 * Returns all snapshots in a specific repository.
-	 * 
-	 *
-	 */
-
-	public SnapshotsResponse snapshots(SnapshotsRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SnapshotsRequest, SnapshotsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<SnapshotsRequest, SnapshotsResponse, ErrorResponse>) SnapshotsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns all snapshots in a specific repository.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SnapshotsRequest}
-	 *
-	 */
-
-	public final SnapshotsResponse snapshots(Function<SnapshotsRequest.Builder, ObjectBuilder<SnapshotsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return snapshots(fn.apply(new SnapshotsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns all snapshots in a specific repository.
-	 * 
-	 *
-	 */
-
-	public SnapshotsResponse snapshots() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new SnapshotsRequest.Builder().build(), SnapshotsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.tasks
-
-	/**
-	 * Returns information about the tasks currently executing on one or more nodes
-	 * in the cluster.
-	 * 
-	 *
-	 */
-
-	public TasksResponse tasks(TasksRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<TasksRequest, TasksResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<TasksRequest, TasksResponse, ErrorResponse>) TasksRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about the tasks currently executing on one or more nodes
-	 * in the cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link TasksRequest}
-	 *
-	 */
-
-	public final TasksResponse tasks(Function<TasksRequest.Builder, ObjectBuilder<TasksRequest>> fn)
-			throws IOException, OpenSearchException {
-		return tasks(fn.apply(new TasksRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about the tasks currently executing on one or more nodes
-	 * in the cluster.
-	 * 
-	 *
-	 */
-
-	public TasksResponse tasks() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new TasksRequest.Builder().build(), TasksRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.templates
-
-	/**
-	 * Returns information about existing templates.
-	 * 
-	 *
-	 */
-
-	public TemplatesResponse templates(TemplatesRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<TemplatesRequest, TemplatesResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<TemplatesRequest, TemplatesResponse, ErrorResponse>) TemplatesRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about existing templates.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link TemplatesRequest}
-	 *
-	 */
-
-	public final TemplatesResponse templates(Function<TemplatesRequest.Builder, ObjectBuilder<TemplatesRequest>> fn)
-			throws IOException, OpenSearchException {
-		return templates(fn.apply(new TemplatesRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about existing templates.
-	 * 
-	 *
-	 */
-
-	public TemplatesResponse templates() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new TemplatesRequest.Builder().build(), TemplatesRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cat.thread_pool
-
-	/**
-	 * Returns cluster-wide thread pool statistics per node. By default the active,
-	 * queue and rejected statistics are returned for all thread pools.
-	 * 
-	 *
-	 */
-
-	public ThreadPoolResponse threadPool(ThreadPoolRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ThreadPoolRequest, ThreadPoolResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ThreadPoolRequest, ThreadPoolResponse, ErrorResponse>) ThreadPoolRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns cluster-wide thread pool statistics per node. By default the active,
-	 * queue and rejected statistics are returned for all thread pools.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ThreadPoolRequest}
-	 *
-	 */
-
-	public final ThreadPoolResponse threadPool(Function<ThreadPoolRequest.Builder, ObjectBuilder<ThreadPoolRequest>> fn)
-			throws IOException, OpenSearchException {
-		return threadPool(fn.apply(new ThreadPoolRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns cluster-wide thread pool statistics per node. By default the active,
-	 * queue and rejected statistics are returned for all thread pools.
-	 * 
-	 *
-	 */
-
-	public ThreadPoolResponse threadPool() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new ThreadPoolRequest.Builder().build(), ThreadPoolRequest._ENDPOINT,
-				this.transportOptions);
-	}
+    public OpenSearchCatClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchCatClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchCatClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchCatClient(this.transport, transportOptions);
+    }
+
+    // ----- Endpoint: cat.aliases
+
+    /**
+     * Shows information about currently configured aliases to indices including
+     * filter and routing infos.
+     *
+     *
+     */
+
+    public AliasesResponse aliases(AliasesRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<AliasesRequest, AliasesResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            AliasesRequest,
+            AliasesResponse,
+            ErrorResponse>) AliasesRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Shows information about currently configured aliases to indices including
+     * filter and routing infos.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link AliasesRequest}
+     *
+     */
+
+    public final AliasesResponse aliases(Function<AliasesRequest.Builder, ObjectBuilder<AliasesRequest>> fn) throws IOException,
+        OpenSearchException {
+        return aliases(fn.apply(new AliasesRequest.Builder()).build());
+    }
+
+    /**
+     * Shows information about currently configured aliases to indices including
+     * filter and routing infos.
+     *
+     *
+     */
+
+    public AliasesResponse aliases() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new AliasesRequest.Builder().build(), AliasesRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.allocation
+
+    /**
+     * Provides a snapshot of how many shards are allocated to each data node and
+     * how much disk space they are using.
+     *
+     *
+     */
+
+    public AllocationResponse allocation(AllocationRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<AllocationRequest, AllocationResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            AllocationRequest,
+            AllocationResponse,
+            ErrorResponse>) AllocationRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Provides a snapshot of how many shards are allocated to each data node and
+     * how much disk space they are using.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link AllocationRequest}
+     *
+     */
+
+    public final AllocationResponse allocation(Function<AllocationRequest.Builder, ObjectBuilder<AllocationRequest>> fn) throws IOException,
+        OpenSearchException {
+        return allocation(fn.apply(new AllocationRequest.Builder()).build());
+    }
+
+    /**
+     * Provides a snapshot of how many shards are allocated to each data node and
+     * how much disk space they are using.
+     *
+     *
+     */
+
+    public AllocationResponse allocation() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new AllocationRequest.Builder().build(), AllocationRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.count
+
+    /**
+     * Provides quick access to the document count of the entire cluster, or
+     * individual indices.
+     *
+     *
+     */
+
+    public CountResponse count(CountRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CountRequest, CountResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CountRequest,
+            CountResponse,
+            ErrorResponse>) CountRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Provides quick access to the document count of the entire cluster, or
+     * individual indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CountRequest}
+     *
+     */
+
+    public final CountResponse count(Function<CountRequest.Builder, ObjectBuilder<CountRequest>> fn) throws IOException,
+        OpenSearchException {
+        return count(fn.apply(new CountRequest.Builder()).build());
+    }
+
+    /**
+     * Provides quick access to the document count of the entire cluster, or
+     * individual indices.
+     *
+     *
+     */
+
+    public CountResponse count() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new CountRequest.Builder().build(), CountRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.fielddata
+
+    /**
+     * Shows how much heap memory is currently being used by fielddata on every data
+     * node in the cluster.
+     *
+     *
+     */
+
+    public FielddataResponse fielddata(FielddataRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<FielddataRequest, FielddataResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            FielddataRequest,
+            FielddataResponse,
+            ErrorResponse>) FielddataRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Shows how much heap memory is currently being used by fielddata on every data
+     * node in the cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link FielddataRequest}
+     *
+     */
+
+    public final FielddataResponse fielddata(Function<FielddataRequest.Builder, ObjectBuilder<FielddataRequest>> fn) throws IOException,
+        OpenSearchException {
+        return fielddata(fn.apply(new FielddataRequest.Builder()).build());
+    }
+
+    /**
+     * Shows how much heap memory is currently being used by fielddata on every data
+     * node in the cluster.
+     *
+     *
+     */
+
+    public FielddataResponse fielddata() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new FielddataRequest.Builder().build(), FielddataRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.health
+
+    /**
+     * Returns a concise representation of the cluster health.
+     *
+     *
+     */
+
+    public HealthResponse health(HealthRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<HealthRequest, HealthResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            HealthRequest,
+            HealthResponse,
+            ErrorResponse>) HealthRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns a concise representation of the cluster health.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link HealthRequest}
+     *
+     */
+
+    public final HealthResponse health(Function<HealthRequest.Builder, ObjectBuilder<HealthRequest>> fn) throws IOException,
+        OpenSearchException {
+        return health(fn.apply(new HealthRequest.Builder()).build());
+    }
+
+    /**
+     * Returns a concise representation of the cluster health.
+     *
+     *
+     */
+
+    public HealthResponse health() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new HealthRequest.Builder().build(), HealthRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.help
+
+    /**
+     * Returns help for the Cat APIs.
+     *
+     *
+     */
+    public HelpResponse help() throws IOException, OpenSearchException {
+        return this.transport.performRequest(HelpRequest._INSTANCE, HelpRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.indices
+
+    /**
+     * Returns information about indices: number of primaries and replicas, document
+     * counts, disk size, ...
+     *
+     *
+     */
+
+    public IndicesResponse indices(IndicesRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<IndicesRequest, IndicesResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            IndicesRequest,
+            IndicesResponse,
+            ErrorResponse>) IndicesRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about indices: number of primaries and replicas, document
+     * counts, disk size, ...
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link IndicesRequest}
+     *
+     */
+
+    public final IndicesResponse indices(Function<IndicesRequest.Builder, ObjectBuilder<IndicesRequest>> fn) throws IOException,
+        OpenSearchException {
+        return indices(fn.apply(new IndicesRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about indices: number of primaries and replicas, document
+     * counts, disk size, ...
+     *
+     *
+     */
+
+    public IndicesResponse indices() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new IndicesRequest.Builder().build(), IndicesRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.master
+
+    /**
+     * Returns information about the master node.
+     *
+     *
+     */
+    @Deprecated
+    public ClusterManagerResponse master() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            ClusterManagerRequest._INSTANCE,
+            ClusterManagerRequest._DEPRECATED_ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cat.cluster_manager
+
+    /**
+     * Returns information about the cluster-manager node.
+     *
+     *
+     */
+    public ClusterManagerResponse clusterManager() throws IOException, OpenSearchException {
+        return this.transport.performRequest(ClusterManagerRequest._INSTANCE, ClusterManagerRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.nodeattrs
+
+    /**
+     * Returns information about custom node attributes.
+     *
+     *
+     */
+    public NodeattrsResponse nodeattrs() throws IOException, OpenSearchException {
+        return this.transport.performRequest(NodeattrsRequest._INSTANCE, NodeattrsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.nodes
+
+    /**
+     * Returns basic statistics about performance of cluster nodes.
+     *
+     *
+     */
+
+    public NodesResponse nodes(NodesRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<NodesRequest, NodesResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            NodesRequest,
+            NodesResponse,
+            ErrorResponse>) NodesRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns basic statistics about performance of cluster nodes.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link NodesRequest}
+     *
+     */
+
+    public final NodesResponse nodes(Function<NodesRequest.Builder, ObjectBuilder<NodesRequest>> fn) throws IOException,
+        OpenSearchException {
+        return nodes(fn.apply(new NodesRequest.Builder()).build());
+    }
+
+    /**
+     * Returns basic statistics about performance of cluster nodes.
+     *
+     *
+     */
+
+    public NodesResponse nodes() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new NodesRequest.Builder().build(), NodesRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.point_in_time_segments
+
+    /**
+     * Provides low-level information about the disk utilization of a PIT by
+     * describing its Lucene segments.
+     *
+     *
+     */
+    public SegmentsResponse pitSegments(PitSegmentsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PitSegmentsRequest, SegmentsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PitSegmentsRequest,
+            SegmentsResponse,
+            ErrorResponse>) PitSegmentsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Provides low-level information about the disk utilization of a PIT by
+     * describing its Lucene segments.
+     *
+     * * @param fn
+     * a function that initializes a builder to create the
+     * {@link PitSegmentsRequest}
+     */
+
+    public final SegmentsResponse pitSegments(Function<PitSegmentsRequest.Builder, ObjectBuilder<PitSegmentsRequest>> fn)
+        throws IOException, OpenSearchException {
+        return pitSegments(fn.apply(new PitSegmentsRequest.Builder()).build());
+    }
+
+    /**
+     * Provides low-level information about the disk utilization of a PIT by
+     * describing its Lucene segments.
+     *
+     */
+    public SegmentsResponse pitSegments() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new PitSegmentsRequest.Builder().build(), PitSegmentsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.pending_tasks
+
+    /**
+     * Returns a concise representation of the cluster pending tasks.
+     *
+     *
+     */
+    public PendingTasksResponse pendingTasks() throws IOException, OpenSearchException {
+        return this.transport.performRequest(PendingTasksRequest._INSTANCE, PendingTasksRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.plugins
+
+    /**
+     * Returns information about installed plugins across nodes node.
+     *
+     *
+     */
+    public PluginsResponse plugins() throws IOException, OpenSearchException {
+        return this.transport.performRequest(PluginsRequest._INSTANCE, PluginsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.recovery
+
+    /**
+     * Returns information about index shard recoveries, both on-going completed.
+     *
+     *
+     */
+
+    public RecoveryResponse recovery(RecoveryRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<RecoveryRequest, RecoveryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            RecoveryRequest,
+            RecoveryResponse,
+            ErrorResponse>) RecoveryRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about index shard recoveries, both on-going completed.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link RecoveryRequest}
+     *
+     */
+
+    public final RecoveryResponse recovery(Function<RecoveryRequest.Builder, ObjectBuilder<RecoveryRequest>> fn) throws IOException,
+        OpenSearchException {
+        return recovery(fn.apply(new RecoveryRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about index shard recoveries, both on-going completed.
+     *
+     *
+     */
+
+    public RecoveryResponse recovery() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new RecoveryRequest.Builder().build(), RecoveryRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.repositories
+
+    /**
+     * Returns information about snapshot repositories registered in the cluster.
+     *
+     *
+     */
+    public RepositoriesResponse repositories() throws IOException, OpenSearchException {
+        return this.transport.performRequest(RepositoriesRequest._INSTANCE, RepositoriesRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.segments
+
+    /**
+     * Provides low-level information about the segments in the shards of an index.
+     *
+     *
+     */
+
+    public SegmentsResponse segments(SegmentsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SegmentsRequest, SegmentsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            SegmentsRequest,
+            SegmentsResponse,
+            ErrorResponse>) SegmentsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Provides low-level information about the segments in the shards of an index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SegmentsRequest}
+     *
+     */
+
+    public final SegmentsResponse segments(Function<SegmentsRequest.Builder, ObjectBuilder<SegmentsRequest>> fn) throws IOException,
+        OpenSearchException {
+        return segments(fn.apply(new SegmentsRequest.Builder()).build());
+    }
+
+    /**
+     * Provides low-level information about the segments in the shards of an index.
+     *
+     *
+     */
+
+    public SegmentsResponse segments() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new SegmentsRequest.Builder().build(), SegmentsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.shards
+
+    /**
+     * Provides a detailed view of shard allocation on nodes.
+     *
+     *
+     */
+
+    public ShardsResponse shards(ShardsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ShardsRequest, ShardsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ShardsRequest,
+            ShardsResponse,
+            ErrorResponse>) ShardsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Provides a detailed view of shard allocation on nodes.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ShardsRequest}
+     *
+     */
+
+    public final ShardsResponse shards(Function<ShardsRequest.Builder, ObjectBuilder<ShardsRequest>> fn) throws IOException,
+        OpenSearchException {
+        return shards(fn.apply(new ShardsRequest.Builder()).build());
+    }
+
+    /**
+     * Provides a detailed view of shard allocation on nodes.
+     *
+     *
+     */
+
+    public ShardsResponse shards() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new ShardsRequest.Builder().build(), ShardsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.snapshots
+
+    /**
+     * Returns all snapshots in a specific repository.
+     *
+     *
+     */
+
+    public SnapshotsResponse snapshots(SnapshotsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SnapshotsRequest, SnapshotsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            SnapshotsRequest,
+            SnapshotsResponse,
+            ErrorResponse>) SnapshotsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns all snapshots in a specific repository.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SnapshotsRequest}
+     *
+     */
+
+    public final SnapshotsResponse snapshots(Function<SnapshotsRequest.Builder, ObjectBuilder<SnapshotsRequest>> fn) throws IOException,
+        OpenSearchException {
+        return snapshots(fn.apply(new SnapshotsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns all snapshots in a specific repository.
+     *
+     *
+     */
+
+    public SnapshotsResponse snapshots() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new SnapshotsRequest.Builder().build(), SnapshotsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.tasks
+
+    /**
+     * Returns information about the tasks currently executing on one or more nodes
+     * in the cluster.
+     *
+     *
+     */
+
+    public TasksResponse tasks(TasksRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<TasksRequest, TasksResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            TasksRequest,
+            TasksResponse,
+            ErrorResponse>) TasksRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about the tasks currently executing on one or more nodes
+     * in the cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link TasksRequest}
+     *
+     */
+
+    public final TasksResponse tasks(Function<TasksRequest.Builder, ObjectBuilder<TasksRequest>> fn) throws IOException,
+        OpenSearchException {
+        return tasks(fn.apply(new TasksRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about the tasks currently executing on one or more nodes
+     * in the cluster.
+     *
+     *
+     */
+
+    public TasksResponse tasks() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new TasksRequest.Builder().build(), TasksRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.templates
+
+    /**
+     * Returns information about existing templates.
+     *
+     *
+     */
+
+    public TemplatesResponse templates(TemplatesRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<TemplatesRequest, TemplatesResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            TemplatesRequest,
+            TemplatesResponse,
+            ErrorResponse>) TemplatesRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about existing templates.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link TemplatesRequest}
+     *
+     */
+
+    public final TemplatesResponse templates(Function<TemplatesRequest.Builder, ObjectBuilder<TemplatesRequest>> fn) throws IOException,
+        OpenSearchException {
+        return templates(fn.apply(new TemplatesRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about existing templates.
+     *
+     *
+     */
+
+    public TemplatesResponse templates() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new TemplatesRequest.Builder().build(), TemplatesRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cat.thread_pool
+
+    /**
+     * Returns cluster-wide thread pool statistics per node. By default the active,
+     * queue and rejected statistics are returned for all thread pools.
+     *
+     *
+     */
+
+    public ThreadPoolResponse threadPool(ThreadPoolRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ThreadPoolRequest, ThreadPoolResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ThreadPoolRequest,
+            ThreadPoolResponse,
+            ErrorResponse>) ThreadPoolRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns cluster-wide thread pool statistics per node. By default the active,
+     * queue and rejected statistics are returned for all thread pools.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ThreadPoolRequest}
+     *
+     */
+
+    public final ThreadPoolResponse threadPool(Function<ThreadPoolRequest.Builder, ObjectBuilder<ThreadPoolRequest>> fn) throws IOException,
+        OpenSearchException {
+        return threadPool(fn.apply(new ThreadPoolRequest.Builder()).build());
+    }
+
+    /**
+     * Returns cluster-wide thread pool statistics per node. By default the active,
+     * queue and rejected statistics are returned for all thread pools.
+     *
+     *
+     */
+
+    public ThreadPoolResponse threadPool() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new ThreadPoolRequest.Builder().build(), ThreadPoolRequest._ENDPOINT, this.transportOptions);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/PendingTasksRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/PendingTasksRequest.java
index 9665e5b332..ce398e3df4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/PendingTasksRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/PendingTasksRequest.java
@@ -32,47 +32,49 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.util.HashMap;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 
-import java.util.HashMap;
-
 // typedef: cat.pending_tasks.Request
 
 /**
  * Returns a concise representation of the cluster pending tasks.
- * 
+ *
  */
 
 public class PendingTasksRequest extends CatRequestBase {
-	public PendingTasksRequest() {
-	}
+    public PendingTasksRequest() {}
 
-	/**
-	 * Singleton instance for {@link PendingTasksRequest}.
-	 */
-	public static final PendingTasksRequest _INSTANCE = new PendingTasksRequest();
+    /**
+     * Singleton instance for {@link PendingTasksRequest}.
+     */
+    public static final PendingTasksRequest _INSTANCE = new PendingTasksRequest();
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Endpoint "{@code cat.pending_tasks}".
-	 */
-	public static final Endpoint<PendingTasksRequest, PendingTasksResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+    /**
+     * Endpoint "{@code cat.pending_tasks}".
+     */
+    public static final Endpoint<PendingTasksRequest, PendingTasksResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
 
-			// Request method
-			request -> {
-				return "GET";
+        // Request method
+        request -> {
+            return "GET";
 
-			},
+        },
 
-			// Request path
-			request -> {
-				return "/_cat/pending_tasks";
+        // Request path
+        request -> {
+            return "/_cat/pending_tasks";
 
-			},
+        },
 
-			// Request parameters
-			request -> new HashMap<>(request.queryParameters()), SimpleEndpoint.emptyMap(), false, PendingTasksResponse._DESERIALIZER);
+        // Request parameters
+        request -> new HashMap<>(request.queryParameters()),
+        SimpleEndpoint.emptyMap(),
+        false,
+        PendingTasksResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/PendingTasksResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/PendingTasksResponse.java
index 1264cdea45..2f3f94f0b4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/PendingTasksResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/PendingTasksResponse.java
@@ -32,124 +32,127 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch.cat.pending_tasks.PendingTasksRecord;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch.cat.pending_tasks.PendingTasksRecord;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.pending_tasks.Response
 
 @JsonpDeserializable
 public class PendingTasksResponse implements JsonpSerializable {
-	private final List<PendingTasksRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PendingTasksResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static PendingTasksResponse of(Function<Builder, ObjectBuilder<PendingTasksResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<PendingTasksRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (PendingTasksRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PendingTasksResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PendingTasksResponse> {
-		private List<PendingTasksRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<PendingTasksRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(PendingTasksRecord value, PendingTasksRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<PendingTasksRecord.Builder, ObjectBuilder<PendingTasksRecord>> fn) {
-			return valueBody(fn.apply(new PendingTasksRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link PendingTasksResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PendingTasksResponse build() {
-			_checkSingleUse();
-
-			return new PendingTasksResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<PendingTasksResponse> _DESERIALIZER = createPendingTasksResponseDeserializer();
-	protected static JsonpDeserializer<PendingTasksResponse> createPendingTasksResponseDeserializer() {
-
-		JsonpDeserializer<List<PendingTasksRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(PendingTasksRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<PendingTasksRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PendingTasksResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static PendingTasksResponse of(Function<Builder, ObjectBuilder<PendingTasksResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<PendingTasksRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (PendingTasksRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PendingTasksResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PendingTasksResponse> {
+        private List<PendingTasksRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<PendingTasksRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(PendingTasksRecord value, PendingTasksRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<PendingTasksRecord.Builder, ObjectBuilder<PendingTasksRecord>> fn) {
+            return valueBody(fn.apply(new PendingTasksRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link PendingTasksResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PendingTasksResponse build() {
+            _checkSingleUse();
+
+            return new PendingTasksResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<PendingTasksResponse> _DESERIALIZER = createPendingTasksResponseDeserializer();
+
+    protected static JsonpDeserializer<PendingTasksResponse> createPendingTasksResponseDeserializer() {
+
+        JsonpDeserializer<List<PendingTasksRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(
+            PendingTasksRecord._DESERIALIZER
+        );
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/PitSegmentsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/PitSegmentsRequest.java
index 11b9c402b4..79eca7b82f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/PitSegmentsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/PitSegmentsRequest.java
@@ -10,9 +10,7 @@
 
 import java.util.List;
 import java.util.function.Function;
-
 import javax.annotation.Nullable;
-
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
@@ -21,10 +19,10 @@
 /**
  * Provides low-level information about the disk utilization of a PIT by
  * describing its Lucene segments
- * 
+ *
  */
 public class PitSegmentsRequest extends CatRequestBase {
-    
+
     @Nullable
     private List<String> pitId;
 
@@ -64,7 +62,7 @@ public final Builder pitId(@Nullable List<String> pitId) {
 
         /**
          * Builds a {@link PitSegmentsRequest}.
-         * 
+         *
          * @throws NullPointerException if some of the required fields are null.
          */
         public PitSegmentsRequest build() {
@@ -82,26 +80,28 @@ protected Builder self() {
      * Endpoint "{@code point_in_time_segments}"
      */
     public static final Endpoint<PitSegmentsRequest, SegmentsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-            // Request Method
-            request -> {
-                return "GET";
-            },
-
-            // Request Path
-            request -> {
-                final int _all = 1 << 0;
-
-                int propsSet = 0;
-
-                if (request.pitId() == null) {
-                    propsSet |= _all;
-                }
-                if (propsSet == 0) {
-                    return "/_cat/pit_segments";
-                } else {
-                    return "/_cat/pit_segments/_all";
-                }
-            },
-            SimpleEndpoint.emptyMap(), SimpleEndpoint.emptyMap(), false, SegmentsResponse._DESERIALIZER);
+        // Request Method
+        request -> { return "GET"; },
+
+        // Request Path
+        request -> {
+            final int _all = 1 << 0;
+
+            int propsSet = 0;
+
+            if (request.pitId() == null) {
+                propsSet |= _all;
+            }
+            if (propsSet == 0) {
+                return "/_cat/pit_segments";
+            } else {
+                return "/_cat/pit_segments/_all";
+            }
+        },
+        SimpleEndpoint.emptyMap(),
+        SimpleEndpoint.emptyMap(),
+        false,
+        SegmentsResponse._DESERIALIZER
+    );
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/PluginsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/PluginsRequest.java
index 4f249f2f62..2f7c944968 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/PluginsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/PluginsRequest.java
@@ -32,12 +32,11 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.util.HashMap;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 
-import java.util.HashMap;
-
 // typedef: cat.plugins.Request
 
 /**
@@ -46,33 +45,36 @@
  */
 
 public class PluginsRequest extends CatRequestBase {
-	public PluginsRequest() {
-	}
+    public PluginsRequest() {}
 
-	/**
-	 * Singleton instance for {@link PluginsRequest}.
-	 */
-	public static final PluginsRequest _INSTANCE = new PluginsRequest();
+    /**
+     * Singleton instance for {@link PluginsRequest}.
+     */
+    public static final PluginsRequest _INSTANCE = new PluginsRequest();
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Endpoint "{@code cat.plugins}".
-	 */
-	public static final Endpoint<PluginsRequest, PluginsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+    /**
+     * Endpoint "{@code cat.plugins}".
+     */
+    public static final Endpoint<PluginsRequest, PluginsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
 
-			// Request method
-			request -> {
-				return "GET";
+        // Request method
+        request -> {
+            return "GET";
 
-			},
+        },
 
-			// Request path
-			request -> {
-				return "/_cat/plugins";
+        // Request path
+        request -> {
+            return "/_cat/plugins";
 
-			},
+        },
 
-			// Request parameters
-			request ->  new HashMap<>(request.queryParameters()), SimpleEndpoint.emptyMap(), false, PluginsResponse._DESERIALIZER);
+        // Request parameters
+        request -> new HashMap<>(request.queryParameters()),
+        SimpleEndpoint.emptyMap(),
+        false,
+        PluginsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/PluginsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/PluginsResponse.java
index ce052b8101..ba19364179 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/PluginsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/PluginsResponse.java
@@ -32,125 +32,125 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch.cat.plugins.PluginsRecord;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch.cat.plugins.PluginsRecord;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.plugins.Response
 
-
 @JsonpDeserializable
 public class PluginsResponse implements JsonpSerializable {
-	private final List<PluginsRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PluginsResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static PluginsResponse of(Function<Builder, ObjectBuilder<PluginsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<PluginsRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (PluginsRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PluginsResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PluginsResponse> {
-		private List<PluginsRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<PluginsRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(PluginsRecord value, PluginsRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<PluginsRecord.Builder, ObjectBuilder<PluginsRecord>> fn) {
-			return valueBody(fn.apply(new PluginsRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link PluginsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PluginsResponse build() {
-			_checkSingleUse();
-
-			return new PluginsResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<PluginsResponse> _DESERIALIZER = createPluginsResponseDeserializer();
-	protected static JsonpDeserializer<PluginsResponse> createPluginsResponseDeserializer() {
-
-		JsonpDeserializer<List<PluginsRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(PluginsRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<PluginsRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PluginsResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static PluginsResponse of(Function<Builder, ObjectBuilder<PluginsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<PluginsRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (PluginsRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PluginsResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PluginsResponse> {
+        private List<PluginsRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<PluginsRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(PluginsRecord value, PluginsRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<PluginsRecord.Builder, ObjectBuilder<PluginsRecord>> fn) {
+            return valueBody(fn.apply(new PluginsRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link PluginsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PluginsResponse build() {
+            _checkSingleUse();
+
+            return new PluginsResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<PluginsResponse> _DESERIALIZER = createPluginsResponseDeserializer();
+
+    protected static JsonpDeserializer<PluginsResponse> createPluginsResponseDeserializer() {
+
+        JsonpDeserializer<List<PluginsRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(PluginsRecord._DESERIALIZER);
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/RecoveryRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/RecoveryRequest.java
index 045a3d00d2..53b98cdd71 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/RecoveryRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/RecoveryRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.Bytes;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.transport.Endpoint;
@@ -39,13 +45,6 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 // typedef: cat.recovery.Request
 
 /**
@@ -220,51 +219,55 @@ protected Builder self() {
      */
     public static final Endpoint<RecoveryRequest, RecoveryResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
 
-            // Request method
-            request -> {
-                return "GET";
-
-            },
-
-            // Request path
-            request -> {
-                final int _index = 1 << 0;
-
-                int propsSet = 0;
-
-                if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
-
-                if (propsSet == 0) {
-                    StringBuilder buf = new StringBuilder();
-                    buf.append("/_cat");
-                    buf.append("/recovery");
-                    return buf.toString();
-                }
-                if (propsSet == (_index)) {
-                    StringBuilder buf = new StringBuilder();
-                    buf.append("/_cat");
-                    buf.append("/recovery");
-                    buf.append("/");
-                    SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-                    return buf.toString();
-                }
-                throw SimpleEndpoint.noPathTemplateFound("path");
-
-            },
-
-            // Request parameters
-            request -> {
-                Map<String, String> params =  new HashMap<>(request.queryParameters());
-                if (request.detailed != null) {
-                    params.put("detailed", String.valueOf(request.detailed));
-                }
-                if (request.activeOnly != null) {
-                    params.put("active_only", String.valueOf(request.activeOnly));
-                }
-                if (request.bytes != null) {
-                    params.put("bytes", request.bytes.jsonValue());
-                }
-                return params;
-
-            }, SimpleEndpoint.emptyMap(), false, RecoveryResponse._DESERIALIZER);
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/recovery");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/recovery");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>(request.queryParameters());
+            if (request.detailed != null) {
+                params.put("detailed", String.valueOf(request.detailed));
+            }
+            if (request.activeOnly != null) {
+                params.put("active_only", String.valueOf(request.activeOnly));
+            }
+            if (request.bytes != null) {
+                params.put("bytes", request.bytes.jsonValue());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        RecoveryResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/RecoveryResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/RecoveryResponse.java
index ea60179060..afdcfaf8ab 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/RecoveryResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/RecoveryResponse.java
@@ -32,124 +32,125 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch.cat.recovery.RecoveryRecord;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch.cat.recovery.RecoveryRecord;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.recovery.Response
 
 @JsonpDeserializable
 public class RecoveryResponse implements JsonpSerializable {
-	private final List<RecoveryRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RecoveryResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static RecoveryResponse of(Function<Builder, ObjectBuilder<RecoveryResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<RecoveryRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (RecoveryRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RecoveryResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryResponse> {
-		private List<RecoveryRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<RecoveryRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(RecoveryRecord value, RecoveryRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<RecoveryRecord.Builder, ObjectBuilder<RecoveryRecord>> fn) {
-			return valueBody(fn.apply(new RecoveryRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link RecoveryResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RecoveryResponse build() {
-			_checkSingleUse();
-
-			return new RecoveryResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<RecoveryResponse> _DESERIALIZER = createRecoveryResponseDeserializer();
-	protected static JsonpDeserializer<RecoveryResponse> createRecoveryResponseDeserializer() {
-
-		JsonpDeserializer<List<RecoveryRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(RecoveryRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<RecoveryRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RecoveryResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static RecoveryResponse of(Function<Builder, ObjectBuilder<RecoveryResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<RecoveryRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (RecoveryRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RecoveryResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryResponse> {
+        private List<RecoveryRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<RecoveryRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(RecoveryRecord value, RecoveryRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<RecoveryRecord.Builder, ObjectBuilder<RecoveryRecord>> fn) {
+            return valueBody(fn.apply(new RecoveryRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link RecoveryResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RecoveryResponse build() {
+            _checkSingleUse();
+
+            return new RecoveryResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<RecoveryResponse> _DESERIALIZER = createRecoveryResponseDeserializer();
+
+    protected static JsonpDeserializer<RecoveryResponse> createRecoveryResponseDeserializer() {
+
+        JsonpDeserializer<List<RecoveryRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(RecoveryRecord._DESERIALIZER);
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/RepositoriesRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/RepositoriesRequest.java
index 7f070757f7..a46803f881 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/RepositoriesRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/RepositoriesRequest.java
@@ -32,47 +32,49 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.util.HashMap;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 
-import java.util.HashMap;
-
 // typedef: cat.repositories.Request
 
 /**
  * Returns information about snapshot repositories registered in the cluster.
- * 
+ *
  */
 
 public class RepositoriesRequest extends CatRequestBase {
-	public RepositoriesRequest() {
-	}
+    public RepositoriesRequest() {}
 
-	/**
-	 * Singleton instance for {@link RepositoriesRequest}.
-	 */
-	public static final RepositoriesRequest _INSTANCE = new RepositoriesRequest();
+    /**
+     * Singleton instance for {@link RepositoriesRequest}.
+     */
+    public static final RepositoriesRequest _INSTANCE = new RepositoriesRequest();
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Endpoint "{@code cat.repositories}".
-	 */
-	public static final Endpoint<RepositoriesRequest, RepositoriesResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+    /**
+     * Endpoint "{@code cat.repositories}".
+     */
+    public static final Endpoint<RepositoriesRequest, RepositoriesResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
 
-			// Request method
-			request -> {
-				return "GET";
+        // Request method
+        request -> {
+            return "GET";
 
-			},
+        },
 
-			// Request path
-			request -> {
-				return "/_cat/repositories";
+        // Request path
+        request -> {
+            return "/_cat/repositories";
 
-			},
+        },
 
-			// Request parameters
-			request -> new HashMap<>(request.queryParameters()), SimpleEndpoint.emptyMap(), false, RepositoriesResponse._DESERIALIZER);
+        // Request parameters
+        request -> new HashMap<>(request.queryParameters()),
+        SimpleEndpoint.emptyMap(),
+        false,
+        RepositoriesResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/RepositoriesResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/RepositoriesResponse.java
index 273bc48e6a..238506c41c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/RepositoriesResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/RepositoriesResponse.java
@@ -32,124 +32,127 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch.cat.repositories.RepositoriesRecord;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch.cat.repositories.RepositoriesRecord;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.repositories.Response
 
 @JsonpDeserializable
 public class RepositoriesResponse implements JsonpSerializable {
-	private final List<RepositoriesRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RepositoriesResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static RepositoriesResponse of(Function<Builder, ObjectBuilder<RepositoriesResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<RepositoriesRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (RepositoriesRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RepositoriesResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RepositoriesResponse> {
-		private List<RepositoriesRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<RepositoriesRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(RepositoriesRecord value, RepositoriesRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<RepositoriesRecord.Builder, ObjectBuilder<RepositoriesRecord>> fn) {
-			return valueBody(fn.apply(new RepositoriesRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link RepositoriesResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RepositoriesResponse build() {
-			_checkSingleUse();
-
-			return new RepositoriesResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<RepositoriesResponse> _DESERIALIZER = createRepositoriesResponseDeserializer();
-	protected static JsonpDeserializer<RepositoriesResponse> createRepositoriesResponseDeserializer() {
-
-		JsonpDeserializer<List<RepositoriesRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(RepositoriesRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<RepositoriesRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RepositoriesResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static RepositoriesResponse of(Function<Builder, ObjectBuilder<RepositoriesResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<RepositoriesRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (RepositoriesRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RepositoriesResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RepositoriesResponse> {
+        private List<RepositoriesRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<RepositoriesRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(RepositoriesRecord value, RepositoriesRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<RepositoriesRecord.Builder, ObjectBuilder<RepositoriesRecord>> fn) {
+            return valueBody(fn.apply(new RepositoriesRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link RepositoriesResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RepositoriesResponse build() {
+            _checkSingleUse();
+
+            return new RepositoriesResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<RepositoriesResponse> _DESERIALIZER = createRepositoriesResponseDeserializer();
+
+    protected static JsonpDeserializer<RepositoriesResponse> createRepositoriesResponseDeserializer() {
+
+        JsonpDeserializer<List<RepositoriesRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(
+            RepositoriesRecord._DESERIALIZER
+        );
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/SegmentsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/SegmentsRequest.java
index 971359d62c..20e4560b66 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/SegmentsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/SegmentsRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.Bytes;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.transport.Endpoint;
@@ -39,13 +45,6 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 // typedef: cat.segments.Request
 
 /**
@@ -54,155 +53,158 @@
  */
 
 public class SegmentsRequest extends CatRequestBase {
-	@Nullable
-	private final Bytes bytes;
-
-	private final List<String> index;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SegmentsRequest(Builder builder) {
-		super(builder);
-		this.bytes = builder.bytes;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-
-	}
-
-	public static SegmentsRequest of(Function<Builder, ObjectBuilder<SegmentsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * The unit in which to display byte values
-	 * <p>
-	 * API name: {@code bytes}
-	 */
-	@Nullable
-	public final Bytes bytes() {
-		return this.bytes;
-	}
-
-	/**
-	 * A comma-separated list of index names to limit the returned information
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SegmentsRequest}.
-	 */
-
-	public static class Builder extends CatRequestBaseBuilder<SegmentsRequest.Builder> {
-		@Nullable
-		private Bytes bytes;
-
-		@Nullable
-		private List<String> index;
-
-		/**
-		 * The unit in which to display byte values
-		 * <p>
-		 * API name: {@code bytes}
-		 */
-		public final Builder bytes(@Nullable Bytes value) {
-			this.bytes = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names to limit the returned information
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names to limit the returned information
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SegmentsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SegmentsRequest build() {
-			_checkSingleUse();
-
-			return new SegmentsRequest(this);
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cat.segments}".
-	 */
-	public static final Endpoint<SegmentsRequest, SegmentsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cat");
-					buf.append("/segments");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cat");
-					buf.append("/segments");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>(request.queryParameters());
-				if (request.bytes != null) {
-					params.put("bytes", request.bytes.jsonValue());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, SegmentsResponse._DESERIALIZER);
+    @Nullable
+    private final Bytes bytes;
+
+    private final List<String> index;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SegmentsRequest(Builder builder) {
+        super(builder);
+        this.bytes = builder.bytes;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+
+    }
+
+    public static SegmentsRequest of(Function<Builder, ObjectBuilder<SegmentsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * The unit in which to display byte values
+     * <p>
+     * API name: {@code bytes}
+     */
+    @Nullable
+    public final Bytes bytes() {
+        return this.bytes;
+    }
+
+    /**
+     * A comma-separated list of index names to limit the returned information
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SegmentsRequest}.
+     */
+
+    public static class Builder extends CatRequestBaseBuilder<SegmentsRequest.Builder> {
+        @Nullable
+        private Bytes bytes;
+
+        @Nullable
+        private List<String> index;
+
+        /**
+         * The unit in which to display byte values
+         * <p>
+         * API name: {@code bytes}
+         */
+        public final Builder bytes(@Nullable Bytes value) {
+            this.bytes = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names to limit the returned information
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names to limit the returned information
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link SegmentsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SegmentsRequest build() {
+            _checkSingleUse();
+
+            return new SegmentsRequest(this);
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cat.segments}".
+     */
+    public static final Endpoint<SegmentsRequest, SegmentsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/segments");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/segments");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>(request.queryParameters());
+            if (request.bytes != null) {
+                params.put("bytes", request.bytes.jsonValue());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        SegmentsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/SegmentsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/SegmentsResponse.java
index 04d909fef5..3d5ed6ca87 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/SegmentsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/SegmentsResponse.java
@@ -32,125 +32,125 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch.cat.segments.SegmentsRecord;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch.cat.segments.SegmentsRecord;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.segments.Response
 
-
 @JsonpDeserializable
 public class SegmentsResponse implements JsonpSerializable {
-	private final List<SegmentsRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SegmentsResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static SegmentsResponse of(Function<Builder, ObjectBuilder<SegmentsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<SegmentsRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (SegmentsRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SegmentsResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SegmentsResponse> {
-		private List<SegmentsRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<SegmentsRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(SegmentsRecord value, SegmentsRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<SegmentsRecord.Builder, ObjectBuilder<SegmentsRecord>> fn) {
-			return valueBody(fn.apply(new SegmentsRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link SegmentsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SegmentsResponse build() {
-			_checkSingleUse();
-
-			return new SegmentsResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<SegmentsResponse> _DESERIALIZER = createSegmentsResponseDeserializer();
-	protected static JsonpDeserializer<SegmentsResponse> createSegmentsResponseDeserializer() {
-
-		JsonpDeserializer<List<SegmentsRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(SegmentsRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<SegmentsRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SegmentsResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static SegmentsResponse of(Function<Builder, ObjectBuilder<SegmentsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<SegmentsRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (SegmentsRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SegmentsResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SegmentsResponse> {
+        private List<SegmentsRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<SegmentsRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(SegmentsRecord value, SegmentsRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<SegmentsRecord.Builder, ObjectBuilder<SegmentsRecord>> fn) {
+            return valueBody(fn.apply(new SegmentsRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link SegmentsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SegmentsResponse build() {
+            _checkSingleUse();
+
+            return new SegmentsResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<SegmentsResponse> _DESERIALIZER = createSegmentsResponseDeserializer();
+
+    protected static JsonpDeserializer<SegmentsResponse> createSegmentsResponseDeserializer() {
+
+        JsonpDeserializer<List<SegmentsRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(SegmentsRecord._DESERIALIZER);
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/ShardsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/ShardsRequest.java
index 40a3e129a3..43f0901f1a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/ShardsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/ShardsRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.Bytes;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.transport.Endpoint;
@@ -39,13 +45,6 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 // typedef: cat.shards.Request
 
 /**
@@ -54,155 +53,158 @@
  */
 
 public class ShardsRequest extends CatRequestBase {
-	@Nullable
-	private final Bytes bytes;
-
-	private final List<String> index;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShardsRequest(Builder builder) {
-		super(builder);
-		this.bytes = builder.bytes;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-
-	}
-
-	public static ShardsRequest of(Function<Builder, ObjectBuilder<ShardsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * The unit in which to display byte values
-	 * <p>
-	 * API name: {@code bytes}
-	 */
-	@Nullable
-	public final Bytes bytes() {
-		return this.bytes;
-	}
-
-	/**
-	 * A comma-separated list of index names to limit the returned information
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardsRequest}.
-	 */
-
-	public static class Builder extends CatRequestBaseBuilder<ShardsRequest.Builder> {
-		@Nullable
-		private Bytes bytes;
-
-		@Nullable
-		private List<String> index;
-
-		/**
-		 * The unit in which to display byte values
-		 * <p>
-		 * API name: {@code bytes}
-		 */
-		public final Builder bytes(@Nullable Bytes value) {
-			this.bytes = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names to limit the returned information
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names to limit the returned information
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShardsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardsRequest build() {
-			_checkSingleUse();
-
-			return new ShardsRequest(this);
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cat.shards}".
-	 */
-	public static final Endpoint<ShardsRequest, ShardsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cat");
-					buf.append("/shards");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cat");
-					buf.append("/shards");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>(request.queryParameters());
-				if (request.bytes != null) {
-					params.put("bytes", request.bytes.jsonValue());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, ShardsResponse._DESERIALIZER);
+    @Nullable
+    private final Bytes bytes;
+
+    private final List<String> index;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShardsRequest(Builder builder) {
+        super(builder);
+        this.bytes = builder.bytes;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+
+    }
+
+    public static ShardsRequest of(Function<Builder, ObjectBuilder<ShardsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * The unit in which to display byte values
+     * <p>
+     * API name: {@code bytes}
+     */
+    @Nullable
+    public final Bytes bytes() {
+        return this.bytes;
+    }
+
+    /**
+     * A comma-separated list of index names to limit the returned information
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardsRequest}.
+     */
+
+    public static class Builder extends CatRequestBaseBuilder<ShardsRequest.Builder> {
+        @Nullable
+        private Bytes bytes;
+
+        @Nullable
+        private List<String> index;
+
+        /**
+         * The unit in which to display byte values
+         * <p>
+         * API name: {@code bytes}
+         */
+        public final Builder bytes(@Nullable Bytes value) {
+            this.bytes = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names to limit the returned information
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names to limit the returned information
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShardsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardsRequest build() {
+            _checkSingleUse();
+
+            return new ShardsRequest(this);
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cat.shards}".
+     */
+    public static final Endpoint<ShardsRequest, ShardsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/shards");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/shards");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>(request.queryParameters());
+            if (request.bytes != null) {
+                params.put("bytes", request.bytes.jsonValue());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        ShardsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/ShardsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/ShardsResponse.java
index 38e1f60fde..f6e28db9c8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/ShardsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/ShardsResponse.java
@@ -32,125 +32,125 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch.cat.shards.ShardsRecord;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch.cat.shards.ShardsRecord;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.shards.Response
 
-
 @JsonpDeserializable
 public class ShardsResponse implements JsonpSerializable {
-	private final List<ShardsRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShardsResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static ShardsResponse of(Function<Builder, ObjectBuilder<ShardsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<ShardsRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (ShardsRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardsResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardsResponse> {
-		private List<ShardsRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<ShardsRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(ShardsRecord value, ShardsRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<ShardsRecord.Builder, ObjectBuilder<ShardsRecord>> fn) {
-			return valueBody(fn.apply(new ShardsRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ShardsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardsResponse build() {
-			_checkSingleUse();
-
-			return new ShardsResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<ShardsResponse> _DESERIALIZER = createShardsResponseDeserializer();
-	protected static JsonpDeserializer<ShardsResponse> createShardsResponseDeserializer() {
-
-		JsonpDeserializer<List<ShardsRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(ShardsRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<ShardsRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShardsResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static ShardsResponse of(Function<Builder, ObjectBuilder<ShardsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<ShardsRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (ShardsRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardsResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardsResponse> {
+        private List<ShardsRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<ShardsRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(ShardsRecord value, ShardsRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<ShardsRecord.Builder, ObjectBuilder<ShardsRecord>> fn) {
+            return valueBody(fn.apply(new ShardsRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ShardsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardsResponse build() {
+            _checkSingleUse();
+
+            return new ShardsResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<ShardsResponse> _DESERIALIZER = createShardsResponseDeserializer();
+
+    protected static JsonpDeserializer<ShardsResponse> createShardsResponseDeserializer() {
+
+        JsonpDeserializer<List<ShardsRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(ShardsRecord._DESERIALIZER);
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/SnapshotsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/SnapshotsRequest.java
index baa057084e..8d8d5b06b2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/SnapshotsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/SnapshotsRequest.java
@@ -32,18 +32,17 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.Endpoint;
-import org.opensearch.client.transport.endpoints.SimpleEndpoint;
-import org.opensearch.client.util.ApiTypeHelper;
-import org.opensearch.client.util.ObjectBuilder;
-
-import javax.annotation.Nullable;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.transport.Endpoint;
+import org.opensearch.client.transport.endpoints.SimpleEndpoint;
+import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.ObjectBuilder;
 
 // typedef: cat.snapshots.Request
 
@@ -53,156 +52,158 @@
  */
 
 public class SnapshotsRequest extends CatRequestBase {
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> repository;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SnapshotsRequest(Builder builder) {
-		super(builder);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.repository = ApiTypeHelper.unmodifiable(builder.repository);
-
-	}
-
-	public static SnapshotsRequest of(Function<Builder, ObjectBuilder<SnapshotsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Set to true to ignore unavailable snapshots
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * Name of repository from which to fetch the snapshot information
-	 * <p>
-	 * API name: {@code repository}
-	 */
-	public final List<String> repository() {
-		return this.repository;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SnapshotsRequest}.
-	 */
-
-	public static class Builder extends CatRequestBaseBuilder<SnapshotsRequest.Builder> {
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private List<String> repository;
-
-		/**
-		 * Set to true to ignore unavailable snapshots
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Name of repository from which to fetch the snapshot information
-		 * <p>
-		 * API name: {@code repository}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>repository</code>.
-		 */
-		public final Builder repository(List<String> list) {
-			this.repository = _listAddAll(this.repository, list);
-			return this;
-		}
-
-		/**
-		 * Name of repository from which to fetch the snapshot information
-		 * <p>
-		 * API name: {@code repository}
-		 * <p>
-		 * Adds one or more values to <code>repository</code>.
-		 */
-		public final Builder repository(String value, String... values) {
-			this.repository = _listAdd(this.repository, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SnapshotsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SnapshotsRequest build() {
-			_checkSingleUse();
-
-			return new SnapshotsRequest(this);
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cat.snapshots}".
-	 */
-	public static final Endpoint<SnapshotsRequest, SnapshotsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _repository = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.repository()))
-					propsSet |= _repository;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cat");
-					buf.append("/snapshots");
-					return buf.toString();
-				}
-				if (propsSet == (_repository)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cat");
-					buf.append("/snapshots");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.repository.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>(request.queryParameters());
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, SnapshotsResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> repository;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SnapshotsRequest(Builder builder) {
+        super(builder);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.repository = ApiTypeHelper.unmodifiable(builder.repository);
+
+    }
+
+    public static SnapshotsRequest of(Function<Builder, ObjectBuilder<SnapshotsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Set to true to ignore unavailable snapshots
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * Name of repository from which to fetch the snapshot information
+     * <p>
+     * API name: {@code repository}
+     */
+    public final List<String> repository() {
+        return this.repository;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SnapshotsRequest}.
+     */
+
+    public static class Builder extends CatRequestBaseBuilder<SnapshotsRequest.Builder> {
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private List<String> repository;
+
+        /**
+         * Set to true to ignore unavailable snapshots
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Name of repository from which to fetch the snapshot information
+         * <p>
+         * API name: {@code repository}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>repository</code>.
+         */
+        public final Builder repository(List<String> list) {
+            this.repository = _listAddAll(this.repository, list);
+            return this;
+        }
+
+        /**
+         * Name of repository from which to fetch the snapshot information
+         * <p>
+         * API name: {@code repository}
+         * <p>
+         * Adds one or more values to <code>repository</code>.
+         */
+        public final Builder repository(String value, String... values) {
+            this.repository = _listAdd(this.repository, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link SnapshotsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SnapshotsRequest build() {
+            _checkSingleUse();
+
+            return new SnapshotsRequest(this);
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cat.snapshots}".
+     */
+    public static final Endpoint<SnapshotsRequest, SnapshotsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _repository = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.repository())) propsSet |= _repository;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/snapshots");
+                return buf.toString();
+            }
+            if (propsSet == (_repository)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/snapshots");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.repository.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>(request.queryParameters());
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        SnapshotsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/SnapshotsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/SnapshotsResponse.java
index d1804b5f31..ffa0d72ea5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/SnapshotsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/SnapshotsResponse.java
@@ -32,124 +32,125 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch.cat.snapshots.SnapshotsRecord;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch.cat.snapshots.SnapshotsRecord;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.snapshots.Response
 
 @JsonpDeserializable
 public class SnapshotsResponse implements JsonpSerializable {
-	private final List<SnapshotsRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SnapshotsResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static SnapshotsResponse of(Function<Builder, ObjectBuilder<SnapshotsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<SnapshotsRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (SnapshotsRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SnapshotsResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotsResponse> {
-		private List<SnapshotsRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<SnapshotsRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(SnapshotsRecord value, SnapshotsRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<SnapshotsRecord.Builder, ObjectBuilder<SnapshotsRecord>> fn) {
-			return valueBody(fn.apply(new SnapshotsRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link SnapshotsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SnapshotsResponse build() {
-			_checkSingleUse();
-
-			return new SnapshotsResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<SnapshotsResponse> _DESERIALIZER = createSnapshotsResponseDeserializer();
-	protected static JsonpDeserializer<SnapshotsResponse> createSnapshotsResponseDeserializer() {
-
-		JsonpDeserializer<List<SnapshotsRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(SnapshotsRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<SnapshotsRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SnapshotsResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static SnapshotsResponse of(Function<Builder, ObjectBuilder<SnapshotsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<SnapshotsRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (SnapshotsRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SnapshotsResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotsResponse> {
+        private List<SnapshotsRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<SnapshotsRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(SnapshotsRecord value, SnapshotsRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<SnapshotsRecord.Builder, ObjectBuilder<SnapshotsRecord>> fn) {
+            return valueBody(fn.apply(new SnapshotsRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link SnapshotsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SnapshotsResponse build() {
+            _checkSingleUse();
+
+            return new SnapshotsResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<SnapshotsResponse> _DESERIALIZER = createSnapshotsResponseDeserializer();
+
+    protected static JsonpDeserializer<SnapshotsResponse> createSnapshotsResponseDeserializer() {
+
+        JsonpDeserializer<List<SnapshotsRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(SnapshotsRecord._DESERIALIZER);
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/TasksRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/TasksRequest.java
index f030ab8eff..bbd7ad8fc6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/TasksRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/TasksRequest.java
@@ -32,18 +32,17 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.Endpoint;
-import org.opensearch.client.transport.endpoints.SimpleEndpoint;
-import org.opensearch.client.util.ApiTypeHelper;
-import org.opensearch.client.util.ObjectBuilder;
-
-import javax.annotation.Nullable;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.transport.Endpoint;
+import org.opensearch.client.transport.endpoints.SimpleEndpoint;
+import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.ObjectBuilder;
 
 // typedef: cat.tasks.Request
 
@@ -54,202 +53,206 @@
  */
 
 public class TasksRequest extends CatRequestBase {
-	private final List<String> actions;
-
-	@Nullable
-	private final Boolean detailed;
-
-	private final List<String> nodeId;
-
-	@Nullable
-	private final Long parentTask;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TasksRequest(Builder builder) {
-		super(builder);
-		this.actions = ApiTypeHelper.unmodifiable(builder.actions);
-		this.detailed = builder.detailed;
-		this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
-		this.parentTask = builder.parentTask;
-
-	}
-
-	public static TasksRequest of(Function<Builder, ObjectBuilder<TasksRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * A comma-separated list of actions that should be returned. Leave empty to
-	 * return all.
-	 * <p>
-	 * API name: {@code actions}
-	 */
-	public final List<String> actions() {
-		return this.actions;
-	}
-
-	/**
-	 * Return detailed task information (default: false)
-	 * <p>
-	 * API name: {@code detailed}
-	 */
-	@Nullable
-	public final Boolean detailed() {
-		return this.detailed;
-	}
-
-	/**
-	 * API name: {@code node_id}
-	 */
-	public final List<String> nodeId() {
-		return this.nodeId;
-	}
-
-	/**
-	 * API name: {@code parent_task}
-	 */
-	@Nullable
-	public final Long parentTask() {
-		return this.parentTask;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TasksRequest}.
-	 */
-
-	public static class Builder extends CatRequestBaseBuilder<TasksRequest.Builder> {
-		@Nullable
-		private List<String> actions;
-
-		@Nullable
-		private Boolean detailed;
-
-		@Nullable
-		private List<String> nodeId;
-
-		@Nullable
-		private Long parentTask;
-
-		/**
-		 * A comma-separated list of actions that should be returned. Leave empty to
-		 * return all.
-		 * <p>
-		 * API name: {@code actions}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>actions</code>.
-		 */
-		public final Builder actions(List<String> list) {
-			this.actions = _listAddAll(this.actions, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of actions that should be returned. Leave empty to
-		 * return all.
-		 * <p>
-		 * API name: {@code actions}
-		 * <p>
-		 * Adds one or more values to <code>actions</code>.
-		 */
-		public final Builder actions(String value, String... values) {
-			this.actions = _listAdd(this.actions, value, values);
-			return this;
-		}
-
-		/**
-		 * Return detailed task information (default: false)
-		 * <p>
-		 * API name: {@code detailed}
-		 */
-		public final Builder detailed(@Nullable Boolean value) {
-			this.detailed = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code node_id}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>nodeId</code>.
-		 */
-		public final Builder nodeId(List<String> list) {
-			this.nodeId = _listAddAll(this.nodeId, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code node_id}
-		 * <p>
-		 * Adds one or more values to <code>nodeId</code>.
-		 */
-		public final Builder nodeId(String value, String... values) {
-			this.nodeId = _listAdd(this.nodeId, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code parent_task}
-		 */
-		public final Builder parentTask(@Nullable Long value) {
-			this.parentTask = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TasksRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TasksRequest build() {
-			_checkSingleUse();
-
-			return new TasksRequest(this);
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cat.tasks}".
-	 */
-	public static final Endpoint<TasksRequest, TasksResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				return "/_cat/tasks";
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>(request.queryParameters());
-				if (request.detailed != null) {
-					params.put("detailed", String.valueOf(request.detailed));
-				}
-				if (request.parentTask != null) {
-					params.put("parent_task", String.valueOf(request.parentTask));
-				}
-				if (ApiTypeHelper.isDefined(request.actions)) {
-					params.put("actions", request.actions.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (ApiTypeHelper.isDefined(request.nodeId)) {
-					params.put("node_id", request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, TasksResponse._DESERIALIZER);
+    private final List<String> actions;
+
+    @Nullable
+    private final Boolean detailed;
+
+    private final List<String> nodeId;
+
+    @Nullable
+    private final Long parentTask;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TasksRequest(Builder builder) {
+        super(builder);
+        this.actions = ApiTypeHelper.unmodifiable(builder.actions);
+        this.detailed = builder.detailed;
+        this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
+        this.parentTask = builder.parentTask;
+
+    }
+
+    public static TasksRequest of(Function<Builder, ObjectBuilder<TasksRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * A comma-separated list of actions that should be returned. Leave empty to
+     * return all.
+     * <p>
+     * API name: {@code actions}
+     */
+    public final List<String> actions() {
+        return this.actions;
+    }
+
+    /**
+     * Return detailed task information (default: false)
+     * <p>
+     * API name: {@code detailed}
+     */
+    @Nullable
+    public final Boolean detailed() {
+        return this.detailed;
+    }
+
+    /**
+     * API name: {@code node_id}
+     */
+    public final List<String> nodeId() {
+        return this.nodeId;
+    }
+
+    /**
+     * API name: {@code parent_task}
+     */
+    @Nullable
+    public final Long parentTask() {
+        return this.parentTask;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TasksRequest}.
+     */
+
+    public static class Builder extends CatRequestBaseBuilder<TasksRequest.Builder> {
+        @Nullable
+        private List<String> actions;
+
+        @Nullable
+        private Boolean detailed;
+
+        @Nullable
+        private List<String> nodeId;
+
+        @Nullable
+        private Long parentTask;
+
+        /**
+         * A comma-separated list of actions that should be returned. Leave empty to
+         * return all.
+         * <p>
+         * API name: {@code actions}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>actions</code>.
+         */
+        public final Builder actions(List<String> list) {
+            this.actions = _listAddAll(this.actions, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of actions that should be returned. Leave empty to
+         * return all.
+         * <p>
+         * API name: {@code actions}
+         * <p>
+         * Adds one or more values to <code>actions</code>.
+         */
+        public final Builder actions(String value, String... values) {
+            this.actions = _listAdd(this.actions, value, values);
+            return this;
+        }
+
+        /**
+         * Return detailed task information (default: false)
+         * <p>
+         * API name: {@code detailed}
+         */
+        public final Builder detailed(@Nullable Boolean value) {
+            this.detailed = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code node_id}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>nodeId</code>.
+         */
+        public final Builder nodeId(List<String> list) {
+            this.nodeId = _listAddAll(this.nodeId, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code node_id}
+         * <p>
+         * Adds one or more values to <code>nodeId</code>.
+         */
+        public final Builder nodeId(String value, String... values) {
+            this.nodeId = _listAdd(this.nodeId, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code parent_task}
+         */
+        public final Builder parentTask(@Nullable Long value) {
+            this.parentTask = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link TasksRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TasksRequest build() {
+            _checkSingleUse();
+
+            return new TasksRequest(this);
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cat.tasks}".
+     */
+    public static final Endpoint<TasksRequest, TasksResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            return "/_cat/tasks";
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>(request.queryParameters());
+            if (request.detailed != null) {
+                params.put("detailed", String.valueOf(request.detailed));
+            }
+            if (request.parentTask != null) {
+                params.put("parent_task", String.valueOf(request.parentTask));
+            }
+            if (ApiTypeHelper.isDefined(request.actions)) {
+                params.put("actions", request.actions.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (ApiTypeHelper.isDefined(request.nodeId)) {
+                params.put("node_id", request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        TasksResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/TasksResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/TasksResponse.java
index d0d583ce98..09742b32ae 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/TasksResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/TasksResponse.java
@@ -32,124 +32,125 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch.cat.tasks.TasksRecord;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch.cat.tasks.TasksRecord;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.tasks.Response
 
 @JsonpDeserializable
 public class TasksResponse implements JsonpSerializable {
-	private final List<TasksRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TasksResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static TasksResponse of(Function<Builder, ObjectBuilder<TasksResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<TasksRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (TasksRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TasksResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TasksResponse> {
-		private List<TasksRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<TasksRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(TasksRecord value, TasksRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<TasksRecord.Builder, ObjectBuilder<TasksRecord>> fn) {
-			return valueBody(fn.apply(new TasksRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link TasksResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TasksResponse build() {
-			_checkSingleUse();
-
-			return new TasksResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<TasksResponse> _DESERIALIZER = createTasksResponseDeserializer();
-	protected static JsonpDeserializer<TasksResponse> createTasksResponseDeserializer() {
-
-		JsonpDeserializer<List<TasksRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(TasksRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<TasksRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TasksResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static TasksResponse of(Function<Builder, ObjectBuilder<TasksResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<TasksRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (TasksRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TasksResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TasksResponse> {
+        private List<TasksRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<TasksRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(TasksRecord value, TasksRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<TasksRecord.Builder, ObjectBuilder<TasksRecord>> fn) {
+            return valueBody(fn.apply(new TasksRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link TasksResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TasksResponse build() {
+            _checkSingleUse();
+
+            return new TasksResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<TasksResponse> _DESERIALIZER = createTasksResponseDeserializer();
+
+    protected static JsonpDeserializer<TasksResponse> createTasksResponseDeserializer() {
+
+        JsonpDeserializer<List<TasksRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(TasksRecord._DESERIALIZER);
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/TemplatesRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/TemplatesRequest.java
index 9d279f1294..4a727e70da 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/TemplatesRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/TemplatesRequest.java
@@ -32,126 +32,128 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.util.HashMap;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ObjectBuilder;
 
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.function.Function;
-
 // typedef: cat.templates.Request
 
 /**
  * Returns information about existing templates.
- * 
+ *
  */
 
 public class TemplatesRequest extends CatRequestBase {
-	@Nullable
-	private final String name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TemplatesRequest(Builder builder) {
-		super(builder);
-		this.name = builder.name;
-
-	}
-
-	public static TemplatesRequest of(Function<Builder, ObjectBuilder<TemplatesRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * A pattern that returned template names must match
-	 * <p>
-	 * API name: {@code name}
-	 */
-	@Nullable
-	public final String name() {
-		return this.name;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TemplatesRequest}.
-	 */
-
-	public static class Builder extends CatRequestBaseBuilder<TemplatesRequest.Builder> {
-		@Nullable
-		private String name;
-
-		/**
-		 * A pattern that returned template names must match
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(@Nullable String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TemplatesRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TemplatesRequest build() {
-			_checkSingleUse();
-
-			return new TemplatesRequest(this);
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cat.templates}".
-	 */
-	public static final Endpoint<TemplatesRequest, TemplatesResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				if (request.name() != null)
-					propsSet |= _name;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cat");
-					buf.append("/templates");
-					return buf.toString();
-				}
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cat");
-					buf.append("/templates");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> new HashMap<>(request.queryParameters()), SimpleEndpoint.emptyMap(), false, TemplatesResponse._DESERIALIZER);
+    @Nullable
+    private final String name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TemplatesRequest(Builder builder) {
+        super(builder);
+        this.name = builder.name;
+
+    }
+
+    public static TemplatesRequest of(Function<Builder, ObjectBuilder<TemplatesRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * A pattern that returned template names must match
+     * <p>
+     * API name: {@code name}
+     */
+    @Nullable
+    public final String name() {
+        return this.name;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TemplatesRequest}.
+     */
+
+    public static class Builder extends CatRequestBaseBuilder<TemplatesRequest.Builder> {
+        @Nullable
+        private String name;
+
+        /**
+         * A pattern that returned template names must match
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(@Nullable String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link TemplatesRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TemplatesRequest build() {
+            _checkSingleUse();
+
+            return new TemplatesRequest(this);
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cat.templates}".
+     */
+    public static final Endpoint<TemplatesRequest, TemplatesResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            if (request.name() != null) propsSet |= _name;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/templates");
+                return buf.toString();
+            }
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/templates");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> new HashMap<>(request.queryParameters()),
+        SimpleEndpoint.emptyMap(),
+        false,
+        TemplatesResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/TemplatesResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/TemplatesResponse.java
index 92a4a50097..2f3e9a7b97 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/TemplatesResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/TemplatesResponse.java
@@ -32,124 +32,125 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch.cat.templates.TemplatesRecord;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch.cat.templates.TemplatesRecord;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.templates.Response
 
 @JsonpDeserializable
 public class TemplatesResponse implements JsonpSerializable {
-	private final List<TemplatesRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TemplatesResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static TemplatesResponse of(Function<Builder, ObjectBuilder<TemplatesResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<TemplatesRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (TemplatesRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TemplatesResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TemplatesResponse> {
-		private List<TemplatesRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<TemplatesRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(TemplatesRecord value, TemplatesRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<TemplatesRecord.Builder, ObjectBuilder<TemplatesRecord>> fn) {
-			return valueBody(fn.apply(new TemplatesRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link TemplatesResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TemplatesResponse build() {
-			_checkSingleUse();
-
-			return new TemplatesResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<TemplatesResponse> _DESERIALIZER = createTemplatesResponseDeserializer();
-	protected static JsonpDeserializer<TemplatesResponse> createTemplatesResponseDeserializer() {
-
-		JsonpDeserializer<List<TemplatesRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(TemplatesRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<TemplatesRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TemplatesResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static TemplatesResponse of(Function<Builder, ObjectBuilder<TemplatesResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<TemplatesRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (TemplatesRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TemplatesResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TemplatesResponse> {
+        private List<TemplatesRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<TemplatesRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(TemplatesRecord value, TemplatesRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<TemplatesRecord.Builder, ObjectBuilder<TemplatesRecord>> fn) {
+            return valueBody(fn.apply(new TemplatesRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link TemplatesResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TemplatesResponse build() {
+            _checkSingleUse();
+
+            return new TemplatesResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<TemplatesResponse> _DESERIALIZER = createTemplatesResponseDeserializer();
+
+    protected static JsonpDeserializer<TemplatesResponse> createTemplatesResponseDeserializer() {
+
+        JsonpDeserializer<List<TemplatesRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(TemplatesRecord._DESERIALIZER);
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/ThreadPoolRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/ThreadPoolRequest.java
index 5f45d3a1ca..e49a776ad7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/ThreadPoolRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/ThreadPoolRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.cat;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch.cat.thread_pool.ThreadPoolSize;
 import org.opensearch.client.transport.Endpoint;
@@ -39,176 +45,170 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 // typedef: cat.thread_pool.Request
 
 /**
  * Returns cluster-wide thread pool statistics per node. By default the active,
  * queue and rejected statistics are returned for all thread pools.
- * 
+ *
  */
 
 public class ThreadPoolRequest extends CatRequestBase {
-	@Nullable
-	private final ThreadPoolSize size;
-
-	private final List<String> threadPoolPatterns;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ThreadPoolRequest(Builder builder) {
-		super(builder);
-		this.size = builder.size;
-		this.threadPoolPatterns = ApiTypeHelper.unmodifiable(builder.threadPoolPatterns);
-
-	}
-
-	public static ThreadPoolRequest of(Function<Builder, ObjectBuilder<ThreadPoolRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * The multiplier in which to display values
-	 * <p>
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final ThreadPoolSize size() {
-		return this.size;
-	}
-
-	/**
-	 * A comma-separated list of regular-expressions to filter the thread pools in
-	 * the output
-	 * <p>
-	 * API name: {@code thread_pool_patterns}
-	 */
-	public final List<String> threadPoolPatterns() {
-		return this.threadPoolPatterns;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ThreadPoolRequest}.
-	 */
-
-	public static class Builder extends CatRequestBaseBuilder<ThreadPoolRequest.Builder> {
-		@Nullable
-		private ThreadPoolSize size;
-
-		@Nullable
-		private List<String> threadPoolPatterns;
-
-		/**
-		 * The multiplier in which to display values
-		 * <p>
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable ThreadPoolSize value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of regular-expressions to filter the thread pools in
-		 * the output
-		 * <p>
-		 * API name: {@code thread_pool_patterns}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>threadPoolPatterns</code>.
-		 */
-		public final Builder threadPoolPatterns(List<String> list) {
-			this.threadPoolPatterns = _listAddAll(this.threadPoolPatterns, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of regular-expressions to filter the thread pools in
-		 * the output
-		 * <p>
-		 * API name: {@code thread_pool_patterns}
-		 * <p>
-		 * Adds one or more values to <code>threadPoolPatterns</code>.
-		 */
-		public final Builder threadPoolPatterns(String value, String... values) {
-			this.threadPoolPatterns = _listAdd(this.threadPoolPatterns, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ThreadPoolRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ThreadPoolRequest build() {
-			_checkSingleUse();
-
-			return new ThreadPoolRequest(this);
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cat.thread_pool}".
-	 */
-	public static final Endpoint<ThreadPoolRequest, ThreadPoolResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _threadPoolPatterns = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.threadPoolPatterns()))
-					propsSet |= _threadPoolPatterns;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cat");
-					buf.append("/thread_pool");
-					return buf.toString();
-				}
-				if (propsSet == (_threadPoolPatterns)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cat");
-					buf.append("/thread_pool");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(
-							request.threadPoolPatterns.stream()
-									.map(v -> v).collect(Collectors.joining(",")), buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>(request.queryParameters());
-				if (request.size != null) {
-					params.put("size", request.size.jsonValue());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, ThreadPoolResponse._DESERIALIZER);
+    @Nullable
+    private final ThreadPoolSize size;
+
+    private final List<String> threadPoolPatterns;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ThreadPoolRequest(Builder builder) {
+        super(builder);
+        this.size = builder.size;
+        this.threadPoolPatterns = ApiTypeHelper.unmodifiable(builder.threadPoolPatterns);
+
+    }
+
+    public static ThreadPoolRequest of(Function<Builder, ObjectBuilder<ThreadPoolRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * The multiplier in which to display values
+     * <p>
+     * API name: {@code size}
+     */
+    @Nullable
+    public final ThreadPoolSize size() {
+        return this.size;
+    }
+
+    /**
+     * A comma-separated list of regular-expressions to filter the thread pools in
+     * the output
+     * <p>
+     * API name: {@code thread_pool_patterns}
+     */
+    public final List<String> threadPoolPatterns() {
+        return this.threadPoolPatterns;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ThreadPoolRequest}.
+     */
+
+    public static class Builder extends CatRequestBaseBuilder<ThreadPoolRequest.Builder> {
+        @Nullable
+        private ThreadPoolSize size;
+
+        @Nullable
+        private List<String> threadPoolPatterns;
+
+        /**
+         * The multiplier in which to display values
+         * <p>
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable ThreadPoolSize value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of regular-expressions to filter the thread pools in
+         * the output
+         * <p>
+         * API name: {@code thread_pool_patterns}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>threadPoolPatterns</code>.
+         */
+        public final Builder threadPoolPatterns(List<String> list) {
+            this.threadPoolPatterns = _listAddAll(this.threadPoolPatterns, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of regular-expressions to filter the thread pools in
+         * the output
+         * <p>
+         * API name: {@code thread_pool_patterns}
+         * <p>
+         * Adds one or more values to <code>threadPoolPatterns</code>.
+         */
+        public final Builder threadPoolPatterns(String value, String... values) {
+            this.threadPoolPatterns = _listAdd(this.threadPoolPatterns, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link ThreadPoolRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ThreadPoolRequest build() {
+            _checkSingleUse();
+
+            return new ThreadPoolRequest(this);
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cat.thread_pool}".
+     */
+    public static final Endpoint<ThreadPoolRequest, ThreadPoolResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _threadPoolPatterns = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.threadPoolPatterns())) propsSet |= _threadPoolPatterns;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/thread_pool");
+                return buf.toString();
+            }
+            if (propsSet == (_threadPoolPatterns)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cat");
+                buf.append("/thread_pool");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.threadPoolPatterns.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>(request.queryParameters());
+            if (request.size != null) {
+                params.put("size", request.size.jsonValue());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        ThreadPoolResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/ThreadPoolResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/ThreadPoolResponse.java
index bdeb060be9..95bd8eec5e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/ThreadPoolResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/ThreadPoolResponse.java
@@ -32,124 +32,125 @@
 
 package org.opensearch.client.opensearch.cat;
 
-import org.opensearch.client.opensearch.cat.thread_pool.ThreadPoolRecord;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch.cat.thread_pool.ThreadPoolRecord;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cat.thread_pool.Response
 
 @JsonpDeserializable
 public class ThreadPoolResponse implements JsonpSerializable {
-	private final List<ThreadPoolRecord> valueBody;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ThreadPoolResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static ThreadPoolResponse of(Function<Builder, ObjectBuilder<ThreadPoolResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<ThreadPoolRecord> valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (ThreadPoolRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ThreadPoolResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ThreadPoolResponse> {
-		private List<ThreadPoolRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<ThreadPoolRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(ThreadPoolRecord value, ThreadPoolRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<ThreadPoolRecord.Builder, ObjectBuilder<ThreadPoolRecord>> fn) {
-			return valueBody(fn.apply(new ThreadPoolRecord.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ThreadPoolResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ThreadPoolResponse build() {
-			_checkSingleUse();
-
-			return new ThreadPoolResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<ThreadPoolResponse> _DESERIALIZER = createThreadPoolResponseDeserializer();
-	protected static JsonpDeserializer<ThreadPoolResponse> createThreadPoolResponseDeserializer() {
-
-		JsonpDeserializer<List<ThreadPoolRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(ThreadPoolRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final List<ThreadPoolRecord> valueBody;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ThreadPoolResponse(Builder builder) {
+
+        this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
+
+    }
+
+    public static ThreadPoolResponse of(Function<Builder, ObjectBuilder<ThreadPoolResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<ThreadPoolRecord> valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (ThreadPoolRecord item0 : this.valueBody) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ThreadPoolResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ThreadPoolResponse> {
+        private List<ThreadPoolRecord> valueBody;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>valueBody</code>.
+         */
+        public final Builder valueBody(List<ThreadPoolRecord> list) {
+            this.valueBody = _listAddAll(this.valueBody, list);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>valueBody</code>.
+         */
+        public final Builder valueBody(ThreadPoolRecord value, ThreadPoolRecord... values) {
+            this.valueBody = _listAdd(this.valueBody, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>valueBody</code> using a builder lambda.
+         */
+        public final Builder valueBody(Function<ThreadPoolRecord.Builder, ObjectBuilder<ThreadPoolRecord>> fn) {
+            return valueBody(fn.apply(new ThreadPoolRecord.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ThreadPoolResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ThreadPoolResponse build() {
+            _checkSingleUse();
+
+            return new ThreadPoolResponse(this);
+        }
+    }
+
+    public static final JsonpDeserializer<ThreadPoolResponse> _DESERIALIZER = createThreadPoolResponseDeserializer();
+
+    protected static JsonpDeserializer<ThreadPoolResponse> createThreadPoolResponseDeserializer() {
+
+        JsonpDeserializer<List<ThreadPoolRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(ThreadPoolRecord._DESERIALIZER);
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/aliases/AliasesRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/aliases/AliasesRecord.java
index ed6920d33d..6c15bacbd2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/aliases/AliasesRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/aliases/AliasesRecord.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cat.aliases;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,269 +43,267 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cat.aliases.AliasesRecord
 
-
 @JsonpDeserializable
 public class AliasesRecord implements JsonpSerializable {
-	@Nullable
-	private final String alias;
-
-	@Nullable
-	private final String index;
-
-	@Nullable
-	private final String filter;
-
-	@Nullable
-	private final String routingIndex;
-
-	@Nullable
-	private final String routingSearch;
-
-	@Nullable
-	private final String isWriteIndex;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AliasesRecord(Builder builder) {
-
-		this.alias = builder.alias;
-		this.index = builder.index;
-		this.filter = builder.filter;
-		this.routingIndex = builder.routingIndex;
-		this.routingSearch = builder.routingSearch;
-		this.isWriteIndex = builder.isWriteIndex;
-
-	}
-
-	public static AliasesRecord of(Function<Builder, ObjectBuilder<AliasesRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * alias name
-	 * <p>
-	 * API name: {@code alias}
-	 */
-	@Nullable
-	public final String alias() {
-		return this.alias;
-	}
-
-	/**
-	 * index alias points to
-	 * <p>
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * filter
-	 * <p>
-	 * API name: {@code filter}
-	 */
-	@Nullable
-	public final String filter() {
-		return this.filter;
-	}
-
-	/**
-	 * index routing
-	 * <p>
-	 * API name: {@code routing.index}
-	 */
-	@Nullable
-	public final String routingIndex() {
-		return this.routingIndex;
-	}
-
-	/**
-	 * search routing
-	 * <p>
-	 * API name: {@code routing.search}
-	 */
-	@Nullable
-	public final String routingSearch() {
-		return this.routingSearch;
-	}
-
-	/**
-	 * write index
-	 * <p>
-	 * API name: {@code is_write_index}
-	 */
-	@Nullable
-	public final String isWriteIndex() {
-		return this.isWriteIndex;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.alias != null) {
-			generator.writeKey("alias");
-			generator.write(this.alias);
-
-		}
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.filter != null) {
-			generator.writeKey("filter");
-			generator.write(this.filter);
-
-		}
-		if (this.routingIndex != null) {
-			generator.writeKey("routing.index");
-			generator.write(this.routingIndex);
-
-		}
-		if (this.routingSearch != null) {
-			generator.writeKey("routing.search");
-			generator.write(this.routingSearch);
-
-		}
-		if (this.isWriteIndex != null) {
-			generator.writeKey("is_write_index");
-			generator.write(this.isWriteIndex);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AliasesRecord}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AliasesRecord> {
-		@Nullable
-		private String alias;
-
-		@Nullable
-		private String index;
-
-		@Nullable
-		private String filter;
-
-		@Nullable
-		private String routingIndex;
-
-		@Nullable
-		private String routingSearch;
-
-		@Nullable
-		private String isWriteIndex;
-
-		/**
-		 * alias name
-		 * <p>
-		 * API name: {@code alias}
-		 */
-		public final Builder alias(@Nullable String value) {
-			this.alias = value;
-			return this;
-		}
-
-		/**
-		 * index alias points to
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * filter
-		 * <p>
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(@Nullable String value) {
-			this.filter = value;
-			return this;
-		}
-
-		/**
-		 * index routing
-		 * <p>
-		 * API name: {@code routing.index}
-		 */
-		public final Builder routingIndex(@Nullable String value) {
-			this.routingIndex = value;
-			return this;
-		}
-
-		/**
-		 * search routing
-		 * <p>
-		 * API name: {@code routing.search}
-		 */
-		public final Builder routingSearch(@Nullable String value) {
-			this.routingSearch = value;
-			return this;
-		}
-
-		/**
-		 * write index
-		 * <p>
-		 * API name: {@code is_write_index}
-		 */
-		public final Builder isWriteIndex(@Nullable String value) {
-			this.isWriteIndex = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AliasesRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AliasesRecord build() {
-			_checkSingleUse();
-
-			return new AliasesRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AliasesRecord}
-	 */
-	public static final JsonpDeserializer<AliasesRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			AliasesRecord::setupAliasesRecordDeserializer);
-
-	protected static void setupAliasesRecordDeserializer(ObjectDeserializer<AliasesRecord.Builder> op) {
-
-		op.add(Builder::alias, JsonpDeserializer.stringDeserializer(), "alias", "a");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index", "i", "idx");
-		op.add(Builder::filter, JsonpDeserializer.stringDeserializer(), "filter", "f", "fi");
-		op.add(Builder::routingIndex, JsonpDeserializer.stringDeserializer(), "routing.index", "ri", "routingIndex");
-		op.add(Builder::routingSearch, JsonpDeserializer.stringDeserializer(), "routing.search", "rs", "routingSearch");
-		op.add(Builder::isWriteIndex, JsonpDeserializer.stringDeserializer(), "is_write_index", "w", "isWriteIndex");
-
-	}
+    @Nullable
+    private final String alias;
+
+    @Nullable
+    private final String index;
+
+    @Nullable
+    private final String filter;
+
+    @Nullable
+    private final String routingIndex;
+
+    @Nullable
+    private final String routingSearch;
+
+    @Nullable
+    private final String isWriteIndex;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AliasesRecord(Builder builder) {
+
+        this.alias = builder.alias;
+        this.index = builder.index;
+        this.filter = builder.filter;
+        this.routingIndex = builder.routingIndex;
+        this.routingSearch = builder.routingSearch;
+        this.isWriteIndex = builder.isWriteIndex;
+
+    }
+
+    public static AliasesRecord of(Function<Builder, ObjectBuilder<AliasesRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * alias name
+     * <p>
+     * API name: {@code alias}
+     */
+    @Nullable
+    public final String alias() {
+        return this.alias;
+    }
+
+    /**
+     * index alias points to
+     * <p>
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * filter
+     * <p>
+     * API name: {@code filter}
+     */
+    @Nullable
+    public final String filter() {
+        return this.filter;
+    }
+
+    /**
+     * index routing
+     * <p>
+     * API name: {@code routing.index}
+     */
+    @Nullable
+    public final String routingIndex() {
+        return this.routingIndex;
+    }
+
+    /**
+     * search routing
+     * <p>
+     * API name: {@code routing.search}
+     */
+    @Nullable
+    public final String routingSearch() {
+        return this.routingSearch;
+    }
+
+    /**
+     * write index
+     * <p>
+     * API name: {@code is_write_index}
+     */
+    @Nullable
+    public final String isWriteIndex() {
+        return this.isWriteIndex;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.alias != null) {
+            generator.writeKey("alias");
+            generator.write(this.alias);
+
+        }
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.filter != null) {
+            generator.writeKey("filter");
+            generator.write(this.filter);
+
+        }
+        if (this.routingIndex != null) {
+            generator.writeKey("routing.index");
+            generator.write(this.routingIndex);
+
+        }
+        if (this.routingSearch != null) {
+            generator.writeKey("routing.search");
+            generator.write(this.routingSearch);
+
+        }
+        if (this.isWriteIndex != null) {
+            generator.writeKey("is_write_index");
+            generator.write(this.isWriteIndex);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AliasesRecord}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AliasesRecord> {
+        @Nullable
+        private String alias;
+
+        @Nullable
+        private String index;
+
+        @Nullable
+        private String filter;
+
+        @Nullable
+        private String routingIndex;
+
+        @Nullable
+        private String routingSearch;
+
+        @Nullable
+        private String isWriteIndex;
+
+        /**
+         * alias name
+         * <p>
+         * API name: {@code alias}
+         */
+        public final Builder alias(@Nullable String value) {
+            this.alias = value;
+            return this;
+        }
+
+        /**
+         * index alias points to
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * filter
+         * <p>
+         * API name: {@code filter}
+         */
+        public final Builder filter(@Nullable String value) {
+            this.filter = value;
+            return this;
+        }
+
+        /**
+         * index routing
+         * <p>
+         * API name: {@code routing.index}
+         */
+        public final Builder routingIndex(@Nullable String value) {
+            this.routingIndex = value;
+            return this;
+        }
+
+        /**
+         * search routing
+         * <p>
+         * API name: {@code routing.search}
+         */
+        public final Builder routingSearch(@Nullable String value) {
+            this.routingSearch = value;
+            return this;
+        }
+
+        /**
+         * write index
+         * <p>
+         * API name: {@code is_write_index}
+         */
+        public final Builder isWriteIndex(@Nullable String value) {
+            this.isWriteIndex = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link AliasesRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AliasesRecord build() {
+            _checkSingleUse();
+
+            return new AliasesRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AliasesRecord}
+     */
+    public static final JsonpDeserializer<AliasesRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AliasesRecord::setupAliasesRecordDeserializer
+    );
+
+    protected static void setupAliasesRecordDeserializer(ObjectDeserializer<AliasesRecord.Builder> op) {
+
+        op.add(Builder::alias, JsonpDeserializer.stringDeserializer(), "alias", "a");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index", "i", "idx");
+        op.add(Builder::filter, JsonpDeserializer.stringDeserializer(), "filter", "f", "fi");
+        op.add(Builder::routingIndex, JsonpDeserializer.stringDeserializer(), "routing.index", "ri", "routingIndex");
+        op.add(Builder::routingSearch, JsonpDeserializer.stringDeserializer(), "routing.search", "rs", "routingSearch");
+        op.add(Builder::isWriteIndex, JsonpDeserializer.stringDeserializer(), "is_write_index", "w", "isWriteIndex");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/allocation/AllocationRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/allocation/AllocationRecord.java
index 128b399785..86041ea29a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/allocation/AllocationRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/allocation/AllocationRecord.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cat.allocation;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,368 +43,366 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cat.allocation.AllocationRecord
 
-
 @JsonpDeserializable
 public class AllocationRecord implements JsonpSerializable {
-	@Nullable
-	private final String shards;
-
-	@Nullable
-	private final String diskIndices;
-
-	@Nullable
-	private final String diskUsed;
-
-	@Nullable
-	private final String diskAvail;
-
-	@Nullable
-	private final String diskTotal;
-
-	@Nullable
-	private final String diskPercent;
-
-	@Nullable
-	private final String host;
-
-	@Nullable
-	private final String ip;
-
-	@Nullable
-	private final String node;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AllocationRecord(Builder builder) {
-
-		this.shards = builder.shards;
-		this.diskIndices = builder.diskIndices;
-		this.diskUsed = builder.diskUsed;
-		this.diskAvail = builder.diskAvail;
-		this.diskTotal = builder.diskTotal;
-		this.diskPercent = builder.diskPercent;
-		this.host = builder.host;
-		this.ip = builder.ip;
-		this.node = builder.node;
-
-	}
-
-	public static AllocationRecord of(Function<Builder, ObjectBuilder<AllocationRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * number of shards on node
-	 * <p>
-	 * API name: {@code shards}
-	 */
-	@Nullable
-	public final String shards() {
-		return this.shards;
-	}
-
-	/**
-	 * disk used by ES indices
-	 * <p>
-	 * API name: {@code disk.indices}
-	 */
-	@Nullable
-	public final String diskIndices() {
-		return this.diskIndices;
-	}
-
-	/**
-	 * disk used (total, not just ES)
-	 * <p>
-	 * API name: {@code disk.used}
-	 */
-	@Nullable
-	public final String diskUsed() {
-		return this.diskUsed;
-	}
-
-	/**
-	 * disk available
-	 * <p>
-	 * API name: {@code disk.avail}
-	 */
-	@Nullable
-	public final String diskAvail() {
-		return this.diskAvail;
-	}
-
-	/**
-	 * total capacity of all volumes
-	 * <p>
-	 * API name: {@code disk.total}
-	 */
-	@Nullable
-	public final String diskTotal() {
-		return this.diskTotal;
-	}
-
-	/**
-	 * percent disk used
-	 * <p>
-	 * API name: {@code disk.percent}
-	 */
-	@Nullable
-	public final String diskPercent() {
-		return this.diskPercent;
-	}
-
-	/**
-	 * host of node
-	 * <p>
-	 * API name: {@code host}
-	 */
-	@Nullable
-	public final String host() {
-		return this.host;
-	}
-
-	/**
-	 * ip of node
-	 * <p>
-	 * API name: {@code ip}
-	 */
-	@Nullable
-	public final String ip() {
-		return this.ip;
-	}
-
-	/**
-	 * name of node
-	 * <p>
-	 * API name: {@code node}
-	 */
-	@Nullable
-	public final String node() {
-		return this.node;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.shards != null) {
-			generator.writeKey("shards");
-			generator.write(this.shards);
-
-		}
-		if (this.diskIndices != null) {
-			generator.writeKey("disk.indices");
-			generator.write(this.diskIndices);
-
-		}
-		if (this.diskUsed != null) {
-			generator.writeKey("disk.used");
-			generator.write(this.diskUsed);
-
-		}
-		if (this.diskAvail != null) {
-			generator.writeKey("disk.avail");
-			generator.write(this.diskAvail);
-
-		}
-		if (this.diskTotal != null) {
-			generator.writeKey("disk.total");
-			generator.write(this.diskTotal);
-
-		}
-		if (this.diskPercent != null) {
-			generator.writeKey("disk.percent");
-			generator.write(this.diskPercent);
-
-		}
-		if (this.host != null) {
-			generator.writeKey("host");
-			generator.write(this.host);
-
-		}
-		if (this.ip != null) {
-			generator.writeKey("ip");
-			generator.write(this.ip);
-
-		}
-		if (this.node != null) {
-			generator.writeKey("node");
-			generator.write(this.node);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AllocationRecord}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AllocationRecord> {
-		@Nullable
-		private String shards;
-
-		@Nullable
-		private String diskIndices;
-
-		@Nullable
-		private String diskUsed;
-
-		@Nullable
-		private String diskAvail;
-
-		@Nullable
-		private String diskTotal;
-
-		@Nullable
-		private String diskPercent;
-
-		@Nullable
-		private String host;
-
-		@Nullable
-		private String ip;
-
-		@Nullable
-		private String node;
-
-		/**
-		 * number of shards on node
-		 * <p>
-		 * API name: {@code shards}
-		 */
-		public final Builder shards(@Nullable String value) {
-			this.shards = value;
-			return this;
-		}
-
-		/**
-		 * disk used by ES indices
-		 * <p>
-		 * API name: {@code disk.indices}
-		 */
-		public final Builder diskIndices(@Nullable String value) {
-			this.diskIndices = value;
-			return this;
-		}
-
-		/**
-		 * disk used (total, not just ES)
-		 * <p>
-		 * API name: {@code disk.used}
-		 */
-		public final Builder diskUsed(@Nullable String value) {
-			this.diskUsed = value;
-			return this;
-		}
-
-		/**
-		 * disk available
-		 * <p>
-		 * API name: {@code disk.avail}
-		 */
-		public final Builder diskAvail(@Nullable String value) {
-			this.diskAvail = value;
-			return this;
-		}
-
-		/**
-		 * total capacity of all volumes
-		 * <p>
-		 * API name: {@code disk.total}
-		 */
-		public final Builder diskTotal(@Nullable String value) {
-			this.diskTotal = value;
-			return this;
-		}
-
-		/**
-		 * percent disk used
-		 * <p>
-		 * API name: {@code disk.percent}
-		 */
-		public final Builder diskPercent(@Nullable String value) {
-			this.diskPercent = value;
-			return this;
-		}
-
-		/**
-		 * host of node
-		 * <p>
-		 * API name: {@code host}
-		 */
-		public final Builder host(@Nullable String value) {
-			this.host = value;
-			return this;
-		}
-
-		/**
-		 * ip of node
-		 * <p>
-		 * API name: {@code ip}
-		 */
-		public final Builder ip(@Nullable String value) {
-			this.ip = value;
-			return this;
-		}
-
-		/**
-		 * name of node
-		 * <p>
-		 * API name: {@code node}
-		 */
-		public final Builder node(@Nullable String value) {
-			this.node = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AllocationRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AllocationRecord build() {
-			_checkSingleUse();
-
-			return new AllocationRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AllocationRecord}
-	 */
-	public static final JsonpDeserializer<AllocationRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			AllocationRecord::setupAllocationRecordDeserializer);
-
-	protected static void setupAllocationRecordDeserializer(ObjectDeserializer<AllocationRecord.Builder> op) {
-
-		op.add(Builder::shards, JsonpDeserializer.stringDeserializer(), "shards", "s");
-		op.add(Builder::diskIndices, JsonpDeserializer.stringDeserializer(), "disk.indices", "di", "diskIndices");
-		op.add(Builder::diskUsed, JsonpDeserializer.stringDeserializer(), "disk.used", "du", "diskUsed");
-		op.add(Builder::diskAvail, JsonpDeserializer.stringDeserializer(), "disk.avail", "da", "diskAvail");
-		op.add(Builder::diskTotal, JsonpDeserializer.stringDeserializer(), "disk.total", "dt", "diskTotal");
-		op.add(Builder::diskPercent, JsonpDeserializer.stringDeserializer(), "disk.percent", "dp", "diskPercent");
-		op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host", "h");
-		op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip");
-		op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node", "n");
-
-	}
+    @Nullable
+    private final String shards;
+
+    @Nullable
+    private final String diskIndices;
+
+    @Nullable
+    private final String diskUsed;
+
+    @Nullable
+    private final String diskAvail;
+
+    @Nullable
+    private final String diskTotal;
+
+    @Nullable
+    private final String diskPercent;
+
+    @Nullable
+    private final String host;
+
+    @Nullable
+    private final String ip;
+
+    @Nullable
+    private final String node;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AllocationRecord(Builder builder) {
+
+        this.shards = builder.shards;
+        this.diskIndices = builder.diskIndices;
+        this.diskUsed = builder.diskUsed;
+        this.diskAvail = builder.diskAvail;
+        this.diskTotal = builder.diskTotal;
+        this.diskPercent = builder.diskPercent;
+        this.host = builder.host;
+        this.ip = builder.ip;
+        this.node = builder.node;
+
+    }
+
+    public static AllocationRecord of(Function<Builder, ObjectBuilder<AllocationRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * number of shards on node
+     * <p>
+     * API name: {@code shards}
+     */
+    @Nullable
+    public final String shards() {
+        return this.shards;
+    }
+
+    /**
+     * disk used by ES indices
+     * <p>
+     * API name: {@code disk.indices}
+     */
+    @Nullable
+    public final String diskIndices() {
+        return this.diskIndices;
+    }
+
+    /**
+     * disk used (total, not just ES)
+     * <p>
+     * API name: {@code disk.used}
+     */
+    @Nullable
+    public final String diskUsed() {
+        return this.diskUsed;
+    }
+
+    /**
+     * disk available
+     * <p>
+     * API name: {@code disk.avail}
+     */
+    @Nullable
+    public final String diskAvail() {
+        return this.diskAvail;
+    }
+
+    /**
+     * total capacity of all volumes
+     * <p>
+     * API name: {@code disk.total}
+     */
+    @Nullable
+    public final String diskTotal() {
+        return this.diskTotal;
+    }
+
+    /**
+     * percent disk used
+     * <p>
+     * API name: {@code disk.percent}
+     */
+    @Nullable
+    public final String diskPercent() {
+        return this.diskPercent;
+    }
+
+    /**
+     * host of node
+     * <p>
+     * API name: {@code host}
+     */
+    @Nullable
+    public final String host() {
+        return this.host;
+    }
+
+    /**
+     * ip of node
+     * <p>
+     * API name: {@code ip}
+     */
+    @Nullable
+    public final String ip() {
+        return this.ip;
+    }
+
+    /**
+     * name of node
+     * <p>
+     * API name: {@code node}
+     */
+    @Nullable
+    public final String node() {
+        return this.node;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.shards != null) {
+            generator.writeKey("shards");
+            generator.write(this.shards);
+
+        }
+        if (this.diskIndices != null) {
+            generator.writeKey("disk.indices");
+            generator.write(this.diskIndices);
+
+        }
+        if (this.diskUsed != null) {
+            generator.writeKey("disk.used");
+            generator.write(this.diskUsed);
+
+        }
+        if (this.diskAvail != null) {
+            generator.writeKey("disk.avail");
+            generator.write(this.diskAvail);
+
+        }
+        if (this.diskTotal != null) {
+            generator.writeKey("disk.total");
+            generator.write(this.diskTotal);
+
+        }
+        if (this.diskPercent != null) {
+            generator.writeKey("disk.percent");
+            generator.write(this.diskPercent);
+
+        }
+        if (this.host != null) {
+            generator.writeKey("host");
+            generator.write(this.host);
+
+        }
+        if (this.ip != null) {
+            generator.writeKey("ip");
+            generator.write(this.ip);
+
+        }
+        if (this.node != null) {
+            generator.writeKey("node");
+            generator.write(this.node);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AllocationRecord}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AllocationRecord> {
+        @Nullable
+        private String shards;
+
+        @Nullable
+        private String diskIndices;
+
+        @Nullable
+        private String diskUsed;
+
+        @Nullable
+        private String diskAvail;
+
+        @Nullable
+        private String diskTotal;
+
+        @Nullable
+        private String diskPercent;
+
+        @Nullable
+        private String host;
+
+        @Nullable
+        private String ip;
+
+        @Nullable
+        private String node;
+
+        /**
+         * number of shards on node
+         * <p>
+         * API name: {@code shards}
+         */
+        public final Builder shards(@Nullable String value) {
+            this.shards = value;
+            return this;
+        }
+
+        /**
+         * disk used by ES indices
+         * <p>
+         * API name: {@code disk.indices}
+         */
+        public final Builder diskIndices(@Nullable String value) {
+            this.diskIndices = value;
+            return this;
+        }
+
+        /**
+         * disk used (total, not just ES)
+         * <p>
+         * API name: {@code disk.used}
+         */
+        public final Builder diskUsed(@Nullable String value) {
+            this.diskUsed = value;
+            return this;
+        }
+
+        /**
+         * disk available
+         * <p>
+         * API name: {@code disk.avail}
+         */
+        public final Builder diskAvail(@Nullable String value) {
+            this.diskAvail = value;
+            return this;
+        }
+
+        /**
+         * total capacity of all volumes
+         * <p>
+         * API name: {@code disk.total}
+         */
+        public final Builder diskTotal(@Nullable String value) {
+            this.diskTotal = value;
+            return this;
+        }
+
+        /**
+         * percent disk used
+         * <p>
+         * API name: {@code disk.percent}
+         */
+        public final Builder diskPercent(@Nullable String value) {
+            this.diskPercent = value;
+            return this;
+        }
+
+        /**
+         * host of node
+         * <p>
+         * API name: {@code host}
+         */
+        public final Builder host(@Nullable String value) {
+            this.host = value;
+            return this;
+        }
+
+        /**
+         * ip of node
+         * <p>
+         * API name: {@code ip}
+         */
+        public final Builder ip(@Nullable String value) {
+            this.ip = value;
+            return this;
+        }
+
+        /**
+         * name of node
+         * <p>
+         * API name: {@code node}
+         */
+        public final Builder node(@Nullable String value) {
+            this.node = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link AllocationRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AllocationRecord build() {
+            _checkSingleUse();
+
+            return new AllocationRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AllocationRecord}
+     */
+    public static final JsonpDeserializer<AllocationRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AllocationRecord::setupAllocationRecordDeserializer
+    );
+
+    protected static void setupAllocationRecordDeserializer(ObjectDeserializer<AllocationRecord.Builder> op) {
+
+        op.add(Builder::shards, JsonpDeserializer.stringDeserializer(), "shards", "s");
+        op.add(Builder::diskIndices, JsonpDeserializer.stringDeserializer(), "disk.indices", "di", "diskIndices");
+        op.add(Builder::diskUsed, JsonpDeserializer.stringDeserializer(), "disk.used", "du", "diskUsed");
+        op.add(Builder::diskAvail, JsonpDeserializer.stringDeserializer(), "disk.avail", "da", "diskAvail");
+        op.add(Builder::diskTotal, JsonpDeserializer.stringDeserializer(), "disk.total", "dt", "diskTotal");
+        op.add(Builder::diskPercent, JsonpDeserializer.stringDeserializer(), "disk.percent", "dp", "diskPercent");
+        op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host", "h");
+        op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip");
+        op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node", "n");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/cluster_manager/ClusterManagerRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/cluster_manager/ClusterManagerRecord.java
index c8629cc995..0237a8cf0c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/cluster_manager/ClusterManagerRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/cluster_manager/ClusterManagerRecord.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cat.cluster_manager;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,203 +43,201 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cat.cluster_manager.ClusterManagerRecord
 
-
 @JsonpDeserializable
 public class ClusterManagerRecord implements JsonpSerializable {
-	@Nullable
-	private final String id;
-
-	@Nullable
-	private final String host;
-
-	@Nullable
-	private final String ip;
-
-	@Nullable
-	private final String node;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterManagerRecord(Builder builder) {
-
-		this.id = builder.id;
-		this.host = builder.host;
-		this.ip = builder.ip;
-		this.node = builder.node;
-
-	}
-
-	public static ClusterManagerRecord of(Function<Builder, ObjectBuilder<ClusterManagerRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * node id
-	 * <p>
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * host name
-	 * <p>
-	 * API name: {@code host}
-	 */
-	@Nullable
-	public final String host() {
-		return this.host;
-	}
-
-	/**
-	 * ip address
-	 * <p>
-	 * API name: {@code ip}
-	 */
-	@Nullable
-	public final String ip() {
-		return this.ip;
-	}
-
-	/**
-	 * node name
-	 * <p>
-	 * API name: {@code node}
-	 */
-	@Nullable
-	public final String node() {
-		return this.node;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.id != null) {
-			generator.writeKey("id");
-			generator.write(this.id);
-
-		}
-		if (this.host != null) {
-			generator.writeKey("host");
-			generator.write(this.host);
-
-		}
-		if (this.ip != null) {
-			generator.writeKey("ip");
-			generator.write(this.ip);
-
-		}
-		if (this.node != null) {
-			generator.writeKey("node");
-			generator.write(this.node);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterManagerRecord}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterManagerRecord> {
-		@Nullable
-		private String id;
-
-		@Nullable
-		private String host;
-
-		@Nullable
-		private String ip;
-
-		@Nullable
-		private String node;
-
-		/**
-		 * node id
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * host name
-		 * <p>
-		 * API name: {@code host}
-		 */
-		public final Builder host(@Nullable String value) {
-			this.host = value;
-			return this;
-		}
-
-		/**
-		 * ip address
-		 * <p>
-		 * API name: {@code ip}
-		 */
-		public final Builder ip(@Nullable String value) {
-			this.ip = value;
-			return this;
-		}
-
-		/**
-		 * node name
-		 * <p>
-		 * API name: {@code node}
-		 */
-		public final Builder node(@Nullable String value) {
-			this.node = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ClusterManagerRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterManagerRecord build() {
-			_checkSingleUse();
-
-			return new ClusterManagerRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterManagerRecord}
-	 */
-	public static final JsonpDeserializer<ClusterManagerRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ClusterManagerRecord::setupClusterManagerRecordDeserializer);
-
-	protected static void setupClusterManagerRecordDeserializer(ObjectDeserializer<ClusterManagerRecord.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host", "h");
-		op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip");
-		op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node", "n");
-
-	}
+    @Nullable
+    private final String id;
+
+    @Nullable
+    private final String host;
+
+    @Nullable
+    private final String ip;
+
+    @Nullable
+    private final String node;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterManagerRecord(Builder builder) {
+
+        this.id = builder.id;
+        this.host = builder.host;
+        this.ip = builder.ip;
+        this.node = builder.node;
+
+    }
+
+    public static ClusterManagerRecord of(Function<Builder, ObjectBuilder<ClusterManagerRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * node id
+     * <p>
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * host name
+     * <p>
+     * API name: {@code host}
+     */
+    @Nullable
+    public final String host() {
+        return this.host;
+    }
+
+    /**
+     * ip address
+     * <p>
+     * API name: {@code ip}
+     */
+    @Nullable
+    public final String ip() {
+        return this.ip;
+    }
+
+    /**
+     * node name
+     * <p>
+     * API name: {@code node}
+     */
+    @Nullable
+    public final String node() {
+        return this.node;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.id != null) {
+            generator.writeKey("id");
+            generator.write(this.id);
+
+        }
+        if (this.host != null) {
+            generator.writeKey("host");
+            generator.write(this.host);
+
+        }
+        if (this.ip != null) {
+            generator.writeKey("ip");
+            generator.write(this.ip);
+
+        }
+        if (this.node != null) {
+            generator.writeKey("node");
+            generator.write(this.node);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterManagerRecord}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterManagerRecord> {
+        @Nullable
+        private String id;
+
+        @Nullable
+        private String host;
+
+        @Nullable
+        private String ip;
+
+        @Nullable
+        private String node;
+
+        /**
+         * node id
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * host name
+         * <p>
+         * API name: {@code host}
+         */
+        public final Builder host(@Nullable String value) {
+            this.host = value;
+            return this;
+        }
+
+        /**
+         * ip address
+         * <p>
+         * API name: {@code ip}
+         */
+        public final Builder ip(@Nullable String value) {
+            this.ip = value;
+            return this;
+        }
+
+        /**
+         * node name
+         * <p>
+         * API name: {@code node}
+         */
+        public final Builder node(@Nullable String value) {
+            this.node = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ClusterManagerRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterManagerRecord build() {
+            _checkSingleUse();
+
+            return new ClusterManagerRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterManagerRecord}
+     */
+    public static final JsonpDeserializer<ClusterManagerRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterManagerRecord::setupClusterManagerRecordDeserializer
+    );
+
+    protected static void setupClusterManagerRecordDeserializer(ObjectDeserializer<ClusterManagerRecord.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host", "h");
+        op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip");
+        op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node", "n");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/count/CountRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/count/CountRecord.java
index 0da79c7f51..aab10c677e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/count/CountRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/count/CountRecord.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cat.count;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,170 +43,168 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cat.count.CountRecord
 
-
 @JsonpDeserializable
 public class CountRecord implements JsonpSerializable {
-	@Nullable
-	private final String epoch;
-
-	@Nullable
-	private final String timestamp;
-
-	@Nullable
-	private final String count;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CountRecord(Builder builder) {
-
-		this.epoch = builder.epoch;
-		this.timestamp = builder.timestamp;
-		this.count = builder.count;
-
-	}
-
-	public static CountRecord of(Function<Builder, ObjectBuilder<CountRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * seconds since 1969-01-01 00:00:00
-	 * <p>
-	 * API name: {@code epoch}
-	 */
-	@Nullable
-	public final String epoch() {
-		return this.epoch;
-	}
-
-	/**
-	 * time in HH:MM:SS
-	 * <p>
-	 * API name: {@code timestamp}
-	 */
-	@Nullable
-	public final String timestamp() {
-		return this.timestamp;
-	}
-
-	/**
-	 * the document count
-	 * <p>
-	 * API name: {@code count}
-	 */
-	@Nullable
-	public final String count() {
-		return this.count;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.epoch != null) {
-			generator.writeKey("epoch");
-			generator.write(this.epoch);
-
-		}
-		if (this.timestamp != null) {
-			generator.writeKey("timestamp");
-			generator.write(this.timestamp);
-
-		}
-		if (this.count != null) {
-			generator.writeKey("count");
-			generator.write(this.count);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CountRecord}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CountRecord> {
-		@Nullable
-		private String epoch;
-
-		@Nullable
-		private String timestamp;
-
-		@Nullable
-		private String count;
-
-		/**
-		 * seconds since 1969-01-01 00:00:00
-		 * <p>
-		 * API name: {@code epoch}
-		 */
-		public final Builder epoch(@Nullable String value) {
-			this.epoch = value;
-			return this;
-		}
-
-		/**
-		 * time in HH:MM:SS
-		 * <p>
-		 * API name: {@code timestamp}
-		 */
-		public final Builder timestamp(@Nullable String value) {
-			this.timestamp = value;
-			return this;
-		}
-
-		/**
-		 * the document count
-		 * <p>
-		 * API name: {@code count}
-		 */
-		public final Builder count(@Nullable String value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CountRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CountRecord build() {
-			_checkSingleUse();
-
-			return new CountRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CountRecord}
-	 */
-	public static final JsonpDeserializer<CountRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CountRecord::setupCountRecordDeserializer);
-
-	protected static void setupCountRecordDeserializer(ObjectDeserializer<CountRecord.Builder> op) {
-
-		op.add(Builder::epoch, JsonpDeserializer.stringDeserializer(), "epoch", "t", "time");
-		op.add(Builder::timestamp, JsonpDeserializer.stringDeserializer(), "timestamp", "ts", "hms", "hhmmss");
-		op.add(Builder::count, JsonpDeserializer.stringDeserializer(), "count", "dc", "docs.count", "docsCount");
-
-	}
+    @Nullable
+    private final String epoch;
+
+    @Nullable
+    private final String timestamp;
+
+    @Nullable
+    private final String count;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CountRecord(Builder builder) {
+
+        this.epoch = builder.epoch;
+        this.timestamp = builder.timestamp;
+        this.count = builder.count;
+
+    }
+
+    public static CountRecord of(Function<Builder, ObjectBuilder<CountRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * seconds since 1969-01-01 00:00:00
+     * <p>
+     * API name: {@code epoch}
+     */
+    @Nullable
+    public final String epoch() {
+        return this.epoch;
+    }
+
+    /**
+     * time in HH:MM:SS
+     * <p>
+     * API name: {@code timestamp}
+     */
+    @Nullable
+    public final String timestamp() {
+        return this.timestamp;
+    }
+
+    /**
+     * the document count
+     * <p>
+     * API name: {@code count}
+     */
+    @Nullable
+    public final String count() {
+        return this.count;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.epoch != null) {
+            generator.writeKey("epoch");
+            generator.write(this.epoch);
+
+        }
+        if (this.timestamp != null) {
+            generator.writeKey("timestamp");
+            generator.write(this.timestamp);
+
+        }
+        if (this.count != null) {
+            generator.writeKey("count");
+            generator.write(this.count);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CountRecord}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CountRecord> {
+        @Nullable
+        private String epoch;
+
+        @Nullable
+        private String timestamp;
+
+        @Nullable
+        private String count;
+
+        /**
+         * seconds since 1969-01-01 00:00:00
+         * <p>
+         * API name: {@code epoch}
+         */
+        public final Builder epoch(@Nullable String value) {
+            this.epoch = value;
+            return this;
+        }
+
+        /**
+         * time in HH:MM:SS
+         * <p>
+         * API name: {@code timestamp}
+         */
+        public final Builder timestamp(@Nullable String value) {
+            this.timestamp = value;
+            return this;
+        }
+
+        /**
+         * the document count
+         * <p>
+         * API name: {@code count}
+         */
+        public final Builder count(@Nullable String value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link CountRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CountRecord build() {
+            _checkSingleUse();
+
+            return new CountRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CountRecord}
+     */
+    public static final JsonpDeserializer<CountRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CountRecord::setupCountRecordDeserializer
+    );
+
+    protected static void setupCountRecordDeserializer(ObjectDeserializer<CountRecord.Builder> op) {
+
+        op.add(Builder::epoch, JsonpDeserializer.stringDeserializer(), "epoch", "t", "time");
+        op.add(Builder::timestamp, JsonpDeserializer.stringDeserializer(), "timestamp", "ts", "hms", "hhmmss");
+        op.add(Builder::count, JsonpDeserializer.stringDeserializer(), "count", "dc", "docs.count", "docsCount");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/fielddata/FielddataRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/fielddata/FielddataRecord.java
index 7fdbe0e9da..2c25d74fad 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/fielddata/FielddataRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/fielddata/FielddataRecord.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cat.fielddata;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,269 +43,267 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cat.fielddata.FielddataRecord
 
-
 @JsonpDeserializable
 public class FielddataRecord implements JsonpSerializable {
-	@Nullable
-	private final String id;
-
-	@Nullable
-	private final String host;
-
-	@Nullable
-	private final String ip;
-
-	@Nullable
-	private final String node;
-
-	@Nullable
-	private final String field;
-
-	@Nullable
-	private final String size;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FielddataRecord(Builder builder) {
-
-		this.id = builder.id;
-		this.host = builder.host;
-		this.ip = builder.ip;
-		this.node = builder.node;
-		this.field = builder.field;
-		this.size = builder.size;
-
-	}
-
-	public static FielddataRecord of(Function<Builder, ObjectBuilder<FielddataRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * node id
-	 * <p>
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * host name
-	 * <p>
-	 * API name: {@code host}
-	 */
-	@Nullable
-	public final String host() {
-		return this.host;
-	}
-
-	/**
-	 * ip address
-	 * <p>
-	 * API name: {@code ip}
-	 */
-	@Nullable
-	public final String ip() {
-		return this.ip;
-	}
-
-	/**
-	 * node name
-	 * <p>
-	 * API name: {@code node}
-	 */
-	@Nullable
-	public final String node() {
-		return this.node;
-	}
-
-	/**
-	 * field name
-	 * <p>
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * field data usage
-	 * <p>
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final String size() {
-		return this.size;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.id != null) {
-			generator.writeKey("id");
-			generator.write(this.id);
-
-		}
-		if (this.host != null) {
-			generator.writeKey("host");
-			generator.write(this.host);
-
-		}
-		if (this.ip != null) {
-			generator.writeKey("ip");
-			generator.write(this.ip);
-
-		}
-		if (this.node != null) {
-			generator.writeKey("node");
-			generator.write(this.node);
-
-		}
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FielddataRecord}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FielddataRecord> {
-		@Nullable
-		private String id;
-
-		@Nullable
-		private String host;
-
-		@Nullable
-		private String ip;
-
-		@Nullable
-		private String node;
-
-		@Nullable
-		private String field;
-
-		@Nullable
-		private String size;
-
-		/**
-		 * node id
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * host name
-		 * <p>
-		 * API name: {@code host}
-		 */
-		public final Builder host(@Nullable String value) {
-			this.host = value;
-			return this;
-		}
-
-		/**
-		 * ip address
-		 * <p>
-		 * API name: {@code ip}
-		 */
-		public final Builder ip(@Nullable String value) {
-			this.ip = value;
-			return this;
-		}
-
-		/**
-		 * node name
-		 * <p>
-		 * API name: {@code node}
-		 */
-		public final Builder node(@Nullable String value) {
-			this.node = value;
-			return this;
-		}
-
-		/**
-		 * field name
-		 * <p>
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * field data usage
-		 * <p>
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable String value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FielddataRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FielddataRecord build() {
-			_checkSingleUse();
-
-			return new FielddataRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FielddataRecord}
-	 */
-	public static final JsonpDeserializer<FielddataRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FielddataRecord::setupFielddataRecordDeserializer);
-
-	protected static void setupFielddataRecordDeserializer(ObjectDeserializer<FielddataRecord.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host", "h");
-		op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip");
-		op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node", "n");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field", "f");
-		op.add(Builder::size, JsonpDeserializer.stringDeserializer(), "size");
-
-	}
+    @Nullable
+    private final String id;
+
+    @Nullable
+    private final String host;
+
+    @Nullable
+    private final String ip;
+
+    @Nullable
+    private final String node;
+
+    @Nullable
+    private final String field;
+
+    @Nullable
+    private final String size;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FielddataRecord(Builder builder) {
+
+        this.id = builder.id;
+        this.host = builder.host;
+        this.ip = builder.ip;
+        this.node = builder.node;
+        this.field = builder.field;
+        this.size = builder.size;
+
+    }
+
+    public static FielddataRecord of(Function<Builder, ObjectBuilder<FielddataRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * node id
+     * <p>
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * host name
+     * <p>
+     * API name: {@code host}
+     */
+    @Nullable
+    public final String host() {
+        return this.host;
+    }
+
+    /**
+     * ip address
+     * <p>
+     * API name: {@code ip}
+     */
+    @Nullable
+    public final String ip() {
+        return this.ip;
+    }
+
+    /**
+     * node name
+     * <p>
+     * API name: {@code node}
+     */
+    @Nullable
+    public final String node() {
+        return this.node;
+    }
+
+    /**
+     * field name
+     * <p>
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * field data usage
+     * <p>
+     * API name: {@code size}
+     */
+    @Nullable
+    public final String size() {
+        return this.size;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.id != null) {
+            generator.writeKey("id");
+            generator.write(this.id);
+
+        }
+        if (this.host != null) {
+            generator.writeKey("host");
+            generator.write(this.host);
+
+        }
+        if (this.ip != null) {
+            generator.writeKey("ip");
+            generator.write(this.ip);
+
+        }
+        if (this.node != null) {
+            generator.writeKey("node");
+            generator.write(this.node);
+
+        }
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FielddataRecord}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FielddataRecord> {
+        @Nullable
+        private String id;
+
+        @Nullable
+        private String host;
+
+        @Nullable
+        private String ip;
+
+        @Nullable
+        private String node;
+
+        @Nullable
+        private String field;
+
+        @Nullable
+        private String size;
+
+        /**
+         * node id
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * host name
+         * <p>
+         * API name: {@code host}
+         */
+        public final Builder host(@Nullable String value) {
+            this.host = value;
+            return this;
+        }
+
+        /**
+         * ip address
+         * <p>
+         * API name: {@code ip}
+         */
+        public final Builder ip(@Nullable String value) {
+            this.ip = value;
+            return this;
+        }
+
+        /**
+         * node name
+         * <p>
+         * API name: {@code node}
+         */
+        public final Builder node(@Nullable String value) {
+            this.node = value;
+            return this;
+        }
+
+        /**
+         * field name
+         * <p>
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * field data usage
+         * <p>
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable String value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link FielddataRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FielddataRecord build() {
+            _checkSingleUse();
+
+            return new FielddataRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FielddataRecord}
+     */
+    public static final JsonpDeserializer<FielddataRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FielddataRecord::setupFielddataRecordDeserializer
+    );
+
+    protected static void setupFielddataRecordDeserializer(ObjectDeserializer<FielddataRecord.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host", "h");
+        op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip");
+        op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node", "n");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field", "f");
+        op.add(Builder::size, JsonpDeserializer.stringDeserializer(), "size");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/health/HealthRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/health/HealthRecord.java
index 8242d2b1d1..8300549435 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/health/HealthRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/health/HealthRecord.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cat.health;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,539 +43,531 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cat.health.HealthRecord
 
-
 @JsonpDeserializable
 public class HealthRecord implements JsonpSerializable {
-	@Nullable
-	private final String epoch;
-
-	@Nullable
-	private final String timestamp;
-
-	@Nullable
-	private final String cluster;
-
-	@Nullable
-	private final String status;
-
-	@Nullable
-	private final String nodeTotal;
-
-	@Nullable
-	private final String nodeData;
-
-	@Nullable
-	private final String shards;
-
-	@Nullable
-	private final String pri;
-
-	@Nullable
-	private final String relo;
-
-	@Nullable
-	private final String init;
-
-	@Nullable
-	private final String unassign;
-
-	@Nullable
-	private final String pendingTasks;
-
-	@Nullable
-	private final String maxTaskWaitTime;
-
-	@Nullable
-	private final String activeShardsPercent;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HealthRecord(Builder builder) {
-
-		this.epoch = builder.epoch;
-		this.timestamp = builder.timestamp;
-		this.cluster = builder.cluster;
-		this.status = builder.status;
-		this.nodeTotal = builder.nodeTotal;
-		this.nodeData = builder.nodeData;
-		this.shards = builder.shards;
-		this.pri = builder.pri;
-		this.relo = builder.relo;
-		this.init = builder.init;
-		this.unassign = builder.unassign;
-		this.pendingTasks = builder.pendingTasks;
-		this.maxTaskWaitTime = builder.maxTaskWaitTime;
-		this.activeShardsPercent = builder.activeShardsPercent;
-
-	}
-
-	public static HealthRecord of(Function<Builder, ObjectBuilder<HealthRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * seconds since 1969-01-01 00:00:00
-	 * <p>
-	 * API name: {@code epoch}
-	 */
-	@Nullable
-	public final String epoch() {
-		return this.epoch;
-	}
-
-	/**
-	 * time in HH:MM:SS
-	 * <p>
-	 * API name: {@code timestamp}
-	 */
-	@Nullable
-	public final String timestamp() {
-		return this.timestamp;
-	}
-
-	/**
-	 * cluster name
-	 * <p>
-	 * API name: {@code cluster}
-	 */
-	@Nullable
-	public final String cluster() {
-		return this.cluster;
-	}
-
-	/**
-	 * health status
-	 * <p>
-	 * API name: {@code status}
-	 */
-	@Nullable
-	public final String status() {
-		return this.status;
-	}
-
-	/**
-	 * total number of nodes
-	 * <p>
-	 * API name: {@code node.total}
-	 */
-	@Nullable
-	public final String nodeTotal() {
-		return this.nodeTotal;
-	}
-
-	/**
-	 * number of nodes that can store data
-	 * <p>
-	 * API name: {@code node.data}
-	 */
-	@Nullable
-	public final String nodeData() {
-		return this.nodeData;
-	}
-
-	/**
-	 * total number of shards
-	 * <p>
-	 * API name: {@code shards}
-	 */
-	@Nullable
-	public final String shards() {
-		return this.shards;
-	}
-
-	/**
-	 * number of primary shards
-	 * <p>
-	 * API name: {@code pri}
-	 */
-	@Nullable
-	public final String pri() {
-		return this.pri;
-	}
-
-	/**
-	 * number of relocating nodes
-	 * <p>
-	 * API name: {@code relo}
-	 */
-	@Nullable
-	public final String relo() {
-		return this.relo;
-	}
-
-	/**
-	 * number of initializing nodes
-	 * <p>
-	 * API name: {@code init}
-	 */
-	@Nullable
-	public final String init() {
-		return this.init;
-	}
-
-	/**
-	 * number of unassigned shards
-	 * <p>
-	 * API name: {@code unassign}
-	 */
-	@Nullable
-	public final String unassign() {
-		return this.unassign;
-	}
-
-	/**
-	 * number of pending tasks
-	 * <p>
-	 * API name: {@code pending_tasks}
-	 */
-	@Nullable
-	public final String pendingTasks() {
-		return this.pendingTasks;
-	}
-
-	/**
-	 * wait time of longest task pending
-	 * <p>
-	 * API name: {@code max_task_wait_time}
-	 */
-	@Nullable
-	public final String maxTaskWaitTime() {
-		return this.maxTaskWaitTime;
-	}
-
-	/**
-	 * active number of shards in percent
-	 * <p>
-	 * API name: {@code active_shards_percent}
-	 */
-	@Nullable
-	public final String activeShardsPercent() {
-		return this.activeShardsPercent;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.epoch != null) {
-			generator.writeKey("epoch");
-			generator.write(this.epoch);
-
-		}
-		if (this.timestamp != null) {
-			generator.writeKey("timestamp");
-			generator.write(this.timestamp);
-
-		}
-		if (this.cluster != null) {
-			generator.writeKey("cluster");
-			generator.write(this.cluster);
-
-		}
-		if (this.status != null) {
-			generator.writeKey("status");
-			generator.write(this.status);
-
-		}
-		if (this.nodeTotal != null) {
-			generator.writeKey("node.total");
-			generator.write(this.nodeTotal);
-
-		}
-		if (this.nodeData != null) {
-			generator.writeKey("node.data");
-			generator.write(this.nodeData);
-
-		}
-		if (this.shards != null) {
-			generator.writeKey("shards");
-			generator.write(this.shards);
-
-		}
-		if (this.pri != null) {
-			generator.writeKey("pri");
-			generator.write(this.pri);
-
-		}
-		if (this.relo != null) {
-			generator.writeKey("relo");
-			generator.write(this.relo);
-
-		}
-		if (this.init != null) {
-			generator.writeKey("init");
-			generator.write(this.init);
-
-		}
-		if (this.unassign != null) {
-			generator.writeKey("unassign");
-			generator.write(this.unassign);
-
-		}
-		if (this.pendingTasks != null) {
-			generator.writeKey("pending_tasks");
-			generator.write(this.pendingTasks);
-
-		}
-		if (this.maxTaskWaitTime != null) {
-			generator.writeKey("max_task_wait_time");
-			generator.write(this.maxTaskWaitTime);
-
-		}
-		if (this.activeShardsPercent != null) {
-			generator.writeKey("active_shards_percent");
-			generator.write(this.activeShardsPercent);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HealthRecord}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HealthRecord> {
-		@Nullable
-		private String epoch;
-
-		@Nullable
-		private String timestamp;
-
-		@Nullable
-		private String cluster;
-
-		@Nullable
-		private String status;
-
-		@Nullable
-		private String nodeTotal;
-
-		@Nullable
-		private String nodeData;
-
-		@Nullable
-		private String shards;
-
-		@Nullable
-		private String pri;
-
-		@Nullable
-		private String relo;
-
-		@Nullable
-		private String init;
-
-		@Nullable
-		private String unassign;
-
-		@Nullable
-		private String pendingTasks;
-
-		@Nullable
-		private String maxTaskWaitTime;
-
-		@Nullable
-		private String activeShardsPercent;
-
-		/**
-		 * seconds since 1969-01-01 00:00:00
-		 * <p>
-		 * API name: {@code epoch}
-		 */
-		public final Builder epoch(@Nullable String value) {
-			this.epoch = value;
-			return this;
-		}
-
-		/**
-		 * time in HH:MM:SS
-		 * <p>
-		 * API name: {@code timestamp}
-		 */
-		public final Builder timestamp(@Nullable String value) {
-			this.timestamp = value;
-			return this;
-		}
-
-		/**
-		 * cluster name
-		 * <p>
-		 * API name: {@code cluster}
-		 */
-		public final Builder cluster(@Nullable String value) {
-			this.cluster = value;
-			return this;
-		}
-
-		/**
-		 * health status
-		 * <p>
-		 * API name: {@code status}
-		 */
-		public final Builder status(@Nullable String value) {
-			this.status = value;
-			return this;
-		}
-
-		/**
-		 * total number of nodes
-		 * <p>
-		 * API name: {@code node.total}
-		 */
-		public final Builder nodeTotal(@Nullable String value) {
-			this.nodeTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of nodes that can store data
-		 * <p>
-		 * API name: {@code node.data}
-		 */
-		public final Builder nodeData(@Nullable String value) {
-			this.nodeData = value;
-			return this;
-		}
-
-		/**
-		 * total number of shards
-		 * <p>
-		 * API name: {@code shards}
-		 */
-		public final Builder shards(@Nullable String value) {
-			this.shards = value;
-			return this;
-		}
-
-		/**
-		 * number of primary shards
-		 * <p>
-		 * API name: {@code pri}
-		 */
-		public final Builder pri(@Nullable String value) {
-			this.pri = value;
-			return this;
-		}
-
-		/**
-		 * number of relocating nodes
-		 * <p>
-		 * API name: {@code relo}
-		 */
-		public final Builder relo(@Nullable String value) {
-			this.relo = value;
-			return this;
-		}
-
-		/**
-		 * number of initializing nodes
-		 * <p>
-		 * API name: {@code init}
-		 */
-		public final Builder init(@Nullable String value) {
-			this.init = value;
-			return this;
-		}
-
-		/**
-		 * number of unassigned shards
-		 * <p>
-		 * API name: {@code unassign}
-		 */
-		public final Builder unassign(@Nullable String value) {
-			this.unassign = value;
-			return this;
-		}
-
-		/**
-		 * number of pending tasks
-		 * <p>
-		 * API name: {@code pending_tasks}
-		 */
-		public final Builder pendingTasks(@Nullable String value) {
-			this.pendingTasks = value;
-			return this;
-		}
-
-		/**
-		 * wait time of longest task pending
-		 * <p>
-		 * API name: {@code max_task_wait_time}
-		 */
-		public final Builder maxTaskWaitTime(@Nullable String value) {
-			this.maxTaskWaitTime = value;
-			return this;
-		}
-
-		/**
-		 * active number of shards in percent
-		 * <p>
-		 * API name: {@code active_shards_percent}
-		 */
-		public final Builder activeShardsPercent(@Nullable String value) {
-			this.activeShardsPercent = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HealthRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HealthRecord build() {
-			_checkSingleUse();
-
-			return new HealthRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HealthRecord}
-	 */
-	public static final JsonpDeserializer<HealthRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			HealthRecord::setupHealthRecordDeserializer);
-
-	protected static void setupHealthRecordDeserializer(ObjectDeserializer<HealthRecord.Builder> op) {
-
-		op.add(Builder::epoch, JsonpDeserializer.stringDeserializer(), "epoch", "time");
-		op.add(Builder::timestamp, JsonpDeserializer.stringDeserializer(), "timestamp", "ts", "hms", "hhmmss");
-		op.add(Builder::cluster, JsonpDeserializer.stringDeserializer(), "cluster", "cl");
-		op.add(Builder::status, JsonpDeserializer.stringDeserializer(), "status", "st");
-		op.add(Builder::nodeTotal, JsonpDeserializer.stringDeserializer(), "node.total", "nt", "nodeTotal");
-		op.add(Builder::nodeData, JsonpDeserializer.stringDeserializer(), "node.data", "nd", "nodeData");
-		op.add(Builder::shards, JsonpDeserializer.stringDeserializer(), "shards", "t", "sh", "shards.total",
-				"shardsTotal");
-		op.add(Builder::pri, JsonpDeserializer.stringDeserializer(), "pri", "p", "shards.primary", "shardsPrimary");
-		op.add(Builder::relo, JsonpDeserializer.stringDeserializer(), "relo", "r", "shards.relocating",
-				"shardsRelocating");
-		op.add(Builder::init, JsonpDeserializer.stringDeserializer(), "init", "i", "shards.initializing",
-				"shardsInitializing");
-		op.add(Builder::unassign, JsonpDeserializer.stringDeserializer(), "unassign", "u", "shards.unassigned",
-				"shardsUnassigned");
-		op.add(Builder::pendingTasks, JsonpDeserializer.stringDeserializer(), "pending_tasks", "pt", "pendingTasks");
-		op.add(Builder::maxTaskWaitTime, JsonpDeserializer.stringDeserializer(), "max_task_wait_time", "mtwt",
-				"maxTaskWaitTime");
-		op.add(Builder::activeShardsPercent, JsonpDeserializer.stringDeserializer(), "active_shards_percent", "asp",
-				"activeShardsPercent");
-
-	}
+    @Nullable
+    private final String epoch;
+
+    @Nullable
+    private final String timestamp;
+
+    @Nullable
+    private final String cluster;
+
+    @Nullable
+    private final String status;
+
+    @Nullable
+    private final String nodeTotal;
+
+    @Nullable
+    private final String nodeData;
+
+    @Nullable
+    private final String shards;
+
+    @Nullable
+    private final String pri;
+
+    @Nullable
+    private final String relo;
+
+    @Nullable
+    private final String init;
+
+    @Nullable
+    private final String unassign;
+
+    @Nullable
+    private final String pendingTasks;
+
+    @Nullable
+    private final String maxTaskWaitTime;
+
+    @Nullable
+    private final String activeShardsPercent;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HealthRecord(Builder builder) {
+
+        this.epoch = builder.epoch;
+        this.timestamp = builder.timestamp;
+        this.cluster = builder.cluster;
+        this.status = builder.status;
+        this.nodeTotal = builder.nodeTotal;
+        this.nodeData = builder.nodeData;
+        this.shards = builder.shards;
+        this.pri = builder.pri;
+        this.relo = builder.relo;
+        this.init = builder.init;
+        this.unassign = builder.unassign;
+        this.pendingTasks = builder.pendingTasks;
+        this.maxTaskWaitTime = builder.maxTaskWaitTime;
+        this.activeShardsPercent = builder.activeShardsPercent;
+
+    }
+
+    public static HealthRecord of(Function<Builder, ObjectBuilder<HealthRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * seconds since 1969-01-01 00:00:00
+     * <p>
+     * API name: {@code epoch}
+     */
+    @Nullable
+    public final String epoch() {
+        return this.epoch;
+    }
+
+    /**
+     * time in HH:MM:SS
+     * <p>
+     * API name: {@code timestamp}
+     */
+    @Nullable
+    public final String timestamp() {
+        return this.timestamp;
+    }
+
+    /**
+     * cluster name
+     * <p>
+     * API name: {@code cluster}
+     */
+    @Nullable
+    public final String cluster() {
+        return this.cluster;
+    }
+
+    /**
+     * health status
+     * <p>
+     * API name: {@code status}
+     */
+    @Nullable
+    public final String status() {
+        return this.status;
+    }
+
+    /**
+     * total number of nodes
+     * <p>
+     * API name: {@code node.total}
+     */
+    @Nullable
+    public final String nodeTotal() {
+        return this.nodeTotal;
+    }
+
+    /**
+     * number of nodes that can store data
+     * <p>
+     * API name: {@code node.data}
+     */
+    @Nullable
+    public final String nodeData() {
+        return this.nodeData;
+    }
+
+    /**
+     * total number of shards
+     * <p>
+     * API name: {@code shards}
+     */
+    @Nullable
+    public final String shards() {
+        return this.shards;
+    }
+
+    /**
+     * number of primary shards
+     * <p>
+     * API name: {@code pri}
+     */
+    @Nullable
+    public final String pri() {
+        return this.pri;
+    }
+
+    /**
+     * number of relocating nodes
+     * <p>
+     * API name: {@code relo}
+     */
+    @Nullable
+    public final String relo() {
+        return this.relo;
+    }
+
+    /**
+     * number of initializing nodes
+     * <p>
+     * API name: {@code init}
+     */
+    @Nullable
+    public final String init() {
+        return this.init;
+    }
+
+    /**
+     * number of unassigned shards
+     * <p>
+     * API name: {@code unassign}
+     */
+    @Nullable
+    public final String unassign() {
+        return this.unassign;
+    }
+
+    /**
+     * number of pending tasks
+     * <p>
+     * API name: {@code pending_tasks}
+     */
+    @Nullable
+    public final String pendingTasks() {
+        return this.pendingTasks;
+    }
+
+    /**
+     * wait time of longest task pending
+     * <p>
+     * API name: {@code max_task_wait_time}
+     */
+    @Nullable
+    public final String maxTaskWaitTime() {
+        return this.maxTaskWaitTime;
+    }
+
+    /**
+     * active number of shards in percent
+     * <p>
+     * API name: {@code active_shards_percent}
+     */
+    @Nullable
+    public final String activeShardsPercent() {
+        return this.activeShardsPercent;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.epoch != null) {
+            generator.writeKey("epoch");
+            generator.write(this.epoch);
+
+        }
+        if (this.timestamp != null) {
+            generator.writeKey("timestamp");
+            generator.write(this.timestamp);
+
+        }
+        if (this.cluster != null) {
+            generator.writeKey("cluster");
+            generator.write(this.cluster);
+
+        }
+        if (this.status != null) {
+            generator.writeKey("status");
+            generator.write(this.status);
+
+        }
+        if (this.nodeTotal != null) {
+            generator.writeKey("node.total");
+            generator.write(this.nodeTotal);
+
+        }
+        if (this.nodeData != null) {
+            generator.writeKey("node.data");
+            generator.write(this.nodeData);
+
+        }
+        if (this.shards != null) {
+            generator.writeKey("shards");
+            generator.write(this.shards);
+
+        }
+        if (this.pri != null) {
+            generator.writeKey("pri");
+            generator.write(this.pri);
+
+        }
+        if (this.relo != null) {
+            generator.writeKey("relo");
+            generator.write(this.relo);
+
+        }
+        if (this.init != null) {
+            generator.writeKey("init");
+            generator.write(this.init);
+
+        }
+        if (this.unassign != null) {
+            generator.writeKey("unassign");
+            generator.write(this.unassign);
+
+        }
+        if (this.pendingTasks != null) {
+            generator.writeKey("pending_tasks");
+            generator.write(this.pendingTasks);
+
+        }
+        if (this.maxTaskWaitTime != null) {
+            generator.writeKey("max_task_wait_time");
+            generator.write(this.maxTaskWaitTime);
+
+        }
+        if (this.activeShardsPercent != null) {
+            generator.writeKey("active_shards_percent");
+            generator.write(this.activeShardsPercent);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HealthRecord}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HealthRecord> {
+        @Nullable
+        private String epoch;
+
+        @Nullable
+        private String timestamp;
+
+        @Nullable
+        private String cluster;
+
+        @Nullable
+        private String status;
+
+        @Nullable
+        private String nodeTotal;
+
+        @Nullable
+        private String nodeData;
+
+        @Nullable
+        private String shards;
+
+        @Nullable
+        private String pri;
+
+        @Nullable
+        private String relo;
+
+        @Nullable
+        private String init;
+
+        @Nullable
+        private String unassign;
+
+        @Nullable
+        private String pendingTasks;
+
+        @Nullable
+        private String maxTaskWaitTime;
+
+        @Nullable
+        private String activeShardsPercent;
+
+        /**
+         * seconds since 1969-01-01 00:00:00
+         * <p>
+         * API name: {@code epoch}
+         */
+        public final Builder epoch(@Nullable String value) {
+            this.epoch = value;
+            return this;
+        }
+
+        /**
+         * time in HH:MM:SS
+         * <p>
+         * API name: {@code timestamp}
+         */
+        public final Builder timestamp(@Nullable String value) {
+            this.timestamp = value;
+            return this;
+        }
+
+        /**
+         * cluster name
+         * <p>
+         * API name: {@code cluster}
+         */
+        public final Builder cluster(@Nullable String value) {
+            this.cluster = value;
+            return this;
+        }
+
+        /**
+         * health status
+         * <p>
+         * API name: {@code status}
+         */
+        public final Builder status(@Nullable String value) {
+            this.status = value;
+            return this;
+        }
+
+        /**
+         * total number of nodes
+         * <p>
+         * API name: {@code node.total}
+         */
+        public final Builder nodeTotal(@Nullable String value) {
+            this.nodeTotal = value;
+            return this;
+        }
+
+        /**
+         * number of nodes that can store data
+         * <p>
+         * API name: {@code node.data}
+         */
+        public final Builder nodeData(@Nullable String value) {
+            this.nodeData = value;
+            return this;
+        }
+
+        /**
+         * total number of shards
+         * <p>
+         * API name: {@code shards}
+         */
+        public final Builder shards(@Nullable String value) {
+            this.shards = value;
+            return this;
+        }
+
+        /**
+         * number of primary shards
+         * <p>
+         * API name: {@code pri}
+         */
+        public final Builder pri(@Nullable String value) {
+            this.pri = value;
+            return this;
+        }
+
+        /**
+         * number of relocating nodes
+         * <p>
+         * API name: {@code relo}
+         */
+        public final Builder relo(@Nullable String value) {
+            this.relo = value;
+            return this;
+        }
+
+        /**
+         * number of initializing nodes
+         * <p>
+         * API name: {@code init}
+         */
+        public final Builder init(@Nullable String value) {
+            this.init = value;
+            return this;
+        }
+
+        /**
+         * number of unassigned shards
+         * <p>
+         * API name: {@code unassign}
+         */
+        public final Builder unassign(@Nullable String value) {
+            this.unassign = value;
+            return this;
+        }
+
+        /**
+         * number of pending tasks
+         * <p>
+         * API name: {@code pending_tasks}
+         */
+        public final Builder pendingTasks(@Nullable String value) {
+            this.pendingTasks = value;
+            return this;
+        }
+
+        /**
+         * wait time of longest task pending
+         * <p>
+         * API name: {@code max_task_wait_time}
+         */
+        public final Builder maxTaskWaitTime(@Nullable String value) {
+            this.maxTaskWaitTime = value;
+            return this;
+        }
+
+        /**
+         * active number of shards in percent
+         * <p>
+         * API name: {@code active_shards_percent}
+         */
+        public final Builder activeShardsPercent(@Nullable String value) {
+            this.activeShardsPercent = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link HealthRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HealthRecord build() {
+            _checkSingleUse();
+
+            return new HealthRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HealthRecord}
+     */
+    public static final JsonpDeserializer<HealthRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HealthRecord::setupHealthRecordDeserializer
+    );
+
+    protected static void setupHealthRecordDeserializer(ObjectDeserializer<HealthRecord.Builder> op) {
+
+        op.add(Builder::epoch, JsonpDeserializer.stringDeserializer(), "epoch", "time");
+        op.add(Builder::timestamp, JsonpDeserializer.stringDeserializer(), "timestamp", "ts", "hms", "hhmmss");
+        op.add(Builder::cluster, JsonpDeserializer.stringDeserializer(), "cluster", "cl");
+        op.add(Builder::status, JsonpDeserializer.stringDeserializer(), "status", "st");
+        op.add(Builder::nodeTotal, JsonpDeserializer.stringDeserializer(), "node.total", "nt", "nodeTotal");
+        op.add(Builder::nodeData, JsonpDeserializer.stringDeserializer(), "node.data", "nd", "nodeData");
+        op.add(Builder::shards, JsonpDeserializer.stringDeserializer(), "shards", "t", "sh", "shards.total", "shardsTotal");
+        op.add(Builder::pri, JsonpDeserializer.stringDeserializer(), "pri", "p", "shards.primary", "shardsPrimary");
+        op.add(Builder::relo, JsonpDeserializer.stringDeserializer(), "relo", "r", "shards.relocating", "shardsRelocating");
+        op.add(Builder::init, JsonpDeserializer.stringDeserializer(), "init", "i", "shards.initializing", "shardsInitializing");
+        op.add(Builder::unassign, JsonpDeserializer.stringDeserializer(), "unassign", "u", "shards.unassigned", "shardsUnassigned");
+        op.add(Builder::pendingTasks, JsonpDeserializer.stringDeserializer(), "pending_tasks", "pt", "pendingTasks");
+        op.add(Builder::maxTaskWaitTime, JsonpDeserializer.stringDeserializer(), "max_task_wait_time", "mtwt", "maxTaskWaitTime");
+        op.add(Builder::activeShardsPercent, JsonpDeserializer.stringDeserializer(), "active_shards_percent", "asp", "activeShardsPercent");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/help/HelpRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/help/HelpRecord.java
index 348e84f996..f1f558c4a9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/help/HelpRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/help/HelpRecord.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cat.help;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,93 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cat.help.HelpRecord
 
-
 @JsonpDeserializable
 public class HelpRecord implements JsonpSerializable {
-	private final String endpoint;
+    private final String endpoint;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private HelpRecord(Builder builder) {
+    private HelpRecord(Builder builder) {
 
-		this.endpoint = ApiTypeHelper.requireNonNull(builder.endpoint, this, "endpoint");
+        this.endpoint = ApiTypeHelper.requireNonNull(builder.endpoint, this, "endpoint");
 
-	}
+    }
 
-	public static HelpRecord of(Function<Builder, ObjectBuilder<HelpRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static HelpRecord of(Function<Builder, ObjectBuilder<HelpRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code endpoint}
-	 */
-	public final String endpoint() {
-		return this.endpoint;
-	}
+    /**
+     * Required - API name: {@code endpoint}
+     */
+    public final String endpoint() {
+        return this.endpoint;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("endpoint");
-		generator.write(this.endpoint);
+        generator.writeKey("endpoint");
+        generator.write(this.endpoint);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link HelpRecord}.
-	 */
+    /**
+     * Builder for {@link HelpRecord}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HelpRecord> {
-		private String endpoint;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HelpRecord> {
+        private String endpoint;
 
-		/**
-		 * Required - API name: {@code endpoint}
-		 */
-		public final Builder endpoint(String value) {
-			this.endpoint = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code endpoint}
+         */
+        public final Builder endpoint(String value) {
+            this.endpoint = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link HelpRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HelpRecord build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link HelpRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HelpRecord build() {
+            _checkSingleUse();
 
-			return new HelpRecord(this);
-		}
-	}
+            return new HelpRecord(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link HelpRecord}
-	 */
-	public static final JsonpDeserializer<HelpRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			HelpRecord::setupHelpRecordDeserializer);
+    /**
+     * Json deserializer for {@link HelpRecord}
+     */
+    public static final JsonpDeserializer<HelpRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HelpRecord::setupHelpRecordDeserializer
+    );
 
-	protected static void setupHelpRecordDeserializer(ObjectDeserializer<HelpRecord.Builder> op) {
+    protected static void setupHelpRecordDeserializer(ObjectDeserializer<HelpRecord.Builder> op) {
 
-		op.add(Builder::endpoint, JsonpDeserializer.stringDeserializer(), "endpoint");
+        op.add(Builder::endpoint, JsonpDeserializer.stringDeserializer(), "endpoint");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/indices/IndicesRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/indices/IndicesRecord.java
index 7ed72412f6..b9f7678fc7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/indices/IndicesRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/indices/IndicesRecord.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cat.indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,4783 +43,4792 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cat.indices.IndicesRecord
 
-
 @JsonpDeserializable
 public class IndicesRecord implements JsonpSerializable {
-	@Nullable
-	private final String health;
+    @Nullable
+    private final String health;
 
-	@Nullable
-	private final String status;
+    @Nullable
+    private final String status;
 
-	@Nullable
-	private final String index;
+    @Nullable
+    private final String index;
 
-	@Nullable
-	private final String uuid;
+    @Nullable
+    private final String uuid;
 
-	@Nullable
-	private final String pri;
+    @Nullable
+    private final String pri;
 
-	@Nullable
-	private final String rep;
+    @Nullable
+    private final String rep;
 
-	@Nullable
-	private final String docsCount;
+    @Nullable
+    private final String docsCount;
 
-	@Nullable
-	private final String docsDeleted;
+    @Nullable
+    private final String docsDeleted;
 
-	@Nullable
-	private final String creationDate;
+    @Nullable
+    private final String creationDate;
 
-	@Nullable
-	private final String creationDateString;
+    @Nullable
+    private final String creationDateString;
 
-	@Nullable
-	private final String storeSize;
+    @Nullable
+    private final String storeSize;
 
-	@Nullable
-	private final String priStoreSize;
+    @Nullable
+    private final String priStoreSize;
 
-	@Nullable
-	private final String completionSize;
+    @Nullable
+    private final String completionSize;
 
-	@Nullable
-	private final String priCompletionSize;
+    @Nullable
+    private final String priCompletionSize;
 
-	@Nullable
-	private final String fielddataMemorySize;
+    @Nullable
+    private final String fielddataMemorySize;
 
-	@Nullable
-	private final String priFielddataMemorySize;
+    @Nullable
+    private final String priFielddataMemorySize;
 
-	@Nullable
-	private final String fielddataEvictions;
+    @Nullable
+    private final String fielddataEvictions;
 
-	@Nullable
-	private final String priFielddataEvictions;
+    @Nullable
+    private final String priFielddataEvictions;
 
-	@Nullable
-	private final String queryCacheMemorySize;
+    @Nullable
+    private final String queryCacheMemorySize;
 
-	@Nullable
-	private final String priQueryCacheMemorySize;
+    @Nullable
+    private final String priQueryCacheMemorySize;
 
-	@Nullable
-	private final String queryCacheEvictions;
+    @Nullable
+    private final String queryCacheEvictions;
 
-	@Nullable
-	private final String priQueryCacheEvictions;
+    @Nullable
+    private final String priQueryCacheEvictions;
 
-	@Nullable
-	private final String requestCacheMemorySize;
+    @Nullable
+    private final String requestCacheMemorySize;
 
-	@Nullable
-	private final String priRequestCacheMemorySize;
+    @Nullable
+    private final String priRequestCacheMemorySize;
 
-	@Nullable
-	private final String requestCacheEvictions;
+    @Nullable
+    private final String requestCacheEvictions;
 
-	@Nullable
-	private final String priRequestCacheEvictions;
+    @Nullable
+    private final String priRequestCacheEvictions;
 
-	@Nullable
-	private final String requestCacheHitCount;
+    @Nullable
+    private final String requestCacheHitCount;
 
-	@Nullable
-	private final String priRequestCacheHitCount;
+    @Nullable
+    private final String priRequestCacheHitCount;
 
-	@Nullable
-	private final String requestCacheMissCount;
+    @Nullable
+    private final String requestCacheMissCount;
 
-	@Nullable
-	private final String priRequestCacheMissCount;
+    @Nullable
+    private final String priRequestCacheMissCount;
 
-	@Nullable
-	private final String flushTotal;
+    @Nullable
+    private final String flushTotal;
 
-	@Nullable
-	private final String priFlushTotal;
+    @Nullable
+    private final String priFlushTotal;
 
-	@Nullable
-	private final String flushTotalTime;
+    @Nullable
+    private final String flushTotalTime;
 
-	@Nullable
-	private final String priFlushTotalTime;
+    @Nullable
+    private final String priFlushTotalTime;
 
-	@Nullable
-	private final String getCurrent;
+    @Nullable
+    private final String getCurrent;
 
-	@Nullable
-	private final String priGetCurrent;
+    @Nullable
+    private final String priGetCurrent;
 
-	@Nullable
-	private final String getTime;
+    @Nullable
+    private final String getTime;
 
-	@Nullable
-	private final String priGetTime;
+    @Nullable
+    private final String priGetTime;
 
-	@Nullable
-	private final String getTotal;
+    @Nullable
+    private final String getTotal;
 
-	@Nullable
-	private final String priGetTotal;
+    @Nullable
+    private final String priGetTotal;
 
-	@Nullable
-	private final String getExistsTime;
+    @Nullable
+    private final String getExistsTime;
 
-	@Nullable
-	private final String priGetExistsTime;
+    @Nullable
+    private final String priGetExistsTime;
 
-	@Nullable
-	private final String getExistsTotal;
+    @Nullable
+    private final String getExistsTotal;
 
-	@Nullable
-	private final String priGetExistsTotal;
+    @Nullable
+    private final String priGetExistsTotal;
 
-	@Nullable
-	private final String getMissingTime;
+    @Nullable
+    private final String getMissingTime;
 
-	@Nullable
-	private final String priGetMissingTime;
+    @Nullable
+    private final String priGetMissingTime;
 
-	@Nullable
-	private final String getMissingTotal;
+    @Nullable
+    private final String getMissingTotal;
 
-	@Nullable
-	private final String priGetMissingTotal;
+    @Nullable
+    private final String priGetMissingTotal;
 
-	@Nullable
-	private final String indexingDeleteCurrent;
+    @Nullable
+    private final String indexingDeleteCurrent;
 
-	@Nullable
-	private final String priIndexingDeleteCurrent;
+    @Nullable
+    private final String priIndexingDeleteCurrent;
 
-	@Nullable
-	private final String indexingDeleteTime;
+    @Nullable
+    private final String indexingDeleteTime;
 
-	@Nullable
-	private final String priIndexingDeleteTime;
+    @Nullable
+    private final String priIndexingDeleteTime;
 
-	@Nullable
-	private final String indexingDeleteTotal;
+    @Nullable
+    private final String indexingDeleteTotal;
 
-	@Nullable
-	private final String priIndexingDeleteTotal;
+    @Nullable
+    private final String priIndexingDeleteTotal;
 
-	@Nullable
-	private final String indexingIndexCurrent;
+    @Nullable
+    private final String indexingIndexCurrent;
 
-	@Nullable
-	private final String priIndexingIndexCurrent;
+    @Nullable
+    private final String priIndexingIndexCurrent;
 
-	@Nullable
-	private final String indexingIndexTime;
+    @Nullable
+    private final String indexingIndexTime;
 
-	@Nullable
-	private final String priIndexingIndexTime;
+    @Nullable
+    private final String priIndexingIndexTime;
 
-	@Nullable
-	private final String indexingIndexTotal;
+    @Nullable
+    private final String indexingIndexTotal;
 
-	@Nullable
-	private final String priIndexingIndexTotal;
+    @Nullable
+    private final String priIndexingIndexTotal;
 
-	@Nullable
-	private final String indexingIndexFailed;
+    @Nullable
+    private final String indexingIndexFailed;
 
-	@Nullable
-	private final String priIndexingIndexFailed;
+    @Nullable
+    private final String priIndexingIndexFailed;
 
-	@Nullable
-	private final String mergesCurrent;
+    @Nullable
+    private final String mergesCurrent;
 
-	@Nullable
-	private final String priMergesCurrent;
+    @Nullable
+    private final String priMergesCurrent;
 
-	@Nullable
-	private final String mergesCurrentDocs;
+    @Nullable
+    private final String mergesCurrentDocs;
 
-	@Nullable
-	private final String priMergesCurrentDocs;
+    @Nullable
+    private final String priMergesCurrentDocs;
 
-	@Nullable
-	private final String mergesCurrentSize;
+    @Nullable
+    private final String mergesCurrentSize;
 
-	@Nullable
-	private final String priMergesCurrentSize;
+    @Nullable
+    private final String priMergesCurrentSize;
 
-	@Nullable
-	private final String mergesTotal;
+    @Nullable
+    private final String mergesTotal;
 
-	@Nullable
-	private final String priMergesTotal;
+    @Nullable
+    private final String priMergesTotal;
 
-	@Nullable
-	private final String mergesTotalDocs;
+    @Nullable
+    private final String mergesTotalDocs;
 
-	@Nullable
-	private final String priMergesTotalDocs;
+    @Nullable
+    private final String priMergesTotalDocs;
 
-	@Nullable
-	private final String mergesTotalSize;
+    @Nullable
+    private final String mergesTotalSize;
 
-	@Nullable
-	private final String priMergesTotalSize;
+    @Nullable
+    private final String priMergesTotalSize;
 
-	@Nullable
-	private final String mergesTotalTime;
+    @Nullable
+    private final String mergesTotalTime;
 
-	@Nullable
-	private final String priMergesTotalTime;
+    @Nullable
+    private final String priMergesTotalTime;
 
-	@Nullable
-	private final String refreshTotal;
+    @Nullable
+    private final String refreshTotal;
 
-	@Nullable
-	private final String priRefreshTotal;
+    @Nullable
+    private final String priRefreshTotal;
 
-	@Nullable
-	private final String refreshTime;
+    @Nullable
+    private final String refreshTime;
 
-	@Nullable
-	private final String priRefreshTime;
+    @Nullable
+    private final String priRefreshTime;
 
-	@Nullable
-	private final String refreshExternalTotal;
+    @Nullable
+    private final String refreshExternalTotal;
 
-	@Nullable
-	private final String priRefreshExternalTotal;
+    @Nullable
+    private final String priRefreshExternalTotal;
 
-	@Nullable
-	private final String refreshExternalTime;
+    @Nullable
+    private final String refreshExternalTime;
 
-	@Nullable
-	private final String priRefreshExternalTime;
+    @Nullable
+    private final String priRefreshExternalTime;
 
-	@Nullable
-	private final String refreshListeners;
+    @Nullable
+    private final String refreshListeners;
 
-	@Nullable
-	private final String priRefreshListeners;
+    @Nullable
+    private final String priRefreshListeners;
 
-	@Nullable
-	private final String searchFetchCurrent;
+    @Nullable
+    private final String searchFetchCurrent;
 
-	@Nullable
-	private final String priSearchFetchCurrent;
+    @Nullable
+    private final String priSearchFetchCurrent;
 
-	@Nullable
-	private final String searchFetchTime;
+    @Nullable
+    private final String searchFetchTime;
 
-	@Nullable
-	private final String priSearchFetchTime;
+    @Nullable
+    private final String priSearchFetchTime;
 
-	@Nullable
-	private final String searchFetchTotal;
+    @Nullable
+    private final String searchFetchTotal;
 
-	@Nullable
-	private final String priSearchFetchTotal;
+    @Nullable
+    private final String priSearchFetchTotal;
 
-	@Nullable
-	private final String searchOpenContexts;
+    @Nullable
+    private final String searchOpenContexts;
 
-	@Nullable
-	private final String priSearchOpenContexts;
+    @Nullable
+    private final String priSearchOpenContexts;
 
-	@Nullable
-	private final String searchQueryCurrent;
+    @Nullable
+    private final String searchQueryCurrent;
 
-	@Nullable
-	private final String priSearchQueryCurrent;
+    @Nullable
+    private final String priSearchQueryCurrent;
 
-	@Nullable
-	private final String searchQueryTime;
+    @Nullable
+    private final String searchQueryTime;
 
-	@Nullable
-	private final String priSearchQueryTime;
+    @Nullable
+    private final String priSearchQueryTime;
 
-	@Nullable
-	private final String searchQueryTotal;
+    @Nullable
+    private final String searchQueryTotal;
 
-	@Nullable
-	private final String priSearchQueryTotal;
+    @Nullable
+    private final String priSearchQueryTotal;
 
-	@Nullable
-	private final String searchScrollCurrent;
+    @Nullable
+    private final String searchScrollCurrent;
 
-	@Nullable
-	private final String priSearchScrollCurrent;
+    @Nullable
+    private final String priSearchScrollCurrent;
 
-	@Nullable
-	private final String searchScrollTime;
+    @Nullable
+    private final String searchScrollTime;
 
-	@Nullable
-	private final String priSearchScrollTime;
+    @Nullable
+    private final String priSearchScrollTime;
 
-	@Nullable
-	private final String searchScrollTotal;
+    @Nullable
+    private final String searchScrollTotal;
 
-	@Nullable
-	private final String priSearchScrollTotal;
+    @Nullable
+    private final String priSearchScrollTotal;
 
-	@Nullable
-	private final String segmentsCount;
+    @Nullable
+    private final String segmentsCount;
 
-	@Nullable
-	private final String priSegmentsCount;
+    @Nullable
+    private final String priSegmentsCount;
 
-	@Nullable
-	private final String segmentsMemory;
+    @Nullable
+    private final String segmentsMemory;
 
-	@Nullable
-	private final String priSegmentsMemory;
+    @Nullable
+    private final String priSegmentsMemory;
 
-	@Nullable
-	private final String segmentsIndexWriterMemory;
+    @Nullable
+    private final String segmentsIndexWriterMemory;
 
-	@Nullable
-	private final String priSegmentsIndexWriterMemory;
+    @Nullable
+    private final String priSegmentsIndexWriterMemory;
 
-	@Nullable
-	private final String segmentsVersionMapMemory;
+    @Nullable
+    private final String segmentsVersionMapMemory;
 
-	@Nullable
-	private final String priSegmentsVersionMapMemory;
+    @Nullable
+    private final String priSegmentsVersionMapMemory;
 
-	@Nullable
-	private final String segmentsFixedBitsetMemory;
+    @Nullable
+    private final String segmentsFixedBitsetMemory;
 
-	@Nullable
-	private final String priSegmentsFixedBitsetMemory;
+    @Nullable
+    private final String priSegmentsFixedBitsetMemory;
 
-	@Nullable
-	private final String warmerCurrent;
+    @Nullable
+    private final String warmerCurrent;
 
-	@Nullable
-	private final String priWarmerCurrent;
+    @Nullable
+    private final String priWarmerCurrent;
 
-	@Nullable
-	private final String warmerTotal;
+    @Nullable
+    private final String warmerTotal;
 
-	@Nullable
-	private final String priWarmerTotal;
+    @Nullable
+    private final String priWarmerTotal;
 
-	@Nullable
-	private final String warmerTotalTime;
+    @Nullable
+    private final String warmerTotalTime;
 
-	@Nullable
-	private final String priWarmerTotalTime;
+    @Nullable
+    private final String priWarmerTotalTime;
 
-	@Nullable
-	private final String suggestCurrent;
+    @Nullable
+    private final String suggestCurrent;
 
-	@Nullable
-	private final String priSuggestCurrent;
+    @Nullable
+    private final String priSuggestCurrent;
 
-	@Nullable
-	private final String suggestTime;
+    @Nullable
+    private final String suggestTime;
 
-	@Nullable
-	private final String priSuggestTime;
+    @Nullable
+    private final String priSuggestTime;
 
-	@Nullable
-	private final String suggestTotal;
+    @Nullable
+    private final String suggestTotal;
 
-	@Nullable
-	private final String priSuggestTotal;
-
-	@Nullable
-	private final String memoryTotal;
-
-	@Nullable
-	private final String priMemoryTotal;
-
-	@Nullable
-	private final String searchThrottled;
-
-	@Nullable
-	private final String bulkTotalOperations;
-
-	@Nullable
-	private final String priBulkTotalOperations;
-
-	@Nullable
-	private final String bulkTotalTime;
-
-	@Nullable
-	private final String priBulkTotalTime;
-
-	@Nullable
-	private final String bulkTotalSizeInBytes;
-
-	@Nullable
-	private final String priBulkTotalSizeInBytes;
-
-	@Nullable
-	private final String bulkAvgTime;
-
-	@Nullable
-	private final String priBulkAvgTime;
-
-	@Nullable
-	private final String bulkAvgSizeInBytes;
-
-	@Nullable
-	private final String priBulkAvgSizeInBytes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndicesRecord(Builder builder) {
-
-		this.health = builder.health;
-		this.status = builder.status;
-		this.index = builder.index;
-		this.uuid = builder.uuid;
-		this.pri = builder.pri;
-		this.rep = builder.rep;
-		this.docsCount = builder.docsCount;
-		this.docsDeleted = builder.docsDeleted;
-		this.creationDate = builder.creationDate;
-		this.creationDateString = builder.creationDateString;
-		this.storeSize = builder.storeSize;
-		this.priStoreSize = builder.priStoreSize;
-		this.completionSize = builder.completionSize;
-		this.priCompletionSize = builder.priCompletionSize;
-		this.fielddataMemorySize = builder.fielddataMemorySize;
-		this.priFielddataMemorySize = builder.priFielddataMemorySize;
-		this.fielddataEvictions = builder.fielddataEvictions;
-		this.priFielddataEvictions = builder.priFielddataEvictions;
-		this.queryCacheMemorySize = builder.queryCacheMemorySize;
-		this.priQueryCacheMemorySize = builder.priQueryCacheMemorySize;
-		this.queryCacheEvictions = builder.queryCacheEvictions;
-		this.priQueryCacheEvictions = builder.priQueryCacheEvictions;
-		this.requestCacheMemorySize = builder.requestCacheMemorySize;
-		this.priRequestCacheMemorySize = builder.priRequestCacheMemorySize;
-		this.requestCacheEvictions = builder.requestCacheEvictions;
-		this.priRequestCacheEvictions = builder.priRequestCacheEvictions;
-		this.requestCacheHitCount = builder.requestCacheHitCount;
-		this.priRequestCacheHitCount = builder.priRequestCacheHitCount;
-		this.requestCacheMissCount = builder.requestCacheMissCount;
-		this.priRequestCacheMissCount = builder.priRequestCacheMissCount;
-		this.flushTotal = builder.flushTotal;
-		this.priFlushTotal = builder.priFlushTotal;
-		this.flushTotalTime = builder.flushTotalTime;
-		this.priFlushTotalTime = builder.priFlushTotalTime;
-		this.getCurrent = builder.getCurrent;
-		this.priGetCurrent = builder.priGetCurrent;
-		this.getTime = builder.getTime;
-		this.priGetTime = builder.priGetTime;
-		this.getTotal = builder.getTotal;
-		this.priGetTotal = builder.priGetTotal;
-		this.getExistsTime = builder.getExistsTime;
-		this.priGetExistsTime = builder.priGetExistsTime;
-		this.getExistsTotal = builder.getExistsTotal;
-		this.priGetExistsTotal = builder.priGetExistsTotal;
-		this.getMissingTime = builder.getMissingTime;
-		this.priGetMissingTime = builder.priGetMissingTime;
-		this.getMissingTotal = builder.getMissingTotal;
-		this.priGetMissingTotal = builder.priGetMissingTotal;
-		this.indexingDeleteCurrent = builder.indexingDeleteCurrent;
-		this.priIndexingDeleteCurrent = builder.priIndexingDeleteCurrent;
-		this.indexingDeleteTime = builder.indexingDeleteTime;
-		this.priIndexingDeleteTime = builder.priIndexingDeleteTime;
-		this.indexingDeleteTotal = builder.indexingDeleteTotal;
-		this.priIndexingDeleteTotal = builder.priIndexingDeleteTotal;
-		this.indexingIndexCurrent = builder.indexingIndexCurrent;
-		this.priIndexingIndexCurrent = builder.priIndexingIndexCurrent;
-		this.indexingIndexTime = builder.indexingIndexTime;
-		this.priIndexingIndexTime = builder.priIndexingIndexTime;
-		this.indexingIndexTotal = builder.indexingIndexTotal;
-		this.priIndexingIndexTotal = builder.priIndexingIndexTotal;
-		this.indexingIndexFailed = builder.indexingIndexFailed;
-		this.priIndexingIndexFailed = builder.priIndexingIndexFailed;
-		this.mergesCurrent = builder.mergesCurrent;
-		this.priMergesCurrent = builder.priMergesCurrent;
-		this.mergesCurrentDocs = builder.mergesCurrentDocs;
-		this.priMergesCurrentDocs = builder.priMergesCurrentDocs;
-		this.mergesCurrentSize = builder.mergesCurrentSize;
-		this.priMergesCurrentSize = builder.priMergesCurrentSize;
-		this.mergesTotal = builder.mergesTotal;
-		this.priMergesTotal = builder.priMergesTotal;
-		this.mergesTotalDocs = builder.mergesTotalDocs;
-		this.priMergesTotalDocs = builder.priMergesTotalDocs;
-		this.mergesTotalSize = builder.mergesTotalSize;
-		this.priMergesTotalSize = builder.priMergesTotalSize;
-		this.mergesTotalTime = builder.mergesTotalTime;
-		this.priMergesTotalTime = builder.priMergesTotalTime;
-		this.refreshTotal = builder.refreshTotal;
-		this.priRefreshTotal = builder.priRefreshTotal;
-		this.refreshTime = builder.refreshTime;
-		this.priRefreshTime = builder.priRefreshTime;
-		this.refreshExternalTotal = builder.refreshExternalTotal;
-		this.priRefreshExternalTotal = builder.priRefreshExternalTotal;
-		this.refreshExternalTime = builder.refreshExternalTime;
-		this.priRefreshExternalTime = builder.priRefreshExternalTime;
-		this.refreshListeners = builder.refreshListeners;
-		this.priRefreshListeners = builder.priRefreshListeners;
-		this.searchFetchCurrent = builder.searchFetchCurrent;
-		this.priSearchFetchCurrent = builder.priSearchFetchCurrent;
-		this.searchFetchTime = builder.searchFetchTime;
-		this.priSearchFetchTime = builder.priSearchFetchTime;
-		this.searchFetchTotal = builder.searchFetchTotal;
-		this.priSearchFetchTotal = builder.priSearchFetchTotal;
-		this.searchOpenContexts = builder.searchOpenContexts;
-		this.priSearchOpenContexts = builder.priSearchOpenContexts;
-		this.searchQueryCurrent = builder.searchQueryCurrent;
-		this.priSearchQueryCurrent = builder.priSearchQueryCurrent;
-		this.searchQueryTime = builder.searchQueryTime;
-		this.priSearchQueryTime = builder.priSearchQueryTime;
-		this.searchQueryTotal = builder.searchQueryTotal;
-		this.priSearchQueryTotal = builder.priSearchQueryTotal;
-		this.searchScrollCurrent = builder.searchScrollCurrent;
-		this.priSearchScrollCurrent = builder.priSearchScrollCurrent;
-		this.searchScrollTime = builder.searchScrollTime;
-		this.priSearchScrollTime = builder.priSearchScrollTime;
-		this.searchScrollTotal = builder.searchScrollTotal;
-		this.priSearchScrollTotal = builder.priSearchScrollTotal;
-		this.segmentsCount = builder.segmentsCount;
-		this.priSegmentsCount = builder.priSegmentsCount;
-		this.segmentsMemory = builder.segmentsMemory;
-		this.priSegmentsMemory = builder.priSegmentsMemory;
-		this.segmentsIndexWriterMemory = builder.segmentsIndexWriterMemory;
-		this.priSegmentsIndexWriterMemory = builder.priSegmentsIndexWriterMemory;
-		this.segmentsVersionMapMemory = builder.segmentsVersionMapMemory;
-		this.priSegmentsVersionMapMemory = builder.priSegmentsVersionMapMemory;
-		this.segmentsFixedBitsetMemory = builder.segmentsFixedBitsetMemory;
-		this.priSegmentsFixedBitsetMemory = builder.priSegmentsFixedBitsetMemory;
-		this.warmerCurrent = builder.warmerCurrent;
-		this.priWarmerCurrent = builder.priWarmerCurrent;
-		this.warmerTotal = builder.warmerTotal;
-		this.priWarmerTotal = builder.priWarmerTotal;
-		this.warmerTotalTime = builder.warmerTotalTime;
-		this.priWarmerTotalTime = builder.priWarmerTotalTime;
-		this.suggestCurrent = builder.suggestCurrent;
-		this.priSuggestCurrent = builder.priSuggestCurrent;
-		this.suggestTime = builder.suggestTime;
-		this.priSuggestTime = builder.priSuggestTime;
-		this.suggestTotal = builder.suggestTotal;
-		this.priSuggestTotal = builder.priSuggestTotal;
-		this.memoryTotal = builder.memoryTotal;
-		this.priMemoryTotal = builder.priMemoryTotal;
-		this.searchThrottled = builder.searchThrottled;
-		this.bulkTotalOperations = builder.bulkTotalOperations;
-		this.priBulkTotalOperations = builder.priBulkTotalOperations;
-		this.bulkTotalTime = builder.bulkTotalTime;
-		this.priBulkTotalTime = builder.priBulkTotalTime;
-		this.bulkTotalSizeInBytes = builder.bulkTotalSizeInBytes;
-		this.priBulkTotalSizeInBytes = builder.priBulkTotalSizeInBytes;
-		this.bulkAvgTime = builder.bulkAvgTime;
-		this.priBulkAvgTime = builder.priBulkAvgTime;
-		this.bulkAvgSizeInBytes = builder.bulkAvgSizeInBytes;
-		this.priBulkAvgSizeInBytes = builder.priBulkAvgSizeInBytes;
-
-	}
-
-	public static IndicesRecord of(Function<Builder, ObjectBuilder<IndicesRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * current health status
-	 * <p>
-	 * API name: {@code health}
-	 */
-	@Nullable
-	public final String health() {
-		return this.health;
-	}
-
-	/**
-	 * open/close status
-	 * <p>
-	 * API name: {@code status}
-	 */
-	@Nullable
-	public final String status() {
-		return this.status;
-	}
-
-	/**
-	 * index name
-	 * <p>
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * index uuid
-	 * <p>
-	 * API name: {@code uuid}
-	 */
-	@Nullable
-	public final String uuid() {
-		return this.uuid;
-	}
-
-	/**
-	 * number of primary shards
-	 * <p>
-	 * API name: {@code pri}
-	 */
-	@Nullable
-	public final String pri() {
-		return this.pri;
-	}
-
-	/**
-	 * number of replica shards
-	 * <p>
-	 * API name: {@code rep}
-	 */
-	@Nullable
-	public final String rep() {
-		return this.rep;
-	}
-
-	/**
-	 * available docs
-	 * <p>
-	 * API name: {@code docs.count}
-	 */
-	@Nullable
-	public final String docsCount() {
-		return this.docsCount;
-	}
-
-	/**
-	 * deleted docs
-	 * <p>
-	 * API name: {@code docs.deleted}
-	 */
-	@Nullable
-	public final String docsDeleted() {
-		return this.docsDeleted;
-	}
-
-	/**
-	 * index creation date (millisecond value)
-	 * <p>
-	 * API name: {@code creation.date}
-	 */
-	@Nullable
-	public final String creationDate() {
-		return this.creationDate;
-	}
-
-	/**
-	 * index creation date (as string)
-	 * <p>
-	 * API name: {@code creation.date.string}
-	 */
-	@Nullable
-	public final String creationDateString() {
-		return this.creationDateString;
-	}
-
-	/**
-	 * store size of primaries &amp; replicas
-	 * <p>
-	 * API name: {@code store.size}
-	 */
-	@Nullable
-	public final String storeSize() {
-		return this.storeSize;
-	}
-
-	/**
-	 * store size of primaries
-	 * <p>
-	 * API name: {@code pri.store.size}
-	 */
-	@Nullable
-	public final String priStoreSize() {
-		return this.priStoreSize;
-	}
-
-	/**
-	 * size of completion
-	 * <p>
-	 * API name: {@code completion.size}
-	 */
-	@Nullable
-	public final String completionSize() {
-		return this.completionSize;
-	}
-
-	/**
-	 * size of completion
-	 * <p>
-	 * API name: {@code pri.completion.size}
-	 */
-	@Nullable
-	public final String priCompletionSize() {
-		return this.priCompletionSize;
-	}
-
-	/**
-	 * used fielddata cache
-	 * <p>
-	 * API name: {@code fielddata.memory_size}
-	 */
-	@Nullable
-	public final String fielddataMemorySize() {
-		return this.fielddataMemorySize;
-	}
-
-	/**
-	 * used fielddata cache
-	 * <p>
-	 * API name: {@code pri.fielddata.memory_size}
-	 */
-	@Nullable
-	public final String priFielddataMemorySize() {
-		return this.priFielddataMemorySize;
-	}
-
-	/**
-	 * fielddata evictions
-	 * <p>
-	 * API name: {@code fielddata.evictions}
-	 */
-	@Nullable
-	public final String fielddataEvictions() {
-		return this.fielddataEvictions;
-	}
-
-	/**
-	 * fielddata evictions
-	 * <p>
-	 * API name: {@code pri.fielddata.evictions}
-	 */
-	@Nullable
-	public final String priFielddataEvictions() {
-		return this.priFielddataEvictions;
-	}
-
-	/**
-	 * used query cache
-	 * <p>
-	 * API name: {@code query_cache.memory_size}
-	 */
-	@Nullable
-	public final String queryCacheMemorySize() {
-		return this.queryCacheMemorySize;
-	}
-
-	/**
-	 * used query cache
-	 * <p>
-	 * API name: {@code pri.query_cache.memory_size}
-	 */
-	@Nullable
-	public final String priQueryCacheMemorySize() {
-		return this.priQueryCacheMemorySize;
-	}
-
-	/**
-	 * query cache evictions
-	 * <p>
-	 * API name: {@code query_cache.evictions}
-	 */
-	@Nullable
-	public final String queryCacheEvictions() {
-		return this.queryCacheEvictions;
-	}
-
-	/**
-	 * query cache evictions
-	 * <p>
-	 * API name: {@code pri.query_cache.evictions}
-	 */
-	@Nullable
-	public final String priQueryCacheEvictions() {
-		return this.priQueryCacheEvictions;
-	}
-
-	/**
-	 * used request cache
-	 * <p>
-	 * API name: {@code request_cache.memory_size}
-	 */
-	@Nullable
-	public final String requestCacheMemorySize() {
-		return this.requestCacheMemorySize;
-	}
-
-	/**
-	 * used request cache
-	 * <p>
-	 * API name: {@code pri.request_cache.memory_size}
-	 */
-	@Nullable
-	public final String priRequestCacheMemorySize() {
-		return this.priRequestCacheMemorySize;
-	}
-
-	/**
-	 * request cache evictions
-	 * <p>
-	 * API name: {@code request_cache.evictions}
-	 */
-	@Nullable
-	public final String requestCacheEvictions() {
-		return this.requestCacheEvictions;
-	}
-
-	/**
-	 * request cache evictions
-	 * <p>
-	 * API name: {@code pri.request_cache.evictions}
-	 */
-	@Nullable
-	public final String priRequestCacheEvictions() {
-		return this.priRequestCacheEvictions;
-	}
-
-	/**
-	 * request cache hit count
-	 * <p>
-	 * API name: {@code request_cache.hit_count}
-	 */
-	@Nullable
-	public final String requestCacheHitCount() {
-		return this.requestCacheHitCount;
-	}
-
-	/**
-	 * request cache hit count
-	 * <p>
-	 * API name: {@code pri.request_cache.hit_count}
-	 */
-	@Nullable
-	public final String priRequestCacheHitCount() {
-		return this.priRequestCacheHitCount;
-	}
-
-	/**
-	 * request cache miss count
-	 * <p>
-	 * API name: {@code request_cache.miss_count}
-	 */
-	@Nullable
-	public final String requestCacheMissCount() {
-		return this.requestCacheMissCount;
-	}
-
-	/**
-	 * request cache miss count
-	 * <p>
-	 * API name: {@code pri.request_cache.miss_count}
-	 */
-	@Nullable
-	public final String priRequestCacheMissCount() {
-		return this.priRequestCacheMissCount;
-	}
-
-	/**
-	 * number of flushes
-	 * <p>
-	 * API name: {@code flush.total}
-	 */
-	@Nullable
-	public final String flushTotal() {
-		return this.flushTotal;
-	}
-
-	/**
-	 * number of flushes
-	 * <p>
-	 * API name: {@code pri.flush.total}
-	 */
-	@Nullable
-	public final String priFlushTotal() {
-		return this.priFlushTotal;
-	}
-
-	/**
-	 * time spent in flush
-	 * <p>
-	 * API name: {@code flush.total_time}
-	 */
-	@Nullable
-	public final String flushTotalTime() {
-		return this.flushTotalTime;
-	}
-
-	/**
-	 * time spent in flush
-	 * <p>
-	 * API name: {@code pri.flush.total_time}
-	 */
-	@Nullable
-	public final String priFlushTotalTime() {
-		return this.priFlushTotalTime;
-	}
-
-	/**
-	 * number of current get ops
-	 * <p>
-	 * API name: {@code get.current}
-	 */
-	@Nullable
-	public final String getCurrent() {
-		return this.getCurrent;
-	}
-
-	/**
-	 * number of current get ops
-	 * <p>
-	 * API name: {@code pri.get.current}
-	 */
-	@Nullable
-	public final String priGetCurrent() {
-		return this.priGetCurrent;
-	}
-
-	/**
-	 * time spent in get
-	 * <p>
-	 * API name: {@code get.time}
-	 */
-	@Nullable
-	public final String getTime() {
-		return this.getTime;
-	}
-
-	/**
-	 * time spent in get
-	 * <p>
-	 * API name: {@code pri.get.time}
-	 */
-	@Nullable
-	public final String priGetTime() {
-		return this.priGetTime;
-	}
-
-	/**
-	 * number of get ops
-	 * <p>
-	 * API name: {@code get.total}
-	 */
-	@Nullable
-	public final String getTotal() {
-		return this.getTotal;
-	}
-
-	/**
-	 * number of get ops
-	 * <p>
-	 * API name: {@code pri.get.total}
-	 */
-	@Nullable
-	public final String priGetTotal() {
-		return this.priGetTotal;
-	}
-
-	/**
-	 * time spent in successful gets
-	 * <p>
-	 * API name: {@code get.exists_time}
-	 */
-	@Nullable
-	public final String getExistsTime() {
-		return this.getExistsTime;
-	}
-
-	/**
-	 * time spent in successful gets
-	 * <p>
-	 * API name: {@code pri.get.exists_time}
-	 */
-	@Nullable
-	public final String priGetExistsTime() {
-		return this.priGetExistsTime;
-	}
-
-	/**
-	 * number of successful gets
-	 * <p>
-	 * API name: {@code get.exists_total}
-	 */
-	@Nullable
-	public final String getExistsTotal() {
-		return this.getExistsTotal;
-	}
-
-	/**
-	 * number of successful gets
-	 * <p>
-	 * API name: {@code pri.get.exists_total}
-	 */
-	@Nullable
-	public final String priGetExistsTotal() {
-		return this.priGetExistsTotal;
-	}
-
-	/**
-	 * time spent in failed gets
-	 * <p>
-	 * API name: {@code get.missing_time}
-	 */
-	@Nullable
-	public final String getMissingTime() {
-		return this.getMissingTime;
-	}
-
-	/**
-	 * time spent in failed gets
-	 * <p>
-	 * API name: {@code pri.get.missing_time}
-	 */
-	@Nullable
-	public final String priGetMissingTime() {
-		return this.priGetMissingTime;
-	}
-
-	/**
-	 * number of failed gets
-	 * <p>
-	 * API name: {@code get.missing_total}
-	 */
-	@Nullable
-	public final String getMissingTotal() {
-		return this.getMissingTotal;
-	}
-
-	/**
-	 * number of failed gets
-	 * <p>
-	 * API name: {@code pri.get.missing_total}
-	 */
-	@Nullable
-	public final String priGetMissingTotal() {
-		return this.priGetMissingTotal;
-	}
-
-	/**
-	 * number of current deletions
-	 * <p>
-	 * API name: {@code indexing.delete_current}
-	 */
-	@Nullable
-	public final String indexingDeleteCurrent() {
-		return this.indexingDeleteCurrent;
-	}
-
-	/**
-	 * number of current deletions
-	 * <p>
-	 * API name: {@code pri.indexing.delete_current}
-	 */
-	@Nullable
-	public final String priIndexingDeleteCurrent() {
-		return this.priIndexingDeleteCurrent;
-	}
-
-	/**
-	 * time spent in deletions
-	 * <p>
-	 * API name: {@code indexing.delete_time}
-	 */
-	@Nullable
-	public final String indexingDeleteTime() {
-		return this.indexingDeleteTime;
-	}
-
-	/**
-	 * time spent in deletions
-	 * <p>
-	 * API name: {@code pri.indexing.delete_time}
-	 */
-	@Nullable
-	public final String priIndexingDeleteTime() {
-		return this.priIndexingDeleteTime;
-	}
-
-	/**
-	 * number of delete ops
-	 * <p>
-	 * API name: {@code indexing.delete_total}
-	 */
-	@Nullable
-	public final String indexingDeleteTotal() {
-		return this.indexingDeleteTotal;
-	}
-
-	/**
-	 * number of delete ops
-	 * <p>
-	 * API name: {@code pri.indexing.delete_total}
-	 */
-	@Nullable
-	public final String priIndexingDeleteTotal() {
-		return this.priIndexingDeleteTotal;
-	}
-
-	/**
-	 * number of current indexing ops
-	 * <p>
-	 * API name: {@code indexing.index_current}
-	 */
-	@Nullable
-	public final String indexingIndexCurrent() {
-		return this.indexingIndexCurrent;
-	}
-
-	/**
-	 * number of current indexing ops
-	 * <p>
-	 * API name: {@code pri.indexing.index_current}
-	 */
-	@Nullable
-	public final String priIndexingIndexCurrent() {
-		return this.priIndexingIndexCurrent;
-	}
-
-	/**
-	 * time spent in indexing
-	 * <p>
-	 * API name: {@code indexing.index_time}
-	 */
-	@Nullable
-	public final String indexingIndexTime() {
-		return this.indexingIndexTime;
-	}
-
-	/**
-	 * time spent in indexing
-	 * <p>
-	 * API name: {@code pri.indexing.index_time}
-	 */
-	@Nullable
-	public final String priIndexingIndexTime() {
-		return this.priIndexingIndexTime;
-	}
-
-	/**
-	 * number of indexing ops
-	 * <p>
-	 * API name: {@code indexing.index_total}
-	 */
-	@Nullable
-	public final String indexingIndexTotal() {
-		return this.indexingIndexTotal;
-	}
-
-	/**
-	 * number of indexing ops
-	 * <p>
-	 * API name: {@code pri.indexing.index_total}
-	 */
-	@Nullable
-	public final String priIndexingIndexTotal() {
-		return this.priIndexingIndexTotal;
-	}
-
-	/**
-	 * number of failed indexing ops
-	 * <p>
-	 * API name: {@code indexing.index_failed}
-	 */
-	@Nullable
-	public final String indexingIndexFailed() {
-		return this.indexingIndexFailed;
-	}
-
-	/**
-	 * number of failed indexing ops
-	 * <p>
-	 * API name: {@code pri.indexing.index_failed}
-	 */
-	@Nullable
-	public final String priIndexingIndexFailed() {
-		return this.priIndexingIndexFailed;
-	}
-
-	/**
-	 * number of current merges
-	 * <p>
-	 * API name: {@code merges.current}
-	 */
-	@Nullable
-	public final String mergesCurrent() {
-		return this.mergesCurrent;
-	}
-
-	/**
-	 * number of current merges
-	 * <p>
-	 * API name: {@code pri.merges.current}
-	 */
-	@Nullable
-	public final String priMergesCurrent() {
-		return this.priMergesCurrent;
-	}
-
-	/**
-	 * number of current merging docs
-	 * <p>
-	 * API name: {@code merges.current_docs}
-	 */
-	@Nullable
-	public final String mergesCurrentDocs() {
-		return this.mergesCurrentDocs;
-	}
-
-	/**
-	 * number of current merging docs
-	 * <p>
-	 * API name: {@code pri.merges.current_docs}
-	 */
-	@Nullable
-	public final String priMergesCurrentDocs() {
-		return this.priMergesCurrentDocs;
-	}
-
-	/**
-	 * size of current merges
-	 * <p>
-	 * API name: {@code merges.current_size}
-	 */
-	@Nullable
-	public final String mergesCurrentSize() {
-		return this.mergesCurrentSize;
-	}
-
-	/**
-	 * size of current merges
-	 * <p>
-	 * API name: {@code pri.merges.current_size}
-	 */
-	@Nullable
-	public final String priMergesCurrentSize() {
-		return this.priMergesCurrentSize;
-	}
-
-	/**
-	 * number of completed merge ops
-	 * <p>
-	 * API name: {@code merges.total}
-	 */
-	@Nullable
-	public final String mergesTotal() {
-		return this.mergesTotal;
-	}
-
-	/**
-	 * number of completed merge ops
-	 * <p>
-	 * API name: {@code pri.merges.total}
-	 */
-	@Nullable
-	public final String priMergesTotal() {
-		return this.priMergesTotal;
-	}
-
-	/**
-	 * docs merged
-	 * <p>
-	 * API name: {@code merges.total_docs}
-	 */
-	@Nullable
-	public final String mergesTotalDocs() {
-		return this.mergesTotalDocs;
-	}
-
-	/**
-	 * docs merged
-	 * <p>
-	 * API name: {@code pri.merges.total_docs}
-	 */
-	@Nullable
-	public final String priMergesTotalDocs() {
-		return this.priMergesTotalDocs;
-	}
-
-	/**
-	 * size merged
-	 * <p>
-	 * API name: {@code merges.total_size}
-	 */
-	@Nullable
-	public final String mergesTotalSize() {
-		return this.mergesTotalSize;
-	}
-
-	/**
-	 * size merged
-	 * <p>
-	 * API name: {@code pri.merges.total_size}
-	 */
-	@Nullable
-	public final String priMergesTotalSize() {
-		return this.priMergesTotalSize;
-	}
-
-	/**
-	 * time spent in merges
-	 * <p>
-	 * API name: {@code merges.total_time}
-	 */
-	@Nullable
-	public final String mergesTotalTime() {
-		return this.mergesTotalTime;
-	}
-
-	/**
-	 * time spent in merges
-	 * <p>
-	 * API name: {@code pri.merges.total_time}
-	 */
-	@Nullable
-	public final String priMergesTotalTime() {
-		return this.priMergesTotalTime;
-	}
-
-	/**
-	 * total refreshes
-	 * <p>
-	 * API name: {@code refresh.total}
-	 */
-	@Nullable
-	public final String refreshTotal() {
-		return this.refreshTotal;
-	}
-
-	/**
-	 * total refreshes
-	 * <p>
-	 * API name: {@code pri.refresh.total}
-	 */
-	@Nullable
-	public final String priRefreshTotal() {
-		return this.priRefreshTotal;
-	}
-
-	/**
-	 * time spent in refreshes
-	 * <p>
-	 * API name: {@code refresh.time}
-	 */
-	@Nullable
-	public final String refreshTime() {
-		return this.refreshTime;
-	}
-
-	/**
-	 * time spent in refreshes
-	 * <p>
-	 * API name: {@code pri.refresh.time}
-	 */
-	@Nullable
-	public final String priRefreshTime() {
-		return this.priRefreshTime;
-	}
-
-	/**
-	 * total external refreshes
-	 * <p>
-	 * API name: {@code refresh.external_total}
-	 */
-	@Nullable
-	public final String refreshExternalTotal() {
-		return this.refreshExternalTotal;
-	}
-
-	/**
-	 * total external refreshes
-	 * <p>
-	 * API name: {@code pri.refresh.external_total}
-	 */
-	@Nullable
-	public final String priRefreshExternalTotal() {
-		return this.priRefreshExternalTotal;
-	}
-
-	/**
-	 * time spent in external refreshes
-	 * <p>
-	 * API name: {@code refresh.external_time}
-	 */
-	@Nullable
-	public final String refreshExternalTime() {
-		return this.refreshExternalTime;
-	}
-
-	/**
-	 * time spent in external refreshes
-	 * <p>
-	 * API name: {@code pri.refresh.external_time}
-	 */
-	@Nullable
-	public final String priRefreshExternalTime() {
-		return this.priRefreshExternalTime;
-	}
-
-	/**
-	 * number of pending refresh listeners
-	 * <p>
-	 * API name: {@code refresh.listeners}
-	 */
-	@Nullable
-	public final String refreshListeners() {
-		return this.refreshListeners;
-	}
-
-	/**
-	 * number of pending refresh listeners
-	 * <p>
-	 * API name: {@code pri.refresh.listeners}
-	 */
-	@Nullable
-	public final String priRefreshListeners() {
-		return this.priRefreshListeners;
-	}
-
-	/**
-	 * current fetch phase ops
-	 * <p>
-	 * API name: {@code search.fetch_current}
-	 */
-	@Nullable
-	public final String searchFetchCurrent() {
-		return this.searchFetchCurrent;
-	}
-
-	/**
-	 * current fetch phase ops
-	 * <p>
-	 * API name: {@code pri.search.fetch_current}
-	 */
-	@Nullable
-	public final String priSearchFetchCurrent() {
-		return this.priSearchFetchCurrent;
-	}
-
-	/**
-	 * time spent in fetch phase
-	 * <p>
-	 * API name: {@code search.fetch_time}
-	 */
-	@Nullable
-	public final String searchFetchTime() {
-		return this.searchFetchTime;
-	}
-
-	/**
-	 * time spent in fetch phase
-	 * <p>
-	 * API name: {@code pri.search.fetch_time}
-	 */
-	@Nullable
-	public final String priSearchFetchTime() {
-		return this.priSearchFetchTime;
-	}
-
-	/**
-	 * total fetch ops
-	 * <p>
-	 * API name: {@code search.fetch_total}
-	 */
-	@Nullable
-	public final String searchFetchTotal() {
-		return this.searchFetchTotal;
-	}
-
-	/**
-	 * total fetch ops
-	 * <p>
-	 * API name: {@code pri.search.fetch_total}
-	 */
-	@Nullable
-	public final String priSearchFetchTotal() {
-		return this.priSearchFetchTotal;
-	}
-
-	/**
-	 * open search contexts
-	 * <p>
-	 * API name: {@code search.open_contexts}
-	 */
-	@Nullable
-	public final String searchOpenContexts() {
-		return this.searchOpenContexts;
-	}
-
-	/**
-	 * open search contexts
-	 * <p>
-	 * API name: {@code pri.search.open_contexts}
-	 */
-	@Nullable
-	public final String priSearchOpenContexts() {
-		return this.priSearchOpenContexts;
-	}
-
-	/**
-	 * current query phase ops
-	 * <p>
-	 * API name: {@code search.query_current}
-	 */
-	@Nullable
-	public final String searchQueryCurrent() {
-		return this.searchQueryCurrent;
-	}
-
-	/**
-	 * current query phase ops
-	 * <p>
-	 * API name: {@code pri.search.query_current}
-	 */
-	@Nullable
-	public final String priSearchQueryCurrent() {
-		return this.priSearchQueryCurrent;
-	}
-
-	/**
-	 * time spent in query phase
-	 * <p>
-	 * API name: {@code search.query_time}
-	 */
-	@Nullable
-	public final String searchQueryTime() {
-		return this.searchQueryTime;
-	}
-
-	/**
-	 * time spent in query phase
-	 * <p>
-	 * API name: {@code pri.search.query_time}
-	 */
-	@Nullable
-	public final String priSearchQueryTime() {
-		return this.priSearchQueryTime;
-	}
-
-	/**
-	 * total query phase ops
-	 * <p>
-	 * API name: {@code search.query_total}
-	 */
-	@Nullable
-	public final String searchQueryTotal() {
-		return this.searchQueryTotal;
-	}
-
-	/**
-	 * total query phase ops
-	 * <p>
-	 * API name: {@code pri.search.query_total}
-	 */
-	@Nullable
-	public final String priSearchQueryTotal() {
-		return this.priSearchQueryTotal;
-	}
-
-	/**
-	 * open scroll contexts
-	 * <p>
-	 * API name: {@code search.scroll_current}
-	 */
-	@Nullable
-	public final String searchScrollCurrent() {
-		return this.searchScrollCurrent;
-	}
-
-	/**
-	 * open scroll contexts
-	 * <p>
-	 * API name: {@code pri.search.scroll_current}
-	 */
-	@Nullable
-	public final String priSearchScrollCurrent() {
-		return this.priSearchScrollCurrent;
-	}
-
-	/**
-	 * time scroll contexts held open
-	 * <p>
-	 * API name: {@code search.scroll_time}
-	 */
-	@Nullable
-	public final String searchScrollTime() {
-		return this.searchScrollTime;
-	}
-
-	/**
-	 * time scroll contexts held open
-	 * <p>
-	 * API name: {@code pri.search.scroll_time}
-	 */
-	@Nullable
-	public final String priSearchScrollTime() {
-		return this.priSearchScrollTime;
-	}
-
-	/**
-	 * completed scroll contexts
-	 * <p>
-	 * API name: {@code search.scroll_total}
-	 */
-	@Nullable
-	public final String searchScrollTotal() {
-		return this.searchScrollTotal;
-	}
-
-	/**
-	 * completed scroll contexts
-	 * <p>
-	 * API name: {@code pri.search.scroll_total}
-	 */
-	@Nullable
-	public final String priSearchScrollTotal() {
-		return this.priSearchScrollTotal;
-	}
-
-	/**
-	 * number of segments
-	 * <p>
-	 * API name: {@code segments.count}
-	 */
-	@Nullable
-	public final String segmentsCount() {
-		return this.segmentsCount;
-	}
-
-	/**
-	 * number of segments
-	 * <p>
-	 * API name: {@code pri.segments.count}
-	 */
-	@Nullable
-	public final String priSegmentsCount() {
-		return this.priSegmentsCount;
-	}
-
-	/**
-	 * memory used by segments
-	 * <p>
-	 * API name: {@code segments.memory}
-	 */
-	@Nullable
-	public final String segmentsMemory() {
-		return this.segmentsMemory;
-	}
-
-	/**
-	 * memory used by segments
-	 * <p>
-	 * API name: {@code pri.segments.memory}
-	 */
-	@Nullable
-	public final String priSegmentsMemory() {
-		return this.priSegmentsMemory;
-	}
-
-	/**
-	 * memory used by index writer
-	 * <p>
-	 * API name: {@code segments.index_writer_memory}
-	 */
-	@Nullable
-	public final String segmentsIndexWriterMemory() {
-		return this.segmentsIndexWriterMemory;
-	}
-
-	/**
-	 * memory used by index writer
-	 * <p>
-	 * API name: {@code pri.segments.index_writer_memory}
-	 */
-	@Nullable
-	public final String priSegmentsIndexWriterMemory() {
-		return this.priSegmentsIndexWriterMemory;
-	}
-
-	/**
-	 * memory used by version map
-	 * <p>
-	 * API name: {@code segments.version_map_memory}
-	 */
-	@Nullable
-	public final String segmentsVersionMapMemory() {
-		return this.segmentsVersionMapMemory;
-	}
-
-	/**
-	 * memory used by version map
-	 * <p>
-	 * API name: {@code pri.segments.version_map_memory}
-	 */
-	@Nullable
-	public final String priSegmentsVersionMapMemory() {
-		return this.priSegmentsVersionMapMemory;
-	}
-
-	/**
-	 * memory used by fixed bit sets for nested object field types and export type
-	 * filters for types referred in _parent fields
-	 * <p>
-	 * API name: {@code segments.fixed_bitset_memory}
-	 */
-	@Nullable
-	public final String segmentsFixedBitsetMemory() {
-		return this.segmentsFixedBitsetMemory;
-	}
-
-	/**
-	 * memory used by fixed bit sets for nested object field types and export type
-	 * filters for types referred in _parent fields
-	 * <p>
-	 * API name: {@code pri.segments.fixed_bitset_memory}
-	 */
-	@Nullable
-	public final String priSegmentsFixedBitsetMemory() {
-		return this.priSegmentsFixedBitsetMemory;
-	}
-
-	/**
-	 * current warmer ops
-	 * <p>
-	 * API name: {@code warmer.current}
-	 */
-	@Nullable
-	public final String warmerCurrent() {
-		return this.warmerCurrent;
-	}
-
-	/**
-	 * current warmer ops
-	 * <p>
-	 * API name: {@code pri.warmer.current}
-	 */
-	@Nullable
-	public final String priWarmerCurrent() {
-		return this.priWarmerCurrent;
-	}
-
-	/**
-	 * total warmer ops
-	 * <p>
-	 * API name: {@code warmer.total}
-	 */
-	@Nullable
-	public final String warmerTotal() {
-		return this.warmerTotal;
-	}
-
-	/**
-	 * total warmer ops
-	 * <p>
-	 * API name: {@code pri.warmer.total}
-	 */
-	@Nullable
-	public final String priWarmerTotal() {
-		return this.priWarmerTotal;
-	}
-
-	/**
-	 * time spent in warmers
-	 * <p>
-	 * API name: {@code warmer.total_time}
-	 */
-	@Nullable
-	public final String warmerTotalTime() {
-		return this.warmerTotalTime;
-	}
-
-	/**
-	 * time spent in warmers
-	 * <p>
-	 * API name: {@code pri.warmer.total_time}
-	 */
-	@Nullable
-	public final String priWarmerTotalTime() {
-		return this.priWarmerTotalTime;
-	}
-
-	/**
-	 * number of current suggest ops
-	 * <p>
-	 * API name: {@code suggest.current}
-	 */
-	@Nullable
-	public final String suggestCurrent() {
-		return this.suggestCurrent;
-	}
-
-	/**
-	 * number of current suggest ops
-	 * <p>
-	 * API name: {@code pri.suggest.current}
-	 */
-	@Nullable
-	public final String priSuggestCurrent() {
-		return this.priSuggestCurrent;
-	}
-
-	/**
-	 * time spend in suggest
-	 * <p>
-	 * API name: {@code suggest.time}
-	 */
-	@Nullable
-	public final String suggestTime() {
-		return this.suggestTime;
-	}
-
-	/**
-	 * time spend in suggest
-	 * <p>
-	 * API name: {@code pri.suggest.time}
-	 */
-	@Nullable
-	public final String priSuggestTime() {
-		return this.priSuggestTime;
-	}
-
-	/**
-	 * number of suggest ops
-	 * <p>
-	 * API name: {@code suggest.total}
-	 */
-	@Nullable
-	public final String suggestTotal() {
-		return this.suggestTotal;
-	}
-
-	/**
-	 * number of suggest ops
-	 * <p>
-	 * API name: {@code pri.suggest.total}
-	 */
-	@Nullable
-	public final String priSuggestTotal() {
-		return this.priSuggestTotal;
-	}
-
-	/**
-	 * total used memory
-	 * <p>
-	 * API name: {@code memory.total}
-	 */
-	@Nullable
-	public final String memoryTotal() {
-		return this.memoryTotal;
-	}
-
-	/**
-	 * total user memory
-	 * <p>
-	 * API name: {@code pri.memory.total}
-	 */
-	@Nullable
-	public final String priMemoryTotal() {
-		return this.priMemoryTotal;
-	}
-
-	/**
-	 * indicates if the index is search throttled
-	 * <p>
-	 * API name: {@code search.throttled}
-	 */
-	@Nullable
-	public final String searchThrottled() {
-		return this.searchThrottled;
-	}
-
-	/**
-	 * number of bulk shard ops
-	 * <p>
-	 * API name: {@code bulk.total_operations}
-	 */
-	@Nullable
-	public final String bulkTotalOperations() {
-		return this.bulkTotalOperations;
-	}
-
-	/**
-	 * number of bulk shard ops
-	 * <p>
-	 * API name: {@code pri.bulk.total_operations}
-	 */
-	@Nullable
-	public final String priBulkTotalOperations() {
-		return this.priBulkTotalOperations;
-	}
-
-	/**
-	 * time spend in shard bulk
-	 * <p>
-	 * API name: {@code bulk.total_time}
-	 */
-	@Nullable
-	public final String bulkTotalTime() {
-		return this.bulkTotalTime;
-	}
-
-	/**
-	 * time spend in shard bulk
-	 * <p>
-	 * API name: {@code pri.bulk.total_time}
-	 */
-	@Nullable
-	public final String priBulkTotalTime() {
-		return this.priBulkTotalTime;
-	}
-
-	/**
-	 * total size in bytes of shard bulk
-	 * <p>
-	 * API name: {@code bulk.total_size_in_bytes}
-	 */
-	@Nullable
-	public final String bulkTotalSizeInBytes() {
-		return this.bulkTotalSizeInBytes;
-	}
-
-	/**
-	 * total size in bytes of shard bulk
-	 * <p>
-	 * API name: {@code pri.bulk.total_size_in_bytes}
-	 */
-	@Nullable
-	public final String priBulkTotalSizeInBytes() {
-		return this.priBulkTotalSizeInBytes;
-	}
-
-	/**
-	 * average time spend in shard bulk
-	 * <p>
-	 * API name: {@code bulk.avg_time}
-	 */
-	@Nullable
-	public final String bulkAvgTime() {
-		return this.bulkAvgTime;
-	}
-
-	/**
-	 * average time spend in shard bulk
-	 * <p>
-	 * API name: {@code pri.bulk.avg_time}
-	 */
-	@Nullable
-	public final String priBulkAvgTime() {
-		return this.priBulkAvgTime;
-	}
-
-	/**
-	 * average size in bytes of shard bulk
-	 * <p>
-	 * API name: {@code bulk.avg_size_in_bytes}
-	 */
-	@Nullable
-	public final String bulkAvgSizeInBytes() {
-		return this.bulkAvgSizeInBytes;
-	}
-
-	/**
-	 * average size in bytes of shard bulk
-	 * <p>
-	 * API name: {@code pri.bulk.avg_size_in_bytes}
-	 */
-	@Nullable
-	public final String priBulkAvgSizeInBytes() {
-		return this.priBulkAvgSizeInBytes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.health != null) {
-			generator.writeKey("health");
-			generator.write(this.health);
-
-		}
-		if (this.status != null) {
-			generator.writeKey("status");
-			generator.write(this.status);
-
-		}
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.uuid != null) {
-			generator.writeKey("uuid");
-			generator.write(this.uuid);
-
-		}
-		if (this.pri != null) {
-			generator.writeKey("pri");
-			generator.write(this.pri);
-
-		}
-		if (this.rep != null) {
-			generator.writeKey("rep");
-			generator.write(this.rep);
-
-		}
-		if (this.docsCount != null) {
-			generator.writeKey("docs.count");
-			generator.write(this.docsCount);
-
-		}
-		if (this.docsDeleted != null) {
-			generator.writeKey("docs.deleted");
-			generator.write(this.docsDeleted);
-
-		}
-		if (this.creationDate != null) {
-			generator.writeKey("creation.date");
-			generator.write(this.creationDate);
-
-		}
-		if (this.creationDateString != null) {
-			generator.writeKey("creation.date.string");
-			generator.write(this.creationDateString);
-
-		}
-		if (this.storeSize != null) {
-			generator.writeKey("store.size");
-			generator.write(this.storeSize);
-
-		}
-		if (this.priStoreSize != null) {
-			generator.writeKey("pri.store.size");
-			generator.write(this.priStoreSize);
-
-		}
-		if (this.completionSize != null) {
-			generator.writeKey("completion.size");
-			generator.write(this.completionSize);
-
-		}
-		if (this.priCompletionSize != null) {
-			generator.writeKey("pri.completion.size");
-			generator.write(this.priCompletionSize);
-
-		}
-		if (this.fielddataMemorySize != null) {
-			generator.writeKey("fielddata.memory_size");
-			generator.write(this.fielddataMemorySize);
-
-		}
-		if (this.priFielddataMemorySize != null) {
-			generator.writeKey("pri.fielddata.memory_size");
-			generator.write(this.priFielddataMemorySize);
-
-		}
-		if (this.fielddataEvictions != null) {
-			generator.writeKey("fielddata.evictions");
-			generator.write(this.fielddataEvictions);
-
-		}
-		if (this.priFielddataEvictions != null) {
-			generator.writeKey("pri.fielddata.evictions");
-			generator.write(this.priFielddataEvictions);
-
-		}
-		if (this.queryCacheMemorySize != null) {
-			generator.writeKey("query_cache.memory_size");
-			generator.write(this.queryCacheMemorySize);
-
-		}
-		if (this.priQueryCacheMemorySize != null) {
-			generator.writeKey("pri.query_cache.memory_size");
-			generator.write(this.priQueryCacheMemorySize);
-
-		}
-		if (this.queryCacheEvictions != null) {
-			generator.writeKey("query_cache.evictions");
-			generator.write(this.queryCacheEvictions);
-
-		}
-		if (this.priQueryCacheEvictions != null) {
-			generator.writeKey("pri.query_cache.evictions");
-			generator.write(this.priQueryCacheEvictions);
-
-		}
-		if (this.requestCacheMemorySize != null) {
-			generator.writeKey("request_cache.memory_size");
-			generator.write(this.requestCacheMemorySize);
-
-		}
-		if (this.priRequestCacheMemorySize != null) {
-			generator.writeKey("pri.request_cache.memory_size");
-			generator.write(this.priRequestCacheMemorySize);
-
-		}
-		if (this.requestCacheEvictions != null) {
-			generator.writeKey("request_cache.evictions");
-			generator.write(this.requestCacheEvictions);
-
-		}
-		if (this.priRequestCacheEvictions != null) {
-			generator.writeKey("pri.request_cache.evictions");
-			generator.write(this.priRequestCacheEvictions);
-
-		}
-		if (this.requestCacheHitCount != null) {
-			generator.writeKey("request_cache.hit_count");
-			generator.write(this.requestCacheHitCount);
-
-		}
-		if (this.priRequestCacheHitCount != null) {
-			generator.writeKey("pri.request_cache.hit_count");
-			generator.write(this.priRequestCacheHitCount);
-
-		}
-		if (this.requestCacheMissCount != null) {
-			generator.writeKey("request_cache.miss_count");
-			generator.write(this.requestCacheMissCount);
-
-		}
-		if (this.priRequestCacheMissCount != null) {
-			generator.writeKey("pri.request_cache.miss_count");
-			generator.write(this.priRequestCacheMissCount);
-
-		}
-		if (this.flushTotal != null) {
-			generator.writeKey("flush.total");
-			generator.write(this.flushTotal);
-
-		}
-		if (this.priFlushTotal != null) {
-			generator.writeKey("pri.flush.total");
-			generator.write(this.priFlushTotal);
-
-		}
-		if (this.flushTotalTime != null) {
-			generator.writeKey("flush.total_time");
-			generator.write(this.flushTotalTime);
-
-		}
-		if (this.priFlushTotalTime != null) {
-			generator.writeKey("pri.flush.total_time");
-			generator.write(this.priFlushTotalTime);
-
-		}
-		if (this.getCurrent != null) {
-			generator.writeKey("get.current");
-			generator.write(this.getCurrent);
-
-		}
-		if (this.priGetCurrent != null) {
-			generator.writeKey("pri.get.current");
-			generator.write(this.priGetCurrent);
-
-		}
-		if (this.getTime != null) {
-			generator.writeKey("get.time");
-			generator.write(this.getTime);
-
-		}
-		if (this.priGetTime != null) {
-			generator.writeKey("pri.get.time");
-			generator.write(this.priGetTime);
-
-		}
-		if (this.getTotal != null) {
-			generator.writeKey("get.total");
-			generator.write(this.getTotal);
-
-		}
-		if (this.priGetTotal != null) {
-			generator.writeKey("pri.get.total");
-			generator.write(this.priGetTotal);
-
-		}
-		if (this.getExistsTime != null) {
-			generator.writeKey("get.exists_time");
-			generator.write(this.getExistsTime);
-
-		}
-		if (this.priGetExistsTime != null) {
-			generator.writeKey("pri.get.exists_time");
-			generator.write(this.priGetExistsTime);
-
-		}
-		if (this.getExistsTotal != null) {
-			generator.writeKey("get.exists_total");
-			generator.write(this.getExistsTotal);
-
-		}
-		if (this.priGetExistsTotal != null) {
-			generator.writeKey("pri.get.exists_total");
-			generator.write(this.priGetExistsTotal);
-
-		}
-		if (this.getMissingTime != null) {
-			generator.writeKey("get.missing_time");
-			generator.write(this.getMissingTime);
-
-		}
-		if (this.priGetMissingTime != null) {
-			generator.writeKey("pri.get.missing_time");
-			generator.write(this.priGetMissingTime);
-
-		}
-		if (this.getMissingTotal != null) {
-			generator.writeKey("get.missing_total");
-			generator.write(this.getMissingTotal);
-
-		}
-		if (this.priGetMissingTotal != null) {
-			generator.writeKey("pri.get.missing_total");
-			generator.write(this.priGetMissingTotal);
-
-		}
-		if (this.indexingDeleteCurrent != null) {
-			generator.writeKey("indexing.delete_current");
-			generator.write(this.indexingDeleteCurrent);
-
-		}
-		if (this.priIndexingDeleteCurrent != null) {
-			generator.writeKey("pri.indexing.delete_current");
-			generator.write(this.priIndexingDeleteCurrent);
-
-		}
-		if (this.indexingDeleteTime != null) {
-			generator.writeKey("indexing.delete_time");
-			generator.write(this.indexingDeleteTime);
-
-		}
-		if (this.priIndexingDeleteTime != null) {
-			generator.writeKey("pri.indexing.delete_time");
-			generator.write(this.priIndexingDeleteTime);
-
-		}
-		if (this.indexingDeleteTotal != null) {
-			generator.writeKey("indexing.delete_total");
-			generator.write(this.indexingDeleteTotal);
-
-		}
-		if (this.priIndexingDeleteTotal != null) {
-			generator.writeKey("pri.indexing.delete_total");
-			generator.write(this.priIndexingDeleteTotal);
-
-		}
-		if (this.indexingIndexCurrent != null) {
-			generator.writeKey("indexing.index_current");
-			generator.write(this.indexingIndexCurrent);
-
-		}
-		if (this.priIndexingIndexCurrent != null) {
-			generator.writeKey("pri.indexing.index_current");
-			generator.write(this.priIndexingIndexCurrent);
-
-		}
-		if (this.indexingIndexTime != null) {
-			generator.writeKey("indexing.index_time");
-			generator.write(this.indexingIndexTime);
-
-		}
-		if (this.priIndexingIndexTime != null) {
-			generator.writeKey("pri.indexing.index_time");
-			generator.write(this.priIndexingIndexTime);
-
-		}
-		if (this.indexingIndexTotal != null) {
-			generator.writeKey("indexing.index_total");
-			generator.write(this.indexingIndexTotal);
-
-		}
-		if (this.priIndexingIndexTotal != null) {
-			generator.writeKey("pri.indexing.index_total");
-			generator.write(this.priIndexingIndexTotal);
-
-		}
-		if (this.indexingIndexFailed != null) {
-			generator.writeKey("indexing.index_failed");
-			generator.write(this.indexingIndexFailed);
-
-		}
-		if (this.priIndexingIndexFailed != null) {
-			generator.writeKey("pri.indexing.index_failed");
-			generator.write(this.priIndexingIndexFailed);
-
-		}
-		if (this.mergesCurrent != null) {
-			generator.writeKey("merges.current");
-			generator.write(this.mergesCurrent);
-
-		}
-		if (this.priMergesCurrent != null) {
-			generator.writeKey("pri.merges.current");
-			generator.write(this.priMergesCurrent);
-
-		}
-		if (this.mergesCurrentDocs != null) {
-			generator.writeKey("merges.current_docs");
-			generator.write(this.mergesCurrentDocs);
-
-		}
-		if (this.priMergesCurrentDocs != null) {
-			generator.writeKey("pri.merges.current_docs");
-			generator.write(this.priMergesCurrentDocs);
-
-		}
-		if (this.mergesCurrentSize != null) {
-			generator.writeKey("merges.current_size");
-			generator.write(this.mergesCurrentSize);
-
-		}
-		if (this.priMergesCurrentSize != null) {
-			generator.writeKey("pri.merges.current_size");
-			generator.write(this.priMergesCurrentSize);
-
-		}
-		if (this.mergesTotal != null) {
-			generator.writeKey("merges.total");
-			generator.write(this.mergesTotal);
-
-		}
-		if (this.priMergesTotal != null) {
-			generator.writeKey("pri.merges.total");
-			generator.write(this.priMergesTotal);
-
-		}
-		if (this.mergesTotalDocs != null) {
-			generator.writeKey("merges.total_docs");
-			generator.write(this.mergesTotalDocs);
-
-		}
-		if (this.priMergesTotalDocs != null) {
-			generator.writeKey("pri.merges.total_docs");
-			generator.write(this.priMergesTotalDocs);
-
-		}
-		if (this.mergesTotalSize != null) {
-			generator.writeKey("merges.total_size");
-			generator.write(this.mergesTotalSize);
-
-		}
-		if (this.priMergesTotalSize != null) {
-			generator.writeKey("pri.merges.total_size");
-			generator.write(this.priMergesTotalSize);
-
-		}
-		if (this.mergesTotalTime != null) {
-			generator.writeKey("merges.total_time");
-			generator.write(this.mergesTotalTime);
-
-		}
-		if (this.priMergesTotalTime != null) {
-			generator.writeKey("pri.merges.total_time");
-			generator.write(this.priMergesTotalTime);
-
-		}
-		if (this.refreshTotal != null) {
-			generator.writeKey("refresh.total");
-			generator.write(this.refreshTotal);
-
-		}
-		if (this.priRefreshTotal != null) {
-			generator.writeKey("pri.refresh.total");
-			generator.write(this.priRefreshTotal);
-
-		}
-		if (this.refreshTime != null) {
-			generator.writeKey("refresh.time");
-			generator.write(this.refreshTime);
-
-		}
-		if (this.priRefreshTime != null) {
-			generator.writeKey("pri.refresh.time");
-			generator.write(this.priRefreshTime);
-
-		}
-		if (this.refreshExternalTotal != null) {
-			generator.writeKey("refresh.external_total");
-			generator.write(this.refreshExternalTotal);
-
-		}
-		if (this.priRefreshExternalTotal != null) {
-			generator.writeKey("pri.refresh.external_total");
-			generator.write(this.priRefreshExternalTotal);
-
-		}
-		if (this.refreshExternalTime != null) {
-			generator.writeKey("refresh.external_time");
-			generator.write(this.refreshExternalTime);
-
-		}
-		if (this.priRefreshExternalTime != null) {
-			generator.writeKey("pri.refresh.external_time");
-			generator.write(this.priRefreshExternalTime);
-
-		}
-		if (this.refreshListeners != null) {
-			generator.writeKey("refresh.listeners");
-			generator.write(this.refreshListeners);
-
-		}
-		if (this.priRefreshListeners != null) {
-			generator.writeKey("pri.refresh.listeners");
-			generator.write(this.priRefreshListeners);
-
-		}
-		if (this.searchFetchCurrent != null) {
-			generator.writeKey("search.fetch_current");
-			generator.write(this.searchFetchCurrent);
-
-		}
-		if (this.priSearchFetchCurrent != null) {
-			generator.writeKey("pri.search.fetch_current");
-			generator.write(this.priSearchFetchCurrent);
-
-		}
-		if (this.searchFetchTime != null) {
-			generator.writeKey("search.fetch_time");
-			generator.write(this.searchFetchTime);
-
-		}
-		if (this.priSearchFetchTime != null) {
-			generator.writeKey("pri.search.fetch_time");
-			generator.write(this.priSearchFetchTime);
-
-		}
-		if (this.searchFetchTotal != null) {
-			generator.writeKey("search.fetch_total");
-			generator.write(this.searchFetchTotal);
-
-		}
-		if (this.priSearchFetchTotal != null) {
-			generator.writeKey("pri.search.fetch_total");
-			generator.write(this.priSearchFetchTotal);
-
-		}
-		if (this.searchOpenContexts != null) {
-			generator.writeKey("search.open_contexts");
-			generator.write(this.searchOpenContexts);
-
-		}
-		if (this.priSearchOpenContexts != null) {
-			generator.writeKey("pri.search.open_contexts");
-			generator.write(this.priSearchOpenContexts);
-
-		}
-		if (this.searchQueryCurrent != null) {
-			generator.writeKey("search.query_current");
-			generator.write(this.searchQueryCurrent);
-
-		}
-		if (this.priSearchQueryCurrent != null) {
-			generator.writeKey("pri.search.query_current");
-			generator.write(this.priSearchQueryCurrent);
-
-		}
-		if (this.searchQueryTime != null) {
-			generator.writeKey("search.query_time");
-			generator.write(this.searchQueryTime);
-
-		}
-		if (this.priSearchQueryTime != null) {
-			generator.writeKey("pri.search.query_time");
-			generator.write(this.priSearchQueryTime);
-
-		}
-		if (this.searchQueryTotal != null) {
-			generator.writeKey("search.query_total");
-			generator.write(this.searchQueryTotal);
-
-		}
-		if (this.priSearchQueryTotal != null) {
-			generator.writeKey("pri.search.query_total");
-			generator.write(this.priSearchQueryTotal);
-
-		}
-		if (this.searchScrollCurrent != null) {
-			generator.writeKey("search.scroll_current");
-			generator.write(this.searchScrollCurrent);
-
-		}
-		if (this.priSearchScrollCurrent != null) {
-			generator.writeKey("pri.search.scroll_current");
-			generator.write(this.priSearchScrollCurrent);
-
-		}
-		if (this.searchScrollTime != null) {
-			generator.writeKey("search.scroll_time");
-			generator.write(this.searchScrollTime);
-
-		}
-		if (this.priSearchScrollTime != null) {
-			generator.writeKey("pri.search.scroll_time");
-			generator.write(this.priSearchScrollTime);
-
-		}
-		if (this.searchScrollTotal != null) {
-			generator.writeKey("search.scroll_total");
-			generator.write(this.searchScrollTotal);
-
-		}
-		if (this.priSearchScrollTotal != null) {
-			generator.writeKey("pri.search.scroll_total");
-			generator.write(this.priSearchScrollTotal);
-
-		}
-		if (this.segmentsCount != null) {
-			generator.writeKey("segments.count");
-			generator.write(this.segmentsCount);
-
-		}
-		if (this.priSegmentsCount != null) {
-			generator.writeKey("pri.segments.count");
-			generator.write(this.priSegmentsCount);
-
-		}
-		if (this.segmentsMemory != null) {
-			generator.writeKey("segments.memory");
-			generator.write(this.segmentsMemory);
-
-		}
-		if (this.priSegmentsMemory != null) {
-			generator.writeKey("pri.segments.memory");
-			generator.write(this.priSegmentsMemory);
-
-		}
-		if (this.segmentsIndexWriterMemory != null) {
-			generator.writeKey("segments.index_writer_memory");
-			generator.write(this.segmentsIndexWriterMemory);
-
-		}
-		if (this.priSegmentsIndexWriterMemory != null) {
-			generator.writeKey("pri.segments.index_writer_memory");
-			generator.write(this.priSegmentsIndexWriterMemory);
-
-		}
-		if (this.segmentsVersionMapMemory != null) {
-			generator.writeKey("segments.version_map_memory");
-			generator.write(this.segmentsVersionMapMemory);
-
-		}
-		if (this.priSegmentsVersionMapMemory != null) {
-			generator.writeKey("pri.segments.version_map_memory");
-			generator.write(this.priSegmentsVersionMapMemory);
-
-		}
-		if (this.segmentsFixedBitsetMemory != null) {
-			generator.writeKey("segments.fixed_bitset_memory");
-			generator.write(this.segmentsFixedBitsetMemory);
-
-		}
-		if (this.priSegmentsFixedBitsetMemory != null) {
-			generator.writeKey("pri.segments.fixed_bitset_memory");
-			generator.write(this.priSegmentsFixedBitsetMemory);
-
-		}
-		if (this.warmerCurrent != null) {
-			generator.writeKey("warmer.current");
-			generator.write(this.warmerCurrent);
-
-		}
-		if (this.priWarmerCurrent != null) {
-			generator.writeKey("pri.warmer.current");
-			generator.write(this.priWarmerCurrent);
-
-		}
-		if (this.warmerTotal != null) {
-			generator.writeKey("warmer.total");
-			generator.write(this.warmerTotal);
-
-		}
-		if (this.priWarmerTotal != null) {
-			generator.writeKey("pri.warmer.total");
-			generator.write(this.priWarmerTotal);
-
-		}
-		if (this.warmerTotalTime != null) {
-			generator.writeKey("warmer.total_time");
-			generator.write(this.warmerTotalTime);
-
-		}
-		if (this.priWarmerTotalTime != null) {
-			generator.writeKey("pri.warmer.total_time");
-			generator.write(this.priWarmerTotalTime);
-
-		}
-		if (this.suggestCurrent != null) {
-			generator.writeKey("suggest.current");
-			generator.write(this.suggestCurrent);
-
-		}
-		if (this.priSuggestCurrent != null) {
-			generator.writeKey("pri.suggest.current");
-			generator.write(this.priSuggestCurrent);
-
-		}
-		if (this.suggestTime != null) {
-			generator.writeKey("suggest.time");
-			generator.write(this.suggestTime);
-
-		}
-		if (this.priSuggestTime != null) {
-			generator.writeKey("pri.suggest.time");
-			generator.write(this.priSuggestTime);
-
-		}
-		if (this.suggestTotal != null) {
-			generator.writeKey("suggest.total");
-			generator.write(this.suggestTotal);
-
-		}
-		if (this.priSuggestTotal != null) {
-			generator.writeKey("pri.suggest.total");
-			generator.write(this.priSuggestTotal);
-
-		}
-		if (this.memoryTotal != null) {
-			generator.writeKey("memory.total");
-			generator.write(this.memoryTotal);
-
-		}
-		if (this.priMemoryTotal != null) {
-			generator.writeKey("pri.memory.total");
-			generator.write(this.priMemoryTotal);
-
-		}
-		if (this.searchThrottled != null) {
-			generator.writeKey("search.throttled");
-			generator.write(this.searchThrottled);
-
-		}
-		if (this.bulkTotalOperations != null) {
-			generator.writeKey("bulk.total_operations");
-			generator.write(this.bulkTotalOperations);
-
-		}
-		if (this.priBulkTotalOperations != null) {
-			generator.writeKey("pri.bulk.total_operations");
-			generator.write(this.priBulkTotalOperations);
-
-		}
-		if (this.bulkTotalTime != null) {
-			generator.writeKey("bulk.total_time");
-			generator.write(this.bulkTotalTime);
+    @Nullable
+    private final String priSuggestTotal;
+
+    @Nullable
+    private final String memoryTotal;
+
+    @Nullable
+    private final String priMemoryTotal;
+
+    @Nullable
+    private final String searchThrottled;
+
+    @Nullable
+    private final String bulkTotalOperations;
+
+    @Nullable
+    private final String priBulkTotalOperations;
+
+    @Nullable
+    private final String bulkTotalTime;
+
+    @Nullable
+    private final String priBulkTotalTime;
+
+    @Nullable
+    private final String bulkTotalSizeInBytes;
+
+    @Nullable
+    private final String priBulkTotalSizeInBytes;
+
+    @Nullable
+    private final String bulkAvgTime;
+
+    @Nullable
+    private final String priBulkAvgTime;
+
+    @Nullable
+    private final String bulkAvgSizeInBytes;
+
+    @Nullable
+    private final String priBulkAvgSizeInBytes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndicesRecord(Builder builder) {
+
+        this.health = builder.health;
+        this.status = builder.status;
+        this.index = builder.index;
+        this.uuid = builder.uuid;
+        this.pri = builder.pri;
+        this.rep = builder.rep;
+        this.docsCount = builder.docsCount;
+        this.docsDeleted = builder.docsDeleted;
+        this.creationDate = builder.creationDate;
+        this.creationDateString = builder.creationDateString;
+        this.storeSize = builder.storeSize;
+        this.priStoreSize = builder.priStoreSize;
+        this.completionSize = builder.completionSize;
+        this.priCompletionSize = builder.priCompletionSize;
+        this.fielddataMemorySize = builder.fielddataMemorySize;
+        this.priFielddataMemorySize = builder.priFielddataMemorySize;
+        this.fielddataEvictions = builder.fielddataEvictions;
+        this.priFielddataEvictions = builder.priFielddataEvictions;
+        this.queryCacheMemorySize = builder.queryCacheMemorySize;
+        this.priQueryCacheMemorySize = builder.priQueryCacheMemorySize;
+        this.queryCacheEvictions = builder.queryCacheEvictions;
+        this.priQueryCacheEvictions = builder.priQueryCacheEvictions;
+        this.requestCacheMemorySize = builder.requestCacheMemorySize;
+        this.priRequestCacheMemorySize = builder.priRequestCacheMemorySize;
+        this.requestCacheEvictions = builder.requestCacheEvictions;
+        this.priRequestCacheEvictions = builder.priRequestCacheEvictions;
+        this.requestCacheHitCount = builder.requestCacheHitCount;
+        this.priRequestCacheHitCount = builder.priRequestCacheHitCount;
+        this.requestCacheMissCount = builder.requestCacheMissCount;
+        this.priRequestCacheMissCount = builder.priRequestCacheMissCount;
+        this.flushTotal = builder.flushTotal;
+        this.priFlushTotal = builder.priFlushTotal;
+        this.flushTotalTime = builder.flushTotalTime;
+        this.priFlushTotalTime = builder.priFlushTotalTime;
+        this.getCurrent = builder.getCurrent;
+        this.priGetCurrent = builder.priGetCurrent;
+        this.getTime = builder.getTime;
+        this.priGetTime = builder.priGetTime;
+        this.getTotal = builder.getTotal;
+        this.priGetTotal = builder.priGetTotal;
+        this.getExistsTime = builder.getExistsTime;
+        this.priGetExistsTime = builder.priGetExistsTime;
+        this.getExistsTotal = builder.getExistsTotal;
+        this.priGetExistsTotal = builder.priGetExistsTotal;
+        this.getMissingTime = builder.getMissingTime;
+        this.priGetMissingTime = builder.priGetMissingTime;
+        this.getMissingTotal = builder.getMissingTotal;
+        this.priGetMissingTotal = builder.priGetMissingTotal;
+        this.indexingDeleteCurrent = builder.indexingDeleteCurrent;
+        this.priIndexingDeleteCurrent = builder.priIndexingDeleteCurrent;
+        this.indexingDeleteTime = builder.indexingDeleteTime;
+        this.priIndexingDeleteTime = builder.priIndexingDeleteTime;
+        this.indexingDeleteTotal = builder.indexingDeleteTotal;
+        this.priIndexingDeleteTotal = builder.priIndexingDeleteTotal;
+        this.indexingIndexCurrent = builder.indexingIndexCurrent;
+        this.priIndexingIndexCurrent = builder.priIndexingIndexCurrent;
+        this.indexingIndexTime = builder.indexingIndexTime;
+        this.priIndexingIndexTime = builder.priIndexingIndexTime;
+        this.indexingIndexTotal = builder.indexingIndexTotal;
+        this.priIndexingIndexTotal = builder.priIndexingIndexTotal;
+        this.indexingIndexFailed = builder.indexingIndexFailed;
+        this.priIndexingIndexFailed = builder.priIndexingIndexFailed;
+        this.mergesCurrent = builder.mergesCurrent;
+        this.priMergesCurrent = builder.priMergesCurrent;
+        this.mergesCurrentDocs = builder.mergesCurrentDocs;
+        this.priMergesCurrentDocs = builder.priMergesCurrentDocs;
+        this.mergesCurrentSize = builder.mergesCurrentSize;
+        this.priMergesCurrentSize = builder.priMergesCurrentSize;
+        this.mergesTotal = builder.mergesTotal;
+        this.priMergesTotal = builder.priMergesTotal;
+        this.mergesTotalDocs = builder.mergesTotalDocs;
+        this.priMergesTotalDocs = builder.priMergesTotalDocs;
+        this.mergesTotalSize = builder.mergesTotalSize;
+        this.priMergesTotalSize = builder.priMergesTotalSize;
+        this.mergesTotalTime = builder.mergesTotalTime;
+        this.priMergesTotalTime = builder.priMergesTotalTime;
+        this.refreshTotal = builder.refreshTotal;
+        this.priRefreshTotal = builder.priRefreshTotal;
+        this.refreshTime = builder.refreshTime;
+        this.priRefreshTime = builder.priRefreshTime;
+        this.refreshExternalTotal = builder.refreshExternalTotal;
+        this.priRefreshExternalTotal = builder.priRefreshExternalTotal;
+        this.refreshExternalTime = builder.refreshExternalTime;
+        this.priRefreshExternalTime = builder.priRefreshExternalTime;
+        this.refreshListeners = builder.refreshListeners;
+        this.priRefreshListeners = builder.priRefreshListeners;
+        this.searchFetchCurrent = builder.searchFetchCurrent;
+        this.priSearchFetchCurrent = builder.priSearchFetchCurrent;
+        this.searchFetchTime = builder.searchFetchTime;
+        this.priSearchFetchTime = builder.priSearchFetchTime;
+        this.searchFetchTotal = builder.searchFetchTotal;
+        this.priSearchFetchTotal = builder.priSearchFetchTotal;
+        this.searchOpenContexts = builder.searchOpenContexts;
+        this.priSearchOpenContexts = builder.priSearchOpenContexts;
+        this.searchQueryCurrent = builder.searchQueryCurrent;
+        this.priSearchQueryCurrent = builder.priSearchQueryCurrent;
+        this.searchQueryTime = builder.searchQueryTime;
+        this.priSearchQueryTime = builder.priSearchQueryTime;
+        this.searchQueryTotal = builder.searchQueryTotal;
+        this.priSearchQueryTotal = builder.priSearchQueryTotal;
+        this.searchScrollCurrent = builder.searchScrollCurrent;
+        this.priSearchScrollCurrent = builder.priSearchScrollCurrent;
+        this.searchScrollTime = builder.searchScrollTime;
+        this.priSearchScrollTime = builder.priSearchScrollTime;
+        this.searchScrollTotal = builder.searchScrollTotal;
+        this.priSearchScrollTotal = builder.priSearchScrollTotal;
+        this.segmentsCount = builder.segmentsCount;
+        this.priSegmentsCount = builder.priSegmentsCount;
+        this.segmentsMemory = builder.segmentsMemory;
+        this.priSegmentsMemory = builder.priSegmentsMemory;
+        this.segmentsIndexWriterMemory = builder.segmentsIndexWriterMemory;
+        this.priSegmentsIndexWriterMemory = builder.priSegmentsIndexWriterMemory;
+        this.segmentsVersionMapMemory = builder.segmentsVersionMapMemory;
+        this.priSegmentsVersionMapMemory = builder.priSegmentsVersionMapMemory;
+        this.segmentsFixedBitsetMemory = builder.segmentsFixedBitsetMemory;
+        this.priSegmentsFixedBitsetMemory = builder.priSegmentsFixedBitsetMemory;
+        this.warmerCurrent = builder.warmerCurrent;
+        this.priWarmerCurrent = builder.priWarmerCurrent;
+        this.warmerTotal = builder.warmerTotal;
+        this.priWarmerTotal = builder.priWarmerTotal;
+        this.warmerTotalTime = builder.warmerTotalTime;
+        this.priWarmerTotalTime = builder.priWarmerTotalTime;
+        this.suggestCurrent = builder.suggestCurrent;
+        this.priSuggestCurrent = builder.priSuggestCurrent;
+        this.suggestTime = builder.suggestTime;
+        this.priSuggestTime = builder.priSuggestTime;
+        this.suggestTotal = builder.suggestTotal;
+        this.priSuggestTotal = builder.priSuggestTotal;
+        this.memoryTotal = builder.memoryTotal;
+        this.priMemoryTotal = builder.priMemoryTotal;
+        this.searchThrottled = builder.searchThrottled;
+        this.bulkTotalOperations = builder.bulkTotalOperations;
+        this.priBulkTotalOperations = builder.priBulkTotalOperations;
+        this.bulkTotalTime = builder.bulkTotalTime;
+        this.priBulkTotalTime = builder.priBulkTotalTime;
+        this.bulkTotalSizeInBytes = builder.bulkTotalSizeInBytes;
+        this.priBulkTotalSizeInBytes = builder.priBulkTotalSizeInBytes;
+        this.bulkAvgTime = builder.bulkAvgTime;
+        this.priBulkAvgTime = builder.priBulkAvgTime;
+        this.bulkAvgSizeInBytes = builder.bulkAvgSizeInBytes;
+        this.priBulkAvgSizeInBytes = builder.priBulkAvgSizeInBytes;
+
+    }
+
+    public static IndicesRecord of(Function<Builder, ObjectBuilder<IndicesRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * current health status
+     * <p>
+     * API name: {@code health}
+     */
+    @Nullable
+    public final String health() {
+        return this.health;
+    }
+
+    /**
+     * open/close status
+     * <p>
+     * API name: {@code status}
+     */
+    @Nullable
+    public final String status() {
+        return this.status;
+    }
+
+    /**
+     * index name
+     * <p>
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * index uuid
+     * <p>
+     * API name: {@code uuid}
+     */
+    @Nullable
+    public final String uuid() {
+        return this.uuid;
+    }
+
+    /**
+     * number of primary shards
+     * <p>
+     * API name: {@code pri}
+     */
+    @Nullable
+    public final String pri() {
+        return this.pri;
+    }
+
+    /**
+     * number of replica shards
+     * <p>
+     * API name: {@code rep}
+     */
+    @Nullable
+    public final String rep() {
+        return this.rep;
+    }
+
+    /**
+     * available docs
+     * <p>
+     * API name: {@code docs.count}
+     */
+    @Nullable
+    public final String docsCount() {
+        return this.docsCount;
+    }
+
+    /**
+     * deleted docs
+     * <p>
+     * API name: {@code docs.deleted}
+     */
+    @Nullable
+    public final String docsDeleted() {
+        return this.docsDeleted;
+    }
+
+    /**
+     * index creation date (millisecond value)
+     * <p>
+     * API name: {@code creation.date}
+     */
+    @Nullable
+    public final String creationDate() {
+        return this.creationDate;
+    }
+
+    /**
+     * index creation date (as string)
+     * <p>
+     * API name: {@code creation.date.string}
+     */
+    @Nullable
+    public final String creationDateString() {
+        return this.creationDateString;
+    }
+
+    /**
+     * store size of primaries &amp; replicas
+     * <p>
+     * API name: {@code store.size}
+     */
+    @Nullable
+    public final String storeSize() {
+        return this.storeSize;
+    }
+
+    /**
+     * store size of primaries
+     * <p>
+     * API name: {@code pri.store.size}
+     */
+    @Nullable
+    public final String priStoreSize() {
+        return this.priStoreSize;
+    }
+
+    /**
+     * size of completion
+     * <p>
+     * API name: {@code completion.size}
+     */
+    @Nullable
+    public final String completionSize() {
+        return this.completionSize;
+    }
+
+    /**
+     * size of completion
+     * <p>
+     * API name: {@code pri.completion.size}
+     */
+    @Nullable
+    public final String priCompletionSize() {
+        return this.priCompletionSize;
+    }
+
+    /**
+     * used fielddata cache
+     * <p>
+     * API name: {@code fielddata.memory_size}
+     */
+    @Nullable
+    public final String fielddataMemorySize() {
+        return this.fielddataMemorySize;
+    }
+
+    /**
+     * used fielddata cache
+     * <p>
+     * API name: {@code pri.fielddata.memory_size}
+     */
+    @Nullable
+    public final String priFielddataMemorySize() {
+        return this.priFielddataMemorySize;
+    }
+
+    /**
+     * fielddata evictions
+     * <p>
+     * API name: {@code fielddata.evictions}
+     */
+    @Nullable
+    public final String fielddataEvictions() {
+        return this.fielddataEvictions;
+    }
+
+    /**
+     * fielddata evictions
+     * <p>
+     * API name: {@code pri.fielddata.evictions}
+     */
+    @Nullable
+    public final String priFielddataEvictions() {
+        return this.priFielddataEvictions;
+    }
+
+    /**
+     * used query cache
+     * <p>
+     * API name: {@code query_cache.memory_size}
+     */
+    @Nullable
+    public final String queryCacheMemorySize() {
+        return this.queryCacheMemorySize;
+    }
+
+    /**
+     * used query cache
+     * <p>
+     * API name: {@code pri.query_cache.memory_size}
+     */
+    @Nullable
+    public final String priQueryCacheMemorySize() {
+        return this.priQueryCacheMemorySize;
+    }
+
+    /**
+     * query cache evictions
+     * <p>
+     * API name: {@code query_cache.evictions}
+     */
+    @Nullable
+    public final String queryCacheEvictions() {
+        return this.queryCacheEvictions;
+    }
+
+    /**
+     * query cache evictions
+     * <p>
+     * API name: {@code pri.query_cache.evictions}
+     */
+    @Nullable
+    public final String priQueryCacheEvictions() {
+        return this.priQueryCacheEvictions;
+    }
+
+    /**
+     * used request cache
+     * <p>
+     * API name: {@code request_cache.memory_size}
+     */
+    @Nullable
+    public final String requestCacheMemorySize() {
+        return this.requestCacheMemorySize;
+    }
+
+    /**
+     * used request cache
+     * <p>
+     * API name: {@code pri.request_cache.memory_size}
+     */
+    @Nullable
+    public final String priRequestCacheMemorySize() {
+        return this.priRequestCacheMemorySize;
+    }
+
+    /**
+     * request cache evictions
+     * <p>
+     * API name: {@code request_cache.evictions}
+     */
+    @Nullable
+    public final String requestCacheEvictions() {
+        return this.requestCacheEvictions;
+    }
+
+    /**
+     * request cache evictions
+     * <p>
+     * API name: {@code pri.request_cache.evictions}
+     */
+    @Nullable
+    public final String priRequestCacheEvictions() {
+        return this.priRequestCacheEvictions;
+    }
+
+    /**
+     * request cache hit count
+     * <p>
+     * API name: {@code request_cache.hit_count}
+     */
+    @Nullable
+    public final String requestCacheHitCount() {
+        return this.requestCacheHitCount;
+    }
+
+    /**
+     * request cache hit count
+     * <p>
+     * API name: {@code pri.request_cache.hit_count}
+     */
+    @Nullable
+    public final String priRequestCacheHitCount() {
+        return this.priRequestCacheHitCount;
+    }
+
+    /**
+     * request cache miss count
+     * <p>
+     * API name: {@code request_cache.miss_count}
+     */
+    @Nullable
+    public final String requestCacheMissCount() {
+        return this.requestCacheMissCount;
+    }
+
+    /**
+     * request cache miss count
+     * <p>
+     * API name: {@code pri.request_cache.miss_count}
+     */
+    @Nullable
+    public final String priRequestCacheMissCount() {
+        return this.priRequestCacheMissCount;
+    }
+
+    /**
+     * number of flushes
+     * <p>
+     * API name: {@code flush.total}
+     */
+    @Nullable
+    public final String flushTotal() {
+        return this.flushTotal;
+    }
+
+    /**
+     * number of flushes
+     * <p>
+     * API name: {@code pri.flush.total}
+     */
+    @Nullable
+    public final String priFlushTotal() {
+        return this.priFlushTotal;
+    }
+
+    /**
+     * time spent in flush
+     * <p>
+     * API name: {@code flush.total_time}
+     */
+    @Nullable
+    public final String flushTotalTime() {
+        return this.flushTotalTime;
+    }
+
+    /**
+     * time spent in flush
+     * <p>
+     * API name: {@code pri.flush.total_time}
+     */
+    @Nullable
+    public final String priFlushTotalTime() {
+        return this.priFlushTotalTime;
+    }
+
+    /**
+     * number of current get ops
+     * <p>
+     * API name: {@code get.current}
+     */
+    @Nullable
+    public final String getCurrent() {
+        return this.getCurrent;
+    }
+
+    /**
+     * number of current get ops
+     * <p>
+     * API name: {@code pri.get.current}
+     */
+    @Nullable
+    public final String priGetCurrent() {
+        return this.priGetCurrent;
+    }
+
+    /**
+     * time spent in get
+     * <p>
+     * API name: {@code get.time}
+     */
+    @Nullable
+    public final String getTime() {
+        return this.getTime;
+    }
+
+    /**
+     * time spent in get
+     * <p>
+     * API name: {@code pri.get.time}
+     */
+    @Nullable
+    public final String priGetTime() {
+        return this.priGetTime;
+    }
+
+    /**
+     * number of get ops
+     * <p>
+     * API name: {@code get.total}
+     */
+    @Nullable
+    public final String getTotal() {
+        return this.getTotal;
+    }
+
+    /**
+     * number of get ops
+     * <p>
+     * API name: {@code pri.get.total}
+     */
+    @Nullable
+    public final String priGetTotal() {
+        return this.priGetTotal;
+    }
+
+    /**
+     * time spent in successful gets
+     * <p>
+     * API name: {@code get.exists_time}
+     */
+    @Nullable
+    public final String getExistsTime() {
+        return this.getExistsTime;
+    }
+
+    /**
+     * time spent in successful gets
+     * <p>
+     * API name: {@code pri.get.exists_time}
+     */
+    @Nullable
+    public final String priGetExistsTime() {
+        return this.priGetExistsTime;
+    }
+
+    /**
+     * number of successful gets
+     * <p>
+     * API name: {@code get.exists_total}
+     */
+    @Nullable
+    public final String getExistsTotal() {
+        return this.getExistsTotal;
+    }
+
+    /**
+     * number of successful gets
+     * <p>
+     * API name: {@code pri.get.exists_total}
+     */
+    @Nullable
+    public final String priGetExistsTotal() {
+        return this.priGetExistsTotal;
+    }
+
+    /**
+     * time spent in failed gets
+     * <p>
+     * API name: {@code get.missing_time}
+     */
+    @Nullable
+    public final String getMissingTime() {
+        return this.getMissingTime;
+    }
+
+    /**
+     * time spent in failed gets
+     * <p>
+     * API name: {@code pri.get.missing_time}
+     */
+    @Nullable
+    public final String priGetMissingTime() {
+        return this.priGetMissingTime;
+    }
+
+    /**
+     * number of failed gets
+     * <p>
+     * API name: {@code get.missing_total}
+     */
+    @Nullable
+    public final String getMissingTotal() {
+        return this.getMissingTotal;
+    }
+
+    /**
+     * number of failed gets
+     * <p>
+     * API name: {@code pri.get.missing_total}
+     */
+    @Nullable
+    public final String priGetMissingTotal() {
+        return this.priGetMissingTotal;
+    }
+
+    /**
+     * number of current deletions
+     * <p>
+     * API name: {@code indexing.delete_current}
+     */
+    @Nullable
+    public final String indexingDeleteCurrent() {
+        return this.indexingDeleteCurrent;
+    }
+
+    /**
+     * number of current deletions
+     * <p>
+     * API name: {@code pri.indexing.delete_current}
+     */
+    @Nullable
+    public final String priIndexingDeleteCurrent() {
+        return this.priIndexingDeleteCurrent;
+    }
+
+    /**
+     * time spent in deletions
+     * <p>
+     * API name: {@code indexing.delete_time}
+     */
+    @Nullable
+    public final String indexingDeleteTime() {
+        return this.indexingDeleteTime;
+    }
+
+    /**
+     * time spent in deletions
+     * <p>
+     * API name: {@code pri.indexing.delete_time}
+     */
+    @Nullable
+    public final String priIndexingDeleteTime() {
+        return this.priIndexingDeleteTime;
+    }
+
+    /**
+     * number of delete ops
+     * <p>
+     * API name: {@code indexing.delete_total}
+     */
+    @Nullable
+    public final String indexingDeleteTotal() {
+        return this.indexingDeleteTotal;
+    }
+
+    /**
+     * number of delete ops
+     * <p>
+     * API name: {@code pri.indexing.delete_total}
+     */
+    @Nullable
+    public final String priIndexingDeleteTotal() {
+        return this.priIndexingDeleteTotal;
+    }
+
+    /**
+     * number of current indexing ops
+     * <p>
+     * API name: {@code indexing.index_current}
+     */
+    @Nullable
+    public final String indexingIndexCurrent() {
+        return this.indexingIndexCurrent;
+    }
+
+    /**
+     * number of current indexing ops
+     * <p>
+     * API name: {@code pri.indexing.index_current}
+     */
+    @Nullable
+    public final String priIndexingIndexCurrent() {
+        return this.priIndexingIndexCurrent;
+    }
+
+    /**
+     * time spent in indexing
+     * <p>
+     * API name: {@code indexing.index_time}
+     */
+    @Nullable
+    public final String indexingIndexTime() {
+        return this.indexingIndexTime;
+    }
+
+    /**
+     * time spent in indexing
+     * <p>
+     * API name: {@code pri.indexing.index_time}
+     */
+    @Nullable
+    public final String priIndexingIndexTime() {
+        return this.priIndexingIndexTime;
+    }
+
+    /**
+     * number of indexing ops
+     * <p>
+     * API name: {@code indexing.index_total}
+     */
+    @Nullable
+    public final String indexingIndexTotal() {
+        return this.indexingIndexTotal;
+    }
+
+    /**
+     * number of indexing ops
+     * <p>
+     * API name: {@code pri.indexing.index_total}
+     */
+    @Nullable
+    public final String priIndexingIndexTotal() {
+        return this.priIndexingIndexTotal;
+    }
+
+    /**
+     * number of failed indexing ops
+     * <p>
+     * API name: {@code indexing.index_failed}
+     */
+    @Nullable
+    public final String indexingIndexFailed() {
+        return this.indexingIndexFailed;
+    }
+
+    /**
+     * number of failed indexing ops
+     * <p>
+     * API name: {@code pri.indexing.index_failed}
+     */
+    @Nullable
+    public final String priIndexingIndexFailed() {
+        return this.priIndexingIndexFailed;
+    }
+
+    /**
+     * number of current merges
+     * <p>
+     * API name: {@code merges.current}
+     */
+    @Nullable
+    public final String mergesCurrent() {
+        return this.mergesCurrent;
+    }
+
+    /**
+     * number of current merges
+     * <p>
+     * API name: {@code pri.merges.current}
+     */
+    @Nullable
+    public final String priMergesCurrent() {
+        return this.priMergesCurrent;
+    }
+
+    /**
+     * number of current merging docs
+     * <p>
+     * API name: {@code merges.current_docs}
+     */
+    @Nullable
+    public final String mergesCurrentDocs() {
+        return this.mergesCurrentDocs;
+    }
+
+    /**
+     * number of current merging docs
+     * <p>
+     * API name: {@code pri.merges.current_docs}
+     */
+    @Nullable
+    public final String priMergesCurrentDocs() {
+        return this.priMergesCurrentDocs;
+    }
+
+    /**
+     * size of current merges
+     * <p>
+     * API name: {@code merges.current_size}
+     */
+    @Nullable
+    public final String mergesCurrentSize() {
+        return this.mergesCurrentSize;
+    }
+
+    /**
+     * size of current merges
+     * <p>
+     * API name: {@code pri.merges.current_size}
+     */
+    @Nullable
+    public final String priMergesCurrentSize() {
+        return this.priMergesCurrentSize;
+    }
+
+    /**
+     * number of completed merge ops
+     * <p>
+     * API name: {@code merges.total}
+     */
+    @Nullable
+    public final String mergesTotal() {
+        return this.mergesTotal;
+    }
+
+    /**
+     * number of completed merge ops
+     * <p>
+     * API name: {@code pri.merges.total}
+     */
+    @Nullable
+    public final String priMergesTotal() {
+        return this.priMergesTotal;
+    }
+
+    /**
+     * docs merged
+     * <p>
+     * API name: {@code merges.total_docs}
+     */
+    @Nullable
+    public final String mergesTotalDocs() {
+        return this.mergesTotalDocs;
+    }
+
+    /**
+     * docs merged
+     * <p>
+     * API name: {@code pri.merges.total_docs}
+     */
+    @Nullable
+    public final String priMergesTotalDocs() {
+        return this.priMergesTotalDocs;
+    }
+
+    /**
+     * size merged
+     * <p>
+     * API name: {@code merges.total_size}
+     */
+    @Nullable
+    public final String mergesTotalSize() {
+        return this.mergesTotalSize;
+    }
+
+    /**
+     * size merged
+     * <p>
+     * API name: {@code pri.merges.total_size}
+     */
+    @Nullable
+    public final String priMergesTotalSize() {
+        return this.priMergesTotalSize;
+    }
+
+    /**
+     * time spent in merges
+     * <p>
+     * API name: {@code merges.total_time}
+     */
+    @Nullable
+    public final String mergesTotalTime() {
+        return this.mergesTotalTime;
+    }
+
+    /**
+     * time spent in merges
+     * <p>
+     * API name: {@code pri.merges.total_time}
+     */
+    @Nullable
+    public final String priMergesTotalTime() {
+        return this.priMergesTotalTime;
+    }
+
+    /**
+     * total refreshes
+     * <p>
+     * API name: {@code refresh.total}
+     */
+    @Nullable
+    public final String refreshTotal() {
+        return this.refreshTotal;
+    }
+
+    /**
+     * total refreshes
+     * <p>
+     * API name: {@code pri.refresh.total}
+     */
+    @Nullable
+    public final String priRefreshTotal() {
+        return this.priRefreshTotal;
+    }
+
+    /**
+     * time spent in refreshes
+     * <p>
+     * API name: {@code refresh.time}
+     */
+    @Nullable
+    public final String refreshTime() {
+        return this.refreshTime;
+    }
+
+    /**
+     * time spent in refreshes
+     * <p>
+     * API name: {@code pri.refresh.time}
+     */
+    @Nullable
+    public final String priRefreshTime() {
+        return this.priRefreshTime;
+    }
+
+    /**
+     * total external refreshes
+     * <p>
+     * API name: {@code refresh.external_total}
+     */
+    @Nullable
+    public final String refreshExternalTotal() {
+        return this.refreshExternalTotal;
+    }
+
+    /**
+     * total external refreshes
+     * <p>
+     * API name: {@code pri.refresh.external_total}
+     */
+    @Nullable
+    public final String priRefreshExternalTotal() {
+        return this.priRefreshExternalTotal;
+    }
+
+    /**
+     * time spent in external refreshes
+     * <p>
+     * API name: {@code refresh.external_time}
+     */
+    @Nullable
+    public final String refreshExternalTime() {
+        return this.refreshExternalTime;
+    }
+
+    /**
+     * time spent in external refreshes
+     * <p>
+     * API name: {@code pri.refresh.external_time}
+     */
+    @Nullable
+    public final String priRefreshExternalTime() {
+        return this.priRefreshExternalTime;
+    }
+
+    /**
+     * number of pending refresh listeners
+     * <p>
+     * API name: {@code refresh.listeners}
+     */
+    @Nullable
+    public final String refreshListeners() {
+        return this.refreshListeners;
+    }
+
+    /**
+     * number of pending refresh listeners
+     * <p>
+     * API name: {@code pri.refresh.listeners}
+     */
+    @Nullable
+    public final String priRefreshListeners() {
+        return this.priRefreshListeners;
+    }
+
+    /**
+     * current fetch phase ops
+     * <p>
+     * API name: {@code search.fetch_current}
+     */
+    @Nullable
+    public final String searchFetchCurrent() {
+        return this.searchFetchCurrent;
+    }
+
+    /**
+     * current fetch phase ops
+     * <p>
+     * API name: {@code pri.search.fetch_current}
+     */
+    @Nullable
+    public final String priSearchFetchCurrent() {
+        return this.priSearchFetchCurrent;
+    }
+
+    /**
+     * time spent in fetch phase
+     * <p>
+     * API name: {@code search.fetch_time}
+     */
+    @Nullable
+    public final String searchFetchTime() {
+        return this.searchFetchTime;
+    }
+
+    /**
+     * time spent in fetch phase
+     * <p>
+     * API name: {@code pri.search.fetch_time}
+     */
+    @Nullable
+    public final String priSearchFetchTime() {
+        return this.priSearchFetchTime;
+    }
+
+    /**
+     * total fetch ops
+     * <p>
+     * API name: {@code search.fetch_total}
+     */
+    @Nullable
+    public final String searchFetchTotal() {
+        return this.searchFetchTotal;
+    }
+
+    /**
+     * total fetch ops
+     * <p>
+     * API name: {@code pri.search.fetch_total}
+     */
+    @Nullable
+    public final String priSearchFetchTotal() {
+        return this.priSearchFetchTotal;
+    }
+
+    /**
+     * open search contexts
+     * <p>
+     * API name: {@code search.open_contexts}
+     */
+    @Nullable
+    public final String searchOpenContexts() {
+        return this.searchOpenContexts;
+    }
+
+    /**
+     * open search contexts
+     * <p>
+     * API name: {@code pri.search.open_contexts}
+     */
+    @Nullable
+    public final String priSearchOpenContexts() {
+        return this.priSearchOpenContexts;
+    }
+
+    /**
+     * current query phase ops
+     * <p>
+     * API name: {@code search.query_current}
+     */
+    @Nullable
+    public final String searchQueryCurrent() {
+        return this.searchQueryCurrent;
+    }
+
+    /**
+     * current query phase ops
+     * <p>
+     * API name: {@code pri.search.query_current}
+     */
+    @Nullable
+    public final String priSearchQueryCurrent() {
+        return this.priSearchQueryCurrent;
+    }
+
+    /**
+     * time spent in query phase
+     * <p>
+     * API name: {@code search.query_time}
+     */
+    @Nullable
+    public final String searchQueryTime() {
+        return this.searchQueryTime;
+    }
+
+    /**
+     * time spent in query phase
+     * <p>
+     * API name: {@code pri.search.query_time}
+     */
+    @Nullable
+    public final String priSearchQueryTime() {
+        return this.priSearchQueryTime;
+    }
+
+    /**
+     * total query phase ops
+     * <p>
+     * API name: {@code search.query_total}
+     */
+    @Nullable
+    public final String searchQueryTotal() {
+        return this.searchQueryTotal;
+    }
+
+    /**
+     * total query phase ops
+     * <p>
+     * API name: {@code pri.search.query_total}
+     */
+    @Nullable
+    public final String priSearchQueryTotal() {
+        return this.priSearchQueryTotal;
+    }
+
+    /**
+     * open scroll contexts
+     * <p>
+     * API name: {@code search.scroll_current}
+     */
+    @Nullable
+    public final String searchScrollCurrent() {
+        return this.searchScrollCurrent;
+    }
+
+    /**
+     * open scroll contexts
+     * <p>
+     * API name: {@code pri.search.scroll_current}
+     */
+    @Nullable
+    public final String priSearchScrollCurrent() {
+        return this.priSearchScrollCurrent;
+    }
+
+    /**
+     * time scroll contexts held open
+     * <p>
+     * API name: {@code search.scroll_time}
+     */
+    @Nullable
+    public final String searchScrollTime() {
+        return this.searchScrollTime;
+    }
+
+    /**
+     * time scroll contexts held open
+     * <p>
+     * API name: {@code pri.search.scroll_time}
+     */
+    @Nullable
+    public final String priSearchScrollTime() {
+        return this.priSearchScrollTime;
+    }
+
+    /**
+     * completed scroll contexts
+     * <p>
+     * API name: {@code search.scroll_total}
+     */
+    @Nullable
+    public final String searchScrollTotal() {
+        return this.searchScrollTotal;
+    }
+
+    /**
+     * completed scroll contexts
+     * <p>
+     * API name: {@code pri.search.scroll_total}
+     */
+    @Nullable
+    public final String priSearchScrollTotal() {
+        return this.priSearchScrollTotal;
+    }
+
+    /**
+     * number of segments
+     * <p>
+     * API name: {@code segments.count}
+     */
+    @Nullable
+    public final String segmentsCount() {
+        return this.segmentsCount;
+    }
+
+    /**
+     * number of segments
+     * <p>
+     * API name: {@code pri.segments.count}
+     */
+    @Nullable
+    public final String priSegmentsCount() {
+        return this.priSegmentsCount;
+    }
+
+    /**
+     * memory used by segments
+     * <p>
+     * API name: {@code segments.memory}
+     */
+    @Nullable
+    public final String segmentsMemory() {
+        return this.segmentsMemory;
+    }
+
+    /**
+     * memory used by segments
+     * <p>
+     * API name: {@code pri.segments.memory}
+     */
+    @Nullable
+    public final String priSegmentsMemory() {
+        return this.priSegmentsMemory;
+    }
+
+    /**
+     * memory used by index writer
+     * <p>
+     * API name: {@code segments.index_writer_memory}
+     */
+    @Nullable
+    public final String segmentsIndexWriterMemory() {
+        return this.segmentsIndexWriterMemory;
+    }
+
+    /**
+     * memory used by index writer
+     * <p>
+     * API name: {@code pri.segments.index_writer_memory}
+     */
+    @Nullable
+    public final String priSegmentsIndexWriterMemory() {
+        return this.priSegmentsIndexWriterMemory;
+    }
+
+    /**
+     * memory used by version map
+     * <p>
+     * API name: {@code segments.version_map_memory}
+     */
+    @Nullable
+    public final String segmentsVersionMapMemory() {
+        return this.segmentsVersionMapMemory;
+    }
+
+    /**
+     * memory used by version map
+     * <p>
+     * API name: {@code pri.segments.version_map_memory}
+     */
+    @Nullable
+    public final String priSegmentsVersionMapMemory() {
+        return this.priSegmentsVersionMapMemory;
+    }
+
+    /**
+     * memory used by fixed bit sets for nested object field types and export type
+     * filters for types referred in _parent fields
+     * <p>
+     * API name: {@code segments.fixed_bitset_memory}
+     */
+    @Nullable
+    public final String segmentsFixedBitsetMemory() {
+        return this.segmentsFixedBitsetMemory;
+    }
+
+    /**
+     * memory used by fixed bit sets for nested object field types and export type
+     * filters for types referred in _parent fields
+     * <p>
+     * API name: {@code pri.segments.fixed_bitset_memory}
+     */
+    @Nullable
+    public final String priSegmentsFixedBitsetMemory() {
+        return this.priSegmentsFixedBitsetMemory;
+    }
+
+    /**
+     * current warmer ops
+     * <p>
+     * API name: {@code warmer.current}
+     */
+    @Nullable
+    public final String warmerCurrent() {
+        return this.warmerCurrent;
+    }
+
+    /**
+     * current warmer ops
+     * <p>
+     * API name: {@code pri.warmer.current}
+     */
+    @Nullable
+    public final String priWarmerCurrent() {
+        return this.priWarmerCurrent;
+    }
+
+    /**
+     * total warmer ops
+     * <p>
+     * API name: {@code warmer.total}
+     */
+    @Nullable
+    public final String warmerTotal() {
+        return this.warmerTotal;
+    }
+
+    /**
+     * total warmer ops
+     * <p>
+     * API name: {@code pri.warmer.total}
+     */
+    @Nullable
+    public final String priWarmerTotal() {
+        return this.priWarmerTotal;
+    }
+
+    /**
+     * time spent in warmers
+     * <p>
+     * API name: {@code warmer.total_time}
+     */
+    @Nullable
+    public final String warmerTotalTime() {
+        return this.warmerTotalTime;
+    }
+
+    /**
+     * time spent in warmers
+     * <p>
+     * API name: {@code pri.warmer.total_time}
+     */
+    @Nullable
+    public final String priWarmerTotalTime() {
+        return this.priWarmerTotalTime;
+    }
+
+    /**
+     * number of current suggest ops
+     * <p>
+     * API name: {@code suggest.current}
+     */
+    @Nullable
+    public final String suggestCurrent() {
+        return this.suggestCurrent;
+    }
+
+    /**
+     * number of current suggest ops
+     * <p>
+     * API name: {@code pri.suggest.current}
+     */
+    @Nullable
+    public final String priSuggestCurrent() {
+        return this.priSuggestCurrent;
+    }
+
+    /**
+     * time spend in suggest
+     * <p>
+     * API name: {@code suggest.time}
+     */
+    @Nullable
+    public final String suggestTime() {
+        return this.suggestTime;
+    }
+
+    /**
+     * time spend in suggest
+     * <p>
+     * API name: {@code pri.suggest.time}
+     */
+    @Nullable
+    public final String priSuggestTime() {
+        return this.priSuggestTime;
+    }
+
+    /**
+     * number of suggest ops
+     * <p>
+     * API name: {@code suggest.total}
+     */
+    @Nullable
+    public final String suggestTotal() {
+        return this.suggestTotal;
+    }
+
+    /**
+     * number of suggest ops
+     * <p>
+     * API name: {@code pri.suggest.total}
+     */
+    @Nullable
+    public final String priSuggestTotal() {
+        return this.priSuggestTotal;
+    }
+
+    /**
+     * total used memory
+     * <p>
+     * API name: {@code memory.total}
+     */
+    @Nullable
+    public final String memoryTotal() {
+        return this.memoryTotal;
+    }
+
+    /**
+     * total user memory
+     * <p>
+     * API name: {@code pri.memory.total}
+     */
+    @Nullable
+    public final String priMemoryTotal() {
+        return this.priMemoryTotal;
+    }
+
+    /**
+     * indicates if the index is search throttled
+     * <p>
+     * API name: {@code search.throttled}
+     */
+    @Nullable
+    public final String searchThrottled() {
+        return this.searchThrottled;
+    }
+
+    /**
+     * number of bulk shard ops
+     * <p>
+     * API name: {@code bulk.total_operations}
+     */
+    @Nullable
+    public final String bulkTotalOperations() {
+        return this.bulkTotalOperations;
+    }
+
+    /**
+     * number of bulk shard ops
+     * <p>
+     * API name: {@code pri.bulk.total_operations}
+     */
+    @Nullable
+    public final String priBulkTotalOperations() {
+        return this.priBulkTotalOperations;
+    }
+
+    /**
+     * time spend in shard bulk
+     * <p>
+     * API name: {@code bulk.total_time}
+     */
+    @Nullable
+    public final String bulkTotalTime() {
+        return this.bulkTotalTime;
+    }
+
+    /**
+     * time spend in shard bulk
+     * <p>
+     * API name: {@code pri.bulk.total_time}
+     */
+    @Nullable
+    public final String priBulkTotalTime() {
+        return this.priBulkTotalTime;
+    }
+
+    /**
+     * total size in bytes of shard bulk
+     * <p>
+     * API name: {@code bulk.total_size_in_bytes}
+     */
+    @Nullable
+    public final String bulkTotalSizeInBytes() {
+        return this.bulkTotalSizeInBytes;
+    }
+
+    /**
+     * total size in bytes of shard bulk
+     * <p>
+     * API name: {@code pri.bulk.total_size_in_bytes}
+     */
+    @Nullable
+    public final String priBulkTotalSizeInBytes() {
+        return this.priBulkTotalSizeInBytes;
+    }
+
+    /**
+     * average time spend in shard bulk
+     * <p>
+     * API name: {@code bulk.avg_time}
+     */
+    @Nullable
+    public final String bulkAvgTime() {
+        return this.bulkAvgTime;
+    }
+
+    /**
+     * average time spend in shard bulk
+     * <p>
+     * API name: {@code pri.bulk.avg_time}
+     */
+    @Nullable
+    public final String priBulkAvgTime() {
+        return this.priBulkAvgTime;
+    }
+
+    /**
+     * average size in bytes of shard bulk
+     * <p>
+     * API name: {@code bulk.avg_size_in_bytes}
+     */
+    @Nullable
+    public final String bulkAvgSizeInBytes() {
+        return this.bulkAvgSizeInBytes;
+    }
+
+    /**
+     * average size in bytes of shard bulk
+     * <p>
+     * API name: {@code pri.bulk.avg_size_in_bytes}
+     */
+    @Nullable
+    public final String priBulkAvgSizeInBytes() {
+        return this.priBulkAvgSizeInBytes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.health != null) {
+            generator.writeKey("health");
+            generator.write(this.health);
+
+        }
+        if (this.status != null) {
+            generator.writeKey("status");
+            generator.write(this.status);
+
+        }
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.uuid != null) {
+            generator.writeKey("uuid");
+            generator.write(this.uuid);
+
+        }
+        if (this.pri != null) {
+            generator.writeKey("pri");
+            generator.write(this.pri);
+
+        }
+        if (this.rep != null) {
+            generator.writeKey("rep");
+            generator.write(this.rep);
+
+        }
+        if (this.docsCount != null) {
+            generator.writeKey("docs.count");
+            generator.write(this.docsCount);
+
+        }
+        if (this.docsDeleted != null) {
+            generator.writeKey("docs.deleted");
+            generator.write(this.docsDeleted);
+
+        }
+        if (this.creationDate != null) {
+            generator.writeKey("creation.date");
+            generator.write(this.creationDate);
+
+        }
+        if (this.creationDateString != null) {
+            generator.writeKey("creation.date.string");
+            generator.write(this.creationDateString);
+
+        }
+        if (this.storeSize != null) {
+            generator.writeKey("store.size");
+            generator.write(this.storeSize);
+
+        }
+        if (this.priStoreSize != null) {
+            generator.writeKey("pri.store.size");
+            generator.write(this.priStoreSize);
+
+        }
+        if (this.completionSize != null) {
+            generator.writeKey("completion.size");
+            generator.write(this.completionSize);
+
+        }
+        if (this.priCompletionSize != null) {
+            generator.writeKey("pri.completion.size");
+            generator.write(this.priCompletionSize);
+
+        }
+        if (this.fielddataMemorySize != null) {
+            generator.writeKey("fielddata.memory_size");
+            generator.write(this.fielddataMemorySize);
+
+        }
+        if (this.priFielddataMemorySize != null) {
+            generator.writeKey("pri.fielddata.memory_size");
+            generator.write(this.priFielddataMemorySize);
+
+        }
+        if (this.fielddataEvictions != null) {
+            generator.writeKey("fielddata.evictions");
+            generator.write(this.fielddataEvictions);
+
+        }
+        if (this.priFielddataEvictions != null) {
+            generator.writeKey("pri.fielddata.evictions");
+            generator.write(this.priFielddataEvictions);
+
+        }
+        if (this.queryCacheMemorySize != null) {
+            generator.writeKey("query_cache.memory_size");
+            generator.write(this.queryCacheMemorySize);
+
+        }
+        if (this.priQueryCacheMemorySize != null) {
+            generator.writeKey("pri.query_cache.memory_size");
+            generator.write(this.priQueryCacheMemorySize);
+
+        }
+        if (this.queryCacheEvictions != null) {
+            generator.writeKey("query_cache.evictions");
+            generator.write(this.queryCacheEvictions);
+
+        }
+        if (this.priQueryCacheEvictions != null) {
+            generator.writeKey("pri.query_cache.evictions");
+            generator.write(this.priQueryCacheEvictions);
+
+        }
+        if (this.requestCacheMemorySize != null) {
+            generator.writeKey("request_cache.memory_size");
+            generator.write(this.requestCacheMemorySize);
+
+        }
+        if (this.priRequestCacheMemorySize != null) {
+            generator.writeKey("pri.request_cache.memory_size");
+            generator.write(this.priRequestCacheMemorySize);
+
+        }
+        if (this.requestCacheEvictions != null) {
+            generator.writeKey("request_cache.evictions");
+            generator.write(this.requestCacheEvictions);
+
+        }
+        if (this.priRequestCacheEvictions != null) {
+            generator.writeKey("pri.request_cache.evictions");
+            generator.write(this.priRequestCacheEvictions);
+
+        }
+        if (this.requestCacheHitCount != null) {
+            generator.writeKey("request_cache.hit_count");
+            generator.write(this.requestCacheHitCount);
+
+        }
+        if (this.priRequestCacheHitCount != null) {
+            generator.writeKey("pri.request_cache.hit_count");
+            generator.write(this.priRequestCacheHitCount);
+
+        }
+        if (this.requestCacheMissCount != null) {
+            generator.writeKey("request_cache.miss_count");
+            generator.write(this.requestCacheMissCount);
+
+        }
+        if (this.priRequestCacheMissCount != null) {
+            generator.writeKey("pri.request_cache.miss_count");
+            generator.write(this.priRequestCacheMissCount);
+
+        }
+        if (this.flushTotal != null) {
+            generator.writeKey("flush.total");
+            generator.write(this.flushTotal);
+
+        }
+        if (this.priFlushTotal != null) {
+            generator.writeKey("pri.flush.total");
+            generator.write(this.priFlushTotal);
+
+        }
+        if (this.flushTotalTime != null) {
+            generator.writeKey("flush.total_time");
+            generator.write(this.flushTotalTime);
+
+        }
+        if (this.priFlushTotalTime != null) {
+            generator.writeKey("pri.flush.total_time");
+            generator.write(this.priFlushTotalTime);
+
+        }
+        if (this.getCurrent != null) {
+            generator.writeKey("get.current");
+            generator.write(this.getCurrent);
+
+        }
+        if (this.priGetCurrent != null) {
+            generator.writeKey("pri.get.current");
+            generator.write(this.priGetCurrent);
+
+        }
+        if (this.getTime != null) {
+            generator.writeKey("get.time");
+            generator.write(this.getTime);
+
+        }
+        if (this.priGetTime != null) {
+            generator.writeKey("pri.get.time");
+            generator.write(this.priGetTime);
+
+        }
+        if (this.getTotal != null) {
+            generator.writeKey("get.total");
+            generator.write(this.getTotal);
+
+        }
+        if (this.priGetTotal != null) {
+            generator.writeKey("pri.get.total");
+            generator.write(this.priGetTotal);
+
+        }
+        if (this.getExistsTime != null) {
+            generator.writeKey("get.exists_time");
+            generator.write(this.getExistsTime);
+
+        }
+        if (this.priGetExistsTime != null) {
+            generator.writeKey("pri.get.exists_time");
+            generator.write(this.priGetExistsTime);
+
+        }
+        if (this.getExistsTotal != null) {
+            generator.writeKey("get.exists_total");
+            generator.write(this.getExistsTotal);
+
+        }
+        if (this.priGetExistsTotal != null) {
+            generator.writeKey("pri.get.exists_total");
+            generator.write(this.priGetExistsTotal);
+
+        }
+        if (this.getMissingTime != null) {
+            generator.writeKey("get.missing_time");
+            generator.write(this.getMissingTime);
+
+        }
+        if (this.priGetMissingTime != null) {
+            generator.writeKey("pri.get.missing_time");
+            generator.write(this.priGetMissingTime);
+
+        }
+        if (this.getMissingTotal != null) {
+            generator.writeKey("get.missing_total");
+            generator.write(this.getMissingTotal);
+
+        }
+        if (this.priGetMissingTotal != null) {
+            generator.writeKey("pri.get.missing_total");
+            generator.write(this.priGetMissingTotal);
+
+        }
+        if (this.indexingDeleteCurrent != null) {
+            generator.writeKey("indexing.delete_current");
+            generator.write(this.indexingDeleteCurrent);
+
+        }
+        if (this.priIndexingDeleteCurrent != null) {
+            generator.writeKey("pri.indexing.delete_current");
+            generator.write(this.priIndexingDeleteCurrent);
+
+        }
+        if (this.indexingDeleteTime != null) {
+            generator.writeKey("indexing.delete_time");
+            generator.write(this.indexingDeleteTime);
+
+        }
+        if (this.priIndexingDeleteTime != null) {
+            generator.writeKey("pri.indexing.delete_time");
+            generator.write(this.priIndexingDeleteTime);
+
+        }
+        if (this.indexingDeleteTotal != null) {
+            generator.writeKey("indexing.delete_total");
+            generator.write(this.indexingDeleteTotal);
+
+        }
+        if (this.priIndexingDeleteTotal != null) {
+            generator.writeKey("pri.indexing.delete_total");
+            generator.write(this.priIndexingDeleteTotal);
+
+        }
+        if (this.indexingIndexCurrent != null) {
+            generator.writeKey("indexing.index_current");
+            generator.write(this.indexingIndexCurrent);
+
+        }
+        if (this.priIndexingIndexCurrent != null) {
+            generator.writeKey("pri.indexing.index_current");
+            generator.write(this.priIndexingIndexCurrent);
+
+        }
+        if (this.indexingIndexTime != null) {
+            generator.writeKey("indexing.index_time");
+            generator.write(this.indexingIndexTime);
+
+        }
+        if (this.priIndexingIndexTime != null) {
+            generator.writeKey("pri.indexing.index_time");
+            generator.write(this.priIndexingIndexTime);
+
+        }
+        if (this.indexingIndexTotal != null) {
+            generator.writeKey("indexing.index_total");
+            generator.write(this.indexingIndexTotal);
+
+        }
+        if (this.priIndexingIndexTotal != null) {
+            generator.writeKey("pri.indexing.index_total");
+            generator.write(this.priIndexingIndexTotal);
+
+        }
+        if (this.indexingIndexFailed != null) {
+            generator.writeKey("indexing.index_failed");
+            generator.write(this.indexingIndexFailed);
+
+        }
+        if (this.priIndexingIndexFailed != null) {
+            generator.writeKey("pri.indexing.index_failed");
+            generator.write(this.priIndexingIndexFailed);
+
+        }
+        if (this.mergesCurrent != null) {
+            generator.writeKey("merges.current");
+            generator.write(this.mergesCurrent);
+
+        }
+        if (this.priMergesCurrent != null) {
+            generator.writeKey("pri.merges.current");
+            generator.write(this.priMergesCurrent);
+
+        }
+        if (this.mergesCurrentDocs != null) {
+            generator.writeKey("merges.current_docs");
+            generator.write(this.mergesCurrentDocs);
+
+        }
+        if (this.priMergesCurrentDocs != null) {
+            generator.writeKey("pri.merges.current_docs");
+            generator.write(this.priMergesCurrentDocs);
+
+        }
+        if (this.mergesCurrentSize != null) {
+            generator.writeKey("merges.current_size");
+            generator.write(this.mergesCurrentSize);
+
+        }
+        if (this.priMergesCurrentSize != null) {
+            generator.writeKey("pri.merges.current_size");
+            generator.write(this.priMergesCurrentSize);
+
+        }
+        if (this.mergesTotal != null) {
+            generator.writeKey("merges.total");
+            generator.write(this.mergesTotal);
+
+        }
+        if (this.priMergesTotal != null) {
+            generator.writeKey("pri.merges.total");
+            generator.write(this.priMergesTotal);
+
+        }
+        if (this.mergesTotalDocs != null) {
+            generator.writeKey("merges.total_docs");
+            generator.write(this.mergesTotalDocs);
+
+        }
+        if (this.priMergesTotalDocs != null) {
+            generator.writeKey("pri.merges.total_docs");
+            generator.write(this.priMergesTotalDocs);
+
+        }
+        if (this.mergesTotalSize != null) {
+            generator.writeKey("merges.total_size");
+            generator.write(this.mergesTotalSize);
+
+        }
+        if (this.priMergesTotalSize != null) {
+            generator.writeKey("pri.merges.total_size");
+            generator.write(this.priMergesTotalSize);
+
+        }
+        if (this.mergesTotalTime != null) {
+            generator.writeKey("merges.total_time");
+            generator.write(this.mergesTotalTime);
+
+        }
+        if (this.priMergesTotalTime != null) {
+            generator.writeKey("pri.merges.total_time");
+            generator.write(this.priMergesTotalTime);
+
+        }
+        if (this.refreshTotal != null) {
+            generator.writeKey("refresh.total");
+            generator.write(this.refreshTotal);
+
+        }
+        if (this.priRefreshTotal != null) {
+            generator.writeKey("pri.refresh.total");
+            generator.write(this.priRefreshTotal);
+
+        }
+        if (this.refreshTime != null) {
+            generator.writeKey("refresh.time");
+            generator.write(this.refreshTime);
+
+        }
+        if (this.priRefreshTime != null) {
+            generator.writeKey("pri.refresh.time");
+            generator.write(this.priRefreshTime);
+
+        }
+        if (this.refreshExternalTotal != null) {
+            generator.writeKey("refresh.external_total");
+            generator.write(this.refreshExternalTotal);
+
+        }
+        if (this.priRefreshExternalTotal != null) {
+            generator.writeKey("pri.refresh.external_total");
+            generator.write(this.priRefreshExternalTotal);
+
+        }
+        if (this.refreshExternalTime != null) {
+            generator.writeKey("refresh.external_time");
+            generator.write(this.refreshExternalTime);
+
+        }
+        if (this.priRefreshExternalTime != null) {
+            generator.writeKey("pri.refresh.external_time");
+            generator.write(this.priRefreshExternalTime);
+
+        }
+        if (this.refreshListeners != null) {
+            generator.writeKey("refresh.listeners");
+            generator.write(this.refreshListeners);
+
+        }
+        if (this.priRefreshListeners != null) {
+            generator.writeKey("pri.refresh.listeners");
+            generator.write(this.priRefreshListeners);
+
+        }
+        if (this.searchFetchCurrent != null) {
+            generator.writeKey("search.fetch_current");
+            generator.write(this.searchFetchCurrent);
+
+        }
+        if (this.priSearchFetchCurrent != null) {
+            generator.writeKey("pri.search.fetch_current");
+            generator.write(this.priSearchFetchCurrent);
+
+        }
+        if (this.searchFetchTime != null) {
+            generator.writeKey("search.fetch_time");
+            generator.write(this.searchFetchTime);
+
+        }
+        if (this.priSearchFetchTime != null) {
+            generator.writeKey("pri.search.fetch_time");
+            generator.write(this.priSearchFetchTime);
+
+        }
+        if (this.searchFetchTotal != null) {
+            generator.writeKey("search.fetch_total");
+            generator.write(this.searchFetchTotal);
+
+        }
+        if (this.priSearchFetchTotal != null) {
+            generator.writeKey("pri.search.fetch_total");
+            generator.write(this.priSearchFetchTotal);
+
+        }
+        if (this.searchOpenContexts != null) {
+            generator.writeKey("search.open_contexts");
+            generator.write(this.searchOpenContexts);
+
+        }
+        if (this.priSearchOpenContexts != null) {
+            generator.writeKey("pri.search.open_contexts");
+            generator.write(this.priSearchOpenContexts);
+
+        }
+        if (this.searchQueryCurrent != null) {
+            generator.writeKey("search.query_current");
+            generator.write(this.searchQueryCurrent);
+
+        }
+        if (this.priSearchQueryCurrent != null) {
+            generator.writeKey("pri.search.query_current");
+            generator.write(this.priSearchQueryCurrent);
+
+        }
+        if (this.searchQueryTime != null) {
+            generator.writeKey("search.query_time");
+            generator.write(this.searchQueryTime);
+
+        }
+        if (this.priSearchQueryTime != null) {
+            generator.writeKey("pri.search.query_time");
+            generator.write(this.priSearchQueryTime);
+
+        }
+        if (this.searchQueryTotal != null) {
+            generator.writeKey("search.query_total");
+            generator.write(this.searchQueryTotal);
+
+        }
+        if (this.priSearchQueryTotal != null) {
+            generator.writeKey("pri.search.query_total");
+            generator.write(this.priSearchQueryTotal);
+
+        }
+        if (this.searchScrollCurrent != null) {
+            generator.writeKey("search.scroll_current");
+            generator.write(this.searchScrollCurrent);
+
+        }
+        if (this.priSearchScrollCurrent != null) {
+            generator.writeKey("pri.search.scroll_current");
+            generator.write(this.priSearchScrollCurrent);
+
+        }
+        if (this.searchScrollTime != null) {
+            generator.writeKey("search.scroll_time");
+            generator.write(this.searchScrollTime);
+
+        }
+        if (this.priSearchScrollTime != null) {
+            generator.writeKey("pri.search.scroll_time");
+            generator.write(this.priSearchScrollTime);
+
+        }
+        if (this.searchScrollTotal != null) {
+            generator.writeKey("search.scroll_total");
+            generator.write(this.searchScrollTotal);
+
+        }
+        if (this.priSearchScrollTotal != null) {
+            generator.writeKey("pri.search.scroll_total");
+            generator.write(this.priSearchScrollTotal);
+
+        }
+        if (this.segmentsCount != null) {
+            generator.writeKey("segments.count");
+            generator.write(this.segmentsCount);
+
+        }
+        if (this.priSegmentsCount != null) {
+            generator.writeKey("pri.segments.count");
+            generator.write(this.priSegmentsCount);
+
+        }
+        if (this.segmentsMemory != null) {
+            generator.writeKey("segments.memory");
+            generator.write(this.segmentsMemory);
+
+        }
+        if (this.priSegmentsMemory != null) {
+            generator.writeKey("pri.segments.memory");
+            generator.write(this.priSegmentsMemory);
+
+        }
+        if (this.segmentsIndexWriterMemory != null) {
+            generator.writeKey("segments.index_writer_memory");
+            generator.write(this.segmentsIndexWriterMemory);
+
+        }
+        if (this.priSegmentsIndexWriterMemory != null) {
+            generator.writeKey("pri.segments.index_writer_memory");
+            generator.write(this.priSegmentsIndexWriterMemory);
+
+        }
+        if (this.segmentsVersionMapMemory != null) {
+            generator.writeKey("segments.version_map_memory");
+            generator.write(this.segmentsVersionMapMemory);
+
+        }
+        if (this.priSegmentsVersionMapMemory != null) {
+            generator.writeKey("pri.segments.version_map_memory");
+            generator.write(this.priSegmentsVersionMapMemory);
+
+        }
+        if (this.segmentsFixedBitsetMemory != null) {
+            generator.writeKey("segments.fixed_bitset_memory");
+            generator.write(this.segmentsFixedBitsetMemory);
+
+        }
+        if (this.priSegmentsFixedBitsetMemory != null) {
+            generator.writeKey("pri.segments.fixed_bitset_memory");
+            generator.write(this.priSegmentsFixedBitsetMemory);
+
+        }
+        if (this.warmerCurrent != null) {
+            generator.writeKey("warmer.current");
+            generator.write(this.warmerCurrent);
+
+        }
+        if (this.priWarmerCurrent != null) {
+            generator.writeKey("pri.warmer.current");
+            generator.write(this.priWarmerCurrent);
+
+        }
+        if (this.warmerTotal != null) {
+            generator.writeKey("warmer.total");
+            generator.write(this.warmerTotal);
+
+        }
+        if (this.priWarmerTotal != null) {
+            generator.writeKey("pri.warmer.total");
+            generator.write(this.priWarmerTotal);
+
+        }
+        if (this.warmerTotalTime != null) {
+            generator.writeKey("warmer.total_time");
+            generator.write(this.warmerTotalTime);
+
+        }
+        if (this.priWarmerTotalTime != null) {
+            generator.writeKey("pri.warmer.total_time");
+            generator.write(this.priWarmerTotalTime);
+
+        }
+        if (this.suggestCurrent != null) {
+            generator.writeKey("suggest.current");
+            generator.write(this.suggestCurrent);
+
+        }
+        if (this.priSuggestCurrent != null) {
+            generator.writeKey("pri.suggest.current");
+            generator.write(this.priSuggestCurrent);
+
+        }
+        if (this.suggestTime != null) {
+            generator.writeKey("suggest.time");
+            generator.write(this.suggestTime);
+
+        }
+        if (this.priSuggestTime != null) {
+            generator.writeKey("pri.suggest.time");
+            generator.write(this.priSuggestTime);
+
+        }
+        if (this.suggestTotal != null) {
+            generator.writeKey("suggest.total");
+            generator.write(this.suggestTotal);
+
+        }
+        if (this.priSuggestTotal != null) {
+            generator.writeKey("pri.suggest.total");
+            generator.write(this.priSuggestTotal);
+
+        }
+        if (this.memoryTotal != null) {
+            generator.writeKey("memory.total");
+            generator.write(this.memoryTotal);
+
+        }
+        if (this.priMemoryTotal != null) {
+            generator.writeKey("pri.memory.total");
+            generator.write(this.priMemoryTotal);
+
+        }
+        if (this.searchThrottled != null) {
+            generator.writeKey("search.throttled");
+            generator.write(this.searchThrottled);
+
+        }
+        if (this.bulkTotalOperations != null) {
+            generator.writeKey("bulk.total_operations");
+            generator.write(this.bulkTotalOperations);
+
+        }
+        if (this.priBulkTotalOperations != null) {
+            generator.writeKey("pri.bulk.total_operations");
+            generator.write(this.priBulkTotalOperations);
+
+        }
+        if (this.bulkTotalTime != null) {
+            generator.writeKey("bulk.total_time");
+            generator.write(this.bulkTotalTime);
 
-		}
-		if (this.priBulkTotalTime != null) {
-			generator.writeKey("pri.bulk.total_time");
-			generator.write(this.priBulkTotalTime);
+        }
+        if (this.priBulkTotalTime != null) {
+            generator.writeKey("pri.bulk.total_time");
+            generator.write(this.priBulkTotalTime);
 
-		}
-		if (this.bulkTotalSizeInBytes != null) {
-			generator.writeKey("bulk.total_size_in_bytes");
-			generator.write(this.bulkTotalSizeInBytes);
+        }
+        if (this.bulkTotalSizeInBytes != null) {
+            generator.writeKey("bulk.total_size_in_bytes");
+            generator.write(this.bulkTotalSizeInBytes);
 
-		}
-		if (this.priBulkTotalSizeInBytes != null) {
-			generator.writeKey("pri.bulk.total_size_in_bytes");
-			generator.write(this.priBulkTotalSizeInBytes);
+        }
+        if (this.priBulkTotalSizeInBytes != null) {
+            generator.writeKey("pri.bulk.total_size_in_bytes");
+            generator.write(this.priBulkTotalSizeInBytes);
 
-		}
-		if (this.bulkAvgTime != null) {
-			generator.writeKey("bulk.avg_time");
-			generator.write(this.bulkAvgTime);
+        }
+        if (this.bulkAvgTime != null) {
+            generator.writeKey("bulk.avg_time");
+            generator.write(this.bulkAvgTime);
 
-		}
-		if (this.priBulkAvgTime != null) {
-			generator.writeKey("pri.bulk.avg_time");
-			generator.write(this.priBulkAvgTime);
+        }
+        if (this.priBulkAvgTime != null) {
+            generator.writeKey("pri.bulk.avg_time");
+            generator.write(this.priBulkAvgTime);
 
-		}
-		if (this.bulkAvgSizeInBytes != null) {
-			generator.writeKey("bulk.avg_size_in_bytes");
-			generator.write(this.bulkAvgSizeInBytes);
+        }
+        if (this.bulkAvgSizeInBytes != null) {
+            generator.writeKey("bulk.avg_size_in_bytes");
+            generator.write(this.bulkAvgSizeInBytes);
 
-		}
-		if (this.priBulkAvgSizeInBytes != null) {
-			generator.writeKey("pri.bulk.avg_size_in_bytes");
-			generator.write(this.priBulkAvgSizeInBytes);
+        }
+        if (this.priBulkAvgSizeInBytes != null) {
+            generator.writeKey("pri.bulk.avg_size_in_bytes");
+            generator.write(this.priBulkAvgSizeInBytes);
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link IndicesRecord}.
-	 */
+    /**
+     * Builder for {@link IndicesRecord}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesRecord> {
-		@Nullable
-		private String health;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesRecord> {
+        @Nullable
+        private String health;
 
-		@Nullable
-		private String status;
+        @Nullable
+        private String status;
 
-		@Nullable
-		private String index;
+        @Nullable
+        private String index;
 
-		@Nullable
-		private String uuid;
+        @Nullable
+        private String uuid;
 
-		@Nullable
-		private String pri;
+        @Nullable
+        private String pri;
 
-		@Nullable
-		private String rep;
+        @Nullable
+        private String rep;
 
-		@Nullable
-		private String docsCount;
+        @Nullable
+        private String docsCount;
 
-		@Nullable
-		private String docsDeleted;
+        @Nullable
+        private String docsDeleted;
 
-		@Nullable
-		private String creationDate;
+        @Nullable
+        private String creationDate;
 
-		@Nullable
-		private String creationDateString;
+        @Nullable
+        private String creationDateString;
 
-		@Nullable
-		private String storeSize;
+        @Nullable
+        private String storeSize;
 
-		@Nullable
-		private String priStoreSize;
+        @Nullable
+        private String priStoreSize;
 
-		@Nullable
-		private String completionSize;
+        @Nullable
+        private String completionSize;
 
-		@Nullable
-		private String priCompletionSize;
+        @Nullable
+        private String priCompletionSize;
 
-		@Nullable
-		private String fielddataMemorySize;
+        @Nullable
+        private String fielddataMemorySize;
 
-		@Nullable
-		private String priFielddataMemorySize;
+        @Nullable
+        private String priFielddataMemorySize;
 
-		@Nullable
-		private String fielddataEvictions;
+        @Nullable
+        private String fielddataEvictions;
 
-		@Nullable
-		private String priFielddataEvictions;
+        @Nullable
+        private String priFielddataEvictions;
 
-		@Nullable
-		private String queryCacheMemorySize;
+        @Nullable
+        private String queryCacheMemorySize;
 
-		@Nullable
-		private String priQueryCacheMemorySize;
+        @Nullable
+        private String priQueryCacheMemorySize;
 
-		@Nullable
-		private String queryCacheEvictions;
+        @Nullable
+        private String queryCacheEvictions;
 
-		@Nullable
-		private String priQueryCacheEvictions;
+        @Nullable
+        private String priQueryCacheEvictions;
 
-		@Nullable
-		private String requestCacheMemorySize;
+        @Nullable
+        private String requestCacheMemorySize;
 
-		@Nullable
-		private String priRequestCacheMemorySize;
+        @Nullable
+        private String priRequestCacheMemorySize;
 
-		@Nullable
-		private String requestCacheEvictions;
+        @Nullable
+        private String requestCacheEvictions;
 
-		@Nullable
-		private String priRequestCacheEvictions;
+        @Nullable
+        private String priRequestCacheEvictions;
 
-		@Nullable
-		private String requestCacheHitCount;
+        @Nullable
+        private String requestCacheHitCount;
 
-		@Nullable
-		private String priRequestCacheHitCount;
+        @Nullable
+        private String priRequestCacheHitCount;
 
-		@Nullable
-		private String requestCacheMissCount;
+        @Nullable
+        private String requestCacheMissCount;
 
-		@Nullable
-		private String priRequestCacheMissCount;
+        @Nullable
+        private String priRequestCacheMissCount;
 
-		@Nullable
-		private String flushTotal;
+        @Nullable
+        private String flushTotal;
 
-		@Nullable
-		private String priFlushTotal;
+        @Nullable
+        private String priFlushTotal;
 
-		@Nullable
-		private String flushTotalTime;
+        @Nullable
+        private String flushTotalTime;
 
-		@Nullable
-		private String priFlushTotalTime;
+        @Nullable
+        private String priFlushTotalTime;
 
-		@Nullable
-		private String getCurrent;
+        @Nullable
+        private String getCurrent;
 
-		@Nullable
-		private String priGetCurrent;
+        @Nullable
+        private String priGetCurrent;
 
-		@Nullable
-		private String getTime;
+        @Nullable
+        private String getTime;
 
-		@Nullable
-		private String priGetTime;
+        @Nullable
+        private String priGetTime;
 
-		@Nullable
-		private String getTotal;
+        @Nullable
+        private String getTotal;
 
-		@Nullable
-		private String priGetTotal;
+        @Nullable
+        private String priGetTotal;
 
-		@Nullable
-		private String getExistsTime;
+        @Nullable
+        private String getExistsTime;
 
-		@Nullable
-		private String priGetExistsTime;
+        @Nullable
+        private String priGetExistsTime;
 
-		@Nullable
-		private String getExistsTotal;
+        @Nullable
+        private String getExistsTotal;
 
-		@Nullable
-		private String priGetExistsTotal;
+        @Nullable
+        private String priGetExistsTotal;
 
-		@Nullable
-		private String getMissingTime;
+        @Nullable
+        private String getMissingTime;
 
-		@Nullable
-		private String priGetMissingTime;
+        @Nullable
+        private String priGetMissingTime;
 
-		@Nullable
-		private String getMissingTotal;
+        @Nullable
+        private String getMissingTotal;
 
-		@Nullable
-		private String priGetMissingTotal;
+        @Nullable
+        private String priGetMissingTotal;
 
-		@Nullable
-		private String indexingDeleteCurrent;
+        @Nullable
+        private String indexingDeleteCurrent;
 
-		@Nullable
-		private String priIndexingDeleteCurrent;
+        @Nullable
+        private String priIndexingDeleteCurrent;
 
-		@Nullable
-		private String indexingDeleteTime;
+        @Nullable
+        private String indexingDeleteTime;
 
-		@Nullable
-		private String priIndexingDeleteTime;
+        @Nullable
+        private String priIndexingDeleteTime;
 
-		@Nullable
-		private String indexingDeleteTotal;
+        @Nullable
+        private String indexingDeleteTotal;
 
-		@Nullable
-		private String priIndexingDeleteTotal;
+        @Nullable
+        private String priIndexingDeleteTotal;
 
-		@Nullable
-		private String indexingIndexCurrent;
+        @Nullable
+        private String indexingIndexCurrent;
 
-		@Nullable
-		private String priIndexingIndexCurrent;
+        @Nullable
+        private String priIndexingIndexCurrent;
 
-		@Nullable
-		private String indexingIndexTime;
+        @Nullable
+        private String indexingIndexTime;
 
-		@Nullable
-		private String priIndexingIndexTime;
+        @Nullable
+        private String priIndexingIndexTime;
 
-		@Nullable
-		private String indexingIndexTotal;
+        @Nullable
+        private String indexingIndexTotal;
 
-		@Nullable
-		private String priIndexingIndexTotal;
+        @Nullable
+        private String priIndexingIndexTotal;
 
-		@Nullable
-		private String indexingIndexFailed;
+        @Nullable
+        private String indexingIndexFailed;
 
-		@Nullable
-		private String priIndexingIndexFailed;
+        @Nullable
+        private String priIndexingIndexFailed;
 
-		@Nullable
-		private String mergesCurrent;
+        @Nullable
+        private String mergesCurrent;
 
-		@Nullable
-		private String priMergesCurrent;
+        @Nullable
+        private String priMergesCurrent;
 
-		@Nullable
-		private String mergesCurrentDocs;
+        @Nullable
+        private String mergesCurrentDocs;
 
-		@Nullable
-		private String priMergesCurrentDocs;
+        @Nullable
+        private String priMergesCurrentDocs;
 
-		@Nullable
-		private String mergesCurrentSize;
+        @Nullable
+        private String mergesCurrentSize;
 
-		@Nullable
-		private String priMergesCurrentSize;
+        @Nullable
+        private String priMergesCurrentSize;
 
-		@Nullable
-		private String mergesTotal;
+        @Nullable
+        private String mergesTotal;
 
-		@Nullable
-		private String priMergesTotal;
+        @Nullable
+        private String priMergesTotal;
 
-		@Nullable
-		private String mergesTotalDocs;
+        @Nullable
+        private String mergesTotalDocs;
 
-		@Nullable
-		private String priMergesTotalDocs;
+        @Nullable
+        private String priMergesTotalDocs;
 
-		@Nullable
-		private String mergesTotalSize;
+        @Nullable
+        private String mergesTotalSize;
 
-		@Nullable
-		private String priMergesTotalSize;
+        @Nullable
+        private String priMergesTotalSize;
 
-		@Nullable
-		private String mergesTotalTime;
+        @Nullable
+        private String mergesTotalTime;
 
-		@Nullable
-		private String priMergesTotalTime;
+        @Nullable
+        private String priMergesTotalTime;
 
-		@Nullable
-		private String refreshTotal;
+        @Nullable
+        private String refreshTotal;
 
-		@Nullable
-		private String priRefreshTotal;
+        @Nullable
+        private String priRefreshTotal;
 
-		@Nullable
-		private String refreshTime;
+        @Nullable
+        private String refreshTime;
 
-		@Nullable
-		private String priRefreshTime;
+        @Nullable
+        private String priRefreshTime;
 
-		@Nullable
-		private String refreshExternalTotal;
+        @Nullable
+        private String refreshExternalTotal;
 
-		@Nullable
-		private String priRefreshExternalTotal;
+        @Nullable
+        private String priRefreshExternalTotal;
 
-		@Nullable
-		private String refreshExternalTime;
+        @Nullable
+        private String refreshExternalTime;
 
-		@Nullable
-		private String priRefreshExternalTime;
+        @Nullable
+        private String priRefreshExternalTime;
 
-		@Nullable
-		private String refreshListeners;
+        @Nullable
+        private String refreshListeners;
 
-		@Nullable
-		private String priRefreshListeners;
+        @Nullable
+        private String priRefreshListeners;
 
-		@Nullable
-		private String searchFetchCurrent;
+        @Nullable
+        private String searchFetchCurrent;
 
-		@Nullable
-		private String priSearchFetchCurrent;
+        @Nullable
+        private String priSearchFetchCurrent;
 
-		@Nullable
-		private String searchFetchTime;
+        @Nullable
+        private String searchFetchTime;
 
-		@Nullable
-		private String priSearchFetchTime;
+        @Nullable
+        private String priSearchFetchTime;
 
-		@Nullable
-		private String searchFetchTotal;
+        @Nullable
+        private String searchFetchTotal;
 
-		@Nullable
-		private String priSearchFetchTotal;
+        @Nullable
+        private String priSearchFetchTotal;
 
-		@Nullable
-		private String searchOpenContexts;
+        @Nullable
+        private String searchOpenContexts;
 
-		@Nullable
-		private String priSearchOpenContexts;
+        @Nullable
+        private String priSearchOpenContexts;
 
-		@Nullable
-		private String searchQueryCurrent;
+        @Nullable
+        private String searchQueryCurrent;
 
-		@Nullable
-		private String priSearchQueryCurrent;
+        @Nullable
+        private String priSearchQueryCurrent;
 
-		@Nullable
-		private String searchQueryTime;
+        @Nullable
+        private String searchQueryTime;
 
-		@Nullable
-		private String priSearchQueryTime;
+        @Nullable
+        private String priSearchQueryTime;
 
-		@Nullable
-		private String searchQueryTotal;
+        @Nullable
+        private String searchQueryTotal;
 
-		@Nullable
-		private String priSearchQueryTotal;
+        @Nullable
+        private String priSearchQueryTotal;
 
-		@Nullable
-		private String searchScrollCurrent;
+        @Nullable
+        private String searchScrollCurrent;
 
-		@Nullable
-		private String priSearchScrollCurrent;
+        @Nullable
+        private String priSearchScrollCurrent;
 
-		@Nullable
-		private String searchScrollTime;
+        @Nullable
+        private String searchScrollTime;
 
-		@Nullable
-		private String priSearchScrollTime;
+        @Nullable
+        private String priSearchScrollTime;
 
-		@Nullable
-		private String searchScrollTotal;
+        @Nullable
+        private String searchScrollTotal;
 
-		@Nullable
-		private String priSearchScrollTotal;
+        @Nullable
+        private String priSearchScrollTotal;
 
-		@Nullable
-		private String segmentsCount;
+        @Nullable
+        private String segmentsCount;
 
-		@Nullable
-		private String priSegmentsCount;
+        @Nullable
+        private String priSegmentsCount;
 
-		@Nullable
-		private String segmentsMemory;
+        @Nullable
+        private String segmentsMemory;
 
-		@Nullable
-		private String priSegmentsMemory;
+        @Nullable
+        private String priSegmentsMemory;
 
-		@Nullable
-		private String segmentsIndexWriterMemory;
+        @Nullable
+        private String segmentsIndexWriterMemory;
 
-		@Nullable
-		private String priSegmentsIndexWriterMemory;
+        @Nullable
+        private String priSegmentsIndexWriterMemory;
 
-		@Nullable
-		private String segmentsVersionMapMemory;
+        @Nullable
+        private String segmentsVersionMapMemory;
 
-		@Nullable
-		private String priSegmentsVersionMapMemory;
+        @Nullable
+        private String priSegmentsVersionMapMemory;
 
-		@Nullable
-		private String segmentsFixedBitsetMemory;
+        @Nullable
+        private String segmentsFixedBitsetMemory;
 
-		@Nullable
-		private String priSegmentsFixedBitsetMemory;
+        @Nullable
+        private String priSegmentsFixedBitsetMemory;
 
-		@Nullable
-		private String warmerCurrent;
+        @Nullable
+        private String warmerCurrent;
 
-		@Nullable
-		private String priWarmerCurrent;
+        @Nullable
+        private String priWarmerCurrent;
 
-		@Nullable
-		private String warmerTotal;
+        @Nullable
+        private String warmerTotal;
 
-		@Nullable
-		private String priWarmerTotal;
+        @Nullable
+        private String priWarmerTotal;
 
-		@Nullable
-		private String warmerTotalTime;
+        @Nullable
+        private String warmerTotalTime;
 
-		@Nullable
-		private String priWarmerTotalTime;
+        @Nullable
+        private String priWarmerTotalTime;
 
-		@Nullable
-		private String suggestCurrent;
+        @Nullable
+        private String suggestCurrent;
 
-		@Nullable
-		private String priSuggestCurrent;
+        @Nullable
+        private String priSuggestCurrent;
 
-		@Nullable
-		private String suggestTime;
+        @Nullable
+        private String suggestTime;
 
-		@Nullable
-		private String priSuggestTime;
+        @Nullable
+        private String priSuggestTime;
 
-		@Nullable
-		private String suggestTotal;
+        @Nullable
+        private String suggestTotal;
 
-		@Nullable
-		private String priSuggestTotal;
+        @Nullable
+        private String priSuggestTotal;
 
-		@Nullable
-		private String memoryTotal;
+        @Nullable
+        private String memoryTotal;
 
-		@Nullable
-		private String priMemoryTotal;
+        @Nullable
+        private String priMemoryTotal;
 
-		@Nullable
-		private String searchThrottled;
+        @Nullable
+        private String searchThrottled;
 
-		@Nullable
-		private String bulkTotalOperations;
+        @Nullable
+        private String bulkTotalOperations;
 
-		@Nullable
-		private String priBulkTotalOperations;
-
-		@Nullable
-		private String bulkTotalTime;
-
-		@Nullable
-		private String priBulkTotalTime;
-
-		@Nullable
-		private String bulkTotalSizeInBytes;
-
-		@Nullable
-		private String priBulkTotalSizeInBytes;
-
-		@Nullable
-		private String bulkAvgTime;
-
-		@Nullable
-		private String priBulkAvgTime;
-
-		@Nullable
-		private String bulkAvgSizeInBytes;
-
-		@Nullable
-		private String priBulkAvgSizeInBytes;
-
-		/**
-		 * current health status
-		 * <p>
-		 * API name: {@code health}
-		 */
-		public final Builder health(@Nullable String value) {
-			this.health = value;
-			return this;
-		}
-
-		/**
-		 * open/close status
-		 * <p>
-		 * API name: {@code status}
-		 */
-		public final Builder status(@Nullable String value) {
-			this.status = value;
-			return this;
-		}
-
-		/**
-		 * index name
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * index uuid
-		 * <p>
-		 * API name: {@code uuid}
-		 */
-		public final Builder uuid(@Nullable String value) {
-			this.uuid = value;
-			return this;
-		}
-
-		/**
-		 * number of primary shards
-		 * <p>
-		 * API name: {@code pri}
-		 */
-		public final Builder pri(@Nullable String value) {
-			this.pri = value;
-			return this;
-		}
-
-		/**
-		 * number of replica shards
-		 * <p>
-		 * API name: {@code rep}
-		 */
-		public final Builder rep(@Nullable String value) {
-			this.rep = value;
-			return this;
-		}
-
-		/**
-		 * available docs
-		 * <p>
-		 * API name: {@code docs.count}
-		 */
-		public final Builder docsCount(@Nullable String value) {
-			this.docsCount = value;
-			return this;
-		}
-
-		/**
-		 * deleted docs
-		 * <p>
-		 * API name: {@code docs.deleted}
-		 */
-		public final Builder docsDeleted(@Nullable String value) {
-			this.docsDeleted = value;
-			return this;
-		}
-
-		/**
-		 * index creation date (millisecond value)
-		 * <p>
-		 * API name: {@code creation.date}
-		 */
-		public final Builder creationDate(@Nullable String value) {
-			this.creationDate = value;
-			return this;
-		}
-
-		/**
-		 * index creation date (as string)
-		 * <p>
-		 * API name: {@code creation.date.string}
-		 */
-		public final Builder creationDateString(@Nullable String value) {
-			this.creationDateString = value;
-			return this;
-		}
-
-		/**
-		 * store size of primaries &amp; replicas
-		 * <p>
-		 * API name: {@code store.size}
-		 */
-		public final Builder storeSize(@Nullable String value) {
-			this.storeSize = value;
-			return this;
-		}
-
-		/**
-		 * store size of primaries
-		 * <p>
-		 * API name: {@code pri.store.size}
-		 */
-		public final Builder priStoreSize(@Nullable String value) {
-			this.priStoreSize = value;
-			return this;
-		}
-
-		/**
-		 * size of completion
-		 * <p>
-		 * API name: {@code completion.size}
-		 */
-		public final Builder completionSize(@Nullable String value) {
-			this.completionSize = value;
-			return this;
-		}
-
-		/**
-		 * size of completion
-		 * <p>
-		 * API name: {@code pri.completion.size}
-		 */
-		public final Builder priCompletionSize(@Nullable String value) {
-			this.priCompletionSize = value;
-			return this;
-		}
-
-		/**
-		 * used fielddata cache
-		 * <p>
-		 * API name: {@code fielddata.memory_size}
-		 */
-		public final Builder fielddataMemorySize(@Nullable String value) {
-			this.fielddataMemorySize = value;
-			return this;
-		}
-
-		/**
-		 * used fielddata cache
-		 * <p>
-		 * API name: {@code pri.fielddata.memory_size}
-		 */
-		public final Builder priFielddataMemorySize(@Nullable String value) {
-			this.priFielddataMemorySize = value;
-			return this;
-		}
-
-		/**
-		 * fielddata evictions
-		 * <p>
-		 * API name: {@code fielddata.evictions}
-		 */
-		public final Builder fielddataEvictions(@Nullable String value) {
-			this.fielddataEvictions = value;
-			return this;
-		}
-
-		/**
-		 * fielddata evictions
-		 * <p>
-		 * API name: {@code pri.fielddata.evictions}
-		 */
-		public final Builder priFielddataEvictions(@Nullable String value) {
-			this.priFielddataEvictions = value;
-			return this;
-		}
-
-		/**
-		 * used query cache
-		 * <p>
-		 * API name: {@code query_cache.memory_size}
-		 */
-		public final Builder queryCacheMemorySize(@Nullable String value) {
-			this.queryCacheMemorySize = value;
-			return this;
-		}
-
-		/**
-		 * used query cache
-		 * <p>
-		 * API name: {@code pri.query_cache.memory_size}
-		 */
-		public final Builder priQueryCacheMemorySize(@Nullable String value) {
-			this.priQueryCacheMemorySize = value;
-			return this;
-		}
-
-		/**
-		 * query cache evictions
-		 * <p>
-		 * API name: {@code query_cache.evictions}
-		 */
-		public final Builder queryCacheEvictions(@Nullable String value) {
-			this.queryCacheEvictions = value;
-			return this;
-		}
-
-		/**
-		 * query cache evictions
-		 * <p>
-		 * API name: {@code pri.query_cache.evictions}
-		 */
-		public final Builder priQueryCacheEvictions(@Nullable String value) {
-			this.priQueryCacheEvictions = value;
-			return this;
-		}
-
-		/**
-		 * used request cache
-		 * <p>
-		 * API name: {@code request_cache.memory_size}
-		 */
-		public final Builder requestCacheMemorySize(@Nullable String value) {
-			this.requestCacheMemorySize = value;
-			return this;
-		}
-
-		/**
-		 * used request cache
-		 * <p>
-		 * API name: {@code pri.request_cache.memory_size}
-		 */
-		public final Builder priRequestCacheMemorySize(@Nullable String value) {
-			this.priRequestCacheMemorySize = value;
-			return this;
-		}
-
-		/**
-		 * request cache evictions
-		 * <p>
-		 * API name: {@code request_cache.evictions}
-		 */
-		public final Builder requestCacheEvictions(@Nullable String value) {
-			this.requestCacheEvictions = value;
-			return this;
-		}
-
-		/**
-		 * request cache evictions
-		 * <p>
-		 * API name: {@code pri.request_cache.evictions}
-		 */
-		public final Builder priRequestCacheEvictions(@Nullable String value) {
-			this.priRequestCacheEvictions = value;
-			return this;
-		}
-
-		/**
-		 * request cache hit count
-		 * <p>
-		 * API name: {@code request_cache.hit_count}
-		 */
-		public final Builder requestCacheHitCount(@Nullable String value) {
-			this.requestCacheHitCount = value;
-			return this;
-		}
-
-		/**
-		 * request cache hit count
-		 * <p>
-		 * API name: {@code pri.request_cache.hit_count}
-		 */
-		public final Builder priRequestCacheHitCount(@Nullable String value) {
-			this.priRequestCacheHitCount = value;
-			return this;
-		}
-
-		/**
-		 * request cache miss count
-		 * <p>
-		 * API name: {@code request_cache.miss_count}
-		 */
-		public final Builder requestCacheMissCount(@Nullable String value) {
-			this.requestCacheMissCount = value;
-			return this;
-		}
-
-		/**
-		 * request cache miss count
-		 * <p>
-		 * API name: {@code pri.request_cache.miss_count}
-		 */
-		public final Builder priRequestCacheMissCount(@Nullable String value) {
-			this.priRequestCacheMissCount = value;
-			return this;
-		}
-
-		/**
-		 * number of flushes
-		 * <p>
-		 * API name: {@code flush.total}
-		 */
-		public final Builder flushTotal(@Nullable String value) {
-			this.flushTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of flushes
-		 * <p>
-		 * API name: {@code pri.flush.total}
-		 */
-		public final Builder priFlushTotal(@Nullable String value) {
-			this.priFlushTotal = value;
-			return this;
-		}
-
-		/**
-		 * time spent in flush
-		 * <p>
-		 * API name: {@code flush.total_time}
-		 */
-		public final Builder flushTotalTime(@Nullable String value) {
-			this.flushTotalTime = value;
-			return this;
-		}
-
-		/**
-		 * time spent in flush
-		 * <p>
-		 * API name: {@code pri.flush.total_time}
-		 */
-		public final Builder priFlushTotalTime(@Nullable String value) {
-			this.priFlushTotalTime = value;
-			return this;
-		}
-
-		/**
-		 * number of current get ops
-		 * <p>
-		 * API name: {@code get.current}
-		 */
-		public final Builder getCurrent(@Nullable String value) {
-			this.getCurrent = value;
-			return this;
-		}
-
-		/**
-		 * number of current get ops
-		 * <p>
-		 * API name: {@code pri.get.current}
-		 */
-		public final Builder priGetCurrent(@Nullable String value) {
-			this.priGetCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time spent in get
-		 * <p>
-		 * API name: {@code get.time}
-		 */
-		public final Builder getTime(@Nullable String value) {
-			this.getTime = value;
-			return this;
-		}
-
-		/**
-		 * time spent in get
-		 * <p>
-		 * API name: {@code pri.get.time}
-		 */
-		public final Builder priGetTime(@Nullable String value) {
-			this.priGetTime = value;
-			return this;
-		}
-
-		/**
-		 * number of get ops
-		 * <p>
-		 * API name: {@code get.total}
-		 */
-		public final Builder getTotal(@Nullable String value) {
-			this.getTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of get ops
-		 * <p>
-		 * API name: {@code pri.get.total}
-		 */
-		public final Builder priGetTotal(@Nullable String value) {
-			this.priGetTotal = value;
-			return this;
-		}
-
-		/**
-		 * time spent in successful gets
-		 * <p>
-		 * API name: {@code get.exists_time}
-		 */
-		public final Builder getExistsTime(@Nullable String value) {
-			this.getExistsTime = value;
-			return this;
-		}
-
-		/**
-		 * time spent in successful gets
-		 * <p>
-		 * API name: {@code pri.get.exists_time}
-		 */
-		public final Builder priGetExistsTime(@Nullable String value) {
-			this.priGetExistsTime = value;
-			return this;
-		}
-
-		/**
-		 * number of successful gets
-		 * <p>
-		 * API name: {@code get.exists_total}
-		 */
-		public final Builder getExistsTotal(@Nullable String value) {
-			this.getExistsTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of successful gets
-		 * <p>
-		 * API name: {@code pri.get.exists_total}
-		 */
-		public final Builder priGetExistsTotal(@Nullable String value) {
-			this.priGetExistsTotal = value;
-			return this;
-		}
-
-		/**
-		 * time spent in failed gets
-		 * <p>
-		 * API name: {@code get.missing_time}
-		 */
-		public final Builder getMissingTime(@Nullable String value) {
-			this.getMissingTime = value;
-			return this;
-		}
-
-		/**
-		 * time spent in failed gets
-		 * <p>
-		 * API name: {@code pri.get.missing_time}
-		 */
-		public final Builder priGetMissingTime(@Nullable String value) {
-			this.priGetMissingTime = value;
-			return this;
-		}
-
-		/**
-		 * number of failed gets
-		 * <p>
-		 * API name: {@code get.missing_total}
-		 */
-		public final Builder getMissingTotal(@Nullable String value) {
-			this.getMissingTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of failed gets
-		 * <p>
-		 * API name: {@code pri.get.missing_total}
-		 */
-		public final Builder priGetMissingTotal(@Nullable String value) {
-			this.priGetMissingTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of current deletions
-		 * <p>
-		 * API name: {@code indexing.delete_current}
-		 */
-		public final Builder indexingDeleteCurrent(@Nullable String value) {
-			this.indexingDeleteCurrent = value;
-			return this;
-		}
-
-		/**
-		 * number of current deletions
-		 * <p>
-		 * API name: {@code pri.indexing.delete_current}
-		 */
-		public final Builder priIndexingDeleteCurrent(@Nullable String value) {
-			this.priIndexingDeleteCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time spent in deletions
-		 * <p>
-		 * API name: {@code indexing.delete_time}
-		 */
-		public final Builder indexingDeleteTime(@Nullable String value) {
-			this.indexingDeleteTime = value;
-			return this;
-		}
-
-		/**
-		 * time spent in deletions
-		 * <p>
-		 * API name: {@code pri.indexing.delete_time}
-		 */
-		public final Builder priIndexingDeleteTime(@Nullable String value) {
-			this.priIndexingDeleteTime = value;
-			return this;
-		}
-
-		/**
-		 * number of delete ops
-		 * <p>
-		 * API name: {@code indexing.delete_total}
-		 */
-		public final Builder indexingDeleteTotal(@Nullable String value) {
-			this.indexingDeleteTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of delete ops
-		 * <p>
-		 * API name: {@code pri.indexing.delete_total}
-		 */
-		public final Builder priIndexingDeleteTotal(@Nullable String value) {
-			this.priIndexingDeleteTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of current indexing ops
-		 * <p>
-		 * API name: {@code indexing.index_current}
-		 */
-		public final Builder indexingIndexCurrent(@Nullable String value) {
-			this.indexingIndexCurrent = value;
-			return this;
-		}
-
-		/**
-		 * number of current indexing ops
-		 * <p>
-		 * API name: {@code pri.indexing.index_current}
-		 */
-		public final Builder priIndexingIndexCurrent(@Nullable String value) {
-			this.priIndexingIndexCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time spent in indexing
-		 * <p>
-		 * API name: {@code indexing.index_time}
-		 */
-		public final Builder indexingIndexTime(@Nullable String value) {
-			this.indexingIndexTime = value;
-			return this;
-		}
-
-		/**
-		 * time spent in indexing
-		 * <p>
-		 * API name: {@code pri.indexing.index_time}
-		 */
-		public final Builder priIndexingIndexTime(@Nullable String value) {
-			this.priIndexingIndexTime = value;
-			return this;
-		}
-
-		/**
-		 * number of indexing ops
-		 * <p>
-		 * API name: {@code indexing.index_total}
-		 */
-		public final Builder indexingIndexTotal(@Nullable String value) {
-			this.indexingIndexTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of indexing ops
-		 * <p>
-		 * API name: {@code pri.indexing.index_total}
-		 */
-		public final Builder priIndexingIndexTotal(@Nullable String value) {
-			this.priIndexingIndexTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of failed indexing ops
-		 * <p>
-		 * API name: {@code indexing.index_failed}
-		 */
-		public final Builder indexingIndexFailed(@Nullable String value) {
-			this.indexingIndexFailed = value;
-			return this;
-		}
-
-		/**
-		 * number of failed indexing ops
-		 * <p>
-		 * API name: {@code pri.indexing.index_failed}
-		 */
-		public final Builder priIndexingIndexFailed(@Nullable String value) {
-			this.priIndexingIndexFailed = value;
-			return this;
-		}
-
-		/**
-		 * number of current merges
-		 * <p>
-		 * API name: {@code merges.current}
-		 */
-		public final Builder mergesCurrent(@Nullable String value) {
-			this.mergesCurrent = value;
-			return this;
-		}
-
-		/**
-		 * number of current merges
-		 * <p>
-		 * API name: {@code pri.merges.current}
-		 */
-		public final Builder priMergesCurrent(@Nullable String value) {
-			this.priMergesCurrent = value;
-			return this;
-		}
-
-		/**
-		 * number of current merging docs
-		 * <p>
-		 * API name: {@code merges.current_docs}
-		 */
-		public final Builder mergesCurrentDocs(@Nullable String value) {
-			this.mergesCurrentDocs = value;
-			return this;
-		}
-
-		/**
-		 * number of current merging docs
-		 * <p>
-		 * API name: {@code pri.merges.current_docs}
-		 */
-		public final Builder priMergesCurrentDocs(@Nullable String value) {
-			this.priMergesCurrentDocs = value;
-			return this;
-		}
-
-		/**
-		 * size of current merges
-		 * <p>
-		 * API name: {@code merges.current_size}
-		 */
-		public final Builder mergesCurrentSize(@Nullable String value) {
-			this.mergesCurrentSize = value;
-			return this;
-		}
-
-		/**
-		 * size of current merges
-		 * <p>
-		 * API name: {@code pri.merges.current_size}
-		 */
-		public final Builder priMergesCurrentSize(@Nullable String value) {
-			this.priMergesCurrentSize = value;
-			return this;
-		}
-
-		/**
-		 * number of completed merge ops
-		 * <p>
-		 * API name: {@code merges.total}
-		 */
-		public final Builder mergesTotal(@Nullable String value) {
-			this.mergesTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of completed merge ops
-		 * <p>
-		 * API name: {@code pri.merges.total}
-		 */
-		public final Builder priMergesTotal(@Nullable String value) {
-			this.priMergesTotal = value;
-			return this;
-		}
-
-		/**
-		 * docs merged
-		 * <p>
-		 * API name: {@code merges.total_docs}
-		 */
-		public final Builder mergesTotalDocs(@Nullable String value) {
-			this.mergesTotalDocs = value;
-			return this;
-		}
-
-		/**
-		 * docs merged
-		 * <p>
-		 * API name: {@code pri.merges.total_docs}
-		 */
-		public final Builder priMergesTotalDocs(@Nullable String value) {
-			this.priMergesTotalDocs = value;
-			return this;
-		}
-
-		/**
-		 * size merged
-		 * <p>
-		 * API name: {@code merges.total_size}
-		 */
-		public final Builder mergesTotalSize(@Nullable String value) {
-			this.mergesTotalSize = value;
-			return this;
-		}
-
-		/**
-		 * size merged
-		 * <p>
-		 * API name: {@code pri.merges.total_size}
-		 */
-		public final Builder priMergesTotalSize(@Nullable String value) {
-			this.priMergesTotalSize = value;
-			return this;
-		}
-
-		/**
-		 * time spent in merges
-		 * <p>
-		 * API name: {@code merges.total_time}
-		 */
-		public final Builder mergesTotalTime(@Nullable String value) {
-			this.mergesTotalTime = value;
-			return this;
-		}
-
-		/**
-		 * time spent in merges
-		 * <p>
-		 * API name: {@code pri.merges.total_time}
-		 */
-		public final Builder priMergesTotalTime(@Nullable String value) {
-			this.priMergesTotalTime = value;
-			return this;
-		}
-
-		/**
-		 * total refreshes
-		 * <p>
-		 * API name: {@code refresh.total}
-		 */
-		public final Builder refreshTotal(@Nullable String value) {
-			this.refreshTotal = value;
-			return this;
-		}
-
-		/**
-		 * total refreshes
-		 * <p>
-		 * API name: {@code pri.refresh.total}
-		 */
-		public final Builder priRefreshTotal(@Nullable String value) {
-			this.priRefreshTotal = value;
-			return this;
-		}
-
-		/**
-		 * time spent in refreshes
-		 * <p>
-		 * API name: {@code refresh.time}
-		 */
-		public final Builder refreshTime(@Nullable String value) {
-			this.refreshTime = value;
-			return this;
-		}
-
-		/**
-		 * time spent in refreshes
-		 * <p>
-		 * API name: {@code pri.refresh.time}
-		 */
-		public final Builder priRefreshTime(@Nullable String value) {
-			this.priRefreshTime = value;
-			return this;
-		}
-
-		/**
-		 * total external refreshes
-		 * <p>
-		 * API name: {@code refresh.external_total}
-		 */
-		public final Builder refreshExternalTotal(@Nullable String value) {
-			this.refreshExternalTotal = value;
-			return this;
-		}
-
-		/**
-		 * total external refreshes
-		 * <p>
-		 * API name: {@code pri.refresh.external_total}
-		 */
-		public final Builder priRefreshExternalTotal(@Nullable String value) {
-			this.priRefreshExternalTotal = value;
-			return this;
-		}
-
-		/**
-		 * time spent in external refreshes
-		 * <p>
-		 * API name: {@code refresh.external_time}
-		 */
-		public final Builder refreshExternalTime(@Nullable String value) {
-			this.refreshExternalTime = value;
-			return this;
-		}
-
-		/**
-		 * time spent in external refreshes
-		 * <p>
-		 * API name: {@code pri.refresh.external_time}
-		 */
-		public final Builder priRefreshExternalTime(@Nullable String value) {
-			this.priRefreshExternalTime = value;
-			return this;
-		}
-
-		/**
-		 * number of pending refresh listeners
-		 * <p>
-		 * API name: {@code refresh.listeners}
-		 */
-		public final Builder refreshListeners(@Nullable String value) {
-			this.refreshListeners = value;
-			return this;
-		}
-
-		/**
-		 * number of pending refresh listeners
-		 * <p>
-		 * API name: {@code pri.refresh.listeners}
-		 */
-		public final Builder priRefreshListeners(@Nullable String value) {
-			this.priRefreshListeners = value;
-			return this;
-		}
-
-		/**
-		 * current fetch phase ops
-		 * <p>
-		 * API name: {@code search.fetch_current}
-		 */
-		public final Builder searchFetchCurrent(@Nullable String value) {
-			this.searchFetchCurrent = value;
-			return this;
-		}
-
-		/**
-		 * current fetch phase ops
-		 * <p>
-		 * API name: {@code pri.search.fetch_current}
-		 */
-		public final Builder priSearchFetchCurrent(@Nullable String value) {
-			this.priSearchFetchCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time spent in fetch phase
-		 * <p>
-		 * API name: {@code search.fetch_time}
-		 */
-		public final Builder searchFetchTime(@Nullable String value) {
-			this.searchFetchTime = value;
-			return this;
-		}
-
-		/**
-		 * time spent in fetch phase
-		 * <p>
-		 * API name: {@code pri.search.fetch_time}
-		 */
-		public final Builder priSearchFetchTime(@Nullable String value) {
-			this.priSearchFetchTime = value;
-			return this;
-		}
-
-		/**
-		 * total fetch ops
-		 * <p>
-		 * API name: {@code search.fetch_total}
-		 */
-		public final Builder searchFetchTotal(@Nullable String value) {
-			this.searchFetchTotal = value;
-			return this;
-		}
-
-		/**
-		 * total fetch ops
-		 * <p>
-		 * API name: {@code pri.search.fetch_total}
-		 */
-		public final Builder priSearchFetchTotal(@Nullable String value) {
-			this.priSearchFetchTotal = value;
-			return this;
-		}
-
-		/**
-		 * open search contexts
-		 * <p>
-		 * API name: {@code search.open_contexts}
-		 */
-		public final Builder searchOpenContexts(@Nullable String value) {
-			this.searchOpenContexts = value;
-			return this;
-		}
-
-		/**
-		 * open search contexts
-		 * <p>
-		 * API name: {@code pri.search.open_contexts}
-		 */
-		public final Builder priSearchOpenContexts(@Nullable String value) {
-			this.priSearchOpenContexts = value;
-			return this;
-		}
-
-		/**
-		 * current query phase ops
-		 * <p>
-		 * API name: {@code search.query_current}
-		 */
-		public final Builder searchQueryCurrent(@Nullable String value) {
-			this.searchQueryCurrent = value;
-			return this;
-		}
-
-		/**
-		 * current query phase ops
-		 * <p>
-		 * API name: {@code pri.search.query_current}
-		 */
-		public final Builder priSearchQueryCurrent(@Nullable String value) {
-			this.priSearchQueryCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time spent in query phase
-		 * <p>
-		 * API name: {@code search.query_time}
-		 */
-		public final Builder searchQueryTime(@Nullable String value) {
-			this.searchQueryTime = value;
-			return this;
-		}
-
-		/**
-		 * time spent in query phase
-		 * <p>
-		 * API name: {@code pri.search.query_time}
-		 */
-		public final Builder priSearchQueryTime(@Nullable String value) {
-			this.priSearchQueryTime = value;
-			return this;
-		}
-
-		/**
-		 * total query phase ops
-		 * <p>
-		 * API name: {@code search.query_total}
-		 */
-		public final Builder searchQueryTotal(@Nullable String value) {
-			this.searchQueryTotal = value;
-			return this;
-		}
-
-		/**
-		 * total query phase ops
-		 * <p>
-		 * API name: {@code pri.search.query_total}
-		 */
-		public final Builder priSearchQueryTotal(@Nullable String value) {
-			this.priSearchQueryTotal = value;
-			return this;
-		}
-
-		/**
-		 * open scroll contexts
-		 * <p>
-		 * API name: {@code search.scroll_current}
-		 */
-		public final Builder searchScrollCurrent(@Nullable String value) {
-			this.searchScrollCurrent = value;
-			return this;
-		}
-
-		/**
-		 * open scroll contexts
-		 * <p>
-		 * API name: {@code pri.search.scroll_current}
-		 */
-		public final Builder priSearchScrollCurrent(@Nullable String value) {
-			this.priSearchScrollCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time scroll contexts held open
-		 * <p>
-		 * API name: {@code search.scroll_time}
-		 */
-		public final Builder searchScrollTime(@Nullable String value) {
-			this.searchScrollTime = value;
-			return this;
-		}
-
-		/**
-		 * time scroll contexts held open
-		 * <p>
-		 * API name: {@code pri.search.scroll_time}
-		 */
-		public final Builder priSearchScrollTime(@Nullable String value) {
-			this.priSearchScrollTime = value;
-			return this;
-		}
-
-		/**
-		 * completed scroll contexts
-		 * <p>
-		 * API name: {@code search.scroll_total}
-		 */
-		public final Builder searchScrollTotal(@Nullable String value) {
-			this.searchScrollTotal = value;
-			return this;
-		}
-
-		/**
-		 * completed scroll contexts
-		 * <p>
-		 * API name: {@code pri.search.scroll_total}
-		 */
-		public final Builder priSearchScrollTotal(@Nullable String value) {
-			this.priSearchScrollTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of segments
-		 * <p>
-		 * API name: {@code segments.count}
-		 */
-		public final Builder segmentsCount(@Nullable String value) {
-			this.segmentsCount = value;
-			return this;
-		}
-
-		/**
-		 * number of segments
-		 * <p>
-		 * API name: {@code pri.segments.count}
-		 */
-		public final Builder priSegmentsCount(@Nullable String value) {
-			this.priSegmentsCount = value;
-			return this;
-		}
-
-		/**
-		 * memory used by segments
-		 * <p>
-		 * API name: {@code segments.memory}
-		 */
-		public final Builder segmentsMemory(@Nullable String value) {
-			this.segmentsMemory = value;
-			return this;
-		}
-
-		/**
-		 * memory used by segments
-		 * <p>
-		 * API name: {@code pri.segments.memory}
-		 */
-		public final Builder priSegmentsMemory(@Nullable String value) {
-			this.priSegmentsMemory = value;
-			return this;
-		}
-
-		/**
-		 * memory used by index writer
-		 * <p>
-		 * API name: {@code segments.index_writer_memory}
-		 */
-		public final Builder segmentsIndexWriterMemory(@Nullable String value) {
-			this.segmentsIndexWriterMemory = value;
-			return this;
-		}
-
-		/**
-		 * memory used by index writer
-		 * <p>
-		 * API name: {@code pri.segments.index_writer_memory}
-		 */
-		public final Builder priSegmentsIndexWriterMemory(@Nullable String value) {
-			this.priSegmentsIndexWriterMemory = value;
-			return this;
-		}
-
-		/**
-		 * memory used by version map
-		 * <p>
-		 * API name: {@code segments.version_map_memory}
-		 */
-		public final Builder segmentsVersionMapMemory(@Nullable String value) {
-			this.segmentsVersionMapMemory = value;
-			return this;
-		}
-
-		/**
-		 * memory used by version map
-		 * <p>
-		 * API name: {@code pri.segments.version_map_memory}
-		 */
-		public final Builder priSegmentsVersionMapMemory(@Nullable String value) {
-			this.priSegmentsVersionMapMemory = value;
-			return this;
-		}
-
-		/**
-		 * memory used by fixed bit sets for nested object field types and export type
-		 * filters for types referred in _parent fields
-		 * <p>
-		 * API name: {@code segments.fixed_bitset_memory}
-		 */
-		public final Builder segmentsFixedBitsetMemory(@Nullable String value) {
-			this.segmentsFixedBitsetMemory = value;
-			return this;
-		}
-
-		/**
-		 * memory used by fixed bit sets for nested object field types and export type
-		 * filters for types referred in _parent fields
-		 * <p>
-		 * API name: {@code pri.segments.fixed_bitset_memory}
-		 */
-		public final Builder priSegmentsFixedBitsetMemory(@Nullable String value) {
-			this.priSegmentsFixedBitsetMemory = value;
-			return this;
-		}
-
-		/**
-		 * current warmer ops
-		 * <p>
-		 * API name: {@code warmer.current}
-		 */
-		public final Builder warmerCurrent(@Nullable String value) {
-			this.warmerCurrent = value;
-			return this;
-		}
-
-		/**
-		 * current warmer ops
-		 * <p>
-		 * API name: {@code pri.warmer.current}
-		 */
-		public final Builder priWarmerCurrent(@Nullable String value) {
-			this.priWarmerCurrent = value;
-			return this;
-		}
-
-		/**
-		 * total warmer ops
-		 * <p>
-		 * API name: {@code warmer.total}
-		 */
-		public final Builder warmerTotal(@Nullable String value) {
-			this.warmerTotal = value;
-			return this;
-		}
-
-		/**
-		 * total warmer ops
-		 * <p>
-		 * API name: {@code pri.warmer.total}
-		 */
-		public final Builder priWarmerTotal(@Nullable String value) {
-			this.priWarmerTotal = value;
-			return this;
-		}
-
-		/**
-		 * time spent in warmers
-		 * <p>
-		 * API name: {@code warmer.total_time}
-		 */
-		public final Builder warmerTotalTime(@Nullable String value) {
-			this.warmerTotalTime = value;
-			return this;
-		}
-
-		/**
-		 * time spent in warmers
-		 * <p>
-		 * API name: {@code pri.warmer.total_time}
-		 */
-		public final Builder priWarmerTotalTime(@Nullable String value) {
-			this.priWarmerTotalTime = value;
-			return this;
-		}
-
-		/**
-		 * number of current suggest ops
-		 * <p>
-		 * API name: {@code suggest.current}
-		 */
-		public final Builder suggestCurrent(@Nullable String value) {
-			this.suggestCurrent = value;
-			return this;
-		}
-
-		/**
-		 * number of current suggest ops
-		 * <p>
-		 * API name: {@code pri.suggest.current}
-		 */
-		public final Builder priSuggestCurrent(@Nullable String value) {
-			this.priSuggestCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time spend in suggest
-		 * <p>
-		 * API name: {@code suggest.time}
-		 */
-		public final Builder suggestTime(@Nullable String value) {
-			this.suggestTime = value;
-			return this;
-		}
-
-		/**
-		 * time spend in suggest
-		 * <p>
-		 * API name: {@code pri.suggest.time}
-		 */
-		public final Builder priSuggestTime(@Nullable String value) {
-			this.priSuggestTime = value;
-			return this;
-		}
-
-		/**
-		 * number of suggest ops
-		 * <p>
-		 * API name: {@code suggest.total}
-		 */
-		public final Builder suggestTotal(@Nullable String value) {
-			this.suggestTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of suggest ops
-		 * <p>
-		 * API name: {@code pri.suggest.total}
-		 */
-		public final Builder priSuggestTotal(@Nullable String value) {
-			this.priSuggestTotal = value;
-			return this;
-		}
-
-		/**
-		 * total used memory
-		 * <p>
-		 * API name: {@code memory.total}
-		 */
-		public final Builder memoryTotal(@Nullable String value) {
-			this.memoryTotal = value;
-			return this;
-		}
-
-		/**
-		 * total user memory
-		 * <p>
-		 * API name: {@code pri.memory.total}
-		 */
-		public final Builder priMemoryTotal(@Nullable String value) {
-			this.priMemoryTotal = value;
-			return this;
-		}
-
-		/**
-		 * indicates if the index is search throttled
-		 * <p>
-		 * API name: {@code search.throttled}
-		 */
-		public final Builder searchThrottled(@Nullable String value) {
-			this.searchThrottled = value;
-			return this;
-		}
-
-		/**
-		 * number of bulk shard ops
-		 * <p>
-		 * API name: {@code bulk.total_operations}
-		 */
-		public final Builder bulkTotalOperations(@Nullable String value) {
-			this.bulkTotalOperations = value;
-			return this;
-		}
-
-		/**
-		 * number of bulk shard ops
-		 * <p>
-		 * API name: {@code pri.bulk.total_operations}
-		 */
-		public final Builder priBulkTotalOperations(@Nullable String value) {
-			this.priBulkTotalOperations = value;
-			return this;
-		}
-
-		/**
-		 * time spend in shard bulk
-		 * <p>
-		 * API name: {@code bulk.total_time}
-		 */
-		public final Builder bulkTotalTime(@Nullable String value) {
-			this.bulkTotalTime = value;
-			return this;
-		}
-
-		/**
-		 * time spend in shard bulk
-		 * <p>
-		 * API name: {@code pri.bulk.total_time}
-		 */
-		public final Builder priBulkTotalTime(@Nullable String value) {
-			this.priBulkTotalTime = value;
-			return this;
-		}
-
-		/**
-		 * total size in bytes of shard bulk
-		 * <p>
-		 * API name: {@code bulk.total_size_in_bytes}
-		 */
-		public final Builder bulkTotalSizeInBytes(@Nullable String value) {
-			this.bulkTotalSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * total size in bytes of shard bulk
-		 * <p>
-		 * API name: {@code pri.bulk.total_size_in_bytes}
-		 */
-		public final Builder priBulkTotalSizeInBytes(@Nullable String value) {
-			this.priBulkTotalSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * average time spend in shard bulk
-		 * <p>
-		 * API name: {@code bulk.avg_time}
-		 */
-		public final Builder bulkAvgTime(@Nullable String value) {
-			this.bulkAvgTime = value;
-			return this;
-		}
-
-		/**
-		 * average time spend in shard bulk
-		 * <p>
-		 * API name: {@code pri.bulk.avg_time}
-		 */
-		public final Builder priBulkAvgTime(@Nullable String value) {
-			this.priBulkAvgTime = value;
-			return this;
-		}
-
-		/**
-		 * average size in bytes of shard bulk
-		 * <p>
-		 * API name: {@code bulk.avg_size_in_bytes}
-		 */
-		public final Builder bulkAvgSizeInBytes(@Nullable String value) {
-			this.bulkAvgSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * average size in bytes of shard bulk
-		 * <p>
-		 * API name: {@code pri.bulk.avg_size_in_bytes}
-		 */
-		public final Builder priBulkAvgSizeInBytes(@Nullable String value) {
-			this.priBulkAvgSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IndicesRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndicesRecord build() {
-			_checkSingleUse();
-
-			return new IndicesRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndicesRecord}
-	 */
-	public static final JsonpDeserializer<IndicesRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IndicesRecord::setupIndicesRecordDeserializer);
-
-	protected static void setupIndicesRecordDeserializer(ObjectDeserializer<IndicesRecord.Builder> op) {
-
-		op.add(Builder::health, JsonpDeserializer.stringDeserializer(), "health", "h");
-		op.add(Builder::status, JsonpDeserializer.stringDeserializer(), "status", "s");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index", "i", "idx");
-		op.add(Builder::uuid, JsonpDeserializer.stringDeserializer(), "uuid", "id");
-		op.add(Builder::pri, JsonpDeserializer.stringDeserializer(), "pri", "p", "shards.primary", "shardsPrimary");
-		op.add(Builder::rep, JsonpDeserializer.stringDeserializer(), "rep", "r", "shards.replica", "shardsReplica");
-		op.add(Builder::docsCount, JsonpDeserializer.stringDeserializer(), "docs.count", "dc", "docsCount");
-		op.add(Builder::docsDeleted, JsonpDeserializer.stringDeserializer(), "docs.deleted", "dd", "docsDeleted");
-		op.add(Builder::creationDate, JsonpDeserializer.stringDeserializer(), "creation.date", "cd");
-		op.add(Builder::creationDateString, JsonpDeserializer.stringDeserializer(), "creation.date.string", "cds");
-		op.add(Builder::storeSize, JsonpDeserializer.stringDeserializer(), "store.size", "ss", "storeSize");
-		op.add(Builder::priStoreSize, JsonpDeserializer.stringDeserializer(), "pri.store.size");
-		op.add(Builder::completionSize, JsonpDeserializer.stringDeserializer(), "completion.size", "cs",
-				"completionSize");
-		op.add(Builder::priCompletionSize, JsonpDeserializer.stringDeserializer(), "pri.completion.size");
-		op.add(Builder::fielddataMemorySize, JsonpDeserializer.stringDeserializer(), "fielddata.memory_size", "fm",
-				"fielddataMemory");
-		op.add(Builder::priFielddataMemorySize, JsonpDeserializer.stringDeserializer(), "pri.fielddata.memory_size");
-		op.add(Builder::fielddataEvictions, JsonpDeserializer.stringDeserializer(), "fielddata.evictions", "fe",
-				"fielddataEvictions");
-		op.add(Builder::priFielddataEvictions, JsonpDeserializer.stringDeserializer(), "pri.fielddata.evictions");
-		op.add(Builder::queryCacheMemorySize, JsonpDeserializer.stringDeserializer(), "query_cache.memory_size", "qcm",
-				"queryCacheMemory");
-		op.add(Builder::priQueryCacheMemorySize, JsonpDeserializer.stringDeserializer(), "pri.query_cache.memory_size");
-		op.add(Builder::queryCacheEvictions, JsonpDeserializer.stringDeserializer(), "query_cache.evictions", "qce",
-				"queryCacheEvictions");
-		op.add(Builder::priQueryCacheEvictions, JsonpDeserializer.stringDeserializer(), "pri.query_cache.evictions");
-		op.add(Builder::requestCacheMemorySize, JsonpDeserializer.stringDeserializer(), "request_cache.memory_size",
-				"rcm", "requestCacheMemory");
-		op.add(Builder::priRequestCacheMemorySize, JsonpDeserializer.stringDeserializer(),
-				"pri.request_cache.memory_size");
-		op.add(Builder::requestCacheEvictions, JsonpDeserializer.stringDeserializer(), "request_cache.evictions", "rce",
-				"requestCacheEvictions");
-		op.add(Builder::priRequestCacheEvictions, JsonpDeserializer.stringDeserializer(),
-				"pri.request_cache.evictions");
-		op.add(Builder::requestCacheHitCount, JsonpDeserializer.stringDeserializer(), "request_cache.hit_count", "rchc",
-				"requestCacheHitCount");
-		op.add(Builder::priRequestCacheHitCount, JsonpDeserializer.stringDeserializer(), "pri.request_cache.hit_count");
-		op.add(Builder::requestCacheMissCount, JsonpDeserializer.stringDeserializer(), "request_cache.miss_count",
-				"rcmc", "requestCacheMissCount");
-		op.add(Builder::priRequestCacheMissCount, JsonpDeserializer.stringDeserializer(),
-				"pri.request_cache.miss_count");
-		op.add(Builder::flushTotal, JsonpDeserializer.stringDeserializer(), "flush.total", "ft", "flushTotal");
-		op.add(Builder::priFlushTotal, JsonpDeserializer.stringDeserializer(), "pri.flush.total");
-		op.add(Builder::flushTotalTime, JsonpDeserializer.stringDeserializer(), "flush.total_time", "ftt",
-				"flushTotalTime");
-		op.add(Builder::priFlushTotalTime, JsonpDeserializer.stringDeserializer(), "pri.flush.total_time");
-		op.add(Builder::getCurrent, JsonpDeserializer.stringDeserializer(), "get.current", "gc", "getCurrent");
-		op.add(Builder::priGetCurrent, JsonpDeserializer.stringDeserializer(), "pri.get.current");
-		op.add(Builder::getTime, JsonpDeserializer.stringDeserializer(), "get.time", "gti", "getTime");
-		op.add(Builder::priGetTime, JsonpDeserializer.stringDeserializer(), "pri.get.time");
-		op.add(Builder::getTotal, JsonpDeserializer.stringDeserializer(), "get.total", "gto", "getTotal");
-		op.add(Builder::priGetTotal, JsonpDeserializer.stringDeserializer(), "pri.get.total");
-		op.add(Builder::getExistsTime, JsonpDeserializer.stringDeserializer(), "get.exists_time", "geti",
-				"getExistsTime");
-		op.add(Builder::priGetExistsTime, JsonpDeserializer.stringDeserializer(), "pri.get.exists_time");
-		op.add(Builder::getExistsTotal, JsonpDeserializer.stringDeserializer(), "get.exists_total", "geto",
-				"getExistsTotal");
-		op.add(Builder::priGetExistsTotal, JsonpDeserializer.stringDeserializer(), "pri.get.exists_total");
-		op.add(Builder::getMissingTime, JsonpDeserializer.stringDeserializer(), "get.missing_time", "gmti",
-				"getMissingTime");
-		op.add(Builder::priGetMissingTime, JsonpDeserializer.stringDeserializer(), "pri.get.missing_time");
-		op.add(Builder::getMissingTotal, JsonpDeserializer.stringDeserializer(), "get.missing_total", "gmto",
-				"getMissingTotal");
-		op.add(Builder::priGetMissingTotal, JsonpDeserializer.stringDeserializer(), "pri.get.missing_total");
-		op.add(Builder::indexingDeleteCurrent, JsonpDeserializer.stringDeserializer(), "indexing.delete_current", "idc",
-				"indexingDeleteCurrent");
-		op.add(Builder::priIndexingDeleteCurrent, JsonpDeserializer.stringDeserializer(),
-				"pri.indexing.delete_current");
-		op.add(Builder::indexingDeleteTime, JsonpDeserializer.stringDeserializer(), "indexing.delete_time", "idti",
-				"indexingDeleteTime");
-		op.add(Builder::priIndexingDeleteTime, JsonpDeserializer.stringDeserializer(), "pri.indexing.delete_time");
-		op.add(Builder::indexingDeleteTotal, JsonpDeserializer.stringDeserializer(), "indexing.delete_total", "idto",
-				"indexingDeleteTotal");
-		op.add(Builder::priIndexingDeleteTotal, JsonpDeserializer.stringDeserializer(), "pri.indexing.delete_total");
-		op.add(Builder::indexingIndexCurrent, JsonpDeserializer.stringDeserializer(), "indexing.index_current", "iic",
-				"indexingIndexCurrent");
-		op.add(Builder::priIndexingIndexCurrent, JsonpDeserializer.stringDeserializer(), "pri.indexing.index_current");
-		op.add(Builder::indexingIndexTime, JsonpDeserializer.stringDeserializer(), "indexing.index_time", "iiti",
-				"indexingIndexTime");
-		op.add(Builder::priIndexingIndexTime, JsonpDeserializer.stringDeserializer(), "pri.indexing.index_time");
-		op.add(Builder::indexingIndexTotal, JsonpDeserializer.stringDeserializer(), "indexing.index_total", "iito",
-				"indexingIndexTotal");
-		op.add(Builder::priIndexingIndexTotal, JsonpDeserializer.stringDeserializer(), "pri.indexing.index_total");
-		op.add(Builder::indexingIndexFailed, JsonpDeserializer.stringDeserializer(), "indexing.index_failed", "iif",
-				"indexingIndexFailed");
-		op.add(Builder::priIndexingIndexFailed, JsonpDeserializer.stringDeserializer(), "pri.indexing.index_failed");
-		op.add(Builder::mergesCurrent, JsonpDeserializer.stringDeserializer(), "merges.current", "mc", "mergesCurrent");
-		op.add(Builder::priMergesCurrent, JsonpDeserializer.stringDeserializer(), "pri.merges.current");
-		op.add(Builder::mergesCurrentDocs, JsonpDeserializer.stringDeserializer(), "merges.current_docs", "mcd",
-				"mergesCurrentDocs");
-		op.add(Builder::priMergesCurrentDocs, JsonpDeserializer.stringDeserializer(), "pri.merges.current_docs");
-		op.add(Builder::mergesCurrentSize, JsonpDeserializer.stringDeserializer(), "merges.current_size", "mcs",
-				"mergesCurrentSize");
-		op.add(Builder::priMergesCurrentSize, JsonpDeserializer.stringDeserializer(), "pri.merges.current_size");
-		op.add(Builder::mergesTotal, JsonpDeserializer.stringDeserializer(), "merges.total", "mt", "mergesTotal");
-		op.add(Builder::priMergesTotal, JsonpDeserializer.stringDeserializer(), "pri.merges.total");
-		op.add(Builder::mergesTotalDocs, JsonpDeserializer.stringDeserializer(), "merges.total_docs", "mtd",
-				"mergesTotalDocs");
-		op.add(Builder::priMergesTotalDocs, JsonpDeserializer.stringDeserializer(), "pri.merges.total_docs");
-		op.add(Builder::mergesTotalSize, JsonpDeserializer.stringDeserializer(), "merges.total_size", "mts",
-				"mergesTotalSize");
-		op.add(Builder::priMergesTotalSize, JsonpDeserializer.stringDeserializer(), "pri.merges.total_size");
-		op.add(Builder::mergesTotalTime, JsonpDeserializer.stringDeserializer(), "merges.total_time", "mtt",
-				"mergesTotalTime");
-		op.add(Builder::priMergesTotalTime, JsonpDeserializer.stringDeserializer(), "pri.merges.total_time");
-		op.add(Builder::refreshTotal, JsonpDeserializer.stringDeserializer(), "refresh.total", "rto", "refreshTotal");
-		op.add(Builder::priRefreshTotal, JsonpDeserializer.stringDeserializer(), "pri.refresh.total");
-		op.add(Builder::refreshTime, JsonpDeserializer.stringDeserializer(), "refresh.time", "rti", "refreshTime");
-		op.add(Builder::priRefreshTime, JsonpDeserializer.stringDeserializer(), "pri.refresh.time");
-		op.add(Builder::refreshExternalTotal, JsonpDeserializer.stringDeserializer(), "refresh.external_total", "reto");
-		op.add(Builder::priRefreshExternalTotal, JsonpDeserializer.stringDeserializer(), "pri.refresh.external_total");
-		op.add(Builder::refreshExternalTime, JsonpDeserializer.stringDeserializer(), "refresh.external_time", "reti");
-		op.add(Builder::priRefreshExternalTime, JsonpDeserializer.stringDeserializer(), "pri.refresh.external_time");
-		op.add(Builder::refreshListeners, JsonpDeserializer.stringDeserializer(), "refresh.listeners", "rli",
-				"refreshListeners");
-		op.add(Builder::priRefreshListeners, JsonpDeserializer.stringDeserializer(), "pri.refresh.listeners");
-		op.add(Builder::searchFetchCurrent, JsonpDeserializer.stringDeserializer(), "search.fetch_current", "sfc",
-				"searchFetchCurrent");
-		op.add(Builder::priSearchFetchCurrent, JsonpDeserializer.stringDeserializer(), "pri.search.fetch_current");
-		op.add(Builder::searchFetchTime, JsonpDeserializer.stringDeserializer(), "search.fetch_time", "sfti",
-				"searchFetchTime");
-		op.add(Builder::priSearchFetchTime, JsonpDeserializer.stringDeserializer(), "pri.search.fetch_time");
-		op.add(Builder::searchFetchTotal, JsonpDeserializer.stringDeserializer(), "search.fetch_total", "sfto",
-				"searchFetchTotal");
-		op.add(Builder::priSearchFetchTotal, JsonpDeserializer.stringDeserializer(), "pri.search.fetch_total");
-		op.add(Builder::searchOpenContexts, JsonpDeserializer.stringDeserializer(), "search.open_contexts", "so",
-				"searchOpenContexts");
-		op.add(Builder::priSearchOpenContexts, JsonpDeserializer.stringDeserializer(), "pri.search.open_contexts");
-		op.add(Builder::searchQueryCurrent, JsonpDeserializer.stringDeserializer(), "search.query_current", "sqc",
-				"searchQueryCurrent");
-		op.add(Builder::priSearchQueryCurrent, JsonpDeserializer.stringDeserializer(), "pri.search.query_current");
-		op.add(Builder::searchQueryTime, JsonpDeserializer.stringDeserializer(), "search.query_time", "sqti",
-				"searchQueryTime");
-		op.add(Builder::priSearchQueryTime, JsonpDeserializer.stringDeserializer(), "pri.search.query_time");
-		op.add(Builder::searchQueryTotal, JsonpDeserializer.stringDeserializer(), "search.query_total", "sqto",
-				"searchQueryTotal");
-		op.add(Builder::priSearchQueryTotal, JsonpDeserializer.stringDeserializer(), "pri.search.query_total");
-		op.add(Builder::searchScrollCurrent, JsonpDeserializer.stringDeserializer(), "search.scroll_current", "scc",
-				"searchScrollCurrent");
-		op.add(Builder::priSearchScrollCurrent, JsonpDeserializer.stringDeserializer(), "pri.search.scroll_current");
-		op.add(Builder::searchScrollTime, JsonpDeserializer.stringDeserializer(), "search.scroll_time", "scti",
-				"searchScrollTime");
-		op.add(Builder::priSearchScrollTime, JsonpDeserializer.stringDeserializer(), "pri.search.scroll_time");
-		op.add(Builder::searchScrollTotal, JsonpDeserializer.stringDeserializer(), "search.scroll_total", "scto",
-				"searchScrollTotal");
-		op.add(Builder::priSearchScrollTotal, JsonpDeserializer.stringDeserializer(), "pri.search.scroll_total");
-		op.add(Builder::segmentsCount, JsonpDeserializer.stringDeserializer(), "segments.count", "sc", "segmentsCount");
-		op.add(Builder::priSegmentsCount, JsonpDeserializer.stringDeserializer(), "pri.segments.count");
-		op.add(Builder::segmentsMemory, JsonpDeserializer.stringDeserializer(), "segments.memory", "sm",
-				"segmentsMemory");
-		op.add(Builder::priSegmentsMemory, JsonpDeserializer.stringDeserializer(), "pri.segments.memory");
-		op.add(Builder::segmentsIndexWriterMemory, JsonpDeserializer.stringDeserializer(),
-				"segments.index_writer_memory", "siwm", "segmentsIndexWriterMemory");
-		op.add(Builder::priSegmentsIndexWriterMemory, JsonpDeserializer.stringDeserializer(),
-				"pri.segments.index_writer_memory");
-		op.add(Builder::segmentsVersionMapMemory, JsonpDeserializer.stringDeserializer(), "segments.version_map_memory",
-				"svmm", "segmentsVersionMapMemory");
-		op.add(Builder::priSegmentsVersionMapMemory, JsonpDeserializer.stringDeserializer(),
-				"pri.segments.version_map_memory");
-		op.add(Builder::segmentsFixedBitsetMemory, JsonpDeserializer.stringDeserializer(),
-				"segments.fixed_bitset_memory", "sfbm", "fixedBitsetMemory");
-		op.add(Builder::priSegmentsFixedBitsetMemory, JsonpDeserializer.stringDeserializer(),
-				"pri.segments.fixed_bitset_memory");
-		op.add(Builder::warmerCurrent, JsonpDeserializer.stringDeserializer(), "warmer.current", "wc", "warmerCurrent");
-		op.add(Builder::priWarmerCurrent, JsonpDeserializer.stringDeserializer(), "pri.warmer.current");
-		op.add(Builder::warmerTotal, JsonpDeserializer.stringDeserializer(), "warmer.total", "wto", "warmerTotal");
-		op.add(Builder::priWarmerTotal, JsonpDeserializer.stringDeserializer(), "pri.warmer.total");
-		op.add(Builder::warmerTotalTime, JsonpDeserializer.stringDeserializer(), "warmer.total_time", "wtt",
-				"warmerTotalTime");
-		op.add(Builder::priWarmerTotalTime, JsonpDeserializer.stringDeserializer(), "pri.warmer.total_time");
-		op.add(Builder::suggestCurrent, JsonpDeserializer.stringDeserializer(), "suggest.current", "suc",
-				"suggestCurrent");
-		op.add(Builder::priSuggestCurrent, JsonpDeserializer.stringDeserializer(), "pri.suggest.current");
-		op.add(Builder::suggestTime, JsonpDeserializer.stringDeserializer(), "suggest.time", "suti", "suggestTime");
-		op.add(Builder::priSuggestTime, JsonpDeserializer.stringDeserializer(), "pri.suggest.time");
-		op.add(Builder::suggestTotal, JsonpDeserializer.stringDeserializer(), "suggest.total", "suto", "suggestTotal");
-		op.add(Builder::priSuggestTotal, JsonpDeserializer.stringDeserializer(), "pri.suggest.total");
-		op.add(Builder::memoryTotal, JsonpDeserializer.stringDeserializer(), "memory.total", "tm", "memoryTotal");
-		op.add(Builder::priMemoryTotal, JsonpDeserializer.stringDeserializer(), "pri.memory.total");
-		op.add(Builder::searchThrottled, JsonpDeserializer.stringDeserializer(), "search.throttled", "sth");
-		op.add(Builder::bulkTotalOperations, JsonpDeserializer.stringDeserializer(), "bulk.total_operations", "bto",
-				"bulkTotalOperation");
-		op.add(Builder::priBulkTotalOperations, JsonpDeserializer.stringDeserializer(), "pri.bulk.total_operations");
-		op.add(Builder::bulkTotalTime, JsonpDeserializer.stringDeserializer(), "bulk.total_time", "btti",
-				"bulkTotalTime");
-		op.add(Builder::priBulkTotalTime, JsonpDeserializer.stringDeserializer(), "pri.bulk.total_time");
-		op.add(Builder::bulkTotalSizeInBytes, JsonpDeserializer.stringDeserializer(), "bulk.total_size_in_bytes",
-				"btsi", "bulkTotalSizeInBytes");
-		op.add(Builder::priBulkTotalSizeInBytes, JsonpDeserializer.stringDeserializer(),
-				"pri.bulk.total_size_in_bytes");
-		op.add(Builder::bulkAvgTime, JsonpDeserializer.stringDeserializer(), "bulk.avg_time", "bati", "bulkAvgTime");
-		op.add(Builder::priBulkAvgTime, JsonpDeserializer.stringDeserializer(), "pri.bulk.avg_time");
-		op.add(Builder::bulkAvgSizeInBytes, JsonpDeserializer.stringDeserializer(), "bulk.avg_size_in_bytes", "basi",
-				"bulkAvgSizeInBytes");
-		op.add(Builder::priBulkAvgSizeInBytes, JsonpDeserializer.stringDeserializer(), "pri.bulk.avg_size_in_bytes");
-
-	}
+        @Nullable
+        private String priBulkTotalOperations;
+
+        @Nullable
+        private String bulkTotalTime;
+
+        @Nullable
+        private String priBulkTotalTime;
+
+        @Nullable
+        private String bulkTotalSizeInBytes;
+
+        @Nullable
+        private String priBulkTotalSizeInBytes;
+
+        @Nullable
+        private String bulkAvgTime;
+
+        @Nullable
+        private String priBulkAvgTime;
+
+        @Nullable
+        private String bulkAvgSizeInBytes;
+
+        @Nullable
+        private String priBulkAvgSizeInBytes;
+
+        /**
+         * current health status
+         * <p>
+         * API name: {@code health}
+         */
+        public final Builder health(@Nullable String value) {
+            this.health = value;
+            return this;
+        }
+
+        /**
+         * open/close status
+         * <p>
+         * API name: {@code status}
+         */
+        public final Builder status(@Nullable String value) {
+            this.status = value;
+            return this;
+        }
+
+        /**
+         * index name
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * index uuid
+         * <p>
+         * API name: {@code uuid}
+         */
+        public final Builder uuid(@Nullable String value) {
+            this.uuid = value;
+            return this;
+        }
+
+        /**
+         * number of primary shards
+         * <p>
+         * API name: {@code pri}
+         */
+        public final Builder pri(@Nullable String value) {
+            this.pri = value;
+            return this;
+        }
+
+        /**
+         * number of replica shards
+         * <p>
+         * API name: {@code rep}
+         */
+        public final Builder rep(@Nullable String value) {
+            this.rep = value;
+            return this;
+        }
+
+        /**
+         * available docs
+         * <p>
+         * API name: {@code docs.count}
+         */
+        public final Builder docsCount(@Nullable String value) {
+            this.docsCount = value;
+            return this;
+        }
+
+        /**
+         * deleted docs
+         * <p>
+         * API name: {@code docs.deleted}
+         */
+        public final Builder docsDeleted(@Nullable String value) {
+            this.docsDeleted = value;
+            return this;
+        }
+
+        /**
+         * index creation date (millisecond value)
+         * <p>
+         * API name: {@code creation.date}
+         */
+        public final Builder creationDate(@Nullable String value) {
+            this.creationDate = value;
+            return this;
+        }
+
+        /**
+         * index creation date (as string)
+         * <p>
+         * API name: {@code creation.date.string}
+         */
+        public final Builder creationDateString(@Nullable String value) {
+            this.creationDateString = value;
+            return this;
+        }
+
+        /**
+         * store size of primaries &amp; replicas
+         * <p>
+         * API name: {@code store.size}
+         */
+        public final Builder storeSize(@Nullable String value) {
+            this.storeSize = value;
+            return this;
+        }
+
+        /**
+         * store size of primaries
+         * <p>
+         * API name: {@code pri.store.size}
+         */
+        public final Builder priStoreSize(@Nullable String value) {
+            this.priStoreSize = value;
+            return this;
+        }
+
+        /**
+         * size of completion
+         * <p>
+         * API name: {@code completion.size}
+         */
+        public final Builder completionSize(@Nullable String value) {
+            this.completionSize = value;
+            return this;
+        }
+
+        /**
+         * size of completion
+         * <p>
+         * API name: {@code pri.completion.size}
+         */
+        public final Builder priCompletionSize(@Nullable String value) {
+            this.priCompletionSize = value;
+            return this;
+        }
+
+        /**
+         * used fielddata cache
+         * <p>
+         * API name: {@code fielddata.memory_size}
+         */
+        public final Builder fielddataMemorySize(@Nullable String value) {
+            this.fielddataMemorySize = value;
+            return this;
+        }
+
+        /**
+         * used fielddata cache
+         * <p>
+         * API name: {@code pri.fielddata.memory_size}
+         */
+        public final Builder priFielddataMemorySize(@Nullable String value) {
+            this.priFielddataMemorySize = value;
+            return this;
+        }
+
+        /**
+         * fielddata evictions
+         * <p>
+         * API name: {@code fielddata.evictions}
+         */
+        public final Builder fielddataEvictions(@Nullable String value) {
+            this.fielddataEvictions = value;
+            return this;
+        }
+
+        /**
+         * fielddata evictions
+         * <p>
+         * API name: {@code pri.fielddata.evictions}
+         */
+        public final Builder priFielddataEvictions(@Nullable String value) {
+            this.priFielddataEvictions = value;
+            return this;
+        }
+
+        /**
+         * used query cache
+         * <p>
+         * API name: {@code query_cache.memory_size}
+         */
+        public final Builder queryCacheMemorySize(@Nullable String value) {
+            this.queryCacheMemorySize = value;
+            return this;
+        }
+
+        /**
+         * used query cache
+         * <p>
+         * API name: {@code pri.query_cache.memory_size}
+         */
+        public final Builder priQueryCacheMemorySize(@Nullable String value) {
+            this.priQueryCacheMemorySize = value;
+            return this;
+        }
+
+        /**
+         * query cache evictions
+         * <p>
+         * API name: {@code query_cache.evictions}
+         */
+        public final Builder queryCacheEvictions(@Nullable String value) {
+            this.queryCacheEvictions = value;
+            return this;
+        }
+
+        /**
+         * query cache evictions
+         * <p>
+         * API name: {@code pri.query_cache.evictions}
+         */
+        public final Builder priQueryCacheEvictions(@Nullable String value) {
+            this.priQueryCacheEvictions = value;
+            return this;
+        }
+
+        /**
+         * used request cache
+         * <p>
+         * API name: {@code request_cache.memory_size}
+         */
+        public final Builder requestCacheMemorySize(@Nullable String value) {
+            this.requestCacheMemorySize = value;
+            return this;
+        }
+
+        /**
+         * used request cache
+         * <p>
+         * API name: {@code pri.request_cache.memory_size}
+         */
+        public final Builder priRequestCacheMemorySize(@Nullable String value) {
+            this.priRequestCacheMemorySize = value;
+            return this;
+        }
+
+        /**
+         * request cache evictions
+         * <p>
+         * API name: {@code request_cache.evictions}
+         */
+        public final Builder requestCacheEvictions(@Nullable String value) {
+            this.requestCacheEvictions = value;
+            return this;
+        }
+
+        /**
+         * request cache evictions
+         * <p>
+         * API name: {@code pri.request_cache.evictions}
+         */
+        public final Builder priRequestCacheEvictions(@Nullable String value) {
+            this.priRequestCacheEvictions = value;
+            return this;
+        }
+
+        /**
+         * request cache hit count
+         * <p>
+         * API name: {@code request_cache.hit_count}
+         */
+        public final Builder requestCacheHitCount(@Nullable String value) {
+            this.requestCacheHitCount = value;
+            return this;
+        }
+
+        /**
+         * request cache hit count
+         * <p>
+         * API name: {@code pri.request_cache.hit_count}
+         */
+        public final Builder priRequestCacheHitCount(@Nullable String value) {
+            this.priRequestCacheHitCount = value;
+            return this;
+        }
+
+        /**
+         * request cache miss count
+         * <p>
+         * API name: {@code request_cache.miss_count}
+         */
+        public final Builder requestCacheMissCount(@Nullable String value) {
+            this.requestCacheMissCount = value;
+            return this;
+        }
+
+        /**
+         * request cache miss count
+         * <p>
+         * API name: {@code pri.request_cache.miss_count}
+         */
+        public final Builder priRequestCacheMissCount(@Nullable String value) {
+            this.priRequestCacheMissCount = value;
+            return this;
+        }
+
+        /**
+         * number of flushes
+         * <p>
+         * API name: {@code flush.total}
+         */
+        public final Builder flushTotal(@Nullable String value) {
+            this.flushTotal = value;
+            return this;
+        }
+
+        /**
+         * number of flushes
+         * <p>
+         * API name: {@code pri.flush.total}
+         */
+        public final Builder priFlushTotal(@Nullable String value) {
+            this.priFlushTotal = value;
+            return this;
+        }
+
+        /**
+         * time spent in flush
+         * <p>
+         * API name: {@code flush.total_time}
+         */
+        public final Builder flushTotalTime(@Nullable String value) {
+            this.flushTotalTime = value;
+            return this;
+        }
+
+        /**
+         * time spent in flush
+         * <p>
+         * API name: {@code pri.flush.total_time}
+         */
+        public final Builder priFlushTotalTime(@Nullable String value) {
+            this.priFlushTotalTime = value;
+            return this;
+        }
+
+        /**
+         * number of current get ops
+         * <p>
+         * API name: {@code get.current}
+         */
+        public final Builder getCurrent(@Nullable String value) {
+            this.getCurrent = value;
+            return this;
+        }
+
+        /**
+         * number of current get ops
+         * <p>
+         * API name: {@code pri.get.current}
+         */
+        public final Builder priGetCurrent(@Nullable String value) {
+            this.priGetCurrent = value;
+            return this;
+        }
+
+        /**
+         * time spent in get
+         * <p>
+         * API name: {@code get.time}
+         */
+        public final Builder getTime(@Nullable String value) {
+            this.getTime = value;
+            return this;
+        }
+
+        /**
+         * time spent in get
+         * <p>
+         * API name: {@code pri.get.time}
+         */
+        public final Builder priGetTime(@Nullable String value) {
+            this.priGetTime = value;
+            return this;
+        }
+
+        /**
+         * number of get ops
+         * <p>
+         * API name: {@code get.total}
+         */
+        public final Builder getTotal(@Nullable String value) {
+            this.getTotal = value;
+            return this;
+        }
+
+        /**
+         * number of get ops
+         * <p>
+         * API name: {@code pri.get.total}
+         */
+        public final Builder priGetTotal(@Nullable String value) {
+            this.priGetTotal = value;
+            return this;
+        }
+
+        /**
+         * time spent in successful gets
+         * <p>
+         * API name: {@code get.exists_time}
+         */
+        public final Builder getExistsTime(@Nullable String value) {
+            this.getExistsTime = value;
+            return this;
+        }
+
+        /**
+         * time spent in successful gets
+         * <p>
+         * API name: {@code pri.get.exists_time}
+         */
+        public final Builder priGetExistsTime(@Nullable String value) {
+            this.priGetExistsTime = value;
+            return this;
+        }
+
+        /**
+         * number of successful gets
+         * <p>
+         * API name: {@code get.exists_total}
+         */
+        public final Builder getExistsTotal(@Nullable String value) {
+            this.getExistsTotal = value;
+            return this;
+        }
+
+        /**
+         * number of successful gets
+         * <p>
+         * API name: {@code pri.get.exists_total}
+         */
+        public final Builder priGetExistsTotal(@Nullable String value) {
+            this.priGetExistsTotal = value;
+            return this;
+        }
+
+        /**
+         * time spent in failed gets
+         * <p>
+         * API name: {@code get.missing_time}
+         */
+        public final Builder getMissingTime(@Nullable String value) {
+            this.getMissingTime = value;
+            return this;
+        }
+
+        /**
+         * time spent in failed gets
+         * <p>
+         * API name: {@code pri.get.missing_time}
+         */
+        public final Builder priGetMissingTime(@Nullable String value) {
+            this.priGetMissingTime = value;
+            return this;
+        }
+
+        /**
+         * number of failed gets
+         * <p>
+         * API name: {@code get.missing_total}
+         */
+        public final Builder getMissingTotal(@Nullable String value) {
+            this.getMissingTotal = value;
+            return this;
+        }
+
+        /**
+         * number of failed gets
+         * <p>
+         * API name: {@code pri.get.missing_total}
+         */
+        public final Builder priGetMissingTotal(@Nullable String value) {
+            this.priGetMissingTotal = value;
+            return this;
+        }
+
+        /**
+         * number of current deletions
+         * <p>
+         * API name: {@code indexing.delete_current}
+         */
+        public final Builder indexingDeleteCurrent(@Nullable String value) {
+            this.indexingDeleteCurrent = value;
+            return this;
+        }
+
+        /**
+         * number of current deletions
+         * <p>
+         * API name: {@code pri.indexing.delete_current}
+         */
+        public final Builder priIndexingDeleteCurrent(@Nullable String value) {
+            this.priIndexingDeleteCurrent = value;
+            return this;
+        }
+
+        /**
+         * time spent in deletions
+         * <p>
+         * API name: {@code indexing.delete_time}
+         */
+        public final Builder indexingDeleteTime(@Nullable String value) {
+            this.indexingDeleteTime = value;
+            return this;
+        }
+
+        /**
+         * time spent in deletions
+         * <p>
+         * API name: {@code pri.indexing.delete_time}
+         */
+        public final Builder priIndexingDeleteTime(@Nullable String value) {
+            this.priIndexingDeleteTime = value;
+            return this;
+        }
+
+        /**
+         * number of delete ops
+         * <p>
+         * API name: {@code indexing.delete_total}
+         */
+        public final Builder indexingDeleteTotal(@Nullable String value) {
+            this.indexingDeleteTotal = value;
+            return this;
+        }
+
+        /**
+         * number of delete ops
+         * <p>
+         * API name: {@code pri.indexing.delete_total}
+         */
+        public final Builder priIndexingDeleteTotal(@Nullable String value) {
+            this.priIndexingDeleteTotal = value;
+            return this;
+        }
+
+        /**
+         * number of current indexing ops
+         * <p>
+         * API name: {@code indexing.index_current}
+         */
+        public final Builder indexingIndexCurrent(@Nullable String value) {
+            this.indexingIndexCurrent = value;
+            return this;
+        }
+
+        /**
+         * number of current indexing ops
+         * <p>
+         * API name: {@code pri.indexing.index_current}
+         */
+        public final Builder priIndexingIndexCurrent(@Nullable String value) {
+            this.priIndexingIndexCurrent = value;
+            return this;
+        }
+
+        /**
+         * time spent in indexing
+         * <p>
+         * API name: {@code indexing.index_time}
+         */
+        public final Builder indexingIndexTime(@Nullable String value) {
+            this.indexingIndexTime = value;
+            return this;
+        }
+
+        /**
+         * time spent in indexing
+         * <p>
+         * API name: {@code pri.indexing.index_time}
+         */
+        public final Builder priIndexingIndexTime(@Nullable String value) {
+            this.priIndexingIndexTime = value;
+            return this;
+        }
+
+        /**
+         * number of indexing ops
+         * <p>
+         * API name: {@code indexing.index_total}
+         */
+        public final Builder indexingIndexTotal(@Nullable String value) {
+            this.indexingIndexTotal = value;
+            return this;
+        }
+
+        /**
+         * number of indexing ops
+         * <p>
+         * API name: {@code pri.indexing.index_total}
+         */
+        public final Builder priIndexingIndexTotal(@Nullable String value) {
+            this.priIndexingIndexTotal = value;
+            return this;
+        }
+
+        /**
+         * number of failed indexing ops
+         * <p>
+         * API name: {@code indexing.index_failed}
+         */
+        public final Builder indexingIndexFailed(@Nullable String value) {
+            this.indexingIndexFailed = value;
+            return this;
+        }
+
+        /**
+         * number of failed indexing ops
+         * <p>
+         * API name: {@code pri.indexing.index_failed}
+         */
+        public final Builder priIndexingIndexFailed(@Nullable String value) {
+            this.priIndexingIndexFailed = value;
+            return this;
+        }
+
+        /**
+         * number of current merges
+         * <p>
+         * API name: {@code merges.current}
+         */
+        public final Builder mergesCurrent(@Nullable String value) {
+            this.mergesCurrent = value;
+            return this;
+        }
+
+        /**
+         * number of current merges
+         * <p>
+         * API name: {@code pri.merges.current}
+         */
+        public final Builder priMergesCurrent(@Nullable String value) {
+            this.priMergesCurrent = value;
+            return this;
+        }
+
+        /**
+         * number of current merging docs
+         * <p>
+         * API name: {@code merges.current_docs}
+         */
+        public final Builder mergesCurrentDocs(@Nullable String value) {
+            this.mergesCurrentDocs = value;
+            return this;
+        }
+
+        /**
+         * number of current merging docs
+         * <p>
+         * API name: {@code pri.merges.current_docs}
+         */
+        public final Builder priMergesCurrentDocs(@Nullable String value) {
+            this.priMergesCurrentDocs = value;
+            return this;
+        }
+
+        /**
+         * size of current merges
+         * <p>
+         * API name: {@code merges.current_size}
+         */
+        public final Builder mergesCurrentSize(@Nullable String value) {
+            this.mergesCurrentSize = value;
+            return this;
+        }
+
+        /**
+         * size of current merges
+         * <p>
+         * API name: {@code pri.merges.current_size}
+         */
+        public final Builder priMergesCurrentSize(@Nullable String value) {
+            this.priMergesCurrentSize = value;
+            return this;
+        }
+
+        /**
+         * number of completed merge ops
+         * <p>
+         * API name: {@code merges.total}
+         */
+        public final Builder mergesTotal(@Nullable String value) {
+            this.mergesTotal = value;
+            return this;
+        }
+
+        /**
+         * number of completed merge ops
+         * <p>
+         * API name: {@code pri.merges.total}
+         */
+        public final Builder priMergesTotal(@Nullable String value) {
+            this.priMergesTotal = value;
+            return this;
+        }
+
+        /**
+         * docs merged
+         * <p>
+         * API name: {@code merges.total_docs}
+         */
+        public final Builder mergesTotalDocs(@Nullable String value) {
+            this.mergesTotalDocs = value;
+            return this;
+        }
+
+        /**
+         * docs merged
+         * <p>
+         * API name: {@code pri.merges.total_docs}
+         */
+        public final Builder priMergesTotalDocs(@Nullable String value) {
+            this.priMergesTotalDocs = value;
+            return this;
+        }
+
+        /**
+         * size merged
+         * <p>
+         * API name: {@code merges.total_size}
+         */
+        public final Builder mergesTotalSize(@Nullable String value) {
+            this.mergesTotalSize = value;
+            return this;
+        }
+
+        /**
+         * size merged
+         * <p>
+         * API name: {@code pri.merges.total_size}
+         */
+        public final Builder priMergesTotalSize(@Nullable String value) {
+            this.priMergesTotalSize = value;
+            return this;
+        }
+
+        /**
+         * time spent in merges
+         * <p>
+         * API name: {@code merges.total_time}
+         */
+        public final Builder mergesTotalTime(@Nullable String value) {
+            this.mergesTotalTime = value;
+            return this;
+        }
+
+        /**
+         * time spent in merges
+         * <p>
+         * API name: {@code pri.merges.total_time}
+         */
+        public final Builder priMergesTotalTime(@Nullable String value) {
+            this.priMergesTotalTime = value;
+            return this;
+        }
+
+        /**
+         * total refreshes
+         * <p>
+         * API name: {@code refresh.total}
+         */
+        public final Builder refreshTotal(@Nullable String value) {
+            this.refreshTotal = value;
+            return this;
+        }
+
+        /**
+         * total refreshes
+         * <p>
+         * API name: {@code pri.refresh.total}
+         */
+        public final Builder priRefreshTotal(@Nullable String value) {
+            this.priRefreshTotal = value;
+            return this;
+        }
+
+        /**
+         * time spent in refreshes
+         * <p>
+         * API name: {@code refresh.time}
+         */
+        public final Builder refreshTime(@Nullable String value) {
+            this.refreshTime = value;
+            return this;
+        }
+
+        /**
+         * time spent in refreshes
+         * <p>
+         * API name: {@code pri.refresh.time}
+         */
+        public final Builder priRefreshTime(@Nullable String value) {
+            this.priRefreshTime = value;
+            return this;
+        }
+
+        /**
+         * total external refreshes
+         * <p>
+         * API name: {@code refresh.external_total}
+         */
+        public final Builder refreshExternalTotal(@Nullable String value) {
+            this.refreshExternalTotal = value;
+            return this;
+        }
+
+        /**
+         * total external refreshes
+         * <p>
+         * API name: {@code pri.refresh.external_total}
+         */
+        public final Builder priRefreshExternalTotal(@Nullable String value) {
+            this.priRefreshExternalTotal = value;
+            return this;
+        }
+
+        /**
+         * time spent in external refreshes
+         * <p>
+         * API name: {@code refresh.external_time}
+         */
+        public final Builder refreshExternalTime(@Nullable String value) {
+            this.refreshExternalTime = value;
+            return this;
+        }
+
+        /**
+         * time spent in external refreshes
+         * <p>
+         * API name: {@code pri.refresh.external_time}
+         */
+        public final Builder priRefreshExternalTime(@Nullable String value) {
+            this.priRefreshExternalTime = value;
+            return this;
+        }
+
+        /**
+         * number of pending refresh listeners
+         * <p>
+         * API name: {@code refresh.listeners}
+         */
+        public final Builder refreshListeners(@Nullable String value) {
+            this.refreshListeners = value;
+            return this;
+        }
+
+        /**
+         * number of pending refresh listeners
+         * <p>
+         * API name: {@code pri.refresh.listeners}
+         */
+        public final Builder priRefreshListeners(@Nullable String value) {
+            this.priRefreshListeners = value;
+            return this;
+        }
+
+        /**
+         * current fetch phase ops
+         * <p>
+         * API name: {@code search.fetch_current}
+         */
+        public final Builder searchFetchCurrent(@Nullable String value) {
+            this.searchFetchCurrent = value;
+            return this;
+        }
+
+        /**
+         * current fetch phase ops
+         * <p>
+         * API name: {@code pri.search.fetch_current}
+         */
+        public final Builder priSearchFetchCurrent(@Nullable String value) {
+            this.priSearchFetchCurrent = value;
+            return this;
+        }
+
+        /**
+         * time spent in fetch phase
+         * <p>
+         * API name: {@code search.fetch_time}
+         */
+        public final Builder searchFetchTime(@Nullable String value) {
+            this.searchFetchTime = value;
+            return this;
+        }
+
+        /**
+         * time spent in fetch phase
+         * <p>
+         * API name: {@code pri.search.fetch_time}
+         */
+        public final Builder priSearchFetchTime(@Nullable String value) {
+            this.priSearchFetchTime = value;
+            return this;
+        }
+
+        /**
+         * total fetch ops
+         * <p>
+         * API name: {@code search.fetch_total}
+         */
+        public final Builder searchFetchTotal(@Nullable String value) {
+            this.searchFetchTotal = value;
+            return this;
+        }
+
+        /**
+         * total fetch ops
+         * <p>
+         * API name: {@code pri.search.fetch_total}
+         */
+        public final Builder priSearchFetchTotal(@Nullable String value) {
+            this.priSearchFetchTotal = value;
+            return this;
+        }
+
+        /**
+         * open search contexts
+         * <p>
+         * API name: {@code search.open_contexts}
+         */
+        public final Builder searchOpenContexts(@Nullable String value) {
+            this.searchOpenContexts = value;
+            return this;
+        }
+
+        /**
+         * open search contexts
+         * <p>
+         * API name: {@code pri.search.open_contexts}
+         */
+        public final Builder priSearchOpenContexts(@Nullable String value) {
+            this.priSearchOpenContexts = value;
+            return this;
+        }
+
+        /**
+         * current query phase ops
+         * <p>
+         * API name: {@code search.query_current}
+         */
+        public final Builder searchQueryCurrent(@Nullable String value) {
+            this.searchQueryCurrent = value;
+            return this;
+        }
+
+        /**
+         * current query phase ops
+         * <p>
+         * API name: {@code pri.search.query_current}
+         */
+        public final Builder priSearchQueryCurrent(@Nullable String value) {
+            this.priSearchQueryCurrent = value;
+            return this;
+        }
+
+        /**
+         * time spent in query phase
+         * <p>
+         * API name: {@code search.query_time}
+         */
+        public final Builder searchQueryTime(@Nullable String value) {
+            this.searchQueryTime = value;
+            return this;
+        }
+
+        /**
+         * time spent in query phase
+         * <p>
+         * API name: {@code pri.search.query_time}
+         */
+        public final Builder priSearchQueryTime(@Nullable String value) {
+            this.priSearchQueryTime = value;
+            return this;
+        }
+
+        /**
+         * total query phase ops
+         * <p>
+         * API name: {@code search.query_total}
+         */
+        public final Builder searchQueryTotal(@Nullable String value) {
+            this.searchQueryTotal = value;
+            return this;
+        }
+
+        /**
+         * total query phase ops
+         * <p>
+         * API name: {@code pri.search.query_total}
+         */
+        public final Builder priSearchQueryTotal(@Nullable String value) {
+            this.priSearchQueryTotal = value;
+            return this;
+        }
+
+        /**
+         * open scroll contexts
+         * <p>
+         * API name: {@code search.scroll_current}
+         */
+        public final Builder searchScrollCurrent(@Nullable String value) {
+            this.searchScrollCurrent = value;
+            return this;
+        }
+
+        /**
+         * open scroll contexts
+         * <p>
+         * API name: {@code pri.search.scroll_current}
+         */
+        public final Builder priSearchScrollCurrent(@Nullable String value) {
+            this.priSearchScrollCurrent = value;
+            return this;
+        }
+
+        /**
+         * time scroll contexts held open
+         * <p>
+         * API name: {@code search.scroll_time}
+         */
+        public final Builder searchScrollTime(@Nullable String value) {
+            this.searchScrollTime = value;
+            return this;
+        }
+
+        /**
+         * time scroll contexts held open
+         * <p>
+         * API name: {@code pri.search.scroll_time}
+         */
+        public final Builder priSearchScrollTime(@Nullable String value) {
+            this.priSearchScrollTime = value;
+            return this;
+        }
+
+        /**
+         * completed scroll contexts
+         * <p>
+         * API name: {@code search.scroll_total}
+         */
+        public final Builder searchScrollTotal(@Nullable String value) {
+            this.searchScrollTotal = value;
+            return this;
+        }
+
+        /**
+         * completed scroll contexts
+         * <p>
+         * API name: {@code pri.search.scroll_total}
+         */
+        public final Builder priSearchScrollTotal(@Nullable String value) {
+            this.priSearchScrollTotal = value;
+            return this;
+        }
+
+        /**
+         * number of segments
+         * <p>
+         * API name: {@code segments.count}
+         */
+        public final Builder segmentsCount(@Nullable String value) {
+            this.segmentsCount = value;
+            return this;
+        }
+
+        /**
+         * number of segments
+         * <p>
+         * API name: {@code pri.segments.count}
+         */
+        public final Builder priSegmentsCount(@Nullable String value) {
+            this.priSegmentsCount = value;
+            return this;
+        }
+
+        /**
+         * memory used by segments
+         * <p>
+         * API name: {@code segments.memory}
+         */
+        public final Builder segmentsMemory(@Nullable String value) {
+            this.segmentsMemory = value;
+            return this;
+        }
+
+        /**
+         * memory used by segments
+         * <p>
+         * API name: {@code pri.segments.memory}
+         */
+        public final Builder priSegmentsMemory(@Nullable String value) {
+            this.priSegmentsMemory = value;
+            return this;
+        }
+
+        /**
+         * memory used by index writer
+         * <p>
+         * API name: {@code segments.index_writer_memory}
+         */
+        public final Builder segmentsIndexWriterMemory(@Nullable String value) {
+            this.segmentsIndexWriterMemory = value;
+            return this;
+        }
+
+        /**
+         * memory used by index writer
+         * <p>
+         * API name: {@code pri.segments.index_writer_memory}
+         */
+        public final Builder priSegmentsIndexWriterMemory(@Nullable String value) {
+            this.priSegmentsIndexWriterMemory = value;
+            return this;
+        }
+
+        /**
+         * memory used by version map
+         * <p>
+         * API name: {@code segments.version_map_memory}
+         */
+        public final Builder segmentsVersionMapMemory(@Nullable String value) {
+            this.segmentsVersionMapMemory = value;
+            return this;
+        }
+
+        /**
+         * memory used by version map
+         * <p>
+         * API name: {@code pri.segments.version_map_memory}
+         */
+        public final Builder priSegmentsVersionMapMemory(@Nullable String value) {
+            this.priSegmentsVersionMapMemory = value;
+            return this;
+        }
+
+        /**
+         * memory used by fixed bit sets for nested object field types and export type
+         * filters for types referred in _parent fields
+         * <p>
+         * API name: {@code segments.fixed_bitset_memory}
+         */
+        public final Builder segmentsFixedBitsetMemory(@Nullable String value) {
+            this.segmentsFixedBitsetMemory = value;
+            return this;
+        }
+
+        /**
+         * memory used by fixed bit sets for nested object field types and export type
+         * filters for types referred in _parent fields
+         * <p>
+         * API name: {@code pri.segments.fixed_bitset_memory}
+         */
+        public final Builder priSegmentsFixedBitsetMemory(@Nullable String value) {
+            this.priSegmentsFixedBitsetMemory = value;
+            return this;
+        }
+
+        /**
+         * current warmer ops
+         * <p>
+         * API name: {@code warmer.current}
+         */
+        public final Builder warmerCurrent(@Nullable String value) {
+            this.warmerCurrent = value;
+            return this;
+        }
+
+        /**
+         * current warmer ops
+         * <p>
+         * API name: {@code pri.warmer.current}
+         */
+        public final Builder priWarmerCurrent(@Nullable String value) {
+            this.priWarmerCurrent = value;
+            return this;
+        }
+
+        /**
+         * total warmer ops
+         * <p>
+         * API name: {@code warmer.total}
+         */
+        public final Builder warmerTotal(@Nullable String value) {
+            this.warmerTotal = value;
+            return this;
+        }
+
+        /**
+         * total warmer ops
+         * <p>
+         * API name: {@code pri.warmer.total}
+         */
+        public final Builder priWarmerTotal(@Nullable String value) {
+            this.priWarmerTotal = value;
+            return this;
+        }
+
+        /**
+         * time spent in warmers
+         * <p>
+         * API name: {@code warmer.total_time}
+         */
+        public final Builder warmerTotalTime(@Nullable String value) {
+            this.warmerTotalTime = value;
+            return this;
+        }
+
+        /**
+         * time spent in warmers
+         * <p>
+         * API name: {@code pri.warmer.total_time}
+         */
+        public final Builder priWarmerTotalTime(@Nullable String value) {
+            this.priWarmerTotalTime = value;
+            return this;
+        }
+
+        /**
+         * number of current suggest ops
+         * <p>
+         * API name: {@code suggest.current}
+         */
+        public final Builder suggestCurrent(@Nullable String value) {
+            this.suggestCurrent = value;
+            return this;
+        }
+
+        /**
+         * number of current suggest ops
+         * <p>
+         * API name: {@code pri.suggest.current}
+         */
+        public final Builder priSuggestCurrent(@Nullable String value) {
+            this.priSuggestCurrent = value;
+            return this;
+        }
+
+        /**
+         * time spend in suggest
+         * <p>
+         * API name: {@code suggest.time}
+         */
+        public final Builder suggestTime(@Nullable String value) {
+            this.suggestTime = value;
+            return this;
+        }
+
+        /**
+         * time spend in suggest
+         * <p>
+         * API name: {@code pri.suggest.time}
+         */
+        public final Builder priSuggestTime(@Nullable String value) {
+            this.priSuggestTime = value;
+            return this;
+        }
+
+        /**
+         * number of suggest ops
+         * <p>
+         * API name: {@code suggest.total}
+         */
+        public final Builder suggestTotal(@Nullable String value) {
+            this.suggestTotal = value;
+            return this;
+        }
+
+        /**
+         * number of suggest ops
+         * <p>
+         * API name: {@code pri.suggest.total}
+         */
+        public final Builder priSuggestTotal(@Nullable String value) {
+            this.priSuggestTotal = value;
+            return this;
+        }
+
+        /**
+         * total used memory
+         * <p>
+         * API name: {@code memory.total}
+         */
+        public final Builder memoryTotal(@Nullable String value) {
+            this.memoryTotal = value;
+            return this;
+        }
+
+        /**
+         * total user memory
+         * <p>
+         * API name: {@code pri.memory.total}
+         */
+        public final Builder priMemoryTotal(@Nullable String value) {
+            this.priMemoryTotal = value;
+            return this;
+        }
+
+        /**
+         * indicates if the index is search throttled
+         * <p>
+         * API name: {@code search.throttled}
+         */
+        public final Builder searchThrottled(@Nullable String value) {
+            this.searchThrottled = value;
+            return this;
+        }
+
+        /**
+         * number of bulk shard ops
+         * <p>
+         * API name: {@code bulk.total_operations}
+         */
+        public final Builder bulkTotalOperations(@Nullable String value) {
+            this.bulkTotalOperations = value;
+            return this;
+        }
+
+        /**
+         * number of bulk shard ops
+         * <p>
+         * API name: {@code pri.bulk.total_operations}
+         */
+        public final Builder priBulkTotalOperations(@Nullable String value) {
+            this.priBulkTotalOperations = value;
+            return this;
+        }
+
+        /**
+         * time spend in shard bulk
+         * <p>
+         * API name: {@code bulk.total_time}
+         */
+        public final Builder bulkTotalTime(@Nullable String value) {
+            this.bulkTotalTime = value;
+            return this;
+        }
+
+        /**
+         * time spend in shard bulk
+         * <p>
+         * API name: {@code pri.bulk.total_time}
+         */
+        public final Builder priBulkTotalTime(@Nullable String value) {
+            this.priBulkTotalTime = value;
+            return this;
+        }
+
+        /**
+         * total size in bytes of shard bulk
+         * <p>
+         * API name: {@code bulk.total_size_in_bytes}
+         */
+        public final Builder bulkTotalSizeInBytes(@Nullable String value) {
+            this.bulkTotalSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * total size in bytes of shard bulk
+         * <p>
+         * API name: {@code pri.bulk.total_size_in_bytes}
+         */
+        public final Builder priBulkTotalSizeInBytes(@Nullable String value) {
+            this.priBulkTotalSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * average time spend in shard bulk
+         * <p>
+         * API name: {@code bulk.avg_time}
+         */
+        public final Builder bulkAvgTime(@Nullable String value) {
+            this.bulkAvgTime = value;
+            return this;
+        }
+
+        /**
+         * average time spend in shard bulk
+         * <p>
+         * API name: {@code pri.bulk.avg_time}
+         */
+        public final Builder priBulkAvgTime(@Nullable String value) {
+            this.priBulkAvgTime = value;
+            return this;
+        }
+
+        /**
+         * average size in bytes of shard bulk
+         * <p>
+         * API name: {@code bulk.avg_size_in_bytes}
+         */
+        public final Builder bulkAvgSizeInBytes(@Nullable String value) {
+            this.bulkAvgSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * average size in bytes of shard bulk
+         * <p>
+         * API name: {@code pri.bulk.avg_size_in_bytes}
+         */
+        public final Builder priBulkAvgSizeInBytes(@Nullable String value) {
+            this.priBulkAvgSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link IndicesRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndicesRecord build() {
+            _checkSingleUse();
+
+            return new IndicesRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndicesRecord}
+     */
+    public static final JsonpDeserializer<IndicesRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndicesRecord::setupIndicesRecordDeserializer
+    );
+
+    protected static void setupIndicesRecordDeserializer(ObjectDeserializer<IndicesRecord.Builder> op) {
+
+        op.add(Builder::health, JsonpDeserializer.stringDeserializer(), "health", "h");
+        op.add(Builder::status, JsonpDeserializer.stringDeserializer(), "status", "s");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index", "i", "idx");
+        op.add(Builder::uuid, JsonpDeserializer.stringDeserializer(), "uuid", "id");
+        op.add(Builder::pri, JsonpDeserializer.stringDeserializer(), "pri", "p", "shards.primary", "shardsPrimary");
+        op.add(Builder::rep, JsonpDeserializer.stringDeserializer(), "rep", "r", "shards.replica", "shardsReplica");
+        op.add(Builder::docsCount, JsonpDeserializer.stringDeserializer(), "docs.count", "dc", "docsCount");
+        op.add(Builder::docsDeleted, JsonpDeserializer.stringDeserializer(), "docs.deleted", "dd", "docsDeleted");
+        op.add(Builder::creationDate, JsonpDeserializer.stringDeserializer(), "creation.date", "cd");
+        op.add(Builder::creationDateString, JsonpDeserializer.stringDeserializer(), "creation.date.string", "cds");
+        op.add(Builder::storeSize, JsonpDeserializer.stringDeserializer(), "store.size", "ss", "storeSize");
+        op.add(Builder::priStoreSize, JsonpDeserializer.stringDeserializer(), "pri.store.size");
+        op.add(Builder::completionSize, JsonpDeserializer.stringDeserializer(), "completion.size", "cs", "completionSize");
+        op.add(Builder::priCompletionSize, JsonpDeserializer.stringDeserializer(), "pri.completion.size");
+        op.add(Builder::fielddataMemorySize, JsonpDeserializer.stringDeserializer(), "fielddata.memory_size", "fm", "fielddataMemory");
+        op.add(Builder::priFielddataMemorySize, JsonpDeserializer.stringDeserializer(), "pri.fielddata.memory_size");
+        op.add(Builder::fielddataEvictions, JsonpDeserializer.stringDeserializer(), "fielddata.evictions", "fe", "fielddataEvictions");
+        op.add(Builder::priFielddataEvictions, JsonpDeserializer.stringDeserializer(), "pri.fielddata.evictions");
+        op.add(Builder::queryCacheMemorySize, JsonpDeserializer.stringDeserializer(), "query_cache.memory_size", "qcm", "queryCacheMemory");
+        op.add(Builder::priQueryCacheMemorySize, JsonpDeserializer.stringDeserializer(), "pri.query_cache.memory_size");
+        op.add(Builder::queryCacheEvictions, JsonpDeserializer.stringDeserializer(), "query_cache.evictions", "qce", "queryCacheEvictions");
+        op.add(Builder::priQueryCacheEvictions, JsonpDeserializer.stringDeserializer(), "pri.query_cache.evictions");
+        op.add(
+            Builder::requestCacheMemorySize,
+            JsonpDeserializer.stringDeserializer(),
+            "request_cache.memory_size",
+            "rcm",
+            "requestCacheMemory"
+        );
+        op.add(Builder::priRequestCacheMemorySize, JsonpDeserializer.stringDeserializer(), "pri.request_cache.memory_size");
+        op.add(
+            Builder::requestCacheEvictions,
+            JsonpDeserializer.stringDeserializer(),
+            "request_cache.evictions",
+            "rce",
+            "requestCacheEvictions"
+        );
+        op.add(Builder::priRequestCacheEvictions, JsonpDeserializer.stringDeserializer(), "pri.request_cache.evictions");
+        op.add(
+            Builder::requestCacheHitCount,
+            JsonpDeserializer.stringDeserializer(),
+            "request_cache.hit_count",
+            "rchc",
+            "requestCacheHitCount"
+        );
+        op.add(Builder::priRequestCacheHitCount, JsonpDeserializer.stringDeserializer(), "pri.request_cache.hit_count");
+        op.add(
+            Builder::requestCacheMissCount,
+            JsonpDeserializer.stringDeserializer(),
+            "request_cache.miss_count",
+            "rcmc",
+            "requestCacheMissCount"
+        );
+        op.add(Builder::priRequestCacheMissCount, JsonpDeserializer.stringDeserializer(), "pri.request_cache.miss_count");
+        op.add(Builder::flushTotal, JsonpDeserializer.stringDeserializer(), "flush.total", "ft", "flushTotal");
+        op.add(Builder::priFlushTotal, JsonpDeserializer.stringDeserializer(), "pri.flush.total");
+        op.add(Builder::flushTotalTime, JsonpDeserializer.stringDeserializer(), "flush.total_time", "ftt", "flushTotalTime");
+        op.add(Builder::priFlushTotalTime, JsonpDeserializer.stringDeserializer(), "pri.flush.total_time");
+        op.add(Builder::getCurrent, JsonpDeserializer.stringDeserializer(), "get.current", "gc", "getCurrent");
+        op.add(Builder::priGetCurrent, JsonpDeserializer.stringDeserializer(), "pri.get.current");
+        op.add(Builder::getTime, JsonpDeserializer.stringDeserializer(), "get.time", "gti", "getTime");
+        op.add(Builder::priGetTime, JsonpDeserializer.stringDeserializer(), "pri.get.time");
+        op.add(Builder::getTotal, JsonpDeserializer.stringDeserializer(), "get.total", "gto", "getTotal");
+        op.add(Builder::priGetTotal, JsonpDeserializer.stringDeserializer(), "pri.get.total");
+        op.add(Builder::getExistsTime, JsonpDeserializer.stringDeserializer(), "get.exists_time", "geti", "getExistsTime");
+        op.add(Builder::priGetExistsTime, JsonpDeserializer.stringDeserializer(), "pri.get.exists_time");
+        op.add(Builder::getExistsTotal, JsonpDeserializer.stringDeserializer(), "get.exists_total", "geto", "getExistsTotal");
+        op.add(Builder::priGetExistsTotal, JsonpDeserializer.stringDeserializer(), "pri.get.exists_total");
+        op.add(Builder::getMissingTime, JsonpDeserializer.stringDeserializer(), "get.missing_time", "gmti", "getMissingTime");
+        op.add(Builder::priGetMissingTime, JsonpDeserializer.stringDeserializer(), "pri.get.missing_time");
+        op.add(Builder::getMissingTotal, JsonpDeserializer.stringDeserializer(), "get.missing_total", "gmto", "getMissingTotal");
+        op.add(Builder::priGetMissingTotal, JsonpDeserializer.stringDeserializer(), "pri.get.missing_total");
+        op.add(
+            Builder::indexingDeleteCurrent,
+            JsonpDeserializer.stringDeserializer(),
+            "indexing.delete_current",
+            "idc",
+            "indexingDeleteCurrent"
+        );
+        op.add(Builder::priIndexingDeleteCurrent, JsonpDeserializer.stringDeserializer(), "pri.indexing.delete_current");
+        op.add(Builder::indexingDeleteTime, JsonpDeserializer.stringDeserializer(), "indexing.delete_time", "idti", "indexingDeleteTime");
+        op.add(Builder::priIndexingDeleteTime, JsonpDeserializer.stringDeserializer(), "pri.indexing.delete_time");
+        op.add(
+            Builder::indexingDeleteTotal,
+            JsonpDeserializer.stringDeserializer(),
+            "indexing.delete_total",
+            "idto",
+            "indexingDeleteTotal"
+        );
+        op.add(Builder::priIndexingDeleteTotal, JsonpDeserializer.stringDeserializer(), "pri.indexing.delete_total");
+        op.add(
+            Builder::indexingIndexCurrent,
+            JsonpDeserializer.stringDeserializer(),
+            "indexing.index_current",
+            "iic",
+            "indexingIndexCurrent"
+        );
+        op.add(Builder::priIndexingIndexCurrent, JsonpDeserializer.stringDeserializer(), "pri.indexing.index_current");
+        op.add(Builder::indexingIndexTime, JsonpDeserializer.stringDeserializer(), "indexing.index_time", "iiti", "indexingIndexTime");
+        op.add(Builder::priIndexingIndexTime, JsonpDeserializer.stringDeserializer(), "pri.indexing.index_time");
+        op.add(Builder::indexingIndexTotal, JsonpDeserializer.stringDeserializer(), "indexing.index_total", "iito", "indexingIndexTotal");
+        op.add(Builder::priIndexingIndexTotal, JsonpDeserializer.stringDeserializer(), "pri.indexing.index_total");
+        op.add(Builder::indexingIndexFailed, JsonpDeserializer.stringDeserializer(), "indexing.index_failed", "iif", "indexingIndexFailed");
+        op.add(Builder::priIndexingIndexFailed, JsonpDeserializer.stringDeserializer(), "pri.indexing.index_failed");
+        op.add(Builder::mergesCurrent, JsonpDeserializer.stringDeserializer(), "merges.current", "mc", "mergesCurrent");
+        op.add(Builder::priMergesCurrent, JsonpDeserializer.stringDeserializer(), "pri.merges.current");
+        op.add(Builder::mergesCurrentDocs, JsonpDeserializer.stringDeserializer(), "merges.current_docs", "mcd", "mergesCurrentDocs");
+        op.add(Builder::priMergesCurrentDocs, JsonpDeserializer.stringDeserializer(), "pri.merges.current_docs");
+        op.add(Builder::mergesCurrentSize, JsonpDeserializer.stringDeserializer(), "merges.current_size", "mcs", "mergesCurrentSize");
+        op.add(Builder::priMergesCurrentSize, JsonpDeserializer.stringDeserializer(), "pri.merges.current_size");
+        op.add(Builder::mergesTotal, JsonpDeserializer.stringDeserializer(), "merges.total", "mt", "mergesTotal");
+        op.add(Builder::priMergesTotal, JsonpDeserializer.stringDeserializer(), "pri.merges.total");
+        op.add(Builder::mergesTotalDocs, JsonpDeserializer.stringDeserializer(), "merges.total_docs", "mtd", "mergesTotalDocs");
+        op.add(Builder::priMergesTotalDocs, JsonpDeserializer.stringDeserializer(), "pri.merges.total_docs");
+        op.add(Builder::mergesTotalSize, JsonpDeserializer.stringDeserializer(), "merges.total_size", "mts", "mergesTotalSize");
+        op.add(Builder::priMergesTotalSize, JsonpDeserializer.stringDeserializer(), "pri.merges.total_size");
+        op.add(Builder::mergesTotalTime, JsonpDeserializer.stringDeserializer(), "merges.total_time", "mtt", "mergesTotalTime");
+        op.add(Builder::priMergesTotalTime, JsonpDeserializer.stringDeserializer(), "pri.merges.total_time");
+        op.add(Builder::refreshTotal, JsonpDeserializer.stringDeserializer(), "refresh.total", "rto", "refreshTotal");
+        op.add(Builder::priRefreshTotal, JsonpDeserializer.stringDeserializer(), "pri.refresh.total");
+        op.add(Builder::refreshTime, JsonpDeserializer.stringDeserializer(), "refresh.time", "rti", "refreshTime");
+        op.add(Builder::priRefreshTime, JsonpDeserializer.stringDeserializer(), "pri.refresh.time");
+        op.add(Builder::refreshExternalTotal, JsonpDeserializer.stringDeserializer(), "refresh.external_total", "reto");
+        op.add(Builder::priRefreshExternalTotal, JsonpDeserializer.stringDeserializer(), "pri.refresh.external_total");
+        op.add(Builder::refreshExternalTime, JsonpDeserializer.stringDeserializer(), "refresh.external_time", "reti");
+        op.add(Builder::priRefreshExternalTime, JsonpDeserializer.stringDeserializer(), "pri.refresh.external_time");
+        op.add(Builder::refreshListeners, JsonpDeserializer.stringDeserializer(), "refresh.listeners", "rli", "refreshListeners");
+        op.add(Builder::priRefreshListeners, JsonpDeserializer.stringDeserializer(), "pri.refresh.listeners");
+        op.add(Builder::searchFetchCurrent, JsonpDeserializer.stringDeserializer(), "search.fetch_current", "sfc", "searchFetchCurrent");
+        op.add(Builder::priSearchFetchCurrent, JsonpDeserializer.stringDeserializer(), "pri.search.fetch_current");
+        op.add(Builder::searchFetchTime, JsonpDeserializer.stringDeserializer(), "search.fetch_time", "sfti", "searchFetchTime");
+        op.add(Builder::priSearchFetchTime, JsonpDeserializer.stringDeserializer(), "pri.search.fetch_time");
+        op.add(Builder::searchFetchTotal, JsonpDeserializer.stringDeserializer(), "search.fetch_total", "sfto", "searchFetchTotal");
+        op.add(Builder::priSearchFetchTotal, JsonpDeserializer.stringDeserializer(), "pri.search.fetch_total");
+        op.add(Builder::searchOpenContexts, JsonpDeserializer.stringDeserializer(), "search.open_contexts", "so", "searchOpenContexts");
+        op.add(Builder::priSearchOpenContexts, JsonpDeserializer.stringDeserializer(), "pri.search.open_contexts");
+        op.add(Builder::searchQueryCurrent, JsonpDeserializer.stringDeserializer(), "search.query_current", "sqc", "searchQueryCurrent");
+        op.add(Builder::priSearchQueryCurrent, JsonpDeserializer.stringDeserializer(), "pri.search.query_current");
+        op.add(Builder::searchQueryTime, JsonpDeserializer.stringDeserializer(), "search.query_time", "sqti", "searchQueryTime");
+        op.add(Builder::priSearchQueryTime, JsonpDeserializer.stringDeserializer(), "pri.search.query_time");
+        op.add(Builder::searchQueryTotal, JsonpDeserializer.stringDeserializer(), "search.query_total", "sqto", "searchQueryTotal");
+        op.add(Builder::priSearchQueryTotal, JsonpDeserializer.stringDeserializer(), "pri.search.query_total");
+        op.add(Builder::searchScrollCurrent, JsonpDeserializer.stringDeserializer(), "search.scroll_current", "scc", "searchScrollCurrent");
+        op.add(Builder::priSearchScrollCurrent, JsonpDeserializer.stringDeserializer(), "pri.search.scroll_current");
+        op.add(Builder::searchScrollTime, JsonpDeserializer.stringDeserializer(), "search.scroll_time", "scti", "searchScrollTime");
+        op.add(Builder::priSearchScrollTime, JsonpDeserializer.stringDeserializer(), "pri.search.scroll_time");
+        op.add(Builder::searchScrollTotal, JsonpDeserializer.stringDeserializer(), "search.scroll_total", "scto", "searchScrollTotal");
+        op.add(Builder::priSearchScrollTotal, JsonpDeserializer.stringDeserializer(), "pri.search.scroll_total");
+        op.add(Builder::segmentsCount, JsonpDeserializer.stringDeserializer(), "segments.count", "sc", "segmentsCount");
+        op.add(Builder::priSegmentsCount, JsonpDeserializer.stringDeserializer(), "pri.segments.count");
+        op.add(Builder::segmentsMemory, JsonpDeserializer.stringDeserializer(), "segments.memory", "sm", "segmentsMemory");
+        op.add(Builder::priSegmentsMemory, JsonpDeserializer.stringDeserializer(), "pri.segments.memory");
+        op.add(
+            Builder::segmentsIndexWriterMemory,
+            JsonpDeserializer.stringDeserializer(),
+            "segments.index_writer_memory",
+            "siwm",
+            "segmentsIndexWriterMemory"
+        );
+        op.add(Builder::priSegmentsIndexWriterMemory, JsonpDeserializer.stringDeserializer(), "pri.segments.index_writer_memory");
+        op.add(
+            Builder::segmentsVersionMapMemory,
+            JsonpDeserializer.stringDeserializer(),
+            "segments.version_map_memory",
+            "svmm",
+            "segmentsVersionMapMemory"
+        );
+        op.add(Builder::priSegmentsVersionMapMemory, JsonpDeserializer.stringDeserializer(), "pri.segments.version_map_memory");
+        op.add(
+            Builder::segmentsFixedBitsetMemory,
+            JsonpDeserializer.stringDeserializer(),
+            "segments.fixed_bitset_memory",
+            "sfbm",
+            "fixedBitsetMemory"
+        );
+        op.add(Builder::priSegmentsFixedBitsetMemory, JsonpDeserializer.stringDeserializer(), "pri.segments.fixed_bitset_memory");
+        op.add(Builder::warmerCurrent, JsonpDeserializer.stringDeserializer(), "warmer.current", "wc", "warmerCurrent");
+        op.add(Builder::priWarmerCurrent, JsonpDeserializer.stringDeserializer(), "pri.warmer.current");
+        op.add(Builder::warmerTotal, JsonpDeserializer.stringDeserializer(), "warmer.total", "wto", "warmerTotal");
+        op.add(Builder::priWarmerTotal, JsonpDeserializer.stringDeserializer(), "pri.warmer.total");
+        op.add(Builder::warmerTotalTime, JsonpDeserializer.stringDeserializer(), "warmer.total_time", "wtt", "warmerTotalTime");
+        op.add(Builder::priWarmerTotalTime, JsonpDeserializer.stringDeserializer(), "pri.warmer.total_time");
+        op.add(Builder::suggestCurrent, JsonpDeserializer.stringDeserializer(), "suggest.current", "suc", "suggestCurrent");
+        op.add(Builder::priSuggestCurrent, JsonpDeserializer.stringDeserializer(), "pri.suggest.current");
+        op.add(Builder::suggestTime, JsonpDeserializer.stringDeserializer(), "suggest.time", "suti", "suggestTime");
+        op.add(Builder::priSuggestTime, JsonpDeserializer.stringDeserializer(), "pri.suggest.time");
+        op.add(Builder::suggestTotal, JsonpDeserializer.stringDeserializer(), "suggest.total", "suto", "suggestTotal");
+        op.add(Builder::priSuggestTotal, JsonpDeserializer.stringDeserializer(), "pri.suggest.total");
+        op.add(Builder::memoryTotal, JsonpDeserializer.stringDeserializer(), "memory.total", "tm", "memoryTotal");
+        op.add(Builder::priMemoryTotal, JsonpDeserializer.stringDeserializer(), "pri.memory.total");
+        op.add(Builder::searchThrottled, JsonpDeserializer.stringDeserializer(), "search.throttled", "sth");
+        op.add(Builder::bulkTotalOperations, JsonpDeserializer.stringDeserializer(), "bulk.total_operations", "bto", "bulkTotalOperation");
+        op.add(Builder::priBulkTotalOperations, JsonpDeserializer.stringDeserializer(), "pri.bulk.total_operations");
+        op.add(Builder::bulkTotalTime, JsonpDeserializer.stringDeserializer(), "bulk.total_time", "btti", "bulkTotalTime");
+        op.add(Builder::priBulkTotalTime, JsonpDeserializer.stringDeserializer(), "pri.bulk.total_time");
+        op.add(
+            Builder::bulkTotalSizeInBytes,
+            JsonpDeserializer.stringDeserializer(),
+            "bulk.total_size_in_bytes",
+            "btsi",
+            "bulkTotalSizeInBytes"
+        );
+        op.add(Builder::priBulkTotalSizeInBytes, JsonpDeserializer.stringDeserializer(), "pri.bulk.total_size_in_bytes");
+        op.add(Builder::bulkAvgTime, JsonpDeserializer.stringDeserializer(), "bulk.avg_time", "bati", "bulkAvgTime");
+        op.add(Builder::priBulkAvgTime, JsonpDeserializer.stringDeserializer(), "pri.bulk.avg_time");
+        op.add(Builder::bulkAvgSizeInBytes, JsonpDeserializer.stringDeserializer(), "bulk.avg_size_in_bytes", "basi", "bulkAvgSizeInBytes");
+        op.add(Builder::priBulkAvgSizeInBytes, JsonpDeserializer.stringDeserializer(), "pri.bulk.avg_size_in_bytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/nodeattrs/NodeAttributesRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/nodeattrs/NodeAttributesRecord.java
index 72fdfa8dc2..894061df32 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/nodeattrs/NodeAttributesRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/nodeattrs/NodeAttributesRecord.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cat.nodeattrs;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,335 +43,333 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cat.nodeattrs.NodeAttributesRecord
 
-
 @JsonpDeserializable
 public class NodeAttributesRecord implements JsonpSerializable {
-	@Nullable
-	private final String node;
-
-	@Nullable
-	private final String id;
-
-	@Nullable
-	private final String pid;
-
-	@Nullable
-	private final String host;
-
-	@Nullable
-	private final String ip;
-
-	@Nullable
-	private final String port;
-
-	@Nullable
-	private final String attr;
-
-	@Nullable
-	private final String value;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeAttributesRecord(Builder builder) {
-
-		this.node = builder.node;
-		this.id = builder.id;
-		this.pid = builder.pid;
-		this.host = builder.host;
-		this.ip = builder.ip;
-		this.port = builder.port;
-		this.attr = builder.attr;
-		this.value = builder.value;
-
-	}
-
-	public static NodeAttributesRecord of(Function<Builder, ObjectBuilder<NodeAttributesRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * node name
-	 * <p>
-	 * API name: {@code node}
-	 */
-	@Nullable
-	public final String node() {
-		return this.node;
-	}
-
-	/**
-	 * unique node id
-	 * <p>
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * process id
-	 * <p>
-	 * API name: {@code pid}
-	 */
-	@Nullable
-	public final String pid() {
-		return this.pid;
-	}
-
-	/**
-	 * host name
-	 * <p>
-	 * API name: {@code host}
-	 */
-	@Nullable
-	public final String host() {
-		return this.host;
-	}
-
-	/**
-	 * ip address
-	 * <p>
-	 * API name: {@code ip}
-	 */
-	@Nullable
-	public final String ip() {
-		return this.ip;
-	}
-
-	/**
-	 * bound transport port
-	 * <p>
-	 * API name: {@code port}
-	 */
-	@Nullable
-	public final String port() {
-		return this.port;
-	}
-
-	/**
-	 * attribute description
-	 * <p>
-	 * API name: {@code attr}
-	 */
-	@Nullable
-	public final String attr() {
-		return this.attr;
-	}
-
-	/**
-	 * attribute value
-	 * <p>
-	 * API name: {@code value}
-	 */
-	@Nullable
-	public final String value() {
-		return this.value;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.node != null) {
-			generator.writeKey("node");
-			generator.write(this.node);
-
-		}
-		if (this.id != null) {
-			generator.writeKey("id");
-			generator.write(this.id);
-
-		}
-		if (this.pid != null) {
-			generator.writeKey("pid");
-			generator.write(this.pid);
-
-		}
-		if (this.host != null) {
-			generator.writeKey("host");
-			generator.write(this.host);
-
-		}
-		if (this.ip != null) {
-			generator.writeKey("ip");
-			generator.write(this.ip);
-
-		}
-		if (this.port != null) {
-			generator.writeKey("port");
-			generator.write(this.port);
-
-		}
-		if (this.attr != null) {
-			generator.writeKey("attr");
-			generator.write(this.attr);
-
-		}
-		if (this.value != null) {
-			generator.writeKey("value");
-			generator.write(this.value);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeAttributesRecord}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeAttributesRecord> {
-		@Nullable
-		private String node;
-
-		@Nullable
-		private String id;
-
-		@Nullable
-		private String pid;
-
-		@Nullable
-		private String host;
-
-		@Nullable
-		private String ip;
-
-		@Nullable
-		private String port;
-
-		@Nullable
-		private String attr;
-
-		@Nullable
-		private String value;
-
-		/**
-		 * node name
-		 * <p>
-		 * API name: {@code node}
-		 */
-		public final Builder node(@Nullable String value) {
-			this.node = value;
-			return this;
-		}
-
-		/**
-		 * unique node id
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * process id
-		 * <p>
-		 * API name: {@code pid}
-		 */
-		public final Builder pid(@Nullable String value) {
-			this.pid = value;
-			return this;
-		}
-
-		/**
-		 * host name
-		 * <p>
-		 * API name: {@code host}
-		 */
-		public final Builder host(@Nullable String value) {
-			this.host = value;
-			return this;
-		}
-
-		/**
-		 * ip address
-		 * <p>
-		 * API name: {@code ip}
-		 */
-		public final Builder ip(@Nullable String value) {
-			this.ip = value;
-			return this;
-		}
-
-		/**
-		 * bound transport port
-		 * <p>
-		 * API name: {@code port}
-		 */
-		public final Builder port(@Nullable String value) {
-			this.port = value;
-			return this;
-		}
-
-		/**
-		 * attribute description
-		 * <p>
-		 * API name: {@code attr}
-		 */
-		public final Builder attr(@Nullable String value) {
-			this.attr = value;
-			return this;
-		}
-
-		/**
-		 * attribute value
-		 * <p>
-		 * API name: {@code value}
-		 */
-		public final Builder value(@Nullable String value) {
-			this.value = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeAttributesRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeAttributesRecord build() {
-			_checkSingleUse();
-
-			return new NodeAttributesRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeAttributesRecord}
-	 */
-	public static final JsonpDeserializer<NodeAttributesRecord> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeAttributesRecord::setupNodeAttributesRecordDeserializer);
-
-	protected static void setupNodeAttributesRecordDeserializer(ObjectDeserializer<NodeAttributesRecord.Builder> op) {
-
-		op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::pid, JsonpDeserializer.stringDeserializer(), "pid");
-		op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host", "h");
-		op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip", "i");
-		op.add(Builder::port, JsonpDeserializer.stringDeserializer(), "port");
-		op.add(Builder::attr, JsonpDeserializer.stringDeserializer(), "attr");
-		op.add(Builder::value, JsonpDeserializer.stringDeserializer(), "value");
-
-	}
+    @Nullable
+    private final String node;
+
+    @Nullable
+    private final String id;
+
+    @Nullable
+    private final String pid;
+
+    @Nullable
+    private final String host;
+
+    @Nullable
+    private final String ip;
+
+    @Nullable
+    private final String port;
+
+    @Nullable
+    private final String attr;
+
+    @Nullable
+    private final String value;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeAttributesRecord(Builder builder) {
+
+        this.node = builder.node;
+        this.id = builder.id;
+        this.pid = builder.pid;
+        this.host = builder.host;
+        this.ip = builder.ip;
+        this.port = builder.port;
+        this.attr = builder.attr;
+        this.value = builder.value;
+
+    }
+
+    public static NodeAttributesRecord of(Function<Builder, ObjectBuilder<NodeAttributesRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * node name
+     * <p>
+     * API name: {@code node}
+     */
+    @Nullable
+    public final String node() {
+        return this.node;
+    }
+
+    /**
+     * unique node id
+     * <p>
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * process id
+     * <p>
+     * API name: {@code pid}
+     */
+    @Nullable
+    public final String pid() {
+        return this.pid;
+    }
+
+    /**
+     * host name
+     * <p>
+     * API name: {@code host}
+     */
+    @Nullable
+    public final String host() {
+        return this.host;
+    }
+
+    /**
+     * ip address
+     * <p>
+     * API name: {@code ip}
+     */
+    @Nullable
+    public final String ip() {
+        return this.ip;
+    }
+
+    /**
+     * bound transport port
+     * <p>
+     * API name: {@code port}
+     */
+    @Nullable
+    public final String port() {
+        return this.port;
+    }
+
+    /**
+     * attribute description
+     * <p>
+     * API name: {@code attr}
+     */
+    @Nullable
+    public final String attr() {
+        return this.attr;
+    }
+
+    /**
+     * attribute value
+     * <p>
+     * API name: {@code value}
+     */
+    @Nullable
+    public final String value() {
+        return this.value;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.node != null) {
+            generator.writeKey("node");
+            generator.write(this.node);
+
+        }
+        if (this.id != null) {
+            generator.writeKey("id");
+            generator.write(this.id);
+
+        }
+        if (this.pid != null) {
+            generator.writeKey("pid");
+            generator.write(this.pid);
+
+        }
+        if (this.host != null) {
+            generator.writeKey("host");
+            generator.write(this.host);
+
+        }
+        if (this.ip != null) {
+            generator.writeKey("ip");
+            generator.write(this.ip);
+
+        }
+        if (this.port != null) {
+            generator.writeKey("port");
+            generator.write(this.port);
+
+        }
+        if (this.attr != null) {
+            generator.writeKey("attr");
+            generator.write(this.attr);
+
+        }
+        if (this.value != null) {
+            generator.writeKey("value");
+            generator.write(this.value);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeAttributesRecord}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeAttributesRecord> {
+        @Nullable
+        private String node;
+
+        @Nullable
+        private String id;
+
+        @Nullable
+        private String pid;
+
+        @Nullable
+        private String host;
+
+        @Nullable
+        private String ip;
+
+        @Nullable
+        private String port;
+
+        @Nullable
+        private String attr;
+
+        @Nullable
+        private String value;
+
+        /**
+         * node name
+         * <p>
+         * API name: {@code node}
+         */
+        public final Builder node(@Nullable String value) {
+            this.node = value;
+            return this;
+        }
+
+        /**
+         * unique node id
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * process id
+         * <p>
+         * API name: {@code pid}
+         */
+        public final Builder pid(@Nullable String value) {
+            this.pid = value;
+            return this;
+        }
+
+        /**
+         * host name
+         * <p>
+         * API name: {@code host}
+         */
+        public final Builder host(@Nullable String value) {
+            this.host = value;
+            return this;
+        }
+
+        /**
+         * ip address
+         * <p>
+         * API name: {@code ip}
+         */
+        public final Builder ip(@Nullable String value) {
+            this.ip = value;
+            return this;
+        }
+
+        /**
+         * bound transport port
+         * <p>
+         * API name: {@code port}
+         */
+        public final Builder port(@Nullable String value) {
+            this.port = value;
+            return this;
+        }
+
+        /**
+         * attribute description
+         * <p>
+         * API name: {@code attr}
+         */
+        public final Builder attr(@Nullable String value) {
+            this.attr = value;
+            return this;
+        }
+
+        /**
+         * attribute value
+         * <p>
+         * API name: {@code value}
+         */
+        public final Builder value(@Nullable String value) {
+            this.value = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeAttributesRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeAttributesRecord build() {
+            _checkSingleUse();
+
+            return new NodeAttributesRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeAttributesRecord}
+     */
+    public static final JsonpDeserializer<NodeAttributesRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeAttributesRecord::setupNodeAttributesRecordDeserializer
+    );
+
+    protected static void setupNodeAttributesRecordDeserializer(ObjectDeserializer<NodeAttributesRecord.Builder> op) {
+
+        op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::pid, JsonpDeserializer.stringDeserializer(), "pid");
+        op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host", "h");
+        op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip", "i");
+        op.add(Builder::port, JsonpDeserializer.stringDeserializer(), "port");
+        op.add(Builder::attr, JsonpDeserializer.stringDeserializer(), "attr");
+        op.add(Builder::value, JsonpDeserializer.stringDeserializer(), "value");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/nodes/NodesRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/nodes/NodesRecord.java
index 5f58b4ed0a..d7ee25d953 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/nodes/NodesRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/nodes/NodesRecord.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cat.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,3336 +43,3360 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cat.nodes.NodesRecord
 
-
 @JsonpDeserializable
 public class NodesRecord implements JsonpSerializable {
-	@Nullable
-	private final String id;
+    @Nullable
+    private final String id;
 
-	@Nullable
-	private final String pid;
+    @Nullable
+    private final String pid;
 
-	@Nullable
-	private final String ip;
+    @Nullable
+    private final String ip;
 
-	@Nullable
-	private final String port;
+    @Nullable
+    private final String port;
 
-	@Nullable
-	private final String httpAddress;
+    @Nullable
+    private final String httpAddress;
 
-	@Nullable
-	private final String version;
+    @Nullable
+    private final String version;
 
-	@Nullable
-	private final String flavor;
+    @Nullable
+    private final String flavor;
 
-	@Nullable
-	private final String type;
+    @Nullable
+    private final String type;
 
-	@Nullable
-	private final String build;
+    @Nullable
+    private final String build;
 
-	@Nullable
-	private final String jdk;
+    @Nullable
+    private final String jdk;
 
-	@Nullable
-	private final String diskTotal;
+    @Nullable
+    private final String diskTotal;
 
-	@Nullable
-	private final String diskUsed;
+    @Nullable
+    private final String diskUsed;
 
-	@Nullable
-	private final String diskAvail;
+    @Nullable
+    private final String diskAvail;
 
-	@Nullable
-	private final String diskUsedPercent;
+    @Nullable
+    private final String diskUsedPercent;
 
-	@Nullable
-	private final String heapCurrent;
+    @Nullable
+    private final String heapCurrent;
 
-	@Nullable
-	private final String heapPercent;
+    @Nullable
+    private final String heapPercent;
 
-	@Nullable
-	private final String heapMax;
+    @Nullable
+    private final String heapMax;
 
-	@Nullable
-	private final String ramCurrent;
+    @Nullable
+    private final String ramCurrent;
 
-	@Nullable
-	private final String ramPercent;
+    @Nullable
+    private final String ramPercent;
 
-	@Nullable
-	private final String ramMax;
+    @Nullable
+    private final String ramMax;
 
-	@Nullable
-	private final String fileDescCurrent;
+    @Nullable
+    private final String fileDescCurrent;
 
-	@Nullable
-	private final String fileDescPercent;
+    @Nullable
+    private final String fileDescPercent;
 
-	@Nullable
-	private final String fileDescMax;
+    @Nullable
+    private final String fileDescMax;
 
-	@Nullable
-	private final String cpu;
+    @Nullable
+    private final String cpu;
 
-	@Nullable
-	private final String load1m;
+    @Nullable
+    private final String load1m;
 
-	@Nullable
-	private final String load5m;
+    @Nullable
+    private final String load5m;
 
-	@Nullable
-	private final String load15m;
+    @Nullable
+    private final String load15m;
 
-	@Nullable
-	private final String uptime;
+    @Nullable
+    private final String uptime;
 
-	@Nullable
-	private final String nodeRole;
+    @Nullable
+    private final String nodeRole;
 
-	@Deprecated
-	@Nullable
-	private final String master;
+    @Deprecated
+    @Nullable
+    private final String master;
 
-	@Nullable
-	private final String clusterManager;
+    @Nullable
+    private final String clusterManager;
 
-	@Nullable
-	private final String name;
+    @Nullable
+    private final String name;
 
-	@Nullable
-	private final String completionSize;
+    @Nullable
+    private final String completionSize;
 
-	@Nullable
-	private final String fielddataMemorySize;
+    @Nullable
+    private final String fielddataMemorySize;
 
-	@Nullable
-	private final String fielddataEvictions;
+    @Nullable
+    private final String fielddataEvictions;
 
-	@Nullable
-	private final String queryCacheMemorySize;
+    @Nullable
+    private final String queryCacheMemorySize;
 
-	@Nullable
-	private final String queryCacheEvictions;
+    @Nullable
+    private final String queryCacheEvictions;
 
-	@Nullable
-	private final String queryCacheHitCount;
+    @Nullable
+    private final String queryCacheHitCount;
 
-	@Nullable
-	private final String queryCacheMissCount;
+    @Nullable
+    private final String queryCacheMissCount;
 
-	@Nullable
-	private final String requestCacheMemorySize;
+    @Nullable
+    private final String requestCacheMemorySize;
 
-	@Nullable
-	private final String requestCacheEvictions;
+    @Nullable
+    private final String requestCacheEvictions;
 
-	@Nullable
-	private final String requestCacheHitCount;
+    @Nullable
+    private final String requestCacheHitCount;
 
-	@Nullable
-	private final String requestCacheMissCount;
+    @Nullable
+    private final String requestCacheMissCount;
 
-	@Nullable
-	private final String flushTotal;
+    @Nullable
+    private final String flushTotal;
 
-	@Nullable
-	private final String flushTotalTime;
+    @Nullable
+    private final String flushTotalTime;
 
-	@Nullable
-	private final String getCurrent;
+    @Nullable
+    private final String getCurrent;
 
-	@Nullable
-	private final String getTime;
+    @Nullable
+    private final String getTime;
 
-	@Nullable
-	private final String getTotal;
+    @Nullable
+    private final String getTotal;
 
-	@Nullable
-	private final String getExistsTime;
+    @Nullable
+    private final String getExistsTime;
 
-	@Nullable
-	private final String getExistsTotal;
+    @Nullable
+    private final String getExistsTotal;
 
-	@Nullable
-	private final String getMissingTime;
+    @Nullable
+    private final String getMissingTime;
 
-	@Nullable
-	private final String getMissingTotal;
+    @Nullable
+    private final String getMissingTotal;
 
-	@Nullable
-	private final String indexingDeleteCurrent;
+    @Nullable
+    private final String indexingDeleteCurrent;
 
-	@Nullable
-	private final String indexingDeleteTime;
+    @Nullable
+    private final String indexingDeleteTime;
 
-	@Nullable
-	private final String indexingDeleteTotal;
+    @Nullable
+    private final String indexingDeleteTotal;
 
-	@Nullable
-	private final String indexingIndexCurrent;
+    @Nullable
+    private final String indexingIndexCurrent;
 
-	@Nullable
-	private final String indexingIndexTime;
+    @Nullable
+    private final String indexingIndexTime;
 
-	@Nullable
-	private final String indexingIndexTotal;
+    @Nullable
+    private final String indexingIndexTotal;
 
-	@Nullable
-	private final String indexingIndexFailed;
+    @Nullable
+    private final String indexingIndexFailed;
 
-	@Nullable
-	private final String mergesCurrent;
+    @Nullable
+    private final String mergesCurrent;
 
-	@Nullable
-	private final String mergesCurrentDocs;
+    @Nullable
+    private final String mergesCurrentDocs;
 
-	@Nullable
-	private final String mergesCurrentSize;
+    @Nullable
+    private final String mergesCurrentSize;
 
-	@Nullable
-	private final String mergesTotal;
+    @Nullable
+    private final String mergesTotal;
 
-	@Nullable
-	private final String mergesTotalDocs;
+    @Nullable
+    private final String mergesTotalDocs;
 
-	@Nullable
-	private final String mergesTotalSize;
+    @Nullable
+    private final String mergesTotalSize;
 
-	@Nullable
-	private final String mergesTotalTime;
+    @Nullable
+    private final String mergesTotalTime;
 
-	@Nullable
-	private final String refreshTotal;
+    @Nullable
+    private final String refreshTotal;
 
-	@Nullable
-	private final String refreshTime;
+    @Nullable
+    private final String refreshTime;
 
-	@Nullable
-	private final String refreshExternalTotal;
+    @Nullable
+    private final String refreshExternalTotal;
 
-	@Nullable
-	private final String refreshExternalTime;
+    @Nullable
+    private final String refreshExternalTime;
 
-	@Nullable
-	private final String refreshListeners;
+    @Nullable
+    private final String refreshListeners;
 
-	@Nullable
-	private final String scriptCompilations;
+    @Nullable
+    private final String scriptCompilations;
 
-	@Nullable
-	private final String scriptCacheEvictions;
+    @Nullable
+    private final String scriptCacheEvictions;
 
-	@Nullable
-	private final String scriptCompilationLimitTriggered;
+    @Nullable
+    private final String scriptCompilationLimitTriggered;
 
-	@Nullable
-	private final String searchFetchCurrent;
+    @Nullable
+    private final String searchFetchCurrent;
 
-	@Nullable
-	private final String searchFetchTime;
+    @Nullable
+    private final String searchFetchTime;
 
-	@Nullable
-	private final String searchFetchTotal;
+    @Nullable
+    private final String searchFetchTotal;
 
-	@Nullable
-	private final String searchOpenContexts;
+    @Nullable
+    private final String searchOpenContexts;
 
-	@Nullable
-	private final String searchQueryCurrent;
+    @Nullable
+    private final String searchQueryCurrent;
 
-	@Nullable
-	private final String searchQueryTime;
+    @Nullable
+    private final String searchQueryTime;
 
-	@Nullable
-	private final String searchQueryTotal;
+    @Nullable
+    private final String searchQueryTotal;
 
-	@Nullable
-	private final String searchScrollCurrent;
+    @Nullable
+    private final String searchScrollCurrent;
 
-	@Nullable
-	private final String searchScrollTime;
+    @Nullable
+    private final String searchScrollTime;
 
-	@Nullable
-	private final String searchScrollTotal;
-
-	@Nullable
-	private final String segmentsCount;
-
-	@Nullable
-	private final String segmentsMemory;
-
-	@Nullable
-	private final String segmentsIndexWriterMemory;
-
-	@Nullable
-	private final String segmentsVersionMapMemory;
-
-	@Nullable
-	private final String segmentsFixedBitsetMemory;
-
-	@Nullable
-	private final String suggestCurrent;
-
-	@Nullable
-	private final String suggestTime;
-
-	@Nullable
-	private final String suggestTotal;
-
-	@Nullable
-	private final String bulkTotalOperations;
-
-	@Nullable
-	private final String bulkTotalTime;
-
-	@Nullable
-	private final String bulkTotalSizeInBytes;
-
-	@Nullable
-	private final String bulkAvgTime;
-
-	@Nullable
-	private final String bulkAvgSizeInBytes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodesRecord(Builder builder) {
-
-		this.id = builder.id;
-		this.pid = builder.pid;
-		this.ip = builder.ip;
-		this.port = builder.port;
-		this.httpAddress = builder.httpAddress;
-		this.version = builder.version;
-		this.flavor = builder.flavor;
-		this.type = builder.type;
-		this.build = builder.build;
-		this.jdk = builder.jdk;
-		this.diskTotal = builder.diskTotal;
-		this.diskUsed = builder.diskUsed;
-		this.diskAvail = builder.diskAvail;
-		this.diskUsedPercent = builder.diskUsedPercent;
-		this.heapCurrent = builder.heapCurrent;
-		this.heapPercent = builder.heapPercent;
-		this.heapMax = builder.heapMax;
-		this.ramCurrent = builder.ramCurrent;
-		this.ramPercent = builder.ramPercent;
-		this.ramMax = builder.ramMax;
-		this.fileDescCurrent = builder.fileDescCurrent;
-		this.fileDescPercent = builder.fileDescPercent;
-		this.fileDescMax = builder.fileDescMax;
-		this.cpu = builder.cpu;
-		this.load1m = builder.load1m;
-		this.load5m = builder.load5m;
-		this.load15m = builder.load15m;
-		this.uptime = builder.uptime;
-		this.nodeRole = builder.nodeRole;
-		this.master = builder.master;
-		this.clusterManager = builder.clusterManager;
-		this.name = builder.name;
-		this.completionSize = builder.completionSize;
-		this.fielddataMemorySize = builder.fielddataMemorySize;
-		this.fielddataEvictions = builder.fielddataEvictions;
-		this.queryCacheMemorySize = builder.queryCacheMemorySize;
-		this.queryCacheEvictions = builder.queryCacheEvictions;
-		this.queryCacheHitCount = builder.queryCacheHitCount;
-		this.queryCacheMissCount = builder.queryCacheMissCount;
-		this.requestCacheMemorySize = builder.requestCacheMemorySize;
-		this.requestCacheEvictions = builder.requestCacheEvictions;
-		this.requestCacheHitCount = builder.requestCacheHitCount;
-		this.requestCacheMissCount = builder.requestCacheMissCount;
-		this.flushTotal = builder.flushTotal;
-		this.flushTotalTime = builder.flushTotalTime;
-		this.getCurrent = builder.getCurrent;
-		this.getTime = builder.getTime;
-		this.getTotal = builder.getTotal;
-		this.getExistsTime = builder.getExistsTime;
-		this.getExistsTotal = builder.getExistsTotal;
-		this.getMissingTime = builder.getMissingTime;
-		this.getMissingTotal = builder.getMissingTotal;
-		this.indexingDeleteCurrent = builder.indexingDeleteCurrent;
-		this.indexingDeleteTime = builder.indexingDeleteTime;
-		this.indexingDeleteTotal = builder.indexingDeleteTotal;
-		this.indexingIndexCurrent = builder.indexingIndexCurrent;
-		this.indexingIndexTime = builder.indexingIndexTime;
-		this.indexingIndexTotal = builder.indexingIndexTotal;
-		this.indexingIndexFailed = builder.indexingIndexFailed;
-		this.mergesCurrent = builder.mergesCurrent;
-		this.mergesCurrentDocs = builder.mergesCurrentDocs;
-		this.mergesCurrentSize = builder.mergesCurrentSize;
-		this.mergesTotal = builder.mergesTotal;
-		this.mergesTotalDocs = builder.mergesTotalDocs;
-		this.mergesTotalSize = builder.mergesTotalSize;
-		this.mergesTotalTime = builder.mergesTotalTime;
-		this.refreshTotal = builder.refreshTotal;
-		this.refreshTime = builder.refreshTime;
-		this.refreshExternalTotal = builder.refreshExternalTotal;
-		this.refreshExternalTime = builder.refreshExternalTime;
-		this.refreshListeners = builder.refreshListeners;
-		this.scriptCompilations = builder.scriptCompilations;
-		this.scriptCacheEvictions = builder.scriptCacheEvictions;
-		this.scriptCompilationLimitTriggered = builder.scriptCompilationLimitTriggered;
-		this.searchFetchCurrent = builder.searchFetchCurrent;
-		this.searchFetchTime = builder.searchFetchTime;
-		this.searchFetchTotal = builder.searchFetchTotal;
-		this.searchOpenContexts = builder.searchOpenContexts;
-		this.searchQueryCurrent = builder.searchQueryCurrent;
-		this.searchQueryTime = builder.searchQueryTime;
-		this.searchQueryTotal = builder.searchQueryTotal;
-		this.searchScrollCurrent = builder.searchScrollCurrent;
-		this.searchScrollTime = builder.searchScrollTime;
-		this.searchScrollTotal = builder.searchScrollTotal;
-		this.segmentsCount = builder.segmentsCount;
-		this.segmentsMemory = builder.segmentsMemory;
-		this.segmentsIndexWriterMemory = builder.segmentsIndexWriterMemory;
-		this.segmentsVersionMapMemory = builder.segmentsVersionMapMemory;
-		this.segmentsFixedBitsetMemory = builder.segmentsFixedBitsetMemory;
-		this.suggestCurrent = builder.suggestCurrent;
-		this.suggestTime = builder.suggestTime;
-		this.suggestTotal = builder.suggestTotal;
-		this.bulkTotalOperations = builder.bulkTotalOperations;
-		this.bulkTotalTime = builder.bulkTotalTime;
-		this.bulkTotalSizeInBytes = builder.bulkTotalSizeInBytes;
-		this.bulkAvgTime = builder.bulkAvgTime;
-		this.bulkAvgSizeInBytes = builder.bulkAvgSizeInBytes;
-
-	}
-
-	public static NodesRecord of(Function<Builder, ObjectBuilder<NodesRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * unique node id
-	 * <p>
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * process id
-	 * <p>
-	 * API name: {@code pid}
-	 */
-	@Nullable
-	public final String pid() {
-		return this.pid;
-	}
-
-	/**
-	 * ip address
-	 * <p>
-	 * API name: {@code ip}
-	 */
-	@Nullable
-	public final String ip() {
-		return this.ip;
-	}
-
-	/**
-	 * bound transport port
-	 * <p>
-	 * API name: {@code port}
-	 */
-	@Nullable
-	public final String port() {
-		return this.port;
-	}
-
-	/**
-	 * bound http address
-	 * <p>
-	 * API name: {@code http_address}
-	 */
-	@Nullable
-	public final String httpAddress() {
-		return this.httpAddress;
-	}
-
-	/**
-	 * es version
-	 * <p>
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final String version() {
-		return this.version;
-	}
-
-	/**
-	 * es distribution flavor
-	 * <p>
-	 * API name: {@code flavor}
-	 */
-	@Nullable
-	public final String flavor() {
-		return this.flavor;
-	}
-
-	/**
-	 * es distribution type
-	 * <p>
-	 * API name: {@code type}
-	 */
-	@Nullable
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * es build hash
-	 * <p>
-	 * API name: {@code build}
-	 */
-	@Nullable
-	public final String build() {
-		return this.build;
-	}
-
-	/**
-	 * jdk version
-	 * <p>
-	 * API name: {@code jdk}
-	 */
-	@Nullable
-	public final String jdk() {
-		return this.jdk;
-	}
-
-	/**
-	 * total disk space
-	 * <p>
-	 * API name: {@code disk.total}
-	 */
-	@Nullable
-	public final String diskTotal() {
-		return this.diskTotal;
-	}
-
-	/**
-	 * used disk space
-	 * <p>
-	 * API name: {@code disk.used}
-	 */
-	@Nullable
-	public final String diskUsed() {
-		return this.diskUsed;
-	}
-
-	/**
-	 * available disk space
-	 * <p>
-	 * API name: {@code disk.avail}
-	 */
-	@Nullable
-	public final String diskAvail() {
-		return this.diskAvail;
-	}
-
-	/**
-	 * used disk space percentage
-	 * <p>
-	 * API name: {@code disk.used_percent}
-	 */
-	@Nullable
-	public final String diskUsedPercent() {
-		return this.diskUsedPercent;
-	}
-
-	/**
-	 * used heap
-	 * <p>
-	 * API name: {@code heap.current}
-	 */
-	@Nullable
-	public final String heapCurrent() {
-		return this.heapCurrent;
-	}
-
-	/**
-	 * used heap ratio
-	 * <p>
-	 * API name: {@code heap.percent}
-	 */
-	@Nullable
-	public final String heapPercent() {
-		return this.heapPercent;
-	}
-
-	/**
-	 * max configured heap
-	 * <p>
-	 * API name: {@code heap.max}
-	 */
-	@Nullable
-	public final String heapMax() {
-		return this.heapMax;
-	}
-
-	/**
-	 * used machine memory
-	 * <p>
-	 * API name: {@code ram.current}
-	 */
-	@Nullable
-	public final String ramCurrent() {
-		return this.ramCurrent;
-	}
-
-	/**
-	 * used machine memory ratio
-	 * <p>
-	 * API name: {@code ram.percent}
-	 */
-	@Nullable
-	public final String ramPercent() {
-		return this.ramPercent;
-	}
-
-	/**
-	 * total machine memory
-	 * <p>
-	 * API name: {@code ram.max}
-	 */
-	@Nullable
-	public final String ramMax() {
-		return this.ramMax;
-	}
-
-	/**
-	 * used file descriptors
-	 * <p>
-	 * API name: {@code file_desc.current}
-	 */
-	@Nullable
-	public final String fileDescCurrent() {
-		return this.fileDescCurrent;
-	}
-
-	/**
-	 * used file descriptor ratio
-	 * <p>
-	 * API name: {@code file_desc.percent}
-	 */
-	@Nullable
-	public final String fileDescPercent() {
-		return this.fileDescPercent;
-	}
-
-	/**
-	 * max file descriptors
-	 * <p>
-	 * API name: {@code file_desc.max}
-	 */
-	@Nullable
-	public final String fileDescMax() {
-		return this.fileDescMax;
-	}
-
-	/**
-	 * recent cpu usage
-	 * <p>
-	 * API name: {@code cpu}
-	 */
-	@Nullable
-	public final String cpu() {
-		return this.cpu;
-	}
-
-	/**
-	 * 1m load avg
-	 * <p>
-	 * API name: {@code load_1m}
-	 */
-	@Nullable
-	public final String load1m() {
-		return this.load1m;
-	}
-
-	/**
-	 * 5m load avg
-	 * <p>
-	 * API name: {@code load_5m}
-	 */
-	@Nullable
-	public final String load5m() {
-		return this.load5m;
-	}
-
-	/**
-	 * 15m load avg
-	 * <p>
-	 * API name: {@code load_15m}
-	 */
-	@Nullable
-	public final String load15m() {
-		return this.load15m;
-	}
-
-	/**
-	 * node uptime
-	 * <p>
-	 * API name: {@code uptime}
-	 */
-	@Nullable
-	public final String uptime() {
-		return this.uptime;
-	}
-
-	/**
-	 * m:cluster-manager eligible node, d:data node, i:ingest node, -:coordinating node only
-	 * <p>
-	 * API name: {@code node.role}
-	 */
-	@Nullable
-	public final String nodeRole() {
-		return this.nodeRole;
-	}
-
-	/**
-	 * *:current master
-	 * <p>
-	 * API name: {@code master}
-	 */
-	@Deprecated
-	@Nullable
-	public final String master() {
-		return this.master;
-	}
-
-	/**
-	 * *:current cluster-manager
-	 * <p>
-	 * API name: {@code clusterManager}
-	 */
-	@Nullable
-	public final String clusterManager() {
-		return this.clusterManager;
-	}
-
-	/**
-	 * node name
-	 * <p>
-	 * API name: {@code name}
-	 */
-	@Nullable
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * size of completion
-	 * <p>
-	 * API name: {@code completion.size}
-	 */
-	@Nullable
-	public final String completionSize() {
-		return this.completionSize;
-	}
-
-	/**
-	 * used fielddata cache
-	 * <p>
-	 * API name: {@code fielddata.memory_size}
-	 */
-	@Nullable
-	public final String fielddataMemorySize() {
-		return this.fielddataMemorySize;
-	}
-
-	/**
-	 * fielddata evictions
-	 * <p>
-	 * API name: {@code fielddata.evictions}
-	 */
-	@Nullable
-	public final String fielddataEvictions() {
-		return this.fielddataEvictions;
-	}
-
-	/**
-	 * used query cache
-	 * <p>
-	 * API name: {@code query_cache.memory_size}
-	 */
-	@Nullable
-	public final String queryCacheMemorySize() {
-		return this.queryCacheMemorySize;
-	}
-
-	/**
-	 * query cache evictions
-	 * <p>
-	 * API name: {@code query_cache.evictions}
-	 */
-	@Nullable
-	public final String queryCacheEvictions() {
-		return this.queryCacheEvictions;
-	}
-
-	/**
-	 * query cache hit counts
-	 * <p>
-	 * API name: {@code query_cache.hit_count}
-	 */
-	@Nullable
-	public final String queryCacheHitCount() {
-		return this.queryCacheHitCount;
-	}
-
-	/**
-	 * query cache miss counts
-	 * <p>
-	 * API name: {@code query_cache.miss_count}
-	 */
-	@Nullable
-	public final String queryCacheMissCount() {
-		return this.queryCacheMissCount;
-	}
-
-	/**
-	 * used request cache
-	 * <p>
-	 * API name: {@code request_cache.memory_size}
-	 */
-	@Nullable
-	public final String requestCacheMemorySize() {
-		return this.requestCacheMemorySize;
-	}
-
-	/**
-	 * request cache evictions
-	 * <p>
-	 * API name: {@code request_cache.evictions}
-	 */
-	@Nullable
-	public final String requestCacheEvictions() {
-		return this.requestCacheEvictions;
-	}
-
-	/**
-	 * request cache hit counts
-	 * <p>
-	 * API name: {@code request_cache.hit_count}
-	 */
-	@Nullable
-	public final String requestCacheHitCount() {
-		return this.requestCacheHitCount;
-	}
-
-	/**
-	 * request cache miss counts
-	 * <p>
-	 * API name: {@code request_cache.miss_count}
-	 */
-	@Nullable
-	public final String requestCacheMissCount() {
-		return this.requestCacheMissCount;
-	}
-
-	/**
-	 * number of flushes
-	 * <p>
-	 * API name: {@code flush.total}
-	 */
-	@Nullable
-	public final String flushTotal() {
-		return this.flushTotal;
-	}
-
-	/**
-	 * time spent in flush
-	 * <p>
-	 * API name: {@code flush.total_time}
-	 */
-	@Nullable
-	public final String flushTotalTime() {
-		return this.flushTotalTime;
-	}
-
-	/**
-	 * number of current get ops
-	 * <p>
-	 * API name: {@code get.current}
-	 */
-	@Nullable
-	public final String getCurrent() {
-		return this.getCurrent;
-	}
-
-	/**
-	 * time spent in get
-	 * <p>
-	 * API name: {@code get.time}
-	 */
-	@Nullable
-	public final String getTime() {
-		return this.getTime;
-	}
-
-	/**
-	 * number of get ops
-	 * <p>
-	 * API name: {@code get.total}
-	 */
-	@Nullable
-	public final String getTotal() {
-		return this.getTotal;
-	}
-
-	/**
-	 * time spent in successful gets
-	 * <p>
-	 * API name: {@code get.exists_time}
-	 */
-	@Nullable
-	public final String getExistsTime() {
-		return this.getExistsTime;
-	}
-
-	/**
-	 * number of successful gets
-	 * <p>
-	 * API name: {@code get.exists_total}
-	 */
-	@Nullable
-	public final String getExistsTotal() {
-		return this.getExistsTotal;
-	}
-
-	/**
-	 * time spent in failed gets
-	 * <p>
-	 * API name: {@code get.missing_time}
-	 */
-	@Nullable
-	public final String getMissingTime() {
-		return this.getMissingTime;
-	}
-
-	/**
-	 * number of failed gets
-	 * <p>
-	 * API name: {@code get.missing_total}
-	 */
-	@Nullable
-	public final String getMissingTotal() {
-		return this.getMissingTotal;
-	}
-
-	/**
-	 * number of current deletions
-	 * <p>
-	 * API name: {@code indexing.delete_current}
-	 */
-	@Nullable
-	public final String indexingDeleteCurrent() {
-		return this.indexingDeleteCurrent;
-	}
-
-	/**
-	 * time spent in deletions
-	 * <p>
-	 * API name: {@code indexing.delete_time}
-	 */
-	@Nullable
-	public final String indexingDeleteTime() {
-		return this.indexingDeleteTime;
-	}
-
-	/**
-	 * number of delete ops
-	 * <p>
-	 * API name: {@code indexing.delete_total}
-	 */
-	@Nullable
-	public final String indexingDeleteTotal() {
-		return this.indexingDeleteTotal;
-	}
-
-	/**
-	 * number of current indexing ops
-	 * <p>
-	 * API name: {@code indexing.index_current}
-	 */
-	@Nullable
-	public final String indexingIndexCurrent() {
-		return this.indexingIndexCurrent;
-	}
-
-	/**
-	 * time spent in indexing
-	 * <p>
-	 * API name: {@code indexing.index_time}
-	 */
-	@Nullable
-	public final String indexingIndexTime() {
-		return this.indexingIndexTime;
-	}
-
-	/**
-	 * number of indexing ops
-	 * <p>
-	 * API name: {@code indexing.index_total}
-	 */
-	@Nullable
-	public final String indexingIndexTotal() {
-		return this.indexingIndexTotal;
-	}
-
-	/**
-	 * number of failed indexing ops
-	 * <p>
-	 * API name: {@code indexing.index_failed}
-	 */
-	@Nullable
-	public final String indexingIndexFailed() {
-		return this.indexingIndexFailed;
-	}
-
-	/**
-	 * number of current merges
-	 * <p>
-	 * API name: {@code merges.current}
-	 */
-	@Nullable
-	public final String mergesCurrent() {
-		return this.mergesCurrent;
-	}
-
-	/**
-	 * number of current merging docs
-	 * <p>
-	 * API name: {@code merges.current_docs}
-	 */
-	@Nullable
-	public final String mergesCurrentDocs() {
-		return this.mergesCurrentDocs;
-	}
-
-	/**
-	 * size of current merges
-	 * <p>
-	 * API name: {@code merges.current_size}
-	 */
-	@Nullable
-	public final String mergesCurrentSize() {
-		return this.mergesCurrentSize;
-	}
-
-	/**
-	 * number of completed merge ops
-	 * <p>
-	 * API name: {@code merges.total}
-	 */
-	@Nullable
-	public final String mergesTotal() {
-		return this.mergesTotal;
-	}
-
-	/**
-	 * docs merged
-	 * <p>
-	 * API name: {@code merges.total_docs}
-	 */
-	@Nullable
-	public final String mergesTotalDocs() {
-		return this.mergesTotalDocs;
-	}
-
-	/**
-	 * size merged
-	 * <p>
-	 * API name: {@code merges.total_size}
-	 */
-	@Nullable
-	public final String mergesTotalSize() {
-		return this.mergesTotalSize;
-	}
-
-	/**
-	 * time spent in merges
-	 * <p>
-	 * API name: {@code merges.total_time}
-	 */
-	@Nullable
-	public final String mergesTotalTime() {
-		return this.mergesTotalTime;
-	}
-
-	/**
-	 * total refreshes
-	 * <p>
-	 * API name: {@code refresh.total}
-	 */
-	@Nullable
-	public final String refreshTotal() {
-		return this.refreshTotal;
-	}
-
-	/**
-	 * time spent in refreshes
-	 * <p>
-	 * API name: {@code refresh.time}
-	 */
-	@Nullable
-	public final String refreshTime() {
-		return this.refreshTime;
-	}
-
-	/**
-	 * total external refreshes
-	 * <p>
-	 * API name: {@code refresh.external_total}
-	 */
-	@Nullable
-	public final String refreshExternalTotal() {
-		return this.refreshExternalTotal;
-	}
-
-	/**
-	 * time spent in external refreshes
-	 * <p>
-	 * API name: {@code refresh.external_time}
-	 */
-	@Nullable
-	public final String refreshExternalTime() {
-		return this.refreshExternalTime;
-	}
-
-	/**
-	 * number of pending refresh listeners
-	 * <p>
-	 * API name: {@code refresh.listeners}
-	 */
-	@Nullable
-	public final String refreshListeners() {
-		return this.refreshListeners;
-	}
-
-	/**
-	 * script compilations
-	 * <p>
-	 * API name: {@code script.compilations}
-	 */
-	@Nullable
-	public final String scriptCompilations() {
-		return this.scriptCompilations;
-	}
-
-	/**
-	 * script cache evictions
-	 * <p>
-	 * API name: {@code script.cache_evictions}
-	 */
-	@Nullable
-	public final String scriptCacheEvictions() {
-		return this.scriptCacheEvictions;
-	}
-
-	/**
-	 * script cache compilation limit triggered
-	 * <p>
-	 * API name: {@code script.compilation_limit_triggered}
-	 */
-	@Nullable
-	public final String scriptCompilationLimitTriggered() {
-		return this.scriptCompilationLimitTriggered;
-	}
-
-	/**
-	 * current fetch phase ops
-	 * <p>
-	 * API name: {@code search.fetch_current}
-	 */
-	@Nullable
-	public final String searchFetchCurrent() {
-		return this.searchFetchCurrent;
-	}
-
-	/**
-	 * time spent in fetch phase
-	 * <p>
-	 * API name: {@code search.fetch_time}
-	 */
-	@Nullable
-	public final String searchFetchTime() {
-		return this.searchFetchTime;
-	}
-
-	/**
-	 * total fetch ops
-	 * <p>
-	 * API name: {@code search.fetch_total}
-	 */
-	@Nullable
-	public final String searchFetchTotal() {
-		return this.searchFetchTotal;
-	}
-
-	/**
-	 * open search contexts
-	 * <p>
-	 * API name: {@code search.open_contexts}
-	 */
-	@Nullable
-	public final String searchOpenContexts() {
-		return this.searchOpenContexts;
-	}
-
-	/**
-	 * current query phase ops
-	 * <p>
-	 * API name: {@code search.query_current}
-	 */
-	@Nullable
-	public final String searchQueryCurrent() {
-		return this.searchQueryCurrent;
-	}
-
-	/**
-	 * time spent in query phase
-	 * <p>
-	 * API name: {@code search.query_time}
-	 */
-	@Nullable
-	public final String searchQueryTime() {
-		return this.searchQueryTime;
-	}
-
-	/**
-	 * total query phase ops
-	 * <p>
-	 * API name: {@code search.query_total}
-	 */
-	@Nullable
-	public final String searchQueryTotal() {
-		return this.searchQueryTotal;
-	}
-
-	/**
-	 * open scroll contexts
-	 * <p>
-	 * API name: {@code search.scroll_current}
-	 */
-	@Nullable
-	public final String searchScrollCurrent() {
-		return this.searchScrollCurrent;
-	}
-
-	/**
-	 * time scroll contexts held open
-	 * <p>
-	 * API name: {@code search.scroll_time}
-	 */
-	@Nullable
-	public final String searchScrollTime() {
-		return this.searchScrollTime;
-	}
-
-	/**
-	 * completed scroll contexts
-	 * <p>
-	 * API name: {@code search.scroll_total}
-	 */
-	@Nullable
-	public final String searchScrollTotal() {
-		return this.searchScrollTotal;
-	}
-
-	/**
-	 * number of segments
-	 * <p>
-	 * API name: {@code segments.count}
-	 */
-	@Nullable
-	public final String segmentsCount() {
-		return this.segmentsCount;
-	}
-
-	/**
-	 * memory used by segments
-	 * <p>
-	 * API name: {@code segments.memory}
-	 */
-	@Nullable
-	public final String segmentsMemory() {
-		return this.segmentsMemory;
-	}
-
-	/**
-	 * memory used by index writer
-	 * <p>
-	 * API name: {@code segments.index_writer_memory}
-	 */
-	@Nullable
-	public final String segmentsIndexWriterMemory() {
-		return this.segmentsIndexWriterMemory;
-	}
-
-	/**
-	 * memory used by version map
-	 * <p>
-	 * API name: {@code segments.version_map_memory}
-	 */
-	@Nullable
-	public final String segmentsVersionMapMemory() {
-		return this.segmentsVersionMapMemory;
-	}
-
-	/**
-	 * memory used by fixed bit sets for nested object field types and export type
-	 * filters for types referred in _parent fields
-	 * <p>
-	 * API name: {@code segments.fixed_bitset_memory}
-	 */
-	@Nullable
-	public final String segmentsFixedBitsetMemory() {
-		return this.segmentsFixedBitsetMemory;
-	}
-
-	/**
-	 * number of current suggest ops
-	 * <p>
-	 * API name: {@code suggest.current}
-	 */
-	@Nullable
-	public final String suggestCurrent() {
-		return this.suggestCurrent;
-	}
-
-	/**
-	 * time spend in suggest
-	 * <p>
-	 * API name: {@code suggest.time}
-	 */
-	@Nullable
-	public final String suggestTime() {
-		return this.suggestTime;
-	}
-
-	/**
-	 * number of suggest ops
-	 * <p>
-	 * API name: {@code suggest.total}
-	 */
-	@Nullable
-	public final String suggestTotal() {
-		return this.suggestTotal;
-	}
-
-	/**
-	 * number of bulk shard ops
-	 * <p>
-	 * API name: {@code bulk.total_operations}
-	 */
-	@Nullable
-	public final String bulkTotalOperations() {
-		return this.bulkTotalOperations;
-	}
-
-	/**
-	 * time spend in shard bulk
-	 * <p>
-	 * API name: {@code bulk.total_time}
-	 */
-	@Nullable
-	public final String bulkTotalTime() {
-		return this.bulkTotalTime;
-	}
-
-	/**
-	 * total size in bytes of shard bulk
-	 * <p>
-	 * API name: {@code bulk.total_size_in_bytes}
-	 */
-	@Nullable
-	public final String bulkTotalSizeInBytes() {
-		return this.bulkTotalSizeInBytes;
-	}
-
-	/**
-	 * average time spend in shard bulk
-	 * <p>
-	 * API name: {@code bulk.avg_time}
-	 */
-	@Nullable
-	public final String bulkAvgTime() {
-		return this.bulkAvgTime;
-	}
-
-	/**
-	 * average size in bytes of shard bulk
-	 * <p>
-	 * API name: {@code bulk.avg_size_in_bytes}
-	 */
-	@Nullable
-	public final String bulkAvgSizeInBytes() {
-		return this.bulkAvgSizeInBytes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.id != null) {
-			generator.writeKey("id");
-			generator.write(this.id);
-
-		}
-		if (this.pid != null) {
-			generator.writeKey("pid");
-			generator.write(this.pid);
-
-		}
-		if (this.ip != null) {
-			generator.writeKey("ip");
-			generator.write(this.ip);
-
-		}
-		if (this.port != null) {
-			generator.writeKey("port");
-			generator.write(this.port);
-
-		}
-		if (this.httpAddress != null) {
-			generator.writeKey("http_address");
-			generator.write(this.httpAddress);
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		if (this.flavor != null) {
-			generator.writeKey("flavor");
-			generator.write(this.flavor);
-
-		}
-		if (this.type != null) {
-			generator.writeKey("type");
-			generator.write(this.type);
-
-		}
-		if (this.build != null) {
-			generator.writeKey("build");
-			generator.write(this.build);
-
-		}
-		if (this.jdk != null) {
-			generator.writeKey("jdk");
-			generator.write(this.jdk);
-
-		}
-		if (this.diskTotal != null) {
-			generator.writeKey("disk.total");
-			generator.write(this.diskTotal);
-
-		}
-		if (this.diskUsed != null) {
-			generator.writeKey("disk.used");
-			generator.write(this.diskUsed);
-
-		}
-		if (this.diskAvail != null) {
-			generator.writeKey("disk.avail");
-			generator.write(this.diskAvail);
-
-		}
-		if (this.diskUsedPercent != null) {
-			generator.writeKey("disk.used_percent");
-			generator.write(this.diskUsedPercent);
-
-		}
-		if (this.heapCurrent != null) {
-			generator.writeKey("heap.current");
-			generator.write(this.heapCurrent);
-
-		}
-		if (this.heapPercent != null) {
-			generator.writeKey("heap.percent");
-			generator.write(this.heapPercent);
-
-		}
-		if (this.heapMax != null) {
-			generator.writeKey("heap.max");
-			generator.write(this.heapMax);
-
-		}
-		if (this.ramCurrent != null) {
-			generator.writeKey("ram.current");
-			generator.write(this.ramCurrent);
-
-		}
-		if (this.ramPercent != null) {
-			generator.writeKey("ram.percent");
-			generator.write(this.ramPercent);
-
-		}
-		if (this.ramMax != null) {
-			generator.writeKey("ram.max");
-			generator.write(this.ramMax);
-
-		}
-		if (this.fileDescCurrent != null) {
-			generator.writeKey("file_desc.current");
-			generator.write(this.fileDescCurrent);
-
-		}
-		if (this.fileDescPercent != null) {
-			generator.writeKey("file_desc.percent");
-			generator.write(this.fileDescPercent);
-
-		}
-		if (this.fileDescMax != null) {
-			generator.writeKey("file_desc.max");
-			generator.write(this.fileDescMax);
-
-		}
-		if (this.cpu != null) {
-			generator.writeKey("cpu");
-			generator.write(this.cpu);
-
-		}
-		if (this.load1m != null) {
-			generator.writeKey("load_1m");
-			generator.write(this.load1m);
-
-		}
-		if (this.load5m != null) {
-			generator.writeKey("load_5m");
-			generator.write(this.load5m);
-
-		}
-		if (this.load15m != null) {
-			generator.writeKey("load_15m");
-			generator.write(this.load15m);
-
-		}
-		if (this.uptime != null) {
-			generator.writeKey("uptime");
-			generator.write(this.uptime);
-
-		}
-		if (this.nodeRole != null) {
-			generator.writeKey("node.role");
-			generator.write(this.nodeRole);
-
-		}
-		if (this.master != null) {
-			generator.writeKey("master");
-			generator.write(this.master);
-
-		}
-		if (this.clusterManager != null) {
-			generator.writeKey("cluster_manager");
-			generator.write(this.clusterManager);
-
-		}
-		if (this.name != null) {
-			generator.writeKey("name");
-			generator.write(this.name);
-
-		}
-		if (this.completionSize != null) {
-			generator.writeKey("completion.size");
-			generator.write(this.completionSize);
-
-		}
-		if (this.fielddataMemorySize != null) {
-			generator.writeKey("fielddata.memory_size");
-			generator.write(this.fielddataMemorySize);
-
-		}
-		if (this.fielddataEvictions != null) {
-			generator.writeKey("fielddata.evictions");
-			generator.write(this.fielddataEvictions);
-
-		}
-		if (this.queryCacheMemorySize != null) {
-			generator.writeKey("query_cache.memory_size");
-			generator.write(this.queryCacheMemorySize);
-
-		}
-		if (this.queryCacheEvictions != null) {
-			generator.writeKey("query_cache.evictions");
-			generator.write(this.queryCacheEvictions);
-
-		}
-		if (this.queryCacheHitCount != null) {
-			generator.writeKey("query_cache.hit_count");
-			generator.write(this.queryCacheHitCount);
-
-		}
-		if (this.queryCacheMissCount != null) {
-			generator.writeKey("query_cache.miss_count");
-			generator.write(this.queryCacheMissCount);
-
-		}
-		if (this.requestCacheMemorySize != null) {
-			generator.writeKey("request_cache.memory_size");
-			generator.write(this.requestCacheMemorySize);
-
-		}
-		if (this.requestCacheEvictions != null) {
-			generator.writeKey("request_cache.evictions");
-			generator.write(this.requestCacheEvictions);
-
-		}
-		if (this.requestCacheHitCount != null) {
-			generator.writeKey("request_cache.hit_count");
-			generator.write(this.requestCacheHitCount);
-
-		}
-		if (this.requestCacheMissCount != null) {
-			generator.writeKey("request_cache.miss_count");
-			generator.write(this.requestCacheMissCount);
-
-		}
-		if (this.flushTotal != null) {
-			generator.writeKey("flush.total");
-			generator.write(this.flushTotal);
-
-		}
-		if (this.flushTotalTime != null) {
-			generator.writeKey("flush.total_time");
-			generator.write(this.flushTotalTime);
-
-		}
-		if (this.getCurrent != null) {
-			generator.writeKey("get.current");
-			generator.write(this.getCurrent);
-
-		}
-		if (this.getTime != null) {
-			generator.writeKey("get.time");
-			generator.write(this.getTime);
-
-		}
-		if (this.getTotal != null) {
-			generator.writeKey("get.total");
-			generator.write(this.getTotal);
-
-		}
-		if (this.getExistsTime != null) {
-			generator.writeKey("get.exists_time");
-			generator.write(this.getExistsTime);
-
-		}
-		if (this.getExistsTotal != null) {
-			generator.writeKey("get.exists_total");
-			generator.write(this.getExistsTotal);
-
-		}
-		if (this.getMissingTime != null) {
-			generator.writeKey("get.missing_time");
-			generator.write(this.getMissingTime);
-
-		}
-		if (this.getMissingTotal != null) {
-			generator.writeKey("get.missing_total");
-			generator.write(this.getMissingTotal);
-
-		}
-		if (this.indexingDeleteCurrent != null) {
-			generator.writeKey("indexing.delete_current");
-			generator.write(this.indexingDeleteCurrent);
-
-		}
-		if (this.indexingDeleteTime != null) {
-			generator.writeKey("indexing.delete_time");
-			generator.write(this.indexingDeleteTime);
-
-		}
-		if (this.indexingDeleteTotal != null) {
-			generator.writeKey("indexing.delete_total");
-			generator.write(this.indexingDeleteTotal);
-
-		}
-		if (this.indexingIndexCurrent != null) {
-			generator.writeKey("indexing.index_current");
-			generator.write(this.indexingIndexCurrent);
-
-		}
-		if (this.indexingIndexTime != null) {
-			generator.writeKey("indexing.index_time");
-			generator.write(this.indexingIndexTime);
-
-		}
-		if (this.indexingIndexTotal != null) {
-			generator.writeKey("indexing.index_total");
-			generator.write(this.indexingIndexTotal);
-
-		}
-		if (this.indexingIndexFailed != null) {
-			generator.writeKey("indexing.index_failed");
-			generator.write(this.indexingIndexFailed);
-
-		}
-		if (this.mergesCurrent != null) {
-			generator.writeKey("merges.current");
-			generator.write(this.mergesCurrent);
-
-		}
-		if (this.mergesCurrentDocs != null) {
-			generator.writeKey("merges.current_docs");
-			generator.write(this.mergesCurrentDocs);
-
-		}
-		if (this.mergesCurrentSize != null) {
-			generator.writeKey("merges.current_size");
-			generator.write(this.mergesCurrentSize);
-
-		}
-		if (this.mergesTotal != null) {
-			generator.writeKey("merges.total");
-			generator.write(this.mergesTotal);
-
-		}
-		if (this.mergesTotalDocs != null) {
-			generator.writeKey("merges.total_docs");
-			generator.write(this.mergesTotalDocs);
-
-		}
-		if (this.mergesTotalSize != null) {
-			generator.writeKey("merges.total_size");
-			generator.write(this.mergesTotalSize);
-
-		}
-		if (this.mergesTotalTime != null) {
-			generator.writeKey("merges.total_time");
-			generator.write(this.mergesTotalTime);
-
-		}
-		if (this.refreshTotal != null) {
-			generator.writeKey("refresh.total");
-			generator.write(this.refreshTotal);
-
-		}
-		if (this.refreshTime != null) {
-			generator.writeKey("refresh.time");
-			generator.write(this.refreshTime);
-
-		}
-		if (this.refreshExternalTotal != null) {
-			generator.writeKey("refresh.external_total");
-			generator.write(this.refreshExternalTotal);
-
-		}
-		if (this.refreshExternalTime != null) {
-			generator.writeKey("refresh.external_time");
-			generator.write(this.refreshExternalTime);
-
-		}
-		if (this.refreshListeners != null) {
-			generator.writeKey("refresh.listeners");
-			generator.write(this.refreshListeners);
-
-		}
-		if (this.scriptCompilations != null) {
-			generator.writeKey("script.compilations");
-			generator.write(this.scriptCompilations);
-
-		}
-		if (this.scriptCacheEvictions != null) {
-			generator.writeKey("script.cache_evictions");
-			generator.write(this.scriptCacheEvictions);
-
-		}
-		if (this.scriptCompilationLimitTriggered != null) {
-			generator.writeKey("script.compilation_limit_triggered");
-			generator.write(this.scriptCompilationLimitTriggered);
-
-		}
-		if (this.searchFetchCurrent != null) {
-			generator.writeKey("search.fetch_current");
-			generator.write(this.searchFetchCurrent);
-
-		}
-		if (this.searchFetchTime != null) {
-			generator.writeKey("search.fetch_time");
-			generator.write(this.searchFetchTime);
-
-		}
-		if (this.searchFetchTotal != null) {
-			generator.writeKey("search.fetch_total");
-			generator.write(this.searchFetchTotal);
-
-		}
-		if (this.searchOpenContexts != null) {
-			generator.writeKey("search.open_contexts");
-			generator.write(this.searchOpenContexts);
-
-		}
-		if (this.searchQueryCurrent != null) {
-			generator.writeKey("search.query_current");
-			generator.write(this.searchQueryCurrent);
-
-		}
-		if (this.searchQueryTime != null) {
-			generator.writeKey("search.query_time");
-			generator.write(this.searchQueryTime);
-
-		}
-		if (this.searchQueryTotal != null) {
-			generator.writeKey("search.query_total");
-			generator.write(this.searchQueryTotal);
-
-		}
-		if (this.searchScrollCurrent != null) {
-			generator.writeKey("search.scroll_current");
-			generator.write(this.searchScrollCurrent);
-
-		}
-		if (this.searchScrollTime != null) {
-			generator.writeKey("search.scroll_time");
-			generator.write(this.searchScrollTime);
-
-		}
-		if (this.searchScrollTotal != null) {
-			generator.writeKey("search.scroll_total");
-			generator.write(this.searchScrollTotal);
-
-		}
-		if (this.segmentsCount != null) {
-			generator.writeKey("segments.count");
-			generator.write(this.segmentsCount);
-
-		}
-		if (this.segmentsMemory != null) {
-			generator.writeKey("segments.memory");
-			generator.write(this.segmentsMemory);
-
-		}
-		if (this.segmentsIndexWriterMemory != null) {
-			generator.writeKey("segments.index_writer_memory");
-			generator.write(this.segmentsIndexWriterMemory);
-
-		}
-		if (this.segmentsVersionMapMemory != null) {
-			generator.writeKey("segments.version_map_memory");
-			generator.write(this.segmentsVersionMapMemory);
-
-		}
-		if (this.segmentsFixedBitsetMemory != null) {
-			generator.writeKey("segments.fixed_bitset_memory");
-			generator.write(this.segmentsFixedBitsetMemory);
-
-		}
-		if (this.suggestCurrent != null) {
-			generator.writeKey("suggest.current");
-			generator.write(this.suggestCurrent);
+    @Nullable
+    private final String searchScrollTotal;
+
+    @Nullable
+    private final String segmentsCount;
+
+    @Nullable
+    private final String segmentsMemory;
+
+    @Nullable
+    private final String segmentsIndexWriterMemory;
+
+    @Nullable
+    private final String segmentsVersionMapMemory;
+
+    @Nullable
+    private final String segmentsFixedBitsetMemory;
+
+    @Nullable
+    private final String suggestCurrent;
+
+    @Nullable
+    private final String suggestTime;
+
+    @Nullable
+    private final String suggestTotal;
+
+    @Nullable
+    private final String bulkTotalOperations;
+
+    @Nullable
+    private final String bulkTotalTime;
+
+    @Nullable
+    private final String bulkTotalSizeInBytes;
+
+    @Nullable
+    private final String bulkAvgTime;
+
+    @Nullable
+    private final String bulkAvgSizeInBytes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodesRecord(Builder builder) {
+
+        this.id = builder.id;
+        this.pid = builder.pid;
+        this.ip = builder.ip;
+        this.port = builder.port;
+        this.httpAddress = builder.httpAddress;
+        this.version = builder.version;
+        this.flavor = builder.flavor;
+        this.type = builder.type;
+        this.build = builder.build;
+        this.jdk = builder.jdk;
+        this.diskTotal = builder.diskTotal;
+        this.diskUsed = builder.diskUsed;
+        this.diskAvail = builder.diskAvail;
+        this.diskUsedPercent = builder.diskUsedPercent;
+        this.heapCurrent = builder.heapCurrent;
+        this.heapPercent = builder.heapPercent;
+        this.heapMax = builder.heapMax;
+        this.ramCurrent = builder.ramCurrent;
+        this.ramPercent = builder.ramPercent;
+        this.ramMax = builder.ramMax;
+        this.fileDescCurrent = builder.fileDescCurrent;
+        this.fileDescPercent = builder.fileDescPercent;
+        this.fileDescMax = builder.fileDescMax;
+        this.cpu = builder.cpu;
+        this.load1m = builder.load1m;
+        this.load5m = builder.load5m;
+        this.load15m = builder.load15m;
+        this.uptime = builder.uptime;
+        this.nodeRole = builder.nodeRole;
+        this.master = builder.master;
+        this.clusterManager = builder.clusterManager;
+        this.name = builder.name;
+        this.completionSize = builder.completionSize;
+        this.fielddataMemorySize = builder.fielddataMemorySize;
+        this.fielddataEvictions = builder.fielddataEvictions;
+        this.queryCacheMemorySize = builder.queryCacheMemorySize;
+        this.queryCacheEvictions = builder.queryCacheEvictions;
+        this.queryCacheHitCount = builder.queryCacheHitCount;
+        this.queryCacheMissCount = builder.queryCacheMissCount;
+        this.requestCacheMemorySize = builder.requestCacheMemorySize;
+        this.requestCacheEvictions = builder.requestCacheEvictions;
+        this.requestCacheHitCount = builder.requestCacheHitCount;
+        this.requestCacheMissCount = builder.requestCacheMissCount;
+        this.flushTotal = builder.flushTotal;
+        this.flushTotalTime = builder.flushTotalTime;
+        this.getCurrent = builder.getCurrent;
+        this.getTime = builder.getTime;
+        this.getTotal = builder.getTotal;
+        this.getExistsTime = builder.getExistsTime;
+        this.getExistsTotal = builder.getExistsTotal;
+        this.getMissingTime = builder.getMissingTime;
+        this.getMissingTotal = builder.getMissingTotal;
+        this.indexingDeleteCurrent = builder.indexingDeleteCurrent;
+        this.indexingDeleteTime = builder.indexingDeleteTime;
+        this.indexingDeleteTotal = builder.indexingDeleteTotal;
+        this.indexingIndexCurrent = builder.indexingIndexCurrent;
+        this.indexingIndexTime = builder.indexingIndexTime;
+        this.indexingIndexTotal = builder.indexingIndexTotal;
+        this.indexingIndexFailed = builder.indexingIndexFailed;
+        this.mergesCurrent = builder.mergesCurrent;
+        this.mergesCurrentDocs = builder.mergesCurrentDocs;
+        this.mergesCurrentSize = builder.mergesCurrentSize;
+        this.mergesTotal = builder.mergesTotal;
+        this.mergesTotalDocs = builder.mergesTotalDocs;
+        this.mergesTotalSize = builder.mergesTotalSize;
+        this.mergesTotalTime = builder.mergesTotalTime;
+        this.refreshTotal = builder.refreshTotal;
+        this.refreshTime = builder.refreshTime;
+        this.refreshExternalTotal = builder.refreshExternalTotal;
+        this.refreshExternalTime = builder.refreshExternalTime;
+        this.refreshListeners = builder.refreshListeners;
+        this.scriptCompilations = builder.scriptCompilations;
+        this.scriptCacheEvictions = builder.scriptCacheEvictions;
+        this.scriptCompilationLimitTriggered = builder.scriptCompilationLimitTriggered;
+        this.searchFetchCurrent = builder.searchFetchCurrent;
+        this.searchFetchTime = builder.searchFetchTime;
+        this.searchFetchTotal = builder.searchFetchTotal;
+        this.searchOpenContexts = builder.searchOpenContexts;
+        this.searchQueryCurrent = builder.searchQueryCurrent;
+        this.searchQueryTime = builder.searchQueryTime;
+        this.searchQueryTotal = builder.searchQueryTotal;
+        this.searchScrollCurrent = builder.searchScrollCurrent;
+        this.searchScrollTime = builder.searchScrollTime;
+        this.searchScrollTotal = builder.searchScrollTotal;
+        this.segmentsCount = builder.segmentsCount;
+        this.segmentsMemory = builder.segmentsMemory;
+        this.segmentsIndexWriterMemory = builder.segmentsIndexWriterMemory;
+        this.segmentsVersionMapMemory = builder.segmentsVersionMapMemory;
+        this.segmentsFixedBitsetMemory = builder.segmentsFixedBitsetMemory;
+        this.suggestCurrent = builder.suggestCurrent;
+        this.suggestTime = builder.suggestTime;
+        this.suggestTotal = builder.suggestTotal;
+        this.bulkTotalOperations = builder.bulkTotalOperations;
+        this.bulkTotalTime = builder.bulkTotalTime;
+        this.bulkTotalSizeInBytes = builder.bulkTotalSizeInBytes;
+        this.bulkAvgTime = builder.bulkAvgTime;
+        this.bulkAvgSizeInBytes = builder.bulkAvgSizeInBytes;
+
+    }
+
+    public static NodesRecord of(Function<Builder, ObjectBuilder<NodesRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * unique node id
+     * <p>
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * process id
+     * <p>
+     * API name: {@code pid}
+     */
+    @Nullable
+    public final String pid() {
+        return this.pid;
+    }
+
+    /**
+     * ip address
+     * <p>
+     * API name: {@code ip}
+     */
+    @Nullable
+    public final String ip() {
+        return this.ip;
+    }
+
+    /**
+     * bound transport port
+     * <p>
+     * API name: {@code port}
+     */
+    @Nullable
+    public final String port() {
+        return this.port;
+    }
+
+    /**
+     * bound http address
+     * <p>
+     * API name: {@code http_address}
+     */
+    @Nullable
+    public final String httpAddress() {
+        return this.httpAddress;
+    }
+
+    /**
+     * es version
+     * <p>
+     * API name: {@code version}
+     */
+    @Nullable
+    public final String version() {
+        return this.version;
+    }
+
+    /**
+     * es distribution flavor
+     * <p>
+     * API name: {@code flavor}
+     */
+    @Nullable
+    public final String flavor() {
+        return this.flavor;
+    }
+
+    /**
+     * es distribution type
+     * <p>
+     * API name: {@code type}
+     */
+    @Nullable
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * es build hash
+     * <p>
+     * API name: {@code build}
+     */
+    @Nullable
+    public final String build() {
+        return this.build;
+    }
+
+    /**
+     * jdk version
+     * <p>
+     * API name: {@code jdk}
+     */
+    @Nullable
+    public final String jdk() {
+        return this.jdk;
+    }
+
+    /**
+     * total disk space
+     * <p>
+     * API name: {@code disk.total}
+     */
+    @Nullable
+    public final String diskTotal() {
+        return this.diskTotal;
+    }
+
+    /**
+     * used disk space
+     * <p>
+     * API name: {@code disk.used}
+     */
+    @Nullable
+    public final String diskUsed() {
+        return this.diskUsed;
+    }
+
+    /**
+     * available disk space
+     * <p>
+     * API name: {@code disk.avail}
+     */
+    @Nullable
+    public final String diskAvail() {
+        return this.diskAvail;
+    }
+
+    /**
+     * used disk space percentage
+     * <p>
+     * API name: {@code disk.used_percent}
+     */
+    @Nullable
+    public final String diskUsedPercent() {
+        return this.diskUsedPercent;
+    }
+
+    /**
+     * used heap
+     * <p>
+     * API name: {@code heap.current}
+     */
+    @Nullable
+    public final String heapCurrent() {
+        return this.heapCurrent;
+    }
+
+    /**
+     * used heap ratio
+     * <p>
+     * API name: {@code heap.percent}
+     */
+    @Nullable
+    public final String heapPercent() {
+        return this.heapPercent;
+    }
+
+    /**
+     * max configured heap
+     * <p>
+     * API name: {@code heap.max}
+     */
+    @Nullable
+    public final String heapMax() {
+        return this.heapMax;
+    }
+
+    /**
+     * used machine memory
+     * <p>
+     * API name: {@code ram.current}
+     */
+    @Nullable
+    public final String ramCurrent() {
+        return this.ramCurrent;
+    }
+
+    /**
+     * used machine memory ratio
+     * <p>
+     * API name: {@code ram.percent}
+     */
+    @Nullable
+    public final String ramPercent() {
+        return this.ramPercent;
+    }
+
+    /**
+     * total machine memory
+     * <p>
+     * API name: {@code ram.max}
+     */
+    @Nullable
+    public final String ramMax() {
+        return this.ramMax;
+    }
+
+    /**
+     * used file descriptors
+     * <p>
+     * API name: {@code file_desc.current}
+     */
+    @Nullable
+    public final String fileDescCurrent() {
+        return this.fileDescCurrent;
+    }
+
+    /**
+     * used file descriptor ratio
+     * <p>
+     * API name: {@code file_desc.percent}
+     */
+    @Nullable
+    public final String fileDescPercent() {
+        return this.fileDescPercent;
+    }
+
+    /**
+     * max file descriptors
+     * <p>
+     * API name: {@code file_desc.max}
+     */
+    @Nullable
+    public final String fileDescMax() {
+        return this.fileDescMax;
+    }
+
+    /**
+     * recent cpu usage
+     * <p>
+     * API name: {@code cpu}
+     */
+    @Nullable
+    public final String cpu() {
+        return this.cpu;
+    }
+
+    /**
+     * 1m load avg
+     * <p>
+     * API name: {@code load_1m}
+     */
+    @Nullable
+    public final String load1m() {
+        return this.load1m;
+    }
+
+    /**
+     * 5m load avg
+     * <p>
+     * API name: {@code load_5m}
+     */
+    @Nullable
+    public final String load5m() {
+        return this.load5m;
+    }
+
+    /**
+     * 15m load avg
+     * <p>
+     * API name: {@code load_15m}
+     */
+    @Nullable
+    public final String load15m() {
+        return this.load15m;
+    }
+
+    /**
+     * node uptime
+     * <p>
+     * API name: {@code uptime}
+     */
+    @Nullable
+    public final String uptime() {
+        return this.uptime;
+    }
+
+    /**
+     * m:cluster-manager eligible node, d:data node, i:ingest node, -:coordinating node only
+     * <p>
+     * API name: {@code node.role}
+     */
+    @Nullable
+    public final String nodeRole() {
+        return this.nodeRole;
+    }
+
+    /**
+     * *:current master
+     * <p>
+     * API name: {@code master}
+     */
+    @Deprecated
+    @Nullable
+    public final String master() {
+        return this.master;
+    }
+
+    /**
+     * *:current cluster-manager
+     * <p>
+     * API name: {@code clusterManager}
+     */
+    @Nullable
+    public final String clusterManager() {
+        return this.clusterManager;
+    }
+
+    /**
+     * node name
+     * <p>
+     * API name: {@code name}
+     */
+    @Nullable
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * size of completion
+     * <p>
+     * API name: {@code completion.size}
+     */
+    @Nullable
+    public final String completionSize() {
+        return this.completionSize;
+    }
+
+    /**
+     * used fielddata cache
+     * <p>
+     * API name: {@code fielddata.memory_size}
+     */
+    @Nullable
+    public final String fielddataMemorySize() {
+        return this.fielddataMemorySize;
+    }
+
+    /**
+     * fielddata evictions
+     * <p>
+     * API name: {@code fielddata.evictions}
+     */
+    @Nullable
+    public final String fielddataEvictions() {
+        return this.fielddataEvictions;
+    }
+
+    /**
+     * used query cache
+     * <p>
+     * API name: {@code query_cache.memory_size}
+     */
+    @Nullable
+    public final String queryCacheMemorySize() {
+        return this.queryCacheMemorySize;
+    }
+
+    /**
+     * query cache evictions
+     * <p>
+     * API name: {@code query_cache.evictions}
+     */
+    @Nullable
+    public final String queryCacheEvictions() {
+        return this.queryCacheEvictions;
+    }
+
+    /**
+     * query cache hit counts
+     * <p>
+     * API name: {@code query_cache.hit_count}
+     */
+    @Nullable
+    public final String queryCacheHitCount() {
+        return this.queryCacheHitCount;
+    }
+
+    /**
+     * query cache miss counts
+     * <p>
+     * API name: {@code query_cache.miss_count}
+     */
+    @Nullable
+    public final String queryCacheMissCount() {
+        return this.queryCacheMissCount;
+    }
+
+    /**
+     * used request cache
+     * <p>
+     * API name: {@code request_cache.memory_size}
+     */
+    @Nullable
+    public final String requestCacheMemorySize() {
+        return this.requestCacheMemorySize;
+    }
+
+    /**
+     * request cache evictions
+     * <p>
+     * API name: {@code request_cache.evictions}
+     */
+    @Nullable
+    public final String requestCacheEvictions() {
+        return this.requestCacheEvictions;
+    }
+
+    /**
+     * request cache hit counts
+     * <p>
+     * API name: {@code request_cache.hit_count}
+     */
+    @Nullable
+    public final String requestCacheHitCount() {
+        return this.requestCacheHitCount;
+    }
+
+    /**
+     * request cache miss counts
+     * <p>
+     * API name: {@code request_cache.miss_count}
+     */
+    @Nullable
+    public final String requestCacheMissCount() {
+        return this.requestCacheMissCount;
+    }
+
+    /**
+     * number of flushes
+     * <p>
+     * API name: {@code flush.total}
+     */
+    @Nullable
+    public final String flushTotal() {
+        return this.flushTotal;
+    }
+
+    /**
+     * time spent in flush
+     * <p>
+     * API name: {@code flush.total_time}
+     */
+    @Nullable
+    public final String flushTotalTime() {
+        return this.flushTotalTime;
+    }
+
+    /**
+     * number of current get ops
+     * <p>
+     * API name: {@code get.current}
+     */
+    @Nullable
+    public final String getCurrent() {
+        return this.getCurrent;
+    }
+
+    /**
+     * time spent in get
+     * <p>
+     * API name: {@code get.time}
+     */
+    @Nullable
+    public final String getTime() {
+        return this.getTime;
+    }
+
+    /**
+     * number of get ops
+     * <p>
+     * API name: {@code get.total}
+     */
+    @Nullable
+    public final String getTotal() {
+        return this.getTotal;
+    }
+
+    /**
+     * time spent in successful gets
+     * <p>
+     * API name: {@code get.exists_time}
+     */
+    @Nullable
+    public final String getExistsTime() {
+        return this.getExistsTime;
+    }
+
+    /**
+     * number of successful gets
+     * <p>
+     * API name: {@code get.exists_total}
+     */
+    @Nullable
+    public final String getExistsTotal() {
+        return this.getExistsTotal;
+    }
+
+    /**
+     * time spent in failed gets
+     * <p>
+     * API name: {@code get.missing_time}
+     */
+    @Nullable
+    public final String getMissingTime() {
+        return this.getMissingTime;
+    }
+
+    /**
+     * number of failed gets
+     * <p>
+     * API name: {@code get.missing_total}
+     */
+    @Nullable
+    public final String getMissingTotal() {
+        return this.getMissingTotal;
+    }
+
+    /**
+     * number of current deletions
+     * <p>
+     * API name: {@code indexing.delete_current}
+     */
+    @Nullable
+    public final String indexingDeleteCurrent() {
+        return this.indexingDeleteCurrent;
+    }
+
+    /**
+     * time spent in deletions
+     * <p>
+     * API name: {@code indexing.delete_time}
+     */
+    @Nullable
+    public final String indexingDeleteTime() {
+        return this.indexingDeleteTime;
+    }
+
+    /**
+     * number of delete ops
+     * <p>
+     * API name: {@code indexing.delete_total}
+     */
+    @Nullable
+    public final String indexingDeleteTotal() {
+        return this.indexingDeleteTotal;
+    }
+
+    /**
+     * number of current indexing ops
+     * <p>
+     * API name: {@code indexing.index_current}
+     */
+    @Nullable
+    public final String indexingIndexCurrent() {
+        return this.indexingIndexCurrent;
+    }
+
+    /**
+     * time spent in indexing
+     * <p>
+     * API name: {@code indexing.index_time}
+     */
+    @Nullable
+    public final String indexingIndexTime() {
+        return this.indexingIndexTime;
+    }
+
+    /**
+     * number of indexing ops
+     * <p>
+     * API name: {@code indexing.index_total}
+     */
+    @Nullable
+    public final String indexingIndexTotal() {
+        return this.indexingIndexTotal;
+    }
+
+    /**
+     * number of failed indexing ops
+     * <p>
+     * API name: {@code indexing.index_failed}
+     */
+    @Nullable
+    public final String indexingIndexFailed() {
+        return this.indexingIndexFailed;
+    }
+
+    /**
+     * number of current merges
+     * <p>
+     * API name: {@code merges.current}
+     */
+    @Nullable
+    public final String mergesCurrent() {
+        return this.mergesCurrent;
+    }
+
+    /**
+     * number of current merging docs
+     * <p>
+     * API name: {@code merges.current_docs}
+     */
+    @Nullable
+    public final String mergesCurrentDocs() {
+        return this.mergesCurrentDocs;
+    }
+
+    /**
+     * size of current merges
+     * <p>
+     * API name: {@code merges.current_size}
+     */
+    @Nullable
+    public final String mergesCurrentSize() {
+        return this.mergesCurrentSize;
+    }
+
+    /**
+     * number of completed merge ops
+     * <p>
+     * API name: {@code merges.total}
+     */
+    @Nullable
+    public final String mergesTotal() {
+        return this.mergesTotal;
+    }
+
+    /**
+     * docs merged
+     * <p>
+     * API name: {@code merges.total_docs}
+     */
+    @Nullable
+    public final String mergesTotalDocs() {
+        return this.mergesTotalDocs;
+    }
+
+    /**
+     * size merged
+     * <p>
+     * API name: {@code merges.total_size}
+     */
+    @Nullable
+    public final String mergesTotalSize() {
+        return this.mergesTotalSize;
+    }
+
+    /**
+     * time spent in merges
+     * <p>
+     * API name: {@code merges.total_time}
+     */
+    @Nullable
+    public final String mergesTotalTime() {
+        return this.mergesTotalTime;
+    }
+
+    /**
+     * total refreshes
+     * <p>
+     * API name: {@code refresh.total}
+     */
+    @Nullable
+    public final String refreshTotal() {
+        return this.refreshTotal;
+    }
+
+    /**
+     * time spent in refreshes
+     * <p>
+     * API name: {@code refresh.time}
+     */
+    @Nullable
+    public final String refreshTime() {
+        return this.refreshTime;
+    }
+
+    /**
+     * total external refreshes
+     * <p>
+     * API name: {@code refresh.external_total}
+     */
+    @Nullable
+    public final String refreshExternalTotal() {
+        return this.refreshExternalTotal;
+    }
+
+    /**
+     * time spent in external refreshes
+     * <p>
+     * API name: {@code refresh.external_time}
+     */
+    @Nullable
+    public final String refreshExternalTime() {
+        return this.refreshExternalTime;
+    }
+
+    /**
+     * number of pending refresh listeners
+     * <p>
+     * API name: {@code refresh.listeners}
+     */
+    @Nullable
+    public final String refreshListeners() {
+        return this.refreshListeners;
+    }
+
+    /**
+     * script compilations
+     * <p>
+     * API name: {@code script.compilations}
+     */
+    @Nullable
+    public final String scriptCompilations() {
+        return this.scriptCompilations;
+    }
+
+    /**
+     * script cache evictions
+     * <p>
+     * API name: {@code script.cache_evictions}
+     */
+    @Nullable
+    public final String scriptCacheEvictions() {
+        return this.scriptCacheEvictions;
+    }
+
+    /**
+     * script cache compilation limit triggered
+     * <p>
+     * API name: {@code script.compilation_limit_triggered}
+     */
+    @Nullable
+    public final String scriptCompilationLimitTriggered() {
+        return this.scriptCompilationLimitTriggered;
+    }
+
+    /**
+     * current fetch phase ops
+     * <p>
+     * API name: {@code search.fetch_current}
+     */
+    @Nullable
+    public final String searchFetchCurrent() {
+        return this.searchFetchCurrent;
+    }
+
+    /**
+     * time spent in fetch phase
+     * <p>
+     * API name: {@code search.fetch_time}
+     */
+    @Nullable
+    public final String searchFetchTime() {
+        return this.searchFetchTime;
+    }
+
+    /**
+     * total fetch ops
+     * <p>
+     * API name: {@code search.fetch_total}
+     */
+    @Nullable
+    public final String searchFetchTotal() {
+        return this.searchFetchTotal;
+    }
+
+    /**
+     * open search contexts
+     * <p>
+     * API name: {@code search.open_contexts}
+     */
+    @Nullable
+    public final String searchOpenContexts() {
+        return this.searchOpenContexts;
+    }
+
+    /**
+     * current query phase ops
+     * <p>
+     * API name: {@code search.query_current}
+     */
+    @Nullable
+    public final String searchQueryCurrent() {
+        return this.searchQueryCurrent;
+    }
+
+    /**
+     * time spent in query phase
+     * <p>
+     * API name: {@code search.query_time}
+     */
+    @Nullable
+    public final String searchQueryTime() {
+        return this.searchQueryTime;
+    }
+
+    /**
+     * total query phase ops
+     * <p>
+     * API name: {@code search.query_total}
+     */
+    @Nullable
+    public final String searchQueryTotal() {
+        return this.searchQueryTotal;
+    }
+
+    /**
+     * open scroll contexts
+     * <p>
+     * API name: {@code search.scroll_current}
+     */
+    @Nullable
+    public final String searchScrollCurrent() {
+        return this.searchScrollCurrent;
+    }
+
+    /**
+     * time scroll contexts held open
+     * <p>
+     * API name: {@code search.scroll_time}
+     */
+    @Nullable
+    public final String searchScrollTime() {
+        return this.searchScrollTime;
+    }
+
+    /**
+     * completed scroll contexts
+     * <p>
+     * API name: {@code search.scroll_total}
+     */
+    @Nullable
+    public final String searchScrollTotal() {
+        return this.searchScrollTotal;
+    }
+
+    /**
+     * number of segments
+     * <p>
+     * API name: {@code segments.count}
+     */
+    @Nullable
+    public final String segmentsCount() {
+        return this.segmentsCount;
+    }
+
+    /**
+     * memory used by segments
+     * <p>
+     * API name: {@code segments.memory}
+     */
+    @Nullable
+    public final String segmentsMemory() {
+        return this.segmentsMemory;
+    }
+
+    /**
+     * memory used by index writer
+     * <p>
+     * API name: {@code segments.index_writer_memory}
+     */
+    @Nullable
+    public final String segmentsIndexWriterMemory() {
+        return this.segmentsIndexWriterMemory;
+    }
+
+    /**
+     * memory used by version map
+     * <p>
+     * API name: {@code segments.version_map_memory}
+     */
+    @Nullable
+    public final String segmentsVersionMapMemory() {
+        return this.segmentsVersionMapMemory;
+    }
+
+    /**
+     * memory used by fixed bit sets for nested object field types and export type
+     * filters for types referred in _parent fields
+     * <p>
+     * API name: {@code segments.fixed_bitset_memory}
+     */
+    @Nullable
+    public final String segmentsFixedBitsetMemory() {
+        return this.segmentsFixedBitsetMemory;
+    }
+
+    /**
+     * number of current suggest ops
+     * <p>
+     * API name: {@code suggest.current}
+     */
+    @Nullable
+    public final String suggestCurrent() {
+        return this.suggestCurrent;
+    }
+
+    /**
+     * time spend in suggest
+     * <p>
+     * API name: {@code suggest.time}
+     */
+    @Nullable
+    public final String suggestTime() {
+        return this.suggestTime;
+    }
+
+    /**
+     * number of suggest ops
+     * <p>
+     * API name: {@code suggest.total}
+     */
+    @Nullable
+    public final String suggestTotal() {
+        return this.suggestTotal;
+    }
+
+    /**
+     * number of bulk shard ops
+     * <p>
+     * API name: {@code bulk.total_operations}
+     */
+    @Nullable
+    public final String bulkTotalOperations() {
+        return this.bulkTotalOperations;
+    }
+
+    /**
+     * time spend in shard bulk
+     * <p>
+     * API name: {@code bulk.total_time}
+     */
+    @Nullable
+    public final String bulkTotalTime() {
+        return this.bulkTotalTime;
+    }
+
+    /**
+     * total size in bytes of shard bulk
+     * <p>
+     * API name: {@code bulk.total_size_in_bytes}
+     */
+    @Nullable
+    public final String bulkTotalSizeInBytes() {
+        return this.bulkTotalSizeInBytes;
+    }
+
+    /**
+     * average time spend in shard bulk
+     * <p>
+     * API name: {@code bulk.avg_time}
+     */
+    @Nullable
+    public final String bulkAvgTime() {
+        return this.bulkAvgTime;
+    }
+
+    /**
+     * average size in bytes of shard bulk
+     * <p>
+     * API name: {@code bulk.avg_size_in_bytes}
+     */
+    @Nullable
+    public final String bulkAvgSizeInBytes() {
+        return this.bulkAvgSizeInBytes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.id != null) {
+            generator.writeKey("id");
+            generator.write(this.id);
+
+        }
+        if (this.pid != null) {
+            generator.writeKey("pid");
+            generator.write(this.pid);
+
+        }
+        if (this.ip != null) {
+            generator.writeKey("ip");
+            generator.write(this.ip);
+
+        }
+        if (this.port != null) {
+            generator.writeKey("port");
+            generator.write(this.port);
+
+        }
+        if (this.httpAddress != null) {
+            generator.writeKey("http_address");
+            generator.write(this.httpAddress);
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        if (this.flavor != null) {
+            generator.writeKey("flavor");
+            generator.write(this.flavor);
+
+        }
+        if (this.type != null) {
+            generator.writeKey("type");
+            generator.write(this.type);
+
+        }
+        if (this.build != null) {
+            generator.writeKey("build");
+            generator.write(this.build);
+
+        }
+        if (this.jdk != null) {
+            generator.writeKey("jdk");
+            generator.write(this.jdk);
+
+        }
+        if (this.diskTotal != null) {
+            generator.writeKey("disk.total");
+            generator.write(this.diskTotal);
+
+        }
+        if (this.diskUsed != null) {
+            generator.writeKey("disk.used");
+            generator.write(this.diskUsed);
+
+        }
+        if (this.diskAvail != null) {
+            generator.writeKey("disk.avail");
+            generator.write(this.diskAvail);
+
+        }
+        if (this.diskUsedPercent != null) {
+            generator.writeKey("disk.used_percent");
+            generator.write(this.diskUsedPercent);
+
+        }
+        if (this.heapCurrent != null) {
+            generator.writeKey("heap.current");
+            generator.write(this.heapCurrent);
+
+        }
+        if (this.heapPercent != null) {
+            generator.writeKey("heap.percent");
+            generator.write(this.heapPercent);
+
+        }
+        if (this.heapMax != null) {
+            generator.writeKey("heap.max");
+            generator.write(this.heapMax);
+
+        }
+        if (this.ramCurrent != null) {
+            generator.writeKey("ram.current");
+            generator.write(this.ramCurrent);
+
+        }
+        if (this.ramPercent != null) {
+            generator.writeKey("ram.percent");
+            generator.write(this.ramPercent);
+
+        }
+        if (this.ramMax != null) {
+            generator.writeKey("ram.max");
+            generator.write(this.ramMax);
+
+        }
+        if (this.fileDescCurrent != null) {
+            generator.writeKey("file_desc.current");
+            generator.write(this.fileDescCurrent);
+
+        }
+        if (this.fileDescPercent != null) {
+            generator.writeKey("file_desc.percent");
+            generator.write(this.fileDescPercent);
+
+        }
+        if (this.fileDescMax != null) {
+            generator.writeKey("file_desc.max");
+            generator.write(this.fileDescMax);
+
+        }
+        if (this.cpu != null) {
+            generator.writeKey("cpu");
+            generator.write(this.cpu);
+
+        }
+        if (this.load1m != null) {
+            generator.writeKey("load_1m");
+            generator.write(this.load1m);
+
+        }
+        if (this.load5m != null) {
+            generator.writeKey("load_5m");
+            generator.write(this.load5m);
+
+        }
+        if (this.load15m != null) {
+            generator.writeKey("load_15m");
+            generator.write(this.load15m);
+
+        }
+        if (this.uptime != null) {
+            generator.writeKey("uptime");
+            generator.write(this.uptime);
+
+        }
+        if (this.nodeRole != null) {
+            generator.writeKey("node.role");
+            generator.write(this.nodeRole);
+
+        }
+        if (this.master != null) {
+            generator.writeKey("master");
+            generator.write(this.master);
+
+        }
+        if (this.clusterManager != null) {
+            generator.writeKey("cluster_manager");
+            generator.write(this.clusterManager);
+
+        }
+        if (this.name != null) {
+            generator.writeKey("name");
+            generator.write(this.name);
+
+        }
+        if (this.completionSize != null) {
+            generator.writeKey("completion.size");
+            generator.write(this.completionSize);
+
+        }
+        if (this.fielddataMemorySize != null) {
+            generator.writeKey("fielddata.memory_size");
+            generator.write(this.fielddataMemorySize);
+
+        }
+        if (this.fielddataEvictions != null) {
+            generator.writeKey("fielddata.evictions");
+            generator.write(this.fielddataEvictions);
+
+        }
+        if (this.queryCacheMemorySize != null) {
+            generator.writeKey("query_cache.memory_size");
+            generator.write(this.queryCacheMemorySize);
+
+        }
+        if (this.queryCacheEvictions != null) {
+            generator.writeKey("query_cache.evictions");
+            generator.write(this.queryCacheEvictions);
+
+        }
+        if (this.queryCacheHitCount != null) {
+            generator.writeKey("query_cache.hit_count");
+            generator.write(this.queryCacheHitCount);
+
+        }
+        if (this.queryCacheMissCount != null) {
+            generator.writeKey("query_cache.miss_count");
+            generator.write(this.queryCacheMissCount);
+
+        }
+        if (this.requestCacheMemorySize != null) {
+            generator.writeKey("request_cache.memory_size");
+            generator.write(this.requestCacheMemorySize);
+
+        }
+        if (this.requestCacheEvictions != null) {
+            generator.writeKey("request_cache.evictions");
+            generator.write(this.requestCacheEvictions);
+
+        }
+        if (this.requestCacheHitCount != null) {
+            generator.writeKey("request_cache.hit_count");
+            generator.write(this.requestCacheHitCount);
+
+        }
+        if (this.requestCacheMissCount != null) {
+            generator.writeKey("request_cache.miss_count");
+            generator.write(this.requestCacheMissCount);
+
+        }
+        if (this.flushTotal != null) {
+            generator.writeKey("flush.total");
+            generator.write(this.flushTotal);
+
+        }
+        if (this.flushTotalTime != null) {
+            generator.writeKey("flush.total_time");
+            generator.write(this.flushTotalTime);
+
+        }
+        if (this.getCurrent != null) {
+            generator.writeKey("get.current");
+            generator.write(this.getCurrent);
+
+        }
+        if (this.getTime != null) {
+            generator.writeKey("get.time");
+            generator.write(this.getTime);
+
+        }
+        if (this.getTotal != null) {
+            generator.writeKey("get.total");
+            generator.write(this.getTotal);
+
+        }
+        if (this.getExistsTime != null) {
+            generator.writeKey("get.exists_time");
+            generator.write(this.getExistsTime);
+
+        }
+        if (this.getExistsTotal != null) {
+            generator.writeKey("get.exists_total");
+            generator.write(this.getExistsTotal);
+
+        }
+        if (this.getMissingTime != null) {
+            generator.writeKey("get.missing_time");
+            generator.write(this.getMissingTime);
+
+        }
+        if (this.getMissingTotal != null) {
+            generator.writeKey("get.missing_total");
+            generator.write(this.getMissingTotal);
+
+        }
+        if (this.indexingDeleteCurrent != null) {
+            generator.writeKey("indexing.delete_current");
+            generator.write(this.indexingDeleteCurrent);
+
+        }
+        if (this.indexingDeleteTime != null) {
+            generator.writeKey("indexing.delete_time");
+            generator.write(this.indexingDeleteTime);
+
+        }
+        if (this.indexingDeleteTotal != null) {
+            generator.writeKey("indexing.delete_total");
+            generator.write(this.indexingDeleteTotal);
+
+        }
+        if (this.indexingIndexCurrent != null) {
+            generator.writeKey("indexing.index_current");
+            generator.write(this.indexingIndexCurrent);
+
+        }
+        if (this.indexingIndexTime != null) {
+            generator.writeKey("indexing.index_time");
+            generator.write(this.indexingIndexTime);
+
+        }
+        if (this.indexingIndexTotal != null) {
+            generator.writeKey("indexing.index_total");
+            generator.write(this.indexingIndexTotal);
+
+        }
+        if (this.indexingIndexFailed != null) {
+            generator.writeKey("indexing.index_failed");
+            generator.write(this.indexingIndexFailed);
+
+        }
+        if (this.mergesCurrent != null) {
+            generator.writeKey("merges.current");
+            generator.write(this.mergesCurrent);
+
+        }
+        if (this.mergesCurrentDocs != null) {
+            generator.writeKey("merges.current_docs");
+            generator.write(this.mergesCurrentDocs);
+
+        }
+        if (this.mergesCurrentSize != null) {
+            generator.writeKey("merges.current_size");
+            generator.write(this.mergesCurrentSize);
+
+        }
+        if (this.mergesTotal != null) {
+            generator.writeKey("merges.total");
+            generator.write(this.mergesTotal);
+
+        }
+        if (this.mergesTotalDocs != null) {
+            generator.writeKey("merges.total_docs");
+            generator.write(this.mergesTotalDocs);
+
+        }
+        if (this.mergesTotalSize != null) {
+            generator.writeKey("merges.total_size");
+            generator.write(this.mergesTotalSize);
+
+        }
+        if (this.mergesTotalTime != null) {
+            generator.writeKey("merges.total_time");
+            generator.write(this.mergesTotalTime);
+
+        }
+        if (this.refreshTotal != null) {
+            generator.writeKey("refresh.total");
+            generator.write(this.refreshTotal);
+
+        }
+        if (this.refreshTime != null) {
+            generator.writeKey("refresh.time");
+            generator.write(this.refreshTime);
+
+        }
+        if (this.refreshExternalTotal != null) {
+            generator.writeKey("refresh.external_total");
+            generator.write(this.refreshExternalTotal);
+
+        }
+        if (this.refreshExternalTime != null) {
+            generator.writeKey("refresh.external_time");
+            generator.write(this.refreshExternalTime);
+
+        }
+        if (this.refreshListeners != null) {
+            generator.writeKey("refresh.listeners");
+            generator.write(this.refreshListeners);
+
+        }
+        if (this.scriptCompilations != null) {
+            generator.writeKey("script.compilations");
+            generator.write(this.scriptCompilations);
+
+        }
+        if (this.scriptCacheEvictions != null) {
+            generator.writeKey("script.cache_evictions");
+            generator.write(this.scriptCacheEvictions);
+
+        }
+        if (this.scriptCompilationLimitTriggered != null) {
+            generator.writeKey("script.compilation_limit_triggered");
+            generator.write(this.scriptCompilationLimitTriggered);
+
+        }
+        if (this.searchFetchCurrent != null) {
+            generator.writeKey("search.fetch_current");
+            generator.write(this.searchFetchCurrent);
+
+        }
+        if (this.searchFetchTime != null) {
+            generator.writeKey("search.fetch_time");
+            generator.write(this.searchFetchTime);
+
+        }
+        if (this.searchFetchTotal != null) {
+            generator.writeKey("search.fetch_total");
+            generator.write(this.searchFetchTotal);
+
+        }
+        if (this.searchOpenContexts != null) {
+            generator.writeKey("search.open_contexts");
+            generator.write(this.searchOpenContexts);
+
+        }
+        if (this.searchQueryCurrent != null) {
+            generator.writeKey("search.query_current");
+            generator.write(this.searchQueryCurrent);
+
+        }
+        if (this.searchQueryTime != null) {
+            generator.writeKey("search.query_time");
+            generator.write(this.searchQueryTime);
+
+        }
+        if (this.searchQueryTotal != null) {
+            generator.writeKey("search.query_total");
+            generator.write(this.searchQueryTotal);
+
+        }
+        if (this.searchScrollCurrent != null) {
+            generator.writeKey("search.scroll_current");
+            generator.write(this.searchScrollCurrent);
+
+        }
+        if (this.searchScrollTime != null) {
+            generator.writeKey("search.scroll_time");
+            generator.write(this.searchScrollTime);
+
+        }
+        if (this.searchScrollTotal != null) {
+            generator.writeKey("search.scroll_total");
+            generator.write(this.searchScrollTotal);
+
+        }
+        if (this.segmentsCount != null) {
+            generator.writeKey("segments.count");
+            generator.write(this.segmentsCount);
+
+        }
+        if (this.segmentsMemory != null) {
+            generator.writeKey("segments.memory");
+            generator.write(this.segmentsMemory);
+
+        }
+        if (this.segmentsIndexWriterMemory != null) {
+            generator.writeKey("segments.index_writer_memory");
+            generator.write(this.segmentsIndexWriterMemory);
+
+        }
+        if (this.segmentsVersionMapMemory != null) {
+            generator.writeKey("segments.version_map_memory");
+            generator.write(this.segmentsVersionMapMemory);
+
+        }
+        if (this.segmentsFixedBitsetMemory != null) {
+            generator.writeKey("segments.fixed_bitset_memory");
+            generator.write(this.segmentsFixedBitsetMemory);
+
+        }
+        if (this.suggestCurrent != null) {
+            generator.writeKey("suggest.current");
+            generator.write(this.suggestCurrent);
 
-		}
-		if (this.suggestTime != null) {
-			generator.writeKey("suggest.time");
-			generator.write(this.suggestTime);
+        }
+        if (this.suggestTime != null) {
+            generator.writeKey("suggest.time");
+            generator.write(this.suggestTime);
 
-		}
-		if (this.suggestTotal != null) {
-			generator.writeKey("suggest.total");
-			generator.write(this.suggestTotal);
+        }
+        if (this.suggestTotal != null) {
+            generator.writeKey("suggest.total");
+            generator.write(this.suggestTotal);
 
-		}
-		if (this.bulkTotalOperations != null) {
-			generator.writeKey("bulk.total_operations");
-			generator.write(this.bulkTotalOperations);
+        }
+        if (this.bulkTotalOperations != null) {
+            generator.writeKey("bulk.total_operations");
+            generator.write(this.bulkTotalOperations);
 
-		}
-		if (this.bulkTotalTime != null) {
-			generator.writeKey("bulk.total_time");
-			generator.write(this.bulkTotalTime);
+        }
+        if (this.bulkTotalTime != null) {
+            generator.writeKey("bulk.total_time");
+            generator.write(this.bulkTotalTime);
 
-		}
-		if (this.bulkTotalSizeInBytes != null) {
-			generator.writeKey("bulk.total_size_in_bytes");
-			generator.write(this.bulkTotalSizeInBytes);
+        }
+        if (this.bulkTotalSizeInBytes != null) {
+            generator.writeKey("bulk.total_size_in_bytes");
+            generator.write(this.bulkTotalSizeInBytes);
 
-		}
-		if (this.bulkAvgTime != null) {
-			generator.writeKey("bulk.avg_time");
-			generator.write(this.bulkAvgTime);
+        }
+        if (this.bulkAvgTime != null) {
+            generator.writeKey("bulk.avg_time");
+            generator.write(this.bulkAvgTime);
 
-		}
-		if (this.bulkAvgSizeInBytes != null) {
-			generator.writeKey("bulk.avg_size_in_bytes");
-			generator.write(this.bulkAvgSizeInBytes);
+        }
+        if (this.bulkAvgSizeInBytes != null) {
+            generator.writeKey("bulk.avg_size_in_bytes");
+            generator.write(this.bulkAvgSizeInBytes);
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link NodesRecord}.
-	 */
+    /**
+     * Builder for {@link NodesRecord}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodesRecord> {
-		@Nullable
-		private String id;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodesRecord> {
+        @Nullable
+        private String id;
 
-		@Nullable
-		private String pid;
+        @Nullable
+        private String pid;
 
-		@Nullable
-		private String ip;
+        @Nullable
+        private String ip;
 
-		@Nullable
-		private String port;
+        @Nullable
+        private String port;
 
-		@Nullable
-		private String httpAddress;
+        @Nullable
+        private String httpAddress;
 
-		@Nullable
-		private String version;
+        @Nullable
+        private String version;
 
-		@Nullable
-		private String flavor;
+        @Nullable
+        private String flavor;
 
-		@Nullable
-		private String type;
+        @Nullable
+        private String type;
 
-		@Nullable
-		private String build;
+        @Nullable
+        private String build;
 
-		@Nullable
-		private String jdk;
+        @Nullable
+        private String jdk;
 
-		@Nullable
-		private String diskTotal;
+        @Nullable
+        private String diskTotal;
 
-		@Nullable
-		private String diskUsed;
+        @Nullable
+        private String diskUsed;
 
-		@Nullable
-		private String diskAvail;
+        @Nullable
+        private String diskAvail;
 
-		@Nullable
-		private String diskUsedPercent;
+        @Nullable
+        private String diskUsedPercent;
 
-		@Nullable
-		private String heapCurrent;
+        @Nullable
+        private String heapCurrent;
 
-		@Nullable
-		private String heapPercent;
+        @Nullable
+        private String heapPercent;
 
-		@Nullable
-		private String heapMax;
+        @Nullable
+        private String heapMax;
 
-		@Nullable
-		private String ramCurrent;
+        @Nullable
+        private String ramCurrent;
 
-		@Nullable
-		private String ramPercent;
+        @Nullable
+        private String ramPercent;
 
-		@Nullable
-		private String ramMax;
+        @Nullable
+        private String ramMax;
 
-		@Nullable
-		private String fileDescCurrent;
+        @Nullable
+        private String fileDescCurrent;
 
-		@Nullable
-		private String fileDescPercent;
+        @Nullable
+        private String fileDescPercent;
 
-		@Nullable
-		private String fileDescMax;
+        @Nullable
+        private String fileDescMax;
 
-		@Nullable
-		private String cpu;
+        @Nullable
+        private String cpu;
 
-		@Nullable
-		private String load1m;
+        @Nullable
+        private String load1m;
 
-		@Nullable
-		private String load5m;
+        @Nullable
+        private String load5m;
 
-		@Nullable
-		private String load15m;
+        @Nullable
+        private String load15m;
 
-		@Nullable
-		private String uptime;
+        @Nullable
+        private String uptime;
 
-		@Nullable
-		private String nodeRole;
+        @Nullable
+        private String nodeRole;
 
-		@Deprecated
-		@Nullable
-		private String master;
+        @Deprecated
+        @Nullable
+        private String master;
 
-		@Nullable
-		private String clusterManager;
+        @Nullable
+        private String clusterManager;
 
-		@Nullable
-		private String name;
+        @Nullable
+        private String name;
 
-		@Nullable
-		private String completionSize;
+        @Nullable
+        private String completionSize;
 
-		@Nullable
-		private String fielddataMemorySize;
+        @Nullable
+        private String fielddataMemorySize;
 
-		@Nullable
-		private String fielddataEvictions;
+        @Nullable
+        private String fielddataEvictions;
 
-		@Nullable
-		private String queryCacheMemorySize;
+        @Nullable
+        private String queryCacheMemorySize;
 
-		@Nullable
-		private String queryCacheEvictions;
+        @Nullable
+        private String queryCacheEvictions;
 
-		@Nullable
-		private String queryCacheHitCount;
+        @Nullable
+        private String queryCacheHitCount;
 
-		@Nullable
-		private String queryCacheMissCount;
+        @Nullable
+        private String queryCacheMissCount;
 
-		@Nullable
-		private String requestCacheMemorySize;
+        @Nullable
+        private String requestCacheMemorySize;
 
-		@Nullable
-		private String requestCacheEvictions;
+        @Nullable
+        private String requestCacheEvictions;
 
-		@Nullable
-		private String requestCacheHitCount;
+        @Nullable
+        private String requestCacheHitCount;
 
-		@Nullable
-		private String requestCacheMissCount;
+        @Nullable
+        private String requestCacheMissCount;
 
-		@Nullable
-		private String flushTotal;
+        @Nullable
+        private String flushTotal;
 
-		@Nullable
-		private String flushTotalTime;
+        @Nullable
+        private String flushTotalTime;
 
-		@Nullable
-		private String getCurrent;
+        @Nullable
+        private String getCurrent;
 
-		@Nullable
-		private String getTime;
+        @Nullable
+        private String getTime;
 
-		@Nullable
-		private String getTotal;
+        @Nullable
+        private String getTotal;
 
-		@Nullable
-		private String getExistsTime;
+        @Nullable
+        private String getExistsTime;
 
-		@Nullable
-		private String getExistsTotal;
+        @Nullable
+        private String getExistsTotal;
 
-		@Nullable
-		private String getMissingTime;
+        @Nullable
+        private String getMissingTime;
 
-		@Nullable
-		private String getMissingTotal;
+        @Nullable
+        private String getMissingTotal;
 
-		@Nullable
-		private String indexingDeleteCurrent;
+        @Nullable
+        private String indexingDeleteCurrent;
 
-		@Nullable
-		private String indexingDeleteTime;
+        @Nullable
+        private String indexingDeleteTime;
 
-		@Nullable
-		private String indexingDeleteTotal;
+        @Nullable
+        private String indexingDeleteTotal;
 
-		@Nullable
-		private String indexingIndexCurrent;
+        @Nullable
+        private String indexingIndexCurrent;
 
-		@Nullable
-		private String indexingIndexTime;
+        @Nullable
+        private String indexingIndexTime;
 
-		@Nullable
-		private String indexingIndexTotal;
+        @Nullable
+        private String indexingIndexTotal;
 
-		@Nullable
-		private String indexingIndexFailed;
+        @Nullable
+        private String indexingIndexFailed;
 
-		@Nullable
-		private String mergesCurrent;
+        @Nullable
+        private String mergesCurrent;
 
-		@Nullable
-		private String mergesCurrentDocs;
+        @Nullable
+        private String mergesCurrentDocs;
 
-		@Nullable
-		private String mergesCurrentSize;
+        @Nullable
+        private String mergesCurrentSize;
 
-		@Nullable
-		private String mergesTotal;
+        @Nullable
+        private String mergesTotal;
 
-		@Nullable
-		private String mergesTotalDocs;
+        @Nullable
+        private String mergesTotalDocs;
 
-		@Nullable
-		private String mergesTotalSize;
+        @Nullable
+        private String mergesTotalSize;
 
-		@Nullable
-		private String mergesTotalTime;
+        @Nullable
+        private String mergesTotalTime;
 
-		@Nullable
-		private String refreshTotal;
+        @Nullable
+        private String refreshTotal;
 
-		@Nullable
-		private String refreshTime;
+        @Nullable
+        private String refreshTime;
 
-		@Nullable
-		private String refreshExternalTotal;
+        @Nullable
+        private String refreshExternalTotal;
 
-		@Nullable
-		private String refreshExternalTime;
+        @Nullable
+        private String refreshExternalTime;
 
-		@Nullable
-		private String refreshListeners;
+        @Nullable
+        private String refreshListeners;
 
-		@Nullable
-		private String scriptCompilations;
+        @Nullable
+        private String scriptCompilations;
 
-		@Nullable
-		private String scriptCacheEvictions;
+        @Nullable
+        private String scriptCacheEvictions;
 
-		@Nullable
-		private String scriptCompilationLimitTriggered;
+        @Nullable
+        private String scriptCompilationLimitTriggered;
 
-		@Nullable
-		private String searchFetchCurrent;
+        @Nullable
+        private String searchFetchCurrent;
 
-		@Nullable
-		private String searchFetchTime;
+        @Nullable
+        private String searchFetchTime;
 
-		@Nullable
-		private String searchFetchTotal;
+        @Nullable
+        private String searchFetchTotal;
 
-		@Nullable
-		private String searchOpenContexts;
+        @Nullable
+        private String searchOpenContexts;
 
-		@Nullable
-		private String searchQueryCurrent;
+        @Nullable
+        private String searchQueryCurrent;
 
-		@Nullable
-		private String searchQueryTime;
+        @Nullable
+        private String searchQueryTime;
 
-		@Nullable
-		private String searchQueryTotal;
+        @Nullable
+        private String searchQueryTotal;
 
-		@Nullable
-		private String searchScrollCurrent;
+        @Nullable
+        private String searchScrollCurrent;
 
-		@Nullable
-		private String searchScrollTime;
+        @Nullable
+        private String searchScrollTime;
 
-		@Nullable
-		private String searchScrollTotal;
+        @Nullable
+        private String searchScrollTotal;
 
-		@Nullable
-		private String segmentsCount;
+        @Nullable
+        private String segmentsCount;
 
-		@Nullable
-		private String segmentsMemory;
+        @Nullable
+        private String segmentsMemory;
 
-		@Nullable
-		private String segmentsIndexWriterMemory;
+        @Nullable
+        private String segmentsIndexWriterMemory;
 
-		@Nullable
-		private String segmentsVersionMapMemory;
+        @Nullable
+        private String segmentsVersionMapMemory;
 
-		@Nullable
-		private String segmentsFixedBitsetMemory;
-
-		@Nullable
-		private String suggestCurrent;
-
-		@Nullable
-		private String suggestTime;
-
-		@Nullable
-		private String suggestTotal;
-
-		@Nullable
-		private String bulkTotalOperations;
-
-		@Nullable
-		private String bulkTotalTime;
-
-		@Nullable
-		private String bulkTotalSizeInBytes;
-
-		@Nullable
-		private String bulkAvgTime;
-
-		@Nullable
-		private String bulkAvgSizeInBytes;
-
-		/**
-		 * unique node id
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * process id
-		 * <p>
-		 * API name: {@code pid}
-		 */
-		public final Builder pid(@Nullable String value) {
-			this.pid = value;
-			return this;
-		}
-
-		/**
-		 * ip address
-		 * <p>
-		 * API name: {@code ip}
-		 */
-		public final Builder ip(@Nullable String value) {
-			this.ip = value;
-			return this;
-		}
-
-		/**
-		 * bound transport port
-		 * <p>
-		 * API name: {@code port}
-		 */
-		public final Builder port(@Nullable String value) {
-			this.port = value;
-			return this;
-		}
-
-		/**
-		 * bound http address
-		 * <p>
-		 * API name: {@code http_address}
-		 */
-		public final Builder httpAddress(@Nullable String value) {
-			this.httpAddress = value;
-			return this;
-		}
-
-		/**
-		 * es version
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * es distribution flavor
-		 * <p>
-		 * API name: {@code flavor}
-		 */
-		public final Builder flavor(@Nullable String value) {
-			this.flavor = value;
-			return this;
-		}
-
-		/**
-		 * es distribution type
-		 * <p>
-		 * API name: {@code type}
-		 */
-		public final Builder type(@Nullable String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * es build hash
-		 * <p>
-		 * API name: {@code build}
-		 */
-		public final Builder build(@Nullable String value) {
-			this.build = value;
-			return this;
-		}
-
-		/**
-		 * jdk version
-		 * <p>
-		 * API name: {@code jdk}
-		 */
-		public final Builder jdk(@Nullable String value) {
-			this.jdk = value;
-			return this;
-		}
-
-		/**
-		 * total disk space
-		 * <p>
-		 * API name: {@code disk.total}
-		 */
-		public final Builder diskTotal(@Nullable String value) {
-			this.diskTotal = value;
-			return this;
-		}
-
-		/**
-		 * used disk space
-		 * <p>
-		 * API name: {@code disk.used}
-		 */
-		public final Builder diskUsed(@Nullable String value) {
-			this.diskUsed = value;
-			return this;
-		}
-
-		/**
-		 * available disk space
-		 * <p>
-		 * API name: {@code disk.avail}
-		 */
-		public final Builder diskAvail(@Nullable String value) {
-			this.diskAvail = value;
-			return this;
-		}
-
-		/**
-		 * used disk space percentage
-		 * <p>
-		 * API name: {@code disk.used_percent}
-		 */
-		public final Builder diskUsedPercent(@Nullable String value) {
-			this.diskUsedPercent = value;
-			return this;
-		}
-
-		/**
-		 * used heap
-		 * <p>
-		 * API name: {@code heap.current}
-		 */
-		public final Builder heapCurrent(@Nullable String value) {
-			this.heapCurrent = value;
-			return this;
-		}
-
-		/**
-		 * used heap ratio
-		 * <p>
-		 * API name: {@code heap.percent}
-		 */
-		public final Builder heapPercent(@Nullable String value) {
-			this.heapPercent = value;
-			return this;
-		}
-
-		/**
-		 * max configured heap
-		 * <p>
-		 * API name: {@code heap.max}
-		 */
-		public final Builder heapMax(@Nullable String value) {
-			this.heapMax = value;
-			return this;
-		}
-
-		/**
-		 * used machine memory
-		 * <p>
-		 * API name: {@code ram.current}
-		 */
-		public final Builder ramCurrent(@Nullable String value) {
-			this.ramCurrent = value;
-			return this;
-		}
-
-		/**
-		 * used machine memory ratio
-		 * <p>
-		 * API name: {@code ram.percent}
-		 */
-		public final Builder ramPercent(@Nullable String value) {
-			this.ramPercent = value;
-			return this;
-		}
-
-		/**
-		 * total machine memory
-		 * <p>
-		 * API name: {@code ram.max}
-		 */
-		public final Builder ramMax(@Nullable String value) {
-			this.ramMax = value;
-			return this;
-		}
-
-		/**
-		 * used file descriptors
-		 * <p>
-		 * API name: {@code file_desc.current}
-		 */
-		public final Builder fileDescCurrent(@Nullable String value) {
-			this.fileDescCurrent = value;
-			return this;
-		}
-
-		/**
-		 * used file descriptor ratio
-		 * <p>
-		 * API name: {@code file_desc.percent}
-		 */
-		public final Builder fileDescPercent(@Nullable String value) {
-			this.fileDescPercent = value;
-			return this;
-		}
-
-		/**
-		 * max file descriptors
-		 * <p>
-		 * API name: {@code file_desc.max}
-		 */
-		public final Builder fileDescMax(@Nullable String value) {
-			this.fileDescMax = value;
-			return this;
-		}
-
-		/**
-		 * recent cpu usage
-		 * <p>
-		 * API name: {@code cpu}
-		 */
-		public final Builder cpu(@Nullable String value) {
-			this.cpu = value;
-			return this;
-		}
-
-		/**
-		 * 1m load avg
-		 * <p>
-		 * API name: {@code load_1m}
-		 */
-		public final Builder load1m(@Nullable String value) {
-			this.load1m = value;
-			return this;
-		}
-
-		/**
-		 * 5m load avg
-		 * <p>
-		 * API name: {@code load_5m}
-		 */
-		public final Builder load5m(@Nullable String value) {
-			this.load5m = value;
-			return this;
-		}
-
-		/**
-		 * 15m load avg
-		 * <p>
-		 * API name: {@code load_15m}
-		 */
-		public final Builder load15m(@Nullable String value) {
-			this.load15m = value;
-			return this;
-		}
-
-		/**
-		 * node uptime
-		 * <p>
-		 * API name: {@code uptime}
-		 */
-		public final Builder uptime(@Nullable String value) {
-			this.uptime = value;
-			return this;
-		}
-
-		/**
-		 * m:cluster-manager eligible node, d:data node, i:ingest node, -:coordinating node only
-		 * <p>
-		 * API name: {@code node.role}
-		 */
-		public final Builder nodeRole(@Nullable String value) {
-			this.nodeRole = value;
-			return this;
-		}
-
-		/**
-		 * *:current master
-		 * <p>
-		 * API name: {@code master}
-		 */
-		@Deprecated
-		public final Builder master(@Nullable String value) {
-			this.master = value;
-			return this;
-		}
-
-		/**
-		 * *:current cluster-manager
-		 * <p>
-		 * API name: {@code clusterManager}
-		 */
-		public final Builder clusterManager(@Nullable String value) {
-			this.clusterManager = value;
-			return this;
-		}
-
-		/**
-		 * node name
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(@Nullable String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * size of completion
-		 * <p>
-		 * API name: {@code completion.size}
-		 */
-		public final Builder completionSize(@Nullable String value) {
-			this.completionSize = value;
-			return this;
-		}
-
-		/**
-		 * used fielddata cache
-		 * <p>
-		 * API name: {@code fielddata.memory_size}
-		 */
-		public final Builder fielddataMemorySize(@Nullable String value) {
-			this.fielddataMemorySize = value;
-			return this;
-		}
-
-		/**
-		 * fielddata evictions
-		 * <p>
-		 * API name: {@code fielddata.evictions}
-		 */
-		public final Builder fielddataEvictions(@Nullable String value) {
-			this.fielddataEvictions = value;
-			return this;
-		}
-
-		/**
-		 * used query cache
-		 * <p>
-		 * API name: {@code query_cache.memory_size}
-		 */
-		public final Builder queryCacheMemorySize(@Nullable String value) {
-			this.queryCacheMemorySize = value;
-			return this;
-		}
-
-		/**
-		 * query cache evictions
-		 * <p>
-		 * API name: {@code query_cache.evictions}
-		 */
-		public final Builder queryCacheEvictions(@Nullable String value) {
-			this.queryCacheEvictions = value;
-			return this;
-		}
-
-		/**
-		 * query cache hit counts
-		 * <p>
-		 * API name: {@code query_cache.hit_count}
-		 */
-		public final Builder queryCacheHitCount(@Nullable String value) {
-			this.queryCacheHitCount = value;
-			return this;
-		}
-
-		/**
-		 * query cache miss counts
-		 * <p>
-		 * API name: {@code query_cache.miss_count}
-		 */
-		public final Builder queryCacheMissCount(@Nullable String value) {
-			this.queryCacheMissCount = value;
-			return this;
-		}
-
-		/**
-		 * used request cache
-		 * <p>
-		 * API name: {@code request_cache.memory_size}
-		 */
-		public final Builder requestCacheMemorySize(@Nullable String value) {
-			this.requestCacheMemorySize = value;
-			return this;
-		}
-
-		/**
-		 * request cache evictions
-		 * <p>
-		 * API name: {@code request_cache.evictions}
-		 */
-		public final Builder requestCacheEvictions(@Nullable String value) {
-			this.requestCacheEvictions = value;
-			return this;
-		}
-
-		/**
-		 * request cache hit counts
-		 * <p>
-		 * API name: {@code request_cache.hit_count}
-		 */
-		public final Builder requestCacheHitCount(@Nullable String value) {
-			this.requestCacheHitCount = value;
-			return this;
-		}
-
-		/**
-		 * request cache miss counts
-		 * <p>
-		 * API name: {@code request_cache.miss_count}
-		 */
-		public final Builder requestCacheMissCount(@Nullable String value) {
-			this.requestCacheMissCount = value;
-			return this;
-		}
-
-		/**
-		 * number of flushes
-		 * <p>
-		 * API name: {@code flush.total}
-		 */
-		public final Builder flushTotal(@Nullable String value) {
-			this.flushTotal = value;
-			return this;
-		}
-
-		/**
-		 * time spent in flush
-		 * <p>
-		 * API name: {@code flush.total_time}
-		 */
-		public final Builder flushTotalTime(@Nullable String value) {
-			this.flushTotalTime = value;
-			return this;
-		}
-
-		/**
-		 * number of current get ops
-		 * <p>
-		 * API name: {@code get.current}
-		 */
-		public final Builder getCurrent(@Nullable String value) {
-			this.getCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time spent in get
-		 * <p>
-		 * API name: {@code get.time}
-		 */
-		public final Builder getTime(@Nullable String value) {
-			this.getTime = value;
-			return this;
-		}
-
-		/**
-		 * number of get ops
-		 * <p>
-		 * API name: {@code get.total}
-		 */
-		public final Builder getTotal(@Nullable String value) {
-			this.getTotal = value;
-			return this;
-		}
-
-		/**
-		 * time spent in successful gets
-		 * <p>
-		 * API name: {@code get.exists_time}
-		 */
-		public final Builder getExistsTime(@Nullable String value) {
-			this.getExistsTime = value;
-			return this;
-		}
-
-		/**
-		 * number of successful gets
-		 * <p>
-		 * API name: {@code get.exists_total}
-		 */
-		public final Builder getExistsTotal(@Nullable String value) {
-			this.getExistsTotal = value;
-			return this;
-		}
-
-		/**
-		 * time spent in failed gets
-		 * <p>
-		 * API name: {@code get.missing_time}
-		 */
-		public final Builder getMissingTime(@Nullable String value) {
-			this.getMissingTime = value;
-			return this;
-		}
-
-		/**
-		 * number of failed gets
-		 * <p>
-		 * API name: {@code get.missing_total}
-		 */
-		public final Builder getMissingTotal(@Nullable String value) {
-			this.getMissingTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of current deletions
-		 * <p>
-		 * API name: {@code indexing.delete_current}
-		 */
-		public final Builder indexingDeleteCurrent(@Nullable String value) {
-			this.indexingDeleteCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time spent in deletions
-		 * <p>
-		 * API name: {@code indexing.delete_time}
-		 */
-		public final Builder indexingDeleteTime(@Nullable String value) {
-			this.indexingDeleteTime = value;
-			return this;
-		}
-
-		/**
-		 * number of delete ops
-		 * <p>
-		 * API name: {@code indexing.delete_total}
-		 */
-		public final Builder indexingDeleteTotal(@Nullable String value) {
-			this.indexingDeleteTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of current indexing ops
-		 * <p>
-		 * API name: {@code indexing.index_current}
-		 */
-		public final Builder indexingIndexCurrent(@Nullable String value) {
-			this.indexingIndexCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time spent in indexing
-		 * <p>
-		 * API name: {@code indexing.index_time}
-		 */
-		public final Builder indexingIndexTime(@Nullable String value) {
-			this.indexingIndexTime = value;
-			return this;
-		}
-
-		/**
-		 * number of indexing ops
-		 * <p>
-		 * API name: {@code indexing.index_total}
-		 */
-		public final Builder indexingIndexTotal(@Nullable String value) {
-			this.indexingIndexTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of failed indexing ops
-		 * <p>
-		 * API name: {@code indexing.index_failed}
-		 */
-		public final Builder indexingIndexFailed(@Nullable String value) {
-			this.indexingIndexFailed = value;
-			return this;
-		}
-
-		/**
-		 * number of current merges
-		 * <p>
-		 * API name: {@code merges.current}
-		 */
-		public final Builder mergesCurrent(@Nullable String value) {
-			this.mergesCurrent = value;
-			return this;
-		}
-
-		/**
-		 * number of current merging docs
-		 * <p>
-		 * API name: {@code merges.current_docs}
-		 */
-		public final Builder mergesCurrentDocs(@Nullable String value) {
-			this.mergesCurrentDocs = value;
-			return this;
-		}
-
-		/**
-		 * size of current merges
-		 * <p>
-		 * API name: {@code merges.current_size}
-		 */
-		public final Builder mergesCurrentSize(@Nullable String value) {
-			this.mergesCurrentSize = value;
-			return this;
-		}
-
-		/**
-		 * number of completed merge ops
-		 * <p>
-		 * API name: {@code merges.total}
-		 */
-		public final Builder mergesTotal(@Nullable String value) {
-			this.mergesTotal = value;
-			return this;
-		}
-
-		/**
-		 * docs merged
-		 * <p>
-		 * API name: {@code merges.total_docs}
-		 */
-		public final Builder mergesTotalDocs(@Nullable String value) {
-			this.mergesTotalDocs = value;
-			return this;
-		}
-
-		/**
-		 * size merged
-		 * <p>
-		 * API name: {@code merges.total_size}
-		 */
-		public final Builder mergesTotalSize(@Nullable String value) {
-			this.mergesTotalSize = value;
-			return this;
-		}
-
-		/**
-		 * time spent in merges
-		 * <p>
-		 * API name: {@code merges.total_time}
-		 */
-		public final Builder mergesTotalTime(@Nullable String value) {
-			this.mergesTotalTime = value;
-			return this;
-		}
-
-		/**
-		 * total refreshes
-		 * <p>
-		 * API name: {@code refresh.total}
-		 */
-		public final Builder refreshTotal(@Nullable String value) {
-			this.refreshTotal = value;
-			return this;
-		}
-
-		/**
-		 * time spent in refreshes
-		 * <p>
-		 * API name: {@code refresh.time}
-		 */
-		public final Builder refreshTime(@Nullable String value) {
-			this.refreshTime = value;
-			return this;
-		}
-
-		/**
-		 * total external refreshes
-		 * <p>
-		 * API name: {@code refresh.external_total}
-		 */
-		public final Builder refreshExternalTotal(@Nullable String value) {
-			this.refreshExternalTotal = value;
-			return this;
-		}
-
-		/**
-		 * time spent in external refreshes
-		 * <p>
-		 * API name: {@code refresh.external_time}
-		 */
-		public final Builder refreshExternalTime(@Nullable String value) {
-			this.refreshExternalTime = value;
-			return this;
-		}
-
-		/**
-		 * number of pending refresh listeners
-		 * <p>
-		 * API name: {@code refresh.listeners}
-		 */
-		public final Builder refreshListeners(@Nullable String value) {
-			this.refreshListeners = value;
-			return this;
-		}
-
-		/**
-		 * script compilations
-		 * <p>
-		 * API name: {@code script.compilations}
-		 */
-		public final Builder scriptCompilations(@Nullable String value) {
-			this.scriptCompilations = value;
-			return this;
-		}
-
-		/**
-		 * script cache evictions
-		 * <p>
-		 * API name: {@code script.cache_evictions}
-		 */
-		public final Builder scriptCacheEvictions(@Nullable String value) {
-			this.scriptCacheEvictions = value;
-			return this;
-		}
-
-		/**
-		 * script cache compilation limit triggered
-		 * <p>
-		 * API name: {@code script.compilation_limit_triggered}
-		 */
-		public final Builder scriptCompilationLimitTriggered(@Nullable String value) {
-			this.scriptCompilationLimitTriggered = value;
-			return this;
-		}
-
-		/**
-		 * current fetch phase ops
-		 * <p>
-		 * API name: {@code search.fetch_current}
-		 */
-		public final Builder searchFetchCurrent(@Nullable String value) {
-			this.searchFetchCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time spent in fetch phase
-		 * <p>
-		 * API name: {@code search.fetch_time}
-		 */
-		public final Builder searchFetchTime(@Nullable String value) {
-			this.searchFetchTime = value;
-			return this;
-		}
-
-		/**
-		 * total fetch ops
-		 * <p>
-		 * API name: {@code search.fetch_total}
-		 */
-		public final Builder searchFetchTotal(@Nullable String value) {
-			this.searchFetchTotal = value;
-			return this;
-		}
-
-		/**
-		 * open search contexts
-		 * <p>
-		 * API name: {@code search.open_contexts}
-		 */
-		public final Builder searchOpenContexts(@Nullable String value) {
-			this.searchOpenContexts = value;
-			return this;
-		}
-
-		/**
-		 * current query phase ops
-		 * <p>
-		 * API name: {@code search.query_current}
-		 */
-		public final Builder searchQueryCurrent(@Nullable String value) {
-			this.searchQueryCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time spent in query phase
-		 * <p>
-		 * API name: {@code search.query_time}
-		 */
-		public final Builder searchQueryTime(@Nullable String value) {
-			this.searchQueryTime = value;
-			return this;
-		}
-
-		/**
-		 * total query phase ops
-		 * <p>
-		 * API name: {@code search.query_total}
-		 */
-		public final Builder searchQueryTotal(@Nullable String value) {
-			this.searchQueryTotal = value;
-			return this;
-		}
-
-		/**
-		 * open scroll contexts
-		 * <p>
-		 * API name: {@code search.scroll_current}
-		 */
-		public final Builder searchScrollCurrent(@Nullable String value) {
-			this.searchScrollCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time scroll contexts held open
-		 * <p>
-		 * API name: {@code search.scroll_time}
-		 */
-		public final Builder searchScrollTime(@Nullable String value) {
-			this.searchScrollTime = value;
-			return this;
-		}
-
-		/**
-		 * completed scroll contexts
-		 * <p>
-		 * API name: {@code search.scroll_total}
-		 */
-		public final Builder searchScrollTotal(@Nullable String value) {
-			this.searchScrollTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of segments
-		 * <p>
-		 * API name: {@code segments.count}
-		 */
-		public final Builder segmentsCount(@Nullable String value) {
-			this.segmentsCount = value;
-			return this;
-		}
-
-		/**
-		 * memory used by segments
-		 * <p>
-		 * API name: {@code segments.memory}
-		 */
-		public final Builder segmentsMemory(@Nullable String value) {
-			this.segmentsMemory = value;
-			return this;
-		}
-
-		/**
-		 * memory used by index writer
-		 * <p>
-		 * API name: {@code segments.index_writer_memory}
-		 */
-		public final Builder segmentsIndexWriterMemory(@Nullable String value) {
-			this.segmentsIndexWriterMemory = value;
-			return this;
-		}
-
-		/**
-		 * memory used by version map
-		 * <p>
-		 * API name: {@code segments.version_map_memory}
-		 */
-		public final Builder segmentsVersionMapMemory(@Nullable String value) {
-			this.segmentsVersionMapMemory = value;
-			return this;
-		}
-
-		/**
-		 * memory used by fixed bit sets for nested object field types and export type
-		 * filters for types referred in _parent fields
-		 * <p>
-		 * API name: {@code segments.fixed_bitset_memory}
-		 */
-		public final Builder segmentsFixedBitsetMemory(@Nullable String value) {
-			this.segmentsFixedBitsetMemory = value;
-			return this;
-		}
-
-		/**
-		 * number of current suggest ops
-		 * <p>
-		 * API name: {@code suggest.current}
-		 */
-		public final Builder suggestCurrent(@Nullable String value) {
-			this.suggestCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time spend in suggest
-		 * <p>
-		 * API name: {@code suggest.time}
-		 */
-		public final Builder suggestTime(@Nullable String value) {
-			this.suggestTime = value;
-			return this;
-		}
-
-		/**
-		 * number of suggest ops
-		 * <p>
-		 * API name: {@code suggest.total}
-		 */
-		public final Builder suggestTotal(@Nullable String value) {
-			this.suggestTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of bulk shard ops
-		 * <p>
-		 * API name: {@code bulk.total_operations}
-		 */
-		public final Builder bulkTotalOperations(@Nullable String value) {
-			this.bulkTotalOperations = value;
-			return this;
-		}
-
-		/**
-		 * time spend in shard bulk
-		 * <p>
-		 * API name: {@code bulk.total_time}
-		 */
-		public final Builder bulkTotalTime(@Nullable String value) {
-			this.bulkTotalTime = value;
-			return this;
-		}
-
-		/**
-		 * total size in bytes of shard bulk
-		 * <p>
-		 * API name: {@code bulk.total_size_in_bytes}
-		 */
-		public final Builder bulkTotalSizeInBytes(@Nullable String value) {
-			this.bulkTotalSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * average time spend in shard bulk
-		 * <p>
-		 * API name: {@code bulk.avg_time}
-		 */
-		public final Builder bulkAvgTime(@Nullable String value) {
-			this.bulkAvgTime = value;
-			return this;
-		}
-
-		/**
-		 * average size in bytes of shard bulk
-		 * <p>
-		 * API name: {@code bulk.avg_size_in_bytes}
-		 */
-		public final Builder bulkAvgSizeInBytes(@Nullable String value) {
-			this.bulkAvgSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodesRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodesRecord build() {
-			_checkSingleUse();
-
-			return new NodesRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodesRecord}
-	 */
-	public static final JsonpDeserializer<NodesRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodesRecord::setupNodesRecordDeserializer);
-
-	protected static void setupNodesRecordDeserializer(ObjectDeserializer<NodesRecord.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id", "nodeId");
-		op.add(Builder::pid, JsonpDeserializer.stringDeserializer(), "pid", "p");
-		op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip", "i");
-		op.add(Builder::port, JsonpDeserializer.stringDeserializer(), "port", "po");
-		op.add(Builder::httpAddress, JsonpDeserializer.stringDeserializer(), "http_address", "http");
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version", "v");
-		op.add(Builder::flavor, JsonpDeserializer.stringDeserializer(), "flavor", "f");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type", "t");
-		op.add(Builder::build, JsonpDeserializer.stringDeserializer(), "build", "b");
-		op.add(Builder::jdk, JsonpDeserializer.stringDeserializer(), "jdk", "j");
-		op.add(Builder::diskTotal, JsonpDeserializer.stringDeserializer(), "disk.total", "dt", "diskTotal");
-		op.add(Builder::diskUsed, JsonpDeserializer.stringDeserializer(), "disk.used", "du", "diskUsed");
-		op.add(Builder::diskAvail, JsonpDeserializer.stringDeserializer(), "disk.avail", "d", "da", "disk",
-				"diskAvail");
-		op.add(Builder::diskUsedPercent, JsonpDeserializer.stringDeserializer(), "disk.used_percent", "dup",
-				"diskUsedPercent");
-		op.add(Builder::heapCurrent, JsonpDeserializer.stringDeserializer(), "heap.current", "hc", "heapCurrent");
-		op.add(Builder::heapPercent, JsonpDeserializer.stringDeserializer(), "heap.percent", "hp", "heapPercent");
-		op.add(Builder::heapMax, JsonpDeserializer.stringDeserializer(), "heap.max", "hm", "heapMax");
-		op.add(Builder::ramCurrent, JsonpDeserializer.stringDeserializer(), "ram.current", "rc", "ramCurrent");
-		op.add(Builder::ramPercent, JsonpDeserializer.stringDeserializer(), "ram.percent", "rp", "ramPercent");
-		op.add(Builder::ramMax, JsonpDeserializer.stringDeserializer(), "ram.max", "rn", "ramMax");
-		op.add(Builder::fileDescCurrent, JsonpDeserializer.stringDeserializer(), "file_desc.current", "fdc",
-				"fileDescriptorCurrent");
-		op.add(Builder::fileDescPercent, JsonpDeserializer.stringDeserializer(), "file_desc.percent", "fdp",
-				"fileDescriptorPercent");
-		op.add(Builder::fileDescMax, JsonpDeserializer.stringDeserializer(), "file_desc.max", "fdm",
-				"fileDescriptorMax");
-		op.add(Builder::cpu, JsonpDeserializer.stringDeserializer(), "cpu");
-		op.add(Builder::load1m, JsonpDeserializer.stringDeserializer(), "load_1m");
-		op.add(Builder::load5m, JsonpDeserializer.stringDeserializer(), "load_5m");
-		op.add(Builder::load15m, JsonpDeserializer.stringDeserializer(), "load_15m", "l");
-		op.add(Builder::uptime, JsonpDeserializer.stringDeserializer(), "uptime", "u");
-		op.add(Builder::nodeRole, JsonpDeserializer.stringDeserializer(), "node.role", "r", "role", "nodeRole");
-		op.add(Builder::master, JsonpDeserializer.stringDeserializer(), "master", "m");
-		op.add(Builder::clusterManager, JsonpDeserializer.stringDeserializer(), "cluster_manager", "m");
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name", "n");
-		op.add(Builder::completionSize, JsonpDeserializer.stringDeserializer(), "completion.size", "cs",
-				"completionSize");
-		op.add(Builder::fielddataMemorySize, JsonpDeserializer.stringDeserializer(), "fielddata.memory_size", "fm",
-				"fielddataMemory");
-		op.add(Builder::fielddataEvictions, JsonpDeserializer.stringDeserializer(), "fielddata.evictions", "fe",
-				"fielddataEvictions");
-		op.add(Builder::queryCacheMemorySize, JsonpDeserializer.stringDeserializer(), "query_cache.memory_size", "qcm",
-				"queryCacheMemory");
-		op.add(Builder::queryCacheEvictions, JsonpDeserializer.stringDeserializer(), "query_cache.evictions", "qce",
-				"queryCacheEvictions");
-		op.add(Builder::queryCacheHitCount, JsonpDeserializer.stringDeserializer(), "query_cache.hit_count", "qchc",
-				"queryCacheHitCount");
-		op.add(Builder::queryCacheMissCount, JsonpDeserializer.stringDeserializer(), "query_cache.miss_count", "qcmc",
-				"queryCacheMissCount");
-		op.add(Builder::requestCacheMemorySize, JsonpDeserializer.stringDeserializer(), "request_cache.memory_size",
-				"rcm", "requestCacheMemory");
-		op.add(Builder::requestCacheEvictions, JsonpDeserializer.stringDeserializer(), "request_cache.evictions", "rce",
-				"requestCacheEvictions");
-		op.add(Builder::requestCacheHitCount, JsonpDeserializer.stringDeserializer(), "request_cache.hit_count", "rchc",
-				"requestCacheHitCount");
-		op.add(Builder::requestCacheMissCount, JsonpDeserializer.stringDeserializer(), "request_cache.miss_count",
-				"rcmc", "requestCacheMissCount");
-		op.add(Builder::flushTotal, JsonpDeserializer.stringDeserializer(), "flush.total", "ft", "flushTotal");
-		op.add(Builder::flushTotalTime, JsonpDeserializer.stringDeserializer(), "flush.total_time", "ftt",
-				"flushTotalTime");
-		op.add(Builder::getCurrent, JsonpDeserializer.stringDeserializer(), "get.current", "gc", "getCurrent");
-		op.add(Builder::getTime, JsonpDeserializer.stringDeserializer(), "get.time", "gti", "getTime");
-		op.add(Builder::getTotal, JsonpDeserializer.stringDeserializer(), "get.total", "gto", "getTotal");
-		op.add(Builder::getExistsTime, JsonpDeserializer.stringDeserializer(), "get.exists_time", "geti",
-				"getExistsTime");
-		op.add(Builder::getExistsTotal, JsonpDeserializer.stringDeserializer(), "get.exists_total", "geto",
-				"getExistsTotal");
-		op.add(Builder::getMissingTime, JsonpDeserializer.stringDeserializer(), "get.missing_time", "gmti",
-				"getMissingTime");
-		op.add(Builder::getMissingTotal, JsonpDeserializer.stringDeserializer(), "get.missing_total", "gmto",
-				"getMissingTotal");
-		op.add(Builder::indexingDeleteCurrent, JsonpDeserializer.stringDeserializer(), "indexing.delete_current", "idc",
-				"indexingDeleteCurrent");
-		op.add(Builder::indexingDeleteTime, JsonpDeserializer.stringDeserializer(), "indexing.delete_time", "idti",
-				"indexingDeleteTime");
-		op.add(Builder::indexingDeleteTotal, JsonpDeserializer.stringDeserializer(), "indexing.delete_total", "idto",
-				"indexingDeleteTotal");
-		op.add(Builder::indexingIndexCurrent, JsonpDeserializer.stringDeserializer(), "indexing.index_current", "iic",
-				"indexingIndexCurrent");
-		op.add(Builder::indexingIndexTime, JsonpDeserializer.stringDeserializer(), "indexing.index_time", "iiti",
-				"indexingIndexTime");
-		op.add(Builder::indexingIndexTotal, JsonpDeserializer.stringDeserializer(), "indexing.index_total", "iito",
-				"indexingIndexTotal");
-		op.add(Builder::indexingIndexFailed, JsonpDeserializer.stringDeserializer(), "indexing.index_failed", "iif",
-				"indexingIndexFailed");
-		op.add(Builder::mergesCurrent, JsonpDeserializer.stringDeserializer(), "merges.current", "mc", "mergesCurrent");
-		op.add(Builder::mergesCurrentDocs, JsonpDeserializer.stringDeserializer(), "merges.current_docs", "mcd",
-				"mergesCurrentDocs");
-		op.add(Builder::mergesCurrentSize, JsonpDeserializer.stringDeserializer(), "merges.current_size", "mcs",
-				"mergesCurrentSize");
-		op.add(Builder::mergesTotal, JsonpDeserializer.stringDeserializer(), "merges.total", "mt", "mergesTotal");
-		op.add(Builder::mergesTotalDocs, JsonpDeserializer.stringDeserializer(), "merges.total_docs", "mtd",
-				"mergesTotalDocs");
-		op.add(Builder::mergesTotalSize, JsonpDeserializer.stringDeserializer(), "merges.total_size", "mts",
-				"mergesTotalSize");
-		op.add(Builder::mergesTotalTime, JsonpDeserializer.stringDeserializer(), "merges.total_time", "mtt",
-				"mergesTotalTime");
-		op.add(Builder::refreshTotal, JsonpDeserializer.stringDeserializer(), "refresh.total");
-		op.add(Builder::refreshTime, JsonpDeserializer.stringDeserializer(), "refresh.time");
-		op.add(Builder::refreshExternalTotal, JsonpDeserializer.stringDeserializer(), "refresh.external_total", "rto",
-				"refreshTotal");
-		op.add(Builder::refreshExternalTime, JsonpDeserializer.stringDeserializer(), "refresh.external_time", "rti",
-				"refreshTime");
-		op.add(Builder::refreshListeners, JsonpDeserializer.stringDeserializer(), "refresh.listeners", "rli",
-				"refreshListeners");
-		op.add(Builder::scriptCompilations, JsonpDeserializer.stringDeserializer(), "script.compilations", "scrcc",
-				"scriptCompilations");
-		op.add(Builder::scriptCacheEvictions, JsonpDeserializer.stringDeserializer(), "script.cache_evictions", "scrce",
-				"scriptCacheEvictions");
-		op.add(Builder::scriptCompilationLimitTriggered, JsonpDeserializer.stringDeserializer(),
-				"script.compilation_limit_triggered", "scrclt", "scriptCacheCompilationLimitTriggered");
-		op.add(Builder::searchFetchCurrent, JsonpDeserializer.stringDeserializer(), "search.fetch_current", "sfc",
-				"searchFetchCurrent");
-		op.add(Builder::searchFetchTime, JsonpDeserializer.stringDeserializer(), "search.fetch_time", "sfti",
-				"searchFetchTime");
-		op.add(Builder::searchFetchTotal, JsonpDeserializer.stringDeserializer(), "search.fetch_total", "sfto",
-				"searchFetchTotal");
-		op.add(Builder::searchOpenContexts, JsonpDeserializer.stringDeserializer(), "search.open_contexts", "so",
-				"searchOpenContexts");
-		op.add(Builder::searchQueryCurrent, JsonpDeserializer.stringDeserializer(), "search.query_current", "sqc",
-				"searchQueryCurrent");
-		op.add(Builder::searchQueryTime, JsonpDeserializer.stringDeserializer(), "search.query_time", "sqti",
-				"searchQueryTime");
-		op.add(Builder::searchQueryTotal, JsonpDeserializer.stringDeserializer(), "search.query_total", "sqto",
-				"searchQueryTotal");
-		op.add(Builder::searchScrollCurrent, JsonpDeserializer.stringDeserializer(), "search.scroll_current", "scc",
-				"searchScrollCurrent");
-		op.add(Builder::searchScrollTime, JsonpDeserializer.stringDeserializer(), "search.scroll_time", "scti",
-				"searchScrollTime");
-		op.add(Builder::searchScrollTotal, JsonpDeserializer.stringDeserializer(), "search.scroll_total", "scto",
-				"searchScrollTotal");
-		op.add(Builder::segmentsCount, JsonpDeserializer.stringDeserializer(), "segments.count", "sc", "segmentsCount");
-		op.add(Builder::segmentsMemory, JsonpDeserializer.stringDeserializer(), "segments.memory", "sm",
-				"segmentsMemory");
-		op.add(Builder::segmentsIndexWriterMemory, JsonpDeserializer.stringDeserializer(),
-				"segments.index_writer_memory", "siwm", "segmentsIndexWriterMemory");
-		op.add(Builder::segmentsVersionMapMemory, JsonpDeserializer.stringDeserializer(), "segments.version_map_memory",
-				"svmm", "segmentsVersionMapMemory");
-		op.add(Builder::segmentsFixedBitsetMemory, JsonpDeserializer.stringDeserializer(),
-				"segments.fixed_bitset_memory", "sfbm", "fixedBitsetMemory");
-		op.add(Builder::suggestCurrent, JsonpDeserializer.stringDeserializer(), "suggest.current", "suc",
-				"suggestCurrent");
-		op.add(Builder::suggestTime, JsonpDeserializer.stringDeserializer(), "suggest.time", "suti", "suggestTime");
-		op.add(Builder::suggestTotal, JsonpDeserializer.stringDeserializer(), "suggest.total", "suto", "suggestTotal");
-		op.add(Builder::bulkTotalOperations, JsonpDeserializer.stringDeserializer(), "bulk.total_operations", "bto",
-				"bulkTotalOperations");
-		op.add(Builder::bulkTotalTime, JsonpDeserializer.stringDeserializer(), "bulk.total_time", "btti",
-				"bulkTotalTime");
-		op.add(Builder::bulkTotalSizeInBytes, JsonpDeserializer.stringDeserializer(), "bulk.total_size_in_bytes",
-				"btsi", "bulkTotalSizeInBytes");
-		op.add(Builder::bulkAvgTime, JsonpDeserializer.stringDeserializer(), "bulk.avg_time", "bati", "bulkAvgTime");
-		op.add(Builder::bulkAvgSizeInBytes, JsonpDeserializer.stringDeserializer(), "bulk.avg_size_in_bytes", "basi",
-				"bulkAvgSizeInBytes");
-
-	}
+        @Nullable
+        private String segmentsFixedBitsetMemory;
+
+        @Nullable
+        private String suggestCurrent;
+
+        @Nullable
+        private String suggestTime;
+
+        @Nullable
+        private String suggestTotal;
+
+        @Nullable
+        private String bulkTotalOperations;
+
+        @Nullable
+        private String bulkTotalTime;
+
+        @Nullable
+        private String bulkTotalSizeInBytes;
+
+        @Nullable
+        private String bulkAvgTime;
+
+        @Nullable
+        private String bulkAvgSizeInBytes;
+
+        /**
+         * unique node id
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * process id
+         * <p>
+         * API name: {@code pid}
+         */
+        public final Builder pid(@Nullable String value) {
+            this.pid = value;
+            return this;
+        }
+
+        /**
+         * ip address
+         * <p>
+         * API name: {@code ip}
+         */
+        public final Builder ip(@Nullable String value) {
+            this.ip = value;
+            return this;
+        }
+
+        /**
+         * bound transport port
+         * <p>
+         * API name: {@code port}
+         */
+        public final Builder port(@Nullable String value) {
+            this.port = value;
+            return this;
+        }
+
+        /**
+         * bound http address
+         * <p>
+         * API name: {@code http_address}
+         */
+        public final Builder httpAddress(@Nullable String value) {
+            this.httpAddress = value;
+            return this;
+        }
+
+        /**
+         * es version
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * es distribution flavor
+         * <p>
+         * API name: {@code flavor}
+         */
+        public final Builder flavor(@Nullable String value) {
+            this.flavor = value;
+            return this;
+        }
+
+        /**
+         * es distribution type
+         * <p>
+         * API name: {@code type}
+         */
+        public final Builder type(@Nullable String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * es build hash
+         * <p>
+         * API name: {@code build}
+         */
+        public final Builder build(@Nullable String value) {
+            this.build = value;
+            return this;
+        }
+
+        /**
+         * jdk version
+         * <p>
+         * API name: {@code jdk}
+         */
+        public final Builder jdk(@Nullable String value) {
+            this.jdk = value;
+            return this;
+        }
+
+        /**
+         * total disk space
+         * <p>
+         * API name: {@code disk.total}
+         */
+        public final Builder diskTotal(@Nullable String value) {
+            this.diskTotal = value;
+            return this;
+        }
+
+        /**
+         * used disk space
+         * <p>
+         * API name: {@code disk.used}
+         */
+        public final Builder diskUsed(@Nullable String value) {
+            this.diskUsed = value;
+            return this;
+        }
+
+        /**
+         * available disk space
+         * <p>
+         * API name: {@code disk.avail}
+         */
+        public final Builder diskAvail(@Nullable String value) {
+            this.diskAvail = value;
+            return this;
+        }
+
+        /**
+         * used disk space percentage
+         * <p>
+         * API name: {@code disk.used_percent}
+         */
+        public final Builder diskUsedPercent(@Nullable String value) {
+            this.diskUsedPercent = value;
+            return this;
+        }
+
+        /**
+         * used heap
+         * <p>
+         * API name: {@code heap.current}
+         */
+        public final Builder heapCurrent(@Nullable String value) {
+            this.heapCurrent = value;
+            return this;
+        }
+
+        /**
+         * used heap ratio
+         * <p>
+         * API name: {@code heap.percent}
+         */
+        public final Builder heapPercent(@Nullable String value) {
+            this.heapPercent = value;
+            return this;
+        }
+
+        /**
+         * max configured heap
+         * <p>
+         * API name: {@code heap.max}
+         */
+        public final Builder heapMax(@Nullable String value) {
+            this.heapMax = value;
+            return this;
+        }
+
+        /**
+         * used machine memory
+         * <p>
+         * API name: {@code ram.current}
+         */
+        public final Builder ramCurrent(@Nullable String value) {
+            this.ramCurrent = value;
+            return this;
+        }
+
+        /**
+         * used machine memory ratio
+         * <p>
+         * API name: {@code ram.percent}
+         */
+        public final Builder ramPercent(@Nullable String value) {
+            this.ramPercent = value;
+            return this;
+        }
+
+        /**
+         * total machine memory
+         * <p>
+         * API name: {@code ram.max}
+         */
+        public final Builder ramMax(@Nullable String value) {
+            this.ramMax = value;
+            return this;
+        }
+
+        /**
+         * used file descriptors
+         * <p>
+         * API name: {@code file_desc.current}
+         */
+        public final Builder fileDescCurrent(@Nullable String value) {
+            this.fileDescCurrent = value;
+            return this;
+        }
+
+        /**
+         * used file descriptor ratio
+         * <p>
+         * API name: {@code file_desc.percent}
+         */
+        public final Builder fileDescPercent(@Nullable String value) {
+            this.fileDescPercent = value;
+            return this;
+        }
+
+        /**
+         * max file descriptors
+         * <p>
+         * API name: {@code file_desc.max}
+         */
+        public final Builder fileDescMax(@Nullable String value) {
+            this.fileDescMax = value;
+            return this;
+        }
+
+        /**
+         * recent cpu usage
+         * <p>
+         * API name: {@code cpu}
+         */
+        public final Builder cpu(@Nullable String value) {
+            this.cpu = value;
+            return this;
+        }
+
+        /**
+         * 1m load avg
+         * <p>
+         * API name: {@code load_1m}
+         */
+        public final Builder load1m(@Nullable String value) {
+            this.load1m = value;
+            return this;
+        }
+
+        /**
+         * 5m load avg
+         * <p>
+         * API name: {@code load_5m}
+         */
+        public final Builder load5m(@Nullable String value) {
+            this.load5m = value;
+            return this;
+        }
+
+        /**
+         * 15m load avg
+         * <p>
+         * API name: {@code load_15m}
+         */
+        public final Builder load15m(@Nullable String value) {
+            this.load15m = value;
+            return this;
+        }
+
+        /**
+         * node uptime
+         * <p>
+         * API name: {@code uptime}
+         */
+        public final Builder uptime(@Nullable String value) {
+            this.uptime = value;
+            return this;
+        }
+
+        /**
+         * m:cluster-manager eligible node, d:data node, i:ingest node, -:coordinating node only
+         * <p>
+         * API name: {@code node.role}
+         */
+        public final Builder nodeRole(@Nullable String value) {
+            this.nodeRole = value;
+            return this;
+        }
+
+        /**
+         * *:current master
+         * <p>
+         * API name: {@code master}
+         */
+        @Deprecated
+        public final Builder master(@Nullable String value) {
+            this.master = value;
+            return this;
+        }
+
+        /**
+         * *:current cluster-manager
+         * <p>
+         * API name: {@code clusterManager}
+         */
+        public final Builder clusterManager(@Nullable String value) {
+            this.clusterManager = value;
+            return this;
+        }
+
+        /**
+         * node name
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(@Nullable String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * size of completion
+         * <p>
+         * API name: {@code completion.size}
+         */
+        public final Builder completionSize(@Nullable String value) {
+            this.completionSize = value;
+            return this;
+        }
+
+        /**
+         * used fielddata cache
+         * <p>
+         * API name: {@code fielddata.memory_size}
+         */
+        public final Builder fielddataMemorySize(@Nullable String value) {
+            this.fielddataMemorySize = value;
+            return this;
+        }
+
+        /**
+         * fielddata evictions
+         * <p>
+         * API name: {@code fielddata.evictions}
+         */
+        public final Builder fielddataEvictions(@Nullable String value) {
+            this.fielddataEvictions = value;
+            return this;
+        }
+
+        /**
+         * used query cache
+         * <p>
+         * API name: {@code query_cache.memory_size}
+         */
+        public final Builder queryCacheMemorySize(@Nullable String value) {
+            this.queryCacheMemorySize = value;
+            return this;
+        }
+
+        /**
+         * query cache evictions
+         * <p>
+         * API name: {@code query_cache.evictions}
+         */
+        public final Builder queryCacheEvictions(@Nullable String value) {
+            this.queryCacheEvictions = value;
+            return this;
+        }
+
+        /**
+         * query cache hit counts
+         * <p>
+         * API name: {@code query_cache.hit_count}
+         */
+        public final Builder queryCacheHitCount(@Nullable String value) {
+            this.queryCacheHitCount = value;
+            return this;
+        }
+
+        /**
+         * query cache miss counts
+         * <p>
+         * API name: {@code query_cache.miss_count}
+         */
+        public final Builder queryCacheMissCount(@Nullable String value) {
+            this.queryCacheMissCount = value;
+            return this;
+        }
+
+        /**
+         * used request cache
+         * <p>
+         * API name: {@code request_cache.memory_size}
+         */
+        public final Builder requestCacheMemorySize(@Nullable String value) {
+            this.requestCacheMemorySize = value;
+            return this;
+        }
+
+        /**
+         * request cache evictions
+         * <p>
+         * API name: {@code request_cache.evictions}
+         */
+        public final Builder requestCacheEvictions(@Nullable String value) {
+            this.requestCacheEvictions = value;
+            return this;
+        }
+
+        /**
+         * request cache hit counts
+         * <p>
+         * API name: {@code request_cache.hit_count}
+         */
+        public final Builder requestCacheHitCount(@Nullable String value) {
+            this.requestCacheHitCount = value;
+            return this;
+        }
+
+        /**
+         * request cache miss counts
+         * <p>
+         * API name: {@code request_cache.miss_count}
+         */
+        public final Builder requestCacheMissCount(@Nullable String value) {
+            this.requestCacheMissCount = value;
+            return this;
+        }
+
+        /**
+         * number of flushes
+         * <p>
+         * API name: {@code flush.total}
+         */
+        public final Builder flushTotal(@Nullable String value) {
+            this.flushTotal = value;
+            return this;
+        }
+
+        /**
+         * time spent in flush
+         * <p>
+         * API name: {@code flush.total_time}
+         */
+        public final Builder flushTotalTime(@Nullable String value) {
+            this.flushTotalTime = value;
+            return this;
+        }
+
+        /**
+         * number of current get ops
+         * <p>
+         * API name: {@code get.current}
+         */
+        public final Builder getCurrent(@Nullable String value) {
+            this.getCurrent = value;
+            return this;
+        }
+
+        /**
+         * time spent in get
+         * <p>
+         * API name: {@code get.time}
+         */
+        public final Builder getTime(@Nullable String value) {
+            this.getTime = value;
+            return this;
+        }
+
+        /**
+         * number of get ops
+         * <p>
+         * API name: {@code get.total}
+         */
+        public final Builder getTotal(@Nullable String value) {
+            this.getTotal = value;
+            return this;
+        }
+
+        /**
+         * time spent in successful gets
+         * <p>
+         * API name: {@code get.exists_time}
+         */
+        public final Builder getExistsTime(@Nullable String value) {
+            this.getExistsTime = value;
+            return this;
+        }
+
+        /**
+         * number of successful gets
+         * <p>
+         * API name: {@code get.exists_total}
+         */
+        public final Builder getExistsTotal(@Nullable String value) {
+            this.getExistsTotal = value;
+            return this;
+        }
+
+        /**
+         * time spent in failed gets
+         * <p>
+         * API name: {@code get.missing_time}
+         */
+        public final Builder getMissingTime(@Nullable String value) {
+            this.getMissingTime = value;
+            return this;
+        }
+
+        /**
+         * number of failed gets
+         * <p>
+         * API name: {@code get.missing_total}
+         */
+        public final Builder getMissingTotal(@Nullable String value) {
+            this.getMissingTotal = value;
+            return this;
+        }
+
+        /**
+         * number of current deletions
+         * <p>
+         * API name: {@code indexing.delete_current}
+         */
+        public final Builder indexingDeleteCurrent(@Nullable String value) {
+            this.indexingDeleteCurrent = value;
+            return this;
+        }
+
+        /**
+         * time spent in deletions
+         * <p>
+         * API name: {@code indexing.delete_time}
+         */
+        public final Builder indexingDeleteTime(@Nullable String value) {
+            this.indexingDeleteTime = value;
+            return this;
+        }
+
+        /**
+         * number of delete ops
+         * <p>
+         * API name: {@code indexing.delete_total}
+         */
+        public final Builder indexingDeleteTotal(@Nullable String value) {
+            this.indexingDeleteTotal = value;
+            return this;
+        }
+
+        /**
+         * number of current indexing ops
+         * <p>
+         * API name: {@code indexing.index_current}
+         */
+        public final Builder indexingIndexCurrent(@Nullable String value) {
+            this.indexingIndexCurrent = value;
+            return this;
+        }
+
+        /**
+         * time spent in indexing
+         * <p>
+         * API name: {@code indexing.index_time}
+         */
+        public final Builder indexingIndexTime(@Nullable String value) {
+            this.indexingIndexTime = value;
+            return this;
+        }
+
+        /**
+         * number of indexing ops
+         * <p>
+         * API name: {@code indexing.index_total}
+         */
+        public final Builder indexingIndexTotal(@Nullable String value) {
+            this.indexingIndexTotal = value;
+            return this;
+        }
+
+        /**
+         * number of failed indexing ops
+         * <p>
+         * API name: {@code indexing.index_failed}
+         */
+        public final Builder indexingIndexFailed(@Nullable String value) {
+            this.indexingIndexFailed = value;
+            return this;
+        }
+
+        /**
+         * number of current merges
+         * <p>
+         * API name: {@code merges.current}
+         */
+        public final Builder mergesCurrent(@Nullable String value) {
+            this.mergesCurrent = value;
+            return this;
+        }
+
+        /**
+         * number of current merging docs
+         * <p>
+         * API name: {@code merges.current_docs}
+         */
+        public final Builder mergesCurrentDocs(@Nullable String value) {
+            this.mergesCurrentDocs = value;
+            return this;
+        }
+
+        /**
+         * size of current merges
+         * <p>
+         * API name: {@code merges.current_size}
+         */
+        public final Builder mergesCurrentSize(@Nullable String value) {
+            this.mergesCurrentSize = value;
+            return this;
+        }
+
+        /**
+         * number of completed merge ops
+         * <p>
+         * API name: {@code merges.total}
+         */
+        public final Builder mergesTotal(@Nullable String value) {
+            this.mergesTotal = value;
+            return this;
+        }
+
+        /**
+         * docs merged
+         * <p>
+         * API name: {@code merges.total_docs}
+         */
+        public final Builder mergesTotalDocs(@Nullable String value) {
+            this.mergesTotalDocs = value;
+            return this;
+        }
+
+        /**
+         * size merged
+         * <p>
+         * API name: {@code merges.total_size}
+         */
+        public final Builder mergesTotalSize(@Nullable String value) {
+            this.mergesTotalSize = value;
+            return this;
+        }
+
+        /**
+         * time spent in merges
+         * <p>
+         * API name: {@code merges.total_time}
+         */
+        public final Builder mergesTotalTime(@Nullable String value) {
+            this.mergesTotalTime = value;
+            return this;
+        }
+
+        /**
+         * total refreshes
+         * <p>
+         * API name: {@code refresh.total}
+         */
+        public final Builder refreshTotal(@Nullable String value) {
+            this.refreshTotal = value;
+            return this;
+        }
+
+        /**
+         * time spent in refreshes
+         * <p>
+         * API name: {@code refresh.time}
+         */
+        public final Builder refreshTime(@Nullable String value) {
+            this.refreshTime = value;
+            return this;
+        }
+
+        /**
+         * total external refreshes
+         * <p>
+         * API name: {@code refresh.external_total}
+         */
+        public final Builder refreshExternalTotal(@Nullable String value) {
+            this.refreshExternalTotal = value;
+            return this;
+        }
+
+        /**
+         * time spent in external refreshes
+         * <p>
+         * API name: {@code refresh.external_time}
+         */
+        public final Builder refreshExternalTime(@Nullable String value) {
+            this.refreshExternalTime = value;
+            return this;
+        }
+
+        /**
+         * number of pending refresh listeners
+         * <p>
+         * API name: {@code refresh.listeners}
+         */
+        public final Builder refreshListeners(@Nullable String value) {
+            this.refreshListeners = value;
+            return this;
+        }
+
+        /**
+         * script compilations
+         * <p>
+         * API name: {@code script.compilations}
+         */
+        public final Builder scriptCompilations(@Nullable String value) {
+            this.scriptCompilations = value;
+            return this;
+        }
+
+        /**
+         * script cache evictions
+         * <p>
+         * API name: {@code script.cache_evictions}
+         */
+        public final Builder scriptCacheEvictions(@Nullable String value) {
+            this.scriptCacheEvictions = value;
+            return this;
+        }
+
+        /**
+         * script cache compilation limit triggered
+         * <p>
+         * API name: {@code script.compilation_limit_triggered}
+         */
+        public final Builder scriptCompilationLimitTriggered(@Nullable String value) {
+            this.scriptCompilationLimitTriggered = value;
+            return this;
+        }
+
+        /**
+         * current fetch phase ops
+         * <p>
+         * API name: {@code search.fetch_current}
+         */
+        public final Builder searchFetchCurrent(@Nullable String value) {
+            this.searchFetchCurrent = value;
+            return this;
+        }
+
+        /**
+         * time spent in fetch phase
+         * <p>
+         * API name: {@code search.fetch_time}
+         */
+        public final Builder searchFetchTime(@Nullable String value) {
+            this.searchFetchTime = value;
+            return this;
+        }
+
+        /**
+         * total fetch ops
+         * <p>
+         * API name: {@code search.fetch_total}
+         */
+        public final Builder searchFetchTotal(@Nullable String value) {
+            this.searchFetchTotal = value;
+            return this;
+        }
+
+        /**
+         * open search contexts
+         * <p>
+         * API name: {@code search.open_contexts}
+         */
+        public final Builder searchOpenContexts(@Nullable String value) {
+            this.searchOpenContexts = value;
+            return this;
+        }
+
+        /**
+         * current query phase ops
+         * <p>
+         * API name: {@code search.query_current}
+         */
+        public final Builder searchQueryCurrent(@Nullable String value) {
+            this.searchQueryCurrent = value;
+            return this;
+        }
+
+        /**
+         * time spent in query phase
+         * <p>
+         * API name: {@code search.query_time}
+         */
+        public final Builder searchQueryTime(@Nullable String value) {
+            this.searchQueryTime = value;
+            return this;
+        }
+
+        /**
+         * total query phase ops
+         * <p>
+         * API name: {@code search.query_total}
+         */
+        public final Builder searchQueryTotal(@Nullable String value) {
+            this.searchQueryTotal = value;
+            return this;
+        }
+
+        /**
+         * open scroll contexts
+         * <p>
+         * API name: {@code search.scroll_current}
+         */
+        public final Builder searchScrollCurrent(@Nullable String value) {
+            this.searchScrollCurrent = value;
+            return this;
+        }
+
+        /**
+         * time scroll contexts held open
+         * <p>
+         * API name: {@code search.scroll_time}
+         */
+        public final Builder searchScrollTime(@Nullable String value) {
+            this.searchScrollTime = value;
+            return this;
+        }
+
+        /**
+         * completed scroll contexts
+         * <p>
+         * API name: {@code search.scroll_total}
+         */
+        public final Builder searchScrollTotal(@Nullable String value) {
+            this.searchScrollTotal = value;
+            return this;
+        }
+
+        /**
+         * number of segments
+         * <p>
+         * API name: {@code segments.count}
+         */
+        public final Builder segmentsCount(@Nullable String value) {
+            this.segmentsCount = value;
+            return this;
+        }
+
+        /**
+         * memory used by segments
+         * <p>
+         * API name: {@code segments.memory}
+         */
+        public final Builder segmentsMemory(@Nullable String value) {
+            this.segmentsMemory = value;
+            return this;
+        }
+
+        /**
+         * memory used by index writer
+         * <p>
+         * API name: {@code segments.index_writer_memory}
+         */
+        public final Builder segmentsIndexWriterMemory(@Nullable String value) {
+            this.segmentsIndexWriterMemory = value;
+            return this;
+        }
+
+        /**
+         * memory used by version map
+         * <p>
+         * API name: {@code segments.version_map_memory}
+         */
+        public final Builder segmentsVersionMapMemory(@Nullable String value) {
+            this.segmentsVersionMapMemory = value;
+            return this;
+        }
+
+        /**
+         * memory used by fixed bit sets for nested object field types and export type
+         * filters for types referred in _parent fields
+         * <p>
+         * API name: {@code segments.fixed_bitset_memory}
+         */
+        public final Builder segmentsFixedBitsetMemory(@Nullable String value) {
+            this.segmentsFixedBitsetMemory = value;
+            return this;
+        }
+
+        /**
+         * number of current suggest ops
+         * <p>
+         * API name: {@code suggest.current}
+         */
+        public final Builder suggestCurrent(@Nullable String value) {
+            this.suggestCurrent = value;
+            return this;
+        }
+
+        /**
+         * time spend in suggest
+         * <p>
+         * API name: {@code suggest.time}
+         */
+        public final Builder suggestTime(@Nullable String value) {
+            this.suggestTime = value;
+            return this;
+        }
+
+        /**
+         * number of suggest ops
+         * <p>
+         * API name: {@code suggest.total}
+         */
+        public final Builder suggestTotal(@Nullable String value) {
+            this.suggestTotal = value;
+            return this;
+        }
+
+        /**
+         * number of bulk shard ops
+         * <p>
+         * API name: {@code bulk.total_operations}
+         */
+        public final Builder bulkTotalOperations(@Nullable String value) {
+            this.bulkTotalOperations = value;
+            return this;
+        }
+
+        /**
+         * time spend in shard bulk
+         * <p>
+         * API name: {@code bulk.total_time}
+         */
+        public final Builder bulkTotalTime(@Nullable String value) {
+            this.bulkTotalTime = value;
+            return this;
+        }
+
+        /**
+         * total size in bytes of shard bulk
+         * <p>
+         * API name: {@code bulk.total_size_in_bytes}
+         */
+        public final Builder bulkTotalSizeInBytes(@Nullable String value) {
+            this.bulkTotalSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * average time spend in shard bulk
+         * <p>
+         * API name: {@code bulk.avg_time}
+         */
+        public final Builder bulkAvgTime(@Nullable String value) {
+            this.bulkAvgTime = value;
+            return this;
+        }
+
+        /**
+         * average size in bytes of shard bulk
+         * <p>
+         * API name: {@code bulk.avg_size_in_bytes}
+         */
+        public final Builder bulkAvgSizeInBytes(@Nullable String value) {
+            this.bulkAvgSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodesRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodesRecord build() {
+            _checkSingleUse();
+
+            return new NodesRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodesRecord}
+     */
+    public static final JsonpDeserializer<NodesRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodesRecord::setupNodesRecordDeserializer
+    );
+
+    protected static void setupNodesRecordDeserializer(ObjectDeserializer<NodesRecord.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id", "nodeId");
+        op.add(Builder::pid, JsonpDeserializer.stringDeserializer(), "pid", "p");
+        op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip", "i");
+        op.add(Builder::port, JsonpDeserializer.stringDeserializer(), "port", "po");
+        op.add(Builder::httpAddress, JsonpDeserializer.stringDeserializer(), "http_address", "http");
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version", "v");
+        op.add(Builder::flavor, JsonpDeserializer.stringDeserializer(), "flavor", "f");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type", "t");
+        op.add(Builder::build, JsonpDeserializer.stringDeserializer(), "build", "b");
+        op.add(Builder::jdk, JsonpDeserializer.stringDeserializer(), "jdk", "j");
+        op.add(Builder::diskTotal, JsonpDeserializer.stringDeserializer(), "disk.total", "dt", "diskTotal");
+        op.add(Builder::diskUsed, JsonpDeserializer.stringDeserializer(), "disk.used", "du", "diskUsed");
+        op.add(Builder::diskAvail, JsonpDeserializer.stringDeserializer(), "disk.avail", "d", "da", "disk", "diskAvail");
+        op.add(Builder::diskUsedPercent, JsonpDeserializer.stringDeserializer(), "disk.used_percent", "dup", "diskUsedPercent");
+        op.add(Builder::heapCurrent, JsonpDeserializer.stringDeserializer(), "heap.current", "hc", "heapCurrent");
+        op.add(Builder::heapPercent, JsonpDeserializer.stringDeserializer(), "heap.percent", "hp", "heapPercent");
+        op.add(Builder::heapMax, JsonpDeserializer.stringDeserializer(), "heap.max", "hm", "heapMax");
+        op.add(Builder::ramCurrent, JsonpDeserializer.stringDeserializer(), "ram.current", "rc", "ramCurrent");
+        op.add(Builder::ramPercent, JsonpDeserializer.stringDeserializer(), "ram.percent", "rp", "ramPercent");
+        op.add(Builder::ramMax, JsonpDeserializer.stringDeserializer(), "ram.max", "rn", "ramMax");
+        op.add(Builder::fileDescCurrent, JsonpDeserializer.stringDeserializer(), "file_desc.current", "fdc", "fileDescriptorCurrent");
+        op.add(Builder::fileDescPercent, JsonpDeserializer.stringDeserializer(), "file_desc.percent", "fdp", "fileDescriptorPercent");
+        op.add(Builder::fileDescMax, JsonpDeserializer.stringDeserializer(), "file_desc.max", "fdm", "fileDescriptorMax");
+        op.add(Builder::cpu, JsonpDeserializer.stringDeserializer(), "cpu");
+        op.add(Builder::load1m, JsonpDeserializer.stringDeserializer(), "load_1m");
+        op.add(Builder::load5m, JsonpDeserializer.stringDeserializer(), "load_5m");
+        op.add(Builder::load15m, JsonpDeserializer.stringDeserializer(), "load_15m", "l");
+        op.add(Builder::uptime, JsonpDeserializer.stringDeserializer(), "uptime", "u");
+        op.add(Builder::nodeRole, JsonpDeserializer.stringDeserializer(), "node.role", "r", "role", "nodeRole");
+        op.add(Builder::master, JsonpDeserializer.stringDeserializer(), "master", "m");
+        op.add(Builder::clusterManager, JsonpDeserializer.stringDeserializer(), "cluster_manager", "m");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name", "n");
+        op.add(Builder::completionSize, JsonpDeserializer.stringDeserializer(), "completion.size", "cs", "completionSize");
+        op.add(Builder::fielddataMemorySize, JsonpDeserializer.stringDeserializer(), "fielddata.memory_size", "fm", "fielddataMemory");
+        op.add(Builder::fielddataEvictions, JsonpDeserializer.stringDeserializer(), "fielddata.evictions", "fe", "fielddataEvictions");
+        op.add(Builder::queryCacheMemorySize, JsonpDeserializer.stringDeserializer(), "query_cache.memory_size", "qcm", "queryCacheMemory");
+        op.add(Builder::queryCacheEvictions, JsonpDeserializer.stringDeserializer(), "query_cache.evictions", "qce", "queryCacheEvictions");
+        op.add(Builder::queryCacheHitCount, JsonpDeserializer.stringDeserializer(), "query_cache.hit_count", "qchc", "queryCacheHitCount");
+        op.add(
+            Builder::queryCacheMissCount,
+            JsonpDeserializer.stringDeserializer(),
+            "query_cache.miss_count",
+            "qcmc",
+            "queryCacheMissCount"
+        );
+        op.add(
+            Builder::requestCacheMemorySize,
+            JsonpDeserializer.stringDeserializer(),
+            "request_cache.memory_size",
+            "rcm",
+            "requestCacheMemory"
+        );
+        op.add(
+            Builder::requestCacheEvictions,
+            JsonpDeserializer.stringDeserializer(),
+            "request_cache.evictions",
+            "rce",
+            "requestCacheEvictions"
+        );
+        op.add(
+            Builder::requestCacheHitCount,
+            JsonpDeserializer.stringDeserializer(),
+            "request_cache.hit_count",
+            "rchc",
+            "requestCacheHitCount"
+        );
+        op.add(
+            Builder::requestCacheMissCount,
+            JsonpDeserializer.stringDeserializer(),
+            "request_cache.miss_count",
+            "rcmc",
+            "requestCacheMissCount"
+        );
+        op.add(Builder::flushTotal, JsonpDeserializer.stringDeserializer(), "flush.total", "ft", "flushTotal");
+        op.add(Builder::flushTotalTime, JsonpDeserializer.stringDeserializer(), "flush.total_time", "ftt", "flushTotalTime");
+        op.add(Builder::getCurrent, JsonpDeserializer.stringDeserializer(), "get.current", "gc", "getCurrent");
+        op.add(Builder::getTime, JsonpDeserializer.stringDeserializer(), "get.time", "gti", "getTime");
+        op.add(Builder::getTotal, JsonpDeserializer.stringDeserializer(), "get.total", "gto", "getTotal");
+        op.add(Builder::getExistsTime, JsonpDeserializer.stringDeserializer(), "get.exists_time", "geti", "getExistsTime");
+        op.add(Builder::getExistsTotal, JsonpDeserializer.stringDeserializer(), "get.exists_total", "geto", "getExistsTotal");
+        op.add(Builder::getMissingTime, JsonpDeserializer.stringDeserializer(), "get.missing_time", "gmti", "getMissingTime");
+        op.add(Builder::getMissingTotal, JsonpDeserializer.stringDeserializer(), "get.missing_total", "gmto", "getMissingTotal");
+        op.add(
+            Builder::indexingDeleteCurrent,
+            JsonpDeserializer.stringDeserializer(),
+            "indexing.delete_current",
+            "idc",
+            "indexingDeleteCurrent"
+        );
+        op.add(Builder::indexingDeleteTime, JsonpDeserializer.stringDeserializer(), "indexing.delete_time", "idti", "indexingDeleteTime");
+        op.add(
+            Builder::indexingDeleteTotal,
+            JsonpDeserializer.stringDeserializer(),
+            "indexing.delete_total",
+            "idto",
+            "indexingDeleteTotal"
+        );
+        op.add(
+            Builder::indexingIndexCurrent,
+            JsonpDeserializer.stringDeserializer(),
+            "indexing.index_current",
+            "iic",
+            "indexingIndexCurrent"
+        );
+        op.add(Builder::indexingIndexTime, JsonpDeserializer.stringDeserializer(), "indexing.index_time", "iiti", "indexingIndexTime");
+        op.add(Builder::indexingIndexTotal, JsonpDeserializer.stringDeserializer(), "indexing.index_total", "iito", "indexingIndexTotal");
+        op.add(Builder::indexingIndexFailed, JsonpDeserializer.stringDeserializer(), "indexing.index_failed", "iif", "indexingIndexFailed");
+        op.add(Builder::mergesCurrent, JsonpDeserializer.stringDeserializer(), "merges.current", "mc", "mergesCurrent");
+        op.add(Builder::mergesCurrentDocs, JsonpDeserializer.stringDeserializer(), "merges.current_docs", "mcd", "mergesCurrentDocs");
+        op.add(Builder::mergesCurrentSize, JsonpDeserializer.stringDeserializer(), "merges.current_size", "mcs", "mergesCurrentSize");
+        op.add(Builder::mergesTotal, JsonpDeserializer.stringDeserializer(), "merges.total", "mt", "mergesTotal");
+        op.add(Builder::mergesTotalDocs, JsonpDeserializer.stringDeserializer(), "merges.total_docs", "mtd", "mergesTotalDocs");
+        op.add(Builder::mergesTotalSize, JsonpDeserializer.stringDeserializer(), "merges.total_size", "mts", "mergesTotalSize");
+        op.add(Builder::mergesTotalTime, JsonpDeserializer.stringDeserializer(), "merges.total_time", "mtt", "mergesTotalTime");
+        op.add(Builder::refreshTotal, JsonpDeserializer.stringDeserializer(), "refresh.total");
+        op.add(Builder::refreshTime, JsonpDeserializer.stringDeserializer(), "refresh.time");
+        op.add(Builder::refreshExternalTotal, JsonpDeserializer.stringDeserializer(), "refresh.external_total", "rto", "refreshTotal");
+        op.add(Builder::refreshExternalTime, JsonpDeserializer.stringDeserializer(), "refresh.external_time", "rti", "refreshTime");
+        op.add(Builder::refreshListeners, JsonpDeserializer.stringDeserializer(), "refresh.listeners", "rli", "refreshListeners");
+        op.add(Builder::scriptCompilations, JsonpDeserializer.stringDeserializer(), "script.compilations", "scrcc", "scriptCompilations");
+        op.add(
+            Builder::scriptCacheEvictions,
+            JsonpDeserializer.stringDeserializer(),
+            "script.cache_evictions",
+            "scrce",
+            "scriptCacheEvictions"
+        );
+        op.add(
+            Builder::scriptCompilationLimitTriggered,
+            JsonpDeserializer.stringDeserializer(),
+            "script.compilation_limit_triggered",
+            "scrclt",
+            "scriptCacheCompilationLimitTriggered"
+        );
+        op.add(Builder::searchFetchCurrent, JsonpDeserializer.stringDeserializer(), "search.fetch_current", "sfc", "searchFetchCurrent");
+        op.add(Builder::searchFetchTime, JsonpDeserializer.stringDeserializer(), "search.fetch_time", "sfti", "searchFetchTime");
+        op.add(Builder::searchFetchTotal, JsonpDeserializer.stringDeserializer(), "search.fetch_total", "sfto", "searchFetchTotal");
+        op.add(Builder::searchOpenContexts, JsonpDeserializer.stringDeserializer(), "search.open_contexts", "so", "searchOpenContexts");
+        op.add(Builder::searchQueryCurrent, JsonpDeserializer.stringDeserializer(), "search.query_current", "sqc", "searchQueryCurrent");
+        op.add(Builder::searchQueryTime, JsonpDeserializer.stringDeserializer(), "search.query_time", "sqti", "searchQueryTime");
+        op.add(Builder::searchQueryTotal, JsonpDeserializer.stringDeserializer(), "search.query_total", "sqto", "searchQueryTotal");
+        op.add(Builder::searchScrollCurrent, JsonpDeserializer.stringDeserializer(), "search.scroll_current", "scc", "searchScrollCurrent");
+        op.add(Builder::searchScrollTime, JsonpDeserializer.stringDeserializer(), "search.scroll_time", "scti", "searchScrollTime");
+        op.add(Builder::searchScrollTotal, JsonpDeserializer.stringDeserializer(), "search.scroll_total", "scto", "searchScrollTotal");
+        op.add(Builder::segmentsCount, JsonpDeserializer.stringDeserializer(), "segments.count", "sc", "segmentsCount");
+        op.add(Builder::segmentsMemory, JsonpDeserializer.stringDeserializer(), "segments.memory", "sm", "segmentsMemory");
+        op.add(
+            Builder::segmentsIndexWriterMemory,
+            JsonpDeserializer.stringDeserializer(),
+            "segments.index_writer_memory",
+            "siwm",
+            "segmentsIndexWriterMemory"
+        );
+        op.add(
+            Builder::segmentsVersionMapMemory,
+            JsonpDeserializer.stringDeserializer(),
+            "segments.version_map_memory",
+            "svmm",
+            "segmentsVersionMapMemory"
+        );
+        op.add(
+            Builder::segmentsFixedBitsetMemory,
+            JsonpDeserializer.stringDeserializer(),
+            "segments.fixed_bitset_memory",
+            "sfbm",
+            "fixedBitsetMemory"
+        );
+        op.add(Builder::suggestCurrent, JsonpDeserializer.stringDeserializer(), "suggest.current", "suc", "suggestCurrent");
+        op.add(Builder::suggestTime, JsonpDeserializer.stringDeserializer(), "suggest.time", "suti", "suggestTime");
+        op.add(Builder::suggestTotal, JsonpDeserializer.stringDeserializer(), "suggest.total", "suto", "suggestTotal");
+        op.add(Builder::bulkTotalOperations, JsonpDeserializer.stringDeserializer(), "bulk.total_operations", "bto", "bulkTotalOperations");
+        op.add(Builder::bulkTotalTime, JsonpDeserializer.stringDeserializer(), "bulk.total_time", "btti", "bulkTotalTime");
+        op.add(
+            Builder::bulkTotalSizeInBytes,
+            JsonpDeserializer.stringDeserializer(),
+            "bulk.total_size_in_bytes",
+            "btsi",
+            "bulkTotalSizeInBytes"
+        );
+        op.add(Builder::bulkAvgTime, JsonpDeserializer.stringDeserializer(), "bulk.avg_time", "bati", "bulkAvgTime");
+        op.add(Builder::bulkAvgSizeInBytes, JsonpDeserializer.stringDeserializer(), "bulk.avg_size_in_bytes", "basi", "bulkAvgSizeInBytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/pending_tasks/PendingTasksRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/pending_tasks/PendingTasksRecord.java
index 67d00a3661..8a18a13046 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/pending_tasks/PendingTasksRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/pending_tasks/PendingTasksRecord.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cat.pending_tasks;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,202 +43,201 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cat.pending_tasks.PendingTasksRecord
 
 @JsonpDeserializable
 public class PendingTasksRecord implements JsonpSerializable {
-	@Nullable
-	private final String insertorder;
-
-	@Nullable
-	private final String timeinqueue;
-
-	@Nullable
-	private final String priority;
-
-	@Nullable
-	private final String source;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PendingTasksRecord(Builder builder) {
-
-		this.insertorder = builder.insertorder;
-		this.timeinqueue = builder.timeinqueue;
-		this.priority = builder.priority;
-		this.source = builder.source;
-
-	}
-
-	public static PendingTasksRecord of(Function<Builder, ObjectBuilder<PendingTasksRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * task insertion order
-	 * <p>
-	 * API name: {@code insertOrder}
-	 */
-	@Nullable
-	public final String insertorder() {
-		return this.insertorder;
-	}
-
-	/**
-	 * how long task has been in queue
-	 * <p>
-	 * API name: {@code timeInQueue}
-	 */
-	@Nullable
-	public final String timeinqueue() {
-		return this.timeinqueue;
-	}
-
-	/**
-	 * task priority
-	 * <p>
-	 * API name: {@code priority}
-	 */
-	@Nullable
-	public final String priority() {
-		return this.priority;
-	}
-
-	/**
-	 * task source
-	 * <p>
-	 * API name: {@code source}
-	 */
-	@Nullable
-	public final String source() {
-		return this.source;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.insertorder != null) {
-			generator.writeKey("insertOrder");
-			generator.write(this.insertorder);
-
-		}
-		if (this.timeinqueue != null) {
-			generator.writeKey("timeInQueue");
-			generator.write(this.timeinqueue);
-
-		}
-		if (this.priority != null) {
-			generator.writeKey("priority");
-			generator.write(this.priority);
-
-		}
-		if (this.source != null) {
-			generator.writeKey("source");
-			generator.write(this.source);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PendingTasksRecord}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PendingTasksRecord> {
-		@Nullable
-		private String insertorder;
-
-		@Nullable
-		private String timeinqueue;
-
-		@Nullable
-		private String priority;
-
-		@Nullable
-		private String source;
-
-		/**
-		 * task insertion order
-		 * <p>
-		 * API name: {@code insertOrder}
-		 */
-		public final Builder insertorder(@Nullable String value) {
-			this.insertorder = value;
-			return this;
-		}
-
-		/**
-		 * how long task has been in queue
-		 * <p>
-		 * API name: {@code timeInQueue}
-		 */
-		public final Builder timeinqueue(@Nullable String value) {
-			this.timeinqueue = value;
-			return this;
-		}
-
-		/**
-		 * task priority
-		 * <p>
-		 * API name: {@code priority}
-		 */
-		public final Builder priority(@Nullable String value) {
-			this.priority = value;
-			return this;
-		}
-
-		/**
-		 * task source
-		 * <p>
-		 * API name: {@code source}
-		 */
-		public final Builder source(@Nullable String value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PendingTasksRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PendingTasksRecord build() {
-			_checkSingleUse();
-
-			return new PendingTasksRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PendingTasksRecord}
-	 */
-	public static final JsonpDeserializer<PendingTasksRecord> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PendingTasksRecord::setupPendingTasksRecordDeserializer);
-
-	protected static void setupPendingTasksRecordDeserializer(ObjectDeserializer<PendingTasksRecord.Builder> op) {
-
-		op.add(Builder::insertorder, JsonpDeserializer.stringDeserializer(), "insertOrder", "o");
-		op.add(Builder::timeinqueue, JsonpDeserializer.stringDeserializer(), "timeInQueue", "t");
-		op.add(Builder::priority, JsonpDeserializer.stringDeserializer(), "priority", "p");
-		op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source", "s");
-
-	}
+    @Nullable
+    private final String insertorder;
+
+    @Nullable
+    private final String timeinqueue;
+
+    @Nullable
+    private final String priority;
+
+    @Nullable
+    private final String source;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PendingTasksRecord(Builder builder) {
+
+        this.insertorder = builder.insertorder;
+        this.timeinqueue = builder.timeinqueue;
+        this.priority = builder.priority;
+        this.source = builder.source;
+
+    }
+
+    public static PendingTasksRecord of(Function<Builder, ObjectBuilder<PendingTasksRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * task insertion order
+     * <p>
+     * API name: {@code insertOrder}
+     */
+    @Nullable
+    public final String insertorder() {
+        return this.insertorder;
+    }
+
+    /**
+     * how long task has been in queue
+     * <p>
+     * API name: {@code timeInQueue}
+     */
+    @Nullable
+    public final String timeinqueue() {
+        return this.timeinqueue;
+    }
+
+    /**
+     * task priority
+     * <p>
+     * API name: {@code priority}
+     */
+    @Nullable
+    public final String priority() {
+        return this.priority;
+    }
+
+    /**
+     * task source
+     * <p>
+     * API name: {@code source}
+     */
+    @Nullable
+    public final String source() {
+        return this.source;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.insertorder != null) {
+            generator.writeKey("insertOrder");
+            generator.write(this.insertorder);
+
+        }
+        if (this.timeinqueue != null) {
+            generator.writeKey("timeInQueue");
+            generator.write(this.timeinqueue);
+
+        }
+        if (this.priority != null) {
+            generator.writeKey("priority");
+            generator.write(this.priority);
+
+        }
+        if (this.source != null) {
+            generator.writeKey("source");
+            generator.write(this.source);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PendingTasksRecord}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PendingTasksRecord> {
+        @Nullable
+        private String insertorder;
+
+        @Nullable
+        private String timeinqueue;
+
+        @Nullable
+        private String priority;
+
+        @Nullable
+        private String source;
+
+        /**
+         * task insertion order
+         * <p>
+         * API name: {@code insertOrder}
+         */
+        public final Builder insertorder(@Nullable String value) {
+            this.insertorder = value;
+            return this;
+        }
+
+        /**
+         * how long task has been in queue
+         * <p>
+         * API name: {@code timeInQueue}
+         */
+        public final Builder timeinqueue(@Nullable String value) {
+            this.timeinqueue = value;
+            return this;
+        }
+
+        /**
+         * task priority
+         * <p>
+         * API name: {@code priority}
+         */
+        public final Builder priority(@Nullable String value) {
+            this.priority = value;
+            return this;
+        }
+
+        /**
+         * task source
+         * <p>
+         * API name: {@code source}
+         */
+        public final Builder source(@Nullable String value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link PendingTasksRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PendingTasksRecord build() {
+            _checkSingleUse();
+
+            return new PendingTasksRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PendingTasksRecord}
+     */
+    public static final JsonpDeserializer<PendingTasksRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PendingTasksRecord::setupPendingTasksRecordDeserializer
+    );
+
+    protected static void setupPendingTasksRecordDeserializer(ObjectDeserializer<PendingTasksRecord.Builder> op) {
+
+        op.add(Builder::insertorder, JsonpDeserializer.stringDeserializer(), "insertOrder", "o");
+        op.add(Builder::timeinqueue, JsonpDeserializer.stringDeserializer(), "timeInQueue", "t");
+        op.add(Builder::priority, JsonpDeserializer.stringDeserializer(), "priority", "p");
+        op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source", "s");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/plugins/PluginsRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/plugins/PluginsRecord.java
index af13d4ac75..6308cc29d0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/plugins/PluginsRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/plugins/PluginsRecord.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cat.plugins;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,269 +43,267 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cat.plugins.PluginsRecord
 
-
 @JsonpDeserializable
 public class PluginsRecord implements JsonpSerializable {
-	@Nullable
-	private final String id;
-
-	@Nullable
-	private final String name;
-
-	@Nullable
-	private final String component;
-
-	@Nullable
-	private final String version;
-
-	@Nullable
-	private final String description;
-
-	@Nullable
-	private final String type;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PluginsRecord(Builder builder) {
-
-		this.id = builder.id;
-		this.name = builder.name;
-		this.component = builder.component;
-		this.version = builder.version;
-		this.description = builder.description;
-		this.type = builder.type;
-
-	}
-
-	public static PluginsRecord of(Function<Builder, ObjectBuilder<PluginsRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * unique node id
-	 * <p>
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * node name
-	 * <p>
-	 * API name: {@code name}
-	 */
-	@Nullable
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * component
-	 * <p>
-	 * API name: {@code component}
-	 */
-	@Nullable
-	public final String component() {
-		return this.component;
-	}
-
-	/**
-	 * component version
-	 * <p>
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final String version() {
-		return this.version;
-	}
-
-	/**
-	 * plugin details
-	 * <p>
-	 * API name: {@code description}
-	 */
-	@Nullable
-	public final String description() {
-		return this.description;
-	}
-
-	/**
-	 * plugin type
-	 * <p>
-	 * API name: {@code type}
-	 */
-	@Nullable
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.id != null) {
-			generator.writeKey("id");
-			generator.write(this.id);
-
-		}
-		if (this.name != null) {
-			generator.writeKey("name");
-			generator.write(this.name);
-
-		}
-		if (this.component != null) {
-			generator.writeKey("component");
-			generator.write(this.component);
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		if (this.description != null) {
-			generator.writeKey("description");
-			generator.write(this.description);
-
-		}
-		if (this.type != null) {
-			generator.writeKey("type");
-			generator.write(this.type);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PluginsRecord}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PluginsRecord> {
-		@Nullable
-		private String id;
-
-		@Nullable
-		private String name;
-
-		@Nullable
-		private String component;
-
-		@Nullable
-		private String version;
-
-		@Nullable
-		private String description;
-
-		@Nullable
-		private String type;
-
-		/**
-		 * unique node id
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * node name
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(@Nullable String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * component
-		 * <p>
-		 * API name: {@code component}
-		 */
-		public final Builder component(@Nullable String value) {
-			this.component = value;
-			return this;
-		}
-
-		/**
-		 * component version
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * plugin details
-		 * <p>
-		 * API name: {@code description}
-		 */
-		public final Builder description(@Nullable String value) {
-			this.description = value;
-			return this;
-		}
-
-		/**
-		 * plugin type
-		 * <p>
-		 * API name: {@code type}
-		 */
-		public final Builder type(@Nullable String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PluginsRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PluginsRecord build() {
-			_checkSingleUse();
-
-			return new PluginsRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PluginsRecord}
-	 */
-	public static final JsonpDeserializer<PluginsRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			PluginsRecord::setupPluginsRecordDeserializer);
-
-	protected static void setupPluginsRecordDeserializer(ObjectDeserializer<PluginsRecord.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name", "n");
-		op.add(Builder::component, JsonpDeserializer.stringDeserializer(), "component", "c");
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version", "v");
-		op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description", "d");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type", "t");
-
-	}
+    @Nullable
+    private final String id;
+
+    @Nullable
+    private final String name;
+
+    @Nullable
+    private final String component;
+
+    @Nullable
+    private final String version;
+
+    @Nullable
+    private final String description;
+
+    @Nullable
+    private final String type;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PluginsRecord(Builder builder) {
+
+        this.id = builder.id;
+        this.name = builder.name;
+        this.component = builder.component;
+        this.version = builder.version;
+        this.description = builder.description;
+        this.type = builder.type;
+
+    }
+
+    public static PluginsRecord of(Function<Builder, ObjectBuilder<PluginsRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * unique node id
+     * <p>
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * node name
+     * <p>
+     * API name: {@code name}
+     */
+    @Nullable
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * component
+     * <p>
+     * API name: {@code component}
+     */
+    @Nullable
+    public final String component() {
+        return this.component;
+    }
+
+    /**
+     * component version
+     * <p>
+     * API name: {@code version}
+     */
+    @Nullable
+    public final String version() {
+        return this.version;
+    }
+
+    /**
+     * plugin details
+     * <p>
+     * API name: {@code description}
+     */
+    @Nullable
+    public final String description() {
+        return this.description;
+    }
+
+    /**
+     * plugin type
+     * <p>
+     * API name: {@code type}
+     */
+    @Nullable
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.id != null) {
+            generator.writeKey("id");
+            generator.write(this.id);
+
+        }
+        if (this.name != null) {
+            generator.writeKey("name");
+            generator.write(this.name);
+
+        }
+        if (this.component != null) {
+            generator.writeKey("component");
+            generator.write(this.component);
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        if (this.description != null) {
+            generator.writeKey("description");
+            generator.write(this.description);
+
+        }
+        if (this.type != null) {
+            generator.writeKey("type");
+            generator.write(this.type);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PluginsRecord}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PluginsRecord> {
+        @Nullable
+        private String id;
+
+        @Nullable
+        private String name;
+
+        @Nullable
+        private String component;
+
+        @Nullable
+        private String version;
+
+        @Nullable
+        private String description;
+
+        @Nullable
+        private String type;
+
+        /**
+         * unique node id
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * node name
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(@Nullable String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * component
+         * <p>
+         * API name: {@code component}
+         */
+        public final Builder component(@Nullable String value) {
+            this.component = value;
+            return this;
+        }
+
+        /**
+         * component version
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * plugin details
+         * <p>
+         * API name: {@code description}
+         */
+        public final Builder description(@Nullable String value) {
+            this.description = value;
+            return this;
+        }
+
+        /**
+         * plugin type
+         * <p>
+         * API name: {@code type}
+         */
+        public final Builder type(@Nullable String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link PluginsRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PluginsRecord build() {
+            _checkSingleUse();
+
+            return new PluginsRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PluginsRecord}
+     */
+    public static final JsonpDeserializer<PluginsRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PluginsRecord::setupPluginsRecordDeserializer
+    );
+
+    protected static void setupPluginsRecordDeserializer(ObjectDeserializer<PluginsRecord.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name", "n");
+        op.add(Builder::component, JsonpDeserializer.stringDeserializer(), "component", "c");
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version", "v");
+        op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description", "d");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type", "t");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/recovery/RecoveryRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/recovery/RecoveryRecord.java
index 7cf4fe0c0b..3921537f00 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/recovery/RecoveryRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/recovery/RecoveryRecord.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cat.recovery;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,929 +43,927 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cat.recovery.RecoveryRecord
 
-
 @JsonpDeserializable
 public class RecoveryRecord implements JsonpSerializable {
-	@Nullable
-	private final String index;
+    @Nullable
+    private final String index;
 
-	@Nullable
-	private final String shard;
+    @Nullable
+    private final String shard;
 
-	@Nullable
-	private final String startTime;
+    @Nullable
+    private final String startTime;
 
-	@Nullable
-	private final String startTimeMillis;
+    @Nullable
+    private final String startTimeMillis;
 
-	@Nullable
-	private final String stopTime;
+    @Nullable
+    private final String stopTime;
 
-	@Nullable
-	private final String stopTimeMillis;
+    @Nullable
+    private final String stopTimeMillis;
 
-	@Nullable
-	private final String time;
+    @Nullable
+    private final String time;
 
-	@Nullable
-	private final String type;
+    @Nullable
+    private final String type;
 
-	@Nullable
-	private final String stage;
+    @Nullable
+    private final String stage;
 
-	@Nullable
-	private final String sourceHost;
+    @Nullable
+    private final String sourceHost;
 
-	@Nullable
-	private final String sourceNode;
-
-	@Nullable
-	private final String targetHost;
-
-	@Nullable
-	private final String targetNode;
-
-	@Nullable
-	private final String repository;
-
-	@Nullable
-	private final String snapshot;
-
-	@Nullable
-	private final String files;
-
-	@Nullable
-	private final String filesRecovered;
-
-	@Nullable
-	private final String filesPercent;
-
-	@Nullable
-	private final String filesTotal;
-
-	@Nullable
-	private final String bytes;
-
-	@Nullable
-	private final String bytesRecovered;
-
-	@Nullable
-	private final String bytesPercent;
-
-	@Nullable
-	private final String bytesTotal;
-
-	@Nullable
-	private final String translogOps;
-
-	@Nullable
-	private final String translogOpsRecovered;
-
-	@Nullable
-	private final String translogOpsPercent;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RecoveryRecord(Builder builder) {
-
-		this.index = builder.index;
-		this.shard = builder.shard;
-		this.startTime = builder.startTime;
-		this.startTimeMillis = builder.startTimeMillis;
-		this.stopTime = builder.stopTime;
-		this.stopTimeMillis = builder.stopTimeMillis;
-		this.time = builder.time;
-		this.type = builder.type;
-		this.stage = builder.stage;
-		this.sourceHost = builder.sourceHost;
-		this.sourceNode = builder.sourceNode;
-		this.targetHost = builder.targetHost;
-		this.targetNode = builder.targetNode;
-		this.repository = builder.repository;
-		this.snapshot = builder.snapshot;
-		this.files = builder.files;
-		this.filesRecovered = builder.filesRecovered;
-		this.filesPercent = builder.filesPercent;
-		this.filesTotal = builder.filesTotal;
-		this.bytes = builder.bytes;
-		this.bytesRecovered = builder.bytesRecovered;
-		this.bytesPercent = builder.bytesPercent;
-		this.bytesTotal = builder.bytesTotal;
-		this.translogOps = builder.translogOps;
-		this.translogOpsRecovered = builder.translogOpsRecovered;
-		this.translogOpsPercent = builder.translogOpsPercent;
-
-	}
-
-	public static RecoveryRecord of(Function<Builder, ObjectBuilder<RecoveryRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * index name
-	 * <p>
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * shard name
-	 * <p>
-	 * API name: {@code shard}
-	 */
-	@Nullable
-	public final String shard() {
-		return this.shard;
-	}
-
-	/**
-	 * recovery start time
-	 * <p>
-	 * API name: {@code start_time}
-	 */
-	@Nullable
-	public final String startTime() {
-		return this.startTime;
-	}
-
-	/**
-	 * recovery start time in epoch milliseconds
-	 * <p>
-	 * API name: {@code start_time_millis}
-	 */
-	@Nullable
-	public final String startTimeMillis() {
-		return this.startTimeMillis;
-	}
-
-	/**
-	 * recovery stop time
-	 * <p>
-	 * API name: {@code stop_time}
-	 */
-	@Nullable
-	public final String stopTime() {
-		return this.stopTime;
-	}
-
-	/**
-	 * recovery stop time in epoch milliseconds
-	 * <p>
-	 * API name: {@code stop_time_millis}
-	 */
-	@Nullable
-	public final String stopTimeMillis() {
-		return this.stopTimeMillis;
-	}
-
-	/**
-	 * recovery time
-	 * <p>
-	 * API name: {@code time}
-	 */
-	@Nullable
-	public final String time() {
-		return this.time;
-	}
-
-	/**
-	 * recovery type
-	 * <p>
-	 * API name: {@code type}
-	 */
-	@Nullable
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * recovery stage
-	 * <p>
-	 * API name: {@code stage}
-	 */
-	@Nullable
-	public final String stage() {
-		return this.stage;
-	}
-
-	/**
-	 * source host
-	 * <p>
-	 * API name: {@code source_host}
-	 */
-	@Nullable
-	public final String sourceHost() {
-		return this.sourceHost;
-	}
-
-	/**
-	 * source node name
-	 * <p>
-	 * API name: {@code source_node}
-	 */
-	@Nullable
-	public final String sourceNode() {
-		return this.sourceNode;
-	}
-
-	/**
-	 * target host
-	 * <p>
-	 * API name: {@code target_host}
-	 */
-	@Nullable
-	public final String targetHost() {
-		return this.targetHost;
-	}
-
-	/**
-	 * target node name
-	 * <p>
-	 * API name: {@code target_node}
-	 */
-	@Nullable
-	public final String targetNode() {
-		return this.targetNode;
-	}
-
-	/**
-	 * repository
-	 * <p>
-	 * API name: {@code repository}
-	 */
-	@Nullable
-	public final String repository() {
-		return this.repository;
-	}
-
-	/**
-	 * snapshot
-	 * <p>
-	 * API name: {@code snapshot}
-	 */
-	@Nullable
-	public final String snapshot() {
-		return this.snapshot;
-	}
-
-	/**
-	 * number of files to recover
-	 * <p>
-	 * API name: {@code files}
-	 */
-	@Nullable
-	public final String files() {
-		return this.files;
-	}
-
-	/**
-	 * files recovered
-	 * <p>
-	 * API name: {@code files_recovered}
-	 */
-	@Nullable
-	public final String filesRecovered() {
-		return this.filesRecovered;
-	}
-
-	/**
-	 * percent of files recovered
-	 * <p>
-	 * API name: {@code files_percent}
-	 */
-	@Nullable
-	public final String filesPercent() {
-		return this.filesPercent;
-	}
-
-	/**
-	 * total number of files
-	 * <p>
-	 * API name: {@code files_total}
-	 */
-	@Nullable
-	public final String filesTotal() {
-		return this.filesTotal;
-	}
-
-	/**
-	 * number of bytes to recover
-	 * <p>
-	 * API name: {@code bytes}
-	 */
-	@Nullable
-	public final String bytes() {
-		return this.bytes;
-	}
-
-	/**
-	 * bytes recovered
-	 * <p>
-	 * API name: {@code bytes_recovered}
-	 */
-	@Nullable
-	public final String bytesRecovered() {
-		return this.bytesRecovered;
-	}
-
-	/**
-	 * percent of bytes recovered
-	 * <p>
-	 * API name: {@code bytes_percent}
-	 */
-	@Nullable
-	public final String bytesPercent() {
-		return this.bytesPercent;
-	}
-
-	/**
-	 * total number of bytes
-	 * <p>
-	 * API name: {@code bytes_total}
-	 */
-	@Nullable
-	public final String bytesTotal() {
-		return this.bytesTotal;
-	}
-
-	/**
-	 * number of translog ops to recover
-	 * <p>
-	 * API name: {@code translog_ops}
-	 */
-	@Nullable
-	public final String translogOps() {
-		return this.translogOps;
-	}
-
-	/**
-	 * translog ops recovered
-	 * <p>
-	 * API name: {@code translog_ops_recovered}
-	 */
-	@Nullable
-	public final String translogOpsRecovered() {
-		return this.translogOpsRecovered;
-	}
-
-	/**
-	 * percent of translog ops recovered
-	 * <p>
-	 * API name: {@code translog_ops_percent}
-	 */
-	@Nullable
-	public final String translogOpsPercent() {
-		return this.translogOpsPercent;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.shard != null) {
-			generator.writeKey("shard");
-			generator.write(this.shard);
-
-		}
-		if (this.startTime != null) {
-			generator.writeKey("start_time");
-			generator.write(this.startTime);
-
-		}
-		if (this.startTimeMillis != null) {
-			generator.writeKey("start_time_millis");
-			generator.write(this.startTimeMillis);
-
-		}
-		if (this.stopTime != null) {
-			generator.writeKey("stop_time");
-			generator.write(this.stopTime);
-
-		}
-		if (this.stopTimeMillis != null) {
-			generator.writeKey("stop_time_millis");
-			generator.write(this.stopTimeMillis);
-
-		}
-		if (this.time != null) {
-			generator.writeKey("time");
-			generator.write(this.time);
-
-		}
-		if (this.type != null) {
-			generator.writeKey("type");
-			generator.write(this.type);
-
-		}
-		if (this.stage != null) {
-			generator.writeKey("stage");
-			generator.write(this.stage);
-
-		}
-		if (this.sourceHost != null) {
-			generator.writeKey("source_host");
-			generator.write(this.sourceHost);
-
-		}
-		if (this.sourceNode != null) {
-			generator.writeKey("source_node");
-			generator.write(this.sourceNode);
-
-		}
-		if (this.targetHost != null) {
-			generator.writeKey("target_host");
-			generator.write(this.targetHost);
-
-		}
-		if (this.targetNode != null) {
-			generator.writeKey("target_node");
-			generator.write(this.targetNode);
-
-		}
-		if (this.repository != null) {
-			generator.writeKey("repository");
-			generator.write(this.repository);
-
-		}
-		if (this.snapshot != null) {
-			generator.writeKey("snapshot");
-			generator.write(this.snapshot);
-
-		}
-		if (this.files != null) {
-			generator.writeKey("files");
-			generator.write(this.files);
-
-		}
-		if (this.filesRecovered != null) {
-			generator.writeKey("files_recovered");
-			generator.write(this.filesRecovered);
-
-		}
-		if (this.filesPercent != null) {
-			generator.writeKey("files_percent");
-			generator.write(this.filesPercent);
-
-		}
-		if (this.filesTotal != null) {
-			generator.writeKey("files_total");
-			generator.write(this.filesTotal);
+    @Nullable
+    private final String sourceNode;
+
+    @Nullable
+    private final String targetHost;
+
+    @Nullable
+    private final String targetNode;
+
+    @Nullable
+    private final String repository;
+
+    @Nullable
+    private final String snapshot;
+
+    @Nullable
+    private final String files;
+
+    @Nullable
+    private final String filesRecovered;
+
+    @Nullable
+    private final String filesPercent;
+
+    @Nullable
+    private final String filesTotal;
+
+    @Nullable
+    private final String bytes;
+
+    @Nullable
+    private final String bytesRecovered;
+
+    @Nullable
+    private final String bytesPercent;
+
+    @Nullable
+    private final String bytesTotal;
+
+    @Nullable
+    private final String translogOps;
+
+    @Nullable
+    private final String translogOpsRecovered;
+
+    @Nullable
+    private final String translogOpsPercent;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RecoveryRecord(Builder builder) {
+
+        this.index = builder.index;
+        this.shard = builder.shard;
+        this.startTime = builder.startTime;
+        this.startTimeMillis = builder.startTimeMillis;
+        this.stopTime = builder.stopTime;
+        this.stopTimeMillis = builder.stopTimeMillis;
+        this.time = builder.time;
+        this.type = builder.type;
+        this.stage = builder.stage;
+        this.sourceHost = builder.sourceHost;
+        this.sourceNode = builder.sourceNode;
+        this.targetHost = builder.targetHost;
+        this.targetNode = builder.targetNode;
+        this.repository = builder.repository;
+        this.snapshot = builder.snapshot;
+        this.files = builder.files;
+        this.filesRecovered = builder.filesRecovered;
+        this.filesPercent = builder.filesPercent;
+        this.filesTotal = builder.filesTotal;
+        this.bytes = builder.bytes;
+        this.bytesRecovered = builder.bytesRecovered;
+        this.bytesPercent = builder.bytesPercent;
+        this.bytesTotal = builder.bytesTotal;
+        this.translogOps = builder.translogOps;
+        this.translogOpsRecovered = builder.translogOpsRecovered;
+        this.translogOpsPercent = builder.translogOpsPercent;
+
+    }
+
+    public static RecoveryRecord of(Function<Builder, ObjectBuilder<RecoveryRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * index name
+     * <p>
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * shard name
+     * <p>
+     * API name: {@code shard}
+     */
+    @Nullable
+    public final String shard() {
+        return this.shard;
+    }
+
+    /**
+     * recovery start time
+     * <p>
+     * API name: {@code start_time}
+     */
+    @Nullable
+    public final String startTime() {
+        return this.startTime;
+    }
+
+    /**
+     * recovery start time in epoch milliseconds
+     * <p>
+     * API name: {@code start_time_millis}
+     */
+    @Nullable
+    public final String startTimeMillis() {
+        return this.startTimeMillis;
+    }
+
+    /**
+     * recovery stop time
+     * <p>
+     * API name: {@code stop_time}
+     */
+    @Nullable
+    public final String stopTime() {
+        return this.stopTime;
+    }
+
+    /**
+     * recovery stop time in epoch milliseconds
+     * <p>
+     * API name: {@code stop_time_millis}
+     */
+    @Nullable
+    public final String stopTimeMillis() {
+        return this.stopTimeMillis;
+    }
+
+    /**
+     * recovery time
+     * <p>
+     * API name: {@code time}
+     */
+    @Nullable
+    public final String time() {
+        return this.time;
+    }
+
+    /**
+     * recovery type
+     * <p>
+     * API name: {@code type}
+     */
+    @Nullable
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * recovery stage
+     * <p>
+     * API name: {@code stage}
+     */
+    @Nullable
+    public final String stage() {
+        return this.stage;
+    }
+
+    /**
+     * source host
+     * <p>
+     * API name: {@code source_host}
+     */
+    @Nullable
+    public final String sourceHost() {
+        return this.sourceHost;
+    }
+
+    /**
+     * source node name
+     * <p>
+     * API name: {@code source_node}
+     */
+    @Nullable
+    public final String sourceNode() {
+        return this.sourceNode;
+    }
+
+    /**
+     * target host
+     * <p>
+     * API name: {@code target_host}
+     */
+    @Nullable
+    public final String targetHost() {
+        return this.targetHost;
+    }
+
+    /**
+     * target node name
+     * <p>
+     * API name: {@code target_node}
+     */
+    @Nullable
+    public final String targetNode() {
+        return this.targetNode;
+    }
+
+    /**
+     * repository
+     * <p>
+     * API name: {@code repository}
+     */
+    @Nullable
+    public final String repository() {
+        return this.repository;
+    }
+
+    /**
+     * snapshot
+     * <p>
+     * API name: {@code snapshot}
+     */
+    @Nullable
+    public final String snapshot() {
+        return this.snapshot;
+    }
+
+    /**
+     * number of files to recover
+     * <p>
+     * API name: {@code files}
+     */
+    @Nullable
+    public final String files() {
+        return this.files;
+    }
+
+    /**
+     * files recovered
+     * <p>
+     * API name: {@code files_recovered}
+     */
+    @Nullable
+    public final String filesRecovered() {
+        return this.filesRecovered;
+    }
+
+    /**
+     * percent of files recovered
+     * <p>
+     * API name: {@code files_percent}
+     */
+    @Nullable
+    public final String filesPercent() {
+        return this.filesPercent;
+    }
+
+    /**
+     * total number of files
+     * <p>
+     * API name: {@code files_total}
+     */
+    @Nullable
+    public final String filesTotal() {
+        return this.filesTotal;
+    }
+
+    /**
+     * number of bytes to recover
+     * <p>
+     * API name: {@code bytes}
+     */
+    @Nullable
+    public final String bytes() {
+        return this.bytes;
+    }
+
+    /**
+     * bytes recovered
+     * <p>
+     * API name: {@code bytes_recovered}
+     */
+    @Nullable
+    public final String bytesRecovered() {
+        return this.bytesRecovered;
+    }
+
+    /**
+     * percent of bytes recovered
+     * <p>
+     * API name: {@code bytes_percent}
+     */
+    @Nullable
+    public final String bytesPercent() {
+        return this.bytesPercent;
+    }
+
+    /**
+     * total number of bytes
+     * <p>
+     * API name: {@code bytes_total}
+     */
+    @Nullable
+    public final String bytesTotal() {
+        return this.bytesTotal;
+    }
+
+    /**
+     * number of translog ops to recover
+     * <p>
+     * API name: {@code translog_ops}
+     */
+    @Nullable
+    public final String translogOps() {
+        return this.translogOps;
+    }
+
+    /**
+     * translog ops recovered
+     * <p>
+     * API name: {@code translog_ops_recovered}
+     */
+    @Nullable
+    public final String translogOpsRecovered() {
+        return this.translogOpsRecovered;
+    }
+
+    /**
+     * percent of translog ops recovered
+     * <p>
+     * API name: {@code translog_ops_percent}
+     */
+    @Nullable
+    public final String translogOpsPercent() {
+        return this.translogOpsPercent;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.shard != null) {
+            generator.writeKey("shard");
+            generator.write(this.shard);
+
+        }
+        if (this.startTime != null) {
+            generator.writeKey("start_time");
+            generator.write(this.startTime);
+
+        }
+        if (this.startTimeMillis != null) {
+            generator.writeKey("start_time_millis");
+            generator.write(this.startTimeMillis);
+
+        }
+        if (this.stopTime != null) {
+            generator.writeKey("stop_time");
+            generator.write(this.stopTime);
+
+        }
+        if (this.stopTimeMillis != null) {
+            generator.writeKey("stop_time_millis");
+            generator.write(this.stopTimeMillis);
+
+        }
+        if (this.time != null) {
+            generator.writeKey("time");
+            generator.write(this.time);
+
+        }
+        if (this.type != null) {
+            generator.writeKey("type");
+            generator.write(this.type);
+
+        }
+        if (this.stage != null) {
+            generator.writeKey("stage");
+            generator.write(this.stage);
+
+        }
+        if (this.sourceHost != null) {
+            generator.writeKey("source_host");
+            generator.write(this.sourceHost);
+
+        }
+        if (this.sourceNode != null) {
+            generator.writeKey("source_node");
+            generator.write(this.sourceNode);
+
+        }
+        if (this.targetHost != null) {
+            generator.writeKey("target_host");
+            generator.write(this.targetHost);
+
+        }
+        if (this.targetNode != null) {
+            generator.writeKey("target_node");
+            generator.write(this.targetNode);
+
+        }
+        if (this.repository != null) {
+            generator.writeKey("repository");
+            generator.write(this.repository);
+
+        }
+        if (this.snapshot != null) {
+            generator.writeKey("snapshot");
+            generator.write(this.snapshot);
+
+        }
+        if (this.files != null) {
+            generator.writeKey("files");
+            generator.write(this.files);
+
+        }
+        if (this.filesRecovered != null) {
+            generator.writeKey("files_recovered");
+            generator.write(this.filesRecovered);
+
+        }
+        if (this.filesPercent != null) {
+            generator.writeKey("files_percent");
+            generator.write(this.filesPercent);
+
+        }
+        if (this.filesTotal != null) {
+            generator.writeKey("files_total");
+            generator.write(this.filesTotal);
 
-		}
-		if (this.bytes != null) {
-			generator.writeKey("bytes");
-			generator.write(this.bytes);
+        }
+        if (this.bytes != null) {
+            generator.writeKey("bytes");
+            generator.write(this.bytes);
 
-		}
-		if (this.bytesRecovered != null) {
-			generator.writeKey("bytes_recovered");
-			generator.write(this.bytesRecovered);
+        }
+        if (this.bytesRecovered != null) {
+            generator.writeKey("bytes_recovered");
+            generator.write(this.bytesRecovered);
 
-		}
-		if (this.bytesPercent != null) {
-			generator.writeKey("bytes_percent");
-			generator.write(this.bytesPercent);
+        }
+        if (this.bytesPercent != null) {
+            generator.writeKey("bytes_percent");
+            generator.write(this.bytesPercent);
 
-		}
-		if (this.bytesTotal != null) {
-			generator.writeKey("bytes_total");
-			generator.write(this.bytesTotal);
+        }
+        if (this.bytesTotal != null) {
+            generator.writeKey("bytes_total");
+            generator.write(this.bytesTotal);
 
-		}
-		if (this.translogOps != null) {
-			generator.writeKey("translog_ops");
-			generator.write(this.translogOps);
+        }
+        if (this.translogOps != null) {
+            generator.writeKey("translog_ops");
+            generator.write(this.translogOps);
 
-		}
-		if (this.translogOpsRecovered != null) {
-			generator.writeKey("translog_ops_recovered");
-			generator.write(this.translogOpsRecovered);
+        }
+        if (this.translogOpsRecovered != null) {
+            generator.writeKey("translog_ops_recovered");
+            generator.write(this.translogOpsRecovered);
 
-		}
-		if (this.translogOpsPercent != null) {
-			generator.writeKey("translog_ops_percent");
-			generator.write(this.translogOpsPercent);
+        }
+        if (this.translogOpsPercent != null) {
+            generator.writeKey("translog_ops_percent");
+            generator.write(this.translogOpsPercent);
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link RecoveryRecord}.
-	 */
+    /**
+     * Builder for {@link RecoveryRecord}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryRecord> {
-		@Nullable
-		private String index;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryRecord> {
+        @Nullable
+        private String index;
 
-		@Nullable
-		private String shard;
-
-		@Nullable
-		private String startTime;
+        @Nullable
+        private String shard;
+
+        @Nullable
+        private String startTime;
 
-		@Nullable
-		private String startTimeMillis;
-
-		@Nullable
-		private String stopTime;
-
-		@Nullable
-		private String stopTimeMillis;
-
-		@Nullable
-		private String time;
-
-		@Nullable
-		private String type;
-
-		@Nullable
-		private String stage;
-
-		@Nullable
-		private String sourceHost;
-
-		@Nullable
-		private String sourceNode;
-
-		@Nullable
-		private String targetHost;
-
-		@Nullable
-		private String targetNode;
-
-		@Nullable
-		private String repository;
-
-		@Nullable
-		private String snapshot;
-
-		@Nullable
-		private String files;
-
-		@Nullable
-		private String filesRecovered;
-
-		@Nullable
-		private String filesPercent;
-
-		@Nullable
-		private String filesTotal;
-
-		@Nullable
-		private String bytes;
-
-		@Nullable
-		private String bytesRecovered;
-
-		@Nullable
-		private String bytesPercent;
-
-		@Nullable
-		private String bytesTotal;
-
-		@Nullable
-		private String translogOps;
-
-		@Nullable
-		private String translogOpsRecovered;
-
-		@Nullable
-		private String translogOpsPercent;
-
-		/**
-		 * index name
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * shard name
-		 * <p>
-		 * API name: {@code shard}
-		 */
-		public final Builder shard(@Nullable String value) {
-			this.shard = value;
-			return this;
-		}
-
-		/**
-		 * recovery start time
-		 * <p>
-		 * API name: {@code start_time}
-		 */
-		public final Builder startTime(@Nullable String value) {
-			this.startTime = value;
-			return this;
-		}
-
-		/**
-		 * recovery start time in epoch milliseconds
-		 * <p>
-		 * API name: {@code start_time_millis}
-		 */
-		public final Builder startTimeMillis(@Nullable String value) {
-			this.startTimeMillis = value;
-			return this;
-		}
-
-		/**
-		 * recovery stop time
-		 * <p>
-		 * API name: {@code stop_time}
-		 */
-		public final Builder stopTime(@Nullable String value) {
-			this.stopTime = value;
-			return this;
-		}
-
-		/**
-		 * recovery stop time in epoch milliseconds
-		 * <p>
-		 * API name: {@code stop_time_millis}
-		 */
-		public final Builder stopTimeMillis(@Nullable String value) {
-			this.stopTimeMillis = value;
-			return this;
-		}
-
-		/**
-		 * recovery time
-		 * <p>
-		 * API name: {@code time}
-		 */
-		public final Builder time(@Nullable String value) {
-			this.time = value;
-			return this;
-		}
-
-		/**
-		 * recovery type
-		 * <p>
-		 * API name: {@code type}
-		 */
-		public final Builder type(@Nullable String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * recovery stage
-		 * <p>
-		 * API name: {@code stage}
-		 */
-		public final Builder stage(@Nullable String value) {
-			this.stage = value;
-			return this;
-		}
-
-		/**
-		 * source host
-		 * <p>
-		 * API name: {@code source_host}
-		 */
-		public final Builder sourceHost(@Nullable String value) {
-			this.sourceHost = value;
-			return this;
-		}
-
-		/**
-		 * source node name
-		 * <p>
-		 * API name: {@code source_node}
-		 */
-		public final Builder sourceNode(@Nullable String value) {
-			this.sourceNode = value;
-			return this;
-		}
-
-		/**
-		 * target host
-		 * <p>
-		 * API name: {@code target_host}
-		 */
-		public final Builder targetHost(@Nullable String value) {
-			this.targetHost = value;
-			return this;
-		}
-
-		/**
-		 * target node name
-		 * <p>
-		 * API name: {@code target_node}
-		 */
-		public final Builder targetNode(@Nullable String value) {
-			this.targetNode = value;
-			return this;
-		}
-
-		/**
-		 * repository
-		 * <p>
-		 * API name: {@code repository}
-		 */
-		public final Builder repository(@Nullable String value) {
-			this.repository = value;
-			return this;
-		}
-
-		/**
-		 * snapshot
-		 * <p>
-		 * API name: {@code snapshot}
-		 */
-		public final Builder snapshot(@Nullable String value) {
-			this.snapshot = value;
-			return this;
-		}
-
-		/**
-		 * number of files to recover
-		 * <p>
-		 * API name: {@code files}
-		 */
-		public final Builder files(@Nullable String value) {
-			this.files = value;
-			return this;
-		}
-
-		/**
-		 * files recovered
-		 * <p>
-		 * API name: {@code files_recovered}
-		 */
-		public final Builder filesRecovered(@Nullable String value) {
-			this.filesRecovered = value;
-			return this;
-		}
-
-		/**
-		 * percent of files recovered
-		 * <p>
-		 * API name: {@code files_percent}
-		 */
-		public final Builder filesPercent(@Nullable String value) {
-			this.filesPercent = value;
-			return this;
-		}
-
-		/**
-		 * total number of files
-		 * <p>
-		 * API name: {@code files_total}
-		 */
-		public final Builder filesTotal(@Nullable String value) {
-			this.filesTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of bytes to recover
-		 * <p>
-		 * API name: {@code bytes}
-		 */
-		public final Builder bytes(@Nullable String value) {
-			this.bytes = value;
-			return this;
-		}
-
-		/**
-		 * bytes recovered
-		 * <p>
-		 * API name: {@code bytes_recovered}
-		 */
-		public final Builder bytesRecovered(@Nullable String value) {
-			this.bytesRecovered = value;
-			return this;
-		}
-
-		/**
-		 * percent of bytes recovered
-		 * <p>
-		 * API name: {@code bytes_percent}
-		 */
-		public final Builder bytesPercent(@Nullable String value) {
-			this.bytesPercent = value;
-			return this;
-		}
-
-		/**
-		 * total number of bytes
-		 * <p>
-		 * API name: {@code bytes_total}
-		 */
-		public final Builder bytesTotal(@Nullable String value) {
-			this.bytesTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of translog ops to recover
-		 * <p>
-		 * API name: {@code translog_ops}
-		 */
-		public final Builder translogOps(@Nullable String value) {
-			this.translogOps = value;
-			return this;
-		}
-
-		/**
-		 * translog ops recovered
-		 * <p>
-		 * API name: {@code translog_ops_recovered}
-		 */
-		public final Builder translogOpsRecovered(@Nullable String value) {
-			this.translogOpsRecovered = value;
-			return this;
-		}
-
-		/**
-		 * percent of translog ops recovered
-		 * <p>
-		 * API name: {@code translog_ops_percent}
-		 */
-		public final Builder translogOpsPercent(@Nullable String value) {
-			this.translogOpsPercent = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RecoveryRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RecoveryRecord build() {
-			_checkSingleUse();
-
-			return new RecoveryRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RecoveryRecord}
-	 */
-	public static final JsonpDeserializer<RecoveryRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RecoveryRecord::setupRecoveryRecordDeserializer);
-
-	protected static void setupRecoveryRecordDeserializer(ObjectDeserializer<RecoveryRecord.Builder> op) {
-
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index", "i", "idx");
-		op.add(Builder::shard, JsonpDeserializer.stringDeserializer(), "shard", "s", "sh");
-		op.add(Builder::startTime, JsonpDeserializer.stringDeserializer(), "start_time", "start");
-		op.add(Builder::startTimeMillis, JsonpDeserializer.stringDeserializer(), "start_time_millis", "start_millis");
-		op.add(Builder::stopTime, JsonpDeserializer.stringDeserializer(), "stop_time", "stop");
-		op.add(Builder::stopTimeMillis, JsonpDeserializer.stringDeserializer(), "stop_time_millis", "stop_millis");
-		op.add(Builder::time, JsonpDeserializer.stringDeserializer(), "time", "t", "ti");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type", "ty");
-		op.add(Builder::stage, JsonpDeserializer.stringDeserializer(), "stage", "st");
-		op.add(Builder::sourceHost, JsonpDeserializer.stringDeserializer(), "source_host", "shost");
-		op.add(Builder::sourceNode, JsonpDeserializer.stringDeserializer(), "source_node", "snode");
-		op.add(Builder::targetHost, JsonpDeserializer.stringDeserializer(), "target_host", "thost");
-		op.add(Builder::targetNode, JsonpDeserializer.stringDeserializer(), "target_node", "tnode");
-		op.add(Builder::repository, JsonpDeserializer.stringDeserializer(), "repository", "rep");
-		op.add(Builder::snapshot, JsonpDeserializer.stringDeserializer(), "snapshot", "snap");
-		op.add(Builder::files, JsonpDeserializer.stringDeserializer(), "files", "f");
-		op.add(Builder::filesRecovered, JsonpDeserializer.stringDeserializer(), "files_recovered", "fr");
-		op.add(Builder::filesPercent, JsonpDeserializer.stringDeserializer(), "files_percent", "fp");
-		op.add(Builder::filesTotal, JsonpDeserializer.stringDeserializer(), "files_total", "tf");
-		op.add(Builder::bytes, JsonpDeserializer.stringDeserializer(), "bytes", "b");
-		op.add(Builder::bytesRecovered, JsonpDeserializer.stringDeserializer(), "bytes_recovered", "br");
-		op.add(Builder::bytesPercent, JsonpDeserializer.stringDeserializer(), "bytes_percent", "bp");
-		op.add(Builder::bytesTotal, JsonpDeserializer.stringDeserializer(), "bytes_total", "tb");
-		op.add(Builder::translogOps, JsonpDeserializer.stringDeserializer(), "translog_ops", "to");
-		op.add(Builder::translogOpsRecovered, JsonpDeserializer.stringDeserializer(), "translog_ops_recovered", "tor");
-		op.add(Builder::translogOpsPercent, JsonpDeserializer.stringDeserializer(), "translog_ops_percent", "top");
-
-	}
+        @Nullable
+        private String startTimeMillis;
+
+        @Nullable
+        private String stopTime;
+
+        @Nullable
+        private String stopTimeMillis;
+
+        @Nullable
+        private String time;
+
+        @Nullable
+        private String type;
+
+        @Nullable
+        private String stage;
+
+        @Nullable
+        private String sourceHost;
+
+        @Nullable
+        private String sourceNode;
+
+        @Nullable
+        private String targetHost;
+
+        @Nullable
+        private String targetNode;
+
+        @Nullable
+        private String repository;
+
+        @Nullable
+        private String snapshot;
+
+        @Nullable
+        private String files;
+
+        @Nullable
+        private String filesRecovered;
+
+        @Nullable
+        private String filesPercent;
+
+        @Nullable
+        private String filesTotal;
+
+        @Nullable
+        private String bytes;
+
+        @Nullable
+        private String bytesRecovered;
+
+        @Nullable
+        private String bytesPercent;
+
+        @Nullable
+        private String bytesTotal;
+
+        @Nullable
+        private String translogOps;
+
+        @Nullable
+        private String translogOpsRecovered;
+
+        @Nullable
+        private String translogOpsPercent;
+
+        /**
+         * index name
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * shard name
+         * <p>
+         * API name: {@code shard}
+         */
+        public final Builder shard(@Nullable String value) {
+            this.shard = value;
+            return this;
+        }
+
+        /**
+         * recovery start time
+         * <p>
+         * API name: {@code start_time}
+         */
+        public final Builder startTime(@Nullable String value) {
+            this.startTime = value;
+            return this;
+        }
+
+        /**
+         * recovery start time in epoch milliseconds
+         * <p>
+         * API name: {@code start_time_millis}
+         */
+        public final Builder startTimeMillis(@Nullable String value) {
+            this.startTimeMillis = value;
+            return this;
+        }
+
+        /**
+         * recovery stop time
+         * <p>
+         * API name: {@code stop_time}
+         */
+        public final Builder stopTime(@Nullable String value) {
+            this.stopTime = value;
+            return this;
+        }
+
+        /**
+         * recovery stop time in epoch milliseconds
+         * <p>
+         * API name: {@code stop_time_millis}
+         */
+        public final Builder stopTimeMillis(@Nullable String value) {
+            this.stopTimeMillis = value;
+            return this;
+        }
+
+        /**
+         * recovery time
+         * <p>
+         * API name: {@code time}
+         */
+        public final Builder time(@Nullable String value) {
+            this.time = value;
+            return this;
+        }
+
+        /**
+         * recovery type
+         * <p>
+         * API name: {@code type}
+         */
+        public final Builder type(@Nullable String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * recovery stage
+         * <p>
+         * API name: {@code stage}
+         */
+        public final Builder stage(@Nullable String value) {
+            this.stage = value;
+            return this;
+        }
+
+        /**
+         * source host
+         * <p>
+         * API name: {@code source_host}
+         */
+        public final Builder sourceHost(@Nullable String value) {
+            this.sourceHost = value;
+            return this;
+        }
+
+        /**
+         * source node name
+         * <p>
+         * API name: {@code source_node}
+         */
+        public final Builder sourceNode(@Nullable String value) {
+            this.sourceNode = value;
+            return this;
+        }
+
+        /**
+         * target host
+         * <p>
+         * API name: {@code target_host}
+         */
+        public final Builder targetHost(@Nullable String value) {
+            this.targetHost = value;
+            return this;
+        }
+
+        /**
+         * target node name
+         * <p>
+         * API name: {@code target_node}
+         */
+        public final Builder targetNode(@Nullable String value) {
+            this.targetNode = value;
+            return this;
+        }
+
+        /**
+         * repository
+         * <p>
+         * API name: {@code repository}
+         */
+        public final Builder repository(@Nullable String value) {
+            this.repository = value;
+            return this;
+        }
+
+        /**
+         * snapshot
+         * <p>
+         * API name: {@code snapshot}
+         */
+        public final Builder snapshot(@Nullable String value) {
+            this.snapshot = value;
+            return this;
+        }
+
+        /**
+         * number of files to recover
+         * <p>
+         * API name: {@code files}
+         */
+        public final Builder files(@Nullable String value) {
+            this.files = value;
+            return this;
+        }
+
+        /**
+         * files recovered
+         * <p>
+         * API name: {@code files_recovered}
+         */
+        public final Builder filesRecovered(@Nullable String value) {
+            this.filesRecovered = value;
+            return this;
+        }
+
+        /**
+         * percent of files recovered
+         * <p>
+         * API name: {@code files_percent}
+         */
+        public final Builder filesPercent(@Nullable String value) {
+            this.filesPercent = value;
+            return this;
+        }
+
+        /**
+         * total number of files
+         * <p>
+         * API name: {@code files_total}
+         */
+        public final Builder filesTotal(@Nullable String value) {
+            this.filesTotal = value;
+            return this;
+        }
+
+        /**
+         * number of bytes to recover
+         * <p>
+         * API name: {@code bytes}
+         */
+        public final Builder bytes(@Nullable String value) {
+            this.bytes = value;
+            return this;
+        }
+
+        /**
+         * bytes recovered
+         * <p>
+         * API name: {@code bytes_recovered}
+         */
+        public final Builder bytesRecovered(@Nullable String value) {
+            this.bytesRecovered = value;
+            return this;
+        }
+
+        /**
+         * percent of bytes recovered
+         * <p>
+         * API name: {@code bytes_percent}
+         */
+        public final Builder bytesPercent(@Nullable String value) {
+            this.bytesPercent = value;
+            return this;
+        }
+
+        /**
+         * total number of bytes
+         * <p>
+         * API name: {@code bytes_total}
+         */
+        public final Builder bytesTotal(@Nullable String value) {
+            this.bytesTotal = value;
+            return this;
+        }
+
+        /**
+         * number of translog ops to recover
+         * <p>
+         * API name: {@code translog_ops}
+         */
+        public final Builder translogOps(@Nullable String value) {
+            this.translogOps = value;
+            return this;
+        }
+
+        /**
+         * translog ops recovered
+         * <p>
+         * API name: {@code translog_ops_recovered}
+         */
+        public final Builder translogOpsRecovered(@Nullable String value) {
+            this.translogOpsRecovered = value;
+            return this;
+        }
+
+        /**
+         * percent of translog ops recovered
+         * <p>
+         * API name: {@code translog_ops_percent}
+         */
+        public final Builder translogOpsPercent(@Nullable String value) {
+            this.translogOpsPercent = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RecoveryRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RecoveryRecord build() {
+            _checkSingleUse();
+
+            return new RecoveryRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RecoveryRecord}
+     */
+    public static final JsonpDeserializer<RecoveryRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RecoveryRecord::setupRecoveryRecordDeserializer
+    );
+
+    protected static void setupRecoveryRecordDeserializer(ObjectDeserializer<RecoveryRecord.Builder> op) {
+
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index", "i", "idx");
+        op.add(Builder::shard, JsonpDeserializer.stringDeserializer(), "shard", "s", "sh");
+        op.add(Builder::startTime, JsonpDeserializer.stringDeserializer(), "start_time", "start");
+        op.add(Builder::startTimeMillis, JsonpDeserializer.stringDeserializer(), "start_time_millis", "start_millis");
+        op.add(Builder::stopTime, JsonpDeserializer.stringDeserializer(), "stop_time", "stop");
+        op.add(Builder::stopTimeMillis, JsonpDeserializer.stringDeserializer(), "stop_time_millis", "stop_millis");
+        op.add(Builder::time, JsonpDeserializer.stringDeserializer(), "time", "t", "ti");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type", "ty");
+        op.add(Builder::stage, JsonpDeserializer.stringDeserializer(), "stage", "st");
+        op.add(Builder::sourceHost, JsonpDeserializer.stringDeserializer(), "source_host", "shost");
+        op.add(Builder::sourceNode, JsonpDeserializer.stringDeserializer(), "source_node", "snode");
+        op.add(Builder::targetHost, JsonpDeserializer.stringDeserializer(), "target_host", "thost");
+        op.add(Builder::targetNode, JsonpDeserializer.stringDeserializer(), "target_node", "tnode");
+        op.add(Builder::repository, JsonpDeserializer.stringDeserializer(), "repository", "rep");
+        op.add(Builder::snapshot, JsonpDeserializer.stringDeserializer(), "snapshot", "snap");
+        op.add(Builder::files, JsonpDeserializer.stringDeserializer(), "files", "f");
+        op.add(Builder::filesRecovered, JsonpDeserializer.stringDeserializer(), "files_recovered", "fr");
+        op.add(Builder::filesPercent, JsonpDeserializer.stringDeserializer(), "files_percent", "fp");
+        op.add(Builder::filesTotal, JsonpDeserializer.stringDeserializer(), "files_total", "tf");
+        op.add(Builder::bytes, JsonpDeserializer.stringDeserializer(), "bytes", "b");
+        op.add(Builder::bytesRecovered, JsonpDeserializer.stringDeserializer(), "bytes_recovered", "br");
+        op.add(Builder::bytesPercent, JsonpDeserializer.stringDeserializer(), "bytes_percent", "bp");
+        op.add(Builder::bytesTotal, JsonpDeserializer.stringDeserializer(), "bytes_total", "tb");
+        op.add(Builder::translogOps, JsonpDeserializer.stringDeserializer(), "translog_ops", "to");
+        op.add(Builder::translogOpsRecovered, JsonpDeserializer.stringDeserializer(), "translog_ops_recovered", "tor");
+        op.add(Builder::translogOpsPercent, JsonpDeserializer.stringDeserializer(), "translog_ops_percent", "top");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/repositories/RepositoriesRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/repositories/RepositoriesRecord.java
index bb15122358..df368d3a24 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/repositories/RepositoriesRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/repositories/RepositoriesRecord.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cat.repositories;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,137 +43,135 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cat.repositories.RepositoriesRecord
 
-
 @JsonpDeserializable
 public class RepositoriesRecord implements JsonpSerializable {
-	@Nullable
-	private final String id;
-
-	@Nullable
-	private final String type;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RepositoriesRecord(Builder builder) {
-
-		this.id = builder.id;
-		this.type = builder.type;
-
-	}
-
-	public static RepositoriesRecord of(Function<Builder, ObjectBuilder<RepositoriesRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * unique repository id
-	 * <p>
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * repository type
-	 * <p>
-	 * API name: {@code type}
-	 */
-	@Nullable
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.id != null) {
-			generator.writeKey("id");
-			generator.write(this.id);
-
-		}
-		if (this.type != null) {
-			generator.writeKey("type");
-			generator.write(this.type);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RepositoriesRecord}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RepositoriesRecord> {
-		@Nullable
-		private String id;
-
-		@Nullable
-		private String type;
-
-		/**
-		 * unique repository id
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * repository type
-		 * <p>
-		 * API name: {@code type}
-		 */
-		public final Builder type(@Nullable String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RepositoriesRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RepositoriesRecord build() {
-			_checkSingleUse();
-
-			return new RepositoriesRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RepositoriesRecord}
-	 */
-	public static final JsonpDeserializer<RepositoriesRecord> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RepositoriesRecord::setupRepositoriesRecordDeserializer);
-
-	protected static void setupRepositoriesRecordDeserializer(ObjectDeserializer<RepositoriesRecord.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id", "repoId");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type", "t");
-
-	}
+    @Nullable
+    private final String id;
+
+    @Nullable
+    private final String type;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RepositoriesRecord(Builder builder) {
+
+        this.id = builder.id;
+        this.type = builder.type;
+
+    }
+
+    public static RepositoriesRecord of(Function<Builder, ObjectBuilder<RepositoriesRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * unique repository id
+     * <p>
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * repository type
+     * <p>
+     * API name: {@code type}
+     */
+    @Nullable
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.id != null) {
+            generator.writeKey("id");
+            generator.write(this.id);
+
+        }
+        if (this.type != null) {
+            generator.writeKey("type");
+            generator.write(this.type);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RepositoriesRecord}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RepositoriesRecord> {
+        @Nullable
+        private String id;
+
+        @Nullable
+        private String type;
+
+        /**
+         * unique repository id
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * repository type
+         * <p>
+         * API name: {@code type}
+         */
+        public final Builder type(@Nullable String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RepositoriesRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RepositoriesRecord build() {
+            _checkSingleUse();
+
+            return new RepositoriesRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RepositoriesRecord}
+     */
+    public static final JsonpDeserializer<RepositoriesRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RepositoriesRecord::setupRepositoriesRecordDeserializer
+    );
+
+    protected static void setupRepositoriesRecordDeserializer(ObjectDeserializer<RepositoriesRecord.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id", "repoId");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type", "t");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/segments/SegmentsRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/segments/SegmentsRecord.java
index ea829d92c1..261f47f910 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/segments/SegmentsRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/segments/SegmentsRecord.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cat.segments;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,566 +43,564 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cat.segments.SegmentsRecord
 
-
 @JsonpDeserializable
 public class SegmentsRecord implements JsonpSerializable {
-	@Nullable
-	private final String index;
-
-	@Nullable
-	private final String shard;
-
-	@Nullable
-	private final String prirep;
-
-	@Nullable
-	private final String ip;
-
-	@Nullable
-	private final String id;
-
-	@Nullable
-	private final String segment;
-
-	@Nullable
-	private final String generation;
-
-	@Nullable
-	private final String docsCount;
-
-	@Nullable
-	private final String docsDeleted;
-
-	@Nullable
-	private final String size;
-
-	@Nullable
-	private final String sizeMemory;
-
-	@Nullable
-	private final String committed;
-
-	@Nullable
-	private final String searchable;
-
-	@Nullable
-	private final String version;
-
-	@Nullable
-	private final String compound;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SegmentsRecord(Builder builder) {
-
-		this.index = builder.index;
-		this.shard = builder.shard;
-		this.prirep = builder.prirep;
-		this.ip = builder.ip;
-		this.id = builder.id;
-		this.segment = builder.segment;
-		this.generation = builder.generation;
-		this.docsCount = builder.docsCount;
-		this.docsDeleted = builder.docsDeleted;
-		this.size = builder.size;
-		this.sizeMemory = builder.sizeMemory;
-		this.committed = builder.committed;
-		this.searchable = builder.searchable;
-		this.version = builder.version;
-		this.compound = builder.compound;
-
-	}
-
-	public static SegmentsRecord of(Function<Builder, ObjectBuilder<SegmentsRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * index name
-	 * <p>
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * shard name
-	 * <p>
-	 * API name: {@code shard}
-	 */
-	@Nullable
-	public final String shard() {
-		return this.shard;
-	}
-
-	/**
-	 * primary or replica
-	 * <p>
-	 * API name: {@code prirep}
-	 */
-	@Nullable
-	public final String prirep() {
-		return this.prirep;
-	}
-
-	/**
-	 * ip of node where it lives
-	 * <p>
-	 * API name: {@code ip}
-	 */
-	@Nullable
-	public final String ip() {
-		return this.ip;
-	}
-
-	/**
-	 * unique id of node where it lives
-	 * <p>
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * segment name
-	 * <p>
-	 * API name: {@code segment}
-	 */
-	@Nullable
-	public final String segment() {
-		return this.segment;
-	}
-
-	/**
-	 * segment generation
-	 * <p>
-	 * API name: {@code generation}
-	 */
-	@Nullable
-	public final String generation() {
-		return this.generation;
-	}
-
-	/**
-	 * number of docs in segment
-	 * <p>
-	 * API name: {@code docs.count}
-	 */
-	@Nullable
-	public final String docsCount() {
-		return this.docsCount;
-	}
-
-	/**
-	 * number of deleted docs in segment
-	 * <p>
-	 * API name: {@code docs.deleted}
-	 */
-	@Nullable
-	public final String docsDeleted() {
-		return this.docsDeleted;
-	}
-
-	/**
-	 * segment size in bytes
-	 * <p>
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final String size() {
-		return this.size;
-	}
-
-	/**
-	 * segment memory in bytes
-	 * <p>
-	 * API name: {@code size.memory}
-	 */
-	@Nullable
-	public final String sizeMemory() {
-		return this.sizeMemory;
-	}
-
-	/**
-	 * is segment committed
-	 * <p>
-	 * API name: {@code committed}
-	 */
-	@Nullable
-	public final String committed() {
-		return this.committed;
-	}
-
-	/**
-	 * is segment searched
-	 * <p>
-	 * API name: {@code searchable}
-	 */
-	@Nullable
-	public final String searchable() {
-		return this.searchable;
-	}
-
-	/**
-	 * version
-	 * <p>
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final String version() {
-		return this.version;
-	}
-
-	/**
-	 * is segment compound
-	 * <p>
-	 * API name: {@code compound}
-	 */
-	@Nullable
-	public final String compound() {
-		return this.compound;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.shard != null) {
-			generator.writeKey("shard");
-			generator.write(this.shard);
-
-		}
-		if (this.prirep != null) {
-			generator.writeKey("prirep");
-			generator.write(this.prirep);
-
-		}
-		if (this.ip != null) {
-			generator.writeKey("ip");
-			generator.write(this.ip);
-
-		}
-		if (this.id != null) {
-			generator.writeKey("id");
-			generator.write(this.id);
-
-		}
-		if (this.segment != null) {
-			generator.writeKey("segment");
-			generator.write(this.segment);
-
-		}
-		if (this.generation != null) {
-			generator.writeKey("generation");
-			generator.write(this.generation);
-
-		}
-		if (this.docsCount != null) {
-			generator.writeKey("docs.count");
-			generator.write(this.docsCount);
-
-		}
-		if (this.docsDeleted != null) {
-			generator.writeKey("docs.deleted");
-			generator.write(this.docsDeleted);
-
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		if (this.sizeMemory != null) {
-			generator.writeKey("size.memory");
-			generator.write(this.sizeMemory);
-
-		}
-		if (this.committed != null) {
-			generator.writeKey("committed");
-			generator.write(this.committed);
-
-		}
-		if (this.searchable != null) {
-			generator.writeKey("searchable");
-			generator.write(this.searchable);
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		if (this.compound != null) {
-			generator.writeKey("compound");
-			generator.write(this.compound);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SegmentsRecord}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SegmentsRecord> {
-		@Nullable
-		private String index;
-
-		@Nullable
-		private String shard;
-
-		@Nullable
-		private String prirep;
-
-		@Nullable
-		private String ip;
-
-		@Nullable
-		private String id;
-
-		@Nullable
-		private String segment;
-
-		@Nullable
-		private String generation;
-
-		@Nullable
-		private String docsCount;
-
-		@Nullable
-		private String docsDeleted;
-
-		@Nullable
-		private String size;
-
-		@Nullable
-		private String sizeMemory;
-
-		@Nullable
-		private String committed;
-
-		@Nullable
-		private String searchable;
-
-		@Nullable
-		private String version;
-
-		@Nullable
-		private String compound;
-
-		/**
-		 * index name
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * shard name
-		 * <p>
-		 * API name: {@code shard}
-		 */
-		public final Builder shard(@Nullable String value) {
-			this.shard = value;
-			return this;
-		}
-
-		/**
-		 * primary or replica
-		 * <p>
-		 * API name: {@code prirep}
-		 */
-		public final Builder prirep(@Nullable String value) {
-			this.prirep = value;
-			return this;
-		}
-
-		/**
-		 * ip of node where it lives
-		 * <p>
-		 * API name: {@code ip}
-		 */
-		public final Builder ip(@Nullable String value) {
-			this.ip = value;
-			return this;
-		}
-
-		/**
-		 * unique id of node where it lives
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * segment name
-		 * <p>
-		 * API name: {@code segment}
-		 */
-		public final Builder segment(@Nullable String value) {
-			this.segment = value;
-			return this;
-		}
-
-		/**
-		 * segment generation
-		 * <p>
-		 * API name: {@code generation}
-		 */
-		public final Builder generation(@Nullable String value) {
-			this.generation = value;
-			return this;
-		}
-
-		/**
-		 * number of docs in segment
-		 * <p>
-		 * API name: {@code docs.count}
-		 */
-		public final Builder docsCount(@Nullable String value) {
-			this.docsCount = value;
-			return this;
-		}
-
-		/**
-		 * number of deleted docs in segment
-		 * <p>
-		 * API name: {@code docs.deleted}
-		 */
-		public final Builder docsDeleted(@Nullable String value) {
-			this.docsDeleted = value;
-			return this;
-		}
-
-		/**
-		 * segment size in bytes
-		 * <p>
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable String value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * segment memory in bytes
-		 * <p>
-		 * API name: {@code size.memory}
-		 */
-		public final Builder sizeMemory(@Nullable String value) {
-			this.sizeMemory = value;
-			return this;
-		}
-
-		/**
-		 * is segment committed
-		 * <p>
-		 * API name: {@code committed}
-		 */
-		public final Builder committed(@Nullable String value) {
-			this.committed = value;
-			return this;
-		}
-
-		/**
-		 * is segment searched
-		 * <p>
-		 * API name: {@code searchable}
-		 */
-		public final Builder searchable(@Nullable String value) {
-			this.searchable = value;
-			return this;
-		}
-
-		/**
-		 * version
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * is segment compound
-		 * <p>
-		 * API name: {@code compound}
-		 */
-		public final Builder compound(@Nullable String value) {
-			this.compound = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SegmentsRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SegmentsRecord build() {
-			_checkSingleUse();
-
-			return new SegmentsRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SegmentsRecord}
-	 */
-	public static final JsonpDeserializer<SegmentsRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SegmentsRecord::setupSegmentsRecordDeserializer);
-
-	protected static void setupSegmentsRecordDeserializer(ObjectDeserializer<SegmentsRecord.Builder> op) {
-
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index", "i", "idx");
-		op.add(Builder::shard, JsonpDeserializer.stringDeserializer(), "shard", "s", "sh");
-		op.add(Builder::prirep, JsonpDeserializer.stringDeserializer(), "prirep", "p", "pr", "primaryOrReplica");
-		op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::segment, JsonpDeserializer.stringDeserializer(), "segment", "seg");
-		op.add(Builder::generation, JsonpDeserializer.stringDeserializer(), "generation", "g", "gen");
-		op.add(Builder::docsCount, JsonpDeserializer.stringDeserializer(), "docs.count", "dc", "docsCount");
-		op.add(Builder::docsDeleted, JsonpDeserializer.stringDeserializer(), "docs.deleted", "dd", "docsDeleted");
-		op.add(Builder::size, JsonpDeserializer.stringDeserializer(), "size", "si");
-		op.add(Builder::sizeMemory, JsonpDeserializer.stringDeserializer(), "size.memory", "sm", "sizeMemory");
-		op.add(Builder::committed, JsonpDeserializer.stringDeserializer(), "committed", "ic", "isCommitted");
-		op.add(Builder::searchable, JsonpDeserializer.stringDeserializer(), "searchable", "is", "isSearchable");
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version", "v");
-		op.add(Builder::compound, JsonpDeserializer.stringDeserializer(), "compound", "ico", "isCompound");
-
-	}
+    @Nullable
+    private final String index;
+
+    @Nullable
+    private final String shard;
+
+    @Nullable
+    private final String prirep;
+
+    @Nullable
+    private final String ip;
+
+    @Nullable
+    private final String id;
+
+    @Nullable
+    private final String segment;
+
+    @Nullable
+    private final String generation;
+
+    @Nullable
+    private final String docsCount;
+
+    @Nullable
+    private final String docsDeleted;
+
+    @Nullable
+    private final String size;
+
+    @Nullable
+    private final String sizeMemory;
+
+    @Nullable
+    private final String committed;
+
+    @Nullable
+    private final String searchable;
+
+    @Nullable
+    private final String version;
+
+    @Nullable
+    private final String compound;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SegmentsRecord(Builder builder) {
+
+        this.index = builder.index;
+        this.shard = builder.shard;
+        this.prirep = builder.prirep;
+        this.ip = builder.ip;
+        this.id = builder.id;
+        this.segment = builder.segment;
+        this.generation = builder.generation;
+        this.docsCount = builder.docsCount;
+        this.docsDeleted = builder.docsDeleted;
+        this.size = builder.size;
+        this.sizeMemory = builder.sizeMemory;
+        this.committed = builder.committed;
+        this.searchable = builder.searchable;
+        this.version = builder.version;
+        this.compound = builder.compound;
+
+    }
+
+    public static SegmentsRecord of(Function<Builder, ObjectBuilder<SegmentsRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * index name
+     * <p>
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * shard name
+     * <p>
+     * API name: {@code shard}
+     */
+    @Nullable
+    public final String shard() {
+        return this.shard;
+    }
+
+    /**
+     * primary or replica
+     * <p>
+     * API name: {@code prirep}
+     */
+    @Nullable
+    public final String prirep() {
+        return this.prirep;
+    }
+
+    /**
+     * ip of node where it lives
+     * <p>
+     * API name: {@code ip}
+     */
+    @Nullable
+    public final String ip() {
+        return this.ip;
+    }
+
+    /**
+     * unique id of node where it lives
+     * <p>
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * segment name
+     * <p>
+     * API name: {@code segment}
+     */
+    @Nullable
+    public final String segment() {
+        return this.segment;
+    }
+
+    /**
+     * segment generation
+     * <p>
+     * API name: {@code generation}
+     */
+    @Nullable
+    public final String generation() {
+        return this.generation;
+    }
+
+    /**
+     * number of docs in segment
+     * <p>
+     * API name: {@code docs.count}
+     */
+    @Nullable
+    public final String docsCount() {
+        return this.docsCount;
+    }
+
+    /**
+     * number of deleted docs in segment
+     * <p>
+     * API name: {@code docs.deleted}
+     */
+    @Nullable
+    public final String docsDeleted() {
+        return this.docsDeleted;
+    }
+
+    /**
+     * segment size in bytes
+     * <p>
+     * API name: {@code size}
+     */
+    @Nullable
+    public final String size() {
+        return this.size;
+    }
+
+    /**
+     * segment memory in bytes
+     * <p>
+     * API name: {@code size.memory}
+     */
+    @Nullable
+    public final String sizeMemory() {
+        return this.sizeMemory;
+    }
+
+    /**
+     * is segment committed
+     * <p>
+     * API name: {@code committed}
+     */
+    @Nullable
+    public final String committed() {
+        return this.committed;
+    }
+
+    /**
+     * is segment searched
+     * <p>
+     * API name: {@code searchable}
+     */
+    @Nullable
+    public final String searchable() {
+        return this.searchable;
+    }
+
+    /**
+     * version
+     * <p>
+     * API name: {@code version}
+     */
+    @Nullable
+    public final String version() {
+        return this.version;
+    }
+
+    /**
+     * is segment compound
+     * <p>
+     * API name: {@code compound}
+     */
+    @Nullable
+    public final String compound() {
+        return this.compound;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.shard != null) {
+            generator.writeKey("shard");
+            generator.write(this.shard);
+
+        }
+        if (this.prirep != null) {
+            generator.writeKey("prirep");
+            generator.write(this.prirep);
+
+        }
+        if (this.ip != null) {
+            generator.writeKey("ip");
+            generator.write(this.ip);
+
+        }
+        if (this.id != null) {
+            generator.writeKey("id");
+            generator.write(this.id);
+
+        }
+        if (this.segment != null) {
+            generator.writeKey("segment");
+            generator.write(this.segment);
+
+        }
+        if (this.generation != null) {
+            generator.writeKey("generation");
+            generator.write(this.generation);
+
+        }
+        if (this.docsCount != null) {
+            generator.writeKey("docs.count");
+            generator.write(this.docsCount);
+
+        }
+        if (this.docsDeleted != null) {
+            generator.writeKey("docs.deleted");
+            generator.write(this.docsDeleted);
+
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        if (this.sizeMemory != null) {
+            generator.writeKey("size.memory");
+            generator.write(this.sizeMemory);
+
+        }
+        if (this.committed != null) {
+            generator.writeKey("committed");
+            generator.write(this.committed);
+
+        }
+        if (this.searchable != null) {
+            generator.writeKey("searchable");
+            generator.write(this.searchable);
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        if (this.compound != null) {
+            generator.writeKey("compound");
+            generator.write(this.compound);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SegmentsRecord}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SegmentsRecord> {
+        @Nullable
+        private String index;
+
+        @Nullable
+        private String shard;
+
+        @Nullable
+        private String prirep;
+
+        @Nullable
+        private String ip;
+
+        @Nullable
+        private String id;
+
+        @Nullable
+        private String segment;
+
+        @Nullable
+        private String generation;
+
+        @Nullable
+        private String docsCount;
+
+        @Nullable
+        private String docsDeleted;
+
+        @Nullable
+        private String size;
+
+        @Nullable
+        private String sizeMemory;
+
+        @Nullable
+        private String committed;
+
+        @Nullable
+        private String searchable;
+
+        @Nullable
+        private String version;
+
+        @Nullable
+        private String compound;
+
+        /**
+         * index name
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * shard name
+         * <p>
+         * API name: {@code shard}
+         */
+        public final Builder shard(@Nullable String value) {
+            this.shard = value;
+            return this;
+        }
+
+        /**
+         * primary or replica
+         * <p>
+         * API name: {@code prirep}
+         */
+        public final Builder prirep(@Nullable String value) {
+            this.prirep = value;
+            return this;
+        }
+
+        /**
+         * ip of node where it lives
+         * <p>
+         * API name: {@code ip}
+         */
+        public final Builder ip(@Nullable String value) {
+            this.ip = value;
+            return this;
+        }
+
+        /**
+         * unique id of node where it lives
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * segment name
+         * <p>
+         * API name: {@code segment}
+         */
+        public final Builder segment(@Nullable String value) {
+            this.segment = value;
+            return this;
+        }
+
+        /**
+         * segment generation
+         * <p>
+         * API name: {@code generation}
+         */
+        public final Builder generation(@Nullable String value) {
+            this.generation = value;
+            return this;
+        }
+
+        /**
+         * number of docs in segment
+         * <p>
+         * API name: {@code docs.count}
+         */
+        public final Builder docsCount(@Nullable String value) {
+            this.docsCount = value;
+            return this;
+        }
+
+        /**
+         * number of deleted docs in segment
+         * <p>
+         * API name: {@code docs.deleted}
+         */
+        public final Builder docsDeleted(@Nullable String value) {
+            this.docsDeleted = value;
+            return this;
+        }
+
+        /**
+         * segment size in bytes
+         * <p>
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable String value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * segment memory in bytes
+         * <p>
+         * API name: {@code size.memory}
+         */
+        public final Builder sizeMemory(@Nullable String value) {
+            this.sizeMemory = value;
+            return this;
+        }
+
+        /**
+         * is segment committed
+         * <p>
+         * API name: {@code committed}
+         */
+        public final Builder committed(@Nullable String value) {
+            this.committed = value;
+            return this;
+        }
+
+        /**
+         * is segment searched
+         * <p>
+         * API name: {@code searchable}
+         */
+        public final Builder searchable(@Nullable String value) {
+            this.searchable = value;
+            return this;
+        }
+
+        /**
+         * version
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * is segment compound
+         * <p>
+         * API name: {@code compound}
+         */
+        public final Builder compound(@Nullable String value) {
+            this.compound = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link SegmentsRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SegmentsRecord build() {
+            _checkSingleUse();
+
+            return new SegmentsRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SegmentsRecord}
+     */
+    public static final JsonpDeserializer<SegmentsRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SegmentsRecord::setupSegmentsRecordDeserializer
+    );
+
+    protected static void setupSegmentsRecordDeserializer(ObjectDeserializer<SegmentsRecord.Builder> op) {
+
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index", "i", "idx");
+        op.add(Builder::shard, JsonpDeserializer.stringDeserializer(), "shard", "s", "sh");
+        op.add(Builder::prirep, JsonpDeserializer.stringDeserializer(), "prirep", "p", "pr", "primaryOrReplica");
+        op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::segment, JsonpDeserializer.stringDeserializer(), "segment", "seg");
+        op.add(Builder::generation, JsonpDeserializer.stringDeserializer(), "generation", "g", "gen");
+        op.add(Builder::docsCount, JsonpDeserializer.stringDeserializer(), "docs.count", "dc", "docsCount");
+        op.add(Builder::docsDeleted, JsonpDeserializer.stringDeserializer(), "docs.deleted", "dd", "docsDeleted");
+        op.add(Builder::size, JsonpDeserializer.stringDeserializer(), "size", "si");
+        op.add(Builder::sizeMemory, JsonpDeserializer.stringDeserializer(), "size.memory", "sm", "sizeMemory");
+        op.add(Builder::committed, JsonpDeserializer.stringDeserializer(), "committed", "ic", "isCommitted");
+        op.add(Builder::searchable, JsonpDeserializer.stringDeserializer(), "searchable", "is", "isSearchable");
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version", "v");
+        op.add(Builder::compound, JsonpDeserializer.stringDeserializer(), "compound", "ico", "isCompound");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/shards/ShardsRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/shards/ShardsRecord.java
index 8c71d60cad..3cc94c1520 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/shards/ShardsRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/shards/ShardsRecord.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cat.shards;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,2627 +43,2627 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cat.shards.ShardsRecord
 
-
 @JsonpDeserializable
 public class ShardsRecord implements JsonpSerializable {
-	@Nullable
-	private final String index;
+    @Nullable
+    private final String index;
 
-	@Nullable
-	private final String shard;
+    @Nullable
+    private final String shard;
 
-	@Nullable
-	private final String prirep;
+    @Nullable
+    private final String prirep;
 
-	@Nullable
-	private final String state;
+    @Nullable
+    private final String state;
 
-	@Nullable
-	private final String docs;
+    @Nullable
+    private final String docs;
 
-	@Nullable
-	private final String store;
+    @Nullable
+    private final String store;
 
-	@Nullable
-	private final String ip;
+    @Nullable
+    private final String ip;
 
-	@Nullable
-	private final String id;
+    @Nullable
+    private final String id;
 
-	@Nullable
-	private final String node;
+    @Nullable
+    private final String node;
 
-	@Nullable
-	private final String syncId;
+    @Nullable
+    private final String syncId;
 
-	@Nullable
-	private final String unassignedReason;
+    @Nullable
+    private final String unassignedReason;
 
-	@Nullable
-	private final String unassignedAt;
+    @Nullable
+    private final String unassignedAt;
 
-	@Nullable
-	private final String unassignedFor;
+    @Nullable
+    private final String unassignedFor;
 
-	@Nullable
-	private final String unassignedDetails;
+    @Nullable
+    private final String unassignedDetails;
 
-	@Nullable
-	private final String recoverysourceType;
+    @Nullable
+    private final String recoverysourceType;
 
-	@Nullable
-	private final String completionSize;
+    @Nullable
+    private final String completionSize;
 
-	@Nullable
-	private final String fielddataMemorySize;
+    @Nullable
+    private final String fielddataMemorySize;
 
-	@Nullable
-	private final String fielddataEvictions;
+    @Nullable
+    private final String fielddataEvictions;
 
-	@Nullable
-	private final String queryCacheMemorySize;
+    @Nullable
+    private final String queryCacheMemorySize;
 
-	@Nullable
-	private final String queryCacheEvictions;
+    @Nullable
+    private final String queryCacheEvictions;
 
-	@Nullable
-	private final String flushTotal;
+    @Nullable
+    private final String flushTotal;
 
-	@Nullable
-	private final String flushTotalTime;
+    @Nullable
+    private final String flushTotalTime;
 
-	@Nullable
-	private final String getCurrent;
+    @Nullable
+    private final String getCurrent;
 
-	@Nullable
-	private final String getTime;
+    @Nullable
+    private final String getTime;
 
-	@Nullable
-	private final String getTotal;
+    @Nullable
+    private final String getTotal;
 
-	@Nullable
-	private final String getExistsTime;
+    @Nullable
+    private final String getExistsTime;
 
-	@Nullable
-	private final String getExistsTotal;
+    @Nullable
+    private final String getExistsTotal;
 
-	@Nullable
-	private final String getMissingTime;
+    @Nullable
+    private final String getMissingTime;
 
-	@Nullable
-	private final String getMissingTotal;
+    @Nullable
+    private final String getMissingTotal;
 
-	@Nullable
-	private final String indexingDeleteCurrent;
+    @Nullable
+    private final String indexingDeleteCurrent;
 
-	@Nullable
-	private final String indexingDeleteTime;
+    @Nullable
+    private final String indexingDeleteTime;
 
-	@Nullable
-	private final String indexingDeleteTotal;
+    @Nullable
+    private final String indexingDeleteTotal;
 
-	@Nullable
-	private final String indexingIndexCurrent;
+    @Nullable
+    private final String indexingIndexCurrent;
 
-	@Nullable
-	private final String indexingIndexTime;
+    @Nullable
+    private final String indexingIndexTime;
 
-	@Nullable
-	private final String indexingIndexTotal;
+    @Nullable
+    private final String indexingIndexTotal;
 
-	@Nullable
-	private final String indexingIndexFailed;
+    @Nullable
+    private final String indexingIndexFailed;
 
-	@Nullable
-	private final String mergesCurrent;
+    @Nullable
+    private final String mergesCurrent;
 
-	@Nullable
-	private final String mergesCurrentDocs;
+    @Nullable
+    private final String mergesCurrentDocs;
 
-	@Nullable
-	private final String mergesCurrentSize;
+    @Nullable
+    private final String mergesCurrentSize;
 
-	@Nullable
-	private final String mergesTotal;
+    @Nullable
+    private final String mergesTotal;
 
-	@Nullable
-	private final String mergesTotalDocs;
+    @Nullable
+    private final String mergesTotalDocs;
 
-	@Nullable
-	private final String mergesTotalSize;
+    @Nullable
+    private final String mergesTotalSize;
 
-	@Nullable
-	private final String mergesTotalTime;
+    @Nullable
+    private final String mergesTotalTime;
 
-	@Nullable
-	private final String refreshTotal;
+    @Nullable
+    private final String refreshTotal;
 
-	@Nullable
-	private final String refreshTime;
+    @Nullable
+    private final String refreshTime;
 
-	@Nullable
-	private final String refreshExternalTotal;
+    @Nullable
+    private final String refreshExternalTotal;
 
-	@Nullable
-	private final String refreshExternalTime;
+    @Nullable
+    private final String refreshExternalTime;
 
-	@Nullable
-	private final String refreshListeners;
+    @Nullable
+    private final String refreshListeners;
 
-	@Nullable
-	private final String searchFetchCurrent;
+    @Nullable
+    private final String searchFetchCurrent;
 
-	@Nullable
-	private final String searchFetchTime;
+    @Nullable
+    private final String searchFetchTime;
 
-	@Nullable
-	private final String searchFetchTotal;
+    @Nullable
+    private final String searchFetchTotal;
 
-	@Nullable
-	private final String searchOpenContexts;
+    @Nullable
+    private final String searchOpenContexts;
 
-	@Nullable
-	private final String searchQueryCurrent;
+    @Nullable
+    private final String searchQueryCurrent;
 
-	@Nullable
-	private final String searchQueryTime;
+    @Nullable
+    private final String searchQueryTime;
 
-	@Nullable
-	private final String searchQueryTotal;
+    @Nullable
+    private final String searchQueryTotal;
 
-	@Nullable
-	private final String searchScrollCurrent;
+    @Nullable
+    private final String searchScrollCurrent;
 
-	@Nullable
-	private final String searchScrollTime;
+    @Nullable
+    private final String searchScrollTime;
 
-	@Nullable
-	private final String searchScrollTotal;
+    @Nullable
+    private final String searchScrollTotal;
 
-	@Nullable
-	private final String segmentsCount;
+    @Nullable
+    private final String segmentsCount;
 
-	@Nullable
-	private final String segmentsMemory;
+    @Nullable
+    private final String segmentsMemory;
 
-	@Nullable
-	private final String segmentsIndexWriterMemory;
+    @Nullable
+    private final String segmentsIndexWriterMemory;
 
-	@Nullable
-	private final String segmentsVersionMapMemory;
+    @Nullable
+    private final String segmentsVersionMapMemory;
 
-	@Nullable
-	private final String segmentsFixedBitsetMemory;
-
-	@Nullable
-	private final String seqNoMax;
-
-	@Nullable
-	private final String seqNoLocalCheckpoint;
-
-	@Nullable
-	private final String seqNoGlobalCheckpoint;
-
-	@Nullable
-	private final String warmerCurrent;
-
-	@Nullable
-	private final String warmerTotal;
-
-	@Nullable
-	private final String warmerTotalTime;
-
-	@Nullable
-	private final String pathData;
-
-	@Nullable
-	private final String pathState;
-
-	@Nullable
-	private final String bulkTotalOperations;
-
-	@Nullable
-	private final String bulkTotalTime;
-
-	@Nullable
-	private final String bulkTotalSizeInBytes;
-
-	@Nullable
-	private final String bulkAvgTime;
-
-	@Nullable
-	private final String bulkAvgSizeInBytes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShardsRecord(Builder builder) {
-
-		this.index = builder.index;
-		this.shard = builder.shard;
-		this.prirep = builder.prirep;
-		this.state = builder.state;
-		this.docs = builder.docs;
-		this.store = builder.store;
-		this.ip = builder.ip;
-		this.id = builder.id;
-		this.node = builder.node;
-		this.syncId = builder.syncId;
-		this.unassignedReason = builder.unassignedReason;
-		this.unassignedAt = builder.unassignedAt;
-		this.unassignedFor = builder.unassignedFor;
-		this.unassignedDetails = builder.unassignedDetails;
-		this.recoverysourceType = builder.recoverysourceType;
-		this.completionSize = builder.completionSize;
-		this.fielddataMemorySize = builder.fielddataMemorySize;
-		this.fielddataEvictions = builder.fielddataEvictions;
-		this.queryCacheMemorySize = builder.queryCacheMemorySize;
-		this.queryCacheEvictions = builder.queryCacheEvictions;
-		this.flushTotal = builder.flushTotal;
-		this.flushTotalTime = builder.flushTotalTime;
-		this.getCurrent = builder.getCurrent;
-		this.getTime = builder.getTime;
-		this.getTotal = builder.getTotal;
-		this.getExistsTime = builder.getExistsTime;
-		this.getExistsTotal = builder.getExistsTotal;
-		this.getMissingTime = builder.getMissingTime;
-		this.getMissingTotal = builder.getMissingTotal;
-		this.indexingDeleteCurrent = builder.indexingDeleteCurrent;
-		this.indexingDeleteTime = builder.indexingDeleteTime;
-		this.indexingDeleteTotal = builder.indexingDeleteTotal;
-		this.indexingIndexCurrent = builder.indexingIndexCurrent;
-		this.indexingIndexTime = builder.indexingIndexTime;
-		this.indexingIndexTotal = builder.indexingIndexTotal;
-		this.indexingIndexFailed = builder.indexingIndexFailed;
-		this.mergesCurrent = builder.mergesCurrent;
-		this.mergesCurrentDocs = builder.mergesCurrentDocs;
-		this.mergesCurrentSize = builder.mergesCurrentSize;
-		this.mergesTotal = builder.mergesTotal;
-		this.mergesTotalDocs = builder.mergesTotalDocs;
-		this.mergesTotalSize = builder.mergesTotalSize;
-		this.mergesTotalTime = builder.mergesTotalTime;
-		this.refreshTotal = builder.refreshTotal;
-		this.refreshTime = builder.refreshTime;
-		this.refreshExternalTotal = builder.refreshExternalTotal;
-		this.refreshExternalTime = builder.refreshExternalTime;
-		this.refreshListeners = builder.refreshListeners;
-		this.searchFetchCurrent = builder.searchFetchCurrent;
-		this.searchFetchTime = builder.searchFetchTime;
-		this.searchFetchTotal = builder.searchFetchTotal;
-		this.searchOpenContexts = builder.searchOpenContexts;
-		this.searchQueryCurrent = builder.searchQueryCurrent;
-		this.searchQueryTime = builder.searchQueryTime;
-		this.searchQueryTotal = builder.searchQueryTotal;
-		this.searchScrollCurrent = builder.searchScrollCurrent;
-		this.searchScrollTime = builder.searchScrollTime;
-		this.searchScrollTotal = builder.searchScrollTotal;
-		this.segmentsCount = builder.segmentsCount;
-		this.segmentsMemory = builder.segmentsMemory;
-		this.segmentsIndexWriterMemory = builder.segmentsIndexWriterMemory;
-		this.segmentsVersionMapMemory = builder.segmentsVersionMapMemory;
-		this.segmentsFixedBitsetMemory = builder.segmentsFixedBitsetMemory;
-		this.seqNoMax = builder.seqNoMax;
-		this.seqNoLocalCheckpoint = builder.seqNoLocalCheckpoint;
-		this.seqNoGlobalCheckpoint = builder.seqNoGlobalCheckpoint;
-		this.warmerCurrent = builder.warmerCurrent;
-		this.warmerTotal = builder.warmerTotal;
-		this.warmerTotalTime = builder.warmerTotalTime;
-		this.pathData = builder.pathData;
-		this.pathState = builder.pathState;
-		this.bulkTotalOperations = builder.bulkTotalOperations;
-		this.bulkTotalTime = builder.bulkTotalTime;
-		this.bulkTotalSizeInBytes = builder.bulkTotalSizeInBytes;
-		this.bulkAvgTime = builder.bulkAvgTime;
-		this.bulkAvgSizeInBytes = builder.bulkAvgSizeInBytes;
-
-	}
-
-	public static ShardsRecord of(Function<Builder, ObjectBuilder<ShardsRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * index name
-	 * <p>
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * shard name
-	 * <p>
-	 * API name: {@code shard}
-	 */
-	@Nullable
-	public final String shard() {
-		return this.shard;
-	}
-
-	/**
-	 * primary or replica
-	 * <p>
-	 * API name: {@code prirep}
-	 */
-	@Nullable
-	public final String prirep() {
-		return this.prirep;
-	}
-
-	/**
-	 * shard state
-	 * <p>
-	 * API name: {@code state}
-	 */
-	@Nullable
-	public final String state() {
-		return this.state;
-	}
-
-	/**
-	 * number of docs in shard
-	 * <p>
-	 * API name: {@code docs}
-	 */
-	@Nullable
-	public final String docs() {
-		return this.docs;
-	}
-
-	/**
-	 * store size of shard (how much disk it uses)
-	 * <p>
-	 * API name: {@code store}
-	 */
-	@Nullable
-	public final String store() {
-		return this.store;
-	}
-
-	/**
-	 * ip of node where it lives
-	 * <p>
-	 * API name: {@code ip}
-	 */
-	@Nullable
-	public final String ip() {
-		return this.ip;
-	}
-
-	/**
-	 * unique id of node where it lives
-	 * <p>
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * name of node where it lives
-	 * <p>
-	 * API name: {@code node}
-	 */
-	@Nullable
-	public final String node() {
-		return this.node;
-	}
-
-	/**
-	 * sync id
-	 * <p>
-	 * API name: {@code sync_id}
-	 */
-	@Nullable
-	public final String syncId() {
-		return this.syncId;
-	}
-
-	/**
-	 * reason shard is unassigned
-	 * <p>
-	 * API name: {@code unassigned.reason}
-	 */
-	@Nullable
-	public final String unassignedReason() {
-		return this.unassignedReason;
-	}
-
-	/**
-	 * time shard became unassigned (UTC)
-	 * <p>
-	 * API name: {@code unassigned.at}
-	 */
-	@Nullable
-	public final String unassignedAt() {
-		return this.unassignedAt;
-	}
-
-	/**
-	 * time has been unassigned
-	 * <p>
-	 * API name: {@code unassigned.for}
-	 */
-	@Nullable
-	public final String unassignedFor() {
-		return this.unassignedFor;
-	}
-
-	/**
-	 * additional details as to why the shard became unassigned
-	 * <p>
-	 * API name: {@code unassigned.details}
-	 */
-	@Nullable
-	public final String unassignedDetails() {
-		return this.unassignedDetails;
-	}
-
-	/**
-	 * recovery source type
-	 * <p>
-	 * API name: {@code recoverysource.type}
-	 */
-	@Nullable
-	public final String recoverysourceType() {
-		return this.recoverysourceType;
-	}
-
-	/**
-	 * size of completion
-	 * <p>
-	 * API name: {@code completion.size}
-	 */
-	@Nullable
-	public final String completionSize() {
-		return this.completionSize;
-	}
-
-	/**
-	 * used fielddata cache
-	 * <p>
-	 * API name: {@code fielddata.memory_size}
-	 */
-	@Nullable
-	public final String fielddataMemorySize() {
-		return this.fielddataMemorySize;
-	}
-
-	/**
-	 * fielddata evictions
-	 * <p>
-	 * API name: {@code fielddata.evictions}
-	 */
-	@Nullable
-	public final String fielddataEvictions() {
-		return this.fielddataEvictions;
-	}
-
-	/**
-	 * used query cache
-	 * <p>
-	 * API name: {@code query_cache.memory_size}
-	 */
-	@Nullable
-	public final String queryCacheMemorySize() {
-		return this.queryCacheMemorySize;
-	}
-
-	/**
-	 * query cache evictions
-	 * <p>
-	 * API name: {@code query_cache.evictions}
-	 */
-	@Nullable
-	public final String queryCacheEvictions() {
-		return this.queryCacheEvictions;
-	}
-
-	/**
-	 * number of flushes
-	 * <p>
-	 * API name: {@code flush.total}
-	 */
-	@Nullable
-	public final String flushTotal() {
-		return this.flushTotal;
-	}
-
-	/**
-	 * time spent in flush
-	 * <p>
-	 * API name: {@code flush.total_time}
-	 */
-	@Nullable
-	public final String flushTotalTime() {
-		return this.flushTotalTime;
-	}
-
-	/**
-	 * number of current get ops
-	 * <p>
-	 * API name: {@code get.current}
-	 */
-	@Nullable
-	public final String getCurrent() {
-		return this.getCurrent;
-	}
-
-	/**
-	 * time spent in get
-	 * <p>
-	 * API name: {@code get.time}
-	 */
-	@Nullable
-	public final String getTime() {
-		return this.getTime;
-	}
-
-	/**
-	 * number of get ops
-	 * <p>
-	 * API name: {@code get.total}
-	 */
-	@Nullable
-	public final String getTotal() {
-		return this.getTotal;
-	}
-
-	/**
-	 * time spent in successful gets
-	 * <p>
-	 * API name: {@code get.exists_time}
-	 */
-	@Nullable
-	public final String getExistsTime() {
-		return this.getExistsTime;
-	}
-
-	/**
-	 * number of successful gets
-	 * <p>
-	 * API name: {@code get.exists_total}
-	 */
-	@Nullable
-	public final String getExistsTotal() {
-		return this.getExistsTotal;
-	}
-
-	/**
-	 * time spent in failed gets
-	 * <p>
-	 * API name: {@code get.missing_time}
-	 */
-	@Nullable
-	public final String getMissingTime() {
-		return this.getMissingTime;
-	}
-
-	/**
-	 * number of failed gets
-	 * <p>
-	 * API name: {@code get.missing_total}
-	 */
-	@Nullable
-	public final String getMissingTotal() {
-		return this.getMissingTotal;
-	}
-
-	/**
-	 * number of current deletions
-	 * <p>
-	 * API name: {@code indexing.delete_current}
-	 */
-	@Nullable
-	public final String indexingDeleteCurrent() {
-		return this.indexingDeleteCurrent;
-	}
-
-	/**
-	 * time spent in deletions
-	 * <p>
-	 * API name: {@code indexing.delete_time}
-	 */
-	@Nullable
-	public final String indexingDeleteTime() {
-		return this.indexingDeleteTime;
-	}
-
-	/**
-	 * number of delete ops
-	 * <p>
-	 * API name: {@code indexing.delete_total}
-	 */
-	@Nullable
-	public final String indexingDeleteTotal() {
-		return this.indexingDeleteTotal;
-	}
-
-	/**
-	 * number of current indexing ops
-	 * <p>
-	 * API name: {@code indexing.index_current}
-	 */
-	@Nullable
-	public final String indexingIndexCurrent() {
-		return this.indexingIndexCurrent;
-	}
-
-	/**
-	 * time spent in indexing
-	 * <p>
-	 * API name: {@code indexing.index_time}
-	 */
-	@Nullable
-	public final String indexingIndexTime() {
-		return this.indexingIndexTime;
-	}
-
-	/**
-	 * number of indexing ops
-	 * <p>
-	 * API name: {@code indexing.index_total}
-	 */
-	@Nullable
-	public final String indexingIndexTotal() {
-		return this.indexingIndexTotal;
-	}
-
-	/**
-	 * number of failed indexing ops
-	 * <p>
-	 * API name: {@code indexing.index_failed}
-	 */
-	@Nullable
-	public final String indexingIndexFailed() {
-		return this.indexingIndexFailed;
-	}
-
-	/**
-	 * number of current merges
-	 * <p>
-	 * API name: {@code merges.current}
-	 */
-	@Nullable
-	public final String mergesCurrent() {
-		return this.mergesCurrent;
-	}
-
-	/**
-	 * number of current merging docs
-	 * <p>
-	 * API name: {@code merges.current_docs}
-	 */
-	@Nullable
-	public final String mergesCurrentDocs() {
-		return this.mergesCurrentDocs;
-	}
-
-	/**
-	 * size of current merges
-	 * <p>
-	 * API name: {@code merges.current_size}
-	 */
-	@Nullable
-	public final String mergesCurrentSize() {
-		return this.mergesCurrentSize;
-	}
-
-	/**
-	 * number of completed merge ops
-	 * <p>
-	 * API name: {@code merges.total}
-	 */
-	@Nullable
-	public final String mergesTotal() {
-		return this.mergesTotal;
-	}
-
-	/**
-	 * docs merged
-	 * <p>
-	 * API name: {@code merges.total_docs}
-	 */
-	@Nullable
-	public final String mergesTotalDocs() {
-		return this.mergesTotalDocs;
-	}
-
-	/**
-	 * size merged
-	 * <p>
-	 * API name: {@code merges.total_size}
-	 */
-	@Nullable
-	public final String mergesTotalSize() {
-		return this.mergesTotalSize;
-	}
-
-	/**
-	 * time spent in merges
-	 * <p>
-	 * API name: {@code merges.total_time}
-	 */
-	@Nullable
-	public final String mergesTotalTime() {
-		return this.mergesTotalTime;
-	}
-
-	/**
-	 * total refreshes
-	 * <p>
-	 * API name: {@code refresh.total}
-	 */
-	@Nullable
-	public final String refreshTotal() {
-		return this.refreshTotal;
-	}
-
-	/**
-	 * time spent in refreshes
-	 * <p>
-	 * API name: {@code refresh.time}
-	 */
-	@Nullable
-	public final String refreshTime() {
-		return this.refreshTime;
-	}
-
-	/**
-	 * total external refreshes
-	 * <p>
-	 * API name: {@code refresh.external_total}
-	 */
-	@Nullable
-	public final String refreshExternalTotal() {
-		return this.refreshExternalTotal;
-	}
-
-	/**
-	 * time spent in external refreshes
-	 * <p>
-	 * API name: {@code refresh.external_time}
-	 */
-	@Nullable
-	public final String refreshExternalTime() {
-		return this.refreshExternalTime;
-	}
-
-	/**
-	 * number of pending refresh listeners
-	 * <p>
-	 * API name: {@code refresh.listeners}
-	 */
-	@Nullable
-	public final String refreshListeners() {
-		return this.refreshListeners;
-	}
-
-	/**
-	 * current fetch phase ops
-	 * <p>
-	 * API name: {@code search.fetch_current}
-	 */
-	@Nullable
-	public final String searchFetchCurrent() {
-		return this.searchFetchCurrent;
-	}
-
-	/**
-	 * time spent in fetch phase
-	 * <p>
-	 * API name: {@code search.fetch_time}
-	 */
-	@Nullable
-	public final String searchFetchTime() {
-		return this.searchFetchTime;
-	}
-
-	/**
-	 * total fetch ops
-	 * <p>
-	 * API name: {@code search.fetch_total}
-	 */
-	@Nullable
-	public final String searchFetchTotal() {
-		return this.searchFetchTotal;
-	}
-
-	/**
-	 * open search contexts
-	 * <p>
-	 * API name: {@code search.open_contexts}
-	 */
-	@Nullable
-	public final String searchOpenContexts() {
-		return this.searchOpenContexts;
-	}
-
-	/**
-	 * current query phase ops
-	 * <p>
-	 * API name: {@code search.query_current}
-	 */
-	@Nullable
-	public final String searchQueryCurrent() {
-		return this.searchQueryCurrent;
-	}
-
-	/**
-	 * time spent in query phase
-	 * <p>
-	 * API name: {@code search.query_time}
-	 */
-	@Nullable
-	public final String searchQueryTime() {
-		return this.searchQueryTime;
-	}
-
-	/**
-	 * total query phase ops
-	 * <p>
-	 * API name: {@code search.query_total}
-	 */
-	@Nullable
-	public final String searchQueryTotal() {
-		return this.searchQueryTotal;
-	}
-
-	/**
-	 * open scroll contexts
-	 * <p>
-	 * API name: {@code search.scroll_current}
-	 */
-	@Nullable
-	public final String searchScrollCurrent() {
-		return this.searchScrollCurrent;
-	}
-
-	/**
-	 * time scroll contexts held open
-	 * <p>
-	 * API name: {@code search.scroll_time}
-	 */
-	@Nullable
-	public final String searchScrollTime() {
-		return this.searchScrollTime;
-	}
-
-	/**
-	 * completed scroll contexts
-	 * <p>
-	 * API name: {@code search.scroll_total}
-	 */
-	@Nullable
-	public final String searchScrollTotal() {
-		return this.searchScrollTotal;
-	}
-
-	/**
-	 * number of segments
-	 * <p>
-	 * API name: {@code segments.count}
-	 */
-	@Nullable
-	public final String segmentsCount() {
-		return this.segmentsCount;
-	}
-
-	/**
-	 * memory used by segments
-	 * <p>
-	 * API name: {@code segments.memory}
-	 */
-	@Nullable
-	public final String segmentsMemory() {
-		return this.segmentsMemory;
-	}
-
-	/**
-	 * memory used by index writer
-	 * <p>
-	 * API name: {@code segments.index_writer_memory}
-	 */
-	@Nullable
-	public final String segmentsIndexWriterMemory() {
-		return this.segmentsIndexWriterMemory;
-	}
-
-	/**
-	 * memory used by version map
-	 * <p>
-	 * API name: {@code segments.version_map_memory}
-	 */
-	@Nullable
-	public final String segmentsVersionMapMemory() {
-		return this.segmentsVersionMapMemory;
-	}
-
-	/**
-	 * memory used by fixed bit sets for nested object field types and export type
-	 * filters for types referred in _parent fields
-	 * <p>
-	 * API name: {@code segments.fixed_bitset_memory}
-	 */
-	@Nullable
-	public final String segmentsFixedBitsetMemory() {
-		return this.segmentsFixedBitsetMemory;
-	}
-
-	/**
-	 * max sequence number
-	 * <p>
-	 * API name: {@code seq_no.max}
-	 */
-	@Nullable
-	public final String seqNoMax() {
-		return this.seqNoMax;
-	}
-
-	/**
-	 * local checkpoint
-	 * <p>
-	 * API name: {@code seq_no.local_checkpoint}
-	 */
-	@Nullable
-	public final String seqNoLocalCheckpoint() {
-		return this.seqNoLocalCheckpoint;
-	}
-
-	/**
-	 * global checkpoint
-	 * <p>
-	 * API name: {@code seq_no.global_checkpoint}
-	 */
-	@Nullable
-	public final String seqNoGlobalCheckpoint() {
-		return this.seqNoGlobalCheckpoint;
-	}
-
-	/**
-	 * current warmer ops
-	 * <p>
-	 * API name: {@code warmer.current}
-	 */
-	@Nullable
-	public final String warmerCurrent() {
-		return this.warmerCurrent;
-	}
-
-	/**
-	 * total warmer ops
-	 * <p>
-	 * API name: {@code warmer.total}
-	 */
-	@Nullable
-	public final String warmerTotal() {
-		return this.warmerTotal;
-	}
-
-	/**
-	 * time spent in warmers
-	 * <p>
-	 * API name: {@code warmer.total_time}
-	 */
-	@Nullable
-	public final String warmerTotalTime() {
-		return this.warmerTotalTime;
-	}
-
-	/**
-	 * shard data path
-	 * <p>
-	 * API name: {@code path.data}
-	 */
-	@Nullable
-	public final String pathData() {
-		return this.pathData;
-	}
-
-	/**
-	 * shard state path
-	 * <p>
-	 * API name: {@code path.state}
-	 */
-	@Nullable
-	public final String pathState() {
-		return this.pathState;
-	}
-
-	/**
-	 * number of bulk shard ops
-	 * <p>
-	 * API name: {@code bulk.total_operations}
-	 */
-	@Nullable
-	public final String bulkTotalOperations() {
-		return this.bulkTotalOperations;
-	}
-
-	/**
-	 * time spend in shard bulk
-	 * <p>
-	 * API name: {@code bulk.total_time}
-	 */
-	@Nullable
-	public final String bulkTotalTime() {
-		return this.bulkTotalTime;
-	}
-
-	/**
-	 * total size in bytes of shard bulk
-	 * <p>
-	 * API name: {@code bulk.total_size_in_bytes}
-	 */
-	@Nullable
-	public final String bulkTotalSizeInBytes() {
-		return this.bulkTotalSizeInBytes;
-	}
-
-	/**
-	 * average time spend in shard bulk
-	 * <p>
-	 * API name: {@code bulk.avg_time}
-	 */
-	@Nullable
-	public final String bulkAvgTime() {
-		return this.bulkAvgTime;
-	}
-
-	/**
-	 * avg size in bytes of shard bulk
-	 * <p>
-	 * API name: {@code bulk.avg_size_in_bytes}
-	 */
-	@Nullable
-	public final String bulkAvgSizeInBytes() {
-		return this.bulkAvgSizeInBytes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.shard != null) {
-			generator.writeKey("shard");
-			generator.write(this.shard);
-
-		}
-		if (this.prirep != null) {
-			generator.writeKey("prirep");
-			generator.write(this.prirep);
-
-		}
-		if (this.state != null) {
-			generator.writeKey("state");
-			generator.write(this.state);
-
-		}
-		if (this.docs != null) {
-			generator.writeKey("docs");
-			generator.write(this.docs);
-
-		}
-		if (this.store != null) {
-			generator.writeKey("store");
-			generator.write(this.store);
-
-		}
-		if (this.ip != null) {
-			generator.writeKey("ip");
-			generator.write(this.ip);
-
-		}
-		if (this.id != null) {
-			generator.writeKey("id");
-			generator.write(this.id);
-
-		}
-		if (this.node != null) {
-			generator.writeKey("node");
-			generator.write(this.node);
-
-		}
-		if (this.syncId != null) {
-			generator.writeKey("sync_id");
-			generator.write(this.syncId);
-
-		}
-		if (this.unassignedReason != null) {
-			generator.writeKey("unassigned.reason");
-			generator.write(this.unassignedReason);
-
-		}
-		if (this.unassignedAt != null) {
-			generator.writeKey("unassigned.at");
-			generator.write(this.unassignedAt);
-
-		}
-		if (this.unassignedFor != null) {
-			generator.writeKey("unassigned.for");
-			generator.write(this.unassignedFor);
-
-		}
-		if (this.unassignedDetails != null) {
-			generator.writeKey("unassigned.details");
-			generator.write(this.unassignedDetails);
-
-		}
-		if (this.recoverysourceType != null) {
-			generator.writeKey("recoverysource.type");
-			generator.write(this.recoverysourceType);
-
-		}
-		if (this.completionSize != null) {
-			generator.writeKey("completion.size");
-			generator.write(this.completionSize);
-
-		}
-		if (this.fielddataMemorySize != null) {
-			generator.writeKey("fielddata.memory_size");
-			generator.write(this.fielddataMemorySize);
-
-		}
-		if (this.fielddataEvictions != null) {
-			generator.writeKey("fielddata.evictions");
-			generator.write(this.fielddataEvictions);
-
-		}
-		if (this.queryCacheMemorySize != null) {
-			generator.writeKey("query_cache.memory_size");
-			generator.write(this.queryCacheMemorySize);
-
-		}
-		if (this.queryCacheEvictions != null) {
-			generator.writeKey("query_cache.evictions");
-			generator.write(this.queryCacheEvictions);
-
-		}
-		if (this.flushTotal != null) {
-			generator.writeKey("flush.total");
-			generator.write(this.flushTotal);
-
-		}
-		if (this.flushTotalTime != null) {
-			generator.writeKey("flush.total_time");
-			generator.write(this.flushTotalTime);
-
-		}
-		if (this.getCurrent != null) {
-			generator.writeKey("get.current");
-			generator.write(this.getCurrent);
-
-		}
-		if (this.getTime != null) {
-			generator.writeKey("get.time");
-			generator.write(this.getTime);
-
-		}
-		if (this.getTotal != null) {
-			generator.writeKey("get.total");
-			generator.write(this.getTotal);
-
-		}
-		if (this.getExistsTime != null) {
-			generator.writeKey("get.exists_time");
-			generator.write(this.getExistsTime);
-
-		}
-		if (this.getExistsTotal != null) {
-			generator.writeKey("get.exists_total");
-			generator.write(this.getExistsTotal);
-
-		}
-		if (this.getMissingTime != null) {
-			generator.writeKey("get.missing_time");
-			generator.write(this.getMissingTime);
-
-		}
-		if (this.getMissingTotal != null) {
-			generator.writeKey("get.missing_total");
-			generator.write(this.getMissingTotal);
-
-		}
-		if (this.indexingDeleteCurrent != null) {
-			generator.writeKey("indexing.delete_current");
-			generator.write(this.indexingDeleteCurrent);
-
-		}
-		if (this.indexingDeleteTime != null) {
-			generator.writeKey("indexing.delete_time");
-			generator.write(this.indexingDeleteTime);
-
-		}
-		if (this.indexingDeleteTotal != null) {
-			generator.writeKey("indexing.delete_total");
-			generator.write(this.indexingDeleteTotal);
-
-		}
-		if (this.indexingIndexCurrent != null) {
-			generator.writeKey("indexing.index_current");
-			generator.write(this.indexingIndexCurrent);
-
-		}
-		if (this.indexingIndexTime != null) {
-			generator.writeKey("indexing.index_time");
-			generator.write(this.indexingIndexTime);
-
-		}
-		if (this.indexingIndexTotal != null) {
-			generator.writeKey("indexing.index_total");
-			generator.write(this.indexingIndexTotal);
-
-		}
-		if (this.indexingIndexFailed != null) {
-			generator.writeKey("indexing.index_failed");
-			generator.write(this.indexingIndexFailed);
-
-		}
-		if (this.mergesCurrent != null) {
-			generator.writeKey("merges.current");
-			generator.write(this.mergesCurrent);
-
-		}
-		if (this.mergesCurrentDocs != null) {
-			generator.writeKey("merges.current_docs");
-			generator.write(this.mergesCurrentDocs);
-
-		}
-		if (this.mergesCurrentSize != null) {
-			generator.writeKey("merges.current_size");
-			generator.write(this.mergesCurrentSize);
-
-		}
-		if (this.mergesTotal != null) {
-			generator.writeKey("merges.total");
-			generator.write(this.mergesTotal);
-
-		}
-		if (this.mergesTotalDocs != null) {
-			generator.writeKey("merges.total_docs");
-			generator.write(this.mergesTotalDocs);
-
-		}
-		if (this.mergesTotalSize != null) {
-			generator.writeKey("merges.total_size");
-			generator.write(this.mergesTotalSize);
-
-		}
-		if (this.mergesTotalTime != null) {
-			generator.writeKey("merges.total_time");
-			generator.write(this.mergesTotalTime);
-
-		}
-		if (this.refreshTotal != null) {
-			generator.writeKey("refresh.total");
-			generator.write(this.refreshTotal);
-
-		}
-		if (this.refreshTime != null) {
-			generator.writeKey("refresh.time");
-			generator.write(this.refreshTime);
-
-		}
-		if (this.refreshExternalTotal != null) {
-			generator.writeKey("refresh.external_total");
-			generator.write(this.refreshExternalTotal);
-
-		}
-		if (this.refreshExternalTime != null) {
-			generator.writeKey("refresh.external_time");
-			generator.write(this.refreshExternalTime);
-
-		}
-		if (this.refreshListeners != null) {
-			generator.writeKey("refresh.listeners");
-			generator.write(this.refreshListeners);
-
-		}
-		if (this.searchFetchCurrent != null) {
-			generator.writeKey("search.fetch_current");
-			generator.write(this.searchFetchCurrent);
-
-		}
-		if (this.searchFetchTime != null) {
-			generator.writeKey("search.fetch_time");
-			generator.write(this.searchFetchTime);
-
-		}
-		if (this.searchFetchTotal != null) {
-			generator.writeKey("search.fetch_total");
-			generator.write(this.searchFetchTotal);
-
-		}
-		if (this.searchOpenContexts != null) {
-			generator.writeKey("search.open_contexts");
-			generator.write(this.searchOpenContexts);
-
-		}
-		if (this.searchQueryCurrent != null) {
-			generator.writeKey("search.query_current");
-			generator.write(this.searchQueryCurrent);
-
-		}
-		if (this.searchQueryTime != null) {
-			generator.writeKey("search.query_time");
-			generator.write(this.searchQueryTime);
-
-		}
-		if (this.searchQueryTotal != null) {
-			generator.writeKey("search.query_total");
-			generator.write(this.searchQueryTotal);
-
-		}
-		if (this.searchScrollCurrent != null) {
-			generator.writeKey("search.scroll_current");
-			generator.write(this.searchScrollCurrent);
-
-		}
-		if (this.searchScrollTime != null) {
-			generator.writeKey("search.scroll_time");
-			generator.write(this.searchScrollTime);
-
-		}
-		if (this.searchScrollTotal != null) {
-			generator.writeKey("search.scroll_total");
-			generator.write(this.searchScrollTotal);
-
-		}
-		if (this.segmentsCount != null) {
-			generator.writeKey("segments.count");
-			generator.write(this.segmentsCount);
-
-		}
-		if (this.segmentsMemory != null) {
-			generator.writeKey("segments.memory");
-			generator.write(this.segmentsMemory);
-
-		}
-		if (this.segmentsIndexWriterMemory != null) {
-			generator.writeKey("segments.index_writer_memory");
-			generator.write(this.segmentsIndexWriterMemory);
-
-		}
-		if (this.segmentsVersionMapMemory != null) {
-			generator.writeKey("segments.version_map_memory");
-			generator.write(this.segmentsVersionMapMemory);
-
-		}
-		if (this.segmentsFixedBitsetMemory != null) {
-			generator.writeKey("segments.fixed_bitset_memory");
-			generator.write(this.segmentsFixedBitsetMemory);
-
-		}
-		if (this.seqNoMax != null) {
-			generator.writeKey("seq_no.max");
-			generator.write(this.seqNoMax);
-
-		}
-		if (this.seqNoLocalCheckpoint != null) {
-			generator.writeKey("seq_no.local_checkpoint");
-			generator.write(this.seqNoLocalCheckpoint);
-
-		}
-		if (this.seqNoGlobalCheckpoint != null) {
-			generator.writeKey("seq_no.global_checkpoint");
-			generator.write(this.seqNoGlobalCheckpoint);
-
-		}
-		if (this.warmerCurrent != null) {
-			generator.writeKey("warmer.current");
-			generator.write(this.warmerCurrent);
-
-		}
-		if (this.warmerTotal != null) {
-			generator.writeKey("warmer.total");
-			generator.write(this.warmerTotal);
-
-		}
-		if (this.warmerTotalTime != null) {
-			generator.writeKey("warmer.total_time");
-			generator.write(this.warmerTotalTime);
+    @Nullable
+    private final String segmentsFixedBitsetMemory;
+
+    @Nullable
+    private final String seqNoMax;
+
+    @Nullable
+    private final String seqNoLocalCheckpoint;
+
+    @Nullable
+    private final String seqNoGlobalCheckpoint;
+
+    @Nullable
+    private final String warmerCurrent;
+
+    @Nullable
+    private final String warmerTotal;
+
+    @Nullable
+    private final String warmerTotalTime;
+
+    @Nullable
+    private final String pathData;
+
+    @Nullable
+    private final String pathState;
+
+    @Nullable
+    private final String bulkTotalOperations;
+
+    @Nullable
+    private final String bulkTotalTime;
+
+    @Nullable
+    private final String bulkTotalSizeInBytes;
+
+    @Nullable
+    private final String bulkAvgTime;
+
+    @Nullable
+    private final String bulkAvgSizeInBytes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShardsRecord(Builder builder) {
+
+        this.index = builder.index;
+        this.shard = builder.shard;
+        this.prirep = builder.prirep;
+        this.state = builder.state;
+        this.docs = builder.docs;
+        this.store = builder.store;
+        this.ip = builder.ip;
+        this.id = builder.id;
+        this.node = builder.node;
+        this.syncId = builder.syncId;
+        this.unassignedReason = builder.unassignedReason;
+        this.unassignedAt = builder.unassignedAt;
+        this.unassignedFor = builder.unassignedFor;
+        this.unassignedDetails = builder.unassignedDetails;
+        this.recoverysourceType = builder.recoverysourceType;
+        this.completionSize = builder.completionSize;
+        this.fielddataMemorySize = builder.fielddataMemorySize;
+        this.fielddataEvictions = builder.fielddataEvictions;
+        this.queryCacheMemorySize = builder.queryCacheMemorySize;
+        this.queryCacheEvictions = builder.queryCacheEvictions;
+        this.flushTotal = builder.flushTotal;
+        this.flushTotalTime = builder.flushTotalTime;
+        this.getCurrent = builder.getCurrent;
+        this.getTime = builder.getTime;
+        this.getTotal = builder.getTotal;
+        this.getExistsTime = builder.getExistsTime;
+        this.getExistsTotal = builder.getExistsTotal;
+        this.getMissingTime = builder.getMissingTime;
+        this.getMissingTotal = builder.getMissingTotal;
+        this.indexingDeleteCurrent = builder.indexingDeleteCurrent;
+        this.indexingDeleteTime = builder.indexingDeleteTime;
+        this.indexingDeleteTotal = builder.indexingDeleteTotal;
+        this.indexingIndexCurrent = builder.indexingIndexCurrent;
+        this.indexingIndexTime = builder.indexingIndexTime;
+        this.indexingIndexTotal = builder.indexingIndexTotal;
+        this.indexingIndexFailed = builder.indexingIndexFailed;
+        this.mergesCurrent = builder.mergesCurrent;
+        this.mergesCurrentDocs = builder.mergesCurrentDocs;
+        this.mergesCurrentSize = builder.mergesCurrentSize;
+        this.mergesTotal = builder.mergesTotal;
+        this.mergesTotalDocs = builder.mergesTotalDocs;
+        this.mergesTotalSize = builder.mergesTotalSize;
+        this.mergesTotalTime = builder.mergesTotalTime;
+        this.refreshTotal = builder.refreshTotal;
+        this.refreshTime = builder.refreshTime;
+        this.refreshExternalTotal = builder.refreshExternalTotal;
+        this.refreshExternalTime = builder.refreshExternalTime;
+        this.refreshListeners = builder.refreshListeners;
+        this.searchFetchCurrent = builder.searchFetchCurrent;
+        this.searchFetchTime = builder.searchFetchTime;
+        this.searchFetchTotal = builder.searchFetchTotal;
+        this.searchOpenContexts = builder.searchOpenContexts;
+        this.searchQueryCurrent = builder.searchQueryCurrent;
+        this.searchQueryTime = builder.searchQueryTime;
+        this.searchQueryTotal = builder.searchQueryTotal;
+        this.searchScrollCurrent = builder.searchScrollCurrent;
+        this.searchScrollTime = builder.searchScrollTime;
+        this.searchScrollTotal = builder.searchScrollTotal;
+        this.segmentsCount = builder.segmentsCount;
+        this.segmentsMemory = builder.segmentsMemory;
+        this.segmentsIndexWriterMemory = builder.segmentsIndexWriterMemory;
+        this.segmentsVersionMapMemory = builder.segmentsVersionMapMemory;
+        this.segmentsFixedBitsetMemory = builder.segmentsFixedBitsetMemory;
+        this.seqNoMax = builder.seqNoMax;
+        this.seqNoLocalCheckpoint = builder.seqNoLocalCheckpoint;
+        this.seqNoGlobalCheckpoint = builder.seqNoGlobalCheckpoint;
+        this.warmerCurrent = builder.warmerCurrent;
+        this.warmerTotal = builder.warmerTotal;
+        this.warmerTotalTime = builder.warmerTotalTime;
+        this.pathData = builder.pathData;
+        this.pathState = builder.pathState;
+        this.bulkTotalOperations = builder.bulkTotalOperations;
+        this.bulkTotalTime = builder.bulkTotalTime;
+        this.bulkTotalSizeInBytes = builder.bulkTotalSizeInBytes;
+        this.bulkAvgTime = builder.bulkAvgTime;
+        this.bulkAvgSizeInBytes = builder.bulkAvgSizeInBytes;
+
+    }
+
+    public static ShardsRecord of(Function<Builder, ObjectBuilder<ShardsRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * index name
+     * <p>
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * shard name
+     * <p>
+     * API name: {@code shard}
+     */
+    @Nullable
+    public final String shard() {
+        return this.shard;
+    }
+
+    /**
+     * primary or replica
+     * <p>
+     * API name: {@code prirep}
+     */
+    @Nullable
+    public final String prirep() {
+        return this.prirep;
+    }
+
+    /**
+     * shard state
+     * <p>
+     * API name: {@code state}
+     */
+    @Nullable
+    public final String state() {
+        return this.state;
+    }
+
+    /**
+     * number of docs in shard
+     * <p>
+     * API name: {@code docs}
+     */
+    @Nullable
+    public final String docs() {
+        return this.docs;
+    }
+
+    /**
+     * store size of shard (how much disk it uses)
+     * <p>
+     * API name: {@code store}
+     */
+    @Nullable
+    public final String store() {
+        return this.store;
+    }
+
+    /**
+     * ip of node where it lives
+     * <p>
+     * API name: {@code ip}
+     */
+    @Nullable
+    public final String ip() {
+        return this.ip;
+    }
+
+    /**
+     * unique id of node where it lives
+     * <p>
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * name of node where it lives
+     * <p>
+     * API name: {@code node}
+     */
+    @Nullable
+    public final String node() {
+        return this.node;
+    }
+
+    /**
+     * sync id
+     * <p>
+     * API name: {@code sync_id}
+     */
+    @Nullable
+    public final String syncId() {
+        return this.syncId;
+    }
+
+    /**
+     * reason shard is unassigned
+     * <p>
+     * API name: {@code unassigned.reason}
+     */
+    @Nullable
+    public final String unassignedReason() {
+        return this.unassignedReason;
+    }
+
+    /**
+     * time shard became unassigned (UTC)
+     * <p>
+     * API name: {@code unassigned.at}
+     */
+    @Nullable
+    public final String unassignedAt() {
+        return this.unassignedAt;
+    }
+
+    /**
+     * time has been unassigned
+     * <p>
+     * API name: {@code unassigned.for}
+     */
+    @Nullable
+    public final String unassignedFor() {
+        return this.unassignedFor;
+    }
+
+    /**
+     * additional details as to why the shard became unassigned
+     * <p>
+     * API name: {@code unassigned.details}
+     */
+    @Nullable
+    public final String unassignedDetails() {
+        return this.unassignedDetails;
+    }
+
+    /**
+     * recovery source type
+     * <p>
+     * API name: {@code recoverysource.type}
+     */
+    @Nullable
+    public final String recoverysourceType() {
+        return this.recoverysourceType;
+    }
+
+    /**
+     * size of completion
+     * <p>
+     * API name: {@code completion.size}
+     */
+    @Nullable
+    public final String completionSize() {
+        return this.completionSize;
+    }
+
+    /**
+     * used fielddata cache
+     * <p>
+     * API name: {@code fielddata.memory_size}
+     */
+    @Nullable
+    public final String fielddataMemorySize() {
+        return this.fielddataMemorySize;
+    }
+
+    /**
+     * fielddata evictions
+     * <p>
+     * API name: {@code fielddata.evictions}
+     */
+    @Nullable
+    public final String fielddataEvictions() {
+        return this.fielddataEvictions;
+    }
+
+    /**
+     * used query cache
+     * <p>
+     * API name: {@code query_cache.memory_size}
+     */
+    @Nullable
+    public final String queryCacheMemorySize() {
+        return this.queryCacheMemorySize;
+    }
+
+    /**
+     * query cache evictions
+     * <p>
+     * API name: {@code query_cache.evictions}
+     */
+    @Nullable
+    public final String queryCacheEvictions() {
+        return this.queryCacheEvictions;
+    }
+
+    /**
+     * number of flushes
+     * <p>
+     * API name: {@code flush.total}
+     */
+    @Nullable
+    public final String flushTotal() {
+        return this.flushTotal;
+    }
+
+    /**
+     * time spent in flush
+     * <p>
+     * API name: {@code flush.total_time}
+     */
+    @Nullable
+    public final String flushTotalTime() {
+        return this.flushTotalTime;
+    }
+
+    /**
+     * number of current get ops
+     * <p>
+     * API name: {@code get.current}
+     */
+    @Nullable
+    public final String getCurrent() {
+        return this.getCurrent;
+    }
+
+    /**
+     * time spent in get
+     * <p>
+     * API name: {@code get.time}
+     */
+    @Nullable
+    public final String getTime() {
+        return this.getTime;
+    }
+
+    /**
+     * number of get ops
+     * <p>
+     * API name: {@code get.total}
+     */
+    @Nullable
+    public final String getTotal() {
+        return this.getTotal;
+    }
+
+    /**
+     * time spent in successful gets
+     * <p>
+     * API name: {@code get.exists_time}
+     */
+    @Nullable
+    public final String getExistsTime() {
+        return this.getExistsTime;
+    }
+
+    /**
+     * number of successful gets
+     * <p>
+     * API name: {@code get.exists_total}
+     */
+    @Nullable
+    public final String getExistsTotal() {
+        return this.getExistsTotal;
+    }
+
+    /**
+     * time spent in failed gets
+     * <p>
+     * API name: {@code get.missing_time}
+     */
+    @Nullable
+    public final String getMissingTime() {
+        return this.getMissingTime;
+    }
+
+    /**
+     * number of failed gets
+     * <p>
+     * API name: {@code get.missing_total}
+     */
+    @Nullable
+    public final String getMissingTotal() {
+        return this.getMissingTotal;
+    }
+
+    /**
+     * number of current deletions
+     * <p>
+     * API name: {@code indexing.delete_current}
+     */
+    @Nullable
+    public final String indexingDeleteCurrent() {
+        return this.indexingDeleteCurrent;
+    }
+
+    /**
+     * time spent in deletions
+     * <p>
+     * API name: {@code indexing.delete_time}
+     */
+    @Nullable
+    public final String indexingDeleteTime() {
+        return this.indexingDeleteTime;
+    }
+
+    /**
+     * number of delete ops
+     * <p>
+     * API name: {@code indexing.delete_total}
+     */
+    @Nullable
+    public final String indexingDeleteTotal() {
+        return this.indexingDeleteTotal;
+    }
+
+    /**
+     * number of current indexing ops
+     * <p>
+     * API name: {@code indexing.index_current}
+     */
+    @Nullable
+    public final String indexingIndexCurrent() {
+        return this.indexingIndexCurrent;
+    }
+
+    /**
+     * time spent in indexing
+     * <p>
+     * API name: {@code indexing.index_time}
+     */
+    @Nullable
+    public final String indexingIndexTime() {
+        return this.indexingIndexTime;
+    }
+
+    /**
+     * number of indexing ops
+     * <p>
+     * API name: {@code indexing.index_total}
+     */
+    @Nullable
+    public final String indexingIndexTotal() {
+        return this.indexingIndexTotal;
+    }
+
+    /**
+     * number of failed indexing ops
+     * <p>
+     * API name: {@code indexing.index_failed}
+     */
+    @Nullable
+    public final String indexingIndexFailed() {
+        return this.indexingIndexFailed;
+    }
+
+    /**
+     * number of current merges
+     * <p>
+     * API name: {@code merges.current}
+     */
+    @Nullable
+    public final String mergesCurrent() {
+        return this.mergesCurrent;
+    }
+
+    /**
+     * number of current merging docs
+     * <p>
+     * API name: {@code merges.current_docs}
+     */
+    @Nullable
+    public final String mergesCurrentDocs() {
+        return this.mergesCurrentDocs;
+    }
+
+    /**
+     * size of current merges
+     * <p>
+     * API name: {@code merges.current_size}
+     */
+    @Nullable
+    public final String mergesCurrentSize() {
+        return this.mergesCurrentSize;
+    }
+
+    /**
+     * number of completed merge ops
+     * <p>
+     * API name: {@code merges.total}
+     */
+    @Nullable
+    public final String mergesTotal() {
+        return this.mergesTotal;
+    }
+
+    /**
+     * docs merged
+     * <p>
+     * API name: {@code merges.total_docs}
+     */
+    @Nullable
+    public final String mergesTotalDocs() {
+        return this.mergesTotalDocs;
+    }
+
+    /**
+     * size merged
+     * <p>
+     * API name: {@code merges.total_size}
+     */
+    @Nullable
+    public final String mergesTotalSize() {
+        return this.mergesTotalSize;
+    }
+
+    /**
+     * time spent in merges
+     * <p>
+     * API name: {@code merges.total_time}
+     */
+    @Nullable
+    public final String mergesTotalTime() {
+        return this.mergesTotalTime;
+    }
+
+    /**
+     * total refreshes
+     * <p>
+     * API name: {@code refresh.total}
+     */
+    @Nullable
+    public final String refreshTotal() {
+        return this.refreshTotal;
+    }
+
+    /**
+     * time spent in refreshes
+     * <p>
+     * API name: {@code refresh.time}
+     */
+    @Nullable
+    public final String refreshTime() {
+        return this.refreshTime;
+    }
+
+    /**
+     * total external refreshes
+     * <p>
+     * API name: {@code refresh.external_total}
+     */
+    @Nullable
+    public final String refreshExternalTotal() {
+        return this.refreshExternalTotal;
+    }
+
+    /**
+     * time spent in external refreshes
+     * <p>
+     * API name: {@code refresh.external_time}
+     */
+    @Nullable
+    public final String refreshExternalTime() {
+        return this.refreshExternalTime;
+    }
+
+    /**
+     * number of pending refresh listeners
+     * <p>
+     * API name: {@code refresh.listeners}
+     */
+    @Nullable
+    public final String refreshListeners() {
+        return this.refreshListeners;
+    }
+
+    /**
+     * current fetch phase ops
+     * <p>
+     * API name: {@code search.fetch_current}
+     */
+    @Nullable
+    public final String searchFetchCurrent() {
+        return this.searchFetchCurrent;
+    }
+
+    /**
+     * time spent in fetch phase
+     * <p>
+     * API name: {@code search.fetch_time}
+     */
+    @Nullable
+    public final String searchFetchTime() {
+        return this.searchFetchTime;
+    }
+
+    /**
+     * total fetch ops
+     * <p>
+     * API name: {@code search.fetch_total}
+     */
+    @Nullable
+    public final String searchFetchTotal() {
+        return this.searchFetchTotal;
+    }
+
+    /**
+     * open search contexts
+     * <p>
+     * API name: {@code search.open_contexts}
+     */
+    @Nullable
+    public final String searchOpenContexts() {
+        return this.searchOpenContexts;
+    }
+
+    /**
+     * current query phase ops
+     * <p>
+     * API name: {@code search.query_current}
+     */
+    @Nullable
+    public final String searchQueryCurrent() {
+        return this.searchQueryCurrent;
+    }
+
+    /**
+     * time spent in query phase
+     * <p>
+     * API name: {@code search.query_time}
+     */
+    @Nullable
+    public final String searchQueryTime() {
+        return this.searchQueryTime;
+    }
+
+    /**
+     * total query phase ops
+     * <p>
+     * API name: {@code search.query_total}
+     */
+    @Nullable
+    public final String searchQueryTotal() {
+        return this.searchQueryTotal;
+    }
+
+    /**
+     * open scroll contexts
+     * <p>
+     * API name: {@code search.scroll_current}
+     */
+    @Nullable
+    public final String searchScrollCurrent() {
+        return this.searchScrollCurrent;
+    }
+
+    /**
+     * time scroll contexts held open
+     * <p>
+     * API name: {@code search.scroll_time}
+     */
+    @Nullable
+    public final String searchScrollTime() {
+        return this.searchScrollTime;
+    }
+
+    /**
+     * completed scroll contexts
+     * <p>
+     * API name: {@code search.scroll_total}
+     */
+    @Nullable
+    public final String searchScrollTotal() {
+        return this.searchScrollTotal;
+    }
+
+    /**
+     * number of segments
+     * <p>
+     * API name: {@code segments.count}
+     */
+    @Nullable
+    public final String segmentsCount() {
+        return this.segmentsCount;
+    }
+
+    /**
+     * memory used by segments
+     * <p>
+     * API name: {@code segments.memory}
+     */
+    @Nullable
+    public final String segmentsMemory() {
+        return this.segmentsMemory;
+    }
+
+    /**
+     * memory used by index writer
+     * <p>
+     * API name: {@code segments.index_writer_memory}
+     */
+    @Nullable
+    public final String segmentsIndexWriterMemory() {
+        return this.segmentsIndexWriterMemory;
+    }
+
+    /**
+     * memory used by version map
+     * <p>
+     * API name: {@code segments.version_map_memory}
+     */
+    @Nullable
+    public final String segmentsVersionMapMemory() {
+        return this.segmentsVersionMapMemory;
+    }
+
+    /**
+     * memory used by fixed bit sets for nested object field types and export type
+     * filters for types referred in _parent fields
+     * <p>
+     * API name: {@code segments.fixed_bitset_memory}
+     */
+    @Nullable
+    public final String segmentsFixedBitsetMemory() {
+        return this.segmentsFixedBitsetMemory;
+    }
+
+    /**
+     * max sequence number
+     * <p>
+     * API name: {@code seq_no.max}
+     */
+    @Nullable
+    public final String seqNoMax() {
+        return this.seqNoMax;
+    }
+
+    /**
+     * local checkpoint
+     * <p>
+     * API name: {@code seq_no.local_checkpoint}
+     */
+    @Nullable
+    public final String seqNoLocalCheckpoint() {
+        return this.seqNoLocalCheckpoint;
+    }
+
+    /**
+     * global checkpoint
+     * <p>
+     * API name: {@code seq_no.global_checkpoint}
+     */
+    @Nullable
+    public final String seqNoGlobalCheckpoint() {
+        return this.seqNoGlobalCheckpoint;
+    }
+
+    /**
+     * current warmer ops
+     * <p>
+     * API name: {@code warmer.current}
+     */
+    @Nullable
+    public final String warmerCurrent() {
+        return this.warmerCurrent;
+    }
+
+    /**
+     * total warmer ops
+     * <p>
+     * API name: {@code warmer.total}
+     */
+    @Nullable
+    public final String warmerTotal() {
+        return this.warmerTotal;
+    }
+
+    /**
+     * time spent in warmers
+     * <p>
+     * API name: {@code warmer.total_time}
+     */
+    @Nullable
+    public final String warmerTotalTime() {
+        return this.warmerTotalTime;
+    }
+
+    /**
+     * shard data path
+     * <p>
+     * API name: {@code path.data}
+     */
+    @Nullable
+    public final String pathData() {
+        return this.pathData;
+    }
+
+    /**
+     * shard state path
+     * <p>
+     * API name: {@code path.state}
+     */
+    @Nullable
+    public final String pathState() {
+        return this.pathState;
+    }
+
+    /**
+     * number of bulk shard ops
+     * <p>
+     * API name: {@code bulk.total_operations}
+     */
+    @Nullable
+    public final String bulkTotalOperations() {
+        return this.bulkTotalOperations;
+    }
+
+    /**
+     * time spend in shard bulk
+     * <p>
+     * API name: {@code bulk.total_time}
+     */
+    @Nullable
+    public final String bulkTotalTime() {
+        return this.bulkTotalTime;
+    }
+
+    /**
+     * total size in bytes of shard bulk
+     * <p>
+     * API name: {@code bulk.total_size_in_bytes}
+     */
+    @Nullable
+    public final String bulkTotalSizeInBytes() {
+        return this.bulkTotalSizeInBytes;
+    }
+
+    /**
+     * average time spend in shard bulk
+     * <p>
+     * API name: {@code bulk.avg_time}
+     */
+    @Nullable
+    public final String bulkAvgTime() {
+        return this.bulkAvgTime;
+    }
+
+    /**
+     * avg size in bytes of shard bulk
+     * <p>
+     * API name: {@code bulk.avg_size_in_bytes}
+     */
+    @Nullable
+    public final String bulkAvgSizeInBytes() {
+        return this.bulkAvgSizeInBytes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.shard != null) {
+            generator.writeKey("shard");
+            generator.write(this.shard);
+
+        }
+        if (this.prirep != null) {
+            generator.writeKey("prirep");
+            generator.write(this.prirep);
+
+        }
+        if (this.state != null) {
+            generator.writeKey("state");
+            generator.write(this.state);
+
+        }
+        if (this.docs != null) {
+            generator.writeKey("docs");
+            generator.write(this.docs);
+
+        }
+        if (this.store != null) {
+            generator.writeKey("store");
+            generator.write(this.store);
+
+        }
+        if (this.ip != null) {
+            generator.writeKey("ip");
+            generator.write(this.ip);
+
+        }
+        if (this.id != null) {
+            generator.writeKey("id");
+            generator.write(this.id);
+
+        }
+        if (this.node != null) {
+            generator.writeKey("node");
+            generator.write(this.node);
+
+        }
+        if (this.syncId != null) {
+            generator.writeKey("sync_id");
+            generator.write(this.syncId);
+
+        }
+        if (this.unassignedReason != null) {
+            generator.writeKey("unassigned.reason");
+            generator.write(this.unassignedReason);
+
+        }
+        if (this.unassignedAt != null) {
+            generator.writeKey("unassigned.at");
+            generator.write(this.unassignedAt);
+
+        }
+        if (this.unassignedFor != null) {
+            generator.writeKey("unassigned.for");
+            generator.write(this.unassignedFor);
+
+        }
+        if (this.unassignedDetails != null) {
+            generator.writeKey("unassigned.details");
+            generator.write(this.unassignedDetails);
+
+        }
+        if (this.recoverysourceType != null) {
+            generator.writeKey("recoverysource.type");
+            generator.write(this.recoverysourceType);
+
+        }
+        if (this.completionSize != null) {
+            generator.writeKey("completion.size");
+            generator.write(this.completionSize);
+
+        }
+        if (this.fielddataMemorySize != null) {
+            generator.writeKey("fielddata.memory_size");
+            generator.write(this.fielddataMemorySize);
+
+        }
+        if (this.fielddataEvictions != null) {
+            generator.writeKey("fielddata.evictions");
+            generator.write(this.fielddataEvictions);
+
+        }
+        if (this.queryCacheMemorySize != null) {
+            generator.writeKey("query_cache.memory_size");
+            generator.write(this.queryCacheMemorySize);
+
+        }
+        if (this.queryCacheEvictions != null) {
+            generator.writeKey("query_cache.evictions");
+            generator.write(this.queryCacheEvictions);
+
+        }
+        if (this.flushTotal != null) {
+            generator.writeKey("flush.total");
+            generator.write(this.flushTotal);
+
+        }
+        if (this.flushTotalTime != null) {
+            generator.writeKey("flush.total_time");
+            generator.write(this.flushTotalTime);
+
+        }
+        if (this.getCurrent != null) {
+            generator.writeKey("get.current");
+            generator.write(this.getCurrent);
+
+        }
+        if (this.getTime != null) {
+            generator.writeKey("get.time");
+            generator.write(this.getTime);
+
+        }
+        if (this.getTotal != null) {
+            generator.writeKey("get.total");
+            generator.write(this.getTotal);
+
+        }
+        if (this.getExistsTime != null) {
+            generator.writeKey("get.exists_time");
+            generator.write(this.getExistsTime);
+
+        }
+        if (this.getExistsTotal != null) {
+            generator.writeKey("get.exists_total");
+            generator.write(this.getExistsTotal);
+
+        }
+        if (this.getMissingTime != null) {
+            generator.writeKey("get.missing_time");
+            generator.write(this.getMissingTime);
+
+        }
+        if (this.getMissingTotal != null) {
+            generator.writeKey("get.missing_total");
+            generator.write(this.getMissingTotal);
+
+        }
+        if (this.indexingDeleteCurrent != null) {
+            generator.writeKey("indexing.delete_current");
+            generator.write(this.indexingDeleteCurrent);
+
+        }
+        if (this.indexingDeleteTime != null) {
+            generator.writeKey("indexing.delete_time");
+            generator.write(this.indexingDeleteTime);
+
+        }
+        if (this.indexingDeleteTotal != null) {
+            generator.writeKey("indexing.delete_total");
+            generator.write(this.indexingDeleteTotal);
+
+        }
+        if (this.indexingIndexCurrent != null) {
+            generator.writeKey("indexing.index_current");
+            generator.write(this.indexingIndexCurrent);
+
+        }
+        if (this.indexingIndexTime != null) {
+            generator.writeKey("indexing.index_time");
+            generator.write(this.indexingIndexTime);
+
+        }
+        if (this.indexingIndexTotal != null) {
+            generator.writeKey("indexing.index_total");
+            generator.write(this.indexingIndexTotal);
+
+        }
+        if (this.indexingIndexFailed != null) {
+            generator.writeKey("indexing.index_failed");
+            generator.write(this.indexingIndexFailed);
+
+        }
+        if (this.mergesCurrent != null) {
+            generator.writeKey("merges.current");
+            generator.write(this.mergesCurrent);
+
+        }
+        if (this.mergesCurrentDocs != null) {
+            generator.writeKey("merges.current_docs");
+            generator.write(this.mergesCurrentDocs);
+
+        }
+        if (this.mergesCurrentSize != null) {
+            generator.writeKey("merges.current_size");
+            generator.write(this.mergesCurrentSize);
+
+        }
+        if (this.mergesTotal != null) {
+            generator.writeKey("merges.total");
+            generator.write(this.mergesTotal);
+
+        }
+        if (this.mergesTotalDocs != null) {
+            generator.writeKey("merges.total_docs");
+            generator.write(this.mergesTotalDocs);
+
+        }
+        if (this.mergesTotalSize != null) {
+            generator.writeKey("merges.total_size");
+            generator.write(this.mergesTotalSize);
+
+        }
+        if (this.mergesTotalTime != null) {
+            generator.writeKey("merges.total_time");
+            generator.write(this.mergesTotalTime);
+
+        }
+        if (this.refreshTotal != null) {
+            generator.writeKey("refresh.total");
+            generator.write(this.refreshTotal);
+
+        }
+        if (this.refreshTime != null) {
+            generator.writeKey("refresh.time");
+            generator.write(this.refreshTime);
+
+        }
+        if (this.refreshExternalTotal != null) {
+            generator.writeKey("refresh.external_total");
+            generator.write(this.refreshExternalTotal);
+
+        }
+        if (this.refreshExternalTime != null) {
+            generator.writeKey("refresh.external_time");
+            generator.write(this.refreshExternalTime);
+
+        }
+        if (this.refreshListeners != null) {
+            generator.writeKey("refresh.listeners");
+            generator.write(this.refreshListeners);
+
+        }
+        if (this.searchFetchCurrent != null) {
+            generator.writeKey("search.fetch_current");
+            generator.write(this.searchFetchCurrent);
+
+        }
+        if (this.searchFetchTime != null) {
+            generator.writeKey("search.fetch_time");
+            generator.write(this.searchFetchTime);
+
+        }
+        if (this.searchFetchTotal != null) {
+            generator.writeKey("search.fetch_total");
+            generator.write(this.searchFetchTotal);
+
+        }
+        if (this.searchOpenContexts != null) {
+            generator.writeKey("search.open_contexts");
+            generator.write(this.searchOpenContexts);
+
+        }
+        if (this.searchQueryCurrent != null) {
+            generator.writeKey("search.query_current");
+            generator.write(this.searchQueryCurrent);
+
+        }
+        if (this.searchQueryTime != null) {
+            generator.writeKey("search.query_time");
+            generator.write(this.searchQueryTime);
+
+        }
+        if (this.searchQueryTotal != null) {
+            generator.writeKey("search.query_total");
+            generator.write(this.searchQueryTotal);
+
+        }
+        if (this.searchScrollCurrent != null) {
+            generator.writeKey("search.scroll_current");
+            generator.write(this.searchScrollCurrent);
+
+        }
+        if (this.searchScrollTime != null) {
+            generator.writeKey("search.scroll_time");
+            generator.write(this.searchScrollTime);
+
+        }
+        if (this.searchScrollTotal != null) {
+            generator.writeKey("search.scroll_total");
+            generator.write(this.searchScrollTotal);
+
+        }
+        if (this.segmentsCount != null) {
+            generator.writeKey("segments.count");
+            generator.write(this.segmentsCount);
+
+        }
+        if (this.segmentsMemory != null) {
+            generator.writeKey("segments.memory");
+            generator.write(this.segmentsMemory);
+
+        }
+        if (this.segmentsIndexWriterMemory != null) {
+            generator.writeKey("segments.index_writer_memory");
+            generator.write(this.segmentsIndexWriterMemory);
+
+        }
+        if (this.segmentsVersionMapMemory != null) {
+            generator.writeKey("segments.version_map_memory");
+            generator.write(this.segmentsVersionMapMemory);
+
+        }
+        if (this.segmentsFixedBitsetMemory != null) {
+            generator.writeKey("segments.fixed_bitset_memory");
+            generator.write(this.segmentsFixedBitsetMemory);
+
+        }
+        if (this.seqNoMax != null) {
+            generator.writeKey("seq_no.max");
+            generator.write(this.seqNoMax);
+
+        }
+        if (this.seqNoLocalCheckpoint != null) {
+            generator.writeKey("seq_no.local_checkpoint");
+            generator.write(this.seqNoLocalCheckpoint);
+
+        }
+        if (this.seqNoGlobalCheckpoint != null) {
+            generator.writeKey("seq_no.global_checkpoint");
+            generator.write(this.seqNoGlobalCheckpoint);
+
+        }
+        if (this.warmerCurrent != null) {
+            generator.writeKey("warmer.current");
+            generator.write(this.warmerCurrent);
+
+        }
+        if (this.warmerTotal != null) {
+            generator.writeKey("warmer.total");
+            generator.write(this.warmerTotal);
+
+        }
+        if (this.warmerTotalTime != null) {
+            generator.writeKey("warmer.total_time");
+            generator.write(this.warmerTotalTime);
 
-		}
-		if (this.pathData != null) {
-			generator.writeKey("path.data");
-			generator.write(this.pathData);
+        }
+        if (this.pathData != null) {
+            generator.writeKey("path.data");
+            generator.write(this.pathData);
 
-		}
-		if (this.pathState != null) {
-			generator.writeKey("path.state");
-			generator.write(this.pathState);
+        }
+        if (this.pathState != null) {
+            generator.writeKey("path.state");
+            generator.write(this.pathState);
 
-		}
-		if (this.bulkTotalOperations != null) {
-			generator.writeKey("bulk.total_operations");
-			generator.write(this.bulkTotalOperations);
+        }
+        if (this.bulkTotalOperations != null) {
+            generator.writeKey("bulk.total_operations");
+            generator.write(this.bulkTotalOperations);
 
-		}
-		if (this.bulkTotalTime != null) {
-			generator.writeKey("bulk.total_time");
-			generator.write(this.bulkTotalTime);
+        }
+        if (this.bulkTotalTime != null) {
+            generator.writeKey("bulk.total_time");
+            generator.write(this.bulkTotalTime);
 
-		}
-		if (this.bulkTotalSizeInBytes != null) {
-			generator.writeKey("bulk.total_size_in_bytes");
-			generator.write(this.bulkTotalSizeInBytes);
+        }
+        if (this.bulkTotalSizeInBytes != null) {
+            generator.writeKey("bulk.total_size_in_bytes");
+            generator.write(this.bulkTotalSizeInBytes);
 
-		}
-		if (this.bulkAvgTime != null) {
-			generator.writeKey("bulk.avg_time");
-			generator.write(this.bulkAvgTime);
+        }
+        if (this.bulkAvgTime != null) {
+            generator.writeKey("bulk.avg_time");
+            generator.write(this.bulkAvgTime);
 
-		}
-		if (this.bulkAvgSizeInBytes != null) {
-			generator.writeKey("bulk.avg_size_in_bytes");
-			generator.write(this.bulkAvgSizeInBytes);
+        }
+        if (this.bulkAvgSizeInBytes != null) {
+            generator.writeKey("bulk.avg_size_in_bytes");
+            generator.write(this.bulkAvgSizeInBytes);
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link ShardsRecord}.
-	 */
+    /**
+     * Builder for {@link ShardsRecord}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardsRecord> {
-		@Nullable
-		private String index;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardsRecord> {
+        @Nullable
+        private String index;
 
-		@Nullable
-		private String shard;
+        @Nullable
+        private String shard;
 
-		@Nullable
-		private String prirep;
+        @Nullable
+        private String prirep;
 
-		@Nullable
-		private String state;
+        @Nullable
+        private String state;
 
-		@Nullable
-		private String docs;
+        @Nullable
+        private String docs;
 
-		@Nullable
-		private String store;
+        @Nullable
+        private String store;
 
-		@Nullable
-		private String ip;
+        @Nullable
+        private String ip;
 
-		@Nullable
-		private String id;
+        @Nullable
+        private String id;
 
-		@Nullable
-		private String node;
+        @Nullable
+        private String node;
 
-		@Nullable
-		private String syncId;
+        @Nullable
+        private String syncId;
 
-		@Nullable
-		private String unassignedReason;
+        @Nullable
+        private String unassignedReason;
 
-		@Nullable
-		private String unassignedAt;
+        @Nullable
+        private String unassignedAt;
 
-		@Nullable
-		private String unassignedFor;
+        @Nullable
+        private String unassignedFor;
 
-		@Nullable
-		private String unassignedDetails;
+        @Nullable
+        private String unassignedDetails;
 
-		@Nullable
-		private String recoverysourceType;
+        @Nullable
+        private String recoverysourceType;
 
-		@Nullable
-		private String completionSize;
+        @Nullable
+        private String completionSize;
 
-		@Nullable
-		private String fielddataMemorySize;
+        @Nullable
+        private String fielddataMemorySize;
 
-		@Nullable
-		private String fielddataEvictions;
+        @Nullable
+        private String fielddataEvictions;
 
-		@Nullable
-		private String queryCacheMemorySize;
+        @Nullable
+        private String queryCacheMemorySize;
 
-		@Nullable
-		private String queryCacheEvictions;
+        @Nullable
+        private String queryCacheEvictions;
 
-		@Nullable
-		private String flushTotal;
+        @Nullable
+        private String flushTotal;
 
-		@Nullable
-		private String flushTotalTime;
+        @Nullable
+        private String flushTotalTime;
 
-		@Nullable
-		private String getCurrent;
+        @Nullable
+        private String getCurrent;
 
-		@Nullable
-		private String getTime;
+        @Nullable
+        private String getTime;
 
-		@Nullable
-		private String getTotal;
+        @Nullable
+        private String getTotal;
 
-		@Nullable
-		private String getExistsTime;
+        @Nullable
+        private String getExistsTime;
 
-		@Nullable
-		private String getExistsTotal;
+        @Nullable
+        private String getExistsTotal;
 
-		@Nullable
-		private String getMissingTime;
+        @Nullable
+        private String getMissingTime;
 
-		@Nullable
-		private String getMissingTotal;
+        @Nullable
+        private String getMissingTotal;
 
-		@Nullable
-		private String indexingDeleteCurrent;
+        @Nullable
+        private String indexingDeleteCurrent;
 
-		@Nullable
-		private String indexingDeleteTime;
+        @Nullable
+        private String indexingDeleteTime;
 
-		@Nullable
-		private String indexingDeleteTotal;
+        @Nullable
+        private String indexingDeleteTotal;
 
-		@Nullable
-		private String indexingIndexCurrent;
+        @Nullable
+        private String indexingIndexCurrent;
 
-		@Nullable
-		private String indexingIndexTime;
+        @Nullable
+        private String indexingIndexTime;
 
-		@Nullable
-		private String indexingIndexTotal;
+        @Nullable
+        private String indexingIndexTotal;
 
-		@Nullable
-		private String indexingIndexFailed;
+        @Nullable
+        private String indexingIndexFailed;
 
-		@Nullable
-		private String mergesCurrent;
+        @Nullable
+        private String mergesCurrent;
 
-		@Nullable
-		private String mergesCurrentDocs;
+        @Nullable
+        private String mergesCurrentDocs;
 
-		@Nullable
-		private String mergesCurrentSize;
+        @Nullable
+        private String mergesCurrentSize;
 
-		@Nullable
-		private String mergesTotal;
+        @Nullable
+        private String mergesTotal;
 
-		@Nullable
-		private String mergesTotalDocs;
+        @Nullable
+        private String mergesTotalDocs;
 
-		@Nullable
-		private String mergesTotalSize;
+        @Nullable
+        private String mergesTotalSize;
 
-		@Nullable
-		private String mergesTotalTime;
+        @Nullable
+        private String mergesTotalTime;
 
-		@Nullable
-		private String refreshTotal;
+        @Nullable
+        private String refreshTotal;
 
-		@Nullable
-		private String refreshTime;
+        @Nullable
+        private String refreshTime;
 
-		@Nullable
-		private String refreshExternalTotal;
+        @Nullable
+        private String refreshExternalTotal;
 
-		@Nullable
-		private String refreshExternalTime;
+        @Nullable
+        private String refreshExternalTime;
 
-		@Nullable
-		private String refreshListeners;
+        @Nullable
+        private String refreshListeners;
 
-		@Nullable
-		private String searchFetchCurrent;
+        @Nullable
+        private String searchFetchCurrent;
 
-		@Nullable
-		private String searchFetchTime;
+        @Nullable
+        private String searchFetchTime;
 
-		@Nullable
-		private String searchFetchTotal;
+        @Nullable
+        private String searchFetchTotal;
 
-		@Nullable
-		private String searchOpenContexts;
+        @Nullable
+        private String searchOpenContexts;
 
-		@Nullable
-		private String searchQueryCurrent;
+        @Nullable
+        private String searchQueryCurrent;
 
-		@Nullable
-		private String searchQueryTime;
+        @Nullable
+        private String searchQueryTime;
 
-		@Nullable
-		private String searchQueryTotal;
+        @Nullable
+        private String searchQueryTotal;
 
-		@Nullable
-		private String searchScrollCurrent;
+        @Nullable
+        private String searchScrollCurrent;
 
-		@Nullable
-		private String searchScrollTime;
+        @Nullable
+        private String searchScrollTime;
 
-		@Nullable
-		private String searchScrollTotal;
+        @Nullable
+        private String searchScrollTotal;
 
-		@Nullable
-		private String segmentsCount;
+        @Nullable
+        private String segmentsCount;
 
-		@Nullable
-		private String segmentsMemory;
+        @Nullable
+        private String segmentsMemory;
 
-		@Nullable
-		private String segmentsIndexWriterMemory;
+        @Nullable
+        private String segmentsIndexWriterMemory;
 
-		@Nullable
-		private String segmentsVersionMapMemory;
+        @Nullable
+        private String segmentsVersionMapMemory;
 
-		@Nullable
-		private String segmentsFixedBitsetMemory;
+        @Nullable
+        private String segmentsFixedBitsetMemory;
 
-		@Nullable
-		private String seqNoMax;
+        @Nullable
+        private String seqNoMax;
 
-		@Nullable
-		private String seqNoLocalCheckpoint;
+        @Nullable
+        private String seqNoLocalCheckpoint;
 
-		@Nullable
-		private String seqNoGlobalCheckpoint;
+        @Nullable
+        private String seqNoGlobalCheckpoint;
 
-		@Nullable
-		private String warmerCurrent;
+        @Nullable
+        private String warmerCurrent;
 
-		@Nullable
-		private String warmerTotal;
-
-		@Nullable
-		private String warmerTotalTime;
-
-		@Nullable
-		private String pathData;
-
-		@Nullable
-		private String pathState;
-
-		@Nullable
-		private String bulkTotalOperations;
-
-		@Nullable
-		private String bulkTotalTime;
-
-		@Nullable
-		private String bulkTotalSizeInBytes;
-
-		@Nullable
-		private String bulkAvgTime;
-
-		@Nullable
-		private String bulkAvgSizeInBytes;
-
-		/**
-		 * index name
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * shard name
-		 * <p>
-		 * API name: {@code shard}
-		 */
-		public final Builder shard(@Nullable String value) {
-			this.shard = value;
-			return this;
-		}
-
-		/**
-		 * primary or replica
-		 * <p>
-		 * API name: {@code prirep}
-		 */
-		public final Builder prirep(@Nullable String value) {
-			this.prirep = value;
-			return this;
-		}
-
-		/**
-		 * shard state
-		 * <p>
-		 * API name: {@code state}
-		 */
-		public final Builder state(@Nullable String value) {
-			this.state = value;
-			return this;
-		}
-
-		/**
-		 * number of docs in shard
-		 * <p>
-		 * API name: {@code docs}
-		 */
-		public final Builder docs(@Nullable String value) {
-			this.docs = value;
-			return this;
-		}
-
-		/**
-		 * store size of shard (how much disk it uses)
-		 * <p>
-		 * API name: {@code store}
-		 */
-		public final Builder store(@Nullable String value) {
-			this.store = value;
-			return this;
-		}
-
-		/**
-		 * ip of node where it lives
-		 * <p>
-		 * API name: {@code ip}
-		 */
-		public final Builder ip(@Nullable String value) {
-			this.ip = value;
-			return this;
-		}
-
-		/**
-		 * unique id of node where it lives
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * name of node where it lives
-		 * <p>
-		 * API name: {@code node}
-		 */
-		public final Builder node(@Nullable String value) {
-			this.node = value;
-			return this;
-		}
-
-		/**
-		 * sync id
-		 * <p>
-		 * API name: {@code sync_id}
-		 */
-		public final Builder syncId(@Nullable String value) {
-			this.syncId = value;
-			return this;
-		}
-
-		/**
-		 * reason shard is unassigned
-		 * <p>
-		 * API name: {@code unassigned.reason}
-		 */
-		public final Builder unassignedReason(@Nullable String value) {
-			this.unassignedReason = value;
-			return this;
-		}
-
-		/**
-		 * time shard became unassigned (UTC)
-		 * <p>
-		 * API name: {@code unassigned.at}
-		 */
-		public final Builder unassignedAt(@Nullable String value) {
-			this.unassignedAt = value;
-			return this;
-		}
-
-		/**
-		 * time has been unassigned
-		 * <p>
-		 * API name: {@code unassigned.for}
-		 */
-		public final Builder unassignedFor(@Nullable String value) {
-			this.unassignedFor = value;
-			return this;
-		}
-
-		/**
-		 * additional details as to why the shard became unassigned
-		 * <p>
-		 * API name: {@code unassigned.details}
-		 */
-		public final Builder unassignedDetails(@Nullable String value) {
-			this.unassignedDetails = value;
-			return this;
-		}
-
-		/**
-		 * recovery source type
-		 * <p>
-		 * API name: {@code recoverysource.type}
-		 */
-		public final Builder recoverysourceType(@Nullable String value) {
-			this.recoverysourceType = value;
-			return this;
-		}
-
-		/**
-		 * size of completion
-		 * <p>
-		 * API name: {@code completion.size}
-		 */
-		public final Builder completionSize(@Nullable String value) {
-			this.completionSize = value;
-			return this;
-		}
-
-		/**
-		 * used fielddata cache
-		 * <p>
-		 * API name: {@code fielddata.memory_size}
-		 */
-		public final Builder fielddataMemorySize(@Nullable String value) {
-			this.fielddataMemorySize = value;
-			return this;
-		}
-
-		/**
-		 * fielddata evictions
-		 * <p>
-		 * API name: {@code fielddata.evictions}
-		 */
-		public final Builder fielddataEvictions(@Nullable String value) {
-			this.fielddataEvictions = value;
-			return this;
-		}
-
-		/**
-		 * used query cache
-		 * <p>
-		 * API name: {@code query_cache.memory_size}
-		 */
-		public final Builder queryCacheMemorySize(@Nullable String value) {
-			this.queryCacheMemorySize = value;
-			return this;
-		}
-
-		/**
-		 * query cache evictions
-		 * <p>
-		 * API name: {@code query_cache.evictions}
-		 */
-		public final Builder queryCacheEvictions(@Nullable String value) {
-			this.queryCacheEvictions = value;
-			return this;
-		}
-
-		/**
-		 * number of flushes
-		 * <p>
-		 * API name: {@code flush.total}
-		 */
-		public final Builder flushTotal(@Nullable String value) {
-			this.flushTotal = value;
-			return this;
-		}
-
-		/**
-		 * time spent in flush
-		 * <p>
-		 * API name: {@code flush.total_time}
-		 */
-		public final Builder flushTotalTime(@Nullable String value) {
-			this.flushTotalTime = value;
-			return this;
-		}
-
-		/**
-		 * number of current get ops
-		 * <p>
-		 * API name: {@code get.current}
-		 */
-		public final Builder getCurrent(@Nullable String value) {
-			this.getCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time spent in get
-		 * <p>
-		 * API name: {@code get.time}
-		 */
-		public final Builder getTime(@Nullable String value) {
-			this.getTime = value;
-			return this;
-		}
-
-		/**
-		 * number of get ops
-		 * <p>
-		 * API name: {@code get.total}
-		 */
-		public final Builder getTotal(@Nullable String value) {
-			this.getTotal = value;
-			return this;
-		}
-
-		/**
-		 * time spent in successful gets
-		 * <p>
-		 * API name: {@code get.exists_time}
-		 */
-		public final Builder getExistsTime(@Nullable String value) {
-			this.getExistsTime = value;
-			return this;
-		}
-
-		/**
-		 * number of successful gets
-		 * <p>
-		 * API name: {@code get.exists_total}
-		 */
-		public final Builder getExistsTotal(@Nullable String value) {
-			this.getExistsTotal = value;
-			return this;
-		}
-
-		/**
-		 * time spent in failed gets
-		 * <p>
-		 * API name: {@code get.missing_time}
-		 */
-		public final Builder getMissingTime(@Nullable String value) {
-			this.getMissingTime = value;
-			return this;
-		}
-
-		/**
-		 * number of failed gets
-		 * <p>
-		 * API name: {@code get.missing_total}
-		 */
-		public final Builder getMissingTotal(@Nullable String value) {
-			this.getMissingTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of current deletions
-		 * <p>
-		 * API name: {@code indexing.delete_current}
-		 */
-		public final Builder indexingDeleteCurrent(@Nullable String value) {
-			this.indexingDeleteCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time spent in deletions
-		 * <p>
-		 * API name: {@code indexing.delete_time}
-		 */
-		public final Builder indexingDeleteTime(@Nullable String value) {
-			this.indexingDeleteTime = value;
-			return this;
-		}
-
-		/**
-		 * number of delete ops
-		 * <p>
-		 * API name: {@code indexing.delete_total}
-		 */
-		public final Builder indexingDeleteTotal(@Nullable String value) {
-			this.indexingDeleteTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of current indexing ops
-		 * <p>
-		 * API name: {@code indexing.index_current}
-		 */
-		public final Builder indexingIndexCurrent(@Nullable String value) {
-			this.indexingIndexCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time spent in indexing
-		 * <p>
-		 * API name: {@code indexing.index_time}
-		 */
-		public final Builder indexingIndexTime(@Nullable String value) {
-			this.indexingIndexTime = value;
-			return this;
-		}
-
-		/**
-		 * number of indexing ops
-		 * <p>
-		 * API name: {@code indexing.index_total}
-		 */
-		public final Builder indexingIndexTotal(@Nullable String value) {
-			this.indexingIndexTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of failed indexing ops
-		 * <p>
-		 * API name: {@code indexing.index_failed}
-		 */
-		public final Builder indexingIndexFailed(@Nullable String value) {
-			this.indexingIndexFailed = value;
-			return this;
-		}
-
-		/**
-		 * number of current merges
-		 * <p>
-		 * API name: {@code merges.current}
-		 */
-		public final Builder mergesCurrent(@Nullable String value) {
-			this.mergesCurrent = value;
-			return this;
-		}
-
-		/**
-		 * number of current merging docs
-		 * <p>
-		 * API name: {@code merges.current_docs}
-		 */
-		public final Builder mergesCurrentDocs(@Nullable String value) {
-			this.mergesCurrentDocs = value;
-			return this;
-		}
-
-		/**
-		 * size of current merges
-		 * <p>
-		 * API name: {@code merges.current_size}
-		 */
-		public final Builder mergesCurrentSize(@Nullable String value) {
-			this.mergesCurrentSize = value;
-			return this;
-		}
-
-		/**
-		 * number of completed merge ops
-		 * <p>
-		 * API name: {@code merges.total}
-		 */
-		public final Builder mergesTotal(@Nullable String value) {
-			this.mergesTotal = value;
-			return this;
-		}
-
-		/**
-		 * docs merged
-		 * <p>
-		 * API name: {@code merges.total_docs}
-		 */
-		public final Builder mergesTotalDocs(@Nullable String value) {
-			this.mergesTotalDocs = value;
-			return this;
-		}
-
-		/**
-		 * size merged
-		 * <p>
-		 * API name: {@code merges.total_size}
-		 */
-		public final Builder mergesTotalSize(@Nullable String value) {
-			this.mergesTotalSize = value;
-			return this;
-		}
-
-		/**
-		 * time spent in merges
-		 * <p>
-		 * API name: {@code merges.total_time}
-		 */
-		public final Builder mergesTotalTime(@Nullable String value) {
-			this.mergesTotalTime = value;
-			return this;
-		}
-
-		/**
-		 * total refreshes
-		 * <p>
-		 * API name: {@code refresh.total}
-		 */
-		public final Builder refreshTotal(@Nullable String value) {
-			this.refreshTotal = value;
-			return this;
-		}
-
-		/**
-		 * time spent in refreshes
-		 * <p>
-		 * API name: {@code refresh.time}
-		 */
-		public final Builder refreshTime(@Nullable String value) {
-			this.refreshTime = value;
-			return this;
-		}
-
-		/**
-		 * total external refreshes
-		 * <p>
-		 * API name: {@code refresh.external_total}
-		 */
-		public final Builder refreshExternalTotal(@Nullable String value) {
-			this.refreshExternalTotal = value;
-			return this;
-		}
-
-		/**
-		 * time spent in external refreshes
-		 * <p>
-		 * API name: {@code refresh.external_time}
-		 */
-		public final Builder refreshExternalTime(@Nullable String value) {
-			this.refreshExternalTime = value;
-			return this;
-		}
-
-		/**
-		 * number of pending refresh listeners
-		 * <p>
-		 * API name: {@code refresh.listeners}
-		 */
-		public final Builder refreshListeners(@Nullable String value) {
-			this.refreshListeners = value;
-			return this;
-		}
-
-		/**
-		 * current fetch phase ops
-		 * <p>
-		 * API name: {@code search.fetch_current}
-		 */
-		public final Builder searchFetchCurrent(@Nullable String value) {
-			this.searchFetchCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time spent in fetch phase
-		 * <p>
-		 * API name: {@code search.fetch_time}
-		 */
-		public final Builder searchFetchTime(@Nullable String value) {
-			this.searchFetchTime = value;
-			return this;
-		}
-
-		/**
-		 * total fetch ops
-		 * <p>
-		 * API name: {@code search.fetch_total}
-		 */
-		public final Builder searchFetchTotal(@Nullable String value) {
-			this.searchFetchTotal = value;
-			return this;
-		}
-
-		/**
-		 * open search contexts
-		 * <p>
-		 * API name: {@code search.open_contexts}
-		 */
-		public final Builder searchOpenContexts(@Nullable String value) {
-			this.searchOpenContexts = value;
-			return this;
-		}
-
-		/**
-		 * current query phase ops
-		 * <p>
-		 * API name: {@code search.query_current}
-		 */
-		public final Builder searchQueryCurrent(@Nullable String value) {
-			this.searchQueryCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time spent in query phase
-		 * <p>
-		 * API name: {@code search.query_time}
-		 */
-		public final Builder searchQueryTime(@Nullable String value) {
-			this.searchQueryTime = value;
-			return this;
-		}
-
-		/**
-		 * total query phase ops
-		 * <p>
-		 * API name: {@code search.query_total}
-		 */
-		public final Builder searchQueryTotal(@Nullable String value) {
-			this.searchQueryTotal = value;
-			return this;
-		}
-
-		/**
-		 * open scroll contexts
-		 * <p>
-		 * API name: {@code search.scroll_current}
-		 */
-		public final Builder searchScrollCurrent(@Nullable String value) {
-			this.searchScrollCurrent = value;
-			return this;
-		}
-
-		/**
-		 * time scroll contexts held open
-		 * <p>
-		 * API name: {@code search.scroll_time}
-		 */
-		public final Builder searchScrollTime(@Nullable String value) {
-			this.searchScrollTime = value;
-			return this;
-		}
-
-		/**
-		 * completed scroll contexts
-		 * <p>
-		 * API name: {@code search.scroll_total}
-		 */
-		public final Builder searchScrollTotal(@Nullable String value) {
-			this.searchScrollTotal = value;
-			return this;
-		}
-
-		/**
-		 * number of segments
-		 * <p>
-		 * API name: {@code segments.count}
-		 */
-		public final Builder segmentsCount(@Nullable String value) {
-			this.segmentsCount = value;
-			return this;
-		}
-
-		/**
-		 * memory used by segments
-		 * <p>
-		 * API name: {@code segments.memory}
-		 */
-		public final Builder segmentsMemory(@Nullable String value) {
-			this.segmentsMemory = value;
-			return this;
-		}
-
-		/**
-		 * memory used by index writer
-		 * <p>
-		 * API name: {@code segments.index_writer_memory}
-		 */
-		public final Builder segmentsIndexWriterMemory(@Nullable String value) {
-			this.segmentsIndexWriterMemory = value;
-			return this;
-		}
-
-		/**
-		 * memory used by version map
-		 * <p>
-		 * API name: {@code segments.version_map_memory}
-		 */
-		public final Builder segmentsVersionMapMemory(@Nullable String value) {
-			this.segmentsVersionMapMemory = value;
-			return this;
-		}
-
-		/**
-		 * memory used by fixed bit sets for nested object field types and export type
-		 * filters for types referred in _parent fields
-		 * <p>
-		 * API name: {@code segments.fixed_bitset_memory}
-		 */
-		public final Builder segmentsFixedBitsetMemory(@Nullable String value) {
-			this.segmentsFixedBitsetMemory = value;
-			return this;
-		}
-
-		/**
-		 * max sequence number
-		 * <p>
-		 * API name: {@code seq_no.max}
-		 */
-		public final Builder seqNoMax(@Nullable String value) {
-			this.seqNoMax = value;
-			return this;
-		}
-
-		/**
-		 * local checkpoint
-		 * <p>
-		 * API name: {@code seq_no.local_checkpoint}
-		 */
-		public final Builder seqNoLocalCheckpoint(@Nullable String value) {
-			this.seqNoLocalCheckpoint = value;
-			return this;
-		}
-
-		/**
-		 * global checkpoint
-		 * <p>
-		 * API name: {@code seq_no.global_checkpoint}
-		 */
-		public final Builder seqNoGlobalCheckpoint(@Nullable String value) {
-			this.seqNoGlobalCheckpoint = value;
-			return this;
-		}
-
-		/**
-		 * current warmer ops
-		 * <p>
-		 * API name: {@code warmer.current}
-		 */
-		public final Builder warmerCurrent(@Nullable String value) {
-			this.warmerCurrent = value;
-			return this;
-		}
-
-		/**
-		 * total warmer ops
-		 * <p>
-		 * API name: {@code warmer.total}
-		 */
-		public final Builder warmerTotal(@Nullable String value) {
-			this.warmerTotal = value;
-			return this;
-		}
-
-		/**
-		 * time spent in warmers
-		 * <p>
-		 * API name: {@code warmer.total_time}
-		 */
-		public final Builder warmerTotalTime(@Nullable String value) {
-			this.warmerTotalTime = value;
-			return this;
-		}
-
-		/**
-		 * shard data path
-		 * <p>
-		 * API name: {@code path.data}
-		 */
-		public final Builder pathData(@Nullable String value) {
-			this.pathData = value;
-			return this;
-		}
-
-		/**
-		 * shard state path
-		 * <p>
-		 * API name: {@code path.state}
-		 */
-		public final Builder pathState(@Nullable String value) {
-			this.pathState = value;
-			return this;
-		}
-
-		/**
-		 * number of bulk shard ops
-		 * <p>
-		 * API name: {@code bulk.total_operations}
-		 */
-		public final Builder bulkTotalOperations(@Nullable String value) {
-			this.bulkTotalOperations = value;
-			return this;
-		}
-
-		/**
-		 * time spend in shard bulk
-		 * <p>
-		 * API name: {@code bulk.total_time}
-		 */
-		public final Builder bulkTotalTime(@Nullable String value) {
-			this.bulkTotalTime = value;
-			return this;
-		}
-
-		/**
-		 * total size in bytes of shard bulk
-		 * <p>
-		 * API name: {@code bulk.total_size_in_bytes}
-		 */
-		public final Builder bulkTotalSizeInBytes(@Nullable String value) {
-			this.bulkTotalSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * average time spend in shard bulk
-		 * <p>
-		 * API name: {@code bulk.avg_time}
-		 */
-		public final Builder bulkAvgTime(@Nullable String value) {
-			this.bulkAvgTime = value;
-			return this;
-		}
-
-		/**
-		 * avg size in bytes of shard bulk
-		 * <p>
-		 * API name: {@code bulk.avg_size_in_bytes}
-		 */
-		public final Builder bulkAvgSizeInBytes(@Nullable String value) {
-			this.bulkAvgSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShardsRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardsRecord build() {
-			_checkSingleUse();
-
-			return new ShardsRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardsRecord}
-	 */
-	public static final JsonpDeserializer<ShardsRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShardsRecord::setupShardsRecordDeserializer);
-
-	protected static void setupShardsRecordDeserializer(ObjectDeserializer<ShardsRecord.Builder> op) {
-
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index", "i", "idx");
-		op.add(Builder::shard, JsonpDeserializer.stringDeserializer(), "shard", "s", "sh");
-		op.add(Builder::prirep, JsonpDeserializer.stringDeserializer(), "prirep", "p", "pr", "primaryOrReplica");
-		op.add(Builder::state, JsonpDeserializer.stringDeserializer(), "state", "st");
-		op.add(Builder::docs, JsonpDeserializer.stringDeserializer(), "docs", "d", "dc");
-		op.add(Builder::store, JsonpDeserializer.stringDeserializer(), "store", "sto");
-		op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node", "n");
-		op.add(Builder::syncId, JsonpDeserializer.stringDeserializer(), "sync_id");
-		op.add(Builder::unassignedReason, JsonpDeserializer.stringDeserializer(), "unassigned.reason", "ur");
-		op.add(Builder::unassignedAt, JsonpDeserializer.stringDeserializer(), "unassigned.at", "ua");
-		op.add(Builder::unassignedFor, JsonpDeserializer.stringDeserializer(), "unassigned.for", "uf");
-		op.add(Builder::unassignedDetails, JsonpDeserializer.stringDeserializer(), "unassigned.details", "ud");
-		op.add(Builder::recoverysourceType, JsonpDeserializer.stringDeserializer(), "recoverysource.type", "rs");
-		op.add(Builder::completionSize, JsonpDeserializer.stringDeserializer(), "completion.size", "cs",
-				"completionSize");
-		op.add(Builder::fielddataMemorySize, JsonpDeserializer.stringDeserializer(), "fielddata.memory_size", "fm",
-				"fielddataMemory");
-		op.add(Builder::fielddataEvictions, JsonpDeserializer.stringDeserializer(), "fielddata.evictions", "fe",
-				"fielddataEvictions");
-		op.add(Builder::queryCacheMemorySize, JsonpDeserializer.stringDeserializer(), "query_cache.memory_size", "qcm",
-				"queryCacheMemory");
-		op.add(Builder::queryCacheEvictions, JsonpDeserializer.stringDeserializer(), "query_cache.evictions", "qce",
-				"queryCacheEvictions");
-		op.add(Builder::flushTotal, JsonpDeserializer.stringDeserializer(), "flush.total", "ft", "flushTotal");
-		op.add(Builder::flushTotalTime, JsonpDeserializer.stringDeserializer(), "flush.total_time", "ftt",
-				"flushTotalTime");
-		op.add(Builder::getCurrent, JsonpDeserializer.stringDeserializer(), "get.current", "gc", "getCurrent");
-		op.add(Builder::getTime, JsonpDeserializer.stringDeserializer(), "get.time", "gti", "getTime");
-		op.add(Builder::getTotal, JsonpDeserializer.stringDeserializer(), "get.total", "gto", "getTotal");
-		op.add(Builder::getExistsTime, JsonpDeserializer.stringDeserializer(), "get.exists_time", "geti",
-				"getExistsTime");
-		op.add(Builder::getExistsTotal, JsonpDeserializer.stringDeserializer(), "get.exists_total", "geto",
-				"getExistsTotal");
-		op.add(Builder::getMissingTime, JsonpDeserializer.stringDeserializer(), "get.missing_time", "gmti",
-				"getMissingTime");
-		op.add(Builder::getMissingTotal, JsonpDeserializer.stringDeserializer(), "get.missing_total", "gmto",
-				"getMissingTotal");
-		op.add(Builder::indexingDeleteCurrent, JsonpDeserializer.stringDeserializer(), "indexing.delete_current", "idc",
-				"indexingDeleteCurrent");
-		op.add(Builder::indexingDeleteTime, JsonpDeserializer.stringDeserializer(), "indexing.delete_time", "idti",
-				"indexingDeleteTime");
-		op.add(Builder::indexingDeleteTotal, JsonpDeserializer.stringDeserializer(), "indexing.delete_total", "idto",
-				"indexingDeleteTotal");
-		op.add(Builder::indexingIndexCurrent, JsonpDeserializer.stringDeserializer(), "indexing.index_current", "iic",
-				"indexingIndexCurrent");
-		op.add(Builder::indexingIndexTime, JsonpDeserializer.stringDeserializer(), "indexing.index_time", "iiti",
-				"indexingIndexTime");
-		op.add(Builder::indexingIndexTotal, JsonpDeserializer.stringDeserializer(), "indexing.index_total", "iito",
-				"indexingIndexTotal");
-		op.add(Builder::indexingIndexFailed, JsonpDeserializer.stringDeserializer(), "indexing.index_failed", "iif",
-				"indexingIndexFailed");
-		op.add(Builder::mergesCurrent, JsonpDeserializer.stringDeserializer(), "merges.current", "mc", "mergesCurrent");
-		op.add(Builder::mergesCurrentDocs, JsonpDeserializer.stringDeserializer(), "merges.current_docs", "mcd",
-				"mergesCurrentDocs");
-		op.add(Builder::mergesCurrentSize, JsonpDeserializer.stringDeserializer(), "merges.current_size", "mcs",
-				"mergesCurrentSize");
-		op.add(Builder::mergesTotal, JsonpDeserializer.stringDeserializer(), "merges.total", "mt", "mergesTotal");
-		op.add(Builder::mergesTotalDocs, JsonpDeserializer.stringDeserializer(), "merges.total_docs", "mtd",
-				"mergesTotalDocs");
-		op.add(Builder::mergesTotalSize, JsonpDeserializer.stringDeserializer(), "merges.total_size", "mts",
-				"mergesTotalSize");
-		op.add(Builder::mergesTotalTime, JsonpDeserializer.stringDeserializer(), "merges.total_time", "mtt",
-				"mergesTotalTime");
-		op.add(Builder::refreshTotal, JsonpDeserializer.stringDeserializer(), "refresh.total");
-		op.add(Builder::refreshTime, JsonpDeserializer.stringDeserializer(), "refresh.time");
-		op.add(Builder::refreshExternalTotal, JsonpDeserializer.stringDeserializer(), "refresh.external_total", "rto",
-				"refreshTotal");
-		op.add(Builder::refreshExternalTime, JsonpDeserializer.stringDeserializer(), "refresh.external_time", "rti",
-				"refreshTime");
-		op.add(Builder::refreshListeners, JsonpDeserializer.stringDeserializer(), "refresh.listeners", "rli",
-				"refreshListeners");
-		op.add(Builder::searchFetchCurrent, JsonpDeserializer.stringDeserializer(), "search.fetch_current", "sfc",
-				"searchFetchCurrent");
-		op.add(Builder::searchFetchTime, JsonpDeserializer.stringDeserializer(), "search.fetch_time", "sfti",
-				"searchFetchTime");
-		op.add(Builder::searchFetchTotal, JsonpDeserializer.stringDeserializer(), "search.fetch_total", "sfto",
-				"searchFetchTotal");
-		op.add(Builder::searchOpenContexts, JsonpDeserializer.stringDeserializer(), "search.open_contexts", "so",
-				"searchOpenContexts");
-		op.add(Builder::searchQueryCurrent, JsonpDeserializer.stringDeserializer(), "search.query_current", "sqc",
-				"searchQueryCurrent");
-		op.add(Builder::searchQueryTime, JsonpDeserializer.stringDeserializer(), "search.query_time", "sqti",
-				"searchQueryTime");
-		op.add(Builder::searchQueryTotal, JsonpDeserializer.stringDeserializer(), "search.query_total", "sqto",
-				"searchQueryTotal");
-		op.add(Builder::searchScrollCurrent, JsonpDeserializer.stringDeserializer(), "search.scroll_current", "scc",
-				"searchScrollCurrent");
-		op.add(Builder::searchScrollTime, JsonpDeserializer.stringDeserializer(), "search.scroll_time", "scti",
-				"searchScrollTime");
-		op.add(Builder::searchScrollTotal, JsonpDeserializer.stringDeserializer(), "search.scroll_total", "scto",
-				"searchScrollTotal");
-		op.add(Builder::segmentsCount, JsonpDeserializer.stringDeserializer(), "segments.count", "sc", "segmentsCount");
-		op.add(Builder::segmentsMemory, JsonpDeserializer.stringDeserializer(), "segments.memory", "sm",
-				"segmentsMemory");
-		op.add(Builder::segmentsIndexWriterMemory, JsonpDeserializer.stringDeserializer(),
-				"segments.index_writer_memory", "siwm", "segmentsIndexWriterMemory");
-		op.add(Builder::segmentsVersionMapMemory, JsonpDeserializer.stringDeserializer(), "segments.version_map_memory",
-				"svmm", "segmentsVersionMapMemory");
-		op.add(Builder::segmentsFixedBitsetMemory, JsonpDeserializer.stringDeserializer(),
-				"segments.fixed_bitset_memory", "sfbm", "fixedBitsetMemory");
-		op.add(Builder::seqNoMax, JsonpDeserializer.stringDeserializer(), "seq_no.max", "sqm", "maxSeqNo");
-		op.add(Builder::seqNoLocalCheckpoint, JsonpDeserializer.stringDeserializer(), "seq_no.local_checkpoint", "sql",
-				"localCheckpoint");
-		op.add(Builder::seqNoGlobalCheckpoint, JsonpDeserializer.stringDeserializer(), "seq_no.global_checkpoint",
-				"sqg", "globalCheckpoint");
-		op.add(Builder::warmerCurrent, JsonpDeserializer.stringDeserializer(), "warmer.current", "wc", "warmerCurrent");
-		op.add(Builder::warmerTotal, JsonpDeserializer.stringDeserializer(), "warmer.total", "wto", "warmerTotal");
-		op.add(Builder::warmerTotalTime, JsonpDeserializer.stringDeserializer(), "warmer.total_time", "wtt",
-				"warmerTotalTime");
-		op.add(Builder::pathData, JsonpDeserializer.stringDeserializer(), "path.data", "pd", "dataPath");
-		op.add(Builder::pathState, JsonpDeserializer.stringDeserializer(), "path.state", "ps", "statsPath");
-		op.add(Builder::bulkTotalOperations, JsonpDeserializer.stringDeserializer(), "bulk.total_operations", "bto",
-				"bulkTotalOperations");
-		op.add(Builder::bulkTotalTime, JsonpDeserializer.stringDeserializer(), "bulk.total_time", "btti",
-				"bulkTotalTime");
-		op.add(Builder::bulkTotalSizeInBytes, JsonpDeserializer.stringDeserializer(), "bulk.total_size_in_bytes",
-				"btsi", "bulkTotalSizeInBytes");
-		op.add(Builder::bulkAvgTime, JsonpDeserializer.stringDeserializer(), "bulk.avg_time", "bati", "bulkAvgTime");
-		op.add(Builder::bulkAvgSizeInBytes, JsonpDeserializer.stringDeserializer(), "bulk.avg_size_in_bytes", "basi",
-				"bulkAvgSizeInBytes");
-
-	}
+        @Nullable
+        private String warmerTotal;
+
+        @Nullable
+        private String warmerTotalTime;
+
+        @Nullable
+        private String pathData;
+
+        @Nullable
+        private String pathState;
+
+        @Nullable
+        private String bulkTotalOperations;
+
+        @Nullable
+        private String bulkTotalTime;
+
+        @Nullable
+        private String bulkTotalSizeInBytes;
+
+        @Nullable
+        private String bulkAvgTime;
+
+        @Nullable
+        private String bulkAvgSizeInBytes;
+
+        /**
+         * index name
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * shard name
+         * <p>
+         * API name: {@code shard}
+         */
+        public final Builder shard(@Nullable String value) {
+            this.shard = value;
+            return this;
+        }
+
+        /**
+         * primary or replica
+         * <p>
+         * API name: {@code prirep}
+         */
+        public final Builder prirep(@Nullable String value) {
+            this.prirep = value;
+            return this;
+        }
+
+        /**
+         * shard state
+         * <p>
+         * API name: {@code state}
+         */
+        public final Builder state(@Nullable String value) {
+            this.state = value;
+            return this;
+        }
+
+        /**
+         * number of docs in shard
+         * <p>
+         * API name: {@code docs}
+         */
+        public final Builder docs(@Nullable String value) {
+            this.docs = value;
+            return this;
+        }
+
+        /**
+         * store size of shard (how much disk it uses)
+         * <p>
+         * API name: {@code store}
+         */
+        public final Builder store(@Nullable String value) {
+            this.store = value;
+            return this;
+        }
+
+        /**
+         * ip of node where it lives
+         * <p>
+         * API name: {@code ip}
+         */
+        public final Builder ip(@Nullable String value) {
+            this.ip = value;
+            return this;
+        }
+
+        /**
+         * unique id of node where it lives
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * name of node where it lives
+         * <p>
+         * API name: {@code node}
+         */
+        public final Builder node(@Nullable String value) {
+            this.node = value;
+            return this;
+        }
+
+        /**
+         * sync id
+         * <p>
+         * API name: {@code sync_id}
+         */
+        public final Builder syncId(@Nullable String value) {
+            this.syncId = value;
+            return this;
+        }
+
+        /**
+         * reason shard is unassigned
+         * <p>
+         * API name: {@code unassigned.reason}
+         */
+        public final Builder unassignedReason(@Nullable String value) {
+            this.unassignedReason = value;
+            return this;
+        }
+
+        /**
+         * time shard became unassigned (UTC)
+         * <p>
+         * API name: {@code unassigned.at}
+         */
+        public final Builder unassignedAt(@Nullable String value) {
+            this.unassignedAt = value;
+            return this;
+        }
+
+        /**
+         * time has been unassigned
+         * <p>
+         * API name: {@code unassigned.for}
+         */
+        public final Builder unassignedFor(@Nullable String value) {
+            this.unassignedFor = value;
+            return this;
+        }
+
+        /**
+         * additional details as to why the shard became unassigned
+         * <p>
+         * API name: {@code unassigned.details}
+         */
+        public final Builder unassignedDetails(@Nullable String value) {
+            this.unassignedDetails = value;
+            return this;
+        }
+
+        /**
+         * recovery source type
+         * <p>
+         * API name: {@code recoverysource.type}
+         */
+        public final Builder recoverysourceType(@Nullable String value) {
+            this.recoverysourceType = value;
+            return this;
+        }
+
+        /**
+         * size of completion
+         * <p>
+         * API name: {@code completion.size}
+         */
+        public final Builder completionSize(@Nullable String value) {
+            this.completionSize = value;
+            return this;
+        }
+
+        /**
+         * used fielddata cache
+         * <p>
+         * API name: {@code fielddata.memory_size}
+         */
+        public final Builder fielddataMemorySize(@Nullable String value) {
+            this.fielddataMemorySize = value;
+            return this;
+        }
+
+        /**
+         * fielddata evictions
+         * <p>
+         * API name: {@code fielddata.evictions}
+         */
+        public final Builder fielddataEvictions(@Nullable String value) {
+            this.fielddataEvictions = value;
+            return this;
+        }
+
+        /**
+         * used query cache
+         * <p>
+         * API name: {@code query_cache.memory_size}
+         */
+        public final Builder queryCacheMemorySize(@Nullable String value) {
+            this.queryCacheMemorySize = value;
+            return this;
+        }
+
+        /**
+         * query cache evictions
+         * <p>
+         * API name: {@code query_cache.evictions}
+         */
+        public final Builder queryCacheEvictions(@Nullable String value) {
+            this.queryCacheEvictions = value;
+            return this;
+        }
+
+        /**
+         * number of flushes
+         * <p>
+         * API name: {@code flush.total}
+         */
+        public final Builder flushTotal(@Nullable String value) {
+            this.flushTotal = value;
+            return this;
+        }
+
+        /**
+         * time spent in flush
+         * <p>
+         * API name: {@code flush.total_time}
+         */
+        public final Builder flushTotalTime(@Nullable String value) {
+            this.flushTotalTime = value;
+            return this;
+        }
+
+        /**
+         * number of current get ops
+         * <p>
+         * API name: {@code get.current}
+         */
+        public final Builder getCurrent(@Nullable String value) {
+            this.getCurrent = value;
+            return this;
+        }
+
+        /**
+         * time spent in get
+         * <p>
+         * API name: {@code get.time}
+         */
+        public final Builder getTime(@Nullable String value) {
+            this.getTime = value;
+            return this;
+        }
+
+        /**
+         * number of get ops
+         * <p>
+         * API name: {@code get.total}
+         */
+        public final Builder getTotal(@Nullable String value) {
+            this.getTotal = value;
+            return this;
+        }
+
+        /**
+         * time spent in successful gets
+         * <p>
+         * API name: {@code get.exists_time}
+         */
+        public final Builder getExistsTime(@Nullable String value) {
+            this.getExistsTime = value;
+            return this;
+        }
+
+        /**
+         * number of successful gets
+         * <p>
+         * API name: {@code get.exists_total}
+         */
+        public final Builder getExistsTotal(@Nullable String value) {
+            this.getExistsTotal = value;
+            return this;
+        }
+
+        /**
+         * time spent in failed gets
+         * <p>
+         * API name: {@code get.missing_time}
+         */
+        public final Builder getMissingTime(@Nullable String value) {
+            this.getMissingTime = value;
+            return this;
+        }
+
+        /**
+         * number of failed gets
+         * <p>
+         * API name: {@code get.missing_total}
+         */
+        public final Builder getMissingTotal(@Nullable String value) {
+            this.getMissingTotal = value;
+            return this;
+        }
+
+        /**
+         * number of current deletions
+         * <p>
+         * API name: {@code indexing.delete_current}
+         */
+        public final Builder indexingDeleteCurrent(@Nullable String value) {
+            this.indexingDeleteCurrent = value;
+            return this;
+        }
+
+        /**
+         * time spent in deletions
+         * <p>
+         * API name: {@code indexing.delete_time}
+         */
+        public final Builder indexingDeleteTime(@Nullable String value) {
+            this.indexingDeleteTime = value;
+            return this;
+        }
+
+        /**
+         * number of delete ops
+         * <p>
+         * API name: {@code indexing.delete_total}
+         */
+        public final Builder indexingDeleteTotal(@Nullable String value) {
+            this.indexingDeleteTotal = value;
+            return this;
+        }
+
+        /**
+         * number of current indexing ops
+         * <p>
+         * API name: {@code indexing.index_current}
+         */
+        public final Builder indexingIndexCurrent(@Nullable String value) {
+            this.indexingIndexCurrent = value;
+            return this;
+        }
+
+        /**
+         * time spent in indexing
+         * <p>
+         * API name: {@code indexing.index_time}
+         */
+        public final Builder indexingIndexTime(@Nullable String value) {
+            this.indexingIndexTime = value;
+            return this;
+        }
+
+        /**
+         * number of indexing ops
+         * <p>
+         * API name: {@code indexing.index_total}
+         */
+        public final Builder indexingIndexTotal(@Nullable String value) {
+            this.indexingIndexTotal = value;
+            return this;
+        }
+
+        /**
+         * number of failed indexing ops
+         * <p>
+         * API name: {@code indexing.index_failed}
+         */
+        public final Builder indexingIndexFailed(@Nullable String value) {
+            this.indexingIndexFailed = value;
+            return this;
+        }
+
+        /**
+         * number of current merges
+         * <p>
+         * API name: {@code merges.current}
+         */
+        public final Builder mergesCurrent(@Nullable String value) {
+            this.mergesCurrent = value;
+            return this;
+        }
+
+        /**
+         * number of current merging docs
+         * <p>
+         * API name: {@code merges.current_docs}
+         */
+        public final Builder mergesCurrentDocs(@Nullable String value) {
+            this.mergesCurrentDocs = value;
+            return this;
+        }
+
+        /**
+         * size of current merges
+         * <p>
+         * API name: {@code merges.current_size}
+         */
+        public final Builder mergesCurrentSize(@Nullable String value) {
+            this.mergesCurrentSize = value;
+            return this;
+        }
+
+        /**
+         * number of completed merge ops
+         * <p>
+         * API name: {@code merges.total}
+         */
+        public final Builder mergesTotal(@Nullable String value) {
+            this.mergesTotal = value;
+            return this;
+        }
+
+        /**
+         * docs merged
+         * <p>
+         * API name: {@code merges.total_docs}
+         */
+        public final Builder mergesTotalDocs(@Nullable String value) {
+            this.mergesTotalDocs = value;
+            return this;
+        }
+
+        /**
+         * size merged
+         * <p>
+         * API name: {@code merges.total_size}
+         */
+        public final Builder mergesTotalSize(@Nullable String value) {
+            this.mergesTotalSize = value;
+            return this;
+        }
+
+        /**
+         * time spent in merges
+         * <p>
+         * API name: {@code merges.total_time}
+         */
+        public final Builder mergesTotalTime(@Nullable String value) {
+            this.mergesTotalTime = value;
+            return this;
+        }
+
+        /**
+         * total refreshes
+         * <p>
+         * API name: {@code refresh.total}
+         */
+        public final Builder refreshTotal(@Nullable String value) {
+            this.refreshTotal = value;
+            return this;
+        }
+
+        /**
+         * time spent in refreshes
+         * <p>
+         * API name: {@code refresh.time}
+         */
+        public final Builder refreshTime(@Nullable String value) {
+            this.refreshTime = value;
+            return this;
+        }
+
+        /**
+         * total external refreshes
+         * <p>
+         * API name: {@code refresh.external_total}
+         */
+        public final Builder refreshExternalTotal(@Nullable String value) {
+            this.refreshExternalTotal = value;
+            return this;
+        }
+
+        /**
+         * time spent in external refreshes
+         * <p>
+         * API name: {@code refresh.external_time}
+         */
+        public final Builder refreshExternalTime(@Nullable String value) {
+            this.refreshExternalTime = value;
+            return this;
+        }
+
+        /**
+         * number of pending refresh listeners
+         * <p>
+         * API name: {@code refresh.listeners}
+         */
+        public final Builder refreshListeners(@Nullable String value) {
+            this.refreshListeners = value;
+            return this;
+        }
+
+        /**
+         * current fetch phase ops
+         * <p>
+         * API name: {@code search.fetch_current}
+         */
+        public final Builder searchFetchCurrent(@Nullable String value) {
+            this.searchFetchCurrent = value;
+            return this;
+        }
+
+        /**
+         * time spent in fetch phase
+         * <p>
+         * API name: {@code search.fetch_time}
+         */
+        public final Builder searchFetchTime(@Nullable String value) {
+            this.searchFetchTime = value;
+            return this;
+        }
+
+        /**
+         * total fetch ops
+         * <p>
+         * API name: {@code search.fetch_total}
+         */
+        public final Builder searchFetchTotal(@Nullable String value) {
+            this.searchFetchTotal = value;
+            return this;
+        }
+
+        /**
+         * open search contexts
+         * <p>
+         * API name: {@code search.open_contexts}
+         */
+        public final Builder searchOpenContexts(@Nullable String value) {
+            this.searchOpenContexts = value;
+            return this;
+        }
+
+        /**
+         * current query phase ops
+         * <p>
+         * API name: {@code search.query_current}
+         */
+        public final Builder searchQueryCurrent(@Nullable String value) {
+            this.searchQueryCurrent = value;
+            return this;
+        }
+
+        /**
+         * time spent in query phase
+         * <p>
+         * API name: {@code search.query_time}
+         */
+        public final Builder searchQueryTime(@Nullable String value) {
+            this.searchQueryTime = value;
+            return this;
+        }
+
+        /**
+         * total query phase ops
+         * <p>
+         * API name: {@code search.query_total}
+         */
+        public final Builder searchQueryTotal(@Nullable String value) {
+            this.searchQueryTotal = value;
+            return this;
+        }
+
+        /**
+         * open scroll contexts
+         * <p>
+         * API name: {@code search.scroll_current}
+         */
+        public final Builder searchScrollCurrent(@Nullable String value) {
+            this.searchScrollCurrent = value;
+            return this;
+        }
+
+        /**
+         * time scroll contexts held open
+         * <p>
+         * API name: {@code search.scroll_time}
+         */
+        public final Builder searchScrollTime(@Nullable String value) {
+            this.searchScrollTime = value;
+            return this;
+        }
+
+        /**
+         * completed scroll contexts
+         * <p>
+         * API name: {@code search.scroll_total}
+         */
+        public final Builder searchScrollTotal(@Nullable String value) {
+            this.searchScrollTotal = value;
+            return this;
+        }
+
+        /**
+         * number of segments
+         * <p>
+         * API name: {@code segments.count}
+         */
+        public final Builder segmentsCount(@Nullable String value) {
+            this.segmentsCount = value;
+            return this;
+        }
+
+        /**
+         * memory used by segments
+         * <p>
+         * API name: {@code segments.memory}
+         */
+        public final Builder segmentsMemory(@Nullable String value) {
+            this.segmentsMemory = value;
+            return this;
+        }
+
+        /**
+         * memory used by index writer
+         * <p>
+         * API name: {@code segments.index_writer_memory}
+         */
+        public final Builder segmentsIndexWriterMemory(@Nullable String value) {
+            this.segmentsIndexWriterMemory = value;
+            return this;
+        }
+
+        /**
+         * memory used by version map
+         * <p>
+         * API name: {@code segments.version_map_memory}
+         */
+        public final Builder segmentsVersionMapMemory(@Nullable String value) {
+            this.segmentsVersionMapMemory = value;
+            return this;
+        }
+
+        /**
+         * memory used by fixed bit sets for nested object field types and export type
+         * filters for types referred in _parent fields
+         * <p>
+         * API name: {@code segments.fixed_bitset_memory}
+         */
+        public final Builder segmentsFixedBitsetMemory(@Nullable String value) {
+            this.segmentsFixedBitsetMemory = value;
+            return this;
+        }
+
+        /**
+         * max sequence number
+         * <p>
+         * API name: {@code seq_no.max}
+         */
+        public final Builder seqNoMax(@Nullable String value) {
+            this.seqNoMax = value;
+            return this;
+        }
+
+        /**
+         * local checkpoint
+         * <p>
+         * API name: {@code seq_no.local_checkpoint}
+         */
+        public final Builder seqNoLocalCheckpoint(@Nullable String value) {
+            this.seqNoLocalCheckpoint = value;
+            return this;
+        }
+
+        /**
+         * global checkpoint
+         * <p>
+         * API name: {@code seq_no.global_checkpoint}
+         */
+        public final Builder seqNoGlobalCheckpoint(@Nullable String value) {
+            this.seqNoGlobalCheckpoint = value;
+            return this;
+        }
+
+        /**
+         * current warmer ops
+         * <p>
+         * API name: {@code warmer.current}
+         */
+        public final Builder warmerCurrent(@Nullable String value) {
+            this.warmerCurrent = value;
+            return this;
+        }
+
+        /**
+         * total warmer ops
+         * <p>
+         * API name: {@code warmer.total}
+         */
+        public final Builder warmerTotal(@Nullable String value) {
+            this.warmerTotal = value;
+            return this;
+        }
+
+        /**
+         * time spent in warmers
+         * <p>
+         * API name: {@code warmer.total_time}
+         */
+        public final Builder warmerTotalTime(@Nullable String value) {
+            this.warmerTotalTime = value;
+            return this;
+        }
+
+        /**
+         * shard data path
+         * <p>
+         * API name: {@code path.data}
+         */
+        public final Builder pathData(@Nullable String value) {
+            this.pathData = value;
+            return this;
+        }
+
+        /**
+         * shard state path
+         * <p>
+         * API name: {@code path.state}
+         */
+        public final Builder pathState(@Nullable String value) {
+            this.pathState = value;
+            return this;
+        }
+
+        /**
+         * number of bulk shard ops
+         * <p>
+         * API name: {@code bulk.total_operations}
+         */
+        public final Builder bulkTotalOperations(@Nullable String value) {
+            this.bulkTotalOperations = value;
+            return this;
+        }
+
+        /**
+         * time spend in shard bulk
+         * <p>
+         * API name: {@code bulk.total_time}
+         */
+        public final Builder bulkTotalTime(@Nullable String value) {
+            this.bulkTotalTime = value;
+            return this;
+        }
+
+        /**
+         * total size in bytes of shard bulk
+         * <p>
+         * API name: {@code bulk.total_size_in_bytes}
+         */
+        public final Builder bulkTotalSizeInBytes(@Nullable String value) {
+            this.bulkTotalSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * average time spend in shard bulk
+         * <p>
+         * API name: {@code bulk.avg_time}
+         */
+        public final Builder bulkAvgTime(@Nullable String value) {
+            this.bulkAvgTime = value;
+            return this;
+        }
+
+        /**
+         * avg size in bytes of shard bulk
+         * <p>
+         * API name: {@code bulk.avg_size_in_bytes}
+         */
+        public final Builder bulkAvgSizeInBytes(@Nullable String value) {
+            this.bulkAvgSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShardsRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardsRecord build() {
+            _checkSingleUse();
+
+            return new ShardsRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardsRecord}
+     */
+    public static final JsonpDeserializer<ShardsRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardsRecord::setupShardsRecordDeserializer
+    );
+
+    protected static void setupShardsRecordDeserializer(ObjectDeserializer<ShardsRecord.Builder> op) {
+
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index", "i", "idx");
+        op.add(Builder::shard, JsonpDeserializer.stringDeserializer(), "shard", "s", "sh");
+        op.add(Builder::prirep, JsonpDeserializer.stringDeserializer(), "prirep", "p", "pr", "primaryOrReplica");
+        op.add(Builder::state, JsonpDeserializer.stringDeserializer(), "state", "st");
+        op.add(Builder::docs, JsonpDeserializer.stringDeserializer(), "docs", "d", "dc");
+        op.add(Builder::store, JsonpDeserializer.stringDeserializer(), "store", "sto");
+        op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node", "n");
+        op.add(Builder::syncId, JsonpDeserializer.stringDeserializer(), "sync_id");
+        op.add(Builder::unassignedReason, JsonpDeserializer.stringDeserializer(), "unassigned.reason", "ur");
+        op.add(Builder::unassignedAt, JsonpDeserializer.stringDeserializer(), "unassigned.at", "ua");
+        op.add(Builder::unassignedFor, JsonpDeserializer.stringDeserializer(), "unassigned.for", "uf");
+        op.add(Builder::unassignedDetails, JsonpDeserializer.stringDeserializer(), "unassigned.details", "ud");
+        op.add(Builder::recoverysourceType, JsonpDeserializer.stringDeserializer(), "recoverysource.type", "rs");
+        op.add(Builder::completionSize, JsonpDeserializer.stringDeserializer(), "completion.size", "cs", "completionSize");
+        op.add(Builder::fielddataMemorySize, JsonpDeserializer.stringDeserializer(), "fielddata.memory_size", "fm", "fielddataMemory");
+        op.add(Builder::fielddataEvictions, JsonpDeserializer.stringDeserializer(), "fielddata.evictions", "fe", "fielddataEvictions");
+        op.add(Builder::queryCacheMemorySize, JsonpDeserializer.stringDeserializer(), "query_cache.memory_size", "qcm", "queryCacheMemory");
+        op.add(Builder::queryCacheEvictions, JsonpDeserializer.stringDeserializer(), "query_cache.evictions", "qce", "queryCacheEvictions");
+        op.add(Builder::flushTotal, JsonpDeserializer.stringDeserializer(), "flush.total", "ft", "flushTotal");
+        op.add(Builder::flushTotalTime, JsonpDeserializer.stringDeserializer(), "flush.total_time", "ftt", "flushTotalTime");
+        op.add(Builder::getCurrent, JsonpDeserializer.stringDeserializer(), "get.current", "gc", "getCurrent");
+        op.add(Builder::getTime, JsonpDeserializer.stringDeserializer(), "get.time", "gti", "getTime");
+        op.add(Builder::getTotal, JsonpDeserializer.stringDeserializer(), "get.total", "gto", "getTotal");
+        op.add(Builder::getExistsTime, JsonpDeserializer.stringDeserializer(), "get.exists_time", "geti", "getExistsTime");
+        op.add(Builder::getExistsTotal, JsonpDeserializer.stringDeserializer(), "get.exists_total", "geto", "getExistsTotal");
+        op.add(Builder::getMissingTime, JsonpDeserializer.stringDeserializer(), "get.missing_time", "gmti", "getMissingTime");
+        op.add(Builder::getMissingTotal, JsonpDeserializer.stringDeserializer(), "get.missing_total", "gmto", "getMissingTotal");
+        op.add(
+            Builder::indexingDeleteCurrent,
+            JsonpDeserializer.stringDeserializer(),
+            "indexing.delete_current",
+            "idc",
+            "indexingDeleteCurrent"
+        );
+        op.add(Builder::indexingDeleteTime, JsonpDeserializer.stringDeserializer(), "indexing.delete_time", "idti", "indexingDeleteTime");
+        op.add(
+            Builder::indexingDeleteTotal,
+            JsonpDeserializer.stringDeserializer(),
+            "indexing.delete_total",
+            "idto",
+            "indexingDeleteTotal"
+        );
+        op.add(
+            Builder::indexingIndexCurrent,
+            JsonpDeserializer.stringDeserializer(),
+            "indexing.index_current",
+            "iic",
+            "indexingIndexCurrent"
+        );
+        op.add(Builder::indexingIndexTime, JsonpDeserializer.stringDeserializer(), "indexing.index_time", "iiti", "indexingIndexTime");
+        op.add(Builder::indexingIndexTotal, JsonpDeserializer.stringDeserializer(), "indexing.index_total", "iito", "indexingIndexTotal");
+        op.add(Builder::indexingIndexFailed, JsonpDeserializer.stringDeserializer(), "indexing.index_failed", "iif", "indexingIndexFailed");
+        op.add(Builder::mergesCurrent, JsonpDeserializer.stringDeserializer(), "merges.current", "mc", "mergesCurrent");
+        op.add(Builder::mergesCurrentDocs, JsonpDeserializer.stringDeserializer(), "merges.current_docs", "mcd", "mergesCurrentDocs");
+        op.add(Builder::mergesCurrentSize, JsonpDeserializer.stringDeserializer(), "merges.current_size", "mcs", "mergesCurrentSize");
+        op.add(Builder::mergesTotal, JsonpDeserializer.stringDeserializer(), "merges.total", "mt", "mergesTotal");
+        op.add(Builder::mergesTotalDocs, JsonpDeserializer.stringDeserializer(), "merges.total_docs", "mtd", "mergesTotalDocs");
+        op.add(Builder::mergesTotalSize, JsonpDeserializer.stringDeserializer(), "merges.total_size", "mts", "mergesTotalSize");
+        op.add(Builder::mergesTotalTime, JsonpDeserializer.stringDeserializer(), "merges.total_time", "mtt", "mergesTotalTime");
+        op.add(Builder::refreshTotal, JsonpDeserializer.stringDeserializer(), "refresh.total");
+        op.add(Builder::refreshTime, JsonpDeserializer.stringDeserializer(), "refresh.time");
+        op.add(Builder::refreshExternalTotal, JsonpDeserializer.stringDeserializer(), "refresh.external_total", "rto", "refreshTotal");
+        op.add(Builder::refreshExternalTime, JsonpDeserializer.stringDeserializer(), "refresh.external_time", "rti", "refreshTime");
+        op.add(Builder::refreshListeners, JsonpDeserializer.stringDeserializer(), "refresh.listeners", "rli", "refreshListeners");
+        op.add(Builder::searchFetchCurrent, JsonpDeserializer.stringDeserializer(), "search.fetch_current", "sfc", "searchFetchCurrent");
+        op.add(Builder::searchFetchTime, JsonpDeserializer.stringDeserializer(), "search.fetch_time", "sfti", "searchFetchTime");
+        op.add(Builder::searchFetchTotal, JsonpDeserializer.stringDeserializer(), "search.fetch_total", "sfto", "searchFetchTotal");
+        op.add(Builder::searchOpenContexts, JsonpDeserializer.stringDeserializer(), "search.open_contexts", "so", "searchOpenContexts");
+        op.add(Builder::searchQueryCurrent, JsonpDeserializer.stringDeserializer(), "search.query_current", "sqc", "searchQueryCurrent");
+        op.add(Builder::searchQueryTime, JsonpDeserializer.stringDeserializer(), "search.query_time", "sqti", "searchQueryTime");
+        op.add(Builder::searchQueryTotal, JsonpDeserializer.stringDeserializer(), "search.query_total", "sqto", "searchQueryTotal");
+        op.add(Builder::searchScrollCurrent, JsonpDeserializer.stringDeserializer(), "search.scroll_current", "scc", "searchScrollCurrent");
+        op.add(Builder::searchScrollTime, JsonpDeserializer.stringDeserializer(), "search.scroll_time", "scti", "searchScrollTime");
+        op.add(Builder::searchScrollTotal, JsonpDeserializer.stringDeserializer(), "search.scroll_total", "scto", "searchScrollTotal");
+        op.add(Builder::segmentsCount, JsonpDeserializer.stringDeserializer(), "segments.count", "sc", "segmentsCount");
+        op.add(Builder::segmentsMemory, JsonpDeserializer.stringDeserializer(), "segments.memory", "sm", "segmentsMemory");
+        op.add(
+            Builder::segmentsIndexWriterMemory,
+            JsonpDeserializer.stringDeserializer(),
+            "segments.index_writer_memory",
+            "siwm",
+            "segmentsIndexWriterMemory"
+        );
+        op.add(
+            Builder::segmentsVersionMapMemory,
+            JsonpDeserializer.stringDeserializer(),
+            "segments.version_map_memory",
+            "svmm",
+            "segmentsVersionMapMemory"
+        );
+        op.add(
+            Builder::segmentsFixedBitsetMemory,
+            JsonpDeserializer.stringDeserializer(),
+            "segments.fixed_bitset_memory",
+            "sfbm",
+            "fixedBitsetMemory"
+        );
+        op.add(Builder::seqNoMax, JsonpDeserializer.stringDeserializer(), "seq_no.max", "sqm", "maxSeqNo");
+        op.add(Builder::seqNoLocalCheckpoint, JsonpDeserializer.stringDeserializer(), "seq_no.local_checkpoint", "sql", "localCheckpoint");
+        op.add(
+            Builder::seqNoGlobalCheckpoint,
+            JsonpDeserializer.stringDeserializer(),
+            "seq_no.global_checkpoint",
+            "sqg",
+            "globalCheckpoint"
+        );
+        op.add(Builder::warmerCurrent, JsonpDeserializer.stringDeserializer(), "warmer.current", "wc", "warmerCurrent");
+        op.add(Builder::warmerTotal, JsonpDeserializer.stringDeserializer(), "warmer.total", "wto", "warmerTotal");
+        op.add(Builder::warmerTotalTime, JsonpDeserializer.stringDeserializer(), "warmer.total_time", "wtt", "warmerTotalTime");
+        op.add(Builder::pathData, JsonpDeserializer.stringDeserializer(), "path.data", "pd", "dataPath");
+        op.add(Builder::pathState, JsonpDeserializer.stringDeserializer(), "path.state", "ps", "statsPath");
+        op.add(Builder::bulkTotalOperations, JsonpDeserializer.stringDeserializer(), "bulk.total_operations", "bto", "bulkTotalOperations");
+        op.add(Builder::bulkTotalTime, JsonpDeserializer.stringDeserializer(), "bulk.total_time", "btti", "bulkTotalTime");
+        op.add(
+            Builder::bulkTotalSizeInBytes,
+            JsonpDeserializer.stringDeserializer(),
+            "bulk.total_size_in_bytes",
+            "btsi",
+            "bulkTotalSizeInBytes"
+        );
+        op.add(Builder::bulkAvgTime, JsonpDeserializer.stringDeserializer(), "bulk.avg_time", "bati", "bulkAvgTime");
+        op.add(Builder::bulkAvgSizeInBytes, JsonpDeserializer.stringDeserializer(), "bulk.avg_size_in_bytes", "basi", "bulkAvgSizeInBytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/snapshots/SnapshotsRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/snapshots/SnapshotsRecord.java
index 5c6016913a..a21a2448af 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/snapshots/SnapshotsRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/snapshots/SnapshotsRecord.java
@@ -32,518 +32,519 @@
 
 package org.opensearch.client.opensearch.cat.snapshots;
 
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Time;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cat.snapshots.SnapshotsRecord
 
-
 @JsonpDeserializable
 public class SnapshotsRecord implements JsonpSerializable {
-	@Nullable
-	private final String id;
-
-	@Nullable
-	private final String repository;
-
-	@Nullable
-	private final String status;
-
-	@Nullable
-	private final String startEpoch;
-
-	@Nullable
-	private final String startTime;
-
-	@Nullable
-	private final String endEpoch;
-
-	@Nullable
-	private final String endTime;
-
-	@Nullable
-	private final Time duration;
-
-	@Nullable
-	private final String indices;
-
-	@Nullable
-	private final String successfulShards;
-
-	@Nullable
-	private final String failedShards;
-
-	@Nullable
-	private final String totalShards;
-
-	@Nullable
-	private final String reason;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SnapshotsRecord(Builder builder) {
-
-		this.id = builder.id;
-		this.repository = builder.repository;
-		this.status = builder.status;
-		this.startEpoch = builder.startEpoch;
-		this.startTime = builder.startTime;
-		this.endEpoch = builder.endEpoch;
-		this.endTime = builder.endTime;
-		this.duration = builder.duration;
-		this.indices = builder.indices;
-		this.successfulShards = builder.successfulShards;
-		this.failedShards = builder.failedShards;
-		this.totalShards = builder.totalShards;
-		this.reason = builder.reason;
-
-	}
-
-	public static SnapshotsRecord of(Function<Builder, ObjectBuilder<SnapshotsRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * unique snapshot
-	 * <p>
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * repository name
-	 * <p>
-	 * API name: {@code repository}
-	 */
-	@Nullable
-	public final String repository() {
-		return this.repository;
-	}
-
-	/**
-	 * snapshot name
-	 * <p>
-	 * API name: {@code status}
-	 */
-	@Nullable
-	public final String status() {
-		return this.status;
-	}
-
-	/**
-	 * start time in seconds since 1970-01-01 00:00:00
-	 * <p>
-	 * API name: {@code start_epoch}
-	 */
-	@Nullable
-	public final String startEpoch() {
-		return this.startEpoch;
-	}
-
-	/**
-	 * start time in HH:MM:SS
-	 * <p>
-	 * API name: {@code start_time}
-	 */
-	@Nullable
-	public final String startTime() {
-		return this.startTime;
-	}
-
-	/**
-	 * end time in seconds since 1970-01-01 00:00:00
-	 * <p>
-	 * API name: {@code end_epoch}
-	 */
-	@Nullable
-	public final String endEpoch() {
-		return this.endEpoch;
-	}
-
-	/**
-	 * end time in HH:MM:SS
-	 * <p>
-	 * API name: {@code end_time}
-	 */
-	@Nullable
-	public final String endTime() {
-		return this.endTime;
-	}
-
-	/**
-	 * duration
-	 * <p>
-	 * API name: {@code duration}
-	 */
-	@Nullable
-	public final Time duration() {
-		return this.duration;
-	}
-
-	/**
-	 * number of indices
-	 * <p>
-	 * API name: {@code indices}
-	 */
-	@Nullable
-	public final String indices() {
-		return this.indices;
-	}
-
-	/**
-	 * number of successful shards
-	 * <p>
-	 * API name: {@code successful_shards}
-	 */
-	@Nullable
-	public final String successfulShards() {
-		return this.successfulShards;
-	}
-
-	/**
-	 * number of failed shards
-	 * <p>
-	 * API name: {@code failed_shards}
-	 */
-	@Nullable
-	public final String failedShards() {
-		return this.failedShards;
-	}
-
-	/**
-	 * number of total shards
-	 * <p>
-	 * API name: {@code total_shards}
-	 */
-	@Nullable
-	public final String totalShards() {
-		return this.totalShards;
-	}
-
-	/**
-	 * reason for failures
-	 * <p>
-	 * API name: {@code reason}
-	 */
-	@Nullable
-	public final String reason() {
-		return this.reason;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.id != null) {
-			generator.writeKey("id");
-			generator.write(this.id);
-
-		}
-		if (this.repository != null) {
-			generator.writeKey("repository");
-			generator.write(this.repository);
-
-		}
-		if (this.status != null) {
-			generator.writeKey("status");
-			generator.write(this.status);
-
-		}
-		if (this.startEpoch != null) {
-			generator.writeKey("start_epoch");
-			generator.write(this.startEpoch);
-
-		}
-		if (this.startTime != null) {
-			generator.writeKey("start_time");
-			generator.write(this.startTime);
-
-		}
-		if (this.endEpoch != null) {
-			generator.writeKey("end_epoch");
-			generator.write(this.endEpoch);
-
-		}
-		if (this.endTime != null) {
-			generator.writeKey("end_time");
-			generator.write(this.endTime);
-
-		}
-		if (this.duration != null) {
-			generator.writeKey("duration");
-			this.duration.serialize(generator, mapper);
-
-		}
-		if (this.indices != null) {
-			generator.writeKey("indices");
-			generator.write(this.indices);
-
-		}
-		if (this.successfulShards != null) {
-			generator.writeKey("successful_shards");
-			generator.write(this.successfulShards);
-
-		}
-		if (this.failedShards != null) {
-			generator.writeKey("failed_shards");
-			generator.write(this.failedShards);
-
-		}
-		if (this.totalShards != null) {
-			generator.writeKey("total_shards");
-			generator.write(this.totalShards);
-
-		}
-		if (this.reason != null) {
-			generator.writeKey("reason");
-			generator.write(this.reason);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SnapshotsRecord}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotsRecord> {
-		@Nullable
-		private String id;
-
-		@Nullable
-		private String repository;
-
-		@Nullable
-		private String status;
-
-		@Nullable
-		private String startEpoch;
-
-		@Nullable
-		private String startTime;
-
-		@Nullable
-		private String endEpoch;
-
-		@Nullable
-		private String endTime;
-
-		@Nullable
-		private Time duration;
-
-		@Nullable
-		private String indices;
-
-		@Nullable
-		private String successfulShards;
-
-		@Nullable
-		private String failedShards;
-
-		@Nullable
-		private String totalShards;
-
-		@Nullable
-		private String reason;
-
-		/**
-		 * unique snapshot
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * repository name
-		 * <p>
-		 * API name: {@code repository}
-		 */
-		public final Builder repository(@Nullable String value) {
-			this.repository = value;
-			return this;
-		}
-
-		/**
-		 * snapshot name
-		 * <p>
-		 * API name: {@code status}
-		 */
-		public final Builder status(@Nullable String value) {
-			this.status = value;
-			return this;
-		}
-
-		/**
-		 * start time in seconds since 1970-01-01 00:00:00
-		 * <p>
-		 * API name: {@code start_epoch}
-		 */
-		public final Builder startEpoch(@Nullable String value) {
-			this.startEpoch = value;
-			return this;
-		}
-
-		/**
-		 * start time in HH:MM:SS
-		 * <p>
-		 * API name: {@code start_time}
-		 */
-		public final Builder startTime(@Nullable String value) {
-			this.startTime = value;
-			return this;
-		}
-
-		/**
-		 * end time in seconds since 1970-01-01 00:00:00
-		 * <p>
-		 * API name: {@code end_epoch}
-		 */
-		public final Builder endEpoch(@Nullable String value) {
-			this.endEpoch = value;
-			return this;
-		}
-
-		/**
-		 * end time in HH:MM:SS
-		 * <p>
-		 * API name: {@code end_time}
-		 */
-		public final Builder endTime(@Nullable String value) {
-			this.endTime = value;
-			return this;
-		}
-
-		/**
-		 * duration
-		 * <p>
-		 * API name: {@code duration}
-		 */
-		public final Builder duration(@Nullable Time value) {
-			this.duration = value;
-			return this;
-		}
-
-		/**
-		 * duration
-		 * <p>
-		 * API name: {@code duration}
-		 */
-		public final Builder duration(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.duration(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * number of indices
-		 * <p>
-		 * API name: {@code indices}
-		 */
-		public final Builder indices(@Nullable String value) {
-			this.indices = value;
-			return this;
-		}
-
-		/**
-		 * number of successful shards
-		 * <p>
-		 * API name: {@code successful_shards}
-		 */
-		public final Builder successfulShards(@Nullable String value) {
-			this.successfulShards = value;
-			return this;
-		}
-
-		/**
-		 * number of failed shards
-		 * <p>
-		 * API name: {@code failed_shards}
-		 */
-		public final Builder failedShards(@Nullable String value) {
-			this.failedShards = value;
-			return this;
-		}
-
-		/**
-		 * number of total shards
-		 * <p>
-		 * API name: {@code total_shards}
-		 */
-		public final Builder totalShards(@Nullable String value) {
-			this.totalShards = value;
-			return this;
-		}
-
-		/**
-		 * reason for failures
-		 * <p>
-		 * API name: {@code reason}
-		 */
-		public final Builder reason(@Nullable String value) {
-			this.reason = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SnapshotsRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SnapshotsRecord build() {
-			_checkSingleUse();
-
-			return new SnapshotsRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SnapshotsRecord}
-	 */
-	public static final JsonpDeserializer<SnapshotsRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SnapshotsRecord::setupSnapshotsRecordDeserializer);
-
-	protected static void setupSnapshotsRecordDeserializer(ObjectDeserializer<SnapshotsRecord.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id", "snapshot");
-		op.add(Builder::repository, JsonpDeserializer.stringDeserializer(), "repository", "re", "repo");
-		op.add(Builder::status, JsonpDeserializer.stringDeserializer(), "status", "s");
-		op.add(Builder::startEpoch, JsonpDeserializer.stringDeserializer(), "start_epoch", "ste", "startEpoch");
-		op.add(Builder::startTime, JsonpDeserializer.stringDeserializer(), "start_time", "sti", "startTime");
-		op.add(Builder::endEpoch, JsonpDeserializer.stringDeserializer(), "end_epoch", "ete", "endEpoch");
-		op.add(Builder::endTime, JsonpDeserializer.stringDeserializer(), "end_time", "eti", "endTime");
-		op.add(Builder::duration, Time._DESERIALIZER, "duration", "dur");
-		op.add(Builder::indices, JsonpDeserializer.stringDeserializer(), "indices", "i");
-		op.add(Builder::successfulShards, JsonpDeserializer.stringDeserializer(), "successful_shards", "ss");
-		op.add(Builder::failedShards, JsonpDeserializer.stringDeserializer(), "failed_shards", "fs");
-		op.add(Builder::totalShards, JsonpDeserializer.stringDeserializer(), "total_shards", "ts");
-		op.add(Builder::reason, JsonpDeserializer.stringDeserializer(), "reason", "r");
-
-	}
+    @Nullable
+    private final String id;
+
+    @Nullable
+    private final String repository;
+
+    @Nullable
+    private final String status;
+
+    @Nullable
+    private final String startEpoch;
+
+    @Nullable
+    private final String startTime;
+
+    @Nullable
+    private final String endEpoch;
+
+    @Nullable
+    private final String endTime;
+
+    @Nullable
+    private final Time duration;
+
+    @Nullable
+    private final String indices;
+
+    @Nullable
+    private final String successfulShards;
+
+    @Nullable
+    private final String failedShards;
+
+    @Nullable
+    private final String totalShards;
+
+    @Nullable
+    private final String reason;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SnapshotsRecord(Builder builder) {
+
+        this.id = builder.id;
+        this.repository = builder.repository;
+        this.status = builder.status;
+        this.startEpoch = builder.startEpoch;
+        this.startTime = builder.startTime;
+        this.endEpoch = builder.endEpoch;
+        this.endTime = builder.endTime;
+        this.duration = builder.duration;
+        this.indices = builder.indices;
+        this.successfulShards = builder.successfulShards;
+        this.failedShards = builder.failedShards;
+        this.totalShards = builder.totalShards;
+        this.reason = builder.reason;
+
+    }
+
+    public static SnapshotsRecord of(Function<Builder, ObjectBuilder<SnapshotsRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * unique snapshot
+     * <p>
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * repository name
+     * <p>
+     * API name: {@code repository}
+     */
+    @Nullable
+    public final String repository() {
+        return this.repository;
+    }
+
+    /**
+     * snapshot name
+     * <p>
+     * API name: {@code status}
+     */
+    @Nullable
+    public final String status() {
+        return this.status;
+    }
+
+    /**
+     * start time in seconds since 1970-01-01 00:00:00
+     * <p>
+     * API name: {@code start_epoch}
+     */
+    @Nullable
+    public final String startEpoch() {
+        return this.startEpoch;
+    }
+
+    /**
+     * start time in HH:MM:SS
+     * <p>
+     * API name: {@code start_time}
+     */
+    @Nullable
+    public final String startTime() {
+        return this.startTime;
+    }
+
+    /**
+     * end time in seconds since 1970-01-01 00:00:00
+     * <p>
+     * API name: {@code end_epoch}
+     */
+    @Nullable
+    public final String endEpoch() {
+        return this.endEpoch;
+    }
+
+    /**
+     * end time in HH:MM:SS
+     * <p>
+     * API name: {@code end_time}
+     */
+    @Nullable
+    public final String endTime() {
+        return this.endTime;
+    }
+
+    /**
+     * duration
+     * <p>
+     * API name: {@code duration}
+     */
+    @Nullable
+    public final Time duration() {
+        return this.duration;
+    }
+
+    /**
+     * number of indices
+     * <p>
+     * API name: {@code indices}
+     */
+    @Nullable
+    public final String indices() {
+        return this.indices;
+    }
+
+    /**
+     * number of successful shards
+     * <p>
+     * API name: {@code successful_shards}
+     */
+    @Nullable
+    public final String successfulShards() {
+        return this.successfulShards;
+    }
+
+    /**
+     * number of failed shards
+     * <p>
+     * API name: {@code failed_shards}
+     */
+    @Nullable
+    public final String failedShards() {
+        return this.failedShards;
+    }
+
+    /**
+     * number of total shards
+     * <p>
+     * API name: {@code total_shards}
+     */
+    @Nullable
+    public final String totalShards() {
+        return this.totalShards;
+    }
+
+    /**
+     * reason for failures
+     * <p>
+     * API name: {@code reason}
+     */
+    @Nullable
+    public final String reason() {
+        return this.reason;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.id != null) {
+            generator.writeKey("id");
+            generator.write(this.id);
+
+        }
+        if (this.repository != null) {
+            generator.writeKey("repository");
+            generator.write(this.repository);
+
+        }
+        if (this.status != null) {
+            generator.writeKey("status");
+            generator.write(this.status);
+
+        }
+        if (this.startEpoch != null) {
+            generator.writeKey("start_epoch");
+            generator.write(this.startEpoch);
+
+        }
+        if (this.startTime != null) {
+            generator.writeKey("start_time");
+            generator.write(this.startTime);
+
+        }
+        if (this.endEpoch != null) {
+            generator.writeKey("end_epoch");
+            generator.write(this.endEpoch);
+
+        }
+        if (this.endTime != null) {
+            generator.writeKey("end_time");
+            generator.write(this.endTime);
+
+        }
+        if (this.duration != null) {
+            generator.writeKey("duration");
+            this.duration.serialize(generator, mapper);
+
+        }
+        if (this.indices != null) {
+            generator.writeKey("indices");
+            generator.write(this.indices);
+
+        }
+        if (this.successfulShards != null) {
+            generator.writeKey("successful_shards");
+            generator.write(this.successfulShards);
+
+        }
+        if (this.failedShards != null) {
+            generator.writeKey("failed_shards");
+            generator.write(this.failedShards);
+
+        }
+        if (this.totalShards != null) {
+            generator.writeKey("total_shards");
+            generator.write(this.totalShards);
+
+        }
+        if (this.reason != null) {
+            generator.writeKey("reason");
+            generator.write(this.reason);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SnapshotsRecord}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotsRecord> {
+        @Nullable
+        private String id;
+
+        @Nullable
+        private String repository;
+
+        @Nullable
+        private String status;
+
+        @Nullable
+        private String startEpoch;
+
+        @Nullable
+        private String startTime;
+
+        @Nullable
+        private String endEpoch;
+
+        @Nullable
+        private String endTime;
+
+        @Nullable
+        private Time duration;
+
+        @Nullable
+        private String indices;
+
+        @Nullable
+        private String successfulShards;
+
+        @Nullable
+        private String failedShards;
+
+        @Nullable
+        private String totalShards;
+
+        @Nullable
+        private String reason;
+
+        /**
+         * unique snapshot
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * repository name
+         * <p>
+         * API name: {@code repository}
+         */
+        public final Builder repository(@Nullable String value) {
+            this.repository = value;
+            return this;
+        }
+
+        /**
+         * snapshot name
+         * <p>
+         * API name: {@code status}
+         */
+        public final Builder status(@Nullable String value) {
+            this.status = value;
+            return this;
+        }
+
+        /**
+         * start time in seconds since 1970-01-01 00:00:00
+         * <p>
+         * API name: {@code start_epoch}
+         */
+        public final Builder startEpoch(@Nullable String value) {
+            this.startEpoch = value;
+            return this;
+        }
+
+        /**
+         * start time in HH:MM:SS
+         * <p>
+         * API name: {@code start_time}
+         */
+        public final Builder startTime(@Nullable String value) {
+            this.startTime = value;
+            return this;
+        }
+
+        /**
+         * end time in seconds since 1970-01-01 00:00:00
+         * <p>
+         * API name: {@code end_epoch}
+         */
+        public final Builder endEpoch(@Nullable String value) {
+            this.endEpoch = value;
+            return this;
+        }
+
+        /**
+         * end time in HH:MM:SS
+         * <p>
+         * API name: {@code end_time}
+         */
+        public final Builder endTime(@Nullable String value) {
+            this.endTime = value;
+            return this;
+        }
+
+        /**
+         * duration
+         * <p>
+         * API name: {@code duration}
+         */
+        public final Builder duration(@Nullable Time value) {
+            this.duration = value;
+            return this;
+        }
+
+        /**
+         * duration
+         * <p>
+         * API name: {@code duration}
+         */
+        public final Builder duration(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.duration(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * number of indices
+         * <p>
+         * API name: {@code indices}
+         */
+        public final Builder indices(@Nullable String value) {
+            this.indices = value;
+            return this;
+        }
+
+        /**
+         * number of successful shards
+         * <p>
+         * API name: {@code successful_shards}
+         */
+        public final Builder successfulShards(@Nullable String value) {
+            this.successfulShards = value;
+            return this;
+        }
+
+        /**
+         * number of failed shards
+         * <p>
+         * API name: {@code failed_shards}
+         */
+        public final Builder failedShards(@Nullable String value) {
+            this.failedShards = value;
+            return this;
+        }
+
+        /**
+         * number of total shards
+         * <p>
+         * API name: {@code total_shards}
+         */
+        public final Builder totalShards(@Nullable String value) {
+            this.totalShards = value;
+            return this;
+        }
+
+        /**
+         * reason for failures
+         * <p>
+         * API name: {@code reason}
+         */
+        public final Builder reason(@Nullable String value) {
+            this.reason = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link SnapshotsRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SnapshotsRecord build() {
+            _checkSingleUse();
+
+            return new SnapshotsRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SnapshotsRecord}
+     */
+    public static final JsonpDeserializer<SnapshotsRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SnapshotsRecord::setupSnapshotsRecordDeserializer
+    );
+
+    protected static void setupSnapshotsRecordDeserializer(ObjectDeserializer<SnapshotsRecord.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id", "snapshot");
+        op.add(Builder::repository, JsonpDeserializer.stringDeserializer(), "repository", "re", "repo");
+        op.add(Builder::status, JsonpDeserializer.stringDeserializer(), "status", "s");
+        op.add(Builder::startEpoch, JsonpDeserializer.stringDeserializer(), "start_epoch", "ste", "startEpoch");
+        op.add(Builder::startTime, JsonpDeserializer.stringDeserializer(), "start_time", "sti", "startTime");
+        op.add(Builder::endEpoch, JsonpDeserializer.stringDeserializer(), "end_epoch", "ete", "endEpoch");
+        op.add(Builder::endTime, JsonpDeserializer.stringDeserializer(), "end_time", "eti", "endTime");
+        op.add(Builder::duration, Time._DESERIALIZER, "duration", "dur");
+        op.add(Builder::indices, JsonpDeserializer.stringDeserializer(), "indices", "i");
+        op.add(Builder::successfulShards, JsonpDeserializer.stringDeserializer(), "successful_shards", "ss");
+        op.add(Builder::failedShards, JsonpDeserializer.stringDeserializer(), "failed_shards", "fs");
+        op.add(Builder::totalShards, JsonpDeserializer.stringDeserializer(), "total_shards", "ts");
+        op.add(Builder::reason, JsonpDeserializer.stringDeserializer(), "reason", "r");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/tasks/TasksRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/tasks/TasksRecord.java
index f8d2c73de6..79d13a6c63 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/tasks/TasksRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/tasks/TasksRecord.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cat.tasks;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,599 +43,597 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cat.tasks.TasksRecord
 
-
 @JsonpDeserializable
 public class TasksRecord implements JsonpSerializable {
-	@Nullable
-	private final String id;
-
-	@Nullable
-	private final String action;
-
-	@Nullable
-	private final String taskId;
-
-	@Nullable
-	private final String parentTaskId;
-
-	@Nullable
-	private final String type;
-
-	@Nullable
-	private final String startTime;
-
-	@Nullable
-	private final String timestamp;
-
-	@Nullable
-	private final String runningTimeNs;
-
-	@Nullable
-	private final String runningTime;
-
-	@Nullable
-	private final String nodeId;
-
-	@Nullable
-	private final String ip;
-
-	@Nullable
-	private final String port;
-
-	@Nullable
-	private final String node;
-
-	@Nullable
-	private final String version;
-
-	@Nullable
-	private final String xOpaqueId;
-
-	@Nullable
-	private final String description;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TasksRecord(Builder builder) {
-
-		this.id = builder.id;
-		this.action = builder.action;
-		this.taskId = builder.taskId;
-		this.parentTaskId = builder.parentTaskId;
-		this.type = builder.type;
-		this.startTime = builder.startTime;
-		this.timestamp = builder.timestamp;
-		this.runningTimeNs = builder.runningTimeNs;
-		this.runningTime = builder.runningTime;
-		this.nodeId = builder.nodeId;
-		this.ip = builder.ip;
-		this.port = builder.port;
-		this.node = builder.node;
-		this.version = builder.version;
-		this.xOpaqueId = builder.xOpaqueId;
-		this.description = builder.description;
-
-	}
-
-	public static TasksRecord of(Function<Builder, ObjectBuilder<TasksRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * id of the task with the node
-	 * <p>
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * task action
-	 * <p>
-	 * API name: {@code action}
-	 */
-	@Nullable
-	public final String action() {
-		return this.action;
-	}
-
-	/**
-	 * unique task id
-	 * <p>
-	 * API name: {@code task_id}
-	 */
-	@Nullable
-	public final String taskId() {
-		return this.taskId;
-	}
-
-	/**
-	 * parent task id
-	 * <p>
-	 * API name: {@code parent_task_id}
-	 */
-	@Nullable
-	public final String parentTaskId() {
-		return this.parentTaskId;
-	}
-
-	/**
-	 * task type
-	 * <p>
-	 * API name: {@code type}
-	 */
-	@Nullable
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * start time in ms
-	 * <p>
-	 * API name: {@code start_time}
-	 */
-	@Nullable
-	public final String startTime() {
-		return this.startTime;
-	}
-
-	/**
-	 * start time in HH:MM:SS
-	 * <p>
-	 * API name: {@code timestamp}
-	 */
-	@Nullable
-	public final String timestamp() {
-		return this.timestamp;
-	}
-
-	/**
-	 * running time ns
-	 * <p>
-	 * API name: {@code running_time_ns}
-	 */
-	@Nullable
-	public final String runningTimeNs() {
-		return this.runningTimeNs;
-	}
-
-	/**
-	 * running time
-	 * <p>
-	 * API name: {@code running_time}
-	 */
-	@Nullable
-	public final String runningTime() {
-		return this.runningTime;
-	}
-
-	/**
-	 * unique node id
-	 * <p>
-	 * API name: {@code node_id}
-	 */
-	@Nullable
-	public final String nodeId() {
-		return this.nodeId;
-	}
-
-	/**
-	 * ip address
-	 * <p>
-	 * API name: {@code ip}
-	 */
-	@Nullable
-	public final String ip() {
-		return this.ip;
-	}
-
-	/**
-	 * bound transport port
-	 * <p>
-	 * API name: {@code port}
-	 */
-	@Nullable
-	public final String port() {
-		return this.port;
-	}
-
-	/**
-	 * node name
-	 * <p>
-	 * API name: {@code node}
-	 */
-	@Nullable
-	public final String node() {
-		return this.node;
-	}
-
-	/**
-	 * es version
-	 * <p>
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final String version() {
-		return this.version;
-	}
-
-	/**
-	 * X-Opaque-ID header
-	 * <p>
-	 * API name: {@code x_opaque_id}
-	 */
-	@Nullable
-	public final String xOpaqueId() {
-		return this.xOpaqueId;
-	}
-
-	/**
-	 * task action
-	 * <p>
-	 * API name: {@code description}
-	 */
-	@Nullable
-	public final String description() {
-		return this.description;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.id != null) {
-			generator.writeKey("id");
-			generator.write(this.id);
-
-		}
-		if (this.action != null) {
-			generator.writeKey("action");
-			generator.write(this.action);
-
-		}
-		if (this.taskId != null) {
-			generator.writeKey("task_id");
-			generator.write(this.taskId);
-
-		}
-		if (this.parentTaskId != null) {
-			generator.writeKey("parent_task_id");
-			generator.write(this.parentTaskId);
-
-		}
-		if (this.type != null) {
-			generator.writeKey("type");
-			generator.write(this.type);
-
-		}
-		if (this.startTime != null) {
-			generator.writeKey("start_time");
-			generator.write(this.startTime);
-
-		}
-		if (this.timestamp != null) {
-			generator.writeKey("timestamp");
-			generator.write(this.timestamp);
-
-		}
-		if (this.runningTimeNs != null) {
-			generator.writeKey("running_time_ns");
-			generator.write(this.runningTimeNs);
-
-		}
-		if (this.runningTime != null) {
-			generator.writeKey("running_time");
-			generator.write(this.runningTime);
-
-		}
-		if (this.nodeId != null) {
-			generator.writeKey("node_id");
-			generator.write(this.nodeId);
-
-		}
-		if (this.ip != null) {
-			generator.writeKey("ip");
-			generator.write(this.ip);
-
-		}
-		if (this.port != null) {
-			generator.writeKey("port");
-			generator.write(this.port);
-
-		}
-		if (this.node != null) {
-			generator.writeKey("node");
-			generator.write(this.node);
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		if (this.xOpaqueId != null) {
-			generator.writeKey("x_opaque_id");
-			generator.write(this.xOpaqueId);
-
-		}
-		if (this.description != null) {
-			generator.writeKey("description");
-			generator.write(this.description);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TasksRecord}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TasksRecord> {
-		@Nullable
-		private String id;
-
-		@Nullable
-		private String action;
-
-		@Nullable
-		private String taskId;
-
-		@Nullable
-		private String parentTaskId;
-
-		@Nullable
-		private String type;
-
-		@Nullable
-		private String startTime;
-
-		@Nullable
-		private String timestamp;
-
-		@Nullable
-		private String runningTimeNs;
-
-		@Nullable
-		private String runningTime;
-
-		@Nullable
-		private String nodeId;
-
-		@Nullable
-		private String ip;
-
-		@Nullable
-		private String port;
-
-		@Nullable
-		private String node;
-
-		@Nullable
-		private String version;
-
-		@Nullable
-		private String xOpaqueId;
-
-		@Nullable
-		private String description;
-
-		/**
-		 * id of the task with the node
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * task action
-		 * <p>
-		 * API name: {@code action}
-		 */
-		public final Builder action(@Nullable String value) {
-			this.action = value;
-			return this;
-		}
-
-		/**
-		 * unique task id
-		 * <p>
-		 * API name: {@code task_id}
-		 */
-		public final Builder taskId(@Nullable String value) {
-			this.taskId = value;
-			return this;
-		}
-
-		/**
-		 * parent task id
-		 * <p>
-		 * API name: {@code parent_task_id}
-		 */
-		public final Builder parentTaskId(@Nullable String value) {
-			this.parentTaskId = value;
-			return this;
-		}
-
-		/**
-		 * task type
-		 * <p>
-		 * API name: {@code type}
-		 */
-		public final Builder type(@Nullable String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * start time in ms
-		 * <p>
-		 * API name: {@code start_time}
-		 */
-		public final Builder startTime(@Nullable String value) {
-			this.startTime = value;
-			return this;
-		}
-
-		/**
-		 * start time in HH:MM:SS
-		 * <p>
-		 * API name: {@code timestamp}
-		 */
-		public final Builder timestamp(@Nullable String value) {
-			this.timestamp = value;
-			return this;
-		}
-
-		/**
-		 * running time ns
-		 * <p>
-		 * API name: {@code running_time_ns}
-		 */
-		public final Builder runningTimeNs(@Nullable String value) {
-			this.runningTimeNs = value;
-			return this;
-		}
-
-		/**
-		 * running time
-		 * <p>
-		 * API name: {@code running_time}
-		 */
-		public final Builder runningTime(@Nullable String value) {
-			this.runningTime = value;
-			return this;
-		}
-
-		/**
-		 * unique node id
-		 * <p>
-		 * API name: {@code node_id}
-		 */
-		public final Builder nodeId(@Nullable String value) {
-			this.nodeId = value;
-			return this;
-		}
-
-		/**
-		 * ip address
-		 * <p>
-		 * API name: {@code ip}
-		 */
-		public final Builder ip(@Nullable String value) {
-			this.ip = value;
-			return this;
-		}
-
-		/**
-		 * bound transport port
-		 * <p>
-		 * API name: {@code port}
-		 */
-		public final Builder port(@Nullable String value) {
-			this.port = value;
-			return this;
-		}
-
-		/**
-		 * node name
-		 * <p>
-		 * API name: {@code node}
-		 */
-		public final Builder node(@Nullable String value) {
-			this.node = value;
-			return this;
-		}
-
-		/**
-		 * es version
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * X-Opaque-ID header
-		 * <p>
-		 * API name: {@code x_opaque_id}
-		 */
-		public final Builder xOpaqueId(@Nullable String value) {
-			this.xOpaqueId = value;
-			return this;
-		}
-
-		/**
-		 * task action
-		 * <p>
-		 * API name: {@code description}
-		 */
-		public final Builder description(@Nullable String value) {
-			this.description = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TasksRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TasksRecord build() {
-			_checkSingleUse();
-
-			return new TasksRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TasksRecord}
-	 */
-	public static final JsonpDeserializer<TasksRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TasksRecord::setupTasksRecordDeserializer);
-
-	protected static void setupTasksRecordDeserializer(ObjectDeserializer<TasksRecord.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::action, JsonpDeserializer.stringDeserializer(), "action", "ac");
-		op.add(Builder::taskId, JsonpDeserializer.stringDeserializer(), "task_id", "ti");
-		op.add(Builder::parentTaskId, JsonpDeserializer.stringDeserializer(), "parent_task_id", "pti");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type", "ty");
-		op.add(Builder::startTime, JsonpDeserializer.stringDeserializer(), "start_time", "start");
-		op.add(Builder::timestamp, JsonpDeserializer.stringDeserializer(), "timestamp", "ts", "hms", "hhmmss");
-		op.add(Builder::runningTimeNs, JsonpDeserializer.stringDeserializer(), "running_time_ns");
-		op.add(Builder::runningTime, JsonpDeserializer.stringDeserializer(), "running_time", "time");
-		op.add(Builder::nodeId, JsonpDeserializer.stringDeserializer(), "node_id", "ni");
-		op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip", "i");
-		op.add(Builder::port, JsonpDeserializer.stringDeserializer(), "port", "po");
-		op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node", "n");
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version", "v");
-		op.add(Builder::xOpaqueId, JsonpDeserializer.stringDeserializer(), "x_opaque_id", "x");
-		op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description", "desc");
-
-	}
+    @Nullable
+    private final String id;
+
+    @Nullable
+    private final String action;
+
+    @Nullable
+    private final String taskId;
+
+    @Nullable
+    private final String parentTaskId;
+
+    @Nullable
+    private final String type;
+
+    @Nullable
+    private final String startTime;
+
+    @Nullable
+    private final String timestamp;
+
+    @Nullable
+    private final String runningTimeNs;
+
+    @Nullable
+    private final String runningTime;
+
+    @Nullable
+    private final String nodeId;
+
+    @Nullable
+    private final String ip;
+
+    @Nullable
+    private final String port;
+
+    @Nullable
+    private final String node;
+
+    @Nullable
+    private final String version;
+
+    @Nullable
+    private final String xOpaqueId;
+
+    @Nullable
+    private final String description;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TasksRecord(Builder builder) {
+
+        this.id = builder.id;
+        this.action = builder.action;
+        this.taskId = builder.taskId;
+        this.parentTaskId = builder.parentTaskId;
+        this.type = builder.type;
+        this.startTime = builder.startTime;
+        this.timestamp = builder.timestamp;
+        this.runningTimeNs = builder.runningTimeNs;
+        this.runningTime = builder.runningTime;
+        this.nodeId = builder.nodeId;
+        this.ip = builder.ip;
+        this.port = builder.port;
+        this.node = builder.node;
+        this.version = builder.version;
+        this.xOpaqueId = builder.xOpaqueId;
+        this.description = builder.description;
+
+    }
+
+    public static TasksRecord of(Function<Builder, ObjectBuilder<TasksRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * id of the task with the node
+     * <p>
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * task action
+     * <p>
+     * API name: {@code action}
+     */
+    @Nullable
+    public final String action() {
+        return this.action;
+    }
+
+    /**
+     * unique task id
+     * <p>
+     * API name: {@code task_id}
+     */
+    @Nullable
+    public final String taskId() {
+        return this.taskId;
+    }
+
+    /**
+     * parent task id
+     * <p>
+     * API name: {@code parent_task_id}
+     */
+    @Nullable
+    public final String parentTaskId() {
+        return this.parentTaskId;
+    }
+
+    /**
+     * task type
+     * <p>
+     * API name: {@code type}
+     */
+    @Nullable
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * start time in ms
+     * <p>
+     * API name: {@code start_time}
+     */
+    @Nullable
+    public final String startTime() {
+        return this.startTime;
+    }
+
+    /**
+     * start time in HH:MM:SS
+     * <p>
+     * API name: {@code timestamp}
+     */
+    @Nullable
+    public final String timestamp() {
+        return this.timestamp;
+    }
+
+    /**
+     * running time ns
+     * <p>
+     * API name: {@code running_time_ns}
+     */
+    @Nullable
+    public final String runningTimeNs() {
+        return this.runningTimeNs;
+    }
+
+    /**
+     * running time
+     * <p>
+     * API name: {@code running_time}
+     */
+    @Nullable
+    public final String runningTime() {
+        return this.runningTime;
+    }
+
+    /**
+     * unique node id
+     * <p>
+     * API name: {@code node_id}
+     */
+    @Nullable
+    public final String nodeId() {
+        return this.nodeId;
+    }
+
+    /**
+     * ip address
+     * <p>
+     * API name: {@code ip}
+     */
+    @Nullable
+    public final String ip() {
+        return this.ip;
+    }
+
+    /**
+     * bound transport port
+     * <p>
+     * API name: {@code port}
+     */
+    @Nullable
+    public final String port() {
+        return this.port;
+    }
+
+    /**
+     * node name
+     * <p>
+     * API name: {@code node}
+     */
+    @Nullable
+    public final String node() {
+        return this.node;
+    }
+
+    /**
+     * es version
+     * <p>
+     * API name: {@code version}
+     */
+    @Nullable
+    public final String version() {
+        return this.version;
+    }
+
+    /**
+     * X-Opaque-ID header
+     * <p>
+     * API name: {@code x_opaque_id}
+     */
+    @Nullable
+    public final String xOpaqueId() {
+        return this.xOpaqueId;
+    }
+
+    /**
+     * task action
+     * <p>
+     * API name: {@code description}
+     */
+    @Nullable
+    public final String description() {
+        return this.description;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.id != null) {
+            generator.writeKey("id");
+            generator.write(this.id);
+
+        }
+        if (this.action != null) {
+            generator.writeKey("action");
+            generator.write(this.action);
+
+        }
+        if (this.taskId != null) {
+            generator.writeKey("task_id");
+            generator.write(this.taskId);
+
+        }
+        if (this.parentTaskId != null) {
+            generator.writeKey("parent_task_id");
+            generator.write(this.parentTaskId);
+
+        }
+        if (this.type != null) {
+            generator.writeKey("type");
+            generator.write(this.type);
+
+        }
+        if (this.startTime != null) {
+            generator.writeKey("start_time");
+            generator.write(this.startTime);
+
+        }
+        if (this.timestamp != null) {
+            generator.writeKey("timestamp");
+            generator.write(this.timestamp);
+
+        }
+        if (this.runningTimeNs != null) {
+            generator.writeKey("running_time_ns");
+            generator.write(this.runningTimeNs);
+
+        }
+        if (this.runningTime != null) {
+            generator.writeKey("running_time");
+            generator.write(this.runningTime);
+
+        }
+        if (this.nodeId != null) {
+            generator.writeKey("node_id");
+            generator.write(this.nodeId);
+
+        }
+        if (this.ip != null) {
+            generator.writeKey("ip");
+            generator.write(this.ip);
+
+        }
+        if (this.port != null) {
+            generator.writeKey("port");
+            generator.write(this.port);
+
+        }
+        if (this.node != null) {
+            generator.writeKey("node");
+            generator.write(this.node);
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        if (this.xOpaqueId != null) {
+            generator.writeKey("x_opaque_id");
+            generator.write(this.xOpaqueId);
+
+        }
+        if (this.description != null) {
+            generator.writeKey("description");
+            generator.write(this.description);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TasksRecord}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TasksRecord> {
+        @Nullable
+        private String id;
+
+        @Nullable
+        private String action;
+
+        @Nullable
+        private String taskId;
+
+        @Nullable
+        private String parentTaskId;
+
+        @Nullable
+        private String type;
+
+        @Nullable
+        private String startTime;
+
+        @Nullable
+        private String timestamp;
+
+        @Nullable
+        private String runningTimeNs;
+
+        @Nullable
+        private String runningTime;
+
+        @Nullable
+        private String nodeId;
+
+        @Nullable
+        private String ip;
+
+        @Nullable
+        private String port;
+
+        @Nullable
+        private String node;
+
+        @Nullable
+        private String version;
+
+        @Nullable
+        private String xOpaqueId;
+
+        @Nullable
+        private String description;
+
+        /**
+         * id of the task with the node
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * task action
+         * <p>
+         * API name: {@code action}
+         */
+        public final Builder action(@Nullable String value) {
+            this.action = value;
+            return this;
+        }
+
+        /**
+         * unique task id
+         * <p>
+         * API name: {@code task_id}
+         */
+        public final Builder taskId(@Nullable String value) {
+            this.taskId = value;
+            return this;
+        }
+
+        /**
+         * parent task id
+         * <p>
+         * API name: {@code parent_task_id}
+         */
+        public final Builder parentTaskId(@Nullable String value) {
+            this.parentTaskId = value;
+            return this;
+        }
+
+        /**
+         * task type
+         * <p>
+         * API name: {@code type}
+         */
+        public final Builder type(@Nullable String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * start time in ms
+         * <p>
+         * API name: {@code start_time}
+         */
+        public final Builder startTime(@Nullable String value) {
+            this.startTime = value;
+            return this;
+        }
+
+        /**
+         * start time in HH:MM:SS
+         * <p>
+         * API name: {@code timestamp}
+         */
+        public final Builder timestamp(@Nullable String value) {
+            this.timestamp = value;
+            return this;
+        }
+
+        /**
+         * running time ns
+         * <p>
+         * API name: {@code running_time_ns}
+         */
+        public final Builder runningTimeNs(@Nullable String value) {
+            this.runningTimeNs = value;
+            return this;
+        }
+
+        /**
+         * running time
+         * <p>
+         * API name: {@code running_time}
+         */
+        public final Builder runningTime(@Nullable String value) {
+            this.runningTime = value;
+            return this;
+        }
+
+        /**
+         * unique node id
+         * <p>
+         * API name: {@code node_id}
+         */
+        public final Builder nodeId(@Nullable String value) {
+            this.nodeId = value;
+            return this;
+        }
+
+        /**
+         * ip address
+         * <p>
+         * API name: {@code ip}
+         */
+        public final Builder ip(@Nullable String value) {
+            this.ip = value;
+            return this;
+        }
+
+        /**
+         * bound transport port
+         * <p>
+         * API name: {@code port}
+         */
+        public final Builder port(@Nullable String value) {
+            this.port = value;
+            return this;
+        }
+
+        /**
+         * node name
+         * <p>
+         * API name: {@code node}
+         */
+        public final Builder node(@Nullable String value) {
+            this.node = value;
+            return this;
+        }
+
+        /**
+         * es version
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * X-Opaque-ID header
+         * <p>
+         * API name: {@code x_opaque_id}
+         */
+        public final Builder xOpaqueId(@Nullable String value) {
+            this.xOpaqueId = value;
+            return this;
+        }
+
+        /**
+         * task action
+         * <p>
+         * API name: {@code description}
+         */
+        public final Builder description(@Nullable String value) {
+            this.description = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link TasksRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TasksRecord build() {
+            _checkSingleUse();
+
+            return new TasksRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TasksRecord}
+     */
+    public static final JsonpDeserializer<TasksRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TasksRecord::setupTasksRecordDeserializer
+    );
+
+    protected static void setupTasksRecordDeserializer(ObjectDeserializer<TasksRecord.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::action, JsonpDeserializer.stringDeserializer(), "action", "ac");
+        op.add(Builder::taskId, JsonpDeserializer.stringDeserializer(), "task_id", "ti");
+        op.add(Builder::parentTaskId, JsonpDeserializer.stringDeserializer(), "parent_task_id", "pti");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type", "ty");
+        op.add(Builder::startTime, JsonpDeserializer.stringDeserializer(), "start_time", "start");
+        op.add(Builder::timestamp, JsonpDeserializer.stringDeserializer(), "timestamp", "ts", "hms", "hhmmss");
+        op.add(Builder::runningTimeNs, JsonpDeserializer.stringDeserializer(), "running_time_ns");
+        op.add(Builder::runningTime, JsonpDeserializer.stringDeserializer(), "running_time", "time");
+        op.add(Builder::nodeId, JsonpDeserializer.stringDeserializer(), "node_id", "ni");
+        op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip", "i");
+        op.add(Builder::port, JsonpDeserializer.stringDeserializer(), "port", "po");
+        op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node", "n");
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version", "v");
+        op.add(Builder::xOpaqueId, JsonpDeserializer.stringDeserializer(), "x_opaque_id", "x");
+        op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description", "desc");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/templates/TemplatesRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/templates/TemplatesRecord.java
index 8460406a7b..10339e2704 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/templates/TemplatesRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/templates/TemplatesRecord.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cat.templates;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,236 +43,234 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cat.templates.TemplatesRecord
 
-
 @JsonpDeserializable
 public class TemplatesRecord implements JsonpSerializable {
-	@Nullable
-	private final String name;
-
-	@Nullable
-	private final String indexPatterns;
-
-	@Nullable
-	private final String order;
-
-	@Nullable
-	private final String version;
-
-	@Nullable
-	private final String composedOf;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TemplatesRecord(Builder builder) {
-
-		this.name = builder.name;
-		this.indexPatterns = builder.indexPatterns;
-		this.order = builder.order;
-		this.version = builder.version;
-		this.composedOf = builder.composedOf;
-
-	}
-
-	public static TemplatesRecord of(Function<Builder, ObjectBuilder<TemplatesRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * template name
-	 * <p>
-	 * API name: {@code name}
-	 */
-	@Nullable
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * template index patterns
-	 * <p>
-	 * API name: {@code index_patterns}
-	 */
-	@Nullable
-	public final String indexPatterns() {
-		return this.indexPatterns;
-	}
-
-	/**
-	 * template application order/priority number
-	 * <p>
-	 * API name: {@code order}
-	 */
-	@Nullable
-	public final String order() {
-		return this.order;
-	}
-
-	/**
-	 * version
-	 * <p>
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final String version() {
-		return this.version;
-	}
-
-	/**
-	 * component templates comprising index template
-	 * <p>
-	 * API name: {@code composed_of}
-	 */
-	@Nullable
-	public final String composedOf() {
-		return this.composedOf;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.name != null) {
-			generator.writeKey("name");
-			generator.write(this.name);
-
-		}
-		if (this.indexPatterns != null) {
-			generator.writeKey("index_patterns");
-			generator.write(this.indexPatterns);
-
-		}
-		if (this.order != null) {
-			generator.writeKey("order");
-			generator.write(this.order);
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		if (this.composedOf != null) {
-			generator.writeKey("composed_of");
-			generator.write(this.composedOf);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TemplatesRecord}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TemplatesRecord> {
-		@Nullable
-		private String name;
-
-		@Nullable
-		private String indexPatterns;
-
-		@Nullable
-		private String order;
-
-		@Nullable
-		private String version;
-
-		@Nullable
-		private String composedOf;
-
-		/**
-		 * template name
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(@Nullable String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * template index patterns
-		 * <p>
-		 * API name: {@code index_patterns}
-		 */
-		public final Builder indexPatterns(@Nullable String value) {
-			this.indexPatterns = value;
-			return this;
-		}
-
-		/**
-		 * template application order/priority number
-		 * <p>
-		 * API name: {@code order}
-		 */
-		public final Builder order(@Nullable String value) {
-			this.order = value;
-			return this;
-		}
-
-		/**
-		 * version
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * component templates comprising index template
-		 * <p>
-		 * API name: {@code composed_of}
-		 */
-		public final Builder composedOf(@Nullable String value) {
-			this.composedOf = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TemplatesRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TemplatesRecord build() {
-			_checkSingleUse();
-
-			return new TemplatesRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TemplatesRecord}
-	 */
-	public static final JsonpDeserializer<TemplatesRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TemplatesRecord::setupTemplatesRecordDeserializer);
-
-	protected static void setupTemplatesRecordDeserializer(ObjectDeserializer<TemplatesRecord.Builder> op) {
-
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name", "n");
-		op.add(Builder::indexPatterns, JsonpDeserializer.stringDeserializer(), "index_patterns", "t");
-		op.add(Builder::order, JsonpDeserializer.stringDeserializer(), "order", "o", "p");
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version", "v");
-		op.add(Builder::composedOf, JsonpDeserializer.stringDeserializer(), "composed_of", "c");
-
-	}
+    @Nullable
+    private final String name;
+
+    @Nullable
+    private final String indexPatterns;
+
+    @Nullable
+    private final String order;
+
+    @Nullable
+    private final String version;
+
+    @Nullable
+    private final String composedOf;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TemplatesRecord(Builder builder) {
+
+        this.name = builder.name;
+        this.indexPatterns = builder.indexPatterns;
+        this.order = builder.order;
+        this.version = builder.version;
+        this.composedOf = builder.composedOf;
+
+    }
+
+    public static TemplatesRecord of(Function<Builder, ObjectBuilder<TemplatesRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * template name
+     * <p>
+     * API name: {@code name}
+     */
+    @Nullable
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * template index patterns
+     * <p>
+     * API name: {@code index_patterns}
+     */
+    @Nullable
+    public final String indexPatterns() {
+        return this.indexPatterns;
+    }
+
+    /**
+     * template application order/priority number
+     * <p>
+     * API name: {@code order}
+     */
+    @Nullable
+    public final String order() {
+        return this.order;
+    }
+
+    /**
+     * version
+     * <p>
+     * API name: {@code version}
+     */
+    @Nullable
+    public final String version() {
+        return this.version;
+    }
+
+    /**
+     * component templates comprising index template
+     * <p>
+     * API name: {@code composed_of}
+     */
+    @Nullable
+    public final String composedOf() {
+        return this.composedOf;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.name != null) {
+            generator.writeKey("name");
+            generator.write(this.name);
+
+        }
+        if (this.indexPatterns != null) {
+            generator.writeKey("index_patterns");
+            generator.write(this.indexPatterns);
+
+        }
+        if (this.order != null) {
+            generator.writeKey("order");
+            generator.write(this.order);
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        if (this.composedOf != null) {
+            generator.writeKey("composed_of");
+            generator.write(this.composedOf);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TemplatesRecord}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TemplatesRecord> {
+        @Nullable
+        private String name;
+
+        @Nullable
+        private String indexPatterns;
+
+        @Nullable
+        private String order;
+
+        @Nullable
+        private String version;
+
+        @Nullable
+        private String composedOf;
+
+        /**
+         * template name
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(@Nullable String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * template index patterns
+         * <p>
+         * API name: {@code index_patterns}
+         */
+        public final Builder indexPatterns(@Nullable String value) {
+            this.indexPatterns = value;
+            return this;
+        }
+
+        /**
+         * template application order/priority number
+         * <p>
+         * API name: {@code order}
+         */
+        public final Builder order(@Nullable String value) {
+            this.order = value;
+            return this;
+        }
+
+        /**
+         * version
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * component templates comprising index template
+         * <p>
+         * API name: {@code composed_of}
+         */
+        public final Builder composedOf(@Nullable String value) {
+            this.composedOf = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link TemplatesRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TemplatesRecord build() {
+            _checkSingleUse();
+
+            return new TemplatesRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TemplatesRecord}
+     */
+    public static final JsonpDeserializer<TemplatesRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TemplatesRecord::setupTemplatesRecordDeserializer
+    );
+
+    protected static void setupTemplatesRecordDeserializer(ObjectDeserializer<TemplatesRecord.Builder> op) {
+
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name", "n");
+        op.add(Builder::indexPatterns, JsonpDeserializer.stringDeserializer(), "index_patterns", "t");
+        op.add(Builder::order, JsonpDeserializer.stringDeserializer(), "order", "o", "p");
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version", "v");
+        op.add(Builder::composedOf, JsonpDeserializer.stringDeserializer(), "composed_of", "c");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/thread_pool/ThreadPoolRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/thread_pool/ThreadPoolRecord.java
index e13aaa3225..a85e4ab732 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/thread_pool/ThreadPoolRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/thread_pool/ThreadPoolRecord.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cat.thread_pool;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,731 +43,729 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cat.thread_pool.ThreadPoolRecord
 
-
 @JsonpDeserializable
 public class ThreadPoolRecord implements JsonpSerializable {
-	@Nullable
-	private final String nodeName;
+    @Nullable
+    private final String nodeName;
 
-	@Nullable
-	private final String nodeId;
+    @Nullable
+    private final String nodeId;
 
-	@Nullable
-	private final String ephemeralNodeId;
-
-	@Nullable
-	private final String pid;
-
-	@Nullable
-	private final String host;
-
-	@Nullable
-	private final String ip;
-
-	@Nullable
-	private final String port;
-
-	@Nullable
-	private final String name;
-
-	@Nullable
-	private final String type;
-
-	@Nullable
-	private final String active;
-
-	@Nullable
-	private final String poolSize;
-
-	@Nullable
-	private final String queue;
-
-	@Nullable
-	private final String queueSize;
-
-	@Nullable
-	private final String rejected;
-
-	@Nullable
-	private final String largest;
-
-	@Nullable
-	private final String completed;
-
-	@Nullable
-	private final String core;
-
-	@Nullable
-	private final String max;
-
-	@Nullable
-	private final String size;
-
-	@Nullable
-	private final String keepAlive;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ThreadPoolRecord(Builder builder) {
-
-		this.nodeName = builder.nodeName;
-		this.nodeId = builder.nodeId;
-		this.ephemeralNodeId = builder.ephemeralNodeId;
-		this.pid = builder.pid;
-		this.host = builder.host;
-		this.ip = builder.ip;
-		this.port = builder.port;
-		this.name = builder.name;
-		this.type = builder.type;
-		this.active = builder.active;
-		this.poolSize = builder.poolSize;
-		this.queue = builder.queue;
-		this.queueSize = builder.queueSize;
-		this.rejected = builder.rejected;
-		this.largest = builder.largest;
-		this.completed = builder.completed;
-		this.core = builder.core;
-		this.max = builder.max;
-		this.size = builder.size;
-		this.keepAlive = builder.keepAlive;
-
-	}
-
-	public static ThreadPoolRecord of(Function<Builder, ObjectBuilder<ThreadPoolRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * node name
-	 * <p>
-	 * API name: {@code node_name}
-	 */
-	@Nullable
-	public final String nodeName() {
-		return this.nodeName;
-	}
-
-	/**
-	 * persistent node id
-	 * <p>
-	 * API name: {@code node_id}
-	 */
-	@Nullable
-	public final String nodeId() {
-		return this.nodeId;
-	}
-
-	/**
-	 * ephemeral node id
-	 * <p>
-	 * API name: {@code ephemeral_node_id}
-	 */
-	@Nullable
-	public final String ephemeralNodeId() {
-		return this.ephemeralNodeId;
-	}
-
-	/**
-	 * process id
-	 * <p>
-	 * API name: {@code pid}
-	 */
-	@Nullable
-	public final String pid() {
-		return this.pid;
-	}
-
-	/**
-	 * host name
-	 * <p>
-	 * API name: {@code host}
-	 */
-	@Nullable
-	public final String host() {
-		return this.host;
-	}
-
-	/**
-	 * ip address
-	 * <p>
-	 * API name: {@code ip}
-	 */
-	@Nullable
-	public final String ip() {
-		return this.ip;
-	}
-
-	/**
-	 * bound transport port
-	 * <p>
-	 * API name: {@code port}
-	 */
-	@Nullable
-	public final String port() {
-		return this.port;
-	}
-
-	/**
-	 * thread pool name
-	 * <p>
-	 * API name: {@code name}
-	 */
-	@Nullable
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * thread pool type
-	 * <p>
-	 * API name: {@code type}
-	 */
-	@Nullable
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * number of active threads
-	 * <p>
-	 * API name: {@code active}
-	 */
-	@Nullable
-	public final String active() {
-		return this.active;
-	}
-
-	/**
-	 * number of threads
-	 * <p>
-	 * API name: {@code pool_size}
-	 */
-	@Nullable
-	public final String poolSize() {
-		return this.poolSize;
-	}
-
-	/**
-	 * number of tasks currently in queue
-	 * <p>
-	 * API name: {@code queue}
-	 */
-	@Nullable
-	public final String queue() {
-		return this.queue;
-	}
-
-	/**
-	 * maximum number of tasks permitted in queue
-	 * <p>
-	 * API name: {@code queue_size}
-	 */
-	@Nullable
-	public final String queueSize() {
-		return this.queueSize;
-	}
-
-	/**
-	 * number of rejected tasks
-	 * <p>
-	 * API name: {@code rejected}
-	 */
-	@Nullable
-	public final String rejected() {
-		return this.rejected;
-	}
-
-	/**
-	 * highest number of seen active threads
-	 * <p>
-	 * API name: {@code largest}
-	 */
-	@Nullable
-	public final String largest() {
-		return this.largest;
-	}
-
-	/**
-	 * number of completed tasks
-	 * <p>
-	 * API name: {@code completed}
-	 */
-	@Nullable
-	public final String completed() {
-		return this.completed;
-	}
-
-	/**
-	 * core number of threads in a scaling thread pool
-	 * <p>
-	 * API name: {@code core}
-	 */
-	@Nullable
-	public final String core() {
-		return this.core;
-	}
-
-	/**
-	 * maximum number of threads in a scaling thread pool
-	 * <p>
-	 * API name: {@code max}
-	 */
-	@Nullable
-	public final String max() {
-		return this.max;
-	}
-
-	/**
-	 * number of threads in a fixed thread pool
-	 * <p>
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final String size() {
-		return this.size;
-	}
-
-	/**
-	 * thread keep alive time
-	 * <p>
-	 * API name: {@code keep_alive}
-	 */
-	@Nullable
-	public final String keepAlive() {
-		return this.keepAlive;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.nodeName != null) {
-			generator.writeKey("node_name");
-			generator.write(this.nodeName);
-
-		}
-		if (this.nodeId != null) {
-			generator.writeKey("node_id");
-			generator.write(this.nodeId);
-
-		}
-		if (this.ephemeralNodeId != null) {
-			generator.writeKey("ephemeral_node_id");
-			generator.write(this.ephemeralNodeId);
-
-		}
-		if (this.pid != null) {
-			generator.writeKey("pid");
-			generator.write(this.pid);
-
-		}
-		if (this.host != null) {
-			generator.writeKey("host");
-			generator.write(this.host);
-
-		}
-		if (this.ip != null) {
-			generator.writeKey("ip");
-			generator.write(this.ip);
-
-		}
-		if (this.port != null) {
-			generator.writeKey("port");
-			generator.write(this.port);
-
-		}
-		if (this.name != null) {
-			generator.writeKey("name");
-			generator.write(this.name);
-
-		}
-		if (this.type != null) {
-			generator.writeKey("type");
-			generator.write(this.type);
-
-		}
-		if (this.active != null) {
-			generator.writeKey("active");
-			generator.write(this.active);
-
-		}
-		if (this.poolSize != null) {
-			generator.writeKey("pool_size");
-			generator.write(this.poolSize);
-
-		}
-		if (this.queue != null) {
-			generator.writeKey("queue");
-			generator.write(this.queue);
-
-		}
-		if (this.queueSize != null) {
-			generator.writeKey("queue_size");
-			generator.write(this.queueSize);
-
-		}
-		if (this.rejected != null) {
-			generator.writeKey("rejected");
-			generator.write(this.rejected);
-
-		}
-		if (this.largest != null) {
-			generator.writeKey("largest");
-			generator.write(this.largest);
-
-		}
-		if (this.completed != null) {
-			generator.writeKey("completed");
-			generator.write(this.completed);
-
-		}
-		if (this.core != null) {
-			generator.writeKey("core");
-			generator.write(this.core);
-
-		}
-		if (this.max != null) {
-			generator.writeKey("max");
-			generator.write(this.max);
-
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		if (this.keepAlive != null) {
-			generator.writeKey("keep_alive");
-			generator.write(this.keepAlive);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ThreadPoolRecord}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ThreadPoolRecord> {
-		@Nullable
-		private String nodeName;
-
-		@Nullable
-		private String nodeId;
-
-		@Nullable
-		private String ephemeralNodeId;
-
-		@Nullable
-		private String pid;
-
-		@Nullable
-		private String host;
-
-		@Nullable
-		private String ip;
-
-		@Nullable
-		private String port;
-
-		@Nullable
-		private String name;
-
-		@Nullable
-		private String type;
-
-		@Nullable
-		private String active;
-
-		@Nullable
-		private String poolSize;
-
-		@Nullable
-		private String queue;
-
-		@Nullable
-		private String queueSize;
-
-		@Nullable
-		private String rejected;
-
-		@Nullable
-		private String largest;
-
-		@Nullable
-		private String completed;
-
-		@Nullable
-		private String core;
-
-		@Nullable
-		private String max;
-
-		@Nullable
-		private String size;
-
-		@Nullable
-		private String keepAlive;
-
-		/**
-		 * node name
-		 * <p>
-		 * API name: {@code node_name}
-		 */
-		public final Builder nodeName(@Nullable String value) {
-			this.nodeName = value;
-			return this;
-		}
-
-		/**
-		 * persistent node id
-		 * <p>
-		 * API name: {@code node_id}
-		 */
-		public final Builder nodeId(@Nullable String value) {
-			this.nodeId = value;
-			return this;
-		}
-
-		/**
-		 * ephemeral node id
-		 * <p>
-		 * API name: {@code ephemeral_node_id}
-		 */
-		public final Builder ephemeralNodeId(@Nullable String value) {
-			this.ephemeralNodeId = value;
-			return this;
-		}
-
-		/**
-		 * process id
-		 * <p>
-		 * API name: {@code pid}
-		 */
-		public final Builder pid(@Nullable String value) {
-			this.pid = value;
-			return this;
-		}
-
-		/**
-		 * host name
-		 * <p>
-		 * API name: {@code host}
-		 */
-		public final Builder host(@Nullable String value) {
-			this.host = value;
-			return this;
-		}
-
-		/**
-		 * ip address
-		 * <p>
-		 * API name: {@code ip}
-		 */
-		public final Builder ip(@Nullable String value) {
-			this.ip = value;
-			return this;
-		}
-
-		/**
-		 * bound transport port
-		 * <p>
-		 * API name: {@code port}
-		 */
-		public final Builder port(@Nullable String value) {
-			this.port = value;
-			return this;
-		}
-
-		/**
-		 * thread pool name
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(@Nullable String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * thread pool type
-		 * <p>
-		 * API name: {@code type}
-		 */
-		public final Builder type(@Nullable String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * number of active threads
-		 * <p>
-		 * API name: {@code active}
-		 */
-		public final Builder active(@Nullable String value) {
-			this.active = value;
-			return this;
-		}
-
-		/**
-		 * number of threads
-		 * <p>
-		 * API name: {@code pool_size}
-		 */
-		public final Builder poolSize(@Nullable String value) {
-			this.poolSize = value;
-			return this;
-		}
-
-		/**
-		 * number of tasks currently in queue
-		 * <p>
-		 * API name: {@code queue}
-		 */
-		public final Builder queue(@Nullable String value) {
-			this.queue = value;
-			return this;
-		}
-
-		/**
-		 * maximum number of tasks permitted in queue
-		 * <p>
-		 * API name: {@code queue_size}
-		 */
-		public final Builder queueSize(@Nullable String value) {
-			this.queueSize = value;
-			return this;
-		}
-
-		/**
-		 * number of rejected tasks
-		 * <p>
-		 * API name: {@code rejected}
-		 */
-		public final Builder rejected(@Nullable String value) {
-			this.rejected = value;
-			return this;
-		}
-
-		/**
-		 * highest number of seen active threads
-		 * <p>
-		 * API name: {@code largest}
-		 */
-		public final Builder largest(@Nullable String value) {
-			this.largest = value;
-			return this;
-		}
-
-		/**
-		 * number of completed tasks
-		 * <p>
-		 * API name: {@code completed}
-		 */
-		public final Builder completed(@Nullable String value) {
-			this.completed = value;
-			return this;
-		}
-
-		/**
-		 * core number of threads in a scaling thread pool
-		 * <p>
-		 * API name: {@code core}
-		 */
-		public final Builder core(@Nullable String value) {
-			this.core = value;
-			return this;
-		}
-
-		/**
-		 * maximum number of threads in a scaling thread pool
-		 * <p>
-		 * API name: {@code max}
-		 */
-		public final Builder max(@Nullable String value) {
-			this.max = value;
-			return this;
-		}
-
-		/**
-		 * number of threads in a fixed thread pool
-		 * <p>
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable String value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * thread keep alive time
-		 * <p>
-		 * API name: {@code keep_alive}
-		 */
-		public final Builder keepAlive(@Nullable String value) {
-			this.keepAlive = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ThreadPoolRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ThreadPoolRecord build() {
-			_checkSingleUse();
-
-			return new ThreadPoolRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ThreadPoolRecord}
-	 */
-	public static final JsonpDeserializer<ThreadPoolRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ThreadPoolRecord::setupThreadPoolRecordDeserializer);
-
-	protected static void setupThreadPoolRecordDeserializer(ObjectDeserializer<ThreadPoolRecord.Builder> op) {
-
-		op.add(Builder::nodeName, JsonpDeserializer.stringDeserializer(), "node_name", "nn");
-		op.add(Builder::nodeId, JsonpDeserializer.stringDeserializer(), "node_id", "id");
-		op.add(Builder::ephemeralNodeId, JsonpDeserializer.stringDeserializer(), "ephemeral_node_id", "eid");
-		op.add(Builder::pid, JsonpDeserializer.stringDeserializer(), "pid", "p");
-		op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host", "h");
-		op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip", "i");
-		op.add(Builder::port, JsonpDeserializer.stringDeserializer(), "port", "po");
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name", "n");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type", "t");
-		op.add(Builder::active, JsonpDeserializer.stringDeserializer(), "active", "a");
-		op.add(Builder::poolSize, JsonpDeserializer.stringDeserializer(), "pool_size", "psz");
-		op.add(Builder::queue, JsonpDeserializer.stringDeserializer(), "queue", "q");
-		op.add(Builder::queueSize, JsonpDeserializer.stringDeserializer(), "queue_size", "qs");
-		op.add(Builder::rejected, JsonpDeserializer.stringDeserializer(), "rejected", "r");
-		op.add(Builder::largest, JsonpDeserializer.stringDeserializer(), "largest", "l");
-		op.add(Builder::completed, JsonpDeserializer.stringDeserializer(), "completed", "c");
-		op.add(Builder::core, JsonpDeserializer.stringDeserializer(), "core", "cr");
-		op.add(Builder::max, JsonpDeserializer.stringDeserializer(), "max", "mx");
-		op.add(Builder::size, JsonpDeserializer.stringDeserializer(), "size", "sz");
-		op.add(Builder::keepAlive, JsonpDeserializer.stringDeserializer(), "keep_alive", "ka");
-
-	}
+    @Nullable
+    private final String ephemeralNodeId;
+
+    @Nullable
+    private final String pid;
+
+    @Nullable
+    private final String host;
+
+    @Nullable
+    private final String ip;
+
+    @Nullable
+    private final String port;
+
+    @Nullable
+    private final String name;
+
+    @Nullable
+    private final String type;
+
+    @Nullable
+    private final String active;
+
+    @Nullable
+    private final String poolSize;
+
+    @Nullable
+    private final String queue;
+
+    @Nullable
+    private final String queueSize;
+
+    @Nullable
+    private final String rejected;
+
+    @Nullable
+    private final String largest;
+
+    @Nullable
+    private final String completed;
+
+    @Nullable
+    private final String core;
+
+    @Nullable
+    private final String max;
+
+    @Nullable
+    private final String size;
+
+    @Nullable
+    private final String keepAlive;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ThreadPoolRecord(Builder builder) {
+
+        this.nodeName = builder.nodeName;
+        this.nodeId = builder.nodeId;
+        this.ephemeralNodeId = builder.ephemeralNodeId;
+        this.pid = builder.pid;
+        this.host = builder.host;
+        this.ip = builder.ip;
+        this.port = builder.port;
+        this.name = builder.name;
+        this.type = builder.type;
+        this.active = builder.active;
+        this.poolSize = builder.poolSize;
+        this.queue = builder.queue;
+        this.queueSize = builder.queueSize;
+        this.rejected = builder.rejected;
+        this.largest = builder.largest;
+        this.completed = builder.completed;
+        this.core = builder.core;
+        this.max = builder.max;
+        this.size = builder.size;
+        this.keepAlive = builder.keepAlive;
+
+    }
+
+    public static ThreadPoolRecord of(Function<Builder, ObjectBuilder<ThreadPoolRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * node name
+     * <p>
+     * API name: {@code node_name}
+     */
+    @Nullable
+    public final String nodeName() {
+        return this.nodeName;
+    }
+
+    /**
+     * persistent node id
+     * <p>
+     * API name: {@code node_id}
+     */
+    @Nullable
+    public final String nodeId() {
+        return this.nodeId;
+    }
+
+    /**
+     * ephemeral node id
+     * <p>
+     * API name: {@code ephemeral_node_id}
+     */
+    @Nullable
+    public final String ephemeralNodeId() {
+        return this.ephemeralNodeId;
+    }
+
+    /**
+     * process id
+     * <p>
+     * API name: {@code pid}
+     */
+    @Nullable
+    public final String pid() {
+        return this.pid;
+    }
+
+    /**
+     * host name
+     * <p>
+     * API name: {@code host}
+     */
+    @Nullable
+    public final String host() {
+        return this.host;
+    }
+
+    /**
+     * ip address
+     * <p>
+     * API name: {@code ip}
+     */
+    @Nullable
+    public final String ip() {
+        return this.ip;
+    }
+
+    /**
+     * bound transport port
+     * <p>
+     * API name: {@code port}
+     */
+    @Nullable
+    public final String port() {
+        return this.port;
+    }
+
+    /**
+     * thread pool name
+     * <p>
+     * API name: {@code name}
+     */
+    @Nullable
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * thread pool type
+     * <p>
+     * API name: {@code type}
+     */
+    @Nullable
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * number of active threads
+     * <p>
+     * API name: {@code active}
+     */
+    @Nullable
+    public final String active() {
+        return this.active;
+    }
+
+    /**
+     * number of threads
+     * <p>
+     * API name: {@code pool_size}
+     */
+    @Nullable
+    public final String poolSize() {
+        return this.poolSize;
+    }
+
+    /**
+     * number of tasks currently in queue
+     * <p>
+     * API name: {@code queue}
+     */
+    @Nullable
+    public final String queue() {
+        return this.queue;
+    }
+
+    /**
+     * maximum number of tasks permitted in queue
+     * <p>
+     * API name: {@code queue_size}
+     */
+    @Nullable
+    public final String queueSize() {
+        return this.queueSize;
+    }
+
+    /**
+     * number of rejected tasks
+     * <p>
+     * API name: {@code rejected}
+     */
+    @Nullable
+    public final String rejected() {
+        return this.rejected;
+    }
+
+    /**
+     * highest number of seen active threads
+     * <p>
+     * API name: {@code largest}
+     */
+    @Nullable
+    public final String largest() {
+        return this.largest;
+    }
+
+    /**
+     * number of completed tasks
+     * <p>
+     * API name: {@code completed}
+     */
+    @Nullable
+    public final String completed() {
+        return this.completed;
+    }
+
+    /**
+     * core number of threads in a scaling thread pool
+     * <p>
+     * API name: {@code core}
+     */
+    @Nullable
+    public final String core() {
+        return this.core;
+    }
+
+    /**
+     * maximum number of threads in a scaling thread pool
+     * <p>
+     * API name: {@code max}
+     */
+    @Nullable
+    public final String max() {
+        return this.max;
+    }
+
+    /**
+     * number of threads in a fixed thread pool
+     * <p>
+     * API name: {@code size}
+     */
+    @Nullable
+    public final String size() {
+        return this.size;
+    }
+
+    /**
+     * thread keep alive time
+     * <p>
+     * API name: {@code keep_alive}
+     */
+    @Nullable
+    public final String keepAlive() {
+        return this.keepAlive;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.nodeName != null) {
+            generator.writeKey("node_name");
+            generator.write(this.nodeName);
+
+        }
+        if (this.nodeId != null) {
+            generator.writeKey("node_id");
+            generator.write(this.nodeId);
+
+        }
+        if (this.ephemeralNodeId != null) {
+            generator.writeKey("ephemeral_node_id");
+            generator.write(this.ephemeralNodeId);
+
+        }
+        if (this.pid != null) {
+            generator.writeKey("pid");
+            generator.write(this.pid);
+
+        }
+        if (this.host != null) {
+            generator.writeKey("host");
+            generator.write(this.host);
+
+        }
+        if (this.ip != null) {
+            generator.writeKey("ip");
+            generator.write(this.ip);
+
+        }
+        if (this.port != null) {
+            generator.writeKey("port");
+            generator.write(this.port);
+
+        }
+        if (this.name != null) {
+            generator.writeKey("name");
+            generator.write(this.name);
+
+        }
+        if (this.type != null) {
+            generator.writeKey("type");
+            generator.write(this.type);
+
+        }
+        if (this.active != null) {
+            generator.writeKey("active");
+            generator.write(this.active);
+
+        }
+        if (this.poolSize != null) {
+            generator.writeKey("pool_size");
+            generator.write(this.poolSize);
+
+        }
+        if (this.queue != null) {
+            generator.writeKey("queue");
+            generator.write(this.queue);
+
+        }
+        if (this.queueSize != null) {
+            generator.writeKey("queue_size");
+            generator.write(this.queueSize);
+
+        }
+        if (this.rejected != null) {
+            generator.writeKey("rejected");
+            generator.write(this.rejected);
+
+        }
+        if (this.largest != null) {
+            generator.writeKey("largest");
+            generator.write(this.largest);
+
+        }
+        if (this.completed != null) {
+            generator.writeKey("completed");
+            generator.write(this.completed);
+
+        }
+        if (this.core != null) {
+            generator.writeKey("core");
+            generator.write(this.core);
+
+        }
+        if (this.max != null) {
+            generator.writeKey("max");
+            generator.write(this.max);
+
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        if (this.keepAlive != null) {
+            generator.writeKey("keep_alive");
+            generator.write(this.keepAlive);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ThreadPoolRecord}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ThreadPoolRecord> {
+        @Nullable
+        private String nodeName;
+
+        @Nullable
+        private String nodeId;
+
+        @Nullable
+        private String ephemeralNodeId;
+
+        @Nullable
+        private String pid;
+
+        @Nullable
+        private String host;
+
+        @Nullable
+        private String ip;
+
+        @Nullable
+        private String port;
+
+        @Nullable
+        private String name;
+
+        @Nullable
+        private String type;
+
+        @Nullable
+        private String active;
+
+        @Nullable
+        private String poolSize;
+
+        @Nullable
+        private String queue;
+
+        @Nullable
+        private String queueSize;
+
+        @Nullable
+        private String rejected;
+
+        @Nullable
+        private String largest;
+
+        @Nullable
+        private String completed;
+
+        @Nullable
+        private String core;
+
+        @Nullable
+        private String max;
+
+        @Nullable
+        private String size;
+
+        @Nullable
+        private String keepAlive;
+
+        /**
+         * node name
+         * <p>
+         * API name: {@code node_name}
+         */
+        public final Builder nodeName(@Nullable String value) {
+            this.nodeName = value;
+            return this;
+        }
+
+        /**
+         * persistent node id
+         * <p>
+         * API name: {@code node_id}
+         */
+        public final Builder nodeId(@Nullable String value) {
+            this.nodeId = value;
+            return this;
+        }
+
+        /**
+         * ephemeral node id
+         * <p>
+         * API name: {@code ephemeral_node_id}
+         */
+        public final Builder ephemeralNodeId(@Nullable String value) {
+            this.ephemeralNodeId = value;
+            return this;
+        }
+
+        /**
+         * process id
+         * <p>
+         * API name: {@code pid}
+         */
+        public final Builder pid(@Nullable String value) {
+            this.pid = value;
+            return this;
+        }
+
+        /**
+         * host name
+         * <p>
+         * API name: {@code host}
+         */
+        public final Builder host(@Nullable String value) {
+            this.host = value;
+            return this;
+        }
+
+        /**
+         * ip address
+         * <p>
+         * API name: {@code ip}
+         */
+        public final Builder ip(@Nullable String value) {
+            this.ip = value;
+            return this;
+        }
+
+        /**
+         * bound transport port
+         * <p>
+         * API name: {@code port}
+         */
+        public final Builder port(@Nullable String value) {
+            this.port = value;
+            return this;
+        }
+
+        /**
+         * thread pool name
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(@Nullable String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * thread pool type
+         * <p>
+         * API name: {@code type}
+         */
+        public final Builder type(@Nullable String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * number of active threads
+         * <p>
+         * API name: {@code active}
+         */
+        public final Builder active(@Nullable String value) {
+            this.active = value;
+            return this;
+        }
+
+        /**
+         * number of threads
+         * <p>
+         * API name: {@code pool_size}
+         */
+        public final Builder poolSize(@Nullable String value) {
+            this.poolSize = value;
+            return this;
+        }
+
+        /**
+         * number of tasks currently in queue
+         * <p>
+         * API name: {@code queue}
+         */
+        public final Builder queue(@Nullable String value) {
+            this.queue = value;
+            return this;
+        }
+
+        /**
+         * maximum number of tasks permitted in queue
+         * <p>
+         * API name: {@code queue_size}
+         */
+        public final Builder queueSize(@Nullable String value) {
+            this.queueSize = value;
+            return this;
+        }
+
+        /**
+         * number of rejected tasks
+         * <p>
+         * API name: {@code rejected}
+         */
+        public final Builder rejected(@Nullable String value) {
+            this.rejected = value;
+            return this;
+        }
+
+        /**
+         * highest number of seen active threads
+         * <p>
+         * API name: {@code largest}
+         */
+        public final Builder largest(@Nullable String value) {
+            this.largest = value;
+            return this;
+        }
+
+        /**
+         * number of completed tasks
+         * <p>
+         * API name: {@code completed}
+         */
+        public final Builder completed(@Nullable String value) {
+            this.completed = value;
+            return this;
+        }
+
+        /**
+         * core number of threads in a scaling thread pool
+         * <p>
+         * API name: {@code core}
+         */
+        public final Builder core(@Nullable String value) {
+            this.core = value;
+            return this;
+        }
+
+        /**
+         * maximum number of threads in a scaling thread pool
+         * <p>
+         * API name: {@code max}
+         */
+        public final Builder max(@Nullable String value) {
+            this.max = value;
+            return this;
+        }
+
+        /**
+         * number of threads in a fixed thread pool
+         * <p>
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable String value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * thread keep alive time
+         * <p>
+         * API name: {@code keep_alive}
+         */
+        public final Builder keepAlive(@Nullable String value) {
+            this.keepAlive = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ThreadPoolRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ThreadPoolRecord build() {
+            _checkSingleUse();
+
+            return new ThreadPoolRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ThreadPoolRecord}
+     */
+    public static final JsonpDeserializer<ThreadPoolRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ThreadPoolRecord::setupThreadPoolRecordDeserializer
+    );
+
+    protected static void setupThreadPoolRecordDeserializer(ObjectDeserializer<ThreadPoolRecord.Builder> op) {
+
+        op.add(Builder::nodeName, JsonpDeserializer.stringDeserializer(), "node_name", "nn");
+        op.add(Builder::nodeId, JsonpDeserializer.stringDeserializer(), "node_id", "id");
+        op.add(Builder::ephemeralNodeId, JsonpDeserializer.stringDeserializer(), "ephemeral_node_id", "eid");
+        op.add(Builder::pid, JsonpDeserializer.stringDeserializer(), "pid", "p");
+        op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host", "h");
+        op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip", "i");
+        op.add(Builder::port, JsonpDeserializer.stringDeserializer(), "port", "po");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name", "n");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type", "t");
+        op.add(Builder::active, JsonpDeserializer.stringDeserializer(), "active", "a");
+        op.add(Builder::poolSize, JsonpDeserializer.stringDeserializer(), "pool_size", "psz");
+        op.add(Builder::queue, JsonpDeserializer.stringDeserializer(), "queue", "q");
+        op.add(Builder::queueSize, JsonpDeserializer.stringDeserializer(), "queue_size", "qs");
+        op.add(Builder::rejected, JsonpDeserializer.stringDeserializer(), "rejected", "r");
+        op.add(Builder::largest, JsonpDeserializer.stringDeserializer(), "largest", "l");
+        op.add(Builder::completed, JsonpDeserializer.stringDeserializer(), "completed", "c");
+        op.add(Builder::core, JsonpDeserializer.stringDeserializer(), "core", "cr");
+        op.add(Builder::max, JsonpDeserializer.stringDeserializer(), "max", "mx");
+        op.add(Builder::size, JsonpDeserializer.stringDeserializer(), "size", "sz");
+        op.add(Builder::keepAlive, JsonpDeserializer.stringDeserializer(), "keep_alive", "ka");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/thread_pool/ThreadPoolSize.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/thread_pool/ThreadPoolSize.java
index 1c75eef5e8..ea07c6a660 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cat/thread_pool/ThreadPoolSize.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cat/thread_pool/ThreadPoolSize.java
@@ -35,31 +35,29 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum ThreadPoolSize implements JsonEnum {
-	K("k"),
+    K("k"),
 
-	M("m"),
+    M("m"),
 
-	G("g"),
+    G("g"),
 
-	T("t"),
+    T("t"),
 
-	P("p"),
+    P("p"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	ThreadPoolSize(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    ThreadPoolSize(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<ThreadPoolSize> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			ThreadPoolSize.values());
+    public static final JsonEnum.Deserializer<ThreadPoolSize> _DESERIALIZER = new JsonEnum.Deserializer<>(ThreadPoolSize.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/AllocationExplainRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/AllocationExplainRequest.java
index a5a6730d95..b52153fc1d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/AllocationExplainRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/AllocationExplainRequest.java
@@ -32,308 +32,313 @@
 
 package org.opensearch.client.opensearch.cluster;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.allocation_explain.Request
 
 /**
  * Provides explanations for shard allocations in the cluster.
- * 
+ *
  */
 @JsonpDeserializable
 public class AllocationExplainRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final String currentNode;
-
-	@Nullable
-	private final Boolean includeDiskInfo;
-
-	@Nullable
-	private final Boolean includeYesDecisions;
-
-	@Nullable
-	private final String index;
-
-	@Nullable
-	private final Boolean primary;
-
-	@Nullable
-	private final Integer shard;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AllocationExplainRequest(Builder builder) {
-
-		this.currentNode = builder.currentNode;
-		this.includeDiskInfo = builder.includeDiskInfo;
-		this.includeYesDecisions = builder.includeYesDecisions;
-		this.index = builder.index;
-		this.primary = builder.primary;
-		this.shard = builder.shard;
-
-	}
-
-	public static AllocationExplainRequest of(Function<Builder, ObjectBuilder<AllocationExplainRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Specifies the node ID or the name of the node to only explain a shard that is
-	 * currently located on the specified node.
-	 * <p>
-	 * API name: {@code current_node}
-	 */
-	@Nullable
-	public final String currentNode() {
-		return this.currentNode;
-	}
-
-	/**
-	 * If true, returns information about disk usage and shard sizes.
-	 * <p>
-	 * API name: {@code include_disk_info}
-	 */
-	@Nullable
-	public final Boolean includeDiskInfo() {
-		return this.includeDiskInfo;
-	}
-
-	/**
-	 * If true, returns YES decisions in explanation.
-	 * <p>
-	 * API name: {@code include_yes_decisions}
-	 */
-	@Nullable
-	public final Boolean includeYesDecisions() {
-		return this.includeYesDecisions;
-	}
-
-	/**
-	 * Specifies the name of the index that you would like an explanation for.
-	 * <p>
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * If true, returns explanation for the primary shard for the given shard ID.
-	 * <p>
-	 * API name: {@code primary}
-	 */
-	@Nullable
-	public final Boolean primary() {
-		return this.primary;
-	}
-
-	/**
-	 * Specifies the ID of the shard that you would like an explanation for.
-	 * <p>
-	 * API name: {@code shard}
-	 */
-	@Nullable
-	public final Integer shard() {
-		return this.shard;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.currentNode != null) {
-			generator.writeKey("current_node");
-			generator.write(this.currentNode);
-
-		}
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.primary != null) {
-			generator.writeKey("primary");
-			generator.write(this.primary);
-
-		}
-		if (this.shard != null) {
-			generator.writeKey("shard");
-			generator.write(this.shard);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AllocationExplainRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AllocationExplainRequest> {
-		@Nullable
-		private String currentNode;
-
-		@Nullable
-		private Boolean includeDiskInfo;
-
-		@Nullable
-		private Boolean includeYesDecisions;
-
-		@Nullable
-		private String index;
-
-		@Nullable
-		private Boolean primary;
-
-		@Nullable
-		private Integer shard;
-
-		/**
-		 * Specifies the node ID or the name of the node to only explain a shard that is
-		 * currently located on the specified node.
-		 * <p>
-		 * API name: {@code current_node}
-		 */
-		public final Builder currentNode(@Nullable String value) {
-			this.currentNode = value;
-			return this;
-		}
-
-		/**
-		 * If true, returns information about disk usage and shard sizes.
-		 * <p>
-		 * API name: {@code include_disk_info}
-		 */
-		public final Builder includeDiskInfo(@Nullable Boolean value) {
-			this.includeDiskInfo = value;
-			return this;
-		}
-
-		/**
-		 * If true, returns YES decisions in explanation.
-		 * <p>
-		 * API name: {@code include_yes_decisions}
-		 */
-		public final Builder includeYesDecisions(@Nullable Boolean value) {
-			this.includeYesDecisions = value;
-			return this;
-		}
-
-		/**
-		 * Specifies the name of the index that you would like an explanation for.
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * If true, returns explanation for the primary shard for the given shard ID.
-		 * <p>
-		 * API name: {@code primary}
-		 */
-		public final Builder primary(@Nullable Boolean value) {
-			this.primary = value;
-			return this;
-		}
-
-		/**
-		 * Specifies the ID of the shard that you would like an explanation for.
-		 * <p>
-		 * API name: {@code shard}
-		 */
-		public final Builder shard(@Nullable Integer value) {
-			this.shard = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AllocationExplainRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AllocationExplainRequest build() {
-			_checkSingleUse();
-
-			return new AllocationExplainRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AllocationExplainRequest}
-	 */
-	public static final JsonpDeserializer<AllocationExplainRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, AllocationExplainRequest::setupAllocationExplainRequestDeserializer);
-
-	protected static void setupAllocationExplainRequestDeserializer(
-			ObjectDeserializer<AllocationExplainRequest.Builder> op) {
-
-		op.add(Builder::currentNode, JsonpDeserializer.stringDeserializer(), "current_node");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::primary, JsonpDeserializer.booleanDeserializer(), "primary");
-		op.add(Builder::shard, JsonpDeserializer.integerDeserializer(), "shard");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cluster.allocation_explain}".
-	 */
-	public static final Endpoint<AllocationExplainRequest, AllocationExplainResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				return "/_cluster/allocation/explain";
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.includeDiskInfo != null) {
-					params.put("include_disk_info", String.valueOf(request.includeDiskInfo));
-				}
-				if (request.includeYesDecisions != null) {
-					params.put("include_yes_decisions", String.valueOf(request.includeYesDecisions));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, AllocationExplainResponse._DESERIALIZER);
+    @Nullable
+    private final String currentNode;
+
+    @Nullable
+    private final Boolean includeDiskInfo;
+
+    @Nullable
+    private final Boolean includeYesDecisions;
+
+    @Nullable
+    private final String index;
+
+    @Nullable
+    private final Boolean primary;
+
+    @Nullable
+    private final Integer shard;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AllocationExplainRequest(Builder builder) {
+
+        this.currentNode = builder.currentNode;
+        this.includeDiskInfo = builder.includeDiskInfo;
+        this.includeYesDecisions = builder.includeYesDecisions;
+        this.index = builder.index;
+        this.primary = builder.primary;
+        this.shard = builder.shard;
+
+    }
+
+    public static AllocationExplainRequest of(Function<Builder, ObjectBuilder<AllocationExplainRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Specifies the node ID or the name of the node to only explain a shard that is
+     * currently located on the specified node.
+     * <p>
+     * API name: {@code current_node}
+     */
+    @Nullable
+    public final String currentNode() {
+        return this.currentNode;
+    }
+
+    /**
+     * If true, returns information about disk usage and shard sizes.
+     * <p>
+     * API name: {@code include_disk_info}
+     */
+    @Nullable
+    public final Boolean includeDiskInfo() {
+        return this.includeDiskInfo;
+    }
+
+    /**
+     * If true, returns YES decisions in explanation.
+     * <p>
+     * API name: {@code include_yes_decisions}
+     */
+    @Nullable
+    public final Boolean includeYesDecisions() {
+        return this.includeYesDecisions;
+    }
+
+    /**
+     * Specifies the name of the index that you would like an explanation for.
+     * <p>
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * If true, returns explanation for the primary shard for the given shard ID.
+     * <p>
+     * API name: {@code primary}
+     */
+    @Nullable
+    public final Boolean primary() {
+        return this.primary;
+    }
+
+    /**
+     * Specifies the ID of the shard that you would like an explanation for.
+     * <p>
+     * API name: {@code shard}
+     */
+    @Nullable
+    public final Integer shard() {
+        return this.shard;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.currentNode != null) {
+            generator.writeKey("current_node");
+            generator.write(this.currentNode);
+
+        }
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.primary != null) {
+            generator.writeKey("primary");
+            generator.write(this.primary);
+
+        }
+        if (this.shard != null) {
+            generator.writeKey("shard");
+            generator.write(this.shard);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AllocationExplainRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AllocationExplainRequest> {
+        @Nullable
+        private String currentNode;
+
+        @Nullable
+        private Boolean includeDiskInfo;
+
+        @Nullable
+        private Boolean includeYesDecisions;
+
+        @Nullable
+        private String index;
+
+        @Nullable
+        private Boolean primary;
+
+        @Nullable
+        private Integer shard;
+
+        /**
+         * Specifies the node ID or the name of the node to only explain a shard that is
+         * currently located on the specified node.
+         * <p>
+         * API name: {@code current_node}
+         */
+        public final Builder currentNode(@Nullable String value) {
+            this.currentNode = value;
+            return this;
+        }
+
+        /**
+         * If true, returns information about disk usage and shard sizes.
+         * <p>
+         * API name: {@code include_disk_info}
+         */
+        public final Builder includeDiskInfo(@Nullable Boolean value) {
+            this.includeDiskInfo = value;
+            return this;
+        }
+
+        /**
+         * If true, returns YES decisions in explanation.
+         * <p>
+         * API name: {@code include_yes_decisions}
+         */
+        public final Builder includeYesDecisions(@Nullable Boolean value) {
+            this.includeYesDecisions = value;
+            return this;
+        }
+
+        /**
+         * Specifies the name of the index that you would like an explanation for.
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * If true, returns explanation for the primary shard for the given shard ID.
+         * <p>
+         * API name: {@code primary}
+         */
+        public final Builder primary(@Nullable Boolean value) {
+            this.primary = value;
+            return this;
+        }
+
+        /**
+         * Specifies the ID of the shard that you would like an explanation for.
+         * <p>
+         * API name: {@code shard}
+         */
+        public final Builder shard(@Nullable Integer value) {
+            this.shard = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link AllocationExplainRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AllocationExplainRequest build() {
+            _checkSingleUse();
+
+            return new AllocationExplainRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AllocationExplainRequest}
+     */
+    public static final JsonpDeserializer<AllocationExplainRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AllocationExplainRequest::setupAllocationExplainRequestDeserializer
+    );
+
+    protected static void setupAllocationExplainRequestDeserializer(ObjectDeserializer<AllocationExplainRequest.Builder> op) {
+
+        op.add(Builder::currentNode, JsonpDeserializer.stringDeserializer(), "current_node");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::primary, JsonpDeserializer.booleanDeserializer(), "primary");
+        op.add(Builder::shard, JsonpDeserializer.integerDeserializer(), "shard");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cluster.allocation_explain}".
+     */
+    public static final Endpoint<AllocationExplainRequest, AllocationExplainResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            return "/_cluster/allocation/explain";
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.includeDiskInfo != null) {
+                params.put("include_disk_info", String.valueOf(request.includeDiskInfo));
+            }
+            if (request.includeYesDecisions != null) {
+                params.put("include_yes_decisions", String.valueOf(request.includeYesDecisions));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        AllocationExplainResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/AllocationExplainResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/AllocationExplainResponse.java
index 06baea126f..df4a1344d3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/AllocationExplainResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/AllocationExplainResponse.java
@@ -32,894 +32,894 @@
 
 package org.opensearch.client.opensearch.cluster;
 
-import org.opensearch.client.opensearch.cluster.allocation_explain.AllocationDecision;
-import org.opensearch.client.opensearch.cluster.allocation_explain.ClusterInfo;
-import org.opensearch.client.opensearch.cluster.allocation_explain.CurrentNode;
-import org.opensearch.client.opensearch.cluster.allocation_explain.Decision;
-import org.opensearch.client.opensearch.cluster.allocation_explain.NodeAllocationExplanation;
-import org.opensearch.client.opensearch.cluster.allocation_explain.UnassignedInformation;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.cluster.allocation_explain.AllocationDecision;
+import org.opensearch.client.opensearch.cluster.allocation_explain.ClusterInfo;
+import org.opensearch.client.opensearch.cluster.allocation_explain.CurrentNode;
+import org.opensearch.client.opensearch.cluster.allocation_explain.Decision;
+import org.opensearch.client.opensearch.cluster.allocation_explain.NodeAllocationExplanation;
+import org.opensearch.client.opensearch.cluster.allocation_explain.UnassignedInformation;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.allocation_explain.Response
 
 @JsonpDeserializable
 public class AllocationExplainResponse implements JsonpSerializable {
-	@Nullable
-	private final String allocateExplanation;
+    @Nullable
+    private final String allocateExplanation;
 
-	@Nullable
-	private final String allocationDelay;
+    @Nullable
+    private final String allocationDelay;
 
-	@Nullable
-	private final Long allocationDelayInMillis;
+    @Nullable
+    private final Long allocationDelayInMillis;
 
-	@Nullable
-	private final Decision canAllocate;
+    @Nullable
+    private final Decision canAllocate;
 
-	@Nullable
-	private final Decision canMoveToOtherNode;
+    @Nullable
+    private final Decision canMoveToOtherNode;
 
-	@Nullable
-	private final Decision canRebalanceCluster;
+    @Nullable
+    private final Decision canRebalanceCluster;
 
-	private final List<AllocationDecision> canRebalanceClusterDecisions;
+    private final List<AllocationDecision> canRebalanceClusterDecisions;
 
-	@Nullable
-	private final Decision canRebalanceToOtherNode;
+    @Nullable
+    private final Decision canRebalanceToOtherNode;
 
-	private final List<AllocationDecision> canRemainDecisions;
+    private final List<AllocationDecision> canRemainDecisions;
 
-	@Nullable
-	private final Decision canRemainOnCurrentNode;
+    @Nullable
+    private final Decision canRemainOnCurrentNode;
 
-	@Nullable
-	private final ClusterInfo clusterInfo;
+    @Nullable
+    private final ClusterInfo clusterInfo;
 
-	@Nullable
-	private final String configuredDelay;
+    @Nullable
+    private final String configuredDelay;
 
-	@Nullable
-	private final Long configuredDelayInMillis;
+    @Nullable
+    private final Long configuredDelayInMillis;
 
-	@Nullable
-	private final CurrentNode currentNode;
-
-	private final String currentState;
-
-	private final String index;
-
-	@Nullable
-	private final String moveExplanation;
-
-	private final List<NodeAllocationExplanation> nodeAllocationDecisions;
-
-	private final boolean primary;
-
-	@Nullable
-	private final String rebalanceExplanation;
-
-	@Nullable
-	private final String remainingDelay;
-
-	@Nullable
-	private final Long remainingDelayInMillis;
-
-	private final int shard;
-
-	@Nullable
-	private final UnassignedInformation unassignedInfo;
-
-	@Nullable
-	private final String note;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AllocationExplainResponse(Builder builder) {
-
-		this.allocateExplanation = builder.allocateExplanation;
-		this.allocationDelay = builder.allocationDelay;
-		this.allocationDelayInMillis = builder.allocationDelayInMillis;
-		this.canAllocate = builder.canAllocate;
-		this.canMoveToOtherNode = builder.canMoveToOtherNode;
-		this.canRebalanceCluster = builder.canRebalanceCluster;
-		this.canRebalanceClusterDecisions = ApiTypeHelper.unmodifiable(builder.canRebalanceClusterDecisions);
-		this.canRebalanceToOtherNode = builder.canRebalanceToOtherNode;
-		this.canRemainDecisions = ApiTypeHelper.unmodifiable(builder.canRemainDecisions);
-		this.canRemainOnCurrentNode = builder.canRemainOnCurrentNode;
-		this.clusterInfo = builder.clusterInfo;
-		this.configuredDelay = builder.configuredDelay;
-		this.configuredDelayInMillis = builder.configuredDelayInMillis;
-		this.currentNode = builder.currentNode;
-		this.currentState = ApiTypeHelper.requireNonNull(builder.currentState, this, "currentState");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.moveExplanation = builder.moveExplanation;
-		this.nodeAllocationDecisions = ApiTypeHelper.unmodifiable(builder.nodeAllocationDecisions);
-		this.primary = ApiTypeHelper.requireNonNull(builder.primary, this, "primary");
-		this.rebalanceExplanation = builder.rebalanceExplanation;
-		this.remainingDelay = builder.remainingDelay;
-		this.remainingDelayInMillis = builder.remainingDelayInMillis;
-		this.shard = ApiTypeHelper.requireNonNull(builder.shard, this, "shard");
-		this.unassignedInfo = builder.unassignedInfo;
-		this.note = builder.note;
-
-	}
-
-	public static AllocationExplainResponse of(Function<Builder, ObjectBuilder<AllocationExplainResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code allocate_explanation}
-	 */
-	@Nullable
-	public final String allocateExplanation() {
-		return this.allocateExplanation;
-	}
-
-	/**
-	 * API name: {@code allocation_delay}
-	 */
-	@Nullable
-	public final String allocationDelay() {
-		return this.allocationDelay;
-	}
-
-	/**
-	 * API name: {@code allocation_delay_in_millis}
-	 */
-	@Nullable
-	public final Long allocationDelayInMillis() {
-		return this.allocationDelayInMillis;
-	}
-
-	/**
-	 * API name: {@code can_allocate}
-	 */
-	@Nullable
-	public final Decision canAllocate() {
-		return this.canAllocate;
-	}
-
-	/**
-	 * API name: {@code can_move_to_other_node}
-	 */
-	@Nullable
-	public final Decision canMoveToOtherNode() {
-		return this.canMoveToOtherNode;
-	}
-
-	/**
-	 * API name: {@code can_rebalance_cluster}
-	 */
-	@Nullable
-	public final Decision canRebalanceCluster() {
-		return this.canRebalanceCluster;
-	}
-
-	/**
-	 * API name: {@code can_rebalance_cluster_decisions}
-	 */
-	public final List<AllocationDecision> canRebalanceClusterDecisions() {
-		return this.canRebalanceClusterDecisions;
-	}
-
-	/**
-	 * API name: {@code can_rebalance_to_other_node}
-	 */
-	@Nullable
-	public final Decision canRebalanceToOtherNode() {
-		return this.canRebalanceToOtherNode;
-	}
-
-	/**
-	 * API name: {@code can_remain_decisions}
-	 */
-	public final List<AllocationDecision> canRemainDecisions() {
-		return this.canRemainDecisions;
-	}
-
-	/**
-	 * API name: {@code can_remain_on_current_node}
-	 */
-	@Nullable
-	public final Decision canRemainOnCurrentNode() {
-		return this.canRemainOnCurrentNode;
-	}
-
-	/**
-	 * API name: {@code cluster_info}
-	 */
-	@Nullable
-	public final ClusterInfo clusterInfo() {
-		return this.clusterInfo;
-	}
-
-	/**
-	 * API name: {@code configured_delay}
-	 */
-	@Nullable
-	public final String configuredDelay() {
-		return this.configuredDelay;
-	}
-
-	/**
-	 * API name: {@code configured_delay_in_millis}
-	 */
-	@Nullable
-	public final Long configuredDelayInMillis() {
-		return this.configuredDelayInMillis;
-	}
-
-	/**
-	 * API name: {@code current_node}
-	 */
-	@Nullable
-	public final CurrentNode currentNode() {
-		return this.currentNode;
-	}
-
-	/**
-	 * Required - API name: {@code current_state}
-	 */
-	public final String currentState() {
-		return this.currentState;
-	}
-
-	/**
-	 * Required - API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code move_explanation}
-	 */
-	@Nullable
-	public final String moveExplanation() {
-		return this.moveExplanation;
-	}
-
-	/**
-	 * API name: {@code node_allocation_decisions}
-	 */
-	public final List<NodeAllocationExplanation> nodeAllocationDecisions() {
-		return this.nodeAllocationDecisions;
-	}
-
-	/**
-	 * Required - API name: {@code primary}
-	 */
-	public final boolean primary() {
-		return this.primary;
-	}
-
-	/**
-	 * API name: {@code rebalance_explanation}
-	 */
-	@Nullable
-	public final String rebalanceExplanation() {
-		return this.rebalanceExplanation;
-	}
-
-	/**
-	 * API name: {@code remaining_delay}
-	 */
-	@Nullable
-	public final String remainingDelay() {
-		return this.remainingDelay;
-	}
-
-	/**
-	 * API name: {@code remaining_delay_in_millis}
-	 */
-	@Nullable
-	public final Long remainingDelayInMillis() {
-		return this.remainingDelayInMillis;
-	}
-
-	/**
-	 * Required - API name: {@code shard}
-	 */
-	public final int shard() {
-		return this.shard;
-	}
-
-	/**
-	 * API name: {@code unassigned_info}
-	 */
-	@Nullable
-	public final UnassignedInformation unassignedInfo() {
-		return this.unassignedInfo;
-	}
-
-	/**
-	 * API name: {@code note}
-	 */
-	@Nullable
-	public final String note() {
-		return this.note;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.allocateExplanation != null) {
-			generator.writeKey("allocate_explanation");
-			generator.write(this.allocateExplanation);
-
-		}
-		if (this.allocationDelay != null) {
-			generator.writeKey("allocation_delay");
-			generator.write(this.allocationDelay);
-
-		}
-		if (this.allocationDelayInMillis != null) {
-			generator.writeKey("allocation_delay_in_millis");
-			generator.write(this.allocationDelayInMillis);
-
-		}
-		if (this.canAllocate != null) {
-			generator.writeKey("can_allocate");
-			this.canAllocate.serialize(generator, mapper);
-		}
-		if (this.canMoveToOtherNode != null) {
-			generator.writeKey("can_move_to_other_node");
-			this.canMoveToOtherNode.serialize(generator, mapper);
-		}
-		if (this.canRebalanceCluster != null) {
-			generator.writeKey("can_rebalance_cluster");
-			this.canRebalanceCluster.serialize(generator, mapper);
-		}
-		if (ApiTypeHelper.isDefined(this.canRebalanceClusterDecisions)) {
-			generator.writeKey("can_rebalance_cluster_decisions");
-			generator.writeStartArray();
-			for (AllocationDecision item0 : this.canRebalanceClusterDecisions) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.canRebalanceToOtherNode != null) {
-			generator.writeKey("can_rebalance_to_other_node");
-			this.canRebalanceToOtherNode.serialize(generator, mapper);
-		}
-		if (ApiTypeHelper.isDefined(this.canRemainDecisions)) {
-			generator.writeKey("can_remain_decisions");
-			generator.writeStartArray();
-			for (AllocationDecision item0 : this.canRemainDecisions) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.canRemainOnCurrentNode != null) {
-			generator.writeKey("can_remain_on_current_node");
-			this.canRemainOnCurrentNode.serialize(generator, mapper);
-		}
-		if (this.clusterInfo != null) {
-			generator.writeKey("cluster_info");
-			this.clusterInfo.serialize(generator, mapper);
-
-		}
-		if (this.configuredDelay != null) {
-			generator.writeKey("configured_delay");
-			generator.write(this.configuredDelay);
-
-		}
-		if (this.configuredDelayInMillis != null) {
-			generator.writeKey("configured_delay_in_millis");
-			generator.write(this.configuredDelayInMillis);
-
-		}
-		if (this.currentNode != null) {
-			generator.writeKey("current_node");
-			this.currentNode.serialize(generator, mapper);
-
-		}
-		generator.writeKey("current_state");
-		generator.write(this.currentState);
-
-		generator.writeKey("index");
-		generator.write(this.index);
-
-		if (this.moveExplanation != null) {
-			generator.writeKey("move_explanation");
-			generator.write(this.moveExplanation);
-
-		}
-		if (ApiTypeHelper.isDefined(this.nodeAllocationDecisions)) {
-			generator.writeKey("node_allocation_decisions");
-			generator.writeStartArray();
-			for (NodeAllocationExplanation item0 : this.nodeAllocationDecisions) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("primary");
-		generator.write(this.primary);
-
-		if (this.rebalanceExplanation != null) {
-			generator.writeKey("rebalance_explanation");
-			generator.write(this.rebalanceExplanation);
+    @Nullable
+    private final CurrentNode currentNode;
+
+    private final String currentState;
+
+    private final String index;
+
+    @Nullable
+    private final String moveExplanation;
+
+    private final List<NodeAllocationExplanation> nodeAllocationDecisions;
+
+    private final boolean primary;
+
+    @Nullable
+    private final String rebalanceExplanation;
+
+    @Nullable
+    private final String remainingDelay;
+
+    @Nullable
+    private final Long remainingDelayInMillis;
+
+    private final int shard;
+
+    @Nullable
+    private final UnassignedInformation unassignedInfo;
+
+    @Nullable
+    private final String note;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AllocationExplainResponse(Builder builder) {
+
+        this.allocateExplanation = builder.allocateExplanation;
+        this.allocationDelay = builder.allocationDelay;
+        this.allocationDelayInMillis = builder.allocationDelayInMillis;
+        this.canAllocate = builder.canAllocate;
+        this.canMoveToOtherNode = builder.canMoveToOtherNode;
+        this.canRebalanceCluster = builder.canRebalanceCluster;
+        this.canRebalanceClusterDecisions = ApiTypeHelper.unmodifiable(builder.canRebalanceClusterDecisions);
+        this.canRebalanceToOtherNode = builder.canRebalanceToOtherNode;
+        this.canRemainDecisions = ApiTypeHelper.unmodifiable(builder.canRemainDecisions);
+        this.canRemainOnCurrentNode = builder.canRemainOnCurrentNode;
+        this.clusterInfo = builder.clusterInfo;
+        this.configuredDelay = builder.configuredDelay;
+        this.configuredDelayInMillis = builder.configuredDelayInMillis;
+        this.currentNode = builder.currentNode;
+        this.currentState = ApiTypeHelper.requireNonNull(builder.currentState, this, "currentState");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.moveExplanation = builder.moveExplanation;
+        this.nodeAllocationDecisions = ApiTypeHelper.unmodifiable(builder.nodeAllocationDecisions);
+        this.primary = ApiTypeHelper.requireNonNull(builder.primary, this, "primary");
+        this.rebalanceExplanation = builder.rebalanceExplanation;
+        this.remainingDelay = builder.remainingDelay;
+        this.remainingDelayInMillis = builder.remainingDelayInMillis;
+        this.shard = ApiTypeHelper.requireNonNull(builder.shard, this, "shard");
+        this.unassignedInfo = builder.unassignedInfo;
+        this.note = builder.note;
+
+    }
+
+    public static AllocationExplainResponse of(Function<Builder, ObjectBuilder<AllocationExplainResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code allocate_explanation}
+     */
+    @Nullable
+    public final String allocateExplanation() {
+        return this.allocateExplanation;
+    }
+
+    /**
+     * API name: {@code allocation_delay}
+     */
+    @Nullable
+    public final String allocationDelay() {
+        return this.allocationDelay;
+    }
+
+    /**
+     * API name: {@code allocation_delay_in_millis}
+     */
+    @Nullable
+    public final Long allocationDelayInMillis() {
+        return this.allocationDelayInMillis;
+    }
+
+    /**
+     * API name: {@code can_allocate}
+     */
+    @Nullable
+    public final Decision canAllocate() {
+        return this.canAllocate;
+    }
+
+    /**
+     * API name: {@code can_move_to_other_node}
+     */
+    @Nullable
+    public final Decision canMoveToOtherNode() {
+        return this.canMoveToOtherNode;
+    }
+
+    /**
+     * API name: {@code can_rebalance_cluster}
+     */
+    @Nullable
+    public final Decision canRebalanceCluster() {
+        return this.canRebalanceCluster;
+    }
+
+    /**
+     * API name: {@code can_rebalance_cluster_decisions}
+     */
+    public final List<AllocationDecision> canRebalanceClusterDecisions() {
+        return this.canRebalanceClusterDecisions;
+    }
+
+    /**
+     * API name: {@code can_rebalance_to_other_node}
+     */
+    @Nullable
+    public final Decision canRebalanceToOtherNode() {
+        return this.canRebalanceToOtherNode;
+    }
+
+    /**
+     * API name: {@code can_remain_decisions}
+     */
+    public final List<AllocationDecision> canRemainDecisions() {
+        return this.canRemainDecisions;
+    }
+
+    /**
+     * API name: {@code can_remain_on_current_node}
+     */
+    @Nullable
+    public final Decision canRemainOnCurrentNode() {
+        return this.canRemainOnCurrentNode;
+    }
+
+    /**
+     * API name: {@code cluster_info}
+     */
+    @Nullable
+    public final ClusterInfo clusterInfo() {
+        return this.clusterInfo;
+    }
+
+    /**
+     * API name: {@code configured_delay}
+     */
+    @Nullable
+    public final String configuredDelay() {
+        return this.configuredDelay;
+    }
+
+    /**
+     * API name: {@code configured_delay_in_millis}
+     */
+    @Nullable
+    public final Long configuredDelayInMillis() {
+        return this.configuredDelayInMillis;
+    }
+
+    /**
+     * API name: {@code current_node}
+     */
+    @Nullable
+    public final CurrentNode currentNode() {
+        return this.currentNode;
+    }
+
+    /**
+     * Required - API name: {@code current_state}
+     */
+    public final String currentState() {
+        return this.currentState;
+    }
+
+    /**
+     * Required - API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code move_explanation}
+     */
+    @Nullable
+    public final String moveExplanation() {
+        return this.moveExplanation;
+    }
+
+    /**
+     * API name: {@code node_allocation_decisions}
+     */
+    public final List<NodeAllocationExplanation> nodeAllocationDecisions() {
+        return this.nodeAllocationDecisions;
+    }
+
+    /**
+     * Required - API name: {@code primary}
+     */
+    public final boolean primary() {
+        return this.primary;
+    }
+
+    /**
+     * API name: {@code rebalance_explanation}
+     */
+    @Nullable
+    public final String rebalanceExplanation() {
+        return this.rebalanceExplanation;
+    }
+
+    /**
+     * API name: {@code remaining_delay}
+     */
+    @Nullable
+    public final String remainingDelay() {
+        return this.remainingDelay;
+    }
+
+    /**
+     * API name: {@code remaining_delay_in_millis}
+     */
+    @Nullable
+    public final Long remainingDelayInMillis() {
+        return this.remainingDelayInMillis;
+    }
+
+    /**
+     * Required - API name: {@code shard}
+     */
+    public final int shard() {
+        return this.shard;
+    }
+
+    /**
+     * API name: {@code unassigned_info}
+     */
+    @Nullable
+    public final UnassignedInformation unassignedInfo() {
+        return this.unassignedInfo;
+    }
+
+    /**
+     * API name: {@code note}
+     */
+    @Nullable
+    public final String note() {
+        return this.note;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.allocateExplanation != null) {
+            generator.writeKey("allocate_explanation");
+            generator.write(this.allocateExplanation);
+
+        }
+        if (this.allocationDelay != null) {
+            generator.writeKey("allocation_delay");
+            generator.write(this.allocationDelay);
+
+        }
+        if (this.allocationDelayInMillis != null) {
+            generator.writeKey("allocation_delay_in_millis");
+            generator.write(this.allocationDelayInMillis);
+
+        }
+        if (this.canAllocate != null) {
+            generator.writeKey("can_allocate");
+            this.canAllocate.serialize(generator, mapper);
+        }
+        if (this.canMoveToOtherNode != null) {
+            generator.writeKey("can_move_to_other_node");
+            this.canMoveToOtherNode.serialize(generator, mapper);
+        }
+        if (this.canRebalanceCluster != null) {
+            generator.writeKey("can_rebalance_cluster");
+            this.canRebalanceCluster.serialize(generator, mapper);
+        }
+        if (ApiTypeHelper.isDefined(this.canRebalanceClusterDecisions)) {
+            generator.writeKey("can_rebalance_cluster_decisions");
+            generator.writeStartArray();
+            for (AllocationDecision item0 : this.canRebalanceClusterDecisions) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.canRebalanceToOtherNode != null) {
+            generator.writeKey("can_rebalance_to_other_node");
+            this.canRebalanceToOtherNode.serialize(generator, mapper);
+        }
+        if (ApiTypeHelper.isDefined(this.canRemainDecisions)) {
+            generator.writeKey("can_remain_decisions");
+            generator.writeStartArray();
+            for (AllocationDecision item0 : this.canRemainDecisions) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.canRemainOnCurrentNode != null) {
+            generator.writeKey("can_remain_on_current_node");
+            this.canRemainOnCurrentNode.serialize(generator, mapper);
+        }
+        if (this.clusterInfo != null) {
+            generator.writeKey("cluster_info");
+            this.clusterInfo.serialize(generator, mapper);
+
+        }
+        if (this.configuredDelay != null) {
+            generator.writeKey("configured_delay");
+            generator.write(this.configuredDelay);
+
+        }
+        if (this.configuredDelayInMillis != null) {
+            generator.writeKey("configured_delay_in_millis");
+            generator.write(this.configuredDelayInMillis);
+
+        }
+        if (this.currentNode != null) {
+            generator.writeKey("current_node");
+            this.currentNode.serialize(generator, mapper);
+
+        }
+        generator.writeKey("current_state");
+        generator.write(this.currentState);
+
+        generator.writeKey("index");
+        generator.write(this.index);
+
+        if (this.moveExplanation != null) {
+            generator.writeKey("move_explanation");
+            generator.write(this.moveExplanation);
+
+        }
+        if (ApiTypeHelper.isDefined(this.nodeAllocationDecisions)) {
+            generator.writeKey("node_allocation_decisions");
+            generator.writeStartArray();
+            for (NodeAllocationExplanation item0 : this.nodeAllocationDecisions) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("primary");
+        generator.write(this.primary);
+
+        if (this.rebalanceExplanation != null) {
+            generator.writeKey("rebalance_explanation");
+            generator.write(this.rebalanceExplanation);
 
-		}
-		if (this.remainingDelay != null) {
-			generator.writeKey("remaining_delay");
-			generator.write(this.remainingDelay);
+        }
+        if (this.remainingDelay != null) {
+            generator.writeKey("remaining_delay");
+            generator.write(this.remainingDelay);
 
-		}
-		if (this.remainingDelayInMillis != null) {
-			generator.writeKey("remaining_delay_in_millis");
-			generator.write(this.remainingDelayInMillis);
+        }
+        if (this.remainingDelayInMillis != null) {
+            generator.writeKey("remaining_delay_in_millis");
+            generator.write(this.remainingDelayInMillis);
 
-		}
-		generator.writeKey("shard");
-		generator.write(this.shard);
+        }
+        generator.writeKey("shard");
+        generator.write(this.shard);
 
-		if (this.unassignedInfo != null) {
-			generator.writeKey("unassigned_info");
-			this.unassignedInfo.serialize(generator, mapper);
+        if (this.unassignedInfo != null) {
+            generator.writeKey("unassigned_info");
+            this.unassignedInfo.serialize(generator, mapper);
 
-		}
-		if (this.note != null) {
-			generator.writeKey("note");
-			generator.write(this.note);
+        }
+        if (this.note != null) {
+            generator.writeKey("note");
+            generator.write(this.note);
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link AllocationExplainResponse}.
-	 */
+    /**
+     * Builder for {@link AllocationExplainResponse}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AllocationExplainResponse> {
-		@Nullable
-		private String allocateExplanation;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AllocationExplainResponse> {
+        @Nullable
+        private String allocateExplanation;
 
-		@Nullable
-		private String allocationDelay;
+        @Nullable
+        private String allocationDelay;
 
-		@Nullable
-		private Long allocationDelayInMillis;
+        @Nullable
+        private Long allocationDelayInMillis;
 
-		@Nullable
-		private Decision canAllocate;
+        @Nullable
+        private Decision canAllocate;
 
-		@Nullable
-		private Decision canMoveToOtherNode;
+        @Nullable
+        private Decision canMoveToOtherNode;
 
-		@Nullable
-		private Decision canRebalanceCluster;
+        @Nullable
+        private Decision canRebalanceCluster;
 
-		@Nullable
-		private List<AllocationDecision> canRebalanceClusterDecisions;
+        @Nullable
+        private List<AllocationDecision> canRebalanceClusterDecisions;
 
-		@Nullable
-		private Decision canRebalanceToOtherNode;
+        @Nullable
+        private Decision canRebalanceToOtherNode;
 
-		@Nullable
-		private List<AllocationDecision> canRemainDecisions;
+        @Nullable
+        private List<AllocationDecision> canRemainDecisions;
 
-		@Nullable
-		private Decision canRemainOnCurrentNode;
+        @Nullable
+        private Decision canRemainOnCurrentNode;
 
-		@Nullable
-		private ClusterInfo clusterInfo;
-
-		@Nullable
-		private String configuredDelay;
-
-		@Nullable
-		private Long configuredDelayInMillis;
-
-		@Nullable
-		private CurrentNode currentNode;
-
-		private String currentState;
-
-		private String index;
-
-		@Nullable
-		private String moveExplanation;
-
-		@Nullable
-		private List<NodeAllocationExplanation> nodeAllocationDecisions;
-
-		private Boolean primary;
-
-		@Nullable
-		private String rebalanceExplanation;
-
-		@Nullable
-		private String remainingDelay;
-
-		@Nullable
-		private Long remainingDelayInMillis;
-
-		private Integer shard;
-
-		@Nullable
-		private UnassignedInformation unassignedInfo;
-
-		@Nullable
-		private String note;
-
-		/**
-		 * API name: {@code allocate_explanation}
-		 */
-		public final Builder allocateExplanation(@Nullable String value) {
-			this.allocateExplanation = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code allocation_delay}
-		 */
-		public final Builder allocationDelay(@Nullable String value) {
-			this.allocationDelay = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code allocation_delay_in_millis}
-		 */
-		public final Builder allocationDelayInMillis(@Nullable Long value) {
-			this.allocationDelayInMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code can_allocate}
-		 */
-		public final Builder canAllocate(@Nullable Decision value) {
-			this.canAllocate = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code can_move_to_other_node}
-		 */
-		public final Builder canMoveToOtherNode(@Nullable Decision value) {
-			this.canMoveToOtherNode = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code can_rebalance_cluster}
-		 */
-		public final Builder canRebalanceCluster(@Nullable Decision value) {
-			this.canRebalanceCluster = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code can_rebalance_cluster_decisions}
-		 * <p>
-		 * Adds all elements of <code>list</code> to
-		 * <code>canRebalanceClusterDecisions</code>.
-		 */
-		public final Builder canRebalanceClusterDecisions(List<AllocationDecision> list) {
-			this.canRebalanceClusterDecisions = _listAddAll(this.canRebalanceClusterDecisions, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code can_rebalance_cluster_decisions}
-		 * <p>
-		 * Adds one or more values to <code>canRebalanceClusterDecisions</code>.
-		 */
-		public final Builder canRebalanceClusterDecisions(AllocationDecision value, AllocationDecision... values) {
-			this.canRebalanceClusterDecisions = _listAdd(this.canRebalanceClusterDecisions, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code can_rebalance_cluster_decisions}
-		 * <p>
-		 * Adds a value to <code>canRebalanceClusterDecisions</code> using a builder
-		 * lambda.
-		 */
-		public final Builder canRebalanceClusterDecisions(
-				Function<AllocationDecision.Builder, ObjectBuilder<AllocationDecision>> fn) {
-			return canRebalanceClusterDecisions(fn.apply(new AllocationDecision.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code can_rebalance_to_other_node}
-		 */
-		public final Builder canRebalanceToOtherNode(@Nullable Decision value) {
-			this.canRebalanceToOtherNode = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code can_remain_decisions}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>canRemainDecisions</code>.
-		 */
-		public final Builder canRemainDecisions(List<AllocationDecision> list) {
-			this.canRemainDecisions = _listAddAll(this.canRemainDecisions, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code can_remain_decisions}
-		 * <p>
-		 * Adds one or more values to <code>canRemainDecisions</code>.
-		 */
-		public final Builder canRemainDecisions(AllocationDecision value, AllocationDecision... values) {
-			this.canRemainDecisions = _listAdd(this.canRemainDecisions, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code can_remain_decisions}
-		 * <p>
-		 * Adds a value to <code>canRemainDecisions</code> using a builder lambda.
-		 */
-		public final Builder canRemainDecisions(
-				Function<AllocationDecision.Builder, ObjectBuilder<AllocationDecision>> fn) {
-			return canRemainDecisions(fn.apply(new AllocationDecision.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code can_remain_on_current_node}
-		 */
-		public final Builder canRemainOnCurrentNode(@Nullable Decision value) {
-			this.canRemainOnCurrentNode = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code cluster_info}
-		 */
-		public final Builder clusterInfo(@Nullable ClusterInfo value) {
-			this.clusterInfo = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code cluster_info}
-		 */
-		public final Builder clusterInfo(Function<ClusterInfo.Builder, ObjectBuilder<ClusterInfo>> fn) {
-			return this.clusterInfo(fn.apply(new ClusterInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code configured_delay}
-		 */
-		public final Builder configuredDelay(@Nullable String value) {
-			this.configuredDelay = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code configured_delay_in_millis}
-		 */
-		public final Builder configuredDelayInMillis(@Nullable Long value) {
-			this.configuredDelayInMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code current_node}
-		 */
-		public final Builder currentNode(@Nullable CurrentNode value) {
-			this.currentNode = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code current_node}
-		 */
-		public final Builder currentNode(Function<CurrentNode.Builder, ObjectBuilder<CurrentNode>> fn) {
-			return this.currentNode(fn.apply(new CurrentNode.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code current_state}
-		 */
-		public final Builder currentState(String value) {
-			this.currentState = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code move_explanation}
-		 */
-		public final Builder moveExplanation(@Nullable String value) {
-			this.moveExplanation = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code node_allocation_decisions}
-		 * <p>
-		 * Adds all elements of <code>list</code> to
-		 * <code>nodeAllocationDecisions</code>.
-		 */
-		public final Builder nodeAllocationDecisions(List<NodeAllocationExplanation> list) {
-			this.nodeAllocationDecisions = _listAddAll(this.nodeAllocationDecisions, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code node_allocation_decisions}
-		 * <p>
-		 * Adds one or more values to <code>nodeAllocationDecisions</code>.
-		 */
-		public final Builder nodeAllocationDecisions(NodeAllocationExplanation value,
-				NodeAllocationExplanation... values) {
-			this.nodeAllocationDecisions = _listAdd(this.nodeAllocationDecisions, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code node_allocation_decisions}
-		 * <p>
-		 * Adds a value to <code>nodeAllocationDecisions</code> using a builder lambda.
-		 */
-		public final Builder nodeAllocationDecisions(
-				Function<NodeAllocationExplanation.Builder, ObjectBuilder<NodeAllocationExplanation>> fn) {
-			return nodeAllocationDecisions(fn.apply(new NodeAllocationExplanation.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code primary}
-		 */
-		public final Builder primary(boolean value) {
-			this.primary = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code rebalance_explanation}
-		 */
-		public final Builder rebalanceExplanation(@Nullable String value) {
-			this.rebalanceExplanation = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code remaining_delay}
-		 */
-		public final Builder remainingDelay(@Nullable String value) {
-			this.remainingDelay = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code remaining_delay_in_millis}
-		 */
-		public final Builder remainingDelayInMillis(@Nullable Long value) {
-			this.remainingDelayInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shard}
-		 */
-		public final Builder shard(int value) {
-			this.shard = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code unassigned_info}
-		 */
-		public final Builder unassignedInfo(@Nullable UnassignedInformation value) {
-			this.unassignedInfo = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code unassigned_info}
-		 */
-		public final Builder unassignedInfo(
-				Function<UnassignedInformation.Builder, ObjectBuilder<UnassignedInformation>> fn) {
-			return this.unassignedInfo(fn.apply(new UnassignedInformation.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code note}
-		 */
-		public final Builder note(@Nullable String value) {
-			this.note = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AllocationExplainResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AllocationExplainResponse build() {
-			_checkSingleUse();
-
-			return new AllocationExplainResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AllocationExplainResponse}
-	 */
-	public static final JsonpDeserializer<AllocationExplainResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, AllocationExplainResponse::setupAllocationExplainResponseDeserializer);
-
-	protected static void setupAllocationExplainResponseDeserializer(
-			ObjectDeserializer<AllocationExplainResponse.Builder> op) {
-
-		op.add(Builder::allocateExplanation, JsonpDeserializer.stringDeserializer(), "allocate_explanation");
-		op.add(Builder::allocationDelay, JsonpDeserializer.stringDeserializer(), "allocation_delay");
-		op.add(Builder::allocationDelayInMillis, JsonpDeserializer.longDeserializer(), "allocation_delay_in_millis");
-		op.add(Builder::canAllocate, Decision._DESERIALIZER, "can_allocate");
-		op.add(Builder::canMoveToOtherNode, Decision._DESERIALIZER, "can_move_to_other_node");
-		op.add(Builder::canRebalanceCluster, Decision._DESERIALIZER, "can_rebalance_cluster");
-		op.add(Builder::canRebalanceClusterDecisions,
-				JsonpDeserializer.arrayDeserializer(AllocationDecision._DESERIALIZER),
-				"can_rebalance_cluster_decisions");
-		op.add(Builder::canRebalanceToOtherNode, Decision._DESERIALIZER, "can_rebalance_to_other_node");
-		op.add(Builder::canRemainDecisions, JsonpDeserializer.arrayDeserializer(AllocationDecision._DESERIALIZER),
-				"can_remain_decisions");
-		op.add(Builder::canRemainOnCurrentNode, Decision._DESERIALIZER, "can_remain_on_current_node");
-		op.add(Builder::clusterInfo, ClusterInfo._DESERIALIZER, "cluster_info");
-		op.add(Builder::configuredDelay, JsonpDeserializer.stringDeserializer(), "configured_delay");
-		op.add(Builder::configuredDelayInMillis, JsonpDeserializer.longDeserializer(), "configured_delay_in_millis");
-		op.add(Builder::currentNode, CurrentNode._DESERIALIZER, "current_node");
-		op.add(Builder::currentState, JsonpDeserializer.stringDeserializer(), "current_state");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::moveExplanation, JsonpDeserializer.stringDeserializer(), "move_explanation");
-		op.add(Builder::nodeAllocationDecisions,
-				JsonpDeserializer.arrayDeserializer(NodeAllocationExplanation._DESERIALIZER),
-				"node_allocation_decisions");
-		op.add(Builder::primary, JsonpDeserializer.booleanDeserializer(), "primary");
-		op.add(Builder::rebalanceExplanation, JsonpDeserializer.stringDeserializer(), "rebalance_explanation");
-		op.add(Builder::remainingDelay, JsonpDeserializer.stringDeserializer(), "remaining_delay");
-		op.add(Builder::remainingDelayInMillis, JsonpDeserializer.longDeserializer(), "remaining_delay_in_millis");
-		op.add(Builder::shard, JsonpDeserializer.integerDeserializer(), "shard");
-		op.add(Builder::unassignedInfo, UnassignedInformation._DESERIALIZER, "unassigned_info");
-		op.add(Builder::note, JsonpDeserializer.stringDeserializer(), "note");
-
-	}
+        @Nullable
+        private ClusterInfo clusterInfo;
+
+        @Nullable
+        private String configuredDelay;
+
+        @Nullable
+        private Long configuredDelayInMillis;
+
+        @Nullable
+        private CurrentNode currentNode;
+
+        private String currentState;
+
+        private String index;
+
+        @Nullable
+        private String moveExplanation;
+
+        @Nullable
+        private List<NodeAllocationExplanation> nodeAllocationDecisions;
+
+        private Boolean primary;
+
+        @Nullable
+        private String rebalanceExplanation;
+
+        @Nullable
+        private String remainingDelay;
+
+        @Nullable
+        private Long remainingDelayInMillis;
+
+        private Integer shard;
+
+        @Nullable
+        private UnassignedInformation unassignedInfo;
+
+        @Nullable
+        private String note;
+
+        /**
+         * API name: {@code allocate_explanation}
+         */
+        public final Builder allocateExplanation(@Nullable String value) {
+            this.allocateExplanation = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code allocation_delay}
+         */
+        public final Builder allocationDelay(@Nullable String value) {
+            this.allocationDelay = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code allocation_delay_in_millis}
+         */
+        public final Builder allocationDelayInMillis(@Nullable Long value) {
+            this.allocationDelayInMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code can_allocate}
+         */
+        public final Builder canAllocate(@Nullable Decision value) {
+            this.canAllocate = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code can_move_to_other_node}
+         */
+        public final Builder canMoveToOtherNode(@Nullable Decision value) {
+            this.canMoveToOtherNode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code can_rebalance_cluster}
+         */
+        public final Builder canRebalanceCluster(@Nullable Decision value) {
+            this.canRebalanceCluster = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code can_rebalance_cluster_decisions}
+         * <p>
+         * Adds all elements of <code>list</code> to
+         * <code>canRebalanceClusterDecisions</code>.
+         */
+        public final Builder canRebalanceClusterDecisions(List<AllocationDecision> list) {
+            this.canRebalanceClusterDecisions = _listAddAll(this.canRebalanceClusterDecisions, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code can_rebalance_cluster_decisions}
+         * <p>
+         * Adds one or more values to <code>canRebalanceClusterDecisions</code>.
+         */
+        public final Builder canRebalanceClusterDecisions(AllocationDecision value, AllocationDecision... values) {
+            this.canRebalanceClusterDecisions = _listAdd(this.canRebalanceClusterDecisions, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code can_rebalance_cluster_decisions}
+         * <p>
+         * Adds a value to <code>canRebalanceClusterDecisions</code> using a builder
+         * lambda.
+         */
+        public final Builder canRebalanceClusterDecisions(Function<AllocationDecision.Builder, ObjectBuilder<AllocationDecision>> fn) {
+            return canRebalanceClusterDecisions(fn.apply(new AllocationDecision.Builder()).build());
+        }
+
+        /**
+         * API name: {@code can_rebalance_to_other_node}
+         */
+        public final Builder canRebalanceToOtherNode(@Nullable Decision value) {
+            this.canRebalanceToOtherNode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code can_remain_decisions}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>canRemainDecisions</code>.
+         */
+        public final Builder canRemainDecisions(List<AllocationDecision> list) {
+            this.canRemainDecisions = _listAddAll(this.canRemainDecisions, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code can_remain_decisions}
+         * <p>
+         * Adds one or more values to <code>canRemainDecisions</code>.
+         */
+        public final Builder canRemainDecisions(AllocationDecision value, AllocationDecision... values) {
+            this.canRemainDecisions = _listAdd(this.canRemainDecisions, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code can_remain_decisions}
+         * <p>
+         * Adds a value to <code>canRemainDecisions</code> using a builder lambda.
+         */
+        public final Builder canRemainDecisions(Function<AllocationDecision.Builder, ObjectBuilder<AllocationDecision>> fn) {
+            return canRemainDecisions(fn.apply(new AllocationDecision.Builder()).build());
+        }
+
+        /**
+         * API name: {@code can_remain_on_current_node}
+         */
+        public final Builder canRemainOnCurrentNode(@Nullable Decision value) {
+            this.canRemainOnCurrentNode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code cluster_info}
+         */
+        public final Builder clusterInfo(@Nullable ClusterInfo value) {
+            this.clusterInfo = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code cluster_info}
+         */
+        public final Builder clusterInfo(Function<ClusterInfo.Builder, ObjectBuilder<ClusterInfo>> fn) {
+            return this.clusterInfo(fn.apply(new ClusterInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code configured_delay}
+         */
+        public final Builder configuredDelay(@Nullable String value) {
+            this.configuredDelay = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code configured_delay_in_millis}
+         */
+        public final Builder configuredDelayInMillis(@Nullable Long value) {
+            this.configuredDelayInMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code current_node}
+         */
+        public final Builder currentNode(@Nullable CurrentNode value) {
+            this.currentNode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code current_node}
+         */
+        public final Builder currentNode(Function<CurrentNode.Builder, ObjectBuilder<CurrentNode>> fn) {
+            return this.currentNode(fn.apply(new CurrentNode.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code current_state}
+         */
+        public final Builder currentState(String value) {
+            this.currentState = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code move_explanation}
+         */
+        public final Builder moveExplanation(@Nullable String value) {
+            this.moveExplanation = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code node_allocation_decisions}
+         * <p>
+         * Adds all elements of <code>list</code> to
+         * <code>nodeAllocationDecisions</code>.
+         */
+        public final Builder nodeAllocationDecisions(List<NodeAllocationExplanation> list) {
+            this.nodeAllocationDecisions = _listAddAll(this.nodeAllocationDecisions, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code node_allocation_decisions}
+         * <p>
+         * Adds one or more values to <code>nodeAllocationDecisions</code>.
+         */
+        public final Builder nodeAllocationDecisions(NodeAllocationExplanation value, NodeAllocationExplanation... values) {
+            this.nodeAllocationDecisions = _listAdd(this.nodeAllocationDecisions, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code node_allocation_decisions}
+         * <p>
+         * Adds a value to <code>nodeAllocationDecisions</code> using a builder lambda.
+         */
+        public final Builder nodeAllocationDecisions(
+            Function<NodeAllocationExplanation.Builder, ObjectBuilder<NodeAllocationExplanation>> fn
+        ) {
+            return nodeAllocationDecisions(fn.apply(new NodeAllocationExplanation.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code primary}
+         */
+        public final Builder primary(boolean value) {
+            this.primary = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code rebalance_explanation}
+         */
+        public final Builder rebalanceExplanation(@Nullable String value) {
+            this.rebalanceExplanation = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code remaining_delay}
+         */
+        public final Builder remainingDelay(@Nullable String value) {
+            this.remainingDelay = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code remaining_delay_in_millis}
+         */
+        public final Builder remainingDelayInMillis(@Nullable Long value) {
+            this.remainingDelayInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shard}
+         */
+        public final Builder shard(int value) {
+            this.shard = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code unassigned_info}
+         */
+        public final Builder unassignedInfo(@Nullable UnassignedInformation value) {
+            this.unassignedInfo = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code unassigned_info}
+         */
+        public final Builder unassignedInfo(Function<UnassignedInformation.Builder, ObjectBuilder<UnassignedInformation>> fn) {
+            return this.unassignedInfo(fn.apply(new UnassignedInformation.Builder()).build());
+        }
+
+        /**
+         * API name: {@code note}
+         */
+        public final Builder note(@Nullable String value) {
+            this.note = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link AllocationExplainResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AllocationExplainResponse build() {
+            _checkSingleUse();
+
+            return new AllocationExplainResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AllocationExplainResponse}
+     */
+    public static final JsonpDeserializer<AllocationExplainResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AllocationExplainResponse::setupAllocationExplainResponseDeserializer
+    );
+
+    protected static void setupAllocationExplainResponseDeserializer(ObjectDeserializer<AllocationExplainResponse.Builder> op) {
+
+        op.add(Builder::allocateExplanation, JsonpDeserializer.stringDeserializer(), "allocate_explanation");
+        op.add(Builder::allocationDelay, JsonpDeserializer.stringDeserializer(), "allocation_delay");
+        op.add(Builder::allocationDelayInMillis, JsonpDeserializer.longDeserializer(), "allocation_delay_in_millis");
+        op.add(Builder::canAllocate, Decision._DESERIALIZER, "can_allocate");
+        op.add(Builder::canMoveToOtherNode, Decision._DESERIALIZER, "can_move_to_other_node");
+        op.add(Builder::canRebalanceCluster, Decision._DESERIALIZER, "can_rebalance_cluster");
+        op.add(
+            Builder::canRebalanceClusterDecisions,
+            JsonpDeserializer.arrayDeserializer(AllocationDecision._DESERIALIZER),
+            "can_rebalance_cluster_decisions"
+        );
+        op.add(Builder::canRebalanceToOtherNode, Decision._DESERIALIZER, "can_rebalance_to_other_node");
+        op.add(Builder::canRemainDecisions, JsonpDeserializer.arrayDeserializer(AllocationDecision._DESERIALIZER), "can_remain_decisions");
+        op.add(Builder::canRemainOnCurrentNode, Decision._DESERIALIZER, "can_remain_on_current_node");
+        op.add(Builder::clusterInfo, ClusterInfo._DESERIALIZER, "cluster_info");
+        op.add(Builder::configuredDelay, JsonpDeserializer.stringDeserializer(), "configured_delay");
+        op.add(Builder::configuredDelayInMillis, JsonpDeserializer.longDeserializer(), "configured_delay_in_millis");
+        op.add(Builder::currentNode, CurrentNode._DESERIALIZER, "current_node");
+        op.add(Builder::currentState, JsonpDeserializer.stringDeserializer(), "current_state");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::moveExplanation, JsonpDeserializer.stringDeserializer(), "move_explanation");
+        op.add(
+            Builder::nodeAllocationDecisions,
+            JsonpDeserializer.arrayDeserializer(NodeAllocationExplanation._DESERIALIZER),
+            "node_allocation_decisions"
+        );
+        op.add(Builder::primary, JsonpDeserializer.booleanDeserializer(), "primary");
+        op.add(Builder::rebalanceExplanation, JsonpDeserializer.stringDeserializer(), "rebalance_explanation");
+        op.add(Builder::remainingDelay, JsonpDeserializer.stringDeserializer(), "remaining_delay");
+        op.add(Builder::remainingDelayInMillis, JsonpDeserializer.longDeserializer(), "remaining_delay_in_millis");
+        op.add(Builder::shard, JsonpDeserializer.integerDeserializer(), "shard");
+        op.add(Builder::unassignedInfo, UnassignedInformation._DESERIALIZER, "unassigned_info");
+        op.add(Builder::note, JsonpDeserializer.stringDeserializer(), "note");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ClusterStatsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ClusterStatsRequest.java
index 9103695d3f..b98a6451e5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ClusterStatsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ClusterStatsRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.cluster;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,13 +47,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: cluster.stats.Request
 
 /**
@@ -56,203 +55,205 @@
  */
 
 public class ClusterStatsRequest extends RequestBase {
-	@Nullable
-	private final Boolean flatSettings;
-
-	private final List<String> nodeId;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterStatsRequest(Builder builder) {
-
-		this.flatSettings = builder.flatSettings;
-		this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
-		this.timeout = builder.timeout;
-
-	}
-
-	public static ClusterStatsRequest of(Function<Builder, ObjectBuilder<ClusterStatsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Return settings in flat format (default: false)
-	 * <p>
-	 * API name: {@code flat_settings}
-	 */
-	@Nullable
-	public final Boolean flatSettings() {
-		return this.flatSettings;
-	}
-
-	/**
-	 * Comma-separated list of node filters used to limit returned information.
-	 * Defaults to all nodes in the cluster.
-	 * <p>
-	 * API name: {@code node_id}
-	 */
-	public final List<String> nodeId() {
-		return this.nodeId;
-	}
-
-	/**
-	 * Period to wait for each node to respond. If a node does not respond before
-	 * its timeout expires, the response does not include its stats. However, timed
-	 * out nodes are included in the response's _nodes.failed property. Defaults to
-	 * no timeout.
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterStatsRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterStatsRequest> {
-		@Nullable
-		private Boolean flatSettings;
-
-		@Nullable
-		private List<String> nodeId;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * Return settings in flat format (default: false)
-		 * <p>
-		 * API name: {@code flat_settings}
-		 */
-		public final Builder flatSettings(@Nullable Boolean value) {
-			this.flatSettings = value;
-			return this;
-		}
-
-		/**
-		 * Comma-separated list of node filters used to limit returned information.
-		 * Defaults to all nodes in the cluster.
-		 * <p>
-		 * API name: {@code node_id}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>nodeId</code>.
-		 */
-		public final Builder nodeId(List<String> list) {
-			this.nodeId = _listAddAll(this.nodeId, list);
-			return this;
-		}
-
-		/**
-		 * Comma-separated list of node filters used to limit returned information.
-		 * Defaults to all nodes in the cluster.
-		 * <p>
-		 * API name: {@code node_id}
-		 * <p>
-		 * Adds one or more values to <code>nodeId</code>.
-		 */
-		public final Builder nodeId(String value, String... values) {
-			this.nodeId = _listAdd(this.nodeId, value, values);
-			return this;
-		}
-
-		/**
-		 * Period to wait for each node to respond. If a node does not respond before
-		 * its timeout expires, the response does not include its stats. However, timed
-		 * out nodes are included in the response's _nodes.failed property. Defaults to
-		 * no timeout.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for each node to respond. If a node does not respond before
-		 * its timeout expires, the response does not include its stats. However, timed
-		 * out nodes are included in the response's _nodes.failed property. Defaults to
-		 * no timeout.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ClusterStatsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterStatsRequest build() {
-			_checkSingleUse();
-
-			return new ClusterStatsRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cluster.stats}".
-	 */
-	public static final Endpoint<ClusterStatsRequest, ClusterStatsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _nodeId = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.nodeId()))
-					propsSet |= _nodeId;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cluster");
-					buf.append("/stats");
-					return buf.toString();
-				}
-				if (propsSet == (_nodeId)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cluster");
-					buf.append("/stats");
-					buf.append("/nodes");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.flatSettings != null) {
-					params.put("flat_settings", String.valueOf(request.flatSettings));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, ClusterStatsResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean flatSettings;
+
+    private final List<String> nodeId;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterStatsRequest(Builder builder) {
+
+        this.flatSettings = builder.flatSettings;
+        this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
+        this.timeout = builder.timeout;
+
+    }
+
+    public static ClusterStatsRequest of(Function<Builder, ObjectBuilder<ClusterStatsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Return settings in flat format (default: false)
+     * <p>
+     * API name: {@code flat_settings}
+     */
+    @Nullable
+    public final Boolean flatSettings() {
+        return this.flatSettings;
+    }
+
+    /**
+     * Comma-separated list of node filters used to limit returned information.
+     * Defaults to all nodes in the cluster.
+     * <p>
+     * API name: {@code node_id}
+     */
+    public final List<String> nodeId() {
+        return this.nodeId;
+    }
+
+    /**
+     * Period to wait for each node to respond. If a node does not respond before
+     * its timeout expires, the response does not include its stats. However, timed
+     * out nodes are included in the response's _nodes.failed property. Defaults to
+     * no timeout.
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterStatsRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterStatsRequest> {
+        @Nullable
+        private Boolean flatSettings;
+
+        @Nullable
+        private List<String> nodeId;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * Return settings in flat format (default: false)
+         * <p>
+         * API name: {@code flat_settings}
+         */
+        public final Builder flatSettings(@Nullable Boolean value) {
+            this.flatSettings = value;
+            return this;
+        }
+
+        /**
+         * Comma-separated list of node filters used to limit returned information.
+         * Defaults to all nodes in the cluster.
+         * <p>
+         * API name: {@code node_id}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>nodeId</code>.
+         */
+        public final Builder nodeId(List<String> list) {
+            this.nodeId = _listAddAll(this.nodeId, list);
+            return this;
+        }
+
+        /**
+         * Comma-separated list of node filters used to limit returned information.
+         * Defaults to all nodes in the cluster.
+         * <p>
+         * API name: {@code node_id}
+         * <p>
+         * Adds one or more values to <code>nodeId</code>.
+         */
+        public final Builder nodeId(String value, String... values) {
+            this.nodeId = _listAdd(this.nodeId, value, values);
+            return this;
+        }
+
+        /**
+         * Period to wait for each node to respond. If a node does not respond before
+         * its timeout expires, the response does not include its stats. However, timed
+         * out nodes are included in the response's _nodes.failed property. Defaults to
+         * no timeout.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for each node to respond. If a node does not respond before
+         * its timeout expires, the response does not include its stats. However, timed
+         * out nodes are included in the response's _nodes.failed property. Defaults to
+         * no timeout.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ClusterStatsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterStatsRequest build() {
+            _checkSingleUse();
+
+            return new ClusterStatsRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cluster.stats}".
+     */
+    public static final Endpoint<ClusterStatsRequest, ClusterStatsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _nodeId = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.nodeId())) propsSet |= _nodeId;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cluster");
+                buf.append("/stats");
+                return buf.toString();
+            }
+            if (propsSet == (_nodeId)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cluster");
+                buf.append("/stats");
+                buf.append("/nodes");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.flatSettings != null) {
+                params.put("flat_settings", String.valueOf(request.flatSettings));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        ClusterStatsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ClusterStatsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ClusterStatsResponse.java
index d00048564f..1eda289d1d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ClusterStatsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ClusterStatsResponse.java
@@ -32,275 +32,274 @@
 
 package org.opensearch.client.opensearch.cluster;
 
-import org.opensearch.client.opensearch._types.HealthStatus;
-import org.opensearch.client.opensearch.cluster.stats.ClusterIndices;
-import org.opensearch.client.opensearch.cluster.stats.ClusterNodes;
-import org.opensearch.client.opensearch.nodes.NodesResponseBase;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.HealthStatus;
+import org.opensearch.client.opensearch.cluster.stats.ClusterIndices;
+import org.opensearch.client.opensearch.cluster.stats.ClusterNodes;
+import org.opensearch.client.opensearch.nodes.NodesResponseBase;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: cluster.stats.Response
 
 @JsonpDeserializable
 public class ClusterStatsResponse extends NodesResponseBase {
-	private final String clusterName;
-
-	private final String clusterUuid;
-
-	private final ClusterIndices indices;
-
-	private final ClusterNodes nodes;
-
-	private final HealthStatus status;
-
-	private final long timestamp;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterStatsResponse(Builder builder) {
-		super(builder);
-
-		this.clusterName = ApiTypeHelper.requireNonNull(builder.clusterName, this, "clusterName");
-		this.clusterUuid = ApiTypeHelper.requireNonNull(builder.clusterUuid, this, "clusterUuid");
-		this.indices = ApiTypeHelper.requireNonNull(builder.indices, this, "indices");
-		this.nodes = ApiTypeHelper.requireNonNull(builder.nodes, this, "nodes");
-		this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
-		this.timestamp = ApiTypeHelper.requireNonNull(builder.timestamp, this, "timestamp");
-
-	}
-
-	public static ClusterStatsResponse of(Function<Builder, ObjectBuilder<ClusterStatsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Name of the cluster, based on the Cluster name setting setting.
-	 * <p>
-	 * API name: {@code cluster_name}
-	 */
-	public final String clusterName() {
-		return this.clusterName;
-	}
-
-	/**
-	 * Required - Unique identifier for the cluster.
-	 * <p>
-	 * API name: {@code cluster_uuid}
-	 */
-	public final String clusterUuid() {
-		return this.clusterUuid;
-	}
-
-	/**
-	 * Required - Contains statistics about indices with shards assigned to selected
-	 * nodes.
-	 * <p>
-	 * API name: {@code indices}
-	 */
-	public final ClusterIndices indices() {
-		return this.indices;
-	}
-
-	/**
-	 * Required - Contains statistics about nodes selected by the request's node
-	 * filters.
-	 * <p>
-	 * API name: {@code nodes}
-	 */
-	public final ClusterNodes nodes() {
-		return this.nodes;
-	}
-
-	/**
-	 * Required - Health status of the cluster, based on the state of its primary
-	 * and replica shards.
-	 * <p>
-	 * API name: {@code status}
-	 */
-	public final HealthStatus status() {
-		return this.status;
-	}
-
-	/**
-	 * Required - Unix timestamp, in milliseconds, of the last time the cluster
-	 * statistics were refreshed.
-	 * <p>
-	 * API name: {@code timestamp}
-	 */
-	public final long timestamp() {
-		return this.timestamp;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("cluster_name");
-		generator.write(this.clusterName);
-
-		generator.writeKey("cluster_uuid");
-		generator.write(this.clusterUuid);
-
-		generator.writeKey("indices");
-		this.indices.serialize(generator, mapper);
-
-		generator.writeKey("nodes");
-		this.nodes.serialize(generator, mapper);
-
-		generator.writeKey("status");
-		this.status.serialize(generator, mapper);
-		generator.writeKey("timestamp");
-		generator.write(this.timestamp);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterStatsResponse}.
-	 */
-
-	public static class Builder extends NodesResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ClusterStatsResponse> {
-		private String clusterName;
-
-		private String clusterUuid;
-
-		private ClusterIndices indices;
-
-		private ClusterNodes nodes;
-
-		private HealthStatus status;
-
-		private Long timestamp;
-
-		/**
-		 * Required - Name of the cluster, based on the Cluster name setting setting.
-		 * <p>
-		 * API name: {@code cluster_name}
-		 */
-		public final Builder clusterName(String value) {
-			this.clusterName = value;
-			return this;
-		}
-
-		/**
-		 * Required - Unique identifier for the cluster.
-		 * <p>
-		 * API name: {@code cluster_uuid}
-		 */
-		public final Builder clusterUuid(String value) {
-			this.clusterUuid = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about indices with shards assigned to selected
-		 * nodes.
-		 * <p>
-		 * API name: {@code indices}
-		 */
-		public final Builder indices(ClusterIndices value) {
-			this.indices = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about indices with shards assigned to selected
-		 * nodes.
-		 * <p>
-		 * API name: {@code indices}
-		 */
-		public final Builder indices(Function<ClusterIndices.Builder, ObjectBuilder<ClusterIndices>> fn) {
-			return this.indices(fn.apply(new ClusterIndices.Builder()).build());
-		}
-
-		/**
-		 * Required - Contains statistics about nodes selected by the request's node
-		 * filters.
-		 * <p>
-		 * API name: {@code nodes}
-		 */
-		public final Builder nodes(ClusterNodes value) {
-			this.nodes = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about nodes selected by the request's node
-		 * filters.
-		 * <p>
-		 * API name: {@code nodes}
-		 */
-		public final Builder nodes(Function<ClusterNodes.Builder, ObjectBuilder<ClusterNodes>> fn) {
-			return this.nodes(fn.apply(new ClusterNodes.Builder()).build());
-		}
-
-		/**
-		 * Required - Health status of the cluster, based on the state of its primary
-		 * and replica shards.
-		 * <p>
-		 * API name: {@code status}
-		 */
-		public final Builder status(HealthStatus value) {
-			this.status = value;
-			return this;
-		}
-
-		/**
-		 * Required - Unix timestamp, in milliseconds, of the last time the cluster
-		 * statistics were refreshed.
-		 * <p>
-		 * API name: {@code timestamp}
-		 */
-		public final Builder timestamp(long value) {
-			this.timestamp = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ClusterStatsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterStatsResponse build() {
-			_checkSingleUse();
-
-			return new ClusterStatsResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterStatsResponse}
-	 */
-	public static final JsonpDeserializer<ClusterStatsResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClusterStatsResponse::setupClusterStatsResponseDeserializer);
-
-	protected static void setupClusterStatsResponseDeserializer(ObjectDeserializer<ClusterStatsResponse.Builder> op) {
-		NodesResponseBase.setupNodesResponseBaseDeserializer(op);
-		op.add(Builder::clusterName, JsonpDeserializer.stringDeserializer(), "cluster_name");
-		op.add(Builder::clusterUuid, JsonpDeserializer.stringDeserializer(), "cluster_uuid");
-		op.add(Builder::indices, ClusterIndices._DESERIALIZER, "indices");
-		op.add(Builder::nodes, ClusterNodes._DESERIALIZER, "nodes");
-		op.add(Builder::status, HealthStatus._DESERIALIZER, "status");
-		op.add(Builder::timestamp, JsonpDeserializer.longDeserializer(), "timestamp");
-
-	}
+    private final String clusterName;
+
+    private final String clusterUuid;
+
+    private final ClusterIndices indices;
+
+    private final ClusterNodes nodes;
+
+    private final HealthStatus status;
+
+    private final long timestamp;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterStatsResponse(Builder builder) {
+        super(builder);
+
+        this.clusterName = ApiTypeHelper.requireNonNull(builder.clusterName, this, "clusterName");
+        this.clusterUuid = ApiTypeHelper.requireNonNull(builder.clusterUuid, this, "clusterUuid");
+        this.indices = ApiTypeHelper.requireNonNull(builder.indices, this, "indices");
+        this.nodes = ApiTypeHelper.requireNonNull(builder.nodes, this, "nodes");
+        this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
+        this.timestamp = ApiTypeHelper.requireNonNull(builder.timestamp, this, "timestamp");
+
+    }
+
+    public static ClusterStatsResponse of(Function<Builder, ObjectBuilder<ClusterStatsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Name of the cluster, based on the Cluster name setting setting.
+     * <p>
+     * API name: {@code cluster_name}
+     */
+    public final String clusterName() {
+        return this.clusterName;
+    }
+
+    /**
+     * Required - Unique identifier for the cluster.
+     * <p>
+     * API name: {@code cluster_uuid}
+     */
+    public final String clusterUuid() {
+        return this.clusterUuid;
+    }
+
+    /**
+     * Required - Contains statistics about indices with shards assigned to selected
+     * nodes.
+     * <p>
+     * API name: {@code indices}
+     */
+    public final ClusterIndices indices() {
+        return this.indices;
+    }
+
+    /**
+     * Required - Contains statistics about nodes selected by the request's node
+     * filters.
+     * <p>
+     * API name: {@code nodes}
+     */
+    public final ClusterNodes nodes() {
+        return this.nodes;
+    }
+
+    /**
+     * Required - Health status of the cluster, based on the state of its primary
+     * and replica shards.
+     * <p>
+     * API name: {@code status}
+     */
+    public final HealthStatus status() {
+        return this.status;
+    }
+
+    /**
+     * Required - Unix timestamp, in milliseconds, of the last time the cluster
+     * statistics were refreshed.
+     * <p>
+     * API name: {@code timestamp}
+     */
+    public final long timestamp() {
+        return this.timestamp;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("cluster_name");
+        generator.write(this.clusterName);
+
+        generator.writeKey("cluster_uuid");
+        generator.write(this.clusterUuid);
+
+        generator.writeKey("indices");
+        this.indices.serialize(generator, mapper);
+
+        generator.writeKey("nodes");
+        this.nodes.serialize(generator, mapper);
+
+        generator.writeKey("status");
+        this.status.serialize(generator, mapper);
+        generator.writeKey("timestamp");
+        generator.write(this.timestamp);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterStatsResponse}.
+     */
+
+    public static class Builder extends NodesResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<ClusterStatsResponse> {
+        private String clusterName;
+
+        private String clusterUuid;
+
+        private ClusterIndices indices;
+
+        private ClusterNodes nodes;
+
+        private HealthStatus status;
+
+        private Long timestamp;
+
+        /**
+         * Required - Name of the cluster, based on the Cluster name setting setting.
+         * <p>
+         * API name: {@code cluster_name}
+         */
+        public final Builder clusterName(String value) {
+            this.clusterName = value;
+            return this;
+        }
+
+        /**
+         * Required - Unique identifier for the cluster.
+         * <p>
+         * API name: {@code cluster_uuid}
+         */
+        public final Builder clusterUuid(String value) {
+            this.clusterUuid = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about indices with shards assigned to selected
+         * nodes.
+         * <p>
+         * API name: {@code indices}
+         */
+        public final Builder indices(ClusterIndices value) {
+            this.indices = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about indices with shards assigned to selected
+         * nodes.
+         * <p>
+         * API name: {@code indices}
+         */
+        public final Builder indices(Function<ClusterIndices.Builder, ObjectBuilder<ClusterIndices>> fn) {
+            return this.indices(fn.apply(new ClusterIndices.Builder()).build());
+        }
+
+        /**
+         * Required - Contains statistics about nodes selected by the request's node
+         * filters.
+         * <p>
+         * API name: {@code nodes}
+         */
+        public final Builder nodes(ClusterNodes value) {
+            this.nodes = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about nodes selected by the request's node
+         * filters.
+         * <p>
+         * API name: {@code nodes}
+         */
+        public final Builder nodes(Function<ClusterNodes.Builder, ObjectBuilder<ClusterNodes>> fn) {
+            return this.nodes(fn.apply(new ClusterNodes.Builder()).build());
+        }
+
+        /**
+         * Required - Health status of the cluster, based on the state of its primary
+         * and replica shards.
+         * <p>
+         * API name: {@code status}
+         */
+        public final Builder status(HealthStatus value) {
+            this.status = value;
+            return this;
+        }
+
+        /**
+         * Required - Unix timestamp, in milliseconds, of the last time the cluster
+         * statistics were refreshed.
+         * <p>
+         * API name: {@code timestamp}
+         */
+        public final Builder timestamp(long value) {
+            this.timestamp = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ClusterStatsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterStatsResponse build() {
+            _checkSingleUse();
+
+            return new ClusterStatsResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterStatsResponse}
+     */
+    public static final JsonpDeserializer<ClusterStatsResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterStatsResponse::setupClusterStatsResponseDeserializer
+    );
+
+    protected static void setupClusterStatsResponseDeserializer(ObjectDeserializer<ClusterStatsResponse.Builder> op) {
+        NodesResponseBase.setupNodesResponseBaseDeserializer(op);
+        op.add(Builder::clusterName, JsonpDeserializer.stringDeserializer(), "cluster_name");
+        op.add(Builder::clusterUuid, JsonpDeserializer.stringDeserializer(), "cluster_uuid");
+        op.add(Builder::indices, ClusterIndices._DESERIALIZER, "indices");
+        op.add(Builder::nodes, ClusterNodes._DESERIALIZER, "nodes");
+        op.add(Builder::status, HealthStatus._DESERIALIZER, "status");
+        op.add(Builder::timestamp, JsonpDeserializer.longDeserializer(), "timestamp");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ComponentTemplate.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ComponentTemplate.java
index ec5ac496fc..aaaa2c43b8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ComponentTemplate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ComponentTemplate.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,125 +43,123 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster._types.ComponentTemplate
 
-
 @JsonpDeserializable
 public class ComponentTemplate implements JsonpSerializable {
-	private final String name;
-
-	private final ComponentTemplateNode componentTemplate;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ComponentTemplate(Builder builder) {
-
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.componentTemplate = ApiTypeHelper.requireNonNull(builder.componentTemplate, this, "componentTemplate");
-
-	}
-
-	public static ComponentTemplate of(Function<Builder, ObjectBuilder<ComponentTemplate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Required - API name: {@code component_template}
-	 */
-	public final ComponentTemplateNode componentTemplate() {
-		return this.componentTemplate;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		generator.writeKey("component_template");
-		this.componentTemplate.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ComponentTemplate}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ComponentTemplate> {
-		private String name;
-
-		private ComponentTemplateNode componentTemplate;
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code component_template}
-		 */
-		public final Builder componentTemplate(ComponentTemplateNode value) {
-			this.componentTemplate = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code component_template}
-		 */
-		public final Builder componentTemplate(
-				Function<ComponentTemplateNode.Builder, ObjectBuilder<ComponentTemplateNode>> fn) {
-			return this.componentTemplate(fn.apply(new ComponentTemplateNode.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ComponentTemplate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ComponentTemplate build() {
-			_checkSingleUse();
-
-			return new ComponentTemplate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ComponentTemplate}
-	 */
-	public static final JsonpDeserializer<ComponentTemplate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ComponentTemplate::setupComponentTemplateDeserializer);
-
-	protected static void setupComponentTemplateDeserializer(ObjectDeserializer<ComponentTemplate.Builder> op) {
-
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::componentTemplate, ComponentTemplateNode._DESERIALIZER, "component_template");
-
-	}
+    private final String name;
+
+    private final ComponentTemplateNode componentTemplate;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ComponentTemplate(Builder builder) {
+
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.componentTemplate = ApiTypeHelper.requireNonNull(builder.componentTemplate, this, "componentTemplate");
+
+    }
+
+    public static ComponentTemplate of(Function<Builder, ObjectBuilder<ComponentTemplate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Required - API name: {@code component_template}
+     */
+    public final ComponentTemplateNode componentTemplate() {
+        return this.componentTemplate;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        generator.writeKey("component_template");
+        this.componentTemplate.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ComponentTemplate}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ComponentTemplate> {
+        private String name;
+
+        private ComponentTemplateNode componentTemplate;
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code component_template}
+         */
+        public final Builder componentTemplate(ComponentTemplateNode value) {
+            this.componentTemplate = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code component_template}
+         */
+        public final Builder componentTemplate(Function<ComponentTemplateNode.Builder, ObjectBuilder<ComponentTemplateNode>> fn) {
+            return this.componentTemplate(fn.apply(new ComponentTemplateNode.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ComponentTemplate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ComponentTemplate build() {
+            _checkSingleUse();
+
+            return new ComponentTemplate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ComponentTemplate}
+     */
+    public static final JsonpDeserializer<ComponentTemplate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ComponentTemplate::setupComponentTemplateDeserializer
+    );
+
+    protected static void setupComponentTemplateDeserializer(ObjectDeserializer<ComponentTemplate.Builder> op) {
+
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::componentTemplate, ComponentTemplateNode._DESERIALIZER, "component_template");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ComponentTemplateNode.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ComponentTemplateNode.java
index e3164b2471..5f36b5ec6f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ComponentTemplateNode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ComponentTemplateNode.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.cluster;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,178 +46,174 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster._types.ComponentTemplateNode
 
-
 @JsonpDeserializable
 public class ComponentTemplateNode implements JsonpSerializable {
-	private final ComponentTemplateSummary template;
+    private final ComponentTemplateSummary template;
 
-	@Nullable
-	private final Long version;
-
-	private final Map<String, JsonData> meta;
+    @Nullable
+    private final Long version;
+
+    private final Map<String, JsonData> meta;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private ComponentTemplateNode(Builder builder) {
-
-		this.template = ApiTypeHelper.requireNonNull(builder.template, this, "template");
-		this.version = builder.version;
-		this.meta = ApiTypeHelper.unmodifiable(builder.meta);
-
-	}
-
-	public static ComponentTemplateNode of(Function<Builder, ObjectBuilder<ComponentTemplateNode>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code template}
-	 */
-	public final ComponentTemplateSummary template() {
-		return this.template;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * API name: {@code _meta}
-	 */
-	public final Map<String, JsonData> meta() {
-		return this.meta;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("template");
-		this.template.serialize(generator, mapper);
-
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		if (ApiTypeHelper.isDefined(this.meta)) {
-			generator.writeKey("_meta");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ComponentTemplateNode}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ComponentTemplateNode> {
-		private ComponentTemplateSummary template;
-
-		@Nullable
-		private Long version;
-
-		@Nullable
-		private Map<String, JsonData> meta;
-
-		/**
-		 * Required - API name: {@code template}
-		 */
-		public final Builder template(ComponentTemplateSummary value) {
-			this.template = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code template}
-		 */
-		public final Builder template(
-				Function<ComponentTemplateSummary.Builder, ObjectBuilder<ComponentTemplateSummary>> fn) {
-			return this.template(fn.apply(new ComponentTemplateSummary.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _meta}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>meta</code>.
-		 */
-		public final Builder meta(Map<String, JsonData> map) {
-			this.meta = _mapPutAll(this.meta, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code _meta}
-		 * <p>
-		 * Adds an entry to <code>meta</code>.
-		 */
-		public final Builder meta(String key, JsonData value) {
-			this.meta = _mapPut(this.meta, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ComponentTemplateNode}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ComponentTemplateNode build() {
-			_checkSingleUse();
-
-			return new ComponentTemplateNode(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ComponentTemplateNode}
-	 */
-	public static final JsonpDeserializer<ComponentTemplateNode> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ComponentTemplateNode::setupComponentTemplateNodeDeserializer);
-
-	protected static void setupComponentTemplateNodeDeserializer(ObjectDeserializer<ComponentTemplateNode.Builder> op) {
-
-		op.add(Builder::template, ComponentTemplateSummary._DESERIALIZER, "template");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
-		op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private ComponentTemplateNode(Builder builder) {
+
+        this.template = ApiTypeHelper.requireNonNull(builder.template, this, "template");
+        this.version = builder.version;
+        this.meta = ApiTypeHelper.unmodifiable(builder.meta);
+
+    }
+
+    public static ComponentTemplateNode of(Function<Builder, ObjectBuilder<ComponentTemplateNode>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code template}
+     */
+    public final ComponentTemplateSummary template() {
+        return this.template;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * API name: {@code _meta}
+     */
+    public final Map<String, JsonData> meta() {
+        return this.meta;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("template");
+        this.template.serialize(generator, mapper);
+
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        if (ApiTypeHelper.isDefined(this.meta)) {
+            generator.writeKey("_meta");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ComponentTemplateNode}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ComponentTemplateNode> {
+        private ComponentTemplateSummary template;
+
+        @Nullable
+        private Long version;
+
+        @Nullable
+        private Map<String, JsonData> meta;
+
+        /**
+         * Required - API name: {@code template}
+         */
+        public final Builder template(ComponentTemplateSummary value) {
+            this.template = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code template}
+         */
+        public final Builder template(Function<ComponentTemplateSummary.Builder, ObjectBuilder<ComponentTemplateSummary>> fn) {
+            return this.template(fn.apply(new ComponentTemplateSummary.Builder()).build());
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _meta}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>meta</code>.
+         */
+        public final Builder meta(Map<String, JsonData> map) {
+            this.meta = _mapPutAll(this.meta, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code _meta}
+         * <p>
+         * Adds an entry to <code>meta</code>.
+         */
+        public final Builder meta(String key, JsonData value) {
+            this.meta = _mapPut(this.meta, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link ComponentTemplateNode}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ComponentTemplateNode build() {
+            _checkSingleUse();
+
+            return new ComponentTemplateNode(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ComponentTemplateNode}
+     */
+    public static final JsonpDeserializer<ComponentTemplateNode> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ComponentTemplateNode::setupComponentTemplateNodeDeserializer
+    );
+
+    protected static void setupComponentTemplateNodeDeserializer(ObjectDeserializer<ComponentTemplateNode.Builder> op) {
+
+        op.add(Builder::template, ComponentTemplateSummary._DESERIALIZER, "template");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
+        op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ComponentTemplateSummary.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ComponentTemplateSummary.java
index a3e898f119..2fa218354c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ComponentTemplateSummary.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ComponentTemplateSummary.java
@@ -32,9 +32,10 @@
 
 package org.opensearch.client.opensearch.cluster;
 
-import org.opensearch.client.opensearch._types.mapping.TypeMapping;
-import org.opensearch.client.opensearch.indices.AliasDefinition;
-import org.opensearch.client.opensearch.indices.IndexSettings;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,294 +43,292 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.mapping.TypeMapping;
+import org.opensearch.client.opensearch.indices.AliasDefinition;
+import org.opensearch.client.opensearch.indices.IndexSettings;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster._types.ComponentTemplateSummary
 
-
 @JsonpDeserializable
 public class ComponentTemplateSummary implements JsonpSerializable {
-	private final Map<String, JsonData> meta;
-
-	@Nullable
-	private final Long version;
-
-	private final Map<String, IndexSettings> settings;
-
-	@Nullable
-	private final TypeMapping mappings;
-
-	private final Map<String, AliasDefinition> aliases;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ComponentTemplateSummary(Builder builder) {
-
-		this.meta = ApiTypeHelper.unmodifiable(builder.meta);
-		this.version = builder.version;
-		this.settings = ApiTypeHelper.unmodifiableRequired(builder.settings, this, "settings");
-		this.mappings = builder.mappings;
-		this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
-
-	}
-
-	public static ComponentTemplateSummary of(Function<Builder, ObjectBuilder<ComponentTemplateSummary>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code _meta}
-	 */
-	public final Map<String, JsonData> meta() {
-		return this.meta;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * Required - API name: {@code settings}
-	 */
-	public final Map<String, IndexSettings> settings() {
-		return this.settings;
-	}
-
-	/**
-	 * API name: {@code mappings}
-	 */
-	@Nullable
-	public final TypeMapping mappings() {
-		return this.mappings;
-	}
-
-	/**
-	 * API name: {@code aliases}
-	 */
-	public final Map<String, AliasDefinition> aliases() {
-		return this.aliases;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.meta)) {
-			generator.writeKey("_meta");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		if (ApiTypeHelper.isDefined(this.settings)) {
-			generator.writeKey("settings");
-			generator.writeStartObject();
-			for (Map.Entry<String, IndexSettings> item0 : this.settings.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.mappings != null) {
-			generator.writeKey("mappings");
-			this.mappings.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.aliases)) {
-			generator.writeKey("aliases");
-			generator.writeStartObject();
-			for (Map.Entry<String, AliasDefinition> item0 : this.aliases.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ComponentTemplateSummary}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ComponentTemplateSummary> {
-		@Nullable
-		private Map<String, JsonData> meta;
-
-		@Nullable
-		private Long version;
-
-		private Map<String, IndexSettings> settings;
-
-		@Nullable
-		private TypeMapping mappings;
-
-		@Nullable
-		private Map<String, AliasDefinition> aliases;
-
-		/**
-		 * API name: {@code _meta}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>meta</code>.
-		 */
-		public final Builder meta(Map<String, JsonData> map) {
-			this.meta = _mapPutAll(this.meta, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code _meta}
-		 * <p>
-		 * Adds an entry to <code>meta</code>.
-		 */
-		public final Builder meta(String key, JsonData value) {
-			this.meta = _mapPut(this.meta, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code settings}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>settings</code>.
-		 */
-		public final Builder settings(Map<String, IndexSettings> map) {
-			this.settings = _mapPutAll(this.settings, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code settings}
-		 * <p>
-		 * Adds an entry to <code>settings</code>.
-		 */
-		public final Builder settings(String key, IndexSettings value) {
-			this.settings = _mapPut(this.settings, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code settings}
-		 * <p>
-		 * Adds an entry to <code>settings</code> using a builder lambda.
-		 */
-		public final Builder settings(String key, Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
-			return settings(key, fn.apply(new IndexSettings.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code mappings}
-		 */
-		public final Builder mappings(@Nullable TypeMapping value) {
-			this.mappings = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mappings}
-		 */
-		public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
-			return this.mappings(fn.apply(new TypeMapping.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aliases</code>.
-		 */
-		public final Builder aliases(Map<String, AliasDefinition> map) {
-			this.aliases = _mapPutAll(this.aliases, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code>.
-		 */
-		public final Builder aliases(String key, AliasDefinition value) {
-			this.aliases = _mapPut(this.aliases, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code> using a builder lambda.
-		 */
-		public final Builder aliases(String key, Function<AliasDefinition.Builder, ObjectBuilder<AliasDefinition>> fn) {
-			return aliases(key, fn.apply(new AliasDefinition.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ComponentTemplateSummary}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ComponentTemplateSummary build() {
-			_checkSingleUse();
-
-			return new ComponentTemplateSummary(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ComponentTemplateSummary}
-	 */
-	public static final JsonpDeserializer<ComponentTemplateSummary> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ComponentTemplateSummary::setupComponentTemplateSummaryDeserializer);
-
-	protected static void setupComponentTemplateSummaryDeserializer(
-			ObjectDeserializer<ComponentTemplateSummary.Builder> op) {
-
-		op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
-		op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(IndexSettings._DESERIALIZER), "settings");
-		op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
-		op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(AliasDefinition._DESERIALIZER), "aliases");
-
-	}
+    private final Map<String, JsonData> meta;
+
+    @Nullable
+    private final Long version;
+
+    private final Map<String, IndexSettings> settings;
+
+    @Nullable
+    private final TypeMapping mappings;
+
+    private final Map<String, AliasDefinition> aliases;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ComponentTemplateSummary(Builder builder) {
+
+        this.meta = ApiTypeHelper.unmodifiable(builder.meta);
+        this.version = builder.version;
+        this.settings = ApiTypeHelper.unmodifiableRequired(builder.settings, this, "settings");
+        this.mappings = builder.mappings;
+        this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
+
+    }
+
+    public static ComponentTemplateSummary of(Function<Builder, ObjectBuilder<ComponentTemplateSummary>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code _meta}
+     */
+    public final Map<String, JsonData> meta() {
+        return this.meta;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * Required - API name: {@code settings}
+     */
+    public final Map<String, IndexSettings> settings() {
+        return this.settings;
+    }
+
+    /**
+     * API name: {@code mappings}
+     */
+    @Nullable
+    public final TypeMapping mappings() {
+        return this.mappings;
+    }
+
+    /**
+     * API name: {@code aliases}
+     */
+    public final Map<String, AliasDefinition> aliases() {
+        return this.aliases;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.meta)) {
+            generator.writeKey("_meta");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        if (ApiTypeHelper.isDefined(this.settings)) {
+            generator.writeKey("settings");
+            generator.writeStartObject();
+            for (Map.Entry<String, IndexSettings> item0 : this.settings.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.mappings != null) {
+            generator.writeKey("mappings");
+            this.mappings.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.aliases)) {
+            generator.writeKey("aliases");
+            generator.writeStartObject();
+            for (Map.Entry<String, AliasDefinition> item0 : this.aliases.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ComponentTemplateSummary}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ComponentTemplateSummary> {
+        @Nullable
+        private Map<String, JsonData> meta;
+
+        @Nullable
+        private Long version;
+
+        private Map<String, IndexSettings> settings;
+
+        @Nullable
+        private TypeMapping mappings;
+
+        @Nullable
+        private Map<String, AliasDefinition> aliases;
+
+        /**
+         * API name: {@code _meta}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>meta</code>.
+         */
+        public final Builder meta(Map<String, JsonData> map) {
+            this.meta = _mapPutAll(this.meta, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code _meta}
+         * <p>
+         * Adds an entry to <code>meta</code>.
+         */
+        public final Builder meta(String key, JsonData value) {
+            this.meta = _mapPut(this.meta, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code settings}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>settings</code>.
+         */
+        public final Builder settings(Map<String, IndexSettings> map) {
+            this.settings = _mapPutAll(this.settings, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code settings}
+         * <p>
+         * Adds an entry to <code>settings</code>.
+         */
+        public final Builder settings(String key, IndexSettings value) {
+            this.settings = _mapPut(this.settings, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code settings}
+         * <p>
+         * Adds an entry to <code>settings</code> using a builder lambda.
+         */
+        public final Builder settings(String key, Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
+            return settings(key, fn.apply(new IndexSettings.Builder()).build());
+        }
+
+        /**
+         * API name: {@code mappings}
+         */
+        public final Builder mappings(@Nullable TypeMapping value) {
+            this.mappings = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mappings}
+         */
+        public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
+            return this.mappings(fn.apply(new TypeMapping.Builder()).build());
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aliases</code>.
+         */
+        public final Builder aliases(Map<String, AliasDefinition> map) {
+            this.aliases = _mapPutAll(this.aliases, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code>.
+         */
+        public final Builder aliases(String key, AliasDefinition value) {
+            this.aliases = _mapPut(this.aliases, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code> using a builder lambda.
+         */
+        public final Builder aliases(String key, Function<AliasDefinition.Builder, ObjectBuilder<AliasDefinition>> fn) {
+            return aliases(key, fn.apply(new AliasDefinition.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ComponentTemplateSummary}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ComponentTemplateSummary build() {
+            _checkSingleUse();
+
+            return new ComponentTemplateSummary(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ComponentTemplateSummary}
+     */
+    public static final JsonpDeserializer<ComponentTemplateSummary> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ComponentTemplateSummary::setupComponentTemplateSummaryDeserializer
+    );
+
+    protected static void setupComponentTemplateSummaryDeserializer(ObjectDeserializer<ComponentTemplateSummary.Builder> op) {
+
+        op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
+        op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(IndexSettings._DESERIALIZER), "settings");
+        op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
+        op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(AliasDefinition._DESERIALIZER), "aliases");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/DeleteComponentTemplateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/DeleteComponentTemplateRequest.java
index 5a985bb95f..043dae54fc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/DeleteComponentTemplateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/DeleteComponentTemplateRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.cluster;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,234 +45,232 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: cluster.delete_component_template.Request
 
 /**
  * Deletes a component template
- * 
+ *
  */
 
 public class DeleteComponentTemplateRequest extends RequestBase {
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final String name;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteComponentTemplateRequest(Builder builder) {
-
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.timeout = builder.timeout;
-
-	}
-
-	public static DeleteComponentTemplateRequest of(
-			Function<Builder, ObjectBuilder<DeleteComponentTemplateRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Required - The name of the template
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteComponentTemplateRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteComponentTemplateRequest> {
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		private String name;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - The name of the template
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link DeleteComponentTemplateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteComponentTemplateRequest build() {
-			_checkSingleUse();
-
-			return new DeleteComponentTemplateRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cluster.delete_component_template}".
-	 */
-	public static final Endpoint<DeleteComponentTemplateRequest, DeleteComponentTemplateResponse, ErrorResponse>
-			_ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "DELETE";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _name;
-
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_component_template");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, DeleteComponentTemplateResponse._DESERIALIZER);
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final String name;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteComponentTemplateRequest(Builder builder) {
+
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.timeout = builder.timeout;
+
+    }
+
+    public static DeleteComponentTemplateRequest of(Function<Builder, ObjectBuilder<DeleteComponentTemplateRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Required - The name of the template
+     * <p>
+     * API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteComponentTemplateRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteComponentTemplateRequest> {
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        private String name;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - The name of the template
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link DeleteComponentTemplateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteComponentTemplateRequest build() {
+            _checkSingleUse();
+
+            return new DeleteComponentTemplateRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cluster.delete_component_template}".
+     */
+    public static final Endpoint<DeleteComponentTemplateRequest, DeleteComponentTemplateResponse, ErrorResponse> _ENDPOINT =
+        new SimpleEndpoint<>(
+
+            // Request method
+            request -> {
+                return "DELETE";
+
+            },
+
+            // Request path
+            request -> {
+                final int _name = 1 << 0;
+
+                int propsSet = 0;
+
+                propsSet |= _name;
+
+                if (propsSet == (_name)) {
+                    StringBuilder buf = new StringBuilder();
+                    buf.append("/_component_template");
+                    buf.append("/");
+                    SimpleEndpoint.pathEncode(request.name, buf);
+                    return buf.toString();
+                }
+                throw SimpleEndpoint.noPathTemplateFound("path");
+
+            },
+
+            // Request parameters
+            request -> {
+                Map<String, String> params = new HashMap<>();
+                if (request.masterTimeout != null) {
+                    params.put("master_timeout", request.masterTimeout._toJsonString());
+                }
+                if (request.clusterManagerTimeout != null) {
+                    params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+                }
+                if (request.timeout != null) {
+                    params.put("timeout", request.timeout._toJsonString());
+                }
+                return params;
+
+            },
+            SimpleEndpoint.emptyMap(),
+            false,
+            DeleteComponentTemplateResponse._DESERIALIZER
+        );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/DeleteComponentTemplateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/DeleteComponentTemplateResponse.java
index 29ea544e29..4b37536fbc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/DeleteComponentTemplateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/DeleteComponentTemplateResponse.java
@@ -32,70 +32,69 @@
 
 package org.opensearch.client.opensearch.cluster;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: cluster.delete_component_template.Response
 
 @JsonpDeserializable
 public class DeleteComponentTemplateResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteComponentTemplateResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static DeleteComponentTemplateResponse of(
-			Function<Builder, ObjectBuilder<DeleteComponentTemplateResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteComponentTemplateResponse}.
-	 */
-
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DeleteComponentTemplateResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DeleteComponentTemplateResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteComponentTemplateResponse build() {
-			_checkSingleUse();
-
-			return new DeleteComponentTemplateResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DeleteComponentTemplateResponse}
-	 */
-	public static final JsonpDeserializer<DeleteComponentTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DeleteComponentTemplateResponse::setupDeleteComponentTemplateResponseDeserializer);
-
-	protected static void setupDeleteComponentTemplateResponseDeserializer(
-			ObjectDeserializer<DeleteComponentTemplateResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteComponentTemplateResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static DeleteComponentTemplateResponse of(Function<Builder, ObjectBuilder<DeleteComponentTemplateResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteComponentTemplateResponse}.
+     */
+
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<DeleteComponentTemplateResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DeleteComponentTemplateResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteComponentTemplateResponse build() {
+            _checkSingleUse();
+
+            return new DeleteComponentTemplateResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DeleteComponentTemplateResponse}
+     */
+    public static final JsonpDeserializer<DeleteComponentTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DeleteComponentTemplateResponse::setupDeleteComponentTemplateResponseDeserializer
+    );
+
+    protected static void setupDeleteComponentTemplateResponseDeserializer(ObjectDeserializer<DeleteComponentTemplateResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/DeleteVotingConfigExclusionsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/DeleteVotingConfigExclusionsRequest.java
index 5145aa7ff2..fcf952f4bf 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/DeleteVotingConfigExclusionsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/DeleteVotingConfigExclusionsRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.cluster;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -41,117 +45,113 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: cluster.delete_voting_config_exclusions.Request
 
 /**
  * Clears cluster voting config exclusions.
- * 
+ *
  */
 
 public class DeleteVotingConfigExclusionsRequest extends RequestBase {
-	@Nullable
-	private final Boolean waitForRemoval;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteVotingConfigExclusionsRequest(Builder builder) {
-
-		this.waitForRemoval = builder.waitForRemoval;
-
-	}
-
-	public static DeleteVotingConfigExclusionsRequest of(
-			Function<Builder, ObjectBuilder<DeleteVotingConfigExclusionsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Specifies whether to wait for all excluded nodes to be removed from the
-	 * cluster before clearing the voting configuration exclusions list. Defaults to
-	 * true, meaning that all excluded nodes must be removed from the cluster before
-	 * this API takes any action. If set to false then the voting configuration
-	 * exclusions list is cleared even if some excluded nodes are still in the
-	 * cluster.
-	 * <p>
-	 * API name: {@code wait_for_removal}
-	 */
-	@Nullable
-	public final Boolean waitForRemoval() {
-		return this.waitForRemoval;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteVotingConfigExclusionsRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase
-			implements
-				ObjectBuilder<DeleteVotingConfigExclusionsRequest> {
-		@Nullable
-		private Boolean waitForRemoval;
-
-		/**
-		 * Specifies whether to wait for all excluded nodes to be removed from the
-		 * cluster before clearing the voting configuration exclusions list. Defaults to
-		 * true, meaning that all excluded nodes must be removed from the cluster before
-		 * this API takes any action. If set to false then the voting configuration
-		 * exclusions list is cleared even if some excluded nodes are still in the
-		 * cluster.
-		 * <p>
-		 * API name: {@code wait_for_removal}
-		 */
-		public final Builder waitForRemoval(@Nullable Boolean value) {
-			this.waitForRemoval = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DeleteVotingConfigExclusionsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteVotingConfigExclusionsRequest build() {
-			_checkSingleUse();
-
-			return new DeleteVotingConfigExclusionsRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cluster.delete_voting_config_exclusions}".
-	 */
-	public static final Endpoint<DeleteVotingConfigExclusionsRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
-			"opensearch/cluster.delete_voting_config_exclusions",
-
-			// Request method
-			request -> {
-				return "DELETE";
-
-			},
-
-			// Request path
-			request -> {
-				return "/_cluster/voting_config_exclusions";
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.waitForRemoval != null) {
-					params.put("wait_for_removal", String.valueOf(request.waitForRemoval));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, null);
+    @Nullable
+    private final Boolean waitForRemoval;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteVotingConfigExclusionsRequest(Builder builder) {
+
+        this.waitForRemoval = builder.waitForRemoval;
+
+    }
+
+    public static DeleteVotingConfigExclusionsRequest of(Function<Builder, ObjectBuilder<DeleteVotingConfigExclusionsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Specifies whether to wait for all excluded nodes to be removed from the
+     * cluster before clearing the voting configuration exclusions list. Defaults to
+     * true, meaning that all excluded nodes must be removed from the cluster before
+     * this API takes any action. If set to false then the voting configuration
+     * exclusions list is cleared even if some excluded nodes are still in the
+     * cluster.
+     * <p>
+     * API name: {@code wait_for_removal}
+     */
+    @Nullable
+    public final Boolean waitForRemoval() {
+        return this.waitForRemoval;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteVotingConfigExclusionsRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteVotingConfigExclusionsRequest> {
+        @Nullable
+        private Boolean waitForRemoval;
+
+        /**
+         * Specifies whether to wait for all excluded nodes to be removed from the
+         * cluster before clearing the voting configuration exclusions list. Defaults to
+         * true, meaning that all excluded nodes must be removed from the cluster before
+         * this API takes any action. If set to false then the voting configuration
+         * exclusions list is cleared even if some excluded nodes are still in the
+         * cluster.
+         * <p>
+         * API name: {@code wait_for_removal}
+         */
+        public final Builder waitForRemoval(@Nullable Boolean value) {
+            this.waitForRemoval = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link DeleteVotingConfigExclusionsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteVotingConfigExclusionsRequest build() {
+            _checkSingleUse();
+
+            return new DeleteVotingConfigExclusionsRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cluster.delete_voting_config_exclusions}".
+     */
+    public static final Endpoint<DeleteVotingConfigExclusionsRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
+        "opensearch/cluster.delete_voting_config_exclusions",
+
+        // Request method
+        request -> {
+            return "DELETE";
+
+        },
+
+        // Request path
+        request -> {
+            return "/_cluster/voting_config_exclusions";
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.waitForRemoval != null) {
+                params.put("wait_for_removal", String.valueOf(request.waitForRemoval));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        null
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/DeleteVotingConfigExclusionsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/DeleteVotingConfigExclusionsResponse.java
index 6b63f4d14d..92e0f78d12 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/DeleteVotingConfigExclusionsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/DeleteVotingConfigExclusionsResponse.java
@@ -36,17 +36,16 @@
 
 // typedef: cluster.delete_voting_config_exclusions.Response
 
-
 public class DeleteVotingConfigExclusionsResponse {
-	public DeleteVotingConfigExclusionsResponse() {
-	}
+    public DeleteVotingConfigExclusionsResponse() {}
 
-	/**
-	 * Singleton instance for {@link DeleteVotingConfigExclusionsResponse}.
-	 */
-	public static final DeleteVotingConfigExclusionsResponse _INSTANCE = new DeleteVotingConfigExclusionsResponse();
+    /**
+     * Singleton instance for {@link DeleteVotingConfigExclusionsResponse}.
+     */
+    public static final DeleteVotingConfigExclusionsResponse _INSTANCE = new DeleteVotingConfigExclusionsResponse();
 
-	public static final JsonpDeserializer<DeleteVotingConfigExclusionsResponse> _DESERIALIZER = JsonpDeserializer
-			.fixedValue(DeleteVotingConfigExclusionsResponse._INSTANCE);
+    public static final JsonpDeserializer<DeleteVotingConfigExclusionsResponse> _DESERIALIZER = JsonpDeserializer.fixedValue(
+        DeleteVotingConfigExclusionsResponse._INSTANCE
+    );
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ExistsComponentTemplateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ExistsComponentTemplateRequest.java
index 178312a7e1..ba84b76951 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ExistsComponentTemplateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ExistsComponentTemplateRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.cluster;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -43,252 +49,248 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: cluster.exists_component_template.Request
 
 /**
  * Returns information about whether a particular component template exist
- * 
+ *
  */
 
 public class ExistsComponentTemplateRequest extends RequestBase {
-	@Nullable
-	private final Boolean local;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final List<String> name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ExistsComponentTemplateRequest(Builder builder) {
-
-		this.local = builder.local;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = ApiTypeHelper.unmodifiableRequired(builder.name, this, "name");
-
-	}
-
-	public static ExistsComponentTemplateRequest of(
-			Function<Builder, ObjectBuilder<ExistsComponentTemplateRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * If true, the request retrieves information from the local node only. Defaults
-	 * to false, which means information is retrieved from the cluster-manager node.
-	 * <p>
-	 * API name: {@code local}
-	 */
-	@Nullable
-	public final Boolean local() {
-		return this.local;
-	}
-
-	/**
-	 * Period to wait for a connection to the master node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Period to wait for a connection to the cluster-manager node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Required - Comma-separated list of component template names used to limit the
-	 * request. Wildcard (*) expressions are supported.
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final List<String> name() {
-		return this.name;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ExistsComponentTemplateRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExistsComponentTemplateRequest> {
-		@Nullable
-		private Boolean local;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		private List<String> name;
-
-		/**
-		 * If true, the request retrieves information from the local node only. Defaults
-		 * to false, which means information is retrieved from the cluster-manager node.
-		 * <p>
-		 * API name: {@code local}
-		 */
-		public final Builder local(@Nullable Boolean value) {
-			this.local = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - Comma-separated list of component template names used to limit the
-		 * request. Wildcard (*) expressions are supported.
-		 * <p>
-		 * API name: {@code name}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>name</code>.
-		 */
-		public final Builder name(List<String> list) {
-			this.name = _listAddAll(this.name, list);
-			return this;
-		}
-
-		/**
-		 * Required - Comma-separated list of component template names used to limit the
-		 * request. Wildcard (*) expressions are supported.
-		 * <p>
-		 * API name: {@code name}
-		 * <p>
-		 * Adds one or more values to <code>name</code>.
-		 */
-		public final Builder name(String value, String... values) {
-			this.name = _listAdd(this.name, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ExistsComponentTemplateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ExistsComponentTemplateRequest build() {
-			_checkSingleUse();
-
-			return new ExistsComponentTemplateRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cluster.exists_component_template}".
-	 */
-	public static final Endpoint<ExistsComponentTemplateRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
-			"opensearch/cluster.exists_component_template",
-
-			// Request method
-			request -> {
-				return "HEAD";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _name;
-
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_component_template");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.local != null) {
-					params.put("local", String.valueOf(request.local));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, null);
+    @Nullable
+    private final Boolean local;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final List<String> name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ExistsComponentTemplateRequest(Builder builder) {
+
+        this.local = builder.local;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = ApiTypeHelper.unmodifiableRequired(builder.name, this, "name");
+
+    }
+
+    public static ExistsComponentTemplateRequest of(Function<Builder, ObjectBuilder<ExistsComponentTemplateRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * If true, the request retrieves information from the local node only. Defaults
+     * to false, which means information is retrieved from the cluster-manager node.
+     * <p>
+     * API name: {@code local}
+     */
+    @Nullable
+    public final Boolean local() {
+        return this.local;
+    }
+
+    /**
+     * Period to wait for a connection to the master node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Period to wait for a connection to the cluster-manager node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Required - Comma-separated list of component template names used to limit the
+     * request. Wildcard (*) expressions are supported.
+     * <p>
+     * API name: {@code name}
+     */
+    public final List<String> name() {
+        return this.name;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ExistsComponentTemplateRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExistsComponentTemplateRequest> {
+        @Nullable
+        private Boolean local;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        private List<String> name;
+
+        /**
+         * If true, the request retrieves information from the local node only. Defaults
+         * to false, which means information is retrieved from the cluster-manager node.
+         * <p>
+         * API name: {@code local}
+         */
+        public final Builder local(@Nullable Boolean value) {
+            this.local = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - Comma-separated list of component template names used to limit the
+         * request. Wildcard (*) expressions are supported.
+         * <p>
+         * API name: {@code name}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>name</code>.
+         */
+        public final Builder name(List<String> list) {
+            this.name = _listAddAll(this.name, list);
+            return this;
+        }
+
+        /**
+         * Required - Comma-separated list of component template names used to limit the
+         * request. Wildcard (*) expressions are supported.
+         * <p>
+         * API name: {@code name}
+         * <p>
+         * Adds one or more values to <code>name</code>.
+         */
+        public final Builder name(String value, String... values) {
+            this.name = _listAdd(this.name, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link ExistsComponentTemplateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ExistsComponentTemplateRequest build() {
+            _checkSingleUse();
+
+            return new ExistsComponentTemplateRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cluster.exists_component_template}".
+     */
+    public static final Endpoint<ExistsComponentTemplateRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
+        "opensearch/cluster.exists_component_template",
+
+        // Request method
+        request -> {
+            return "HEAD";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _name;
+
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_component_template");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.local != null) {
+                params.put("local", String.valueOf(request.local));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        null
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ExistsComponentTemplateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ExistsComponentTemplateResponse.java
index d52c988ecc..e32828dbba 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ExistsComponentTemplateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/ExistsComponentTemplateResponse.java
@@ -36,17 +36,16 @@
 
 // typedef: cluster.exists_component_template.Response
 
-
 public class ExistsComponentTemplateResponse {
-	public ExistsComponentTemplateResponse() {
-	}
+    public ExistsComponentTemplateResponse() {}
 
-	/**
-	 * Singleton instance for {@link ExistsComponentTemplateResponse}.
-	 */
-	public static final ExistsComponentTemplateResponse _INSTANCE = new ExistsComponentTemplateResponse();
+    /**
+     * Singleton instance for {@link ExistsComponentTemplateResponse}.
+     */
+    public static final ExistsComponentTemplateResponse _INSTANCE = new ExistsComponentTemplateResponse();
 
-	public static final JsonpDeserializer<ExistsComponentTemplateResponse> _DESERIALIZER = JsonpDeserializer
-			.fixedValue(ExistsComponentTemplateResponse._INSTANCE);
+    public static final JsonpDeserializer<ExistsComponentTemplateResponse> _DESERIALIZER = JsonpDeserializer.fixedValue(
+        ExistsComponentTemplateResponse._INSTANCE
+    );
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/GetClusterSettingsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/GetClusterSettingsRequest.java
index 08496402ff..af3bd90d05 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/GetClusterSettingsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/GetClusterSettingsRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.cluster;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -40,255 +44,254 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: cluster.get_settings.Request
 
 /**
  * Returns cluster settings.
- * 
+ *
  */
 
 public class GetClusterSettingsRequest extends RequestBase {
-	@Nullable
-	private final Boolean flatSettings;
-
-	@Nullable
-	private final Boolean includeDefaults;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetClusterSettingsRequest(Builder builder) {
-
-		this.flatSettings = builder.flatSettings;
-		this.includeDefaults = builder.includeDefaults;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.timeout = builder.timeout;
-
-	}
-
-	public static GetClusterSettingsRequest of(Function<Builder, ObjectBuilder<GetClusterSettingsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Return settings in flat format (default: false)
-	 * <p>
-	 * API name: {@code flat_settings}
-	 */
-	@Nullable
-	public final Boolean flatSettings() {
-		return this.flatSettings;
-	}
-
-	/**
-	 * Whether to return all default clusters setting.
-	 * <p>
-	 * API name: {@code include_defaults}
-	 */
-	@Nullable
-	public final Boolean includeDefaults() {
-		return this.includeDefaults;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to master node
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to cluster-manager node
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetClusterSettingsRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetClusterSettingsRequest> {
-		@Nullable
-		private Boolean flatSettings;
-
-		@Nullable
-		private Boolean includeDefaults;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * Return settings in flat format (default: false)
-		 * <p>
-		 * API name: {@code flat_settings}
-		 */
-		public final Builder flatSettings(@Nullable Boolean value) {
-			this.flatSettings = value;
-			return this;
-		}
-
-		/**
-		 * Whether to return all default clusters setting.
-		 * <p>
-		 * API name: {@code include_defaults}
-		 */
-		public final Builder includeDefaults(@Nullable Boolean value) {
-			this.includeDefaults = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link GetClusterSettingsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetClusterSettingsRequest build() {
-			_checkSingleUse();
-
-			return new GetClusterSettingsRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cluster.get_settings}".
-	 */
-	public static final Endpoint<GetClusterSettingsRequest, GetClusterSettingsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				return "/_cluster/settings";
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.flatSettings != null) {
-					params.put("flat_settings", String.valueOf(request.flatSettings));
-				}
-				if (request.includeDefaults != null) {
-					params.put("include_defaults", String.valueOf(request.includeDefaults));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, GetClusterSettingsResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean flatSettings;
+
+    @Nullable
+    private final Boolean includeDefaults;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetClusterSettingsRequest(Builder builder) {
+
+        this.flatSettings = builder.flatSettings;
+        this.includeDefaults = builder.includeDefaults;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.timeout = builder.timeout;
+
+    }
+
+    public static GetClusterSettingsRequest of(Function<Builder, ObjectBuilder<GetClusterSettingsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Return settings in flat format (default: false)
+     * <p>
+     * API name: {@code flat_settings}
+     */
+    @Nullable
+    public final Boolean flatSettings() {
+        return this.flatSettings;
+    }
+
+    /**
+     * Whether to return all default clusters setting.
+     * <p>
+     * API name: {@code include_defaults}
+     */
+    @Nullable
+    public final Boolean includeDefaults() {
+        return this.includeDefaults;
+    }
+
+    /**
+     * Explicit operation timeout for connection to master node
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Explicit operation timeout for connection to cluster-manager node
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetClusterSettingsRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetClusterSettingsRequest> {
+        @Nullable
+        private Boolean flatSettings;
+
+        @Nullable
+        private Boolean includeDefaults;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * Return settings in flat format (default: false)
+         * <p>
+         * API name: {@code flat_settings}
+         */
+        public final Builder flatSettings(@Nullable Boolean value) {
+            this.flatSettings = value;
+            return this;
+        }
+
+        /**
+         * Whether to return all default clusters setting.
+         * <p>
+         * API name: {@code include_defaults}
+         */
+        public final Builder includeDefaults(@Nullable Boolean value) {
+            this.includeDefaults = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link GetClusterSettingsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetClusterSettingsRequest build() {
+            _checkSingleUse();
+
+            return new GetClusterSettingsRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cluster.get_settings}".
+     */
+    public static final Endpoint<GetClusterSettingsRequest, GetClusterSettingsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            return "/_cluster/settings";
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.flatSettings != null) {
+                params.put("flat_settings", String.valueOf(request.flatSettings));
+            }
+            if (request.includeDefaults != null) {
+                params.put("include_defaults", String.valueOf(request.includeDefaults));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetClusterSettingsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/GetClusterSettingsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/GetClusterSettingsResponse.java
index b45f234c3e..5e2a6a90e6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/GetClusterSettingsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/GetClusterSettingsResponse.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.cluster;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,205 +46,202 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.get_settings.Response
 
 @JsonpDeserializable
 public class GetClusterSettingsResponse implements JsonpSerializable {
-	private final Map<String, JsonData> persistent;
+    private final Map<String, JsonData> persistent;
 
-	private final Map<String, JsonData> transient_;
+    private final Map<String, JsonData> transient_;
 
-	private final Map<String, JsonData> defaults;
+    private final Map<String, JsonData> defaults;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private GetClusterSettingsResponse(Builder builder) {
-
-		this.persistent = ApiTypeHelper.unmodifiableRequired(builder.persistent, this, "persistent");
-		this.transient_ = ApiTypeHelper.unmodifiableRequired(builder.transient_, this, "transient_");
-		this.defaults = ApiTypeHelper.unmodifiable(builder.defaults);
-
-	}
-
-	public static GetClusterSettingsResponse of(Function<Builder, ObjectBuilder<GetClusterSettingsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code persistent}
-	 */
-	public final Map<String, JsonData> persistent() {
-		return this.persistent;
-	}
-
-	/**
-	 * Required - API name: {@code transient}
-	 */
-	public final Map<String, JsonData> transient_() {
-		return this.transient_;
-	}
-
-	/**
-	 * API name: {@code defaults}
-	 */
-	public final Map<String, JsonData> defaults() {
-		return this.defaults;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.persistent)) {
-			generator.writeKey("persistent");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.persistent.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.transient_)) {
-			generator.writeKey("transient");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.transient_.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.defaults)) {
-			generator.writeKey("defaults");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.defaults.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetClusterSettingsResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetClusterSettingsResponse> {
-		private Map<String, JsonData> persistent;
-
-		private Map<String, JsonData> transient_;
-
-		@Nullable
-		private Map<String, JsonData> defaults;
-
-		/**
-		 * Required - API name: {@code persistent}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>persistent</code>.
-		 */
-		public final Builder persistent(Map<String, JsonData> map) {
-			this.persistent = _mapPutAll(this.persistent, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code persistent}
-		 * <p>
-		 * Adds an entry to <code>persistent</code>.
-		 */
-		public final Builder persistent(String key, JsonData value) {
-			this.persistent = _mapPut(this.persistent, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code transient}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>transient_</code>.
-		 */
-		public final Builder transient_(Map<String, JsonData> map) {
-			this.transient_ = _mapPutAll(this.transient_, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code transient}
-		 * <p>
-		 * Adds an entry to <code>transient_</code>.
-		 */
-		public final Builder transient_(String key, JsonData value) {
-			this.transient_ = _mapPut(this.transient_, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code defaults}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>defaults</code>.
-		 */
-		public final Builder defaults(Map<String, JsonData> map) {
-			this.defaults = _mapPutAll(this.defaults, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code defaults}
-		 * <p>
-		 * Adds an entry to <code>defaults</code>.
-		 */
-		public final Builder defaults(String key, JsonData value) {
-			this.defaults = _mapPut(this.defaults, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetClusterSettingsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetClusterSettingsResponse build() {
-			_checkSingleUse();
-
-			return new GetClusterSettingsResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetClusterSettingsResponse}
-	 */
-	public static final JsonpDeserializer<GetClusterSettingsResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GetClusterSettingsResponse::setupGetClusterSettingsResponseDeserializer);
-
-	protected static void setupGetClusterSettingsResponseDeserializer(
-			ObjectDeserializer<GetClusterSettingsResponse.Builder> op) {
-
-		op.add(Builder::persistent, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "persistent");
-		op.add(Builder::transient_, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "transient");
-		op.add(Builder::defaults, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "defaults");
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private GetClusterSettingsResponse(Builder builder) {
+
+        this.persistent = ApiTypeHelper.unmodifiableRequired(builder.persistent, this, "persistent");
+        this.transient_ = ApiTypeHelper.unmodifiableRequired(builder.transient_, this, "transient_");
+        this.defaults = ApiTypeHelper.unmodifiable(builder.defaults);
+
+    }
+
+    public static GetClusterSettingsResponse of(Function<Builder, ObjectBuilder<GetClusterSettingsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code persistent}
+     */
+    public final Map<String, JsonData> persistent() {
+        return this.persistent;
+    }
+
+    /**
+     * Required - API name: {@code transient}
+     */
+    public final Map<String, JsonData> transient_() {
+        return this.transient_;
+    }
+
+    /**
+     * API name: {@code defaults}
+     */
+    public final Map<String, JsonData> defaults() {
+        return this.defaults;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.persistent)) {
+            generator.writeKey("persistent");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.persistent.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.transient_)) {
+            generator.writeKey("transient");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.transient_.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.defaults)) {
+            generator.writeKey("defaults");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.defaults.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetClusterSettingsResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetClusterSettingsResponse> {
+        private Map<String, JsonData> persistent;
+
+        private Map<String, JsonData> transient_;
+
+        @Nullable
+        private Map<String, JsonData> defaults;
+
+        /**
+         * Required - API name: {@code persistent}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>persistent</code>.
+         */
+        public final Builder persistent(Map<String, JsonData> map) {
+            this.persistent = _mapPutAll(this.persistent, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code persistent}
+         * <p>
+         * Adds an entry to <code>persistent</code>.
+         */
+        public final Builder persistent(String key, JsonData value) {
+            this.persistent = _mapPut(this.persistent, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code transient}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>transient_</code>.
+         */
+        public final Builder transient_(Map<String, JsonData> map) {
+            this.transient_ = _mapPutAll(this.transient_, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code transient}
+         * <p>
+         * Adds an entry to <code>transient_</code>.
+         */
+        public final Builder transient_(String key, JsonData value) {
+            this.transient_ = _mapPut(this.transient_, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code defaults}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>defaults</code>.
+         */
+        public final Builder defaults(Map<String, JsonData> map) {
+            this.defaults = _mapPutAll(this.defaults, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code defaults}
+         * <p>
+         * Adds an entry to <code>defaults</code>.
+         */
+        public final Builder defaults(String key, JsonData value) {
+            this.defaults = _mapPut(this.defaults, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetClusterSettingsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetClusterSettingsResponse build() {
+            _checkSingleUse();
+
+            return new GetClusterSettingsResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetClusterSettingsResponse}
+     */
+    public static final JsonpDeserializer<GetClusterSettingsResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetClusterSettingsResponse::setupGetClusterSettingsResponseDeserializer
+    );
+
+    protected static void setupGetClusterSettingsResponseDeserializer(ObjectDeserializer<GetClusterSettingsResponse.Builder> op) {
+
+        op.add(Builder::persistent, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "persistent");
+        op.add(Builder::transient_, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "transient");
+        op.add(Builder::defaults, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "defaults");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/GetComponentTemplateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/GetComponentTemplateRequest.java
index eb37dd4ded..ba1794d05a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/GetComponentTemplateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/GetComponentTemplateRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.cluster;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -40,261 +44,258 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: cluster.get_component_template.Request
 
 /**
  * Returns one or more component templates
- * 
+ *
  */
 
 public class GetComponentTemplateRequest extends RequestBase {
-	@Nullable
-	private final Boolean flatSettings;
-
-	@Nullable
-	private final Boolean local;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final String name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetComponentTemplateRequest(Builder builder) {
-
-		this.flatSettings = builder.flatSettings;
-		this.local = builder.local;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = builder.name;
-
-	}
-
-	public static GetComponentTemplateRequest of(Function<Builder, ObjectBuilder<GetComponentTemplateRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code flat_settings}
-	 */
-	@Nullable
-	public final Boolean flatSettings() {
-		return this.flatSettings;
-	}
-
-	/**
-	 * Return local information, do not retrieve the state from master node
-	 * (default: false)
-	 * <p>
-	 * API name: {@code local}
-	 */
-	@Nullable
-	public final Boolean local() {
-		return this.local;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to master node
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to cluster-manager node
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * The comma separated names of the component templates
-	 * <p>
-	 * API name: {@code name}
-	 */
-	@Nullable
-	public final String name() {
-		return this.name;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetComponentTemplateRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetComponentTemplateRequest> {
-		@Nullable
-		private Boolean flatSettings;
-
-		@Nullable
-		private Boolean local;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private String name;
-
-		/**
-		 * API name: {@code flat_settings}
-		 */
-		public final Builder flatSettings(@Nullable Boolean value) {
-			this.flatSettings = value;
-			return this;
-		}
-
-		/**
-		 * Return local information, do not retrieve the state from master node
-		 * (default: false)
-		 * <p>
-		 * API name: {@code local}
-		 */
-		public final Builder local(@Nullable Boolean value) {
-			this.local = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * The comma separated names of the component templates
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(@Nullable String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetComponentTemplateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetComponentTemplateRequest build() {
-			_checkSingleUse();
-
-			return new GetComponentTemplateRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cluster.get_component_template}".
-	 */
-	public static final Endpoint<GetComponentTemplateRequest, GetComponentTemplateResponse, ErrorResponse> _ENDPOINT =
-			new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				if (request.name() != null)
-					propsSet |= _name;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_component_template");
-					return buf.toString();
-				}
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_component_template");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.flatSettings != null) {
-					params.put("flat_settings", String.valueOf(request.flatSettings));
-				}
-				if (request.local != null) {
-					params.put("local", String.valueOf(request.local));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, GetComponentTemplateResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean flatSettings;
+
+    @Nullable
+    private final Boolean local;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final String name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetComponentTemplateRequest(Builder builder) {
+
+        this.flatSettings = builder.flatSettings;
+        this.local = builder.local;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = builder.name;
+
+    }
+
+    public static GetComponentTemplateRequest of(Function<Builder, ObjectBuilder<GetComponentTemplateRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code flat_settings}
+     */
+    @Nullable
+    public final Boolean flatSettings() {
+        return this.flatSettings;
+    }
+
+    /**
+     * Return local information, do not retrieve the state from master node
+     * (default: false)
+     * <p>
+     * API name: {@code local}
+     */
+    @Nullable
+    public final Boolean local() {
+        return this.local;
+    }
+
+    /**
+     * Explicit operation timeout for connection to master node
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Explicit operation timeout for connection to cluster-manager node
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * The comma separated names of the component templates
+     * <p>
+     * API name: {@code name}
+     */
+    @Nullable
+    public final String name() {
+        return this.name;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetComponentTemplateRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetComponentTemplateRequest> {
+        @Nullable
+        private Boolean flatSettings;
+
+        @Nullable
+        private Boolean local;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private String name;
+
+        /**
+         * API name: {@code flat_settings}
+         */
+        public final Builder flatSettings(@Nullable Boolean value) {
+            this.flatSettings = value;
+            return this;
+        }
+
+        /**
+         * Return local information, do not retrieve the state from master node
+         * (default: false)
+         * <p>
+         * API name: {@code local}
+         */
+        public final Builder local(@Nullable Boolean value) {
+            this.local = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * The comma separated names of the component templates
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(@Nullable String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetComponentTemplateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetComponentTemplateRequest build() {
+            _checkSingleUse();
+
+            return new GetComponentTemplateRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cluster.get_component_template}".
+     */
+    public static final Endpoint<GetComponentTemplateRequest, GetComponentTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            if (request.name() != null) propsSet |= _name;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_component_template");
+                return buf.toString();
+            }
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_component_template");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.flatSettings != null) {
+                params.put("flat_settings", String.valueOf(request.flatSettings));
+            }
+            if (request.local != null) {
+                params.put("local", String.valueOf(request.local));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetComponentTemplateResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/GetComponentTemplateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/GetComponentTemplateResponse.java
index 7ec55bcc9a..cf08562749 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/GetComponentTemplateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/GetComponentTemplateResponse.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cluster;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,126 +44,121 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cluster.get_component_template.Response
 
 @JsonpDeserializable
 public class GetComponentTemplateResponse implements JsonpSerializable {
-	private final List<ComponentTemplate> componentTemplates;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetComponentTemplateResponse(Builder builder) {
-
-		this.componentTemplates = ApiTypeHelper.unmodifiableRequired(builder.componentTemplates, this,
-				"componentTemplates");
-
-	}
-
-	public static GetComponentTemplateResponse of(Function<Builder, ObjectBuilder<GetComponentTemplateResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code component_templates}
-	 */
-	public final List<ComponentTemplate> componentTemplates() {
-		return this.componentTemplates;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.componentTemplates)) {
-			generator.writeKey("component_templates");
-			generator.writeStartArray();
-			for (ComponentTemplate item0 : this.componentTemplates) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetComponentTemplateResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetComponentTemplateResponse> {
-		private List<ComponentTemplate> componentTemplates;
-
-		/**
-		 * Required - API name: {@code component_templates}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>componentTemplates</code>.
-		 */
-		public final Builder componentTemplates(List<ComponentTemplate> list) {
-			this.componentTemplates = _listAddAll(this.componentTemplates, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code component_templates}
-		 * <p>
-		 * Adds one or more values to <code>componentTemplates</code>.
-		 */
-		public final Builder componentTemplates(ComponentTemplate value, ComponentTemplate... values) {
-			this.componentTemplates = _listAdd(this.componentTemplates, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code component_templates}
-		 * <p>
-		 * Adds a value to <code>componentTemplates</code> using a builder lambda.
-		 */
-		public final Builder componentTemplates(
-				Function<ComponentTemplate.Builder, ObjectBuilder<ComponentTemplate>> fn) {
-			return componentTemplates(fn.apply(new ComponentTemplate.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link GetComponentTemplateResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetComponentTemplateResponse build() {
-			_checkSingleUse();
-
-			return new GetComponentTemplateResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetComponentTemplateResponse}
-	 */
-	public static final JsonpDeserializer<GetComponentTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GetComponentTemplateResponse::setupGetComponentTemplateResponseDeserializer);
-
-	protected static void setupGetComponentTemplateResponseDeserializer(
-			ObjectDeserializer<GetComponentTemplateResponse.Builder> op) {
-
-		op.add(Builder::componentTemplates, JsonpDeserializer.arrayDeserializer(ComponentTemplate._DESERIALIZER),
-				"component_templates");
-
-	}
+    private final List<ComponentTemplate> componentTemplates;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetComponentTemplateResponse(Builder builder) {
+
+        this.componentTemplates = ApiTypeHelper.unmodifiableRequired(builder.componentTemplates, this, "componentTemplates");
+
+    }
+
+    public static GetComponentTemplateResponse of(Function<Builder, ObjectBuilder<GetComponentTemplateResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code component_templates}
+     */
+    public final List<ComponentTemplate> componentTemplates() {
+        return this.componentTemplates;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.componentTemplates)) {
+            generator.writeKey("component_templates");
+            generator.writeStartArray();
+            for (ComponentTemplate item0 : this.componentTemplates) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetComponentTemplateResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetComponentTemplateResponse> {
+        private List<ComponentTemplate> componentTemplates;
+
+        /**
+         * Required - API name: {@code component_templates}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>componentTemplates</code>.
+         */
+        public final Builder componentTemplates(List<ComponentTemplate> list) {
+            this.componentTemplates = _listAddAll(this.componentTemplates, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code component_templates}
+         * <p>
+         * Adds one or more values to <code>componentTemplates</code>.
+         */
+        public final Builder componentTemplates(ComponentTemplate value, ComponentTemplate... values) {
+            this.componentTemplates = _listAdd(this.componentTemplates, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code component_templates}
+         * <p>
+         * Adds a value to <code>componentTemplates</code> using a builder lambda.
+         */
+        public final Builder componentTemplates(Function<ComponentTemplate.Builder, ObjectBuilder<ComponentTemplate>> fn) {
+            return componentTemplates(fn.apply(new ComponentTemplate.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link GetComponentTemplateResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetComponentTemplateResponse build() {
+            _checkSingleUse();
+
+            return new GetComponentTemplateResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetComponentTemplateResponse}
+     */
+    public static final JsonpDeserializer<GetComponentTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetComponentTemplateResponse::setupGetComponentTemplateResponseDeserializer
+    );
+
+    protected static void setupGetComponentTemplateResponseDeserializer(ObjectDeserializer<GetComponentTemplateResponse.Builder> op) {
+
+        op.add(Builder::componentTemplates, JsonpDeserializer.arrayDeserializer(ComponentTemplate._DESERIALIZER), "component_templates");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/HealthRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/HealthRequest.java
index 4fbaf8b897..76bb75032c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/HealthRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/HealthRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.cluster;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.HealthStatus;
@@ -46,594 +52,587 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: cluster.health.Request
 
 /**
  * Returns basic information about the health of the cluster.
- * 
+ *
  */
 
 public class HealthRequest extends RequestBase {
-	private final List<ExpandWildcard> expandWildcards;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Level level;
-
-	@Nullable
-	private final Boolean local;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final WaitForActiveShards waitForActiveShards;
-
-	@Nullable
-	private final WaitForEvents waitForEvents;
-
-	@Nullable
-	private final Boolean waitForNoInitializingShards;
-
-	@Nullable
-	private final Boolean waitForNoRelocatingShards;
-
-	@Nullable
-	private final String waitForNodes;
-
-	@Nullable
-	private final HealthStatus waitForStatus;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HealthRequest(Builder builder) {
-
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.level = builder.level;
-		this.local = builder.local;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.timeout = builder.timeout;
-		this.waitForActiveShards = builder.waitForActiveShards;
-		this.waitForEvents = builder.waitForEvents;
-		this.waitForNoInitializingShards = builder.waitForNoInitializingShards;
-		this.waitForNoRelocatingShards = builder.waitForNoRelocatingShards;
-		this.waitForNodes = builder.waitForNodes;
-		this.waitForStatus = builder.waitForStatus;
-
-	}
-
-	public static HealthRequest of(Function<Builder, ObjectBuilder<HealthRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Comma-separated list of data streams, indices, and index aliases used to
-	 * limit the request. Wildcard expressions (*) are supported. To target all data
-	 * streams and indices in a cluster, omit this parameter or use _all or *.
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Can be one of cluster, indices or shards. Controls the details level of the
-	 * health information returned.
-	 * <p>
-	 * API name: {@code level}
-	 */
-	@Nullable
-	public final Level level() {
-		return this.level;
-	}
-
-	/**
-	 * If true, the request retrieves information from the local node only. Defaults
-	 * to false, which means information is retrieved from the cluster-manager node.
-	 * <p>
-	 * API name: {@code local}
-	 */
-	@Nullable
-	public final Boolean local() {
-		return this.local;
-	}
-
-	/**
-	 * Period to wait for a connection to the master node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Period to wait for a connection to the cluster-manager node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Period to wait for a response. If no response is received before the timeout
-	 * expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * A number controlling to how many active shards to wait for, all to wait for
-	 * all shards in the cluster to be active, or 0 to not wait.
-	 * <p>
-	 * API name: {@code wait_for_active_shards}
-	 */
-	@Nullable
-	public final WaitForActiveShards waitForActiveShards() {
-		return this.waitForActiveShards;
-	}
-
-	/**
-	 * Can be one of immediate, urgent, high, normal, low, languid. Wait until all
-	 * currently queued events with the given priority are processed.
-	 * <p>
-	 * API name: {@code wait_for_events}
-	 */
-	@Nullable
-	public final WaitForEvents waitForEvents() {
-		return this.waitForEvents;
-	}
-
-	/**
-	 * A boolean value which controls whether to wait (until the timeout provided)
-	 * for the cluster to have no shard initializations. Defaults to false, which
-	 * means it will not wait for initializing shards.
-	 * <p>
-	 * API name: {@code wait_for_no_initializing_shards}
-	 */
-	@Nullable
-	public final Boolean waitForNoInitializingShards() {
-		return this.waitForNoInitializingShards;
-	}
-
-	/**
-	 * A boolean value which controls whether to wait (until the timeout provided)
-	 * for the cluster to have no shard relocations. Defaults to false, which means
-	 * it will not wait for relocating shards.
-	 * <p>
-	 * API name: {@code wait_for_no_relocating_shards}
-	 */
-	@Nullable
-	public final Boolean waitForNoRelocatingShards() {
-		return this.waitForNoRelocatingShards;
-	}
-
-	/**
-	 * The request waits until the specified number N of nodes is available. It also
-	 * accepts &gt;=N, &lt;=N, &gt;N and &lt;N. Alternatively, it is possible to use
-	 * ge(N), le(N), gt(N) and lt(N) notation.
-	 * <p>
-	 * API name: {@code wait_for_nodes}
-	 */
-	@Nullable
-	public final String waitForNodes() {
-		return this.waitForNodes;
-	}
-
-	/**
-	 * One of green, yellow or red. Will wait (until the timeout provided) until the
-	 * status of the cluster changes to the one provided or better, i.e. green &gt;
-	 * yellow &gt; red. By default, will not wait for any status.
-	 * <p>
-	 * API name: {@code wait_for_status}
-	 */
-	@Nullable
-	public final HealthStatus waitForStatus() {
-		return this.waitForStatus;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HealthRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HealthRequest> {
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private Level level;
-
-		@Nullable
-		private Boolean local;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private WaitForActiveShards waitForActiveShards;
-
-		@Nullable
-		private WaitForEvents waitForEvents;
-
-		@Nullable
-		private Boolean waitForNoInitializingShards;
-
-		@Nullable
-		private Boolean waitForNoRelocatingShards;
-
-		@Nullable
-		private String waitForNodes;
-
-		@Nullable
-		private HealthStatus waitForStatus;
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Comma-separated list of data streams, indices, and index aliases used to
-		 * limit the request. Wildcard expressions (*) are supported. To target all data
-		 * streams and indices in a cluster, omit this parameter or use _all or *.
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * Comma-separated list of data streams, indices, and index aliases used to
-		 * limit the request. Wildcard expressions (*) are supported. To target all data
-		 * streams and indices in a cluster, omit this parameter or use _all or *.
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Can be one of cluster, indices or shards. Controls the details level of the
-		 * health information returned.
-		 * <p>
-		 * API name: {@code level}
-		 */
-		public final Builder level(@Nullable Level value) {
-			this.level = value;
-			return this;
-		}
-
-		/**
-		 * If true, the request retrieves information from the local node only. Defaults
-		 * to false, which means information is retrieved from the cluster-manager node.
-		 * <p>
-		 * API name: {@code local}
-		 */
-		public final Builder local(@Nullable Boolean value) {
-			this.local = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Period to wait for a response. If no response is received before the timeout
-		 * expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a response. If no response is received before the timeout
-		 * expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * A number controlling to how many active shards to wait for, all to wait for
-		 * all shards in the cluster to be active, or 0 to not wait.
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
-			this.waitForActiveShards = value;
-			return this;
-		}
-
-		/**
-		 * A number controlling to how many active shards to wait for, all to wait for
-		 * all shards in the cluster to be active, or 0 to not wait.
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(
-				Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
-			return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
-		}
-
-		/**
-		 * Can be one of immediate, urgent, high, normal, low, languid. Wait until all
-		 * currently queued events with the given priority are processed.
-		 * <p>
-		 * API name: {@code wait_for_events}
-		 */
-		public final Builder waitForEvents(@Nullable WaitForEvents value) {
-			this.waitForEvents = value;
-			return this;
-		}
-
-		/**
-		 * A boolean value which controls whether to wait (until the timeout provided)
-		 * for the cluster to have no shard initializations. Defaults to false, which
-		 * means it will not wait for initializing shards.
-		 * <p>
-		 * API name: {@code wait_for_no_initializing_shards}
-		 */
-		public final Builder waitForNoInitializingShards(@Nullable Boolean value) {
-			this.waitForNoInitializingShards = value;
-			return this;
-		}
-
-		/**
-		 * A boolean value which controls whether to wait (until the timeout provided)
-		 * for the cluster to have no shard relocations. Defaults to false, which means
-		 * it will not wait for relocating shards.
-		 * <p>
-		 * API name: {@code wait_for_no_relocating_shards}
-		 */
-		public final Builder waitForNoRelocatingShards(@Nullable Boolean value) {
-			this.waitForNoRelocatingShards = value;
-			return this;
-		}
-
-		/**
-		 * The request waits until the specified number N of nodes is available. It also
-		 * accepts &gt;=N, &lt;=N, &gt;N and &lt;N. Alternatively, it is possible to use
-		 * ge(N), le(N), gt(N) and lt(N) notation.
-		 * <p>
-		 * API name: {@code wait_for_nodes}
-		 */
-		public final Builder waitForNodes(@Nullable String value) {
-			this.waitForNodes = value;
-			return this;
-		}
-
-		/**
-		 * One of green, yellow or red. Will wait (until the timeout provided) until the
-		 * status of the cluster changes to the one provided or better, i.e. green &gt;
-		 * yellow &gt; red. By default, will not wait for any status.
-		 * <p>
-		 * API name: {@code wait_for_status}
-		 */
-		public final Builder waitForStatus(@Nullable HealthStatus value) {
-			this.waitForStatus = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HealthRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HealthRequest build() {
-			_checkSingleUse();
-
-			return new HealthRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cluster.health}".
-	 */
-	public static final Endpoint<HealthRequest, HealthResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cluster");
-					buf.append("/health");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cluster");
-					buf.append("/health");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.level != null) {
-					params.put("level", request.level.jsonValue());
-				}
-				if (request.waitForEvents != null) {
-					params.put("wait_for_events", request.waitForEvents.jsonValue());
-				}
-				if (request.waitForNoInitializingShards != null) {
-					params.put("wait_for_no_initializing_shards", String.valueOf(request.waitForNoInitializingShards));
-				}
-				if (request.waitForStatus != null) {
-					params.put("wait_for_status", request.waitForStatus.jsonValue());
-				}
-				if (request.waitForActiveShards != null) {
-					params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
-				}
-				if (request.waitForNodes != null) {
-					params.put("wait_for_nodes", request.waitForNodes);
-				}
-				if (request.waitForNoRelocatingShards != null) {
-					params.put("wait_for_no_relocating_shards", String.valueOf(request.waitForNoRelocatingShards));
-				}
-				if (request.local != null) {
-					params.put("local", String.valueOf(request.local));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, HealthResponse._DESERIALIZER);
+    private final List<ExpandWildcard> expandWildcards;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Level level;
+
+    @Nullable
+    private final Boolean local;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final WaitForActiveShards waitForActiveShards;
+
+    @Nullable
+    private final WaitForEvents waitForEvents;
+
+    @Nullable
+    private final Boolean waitForNoInitializingShards;
+
+    @Nullable
+    private final Boolean waitForNoRelocatingShards;
+
+    @Nullable
+    private final String waitForNodes;
+
+    @Nullable
+    private final HealthStatus waitForStatus;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HealthRequest(Builder builder) {
+
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.level = builder.level;
+        this.local = builder.local;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.timeout = builder.timeout;
+        this.waitForActiveShards = builder.waitForActiveShards;
+        this.waitForEvents = builder.waitForEvents;
+        this.waitForNoInitializingShards = builder.waitForNoInitializingShards;
+        this.waitForNoRelocatingShards = builder.waitForNoRelocatingShards;
+        this.waitForNodes = builder.waitForNodes;
+        this.waitForStatus = builder.waitForStatus;
+
+    }
+
+    public static HealthRequest of(Function<Builder, ObjectBuilder<HealthRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Comma-separated list of data streams, indices, and index aliases used to
+     * limit the request. Wildcard expressions (*) are supported. To target all data
+     * streams and indices in a cluster, omit this parameter or use _all or *.
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Can be one of cluster, indices or shards. Controls the details level of the
+     * health information returned.
+     * <p>
+     * API name: {@code level}
+     */
+    @Nullable
+    public final Level level() {
+        return this.level;
+    }
+
+    /**
+     * If true, the request retrieves information from the local node only. Defaults
+     * to false, which means information is retrieved from the cluster-manager node.
+     * <p>
+     * API name: {@code local}
+     */
+    @Nullable
+    public final Boolean local() {
+        return this.local;
+    }
+
+    /**
+     * Period to wait for a connection to the master node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Period to wait for a connection to the cluster-manager node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Period to wait for a response. If no response is received before the timeout
+     * expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * A number controlling to how many active shards to wait for, all to wait for
+     * all shards in the cluster to be active, or 0 to not wait.
+     * <p>
+     * API name: {@code wait_for_active_shards}
+     */
+    @Nullable
+    public final WaitForActiveShards waitForActiveShards() {
+        return this.waitForActiveShards;
+    }
+
+    /**
+     * Can be one of immediate, urgent, high, normal, low, languid. Wait until all
+     * currently queued events with the given priority are processed.
+     * <p>
+     * API name: {@code wait_for_events}
+     */
+    @Nullable
+    public final WaitForEvents waitForEvents() {
+        return this.waitForEvents;
+    }
+
+    /**
+     * A boolean value which controls whether to wait (until the timeout provided)
+     * for the cluster to have no shard initializations. Defaults to false, which
+     * means it will not wait for initializing shards.
+     * <p>
+     * API name: {@code wait_for_no_initializing_shards}
+     */
+    @Nullable
+    public final Boolean waitForNoInitializingShards() {
+        return this.waitForNoInitializingShards;
+    }
+
+    /**
+     * A boolean value which controls whether to wait (until the timeout provided)
+     * for the cluster to have no shard relocations. Defaults to false, which means
+     * it will not wait for relocating shards.
+     * <p>
+     * API name: {@code wait_for_no_relocating_shards}
+     */
+    @Nullable
+    public final Boolean waitForNoRelocatingShards() {
+        return this.waitForNoRelocatingShards;
+    }
+
+    /**
+     * The request waits until the specified number N of nodes is available. It also
+     * accepts &gt;=N, &lt;=N, &gt;N and &lt;N. Alternatively, it is possible to use
+     * ge(N), le(N), gt(N) and lt(N) notation.
+     * <p>
+     * API name: {@code wait_for_nodes}
+     */
+    @Nullable
+    public final String waitForNodes() {
+        return this.waitForNodes;
+    }
+
+    /**
+     * One of green, yellow or red. Will wait (until the timeout provided) until the
+     * status of the cluster changes to the one provided or better, i.e. green &gt;
+     * yellow &gt; red. By default, will not wait for any status.
+     * <p>
+     * API name: {@code wait_for_status}
+     */
+    @Nullable
+    public final HealthStatus waitForStatus() {
+        return this.waitForStatus;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HealthRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HealthRequest> {
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private Level level;
+
+        @Nullable
+        private Boolean local;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private WaitForActiveShards waitForActiveShards;
+
+        @Nullable
+        private WaitForEvents waitForEvents;
+
+        @Nullable
+        private Boolean waitForNoInitializingShards;
+
+        @Nullable
+        private Boolean waitForNoRelocatingShards;
+
+        @Nullable
+        private String waitForNodes;
+
+        @Nullable
+        private HealthStatus waitForStatus;
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Comma-separated list of data streams, indices, and index aliases used to
+         * limit the request. Wildcard expressions (*) are supported. To target all data
+         * streams and indices in a cluster, omit this parameter or use _all or *.
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * Comma-separated list of data streams, indices, and index aliases used to
+         * limit the request. Wildcard expressions (*) are supported. To target all data
+         * streams and indices in a cluster, omit this parameter or use _all or *.
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Can be one of cluster, indices or shards. Controls the details level of the
+         * health information returned.
+         * <p>
+         * API name: {@code level}
+         */
+        public final Builder level(@Nullable Level value) {
+            this.level = value;
+            return this;
+        }
+
+        /**
+         * If true, the request retrieves information from the local node only. Defaults
+         * to false, which means information is retrieved from the cluster-manager node.
+         * <p>
+         * API name: {@code local}
+         */
+        public final Builder local(@Nullable Boolean value) {
+            this.local = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Period to wait for a response. If no response is received before the timeout
+         * expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a response. If no response is received before the timeout
+         * expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * A number controlling to how many active shards to wait for, all to wait for
+         * all shards in the cluster to be active, or 0 to not wait.
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
+            this.waitForActiveShards = value;
+            return this;
+        }
+
+        /**
+         * A number controlling to how many active shards to wait for, all to wait for
+         * all shards in the cluster to be active, or 0 to not wait.
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
+            return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
+        }
+
+        /**
+         * Can be one of immediate, urgent, high, normal, low, languid. Wait until all
+         * currently queued events with the given priority are processed.
+         * <p>
+         * API name: {@code wait_for_events}
+         */
+        public final Builder waitForEvents(@Nullable WaitForEvents value) {
+            this.waitForEvents = value;
+            return this;
+        }
+
+        /**
+         * A boolean value which controls whether to wait (until the timeout provided)
+         * for the cluster to have no shard initializations. Defaults to false, which
+         * means it will not wait for initializing shards.
+         * <p>
+         * API name: {@code wait_for_no_initializing_shards}
+         */
+        public final Builder waitForNoInitializingShards(@Nullable Boolean value) {
+            this.waitForNoInitializingShards = value;
+            return this;
+        }
+
+        /**
+         * A boolean value which controls whether to wait (until the timeout provided)
+         * for the cluster to have no shard relocations. Defaults to false, which means
+         * it will not wait for relocating shards.
+         * <p>
+         * API name: {@code wait_for_no_relocating_shards}
+         */
+        public final Builder waitForNoRelocatingShards(@Nullable Boolean value) {
+            this.waitForNoRelocatingShards = value;
+            return this;
+        }
+
+        /**
+         * The request waits until the specified number N of nodes is available. It also
+         * accepts &gt;=N, &lt;=N, &gt;N and &lt;N. Alternatively, it is possible to use
+         * ge(N), le(N), gt(N) and lt(N) notation.
+         * <p>
+         * API name: {@code wait_for_nodes}
+         */
+        public final Builder waitForNodes(@Nullable String value) {
+            this.waitForNodes = value;
+            return this;
+        }
+
+        /**
+         * One of green, yellow or red. Will wait (until the timeout provided) until the
+         * status of the cluster changes to the one provided or better, i.e. green &gt;
+         * yellow &gt; red. By default, will not wait for any status.
+         * <p>
+         * API name: {@code wait_for_status}
+         */
+        public final Builder waitForStatus(@Nullable HealthStatus value) {
+            this.waitForStatus = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link HealthRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HealthRequest build() {
+            _checkSingleUse();
+
+            return new HealthRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cluster.health}".
+     */
+    public static final Endpoint<HealthRequest, HealthResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cluster");
+                buf.append("/health");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cluster");
+                buf.append("/health");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.level != null) {
+                params.put("level", request.level.jsonValue());
+            }
+            if (request.waitForEvents != null) {
+                params.put("wait_for_events", request.waitForEvents.jsonValue());
+            }
+            if (request.waitForNoInitializingShards != null) {
+                params.put("wait_for_no_initializing_shards", String.valueOf(request.waitForNoInitializingShards));
+            }
+            if (request.waitForStatus != null) {
+                params.put("wait_for_status", request.waitForStatus.jsonValue());
+            }
+            if (request.waitForActiveShards != null) {
+                params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
+            }
+            if (request.waitForNodes != null) {
+                params.put("wait_for_nodes", request.waitForNodes);
+            }
+            if (request.waitForNoRelocatingShards != null) {
+                params.put("wait_for_no_relocating_shards", String.valueOf(request.waitForNoRelocatingShards));
+            }
+            if (request.local != null) {
+                params.put("local", String.valueOf(request.local));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        HealthResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/HealthResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/HealthResponse.java
index 98e15c5acd..be70fa0212 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/HealthResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/HealthResponse.java
@@ -32,566 +32,566 @@
 
 package org.opensearch.client.opensearch.cluster;
 
-import org.opensearch.client.opensearch._types.HealthStatus;
-import org.opensearch.client.opensearch.cluster.health.IndexHealthStats;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.HealthStatus;
+import org.opensearch.client.opensearch.cluster.health.IndexHealthStats;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.health.Response
 
 @JsonpDeserializable
 public class HealthResponse implements JsonpSerializable {
-	private final int activePrimaryShards;
-
-	private final int activeShards;
-
-	private final String activeShardsPercentAsNumber;
-
-	private final String clusterName;
-
-	private final int delayedUnassignedShards;
-
-	private final Map<String, IndexHealthStats> indices;
-
-	private final int initializingShards;
-
-	private final int numberOfDataNodes;
-
-	private final int numberOfInFlightFetch;
-
-	private final int numberOfNodes;
-
-	private final int numberOfPendingTasks;
-
-	private final int relocatingShards;
-
-	private final HealthStatus status;
-
-	private final String taskMaxWaitingInQueueMillis;
-
-	private final boolean timedOut;
-
-	private final int unassignedShards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HealthResponse(Builder builder) {
-
-		this.activePrimaryShards = ApiTypeHelper.requireNonNull(builder.activePrimaryShards, this,
-				"activePrimaryShards");
-		this.activeShards = ApiTypeHelper.requireNonNull(builder.activeShards, this, "activeShards");
-		this.activeShardsPercentAsNumber = ApiTypeHelper.requireNonNull(builder.activeShardsPercentAsNumber, this,
-				"activeShardsPercentAsNumber");
-		this.clusterName = ApiTypeHelper.requireNonNull(builder.clusterName, this, "clusterName");
-		this.delayedUnassignedShards = ApiTypeHelper.requireNonNull(builder.delayedUnassignedShards, this,
-				"delayedUnassignedShards");
-		this.indices = ApiTypeHelper.unmodifiable(builder.indices);
-		this.initializingShards = ApiTypeHelper.requireNonNull(builder.initializingShards, this, "initializingShards");
-		this.numberOfDataNodes = ApiTypeHelper.requireNonNull(builder.numberOfDataNodes, this, "numberOfDataNodes");
-		this.numberOfInFlightFetch = ApiTypeHelper.requireNonNull(builder.numberOfInFlightFetch, this,
-				"numberOfInFlightFetch");
-		this.numberOfNodes = ApiTypeHelper.requireNonNull(builder.numberOfNodes, this, "numberOfNodes");
-		this.numberOfPendingTasks = ApiTypeHelper.requireNonNull(builder.numberOfPendingTasks, this,
-				"numberOfPendingTasks");
-		this.relocatingShards = ApiTypeHelper.requireNonNull(builder.relocatingShards, this, "relocatingShards");
-		this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
-		this.taskMaxWaitingInQueueMillis = ApiTypeHelper.requireNonNull(builder.taskMaxWaitingInQueueMillis, this,
-				"taskMaxWaitingInQueueMillis");
-		this.timedOut = ApiTypeHelper.requireNonNull(builder.timedOut, this, "timedOut");
-		this.unassignedShards = ApiTypeHelper.requireNonNull(builder.unassignedShards, this, "unassignedShards");
-
-	}
-
-	public static HealthResponse of(Function<Builder, ObjectBuilder<HealthResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - The number of active primary shards.
-	 * <p>
-	 * API name: {@code active_primary_shards}
-	 */
-	public final int activePrimaryShards() {
-		return this.activePrimaryShards;
-	}
-
-	/**
-	 * Required - The total number of active primary and replica shards.
-	 * <p>
-	 * API name: {@code active_shards}
-	 */
-	public final int activeShards() {
-		return this.activeShards;
-	}
-
-	/**
-	 * Required - The ratio of active shards in the cluster expressed as a
-	 * percentage.
-	 * <p>
-	 * API name: {@code active_shards_percent_as_number}
-	 */
-	public final String activeShardsPercentAsNumber() {
-		return this.activeShardsPercentAsNumber;
-	}
-
-	/**
-	 * Required - The name of the cluster.
-	 * <p>
-	 * API name: {@code cluster_name}
-	 */
-	public final String clusterName() {
-		return this.clusterName;
-	}
-
-	/**
-	 * Required - The number of shards whose allocation has been delayed by the
-	 * timeout settings.
-	 * <p>
-	 * API name: {@code delayed_unassigned_shards}
-	 */
-	public final int delayedUnassignedShards() {
-		return this.delayedUnassignedShards;
-	}
-
-	/**
-	 * API name: {@code indices}
-	 */
-	public final Map<String, IndexHealthStats> indices() {
-		return this.indices;
-	}
-
-	/**
-	 * Required - The number of shards that are under initialization.
-	 * <p>
-	 * API name: {@code initializing_shards}
-	 */
-	public final int initializingShards() {
-		return this.initializingShards;
-	}
-
-	/**
-	 * Required - The number of nodes that are dedicated data nodes.
-	 * <p>
-	 * API name: {@code number_of_data_nodes}
-	 */
-	public final int numberOfDataNodes() {
-		return this.numberOfDataNodes;
-	}
-
-	/**
-	 * Required - API name: {@code number_of_in_flight_fetch}
-	 */
-	public final int numberOfInFlightFetch() {
-		return this.numberOfInFlightFetch;
-	}
-
-	/**
-	 * Required - The number of nodes within the cluster.
-	 * <p>
-	 * API name: {@code number_of_nodes}
-	 */
-	public final int numberOfNodes() {
-		return this.numberOfNodes;
-	}
-
-	/**
-	 * Required - The number of cluster-level changes that have not yet been
-	 * executed.
-	 * <p>
-	 * API name: {@code number_of_pending_tasks}
-	 */
-	public final int numberOfPendingTasks() {
-		return this.numberOfPendingTasks;
-	}
-
-	/**
-	 * Required - The number of shards that are under relocation.
-	 * <p>
-	 * API name: {@code relocating_shards}
-	 */
-	public final int relocatingShards() {
-		return this.relocatingShards;
-	}
-
-	/**
-	 * Required - API name: {@code status}
-	 */
-	public final HealthStatus status() {
-		return this.status;
-	}
-
-	/**
-	 * Required - The time expressed in milliseconds since the earliest initiated
-	 * task is waiting for being performed.
-	 * <p>
-	 * API name: {@code task_max_waiting_in_queue_millis}
-	 */
-	public final String taskMaxWaitingInQueueMillis() {
-		return this.taskMaxWaitingInQueueMillis;
-	}
-
-	/**
-	 * Required - If false the response returned within the period of time that is
-	 * specified by the timeout parameter (30s by default)
-	 * <p>
-	 * API name: {@code timed_out}
-	 */
-	public final boolean timedOut() {
-		return this.timedOut;
-	}
-
-	/**
-	 * Required - The number of shards that are not allocated.
-	 * <p>
-	 * API name: {@code unassigned_shards}
-	 */
-	public final int unassignedShards() {
-		return this.unassignedShards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("active_primary_shards");
-		generator.write(this.activePrimaryShards);
-
-		generator.writeKey("active_shards");
-		generator.write(this.activeShards);
-
-		generator.writeKey("active_shards_percent_as_number");
-		generator.write(this.activeShardsPercentAsNumber);
-
-		generator.writeKey("cluster_name");
-		generator.write(this.clusterName);
-
-		generator.writeKey("delayed_unassigned_shards");
-		generator.write(this.delayedUnassignedShards);
-
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartObject();
-			for (Map.Entry<String, IndexHealthStats> item0 : this.indices.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("initializing_shards");
-		generator.write(this.initializingShards);
-
-		generator.writeKey("number_of_data_nodes");
-		generator.write(this.numberOfDataNodes);
-
-		generator.writeKey("number_of_in_flight_fetch");
-		generator.write(this.numberOfInFlightFetch);
-
-		generator.writeKey("number_of_nodes");
-		generator.write(this.numberOfNodes);
-
-		generator.writeKey("number_of_pending_tasks");
-		generator.write(this.numberOfPendingTasks);
-
-		generator.writeKey("relocating_shards");
-		generator.write(this.relocatingShards);
-
-		generator.writeKey("status");
-		this.status.serialize(generator, mapper);
-		generator.writeKey("task_max_waiting_in_queue_millis");
-		generator.write(this.taskMaxWaitingInQueueMillis);
-
-		generator.writeKey("timed_out");
-		generator.write(this.timedOut);
-
-		generator.writeKey("unassigned_shards");
-		generator.write(this.unassignedShards);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HealthResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HealthResponse> {
-		private Integer activePrimaryShards;
-
-		private Integer activeShards;
-
-		private String activeShardsPercentAsNumber;
-
-		private String clusterName;
-
-		private Integer delayedUnassignedShards;
-
-		@Nullable
-		private Map<String, IndexHealthStats> indices;
-
-		private Integer initializingShards;
-
-		private Integer numberOfDataNodes;
-
-		private Integer numberOfInFlightFetch;
-
-		private Integer numberOfNodes;
-
-		private Integer numberOfPendingTasks;
-
-		private Integer relocatingShards;
-
-		private HealthStatus status;
-
-		private String taskMaxWaitingInQueueMillis;
-
-		private Boolean timedOut;
-
-		private Integer unassignedShards;
-
-		/**
-		 * Required - The number of active primary shards.
-		 * <p>
-		 * API name: {@code active_primary_shards}
-		 */
-		public final Builder activePrimaryShards(int value) {
-			this.activePrimaryShards = value;
-			return this;
-		}
-
-		/**
-		 * Required - The total number of active primary and replica shards.
-		 * <p>
-		 * API name: {@code active_shards}
-		 */
-		public final Builder activeShards(int value) {
-			this.activeShards = value;
-			return this;
-		}
-
-		/**
-		 * Required - The ratio of active shards in the cluster expressed as a
-		 * percentage.
-		 * <p>
-		 * API name: {@code active_shards_percent_as_number}
-		 */
-		public final Builder activeShardsPercentAsNumber(String value) {
-			this.activeShardsPercentAsNumber = value;
-			return this;
-		}
-
-		/**
-		 * Required - The name of the cluster.
-		 * <p>
-		 * API name: {@code cluster_name}
-		 */
-		public final Builder clusterName(String value) {
-			this.clusterName = value;
-			return this;
-		}
-
-		/**
-		 * Required - The number of shards whose allocation has been delayed by the
-		 * timeout settings.
-		 * <p>
-		 * API name: {@code delayed_unassigned_shards}
-		 */
-		public final Builder delayedUnassignedShards(int value) {
-			this.delayedUnassignedShards = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code indices}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>indices</code>.
-		 */
-		public final Builder indices(Map<String, IndexHealthStats> map) {
-			this.indices = _mapPutAll(this.indices, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code indices}
-		 * <p>
-		 * Adds an entry to <code>indices</code>.
-		 */
-		public final Builder indices(String key, IndexHealthStats value) {
-			this.indices = _mapPut(this.indices, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code indices}
-		 * <p>
-		 * Adds an entry to <code>indices</code> using a builder lambda.
-		 */
-		public final Builder indices(String key,
-				Function<IndexHealthStats.Builder, ObjectBuilder<IndexHealthStats>> fn) {
-			return indices(key, fn.apply(new IndexHealthStats.Builder()).build());
-		}
-
-		/**
-		 * Required - The number of shards that are under initialization.
-		 * <p>
-		 * API name: {@code initializing_shards}
-		 */
-		public final Builder initializingShards(int value) {
-			this.initializingShards = value;
-			return this;
-		}
-
-		/**
-		 * Required - The number of nodes that are dedicated data nodes.
-		 * <p>
-		 * API name: {@code number_of_data_nodes}
-		 */
-		public final Builder numberOfDataNodes(int value) {
-			this.numberOfDataNodes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code number_of_in_flight_fetch}
-		 */
-		public final Builder numberOfInFlightFetch(int value) {
-			this.numberOfInFlightFetch = value;
-			return this;
-		}
-
-		/**
-		 * Required - The number of nodes within the cluster.
-		 * <p>
-		 * API name: {@code number_of_nodes}
-		 */
-		public final Builder numberOfNodes(int value) {
-			this.numberOfNodes = value;
-			return this;
-		}
-
-		/**
-		 * Required - The number of cluster-level changes that have not yet been
-		 * executed.
-		 * <p>
-		 * API name: {@code number_of_pending_tasks}
-		 */
-		public final Builder numberOfPendingTasks(int value) {
-			this.numberOfPendingTasks = value;
-			return this;
-		}
-
-		/**
-		 * Required - The number of shards that are under relocation.
-		 * <p>
-		 * API name: {@code relocating_shards}
-		 */
-		public final Builder relocatingShards(int value) {
-			this.relocatingShards = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code status}
-		 */
-		public final Builder status(HealthStatus value) {
-			this.status = value;
-			return this;
-		}
-
-		/**
-		 * Required - The time expressed in milliseconds since the earliest initiated
-		 * task is waiting for being performed.
-		 * <p>
-		 * API name: {@code task_max_waiting_in_queue_millis}
-		 */
-		public final Builder taskMaxWaitingInQueueMillis(String value) {
-			this.taskMaxWaitingInQueueMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - If false the response returned within the period of time that is
-		 * specified by the timeout parameter (30s by default)
-		 * <p>
-		 * API name: {@code timed_out}
-		 */
-		public final Builder timedOut(boolean value) {
-			this.timedOut = value;
-			return this;
-		}
-
-		/**
-		 * Required - The number of shards that are not allocated.
-		 * <p>
-		 * API name: {@code unassigned_shards}
-		 */
-		public final Builder unassignedShards(int value) {
-			this.unassignedShards = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HealthResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HealthResponse build() {
-			_checkSingleUse();
-
-			return new HealthResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HealthResponse}
-	 */
-	public static final JsonpDeserializer<HealthResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			HealthResponse::setupHealthResponseDeserializer);
-
-	protected static void setupHealthResponseDeserializer(ObjectDeserializer<HealthResponse.Builder> op) {
-
-		op.add(Builder::activePrimaryShards, JsonpDeserializer.integerDeserializer(), "active_primary_shards");
-		op.add(Builder::activeShards, JsonpDeserializer.integerDeserializer(), "active_shards");
-		op.add(Builder::activeShardsPercentAsNumber, JsonpDeserializer.stringDeserializer(),
-				"active_shards_percent_as_number");
-		op.add(Builder::clusterName, JsonpDeserializer.stringDeserializer(), "cluster_name");
-		op.add(Builder::delayedUnassignedShards, JsonpDeserializer.integerDeserializer(), "delayed_unassigned_shards");
-		op.add(Builder::indices, JsonpDeserializer.stringMapDeserializer(IndexHealthStats._DESERIALIZER), "indices");
-		op.add(Builder::initializingShards, JsonpDeserializer.integerDeserializer(), "initializing_shards");
-		op.add(Builder::numberOfDataNodes, JsonpDeserializer.integerDeserializer(), "number_of_data_nodes");
-		op.add(Builder::numberOfInFlightFetch, JsonpDeserializer.integerDeserializer(), "number_of_in_flight_fetch");
-		op.add(Builder::numberOfNodes, JsonpDeserializer.integerDeserializer(), "number_of_nodes");
-		op.add(Builder::numberOfPendingTasks, JsonpDeserializer.integerDeserializer(), "number_of_pending_tasks");
-		op.add(Builder::relocatingShards, JsonpDeserializer.integerDeserializer(), "relocating_shards");
-		op.add(Builder::status, HealthStatus._DESERIALIZER, "status");
-		op.add(Builder::taskMaxWaitingInQueueMillis, JsonpDeserializer.stringDeserializer(),
-				"task_max_waiting_in_queue_millis");
-		op.add(Builder::timedOut, JsonpDeserializer.booleanDeserializer(), "timed_out");
-		op.add(Builder::unassignedShards, JsonpDeserializer.integerDeserializer(), "unassigned_shards");
-
-	}
+    private final int activePrimaryShards;
+
+    private final int activeShards;
+
+    private final String activeShardsPercentAsNumber;
+
+    private final String clusterName;
+
+    private final int delayedUnassignedShards;
+
+    private final Map<String, IndexHealthStats> indices;
+
+    private final int initializingShards;
+
+    private final int numberOfDataNodes;
+
+    private final int numberOfInFlightFetch;
+
+    private final int numberOfNodes;
+
+    private final int numberOfPendingTasks;
+
+    private final int relocatingShards;
+
+    private final HealthStatus status;
+
+    private final String taskMaxWaitingInQueueMillis;
+
+    private final boolean timedOut;
+
+    private final int unassignedShards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HealthResponse(Builder builder) {
+
+        this.activePrimaryShards = ApiTypeHelper.requireNonNull(builder.activePrimaryShards, this, "activePrimaryShards");
+        this.activeShards = ApiTypeHelper.requireNonNull(builder.activeShards, this, "activeShards");
+        this.activeShardsPercentAsNumber = ApiTypeHelper.requireNonNull(
+            builder.activeShardsPercentAsNumber,
+            this,
+            "activeShardsPercentAsNumber"
+        );
+        this.clusterName = ApiTypeHelper.requireNonNull(builder.clusterName, this, "clusterName");
+        this.delayedUnassignedShards = ApiTypeHelper.requireNonNull(builder.delayedUnassignedShards, this, "delayedUnassignedShards");
+        this.indices = ApiTypeHelper.unmodifiable(builder.indices);
+        this.initializingShards = ApiTypeHelper.requireNonNull(builder.initializingShards, this, "initializingShards");
+        this.numberOfDataNodes = ApiTypeHelper.requireNonNull(builder.numberOfDataNodes, this, "numberOfDataNodes");
+        this.numberOfInFlightFetch = ApiTypeHelper.requireNonNull(builder.numberOfInFlightFetch, this, "numberOfInFlightFetch");
+        this.numberOfNodes = ApiTypeHelper.requireNonNull(builder.numberOfNodes, this, "numberOfNodes");
+        this.numberOfPendingTasks = ApiTypeHelper.requireNonNull(builder.numberOfPendingTasks, this, "numberOfPendingTasks");
+        this.relocatingShards = ApiTypeHelper.requireNonNull(builder.relocatingShards, this, "relocatingShards");
+        this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
+        this.taskMaxWaitingInQueueMillis = ApiTypeHelper.requireNonNull(
+            builder.taskMaxWaitingInQueueMillis,
+            this,
+            "taskMaxWaitingInQueueMillis"
+        );
+        this.timedOut = ApiTypeHelper.requireNonNull(builder.timedOut, this, "timedOut");
+        this.unassignedShards = ApiTypeHelper.requireNonNull(builder.unassignedShards, this, "unassignedShards");
+
+    }
+
+    public static HealthResponse of(Function<Builder, ObjectBuilder<HealthResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - The number of active primary shards.
+     * <p>
+     * API name: {@code active_primary_shards}
+     */
+    public final int activePrimaryShards() {
+        return this.activePrimaryShards;
+    }
+
+    /**
+     * Required - The total number of active primary and replica shards.
+     * <p>
+     * API name: {@code active_shards}
+     */
+    public final int activeShards() {
+        return this.activeShards;
+    }
+
+    /**
+     * Required - The ratio of active shards in the cluster expressed as a
+     * percentage.
+     * <p>
+     * API name: {@code active_shards_percent_as_number}
+     */
+    public final String activeShardsPercentAsNumber() {
+        return this.activeShardsPercentAsNumber;
+    }
+
+    /**
+     * Required - The name of the cluster.
+     * <p>
+     * API name: {@code cluster_name}
+     */
+    public final String clusterName() {
+        return this.clusterName;
+    }
+
+    /**
+     * Required - The number of shards whose allocation has been delayed by the
+     * timeout settings.
+     * <p>
+     * API name: {@code delayed_unassigned_shards}
+     */
+    public final int delayedUnassignedShards() {
+        return this.delayedUnassignedShards;
+    }
+
+    /**
+     * API name: {@code indices}
+     */
+    public final Map<String, IndexHealthStats> indices() {
+        return this.indices;
+    }
+
+    /**
+     * Required - The number of shards that are under initialization.
+     * <p>
+     * API name: {@code initializing_shards}
+     */
+    public final int initializingShards() {
+        return this.initializingShards;
+    }
+
+    /**
+     * Required - The number of nodes that are dedicated data nodes.
+     * <p>
+     * API name: {@code number_of_data_nodes}
+     */
+    public final int numberOfDataNodes() {
+        return this.numberOfDataNodes;
+    }
+
+    /**
+     * Required - API name: {@code number_of_in_flight_fetch}
+     */
+    public final int numberOfInFlightFetch() {
+        return this.numberOfInFlightFetch;
+    }
+
+    /**
+     * Required - The number of nodes within the cluster.
+     * <p>
+     * API name: {@code number_of_nodes}
+     */
+    public final int numberOfNodes() {
+        return this.numberOfNodes;
+    }
+
+    /**
+     * Required - The number of cluster-level changes that have not yet been
+     * executed.
+     * <p>
+     * API name: {@code number_of_pending_tasks}
+     */
+    public final int numberOfPendingTasks() {
+        return this.numberOfPendingTasks;
+    }
+
+    /**
+     * Required - The number of shards that are under relocation.
+     * <p>
+     * API name: {@code relocating_shards}
+     */
+    public final int relocatingShards() {
+        return this.relocatingShards;
+    }
+
+    /**
+     * Required - API name: {@code status}
+     */
+    public final HealthStatus status() {
+        return this.status;
+    }
+
+    /**
+     * Required - The time expressed in milliseconds since the earliest initiated
+     * task is waiting for being performed.
+     * <p>
+     * API name: {@code task_max_waiting_in_queue_millis}
+     */
+    public final String taskMaxWaitingInQueueMillis() {
+        return this.taskMaxWaitingInQueueMillis;
+    }
+
+    /**
+     * Required - If false the response returned within the period of time that is
+     * specified by the timeout parameter (30s by default)
+     * <p>
+     * API name: {@code timed_out}
+     */
+    public final boolean timedOut() {
+        return this.timedOut;
+    }
+
+    /**
+     * Required - The number of shards that are not allocated.
+     * <p>
+     * API name: {@code unassigned_shards}
+     */
+    public final int unassignedShards() {
+        return this.unassignedShards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("active_primary_shards");
+        generator.write(this.activePrimaryShards);
+
+        generator.writeKey("active_shards");
+        generator.write(this.activeShards);
+
+        generator.writeKey("active_shards_percent_as_number");
+        generator.write(this.activeShardsPercentAsNumber);
+
+        generator.writeKey("cluster_name");
+        generator.write(this.clusterName);
+
+        generator.writeKey("delayed_unassigned_shards");
+        generator.write(this.delayedUnassignedShards);
+
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartObject();
+            for (Map.Entry<String, IndexHealthStats> item0 : this.indices.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("initializing_shards");
+        generator.write(this.initializingShards);
+
+        generator.writeKey("number_of_data_nodes");
+        generator.write(this.numberOfDataNodes);
+
+        generator.writeKey("number_of_in_flight_fetch");
+        generator.write(this.numberOfInFlightFetch);
+
+        generator.writeKey("number_of_nodes");
+        generator.write(this.numberOfNodes);
+
+        generator.writeKey("number_of_pending_tasks");
+        generator.write(this.numberOfPendingTasks);
+
+        generator.writeKey("relocating_shards");
+        generator.write(this.relocatingShards);
+
+        generator.writeKey("status");
+        this.status.serialize(generator, mapper);
+        generator.writeKey("task_max_waiting_in_queue_millis");
+        generator.write(this.taskMaxWaitingInQueueMillis);
+
+        generator.writeKey("timed_out");
+        generator.write(this.timedOut);
+
+        generator.writeKey("unassigned_shards");
+        generator.write(this.unassignedShards);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HealthResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HealthResponse> {
+        private Integer activePrimaryShards;
+
+        private Integer activeShards;
+
+        private String activeShardsPercentAsNumber;
+
+        private String clusterName;
+
+        private Integer delayedUnassignedShards;
+
+        @Nullable
+        private Map<String, IndexHealthStats> indices;
+
+        private Integer initializingShards;
+
+        private Integer numberOfDataNodes;
+
+        private Integer numberOfInFlightFetch;
+
+        private Integer numberOfNodes;
+
+        private Integer numberOfPendingTasks;
+
+        private Integer relocatingShards;
+
+        private HealthStatus status;
+
+        private String taskMaxWaitingInQueueMillis;
+
+        private Boolean timedOut;
+
+        private Integer unassignedShards;
+
+        /**
+         * Required - The number of active primary shards.
+         * <p>
+         * API name: {@code active_primary_shards}
+         */
+        public final Builder activePrimaryShards(int value) {
+            this.activePrimaryShards = value;
+            return this;
+        }
+
+        /**
+         * Required - The total number of active primary and replica shards.
+         * <p>
+         * API name: {@code active_shards}
+         */
+        public final Builder activeShards(int value) {
+            this.activeShards = value;
+            return this;
+        }
+
+        /**
+         * Required - The ratio of active shards in the cluster expressed as a
+         * percentage.
+         * <p>
+         * API name: {@code active_shards_percent_as_number}
+         */
+        public final Builder activeShardsPercentAsNumber(String value) {
+            this.activeShardsPercentAsNumber = value;
+            return this;
+        }
+
+        /**
+         * Required - The name of the cluster.
+         * <p>
+         * API name: {@code cluster_name}
+         */
+        public final Builder clusterName(String value) {
+            this.clusterName = value;
+            return this;
+        }
+
+        /**
+         * Required - The number of shards whose allocation has been delayed by the
+         * timeout settings.
+         * <p>
+         * API name: {@code delayed_unassigned_shards}
+         */
+        public final Builder delayedUnassignedShards(int value) {
+            this.delayedUnassignedShards = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code indices}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>indices</code>.
+         */
+        public final Builder indices(Map<String, IndexHealthStats> map) {
+            this.indices = _mapPutAll(this.indices, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code indices}
+         * <p>
+         * Adds an entry to <code>indices</code>.
+         */
+        public final Builder indices(String key, IndexHealthStats value) {
+            this.indices = _mapPut(this.indices, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code indices}
+         * <p>
+         * Adds an entry to <code>indices</code> using a builder lambda.
+         */
+        public final Builder indices(String key, Function<IndexHealthStats.Builder, ObjectBuilder<IndexHealthStats>> fn) {
+            return indices(key, fn.apply(new IndexHealthStats.Builder()).build());
+        }
+
+        /**
+         * Required - The number of shards that are under initialization.
+         * <p>
+         * API name: {@code initializing_shards}
+         */
+        public final Builder initializingShards(int value) {
+            this.initializingShards = value;
+            return this;
+        }
+
+        /**
+         * Required - The number of nodes that are dedicated data nodes.
+         * <p>
+         * API name: {@code number_of_data_nodes}
+         */
+        public final Builder numberOfDataNodes(int value) {
+            this.numberOfDataNodes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code number_of_in_flight_fetch}
+         */
+        public final Builder numberOfInFlightFetch(int value) {
+            this.numberOfInFlightFetch = value;
+            return this;
+        }
+
+        /**
+         * Required - The number of nodes within the cluster.
+         * <p>
+         * API name: {@code number_of_nodes}
+         */
+        public final Builder numberOfNodes(int value) {
+            this.numberOfNodes = value;
+            return this;
+        }
+
+        /**
+         * Required - The number of cluster-level changes that have not yet been
+         * executed.
+         * <p>
+         * API name: {@code number_of_pending_tasks}
+         */
+        public final Builder numberOfPendingTasks(int value) {
+            this.numberOfPendingTasks = value;
+            return this;
+        }
+
+        /**
+         * Required - The number of shards that are under relocation.
+         * <p>
+         * API name: {@code relocating_shards}
+         */
+        public final Builder relocatingShards(int value) {
+            this.relocatingShards = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code status}
+         */
+        public final Builder status(HealthStatus value) {
+            this.status = value;
+            return this;
+        }
+
+        /**
+         * Required - The time expressed in milliseconds since the earliest initiated
+         * task is waiting for being performed.
+         * <p>
+         * API name: {@code task_max_waiting_in_queue_millis}
+         */
+        public final Builder taskMaxWaitingInQueueMillis(String value) {
+            this.taskMaxWaitingInQueueMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - If false the response returned within the period of time that is
+         * specified by the timeout parameter (30s by default)
+         * <p>
+         * API name: {@code timed_out}
+         */
+        public final Builder timedOut(boolean value) {
+            this.timedOut = value;
+            return this;
+        }
+
+        /**
+         * Required - The number of shards that are not allocated.
+         * <p>
+         * API name: {@code unassigned_shards}
+         */
+        public final Builder unassignedShards(int value) {
+            this.unassignedShards = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link HealthResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HealthResponse build() {
+            _checkSingleUse();
+
+            return new HealthResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HealthResponse}
+     */
+    public static final JsonpDeserializer<HealthResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HealthResponse::setupHealthResponseDeserializer
+    );
+
+    protected static void setupHealthResponseDeserializer(ObjectDeserializer<HealthResponse.Builder> op) {
+
+        op.add(Builder::activePrimaryShards, JsonpDeserializer.integerDeserializer(), "active_primary_shards");
+        op.add(Builder::activeShards, JsonpDeserializer.integerDeserializer(), "active_shards");
+        op.add(Builder::activeShardsPercentAsNumber, JsonpDeserializer.stringDeserializer(), "active_shards_percent_as_number");
+        op.add(Builder::clusterName, JsonpDeserializer.stringDeserializer(), "cluster_name");
+        op.add(Builder::delayedUnassignedShards, JsonpDeserializer.integerDeserializer(), "delayed_unassigned_shards");
+        op.add(Builder::indices, JsonpDeserializer.stringMapDeserializer(IndexHealthStats._DESERIALIZER), "indices");
+        op.add(Builder::initializingShards, JsonpDeserializer.integerDeserializer(), "initializing_shards");
+        op.add(Builder::numberOfDataNodes, JsonpDeserializer.integerDeserializer(), "number_of_data_nodes");
+        op.add(Builder::numberOfInFlightFetch, JsonpDeserializer.integerDeserializer(), "number_of_in_flight_fetch");
+        op.add(Builder::numberOfNodes, JsonpDeserializer.integerDeserializer(), "number_of_nodes");
+        op.add(Builder::numberOfPendingTasks, JsonpDeserializer.integerDeserializer(), "number_of_pending_tasks");
+        op.add(Builder::relocatingShards, JsonpDeserializer.integerDeserializer(), "relocating_shards");
+        op.add(Builder::status, HealthStatus._DESERIALIZER, "status");
+        op.add(Builder::taskMaxWaitingInQueueMillis, JsonpDeserializer.stringDeserializer(), "task_max_waiting_in_queue_millis");
+        op.add(Builder::timedOut, JsonpDeserializer.booleanDeserializer(), "timed_out");
+        op.add(Builder::unassignedShards, JsonpDeserializer.integerDeserializer(), "unassigned_shards");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/OpenSearchClusterAsyncClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/OpenSearchClusterAsyncClient.java
index 8ca8ad1952..30e4ea5117 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/OpenSearchClusterAsyncClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/OpenSearchClusterAsyncClient.java
@@ -32,630 +32,658 @@
 
 package org.opensearch.client.opensearch.cluster;
 
+import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
+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;
-import java.io.IOException;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 /**
  * Client for the cluster namespace.
  */
-public class OpenSearchClusterAsyncClient
-		extends
-			ApiClient<OpenSearchTransport, OpenSearchClusterAsyncClient> {
-
-	public OpenSearchClusterAsyncClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchClusterAsyncClient(OpenSearchTransport transport,
-                                        @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchClusterAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchClusterAsyncClient(this.transport, transportOptions);
-	}
-
-	// ----- Endpoint: cluster.allocation_explain
-
-	/**
-	 * Provides explanations for shard allocations in the cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<AllocationExplainResponse> allocationExplain(AllocationExplainRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<AllocationExplainRequest, AllocationExplainResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<AllocationExplainRequest, AllocationExplainResponse, ErrorResponse>)
-						AllocationExplainRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Provides explanations for shard allocations in the cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link AllocationExplainRequest}
-	 *
-	 */
-
-	public final CompletableFuture<AllocationExplainResponse> allocationExplain(
-			Function<AllocationExplainRequest.Builder, ObjectBuilder<AllocationExplainRequest>> fn)
-			throws IOException, OpenSearchException {
-		return allocationExplain(fn.apply(new AllocationExplainRequest.Builder()).build());
-	}
-
-	/**
-	 * Provides explanations for shard allocations in the cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<AllocationExplainResponse> allocationExplain() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new AllocationExplainRequest.Builder().build(),
-				AllocationExplainRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.delete_component_template
-
-	/**
-	 * Deletes a component template
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<DeleteComponentTemplateResponse> deleteComponentTemplate(
-			DeleteComponentTemplateRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteComponentTemplateRequest, DeleteComponentTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteComponentTemplateRequest, DeleteComponentTemplateResponse, ErrorResponse>)
-						DeleteComponentTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes a component template
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteComponentTemplateRequest}
-	 *
-	 */
-
-	public final CompletableFuture<DeleteComponentTemplateResponse> deleteComponentTemplate(
-			Function<DeleteComponentTemplateRequest.Builder, ObjectBuilder<DeleteComponentTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteComponentTemplate(fn.apply(new DeleteComponentTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: cluster.delete_voting_config_exclusions
-
-	/**
-	 * Clears cluster voting config exclusions.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<BooleanResponse> deleteVotingConfigExclusions(DeleteVotingConfigExclusionsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteVotingConfigExclusionsRequest, BooleanResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteVotingConfigExclusionsRequest, BooleanResponse, ErrorResponse>)
-						DeleteVotingConfigExclusionsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Clears cluster voting config exclusions.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteVotingConfigExclusionsRequest}
-	 *
-	 */
-
-	public final CompletableFuture<BooleanResponse> deleteVotingConfigExclusions(
-			Function<DeleteVotingConfigExclusionsRequest.Builder, ObjectBuilder<DeleteVotingConfigExclusionsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteVotingConfigExclusions(fn.apply(new DeleteVotingConfigExclusionsRequest.Builder()).build());
-	}
-
-	/**
-	 * Clears cluster voting config exclusions.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<BooleanResponse> deleteVotingConfigExclusions()
-			throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new DeleteVotingConfigExclusionsRequest.Builder().build(),
-				DeleteVotingConfigExclusionsRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.exists_component_template
-
-	/**
-	 * Returns information about whether a particular component template exist
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<BooleanResponse> existsComponentTemplate(ExistsComponentTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ExistsComponentTemplateRequest, BooleanResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ExistsComponentTemplateRequest, BooleanResponse, ErrorResponse>)
-						ExistsComponentTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about whether a particular component template exist
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ExistsComponentTemplateRequest}
-	 *
-	 */
-
-	public final CompletableFuture<BooleanResponse> existsComponentTemplate(
-			Function<ExistsComponentTemplateRequest.Builder, ObjectBuilder<ExistsComponentTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return existsComponentTemplate(fn.apply(new ExistsComponentTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: cluster.get_component_template
-
-	/**
-	 * Returns one or more component templates
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetComponentTemplateResponse> getComponentTemplate(GetComponentTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetComponentTemplateRequest, GetComponentTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetComponentTemplateRequest, GetComponentTemplateResponse, ErrorResponse>)
-						GetComponentTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns one or more component templates
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetComponentTemplateRequest}
-	 *
-	 */
-
-	public final CompletableFuture<GetComponentTemplateResponse> getComponentTemplate(
-			Function<GetComponentTemplateRequest.Builder, ObjectBuilder<GetComponentTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getComponentTemplate(fn.apply(new GetComponentTemplateRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns one or more component templates
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetComponentTemplateResponse> getComponentTemplate()
-			throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new GetComponentTemplateRequest.Builder().build(),
-				GetComponentTemplateRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.get_settings
-
-	/**
-	 * Returns cluster settings.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetClusterSettingsResponse> getSettings(GetClusterSettingsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetClusterSettingsRequest, GetClusterSettingsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetClusterSettingsRequest, GetClusterSettingsResponse, ErrorResponse>)
-						GetClusterSettingsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns cluster settings.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetClusterSettingsRequest}
-	 *
-	 */
-
-	public final CompletableFuture<GetClusterSettingsResponse> getSettings(
-			Function<GetClusterSettingsRequest.Builder, ObjectBuilder<GetClusterSettingsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getSettings(fn.apply(new GetClusterSettingsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns cluster settings.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetClusterSettingsResponse> getSettings() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new GetClusterSettingsRequest.Builder().build(),
-				GetClusterSettingsRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.health
-
-	/**
-	 * Returns basic information about the health of the cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<HealthResponse> health(HealthRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<HealthRequest, HealthResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<HealthRequest, HealthResponse, ErrorResponse>) HealthRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns basic information about the health of the cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link HealthRequest}
-	 *
-	 */
-
-	public final CompletableFuture<HealthResponse> health(
-			Function<HealthRequest.Builder, ObjectBuilder<HealthRequest>> fn)
-			throws IOException, OpenSearchException {
-		return health(fn.apply(new HealthRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns basic information about the health of the cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<HealthResponse> health() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new HealthRequest.Builder().build(), HealthRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.pending_tasks
-
-	/**
-	 * Returns a list of any cluster-level changes (e.g. create index, update
-	 * mapping, allocate or fail shard) which have not yet been executed.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<PendingTasksResponse> pendingTasks(PendingTasksRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PendingTasksRequest, PendingTasksResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PendingTasksRequest, PendingTasksResponse, ErrorResponse>) PendingTasksRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns a list of any cluster-level changes (e.g. create index, update
-	 * mapping, allocate or fail shard) which have not yet been executed.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PendingTasksRequest}
-	 *
-	 */
-
-	public final CompletableFuture<PendingTasksResponse> pendingTasks(
-			Function<PendingTasksRequest.Builder, ObjectBuilder<PendingTasksRequest>> fn)
-			throws IOException, OpenSearchException {
-		return pendingTasks(fn.apply(new PendingTasksRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns a list of any cluster-level changes (e.g. create index, update
-	 * mapping, allocate or fail shard) which have not yet been executed.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<PendingTasksResponse> pendingTasks() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new PendingTasksRequest.Builder().build(),
-				PendingTasksRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.post_voting_config_exclusions
-
-	/**
-	 * Updates the cluster voting config exclusions by node ids or node names.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<BooleanResponse> postVotingConfigExclusions(PostVotingConfigExclusionsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PostVotingConfigExclusionsRequest, BooleanResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PostVotingConfigExclusionsRequest, BooleanResponse, ErrorResponse>)
-						PostVotingConfigExclusionsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Updates the cluster voting config exclusions by node ids or node names.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PostVotingConfigExclusionsRequest}
-	 *
-	 */
-
-	public final CompletableFuture<BooleanResponse> postVotingConfigExclusions(
-			Function<PostVotingConfigExclusionsRequest.Builder, ObjectBuilder<PostVotingConfigExclusionsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return postVotingConfigExclusions(fn.apply(new PostVotingConfigExclusionsRequest.Builder()).build());
-	}
-
-	/**
-	 * Updates the cluster voting config exclusions by node ids or node names.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<BooleanResponse> postVotingConfigExclusions() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new PostVotingConfigExclusionsRequest.Builder().build(),
-				PostVotingConfigExclusionsRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.put_component_template
-
-	/**
-	 * Creates or updates a component template
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<PutComponentTemplateResponse> putComponentTemplate(PutComponentTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutComponentTemplateRequest, PutComponentTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutComponentTemplateRequest, PutComponentTemplateResponse, ErrorResponse>)
-						PutComponentTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates or updates a component template
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutComponentTemplateRequest}
-	 *
-	 */
-
-	public final CompletableFuture<PutComponentTemplateResponse> putComponentTemplate(
-			Function<PutComponentTemplateRequest.Builder, ObjectBuilder<PutComponentTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putComponentTemplate(fn.apply(new PutComponentTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: cluster.put_settings
-
-	/**
-	 * Updates the cluster settings.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<PutClusterSettingsResponse> putSettings(PutClusterSettingsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutClusterSettingsRequest, PutClusterSettingsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutClusterSettingsRequest, PutClusterSettingsResponse, ErrorResponse>)
-						PutClusterSettingsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Updates the cluster settings.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutClusterSettingsRequest}
-	 *
-	 */
-
-	public final CompletableFuture<PutClusterSettingsResponse> putSettings(
-			Function<PutClusterSettingsRequest.Builder, ObjectBuilder<PutClusterSettingsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putSettings(fn.apply(new PutClusterSettingsRequest.Builder()).build());
-	}
-
-	/**
-	 * Updates the cluster settings.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<PutClusterSettingsResponse> putSettings() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new PutClusterSettingsRequest.Builder().build(),
-				PutClusterSettingsRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.remote_info
-
-	/**
-	 * Returns the information about configured remote clusters.
-	 * 
-	 *
-	 */
-	public CompletableFuture<RemoteInfoResponse> remoteInfo() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(RemoteInfoRequest._INSTANCE, RemoteInfoRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.reroute
-
-	/**
-	 * Allows to manually change the allocation of individual shards in the cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<RerouteResponse> reroute(RerouteRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<RerouteRequest, RerouteResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<RerouteRequest, RerouteResponse, ErrorResponse>) RerouteRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to manually change the allocation of individual shards in the cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link RerouteRequest}
-	 *
-	 */
-
-	public final CompletableFuture<RerouteResponse> reroute(
-			Function<RerouteRequest.Builder, ObjectBuilder<RerouteRequest>> fn)
-			throws IOException, OpenSearchException {
-		return reroute(fn.apply(new RerouteRequest.Builder()).build());
-	}
-
-	/**
-	 * Allows to manually change the allocation of individual shards in the cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<RerouteResponse> reroute() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new RerouteRequest.Builder().build(), RerouteRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.state
-
-	/**
-	 * Returns a comprehensive information about the state of the cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<StateResponse> state(StateRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<StateRequest, StateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<StateRequest, StateResponse, ErrorResponse>) StateRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns a comprehensive information about the state of the cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link StateRequest}
-	 *
-	 */
-
-	public final CompletableFuture<StateResponse> state(Function<StateRequest.Builder, ObjectBuilder<StateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return state(fn.apply(new StateRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns a comprehensive information about the state of the cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<StateResponse> state() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new StateRequest.Builder().build(), StateRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.stats
-
-	/**
-	 * Returns high-level overview of cluster statistics.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ClusterStatsResponse> stats(ClusterStatsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ClusterStatsRequest, ClusterStatsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ClusterStatsRequest, ClusterStatsResponse, ErrorResponse>) ClusterStatsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns high-level overview of cluster statistics.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ClusterStatsRequest}
-	 *
-	 */
-
-	public final CompletableFuture<ClusterStatsResponse> stats(
-			Function<ClusterStatsRequest.Builder, ObjectBuilder<ClusterStatsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return stats(fn.apply(new ClusterStatsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns high-level overview of cluster statistics.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ClusterStatsResponse> stats() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new ClusterStatsRequest.Builder().build(),
-				ClusterStatsRequest._ENDPOINT, this.transportOptions);
-	}
+public class OpenSearchClusterAsyncClient extends ApiClient<OpenSearchTransport, OpenSearchClusterAsyncClient> {
+
+    public OpenSearchClusterAsyncClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchClusterAsyncClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchClusterAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchClusterAsyncClient(this.transport, transportOptions);
+    }
+
+    // ----- Endpoint: cluster.allocation_explain
+
+    /**
+     * Provides explanations for shard allocations in the cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<AllocationExplainResponse> allocationExplain(AllocationExplainRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<AllocationExplainRequest, AllocationExplainResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            AllocationExplainRequest,
+            AllocationExplainResponse,
+            ErrorResponse>) AllocationExplainRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Provides explanations for shard allocations in the cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link AllocationExplainRequest}
+     *
+     */
+
+    public final CompletableFuture<AllocationExplainResponse> allocationExplain(
+        Function<AllocationExplainRequest.Builder, ObjectBuilder<AllocationExplainRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return allocationExplain(fn.apply(new AllocationExplainRequest.Builder()).build());
+    }
+
+    /**
+     * Provides explanations for shard allocations in the cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<AllocationExplainResponse> allocationExplain() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new AllocationExplainRequest.Builder().build(),
+            AllocationExplainRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cluster.delete_component_template
+
+    /**
+     * Deletes a component template
+     *
+     *
+     */
+
+    public CompletableFuture<DeleteComponentTemplateResponse> deleteComponentTemplate(DeleteComponentTemplateRequest request)
+        throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteComponentTemplateRequest, DeleteComponentTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteComponentTemplateRequest,
+            DeleteComponentTemplateResponse,
+            ErrorResponse>) DeleteComponentTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes a component template
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteComponentTemplateRequest}
+     *
+     */
+
+    public final CompletableFuture<DeleteComponentTemplateResponse> deleteComponentTemplate(
+        Function<DeleteComponentTemplateRequest.Builder, ObjectBuilder<DeleteComponentTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deleteComponentTemplate(fn.apply(new DeleteComponentTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: cluster.delete_voting_config_exclusions
+
+    /**
+     * Clears cluster voting config exclusions.
+     *
+     *
+     */
+
+    public CompletableFuture<BooleanResponse> deleteVotingConfigExclusions(DeleteVotingConfigExclusionsRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteVotingConfigExclusionsRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteVotingConfigExclusionsRequest,
+            BooleanResponse,
+            ErrorResponse>) DeleteVotingConfigExclusionsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Clears cluster voting config exclusions.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteVotingConfigExclusionsRequest}
+     *
+     */
+
+    public final CompletableFuture<BooleanResponse> deleteVotingConfigExclusions(
+        Function<DeleteVotingConfigExclusionsRequest.Builder, ObjectBuilder<DeleteVotingConfigExclusionsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deleteVotingConfigExclusions(fn.apply(new DeleteVotingConfigExclusionsRequest.Builder()).build());
+    }
+
+    /**
+     * Clears cluster voting config exclusions.
+     *
+     *
+     */
+
+    public CompletableFuture<BooleanResponse> deleteVotingConfigExclusions() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new DeleteVotingConfigExclusionsRequest.Builder().build(),
+            DeleteVotingConfigExclusionsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cluster.exists_component_template
+
+    /**
+     * Returns information about whether a particular component template exist
+     *
+     *
+     */
+
+    public CompletableFuture<BooleanResponse> existsComponentTemplate(ExistsComponentTemplateRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ExistsComponentTemplateRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ExistsComponentTemplateRequest,
+            BooleanResponse,
+            ErrorResponse>) ExistsComponentTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about whether a particular component template exist
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ExistsComponentTemplateRequest}
+     *
+     */
+
+    public final CompletableFuture<BooleanResponse> existsComponentTemplate(
+        Function<ExistsComponentTemplateRequest.Builder, ObjectBuilder<ExistsComponentTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return existsComponentTemplate(fn.apply(new ExistsComponentTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: cluster.get_component_template
+
+    /**
+     * Returns one or more component templates
+     *
+     *
+     */
+
+    public CompletableFuture<GetComponentTemplateResponse> getComponentTemplate(GetComponentTemplateRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetComponentTemplateRequest, GetComponentTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetComponentTemplateRequest,
+            GetComponentTemplateResponse,
+            ErrorResponse>) GetComponentTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns one or more component templates
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetComponentTemplateRequest}
+     *
+     */
+
+    public final CompletableFuture<GetComponentTemplateResponse> getComponentTemplate(
+        Function<GetComponentTemplateRequest.Builder, ObjectBuilder<GetComponentTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return getComponentTemplate(fn.apply(new GetComponentTemplateRequest.Builder()).build());
+    }
+
+    /**
+     * Returns one or more component templates
+     *
+     *
+     */
+
+    public CompletableFuture<GetComponentTemplateResponse> getComponentTemplate() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new GetComponentTemplateRequest.Builder().build(),
+            GetComponentTemplateRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cluster.get_settings
+
+    /**
+     * Returns cluster settings.
+     *
+     *
+     */
+
+    public CompletableFuture<GetClusterSettingsResponse> getSettings(GetClusterSettingsRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetClusterSettingsRequest, GetClusterSettingsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetClusterSettingsRequest,
+            GetClusterSettingsResponse,
+            ErrorResponse>) GetClusterSettingsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns cluster settings.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetClusterSettingsRequest}
+     *
+     */
+
+    public final CompletableFuture<GetClusterSettingsResponse> getSettings(
+        Function<GetClusterSettingsRequest.Builder, ObjectBuilder<GetClusterSettingsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return getSettings(fn.apply(new GetClusterSettingsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns cluster settings.
+     *
+     *
+     */
+
+    public CompletableFuture<GetClusterSettingsResponse> getSettings() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new GetClusterSettingsRequest.Builder().build(),
+            GetClusterSettingsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cluster.health
+
+    /**
+     * Returns basic information about the health of the cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<HealthResponse> health(HealthRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<HealthRequest, HealthResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            HealthRequest,
+            HealthResponse,
+            ErrorResponse>) HealthRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns basic information about the health of the cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link HealthRequest}
+     *
+     */
+
+    public final CompletableFuture<HealthResponse> health(Function<HealthRequest.Builder, ObjectBuilder<HealthRequest>> fn)
+        throws IOException, OpenSearchException {
+        return health(fn.apply(new HealthRequest.Builder()).build());
+    }
+
+    /**
+     * Returns basic information about the health of the cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<HealthResponse> health() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new HealthRequest.Builder().build(), HealthRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cluster.pending_tasks
+
+    /**
+     * Returns a list of any cluster-level changes (e.g. create index, update
+     * mapping, allocate or fail shard) which have not yet been executed.
+     *
+     *
+     */
+
+    public CompletableFuture<PendingTasksResponse> pendingTasks(PendingTasksRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PendingTasksRequest, PendingTasksResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PendingTasksRequest,
+            PendingTasksResponse,
+            ErrorResponse>) PendingTasksRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns a list of any cluster-level changes (e.g. create index, update
+     * mapping, allocate or fail shard) which have not yet been executed.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PendingTasksRequest}
+     *
+     */
+
+    public final CompletableFuture<PendingTasksResponse> pendingTasks(
+        Function<PendingTasksRequest.Builder, ObjectBuilder<PendingTasksRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return pendingTasks(fn.apply(new PendingTasksRequest.Builder()).build());
+    }
+
+    /**
+     * Returns a list of any cluster-level changes (e.g. create index, update
+     * mapping, allocate or fail shard) which have not yet been executed.
+     *
+     *
+     */
+
+    public CompletableFuture<PendingTasksResponse> pendingTasks() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new PendingTasksRequest.Builder().build(),
+            PendingTasksRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cluster.post_voting_config_exclusions
+
+    /**
+     * Updates the cluster voting config exclusions by node ids or node names.
+     *
+     *
+     */
+
+    public CompletableFuture<BooleanResponse> postVotingConfigExclusions(PostVotingConfigExclusionsRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PostVotingConfigExclusionsRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PostVotingConfigExclusionsRequest,
+            BooleanResponse,
+            ErrorResponse>) PostVotingConfigExclusionsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Updates the cluster voting config exclusions by node ids or node names.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PostVotingConfigExclusionsRequest}
+     *
+     */
+
+    public final CompletableFuture<BooleanResponse> postVotingConfigExclusions(
+        Function<PostVotingConfigExclusionsRequest.Builder, ObjectBuilder<PostVotingConfigExclusionsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return postVotingConfigExclusions(fn.apply(new PostVotingConfigExclusionsRequest.Builder()).build());
+    }
+
+    /**
+     * Updates the cluster voting config exclusions by node ids or node names.
+     *
+     *
+     */
+
+    public CompletableFuture<BooleanResponse> postVotingConfigExclusions() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new PostVotingConfigExclusionsRequest.Builder().build(),
+            PostVotingConfigExclusionsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cluster.put_component_template
+
+    /**
+     * Creates or updates a component template
+     *
+     *
+     */
+
+    public CompletableFuture<PutComponentTemplateResponse> putComponentTemplate(PutComponentTemplateRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutComponentTemplateRequest, PutComponentTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutComponentTemplateRequest,
+            PutComponentTemplateResponse,
+            ErrorResponse>) PutComponentTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates or updates a component template
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutComponentTemplateRequest}
+     *
+     */
+
+    public final CompletableFuture<PutComponentTemplateResponse> putComponentTemplate(
+        Function<PutComponentTemplateRequest.Builder, ObjectBuilder<PutComponentTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return putComponentTemplate(fn.apply(new PutComponentTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: cluster.put_settings
+
+    /**
+     * Updates the cluster settings.
+     *
+     *
+     */
+
+    public CompletableFuture<PutClusterSettingsResponse> putSettings(PutClusterSettingsRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutClusterSettingsRequest, PutClusterSettingsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutClusterSettingsRequest,
+            PutClusterSettingsResponse,
+            ErrorResponse>) PutClusterSettingsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Updates the cluster settings.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutClusterSettingsRequest}
+     *
+     */
+
+    public final CompletableFuture<PutClusterSettingsResponse> putSettings(
+        Function<PutClusterSettingsRequest.Builder, ObjectBuilder<PutClusterSettingsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return putSettings(fn.apply(new PutClusterSettingsRequest.Builder()).build());
+    }
+
+    /**
+     * Updates the cluster settings.
+     *
+     *
+     */
+
+    public CompletableFuture<PutClusterSettingsResponse> putSettings() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new PutClusterSettingsRequest.Builder().build(),
+            PutClusterSettingsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cluster.remote_info
+
+    /**
+     * Returns the information about configured remote clusters.
+     *
+     *
+     */
+    public CompletableFuture<RemoteInfoResponse> remoteInfo() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(RemoteInfoRequest._INSTANCE, RemoteInfoRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cluster.reroute
+
+    /**
+     * Allows to manually change the allocation of individual shards in the cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<RerouteResponse> reroute(RerouteRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<RerouteRequest, RerouteResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            RerouteRequest,
+            RerouteResponse,
+            ErrorResponse>) RerouteRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to manually change the allocation of individual shards in the cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link RerouteRequest}
+     *
+     */
+
+    public final CompletableFuture<RerouteResponse> reroute(Function<RerouteRequest.Builder, ObjectBuilder<RerouteRequest>> fn)
+        throws IOException, OpenSearchException {
+        return reroute(fn.apply(new RerouteRequest.Builder()).build());
+    }
+
+    /**
+     * Allows to manually change the allocation of individual shards in the cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<RerouteResponse> reroute() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new RerouteRequest.Builder().build(), RerouteRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cluster.state
+
+    /**
+     * Returns a comprehensive information about the state of the cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<StateResponse> state(StateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<StateRequest, StateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            StateRequest,
+            StateResponse,
+            ErrorResponse>) StateRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns a comprehensive information about the state of the cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link StateRequest}
+     *
+     */
+
+    public final CompletableFuture<StateResponse> state(Function<StateRequest.Builder, ObjectBuilder<StateRequest>> fn) throws IOException,
+        OpenSearchException {
+        return state(fn.apply(new StateRequest.Builder()).build());
+    }
+
+    /**
+     * Returns a comprehensive information about the state of the cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<StateResponse> state() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new StateRequest.Builder().build(), StateRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cluster.stats
+
+    /**
+     * Returns high-level overview of cluster statistics.
+     *
+     *
+     */
+
+    public CompletableFuture<ClusterStatsResponse> stats(ClusterStatsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ClusterStatsRequest, ClusterStatsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ClusterStatsRequest,
+            ClusterStatsResponse,
+            ErrorResponse>) ClusterStatsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns high-level overview of cluster statistics.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ClusterStatsRequest}
+     *
+     */
+
+    public final CompletableFuture<ClusterStatsResponse> stats(Function<ClusterStatsRequest.Builder, ObjectBuilder<ClusterStatsRequest>> fn)
+        throws IOException, OpenSearchException {
+        return stats(fn.apply(new ClusterStatsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns high-level overview of cluster statistics.
+     *
+     *
+     */
+
+    public CompletableFuture<ClusterStatsResponse> stats() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new ClusterStatsRequest.Builder().build(),
+            ClusterStatsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/OpenSearchClusterClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/OpenSearchClusterClient.java
index 4ff203e947..1b1efae0ad 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/OpenSearchClusterClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/OpenSearchClusterClient.java
@@ -32,619 +32,649 @@
 
 package org.opensearch.client.opensearch.cluster;
 
+import java.io.IOException;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
+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;
-import java.io.IOException;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 /**
  * Client for the cluster namespace.
  */
 public class OpenSearchClusterClient extends ApiClient<OpenSearchTransport, OpenSearchClusterClient> {
 
-	public OpenSearchClusterClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchClusterClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchClusterClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchClusterClient(this.transport, transportOptions);
-	}
-
-	// ----- Endpoint: cluster.allocation_explain
-
-	/**
-	 * Provides explanations for shard allocations in the cluster.
-	 * 
-	 *
-	 */
-
-	public AllocationExplainResponse allocationExplain(AllocationExplainRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<AllocationExplainRequest, AllocationExplainResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<AllocationExplainRequest, AllocationExplainResponse, ErrorResponse>)
-						AllocationExplainRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Provides explanations for shard allocations in the cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link AllocationExplainRequest}
-	 *
-	 */
-
-	public final AllocationExplainResponse allocationExplain(
-			Function<AllocationExplainRequest.Builder, ObjectBuilder<AllocationExplainRequest>> fn)
-			throws IOException, OpenSearchException {
-		return allocationExplain(fn.apply(new AllocationExplainRequest.Builder()).build());
-	}
-
-	/**
-	 * Provides explanations for shard allocations in the cluster.
-	 * 
-	 *
-	 */
-
-	public AllocationExplainResponse allocationExplain() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new AllocationExplainRequest.Builder().build(),
-				AllocationExplainRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.delete_component_template
-
-	/**
-	 * Deletes a component template
-	 * 
-	 *
-	 */
-
-	public DeleteComponentTemplateResponse deleteComponentTemplate(DeleteComponentTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteComponentTemplateRequest, DeleteComponentTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteComponentTemplateRequest, DeleteComponentTemplateResponse, ErrorResponse>)
-						DeleteComponentTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes a component template
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteComponentTemplateRequest}
-	 *
-	 */
-
-	public final DeleteComponentTemplateResponse deleteComponentTemplate(
-			Function<DeleteComponentTemplateRequest.Builder, ObjectBuilder<DeleteComponentTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteComponentTemplate(fn.apply(new DeleteComponentTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: cluster.delete_voting_config_exclusions
-
-	/**
-	 * Clears cluster voting config exclusions.
-	 * 
-	 *
-	 */
-
-	public BooleanResponse deleteVotingConfigExclusions(DeleteVotingConfigExclusionsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteVotingConfigExclusionsRequest, BooleanResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteVotingConfigExclusionsRequest, BooleanResponse, ErrorResponse>)
-						DeleteVotingConfigExclusionsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Clears cluster voting config exclusions.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteVotingConfigExclusionsRequest}
-	 *
-	 */
-
-	public final BooleanResponse deleteVotingConfigExclusions(
-			Function<DeleteVotingConfigExclusionsRequest.Builder, ObjectBuilder<DeleteVotingConfigExclusionsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteVotingConfigExclusions(fn.apply(new DeleteVotingConfigExclusionsRequest.Builder()).build());
-	}
-
-	/**
-	 * Clears cluster voting config exclusions.
-	 * 
-	 *
-	 */
-
-	public BooleanResponse deleteVotingConfigExclusions() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new DeleteVotingConfigExclusionsRequest.Builder().build(),
-				DeleteVotingConfigExclusionsRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.exists_component_template
-
-	/**
-	 * Returns information about whether a particular component template exist
-	 * 
-	 *
-	 */
-
-	public BooleanResponse existsComponentTemplate(ExistsComponentTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ExistsComponentTemplateRequest, BooleanResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ExistsComponentTemplateRequest, BooleanResponse, ErrorResponse>)
-						ExistsComponentTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about whether a particular component template exist
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ExistsComponentTemplateRequest}
-	 *
-	 */
-
-	public final BooleanResponse existsComponentTemplate(
-			Function<ExistsComponentTemplateRequest.Builder, ObjectBuilder<ExistsComponentTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return existsComponentTemplate(fn.apply(new ExistsComponentTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: cluster.get_component_template
-
-	/**
-	 * Returns one or more component templates
-	 * 
-	 *
-	 */
-
-	public GetComponentTemplateResponse getComponentTemplate(GetComponentTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetComponentTemplateRequest, GetComponentTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetComponentTemplateRequest, GetComponentTemplateResponse, ErrorResponse>)
-						GetComponentTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns one or more component templates
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetComponentTemplateRequest}
-	 *
-	 */
-
-	public final GetComponentTemplateResponse getComponentTemplate(
-			Function<GetComponentTemplateRequest.Builder, ObjectBuilder<GetComponentTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getComponentTemplate(fn.apply(new GetComponentTemplateRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns one or more component templates
-	 * 
-	 *
-	 */
-
-	public GetComponentTemplateResponse getComponentTemplate() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new GetComponentTemplateRequest.Builder().build(),
-				GetComponentTemplateRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.get_settings
-
-	/**
-	 * Returns cluster settings.
-	 * 
-	 *
-	 */
-
-	public GetClusterSettingsResponse getSettings(GetClusterSettingsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetClusterSettingsRequest, GetClusterSettingsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetClusterSettingsRequest, GetClusterSettingsResponse, ErrorResponse>)
-						GetClusterSettingsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns cluster settings.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetClusterSettingsRequest}
-	 *
-	 */
-
-	public final GetClusterSettingsResponse getSettings(
-			Function<GetClusterSettingsRequest.Builder, ObjectBuilder<GetClusterSettingsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getSettings(fn.apply(new GetClusterSettingsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns cluster settings.
-	 * 
-	 *
-	 */
-
-	public GetClusterSettingsResponse getSettings() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new GetClusterSettingsRequest.Builder().build(),
-				GetClusterSettingsRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.health
-
-	/**
-	 * Returns basic information about the health of the cluster.
-	 * 
-	 *
-	 */
-
-	public HealthResponse health(HealthRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<HealthRequest, HealthResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<HealthRequest, HealthResponse, ErrorResponse>) HealthRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns basic information about the health of the cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link HealthRequest}
-	 *
-	 */
-
-	public final HealthResponse health(Function<HealthRequest.Builder, ObjectBuilder<HealthRequest>> fn)
-			throws IOException, OpenSearchException {
-		return health(fn.apply(new HealthRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns basic information about the health of the cluster.
-	 * 
-	 *
-	 */
-
-	public HealthResponse health() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new HealthRequest.Builder().build(), HealthRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.pending_tasks
-
-	/**
-	 * Returns a list of any cluster-level changes (e.g. create index, update
-	 * mapping, allocate or fail shard) which have not yet been executed.
-	 * 
-	 *
-	 */
-
-	public PendingTasksResponse pendingTasks(PendingTasksRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PendingTasksRequest, PendingTasksResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PendingTasksRequest, PendingTasksResponse, ErrorResponse>) PendingTasksRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns a list of any cluster-level changes (e.g. create index, update
-	 * mapping, allocate or fail shard) which have not yet been executed.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PendingTasksRequest}
-	 *
-	 */
-
-	public final PendingTasksResponse pendingTasks(
-			Function<PendingTasksRequest.Builder, ObjectBuilder<PendingTasksRequest>> fn)
-			throws IOException, OpenSearchException {
-		return pendingTasks(fn.apply(new PendingTasksRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns a list of any cluster-level changes (e.g. create index, update
-	 * mapping, allocate or fail shard) which have not yet been executed.
-	 * 
-	 *
-	 */
-
-	public PendingTasksResponse pendingTasks() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new PendingTasksRequest.Builder().build(), PendingTasksRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.post_voting_config_exclusions
-
-	/**
-	 * Updates the cluster voting config exclusions by node ids or node names.
-	 * 
-	 *
-	 */
-
-	public BooleanResponse postVotingConfigExclusions(PostVotingConfigExclusionsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PostVotingConfigExclusionsRequest, BooleanResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PostVotingConfigExclusionsRequest, BooleanResponse, ErrorResponse>)
-						PostVotingConfigExclusionsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Updates the cluster voting config exclusions by node ids or node names.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PostVotingConfigExclusionsRequest}
-	 *
-	 */
-
-	public final BooleanResponse postVotingConfigExclusions(
-			Function<PostVotingConfigExclusionsRequest.Builder, ObjectBuilder<PostVotingConfigExclusionsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return postVotingConfigExclusions(fn.apply(new PostVotingConfigExclusionsRequest.Builder()).build());
-	}
-
-	/**
-	 * Updates the cluster voting config exclusions by node ids or node names.
-	 * 
-	 *
-	 */
-
-	public BooleanResponse postVotingConfigExclusions() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new PostVotingConfigExclusionsRequest.Builder().build(),
-				PostVotingConfigExclusionsRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.put_component_template
-
-	/**
-	 * Creates or updates a component template
-	 * 
-	 *
-	 */
-
-	public PutComponentTemplateResponse putComponentTemplate(PutComponentTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutComponentTemplateRequest, PutComponentTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutComponentTemplateRequest, PutComponentTemplateResponse, ErrorResponse>)
-						PutComponentTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates or updates a component template
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutComponentTemplateRequest}
-	 *
-	 */
-
-	public final PutComponentTemplateResponse putComponentTemplate(
-			Function<PutComponentTemplateRequest.Builder, ObjectBuilder<PutComponentTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putComponentTemplate(fn.apply(new PutComponentTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: cluster.put_settings
-
-	/**
-	 * Updates the cluster settings.
-	 * 
-	 *
-	 */
-
-	public PutClusterSettingsResponse putSettings(PutClusterSettingsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutClusterSettingsRequest, PutClusterSettingsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutClusterSettingsRequest, PutClusterSettingsResponse, ErrorResponse>)
-						PutClusterSettingsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Updates the cluster settings.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutClusterSettingsRequest}
-	 *
-	 */
-
-	public final PutClusterSettingsResponse putSettings(
-			Function<PutClusterSettingsRequest.Builder, ObjectBuilder<PutClusterSettingsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putSettings(fn.apply(new PutClusterSettingsRequest.Builder()).build());
-	}
-
-	/**
-	 * Updates the cluster settings.
-	 * 
-	 *
-	 */
-
-	public PutClusterSettingsResponse putSettings() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new PutClusterSettingsRequest.Builder().build(),
-				PutClusterSettingsRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.remote_info
-
-	/**
-	 * Returns the information about configured remote clusters.
-	 * 
-	 *
-	 */
-	public RemoteInfoResponse remoteInfo() throws IOException, OpenSearchException {
-		return this.transport.performRequest(RemoteInfoRequest._INSTANCE, RemoteInfoRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.reroute
-
-	/**
-	 * Allows to manually change the allocation of individual shards in the cluster.
-	 * 
-	 *
-	 */
-
-	public RerouteResponse reroute(RerouteRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<RerouteRequest, RerouteResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<RerouteRequest, RerouteResponse, ErrorResponse>) RerouteRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to manually change the allocation of individual shards in the cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link RerouteRequest}
-	 *
-	 */
-
-	public final RerouteResponse reroute(Function<RerouteRequest.Builder, ObjectBuilder<RerouteRequest>> fn)
-			throws IOException, OpenSearchException {
-		return reroute(fn.apply(new RerouteRequest.Builder()).build());
-	}
-
-	/**
-	 * Allows to manually change the allocation of individual shards in the cluster.
-	 * 
-	 *
-	 */
-
-	public RerouteResponse reroute() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new RerouteRequest.Builder().build(), RerouteRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.state
-
-	/**
-	 * Returns a comprehensive information about the state of the cluster.
-	 * 
-	 *
-	 */
-
-	public StateResponse state(StateRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<StateRequest, StateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<StateRequest, StateResponse, ErrorResponse>) StateRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns a comprehensive information about the state of the cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link StateRequest}
-	 *
-	 */
-
-	public final StateResponse state(Function<StateRequest.Builder, ObjectBuilder<StateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return state(fn.apply(new StateRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns a comprehensive information about the state of the cluster.
-	 * 
-	 *
-	 */
-
-	public StateResponse state() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new StateRequest.Builder().build(), StateRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: cluster.stats
-
-	/**
-	 * Returns high-level overview of cluster statistics.
-	 * 
-	 *
-	 */
-
-	public ClusterStatsResponse stats(ClusterStatsRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ClusterStatsRequest, ClusterStatsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ClusterStatsRequest, ClusterStatsResponse, ErrorResponse>) ClusterStatsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns high-level overview of cluster statistics.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ClusterStatsRequest}
-	 *
-	 */
-
-	public final ClusterStatsResponse stats(
-			Function<ClusterStatsRequest.Builder, ObjectBuilder<ClusterStatsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return stats(fn.apply(new ClusterStatsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns high-level overview of cluster statistics.
-	 * 
-	 *
-	 */
-
-	public ClusterStatsResponse stats() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new ClusterStatsRequest.Builder().build(), ClusterStatsRequest._ENDPOINT,
-				this.transportOptions);
-	}
+    public OpenSearchClusterClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchClusterClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchClusterClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchClusterClient(this.transport, transportOptions);
+    }
+
+    // ----- Endpoint: cluster.allocation_explain
+
+    /**
+     * Provides explanations for shard allocations in the cluster.
+     *
+     *
+     */
+
+    public AllocationExplainResponse allocationExplain(AllocationExplainRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<AllocationExplainRequest, AllocationExplainResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            AllocationExplainRequest,
+            AllocationExplainResponse,
+            ErrorResponse>) AllocationExplainRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Provides explanations for shard allocations in the cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link AllocationExplainRequest}
+     *
+     */
+
+    public final AllocationExplainResponse allocationExplain(
+        Function<AllocationExplainRequest.Builder, ObjectBuilder<AllocationExplainRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return allocationExplain(fn.apply(new AllocationExplainRequest.Builder()).build());
+    }
+
+    /**
+     * Provides explanations for shard allocations in the cluster.
+     *
+     *
+     */
+
+    public AllocationExplainResponse allocationExplain() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new AllocationExplainRequest.Builder().build(),
+            AllocationExplainRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cluster.delete_component_template
+
+    /**
+     * Deletes a component template
+     *
+     *
+     */
+
+    public DeleteComponentTemplateResponse deleteComponentTemplate(DeleteComponentTemplateRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteComponentTemplateRequest, DeleteComponentTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteComponentTemplateRequest,
+            DeleteComponentTemplateResponse,
+            ErrorResponse>) DeleteComponentTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes a component template
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteComponentTemplateRequest}
+     *
+     */
+
+    public final DeleteComponentTemplateResponse deleteComponentTemplate(
+        Function<DeleteComponentTemplateRequest.Builder, ObjectBuilder<DeleteComponentTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deleteComponentTemplate(fn.apply(new DeleteComponentTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: cluster.delete_voting_config_exclusions
+
+    /**
+     * Clears cluster voting config exclusions.
+     *
+     *
+     */
+
+    public BooleanResponse deleteVotingConfigExclusions(DeleteVotingConfigExclusionsRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteVotingConfigExclusionsRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteVotingConfigExclusionsRequest,
+            BooleanResponse,
+            ErrorResponse>) DeleteVotingConfigExclusionsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Clears cluster voting config exclusions.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteVotingConfigExclusionsRequest}
+     *
+     */
+
+    public final BooleanResponse deleteVotingConfigExclusions(
+        Function<DeleteVotingConfigExclusionsRequest.Builder, ObjectBuilder<DeleteVotingConfigExclusionsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deleteVotingConfigExclusions(fn.apply(new DeleteVotingConfigExclusionsRequest.Builder()).build());
+    }
+
+    /**
+     * Clears cluster voting config exclusions.
+     *
+     *
+     */
+
+    public BooleanResponse deleteVotingConfigExclusions() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new DeleteVotingConfigExclusionsRequest.Builder().build(),
+            DeleteVotingConfigExclusionsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cluster.exists_component_template
+
+    /**
+     * Returns information about whether a particular component template exist
+     *
+     *
+     */
+
+    public BooleanResponse existsComponentTemplate(ExistsComponentTemplateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ExistsComponentTemplateRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ExistsComponentTemplateRequest,
+            BooleanResponse,
+            ErrorResponse>) ExistsComponentTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about whether a particular component template exist
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ExistsComponentTemplateRequest}
+     *
+     */
+
+    public final BooleanResponse existsComponentTemplate(
+        Function<ExistsComponentTemplateRequest.Builder, ObjectBuilder<ExistsComponentTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return existsComponentTemplate(fn.apply(new ExistsComponentTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: cluster.get_component_template
+
+    /**
+     * Returns one or more component templates
+     *
+     *
+     */
+
+    public GetComponentTemplateResponse getComponentTemplate(GetComponentTemplateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetComponentTemplateRequest, GetComponentTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetComponentTemplateRequest,
+            GetComponentTemplateResponse,
+            ErrorResponse>) GetComponentTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns one or more component templates
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetComponentTemplateRequest}
+     *
+     */
+
+    public final GetComponentTemplateResponse getComponentTemplate(
+        Function<GetComponentTemplateRequest.Builder, ObjectBuilder<GetComponentTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return getComponentTemplate(fn.apply(new GetComponentTemplateRequest.Builder()).build());
+    }
+
+    /**
+     * Returns one or more component templates
+     *
+     *
+     */
+
+    public GetComponentTemplateResponse getComponentTemplate() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new GetComponentTemplateRequest.Builder().build(),
+            GetComponentTemplateRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cluster.get_settings
+
+    /**
+     * Returns cluster settings.
+     *
+     *
+     */
+
+    public GetClusterSettingsResponse getSettings(GetClusterSettingsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetClusterSettingsRequest, GetClusterSettingsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetClusterSettingsRequest,
+            GetClusterSettingsResponse,
+            ErrorResponse>) GetClusterSettingsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns cluster settings.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetClusterSettingsRequest}
+     *
+     */
+
+    public final GetClusterSettingsResponse getSettings(
+        Function<GetClusterSettingsRequest.Builder, ObjectBuilder<GetClusterSettingsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return getSettings(fn.apply(new GetClusterSettingsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns cluster settings.
+     *
+     *
+     */
+
+    public GetClusterSettingsResponse getSettings() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new GetClusterSettingsRequest.Builder().build(),
+            GetClusterSettingsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cluster.health
+
+    /**
+     * Returns basic information about the health of the cluster.
+     *
+     *
+     */
+
+    public HealthResponse health(HealthRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<HealthRequest, HealthResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            HealthRequest,
+            HealthResponse,
+            ErrorResponse>) HealthRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns basic information about the health of the cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link HealthRequest}
+     *
+     */
+
+    public final HealthResponse health(Function<HealthRequest.Builder, ObjectBuilder<HealthRequest>> fn) throws IOException,
+        OpenSearchException {
+        return health(fn.apply(new HealthRequest.Builder()).build());
+    }
+
+    /**
+     * Returns basic information about the health of the cluster.
+     *
+     *
+     */
+
+    public HealthResponse health() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new HealthRequest.Builder().build(), HealthRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cluster.pending_tasks
+
+    /**
+     * Returns a list of any cluster-level changes (e.g. create index, update
+     * mapping, allocate or fail shard) which have not yet been executed.
+     *
+     *
+     */
+
+    public PendingTasksResponse pendingTasks(PendingTasksRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PendingTasksRequest, PendingTasksResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PendingTasksRequest,
+            PendingTasksResponse,
+            ErrorResponse>) PendingTasksRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns a list of any cluster-level changes (e.g. create index, update
+     * mapping, allocate or fail shard) which have not yet been executed.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PendingTasksRequest}
+     *
+     */
+
+    public final PendingTasksResponse pendingTasks(Function<PendingTasksRequest.Builder, ObjectBuilder<PendingTasksRequest>> fn)
+        throws IOException, OpenSearchException {
+        return pendingTasks(fn.apply(new PendingTasksRequest.Builder()).build());
+    }
+
+    /**
+     * Returns a list of any cluster-level changes (e.g. create index, update
+     * mapping, allocate or fail shard) which have not yet been executed.
+     *
+     *
+     */
+
+    public PendingTasksResponse pendingTasks() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new PendingTasksRequest.Builder().build(),
+            PendingTasksRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cluster.post_voting_config_exclusions
+
+    /**
+     * Updates the cluster voting config exclusions by node ids or node names.
+     *
+     *
+     */
+
+    public BooleanResponse postVotingConfigExclusions(PostVotingConfigExclusionsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PostVotingConfigExclusionsRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PostVotingConfigExclusionsRequest,
+            BooleanResponse,
+            ErrorResponse>) PostVotingConfigExclusionsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Updates the cluster voting config exclusions by node ids or node names.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PostVotingConfigExclusionsRequest}
+     *
+     */
+
+    public final BooleanResponse postVotingConfigExclusions(
+        Function<PostVotingConfigExclusionsRequest.Builder, ObjectBuilder<PostVotingConfigExclusionsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return postVotingConfigExclusions(fn.apply(new PostVotingConfigExclusionsRequest.Builder()).build());
+    }
+
+    /**
+     * Updates the cluster voting config exclusions by node ids or node names.
+     *
+     *
+     */
+
+    public BooleanResponse postVotingConfigExclusions() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new PostVotingConfigExclusionsRequest.Builder().build(),
+            PostVotingConfigExclusionsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cluster.put_component_template
+
+    /**
+     * Creates or updates a component template
+     *
+     *
+     */
+
+    public PutComponentTemplateResponse putComponentTemplate(PutComponentTemplateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutComponentTemplateRequest, PutComponentTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutComponentTemplateRequest,
+            PutComponentTemplateResponse,
+            ErrorResponse>) PutComponentTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates or updates a component template
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutComponentTemplateRequest}
+     *
+     */
+
+    public final PutComponentTemplateResponse putComponentTemplate(
+        Function<PutComponentTemplateRequest.Builder, ObjectBuilder<PutComponentTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return putComponentTemplate(fn.apply(new PutComponentTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: cluster.put_settings
+
+    /**
+     * Updates the cluster settings.
+     *
+     *
+     */
+
+    public PutClusterSettingsResponse putSettings(PutClusterSettingsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutClusterSettingsRequest, PutClusterSettingsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutClusterSettingsRequest,
+            PutClusterSettingsResponse,
+            ErrorResponse>) PutClusterSettingsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Updates the cluster settings.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutClusterSettingsRequest}
+     *
+     */
+
+    public final PutClusterSettingsResponse putSettings(
+        Function<PutClusterSettingsRequest.Builder, ObjectBuilder<PutClusterSettingsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return putSettings(fn.apply(new PutClusterSettingsRequest.Builder()).build());
+    }
+
+    /**
+     * Updates the cluster settings.
+     *
+     *
+     */
+
+    public PutClusterSettingsResponse putSettings() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new PutClusterSettingsRequest.Builder().build(),
+            PutClusterSettingsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: cluster.remote_info
+
+    /**
+     * Returns the information about configured remote clusters.
+     *
+     *
+     */
+    public RemoteInfoResponse remoteInfo() throws IOException, OpenSearchException {
+        return this.transport.performRequest(RemoteInfoRequest._INSTANCE, RemoteInfoRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cluster.reroute
+
+    /**
+     * Allows to manually change the allocation of individual shards in the cluster.
+     *
+     *
+     */
+
+    public RerouteResponse reroute(RerouteRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<RerouteRequest, RerouteResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            RerouteRequest,
+            RerouteResponse,
+            ErrorResponse>) RerouteRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to manually change the allocation of individual shards in the cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link RerouteRequest}
+     *
+     */
+
+    public final RerouteResponse reroute(Function<RerouteRequest.Builder, ObjectBuilder<RerouteRequest>> fn) throws IOException,
+        OpenSearchException {
+        return reroute(fn.apply(new RerouteRequest.Builder()).build());
+    }
+
+    /**
+     * Allows to manually change the allocation of individual shards in the cluster.
+     *
+     *
+     */
+
+    public RerouteResponse reroute() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new RerouteRequest.Builder().build(), RerouteRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cluster.state
+
+    /**
+     * Returns a comprehensive information about the state of the cluster.
+     *
+     *
+     */
+
+    public StateResponse state(StateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<StateRequest, StateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            StateRequest,
+            StateResponse,
+            ErrorResponse>) StateRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns a comprehensive information about the state of the cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link StateRequest}
+     *
+     */
+
+    public final StateResponse state(Function<StateRequest.Builder, ObjectBuilder<StateRequest>> fn) throws IOException,
+        OpenSearchException {
+        return state(fn.apply(new StateRequest.Builder()).build());
+    }
+
+    /**
+     * Returns a comprehensive information about the state of the cluster.
+     *
+     *
+     */
+
+    public StateResponse state() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new StateRequest.Builder().build(), StateRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: cluster.stats
+
+    /**
+     * Returns high-level overview of cluster statistics.
+     *
+     *
+     */
+
+    public ClusterStatsResponse stats(ClusterStatsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ClusterStatsRequest, ClusterStatsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ClusterStatsRequest,
+            ClusterStatsResponse,
+            ErrorResponse>) ClusterStatsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns high-level overview of cluster statistics.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ClusterStatsRequest}
+     *
+     */
+
+    public final ClusterStatsResponse stats(Function<ClusterStatsRequest.Builder, ObjectBuilder<ClusterStatsRequest>> fn)
+        throws IOException, OpenSearchException {
+        return stats(fn.apply(new ClusterStatsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns high-level overview of cluster statistics.
+     *
+     *
+     */
+
+    public ClusterStatsResponse stats() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new ClusterStatsRequest.Builder().build(),
+            ClusterStatsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PendingTasksRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PendingTasksRequest.java
index 33474b3c9a..de314848c5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PendingTasksRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PendingTasksRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.cluster;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -40,189 +44,188 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: cluster.pending_tasks.Request
 
 /**
  * Returns a list of any cluster-level changes (e.g. create index, update
  * mapping, allocate or fail shard) which have not yet been executed.
- * 
+ *
  */
 
 public class PendingTasksRequest extends RequestBase {
-	@Nullable
-	private final Boolean local;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PendingTasksRequest(Builder builder) {
-
-		this.local = builder.local;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-
-	}
-
-	public static PendingTasksRequest of(Function<Builder, ObjectBuilder<PendingTasksRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Return local information, do not retrieve the state from cluster-manager node
-	 * (default: false)
-	 * <p>
-	 * API name: {@code local}
-	 */
-	@Nullable
-	public final Boolean local() {
-		return this.local;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PendingTasksRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PendingTasksRequest> {
-		@Nullable
-		private Boolean local;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		/**
-		 * Return local information, do not retrieve the state from cluster-manager node
-		 * (default: false)
-		 * <p>
-		 * API name: {@code local}
-		 */
-		public final Builder local(@Nullable Boolean value) {
-			this.local = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link PendingTasksRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PendingTasksRequest build() {
-			_checkSingleUse();
-
-			return new PendingTasksRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cluster.pending_tasks}".
-	 */
-	public static final Endpoint<PendingTasksRequest, PendingTasksResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				return "/_cluster/pending_tasks";
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.local != null) {
-					params.put("local", String.valueOf(request.local));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, PendingTasksResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean local;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PendingTasksRequest(Builder builder) {
+
+        this.local = builder.local;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+
+    }
+
+    public static PendingTasksRequest of(Function<Builder, ObjectBuilder<PendingTasksRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Return local information, do not retrieve the state from cluster-manager node
+     * (default: false)
+     * <p>
+     * API name: {@code local}
+     */
+    @Nullable
+    public final Boolean local() {
+        return this.local;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PendingTasksRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PendingTasksRequest> {
+        @Nullable
+        private Boolean local;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        /**
+         * Return local information, do not retrieve the state from cluster-manager node
+         * (default: false)
+         * <p>
+         * API name: {@code local}
+         */
+        public final Builder local(@Nullable Boolean value) {
+            this.local = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link PendingTasksRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PendingTasksRequest build() {
+            _checkSingleUse();
+
+            return new PendingTasksRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cluster.pending_tasks}".
+     */
+    public static final Endpoint<PendingTasksRequest, PendingTasksResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            return "/_cluster/pending_tasks";
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.local != null) {
+                params.put("local", String.valueOf(request.local));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        PendingTasksResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PendingTasksResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PendingTasksResponse.java
index d1a1a23aae..a30967162a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PendingTasksResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PendingTasksResponse.java
@@ -32,133 +32,134 @@
 
 package org.opensearch.client.opensearch.cluster;
 
-import org.opensearch.client.opensearch.cluster.pending_tasks.PendingTask;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.cluster.pending_tasks.PendingTask;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cluster.pending_tasks.Response
 
 @JsonpDeserializable
 public class PendingTasksResponse implements JsonpSerializable {
-	private final List<PendingTask> tasks;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PendingTasksResponse(Builder builder) {
-
-		this.tasks = ApiTypeHelper.unmodifiableRequired(builder.tasks, this, "tasks");
-
-	}
-
-	public static PendingTasksResponse of(Function<Builder, ObjectBuilder<PendingTasksResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code tasks}
-	 */
-	public final List<PendingTask> tasks() {
-		return this.tasks;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.tasks)) {
-			generator.writeKey("tasks");
-			generator.writeStartArray();
-			for (PendingTask item0 : this.tasks) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PendingTasksResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PendingTasksResponse> {
-		private List<PendingTask> tasks;
-
-		/**
-		 * Required - API name: {@code tasks}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>tasks</code>.
-		 */
-		public final Builder tasks(List<PendingTask> list) {
-			this.tasks = _listAddAll(this.tasks, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tasks}
-		 * <p>
-		 * Adds one or more values to <code>tasks</code>.
-		 */
-		public final Builder tasks(PendingTask value, PendingTask... values) {
-			this.tasks = _listAdd(this.tasks, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tasks}
-		 * <p>
-		 * Adds a value to <code>tasks</code> using a builder lambda.
-		 */
-		public final Builder tasks(Function<PendingTask.Builder, ObjectBuilder<PendingTask>> fn) {
-			return tasks(fn.apply(new PendingTask.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link PendingTasksResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PendingTasksResponse build() {
-			_checkSingleUse();
-
-			return new PendingTasksResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PendingTasksResponse}
-	 */
-	public static final JsonpDeserializer<PendingTasksResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PendingTasksResponse::setupPendingTasksResponseDeserializer);
-
-	protected static void setupPendingTasksResponseDeserializer(ObjectDeserializer<PendingTasksResponse.Builder> op) {
-
-		op.add(Builder::tasks, JsonpDeserializer.arrayDeserializer(PendingTask._DESERIALIZER), "tasks");
-
-	}
+    private final List<PendingTask> tasks;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PendingTasksResponse(Builder builder) {
+
+        this.tasks = ApiTypeHelper.unmodifiableRequired(builder.tasks, this, "tasks");
+
+    }
+
+    public static PendingTasksResponse of(Function<Builder, ObjectBuilder<PendingTasksResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code tasks}
+     */
+    public final List<PendingTask> tasks() {
+        return this.tasks;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.tasks)) {
+            generator.writeKey("tasks");
+            generator.writeStartArray();
+            for (PendingTask item0 : this.tasks) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PendingTasksResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PendingTasksResponse> {
+        private List<PendingTask> tasks;
+
+        /**
+         * Required - API name: {@code tasks}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>tasks</code>.
+         */
+        public final Builder tasks(List<PendingTask> list) {
+            this.tasks = _listAddAll(this.tasks, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tasks}
+         * <p>
+         * Adds one or more values to <code>tasks</code>.
+         */
+        public final Builder tasks(PendingTask value, PendingTask... values) {
+            this.tasks = _listAdd(this.tasks, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tasks}
+         * <p>
+         * Adds a value to <code>tasks</code> using a builder lambda.
+         */
+        public final Builder tasks(Function<PendingTask.Builder, ObjectBuilder<PendingTask>> fn) {
+            return tasks(fn.apply(new PendingTask.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link PendingTasksResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PendingTasksResponse build() {
+            _checkSingleUse();
+
+            return new PendingTasksResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PendingTasksResponse}
+     */
+    public static final JsonpDeserializer<PendingTasksResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PendingTasksResponse::setupPendingTasksResponseDeserializer
+    );
+
+    protected static void setupPendingTasksResponseDeserializer(ObjectDeserializer<PendingTasksResponse.Builder> op) {
+
+        op.add(Builder::tasks, JsonpDeserializer.arrayDeserializer(PendingTask._DESERIALIZER), "tasks");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PostVotingConfigExclusionsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PostVotingConfigExclusionsRequest.java
index ba54777114..7aa47b4bdf 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PostVotingConfigExclusionsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PostVotingConfigExclusionsRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.cluster;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -43,215 +49,211 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: cluster.post_voting_config_exclusions.Request
 
 /**
  * Updates the cluster voting config exclusions by node ids or node names.
- * 
+ *
  */
 
 public class PostVotingConfigExclusionsRequest extends RequestBase {
-	private final List<String> nodeIds;
-
-	private final List<String> nodeNames;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PostVotingConfigExclusionsRequest(Builder builder) {
-
-		this.nodeIds = ApiTypeHelper.unmodifiable(builder.nodeIds);
-		this.nodeNames = ApiTypeHelper.unmodifiable(builder.nodeNames);
-		this.timeout = builder.timeout;
-
-	}
-
-	public static PostVotingConfigExclusionsRequest of(
-			Function<Builder, ObjectBuilder<PostVotingConfigExclusionsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * A comma-separated list of the persistent ids of the nodes to exclude from the
-	 * voting configuration. If specified, you may not also specify node_names.
-	 * <p>
-	 * API name: {@code node_ids}
-	 */
-	public final List<String> nodeIds() {
-		return this.nodeIds;
-	}
-
-	/**
-	 * A comma-separated list of the names of the nodes to exclude from the voting
-	 * configuration. If specified, you may not also specify node_ids.
-	 * <p>
-	 * API name: {@code node_names}
-	 */
-	public final List<String> nodeNames() {
-		return this.nodeNames;
-	}
-
-	/**
-	 * When adding a voting configuration exclusion, the API waits for the specified
-	 * nodes to be excluded from the voting configuration before returning. If the
-	 * timeout expires before the appropriate condition is satisfied, the request
-	 * fails and returns an error.
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PostVotingConfigExclusionsRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PostVotingConfigExclusionsRequest> {
-		@Nullable
-		private List<String> nodeIds;
-
-		@Nullable
-		private List<String> nodeNames;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * A comma-separated list of the persistent ids of the nodes to exclude from the
-		 * voting configuration. If specified, you may not also specify node_names.
-		 * <p>
-		 * API name: {@code node_ids}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>nodeIds</code>.
-		 */
-		public final Builder nodeIds(List<String> list) {
-			this.nodeIds = _listAddAll(this.nodeIds, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of the persistent ids of the nodes to exclude from the
-		 * voting configuration. If specified, you may not also specify node_names.
-		 * <p>
-		 * API name: {@code node_ids}
-		 * <p>
-		 * Adds one or more values to <code>nodeIds</code>.
-		 */
-		public final Builder nodeIds(String value, String... values) {
-			this.nodeIds = _listAdd(this.nodeIds, value, values);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of the names of the nodes to exclude from the voting
-		 * configuration. If specified, you may not also specify node_ids.
-		 * <p>
-		 * API name: {@code node_names}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>nodeNames</code>.
-		 */
-		public final Builder nodeNames(List<String> list) {
-			this.nodeNames = _listAddAll(this.nodeNames, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of the names of the nodes to exclude from the voting
-		 * configuration. If specified, you may not also specify node_ids.
-		 * <p>
-		 * API name: {@code node_names}
-		 * <p>
-		 * Adds one or more values to <code>nodeNames</code>.
-		 */
-		public final Builder nodeNames(String value, String... values) {
-			this.nodeNames = _listAdd(this.nodeNames, value, values);
-			return this;
-		}
-
-		/**
-		 * When adding a voting configuration exclusion, the API waits for the specified
-		 * nodes to be excluded from the voting configuration before returning. If the
-		 * timeout expires before the appropriate condition is satisfied, the request
-		 * fails and returns an error.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * When adding a voting configuration exclusion, the API waits for the specified
-		 * nodes to be excluded from the voting configuration before returning. If the
-		 * timeout expires before the appropriate condition is satisfied, the request
-		 * fails and returns an error.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link PostVotingConfigExclusionsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PostVotingConfigExclusionsRequest build() {
-			_checkSingleUse();
-
-			return new PostVotingConfigExclusionsRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cluster.post_voting_config_exclusions}".
-	 */
-	public static final Endpoint<PostVotingConfigExclusionsRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
-			"opensearch/cluster.post_voting_config_exclusions",
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				return "/_cluster/voting_config_exclusions";
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (ApiTypeHelper.isDefined(request.nodeNames)) {
-					params.put("node_names", request.nodeNames.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (ApiTypeHelper.isDefined(request.nodeIds)) {
-					params.put("node_ids", request.nodeIds.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, null);
+    private final List<String> nodeIds;
+
+    private final List<String> nodeNames;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PostVotingConfigExclusionsRequest(Builder builder) {
+
+        this.nodeIds = ApiTypeHelper.unmodifiable(builder.nodeIds);
+        this.nodeNames = ApiTypeHelper.unmodifiable(builder.nodeNames);
+        this.timeout = builder.timeout;
+
+    }
+
+    public static PostVotingConfigExclusionsRequest of(Function<Builder, ObjectBuilder<PostVotingConfigExclusionsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * A comma-separated list of the persistent ids of the nodes to exclude from the
+     * voting configuration. If specified, you may not also specify node_names.
+     * <p>
+     * API name: {@code node_ids}
+     */
+    public final List<String> nodeIds() {
+        return this.nodeIds;
+    }
+
+    /**
+     * A comma-separated list of the names of the nodes to exclude from the voting
+     * configuration. If specified, you may not also specify node_ids.
+     * <p>
+     * API name: {@code node_names}
+     */
+    public final List<String> nodeNames() {
+        return this.nodeNames;
+    }
+
+    /**
+     * When adding a voting configuration exclusion, the API waits for the specified
+     * nodes to be excluded from the voting configuration before returning. If the
+     * timeout expires before the appropriate condition is satisfied, the request
+     * fails and returns an error.
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PostVotingConfigExclusionsRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PostVotingConfigExclusionsRequest> {
+        @Nullable
+        private List<String> nodeIds;
+
+        @Nullable
+        private List<String> nodeNames;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * A comma-separated list of the persistent ids of the nodes to exclude from the
+         * voting configuration. If specified, you may not also specify node_names.
+         * <p>
+         * API name: {@code node_ids}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>nodeIds</code>.
+         */
+        public final Builder nodeIds(List<String> list) {
+            this.nodeIds = _listAddAll(this.nodeIds, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of the persistent ids of the nodes to exclude from the
+         * voting configuration. If specified, you may not also specify node_names.
+         * <p>
+         * API name: {@code node_ids}
+         * <p>
+         * Adds one or more values to <code>nodeIds</code>.
+         */
+        public final Builder nodeIds(String value, String... values) {
+            this.nodeIds = _listAdd(this.nodeIds, value, values);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of the names of the nodes to exclude from the voting
+         * configuration. If specified, you may not also specify node_ids.
+         * <p>
+         * API name: {@code node_names}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>nodeNames</code>.
+         */
+        public final Builder nodeNames(List<String> list) {
+            this.nodeNames = _listAddAll(this.nodeNames, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of the names of the nodes to exclude from the voting
+         * configuration. If specified, you may not also specify node_ids.
+         * <p>
+         * API name: {@code node_names}
+         * <p>
+         * Adds one or more values to <code>nodeNames</code>.
+         */
+        public final Builder nodeNames(String value, String... values) {
+            this.nodeNames = _listAdd(this.nodeNames, value, values);
+            return this;
+        }
+
+        /**
+         * When adding a voting configuration exclusion, the API waits for the specified
+         * nodes to be excluded from the voting configuration before returning. If the
+         * timeout expires before the appropriate condition is satisfied, the request
+         * fails and returns an error.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * When adding a voting configuration exclusion, the API waits for the specified
+         * nodes to be excluded from the voting configuration before returning. If the
+         * timeout expires before the appropriate condition is satisfied, the request
+         * fails and returns an error.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link PostVotingConfigExclusionsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PostVotingConfigExclusionsRequest build() {
+            _checkSingleUse();
+
+            return new PostVotingConfigExclusionsRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cluster.post_voting_config_exclusions}".
+     */
+    public static final Endpoint<PostVotingConfigExclusionsRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
+        "opensearch/cluster.post_voting_config_exclusions",
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            return "/_cluster/voting_config_exclusions";
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (ApiTypeHelper.isDefined(request.nodeNames)) {
+                params.put("node_names", request.nodeNames.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (ApiTypeHelper.isDefined(request.nodeIds)) {
+                params.put("node_ids", request.nodeIds.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        null
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PostVotingConfigExclusionsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PostVotingConfigExclusionsResponse.java
index 52d2e68bca..0e20b8132e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PostVotingConfigExclusionsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PostVotingConfigExclusionsResponse.java
@@ -36,17 +36,16 @@
 
 // typedef: cluster.post_voting_config_exclusions.Response
 
-
 public class PostVotingConfigExclusionsResponse {
-	public PostVotingConfigExclusionsResponse() {
-	}
+    public PostVotingConfigExclusionsResponse() {}
 
-	/**
-	 * Singleton instance for {@link PostVotingConfigExclusionsResponse}.
-	 */
-	public static final PostVotingConfigExclusionsResponse _INSTANCE = new PostVotingConfigExclusionsResponse();
+    /**
+     * Singleton instance for {@link PostVotingConfigExclusionsResponse}.
+     */
+    public static final PostVotingConfigExclusionsResponse _INSTANCE = new PostVotingConfigExclusionsResponse();
 
-	public static final JsonpDeserializer<PostVotingConfigExclusionsResponse> _DESERIALIZER = JsonpDeserializer
-			.fixedValue(PostVotingConfigExclusionsResponse._INSTANCE);
+    public static final JsonpDeserializer<PostVotingConfigExclusionsResponse> _DESERIALIZER = JsonpDeserializer.fixedValue(
+        PostVotingConfigExclusionsResponse._INSTANCE
+    );
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PutClusterSettingsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PutClusterSettingsRequest.java
index 0af5d69451..7ddcaed934 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PutClusterSettingsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PutClusterSettingsRequest.java
@@ -32,9 +32,11 @@
 
 package org.opensearch.client.opensearch.cluster;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,347 +44,350 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+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.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.put_settings.Request
 
 /**
  * Updates the cluster settings.
- * 
+ *
  */
 @JsonpDeserializable
 public class PutClusterSettingsRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final Boolean flatSettings;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final Map<String, JsonData> persistent;
-
-	@Nullable
-	private final Time timeout;
-
-	private final Map<String, JsonData> transient_;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PutClusterSettingsRequest(Builder builder) {
-
-		this.flatSettings = builder.flatSettings;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.persistent = ApiTypeHelper.unmodifiable(builder.persistent);
-		this.timeout = builder.timeout;
-		this.transient_ = ApiTypeHelper.unmodifiable(builder.transient_);
-
-	}
-
-	public static PutClusterSettingsRequest of(Function<Builder, ObjectBuilder<PutClusterSettingsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Return settings in flat format (default: false)
-	 * <p>
-	 * API name: {@code flat_settings}
-	 */
-	@Nullable
-	public final Boolean flatSettings() {
-		return this.flatSettings;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to master node
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to cluster-manager node
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * API name: {@code persistent}
-	 */
-	public final Map<String, JsonData> persistent() {
-		return this.persistent;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * API name: {@code transient}
-	 */
-	public final Map<String, JsonData> transient_() {
-		return this.transient_;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.persistent)) {
-			generator.writeKey("persistent");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.persistent.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.transient_)) {
-			generator.writeKey("transient");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.transient_.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PutClusterSettingsRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutClusterSettingsRequest> {
-		@Nullable
-		private Boolean flatSettings;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Map<String, JsonData> persistent;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private Map<String, JsonData> transient_;
-
-		/**
-		 * Return settings in flat format (default: false)
-		 * <p>
-		 * API name: {@code flat_settings}
-		 */
-		public final Builder flatSettings(@Nullable Boolean value) {
-			this.flatSettings = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code persistent}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>persistent</code>.
-		 */
-		public final Builder persistent(Map<String, JsonData> map) {
-			this.persistent = _mapPutAll(this.persistent, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code persistent}
-		 * <p>
-		 * Adds an entry to <code>persistent</code>.
-		 */
-		public final Builder persistent(String key, JsonData value) {
-			this.persistent = _mapPut(this.persistent, key, value);
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code transient}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>transient_</code>.
-		 */
-		public final Builder transient_(Map<String, JsonData> map) {
-			this.transient_ = _mapPutAll(this.transient_, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code transient}
-		 * <p>
-		 * Adds an entry to <code>transient_</code>.
-		 */
-		public final Builder transient_(String key, JsonData value) {
-			this.transient_ = _mapPut(this.transient_, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PutClusterSettingsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutClusterSettingsRequest build() {
-			_checkSingleUse();
-
-			return new PutClusterSettingsRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PutClusterSettingsRequest}
-	 */
-	public static final JsonpDeserializer<PutClusterSettingsRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PutClusterSettingsRequest::setupPutClusterSettingsRequestDeserializer);
-
-	protected static void setupPutClusterSettingsRequestDeserializer(
-			ObjectDeserializer<PutClusterSettingsRequest.Builder> op) {
-
-		op.add(Builder::persistent, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "persistent");
-		op.add(Builder::transient_, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "transient");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cluster.put_settings}".
-	 */
-	public static final Endpoint<PutClusterSettingsRequest, PutClusterSettingsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "PUT";
-
-			},
-
-			// Request path
-			request -> {
-				return "/_cluster/settings";
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.flatSettings != null) {
-					params.put("flat_settings", String.valueOf(request.flatSettings));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, PutClusterSettingsResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean flatSettings;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final Map<String, JsonData> persistent;
+
+    @Nullable
+    private final Time timeout;
+
+    private final Map<String, JsonData> transient_;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PutClusterSettingsRequest(Builder builder) {
+
+        this.flatSettings = builder.flatSettings;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.persistent = ApiTypeHelper.unmodifiable(builder.persistent);
+        this.timeout = builder.timeout;
+        this.transient_ = ApiTypeHelper.unmodifiable(builder.transient_);
+
+    }
+
+    public static PutClusterSettingsRequest of(Function<Builder, ObjectBuilder<PutClusterSettingsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Return settings in flat format (default: false)
+     * <p>
+     * API name: {@code flat_settings}
+     */
+    @Nullable
+    public final Boolean flatSettings() {
+        return this.flatSettings;
+    }
+
+    /**
+     * Explicit operation timeout for connection to master node
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Explicit operation timeout for connection to cluster-manager node
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * API name: {@code persistent}
+     */
+    public final Map<String, JsonData> persistent() {
+        return this.persistent;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * API name: {@code transient}
+     */
+    public final Map<String, JsonData> transient_() {
+        return this.transient_;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.persistent)) {
+            generator.writeKey("persistent");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.persistent.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.transient_)) {
+            generator.writeKey("transient");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.transient_.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PutClusterSettingsRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutClusterSettingsRequest> {
+        @Nullable
+        private Boolean flatSettings;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Map<String, JsonData> persistent;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private Map<String, JsonData> transient_;
+
+        /**
+         * Return settings in flat format (default: false)
+         * <p>
+         * API name: {@code flat_settings}
+         */
+        public final Builder flatSettings(@Nullable Boolean value) {
+            this.flatSettings = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code persistent}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>persistent</code>.
+         */
+        public final Builder persistent(Map<String, JsonData> map) {
+            this.persistent = _mapPutAll(this.persistent, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code persistent}
+         * <p>
+         * Adds an entry to <code>persistent</code>.
+         */
+        public final Builder persistent(String key, JsonData value) {
+            this.persistent = _mapPut(this.persistent, key, value);
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code transient}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>transient_</code>.
+         */
+        public final Builder transient_(Map<String, JsonData> map) {
+            this.transient_ = _mapPutAll(this.transient_, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code transient}
+         * <p>
+         * Adds an entry to <code>transient_</code>.
+         */
+        public final Builder transient_(String key, JsonData value) {
+            this.transient_ = _mapPut(this.transient_, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link PutClusterSettingsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutClusterSettingsRequest build() {
+            _checkSingleUse();
+
+            return new PutClusterSettingsRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PutClusterSettingsRequest}
+     */
+    public static final JsonpDeserializer<PutClusterSettingsRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PutClusterSettingsRequest::setupPutClusterSettingsRequestDeserializer
+    );
+
+    protected static void setupPutClusterSettingsRequestDeserializer(ObjectDeserializer<PutClusterSettingsRequest.Builder> op) {
+
+        op.add(Builder::persistent, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "persistent");
+        op.add(Builder::transient_, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "transient");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cluster.put_settings}".
+     */
+    public static final Endpoint<PutClusterSettingsRequest, PutClusterSettingsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "PUT";
+
+        },
+
+        // Request path
+        request -> {
+            return "/_cluster/settings";
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.flatSettings != null) {
+                params.put("flat_settings", String.valueOf(request.flatSettings));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        PutClusterSettingsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PutClusterSettingsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PutClusterSettingsResponse.java
index 62c7e979b5..5527a0a956 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PutClusterSettingsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PutClusterSettingsResponse.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cluster;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,183 +45,181 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: cluster.put_settings.Response
 
 @JsonpDeserializable
 public class PutClusterSettingsResponse implements JsonpSerializable {
-	private final boolean acknowledged;
+    private final boolean acknowledged;
 
-	private final Map<String, JsonData> persistent;
+    private final Map<String, JsonData> persistent;
 
-	private final Map<String, JsonData> transient_;
+    private final Map<String, JsonData> transient_;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private PutClusterSettingsResponse(Builder builder) {
-
-		this.acknowledged = ApiTypeHelper.requireNonNull(builder.acknowledged, this, "acknowledged");
-		this.persistent = ApiTypeHelper.unmodifiableRequired(builder.persistent, this, "persistent");
-		this.transient_ = ApiTypeHelper.unmodifiableRequired(builder.transient_, this, "transient_");
-
-	}
-
-	public static PutClusterSettingsResponse of(Function<Builder, ObjectBuilder<PutClusterSettingsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code acknowledged}
-	 */
-	public final boolean acknowledged() {
-		return this.acknowledged;
-	}
-
-	/**
-	 * Required - API name: {@code persistent}
-	 */
-	public final Map<String, JsonData> persistent() {
-		return this.persistent;
-	}
-
-	/**
-	 * Required - API name: {@code transient}
-	 */
-	public final Map<String, JsonData> transient_() {
-		return this.transient_;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("acknowledged");
-		generator.write(this.acknowledged);
-
-		if (ApiTypeHelper.isDefined(this.persistent)) {
-			generator.writeKey("persistent");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.persistent.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.transient_)) {
-			generator.writeKey("transient");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.transient_.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PutClusterSettingsResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutClusterSettingsResponse> {
-		private Boolean acknowledged;
-
-		private Map<String, JsonData> persistent;
-
-		private Map<String, JsonData> transient_;
-
-		/**
-		 * Required - API name: {@code acknowledged}
-		 */
-		public final Builder acknowledged(boolean value) {
-			this.acknowledged = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code persistent}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>persistent</code>.
-		 */
-		public final Builder persistent(Map<String, JsonData> map) {
-			this.persistent = _mapPutAll(this.persistent, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code persistent}
-		 * <p>
-		 * Adds an entry to <code>persistent</code>.
-		 */
-		public final Builder persistent(String key, JsonData value) {
-			this.persistent = _mapPut(this.persistent, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code transient}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>transient_</code>.
-		 */
-		public final Builder transient_(Map<String, JsonData> map) {
-			this.transient_ = _mapPutAll(this.transient_, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code transient}
-		 * <p>
-		 * Adds an entry to <code>transient_</code>.
-		 */
-		public final Builder transient_(String key, JsonData value) {
-			this.transient_ = _mapPut(this.transient_, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PutClusterSettingsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutClusterSettingsResponse build() {
-			_checkSingleUse();
-
-			return new PutClusterSettingsResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PutClusterSettingsResponse}
-	 */
-	public static final JsonpDeserializer<PutClusterSettingsResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PutClusterSettingsResponse::setupPutClusterSettingsResponseDeserializer);
-
-	protected static void setupPutClusterSettingsResponseDeserializer(
-			ObjectDeserializer<PutClusterSettingsResponse.Builder> op) {
-
-		op.add(Builder::acknowledged, JsonpDeserializer.booleanDeserializer(), "acknowledged");
-		op.add(Builder::persistent, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "persistent");
-		op.add(Builder::transient_, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "transient");
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private PutClusterSettingsResponse(Builder builder) {
+
+        this.acknowledged = ApiTypeHelper.requireNonNull(builder.acknowledged, this, "acknowledged");
+        this.persistent = ApiTypeHelper.unmodifiableRequired(builder.persistent, this, "persistent");
+        this.transient_ = ApiTypeHelper.unmodifiableRequired(builder.transient_, this, "transient_");
+
+    }
+
+    public static PutClusterSettingsResponse of(Function<Builder, ObjectBuilder<PutClusterSettingsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code acknowledged}
+     */
+    public final boolean acknowledged() {
+        return this.acknowledged;
+    }
+
+    /**
+     * Required - API name: {@code persistent}
+     */
+    public final Map<String, JsonData> persistent() {
+        return this.persistent;
+    }
+
+    /**
+     * Required - API name: {@code transient}
+     */
+    public final Map<String, JsonData> transient_() {
+        return this.transient_;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("acknowledged");
+        generator.write(this.acknowledged);
+
+        if (ApiTypeHelper.isDefined(this.persistent)) {
+            generator.writeKey("persistent");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.persistent.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.transient_)) {
+            generator.writeKey("transient");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.transient_.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PutClusterSettingsResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutClusterSettingsResponse> {
+        private Boolean acknowledged;
+
+        private Map<String, JsonData> persistent;
+
+        private Map<String, JsonData> transient_;
+
+        /**
+         * Required - API name: {@code acknowledged}
+         */
+        public final Builder acknowledged(boolean value) {
+            this.acknowledged = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code persistent}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>persistent</code>.
+         */
+        public final Builder persistent(Map<String, JsonData> map) {
+            this.persistent = _mapPutAll(this.persistent, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code persistent}
+         * <p>
+         * Adds an entry to <code>persistent</code>.
+         */
+        public final Builder persistent(String key, JsonData value) {
+            this.persistent = _mapPut(this.persistent, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code transient}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>transient_</code>.
+         */
+        public final Builder transient_(Map<String, JsonData> map) {
+            this.transient_ = _mapPutAll(this.transient_, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code transient}
+         * <p>
+         * Adds an entry to <code>transient_</code>.
+         */
+        public final Builder transient_(String key, JsonData value) {
+            this.transient_ = _mapPut(this.transient_, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link PutClusterSettingsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutClusterSettingsResponse build() {
+            _checkSingleUse();
+
+            return new PutClusterSettingsResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PutClusterSettingsResponse}
+     */
+    public static final JsonpDeserializer<PutClusterSettingsResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PutClusterSettingsResponse::setupPutClusterSettingsResponseDeserializer
+    );
+
+    protected static void setupPutClusterSettingsResponseDeserializer(ObjectDeserializer<PutClusterSettingsResponse.Builder> op) {
+
+        op.add(Builder::acknowledged, JsonpDeserializer.booleanDeserializer(), "acknowledged");
+        op.add(Builder::persistent, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "persistent");
+        op.add(Builder::transient_, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "transient");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PutComponentTemplateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PutComponentTemplateRequest.java
index ffe4d6ad0b..591cff2b51 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PutComponentTemplateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PutComponentTemplateRequest.java
@@ -32,13 +32,11 @@
 
 package org.opensearch.client.opensearch.cluster;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
-import org.opensearch.client.opensearch._types.mapping.TypeMapping;
-import org.opensearch.client.opensearch.indices.AliasDefinition;
-import org.opensearch.client.opensearch.indices.IndexSettings;
-import org.opensearch.client.opensearch.indices.IndexState;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -46,492 +44,497 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.Time;
+import org.opensearch.client.opensearch._types.mapping.TypeMapping;
+import org.opensearch.client.opensearch.indices.AliasDefinition;
+import org.opensearch.client.opensearch.indices.IndexSettings;
+import org.opensearch.client.opensearch.indices.IndexState;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.put_component_template.Request
 
 /**
  * Creates or updates a component template
- * 
+ *
  */
 @JsonpDeserializable
 public class PutComponentTemplateRequest extends RequestBase implements JsonpSerializable {
-	private final Map<String, JsonData> meta;
-
-	private final Map<String, AliasDefinition> aliases;
-
-	@Nullable
-	private final Boolean create;
-
-	@Nullable
-	private final TypeMapping mappings;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final String name;
-
-	@Nullable
-	private final IndexSettings settings;
-
-	private final IndexState template;
-
-	@Nullable
-	private final Long version;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PutComponentTemplateRequest(Builder builder) {
-
-		this.meta = ApiTypeHelper.unmodifiable(builder.meta);
-		this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
-		this.create = builder.create;
-		this.mappings = builder.mappings;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.settings = builder.settings;
-		this.template = ApiTypeHelper.requireNonNull(builder.template, this, "template");
-		this.version = builder.version;
-
-	}
-
-	public static PutComponentTemplateRequest of(Function<Builder, ObjectBuilder<PutComponentTemplateRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code _meta}
-	 */
-	public final Map<String, JsonData> meta() {
-		return this.meta;
-	}
-
-	/**
-	 * API name: {@code aliases}
-	 */
-	public final Map<String, AliasDefinition> aliases() {
-		return this.aliases;
-	}
-
-	/**
-	 * Whether the index template should only be added if new or can also replace an
-	 * existing one
-	 * <p>
-	 * API name: {@code create}
-	 */
-	@Nullable
-	public final Boolean create() {
-		return this.create;
-	}
-
-	/**
-	 * API name: {@code mappings}
-	 */
-	@Nullable
-	public final TypeMapping mappings() {
-		return this.mappings;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Required - The name of the template
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * API name: {@code settings}
-	 */
-	@Nullable
-	public final IndexSettings settings() {
-		return this.settings;
-	}
-
-	/**
-	 * Required - API name: {@code template}
-	 */
-	public final IndexState template() {
-		return this.template;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.meta)) {
-			generator.writeKey("_meta");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.aliases)) {
-			generator.writeKey("aliases");
-			generator.writeStartObject();
-			for (Map.Entry<String, AliasDefinition> item0 : this.aliases.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.mappings != null) {
-			generator.writeKey("mappings");
-			this.mappings.serialize(generator, mapper);
-
-		}
-		if (this.settings != null) {
-			generator.writeKey("settings");
-			this.settings.serialize(generator, mapper);
-
-		}
-		generator.writeKey("template");
-		this.template.serialize(generator, mapper);
-
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PutComponentTemplateRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutComponentTemplateRequest> {
-		@Nullable
-		private Map<String, JsonData> meta;
-
-		@Nullable
-		private Map<String, AliasDefinition> aliases;
-
-		@Nullable
-		private Boolean create;
-
-		@Nullable
-		private TypeMapping mappings;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		private String name;
-
-		@Nullable
-		private IndexSettings settings;
-
-		private IndexState template;
-
-		@Nullable
-		private Long version;
-
-		/**
-		 * API name: {@code _meta}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>meta</code>.
-		 */
-		public final Builder meta(Map<String, JsonData> map) {
-			this.meta = _mapPutAll(this.meta, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code _meta}
-		 * <p>
-		 * Adds an entry to <code>meta</code>.
-		 */
-		public final Builder meta(String key, JsonData value) {
-			this.meta = _mapPut(this.meta, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aliases</code>.
-		 */
-		public final Builder aliases(Map<String, AliasDefinition> map) {
-			this.aliases = _mapPutAll(this.aliases, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code>.
-		 */
-		public final Builder aliases(String key, AliasDefinition value) {
-			this.aliases = _mapPut(this.aliases, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code> using a builder lambda.
-		 */
-		public final Builder aliases(String key, Function<AliasDefinition.Builder, ObjectBuilder<AliasDefinition>> fn) {
-			return aliases(key, fn.apply(new AliasDefinition.Builder()).build());
-		}
-
-		/**
-		 * Whether the index template should only be added if new or can also replace an
-		 * existing one
-		 * <p>
-		 * API name: {@code create}
-		 */
-		public final Builder create(@Nullable Boolean value) {
-			this.create = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mappings}
-		 */
-		public final Builder mappings(@Nullable TypeMapping value) {
-			this.mappings = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mappings}
-		 */
-		public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
-			return this.mappings(fn.apply(new TypeMapping.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - The name of the template
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code settings}
-		 */
-		public final Builder settings(@Nullable IndexSettings value) {
-			this.settings = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code settings}
-		 */
-		public final Builder settings(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
-			return this.settings(fn.apply(new IndexSettings.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code template}
-		 */
-		public final Builder template(IndexState value) {
-			this.template = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code template}
-		 */
-		public final Builder template(Function<IndexState.Builder, ObjectBuilder<IndexState>> fn) {
-			return this.template(fn.apply(new IndexState.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PutComponentTemplateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutComponentTemplateRequest build() {
-			_checkSingleUse();
-
-			return new PutComponentTemplateRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PutComponentTemplateRequest}
-	 */
-	public static final JsonpDeserializer<PutComponentTemplateRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PutComponentTemplateRequest::setupPutComponentTemplateRequestDeserializer);
-
-	protected static void setupPutComponentTemplateRequestDeserializer(
-			ObjectDeserializer<PutComponentTemplateRequest.Builder> op) {
-
-		op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
-		op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(AliasDefinition._DESERIALIZER), "aliases");
-		op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
-		op.add(Builder::settings, IndexSettings._DESERIALIZER, "settings");
-		op.add(Builder::template, IndexState._DESERIALIZER, "template");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cluster.put_component_template}".
-	 */
-	public static final Endpoint<PutComponentTemplateRequest, PutComponentTemplateResponse, ErrorResponse> _ENDPOINT =
-			new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "PUT";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _name;
-
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_component_template");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.create != null) {
-					params.put("create", String.valueOf(request.create));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, PutComponentTemplateResponse._DESERIALIZER);
+    private final Map<String, JsonData> meta;
+
+    private final Map<String, AliasDefinition> aliases;
+
+    @Nullable
+    private final Boolean create;
+
+    @Nullable
+    private final TypeMapping mappings;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final String name;
+
+    @Nullable
+    private final IndexSettings settings;
+
+    private final IndexState template;
+
+    @Nullable
+    private final Long version;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PutComponentTemplateRequest(Builder builder) {
+
+        this.meta = ApiTypeHelper.unmodifiable(builder.meta);
+        this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
+        this.create = builder.create;
+        this.mappings = builder.mappings;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.settings = builder.settings;
+        this.template = ApiTypeHelper.requireNonNull(builder.template, this, "template");
+        this.version = builder.version;
+
+    }
+
+    public static PutComponentTemplateRequest of(Function<Builder, ObjectBuilder<PutComponentTemplateRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code _meta}
+     */
+    public final Map<String, JsonData> meta() {
+        return this.meta;
+    }
+
+    /**
+     * API name: {@code aliases}
+     */
+    public final Map<String, AliasDefinition> aliases() {
+        return this.aliases;
+    }
+
+    /**
+     * Whether the index template should only be added if new or can also replace an
+     * existing one
+     * <p>
+     * API name: {@code create}
+     */
+    @Nullable
+    public final Boolean create() {
+        return this.create;
+    }
+
+    /**
+     * API name: {@code mappings}
+     */
+    @Nullable
+    public final TypeMapping mappings() {
+        return this.mappings;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Required - The name of the template
+     * <p>
+     * API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * API name: {@code settings}
+     */
+    @Nullable
+    public final IndexSettings settings() {
+        return this.settings;
+    }
+
+    /**
+     * Required - API name: {@code template}
+     */
+    public final IndexState template() {
+        return this.template;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.meta)) {
+            generator.writeKey("_meta");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.aliases)) {
+            generator.writeKey("aliases");
+            generator.writeStartObject();
+            for (Map.Entry<String, AliasDefinition> item0 : this.aliases.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.mappings != null) {
+            generator.writeKey("mappings");
+            this.mappings.serialize(generator, mapper);
+
+        }
+        if (this.settings != null) {
+            generator.writeKey("settings");
+            this.settings.serialize(generator, mapper);
+
+        }
+        generator.writeKey("template");
+        this.template.serialize(generator, mapper);
+
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PutComponentTemplateRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutComponentTemplateRequest> {
+        @Nullable
+        private Map<String, JsonData> meta;
+
+        @Nullable
+        private Map<String, AliasDefinition> aliases;
+
+        @Nullable
+        private Boolean create;
+
+        @Nullable
+        private TypeMapping mappings;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        private String name;
+
+        @Nullable
+        private IndexSettings settings;
+
+        private IndexState template;
+
+        @Nullable
+        private Long version;
+
+        /**
+         * API name: {@code _meta}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>meta</code>.
+         */
+        public final Builder meta(Map<String, JsonData> map) {
+            this.meta = _mapPutAll(this.meta, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code _meta}
+         * <p>
+         * Adds an entry to <code>meta</code>.
+         */
+        public final Builder meta(String key, JsonData value) {
+            this.meta = _mapPut(this.meta, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aliases</code>.
+         */
+        public final Builder aliases(Map<String, AliasDefinition> map) {
+            this.aliases = _mapPutAll(this.aliases, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code>.
+         */
+        public final Builder aliases(String key, AliasDefinition value) {
+            this.aliases = _mapPut(this.aliases, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code> using a builder lambda.
+         */
+        public final Builder aliases(String key, Function<AliasDefinition.Builder, ObjectBuilder<AliasDefinition>> fn) {
+            return aliases(key, fn.apply(new AliasDefinition.Builder()).build());
+        }
+
+        /**
+         * Whether the index template should only be added if new or can also replace an
+         * existing one
+         * <p>
+         * API name: {@code create}
+         */
+        public final Builder create(@Nullable Boolean value) {
+            this.create = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mappings}
+         */
+        public final Builder mappings(@Nullable TypeMapping value) {
+            this.mappings = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mappings}
+         */
+        public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
+            return this.mappings(fn.apply(new TypeMapping.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - The name of the template
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code settings}
+         */
+        public final Builder settings(@Nullable IndexSettings value) {
+            this.settings = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code settings}
+         */
+        public final Builder settings(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
+            return this.settings(fn.apply(new IndexSettings.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code template}
+         */
+        public final Builder template(IndexState value) {
+            this.template = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code template}
+         */
+        public final Builder template(Function<IndexState.Builder, ObjectBuilder<IndexState>> fn) {
+            return this.template(fn.apply(new IndexState.Builder()).build());
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link PutComponentTemplateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutComponentTemplateRequest build() {
+            _checkSingleUse();
+
+            return new PutComponentTemplateRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PutComponentTemplateRequest}
+     */
+    public static final JsonpDeserializer<PutComponentTemplateRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PutComponentTemplateRequest::setupPutComponentTemplateRequestDeserializer
+    );
+
+    protected static void setupPutComponentTemplateRequestDeserializer(ObjectDeserializer<PutComponentTemplateRequest.Builder> op) {
+
+        op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
+        op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(AliasDefinition._DESERIALIZER), "aliases");
+        op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
+        op.add(Builder::settings, IndexSettings._DESERIALIZER, "settings");
+        op.add(Builder::template, IndexState._DESERIALIZER, "template");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cluster.put_component_template}".
+     */
+    public static final Endpoint<PutComponentTemplateRequest, PutComponentTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "PUT";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _name;
+
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_component_template");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.create != null) {
+                params.put("create", String.valueOf(request.create));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        PutComponentTemplateResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PutComponentTemplateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PutComponentTemplateResponse.java
index 345cd9ba23..7e882b0d08 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PutComponentTemplateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/PutComponentTemplateResponse.java
@@ -32,69 +32,69 @@
 
 package org.opensearch.client.opensearch.cluster;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: cluster.put_component_template.Response
 
 @JsonpDeserializable
 public class PutComponentTemplateResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
-
-	private PutComponentTemplateResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static PutComponentTemplateResponse of(Function<Builder, ObjectBuilder<PutComponentTemplateResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PutComponentTemplateResponse}.
-	 */
-
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PutComponentTemplateResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PutComponentTemplateResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutComponentTemplateResponse build() {
-			_checkSingleUse();
-
-			return new PutComponentTemplateResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PutComponentTemplateResponse}
-	 */
-	public static final JsonpDeserializer<PutComponentTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PutComponentTemplateResponse::setupPutComponentTemplateResponseDeserializer);
-
-	protected static void setupPutComponentTemplateResponseDeserializer(
-			ObjectDeserializer<PutComponentTemplateResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private PutComponentTemplateResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static PutComponentTemplateResponse of(Function<Builder, ObjectBuilder<PutComponentTemplateResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PutComponentTemplateResponse}.
+     */
+
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<PutComponentTemplateResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PutComponentTemplateResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutComponentTemplateResponse build() {
+            _checkSingleUse();
+
+            return new PutComponentTemplateResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PutComponentTemplateResponse}
+     */
+    public static final JsonpDeserializer<PutComponentTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PutComponentTemplateResponse::setupPutComponentTemplateResponseDeserializer
+    );
+
+    protected static void setupPutComponentTemplateResponseDeserializer(ObjectDeserializer<PutComponentTemplateResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/RemoteInfoRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/RemoteInfoRequest.java
index 4229f7e522..d0cbf8fa0a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/RemoteInfoRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/RemoteInfoRequest.java
@@ -32,53 +32,55 @@
 
 package org.opensearch.client.opensearch.cluster;
 
+import java.util.Collections;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 
-import java.util.Collections;
-
 // typedef: cluster.remote_info.Request
 
 /**
  * The cluster remote info API allows you to retrieve all of the configured
  * remote cluster information. It returns connection and endpoint information
  * keyed by the configured remote cluster alias.
- * 
+ *
  */
 
 public class RemoteInfoRequest extends RequestBase {
-	public RemoteInfoRequest() {
-	}
+    public RemoteInfoRequest() {}
 
-	/**
-	 * Singleton instance for {@link RemoteInfoRequest}.
-	 */
-	public static final RemoteInfoRequest _INSTANCE = new RemoteInfoRequest();
+    /**
+     * Singleton instance for {@link RemoteInfoRequest}.
+     */
+    public static final RemoteInfoRequest _INSTANCE = new RemoteInfoRequest();
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Endpoint "{@code cluster.remote_info}".
-	 */
-	public static final Endpoint<RemoteInfoRequest, RemoteInfoResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+    /**
+     * Endpoint "{@code cluster.remote_info}".
+     */
+    public static final Endpoint<RemoteInfoRequest, RemoteInfoResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
 
-			// Request method
-			request -> {
-				return "GET";
+        // Request method
+        request -> {
+            return "GET";
 
-			},
+        },
 
-			// Request path
-			request -> {
-				return "/_remote/info";
+        // Request path
+        request -> {
+            return "/_remote/info";
 
-			},
+        },
 
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
 
-			}, SimpleEndpoint.emptyMap(), false, RemoteInfoResponse._DESERIALIZER);
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        RemoteInfoResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/RemoteInfoResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/RemoteInfoResponse.java
index 001e6e118a..b9940b0717 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/RemoteInfoResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/RemoteInfoResponse.java
@@ -32,72 +32,72 @@
 
 package org.opensearch.client.opensearch.cluster;
 
-import org.opensearch.client.opensearch.cluster.remote_info.ClusterRemoteInfo;
+import java.util.function.Function;
 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.cluster.remote_info.ClusterRemoteInfo;
 import org.opensearch.client.transport.endpoints.DictionaryResponse;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: cluster.remote_info.Response
 
 @JsonpDeserializable
 public class RemoteInfoResponse extends DictionaryResponse<String, ClusterRemoteInfo> {
-	// ---------------------------------------------------------------------------------------------
-
-	private RemoteInfoResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static RemoteInfoResponse of(Function<Builder, ObjectBuilder<RemoteInfoResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RemoteInfoResponse}.
-	 */
-
-	public static class Builder extends DictionaryResponse.AbstractBuilder<String, ClusterRemoteInfo, Builder>
-			implements
-				ObjectBuilder<RemoteInfoResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RemoteInfoResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RemoteInfoResponse build() {
-			_checkSingleUse();
-			super.tKeySerializer(null);
-			super.tValueSerializer(null);
-
-			return new RemoteInfoResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RemoteInfoResponse}
-	 */
-	public static final JsonpDeserializer<RemoteInfoResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RemoteInfoResponse::setupRemoteInfoResponseDeserializer);
-
-	protected static void setupRemoteInfoResponseDeserializer(ObjectDeserializer<RemoteInfoResponse.Builder> op) {
-		DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(),
-				ClusterRemoteInfo._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private RemoteInfoResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static RemoteInfoResponse of(Function<Builder, ObjectBuilder<RemoteInfoResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RemoteInfoResponse}.
+     */
+
+    public static class Builder extends DictionaryResponse.AbstractBuilder<String, ClusterRemoteInfo, Builder>
+        implements
+            ObjectBuilder<RemoteInfoResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RemoteInfoResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RemoteInfoResponse build() {
+            _checkSingleUse();
+            super.tKeySerializer(null);
+            super.tValueSerializer(null);
+
+            return new RemoteInfoResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RemoteInfoResponse}
+     */
+    public static final JsonpDeserializer<RemoteInfoResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RemoteInfoResponse::setupRemoteInfoResponseDeserializer
+    );
+
+    protected static void setupRemoteInfoResponseDeserializer(ObjectDeserializer<RemoteInfoResponse.Builder> op) {
+        DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(), ClusterRemoteInfo._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/RerouteRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/RerouteRequest.java
index 36fe8e2888..23b9882a2b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/RerouteRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/RerouteRequest.java
@@ -32,449 +32,454 @@
 
 package org.opensearch.client.opensearch.cluster;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
-import org.opensearch.client.opensearch.cluster.reroute.Command;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.Time;
+import org.opensearch.client.opensearch.cluster.reroute.Command;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: cluster.reroute.Request
 
 /**
  * Allows to manually change the allocation of individual shards in the cluster.
- * 
+ *
  */
 @JsonpDeserializable
 public class RerouteRequest extends RequestBase implements JsonpSerializable {
-	private final List<Command> commands;
-
-	@Nullable
-	private final Boolean dryRun;
-
-	@Nullable
-	private final Boolean explain;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final List<String> metric;
-
-	@Nullable
-	private final Boolean retryFailed;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RerouteRequest(Builder builder) {
-
-		this.commands = ApiTypeHelper.unmodifiable(builder.commands);
-		this.dryRun = builder.dryRun;
-		this.explain = builder.explain;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.metric = ApiTypeHelper.unmodifiable(builder.metric);
-		this.retryFailed = builder.retryFailed;
-		this.timeout = builder.timeout;
-
-	}
-
-	public static RerouteRequest of(Function<Builder, ObjectBuilder<RerouteRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Defines the commands to perform.
-	 * <p>
-	 * API name: {@code commands}
-	 */
-	public final List<Command> commands() {
-		return this.commands;
-	}
-
-	/**
-	 * If true, then the request simulates the operation only and returns the
-	 * resulting state.
-	 * <p>
-	 * API name: {@code dry_run}
-	 */
-	@Nullable
-	public final Boolean dryRun() {
-		return this.dryRun;
-	}
-
-	/**
-	 * If true, then the response contains an explanation of why the commands can or
-	 * cannot be executed.
-	 * <p>
-	 * API name: {@code explain}
-	 */
-	@Nullable
-	public final Boolean explain() {
-		return this.explain;
-	}
-
-	/**
-	 * Period to wait for a connection to the master node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Period to wait for a connection to the cluster-manager node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code cluster_amanger_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Limits the information returned to the specified metrics.
-	 * <p>
-	 * API name: {@code metric}
-	 */
-	public final List<String> metric() {
-		return this.metric;
-	}
-
-	/**
-	 * If true, then retries allocation of shards that are blocked due to too many
-	 * subsequent allocation failures.
-	 * <p>
-	 * API name: {@code retry_failed}
-	 */
-	@Nullable
-	public final Boolean retryFailed() {
-		return this.retryFailed;
-	}
-
-	/**
-	 * Period to wait for a response. If no response is received before the timeout
-	 * expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.commands)) {
-			generator.writeKey("commands");
-			generator.writeStartArray();
-			for (Command item0 : this.commands) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RerouteRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RerouteRequest> {
-		@Nullable
-		private List<Command> commands;
-
-		@Nullable
-		private Boolean dryRun;
-
-		@Nullable
-		private Boolean explain;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private List<String> metric;
-
-		@Nullable
-		private Boolean retryFailed;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * Defines the commands to perform.
-		 * <p>
-		 * API name: {@code commands}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>commands</code>.
-		 */
-		public final Builder commands(List<Command> list) {
-			this.commands = _listAddAll(this.commands, list);
-			return this;
-		}
-
-		/**
-		 * Defines the commands to perform.
-		 * <p>
-		 * API name: {@code commands}
-		 * <p>
-		 * Adds one or more values to <code>commands</code>.
-		 */
-		public final Builder commands(Command value, Command... values) {
-			this.commands = _listAdd(this.commands, value, values);
-			return this;
-		}
-
-		/**
-		 * Defines the commands to perform.
-		 * <p>
-		 * API name: {@code commands}
-		 * <p>
-		 * Adds a value to <code>commands</code> using a builder lambda.
-		 */
-		public final Builder commands(Function<Command.Builder, ObjectBuilder<Command>> fn) {
-			return commands(fn.apply(new Command.Builder()).build());
-		}
-
-		/**
-		 * If true, then the request simulates the operation only and returns the
-		 * resulting state.
-		 * <p>
-		 * API name: {@code dry_run}
-		 */
-		public final Builder dryRun(@Nullable Boolean value) {
-			this.dryRun = value;
-			return this;
-		}
-
-		/**
-		 * If true, then the response contains an explanation of why the commands can or
-		 * cannot be executed.
-		 * <p>
-		 * API name: {@code explain}
-		 */
-		public final Builder explain(@Nullable Boolean value) {
-			this.explain = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Limits the information returned to the specified metrics.
-		 * <p>
-		 * API name: {@code metric}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>metric</code>.
-		 */
-		public final Builder metric(List<String> list) {
-			this.metric = _listAddAll(this.metric, list);
-			return this;
-		}
-
-		/**
-		 * Limits the information returned to the specified metrics.
-		 * <p>
-		 * API name: {@code metric}
-		 * <p>
-		 * Adds one or more values to <code>metric</code>.
-		 */
-		public final Builder metric(String value, String... values) {
-			this.metric = _listAdd(this.metric, value, values);
-			return this;
-		}
-
-		/**
-		 * If true, then retries allocation of shards that are blocked due to too many
-		 * subsequent allocation failures.
-		 * <p>
-		 * API name: {@code retry_failed}
-		 */
-		public final Builder retryFailed(@Nullable Boolean value) {
-			this.retryFailed = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a response. If no response is received before the timeout
-		 * expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a response. If no response is received before the timeout
-		 * expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link RerouteRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RerouteRequest build() {
-			_checkSingleUse();
-
-			return new RerouteRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RerouteRequest}
-	 */
-	public static final JsonpDeserializer<RerouteRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RerouteRequest::setupRerouteRequestDeserializer);
-
-	protected static void setupRerouteRequestDeserializer(ObjectDeserializer<RerouteRequest.Builder> op) {
-
-		op.add(Builder::commands, JsonpDeserializer.arrayDeserializer(Command._DESERIALIZER), "commands");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cluster.reroute}".
-	 */
-	public static final Endpoint<RerouteRequest, RerouteResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				return "/_cluster/reroute";
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.explain != null) {
-					params.put("explain", String.valueOf(request.explain));
-				}
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_mamager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (ApiTypeHelper.isDefined(request.metric)) {
-					params.put("metric", request.metric.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.dryRun != null) {
-					params.put("dry_run", String.valueOf(request.dryRun));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				if (request.retryFailed != null) {
-					params.put("retry_failed", String.valueOf(request.retryFailed));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, RerouteResponse._DESERIALIZER);
+    private final List<Command> commands;
+
+    @Nullable
+    private final Boolean dryRun;
+
+    @Nullable
+    private final Boolean explain;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final List<String> metric;
+
+    @Nullable
+    private final Boolean retryFailed;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RerouteRequest(Builder builder) {
+
+        this.commands = ApiTypeHelper.unmodifiable(builder.commands);
+        this.dryRun = builder.dryRun;
+        this.explain = builder.explain;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.metric = ApiTypeHelper.unmodifiable(builder.metric);
+        this.retryFailed = builder.retryFailed;
+        this.timeout = builder.timeout;
+
+    }
+
+    public static RerouteRequest of(Function<Builder, ObjectBuilder<RerouteRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Defines the commands to perform.
+     * <p>
+     * API name: {@code commands}
+     */
+    public final List<Command> commands() {
+        return this.commands;
+    }
+
+    /**
+     * If true, then the request simulates the operation only and returns the
+     * resulting state.
+     * <p>
+     * API name: {@code dry_run}
+     */
+    @Nullable
+    public final Boolean dryRun() {
+        return this.dryRun;
+    }
+
+    /**
+     * If true, then the response contains an explanation of why the commands can or
+     * cannot be executed.
+     * <p>
+     * API name: {@code explain}
+     */
+    @Nullable
+    public final Boolean explain() {
+        return this.explain;
+    }
+
+    /**
+     * Period to wait for a connection to the master node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Period to wait for a connection to the cluster-manager node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code cluster_amanger_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Limits the information returned to the specified metrics.
+     * <p>
+     * API name: {@code metric}
+     */
+    public final List<String> metric() {
+        return this.metric;
+    }
+
+    /**
+     * If true, then retries allocation of shards that are blocked due to too many
+     * subsequent allocation failures.
+     * <p>
+     * API name: {@code retry_failed}
+     */
+    @Nullable
+    public final Boolean retryFailed() {
+        return this.retryFailed;
+    }
+
+    /**
+     * Period to wait for a response. If no response is received before the timeout
+     * expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.commands)) {
+            generator.writeKey("commands");
+            generator.writeStartArray();
+            for (Command item0 : this.commands) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RerouteRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RerouteRequest> {
+        @Nullable
+        private List<Command> commands;
+
+        @Nullable
+        private Boolean dryRun;
+
+        @Nullable
+        private Boolean explain;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private List<String> metric;
+
+        @Nullable
+        private Boolean retryFailed;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * Defines the commands to perform.
+         * <p>
+         * API name: {@code commands}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>commands</code>.
+         */
+        public final Builder commands(List<Command> list) {
+            this.commands = _listAddAll(this.commands, list);
+            return this;
+        }
+
+        /**
+         * Defines the commands to perform.
+         * <p>
+         * API name: {@code commands}
+         * <p>
+         * Adds one or more values to <code>commands</code>.
+         */
+        public final Builder commands(Command value, Command... values) {
+            this.commands = _listAdd(this.commands, value, values);
+            return this;
+        }
+
+        /**
+         * Defines the commands to perform.
+         * <p>
+         * API name: {@code commands}
+         * <p>
+         * Adds a value to <code>commands</code> using a builder lambda.
+         */
+        public final Builder commands(Function<Command.Builder, ObjectBuilder<Command>> fn) {
+            return commands(fn.apply(new Command.Builder()).build());
+        }
+
+        /**
+         * If true, then the request simulates the operation only and returns the
+         * resulting state.
+         * <p>
+         * API name: {@code dry_run}
+         */
+        public final Builder dryRun(@Nullable Boolean value) {
+            this.dryRun = value;
+            return this;
+        }
+
+        /**
+         * If true, then the response contains an explanation of why the commands can or
+         * cannot be executed.
+         * <p>
+         * API name: {@code explain}
+         */
+        public final Builder explain(@Nullable Boolean value) {
+            this.explain = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Limits the information returned to the specified metrics.
+         * <p>
+         * API name: {@code metric}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>metric</code>.
+         */
+        public final Builder metric(List<String> list) {
+            this.metric = _listAddAll(this.metric, list);
+            return this;
+        }
+
+        /**
+         * Limits the information returned to the specified metrics.
+         * <p>
+         * API name: {@code metric}
+         * <p>
+         * Adds one or more values to <code>metric</code>.
+         */
+        public final Builder metric(String value, String... values) {
+            this.metric = _listAdd(this.metric, value, values);
+            return this;
+        }
+
+        /**
+         * If true, then retries allocation of shards that are blocked due to too many
+         * subsequent allocation failures.
+         * <p>
+         * API name: {@code retry_failed}
+         */
+        public final Builder retryFailed(@Nullable Boolean value) {
+            this.retryFailed = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a response. If no response is received before the timeout
+         * expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a response. If no response is received before the timeout
+         * expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link RerouteRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RerouteRequest build() {
+            _checkSingleUse();
+
+            return new RerouteRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RerouteRequest}
+     */
+    public static final JsonpDeserializer<RerouteRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RerouteRequest::setupRerouteRequestDeserializer
+    );
+
+    protected static void setupRerouteRequestDeserializer(ObjectDeserializer<RerouteRequest.Builder> op) {
+
+        op.add(Builder::commands, JsonpDeserializer.arrayDeserializer(Command._DESERIALIZER), "commands");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cluster.reroute}".
+     */
+    public static final Endpoint<RerouteRequest, RerouteResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            return "/_cluster/reroute";
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.explain != null) {
+                params.put("explain", String.valueOf(request.explain));
+            }
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_mamager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (ApiTypeHelper.isDefined(request.metric)) {
+                params.put("metric", request.metric.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.dryRun != null) {
+                params.put("dry_run", String.valueOf(request.dryRun));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            if (request.retryFailed != null) {
+                params.put("retry_failed", String.valueOf(request.retryFailed));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        RerouteResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/RerouteResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/RerouteResponse.java
index 635ead6916..e4367d5254 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/RerouteResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/RerouteResponse.java
@@ -32,7 +32,10 @@
 
 package org.opensearch.client.opensearch.cluster;
 
-import org.opensearch.client.opensearch.cluster.reroute.RerouteExplanation;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,160 +43,157 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.cluster.reroute.RerouteExplanation;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.reroute.Response
 
 @JsonpDeserializable
 public class RerouteResponse implements JsonpSerializable {
-	private final List<RerouteExplanation> explanations;
-
-	private final JsonData state;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RerouteResponse(Builder builder) {
-
-		this.explanations = ApiTypeHelper.unmodifiable(builder.explanations);
-		this.state = ApiTypeHelper.requireNonNull(builder.state, this, "state");
-
-	}
-
-	public static RerouteResponse of(Function<Builder, ObjectBuilder<RerouteResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code explanations}
-	 */
-	public final List<RerouteExplanation> explanations() {
-		return this.explanations;
-	}
-
-	/**
-	 * Required - There aren't any guarantees on the output/structure of the raw
-	 * cluster state. Here you will find the internal representation of the cluster,
-	 * which can differ from the external representation.
-	 * <p>
-	 * API name: {@code state}
-	 */
-	public final JsonData state() {
-		return this.state;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.explanations)) {
-			generator.writeKey("explanations");
-			generator.writeStartArray();
-			for (RerouteExplanation item0 : this.explanations) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("state");
-		this.state.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RerouteResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RerouteResponse> {
-		@Nullable
-		private List<RerouteExplanation> explanations;
-
-		private JsonData state;
-
-		/**
-		 * API name: {@code explanations}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>explanations</code>.
-		 */
-		public final Builder explanations(List<RerouteExplanation> list) {
-			this.explanations = _listAddAll(this.explanations, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code explanations}
-		 * <p>
-		 * Adds one or more values to <code>explanations</code>.
-		 */
-		public final Builder explanations(RerouteExplanation value, RerouteExplanation... values) {
-			this.explanations = _listAdd(this.explanations, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code explanations}
-		 * <p>
-		 * Adds a value to <code>explanations</code> using a builder lambda.
-		 */
-		public final Builder explanations(Function<RerouteExplanation.Builder, ObjectBuilder<RerouteExplanation>> fn) {
-			return explanations(fn.apply(new RerouteExplanation.Builder()).build());
-		}
-
-		/**
-		 * Required - There aren't any guarantees on the output/structure of the raw
-		 * cluster state. Here you will find the internal representation of the cluster,
-		 * which can differ from the external representation.
-		 * <p>
-		 * API name: {@code state}
-		 */
-		public final Builder state(JsonData value) {
-			this.state = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RerouteResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RerouteResponse build() {
-			_checkSingleUse();
-
-			return new RerouteResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RerouteResponse}
-	 */
-	public static final JsonpDeserializer<RerouteResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RerouteResponse::setupRerouteResponseDeserializer);
-
-	protected static void setupRerouteResponseDeserializer(ObjectDeserializer<RerouteResponse.Builder> op) {
-
-		op.add(Builder::explanations, JsonpDeserializer.arrayDeserializer(RerouteExplanation._DESERIALIZER),
-				"explanations");
-		op.add(Builder::state, JsonData._DESERIALIZER, "state");
-
-	}
+    private final List<RerouteExplanation> explanations;
+
+    private final JsonData state;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RerouteResponse(Builder builder) {
+
+        this.explanations = ApiTypeHelper.unmodifiable(builder.explanations);
+        this.state = ApiTypeHelper.requireNonNull(builder.state, this, "state");
+
+    }
+
+    public static RerouteResponse of(Function<Builder, ObjectBuilder<RerouteResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code explanations}
+     */
+    public final List<RerouteExplanation> explanations() {
+        return this.explanations;
+    }
+
+    /**
+     * Required - There aren't any guarantees on the output/structure of the raw
+     * cluster state. Here you will find the internal representation of the cluster,
+     * which can differ from the external representation.
+     * <p>
+     * API name: {@code state}
+     */
+    public final JsonData state() {
+        return this.state;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.explanations)) {
+            generator.writeKey("explanations");
+            generator.writeStartArray();
+            for (RerouteExplanation item0 : this.explanations) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("state");
+        this.state.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RerouteResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RerouteResponse> {
+        @Nullable
+        private List<RerouteExplanation> explanations;
+
+        private JsonData state;
+
+        /**
+         * API name: {@code explanations}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>explanations</code>.
+         */
+        public final Builder explanations(List<RerouteExplanation> list) {
+            this.explanations = _listAddAll(this.explanations, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code explanations}
+         * <p>
+         * Adds one or more values to <code>explanations</code>.
+         */
+        public final Builder explanations(RerouteExplanation value, RerouteExplanation... values) {
+            this.explanations = _listAdd(this.explanations, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code explanations}
+         * <p>
+         * Adds a value to <code>explanations</code> using a builder lambda.
+         */
+        public final Builder explanations(Function<RerouteExplanation.Builder, ObjectBuilder<RerouteExplanation>> fn) {
+            return explanations(fn.apply(new RerouteExplanation.Builder()).build());
+        }
+
+        /**
+         * Required - There aren't any guarantees on the output/structure of the raw
+         * cluster state. Here you will find the internal representation of the cluster,
+         * which can differ from the external representation.
+         * <p>
+         * API name: {@code state}
+         */
+        public final Builder state(JsonData value) {
+            this.state = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RerouteResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RerouteResponse build() {
+            _checkSingleUse();
+
+            return new RerouteResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RerouteResponse}
+     */
+    public static final JsonpDeserializer<RerouteResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RerouteResponse::setupRerouteResponseDeserializer
+    );
+
+    protected static void setupRerouteResponseDeserializer(ObjectDeserializer<RerouteResponse.Builder> op) {
+
+        op.add(Builder::explanations, JsonpDeserializer.arrayDeserializer(RerouteExplanation._DESERIALIZER), "explanations");
+        op.add(Builder::state, JsonData._DESERIALIZER, "state");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/StateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/StateRequest.java
index 0fb496344c..dc34bce34e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/StateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/StateRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.cluster;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -42,521 +48,512 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: cluster.state.Request
 
 /**
  * Returns a comprehensive information about the state of the cluster.
- * 
+ *
  */
 
 public class StateRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean flatSettings;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Boolean local;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final List<String> metric;
-
-	@Nullable
-	private final Long waitForMetadataVersion;
-
-	@Nullable
-	private final Time waitForTimeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private StateRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.flatSettings = builder.flatSettings;
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.local = builder.local;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.metric = ApiTypeHelper.unmodifiable(builder.metric);
-		this.waitForMetadataVersion = builder.waitForMetadataVersion;
-		this.waitForTimeout = builder.waitForTimeout;
-
-	}
-
-	public static StateRequest of(Function<Builder, ObjectBuilder<StateRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Return settings in flat format (default: false)
-	 * <p>
-	 * API name: {@code flat_settings}
-	 */
-	@Nullable
-	public final Boolean flatSettings() {
-		return this.flatSettings;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * A comma-separated list of index names; use <code>_all</code> or empty string
-	 * to perform the operation on all indices
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Return local information, do not retrieve the state from cluster-manager node
-	 * (default: false)
-	 * <p>
-	 * API name: {@code local}
-	 */
-	@Nullable
-	public final Boolean local() {
-		return this.local;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Limit the information returned to the specified metrics
-	 * <p>
-	 * API name: {@code metric}
-	 */
-	public final List<String> metric() {
-		return this.metric;
-	}
-
-	/**
-	 * Wait for the metadata version to be equal or greater than the specified
-	 * metadata version
-	 * <p>
-	 * API name: {@code wait_for_metadata_version}
-	 */
-	@Nullable
-	public final Long waitForMetadataVersion() {
-		return this.waitForMetadataVersion;
-	}
-
-	/**
-	 * The maximum time to wait for wait_for_metadata_version before timing out
-	 * <p>
-	 * API name: {@code wait_for_timeout}
-	 */
-	@Nullable
-	public final Time waitForTimeout() {
-		return this.waitForTimeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link StateRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<StateRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean flatSettings;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private Boolean local;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private List<String> metric;
-
-		@Nullable
-		private Long waitForMetadataVersion;
-
-		@Nullable
-		private Time waitForTimeout;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Return settings in flat format (default: false)
-		 * <p>
-		 * API name: {@code flat_settings}
-		 */
-		public final Builder flatSettings(@Nullable Boolean value) {
-			this.flatSettings = value;
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Return local information, do not retrieve the state from cluster-manager node
-		 * (default: false)
-		 * <p>
-		 * API name: {@code local}
-		 */
-		public final Builder local(@Nullable Boolean value) {
-			this.local = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Limit the information returned to the specified metrics
-		 * <p>
-		 * API name: {@code metric}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>metric</code>.
-		 */
-		public final Builder metric(List<String> list) {
-			this.metric = _listAddAll(this.metric, list);
-			return this;
-		}
-
-		/**
-		 * Limit the information returned to the specified metrics
-		 * <p>
-		 * API name: {@code metric}
-		 * <p>
-		 * Adds one or more values to <code>metric</code>.
-		 */
-		public final Builder metric(String value, String... values) {
-			this.metric = _listAdd(this.metric, value, values);
-			return this;
-		}
-
-		/**
-		 * Wait for the metadata version to be equal or greater than the specified
-		 * metadata version
-		 * <p>
-		 * API name: {@code wait_for_metadata_version}
-		 */
-		public final Builder waitForMetadataVersion(@Nullable Long value) {
-			this.waitForMetadataVersion = value;
-			return this;
-		}
-
-		/**
-		 * The maximum time to wait for wait_for_metadata_version before timing out
-		 * <p>
-		 * API name: {@code wait_for_timeout}
-		 */
-		public final Builder waitForTimeout(@Nullable Time value) {
-			this.waitForTimeout = value;
-			return this;
-		}
-
-		/**
-		 * The maximum time to wait for wait_for_metadata_version before timing out
-		 * <p>
-		 * API name: {@code wait_for_timeout}
-		 */
-		public final Builder waitForTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.waitForTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link StateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StateRequest build() {
-			_checkSingleUse();
-
-			return new StateRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code cluster.state}".
-	 */
-	public static final Endpoint<StateRequest, StateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _metric = 1 << 0;
-				final int _index = 1 << 1;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.metric()))
-					propsSet |= _metric;
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cluster");
-					buf.append("/state");
-					return buf.toString();
-				}
-				if (propsSet == (_metric)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cluster");
-					buf.append("/state");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					return buf.toString();
-				}
-				if (propsSet == (_metric | _index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cluster");
-					buf.append("/state");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				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(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.waitForTimeout != null) {
-					params.put("wait_for_timeout", request.waitForTimeout._toJsonString());
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.waitForMetadataVersion != null) {
-					params.put("wait_for_metadata_version", String.valueOf(request.waitForMetadataVersion));
-				}
-				if (request.local != null) {
-					params.put("local", String.valueOf(request.local));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, StateResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean flatSettings;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Boolean local;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final List<String> metric;
+
+    @Nullable
+    private final Long waitForMetadataVersion;
+
+    @Nullable
+    private final Time waitForTimeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private StateRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.flatSettings = builder.flatSettings;
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.local = builder.local;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.metric = ApiTypeHelper.unmodifiable(builder.metric);
+        this.waitForMetadataVersion = builder.waitForMetadataVersion;
+        this.waitForTimeout = builder.waitForTimeout;
+
+    }
+
+    public static StateRequest of(Function<Builder, ObjectBuilder<StateRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Return settings in flat format (default: false)
+     * <p>
+     * API name: {@code flat_settings}
+     */
+    @Nullable
+    public final Boolean flatSettings() {
+        return this.flatSettings;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * A comma-separated list of index names; use <code>_all</code> or empty string
+     * to perform the operation on all indices
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Return local information, do not retrieve the state from cluster-manager node
+     * (default: false)
+     * <p>
+     * API name: {@code local}
+     */
+    @Nullable
+    public final Boolean local() {
+        return this.local;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Limit the information returned to the specified metrics
+     * <p>
+     * API name: {@code metric}
+     */
+    public final List<String> metric() {
+        return this.metric;
+    }
+
+    /**
+     * Wait for the metadata version to be equal or greater than the specified
+     * metadata version
+     * <p>
+     * API name: {@code wait_for_metadata_version}
+     */
+    @Nullable
+    public final Long waitForMetadataVersion() {
+        return this.waitForMetadataVersion;
+    }
+
+    /**
+     * The maximum time to wait for wait_for_metadata_version before timing out
+     * <p>
+     * API name: {@code wait_for_timeout}
+     */
+    @Nullable
+    public final Time waitForTimeout() {
+        return this.waitForTimeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link StateRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<StateRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean flatSettings;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private Boolean local;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private List<String> metric;
+
+        @Nullable
+        private Long waitForMetadataVersion;
+
+        @Nullable
+        private Time waitForTimeout;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Return settings in flat format (default: false)
+         * <p>
+         * API name: {@code flat_settings}
+         */
+        public final Builder flatSettings(@Nullable Boolean value) {
+            this.flatSettings = value;
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Return local information, do not retrieve the state from cluster-manager node
+         * (default: false)
+         * <p>
+         * API name: {@code local}
+         */
+        public final Builder local(@Nullable Boolean value) {
+            this.local = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Limit the information returned to the specified metrics
+         * <p>
+         * API name: {@code metric}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>metric</code>.
+         */
+        public final Builder metric(List<String> list) {
+            this.metric = _listAddAll(this.metric, list);
+            return this;
+        }
+
+        /**
+         * Limit the information returned to the specified metrics
+         * <p>
+         * API name: {@code metric}
+         * <p>
+         * Adds one or more values to <code>metric</code>.
+         */
+        public final Builder metric(String value, String... values) {
+            this.metric = _listAdd(this.metric, value, values);
+            return this;
+        }
+
+        /**
+         * Wait for the metadata version to be equal or greater than the specified
+         * metadata version
+         * <p>
+         * API name: {@code wait_for_metadata_version}
+         */
+        public final Builder waitForMetadataVersion(@Nullable Long value) {
+            this.waitForMetadataVersion = value;
+            return this;
+        }
+
+        /**
+         * The maximum time to wait for wait_for_metadata_version before timing out
+         * <p>
+         * API name: {@code wait_for_timeout}
+         */
+        public final Builder waitForTimeout(@Nullable Time value) {
+            this.waitForTimeout = value;
+            return this;
+        }
+
+        /**
+         * The maximum time to wait for wait_for_metadata_version before timing out
+         * <p>
+         * API name: {@code wait_for_timeout}
+         */
+        public final Builder waitForTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.waitForTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link StateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StateRequest build() {
+            _checkSingleUse();
+
+            return new StateRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code cluster.state}".
+     */
+    public static final Endpoint<StateRequest, StateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _metric = 1 << 0;
+            final int _index = 1 << 1;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.metric())) propsSet |= _metric;
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cluster");
+                buf.append("/state");
+                return buf.toString();
+            }
+            if (propsSet == (_metric)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cluster");
+                buf.append("/state");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            if (propsSet == (_metric | _index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cluster");
+                buf.append("/state");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            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(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.waitForTimeout != null) {
+                params.put("wait_for_timeout", request.waitForTimeout._toJsonString());
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.waitForMetadataVersion != null) {
+                params.put("wait_for_metadata_version", String.valueOf(request.waitForMetadataVersion));
+            }
+            if (request.local != null) {
+                params.put("local", String.valueOf(request.local));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        StateResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/StateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/StateResponse.java
index 12f447c448..0895ca2bcf 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/StateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/StateResponse.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,84 +42,84 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: cluster.state.Response
 
 @JsonpDeserializable
 public class StateResponse implements JsonpSerializable {
-	private final JsonData valueBody;
+    private final JsonData valueBody;
+
+    // ---------------------------------------------------------------------------------------------
 
-	// ---------------------------------------------------------------------------------------------
+    private StateResponse(Builder builder) {
 
-	private StateResponse(Builder builder) {
+        this.valueBody = ApiTypeHelper.requireNonNull(builder.valueBody, this, "valueBody");
 
-		this.valueBody = ApiTypeHelper.requireNonNull(builder.valueBody, this, "valueBody");
+    }
 
-	}
+    public static StateResponse of(Function<Builder, ObjectBuilder<StateResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	public static StateResponse of(Function<Builder, ObjectBuilder<StateResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final JsonData valueBody() {
+        return this.valueBody;
+    }
 
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final JsonData valueBody() {
-		return this.valueBody;
-	}
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        this.valueBody.serialize(generator, mapper);
 
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		this.valueBody.serialize(generator, mapper);
+    }
 
-	}
+    // ---------------------------------------------------------------------------------------------
 
-	// ---------------------------------------------------------------------------------------------
+    /**
+     * Builder for {@link StateResponse}.
+     */
 
-	/**
-	 * Builder for {@link StateResponse}.
-	 */
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<StateResponse> {
+        private JsonData valueBody;
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<StateResponse> {
-		private JsonData valueBody;
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         */
+        public final Builder valueBody(JsonData value) {
+            this.valueBody = value;
+            return this;
+        }
 
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 */
-		public final Builder valueBody(JsonData value) {
-			this.valueBody = value;
-			return this;
-		}
+        /**
+         * Builds a {@link StateResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public StateResponse build() {
+            _checkSingleUse();
 
-		/**
-		 * Builds a {@link StateResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public StateResponse build() {
-			_checkSingleUse();
+            return new StateResponse(this);
+        }
+    }
 
-			return new StateResponse(this);
-		}
-	}
+    public static final JsonpDeserializer<StateResponse> _DESERIALIZER = createStateResponseDeserializer();
 
-	public static final JsonpDeserializer<StateResponse> _DESERIALIZER = createStateResponseDeserializer();
-	protected static JsonpDeserializer<StateResponse> createStateResponseDeserializer() {
+    protected static JsonpDeserializer<StateResponse> createStateResponseDeserializer() {
 
-		JsonpDeserializer<JsonData> valueDeserializer = JsonData._DESERIALIZER;
+        JsonpDeserializer<JsonData> valueDeserializer = JsonData._DESERIALIZER;
 
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/AllocationDecision.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/AllocationDecision.java
index 75348d9a44..8e711f82d1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/AllocationDecision.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/AllocationDecision.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.allocation_explain;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,140 +43,139 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.allocation_explain.AllocationDecision
 
-
 @JsonpDeserializable
 public class AllocationDecision implements JsonpSerializable {
-	private final String decider;
-
-	private final AllocationExplainDecision decision;
-
-	private final String explanation;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AllocationDecision(Builder builder) {
-
-		this.decider = ApiTypeHelper.requireNonNull(builder.decider, this, "decider");
-		this.decision = ApiTypeHelper.requireNonNull(builder.decision, this, "decision");
-		this.explanation = ApiTypeHelper.requireNonNull(builder.explanation, this, "explanation");
-
-	}
-
-	public static AllocationDecision of(Function<Builder, ObjectBuilder<AllocationDecision>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code decider}
-	 */
-	public final String decider() {
-		return this.decider;
-	}
-
-	/**
-	 * Required - API name: {@code decision}
-	 */
-	public final AllocationExplainDecision decision() {
-		return this.decision;
-	}
-
-	/**
-	 * Required - API name: {@code explanation}
-	 */
-	public final String explanation() {
-		return this.explanation;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("decider");
-		generator.write(this.decider);
-
-		generator.writeKey("decision");
-		this.decision.serialize(generator, mapper);
-		generator.writeKey("explanation");
-		generator.write(this.explanation);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AllocationDecision}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AllocationDecision> {
-		private String decider;
-
-		private AllocationExplainDecision decision;
-
-		private String explanation;
-
-		/**
-		 * Required - API name: {@code decider}
-		 */
-		public final Builder decider(String value) {
-			this.decider = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code decision}
-		 */
-		public final Builder decision(AllocationExplainDecision value) {
-			this.decision = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code explanation}
-		 */
-		public final Builder explanation(String value) {
-			this.explanation = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AllocationDecision}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AllocationDecision build() {
-			_checkSingleUse();
-
-			return new AllocationDecision(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AllocationDecision}
-	 */
-	public static final JsonpDeserializer<AllocationDecision> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, AllocationDecision::setupAllocationDecisionDeserializer);
-
-	protected static void setupAllocationDecisionDeserializer(ObjectDeserializer<AllocationDecision.Builder> op) {
-
-		op.add(Builder::decider, JsonpDeserializer.stringDeserializer(), "decider");
-		op.add(Builder::decision, AllocationExplainDecision._DESERIALIZER, "decision");
-		op.add(Builder::explanation, JsonpDeserializer.stringDeserializer(), "explanation");
-
-	}
+    private final String decider;
+
+    private final AllocationExplainDecision decision;
+
+    private final String explanation;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AllocationDecision(Builder builder) {
+
+        this.decider = ApiTypeHelper.requireNonNull(builder.decider, this, "decider");
+        this.decision = ApiTypeHelper.requireNonNull(builder.decision, this, "decision");
+        this.explanation = ApiTypeHelper.requireNonNull(builder.explanation, this, "explanation");
+
+    }
+
+    public static AllocationDecision of(Function<Builder, ObjectBuilder<AllocationDecision>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code decider}
+     */
+    public final String decider() {
+        return this.decider;
+    }
+
+    /**
+     * Required - API name: {@code decision}
+     */
+    public final AllocationExplainDecision decision() {
+        return this.decision;
+    }
+
+    /**
+     * Required - API name: {@code explanation}
+     */
+    public final String explanation() {
+        return this.explanation;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("decider");
+        generator.write(this.decider);
+
+        generator.writeKey("decision");
+        this.decision.serialize(generator, mapper);
+        generator.writeKey("explanation");
+        generator.write(this.explanation);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AllocationDecision}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AllocationDecision> {
+        private String decider;
+
+        private AllocationExplainDecision decision;
+
+        private String explanation;
+
+        /**
+         * Required - API name: {@code decider}
+         */
+        public final Builder decider(String value) {
+            this.decider = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code decision}
+         */
+        public final Builder decision(AllocationExplainDecision value) {
+            this.decision = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code explanation}
+         */
+        public final Builder explanation(String value) {
+            this.explanation = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link AllocationDecision}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AllocationDecision build() {
+            _checkSingleUse();
+
+            return new AllocationDecision(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AllocationDecision}
+     */
+    public static final JsonpDeserializer<AllocationDecision> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AllocationDecision::setupAllocationDecisionDeserializer
+    );
+
+    protected static void setupAllocationDecisionDeserializer(ObjectDeserializer<AllocationDecision.Builder> op) {
+
+        op.add(Builder::decider, JsonpDeserializer.stringDeserializer(), "decider");
+        op.add(Builder::decision, AllocationExplainDecision._DESERIALIZER, "decision");
+        op.add(Builder::explanation, JsonpDeserializer.stringDeserializer(), "explanation");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/AllocationExplainDecision.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/AllocationExplainDecision.java
index 9c7efc2d74..31a7cabdcc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/AllocationExplainDecision.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/AllocationExplainDecision.java
@@ -37,26 +37,27 @@
 
 @JsonpDeserializable
 public enum AllocationExplainDecision implements JsonEnum {
-	No("NO"),
+    No("NO"),
 
-	Yes("YES"),
+    Yes("YES"),
 
-	Throttle("THROTTLE"),
+    Throttle("THROTTLE"),
 
-	Always("ALWAYS"),
+    Always("ALWAYS"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	AllocationExplainDecision(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    AllocationExplainDecision(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<AllocationExplainDecision> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			AllocationExplainDecision.values());
+    public static final JsonEnum.Deserializer<AllocationExplainDecision> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        AllocationExplainDecision.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/AllocationStore.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/AllocationStore.java
index f1e97a6afd..67c4652de2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/AllocationStore.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/AllocationStore.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.allocation_explain;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,214 +43,212 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.allocation_explain.AllocationStore
 
-
 @JsonpDeserializable
 public class AllocationStore implements JsonpSerializable {
-	private final String allocationId;
+    private final String allocationId;
 
-	private final boolean found;
+    private final boolean found;
 
-	private final boolean inSync;
+    private final boolean inSync;
 
-	private final long matchingSizeInBytes;
+    private final long matchingSizeInBytes;
 
-	private final boolean matchingSyncId;
+    private final boolean matchingSyncId;
 
-	private final String storeException;
+    private final String storeException;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private AllocationStore(Builder builder) {
+    private AllocationStore(Builder builder) {
 
-		this.allocationId = ApiTypeHelper.requireNonNull(builder.allocationId, this, "allocationId");
-		this.found = ApiTypeHelper.requireNonNull(builder.found, this, "found");
-		this.inSync = ApiTypeHelper.requireNonNull(builder.inSync, this, "inSync");
-		this.matchingSizeInBytes = ApiTypeHelper.requireNonNull(builder.matchingSizeInBytes, this,
-				"matchingSizeInBytes");
-		this.matchingSyncId = ApiTypeHelper.requireNonNull(builder.matchingSyncId, this, "matchingSyncId");
-		this.storeException = ApiTypeHelper.requireNonNull(builder.storeException, this, "storeException");
+        this.allocationId = ApiTypeHelper.requireNonNull(builder.allocationId, this, "allocationId");
+        this.found = ApiTypeHelper.requireNonNull(builder.found, this, "found");
+        this.inSync = ApiTypeHelper.requireNonNull(builder.inSync, this, "inSync");
+        this.matchingSizeInBytes = ApiTypeHelper.requireNonNull(builder.matchingSizeInBytes, this, "matchingSizeInBytes");
+        this.matchingSyncId = ApiTypeHelper.requireNonNull(builder.matchingSyncId, this, "matchingSyncId");
+        this.storeException = ApiTypeHelper.requireNonNull(builder.storeException, this, "storeException");
 
-	}
+    }
 
-	public static AllocationStore of(Function<Builder, ObjectBuilder<AllocationStore>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static AllocationStore of(Function<Builder, ObjectBuilder<AllocationStore>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code allocation_id}
-	 */
-	public final String allocationId() {
-		return this.allocationId;
-	}
+    /**
+     * Required - API name: {@code allocation_id}
+     */
+    public final String allocationId() {
+        return this.allocationId;
+    }
 
-	/**
-	 * Required - API name: {@code found}
-	 */
-	public final boolean found() {
-		return this.found;
-	}
+    /**
+     * Required - API name: {@code found}
+     */
+    public final boolean found() {
+        return this.found;
+    }
 
-	/**
-	 * Required - API name: {@code in_sync}
-	 */
-	public final boolean inSync() {
-		return this.inSync;
-	}
+    /**
+     * Required - API name: {@code in_sync}
+     */
+    public final boolean inSync() {
+        return this.inSync;
+    }
 
-	/**
-	 * Required - API name: {@code matching_size_in_bytes}
-	 */
-	public final long matchingSizeInBytes() {
-		return this.matchingSizeInBytes;
-	}
-
-	/**
-	 * Required - API name: {@code matching_sync_id}
-	 */
-	public final boolean matchingSyncId() {
-		return this.matchingSyncId;
-	}
-
-	/**
-	 * Required - API name: {@code store_exception}
-	 */
-	public final String storeException() {
-		return this.storeException;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("allocation_id");
-		generator.write(this.allocationId);
-
-		generator.writeKey("found");
-		generator.write(this.found);
-
-		generator.writeKey("in_sync");
-		generator.write(this.inSync);
-
-		generator.writeKey("matching_size_in_bytes");
-		generator.write(this.matchingSizeInBytes);
-
-		generator.writeKey("matching_sync_id");
-		generator.write(this.matchingSyncId);
-
-		generator.writeKey("store_exception");
-		generator.write(this.storeException);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AllocationStore}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AllocationStore> {
-		private String allocationId;
-
-		private Boolean found;
-
-		private Boolean inSync;
-
-		private Long matchingSizeInBytes;
-
-		private Boolean matchingSyncId;
-
-		private String storeException;
-
-		/**
-		 * Required - API name: {@code allocation_id}
-		 */
-		public final Builder allocationId(String value) {
-			this.allocationId = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code found}
-		 */
-		public final Builder found(boolean value) {
-			this.found = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code in_sync}
-		 */
-		public final Builder inSync(boolean value) {
-			this.inSync = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code matching_size_in_bytes}
-		 */
-		public final Builder matchingSizeInBytes(long value) {
-			this.matchingSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code matching_sync_id}
-		 */
-		public final Builder matchingSyncId(boolean value) {
-			this.matchingSyncId = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code store_exception}
-		 */
-		public final Builder storeException(String value) {
-			this.storeException = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AllocationStore}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AllocationStore build() {
-			_checkSingleUse();
-
-			return new AllocationStore(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AllocationStore}
-	 */
-	public static final JsonpDeserializer<AllocationStore> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			AllocationStore::setupAllocationStoreDeserializer);
-
-	protected static void setupAllocationStoreDeserializer(ObjectDeserializer<AllocationStore.Builder> op) {
-
-		op.add(Builder::allocationId, JsonpDeserializer.stringDeserializer(), "allocation_id");
-		op.add(Builder::found, JsonpDeserializer.booleanDeserializer(), "found");
-		op.add(Builder::inSync, JsonpDeserializer.booleanDeserializer(), "in_sync");
-		op.add(Builder::matchingSizeInBytes, JsonpDeserializer.longDeserializer(), "matching_size_in_bytes");
-		op.add(Builder::matchingSyncId, JsonpDeserializer.booleanDeserializer(), "matching_sync_id");
-		op.add(Builder::storeException, JsonpDeserializer.stringDeserializer(), "store_exception");
-
-	}
+    /**
+     * Required - API name: {@code matching_size_in_bytes}
+     */
+    public final long matchingSizeInBytes() {
+        return this.matchingSizeInBytes;
+    }
+
+    /**
+     * Required - API name: {@code matching_sync_id}
+     */
+    public final boolean matchingSyncId() {
+        return this.matchingSyncId;
+    }
+
+    /**
+     * Required - API name: {@code store_exception}
+     */
+    public final String storeException() {
+        return this.storeException;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("allocation_id");
+        generator.write(this.allocationId);
+
+        generator.writeKey("found");
+        generator.write(this.found);
+
+        generator.writeKey("in_sync");
+        generator.write(this.inSync);
+
+        generator.writeKey("matching_size_in_bytes");
+        generator.write(this.matchingSizeInBytes);
+
+        generator.writeKey("matching_sync_id");
+        generator.write(this.matchingSyncId);
+
+        generator.writeKey("store_exception");
+        generator.write(this.storeException);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AllocationStore}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AllocationStore> {
+        private String allocationId;
+
+        private Boolean found;
+
+        private Boolean inSync;
+
+        private Long matchingSizeInBytes;
+
+        private Boolean matchingSyncId;
+
+        private String storeException;
+
+        /**
+         * Required - API name: {@code allocation_id}
+         */
+        public final Builder allocationId(String value) {
+            this.allocationId = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code found}
+         */
+        public final Builder found(boolean value) {
+            this.found = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code in_sync}
+         */
+        public final Builder inSync(boolean value) {
+            this.inSync = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code matching_size_in_bytes}
+         */
+        public final Builder matchingSizeInBytes(long value) {
+            this.matchingSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code matching_sync_id}
+         */
+        public final Builder matchingSyncId(boolean value) {
+            this.matchingSyncId = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code store_exception}
+         */
+        public final Builder storeException(String value) {
+            this.storeException = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link AllocationStore}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AllocationStore build() {
+            _checkSingleUse();
+
+            return new AllocationStore(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AllocationStore}
+     */
+    public static final JsonpDeserializer<AllocationStore> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AllocationStore::setupAllocationStoreDeserializer
+    );
+
+    protected static void setupAllocationStoreDeserializer(ObjectDeserializer<AllocationStore.Builder> op) {
+
+        op.add(Builder::allocationId, JsonpDeserializer.stringDeserializer(), "allocation_id");
+        op.add(Builder::found, JsonpDeserializer.booleanDeserializer(), "found");
+        op.add(Builder::inSync, JsonpDeserializer.booleanDeserializer(), "in_sync");
+        op.add(Builder::matchingSizeInBytes, JsonpDeserializer.longDeserializer(), "matching_size_in_bytes");
+        op.add(Builder::matchingSyncId, JsonpDeserializer.booleanDeserializer(), "matching_sync_id");
+        op.add(Builder::storeException, JsonpDeserializer.stringDeserializer(), "store_exception");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/ClusterInfo.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/ClusterInfo.java
index e434d7bc52..32d74f607d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/ClusterInfo.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/ClusterInfo.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch.cluster.allocation_explain;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,316 +46,311 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.allocation_explain.ClusterInfo
 
-
 @JsonpDeserializable
 public class ClusterInfo implements JsonpSerializable {
-	private final Map<String, NodeDiskUsage> nodes;
-
-	private final Map<String, Long> shardSizes;
-
-	private final Map<String, String> shardDataSetSizes;
-
-	private final Map<String, String> shardPaths;
-
-	private final List<ReservedSize> reservedSizes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterInfo(Builder builder) {
-
-		this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
-		this.shardSizes = ApiTypeHelper.unmodifiableRequired(builder.shardSizes, this, "shardSizes");
-		this.shardDataSetSizes = ApiTypeHelper.unmodifiable(builder.shardDataSetSizes);
-		this.shardPaths = ApiTypeHelper.unmodifiableRequired(builder.shardPaths, this, "shardPaths");
-		this.reservedSizes = ApiTypeHelper.unmodifiableRequired(builder.reservedSizes, this, "reservedSizes");
-
-	}
-
-	public static ClusterInfo of(Function<Builder, ObjectBuilder<ClusterInfo>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code nodes}
-	 */
-	public final Map<String, NodeDiskUsage> nodes() {
-		return this.nodes;
-	}
-
-	/**
-	 * Required - API name: {@code shard_sizes}
-	 */
-	public final Map<String, Long> shardSizes() {
-		return this.shardSizes;
-	}
-
-	/**
-	 * API name: {@code shard_data_set_sizes}
-	 */
-	public final Map<String, String> shardDataSetSizes() {
-		return this.shardDataSetSizes;
-	}
+    private final Map<String, NodeDiskUsage> nodes;
+
+    private final Map<String, Long> shardSizes;
+
+    private final Map<String, String> shardDataSetSizes;
+
+    private final Map<String, String> shardPaths;
+
+    private final List<ReservedSize> reservedSizes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterInfo(Builder builder) {
+
+        this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
+        this.shardSizes = ApiTypeHelper.unmodifiableRequired(builder.shardSizes, this, "shardSizes");
+        this.shardDataSetSizes = ApiTypeHelper.unmodifiable(builder.shardDataSetSizes);
+        this.shardPaths = ApiTypeHelper.unmodifiableRequired(builder.shardPaths, this, "shardPaths");
+        this.reservedSizes = ApiTypeHelper.unmodifiableRequired(builder.reservedSizes, this, "reservedSizes");
+
+    }
+
+    public static ClusterInfo of(Function<Builder, ObjectBuilder<ClusterInfo>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code nodes}
+     */
+    public final Map<String, NodeDiskUsage> nodes() {
+        return this.nodes;
+    }
+
+    /**
+     * Required - API name: {@code shard_sizes}
+     */
+    public final Map<String, Long> shardSizes() {
+        return this.shardSizes;
+    }
+
+    /**
+     * API name: {@code shard_data_set_sizes}
+     */
+    public final Map<String, String> shardDataSetSizes() {
+        return this.shardDataSetSizes;
+    }
 
-	/**
-	 * Required - API name: {@code shard_paths}
-	 */
-	public final Map<String, String> shardPaths() {
-		return this.shardPaths;
-	}
-
-	/**
-	 * Required - API name: {@code reserved_sizes}
-	 */
-	public final List<ReservedSize> reservedSizes() {
-		return this.reservedSizes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.nodes)) {
-			generator.writeKey("nodes");
-			generator.writeStartObject();
-			for (Map.Entry<String, NodeDiskUsage> item0 : this.nodes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.shardSizes)) {
-			generator.writeKey("shard_sizes");
-			generator.writeStartObject();
-			for (Map.Entry<String, Long> item0 : this.shardSizes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.shardDataSetSizes)) {
-			generator.writeKey("shard_data_set_sizes");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.shardDataSetSizes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.shardPaths)) {
-			generator.writeKey("shard_paths");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.shardPaths.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.reservedSizes)) {
-			generator.writeKey("reserved_sizes");
-			generator.writeStartArray();
-			for (ReservedSize item0 : this.reservedSizes) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterInfo}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterInfo> {
-		private Map<String, NodeDiskUsage> nodes;
-
-		private Map<String, Long> shardSizes;
-
-		@Nullable
-		private Map<String, String> shardDataSetSizes;
-
-		private Map<String, String> shardPaths;
-
-		private List<ReservedSize> reservedSizes;
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>nodes</code>.
-		 */
-		public final Builder nodes(Map<String, NodeDiskUsage> map) {
-			this.nodes = _mapPutAll(this.nodes, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code>.
-		 */
-		public final Builder nodes(String key, NodeDiskUsage value) {
-			this.nodes = _mapPut(this.nodes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code> using a builder lambda.
-		 */
-		public final Builder nodes(String key, Function<NodeDiskUsage.Builder, ObjectBuilder<NodeDiskUsage>> fn) {
-			return nodes(key, fn.apply(new NodeDiskUsage.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code shard_sizes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>shardSizes</code>.
-		 */
-		public final Builder shardSizes(Map<String, Long> map) {
-			this.shardSizes = _mapPutAll(this.shardSizes, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shard_sizes}
-		 * <p>
-		 * Adds an entry to <code>shardSizes</code>.
-		 */
-		public final Builder shardSizes(String key, Long value) {
-			this.shardSizes = _mapPut(this.shardSizes, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code shard_data_set_sizes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>shardDataSetSizes</code>.
-		 */
-		public final Builder shardDataSetSizes(Map<String, String> map) {
-			this.shardDataSetSizes = _mapPutAll(this.shardDataSetSizes, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code shard_data_set_sizes}
-		 * <p>
-		 * Adds an entry to <code>shardDataSetSizes</code>.
-		 */
-		public final Builder shardDataSetSizes(String key, String value) {
-			this.shardDataSetSizes = _mapPut(this.shardDataSetSizes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shard_paths}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>shardPaths</code>.
-		 */
-		public final Builder shardPaths(Map<String, String> map) {
-			this.shardPaths = _mapPutAll(this.shardPaths, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shard_paths}
-		 * <p>
-		 * Adds an entry to <code>shardPaths</code>.
-		 */
-		public final Builder shardPaths(String key, String value) {
-			this.shardPaths = _mapPut(this.shardPaths, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code reserved_sizes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>reservedSizes</code>.
-		 */
-		public final Builder reservedSizes(List<ReservedSize> list) {
-			this.reservedSizes = _listAddAll(this.reservedSizes, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code reserved_sizes}
-		 * <p>
-		 * Adds one or more values to <code>reservedSizes</code>.
-		 */
-		public final Builder reservedSizes(ReservedSize value, ReservedSize... values) {
-			this.reservedSizes = _listAdd(this.reservedSizes, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code reserved_sizes}
-		 * <p>
-		 * Adds a value to <code>reservedSizes</code> using a builder lambda.
-		 */
-		public final Builder reservedSizes(Function<ReservedSize.Builder, ObjectBuilder<ReservedSize>> fn) {
-			return reservedSizes(fn.apply(new ReservedSize.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ClusterInfo}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterInfo build() {
-			_checkSingleUse();
-
-			return new ClusterInfo(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterInfo}
-	 */
-	public static final JsonpDeserializer<ClusterInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ClusterInfo::setupClusterInfoDeserializer);
-
-	protected static void setupClusterInfoDeserializer(ObjectDeserializer<ClusterInfo.Builder> op) {
-
-		op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(NodeDiskUsage._DESERIALIZER), "nodes");
-		op.add(Builder::shardSizes, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.longDeserializer()),
-				"shard_sizes");
-		op.add(Builder::shardDataSetSizes,
-				JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
-				"shard_data_set_sizes");
-		op.add(Builder::shardPaths, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
-				"shard_paths");
-		op.add(Builder::reservedSizes, JsonpDeserializer.arrayDeserializer(ReservedSize._DESERIALIZER),
-				"reserved_sizes");
-
-	}
+    /**
+     * Required - API name: {@code shard_paths}
+     */
+    public final Map<String, String> shardPaths() {
+        return this.shardPaths;
+    }
+
+    /**
+     * Required - API name: {@code reserved_sizes}
+     */
+    public final List<ReservedSize> reservedSizes() {
+        return this.reservedSizes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.nodes)) {
+            generator.writeKey("nodes");
+            generator.writeStartObject();
+            for (Map.Entry<String, NodeDiskUsage> item0 : this.nodes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.shardSizes)) {
+            generator.writeKey("shard_sizes");
+            generator.writeStartObject();
+            for (Map.Entry<String, Long> item0 : this.shardSizes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.shardDataSetSizes)) {
+            generator.writeKey("shard_data_set_sizes");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.shardDataSetSizes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.shardPaths)) {
+            generator.writeKey("shard_paths");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.shardPaths.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.reservedSizes)) {
+            generator.writeKey("reserved_sizes");
+            generator.writeStartArray();
+            for (ReservedSize item0 : this.reservedSizes) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterInfo}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterInfo> {
+        private Map<String, NodeDiskUsage> nodes;
+
+        private Map<String, Long> shardSizes;
+
+        @Nullable
+        private Map<String, String> shardDataSetSizes;
+
+        private Map<String, String> shardPaths;
+
+        private List<ReservedSize> reservedSizes;
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>nodes</code>.
+         */
+        public final Builder nodes(Map<String, NodeDiskUsage> map) {
+            this.nodes = _mapPutAll(this.nodes, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code>.
+         */
+        public final Builder nodes(String key, NodeDiskUsage value) {
+            this.nodes = _mapPut(this.nodes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code> using a builder lambda.
+         */
+        public final Builder nodes(String key, Function<NodeDiskUsage.Builder, ObjectBuilder<NodeDiskUsage>> fn) {
+            return nodes(key, fn.apply(new NodeDiskUsage.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code shard_sizes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>shardSizes</code>.
+         */
+        public final Builder shardSizes(Map<String, Long> map) {
+            this.shardSizes = _mapPutAll(this.shardSizes, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shard_sizes}
+         * <p>
+         * Adds an entry to <code>shardSizes</code>.
+         */
+        public final Builder shardSizes(String key, Long value) {
+            this.shardSizes = _mapPut(this.shardSizes, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code shard_data_set_sizes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>shardDataSetSizes</code>.
+         */
+        public final Builder shardDataSetSizes(Map<String, String> map) {
+            this.shardDataSetSizes = _mapPutAll(this.shardDataSetSizes, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code shard_data_set_sizes}
+         * <p>
+         * Adds an entry to <code>shardDataSetSizes</code>.
+         */
+        public final Builder shardDataSetSizes(String key, String value) {
+            this.shardDataSetSizes = _mapPut(this.shardDataSetSizes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shard_paths}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>shardPaths</code>.
+         */
+        public final Builder shardPaths(Map<String, String> map) {
+            this.shardPaths = _mapPutAll(this.shardPaths, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shard_paths}
+         * <p>
+         * Adds an entry to <code>shardPaths</code>.
+         */
+        public final Builder shardPaths(String key, String value) {
+            this.shardPaths = _mapPut(this.shardPaths, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code reserved_sizes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>reservedSizes</code>.
+         */
+        public final Builder reservedSizes(List<ReservedSize> list) {
+            this.reservedSizes = _listAddAll(this.reservedSizes, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code reserved_sizes}
+         * <p>
+         * Adds one or more values to <code>reservedSizes</code>.
+         */
+        public final Builder reservedSizes(ReservedSize value, ReservedSize... values) {
+            this.reservedSizes = _listAdd(this.reservedSizes, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code reserved_sizes}
+         * <p>
+         * Adds a value to <code>reservedSizes</code> using a builder lambda.
+         */
+        public final Builder reservedSizes(Function<ReservedSize.Builder, ObjectBuilder<ReservedSize>> fn) {
+            return reservedSizes(fn.apply(new ReservedSize.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ClusterInfo}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterInfo build() {
+            _checkSingleUse();
+
+            return new ClusterInfo(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterInfo}
+     */
+    public static final JsonpDeserializer<ClusterInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterInfo::setupClusterInfoDeserializer
+    );
+
+    protected static void setupClusterInfoDeserializer(ObjectDeserializer<ClusterInfo.Builder> op) {
+
+        op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(NodeDiskUsage._DESERIALIZER), "nodes");
+        op.add(Builder::shardSizes, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.longDeserializer()), "shard_sizes");
+        op.add(
+            Builder::shardDataSetSizes,
+            JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
+            "shard_data_set_sizes"
+        );
+        op.add(Builder::shardPaths, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "shard_paths");
+        op.add(Builder::reservedSizes, JsonpDeserializer.arrayDeserializer(ReservedSize._DESERIALIZER), "reserved_sizes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/CurrentNode.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/CurrentNode.java
index 838ad9e1c9..f4faa69a71 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/CurrentNode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/CurrentNode.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cluster.allocation_explain;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,211 +44,208 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: cluster.allocation_explain.CurrentNode
 
-
 @JsonpDeserializable
 public class CurrentNode implements JsonpSerializable {
-	private final String id;
+    private final String id;
 
-	private final String name;
+    private final String name;
 
-	private final Map<String, String> attributes;
+    private final Map<String, String> attributes;
 
-	private final String transportAddress;
+    private final String transportAddress;
 
-	private final int weightRanking;
+    private final int weightRanking;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private CurrentNode(Builder builder) {
+    private CurrentNode(Builder builder) {
 
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.attributes = ApiTypeHelper.unmodifiableRequired(builder.attributes, this, "attributes");
-		this.transportAddress = ApiTypeHelper.requireNonNull(builder.transportAddress, this, "transportAddress");
-		this.weightRanking = ApiTypeHelper.requireNonNull(builder.weightRanking, this, "weightRanking");
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.attributes = ApiTypeHelper.unmodifiableRequired(builder.attributes, this, "attributes");
+        this.transportAddress = ApiTypeHelper.requireNonNull(builder.transportAddress, this, "transportAddress");
+        this.weightRanking = ApiTypeHelper.requireNonNull(builder.weightRanking, this, "weightRanking");
 
-	}
+    }
 
-	public static CurrentNode of(Function<Builder, ObjectBuilder<CurrentNode>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static CurrentNode of(Function<Builder, ObjectBuilder<CurrentNode>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
+    /**
+     * Required - API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
 
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Required - API name: {@code attributes}
-	 */
-	public final Map<String, String> attributes() {
-		return this.attributes;
-	}
-
-	/**
-	 * Required - API name: {@code transport_address}
-	 */
-	public final String transportAddress() {
-		return this.transportAddress;
-	}
-
-	/**
-	 * Required - API name: {@code weight_ranking}
-	 */
-	public final int weightRanking() {
-		return this.weightRanking;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("id");
-		generator.write(this.id);
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		if (ApiTypeHelper.isDefined(this.attributes)) {
-			generator.writeKey("attributes");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.attributes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("transport_address");
-		generator.write(this.transportAddress);
-
-		generator.writeKey("weight_ranking");
-		generator.write(this.weightRanking);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CurrentNode}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CurrentNode> {
-		private String id;
-
-		private String name;
-
-		private Map<String, String> attributes;
-
-		private String transportAddress;
-
-		private Integer weightRanking;
-
-		/**
-		 * Required - API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code attributes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>attributes</code>.
-		 */
-		public final Builder attributes(Map<String, String> map) {
-			this.attributes = _mapPutAll(this.attributes, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code attributes}
-		 * <p>
-		 * Adds an entry to <code>attributes</code>.
-		 */
-		public final Builder attributes(String key, String value) {
-			this.attributes = _mapPut(this.attributes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code transport_address}
-		 */
-		public final Builder transportAddress(String value) {
-			this.transportAddress = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code weight_ranking}
-		 */
-		public final Builder weightRanking(int value) {
-			this.weightRanking = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CurrentNode}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CurrentNode build() {
-			_checkSingleUse();
-
-			return new CurrentNode(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CurrentNode}
-	 */
-	public static final JsonpDeserializer<CurrentNode> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CurrentNode::setupCurrentNodeDeserializer);
-
-	protected static void setupCurrentNodeDeserializer(ObjectDeserializer<CurrentNode.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::attributes, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
-				"attributes");
-		op.add(Builder::transportAddress, JsonpDeserializer.stringDeserializer(), "transport_address");
-		op.add(Builder::weightRanking, JsonpDeserializer.integerDeserializer(), "weight_ranking");
-
-	}
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Required - API name: {@code attributes}
+     */
+    public final Map<String, String> attributes() {
+        return this.attributes;
+    }
+
+    /**
+     * Required - API name: {@code transport_address}
+     */
+    public final String transportAddress() {
+        return this.transportAddress;
+    }
+
+    /**
+     * Required - API name: {@code weight_ranking}
+     */
+    public final int weightRanking() {
+        return this.weightRanking;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("id");
+        generator.write(this.id);
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        if (ApiTypeHelper.isDefined(this.attributes)) {
+            generator.writeKey("attributes");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.attributes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("transport_address");
+        generator.write(this.transportAddress);
+
+        generator.writeKey("weight_ranking");
+        generator.write(this.weightRanking);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CurrentNode}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CurrentNode> {
+        private String id;
+
+        private String name;
+
+        private Map<String, String> attributes;
+
+        private String transportAddress;
+
+        private Integer weightRanking;
+
+        /**
+         * Required - API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code attributes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>attributes</code>.
+         */
+        public final Builder attributes(Map<String, String> map) {
+            this.attributes = _mapPutAll(this.attributes, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code attributes}
+         * <p>
+         * Adds an entry to <code>attributes</code>.
+         */
+        public final Builder attributes(String key, String value) {
+            this.attributes = _mapPut(this.attributes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code transport_address}
+         */
+        public final Builder transportAddress(String value) {
+            this.transportAddress = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code weight_ranking}
+         */
+        public final Builder weightRanking(int value) {
+            this.weightRanking = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link CurrentNode}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CurrentNode build() {
+            _checkSingleUse();
+
+            return new CurrentNode(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CurrentNode}
+     */
+    public static final JsonpDeserializer<CurrentNode> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CurrentNode::setupCurrentNodeDeserializer
+    );
+
+    protected static void setupCurrentNodeDeserializer(ObjectDeserializer<CurrentNode.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::attributes, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "attributes");
+        op.add(Builder::transportAddress, JsonpDeserializer.stringDeserializer(), "transport_address");
+        op.add(Builder::weightRanking, JsonpDeserializer.integerDeserializer(), "weight_ranking");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/Decision.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/Decision.java
index d8b48a60ef..6d152438b2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/Decision.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/Decision.java
@@ -35,36 +35,35 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum Decision implements JsonEnum {
-	Yes("yes"),
+    Yes("yes"),
 
-	No("no"),
+    No("no"),
 
-	WorseBalance("worse_balance"),
+    WorseBalance("worse_balance"),
 
-	Throttled("throttled"),
+    Throttled("throttled"),
 
-	AwaitingInfo("awaiting_info"),
+    AwaitingInfo("awaiting_info"),
 
-	AllocationDelayed("allocation_delayed"),
+    AllocationDelayed("allocation_delayed"),
 
-	NoValidShardCopy("no_valid_shard_copy"),
+    NoValidShardCopy("no_valid_shard_copy"),
 
-	NoAttempt("no_attempt"),
+    NoAttempt("no_attempt"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	Decision(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    Decision(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<Decision> _DESERIALIZER = new JsonEnum.Deserializer<>(Decision.values());
+    public static final JsonEnum.Deserializer<Decision> _DESERIALIZER = new JsonEnum.Deserializer<>(Decision.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/DiskUsage.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/DiskUsage.java
index 7a8508c8b1..a89c8b336e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/DiskUsage.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/DiskUsage.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.allocation_explain;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,213 +43,212 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.allocation_explain.DiskUsage
 
-
 @JsonpDeserializable
 public class DiskUsage implements JsonpSerializable {
-	private final String path;
+    private final String path;
 
-	private final long totalBytes;
+    private final long totalBytes;
 
-	private final long usedBytes;
+    private final long usedBytes;
 
-	private final long freeBytes;
+    private final long freeBytes;
 
-	private final double freeDiskPercent;
+    private final double freeDiskPercent;
 
-	private final double usedDiskPercent;
+    private final double usedDiskPercent;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private DiskUsage(Builder builder) {
+    private DiskUsage(Builder builder) {
 
-		this.path = ApiTypeHelper.requireNonNull(builder.path, this, "path");
-		this.totalBytes = ApiTypeHelper.requireNonNull(builder.totalBytes, this, "totalBytes");
-		this.usedBytes = ApiTypeHelper.requireNonNull(builder.usedBytes, this, "usedBytes");
-		this.freeBytes = ApiTypeHelper.requireNonNull(builder.freeBytes, this, "freeBytes");
-		this.freeDiskPercent = ApiTypeHelper.requireNonNull(builder.freeDiskPercent, this, "freeDiskPercent");
-		this.usedDiskPercent = ApiTypeHelper.requireNonNull(builder.usedDiskPercent, this, "usedDiskPercent");
+        this.path = ApiTypeHelper.requireNonNull(builder.path, this, "path");
+        this.totalBytes = ApiTypeHelper.requireNonNull(builder.totalBytes, this, "totalBytes");
+        this.usedBytes = ApiTypeHelper.requireNonNull(builder.usedBytes, this, "usedBytes");
+        this.freeBytes = ApiTypeHelper.requireNonNull(builder.freeBytes, this, "freeBytes");
+        this.freeDiskPercent = ApiTypeHelper.requireNonNull(builder.freeDiskPercent, this, "freeDiskPercent");
+        this.usedDiskPercent = ApiTypeHelper.requireNonNull(builder.usedDiskPercent, this, "usedDiskPercent");
 
-	}
+    }
 
-	public static DiskUsage of(Function<Builder, ObjectBuilder<DiskUsage>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static DiskUsage of(Function<Builder, ObjectBuilder<DiskUsage>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code path}
-	 */
-	public final String path() {
-		return this.path;
-	}
+    /**
+     * Required - API name: {@code path}
+     */
+    public final String path() {
+        return this.path;
+    }
 
-	/**
-	 * Required - API name: {@code total_bytes}
-	 */
-	public final long totalBytes() {
-		return this.totalBytes;
-	}
+    /**
+     * Required - API name: {@code total_bytes}
+     */
+    public final long totalBytes() {
+        return this.totalBytes;
+    }
 
-	/**
-	 * Required - API name: {@code used_bytes}
-	 */
-	public final long usedBytes() {
-		return this.usedBytes;
-	}
+    /**
+     * Required - API name: {@code used_bytes}
+     */
+    public final long usedBytes() {
+        return this.usedBytes;
+    }
 
-	/**
-	 * Required - API name: {@code free_bytes}
-	 */
-	public final long freeBytes() {
-		return this.freeBytes;
-	}
-
-	/**
-	 * Required - API name: {@code free_disk_percent}
-	 */
-	public final double freeDiskPercent() {
-		return this.freeDiskPercent;
-	}
-
-	/**
-	 * Required - API name: {@code used_disk_percent}
-	 */
-	public final double usedDiskPercent() {
-		return this.usedDiskPercent;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("path");
-		generator.write(this.path);
-
-		generator.writeKey("total_bytes");
-		generator.write(this.totalBytes);
-
-		generator.writeKey("used_bytes");
-		generator.write(this.usedBytes);
-
-		generator.writeKey("free_bytes");
-		generator.write(this.freeBytes);
-
-		generator.writeKey("free_disk_percent");
-		generator.write(this.freeDiskPercent);
-
-		generator.writeKey("used_disk_percent");
-		generator.write(this.usedDiskPercent);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DiskUsage}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DiskUsage> {
-		private String path;
-
-		private Long totalBytes;
-
-		private Long usedBytes;
-
-		private Long freeBytes;
-
-		private Double freeDiskPercent;
-
-		private Double usedDiskPercent;
-
-		/**
-		 * Required - API name: {@code path}
-		 */
-		public final Builder path(String value) {
-			this.path = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_bytes}
-		 */
-		public final Builder totalBytes(long value) {
-			this.totalBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code used_bytes}
-		 */
-		public final Builder usedBytes(long value) {
-			this.usedBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code free_bytes}
-		 */
-		public final Builder freeBytes(long value) {
-			this.freeBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code free_disk_percent}
-		 */
-		public final Builder freeDiskPercent(double value) {
-			this.freeDiskPercent = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code used_disk_percent}
-		 */
-		public final Builder usedDiskPercent(double value) {
-			this.usedDiskPercent = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DiskUsage}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DiskUsage build() {
-			_checkSingleUse();
-
-			return new DiskUsage(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DiskUsage}
-	 */
-	public static final JsonpDeserializer<DiskUsage> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			DiskUsage::setupDiskUsageDeserializer);
-
-	protected static void setupDiskUsageDeserializer(ObjectDeserializer<DiskUsage.Builder> op) {
-
-		op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
-		op.add(Builder::totalBytes, JsonpDeserializer.longDeserializer(), "total_bytes");
-		op.add(Builder::usedBytes, JsonpDeserializer.longDeserializer(), "used_bytes");
-		op.add(Builder::freeBytes, JsonpDeserializer.longDeserializer(), "free_bytes");
-		op.add(Builder::freeDiskPercent, JsonpDeserializer.doubleDeserializer(), "free_disk_percent");
-		op.add(Builder::usedDiskPercent, JsonpDeserializer.doubleDeserializer(), "used_disk_percent");
-
-	}
+    /**
+     * Required - API name: {@code free_bytes}
+     */
+    public final long freeBytes() {
+        return this.freeBytes;
+    }
+
+    /**
+     * Required - API name: {@code free_disk_percent}
+     */
+    public final double freeDiskPercent() {
+        return this.freeDiskPercent;
+    }
+
+    /**
+     * Required - API name: {@code used_disk_percent}
+     */
+    public final double usedDiskPercent() {
+        return this.usedDiskPercent;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("path");
+        generator.write(this.path);
+
+        generator.writeKey("total_bytes");
+        generator.write(this.totalBytes);
+
+        generator.writeKey("used_bytes");
+        generator.write(this.usedBytes);
+
+        generator.writeKey("free_bytes");
+        generator.write(this.freeBytes);
+
+        generator.writeKey("free_disk_percent");
+        generator.write(this.freeDiskPercent);
+
+        generator.writeKey("used_disk_percent");
+        generator.write(this.usedDiskPercent);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DiskUsage}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DiskUsage> {
+        private String path;
+
+        private Long totalBytes;
+
+        private Long usedBytes;
+
+        private Long freeBytes;
+
+        private Double freeDiskPercent;
+
+        private Double usedDiskPercent;
+
+        /**
+         * Required - API name: {@code path}
+         */
+        public final Builder path(String value) {
+            this.path = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_bytes}
+         */
+        public final Builder totalBytes(long value) {
+            this.totalBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code used_bytes}
+         */
+        public final Builder usedBytes(long value) {
+            this.usedBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code free_bytes}
+         */
+        public final Builder freeBytes(long value) {
+            this.freeBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code free_disk_percent}
+         */
+        public final Builder freeDiskPercent(double value) {
+            this.freeDiskPercent = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code used_disk_percent}
+         */
+        public final Builder usedDiskPercent(double value) {
+            this.usedDiskPercent = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link DiskUsage}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DiskUsage build() {
+            _checkSingleUse();
+
+            return new DiskUsage(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DiskUsage}
+     */
+    public static final JsonpDeserializer<DiskUsage> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DiskUsage::setupDiskUsageDeserializer
+    );
+
+    protected static void setupDiskUsageDeserializer(ObjectDeserializer<DiskUsage.Builder> op) {
+
+        op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
+        op.add(Builder::totalBytes, JsonpDeserializer.longDeserializer(), "total_bytes");
+        op.add(Builder::usedBytes, JsonpDeserializer.longDeserializer(), "used_bytes");
+        op.add(Builder::freeBytes, JsonpDeserializer.longDeserializer(), "free_bytes");
+        op.add(Builder::freeDiskPercent, JsonpDeserializer.doubleDeserializer(), "free_disk_percent");
+        op.add(Builder::usedDiskPercent, JsonpDeserializer.doubleDeserializer(), "used_disk_percent");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/NodeAllocationExplanation.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/NodeAllocationExplanation.java
index e31e952afa..a5bf29a5dd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/NodeAllocationExplanation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/NodeAllocationExplanation.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch.cluster.allocation_explain;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,325 +46,319 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.allocation_explain.NodeAllocationExplanation
 
-
 @JsonpDeserializable
 public class NodeAllocationExplanation implements JsonpSerializable {
-	private final List<AllocationDecision> deciders;
-
-	private final Map<String, String> nodeAttributes;
-
-	private final Decision nodeDecision;
-
-	private final String nodeId;
-
-	private final String nodeName;
-
-	@Nullable
-	private final AllocationStore store;
-
-	private final String transportAddress;
-
-	private final int weightRanking;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeAllocationExplanation(Builder builder) {
-
-		this.deciders = ApiTypeHelper.unmodifiableRequired(builder.deciders, this, "deciders");
-		this.nodeAttributes = ApiTypeHelper.unmodifiableRequired(builder.nodeAttributes, this, "nodeAttributes");
-		this.nodeDecision = ApiTypeHelper.requireNonNull(builder.nodeDecision, this, "nodeDecision");
-		this.nodeId = ApiTypeHelper.requireNonNull(builder.nodeId, this, "nodeId");
-		this.nodeName = ApiTypeHelper.requireNonNull(builder.nodeName, this, "nodeName");
-		this.store = builder.store;
-		this.transportAddress = ApiTypeHelper.requireNonNull(builder.transportAddress, this, "transportAddress");
-		this.weightRanking = ApiTypeHelper.requireNonNull(builder.weightRanking, this, "weightRanking");
-
-	}
-
-	public static NodeAllocationExplanation of(Function<Builder, ObjectBuilder<NodeAllocationExplanation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code deciders}
-	 */
-	public final List<AllocationDecision> deciders() {
-		return this.deciders;
-	}
-
-	/**
-	 * Required - API name: {@code node_attributes}
-	 */
-	public final Map<String, String> nodeAttributes() {
-		return this.nodeAttributes;
-	}
-
-	/**
-	 * Required - API name: {@code node_decision}
-	 */
-	public final Decision nodeDecision() {
-		return this.nodeDecision;
-	}
-
-	/**
-	 * Required - API name: {@code node_id}
-	 */
-	public final String nodeId() {
-		return this.nodeId;
-	}
-
-	/**
-	 * Required - API name: {@code node_name}
-	 */
-	public final String nodeName() {
-		return this.nodeName;
-	}
+    private final List<AllocationDecision> deciders;
+
+    private final Map<String, String> nodeAttributes;
+
+    private final Decision nodeDecision;
+
+    private final String nodeId;
+
+    private final String nodeName;
+
+    @Nullable
+    private final AllocationStore store;
+
+    private final String transportAddress;
+
+    private final int weightRanking;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeAllocationExplanation(Builder builder) {
+
+        this.deciders = ApiTypeHelper.unmodifiableRequired(builder.deciders, this, "deciders");
+        this.nodeAttributes = ApiTypeHelper.unmodifiableRequired(builder.nodeAttributes, this, "nodeAttributes");
+        this.nodeDecision = ApiTypeHelper.requireNonNull(builder.nodeDecision, this, "nodeDecision");
+        this.nodeId = ApiTypeHelper.requireNonNull(builder.nodeId, this, "nodeId");
+        this.nodeName = ApiTypeHelper.requireNonNull(builder.nodeName, this, "nodeName");
+        this.store = builder.store;
+        this.transportAddress = ApiTypeHelper.requireNonNull(builder.transportAddress, this, "transportAddress");
+        this.weightRanking = ApiTypeHelper.requireNonNull(builder.weightRanking, this, "weightRanking");
+
+    }
+
+    public static NodeAllocationExplanation of(Function<Builder, ObjectBuilder<NodeAllocationExplanation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code deciders}
+     */
+    public final List<AllocationDecision> deciders() {
+        return this.deciders;
+    }
+
+    /**
+     * Required - API name: {@code node_attributes}
+     */
+    public final Map<String, String> nodeAttributes() {
+        return this.nodeAttributes;
+    }
+
+    /**
+     * Required - API name: {@code node_decision}
+     */
+    public final Decision nodeDecision() {
+        return this.nodeDecision;
+    }
+
+    /**
+     * Required - API name: {@code node_id}
+     */
+    public final String nodeId() {
+        return this.nodeId;
+    }
+
+    /**
+     * Required - API name: {@code node_name}
+     */
+    public final String nodeName() {
+        return this.nodeName;
+    }
 
-	/**
-	 * API name: {@code store}
-	 */
-	@Nullable
-	public final AllocationStore store() {
-		return this.store;
-	}
-
-	/**
-	 * Required - API name: {@code transport_address}
-	 */
-	public final String transportAddress() {
-		return this.transportAddress;
-	}
-
-	/**
-	 * Required - API name: {@code weight_ranking}
-	 */
-	public final int weightRanking() {
-		return this.weightRanking;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.deciders)) {
-			generator.writeKey("deciders");
-			generator.writeStartArray();
-			for (AllocationDecision item0 : this.deciders) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.nodeAttributes)) {
-			generator.writeKey("node_attributes");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.nodeAttributes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("node_decision");
-		this.nodeDecision.serialize(generator, mapper);
-		generator.writeKey("node_id");
-		generator.write(this.nodeId);
-
-		generator.writeKey("node_name");
-		generator.write(this.nodeName);
-
-		if (this.store != null) {
-			generator.writeKey("store");
-			this.store.serialize(generator, mapper);
-
-		}
-		generator.writeKey("transport_address");
-		generator.write(this.transportAddress);
-
-		generator.writeKey("weight_ranking");
-		generator.write(this.weightRanking);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeAllocationExplanation}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeAllocationExplanation> {
-		private List<AllocationDecision> deciders;
-
-		private Map<String, String> nodeAttributes;
-
-		private Decision nodeDecision;
-
-		private String nodeId;
-
-		private String nodeName;
-
-		@Nullable
-		private AllocationStore store;
-
-		private String transportAddress;
-
-		private Integer weightRanking;
-
-		/**
-		 * Required - API name: {@code deciders}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>deciders</code>.
-		 */
-		public final Builder deciders(List<AllocationDecision> list) {
-			this.deciders = _listAddAll(this.deciders, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code deciders}
-		 * <p>
-		 * Adds one or more values to <code>deciders</code>.
-		 */
-		public final Builder deciders(AllocationDecision value, AllocationDecision... values) {
-			this.deciders = _listAdd(this.deciders, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code deciders}
-		 * <p>
-		 * Adds a value to <code>deciders</code> using a builder lambda.
-		 */
-		public final Builder deciders(Function<AllocationDecision.Builder, ObjectBuilder<AllocationDecision>> fn) {
-			return deciders(fn.apply(new AllocationDecision.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code node_attributes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>nodeAttributes</code>.
-		 */
-		public final Builder nodeAttributes(Map<String, String> map) {
-			this.nodeAttributes = _mapPutAll(this.nodeAttributes, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code node_attributes}
-		 * <p>
-		 * Adds an entry to <code>nodeAttributes</code>.
-		 */
-		public final Builder nodeAttributes(String key, String value) {
-			this.nodeAttributes = _mapPut(this.nodeAttributes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code node_decision}
-		 */
-		public final Builder nodeDecision(Decision value) {
-			this.nodeDecision = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code node_id}
-		 */
-		public final Builder nodeId(String value) {
-			this.nodeId = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code node_name}
-		 */
-		public final Builder nodeName(String value) {
-			this.nodeName = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code store}
-		 */
-		public final Builder store(@Nullable AllocationStore value) {
-			this.store = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code store}
-		 */
-		public final Builder store(Function<AllocationStore.Builder, ObjectBuilder<AllocationStore>> fn) {
-			return this.store(fn.apply(new AllocationStore.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code transport_address}
-		 */
-		public final Builder transportAddress(String value) {
-			this.transportAddress = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code weight_ranking}
-		 */
-		public final Builder weightRanking(int value) {
-			this.weightRanking = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeAllocationExplanation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeAllocationExplanation build() {
-			_checkSingleUse();
-
-			return new NodeAllocationExplanation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeAllocationExplanation}
-	 */
-	public static final JsonpDeserializer<NodeAllocationExplanation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeAllocationExplanation::setupNodeAllocationExplanationDeserializer);
-
-	protected static void setupNodeAllocationExplanationDeserializer(
-			ObjectDeserializer<NodeAllocationExplanation.Builder> op) {
-
-		op.add(Builder::deciders, JsonpDeserializer.arrayDeserializer(AllocationDecision._DESERIALIZER), "deciders");
-		op.add(Builder::nodeAttributes, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
-				"node_attributes");
-		op.add(Builder::nodeDecision, Decision._DESERIALIZER, "node_decision");
-		op.add(Builder::nodeId, JsonpDeserializer.stringDeserializer(), "node_id");
-		op.add(Builder::nodeName, JsonpDeserializer.stringDeserializer(), "node_name");
-		op.add(Builder::store, AllocationStore._DESERIALIZER, "store");
-		op.add(Builder::transportAddress, JsonpDeserializer.stringDeserializer(), "transport_address");
-		op.add(Builder::weightRanking, JsonpDeserializer.integerDeserializer(), "weight_ranking");
-
-	}
+    /**
+     * API name: {@code store}
+     */
+    @Nullable
+    public final AllocationStore store() {
+        return this.store;
+    }
+
+    /**
+     * Required - API name: {@code transport_address}
+     */
+    public final String transportAddress() {
+        return this.transportAddress;
+    }
+
+    /**
+     * Required - API name: {@code weight_ranking}
+     */
+    public final int weightRanking() {
+        return this.weightRanking;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.deciders)) {
+            generator.writeKey("deciders");
+            generator.writeStartArray();
+            for (AllocationDecision item0 : this.deciders) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.nodeAttributes)) {
+            generator.writeKey("node_attributes");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.nodeAttributes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("node_decision");
+        this.nodeDecision.serialize(generator, mapper);
+        generator.writeKey("node_id");
+        generator.write(this.nodeId);
+
+        generator.writeKey("node_name");
+        generator.write(this.nodeName);
+
+        if (this.store != null) {
+            generator.writeKey("store");
+            this.store.serialize(generator, mapper);
+
+        }
+        generator.writeKey("transport_address");
+        generator.write(this.transportAddress);
+
+        generator.writeKey("weight_ranking");
+        generator.write(this.weightRanking);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeAllocationExplanation}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeAllocationExplanation> {
+        private List<AllocationDecision> deciders;
+
+        private Map<String, String> nodeAttributes;
+
+        private Decision nodeDecision;
+
+        private String nodeId;
+
+        private String nodeName;
+
+        @Nullable
+        private AllocationStore store;
+
+        private String transportAddress;
+
+        private Integer weightRanking;
+
+        /**
+         * Required - API name: {@code deciders}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>deciders</code>.
+         */
+        public final Builder deciders(List<AllocationDecision> list) {
+            this.deciders = _listAddAll(this.deciders, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code deciders}
+         * <p>
+         * Adds one or more values to <code>deciders</code>.
+         */
+        public final Builder deciders(AllocationDecision value, AllocationDecision... values) {
+            this.deciders = _listAdd(this.deciders, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code deciders}
+         * <p>
+         * Adds a value to <code>deciders</code> using a builder lambda.
+         */
+        public final Builder deciders(Function<AllocationDecision.Builder, ObjectBuilder<AllocationDecision>> fn) {
+            return deciders(fn.apply(new AllocationDecision.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code node_attributes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>nodeAttributes</code>.
+         */
+        public final Builder nodeAttributes(Map<String, String> map) {
+            this.nodeAttributes = _mapPutAll(this.nodeAttributes, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code node_attributes}
+         * <p>
+         * Adds an entry to <code>nodeAttributes</code>.
+         */
+        public final Builder nodeAttributes(String key, String value) {
+            this.nodeAttributes = _mapPut(this.nodeAttributes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code node_decision}
+         */
+        public final Builder nodeDecision(Decision value) {
+            this.nodeDecision = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code node_id}
+         */
+        public final Builder nodeId(String value) {
+            this.nodeId = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code node_name}
+         */
+        public final Builder nodeName(String value) {
+            this.nodeName = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code store}
+         */
+        public final Builder store(@Nullable AllocationStore value) {
+            this.store = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code store}
+         */
+        public final Builder store(Function<AllocationStore.Builder, ObjectBuilder<AllocationStore>> fn) {
+            return this.store(fn.apply(new AllocationStore.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code transport_address}
+         */
+        public final Builder transportAddress(String value) {
+            this.transportAddress = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code weight_ranking}
+         */
+        public final Builder weightRanking(int value) {
+            this.weightRanking = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeAllocationExplanation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeAllocationExplanation build() {
+            _checkSingleUse();
+
+            return new NodeAllocationExplanation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeAllocationExplanation}
+     */
+    public static final JsonpDeserializer<NodeAllocationExplanation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeAllocationExplanation::setupNodeAllocationExplanationDeserializer
+    );
+
+    protected static void setupNodeAllocationExplanationDeserializer(ObjectDeserializer<NodeAllocationExplanation.Builder> op) {
+
+        op.add(Builder::deciders, JsonpDeserializer.arrayDeserializer(AllocationDecision._DESERIALIZER), "deciders");
+        op.add(Builder::nodeAttributes, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "node_attributes");
+        op.add(Builder::nodeDecision, Decision._DESERIALIZER, "node_decision");
+        op.add(Builder::nodeId, JsonpDeserializer.stringDeserializer(), "node_id");
+        op.add(Builder::nodeName, JsonpDeserializer.stringDeserializer(), "node_name");
+        op.add(Builder::store, AllocationStore._DESERIALIZER, "store");
+        op.add(Builder::transportAddress, JsonpDeserializer.stringDeserializer(), "transport_address");
+        op.add(Builder::weightRanking, JsonpDeserializer.integerDeserializer(), "weight_ranking");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/NodeDiskUsage.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/NodeDiskUsage.java
index 0e05930ef3..2146c9908a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/NodeDiskUsage.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/NodeDiskUsage.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.allocation_explain;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,155 +43,154 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.allocation_explain.NodeDiskUsage
 
-
 @JsonpDeserializable
 public class NodeDiskUsage implements JsonpSerializable {
-	private final String nodeName;
+    private final String nodeName;
 
-	private final DiskUsage leastAvailable;
-
-	private final DiskUsage mostAvailable;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeDiskUsage(Builder builder) {
-
-		this.nodeName = ApiTypeHelper.requireNonNull(builder.nodeName, this, "nodeName");
-		this.leastAvailable = ApiTypeHelper.requireNonNull(builder.leastAvailable, this, "leastAvailable");
-		this.mostAvailable = ApiTypeHelper.requireNonNull(builder.mostAvailable, this, "mostAvailable");
-
-	}
-
-	public static NodeDiskUsage of(Function<Builder, ObjectBuilder<NodeDiskUsage>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code node_name}
-	 */
-	public final String nodeName() {
-		return this.nodeName;
-	}
-
-	/**
-	 * Required - API name: {@code least_available}
-	 */
-	public final DiskUsage leastAvailable() {
-		return this.leastAvailable;
-	}
-
-	/**
-	 * Required - API name: {@code most_available}
-	 */
-	public final DiskUsage mostAvailable() {
-		return this.mostAvailable;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("node_name");
-		generator.write(this.nodeName);
-
-		generator.writeKey("least_available");
-		this.leastAvailable.serialize(generator, mapper);
-
-		generator.writeKey("most_available");
-		this.mostAvailable.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeDiskUsage}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeDiskUsage> {
-		private String nodeName;
-
-		private DiskUsage leastAvailable;
-
-		private DiskUsage mostAvailable;
-
-		/**
-		 * Required - API name: {@code node_name}
-		 */
-		public final Builder nodeName(String value) {
-			this.nodeName = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code least_available}
-		 */
-		public final Builder leastAvailable(DiskUsage value) {
-			this.leastAvailable = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code least_available}
-		 */
-		public final Builder leastAvailable(Function<DiskUsage.Builder, ObjectBuilder<DiskUsage>> fn) {
-			return this.leastAvailable(fn.apply(new DiskUsage.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code most_available}
-		 */
-		public final Builder mostAvailable(DiskUsage value) {
-			this.mostAvailable = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code most_available}
-		 */
-		public final Builder mostAvailable(Function<DiskUsage.Builder, ObjectBuilder<DiskUsage>> fn) {
-			return this.mostAvailable(fn.apply(new DiskUsage.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link NodeDiskUsage}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeDiskUsage build() {
-			_checkSingleUse();
-
-			return new NodeDiskUsage(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeDiskUsage}
-	 */
-	public static final JsonpDeserializer<NodeDiskUsage> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeDiskUsage::setupNodeDiskUsageDeserializer);
-
-	protected static void setupNodeDiskUsageDeserializer(ObjectDeserializer<NodeDiskUsage.Builder> op) {
-
-		op.add(Builder::nodeName, JsonpDeserializer.stringDeserializer(), "node_name");
-		op.add(Builder::leastAvailable, DiskUsage._DESERIALIZER, "least_available");
-		op.add(Builder::mostAvailable, DiskUsage._DESERIALIZER, "most_available");
-
-	}
+    private final DiskUsage leastAvailable;
+
+    private final DiskUsage mostAvailable;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeDiskUsage(Builder builder) {
+
+        this.nodeName = ApiTypeHelper.requireNonNull(builder.nodeName, this, "nodeName");
+        this.leastAvailable = ApiTypeHelper.requireNonNull(builder.leastAvailable, this, "leastAvailable");
+        this.mostAvailable = ApiTypeHelper.requireNonNull(builder.mostAvailable, this, "mostAvailable");
+
+    }
+
+    public static NodeDiskUsage of(Function<Builder, ObjectBuilder<NodeDiskUsage>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code node_name}
+     */
+    public final String nodeName() {
+        return this.nodeName;
+    }
+
+    /**
+     * Required - API name: {@code least_available}
+     */
+    public final DiskUsage leastAvailable() {
+        return this.leastAvailable;
+    }
+
+    /**
+     * Required - API name: {@code most_available}
+     */
+    public final DiskUsage mostAvailable() {
+        return this.mostAvailable;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("node_name");
+        generator.write(this.nodeName);
+
+        generator.writeKey("least_available");
+        this.leastAvailable.serialize(generator, mapper);
+
+        generator.writeKey("most_available");
+        this.mostAvailable.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeDiskUsage}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeDiskUsage> {
+        private String nodeName;
+
+        private DiskUsage leastAvailable;
+
+        private DiskUsage mostAvailable;
+
+        /**
+         * Required - API name: {@code node_name}
+         */
+        public final Builder nodeName(String value) {
+            this.nodeName = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code least_available}
+         */
+        public final Builder leastAvailable(DiskUsage value) {
+            this.leastAvailable = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code least_available}
+         */
+        public final Builder leastAvailable(Function<DiskUsage.Builder, ObjectBuilder<DiskUsage>> fn) {
+            return this.leastAvailable(fn.apply(new DiskUsage.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code most_available}
+         */
+        public final Builder mostAvailable(DiskUsage value) {
+            this.mostAvailable = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code most_available}
+         */
+        public final Builder mostAvailable(Function<DiskUsage.Builder, ObjectBuilder<DiskUsage>> fn) {
+            return this.mostAvailable(fn.apply(new DiskUsage.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link NodeDiskUsage}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeDiskUsage build() {
+            _checkSingleUse();
+
+            return new NodeDiskUsage(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeDiskUsage}
+     */
+    public static final JsonpDeserializer<NodeDiskUsage> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeDiskUsage::setupNodeDiskUsageDeserializer
+    );
+
+    protected static void setupNodeDiskUsageDeserializer(ObjectDeserializer<NodeDiskUsage.Builder> op) {
+
+        op.add(Builder::nodeName, JsonpDeserializer.stringDeserializer(), "node_name");
+        op.add(Builder::leastAvailable, DiskUsage._DESERIALIZER, "least_available");
+        op.add(Builder::mostAvailable, DiskUsage._DESERIALIZER, "most_available");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/ReservedSize.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/ReservedSize.java
index 820cab950c..36e9732f9e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/ReservedSize.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/ReservedSize.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cluster.allocation_explain;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,186 +44,184 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cluster.allocation_explain.ReservedSize
 
-
 @JsonpDeserializable
 public class ReservedSize implements JsonpSerializable {
-	private final String nodeId;
+    private final String nodeId;
 
-	private final String path;
+    private final String path;
 
-	private final long total;
+    private final long total;
 
-	private final List<String> shards;
+    private final List<String> shards;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ReservedSize(Builder builder) {
+    private ReservedSize(Builder builder) {
 
-		this.nodeId = ApiTypeHelper.requireNonNull(builder.nodeId, this, "nodeId");
-		this.path = ApiTypeHelper.requireNonNull(builder.path, this, "path");
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
-		this.shards = ApiTypeHelper.unmodifiableRequired(builder.shards, this, "shards");
+        this.nodeId = ApiTypeHelper.requireNonNull(builder.nodeId, this, "nodeId");
+        this.path = ApiTypeHelper.requireNonNull(builder.path, this, "path");
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+        this.shards = ApiTypeHelper.unmodifiableRequired(builder.shards, this, "shards");
 
-	}
+    }
 
-	public static ReservedSize of(Function<Builder, ObjectBuilder<ReservedSize>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ReservedSize of(Function<Builder, ObjectBuilder<ReservedSize>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code node_id}
-	 */
-	public final String nodeId() {
-		return this.nodeId;
-	}
-
-	/**
-	 * Required - API name: {@code path}
-	 */
-	public final String path() {
-		return this.path;
-	}
-
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final long total() {
-		return this.total;
-	}
-
-	/**
-	 * Required - API name: {@code shards}
-	 */
-	public final List<String> shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("node_id");
-		generator.write(this.nodeId);
-
-		generator.writeKey("path");
-		generator.write(this.path);
-
-		generator.writeKey("total");
-		generator.write(this.total);
-
-		if (ApiTypeHelper.isDefined(this.shards)) {
-			generator.writeKey("shards");
-			generator.writeStartArray();
-			for (String item0 : this.shards) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ReservedSize}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ReservedSize> {
-		private String nodeId;
-
-		private String path;
-
-		private Long total;
-
-		private List<String> shards;
-
-		/**
-		 * Required - API name: {@code node_id}
-		 */
-		public final Builder nodeId(String value) {
-			this.nodeId = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code path}
-		 */
-		public final Builder path(String value) {
-			this.path = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(long value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>shards</code>.
-		 */
-		public final Builder shards(List<String> list) {
-			this.shards = _listAddAll(this.shards, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards}
-		 * <p>
-		 * Adds one or more values to <code>shards</code>.
-		 */
-		public final Builder shards(String value, String... values) {
-			this.shards = _listAdd(this.shards, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ReservedSize}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ReservedSize build() {
-			_checkSingleUse();
-
-			return new ReservedSize(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ReservedSize}
-	 */
-	public static final JsonpDeserializer<ReservedSize> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ReservedSize::setupReservedSizeDeserializer);
-
-	protected static void setupReservedSizeDeserializer(ObjectDeserializer<ReservedSize.Builder> op) {
-
-		op.add(Builder::nodeId, JsonpDeserializer.stringDeserializer(), "node_id");
-		op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
-		op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
-		op.add(Builder::shards, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "shards");
-
-	}
+    /**
+     * Required - API name: {@code node_id}
+     */
+    public final String nodeId() {
+        return this.nodeId;
+    }
+
+    /**
+     * Required - API name: {@code path}
+     */
+    public final String path() {
+        return this.path;
+    }
+
+    /**
+     * Required - API name: {@code total}
+     */
+    public final long total() {
+        return this.total;
+    }
+
+    /**
+     * Required - API name: {@code shards}
+     */
+    public final List<String> shards() {
+        return this.shards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("node_id");
+        generator.write(this.nodeId);
+
+        generator.writeKey("path");
+        generator.write(this.path);
+
+        generator.writeKey("total");
+        generator.write(this.total);
+
+        if (ApiTypeHelper.isDefined(this.shards)) {
+            generator.writeKey("shards");
+            generator.writeStartArray();
+            for (String item0 : this.shards) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ReservedSize}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ReservedSize> {
+        private String nodeId;
+
+        private String path;
+
+        private Long total;
+
+        private List<String> shards;
+
+        /**
+         * Required - API name: {@code node_id}
+         */
+        public final Builder nodeId(String value) {
+            this.nodeId = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code path}
+         */
+        public final Builder path(String value) {
+            this.path = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(long value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>shards</code>.
+         */
+        public final Builder shards(List<String> list) {
+            this.shards = _listAddAll(this.shards, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards}
+         * <p>
+         * Adds one or more values to <code>shards</code>.
+         */
+        public final Builder shards(String value, String... values) {
+            this.shards = _listAdd(this.shards, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link ReservedSize}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ReservedSize build() {
+            _checkSingleUse();
+
+            return new ReservedSize(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ReservedSize}
+     */
+    public static final JsonpDeserializer<ReservedSize> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ReservedSize::setupReservedSizeDeserializer
+    );
+
+    protected static void setupReservedSizeDeserializer(ObjectDeserializer<ReservedSize.Builder> op) {
+
+        op.add(Builder::nodeId, JsonpDeserializer.stringDeserializer(), "node_id");
+        op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
+        op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
+        op.add(Builder::shards, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "shards");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/UnassignedInformation.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/UnassignedInformation.java
index 03a640e3ae..8db5412553 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/UnassignedInformation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/UnassignedInformation.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cluster.allocation_explain;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,263 +44,261 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.allocation_explain.UnassignedInformation
 
 @JsonpDeserializable
 public class UnassignedInformation implements JsonpSerializable {
-	private final String at;
-
-	@Nullable
-	private final String lastAllocationStatus;
-
-	private final UnassignedInformationReason reason;
-
-	@Nullable
-	private final String details;
-
-	@Nullable
-	private final Integer failedAllocationAttempts;
-
-	@Nullable
-	private final Boolean delayed;
-
-	@Nullable
-	private final String allocationStatus;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private UnassignedInformation(Builder builder) {
-
-		this.at = ApiTypeHelper.requireNonNull(builder.at, this, "at");
-		this.lastAllocationStatus = builder.lastAllocationStatus;
-		this.reason = ApiTypeHelper.requireNonNull(builder.reason, this, "reason");
-		this.details = builder.details;
-		this.failedAllocationAttempts = builder.failedAllocationAttempts;
-		this.delayed = builder.delayed;
-		this.allocationStatus = builder.allocationStatus;
-
-	}
-
-	public static UnassignedInformation of(Function<Builder, ObjectBuilder<UnassignedInformation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code at}
-	 */
-	public final String at() {
-		return this.at;
-	}
-
-	/**
-	 * API name: {@code last_allocation_status}
-	 */
-	@Nullable
-	public final String lastAllocationStatus() {
-		return this.lastAllocationStatus;
-	}
-
-	/**
-	 * Required - API name: {@code reason}
-	 */
-	public final UnassignedInformationReason reason() {
-		return this.reason;
-	}
-
-	/**
-	 * API name: {@code details}
-	 */
-	@Nullable
-	public final String details() {
-		return this.details;
-	}
-
-	/**
-	 * API name: {@code failed_allocation_attempts}
-	 */
-	@Nullable
-	public final Integer failedAllocationAttempts() {
-		return this.failedAllocationAttempts;
-	}
-
-	/**
-	 * API name: {@code delayed}
-	 */
-	@Nullable
-	public final Boolean delayed() {
-		return this.delayed;
-	}
-
-	/**
-	 * API name: {@code allocation_status}
-	 */
-	@Nullable
-	public final String allocationStatus() {
-		return this.allocationStatus;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("at");
-		generator.write(this.at);
-
-		if (this.lastAllocationStatus != null) {
-			generator.writeKey("last_allocation_status");
-			generator.write(this.lastAllocationStatus);
-
-		}
-		generator.writeKey("reason");
-		this.reason.serialize(generator, mapper);
-		if (this.details != null) {
-			generator.writeKey("details");
-			generator.write(this.details);
-
-		}
-		if (this.failedAllocationAttempts != null) {
-			generator.writeKey("failed_allocation_attempts");
-			generator.write(this.failedAllocationAttempts);
-
-		}
-		if (this.delayed != null) {
-			generator.writeKey("delayed");
-			generator.write(this.delayed);
-
-		}
-		if (this.allocationStatus != null) {
-			generator.writeKey("allocation_status");
-			generator.write(this.allocationStatus);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UnassignedInformation}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<UnassignedInformation> {
-		private String at;
-
-		@Nullable
-		private String lastAllocationStatus;
-
-		private UnassignedInformationReason reason;
-
-		@Nullable
-		private String details;
-
-		@Nullable
-		private Integer failedAllocationAttempts;
-
-		@Nullable
-		private Boolean delayed;
-
-		@Nullable
-		private String allocationStatus;
-
-		/**
-		 * Required - API name: {@code at}
-		 */
-		public final Builder at(String value) {
-			this.at = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code last_allocation_status}
-		 */
-		public final Builder lastAllocationStatus(@Nullable String value) {
-			this.lastAllocationStatus = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code reason}
-		 */
-		public final Builder reason(UnassignedInformationReason value) {
-			this.reason = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code details}
-		 */
-		public final Builder details(@Nullable String value) {
-			this.details = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code failed_allocation_attempts}
-		 */
-		public final Builder failedAllocationAttempts(@Nullable Integer value) {
-			this.failedAllocationAttempts = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code delayed}
-		 */
-		public final Builder delayed(@Nullable Boolean value) {
-			this.delayed = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code allocation_status}
-		 */
-		public final Builder allocationStatus(@Nullable String value) {
-			this.allocationStatus = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link UnassignedInformation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UnassignedInformation build() {
-			_checkSingleUse();
-
-			return new UnassignedInformation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link UnassignedInformation}
-	 */
-	public static final JsonpDeserializer<UnassignedInformation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, UnassignedInformation::setupUnassignedInformationDeserializer);
-
-	protected static void setupUnassignedInformationDeserializer(ObjectDeserializer<UnassignedInformation.Builder> op) {
-
-		op.add(Builder::at, JsonpDeserializer.stringDeserializer(), "at");
-		op.add(Builder::lastAllocationStatus, JsonpDeserializer.stringDeserializer(), "last_allocation_status");
-		op.add(Builder::reason, UnassignedInformationReason._DESERIALIZER, "reason");
-		op.add(Builder::details, JsonpDeserializer.stringDeserializer(), "details");
-		op.add(Builder::failedAllocationAttempts, JsonpDeserializer.integerDeserializer(),
-				"failed_allocation_attempts");
-		op.add(Builder::delayed, JsonpDeserializer.booleanDeserializer(), "delayed");
-		op.add(Builder::allocationStatus, JsonpDeserializer.stringDeserializer(), "allocation_status");
-
-	}
+    private final String at;
+
+    @Nullable
+    private final String lastAllocationStatus;
+
+    private final UnassignedInformationReason reason;
+
+    @Nullable
+    private final String details;
+
+    @Nullable
+    private final Integer failedAllocationAttempts;
+
+    @Nullable
+    private final Boolean delayed;
+
+    @Nullable
+    private final String allocationStatus;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private UnassignedInformation(Builder builder) {
+
+        this.at = ApiTypeHelper.requireNonNull(builder.at, this, "at");
+        this.lastAllocationStatus = builder.lastAllocationStatus;
+        this.reason = ApiTypeHelper.requireNonNull(builder.reason, this, "reason");
+        this.details = builder.details;
+        this.failedAllocationAttempts = builder.failedAllocationAttempts;
+        this.delayed = builder.delayed;
+        this.allocationStatus = builder.allocationStatus;
+
+    }
+
+    public static UnassignedInformation of(Function<Builder, ObjectBuilder<UnassignedInformation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code at}
+     */
+    public final String at() {
+        return this.at;
+    }
+
+    /**
+     * API name: {@code last_allocation_status}
+     */
+    @Nullable
+    public final String lastAllocationStatus() {
+        return this.lastAllocationStatus;
+    }
+
+    /**
+     * Required - API name: {@code reason}
+     */
+    public final UnassignedInformationReason reason() {
+        return this.reason;
+    }
+
+    /**
+     * API name: {@code details}
+     */
+    @Nullable
+    public final String details() {
+        return this.details;
+    }
+
+    /**
+     * API name: {@code failed_allocation_attempts}
+     */
+    @Nullable
+    public final Integer failedAllocationAttempts() {
+        return this.failedAllocationAttempts;
+    }
+
+    /**
+     * API name: {@code delayed}
+     */
+    @Nullable
+    public final Boolean delayed() {
+        return this.delayed;
+    }
+
+    /**
+     * API name: {@code allocation_status}
+     */
+    @Nullable
+    public final String allocationStatus() {
+        return this.allocationStatus;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("at");
+        generator.write(this.at);
+
+        if (this.lastAllocationStatus != null) {
+            generator.writeKey("last_allocation_status");
+            generator.write(this.lastAllocationStatus);
+
+        }
+        generator.writeKey("reason");
+        this.reason.serialize(generator, mapper);
+        if (this.details != null) {
+            generator.writeKey("details");
+            generator.write(this.details);
+
+        }
+        if (this.failedAllocationAttempts != null) {
+            generator.writeKey("failed_allocation_attempts");
+            generator.write(this.failedAllocationAttempts);
+
+        }
+        if (this.delayed != null) {
+            generator.writeKey("delayed");
+            generator.write(this.delayed);
+
+        }
+        if (this.allocationStatus != null) {
+            generator.writeKey("allocation_status");
+            generator.write(this.allocationStatus);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UnassignedInformation}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<UnassignedInformation> {
+        private String at;
+
+        @Nullable
+        private String lastAllocationStatus;
+
+        private UnassignedInformationReason reason;
+
+        @Nullable
+        private String details;
+
+        @Nullable
+        private Integer failedAllocationAttempts;
+
+        @Nullable
+        private Boolean delayed;
+
+        @Nullable
+        private String allocationStatus;
+
+        /**
+         * Required - API name: {@code at}
+         */
+        public final Builder at(String value) {
+            this.at = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code last_allocation_status}
+         */
+        public final Builder lastAllocationStatus(@Nullable String value) {
+            this.lastAllocationStatus = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code reason}
+         */
+        public final Builder reason(UnassignedInformationReason value) {
+            this.reason = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code details}
+         */
+        public final Builder details(@Nullable String value) {
+            this.details = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code failed_allocation_attempts}
+         */
+        public final Builder failedAllocationAttempts(@Nullable Integer value) {
+            this.failedAllocationAttempts = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code delayed}
+         */
+        public final Builder delayed(@Nullable Boolean value) {
+            this.delayed = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code allocation_status}
+         */
+        public final Builder allocationStatus(@Nullable String value) {
+            this.allocationStatus = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link UnassignedInformation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UnassignedInformation build() {
+            _checkSingleUse();
+
+            return new UnassignedInformation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link UnassignedInformation}
+     */
+    public static final JsonpDeserializer<UnassignedInformation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        UnassignedInformation::setupUnassignedInformationDeserializer
+    );
+
+    protected static void setupUnassignedInformationDeserializer(ObjectDeserializer<UnassignedInformation.Builder> op) {
+
+        op.add(Builder::at, JsonpDeserializer.stringDeserializer(), "at");
+        op.add(Builder::lastAllocationStatus, JsonpDeserializer.stringDeserializer(), "last_allocation_status");
+        op.add(Builder::reason, UnassignedInformationReason._DESERIALIZER, "reason");
+        op.add(Builder::details, JsonpDeserializer.stringDeserializer(), "details");
+        op.add(Builder::failedAllocationAttempts, JsonpDeserializer.integerDeserializer(), "failed_allocation_attempts");
+        op.add(Builder::delayed, JsonpDeserializer.booleanDeserializer(), "delayed");
+        op.add(Builder::allocationStatus, JsonpDeserializer.stringDeserializer(), "allocation_status");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/UnassignedInformationReason.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/UnassignedInformationReason.java
index 1e7a2a2ec7..4c8ba850ed 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/UnassignedInformationReason.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/allocation_explain/UnassignedInformationReason.java
@@ -37,48 +37,49 @@
 
 @JsonpDeserializable
 public enum UnassignedInformationReason implements JsonEnum {
-	IndexCreated("INDEX_CREATED"),
+    IndexCreated("INDEX_CREATED"),
 
-	ClusterRecovered("CLUSTER_RECOVERED"),
+    ClusterRecovered("CLUSTER_RECOVERED"),
 
-	IndexReopened("INDEX_REOPENED"),
+    IndexReopened("INDEX_REOPENED"),
 
-	DanglingIndexImported("DANGLING_INDEX_IMPORTED"),
+    DanglingIndexImported("DANGLING_INDEX_IMPORTED"),
 
-	NewIndexRestored("NEW_INDEX_RESTORED"),
+    NewIndexRestored("NEW_INDEX_RESTORED"),
 
-	ExistingIndexRestored("EXISTING_INDEX_RESTORED"),
+    ExistingIndexRestored("EXISTING_INDEX_RESTORED"),
 
-	ReplicaAdded("REPLICA_ADDED"),
+    ReplicaAdded("REPLICA_ADDED"),
 
-	AllocationFailed("ALLOCATION_FAILED"),
+    AllocationFailed("ALLOCATION_FAILED"),
 
-	NodeLeft("NODE_LEFT"),
+    NodeLeft("NODE_LEFT"),
 
-	RerouteCancelled("REROUTE_CANCELLED"),
+    RerouteCancelled("REROUTE_CANCELLED"),
 
-	Reinitialized("REINITIALIZED"),
+    Reinitialized("REINITIALIZED"),
 
-	ReallocatedReplica("REALLOCATED_REPLICA"),
+    ReallocatedReplica("REALLOCATED_REPLICA"),
 
-	PrimaryFailed("PRIMARY_FAILED"),
+    PrimaryFailed("PRIMARY_FAILED"),
 
-	ForcedEmptyPrimary("FORCED_EMPTY_PRIMARY"),
+    ForcedEmptyPrimary("FORCED_EMPTY_PRIMARY"),
 
-	ManualAllocation("MANUAL_ALLOCATION"),
+    ManualAllocation("MANUAL_ALLOCATION"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	UnassignedInformationReason(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    UnassignedInformationReason(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<UnassignedInformationReason> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			UnassignedInformationReason.values());
+    public static final JsonEnum.Deserializer<UnassignedInformationReason> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        UnassignedInformationReason.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/health/IndexHealthStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/health/IndexHealthStats.java
index 5837bddadb..7572cefd2f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/health/IndexHealthStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/health/IndexHealthStats.java
@@ -32,328 +32,327 @@
 
 package org.opensearch.client.opensearch.cluster.health;
 
-import org.opensearch.client.opensearch._types.HealthStatus;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.HealthStatus;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.health.IndexHealthStats
 
-
 @JsonpDeserializable
 public class IndexHealthStats implements JsonpSerializable {
-	private final int activePrimaryShards;
-
-	private final int activeShards;
-
-	private final int initializingShards;
-
-	private final int numberOfReplicas;
-
-	private final int numberOfShards;
-
-	private final int relocatingShards;
-
-	private final Map<String, ShardHealthStats> shards;
-
-	private final HealthStatus status;
-
-	private final int unassignedShards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexHealthStats(Builder builder) {
-
-		this.activePrimaryShards = ApiTypeHelper.requireNonNull(builder.activePrimaryShards, this,
-				"activePrimaryShards");
-		this.activeShards = ApiTypeHelper.requireNonNull(builder.activeShards, this, "activeShards");
-		this.initializingShards = ApiTypeHelper.requireNonNull(builder.initializingShards, this, "initializingShards");
-		this.numberOfReplicas = ApiTypeHelper.requireNonNull(builder.numberOfReplicas, this, "numberOfReplicas");
-		this.numberOfShards = ApiTypeHelper.requireNonNull(builder.numberOfShards, this, "numberOfShards");
-		this.relocatingShards = ApiTypeHelper.requireNonNull(builder.relocatingShards, this, "relocatingShards");
-		this.shards = ApiTypeHelper.unmodifiable(builder.shards);
-		this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
-		this.unassignedShards = ApiTypeHelper.requireNonNull(builder.unassignedShards, this, "unassignedShards");
-
-	}
-
-	public static IndexHealthStats of(Function<Builder, ObjectBuilder<IndexHealthStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code active_primary_shards}
-	 */
-	public final int activePrimaryShards() {
-		return this.activePrimaryShards;
-	}
-
-	/**
-	 * Required - API name: {@code active_shards}
-	 */
-	public final int activeShards() {
-		return this.activeShards;
-	}
-
-	/**
-	 * Required - API name: {@code initializing_shards}
-	 */
-	public final int initializingShards() {
-		return this.initializingShards;
-	}
-
-	/**
-	 * Required - API name: {@code number_of_replicas}
-	 */
-	public final int numberOfReplicas() {
-		return this.numberOfReplicas;
-	}
+    private final int activePrimaryShards;
+
+    private final int activeShards;
+
+    private final int initializingShards;
+
+    private final int numberOfReplicas;
+
+    private final int numberOfShards;
+
+    private final int relocatingShards;
+
+    private final Map<String, ShardHealthStats> shards;
+
+    private final HealthStatus status;
+
+    private final int unassignedShards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexHealthStats(Builder builder) {
+
+        this.activePrimaryShards = ApiTypeHelper.requireNonNull(builder.activePrimaryShards, this, "activePrimaryShards");
+        this.activeShards = ApiTypeHelper.requireNonNull(builder.activeShards, this, "activeShards");
+        this.initializingShards = ApiTypeHelper.requireNonNull(builder.initializingShards, this, "initializingShards");
+        this.numberOfReplicas = ApiTypeHelper.requireNonNull(builder.numberOfReplicas, this, "numberOfReplicas");
+        this.numberOfShards = ApiTypeHelper.requireNonNull(builder.numberOfShards, this, "numberOfShards");
+        this.relocatingShards = ApiTypeHelper.requireNonNull(builder.relocatingShards, this, "relocatingShards");
+        this.shards = ApiTypeHelper.unmodifiable(builder.shards);
+        this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
+        this.unassignedShards = ApiTypeHelper.requireNonNull(builder.unassignedShards, this, "unassignedShards");
+
+    }
+
+    public static IndexHealthStats of(Function<Builder, ObjectBuilder<IndexHealthStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code active_primary_shards}
+     */
+    public final int activePrimaryShards() {
+        return this.activePrimaryShards;
+    }
+
+    /**
+     * Required - API name: {@code active_shards}
+     */
+    public final int activeShards() {
+        return this.activeShards;
+    }
+
+    /**
+     * Required - API name: {@code initializing_shards}
+     */
+    public final int initializingShards() {
+        return this.initializingShards;
+    }
+
+    /**
+     * Required - API name: {@code number_of_replicas}
+     */
+    public final int numberOfReplicas() {
+        return this.numberOfReplicas;
+    }
 
-	/**
-	 * Required - API name: {@code number_of_shards}
-	 */
-	public final int numberOfShards() {
-		return this.numberOfShards;
-	}
+    /**
+     * Required - API name: {@code number_of_shards}
+     */
+    public final int numberOfShards() {
+        return this.numberOfShards;
+    }
 
-	/**
-	 * Required - API name: {@code relocating_shards}
-	 */
-	public final int relocatingShards() {
-		return this.relocatingShards;
-	}
+    /**
+     * Required - API name: {@code relocating_shards}
+     */
+    public final int relocatingShards() {
+        return this.relocatingShards;
+    }
 
-	/**
-	 * API name: {@code shards}
-	 */
-	public final Map<String, ShardHealthStats> shards() {
-		return this.shards;
-	}
+    /**
+     * API name: {@code shards}
+     */
+    public final Map<String, ShardHealthStats> shards() {
+        return this.shards;
+    }
 
-	/**
-	 * Required - API name: {@code status}
-	 */
-	public final HealthStatus status() {
-		return this.status;
-	}
+    /**
+     * Required - API name: {@code status}
+     */
+    public final HealthStatus status() {
+        return this.status;
+    }
 
-	/**
-	 * Required - API name: {@code unassigned_shards}
-	 */
-	public final int unassignedShards() {
-		return this.unassignedShards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("active_primary_shards");
-		generator.write(this.activePrimaryShards);
-
-		generator.writeKey("active_shards");
-		generator.write(this.activeShards);
-
-		generator.writeKey("initializing_shards");
-		generator.write(this.initializingShards);
-
-		generator.writeKey("number_of_replicas");
-		generator.write(this.numberOfReplicas);
-
-		generator.writeKey("number_of_shards");
-		generator.write(this.numberOfShards);
-
-		generator.writeKey("relocating_shards");
-		generator.write(this.relocatingShards);
-
-		if (ApiTypeHelper.isDefined(this.shards)) {
-			generator.writeKey("shards");
-			generator.writeStartObject();
-			for (Map.Entry<String, ShardHealthStats> item0 : this.shards.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("status");
-		this.status.serialize(generator, mapper);
-		generator.writeKey("unassigned_shards");
-		generator.write(this.unassignedShards);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexHealthStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexHealthStats> {
-		private Integer activePrimaryShards;
-
-		private Integer activeShards;
-
-		private Integer initializingShards;
-
-		private Integer numberOfReplicas;
-
-		private Integer numberOfShards;
-
-		private Integer relocatingShards;
-
-		@Nullable
-		private Map<String, ShardHealthStats> shards;
-
-		private HealthStatus status;
-
-		private Integer unassignedShards;
-
-		/**
-		 * Required - API name: {@code active_primary_shards}
-		 */
-		public final Builder activePrimaryShards(int value) {
-			this.activePrimaryShards = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code active_shards}
-		 */
-		public final Builder activeShards(int value) {
-			this.activeShards = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code initializing_shards}
-		 */
-		public final Builder initializingShards(int value) {
-			this.initializingShards = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code number_of_replicas}
-		 */
-		public final Builder numberOfReplicas(int value) {
-			this.numberOfReplicas = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code number_of_shards}
-		 */
-		public final Builder numberOfShards(int value) {
-			this.numberOfShards = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code relocating_shards}
-		 */
-		public final Builder relocatingShards(int value) {
-			this.relocatingShards = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code shards}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>shards</code>.
-		 */
-		public final Builder shards(Map<String, ShardHealthStats> map) {
-			this.shards = _mapPutAll(this.shards, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code shards}
-		 * <p>
-		 * Adds an entry to <code>shards</code>.
-		 */
-		public final Builder shards(String key, ShardHealthStats value) {
-			this.shards = _mapPut(this.shards, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code shards}
-		 * <p>
-		 * Adds an entry to <code>shards</code> using a builder lambda.
-		 */
-		public final Builder shards(String key,
-				Function<ShardHealthStats.Builder, ObjectBuilder<ShardHealthStats>> fn) {
-			return shards(key, fn.apply(new ShardHealthStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code status}
-		 */
-		public final Builder status(HealthStatus value) {
-			this.status = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code unassigned_shards}
-		 */
-		public final Builder unassignedShards(int value) {
-			this.unassignedShards = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IndexHealthStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexHealthStats build() {
-			_checkSingleUse();
-
-			return new IndexHealthStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndexHealthStats}
-	 */
-	public static final JsonpDeserializer<IndexHealthStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IndexHealthStats::setupIndexHealthStatsDeserializer);
-
-	protected static void setupIndexHealthStatsDeserializer(ObjectDeserializer<IndexHealthStats.Builder> op) {
-
-		op.add(Builder::activePrimaryShards, JsonpDeserializer.integerDeserializer(), "active_primary_shards");
-		op.add(Builder::activeShards, JsonpDeserializer.integerDeserializer(), "active_shards");
-		op.add(Builder::initializingShards, JsonpDeserializer.integerDeserializer(), "initializing_shards");
-		op.add(Builder::numberOfReplicas, JsonpDeserializer.integerDeserializer(), "number_of_replicas");
-		op.add(Builder::numberOfShards, JsonpDeserializer.integerDeserializer(), "number_of_shards");
-		op.add(Builder::relocatingShards, JsonpDeserializer.integerDeserializer(), "relocating_shards");
-		op.add(Builder::shards, JsonpDeserializer.stringMapDeserializer(ShardHealthStats._DESERIALIZER), "shards");
-		op.add(Builder::status, HealthStatus._DESERIALIZER, "status");
-		op.add(Builder::unassignedShards, JsonpDeserializer.integerDeserializer(), "unassigned_shards");
-
-	}
+    /**
+     * Required - API name: {@code unassigned_shards}
+     */
+    public final int unassignedShards() {
+        return this.unassignedShards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("active_primary_shards");
+        generator.write(this.activePrimaryShards);
+
+        generator.writeKey("active_shards");
+        generator.write(this.activeShards);
+
+        generator.writeKey("initializing_shards");
+        generator.write(this.initializingShards);
+
+        generator.writeKey("number_of_replicas");
+        generator.write(this.numberOfReplicas);
+
+        generator.writeKey("number_of_shards");
+        generator.write(this.numberOfShards);
+
+        generator.writeKey("relocating_shards");
+        generator.write(this.relocatingShards);
+
+        if (ApiTypeHelper.isDefined(this.shards)) {
+            generator.writeKey("shards");
+            generator.writeStartObject();
+            for (Map.Entry<String, ShardHealthStats> item0 : this.shards.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("status");
+        this.status.serialize(generator, mapper);
+        generator.writeKey("unassigned_shards");
+        generator.write(this.unassignedShards);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexHealthStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexHealthStats> {
+        private Integer activePrimaryShards;
+
+        private Integer activeShards;
+
+        private Integer initializingShards;
+
+        private Integer numberOfReplicas;
+
+        private Integer numberOfShards;
+
+        private Integer relocatingShards;
+
+        @Nullable
+        private Map<String, ShardHealthStats> shards;
+
+        private HealthStatus status;
+
+        private Integer unassignedShards;
+
+        /**
+         * Required - API name: {@code active_primary_shards}
+         */
+        public final Builder activePrimaryShards(int value) {
+            this.activePrimaryShards = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code active_shards}
+         */
+        public final Builder activeShards(int value) {
+            this.activeShards = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code initializing_shards}
+         */
+        public final Builder initializingShards(int value) {
+            this.initializingShards = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code number_of_replicas}
+         */
+        public final Builder numberOfReplicas(int value) {
+            this.numberOfReplicas = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code number_of_shards}
+         */
+        public final Builder numberOfShards(int value) {
+            this.numberOfShards = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code relocating_shards}
+         */
+        public final Builder relocatingShards(int value) {
+            this.relocatingShards = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code shards}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>shards</code>.
+         */
+        public final Builder shards(Map<String, ShardHealthStats> map) {
+            this.shards = _mapPutAll(this.shards, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code shards}
+         * <p>
+         * Adds an entry to <code>shards</code>.
+         */
+        public final Builder shards(String key, ShardHealthStats value) {
+            this.shards = _mapPut(this.shards, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code shards}
+         * <p>
+         * Adds an entry to <code>shards</code> using a builder lambda.
+         */
+        public final Builder shards(String key, Function<ShardHealthStats.Builder, ObjectBuilder<ShardHealthStats>> fn) {
+            return shards(key, fn.apply(new ShardHealthStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code status}
+         */
+        public final Builder status(HealthStatus value) {
+            this.status = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code unassigned_shards}
+         */
+        public final Builder unassignedShards(int value) {
+            this.unassignedShards = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link IndexHealthStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexHealthStats build() {
+            _checkSingleUse();
+
+            return new IndexHealthStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndexHealthStats}
+     */
+    public static final JsonpDeserializer<IndexHealthStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexHealthStats::setupIndexHealthStatsDeserializer
+    );
+
+    protected static void setupIndexHealthStatsDeserializer(ObjectDeserializer<IndexHealthStats.Builder> op) {
+
+        op.add(Builder::activePrimaryShards, JsonpDeserializer.integerDeserializer(), "active_primary_shards");
+        op.add(Builder::activeShards, JsonpDeserializer.integerDeserializer(), "active_shards");
+        op.add(Builder::initializingShards, JsonpDeserializer.integerDeserializer(), "initializing_shards");
+        op.add(Builder::numberOfReplicas, JsonpDeserializer.integerDeserializer(), "number_of_replicas");
+        op.add(Builder::numberOfShards, JsonpDeserializer.integerDeserializer(), "number_of_shards");
+        op.add(Builder::relocatingShards, JsonpDeserializer.integerDeserializer(), "relocating_shards");
+        op.add(Builder::shards, JsonpDeserializer.stringMapDeserializer(ShardHealthStats._DESERIALIZER), "shards");
+        op.add(Builder::status, HealthStatus._DESERIALIZER, "status");
+        op.add(Builder::unassignedShards, JsonpDeserializer.integerDeserializer(), "unassigned_shards");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/health/ShardHealthStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/health/ShardHealthStats.java
index 5eb2f74b67..c3face082b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/health/ShardHealthStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/health/ShardHealthStats.java
@@ -32,222 +32,223 @@
 
 package org.opensearch.client.opensearch.cluster.health;
 
-import org.opensearch.client.opensearch._types.HealthStatus;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.HealthStatus;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.health.ShardHealthStats
 
-
 @JsonpDeserializable
 public class ShardHealthStats implements JsonpSerializable {
-	private final int activeShards;
+    private final int activeShards;
 
-	private final int initializingShards;
+    private final int initializingShards;
 
-	private final boolean primaryActive;
+    private final boolean primaryActive;
 
-	private final int relocatingShards;
+    private final int relocatingShards;
 
-	private final HealthStatus status;
+    private final HealthStatus status;
 
-	private final int unassignedShards;
+    private final int unassignedShards;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ShardHealthStats(Builder builder) {
+    private ShardHealthStats(Builder builder) {
 
-		this.activeShards = ApiTypeHelper.requireNonNull(builder.activeShards, this, "activeShards");
-		this.initializingShards = ApiTypeHelper.requireNonNull(builder.initializingShards, this, "initializingShards");
-		this.primaryActive = ApiTypeHelper.requireNonNull(builder.primaryActive, this, "primaryActive");
-		this.relocatingShards = ApiTypeHelper.requireNonNull(builder.relocatingShards, this, "relocatingShards");
-		this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
-		this.unassignedShards = ApiTypeHelper.requireNonNull(builder.unassignedShards, this, "unassignedShards");
+        this.activeShards = ApiTypeHelper.requireNonNull(builder.activeShards, this, "activeShards");
+        this.initializingShards = ApiTypeHelper.requireNonNull(builder.initializingShards, this, "initializingShards");
+        this.primaryActive = ApiTypeHelper.requireNonNull(builder.primaryActive, this, "primaryActive");
+        this.relocatingShards = ApiTypeHelper.requireNonNull(builder.relocatingShards, this, "relocatingShards");
+        this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
+        this.unassignedShards = ApiTypeHelper.requireNonNull(builder.unassignedShards, this, "unassignedShards");
 
-	}
+    }
 
-	public static ShardHealthStats of(Function<Builder, ObjectBuilder<ShardHealthStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ShardHealthStats of(Function<Builder, ObjectBuilder<ShardHealthStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code active_shards}
-	 */
-	public final int activeShards() {
-		return this.activeShards;
-	}
+    /**
+     * Required - API name: {@code active_shards}
+     */
+    public final int activeShards() {
+        return this.activeShards;
+    }
 
-	/**
-	 * Required - API name: {@code initializing_shards}
-	 */
-	public final int initializingShards() {
-		return this.initializingShards;
-	}
+    /**
+     * Required - API name: {@code initializing_shards}
+     */
+    public final int initializingShards() {
+        return this.initializingShards;
+    }
 
-	/**
-	 * Required - API name: {@code primary_active}
-	 */
-	public final boolean primaryActive() {
-		return this.primaryActive;
-	}
-
-	/**
-	 * Required - API name: {@code relocating_shards}
-	 */
-	public final int relocatingShards() {
-		return this.relocatingShards;
-	}
-
-	/**
-	 * Required - API name: {@code status}
-	 */
-	public final HealthStatus status() {
-		return this.status;
-	}
-
-	/**
-	 * Required - API name: {@code unassigned_shards}
-	 */
-	public final int unassignedShards() {
-		return this.unassignedShards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("active_shards");
-		generator.write(this.activeShards);
-
-		generator.writeKey("initializing_shards");
-		generator.write(this.initializingShards);
-
-		generator.writeKey("primary_active");
-		generator.write(this.primaryActive);
-
-		generator.writeKey("relocating_shards");
-		generator.write(this.relocatingShards);
-
-		generator.writeKey("status");
-		this.status.serialize(generator, mapper);
-		generator.writeKey("unassigned_shards");
-		generator.write(this.unassignedShards);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardHealthStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardHealthStats> {
-		private Integer activeShards;
-
-		private Integer initializingShards;
-
-		private Boolean primaryActive;
-
-		private Integer relocatingShards;
-
-		private HealthStatus status;
-
-		private Integer unassignedShards;
-
-		/**
-		 * Required - API name: {@code active_shards}
-		 */
-		public final Builder activeShards(int value) {
-			this.activeShards = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code initializing_shards}
-		 */
-		public final Builder initializingShards(int value) {
-			this.initializingShards = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code primary_active}
-		 */
-		public final Builder primaryActive(boolean value) {
-			this.primaryActive = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code relocating_shards}
-		 */
-		public final Builder relocatingShards(int value) {
-			this.relocatingShards = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code status}
-		 */
-		public final Builder status(HealthStatus value) {
-			this.status = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code unassigned_shards}
-		 */
-		public final Builder unassignedShards(int value) {
-			this.unassignedShards = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShardHealthStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardHealthStats build() {
-			_checkSingleUse();
-
-			return new ShardHealthStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardHealthStats}
-	 */
-	public static final JsonpDeserializer<ShardHealthStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShardHealthStats::setupShardHealthStatsDeserializer);
-
-	protected static void setupShardHealthStatsDeserializer(ObjectDeserializer<ShardHealthStats.Builder> op) {
-
-		op.add(Builder::activeShards, JsonpDeserializer.integerDeserializer(), "active_shards");
-		op.add(Builder::initializingShards, JsonpDeserializer.integerDeserializer(), "initializing_shards");
-		op.add(Builder::primaryActive, JsonpDeserializer.booleanDeserializer(), "primary_active");
-		op.add(Builder::relocatingShards, JsonpDeserializer.integerDeserializer(), "relocating_shards");
-		op.add(Builder::status, HealthStatus._DESERIALIZER, "status");
-		op.add(Builder::unassignedShards, JsonpDeserializer.integerDeserializer(), "unassigned_shards");
-
-	}
+    /**
+     * Required - API name: {@code primary_active}
+     */
+    public final boolean primaryActive() {
+        return this.primaryActive;
+    }
+
+    /**
+     * Required - API name: {@code relocating_shards}
+     */
+    public final int relocatingShards() {
+        return this.relocatingShards;
+    }
+
+    /**
+     * Required - API name: {@code status}
+     */
+    public final HealthStatus status() {
+        return this.status;
+    }
+
+    /**
+     * Required - API name: {@code unassigned_shards}
+     */
+    public final int unassignedShards() {
+        return this.unassignedShards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("active_shards");
+        generator.write(this.activeShards);
+
+        generator.writeKey("initializing_shards");
+        generator.write(this.initializingShards);
+
+        generator.writeKey("primary_active");
+        generator.write(this.primaryActive);
+
+        generator.writeKey("relocating_shards");
+        generator.write(this.relocatingShards);
+
+        generator.writeKey("status");
+        this.status.serialize(generator, mapper);
+        generator.writeKey("unassigned_shards");
+        generator.write(this.unassignedShards);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardHealthStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardHealthStats> {
+        private Integer activeShards;
+
+        private Integer initializingShards;
+
+        private Boolean primaryActive;
+
+        private Integer relocatingShards;
+
+        private HealthStatus status;
+
+        private Integer unassignedShards;
+
+        /**
+         * Required - API name: {@code active_shards}
+         */
+        public final Builder activeShards(int value) {
+            this.activeShards = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code initializing_shards}
+         */
+        public final Builder initializingShards(int value) {
+            this.initializingShards = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code primary_active}
+         */
+        public final Builder primaryActive(boolean value) {
+            this.primaryActive = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code relocating_shards}
+         */
+        public final Builder relocatingShards(int value) {
+            this.relocatingShards = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code status}
+         */
+        public final Builder status(HealthStatus value) {
+            this.status = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code unassigned_shards}
+         */
+        public final Builder unassignedShards(int value) {
+            this.unassignedShards = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShardHealthStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardHealthStats build() {
+            _checkSingleUse();
+
+            return new ShardHealthStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardHealthStats}
+     */
+    public static final JsonpDeserializer<ShardHealthStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardHealthStats::setupShardHealthStatsDeserializer
+    );
+
+    protected static void setupShardHealthStatsDeserializer(ObjectDeserializer<ShardHealthStats.Builder> op) {
+
+        op.add(Builder::activeShards, JsonpDeserializer.integerDeserializer(), "active_shards");
+        op.add(Builder::initializingShards, JsonpDeserializer.integerDeserializer(), "initializing_shards");
+        op.add(Builder::primaryActive, JsonpDeserializer.booleanDeserializer(), "primary_active");
+        op.add(Builder::relocatingShards, JsonpDeserializer.integerDeserializer(), "relocating_shards");
+        op.add(Builder::status, HealthStatus._DESERIALIZER, "status");
+        op.add(Builder::unassignedShards, JsonpDeserializer.integerDeserializer(), "unassigned_shards");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/pending_tasks/PendingTask.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/pending_tasks/PendingTask.java
index aa59ba0375..daaedfa1a9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/pending_tasks/PendingTask.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/pending_tasks/PendingTask.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.pending_tasks;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,212 +43,212 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.pending_tasks.PendingTask
 
 @JsonpDeserializable
 public class PendingTask implements JsonpSerializable {
-	private final boolean executing;
+    private final boolean executing;
 
-	private final int insertOrder;
+    private final int insertOrder;
 
-	private final String priority;
+    private final String priority;
 
-	private final String source;
+    private final String source;
 
-	private final String timeInQueue;
+    private final String timeInQueue;
 
-	private final int timeInQueueMillis;
+    private final int timeInQueueMillis;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private PendingTask(Builder builder) {
+    private PendingTask(Builder builder) {
 
-		this.executing = ApiTypeHelper.requireNonNull(builder.executing, this, "executing");
-		this.insertOrder = ApiTypeHelper.requireNonNull(builder.insertOrder, this, "insertOrder");
-		this.priority = ApiTypeHelper.requireNonNull(builder.priority, this, "priority");
-		this.source = ApiTypeHelper.requireNonNull(builder.source, this, "source");
-		this.timeInQueue = ApiTypeHelper.requireNonNull(builder.timeInQueue, this, "timeInQueue");
-		this.timeInQueueMillis = ApiTypeHelper.requireNonNull(builder.timeInQueueMillis, this, "timeInQueueMillis");
+        this.executing = ApiTypeHelper.requireNonNull(builder.executing, this, "executing");
+        this.insertOrder = ApiTypeHelper.requireNonNull(builder.insertOrder, this, "insertOrder");
+        this.priority = ApiTypeHelper.requireNonNull(builder.priority, this, "priority");
+        this.source = ApiTypeHelper.requireNonNull(builder.source, this, "source");
+        this.timeInQueue = ApiTypeHelper.requireNonNull(builder.timeInQueue, this, "timeInQueue");
+        this.timeInQueueMillis = ApiTypeHelper.requireNonNull(builder.timeInQueueMillis, this, "timeInQueueMillis");
 
-	}
+    }
 
-	public static PendingTask of(Function<Builder, ObjectBuilder<PendingTask>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static PendingTask of(Function<Builder, ObjectBuilder<PendingTask>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code executing}
-	 */
-	public final boolean executing() {
-		return this.executing;
-	}
+    /**
+     * Required - API name: {@code executing}
+     */
+    public final boolean executing() {
+        return this.executing;
+    }
 
-	/**
-	 * Required - API name: {@code insert_order}
-	 */
-	public final int insertOrder() {
-		return this.insertOrder;
-	}
+    /**
+     * Required - API name: {@code insert_order}
+     */
+    public final int insertOrder() {
+        return this.insertOrder;
+    }
 
-	/**
-	 * Required - API name: {@code priority}
-	 */
-	public final String priority() {
-		return this.priority;
-	}
+    /**
+     * Required - API name: {@code priority}
+     */
+    public final String priority() {
+        return this.priority;
+    }
 
-	/**
-	 * Required - API name: {@code source}
-	 */
-	public final String source() {
-		return this.source;
-	}
-
-	/**
-	 * Required - API name: {@code time_in_queue}
-	 */
-	public final String timeInQueue() {
-		return this.timeInQueue;
-	}
-
-	/**
-	 * Required - API name: {@code time_in_queue_millis}
-	 */
-	public final int timeInQueueMillis() {
-		return this.timeInQueueMillis;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("executing");
-		generator.write(this.executing);
-
-		generator.writeKey("insert_order");
-		generator.write(this.insertOrder);
-
-		generator.writeKey("priority");
-		generator.write(this.priority);
-
-		generator.writeKey("source");
-		generator.write(this.source);
-
-		generator.writeKey("time_in_queue");
-		generator.write(this.timeInQueue);
-
-		generator.writeKey("time_in_queue_millis");
-		generator.write(this.timeInQueueMillis);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PendingTask}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PendingTask> {
-		private Boolean executing;
-
-		private Integer insertOrder;
-
-		private String priority;
-
-		private String source;
-
-		private String timeInQueue;
-
-		private Integer timeInQueueMillis;
-
-		/**
-		 * Required - API name: {@code executing}
-		 */
-		public final Builder executing(boolean value) {
-			this.executing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code insert_order}
-		 */
-		public final Builder insertOrder(int value) {
-			this.insertOrder = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code priority}
-		 */
-		public final Builder priority(String value) {
-			this.priority = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code source}
-		 */
-		public final Builder source(String value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code time_in_queue}
-		 */
-		public final Builder timeInQueue(String value) {
-			this.timeInQueue = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code time_in_queue_millis}
-		 */
-		public final Builder timeInQueueMillis(int value) {
-			this.timeInQueueMillis = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PendingTask}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PendingTask build() {
-			_checkSingleUse();
-
-			return new PendingTask(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PendingTask}
-	 */
-	public static final JsonpDeserializer<PendingTask> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			PendingTask::setupPendingTaskDeserializer);
-
-	protected static void setupPendingTaskDeserializer(ObjectDeserializer<PendingTask.Builder> op) {
-
-		op.add(Builder::executing, JsonpDeserializer.booleanDeserializer(), "executing");
-		op.add(Builder::insertOrder, JsonpDeserializer.integerDeserializer(), "insert_order");
-		op.add(Builder::priority, JsonpDeserializer.stringDeserializer(), "priority");
-		op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source");
-		op.add(Builder::timeInQueue, JsonpDeserializer.stringDeserializer(), "time_in_queue");
-		op.add(Builder::timeInQueueMillis, JsonpDeserializer.integerDeserializer(), "time_in_queue_millis");
-
-	}
+    /**
+     * Required - API name: {@code source}
+     */
+    public final String source() {
+        return this.source;
+    }
+
+    /**
+     * Required - API name: {@code time_in_queue}
+     */
+    public final String timeInQueue() {
+        return this.timeInQueue;
+    }
+
+    /**
+     * Required - API name: {@code time_in_queue_millis}
+     */
+    public final int timeInQueueMillis() {
+        return this.timeInQueueMillis;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("executing");
+        generator.write(this.executing);
+
+        generator.writeKey("insert_order");
+        generator.write(this.insertOrder);
+
+        generator.writeKey("priority");
+        generator.write(this.priority);
+
+        generator.writeKey("source");
+        generator.write(this.source);
+
+        generator.writeKey("time_in_queue");
+        generator.write(this.timeInQueue);
+
+        generator.writeKey("time_in_queue_millis");
+        generator.write(this.timeInQueueMillis);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PendingTask}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PendingTask> {
+        private Boolean executing;
+
+        private Integer insertOrder;
+
+        private String priority;
+
+        private String source;
+
+        private String timeInQueue;
+
+        private Integer timeInQueueMillis;
+
+        /**
+         * Required - API name: {@code executing}
+         */
+        public final Builder executing(boolean value) {
+            this.executing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code insert_order}
+         */
+        public final Builder insertOrder(int value) {
+            this.insertOrder = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code priority}
+         */
+        public final Builder priority(String value) {
+            this.priority = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code source}
+         */
+        public final Builder source(String value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code time_in_queue}
+         */
+        public final Builder timeInQueue(String value) {
+            this.timeInQueue = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code time_in_queue_millis}
+         */
+        public final Builder timeInQueueMillis(int value) {
+            this.timeInQueueMillis = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link PendingTask}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PendingTask build() {
+            _checkSingleUse();
+
+            return new PendingTask(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PendingTask}
+     */
+    public static final JsonpDeserializer<PendingTask> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PendingTask::setupPendingTaskDeserializer
+    );
+
+    protected static void setupPendingTaskDeserializer(ObjectDeserializer<PendingTask.Builder> op) {
+
+        op.add(Builder::executing, JsonpDeserializer.booleanDeserializer(), "executing");
+        op.add(Builder::insertOrder, JsonpDeserializer.integerDeserializer(), "insert_order");
+        op.add(Builder::priority, JsonpDeserializer.stringDeserializer(), "priority");
+        op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source");
+        op.add(Builder::timeInQueue, JsonpDeserializer.stringDeserializer(), "time_in_queue");
+        op.add(Builder::timeInQueueMillis, JsonpDeserializer.integerDeserializer(), "time_in_queue_millis");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteInfo.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteInfo.java
index a6b9ea2e3d..c0a3f47549 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteInfo.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteInfo.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.remote_info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -44,158 +46,153 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: cluster.remote_info.ClusterRemoteInfo
 
 @JsonpDeserializable
-public class ClusterRemoteInfo
-		implements
-			TaggedUnion<ClusterRemoteInfo.Kind, ClusterRemoteInfoVariant>,
-			JsonpSerializable {
+public class ClusterRemoteInfo implements TaggedUnion<ClusterRemoteInfo.Kind, ClusterRemoteInfoVariant>, JsonpSerializable {
+
+    /**
+     * {@link ClusterRemoteInfo} variant kinds.
+     */
+    /**
+     * {@link ClusterRemoteInfo} variant kinds.
+     */
+
+    public enum Kind implements JsonEnum {
+        Proxy("proxy"),
+
+        Sniff("sniff"),
+
+        ;
 
-	/**
-	 * {@link ClusterRemoteInfo} variant kinds.
-	 */
-	/**
-	 * {@link ClusterRemoteInfo} variant kinds.
-	 */
-
-	public enum Kind implements JsonEnum {
-		Proxy("proxy"),
+        private final String jsonValue;
 
-		Sniff("sniff"),
-
-		;
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
 
-		private final String jsonValue;
-
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
-
-		public String jsonValue() {
-			return this.jsonValue;
-		}
-
-	}
-
-	private final Kind _kind;
-	private final ClusterRemoteInfoVariant _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
+        public String jsonValue() {
+            return this.jsonValue;
+        }
 
-	@Override
-	public final ClusterRemoteInfoVariant _get() {
-		return _value;
-	}
+    }
+
+    private final Kind _kind;
+    private final ClusterRemoteInfoVariant _value;
 
-	public ClusterRemoteInfo(ClusterRemoteInfoVariant value) {
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
 
-		this._kind = ApiTypeHelper.requireNonNull(value._clusterRemoteInfoKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+    @Override
+    public final ClusterRemoteInfoVariant _get() {
+        return _value;
+    }
 
-	}
+    public ClusterRemoteInfo(ClusterRemoteInfoVariant value) {
 
-	private ClusterRemoteInfo(Builder builder) {
+        this._kind = ApiTypeHelper.requireNonNull(value._clusterRemoteInfoKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
 
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+    }
 
-	}
+    private ClusterRemoteInfo(Builder builder) {
 
-	public static ClusterRemoteInfo of(Function<Builder, ObjectBuilder<ClusterRemoteInfo>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
 
-	/**
-	 * Is this variant instance of kind {@code proxy}?
-	 */
-	public boolean isProxy() {
-		return _kind == Kind.Proxy;
-	}
+    }
 
-	/**
-	 * Get the {@code proxy} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code proxy} kind.
-	 */
-	public ClusterRemoteProxyInfo proxy() {
-		return TaggedUnionUtils.get(this, Kind.Proxy);
-	}
+    public static ClusterRemoteInfo of(Function<Builder, ObjectBuilder<ClusterRemoteInfo>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Is this variant instance of kind {@code sniff}?
-	 */
-	public boolean isSniff() {
-		return _kind == Kind.Sniff;
-	}
+    /**
+     * Is this variant instance of kind {@code proxy}?
+     */
+    public boolean isProxy() {
+        return _kind == Kind.Proxy;
+    }
 
-	/**
-	 * Get the {@code sniff} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code sniff} kind.
-	 */
-	public ClusterRemoteSniffInfo sniff() {
-		return TaggedUnionUtils.get(this, Kind.Sniff);
-	}
+    /**
+     * Get the {@code proxy} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code proxy} kind.
+     */
+    public ClusterRemoteProxyInfo proxy() {
+        return TaggedUnionUtils.get(this, Kind.Proxy);
+    }
 
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Is this variant instance of kind {@code sniff}?
+     */
+    public boolean isSniff() {
+        return _kind == Kind.Sniff;
+    }
 
-		mapper.serialize(_value, generator);
+    /**
+     * Get the {@code sniff} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code sniff} kind.
+     */
+    public ClusterRemoteSniffInfo sniff() {
+        return TaggedUnionUtils.get(this, Kind.Sniff);
+    }
 
-	}
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterRemoteInfo> {
-		private Kind _kind;
-		private ClusterRemoteInfoVariant _value;
+        mapper.serialize(_value, generator);
 
-		public ObjectBuilder<ClusterRemoteInfo> proxy(ClusterRemoteProxyInfo v) {
-			this._kind = Kind.Proxy;
-			this._value = v;
-			return this;
-		}
+    }
 
-		public ObjectBuilder<ClusterRemoteInfo> proxy(
-				Function<ClusterRemoteProxyInfo.Builder, ObjectBuilder<ClusterRemoteProxyInfo>> fn) {
-			return this.proxy(fn.apply(new ClusterRemoteProxyInfo.Builder()).build());
-		}
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterRemoteInfo> {
+        private Kind _kind;
+        private ClusterRemoteInfoVariant _value;
 
-		public ObjectBuilder<ClusterRemoteInfo> sniff(ClusterRemoteSniffInfo v) {
-			this._kind = Kind.Sniff;
-			this._value = v;
-			return this;
-		}
+        public ObjectBuilder<ClusterRemoteInfo> proxy(ClusterRemoteProxyInfo v) {
+            this._kind = Kind.Proxy;
+            this._value = v;
+            return this;
+        }
 
-		public ObjectBuilder<ClusterRemoteInfo> sniff(
-				Function<ClusterRemoteSniffInfo.Builder, ObjectBuilder<ClusterRemoteSniffInfo>> fn) {
-			return this.sniff(fn.apply(new ClusterRemoteSniffInfo.Builder()).build());
-		}
+        public ObjectBuilder<ClusterRemoteInfo> proxy(Function<ClusterRemoteProxyInfo.Builder, ObjectBuilder<ClusterRemoteProxyInfo>> fn) {
+            return this.proxy(fn.apply(new ClusterRemoteProxyInfo.Builder()).build());
+        }
 
-		public ClusterRemoteInfo build() {
-			_checkSingleUse();
-			return new ClusterRemoteInfo(this);
-		}
+        public ObjectBuilder<ClusterRemoteInfo> sniff(ClusterRemoteSniffInfo v) {
+            this._kind = Kind.Sniff;
+            this._value = v;
+            return this;
+        }
 
-	}
-
-	protected static void setupClusterRemoteInfoDeserializer(ObjectDeserializer<Builder> op) {
+        public ObjectBuilder<ClusterRemoteInfo> sniff(Function<ClusterRemoteSniffInfo.Builder, ObjectBuilder<ClusterRemoteSniffInfo>> fn) {
+            return this.sniff(fn.apply(new ClusterRemoteSniffInfo.Builder()).build());
+        }
 
-		op.add(Builder::proxy, ClusterRemoteProxyInfo._DESERIALIZER, "proxy");
-		op.add(Builder::sniff, ClusterRemoteSniffInfo._DESERIALIZER, "sniff");
+        public ClusterRemoteInfo build() {
+            _checkSingleUse();
+            return new ClusterRemoteInfo(this);
+        }
+
+    }
 
-		op.setTypeProperty("mode", null);
+    protected static void setupClusterRemoteInfoDeserializer(ObjectDeserializer<Builder> op) {
+
+        op.add(Builder::proxy, ClusterRemoteProxyInfo._DESERIALIZER, "proxy");
+        op.add(Builder::sniff, ClusterRemoteSniffInfo._DESERIALIZER, "sniff");
 
-	}
+        op.setTypeProperty("mode", null);
+
+    }
 
-	public static final JsonpDeserializer<ClusterRemoteInfo> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClusterRemoteInfo::setupClusterRemoteInfoDeserializer, Builder::build);
+    public static final JsonpDeserializer<ClusterRemoteInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterRemoteInfo::setupClusterRemoteInfoDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteInfoBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteInfoBuilders.java
index 5d0c8ec2d9..4678b4c864 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteInfoBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteInfoBuilders.java
@@ -36,23 +36,22 @@
  * Builders for {@link ClusterRemoteInfo} variants.
  */
 public class ClusterRemoteInfoBuilders {
-	private ClusterRemoteInfoBuilders() {
-	}
+    private ClusterRemoteInfoBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link ClusterRemoteProxyInfo proxy}
-	 * {@code ClusterRemoteInfo} variant.
-	 */
-	public static ClusterRemoteProxyInfo.Builder proxy() {
-		return new ClusterRemoteProxyInfo.Builder();
-	}
+    /**
+     * Creates a builder for the {@link ClusterRemoteProxyInfo proxy}
+     * {@code ClusterRemoteInfo} variant.
+     */
+    public static ClusterRemoteProxyInfo.Builder proxy() {
+        return new ClusterRemoteProxyInfo.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link ClusterRemoteSniffInfo sniff}
-	 * {@code ClusterRemoteInfo} variant.
-	 */
-	public static ClusterRemoteSniffInfo.Builder sniff() {
-		return new ClusterRemoteSniffInfo.Builder();
-	}
+    /**
+     * Creates a builder for the {@link ClusterRemoteSniffInfo sniff}
+     * {@code ClusterRemoteInfo} variant.
+     */
+    public static ClusterRemoteSniffInfo.Builder sniff() {
+        return new ClusterRemoteSniffInfo.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteInfoVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteInfoVariant.java
index 8af7a06973..0fff1cec49 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteInfoVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteInfoVariant.java
@@ -39,10 +39,10 @@
  */
 public interface ClusterRemoteInfoVariant extends JsonpSerializable {
 
-	ClusterRemoteInfo.Kind _clusterRemoteInfoKind();
+    ClusterRemoteInfo.Kind _clusterRemoteInfoKind();
 
-	default ClusterRemoteInfo _toClusterRemoteInfo() {
-		return new ClusterRemoteInfo(this);
-	}
+    default ClusterRemoteInfo _toClusterRemoteInfo() {
+        return new ClusterRemoteInfo(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteProxyInfo.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteProxyInfo.java
index 3288758e6d..7fa8c67a4d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteProxyInfo.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteProxyInfo.java
@@ -32,270 +32,266 @@
 
 package org.opensearch.client.opensearch.cluster.remote_info;
 
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Time;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.remote_info.ClusterRemoteProxyInfo
 
 @JsonpDeserializable
 public class ClusterRemoteProxyInfo implements ClusterRemoteInfoVariant, JsonpSerializable {
-	private final boolean connected;
-
-	private final Time initialConnectTimeout;
-
-	private final boolean skipUnavailable;
-
-	private final String proxyAddress;
-
-	private final String serverName;
-
-	private final int numProxySocketsConnected;
-
-	private final int maxProxySocketConnections;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterRemoteProxyInfo(Builder builder) {
-
-		this.connected = ApiTypeHelper.requireNonNull(builder.connected, this, "connected");
-		this.initialConnectTimeout = ApiTypeHelper.requireNonNull(builder.initialConnectTimeout, this,
-				"initialConnectTimeout");
-		this.skipUnavailable = ApiTypeHelper.requireNonNull(builder.skipUnavailable, this, "skipUnavailable");
-		this.proxyAddress = ApiTypeHelper.requireNonNull(builder.proxyAddress, this, "proxyAddress");
-		this.serverName = ApiTypeHelper.requireNonNull(builder.serverName, this, "serverName");
-		this.numProxySocketsConnected = ApiTypeHelper.requireNonNull(builder.numProxySocketsConnected, this,
-				"numProxySocketsConnected");
-		this.maxProxySocketConnections = ApiTypeHelper.requireNonNull(builder.maxProxySocketConnections, this,
-				"maxProxySocketConnections");
-
-	}
+    private final boolean connected;
+
+    private final Time initialConnectTimeout;
+
+    private final boolean skipUnavailable;
+
+    private final String proxyAddress;
+
+    private final String serverName;
+
+    private final int numProxySocketsConnected;
+
+    private final int maxProxySocketConnections;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterRemoteProxyInfo(Builder builder) {
+
+        this.connected = ApiTypeHelper.requireNonNull(builder.connected, this, "connected");
+        this.initialConnectTimeout = ApiTypeHelper.requireNonNull(builder.initialConnectTimeout, this, "initialConnectTimeout");
+        this.skipUnavailable = ApiTypeHelper.requireNonNull(builder.skipUnavailable, this, "skipUnavailable");
+        this.proxyAddress = ApiTypeHelper.requireNonNull(builder.proxyAddress, this, "proxyAddress");
+        this.serverName = ApiTypeHelper.requireNonNull(builder.serverName, this, "serverName");
+        this.numProxySocketsConnected = ApiTypeHelper.requireNonNull(builder.numProxySocketsConnected, this, "numProxySocketsConnected");
+        this.maxProxySocketConnections = ApiTypeHelper.requireNonNull(builder.maxProxySocketConnections, this, "maxProxySocketConnections");
+
+    }
+
+    public static ClusterRemoteProxyInfo of(Function<Builder, ObjectBuilder<ClusterRemoteProxyInfo>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	public static ClusterRemoteProxyInfo of(Function<Builder, ObjectBuilder<ClusterRemoteProxyInfo>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    /**
+     * ClusterRemoteInfo variant kind.
+     */
+    @Override
+    public ClusterRemoteInfo.Kind _clusterRemoteInfoKind() {
+        return ClusterRemoteInfo.Kind.Proxy;
+    }
 
-	/**
-	 * ClusterRemoteInfo variant kind.
-	 */
-	@Override
-	public ClusterRemoteInfo.Kind _clusterRemoteInfoKind() {
-		return ClusterRemoteInfo.Kind.Proxy;
-	}
+    /**
+     * Required - API name: {@code connected}
+     */
+    public final boolean connected() {
+        return this.connected;
+    }
 
-	/**
-	 * Required - API name: {@code connected}
-	 */
-	public final boolean connected() {
-		return this.connected;
-	}
+    /**
+     * Required - API name: {@code initial_connect_timeout}
+     */
+    public final Time initialConnectTimeout() {
+        return this.initialConnectTimeout;
+    }
 
-	/**
-	 * Required - API name: {@code initial_connect_timeout}
-	 */
-	public final Time initialConnectTimeout() {
-		return this.initialConnectTimeout;
-	}
+    /**
+     * Required - API name: {@code skip_unavailable}
+     */
+    public final boolean skipUnavailable() {
+        return this.skipUnavailable;
+    }
 
-	/**
-	 * Required - API name: {@code skip_unavailable}
-	 */
-	public final boolean skipUnavailable() {
-		return this.skipUnavailable;
-	}
+    /**
+     * Required - API name: {@code proxy_address}
+     */
+    public final String proxyAddress() {
+        return this.proxyAddress;
+    }
 
-	/**
-	 * Required - API name: {@code proxy_address}
-	 */
-	public final String proxyAddress() {
-		return this.proxyAddress;
-	}
+    /**
+     * Required - API name: {@code server_name}
+     */
+    public final String serverName() {
+        return this.serverName;
+    }
 
-	/**
-	 * Required - API name: {@code server_name}
-	 */
-	public final String serverName() {
-		return this.serverName;
-	}
-
-	/**
-	 * Required - API name: {@code num_proxy_sockets_connected}
-	 */
-	public final int numProxySocketsConnected() {
-		return this.numProxySocketsConnected;
-	}
-
-	/**
-	 * Required - API name: {@code max_proxy_socket_connections}
-	 */
-	public final int maxProxySocketConnections() {
-		return this.maxProxySocketConnections;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("mode", "proxy");
-
-		generator.writeKey("connected");
-		generator.write(this.connected);
-
-		generator.writeKey("initial_connect_timeout");
-		this.initialConnectTimeout.serialize(generator, mapper);
-
-		generator.writeKey("skip_unavailable");
-		generator.write(this.skipUnavailable);
-
-		generator.writeKey("proxy_address");
-		generator.write(this.proxyAddress);
-
-		generator.writeKey("server_name");
-		generator.write(this.serverName);
-
-		generator.writeKey("num_proxy_sockets_connected");
-		generator.write(this.numProxySocketsConnected);
-
-		generator.writeKey("max_proxy_socket_connections");
-		generator.write(this.maxProxySocketConnections);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterRemoteProxyInfo}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterRemoteProxyInfo> {
-		private Boolean connected;
-
-		private Time initialConnectTimeout;
-
-		private Boolean skipUnavailable;
-
-		private String proxyAddress;
-
-		private String serverName;
-
-		private Integer numProxySocketsConnected;
-
-		private Integer maxProxySocketConnections;
-
-		/**
-		 * Required - API name: {@code connected}
-		 */
-		public final Builder connected(boolean value) {
-			this.connected = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code initial_connect_timeout}
-		 */
-		public final Builder initialConnectTimeout(Time value) {
-			this.initialConnectTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code initial_connect_timeout}
-		 */
-		public final Builder initialConnectTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.initialConnectTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code skip_unavailable}
-		 */
-		public final Builder skipUnavailable(boolean value) {
-			this.skipUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code proxy_address}
-		 */
-		public final Builder proxyAddress(String value) {
-			this.proxyAddress = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code server_name}
-		 */
-		public final Builder serverName(String value) {
-			this.serverName = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code num_proxy_sockets_connected}
-		 */
-		public final Builder numProxySocketsConnected(int value) {
-			this.numProxySocketsConnected = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code max_proxy_socket_connections}
-		 */
-		public final Builder maxProxySocketConnections(int value) {
-			this.maxProxySocketConnections = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ClusterRemoteProxyInfo}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterRemoteProxyInfo build() {
-			_checkSingleUse();
-
-			return new ClusterRemoteProxyInfo(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterRemoteProxyInfo}
-	 */
-	public static final JsonpDeserializer<ClusterRemoteProxyInfo> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClusterRemoteProxyInfo::setupClusterRemoteProxyInfoDeserializer);
-
-	protected static void setupClusterRemoteProxyInfoDeserializer(
-			ObjectDeserializer<ClusterRemoteProxyInfo.Builder> op) {
-
-		op.add(Builder::connected, JsonpDeserializer.booleanDeserializer(), "connected");
-		op.add(Builder::initialConnectTimeout, Time._DESERIALIZER, "initial_connect_timeout");
-		op.add(Builder::skipUnavailable, JsonpDeserializer.booleanDeserializer(), "skip_unavailable");
-		op.add(Builder::proxyAddress, JsonpDeserializer.stringDeserializer(), "proxy_address");
-		op.add(Builder::serverName, JsonpDeserializer.stringDeserializer(), "server_name");
-		op.add(Builder::numProxySocketsConnected, JsonpDeserializer.integerDeserializer(),
-				"num_proxy_sockets_connected");
-		op.add(Builder::maxProxySocketConnections, JsonpDeserializer.integerDeserializer(),
-				"max_proxy_socket_connections");
-
-		op.ignore("mode");
-	}
+    /**
+     * Required - API name: {@code num_proxy_sockets_connected}
+     */
+    public final int numProxySocketsConnected() {
+        return this.numProxySocketsConnected;
+    }
+
+    /**
+     * Required - API name: {@code max_proxy_socket_connections}
+     */
+    public final int maxProxySocketConnections() {
+        return this.maxProxySocketConnections;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("mode", "proxy");
+
+        generator.writeKey("connected");
+        generator.write(this.connected);
+
+        generator.writeKey("initial_connect_timeout");
+        this.initialConnectTimeout.serialize(generator, mapper);
+
+        generator.writeKey("skip_unavailable");
+        generator.write(this.skipUnavailable);
+
+        generator.writeKey("proxy_address");
+        generator.write(this.proxyAddress);
+
+        generator.writeKey("server_name");
+        generator.write(this.serverName);
+
+        generator.writeKey("num_proxy_sockets_connected");
+        generator.write(this.numProxySocketsConnected);
+
+        generator.writeKey("max_proxy_socket_connections");
+        generator.write(this.maxProxySocketConnections);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterRemoteProxyInfo}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterRemoteProxyInfo> {
+        private Boolean connected;
+
+        private Time initialConnectTimeout;
+
+        private Boolean skipUnavailable;
+
+        private String proxyAddress;
+
+        private String serverName;
+
+        private Integer numProxySocketsConnected;
+
+        private Integer maxProxySocketConnections;
+
+        /**
+         * Required - API name: {@code connected}
+         */
+        public final Builder connected(boolean value) {
+            this.connected = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code initial_connect_timeout}
+         */
+        public final Builder initialConnectTimeout(Time value) {
+            this.initialConnectTimeout = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code initial_connect_timeout}
+         */
+        public final Builder initialConnectTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.initialConnectTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code skip_unavailable}
+         */
+        public final Builder skipUnavailable(boolean value) {
+            this.skipUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code proxy_address}
+         */
+        public final Builder proxyAddress(String value) {
+            this.proxyAddress = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code server_name}
+         */
+        public final Builder serverName(String value) {
+            this.serverName = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code num_proxy_sockets_connected}
+         */
+        public final Builder numProxySocketsConnected(int value) {
+            this.numProxySocketsConnected = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code max_proxy_socket_connections}
+         */
+        public final Builder maxProxySocketConnections(int value) {
+            this.maxProxySocketConnections = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ClusterRemoteProxyInfo}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterRemoteProxyInfo build() {
+            _checkSingleUse();
+
+            return new ClusterRemoteProxyInfo(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterRemoteProxyInfo}
+     */
+    public static final JsonpDeserializer<ClusterRemoteProxyInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterRemoteProxyInfo::setupClusterRemoteProxyInfoDeserializer
+    );
+
+    protected static void setupClusterRemoteProxyInfoDeserializer(ObjectDeserializer<ClusterRemoteProxyInfo.Builder> op) {
+
+        op.add(Builder::connected, JsonpDeserializer.booleanDeserializer(), "connected");
+        op.add(Builder::initialConnectTimeout, Time._DESERIALIZER, "initial_connect_timeout");
+        op.add(Builder::skipUnavailable, JsonpDeserializer.booleanDeserializer(), "skip_unavailable");
+        op.add(Builder::proxyAddress, JsonpDeserializer.stringDeserializer(), "proxy_address");
+        op.add(Builder::serverName, JsonpDeserializer.stringDeserializer(), "server_name");
+        op.add(Builder::numProxySocketsConnected, JsonpDeserializer.integerDeserializer(), "num_proxy_sockets_connected");
+        op.add(Builder::maxProxySocketConnections, JsonpDeserializer.integerDeserializer(), "max_proxy_socket_connections");
+
+        op.ignore("mode");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteSniffInfo.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteSniffInfo.java
index fb916f5ee4..3dbadf63d4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteSniffInfo.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/remote_info/ClusterRemoteSniffInfo.java
@@ -32,265 +32,263 @@
 
 package org.opensearch.client.opensearch.cluster.remote_info;
 
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Time;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cluster.remote_info.ClusterRemoteSniffInfo
 
 @JsonpDeserializable
 public class ClusterRemoteSniffInfo implements ClusterRemoteInfoVariant, JsonpSerializable {
-	private final boolean connected;
-
-	private final int maxConnectionsPerCluster;
-
-	private final long numNodesConnected;
-
-	private final Time initialConnectTimeout;
-
-	private final boolean skipUnavailable;
-
-	private final List<String> seeds;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterRemoteSniffInfo(Builder builder) {
-
-		this.connected = ApiTypeHelper.requireNonNull(builder.connected, this, "connected");
-		this.maxConnectionsPerCluster = ApiTypeHelper.requireNonNull(builder.maxConnectionsPerCluster, this,
-				"maxConnectionsPerCluster");
-		this.numNodesConnected = ApiTypeHelper.requireNonNull(builder.numNodesConnected, this, "numNodesConnected");
-		this.initialConnectTimeout = ApiTypeHelper.requireNonNull(builder.initialConnectTimeout, this,
-				"initialConnectTimeout");
-		this.skipUnavailable = ApiTypeHelper.requireNonNull(builder.skipUnavailable, this, "skipUnavailable");
-		this.seeds = ApiTypeHelper.unmodifiableRequired(builder.seeds, this, "seeds");
+    private final boolean connected;
+
+    private final int maxConnectionsPerCluster;
+
+    private final long numNodesConnected;
+
+    private final Time initialConnectTimeout;
+
+    private final boolean skipUnavailable;
+
+    private final List<String> seeds;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterRemoteSniffInfo(Builder builder) {
+
+        this.connected = ApiTypeHelper.requireNonNull(builder.connected, this, "connected");
+        this.maxConnectionsPerCluster = ApiTypeHelper.requireNonNull(builder.maxConnectionsPerCluster, this, "maxConnectionsPerCluster");
+        this.numNodesConnected = ApiTypeHelper.requireNonNull(builder.numNodesConnected, this, "numNodesConnected");
+        this.initialConnectTimeout = ApiTypeHelper.requireNonNull(builder.initialConnectTimeout, this, "initialConnectTimeout");
+        this.skipUnavailable = ApiTypeHelper.requireNonNull(builder.skipUnavailable, this, "skipUnavailable");
+        this.seeds = ApiTypeHelper.unmodifiableRequired(builder.seeds, this, "seeds");
 
-	}
+    }
 
-	public static ClusterRemoteSniffInfo of(Function<Builder, ObjectBuilder<ClusterRemoteSniffInfo>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ClusterRemoteSniffInfo of(Function<Builder, ObjectBuilder<ClusterRemoteSniffInfo>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * ClusterRemoteInfo variant kind.
-	 */
-	@Override
-	public ClusterRemoteInfo.Kind _clusterRemoteInfoKind() {
-		return ClusterRemoteInfo.Kind.Sniff;
-	}
+    /**
+     * ClusterRemoteInfo variant kind.
+     */
+    @Override
+    public ClusterRemoteInfo.Kind _clusterRemoteInfoKind() {
+        return ClusterRemoteInfo.Kind.Sniff;
+    }
 
-	/**
-	 * Required - API name: {@code connected}
-	 */
-	public final boolean connected() {
-		return this.connected;
-	}
+    /**
+     * Required - API name: {@code connected}
+     */
+    public final boolean connected() {
+        return this.connected;
+    }
 
-	/**
-	 * Required - API name: {@code max_connections_per_cluster}
-	 */
-	public final int maxConnectionsPerCluster() {
-		return this.maxConnectionsPerCluster;
-	}
+    /**
+     * Required - API name: {@code max_connections_per_cluster}
+     */
+    public final int maxConnectionsPerCluster() {
+        return this.maxConnectionsPerCluster;
+    }
 
-	/**
-	 * Required - API name: {@code num_nodes_connected}
-	 */
-	public final long numNodesConnected() {
-		return this.numNodesConnected;
-	}
+    /**
+     * Required - API name: {@code num_nodes_connected}
+     */
+    public final long numNodesConnected() {
+        return this.numNodesConnected;
+    }
 
-	/**
-	 * Required - API name: {@code initial_connect_timeout}
-	 */
-	public final Time initialConnectTimeout() {
-		return this.initialConnectTimeout;
-	}
+    /**
+     * Required - API name: {@code initial_connect_timeout}
+     */
+    public final Time initialConnectTimeout() {
+        return this.initialConnectTimeout;
+    }
 
-	/**
-	 * Required - API name: {@code skip_unavailable}
-	 */
-	public final boolean skipUnavailable() {
-		return this.skipUnavailable;
-	}
-
-	/**
-	 * Required - API name: {@code seeds}
-	 */
-	public final List<String> seeds() {
-		return this.seeds;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.write("mode", "sniff");
-
-		generator.writeKey("connected");
-		generator.write(this.connected);
-
-		generator.writeKey("max_connections_per_cluster");
-		generator.write(this.maxConnectionsPerCluster);
-
-		generator.writeKey("num_nodes_connected");
-		generator.write(this.numNodesConnected);
-
-		generator.writeKey("initial_connect_timeout");
-		this.initialConnectTimeout.serialize(generator, mapper);
-
-		generator.writeKey("skip_unavailable");
-		generator.write(this.skipUnavailable);
-
-		if (ApiTypeHelper.isDefined(this.seeds)) {
-			generator.writeKey("seeds");
-			generator.writeStartArray();
-			for (String item0 : this.seeds) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterRemoteSniffInfo}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterRemoteSniffInfo> {
-		private Boolean connected;
-
-		private Integer maxConnectionsPerCluster;
-
-		private Long numNodesConnected;
-
-		private Time initialConnectTimeout;
-
-		private Boolean skipUnavailable;
-
-		private List<String> seeds;
-
-		/**
-		 * Required - API name: {@code connected}
-		 */
-		public final Builder connected(boolean value) {
-			this.connected = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code max_connections_per_cluster}
-		 */
-		public final Builder maxConnectionsPerCluster(int value) {
-			this.maxConnectionsPerCluster = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code num_nodes_connected}
-		 */
-		public final Builder numNodesConnected(long value) {
-			this.numNodesConnected = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code initial_connect_timeout}
-		 */
-		public final Builder initialConnectTimeout(Time value) {
-			this.initialConnectTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code initial_connect_timeout}
-		 */
-		public final Builder initialConnectTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.initialConnectTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code skip_unavailable}
-		 */
-		public final Builder skipUnavailable(boolean value) {
-			this.skipUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code seeds}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>seeds</code>.
-		 */
-		public final Builder seeds(List<String> list) {
-			this.seeds = _listAddAll(this.seeds, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code seeds}
-		 * <p>
-		 * Adds one or more values to <code>seeds</code>.
-		 */
-		public final Builder seeds(String value, String... values) {
-			this.seeds = _listAdd(this.seeds, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ClusterRemoteSniffInfo}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterRemoteSniffInfo build() {
-			_checkSingleUse();
-
-			return new ClusterRemoteSniffInfo(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterRemoteSniffInfo}
-	 */
-	public static final JsonpDeserializer<ClusterRemoteSniffInfo> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClusterRemoteSniffInfo::setupClusterRemoteSniffInfoDeserializer);
-
-	protected static void setupClusterRemoteSniffInfoDeserializer(
-			ObjectDeserializer<ClusterRemoteSniffInfo.Builder> op) {
-
-		op.add(Builder::connected, JsonpDeserializer.booleanDeserializer(), "connected");
-		op.add(Builder::maxConnectionsPerCluster, JsonpDeserializer.integerDeserializer(),
-				"max_connections_per_cluster");
-		op.add(Builder::numNodesConnected, JsonpDeserializer.longDeserializer(), "num_nodes_connected");
-		op.add(Builder::initialConnectTimeout, Time._DESERIALIZER, "initial_connect_timeout");
-		op.add(Builder::skipUnavailable, JsonpDeserializer.booleanDeserializer(), "skip_unavailable");
-		op.add(Builder::seeds, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "seeds");
-
-		op.ignore("mode");
-	}
+    /**
+     * Required - API name: {@code skip_unavailable}
+     */
+    public final boolean skipUnavailable() {
+        return this.skipUnavailable;
+    }
+
+    /**
+     * Required - API name: {@code seeds}
+     */
+    public final List<String> seeds() {
+        return this.seeds;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.write("mode", "sniff");
+
+        generator.writeKey("connected");
+        generator.write(this.connected);
+
+        generator.writeKey("max_connections_per_cluster");
+        generator.write(this.maxConnectionsPerCluster);
+
+        generator.writeKey("num_nodes_connected");
+        generator.write(this.numNodesConnected);
+
+        generator.writeKey("initial_connect_timeout");
+        this.initialConnectTimeout.serialize(generator, mapper);
+
+        generator.writeKey("skip_unavailable");
+        generator.write(this.skipUnavailable);
+
+        if (ApiTypeHelper.isDefined(this.seeds)) {
+            generator.writeKey("seeds");
+            generator.writeStartArray();
+            for (String item0 : this.seeds) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterRemoteSniffInfo}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterRemoteSniffInfo> {
+        private Boolean connected;
+
+        private Integer maxConnectionsPerCluster;
+
+        private Long numNodesConnected;
+
+        private Time initialConnectTimeout;
+
+        private Boolean skipUnavailable;
+
+        private List<String> seeds;
+
+        /**
+         * Required - API name: {@code connected}
+         */
+        public final Builder connected(boolean value) {
+            this.connected = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code max_connections_per_cluster}
+         */
+        public final Builder maxConnectionsPerCluster(int value) {
+            this.maxConnectionsPerCluster = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code num_nodes_connected}
+         */
+        public final Builder numNodesConnected(long value) {
+            this.numNodesConnected = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code initial_connect_timeout}
+         */
+        public final Builder initialConnectTimeout(Time value) {
+            this.initialConnectTimeout = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code initial_connect_timeout}
+         */
+        public final Builder initialConnectTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.initialConnectTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code skip_unavailable}
+         */
+        public final Builder skipUnavailable(boolean value) {
+            this.skipUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code seeds}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>seeds</code>.
+         */
+        public final Builder seeds(List<String> list) {
+            this.seeds = _listAddAll(this.seeds, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code seeds}
+         * <p>
+         * Adds one or more values to <code>seeds</code>.
+         */
+        public final Builder seeds(String value, String... values) {
+            this.seeds = _listAdd(this.seeds, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link ClusterRemoteSniffInfo}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterRemoteSniffInfo build() {
+            _checkSingleUse();
+
+            return new ClusterRemoteSniffInfo(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterRemoteSniffInfo}
+     */
+    public static final JsonpDeserializer<ClusterRemoteSniffInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterRemoteSniffInfo::setupClusterRemoteSniffInfoDeserializer
+    );
+
+    protected static void setupClusterRemoteSniffInfoDeserializer(ObjectDeserializer<ClusterRemoteSniffInfo.Builder> op) {
+
+        op.add(Builder::connected, JsonpDeserializer.booleanDeserializer(), "connected");
+        op.add(Builder::maxConnectionsPerCluster, JsonpDeserializer.integerDeserializer(), "max_connections_per_cluster");
+        op.add(Builder::numNodesConnected, JsonpDeserializer.longDeserializer(), "num_nodes_connected");
+        op.add(Builder::initialConnectTimeout, Time._DESERIALIZER, "initial_connect_timeout");
+        op.add(Builder::skipUnavailable, JsonpDeserializer.booleanDeserializer(), "skip_unavailable");
+        op.add(Builder::seeds, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "seeds");
+
+        op.ignore("mode");
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/Command.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/Command.java
index 8ca32e01d5..1ca520b5a5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/Command.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/Command.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cluster.reroute;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,356 +43,357 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.reroute.Command
 
 @JsonpDeserializable
 public class Command implements JsonpSerializable {
-	@Nullable
-	private final CommandCancelAction cancel;
-
-	@Nullable
-	private final CommandMoveAction move;
-
-	@Nullable
-	private final CommandAllocateReplicaAction allocateReplica;
-
-	@Nullable
-	private final CommandAllocatePrimaryAction allocateStalePrimary;
-
-	@Nullable
-	private final CommandAllocatePrimaryAction allocateEmptyPrimary;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Command(Builder builder) {
-
-		this.cancel = builder.cancel;
-		this.move = builder.move;
-		this.allocateReplica = builder.allocateReplica;
-		this.allocateStalePrimary = builder.allocateStalePrimary;
-		this.allocateEmptyPrimary = builder.allocateEmptyPrimary;
-
-	}
-
-	public static Command of(Function<Builder, ObjectBuilder<Command>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Cancel allocation of a shard (or recovery). Accepts index and shard for index
-	 * name and shard number, and node for the node to cancel the shard allocation
-	 * on. This can be used to force resynchronization of existing replicas from the
-	 * primary shard by cancelling them and allowing them to be reinitialized
-	 * through the standard recovery process. By default only replica shard
-	 * allocations can be cancelled. If it is necessary to cancel the allocation of
-	 * a primary shard then the allow_primary flag must also be included in the
-	 * request.
-	 * <p>
-	 * API name: {@code cancel}
-	 */
-	@Nullable
-	public final CommandCancelAction cancel() {
-		return this.cancel;
-	}
-
-	/**
-	 * Move a started shard from one node to another node. Accepts index and shard
-	 * for index name and shard number, from_node for the node to move the shard
-	 * from, and to_node for the node to move the shard to.
-	 * <p>
-	 * API name: {@code move}
-	 */
-	@Nullable
-	public final CommandMoveAction move() {
-		return this.move;
-	}
-
-	/**
-	 * Allocate an unassigned replica shard to a node. Accepts index and shard for
-	 * index name and shard number, and node to allocate the shard to. Takes
-	 * allocation deciders into account.
-	 * <p>
-	 * API name: {@code allocate_replica}
-	 */
-	@Nullable
-	public final CommandAllocateReplicaAction allocateReplica() {
-		return this.allocateReplica;
-	}
-
-	/**
-	 * Allocate a primary shard to a node that holds a stale copy. Accepts the index
-	 * and shard for index name and shard number, and node to allocate the shard to.
-	 * Using this command may lead to data loss for the provided shard id. If a node
-	 * which has the good copy of the data rejoins the cluster later on, that data
-	 * will be deleted or overwritten with the data of the stale copy that was
-	 * forcefully allocated with this command. To ensure that these implications are
-	 * well-understood, this command requires the flag accept_data_loss to be
-	 * explicitly set to true.
-	 * <p>
-	 * API name: {@code allocate_stale_primary}
-	 */
-	@Nullable
-	public final CommandAllocatePrimaryAction allocateStalePrimary() {
-		return this.allocateStalePrimary;
-	}
-
-	/**
-	 * Allocate an empty primary shard to a node. Accepts the index and shard for
-	 * index name and shard number, and node to allocate the shard to. Using this
-	 * command leads to a complete loss of all data that was indexed into this
-	 * shard, if it was previously started. If a node which has a copy of the data
-	 * rejoins the cluster later on, that data will be deleted. To ensure that these
-	 * implications are well-understood, this command requires the flag
-	 * accept_data_loss to be explicitly set to true.
-	 * <p>
-	 * API name: {@code allocate_empty_primary}
-	 */
-	@Nullable
-	public final CommandAllocatePrimaryAction allocateEmptyPrimary() {
-		return this.allocateEmptyPrimary;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.cancel != null) {
-			generator.writeKey("cancel");
-			this.cancel.serialize(generator, mapper);
-
-		}
-		if (this.move != null) {
-			generator.writeKey("move");
-			this.move.serialize(generator, mapper);
-
-		}
-		if (this.allocateReplica != null) {
-			generator.writeKey("allocate_replica");
-			this.allocateReplica.serialize(generator, mapper);
-
-		}
-		if (this.allocateStalePrimary != null) {
-			generator.writeKey("allocate_stale_primary");
-			this.allocateStalePrimary.serialize(generator, mapper);
-
-		}
-		if (this.allocateEmptyPrimary != null) {
-			generator.writeKey("allocate_empty_primary");
-			this.allocateEmptyPrimary.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Command}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Command> {
-		@Nullable
-		private CommandCancelAction cancel;
-
-		@Nullable
-		private CommandMoveAction move;
-
-		@Nullable
-		private CommandAllocateReplicaAction allocateReplica;
-
-		@Nullable
-		private CommandAllocatePrimaryAction allocateStalePrimary;
-
-		@Nullable
-		private CommandAllocatePrimaryAction allocateEmptyPrimary;
-
-		/**
-		 * Cancel allocation of a shard (or recovery). Accepts index and shard for index
-		 * name and shard number, and node for the node to cancel the shard allocation
-		 * on. This can be used to force resynchronization of existing replicas from the
-		 * primary shard by cancelling them and allowing them to be reinitialized
-		 * through the standard recovery process. By default only replica shard
-		 * allocations can be cancelled. If it is necessary to cancel the allocation of
-		 * a primary shard then the allow_primary flag must also be included in the
-		 * request.
-		 * <p>
-		 * API name: {@code cancel}
-		 */
-		public final Builder cancel(@Nullable CommandCancelAction value) {
-			this.cancel = value;
-			return this;
-		}
-
-		/**
-		 * Cancel allocation of a shard (or recovery). Accepts index and shard for index
-		 * name and shard number, and node for the node to cancel the shard allocation
-		 * on. This can be used to force resynchronization of existing replicas from the
-		 * primary shard by cancelling them and allowing them to be reinitialized
-		 * through the standard recovery process. By default only replica shard
-		 * allocations can be cancelled. If it is necessary to cancel the allocation of
-		 * a primary shard then the allow_primary flag must also be included in the
-		 * request.
-		 * <p>
-		 * API name: {@code cancel}
-		 */
-		public final Builder cancel(Function<CommandCancelAction.Builder, ObjectBuilder<CommandCancelAction>> fn) {
-			return this.cancel(fn.apply(new CommandCancelAction.Builder()).build());
-		}
-
-		/**
-		 * Move a started shard from one node to another node. Accepts index and shard
-		 * for index name and shard number, from_node for the node to move the shard
-		 * from, and to_node for the node to move the shard to.
-		 * <p>
-		 * API name: {@code move}
-		 */
-		public final Builder move(@Nullable CommandMoveAction value) {
-			this.move = value;
-			return this;
-		}
-
-		/**
-		 * Move a started shard from one node to another node. Accepts index and shard
-		 * for index name and shard number, from_node for the node to move the shard
-		 * from, and to_node for the node to move the shard to.
-		 * <p>
-		 * API name: {@code move}
-		 */
-		public final Builder move(Function<CommandMoveAction.Builder, ObjectBuilder<CommandMoveAction>> fn) {
-			return this.move(fn.apply(new CommandMoveAction.Builder()).build());
-		}
-
-		/**
-		 * Allocate an unassigned replica shard to a node. Accepts index and shard for
-		 * index name and shard number, and node to allocate the shard to. Takes
-		 * allocation deciders into account.
-		 * <p>
-		 * API name: {@code allocate_replica}
-		 */
-		public final Builder allocateReplica(@Nullable CommandAllocateReplicaAction value) {
-			this.allocateReplica = value;
-			return this;
-		}
-
-		/**
-		 * Allocate an unassigned replica shard to a node. Accepts index and shard for
-		 * index name and shard number, and node to allocate the shard to. Takes
-		 * allocation deciders into account.
-		 * <p>
-		 * API name: {@code allocate_replica}
-		 */
-		public final Builder allocateReplica(
-				Function<CommandAllocateReplicaAction.Builder, ObjectBuilder<CommandAllocateReplicaAction>> fn) {
-			return this.allocateReplica(fn.apply(new CommandAllocateReplicaAction.Builder()).build());
-		}
-
-		/**
-		 * Allocate a primary shard to a node that holds a stale copy. Accepts the index
-		 * and shard for index name and shard number, and node to allocate the shard to.
-		 * Using this command may lead to data loss for the provided shard id. If a node
-		 * which has the good copy of the data rejoins the cluster later on, that data
-		 * will be deleted or overwritten with the data of the stale copy that was
-		 * forcefully allocated with this command. To ensure that these implications are
-		 * well-understood, this command requires the flag accept_data_loss to be
-		 * explicitly set to true.
-		 * <p>
-		 * API name: {@code allocate_stale_primary}
-		 */
-		public final Builder allocateStalePrimary(@Nullable CommandAllocatePrimaryAction value) {
-			this.allocateStalePrimary = value;
-			return this;
-		}
-
-		/**
-		 * Allocate a primary shard to a node that holds a stale copy. Accepts the index
-		 * and shard for index name and shard number, and node to allocate the shard to.
-		 * Using this command may lead to data loss for the provided shard id. If a node
-		 * which has the good copy of the data rejoins the cluster later on, that data
-		 * will be deleted or overwritten with the data of the stale copy that was
-		 * forcefully allocated with this command. To ensure that these implications are
-		 * well-understood, this command requires the flag accept_data_loss to be
-		 * explicitly set to true.
-		 * <p>
-		 * API name: {@code allocate_stale_primary}
-		 */
-		public final Builder allocateStalePrimary(
-				Function<CommandAllocatePrimaryAction.Builder, ObjectBuilder<CommandAllocatePrimaryAction>> fn) {
-			return this.allocateStalePrimary(fn.apply(new CommandAllocatePrimaryAction.Builder()).build());
-		}
-
-		/**
-		 * Allocate an empty primary shard to a node. Accepts the index and shard for
-		 * index name and shard number, and node to allocate the shard to. Using this
-		 * command leads to a complete loss of all data that was indexed into this
-		 * shard, if it was previously started. If a node which has a copy of the data
-		 * rejoins the cluster later on, that data will be deleted. To ensure that these
-		 * implications are well-understood, this command requires the flag
-		 * accept_data_loss to be explicitly set to true.
-		 * <p>
-		 * API name: {@code allocate_empty_primary}
-		 */
-		public final Builder allocateEmptyPrimary(@Nullable CommandAllocatePrimaryAction value) {
-			this.allocateEmptyPrimary = value;
-			return this;
-		}
-
-		/**
-		 * Allocate an empty primary shard to a node. Accepts the index and shard for
-		 * index name and shard number, and node to allocate the shard to. Using this
-		 * command leads to a complete loss of all data that was indexed into this
-		 * shard, if it was previously started. If a node which has a copy of the data
-		 * rejoins the cluster later on, that data will be deleted. To ensure that these
-		 * implications are well-understood, this command requires the flag
-		 * accept_data_loss to be explicitly set to true.
-		 * <p>
-		 * API name: {@code allocate_empty_primary}
-		 */
-		public final Builder allocateEmptyPrimary(
-				Function<CommandAllocatePrimaryAction.Builder, ObjectBuilder<CommandAllocatePrimaryAction>> fn) {
-			return this.allocateEmptyPrimary(fn.apply(new CommandAllocatePrimaryAction.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link Command}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Command build() {
-			_checkSingleUse();
-
-			return new Command(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Command}
-	 */
-	public static final JsonpDeserializer<Command> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Command::setupCommandDeserializer);
-
-	protected static void setupCommandDeserializer(ObjectDeserializer<Command.Builder> op) {
-
-		op.add(Builder::cancel, CommandCancelAction._DESERIALIZER, "cancel");
-		op.add(Builder::move, CommandMoveAction._DESERIALIZER, "move");
-		op.add(Builder::allocateReplica, CommandAllocateReplicaAction._DESERIALIZER, "allocate_replica");
-		op.add(Builder::allocateStalePrimary, CommandAllocatePrimaryAction._DESERIALIZER, "allocate_stale_primary");
-		op.add(Builder::allocateEmptyPrimary, CommandAllocatePrimaryAction._DESERIALIZER, "allocate_empty_primary");
-
-	}
+    @Nullable
+    private final CommandCancelAction cancel;
+
+    @Nullable
+    private final CommandMoveAction move;
+
+    @Nullable
+    private final CommandAllocateReplicaAction allocateReplica;
+
+    @Nullable
+    private final CommandAllocatePrimaryAction allocateStalePrimary;
+
+    @Nullable
+    private final CommandAllocatePrimaryAction allocateEmptyPrimary;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Command(Builder builder) {
+
+        this.cancel = builder.cancel;
+        this.move = builder.move;
+        this.allocateReplica = builder.allocateReplica;
+        this.allocateStalePrimary = builder.allocateStalePrimary;
+        this.allocateEmptyPrimary = builder.allocateEmptyPrimary;
+
+    }
+
+    public static Command of(Function<Builder, ObjectBuilder<Command>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Cancel allocation of a shard (or recovery). Accepts index and shard for index
+     * name and shard number, and node for the node to cancel the shard allocation
+     * on. This can be used to force resynchronization of existing replicas from the
+     * primary shard by cancelling them and allowing them to be reinitialized
+     * through the standard recovery process. By default only replica shard
+     * allocations can be cancelled. If it is necessary to cancel the allocation of
+     * a primary shard then the allow_primary flag must also be included in the
+     * request.
+     * <p>
+     * API name: {@code cancel}
+     */
+    @Nullable
+    public final CommandCancelAction cancel() {
+        return this.cancel;
+    }
+
+    /**
+     * Move a started shard from one node to another node. Accepts index and shard
+     * for index name and shard number, from_node for the node to move the shard
+     * from, and to_node for the node to move the shard to.
+     * <p>
+     * API name: {@code move}
+     */
+    @Nullable
+    public final CommandMoveAction move() {
+        return this.move;
+    }
+
+    /**
+     * Allocate an unassigned replica shard to a node. Accepts index and shard for
+     * index name and shard number, and node to allocate the shard to. Takes
+     * allocation deciders into account.
+     * <p>
+     * API name: {@code allocate_replica}
+     */
+    @Nullable
+    public final CommandAllocateReplicaAction allocateReplica() {
+        return this.allocateReplica;
+    }
+
+    /**
+     * Allocate a primary shard to a node that holds a stale copy. Accepts the index
+     * and shard for index name and shard number, and node to allocate the shard to.
+     * Using this command may lead to data loss for the provided shard id. If a node
+     * which has the good copy of the data rejoins the cluster later on, that data
+     * will be deleted or overwritten with the data of the stale copy that was
+     * forcefully allocated with this command. To ensure that these implications are
+     * well-understood, this command requires the flag accept_data_loss to be
+     * explicitly set to true.
+     * <p>
+     * API name: {@code allocate_stale_primary}
+     */
+    @Nullable
+    public final CommandAllocatePrimaryAction allocateStalePrimary() {
+        return this.allocateStalePrimary;
+    }
+
+    /**
+     * Allocate an empty primary shard to a node. Accepts the index and shard for
+     * index name and shard number, and node to allocate the shard to. Using this
+     * command leads to a complete loss of all data that was indexed into this
+     * shard, if it was previously started. If a node which has a copy of the data
+     * rejoins the cluster later on, that data will be deleted. To ensure that these
+     * implications are well-understood, this command requires the flag
+     * accept_data_loss to be explicitly set to true.
+     * <p>
+     * API name: {@code allocate_empty_primary}
+     */
+    @Nullable
+    public final CommandAllocatePrimaryAction allocateEmptyPrimary() {
+        return this.allocateEmptyPrimary;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.cancel != null) {
+            generator.writeKey("cancel");
+            this.cancel.serialize(generator, mapper);
+
+        }
+        if (this.move != null) {
+            generator.writeKey("move");
+            this.move.serialize(generator, mapper);
+
+        }
+        if (this.allocateReplica != null) {
+            generator.writeKey("allocate_replica");
+            this.allocateReplica.serialize(generator, mapper);
+
+        }
+        if (this.allocateStalePrimary != null) {
+            generator.writeKey("allocate_stale_primary");
+            this.allocateStalePrimary.serialize(generator, mapper);
+
+        }
+        if (this.allocateEmptyPrimary != null) {
+            generator.writeKey("allocate_empty_primary");
+            this.allocateEmptyPrimary.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Command}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Command> {
+        @Nullable
+        private CommandCancelAction cancel;
+
+        @Nullable
+        private CommandMoveAction move;
+
+        @Nullable
+        private CommandAllocateReplicaAction allocateReplica;
+
+        @Nullable
+        private CommandAllocatePrimaryAction allocateStalePrimary;
+
+        @Nullable
+        private CommandAllocatePrimaryAction allocateEmptyPrimary;
+
+        /**
+         * Cancel allocation of a shard (or recovery). Accepts index and shard for index
+         * name and shard number, and node for the node to cancel the shard allocation
+         * on. This can be used to force resynchronization of existing replicas from the
+         * primary shard by cancelling them and allowing them to be reinitialized
+         * through the standard recovery process. By default only replica shard
+         * allocations can be cancelled. If it is necessary to cancel the allocation of
+         * a primary shard then the allow_primary flag must also be included in the
+         * request.
+         * <p>
+         * API name: {@code cancel}
+         */
+        public final Builder cancel(@Nullable CommandCancelAction value) {
+            this.cancel = value;
+            return this;
+        }
+
+        /**
+         * Cancel allocation of a shard (or recovery). Accepts index and shard for index
+         * name and shard number, and node for the node to cancel the shard allocation
+         * on. This can be used to force resynchronization of existing replicas from the
+         * primary shard by cancelling them and allowing them to be reinitialized
+         * through the standard recovery process. By default only replica shard
+         * allocations can be cancelled. If it is necessary to cancel the allocation of
+         * a primary shard then the allow_primary flag must also be included in the
+         * request.
+         * <p>
+         * API name: {@code cancel}
+         */
+        public final Builder cancel(Function<CommandCancelAction.Builder, ObjectBuilder<CommandCancelAction>> fn) {
+            return this.cancel(fn.apply(new CommandCancelAction.Builder()).build());
+        }
+
+        /**
+         * Move a started shard from one node to another node. Accepts index and shard
+         * for index name and shard number, from_node for the node to move the shard
+         * from, and to_node for the node to move the shard to.
+         * <p>
+         * API name: {@code move}
+         */
+        public final Builder move(@Nullable CommandMoveAction value) {
+            this.move = value;
+            return this;
+        }
+
+        /**
+         * Move a started shard from one node to another node. Accepts index and shard
+         * for index name and shard number, from_node for the node to move the shard
+         * from, and to_node for the node to move the shard to.
+         * <p>
+         * API name: {@code move}
+         */
+        public final Builder move(Function<CommandMoveAction.Builder, ObjectBuilder<CommandMoveAction>> fn) {
+            return this.move(fn.apply(new CommandMoveAction.Builder()).build());
+        }
+
+        /**
+         * Allocate an unassigned replica shard to a node. Accepts index and shard for
+         * index name and shard number, and node to allocate the shard to. Takes
+         * allocation deciders into account.
+         * <p>
+         * API name: {@code allocate_replica}
+         */
+        public final Builder allocateReplica(@Nullable CommandAllocateReplicaAction value) {
+            this.allocateReplica = value;
+            return this;
+        }
+
+        /**
+         * Allocate an unassigned replica shard to a node. Accepts index and shard for
+         * index name and shard number, and node to allocate the shard to. Takes
+         * allocation deciders into account.
+         * <p>
+         * API name: {@code allocate_replica}
+         */
+        public final Builder allocateReplica(
+            Function<CommandAllocateReplicaAction.Builder, ObjectBuilder<CommandAllocateReplicaAction>> fn
+        ) {
+            return this.allocateReplica(fn.apply(new CommandAllocateReplicaAction.Builder()).build());
+        }
+
+        /**
+         * Allocate a primary shard to a node that holds a stale copy. Accepts the index
+         * and shard for index name and shard number, and node to allocate the shard to.
+         * Using this command may lead to data loss for the provided shard id. If a node
+         * which has the good copy of the data rejoins the cluster later on, that data
+         * will be deleted or overwritten with the data of the stale copy that was
+         * forcefully allocated with this command. To ensure that these implications are
+         * well-understood, this command requires the flag accept_data_loss to be
+         * explicitly set to true.
+         * <p>
+         * API name: {@code allocate_stale_primary}
+         */
+        public final Builder allocateStalePrimary(@Nullable CommandAllocatePrimaryAction value) {
+            this.allocateStalePrimary = value;
+            return this;
+        }
+
+        /**
+         * Allocate a primary shard to a node that holds a stale copy. Accepts the index
+         * and shard for index name and shard number, and node to allocate the shard to.
+         * Using this command may lead to data loss for the provided shard id. If a node
+         * which has the good copy of the data rejoins the cluster later on, that data
+         * will be deleted or overwritten with the data of the stale copy that was
+         * forcefully allocated with this command. To ensure that these implications are
+         * well-understood, this command requires the flag accept_data_loss to be
+         * explicitly set to true.
+         * <p>
+         * API name: {@code allocate_stale_primary}
+         */
+        public final Builder allocateStalePrimary(
+            Function<CommandAllocatePrimaryAction.Builder, ObjectBuilder<CommandAllocatePrimaryAction>> fn
+        ) {
+            return this.allocateStalePrimary(fn.apply(new CommandAllocatePrimaryAction.Builder()).build());
+        }
+
+        /**
+         * Allocate an empty primary shard to a node. Accepts the index and shard for
+         * index name and shard number, and node to allocate the shard to. Using this
+         * command leads to a complete loss of all data that was indexed into this
+         * shard, if it was previously started. If a node which has a copy of the data
+         * rejoins the cluster later on, that data will be deleted. To ensure that these
+         * implications are well-understood, this command requires the flag
+         * accept_data_loss to be explicitly set to true.
+         * <p>
+         * API name: {@code allocate_empty_primary}
+         */
+        public final Builder allocateEmptyPrimary(@Nullable CommandAllocatePrimaryAction value) {
+            this.allocateEmptyPrimary = value;
+            return this;
+        }
+
+        /**
+         * Allocate an empty primary shard to a node. Accepts the index and shard for
+         * index name and shard number, and node to allocate the shard to. Using this
+         * command leads to a complete loss of all data that was indexed into this
+         * shard, if it was previously started. If a node which has a copy of the data
+         * rejoins the cluster later on, that data will be deleted. To ensure that these
+         * implications are well-understood, this command requires the flag
+         * accept_data_loss to be explicitly set to true.
+         * <p>
+         * API name: {@code allocate_empty_primary}
+         */
+        public final Builder allocateEmptyPrimary(
+            Function<CommandAllocatePrimaryAction.Builder, ObjectBuilder<CommandAllocatePrimaryAction>> fn
+        ) {
+            return this.allocateEmptyPrimary(fn.apply(new CommandAllocatePrimaryAction.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link Command}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Command build() {
+            _checkSingleUse();
+
+            return new Command(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Command}
+     */
+    public static final JsonpDeserializer<Command> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Command::setupCommandDeserializer
+    );
+
+    protected static void setupCommandDeserializer(ObjectDeserializer<Command.Builder> op) {
+
+        op.add(Builder::cancel, CommandCancelAction._DESERIALIZER, "cancel");
+        op.add(Builder::move, CommandMoveAction._DESERIALIZER, "move");
+        op.add(Builder::allocateReplica, CommandAllocateReplicaAction._DESERIALIZER, "allocate_replica");
+        op.add(Builder::allocateStalePrimary, CommandAllocatePrimaryAction._DESERIALIZER, "allocate_stale_primary");
+        op.add(Builder::allocateEmptyPrimary, CommandAllocatePrimaryAction._DESERIALIZER, "allocate_empty_primary");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/CommandAllocatePrimaryAction.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/CommandAllocatePrimaryAction.java
index c2d46bf067..680c155a18 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/CommandAllocatePrimaryAction.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/CommandAllocatePrimaryAction.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.reroute;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,176 +43,174 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.reroute.CommandAllocatePrimaryAction
 
-
 @JsonpDeserializable
 public class CommandAllocatePrimaryAction implements JsonpSerializable {
-	private final String index;
+    private final String index;
 
-	private final int shard;
+    private final int shard;
 
-	private final String node;
+    private final String node;
 
-	private final boolean acceptDataLoss;
+    private final boolean acceptDataLoss;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private CommandAllocatePrimaryAction(Builder builder) {
+    private CommandAllocatePrimaryAction(Builder builder) {
 
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.shard = ApiTypeHelper.requireNonNull(builder.shard, this, "shard");
-		this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
-		this.acceptDataLoss = ApiTypeHelper.requireNonNull(builder.acceptDataLoss, this, "acceptDataLoss");
-
-	}
-
-	public static CommandAllocatePrimaryAction of(Function<Builder, ObjectBuilder<CommandAllocatePrimaryAction>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Required - API name: {@code shard}
-	 */
-	public final int shard() {
-		return this.shard;
-	}
-
-	/**
-	 * Required - API name: {@code node}
-	 */
-	public final String node() {
-		return this.node;
-	}
-
-	/**
-	 * Required - If a node which has a copy of the data rejoins the cluster later
-	 * on, that data will be deleted. To ensure that these implications are
-	 * well-understood, this command requires the flag accept_data_loss to be
-	 * explicitly set to true
-	 * <p>
-	 * API name: {@code accept_data_loss}
-	 */
-	public final boolean acceptDataLoss() {
-		return this.acceptDataLoss;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("index");
-		generator.write(this.index);
-
-		generator.writeKey("shard");
-		generator.write(this.shard);
-
-		generator.writeKey("node");
-		generator.write(this.node);
-
-		generator.writeKey("accept_data_loss");
-		generator.write(this.acceptDataLoss);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CommandAllocatePrimaryAction}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CommandAllocatePrimaryAction> {
-		private String index;
-
-		private Integer shard;
-
-		private String node;
-
-		private Boolean acceptDataLoss;
-
-		/**
-		 * Required - API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shard}
-		 */
-		public final Builder shard(int value) {
-			this.shard = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code node}
-		 */
-		public final Builder node(String value) {
-			this.node = value;
-			return this;
-		}
-
-		/**
-		 * Required - If a node which has a copy of the data rejoins the cluster later
-		 * on, that data will be deleted. To ensure that these implications are
-		 * well-understood, this command requires the flag accept_data_loss to be
-		 * explicitly set to true
-		 * <p>
-		 * API name: {@code accept_data_loss}
-		 */
-		public final Builder acceptDataLoss(boolean value) {
-			this.acceptDataLoss = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CommandAllocatePrimaryAction}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CommandAllocatePrimaryAction build() {
-			_checkSingleUse();
-
-			return new CommandAllocatePrimaryAction(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CommandAllocatePrimaryAction}
-	 */
-	public static final JsonpDeserializer<CommandAllocatePrimaryAction> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CommandAllocatePrimaryAction::setupCommandAllocatePrimaryActionDeserializer);
-
-	protected static void setupCommandAllocatePrimaryActionDeserializer(
-			ObjectDeserializer<CommandAllocatePrimaryAction.Builder> op) {
-
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::shard, JsonpDeserializer.integerDeserializer(), "shard");
-		op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
-		op.add(Builder::acceptDataLoss, JsonpDeserializer.booleanDeserializer(), "accept_data_loss");
-
-	}
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.shard = ApiTypeHelper.requireNonNull(builder.shard, this, "shard");
+        this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
+        this.acceptDataLoss = ApiTypeHelper.requireNonNull(builder.acceptDataLoss, this, "acceptDataLoss");
+
+    }
+
+    public static CommandAllocatePrimaryAction of(Function<Builder, ObjectBuilder<CommandAllocatePrimaryAction>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Required - API name: {@code shard}
+     */
+    public final int shard() {
+        return this.shard;
+    }
+
+    /**
+     * Required - API name: {@code node}
+     */
+    public final String node() {
+        return this.node;
+    }
+
+    /**
+     * Required - If a node which has a copy of the data rejoins the cluster later
+     * on, that data will be deleted. To ensure that these implications are
+     * well-understood, this command requires the flag accept_data_loss to be
+     * explicitly set to true
+     * <p>
+     * API name: {@code accept_data_loss}
+     */
+    public final boolean acceptDataLoss() {
+        return this.acceptDataLoss;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("index");
+        generator.write(this.index);
+
+        generator.writeKey("shard");
+        generator.write(this.shard);
+
+        generator.writeKey("node");
+        generator.write(this.node);
+
+        generator.writeKey("accept_data_loss");
+        generator.write(this.acceptDataLoss);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CommandAllocatePrimaryAction}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CommandAllocatePrimaryAction> {
+        private String index;
+
+        private Integer shard;
+
+        private String node;
+
+        private Boolean acceptDataLoss;
+
+        /**
+         * Required - API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shard}
+         */
+        public final Builder shard(int value) {
+            this.shard = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code node}
+         */
+        public final Builder node(String value) {
+            this.node = value;
+            return this;
+        }
+
+        /**
+         * Required - If a node which has a copy of the data rejoins the cluster later
+         * on, that data will be deleted. To ensure that these implications are
+         * well-understood, this command requires the flag accept_data_loss to be
+         * explicitly set to true
+         * <p>
+         * API name: {@code accept_data_loss}
+         */
+        public final Builder acceptDataLoss(boolean value) {
+            this.acceptDataLoss = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link CommandAllocatePrimaryAction}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CommandAllocatePrimaryAction build() {
+            _checkSingleUse();
+
+            return new CommandAllocatePrimaryAction(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CommandAllocatePrimaryAction}
+     */
+    public static final JsonpDeserializer<CommandAllocatePrimaryAction> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CommandAllocatePrimaryAction::setupCommandAllocatePrimaryActionDeserializer
+    );
+
+    protected static void setupCommandAllocatePrimaryActionDeserializer(ObjectDeserializer<CommandAllocatePrimaryAction.Builder> op) {
+
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::shard, JsonpDeserializer.integerDeserializer(), "shard");
+        op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
+        op.add(Builder::acceptDataLoss, JsonpDeserializer.booleanDeserializer(), "accept_data_loss");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/CommandAllocateReplicaAction.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/CommandAllocateReplicaAction.java
index 4aa92bcab6..2d4245336c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/CommandAllocateReplicaAction.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/CommandAllocateReplicaAction.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.reroute;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,141 +43,140 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.reroute.CommandAllocateReplicaAction
 
 @JsonpDeserializable
 public class CommandAllocateReplicaAction implements JsonpSerializable {
-	private final String index;
+    private final String index;
 
-	private final int shard;
-
-	private final String node;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CommandAllocateReplicaAction(Builder builder) {
-
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.shard = ApiTypeHelper.requireNonNull(builder.shard, this, "shard");
-		this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
-
-	}
-
-	public static CommandAllocateReplicaAction of(Function<Builder, ObjectBuilder<CommandAllocateReplicaAction>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Required - API name: {@code shard}
-	 */
-	public final int shard() {
-		return this.shard;
-	}
-
-	/**
-	 * Required - API name: {@code node}
-	 */
-	public final String node() {
-		return this.node;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("index");
-		generator.write(this.index);
-
-		generator.writeKey("shard");
-		generator.write(this.shard);
-
-		generator.writeKey("node");
-		generator.write(this.node);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CommandAllocateReplicaAction}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CommandAllocateReplicaAction> {
-		private String index;
-
-		private Integer shard;
-
-		private String node;
-
-		/**
-		 * Required - API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shard}
-		 */
-		public final Builder shard(int value) {
-			this.shard = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code node}
-		 */
-		public final Builder node(String value) {
-			this.node = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CommandAllocateReplicaAction}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CommandAllocateReplicaAction build() {
-			_checkSingleUse();
-
-			return new CommandAllocateReplicaAction(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CommandAllocateReplicaAction}
-	 */
-	public static final JsonpDeserializer<CommandAllocateReplicaAction> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CommandAllocateReplicaAction::setupCommandAllocateReplicaActionDeserializer);
-
-	protected static void setupCommandAllocateReplicaActionDeserializer(
-			ObjectDeserializer<CommandAllocateReplicaAction.Builder> op) {
-
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::shard, JsonpDeserializer.integerDeserializer(), "shard");
-		op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
-
-	}
+    private final int shard;
+
+    private final String node;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CommandAllocateReplicaAction(Builder builder) {
+
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.shard = ApiTypeHelper.requireNonNull(builder.shard, this, "shard");
+        this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
+
+    }
+
+    public static CommandAllocateReplicaAction of(Function<Builder, ObjectBuilder<CommandAllocateReplicaAction>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Required - API name: {@code shard}
+     */
+    public final int shard() {
+        return this.shard;
+    }
+
+    /**
+     * Required - API name: {@code node}
+     */
+    public final String node() {
+        return this.node;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("index");
+        generator.write(this.index);
+
+        generator.writeKey("shard");
+        generator.write(this.shard);
+
+        generator.writeKey("node");
+        generator.write(this.node);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CommandAllocateReplicaAction}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CommandAllocateReplicaAction> {
+        private String index;
+
+        private Integer shard;
+
+        private String node;
+
+        /**
+         * Required - API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shard}
+         */
+        public final Builder shard(int value) {
+            this.shard = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code node}
+         */
+        public final Builder node(String value) {
+            this.node = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link CommandAllocateReplicaAction}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CommandAllocateReplicaAction build() {
+            _checkSingleUse();
+
+            return new CommandAllocateReplicaAction(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CommandAllocateReplicaAction}
+     */
+    public static final JsonpDeserializer<CommandAllocateReplicaAction> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CommandAllocateReplicaAction::setupCommandAllocateReplicaActionDeserializer
+    );
+
+    protected static void setupCommandAllocateReplicaActionDeserializer(ObjectDeserializer<CommandAllocateReplicaAction.Builder> op) {
+
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::shard, JsonpDeserializer.integerDeserializer(), "shard");
+        op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/CommandCancelAction.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/CommandCancelAction.java
index 3cf48816ae..e7e1bcf731 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/CommandCancelAction.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/CommandCancelAction.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cluster.reroute;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,172 +44,170 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.reroute.CommandCancelAction
 
-
 @JsonpDeserializable
 public class CommandCancelAction implements JsonpSerializable {
-	private final String index;
+    private final String index;
 
-	private final int shard;
+    private final int shard;
 
-	private final String node;
+    private final String node;
 
-	@Nullable
-	private final Boolean allowPrimary;
+    @Nullable
+    private final Boolean allowPrimary;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private CommandCancelAction(Builder builder) {
+    private CommandCancelAction(Builder builder) {
 
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.shard = ApiTypeHelper.requireNonNull(builder.shard, this, "shard");
-		this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
-		this.allowPrimary = builder.allowPrimary;
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.shard = ApiTypeHelper.requireNonNull(builder.shard, this, "shard");
+        this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
+        this.allowPrimary = builder.allowPrimary;
 
-	}
-
-	public static CommandCancelAction of(Function<Builder, ObjectBuilder<CommandCancelAction>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Required - API name: {@code shard}
-	 */
-	public final int shard() {
-		return this.shard;
-	}
-
-	/**
-	 * Required - API name: {@code node}
-	 */
-	public final String node() {
-		return this.node;
-	}
-
-	/**
-	 * API name: {@code allow_primary}
-	 */
-	@Nullable
-	public final Boolean allowPrimary() {
-		return this.allowPrimary;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("index");
-		generator.write(this.index);
-
-		generator.writeKey("shard");
-		generator.write(this.shard);
-
-		generator.writeKey("node");
-		generator.write(this.node);
-
-		if (this.allowPrimary != null) {
-			generator.writeKey("allow_primary");
-			generator.write(this.allowPrimary);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CommandCancelAction}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CommandCancelAction> {
-		private String index;
-
-		private Integer shard;
-
-		private String node;
-
-		@Nullable
-		private Boolean allowPrimary;
-
-		/**
-		 * Required - API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shard}
-		 */
-		public final Builder shard(int value) {
-			this.shard = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code node}
-		 */
-		public final Builder node(String value) {
-			this.node = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code allow_primary}
-		 */
-		public final Builder allowPrimary(@Nullable Boolean value) {
-			this.allowPrimary = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CommandCancelAction}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CommandCancelAction build() {
-			_checkSingleUse();
-
-			return new CommandCancelAction(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CommandCancelAction}
-	 */
-	public static final JsonpDeserializer<CommandCancelAction> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CommandCancelAction::setupCommandCancelActionDeserializer);
-
-	protected static void setupCommandCancelActionDeserializer(ObjectDeserializer<CommandCancelAction.Builder> op) {
-
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::shard, JsonpDeserializer.integerDeserializer(), "shard");
-		op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
-		op.add(Builder::allowPrimary, JsonpDeserializer.booleanDeserializer(), "allow_primary");
-
-	}
+    }
+
+    public static CommandCancelAction of(Function<Builder, ObjectBuilder<CommandCancelAction>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Required - API name: {@code shard}
+     */
+    public final int shard() {
+        return this.shard;
+    }
+
+    /**
+     * Required - API name: {@code node}
+     */
+    public final String node() {
+        return this.node;
+    }
+
+    /**
+     * API name: {@code allow_primary}
+     */
+    @Nullable
+    public final Boolean allowPrimary() {
+        return this.allowPrimary;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("index");
+        generator.write(this.index);
+
+        generator.writeKey("shard");
+        generator.write(this.shard);
+
+        generator.writeKey("node");
+        generator.write(this.node);
+
+        if (this.allowPrimary != null) {
+            generator.writeKey("allow_primary");
+            generator.write(this.allowPrimary);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CommandCancelAction}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CommandCancelAction> {
+        private String index;
+
+        private Integer shard;
+
+        private String node;
+
+        @Nullable
+        private Boolean allowPrimary;
+
+        /**
+         * Required - API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shard}
+         */
+        public final Builder shard(int value) {
+            this.shard = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code node}
+         */
+        public final Builder node(String value) {
+            this.node = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code allow_primary}
+         */
+        public final Builder allowPrimary(@Nullable Boolean value) {
+            this.allowPrimary = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link CommandCancelAction}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CommandCancelAction build() {
+            _checkSingleUse();
+
+            return new CommandCancelAction(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CommandCancelAction}
+     */
+    public static final JsonpDeserializer<CommandCancelAction> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CommandCancelAction::setupCommandCancelActionDeserializer
+    );
+
+    protected static void setupCommandCancelActionDeserializer(ObjectDeserializer<CommandCancelAction.Builder> op) {
+
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::shard, JsonpDeserializer.integerDeserializer(), "shard");
+        op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
+        op.add(Builder::allowPrimary, JsonpDeserializer.booleanDeserializer(), "allow_primary");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/CommandMoveAction.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/CommandMoveAction.java
index 459db41501..1fcd576ad4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/CommandMoveAction.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/CommandMoveAction.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.reroute;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,173 +43,172 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.reroute.CommandMoveAction
 
-
 @JsonpDeserializable
 public class CommandMoveAction implements JsonpSerializable {
-	private final String index;
+    private final String index;
 
-	private final int shard;
+    private final int shard;
 
-	private final String fromNode;
+    private final String fromNode;
 
-	private final String toNode;
+    private final String toNode;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private CommandMoveAction(Builder builder) {
+    private CommandMoveAction(Builder builder) {
 
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.shard = ApiTypeHelper.requireNonNull(builder.shard, this, "shard");
-		this.fromNode = ApiTypeHelper.requireNonNull(builder.fromNode, this, "fromNode");
-		this.toNode = ApiTypeHelper.requireNonNull(builder.toNode, this, "toNode");
-
-	}
-
-	public static CommandMoveAction of(Function<Builder, ObjectBuilder<CommandMoveAction>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Required - API name: {@code shard}
-	 */
-	public final int shard() {
-		return this.shard;
-	}
-
-	/**
-	 * Required - The node to move the shard from
-	 * <p>
-	 * API name: {@code from_node}
-	 */
-	public final String fromNode() {
-		return this.fromNode;
-	}
-
-	/**
-	 * Required - The node to move the shard to
-	 * <p>
-	 * API name: {@code to_node}
-	 */
-	public final String toNode() {
-		return this.toNode;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("index");
-		generator.write(this.index);
-
-		generator.writeKey("shard");
-		generator.write(this.shard);
-
-		generator.writeKey("from_node");
-		generator.write(this.fromNode);
-
-		generator.writeKey("to_node");
-		generator.write(this.toNode);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CommandMoveAction}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CommandMoveAction> {
-		private String index;
-
-		private Integer shard;
-
-		private String fromNode;
-
-		private String toNode;
-
-		/**
-		 * Required - API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shard}
-		 */
-		public final Builder shard(int value) {
-			this.shard = value;
-			return this;
-		}
-
-		/**
-		 * Required - The node to move the shard from
-		 * <p>
-		 * API name: {@code from_node}
-		 */
-		public final Builder fromNode(String value) {
-			this.fromNode = value;
-			return this;
-		}
-
-		/**
-		 * Required - The node to move the shard to
-		 * <p>
-		 * API name: {@code to_node}
-		 */
-		public final Builder toNode(String value) {
-			this.toNode = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CommandMoveAction}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CommandMoveAction build() {
-			_checkSingleUse();
-
-			return new CommandMoveAction(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CommandMoveAction}
-	 */
-	public static final JsonpDeserializer<CommandMoveAction> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CommandMoveAction::setupCommandMoveActionDeserializer);
-
-	protected static void setupCommandMoveActionDeserializer(ObjectDeserializer<CommandMoveAction.Builder> op) {
-
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::shard, JsonpDeserializer.integerDeserializer(), "shard");
-		op.add(Builder::fromNode, JsonpDeserializer.stringDeserializer(), "from_node");
-		op.add(Builder::toNode, JsonpDeserializer.stringDeserializer(), "to_node");
-
-	}
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.shard = ApiTypeHelper.requireNonNull(builder.shard, this, "shard");
+        this.fromNode = ApiTypeHelper.requireNonNull(builder.fromNode, this, "fromNode");
+        this.toNode = ApiTypeHelper.requireNonNull(builder.toNode, this, "toNode");
+
+    }
+
+    public static CommandMoveAction of(Function<Builder, ObjectBuilder<CommandMoveAction>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Required - API name: {@code shard}
+     */
+    public final int shard() {
+        return this.shard;
+    }
+
+    /**
+     * Required - The node to move the shard from
+     * <p>
+     * API name: {@code from_node}
+     */
+    public final String fromNode() {
+        return this.fromNode;
+    }
+
+    /**
+     * Required - The node to move the shard to
+     * <p>
+     * API name: {@code to_node}
+     */
+    public final String toNode() {
+        return this.toNode;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("index");
+        generator.write(this.index);
+
+        generator.writeKey("shard");
+        generator.write(this.shard);
+
+        generator.writeKey("from_node");
+        generator.write(this.fromNode);
+
+        generator.writeKey("to_node");
+        generator.write(this.toNode);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CommandMoveAction}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CommandMoveAction> {
+        private String index;
+
+        private Integer shard;
+
+        private String fromNode;
+
+        private String toNode;
+
+        /**
+         * Required - API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shard}
+         */
+        public final Builder shard(int value) {
+            this.shard = value;
+            return this;
+        }
+
+        /**
+         * Required - The node to move the shard from
+         * <p>
+         * API name: {@code from_node}
+         */
+        public final Builder fromNode(String value) {
+            this.fromNode = value;
+            return this;
+        }
+
+        /**
+         * Required - The node to move the shard to
+         * <p>
+         * API name: {@code to_node}
+         */
+        public final Builder toNode(String value) {
+            this.toNode = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link CommandMoveAction}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CommandMoveAction build() {
+            _checkSingleUse();
+
+            return new CommandMoveAction(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CommandMoveAction}
+     */
+    public static final JsonpDeserializer<CommandMoveAction> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CommandMoveAction::setupCommandMoveActionDeserializer
+    );
+
+    protected static void setupCommandMoveActionDeserializer(ObjectDeserializer<CommandMoveAction.Builder> op) {
+
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::shard, JsonpDeserializer.integerDeserializer(), "shard");
+        op.add(Builder::fromNode, JsonpDeserializer.stringDeserializer(), "from_node");
+        op.add(Builder::toNode, JsonpDeserializer.stringDeserializer(), "to_node");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/RerouteDecision.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/RerouteDecision.java
index e1b07b10d8..fe8d1e21a8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/RerouteDecision.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/RerouteDecision.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.reroute;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,141 +43,140 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.reroute.RerouteDecision
 
-
 @JsonpDeserializable
 public class RerouteDecision implements JsonpSerializable {
-	private final String decider;
-
-	private final String decision;
-
-	private final String explanation;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RerouteDecision(Builder builder) {
-
-		this.decider = ApiTypeHelper.requireNonNull(builder.decider, this, "decider");
-		this.decision = ApiTypeHelper.requireNonNull(builder.decision, this, "decision");
-		this.explanation = ApiTypeHelper.requireNonNull(builder.explanation, this, "explanation");
-
-	}
-
-	public static RerouteDecision of(Function<Builder, ObjectBuilder<RerouteDecision>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code decider}
-	 */
-	public final String decider() {
-		return this.decider;
-	}
+    private final String decider;
 
-	/**
-	 * Required - API name: {@code decision}
-	 */
-	public final String decision() {
-		return this.decision;
-	}
-
-	/**
-	 * Required - API name: {@code explanation}
-	 */
-	public final String explanation() {
-		return this.explanation;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("decider");
-		generator.write(this.decider);
-
-		generator.writeKey("decision");
-		generator.write(this.decision);
-
-		generator.writeKey("explanation");
-		generator.write(this.explanation);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RerouteDecision}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RerouteDecision> {
-		private String decider;
-
-		private String decision;
-
-		private String explanation;
-
-		/**
-		 * Required - API name: {@code decider}
-		 */
-		public final Builder decider(String value) {
-			this.decider = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code decision}
-		 */
-		public final Builder decision(String value) {
-			this.decision = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code explanation}
-		 */
-		public final Builder explanation(String value) {
-			this.explanation = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RerouteDecision}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RerouteDecision build() {
-			_checkSingleUse();
-
-			return new RerouteDecision(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RerouteDecision}
-	 */
-	public static final JsonpDeserializer<RerouteDecision> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RerouteDecision::setupRerouteDecisionDeserializer);
-
-	protected static void setupRerouteDecisionDeserializer(ObjectDeserializer<RerouteDecision.Builder> op) {
-
-		op.add(Builder::decider, JsonpDeserializer.stringDeserializer(), "decider");
-		op.add(Builder::decision, JsonpDeserializer.stringDeserializer(), "decision");
-		op.add(Builder::explanation, JsonpDeserializer.stringDeserializer(), "explanation");
-
-	}
+    private final String decision;
+
+    private final String explanation;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RerouteDecision(Builder builder) {
+
+        this.decider = ApiTypeHelper.requireNonNull(builder.decider, this, "decider");
+        this.decision = ApiTypeHelper.requireNonNull(builder.decision, this, "decision");
+        this.explanation = ApiTypeHelper.requireNonNull(builder.explanation, this, "explanation");
+
+    }
+
+    public static RerouteDecision of(Function<Builder, ObjectBuilder<RerouteDecision>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code decider}
+     */
+    public final String decider() {
+        return this.decider;
+    }
+
+    /**
+     * Required - API name: {@code decision}
+     */
+    public final String decision() {
+        return this.decision;
+    }
+
+    /**
+     * Required - API name: {@code explanation}
+     */
+    public final String explanation() {
+        return this.explanation;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("decider");
+        generator.write(this.decider);
+
+        generator.writeKey("decision");
+        generator.write(this.decision);
+
+        generator.writeKey("explanation");
+        generator.write(this.explanation);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RerouteDecision}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RerouteDecision> {
+        private String decider;
+
+        private String decision;
+
+        private String explanation;
+
+        /**
+         * Required - API name: {@code decider}
+         */
+        public final Builder decider(String value) {
+            this.decider = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code decision}
+         */
+        public final Builder decision(String value) {
+            this.decision = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code explanation}
+         */
+        public final Builder explanation(String value) {
+            this.explanation = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RerouteDecision}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RerouteDecision build() {
+            _checkSingleUse();
+
+            return new RerouteDecision(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RerouteDecision}
+     */
+    public static final JsonpDeserializer<RerouteDecision> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RerouteDecision::setupRerouteDecisionDeserializer
+    );
+
+    protected static void setupRerouteDecisionDeserializer(ObjectDeserializer<RerouteDecision.Builder> op) {
+
+        op.add(Builder::decider, JsonpDeserializer.stringDeserializer(), "decider");
+        op.add(Builder::decision, JsonpDeserializer.stringDeserializer(), "decision");
+        op.add(Builder::explanation, JsonpDeserializer.stringDeserializer(), "explanation");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/RerouteExplanation.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/RerouteExplanation.java
index 704882e9d0..348d0ae90a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/RerouteExplanation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/RerouteExplanation.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cluster.reroute;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,177 +44,175 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cluster.reroute.RerouteExplanation
 
-
 @JsonpDeserializable
 public class RerouteExplanation implements JsonpSerializable {
-	private final String command;
+    private final String command;
 
-	private final List<RerouteDecision> decisions;
-
-	private final RerouteParameters parameters;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RerouteExplanation(Builder builder) {
-
-		this.command = ApiTypeHelper.requireNonNull(builder.command, this, "command");
-		this.decisions = ApiTypeHelper.unmodifiableRequired(builder.decisions, this, "decisions");
-		this.parameters = ApiTypeHelper.requireNonNull(builder.parameters, this, "parameters");
-
-	}
-
-	public static RerouteExplanation of(Function<Builder, ObjectBuilder<RerouteExplanation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code command}
-	 */
-	public final String command() {
-		return this.command;
-	}
-
-	/**
-	 * Required - API name: {@code decisions}
-	 */
-	public final List<RerouteDecision> decisions() {
-		return this.decisions;
-	}
-
-	/**
-	 * Required - API name: {@code parameters}
-	 */
-	public final RerouteParameters parameters() {
-		return this.parameters;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("command");
-		generator.write(this.command);
-
-		if (ApiTypeHelper.isDefined(this.decisions)) {
-			generator.writeKey("decisions");
-			generator.writeStartArray();
-			for (RerouteDecision item0 : this.decisions) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("parameters");
-		this.parameters.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RerouteExplanation}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RerouteExplanation> {
-		private String command;
-
-		private List<RerouteDecision> decisions;
-
-		private RerouteParameters parameters;
-
-		/**
-		 * Required - API name: {@code command}
-		 */
-		public final Builder command(String value) {
-			this.command = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code decisions}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>decisions</code>.
-		 */
-		public final Builder decisions(List<RerouteDecision> list) {
-			this.decisions = _listAddAll(this.decisions, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code decisions}
-		 * <p>
-		 * Adds one or more values to <code>decisions</code>.
-		 */
-		public final Builder decisions(RerouteDecision value, RerouteDecision... values) {
-			this.decisions = _listAdd(this.decisions, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code decisions}
-		 * <p>
-		 * Adds a value to <code>decisions</code> using a builder lambda.
-		 */
-		public final Builder decisions(Function<RerouteDecision.Builder, ObjectBuilder<RerouteDecision>> fn) {
-			return decisions(fn.apply(new RerouteDecision.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code parameters}
-		 */
-		public final Builder parameters(RerouteParameters value) {
-			this.parameters = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code parameters}
-		 */
-		public final Builder parameters(Function<RerouteParameters.Builder, ObjectBuilder<RerouteParameters>> fn) {
-			return this.parameters(fn.apply(new RerouteParameters.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link RerouteExplanation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RerouteExplanation build() {
-			_checkSingleUse();
-
-			return new RerouteExplanation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RerouteExplanation}
-	 */
-	public static final JsonpDeserializer<RerouteExplanation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RerouteExplanation::setupRerouteExplanationDeserializer);
-
-	protected static void setupRerouteExplanationDeserializer(ObjectDeserializer<RerouteExplanation.Builder> op) {
-
-		op.add(Builder::command, JsonpDeserializer.stringDeserializer(), "command");
-		op.add(Builder::decisions, JsonpDeserializer.arrayDeserializer(RerouteDecision._DESERIALIZER), "decisions");
-		op.add(Builder::parameters, RerouteParameters._DESERIALIZER, "parameters");
-
-	}
+    private final List<RerouteDecision> decisions;
+
+    private final RerouteParameters parameters;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RerouteExplanation(Builder builder) {
+
+        this.command = ApiTypeHelper.requireNonNull(builder.command, this, "command");
+        this.decisions = ApiTypeHelper.unmodifiableRequired(builder.decisions, this, "decisions");
+        this.parameters = ApiTypeHelper.requireNonNull(builder.parameters, this, "parameters");
+
+    }
+
+    public static RerouteExplanation of(Function<Builder, ObjectBuilder<RerouteExplanation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code command}
+     */
+    public final String command() {
+        return this.command;
+    }
+
+    /**
+     * Required - API name: {@code decisions}
+     */
+    public final List<RerouteDecision> decisions() {
+        return this.decisions;
+    }
+
+    /**
+     * Required - API name: {@code parameters}
+     */
+    public final RerouteParameters parameters() {
+        return this.parameters;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("command");
+        generator.write(this.command);
+
+        if (ApiTypeHelper.isDefined(this.decisions)) {
+            generator.writeKey("decisions");
+            generator.writeStartArray();
+            for (RerouteDecision item0 : this.decisions) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("parameters");
+        this.parameters.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RerouteExplanation}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RerouteExplanation> {
+        private String command;
+
+        private List<RerouteDecision> decisions;
+
+        private RerouteParameters parameters;
+
+        /**
+         * Required - API name: {@code command}
+         */
+        public final Builder command(String value) {
+            this.command = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code decisions}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>decisions</code>.
+         */
+        public final Builder decisions(List<RerouteDecision> list) {
+            this.decisions = _listAddAll(this.decisions, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code decisions}
+         * <p>
+         * Adds one or more values to <code>decisions</code>.
+         */
+        public final Builder decisions(RerouteDecision value, RerouteDecision... values) {
+            this.decisions = _listAdd(this.decisions, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code decisions}
+         * <p>
+         * Adds a value to <code>decisions</code> using a builder lambda.
+         */
+        public final Builder decisions(Function<RerouteDecision.Builder, ObjectBuilder<RerouteDecision>> fn) {
+            return decisions(fn.apply(new RerouteDecision.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code parameters}
+         */
+        public final Builder parameters(RerouteParameters value) {
+            this.parameters = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code parameters}
+         */
+        public final Builder parameters(Function<RerouteParameters.Builder, ObjectBuilder<RerouteParameters>> fn) {
+            return this.parameters(fn.apply(new RerouteParameters.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link RerouteExplanation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RerouteExplanation build() {
+            _checkSingleUse();
+
+            return new RerouteExplanation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RerouteExplanation}
+     */
+    public static final JsonpDeserializer<RerouteExplanation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RerouteExplanation::setupRerouteExplanationDeserializer
+    );
+
+    protected static void setupRerouteExplanationDeserializer(ObjectDeserializer<RerouteExplanation.Builder> op) {
+
+        op.add(Builder::command, JsonpDeserializer.stringDeserializer(), "command");
+        op.add(Builder::decisions, JsonpDeserializer.arrayDeserializer(RerouteDecision._DESERIALIZER), "decisions");
+        op.add(Builder::parameters, RerouteParameters._DESERIALIZER, "parameters");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/RerouteParameters.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/RerouteParameters.java
index fe0bbe3916..fda5e90362 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/RerouteParameters.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/reroute/RerouteParameters.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cluster.reroute;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,224 +44,223 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.reroute.RerouteParameters
 
 @JsonpDeserializable
 public class RerouteParameters implements JsonpSerializable {
-	private final boolean allowPrimary;
-
-	private final String index;
-
-	private final String node;
-
-	private final int shard;
-
-	@Nullable
-	private final String fromNode;
+    private final boolean allowPrimary;
+
+    private final String index;
+
+    private final String node;
+
+    private final int shard;
+
+    @Nullable
+    private final String fromNode;
 
-	@Nullable
-	private final String toNode;
+    @Nullable
+    private final String toNode;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private RerouteParameters(Builder builder) {
+    // ---------------------------------------------------------------------------------------------
+
+    private RerouteParameters(Builder builder) {
 
-		this.allowPrimary = ApiTypeHelper.requireNonNull(builder.allowPrimary, this, "allowPrimary");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
-		this.shard = ApiTypeHelper.requireNonNull(builder.shard, this, "shard");
-		this.fromNode = builder.fromNode;
-		this.toNode = builder.toNode;
+        this.allowPrimary = ApiTypeHelper.requireNonNull(builder.allowPrimary, this, "allowPrimary");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
+        this.shard = ApiTypeHelper.requireNonNull(builder.shard, this, "shard");
+        this.fromNode = builder.fromNode;
+        this.toNode = builder.toNode;
 
-	}
+    }
 
-	public static RerouteParameters of(Function<Builder, ObjectBuilder<RerouteParameters>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static RerouteParameters of(Function<Builder, ObjectBuilder<RerouteParameters>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code allow_primary}
-	 */
-	public final boolean allowPrimary() {
-		return this.allowPrimary;
-	}
+    /**
+     * Required - API name: {@code allow_primary}
+     */
+    public final boolean allowPrimary() {
+        return this.allowPrimary;
+    }
 
-	/**
-	 * Required - API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
+    /**
+     * Required - API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
 
-	/**
-	 * Required - API name: {@code node}
-	 */
-	public final String node() {
-		return this.node;
-	}
-
-	/**
-	 * Required - API name: {@code shard}
-	 */
-	public final int shard() {
-		return this.shard;
-	}
-
-	/**
-	 * API name: {@code from_node}
-	 */
-	@Nullable
-	public final String fromNode() {
-		return this.fromNode;
-	}
-
-	/**
-	 * API name: {@code to_node}
-	 */
-	@Nullable
-	public final String toNode() {
-		return this.toNode;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("allow_primary");
-		generator.write(this.allowPrimary);
-
-		generator.writeKey("index");
-		generator.write(this.index);
-
-		generator.writeKey("node");
-		generator.write(this.node);
-
-		generator.writeKey("shard");
-		generator.write(this.shard);
-
-		if (this.fromNode != null) {
-			generator.writeKey("from_node");
-			generator.write(this.fromNode);
-
-		}
-		if (this.toNode != null) {
-			generator.writeKey("to_node");
-			generator.write(this.toNode);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RerouteParameters}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RerouteParameters> {
-		private Boolean allowPrimary;
-
-		private String index;
-
-		private String node;
-
-		private Integer shard;
-
-		@Nullable
-		private String fromNode;
-
-		@Nullable
-		private String toNode;
-
-		/**
-		 * Required - API name: {@code allow_primary}
-		 */
-		public final Builder allowPrimary(boolean value) {
-			this.allowPrimary = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code node}
-		 */
-		public final Builder node(String value) {
-			this.node = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shard}
-		 */
-		public final Builder shard(int value) {
-			this.shard = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code from_node}
-		 */
-		public final Builder fromNode(@Nullable String value) {
-			this.fromNode = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code to_node}
-		 */
-		public final Builder toNode(@Nullable String value) {
-			this.toNode = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RerouteParameters}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RerouteParameters build() {
-			_checkSingleUse();
-
-			return new RerouteParameters(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RerouteParameters}
-	 */
-	public static final JsonpDeserializer<RerouteParameters> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RerouteParameters::setupRerouteParametersDeserializer);
-
-	protected static void setupRerouteParametersDeserializer(ObjectDeserializer<RerouteParameters.Builder> op) {
-
-		op.add(Builder::allowPrimary, JsonpDeserializer.booleanDeserializer(), "allow_primary");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
-		op.add(Builder::shard, JsonpDeserializer.integerDeserializer(), "shard");
-		op.add(Builder::fromNode, JsonpDeserializer.stringDeserializer(), "from_node");
-		op.add(Builder::toNode, JsonpDeserializer.stringDeserializer(), "to_node");
-
-	}
+    /**
+     * Required - API name: {@code node}
+     */
+    public final String node() {
+        return this.node;
+    }
+
+    /**
+     * Required - API name: {@code shard}
+     */
+    public final int shard() {
+        return this.shard;
+    }
+
+    /**
+     * API name: {@code from_node}
+     */
+    @Nullable
+    public final String fromNode() {
+        return this.fromNode;
+    }
+
+    /**
+     * API name: {@code to_node}
+     */
+    @Nullable
+    public final String toNode() {
+        return this.toNode;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("allow_primary");
+        generator.write(this.allowPrimary);
+
+        generator.writeKey("index");
+        generator.write(this.index);
+
+        generator.writeKey("node");
+        generator.write(this.node);
+
+        generator.writeKey("shard");
+        generator.write(this.shard);
+
+        if (this.fromNode != null) {
+            generator.writeKey("from_node");
+            generator.write(this.fromNode);
+
+        }
+        if (this.toNode != null) {
+            generator.writeKey("to_node");
+            generator.write(this.toNode);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RerouteParameters}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RerouteParameters> {
+        private Boolean allowPrimary;
+
+        private String index;
+
+        private String node;
+
+        private Integer shard;
+
+        @Nullable
+        private String fromNode;
+
+        @Nullable
+        private String toNode;
+
+        /**
+         * Required - API name: {@code allow_primary}
+         */
+        public final Builder allowPrimary(boolean value) {
+            this.allowPrimary = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code node}
+         */
+        public final Builder node(String value) {
+            this.node = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shard}
+         */
+        public final Builder shard(int value) {
+            this.shard = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code from_node}
+         */
+        public final Builder fromNode(@Nullable String value) {
+            this.fromNode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code to_node}
+         */
+        public final Builder toNode(@Nullable String value) {
+            this.toNode = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RerouteParameters}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RerouteParameters build() {
+            _checkSingleUse();
+
+            return new RerouteParameters(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RerouteParameters}
+     */
+    public static final JsonpDeserializer<RerouteParameters> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RerouteParameters::setupRerouteParametersDeserializer
+    );
+
+    protected static void setupRerouteParametersDeserializer(ObjectDeserializer<RerouteParameters.Builder> op) {
+
+        op.add(Builder::allowPrimary, JsonpDeserializer.booleanDeserializer(), "allow_primary");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
+        op.add(Builder::shard, JsonpDeserializer.integerDeserializer(), "shard");
+        op.add(Builder::fromNode, JsonpDeserializer.stringDeserializer(), "from_node");
+        op.add(Builder::toNode, JsonpDeserializer.stringDeserializer(), "to_node");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/CharFilterTypes.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/CharFilterTypes.java
index ea516fe726..8a4a1f89bc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/CharFilterTypes.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/CharFilterTypes.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,495 +44,485 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cluster.stats.CharFilterTypes
 
-
 @JsonpDeserializable
 public class CharFilterTypes implements JsonpSerializable {
-	private final List<FieldTypes> charFilterTypes;
-
-	private final List<FieldTypes> tokenizerTypes;
-
-	private final List<FieldTypes> filterTypes;
-
-	private final List<FieldTypes> analyzerTypes;
-
-	private final List<FieldTypes> builtInCharFilters;
-
-	private final List<FieldTypes> builtInTokenizers;
-
-	private final List<FieldTypes> builtInFilters;
-
-	private final List<FieldTypes> builtInAnalyzers;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CharFilterTypes(Builder builder) {
-
-		this.charFilterTypes = ApiTypeHelper.unmodifiableRequired(builder.charFilterTypes, this, "charFilterTypes");
-		this.tokenizerTypes = ApiTypeHelper.unmodifiableRequired(builder.tokenizerTypes, this, "tokenizerTypes");
-		this.filterTypes = ApiTypeHelper.unmodifiableRequired(builder.filterTypes, this, "filterTypes");
-		this.analyzerTypes = ApiTypeHelper.unmodifiableRequired(builder.analyzerTypes, this, "analyzerTypes");
-		this.builtInCharFilters = ApiTypeHelper.unmodifiableRequired(builder.builtInCharFilters, this,
-				"builtInCharFilters");
-		this.builtInTokenizers = ApiTypeHelper.unmodifiableRequired(builder.builtInTokenizers, this,
-				"builtInTokenizers");
-		this.builtInFilters = ApiTypeHelper.unmodifiableRequired(builder.builtInFilters, this, "builtInFilters");
-		this.builtInAnalyzers = ApiTypeHelper.unmodifiableRequired(builder.builtInAnalyzers, this, "builtInAnalyzers");
-
-	}
-
-	public static CharFilterTypes of(Function<Builder, ObjectBuilder<CharFilterTypes>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code char_filter_types}
-	 */
-	public final List<FieldTypes> charFilterTypes() {
-		return this.charFilterTypes;
-	}
-
-	/**
-	 * Required - API name: {@code tokenizer_types}
-	 */
-	public final List<FieldTypes> tokenizerTypes() {
-		return this.tokenizerTypes;
-	}
-
-	/**
-	 * Required - API name: {@code filter_types}
-	 */
-	public final List<FieldTypes> filterTypes() {
-		return this.filterTypes;
-	}
-
-	/**
-	 * Required - API name: {@code analyzer_types}
-	 */
-	public final List<FieldTypes> analyzerTypes() {
-		return this.analyzerTypes;
-	}
-
-	/**
-	 * Required - API name: {@code built_in_char_filters}
-	 */
-	public final List<FieldTypes> builtInCharFilters() {
-		return this.builtInCharFilters;
-	}
-
-	/**
-	 * Required - API name: {@code built_in_tokenizers}
-	 */
-	public final List<FieldTypes> builtInTokenizers() {
-		return this.builtInTokenizers;
-	}
-
-	/**
-	 * Required - API name: {@code built_in_filters}
-	 */
-	public final List<FieldTypes> builtInFilters() {
-		return this.builtInFilters;
-	}
-
-	/**
-	 * Required - API name: {@code built_in_analyzers}
-	 */
-	public final List<FieldTypes> builtInAnalyzers() {
-		return this.builtInAnalyzers;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.charFilterTypes)) {
-			generator.writeKey("char_filter_types");
-			generator.writeStartArray();
-			for (FieldTypes item0 : this.charFilterTypes) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.tokenizerTypes)) {
-			generator.writeKey("tokenizer_types");
-			generator.writeStartArray();
-			for (FieldTypes item0 : this.tokenizerTypes) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.filterTypes)) {
-			generator.writeKey("filter_types");
-			generator.writeStartArray();
-			for (FieldTypes item0 : this.filterTypes) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.analyzerTypes)) {
-			generator.writeKey("analyzer_types");
-			generator.writeStartArray();
-			for (FieldTypes item0 : this.analyzerTypes) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.builtInCharFilters)) {
-			generator.writeKey("built_in_char_filters");
-			generator.writeStartArray();
-			for (FieldTypes item0 : this.builtInCharFilters) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.builtInTokenizers)) {
-			generator.writeKey("built_in_tokenizers");
-			generator.writeStartArray();
-			for (FieldTypes item0 : this.builtInTokenizers) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.builtInFilters)) {
-			generator.writeKey("built_in_filters");
-			generator.writeStartArray();
-			for (FieldTypes item0 : this.builtInFilters) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.builtInAnalyzers)) {
-			generator.writeKey("built_in_analyzers");
-			generator.writeStartArray();
-			for (FieldTypes item0 : this.builtInAnalyzers) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CharFilterTypes}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CharFilterTypes> {
-		private List<FieldTypes> charFilterTypes;
-
-		private List<FieldTypes> tokenizerTypes;
-
-		private List<FieldTypes> filterTypes;
-
-		private List<FieldTypes> analyzerTypes;
-
-		private List<FieldTypes> builtInCharFilters;
-
-		private List<FieldTypes> builtInTokenizers;
-
-		private List<FieldTypes> builtInFilters;
-
-		private List<FieldTypes> builtInAnalyzers;
-
-		/**
-		 * Required - API name: {@code char_filter_types}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>charFilterTypes</code>.
-		 */
-		public final Builder charFilterTypes(List<FieldTypes> list) {
-			this.charFilterTypes = _listAddAll(this.charFilterTypes, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code char_filter_types}
-		 * <p>
-		 * Adds one or more values to <code>charFilterTypes</code>.
-		 */
-		public final Builder charFilterTypes(FieldTypes value, FieldTypes... values) {
-			this.charFilterTypes = _listAdd(this.charFilterTypes, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code char_filter_types}
-		 * <p>
-		 * Adds a value to <code>charFilterTypes</code> using a builder lambda.
-		 */
-		public final Builder charFilterTypes(Function<FieldTypes.Builder, ObjectBuilder<FieldTypes>> fn) {
-			return charFilterTypes(fn.apply(new FieldTypes.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code tokenizer_types}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>tokenizerTypes</code>.
-		 */
-		public final Builder tokenizerTypes(List<FieldTypes> list) {
-			this.tokenizerTypes = _listAddAll(this.tokenizerTypes, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tokenizer_types}
-		 * <p>
-		 * Adds one or more values to <code>tokenizerTypes</code>.
-		 */
-		public final Builder tokenizerTypes(FieldTypes value, FieldTypes... values) {
-			this.tokenizerTypes = _listAdd(this.tokenizerTypes, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tokenizer_types}
-		 * <p>
-		 * Adds a value to <code>tokenizerTypes</code> using a builder lambda.
-		 */
-		public final Builder tokenizerTypes(Function<FieldTypes.Builder, ObjectBuilder<FieldTypes>> fn) {
-			return tokenizerTypes(fn.apply(new FieldTypes.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code filter_types}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>filterTypes</code>.
-		 */
-		public final Builder filterTypes(List<FieldTypes> list) {
-			this.filterTypes = _listAddAll(this.filterTypes, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code filter_types}
-		 * <p>
-		 * Adds one or more values to <code>filterTypes</code>.
-		 */
-		public final Builder filterTypes(FieldTypes value, FieldTypes... values) {
-			this.filterTypes = _listAdd(this.filterTypes, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code filter_types}
-		 * <p>
-		 * Adds a value to <code>filterTypes</code> using a builder lambda.
-		 */
-		public final Builder filterTypes(Function<FieldTypes.Builder, ObjectBuilder<FieldTypes>> fn) {
-			return filterTypes(fn.apply(new FieldTypes.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code analyzer_types}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>analyzerTypes</code>.
-		 */
-		public final Builder analyzerTypes(List<FieldTypes> list) {
-			this.analyzerTypes = _listAddAll(this.analyzerTypes, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code analyzer_types}
-		 * <p>
-		 * Adds one or more values to <code>analyzerTypes</code>.
-		 */
-		public final Builder analyzerTypes(FieldTypes value, FieldTypes... values) {
-			this.analyzerTypes = _listAdd(this.analyzerTypes, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code analyzer_types}
-		 * <p>
-		 * Adds a value to <code>analyzerTypes</code> using a builder lambda.
-		 */
-		public final Builder analyzerTypes(Function<FieldTypes.Builder, ObjectBuilder<FieldTypes>> fn) {
-			return analyzerTypes(fn.apply(new FieldTypes.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code built_in_char_filters}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>builtInCharFilters</code>.
-		 */
-		public final Builder builtInCharFilters(List<FieldTypes> list) {
-			this.builtInCharFilters = _listAddAll(this.builtInCharFilters, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code built_in_char_filters}
-		 * <p>
-		 * Adds one or more values to <code>builtInCharFilters</code>.
-		 */
-		public final Builder builtInCharFilters(FieldTypes value, FieldTypes... values) {
-			this.builtInCharFilters = _listAdd(this.builtInCharFilters, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code built_in_char_filters}
-		 * <p>
-		 * Adds a value to <code>builtInCharFilters</code> using a builder lambda.
-		 */
-		public final Builder builtInCharFilters(Function<FieldTypes.Builder, ObjectBuilder<FieldTypes>> fn) {
-			return builtInCharFilters(fn.apply(new FieldTypes.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code built_in_tokenizers}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>builtInTokenizers</code>.
-		 */
-		public final Builder builtInTokenizers(List<FieldTypes> list) {
-			this.builtInTokenizers = _listAddAll(this.builtInTokenizers, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code built_in_tokenizers}
-		 * <p>
-		 * Adds one or more values to <code>builtInTokenizers</code>.
-		 */
-		public final Builder builtInTokenizers(FieldTypes value, FieldTypes... values) {
-			this.builtInTokenizers = _listAdd(this.builtInTokenizers, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code built_in_tokenizers}
-		 * <p>
-		 * Adds a value to <code>builtInTokenizers</code> using a builder lambda.
-		 */
-		public final Builder builtInTokenizers(Function<FieldTypes.Builder, ObjectBuilder<FieldTypes>> fn) {
-			return builtInTokenizers(fn.apply(new FieldTypes.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code built_in_filters}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>builtInFilters</code>.
-		 */
-		public final Builder builtInFilters(List<FieldTypes> list) {
-			this.builtInFilters = _listAddAll(this.builtInFilters, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code built_in_filters}
-		 * <p>
-		 * Adds one or more values to <code>builtInFilters</code>.
-		 */
-		public final Builder builtInFilters(FieldTypes value, FieldTypes... values) {
-			this.builtInFilters = _listAdd(this.builtInFilters, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code built_in_filters}
-		 * <p>
-		 * Adds a value to <code>builtInFilters</code> using a builder lambda.
-		 */
-		public final Builder builtInFilters(Function<FieldTypes.Builder, ObjectBuilder<FieldTypes>> fn) {
-			return builtInFilters(fn.apply(new FieldTypes.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code built_in_analyzers}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>builtInAnalyzers</code>.
-		 */
-		public final Builder builtInAnalyzers(List<FieldTypes> list) {
-			this.builtInAnalyzers = _listAddAll(this.builtInAnalyzers, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code built_in_analyzers}
-		 * <p>
-		 * Adds one or more values to <code>builtInAnalyzers</code>.
-		 */
-		public final Builder builtInAnalyzers(FieldTypes value, FieldTypes... values) {
-			this.builtInAnalyzers = _listAdd(this.builtInAnalyzers, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code built_in_analyzers}
-		 * <p>
-		 * Adds a value to <code>builtInAnalyzers</code> using a builder lambda.
-		 */
-		public final Builder builtInAnalyzers(Function<FieldTypes.Builder, ObjectBuilder<FieldTypes>> fn) {
-			return builtInAnalyzers(fn.apply(new FieldTypes.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link CharFilterTypes}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CharFilterTypes build() {
-			_checkSingleUse();
-
-			return new CharFilterTypes(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CharFilterTypes}
-	 */
-	public static final JsonpDeserializer<CharFilterTypes> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CharFilterTypes::setupCharFilterTypesDeserializer);
-
-	protected static void setupCharFilterTypesDeserializer(ObjectDeserializer<CharFilterTypes.Builder> op) {
-
-		op.add(Builder::charFilterTypes, JsonpDeserializer.arrayDeserializer(FieldTypes._DESERIALIZER),
-				"char_filter_types");
-		op.add(Builder::tokenizerTypes, JsonpDeserializer.arrayDeserializer(FieldTypes._DESERIALIZER),
-				"tokenizer_types");
-		op.add(Builder::filterTypes, JsonpDeserializer.arrayDeserializer(FieldTypes._DESERIALIZER), "filter_types");
-		op.add(Builder::analyzerTypes, JsonpDeserializer.arrayDeserializer(FieldTypes._DESERIALIZER), "analyzer_types");
-		op.add(Builder::builtInCharFilters, JsonpDeserializer.arrayDeserializer(FieldTypes._DESERIALIZER),
-				"built_in_char_filters");
-		op.add(Builder::builtInTokenizers, JsonpDeserializer.arrayDeserializer(FieldTypes._DESERIALIZER),
-				"built_in_tokenizers");
-		op.add(Builder::builtInFilters, JsonpDeserializer.arrayDeserializer(FieldTypes._DESERIALIZER),
-				"built_in_filters");
-		op.add(Builder::builtInAnalyzers, JsonpDeserializer.arrayDeserializer(FieldTypes._DESERIALIZER),
-				"built_in_analyzers");
-
-	}
+    private final List<FieldTypes> charFilterTypes;
+
+    private final List<FieldTypes> tokenizerTypes;
+
+    private final List<FieldTypes> filterTypes;
+
+    private final List<FieldTypes> analyzerTypes;
+
+    private final List<FieldTypes> builtInCharFilters;
+
+    private final List<FieldTypes> builtInTokenizers;
+
+    private final List<FieldTypes> builtInFilters;
+
+    private final List<FieldTypes> builtInAnalyzers;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CharFilterTypes(Builder builder) {
+
+        this.charFilterTypes = ApiTypeHelper.unmodifiableRequired(builder.charFilterTypes, this, "charFilterTypes");
+        this.tokenizerTypes = ApiTypeHelper.unmodifiableRequired(builder.tokenizerTypes, this, "tokenizerTypes");
+        this.filterTypes = ApiTypeHelper.unmodifiableRequired(builder.filterTypes, this, "filterTypes");
+        this.analyzerTypes = ApiTypeHelper.unmodifiableRequired(builder.analyzerTypes, this, "analyzerTypes");
+        this.builtInCharFilters = ApiTypeHelper.unmodifiableRequired(builder.builtInCharFilters, this, "builtInCharFilters");
+        this.builtInTokenizers = ApiTypeHelper.unmodifiableRequired(builder.builtInTokenizers, this, "builtInTokenizers");
+        this.builtInFilters = ApiTypeHelper.unmodifiableRequired(builder.builtInFilters, this, "builtInFilters");
+        this.builtInAnalyzers = ApiTypeHelper.unmodifiableRequired(builder.builtInAnalyzers, this, "builtInAnalyzers");
+
+    }
+
+    public static CharFilterTypes of(Function<Builder, ObjectBuilder<CharFilterTypes>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code char_filter_types}
+     */
+    public final List<FieldTypes> charFilterTypes() {
+        return this.charFilterTypes;
+    }
+
+    /**
+     * Required - API name: {@code tokenizer_types}
+     */
+    public final List<FieldTypes> tokenizerTypes() {
+        return this.tokenizerTypes;
+    }
+
+    /**
+     * Required - API name: {@code filter_types}
+     */
+    public final List<FieldTypes> filterTypes() {
+        return this.filterTypes;
+    }
+
+    /**
+     * Required - API name: {@code analyzer_types}
+     */
+    public final List<FieldTypes> analyzerTypes() {
+        return this.analyzerTypes;
+    }
+
+    /**
+     * Required - API name: {@code built_in_char_filters}
+     */
+    public final List<FieldTypes> builtInCharFilters() {
+        return this.builtInCharFilters;
+    }
+
+    /**
+     * Required - API name: {@code built_in_tokenizers}
+     */
+    public final List<FieldTypes> builtInTokenizers() {
+        return this.builtInTokenizers;
+    }
+
+    /**
+     * Required - API name: {@code built_in_filters}
+     */
+    public final List<FieldTypes> builtInFilters() {
+        return this.builtInFilters;
+    }
+
+    /**
+     * Required - API name: {@code built_in_analyzers}
+     */
+    public final List<FieldTypes> builtInAnalyzers() {
+        return this.builtInAnalyzers;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.charFilterTypes)) {
+            generator.writeKey("char_filter_types");
+            generator.writeStartArray();
+            for (FieldTypes item0 : this.charFilterTypes) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.tokenizerTypes)) {
+            generator.writeKey("tokenizer_types");
+            generator.writeStartArray();
+            for (FieldTypes item0 : this.tokenizerTypes) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.filterTypes)) {
+            generator.writeKey("filter_types");
+            generator.writeStartArray();
+            for (FieldTypes item0 : this.filterTypes) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.analyzerTypes)) {
+            generator.writeKey("analyzer_types");
+            generator.writeStartArray();
+            for (FieldTypes item0 : this.analyzerTypes) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.builtInCharFilters)) {
+            generator.writeKey("built_in_char_filters");
+            generator.writeStartArray();
+            for (FieldTypes item0 : this.builtInCharFilters) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.builtInTokenizers)) {
+            generator.writeKey("built_in_tokenizers");
+            generator.writeStartArray();
+            for (FieldTypes item0 : this.builtInTokenizers) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.builtInFilters)) {
+            generator.writeKey("built_in_filters");
+            generator.writeStartArray();
+            for (FieldTypes item0 : this.builtInFilters) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.builtInAnalyzers)) {
+            generator.writeKey("built_in_analyzers");
+            generator.writeStartArray();
+            for (FieldTypes item0 : this.builtInAnalyzers) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CharFilterTypes}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CharFilterTypes> {
+        private List<FieldTypes> charFilterTypes;
+
+        private List<FieldTypes> tokenizerTypes;
+
+        private List<FieldTypes> filterTypes;
+
+        private List<FieldTypes> analyzerTypes;
+
+        private List<FieldTypes> builtInCharFilters;
+
+        private List<FieldTypes> builtInTokenizers;
+
+        private List<FieldTypes> builtInFilters;
+
+        private List<FieldTypes> builtInAnalyzers;
+
+        /**
+         * Required - API name: {@code char_filter_types}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>charFilterTypes</code>.
+         */
+        public final Builder charFilterTypes(List<FieldTypes> list) {
+            this.charFilterTypes = _listAddAll(this.charFilterTypes, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code char_filter_types}
+         * <p>
+         * Adds one or more values to <code>charFilterTypes</code>.
+         */
+        public final Builder charFilterTypes(FieldTypes value, FieldTypes... values) {
+            this.charFilterTypes = _listAdd(this.charFilterTypes, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code char_filter_types}
+         * <p>
+         * Adds a value to <code>charFilterTypes</code> using a builder lambda.
+         */
+        public final Builder charFilterTypes(Function<FieldTypes.Builder, ObjectBuilder<FieldTypes>> fn) {
+            return charFilterTypes(fn.apply(new FieldTypes.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code tokenizer_types}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>tokenizerTypes</code>.
+         */
+        public final Builder tokenizerTypes(List<FieldTypes> list) {
+            this.tokenizerTypes = _listAddAll(this.tokenizerTypes, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tokenizer_types}
+         * <p>
+         * Adds one or more values to <code>tokenizerTypes</code>.
+         */
+        public final Builder tokenizerTypes(FieldTypes value, FieldTypes... values) {
+            this.tokenizerTypes = _listAdd(this.tokenizerTypes, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tokenizer_types}
+         * <p>
+         * Adds a value to <code>tokenizerTypes</code> using a builder lambda.
+         */
+        public final Builder tokenizerTypes(Function<FieldTypes.Builder, ObjectBuilder<FieldTypes>> fn) {
+            return tokenizerTypes(fn.apply(new FieldTypes.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code filter_types}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>filterTypes</code>.
+         */
+        public final Builder filterTypes(List<FieldTypes> list) {
+            this.filterTypes = _listAddAll(this.filterTypes, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code filter_types}
+         * <p>
+         * Adds one or more values to <code>filterTypes</code>.
+         */
+        public final Builder filterTypes(FieldTypes value, FieldTypes... values) {
+            this.filterTypes = _listAdd(this.filterTypes, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code filter_types}
+         * <p>
+         * Adds a value to <code>filterTypes</code> using a builder lambda.
+         */
+        public final Builder filterTypes(Function<FieldTypes.Builder, ObjectBuilder<FieldTypes>> fn) {
+            return filterTypes(fn.apply(new FieldTypes.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code analyzer_types}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>analyzerTypes</code>.
+         */
+        public final Builder analyzerTypes(List<FieldTypes> list) {
+            this.analyzerTypes = _listAddAll(this.analyzerTypes, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code analyzer_types}
+         * <p>
+         * Adds one or more values to <code>analyzerTypes</code>.
+         */
+        public final Builder analyzerTypes(FieldTypes value, FieldTypes... values) {
+            this.analyzerTypes = _listAdd(this.analyzerTypes, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code analyzer_types}
+         * <p>
+         * Adds a value to <code>analyzerTypes</code> using a builder lambda.
+         */
+        public final Builder analyzerTypes(Function<FieldTypes.Builder, ObjectBuilder<FieldTypes>> fn) {
+            return analyzerTypes(fn.apply(new FieldTypes.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code built_in_char_filters}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>builtInCharFilters</code>.
+         */
+        public final Builder builtInCharFilters(List<FieldTypes> list) {
+            this.builtInCharFilters = _listAddAll(this.builtInCharFilters, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code built_in_char_filters}
+         * <p>
+         * Adds one or more values to <code>builtInCharFilters</code>.
+         */
+        public final Builder builtInCharFilters(FieldTypes value, FieldTypes... values) {
+            this.builtInCharFilters = _listAdd(this.builtInCharFilters, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code built_in_char_filters}
+         * <p>
+         * Adds a value to <code>builtInCharFilters</code> using a builder lambda.
+         */
+        public final Builder builtInCharFilters(Function<FieldTypes.Builder, ObjectBuilder<FieldTypes>> fn) {
+            return builtInCharFilters(fn.apply(new FieldTypes.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code built_in_tokenizers}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>builtInTokenizers</code>.
+         */
+        public final Builder builtInTokenizers(List<FieldTypes> list) {
+            this.builtInTokenizers = _listAddAll(this.builtInTokenizers, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code built_in_tokenizers}
+         * <p>
+         * Adds one or more values to <code>builtInTokenizers</code>.
+         */
+        public final Builder builtInTokenizers(FieldTypes value, FieldTypes... values) {
+            this.builtInTokenizers = _listAdd(this.builtInTokenizers, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code built_in_tokenizers}
+         * <p>
+         * Adds a value to <code>builtInTokenizers</code> using a builder lambda.
+         */
+        public final Builder builtInTokenizers(Function<FieldTypes.Builder, ObjectBuilder<FieldTypes>> fn) {
+            return builtInTokenizers(fn.apply(new FieldTypes.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code built_in_filters}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>builtInFilters</code>.
+         */
+        public final Builder builtInFilters(List<FieldTypes> list) {
+            this.builtInFilters = _listAddAll(this.builtInFilters, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code built_in_filters}
+         * <p>
+         * Adds one or more values to <code>builtInFilters</code>.
+         */
+        public final Builder builtInFilters(FieldTypes value, FieldTypes... values) {
+            this.builtInFilters = _listAdd(this.builtInFilters, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code built_in_filters}
+         * <p>
+         * Adds a value to <code>builtInFilters</code> using a builder lambda.
+         */
+        public final Builder builtInFilters(Function<FieldTypes.Builder, ObjectBuilder<FieldTypes>> fn) {
+            return builtInFilters(fn.apply(new FieldTypes.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code built_in_analyzers}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>builtInAnalyzers</code>.
+         */
+        public final Builder builtInAnalyzers(List<FieldTypes> list) {
+            this.builtInAnalyzers = _listAddAll(this.builtInAnalyzers, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code built_in_analyzers}
+         * <p>
+         * Adds one or more values to <code>builtInAnalyzers</code>.
+         */
+        public final Builder builtInAnalyzers(FieldTypes value, FieldTypes... values) {
+            this.builtInAnalyzers = _listAdd(this.builtInAnalyzers, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code built_in_analyzers}
+         * <p>
+         * Adds a value to <code>builtInAnalyzers</code> using a builder lambda.
+         */
+        public final Builder builtInAnalyzers(Function<FieldTypes.Builder, ObjectBuilder<FieldTypes>> fn) {
+            return builtInAnalyzers(fn.apply(new FieldTypes.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link CharFilterTypes}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CharFilterTypes build() {
+            _checkSingleUse();
+
+            return new CharFilterTypes(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CharFilterTypes}
+     */
+    public static final JsonpDeserializer<CharFilterTypes> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CharFilterTypes::setupCharFilterTypesDeserializer
+    );
+
+    protected static void setupCharFilterTypesDeserializer(ObjectDeserializer<CharFilterTypes.Builder> op) {
+
+        op.add(Builder::charFilterTypes, JsonpDeserializer.arrayDeserializer(FieldTypes._DESERIALIZER), "char_filter_types");
+        op.add(Builder::tokenizerTypes, JsonpDeserializer.arrayDeserializer(FieldTypes._DESERIALIZER), "tokenizer_types");
+        op.add(Builder::filterTypes, JsonpDeserializer.arrayDeserializer(FieldTypes._DESERIALIZER), "filter_types");
+        op.add(Builder::analyzerTypes, JsonpDeserializer.arrayDeserializer(FieldTypes._DESERIALIZER), "analyzer_types");
+        op.add(Builder::builtInCharFilters, JsonpDeserializer.arrayDeserializer(FieldTypes._DESERIALIZER), "built_in_char_filters");
+        op.add(Builder::builtInTokenizers, JsonpDeserializer.arrayDeserializer(FieldTypes._DESERIALIZER), "built_in_tokenizers");
+        op.add(Builder::builtInFilters, JsonpDeserializer.arrayDeserializer(FieldTypes._DESERIALIZER), "built_in_filters");
+        op.add(Builder::builtInAnalyzers, JsonpDeserializer.arrayDeserializer(FieldTypes._DESERIALIZER), "built_in_analyzers");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterFileSystem.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterFileSystem.java
index dd52b3e3f7..f9449612bd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterFileSystem.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterFileSystem.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,141 +43,140 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.stats.ClusterFileSystem
 
-
 @JsonpDeserializable
 public class ClusterFileSystem implements JsonpSerializable {
-	private final long availableInBytes;
-
-	private final long freeInBytes;
-
-	private final long totalInBytes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterFileSystem(Builder builder) {
-
-		this.availableInBytes = ApiTypeHelper.requireNonNull(builder.availableInBytes, this, "availableInBytes");
-		this.freeInBytes = ApiTypeHelper.requireNonNull(builder.freeInBytes, this, "freeInBytes");
-		this.totalInBytes = ApiTypeHelper.requireNonNull(builder.totalInBytes, this, "totalInBytes");
-
-	}
-
-	public static ClusterFileSystem of(Function<Builder, ObjectBuilder<ClusterFileSystem>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code available_in_bytes}
-	 */
-	public final long availableInBytes() {
-		return this.availableInBytes;
-	}
+    private final long availableInBytes;
 
-	/**
-	 * Required - API name: {@code free_in_bytes}
-	 */
-	public final long freeInBytes() {
-		return this.freeInBytes;
-	}
-
-	/**
-	 * Required - API name: {@code total_in_bytes}
-	 */
-	public final long totalInBytes() {
-		return this.totalInBytes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("available_in_bytes");
-		generator.write(this.availableInBytes);
-
-		generator.writeKey("free_in_bytes");
-		generator.write(this.freeInBytes);
-
-		generator.writeKey("total_in_bytes");
-		generator.write(this.totalInBytes);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterFileSystem}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterFileSystem> {
-		private Long availableInBytes;
-
-		private Long freeInBytes;
-
-		private Long totalInBytes;
-
-		/**
-		 * Required - API name: {@code available_in_bytes}
-		 */
-		public final Builder availableInBytes(long value) {
-			this.availableInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code free_in_bytes}
-		 */
-		public final Builder freeInBytes(long value) {
-			this.freeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_in_bytes}
-		 */
-		public final Builder totalInBytes(long value) {
-			this.totalInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ClusterFileSystem}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterFileSystem build() {
-			_checkSingleUse();
-
-			return new ClusterFileSystem(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterFileSystem}
-	 */
-	public static final JsonpDeserializer<ClusterFileSystem> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClusterFileSystem::setupClusterFileSystemDeserializer);
-
-	protected static void setupClusterFileSystemDeserializer(ObjectDeserializer<ClusterFileSystem.Builder> op) {
-
-		op.add(Builder::availableInBytes, JsonpDeserializer.longDeserializer(), "available_in_bytes");
-		op.add(Builder::freeInBytes, JsonpDeserializer.longDeserializer(), "free_in_bytes");
-		op.add(Builder::totalInBytes, JsonpDeserializer.longDeserializer(), "total_in_bytes");
-
-	}
+    private final long freeInBytes;
+
+    private final long totalInBytes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterFileSystem(Builder builder) {
+
+        this.availableInBytes = ApiTypeHelper.requireNonNull(builder.availableInBytes, this, "availableInBytes");
+        this.freeInBytes = ApiTypeHelper.requireNonNull(builder.freeInBytes, this, "freeInBytes");
+        this.totalInBytes = ApiTypeHelper.requireNonNull(builder.totalInBytes, this, "totalInBytes");
+
+    }
+
+    public static ClusterFileSystem of(Function<Builder, ObjectBuilder<ClusterFileSystem>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code available_in_bytes}
+     */
+    public final long availableInBytes() {
+        return this.availableInBytes;
+    }
+
+    /**
+     * Required - API name: {@code free_in_bytes}
+     */
+    public final long freeInBytes() {
+        return this.freeInBytes;
+    }
+
+    /**
+     * Required - API name: {@code total_in_bytes}
+     */
+    public final long totalInBytes() {
+        return this.totalInBytes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("available_in_bytes");
+        generator.write(this.availableInBytes);
+
+        generator.writeKey("free_in_bytes");
+        generator.write(this.freeInBytes);
+
+        generator.writeKey("total_in_bytes");
+        generator.write(this.totalInBytes);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterFileSystem}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterFileSystem> {
+        private Long availableInBytes;
+
+        private Long freeInBytes;
+
+        private Long totalInBytes;
+
+        /**
+         * Required - API name: {@code available_in_bytes}
+         */
+        public final Builder availableInBytes(long value) {
+            this.availableInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code free_in_bytes}
+         */
+        public final Builder freeInBytes(long value) {
+            this.freeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_in_bytes}
+         */
+        public final Builder totalInBytes(long value) {
+            this.totalInBytes = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ClusterFileSystem}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterFileSystem build() {
+            _checkSingleUse();
+
+            return new ClusterFileSystem(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterFileSystem}
+     */
+    public static final JsonpDeserializer<ClusterFileSystem> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterFileSystem::setupClusterFileSystemDeserializer
+    );
+
+    protected static void setupClusterFileSystemDeserializer(ObjectDeserializer<ClusterFileSystem.Builder> op) {
+
+        op.add(Builder::availableInBytes, JsonpDeserializer.longDeserializer(), "available_in_bytes");
+        op.add(Builder::freeInBytes, JsonpDeserializer.longDeserializer(), "free_in_bytes");
+        op.add(Builder::totalInBytes, JsonpDeserializer.longDeserializer(), "total_in_bytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterIndices.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterIndices.java
index 8ebae307b0..d1b3543a4d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterIndices.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterIndices.java
@@ -32,513 +32,514 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
-import org.opensearch.client.opensearch._types.CompletionStats;
-import org.opensearch.client.opensearch._types.DocStats;
-import org.opensearch.client.opensearch._types.FielddataStats;
-import org.opensearch.client.opensearch._types.QueryCacheStats;
-import org.opensearch.client.opensearch._types.SegmentsStats;
-import org.opensearch.client.opensearch._types.StoreStats;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.CompletionStats;
+import org.opensearch.client.opensearch._types.DocStats;
+import org.opensearch.client.opensearch._types.FielddataStats;
+import org.opensearch.client.opensearch._types.QueryCacheStats;
+import org.opensearch.client.opensearch._types.SegmentsStats;
+import org.opensearch.client.opensearch._types.StoreStats;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.stats.ClusterIndices
 
-
 @JsonpDeserializable
 public class ClusterIndices implements JsonpSerializable {
-	private final CompletionStats completion;
-
-	private final long count;
-
-	private final DocStats docs;
-
-	private final FielddataStats fielddata;
-
-	private final QueryCacheStats queryCache;
-
-	private final SegmentsStats segments;
-
-	private final ClusterIndicesShards shards;
-
-	private final StoreStats store;
-
-	private final FieldTypesMappings mappings;
-
-	private final CharFilterTypes analysis;
-
-	private final List<IndicesVersions> versions;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterIndices(Builder builder) {
-
-		this.completion = ApiTypeHelper.requireNonNull(builder.completion, this, "completion");
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.docs = ApiTypeHelper.requireNonNull(builder.docs, this, "docs");
-		this.fielddata = ApiTypeHelper.requireNonNull(builder.fielddata, this, "fielddata");
-		this.queryCache = ApiTypeHelper.requireNonNull(builder.queryCache, this, "queryCache");
-		this.segments = ApiTypeHelper.requireNonNull(builder.segments, this, "segments");
-		this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
-		this.store = ApiTypeHelper.requireNonNull(builder.store, this, "store");
-		this.mappings = ApiTypeHelper.requireNonNull(builder.mappings, this, "mappings");
-		this.analysis = ApiTypeHelper.requireNonNull(builder.analysis, this, "analysis");
-		this.versions = ApiTypeHelper.unmodifiable(builder.versions);
-
-	}
-
-	public static ClusterIndices of(Function<Builder, ObjectBuilder<ClusterIndices>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Contains statistics about memory used for completion in selected
-	 * nodes.
-	 * <p>
-	 * API name: {@code completion}
-	 */
-	public final CompletionStats completion() {
-		return this.completion;
-	}
-
-	/**
-	 * Required - Total number of indices with shards assigned to selected nodes.
-	 * <p>
-	 * API name: {@code count}
-	 */
-	public final long count() {
-		return this.count;
-	}
-
-	/**
-	 * Required - Contains counts for documents in selected nodes.
-	 * <p>
-	 * API name: {@code docs}
-	 */
-	public final DocStats docs() {
-		return this.docs;
-	}
-
-	/**
-	 * Required - Contains statistics about the field data cache of selected nodes.
-	 * <p>
-	 * API name: {@code fielddata}
-	 */
-	public final FielddataStats fielddata() {
-		return this.fielddata;
-	}
-
-	/**
-	 * Required - Contains statistics about the query cache of selected nodes.
-	 * <p>
-	 * API name: {@code query_cache}
-	 */
-	public final QueryCacheStats queryCache() {
-		return this.queryCache;
-	}
-
-	/**
-	 * Required - Contains statistics about segments in selected nodes.
-	 * <p>
-	 * API name: {@code segments}
-	 */
-	public final SegmentsStats segments() {
-		return this.segments;
-	}
-
-	/**
-	 * Required - Contains statistics about indices with shards assigned to selected
-	 * nodes.
-	 * <p>
-	 * API name: {@code shards}
-	 */
-	public final ClusterIndicesShards shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Required - Contains statistics about the size of shards assigned to selected
-	 * nodes.
-	 * <p>
-	 * API name: {@code store}
-	 */
-	public final StoreStats store() {
-		return this.store;
-	}
-
-	/**
-	 * Required - Contains statistics about field mappings in selected nodes.
-	 * <p>
-	 * API name: {@code mappings}
-	 */
-	public final FieldTypesMappings mappings() {
-		return this.mappings;
-	}
-
-	/**
-	 * Required - Contains statistics about analyzers and analyzer components used
-	 * in selected nodes.
-	 * <p>
-	 * API name: {@code analysis}
-	 */
-	public final CharFilterTypes analysis() {
-		return this.analysis;
-	}
-
-	/**
-	 * API name: {@code versions}
-	 */
-	public final List<IndicesVersions> versions() {
-		return this.versions;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("completion");
-		this.completion.serialize(generator, mapper);
-
-		generator.writeKey("count");
-		generator.write(this.count);
-
-		generator.writeKey("docs");
-		this.docs.serialize(generator, mapper);
-
-		generator.writeKey("fielddata");
-		this.fielddata.serialize(generator, mapper);
-
-		generator.writeKey("query_cache");
-		this.queryCache.serialize(generator, mapper);
-
-		generator.writeKey("segments");
-		this.segments.serialize(generator, mapper);
-
-		generator.writeKey("shards");
-		this.shards.serialize(generator, mapper);
-
-		generator.writeKey("store");
-		this.store.serialize(generator, mapper);
-
-		generator.writeKey("mappings");
-		this.mappings.serialize(generator, mapper);
-
-		generator.writeKey("analysis");
-		this.analysis.serialize(generator, mapper);
-
-		if (ApiTypeHelper.isDefined(this.versions)) {
-			generator.writeKey("versions");
-			generator.writeStartArray();
-			for (IndicesVersions item0 : this.versions) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterIndices}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterIndices> {
-		private CompletionStats completion;
-
-		private Long count;
-
-		private DocStats docs;
-
-		private FielddataStats fielddata;
-
-		private QueryCacheStats queryCache;
-
-		private SegmentsStats segments;
-
-		private ClusterIndicesShards shards;
-
-		private StoreStats store;
-
-		private FieldTypesMappings mappings;
-
-		private CharFilterTypes analysis;
-
-		@Nullable
-		private List<IndicesVersions> versions;
-
-		/**
-		 * Required - Contains statistics about memory used for completion in selected
-		 * nodes.
-		 * <p>
-		 * API name: {@code completion}
-		 */
-		public final Builder completion(CompletionStats value) {
-			this.completion = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about memory used for completion in selected
-		 * nodes.
-		 * <p>
-		 * API name: {@code completion}
-		 */
-		public final Builder completion(Function<CompletionStats.Builder, ObjectBuilder<CompletionStats>> fn) {
-			return this.completion(fn.apply(new CompletionStats.Builder()).build());
-		}
-
-		/**
-		 * Required - Total number of indices with shards assigned to selected nodes.
-		 * <p>
-		 * API name: {@code count}
-		 */
-		public final Builder count(long value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains counts for documents in selected nodes.
-		 * <p>
-		 * API name: {@code docs}
-		 */
-		public final Builder docs(DocStats value) {
-			this.docs = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains counts for documents in selected nodes.
-		 * <p>
-		 * API name: {@code docs}
-		 */
-		public final Builder docs(Function<DocStats.Builder, ObjectBuilder<DocStats>> fn) {
-			return this.docs(fn.apply(new DocStats.Builder()).build());
-		}
-
-		/**
-		 * Required - Contains statistics about the field data cache of selected nodes.
-		 * <p>
-		 * API name: {@code fielddata}
-		 */
-		public final Builder fielddata(FielddataStats value) {
-			this.fielddata = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about the field data cache of selected nodes.
-		 * <p>
-		 * API name: {@code fielddata}
-		 */
-		public final Builder fielddata(Function<FielddataStats.Builder, ObjectBuilder<FielddataStats>> fn) {
-			return this.fielddata(fn.apply(new FielddataStats.Builder()).build());
-		}
-
-		/**
-		 * Required - Contains statistics about the query cache of selected nodes.
-		 * <p>
-		 * API name: {@code query_cache}
-		 */
-		public final Builder queryCache(QueryCacheStats value) {
-			this.queryCache = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about the query cache of selected nodes.
-		 * <p>
-		 * API name: {@code query_cache}
-		 */
-		public final Builder queryCache(Function<QueryCacheStats.Builder, ObjectBuilder<QueryCacheStats>> fn) {
-			return this.queryCache(fn.apply(new QueryCacheStats.Builder()).build());
-		}
-
-		/**
-		 * Required - Contains statistics about segments in selected nodes.
-		 * <p>
-		 * API name: {@code segments}
-		 */
-		public final Builder segments(SegmentsStats value) {
-			this.segments = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about segments in selected nodes.
-		 * <p>
-		 * API name: {@code segments}
-		 */
-		public final Builder segments(Function<SegmentsStats.Builder, ObjectBuilder<SegmentsStats>> fn) {
-			return this.segments(fn.apply(new SegmentsStats.Builder()).build());
-		}
-
-		/**
-		 * Required - Contains statistics about indices with shards assigned to selected
-		 * nodes.
-		 * <p>
-		 * API name: {@code shards}
-		 */
-		public final Builder shards(ClusterIndicesShards value) {
-			this.shards = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about indices with shards assigned to selected
-		 * nodes.
-		 * <p>
-		 * API name: {@code shards}
-		 */
-		public final Builder shards(Function<ClusterIndicesShards.Builder, ObjectBuilder<ClusterIndicesShards>> fn) {
-			return this.shards(fn.apply(new ClusterIndicesShards.Builder()).build());
-		}
-
-		/**
-		 * Required - Contains statistics about the size of shards assigned to selected
-		 * nodes.
-		 * <p>
-		 * API name: {@code store}
-		 */
-		public final Builder store(StoreStats value) {
-			this.store = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about the size of shards assigned to selected
-		 * nodes.
-		 * <p>
-		 * API name: {@code store}
-		 */
-		public final Builder store(Function<StoreStats.Builder, ObjectBuilder<StoreStats>> fn) {
-			return this.store(fn.apply(new StoreStats.Builder()).build());
-		}
-
-		/**
-		 * Required - Contains statistics about field mappings in selected nodes.
-		 * <p>
-		 * API name: {@code mappings}
-		 */
-		public final Builder mappings(FieldTypesMappings value) {
-			this.mappings = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about field mappings in selected nodes.
-		 * <p>
-		 * API name: {@code mappings}
-		 */
-		public final Builder mappings(Function<FieldTypesMappings.Builder, ObjectBuilder<FieldTypesMappings>> fn) {
-			return this.mappings(fn.apply(new FieldTypesMappings.Builder()).build());
-		}
-
-		/**
-		 * Required - Contains statistics about analyzers and analyzer components used
-		 * in selected nodes.
-		 * <p>
-		 * API name: {@code analysis}
-		 */
-		public final Builder analysis(CharFilterTypes value) {
-			this.analysis = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about analyzers and analyzer components used
-		 * in selected nodes.
-		 * <p>
-		 * API name: {@code analysis}
-		 */
-		public final Builder analysis(Function<CharFilterTypes.Builder, ObjectBuilder<CharFilterTypes>> fn) {
-			return this.analysis(fn.apply(new CharFilterTypes.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code versions}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>versions</code>.
-		 */
-		public final Builder versions(List<IndicesVersions> list) {
-			this.versions = _listAddAll(this.versions, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code versions}
-		 * <p>
-		 * Adds one or more values to <code>versions</code>.
-		 */
-		public final Builder versions(IndicesVersions value, IndicesVersions... values) {
-			this.versions = _listAdd(this.versions, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code versions}
-		 * <p>
-		 * Adds a value to <code>versions</code> using a builder lambda.
-		 */
-		public final Builder versions(Function<IndicesVersions.Builder, ObjectBuilder<IndicesVersions>> fn) {
-			return versions(fn.apply(new IndicesVersions.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ClusterIndices}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterIndices build() {
-			_checkSingleUse();
-
-			return new ClusterIndices(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterIndices}
-	 */
-	public static final JsonpDeserializer<ClusterIndices> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ClusterIndices::setupClusterIndicesDeserializer);
-
-	protected static void setupClusterIndicesDeserializer(ObjectDeserializer<ClusterIndices.Builder> op) {
-
-		op.add(Builder::completion, CompletionStats._DESERIALIZER, "completion");
-		op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
-		op.add(Builder::docs, DocStats._DESERIALIZER, "docs");
-		op.add(Builder::fielddata, FielddataStats._DESERIALIZER, "fielddata");
-		op.add(Builder::queryCache, QueryCacheStats._DESERIALIZER, "query_cache");
-		op.add(Builder::segments, SegmentsStats._DESERIALIZER, "segments");
-		op.add(Builder::shards, ClusterIndicesShards._DESERIALIZER, "shards");
-		op.add(Builder::store, StoreStats._DESERIALIZER, "store");
-		op.add(Builder::mappings, FieldTypesMappings._DESERIALIZER, "mappings");
-		op.add(Builder::analysis, CharFilterTypes._DESERIALIZER, "analysis");
-		op.add(Builder::versions, JsonpDeserializer.arrayDeserializer(IndicesVersions._DESERIALIZER), "versions");
-
-	}
+    private final CompletionStats completion;
+
+    private final long count;
+
+    private final DocStats docs;
+
+    private final FielddataStats fielddata;
+
+    private final QueryCacheStats queryCache;
+
+    private final SegmentsStats segments;
+
+    private final ClusterIndicesShards shards;
+
+    private final StoreStats store;
+
+    private final FieldTypesMappings mappings;
+
+    private final CharFilterTypes analysis;
+
+    private final List<IndicesVersions> versions;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterIndices(Builder builder) {
+
+        this.completion = ApiTypeHelper.requireNonNull(builder.completion, this, "completion");
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.docs = ApiTypeHelper.requireNonNull(builder.docs, this, "docs");
+        this.fielddata = ApiTypeHelper.requireNonNull(builder.fielddata, this, "fielddata");
+        this.queryCache = ApiTypeHelper.requireNonNull(builder.queryCache, this, "queryCache");
+        this.segments = ApiTypeHelper.requireNonNull(builder.segments, this, "segments");
+        this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
+        this.store = ApiTypeHelper.requireNonNull(builder.store, this, "store");
+        this.mappings = ApiTypeHelper.requireNonNull(builder.mappings, this, "mappings");
+        this.analysis = ApiTypeHelper.requireNonNull(builder.analysis, this, "analysis");
+        this.versions = ApiTypeHelper.unmodifiable(builder.versions);
+
+    }
+
+    public static ClusterIndices of(Function<Builder, ObjectBuilder<ClusterIndices>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Contains statistics about memory used for completion in selected
+     * nodes.
+     * <p>
+     * API name: {@code completion}
+     */
+    public final CompletionStats completion() {
+        return this.completion;
+    }
+
+    /**
+     * Required - Total number of indices with shards assigned to selected nodes.
+     * <p>
+     * API name: {@code count}
+     */
+    public final long count() {
+        return this.count;
+    }
+
+    /**
+     * Required - Contains counts for documents in selected nodes.
+     * <p>
+     * API name: {@code docs}
+     */
+    public final DocStats docs() {
+        return this.docs;
+    }
+
+    /**
+     * Required - Contains statistics about the field data cache of selected nodes.
+     * <p>
+     * API name: {@code fielddata}
+     */
+    public final FielddataStats fielddata() {
+        return this.fielddata;
+    }
+
+    /**
+     * Required - Contains statistics about the query cache of selected nodes.
+     * <p>
+     * API name: {@code query_cache}
+     */
+    public final QueryCacheStats queryCache() {
+        return this.queryCache;
+    }
+
+    /**
+     * Required - Contains statistics about segments in selected nodes.
+     * <p>
+     * API name: {@code segments}
+     */
+    public final SegmentsStats segments() {
+        return this.segments;
+    }
+
+    /**
+     * Required - Contains statistics about indices with shards assigned to selected
+     * nodes.
+     * <p>
+     * API name: {@code shards}
+     */
+    public final ClusterIndicesShards shards() {
+        return this.shards;
+    }
+
+    /**
+     * Required - Contains statistics about the size of shards assigned to selected
+     * nodes.
+     * <p>
+     * API name: {@code store}
+     */
+    public final StoreStats store() {
+        return this.store;
+    }
+
+    /**
+     * Required - Contains statistics about field mappings in selected nodes.
+     * <p>
+     * API name: {@code mappings}
+     */
+    public final FieldTypesMappings mappings() {
+        return this.mappings;
+    }
+
+    /**
+     * Required - Contains statistics about analyzers and analyzer components used
+     * in selected nodes.
+     * <p>
+     * API name: {@code analysis}
+     */
+    public final CharFilterTypes analysis() {
+        return this.analysis;
+    }
+
+    /**
+     * API name: {@code versions}
+     */
+    public final List<IndicesVersions> versions() {
+        return this.versions;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("completion");
+        this.completion.serialize(generator, mapper);
+
+        generator.writeKey("count");
+        generator.write(this.count);
+
+        generator.writeKey("docs");
+        this.docs.serialize(generator, mapper);
+
+        generator.writeKey("fielddata");
+        this.fielddata.serialize(generator, mapper);
+
+        generator.writeKey("query_cache");
+        this.queryCache.serialize(generator, mapper);
+
+        generator.writeKey("segments");
+        this.segments.serialize(generator, mapper);
+
+        generator.writeKey("shards");
+        this.shards.serialize(generator, mapper);
+
+        generator.writeKey("store");
+        this.store.serialize(generator, mapper);
+
+        generator.writeKey("mappings");
+        this.mappings.serialize(generator, mapper);
+
+        generator.writeKey("analysis");
+        this.analysis.serialize(generator, mapper);
+
+        if (ApiTypeHelper.isDefined(this.versions)) {
+            generator.writeKey("versions");
+            generator.writeStartArray();
+            for (IndicesVersions item0 : this.versions) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterIndices}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterIndices> {
+        private CompletionStats completion;
+
+        private Long count;
+
+        private DocStats docs;
+
+        private FielddataStats fielddata;
+
+        private QueryCacheStats queryCache;
+
+        private SegmentsStats segments;
+
+        private ClusterIndicesShards shards;
+
+        private StoreStats store;
+
+        private FieldTypesMappings mappings;
+
+        private CharFilterTypes analysis;
+
+        @Nullable
+        private List<IndicesVersions> versions;
+
+        /**
+         * Required - Contains statistics about memory used for completion in selected
+         * nodes.
+         * <p>
+         * API name: {@code completion}
+         */
+        public final Builder completion(CompletionStats value) {
+            this.completion = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about memory used for completion in selected
+         * nodes.
+         * <p>
+         * API name: {@code completion}
+         */
+        public final Builder completion(Function<CompletionStats.Builder, ObjectBuilder<CompletionStats>> fn) {
+            return this.completion(fn.apply(new CompletionStats.Builder()).build());
+        }
+
+        /**
+         * Required - Total number of indices with shards assigned to selected nodes.
+         * <p>
+         * API name: {@code count}
+         */
+        public final Builder count(long value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains counts for documents in selected nodes.
+         * <p>
+         * API name: {@code docs}
+         */
+        public final Builder docs(DocStats value) {
+            this.docs = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains counts for documents in selected nodes.
+         * <p>
+         * API name: {@code docs}
+         */
+        public final Builder docs(Function<DocStats.Builder, ObjectBuilder<DocStats>> fn) {
+            return this.docs(fn.apply(new DocStats.Builder()).build());
+        }
+
+        /**
+         * Required - Contains statistics about the field data cache of selected nodes.
+         * <p>
+         * API name: {@code fielddata}
+         */
+        public final Builder fielddata(FielddataStats value) {
+            this.fielddata = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about the field data cache of selected nodes.
+         * <p>
+         * API name: {@code fielddata}
+         */
+        public final Builder fielddata(Function<FielddataStats.Builder, ObjectBuilder<FielddataStats>> fn) {
+            return this.fielddata(fn.apply(new FielddataStats.Builder()).build());
+        }
+
+        /**
+         * Required - Contains statistics about the query cache of selected nodes.
+         * <p>
+         * API name: {@code query_cache}
+         */
+        public final Builder queryCache(QueryCacheStats value) {
+            this.queryCache = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about the query cache of selected nodes.
+         * <p>
+         * API name: {@code query_cache}
+         */
+        public final Builder queryCache(Function<QueryCacheStats.Builder, ObjectBuilder<QueryCacheStats>> fn) {
+            return this.queryCache(fn.apply(new QueryCacheStats.Builder()).build());
+        }
+
+        /**
+         * Required - Contains statistics about segments in selected nodes.
+         * <p>
+         * API name: {@code segments}
+         */
+        public final Builder segments(SegmentsStats value) {
+            this.segments = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about segments in selected nodes.
+         * <p>
+         * API name: {@code segments}
+         */
+        public final Builder segments(Function<SegmentsStats.Builder, ObjectBuilder<SegmentsStats>> fn) {
+            return this.segments(fn.apply(new SegmentsStats.Builder()).build());
+        }
+
+        /**
+         * Required - Contains statistics about indices with shards assigned to selected
+         * nodes.
+         * <p>
+         * API name: {@code shards}
+         */
+        public final Builder shards(ClusterIndicesShards value) {
+            this.shards = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about indices with shards assigned to selected
+         * nodes.
+         * <p>
+         * API name: {@code shards}
+         */
+        public final Builder shards(Function<ClusterIndicesShards.Builder, ObjectBuilder<ClusterIndicesShards>> fn) {
+            return this.shards(fn.apply(new ClusterIndicesShards.Builder()).build());
+        }
+
+        /**
+         * Required - Contains statistics about the size of shards assigned to selected
+         * nodes.
+         * <p>
+         * API name: {@code store}
+         */
+        public final Builder store(StoreStats value) {
+            this.store = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about the size of shards assigned to selected
+         * nodes.
+         * <p>
+         * API name: {@code store}
+         */
+        public final Builder store(Function<StoreStats.Builder, ObjectBuilder<StoreStats>> fn) {
+            return this.store(fn.apply(new StoreStats.Builder()).build());
+        }
+
+        /**
+         * Required - Contains statistics about field mappings in selected nodes.
+         * <p>
+         * API name: {@code mappings}
+         */
+        public final Builder mappings(FieldTypesMappings value) {
+            this.mappings = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about field mappings in selected nodes.
+         * <p>
+         * API name: {@code mappings}
+         */
+        public final Builder mappings(Function<FieldTypesMappings.Builder, ObjectBuilder<FieldTypesMappings>> fn) {
+            return this.mappings(fn.apply(new FieldTypesMappings.Builder()).build());
+        }
+
+        /**
+         * Required - Contains statistics about analyzers and analyzer components used
+         * in selected nodes.
+         * <p>
+         * API name: {@code analysis}
+         */
+        public final Builder analysis(CharFilterTypes value) {
+            this.analysis = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about analyzers and analyzer components used
+         * in selected nodes.
+         * <p>
+         * API name: {@code analysis}
+         */
+        public final Builder analysis(Function<CharFilterTypes.Builder, ObjectBuilder<CharFilterTypes>> fn) {
+            return this.analysis(fn.apply(new CharFilterTypes.Builder()).build());
+        }
+
+        /**
+         * API name: {@code versions}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>versions</code>.
+         */
+        public final Builder versions(List<IndicesVersions> list) {
+            this.versions = _listAddAll(this.versions, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code versions}
+         * <p>
+         * Adds one or more values to <code>versions</code>.
+         */
+        public final Builder versions(IndicesVersions value, IndicesVersions... values) {
+            this.versions = _listAdd(this.versions, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code versions}
+         * <p>
+         * Adds a value to <code>versions</code> using a builder lambda.
+         */
+        public final Builder versions(Function<IndicesVersions.Builder, ObjectBuilder<IndicesVersions>> fn) {
+            return versions(fn.apply(new IndicesVersions.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ClusterIndices}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterIndices build() {
+            _checkSingleUse();
+
+            return new ClusterIndices(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterIndices}
+     */
+    public static final JsonpDeserializer<ClusterIndices> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterIndices::setupClusterIndicesDeserializer
+    );
+
+    protected static void setupClusterIndicesDeserializer(ObjectDeserializer<ClusterIndices.Builder> op) {
+
+        op.add(Builder::completion, CompletionStats._DESERIALIZER, "completion");
+        op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
+        op.add(Builder::docs, DocStats._DESERIALIZER, "docs");
+        op.add(Builder::fielddata, FielddataStats._DESERIALIZER, "fielddata");
+        op.add(Builder::queryCache, QueryCacheStats._DESERIALIZER, "query_cache");
+        op.add(Builder::segments, SegmentsStats._DESERIALIZER, "segments");
+        op.add(Builder::shards, ClusterIndicesShards._DESERIALIZER, "shards");
+        op.add(Builder::store, StoreStats._DESERIALIZER, "store");
+        op.add(Builder::mappings, FieldTypesMappings._DESERIALIZER, "mappings");
+        op.add(Builder::analysis, CharFilterTypes._DESERIALIZER, "analysis");
+        op.add(Builder::versions, JsonpDeserializer.arrayDeserializer(IndicesVersions._DESERIALIZER), "versions");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterIndicesShards.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterIndicesShards.java
index 8cb9b3202f..098d19e205 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterIndicesShards.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterIndicesShards.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,9 +43,6 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.stats.ClusterIndicesShards
 
@@ -52,204 +52,205 @@
  */
 @JsonpDeserializable
 public class ClusterIndicesShards implements JsonpSerializable {
-	@Nullable
-	private final ClusterIndicesShardsIndex index;
-
-	@Nullable
-	private final Double primaries;
-
-	@Nullable
-	private final Double replication;
-
-	@Nullable
-	private final Double total;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterIndicesShards(Builder builder) {
-
-		this.index = builder.index;
-		this.primaries = builder.primaries;
-		this.replication = builder.replication;
-		this.total = builder.total;
-
-	}
-
-	public static ClusterIndicesShards of(Function<Builder, ObjectBuilder<ClusterIndicesShards>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Contains statistics about shards assigned to selected nodes.
-	 * <p>
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final ClusterIndicesShardsIndex index() {
-		return this.index;
-	}
-
-	/**
-	 * Number of primary shards assigned to selected nodes.
-	 * <p>
-	 * API name: {@code primaries}
-	 */
-	@Nullable
-	public final Double primaries() {
-		return this.primaries;
-	}
-
-	/**
-	 * Ratio of replica shards to primary shards across all selected nodes.
-	 * <p>
-	 * API name: {@code replication}
-	 */
-	@Nullable
-	public final Double replication() {
-		return this.replication;
-	}
-
-	/**
-	 * Total number of shards assigned to selected nodes.
-	 * <p>
-	 * API name: {@code total}
-	 */
-	@Nullable
-	public final Double total() {
-		return this.total;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.index != null) {
-			generator.writeKey("index");
-			this.index.serialize(generator, mapper);
-
-		}
-		if (this.primaries != null) {
-			generator.writeKey("primaries");
-			generator.write(this.primaries);
-
-		}
-		if (this.replication != null) {
-			generator.writeKey("replication");
-			generator.write(this.replication);
-
-		}
-		if (this.total != null) {
-			generator.writeKey("total");
-			generator.write(this.total);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterIndicesShards}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterIndicesShards> {
-		@Nullable
-		private ClusterIndicesShardsIndex index;
-
-		@Nullable
-		private Double primaries;
-
-		@Nullable
-		private Double replication;
-
-		@Nullable
-		private Double total;
-
-		/**
-		 * Contains statistics about shards assigned to selected nodes.
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable ClusterIndicesShardsIndex value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Contains statistics about shards assigned to selected nodes.
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(
-				Function<ClusterIndicesShardsIndex.Builder, ObjectBuilder<ClusterIndicesShardsIndex>> fn) {
-			return this.index(fn.apply(new ClusterIndicesShardsIndex.Builder()).build());
-		}
-
-		/**
-		 * Number of primary shards assigned to selected nodes.
-		 * <p>
-		 * API name: {@code primaries}
-		 */
-		public final Builder primaries(@Nullable Double value) {
-			this.primaries = value;
-			return this;
-		}
-
-		/**
-		 * Ratio of replica shards to primary shards across all selected nodes.
-		 * <p>
-		 * API name: {@code replication}
-		 */
-		public final Builder replication(@Nullable Double value) {
-			this.replication = value;
-			return this;
-		}
-
-		/**
-		 * Total number of shards assigned to selected nodes.
-		 * <p>
-		 * API name: {@code total}
-		 */
-		public final Builder total(@Nullable Double value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ClusterIndicesShards}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterIndicesShards build() {
-			_checkSingleUse();
-
-			return new ClusterIndicesShards(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterIndicesShards}
-	 */
-	public static final JsonpDeserializer<ClusterIndicesShards> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClusterIndicesShards::setupClusterIndicesShardsDeserializer);
-
-	protected static void setupClusterIndicesShardsDeserializer(ObjectDeserializer<ClusterIndicesShards.Builder> op) {
-
-		op.add(Builder::index, ClusterIndicesShardsIndex._DESERIALIZER, "index");
-		op.add(Builder::primaries, JsonpDeserializer.doubleDeserializer(), "primaries");
-		op.add(Builder::replication, JsonpDeserializer.doubleDeserializer(), "replication");
-		op.add(Builder::total, JsonpDeserializer.doubleDeserializer(), "total");
-
-	}
+    @Nullable
+    private final ClusterIndicesShardsIndex index;
+
+    @Nullable
+    private final Double primaries;
+
+    @Nullable
+    private final Double replication;
+
+    @Nullable
+    private final Double total;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterIndicesShards(Builder builder) {
+
+        this.index = builder.index;
+        this.primaries = builder.primaries;
+        this.replication = builder.replication;
+        this.total = builder.total;
+
+    }
+
+    public static ClusterIndicesShards of(Function<Builder, ObjectBuilder<ClusterIndicesShards>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Contains statistics about shards assigned to selected nodes.
+     * <p>
+     * API name: {@code index}
+     */
+    @Nullable
+    public final ClusterIndicesShardsIndex index() {
+        return this.index;
+    }
+
+    /**
+     * Number of primary shards assigned to selected nodes.
+     * <p>
+     * API name: {@code primaries}
+     */
+    @Nullable
+    public final Double primaries() {
+        return this.primaries;
+    }
+
+    /**
+     * Ratio of replica shards to primary shards across all selected nodes.
+     * <p>
+     * API name: {@code replication}
+     */
+    @Nullable
+    public final Double replication() {
+        return this.replication;
+    }
+
+    /**
+     * Total number of shards assigned to selected nodes.
+     * <p>
+     * API name: {@code total}
+     */
+    @Nullable
+    public final Double total() {
+        return this.total;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.index != null) {
+            generator.writeKey("index");
+            this.index.serialize(generator, mapper);
+
+        }
+        if (this.primaries != null) {
+            generator.writeKey("primaries");
+            generator.write(this.primaries);
+
+        }
+        if (this.replication != null) {
+            generator.writeKey("replication");
+            generator.write(this.replication);
+
+        }
+        if (this.total != null) {
+            generator.writeKey("total");
+            generator.write(this.total);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterIndicesShards}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterIndicesShards> {
+        @Nullable
+        private ClusterIndicesShardsIndex index;
+
+        @Nullable
+        private Double primaries;
+
+        @Nullable
+        private Double replication;
+
+        @Nullable
+        private Double total;
+
+        /**
+         * Contains statistics about shards assigned to selected nodes.
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable ClusterIndicesShardsIndex value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Contains statistics about shards assigned to selected nodes.
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(Function<ClusterIndicesShardsIndex.Builder, ObjectBuilder<ClusterIndicesShardsIndex>> fn) {
+            return this.index(fn.apply(new ClusterIndicesShardsIndex.Builder()).build());
+        }
+
+        /**
+         * Number of primary shards assigned to selected nodes.
+         * <p>
+         * API name: {@code primaries}
+         */
+        public final Builder primaries(@Nullable Double value) {
+            this.primaries = value;
+            return this;
+        }
+
+        /**
+         * Ratio of replica shards to primary shards across all selected nodes.
+         * <p>
+         * API name: {@code replication}
+         */
+        public final Builder replication(@Nullable Double value) {
+            this.replication = value;
+            return this;
+        }
+
+        /**
+         * Total number of shards assigned to selected nodes.
+         * <p>
+         * API name: {@code total}
+         */
+        public final Builder total(@Nullable Double value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ClusterIndicesShards}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterIndicesShards build() {
+            _checkSingleUse();
+
+            return new ClusterIndicesShards(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterIndicesShards}
+     */
+    public static final JsonpDeserializer<ClusterIndicesShards> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterIndicesShards::setupClusterIndicesShardsDeserializer
+    );
+
+    protected static void setupClusterIndicesShardsDeserializer(ObjectDeserializer<ClusterIndicesShards.Builder> op) {
+
+        op.add(Builder::index, ClusterIndicesShardsIndex._DESERIALIZER, "index");
+        op.add(Builder::primaries, JsonpDeserializer.doubleDeserializer(), "primaries");
+        op.add(Builder::replication, JsonpDeserializer.doubleDeserializer(), "replication");
+        op.add(Builder::total, JsonpDeserializer.doubleDeserializer(), "total");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterIndicesShardsIndex.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterIndicesShardsIndex.java
index 59a66aae35..85823b0882 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterIndicesShardsIndex.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterIndicesShardsIndex.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,191 +43,188 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: cluster.stats.ClusterIndicesShardsIndex
 
-
 @JsonpDeserializable
 public class ClusterIndicesShardsIndex implements JsonpSerializable {
-	private final ClusterShardMetrics primaries;
-
-	private final ClusterShardMetrics replication;
-
-	private final ClusterShardMetrics shards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterIndicesShardsIndex(Builder builder) {
-
-		this.primaries = ApiTypeHelper.requireNonNull(builder.primaries, this, "primaries");
-		this.replication = ApiTypeHelper.requireNonNull(builder.replication, this, "replication");
-		this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
-
-	}
-
-	public static ClusterIndicesShardsIndex of(Function<Builder, ObjectBuilder<ClusterIndicesShardsIndex>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Contains statistics about the number of primary shards assigned to
-	 * selected nodes.
-	 * <p>
-	 * API name: {@code primaries}
-	 */
-	public final ClusterShardMetrics primaries() {
-		return this.primaries;
-	}
-
-	/**
-	 * Required - Contains statistics about the number of replication shards
-	 * assigned to selected nodes.
-	 * <p>
-	 * API name: {@code replication}
-	 */
-	public final ClusterShardMetrics replication() {
-		return this.replication;
-	}
-
-	/**
-	 * Required - Contains statistics about the number of shards assigned to
-	 * selected nodes.
-	 * <p>
-	 * API name: {@code shards}
-	 */
-	public final ClusterShardMetrics shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("primaries");
-		this.primaries.serialize(generator, mapper);
-
-		generator.writeKey("replication");
-		this.replication.serialize(generator, mapper);
-
-		generator.writeKey("shards");
-		this.shards.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterIndicesShardsIndex}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterIndicesShardsIndex> {
-		private ClusterShardMetrics primaries;
-
-		private ClusterShardMetrics replication;
-
-		private ClusterShardMetrics shards;
-
-		/**
-		 * Required - Contains statistics about the number of primary shards assigned to
-		 * selected nodes.
-		 * <p>
-		 * API name: {@code primaries}
-		 */
-		public final Builder primaries(ClusterShardMetrics value) {
-			this.primaries = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about the number of primary shards assigned to
-		 * selected nodes.
-		 * <p>
-		 * API name: {@code primaries}
-		 */
-		public final Builder primaries(Function<ClusterShardMetrics.Builder, ObjectBuilder<ClusterShardMetrics>> fn) {
-			return this.primaries(fn.apply(new ClusterShardMetrics.Builder()).build());
-		}
-
-		/**
-		 * Required - Contains statistics about the number of replication shards
-		 * assigned to selected nodes.
-		 * <p>
-		 * API name: {@code replication}
-		 */
-		public final Builder replication(ClusterShardMetrics value) {
-			this.replication = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about the number of replication shards
-		 * assigned to selected nodes.
-		 * <p>
-		 * API name: {@code replication}
-		 */
-		public final Builder replication(Function<ClusterShardMetrics.Builder, ObjectBuilder<ClusterShardMetrics>> fn) {
-			return this.replication(fn.apply(new ClusterShardMetrics.Builder()).build());
-		}
-
-		/**
-		 * Required - Contains statistics about the number of shards assigned to
-		 * selected nodes.
-		 * <p>
-		 * API name: {@code shards}
-		 */
-		public final Builder shards(ClusterShardMetrics value) {
-			this.shards = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about the number of shards assigned to
-		 * selected nodes.
-		 * <p>
-		 * API name: {@code shards}
-		 */
-		public final Builder shards(Function<ClusterShardMetrics.Builder, ObjectBuilder<ClusterShardMetrics>> fn) {
-			return this.shards(fn.apply(new ClusterShardMetrics.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ClusterIndicesShardsIndex}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterIndicesShardsIndex build() {
-			_checkSingleUse();
-
-			return new ClusterIndicesShardsIndex(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterIndicesShardsIndex}
-	 */
-	public static final JsonpDeserializer<ClusterIndicesShardsIndex> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClusterIndicesShardsIndex::setupClusterIndicesShardsIndexDeserializer);
-
-	protected static void setupClusterIndicesShardsIndexDeserializer(
-			ObjectDeserializer<ClusterIndicesShardsIndex.Builder> op) {
-
-		op.add(Builder::primaries, ClusterShardMetrics._DESERIALIZER, "primaries");
-		op.add(Builder::replication, ClusterShardMetrics._DESERIALIZER, "replication");
-		op.add(Builder::shards, ClusterShardMetrics._DESERIALIZER, "shards");
-
-	}
+    private final ClusterShardMetrics primaries;
+
+    private final ClusterShardMetrics replication;
+
+    private final ClusterShardMetrics shards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterIndicesShardsIndex(Builder builder) {
+
+        this.primaries = ApiTypeHelper.requireNonNull(builder.primaries, this, "primaries");
+        this.replication = ApiTypeHelper.requireNonNull(builder.replication, this, "replication");
+        this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
+
+    }
+
+    public static ClusterIndicesShardsIndex of(Function<Builder, ObjectBuilder<ClusterIndicesShardsIndex>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Contains statistics about the number of primary shards assigned to
+     * selected nodes.
+     * <p>
+     * API name: {@code primaries}
+     */
+    public final ClusterShardMetrics primaries() {
+        return this.primaries;
+    }
+
+    /**
+     * Required - Contains statistics about the number of replication shards
+     * assigned to selected nodes.
+     * <p>
+     * API name: {@code replication}
+     */
+    public final ClusterShardMetrics replication() {
+        return this.replication;
+    }
+
+    /**
+     * Required - Contains statistics about the number of shards assigned to
+     * selected nodes.
+     * <p>
+     * API name: {@code shards}
+     */
+    public final ClusterShardMetrics shards() {
+        return this.shards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("primaries");
+        this.primaries.serialize(generator, mapper);
+
+        generator.writeKey("replication");
+        this.replication.serialize(generator, mapper);
+
+        generator.writeKey("shards");
+        this.shards.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterIndicesShardsIndex}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterIndicesShardsIndex> {
+        private ClusterShardMetrics primaries;
+
+        private ClusterShardMetrics replication;
+
+        private ClusterShardMetrics shards;
+
+        /**
+         * Required - Contains statistics about the number of primary shards assigned to
+         * selected nodes.
+         * <p>
+         * API name: {@code primaries}
+         */
+        public final Builder primaries(ClusterShardMetrics value) {
+            this.primaries = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about the number of primary shards assigned to
+         * selected nodes.
+         * <p>
+         * API name: {@code primaries}
+         */
+        public final Builder primaries(Function<ClusterShardMetrics.Builder, ObjectBuilder<ClusterShardMetrics>> fn) {
+            return this.primaries(fn.apply(new ClusterShardMetrics.Builder()).build());
+        }
+
+        /**
+         * Required - Contains statistics about the number of replication shards
+         * assigned to selected nodes.
+         * <p>
+         * API name: {@code replication}
+         */
+        public final Builder replication(ClusterShardMetrics value) {
+            this.replication = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about the number of replication shards
+         * assigned to selected nodes.
+         * <p>
+         * API name: {@code replication}
+         */
+        public final Builder replication(Function<ClusterShardMetrics.Builder, ObjectBuilder<ClusterShardMetrics>> fn) {
+            return this.replication(fn.apply(new ClusterShardMetrics.Builder()).build());
+        }
+
+        /**
+         * Required - Contains statistics about the number of shards assigned to
+         * selected nodes.
+         * <p>
+         * API name: {@code shards}
+         */
+        public final Builder shards(ClusterShardMetrics value) {
+            this.shards = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about the number of shards assigned to
+         * selected nodes.
+         * <p>
+         * API name: {@code shards}
+         */
+        public final Builder shards(Function<ClusterShardMetrics.Builder, ObjectBuilder<ClusterShardMetrics>> fn) {
+            return this.shards(fn.apply(new ClusterShardMetrics.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ClusterIndicesShardsIndex}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterIndicesShardsIndex build() {
+            _checkSingleUse();
+
+            return new ClusterIndicesShardsIndex(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterIndicesShardsIndex}
+     */
+    public static final JsonpDeserializer<ClusterIndicesShardsIndex> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterIndicesShardsIndex::setupClusterIndicesShardsIndexDeserializer
+    );
+
+    protected static void setupClusterIndicesShardsIndexDeserializer(ObjectDeserializer<ClusterIndicesShardsIndex.Builder> op) {
+
+        op.add(Builder::primaries, ClusterShardMetrics._DESERIALIZER, "primaries");
+        op.add(Builder::replication, ClusterShardMetrics._DESERIALIZER, "replication");
+        op.add(Builder::shards, ClusterShardMetrics._DESERIALIZER, "shards");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterIngest.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterIngest.java
index d44ac89be6..d718523105 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterIngest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterIngest.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,150 +44,146 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: cluster.stats.ClusterIngest
 
-
 @JsonpDeserializable
 public class ClusterIngest implements JsonpSerializable {
-	private final int numberOfPipelines;
-
-	private final Map<String, ClusterProcessor> processorStats;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterIngest(Builder builder) {
-
-		this.numberOfPipelines = ApiTypeHelper.requireNonNull(builder.numberOfPipelines, this, "numberOfPipelines");
-		this.processorStats = ApiTypeHelper.unmodifiableRequired(builder.processorStats, this, "processorStats");
-
-	}
-
-	public static ClusterIngest of(Function<Builder, ObjectBuilder<ClusterIngest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code number_of_pipelines}
-	 */
-	public final int numberOfPipelines() {
-		return this.numberOfPipelines;
-	}
-
-	/**
-	 * Required - API name: {@code processor_stats}
-	 */
-	public final Map<String, ClusterProcessor> processorStats() {
-		return this.processorStats;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("number_of_pipelines");
-		generator.write(this.numberOfPipelines);
-
-		if (ApiTypeHelper.isDefined(this.processorStats)) {
-			generator.writeKey("processor_stats");
-			generator.writeStartObject();
-			for (Map.Entry<String, ClusterProcessor> item0 : this.processorStats.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterIngest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterIngest> {
-		private Integer numberOfPipelines;
-
-		private Map<String, ClusterProcessor> processorStats;
-
-		/**
-		 * Required - API name: {@code number_of_pipelines}
-		 */
-		public final Builder numberOfPipelines(int value) {
-			this.numberOfPipelines = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code processor_stats}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>processorStats</code>.
-		 */
-		public final Builder processorStats(Map<String, ClusterProcessor> map) {
-			this.processorStats = _mapPutAll(this.processorStats, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code processor_stats}
-		 * <p>
-		 * Adds an entry to <code>processorStats</code>.
-		 */
-		public final Builder processorStats(String key, ClusterProcessor value) {
-			this.processorStats = _mapPut(this.processorStats, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code processor_stats}
-		 * <p>
-		 * Adds an entry to <code>processorStats</code> using a builder lambda.
-		 */
-		public final Builder processorStats(String key,
-				Function<ClusterProcessor.Builder, ObjectBuilder<ClusterProcessor>> fn) {
-			return processorStats(key, fn.apply(new ClusterProcessor.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ClusterIngest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterIngest build() {
-			_checkSingleUse();
-
-			return new ClusterIngest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterIngest}
-	 */
-	public static final JsonpDeserializer<ClusterIngest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ClusterIngest::setupClusterIngestDeserializer);
-
-	protected static void setupClusterIngestDeserializer(ObjectDeserializer<ClusterIngest.Builder> op) {
-
-		op.add(Builder::numberOfPipelines, JsonpDeserializer.integerDeserializer(), "number_of_pipelines");
-		op.add(Builder::processorStats, JsonpDeserializer.stringMapDeserializer(ClusterProcessor._DESERIALIZER),
-				"processor_stats");
-
-	}
+    private final int numberOfPipelines;
+
+    private final Map<String, ClusterProcessor> processorStats;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterIngest(Builder builder) {
+
+        this.numberOfPipelines = ApiTypeHelper.requireNonNull(builder.numberOfPipelines, this, "numberOfPipelines");
+        this.processorStats = ApiTypeHelper.unmodifiableRequired(builder.processorStats, this, "processorStats");
+
+    }
+
+    public static ClusterIngest of(Function<Builder, ObjectBuilder<ClusterIngest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code number_of_pipelines}
+     */
+    public final int numberOfPipelines() {
+        return this.numberOfPipelines;
+    }
+
+    /**
+     * Required - API name: {@code processor_stats}
+     */
+    public final Map<String, ClusterProcessor> processorStats() {
+        return this.processorStats;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("number_of_pipelines");
+        generator.write(this.numberOfPipelines);
+
+        if (ApiTypeHelper.isDefined(this.processorStats)) {
+            generator.writeKey("processor_stats");
+            generator.writeStartObject();
+            for (Map.Entry<String, ClusterProcessor> item0 : this.processorStats.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterIngest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterIngest> {
+        private Integer numberOfPipelines;
+
+        private Map<String, ClusterProcessor> processorStats;
+
+        /**
+         * Required - API name: {@code number_of_pipelines}
+         */
+        public final Builder numberOfPipelines(int value) {
+            this.numberOfPipelines = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code processor_stats}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>processorStats</code>.
+         */
+        public final Builder processorStats(Map<String, ClusterProcessor> map) {
+            this.processorStats = _mapPutAll(this.processorStats, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code processor_stats}
+         * <p>
+         * Adds an entry to <code>processorStats</code>.
+         */
+        public final Builder processorStats(String key, ClusterProcessor value) {
+            this.processorStats = _mapPut(this.processorStats, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code processor_stats}
+         * <p>
+         * Adds an entry to <code>processorStats</code> using a builder lambda.
+         */
+        public final Builder processorStats(String key, Function<ClusterProcessor.Builder, ObjectBuilder<ClusterProcessor>> fn) {
+            return processorStats(key, fn.apply(new ClusterProcessor.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ClusterIngest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterIngest build() {
+            _checkSingleUse();
+
+            return new ClusterIngest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterIngest}
+     */
+    public static final JsonpDeserializer<ClusterIngest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterIngest::setupClusterIngestDeserializer
+    );
+
+    protected static void setupClusterIngestDeserializer(ObjectDeserializer<ClusterIngest.Builder> op) {
+
+        op.add(Builder::numberOfPipelines, JsonpDeserializer.integerDeserializer(), "number_of_pipelines");
+        op.add(Builder::processorStats, JsonpDeserializer.stringMapDeserializer(ClusterProcessor._DESERIALIZER), "processor_stats");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterJvm.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterJvm.java
index e4734de17c..a7b5eebb59 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterJvm.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterJvm.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,201 +44,200 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cluster.stats.ClusterJvm
 
 @JsonpDeserializable
 public class ClusterJvm implements JsonpSerializable {
-	private final long maxUptimeInMillis;
+    private final long maxUptimeInMillis;
 
-	private final ClusterJvmMemory mem;
+    private final ClusterJvmMemory mem;
 
-	private final long threads;
+    private final long threads;
 
-	private final List<ClusterJvmVersion> versions;
+    private final List<ClusterJvmVersion> versions;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ClusterJvm(Builder builder) {
+    private ClusterJvm(Builder builder) {
 
-		this.maxUptimeInMillis = ApiTypeHelper.requireNonNull(builder.maxUptimeInMillis, this, "maxUptimeInMillis");
-		this.mem = ApiTypeHelper.requireNonNull(builder.mem, this, "mem");
-		this.threads = ApiTypeHelper.requireNonNull(builder.threads, this, "threads");
-		this.versions = ApiTypeHelper.unmodifiableRequired(builder.versions, this, "versions");
+        this.maxUptimeInMillis = ApiTypeHelper.requireNonNull(builder.maxUptimeInMillis, this, "maxUptimeInMillis");
+        this.mem = ApiTypeHelper.requireNonNull(builder.mem, this, "mem");
+        this.threads = ApiTypeHelper.requireNonNull(builder.threads, this, "threads");
+        this.versions = ApiTypeHelper.unmodifiableRequired(builder.versions, this, "versions");
 
-	}
+    }
 
-	public static ClusterJvm of(Function<Builder, ObjectBuilder<ClusterJvm>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ClusterJvm of(Function<Builder, ObjectBuilder<ClusterJvm>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code max_uptime_in_millis}
-	 */
-	public final long maxUptimeInMillis() {
-		return this.maxUptimeInMillis;
-	}
+    /**
+     * Required - API name: {@code max_uptime_in_millis}
+     */
+    public final long maxUptimeInMillis() {
+        return this.maxUptimeInMillis;
+    }
 
-	/**
-	 * Required - API name: {@code mem}
-	 */
-	public final ClusterJvmMemory mem() {
-		return this.mem;
-	}
-
-	/**
-	 * Required - API name: {@code threads}
-	 */
-	public final long threads() {
-		return this.threads;
-	}
-
-	/**
-	 * Required - API name: {@code versions}
-	 */
-	public final List<ClusterJvmVersion> versions() {
-		return this.versions;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("max_uptime_in_millis");
-		generator.write(this.maxUptimeInMillis);
-
-		generator.writeKey("mem");
-		this.mem.serialize(generator, mapper);
-
-		generator.writeKey("threads");
-		generator.write(this.threads);
-
-		if (ApiTypeHelper.isDefined(this.versions)) {
-			generator.writeKey("versions");
-			generator.writeStartArray();
-			for (ClusterJvmVersion item0 : this.versions) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterJvm}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterJvm> {
-		private Long maxUptimeInMillis;
-
-		private ClusterJvmMemory mem;
-
-		private Long threads;
-
-		private List<ClusterJvmVersion> versions;
-
-		/**
-		 * Required - API name: {@code max_uptime_in_millis}
-		 */
-		public final Builder maxUptimeInMillis(long value) {
-			this.maxUptimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mem}
-		 */
-		public final Builder mem(ClusterJvmMemory value) {
-			this.mem = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mem}
-		 */
-		public final Builder mem(Function<ClusterJvmMemory.Builder, ObjectBuilder<ClusterJvmMemory>> fn) {
-			return this.mem(fn.apply(new ClusterJvmMemory.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code threads}
-		 */
-		public final Builder threads(long value) {
-			this.threads = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code versions}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>versions</code>.
-		 */
-		public final Builder versions(List<ClusterJvmVersion> list) {
-			this.versions = _listAddAll(this.versions, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code versions}
-		 * <p>
-		 * Adds one or more values to <code>versions</code>.
-		 */
-		public final Builder versions(ClusterJvmVersion value, ClusterJvmVersion... values) {
-			this.versions = _listAdd(this.versions, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code versions}
-		 * <p>
-		 * Adds a value to <code>versions</code> using a builder lambda.
-		 */
-		public final Builder versions(Function<ClusterJvmVersion.Builder, ObjectBuilder<ClusterJvmVersion>> fn) {
-			return versions(fn.apply(new ClusterJvmVersion.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ClusterJvm}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterJvm build() {
-			_checkSingleUse();
-
-			return new ClusterJvm(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterJvm}
-	 */
-	public static final JsonpDeserializer<ClusterJvm> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ClusterJvm::setupClusterJvmDeserializer);
-
-	protected static void setupClusterJvmDeserializer(ObjectDeserializer<ClusterJvm.Builder> op) {
-
-		op.add(Builder::maxUptimeInMillis, JsonpDeserializer.longDeserializer(), "max_uptime_in_millis");
-		op.add(Builder::mem, ClusterJvmMemory._DESERIALIZER, "mem");
-		op.add(Builder::threads, JsonpDeserializer.longDeserializer(), "threads");
-		op.add(Builder::versions, JsonpDeserializer.arrayDeserializer(ClusterJvmVersion._DESERIALIZER), "versions");
-
-	}
+    /**
+     * Required - API name: {@code mem}
+     */
+    public final ClusterJvmMemory mem() {
+        return this.mem;
+    }
+
+    /**
+     * Required - API name: {@code threads}
+     */
+    public final long threads() {
+        return this.threads;
+    }
+
+    /**
+     * Required - API name: {@code versions}
+     */
+    public final List<ClusterJvmVersion> versions() {
+        return this.versions;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("max_uptime_in_millis");
+        generator.write(this.maxUptimeInMillis);
+
+        generator.writeKey("mem");
+        this.mem.serialize(generator, mapper);
+
+        generator.writeKey("threads");
+        generator.write(this.threads);
+
+        if (ApiTypeHelper.isDefined(this.versions)) {
+            generator.writeKey("versions");
+            generator.writeStartArray();
+            for (ClusterJvmVersion item0 : this.versions) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterJvm}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterJvm> {
+        private Long maxUptimeInMillis;
+
+        private ClusterJvmMemory mem;
+
+        private Long threads;
+
+        private List<ClusterJvmVersion> versions;
+
+        /**
+         * Required - API name: {@code max_uptime_in_millis}
+         */
+        public final Builder maxUptimeInMillis(long value) {
+            this.maxUptimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mem}
+         */
+        public final Builder mem(ClusterJvmMemory value) {
+            this.mem = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mem}
+         */
+        public final Builder mem(Function<ClusterJvmMemory.Builder, ObjectBuilder<ClusterJvmMemory>> fn) {
+            return this.mem(fn.apply(new ClusterJvmMemory.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code threads}
+         */
+        public final Builder threads(long value) {
+            this.threads = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code versions}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>versions</code>.
+         */
+        public final Builder versions(List<ClusterJvmVersion> list) {
+            this.versions = _listAddAll(this.versions, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code versions}
+         * <p>
+         * Adds one or more values to <code>versions</code>.
+         */
+        public final Builder versions(ClusterJvmVersion value, ClusterJvmVersion... values) {
+            this.versions = _listAdd(this.versions, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code versions}
+         * <p>
+         * Adds a value to <code>versions</code> using a builder lambda.
+         */
+        public final Builder versions(Function<ClusterJvmVersion.Builder, ObjectBuilder<ClusterJvmVersion>> fn) {
+            return versions(fn.apply(new ClusterJvmVersion.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ClusterJvm}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterJvm build() {
+            _checkSingleUse();
+
+            return new ClusterJvm(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterJvm}
+     */
+    public static final JsonpDeserializer<ClusterJvm> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterJvm::setupClusterJvmDeserializer
+    );
+
+    protected static void setupClusterJvmDeserializer(ObjectDeserializer<ClusterJvm.Builder> op) {
+
+        op.add(Builder::maxUptimeInMillis, JsonpDeserializer.longDeserializer(), "max_uptime_in_millis");
+        op.add(Builder::mem, ClusterJvmMemory._DESERIALIZER, "mem");
+        op.add(Builder::threads, JsonpDeserializer.longDeserializer(), "threads");
+        op.add(Builder::versions, JsonpDeserializer.arrayDeserializer(ClusterJvmVersion._DESERIALIZER), "versions");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterJvmMemory.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterJvmMemory.java
index d1480f6bdd..33e34234e4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterJvmMemory.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterJvmMemory.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,117 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.stats.ClusterJvmMemory
 
-
 @JsonpDeserializable
 public class ClusterJvmMemory implements JsonpSerializable {
-	private final long heapMaxInBytes;
-
-	private final long heapUsedInBytes;
-
-	// ---------------------------------------------------------------------------------------------
+    private final long heapMaxInBytes;
 
-	private ClusterJvmMemory(Builder builder) {
+    private final long heapUsedInBytes;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.heapMaxInBytes = ApiTypeHelper.requireNonNull(builder.heapMaxInBytes, this, "heapMaxInBytes");
-		this.heapUsedInBytes = ApiTypeHelper.requireNonNull(builder.heapUsedInBytes, this, "heapUsedInBytes");
+    private ClusterJvmMemory(Builder builder) {
 
-	}
+        this.heapMaxInBytes = ApiTypeHelper.requireNonNull(builder.heapMaxInBytes, this, "heapMaxInBytes");
+        this.heapUsedInBytes = ApiTypeHelper.requireNonNull(builder.heapUsedInBytes, this, "heapUsedInBytes");
 
-	public static ClusterJvmMemory of(Function<Builder, ObjectBuilder<ClusterJvmMemory>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code heap_max_in_bytes}
-	 */
-	public final long heapMaxInBytes() {
-		return this.heapMaxInBytes;
-	}
+    public static ClusterJvmMemory of(Function<Builder, ObjectBuilder<ClusterJvmMemory>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code heap_used_in_bytes}
-	 */
-	public final long heapUsedInBytes() {
-		return this.heapUsedInBytes;
-	}
+    /**
+     * Required - API name: {@code heap_max_in_bytes}
+     */
+    public final long heapMaxInBytes() {
+        return this.heapMaxInBytes;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code heap_used_in_bytes}
+     */
+    public final long heapUsedInBytes() {
+        return this.heapUsedInBytes;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("heap_max_in_bytes");
-		generator.write(this.heapMaxInBytes);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("heap_used_in_bytes");
-		generator.write(this.heapUsedInBytes);
+        generator.writeKey("heap_max_in_bytes");
+        generator.write(this.heapMaxInBytes);
 
-	}
+        generator.writeKey("heap_used_in_bytes");
+        generator.write(this.heapUsedInBytes);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link ClusterJvmMemory}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterJvmMemory> {
-		private Long heapMaxInBytes;
+    /**
+     * Builder for {@link ClusterJvmMemory}.
+     */
 
-		private Long heapUsedInBytes;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterJvmMemory> {
+        private Long heapMaxInBytes;
 
-		/**
-		 * Required - API name: {@code heap_max_in_bytes}
-		 */
-		public final Builder heapMaxInBytes(long value) {
-			this.heapMaxInBytes = value;
-			return this;
-		}
+        private Long heapUsedInBytes;
 
-		/**
-		 * Required - API name: {@code heap_used_in_bytes}
-		 */
-		public final Builder heapUsedInBytes(long value) {
-			this.heapUsedInBytes = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code heap_max_in_bytes}
+         */
+        public final Builder heapMaxInBytes(long value) {
+            this.heapMaxInBytes = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link ClusterJvmMemory}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterJvmMemory build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code heap_used_in_bytes}
+         */
+        public final Builder heapUsedInBytes(long value) {
+            this.heapUsedInBytes = value;
+            return this;
+        }
 
-			return new ClusterJvmMemory(this);
-		}
-	}
+        /**
+         * Builds a {@link ClusterJvmMemory}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterJvmMemory build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new ClusterJvmMemory(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link ClusterJvmMemory}
-	 */
-	public static final JsonpDeserializer<ClusterJvmMemory> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ClusterJvmMemory::setupClusterJvmMemoryDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupClusterJvmMemoryDeserializer(ObjectDeserializer<ClusterJvmMemory.Builder> op) {
+    /**
+     * Json deserializer for {@link ClusterJvmMemory}
+     */
+    public static final JsonpDeserializer<ClusterJvmMemory> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterJvmMemory::setupClusterJvmMemoryDeserializer
+    );
 
-		op.add(Builder::heapMaxInBytes, JsonpDeserializer.longDeserializer(), "heap_max_in_bytes");
-		op.add(Builder::heapUsedInBytes, JsonpDeserializer.longDeserializer(), "heap_used_in_bytes");
+    protected static void setupClusterJvmMemoryDeserializer(ObjectDeserializer<ClusterJvmMemory.Builder> op) {
 
-	}
+        op.add(Builder::heapMaxInBytes, JsonpDeserializer.longDeserializer(), "heap_max_in_bytes");
+        op.add(Builder::heapUsedInBytes, JsonpDeserializer.longDeserializer(), "heap_used_in_bytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterJvmVersion.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterJvmVersion.java
index 01f01bd0c8..1783b11516 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterJvmVersion.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterJvmVersion.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,237 +43,236 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.stats.ClusterJvmVersion
 
-
 @JsonpDeserializable
 public class ClusterJvmVersion implements JsonpSerializable {
-	private final boolean bundledJdk;
-
-	private final int count;
-
-	private final boolean usingBundledJdk;
-
-	private final String version;
-
-	private final String vmName;
+    private final boolean bundledJdk;
+
+    private final int count;
+
+    private final boolean usingBundledJdk;
+
+    private final String version;
+
+    private final String vmName;
 
-	private final String vmVendor;
-
-	private final String vmVersion;
+    private final String vmVendor;
+
+    private final String vmVersion;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ClusterJvmVersion(Builder builder) {
+    private ClusterJvmVersion(Builder builder) {
 
-		this.bundledJdk = ApiTypeHelper.requireNonNull(builder.bundledJdk, this, "bundledJdk");
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.usingBundledJdk = ApiTypeHelper.requireNonNull(builder.usingBundledJdk, this, "usingBundledJdk");
-		this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
-		this.vmName = ApiTypeHelper.requireNonNull(builder.vmName, this, "vmName");
-		this.vmVendor = ApiTypeHelper.requireNonNull(builder.vmVendor, this, "vmVendor");
-		this.vmVersion = ApiTypeHelper.requireNonNull(builder.vmVersion, this, "vmVersion");
+        this.bundledJdk = ApiTypeHelper.requireNonNull(builder.bundledJdk, this, "bundledJdk");
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.usingBundledJdk = ApiTypeHelper.requireNonNull(builder.usingBundledJdk, this, "usingBundledJdk");
+        this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
+        this.vmName = ApiTypeHelper.requireNonNull(builder.vmName, this, "vmName");
+        this.vmVendor = ApiTypeHelper.requireNonNull(builder.vmVendor, this, "vmVendor");
+        this.vmVersion = ApiTypeHelper.requireNonNull(builder.vmVersion, this, "vmVersion");
 
-	}
+    }
 
-	public static ClusterJvmVersion of(Function<Builder, ObjectBuilder<ClusterJvmVersion>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ClusterJvmVersion of(Function<Builder, ObjectBuilder<ClusterJvmVersion>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code bundled_jdk}
-	 */
-	public final boolean bundledJdk() {
-		return this.bundledJdk;
-	}
+    /**
+     * Required - API name: {@code bundled_jdk}
+     */
+    public final boolean bundledJdk() {
+        return this.bundledJdk;
+    }
 
-	/**
-	 * Required - API name: {@code count}
-	 */
-	public final int count() {
-		return this.count;
-	}
+    /**
+     * Required - API name: {@code count}
+     */
+    public final int count() {
+        return this.count;
+    }
 
-	/**
-	 * Required - API name: {@code using_bundled_jdk}
-	 */
-	public final boolean usingBundledJdk() {
-		return this.usingBundledJdk;
-	}
+    /**
+     * Required - API name: {@code using_bundled_jdk}
+     */
+    public final boolean usingBundledJdk() {
+        return this.usingBundledJdk;
+    }
 
-	/**
-	 * Required - API name: {@code version}
-	 */
-	public final String version() {
-		return this.version;
-	}
+    /**
+     * Required - API name: {@code version}
+     */
+    public final String version() {
+        return this.version;
+    }
 
-	/**
-	 * Required - API name: {@code vm_name}
-	 */
-	public final String vmName() {
-		return this.vmName;
-	}
+    /**
+     * Required - API name: {@code vm_name}
+     */
+    public final String vmName() {
+        return this.vmName;
+    }
 
-	/**
-	 * Required - API name: {@code vm_vendor}
-	 */
-	public final String vmVendor() {
-		return this.vmVendor;
-	}
-
-	/**
-	 * Required - API name: {@code vm_version}
-	 */
-	public final String vmVersion() {
-		return this.vmVersion;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("bundled_jdk");
-		generator.write(this.bundledJdk);
-
-		generator.writeKey("count");
-		generator.write(this.count);
-
-		generator.writeKey("using_bundled_jdk");
-		generator.write(this.usingBundledJdk);
-
-		generator.writeKey("version");
-		generator.write(this.version);
-
-		generator.writeKey("vm_name");
-		generator.write(this.vmName);
-
-		generator.writeKey("vm_vendor");
-		generator.write(this.vmVendor);
-
-		generator.writeKey("vm_version");
-		generator.write(this.vmVersion);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterJvmVersion}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterJvmVersion> {
-		private Boolean bundledJdk;
-
-		private Integer count;
-
-		private Boolean usingBundledJdk;
-
-		private String version;
-
-		private String vmName;
-
-		private String vmVendor;
-
-		private String vmVersion;
-
-		/**
-		 * Required - API name: {@code bundled_jdk}
-		 */
-		public final Builder bundledJdk(boolean value) {
-			this.bundledJdk = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code count}
-		 */
-		public final Builder count(int value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code using_bundled_jdk}
-		 */
-		public final Builder usingBundledJdk(boolean value) {
-			this.usingBundledJdk = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code version}
-		 */
-		public final Builder version(String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code vm_name}
-		 */
-		public final Builder vmName(String value) {
-			this.vmName = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code vm_vendor}
-		 */
-		public final Builder vmVendor(String value) {
-			this.vmVendor = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code vm_version}
-		 */
-		public final Builder vmVersion(String value) {
-			this.vmVersion = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ClusterJvmVersion}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterJvmVersion build() {
-			_checkSingleUse();
-
-			return new ClusterJvmVersion(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterJvmVersion}
-	 */
-	public static final JsonpDeserializer<ClusterJvmVersion> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClusterJvmVersion::setupClusterJvmVersionDeserializer);
-
-	protected static void setupClusterJvmVersionDeserializer(ObjectDeserializer<ClusterJvmVersion.Builder> op) {
-
-		op.add(Builder::bundledJdk, JsonpDeserializer.booleanDeserializer(), "bundled_jdk");
-		op.add(Builder::count, JsonpDeserializer.integerDeserializer(), "count");
-		op.add(Builder::usingBundledJdk, JsonpDeserializer.booleanDeserializer(), "using_bundled_jdk");
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
-		op.add(Builder::vmName, JsonpDeserializer.stringDeserializer(), "vm_name");
-		op.add(Builder::vmVendor, JsonpDeserializer.stringDeserializer(), "vm_vendor");
-		op.add(Builder::vmVersion, JsonpDeserializer.stringDeserializer(), "vm_version");
-
-	}
+    /**
+     * Required - API name: {@code vm_vendor}
+     */
+    public final String vmVendor() {
+        return this.vmVendor;
+    }
+
+    /**
+     * Required - API name: {@code vm_version}
+     */
+    public final String vmVersion() {
+        return this.vmVersion;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("bundled_jdk");
+        generator.write(this.bundledJdk);
+
+        generator.writeKey("count");
+        generator.write(this.count);
+
+        generator.writeKey("using_bundled_jdk");
+        generator.write(this.usingBundledJdk);
+
+        generator.writeKey("version");
+        generator.write(this.version);
+
+        generator.writeKey("vm_name");
+        generator.write(this.vmName);
+
+        generator.writeKey("vm_vendor");
+        generator.write(this.vmVendor);
+
+        generator.writeKey("vm_version");
+        generator.write(this.vmVersion);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterJvmVersion}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterJvmVersion> {
+        private Boolean bundledJdk;
+
+        private Integer count;
+
+        private Boolean usingBundledJdk;
+
+        private String version;
+
+        private String vmName;
+
+        private String vmVendor;
+
+        private String vmVersion;
+
+        /**
+         * Required - API name: {@code bundled_jdk}
+         */
+        public final Builder bundledJdk(boolean value) {
+            this.bundledJdk = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code count}
+         */
+        public final Builder count(int value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code using_bundled_jdk}
+         */
+        public final Builder usingBundledJdk(boolean value) {
+            this.usingBundledJdk = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code version}
+         */
+        public final Builder version(String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code vm_name}
+         */
+        public final Builder vmName(String value) {
+            this.vmName = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code vm_vendor}
+         */
+        public final Builder vmVendor(String value) {
+            this.vmVendor = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code vm_version}
+         */
+        public final Builder vmVersion(String value) {
+            this.vmVersion = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ClusterJvmVersion}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterJvmVersion build() {
+            _checkSingleUse();
+
+            return new ClusterJvmVersion(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterJvmVersion}
+     */
+    public static final JsonpDeserializer<ClusterJvmVersion> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterJvmVersion::setupClusterJvmVersionDeserializer
+    );
+
+    protected static void setupClusterJvmVersionDeserializer(ObjectDeserializer<ClusterJvmVersion.Builder> op) {
+
+        op.add(Builder::bundledJdk, JsonpDeserializer.booleanDeserializer(), "bundled_jdk");
+        op.add(Builder::count, JsonpDeserializer.integerDeserializer(), "count");
+        op.add(Builder::usingBundledJdk, JsonpDeserializer.booleanDeserializer(), "using_bundled_jdk");
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
+        op.add(Builder::vmName, JsonpDeserializer.stringDeserializer(), "vm_name");
+        op.add(Builder::vmVendor, JsonpDeserializer.stringDeserializer(), "vm_vendor");
+        op.add(Builder::vmVersion, JsonpDeserializer.stringDeserializer(), "vm_version");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterNetworkTypes.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterNetworkTypes.java
index 21580bd6b4..bf5418c407 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterNetworkTypes.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterNetworkTypes.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,160 +44,161 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: cluster.stats.ClusterNetworkTypes
 
 @JsonpDeserializable
 public class ClusterNetworkTypes implements JsonpSerializable {
-	private final Map<String, Integer> httpTypes;
-
-	private final Map<String, Integer> transportTypes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterNetworkTypes(Builder builder) {
-
-		this.httpTypes = ApiTypeHelper.unmodifiableRequired(builder.httpTypes, this, "httpTypes");
-		this.transportTypes = ApiTypeHelper.unmodifiableRequired(builder.transportTypes, this, "transportTypes");
-
-	}
-
-	public static ClusterNetworkTypes of(Function<Builder, ObjectBuilder<ClusterNetworkTypes>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code http_types}
-	 */
-	public final Map<String, Integer> httpTypes() {
-		return this.httpTypes;
-	}
-
-	/**
-	 * Required - API name: {@code transport_types}
-	 */
-	public final Map<String, Integer> transportTypes() {
-		return this.transportTypes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.httpTypes)) {
-			generator.writeKey("http_types");
-			generator.writeStartObject();
-			for (Map.Entry<String, Integer> item0 : this.httpTypes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.transportTypes)) {
-			generator.writeKey("transport_types");
-			generator.writeStartObject();
-			for (Map.Entry<String, Integer> item0 : this.transportTypes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterNetworkTypes}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterNetworkTypes> {
-		private Map<String, Integer> httpTypes;
-
-		private Map<String, Integer> transportTypes;
-
-		/**
-		 * Required - API name: {@code http_types}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>httpTypes</code>.
-		 */
-		public final Builder httpTypes(Map<String, Integer> map) {
-			this.httpTypes = _mapPutAll(this.httpTypes, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code http_types}
-		 * <p>
-		 * Adds an entry to <code>httpTypes</code>.
-		 */
-		public final Builder httpTypes(String key, Integer value) {
-			this.httpTypes = _mapPut(this.httpTypes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code transport_types}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>transportTypes</code>.
-		 */
-		public final Builder transportTypes(Map<String, Integer> map) {
-			this.transportTypes = _mapPutAll(this.transportTypes, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code transport_types}
-		 * <p>
-		 * Adds an entry to <code>transportTypes</code>.
-		 */
-		public final Builder transportTypes(String key, Integer value) {
-			this.transportTypes = _mapPut(this.transportTypes, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ClusterNetworkTypes}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterNetworkTypes build() {
-			_checkSingleUse();
-
-			return new ClusterNetworkTypes(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterNetworkTypes}
-	 */
-	public static final JsonpDeserializer<ClusterNetworkTypes> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClusterNetworkTypes::setupClusterNetworkTypesDeserializer);
-
-	protected static void setupClusterNetworkTypesDeserializer(ObjectDeserializer<ClusterNetworkTypes.Builder> op) {
-
-		op.add(Builder::httpTypes, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.integerDeserializer()),
-				"http_types");
-		op.add(Builder::transportTypes,
-				JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.integerDeserializer()), "transport_types");
-
-	}
+    private final Map<String, Integer> httpTypes;
+
+    private final Map<String, Integer> transportTypes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterNetworkTypes(Builder builder) {
+
+        this.httpTypes = ApiTypeHelper.unmodifiableRequired(builder.httpTypes, this, "httpTypes");
+        this.transportTypes = ApiTypeHelper.unmodifiableRequired(builder.transportTypes, this, "transportTypes");
+
+    }
+
+    public static ClusterNetworkTypes of(Function<Builder, ObjectBuilder<ClusterNetworkTypes>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code http_types}
+     */
+    public final Map<String, Integer> httpTypes() {
+        return this.httpTypes;
+    }
+
+    /**
+     * Required - API name: {@code transport_types}
+     */
+    public final Map<String, Integer> transportTypes() {
+        return this.transportTypes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.httpTypes)) {
+            generator.writeKey("http_types");
+            generator.writeStartObject();
+            for (Map.Entry<String, Integer> item0 : this.httpTypes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.transportTypes)) {
+            generator.writeKey("transport_types");
+            generator.writeStartObject();
+            for (Map.Entry<String, Integer> item0 : this.transportTypes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterNetworkTypes}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterNetworkTypes> {
+        private Map<String, Integer> httpTypes;
+
+        private Map<String, Integer> transportTypes;
+
+        /**
+         * Required - API name: {@code http_types}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>httpTypes</code>.
+         */
+        public final Builder httpTypes(Map<String, Integer> map) {
+            this.httpTypes = _mapPutAll(this.httpTypes, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code http_types}
+         * <p>
+         * Adds an entry to <code>httpTypes</code>.
+         */
+        public final Builder httpTypes(String key, Integer value) {
+            this.httpTypes = _mapPut(this.httpTypes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code transport_types}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>transportTypes</code>.
+         */
+        public final Builder transportTypes(Map<String, Integer> map) {
+            this.transportTypes = _mapPutAll(this.transportTypes, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code transport_types}
+         * <p>
+         * Adds an entry to <code>transportTypes</code>.
+         */
+        public final Builder transportTypes(String key, Integer value) {
+            this.transportTypes = _mapPut(this.transportTypes, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link ClusterNetworkTypes}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterNetworkTypes build() {
+            _checkSingleUse();
+
+            return new ClusterNetworkTypes(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterNetworkTypes}
+     */
+    public static final JsonpDeserializer<ClusterNetworkTypes> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterNetworkTypes::setupClusterNetworkTypesDeserializer
+    );
+
+    protected static void setupClusterNetworkTypesDeserializer(ObjectDeserializer<ClusterNetworkTypes.Builder> op) {
+
+        op.add(Builder::httpTypes, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.integerDeserializer()), "http_types");
+        op.add(
+            Builder::transportTypes,
+            JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.integerDeserializer()),
+            "transport_types"
+        );
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterNodeCount.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterNodeCount.java
index 2240ec3269..17f9a8d370 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterNodeCount.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterNodeCount.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,412 +44,409 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.stats.ClusterNodeCount
 
-
 @JsonpDeserializable
 public class ClusterNodeCount implements JsonpSerializable {
-	private final int coordinatingOnly;
+    private final int coordinatingOnly;
 
-	private final int data;
+    private final int data;
 
-	private final int ingest;
+    private final int ingest;
 
-	private final int clusterManager;
-
-	private final int total;
-
-	private final int votingOnly;
-
-	private final int dataCold;
-
-	@Nullable
-	private final Integer dataFrozen;
-
-	private final int dataContent;
-
-	private final int dataWarm;
-
-	private final int dataHot;
-
-	private final int ml;
-
-	private final int remoteClusterClient;
-
-	private final int transform;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterNodeCount(Builder builder) {
-
-		this.coordinatingOnly = ApiTypeHelper.requireNonNull(builder.coordinatingOnly, this, "coordinatingOnly");
-		this.data = ApiTypeHelper.requireNonNull(builder.data, this, "data");
-		this.ingest = ApiTypeHelper.requireNonNull(builder.ingest, this, "ingest");
-		this.clusterManager = ApiTypeHelper.requireNonNull(builder.clusterManager, this, "clusterManager");
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
-		this.votingOnly = ApiTypeHelper.requireNonNull(builder.votingOnly, this, "votingOnly");
-		this.dataCold = ApiTypeHelper.requireNonNull(builder.dataCold, this, "dataCold");
-		this.dataFrozen = builder.dataFrozen;
-		this.dataContent = ApiTypeHelper.requireNonNull(builder.dataContent, this, "dataContent");
-		this.dataWarm = ApiTypeHelper.requireNonNull(builder.dataWarm, this, "dataWarm");
-		this.dataHot = ApiTypeHelper.requireNonNull(builder.dataHot, this, "dataHot");
-		this.ml = ApiTypeHelper.requireNonNull(builder.ml, this, "ml");
-		this.remoteClusterClient = ApiTypeHelper.requireNonNull(builder.remoteClusterClient, this,
-				"remoteClusterClient");
-		this.transform = ApiTypeHelper.requireNonNull(builder.transform, this, "transform");
-
-	}
-
-	public static ClusterNodeCount of(Function<Builder, ObjectBuilder<ClusterNodeCount>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code coordinating_only}
-	 */
-	public final int coordinatingOnly() {
-		return this.coordinatingOnly;
-	}
-
-	/**
-	 * Required - API name: {@code data}
-	 */
-	public final int data() {
-		return this.data;
-	}
-
-	/**
-	 * Required - API name: {@code ingest}
-	 */
-	public final int ingest() {
-		return this.ingest;
-	}
-
-	/**
-	 * Required - API name: {@code clusterManager}
-	 */
-	public final int clusterManager() {
-		return this.clusterManager;
-	}
-
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final int total() {
-		return this.total;
-	}
-
-	/**
-	 * Required - API name: {@code voting_only}
-	 */
-	public final int votingOnly() {
-		return this.votingOnly;
-	}
-
-	/**
-	 * Required - API name: {@code data_cold}
-	 */
-	public final int dataCold() {
-		return this.dataCold;
-	}
-
-	/**
-	 * API name: {@code data_frozen}
-	 */
-	@Nullable
-	public final Integer dataFrozen() {
-		return this.dataFrozen;
-	}
-
-	/**
-	 * Required - API name: {@code data_content}
-	 */
-	public final int dataContent() {
-		return this.dataContent;
-	}
-
-	/**
-	 * Required - API name: {@code data_warm}
-	 */
-	public final int dataWarm() {
-		return this.dataWarm;
-	}
-
-	/**
-	 * Required - API name: {@code data_hot}
-	 */
-	public final int dataHot() {
-		return this.dataHot;
-	}
-
-	/**
-	 * Required - API name: {@code ml}
-	 */
-	public final int ml() {
-		return this.ml;
-	}
-
-	/**
-	 * Required - API name: {@code remote_cluster_client}
-	 */
-	public final int remoteClusterClient() {
-		return this.remoteClusterClient;
-	}
+    private final int clusterManager;
+
+    private final int total;
+
+    private final int votingOnly;
+
+    private final int dataCold;
+
+    @Nullable
+    private final Integer dataFrozen;
+
+    private final int dataContent;
+
+    private final int dataWarm;
+
+    private final int dataHot;
+
+    private final int ml;
+
+    private final int remoteClusterClient;
+
+    private final int transform;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterNodeCount(Builder builder) {
+
+        this.coordinatingOnly = ApiTypeHelper.requireNonNull(builder.coordinatingOnly, this, "coordinatingOnly");
+        this.data = ApiTypeHelper.requireNonNull(builder.data, this, "data");
+        this.ingest = ApiTypeHelper.requireNonNull(builder.ingest, this, "ingest");
+        this.clusterManager = ApiTypeHelper.requireNonNull(builder.clusterManager, this, "clusterManager");
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+        this.votingOnly = ApiTypeHelper.requireNonNull(builder.votingOnly, this, "votingOnly");
+        this.dataCold = ApiTypeHelper.requireNonNull(builder.dataCold, this, "dataCold");
+        this.dataFrozen = builder.dataFrozen;
+        this.dataContent = ApiTypeHelper.requireNonNull(builder.dataContent, this, "dataContent");
+        this.dataWarm = ApiTypeHelper.requireNonNull(builder.dataWarm, this, "dataWarm");
+        this.dataHot = ApiTypeHelper.requireNonNull(builder.dataHot, this, "dataHot");
+        this.ml = ApiTypeHelper.requireNonNull(builder.ml, this, "ml");
+        this.remoteClusterClient = ApiTypeHelper.requireNonNull(builder.remoteClusterClient, this, "remoteClusterClient");
+        this.transform = ApiTypeHelper.requireNonNull(builder.transform, this, "transform");
+
+    }
+
+    public static ClusterNodeCount of(Function<Builder, ObjectBuilder<ClusterNodeCount>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code coordinating_only}
+     */
+    public final int coordinatingOnly() {
+        return this.coordinatingOnly;
+    }
+
+    /**
+     * Required - API name: {@code data}
+     */
+    public final int data() {
+        return this.data;
+    }
+
+    /**
+     * Required - API name: {@code ingest}
+     */
+    public final int ingest() {
+        return this.ingest;
+    }
+
+    /**
+     * Required - API name: {@code clusterManager}
+     */
+    public final int clusterManager() {
+        return this.clusterManager;
+    }
+
+    /**
+     * Required - API name: {@code total}
+     */
+    public final int total() {
+        return this.total;
+    }
+
+    /**
+     * Required - API name: {@code voting_only}
+     */
+    public final int votingOnly() {
+        return this.votingOnly;
+    }
+
+    /**
+     * Required - API name: {@code data_cold}
+     */
+    public final int dataCold() {
+        return this.dataCold;
+    }
+
+    /**
+     * API name: {@code data_frozen}
+     */
+    @Nullable
+    public final Integer dataFrozen() {
+        return this.dataFrozen;
+    }
+
+    /**
+     * Required - API name: {@code data_content}
+     */
+    public final int dataContent() {
+        return this.dataContent;
+    }
+
+    /**
+     * Required - API name: {@code data_warm}
+     */
+    public final int dataWarm() {
+        return this.dataWarm;
+    }
+
+    /**
+     * Required - API name: {@code data_hot}
+     */
+    public final int dataHot() {
+        return this.dataHot;
+    }
+
+    /**
+     * Required - API name: {@code ml}
+     */
+    public final int ml() {
+        return this.ml;
+    }
+
+    /**
+     * Required - API name: {@code remote_cluster_client}
+     */
+    public final int remoteClusterClient() {
+        return this.remoteClusterClient;
+    }
 
-	/**
-	 * Required - API name: {@code transform}
-	 */
-	public final int transform() {
-		return this.transform;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("coordinating_only");
-		generator.write(this.coordinatingOnly);
-
-		generator.writeKey("data");
-		generator.write(this.data);
-
-		generator.writeKey("ingest");
-		generator.write(this.ingest);
-
-		generator.writeKey("cluster_manager");
-		generator.write(this.clusterManager);
-
-		generator.writeKey("total");
-		generator.write(this.total);
-
-		generator.writeKey("voting_only");
-		generator.write(this.votingOnly);
-
-		generator.writeKey("data_cold");
-		generator.write(this.dataCold);
-
-		if (this.dataFrozen != null) {
-			generator.writeKey("data_frozen");
-			generator.write(this.dataFrozen);
-
-		}
-		generator.writeKey("data_content");
-		generator.write(this.dataContent);
-
-		generator.writeKey("data_warm");
-		generator.write(this.dataWarm);
-
-		generator.writeKey("data_hot");
-		generator.write(this.dataHot);
-
-		generator.writeKey("ml");
-		generator.write(this.ml);
-
-		generator.writeKey("remote_cluster_client");
-		generator.write(this.remoteClusterClient);
-
-		generator.writeKey("transform");
-		generator.write(this.transform);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterNodeCount}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterNodeCount> {
-		private Integer coordinatingOnly;
-
-		private Integer data;
-
-		private Integer ingest;
-
-		private Integer clusterManager;
-
-		private Integer total;
-
-		private Integer votingOnly;
-
-		private Integer dataCold;
-
-		@Nullable
-		private Integer dataFrozen;
-
-		private Integer dataContent;
-
-		private Integer dataWarm;
-
-		private Integer dataHot;
-
-		private Integer ml;
-
-		private Integer remoteClusterClient;
-
-		private Integer transform;
-
-		/**
-		 * Required - API name: {@code coordinating_only}
-		 */
-		public final Builder coordinatingOnly(int value) {
-			this.coordinatingOnly = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code data}
-		 */
-		public final Builder data(int value) {
-			this.data = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code ingest}
-		 */
-		public final Builder ingest(int value) {
-			this.ingest = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code clusterManager}
-		 */
-		public final Builder clusterManager(int value) {
-			this.clusterManager = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(int value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code voting_only}
-		 */
-		public final Builder votingOnly(int value) {
-			this.votingOnly = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code data_cold}
-		 */
-		public final Builder dataCold(int value) {
-			this.dataCold = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code data_frozen}
-		 */
-		public final Builder dataFrozen(@Nullable Integer value) {
-			this.dataFrozen = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code data_content}
-		 */
-		public final Builder dataContent(int value) {
-			this.dataContent = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code data_warm}
-		 */
-		public final Builder dataWarm(int value) {
-			this.dataWarm = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code data_hot}
-		 */
-		public final Builder dataHot(int value) {
-			this.dataHot = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code ml}
-		 */
-		public final Builder ml(int value) {
-			this.ml = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code remote_cluster_client}
-		 */
-		public final Builder remoteClusterClient(int value) {
-			this.remoteClusterClient = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code transform}
-		 */
-		public final Builder transform(int value) {
-			this.transform = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ClusterNodeCount}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterNodeCount build() {
-			_checkSingleUse();
-
-			return new ClusterNodeCount(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterNodeCount}
-	 */
-	public static final JsonpDeserializer<ClusterNodeCount> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ClusterNodeCount::setupClusterNodeCountDeserializer);
-
-	protected static void setupClusterNodeCountDeserializer(ObjectDeserializer<ClusterNodeCount.Builder> op) {
-
-		op.add(Builder::coordinatingOnly, JsonpDeserializer.integerDeserializer(), "coordinating_only");
-		op.add(Builder::data, JsonpDeserializer.integerDeserializer(), "data");
-		op.add(Builder::ingest, JsonpDeserializer.integerDeserializer(), "ingest");
-		op.add(Builder::clusterManager, JsonpDeserializer.integerDeserializer(), "cluster_manager");
-		op.add(Builder::total, JsonpDeserializer.integerDeserializer(), "total");
-		op.add(Builder::votingOnly, JsonpDeserializer.integerDeserializer(), "voting_only");
-		op.add(Builder::dataCold, JsonpDeserializer.integerDeserializer(), "data_cold");
-		op.add(Builder::dataFrozen, JsonpDeserializer.integerDeserializer(), "data_frozen");
-		op.add(Builder::dataContent, JsonpDeserializer.integerDeserializer(), "data_content");
-		op.add(Builder::dataWarm, JsonpDeserializer.integerDeserializer(), "data_warm");
-		op.add(Builder::dataHot, JsonpDeserializer.integerDeserializer(), "data_hot");
-		op.add(Builder::ml, JsonpDeserializer.integerDeserializer(), "ml");
-		op.add(Builder::remoteClusterClient, JsonpDeserializer.integerDeserializer(), "remote_cluster_client");
-		op.add(Builder::transform, JsonpDeserializer.integerDeserializer(), "transform");
-
-	}
+    /**
+     * Required - API name: {@code transform}
+     */
+    public final int transform() {
+        return this.transform;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("coordinating_only");
+        generator.write(this.coordinatingOnly);
+
+        generator.writeKey("data");
+        generator.write(this.data);
+
+        generator.writeKey("ingest");
+        generator.write(this.ingest);
+
+        generator.writeKey("cluster_manager");
+        generator.write(this.clusterManager);
+
+        generator.writeKey("total");
+        generator.write(this.total);
+
+        generator.writeKey("voting_only");
+        generator.write(this.votingOnly);
+
+        generator.writeKey("data_cold");
+        generator.write(this.dataCold);
+
+        if (this.dataFrozen != null) {
+            generator.writeKey("data_frozen");
+            generator.write(this.dataFrozen);
+
+        }
+        generator.writeKey("data_content");
+        generator.write(this.dataContent);
+
+        generator.writeKey("data_warm");
+        generator.write(this.dataWarm);
+
+        generator.writeKey("data_hot");
+        generator.write(this.dataHot);
+
+        generator.writeKey("ml");
+        generator.write(this.ml);
+
+        generator.writeKey("remote_cluster_client");
+        generator.write(this.remoteClusterClient);
+
+        generator.writeKey("transform");
+        generator.write(this.transform);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterNodeCount}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterNodeCount> {
+        private Integer coordinatingOnly;
+
+        private Integer data;
+
+        private Integer ingest;
+
+        private Integer clusterManager;
+
+        private Integer total;
+
+        private Integer votingOnly;
+
+        private Integer dataCold;
+
+        @Nullable
+        private Integer dataFrozen;
+
+        private Integer dataContent;
+
+        private Integer dataWarm;
+
+        private Integer dataHot;
+
+        private Integer ml;
+
+        private Integer remoteClusterClient;
+
+        private Integer transform;
+
+        /**
+         * Required - API name: {@code coordinating_only}
+         */
+        public final Builder coordinatingOnly(int value) {
+            this.coordinatingOnly = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code data}
+         */
+        public final Builder data(int value) {
+            this.data = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code ingest}
+         */
+        public final Builder ingest(int value) {
+            this.ingest = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code clusterManager}
+         */
+        public final Builder clusterManager(int value) {
+            this.clusterManager = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(int value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code voting_only}
+         */
+        public final Builder votingOnly(int value) {
+            this.votingOnly = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code data_cold}
+         */
+        public final Builder dataCold(int value) {
+            this.dataCold = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code data_frozen}
+         */
+        public final Builder dataFrozen(@Nullable Integer value) {
+            this.dataFrozen = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code data_content}
+         */
+        public final Builder dataContent(int value) {
+            this.dataContent = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code data_warm}
+         */
+        public final Builder dataWarm(int value) {
+            this.dataWarm = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code data_hot}
+         */
+        public final Builder dataHot(int value) {
+            this.dataHot = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code ml}
+         */
+        public final Builder ml(int value) {
+            this.ml = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code remote_cluster_client}
+         */
+        public final Builder remoteClusterClient(int value) {
+            this.remoteClusterClient = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code transform}
+         */
+        public final Builder transform(int value) {
+            this.transform = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ClusterNodeCount}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterNodeCount build() {
+            _checkSingleUse();
+
+            return new ClusterNodeCount(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterNodeCount}
+     */
+    public static final JsonpDeserializer<ClusterNodeCount> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterNodeCount::setupClusterNodeCountDeserializer
+    );
+
+    protected static void setupClusterNodeCountDeserializer(ObjectDeserializer<ClusterNodeCount.Builder> op) {
+
+        op.add(Builder::coordinatingOnly, JsonpDeserializer.integerDeserializer(), "coordinating_only");
+        op.add(Builder::data, JsonpDeserializer.integerDeserializer(), "data");
+        op.add(Builder::ingest, JsonpDeserializer.integerDeserializer(), "ingest");
+        op.add(Builder::clusterManager, JsonpDeserializer.integerDeserializer(), "cluster_manager");
+        op.add(Builder::total, JsonpDeserializer.integerDeserializer(), "total");
+        op.add(Builder::votingOnly, JsonpDeserializer.integerDeserializer(), "voting_only");
+        op.add(Builder::dataCold, JsonpDeserializer.integerDeserializer(), "data_cold");
+        op.add(Builder::dataFrozen, JsonpDeserializer.integerDeserializer(), "data_frozen");
+        op.add(Builder::dataContent, JsonpDeserializer.integerDeserializer(), "data_content");
+        op.add(Builder::dataWarm, JsonpDeserializer.integerDeserializer(), "data_warm");
+        op.add(Builder::dataHot, JsonpDeserializer.integerDeserializer(), "data_hot");
+        op.add(Builder::ml, JsonpDeserializer.integerDeserializer(), "ml");
+        op.add(Builder::remoteClusterClient, JsonpDeserializer.integerDeserializer(), "remote_cluster_client");
+        op.add(Builder::transform, JsonpDeserializer.integerDeserializer(), "transform");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterNodes.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterNodes.java
index 59693f638e..b957b6fbc2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterNodes.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterNodes.java
@@ -32,578 +32,579 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
-import org.opensearch.client.opensearch._types.PluginStats;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.PluginStats;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: cluster.stats.ClusterNodes
 
-
 @JsonpDeserializable
 public class ClusterNodes implements JsonpSerializable {
-	private final ClusterNodeCount count;
-
-	private final Map<String, Integer> discoveryTypes;
-
-	private final ClusterFileSystem fs;
-
-	private final ClusterIngest ingest;
-
-	private final ClusterJvm jvm;
-
-	private final ClusterNetworkTypes networkTypes;
-
-	private final ClusterOperatingSystem os;
-
-	private final List<NodePackagingType> packagingTypes;
-
-	private final List<PluginStats> plugins;
-
-	private final ClusterProcess process;
-
-	private final List<String> versions;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterNodes(Builder builder) {
-
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.discoveryTypes = ApiTypeHelper.unmodifiableRequired(builder.discoveryTypes, this, "discoveryTypes");
-		this.fs = ApiTypeHelper.requireNonNull(builder.fs, this, "fs");
-		this.ingest = ApiTypeHelper.requireNonNull(builder.ingest, this, "ingest");
-		this.jvm = ApiTypeHelper.requireNonNull(builder.jvm, this, "jvm");
-		this.networkTypes = ApiTypeHelper.requireNonNull(builder.networkTypes, this, "networkTypes");
-		this.os = ApiTypeHelper.requireNonNull(builder.os, this, "os");
-		this.packagingTypes = ApiTypeHelper.unmodifiableRequired(builder.packagingTypes, this, "packagingTypes");
-		this.plugins = ApiTypeHelper.unmodifiableRequired(builder.plugins, this, "plugins");
-		this.process = ApiTypeHelper.requireNonNull(builder.process, this, "process");
-		this.versions = ApiTypeHelper.unmodifiableRequired(builder.versions, this, "versions");
-
-	}
-
-	public static ClusterNodes of(Function<Builder, ObjectBuilder<ClusterNodes>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Contains counts for nodes selected by the request's node filters.
-	 * <p>
-	 * API name: {@code count}
-	 */
-	public final ClusterNodeCount count() {
-		return this.count;
-	}
-
-	/**
-	 * Required - Contains statistics about the discovery types used by selected
-	 * nodes.
-	 * <p>
-	 * API name: {@code discovery_types}
-	 */
-	public final Map<String, Integer> discoveryTypes() {
-		return this.discoveryTypes;
-	}
-
-	/**
-	 * Required - Contains statistics about file stores by selected nodes.
-	 * <p>
-	 * API name: {@code fs}
-	 */
-	public final ClusterFileSystem fs() {
-		return this.fs;
-	}
-
-	/**
-	 * Required - API name: {@code ingest}
-	 */
-	public final ClusterIngest ingest() {
-		return this.ingest;
-	}
-
-	/**
-	 * Required - Contains statistics about the Java Virtual Machines (JVMs) used by
-	 * selected nodes.
-	 * <p>
-	 * API name: {@code jvm}
-	 */
-	public final ClusterJvm jvm() {
-		return this.jvm;
-	}
-
-	/**
-	 * Required - Contains statistics about the transport and HTTP networks used by
-	 * selected nodes.
-	 * <p>
-	 * API name: {@code network_types}
-	 */
-	public final ClusterNetworkTypes networkTypes() {
-		return this.networkTypes;
-	}
-
-	/**
-	 * Required - Contains statistics about the operating systems used by selected
-	 * nodes.
-	 * <p>
-	 * API name: {@code os}
-	 */
-	public final ClusterOperatingSystem os() {
-		return this.os;
-	}
-
-	/**
-	 * Required - Contains statistics about Elasticsearch distributions installed on
-	 * selected nodes.
-	 * <p>
-	 * API name: {@code packaging_types}
-	 */
-	public final List<NodePackagingType> packagingTypes() {
-		return this.packagingTypes;
-	}
-
-	/**
-	 * Required - Contains statistics about installed plugins and modules by
-	 * selected nodes.
-	 * <p>
-	 * API name: {@code plugins}
-	 */
-	public final List<PluginStats> plugins() {
-		return this.plugins;
-	}
-
-	/**
-	 * Required - Contains statistics about processes used by selected nodes.
-	 * <p>
-	 * API name: {@code process}
-	 */
-	public final ClusterProcess process() {
-		return this.process;
-	}
-
-	/**
-	 * Required - Array of Elasticsearch versions used on selected nodes.
-	 * <p>
-	 * API name: {@code versions}
-	 */
-	public final List<String> versions() {
-		return this.versions;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("count");
-		this.count.serialize(generator, mapper);
-
-		if (ApiTypeHelper.isDefined(this.discoveryTypes)) {
-			generator.writeKey("discovery_types");
-			generator.writeStartObject();
-			for (Map.Entry<String, Integer> item0 : this.discoveryTypes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("fs");
-		this.fs.serialize(generator, mapper);
-
-		generator.writeKey("ingest");
-		this.ingest.serialize(generator, mapper);
-
-		generator.writeKey("jvm");
-		this.jvm.serialize(generator, mapper);
-
-		generator.writeKey("network_types");
-		this.networkTypes.serialize(generator, mapper);
-
-		generator.writeKey("os");
-		this.os.serialize(generator, mapper);
-
-		if (ApiTypeHelper.isDefined(this.packagingTypes)) {
-			generator.writeKey("packaging_types");
-			generator.writeStartArray();
-			for (NodePackagingType item0 : this.packagingTypes) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.plugins)) {
-			generator.writeKey("plugins");
-			generator.writeStartArray();
-			for (PluginStats item0 : this.plugins) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("process");
-		this.process.serialize(generator, mapper);
-
-		if (ApiTypeHelper.isDefined(this.versions)) {
-			generator.writeKey("versions");
-			generator.writeStartArray();
-			for (String item0 : this.versions) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterNodes}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterNodes> {
-		private ClusterNodeCount count;
-
-		private Map<String, Integer> discoveryTypes;
-
-		private ClusterFileSystem fs;
-
-		private ClusterIngest ingest;
-
-		private ClusterJvm jvm;
-
-		private ClusterNetworkTypes networkTypes;
-
-		private ClusterOperatingSystem os;
-
-		private List<NodePackagingType> packagingTypes;
-
-		private List<PluginStats> plugins;
-
-		private ClusterProcess process;
-
-		private List<String> versions;
-
-		/**
-		 * Required - Contains counts for nodes selected by the request's node filters.
-		 * <p>
-		 * API name: {@code count}
-		 */
-		public final Builder count(ClusterNodeCount value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains counts for nodes selected by the request's node filters.
-		 * <p>
-		 * API name: {@code count}
-		 */
-		public final Builder count(Function<ClusterNodeCount.Builder, ObjectBuilder<ClusterNodeCount>> fn) {
-			return this.count(fn.apply(new ClusterNodeCount.Builder()).build());
-		}
-
-		/**
-		 * Required - Contains statistics about the discovery types used by selected
-		 * nodes.
-		 * <p>
-		 * API name: {@code discovery_types}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>discoveryTypes</code>.
-		 */
-		public final Builder discoveryTypes(Map<String, Integer> map) {
-			this.discoveryTypes = _mapPutAll(this.discoveryTypes, map);
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about the discovery types used by selected
-		 * nodes.
-		 * <p>
-		 * API name: {@code discovery_types}
-		 * <p>
-		 * Adds an entry to <code>discoveryTypes</code>.
-		 */
-		public final Builder discoveryTypes(String key, Integer value) {
-			this.discoveryTypes = _mapPut(this.discoveryTypes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about file stores by selected nodes.
-		 * <p>
-		 * API name: {@code fs}
-		 */
-		public final Builder fs(ClusterFileSystem value) {
-			this.fs = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about file stores by selected nodes.
-		 * <p>
-		 * API name: {@code fs}
-		 */
-		public final Builder fs(Function<ClusterFileSystem.Builder, ObjectBuilder<ClusterFileSystem>> fn) {
-			return this.fs(fn.apply(new ClusterFileSystem.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code ingest}
-		 */
-		public final Builder ingest(ClusterIngest value) {
-			this.ingest = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code ingest}
-		 */
-		public final Builder ingest(Function<ClusterIngest.Builder, ObjectBuilder<ClusterIngest>> fn) {
-			return this.ingest(fn.apply(new ClusterIngest.Builder()).build());
-		}
-
-		/**
-		 * Required - Contains statistics about the Java Virtual Machines (JVMs) used by
-		 * selected nodes.
-		 * <p>
-		 * API name: {@code jvm}
-		 */
-		public final Builder jvm(ClusterJvm value) {
-			this.jvm = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about the Java Virtual Machines (JVMs) used by
-		 * selected nodes.
-		 * <p>
-		 * API name: {@code jvm}
-		 */
-		public final Builder jvm(Function<ClusterJvm.Builder, ObjectBuilder<ClusterJvm>> fn) {
-			return this.jvm(fn.apply(new ClusterJvm.Builder()).build());
-		}
-
-		/**
-		 * Required - Contains statistics about the transport and HTTP networks used by
-		 * selected nodes.
-		 * <p>
-		 * API name: {@code network_types}
-		 */
-		public final Builder networkTypes(ClusterNetworkTypes value) {
-			this.networkTypes = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about the transport and HTTP networks used by
-		 * selected nodes.
-		 * <p>
-		 * API name: {@code network_types}
-		 */
-		public final Builder networkTypes(
-				Function<ClusterNetworkTypes.Builder, ObjectBuilder<ClusterNetworkTypes>> fn) {
-			return this.networkTypes(fn.apply(new ClusterNetworkTypes.Builder()).build());
-		}
-
-		/**
-		 * Required - Contains statistics about the operating systems used by selected
-		 * nodes.
-		 * <p>
-		 * API name: {@code os}
-		 */
-		public final Builder os(ClusterOperatingSystem value) {
-			this.os = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about the operating systems used by selected
-		 * nodes.
-		 * <p>
-		 * API name: {@code os}
-		 */
-		public final Builder os(Function<ClusterOperatingSystem.Builder, ObjectBuilder<ClusterOperatingSystem>> fn) {
-			return this.os(fn.apply(new ClusterOperatingSystem.Builder()).build());
-		}
-
-		/**
-		 * Required - Contains statistics about Elasticsearch distributions installed on
-		 * selected nodes.
-		 * <p>
-		 * API name: {@code packaging_types}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>packagingTypes</code>.
-		 */
-		public final Builder packagingTypes(List<NodePackagingType> list) {
-			this.packagingTypes = _listAddAll(this.packagingTypes, list);
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about Elasticsearch distributions installed on
-		 * selected nodes.
-		 * <p>
-		 * API name: {@code packaging_types}
-		 * <p>
-		 * Adds one or more values to <code>packagingTypes</code>.
-		 */
-		public final Builder packagingTypes(NodePackagingType value, NodePackagingType... values) {
-			this.packagingTypes = _listAdd(this.packagingTypes, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about Elasticsearch distributions installed on
-		 * selected nodes.
-		 * <p>
-		 * API name: {@code packaging_types}
-		 * <p>
-		 * Adds a value to <code>packagingTypes</code> using a builder lambda.
-		 */
-		public final Builder packagingTypes(Function<NodePackagingType.Builder, ObjectBuilder<NodePackagingType>> fn) {
-			return packagingTypes(fn.apply(new NodePackagingType.Builder()).build());
-		}
-
-		/**
-		 * Required - Contains statistics about installed plugins and modules by
-		 * selected nodes.
-		 * <p>
-		 * API name: {@code plugins}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>plugins</code>.
-		 */
-		public final Builder plugins(List<PluginStats> list) {
-			this.plugins = _listAddAll(this.plugins, list);
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about installed plugins and modules by
-		 * selected nodes.
-		 * <p>
-		 * API name: {@code plugins}
-		 * <p>
-		 * Adds one or more values to <code>plugins</code>.
-		 */
-		public final Builder plugins(PluginStats value, PluginStats... values) {
-			this.plugins = _listAdd(this.plugins, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about installed plugins and modules by
-		 * selected nodes.
-		 * <p>
-		 * API name: {@code plugins}
-		 * <p>
-		 * Adds a value to <code>plugins</code> using a builder lambda.
-		 */
-		public final Builder plugins(Function<PluginStats.Builder, ObjectBuilder<PluginStats>> fn) {
-			return plugins(fn.apply(new PluginStats.Builder()).build());
-		}
-
-		/**
-		 * Required - Contains statistics about processes used by selected nodes.
-		 * <p>
-		 * API name: {@code process}
-		 */
-		public final Builder process(ClusterProcess value) {
-			this.process = value;
-			return this;
-		}
-
-		/**
-		 * Required - Contains statistics about processes used by selected nodes.
-		 * <p>
-		 * API name: {@code process}
-		 */
-		public final Builder process(Function<ClusterProcess.Builder, ObjectBuilder<ClusterProcess>> fn) {
-			return this.process(fn.apply(new ClusterProcess.Builder()).build());
-		}
-
-		/**
-		 * Required - Array of Elasticsearch versions used on selected nodes.
-		 * <p>
-		 * API name: {@code versions}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>versions</code>.
-		 */
-		public final Builder versions(List<String> list) {
-			this.versions = _listAddAll(this.versions, list);
-			return this;
-		}
-
-		/**
-		 * Required - Array of Elasticsearch versions used on selected nodes.
-		 * <p>
-		 * API name: {@code versions}
-		 * <p>
-		 * Adds one or more values to <code>versions</code>.
-		 */
-		public final Builder versions(String value, String... values) {
-			this.versions = _listAdd(this.versions, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ClusterNodes}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterNodes build() {
-			_checkSingleUse();
-
-			return new ClusterNodes(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterNodes}
-	 */
-	public static final JsonpDeserializer<ClusterNodes> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ClusterNodes::setupClusterNodesDeserializer);
-
-	protected static void setupClusterNodesDeserializer(ObjectDeserializer<ClusterNodes.Builder> op) {
-
-		op.add(Builder::count, ClusterNodeCount._DESERIALIZER, "count");
-		op.add(Builder::discoveryTypes,
-				JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.integerDeserializer()), "discovery_types");
-		op.add(Builder::fs, ClusterFileSystem._DESERIALIZER, "fs");
-		op.add(Builder::ingest, ClusterIngest._DESERIALIZER, "ingest");
-		op.add(Builder::jvm, ClusterJvm._DESERIALIZER, "jvm");
-		op.add(Builder::networkTypes, ClusterNetworkTypes._DESERIALIZER, "network_types");
-		op.add(Builder::os, ClusterOperatingSystem._DESERIALIZER, "os");
-		op.add(Builder::packagingTypes, JsonpDeserializer.arrayDeserializer(NodePackagingType._DESERIALIZER),
-				"packaging_types");
-		op.add(Builder::plugins, JsonpDeserializer.arrayDeserializer(PluginStats._DESERIALIZER), "plugins");
-		op.add(Builder::process, ClusterProcess._DESERIALIZER, "process");
-		op.add(Builder::versions, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"versions");
-
-	}
+    private final ClusterNodeCount count;
+
+    private final Map<String, Integer> discoveryTypes;
+
+    private final ClusterFileSystem fs;
+
+    private final ClusterIngest ingest;
+
+    private final ClusterJvm jvm;
+
+    private final ClusterNetworkTypes networkTypes;
+
+    private final ClusterOperatingSystem os;
+
+    private final List<NodePackagingType> packagingTypes;
+
+    private final List<PluginStats> plugins;
+
+    private final ClusterProcess process;
+
+    private final List<String> versions;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterNodes(Builder builder) {
+
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.discoveryTypes = ApiTypeHelper.unmodifiableRequired(builder.discoveryTypes, this, "discoveryTypes");
+        this.fs = ApiTypeHelper.requireNonNull(builder.fs, this, "fs");
+        this.ingest = ApiTypeHelper.requireNonNull(builder.ingest, this, "ingest");
+        this.jvm = ApiTypeHelper.requireNonNull(builder.jvm, this, "jvm");
+        this.networkTypes = ApiTypeHelper.requireNonNull(builder.networkTypes, this, "networkTypes");
+        this.os = ApiTypeHelper.requireNonNull(builder.os, this, "os");
+        this.packagingTypes = ApiTypeHelper.unmodifiableRequired(builder.packagingTypes, this, "packagingTypes");
+        this.plugins = ApiTypeHelper.unmodifiableRequired(builder.plugins, this, "plugins");
+        this.process = ApiTypeHelper.requireNonNull(builder.process, this, "process");
+        this.versions = ApiTypeHelper.unmodifiableRequired(builder.versions, this, "versions");
+
+    }
+
+    public static ClusterNodes of(Function<Builder, ObjectBuilder<ClusterNodes>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Contains counts for nodes selected by the request's node filters.
+     * <p>
+     * API name: {@code count}
+     */
+    public final ClusterNodeCount count() {
+        return this.count;
+    }
+
+    /**
+     * Required - Contains statistics about the discovery types used by selected
+     * nodes.
+     * <p>
+     * API name: {@code discovery_types}
+     */
+    public final Map<String, Integer> discoveryTypes() {
+        return this.discoveryTypes;
+    }
+
+    /**
+     * Required - Contains statistics about file stores by selected nodes.
+     * <p>
+     * API name: {@code fs}
+     */
+    public final ClusterFileSystem fs() {
+        return this.fs;
+    }
+
+    /**
+     * Required - API name: {@code ingest}
+     */
+    public final ClusterIngest ingest() {
+        return this.ingest;
+    }
+
+    /**
+     * Required - Contains statistics about the Java Virtual Machines (JVMs) used by
+     * selected nodes.
+     * <p>
+     * API name: {@code jvm}
+     */
+    public final ClusterJvm jvm() {
+        return this.jvm;
+    }
+
+    /**
+     * Required - Contains statistics about the transport and HTTP networks used by
+     * selected nodes.
+     * <p>
+     * API name: {@code network_types}
+     */
+    public final ClusterNetworkTypes networkTypes() {
+        return this.networkTypes;
+    }
+
+    /**
+     * Required - Contains statistics about the operating systems used by selected
+     * nodes.
+     * <p>
+     * API name: {@code os}
+     */
+    public final ClusterOperatingSystem os() {
+        return this.os;
+    }
+
+    /**
+     * Required - Contains statistics about Elasticsearch distributions installed on
+     * selected nodes.
+     * <p>
+     * API name: {@code packaging_types}
+     */
+    public final List<NodePackagingType> packagingTypes() {
+        return this.packagingTypes;
+    }
+
+    /**
+     * Required - Contains statistics about installed plugins and modules by
+     * selected nodes.
+     * <p>
+     * API name: {@code plugins}
+     */
+    public final List<PluginStats> plugins() {
+        return this.plugins;
+    }
+
+    /**
+     * Required - Contains statistics about processes used by selected nodes.
+     * <p>
+     * API name: {@code process}
+     */
+    public final ClusterProcess process() {
+        return this.process;
+    }
+
+    /**
+     * Required - Array of Elasticsearch versions used on selected nodes.
+     * <p>
+     * API name: {@code versions}
+     */
+    public final List<String> versions() {
+        return this.versions;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("count");
+        this.count.serialize(generator, mapper);
+
+        if (ApiTypeHelper.isDefined(this.discoveryTypes)) {
+            generator.writeKey("discovery_types");
+            generator.writeStartObject();
+            for (Map.Entry<String, Integer> item0 : this.discoveryTypes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("fs");
+        this.fs.serialize(generator, mapper);
+
+        generator.writeKey("ingest");
+        this.ingest.serialize(generator, mapper);
+
+        generator.writeKey("jvm");
+        this.jvm.serialize(generator, mapper);
+
+        generator.writeKey("network_types");
+        this.networkTypes.serialize(generator, mapper);
+
+        generator.writeKey("os");
+        this.os.serialize(generator, mapper);
+
+        if (ApiTypeHelper.isDefined(this.packagingTypes)) {
+            generator.writeKey("packaging_types");
+            generator.writeStartArray();
+            for (NodePackagingType item0 : this.packagingTypes) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.plugins)) {
+            generator.writeKey("plugins");
+            generator.writeStartArray();
+            for (PluginStats item0 : this.plugins) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("process");
+        this.process.serialize(generator, mapper);
+
+        if (ApiTypeHelper.isDefined(this.versions)) {
+            generator.writeKey("versions");
+            generator.writeStartArray();
+            for (String item0 : this.versions) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterNodes}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterNodes> {
+        private ClusterNodeCount count;
+
+        private Map<String, Integer> discoveryTypes;
+
+        private ClusterFileSystem fs;
+
+        private ClusterIngest ingest;
+
+        private ClusterJvm jvm;
+
+        private ClusterNetworkTypes networkTypes;
+
+        private ClusterOperatingSystem os;
+
+        private List<NodePackagingType> packagingTypes;
+
+        private List<PluginStats> plugins;
+
+        private ClusterProcess process;
+
+        private List<String> versions;
+
+        /**
+         * Required - Contains counts for nodes selected by the request's node filters.
+         * <p>
+         * API name: {@code count}
+         */
+        public final Builder count(ClusterNodeCount value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains counts for nodes selected by the request's node filters.
+         * <p>
+         * API name: {@code count}
+         */
+        public final Builder count(Function<ClusterNodeCount.Builder, ObjectBuilder<ClusterNodeCount>> fn) {
+            return this.count(fn.apply(new ClusterNodeCount.Builder()).build());
+        }
+
+        /**
+         * Required - Contains statistics about the discovery types used by selected
+         * nodes.
+         * <p>
+         * API name: {@code discovery_types}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>discoveryTypes</code>.
+         */
+        public final Builder discoveryTypes(Map<String, Integer> map) {
+            this.discoveryTypes = _mapPutAll(this.discoveryTypes, map);
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about the discovery types used by selected
+         * nodes.
+         * <p>
+         * API name: {@code discovery_types}
+         * <p>
+         * Adds an entry to <code>discoveryTypes</code>.
+         */
+        public final Builder discoveryTypes(String key, Integer value) {
+            this.discoveryTypes = _mapPut(this.discoveryTypes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about file stores by selected nodes.
+         * <p>
+         * API name: {@code fs}
+         */
+        public final Builder fs(ClusterFileSystem value) {
+            this.fs = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about file stores by selected nodes.
+         * <p>
+         * API name: {@code fs}
+         */
+        public final Builder fs(Function<ClusterFileSystem.Builder, ObjectBuilder<ClusterFileSystem>> fn) {
+            return this.fs(fn.apply(new ClusterFileSystem.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code ingest}
+         */
+        public final Builder ingest(ClusterIngest value) {
+            this.ingest = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code ingest}
+         */
+        public final Builder ingest(Function<ClusterIngest.Builder, ObjectBuilder<ClusterIngest>> fn) {
+            return this.ingest(fn.apply(new ClusterIngest.Builder()).build());
+        }
+
+        /**
+         * Required - Contains statistics about the Java Virtual Machines (JVMs) used by
+         * selected nodes.
+         * <p>
+         * API name: {@code jvm}
+         */
+        public final Builder jvm(ClusterJvm value) {
+            this.jvm = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about the Java Virtual Machines (JVMs) used by
+         * selected nodes.
+         * <p>
+         * API name: {@code jvm}
+         */
+        public final Builder jvm(Function<ClusterJvm.Builder, ObjectBuilder<ClusterJvm>> fn) {
+            return this.jvm(fn.apply(new ClusterJvm.Builder()).build());
+        }
+
+        /**
+         * Required - Contains statistics about the transport and HTTP networks used by
+         * selected nodes.
+         * <p>
+         * API name: {@code network_types}
+         */
+        public final Builder networkTypes(ClusterNetworkTypes value) {
+            this.networkTypes = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about the transport and HTTP networks used by
+         * selected nodes.
+         * <p>
+         * API name: {@code network_types}
+         */
+        public final Builder networkTypes(Function<ClusterNetworkTypes.Builder, ObjectBuilder<ClusterNetworkTypes>> fn) {
+            return this.networkTypes(fn.apply(new ClusterNetworkTypes.Builder()).build());
+        }
+
+        /**
+         * Required - Contains statistics about the operating systems used by selected
+         * nodes.
+         * <p>
+         * API name: {@code os}
+         */
+        public final Builder os(ClusterOperatingSystem value) {
+            this.os = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about the operating systems used by selected
+         * nodes.
+         * <p>
+         * API name: {@code os}
+         */
+        public final Builder os(Function<ClusterOperatingSystem.Builder, ObjectBuilder<ClusterOperatingSystem>> fn) {
+            return this.os(fn.apply(new ClusterOperatingSystem.Builder()).build());
+        }
+
+        /**
+         * Required - Contains statistics about Elasticsearch distributions installed on
+         * selected nodes.
+         * <p>
+         * API name: {@code packaging_types}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>packagingTypes</code>.
+         */
+        public final Builder packagingTypes(List<NodePackagingType> list) {
+            this.packagingTypes = _listAddAll(this.packagingTypes, list);
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about Elasticsearch distributions installed on
+         * selected nodes.
+         * <p>
+         * API name: {@code packaging_types}
+         * <p>
+         * Adds one or more values to <code>packagingTypes</code>.
+         */
+        public final Builder packagingTypes(NodePackagingType value, NodePackagingType... values) {
+            this.packagingTypes = _listAdd(this.packagingTypes, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about Elasticsearch distributions installed on
+         * selected nodes.
+         * <p>
+         * API name: {@code packaging_types}
+         * <p>
+         * Adds a value to <code>packagingTypes</code> using a builder lambda.
+         */
+        public final Builder packagingTypes(Function<NodePackagingType.Builder, ObjectBuilder<NodePackagingType>> fn) {
+            return packagingTypes(fn.apply(new NodePackagingType.Builder()).build());
+        }
+
+        /**
+         * Required - Contains statistics about installed plugins and modules by
+         * selected nodes.
+         * <p>
+         * API name: {@code plugins}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>plugins</code>.
+         */
+        public final Builder plugins(List<PluginStats> list) {
+            this.plugins = _listAddAll(this.plugins, list);
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about installed plugins and modules by
+         * selected nodes.
+         * <p>
+         * API name: {@code plugins}
+         * <p>
+         * Adds one or more values to <code>plugins</code>.
+         */
+        public final Builder plugins(PluginStats value, PluginStats... values) {
+            this.plugins = _listAdd(this.plugins, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about installed plugins and modules by
+         * selected nodes.
+         * <p>
+         * API name: {@code plugins}
+         * <p>
+         * Adds a value to <code>plugins</code> using a builder lambda.
+         */
+        public final Builder plugins(Function<PluginStats.Builder, ObjectBuilder<PluginStats>> fn) {
+            return plugins(fn.apply(new PluginStats.Builder()).build());
+        }
+
+        /**
+         * Required - Contains statistics about processes used by selected nodes.
+         * <p>
+         * API name: {@code process}
+         */
+        public final Builder process(ClusterProcess value) {
+            this.process = value;
+            return this;
+        }
+
+        /**
+         * Required - Contains statistics about processes used by selected nodes.
+         * <p>
+         * API name: {@code process}
+         */
+        public final Builder process(Function<ClusterProcess.Builder, ObjectBuilder<ClusterProcess>> fn) {
+            return this.process(fn.apply(new ClusterProcess.Builder()).build());
+        }
+
+        /**
+         * Required - Array of Elasticsearch versions used on selected nodes.
+         * <p>
+         * API name: {@code versions}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>versions</code>.
+         */
+        public final Builder versions(List<String> list) {
+            this.versions = _listAddAll(this.versions, list);
+            return this;
+        }
+
+        /**
+         * Required - Array of Elasticsearch versions used on selected nodes.
+         * <p>
+         * API name: {@code versions}
+         * <p>
+         * Adds one or more values to <code>versions</code>.
+         */
+        public final Builder versions(String value, String... values) {
+            this.versions = _listAdd(this.versions, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link ClusterNodes}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterNodes build() {
+            _checkSingleUse();
+
+            return new ClusterNodes(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterNodes}
+     */
+    public static final JsonpDeserializer<ClusterNodes> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterNodes::setupClusterNodesDeserializer
+    );
+
+    protected static void setupClusterNodesDeserializer(ObjectDeserializer<ClusterNodes.Builder> op) {
+
+        op.add(Builder::count, ClusterNodeCount._DESERIALIZER, "count");
+        op.add(
+            Builder::discoveryTypes,
+            JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.integerDeserializer()),
+            "discovery_types"
+        );
+        op.add(Builder::fs, ClusterFileSystem._DESERIALIZER, "fs");
+        op.add(Builder::ingest, ClusterIngest._DESERIALIZER, "ingest");
+        op.add(Builder::jvm, ClusterJvm._DESERIALIZER, "jvm");
+        op.add(Builder::networkTypes, ClusterNetworkTypes._DESERIALIZER, "network_types");
+        op.add(Builder::os, ClusterOperatingSystem._DESERIALIZER, "os");
+        op.add(Builder::packagingTypes, JsonpDeserializer.arrayDeserializer(NodePackagingType._DESERIALIZER), "packaging_types");
+        op.add(Builder::plugins, JsonpDeserializer.arrayDeserializer(PluginStats._DESERIALIZER), "plugins");
+        op.add(Builder::process, ClusterProcess._DESERIALIZER, "process");
+        op.add(Builder::versions, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "versions");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterOperatingSystem.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterOperatingSystem.java
index 5e17433aa7..e32487c7cb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterOperatingSystem.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterOperatingSystem.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,319 +45,313 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.stats.ClusterOperatingSystem
 
 @JsonpDeserializable
 public class ClusterOperatingSystem implements JsonpSerializable {
-	private final int allocatedProcessors;
-
-	private final int availableProcessors;
-
-	private final OperatingSystemMemoryInfo mem;
-
-	private final List<ClusterOperatingSystemName> names;
-
-	private final List<ClusterOperatingSystemPrettyName> prettyNames;
-
-	private final List<ClusterOperatingSystemArchitecture> architectures;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterOperatingSystem(Builder builder) {
-
-		this.allocatedProcessors = ApiTypeHelper.requireNonNull(builder.allocatedProcessors, this,
-				"allocatedProcessors");
-		this.availableProcessors = ApiTypeHelper.requireNonNull(builder.availableProcessors, this,
-				"availableProcessors");
-		this.mem = ApiTypeHelper.requireNonNull(builder.mem, this, "mem");
-		this.names = ApiTypeHelper.unmodifiableRequired(builder.names, this, "names");
-		this.prettyNames = ApiTypeHelper.unmodifiableRequired(builder.prettyNames, this, "prettyNames");
-		this.architectures = ApiTypeHelper.unmodifiable(builder.architectures);
-
-	}
-
-	public static ClusterOperatingSystem of(Function<Builder, ObjectBuilder<ClusterOperatingSystem>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code allocated_processors}
-	 */
-	public final int allocatedProcessors() {
-		return this.allocatedProcessors;
-	}
+    private final int allocatedProcessors;
+
+    private final int availableProcessors;
+
+    private final OperatingSystemMemoryInfo mem;
+
+    private final List<ClusterOperatingSystemName> names;
+
+    private final List<ClusterOperatingSystemPrettyName> prettyNames;
+
+    private final List<ClusterOperatingSystemArchitecture> architectures;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterOperatingSystem(Builder builder) {
+
+        this.allocatedProcessors = ApiTypeHelper.requireNonNull(builder.allocatedProcessors, this, "allocatedProcessors");
+        this.availableProcessors = ApiTypeHelper.requireNonNull(builder.availableProcessors, this, "availableProcessors");
+        this.mem = ApiTypeHelper.requireNonNull(builder.mem, this, "mem");
+        this.names = ApiTypeHelper.unmodifiableRequired(builder.names, this, "names");
+        this.prettyNames = ApiTypeHelper.unmodifiableRequired(builder.prettyNames, this, "prettyNames");
+        this.architectures = ApiTypeHelper.unmodifiable(builder.architectures);
+
+    }
+
+    public static ClusterOperatingSystem of(Function<Builder, ObjectBuilder<ClusterOperatingSystem>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code allocated_processors}
+     */
+    public final int allocatedProcessors() {
+        return this.allocatedProcessors;
+    }
 
-	/**
-	 * Required - API name: {@code available_processors}
-	 */
-	public final int availableProcessors() {
-		return this.availableProcessors;
-	}
+    /**
+     * Required - API name: {@code available_processors}
+     */
+    public final int availableProcessors() {
+        return this.availableProcessors;
+    }
 
-	/**
-	 * Required - API name: {@code mem}
-	 */
-	public final OperatingSystemMemoryInfo mem() {
-		return this.mem;
-	}
+    /**
+     * Required - API name: {@code mem}
+     */
+    public final OperatingSystemMemoryInfo mem() {
+        return this.mem;
+    }
 
-	/**
-	 * Required - API name: {@code names}
-	 */
-	public final List<ClusterOperatingSystemName> names() {
-		return this.names;
-	}
+    /**
+     * Required - API name: {@code names}
+     */
+    public final List<ClusterOperatingSystemName> names() {
+        return this.names;
+    }
 
-	/**
-	 * Required - API name: {@code pretty_names}
-	 */
-	public final List<ClusterOperatingSystemPrettyName> prettyNames() {
-		return this.prettyNames;
-	}
-
-	/**
-	 * API name: {@code architectures}
-	 */
-	public final List<ClusterOperatingSystemArchitecture> architectures() {
-		return this.architectures;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("allocated_processors");
-		generator.write(this.allocatedProcessors);
-
-		generator.writeKey("available_processors");
-		generator.write(this.availableProcessors);
-
-		generator.writeKey("mem");
-		this.mem.serialize(generator, mapper);
-
-		if (ApiTypeHelper.isDefined(this.names)) {
-			generator.writeKey("names");
-			generator.writeStartArray();
-			for (ClusterOperatingSystemName item0 : this.names) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.prettyNames)) {
-			generator.writeKey("pretty_names");
-			generator.writeStartArray();
-			for (ClusterOperatingSystemPrettyName item0 : this.prettyNames) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.architectures)) {
-			generator.writeKey("architectures");
-			generator.writeStartArray();
-			for (ClusterOperatingSystemArchitecture item0 : this.architectures) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterOperatingSystem}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterOperatingSystem> {
-		private Integer allocatedProcessors;
-
-		private Integer availableProcessors;
-
-		private OperatingSystemMemoryInfo mem;
-
-		private List<ClusterOperatingSystemName> names;
-
-		private List<ClusterOperatingSystemPrettyName> prettyNames;
-
-		@Nullable
-		private List<ClusterOperatingSystemArchitecture> architectures;
-
-		/**
-		 * Required - API name: {@code allocated_processors}
-		 */
-		public final Builder allocatedProcessors(int value) {
-			this.allocatedProcessors = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code available_processors}
-		 */
-		public final Builder availableProcessors(int value) {
-			this.availableProcessors = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mem}
-		 */
-		public final Builder mem(OperatingSystemMemoryInfo value) {
-			this.mem = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mem}
-		 */
-		public final Builder mem(
-				Function<OperatingSystemMemoryInfo.Builder, ObjectBuilder<OperatingSystemMemoryInfo>> fn) {
-			return this.mem(fn.apply(new OperatingSystemMemoryInfo.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code names}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>names</code>.
-		 */
-		public final Builder names(List<ClusterOperatingSystemName> list) {
-			this.names = _listAddAll(this.names, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code names}
-		 * <p>
-		 * Adds one or more values to <code>names</code>.
-		 */
-		public final Builder names(ClusterOperatingSystemName value, ClusterOperatingSystemName... values) {
-			this.names = _listAdd(this.names, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code names}
-		 * <p>
-		 * Adds a value to <code>names</code> using a builder lambda.
-		 */
-		public final Builder names(
-				Function<ClusterOperatingSystemName.Builder, ObjectBuilder<ClusterOperatingSystemName>> fn) {
-			return names(fn.apply(new ClusterOperatingSystemName.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code pretty_names}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>prettyNames</code>.
-		 */
-		public final Builder prettyNames(List<ClusterOperatingSystemPrettyName> list) {
-			this.prettyNames = _listAddAll(this.prettyNames, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code pretty_names}
-		 * <p>
-		 * Adds one or more values to <code>prettyNames</code>.
-		 */
-		public final Builder prettyNames(ClusterOperatingSystemPrettyName value,
-				ClusterOperatingSystemPrettyName... values) {
-			this.prettyNames = _listAdd(this.prettyNames, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code pretty_names}
-		 * <p>
-		 * Adds a value to <code>prettyNames</code> using a builder lambda.
-		 */
-		public final Builder prettyNames(
-				Function<ClusterOperatingSystemPrettyName.Builder, ObjectBuilder<ClusterOperatingSystemPrettyName>> fn) {
-			return prettyNames(fn.apply(new ClusterOperatingSystemPrettyName.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code architectures}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>architectures</code>.
-		 */
-		public final Builder architectures(List<ClusterOperatingSystemArchitecture> list) {
-			this.architectures = _listAddAll(this.architectures, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code architectures}
-		 * <p>
-		 * Adds one or more values to <code>architectures</code>.
-		 */
-		public final Builder architectures(ClusterOperatingSystemArchitecture value,
-				ClusterOperatingSystemArchitecture... values) {
-			this.architectures = _listAdd(this.architectures, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code architectures}
-		 * <p>
-		 * Adds a value to <code>architectures</code> using a builder lambda.
-		 */
-		public final Builder architectures(
-				Function<ClusterOperatingSystemArchitecture.Builder,
-						ObjectBuilder<ClusterOperatingSystemArchitecture>> fn) {
-			return architectures(fn.apply(new ClusterOperatingSystemArchitecture.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ClusterOperatingSystem}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterOperatingSystem build() {
-			_checkSingleUse();
-
-			return new ClusterOperatingSystem(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterOperatingSystem}
-	 */
-	public static final JsonpDeserializer<ClusterOperatingSystem> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClusterOperatingSystem::setupClusterOperatingSystemDeserializer);
-
-	protected static void setupClusterOperatingSystemDeserializer(
-			ObjectDeserializer<ClusterOperatingSystem.Builder> op) {
-
-		op.add(Builder::allocatedProcessors, JsonpDeserializer.integerDeserializer(), "allocated_processors");
-		op.add(Builder::availableProcessors, JsonpDeserializer.integerDeserializer(), "available_processors");
-		op.add(Builder::mem, OperatingSystemMemoryInfo._DESERIALIZER, "mem");
-		op.add(Builder::names, JsonpDeserializer.arrayDeserializer(ClusterOperatingSystemName._DESERIALIZER), "names");
-		op.add(Builder::prettyNames,
-				JsonpDeserializer.arrayDeserializer(ClusterOperatingSystemPrettyName._DESERIALIZER), "pretty_names");
-		op.add(Builder::architectures,
-				JsonpDeserializer.arrayDeserializer(ClusterOperatingSystemArchitecture._DESERIALIZER), "architectures");
-
-	}
+    /**
+     * Required - API name: {@code pretty_names}
+     */
+    public final List<ClusterOperatingSystemPrettyName> prettyNames() {
+        return this.prettyNames;
+    }
+
+    /**
+     * API name: {@code architectures}
+     */
+    public final List<ClusterOperatingSystemArchitecture> architectures() {
+        return this.architectures;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("allocated_processors");
+        generator.write(this.allocatedProcessors);
+
+        generator.writeKey("available_processors");
+        generator.write(this.availableProcessors);
+
+        generator.writeKey("mem");
+        this.mem.serialize(generator, mapper);
+
+        if (ApiTypeHelper.isDefined(this.names)) {
+            generator.writeKey("names");
+            generator.writeStartArray();
+            for (ClusterOperatingSystemName item0 : this.names) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.prettyNames)) {
+            generator.writeKey("pretty_names");
+            generator.writeStartArray();
+            for (ClusterOperatingSystemPrettyName item0 : this.prettyNames) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.architectures)) {
+            generator.writeKey("architectures");
+            generator.writeStartArray();
+            for (ClusterOperatingSystemArchitecture item0 : this.architectures) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterOperatingSystem}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterOperatingSystem> {
+        private Integer allocatedProcessors;
+
+        private Integer availableProcessors;
+
+        private OperatingSystemMemoryInfo mem;
+
+        private List<ClusterOperatingSystemName> names;
+
+        private List<ClusterOperatingSystemPrettyName> prettyNames;
+
+        @Nullable
+        private List<ClusterOperatingSystemArchitecture> architectures;
+
+        /**
+         * Required - API name: {@code allocated_processors}
+         */
+        public final Builder allocatedProcessors(int value) {
+            this.allocatedProcessors = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code available_processors}
+         */
+        public final Builder availableProcessors(int value) {
+            this.availableProcessors = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mem}
+         */
+        public final Builder mem(OperatingSystemMemoryInfo value) {
+            this.mem = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mem}
+         */
+        public final Builder mem(Function<OperatingSystemMemoryInfo.Builder, ObjectBuilder<OperatingSystemMemoryInfo>> fn) {
+            return this.mem(fn.apply(new OperatingSystemMemoryInfo.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code names}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>names</code>.
+         */
+        public final Builder names(List<ClusterOperatingSystemName> list) {
+            this.names = _listAddAll(this.names, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code names}
+         * <p>
+         * Adds one or more values to <code>names</code>.
+         */
+        public final Builder names(ClusterOperatingSystemName value, ClusterOperatingSystemName... values) {
+            this.names = _listAdd(this.names, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code names}
+         * <p>
+         * Adds a value to <code>names</code> using a builder lambda.
+         */
+        public final Builder names(Function<ClusterOperatingSystemName.Builder, ObjectBuilder<ClusterOperatingSystemName>> fn) {
+            return names(fn.apply(new ClusterOperatingSystemName.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code pretty_names}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>prettyNames</code>.
+         */
+        public final Builder prettyNames(List<ClusterOperatingSystemPrettyName> list) {
+            this.prettyNames = _listAddAll(this.prettyNames, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code pretty_names}
+         * <p>
+         * Adds one or more values to <code>prettyNames</code>.
+         */
+        public final Builder prettyNames(ClusterOperatingSystemPrettyName value, ClusterOperatingSystemPrettyName... values) {
+            this.prettyNames = _listAdd(this.prettyNames, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code pretty_names}
+         * <p>
+         * Adds a value to <code>prettyNames</code> using a builder lambda.
+         */
+        public final Builder prettyNames(
+            Function<ClusterOperatingSystemPrettyName.Builder, ObjectBuilder<ClusterOperatingSystemPrettyName>> fn
+        ) {
+            return prettyNames(fn.apply(new ClusterOperatingSystemPrettyName.Builder()).build());
+        }
+
+        /**
+         * API name: {@code architectures}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>architectures</code>.
+         */
+        public final Builder architectures(List<ClusterOperatingSystemArchitecture> list) {
+            this.architectures = _listAddAll(this.architectures, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code architectures}
+         * <p>
+         * Adds one or more values to <code>architectures</code>.
+         */
+        public final Builder architectures(ClusterOperatingSystemArchitecture value, ClusterOperatingSystemArchitecture... values) {
+            this.architectures = _listAdd(this.architectures, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code architectures}
+         * <p>
+         * Adds a value to <code>architectures</code> using a builder lambda.
+         */
+        public final Builder architectures(
+            Function<ClusterOperatingSystemArchitecture.Builder, ObjectBuilder<ClusterOperatingSystemArchitecture>> fn
+        ) {
+            return architectures(fn.apply(new ClusterOperatingSystemArchitecture.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ClusterOperatingSystem}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterOperatingSystem build() {
+            _checkSingleUse();
+
+            return new ClusterOperatingSystem(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterOperatingSystem}
+     */
+    public static final JsonpDeserializer<ClusterOperatingSystem> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterOperatingSystem::setupClusterOperatingSystemDeserializer
+    );
+
+    protected static void setupClusterOperatingSystemDeserializer(ObjectDeserializer<ClusterOperatingSystem.Builder> op) {
+
+        op.add(Builder::allocatedProcessors, JsonpDeserializer.integerDeserializer(), "allocated_processors");
+        op.add(Builder::availableProcessors, JsonpDeserializer.integerDeserializer(), "available_processors");
+        op.add(Builder::mem, OperatingSystemMemoryInfo._DESERIALIZER, "mem");
+        op.add(Builder::names, JsonpDeserializer.arrayDeserializer(ClusterOperatingSystemName._DESERIALIZER), "names");
+        op.add(Builder::prettyNames, JsonpDeserializer.arrayDeserializer(ClusterOperatingSystemPrettyName._DESERIALIZER), "pretty_names");
+        op.add(
+            Builder::architectures,
+            JsonpDeserializer.arrayDeserializer(ClusterOperatingSystemArchitecture._DESERIALIZER),
+            "architectures"
+        );
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterOperatingSystemArchitecture.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterOperatingSystemArchitecture.java
index 72f334d290..5539afb74c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterOperatingSystemArchitecture.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterOperatingSystemArchitecture.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,120 +43,118 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.stats.ClusterOperatingSystemArchitecture
 
-
 @JsonpDeserializable
 public class ClusterOperatingSystemArchitecture implements JsonpSerializable {
-	private final int count;
-
-	private final String arch;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterOperatingSystemArchitecture(Builder builder) {
-
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.arch = ApiTypeHelper.requireNonNull(builder.arch, this, "arch");
-
-	}
-
-	public static ClusterOperatingSystemArchitecture of(
-			Function<Builder, ObjectBuilder<ClusterOperatingSystemArchitecture>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code count}
-	 */
-	public final int count() {
-		return this.count;
-	}
-
-	/**
-	 * Required - API name: {@code arch}
-	 */
-	public final String arch() {
-		return this.arch;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("count");
-		generator.write(this.count);
-
-		generator.writeKey("arch");
-		generator.write(this.arch);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterOperatingSystemArchitecture}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterOperatingSystemArchitecture> {
-		private Integer count;
-
-		private String arch;
-
-		/**
-		 * Required - API name: {@code count}
-		 */
-		public final Builder count(int value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code arch}
-		 */
-		public final Builder arch(String value) {
-			this.arch = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ClusterOperatingSystemArchitecture}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterOperatingSystemArchitecture build() {
-			_checkSingleUse();
-
-			return new ClusterOperatingSystemArchitecture(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterOperatingSystemArchitecture}
-	 */
-	public static final JsonpDeserializer<ClusterOperatingSystemArchitecture> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new,
-					ClusterOperatingSystemArchitecture::setupClusterOperatingSystemArchitectureDeserializer);
-
-	protected static void setupClusterOperatingSystemArchitectureDeserializer(
-			ObjectDeserializer<ClusterOperatingSystemArchitecture.Builder> op) {
-
-		op.add(Builder::count, JsonpDeserializer.integerDeserializer(), "count");
-		op.add(Builder::arch, JsonpDeserializer.stringDeserializer(), "arch");
-
-	}
+    private final int count;
+
+    private final String arch;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterOperatingSystemArchitecture(Builder builder) {
+
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.arch = ApiTypeHelper.requireNonNull(builder.arch, this, "arch");
+
+    }
+
+    public static ClusterOperatingSystemArchitecture of(Function<Builder, ObjectBuilder<ClusterOperatingSystemArchitecture>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code count}
+     */
+    public final int count() {
+        return this.count;
+    }
+
+    /**
+     * Required - API name: {@code arch}
+     */
+    public final String arch() {
+        return this.arch;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("count");
+        generator.write(this.count);
+
+        generator.writeKey("arch");
+        generator.write(this.arch);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterOperatingSystemArchitecture}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterOperatingSystemArchitecture> {
+        private Integer count;
+
+        private String arch;
+
+        /**
+         * Required - API name: {@code count}
+         */
+        public final Builder count(int value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code arch}
+         */
+        public final Builder arch(String value) {
+            this.arch = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ClusterOperatingSystemArchitecture}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterOperatingSystemArchitecture build() {
+            _checkSingleUse();
+
+            return new ClusterOperatingSystemArchitecture(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterOperatingSystemArchitecture}
+     */
+    public static final JsonpDeserializer<ClusterOperatingSystemArchitecture> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterOperatingSystemArchitecture::setupClusterOperatingSystemArchitectureDeserializer
+    );
+
+    protected static void setupClusterOperatingSystemArchitectureDeserializer(
+        ObjectDeserializer<ClusterOperatingSystemArchitecture.Builder> op
+    ) {
+
+        op.add(Builder::count, JsonpDeserializer.integerDeserializer(), "count");
+        op.add(Builder::arch, JsonpDeserializer.stringDeserializer(), "arch");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterOperatingSystemName.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterOperatingSystemName.java
index 60443c349b..a9cdc1b36f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterOperatingSystemName.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterOperatingSystemName.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,117 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.stats.ClusterOperatingSystemName
 
 @JsonpDeserializable
 public class ClusterOperatingSystemName implements JsonpSerializable {
-	private final int count;
-
-	private final String name;
-
-	// ---------------------------------------------------------------------------------------------
+    private final int count;
 
-	private ClusterOperatingSystemName(Builder builder) {
+    private final String name;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+    private ClusterOperatingSystemName(Builder builder) {
 
-	}
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
 
-	public static ClusterOperatingSystemName of(Function<Builder, ObjectBuilder<ClusterOperatingSystemName>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code count}
-	 */
-	public final int count() {
-		return this.count;
-	}
+    public static ClusterOperatingSystemName of(Function<Builder, ObjectBuilder<ClusterOperatingSystemName>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
+    /**
+     * Required - API name: {@code count}
+     */
+    public final int count() {
+        return this.count;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("count");
-		generator.write(this.count);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("name");
-		generator.write(this.name);
+        generator.writeKey("count");
+        generator.write(this.count);
 
-	}
+        generator.writeKey("name");
+        generator.write(this.name);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link ClusterOperatingSystemName}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterOperatingSystemName> {
-		private Integer count;
+    /**
+     * Builder for {@link ClusterOperatingSystemName}.
+     */
 
-		private String name;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterOperatingSystemName> {
+        private Integer count;
 
-		/**
-		 * Required - API name: {@code count}
-		 */
-		public final Builder count(int value) {
-			this.count = value;
-			return this;
-		}
+        private String name;
 
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code count}
+         */
+        public final Builder count(int value) {
+            this.count = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link ClusterOperatingSystemName}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterOperatingSystemName build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
 
-			return new ClusterOperatingSystemName(this);
-		}
-	}
+        /**
+         * Builds a {@link ClusterOperatingSystemName}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterOperatingSystemName build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new ClusterOperatingSystemName(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link ClusterOperatingSystemName}
-	 */
-	public static final JsonpDeserializer<ClusterOperatingSystemName> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClusterOperatingSystemName::setupClusterOperatingSystemNameDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupClusterOperatingSystemNameDeserializer(
-			ObjectDeserializer<ClusterOperatingSystemName.Builder> op) {
+    /**
+     * Json deserializer for {@link ClusterOperatingSystemName}
+     */
+    public static final JsonpDeserializer<ClusterOperatingSystemName> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterOperatingSystemName::setupClusterOperatingSystemNameDeserializer
+    );
 
-		op.add(Builder::count, JsonpDeserializer.integerDeserializer(), "count");
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+    protected static void setupClusterOperatingSystemNameDeserializer(ObjectDeserializer<ClusterOperatingSystemName.Builder> op) {
 
-	}
+        op.add(Builder::count, JsonpDeserializer.integerDeserializer(), "count");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterOperatingSystemPrettyName.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterOperatingSystemPrettyName.java
index 99eb568637..879313400f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterOperatingSystemPrettyName.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterOperatingSystemPrettyName.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,118 +43,118 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.stats.ClusterOperatingSystemPrettyName
 
 @JsonpDeserializable
 public class ClusterOperatingSystemPrettyName implements JsonpSerializable {
-	private final int count;
-
-	private final String prettyName;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterOperatingSystemPrettyName(Builder builder) {
-
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.prettyName = ApiTypeHelper.requireNonNull(builder.prettyName, this, "prettyName");
-
-	}
-
-	public static ClusterOperatingSystemPrettyName of(
-			Function<Builder, ObjectBuilder<ClusterOperatingSystemPrettyName>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code count}
-	 */
-	public final int count() {
-		return this.count;
-	}
-
-	/**
-	 * Required - API name: {@code pretty_name}
-	 */
-	public final String prettyName() {
-		return this.prettyName;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("count");
-		generator.write(this.count);
-
-		generator.writeKey("pretty_name");
-		generator.write(this.prettyName);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterOperatingSystemPrettyName}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterOperatingSystemPrettyName> {
-		private Integer count;
-
-		private String prettyName;
-
-		/**
-		 * Required - API name: {@code count}
-		 */
-		public final Builder count(int value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code pretty_name}
-		 */
-		public final Builder prettyName(String value) {
-			this.prettyName = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ClusterOperatingSystemPrettyName}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterOperatingSystemPrettyName build() {
-			_checkSingleUse();
-
-			return new ClusterOperatingSystemPrettyName(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterOperatingSystemPrettyName}
-	 */
-	public static final JsonpDeserializer<ClusterOperatingSystemPrettyName> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClusterOperatingSystemPrettyName::setupClusterOperatingSystemPrettyNameDeserializer);
-
-	protected static void setupClusterOperatingSystemPrettyNameDeserializer(
-			ObjectDeserializer<ClusterOperatingSystemPrettyName.Builder> op) {
-
-		op.add(Builder::count, JsonpDeserializer.integerDeserializer(), "count");
-		op.add(Builder::prettyName, JsonpDeserializer.stringDeserializer(), "pretty_name");
-
-	}
+    private final int count;
+
+    private final String prettyName;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterOperatingSystemPrettyName(Builder builder) {
+
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.prettyName = ApiTypeHelper.requireNonNull(builder.prettyName, this, "prettyName");
+
+    }
+
+    public static ClusterOperatingSystemPrettyName of(Function<Builder, ObjectBuilder<ClusterOperatingSystemPrettyName>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code count}
+     */
+    public final int count() {
+        return this.count;
+    }
+
+    /**
+     * Required - API name: {@code pretty_name}
+     */
+    public final String prettyName() {
+        return this.prettyName;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("count");
+        generator.write(this.count);
+
+        generator.writeKey("pretty_name");
+        generator.write(this.prettyName);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterOperatingSystemPrettyName}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterOperatingSystemPrettyName> {
+        private Integer count;
+
+        private String prettyName;
+
+        /**
+         * Required - API name: {@code count}
+         */
+        public final Builder count(int value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code pretty_name}
+         */
+        public final Builder prettyName(String value) {
+            this.prettyName = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ClusterOperatingSystemPrettyName}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterOperatingSystemPrettyName build() {
+            _checkSingleUse();
+
+            return new ClusterOperatingSystemPrettyName(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterOperatingSystemPrettyName}
+     */
+    public static final JsonpDeserializer<ClusterOperatingSystemPrettyName> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterOperatingSystemPrettyName::setupClusterOperatingSystemPrettyNameDeserializer
+    );
+
+    protected static void setupClusterOperatingSystemPrettyNameDeserializer(
+        ObjectDeserializer<ClusterOperatingSystemPrettyName.Builder> op
+    ) {
+
+        op.add(Builder::count, JsonpDeserializer.integerDeserializer(), "count");
+        op.add(Builder::prettyName, JsonpDeserializer.stringDeserializer(), "pretty_name");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterProcess.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterProcess.java
index 6b76bbe045..9e683eedd0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterProcess.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterProcess.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,133 +43,132 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: cluster.stats.ClusterProcess
 
 @JsonpDeserializable
 public class ClusterProcess implements JsonpSerializable {
-	private final ClusterProcessCpu cpu;
-
-	private final ClusterProcessOpenFileDescriptors openFileDescriptors;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterProcess(Builder builder) {
-
-		this.cpu = ApiTypeHelper.requireNonNull(builder.cpu, this, "cpu");
-		this.openFileDescriptors = ApiTypeHelper.requireNonNull(builder.openFileDescriptors, this,
-				"openFileDescriptors");
-
-	}
-
-	public static ClusterProcess of(Function<Builder, ObjectBuilder<ClusterProcess>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code cpu}
-	 */
-	public final ClusterProcessCpu cpu() {
-		return this.cpu;
-	}
-
-	/**
-	 * Required - API name: {@code open_file_descriptors}
-	 */
-	public final ClusterProcessOpenFileDescriptors openFileDescriptors() {
-		return this.openFileDescriptors;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("cpu");
-		this.cpu.serialize(generator, mapper);
-
-		generator.writeKey("open_file_descriptors");
-		this.openFileDescriptors.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterProcess}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterProcess> {
-		private ClusterProcessCpu cpu;
-
-		private ClusterProcessOpenFileDescriptors openFileDescriptors;
-
-		/**
-		 * Required - API name: {@code cpu}
-		 */
-		public final Builder cpu(ClusterProcessCpu value) {
-			this.cpu = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code cpu}
-		 */
-		public final Builder cpu(Function<ClusterProcessCpu.Builder, ObjectBuilder<ClusterProcessCpu>> fn) {
-			return this.cpu(fn.apply(new ClusterProcessCpu.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code open_file_descriptors}
-		 */
-		public final Builder openFileDescriptors(ClusterProcessOpenFileDescriptors value) {
-			this.openFileDescriptors = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code open_file_descriptors}
-		 */
-		public final Builder openFileDescriptors(
-				Function<ClusterProcessOpenFileDescriptors.Builder, ObjectBuilder<ClusterProcessOpenFileDescriptors>> fn) {
-			return this.openFileDescriptors(fn.apply(new ClusterProcessOpenFileDescriptors.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ClusterProcess}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterProcess build() {
-			_checkSingleUse();
-
-			return new ClusterProcess(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterProcess}
-	 */
-	public static final JsonpDeserializer<ClusterProcess> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ClusterProcess::setupClusterProcessDeserializer);
-
-	protected static void setupClusterProcessDeserializer(ObjectDeserializer<ClusterProcess.Builder> op) {
-
-		op.add(Builder::cpu, ClusterProcessCpu._DESERIALIZER, "cpu");
-		op.add(Builder::openFileDescriptors, ClusterProcessOpenFileDescriptors._DESERIALIZER, "open_file_descriptors");
-
-	}
+    private final ClusterProcessCpu cpu;
+
+    private final ClusterProcessOpenFileDescriptors openFileDescriptors;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterProcess(Builder builder) {
+
+        this.cpu = ApiTypeHelper.requireNonNull(builder.cpu, this, "cpu");
+        this.openFileDescriptors = ApiTypeHelper.requireNonNull(builder.openFileDescriptors, this, "openFileDescriptors");
+
+    }
+
+    public static ClusterProcess of(Function<Builder, ObjectBuilder<ClusterProcess>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code cpu}
+     */
+    public final ClusterProcessCpu cpu() {
+        return this.cpu;
+    }
+
+    /**
+     * Required - API name: {@code open_file_descriptors}
+     */
+    public final ClusterProcessOpenFileDescriptors openFileDescriptors() {
+        return this.openFileDescriptors;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("cpu");
+        this.cpu.serialize(generator, mapper);
+
+        generator.writeKey("open_file_descriptors");
+        this.openFileDescriptors.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterProcess}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterProcess> {
+        private ClusterProcessCpu cpu;
+
+        private ClusterProcessOpenFileDescriptors openFileDescriptors;
+
+        /**
+         * Required - API name: {@code cpu}
+         */
+        public final Builder cpu(ClusterProcessCpu value) {
+            this.cpu = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code cpu}
+         */
+        public final Builder cpu(Function<ClusterProcessCpu.Builder, ObjectBuilder<ClusterProcessCpu>> fn) {
+            return this.cpu(fn.apply(new ClusterProcessCpu.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code open_file_descriptors}
+         */
+        public final Builder openFileDescriptors(ClusterProcessOpenFileDescriptors value) {
+            this.openFileDescriptors = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code open_file_descriptors}
+         */
+        public final Builder openFileDescriptors(
+            Function<ClusterProcessOpenFileDescriptors.Builder, ObjectBuilder<ClusterProcessOpenFileDescriptors>> fn
+        ) {
+            return this.openFileDescriptors(fn.apply(new ClusterProcessOpenFileDescriptors.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ClusterProcess}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterProcess build() {
+            _checkSingleUse();
+
+            return new ClusterProcess(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterProcess}
+     */
+    public static final JsonpDeserializer<ClusterProcess> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterProcess::setupClusterProcessDeserializer
+    );
+
+    protected static void setupClusterProcessDeserializer(ObjectDeserializer<ClusterProcess.Builder> op) {
+
+        op.add(Builder::cpu, ClusterProcessCpu._DESERIALIZER, "cpu");
+        op.add(Builder::openFileDescriptors, ClusterProcessOpenFileDescriptors._DESERIALIZER, "open_file_descriptors");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterProcessCpu.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterProcessCpu.java
index 6bc4e16932..7629f6b8a2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterProcessCpu.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterProcessCpu.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,92 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.stats.ClusterProcessCpu
 
 @JsonpDeserializable
 public class ClusterProcessCpu implements JsonpSerializable {
-	private final int percent;
+    private final int percent;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ClusterProcessCpu(Builder builder) {
+    private ClusterProcessCpu(Builder builder) {
 
-		this.percent = ApiTypeHelper.requireNonNull(builder.percent, this, "percent");
+        this.percent = ApiTypeHelper.requireNonNull(builder.percent, this, "percent");
 
-	}
+    }
 
-	public static ClusterProcessCpu of(Function<Builder, ObjectBuilder<ClusterProcessCpu>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ClusterProcessCpu of(Function<Builder, ObjectBuilder<ClusterProcessCpu>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code percent}
-	 */
-	public final int percent() {
-		return this.percent;
-	}
+    /**
+     * Required - API name: {@code percent}
+     */
+    public final int percent() {
+        return this.percent;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("percent");
-		generator.write(this.percent);
+        generator.writeKey("percent");
+        generator.write(this.percent);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link ClusterProcessCpu}.
-	 */
+    /**
+     * Builder for {@link ClusterProcessCpu}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterProcessCpu> {
-		private Integer percent;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterProcessCpu> {
+        private Integer percent;
 
-		/**
-		 * Required - API name: {@code percent}
-		 */
-		public final Builder percent(int value) {
-			this.percent = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code percent}
+         */
+        public final Builder percent(int value) {
+            this.percent = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link ClusterProcessCpu}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterProcessCpu build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link ClusterProcessCpu}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterProcessCpu build() {
+            _checkSingleUse();
 
-			return new ClusterProcessCpu(this);
-		}
-	}
+            return new ClusterProcessCpu(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link ClusterProcessCpu}
-	 */
-	public static final JsonpDeserializer<ClusterProcessCpu> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClusterProcessCpu::setupClusterProcessCpuDeserializer);
+    /**
+     * Json deserializer for {@link ClusterProcessCpu}
+     */
+    public static final JsonpDeserializer<ClusterProcessCpu> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterProcessCpu::setupClusterProcessCpuDeserializer
+    );
 
-	protected static void setupClusterProcessCpuDeserializer(ObjectDeserializer<ClusterProcessCpu.Builder> op) {
+    protected static void setupClusterProcessCpuDeserializer(ObjectDeserializer<ClusterProcessCpu.Builder> op) {
 
-		op.add(Builder::percent, JsonpDeserializer.integerDeserializer(), "percent");
+        op.add(Builder::percent, JsonpDeserializer.integerDeserializer(), "percent");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterProcessOpenFileDescriptors.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterProcessOpenFileDescriptors.java
index 1ca9e15d8b..6521c75980 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterProcessOpenFileDescriptors.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterProcessOpenFileDescriptors.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,142 +43,142 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.stats.ClusterProcessOpenFileDescriptors
 
 @JsonpDeserializable
 public class ClusterProcessOpenFileDescriptors implements JsonpSerializable {
-	private final long avg;
+    private final long avg;
 
-	private final long max;
-
-	private final long min;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterProcessOpenFileDescriptors(Builder builder) {
-
-		this.avg = ApiTypeHelper.requireNonNull(builder.avg, this, "avg");
-		this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
-		this.min = ApiTypeHelper.requireNonNull(builder.min, this, "min");
-
-	}
-
-	public static ClusterProcessOpenFileDescriptors of(
-			Function<Builder, ObjectBuilder<ClusterProcessOpenFileDescriptors>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code avg}
-	 */
-	public final long avg() {
-		return this.avg;
-	}
-
-	/**
-	 * Required - API name: {@code max}
-	 */
-	public final long max() {
-		return this.max;
-	}
-
-	/**
-	 * Required - API name: {@code min}
-	 */
-	public final long min() {
-		return this.min;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("avg");
-		generator.write(this.avg);
-
-		generator.writeKey("max");
-		generator.write(this.max);
-
-		generator.writeKey("min");
-		generator.write(this.min);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterProcessOpenFileDescriptors}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterProcessOpenFileDescriptors> {
-		private Long avg;
-
-		private Long max;
-
-		private Long min;
-
-		/**
-		 * Required - API name: {@code avg}
-		 */
-		public final Builder avg(long value) {
-			this.avg = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code max}
-		 */
-		public final Builder max(long value) {
-			this.max = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code min}
-		 */
-		public final Builder min(long value) {
-			this.min = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ClusterProcessOpenFileDescriptors}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterProcessOpenFileDescriptors build() {
-			_checkSingleUse();
-
-			return new ClusterProcessOpenFileDescriptors(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterProcessOpenFileDescriptors}
-	 */
-	public static final JsonpDeserializer<ClusterProcessOpenFileDescriptors> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClusterProcessOpenFileDescriptors::setupClusterProcessOpenFileDescriptorsDeserializer);
-
-	protected static void setupClusterProcessOpenFileDescriptorsDeserializer(
-			ObjectDeserializer<ClusterProcessOpenFileDescriptors.Builder> op) {
-
-		op.add(Builder::avg, JsonpDeserializer.longDeserializer(), "avg");
-		op.add(Builder::max, JsonpDeserializer.longDeserializer(), "max");
-		op.add(Builder::min, JsonpDeserializer.longDeserializer(), "min");
-
-	}
+    private final long max;
+
+    private final long min;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterProcessOpenFileDescriptors(Builder builder) {
+
+        this.avg = ApiTypeHelper.requireNonNull(builder.avg, this, "avg");
+        this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
+        this.min = ApiTypeHelper.requireNonNull(builder.min, this, "min");
+
+    }
+
+    public static ClusterProcessOpenFileDescriptors of(Function<Builder, ObjectBuilder<ClusterProcessOpenFileDescriptors>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code avg}
+     */
+    public final long avg() {
+        return this.avg;
+    }
+
+    /**
+     * Required - API name: {@code max}
+     */
+    public final long max() {
+        return this.max;
+    }
+
+    /**
+     * Required - API name: {@code min}
+     */
+    public final long min() {
+        return this.min;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("avg");
+        generator.write(this.avg);
+
+        generator.writeKey("max");
+        generator.write(this.max);
+
+        generator.writeKey("min");
+        generator.write(this.min);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterProcessOpenFileDescriptors}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterProcessOpenFileDescriptors> {
+        private Long avg;
+
+        private Long max;
+
+        private Long min;
+
+        /**
+         * Required - API name: {@code avg}
+         */
+        public final Builder avg(long value) {
+            this.avg = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code max}
+         */
+        public final Builder max(long value) {
+            this.max = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code min}
+         */
+        public final Builder min(long value) {
+            this.min = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ClusterProcessOpenFileDescriptors}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterProcessOpenFileDescriptors build() {
+            _checkSingleUse();
+
+            return new ClusterProcessOpenFileDescriptors(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterProcessOpenFileDescriptors}
+     */
+    public static final JsonpDeserializer<ClusterProcessOpenFileDescriptors> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterProcessOpenFileDescriptors::setupClusterProcessOpenFileDescriptorsDeserializer
+    );
+
+    protected static void setupClusterProcessOpenFileDescriptorsDeserializer(
+        ObjectDeserializer<ClusterProcessOpenFileDescriptors.Builder> op
+    ) {
+
+        op.add(Builder::avg, JsonpDeserializer.longDeserializer(), "avg");
+        op.add(Builder::max, JsonpDeserializer.longDeserializer(), "max");
+        op.add(Builder::min, JsonpDeserializer.longDeserializer(), "min");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterProcessor.java
index 4a16d962c7..b20b42cd8f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterProcessor.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,165 +43,164 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.stats.ClusterProcessor
 
-
 @JsonpDeserializable
 public class ClusterProcessor implements JsonpSerializable {
-	private final long count;
+    private final long count;
 
-	private final long current;
+    private final long current;
 
-	private final long failed;
+    private final long failed;
 
-	private final long timeInMillis;
+    private final long timeInMillis;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ClusterProcessor(Builder builder) {
+    private ClusterProcessor(Builder builder) {
 
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.current = ApiTypeHelper.requireNonNull(builder.current, this, "current");
-		this.failed = ApiTypeHelper.requireNonNull(builder.failed, this, "failed");
-		this.timeInMillis = ApiTypeHelper.requireNonNull(builder.timeInMillis, this, "timeInMillis");
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.current = ApiTypeHelper.requireNonNull(builder.current, this, "current");
+        this.failed = ApiTypeHelper.requireNonNull(builder.failed, this, "failed");
+        this.timeInMillis = ApiTypeHelper.requireNonNull(builder.timeInMillis, this, "timeInMillis");
 
-	}
+    }
 
-	public static ClusterProcessor of(Function<Builder, ObjectBuilder<ClusterProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ClusterProcessor of(Function<Builder, ObjectBuilder<ClusterProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code count}
-	 */
-	public final long count() {
-		return this.count;
-	}
-
-	/**
-	 * Required - API name: {@code current}
-	 */
-	public final long current() {
-		return this.current;
-	}
-
-	/**
-	 * Required - API name: {@code failed}
-	 */
-	public final long failed() {
-		return this.failed;
-	}
-
-	/**
-	 * Required - API name: {@code time_in_millis}
-	 */
-	public final long timeInMillis() {
-		return this.timeInMillis;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("count");
-		generator.write(this.count);
-
-		generator.writeKey("current");
-		generator.write(this.current);
-
-		generator.writeKey("failed");
-		generator.write(this.failed);
-
-		generator.writeKey("time_in_millis");
-		generator.write(this.timeInMillis);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterProcessor}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterProcessor> {
-		private Long count;
-
-		private Long current;
-
-		private Long failed;
-
-		private Long timeInMillis;
-
-		/**
-		 * Required - API name: {@code count}
-		 */
-		public final Builder count(long value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code current}
-		 */
-		public final Builder current(long value) {
-			this.current = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code failed}
-		 */
-		public final Builder failed(long value) {
-			this.failed = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code time_in_millis}
-		 */
-		public final Builder timeInMillis(long value) {
-			this.timeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ClusterProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterProcessor build() {
-			_checkSingleUse();
-
-			return new ClusterProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterProcessor}
-	 */
-	public static final JsonpDeserializer<ClusterProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ClusterProcessor::setupClusterProcessorDeserializer);
-
-	protected static void setupClusterProcessorDeserializer(ObjectDeserializer<ClusterProcessor.Builder> op) {
-
-		op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
-		op.add(Builder::current, JsonpDeserializer.longDeserializer(), "current");
-		op.add(Builder::failed, JsonpDeserializer.longDeserializer(), "failed");
-		op.add(Builder::timeInMillis, JsonpDeserializer.longDeserializer(), "time_in_millis");
-
-	}
+    /**
+     * Required - API name: {@code count}
+     */
+    public final long count() {
+        return this.count;
+    }
+
+    /**
+     * Required - API name: {@code current}
+     */
+    public final long current() {
+        return this.current;
+    }
+
+    /**
+     * Required - API name: {@code failed}
+     */
+    public final long failed() {
+        return this.failed;
+    }
+
+    /**
+     * Required - API name: {@code time_in_millis}
+     */
+    public final long timeInMillis() {
+        return this.timeInMillis;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("count");
+        generator.write(this.count);
+
+        generator.writeKey("current");
+        generator.write(this.current);
+
+        generator.writeKey("failed");
+        generator.write(this.failed);
+
+        generator.writeKey("time_in_millis");
+        generator.write(this.timeInMillis);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterProcessor}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterProcessor> {
+        private Long count;
+
+        private Long current;
+
+        private Long failed;
+
+        private Long timeInMillis;
+
+        /**
+         * Required - API name: {@code count}
+         */
+        public final Builder count(long value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code current}
+         */
+        public final Builder current(long value) {
+            this.current = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code failed}
+         */
+        public final Builder failed(long value) {
+            this.failed = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code time_in_millis}
+         */
+        public final Builder timeInMillis(long value) {
+            this.timeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ClusterProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterProcessor build() {
+            _checkSingleUse();
+
+            return new ClusterProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterProcessor}
+     */
+    public static final JsonpDeserializer<ClusterProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterProcessor::setupClusterProcessorDeserializer
+    );
+
+    protected static void setupClusterProcessorDeserializer(ObjectDeserializer<ClusterProcessor.Builder> op) {
+
+        op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
+        op.add(Builder::current, JsonpDeserializer.longDeserializer(), "current");
+        op.add(Builder::failed, JsonpDeserializer.longDeserializer(), "failed");
+        op.add(Builder::timeInMillis, JsonpDeserializer.longDeserializer(), "time_in_millis");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterShardMetrics.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterShardMetrics.java
index a0f1192b65..2f90f15a1a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterShardMetrics.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterShardMetrics.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,141 +43,140 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.stats.ClusterShardMetrics
 
-
 @JsonpDeserializable
 public class ClusterShardMetrics implements JsonpSerializable {
-	private final double avg;
-
-	private final double max;
-
-	private final double min;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClusterShardMetrics(Builder builder) {
-
-		this.avg = ApiTypeHelper.requireNonNull(builder.avg, this, "avg");
-		this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
-		this.min = ApiTypeHelper.requireNonNull(builder.min, this, "min");
-
-	}
-
-	public static ClusterShardMetrics of(Function<Builder, ObjectBuilder<ClusterShardMetrics>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code avg}
-	 */
-	public final double avg() {
-		return this.avg;
-	}
+    private final double avg;
 
-	/**
-	 * Required - API name: {@code max}
-	 */
-	public final double max() {
-		return this.max;
-	}
-
-	/**
-	 * Required - API name: {@code min}
-	 */
-	public final double min() {
-		return this.min;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("avg");
-		generator.write(this.avg);
-
-		generator.writeKey("max");
-		generator.write(this.max);
-
-		generator.writeKey("min");
-		generator.write(this.min);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClusterShardMetrics}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterShardMetrics> {
-		private Double avg;
-
-		private Double max;
-
-		private Double min;
-
-		/**
-		 * Required - API name: {@code avg}
-		 */
-		public final Builder avg(double value) {
-			this.avg = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code max}
-		 */
-		public final Builder max(double value) {
-			this.max = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code min}
-		 */
-		public final Builder min(double value) {
-			this.min = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ClusterShardMetrics}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClusterShardMetrics build() {
-			_checkSingleUse();
-
-			return new ClusterShardMetrics(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClusterShardMetrics}
-	 */
-	public static final JsonpDeserializer<ClusterShardMetrics> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClusterShardMetrics::setupClusterShardMetricsDeserializer);
-
-	protected static void setupClusterShardMetricsDeserializer(ObjectDeserializer<ClusterShardMetrics.Builder> op) {
-
-		op.add(Builder::avg, JsonpDeserializer.doubleDeserializer(), "avg");
-		op.add(Builder::max, JsonpDeserializer.doubleDeserializer(), "max");
-		op.add(Builder::min, JsonpDeserializer.doubleDeserializer(), "min");
-
-	}
+    private final double max;
+
+    private final double min;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClusterShardMetrics(Builder builder) {
+
+        this.avg = ApiTypeHelper.requireNonNull(builder.avg, this, "avg");
+        this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
+        this.min = ApiTypeHelper.requireNonNull(builder.min, this, "min");
+
+    }
+
+    public static ClusterShardMetrics of(Function<Builder, ObjectBuilder<ClusterShardMetrics>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code avg}
+     */
+    public final double avg() {
+        return this.avg;
+    }
+
+    /**
+     * Required - API name: {@code max}
+     */
+    public final double max() {
+        return this.max;
+    }
+
+    /**
+     * Required - API name: {@code min}
+     */
+    public final double min() {
+        return this.min;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("avg");
+        generator.write(this.avg);
+
+        generator.writeKey("max");
+        generator.write(this.max);
+
+        generator.writeKey("min");
+        generator.write(this.min);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClusterShardMetrics}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterShardMetrics> {
+        private Double avg;
+
+        private Double max;
+
+        private Double min;
+
+        /**
+         * Required - API name: {@code avg}
+         */
+        public final Builder avg(double value) {
+            this.avg = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code max}
+         */
+        public final Builder max(double value) {
+            this.max = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code min}
+         */
+        public final Builder min(double value) {
+            this.min = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ClusterShardMetrics}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClusterShardMetrics build() {
+            _checkSingleUse();
+
+            return new ClusterShardMetrics(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClusterShardMetrics}
+     */
+    public static final JsonpDeserializer<ClusterShardMetrics> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClusterShardMetrics::setupClusterShardMetricsDeserializer
+    );
+
+    protected static void setupClusterShardMetricsDeserializer(ObjectDeserializer<ClusterShardMetrics.Builder> op) {
+
+        op.add(Builder::avg, JsonpDeserializer.doubleDeserializer(), "avg");
+        op.add(Builder::max, JsonpDeserializer.doubleDeserializer(), "max");
+        op.add(Builder::min, JsonpDeserializer.doubleDeserializer(), "min");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/FieldTypes.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/FieldTypes.java
index c833ec03ca..eaf77e7abb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/FieldTypes.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/FieldTypes.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,172 +44,170 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.stats.FieldTypes
 
-
 @JsonpDeserializable
 public class FieldTypes implements JsonpSerializable {
-	private final String name;
+    private final String name;
 
-	private final int count;
+    private final int count;
 
-	private final int indexCount;
+    private final int indexCount;
 
-	@Nullable
-	private final Integer scriptCount;
+    @Nullable
+    private final Integer scriptCount;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private FieldTypes(Builder builder) {
+    private FieldTypes(Builder builder) {
 
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.indexCount = ApiTypeHelper.requireNonNull(builder.indexCount, this, "indexCount");
-		this.scriptCount = builder.scriptCount;
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.indexCount = ApiTypeHelper.requireNonNull(builder.indexCount, this, "indexCount");
+        this.scriptCount = builder.scriptCount;
 
-	}
-
-	public static FieldTypes of(Function<Builder, ObjectBuilder<FieldTypes>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Required - API name: {@code count}
-	 */
-	public final int count() {
-		return this.count;
-	}
-
-	/**
-	 * Required - API name: {@code index_count}
-	 */
-	public final int indexCount() {
-		return this.indexCount;
-	}
-
-	/**
-	 * API name: {@code script_count}
-	 */
-	@Nullable
-	public final Integer scriptCount() {
-		return this.scriptCount;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		generator.writeKey("count");
-		generator.write(this.count);
-
-		generator.writeKey("index_count");
-		generator.write(this.indexCount);
-
-		if (this.scriptCount != null) {
-			generator.writeKey("script_count");
-			generator.write(this.scriptCount);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FieldTypes}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldTypes> {
-		private String name;
-
-		private Integer count;
-
-		private Integer indexCount;
-
-		@Nullable
-		private Integer scriptCount;
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code count}
-		 */
-		public final Builder count(int value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index_count}
-		 */
-		public final Builder indexCount(int value) {
-			this.indexCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script_count}
-		 */
-		public final Builder scriptCount(@Nullable Integer value) {
-			this.scriptCount = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FieldTypes}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FieldTypes build() {
-			_checkSingleUse();
-
-			return new FieldTypes(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FieldTypes}
-	 */
-	public static final JsonpDeserializer<FieldTypes> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FieldTypes::setupFieldTypesDeserializer);
-
-	protected static void setupFieldTypesDeserializer(ObjectDeserializer<FieldTypes.Builder> op) {
-
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::count, JsonpDeserializer.integerDeserializer(), "count");
-		op.add(Builder::indexCount, JsonpDeserializer.integerDeserializer(), "index_count");
-		op.add(Builder::scriptCount, JsonpDeserializer.integerDeserializer(), "script_count");
-
-	}
+    }
+
+    public static FieldTypes of(Function<Builder, ObjectBuilder<FieldTypes>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Required - API name: {@code count}
+     */
+    public final int count() {
+        return this.count;
+    }
+
+    /**
+     * Required - API name: {@code index_count}
+     */
+    public final int indexCount() {
+        return this.indexCount;
+    }
+
+    /**
+     * API name: {@code script_count}
+     */
+    @Nullable
+    public final Integer scriptCount() {
+        return this.scriptCount;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        generator.writeKey("count");
+        generator.write(this.count);
+
+        generator.writeKey("index_count");
+        generator.write(this.indexCount);
+
+        if (this.scriptCount != null) {
+            generator.writeKey("script_count");
+            generator.write(this.scriptCount);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FieldTypes}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldTypes> {
+        private String name;
+
+        private Integer count;
+
+        private Integer indexCount;
+
+        @Nullable
+        private Integer scriptCount;
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code count}
+         */
+        public final Builder count(int value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index_count}
+         */
+        public final Builder indexCount(int value) {
+            this.indexCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script_count}
+         */
+        public final Builder scriptCount(@Nullable Integer value) {
+            this.scriptCount = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link FieldTypes}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FieldTypes build() {
+            _checkSingleUse();
+
+            return new FieldTypes(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FieldTypes}
+     */
+    public static final JsonpDeserializer<FieldTypes> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FieldTypes::setupFieldTypesDeserializer
+    );
+
+    protected static void setupFieldTypesDeserializer(ObjectDeserializer<FieldTypes.Builder> op) {
+
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::count, JsonpDeserializer.integerDeserializer(), "count");
+        op.add(Builder::indexCount, JsonpDeserializer.integerDeserializer(), "index_count");
+        op.add(Builder::scriptCount, JsonpDeserializer.integerDeserializer(), "script_count");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/FieldTypesMappings.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/FieldTypesMappings.java
index d9f59828cb..6641db1353 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/FieldTypesMappings.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/FieldTypesMappings.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,179 +45,174 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: cluster.stats.FieldTypesMappings
 
-
 @JsonpDeserializable
 public class FieldTypesMappings implements JsonpSerializable {
-	private final List<FieldTypes> fieldTypes;
-
-	private final List<RuntimeFieldTypes> runtimeFieldTypes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FieldTypesMappings(Builder builder) {
-
-		this.fieldTypes = ApiTypeHelper.unmodifiableRequired(builder.fieldTypes, this, "fieldTypes");
-		this.runtimeFieldTypes = ApiTypeHelper.unmodifiable(builder.runtimeFieldTypes);
-
-	}
-
-	public static FieldTypesMappings of(Function<Builder, ObjectBuilder<FieldTypesMappings>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code field_types}
-	 */
-	public final List<FieldTypes> fieldTypes() {
-		return this.fieldTypes;
-	}
-
-	/**
-	 * API name: {@code runtime_field_types}
-	 */
-	public final List<RuntimeFieldTypes> runtimeFieldTypes() {
-		return this.runtimeFieldTypes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.fieldTypes)) {
-			generator.writeKey("field_types");
-			generator.writeStartArray();
-			for (FieldTypes item0 : this.fieldTypes) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.runtimeFieldTypes)) {
-			generator.writeKey("runtime_field_types");
-			generator.writeStartArray();
-			for (RuntimeFieldTypes item0 : this.runtimeFieldTypes) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FieldTypesMappings}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldTypesMappings> {
-		private List<FieldTypes> fieldTypes;
-
-		@Nullable
-		private List<RuntimeFieldTypes> runtimeFieldTypes;
-
-		/**
-		 * Required - API name: {@code field_types}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fieldTypes</code>.
-		 */
-		public final Builder fieldTypes(List<FieldTypes> list) {
-			this.fieldTypes = _listAddAll(this.fieldTypes, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code field_types}
-		 * <p>
-		 * Adds one or more values to <code>fieldTypes</code>.
-		 */
-		public final Builder fieldTypes(FieldTypes value, FieldTypes... values) {
-			this.fieldTypes = _listAdd(this.fieldTypes, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code field_types}
-		 * <p>
-		 * Adds a value to <code>fieldTypes</code> using a builder lambda.
-		 */
-		public final Builder fieldTypes(Function<FieldTypes.Builder, ObjectBuilder<FieldTypes>> fn) {
-			return fieldTypes(fn.apply(new FieldTypes.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code runtime_field_types}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>runtimeFieldTypes</code>.
-		 */
-		public final Builder runtimeFieldTypes(List<RuntimeFieldTypes> list) {
-			this.runtimeFieldTypes = _listAddAll(this.runtimeFieldTypes, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code runtime_field_types}
-		 * <p>
-		 * Adds one or more values to <code>runtimeFieldTypes</code>.
-		 */
-		public final Builder runtimeFieldTypes(RuntimeFieldTypes value, RuntimeFieldTypes... values) {
-			this.runtimeFieldTypes = _listAdd(this.runtimeFieldTypes, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code runtime_field_types}
-		 * <p>
-		 * Adds a value to <code>runtimeFieldTypes</code> using a builder lambda.
-		 */
-		public final Builder runtimeFieldTypes(
-				Function<RuntimeFieldTypes.Builder, ObjectBuilder<RuntimeFieldTypes>> fn) {
-			return runtimeFieldTypes(fn.apply(new RuntimeFieldTypes.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link FieldTypesMappings}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FieldTypesMappings build() {
-			_checkSingleUse();
-
-			return new FieldTypesMappings(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FieldTypesMappings}
-	 */
-	public static final JsonpDeserializer<FieldTypesMappings> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, FieldTypesMappings::setupFieldTypesMappingsDeserializer);
-
-	protected static void setupFieldTypesMappingsDeserializer(ObjectDeserializer<FieldTypesMappings.Builder> op) {
-
-		op.add(Builder::fieldTypes, JsonpDeserializer.arrayDeserializer(FieldTypes._DESERIALIZER), "field_types");
-		op.add(Builder::runtimeFieldTypes, JsonpDeserializer.arrayDeserializer(RuntimeFieldTypes._DESERIALIZER),
-				"runtime_field_types");
-
-	}
+    private final List<FieldTypes> fieldTypes;
+
+    private final List<RuntimeFieldTypes> runtimeFieldTypes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FieldTypesMappings(Builder builder) {
+
+        this.fieldTypes = ApiTypeHelper.unmodifiableRequired(builder.fieldTypes, this, "fieldTypes");
+        this.runtimeFieldTypes = ApiTypeHelper.unmodifiable(builder.runtimeFieldTypes);
+
+    }
+
+    public static FieldTypesMappings of(Function<Builder, ObjectBuilder<FieldTypesMappings>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code field_types}
+     */
+    public final List<FieldTypes> fieldTypes() {
+        return this.fieldTypes;
+    }
+
+    /**
+     * API name: {@code runtime_field_types}
+     */
+    public final List<RuntimeFieldTypes> runtimeFieldTypes() {
+        return this.runtimeFieldTypes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.fieldTypes)) {
+            generator.writeKey("field_types");
+            generator.writeStartArray();
+            for (FieldTypes item0 : this.fieldTypes) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.runtimeFieldTypes)) {
+            generator.writeKey("runtime_field_types");
+            generator.writeStartArray();
+            for (RuntimeFieldTypes item0 : this.runtimeFieldTypes) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FieldTypesMappings}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldTypesMappings> {
+        private List<FieldTypes> fieldTypes;
+
+        @Nullable
+        private List<RuntimeFieldTypes> runtimeFieldTypes;
+
+        /**
+         * Required - API name: {@code field_types}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fieldTypes</code>.
+         */
+        public final Builder fieldTypes(List<FieldTypes> list) {
+            this.fieldTypes = _listAddAll(this.fieldTypes, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code field_types}
+         * <p>
+         * Adds one or more values to <code>fieldTypes</code>.
+         */
+        public final Builder fieldTypes(FieldTypes value, FieldTypes... values) {
+            this.fieldTypes = _listAdd(this.fieldTypes, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code field_types}
+         * <p>
+         * Adds a value to <code>fieldTypes</code> using a builder lambda.
+         */
+        public final Builder fieldTypes(Function<FieldTypes.Builder, ObjectBuilder<FieldTypes>> fn) {
+            return fieldTypes(fn.apply(new FieldTypes.Builder()).build());
+        }
+
+        /**
+         * API name: {@code runtime_field_types}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>runtimeFieldTypes</code>.
+         */
+        public final Builder runtimeFieldTypes(List<RuntimeFieldTypes> list) {
+            this.runtimeFieldTypes = _listAddAll(this.runtimeFieldTypes, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code runtime_field_types}
+         * <p>
+         * Adds one or more values to <code>runtimeFieldTypes</code>.
+         */
+        public final Builder runtimeFieldTypes(RuntimeFieldTypes value, RuntimeFieldTypes... values) {
+            this.runtimeFieldTypes = _listAdd(this.runtimeFieldTypes, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code runtime_field_types}
+         * <p>
+         * Adds a value to <code>runtimeFieldTypes</code> using a builder lambda.
+         */
+        public final Builder runtimeFieldTypes(Function<RuntimeFieldTypes.Builder, ObjectBuilder<RuntimeFieldTypes>> fn) {
+            return runtimeFieldTypes(fn.apply(new RuntimeFieldTypes.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link FieldTypesMappings}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FieldTypesMappings build() {
+            _checkSingleUse();
+
+            return new FieldTypesMappings(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FieldTypesMappings}
+     */
+    public static final JsonpDeserializer<FieldTypesMappings> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FieldTypesMappings::setupFieldTypesMappingsDeserializer
+    );
+
+    protected static void setupFieldTypesMappingsDeserializer(ObjectDeserializer<FieldTypesMappings.Builder> op) {
+
+        op.add(Builder::fieldTypes, JsonpDeserializer.arrayDeserializer(FieldTypes._DESERIALIZER), "field_types");
+        op.add(Builder::runtimeFieldTypes, JsonpDeserializer.arrayDeserializer(RuntimeFieldTypes._DESERIALIZER), "runtime_field_types");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/IndicesVersions.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/IndicesVersions.java
index 9b820eacbb..abf01c5c8b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/IndicesVersions.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/IndicesVersions.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,165 +43,164 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.stats.IndicesVersions
 
-
 @JsonpDeserializable
 public class IndicesVersions implements JsonpSerializable {
-	private final int indexCount;
+    private final int indexCount;
 
-	private final int primaryShardCount;
+    private final int primaryShardCount;
 
-	private final long totalPrimaryBytes;
+    private final long totalPrimaryBytes;
 
-	private final String version;
+    private final String version;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private IndicesVersions(Builder builder) {
+    private IndicesVersions(Builder builder) {
 
-		this.indexCount = ApiTypeHelper.requireNonNull(builder.indexCount, this, "indexCount");
-		this.primaryShardCount = ApiTypeHelper.requireNonNull(builder.primaryShardCount, this, "primaryShardCount");
-		this.totalPrimaryBytes = ApiTypeHelper.requireNonNull(builder.totalPrimaryBytes, this, "totalPrimaryBytes");
-		this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
+        this.indexCount = ApiTypeHelper.requireNonNull(builder.indexCount, this, "indexCount");
+        this.primaryShardCount = ApiTypeHelper.requireNonNull(builder.primaryShardCount, this, "primaryShardCount");
+        this.totalPrimaryBytes = ApiTypeHelper.requireNonNull(builder.totalPrimaryBytes, this, "totalPrimaryBytes");
+        this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
 
-	}
+    }
 
-	public static IndicesVersions of(Function<Builder, ObjectBuilder<IndicesVersions>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static IndicesVersions of(Function<Builder, ObjectBuilder<IndicesVersions>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code index_count}
-	 */
-	public final int indexCount() {
-		return this.indexCount;
-	}
-
-	/**
-	 * Required - API name: {@code primary_shard_count}
-	 */
-	public final int primaryShardCount() {
-		return this.primaryShardCount;
-	}
-
-	/**
-	 * Required - API name: {@code total_primary_bytes}
-	 */
-	public final long totalPrimaryBytes() {
-		return this.totalPrimaryBytes;
-	}
-
-	/**
-	 * Required - API name: {@code version}
-	 */
-	public final String version() {
-		return this.version;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("index_count");
-		generator.write(this.indexCount);
-
-		generator.writeKey("primary_shard_count");
-		generator.write(this.primaryShardCount);
-
-		generator.writeKey("total_primary_bytes");
-		generator.write(this.totalPrimaryBytes);
-
-		generator.writeKey("version");
-		generator.write(this.version);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndicesVersions}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesVersions> {
-		private Integer indexCount;
-
-		private Integer primaryShardCount;
-
-		private Long totalPrimaryBytes;
-
-		private String version;
-
-		/**
-		 * Required - API name: {@code index_count}
-		 */
-		public final Builder indexCount(int value) {
-			this.indexCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code primary_shard_count}
-		 */
-		public final Builder primaryShardCount(int value) {
-			this.primaryShardCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_primary_bytes}
-		 */
-		public final Builder totalPrimaryBytes(long value) {
-			this.totalPrimaryBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code version}
-		 */
-		public final Builder version(String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IndicesVersions}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndicesVersions build() {
-			_checkSingleUse();
-
-			return new IndicesVersions(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndicesVersions}
-	 */
-	public static final JsonpDeserializer<IndicesVersions> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IndicesVersions::setupIndicesVersionsDeserializer);
-
-	protected static void setupIndicesVersionsDeserializer(ObjectDeserializer<IndicesVersions.Builder> op) {
-
-		op.add(Builder::indexCount, JsonpDeserializer.integerDeserializer(), "index_count");
-		op.add(Builder::primaryShardCount, JsonpDeserializer.integerDeserializer(), "primary_shard_count");
-		op.add(Builder::totalPrimaryBytes, JsonpDeserializer.longDeserializer(), "total_primary_bytes");
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
-
-	}
+    /**
+     * Required - API name: {@code index_count}
+     */
+    public final int indexCount() {
+        return this.indexCount;
+    }
+
+    /**
+     * Required - API name: {@code primary_shard_count}
+     */
+    public final int primaryShardCount() {
+        return this.primaryShardCount;
+    }
+
+    /**
+     * Required - API name: {@code total_primary_bytes}
+     */
+    public final long totalPrimaryBytes() {
+        return this.totalPrimaryBytes;
+    }
+
+    /**
+     * Required - API name: {@code version}
+     */
+    public final String version() {
+        return this.version;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("index_count");
+        generator.write(this.indexCount);
+
+        generator.writeKey("primary_shard_count");
+        generator.write(this.primaryShardCount);
+
+        generator.writeKey("total_primary_bytes");
+        generator.write(this.totalPrimaryBytes);
+
+        generator.writeKey("version");
+        generator.write(this.version);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndicesVersions}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesVersions> {
+        private Integer indexCount;
+
+        private Integer primaryShardCount;
+
+        private Long totalPrimaryBytes;
+
+        private String version;
+
+        /**
+         * Required - API name: {@code index_count}
+         */
+        public final Builder indexCount(int value) {
+            this.indexCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code primary_shard_count}
+         */
+        public final Builder primaryShardCount(int value) {
+            this.primaryShardCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_primary_bytes}
+         */
+        public final Builder totalPrimaryBytes(long value) {
+            this.totalPrimaryBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code version}
+         */
+        public final Builder version(String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link IndicesVersions}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndicesVersions build() {
+            _checkSingleUse();
+
+            return new IndicesVersions(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndicesVersions}
+     */
+    public static final JsonpDeserializer<IndicesVersions> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndicesVersions::setupIndicesVersionsDeserializer
+    );
+
+    protected static void setupIndicesVersionsDeserializer(ObjectDeserializer<IndicesVersions.Builder> op) {
+
+        op.add(Builder::indexCount, JsonpDeserializer.integerDeserializer(), "index_count");
+        op.add(Builder::primaryShardCount, JsonpDeserializer.integerDeserializer(), "primary_shard_count");
+        op.add(Builder::totalPrimaryBytes, JsonpDeserializer.longDeserializer(), "total_primary_bytes");
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/NodePackagingType.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/NodePackagingType.java
index 7c35b321fb..6cbc2359c0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/NodePackagingType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/NodePackagingType.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,140 +43,140 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.stats.NodePackagingType
 
 @JsonpDeserializable
 public class NodePackagingType implements JsonpSerializable {
-	private final int count;
-
-	private final String flavor;
-
-	private final String type;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodePackagingType(Builder builder) {
-
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.flavor = ApiTypeHelper.requireNonNull(builder.flavor, this, "flavor");
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-
-	}
-
-	public static NodePackagingType of(Function<Builder, ObjectBuilder<NodePackagingType>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code count}
-	 */
-	public final int count() {
-		return this.count;
-	}
+    private final int count;
 
-	/**
-	 * Required - API name: {@code flavor}
-	 */
-	public final String flavor() {
-		return this.flavor;
-	}
-
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("count");
-		generator.write(this.count);
-
-		generator.writeKey("flavor");
-		generator.write(this.flavor);
-
-		generator.writeKey("type");
-		generator.write(this.type);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodePackagingType}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodePackagingType> {
-		private Integer count;
-
-		private String flavor;
-
-		private String type;
-
-		/**
-		 * Required - API name: {@code count}
-		 */
-		public final Builder count(int value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code flavor}
-		 */
-		public final Builder flavor(String value) {
-			this.flavor = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodePackagingType}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodePackagingType build() {
-			_checkSingleUse();
-
-			return new NodePackagingType(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodePackagingType}
-	 */
-	public static final JsonpDeserializer<NodePackagingType> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodePackagingType::setupNodePackagingTypeDeserializer);
-
-	protected static void setupNodePackagingTypeDeserializer(ObjectDeserializer<NodePackagingType.Builder> op) {
-
-		op.add(Builder::count, JsonpDeserializer.integerDeserializer(), "count");
-		op.add(Builder::flavor, JsonpDeserializer.stringDeserializer(), "flavor");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-
-	}
+    private final String flavor;
+
+    private final String type;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodePackagingType(Builder builder) {
+
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.flavor = ApiTypeHelper.requireNonNull(builder.flavor, this, "flavor");
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+
+    }
+
+    public static NodePackagingType of(Function<Builder, ObjectBuilder<NodePackagingType>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code count}
+     */
+    public final int count() {
+        return this.count;
+    }
+
+    /**
+     * Required - API name: {@code flavor}
+     */
+    public final String flavor() {
+        return this.flavor;
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("count");
+        generator.write(this.count);
+
+        generator.writeKey("flavor");
+        generator.write(this.flavor);
+
+        generator.writeKey("type");
+        generator.write(this.type);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodePackagingType}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodePackagingType> {
+        private Integer count;
+
+        private String flavor;
+
+        private String type;
+
+        /**
+         * Required - API name: {@code count}
+         */
+        public final Builder count(int value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code flavor}
+         */
+        public final Builder flavor(String value) {
+            this.flavor = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodePackagingType}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodePackagingType build() {
+            _checkSingleUse();
+
+            return new NodePackagingType(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodePackagingType}
+     */
+    public static final JsonpDeserializer<NodePackagingType> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodePackagingType::setupNodePackagingTypeDeserializer
+    );
+
+    protected static void setupNodePackagingTypeDeserializer(ObjectDeserializer<NodePackagingType.Builder> op) {
+
+        op.add(Builder::count, JsonpDeserializer.integerDeserializer(), "count");
+        op.add(Builder::flavor, JsonpDeserializer.stringDeserializer(), "flavor");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/OperatingSystemMemoryInfo.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/OperatingSystemMemoryInfo.java
index 12e59c96d3..0e17eb5be9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/OperatingSystemMemoryInfo.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/OperatingSystemMemoryInfo.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,190 +43,188 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: cluster.stats.OperatingSystemMemoryInfo
 
-
 @JsonpDeserializable
 public class OperatingSystemMemoryInfo implements JsonpSerializable {
-	private final long freeInBytes;
+    private final long freeInBytes;
 
-	private final int freePercent;
+    private final int freePercent;
 
-	private final long totalInBytes;
+    private final long totalInBytes;
 
-	private final long usedInBytes;
+    private final long usedInBytes;
 
-	private final int usedPercent;
+    private final int usedPercent;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private OperatingSystemMemoryInfo(Builder builder) {
+    private OperatingSystemMemoryInfo(Builder builder) {
 
-		this.freeInBytes = ApiTypeHelper.requireNonNull(builder.freeInBytes, this, "freeInBytes");
-		this.freePercent = ApiTypeHelper.requireNonNull(builder.freePercent, this, "freePercent");
-		this.totalInBytes = ApiTypeHelper.requireNonNull(builder.totalInBytes, this, "totalInBytes");
-		this.usedInBytes = ApiTypeHelper.requireNonNull(builder.usedInBytes, this, "usedInBytes");
-		this.usedPercent = ApiTypeHelper.requireNonNull(builder.usedPercent, this, "usedPercent");
+        this.freeInBytes = ApiTypeHelper.requireNonNull(builder.freeInBytes, this, "freeInBytes");
+        this.freePercent = ApiTypeHelper.requireNonNull(builder.freePercent, this, "freePercent");
+        this.totalInBytes = ApiTypeHelper.requireNonNull(builder.totalInBytes, this, "totalInBytes");
+        this.usedInBytes = ApiTypeHelper.requireNonNull(builder.usedInBytes, this, "usedInBytes");
+        this.usedPercent = ApiTypeHelper.requireNonNull(builder.usedPercent, this, "usedPercent");
 
-	}
+    }
 
-	public static OperatingSystemMemoryInfo of(Function<Builder, ObjectBuilder<OperatingSystemMemoryInfo>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static OperatingSystemMemoryInfo of(Function<Builder, ObjectBuilder<OperatingSystemMemoryInfo>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code free_in_bytes}
-	 */
-	public final long freeInBytes() {
-		return this.freeInBytes;
-	}
+    /**
+     * Required - API name: {@code free_in_bytes}
+     */
+    public final long freeInBytes() {
+        return this.freeInBytes;
+    }
 
-	/**
-	 * Required - API name: {@code free_percent}
-	 */
-	public final int freePercent() {
-		return this.freePercent;
-	}
-
-	/**
-	 * Required - API name: {@code total_in_bytes}
-	 */
-	public final long totalInBytes() {
-		return this.totalInBytes;
-	}
-
-	/**
-	 * Required - API name: {@code used_in_bytes}
-	 */
-	public final long usedInBytes() {
-		return this.usedInBytes;
-	}
-
-	/**
-	 * Required - API name: {@code used_percent}
-	 */
-	public final int usedPercent() {
-		return this.usedPercent;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("free_in_bytes");
-		generator.write(this.freeInBytes);
-
-		generator.writeKey("free_percent");
-		generator.write(this.freePercent);
-
-		generator.writeKey("total_in_bytes");
-		generator.write(this.totalInBytes);
-
-		generator.writeKey("used_in_bytes");
-		generator.write(this.usedInBytes);
-
-		generator.writeKey("used_percent");
-		generator.write(this.usedPercent);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link OperatingSystemMemoryInfo}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<OperatingSystemMemoryInfo> {
-		private Long freeInBytes;
-
-		private Integer freePercent;
-
-		private Long totalInBytes;
-
-		private Long usedInBytes;
-
-		private Integer usedPercent;
-
-		/**
-		 * Required - API name: {@code free_in_bytes}
-		 */
-		public final Builder freeInBytes(long value) {
-			this.freeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code free_percent}
-		 */
-		public final Builder freePercent(int value) {
-			this.freePercent = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_in_bytes}
-		 */
-		public final Builder totalInBytes(long value) {
-			this.totalInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code used_in_bytes}
-		 */
-		public final Builder usedInBytes(long value) {
-			this.usedInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code used_percent}
-		 */
-		public final Builder usedPercent(int value) {
-			this.usedPercent = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link OperatingSystemMemoryInfo}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public OperatingSystemMemoryInfo build() {
-			_checkSingleUse();
-
-			return new OperatingSystemMemoryInfo(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link OperatingSystemMemoryInfo}
-	 */
-	public static final JsonpDeserializer<OperatingSystemMemoryInfo> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, OperatingSystemMemoryInfo::setupOperatingSystemMemoryInfoDeserializer);
-
-	protected static void setupOperatingSystemMemoryInfoDeserializer(
-			ObjectDeserializer<OperatingSystemMemoryInfo.Builder> op) {
-
-		op.add(Builder::freeInBytes, JsonpDeserializer.longDeserializer(), "free_in_bytes");
-		op.add(Builder::freePercent, JsonpDeserializer.integerDeserializer(), "free_percent");
-		op.add(Builder::totalInBytes, JsonpDeserializer.longDeserializer(), "total_in_bytes");
-		op.add(Builder::usedInBytes, JsonpDeserializer.longDeserializer(), "used_in_bytes");
-		op.add(Builder::usedPercent, JsonpDeserializer.integerDeserializer(), "used_percent");
-
-	}
+    /**
+     * Required - API name: {@code free_percent}
+     */
+    public final int freePercent() {
+        return this.freePercent;
+    }
+
+    /**
+     * Required - API name: {@code total_in_bytes}
+     */
+    public final long totalInBytes() {
+        return this.totalInBytes;
+    }
+
+    /**
+     * Required - API name: {@code used_in_bytes}
+     */
+    public final long usedInBytes() {
+        return this.usedInBytes;
+    }
+
+    /**
+     * Required - API name: {@code used_percent}
+     */
+    public final int usedPercent() {
+        return this.usedPercent;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("free_in_bytes");
+        generator.write(this.freeInBytes);
+
+        generator.writeKey("free_percent");
+        generator.write(this.freePercent);
+
+        generator.writeKey("total_in_bytes");
+        generator.write(this.totalInBytes);
+
+        generator.writeKey("used_in_bytes");
+        generator.write(this.usedInBytes);
+
+        generator.writeKey("used_percent");
+        generator.write(this.usedPercent);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link OperatingSystemMemoryInfo}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<OperatingSystemMemoryInfo> {
+        private Long freeInBytes;
+
+        private Integer freePercent;
+
+        private Long totalInBytes;
+
+        private Long usedInBytes;
+
+        private Integer usedPercent;
+
+        /**
+         * Required - API name: {@code free_in_bytes}
+         */
+        public final Builder freeInBytes(long value) {
+            this.freeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code free_percent}
+         */
+        public final Builder freePercent(int value) {
+            this.freePercent = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_in_bytes}
+         */
+        public final Builder totalInBytes(long value) {
+            this.totalInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code used_in_bytes}
+         */
+        public final Builder usedInBytes(long value) {
+            this.usedInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code used_percent}
+         */
+        public final Builder usedPercent(int value) {
+            this.usedPercent = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link OperatingSystemMemoryInfo}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public OperatingSystemMemoryInfo build() {
+            _checkSingleUse();
+
+            return new OperatingSystemMemoryInfo(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link OperatingSystemMemoryInfo}
+     */
+    public static final JsonpDeserializer<OperatingSystemMemoryInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        OperatingSystemMemoryInfo::setupOperatingSystemMemoryInfoDeserializer
+    );
+
+    protected static void setupOperatingSystemMemoryInfoDeserializer(ObjectDeserializer<OperatingSystemMemoryInfo.Builder> op) {
+
+        op.add(Builder::freeInBytes, JsonpDeserializer.longDeserializer(), "free_in_bytes");
+        op.add(Builder::freePercent, JsonpDeserializer.integerDeserializer(), "free_percent");
+        op.add(Builder::totalInBytes, JsonpDeserializer.longDeserializer(), "total_in_bytes");
+        op.add(Builder::usedInBytes, JsonpDeserializer.longDeserializer(), "used_in_bytes");
+        op.add(Builder::usedPercent, JsonpDeserializer.integerDeserializer(), "used_percent");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/RuntimeFieldTypes.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/RuntimeFieldTypes.java
index 374169f753..fcff99de4c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/RuntimeFieldTypes.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/RuntimeFieldTypes.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.cluster.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,424 +44,423 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: cluster.stats.RuntimeFieldTypes
 
 @JsonpDeserializable
 public class RuntimeFieldTypes implements JsonpSerializable {
-	private final String name;
+    private final String name;
 
-	private final int count;
+    private final int count;
 
-	private final int indexCount;
+    private final int indexCount;
 
-	private final int scriptlessCount;
-
-	private final int shadowedCount;
+    private final int scriptlessCount;
+
+    private final int shadowedCount;
 
-	private final List<String> lang;
-
-	private final int linesMax;
-
-	private final int linesTotal;
-
-	private final int charsMax;
-
-	private final int charsTotal;
-
-	private final int sourceMax;
-
-	private final int sourceTotal;
-
-	private final int docMax;
-
-	private final int docTotal;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RuntimeFieldTypes(Builder builder) {
-
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.indexCount = ApiTypeHelper.requireNonNull(builder.indexCount, this, "indexCount");
-		this.scriptlessCount = ApiTypeHelper.requireNonNull(builder.scriptlessCount, this, "scriptlessCount");
-		this.shadowedCount = ApiTypeHelper.requireNonNull(builder.shadowedCount, this, "shadowedCount");
-		this.lang = ApiTypeHelper.unmodifiableRequired(builder.lang, this, "lang");
-		this.linesMax = ApiTypeHelper.requireNonNull(builder.linesMax, this, "linesMax");
-		this.linesTotal = ApiTypeHelper.requireNonNull(builder.linesTotal, this, "linesTotal");
-		this.charsMax = ApiTypeHelper.requireNonNull(builder.charsMax, this, "charsMax");
-		this.charsTotal = ApiTypeHelper.requireNonNull(builder.charsTotal, this, "charsTotal");
-		this.sourceMax = ApiTypeHelper.requireNonNull(builder.sourceMax, this, "sourceMax");
-		this.sourceTotal = ApiTypeHelper.requireNonNull(builder.sourceTotal, this, "sourceTotal");
-		this.docMax = ApiTypeHelper.requireNonNull(builder.docMax, this, "docMax");
-		this.docTotal = ApiTypeHelper.requireNonNull(builder.docTotal, this, "docTotal");
-
-	}
-
-	public static RuntimeFieldTypes of(Function<Builder, ObjectBuilder<RuntimeFieldTypes>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Required - API name: {@code count}
-	 */
-	public final int count() {
-		return this.count;
-	}
-
-	/**
-	 * Required - API name: {@code index_count}
-	 */
-	public final int indexCount() {
-		return this.indexCount;
-	}
-
-	/**
-	 * Required - API name: {@code scriptless_count}
-	 */
-	public final int scriptlessCount() {
-		return this.scriptlessCount;
-	}
-
-	/**
-	 * Required - API name: {@code shadowed_count}
-	 */
-	public final int shadowedCount() {
-		return this.shadowedCount;
-	}
-
-	/**
-	 * Required - API name: {@code lang}
-	 */
-	public final List<String> lang() {
-		return this.lang;
-	}
-
-	/**
-	 * Required - API name: {@code lines_max}
-	 */
-	public final int linesMax() {
-		return this.linesMax;
-	}
-
-	/**
-	 * Required - API name: {@code lines_total}
-	 */
-	public final int linesTotal() {
-		return this.linesTotal;
-	}
-
-	/**
-	 * Required - API name: {@code chars_max}
-	 */
-	public final int charsMax() {
-		return this.charsMax;
-	}
-
-	/**
-	 * Required - API name: {@code chars_total}
-	 */
-	public final int charsTotal() {
-		return this.charsTotal;
-	}
-
-	/**
-	 * Required - API name: {@code source_max}
-	 */
-	public final int sourceMax() {
-		return this.sourceMax;
-	}
-
-	/**
-	 * Required - API name: {@code source_total}
-	 */
-	public final int sourceTotal() {
-		return this.sourceTotal;
-	}
-
-	/**
-	 * Required - API name: {@code doc_max}
-	 */
-	public final int docMax() {
-		return this.docMax;
-	}
-
-	/**
-	 * Required - API name: {@code doc_total}
-	 */
-	public final int docTotal() {
-		return this.docTotal;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		generator.writeKey("count");
-		generator.write(this.count);
-
-		generator.writeKey("index_count");
-		generator.write(this.indexCount);
-
-		generator.writeKey("scriptless_count");
-		generator.write(this.scriptlessCount);
-
-		generator.writeKey("shadowed_count");
-		generator.write(this.shadowedCount);
-
-		if (ApiTypeHelper.isDefined(this.lang)) {
-			generator.writeKey("lang");
-			generator.writeStartArray();
-			for (String item0 : this.lang) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("lines_max");
-		generator.write(this.linesMax);
-
-		generator.writeKey("lines_total");
-		generator.write(this.linesTotal);
-
-		generator.writeKey("chars_max");
-		generator.write(this.charsMax);
-
-		generator.writeKey("chars_total");
-		generator.write(this.charsTotal);
-
-		generator.writeKey("source_max");
-		generator.write(this.sourceMax);
-
-		generator.writeKey("source_total");
-		generator.write(this.sourceTotal);
-
-		generator.writeKey("doc_max");
-		generator.write(this.docMax);
-
-		generator.writeKey("doc_total");
-		generator.write(this.docTotal);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RuntimeFieldTypes}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RuntimeFieldTypes> {
-		private String name;
-
-		private Integer count;
-
-		private Integer indexCount;
-
-		private Integer scriptlessCount;
-
-		private Integer shadowedCount;
-
-		private List<String> lang;
-
-		private Integer linesMax;
-
-		private Integer linesTotal;
-
-		private Integer charsMax;
-
-		private Integer charsTotal;
-
-		private Integer sourceMax;
-
-		private Integer sourceTotal;
-
-		private Integer docMax;
-
-		private Integer docTotal;
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code count}
-		 */
-		public final Builder count(int value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index_count}
-		 */
-		public final Builder indexCount(int value) {
-			this.indexCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code scriptless_count}
-		 */
-		public final Builder scriptlessCount(int value) {
-			this.scriptlessCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shadowed_count}
-		 */
-		public final Builder shadowedCount(int value) {
-			this.shadowedCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code lang}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>lang</code>.
-		 */
-		public final Builder lang(List<String> list) {
-			this.lang = _listAddAll(this.lang, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code lang}
-		 * <p>
-		 * Adds one or more values to <code>lang</code>.
-		 */
-		public final Builder lang(String value, String... values) {
-			this.lang = _listAdd(this.lang, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code lines_max}
-		 */
-		public final Builder linesMax(int value) {
-			this.linesMax = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code lines_total}
-		 */
-		public final Builder linesTotal(int value) {
-			this.linesTotal = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code chars_max}
-		 */
-		public final Builder charsMax(int value) {
-			this.charsMax = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code chars_total}
-		 */
-		public final Builder charsTotal(int value) {
-			this.charsTotal = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code source_max}
-		 */
-		public final Builder sourceMax(int value) {
-			this.sourceMax = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code source_total}
-		 */
-		public final Builder sourceTotal(int value) {
-			this.sourceTotal = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code doc_max}
-		 */
-		public final Builder docMax(int value) {
-			this.docMax = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code doc_total}
-		 */
-		public final Builder docTotal(int value) {
-			this.docTotal = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RuntimeFieldTypes}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RuntimeFieldTypes build() {
-			_checkSingleUse();
-
-			return new RuntimeFieldTypes(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RuntimeFieldTypes}
-	 */
-	public static final JsonpDeserializer<RuntimeFieldTypes> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RuntimeFieldTypes::setupRuntimeFieldTypesDeserializer);
-
-	protected static void setupRuntimeFieldTypesDeserializer(ObjectDeserializer<RuntimeFieldTypes.Builder> op) {
-
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::count, JsonpDeserializer.integerDeserializer(), "count");
-		op.add(Builder::indexCount, JsonpDeserializer.integerDeserializer(), "index_count");
-		op.add(Builder::scriptlessCount, JsonpDeserializer.integerDeserializer(), "scriptless_count");
-		op.add(Builder::shadowedCount, JsonpDeserializer.integerDeserializer(), "shadowed_count");
-		op.add(Builder::lang, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "lang");
-		op.add(Builder::linesMax, JsonpDeserializer.integerDeserializer(), "lines_max");
-		op.add(Builder::linesTotal, JsonpDeserializer.integerDeserializer(), "lines_total");
-		op.add(Builder::charsMax, JsonpDeserializer.integerDeserializer(), "chars_max");
-		op.add(Builder::charsTotal, JsonpDeserializer.integerDeserializer(), "chars_total");
-		op.add(Builder::sourceMax, JsonpDeserializer.integerDeserializer(), "source_max");
-		op.add(Builder::sourceTotal, JsonpDeserializer.integerDeserializer(), "source_total");
-		op.add(Builder::docMax, JsonpDeserializer.integerDeserializer(), "doc_max");
-		op.add(Builder::docTotal, JsonpDeserializer.integerDeserializer(), "doc_total");
-
-	}
+    private final List<String> lang;
+
+    private final int linesMax;
+
+    private final int linesTotal;
+
+    private final int charsMax;
+
+    private final int charsTotal;
+
+    private final int sourceMax;
+
+    private final int sourceTotal;
+
+    private final int docMax;
+
+    private final int docTotal;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RuntimeFieldTypes(Builder builder) {
+
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.indexCount = ApiTypeHelper.requireNonNull(builder.indexCount, this, "indexCount");
+        this.scriptlessCount = ApiTypeHelper.requireNonNull(builder.scriptlessCount, this, "scriptlessCount");
+        this.shadowedCount = ApiTypeHelper.requireNonNull(builder.shadowedCount, this, "shadowedCount");
+        this.lang = ApiTypeHelper.unmodifiableRequired(builder.lang, this, "lang");
+        this.linesMax = ApiTypeHelper.requireNonNull(builder.linesMax, this, "linesMax");
+        this.linesTotal = ApiTypeHelper.requireNonNull(builder.linesTotal, this, "linesTotal");
+        this.charsMax = ApiTypeHelper.requireNonNull(builder.charsMax, this, "charsMax");
+        this.charsTotal = ApiTypeHelper.requireNonNull(builder.charsTotal, this, "charsTotal");
+        this.sourceMax = ApiTypeHelper.requireNonNull(builder.sourceMax, this, "sourceMax");
+        this.sourceTotal = ApiTypeHelper.requireNonNull(builder.sourceTotal, this, "sourceTotal");
+        this.docMax = ApiTypeHelper.requireNonNull(builder.docMax, this, "docMax");
+        this.docTotal = ApiTypeHelper.requireNonNull(builder.docTotal, this, "docTotal");
+
+    }
+
+    public static RuntimeFieldTypes of(Function<Builder, ObjectBuilder<RuntimeFieldTypes>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Required - API name: {@code count}
+     */
+    public final int count() {
+        return this.count;
+    }
+
+    /**
+     * Required - API name: {@code index_count}
+     */
+    public final int indexCount() {
+        return this.indexCount;
+    }
+
+    /**
+     * Required - API name: {@code scriptless_count}
+     */
+    public final int scriptlessCount() {
+        return this.scriptlessCount;
+    }
+
+    /**
+     * Required - API name: {@code shadowed_count}
+     */
+    public final int shadowedCount() {
+        return this.shadowedCount;
+    }
+
+    /**
+     * Required - API name: {@code lang}
+     */
+    public final List<String> lang() {
+        return this.lang;
+    }
+
+    /**
+     * Required - API name: {@code lines_max}
+     */
+    public final int linesMax() {
+        return this.linesMax;
+    }
+
+    /**
+     * Required - API name: {@code lines_total}
+     */
+    public final int linesTotal() {
+        return this.linesTotal;
+    }
+
+    /**
+     * Required - API name: {@code chars_max}
+     */
+    public final int charsMax() {
+        return this.charsMax;
+    }
+
+    /**
+     * Required - API name: {@code chars_total}
+     */
+    public final int charsTotal() {
+        return this.charsTotal;
+    }
+
+    /**
+     * Required - API name: {@code source_max}
+     */
+    public final int sourceMax() {
+        return this.sourceMax;
+    }
+
+    /**
+     * Required - API name: {@code source_total}
+     */
+    public final int sourceTotal() {
+        return this.sourceTotal;
+    }
+
+    /**
+     * Required - API name: {@code doc_max}
+     */
+    public final int docMax() {
+        return this.docMax;
+    }
+
+    /**
+     * Required - API name: {@code doc_total}
+     */
+    public final int docTotal() {
+        return this.docTotal;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        generator.writeKey("count");
+        generator.write(this.count);
+
+        generator.writeKey("index_count");
+        generator.write(this.indexCount);
+
+        generator.writeKey("scriptless_count");
+        generator.write(this.scriptlessCount);
+
+        generator.writeKey("shadowed_count");
+        generator.write(this.shadowedCount);
+
+        if (ApiTypeHelper.isDefined(this.lang)) {
+            generator.writeKey("lang");
+            generator.writeStartArray();
+            for (String item0 : this.lang) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("lines_max");
+        generator.write(this.linesMax);
+
+        generator.writeKey("lines_total");
+        generator.write(this.linesTotal);
+
+        generator.writeKey("chars_max");
+        generator.write(this.charsMax);
+
+        generator.writeKey("chars_total");
+        generator.write(this.charsTotal);
+
+        generator.writeKey("source_max");
+        generator.write(this.sourceMax);
+
+        generator.writeKey("source_total");
+        generator.write(this.sourceTotal);
+
+        generator.writeKey("doc_max");
+        generator.write(this.docMax);
+
+        generator.writeKey("doc_total");
+        generator.write(this.docTotal);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RuntimeFieldTypes}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RuntimeFieldTypes> {
+        private String name;
+
+        private Integer count;
+
+        private Integer indexCount;
+
+        private Integer scriptlessCount;
+
+        private Integer shadowedCount;
+
+        private List<String> lang;
+
+        private Integer linesMax;
+
+        private Integer linesTotal;
+
+        private Integer charsMax;
+
+        private Integer charsTotal;
+
+        private Integer sourceMax;
+
+        private Integer sourceTotal;
+
+        private Integer docMax;
+
+        private Integer docTotal;
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code count}
+         */
+        public final Builder count(int value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index_count}
+         */
+        public final Builder indexCount(int value) {
+            this.indexCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code scriptless_count}
+         */
+        public final Builder scriptlessCount(int value) {
+            this.scriptlessCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shadowed_count}
+         */
+        public final Builder shadowedCount(int value) {
+            this.shadowedCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code lang}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>lang</code>.
+         */
+        public final Builder lang(List<String> list) {
+            this.lang = _listAddAll(this.lang, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code lang}
+         * <p>
+         * Adds one or more values to <code>lang</code>.
+         */
+        public final Builder lang(String value, String... values) {
+            this.lang = _listAdd(this.lang, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code lines_max}
+         */
+        public final Builder linesMax(int value) {
+            this.linesMax = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code lines_total}
+         */
+        public final Builder linesTotal(int value) {
+            this.linesTotal = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code chars_max}
+         */
+        public final Builder charsMax(int value) {
+            this.charsMax = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code chars_total}
+         */
+        public final Builder charsTotal(int value) {
+            this.charsTotal = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code source_max}
+         */
+        public final Builder sourceMax(int value) {
+            this.sourceMax = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code source_total}
+         */
+        public final Builder sourceTotal(int value) {
+            this.sourceTotal = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code doc_max}
+         */
+        public final Builder docMax(int value) {
+            this.docMax = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code doc_total}
+         */
+        public final Builder docTotal(int value) {
+            this.docTotal = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RuntimeFieldTypes}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RuntimeFieldTypes build() {
+            _checkSingleUse();
+
+            return new RuntimeFieldTypes(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RuntimeFieldTypes}
+     */
+    public static final JsonpDeserializer<RuntimeFieldTypes> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RuntimeFieldTypes::setupRuntimeFieldTypesDeserializer
+    );
+
+    protected static void setupRuntimeFieldTypesDeserializer(ObjectDeserializer<RuntimeFieldTypes.Builder> op) {
+
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::count, JsonpDeserializer.integerDeserializer(), "count");
+        op.add(Builder::indexCount, JsonpDeserializer.integerDeserializer(), "index_count");
+        op.add(Builder::scriptlessCount, JsonpDeserializer.integerDeserializer(), "scriptless_count");
+        op.add(Builder::shadowedCount, JsonpDeserializer.integerDeserializer(), "shadowed_count");
+        op.add(Builder::lang, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "lang");
+        op.add(Builder::linesMax, JsonpDeserializer.integerDeserializer(), "lines_max");
+        op.add(Builder::linesTotal, JsonpDeserializer.integerDeserializer(), "lines_total");
+        op.add(Builder::charsMax, JsonpDeserializer.integerDeserializer(), "chars_max");
+        op.add(Builder::charsTotal, JsonpDeserializer.integerDeserializer(), "chars_total");
+        op.add(Builder::sourceMax, JsonpDeserializer.integerDeserializer(), "source_max");
+        op.add(Builder::sourceTotal, JsonpDeserializer.integerDeserializer(), "source_total");
+        op.add(Builder::docMax, JsonpDeserializer.integerDeserializer(), "doc_max");
+        op.add(Builder::docTotal, JsonpDeserializer.integerDeserializer(), "doc_total");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/BulkRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/BulkRequest.java
index 98a599faa3..a1424891df 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/BulkRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/BulkRequest.java
@@ -32,6 +32,17 @@
 
 package org.opensearch.client.opensearch.core;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.json.NdJsonpSerializable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.Refresh;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -39,23 +50,11 @@
 import org.opensearch.client.opensearch._types.WaitForActiveShards;
 import org.opensearch.client.opensearch.core.bulk.BulkOperation;
 import org.opensearch.client.opensearch.core.search.SourceConfigParam;
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
-import org.opensearch.client.json.NdJsonpSerializable;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: _global.bulk.Request
 
@@ -66,523 +65,524 @@
  */
 
 public class BulkRequest extends RequestBase implements NdJsonpSerializable, JsonpSerializable {
-	@Nullable
-	private final SourceConfigParam source;
-
-	private final List<String> sourceExcludes;
-
-	private final List<String> sourceIncludes;
-
-	@Nullable
-	private final String index;
-
-	@Nullable
-	private final String pipeline;
-
-	@Nullable
-	private final Refresh refresh;
-
-	@Nullable
-	private final Boolean requireAlias;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final WaitForActiveShards waitForActiveShards;
-
-	private final List<BulkOperation> operations;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private BulkRequest(Builder builder) {
-
-		this.source = builder.source;
-		this.sourceExcludes = ApiTypeHelper.unmodifiable(builder.sourceExcludes);
-		this.sourceIncludes = ApiTypeHelper.unmodifiable(builder.sourceIncludes);
-		this.index = builder.index;
-		this.pipeline = builder.pipeline;
-		this.refresh = builder.refresh;
-		this.requireAlias = builder.requireAlias;
-		this.routing = builder.routing;
-		this.timeout = builder.timeout;
-		this.waitForActiveShards = builder.waitForActiveShards;
-		this.operations = ApiTypeHelper.unmodifiableRequired(builder.operations, this, "operations");
-
-	}
-
-	public static BulkRequest of(Function<Builder, ObjectBuilder<BulkRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	@Override
-	public Iterator<?> _serializables() {
-		return this.operations.iterator();
-	}
-	/**
-	 * True or false to return the _source field or not, or default list of fields
-	 * to return, can be overridden on each sub-request
-	 * <p>
-	 * API name: {@code _source}
-	 */
-	@Nullable
-	public final SourceConfigParam source() {
-		return this.source;
-	}
-
-	/**
-	 * Default list of fields to exclude from the returned _source field, can be
-	 * overridden on each sub-request
-	 * <p>
-	 * API name: {@code _source_excludes}
-	 */
-	public final List<String> sourceExcludes() {
-		return this.sourceExcludes;
-	}
-
-	/**
-	 * Default list of fields to extract and return from the _source field, can be
-	 * overridden on each sub-request
-	 * <p>
-	 * API name: {@code _source_includes}
-	 */
-	public final List<String> sourceIncludes() {
-		return this.sourceIncludes;
-	}
-
-	/**
-	 * Default index for items which don't provide one
-	 * <p>
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * The pipeline id to preprocess incoming documents with
-	 * <p>
-	 * API name: {@code pipeline}
-	 */
-	@Nullable
-	public final String pipeline() {
-		return this.pipeline;
-	}
-
-	/**
-	 * If <code>true</code> then refresh the affected shards to make this operation
-	 * visible to search, if <code>wait_for</code> then wait for a refresh to make
-	 * this operation visible to search, if <code>false</code> (the default) then do
-	 * nothing with refreshes.
-	 * <p>
-	 * API name: {@code refresh}
-	 */
-	@Nullable
-	public final Refresh refresh() {
-		return this.refresh;
-	}
-
-	/**
-	 * Sets require_alias for all incoming documents. Defaults to unset (false)
-	 * <p>
-	 * API name: {@code require_alias}
-	 */
-	@Nullable
-	public final Boolean requireAlias() {
-		return this.requireAlias;
-	}
-
-	/**
-	 * Specific routing value
-	 * <p>
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Sets the number of shard copies that must be active before proceeding with
-	 * the bulk operation. Defaults to 1, meaning the primary shard only. Set to
-	 * <code>all</code> for all shard copies, otherwise set to any non-negative
-	 * value less than or equal to the total number of copies for the shard (number
-	 * of replicas + 1)
-	 * <p>
-	 * API name: {@code wait_for_active_shards}
-	 */
-	@Nullable
-	public final WaitForActiveShards waitForActiveShards() {
-		return this.waitForActiveShards;
-	}
-
-	/**
-	 * Required - Request body.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<BulkOperation> operations() {
-		return this.operations;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (BulkOperation item0 : this.operations) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link BulkRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<BulkRequest> {
-		@Nullable
-		private SourceConfigParam source;
-
-		@Nullable
-		private List<String> sourceExcludes;
-
-		@Nullable
-		private List<String> sourceIncludes;
-
-		@Nullable
-		private String index;
-
-		@Nullable
-		private String pipeline;
-
-		@Nullable
-		private Refresh refresh;
-
-		@Nullable
-		private Boolean requireAlias;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private WaitForActiveShards waitForActiveShards;
-
-		private List<BulkOperation> operations;
-
-		/**
-		 * True or false to return the _source field or not, or default list of fields
-		 * to return, can be overridden on each sub-request
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(@Nullable SourceConfigParam value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * True or false to return the _source field or not, or default list of fields
-		 * to return, can be overridden on each sub-request
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(Function<SourceConfigParam.Builder, ObjectBuilder<SourceConfigParam>> fn) {
-			return this.source(fn.apply(new SourceConfigParam.Builder()).build());
-		}
-
-		/**
-		 * Default list of fields to exclude from the returned _source field, can be
-		 * overridden on each sub-request
-		 * <p>
-		 * API name: {@code _source_excludes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceExcludes</code>.
-		 */
-		public final Builder sourceExcludes(List<String> list) {
-			this.sourceExcludes = _listAddAll(this.sourceExcludes, list);
-			return this;
-		}
-
-		/**
-		 * Default list of fields to exclude from the returned _source field, can be
-		 * overridden on each sub-request
-		 * <p>
-		 * API name: {@code _source_excludes}
-		 * <p>
-		 * Adds one or more values to <code>sourceExcludes</code>.
-		 */
-		public final Builder sourceExcludes(String value, String... values) {
-			this.sourceExcludes = _listAdd(this.sourceExcludes, value, values);
-			return this;
-		}
-
-		/**
-		 * Default list of fields to extract and return from the _source field, can be
-		 * overridden on each sub-request
-		 * <p>
-		 * API name: {@code _source_includes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceIncludes</code>.
-		 */
-		public final Builder sourceIncludes(List<String> list) {
-			this.sourceIncludes = _listAddAll(this.sourceIncludes, list);
-			return this;
-		}
-
-		/**
-		 * Default list of fields to extract and return from the _source field, can be
-		 * overridden on each sub-request
-		 * <p>
-		 * API name: {@code _source_includes}
-		 * <p>
-		 * Adds one or more values to <code>sourceIncludes</code>.
-		 */
-		public final Builder sourceIncludes(String value, String... values) {
-			this.sourceIncludes = _listAdd(this.sourceIncludes, value, values);
-			return this;
-		}
-
-		/**
-		 * Default index for items which don't provide one
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * The pipeline id to preprocess incoming documents with
-		 * <p>
-		 * API name: {@code pipeline}
-		 */
-		public final Builder pipeline(@Nullable String value) {
-			this.pipeline = value;
-			return this;
-		}
-
-		/**
-		 * If <code>true</code> then refresh the affected shards to make this operation
-		 * visible to search, if <code>wait_for</code> then wait for a refresh to make
-		 * this operation visible to search, if <code>false</code> (the default) then do
-		 * nothing with refreshes.
-		 * <p>
-		 * API name: {@code refresh}
-		 */
-		public final Builder refresh(@Nullable Refresh value) {
-			this.refresh = value;
-			return this;
-		}
-
-		/**
-		 * Sets require_alias for all incoming documents. Defaults to unset (false)
-		 * <p>
-		 * API name: {@code require_alias}
-		 */
-		public final Builder requireAlias(@Nullable Boolean value) {
-			this.requireAlias = value;
-			return this;
-		}
-
-		/**
-		 * Specific routing value
-		 * <p>
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Sets the number of shard copies that must be active before proceeding with
-		 * the bulk operation. Defaults to 1, meaning the primary shard only. Set to
-		 * <code>all</code> for all shard copies, otherwise set to any non-negative
-		 * value less than or equal to the total number of copies for the shard (number
-		 * of replicas + 1)
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
-			this.waitForActiveShards = value;
-			return this;
-		}
-
-		/**
-		 * Sets the number of shard copies that must be active before proceeding with
-		 * the bulk operation. Defaults to 1, meaning the primary shard only. Set to
-		 * <code>all</code> for all shard copies, otherwise set to any non-negative
-		 * value less than or equal to the total number of copies for the shard (number
-		 * of replicas + 1)
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(
-				Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
-			return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
-		}
-
-		/**
-		 * Required - Request body.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>operations</code>.
-		 */
-		public final Builder operations(List<BulkOperation> list) {
-			this.operations = _listAddAll(this.operations, list);
-			return this;
-		}
-
-		/**
-		 * Required - Request body.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>operations</code>.
-		 */
-		public final Builder operations(BulkOperation value, BulkOperation... values) {
-			this.operations = _listAdd(this.operations, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Request body.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>operations</code> using a builder lambda.
-		 */
-		public final Builder operations(Function<BulkOperation.Builder, ObjectBuilder<BulkOperation>> fn) {
-			return operations(fn.apply(new BulkOperation.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link BulkRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public BulkRequest build() {
-			_checkSingleUse();
-
-			return new BulkRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code bulk}".
-	 */
-	public static final Endpoint<BulkRequest, BulkResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (request.index() != null)
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_bulk");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_bulk");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.pipeline != null) {
-					params.put("pipeline", request.pipeline);
-				}
-				if (request.routing != null) {
-					params.put("routing", request.routing);
-				}
-				if (request.requireAlias != null) {
-					params.put("require_alias", String.valueOf(request.requireAlias));
-				}
-				if (request.refresh != null) {
-					params.put("refresh", request.refresh.jsonValue());
-				}
-				if (request.waitForActiveShards != null) {
-					params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
-				}
-				if (request.source != null) {
-					params.put("_source", request.source._toJsonString());
-				}
-				if (ApiTypeHelper.isDefined(request.sourceExcludes)) {
-					params.put("_source_excludes",
-							request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (ApiTypeHelper.isDefined(request.sourceIncludes)) {
-					params.put("_source_includes",
-							request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, BulkResponse._DESERIALIZER);
+    @Nullable
+    private final SourceConfigParam source;
+
+    private final List<String> sourceExcludes;
+
+    private final List<String> sourceIncludes;
+
+    @Nullable
+    private final String index;
+
+    @Nullable
+    private final String pipeline;
+
+    @Nullable
+    private final Refresh refresh;
+
+    @Nullable
+    private final Boolean requireAlias;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final WaitForActiveShards waitForActiveShards;
+
+    private final List<BulkOperation> operations;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private BulkRequest(Builder builder) {
+
+        this.source = builder.source;
+        this.sourceExcludes = ApiTypeHelper.unmodifiable(builder.sourceExcludes);
+        this.sourceIncludes = ApiTypeHelper.unmodifiable(builder.sourceIncludes);
+        this.index = builder.index;
+        this.pipeline = builder.pipeline;
+        this.refresh = builder.refresh;
+        this.requireAlias = builder.requireAlias;
+        this.routing = builder.routing;
+        this.timeout = builder.timeout;
+        this.waitForActiveShards = builder.waitForActiveShards;
+        this.operations = ApiTypeHelper.unmodifiableRequired(builder.operations, this, "operations");
+
+    }
+
+    public static BulkRequest of(Function<Builder, ObjectBuilder<BulkRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    @Override
+    public Iterator<?> _serializables() {
+        return this.operations.iterator();
+    }
+
+    /**
+     * True or false to return the _source field or not, or default list of fields
+     * to return, can be overridden on each sub-request
+     * <p>
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final SourceConfigParam source() {
+        return this.source;
+    }
+
+    /**
+     * Default list of fields to exclude from the returned _source field, can be
+     * overridden on each sub-request
+     * <p>
+     * API name: {@code _source_excludes}
+     */
+    public final List<String> sourceExcludes() {
+        return this.sourceExcludes;
+    }
+
+    /**
+     * Default list of fields to extract and return from the _source field, can be
+     * overridden on each sub-request
+     * <p>
+     * API name: {@code _source_includes}
+     */
+    public final List<String> sourceIncludes() {
+        return this.sourceIncludes;
+    }
+
+    /**
+     * Default index for items which don't provide one
+     * <p>
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * The pipeline id to preprocess incoming documents with
+     * <p>
+     * API name: {@code pipeline}
+     */
+    @Nullable
+    public final String pipeline() {
+        return this.pipeline;
+    }
+
+    /**
+     * If <code>true</code> then refresh the affected shards to make this operation
+     * visible to search, if <code>wait_for</code> then wait for a refresh to make
+     * this operation visible to search, if <code>false</code> (the default) then do
+     * nothing with refreshes.
+     * <p>
+     * API name: {@code refresh}
+     */
+    @Nullable
+    public final Refresh refresh() {
+        return this.refresh;
+    }
+
+    /**
+     * Sets require_alias for all incoming documents. Defaults to unset (false)
+     * <p>
+     * API name: {@code require_alias}
+     */
+    @Nullable
+    public final Boolean requireAlias() {
+        return this.requireAlias;
+    }
+
+    /**
+     * Specific routing value
+     * <p>
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Sets the number of shard copies that must be active before proceeding with
+     * the bulk operation. Defaults to 1, meaning the primary shard only. Set to
+     * <code>all</code> for all shard copies, otherwise set to any non-negative
+     * value less than or equal to the total number of copies for the shard (number
+     * of replicas + 1)
+     * <p>
+     * API name: {@code wait_for_active_shards}
+     */
+    @Nullable
+    public final WaitForActiveShards waitForActiveShards() {
+        return this.waitForActiveShards;
+    }
+
+    /**
+     * Required - Request body.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<BulkOperation> operations() {
+        return this.operations;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (BulkOperation item0 : this.operations) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link BulkRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<BulkRequest> {
+        @Nullable
+        private SourceConfigParam source;
+
+        @Nullable
+        private List<String> sourceExcludes;
+
+        @Nullable
+        private List<String> sourceIncludes;
+
+        @Nullable
+        private String index;
+
+        @Nullable
+        private String pipeline;
+
+        @Nullable
+        private Refresh refresh;
+
+        @Nullable
+        private Boolean requireAlias;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private WaitForActiveShards waitForActiveShards;
+
+        private List<BulkOperation> operations;
+
+        /**
+         * True or false to return the _source field or not, or default list of fields
+         * to return, can be overridden on each sub-request
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(@Nullable SourceConfigParam value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * True or false to return the _source field or not, or default list of fields
+         * to return, can be overridden on each sub-request
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(Function<SourceConfigParam.Builder, ObjectBuilder<SourceConfigParam>> fn) {
+            return this.source(fn.apply(new SourceConfigParam.Builder()).build());
+        }
+
+        /**
+         * Default list of fields to exclude from the returned _source field, can be
+         * overridden on each sub-request
+         * <p>
+         * API name: {@code _source_excludes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceExcludes</code>.
+         */
+        public final Builder sourceExcludes(List<String> list) {
+            this.sourceExcludes = _listAddAll(this.sourceExcludes, list);
+            return this;
+        }
+
+        /**
+         * Default list of fields to exclude from the returned _source field, can be
+         * overridden on each sub-request
+         * <p>
+         * API name: {@code _source_excludes}
+         * <p>
+         * Adds one or more values to <code>sourceExcludes</code>.
+         */
+        public final Builder sourceExcludes(String value, String... values) {
+            this.sourceExcludes = _listAdd(this.sourceExcludes, value, values);
+            return this;
+        }
+
+        /**
+         * Default list of fields to extract and return from the _source field, can be
+         * overridden on each sub-request
+         * <p>
+         * API name: {@code _source_includes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceIncludes</code>.
+         */
+        public final Builder sourceIncludes(List<String> list) {
+            this.sourceIncludes = _listAddAll(this.sourceIncludes, list);
+            return this;
+        }
+
+        /**
+         * Default list of fields to extract and return from the _source field, can be
+         * overridden on each sub-request
+         * <p>
+         * API name: {@code _source_includes}
+         * <p>
+         * Adds one or more values to <code>sourceIncludes</code>.
+         */
+        public final Builder sourceIncludes(String value, String... values) {
+            this.sourceIncludes = _listAdd(this.sourceIncludes, value, values);
+            return this;
+        }
+
+        /**
+         * Default index for items which don't provide one
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * The pipeline id to preprocess incoming documents with
+         * <p>
+         * API name: {@code pipeline}
+         */
+        public final Builder pipeline(@Nullable String value) {
+            this.pipeline = value;
+            return this;
+        }
+
+        /**
+         * If <code>true</code> then refresh the affected shards to make this operation
+         * visible to search, if <code>wait_for</code> then wait for a refresh to make
+         * this operation visible to search, if <code>false</code> (the default) then do
+         * nothing with refreshes.
+         * <p>
+         * API name: {@code refresh}
+         */
+        public final Builder refresh(@Nullable Refresh value) {
+            this.refresh = value;
+            return this;
+        }
+
+        /**
+         * Sets require_alias for all incoming documents. Defaults to unset (false)
+         * <p>
+         * API name: {@code require_alias}
+         */
+        public final Builder requireAlias(@Nullable Boolean value) {
+            this.requireAlias = value;
+            return this;
+        }
+
+        /**
+         * Specific routing value
+         * <p>
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Sets the number of shard copies that must be active before proceeding with
+         * the bulk operation. Defaults to 1, meaning the primary shard only. Set to
+         * <code>all</code> for all shard copies, otherwise set to any non-negative
+         * value less than or equal to the total number of copies for the shard (number
+         * of replicas + 1)
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
+            this.waitForActiveShards = value;
+            return this;
+        }
+
+        /**
+         * Sets the number of shard copies that must be active before proceeding with
+         * the bulk operation. Defaults to 1, meaning the primary shard only. Set to
+         * <code>all</code> for all shard copies, otherwise set to any non-negative
+         * value less than or equal to the total number of copies for the shard (number
+         * of replicas + 1)
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
+            return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
+        }
+
+        /**
+         * Required - Request body.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>operations</code>.
+         */
+        public final Builder operations(List<BulkOperation> list) {
+            this.operations = _listAddAll(this.operations, list);
+            return this;
+        }
+
+        /**
+         * Required - Request body.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>operations</code>.
+         */
+        public final Builder operations(BulkOperation value, BulkOperation... values) {
+            this.operations = _listAdd(this.operations, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Request body.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>operations</code> using a builder lambda.
+         */
+        public final Builder operations(Function<BulkOperation.Builder, ObjectBuilder<BulkOperation>> fn) {
+            return operations(fn.apply(new BulkOperation.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link BulkRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public BulkRequest build() {
+            _checkSingleUse();
+
+            return new BulkRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code bulk}".
+     */
+    public static final Endpoint<BulkRequest, BulkResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (request.index() != null) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_bulk");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_bulk");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.pipeline != null) {
+                params.put("pipeline", request.pipeline);
+            }
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            if (request.requireAlias != null) {
+                params.put("require_alias", String.valueOf(request.requireAlias));
+            }
+            if (request.refresh != null) {
+                params.put("refresh", request.refresh.jsonValue());
+            }
+            if (request.waitForActiveShards != null) {
+                params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
+            }
+            if (request.source != null) {
+                params.put("_source", request.source._toJsonString());
+            }
+            if (ApiTypeHelper.isDefined(request.sourceExcludes)) {
+                params.put("_source_excludes", request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (ApiTypeHelper.isDefined(request.sourceIncludes)) {
+                params.put("_source_includes", request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        BulkResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/BulkResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/BulkResponse.java
index aed5b709df..13cbc5a1d8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/BulkResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/BulkResponse.java
@@ -32,212 +32,212 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch.core.bulk.BulkResponseItem;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.bulk.BulkResponseItem;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.bulk.Response
 
-
 @JsonpDeserializable
 public class BulkResponse implements JsonpSerializable {
-	private final boolean errors;
+    private final boolean errors;
 
-	private final List<BulkResponseItem> items;
+    private final List<BulkResponseItem> items;
 
-	private final long took;
+    private final long took;
 
-	@Nullable
-	private final Long ingestTook;
+    @Nullable
+    private final Long ingestTook;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private BulkResponse(Builder builder) {
+    private BulkResponse(Builder builder) {
 
-		this.errors = ApiTypeHelper.requireNonNull(builder.errors, this, "errors");
-		this.items = ApiTypeHelper.unmodifiableRequired(builder.items, this, "items");
-		this.took = ApiTypeHelper.requireNonNull(builder.took, this, "took");
-		this.ingestTook = builder.ingestTook;
+        this.errors = ApiTypeHelper.requireNonNull(builder.errors, this, "errors");
+        this.items = ApiTypeHelper.unmodifiableRequired(builder.items, this, "items");
+        this.took = ApiTypeHelper.requireNonNull(builder.took, this, "took");
+        this.ingestTook = builder.ingestTook;
 
-	}
-
-	public static BulkResponse of(Function<Builder, ObjectBuilder<BulkResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code errors}
-	 */
-	public final boolean errors() {
-		return this.errors;
-	}
-
-	/**
-	 * Required - API name: {@code items}
-	 */
-	public final List<BulkResponseItem> items() {
-		return this.items;
-	}
-
-	/**
-	 * Required - API name: {@code took}
-	 */
-	public final long took() {
-		return this.took;
-	}
-
-	/**
-	 * API name: {@code ingest_took}
-	 */
-	@Nullable
-	public final Long ingestTook() {
-		return this.ingestTook;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("errors");
-		generator.write(this.errors);
-
-		if (ApiTypeHelper.isDefined(this.items)) {
-			generator.writeKey("items");
-			generator.writeStartArray();
-			for (BulkResponseItem item0 : this.items) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("took");
-		generator.write(this.took);
-
-		if (this.ingestTook != null) {
-			generator.writeKey("ingest_took");
-			generator.write(this.ingestTook);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link BulkResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<BulkResponse> {
-		private Boolean errors;
-
-		private List<BulkResponseItem> items;
-
-		private Long took;
-
-		@Nullable
-		private Long ingestTook;
-
-		/**
-		 * Required - API name: {@code errors}
-		 */
-		public final Builder errors(boolean value) {
-			this.errors = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code items}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>items</code>.
-		 */
-		public final Builder items(List<BulkResponseItem> list) {
-			this.items = _listAddAll(this.items, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code items}
-		 * <p>
-		 * Adds one or more values to <code>items</code>.
-		 */
-		public final Builder items(BulkResponseItem value, BulkResponseItem... values) {
-			this.items = _listAdd(this.items, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code items}
-		 * <p>
-		 * Adds a value to <code>items</code> using a builder lambda.
-		 */
-		public final Builder items(Function<BulkResponseItem.Builder, ObjectBuilder<BulkResponseItem>> fn) {
-			return items(fn.apply(new BulkResponseItem.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code took}
-		 */
-		public final Builder took(long value) {
-			this.took = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ingest_took}
-		 */
-		public final Builder ingestTook(@Nullable Long value) {
-			this.ingestTook = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link BulkResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public BulkResponse build() {
-			_checkSingleUse();
-
-			return new BulkResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link BulkResponse}
-	 */
-	public static final JsonpDeserializer<BulkResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			BulkResponse::setupBulkResponseDeserializer);
-
-	protected static void setupBulkResponseDeserializer(ObjectDeserializer<BulkResponse.Builder> op) {
-
-		op.add(Builder::errors, JsonpDeserializer.booleanDeserializer(), "errors");
-		op.add(Builder::items, JsonpDeserializer.arrayDeserializer(BulkResponseItem._DESERIALIZER), "items");
-		op.add(Builder::took, JsonpDeserializer.longDeserializer(), "took");
-		op.add(Builder::ingestTook, JsonpDeserializer.longDeserializer(), "ingest_took");
-
-	}
+    }
+
+    public static BulkResponse of(Function<Builder, ObjectBuilder<BulkResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code errors}
+     */
+    public final boolean errors() {
+        return this.errors;
+    }
+
+    /**
+     * Required - API name: {@code items}
+     */
+    public final List<BulkResponseItem> items() {
+        return this.items;
+    }
+
+    /**
+     * Required - API name: {@code took}
+     */
+    public final long took() {
+        return this.took;
+    }
+
+    /**
+     * API name: {@code ingest_took}
+     */
+    @Nullable
+    public final Long ingestTook() {
+        return this.ingestTook;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("errors");
+        generator.write(this.errors);
+
+        if (ApiTypeHelper.isDefined(this.items)) {
+            generator.writeKey("items");
+            generator.writeStartArray();
+            for (BulkResponseItem item0 : this.items) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("took");
+        generator.write(this.took);
+
+        if (this.ingestTook != null) {
+            generator.writeKey("ingest_took");
+            generator.write(this.ingestTook);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link BulkResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<BulkResponse> {
+        private Boolean errors;
+
+        private List<BulkResponseItem> items;
+
+        private Long took;
+
+        @Nullable
+        private Long ingestTook;
+
+        /**
+         * Required - API name: {@code errors}
+         */
+        public final Builder errors(boolean value) {
+            this.errors = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code items}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>items</code>.
+         */
+        public final Builder items(List<BulkResponseItem> list) {
+            this.items = _listAddAll(this.items, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code items}
+         * <p>
+         * Adds one or more values to <code>items</code>.
+         */
+        public final Builder items(BulkResponseItem value, BulkResponseItem... values) {
+            this.items = _listAdd(this.items, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code items}
+         * <p>
+         * Adds a value to <code>items</code> using a builder lambda.
+         */
+        public final Builder items(Function<BulkResponseItem.Builder, ObjectBuilder<BulkResponseItem>> fn) {
+            return items(fn.apply(new BulkResponseItem.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code took}
+         */
+        public final Builder took(long value) {
+            this.took = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ingest_took}
+         */
+        public final Builder ingestTook(@Nullable Long value) {
+            this.ingestTook = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link BulkResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public BulkResponse build() {
+            _checkSingleUse();
+
+            return new BulkResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link BulkResponse}
+     */
+    public static final JsonpDeserializer<BulkResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        BulkResponse::setupBulkResponseDeserializer
+    );
+
+    protected static void setupBulkResponseDeserializer(ObjectDeserializer<BulkResponse.Builder> op) {
+
+        op.add(Builder::errors, JsonpDeserializer.booleanDeserializer(), "errors");
+        op.add(Builder::items, JsonpDeserializer.arrayDeserializer(BulkResponseItem._DESERIALIZER), "items");
+        op.add(Builder::took, JsonpDeserializer.longDeserializer(), "took");
+        op.add(Builder::ingestTook, JsonpDeserializer.longDeserializer(), "ingest_took");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/ClearScrollRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/ClearScrollRequest.java
index 01c81f67e0..cdc60d9114 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/ClearScrollRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/ClearScrollRequest.java
@@ -32,159 +32,163 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.clear_scroll.Request
 
 /**
  * Explicitly clears the search context for a scroll.
- * 
+ *
  */
 @JsonpDeserializable
 public class ClearScrollRequest extends RequestBase implements JsonpSerializable {
-	private final List<String> scrollId;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClearScrollRequest(Builder builder) {
-
-		this.scrollId = ApiTypeHelper.unmodifiable(builder.scrollId);
-
-	}
-
-	public static ClearScrollRequest of(Function<Builder, ObjectBuilder<ClearScrollRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code scroll_id}
-	 */
-	public final List<String> scrollId() {
-		return this.scrollId;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.scrollId)) {
-			generator.writeKey("scroll_id");
-			generator.writeStartArray();
-			for (String item0 : this.scrollId) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClearScrollRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClearScrollRequest> {
-		@Nullable
-		private List<String> scrollId;
-
-		/**
-		 * API name: {@code scroll_id}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>scrollId</code>.
-		 */
-		public final Builder scrollId(List<String> list) {
-			this.scrollId = _listAddAll(this.scrollId, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code scroll_id}
-		 * <p>
-		 * Adds one or more values to <code>scrollId</code>.
-		 */
-		public final Builder scrollId(String value, String... values) {
-			this.scrollId = _listAdd(this.scrollId, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ClearScrollRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClearScrollRequest build() {
-			_checkSingleUse();
-
-			return new ClearScrollRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ClearScrollRequest}
-	 */
-	public static final JsonpDeserializer<ClearScrollRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClearScrollRequest::setupClearScrollRequestDeserializer);
-
-	protected static void setupClearScrollRequestDeserializer(ObjectDeserializer<ClearScrollRequest.Builder> op) {
-
-		op.add(Builder::scrollId, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"scroll_id");
+    private final List<String> scrollId;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClearScrollRequest(Builder builder) {
 
-	}
+        this.scrollId = ApiTypeHelper.unmodifiable(builder.scrollId);
+
+    }
+
+    public static ClearScrollRequest of(Function<Builder, ObjectBuilder<ClearScrollRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code scroll_id}
+     */
+    public final List<String> scrollId() {
+        return this.scrollId;
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	/**
-	 * Endpoint "{@code clear_scroll}".
-	 */
-	public static final Endpoint<ClearScrollRequest, ClearScrollResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "DELETE";
-
-			},
-
-			// Request path
-			request -> {
-				return "/_search/scroll";
-
-			},
-
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.scrollId)) {
+            generator.writeKey("scroll_id");
+            generator.writeStartArray();
+            for (String item0 : this.scrollId) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClearScrollRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClearScrollRequest> {
+        @Nullable
+        private List<String> scrollId;
+
+        /**
+         * API name: {@code scroll_id}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>scrollId</code>.
+         */
+        public final Builder scrollId(List<String> list) {
+            this.scrollId = _listAddAll(this.scrollId, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code scroll_id}
+         * <p>
+         * Adds one or more values to <code>scrollId</code>.
+         */
+        public final Builder scrollId(String value, String... values) {
+            this.scrollId = _listAdd(this.scrollId, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link ClearScrollRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClearScrollRequest build() {
+            _checkSingleUse();
+
+            return new ClearScrollRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ClearScrollRequest}
+     */
+    public static final JsonpDeserializer<ClearScrollRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClearScrollRequest::setupClearScrollRequestDeserializer
+    );
+
+    protected static void setupClearScrollRequestDeserializer(ObjectDeserializer<ClearScrollRequest.Builder> op) {
+
+        op.add(Builder::scrollId, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "scroll_id");
 
-			}, SimpleEndpoint.emptyMap(), true, ClearScrollResponse._DESERIALIZER);
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code clear_scroll}".
+     */
+    public static final Endpoint<ClearScrollRequest, ClearScrollResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "DELETE";
+
+        },
+
+        // Request path
+        request -> {
+            return "/_search/scroll";
+
+        },
+
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        ClearScrollResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/ClearScrollResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/ClearScrollResponse.java
index 5e8a01a8aa..017d435173 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/ClearScrollResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/ClearScrollResponse.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,116 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.clear_scroll.Response
 
 @JsonpDeserializable
 public class ClearScrollResponse implements JsonpSerializable {
-	private final boolean succeeded;
-
-	private final int numFreed;
-
-	// ---------------------------------------------------------------------------------------------
+    private final boolean succeeded;
 
-	private ClearScrollResponse(Builder builder) {
+    private final int numFreed;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.succeeded = ApiTypeHelper.requireNonNull(builder.succeeded, this, "succeeded");
-		this.numFreed = ApiTypeHelper.requireNonNull(builder.numFreed, this, "numFreed");
+    private ClearScrollResponse(Builder builder) {
 
-	}
+        this.succeeded = ApiTypeHelper.requireNonNull(builder.succeeded, this, "succeeded");
+        this.numFreed = ApiTypeHelper.requireNonNull(builder.numFreed, this, "numFreed");
 
-	public static ClearScrollResponse of(Function<Builder, ObjectBuilder<ClearScrollResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code succeeded}
-	 */
-	public final boolean succeeded() {
-		return this.succeeded;
-	}
+    public static ClearScrollResponse of(Function<Builder, ObjectBuilder<ClearScrollResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code num_freed}
-	 */
-	public final int numFreed() {
-		return this.numFreed;
-	}
+    /**
+     * Required - API name: {@code succeeded}
+     */
+    public final boolean succeeded() {
+        return this.succeeded;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code num_freed}
+     */
+    public final int numFreed() {
+        return this.numFreed;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("succeeded");
-		generator.write(this.succeeded);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("num_freed");
-		generator.write(this.numFreed);
+        generator.writeKey("succeeded");
+        generator.write(this.succeeded);
 
-	}
+        generator.writeKey("num_freed");
+        generator.write(this.numFreed);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link ClearScrollResponse}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClearScrollResponse> {
-		private Boolean succeeded;
+    /**
+     * Builder for {@link ClearScrollResponse}.
+     */
 
-		private Integer numFreed;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClearScrollResponse> {
+        private Boolean succeeded;
 
-		/**
-		 * Required - API name: {@code succeeded}
-		 */
-		public final Builder succeeded(boolean value) {
-			this.succeeded = value;
-			return this;
-		}
+        private Integer numFreed;
 
-		/**
-		 * Required - API name: {@code num_freed}
-		 */
-		public final Builder numFreed(int value) {
-			this.numFreed = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code succeeded}
+         */
+        public final Builder succeeded(boolean value) {
+            this.succeeded = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link ClearScrollResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClearScrollResponse build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code num_freed}
+         */
+        public final Builder numFreed(int value) {
+            this.numFreed = value;
+            return this;
+        }
 
-			return new ClearScrollResponse(this);
-		}
-	}
+        /**
+         * Builds a {@link ClearScrollResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClearScrollResponse build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new ClearScrollResponse(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link ClearScrollResponse}
-	 */
-	public static final JsonpDeserializer<ClearScrollResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClearScrollResponse::setupClearScrollResponseDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupClearScrollResponseDeserializer(ObjectDeserializer<ClearScrollResponse.Builder> op) {
+    /**
+     * Json deserializer for {@link ClearScrollResponse}
+     */
+    public static final JsonpDeserializer<ClearScrollResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClearScrollResponse::setupClearScrollResponseDeserializer
+    );
 
-		op.add(Builder::succeeded, JsonpDeserializer.booleanDeserializer(), "succeeded");
-		op.add(Builder::numFreed, JsonpDeserializer.integerDeserializer(), "num_freed");
+    protected static void setupClearScrollResponseDeserializer(ObjectDeserializer<ClearScrollResponse.Builder> op) {
 
-	}
+        op.add(Builder::succeeded, JsonpDeserializer.booleanDeserializer(), "succeeded");
+        op.add(Builder::numFreed, JsonpDeserializer.integerDeserializer(), "num_freed");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/CountRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/CountRequest.java
index 6b44fe2991..ed09854919 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/CountRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/CountRequest.java
@@ -32,30 +32,29 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.ExpandWildcard;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.query_dsl.Operator;
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.ExpandWildcard;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.query_dsl.Operator;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: _global.count.Request
 
@@ -65,638 +64,641 @@
  */
 @JsonpDeserializable
 public class CountRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	@Nullable
-	private final Boolean analyzeWildcard;
-
-	@Nullable
-	private final String analyzer;
-
-	@Nullable
-	private final Operator defaultOperator;
-
-	@Nullable
-	private final String df;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean ignoreThrottled;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Boolean lenient;
-
-	@Nullable
-	private final Double minScore;
-
-	@Nullable
-	private final String preference;
-
-	@Nullable
-	private final String q;
-
-	@Nullable
-	private final Query query;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final Long terminateAfter;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CountRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.analyzeWildcard = builder.analyzeWildcard;
-		this.analyzer = builder.analyzer;
-		this.defaultOperator = builder.defaultOperator;
-		this.df = builder.df;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.ignoreThrottled = builder.ignoreThrottled;
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.lenient = builder.lenient;
-		this.minScore = builder.minScore;
-		this.preference = builder.preference;
-		this.q = builder.q;
-		this.query = builder.query;
-		this.routing = builder.routing;
-		this.terminateAfter = builder.terminateAfter;
-
-	}
-
-	public static CountRequest of(Function<Builder, ObjectBuilder<CountRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Specify whether wildcard and prefix queries should be analyzed (default:
-	 * false)
-	 * <p>
-	 * API name: {@code analyze_wildcard}
-	 */
-	@Nullable
-	public final Boolean analyzeWildcard() {
-		return this.analyzeWildcard;
-	}
-
-	/**
-	 * The analyzer to use for the query string
-	 * <p>
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * The default operator for query string query (AND or OR)
-	 * <p>
-	 * API name: {@code default_operator}
-	 */
-	@Nullable
-	public final Operator defaultOperator() {
-		return this.defaultOperator;
-	}
-
-	/**
-	 * The field to use as default where no field prefix is given in the query
-	 * string
-	 * <p>
-	 * API name: {@code df}
-	 */
-	@Nullable
-	public final String df() {
-		return this.df;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Whether specified concrete, expanded or aliased indices should be ignored
-	 * when throttled
-	 * <p>
-	 * API name: {@code ignore_throttled}
-	 */
-	@Nullable
-	public final Boolean ignoreThrottled() {
-		return this.ignoreThrottled;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * A comma-separated list of indices to restrict the results
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Specify whether format-based query failures (such as providing text to a
-	 * numeric field) should be ignored
-	 * <p>
-	 * API name: {@code lenient}
-	 */
-	@Nullable
-	public final Boolean lenient() {
-		return this.lenient;
-	}
-
-	/**
-	 * Include only documents with a specific <code>_score</code> value in the
-	 * result
-	 * <p>
-	 * API name: {@code min_score}
-	 */
-	@Nullable
-	public final Double minScore() {
-		return this.minScore;
-	}
-
-	/**
-	 * Specify the node or shard the operation should be performed on (default:
-	 * random)
-	 * <p>
-	 * API name: {@code preference}
-	 */
-	@Nullable
-	public final String preference() {
-		return this.preference;
-	}
-
-	/**
-	 * Query in the Lucene query string syntax
-	 * <p>
-	 * API name: {@code q}
-	 */
-	@Nullable
-	public final String q() {
-		return this.q;
-	}
-
-	/**
-	 * API name: {@code query}
-	 */
-	@Nullable
-	public final Query query() {
-		return this.query;
-	}
-
-	/**
-	 * A comma-separated list of specific routing values
-	 * <p>
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * The maximum count for each shard, upon reaching which the query execution
-	 * will terminate early
-	 * <p>
-	 * API name: {@code terminate_after}
-	 */
-	@Nullable
-	public final Long terminateAfter() {
-		return this.terminateAfter;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.query != null) {
-			generator.writeKey("query");
-			this.query.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CountRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CountRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private Boolean analyzeWildcard;
-
-		@Nullable
-		private String analyzer;
-
-		@Nullable
-		private Operator defaultOperator;
-
-		@Nullable
-		private String df;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean ignoreThrottled;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private Boolean lenient;
-
-		@Nullable
-		private Double minScore;
-
-		@Nullable
-		private String preference;
-
-		@Nullable
-		private String q;
-
-		@Nullable
-		private Query query;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private Long terminateAfter;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Specify whether wildcard and prefix queries should be analyzed (default:
-		 * false)
-		 * <p>
-		 * API name: {@code analyze_wildcard}
-		 */
-		public final Builder analyzeWildcard(@Nullable Boolean value) {
-			this.analyzeWildcard = value;
-			return this;
-		}
-
-		/**
-		 * The analyzer to use for the query string
-		 * <p>
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * The default operator for query string query (AND or OR)
-		 * <p>
-		 * API name: {@code default_operator}
-		 */
-		public final Builder defaultOperator(@Nullable Operator value) {
-			this.defaultOperator = value;
-			return this;
-		}
-
-		/**
-		 * The field to use as default where no field prefix is given in the query
-		 * string
-		 * <p>
-		 * API name: {@code df}
-		 */
-		public final Builder df(@Nullable String value) {
-			this.df = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete, expanded or aliased indices should be ignored
-		 * when throttled
-		 * <p>
-		 * API name: {@code ignore_throttled}
-		 */
-		public final Builder ignoreThrottled(@Nullable Boolean value) {
-			this.ignoreThrottled = value;
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of indices to restrict the results
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of indices to restrict the results
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Specify whether format-based query failures (such as providing text to a
-		 * numeric field) should be ignored
-		 * <p>
-		 * API name: {@code lenient}
-		 */
-		public final Builder lenient(@Nullable Boolean value) {
-			this.lenient = value;
-			return this;
-		}
-
-		/**
-		 * Include only documents with a specific <code>_score</code> value in the
-		 * result
-		 * <p>
-		 * API name: {@code min_score}
-		 */
-		public final Builder minScore(@Nullable Double value) {
-			this.minScore = value;
-			return this;
-		}
-
-		/**
-		 * Specify the node or shard the operation should be performed on (default:
-		 * random)
-		 * <p>
-		 * API name: {@code preference}
-		 */
-		public final Builder preference(@Nullable String value) {
-			this.preference = value;
-			return this;
-		}
-
-		/**
-		 * Query in the Lucene query string syntax
-		 * <p>
-		 * API name: {@code q}
-		 */
-		public final Builder q(@Nullable String value) {
-			this.q = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code query}
-		 */
-		public final Builder query(@Nullable Query value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code query}
-		 */
-		public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.query(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * A comma-separated list of specific routing values
-		 * <p>
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * The maximum count for each shard, upon reaching which the query execution
-		 * will terminate early
-		 * <p>
-		 * API name: {@code terminate_after}
-		 */
-		public final Builder terminateAfter(@Nullable Long value) {
-			this.terminateAfter = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CountRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CountRequest build() {
-			_checkSingleUse();
-
-			return new CountRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CountRequest}
-	 */
-	public static final JsonpDeserializer<CountRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CountRequest::setupCountRequestDeserializer);
-
-	protected static void setupCountRequestDeserializer(ObjectDeserializer<CountRequest.Builder> op) {
-
-		op.add(Builder::query, Query._DESERIALIZER, "query");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code count}".
-	 */
-	public static final Endpoint<CountRequest, CountResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_count");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_count");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.df != null) {
-					params.put("df", request.df);
-				}
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.preference != null) {
-					params.put("preference", request.preference);
-				}
-				if (request.analyzeWildcard != null) {
-					params.put("analyze_wildcard", String.valueOf(request.analyzeWildcard));
-				}
-				if (request.terminateAfter != null) {
-					params.put("terminate_after", String.valueOf(request.terminateAfter));
-				}
-				if (request.lenient != null) {
-					params.put("lenient", String.valueOf(request.lenient));
-				}
-				if (request.minScore != null) {
-					params.put("min_score", String.valueOf(request.minScore));
-				}
-				if (request.routing != null) {
-					params.put("routing", request.routing);
-				}
-				if (request.q != null) {
-					params.put("q", request.q);
-				}
-				if (request.defaultOperator != null) {
-					params.put("default_operator", request.defaultOperator.jsonValue());
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.analyzer != null) {
-					params.put("analyzer", request.analyzer);
-				}
-				if (request.ignoreThrottled != null) {
-					params.put("ignore_throttled", String.valueOf(request.ignoreThrottled));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, CountResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    @Nullable
+    private final Boolean analyzeWildcard;
+
+    @Nullable
+    private final String analyzer;
+
+    @Nullable
+    private final Operator defaultOperator;
+
+    @Nullable
+    private final String df;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean ignoreThrottled;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Boolean lenient;
+
+    @Nullable
+    private final Double minScore;
+
+    @Nullable
+    private final String preference;
+
+    @Nullable
+    private final String q;
+
+    @Nullable
+    private final Query query;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final Long terminateAfter;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CountRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.analyzeWildcard = builder.analyzeWildcard;
+        this.analyzer = builder.analyzer;
+        this.defaultOperator = builder.defaultOperator;
+        this.df = builder.df;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.ignoreThrottled = builder.ignoreThrottled;
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.lenient = builder.lenient;
+        this.minScore = builder.minScore;
+        this.preference = builder.preference;
+        this.q = builder.q;
+        this.query = builder.query;
+        this.routing = builder.routing;
+        this.terminateAfter = builder.terminateAfter;
+
+    }
+
+    public static CountRequest of(Function<Builder, ObjectBuilder<CountRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Specify whether wildcard and prefix queries should be analyzed (default:
+     * false)
+     * <p>
+     * API name: {@code analyze_wildcard}
+     */
+    @Nullable
+    public final Boolean analyzeWildcard() {
+        return this.analyzeWildcard;
+    }
+
+    /**
+     * The analyzer to use for the query string
+     * <p>
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * The default operator for query string query (AND or OR)
+     * <p>
+     * API name: {@code default_operator}
+     */
+    @Nullable
+    public final Operator defaultOperator() {
+        return this.defaultOperator;
+    }
+
+    /**
+     * The field to use as default where no field prefix is given in the query
+     * string
+     * <p>
+     * API name: {@code df}
+     */
+    @Nullable
+    public final String df() {
+        return this.df;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Whether specified concrete, expanded or aliased indices should be ignored
+     * when throttled
+     * <p>
+     * API name: {@code ignore_throttled}
+     */
+    @Nullable
+    public final Boolean ignoreThrottled() {
+        return this.ignoreThrottled;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * A comma-separated list of indices to restrict the results
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Specify whether format-based query failures (such as providing text to a
+     * numeric field) should be ignored
+     * <p>
+     * API name: {@code lenient}
+     */
+    @Nullable
+    public final Boolean lenient() {
+        return this.lenient;
+    }
+
+    /**
+     * Include only documents with a specific <code>_score</code> value in the
+     * result
+     * <p>
+     * API name: {@code min_score}
+     */
+    @Nullable
+    public final Double minScore() {
+        return this.minScore;
+    }
+
+    /**
+     * Specify the node or shard the operation should be performed on (default:
+     * random)
+     * <p>
+     * API name: {@code preference}
+     */
+    @Nullable
+    public final String preference() {
+        return this.preference;
+    }
+
+    /**
+     * Query in the Lucene query string syntax
+     * <p>
+     * API name: {@code q}
+     */
+    @Nullable
+    public final String q() {
+        return this.q;
+    }
+
+    /**
+     * API name: {@code query}
+     */
+    @Nullable
+    public final Query query() {
+        return this.query;
+    }
+
+    /**
+     * A comma-separated list of specific routing values
+     * <p>
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * The maximum count for each shard, upon reaching which the query execution
+     * will terminate early
+     * <p>
+     * API name: {@code terminate_after}
+     */
+    @Nullable
+    public final Long terminateAfter() {
+        return this.terminateAfter;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.query != null) {
+            generator.writeKey("query");
+            this.query.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CountRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CountRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private Boolean analyzeWildcard;
+
+        @Nullable
+        private String analyzer;
+
+        @Nullable
+        private Operator defaultOperator;
+
+        @Nullable
+        private String df;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean ignoreThrottled;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private Boolean lenient;
+
+        @Nullable
+        private Double minScore;
+
+        @Nullable
+        private String preference;
+
+        @Nullable
+        private String q;
+
+        @Nullable
+        private Query query;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private Long terminateAfter;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Specify whether wildcard and prefix queries should be analyzed (default:
+         * false)
+         * <p>
+         * API name: {@code analyze_wildcard}
+         */
+        public final Builder analyzeWildcard(@Nullable Boolean value) {
+            this.analyzeWildcard = value;
+            return this;
+        }
+
+        /**
+         * The analyzer to use for the query string
+         * <p>
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * The default operator for query string query (AND or OR)
+         * <p>
+         * API name: {@code default_operator}
+         */
+        public final Builder defaultOperator(@Nullable Operator value) {
+            this.defaultOperator = value;
+            return this;
+        }
+
+        /**
+         * The field to use as default where no field prefix is given in the query
+         * string
+         * <p>
+         * API name: {@code df}
+         */
+        public final Builder df(@Nullable String value) {
+            this.df = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Whether specified concrete, expanded or aliased indices should be ignored
+         * when throttled
+         * <p>
+         * API name: {@code ignore_throttled}
+         */
+        public final Builder ignoreThrottled(@Nullable Boolean value) {
+            this.ignoreThrottled = value;
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of indices to restrict the results
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of indices to restrict the results
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Specify whether format-based query failures (such as providing text to a
+         * numeric field) should be ignored
+         * <p>
+         * API name: {@code lenient}
+         */
+        public final Builder lenient(@Nullable Boolean value) {
+            this.lenient = value;
+            return this;
+        }
+
+        /**
+         * Include only documents with a specific <code>_score</code> value in the
+         * result
+         * <p>
+         * API name: {@code min_score}
+         */
+        public final Builder minScore(@Nullable Double value) {
+            this.minScore = value;
+            return this;
+        }
+
+        /**
+         * Specify the node or shard the operation should be performed on (default:
+         * random)
+         * <p>
+         * API name: {@code preference}
+         */
+        public final Builder preference(@Nullable String value) {
+            this.preference = value;
+            return this;
+        }
+
+        /**
+         * Query in the Lucene query string syntax
+         * <p>
+         * API name: {@code q}
+         */
+        public final Builder q(@Nullable String value) {
+            this.q = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code query}
+         */
+        public final Builder query(@Nullable Query value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code query}
+         */
+        public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.query(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * A comma-separated list of specific routing values
+         * <p>
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * The maximum count for each shard, upon reaching which the query execution
+         * will terminate early
+         * <p>
+         * API name: {@code terminate_after}
+         */
+        public final Builder terminateAfter(@Nullable Long value) {
+            this.terminateAfter = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link CountRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CountRequest build() {
+            _checkSingleUse();
+
+            return new CountRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CountRequest}
+     */
+    public static final JsonpDeserializer<CountRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CountRequest::setupCountRequestDeserializer
+    );
+
+    protected static void setupCountRequestDeserializer(ObjectDeserializer<CountRequest.Builder> op) {
+
+        op.add(Builder::query, Query._DESERIALIZER, "query");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code count}".
+     */
+    public static final Endpoint<CountRequest, CountResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_count");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_count");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.df != null) {
+                params.put("df", request.df);
+            }
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.preference != null) {
+                params.put("preference", request.preference);
+            }
+            if (request.analyzeWildcard != null) {
+                params.put("analyze_wildcard", String.valueOf(request.analyzeWildcard));
+            }
+            if (request.terminateAfter != null) {
+                params.put("terminate_after", String.valueOf(request.terminateAfter));
+            }
+            if (request.lenient != null) {
+                params.put("lenient", String.valueOf(request.lenient));
+            }
+            if (request.minScore != null) {
+                params.put("min_score", String.valueOf(request.minScore));
+            }
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            if (request.q != null) {
+                params.put("q", request.q);
+            }
+            if (request.defaultOperator != null) {
+                params.put("default_operator", request.defaultOperator.jsonValue());
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.analyzer != null) {
+                params.put("analyzer", request.analyzer);
+            }
+            if (request.ignoreThrottled != null) {
+                params.put("ignore_throttled", String.valueOf(request.ignoreThrottled));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        CountResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/CountResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/CountResponse.java
index c9556a17b5..05e477eafe 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/CountResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/CountResponse.java
@@ -32,134 +32,135 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.ShardStatistics;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ShardStatistics;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _global.count.Response
 
 @JsonpDeserializable
 public class CountResponse implements JsonpSerializable {
-	private final long count;
-
-	private final ShardStatistics shards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CountResponse(Builder builder) {
-
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
-
-	}
-
-	public static CountResponse of(Function<Builder, ObjectBuilder<CountResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code count}
-	 */
-	public final long count() {
-		return this.count;
-	}
-
-	/**
-	 * Required - API name: {@code _shards}
-	 */
-	public final ShardStatistics shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("count");
-		generator.write(this.count);
-
-		generator.writeKey("_shards");
-		this.shards.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CountResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CountResponse> {
-		private Long count;
-
-		private ShardStatistics shards;
-
-		/**
-		 * Required - API name: {@code count}
-		 */
-		public final Builder count(long value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _shards}
-		 */
-		public final Builder shards(ShardStatistics value) {
-			this.shards = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _shards}
-		 */
-		public final Builder shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
-			return this.shards(fn.apply(new ShardStatistics.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link CountResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CountResponse build() {
-			_checkSingleUse();
-
-			return new CountResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CountResponse}
-	 */
-	public static final JsonpDeserializer<CountResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CountResponse::setupCountResponseDeserializer);
-
-	protected static void setupCountResponseDeserializer(ObjectDeserializer<CountResponse.Builder> op) {
-
-		op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
-		op.add(Builder::shards, ShardStatistics._DESERIALIZER, "_shards");
-
-	}
+    private final long count;
+
+    private final ShardStatistics shards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CountResponse(Builder builder) {
+
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
+
+    }
+
+    public static CountResponse of(Function<Builder, ObjectBuilder<CountResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code count}
+     */
+    public final long count() {
+        return this.count;
+    }
+
+    /**
+     * Required - API name: {@code _shards}
+     */
+    public final ShardStatistics shards() {
+        return this.shards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("count");
+        generator.write(this.count);
+
+        generator.writeKey("_shards");
+        this.shards.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CountResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CountResponse> {
+        private Long count;
+
+        private ShardStatistics shards;
+
+        /**
+         * Required - API name: {@code count}
+         */
+        public final Builder count(long value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _shards}
+         */
+        public final Builder shards(ShardStatistics value) {
+            this.shards = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _shards}
+         */
+        public final Builder shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
+            return this.shards(fn.apply(new ShardStatistics.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link CountResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CountResponse build() {
+            _checkSingleUse();
+
+            return new CountResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CountResponse}
+     */
+    public static final JsonpDeserializer<CountResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CountResponse::setupCountResponseDeserializer
+    );
+
+    protected static void setupCountResponseDeserializer(ObjectDeserializer<CountResponse.Builder> op) {
+
+        op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
+        op.add(Builder::shards, ShardStatistics._DESERIALIZER, "_shards");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/CreateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/CreateRequest.java
index 0de43c0dbf..62a02ca9a1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/CreateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/CreateRequest.java
@@ -32,28 +32,27 @@
 
 package org.opensearch.client.opensearch.core;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.json.JsonpSerializer;
+import org.opensearch.client.json.JsonpUtils;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.Refresh;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
 import org.opensearch.client.opensearch._types.VersionType;
 import org.opensearch.client.opensearch._types.WaitForActiveShards;
-import org.opensearch.client.json.JsonpDeserializer;
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
-import org.opensearch.client.json.JsonpSerializer;
-import org.opensearch.client.json.JsonpUtils;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.create.Request
 
@@ -66,432 +65,435 @@
  */
 
 public class CreateRequest<TDocument> extends RequestBase implements JsonpSerializable {
-	private final String id;
-
-	private final String index;
-
-	@Nullable
-	private final String pipeline;
-
-	@Nullable
-	private final Refresh refresh;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final Long version;
-
-	@Nullable
-	private final VersionType versionType;
-
-	@Nullable
-	private final WaitForActiveShards waitForActiveShards;
-
-	private final TDocument document;
-
-	@Nullable
-	private final JsonpSerializer<TDocument> tDocumentSerializer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CreateRequest(Builder<TDocument> builder) {
-
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.pipeline = builder.pipeline;
-		this.refresh = builder.refresh;
-		this.routing = builder.routing;
-		this.timeout = builder.timeout;
-		this.version = builder.version;
-		this.versionType = builder.versionType;
-		this.waitForActiveShards = builder.waitForActiveShards;
-		this.document = ApiTypeHelper.requireNonNull(builder.document, this, "document");
-		this.tDocumentSerializer = builder.tDocumentSerializer;
-
-	}
-
-	public static <TDocument> CreateRequest<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<CreateRequest<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * Required - Document ID
-	 * <p>
-	 * API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - The name of the index
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * The pipeline id to preprocess incoming documents with
-	 * <p>
-	 * API name: {@code pipeline}
-	 */
-	@Nullable
-	public final String pipeline() {
-		return this.pipeline;
-	}
-
-	/**
-	 * If <code>true</code> then refresh the affected shards to make this operation
-	 * visible to search, if <code>wait_for</code> then wait for a refresh to make
-	 * this operation visible to search, if <code>false</code> (the default) then do
-	 * nothing with refreshes.
-	 * <p>
-	 * API name: {@code refresh}
-	 */
-	@Nullable
-	public final Refresh refresh() {
-		return this.refresh;
-	}
-
-	/**
-	 * Specific routing value
-	 * <p>
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Explicit version number for concurrency control
-	 * <p>
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * Specific version type
-	 * <p>
-	 * API name: {@code version_type}
-	 */
-	@Nullable
-	public final VersionType versionType() {
-		return this.versionType;
-	}
-
-	/**
-	 * Sets the number of shard copies that must be active before proceeding with
-	 * the index operation. Defaults to 1, meaning the primary shard only. Set to
-	 * <code>all</code> for all shard copies, otherwise set to any non-negative
-	 * value less than or equal to the total number of copies for the shard (number
-	 * of replicas + 1)
-	 * <p>
-	 * API name: {@code wait_for_active_shards}
-	 */
-	@Nullable
-	public final WaitForActiveShards waitForActiveShards() {
-		return this.waitForActiveShards;
-	}
-
-	/**
-	 * Required - Request body.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final TDocument document() {
-		return this.document;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		JsonpUtils.serialize(this.document, generator, tDocumentSerializer, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CreateRequest}.
-	 */
-
-	public static class Builder<TDocument> extends ObjectBuilderBase
-			implements
-				ObjectBuilder<CreateRequest<TDocument>> {
-		private String id;
-
-		private String index;
-
-		@Nullable
-		private String pipeline;
-
-		@Nullable
-		private Refresh refresh;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private Long version;
-
-		@Nullable
-		private VersionType versionType;
-
-		@Nullable
-		private WaitForActiveShards waitForActiveShards;
-
-		private TDocument document;
-
-		@Nullable
-		private JsonpSerializer<TDocument> tDocumentSerializer;
-
-		/**
-		 * Required - Document ID
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder<TDocument> id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - The name of the index
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder<TDocument> index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * The pipeline id to preprocess incoming documents with
-		 * <p>
-		 * API name: {@code pipeline}
-		 */
-		public final Builder<TDocument> pipeline(@Nullable String value) {
-			this.pipeline = value;
-			return this;
-		}
-
-		/**
-		 * If <code>true</code> then refresh the affected shards to make this operation
-		 * visible to search, if <code>wait_for</code> then wait for a refresh to make
-		 * this operation visible to search, if <code>false</code> (the default) then do
-		 * nothing with refreshes.
-		 * <p>
-		 * API name: {@code refresh}
-		 */
-		public final Builder<TDocument> refresh(@Nullable Refresh value) {
-			this.refresh = value;
-			return this;
-		}
-
-		/**
-		 * Specific routing value
-		 * <p>
-		 * API name: {@code routing}
-		 */
-		public final Builder<TDocument> routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder<TDocument> timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder<TDocument> timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit version number for concurrency control
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder<TDocument> version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Specific version type
-		 * <p>
-		 * API name: {@code version_type}
-		 */
-		public final Builder<TDocument> versionType(@Nullable VersionType value) {
-			this.versionType = value;
-			return this;
-		}
-
-		/**
-		 * Sets the number of shard copies that must be active before proceeding with
-		 * the index operation. Defaults to 1, meaning the primary shard only. Set to
-		 * <code>all</code> for all shard copies, otherwise set to any non-negative
-		 * value less than or equal to the total number of copies for the shard (number
-		 * of replicas + 1)
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder<TDocument> waitForActiveShards(@Nullable WaitForActiveShards value) {
-			this.waitForActiveShards = value;
-			return this;
-		}
-
-		/**
-		 * Sets the number of shard copies that must be active before proceeding with
-		 * the index operation. Defaults to 1, meaning the primary shard only. Set to
-		 * <code>all</code> for all shard copies, otherwise set to any non-negative
-		 * value less than or equal to the total number of copies for the shard (number
-		 * of replicas + 1)
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder<TDocument> waitForActiveShards(
-				Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
-			return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
-		}
-
-		/**
-		 * Required - Request body.
-		 * <p>
-		 * API name: {@code _value_body}
-		 */
-		public final Builder<TDocument> document(TDocument value) {
-			this.document = value;
-			return this;
-		}
-
-		/**
-		 * Serializer for TDocument. If not set, an attempt will be made to find a
-		 * serializer from the JSON context.
-		 */
-		public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
-			this.tDocumentSerializer = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CreateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CreateRequest<TDocument> build() {
-			_checkSingleUse();
-
-			return new CreateRequest<TDocument>(this);
-		}
-	}
-
-	public static <TDocument> JsonpDeserializer<CreateRequest<TDocument>> createCreateRequestDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-
-		JsonpDeserializer<TDocument> valueDeserializer = tDocumentDeserializer;
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(), (parser, mapper) -> new Builder<TDocument>()
-				.document(valueDeserializer.deserialize(parser, mapper)).build());
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code create}".
-	 */
-	public static final Endpoint<CreateRequest<?>, CreateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "PUT";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-				final int _id = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-				propsSet |= _id;
-
-				if (propsSet == (_index | _id)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_create");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.id, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.pipeline != null) {
-					params.put("pipeline", request.pipeline);
-				}
-				if (request.routing != null) {
-					params.put("routing", request.routing);
-				}
-				if (request.versionType != null) {
-					params.put("version_type", request.versionType.jsonValue());
-				}
-				if (request.refresh != null) {
-					params.put("refresh", request.refresh.jsonValue());
-				}
-				if (request.waitForActiveShards != null) {
-					params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
-				}
-				if (request.version != null) {
-					params.put("version", String.valueOf(request.version));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, CreateResponse._DESERIALIZER);
+    private final String id;
+
+    private final String index;
+
+    @Nullable
+    private final String pipeline;
+
+    @Nullable
+    private final Refresh refresh;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final Long version;
+
+    @Nullable
+    private final VersionType versionType;
+
+    @Nullable
+    private final WaitForActiveShards waitForActiveShards;
+
+    private final TDocument document;
+
+    @Nullable
+    private final JsonpSerializer<TDocument> tDocumentSerializer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CreateRequest(Builder<TDocument> builder) {
+
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.pipeline = builder.pipeline;
+        this.refresh = builder.refresh;
+        this.routing = builder.routing;
+        this.timeout = builder.timeout;
+        this.version = builder.version;
+        this.versionType = builder.versionType;
+        this.waitForActiveShards = builder.waitForActiveShards;
+        this.document = ApiTypeHelper.requireNonNull(builder.document, this, "document");
+        this.tDocumentSerializer = builder.tDocumentSerializer;
+
+    }
+
+    public static <TDocument> CreateRequest<TDocument> of(Function<Builder<TDocument>, ObjectBuilder<CreateRequest<TDocument>>> fn) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * Required - Document ID
+     * <p>
+     * API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - The name of the index
+     * <p>
+     * API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * The pipeline id to preprocess incoming documents with
+     * <p>
+     * API name: {@code pipeline}
+     */
+    @Nullable
+    public final String pipeline() {
+        return this.pipeline;
+    }
+
+    /**
+     * If <code>true</code> then refresh the affected shards to make this operation
+     * visible to search, if <code>wait_for</code> then wait for a refresh to make
+     * this operation visible to search, if <code>false</code> (the default) then do
+     * nothing with refreshes.
+     * <p>
+     * API name: {@code refresh}
+     */
+    @Nullable
+    public final Refresh refresh() {
+        return this.refresh;
+    }
+
+    /**
+     * Specific routing value
+     * <p>
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Explicit version number for concurrency control
+     * <p>
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * Specific version type
+     * <p>
+     * API name: {@code version_type}
+     */
+    @Nullable
+    public final VersionType versionType() {
+        return this.versionType;
+    }
+
+    /**
+     * Sets the number of shard copies that must be active before proceeding with
+     * the index operation. Defaults to 1, meaning the primary shard only. Set to
+     * <code>all</code> for all shard copies, otherwise set to any non-negative
+     * value less than or equal to the total number of copies for the shard (number
+     * of replicas + 1)
+     * <p>
+     * API name: {@code wait_for_active_shards}
+     */
+    @Nullable
+    public final WaitForActiveShards waitForActiveShards() {
+        return this.waitForActiveShards;
+    }
+
+    /**
+     * Required - Request body.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final TDocument document() {
+        return this.document;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        JsonpUtils.serialize(this.document, generator, tDocumentSerializer, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CreateRequest}.
+     */
+
+    public static class Builder<TDocument> extends ObjectBuilderBase implements ObjectBuilder<CreateRequest<TDocument>> {
+        private String id;
+
+        private String index;
+
+        @Nullable
+        private String pipeline;
+
+        @Nullable
+        private Refresh refresh;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private Long version;
+
+        @Nullable
+        private VersionType versionType;
+
+        @Nullable
+        private WaitForActiveShards waitForActiveShards;
+
+        private TDocument document;
+
+        @Nullable
+        private JsonpSerializer<TDocument> tDocumentSerializer;
+
+        /**
+         * Required - Document ID
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder<TDocument> id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - The name of the index
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder<TDocument> index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * The pipeline id to preprocess incoming documents with
+         * <p>
+         * API name: {@code pipeline}
+         */
+        public final Builder<TDocument> pipeline(@Nullable String value) {
+            this.pipeline = value;
+            return this;
+        }
+
+        /**
+         * If <code>true</code> then refresh the affected shards to make this operation
+         * visible to search, if <code>wait_for</code> then wait for a refresh to make
+         * this operation visible to search, if <code>false</code> (the default) then do
+         * nothing with refreshes.
+         * <p>
+         * API name: {@code refresh}
+         */
+        public final Builder<TDocument> refresh(@Nullable Refresh value) {
+            this.refresh = value;
+            return this;
+        }
+
+        /**
+         * Specific routing value
+         * <p>
+         * API name: {@code routing}
+         */
+        public final Builder<TDocument> routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder<TDocument> timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder<TDocument> timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit version number for concurrency control
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder<TDocument> version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Specific version type
+         * <p>
+         * API name: {@code version_type}
+         */
+        public final Builder<TDocument> versionType(@Nullable VersionType value) {
+            this.versionType = value;
+            return this;
+        }
+
+        /**
+         * Sets the number of shard copies that must be active before proceeding with
+         * the index operation. Defaults to 1, meaning the primary shard only. Set to
+         * <code>all</code> for all shard copies, otherwise set to any non-negative
+         * value less than or equal to the total number of copies for the shard (number
+         * of replicas + 1)
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder<TDocument> waitForActiveShards(@Nullable WaitForActiveShards value) {
+            this.waitForActiveShards = value;
+            return this;
+        }
+
+        /**
+         * Sets the number of shard copies that must be active before proceeding with
+         * the index operation. Defaults to 1, meaning the primary shard only. Set to
+         * <code>all</code> for all shard copies, otherwise set to any non-negative
+         * value less than or equal to the total number of copies for the shard (number
+         * of replicas + 1)
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder<TDocument> waitForActiveShards(Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
+            return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
+        }
+
+        /**
+         * Required - Request body.
+         * <p>
+         * API name: {@code _value_body}
+         */
+        public final Builder<TDocument> document(TDocument value) {
+            this.document = value;
+            return this;
+        }
+
+        /**
+         * Serializer for TDocument. If not set, an attempt will be made to find a
+         * serializer from the JSON context.
+         */
+        public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
+            this.tDocumentSerializer = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link CreateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CreateRequest<TDocument> build() {
+            _checkSingleUse();
+
+            return new CreateRequest<TDocument>(this);
+        }
+    }
+
+    public static <TDocument> JsonpDeserializer<CreateRequest<TDocument>> createCreateRequestDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+
+        JsonpDeserializer<TDocument> valueDeserializer = tDocumentDeserializer;
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder<TDocument>().document(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code create}".
+     */
+    public static final Endpoint<CreateRequest<?>, CreateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "PUT";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+            final int _id = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+            propsSet |= _id;
+
+            if (propsSet == (_index | _id)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_create");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.id, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.pipeline != null) {
+                params.put("pipeline", request.pipeline);
+            }
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            if (request.versionType != null) {
+                params.put("version_type", request.versionType.jsonValue());
+            }
+            if (request.refresh != null) {
+                params.put("refresh", request.refresh.jsonValue());
+            }
+            if (request.waitForActiveShards != null) {
+                params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
+            }
+            if (request.version != null) {
+                params.put("version", String.valueOf(request.version));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        CreateResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/CreateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/CreateResponse.java
index 1a701d19ac..e4311109ef 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/CreateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/CreateResponse.java
@@ -32,69 +32,67 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.WriteResponseBase;
+import java.util.function.Function;
 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.WriteResponseBase;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _global.create.Response
 
-
 @JsonpDeserializable
 public class CreateResponse extends WriteResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private CreateResponse(Builder builder) {
-		super(builder);
+    private CreateResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static CreateResponse of(Function<Builder, ObjectBuilder<CreateResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static CreateResponse of(Function<Builder, ObjectBuilder<CreateResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link CreateResponse}.
-	 */
+    /**
+     * Builder for {@link CreateResponse}.
+     */
 
-	public static class Builder extends WriteResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<CreateResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends WriteResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<CreateResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link CreateResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CreateResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link CreateResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CreateResponse build() {
+            _checkSingleUse();
 
-			return new CreateResponse(this);
-		}
-	}
+            return new CreateResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link CreateResponse}
-	 */
-	public static final JsonpDeserializer<CreateResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CreateResponse::setupCreateResponseDeserializer);
+    /**
+     * Json deserializer for {@link CreateResponse}
+     */
+    public static final JsonpDeserializer<CreateResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CreateResponse::setupCreateResponseDeserializer
+    );
 
-	protected static void setupCreateResponseDeserializer(ObjectDeserializer<CreateResponse.Builder> op) {
-		WriteResponseBase.setupWriteResponseBaseDeserializer(op);
+    protected static void setupCreateResponseDeserializer(ObjectDeserializer<CreateResponse.Builder> op) {
+        WriteResponseBase.setupWriteResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteByQueryRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteByQueryRequest.java
index 3d4d58a13d..b69fb06086 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteByQueryRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteByQueryRequest.java
@@ -32,6 +32,19 @@
 
 package org.opensearch.client.opensearch.core;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpDeserializable;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.json.ObjectBuilderDeserializer;
+import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.opensearch._types.Conflicts;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
@@ -43,1386 +56,1373 @@
 import org.opensearch.client.opensearch._types.query_dsl.Operator;
 import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.opensearch.core.search.SourceConfigParam;
-import org.opensearch.client.json.JsonpDeserializable;
-import org.opensearch.client.json.JsonpDeserializer;
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
-import org.opensearch.client.json.ObjectBuilderDeserializer;
-import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: _global.delete_by_query.Request
 
 /**
  * Deletes documents matching the provided query.
- * 
+ *
  */
 @JsonpDeserializable
 public class DeleteByQueryRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final SourceConfigParam source;
+    @Nullable
+    private final SourceConfigParam source;
 
-	private final List<String> sourceExcludes;
+    private final List<String> sourceExcludes;
 
-	private final List<String> sourceIncludes;
+    private final List<String> sourceIncludes;
 
-	@Nullable
-	private final Boolean allowNoIndices;
+    @Nullable
+    private final Boolean allowNoIndices;
 
-	@Nullable
-	private final Boolean analyzeWildcard;
+    @Nullable
+    private final Boolean analyzeWildcard;
 
-	@Nullable
-	private final String analyzer;
+    @Nullable
+    private final String analyzer;
 
-	@Nullable
-	private final Conflicts conflicts;
+    @Nullable
+    private final Conflicts conflicts;
 
-	@Nullable
-	private final Operator defaultOperator;
+    @Nullable
+    private final Operator defaultOperator;
 
-	@Nullable
-	private final String df;
+    @Nullable
+    private final String df;
 
-	private final List<ExpandWildcard> expandWildcards;
+    private final List<ExpandWildcard> expandWildcards;
 
-	@Nullable
-	private final Long from;
+    @Nullable
+    private final Long from;
 
-	@Nullable
-	private final Boolean ignoreUnavailable;
+    @Nullable
+    private final Boolean ignoreUnavailable;
 
-	private final List<String> index;
+    private final List<String> index;
 
-	@Nullable
-	private final Boolean lenient;
+    @Nullable
+    private final Boolean lenient;
 
-	@Nullable
-	private final Long maxDocs;
+    @Nullable
+    private final Long maxDocs;
 
-	@Nullable
-	private final String preference;
+    @Nullable
+    private final String preference;
 
-	@Nullable
-	private final String q;
+    @Nullable
+    private final String q;
 
-	@Nullable
-	private final Query query;
+    @Nullable
+    private final Query query;
 
-	@Nullable
-	private final Boolean refresh;
+    @Nullable
+    private final Boolean refresh;
 
-	@Nullable
-	private final Boolean requestCache;
+    @Nullable
+    private final Boolean requestCache;
 
-	@Nullable
-	private final Long requestsPerSecond;
+    @Nullable
+    private final Long requestsPerSecond;
 
-	@Nullable
-	private final String routing;
+    @Nullable
+    private final String routing;
 
-	@Nullable
-	private final Time scroll;
+    @Nullable
+    private final Time scroll;
 
-	@Nullable
-	private final Long scrollSize;
+    @Nullable
+    private final Long scrollSize;
 
-	@Nullable
-	private final Time searchTimeout;
+    @Nullable
+    private final Time searchTimeout;
 
-	@Nullable
-	private final SearchType searchType;
+    @Nullable
+    private final SearchType searchType;
 
-	@Nullable
-	private final Long size;
-
-	@Nullable
-	private final SlicedScroll slice;
-
-	@Nullable
-	private final Long slices;
-
-	private final List<String> sort;
-
-	private final List<String> stats;
-
-	@Nullable
-	private final Long terminateAfter;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final Boolean version;
-
-	@Nullable
-	private final WaitForActiveShards waitForActiveShards;
-
-	@Nullable
-	private final Boolean waitForCompletion;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteByQueryRequest(Builder builder) {
-
-		this.source = builder.source;
-		this.sourceExcludes = ApiTypeHelper.unmodifiable(builder.sourceExcludes);
-		this.sourceIncludes = ApiTypeHelper.unmodifiable(builder.sourceIncludes);
-		this.allowNoIndices = builder.allowNoIndices;
-		this.analyzeWildcard = builder.analyzeWildcard;
-		this.analyzer = builder.analyzer;
-		this.conflicts = builder.conflicts;
-		this.defaultOperator = builder.defaultOperator;
-		this.df = builder.df;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.from = builder.from;
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
-		this.lenient = builder.lenient;
-		this.maxDocs = builder.maxDocs;
-		this.preference = builder.preference;
-		this.q = builder.q;
-		this.query = builder.query;
-		this.refresh = builder.refresh;
-		this.requestCache = builder.requestCache;
-		this.requestsPerSecond = builder.requestsPerSecond;
-		this.routing = builder.routing;
-		this.scroll = builder.scroll;
-		this.scrollSize = builder.scrollSize;
-		this.searchTimeout = builder.searchTimeout;
-		this.searchType = builder.searchType;
-		this.size = builder.size;
-		this.slice = builder.slice;
-		this.slices = builder.slices;
-		this.sort = ApiTypeHelper.unmodifiable(builder.sort);
-		this.stats = ApiTypeHelper.unmodifiable(builder.stats);
-		this.terminateAfter = builder.terminateAfter;
-		this.timeout = builder.timeout;
-		this.version = builder.version;
-		this.waitForActiveShards = builder.waitForActiveShards;
-		this.waitForCompletion = builder.waitForCompletion;
-
-	}
-
-	public static DeleteByQueryRequest of(Function<Builder, ObjectBuilder<DeleteByQueryRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * True or false to return the _source field or not, or a list of fields to
-	 * return
-	 * <p>
-	 * API name: {@code _source}
-	 */
-	@Nullable
-	public final SourceConfigParam source() {
-		return this.source;
-	}
-
-	/**
-	 * A list of fields to exclude from the returned _source field
-	 * <p>
-	 * API name: {@code _source_excludes}
-	 */
-	public final List<String> sourceExcludes() {
-		return this.sourceExcludes;
-	}
-
-	/**
-	 * A list of fields to extract and return from the _source field
-	 * <p>
-	 * API name: {@code _source_includes}
-	 */
-	public final List<String> sourceIncludes() {
-		return this.sourceIncludes;
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Specify whether wildcard and prefix queries should be analyzed (default:
-	 * false)
-	 * <p>
-	 * API name: {@code analyze_wildcard}
-	 */
-	@Nullable
-	public final Boolean analyzeWildcard() {
-		return this.analyzeWildcard;
-	}
-
-	/**
-	 * The analyzer to use for the query string
-	 * <p>
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * What to do when the delete by query hits version conflicts?
-	 * <p>
-	 * API name: {@code conflicts}
-	 */
-	@Nullable
-	public final Conflicts conflicts() {
-		return this.conflicts;
-	}
-
-	/**
-	 * The default operator for query string query (AND or OR)
-	 * <p>
-	 * API name: {@code default_operator}
-	 */
-	@Nullable
-	public final Operator defaultOperator() {
-		return this.defaultOperator;
-	}
-
-	/**
-	 * The field to use as default where no field prefix is given in the query
-	 * string
-	 * <p>
-	 * API name: {@code df}
-	 */
-	@Nullable
-	public final String df() {
-		return this.df;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Starting offset (default: 0)
-	 * <p>
-	 * API name: {@code from}
-	 */
-	@Nullable
-	public final Long from() {
-		return this.from;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * Required - A comma-separated list of index names to search; use
-	 * <code>_all</code> or empty string to perform the operation on all indices
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Specify whether format-based query failures (such as providing text to a
-	 * numeric field) should be ignored
-	 * <p>
-	 * API name: {@code lenient}
-	 */
-	@Nullable
-	public final Boolean lenient() {
-		return this.lenient;
-	}
-
-	/**
-	 * API name: {@code max_docs}
-	 */
-	@Nullable
-	public final Long maxDocs() {
-		return this.maxDocs;
-	}
-
-	/**
-	 * Specify the node or shard the operation should be performed on (default:
-	 * random)
-	 * <p>
-	 * API name: {@code preference}
-	 */
-	@Nullable
-	public final String preference() {
-		return this.preference;
-	}
-
-	/**
-	 * Query in the Lucene query string syntax
-	 * <p>
-	 * API name: {@code q}
-	 */
-	@Nullable
-	public final String q() {
-		return this.q;
-	}
-
-	/**
-	 * API name: {@code query}
-	 */
-	@Nullable
-	public final Query query() {
-		return this.query;
-	}
-
-	/**
-	 * Should the effected indexes be refreshed?
-	 * <p>
-	 * API name: {@code refresh}
-	 */
-	@Nullable
-	public final Boolean refresh() {
-		return this.refresh;
-	}
-
-	/**
-	 * Specify if request cache should be used for this request or not, defaults to
-	 * index level setting
-	 * <p>
-	 * API name: {@code request_cache}
-	 */
-	@Nullable
-	public final Boolean requestCache() {
-		return this.requestCache;
-	}
-
-	/**
-	 * The throttle for this request in sub-requests per second. -1 means no
-	 * throttle.
-	 * <p>
-	 * API name: {@code requests_per_second}
-	 */
-	@Nullable
-	public final Long requestsPerSecond() {
-		return this.requestsPerSecond;
-	}
-
-	/**
-	 * A comma-separated list of specific routing values
-	 * <p>
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Specify how long a consistent view of the index should be maintained for
-	 * scrolled search
-	 * <p>
-	 * API name: {@code scroll}
-	 */
-	@Nullable
-	public final Time scroll() {
-		return this.scroll;
-	}
-
-	/**
-	 * Size on the scroll request powering the delete by query
-	 * <p>
-	 * API name: {@code scroll_size}
-	 */
-	@Nullable
-	public final Long scrollSize() {
-		return this.scrollSize;
-	}
-
-	/**
-	 * Explicit timeout for each search request. Defaults to no timeout.
-	 * <p>
-	 * API name: {@code search_timeout}
-	 */
-	@Nullable
-	public final Time searchTimeout() {
-		return this.searchTimeout;
-	}
-
-	/**
-	 * Search operation type
-	 * <p>
-	 * API name: {@code search_type}
-	 */
-	@Nullable
-	public final SearchType searchType() {
-		return this.searchType;
-	}
-
-	/**
-	 * Deprecated, please use <code>max_docs</code> instead
-	 * <p>
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Long size() {
-		return this.size;
-	}
-
-	/**
-	 * API name: {@code slice}
-	 */
-	@Nullable
-	public final SlicedScroll slice() {
-		return this.slice;
-	}
-
-	/**
-	 * The number of slices this task should be divided into. Defaults to 1, meaning
-	 * the task isn't sliced into subtasks. Can be set to 0 for <code>auto</code>.
-	 * <p>
-	 * API name: {@code slices}
-	 */
-	@Nullable
-	public final Long slices() {
-		return this.slices;
-	}
-
-	/**
-	 * A comma-separated list of &lt;field&gt;:&lt;direction&gt; pairs
-	 * <p>
-	 * API name: {@code sort}
-	 */
-	public final List<String> sort() {
-		return this.sort;
-	}
-
-	/**
-	 * Specific 'tag' of the request for logging and statistical purposes
-	 * <p>
-	 * API name: {@code stats}
-	 */
-	public final List<String> stats() {
-		return this.stats;
-	}
-
-	/**
-	 * The maximum number of documents to collect for each shard, upon reaching
-	 * which the query execution will terminate early.
-	 * <p>
-	 * API name: {@code terminate_after}
-	 */
-	@Nullable
-	public final Long terminateAfter() {
-		return this.terminateAfter;
-	}
-
-	/**
-	 * Time each individual bulk request should wait for shards that are
-	 * unavailable.
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Specify whether to return document version as part of a hit
-	 * <p>
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Boolean version() {
-		return this.version;
-	}
-
-	/**
-	 * Sets the number of shard copies that must be active before proceeding with
-	 * the delete by query operation. Defaults to 1, meaning the primary shard only.
-	 * Set to <code>all</code> for all shard copies, otherwise set to any
-	 * non-negative value less than or equal to the total number of copies for the
-	 * shard (number of replicas + 1)
-	 * <p>
-	 * API name: {@code wait_for_active_shards}
-	 */
-	@Nullable
-	public final WaitForActiveShards waitForActiveShards() {
-		return this.waitForActiveShards;
-	}
-
-	/**
-	 * Should the request should block until the delete by query is complete.
-	 * <p>
-	 * API name: {@code wait_for_completion}
-	 */
-	@Nullable
-	public final Boolean waitForCompletion() {
-		return this.waitForCompletion;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.maxDocs != null) {
-			generator.writeKey("max_docs");
-			generator.write(this.maxDocs);
-
-		}
-		if (this.query != null) {
-			generator.writeKey("query");
-			this.query.serialize(generator, mapper);
-
-		}
-		if (this.slice != null) {
-			generator.writeKey("slice");
-			this.slice.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteByQueryRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteByQueryRequest> {
-		@Nullable
-		private SourceConfigParam source;
-
-		@Nullable
-		private List<String> sourceExcludes;
+    @Nullable
+    private final Long size;
+
+    @Nullable
+    private final SlicedScroll slice;
+
+    @Nullable
+    private final Long slices;
+
+    private final List<String> sort;
+
+    private final List<String> stats;
+
+    @Nullable
+    private final Long terminateAfter;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final Boolean version;
+
+    @Nullable
+    private final WaitForActiveShards waitForActiveShards;
+
+    @Nullable
+    private final Boolean waitForCompletion;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteByQueryRequest(Builder builder) {
+
+        this.source = builder.source;
+        this.sourceExcludes = ApiTypeHelper.unmodifiable(builder.sourceExcludes);
+        this.sourceIncludes = ApiTypeHelper.unmodifiable(builder.sourceIncludes);
+        this.allowNoIndices = builder.allowNoIndices;
+        this.analyzeWildcard = builder.analyzeWildcard;
+        this.analyzer = builder.analyzer;
+        this.conflicts = builder.conflicts;
+        this.defaultOperator = builder.defaultOperator;
+        this.df = builder.df;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.from = builder.from;
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
+        this.lenient = builder.lenient;
+        this.maxDocs = builder.maxDocs;
+        this.preference = builder.preference;
+        this.q = builder.q;
+        this.query = builder.query;
+        this.refresh = builder.refresh;
+        this.requestCache = builder.requestCache;
+        this.requestsPerSecond = builder.requestsPerSecond;
+        this.routing = builder.routing;
+        this.scroll = builder.scroll;
+        this.scrollSize = builder.scrollSize;
+        this.searchTimeout = builder.searchTimeout;
+        this.searchType = builder.searchType;
+        this.size = builder.size;
+        this.slice = builder.slice;
+        this.slices = builder.slices;
+        this.sort = ApiTypeHelper.unmodifiable(builder.sort);
+        this.stats = ApiTypeHelper.unmodifiable(builder.stats);
+        this.terminateAfter = builder.terminateAfter;
+        this.timeout = builder.timeout;
+        this.version = builder.version;
+        this.waitForActiveShards = builder.waitForActiveShards;
+        this.waitForCompletion = builder.waitForCompletion;
+
+    }
+
+    public static DeleteByQueryRequest of(Function<Builder, ObjectBuilder<DeleteByQueryRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * True or false to return the _source field or not, or a list of fields to
+     * return
+     * <p>
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final SourceConfigParam source() {
+        return this.source;
+    }
+
+    /**
+     * A list of fields to exclude from the returned _source field
+     * <p>
+     * API name: {@code _source_excludes}
+     */
+    public final List<String> sourceExcludes() {
+        return this.sourceExcludes;
+    }
+
+    /**
+     * A list of fields to extract and return from the _source field
+     * <p>
+     * API name: {@code _source_includes}
+     */
+    public final List<String> sourceIncludes() {
+        return this.sourceIncludes;
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Specify whether wildcard and prefix queries should be analyzed (default:
+     * false)
+     * <p>
+     * API name: {@code analyze_wildcard}
+     */
+    @Nullable
+    public final Boolean analyzeWildcard() {
+        return this.analyzeWildcard;
+    }
+
+    /**
+     * The analyzer to use for the query string
+     * <p>
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * What to do when the delete by query hits version conflicts?
+     * <p>
+     * API name: {@code conflicts}
+     */
+    @Nullable
+    public final Conflicts conflicts() {
+        return this.conflicts;
+    }
+
+    /**
+     * The default operator for query string query (AND or OR)
+     * <p>
+     * API name: {@code default_operator}
+     */
+    @Nullable
+    public final Operator defaultOperator() {
+        return this.defaultOperator;
+    }
+
+    /**
+     * The field to use as default where no field prefix is given in the query
+     * string
+     * <p>
+     * API name: {@code df}
+     */
+    @Nullable
+    public final String df() {
+        return this.df;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Starting offset (default: 0)
+     * <p>
+     * API name: {@code from}
+     */
+    @Nullable
+    public final Long from() {
+        return this.from;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * Required - A comma-separated list of index names to search; use
+     * <code>_all</code> or empty string to perform the operation on all indices
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Specify whether format-based query failures (such as providing text to a
+     * numeric field) should be ignored
+     * <p>
+     * API name: {@code lenient}
+     */
+    @Nullable
+    public final Boolean lenient() {
+        return this.lenient;
+    }
+
+    /**
+     * API name: {@code max_docs}
+     */
+    @Nullable
+    public final Long maxDocs() {
+        return this.maxDocs;
+    }
+
+    /**
+     * Specify the node or shard the operation should be performed on (default:
+     * random)
+     * <p>
+     * API name: {@code preference}
+     */
+    @Nullable
+    public final String preference() {
+        return this.preference;
+    }
+
+    /**
+     * Query in the Lucene query string syntax
+     * <p>
+     * API name: {@code q}
+     */
+    @Nullable
+    public final String q() {
+        return this.q;
+    }
+
+    /**
+     * API name: {@code query}
+     */
+    @Nullable
+    public final Query query() {
+        return this.query;
+    }
+
+    /**
+     * Should the effected indexes be refreshed?
+     * <p>
+     * API name: {@code refresh}
+     */
+    @Nullable
+    public final Boolean refresh() {
+        return this.refresh;
+    }
+
+    /**
+     * Specify if request cache should be used for this request or not, defaults to
+     * index level setting
+     * <p>
+     * API name: {@code request_cache}
+     */
+    @Nullable
+    public final Boolean requestCache() {
+        return this.requestCache;
+    }
+
+    /**
+     * The throttle for this request in sub-requests per second. -1 means no
+     * throttle.
+     * <p>
+     * API name: {@code requests_per_second}
+     */
+    @Nullable
+    public final Long requestsPerSecond() {
+        return this.requestsPerSecond;
+    }
+
+    /**
+     * A comma-separated list of specific routing values
+     * <p>
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * Specify how long a consistent view of the index should be maintained for
+     * scrolled search
+     * <p>
+     * API name: {@code scroll}
+     */
+    @Nullable
+    public final Time scroll() {
+        return this.scroll;
+    }
+
+    /**
+     * Size on the scroll request powering the delete by query
+     * <p>
+     * API name: {@code scroll_size}
+     */
+    @Nullable
+    public final Long scrollSize() {
+        return this.scrollSize;
+    }
+
+    /**
+     * Explicit timeout for each search request. Defaults to no timeout.
+     * <p>
+     * API name: {@code search_timeout}
+     */
+    @Nullable
+    public final Time searchTimeout() {
+        return this.searchTimeout;
+    }
+
+    /**
+     * Search operation type
+     * <p>
+     * API name: {@code search_type}
+     */
+    @Nullable
+    public final SearchType searchType() {
+        return this.searchType;
+    }
+
+    /**
+     * Deprecated, please use <code>max_docs</code> instead
+     * <p>
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Long size() {
+        return this.size;
+    }
+
+    /**
+     * API name: {@code slice}
+     */
+    @Nullable
+    public final SlicedScroll slice() {
+        return this.slice;
+    }
+
+    /**
+     * The number of slices this task should be divided into. Defaults to 1, meaning
+     * the task isn't sliced into subtasks. Can be set to 0 for <code>auto</code>.
+     * <p>
+     * API name: {@code slices}
+     */
+    @Nullable
+    public final Long slices() {
+        return this.slices;
+    }
+
+    /**
+     * A comma-separated list of &lt;field&gt;:&lt;direction&gt; pairs
+     * <p>
+     * API name: {@code sort}
+     */
+    public final List<String> sort() {
+        return this.sort;
+    }
+
+    /**
+     * Specific 'tag' of the request for logging and statistical purposes
+     * <p>
+     * API name: {@code stats}
+     */
+    public final List<String> stats() {
+        return this.stats;
+    }
+
+    /**
+     * The maximum number of documents to collect for each shard, upon reaching
+     * which the query execution will terminate early.
+     * <p>
+     * API name: {@code terminate_after}
+     */
+    @Nullable
+    public final Long terminateAfter() {
+        return this.terminateAfter;
+    }
+
+    /**
+     * Time each individual bulk request should wait for shards that are
+     * unavailable.
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Specify whether to return document version as part of a hit
+     * <p>
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Boolean version() {
+        return this.version;
+    }
+
+    /**
+     * Sets the number of shard copies that must be active before proceeding with
+     * the delete by query operation. Defaults to 1, meaning the primary shard only.
+     * Set to <code>all</code> for all shard copies, otherwise set to any
+     * non-negative value less than or equal to the total number of copies for the
+     * shard (number of replicas + 1)
+     * <p>
+     * API name: {@code wait_for_active_shards}
+     */
+    @Nullable
+    public final WaitForActiveShards waitForActiveShards() {
+        return this.waitForActiveShards;
+    }
+
+    /**
+     * Should the request should block until the delete by query is complete.
+     * <p>
+     * API name: {@code wait_for_completion}
+     */
+    @Nullable
+    public final Boolean waitForCompletion() {
+        return this.waitForCompletion;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.maxDocs != null) {
+            generator.writeKey("max_docs");
+            generator.write(this.maxDocs);
+
+        }
+        if (this.query != null) {
+            generator.writeKey("query");
+            this.query.serialize(generator, mapper);
+
+        }
+        if (this.slice != null) {
+            generator.writeKey("slice");
+            this.slice.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteByQueryRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteByQueryRequest> {
+        @Nullable
+        private SourceConfigParam source;
+
+        @Nullable
+        private List<String> sourceExcludes;
 
-		@Nullable
-		private List<String> sourceIncludes;
+        @Nullable
+        private List<String> sourceIncludes;
 
-		@Nullable
-		private Boolean allowNoIndices;
+        @Nullable
+        private Boolean allowNoIndices;
 
-		@Nullable
-		private Boolean analyzeWildcard;
+        @Nullable
+        private Boolean analyzeWildcard;
 
-		@Nullable
-		private String analyzer;
+        @Nullable
+        private String analyzer;
 
-		@Nullable
-		private Conflicts conflicts;
+        @Nullable
+        private Conflicts conflicts;
 
-		@Nullable
-		private Operator defaultOperator;
+        @Nullable
+        private Operator defaultOperator;
 
-		@Nullable
-		private String df;
+        @Nullable
+        private String df;
 
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
 
-		@Nullable
-		private Long from;
+        @Nullable
+        private Long from;
 
-		@Nullable
-		private Boolean ignoreUnavailable;
+        @Nullable
+        private Boolean ignoreUnavailable;
 
-		private List<String> index;
+        private List<String> index;
 
-		@Nullable
-		private Boolean lenient;
+        @Nullable
+        private Boolean lenient;
 
-		@Nullable
-		private Long maxDocs;
+        @Nullable
+        private Long maxDocs;
 
-		@Nullable
-		private String preference;
+        @Nullable
+        private String preference;
 
-		@Nullable
-		private String q;
+        @Nullable
+        private String q;
 
-		@Nullable
-		private Query query;
+        @Nullable
+        private Query query;
 
-		@Nullable
-		private Boolean refresh;
+        @Nullable
+        private Boolean refresh;
 
-		@Nullable
-		private Boolean requestCache;
+        @Nullable
+        private Boolean requestCache;
 
-		@Nullable
-		private Long requestsPerSecond;
+        @Nullable
+        private Long requestsPerSecond;
 
-		@Nullable
-		private String routing;
+        @Nullable
+        private String routing;
 
-		@Nullable
-		private Time scroll;
+        @Nullable
+        private Time scroll;
 
-		@Nullable
-		private Long scrollSize;
+        @Nullable
+        private Long scrollSize;
 
-		@Nullable
-		private Time searchTimeout;
-
-		@Nullable
-		private SearchType searchType;
-
-		@Nullable
-		private Long size;
-
-		@Nullable
-		private SlicedScroll slice;
-
-		@Nullable
-		private Long slices;
-
-		@Nullable
-		private List<String> sort;
-
-		@Nullable
-		private List<String> stats;
-
-		@Nullable
-		private Long terminateAfter;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private Boolean version;
-
-		@Nullable
-		private WaitForActiveShards waitForActiveShards;
-
-		@Nullable
-		private Boolean waitForCompletion;
-
-		/**
-		 * True or false to return the _source field or not, or a list of fields to
-		 * return
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(@Nullable SourceConfigParam value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * True or false to return the _source field or not, or a list of fields to
-		 * return
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(Function<SourceConfigParam.Builder, ObjectBuilder<SourceConfigParam>> fn) {
-			return this.source(fn.apply(new SourceConfigParam.Builder()).build());
-		}
-
-		/**
-		 * A list of fields to exclude from the returned _source field
-		 * <p>
-		 * API name: {@code _source_excludes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceExcludes</code>.
-		 */
-		public final Builder sourceExcludes(List<String> list) {
-			this.sourceExcludes = _listAddAll(this.sourceExcludes, list);
-			return this;
-		}
-
-		/**
-		 * A list of fields to exclude from the returned _source field
-		 * <p>
-		 * API name: {@code _source_excludes}
-		 * <p>
-		 * Adds one or more values to <code>sourceExcludes</code>.
-		 */
-		public final Builder sourceExcludes(String value, String... values) {
-			this.sourceExcludes = _listAdd(this.sourceExcludes, value, values);
-			return this;
-		}
-
-		/**
-		 * A list of fields to extract and return from the _source field
-		 * <p>
-		 * API name: {@code _source_includes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceIncludes</code>.
-		 */
-		public final Builder sourceIncludes(List<String> list) {
-			this.sourceIncludes = _listAddAll(this.sourceIncludes, list);
-			return this;
-		}
-
-		/**
-		 * A list of fields to extract and return from the _source field
-		 * <p>
-		 * API name: {@code _source_includes}
-		 * <p>
-		 * Adds one or more values to <code>sourceIncludes</code>.
-		 */
-		public final Builder sourceIncludes(String value, String... values) {
-			this.sourceIncludes = _listAdd(this.sourceIncludes, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Specify whether wildcard and prefix queries should be analyzed (default:
-		 * false)
-		 * <p>
-		 * API name: {@code analyze_wildcard}
-		 */
-		public final Builder analyzeWildcard(@Nullable Boolean value) {
-			this.analyzeWildcard = value;
-			return this;
-		}
-
-		/**
-		 * The analyzer to use for the query string
-		 * <p>
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * What to do when the delete by query hits version conflicts?
-		 * <p>
-		 * API name: {@code conflicts}
-		 */
-		public final Builder conflicts(@Nullable Conflicts value) {
-			this.conflicts = value;
-			return this;
-		}
-
-		/**
-		 * The default operator for query string query (AND or OR)
-		 * <p>
-		 * API name: {@code default_operator}
-		 */
-		public final Builder defaultOperator(@Nullable Operator value) {
-			this.defaultOperator = value;
-			return this;
-		}
-
-		/**
-		 * The field to use as default where no field prefix is given in the query
-		 * string
-		 * <p>
-		 * API name: {@code df}
-		 */
-		public final Builder df(@Nullable String value) {
-			this.df = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Starting offset (default: 0)
-		 * <p>
-		 * API name: {@code from}
-		 */
-		public final Builder from(@Nullable Long value) {
-			this.from = value;
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Required - A comma-separated list of index names to search; use
-		 * <code>_all</code> or empty string to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * Required - A comma-separated list of index names to search; use
-		 * <code>_all</code> or empty string to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Specify whether format-based query failures (such as providing text to a
-		 * numeric field) should be ignored
-		 * <p>
-		 * API name: {@code lenient}
-		 */
-		public final Builder lenient(@Nullable Boolean value) {
-			this.lenient = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_docs}
-		 */
-		public final Builder maxDocs(@Nullable Long value) {
-			this.maxDocs = value;
-			return this;
-		}
-
-		/**
-		 * Specify the node or shard the operation should be performed on (default:
-		 * random)
-		 * <p>
-		 * API name: {@code preference}
-		 */
-		public final Builder preference(@Nullable String value) {
-			this.preference = value;
-			return this;
-		}
-
-		/**
-		 * Query in the Lucene query string syntax
-		 * <p>
-		 * API name: {@code q}
-		 */
-		public final Builder q(@Nullable String value) {
-			this.q = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code query}
-		 */
-		public final Builder query(@Nullable Query value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code query}
-		 */
-		public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.query(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * Should the effected indexes be refreshed?
-		 * <p>
-		 * API name: {@code refresh}
-		 */
-		public final Builder refresh(@Nullable Boolean value) {
-			this.refresh = value;
-			return this;
-		}
-
-		/**
-		 * Specify if request cache should be used for this request or not, defaults to
-		 * index level setting
-		 * <p>
-		 * API name: {@code request_cache}
-		 */
-		public final Builder requestCache(@Nullable Boolean value) {
-			this.requestCache = value;
-			return this;
-		}
-
-		/**
-		 * The throttle for this request in sub-requests per second. -1 means no
-		 * throttle.
-		 * <p>
-		 * API name: {@code requests_per_second}
-		 */
-		public final Builder requestsPerSecond(@Nullable Long value) {
-			this.requestsPerSecond = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of specific routing values
-		 * <p>
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Specify how long a consistent view of the index should be maintained for
-		 * scrolled search
-		 * <p>
-		 * API name: {@code scroll}
-		 */
-		public final Builder scroll(@Nullable Time value) {
-			this.scroll = value;
-			return this;
-		}
-
-		/**
-		 * Specify how long a consistent view of the index should be maintained for
-		 * scrolled search
-		 * <p>
-		 * API name: {@code scroll}
-		 */
-		public final Builder scroll(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.scroll(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Size on the scroll request powering the delete by query
-		 * <p>
-		 * API name: {@code scroll_size}
-		 */
-		public final Builder scrollSize(@Nullable Long value) {
-			this.scrollSize = value;
-			return this;
-		}
-
-		/**
-		 * Explicit timeout for each search request. Defaults to no timeout.
-		 * <p>
-		 * API name: {@code search_timeout}
-		 */
-		public final Builder searchTimeout(@Nullable Time value) {
-			this.searchTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit timeout for each search request. Defaults to no timeout.
-		 * <p>
-		 * API name: {@code search_timeout}
-		 */
-		public final Builder searchTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.searchTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Search operation type
-		 * <p>
-		 * API name: {@code search_type}
-		 */
-		public final Builder searchType(@Nullable SearchType value) {
-			this.searchType = value;
-			return this;
-		}
-
-		/**
-		 * Deprecated, please use <code>max_docs</code> instead
-		 * <p>
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Long value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code slice}
-		 */
-		public final Builder slice(@Nullable SlicedScroll value) {
-			this.slice = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code slice}
-		 */
-		public final Builder slice(Function<SlicedScroll.Builder, ObjectBuilder<SlicedScroll>> fn) {
-			return this.slice(fn.apply(new SlicedScroll.Builder()).build());
-		}
-
-		/**
-		 * The number of slices this task should be divided into. Defaults to 1, meaning
-		 * the task isn't sliced into subtasks. Can be set to 0 for <code>auto</code>.
-		 * <p>
-		 * API name: {@code slices}
-		 */
-		public final Builder slices(@Nullable Long value) {
-			this.slices = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of &lt;field&gt;:&lt;direction&gt; pairs
-		 * <p>
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sort</code>.
-		 */
-		public final Builder sort(List<String> list) {
-			this.sort = _listAddAll(this.sort, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of &lt;field&gt;:&lt;direction&gt; pairs
-		 * <p>
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds one or more values to <code>sort</code>.
-		 */
-		public final Builder sort(String value, String... values) {
-			this.sort = _listAdd(this.sort, value, values);
-			return this;
-		}
-
-		/**
-		 * Specific 'tag' of the request for logging and statistical purposes
-		 * <p>
-		 * API name: {@code stats}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>stats</code>.
-		 */
-		public final Builder stats(List<String> list) {
-			this.stats = _listAddAll(this.stats, list);
-			return this;
-		}
-
-		/**
-		 * Specific 'tag' of the request for logging and statistical purposes
-		 * <p>
-		 * API name: {@code stats}
-		 * <p>
-		 * Adds one or more values to <code>stats</code>.
-		 */
-		public final Builder stats(String value, String... values) {
-			this.stats = _listAdd(this.stats, value, values);
-			return this;
-		}
-
-		/**
-		 * The maximum number of documents to collect for each shard, upon reaching
-		 * which the query execution will terminate early.
-		 * <p>
-		 * API name: {@code terminate_after}
-		 */
-		public final Builder terminateAfter(@Nullable Long value) {
-			this.terminateAfter = value;
-			return this;
-		}
-
-		/**
-		 * Time each individual bulk request should wait for shards that are
-		 * unavailable.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Time each individual bulk request should wait for shards that are
-		 * unavailable.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify whether to return document version as part of a hit
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Boolean value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Sets the number of shard copies that must be active before proceeding with
-		 * the delete by query operation. Defaults to 1, meaning the primary shard only.
-		 * Set to <code>all</code> for all shard copies, otherwise set to any
-		 * non-negative value less than or equal to the total number of copies for the
-		 * shard (number of replicas + 1)
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
-			this.waitForActiveShards = value;
-			return this;
-		}
-
-		/**
-		 * Sets the number of shard copies that must be active before proceeding with
-		 * the delete by query operation. Defaults to 1, meaning the primary shard only.
-		 * Set to <code>all</code> for all shard copies, otherwise set to any
-		 * non-negative value less than or equal to the total number of copies for the
-		 * shard (number of replicas + 1)
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(
-				Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
-			return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
-		}
-
-		/**
-		 * Should the request should block until the delete by query is complete.
-		 * <p>
-		 * API name: {@code wait_for_completion}
-		 */
-		public final Builder waitForCompletion(@Nullable Boolean value) {
-			this.waitForCompletion = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DeleteByQueryRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteByQueryRequest build() {
-			_checkSingleUse();
-
-			return new DeleteByQueryRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DeleteByQueryRequest}
-	 */
-	public static final JsonpDeserializer<DeleteByQueryRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DeleteByQueryRequest::setupDeleteByQueryRequestDeserializer);
-
-	protected static void setupDeleteByQueryRequestDeserializer(ObjectDeserializer<DeleteByQueryRequest.Builder> op) {
-
-		op.add(Builder::maxDocs, JsonpDeserializer.longDeserializer(), "max_docs");
-		op.add(Builder::query, Query._DESERIALIZER, "query");
-		op.add(Builder::slice, SlicedScroll._DESERIALIZER, "slice");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code delete_by_query}".
-	 */
-	public static final Endpoint<DeleteByQueryRequest, DeleteByQueryResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_delete_by_query");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.slices != null) {
-					params.put("slices", request.slices == 0 ? "auto" : String.valueOf(request.slices));
-				}
-				if (request.df != null) {
-					params.put("df", request.df);
-				}
-				if (request.terminateAfter != null) {
-					params.put("terminate_after", String.valueOf(request.terminateAfter));
-				}
-				if (request.waitForCompletion != null) {
-					params.put("wait_for_completion", String.valueOf(request.waitForCompletion));
-				}
-				if (request.lenient != null) {
-					params.put("lenient", String.valueOf(request.lenient));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				if (request.routing != null) {
-					params.put("routing", request.routing);
-				}
-				if (request.requestsPerSecond != null) {
-					params.put("requests_per_second", String.valueOf(request.requestsPerSecond));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (ApiTypeHelper.isDefined(request.stats)) {
-					params.put("stats", request.stats.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.analyzer != null) {
-					params.put("analyzer", request.analyzer);
-				}
-				if (request.conflicts != null) {
-					params.put("conflicts", request.conflicts.jsonValue());
-				}
-				if (request.from != null) {
-					params.put("from", String.valueOf(request.from));
-				}
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.preference != null) {
-					params.put("preference", request.preference);
-				}
-				if (request.searchTimeout != null) {
-					params.put("search_timeout", request.searchTimeout._toJsonString());
-				}
-				if (request.analyzeWildcard != null) {
-					params.put("analyze_wildcard", String.valueOf(request.analyzeWildcard));
-				}
-				if (request.scroll != null) {
-					params.put("scroll", request.scroll._toJsonString());
-				}
-				if (request.scrollSize != null) {
-					params.put("scroll_size", String.valueOf(request.scrollSize));
-				}
-				if (request.refresh != null) {
-					params.put("refresh", String.valueOf(request.refresh));
-				}
-				if (ApiTypeHelper.isDefined(request.sort)) {
-					params.put("sort", request.sort.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.searchType != null) {
-					params.put("search_type", request.searchType.jsonValue());
-				}
-				if (request.version != null) {
-					params.put("version", String.valueOf(request.version));
-				}
-				if (request.q != null) {
-					params.put("q", request.q);
-				}
-				if (request.defaultOperator != null) {
-					params.put("default_operator", request.defaultOperator.jsonValue());
-				}
-				if (request.size != null) {
-					params.put("size", String.valueOf(request.size));
-				}
-				if (request.waitForActiveShards != null) {
-					params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
-				}
-				if (request.source != null) {
-					params.put("_source", request.source._toJsonString());
-				}
-				if (ApiTypeHelper.isDefined(request.sourceExcludes)) {
-					params.put("_source_excludes",
-							request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.requestCache != null) {
-					params.put("request_cache", String.valueOf(request.requestCache));
-				}
-				if (ApiTypeHelper.isDefined(request.sourceIncludes)) {
-					params.put("_source_includes",
-							request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, DeleteByQueryResponse._DESERIALIZER);
+        @Nullable
+        private Time searchTimeout;
+
+        @Nullable
+        private SearchType searchType;
+
+        @Nullable
+        private Long size;
+
+        @Nullable
+        private SlicedScroll slice;
+
+        @Nullable
+        private Long slices;
+
+        @Nullable
+        private List<String> sort;
+
+        @Nullable
+        private List<String> stats;
+
+        @Nullable
+        private Long terminateAfter;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private Boolean version;
+
+        @Nullable
+        private WaitForActiveShards waitForActiveShards;
+
+        @Nullable
+        private Boolean waitForCompletion;
+
+        /**
+         * True or false to return the _source field or not, or a list of fields to
+         * return
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(@Nullable SourceConfigParam value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * True or false to return the _source field or not, or a list of fields to
+         * return
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(Function<SourceConfigParam.Builder, ObjectBuilder<SourceConfigParam>> fn) {
+            return this.source(fn.apply(new SourceConfigParam.Builder()).build());
+        }
+
+        /**
+         * A list of fields to exclude from the returned _source field
+         * <p>
+         * API name: {@code _source_excludes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceExcludes</code>.
+         */
+        public final Builder sourceExcludes(List<String> list) {
+            this.sourceExcludes = _listAddAll(this.sourceExcludes, list);
+            return this;
+        }
+
+        /**
+         * A list of fields to exclude from the returned _source field
+         * <p>
+         * API name: {@code _source_excludes}
+         * <p>
+         * Adds one or more values to <code>sourceExcludes</code>.
+         */
+        public final Builder sourceExcludes(String value, String... values) {
+            this.sourceExcludes = _listAdd(this.sourceExcludes, value, values);
+            return this;
+        }
+
+        /**
+         * A list of fields to extract and return from the _source field
+         * <p>
+         * API name: {@code _source_includes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceIncludes</code>.
+         */
+        public final Builder sourceIncludes(List<String> list) {
+            this.sourceIncludes = _listAddAll(this.sourceIncludes, list);
+            return this;
+        }
+
+        /**
+         * A list of fields to extract and return from the _source field
+         * <p>
+         * API name: {@code _source_includes}
+         * <p>
+         * Adds one or more values to <code>sourceIncludes</code>.
+         */
+        public final Builder sourceIncludes(String value, String... values) {
+            this.sourceIncludes = _listAdd(this.sourceIncludes, value, values);
+            return this;
+        }
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Specify whether wildcard and prefix queries should be analyzed (default:
+         * false)
+         * <p>
+         * API name: {@code analyze_wildcard}
+         */
+        public final Builder analyzeWildcard(@Nullable Boolean value) {
+            this.analyzeWildcard = value;
+            return this;
+        }
+
+        /**
+         * The analyzer to use for the query string
+         * <p>
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * What to do when the delete by query hits version conflicts?
+         * <p>
+         * API name: {@code conflicts}
+         */
+        public final Builder conflicts(@Nullable Conflicts value) {
+            this.conflicts = value;
+            return this;
+        }
+
+        /**
+         * The default operator for query string query (AND or OR)
+         * <p>
+         * API name: {@code default_operator}
+         */
+        public final Builder defaultOperator(@Nullable Operator value) {
+            this.defaultOperator = value;
+            return this;
+        }
+
+        /**
+         * The field to use as default where no field prefix is given in the query
+         * string
+         * <p>
+         * API name: {@code df}
+         */
+        public final Builder df(@Nullable String value) {
+            this.df = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Starting offset (default: 0)
+         * <p>
+         * API name: {@code from}
+         */
+        public final Builder from(@Nullable Long value) {
+            this.from = value;
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Required - A comma-separated list of index names to search; use
+         * <code>_all</code> or empty string to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * Required - A comma-separated list of index names to search; use
+         * <code>_all</code> or empty string to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Specify whether format-based query failures (such as providing text to a
+         * numeric field) should be ignored
+         * <p>
+         * API name: {@code lenient}
+         */
+        public final Builder lenient(@Nullable Boolean value) {
+            this.lenient = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_docs}
+         */
+        public final Builder maxDocs(@Nullable Long value) {
+            this.maxDocs = value;
+            return this;
+        }
+
+        /**
+         * Specify the node or shard the operation should be performed on (default:
+         * random)
+         * <p>
+         * API name: {@code preference}
+         */
+        public final Builder preference(@Nullable String value) {
+            this.preference = value;
+            return this;
+        }
+
+        /**
+         * Query in the Lucene query string syntax
+         * <p>
+         * API name: {@code q}
+         */
+        public final Builder q(@Nullable String value) {
+            this.q = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code query}
+         */
+        public final Builder query(@Nullable Query value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code query}
+         */
+        public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.query(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * Should the effected indexes be refreshed?
+         * <p>
+         * API name: {@code refresh}
+         */
+        public final Builder refresh(@Nullable Boolean value) {
+            this.refresh = value;
+            return this;
+        }
+
+        /**
+         * Specify if request cache should be used for this request or not, defaults to
+         * index level setting
+         * <p>
+         * API name: {@code request_cache}
+         */
+        public final Builder requestCache(@Nullable Boolean value) {
+            this.requestCache = value;
+            return this;
+        }
+
+        /**
+         * The throttle for this request in sub-requests per second. -1 means no
+         * throttle.
+         * <p>
+         * API name: {@code requests_per_second}
+         */
+        public final Builder requestsPerSecond(@Nullable Long value) {
+            this.requestsPerSecond = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of specific routing values
+         * <p>
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Specify how long a consistent view of the index should be maintained for
+         * scrolled search
+         * <p>
+         * API name: {@code scroll}
+         */
+        public final Builder scroll(@Nullable Time value) {
+            this.scroll = value;
+            return this;
+        }
+
+        /**
+         * Specify how long a consistent view of the index should be maintained for
+         * scrolled search
+         * <p>
+         * API name: {@code scroll}
+         */
+        public final Builder scroll(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.scroll(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Size on the scroll request powering the delete by query
+         * <p>
+         * API name: {@code scroll_size}
+         */
+        public final Builder scrollSize(@Nullable Long value) {
+            this.scrollSize = value;
+            return this;
+        }
+
+        /**
+         * Explicit timeout for each search request. Defaults to no timeout.
+         * <p>
+         * API name: {@code search_timeout}
+         */
+        public final Builder searchTimeout(@Nullable Time value) {
+            this.searchTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit timeout for each search request. Defaults to no timeout.
+         * <p>
+         * API name: {@code search_timeout}
+         */
+        public final Builder searchTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.searchTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Search operation type
+         * <p>
+         * API name: {@code search_type}
+         */
+        public final Builder searchType(@Nullable SearchType value) {
+            this.searchType = value;
+            return this;
+        }
+
+        /**
+         * Deprecated, please use <code>max_docs</code> instead
+         * <p>
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Long value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code slice}
+         */
+        public final Builder slice(@Nullable SlicedScroll value) {
+            this.slice = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code slice}
+         */
+        public final Builder slice(Function<SlicedScroll.Builder, ObjectBuilder<SlicedScroll>> fn) {
+            return this.slice(fn.apply(new SlicedScroll.Builder()).build());
+        }
+
+        /**
+         * The number of slices this task should be divided into. Defaults to 1, meaning
+         * the task isn't sliced into subtasks. Can be set to 0 for <code>auto</code>.
+         * <p>
+         * API name: {@code slices}
+         */
+        public final Builder slices(@Nullable Long value) {
+            this.slices = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of &lt;field&gt;:&lt;direction&gt; pairs
+         * <p>
+         * API name: {@code sort}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sort</code>.
+         */
+        public final Builder sort(List<String> list) {
+            this.sort = _listAddAll(this.sort, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of &lt;field&gt;:&lt;direction&gt; pairs
+         * <p>
+         * API name: {@code sort}
+         * <p>
+         * Adds one or more values to <code>sort</code>.
+         */
+        public final Builder sort(String value, String... values) {
+            this.sort = _listAdd(this.sort, value, values);
+            return this;
+        }
+
+        /**
+         * Specific 'tag' of the request for logging and statistical purposes
+         * <p>
+         * API name: {@code stats}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>stats</code>.
+         */
+        public final Builder stats(List<String> list) {
+            this.stats = _listAddAll(this.stats, list);
+            return this;
+        }
+
+        /**
+         * Specific 'tag' of the request for logging and statistical purposes
+         * <p>
+         * API name: {@code stats}
+         * <p>
+         * Adds one or more values to <code>stats</code>.
+         */
+        public final Builder stats(String value, String... values) {
+            this.stats = _listAdd(this.stats, value, values);
+            return this;
+        }
+
+        /**
+         * The maximum number of documents to collect for each shard, upon reaching
+         * which the query execution will terminate early.
+         * <p>
+         * API name: {@code terminate_after}
+         */
+        public final Builder terminateAfter(@Nullable Long value) {
+            this.terminateAfter = value;
+            return this;
+        }
+
+        /**
+         * Time each individual bulk request should wait for shards that are
+         * unavailable.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Time each individual bulk request should wait for shards that are
+         * unavailable.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify whether to return document version as part of a hit
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Boolean value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Sets the number of shard copies that must be active before proceeding with
+         * the delete by query operation. Defaults to 1, meaning the primary shard only.
+         * Set to <code>all</code> for all shard copies, otherwise set to any
+         * non-negative value less than or equal to the total number of copies for the
+         * shard (number of replicas + 1)
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
+            this.waitForActiveShards = value;
+            return this;
+        }
+
+        /**
+         * Sets the number of shard copies that must be active before proceeding with
+         * the delete by query operation. Defaults to 1, meaning the primary shard only.
+         * Set to <code>all</code> for all shard copies, otherwise set to any
+         * non-negative value less than or equal to the total number of copies for the
+         * shard (number of replicas + 1)
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
+            return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
+        }
+
+        /**
+         * Should the request should block until the delete by query is complete.
+         * <p>
+         * API name: {@code wait_for_completion}
+         */
+        public final Builder waitForCompletion(@Nullable Boolean value) {
+            this.waitForCompletion = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link DeleteByQueryRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteByQueryRequest build() {
+            _checkSingleUse();
+
+            return new DeleteByQueryRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DeleteByQueryRequest}
+     */
+    public static final JsonpDeserializer<DeleteByQueryRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DeleteByQueryRequest::setupDeleteByQueryRequestDeserializer
+    );
+
+    protected static void setupDeleteByQueryRequestDeserializer(ObjectDeserializer<DeleteByQueryRequest.Builder> op) {
+
+        op.add(Builder::maxDocs, JsonpDeserializer.longDeserializer(), "max_docs");
+        op.add(Builder::query, Query._DESERIALIZER, "query");
+        op.add(Builder::slice, SlicedScroll._DESERIALIZER, "slice");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code delete_by_query}".
+     */
+    public static final Endpoint<DeleteByQueryRequest, DeleteByQueryResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_delete_by_query");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.slices != null) {
+                params.put("slices", request.slices == 0 ? "auto" : String.valueOf(request.slices));
+            }
+            if (request.df != null) {
+                params.put("df", request.df);
+            }
+            if (request.terminateAfter != null) {
+                params.put("terminate_after", String.valueOf(request.terminateAfter));
+            }
+            if (request.waitForCompletion != null) {
+                params.put("wait_for_completion", String.valueOf(request.waitForCompletion));
+            }
+            if (request.lenient != null) {
+                params.put("lenient", String.valueOf(request.lenient));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            if (request.requestsPerSecond != null) {
+                params.put("requests_per_second", String.valueOf(request.requestsPerSecond));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (ApiTypeHelper.isDefined(request.stats)) {
+                params.put("stats", request.stats.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.analyzer != null) {
+                params.put("analyzer", request.analyzer);
+            }
+            if (request.conflicts != null) {
+                params.put("conflicts", request.conflicts.jsonValue());
+            }
+            if (request.from != null) {
+                params.put("from", String.valueOf(request.from));
+            }
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.preference != null) {
+                params.put("preference", request.preference);
+            }
+            if (request.searchTimeout != null) {
+                params.put("search_timeout", request.searchTimeout._toJsonString());
+            }
+            if (request.analyzeWildcard != null) {
+                params.put("analyze_wildcard", String.valueOf(request.analyzeWildcard));
+            }
+            if (request.scroll != null) {
+                params.put("scroll", request.scroll._toJsonString());
+            }
+            if (request.scrollSize != null) {
+                params.put("scroll_size", String.valueOf(request.scrollSize));
+            }
+            if (request.refresh != null) {
+                params.put("refresh", String.valueOf(request.refresh));
+            }
+            if (ApiTypeHelper.isDefined(request.sort)) {
+                params.put("sort", request.sort.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.searchType != null) {
+                params.put("search_type", request.searchType.jsonValue());
+            }
+            if (request.version != null) {
+                params.put("version", String.valueOf(request.version));
+            }
+            if (request.q != null) {
+                params.put("q", request.q);
+            }
+            if (request.defaultOperator != null) {
+                params.put("default_operator", request.defaultOperator.jsonValue());
+            }
+            if (request.size != null) {
+                params.put("size", String.valueOf(request.size));
+            }
+            if (request.waitForActiveShards != null) {
+                params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
+            }
+            if (request.source != null) {
+                params.put("_source", request.source._toJsonString());
+            }
+            if (ApiTypeHelper.isDefined(request.sourceExcludes)) {
+                params.put("_source_excludes", request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.requestCache != null) {
+                params.put("request_cache", String.valueOf(request.requestCache));
+            }
+            if (ApiTypeHelper.isDefined(request.sourceIncludes)) {
+                params.put("_source_includes", request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        DeleteByQueryResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteByQueryResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteByQueryResponse.java
index 474e8b3326..7f95532c2b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteByQueryResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteByQueryResponse.java
@@ -32,522 +32,521 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.BulkIndexByScrollFailure;
-import org.opensearch.client.opensearch._types.Retries;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.BulkIndexByScrollFailure;
+import org.opensearch.client.opensearch._types.Retries;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.delete_by_query.Response
 
 @JsonpDeserializable
 public class DeleteByQueryResponse implements JsonpSerializable {
-	@Nullable
-	private final Long batches;
-
-	@Nullable
-	private final Long deleted;
-
-	private final List<BulkIndexByScrollFailure> failures;
-
-	@Nullable
-	private final Long noops;
-
-	@Nullable
-	private final Float requestsPerSecond;
-
-	@Nullable
-	private final Retries retries;
-
-	@Nullable
-	private final Integer sliceId;
-
-	@Nullable
-	private final String task;
-
-	@Nullable
-	private final Long throttledMillis;
-
-	@Nullable
-	private final Long throttledUntilMillis;
-
-	@Nullable
-	private final Boolean timedOut;
-
-	@Nullable
-	private final Long took;
-
-	@Nullable
-	private final Long total;
-
-	@Nullable
-	private final Long versionConflicts;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteByQueryResponse(Builder builder) {
-
-		this.batches = builder.batches;
-		this.deleted = builder.deleted;
-		this.failures = ApiTypeHelper.unmodifiable(builder.failures);
-		this.noops = builder.noops;
-		this.requestsPerSecond = builder.requestsPerSecond;
-		this.retries = builder.retries;
-		this.sliceId = builder.sliceId;
-		this.task = builder.task;
-		this.throttledMillis = builder.throttledMillis;
-		this.throttledUntilMillis = builder.throttledUntilMillis;
-		this.timedOut = builder.timedOut;
-		this.took = builder.took;
-		this.total = builder.total;
-		this.versionConflicts = builder.versionConflicts;
-
-	}
-
-	public static DeleteByQueryResponse of(Function<Builder, ObjectBuilder<DeleteByQueryResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code batches}
-	 */
-	@Nullable
-	public final Long batches() {
-		return this.batches;
-	}
-
-	/**
-	 * API name: {@code deleted}
-	 */
-	@Nullable
-	public final Long deleted() {
-		return this.deleted;
-	}
-
-	/**
-	 * API name: {@code failures}
-	 */
-	public final List<BulkIndexByScrollFailure> failures() {
-		return this.failures;
-	}
-
-	/**
-	 * API name: {@code noops}
-	 */
-	@Nullable
-	public final Long noops() {
-		return this.noops;
-	}
-
-	/**
-	 * API name: {@code requests_per_second}
-	 */
-	@Nullable
-	public final Float requestsPerSecond() {
-		return this.requestsPerSecond;
-	}
-
-	/**
-	 * API name: {@code retries}
-	 */
-	@Nullable
-	public final Retries retries() {
-		return this.retries;
-	}
-
-	/**
-	 * API name: {@code slice_id}
-	 */
-	@Nullable
-	public final Integer sliceId() {
-		return this.sliceId;
-	}
-
-	/**
-	 * API name: {@code task}
-	 */
-	@Nullable
-	public final String task() {
-		return this.task;
-	}
-
-	/**
-	 * API name: {@code throttled_millis}
-	 */
-	@Nullable
-	public final Long throttledMillis() {
-		return this.throttledMillis;
-	}
-
-	/**
-	 * API name: {@code throttled_until_millis}
-	 */
-	@Nullable
-	public final Long throttledUntilMillis() {
-		return this.throttledUntilMillis;
-	}
-
-	/**
-	 * API name: {@code timed_out}
-	 */
-	@Nullable
-	public final Boolean timedOut() {
-		return this.timedOut;
-	}
-
-	/**
-	 * API name: {@code took}
-	 */
-	@Nullable
-	public final Long took() {
-		return this.took;
-	}
-
-	/**
-	 * API name: {@code total}
-	 */
-	@Nullable
-	public final Long total() {
-		return this.total;
-	}
-
-	/**
-	 * API name: {@code version_conflicts}
-	 */
-	@Nullable
-	public final Long versionConflicts() {
-		return this.versionConflicts;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.batches != null) {
-			generator.writeKey("batches");
-			generator.write(this.batches);
-
-		}
-		if (this.deleted != null) {
-			generator.writeKey("deleted");
-			generator.write(this.deleted);
-
-		}
-		if (ApiTypeHelper.isDefined(this.failures)) {
-			generator.writeKey("failures");
-			generator.writeStartArray();
-			for (BulkIndexByScrollFailure item0 : this.failures) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.noops != null) {
-			generator.writeKey("noops");
-			generator.write(this.noops);
-
-		}
-		if (this.requestsPerSecond != null) {
-			generator.writeKey("requests_per_second");
-			generator.write(this.requestsPerSecond);
-
-		}
-		if (this.retries != null) {
-			generator.writeKey("retries");
-			this.retries.serialize(generator, mapper);
-
-		}
-		if (this.sliceId != null) {
-			generator.writeKey("slice_id");
-			generator.write(this.sliceId);
-
-		}
-		if (this.task != null) {
-			generator.writeKey("task");
-			generator.write(this.task);
-
-		}
-		if (this.throttledMillis != null) {
-			generator.writeKey("throttled_millis");
-			generator.write(this.throttledMillis);
-
-		}
-		if (this.throttledUntilMillis != null) {
-			generator.writeKey("throttled_until_millis");
-			generator.write(this.throttledUntilMillis);
-
-		}
-		if (this.timedOut != null) {
-			generator.writeKey("timed_out");
-			generator.write(this.timedOut);
-
-		}
-		if (this.took != null) {
-			generator.writeKey("took");
-			generator.write(this.took);
-
-		}
-		if (this.total != null) {
-			generator.writeKey("total");
-			generator.write(this.total);
-
-		}
-		if (this.versionConflicts != null) {
-			generator.writeKey("version_conflicts");
-			generator.write(this.versionConflicts);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteByQueryResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteByQueryResponse> {
-		@Nullable
-		private Long batches;
-
-		@Nullable
-		private Long deleted;
-
-		@Nullable
-		private List<BulkIndexByScrollFailure> failures;
-
-		@Nullable
-		private Long noops;
-
-		@Nullable
-		private Float requestsPerSecond;
-
-		@Nullable
-		private Retries retries;
-
-		@Nullable
-		private Integer sliceId;
-
-		@Nullable
-		private String task;
-
-		@Nullable
-		private Long throttledMillis;
-
-		@Nullable
-		private Long throttledUntilMillis;
-
-		@Nullable
-		private Boolean timedOut;
-
-		@Nullable
-		private Long took;
-
-		@Nullable
-		private Long total;
-
-		@Nullable
-		private Long versionConflicts;
-
-		/**
-		 * API name: {@code batches}
-		 */
-		public final Builder batches(@Nullable Long value) {
-			this.batches = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code deleted}
-		 */
-		public final Builder deleted(@Nullable Long value) {
-			this.deleted = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>failures</code>.
-		 */
-		public final Builder failures(List<BulkIndexByScrollFailure> list) {
-			this.failures = _listAddAll(this.failures, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds one or more values to <code>failures</code>.
-		 */
-		public final Builder failures(BulkIndexByScrollFailure value, BulkIndexByScrollFailure... values) {
-			this.failures = _listAdd(this.failures, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds a value to <code>failures</code> using a builder lambda.
-		 */
-		public final Builder failures(
-				Function<BulkIndexByScrollFailure.Builder, ObjectBuilder<BulkIndexByScrollFailure>> fn) {
-			return failures(fn.apply(new BulkIndexByScrollFailure.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code noops}
-		 */
-		public final Builder noops(@Nullable Long value) {
-			this.noops = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code requests_per_second}
-		 */
-		public final Builder requestsPerSecond(@Nullable Float value) {
-			this.requestsPerSecond = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code retries}
-		 */
-		public final Builder retries(@Nullable Retries value) {
-			this.retries = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code retries}
-		 */
-		public final Builder retries(Function<Retries.Builder, ObjectBuilder<Retries>> fn) {
-			return this.retries(fn.apply(new Retries.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code slice_id}
-		 */
-		public final Builder sliceId(@Nullable Integer value) {
-			this.sliceId = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code task}
-		 */
-		public final Builder task(@Nullable String value) {
-			this.task = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code throttled_millis}
-		 */
-		public final Builder throttledMillis(@Nullable Long value) {
-			this.throttledMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code throttled_until_millis}
-		 */
-		public final Builder throttledUntilMillis(@Nullable Long value) {
-			this.throttledUntilMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code timed_out}
-		 */
-		public final Builder timedOut(@Nullable Boolean value) {
-			this.timedOut = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code took}
-		 */
-		public final Builder took(@Nullable Long value) {
-			this.took = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total}
-		 */
-		public final Builder total(@Nullable Long value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code version_conflicts}
-		 */
-		public final Builder versionConflicts(@Nullable Long value) {
-			this.versionConflicts = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DeleteByQueryResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteByQueryResponse build() {
-			_checkSingleUse();
-
-			return new DeleteByQueryResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DeleteByQueryResponse}
-	 */
-	public static final JsonpDeserializer<DeleteByQueryResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DeleteByQueryResponse::setupDeleteByQueryResponseDeserializer);
-
-	protected static void setupDeleteByQueryResponseDeserializer(ObjectDeserializer<DeleteByQueryResponse.Builder> op) {
-
-		op.add(Builder::batches, JsonpDeserializer.longDeserializer(), "batches");
-		op.add(Builder::deleted, JsonpDeserializer.longDeserializer(), "deleted");
-		op.add(Builder::failures, JsonpDeserializer.arrayDeserializer(BulkIndexByScrollFailure._DESERIALIZER),
-				"failures");
-		op.add(Builder::noops, JsonpDeserializer.longDeserializer(), "noops");
-		op.add(Builder::requestsPerSecond, JsonpDeserializer.floatDeserializer(), "requests_per_second");
-		op.add(Builder::retries, Retries._DESERIALIZER, "retries");
-		op.add(Builder::sliceId, JsonpDeserializer.integerDeserializer(), "slice_id");
-		op.add(Builder::task, JsonpDeserializer.stringDeserializer(), "task");
-		op.add(Builder::throttledMillis, JsonpDeserializer.longDeserializer(), "throttled_millis");
-		op.add(Builder::throttledUntilMillis, JsonpDeserializer.longDeserializer(), "throttled_until_millis");
-		op.add(Builder::timedOut, JsonpDeserializer.booleanDeserializer(), "timed_out");
-		op.add(Builder::took, JsonpDeserializer.longDeserializer(), "took");
-		op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
-		op.add(Builder::versionConflicts, JsonpDeserializer.longDeserializer(), "version_conflicts");
-
-	}
+    @Nullable
+    private final Long batches;
+
+    @Nullable
+    private final Long deleted;
+
+    private final List<BulkIndexByScrollFailure> failures;
+
+    @Nullable
+    private final Long noops;
+
+    @Nullable
+    private final Float requestsPerSecond;
+
+    @Nullable
+    private final Retries retries;
+
+    @Nullable
+    private final Integer sliceId;
+
+    @Nullable
+    private final String task;
+
+    @Nullable
+    private final Long throttledMillis;
+
+    @Nullable
+    private final Long throttledUntilMillis;
+
+    @Nullable
+    private final Boolean timedOut;
+
+    @Nullable
+    private final Long took;
+
+    @Nullable
+    private final Long total;
+
+    @Nullable
+    private final Long versionConflicts;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteByQueryResponse(Builder builder) {
+
+        this.batches = builder.batches;
+        this.deleted = builder.deleted;
+        this.failures = ApiTypeHelper.unmodifiable(builder.failures);
+        this.noops = builder.noops;
+        this.requestsPerSecond = builder.requestsPerSecond;
+        this.retries = builder.retries;
+        this.sliceId = builder.sliceId;
+        this.task = builder.task;
+        this.throttledMillis = builder.throttledMillis;
+        this.throttledUntilMillis = builder.throttledUntilMillis;
+        this.timedOut = builder.timedOut;
+        this.took = builder.took;
+        this.total = builder.total;
+        this.versionConflicts = builder.versionConflicts;
+
+    }
+
+    public static DeleteByQueryResponse of(Function<Builder, ObjectBuilder<DeleteByQueryResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code batches}
+     */
+    @Nullable
+    public final Long batches() {
+        return this.batches;
+    }
+
+    /**
+     * API name: {@code deleted}
+     */
+    @Nullable
+    public final Long deleted() {
+        return this.deleted;
+    }
+
+    /**
+     * API name: {@code failures}
+     */
+    public final List<BulkIndexByScrollFailure> failures() {
+        return this.failures;
+    }
+
+    /**
+     * API name: {@code noops}
+     */
+    @Nullable
+    public final Long noops() {
+        return this.noops;
+    }
+
+    /**
+     * API name: {@code requests_per_second}
+     */
+    @Nullable
+    public final Float requestsPerSecond() {
+        return this.requestsPerSecond;
+    }
+
+    /**
+     * API name: {@code retries}
+     */
+    @Nullable
+    public final Retries retries() {
+        return this.retries;
+    }
+
+    /**
+     * API name: {@code slice_id}
+     */
+    @Nullable
+    public final Integer sliceId() {
+        return this.sliceId;
+    }
+
+    /**
+     * API name: {@code task}
+     */
+    @Nullable
+    public final String task() {
+        return this.task;
+    }
+
+    /**
+     * API name: {@code throttled_millis}
+     */
+    @Nullable
+    public final Long throttledMillis() {
+        return this.throttledMillis;
+    }
+
+    /**
+     * API name: {@code throttled_until_millis}
+     */
+    @Nullable
+    public final Long throttledUntilMillis() {
+        return this.throttledUntilMillis;
+    }
+
+    /**
+     * API name: {@code timed_out}
+     */
+    @Nullable
+    public final Boolean timedOut() {
+        return this.timedOut;
+    }
+
+    /**
+     * API name: {@code took}
+     */
+    @Nullable
+    public final Long took() {
+        return this.took;
+    }
+
+    /**
+     * API name: {@code total}
+     */
+    @Nullable
+    public final Long total() {
+        return this.total;
+    }
+
+    /**
+     * API name: {@code version_conflicts}
+     */
+    @Nullable
+    public final Long versionConflicts() {
+        return this.versionConflicts;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.batches != null) {
+            generator.writeKey("batches");
+            generator.write(this.batches);
+
+        }
+        if (this.deleted != null) {
+            generator.writeKey("deleted");
+            generator.write(this.deleted);
+
+        }
+        if (ApiTypeHelper.isDefined(this.failures)) {
+            generator.writeKey("failures");
+            generator.writeStartArray();
+            for (BulkIndexByScrollFailure item0 : this.failures) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.noops != null) {
+            generator.writeKey("noops");
+            generator.write(this.noops);
+
+        }
+        if (this.requestsPerSecond != null) {
+            generator.writeKey("requests_per_second");
+            generator.write(this.requestsPerSecond);
+
+        }
+        if (this.retries != null) {
+            generator.writeKey("retries");
+            this.retries.serialize(generator, mapper);
+
+        }
+        if (this.sliceId != null) {
+            generator.writeKey("slice_id");
+            generator.write(this.sliceId);
+
+        }
+        if (this.task != null) {
+            generator.writeKey("task");
+            generator.write(this.task);
+
+        }
+        if (this.throttledMillis != null) {
+            generator.writeKey("throttled_millis");
+            generator.write(this.throttledMillis);
+
+        }
+        if (this.throttledUntilMillis != null) {
+            generator.writeKey("throttled_until_millis");
+            generator.write(this.throttledUntilMillis);
+
+        }
+        if (this.timedOut != null) {
+            generator.writeKey("timed_out");
+            generator.write(this.timedOut);
+
+        }
+        if (this.took != null) {
+            generator.writeKey("took");
+            generator.write(this.took);
+
+        }
+        if (this.total != null) {
+            generator.writeKey("total");
+            generator.write(this.total);
+
+        }
+        if (this.versionConflicts != null) {
+            generator.writeKey("version_conflicts");
+            generator.write(this.versionConflicts);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteByQueryResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteByQueryResponse> {
+        @Nullable
+        private Long batches;
+
+        @Nullable
+        private Long deleted;
+
+        @Nullable
+        private List<BulkIndexByScrollFailure> failures;
+
+        @Nullable
+        private Long noops;
+
+        @Nullable
+        private Float requestsPerSecond;
+
+        @Nullable
+        private Retries retries;
+
+        @Nullable
+        private Integer sliceId;
+
+        @Nullable
+        private String task;
+
+        @Nullable
+        private Long throttledMillis;
+
+        @Nullable
+        private Long throttledUntilMillis;
+
+        @Nullable
+        private Boolean timedOut;
+
+        @Nullable
+        private Long took;
+
+        @Nullable
+        private Long total;
+
+        @Nullable
+        private Long versionConflicts;
+
+        /**
+         * API name: {@code batches}
+         */
+        public final Builder batches(@Nullable Long value) {
+            this.batches = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code deleted}
+         */
+        public final Builder deleted(@Nullable Long value) {
+            this.deleted = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>failures</code>.
+         */
+        public final Builder failures(List<BulkIndexByScrollFailure> list) {
+            this.failures = _listAddAll(this.failures, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds one or more values to <code>failures</code>.
+         */
+        public final Builder failures(BulkIndexByScrollFailure value, BulkIndexByScrollFailure... values) {
+            this.failures = _listAdd(this.failures, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds a value to <code>failures</code> using a builder lambda.
+         */
+        public final Builder failures(Function<BulkIndexByScrollFailure.Builder, ObjectBuilder<BulkIndexByScrollFailure>> fn) {
+            return failures(fn.apply(new BulkIndexByScrollFailure.Builder()).build());
+        }
+
+        /**
+         * API name: {@code noops}
+         */
+        public final Builder noops(@Nullable Long value) {
+            this.noops = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code requests_per_second}
+         */
+        public final Builder requestsPerSecond(@Nullable Float value) {
+            this.requestsPerSecond = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code retries}
+         */
+        public final Builder retries(@Nullable Retries value) {
+            this.retries = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code retries}
+         */
+        public final Builder retries(Function<Retries.Builder, ObjectBuilder<Retries>> fn) {
+            return this.retries(fn.apply(new Retries.Builder()).build());
+        }
+
+        /**
+         * API name: {@code slice_id}
+         */
+        public final Builder sliceId(@Nullable Integer value) {
+            this.sliceId = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code task}
+         */
+        public final Builder task(@Nullable String value) {
+            this.task = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code throttled_millis}
+         */
+        public final Builder throttledMillis(@Nullable Long value) {
+            this.throttledMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code throttled_until_millis}
+         */
+        public final Builder throttledUntilMillis(@Nullable Long value) {
+            this.throttledUntilMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code timed_out}
+         */
+        public final Builder timedOut(@Nullable Boolean value) {
+            this.timedOut = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code took}
+         */
+        public final Builder took(@Nullable Long value) {
+            this.took = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total}
+         */
+        public final Builder total(@Nullable Long value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code version_conflicts}
+         */
+        public final Builder versionConflicts(@Nullable Long value) {
+            this.versionConflicts = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link DeleteByQueryResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteByQueryResponse build() {
+            _checkSingleUse();
+
+            return new DeleteByQueryResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DeleteByQueryResponse}
+     */
+    public static final JsonpDeserializer<DeleteByQueryResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DeleteByQueryResponse::setupDeleteByQueryResponseDeserializer
+    );
+
+    protected static void setupDeleteByQueryResponseDeserializer(ObjectDeserializer<DeleteByQueryResponse.Builder> op) {
+
+        op.add(Builder::batches, JsonpDeserializer.longDeserializer(), "batches");
+        op.add(Builder::deleted, JsonpDeserializer.longDeserializer(), "deleted");
+        op.add(Builder::failures, JsonpDeserializer.arrayDeserializer(BulkIndexByScrollFailure._DESERIALIZER), "failures");
+        op.add(Builder::noops, JsonpDeserializer.longDeserializer(), "noops");
+        op.add(Builder::requestsPerSecond, JsonpDeserializer.floatDeserializer(), "requests_per_second");
+        op.add(Builder::retries, Retries._DESERIALIZER, "retries");
+        op.add(Builder::sliceId, JsonpDeserializer.integerDeserializer(), "slice_id");
+        op.add(Builder::task, JsonpDeserializer.stringDeserializer(), "task");
+        op.add(Builder::throttledMillis, JsonpDeserializer.longDeserializer(), "throttled_millis");
+        op.add(Builder::throttledUntilMillis, JsonpDeserializer.longDeserializer(), "throttled_until_millis");
+        op.add(Builder::timedOut, JsonpDeserializer.booleanDeserializer(), "timed_out");
+        op.add(Builder::took, JsonpDeserializer.longDeserializer(), "took");
+        op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
+        op.add(Builder::versionConflicts, JsonpDeserializer.longDeserializer(), "version_conflicts");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteByQueryRethrottleRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteByQueryRethrottleRequest.java
index a0f81f73f7..32715c216e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteByQueryRethrottleRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteByQueryRethrottleRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -40,146 +44,144 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: _global.delete_by_query_rethrottle.Request
 
 /**
  * Changes the number of requests per second for a particular Delete By Query
  * operation.
- * 
+ *
  */
 
 public class DeleteByQueryRethrottleRequest extends RequestBase {
-	@Nullable
-	private final Long requestsPerSecond;
-
-	private final String taskId;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteByQueryRethrottleRequest(Builder builder) {
-
-		this.requestsPerSecond = builder.requestsPerSecond;
-		this.taskId = ApiTypeHelper.requireNonNull(builder.taskId, this, "taskId");
-
-	}
-
-	public static DeleteByQueryRethrottleRequest of(
-			Function<Builder, ObjectBuilder<DeleteByQueryRethrottleRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * The throttle to set on this request in floating sub-requests per second. -1
-	 * means set no throttle.
-	 * <p>
-	 * API name: {@code requests_per_second}
-	 */
-	@Nullable
-	public final Long requestsPerSecond() {
-		return this.requestsPerSecond;
-	}
-
-	/**
-	 * Required - The task id to rethrottle
-	 * <p>
-	 * API name: {@code task_id}
-	 */
-	public final String taskId() {
-		return this.taskId;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteByQueryRethrottleRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteByQueryRethrottleRequest> {
-		@Nullable
-		private Long requestsPerSecond;
-
-		private String taskId;
-
-		/**
-		 * The throttle to set on this request in floating sub-requests per second. -1
-		 * means set no throttle.
-		 * <p>
-		 * API name: {@code requests_per_second}
-		 */
-		public final Builder requestsPerSecond(@Nullable Long value) {
-			this.requestsPerSecond = value;
-			return this;
-		}
-
-		/**
-		 * Required - The task id to rethrottle
-		 * <p>
-		 * API name: {@code task_id}
-		 */
-		public final Builder taskId(String value) {
-			this.taskId = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DeleteByQueryRethrottleRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteByQueryRethrottleRequest build() {
-			_checkSingleUse();
-
-			return new DeleteByQueryRethrottleRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code delete_by_query_rethrottle}".
-	 */
-	public static final Endpoint<DeleteByQueryRethrottleRequest, DeleteByQueryRethrottleResponse, ErrorResponse>
-			_ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _taskId = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _taskId;
-
-				if (propsSet == (_taskId)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_delete_by_query");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.taskId, buf);
-					buf.append("/_rethrottle");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.requestsPerSecond != null) {
-					params.put("requests_per_second", String.valueOf(request.requestsPerSecond));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, DeleteByQueryRethrottleResponse._DESERIALIZER);
+    @Nullable
+    private final Long requestsPerSecond;
+
+    private final String taskId;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteByQueryRethrottleRequest(Builder builder) {
+
+        this.requestsPerSecond = builder.requestsPerSecond;
+        this.taskId = ApiTypeHelper.requireNonNull(builder.taskId, this, "taskId");
+
+    }
+
+    public static DeleteByQueryRethrottleRequest of(Function<Builder, ObjectBuilder<DeleteByQueryRethrottleRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * The throttle to set on this request in floating sub-requests per second. -1
+     * means set no throttle.
+     * <p>
+     * API name: {@code requests_per_second}
+     */
+    @Nullable
+    public final Long requestsPerSecond() {
+        return this.requestsPerSecond;
+    }
+
+    /**
+     * Required - The task id to rethrottle
+     * <p>
+     * API name: {@code task_id}
+     */
+    public final String taskId() {
+        return this.taskId;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteByQueryRethrottleRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteByQueryRethrottleRequest> {
+        @Nullable
+        private Long requestsPerSecond;
+
+        private String taskId;
+
+        /**
+         * The throttle to set on this request in floating sub-requests per second. -1
+         * means set no throttle.
+         * <p>
+         * API name: {@code requests_per_second}
+         */
+        public final Builder requestsPerSecond(@Nullable Long value) {
+            this.requestsPerSecond = value;
+            return this;
+        }
+
+        /**
+         * Required - The task id to rethrottle
+         * <p>
+         * API name: {@code task_id}
+         */
+        public final Builder taskId(String value) {
+            this.taskId = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link DeleteByQueryRethrottleRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteByQueryRethrottleRequest build() {
+            _checkSingleUse();
+
+            return new DeleteByQueryRethrottleRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code delete_by_query_rethrottle}".
+     */
+    public static final Endpoint<DeleteByQueryRethrottleRequest, DeleteByQueryRethrottleResponse, ErrorResponse> _ENDPOINT =
+        new SimpleEndpoint<>(
+
+            // Request method
+            request -> {
+                return "POST";
+
+            },
+
+            // Request path
+            request -> {
+                final int _taskId = 1 << 0;
+
+                int propsSet = 0;
+
+                propsSet |= _taskId;
+
+                if (propsSet == (_taskId)) {
+                    StringBuilder buf = new StringBuilder();
+                    buf.append("/_delete_by_query");
+                    buf.append("/");
+                    SimpleEndpoint.pathEncode(request.taskId, buf);
+                    buf.append("/_rethrottle");
+                    return buf.toString();
+                }
+                throw SimpleEndpoint.noPathTemplateFound("path");
+
+            },
+
+            // Request parameters
+            request -> {
+                Map<String, String> params = new HashMap<>();
+                if (request.requestsPerSecond != null) {
+                    params.put("requests_per_second", String.valueOf(request.requestsPerSecond));
+                }
+                return params;
+
+            },
+            SimpleEndpoint.emptyMap(),
+            false,
+            DeleteByQueryRethrottleResponse._DESERIALIZER
+        );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteByQueryRethrottleResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteByQueryRethrottleResponse.java
index dc72e29d38..6aa588a151 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteByQueryRethrottleResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteByQueryRethrottleResponse.java
@@ -32,70 +32,67 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch.tasks.ListResponse;
+import java.util.function.Function;
 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.tasks.ListResponse;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _global.delete_by_query_rethrottle.Response
 
 @JsonpDeserializable
 public class DeleteByQueryRethrottleResponse extends ListResponse {
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteByQueryRethrottleResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static DeleteByQueryRethrottleResponse of(
-			Function<Builder, ObjectBuilder<DeleteByQueryRethrottleResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteByQueryRethrottleResponse}.
-	 */
-
-	public static class Builder extends ListResponse.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DeleteByQueryRethrottleResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DeleteByQueryRethrottleResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteByQueryRethrottleResponse build() {
-			_checkSingleUse();
-
-			return new DeleteByQueryRethrottleResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DeleteByQueryRethrottleResponse}
-	 */
-	public static final JsonpDeserializer<DeleteByQueryRethrottleResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DeleteByQueryRethrottleResponse::setupDeleteByQueryRethrottleResponseDeserializer);
-
-	protected static void setupDeleteByQueryRethrottleResponseDeserializer(
-			ObjectDeserializer<DeleteByQueryRethrottleResponse.Builder> op) {
-		ListResponse.setupListResponseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteByQueryRethrottleResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static DeleteByQueryRethrottleResponse of(Function<Builder, ObjectBuilder<DeleteByQueryRethrottleResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteByQueryRethrottleResponse}.
+     */
+
+    public static class Builder extends ListResponse.AbstractBuilder<Builder> implements ObjectBuilder<DeleteByQueryRethrottleResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DeleteByQueryRethrottleResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteByQueryRethrottleResponse build() {
+            _checkSingleUse();
+
+            return new DeleteByQueryRethrottleResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DeleteByQueryRethrottleResponse}
+     */
+    public static final JsonpDeserializer<DeleteByQueryRethrottleResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DeleteByQueryRethrottleResponse::setupDeleteByQueryRethrottleResponseDeserializer
+    );
+
+    protected static void setupDeleteByQueryRethrottleResponseDeserializer(ObjectDeserializer<DeleteByQueryRethrottleResponse.Builder> op) {
+        ListResponse.setupListResponseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteRequest.java
index cc77151e12..1aa54a5003 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.Refresh;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -44,11 +48,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: _global.delete.Request
 
 /**
@@ -57,406 +56,409 @@
  */
 
 public class DeleteRequest extends RequestBase {
-	private final String id;
-
-	@Nullable
-	private final Long ifPrimaryTerm;
-
-	@Nullable
-	private final Long ifSeqNo;
-
-	private final String index;
-
-	@Nullable
-	private final Refresh refresh;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final Long version;
-
-	@Nullable
-	private final VersionType versionType;
-
-	@Nullable
-	private final WaitForActiveShards waitForActiveShards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteRequest(Builder builder) {
-
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.ifPrimaryTerm = builder.ifPrimaryTerm;
-		this.ifSeqNo = builder.ifSeqNo;
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.refresh = builder.refresh;
-		this.routing = builder.routing;
-		this.timeout = builder.timeout;
-		this.version = builder.version;
-		this.versionType = builder.versionType;
-		this.waitForActiveShards = builder.waitForActiveShards;
-
-	}
-
-	public static DeleteRequest of(Function<Builder, ObjectBuilder<DeleteRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - The document ID
-	 * <p>
-	 * API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * only perform the delete operation if the last operation that has changed the
-	 * document has the specified primary term
-	 * <p>
-	 * API name: {@code if_primary_term}
-	 */
-	@Nullable
-	public final Long ifPrimaryTerm() {
-		return this.ifPrimaryTerm;
-	}
-
-	/**
-	 * only perform the delete operation if the last operation that has changed the
-	 * document has the specified sequence number
-	 * <p>
-	 * API name: {@code if_seq_no}
-	 */
-	@Nullable
-	public final Long ifSeqNo() {
-		return this.ifSeqNo;
-	}
-
-	/**
-	 * Required - The name of the index
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * If <code>true</code> then refresh the affected shards to make this operation
-	 * visible to search, if <code>wait_for</code> then wait for a refresh to make
-	 * this operation visible to search, if <code>false</code> (the default) then do
-	 * nothing with refreshes.
-	 * <p>
-	 * API name: {@code refresh}
-	 */
-	@Nullable
-	public final Refresh refresh() {
-		return this.refresh;
-	}
-
-	/**
-	 * Specific routing value
-	 * <p>
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Explicit version number for concurrency control
-	 * <p>
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * Specific version type
-	 * <p>
-	 * API name: {@code version_type}
-	 */
-	@Nullable
-	public final VersionType versionType() {
-		return this.versionType;
-	}
-
-	/**
-	 * Sets the number of shard copies that must be active before proceeding with
-	 * the delete operation. Defaults to 1, meaning the primary shard only. Set to
-	 * <code>all</code> for all shard copies, otherwise set to any non-negative
-	 * value less than or equal to the total number of copies for the shard (number
-	 * of replicas + 1)
-	 * <p>
-	 * API name: {@code wait_for_active_shards}
-	 */
-	@Nullable
-	public final WaitForActiveShards waitForActiveShards() {
-		return this.waitForActiveShards;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteRequest> {
-		private String id;
-
-		@Nullable
-		private Long ifPrimaryTerm;
-
-		@Nullable
-		private Long ifSeqNo;
-
-		private String index;
-
-		@Nullable
-		private Refresh refresh;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private Long version;
-
-		@Nullable
-		private VersionType versionType;
-
-		@Nullable
-		private WaitForActiveShards waitForActiveShards;
-
-		/**
-		 * Required - The document ID
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * only perform the delete operation if the last operation that has changed the
-		 * document has the specified primary term
-		 * <p>
-		 * API name: {@code if_primary_term}
-		 */
-		public final Builder ifPrimaryTerm(@Nullable Long value) {
-			this.ifPrimaryTerm = value;
-			return this;
-		}
-
-		/**
-		 * only perform the delete operation if the last operation that has changed the
-		 * document has the specified sequence number
-		 * <p>
-		 * API name: {@code if_seq_no}
-		 */
-		public final Builder ifSeqNo(@Nullable Long value) {
-			this.ifSeqNo = value;
-			return this;
-		}
-
-		/**
-		 * Required - The name of the index
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * If <code>true</code> then refresh the affected shards to make this operation
-		 * visible to search, if <code>wait_for</code> then wait for a refresh to make
-		 * this operation visible to search, if <code>false</code> (the default) then do
-		 * nothing with refreshes.
-		 * <p>
-		 * API name: {@code refresh}
-		 */
-		public final Builder refresh(@Nullable Refresh value) {
-			this.refresh = value;
-			return this;
-		}
-
-		/**
-		 * Specific routing value
-		 * <p>
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit version number for concurrency control
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Specific version type
-		 * <p>
-		 * API name: {@code version_type}
-		 */
-		public final Builder versionType(@Nullable VersionType value) {
-			this.versionType = value;
-			return this;
-		}
-
-		/**
-		 * Sets the number of shard copies that must be active before proceeding with
-		 * the delete operation. Defaults to 1, meaning the primary shard only. Set to
-		 * <code>all</code> for all shard copies, otherwise set to any non-negative
-		 * value less than or equal to the total number of copies for the shard (number
-		 * of replicas + 1)
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
-			this.waitForActiveShards = value;
-			return this;
-		}
-
-		/**
-		 * Sets the number of shard copies that must be active before proceeding with
-		 * the delete operation. Defaults to 1, meaning the primary shard only. Set to
-		 * <code>all</code> for all shard copies, otherwise set to any non-negative
-		 * value less than or equal to the total number of copies for the shard (number
-		 * of replicas + 1)
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(
-				Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
-			return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link DeleteRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteRequest build() {
-			_checkSingleUse();
-
-			return new DeleteRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code delete}".
-	 */
-	public static final Endpoint<DeleteRequest, DeleteResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "DELETE";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-				final int _id = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-				propsSet |= _id;
-
-				if (propsSet == (_index | _id)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_doc");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.id, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.routing != null) {
-					params.put("routing", request.routing);
-				}
-				if (request.versionType != null) {
-					params.put("version_type", request.versionType.jsonValue());
-				}
-				if (request.ifPrimaryTerm != null) {
-					params.put("if_primary_term", String.valueOf(request.ifPrimaryTerm));
-				}
-				if (request.ifSeqNo != null) {
-					params.put("if_seq_no", String.valueOf(request.ifSeqNo));
-				}
-				if (request.refresh != null) {
-					params.put("refresh", request.refresh.jsonValue());
-				}
-				if (request.waitForActiveShards != null) {
-					params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
-				}
-				if (request.version != null) {
-					params.put("version", String.valueOf(request.version));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, DeleteResponse._DESERIALIZER);
+    private final String id;
+
+    @Nullable
+    private final Long ifPrimaryTerm;
+
+    @Nullable
+    private final Long ifSeqNo;
+
+    private final String index;
+
+    @Nullable
+    private final Refresh refresh;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final Long version;
+
+    @Nullable
+    private final VersionType versionType;
+
+    @Nullable
+    private final WaitForActiveShards waitForActiveShards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteRequest(Builder builder) {
+
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.ifPrimaryTerm = builder.ifPrimaryTerm;
+        this.ifSeqNo = builder.ifSeqNo;
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.refresh = builder.refresh;
+        this.routing = builder.routing;
+        this.timeout = builder.timeout;
+        this.version = builder.version;
+        this.versionType = builder.versionType;
+        this.waitForActiveShards = builder.waitForActiveShards;
+
+    }
+
+    public static DeleteRequest of(Function<Builder, ObjectBuilder<DeleteRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - The document ID
+     * <p>
+     * API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * only perform the delete operation if the last operation that has changed the
+     * document has the specified primary term
+     * <p>
+     * API name: {@code if_primary_term}
+     */
+    @Nullable
+    public final Long ifPrimaryTerm() {
+        return this.ifPrimaryTerm;
+    }
+
+    /**
+     * only perform the delete operation if the last operation that has changed the
+     * document has the specified sequence number
+     * <p>
+     * API name: {@code if_seq_no}
+     */
+    @Nullable
+    public final Long ifSeqNo() {
+        return this.ifSeqNo;
+    }
+
+    /**
+     * Required - The name of the index
+     * <p>
+     * API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * If <code>true</code> then refresh the affected shards to make this operation
+     * visible to search, if <code>wait_for</code> then wait for a refresh to make
+     * this operation visible to search, if <code>false</code> (the default) then do
+     * nothing with refreshes.
+     * <p>
+     * API name: {@code refresh}
+     */
+    @Nullable
+    public final Refresh refresh() {
+        return this.refresh;
+    }
+
+    /**
+     * Specific routing value
+     * <p>
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Explicit version number for concurrency control
+     * <p>
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * Specific version type
+     * <p>
+     * API name: {@code version_type}
+     */
+    @Nullable
+    public final VersionType versionType() {
+        return this.versionType;
+    }
+
+    /**
+     * Sets the number of shard copies that must be active before proceeding with
+     * the delete operation. Defaults to 1, meaning the primary shard only. Set to
+     * <code>all</code> for all shard copies, otherwise set to any non-negative
+     * value less than or equal to the total number of copies for the shard (number
+     * of replicas + 1)
+     * <p>
+     * API name: {@code wait_for_active_shards}
+     */
+    @Nullable
+    public final WaitForActiveShards waitForActiveShards() {
+        return this.waitForActiveShards;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteRequest> {
+        private String id;
+
+        @Nullable
+        private Long ifPrimaryTerm;
+
+        @Nullable
+        private Long ifSeqNo;
+
+        private String index;
+
+        @Nullable
+        private Refresh refresh;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private Long version;
+
+        @Nullable
+        private VersionType versionType;
+
+        @Nullable
+        private WaitForActiveShards waitForActiveShards;
+
+        /**
+         * Required - The document ID
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * only perform the delete operation if the last operation that has changed the
+         * document has the specified primary term
+         * <p>
+         * API name: {@code if_primary_term}
+         */
+        public final Builder ifPrimaryTerm(@Nullable Long value) {
+            this.ifPrimaryTerm = value;
+            return this;
+        }
+
+        /**
+         * only perform the delete operation if the last operation that has changed the
+         * document has the specified sequence number
+         * <p>
+         * API name: {@code if_seq_no}
+         */
+        public final Builder ifSeqNo(@Nullable Long value) {
+            this.ifSeqNo = value;
+            return this;
+        }
+
+        /**
+         * Required - The name of the index
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * If <code>true</code> then refresh the affected shards to make this operation
+         * visible to search, if <code>wait_for</code> then wait for a refresh to make
+         * this operation visible to search, if <code>false</code> (the default) then do
+         * nothing with refreshes.
+         * <p>
+         * API name: {@code refresh}
+         */
+        public final Builder refresh(@Nullable Refresh value) {
+            this.refresh = value;
+            return this;
+        }
+
+        /**
+         * Specific routing value
+         * <p>
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit version number for concurrency control
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Specific version type
+         * <p>
+         * API name: {@code version_type}
+         */
+        public final Builder versionType(@Nullable VersionType value) {
+            this.versionType = value;
+            return this;
+        }
+
+        /**
+         * Sets the number of shard copies that must be active before proceeding with
+         * the delete operation. Defaults to 1, meaning the primary shard only. Set to
+         * <code>all</code> for all shard copies, otherwise set to any non-negative
+         * value less than or equal to the total number of copies for the shard (number
+         * of replicas + 1)
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
+            this.waitForActiveShards = value;
+            return this;
+        }
+
+        /**
+         * Sets the number of shard copies that must be active before proceeding with
+         * the delete operation. Defaults to 1, meaning the primary shard only. Set to
+         * <code>all</code> for all shard copies, otherwise set to any non-negative
+         * value less than or equal to the total number of copies for the shard (number
+         * of replicas + 1)
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
+            return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link DeleteRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteRequest build() {
+            _checkSingleUse();
+
+            return new DeleteRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code delete}".
+     */
+    public static final Endpoint<DeleteRequest, DeleteResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "DELETE";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+            final int _id = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+            propsSet |= _id;
+
+            if (propsSet == (_index | _id)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_doc");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.id, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            if (request.versionType != null) {
+                params.put("version_type", request.versionType.jsonValue());
+            }
+            if (request.ifPrimaryTerm != null) {
+                params.put("if_primary_term", String.valueOf(request.ifPrimaryTerm));
+            }
+            if (request.ifSeqNo != null) {
+                params.put("if_seq_no", String.valueOf(request.ifSeqNo));
+            }
+            if (request.refresh != null) {
+                params.put("refresh", request.refresh.jsonValue());
+            }
+            if (request.waitForActiveShards != null) {
+                params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
+            }
+            if (request.version != null) {
+                params.put("version", String.valueOf(request.version));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        DeleteResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteResponse.java
index 71981cae30..13d7030ca9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteResponse.java
@@ -32,69 +32,67 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.WriteResponseBase;
+import java.util.function.Function;
 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.WriteResponseBase;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _global.delete.Response
 
-
 @JsonpDeserializable
 public class DeleteResponse extends WriteResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private DeleteResponse(Builder builder) {
-		super(builder);
+    private DeleteResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static DeleteResponse of(Function<Builder, ObjectBuilder<DeleteResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static DeleteResponse of(Function<Builder, ObjectBuilder<DeleteResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link DeleteResponse}.
-	 */
+    /**
+     * Builder for {@link DeleteResponse}.
+     */
 
-	public static class Builder extends WriteResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DeleteResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends WriteResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<DeleteResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link DeleteResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link DeleteResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteResponse build() {
+            _checkSingleUse();
 
-			return new DeleteResponse(this);
-		}
-	}
+            return new DeleteResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link DeleteResponse}
-	 */
-	public static final JsonpDeserializer<DeleteResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			DeleteResponse::setupDeleteResponseDeserializer);
+    /**
+     * Json deserializer for {@link DeleteResponse}
+     */
+    public static final JsonpDeserializer<DeleteResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DeleteResponse::setupDeleteResponseDeserializer
+    );
 
-	protected static void setupDeleteResponseDeserializer(ObjectDeserializer<DeleteResponse.Builder> op) {
-		WriteResponseBase.setupWriteResponseBaseDeserializer(op);
+    protected static void setupDeleteResponseDeserializer(ObjectDeserializer<DeleteResponse.Builder> op) {
+        WriteResponseBase.setupWriteResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteScriptRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteScriptRequest.java
index 08462a457a..17f6ff6682 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteScriptRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteScriptRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,231 +45,230 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: _global.delete_script.Request
 
 /**
  * Deletes a script.
- * 
+ *
  */
 
 public class DeleteScriptRequest extends RequestBase {
-	private final String id;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteScriptRequest(Builder builder) {
-
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.timeout = builder.timeout;
-
-	}
-
-	public static DeleteScriptRequest of(Function<Builder, ObjectBuilder<DeleteScriptRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Script ID
-	 * <p>
-	 * API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteScriptRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteScriptRequest> {
-		private String id;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * Required - Script ID
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link DeleteScriptRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteScriptRequest build() {
-			_checkSingleUse();
-
-			return new DeleteScriptRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code delete_script}".
-	 */
-	public static final Endpoint<DeleteScriptRequest, DeleteScriptResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "DELETE";
-
-			},
-
-			// Request path
-			request -> {
-				final int _id = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _id;
-
-				if (propsSet == (_id)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_scripts");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.id, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, DeleteScriptResponse._DESERIALIZER);
+    private final String id;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteScriptRequest(Builder builder) {
+
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.timeout = builder.timeout;
+
+    }
+
+    public static DeleteScriptRequest of(Function<Builder, ObjectBuilder<DeleteScriptRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Script ID
+     * <p>
+     * API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteScriptRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteScriptRequest> {
+        private String id;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * Required - Script ID
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link DeleteScriptRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteScriptRequest build() {
+            _checkSingleUse();
+
+            return new DeleteScriptRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code delete_script}".
+     */
+    public static final Endpoint<DeleteScriptRequest, DeleteScriptResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "DELETE";
+
+        },
+
+        // Request path
+        request -> {
+            final int _id = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _id;
+
+            if (propsSet == (_id)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_scripts");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.id, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        DeleteScriptResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteScriptResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteScriptResponse.java
index fcc6fd4c57..3e0613efb6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteScriptResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/DeleteScriptResponse.java
@@ -32,68 +32,67 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _global.delete_script.Response
 
 @JsonpDeserializable
 public class DeleteScriptResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private DeleteScriptResponse(Builder builder) {
-		super(builder);
+    private DeleteScriptResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static DeleteScriptResponse of(Function<Builder, ObjectBuilder<DeleteScriptResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static DeleteScriptResponse of(Function<Builder, ObjectBuilder<DeleteScriptResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link DeleteScriptResponse}.
-	 */
+    /**
+     * Builder for {@link DeleteScriptResponse}.
+     */
 
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DeleteScriptResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<DeleteScriptResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link DeleteScriptResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteScriptResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link DeleteScriptResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteScriptResponse build() {
+            _checkSingleUse();
 
-			return new DeleteScriptResponse(this);
-		}
-	}
+            return new DeleteScriptResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link DeleteScriptResponse}
-	 */
-	public static final JsonpDeserializer<DeleteScriptResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DeleteScriptResponse::setupDeleteScriptResponseDeserializer);
+    /**
+     * Json deserializer for {@link DeleteScriptResponse}
+     */
+    public static final JsonpDeserializer<DeleteScriptResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DeleteScriptResponse::setupDeleteScriptResponseDeserializer
+    );
 
-	protected static void setupDeleteScriptResponseDeserializer(ObjectDeserializer<DeleteScriptResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+    protected static void setupDeleteScriptResponseDeserializer(ObjectDeserializer<DeleteScriptResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/ExistsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/ExistsRequest.java
index f1a00dc712..71a92cdc1b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/ExistsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/ExistsRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.VersionType;
@@ -44,494 +50,488 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: _global.exists.Request
 
 /**
  * Returns information about whether a document exists in an index.
- * 
+ *
  */
 
 public class ExistsRequest extends RequestBase {
-	@Nullable
-	private final SourceConfigParam source;
-
-	private final List<String> sourceExcludes;
-
-	private final List<String> sourceIncludes;
-
-	private final String id;
-
-	private final String index;
-
-	@Nullable
-	private final String preference;
-
-	@Nullable
-	private final Boolean realtime;
-
-	@Nullable
-	private final Boolean refresh;
-
-	@Nullable
-	private final String routing;
-
-	private final List<String> storedFields;
-
-	@Nullable
-	private final Long version;
-
-	@Nullable
-	private final VersionType versionType;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ExistsRequest(Builder builder) {
-
-		this.source = builder.source;
-		this.sourceExcludes = ApiTypeHelper.unmodifiable(builder.sourceExcludes);
-		this.sourceIncludes = ApiTypeHelper.unmodifiable(builder.sourceIncludes);
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.preference = builder.preference;
-		this.realtime = builder.realtime;
-		this.refresh = builder.refresh;
-		this.routing = builder.routing;
-		this.storedFields = ApiTypeHelper.unmodifiable(builder.storedFields);
-		this.version = builder.version;
-		this.versionType = builder.versionType;
-
-	}
-
-	public static ExistsRequest of(Function<Builder, ObjectBuilder<ExistsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * True or false to return the _source field or not, or a list of fields to
-	 * return
-	 * <p>
-	 * API name: {@code _source}
-	 */
-	@Nullable
-	public final SourceConfigParam source() {
-		return this.source;
-	}
-
-	/**
-	 * A list of fields to exclude from the returned _source field
-	 * <p>
-	 * API name: {@code _source_excludes}
-	 */
-	public final List<String> sourceExcludes() {
-		return this.sourceExcludes;
-	}
-
-	/**
-	 * A list of fields to extract and return from the _source field
-	 * <p>
-	 * API name: {@code _source_includes}
-	 */
-	public final List<String> sourceIncludes() {
-		return this.sourceIncludes;
-	}
-
-	/**
-	 * Required - The document ID
-	 * <p>
-	 * API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - The name of the index
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Specify the node or shard the operation should be performed on (default:
-	 * random)
-	 * <p>
-	 * API name: {@code preference}
-	 */
-	@Nullable
-	public final String preference() {
-		return this.preference;
-	}
-
-	/**
-	 * Specify whether to perform the operation in realtime or search mode
-	 * <p>
-	 * API name: {@code realtime}
-	 */
-	@Nullable
-	public final Boolean realtime() {
-		return this.realtime;
-	}
-
-	/**
-	 * Refresh the shard containing the document before performing the operation
-	 * <p>
-	 * API name: {@code refresh}
-	 */
-	@Nullable
-	public final Boolean refresh() {
-		return this.refresh;
-	}
-
-	/**
-	 * Specific routing value
-	 * <p>
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * A comma-separated list of stored fields to return in the response
-	 * <p>
-	 * API name: {@code stored_fields}
-	 */
-	public final List<String> storedFields() {
-		return this.storedFields;
-	}
-
-	/**
-	 * Explicit version number for concurrency control
-	 * <p>
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * Specific version type
-	 * <p>
-	 * API name: {@code version_type}
-	 */
-	@Nullable
-	public final VersionType versionType() {
-		return this.versionType;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ExistsRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExistsRequest> {
-		@Nullable
-		private SourceConfigParam source;
-
-		@Nullable
-		private List<String> sourceExcludes;
-
-		@Nullable
-		private List<String> sourceIncludes;
-
-		private String id;
-
-		private String index;
-
-		@Nullable
-		private String preference;
-
-		@Nullable
-		private Boolean realtime;
-
-		@Nullable
-		private Boolean refresh;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private List<String> storedFields;
-
-		@Nullable
-		private Long version;
-
-		@Nullable
-		private VersionType versionType;
-
-		/**
-		 * True or false to return the _source field or not, or a list of fields to
-		 * return
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(@Nullable SourceConfigParam value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * True or false to return the _source field or not, or a list of fields to
-		 * return
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(Function<SourceConfigParam.Builder, ObjectBuilder<SourceConfigParam>> fn) {
-			return this.source(fn.apply(new SourceConfigParam.Builder()).build());
-		}
-
-		/**
-		 * A list of fields to exclude from the returned _source field
-		 * <p>
-		 * API name: {@code _source_excludes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceExcludes</code>.
-		 */
-		public final Builder sourceExcludes(List<String> list) {
-			this.sourceExcludes = _listAddAll(this.sourceExcludes, list);
-			return this;
-		}
-
-		/**
-		 * A list of fields to exclude from the returned _source field
-		 * <p>
-		 * API name: {@code _source_excludes}
-		 * <p>
-		 * Adds one or more values to <code>sourceExcludes</code>.
-		 */
-		public final Builder sourceExcludes(String value, String... values) {
-			this.sourceExcludes = _listAdd(this.sourceExcludes, value, values);
-			return this;
-		}
-
-		/**
-		 * A list of fields to extract and return from the _source field
-		 * <p>
-		 * API name: {@code _source_includes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceIncludes</code>.
-		 */
-		public final Builder sourceIncludes(List<String> list) {
-			this.sourceIncludes = _listAddAll(this.sourceIncludes, list);
-			return this;
-		}
-
-		/**
-		 * A list of fields to extract and return from the _source field
-		 * <p>
-		 * API name: {@code _source_includes}
-		 * <p>
-		 * Adds one or more values to <code>sourceIncludes</code>.
-		 */
-		public final Builder sourceIncludes(String value, String... values) {
-			this.sourceIncludes = _listAdd(this.sourceIncludes, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - The document ID
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - The name of the index
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Specify the node or shard the operation should be performed on (default:
-		 * random)
-		 * <p>
-		 * API name: {@code preference}
-		 */
-		public final Builder preference(@Nullable String value) {
-			this.preference = value;
-			return this;
-		}
-
-		/**
-		 * Specify whether to perform the operation in realtime or search mode
-		 * <p>
-		 * API name: {@code realtime}
-		 */
-		public final Builder realtime(@Nullable Boolean value) {
-			this.realtime = value;
-			return this;
-		}
-
-		/**
-		 * Refresh the shard containing the document before performing the operation
-		 * <p>
-		 * API name: {@code refresh}
-		 */
-		public final Builder refresh(@Nullable Boolean value) {
-			this.refresh = value;
-			return this;
-		}
-
-		/**
-		 * Specific routing value
-		 * <p>
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of stored fields to return in the response
-		 * <p>
-		 * API name: {@code stored_fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>storedFields</code>.
-		 */
-		public final Builder storedFields(List<String> list) {
-			this.storedFields = _listAddAll(this.storedFields, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of stored fields to return in the response
-		 * <p>
-		 * API name: {@code stored_fields}
-		 * <p>
-		 * Adds one or more values to <code>storedFields</code>.
-		 */
-		public final Builder storedFields(String value, String... values) {
-			this.storedFields = _listAdd(this.storedFields, value, values);
-			return this;
-		}
-
-		/**
-		 * Explicit version number for concurrency control
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Specific version type
-		 * <p>
-		 * API name: {@code version_type}
-		 */
-		public final Builder versionType(@Nullable VersionType value) {
-			this.versionType = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ExistsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ExistsRequest build() {
-			_checkSingleUse();
-
-			return new ExistsRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code exists}".
-	 */
-	public static final Endpoint<ExistsRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
-			"opensearch/exists",
-
-			// Request method
-			request -> {
-				return "HEAD";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-				final int _id = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-				propsSet |= _id;
-
-				if (propsSet == (_index | _id)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_doc");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.id, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.routing != null) {
-					params.put("routing", request.routing);
-				}
-				if (request.realtime != null) {
-					params.put("realtime", String.valueOf(request.realtime));
-				}
-				if (request.versionType != null) {
-					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(",")));
-				}
-				if (request.preference != null) {
-					params.put("preference", request.preference);
-				}
-				if (request.refresh != null) {
-					params.put("refresh", String.valueOf(request.refresh));
-				}
-				if (request.source != null) {
-					params.put("_source", request.source._toJsonString());
-				}
-				if (ApiTypeHelper.isDefined(request.sourceExcludes)) {
-					params.put("_source_excludes",
-							request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (ApiTypeHelper.isDefined(request.sourceIncludes)) {
-					params.put("_source_includes",
-							request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.version != null) {
-					params.put("version", String.valueOf(request.version));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, null);
+    @Nullable
+    private final SourceConfigParam source;
+
+    private final List<String> sourceExcludes;
+
+    private final List<String> sourceIncludes;
+
+    private final String id;
+
+    private final String index;
+
+    @Nullable
+    private final String preference;
+
+    @Nullable
+    private final Boolean realtime;
+
+    @Nullable
+    private final Boolean refresh;
+
+    @Nullable
+    private final String routing;
+
+    private final List<String> storedFields;
+
+    @Nullable
+    private final Long version;
+
+    @Nullable
+    private final VersionType versionType;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ExistsRequest(Builder builder) {
+
+        this.source = builder.source;
+        this.sourceExcludes = ApiTypeHelper.unmodifiable(builder.sourceExcludes);
+        this.sourceIncludes = ApiTypeHelper.unmodifiable(builder.sourceIncludes);
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.preference = builder.preference;
+        this.realtime = builder.realtime;
+        this.refresh = builder.refresh;
+        this.routing = builder.routing;
+        this.storedFields = ApiTypeHelper.unmodifiable(builder.storedFields);
+        this.version = builder.version;
+        this.versionType = builder.versionType;
+
+    }
+
+    public static ExistsRequest of(Function<Builder, ObjectBuilder<ExistsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * True or false to return the _source field or not, or a list of fields to
+     * return
+     * <p>
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final SourceConfigParam source() {
+        return this.source;
+    }
+
+    /**
+     * A list of fields to exclude from the returned _source field
+     * <p>
+     * API name: {@code _source_excludes}
+     */
+    public final List<String> sourceExcludes() {
+        return this.sourceExcludes;
+    }
+
+    /**
+     * A list of fields to extract and return from the _source field
+     * <p>
+     * API name: {@code _source_includes}
+     */
+    public final List<String> sourceIncludes() {
+        return this.sourceIncludes;
+    }
+
+    /**
+     * Required - The document ID
+     * <p>
+     * API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - The name of the index
+     * <p>
+     * API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Specify the node or shard the operation should be performed on (default:
+     * random)
+     * <p>
+     * API name: {@code preference}
+     */
+    @Nullable
+    public final String preference() {
+        return this.preference;
+    }
+
+    /**
+     * Specify whether to perform the operation in realtime or search mode
+     * <p>
+     * API name: {@code realtime}
+     */
+    @Nullable
+    public final Boolean realtime() {
+        return this.realtime;
+    }
+
+    /**
+     * Refresh the shard containing the document before performing the operation
+     * <p>
+     * API name: {@code refresh}
+     */
+    @Nullable
+    public final Boolean refresh() {
+        return this.refresh;
+    }
+
+    /**
+     * Specific routing value
+     * <p>
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * A comma-separated list of stored fields to return in the response
+     * <p>
+     * API name: {@code stored_fields}
+     */
+    public final List<String> storedFields() {
+        return this.storedFields;
+    }
+
+    /**
+     * Explicit version number for concurrency control
+     * <p>
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * Specific version type
+     * <p>
+     * API name: {@code version_type}
+     */
+    @Nullable
+    public final VersionType versionType() {
+        return this.versionType;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ExistsRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExistsRequest> {
+        @Nullable
+        private SourceConfigParam source;
+
+        @Nullable
+        private List<String> sourceExcludes;
+
+        @Nullable
+        private List<String> sourceIncludes;
+
+        private String id;
+
+        private String index;
+
+        @Nullable
+        private String preference;
+
+        @Nullable
+        private Boolean realtime;
+
+        @Nullable
+        private Boolean refresh;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private List<String> storedFields;
+
+        @Nullable
+        private Long version;
+
+        @Nullable
+        private VersionType versionType;
+
+        /**
+         * True or false to return the _source field or not, or a list of fields to
+         * return
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(@Nullable SourceConfigParam value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * True or false to return the _source field or not, or a list of fields to
+         * return
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(Function<SourceConfigParam.Builder, ObjectBuilder<SourceConfigParam>> fn) {
+            return this.source(fn.apply(new SourceConfigParam.Builder()).build());
+        }
+
+        /**
+         * A list of fields to exclude from the returned _source field
+         * <p>
+         * API name: {@code _source_excludes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceExcludes</code>.
+         */
+        public final Builder sourceExcludes(List<String> list) {
+            this.sourceExcludes = _listAddAll(this.sourceExcludes, list);
+            return this;
+        }
+
+        /**
+         * A list of fields to exclude from the returned _source field
+         * <p>
+         * API name: {@code _source_excludes}
+         * <p>
+         * Adds one or more values to <code>sourceExcludes</code>.
+         */
+        public final Builder sourceExcludes(String value, String... values) {
+            this.sourceExcludes = _listAdd(this.sourceExcludes, value, values);
+            return this;
+        }
+
+        /**
+         * A list of fields to extract and return from the _source field
+         * <p>
+         * API name: {@code _source_includes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceIncludes</code>.
+         */
+        public final Builder sourceIncludes(List<String> list) {
+            this.sourceIncludes = _listAddAll(this.sourceIncludes, list);
+            return this;
+        }
+
+        /**
+         * A list of fields to extract and return from the _source field
+         * <p>
+         * API name: {@code _source_includes}
+         * <p>
+         * Adds one or more values to <code>sourceIncludes</code>.
+         */
+        public final Builder sourceIncludes(String value, String... values) {
+            this.sourceIncludes = _listAdd(this.sourceIncludes, value, values);
+            return this;
+        }
+
+        /**
+         * Required - The document ID
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - The name of the index
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Specify the node or shard the operation should be performed on (default:
+         * random)
+         * <p>
+         * API name: {@code preference}
+         */
+        public final Builder preference(@Nullable String value) {
+            this.preference = value;
+            return this;
+        }
+
+        /**
+         * Specify whether to perform the operation in realtime or search mode
+         * <p>
+         * API name: {@code realtime}
+         */
+        public final Builder realtime(@Nullable Boolean value) {
+            this.realtime = value;
+            return this;
+        }
+
+        /**
+         * Refresh the shard containing the document before performing the operation
+         * <p>
+         * API name: {@code refresh}
+         */
+        public final Builder refresh(@Nullable Boolean value) {
+            this.refresh = value;
+            return this;
+        }
+
+        /**
+         * Specific routing value
+         * <p>
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of stored fields to return in the response
+         * <p>
+         * API name: {@code stored_fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>storedFields</code>.
+         */
+        public final Builder storedFields(List<String> list) {
+            this.storedFields = _listAddAll(this.storedFields, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of stored fields to return in the response
+         * <p>
+         * API name: {@code stored_fields}
+         * <p>
+         * Adds one or more values to <code>storedFields</code>.
+         */
+        public final Builder storedFields(String value, String... values) {
+            this.storedFields = _listAdd(this.storedFields, value, values);
+            return this;
+        }
+
+        /**
+         * Explicit version number for concurrency control
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Specific version type
+         * <p>
+         * API name: {@code version_type}
+         */
+        public final Builder versionType(@Nullable VersionType value) {
+            this.versionType = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ExistsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ExistsRequest build() {
+            _checkSingleUse();
+
+            return new ExistsRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code exists}".
+     */
+    public static final Endpoint<ExistsRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
+        "opensearch/exists",
+
+        // Request method
+        request -> {
+            return "HEAD";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+            final int _id = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+            propsSet |= _id;
+
+            if (propsSet == (_index | _id)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_doc");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.id, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            if (request.realtime != null) {
+                params.put("realtime", String.valueOf(request.realtime));
+            }
+            if (request.versionType != null) {
+                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(",")));
+            }
+            if (request.preference != null) {
+                params.put("preference", request.preference);
+            }
+            if (request.refresh != null) {
+                params.put("refresh", String.valueOf(request.refresh));
+            }
+            if (request.source != null) {
+                params.put("_source", request.source._toJsonString());
+            }
+            if (ApiTypeHelper.isDefined(request.sourceExcludes)) {
+                params.put("_source_excludes", request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (ApiTypeHelper.isDefined(request.sourceIncludes)) {
+                params.put("_source_includes", request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.version != null) {
+                params.put("version", String.valueOf(request.version));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        null
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/ExistsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/ExistsResponse.java
index 81d46e15ee..484116087e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/ExistsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/ExistsResponse.java
@@ -36,17 +36,14 @@
 
 // typedef: _global.exists.Response
 
-
 public class ExistsResponse {
-	public ExistsResponse() {
-	}
+    public ExistsResponse() {}
 
-	/**
-	 * Singleton instance for {@link ExistsResponse}.
-	 */
-	public static final ExistsResponse _INSTANCE = new ExistsResponse();
+    /**
+     * Singleton instance for {@link ExistsResponse}.
+     */
+    public static final ExistsResponse _INSTANCE = new ExistsResponse();
 
-	public static final JsonpDeserializer<ExistsResponse> _DESERIALIZER = JsonpDeserializer
-			.fixedValue(ExistsResponse._INSTANCE);
+    public static final JsonpDeserializer<ExistsResponse> _DESERIALIZER = JsonpDeserializer.fixedValue(ExistsResponse._INSTANCE);
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/ExistsSourceRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/ExistsSourceRequest.java
index 9144e7c078..3af5df4346 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/ExistsSourceRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/ExistsSourceRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.VersionType;
@@ -44,451 +50,446 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: _global.exists_source.Request
 
 /**
  * Returns information about whether a document source exists in an index.
- * 
+ *
  */
 
 public class ExistsSourceRequest extends RequestBase {
-	@Nullable
-	private final SourceConfigParam source;
-
-	private final List<String> sourceExcludes;
-
-	private final List<String> sourceIncludes;
-
-	private final String id;
-
-	private final String index;
-
-	@Nullable
-	private final String preference;
-
-	@Nullable
-	private final Boolean realtime;
-
-	@Nullable
-	private final Boolean refresh;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final Long version;
-
-	@Nullable
-	private final VersionType versionType;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ExistsSourceRequest(Builder builder) {
-
-		this.source = builder.source;
-		this.sourceExcludes = ApiTypeHelper.unmodifiable(builder.sourceExcludes);
-		this.sourceIncludes = ApiTypeHelper.unmodifiable(builder.sourceIncludes);
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.preference = builder.preference;
-		this.realtime = builder.realtime;
-		this.refresh = builder.refresh;
-		this.routing = builder.routing;
-		this.version = builder.version;
-		this.versionType = builder.versionType;
-
-	}
-
-	public static ExistsSourceRequest of(Function<Builder, ObjectBuilder<ExistsSourceRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * True or false to return the _source field or not, or a list of fields to
-	 * return
-	 * <p>
-	 * API name: {@code _source}
-	 */
-	@Nullable
-	public final SourceConfigParam source() {
-		return this.source;
-	}
-
-	/**
-	 * A list of fields to exclude from the returned _source field
-	 * <p>
-	 * API name: {@code _source_excludes}
-	 */
-	public final List<String> sourceExcludes() {
-		return this.sourceExcludes;
-	}
-
-	/**
-	 * A list of fields to extract and return from the _source field
-	 * <p>
-	 * API name: {@code _source_includes}
-	 */
-	public final List<String> sourceIncludes() {
-		return this.sourceIncludes;
-	}
-
-	/**
-	 * Required - The document ID
-	 * <p>
-	 * API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - The name of the index
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Specify the node or shard the operation should be performed on (default:
-	 * random)
-	 * <p>
-	 * API name: {@code preference}
-	 */
-	@Nullable
-	public final String preference() {
-		return this.preference;
-	}
-
-	/**
-	 * Specify whether to perform the operation in realtime or search mode
-	 * <p>
-	 * API name: {@code realtime}
-	 */
-	@Nullable
-	public final Boolean realtime() {
-		return this.realtime;
-	}
-
-	/**
-	 * Refresh the shard containing the document before performing the operation
-	 * <p>
-	 * API name: {@code refresh}
-	 */
-	@Nullable
-	public final Boolean refresh() {
-		return this.refresh;
-	}
-
-	/**
-	 * Specific routing value
-	 * <p>
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Explicit version number for concurrency control
-	 * <p>
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * Specific version type
-	 * <p>
-	 * API name: {@code version_type}
-	 */
-	@Nullable
-	public final VersionType versionType() {
-		return this.versionType;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ExistsSourceRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExistsSourceRequest> {
-		@Nullable
-		private SourceConfigParam source;
-
-		@Nullable
-		private List<String> sourceExcludes;
-
-		@Nullable
-		private List<String> sourceIncludes;
-
-		private String id;
-
-		private String index;
-
-		@Nullable
-		private String preference;
-
-		@Nullable
-		private Boolean realtime;
-
-		@Nullable
-		private Boolean refresh;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private Long version;
-
-		@Nullable
-		private VersionType versionType;
-
-		/**
-		 * True or false to return the _source field or not, or a list of fields to
-		 * return
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(@Nullable SourceConfigParam value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * True or false to return the _source field or not, or a list of fields to
-		 * return
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(Function<SourceConfigParam.Builder, ObjectBuilder<SourceConfigParam>> fn) {
-			return this.source(fn.apply(new SourceConfigParam.Builder()).build());
-		}
-
-		/**
-		 * A list of fields to exclude from the returned _source field
-		 * <p>
-		 * API name: {@code _source_excludes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceExcludes</code>.
-		 */
-		public final Builder sourceExcludes(List<String> list) {
-			this.sourceExcludes = _listAddAll(this.sourceExcludes, list);
-			return this;
-		}
-
-		/**
-		 * A list of fields to exclude from the returned _source field
-		 * <p>
-		 * API name: {@code _source_excludes}
-		 * <p>
-		 * Adds one or more values to <code>sourceExcludes</code>.
-		 */
-		public final Builder sourceExcludes(String value, String... values) {
-			this.sourceExcludes = _listAdd(this.sourceExcludes, value, values);
-			return this;
-		}
-
-		/**
-		 * A list of fields to extract and return from the _source field
-		 * <p>
-		 * API name: {@code _source_includes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceIncludes</code>.
-		 */
-		public final Builder sourceIncludes(List<String> list) {
-			this.sourceIncludes = _listAddAll(this.sourceIncludes, list);
-			return this;
-		}
-
-		/**
-		 * A list of fields to extract and return from the _source field
-		 * <p>
-		 * API name: {@code _source_includes}
-		 * <p>
-		 * Adds one or more values to <code>sourceIncludes</code>.
-		 */
-		public final Builder sourceIncludes(String value, String... values) {
-			this.sourceIncludes = _listAdd(this.sourceIncludes, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - The document ID
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - The name of the index
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Specify the node or shard the operation should be performed on (default:
-		 * random)
-		 * <p>
-		 * API name: {@code preference}
-		 */
-		public final Builder preference(@Nullable String value) {
-			this.preference = value;
-			return this;
-		}
-
-		/**
-		 * Specify whether to perform the operation in realtime or search mode
-		 * <p>
-		 * API name: {@code realtime}
-		 */
-		public final Builder realtime(@Nullable Boolean value) {
-			this.realtime = value;
-			return this;
-		}
-
-		/**
-		 * Refresh the shard containing the document before performing the operation
-		 * <p>
-		 * API name: {@code refresh}
-		 */
-		public final Builder refresh(@Nullable Boolean value) {
-			this.refresh = value;
-			return this;
-		}
-
-		/**
-		 * Specific routing value
-		 * <p>
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Explicit version number for concurrency control
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Specific version type
-		 * <p>
-		 * API name: {@code version_type}
-		 */
-		public final Builder versionType(@Nullable VersionType value) {
-			this.versionType = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ExistsSourceRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ExistsSourceRequest build() {
-			_checkSingleUse();
-
-			return new ExistsSourceRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code exists_source}".
-	 */
-	public static final Endpoint<ExistsSourceRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
-			"opensearch/exists_source",
-
-			// Request method
-			request -> {
-				return "HEAD";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-				final int _id = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-				propsSet |= _id;
-
-				if (propsSet == (_index | _id)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_source");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.id, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.routing != null) {
-					params.put("routing", request.routing);
-				}
-				if (request.realtime != null) {
-					params.put("realtime", String.valueOf(request.realtime));
-				}
-				if (request.versionType != null) {
-					params.put("version_type", request.versionType.jsonValue());
-				}
-				if (request.preference != null) {
-					params.put("preference", request.preference);
-				}
-				if (request.refresh != null) {
-					params.put("refresh", String.valueOf(request.refresh));
-				}
-				if (request.source != null) {
-					params.put("_source", request.source._toJsonString());
-				}
-				if (ApiTypeHelper.isDefined(request.sourceExcludes)) {
-					params.put("_source_excludes",
-							request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (ApiTypeHelper.isDefined(request.sourceIncludes)) {
-					params.put("_source_includes",
-							request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.version != null) {
-					params.put("version", String.valueOf(request.version));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, null);
+    @Nullable
+    private final SourceConfigParam source;
+
+    private final List<String> sourceExcludes;
+
+    private final List<String> sourceIncludes;
+
+    private final String id;
+
+    private final String index;
+
+    @Nullable
+    private final String preference;
+
+    @Nullable
+    private final Boolean realtime;
+
+    @Nullable
+    private final Boolean refresh;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final Long version;
+
+    @Nullable
+    private final VersionType versionType;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ExistsSourceRequest(Builder builder) {
+
+        this.source = builder.source;
+        this.sourceExcludes = ApiTypeHelper.unmodifiable(builder.sourceExcludes);
+        this.sourceIncludes = ApiTypeHelper.unmodifiable(builder.sourceIncludes);
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.preference = builder.preference;
+        this.realtime = builder.realtime;
+        this.refresh = builder.refresh;
+        this.routing = builder.routing;
+        this.version = builder.version;
+        this.versionType = builder.versionType;
+
+    }
+
+    public static ExistsSourceRequest of(Function<Builder, ObjectBuilder<ExistsSourceRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * True or false to return the _source field or not, or a list of fields to
+     * return
+     * <p>
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final SourceConfigParam source() {
+        return this.source;
+    }
+
+    /**
+     * A list of fields to exclude from the returned _source field
+     * <p>
+     * API name: {@code _source_excludes}
+     */
+    public final List<String> sourceExcludes() {
+        return this.sourceExcludes;
+    }
+
+    /**
+     * A list of fields to extract and return from the _source field
+     * <p>
+     * API name: {@code _source_includes}
+     */
+    public final List<String> sourceIncludes() {
+        return this.sourceIncludes;
+    }
+
+    /**
+     * Required - The document ID
+     * <p>
+     * API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - The name of the index
+     * <p>
+     * API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Specify the node or shard the operation should be performed on (default:
+     * random)
+     * <p>
+     * API name: {@code preference}
+     */
+    @Nullable
+    public final String preference() {
+        return this.preference;
+    }
+
+    /**
+     * Specify whether to perform the operation in realtime or search mode
+     * <p>
+     * API name: {@code realtime}
+     */
+    @Nullable
+    public final Boolean realtime() {
+        return this.realtime;
+    }
+
+    /**
+     * Refresh the shard containing the document before performing the operation
+     * <p>
+     * API name: {@code refresh}
+     */
+    @Nullable
+    public final Boolean refresh() {
+        return this.refresh;
+    }
+
+    /**
+     * Specific routing value
+     * <p>
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * Explicit version number for concurrency control
+     * <p>
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * Specific version type
+     * <p>
+     * API name: {@code version_type}
+     */
+    @Nullable
+    public final VersionType versionType() {
+        return this.versionType;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ExistsSourceRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExistsSourceRequest> {
+        @Nullable
+        private SourceConfigParam source;
+
+        @Nullable
+        private List<String> sourceExcludes;
+
+        @Nullable
+        private List<String> sourceIncludes;
+
+        private String id;
+
+        private String index;
+
+        @Nullable
+        private String preference;
+
+        @Nullable
+        private Boolean realtime;
+
+        @Nullable
+        private Boolean refresh;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private Long version;
+
+        @Nullable
+        private VersionType versionType;
+
+        /**
+         * True or false to return the _source field or not, or a list of fields to
+         * return
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(@Nullable SourceConfigParam value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * True or false to return the _source field or not, or a list of fields to
+         * return
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(Function<SourceConfigParam.Builder, ObjectBuilder<SourceConfigParam>> fn) {
+            return this.source(fn.apply(new SourceConfigParam.Builder()).build());
+        }
+
+        /**
+         * A list of fields to exclude from the returned _source field
+         * <p>
+         * API name: {@code _source_excludes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceExcludes</code>.
+         */
+        public final Builder sourceExcludes(List<String> list) {
+            this.sourceExcludes = _listAddAll(this.sourceExcludes, list);
+            return this;
+        }
+
+        /**
+         * A list of fields to exclude from the returned _source field
+         * <p>
+         * API name: {@code _source_excludes}
+         * <p>
+         * Adds one or more values to <code>sourceExcludes</code>.
+         */
+        public final Builder sourceExcludes(String value, String... values) {
+            this.sourceExcludes = _listAdd(this.sourceExcludes, value, values);
+            return this;
+        }
+
+        /**
+         * A list of fields to extract and return from the _source field
+         * <p>
+         * API name: {@code _source_includes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceIncludes</code>.
+         */
+        public final Builder sourceIncludes(List<String> list) {
+            this.sourceIncludes = _listAddAll(this.sourceIncludes, list);
+            return this;
+        }
+
+        /**
+         * A list of fields to extract and return from the _source field
+         * <p>
+         * API name: {@code _source_includes}
+         * <p>
+         * Adds one or more values to <code>sourceIncludes</code>.
+         */
+        public final Builder sourceIncludes(String value, String... values) {
+            this.sourceIncludes = _listAdd(this.sourceIncludes, value, values);
+            return this;
+        }
+
+        /**
+         * Required - The document ID
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - The name of the index
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Specify the node or shard the operation should be performed on (default:
+         * random)
+         * <p>
+         * API name: {@code preference}
+         */
+        public final Builder preference(@Nullable String value) {
+            this.preference = value;
+            return this;
+        }
+
+        /**
+         * Specify whether to perform the operation in realtime or search mode
+         * <p>
+         * API name: {@code realtime}
+         */
+        public final Builder realtime(@Nullable Boolean value) {
+            this.realtime = value;
+            return this;
+        }
+
+        /**
+         * Refresh the shard containing the document before performing the operation
+         * <p>
+         * API name: {@code refresh}
+         */
+        public final Builder refresh(@Nullable Boolean value) {
+            this.refresh = value;
+            return this;
+        }
+
+        /**
+         * Specific routing value
+         * <p>
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Explicit version number for concurrency control
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Specific version type
+         * <p>
+         * API name: {@code version_type}
+         */
+        public final Builder versionType(@Nullable VersionType value) {
+            this.versionType = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ExistsSourceRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ExistsSourceRequest build() {
+            _checkSingleUse();
+
+            return new ExistsSourceRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code exists_source}".
+     */
+    public static final Endpoint<ExistsSourceRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
+        "opensearch/exists_source",
+
+        // Request method
+        request -> {
+            return "HEAD";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+            final int _id = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+            propsSet |= _id;
+
+            if (propsSet == (_index | _id)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_source");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.id, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            if (request.realtime != null) {
+                params.put("realtime", String.valueOf(request.realtime));
+            }
+            if (request.versionType != null) {
+                params.put("version_type", request.versionType.jsonValue());
+            }
+            if (request.preference != null) {
+                params.put("preference", request.preference);
+            }
+            if (request.refresh != null) {
+                params.put("refresh", String.valueOf(request.refresh));
+            }
+            if (request.source != null) {
+                params.put("_source", request.source._toJsonString());
+            }
+            if (ApiTypeHelper.isDefined(request.sourceExcludes)) {
+                params.put("_source_excludes", request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (ApiTypeHelper.isDefined(request.sourceIncludes)) {
+                params.put("_source_includes", request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.version != null) {
+                params.put("version", String.valueOf(request.version));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        null
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/ExistsSourceResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/ExistsSourceResponse.java
index a9f507c2ea..7c0869734c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/ExistsSourceResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/ExistsSourceResponse.java
@@ -41,15 +41,15 @@
  */
 
 public class ExistsSourceResponse {
-	public ExistsSourceResponse() {
-	}
+    public ExistsSourceResponse() {}
 
-	/**
-	 * Singleton instance for {@link ExistsSourceResponse}.
-	 */
-	public static final ExistsSourceResponse _INSTANCE = new ExistsSourceResponse();
+    /**
+     * Singleton instance for {@link ExistsSourceResponse}.
+     */
+    public static final ExistsSourceResponse _INSTANCE = new ExistsSourceResponse();
 
-	public static final JsonpDeserializer<ExistsSourceResponse> _DESERIALIZER = JsonpDeserializer
-			.fixedValue(ExistsSourceResponse._INSTANCE);
+    public static final JsonpDeserializer<ExistsSourceResponse> _DESERIALIZER = JsonpDeserializer.fixedValue(
+        ExistsSourceResponse._INSTANCE
+    );
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/ExplainRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/ExplainRequest.java
index 404b2f8aa1..1b6ae3392e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/ExplainRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/ExplainRequest.java
@@ -32,30 +32,29 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.query_dsl.Operator;
-import org.opensearch.client.opensearch._types.query_dsl.Query;
-import org.opensearch.client.opensearch.core.search.SourceConfigParam;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.query_dsl.Operator;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
+import org.opensearch.client.opensearch.core.search.SourceConfigParam;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: _global.explain.Request
 
@@ -65,614 +64,617 @@
  */
 @JsonpDeserializable
 public class ExplainRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final SourceConfigParam source;
-
-	private final List<String> sourceExcludes;
-
-	private final List<String> sourceIncludes;
-
-	@Nullable
-	private final Boolean analyzeWildcard;
-
-	@Nullable
-	private final String analyzer;
-
-	@Nullable
-	private final Operator defaultOperator;
-
-	@Nullable
-	private final String df;
-
-	private final String id;
-
-	private final String index;
-
-	@Nullable
-	private final Boolean lenient;
-
-	@Nullable
-	private final String preference;
-
-	@Nullable
-	private final String q;
-
-	@Nullable
-	private final Query query;
-
-	@Nullable
-	private final String routing;
-
-	private final List<String> storedFields;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ExplainRequest(Builder builder) {
-
-		this.source = builder.source;
-		this.sourceExcludes = ApiTypeHelper.unmodifiable(builder.sourceExcludes);
-		this.sourceIncludes = ApiTypeHelper.unmodifiable(builder.sourceIncludes);
-		this.analyzeWildcard = builder.analyzeWildcard;
-		this.analyzer = builder.analyzer;
-		this.defaultOperator = builder.defaultOperator;
-		this.df = builder.df;
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.lenient = builder.lenient;
-		this.preference = builder.preference;
-		this.q = builder.q;
-		this.query = builder.query;
-		this.routing = builder.routing;
-		this.storedFields = ApiTypeHelper.unmodifiable(builder.storedFields);
-
-	}
-
-	public static ExplainRequest of(Function<Builder, ObjectBuilder<ExplainRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * True or false to return the _source field or not, or a list of fields to
-	 * return
-	 * <p>
-	 * API name: {@code _source}
-	 */
-	@Nullable
-	public final SourceConfigParam source() {
-		return this.source;
-	}
-
-	/**
-	 * A list of fields to exclude from the returned _source field
-	 * <p>
-	 * API name: {@code _source_excludes}
-	 */
-	public final List<String> sourceExcludes() {
-		return this.sourceExcludes;
-	}
-
-	/**
-	 * A list of fields to extract and return from the _source field
-	 * <p>
-	 * API name: {@code _source_includes}
-	 */
-	public final List<String> sourceIncludes() {
-		return this.sourceIncludes;
-	}
-
-	/**
-	 * Specify whether wildcards and prefix queries in the query string query should
-	 * be analyzed (default: false)
-	 * <p>
-	 * API name: {@code analyze_wildcard}
-	 */
-	@Nullable
-	public final Boolean analyzeWildcard() {
-		return this.analyzeWildcard;
-	}
-
-	/**
-	 * The analyzer for the query string query
-	 * <p>
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * The default operator for query string query (AND or OR)
-	 * <p>
-	 * API name: {@code default_operator}
-	 */
-	@Nullable
-	public final Operator defaultOperator() {
-		return this.defaultOperator;
-	}
-
-	/**
-	 * The default field for query string query (default: _all)
-	 * <p>
-	 * API name: {@code df}
-	 */
-	@Nullable
-	public final String df() {
-		return this.df;
-	}
-
-	/**
-	 * Required - The document ID
-	 * <p>
-	 * API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - The name of the index
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Specify whether format-based query failures (such as providing text to a
-	 * numeric field) should be ignored
-	 * <p>
-	 * API name: {@code lenient}
-	 */
-	@Nullable
-	public final Boolean lenient() {
-		return this.lenient;
-	}
-
-	/**
-	 * Specify the node or shard the operation should be performed on (default:
-	 * random)
-	 * <p>
-	 * API name: {@code preference}
-	 */
-	@Nullable
-	public final String preference() {
-		return this.preference;
-	}
-
-	/**
-	 * Query in the Lucene query string syntax
-	 * <p>
-	 * API name: {@code q}
-	 */
-	@Nullable
-	public final String q() {
-		return this.q;
-	}
-
-	/**
-	 * API name: {@code query}
-	 */
-	@Nullable
-	public final Query query() {
-		return this.query;
-	}
-
-	/**
-	 * Specific routing value
-	 * <p>
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * A comma-separated list of stored fields to return in the response
-	 * <p>
-	 * API name: {@code stored_fields}
-	 */
-	public final List<String> storedFields() {
-		return this.storedFields;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.query != null) {
-			generator.writeKey("query");
-			this.query.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ExplainRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExplainRequest> {
-		@Nullable
-		private SourceConfigParam source;
-
-		@Nullable
-		private List<String> sourceExcludes;
-
-		@Nullable
-		private List<String> sourceIncludes;
-
-		@Nullable
-		private Boolean analyzeWildcard;
-
-		@Nullable
-		private String analyzer;
-
-		@Nullable
-		private Operator defaultOperator;
-
-		@Nullable
-		private String df;
-
-		private String id;
-
-		private String index;
-
-		@Nullable
-		private Boolean lenient;
-
-		@Nullable
-		private String preference;
-
-		@Nullable
-		private String q;
-
-		@Nullable
-		private Query query;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private List<String> storedFields;
-
-		/**
-		 * True or false to return the _source field or not, or a list of fields to
-		 * return
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(@Nullable SourceConfigParam value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * True or false to return the _source field or not, or a list of fields to
-		 * return
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(Function<SourceConfigParam.Builder, ObjectBuilder<SourceConfigParam>> fn) {
-			return this.source(fn.apply(new SourceConfigParam.Builder()).build());
-		}
-
-		/**
-		 * A list of fields to exclude from the returned _source field
-		 * <p>
-		 * API name: {@code _source_excludes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceExcludes</code>.
-		 */
-		public final Builder sourceExcludes(List<String> list) {
-			this.sourceExcludes = _listAddAll(this.sourceExcludes, list);
-			return this;
-		}
-
-		/**
-		 * A list of fields to exclude from the returned _source field
-		 * <p>
-		 * API name: {@code _source_excludes}
-		 * <p>
-		 * Adds one or more values to <code>sourceExcludes</code>.
-		 */
-		public final Builder sourceExcludes(String value, String... values) {
-			this.sourceExcludes = _listAdd(this.sourceExcludes, value, values);
-			return this;
-		}
-
-		/**
-		 * A list of fields to extract and return from the _source field
-		 * <p>
-		 * API name: {@code _source_includes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceIncludes</code>.
-		 */
-		public final Builder sourceIncludes(List<String> list) {
-			this.sourceIncludes = _listAddAll(this.sourceIncludes, list);
-			return this;
-		}
-
-		/**
-		 * A list of fields to extract and return from the _source field
-		 * <p>
-		 * API name: {@code _source_includes}
-		 * <p>
-		 * Adds one or more values to <code>sourceIncludes</code>.
-		 */
-		public final Builder sourceIncludes(String value, String... values) {
-			this.sourceIncludes = _listAdd(this.sourceIncludes, value, values);
-			return this;
-		}
-
-		/**
-		 * Specify whether wildcards and prefix queries in the query string query should
-		 * be analyzed (default: false)
-		 * <p>
-		 * API name: {@code analyze_wildcard}
-		 */
-		public final Builder analyzeWildcard(@Nullable Boolean value) {
-			this.analyzeWildcard = value;
-			return this;
-		}
-
-		/**
-		 * The analyzer for the query string query
-		 * <p>
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * The default operator for query string query (AND or OR)
-		 * <p>
-		 * API name: {@code default_operator}
-		 */
-		public final Builder defaultOperator(@Nullable Operator value) {
-			this.defaultOperator = value;
-			return this;
-		}
-
-		/**
-		 * The default field for query string query (default: _all)
-		 * <p>
-		 * API name: {@code df}
-		 */
-		public final Builder df(@Nullable String value) {
-			this.df = value;
-			return this;
-		}
-
-		/**
-		 * Required - The document ID
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - The name of the index
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Specify whether format-based query failures (such as providing text to a
-		 * numeric field) should be ignored
-		 * <p>
-		 * API name: {@code lenient}
-		 */
-		public final Builder lenient(@Nullable Boolean value) {
-			this.lenient = value;
-			return this;
-		}
-
-		/**
-		 * Specify the node or shard the operation should be performed on (default:
-		 * random)
-		 * <p>
-		 * API name: {@code preference}
-		 */
-		public final Builder preference(@Nullable String value) {
-			this.preference = value;
-			return this;
-		}
-
-		/**
-		 * Query in the Lucene query string syntax
-		 * <p>
-		 * API name: {@code q}
-		 */
-		public final Builder q(@Nullable String value) {
-			this.q = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code query}
-		 */
-		public final Builder query(@Nullable Query value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code query}
-		 */
-		public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.query(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * Specific routing value
-		 * <p>
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of stored fields to return in the response
-		 * <p>
-		 * API name: {@code stored_fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>storedFields</code>.
-		 */
-		public final Builder storedFields(List<String> list) {
-			this.storedFields = _listAddAll(this.storedFields, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of stored fields to return in the response
-		 * <p>
-		 * API name: {@code stored_fields}
-		 * <p>
-		 * Adds one or more values to <code>storedFields</code>.
-		 */
-		public final Builder storedFields(String value, String... values) {
-			this.storedFields = _listAdd(this.storedFields, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ExplainRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ExplainRequest build() {
-			_checkSingleUse();
-
-			return new ExplainRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ExplainRequest}
-	 */
-	public static final JsonpDeserializer<ExplainRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ExplainRequest::setupExplainRequestDeserializer);
-
-	protected static void setupExplainRequestDeserializer(ObjectDeserializer<ExplainRequest.Builder> op) {
-
-		op.add(Builder::query, Query._DESERIALIZER, "query");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code explain}".
-	 */
-	public static final SimpleEndpoint<ExplainRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-				final int _id = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-				propsSet |= _id;
-
-				if (propsSet == (_index | _id)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_explain");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.id, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.routing != null) {
-					params.put("routing", request.routing);
-				}
-				if (request.q != null) {
-					params.put("q", request.q);
-				}
-				if (request.df != null) {
-					params.put("df", request.df);
-				}
-				if (request.defaultOperator != null) {
-					params.put("default_operator", request.defaultOperator.jsonValue());
-				}
-				if (request.analyzer != null) {
-					params.put("analyzer", request.analyzer);
-				}
-				if (ApiTypeHelper.isDefined(request.storedFields)) {
-					params.put("stored_fields",
-							request.storedFields.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.preference != null) {
-					params.put("preference", request.preference);
-				}
-				if (request.analyzeWildcard != null) {
-					params.put("analyze_wildcard", String.valueOf(request.analyzeWildcard));
-				}
-				if (request.source != null) {
-					params.put("_source", request.source._toJsonString());
-				}
-				if (ApiTypeHelper.isDefined(request.sourceExcludes)) {
-					params.put("_source_excludes",
-							request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (ApiTypeHelper.isDefined(request.sourceIncludes)) {
-					params.put("_source_includes",
-							request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.lenient != null) {
-					params.put("lenient", String.valueOf(request.lenient));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, ExplainResponse._DESERIALIZER);
-
-	/**
-	 * Create an "{@code explain}" endpoint.
-	 */
-	public static <TDocument> Endpoint<ExplainRequest, ExplainResponse<TDocument>, ErrorResponse> createExplainEndpoint(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return _ENDPOINT
-				.withResponseDeserializer(ExplainResponse.createExplainResponseDeserializer(tDocumentDeserializer));
-	}
+    @Nullable
+    private final SourceConfigParam source;
+
+    private final List<String> sourceExcludes;
+
+    private final List<String> sourceIncludes;
+
+    @Nullable
+    private final Boolean analyzeWildcard;
+
+    @Nullable
+    private final String analyzer;
+
+    @Nullable
+    private final Operator defaultOperator;
+
+    @Nullable
+    private final String df;
+
+    private final String id;
+
+    private final String index;
+
+    @Nullable
+    private final Boolean lenient;
+
+    @Nullable
+    private final String preference;
+
+    @Nullable
+    private final String q;
+
+    @Nullable
+    private final Query query;
+
+    @Nullable
+    private final String routing;
+
+    private final List<String> storedFields;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ExplainRequest(Builder builder) {
+
+        this.source = builder.source;
+        this.sourceExcludes = ApiTypeHelper.unmodifiable(builder.sourceExcludes);
+        this.sourceIncludes = ApiTypeHelper.unmodifiable(builder.sourceIncludes);
+        this.analyzeWildcard = builder.analyzeWildcard;
+        this.analyzer = builder.analyzer;
+        this.defaultOperator = builder.defaultOperator;
+        this.df = builder.df;
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.lenient = builder.lenient;
+        this.preference = builder.preference;
+        this.q = builder.q;
+        this.query = builder.query;
+        this.routing = builder.routing;
+        this.storedFields = ApiTypeHelper.unmodifiable(builder.storedFields);
+
+    }
+
+    public static ExplainRequest of(Function<Builder, ObjectBuilder<ExplainRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * True or false to return the _source field or not, or a list of fields to
+     * return
+     * <p>
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final SourceConfigParam source() {
+        return this.source;
+    }
+
+    /**
+     * A list of fields to exclude from the returned _source field
+     * <p>
+     * API name: {@code _source_excludes}
+     */
+    public final List<String> sourceExcludes() {
+        return this.sourceExcludes;
+    }
+
+    /**
+     * A list of fields to extract and return from the _source field
+     * <p>
+     * API name: {@code _source_includes}
+     */
+    public final List<String> sourceIncludes() {
+        return this.sourceIncludes;
+    }
+
+    /**
+     * Specify whether wildcards and prefix queries in the query string query should
+     * be analyzed (default: false)
+     * <p>
+     * API name: {@code analyze_wildcard}
+     */
+    @Nullable
+    public final Boolean analyzeWildcard() {
+        return this.analyzeWildcard;
+    }
+
+    /**
+     * The analyzer for the query string query
+     * <p>
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * The default operator for query string query (AND or OR)
+     * <p>
+     * API name: {@code default_operator}
+     */
+    @Nullable
+    public final Operator defaultOperator() {
+        return this.defaultOperator;
+    }
+
+    /**
+     * The default field for query string query (default: _all)
+     * <p>
+     * API name: {@code df}
+     */
+    @Nullable
+    public final String df() {
+        return this.df;
+    }
+
+    /**
+     * Required - The document ID
+     * <p>
+     * API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - The name of the index
+     * <p>
+     * API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Specify whether format-based query failures (such as providing text to a
+     * numeric field) should be ignored
+     * <p>
+     * API name: {@code lenient}
+     */
+    @Nullable
+    public final Boolean lenient() {
+        return this.lenient;
+    }
+
+    /**
+     * Specify the node or shard the operation should be performed on (default:
+     * random)
+     * <p>
+     * API name: {@code preference}
+     */
+    @Nullable
+    public final String preference() {
+        return this.preference;
+    }
+
+    /**
+     * Query in the Lucene query string syntax
+     * <p>
+     * API name: {@code q}
+     */
+    @Nullable
+    public final String q() {
+        return this.q;
+    }
+
+    /**
+     * API name: {@code query}
+     */
+    @Nullable
+    public final Query query() {
+        return this.query;
+    }
+
+    /**
+     * Specific routing value
+     * <p>
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * A comma-separated list of stored fields to return in the response
+     * <p>
+     * API name: {@code stored_fields}
+     */
+    public final List<String> storedFields() {
+        return this.storedFields;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.query != null) {
+            generator.writeKey("query");
+            this.query.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ExplainRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExplainRequest> {
+        @Nullable
+        private SourceConfigParam source;
+
+        @Nullable
+        private List<String> sourceExcludes;
+
+        @Nullable
+        private List<String> sourceIncludes;
+
+        @Nullable
+        private Boolean analyzeWildcard;
+
+        @Nullable
+        private String analyzer;
+
+        @Nullable
+        private Operator defaultOperator;
+
+        @Nullable
+        private String df;
+
+        private String id;
+
+        private String index;
+
+        @Nullable
+        private Boolean lenient;
+
+        @Nullable
+        private String preference;
+
+        @Nullable
+        private String q;
+
+        @Nullable
+        private Query query;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private List<String> storedFields;
+
+        /**
+         * True or false to return the _source field or not, or a list of fields to
+         * return
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(@Nullable SourceConfigParam value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * True or false to return the _source field or not, or a list of fields to
+         * return
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(Function<SourceConfigParam.Builder, ObjectBuilder<SourceConfigParam>> fn) {
+            return this.source(fn.apply(new SourceConfigParam.Builder()).build());
+        }
+
+        /**
+         * A list of fields to exclude from the returned _source field
+         * <p>
+         * API name: {@code _source_excludes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceExcludes</code>.
+         */
+        public final Builder sourceExcludes(List<String> list) {
+            this.sourceExcludes = _listAddAll(this.sourceExcludes, list);
+            return this;
+        }
+
+        /**
+         * A list of fields to exclude from the returned _source field
+         * <p>
+         * API name: {@code _source_excludes}
+         * <p>
+         * Adds one or more values to <code>sourceExcludes</code>.
+         */
+        public final Builder sourceExcludes(String value, String... values) {
+            this.sourceExcludes = _listAdd(this.sourceExcludes, value, values);
+            return this;
+        }
+
+        /**
+         * A list of fields to extract and return from the _source field
+         * <p>
+         * API name: {@code _source_includes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceIncludes</code>.
+         */
+        public final Builder sourceIncludes(List<String> list) {
+            this.sourceIncludes = _listAddAll(this.sourceIncludes, list);
+            return this;
+        }
+
+        /**
+         * A list of fields to extract and return from the _source field
+         * <p>
+         * API name: {@code _source_includes}
+         * <p>
+         * Adds one or more values to <code>sourceIncludes</code>.
+         */
+        public final Builder sourceIncludes(String value, String... values) {
+            this.sourceIncludes = _listAdd(this.sourceIncludes, value, values);
+            return this;
+        }
+
+        /**
+         * Specify whether wildcards and prefix queries in the query string query should
+         * be analyzed (default: false)
+         * <p>
+         * API name: {@code analyze_wildcard}
+         */
+        public final Builder analyzeWildcard(@Nullable Boolean value) {
+            this.analyzeWildcard = value;
+            return this;
+        }
+
+        /**
+         * The analyzer for the query string query
+         * <p>
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * The default operator for query string query (AND or OR)
+         * <p>
+         * API name: {@code default_operator}
+         */
+        public final Builder defaultOperator(@Nullable Operator value) {
+            this.defaultOperator = value;
+            return this;
+        }
+
+        /**
+         * The default field for query string query (default: _all)
+         * <p>
+         * API name: {@code df}
+         */
+        public final Builder df(@Nullable String value) {
+            this.df = value;
+            return this;
+        }
+
+        /**
+         * Required - The document ID
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - The name of the index
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Specify whether format-based query failures (such as providing text to a
+         * numeric field) should be ignored
+         * <p>
+         * API name: {@code lenient}
+         */
+        public final Builder lenient(@Nullable Boolean value) {
+            this.lenient = value;
+            return this;
+        }
+
+        /**
+         * Specify the node or shard the operation should be performed on (default:
+         * random)
+         * <p>
+         * API name: {@code preference}
+         */
+        public final Builder preference(@Nullable String value) {
+            this.preference = value;
+            return this;
+        }
+
+        /**
+         * Query in the Lucene query string syntax
+         * <p>
+         * API name: {@code q}
+         */
+        public final Builder q(@Nullable String value) {
+            this.q = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code query}
+         */
+        public final Builder query(@Nullable Query value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code query}
+         */
+        public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.query(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * Specific routing value
+         * <p>
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of stored fields to return in the response
+         * <p>
+         * API name: {@code stored_fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>storedFields</code>.
+         */
+        public final Builder storedFields(List<String> list) {
+            this.storedFields = _listAddAll(this.storedFields, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of stored fields to return in the response
+         * <p>
+         * API name: {@code stored_fields}
+         * <p>
+         * Adds one or more values to <code>storedFields</code>.
+         */
+        public final Builder storedFields(String value, String... values) {
+            this.storedFields = _listAdd(this.storedFields, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link ExplainRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ExplainRequest build() {
+            _checkSingleUse();
+
+            return new ExplainRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ExplainRequest}
+     */
+    public static final JsonpDeserializer<ExplainRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ExplainRequest::setupExplainRequestDeserializer
+    );
+
+    protected static void setupExplainRequestDeserializer(ObjectDeserializer<ExplainRequest.Builder> op) {
+
+        op.add(Builder::query, Query._DESERIALIZER, "query");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code explain}".
+     */
+    public static final SimpleEndpoint<ExplainRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+            final int _id = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+            propsSet |= _id;
+
+            if (propsSet == (_index | _id)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_explain");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.id, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            if (request.q != null) {
+                params.put("q", request.q);
+            }
+            if (request.df != null) {
+                params.put("df", request.df);
+            }
+            if (request.defaultOperator != null) {
+                params.put("default_operator", request.defaultOperator.jsonValue());
+            }
+            if (request.analyzer != null) {
+                params.put("analyzer", request.analyzer);
+            }
+            if (ApiTypeHelper.isDefined(request.storedFields)) {
+                params.put("stored_fields", request.storedFields.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.preference != null) {
+                params.put("preference", request.preference);
+            }
+            if (request.analyzeWildcard != null) {
+                params.put("analyze_wildcard", String.valueOf(request.analyzeWildcard));
+            }
+            if (request.source != null) {
+                params.put("_source", request.source._toJsonString());
+            }
+            if (ApiTypeHelper.isDefined(request.sourceExcludes)) {
+                params.put("_source_excludes", request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (ApiTypeHelper.isDefined(request.sourceIncludes)) {
+                params.put("_source_includes", request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.lenient != null) {
+                params.put("lenient", String.valueOf(request.lenient));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        ExplainResponse._DESERIALIZER
+    );
+
+    /**
+     * Create an "{@code explain}" endpoint.
+     */
+    public static <TDocument> Endpoint<ExplainRequest, ExplainResponse<TDocument>, ErrorResponse> createExplainEndpoint(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return _ENDPOINT.withResponseDeserializer(ExplainResponse.createExplainResponseDeserializer(tDocumentDeserializer));
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/ExplainResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/ExplainResponse.java
index 8aebce88ee..db36b5066e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/ExplainResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/ExplainResponse.java
@@ -32,8 +32,10 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.InlineGet;
-import org.opensearch.client.opensearch.core.explain.ExplanationDetail;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,256 +44,252 @@
 import org.opensearch.client.json.NamedDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.InlineGet;
+import org.opensearch.client.opensearch.core.explain.ExplanationDetail;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import java.util.function.Supplier;
-import javax.annotation.Nullable;
 
 // typedef: _global.explain.Response
 
-
 @JsonpDeserializable
 public class ExplainResponse<TDocument> implements JsonpSerializable {
-	private final String index;
-
-	private final String id;
-
-	private final boolean matched;
+    private final String index;
+
+    private final String id;
+
+    private final boolean matched;
+
+    @Nullable
+    private final ExplanationDetail explanation;
 
-	@Nullable
-	private final ExplanationDetail explanation;
+    @Nullable
+    private final InlineGet<TDocument> get;
 
-	@Nullable
-	private final InlineGet<TDocument> get;
-
-	@Nullable
-	private final JsonpSerializer<TDocument> tDocumentSerializer;
+    @Nullable
+    private final JsonpSerializer<TDocument> tDocumentSerializer;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ExplainResponse(Builder<TDocument> builder) {
+    private ExplainResponse(Builder<TDocument> builder) {
 
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.matched = ApiTypeHelper.requireNonNull(builder.matched, this, "matched");
-		this.explanation = builder.explanation;
-		this.get = builder.get;
-		this.tDocumentSerializer = builder.tDocumentSerializer;
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.matched = ApiTypeHelper.requireNonNull(builder.matched, this, "matched");
+        this.explanation = builder.explanation;
+        this.get = builder.get;
+        this.tDocumentSerializer = builder.tDocumentSerializer;
 
-	}
+    }
 
-	public static <TDocument> ExplainResponse<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<ExplainResponse<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
+    public static <TDocument> ExplainResponse<TDocument> of(Function<Builder<TDocument>, ObjectBuilder<ExplainResponse<TDocument>>> fn) {
+        return fn.apply(new Builder<>()).build();
+    }
 
-	/**
-	 * Required - API name: {@code _index}
-	 */
-	public final String index() {
-		return this.index;
-	}
+    /**
+     * Required - API name: {@code _index}
+     */
+    public final String index() {
+        return this.index;
+    }
 
-	/**
-	 * Required - API name: {@code _id}
-	 */
-	public final String id() {
-		return this.id;
-	}
+    /**
+     * Required - API name: {@code _id}
+     */
+    public final String id() {
+        return this.id;
+    }
 
-	/**
-	 * Required - API name: {@code matched}
-	 */
-	public final boolean matched() {
-		return this.matched;
-	}
-
-	/**
-	 * API name: {@code explanation}
-	 */
-	@Nullable
-	public final ExplanationDetail explanation() {
-		return this.explanation;
-	}
-
-	/**
-	 * API name: {@code get}
-	 */
-	@Nullable
-	public final InlineGet<TDocument> get() {
-		return this.get;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("_index");
-		generator.write(this.index);
-
-		generator.writeKey("_id");
-		generator.write(this.id);
-
-		generator.writeKey("matched");
-		generator.write(this.matched);
-
-		if (this.explanation != null) {
-			generator.writeKey("explanation");
-			this.explanation.serialize(generator, mapper);
-
-		}
-		if (this.get != null) {
-			generator.writeKey("get");
-			this.get.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ExplainResponse}.
-	 */
-
-	public static class Builder<TDocument> extends ObjectBuilderBase
-			implements
-				ObjectBuilder<ExplainResponse<TDocument>> {
-		private String index;
-
-		@Nullable
-		private String type;
-
-		private String id;
-
-		private Boolean matched;
-
-		@Nullable
-		private ExplanationDetail explanation;
-
-		@Nullable
-		private InlineGet<TDocument> get;
-
-		@Nullable
-		private JsonpSerializer<TDocument> tDocumentSerializer;
-
-		/**
-		 * Required - API name: {@code _index}
-		 */
-		public final Builder<TDocument> index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _id}
-		 */
-		public final Builder<TDocument> id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code matched}
-		 */
-		public final Builder<TDocument> matched(boolean value) {
-			this.matched = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code explanation}
-		 */
-		public final Builder<TDocument> explanation(@Nullable ExplanationDetail value) {
-			this.explanation = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code explanation}
-		 */
-		public final Builder<TDocument> explanation(
-				Function<ExplanationDetail.Builder, ObjectBuilder<ExplanationDetail>> fn) {
-			return this.explanation(fn.apply(new ExplanationDetail.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code get}
-		 */
-		public final Builder<TDocument> get(@Nullable InlineGet<TDocument> value) {
-			this.get = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code get}
-		 */
-		public final Builder<TDocument> get(
-				Function<InlineGet.Builder<TDocument>, ObjectBuilder<InlineGet<TDocument>>> fn) {
-			return this.get(fn.apply(new InlineGet.Builder<TDocument>()).build());
-		}
-
-		/**
-		 * Serializer for TDocument. If not set, an attempt will be made to find a
-		 * serializer from the JSON context.
-		 */
-		public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
-			this.tDocumentSerializer = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ExplainResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ExplainResponse<TDocument> build() {
-			_checkSingleUse();
-
-			return new ExplainResponse<TDocument>(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Create a JSON deserializer for ExplainResponse
-	 */
-	public static <TDocument> JsonpDeserializer<ExplainResponse<TDocument>> createExplainResponseDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return ObjectBuilderDeserializer.createForObject((Supplier<Builder<TDocument>>) Builder::new,
-				op -> ExplainResponse.setupExplainResponseDeserializer(op, tDocumentDeserializer));
-	};
-
-	/**
-	 * Json deserializer for {@link ExplainResponse} based on named deserializers
-	 * provided by the calling {@code JsonMapper}.
-	 */
-	public static final JsonpDeserializer<ExplainResponse<Object>> _DESERIALIZER = createExplainResponseDeserializer(
-			new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.explain.TDocument"));
-
-	protected static <TDocument> void setupExplainResponseDeserializer(
-			ObjectDeserializer<ExplainResponse.Builder<TDocument>> op,
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
-		op.add(Builder::matched, JsonpDeserializer.booleanDeserializer(), "matched");
-		op.add(Builder::explanation, ExplanationDetail._DESERIALIZER, "explanation");
-		op.add(Builder::get, InlineGet.createInlineGetDeserializer(tDocumentDeserializer), "get");
-
-	}
+    /**
+     * Required - API name: {@code matched}
+     */
+    public final boolean matched() {
+        return this.matched;
+    }
+
+    /**
+     * API name: {@code explanation}
+     */
+    @Nullable
+    public final ExplanationDetail explanation() {
+        return this.explanation;
+    }
+
+    /**
+     * API name: {@code get}
+     */
+    @Nullable
+    public final InlineGet<TDocument> get() {
+        return this.get;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("_index");
+        generator.write(this.index);
+
+        generator.writeKey("_id");
+        generator.write(this.id);
+
+        generator.writeKey("matched");
+        generator.write(this.matched);
+
+        if (this.explanation != null) {
+            generator.writeKey("explanation");
+            this.explanation.serialize(generator, mapper);
+
+        }
+        if (this.get != null) {
+            generator.writeKey("get");
+            this.get.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ExplainResponse}.
+     */
+
+    public static class Builder<TDocument> extends ObjectBuilderBase implements ObjectBuilder<ExplainResponse<TDocument>> {
+        private String index;
+
+        @Nullable
+        private String type;
+
+        private String id;
+
+        private Boolean matched;
+
+        @Nullable
+        private ExplanationDetail explanation;
+
+        @Nullable
+        private InlineGet<TDocument> get;
+
+        @Nullable
+        private JsonpSerializer<TDocument> tDocumentSerializer;
+
+        /**
+         * Required - API name: {@code _index}
+         */
+        public final Builder<TDocument> index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _id}
+         */
+        public final Builder<TDocument> id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code matched}
+         */
+        public final Builder<TDocument> matched(boolean value) {
+            this.matched = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code explanation}
+         */
+        public final Builder<TDocument> explanation(@Nullable ExplanationDetail value) {
+            this.explanation = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code explanation}
+         */
+        public final Builder<TDocument> explanation(Function<ExplanationDetail.Builder, ObjectBuilder<ExplanationDetail>> fn) {
+            return this.explanation(fn.apply(new ExplanationDetail.Builder()).build());
+        }
+
+        /**
+         * API name: {@code get}
+         */
+        public final Builder<TDocument> get(@Nullable InlineGet<TDocument> value) {
+            this.get = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code get}
+         */
+        public final Builder<TDocument> get(Function<InlineGet.Builder<TDocument>, ObjectBuilder<InlineGet<TDocument>>> fn) {
+            return this.get(fn.apply(new InlineGet.Builder<TDocument>()).build());
+        }
+
+        /**
+         * Serializer for TDocument. If not set, an attempt will be made to find a
+         * serializer from the JSON context.
+         */
+        public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
+            this.tDocumentSerializer = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ExplainResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ExplainResponse<TDocument> build() {
+            _checkSingleUse();
+
+            return new ExplainResponse<TDocument>(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Create a JSON deserializer for ExplainResponse
+     */
+    public static <TDocument> JsonpDeserializer<ExplainResponse<TDocument>> createExplainResponseDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<TDocument>>) Builder::new,
+            op -> ExplainResponse.setupExplainResponseDeserializer(op, tDocumentDeserializer)
+        );
+    };
+
+    /**
+     * Json deserializer for {@link ExplainResponse} based on named deserializers
+     * provided by the calling {@code JsonMapper}.
+     */
+    public static final JsonpDeserializer<ExplainResponse<Object>> _DESERIALIZER = createExplainResponseDeserializer(
+        new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.explain.TDocument")
+    );
+
+    protected static <TDocument> void setupExplainResponseDeserializer(
+        ObjectDeserializer<ExplainResponse.Builder<TDocument>> op,
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(Builder::matched, JsonpDeserializer.booleanDeserializer(), "matched");
+        op.add(Builder::explanation, ExplanationDetail._DESERIALIZER, "explanation");
+        op.add(Builder::get, InlineGet.createInlineGetDeserializer(tDocumentDeserializer), "get");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/FieldCapsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/FieldCapsRequest.java
index f6793460c7..224c9da095 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/FieldCapsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/FieldCapsRequest.java
@@ -32,459 +32,459 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.ExpandWildcard;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.mapping.RuntimeField;
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.ExpandWildcard;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.mapping.RuntimeField;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: _global.field_caps.Request
 
 /**
  * Returns the information about the capabilities of fields among multiple
  * indices.
- * 
+ *
  */
 @JsonpDeserializable
 public class FieldCapsRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	private final List<String> fields;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	@Nullable
-	private final Boolean includeUnmapped;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Query indexFilter;
-
-	private final Map<String, RuntimeField> runtimeMappings;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FieldCapsRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.includeUnmapped = builder.includeUnmapped;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.indexFilter = builder.indexFilter;
-		this.runtimeMappings = ApiTypeHelper.unmodifiable(builder.runtimeMappings);
-
-	}
-
-	public static FieldCapsRequest of(Function<Builder, ObjectBuilder<FieldCapsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * A comma-separated list of field names
-	 * <p>
-	 * API name: {@code fields}
-	 */
-	public final List<String> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * Indicates whether unmapped fields should be included in the response.
-	 * <p>
-	 * API name: {@code include_unmapped}
-	 */
-	@Nullable
-	public final Boolean includeUnmapped() {
-		return this.includeUnmapped;
-	}
-
-	/**
-	 * A comma-separated list of index names; use <code>_all</code> or empty string
-	 * to perform the operation on all indices
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code index_filter}
-	 */
-	@Nullable
-	public final Query indexFilter() {
-		return this.indexFilter;
-	}
-
-	/**
-	 * API name: {@code runtime_mappings}
-	 */
-	public final Map<String, RuntimeField> runtimeMappings() {
-		return this.runtimeMappings;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.indexFilter != null) {
-			generator.writeKey("index_filter");
-			this.indexFilter.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.runtimeMappings)) {
-			generator.writeKey("runtime_mappings");
-			generator.writeStartObject();
-			for (Map.Entry<String, RuntimeField> item0 : this.runtimeMappings.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FieldCapsRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldCapsRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private List<String> fields;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private Boolean includeUnmapped;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private Query indexFilter;
-
-		@Nullable
-		private Map<String, RuntimeField> runtimeMappings;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of field names
-		 * <p>
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fields</code>.
-		 */
-		public final Builder fields(List<String> list) {
-			this.fields = _listAddAll(this.fields, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of field names
-		 * <p>
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds one or more values to <code>fields</code>.
-		 */
-		public final Builder fields(String value, String... values) {
-			this.fields = _listAdd(this.fields, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Indicates whether unmapped fields should be included in the response.
-		 * <p>
-		 * API name: {@code include_unmapped}
-		 */
-		public final Builder includeUnmapped(@Nullable Boolean value) {
-			this.includeUnmapped = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_filter}
-		 */
-		public final Builder indexFilter(@Nullable Query value) {
-			this.indexFilter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_filter}
-		 */
-		public final Builder indexFilter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.indexFilter(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code runtime_mappings}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>runtimeMappings</code>.
-		 */
-		public final Builder runtimeMappings(Map<String, RuntimeField> map) {
-			this.runtimeMappings = _mapPutAll(this.runtimeMappings, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code runtime_mappings}
-		 * <p>
-		 * Adds an entry to <code>runtimeMappings</code>.
-		 */
-		public final Builder runtimeMappings(String key, RuntimeField value) {
-			this.runtimeMappings = _mapPut(this.runtimeMappings, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code runtime_mappings}
-		 * <p>
-		 * Adds an entry to <code>runtimeMappings</code> using a builder lambda.
-		 */
-		public final Builder runtimeMappings(String key,
-				Function<RuntimeField.Builder, ObjectBuilder<RuntimeField>> fn) {
-			return runtimeMappings(key, fn.apply(new RuntimeField.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link FieldCapsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FieldCapsRequest build() {
-			_checkSingleUse();
-
-			return new FieldCapsRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FieldCapsRequest}
-	 */
-	public static final JsonpDeserializer<FieldCapsRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FieldCapsRequest::setupFieldCapsRequestDeserializer);
-
-	protected static void setupFieldCapsRequestDeserializer(ObjectDeserializer<FieldCapsRequest.Builder> op) {
-
-		op.add(Builder::indexFilter, Query._DESERIALIZER, "index_filter");
-		op.add(Builder::runtimeMappings, JsonpDeserializer.stringMapDeserializer(RuntimeField._DESERIALIZER),
-				"runtime_mappings");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code field_caps}".
-	 */
-	public static final Endpoint<FieldCapsRequest, FieldCapsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_field_caps");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_field_caps");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					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(",")));
-				}
-				if (request.includeUnmapped != null) {
-					params.put("include_unmapped", String.valueOf(request.includeUnmapped));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, FieldCapsResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    private final List<String> fields;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    @Nullable
+    private final Boolean includeUnmapped;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Query indexFilter;
+
+    private final Map<String, RuntimeField> runtimeMappings;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FieldCapsRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.includeUnmapped = builder.includeUnmapped;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.indexFilter = builder.indexFilter;
+        this.runtimeMappings = ApiTypeHelper.unmodifiable(builder.runtimeMappings);
+
+    }
+
+    public static FieldCapsRequest of(Function<Builder, ObjectBuilder<FieldCapsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * A comma-separated list of field names
+     * <p>
+     * API name: {@code fields}
+     */
+    public final List<String> fields() {
+        return this.fields;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * Indicates whether unmapped fields should be included in the response.
+     * <p>
+     * API name: {@code include_unmapped}
+     */
+    @Nullable
+    public final Boolean includeUnmapped() {
+        return this.includeUnmapped;
+    }
+
+    /**
+     * A comma-separated list of index names; use <code>_all</code> or empty string
+     * to perform the operation on all indices
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code index_filter}
+     */
+    @Nullable
+    public final Query indexFilter() {
+        return this.indexFilter;
+    }
+
+    /**
+     * API name: {@code runtime_mappings}
+     */
+    public final Map<String, RuntimeField> runtimeMappings() {
+        return this.runtimeMappings;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.indexFilter != null) {
+            generator.writeKey("index_filter");
+            this.indexFilter.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.runtimeMappings)) {
+            generator.writeKey("runtime_mappings");
+            generator.writeStartObject();
+            for (Map.Entry<String, RuntimeField> item0 : this.runtimeMappings.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FieldCapsRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldCapsRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private List<String> fields;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private Boolean includeUnmapped;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private Query indexFilter;
+
+        @Nullable
+        private Map<String, RuntimeField> runtimeMappings;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of field names
+         * <p>
+         * API name: {@code fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fields</code>.
+         */
+        public final Builder fields(List<String> list) {
+            this.fields = _listAddAll(this.fields, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of field names
+         * <p>
+         * API name: {@code fields}
+         * <p>
+         * Adds one or more values to <code>fields</code>.
+         */
+        public final Builder fields(String value, String... values) {
+            this.fields = _listAdd(this.fields, value, values);
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Indicates whether unmapped fields should be included in the response.
+         * <p>
+         * API name: {@code include_unmapped}
+         */
+        public final Builder includeUnmapped(@Nullable Boolean value) {
+            this.includeUnmapped = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code index_filter}
+         */
+        public final Builder indexFilter(@Nullable Query value) {
+            this.indexFilter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index_filter}
+         */
+        public final Builder indexFilter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.indexFilter(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code runtime_mappings}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>runtimeMappings</code>.
+         */
+        public final Builder runtimeMappings(Map<String, RuntimeField> map) {
+            this.runtimeMappings = _mapPutAll(this.runtimeMappings, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code runtime_mappings}
+         * <p>
+         * Adds an entry to <code>runtimeMappings</code>.
+         */
+        public final Builder runtimeMappings(String key, RuntimeField value) {
+            this.runtimeMappings = _mapPut(this.runtimeMappings, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code runtime_mappings}
+         * <p>
+         * Adds an entry to <code>runtimeMappings</code> using a builder lambda.
+         */
+        public final Builder runtimeMappings(String key, Function<RuntimeField.Builder, ObjectBuilder<RuntimeField>> fn) {
+            return runtimeMappings(key, fn.apply(new RuntimeField.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link FieldCapsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FieldCapsRequest build() {
+            _checkSingleUse();
+
+            return new FieldCapsRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FieldCapsRequest}
+     */
+    public static final JsonpDeserializer<FieldCapsRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FieldCapsRequest::setupFieldCapsRequestDeserializer
+    );
+
+    protected static void setupFieldCapsRequestDeserializer(ObjectDeserializer<FieldCapsRequest.Builder> op) {
+
+        op.add(Builder::indexFilter, Query._DESERIALIZER, "index_filter");
+        op.add(Builder::runtimeMappings, JsonpDeserializer.stringMapDeserializer(RuntimeField._DESERIALIZER), "runtime_mappings");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code field_caps}".
+     */
+    public static final Endpoint<FieldCapsRequest, FieldCapsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_field_caps");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_field_caps");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                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(",")));
+            }
+            if (request.includeUnmapped != null) {
+                params.put("include_unmapped", String.valueOf(request.includeUnmapped));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        FieldCapsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/FieldCapsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/FieldCapsResponse.java
index 86f9df9232..ea3a5a5cc5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/FieldCapsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/FieldCapsResponse.java
@@ -32,179 +32,182 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch.core.field_caps.FieldCapability;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.field_caps.FieldCapability;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _global.field_caps.Response
 
 @JsonpDeserializable
 public class FieldCapsResponse implements JsonpSerializable {
-	private final List<String> indices;
-
-	private final Map<String, Map<String, FieldCapability>> fields;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FieldCapsResponse(Builder builder) {
-
-		this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
-		this.fields = ApiTypeHelper.unmodifiableRequired(builder.fields, this, "fields");
-
-	}
-
-	public static FieldCapsResponse of(Function<Builder, ObjectBuilder<FieldCapsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code indices}
-	 */
-	public final List<String> indices() {
-		return this.indices;
-	}
-
-	/**
-	 * Required - API name: {@code fields}
-	 */
-	public final Map<String, Map<String, FieldCapability>> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartArray();
-			for (String item0 : this.indices) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartObject();
-			for (Map.Entry<String, Map<String, FieldCapability>> item0 : this.fields.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.writeStartObject();
-				if (item0.getValue() != null) {
-					for (Map.Entry<String, FieldCapability> item1 : item0.getValue().entrySet()) {
-						generator.writeKey(item1.getKey());
-						item1.getValue().serialize(generator, mapper);
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FieldCapsResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldCapsResponse> {
-		private List<String> indices;
-
-		private Map<String, Map<String, FieldCapability>> fields;
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indices</code>.
-		 */
-		public final Builder indices(List<String> list) {
-			this.indices = _listAddAll(this.indices, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds one or more values to <code>indices</code>.
-		 */
-		public final Builder indices(String value, String... values) {
-			this.indices = _listAdd(this.indices, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code fields}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>fields</code>.
-		 */
-		public final Builder fields(Map<String, Map<String, FieldCapability>> map) {
-			this.fields = _mapPutAll(this.fields, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code fields}
-		 * <p>
-		 * Adds an entry to <code>fields</code>.
-		 */
-		public final Builder fields(String key, Map<String, FieldCapability> value) {
-			this.fields = _mapPut(this.fields, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FieldCapsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FieldCapsResponse build() {
-			_checkSingleUse();
-
-			return new FieldCapsResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FieldCapsResponse}
-	 */
-	public static final JsonpDeserializer<FieldCapsResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, FieldCapsResponse::setupFieldCapsResponseDeserializer);
-
-	protected static void setupFieldCapsResponseDeserializer(ObjectDeserializer<FieldCapsResponse.Builder> op) {
-
-		op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"indices");
-		op.add(Builder::fields, JsonpDeserializer.stringMapDeserializer(
-				JsonpDeserializer.stringMapDeserializer(FieldCapability._DESERIALIZER)), "fields");
-
-	}
+    private final List<String> indices;
+
+    private final Map<String, Map<String, FieldCapability>> fields;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FieldCapsResponse(Builder builder) {
+
+        this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
+        this.fields = ApiTypeHelper.unmodifiableRequired(builder.fields, this, "fields");
+
+    }
+
+    public static FieldCapsResponse of(Function<Builder, ObjectBuilder<FieldCapsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code indices}
+     */
+    public final List<String> indices() {
+        return this.indices;
+    }
+
+    /**
+     * Required - API name: {@code fields}
+     */
+    public final Map<String, Map<String, FieldCapability>> fields() {
+        return this.fields;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartArray();
+            for (String item0 : this.indices) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartObject();
+            for (Map.Entry<String, Map<String, FieldCapability>> item0 : this.fields.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.writeStartObject();
+                if (item0.getValue() != null) {
+                    for (Map.Entry<String, FieldCapability> item1 : item0.getValue().entrySet()) {
+                        generator.writeKey(item1.getKey());
+                        item1.getValue().serialize(generator, mapper);
+
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FieldCapsResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldCapsResponse> {
+        private List<String> indices;
+
+        private Map<String, Map<String, FieldCapability>> fields;
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indices</code>.
+         */
+        public final Builder indices(List<String> list) {
+            this.indices = _listAddAll(this.indices, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds one or more values to <code>indices</code>.
+         */
+        public final Builder indices(String value, String... values) {
+            this.indices = _listAdd(this.indices, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code fields}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>fields</code>.
+         */
+        public final Builder fields(Map<String, Map<String, FieldCapability>> map) {
+            this.fields = _mapPutAll(this.fields, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code fields}
+         * <p>
+         * Adds an entry to <code>fields</code>.
+         */
+        public final Builder fields(String key, Map<String, FieldCapability> value) {
+            this.fields = _mapPut(this.fields, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link FieldCapsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FieldCapsResponse build() {
+            _checkSingleUse();
+
+            return new FieldCapsResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FieldCapsResponse}
+     */
+    public static final JsonpDeserializer<FieldCapsResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FieldCapsResponse::setupFieldCapsResponseDeserializer
+    );
+
+    protected static void setupFieldCapsResponseDeserializer(ObjectDeserializer<FieldCapsResponse.Builder> op) {
+
+        op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "indices");
+        op.add(
+            Builder::fields,
+            JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringMapDeserializer(FieldCapability._DESERIALIZER)),
+            "fields"
+        );
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetRequest.java
index 8c67517146..32b1132125 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetRequest.java
@@ -32,24 +32,23 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.VersionType;
 import org.opensearch.client.opensearch.core.search.SourceConfigParam;
-import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: _global.get.Request
 
 /**
@@ -58,490 +57,492 @@
  */
 
 public class GetRequest extends RequestBase {
-	@Nullable
-	private final SourceConfigParam source;
-
-	private final List<String> sourceExcludes;
-
-	private final List<String> sourceIncludes;
-
-	private final String id;
-
-	private final String index;
-
-	@Nullable
-	private final String preference;
-
-	@Nullable
-	private final Boolean realtime;
-
-	@Nullable
-	private final Boolean refresh;
-
-	@Nullable
-	private final String routing;
-
-	private final List<String> storedFields;
-
-	@Nullable
-	private final Long version;
-
-	@Nullable
-	private final VersionType versionType;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetRequest(Builder builder) {
-
-		this.source = builder.source;
-		this.sourceExcludes = ApiTypeHelper.unmodifiable(builder.sourceExcludes);
-		this.sourceIncludes = ApiTypeHelper.unmodifiable(builder.sourceIncludes);
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.preference = builder.preference;
-		this.realtime = builder.realtime;
-		this.refresh = builder.refresh;
-		this.routing = builder.routing;
-		this.storedFields = ApiTypeHelper.unmodifiable(builder.storedFields);
-		this.version = builder.version;
-		this.versionType = builder.versionType;
-
-	}
-
-	public static GetRequest of(Function<Builder, ObjectBuilder<GetRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * True or false to return the _source field or not, or a list of fields to
-	 * return.
-	 * <p>
-	 * API name: {@code _source}
-	 */
-	@Nullable
-	public final SourceConfigParam source() {
-		return this.source;
-	}
-
-	/**
-	 * A comma-separated list of source fields to exclude in the response.
-	 * <p>
-	 * API name: {@code _source_excludes}
-	 */
-	public final List<String> sourceExcludes() {
-		return this.sourceExcludes;
-	}
-
-	/**
-	 * A comma-separated list of source fields to include in the response.
-	 * <p>
-	 * API name: {@code _source_includes}
-	 */
-	public final List<String> sourceIncludes() {
-		return this.sourceIncludes;
-	}
-
-	/**
-	 * Required - Unique identifier of the document.
-	 * <p>
-	 * API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - Name of the index that contains the document.
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Specifies the node or shard the operation should be performed on. Random by
-	 * default.
-	 * <p>
-	 * API name: {@code preference}
-	 */
-	@Nullable
-	public final String preference() {
-		return this.preference;
-	}
-
-	/**
-	 * Boolean) If true, the request is real-time as opposed to near-real-time.
-	 * <p>
-	 * API name: {@code realtime}
-	 */
-	@Nullable
-	public final Boolean realtime() {
-		return this.realtime;
-	}
-
-	/**
-	 * If true, Elasticsearch refreshes the affected shards to make this operation
-	 * visible to search. If false, do nothing with refreshes.
-	 * <p>
-	 * API name: {@code refresh}
-	 */
-	@Nullable
-	public final Boolean refresh() {
-		return this.refresh;
-	}
-
-	/**
-	 * Target the specified primary shard.
-	 * <p>
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * A comma-separated list of stored fields to return in the response
-	 * <p>
-	 * API name: {@code stored_fields}
-	 */
-	public final List<String> storedFields() {
-		return this.storedFields;
-	}
-
-	/**
-	 * Explicit version number for concurrency control. The specified version must
-	 * match the current version of the document for the request to succeed.
-	 * <p>
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * Specific version type: internal, external, external_gte.
-	 * <p>
-	 * API name: {@code version_type}
-	 */
-	@Nullable
-	public final VersionType versionType() {
-		return this.versionType;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetRequest> {
-		@Nullable
-		private SourceConfigParam source;
-
-		@Nullable
-		private List<String> sourceExcludes;
-
-		@Nullable
-		private List<String> sourceIncludes;
-
-		private String id;
-
-		private String index;
-
-		@Nullable
-		private String preference;
-
-		@Nullable
-		private Boolean realtime;
-
-		@Nullable
-		private Boolean refresh;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private List<String> storedFields;
-
-		@Nullable
-		private Long version;
-
-		@Nullable
-		private VersionType versionType;
-
-		/**
-		 * True or false to return the _source field or not, or a list of fields to
-		 * return.
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(@Nullable SourceConfigParam value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * True or false to return the _source field or not, or a list of fields to
-		 * return.
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(Function<SourceConfigParam.Builder, ObjectBuilder<SourceConfigParam>> fn) {
-			return this.source(fn.apply(new SourceConfigParam.Builder()).build());
-		}
-
-		/**
-		 * A comma-separated list of source fields to exclude in the response.
-		 * <p>
-		 * API name: {@code _source_excludes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceExcludes</code>.
-		 */
-		public final Builder sourceExcludes(List<String> list) {
-			this.sourceExcludes = _listAddAll(this.sourceExcludes, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of source fields to exclude in the response.
-		 * <p>
-		 * API name: {@code _source_excludes}
-		 * <p>
-		 * Adds one or more values to <code>sourceExcludes</code>.
-		 */
-		public final Builder sourceExcludes(String value, String... values) {
-			this.sourceExcludes = _listAdd(this.sourceExcludes, value, values);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of source fields to include in the response.
-		 * <p>
-		 * API name: {@code _source_includes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceIncludes</code>.
-		 */
-		public final Builder sourceIncludes(List<String> list) {
-			this.sourceIncludes = _listAddAll(this.sourceIncludes, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of source fields to include in the response.
-		 * <p>
-		 * API name: {@code _source_includes}
-		 * <p>
-		 * Adds one or more values to <code>sourceIncludes</code>.
-		 */
-		public final Builder sourceIncludes(String value, String... values) {
-			this.sourceIncludes = _listAdd(this.sourceIncludes, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Unique identifier of the document.
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - Name of the index that contains the document.
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Specifies the node or shard the operation should be performed on. Random by
-		 * default.
-		 * <p>
-		 * API name: {@code preference}
-		 */
-		public final Builder preference(@Nullable String value) {
-			this.preference = value;
-			return this;
-		}
-
-		/**
-		 * Boolean) If true, the request is real-time as opposed to near-real-time.
-		 * <p>
-		 * API name: {@code realtime}
-		 */
-		public final Builder realtime(@Nullable Boolean value) {
-			this.realtime = value;
-			return this;
-		}
-
-		/**
-		 * If true, Elasticsearch refreshes the affected shards to make this operation
-		 * visible to search. If false, do nothing with refreshes.
-		 * <p>
-		 * API name: {@code refresh}
-		 */
-		public final Builder refresh(@Nullable Boolean value) {
-			this.refresh = value;
-			return this;
-		}
-
-		/**
-		 * Target the specified primary shard.
-		 * <p>
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of stored fields to return in the response
-		 * <p>
-		 * API name: {@code stored_fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>storedFields</code>.
-		 */
-		public final Builder storedFields(List<String> list) {
-			this.storedFields = _listAddAll(this.storedFields, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of stored fields to return in the response
-		 * <p>
-		 * API name: {@code stored_fields}
-		 * <p>
-		 * Adds one or more values to <code>storedFields</code>.
-		 */
-		public final Builder storedFields(String value, String... values) {
-			this.storedFields = _listAdd(this.storedFields, value, values);
-			return this;
-		}
-
-		/**
-		 * Explicit version number for concurrency control. The specified version must
-		 * match the current version of the document for the request to succeed.
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Specific version type: internal, external, external_gte.
-		 * <p>
-		 * API name: {@code version_type}
-		 */
-		public final Builder versionType(@Nullable VersionType value) {
-			this.versionType = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetRequest build() {
-			_checkSingleUse();
-
-			return new GetRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code get}".
-	 */
-	public static final SimpleEndpoint<GetRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-				final int _id = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-				propsSet |= _id;
-
-				if (propsSet == (_index | _id)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_doc");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.id, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.routing != null) {
-					params.put("routing", request.routing);
-				}
-				if (request.realtime != null) {
-					params.put("realtime", String.valueOf(request.realtime));
-				}
-				if (request.versionType != null) {
-					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(",")));
-				}
-				if (request.preference != null) {
-					params.put("preference", request.preference);
-				}
-				if (request.refresh != null) {
-					params.put("refresh", String.valueOf(request.refresh));
-				}
-				if (request.source != null) {
-					params.put("_source", request.source._toJsonString());
-				}
-				if (ApiTypeHelper.isDefined(request.sourceExcludes)) {
-					params.put("_source_excludes",
-							request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (ApiTypeHelper.isDefined(request.sourceIncludes)) {
-					params.put("_source_includes",
-							request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.version != null) {
-					params.put("version", String.valueOf(request.version));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, GetResponse._DESERIALIZER);
-
-	/**
-	 * Create an "{@code get}" endpoint.
-	 */
-	public static <TDocument> Endpoint<GetRequest, GetResponse<TDocument>, ErrorResponse> createGetEndpoint(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return _ENDPOINT.withResponseDeserializer(GetResponse.createGetResponseDeserializer(tDocumentDeserializer));
-	}
+    @Nullable
+    private final SourceConfigParam source;
+
+    private final List<String> sourceExcludes;
+
+    private final List<String> sourceIncludes;
+
+    private final String id;
+
+    private final String index;
+
+    @Nullable
+    private final String preference;
+
+    @Nullable
+    private final Boolean realtime;
+
+    @Nullable
+    private final Boolean refresh;
+
+    @Nullable
+    private final String routing;
+
+    private final List<String> storedFields;
+
+    @Nullable
+    private final Long version;
+
+    @Nullable
+    private final VersionType versionType;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetRequest(Builder builder) {
+
+        this.source = builder.source;
+        this.sourceExcludes = ApiTypeHelper.unmodifiable(builder.sourceExcludes);
+        this.sourceIncludes = ApiTypeHelper.unmodifiable(builder.sourceIncludes);
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.preference = builder.preference;
+        this.realtime = builder.realtime;
+        this.refresh = builder.refresh;
+        this.routing = builder.routing;
+        this.storedFields = ApiTypeHelper.unmodifiable(builder.storedFields);
+        this.version = builder.version;
+        this.versionType = builder.versionType;
+
+    }
+
+    public static GetRequest of(Function<Builder, ObjectBuilder<GetRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * True or false to return the _source field or not, or a list of fields to
+     * return.
+     * <p>
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final SourceConfigParam source() {
+        return this.source;
+    }
+
+    /**
+     * A comma-separated list of source fields to exclude in the response.
+     * <p>
+     * API name: {@code _source_excludes}
+     */
+    public final List<String> sourceExcludes() {
+        return this.sourceExcludes;
+    }
+
+    /**
+     * A comma-separated list of source fields to include in the response.
+     * <p>
+     * API name: {@code _source_includes}
+     */
+    public final List<String> sourceIncludes() {
+        return this.sourceIncludes;
+    }
+
+    /**
+     * Required - Unique identifier of the document.
+     * <p>
+     * API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - Name of the index that contains the document.
+     * <p>
+     * API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Specifies the node or shard the operation should be performed on. Random by
+     * default.
+     * <p>
+     * API name: {@code preference}
+     */
+    @Nullable
+    public final String preference() {
+        return this.preference;
+    }
+
+    /**
+     * Boolean) If true, the request is real-time as opposed to near-real-time.
+     * <p>
+     * API name: {@code realtime}
+     */
+    @Nullable
+    public final Boolean realtime() {
+        return this.realtime;
+    }
+
+    /**
+     * If true, Elasticsearch refreshes the affected shards to make this operation
+     * visible to search. If false, do nothing with refreshes.
+     * <p>
+     * API name: {@code refresh}
+     */
+    @Nullable
+    public final Boolean refresh() {
+        return this.refresh;
+    }
+
+    /**
+     * Target the specified primary shard.
+     * <p>
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * A comma-separated list of stored fields to return in the response
+     * <p>
+     * API name: {@code stored_fields}
+     */
+    public final List<String> storedFields() {
+        return this.storedFields;
+    }
+
+    /**
+     * Explicit version number for concurrency control. The specified version must
+     * match the current version of the document for the request to succeed.
+     * <p>
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * Specific version type: internal, external, external_gte.
+     * <p>
+     * API name: {@code version_type}
+     */
+    @Nullable
+    public final VersionType versionType() {
+        return this.versionType;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetRequest> {
+        @Nullable
+        private SourceConfigParam source;
+
+        @Nullable
+        private List<String> sourceExcludes;
+
+        @Nullable
+        private List<String> sourceIncludes;
+
+        private String id;
+
+        private String index;
+
+        @Nullable
+        private String preference;
+
+        @Nullable
+        private Boolean realtime;
+
+        @Nullable
+        private Boolean refresh;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private List<String> storedFields;
+
+        @Nullable
+        private Long version;
+
+        @Nullable
+        private VersionType versionType;
+
+        /**
+         * True or false to return the _source field or not, or a list of fields to
+         * return.
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(@Nullable SourceConfigParam value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * True or false to return the _source field or not, or a list of fields to
+         * return.
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(Function<SourceConfigParam.Builder, ObjectBuilder<SourceConfigParam>> fn) {
+            return this.source(fn.apply(new SourceConfigParam.Builder()).build());
+        }
+
+        /**
+         * A comma-separated list of source fields to exclude in the response.
+         * <p>
+         * API name: {@code _source_excludes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceExcludes</code>.
+         */
+        public final Builder sourceExcludes(List<String> list) {
+            this.sourceExcludes = _listAddAll(this.sourceExcludes, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of source fields to exclude in the response.
+         * <p>
+         * API name: {@code _source_excludes}
+         * <p>
+         * Adds one or more values to <code>sourceExcludes</code>.
+         */
+        public final Builder sourceExcludes(String value, String... values) {
+            this.sourceExcludes = _listAdd(this.sourceExcludes, value, values);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of source fields to include in the response.
+         * <p>
+         * API name: {@code _source_includes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceIncludes</code>.
+         */
+        public final Builder sourceIncludes(List<String> list) {
+            this.sourceIncludes = _listAddAll(this.sourceIncludes, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of source fields to include in the response.
+         * <p>
+         * API name: {@code _source_includes}
+         * <p>
+         * Adds one or more values to <code>sourceIncludes</code>.
+         */
+        public final Builder sourceIncludes(String value, String... values) {
+            this.sourceIncludes = _listAdd(this.sourceIncludes, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Unique identifier of the document.
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - Name of the index that contains the document.
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Specifies the node or shard the operation should be performed on. Random by
+         * default.
+         * <p>
+         * API name: {@code preference}
+         */
+        public final Builder preference(@Nullable String value) {
+            this.preference = value;
+            return this;
+        }
+
+        /**
+         * Boolean) If true, the request is real-time as opposed to near-real-time.
+         * <p>
+         * API name: {@code realtime}
+         */
+        public final Builder realtime(@Nullable Boolean value) {
+            this.realtime = value;
+            return this;
+        }
+
+        /**
+         * If true, Elasticsearch refreshes the affected shards to make this operation
+         * visible to search. If false, do nothing with refreshes.
+         * <p>
+         * API name: {@code refresh}
+         */
+        public final Builder refresh(@Nullable Boolean value) {
+            this.refresh = value;
+            return this;
+        }
+
+        /**
+         * Target the specified primary shard.
+         * <p>
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of stored fields to return in the response
+         * <p>
+         * API name: {@code stored_fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>storedFields</code>.
+         */
+        public final Builder storedFields(List<String> list) {
+            this.storedFields = _listAddAll(this.storedFields, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of stored fields to return in the response
+         * <p>
+         * API name: {@code stored_fields}
+         * <p>
+         * Adds one or more values to <code>storedFields</code>.
+         */
+        public final Builder storedFields(String value, String... values) {
+            this.storedFields = _listAdd(this.storedFields, value, values);
+            return this;
+        }
+
+        /**
+         * Explicit version number for concurrency control. The specified version must
+         * match the current version of the document for the request to succeed.
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Specific version type: internal, external, external_gte.
+         * <p>
+         * API name: {@code version_type}
+         */
+        public final Builder versionType(@Nullable VersionType value) {
+            this.versionType = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetRequest build() {
+            _checkSingleUse();
+
+            return new GetRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code get}".
+     */
+    public static final SimpleEndpoint<GetRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+            final int _id = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+            propsSet |= _id;
+
+            if (propsSet == (_index | _id)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_doc");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.id, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            if (request.realtime != null) {
+                params.put("realtime", String.valueOf(request.realtime));
+            }
+            if (request.versionType != null) {
+                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(",")));
+            }
+            if (request.preference != null) {
+                params.put("preference", request.preference);
+            }
+            if (request.refresh != null) {
+                params.put("refresh", String.valueOf(request.refresh));
+            }
+            if (request.source != null) {
+                params.put("_source", request.source._toJsonString());
+            }
+            if (ApiTypeHelper.isDefined(request.sourceExcludes)) {
+                params.put("_source_excludes", request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (ApiTypeHelper.isDefined(request.sourceIncludes)) {
+                params.put("_source_includes", request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.version != null) {
+                params.put("version", String.valueOf(request.version));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetResponse._DESERIALIZER
+    );
+
+    /**
+     * Create an "{@code get}" endpoint.
+     */
+    public static <TDocument> Endpoint<GetRequest, GetResponse<TDocument>, ErrorResponse> createGetEndpoint(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return _ENDPOINT.withResponseDeserializer(GetResponse.createGetResponseDeserializer(tDocumentDeserializer));
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetResponse.java
index a83af7e65f..1c8d50cbc1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetResponse.java
@@ -32,83 +32,86 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch.core.get.GetResult;
+import java.util.function.Function;
+import java.util.function.Supplier;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.NamedDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.get.GetResult;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-import java.util.function.Supplier;
-
 // typedef: _global.get.Response
 
-
 @JsonpDeserializable
 public class GetResponse<TDocument> extends GetResult<TDocument> {
-	// ---------------------------------------------------------------------------------------------
-
-	private GetResponse(Builder<TDocument> builder) {
-		super(builder);
-
-	}
-
-	public static <TDocument> GetResponse<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<GetResponse<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetResponse}.
-	 */
-
-	public static class Builder<TDocument> extends GetResult.AbstractBuilder<TDocument, Builder<TDocument>>
-			implements
-				ObjectBuilder<GetResponse<TDocument>> {
-		@Override
-		protected Builder<TDocument> self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetResponse<TDocument> build() {
-			_checkSingleUse();
-
-			return new GetResponse<TDocument>(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Create a JSON deserializer for GetResponse
-	 */
-	public static <TDocument> JsonpDeserializer<GetResponse<TDocument>> createGetResponseDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return ObjectBuilderDeserializer.createForObject((Supplier<Builder<TDocument>>) Builder::new,
-				op -> GetResponse.setupGetResponseDeserializer(op, tDocumentDeserializer));
-	};
-
-	/**
-	 * Json deserializer for {@link GetResponse} based on named deserializers
-	 * provided by the calling {@code JsonMapper}.
-	 */
-	public static final JsonpDeserializer<GetResponse<Object>> _DESERIALIZER = createGetResponseDeserializer(
-			new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.get.TDocument"));
-
-	protected static <TDocument> void setupGetResponseDeserializer(
-			ObjectDeserializer<GetResponse.Builder<TDocument>> op, JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		GetResult.setupGetResultDeserializer(op, tDocumentDeserializer);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private GetResponse(Builder<TDocument> builder) {
+        super(builder);
+
+    }
+
+    public static <TDocument> GetResponse<TDocument> of(Function<Builder<TDocument>, ObjectBuilder<GetResponse<TDocument>>> fn) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetResponse}.
+     */
+
+    public static class Builder<TDocument> extends GetResult.AbstractBuilder<TDocument, Builder<TDocument>>
+        implements
+            ObjectBuilder<GetResponse<TDocument>> {
+        @Override
+        protected Builder<TDocument> self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetResponse<TDocument> build() {
+            _checkSingleUse();
+
+            return new GetResponse<TDocument>(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Create a JSON deserializer for GetResponse
+     */
+    public static <TDocument> JsonpDeserializer<GetResponse<TDocument>> createGetResponseDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<TDocument>>) Builder::new,
+            op -> GetResponse.setupGetResponseDeserializer(op, tDocumentDeserializer)
+        );
+    };
+
+    /**
+     * Json deserializer for {@link GetResponse} based on named deserializers
+     * provided by the calling {@code JsonMapper}.
+     */
+    public static final JsonpDeserializer<GetResponse<Object>> _DESERIALIZER = createGetResponseDeserializer(
+        new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.get.TDocument")
+    );
+
+    protected static <TDocument> void setupGetResponseDeserializer(
+        ObjectDeserializer<GetResponse.Builder<TDocument>> op,
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        GetResult.setupGetResultDeserializer(op, tDocumentDeserializer);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptContextRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptContextRequest.java
index a17b858385..bad38a971e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptContextRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptContextRequest.java
@@ -32,51 +32,53 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.Collections;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 
-import java.util.Collections;
-
 // typedef: _global.get_script_context.Request
 
 /**
  * Returns all script contexts.
- * 
+ *
  */
 
 public class GetScriptContextRequest extends RequestBase {
-	public GetScriptContextRequest() {
-	}
+    public GetScriptContextRequest() {}
 
-	/**
-	 * Singleton instance for {@link GetScriptContextRequest}.
-	 */
-	public static final GetScriptContextRequest _INSTANCE = new GetScriptContextRequest();
+    /**
+     * Singleton instance for {@link GetScriptContextRequest}.
+     */
+    public static final GetScriptContextRequest _INSTANCE = new GetScriptContextRequest();
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Endpoint "{@code get_script_context}".
-	 */
-	public static final Endpoint<GetScriptContextRequest, GetScriptContextResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+    /**
+     * Endpoint "{@code get_script_context}".
+     */
+    public static final Endpoint<GetScriptContextRequest, GetScriptContextResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
 
-			// Request method
-			request -> {
-				return "GET";
+        // Request method
+        request -> {
+            return "GET";
 
-			},
+        },
 
-			// Request path
-			request -> {
-				return "/_script_context";
+        // Request path
+        request -> {
+            return "/_script_context";
 
-			},
+        },
 
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
 
-			}, SimpleEndpoint.emptyMap(), false, GetScriptContextResponse._DESERIALIZER);
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetScriptContextResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptContextResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptContextResponse.java
index 5df0f16ec1..1a0bf28b8a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptContextResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptContextResponse.java
@@ -32,134 +32,134 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch.core.get_script_context.Context;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.get_script_context.Context;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _global.get_script_context.Response
 
 @JsonpDeserializable
 public class GetScriptContextResponse implements JsonpSerializable {
-	private final List<Context> contexts;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetScriptContextResponse(Builder builder) {
-
-		this.contexts = ApiTypeHelper.unmodifiableRequired(builder.contexts, this, "contexts");
-
-	}
-
-	public static GetScriptContextResponse of(Function<Builder, ObjectBuilder<GetScriptContextResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code contexts}
-	 */
-	public final List<Context> contexts() {
-		return this.contexts;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.contexts)) {
-			generator.writeKey("contexts");
-			generator.writeStartArray();
-			for (Context item0 : this.contexts) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetScriptContextResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetScriptContextResponse> {
-		private List<Context> contexts;
-
-		/**
-		 * Required - API name: {@code contexts}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>contexts</code>.
-		 */
-		public final Builder contexts(List<Context> list) {
-			this.contexts = _listAddAll(this.contexts, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code contexts}
-		 * <p>
-		 * Adds one or more values to <code>contexts</code>.
-		 */
-		public final Builder contexts(Context value, Context... values) {
-			this.contexts = _listAdd(this.contexts, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code contexts}
-		 * <p>
-		 * Adds a value to <code>contexts</code> using a builder lambda.
-		 */
-		public final Builder contexts(Function<Context.Builder, ObjectBuilder<Context>> fn) {
-			return contexts(fn.apply(new Context.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link GetScriptContextResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetScriptContextResponse build() {
-			_checkSingleUse();
-
-			return new GetScriptContextResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetScriptContextResponse}
-	 */
-	public static final JsonpDeserializer<GetScriptContextResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GetScriptContextResponse::setupGetScriptContextResponseDeserializer);
-
-	protected static void setupGetScriptContextResponseDeserializer(
-			ObjectDeserializer<GetScriptContextResponse.Builder> op) {
-
-		op.add(Builder::contexts, JsonpDeserializer.arrayDeserializer(Context._DESERIALIZER), "contexts");
-
-	}
+    private final List<Context> contexts;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetScriptContextResponse(Builder builder) {
+
+        this.contexts = ApiTypeHelper.unmodifiableRequired(builder.contexts, this, "contexts");
+
+    }
+
+    public static GetScriptContextResponse of(Function<Builder, ObjectBuilder<GetScriptContextResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code contexts}
+     */
+    public final List<Context> contexts() {
+        return this.contexts;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.contexts)) {
+            generator.writeKey("contexts");
+            generator.writeStartArray();
+            for (Context item0 : this.contexts) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetScriptContextResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetScriptContextResponse> {
+        private List<Context> contexts;
+
+        /**
+         * Required - API name: {@code contexts}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>contexts</code>.
+         */
+        public final Builder contexts(List<Context> list) {
+            this.contexts = _listAddAll(this.contexts, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code contexts}
+         * <p>
+         * Adds one or more values to <code>contexts</code>.
+         */
+        public final Builder contexts(Context value, Context... values) {
+            this.contexts = _listAdd(this.contexts, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code contexts}
+         * <p>
+         * Adds a value to <code>contexts</code> using a builder lambda.
+         */
+        public final Builder contexts(Function<Context.Builder, ObjectBuilder<Context>> fn) {
+            return contexts(fn.apply(new Context.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link GetScriptContextResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetScriptContextResponse build() {
+            _checkSingleUse();
+
+            return new GetScriptContextResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetScriptContextResponse}
+     */
+    public static final JsonpDeserializer<GetScriptContextResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetScriptContextResponse::setupGetScriptContextResponseDeserializer
+    );
+
+    protected static void setupGetScriptContextResponseDeserializer(ObjectDeserializer<GetScriptContextResponse.Builder> op) {
+
+        op.add(Builder::contexts, JsonpDeserializer.arrayDeserializer(Context._DESERIALIZER), "contexts");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptLanguagesRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptLanguagesRequest.java
index e3b566a709..0b12f7264d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptLanguagesRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptLanguagesRequest.java
@@ -32,51 +32,53 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.Collections;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 
-import java.util.Collections;
-
 // typedef: _global.get_script_languages.Request
 
 /**
  * Returns available script types, languages and contexts
- * 
+ *
  */
 
 public class GetScriptLanguagesRequest extends RequestBase {
-	public GetScriptLanguagesRequest() {
-	}
+    public GetScriptLanguagesRequest() {}
 
-	/**
-	 * Singleton instance for {@link GetScriptLanguagesRequest}.
-	 */
-	public static final GetScriptLanguagesRequest _INSTANCE = new GetScriptLanguagesRequest();
+    /**
+     * Singleton instance for {@link GetScriptLanguagesRequest}.
+     */
+    public static final GetScriptLanguagesRequest _INSTANCE = new GetScriptLanguagesRequest();
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Endpoint "{@code get_script_languages}".
-	 */
-	public static final Endpoint<GetScriptLanguagesRequest, GetScriptLanguagesResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+    /**
+     * Endpoint "{@code get_script_languages}".
+     */
+    public static final Endpoint<GetScriptLanguagesRequest, GetScriptLanguagesResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
 
-			// Request method
-			request -> {
-				return "GET";
+        // Request method
+        request -> {
+            return "GET";
 
-			},
+        },
 
-			// Request path
-			request -> {
-				return "/_script_language";
+        // Request path
+        request -> {
+            return "/_script_language";
 
-			},
+        },
 
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
 
-			}, SimpleEndpoint.emptyMap(), false, GetScriptLanguagesResponse._DESERIALIZER);
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetScriptLanguagesResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptLanguagesResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptLanguagesResponse.java
index dbf4a2a16b..95886a42c6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptLanguagesResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptLanguagesResponse.java
@@ -32,179 +32,177 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch.core.get_script_languages.LanguageContext;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.get_script_languages.LanguageContext;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _global.get_script_languages.Response
 
 @JsonpDeserializable
 public class GetScriptLanguagesResponse implements JsonpSerializable {
-	private final List<LanguageContext> languageContexts;
-
-	private final List<String> typesAllowed;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetScriptLanguagesResponse(Builder builder) {
-
-		this.languageContexts = ApiTypeHelper.unmodifiableRequired(builder.languageContexts, this, "languageContexts");
-		this.typesAllowed = ApiTypeHelper.unmodifiableRequired(builder.typesAllowed, this, "typesAllowed");
-
-	}
-
-	public static GetScriptLanguagesResponse of(Function<Builder, ObjectBuilder<GetScriptLanguagesResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code language_contexts}
-	 */
-	public final List<LanguageContext> languageContexts() {
-		return this.languageContexts;
-	}
-
-	/**
-	 * Required - API name: {@code types_allowed}
-	 */
-	public final List<String> typesAllowed() {
-		return this.typesAllowed;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.languageContexts)) {
-			generator.writeKey("language_contexts");
-			generator.writeStartArray();
-			for (LanguageContext item0 : this.languageContexts) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.typesAllowed)) {
-			generator.writeKey("types_allowed");
-			generator.writeStartArray();
-			for (String item0 : this.typesAllowed) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetScriptLanguagesResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetScriptLanguagesResponse> {
-		private List<LanguageContext> languageContexts;
-
-		private List<String> typesAllowed;
-
-		/**
-		 * Required - API name: {@code language_contexts}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>languageContexts</code>.
-		 */
-		public final Builder languageContexts(List<LanguageContext> list) {
-			this.languageContexts = _listAddAll(this.languageContexts, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code language_contexts}
-		 * <p>
-		 * Adds one or more values to <code>languageContexts</code>.
-		 */
-		public final Builder languageContexts(LanguageContext value, LanguageContext... values) {
-			this.languageContexts = _listAdd(this.languageContexts, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code language_contexts}
-		 * <p>
-		 * Adds a value to <code>languageContexts</code> using a builder lambda.
-		 */
-		public final Builder languageContexts(Function<LanguageContext.Builder, ObjectBuilder<LanguageContext>> fn) {
-			return languageContexts(fn.apply(new LanguageContext.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code types_allowed}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>typesAllowed</code>.
-		 */
-		public final Builder typesAllowed(List<String> list) {
-			this.typesAllowed = _listAddAll(this.typesAllowed, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code types_allowed}
-		 * <p>
-		 * Adds one or more values to <code>typesAllowed</code>.
-		 */
-		public final Builder typesAllowed(String value, String... values) {
-			this.typesAllowed = _listAdd(this.typesAllowed, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetScriptLanguagesResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetScriptLanguagesResponse build() {
-			_checkSingleUse();
-
-			return new GetScriptLanguagesResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetScriptLanguagesResponse}
-	 */
-	public static final JsonpDeserializer<GetScriptLanguagesResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GetScriptLanguagesResponse::setupGetScriptLanguagesResponseDeserializer);
-
-	protected static void setupGetScriptLanguagesResponseDeserializer(
-			ObjectDeserializer<GetScriptLanguagesResponse.Builder> op) {
-
-		op.add(Builder::languageContexts, JsonpDeserializer.arrayDeserializer(LanguageContext._DESERIALIZER),
-				"language_contexts");
-		op.add(Builder::typesAllowed, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"types_allowed");
-
-	}
+    private final List<LanguageContext> languageContexts;
+
+    private final List<String> typesAllowed;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetScriptLanguagesResponse(Builder builder) {
+
+        this.languageContexts = ApiTypeHelper.unmodifiableRequired(builder.languageContexts, this, "languageContexts");
+        this.typesAllowed = ApiTypeHelper.unmodifiableRequired(builder.typesAllowed, this, "typesAllowed");
+
+    }
+
+    public static GetScriptLanguagesResponse of(Function<Builder, ObjectBuilder<GetScriptLanguagesResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code language_contexts}
+     */
+    public final List<LanguageContext> languageContexts() {
+        return this.languageContexts;
+    }
+
+    /**
+     * Required - API name: {@code types_allowed}
+     */
+    public final List<String> typesAllowed() {
+        return this.typesAllowed;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.languageContexts)) {
+            generator.writeKey("language_contexts");
+            generator.writeStartArray();
+            for (LanguageContext item0 : this.languageContexts) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.typesAllowed)) {
+            generator.writeKey("types_allowed");
+            generator.writeStartArray();
+            for (String item0 : this.typesAllowed) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetScriptLanguagesResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetScriptLanguagesResponse> {
+        private List<LanguageContext> languageContexts;
+
+        private List<String> typesAllowed;
+
+        /**
+         * Required - API name: {@code language_contexts}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>languageContexts</code>.
+         */
+        public final Builder languageContexts(List<LanguageContext> list) {
+            this.languageContexts = _listAddAll(this.languageContexts, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code language_contexts}
+         * <p>
+         * Adds one or more values to <code>languageContexts</code>.
+         */
+        public final Builder languageContexts(LanguageContext value, LanguageContext... values) {
+            this.languageContexts = _listAdd(this.languageContexts, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code language_contexts}
+         * <p>
+         * Adds a value to <code>languageContexts</code> using a builder lambda.
+         */
+        public final Builder languageContexts(Function<LanguageContext.Builder, ObjectBuilder<LanguageContext>> fn) {
+            return languageContexts(fn.apply(new LanguageContext.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code types_allowed}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>typesAllowed</code>.
+         */
+        public final Builder typesAllowed(List<String> list) {
+            this.typesAllowed = _listAddAll(this.typesAllowed, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code types_allowed}
+         * <p>
+         * Adds one or more values to <code>typesAllowed</code>.
+         */
+        public final Builder typesAllowed(String value, String... values) {
+            this.typesAllowed = _listAdd(this.typesAllowed, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetScriptLanguagesResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetScriptLanguagesResponse build() {
+            _checkSingleUse();
+
+            return new GetScriptLanguagesResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetScriptLanguagesResponse}
+     */
+    public static final JsonpDeserializer<GetScriptLanguagesResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetScriptLanguagesResponse::setupGetScriptLanguagesResponseDeserializer
+    );
+
+    protected static void setupGetScriptLanguagesResponseDeserializer(ObjectDeserializer<GetScriptLanguagesResponse.Builder> op) {
+
+        op.add(Builder::languageContexts, JsonpDeserializer.arrayDeserializer(LanguageContext._DESERIALIZER), "language_contexts");
+        op.add(Builder::typesAllowed, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "types_allowed");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptRequest.java
index 16d3d0377a..d1f7d338f0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,193 +45,192 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: _global.get_script.Request
 
 /**
  * Returns a script.
- * 
+ *
  */
 
 public class GetScriptRequest extends RequestBase {
-	private final String id;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetScriptRequest(Builder builder) {
-
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-
-	}
-
-	public static GetScriptRequest of(Function<Builder, ObjectBuilder<GetScriptRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Script ID
-	 * <p>
-	 * API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetScriptRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetScriptRequest> {
-		private String id;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		/**
-		 * Required - Script ID
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link GetScriptRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetScriptRequest build() {
-			_checkSingleUse();
-
-			return new GetScriptRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code get_script}".
-	 */
-	public static final Endpoint<GetScriptRequest, GetScriptResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _id = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _id;
-
-				if (propsSet == (_id)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_scripts");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.id, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, GetScriptResponse._DESERIALIZER);
+    private final String id;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetScriptRequest(Builder builder) {
+
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+
+    }
+
+    public static GetScriptRequest of(Function<Builder, ObjectBuilder<GetScriptRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Script ID
+     * <p>
+     * API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetScriptRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetScriptRequest> {
+        private String id;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        /**
+         * Required - Script ID
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link GetScriptRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetScriptRequest build() {
+            _checkSingleUse();
+
+            return new GetScriptRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code get_script}".
+     */
+    public static final Endpoint<GetScriptRequest, GetScriptResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _id = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _id;
+
+            if (propsSet == (_id)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_scripts");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.id, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetScriptResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptResponse.java
index fd8744b101..c7c2868ad9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetScriptResponse.java
@@ -32,164 +32,166 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.StoredScript;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.StoredScript;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.get_script.Response
 
 @JsonpDeserializable
 public class GetScriptResponse implements JsonpSerializable {
-	private final String id;
+    private final String id;
 
-	private final boolean found;
-
-	@Nullable
-	private final StoredScript script;
+    private final boolean found;
+
+    @Nullable
+    private final StoredScript script;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private GetScriptResponse(Builder builder) {
-
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.found = ApiTypeHelper.requireNonNull(builder.found, this, "found");
-		this.script = builder.script;
-
-	}
-
-	public static GetScriptResponse of(Function<Builder, ObjectBuilder<GetScriptResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code _id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - API name: {@code found}
-	 */
-	public final boolean found() {
-		return this.found;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final StoredScript script() {
-		return this.script;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("_id");
-		generator.write(this.id);
-
-		generator.writeKey("found");
-		generator.write(this.found);
-
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetScriptResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetScriptResponse> {
-		private String id;
-
-		private Boolean found;
-
-		@Nullable
-		private StoredScript script;
-
-		/**
-		 * Required - API name: {@code _id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code found}
-		 */
-		public final Builder found(boolean value) {
-			this.found = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(@Nullable StoredScript value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(Function<StoredScript.Builder, ObjectBuilder<StoredScript>> fn) {
-			return this.script(fn.apply(new StoredScript.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link GetScriptResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetScriptResponse build() {
-			_checkSingleUse();
-
-			return new GetScriptResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetScriptResponse}
-	 */
-	public static final JsonpDeserializer<GetScriptResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GetScriptResponse::setupGetScriptResponseDeserializer);
-
-	protected static void setupGetScriptResponseDeserializer(ObjectDeserializer<GetScriptResponse.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
-		op.add(Builder::found, JsonpDeserializer.booleanDeserializer(), "found");
-		op.add(Builder::script, StoredScript._DESERIALIZER, "script");
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private GetScriptResponse(Builder builder) {
+
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.found = ApiTypeHelper.requireNonNull(builder.found, this, "found");
+        this.script = builder.script;
+
+    }
+
+    public static GetScriptResponse of(Function<Builder, ObjectBuilder<GetScriptResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code _id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - API name: {@code found}
+     */
+    public final boolean found() {
+        return this.found;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final StoredScript script() {
+        return this.script;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("_id");
+        generator.write(this.id);
+
+        generator.writeKey("found");
+        generator.write(this.found);
+
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetScriptResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetScriptResponse> {
+        private String id;
+
+        private Boolean found;
+
+        @Nullable
+        private StoredScript script;
+
+        /**
+         * Required - API name: {@code _id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code found}
+         */
+        public final Builder found(boolean value) {
+            this.found = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(@Nullable StoredScript value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(Function<StoredScript.Builder, ObjectBuilder<StoredScript>> fn) {
+            return this.script(fn.apply(new StoredScript.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link GetScriptResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetScriptResponse build() {
+            _checkSingleUse();
+
+            return new GetScriptResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetScriptResponse}
+     */
+    public static final JsonpDeserializer<GetScriptResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetScriptResponse::setupGetScriptResponseDeserializer
+    );
+
+    protected static void setupGetScriptResponseDeserializer(ObjectDeserializer<GetScriptResponse.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(Builder::found, JsonpDeserializer.booleanDeserializer(), "found");
+        op.add(Builder::script, StoredScript._DESERIALIZER, "script");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetSourceRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetSourceRequest.java
index c2912018a6..e83a8a7f99 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetSourceRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetSourceRequest.java
@@ -32,23 +32,22 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.VersionType;
 import org.opensearch.client.opensearch.core.search.SourceConfigParam;
-import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: _global.get_source.Request
 
 /**
@@ -57,485 +56,486 @@
  */
 
 public class GetSourceRequest {
-	@Nullable
-	private final SourceConfigParam source;
-
-	private final List<String> sourceExcludes;
-
-	private final List<String> sourceIncludes;
-
-	private final String id;
-
-	private final String index;
-
-	@Nullable
-	private final String preference;
-
-	@Nullable
-	private final Boolean realtime;
-
-	@Nullable
-	private final Boolean refresh;
-
-	@Nullable
-	private final String routing;
-
-	private final List<String> storedFields;
-
-	@Nullable
-	private final Long version;
-
-	@Nullable
-	private final VersionType versionType;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetSourceRequest(Builder builder) {
-
-		this.source = builder.source;
-		this.sourceExcludes = ApiTypeHelper.unmodifiable(builder.sourceExcludes);
-		this.sourceIncludes = ApiTypeHelper.unmodifiable(builder.sourceIncludes);
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.preference = builder.preference;
-		this.realtime = builder.realtime;
-		this.refresh = builder.refresh;
-		this.routing = builder.routing;
-		this.storedFields = ApiTypeHelper.unmodifiable(builder.storedFields);
-		this.version = builder.version;
-		this.versionType = builder.versionType;
-
-	}
-
-	public static GetSourceRequest of(Function<Builder, ObjectBuilder<GetSourceRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * True or false to return the _source field or not, or a list of fields to
-	 * return.
-	 * <p>
-	 * API name: {@code _source}
-	 */
-	@Nullable
-	public final SourceConfigParam source() {
-		return this.source;
-	}
-
-	/**
-	 * A comma-separated list of source fields to exclude in the response.
-	 * <p>
-	 * API name: {@code _source_excludes}
-	 */
-	public final List<String> sourceExcludes() {
-		return this.sourceExcludes;
-	}
-
-	/**
-	 * A comma-separated list of source fields to include in the response.
-	 * <p>
-	 * API name: {@code _source_includes}
-	 */
-	public final List<String> sourceIncludes() {
-		return this.sourceIncludes;
-	}
-
-	/**
-	 * Required - Unique identifier of the document.
-	 * <p>
-	 * API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - Name of the index that contains the document.
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Specifies the node or shard the operation should be performed on. Random by
-	 * default.
-	 * <p>
-	 * API name: {@code preference}
-	 */
-	@Nullable
-	public final String preference() {
-		return this.preference;
-	}
-
-	/**
-	 * Boolean) If true, the request is real-time as opposed to near-real-time.
-	 * <p>
-	 * API name: {@code realtime}
-	 */
-	@Nullable
-	public final Boolean realtime() {
-		return this.realtime;
-	}
-
-	/**
-	 * If true, Elasticsearch refreshes the affected shards to make this operation
-	 * visible to search. If false, do nothing with refreshes.
-	 * <p>
-	 * API name: {@code refresh}
-	 */
-	@Nullable
-	public final Boolean refresh() {
-		return this.refresh;
-	}
-
-	/**
-	 * Target the specified primary shard.
-	 * <p>
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * API name: {@code stored_fields}
-	 */
-	public final List<String> storedFields() {
-		return this.storedFields;
-	}
-
-	/**
-	 * Explicit version number for concurrency control. The specified version must
-	 * match the current version of the document for the request to succeed.
-	 * <p>
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * Specific version type: internal, external, external_gte.
-	 * <p>
-	 * API name: {@code version_type}
-	 */
-	@Nullable
-	public final VersionType versionType() {
-		return this.versionType;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetSourceRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetSourceRequest> {
-		@Nullable
-		private SourceConfigParam source;
-
-		@Nullable
-		private List<String> sourceExcludes;
-
-		@Nullable
-		private List<String> sourceIncludes;
-
-		private String id;
-
-		private String index;
-
-		@Nullable
-		private String preference;
-
-		@Nullable
-		private Boolean realtime;
-
-		@Nullable
-		private Boolean refresh;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private List<String> storedFields;
-
-		@Nullable
-		private Long version;
-
-		@Nullable
-		private VersionType versionType;
-
-		/**
-		 * True or false to return the _source field or not, or a list of fields to
-		 * return.
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(@Nullable SourceConfigParam value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * True or false to return the _source field or not, or a list of fields to
-		 * return.
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(Function<SourceConfigParam.Builder, ObjectBuilder<SourceConfigParam>> fn) {
-			return this.source(fn.apply(new SourceConfigParam.Builder()).build());
-		}
-
-		/**
-		 * A comma-separated list of source fields to exclude in the response.
-		 * <p>
-		 * API name: {@code _source_excludes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceExcludes</code>.
-		 */
-		public final Builder sourceExcludes(List<String> list) {
-			this.sourceExcludes = _listAddAll(this.sourceExcludes, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of source fields to exclude in the response.
-		 * <p>
-		 * API name: {@code _source_excludes}
-		 * <p>
-		 * Adds one or more values to <code>sourceExcludes</code>.
-		 */
-		public final Builder sourceExcludes(String value, String... values) {
-			this.sourceExcludes = _listAdd(this.sourceExcludes, value, values);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of source fields to include in the response.
-		 * <p>
-		 * API name: {@code _source_includes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceIncludes</code>.
-		 */
-		public final Builder sourceIncludes(List<String> list) {
-			this.sourceIncludes = _listAddAll(this.sourceIncludes, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of source fields to include in the response.
-		 * <p>
-		 * API name: {@code _source_includes}
-		 * <p>
-		 * Adds one or more values to <code>sourceIncludes</code>.
-		 */
-		public final Builder sourceIncludes(String value, String... values) {
-			this.sourceIncludes = _listAdd(this.sourceIncludes, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Unique identifier of the document.
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - Name of the index that contains the document.
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Specifies the node or shard the operation should be performed on. Random by
-		 * default.
-		 * <p>
-		 * API name: {@code preference}
-		 */
-		public final Builder preference(@Nullable String value) {
-			this.preference = value;
-			return this;
-		}
-
-		/**
-		 * Boolean) If true, the request is real-time as opposed to near-real-time.
-		 * <p>
-		 * API name: {@code realtime}
-		 */
-		public final Builder realtime(@Nullable Boolean value) {
-			this.realtime = value;
-			return this;
-		}
-
-		/**
-		 * If true, Elasticsearch refreshes the affected shards to make this operation
-		 * visible to search. If false, do nothing with refreshes.
-		 * <p>
-		 * API name: {@code refresh}
-		 */
-		public final Builder refresh(@Nullable Boolean value) {
-			this.refresh = value;
-			return this;
-		}
-
-		/**
-		 * Target the specified primary shard.
-		 * <p>
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code stored_fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>storedFields</code>.
-		 */
-		public final Builder storedFields(List<String> list) {
-			this.storedFields = _listAddAll(this.storedFields, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stored_fields}
-		 * <p>
-		 * Adds one or more values to <code>storedFields</code>.
-		 */
-		public final Builder storedFields(String value, String... values) {
-			this.storedFields = _listAdd(this.storedFields, value, values);
-			return this;
-		}
-
-		/**
-		 * Explicit version number for concurrency control. The specified version must
-		 * match the current version of the document for the request to succeed.
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Specific version type: internal, external, external_gte.
-		 * <p>
-		 * API name: {@code version_type}
-		 */
-		public final Builder versionType(@Nullable VersionType value) {
-			this.versionType = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetSourceRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetSourceRequest build() {
-			_checkSingleUse();
-
-			return new GetSourceRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code get_source}".
-	 */
-	public static final SimpleEndpoint<GetSourceRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-				final int _id = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-				propsSet |= _id;
-
-				if (propsSet == (_index | _id)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_source");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.id, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.routing != null) {
-					params.put("routing", request.routing);
-				}
-				if (request.realtime != null) {
-					params.put("realtime", String.valueOf(request.realtime));
-				}
-				if (request.versionType != null) {
-					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(",")));
-				}
-				if (request.preference != null) {
-					params.put("preference", request.preference);
-				}
-				if (request.refresh != null) {
-					params.put("refresh", String.valueOf(request.refresh));
-				}
-				if (request.source != null) {
-					params.put("_source", request.source._toJsonString());
-				}
-				if (ApiTypeHelper.isDefined(request.sourceExcludes)) {
-					params.put("_source_excludes",
-							request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (ApiTypeHelper.isDefined(request.sourceIncludes)) {
-					params.put("_source_includes",
-							request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.version != null) {
-					params.put("version", String.valueOf(request.version));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, GetSourceResponse._DESERIALIZER);
-
-	/**
-	 * Create an "{@code get_source}" endpoint.
-	 */
-	public static <TDocument> Endpoint<GetSourceRequest, GetSourceResponse<TDocument>, ErrorResponse> createGetSourceEndpoint(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return _ENDPOINT
-				.withResponseDeserializer(GetSourceResponse.createGetSourceResponseDeserializer(tDocumentDeserializer));
-	}
+    @Nullable
+    private final SourceConfigParam source;
+
+    private final List<String> sourceExcludes;
+
+    private final List<String> sourceIncludes;
+
+    private final String id;
+
+    private final String index;
+
+    @Nullable
+    private final String preference;
+
+    @Nullable
+    private final Boolean realtime;
+
+    @Nullable
+    private final Boolean refresh;
+
+    @Nullable
+    private final String routing;
+
+    private final List<String> storedFields;
+
+    @Nullable
+    private final Long version;
+
+    @Nullable
+    private final VersionType versionType;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetSourceRequest(Builder builder) {
+
+        this.source = builder.source;
+        this.sourceExcludes = ApiTypeHelper.unmodifiable(builder.sourceExcludes);
+        this.sourceIncludes = ApiTypeHelper.unmodifiable(builder.sourceIncludes);
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.preference = builder.preference;
+        this.realtime = builder.realtime;
+        this.refresh = builder.refresh;
+        this.routing = builder.routing;
+        this.storedFields = ApiTypeHelper.unmodifiable(builder.storedFields);
+        this.version = builder.version;
+        this.versionType = builder.versionType;
+
+    }
+
+    public static GetSourceRequest of(Function<Builder, ObjectBuilder<GetSourceRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * True or false to return the _source field or not, or a list of fields to
+     * return.
+     * <p>
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final SourceConfigParam source() {
+        return this.source;
+    }
+
+    /**
+     * A comma-separated list of source fields to exclude in the response.
+     * <p>
+     * API name: {@code _source_excludes}
+     */
+    public final List<String> sourceExcludes() {
+        return this.sourceExcludes;
+    }
+
+    /**
+     * A comma-separated list of source fields to include in the response.
+     * <p>
+     * API name: {@code _source_includes}
+     */
+    public final List<String> sourceIncludes() {
+        return this.sourceIncludes;
+    }
+
+    /**
+     * Required - Unique identifier of the document.
+     * <p>
+     * API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - Name of the index that contains the document.
+     * <p>
+     * API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Specifies the node or shard the operation should be performed on. Random by
+     * default.
+     * <p>
+     * API name: {@code preference}
+     */
+    @Nullable
+    public final String preference() {
+        return this.preference;
+    }
+
+    /**
+     * Boolean) If true, the request is real-time as opposed to near-real-time.
+     * <p>
+     * API name: {@code realtime}
+     */
+    @Nullable
+    public final Boolean realtime() {
+        return this.realtime;
+    }
+
+    /**
+     * If true, Elasticsearch refreshes the affected shards to make this operation
+     * visible to search. If false, do nothing with refreshes.
+     * <p>
+     * API name: {@code refresh}
+     */
+    @Nullable
+    public final Boolean refresh() {
+        return this.refresh;
+    }
+
+    /**
+     * Target the specified primary shard.
+     * <p>
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * API name: {@code stored_fields}
+     */
+    public final List<String> storedFields() {
+        return this.storedFields;
+    }
+
+    /**
+     * Explicit version number for concurrency control. The specified version must
+     * match the current version of the document for the request to succeed.
+     * <p>
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * Specific version type: internal, external, external_gte.
+     * <p>
+     * API name: {@code version_type}
+     */
+    @Nullable
+    public final VersionType versionType() {
+        return this.versionType;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetSourceRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetSourceRequest> {
+        @Nullable
+        private SourceConfigParam source;
+
+        @Nullable
+        private List<String> sourceExcludes;
+
+        @Nullable
+        private List<String> sourceIncludes;
+
+        private String id;
+
+        private String index;
+
+        @Nullable
+        private String preference;
+
+        @Nullable
+        private Boolean realtime;
+
+        @Nullable
+        private Boolean refresh;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private List<String> storedFields;
+
+        @Nullable
+        private Long version;
+
+        @Nullable
+        private VersionType versionType;
+
+        /**
+         * True or false to return the _source field or not, or a list of fields to
+         * return.
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(@Nullable SourceConfigParam value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * True or false to return the _source field or not, or a list of fields to
+         * return.
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(Function<SourceConfigParam.Builder, ObjectBuilder<SourceConfigParam>> fn) {
+            return this.source(fn.apply(new SourceConfigParam.Builder()).build());
+        }
+
+        /**
+         * A comma-separated list of source fields to exclude in the response.
+         * <p>
+         * API name: {@code _source_excludes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceExcludes</code>.
+         */
+        public final Builder sourceExcludes(List<String> list) {
+            this.sourceExcludes = _listAddAll(this.sourceExcludes, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of source fields to exclude in the response.
+         * <p>
+         * API name: {@code _source_excludes}
+         * <p>
+         * Adds one or more values to <code>sourceExcludes</code>.
+         */
+        public final Builder sourceExcludes(String value, String... values) {
+            this.sourceExcludes = _listAdd(this.sourceExcludes, value, values);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of source fields to include in the response.
+         * <p>
+         * API name: {@code _source_includes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceIncludes</code>.
+         */
+        public final Builder sourceIncludes(List<String> list) {
+            this.sourceIncludes = _listAddAll(this.sourceIncludes, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of source fields to include in the response.
+         * <p>
+         * API name: {@code _source_includes}
+         * <p>
+         * Adds one or more values to <code>sourceIncludes</code>.
+         */
+        public final Builder sourceIncludes(String value, String... values) {
+            this.sourceIncludes = _listAdd(this.sourceIncludes, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Unique identifier of the document.
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - Name of the index that contains the document.
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Specifies the node or shard the operation should be performed on. Random by
+         * default.
+         * <p>
+         * API name: {@code preference}
+         */
+        public final Builder preference(@Nullable String value) {
+            this.preference = value;
+            return this;
+        }
+
+        /**
+         * Boolean) If true, the request is real-time as opposed to near-real-time.
+         * <p>
+         * API name: {@code realtime}
+         */
+        public final Builder realtime(@Nullable Boolean value) {
+            this.realtime = value;
+            return this;
+        }
+
+        /**
+         * If true, Elasticsearch refreshes the affected shards to make this operation
+         * visible to search. If false, do nothing with refreshes.
+         * <p>
+         * API name: {@code refresh}
+         */
+        public final Builder refresh(@Nullable Boolean value) {
+            this.refresh = value;
+            return this;
+        }
+
+        /**
+         * Target the specified primary shard.
+         * <p>
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code stored_fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>storedFields</code>.
+         */
+        public final Builder storedFields(List<String> list) {
+            this.storedFields = _listAddAll(this.storedFields, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code stored_fields}
+         * <p>
+         * Adds one or more values to <code>storedFields</code>.
+         */
+        public final Builder storedFields(String value, String... values) {
+            this.storedFields = _listAdd(this.storedFields, value, values);
+            return this;
+        }
+
+        /**
+         * Explicit version number for concurrency control. The specified version must
+         * match the current version of the document for the request to succeed.
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Specific version type: internal, external, external_gte.
+         * <p>
+         * API name: {@code version_type}
+         */
+        public final Builder versionType(@Nullable VersionType value) {
+            this.versionType = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetSourceRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetSourceRequest build() {
+            _checkSingleUse();
+
+            return new GetSourceRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code get_source}".
+     */
+    public static final SimpleEndpoint<GetSourceRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+            final int _id = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+            propsSet |= _id;
+
+            if (propsSet == (_index | _id)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_source");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.id, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            if (request.realtime != null) {
+                params.put("realtime", String.valueOf(request.realtime));
+            }
+            if (request.versionType != null) {
+                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(",")));
+            }
+            if (request.preference != null) {
+                params.put("preference", request.preference);
+            }
+            if (request.refresh != null) {
+                params.put("refresh", String.valueOf(request.refresh));
+            }
+            if (request.source != null) {
+                params.put("_source", request.source._toJsonString());
+            }
+            if (ApiTypeHelper.isDefined(request.sourceExcludes)) {
+                params.put("_source_excludes", request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (ApiTypeHelper.isDefined(request.sourceIncludes)) {
+                params.put("_source_includes", request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.version != null) {
+                params.put("version", String.valueOf(request.version));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetSourceResponse._DESERIALIZER
+    );
+
+    /**
+     * Create an "{@code get_source}" endpoint.
+     */
+    public static <TDocument> Endpoint<GetSourceRequest, GetSourceResponse<TDocument>, ErrorResponse> createGetSourceEndpoint(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return _ENDPOINT.withResponseDeserializer(GetSourceResponse.createGetSourceResponseDeserializer(tDocumentDeserializer));
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetSourceResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetSourceResponse.java
index 98e6230228..c04020c082 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetSourceResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetSourceResponse.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,112 +45,110 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.get_source.Response
 
-
 @JsonpDeserializable
 public class GetSourceResponse<TDocument> implements JsonpSerializable {
-	private final TDocument valueBody;
-
-	@Nullable
-	private final JsonpSerializer<TDocument> tDocumentSerializer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetSourceResponse(Builder<TDocument> builder) {
-
-		this.valueBody = ApiTypeHelper.requireNonNull(builder.valueBody, this, "valueBody");
-		this.tDocumentSerializer = builder.tDocumentSerializer;
-
-	}
-
-	public static <TDocument> GetSourceResponse<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<GetSourceResponse<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final TDocument valueBody() {
-		return this.valueBody;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		JsonpUtils.serialize(this.valueBody, generator, tDocumentSerializer, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetSourceResponse}.
-	 */
-
-	public static class Builder<TDocument> extends ObjectBuilderBase
-			implements
-				ObjectBuilder<GetSourceResponse<TDocument>> {
-		private TDocument valueBody;
-
-		@Nullable
-		private JsonpSerializer<TDocument> tDocumentSerializer;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 */
-		public final Builder<TDocument> valueBody(TDocument value) {
-			this.valueBody = value;
-			return this;
-		}
-
-		/**
-		 * Serializer for TDocument. If not set, an attempt will be made to find a
-		 * serializer from the JSON context.
-		 */
-		public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
-			this.tDocumentSerializer = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetSourceResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetSourceResponse<TDocument> build() {
-			_checkSingleUse();
-
-			return new GetSourceResponse<TDocument>(this);
-		}
-	}
-
-	/**
-	 * Json deserializer for {@link GetSourceResponse} based on named deserializers
-	 * provided by the calling {@code JsonMapper}.
-	 */
-	public static final JsonpDeserializer<GetSourceResponse<Object>> _DESERIALIZER = createGetSourceResponseDeserializer(
-			new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.get_source.TDocument"));
-
-	public static <TDocument> JsonpDeserializer<GetSourceResponse<TDocument>> createGetSourceResponseDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-
-		JsonpDeserializer<TDocument> valueDeserializer = tDocumentDeserializer;
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(), (parser, mapper) -> new Builder<TDocument>()
-				.valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+    private final TDocument valueBody;
+
+    @Nullable
+    private final JsonpSerializer<TDocument> tDocumentSerializer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetSourceResponse(Builder<TDocument> builder) {
+
+        this.valueBody = ApiTypeHelper.requireNonNull(builder.valueBody, this, "valueBody");
+        this.tDocumentSerializer = builder.tDocumentSerializer;
+
+    }
+
+    public static <TDocument> GetSourceResponse<TDocument> of(
+        Function<Builder<TDocument>, ObjectBuilder<GetSourceResponse<TDocument>>> fn
+    ) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final TDocument valueBody() {
+        return this.valueBody;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        JsonpUtils.serialize(this.valueBody, generator, tDocumentSerializer, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetSourceResponse}.
+     */
+
+    public static class Builder<TDocument> extends ObjectBuilderBase implements ObjectBuilder<GetSourceResponse<TDocument>> {
+        private TDocument valueBody;
+
+        @Nullable
+        private JsonpSerializer<TDocument> tDocumentSerializer;
+
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         */
+        public final Builder<TDocument> valueBody(TDocument value) {
+            this.valueBody = value;
+            return this;
+        }
+
+        /**
+         * Serializer for TDocument. If not set, an attempt will be made to find a
+         * serializer from the JSON context.
+         */
+        public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
+            this.tDocumentSerializer = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetSourceResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetSourceResponse<TDocument> build() {
+            _checkSingleUse();
+
+            return new GetSourceResponse<TDocument>(this);
+        }
+    }
+
+    /**
+     * Json deserializer for {@link GetSourceResponse} based on named deserializers
+     * provided by the calling {@code JsonMapper}.
+     */
+    public static final JsonpDeserializer<GetSourceResponse<Object>> _DESERIALIZER = createGetSourceResponseDeserializer(
+        new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.get_source.TDocument")
+    );
+
+    public static <TDocument> JsonpDeserializer<GetSourceResponse<TDocument>> createGetSourceResponseDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+
+        JsonpDeserializer<TDocument> valueDeserializer = tDocumentDeserializer;
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder<TDocument>().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/IndexRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/IndexRequest.java
index f0622b847e..935e2a02ff 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/IndexRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/IndexRequest.java
@@ -32,6 +32,16 @@
 
 package org.opensearch.client.opensearch.core;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.json.JsonpSerializer;
+import org.opensearch.client.json.JsonpUtils;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.OpType;
 import org.opensearch.client.opensearch._types.Refresh;
@@ -39,22 +49,11 @@
 import org.opensearch.client.opensearch._types.Time;
 import org.opensearch.client.opensearch._types.VersionType;
 import org.opensearch.client.opensearch._types.WaitForActiveShards;
-import org.opensearch.client.json.JsonpDeserializer;
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
-import org.opensearch.client.json.JsonpSerializer;
-import org.opensearch.client.json.JsonpUtils;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.index.Request
 
@@ -64,582 +63,583 @@
  */
 
 public class IndexRequest<TDocument> extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final String id;
-
-	@Nullable
-	private final Long ifPrimaryTerm;
-
-	@Nullable
-	private final Long ifSeqNo;
-
-	private final String index;
-
-	@Nullable
-	private final OpType opType;
-
-	@Nullable
-	private final String pipeline;
-
-	@Nullable
-	private final Refresh refresh;
-
-	@Nullable
-	private final Boolean requireAlias;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final Long version;
-
-	@Nullable
-	private final VersionType versionType;
-
-	@Nullable
-	private final WaitForActiveShards waitForActiveShards;
-
-	private final TDocument document;
-
-	@Nullable
-	private final JsonpSerializer<TDocument> tDocumentSerializer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexRequest(Builder<TDocument> builder) {
-
-		this.id = builder.id;
-		this.ifPrimaryTerm = builder.ifPrimaryTerm;
-		this.ifSeqNo = builder.ifSeqNo;
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.opType = builder.opType;
-		this.pipeline = builder.pipeline;
-		this.refresh = builder.refresh;
-		this.requireAlias = builder.requireAlias;
-		this.routing = builder.routing;
-		this.timeout = builder.timeout;
-		this.version = builder.version;
-		this.versionType = builder.versionType;
-		this.waitForActiveShards = builder.waitForActiveShards;
-		this.document = ApiTypeHelper.requireNonNull(builder.document, this, "document");
-		this.tDocumentSerializer = builder.tDocumentSerializer;
-
-	}
-
-	public static <TDocument> IndexRequest<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<IndexRequest<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * Document ID
-	 * <p>
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * only perform the index operation if the last operation that has changed the
-	 * document has the specified primary term
-	 * <p>
-	 * API name: {@code if_primary_term}
-	 */
-	@Nullable
-	public final Long ifPrimaryTerm() {
-		return this.ifPrimaryTerm;
-	}
-
-	/**
-	 * only perform the index operation if the last operation that has changed the
-	 * document has the specified sequence number
-	 * <p>
-	 * API name: {@code if_seq_no}
-	 */
-	@Nullable
-	public final Long ifSeqNo() {
-		return this.ifSeqNo;
-	}
-
-	/**
-	 * Required - The name of the index
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Explicit operation type. Defaults to <code>index</code> for requests with an
-	 * explicit document ID, and to <code>create</code>for requests without an
-	 * explicit document ID
-	 * <p>
-	 * API name: {@code op_type}
-	 */
-	@Nullable
-	public final OpType opType() {
-		return this.opType;
-	}
-
-	/**
-	 * The pipeline id to preprocess incoming documents with
-	 * <p>
-	 * API name: {@code pipeline}
-	 */
-	@Nullable
-	public final String pipeline() {
-		return this.pipeline;
-	}
-
-	/**
-	 * If <code>true</code> then refresh the affected shards to make this operation
-	 * visible to search, if <code>wait_for</code> then wait for a refresh to make
-	 * this operation visible to search, if <code>false</code> (the default) then do
-	 * nothing with refreshes.
-	 * <p>
-	 * API name: {@code refresh}
-	 */
-	@Nullable
-	public final Refresh refresh() {
-		return this.refresh;
-	}
-
-	/**
-	 * When true, requires destination to be an alias. Default is false
-	 * <p>
-	 * API name: {@code require_alias}
-	 */
-	@Nullable
-	public final Boolean requireAlias() {
-		return this.requireAlias;
-	}
-
-	/**
-	 * Specific routing value
-	 * <p>
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Explicit version number for concurrency control
-	 * <p>
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * Specific version type
-	 * <p>
-	 * API name: {@code version_type}
-	 */
-	@Nullable
-	public final VersionType versionType() {
-		return this.versionType;
-	}
-
-	/**
-	 * Sets the number of shard copies that must be active before proceeding with
-	 * the index operation. Defaults to 1, meaning the primary shard only. Set to
-	 * <code>all</code> for all shard copies, otherwise set to any non-negative
-	 * value less than or equal to the total number of copies for the shard (number
-	 * of replicas + 1)
-	 * <p>
-	 * API name: {@code wait_for_active_shards}
-	 */
-	@Nullable
-	public final WaitForActiveShards waitForActiveShards() {
-		return this.waitForActiveShards;
-	}
-
-	/**
-	 * Required - Request body.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final TDocument document() {
-		return this.document;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		JsonpUtils.serialize(this.document, generator, tDocumentSerializer, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexRequest}.
-	 */
-
-	public static class Builder<TDocument> extends ObjectBuilderBase implements ObjectBuilder<IndexRequest<TDocument>> {
-		@Nullable
-		private String id;
-
-		@Nullable
-		private Long ifPrimaryTerm;
-
-		@Nullable
-		private Long ifSeqNo;
-
-		private String index;
-
-		@Nullable
-		private OpType opType;
-
-		@Nullable
-		private String pipeline;
-
-		@Nullable
-		private Refresh refresh;
-
-		@Nullable
-		private Boolean requireAlias;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private Long version;
-
-		@Nullable
-		private VersionType versionType;
-
-		@Nullable
-		private WaitForActiveShards waitForActiveShards;
-
-		private TDocument document;
-
-		@Nullable
-		private JsonpSerializer<TDocument> tDocumentSerializer;
-
-		/**
-		 * Document ID
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder<TDocument> id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * only perform the index operation if the last operation that has changed the
-		 * document has the specified primary term
-		 * <p>
-		 * API name: {@code if_primary_term}
-		 */
-		public final Builder<TDocument> ifPrimaryTerm(@Nullable Long value) {
-			this.ifPrimaryTerm = value;
-			return this;
-		}
-
-		/**
-		 * only perform the index operation if the last operation that has changed the
-		 * document has the specified sequence number
-		 * <p>
-		 * API name: {@code if_seq_no}
-		 */
-		public final Builder<TDocument> ifSeqNo(@Nullable Long value) {
-			this.ifSeqNo = value;
-			return this;
-		}
-
-		/**
-		 * Required - The name of the index
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder<TDocument> index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation type. Defaults to <code>index</code> for requests with an
-		 * explicit document ID, and to <code>create</code>for requests without an
-		 * explicit document ID
-		 * <p>
-		 * API name: {@code op_type}
-		 */
-		public final Builder<TDocument> opType(@Nullable OpType value) {
-			this.opType = value;
-			return this;
-		}
-
-		/**
-		 * The pipeline id to preprocess incoming documents with
-		 * <p>
-		 * API name: {@code pipeline}
-		 */
-		public final Builder<TDocument> pipeline(@Nullable String value) {
-			this.pipeline = value;
-			return this;
-		}
-
-		/**
-		 * If <code>true</code> then refresh the affected shards to make this operation
-		 * visible to search, if <code>wait_for</code> then wait for a refresh to make
-		 * this operation visible to search, if <code>false</code> (the default) then do
-		 * nothing with refreshes.
-		 * <p>
-		 * API name: {@code refresh}
-		 */
-		public final Builder<TDocument> refresh(@Nullable Refresh value) {
-			this.refresh = value;
-			return this;
-		}
-
-		/**
-		 * When true, requires destination to be an alias. Default is false
-		 * <p>
-		 * API name: {@code require_alias}
-		 */
-		public final Builder<TDocument> requireAlias(@Nullable Boolean value) {
-			this.requireAlias = value;
-			return this;
-		}
-
-		/**
-		 * Specific routing value
-		 * <p>
-		 * API name: {@code routing}
-		 */
-		public final Builder<TDocument> routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder<TDocument> timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder<TDocument> timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit version number for concurrency control
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder<TDocument> version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Specific version type
-		 * <p>
-		 * API name: {@code version_type}
-		 */
-		public final Builder<TDocument> versionType(@Nullable VersionType value) {
-			this.versionType = value;
-			return this;
-		}
-
-		/**
-		 * Sets the number of shard copies that must be active before proceeding with
-		 * the index operation. Defaults to 1, meaning the primary shard only. Set to
-		 * <code>all</code> for all shard copies, otherwise set to any non-negative
-		 * value less than or equal to the total number of copies for the shard (number
-		 * of replicas + 1)
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder<TDocument> waitForActiveShards(@Nullable WaitForActiveShards value) {
-			this.waitForActiveShards = value;
-			return this;
-		}
-
-		/**
-		 * Sets the number of shard copies that must be active before proceeding with
-		 * the index operation. Defaults to 1, meaning the primary shard only. Set to
-		 * <code>all</code> for all shard copies, otherwise set to any non-negative
-		 * value less than or equal to the total number of copies for the shard (number
-		 * of replicas + 1)
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder<TDocument> waitForActiveShards(
-				Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
-			return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
-		}
-
-		/**
-		 * Required - Request body.
-		 * <p>
-		 * API name: {@code _value_body}
-		 */
-		public final Builder<TDocument> document(TDocument value) {
-			this.document = value;
-			return this;
-		}
-
-		/**
-		 * Serializer for TDocument. If not set, an attempt will be made to find a
-		 * serializer from the JSON context.
-		 */
-		public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
-			this.tDocumentSerializer = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IndexRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexRequest<TDocument> build() {
-			_checkSingleUse();
-
-			return new IndexRequest<TDocument>(this);
-		}
-	}
-
-	public static <TDocument> JsonpDeserializer<IndexRequest<TDocument>> createIndexRequestDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-
-		JsonpDeserializer<TDocument> valueDeserializer = tDocumentDeserializer;
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(), (parser, mapper) -> new Builder<TDocument>()
-				.document(valueDeserializer.deserialize(parser, mapper)).build());
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code index}".
-	 */
-	public static final Endpoint<IndexRequest<?>, IndexResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				final int _index = 1 << 0;
-				final int _id = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-				if (request.id() != null)
-					propsSet |= _id;
-
-				if (propsSet == (_index | _id))
-					return "PUT";
-				if (propsSet == (_index))
-					return "POST";
-				throw SimpleEndpoint.noPathTemplateFound("method");
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-				final int _id = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-				if (request.id() != null)
-					propsSet |= _id;
-
-				if (propsSet == (_index | _id)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_doc");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.id, buf);
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_doc");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.pipeline != null) {
-					params.put("pipeline", request.pipeline);
-				}
-				if (request.routing != null) {
-					params.put("routing", request.routing);
-				}
-				if (request.requireAlias != null) {
-					params.put("require_alias", String.valueOf(request.requireAlias));
-				}
-				if (request.versionType != null) {
-					params.put("version_type", request.versionType.jsonValue());
-				}
-				if (request.ifPrimaryTerm != null) {
-					params.put("if_primary_term", String.valueOf(request.ifPrimaryTerm));
-				}
-				if (request.ifSeqNo != null) {
-					params.put("if_seq_no", String.valueOf(request.ifSeqNo));
-				}
-				if (request.refresh != null) {
-					params.put("refresh", request.refresh.jsonValue());
-				}
-				if (request.waitForActiveShards != null) {
-					params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
-				}
-				if (request.opType != null) {
-					params.put("op_type", request.opType.jsonValue());
-				}
-				if (request.version != null) {
-					params.put("version", String.valueOf(request.version));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, IndexResponse._DESERIALIZER);
+    @Nullable
+    private final String id;
+
+    @Nullable
+    private final Long ifPrimaryTerm;
+
+    @Nullable
+    private final Long ifSeqNo;
+
+    private final String index;
+
+    @Nullable
+    private final OpType opType;
+
+    @Nullable
+    private final String pipeline;
+
+    @Nullable
+    private final Refresh refresh;
+
+    @Nullable
+    private final Boolean requireAlias;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final Long version;
+
+    @Nullable
+    private final VersionType versionType;
+
+    @Nullable
+    private final WaitForActiveShards waitForActiveShards;
+
+    private final TDocument document;
+
+    @Nullable
+    private final JsonpSerializer<TDocument> tDocumentSerializer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexRequest(Builder<TDocument> builder) {
+
+        this.id = builder.id;
+        this.ifPrimaryTerm = builder.ifPrimaryTerm;
+        this.ifSeqNo = builder.ifSeqNo;
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.opType = builder.opType;
+        this.pipeline = builder.pipeline;
+        this.refresh = builder.refresh;
+        this.requireAlias = builder.requireAlias;
+        this.routing = builder.routing;
+        this.timeout = builder.timeout;
+        this.version = builder.version;
+        this.versionType = builder.versionType;
+        this.waitForActiveShards = builder.waitForActiveShards;
+        this.document = ApiTypeHelper.requireNonNull(builder.document, this, "document");
+        this.tDocumentSerializer = builder.tDocumentSerializer;
+
+    }
+
+    public static <TDocument> IndexRequest<TDocument> of(Function<Builder<TDocument>, ObjectBuilder<IndexRequest<TDocument>>> fn) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * Document ID
+     * <p>
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * only perform the index operation if the last operation that has changed the
+     * document has the specified primary term
+     * <p>
+     * API name: {@code if_primary_term}
+     */
+    @Nullable
+    public final Long ifPrimaryTerm() {
+        return this.ifPrimaryTerm;
+    }
+
+    /**
+     * only perform the index operation if the last operation that has changed the
+     * document has the specified sequence number
+     * <p>
+     * API name: {@code if_seq_no}
+     */
+    @Nullable
+    public final Long ifSeqNo() {
+        return this.ifSeqNo;
+    }
+
+    /**
+     * Required - The name of the index
+     * <p>
+     * API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Explicit operation type. Defaults to <code>index</code> for requests with an
+     * explicit document ID, and to <code>create</code>for requests without an
+     * explicit document ID
+     * <p>
+     * API name: {@code op_type}
+     */
+    @Nullable
+    public final OpType opType() {
+        return this.opType;
+    }
+
+    /**
+     * The pipeline id to preprocess incoming documents with
+     * <p>
+     * API name: {@code pipeline}
+     */
+    @Nullable
+    public final String pipeline() {
+        return this.pipeline;
+    }
+
+    /**
+     * If <code>true</code> then refresh the affected shards to make this operation
+     * visible to search, if <code>wait_for</code> then wait for a refresh to make
+     * this operation visible to search, if <code>false</code> (the default) then do
+     * nothing with refreshes.
+     * <p>
+     * API name: {@code refresh}
+     */
+    @Nullable
+    public final Refresh refresh() {
+        return this.refresh;
+    }
+
+    /**
+     * When true, requires destination to be an alias. Default is false
+     * <p>
+     * API name: {@code require_alias}
+     */
+    @Nullable
+    public final Boolean requireAlias() {
+        return this.requireAlias;
+    }
+
+    /**
+     * Specific routing value
+     * <p>
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Explicit version number for concurrency control
+     * <p>
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * Specific version type
+     * <p>
+     * API name: {@code version_type}
+     */
+    @Nullable
+    public final VersionType versionType() {
+        return this.versionType;
+    }
+
+    /**
+     * Sets the number of shard copies that must be active before proceeding with
+     * the index operation. Defaults to 1, meaning the primary shard only. Set to
+     * <code>all</code> for all shard copies, otherwise set to any non-negative
+     * value less than or equal to the total number of copies for the shard (number
+     * of replicas + 1)
+     * <p>
+     * API name: {@code wait_for_active_shards}
+     */
+    @Nullable
+    public final WaitForActiveShards waitForActiveShards() {
+        return this.waitForActiveShards;
+    }
+
+    /**
+     * Required - Request body.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final TDocument document() {
+        return this.document;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        JsonpUtils.serialize(this.document, generator, tDocumentSerializer, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexRequest}.
+     */
+
+    public static class Builder<TDocument> extends ObjectBuilderBase implements ObjectBuilder<IndexRequest<TDocument>> {
+        @Nullable
+        private String id;
+
+        @Nullable
+        private Long ifPrimaryTerm;
+
+        @Nullable
+        private Long ifSeqNo;
+
+        private String index;
+
+        @Nullable
+        private OpType opType;
+
+        @Nullable
+        private String pipeline;
+
+        @Nullable
+        private Refresh refresh;
+
+        @Nullable
+        private Boolean requireAlias;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private Long version;
+
+        @Nullable
+        private VersionType versionType;
+
+        @Nullable
+        private WaitForActiveShards waitForActiveShards;
+
+        private TDocument document;
+
+        @Nullable
+        private JsonpSerializer<TDocument> tDocumentSerializer;
+
+        /**
+         * Document ID
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder<TDocument> id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * only perform the index operation if the last operation that has changed the
+         * document has the specified primary term
+         * <p>
+         * API name: {@code if_primary_term}
+         */
+        public final Builder<TDocument> ifPrimaryTerm(@Nullable Long value) {
+            this.ifPrimaryTerm = value;
+            return this;
+        }
+
+        /**
+         * only perform the index operation if the last operation that has changed the
+         * document has the specified sequence number
+         * <p>
+         * API name: {@code if_seq_no}
+         */
+        public final Builder<TDocument> ifSeqNo(@Nullable Long value) {
+            this.ifSeqNo = value;
+            return this;
+        }
+
+        /**
+         * Required - The name of the index
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder<TDocument> index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation type. Defaults to <code>index</code> for requests with an
+         * explicit document ID, and to <code>create</code>for requests without an
+         * explicit document ID
+         * <p>
+         * API name: {@code op_type}
+         */
+        public final Builder<TDocument> opType(@Nullable OpType value) {
+            this.opType = value;
+            return this;
+        }
+
+        /**
+         * The pipeline id to preprocess incoming documents with
+         * <p>
+         * API name: {@code pipeline}
+         */
+        public final Builder<TDocument> pipeline(@Nullable String value) {
+            this.pipeline = value;
+            return this;
+        }
+
+        /**
+         * If <code>true</code> then refresh the affected shards to make this operation
+         * visible to search, if <code>wait_for</code> then wait for a refresh to make
+         * this operation visible to search, if <code>false</code> (the default) then do
+         * nothing with refreshes.
+         * <p>
+         * API name: {@code refresh}
+         */
+        public final Builder<TDocument> refresh(@Nullable Refresh value) {
+            this.refresh = value;
+            return this;
+        }
+
+        /**
+         * When true, requires destination to be an alias. Default is false
+         * <p>
+         * API name: {@code require_alias}
+         */
+        public final Builder<TDocument> requireAlias(@Nullable Boolean value) {
+            this.requireAlias = value;
+            return this;
+        }
+
+        /**
+         * Specific routing value
+         * <p>
+         * API name: {@code routing}
+         */
+        public final Builder<TDocument> routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder<TDocument> timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder<TDocument> timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit version number for concurrency control
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder<TDocument> version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Specific version type
+         * <p>
+         * API name: {@code version_type}
+         */
+        public final Builder<TDocument> versionType(@Nullable VersionType value) {
+            this.versionType = value;
+            return this;
+        }
+
+        /**
+         * Sets the number of shard copies that must be active before proceeding with
+         * the index operation. Defaults to 1, meaning the primary shard only. Set to
+         * <code>all</code> for all shard copies, otherwise set to any non-negative
+         * value less than or equal to the total number of copies for the shard (number
+         * of replicas + 1)
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder<TDocument> waitForActiveShards(@Nullable WaitForActiveShards value) {
+            this.waitForActiveShards = value;
+            return this;
+        }
+
+        /**
+         * Sets the number of shard copies that must be active before proceeding with
+         * the index operation. Defaults to 1, meaning the primary shard only. Set to
+         * <code>all</code> for all shard copies, otherwise set to any non-negative
+         * value less than or equal to the total number of copies for the shard (number
+         * of replicas + 1)
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder<TDocument> waitForActiveShards(Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
+            return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
+        }
+
+        /**
+         * Required - Request body.
+         * <p>
+         * API name: {@code _value_body}
+         */
+        public final Builder<TDocument> document(TDocument value) {
+            this.document = value;
+            return this;
+        }
+
+        /**
+         * Serializer for TDocument. If not set, an attempt will be made to find a
+         * serializer from the JSON context.
+         */
+        public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
+            this.tDocumentSerializer = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link IndexRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexRequest<TDocument> build() {
+            _checkSingleUse();
+
+            return new IndexRequest<TDocument>(this);
+        }
+    }
+
+    public static <TDocument> JsonpDeserializer<IndexRequest<TDocument>> createIndexRequestDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+
+        JsonpDeserializer<TDocument> valueDeserializer = tDocumentDeserializer;
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder<TDocument>().document(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code index}".
+     */
+    public static final Endpoint<IndexRequest<?>, IndexResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            final int _index = 1 << 0;
+            final int _id = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+            if (request.id() != null) propsSet |= _id;
+
+            if (propsSet == (_index | _id)) return "PUT";
+            if (propsSet == (_index)) return "POST";
+            throw SimpleEndpoint.noPathTemplateFound("method");
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+            final int _id = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+            if (request.id() != null) propsSet |= _id;
+
+            if (propsSet == (_index | _id)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_doc");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.id, buf);
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_doc");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.pipeline != null) {
+                params.put("pipeline", request.pipeline);
+            }
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            if (request.requireAlias != null) {
+                params.put("require_alias", String.valueOf(request.requireAlias));
+            }
+            if (request.versionType != null) {
+                params.put("version_type", request.versionType.jsonValue());
+            }
+            if (request.ifPrimaryTerm != null) {
+                params.put("if_primary_term", String.valueOf(request.ifPrimaryTerm));
+            }
+            if (request.ifSeqNo != null) {
+                params.put("if_seq_no", String.valueOf(request.ifSeqNo));
+            }
+            if (request.refresh != null) {
+                params.put("refresh", request.refresh.jsonValue());
+            }
+            if (request.waitForActiveShards != null) {
+                params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
+            }
+            if (request.opType != null) {
+                params.put("op_type", request.opType.jsonValue());
+            }
+            if (request.version != null) {
+                params.put("version", String.valueOf(request.version));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        IndexResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/IndexResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/IndexResponse.java
index 46976fdfff..acfab3a7c1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/IndexResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/IndexResponse.java
@@ -32,69 +32,67 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.WriteResponseBase;
+import java.util.function.Function;
 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.WriteResponseBase;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _global.index.Response
 
-
 @JsonpDeserializable
 public class IndexResponse extends WriteResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private IndexResponse(Builder builder) {
-		super(builder);
+    private IndexResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static IndexResponse of(Function<Builder, ObjectBuilder<IndexResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static IndexResponse of(Function<Builder, ObjectBuilder<IndexResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link IndexResponse}.
-	 */
+    /**
+     * Builder for {@link IndexResponse}.
+     */
 
-	public static class Builder extends WriteResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<IndexResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends WriteResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<IndexResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link IndexResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link IndexResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexResponse build() {
+            _checkSingleUse();
 
-			return new IndexResponse(this);
-		}
-	}
+            return new IndexResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link IndexResponse}
-	 */
-	public static final JsonpDeserializer<IndexResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IndexResponse::setupIndexResponseDeserializer);
+    /**
+     * Json deserializer for {@link IndexResponse}
+     */
+    public static final JsonpDeserializer<IndexResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexResponse::setupIndexResponseDeserializer
+    );
 
-	protected static void setupIndexResponseDeserializer(ObjectDeserializer<IndexResponse.Builder> op) {
-		WriteResponseBase.setupWriteResponseBaseDeserializer(op);
+    protected static void setupIndexResponseDeserializer(ObjectDeserializer<IndexResponse.Builder> op) {
+        WriteResponseBase.setupWriteResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/InfoRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/InfoRequest.java
index 8b98380ba8..dea60eaaf1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/InfoRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/InfoRequest.java
@@ -32,13 +32,12 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.Collections;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 
-import java.util.Collections;
-
 // typedef: _global.info.Request
 
 /**
@@ -47,36 +46,39 @@
  */
 
 public class InfoRequest extends RequestBase {
-	public InfoRequest() {
-	}
+    public InfoRequest() {}
 
-	/**
-	 * Singleton instance for {@link InfoRequest}.
-	 */
-	public static final InfoRequest _INSTANCE = new InfoRequest();
+    /**
+     * Singleton instance for {@link InfoRequest}.
+     */
+    public static final InfoRequest _INSTANCE = new InfoRequest();
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Endpoint "{@code info}".
-	 */
-	public static final Endpoint<InfoRequest, InfoResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+    /**
+     * Endpoint "{@code info}".
+     */
+    public static final Endpoint<InfoRequest, InfoResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
 
-			// Request method
-			request -> {
-				return "GET";
+        // Request method
+        request -> {
+            return "GET";
 
-			},
+        },
 
-			// Request path
-			request -> {
-				return "/";
+        // Request path
+        request -> {
+            return "/";
 
-			},
+        },
 
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
 
-			}, SimpleEndpoint.emptyMap(), false, InfoResponse._DESERIALIZER);
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        InfoResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/InfoResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/InfoResponse.java
index 90efc8d5ed..dd00b140b0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/InfoResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/InfoResponse.java
@@ -32,208 +32,207 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.OpenSearchVersionInfo;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.OpenSearchVersionInfo;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _global.info.Response
 
-
 @JsonpDeserializable
 public class InfoResponse implements JsonpSerializable {
-	private final String clusterName;
+    private final String clusterName;
 
-	private final String clusterUuid;
+    private final String clusterUuid;
 
-	private final String name;
+    private final String name;
 
-	private final String tagline;
+    private final String tagline;
 
-	private final OpenSearchVersionInfo version;
+    private final OpenSearchVersionInfo version;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private InfoResponse(Builder builder) {
+    private InfoResponse(Builder builder) {
 
-		this.clusterName = ApiTypeHelper.requireNonNull(builder.clusterName, this, "clusterName");
-		this.clusterUuid = ApiTypeHelper.requireNonNull(builder.clusterUuid, this, "clusterUuid");
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.tagline = ApiTypeHelper.requireNonNull(builder.tagline, this, "tagline");
-		this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
+        this.clusterName = ApiTypeHelper.requireNonNull(builder.clusterName, this, "clusterName");
+        this.clusterUuid = ApiTypeHelper.requireNonNull(builder.clusterUuid, this, "clusterUuid");
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.tagline = ApiTypeHelper.requireNonNull(builder.tagline, this, "tagline");
+        this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
 
-	}
+    }
 
-	public static InfoResponse of(Function<Builder, ObjectBuilder<InfoResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static InfoResponse of(Function<Builder, ObjectBuilder<InfoResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code cluster_name}
-	 */
-	public final String clusterName() {
-		return this.clusterName;
-	}
+    /**
+     * Required - API name: {@code cluster_name}
+     */
+    public final String clusterName() {
+        return this.clusterName;
+    }
 
-	/**
-	 * Required - API name: {@code cluster_uuid}
-	 */
-	public final String clusterUuid() {
-		return this.clusterUuid;
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Required - API name: {@code tagline}
-	 */
-	public final String tagline() {
-		return this.tagline;
-	}
-
-	/**
-	 * Required - API name: {@code version}
-	 */
-	public final OpenSearchVersionInfo version() {
-		return this.version;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("cluster_name");
-		generator.write(this.clusterName);
-
-		generator.writeKey("cluster_uuid");
-		generator.write(this.clusterUuid);
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		generator.writeKey("tagline");
-		generator.write(this.tagline);
-
-		generator.writeKey("version");
-		this.version.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link InfoResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InfoResponse> {
-		private String clusterName;
-
-		private String clusterUuid;
-
-		private String name;
-
-		private String tagline;
-
-		private OpenSearchVersionInfo version;
-
-		/**
-		 * Required - API name: {@code cluster_name}
-		 */
-		public final Builder clusterName(String value) {
-			this.clusterName = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code cluster_uuid}
-		 */
-		public final Builder clusterUuid(String value) {
-			this.clusterUuid = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tagline}
-		 */
-		public final Builder tagline(String value) {
-			this.tagline = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code version}
-		 */
-		public final Builder version(OpenSearchVersionInfo value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code version}
-		 */
-		public final Builder version(
-				Function<OpenSearchVersionInfo.Builder, ObjectBuilder<OpenSearchVersionInfo>> fn) {
-			return this.version(fn.apply(new OpenSearchVersionInfo.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link InfoResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public InfoResponse build() {
-			_checkSingleUse();
-
-			return new InfoResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link InfoResponse}
-	 */
-	public static final JsonpDeserializer<InfoResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			InfoResponse::setupInfoResponseDeserializer);
-
-	protected static void setupInfoResponseDeserializer(ObjectDeserializer<InfoResponse.Builder> op) {
-
-		op.add(Builder::clusterName, JsonpDeserializer.stringDeserializer(), "cluster_name");
-		op.add(Builder::clusterUuid, JsonpDeserializer.stringDeserializer(), "cluster_uuid");
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::tagline, JsonpDeserializer.stringDeserializer(), "tagline");
-		op.add(Builder::version, OpenSearchVersionInfo._DESERIALIZER, "version");
-
-	}
+    /**
+     * Required - API name: {@code cluster_uuid}
+     */
+    public final String clusterUuid() {
+        return this.clusterUuid;
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Required - API name: {@code tagline}
+     */
+    public final String tagline() {
+        return this.tagline;
+    }
+
+    /**
+     * Required - API name: {@code version}
+     */
+    public final OpenSearchVersionInfo version() {
+        return this.version;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("cluster_name");
+        generator.write(this.clusterName);
+
+        generator.writeKey("cluster_uuid");
+        generator.write(this.clusterUuid);
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        generator.writeKey("tagline");
+        generator.write(this.tagline);
+
+        generator.writeKey("version");
+        this.version.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link InfoResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InfoResponse> {
+        private String clusterName;
+
+        private String clusterUuid;
+
+        private String name;
+
+        private String tagline;
+
+        private OpenSearchVersionInfo version;
+
+        /**
+         * Required - API name: {@code cluster_name}
+         */
+        public final Builder clusterName(String value) {
+            this.clusterName = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code cluster_uuid}
+         */
+        public final Builder clusterUuid(String value) {
+            this.clusterUuid = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tagline}
+         */
+        public final Builder tagline(String value) {
+            this.tagline = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code version}
+         */
+        public final Builder version(OpenSearchVersionInfo value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code version}
+         */
+        public final Builder version(Function<OpenSearchVersionInfo.Builder, ObjectBuilder<OpenSearchVersionInfo>> fn) {
+            return this.version(fn.apply(new OpenSearchVersionInfo.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link InfoResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public InfoResponse build() {
+            _checkSingleUse();
+
+            return new InfoResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link InfoResponse}
+     */
+    public static final JsonpDeserializer<InfoResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        InfoResponse::setupInfoResponseDeserializer
+    );
+
+    protected static void setupInfoResponseDeserializer(ObjectDeserializer<InfoResponse.Builder> op) {
+
+        op.add(Builder::clusterName, JsonpDeserializer.stringDeserializer(), "cluster_name");
+        op.add(Builder::clusterUuid, JsonpDeserializer.stringDeserializer(), "cluster_uuid");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::tagline, JsonpDeserializer.stringDeserializer(), "tagline");
+        op.add(Builder::version, OpenSearchVersionInfo._DESERIALIZER, "version");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/MgetRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/MgetRequest.java
index 822754fd02..c3588f21d2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/MgetRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/MgetRequest.java
@@ -32,29 +32,28 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch.core.mget.MultiGetOperation;
-import org.opensearch.client.opensearch.core.search.SourceConfigParam;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch.core.mget.MultiGetOperation;
+import org.opensearch.client.opensearch.core.search.SourceConfigParam;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: _global.mget.Request
 
@@ -64,531 +63,534 @@
  */
 @JsonpDeserializable
 public class MgetRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final SourceConfigParam source;
-
-	private final List<String> sourceExcludes;
-
-	private final List<String> sourceIncludes;
-
-	private final List<MultiGetOperation> docs;
-
-	private final List<String> ids;
-
-	@Nullable
-	private final String index;
-
-	@Nullable
-	private final String preference;
-
-	@Nullable
-	private final Boolean realtime;
-
-	@Nullable
-	private final Boolean refresh;
-
-	@Nullable
-	private final String routing;
-
-	private final List<String> storedFields;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MgetRequest(Builder builder) {
-
-		this.source = builder.source;
-		this.sourceExcludes = ApiTypeHelper.unmodifiable(builder.sourceExcludes);
-		this.sourceIncludes = ApiTypeHelper.unmodifiable(builder.sourceIncludes);
-		this.docs = ApiTypeHelper.unmodifiable(builder.docs);
-		this.ids = ApiTypeHelper.unmodifiable(builder.ids);
-		this.index = builder.index;
-		this.preference = builder.preference;
-		this.realtime = builder.realtime;
-		this.refresh = builder.refresh;
-		this.routing = builder.routing;
-		this.storedFields = ApiTypeHelper.unmodifiable(builder.storedFields);
-
-	}
-
-	public static MgetRequest of(Function<Builder, ObjectBuilder<MgetRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * True or false to return the _source field or not, or a list of fields to
-	 * return
-	 * <p>
-	 * API name: {@code _source}
-	 */
-	@Nullable
-	public final SourceConfigParam source() {
-		return this.source;
-	}
-
-	/**
-	 * A list of fields to exclude from the returned _source field
-	 * <p>
-	 * API name: {@code _source_excludes}
-	 */
-	public final List<String> sourceExcludes() {
-		return this.sourceExcludes;
-	}
-
-	/**
-	 * A list of fields to extract and return from the _source field
-	 * <p>
-	 * API name: {@code _source_includes}
-	 */
-	public final List<String> sourceIncludes() {
-		return this.sourceIncludes;
-	}
-
-	/**
-	 * API name: {@code docs}
-	 */
-	public final List<MultiGetOperation> docs() {
-		return this.docs;
-	}
-
-	/**
-	 * API name: {@code ids}
-	 */
-	public final List<String> ids() {
-		return this.ids;
-	}
-
-	/**
-	 * The name of the index
-	 * <p>
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Specify the node or shard the operation should be performed on (default:
-	 * random)
-	 * <p>
-	 * API name: {@code preference}
-	 */
-	@Nullable
-	public final String preference() {
-		return this.preference;
-	}
-
-	/**
-	 * Specify whether to perform the operation in realtime or search mode
-	 * <p>
-	 * API name: {@code realtime}
-	 */
-	@Nullable
-	public final Boolean realtime() {
-		return this.realtime;
-	}
-
-	/**
-	 * Refresh the shard containing the document before performing the operation
-	 * <p>
-	 * API name: {@code refresh}
-	 */
-	@Nullable
-	public final Boolean refresh() {
-		return this.refresh;
-	}
-
-	/**
-	 * Specific routing value
-	 * <p>
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * A comma-separated list of stored fields to return in the response
-	 * <p>
-	 * API name: {@code stored_fields}
-	 */
-	public final List<String> storedFields() {
-		return this.storedFields;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.docs)) {
-			generator.writeKey("docs");
-			generator.writeStartArray();
-			for (MultiGetOperation item0 : this.docs) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.ids)) {
-			generator.writeKey("ids");
-			generator.writeStartArray();
-			for (String item0 : this.ids) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MgetRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MgetRequest> {
-		@Nullable
-		private SourceConfigParam source;
-
-		@Nullable
-		private List<String> sourceExcludes;
-
-		@Nullable
-		private List<String> sourceIncludes;
-
-		@Nullable
-		private List<MultiGetOperation> docs;
-
-		@Nullable
-		private List<String> ids;
-
-		@Nullable
-		private String index;
-
-		@Nullable
-		private String preference;
-
-		@Nullable
-		private Boolean realtime;
-
-		@Nullable
-		private Boolean refresh;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private List<String> storedFields;
-
-		/**
-		 * True or false to return the _source field or not, or a list of fields to
-		 * return
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(@Nullable SourceConfigParam value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * True or false to return the _source field or not, or a list of fields to
-		 * return
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(Function<SourceConfigParam.Builder, ObjectBuilder<SourceConfigParam>> fn) {
-			return this.source(fn.apply(new SourceConfigParam.Builder()).build());
-		}
-
-		/**
-		 * A list of fields to exclude from the returned _source field
-		 * <p>
-		 * API name: {@code _source_excludes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceExcludes</code>.
-		 */
-		public final Builder sourceExcludes(List<String> list) {
-			this.sourceExcludes = _listAddAll(this.sourceExcludes, list);
-			return this;
-		}
-
-		/**
-		 * A list of fields to exclude from the returned _source field
-		 * <p>
-		 * API name: {@code _source_excludes}
-		 * <p>
-		 * Adds one or more values to <code>sourceExcludes</code>.
-		 */
-		public final Builder sourceExcludes(String value, String... values) {
-			this.sourceExcludes = _listAdd(this.sourceExcludes, value, values);
-			return this;
-		}
-
-		/**
-		 * A list of fields to extract and return from the _source field
-		 * <p>
-		 * API name: {@code _source_includes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceIncludes</code>.
-		 */
-		public final Builder sourceIncludes(List<String> list) {
-			this.sourceIncludes = _listAddAll(this.sourceIncludes, list);
-			return this;
-		}
-
-		/**
-		 * A list of fields to extract and return from the _source field
-		 * <p>
-		 * API name: {@code _source_includes}
-		 * <p>
-		 * Adds one or more values to <code>sourceIncludes</code>.
-		 */
-		public final Builder sourceIncludes(String value, String... values) {
-			this.sourceIncludes = _listAdd(this.sourceIncludes, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code docs}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>docs</code>.
-		 */
-		public final Builder docs(List<MultiGetOperation> list) {
-			this.docs = _listAddAll(this.docs, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code docs}
-		 * <p>
-		 * Adds one or more values to <code>docs</code>.
-		 */
-		public final Builder docs(MultiGetOperation value, MultiGetOperation... values) {
-			this.docs = _listAdd(this.docs, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code docs}
-		 * <p>
-		 * Adds a value to <code>docs</code> using a builder lambda.
-		 */
-		public final Builder docs(Function<MultiGetOperation.Builder, ObjectBuilder<MultiGetOperation>> fn) {
-			return docs(fn.apply(new MultiGetOperation.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code ids}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>ids</code>.
-		 */
-		public final Builder ids(List<String> list) {
-			this.ids = _listAddAll(this.ids, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code ids}
-		 * <p>
-		 * Adds one or more values to <code>ids</code>.
-		 */
-		public final Builder ids(String value, String... values) {
-			this.ids = _listAdd(this.ids, value, values);
-			return this;
-		}
-
-		/**
-		 * The name of the index
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Specify the node or shard the operation should be performed on (default:
-		 * random)
-		 * <p>
-		 * API name: {@code preference}
-		 */
-		public final Builder preference(@Nullable String value) {
-			this.preference = value;
-			return this;
-		}
-
-		/**
-		 * Specify whether to perform the operation in realtime or search mode
-		 * <p>
-		 * API name: {@code realtime}
-		 */
-		public final Builder realtime(@Nullable Boolean value) {
-			this.realtime = value;
-			return this;
-		}
-
-		/**
-		 * Refresh the shard containing the document before performing the operation
-		 * <p>
-		 * API name: {@code refresh}
-		 */
-		public final Builder refresh(@Nullable Boolean value) {
-			this.refresh = value;
-			return this;
-		}
-
-		/**
-		 * Specific routing value
-		 * <p>
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of stored fields to return in the response
-		 * <p>
-		 * API name: {@code stored_fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>storedFields</code>.
-		 */
-		public final Builder storedFields(List<String> list) {
-			this.storedFields = _listAddAll(this.storedFields, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of stored fields to return in the response
-		 * <p>
-		 * API name: {@code stored_fields}
-		 * <p>
-		 * Adds one or more values to <code>storedFields</code>.
-		 */
-		public final Builder storedFields(String value, String... values) {
-			this.storedFields = _listAdd(this.storedFields, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MgetRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MgetRequest build() {
-			_checkSingleUse();
-
-			return new MgetRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MgetRequest}
-	 */
-	public static final JsonpDeserializer<MgetRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			MgetRequest::setupMgetRequestDeserializer);
-
-	protected static void setupMgetRequestDeserializer(ObjectDeserializer<MgetRequest.Builder> op) {
-
-		op.add(Builder::docs, JsonpDeserializer.arrayDeserializer(MultiGetOperation._DESERIALIZER), "docs");
-		op.add(Builder::ids, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "ids");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code mget}".
-	 */
-	public static final SimpleEndpoint<MgetRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (request.index() != null)
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_mget");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_mget");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.routing != null) {
-					params.put("routing", request.routing);
-				}
-				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(",")));
-				}
-				if (request.preference != null) {
-					params.put("preference", request.preference);
-				}
-				if (request.refresh != null) {
-					params.put("refresh", String.valueOf(request.refresh));
-				}
-				if (request.source != null) {
-					params.put("_source", request.source._toJsonString());
-				}
-				if (ApiTypeHelper.isDefined(request.sourceExcludes)) {
-					params.put("_source_excludes",
-							request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (ApiTypeHelper.isDefined(request.sourceIncludes)) {
-					params.put("_source_includes",
-							request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, MgetResponse._DESERIALIZER);
-
-	/**
-	 * Create an "{@code mget}" endpoint.
-	 */
-	public static <TDocument> Endpoint<MgetRequest, MgetResponse<TDocument>, ErrorResponse> createMgetEndpoint(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return _ENDPOINT.withResponseDeserializer(MgetResponse.createMgetResponseDeserializer(tDocumentDeserializer));
-	}
+    @Nullable
+    private final SourceConfigParam source;
+
+    private final List<String> sourceExcludes;
+
+    private final List<String> sourceIncludes;
+
+    private final List<MultiGetOperation> docs;
+
+    private final List<String> ids;
+
+    @Nullable
+    private final String index;
+
+    @Nullable
+    private final String preference;
+
+    @Nullable
+    private final Boolean realtime;
+
+    @Nullable
+    private final Boolean refresh;
+
+    @Nullable
+    private final String routing;
+
+    private final List<String> storedFields;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MgetRequest(Builder builder) {
+
+        this.source = builder.source;
+        this.sourceExcludes = ApiTypeHelper.unmodifiable(builder.sourceExcludes);
+        this.sourceIncludes = ApiTypeHelper.unmodifiable(builder.sourceIncludes);
+        this.docs = ApiTypeHelper.unmodifiable(builder.docs);
+        this.ids = ApiTypeHelper.unmodifiable(builder.ids);
+        this.index = builder.index;
+        this.preference = builder.preference;
+        this.realtime = builder.realtime;
+        this.refresh = builder.refresh;
+        this.routing = builder.routing;
+        this.storedFields = ApiTypeHelper.unmodifiable(builder.storedFields);
+
+    }
+
+    public static MgetRequest of(Function<Builder, ObjectBuilder<MgetRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * True or false to return the _source field or not, or a list of fields to
+     * return
+     * <p>
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final SourceConfigParam source() {
+        return this.source;
+    }
+
+    /**
+     * A list of fields to exclude from the returned _source field
+     * <p>
+     * API name: {@code _source_excludes}
+     */
+    public final List<String> sourceExcludes() {
+        return this.sourceExcludes;
+    }
+
+    /**
+     * A list of fields to extract and return from the _source field
+     * <p>
+     * API name: {@code _source_includes}
+     */
+    public final List<String> sourceIncludes() {
+        return this.sourceIncludes;
+    }
+
+    /**
+     * API name: {@code docs}
+     */
+    public final List<MultiGetOperation> docs() {
+        return this.docs;
+    }
+
+    /**
+     * API name: {@code ids}
+     */
+    public final List<String> ids() {
+        return this.ids;
+    }
+
+    /**
+     * The name of the index
+     * <p>
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Specify the node or shard the operation should be performed on (default:
+     * random)
+     * <p>
+     * API name: {@code preference}
+     */
+    @Nullable
+    public final String preference() {
+        return this.preference;
+    }
+
+    /**
+     * Specify whether to perform the operation in realtime or search mode
+     * <p>
+     * API name: {@code realtime}
+     */
+    @Nullable
+    public final Boolean realtime() {
+        return this.realtime;
+    }
+
+    /**
+     * Refresh the shard containing the document before performing the operation
+     * <p>
+     * API name: {@code refresh}
+     */
+    @Nullable
+    public final Boolean refresh() {
+        return this.refresh;
+    }
+
+    /**
+     * Specific routing value
+     * <p>
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * A comma-separated list of stored fields to return in the response
+     * <p>
+     * API name: {@code stored_fields}
+     */
+    public final List<String> storedFields() {
+        return this.storedFields;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.docs)) {
+            generator.writeKey("docs");
+            generator.writeStartArray();
+            for (MultiGetOperation item0 : this.docs) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.ids)) {
+            generator.writeKey("ids");
+            generator.writeStartArray();
+            for (String item0 : this.ids) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MgetRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MgetRequest> {
+        @Nullable
+        private SourceConfigParam source;
+
+        @Nullable
+        private List<String> sourceExcludes;
+
+        @Nullable
+        private List<String> sourceIncludes;
+
+        @Nullable
+        private List<MultiGetOperation> docs;
+
+        @Nullable
+        private List<String> ids;
+
+        @Nullable
+        private String index;
+
+        @Nullable
+        private String preference;
+
+        @Nullable
+        private Boolean realtime;
+
+        @Nullable
+        private Boolean refresh;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private List<String> storedFields;
+
+        /**
+         * True or false to return the _source field or not, or a list of fields to
+         * return
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(@Nullable SourceConfigParam value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * True or false to return the _source field or not, or a list of fields to
+         * return
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(Function<SourceConfigParam.Builder, ObjectBuilder<SourceConfigParam>> fn) {
+            return this.source(fn.apply(new SourceConfigParam.Builder()).build());
+        }
+
+        /**
+         * A list of fields to exclude from the returned _source field
+         * <p>
+         * API name: {@code _source_excludes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceExcludes</code>.
+         */
+        public final Builder sourceExcludes(List<String> list) {
+            this.sourceExcludes = _listAddAll(this.sourceExcludes, list);
+            return this;
+        }
+
+        /**
+         * A list of fields to exclude from the returned _source field
+         * <p>
+         * API name: {@code _source_excludes}
+         * <p>
+         * Adds one or more values to <code>sourceExcludes</code>.
+         */
+        public final Builder sourceExcludes(String value, String... values) {
+            this.sourceExcludes = _listAdd(this.sourceExcludes, value, values);
+            return this;
+        }
+
+        /**
+         * A list of fields to extract and return from the _source field
+         * <p>
+         * API name: {@code _source_includes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceIncludes</code>.
+         */
+        public final Builder sourceIncludes(List<String> list) {
+            this.sourceIncludes = _listAddAll(this.sourceIncludes, list);
+            return this;
+        }
+
+        /**
+         * A list of fields to extract and return from the _source field
+         * <p>
+         * API name: {@code _source_includes}
+         * <p>
+         * Adds one or more values to <code>sourceIncludes</code>.
+         */
+        public final Builder sourceIncludes(String value, String... values) {
+            this.sourceIncludes = _listAdd(this.sourceIncludes, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code docs}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>docs</code>.
+         */
+        public final Builder docs(List<MultiGetOperation> list) {
+            this.docs = _listAddAll(this.docs, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code docs}
+         * <p>
+         * Adds one or more values to <code>docs</code>.
+         */
+        public final Builder docs(MultiGetOperation value, MultiGetOperation... values) {
+            this.docs = _listAdd(this.docs, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code docs}
+         * <p>
+         * Adds a value to <code>docs</code> using a builder lambda.
+         */
+        public final Builder docs(Function<MultiGetOperation.Builder, ObjectBuilder<MultiGetOperation>> fn) {
+            return docs(fn.apply(new MultiGetOperation.Builder()).build());
+        }
+
+        /**
+         * API name: {@code ids}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>ids</code>.
+         */
+        public final Builder ids(List<String> list) {
+            this.ids = _listAddAll(this.ids, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code ids}
+         * <p>
+         * Adds one or more values to <code>ids</code>.
+         */
+        public final Builder ids(String value, String... values) {
+            this.ids = _listAdd(this.ids, value, values);
+            return this;
+        }
+
+        /**
+         * The name of the index
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Specify the node or shard the operation should be performed on (default:
+         * random)
+         * <p>
+         * API name: {@code preference}
+         */
+        public final Builder preference(@Nullable String value) {
+            this.preference = value;
+            return this;
+        }
+
+        /**
+         * Specify whether to perform the operation in realtime or search mode
+         * <p>
+         * API name: {@code realtime}
+         */
+        public final Builder realtime(@Nullable Boolean value) {
+            this.realtime = value;
+            return this;
+        }
+
+        /**
+         * Refresh the shard containing the document before performing the operation
+         * <p>
+         * API name: {@code refresh}
+         */
+        public final Builder refresh(@Nullable Boolean value) {
+            this.refresh = value;
+            return this;
+        }
+
+        /**
+         * Specific routing value
+         * <p>
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of stored fields to return in the response
+         * <p>
+         * API name: {@code stored_fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>storedFields</code>.
+         */
+        public final Builder storedFields(List<String> list) {
+            this.storedFields = _listAddAll(this.storedFields, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of stored fields to return in the response
+         * <p>
+         * API name: {@code stored_fields}
+         * <p>
+         * Adds one or more values to <code>storedFields</code>.
+         */
+        public final Builder storedFields(String value, String... values) {
+            this.storedFields = _listAdd(this.storedFields, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link MgetRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MgetRequest build() {
+            _checkSingleUse();
+
+            return new MgetRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MgetRequest}
+     */
+    public static final JsonpDeserializer<MgetRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MgetRequest::setupMgetRequestDeserializer
+    );
+
+    protected static void setupMgetRequestDeserializer(ObjectDeserializer<MgetRequest.Builder> op) {
+
+        op.add(Builder::docs, JsonpDeserializer.arrayDeserializer(MultiGetOperation._DESERIALIZER), "docs");
+        op.add(Builder::ids, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "ids");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code mget}".
+     */
+    public static final SimpleEndpoint<MgetRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (request.index() != null) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_mget");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_mget");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            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(",")));
+            }
+            if (request.preference != null) {
+                params.put("preference", request.preference);
+            }
+            if (request.refresh != null) {
+                params.put("refresh", String.valueOf(request.refresh));
+            }
+            if (request.source != null) {
+                params.put("_source", request.source._toJsonString());
+            }
+            if (ApiTypeHelper.isDefined(request.sourceExcludes)) {
+                params.put("_source_excludes", request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (ApiTypeHelper.isDefined(request.sourceIncludes)) {
+                params.put("_source_includes", request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        MgetResponse._DESERIALIZER
+    );
+
+    /**
+     * Create an "{@code mget}" endpoint.
+     */
+    public static <TDocument> Endpoint<MgetRequest, MgetResponse<TDocument>, ErrorResponse> createMgetEndpoint(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return _ENDPOINT.withResponseDeserializer(MgetResponse.createMgetResponseDeserializer(tDocumentDeserializer));
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/MgetResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/MgetResponse.java
index 7d98ce69ee..c74c55ced7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/MgetResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/MgetResponse.java
@@ -32,7 +32,11 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch.core.mget.MultiGetResponseItem;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,161 +45,162 @@
 import org.opensearch.client.json.NamedDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.mget.MultiGetResponseItem;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import javax.annotation.Nullable;
 
 // typedef: _global.mget.Response
 
-
 @JsonpDeserializable
 public class MgetResponse<TDocument> implements JsonpSerializable {
-	private final List<MultiGetResponseItem<TDocument>> docs;
-
-	@Nullable
-	private final JsonpSerializer<TDocument> tDocumentSerializer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MgetResponse(Builder<TDocument> builder) {
-
-		this.docs = ApiTypeHelper.unmodifiableRequired(builder.docs, this, "docs");
-		this.tDocumentSerializer = builder.tDocumentSerializer;
-
-	}
-
-	public static <TDocument> MgetResponse<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<MgetResponse<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * Required - API name: {@code docs}
-	 */
-	public final List<MultiGetResponseItem<TDocument>> docs() {
-		return this.docs;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.docs)) {
-			generator.writeKey("docs");
-			generator.writeStartArray();
-			for (MultiGetResponseItem<TDocument> item0 : this.docs) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MgetResponse}.
-	 */
-
-	public static class Builder<TDocument> extends ObjectBuilderBase implements ObjectBuilder<MgetResponse<TDocument>> {
-		private List<MultiGetResponseItem<TDocument>> docs;
-
-		@Nullable
-		private JsonpSerializer<TDocument> tDocumentSerializer;
-
-		/**
-		 * Required - API name: {@code docs}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>docs</code>.
-		 */
-		public final Builder<TDocument> docs(List<MultiGetResponseItem<TDocument>> list) {
-			this.docs = _listAddAll(this.docs, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code docs}
-		 * <p>
-		 * Adds one or more values to <code>docs</code>.
-		 */
-		public final Builder<TDocument> docs(MultiGetResponseItem<TDocument> value,
-				MultiGetResponseItem<TDocument>... values) {
-			this.docs = _listAdd(this.docs, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code docs}
-		 * <p>
-		 * Adds a value to <code>docs</code> using a builder lambda.
-		 */
-		public final Builder<TDocument> docs(
-				Function<MultiGetResponseItem.Builder<TDocument>, ObjectBuilder<MultiGetResponseItem<TDocument>>> fn) {
-			return docs(fn.apply(new MultiGetResponseItem.Builder<TDocument>()).build());
-		}
-
-		/**
-		 * Serializer for TDocument. If not set, an attempt will be made to find a
-		 * serializer from the JSON context.
-		 */
-		public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
-			this.tDocumentSerializer = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MgetResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MgetResponse<TDocument> build() {
-			_checkSingleUse();
-
-			return new MgetResponse<TDocument>(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Create a JSON deserializer for MgetResponse
-	 */
-	public static <TDocument> JsonpDeserializer<MgetResponse<TDocument>> createMgetResponseDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return ObjectBuilderDeserializer.createForObject((Supplier<Builder<TDocument>>) Builder::new,
-				op -> MgetResponse.setupMgetResponseDeserializer(op, tDocumentDeserializer));
-	};
-
-	/**
-	 * Json deserializer for {@link MgetResponse} based on named deserializers
-	 * provided by the calling {@code JsonMapper}.
-	 */
-	public static final JsonpDeserializer<MgetResponse<Object>> _DESERIALIZER = createMgetResponseDeserializer(
-			new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.mget.TDocument"));
-
-	protected static <TDocument> void setupMgetResponseDeserializer(
-			ObjectDeserializer<MgetResponse.Builder<TDocument>> op,
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-
-		op.add(Builder::docs, JsonpDeserializer.arrayDeserializer(
-				MultiGetResponseItem.createMultiGetResponseItemDeserializer(tDocumentDeserializer)), "docs");
-
-	}
+    private final List<MultiGetResponseItem<TDocument>> docs;
+
+    @Nullable
+    private final JsonpSerializer<TDocument> tDocumentSerializer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MgetResponse(Builder<TDocument> builder) {
+
+        this.docs = ApiTypeHelper.unmodifiableRequired(builder.docs, this, "docs");
+        this.tDocumentSerializer = builder.tDocumentSerializer;
+
+    }
+
+    public static <TDocument> MgetResponse<TDocument> of(Function<Builder<TDocument>, ObjectBuilder<MgetResponse<TDocument>>> fn) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * Required - API name: {@code docs}
+     */
+    public final List<MultiGetResponseItem<TDocument>> docs() {
+        return this.docs;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.docs)) {
+            generator.writeKey("docs");
+            generator.writeStartArray();
+            for (MultiGetResponseItem<TDocument> item0 : this.docs) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MgetResponse}.
+     */
+
+    public static class Builder<TDocument> extends ObjectBuilderBase implements ObjectBuilder<MgetResponse<TDocument>> {
+        private List<MultiGetResponseItem<TDocument>> docs;
+
+        @Nullable
+        private JsonpSerializer<TDocument> tDocumentSerializer;
+
+        /**
+         * Required - API name: {@code docs}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>docs</code>.
+         */
+        public final Builder<TDocument> docs(List<MultiGetResponseItem<TDocument>> list) {
+            this.docs = _listAddAll(this.docs, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code docs}
+         * <p>
+         * Adds one or more values to <code>docs</code>.
+         */
+        public final Builder<TDocument> docs(MultiGetResponseItem<TDocument> value, MultiGetResponseItem<TDocument>... values) {
+            this.docs = _listAdd(this.docs, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code docs}
+         * <p>
+         * Adds a value to <code>docs</code> using a builder lambda.
+         */
+        public final Builder<TDocument> docs(
+            Function<MultiGetResponseItem.Builder<TDocument>, ObjectBuilder<MultiGetResponseItem<TDocument>>> fn
+        ) {
+            return docs(fn.apply(new MultiGetResponseItem.Builder<TDocument>()).build());
+        }
+
+        /**
+         * Serializer for TDocument. If not set, an attempt will be made to find a
+         * serializer from the JSON context.
+         */
+        public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
+            this.tDocumentSerializer = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link MgetResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MgetResponse<TDocument> build() {
+            _checkSingleUse();
+
+            return new MgetResponse<TDocument>(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Create a JSON deserializer for MgetResponse
+     */
+    public static <TDocument> JsonpDeserializer<MgetResponse<TDocument>> createMgetResponseDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<TDocument>>) Builder::new,
+            op -> MgetResponse.setupMgetResponseDeserializer(op, tDocumentDeserializer)
+        );
+    };
+
+    /**
+     * Json deserializer for {@link MgetResponse} based on named deserializers
+     * provided by the calling {@code JsonMapper}.
+     */
+    public static final JsonpDeserializer<MgetResponse<Object>> _DESERIALIZER = createMgetResponseDeserializer(
+        new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.mget.TDocument")
+    );
+
+    protected static <TDocument> void setupMgetResponseDeserializer(
+        ObjectDeserializer<MgetResponse.Builder<TDocument>> op,
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+
+        op.add(
+            Builder::docs,
+            JsonpDeserializer.arrayDeserializer(MultiGetResponseItem.createMultiGetResponseItemDeserializer(tDocumentDeserializer)),
+            "docs"
+        );
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/MsearchRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/MsearchRequest.java
index a6660a5145..72a0d5ccdd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/MsearchRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/MsearchRequest.java
@@ -32,540 +32,541 @@
 
 package org.opensearch.client.opensearch.core;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.json.NdJsonpSerializable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.SearchType;
 import org.opensearch.client.opensearch.core.msearch.RequestItem;
-import org.opensearch.client.json.JsonpDeserializer;
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
-import org.opensearch.client.json.NdJsonpSerializable;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: _global.msearch.Request
 
 /**
  * Allows to execute several search operations in one request.
- * 
+ *
  */
 
 public class MsearchRequest extends RequestBase implements NdJsonpSerializable, JsonpSerializable {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	@Nullable
-	private final Boolean ccsMinimizeRoundtrips;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean ignoreThrottled;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Long maxConcurrentSearches;
-
-	@Nullable
-	private final Long maxConcurrentShardRequests;
-
-	@Nullable
-	private final Long preFilterShardSize;
-
-	@Nullable
-	private final SearchType searchType;
-
-	private final List<RequestItem> searches;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MsearchRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.ccsMinimizeRoundtrips = builder.ccsMinimizeRoundtrips;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.ignoreThrottled = builder.ignoreThrottled;
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.maxConcurrentSearches = builder.maxConcurrentSearches;
-		this.maxConcurrentShardRequests = builder.maxConcurrentShardRequests;
-		this.preFilterShardSize = builder.preFilterShardSize;
-		this.searchType = builder.searchType;
-		this.searches = ApiTypeHelper.unmodifiableRequired(builder.searches, this, "searches");
-
-	}
-
-	public static MsearchRequest of(Function<Builder, ObjectBuilder<MsearchRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	@Override
-	public Iterator<?> _serializables() {
-		return this.searches.iterator();
-	}
-	/**
-	 * If false, the request returns an error if any wildcard expression, index
-	 * alias, or _all value targets only missing or closed indices. This behavior
-	 * applies even if the request targets other open indices. For example, a
-	 * request targeting foo*,bar* returns an error if an index starts with foo but
-	 * no index starts with bar.
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * If true, network roundtrips between the coordinating node and remote clusters
-	 * are minimized for cross-cluster search requests.
-	 * <p>
-	 * API name: {@code ccs_minimize_roundtrips}
-	 */
-	@Nullable
-	public final Boolean ccsMinimizeRoundtrips() {
-		return this.ccsMinimizeRoundtrips;
-	}
-
-	/**
-	 * Type of index that wildcard expressions can match. If the request can target
-	 * data streams, this argument determines whether wildcard expressions match
-	 * hidden data streams.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * If true, concrete, expanded or aliased indices are ignored when frozen.
-	 * <p>
-	 * API name: {@code ignore_throttled}
-	 */
-	@Nullable
-	public final Boolean ignoreThrottled() {
-		return this.ignoreThrottled;
-	}
-
-	/**
-	 * If true, missing or closed indices are not included in the response.
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * Comma-separated list of data streams, indices, and index aliases to search.
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Maximum number of concurrent searches the multi search API can execute.
-	 * <p>
-	 * API name: {@code max_concurrent_searches}
-	 */
-	@Nullable
-	public final Long maxConcurrentSearches() {
-		return this.maxConcurrentSearches;
-	}
-
-	/**
-	 * Maximum number of concurrent shard requests that each sub-search request
-	 * executes per node.
-	 * <p>
-	 * API name: {@code max_concurrent_shard_requests}
-	 */
-	@Nullable
-	public final Long maxConcurrentShardRequests() {
-		return this.maxConcurrentShardRequests;
-	}
-
-	/**
-	 * Defines a threshold that enforces a pre-filter roundtrip to prefilter search
-	 * shards based on query rewriting if the number of shards the search request
-	 * expands to exceeds the threshold. This filter roundtrip can limit the number
-	 * of shards significantly if for instance a shard can not match any documents
-	 * based on its rewrite method i.e., if date filters are mandatory to match but
-	 * the shard bounds and the query are disjoint.
-	 * <p>
-	 * API name: {@code pre_filter_shard_size}
-	 */
-	@Nullable
-	public final Long preFilterShardSize() {
-		return this.preFilterShardSize;
-	}
-
-	/**
-	 * Indicates whether global term and document frequencies should be used when
-	 * scoring returned documents.
-	 * <p>
-	 * API name: {@code search_type}
-	 */
-	@Nullable
-	public final SearchType searchType() {
-		return this.searchType;
-	}
-
-	/**
-	 * Required - Request body.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<RequestItem> searches() {
-		return this.searches;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (RequestItem item0 : this.searches) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MsearchRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MsearchRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private Boolean ccsMinimizeRoundtrips;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean ignoreThrottled;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private Long maxConcurrentSearches;
-
-		@Nullable
-		private Long maxConcurrentShardRequests;
-
-		@Nullable
-		private Long preFilterShardSize;
-
-		@Nullable
-		private SearchType searchType;
-
-		private List<RequestItem> searches;
-
-		/**
-		 * If false, the request returns an error if any wildcard expression, index
-		 * alias, or _all value targets only missing or closed indices. This behavior
-		 * applies even if the request targets other open indices. For example, a
-		 * request targeting foo*,bar* returns an error if an index starts with foo but
-		 * no index starts with bar.
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * If true, network roundtrips between the coordinating node and remote clusters
-		 * are minimized for cross-cluster search requests.
-		 * <p>
-		 * API name: {@code ccs_minimize_roundtrips}
-		 */
-		public final Builder ccsMinimizeRoundtrips(@Nullable Boolean value) {
-			this.ccsMinimizeRoundtrips = value;
-			return this;
-		}
-
-		/**
-		 * Type of index that wildcard expressions can match. If the request can target
-		 * data streams, this argument determines whether wildcard expressions match
-		 * hidden data streams.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Type of index that wildcard expressions can match. If the request can target
-		 * data streams, this argument determines whether wildcard expressions match
-		 * hidden data streams.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * If true, concrete, expanded or aliased indices are ignored when frozen.
-		 * <p>
-		 * API name: {@code ignore_throttled}
-		 */
-		public final Builder ignoreThrottled(@Nullable Boolean value) {
-			this.ignoreThrottled = value;
-			return this;
-		}
-
-		/**
-		 * If true, missing or closed indices are not included in the response.
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Comma-separated list of data streams, indices, and index aliases to search.
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * Comma-separated list of data streams, indices, and index aliases to search.
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Maximum number of concurrent searches the multi search API can execute.
-		 * <p>
-		 * API name: {@code max_concurrent_searches}
-		 */
-		public final Builder maxConcurrentSearches(@Nullable Long value) {
-			this.maxConcurrentSearches = value;
-			return this;
-		}
-
-		/**
-		 * Maximum number of concurrent shard requests that each sub-search request
-		 * executes per node.
-		 * <p>
-		 * API name: {@code max_concurrent_shard_requests}
-		 */
-		public final Builder maxConcurrentShardRequests(@Nullable Long value) {
-			this.maxConcurrentShardRequests = value;
-			return this;
-		}
-
-		/**
-		 * Defines a threshold that enforces a pre-filter roundtrip to prefilter search
-		 * shards based on query rewriting if the number of shards the search request
-		 * expands to exceeds the threshold. This filter roundtrip can limit the number
-		 * of shards significantly if for instance a shard can not match any documents
-		 * based on its rewrite method i.e., if date filters are mandatory to match but
-		 * the shard bounds and the query are disjoint.
-		 * <p>
-		 * API name: {@code pre_filter_shard_size}
-		 */
-		public final Builder preFilterShardSize(@Nullable Long value) {
-			this.preFilterShardSize = value;
-			return this;
-		}
-
-		/**
-		 * Indicates whether global term and document frequencies should be used when
-		 * scoring returned documents.
-		 * <p>
-		 * API name: {@code search_type}
-		 */
-		public final Builder searchType(@Nullable SearchType value) {
-			this.searchType = value;
-			return this;
-		}
-
-		/**
-		 * Required - Request body.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>searches</code>.
-		 */
-		public final Builder searches(List<RequestItem> list) {
-			this.searches = _listAddAll(this.searches, list);
-			return this;
-		}
-
-		/**
-		 * Required - Request body.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>searches</code>.
-		 */
-		public final Builder searches(RequestItem value, RequestItem... values) {
-			this.searches = _listAdd(this.searches, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Request body.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>searches</code> using a builder lambda.
-		 */
-		public final Builder searches(Function<RequestItem.Builder, ObjectBuilder<RequestItem>> fn) {
-			return searches(fn.apply(new RequestItem.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link MsearchRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MsearchRequest build() {
-			_checkSingleUse();
-
-			return new MsearchRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code msearch}".
-	 */
-	public static final SimpleEndpoint<MsearchRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_msearch");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_msearch");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				params.put("typed_keys", "true");
-				if (request.preFilterShardSize != null) {
-					params.put("pre_filter_shard_size", String.valueOf(request.preFilterShardSize));
-				}
-				if (request.maxConcurrentShardRequests != null) {
-					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(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.ignoreThrottled != null) {
-					params.put("ignore_throttled", String.valueOf(request.ignoreThrottled));
-				}
-				if (request.maxConcurrentSearches != null) {
-					params.put("max_concurrent_searches", String.valueOf(request.maxConcurrentSearches));
-				}
-				if (request.searchType != null) {
-					params.put("search_type", request.searchType.jsonValue());
-				}
-				if (request.ccsMinimizeRoundtrips != null) {
-					params.put("ccs_minimize_roundtrips", String.valueOf(request.ccsMinimizeRoundtrips));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, MsearchResponse._DESERIALIZER);
-
-	/**
-	 * Create an "{@code msearch}" endpoint.
-	 */
-	public static <TDocument> Endpoint<MsearchRequest, MsearchResponse<TDocument>, ErrorResponse> createMsearchEndpoint(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return _ENDPOINT
-				.withResponseDeserializer(MsearchResponse.createMsearchResponseDeserializer(tDocumentDeserializer));
-	}
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    @Nullable
+    private final Boolean ccsMinimizeRoundtrips;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean ignoreThrottled;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Long maxConcurrentSearches;
+
+    @Nullable
+    private final Long maxConcurrentShardRequests;
+
+    @Nullable
+    private final Long preFilterShardSize;
+
+    @Nullable
+    private final SearchType searchType;
+
+    private final List<RequestItem> searches;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MsearchRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.ccsMinimizeRoundtrips = builder.ccsMinimizeRoundtrips;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.ignoreThrottled = builder.ignoreThrottled;
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.maxConcurrentSearches = builder.maxConcurrentSearches;
+        this.maxConcurrentShardRequests = builder.maxConcurrentShardRequests;
+        this.preFilterShardSize = builder.preFilterShardSize;
+        this.searchType = builder.searchType;
+        this.searches = ApiTypeHelper.unmodifiableRequired(builder.searches, this, "searches");
+
+    }
+
+    public static MsearchRequest of(Function<Builder, ObjectBuilder<MsearchRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    @Override
+    public Iterator<?> _serializables() {
+        return this.searches.iterator();
+    }
+
+    /**
+     * If false, the request returns an error if any wildcard expression, index
+     * alias, or _all value targets only missing or closed indices. This behavior
+     * applies even if the request targets other open indices. For example, a
+     * request targeting foo*,bar* returns an error if an index starts with foo but
+     * no index starts with bar.
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * If true, network roundtrips between the coordinating node and remote clusters
+     * are minimized for cross-cluster search requests.
+     * <p>
+     * API name: {@code ccs_minimize_roundtrips}
+     */
+    @Nullable
+    public final Boolean ccsMinimizeRoundtrips() {
+        return this.ccsMinimizeRoundtrips;
+    }
+
+    /**
+     * Type of index that wildcard expressions can match. If the request can target
+     * data streams, this argument determines whether wildcard expressions match
+     * hidden data streams.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * If true, concrete, expanded or aliased indices are ignored when frozen.
+     * <p>
+     * API name: {@code ignore_throttled}
+     */
+    @Nullable
+    public final Boolean ignoreThrottled() {
+        return this.ignoreThrottled;
+    }
+
+    /**
+     * If true, missing or closed indices are not included in the response.
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * Comma-separated list of data streams, indices, and index aliases to search.
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Maximum number of concurrent searches the multi search API can execute.
+     * <p>
+     * API name: {@code max_concurrent_searches}
+     */
+    @Nullable
+    public final Long maxConcurrentSearches() {
+        return this.maxConcurrentSearches;
+    }
+
+    /**
+     * Maximum number of concurrent shard requests that each sub-search request
+     * executes per node.
+     * <p>
+     * API name: {@code max_concurrent_shard_requests}
+     */
+    @Nullable
+    public final Long maxConcurrentShardRequests() {
+        return this.maxConcurrentShardRequests;
+    }
+
+    /**
+     * Defines a threshold that enforces a pre-filter roundtrip to prefilter search
+     * shards based on query rewriting if the number of shards the search request
+     * expands to exceeds the threshold. This filter roundtrip can limit the number
+     * of shards significantly if for instance a shard can not match any documents
+     * based on its rewrite method i.e., if date filters are mandatory to match but
+     * the shard bounds and the query are disjoint.
+     * <p>
+     * API name: {@code pre_filter_shard_size}
+     */
+    @Nullable
+    public final Long preFilterShardSize() {
+        return this.preFilterShardSize;
+    }
+
+    /**
+     * Indicates whether global term and document frequencies should be used when
+     * scoring returned documents.
+     * <p>
+     * API name: {@code search_type}
+     */
+    @Nullable
+    public final SearchType searchType() {
+        return this.searchType;
+    }
+
+    /**
+     * Required - Request body.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<RequestItem> searches() {
+        return this.searches;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (RequestItem item0 : this.searches) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MsearchRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MsearchRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private Boolean ccsMinimizeRoundtrips;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean ignoreThrottled;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private Long maxConcurrentSearches;
+
+        @Nullable
+        private Long maxConcurrentShardRequests;
+
+        @Nullable
+        private Long preFilterShardSize;
+
+        @Nullable
+        private SearchType searchType;
+
+        private List<RequestItem> searches;
+
+        /**
+         * If false, the request returns an error if any wildcard expression, index
+         * alias, or _all value targets only missing or closed indices. This behavior
+         * applies even if the request targets other open indices. For example, a
+         * request targeting foo*,bar* returns an error if an index starts with foo but
+         * no index starts with bar.
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * If true, network roundtrips between the coordinating node and remote clusters
+         * are minimized for cross-cluster search requests.
+         * <p>
+         * API name: {@code ccs_minimize_roundtrips}
+         */
+        public final Builder ccsMinimizeRoundtrips(@Nullable Boolean value) {
+            this.ccsMinimizeRoundtrips = value;
+            return this;
+        }
+
+        /**
+         * Type of index that wildcard expressions can match. If the request can target
+         * data streams, this argument determines whether wildcard expressions match
+         * hidden data streams.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Type of index that wildcard expressions can match. If the request can target
+         * data streams, this argument determines whether wildcard expressions match
+         * hidden data streams.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * If true, concrete, expanded or aliased indices are ignored when frozen.
+         * <p>
+         * API name: {@code ignore_throttled}
+         */
+        public final Builder ignoreThrottled(@Nullable Boolean value) {
+            this.ignoreThrottled = value;
+            return this;
+        }
+
+        /**
+         * If true, missing or closed indices are not included in the response.
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Comma-separated list of data streams, indices, and index aliases to search.
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * Comma-separated list of data streams, indices, and index aliases to search.
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Maximum number of concurrent searches the multi search API can execute.
+         * <p>
+         * API name: {@code max_concurrent_searches}
+         */
+        public final Builder maxConcurrentSearches(@Nullable Long value) {
+            this.maxConcurrentSearches = value;
+            return this;
+        }
+
+        /**
+         * Maximum number of concurrent shard requests that each sub-search request
+         * executes per node.
+         * <p>
+         * API name: {@code max_concurrent_shard_requests}
+         */
+        public final Builder maxConcurrentShardRequests(@Nullable Long value) {
+            this.maxConcurrentShardRequests = value;
+            return this;
+        }
+
+        /**
+         * Defines a threshold that enforces a pre-filter roundtrip to prefilter search
+         * shards based on query rewriting if the number of shards the search request
+         * expands to exceeds the threshold. This filter roundtrip can limit the number
+         * of shards significantly if for instance a shard can not match any documents
+         * based on its rewrite method i.e., if date filters are mandatory to match but
+         * the shard bounds and the query are disjoint.
+         * <p>
+         * API name: {@code pre_filter_shard_size}
+         */
+        public final Builder preFilterShardSize(@Nullable Long value) {
+            this.preFilterShardSize = value;
+            return this;
+        }
+
+        /**
+         * Indicates whether global term and document frequencies should be used when
+         * scoring returned documents.
+         * <p>
+         * API name: {@code search_type}
+         */
+        public final Builder searchType(@Nullable SearchType value) {
+            this.searchType = value;
+            return this;
+        }
+
+        /**
+         * Required - Request body.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>searches</code>.
+         */
+        public final Builder searches(List<RequestItem> list) {
+            this.searches = _listAddAll(this.searches, list);
+            return this;
+        }
+
+        /**
+         * Required - Request body.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>searches</code>.
+         */
+        public final Builder searches(RequestItem value, RequestItem... values) {
+            this.searches = _listAdd(this.searches, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Request body.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>searches</code> using a builder lambda.
+         */
+        public final Builder searches(Function<RequestItem.Builder, ObjectBuilder<RequestItem>> fn) {
+            return searches(fn.apply(new RequestItem.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link MsearchRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MsearchRequest build() {
+            _checkSingleUse();
+
+            return new MsearchRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code msearch}".
+     */
+    public static final SimpleEndpoint<MsearchRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_msearch");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_msearch");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            params.put("typed_keys", "true");
+            if (request.preFilterShardSize != null) {
+                params.put("pre_filter_shard_size", String.valueOf(request.preFilterShardSize));
+            }
+            if (request.maxConcurrentShardRequests != null) {
+                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(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.ignoreThrottled != null) {
+                params.put("ignore_throttled", String.valueOf(request.ignoreThrottled));
+            }
+            if (request.maxConcurrentSearches != null) {
+                params.put("max_concurrent_searches", String.valueOf(request.maxConcurrentSearches));
+            }
+            if (request.searchType != null) {
+                params.put("search_type", request.searchType.jsonValue());
+            }
+            if (request.ccsMinimizeRoundtrips != null) {
+                params.put("ccs_minimize_roundtrips", String.valueOf(request.ccsMinimizeRoundtrips));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        MsearchResponse._DESERIALIZER
+    );
+
+    /**
+     * Create an "{@code msearch}" endpoint.
+     */
+    public static <TDocument> Endpoint<MsearchRequest, MsearchResponse<TDocument>, ErrorResponse> createMsearchEndpoint(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return _ENDPOINT.withResponseDeserializer(MsearchResponse.createMsearchResponseDeserializer(tDocumentDeserializer));
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/MsearchResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/MsearchResponse.java
index 2e410a8d89..7bb9a79416 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/MsearchResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/MsearchResponse.java
@@ -32,83 +32,86 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch.core.msearch.MultiSearchResult;
+import java.util.function.Function;
+import java.util.function.Supplier;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.NamedDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.msearch.MultiSearchResult;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-import java.util.function.Supplier;
-
 // typedef: _global.msearch.Response
 
 @JsonpDeserializable
 public class MsearchResponse<TDocument> extends MultiSearchResult<TDocument> {
-	// ---------------------------------------------------------------------------------------------
-
-	private MsearchResponse(Builder<TDocument> builder) {
-		super(builder);
-
-	}
-
-	public static <TDocument> MsearchResponse<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<MsearchResponse<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MsearchResponse}.
-	 */
-
-	public static class Builder<TDocument> extends MultiSearchResult.AbstractBuilder<TDocument, Builder<TDocument>>
-			implements
-				ObjectBuilder<MsearchResponse<TDocument>> {
-		@Override
-		protected Builder<TDocument> self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MsearchResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MsearchResponse<TDocument> build() {
-			_checkSingleUse();
-
-			return new MsearchResponse<TDocument>(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Create a JSON deserializer for MsearchResponse
-	 */
-	public static <TDocument> JsonpDeserializer<MsearchResponse<TDocument>> createMsearchResponseDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return ObjectBuilderDeserializer.createForObject((Supplier<Builder<TDocument>>) Builder::new,
-				op -> MsearchResponse.setupMsearchResponseDeserializer(op, tDocumentDeserializer));
-	};
-
-	/**
-	 * Json deserializer for {@link MsearchResponse} based on named deserializers
-	 * provided by the calling {@code JsonMapper}.
-	 */
-	public static final JsonpDeserializer<MsearchResponse<Object>> _DESERIALIZER = createMsearchResponseDeserializer(
-			new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.msearch.TDocument"));
-
-	protected static <TDocument> void setupMsearchResponseDeserializer(
-			ObjectDeserializer<MsearchResponse.Builder<TDocument>> op,
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		MultiSearchResult.setupMultiSearchResultDeserializer(op, tDocumentDeserializer);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private MsearchResponse(Builder<TDocument> builder) {
+        super(builder);
+
+    }
+
+    public static <TDocument> MsearchResponse<TDocument> of(Function<Builder<TDocument>, ObjectBuilder<MsearchResponse<TDocument>>> fn) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MsearchResponse}.
+     */
+
+    public static class Builder<TDocument> extends MultiSearchResult.AbstractBuilder<TDocument, Builder<TDocument>>
+        implements
+            ObjectBuilder<MsearchResponse<TDocument>> {
+        @Override
+        protected Builder<TDocument> self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MsearchResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MsearchResponse<TDocument> build() {
+            _checkSingleUse();
+
+            return new MsearchResponse<TDocument>(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Create a JSON deserializer for MsearchResponse
+     */
+    public static <TDocument> JsonpDeserializer<MsearchResponse<TDocument>> createMsearchResponseDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<TDocument>>) Builder::new,
+            op -> MsearchResponse.setupMsearchResponseDeserializer(op, tDocumentDeserializer)
+        );
+    };
+
+    /**
+     * Json deserializer for {@link MsearchResponse} based on named deserializers
+     * provided by the calling {@code JsonMapper}.
+     */
+    public static final JsonpDeserializer<MsearchResponse<Object>> _DESERIALIZER = createMsearchResponseDeserializer(
+        new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.msearch.TDocument")
+    );
+
+    protected static <TDocument> void setupMsearchResponseDeserializer(
+        ObjectDeserializer<MsearchResponse.Builder<TDocument>> op,
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        MultiSearchResult.setupMultiSearchResultDeserializer(op, tDocumentDeserializer);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/MsearchTemplateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/MsearchTemplateRequest.java
index 8b9caa89da..f1dbd8e217 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/MsearchTemplateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/MsearchTemplateRequest.java
@@ -32,322 +32,325 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.SearchType;
-import org.opensearch.client.opensearch.core.msearch_template.RequestItem;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.NdJsonpSerializable;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.SearchType;
+import org.opensearch.client.opensearch.core.msearch_template.RequestItem;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: _global.msearch_template.Request
 
 /**
  * Allows to execute several search template operations in one request.
- * 
+ *
  */
 
 public class MsearchTemplateRequest extends RequestBase implements NdJsonpSerializable, JsonpSerializable {
-	@Nullable
-	private final Boolean ccsMinimizeRoundtrips;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Long maxConcurrentSearches;
-
-	@Nullable
-	private final SearchType searchType;
-
-	private final List<RequestItem> searchTemplates;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MsearchTemplateRequest(Builder builder) {
-
-		this.ccsMinimizeRoundtrips = builder.ccsMinimizeRoundtrips;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.maxConcurrentSearches = builder.maxConcurrentSearches;
-		this.searchType = builder.searchType;
-		this.searchTemplates = ApiTypeHelper.unmodifiableRequired(builder.searchTemplates, this, "searchTemplates");
-
-	}
-
-	public static MsearchTemplateRequest of(Function<Builder, ObjectBuilder<MsearchTemplateRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	@Override
-	public Iterator<?> _serializables() {
-		return this.searchTemplates.iterator();
-	}
-	/**
-	 * Indicates whether network round-trips should be minimized as part of
-	 * cross-cluster search requests execution
-	 * <p>
-	 * API name: {@code ccs_minimize_roundtrips}
-	 */
-	@Nullable
-	public final Boolean ccsMinimizeRoundtrips() {
-		return this.ccsMinimizeRoundtrips;
-	}
-
-	/**
-	 * A comma-separated list of index names to use as default
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Controls the maximum number of concurrent searches the multi search api will
-	 * execute
-	 * <p>
-	 * API name: {@code max_concurrent_searches}
-	 */
-	@Nullable
-	public final Long maxConcurrentSearches() {
-		return this.maxConcurrentSearches;
-	}
-
-	/**
-	 * Search operation type
-	 * <p>
-	 * API name: {@code search_type}
-	 */
-	@Nullable
-	public final SearchType searchType() {
-		return this.searchType;
-	}
-
-	/**
-	 * Required - Request body.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final List<RequestItem> searchTemplates() {
-		return this.searchTemplates;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (RequestItem item0 : this.searchTemplates) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MsearchTemplateRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MsearchTemplateRequest> {
-		@Nullable
-		private Boolean ccsMinimizeRoundtrips;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private Long maxConcurrentSearches;
-
-		@Nullable
-		private SearchType searchType;
-
-		private List<RequestItem> searchTemplates;
-
-		/**
-		 * Indicates whether network round-trips should be minimized as part of
-		 * cross-cluster search requests execution
-		 * <p>
-		 * API name: {@code ccs_minimize_roundtrips}
-		 */
-		public final Builder ccsMinimizeRoundtrips(@Nullable Boolean value) {
-			this.ccsMinimizeRoundtrips = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names to use as default
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names to use as default
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Controls the maximum number of concurrent searches the multi search api will
-		 * execute
-		 * <p>
-		 * API name: {@code max_concurrent_searches}
-		 */
-		public final Builder maxConcurrentSearches(@Nullable Long value) {
-			this.maxConcurrentSearches = value;
-			return this;
-		}
-
-		/**
-		 * Search operation type
-		 * <p>
-		 * API name: {@code search_type}
-		 */
-		public final Builder searchType(@Nullable SearchType value) {
-			this.searchType = value;
-			return this;
-		}
-
-		/**
-		 * Required - Request body.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>searchTemplates</code>.
-		 */
-		public final Builder searchTemplates(List<RequestItem> list) {
-			this.searchTemplates = _listAddAll(this.searchTemplates, list);
-			return this;
-		}
-
-		/**
-		 * Required - Request body.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds one or more values to <code>searchTemplates</code>.
-		 */
-		public final Builder searchTemplates(RequestItem value, RequestItem... values) {
-			this.searchTemplates = _listAdd(this.searchTemplates, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Request body.
-		 * <p>
-		 * API name: {@code _value_body}
-		 * <p>
-		 * Adds a value to <code>searchTemplates</code> using a builder lambda.
-		 */
-		public final Builder searchTemplates(Function<RequestItem.Builder, ObjectBuilder<RequestItem>> fn) {
-			return searchTemplates(fn.apply(new RequestItem.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link MsearchTemplateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MsearchTemplateRequest build() {
-			_checkSingleUse();
-
-			return new MsearchTemplateRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code msearch_template}".
-	 */
-	public static final SimpleEndpoint<MsearchTemplateRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_msearch");
-					buf.append("/template");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_msearch");
-					buf.append("/template");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				params.put("typed_keys", "true");
-				if (request.maxConcurrentSearches != null) {
-					params.put("max_concurrent_searches", String.valueOf(request.maxConcurrentSearches));
-				}
-				if (request.searchType != null) {
-					params.put("search_type", request.searchType.jsonValue());
-				}
-				if (request.ccsMinimizeRoundtrips != null) {
-					params.put("ccs_minimize_roundtrips", String.valueOf(request.ccsMinimizeRoundtrips));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, MsearchTemplateResponse._DESERIALIZER);
-
-	/**
-	 * Create an "{@code msearch_template}" endpoint.
-	 */
-	public static <TDocument> Endpoint<MsearchTemplateRequest, MsearchTemplateResponse<TDocument>, ErrorResponse>
-	createMsearchTemplateEndpoint(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return _ENDPOINT.withResponseDeserializer(
-				MsearchTemplateResponse.createMsearchTemplateResponseDeserializer(tDocumentDeserializer));
-	}
+    @Nullable
+    private final Boolean ccsMinimizeRoundtrips;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Long maxConcurrentSearches;
+
+    @Nullable
+    private final SearchType searchType;
+
+    private final List<RequestItem> searchTemplates;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MsearchTemplateRequest(Builder builder) {
+
+        this.ccsMinimizeRoundtrips = builder.ccsMinimizeRoundtrips;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.maxConcurrentSearches = builder.maxConcurrentSearches;
+        this.searchType = builder.searchType;
+        this.searchTemplates = ApiTypeHelper.unmodifiableRequired(builder.searchTemplates, this, "searchTemplates");
+
+    }
+
+    public static MsearchTemplateRequest of(Function<Builder, ObjectBuilder<MsearchTemplateRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    @Override
+    public Iterator<?> _serializables() {
+        return this.searchTemplates.iterator();
+    }
+
+    /**
+     * Indicates whether network round-trips should be minimized as part of
+     * cross-cluster search requests execution
+     * <p>
+     * API name: {@code ccs_minimize_roundtrips}
+     */
+    @Nullable
+    public final Boolean ccsMinimizeRoundtrips() {
+        return this.ccsMinimizeRoundtrips;
+    }
+
+    /**
+     * A comma-separated list of index names to use as default
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Controls the maximum number of concurrent searches the multi search api will
+     * execute
+     * <p>
+     * API name: {@code max_concurrent_searches}
+     */
+    @Nullable
+    public final Long maxConcurrentSearches() {
+        return this.maxConcurrentSearches;
+    }
+
+    /**
+     * Search operation type
+     * <p>
+     * API name: {@code search_type}
+     */
+    @Nullable
+    public final SearchType searchType() {
+        return this.searchType;
+    }
+
+    /**
+     * Required - Request body.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final List<RequestItem> searchTemplates() {
+        return this.searchTemplates;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartArray();
+        for (RequestItem item0 : this.searchTemplates) {
+            item0.serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MsearchTemplateRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MsearchTemplateRequest> {
+        @Nullable
+        private Boolean ccsMinimizeRoundtrips;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private Long maxConcurrentSearches;
+
+        @Nullable
+        private SearchType searchType;
+
+        private List<RequestItem> searchTemplates;
+
+        /**
+         * Indicates whether network round-trips should be minimized as part of
+         * cross-cluster search requests execution
+         * <p>
+         * API name: {@code ccs_minimize_roundtrips}
+         */
+        public final Builder ccsMinimizeRoundtrips(@Nullable Boolean value) {
+            this.ccsMinimizeRoundtrips = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names to use as default
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names to use as default
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Controls the maximum number of concurrent searches the multi search api will
+         * execute
+         * <p>
+         * API name: {@code max_concurrent_searches}
+         */
+        public final Builder maxConcurrentSearches(@Nullable Long value) {
+            this.maxConcurrentSearches = value;
+            return this;
+        }
+
+        /**
+         * Search operation type
+         * <p>
+         * API name: {@code search_type}
+         */
+        public final Builder searchType(@Nullable SearchType value) {
+            this.searchType = value;
+            return this;
+        }
+
+        /**
+         * Required - Request body.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>searchTemplates</code>.
+         */
+        public final Builder searchTemplates(List<RequestItem> list) {
+            this.searchTemplates = _listAddAll(this.searchTemplates, list);
+            return this;
+        }
+
+        /**
+         * Required - Request body.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds one or more values to <code>searchTemplates</code>.
+         */
+        public final Builder searchTemplates(RequestItem value, RequestItem... values) {
+            this.searchTemplates = _listAdd(this.searchTemplates, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Request body.
+         * <p>
+         * API name: {@code _value_body}
+         * <p>
+         * Adds a value to <code>searchTemplates</code> using a builder lambda.
+         */
+        public final Builder searchTemplates(Function<RequestItem.Builder, ObjectBuilder<RequestItem>> fn) {
+            return searchTemplates(fn.apply(new RequestItem.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link MsearchTemplateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MsearchTemplateRequest build() {
+            _checkSingleUse();
+
+            return new MsearchTemplateRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code msearch_template}".
+     */
+    public static final SimpleEndpoint<MsearchTemplateRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_msearch");
+                buf.append("/template");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_msearch");
+                buf.append("/template");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            params.put("typed_keys", "true");
+            if (request.maxConcurrentSearches != null) {
+                params.put("max_concurrent_searches", String.valueOf(request.maxConcurrentSearches));
+            }
+            if (request.searchType != null) {
+                params.put("search_type", request.searchType.jsonValue());
+            }
+            if (request.ccsMinimizeRoundtrips != null) {
+                params.put("ccs_minimize_roundtrips", String.valueOf(request.ccsMinimizeRoundtrips));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        MsearchTemplateResponse._DESERIALIZER
+    );
+
+    /**
+     * Create an "{@code msearch_template}" endpoint.
+     */
+    public static <
+        TDocument> Endpoint<MsearchTemplateRequest, MsearchTemplateResponse<TDocument>, ErrorResponse> createMsearchTemplateEndpoint(
+            JsonpDeserializer<TDocument> tDocumentDeserializer
+        ) {
+        return _ENDPOINT.withResponseDeserializer(MsearchTemplateResponse.createMsearchTemplateResponseDeserializer(tDocumentDeserializer));
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/MsearchTemplateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/MsearchTemplateResponse.java
index ae3468a50b..c7eb1f1b3a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/MsearchTemplateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/MsearchTemplateResponse.java
@@ -32,83 +32,88 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch.core.msearch.MultiSearchResult;
+import java.util.function.Function;
+import java.util.function.Supplier;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.NamedDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.msearch.MultiSearchResult;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-import java.util.function.Supplier;
-
 // typedef: _global.msearch_template.Response
 
 @JsonpDeserializable
 public class MsearchTemplateResponse<TDocument> extends MultiSearchResult<TDocument> {
-	// ---------------------------------------------------------------------------------------------
-
-	private MsearchTemplateResponse(Builder<TDocument> builder) {
-		super(builder);
-
-	}
-
-	public static <TDocument> MsearchTemplateResponse<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<MsearchTemplateResponse<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MsearchTemplateResponse}.
-	 */
-
-	public static class Builder<TDocument> extends MultiSearchResult.AbstractBuilder<TDocument, Builder<TDocument>>
-			implements
-				ObjectBuilder<MsearchTemplateResponse<TDocument>> {
-		@Override
-		protected Builder<TDocument> self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MsearchTemplateResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MsearchTemplateResponse<TDocument> build() {
-			_checkSingleUse();
-
-			return new MsearchTemplateResponse<TDocument>(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Create a JSON deserializer for MsearchTemplateResponse
-	 */
-	public static <TDocument> JsonpDeserializer<MsearchTemplateResponse<TDocument>> createMsearchTemplateResponseDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return ObjectBuilderDeserializer.createForObject((Supplier<Builder<TDocument>>) Builder::new,
-				op -> MsearchTemplateResponse.setupMsearchTemplateResponseDeserializer(op, tDocumentDeserializer));
-	};
-
-	/**
-	 * Json deserializer for {@link MsearchTemplateResponse} based on named
-	 * deserializers provided by the calling {@code JsonMapper}.
-	 */
-	public static final JsonpDeserializer<MsearchTemplateResponse<Object>> _DESERIALIZER = createMsearchTemplateResponseDeserializer(
-			new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.msearch_template.TDocument"));
-
-	protected static <TDocument> void setupMsearchTemplateResponseDeserializer(
-			ObjectDeserializer<MsearchTemplateResponse.Builder<TDocument>> op,
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		MultiSearchResult.setupMultiSearchResultDeserializer(op, tDocumentDeserializer);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private MsearchTemplateResponse(Builder<TDocument> builder) {
+        super(builder);
+
+    }
+
+    public static <TDocument> MsearchTemplateResponse<TDocument> of(
+        Function<Builder<TDocument>, ObjectBuilder<MsearchTemplateResponse<TDocument>>> fn
+    ) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MsearchTemplateResponse}.
+     */
+
+    public static class Builder<TDocument> extends MultiSearchResult.AbstractBuilder<TDocument, Builder<TDocument>>
+        implements
+            ObjectBuilder<MsearchTemplateResponse<TDocument>> {
+        @Override
+        protected Builder<TDocument> self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MsearchTemplateResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MsearchTemplateResponse<TDocument> build() {
+            _checkSingleUse();
+
+            return new MsearchTemplateResponse<TDocument>(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Create a JSON deserializer for MsearchTemplateResponse
+     */
+    public static <TDocument> JsonpDeserializer<MsearchTemplateResponse<TDocument>> createMsearchTemplateResponseDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<TDocument>>) Builder::new,
+            op -> MsearchTemplateResponse.setupMsearchTemplateResponseDeserializer(op, tDocumentDeserializer)
+        );
+    };
+
+    /**
+     * Json deserializer for {@link MsearchTemplateResponse} based on named
+     * deserializers provided by the calling {@code JsonMapper}.
+     */
+    public static final JsonpDeserializer<MsearchTemplateResponse<Object>> _DESERIALIZER = createMsearchTemplateResponseDeserializer(
+        new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.msearch_template.TDocument")
+    );
+
+    protected static <TDocument> void setupMsearchTemplateResponseDeserializer(
+        ObjectDeserializer<MsearchTemplateResponse.Builder<TDocument>> op,
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        MultiSearchResult.setupMultiSearchResultDeserializer(op, tDocumentDeserializer);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/MtermvectorsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/MtermvectorsRequest.java
index 37118d5a0f..8369038be4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/MtermvectorsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/MtermvectorsRequest.java
@@ -32,636 +32,639 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.VersionType;
-import org.opensearch.client.opensearch.core.mtermvectors.MultiTermVectorsOperation;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.VersionType;
+import org.opensearch.client.opensearch.core.mtermvectors.MultiTermVectorsOperation;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: _global.mtermvectors.Request
 
 /**
  * Returns multiple termvectors in one request.
- * 
+ *
  */
 @JsonpDeserializable
 public class MtermvectorsRequest extends RequestBase implements JsonpSerializable {
-	private final List<MultiTermVectorsOperation> docs;
-
-	@Nullable
-	private final Boolean fieldStatistics;
-
-	private final List<String> fields;
-
-	private final List<String> ids;
-
-	@Nullable
-	private final String index;
-
-	@Nullable
-	private final Boolean offsets;
-
-	@Nullable
-	private final Boolean payloads;
-
-	@Nullable
-	private final Boolean positions;
-
-	@Nullable
-	private final String preference;
-
-	@Nullable
-	private final Boolean realtime;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final Boolean termStatistics;
-
-	@Nullable
-	private final Long version;
-
-	@Nullable
-	private final VersionType versionType;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MtermvectorsRequest(Builder builder) {
-
-		this.docs = ApiTypeHelper.unmodifiable(builder.docs);
-		this.fieldStatistics = builder.fieldStatistics;
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-		this.ids = ApiTypeHelper.unmodifiable(builder.ids);
-		this.index = builder.index;
-		this.offsets = builder.offsets;
-		this.payloads = builder.payloads;
-		this.positions = builder.positions;
-		this.preference = builder.preference;
-		this.realtime = builder.realtime;
-		this.routing = builder.routing;
-		this.termStatistics = builder.termStatistics;
-		this.version = builder.version;
-		this.versionType = builder.versionType;
-
-	}
-
-	public static MtermvectorsRequest of(Function<Builder, ObjectBuilder<MtermvectorsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code docs}
-	 */
-	public final List<MultiTermVectorsOperation> docs() {
-		return this.docs;
-	}
-
-	/**
-	 * Specifies if document count, sum of document frequencies and sum of total
-	 * term frequencies should be returned. Applies to all returned documents unless
-	 * otherwise specified in body &quot;params&quot; or &quot;docs&quot;.
-	 * <p>
-	 * API name: {@code field_statistics}
-	 */
-	@Nullable
-	public final Boolean fieldStatistics() {
-		return this.fieldStatistics;
-	}
-
-	/**
-	 * A comma-separated list of fields to return. Applies to all returned documents
-	 * unless otherwise specified in body &quot;params&quot; or &quot;docs&quot;.
-	 * <p>
-	 * API name: {@code fields}
-	 */
-	public final List<String> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * API name: {@code ids}
-	 */
-	public final List<String> ids() {
-		return this.ids;
-	}
-
-	/**
-	 * The index in which the document resides.
-	 * <p>
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Specifies if term offsets should be returned. Applies to all returned
-	 * documents unless otherwise specified in body &quot;params&quot; or
-	 * &quot;docs&quot;.
-	 * <p>
-	 * API name: {@code offsets}
-	 */
-	@Nullable
-	public final Boolean offsets() {
-		return this.offsets;
-	}
-
-	/**
-	 * Specifies if term payloads should be returned. Applies to all returned
-	 * documents unless otherwise specified in body &quot;params&quot; or
-	 * &quot;docs&quot;.
-	 * <p>
-	 * API name: {@code payloads}
-	 */
-	@Nullable
-	public final Boolean payloads() {
-		return this.payloads;
-	}
-
-	/**
-	 * Specifies if term positions should be returned. Applies to all returned
-	 * documents unless otherwise specified in body &quot;params&quot; or
-	 * &quot;docs&quot;.
-	 * <p>
-	 * API name: {@code positions}
-	 */
-	@Nullable
-	public final Boolean positions() {
-		return this.positions;
-	}
-
-	/**
-	 * Specify the node or shard the operation should be performed on (default:
-	 * random) .Applies to all returned documents unless otherwise specified in body
-	 * &quot;params&quot; or &quot;docs&quot;.
-	 * <p>
-	 * API name: {@code preference}
-	 */
-	@Nullable
-	public final String preference() {
-		return this.preference;
-	}
-
-	/**
-	 * Specifies if requests are real-time as opposed to near-real-time (default:
-	 * true).
-	 * <p>
-	 * API name: {@code realtime}
-	 */
-	@Nullable
-	public final Boolean realtime() {
-		return this.realtime;
-	}
-
-	/**
-	 * Specific routing value. Applies to all returned documents unless otherwise
-	 * specified in body &quot;params&quot; or &quot;docs&quot;.
-	 * <p>
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Specifies if total term frequency and document frequency should be returned.
-	 * Applies to all returned documents unless otherwise specified in body
-	 * &quot;params&quot; or &quot;docs&quot;.
-	 * <p>
-	 * API name: {@code term_statistics}
-	 */
-	@Nullable
-	public final Boolean termStatistics() {
-		return this.termStatistics;
-	}
-
-	/**
-	 * Explicit version number for concurrency control
-	 * <p>
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * Specific version type
-	 * <p>
-	 * API name: {@code version_type}
-	 */
-	@Nullable
-	public final VersionType versionType() {
-		return this.versionType;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.docs)) {
-			generator.writeKey("docs");
-			generator.writeStartArray();
-			for (MultiTermVectorsOperation item0 : this.docs) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.ids)) {
-			generator.writeKey("ids");
-			generator.writeStartArray();
-			for (String item0 : this.ids) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MtermvectorsRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MtermvectorsRequest> {
-		@Nullable
-		private List<MultiTermVectorsOperation> docs;
-
-		@Nullable
-		private Boolean fieldStatistics;
-
-		@Nullable
-		private List<String> fields;
-
-		@Nullable
-		private List<String> ids;
-
-		@Nullable
-		private String index;
-
-		@Nullable
-		private Boolean offsets;
-
-		@Nullable
-		private Boolean payloads;
-
-		@Nullable
-		private Boolean positions;
-
-		@Nullable
-		private String preference;
-
-		@Nullable
-		private Boolean realtime;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private Boolean termStatistics;
-
-		@Nullable
-		private Long version;
-
-		@Nullable
-		private VersionType versionType;
-
-		/**
-		 * API name: {@code docs}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>docs</code>.
-		 */
-		public final Builder docs(List<MultiTermVectorsOperation> list) {
-			this.docs = _listAddAll(this.docs, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code docs}
-		 * <p>
-		 * Adds one or more values to <code>docs</code>.
-		 */
-		public final Builder docs(MultiTermVectorsOperation value, MultiTermVectorsOperation... values) {
-			this.docs = _listAdd(this.docs, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code docs}
-		 * <p>
-		 * Adds a value to <code>docs</code> using a builder lambda.
-		 */
-		public final Builder docs(
-				Function<MultiTermVectorsOperation.Builder, ObjectBuilder<MultiTermVectorsOperation>> fn) {
-			return docs(fn.apply(new MultiTermVectorsOperation.Builder()).build());
-		}
-
-		/**
-		 * Specifies if document count, sum of document frequencies and sum of total
-		 * term frequencies should be returned. Applies to all returned documents unless
-		 * otherwise specified in body &quot;params&quot; or &quot;docs&quot;.
-		 * <p>
-		 * API name: {@code field_statistics}
-		 */
-		public final Builder fieldStatistics(@Nullable Boolean value) {
-			this.fieldStatistics = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of fields to return. Applies to all returned documents
-		 * unless otherwise specified in body &quot;params&quot; or &quot;docs&quot;.
-		 * <p>
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fields</code>.
-		 */
-		public final Builder fields(List<String> list) {
-			this.fields = _listAddAll(this.fields, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of fields to return. Applies to all returned documents
-		 * unless otherwise specified in body &quot;params&quot; or &quot;docs&quot;.
-		 * <p>
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds one or more values to <code>fields</code>.
-		 */
-		public final Builder fields(String value, String... values) {
-			this.fields = _listAdd(this.fields, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code ids}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>ids</code>.
-		 */
-		public final Builder ids(List<String> list) {
-			this.ids = _listAddAll(this.ids, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code ids}
-		 * <p>
-		 * Adds one or more values to <code>ids</code>.
-		 */
-		public final Builder ids(String value, String... values) {
-			this.ids = _listAdd(this.ids, value, values);
-			return this;
-		}
-
-		/**
-		 * The index in which the document resides.
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Specifies if term offsets should be returned. Applies to all returned
-		 * documents unless otherwise specified in body &quot;params&quot; or
-		 * &quot;docs&quot;.
-		 * <p>
-		 * API name: {@code offsets}
-		 */
-		public final Builder offsets(@Nullable Boolean value) {
-			this.offsets = value;
-			return this;
-		}
-
-		/**
-		 * Specifies if term payloads should be returned. Applies to all returned
-		 * documents unless otherwise specified in body &quot;params&quot; or
-		 * &quot;docs&quot;.
-		 * <p>
-		 * API name: {@code payloads}
-		 */
-		public final Builder payloads(@Nullable Boolean value) {
-			this.payloads = value;
-			return this;
-		}
-
-		/**
-		 * Specifies if term positions should be returned. Applies to all returned
-		 * documents unless otherwise specified in body &quot;params&quot; or
-		 * &quot;docs&quot;.
-		 * <p>
-		 * API name: {@code positions}
-		 */
-		public final Builder positions(@Nullable Boolean value) {
-			this.positions = value;
-			return this;
-		}
-
-		/**
-		 * Specify the node or shard the operation should be performed on (default:
-		 * random) .Applies to all returned documents unless otherwise specified in body
-		 * &quot;params&quot; or &quot;docs&quot;.
-		 * <p>
-		 * API name: {@code preference}
-		 */
-		public final Builder preference(@Nullable String value) {
-			this.preference = value;
-			return this;
-		}
-
-		/**
-		 * Specifies if requests are real-time as opposed to near-real-time (default:
-		 * true).
-		 * <p>
-		 * API name: {@code realtime}
-		 */
-		public final Builder realtime(@Nullable Boolean value) {
-			this.realtime = value;
-			return this;
-		}
-
-		/**
-		 * Specific routing value. Applies to all returned documents unless otherwise
-		 * specified in body &quot;params&quot; or &quot;docs&quot;.
-		 * <p>
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Specifies if total term frequency and document frequency should be returned.
-		 * Applies to all returned documents unless otherwise specified in body
-		 * &quot;params&quot; or &quot;docs&quot;.
-		 * <p>
-		 * API name: {@code term_statistics}
-		 */
-		public final Builder termStatistics(@Nullable Boolean value) {
-			this.termStatistics = value;
-			return this;
-		}
-
-		/**
-		 * Explicit version number for concurrency control
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Specific version type
-		 * <p>
-		 * API name: {@code version_type}
-		 */
-		public final Builder versionType(@Nullable VersionType value) {
-			this.versionType = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MtermvectorsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MtermvectorsRequest build() {
-			_checkSingleUse();
-
-			return new MtermvectorsRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MtermvectorsRequest}
-	 */
-	public static final JsonpDeserializer<MtermvectorsRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MtermvectorsRequest::setupMtermvectorsRequestDeserializer);
-
-	protected static void setupMtermvectorsRequestDeserializer(ObjectDeserializer<MtermvectorsRequest.Builder> op) {
-
-		op.add(Builder::docs, JsonpDeserializer.arrayDeserializer(MultiTermVectorsOperation._DESERIALIZER), "docs");
-		op.add(Builder::ids, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "ids");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code mtermvectors}".
-	 */
-	public static final Endpoint<MtermvectorsRequest, MtermvectorsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (request.index() != null)
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_mtermvectors");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_mtermvectors");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.routing != null) {
-					params.put("routing", request.routing);
-				}
-				if (request.realtime != null) {
-					params.put("realtime", String.valueOf(request.realtime));
-				}
-				if (request.termStatistics != null) {
-					params.put("term_statistics", String.valueOf(request.termStatistics));
-				}
-				if (request.offsets != null) {
-					params.put("offsets", String.valueOf(request.offsets));
-				}
-				if (request.payloads != null) {
-					params.put("payloads", String.valueOf(request.payloads));
-				}
-				if (request.versionType != null) {
-					params.put("version_type", request.versionType.jsonValue());
-				}
-				if (request.preference != null) {
-					params.put("preference", request.preference);
-				}
-				if (request.positions != null) {
-					params.put("positions", String.valueOf(request.positions));
-				}
-				if (request.fieldStatistics != null) {
-					params.put("field_statistics", String.valueOf(request.fieldStatistics));
-				}
-				if (ApiTypeHelper.isDefined(request.fields)) {
-					params.put("fields", request.fields.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.version != null) {
-					params.put("version", String.valueOf(request.version));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, MtermvectorsResponse._DESERIALIZER);
+    private final List<MultiTermVectorsOperation> docs;
+
+    @Nullable
+    private final Boolean fieldStatistics;
+
+    private final List<String> fields;
+
+    private final List<String> ids;
+
+    @Nullable
+    private final String index;
+
+    @Nullable
+    private final Boolean offsets;
+
+    @Nullable
+    private final Boolean payloads;
+
+    @Nullable
+    private final Boolean positions;
+
+    @Nullable
+    private final String preference;
+
+    @Nullable
+    private final Boolean realtime;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final Boolean termStatistics;
+
+    @Nullable
+    private final Long version;
+
+    @Nullable
+    private final VersionType versionType;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MtermvectorsRequest(Builder builder) {
+
+        this.docs = ApiTypeHelper.unmodifiable(builder.docs);
+        this.fieldStatistics = builder.fieldStatistics;
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.ids = ApiTypeHelper.unmodifiable(builder.ids);
+        this.index = builder.index;
+        this.offsets = builder.offsets;
+        this.payloads = builder.payloads;
+        this.positions = builder.positions;
+        this.preference = builder.preference;
+        this.realtime = builder.realtime;
+        this.routing = builder.routing;
+        this.termStatistics = builder.termStatistics;
+        this.version = builder.version;
+        this.versionType = builder.versionType;
+
+    }
+
+    public static MtermvectorsRequest of(Function<Builder, ObjectBuilder<MtermvectorsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code docs}
+     */
+    public final List<MultiTermVectorsOperation> docs() {
+        return this.docs;
+    }
+
+    /**
+     * Specifies if document count, sum of document frequencies and sum of total
+     * term frequencies should be returned. Applies to all returned documents unless
+     * otherwise specified in body &quot;params&quot; or &quot;docs&quot;.
+     * <p>
+     * API name: {@code field_statistics}
+     */
+    @Nullable
+    public final Boolean fieldStatistics() {
+        return this.fieldStatistics;
+    }
+
+    /**
+     * A comma-separated list of fields to return. Applies to all returned documents
+     * unless otherwise specified in body &quot;params&quot; or &quot;docs&quot;.
+     * <p>
+     * API name: {@code fields}
+     */
+    public final List<String> fields() {
+        return this.fields;
+    }
+
+    /**
+     * API name: {@code ids}
+     */
+    public final List<String> ids() {
+        return this.ids;
+    }
+
+    /**
+     * The index in which the document resides.
+     * <p>
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Specifies if term offsets should be returned. Applies to all returned
+     * documents unless otherwise specified in body &quot;params&quot; or
+     * &quot;docs&quot;.
+     * <p>
+     * API name: {@code offsets}
+     */
+    @Nullable
+    public final Boolean offsets() {
+        return this.offsets;
+    }
+
+    /**
+     * Specifies if term payloads should be returned. Applies to all returned
+     * documents unless otherwise specified in body &quot;params&quot; or
+     * &quot;docs&quot;.
+     * <p>
+     * API name: {@code payloads}
+     */
+    @Nullable
+    public final Boolean payloads() {
+        return this.payloads;
+    }
+
+    /**
+     * Specifies if term positions should be returned. Applies to all returned
+     * documents unless otherwise specified in body &quot;params&quot; or
+     * &quot;docs&quot;.
+     * <p>
+     * API name: {@code positions}
+     */
+    @Nullable
+    public final Boolean positions() {
+        return this.positions;
+    }
+
+    /**
+     * Specify the node or shard the operation should be performed on (default:
+     * random) .Applies to all returned documents unless otherwise specified in body
+     * &quot;params&quot; or &quot;docs&quot;.
+     * <p>
+     * API name: {@code preference}
+     */
+    @Nullable
+    public final String preference() {
+        return this.preference;
+    }
+
+    /**
+     * Specifies if requests are real-time as opposed to near-real-time (default:
+     * true).
+     * <p>
+     * API name: {@code realtime}
+     */
+    @Nullable
+    public final Boolean realtime() {
+        return this.realtime;
+    }
+
+    /**
+     * Specific routing value. Applies to all returned documents unless otherwise
+     * specified in body &quot;params&quot; or &quot;docs&quot;.
+     * <p>
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * Specifies if total term frequency and document frequency should be returned.
+     * Applies to all returned documents unless otherwise specified in body
+     * &quot;params&quot; or &quot;docs&quot;.
+     * <p>
+     * API name: {@code term_statistics}
+     */
+    @Nullable
+    public final Boolean termStatistics() {
+        return this.termStatistics;
+    }
+
+    /**
+     * Explicit version number for concurrency control
+     * <p>
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * Specific version type
+     * <p>
+     * API name: {@code version_type}
+     */
+    @Nullable
+    public final VersionType versionType() {
+        return this.versionType;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.docs)) {
+            generator.writeKey("docs");
+            generator.writeStartArray();
+            for (MultiTermVectorsOperation item0 : this.docs) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.ids)) {
+            generator.writeKey("ids");
+            generator.writeStartArray();
+            for (String item0 : this.ids) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MtermvectorsRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MtermvectorsRequest> {
+        @Nullable
+        private List<MultiTermVectorsOperation> docs;
+
+        @Nullable
+        private Boolean fieldStatistics;
+
+        @Nullable
+        private List<String> fields;
+
+        @Nullable
+        private List<String> ids;
+
+        @Nullable
+        private String index;
+
+        @Nullable
+        private Boolean offsets;
+
+        @Nullable
+        private Boolean payloads;
+
+        @Nullable
+        private Boolean positions;
+
+        @Nullable
+        private String preference;
+
+        @Nullable
+        private Boolean realtime;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private Boolean termStatistics;
+
+        @Nullable
+        private Long version;
+
+        @Nullable
+        private VersionType versionType;
+
+        /**
+         * API name: {@code docs}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>docs</code>.
+         */
+        public final Builder docs(List<MultiTermVectorsOperation> list) {
+            this.docs = _listAddAll(this.docs, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code docs}
+         * <p>
+         * Adds one or more values to <code>docs</code>.
+         */
+        public final Builder docs(MultiTermVectorsOperation value, MultiTermVectorsOperation... values) {
+            this.docs = _listAdd(this.docs, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code docs}
+         * <p>
+         * Adds a value to <code>docs</code> using a builder lambda.
+         */
+        public final Builder docs(Function<MultiTermVectorsOperation.Builder, ObjectBuilder<MultiTermVectorsOperation>> fn) {
+            return docs(fn.apply(new MultiTermVectorsOperation.Builder()).build());
+        }
+
+        /**
+         * Specifies if document count, sum of document frequencies and sum of total
+         * term frequencies should be returned. Applies to all returned documents unless
+         * otherwise specified in body &quot;params&quot; or &quot;docs&quot;.
+         * <p>
+         * API name: {@code field_statistics}
+         */
+        public final Builder fieldStatistics(@Nullable Boolean value) {
+            this.fieldStatistics = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of fields to return. Applies to all returned documents
+         * unless otherwise specified in body &quot;params&quot; or &quot;docs&quot;.
+         * <p>
+         * API name: {@code fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fields</code>.
+         */
+        public final Builder fields(List<String> list) {
+            this.fields = _listAddAll(this.fields, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of fields to return. Applies to all returned documents
+         * unless otherwise specified in body &quot;params&quot; or &quot;docs&quot;.
+         * <p>
+         * API name: {@code fields}
+         * <p>
+         * Adds one or more values to <code>fields</code>.
+         */
+        public final Builder fields(String value, String... values) {
+            this.fields = _listAdd(this.fields, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code ids}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>ids</code>.
+         */
+        public final Builder ids(List<String> list) {
+            this.ids = _listAddAll(this.ids, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code ids}
+         * <p>
+         * Adds one or more values to <code>ids</code>.
+         */
+        public final Builder ids(String value, String... values) {
+            this.ids = _listAdd(this.ids, value, values);
+            return this;
+        }
+
+        /**
+         * The index in which the document resides.
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Specifies if term offsets should be returned. Applies to all returned
+         * documents unless otherwise specified in body &quot;params&quot; or
+         * &quot;docs&quot;.
+         * <p>
+         * API name: {@code offsets}
+         */
+        public final Builder offsets(@Nullable Boolean value) {
+            this.offsets = value;
+            return this;
+        }
+
+        /**
+         * Specifies if term payloads should be returned. Applies to all returned
+         * documents unless otherwise specified in body &quot;params&quot; or
+         * &quot;docs&quot;.
+         * <p>
+         * API name: {@code payloads}
+         */
+        public final Builder payloads(@Nullable Boolean value) {
+            this.payloads = value;
+            return this;
+        }
+
+        /**
+         * Specifies if term positions should be returned. Applies to all returned
+         * documents unless otherwise specified in body &quot;params&quot; or
+         * &quot;docs&quot;.
+         * <p>
+         * API name: {@code positions}
+         */
+        public final Builder positions(@Nullable Boolean value) {
+            this.positions = value;
+            return this;
+        }
+
+        /**
+         * Specify the node or shard the operation should be performed on (default:
+         * random) .Applies to all returned documents unless otherwise specified in body
+         * &quot;params&quot; or &quot;docs&quot;.
+         * <p>
+         * API name: {@code preference}
+         */
+        public final Builder preference(@Nullable String value) {
+            this.preference = value;
+            return this;
+        }
+
+        /**
+         * Specifies if requests are real-time as opposed to near-real-time (default:
+         * true).
+         * <p>
+         * API name: {@code realtime}
+         */
+        public final Builder realtime(@Nullable Boolean value) {
+            this.realtime = value;
+            return this;
+        }
+
+        /**
+         * Specific routing value. Applies to all returned documents unless otherwise
+         * specified in body &quot;params&quot; or &quot;docs&quot;.
+         * <p>
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Specifies if total term frequency and document frequency should be returned.
+         * Applies to all returned documents unless otherwise specified in body
+         * &quot;params&quot; or &quot;docs&quot;.
+         * <p>
+         * API name: {@code term_statistics}
+         */
+        public final Builder termStatistics(@Nullable Boolean value) {
+            this.termStatistics = value;
+            return this;
+        }
+
+        /**
+         * Explicit version number for concurrency control
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Specific version type
+         * <p>
+         * API name: {@code version_type}
+         */
+        public final Builder versionType(@Nullable VersionType value) {
+            this.versionType = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link MtermvectorsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MtermvectorsRequest build() {
+            _checkSingleUse();
+
+            return new MtermvectorsRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MtermvectorsRequest}
+     */
+    public static final JsonpDeserializer<MtermvectorsRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MtermvectorsRequest::setupMtermvectorsRequestDeserializer
+    );
+
+    protected static void setupMtermvectorsRequestDeserializer(ObjectDeserializer<MtermvectorsRequest.Builder> op) {
+
+        op.add(Builder::docs, JsonpDeserializer.arrayDeserializer(MultiTermVectorsOperation._DESERIALIZER), "docs");
+        op.add(Builder::ids, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "ids");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code mtermvectors}".
+     */
+    public static final Endpoint<MtermvectorsRequest, MtermvectorsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (request.index() != null) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_mtermvectors");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_mtermvectors");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            if (request.realtime != null) {
+                params.put("realtime", String.valueOf(request.realtime));
+            }
+            if (request.termStatistics != null) {
+                params.put("term_statistics", String.valueOf(request.termStatistics));
+            }
+            if (request.offsets != null) {
+                params.put("offsets", String.valueOf(request.offsets));
+            }
+            if (request.payloads != null) {
+                params.put("payloads", String.valueOf(request.payloads));
+            }
+            if (request.versionType != null) {
+                params.put("version_type", request.versionType.jsonValue());
+            }
+            if (request.preference != null) {
+                params.put("preference", request.preference);
+            }
+            if (request.positions != null) {
+                params.put("positions", String.valueOf(request.positions));
+            }
+            if (request.fieldStatistics != null) {
+                params.put("field_statistics", String.valueOf(request.fieldStatistics));
+            }
+            if (ApiTypeHelper.isDefined(request.fields)) {
+                params.put("fields", request.fields.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.version != null) {
+                params.put("version", String.valueOf(request.version));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        MtermvectorsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/MtermvectorsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/MtermvectorsResponse.java
index 0cd589ee5c..d2ef648d00 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/MtermvectorsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/MtermvectorsResponse.java
@@ -32,133 +32,134 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch.core.mtermvectors.MultiTermVectorsResult;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.mtermvectors.MultiTermVectorsResult;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _global.mtermvectors.Response
 
 @JsonpDeserializable
 public class MtermvectorsResponse implements JsonpSerializable {
-	private final List<MultiTermVectorsResult> docs;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MtermvectorsResponse(Builder builder) {
-
-		this.docs = ApiTypeHelper.unmodifiableRequired(builder.docs, this, "docs");
-
-	}
-
-	public static MtermvectorsResponse of(Function<Builder, ObjectBuilder<MtermvectorsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code docs}
-	 */
-	public final List<MultiTermVectorsResult> docs() {
-		return this.docs;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.docs)) {
-			generator.writeKey("docs");
-			generator.writeStartArray();
-			for (MultiTermVectorsResult item0 : this.docs) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MtermvectorsResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MtermvectorsResponse> {
-		private List<MultiTermVectorsResult> docs;
-
-		/**
-		 * Required - API name: {@code docs}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>docs</code>.
-		 */
-		public final Builder docs(List<MultiTermVectorsResult> list) {
-			this.docs = _listAddAll(this.docs, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code docs}
-		 * <p>
-		 * Adds one or more values to <code>docs</code>.
-		 */
-		public final Builder docs(MultiTermVectorsResult value, MultiTermVectorsResult... values) {
-			this.docs = _listAdd(this.docs, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code docs}
-		 * <p>
-		 * Adds a value to <code>docs</code> using a builder lambda.
-		 */
-		public final Builder docs(Function<MultiTermVectorsResult.Builder, ObjectBuilder<MultiTermVectorsResult>> fn) {
-			return docs(fn.apply(new MultiTermVectorsResult.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link MtermvectorsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MtermvectorsResponse build() {
-			_checkSingleUse();
-
-			return new MtermvectorsResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MtermvectorsResponse}
-	 */
-	public static final JsonpDeserializer<MtermvectorsResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MtermvectorsResponse::setupMtermvectorsResponseDeserializer);
-
-	protected static void setupMtermvectorsResponseDeserializer(ObjectDeserializer<MtermvectorsResponse.Builder> op) {
-
-		op.add(Builder::docs, JsonpDeserializer.arrayDeserializer(MultiTermVectorsResult._DESERIALIZER), "docs");
-
-	}
+    private final List<MultiTermVectorsResult> docs;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MtermvectorsResponse(Builder builder) {
+
+        this.docs = ApiTypeHelper.unmodifiableRequired(builder.docs, this, "docs");
+
+    }
+
+    public static MtermvectorsResponse of(Function<Builder, ObjectBuilder<MtermvectorsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code docs}
+     */
+    public final List<MultiTermVectorsResult> docs() {
+        return this.docs;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.docs)) {
+            generator.writeKey("docs");
+            generator.writeStartArray();
+            for (MultiTermVectorsResult item0 : this.docs) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MtermvectorsResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MtermvectorsResponse> {
+        private List<MultiTermVectorsResult> docs;
+
+        /**
+         * Required - API name: {@code docs}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>docs</code>.
+         */
+        public final Builder docs(List<MultiTermVectorsResult> list) {
+            this.docs = _listAddAll(this.docs, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code docs}
+         * <p>
+         * Adds one or more values to <code>docs</code>.
+         */
+        public final Builder docs(MultiTermVectorsResult value, MultiTermVectorsResult... values) {
+            this.docs = _listAdd(this.docs, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code docs}
+         * <p>
+         * Adds a value to <code>docs</code> using a builder lambda.
+         */
+        public final Builder docs(Function<MultiTermVectorsResult.Builder, ObjectBuilder<MultiTermVectorsResult>> fn) {
+            return docs(fn.apply(new MultiTermVectorsResult.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link MtermvectorsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MtermvectorsResponse build() {
+            _checkSingleUse();
+
+            return new MtermvectorsResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MtermvectorsResponse}
+     */
+    public static final JsonpDeserializer<MtermvectorsResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MtermvectorsResponse::setupMtermvectorsResponseDeserializer
+    );
+
+    protected static void setupMtermvectorsResponseDeserializer(ObjectDeserializer<MtermvectorsResponse.Builder> op) {
+
+        op.add(Builder::docs, JsonpDeserializer.arrayDeserializer(MultiTermVectorsResult._DESERIALIZER), "docs");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/PingRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/PingRequest.java
index dd2b674367..55f24135b7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/PingRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/PingRequest.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.Collections;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -39,8 +40,6 @@
 import org.opensearch.client.transport.endpoints.BooleanResponse;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 
-import java.util.Collections;
-
 // typedef: _global.ping.Request
 
 /**
@@ -49,37 +48,40 @@
  */
 
 public class PingRequest extends RequestBase {
-	public PingRequest() {
-	}
+    public PingRequest() {}
 
-	/**
-	 * Singleton instance for {@link PingRequest}.
-	 */
-	public static final PingRequest _INSTANCE = new PingRequest();
+    /**
+     * Singleton instance for {@link PingRequest}.
+     */
+    public static final PingRequest _INSTANCE = new PingRequest();
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Endpoint "{@code ping}".
-	 */
-	public static final Endpoint<PingRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
-			"opensearch/ping",
+    /**
+     * Endpoint "{@code ping}".
+     */
+    public static final Endpoint<PingRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
+        "opensearch/ping",
 
-			// Request method
-			request -> {
-				return "HEAD";
+        // Request method
+        request -> {
+            return "HEAD";
 
-			},
+        },
 
-			// Request path
-			request -> {
-				return "/";
+        // Request path
+        request -> {
+            return "/";
 
-			},
+        },
 
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
 
-			}, SimpleEndpoint.emptyMap(), false, null);
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        null
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/PingResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/PingResponse.java
index 959d1ed339..1184333841 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/PingResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/PingResponse.java
@@ -36,18 +36,14 @@
 
 // typedef: _global.ping.Response
 
-
-
 public class PingResponse {
-	public PingResponse() {
-	}
+    public PingResponse() {}
 
-	/**
-	 * Singleton instance for {@link PingResponse}.
-	 */
-	public static final PingResponse _INSTANCE = new PingResponse();
+    /**
+     * Singleton instance for {@link PingResponse}.
+     */
+    public static final PingResponse _INSTANCE = new PingResponse();
 
-	public static final JsonpDeserializer<PingResponse> _DESERIALIZER = JsonpDeserializer
-			.fixedValue(PingResponse._INSTANCE);
+    public static final JsonpDeserializer<PingResponse> _DESERIALIZER = JsonpDeserializer.fixedValue(PingResponse._INSTANCE);
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/PutScriptRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/PutScriptRequest.java
index 5deebfc799..cf5f9ba3a4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/PutScriptRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/PutScriptRequest.java
@@ -32,345 +32,349 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.StoredScript;
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.StoredScript;
+import org.opensearch.client.opensearch._types.Time;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.put_script.Request
 
 /**
  * Creates or updates a script.
- * 
+ *
  */
 @JsonpDeserializable
 public class PutScriptRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final String context;
-
-	private final String id;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final StoredScript script;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PutScriptRequest(Builder builder) {
-
-		this.context = builder.context;
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
-		this.timeout = builder.timeout;
-
-	}
-
-	public static PutScriptRequest of(Function<Builder, ObjectBuilder<PutScriptRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Script context
-	 * <p>
-	 * API name: {@code context}
-	 */
-	@Nullable
-	public final String context() {
-		return this.context;
-	}
-
-	/**
-	 * Required - Script ID
-	 * <p>
-	 * API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Required - API name: {@code script}
-	 */
-	public final StoredScript script() {
-		return this.script;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("script");
-		this.script.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PutScriptRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutScriptRequest> {
-		@Nullable
-		private String context;
-
-		private String id;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		private StoredScript script;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * Script context
-		 * <p>
-		 * API name: {@code context}
-		 */
-		public final Builder context(@Nullable String value) {
-			this.context = value;
-			return this;
-		}
-
-		/**
-		 * Required - Script ID
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(StoredScript value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(Function<StoredScript.Builder, ObjectBuilder<StoredScript>> fn) {
-			return this.script(fn.apply(new StoredScript.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link PutScriptRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutScriptRequest build() {
-			_checkSingleUse();
-
-			return new PutScriptRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PutScriptRequest}
-	 */
-	public static final JsonpDeserializer<PutScriptRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			PutScriptRequest::setupPutScriptRequestDeserializer);
-
-	protected static void setupPutScriptRequestDeserializer(ObjectDeserializer<PutScriptRequest.Builder> op) {
-
-		op.add(Builder::script, StoredScript._DESERIALIZER, "script");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code put_script}".
-	 */
-	public static final Endpoint<PutScriptRequest, PutScriptResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "PUT";
-
-			},
-
-			// Request path
-			request -> {
-				final int _context = 1 << 0;
-				final int _id = 1 << 1;
-
-				int propsSet = 0;
-
-				if (request.context() != null)
-					propsSet |= _context;
-				propsSet |= _id;
-
-				if (propsSet == (_id)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_scripts");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.id, buf);
-					return buf.toString();
-				}
-				if (propsSet == (_id | _context)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_scripts");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.id, buf);
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.context, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, PutScriptResponse._DESERIALIZER);
+    @Nullable
+    private final String context;
+
+    private final String id;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final StoredScript script;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PutScriptRequest(Builder builder) {
+
+        this.context = builder.context;
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
+        this.timeout = builder.timeout;
+
+    }
+
+    public static PutScriptRequest of(Function<Builder, ObjectBuilder<PutScriptRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Script context
+     * <p>
+     * API name: {@code context}
+     */
+    @Nullable
+    public final String context() {
+        return this.context;
+    }
+
+    /**
+     * Required - Script ID
+     * <p>
+     * API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Required - API name: {@code script}
+     */
+    public final StoredScript script() {
+        return this.script;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("script");
+        this.script.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PutScriptRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutScriptRequest> {
+        @Nullable
+        private String context;
+
+        private String id;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        private StoredScript script;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * Script context
+         * <p>
+         * API name: {@code context}
+         */
+        public final Builder context(@Nullable String value) {
+            this.context = value;
+            return this;
+        }
+
+        /**
+         * Required - Script ID
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(StoredScript value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(Function<StoredScript.Builder, ObjectBuilder<StoredScript>> fn) {
+            return this.script(fn.apply(new StoredScript.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link PutScriptRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutScriptRequest build() {
+            _checkSingleUse();
+
+            return new PutScriptRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PutScriptRequest}
+     */
+    public static final JsonpDeserializer<PutScriptRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PutScriptRequest::setupPutScriptRequestDeserializer
+    );
+
+    protected static void setupPutScriptRequestDeserializer(ObjectDeserializer<PutScriptRequest.Builder> op) {
+
+        op.add(Builder::script, StoredScript._DESERIALIZER, "script");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code put_script}".
+     */
+    public static final Endpoint<PutScriptRequest, PutScriptResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "PUT";
+
+        },
+
+        // Request path
+        request -> {
+            final int _context = 1 << 0;
+            final int _id = 1 << 1;
+
+            int propsSet = 0;
+
+            if (request.context() != null) propsSet |= _context;
+            propsSet |= _id;
+
+            if (propsSet == (_id)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_scripts");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.id, buf);
+                return buf.toString();
+            }
+            if (propsSet == (_id | _context)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_scripts");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.id, buf);
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.context, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        PutScriptResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/PutScriptResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/PutScriptResponse.java
index e7016ed53e..9ad393a642 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/PutScriptResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/PutScriptResponse.java
@@ -32,68 +32,67 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _global.put_script.Response
 
 @JsonpDeserializable
 public class PutScriptResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private PutScriptResponse(Builder builder) {
-		super(builder);
+    private PutScriptResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static PutScriptResponse of(Function<Builder, ObjectBuilder<PutScriptResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static PutScriptResponse of(Function<Builder, ObjectBuilder<PutScriptResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link PutScriptResponse}.
-	 */
+    /**
+     * Builder for {@link PutScriptResponse}.
+     */
 
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PutScriptResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<PutScriptResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link PutScriptResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutScriptResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link PutScriptResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutScriptResponse build() {
+            _checkSingleUse();
 
-			return new PutScriptResponse(this);
-		}
-	}
+            return new PutScriptResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link PutScriptResponse}
-	 */
-	public static final JsonpDeserializer<PutScriptResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PutScriptResponse::setupPutScriptResponseDeserializer);
+    /**
+     * Json deserializer for {@link PutScriptResponse}
+     */
+    public static final JsonpDeserializer<PutScriptResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PutScriptResponse::setupPutScriptResponseDeserializer
+    );
 
-	protected static void setupPutScriptResponseDeserializer(ObjectDeserializer<PutScriptResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+    protected static void setupPutScriptResponseDeserializer(ObjectDeserializer<PutScriptResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/RankEvalRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/RankEvalRequest.java
index 79531eb17f..c8d48ff56a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/RankEvalRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/RankEvalRequest.java
@@ -32,30 +32,29 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.ExpandWildcard;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch.core.rank_eval.RankEvalMetric;
-import org.opensearch.client.opensearch.core.rank_eval.RankEvalRequestItem;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.ExpandWildcard;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch.core.rank_eval.RankEvalMetric;
+import org.opensearch.client.opensearch.core.rank_eval.RankEvalRequestItem;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: _global.rank_eval.Request
 
@@ -66,403 +65,407 @@
  */
 @JsonpDeserializable
 public class RankEvalRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	@Nullable
-	private final RankEvalMetric metric;
-
-	private final List<RankEvalRequestItem> requests;
-
-	@Nullable
-	private final String searchType;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RankEvalRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
-		this.metric = builder.metric;
-		this.requests = ApiTypeHelper.unmodifiableRequired(builder.requests, this, "requests");
-		this.searchType = builder.searchType;
-
-	}
-
-	public static RankEvalRequest of(Function<Builder, ObjectBuilder<RankEvalRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * If false, the request returns an error if any wildcard expression, index
-	 * alias, or _all value targets only missing or closed indices. This behavior
-	 * applies even if the request targets other open indices. For example, a
-	 * request targeting foo*,bar* returns an error if an index starts with foo but
-	 * no index starts with bar.
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * If true, missing or closed indices are not included in the response.
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * Required - Comma-separated list of data streams, indices, and index aliases
-	 * used to limit the request. Wildcard (*) expressions are supported. To target
-	 * all data streams and indices in a cluster, omit this parameter or use _all or
-	 * *.
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Definition of the evaluation metric to calculate
-	 * <p>
-	 * API name: {@code metric}
-	 */
-	@Nullable
-	public final RankEvalMetric metric() {
-		return this.metric;
-	}
-
-	/**
-	 * Required - A set of typical search requests, together with their provided
-	 * ratings
-	 * <p>
-	 * API name: {@code requests}
-	 */
-	public final List<RankEvalRequestItem> requests() {
-		return this.requests;
-	}
-
-	/**
-	 * Search operation type
-	 * <p>
-	 * API name: {@code search_type}
-	 */
-	@Nullable
-	public final String searchType() {
-		return this.searchType;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.metric != null) {
-			generator.writeKey("metric");
-			this.metric.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.requests)) {
-			generator.writeKey("requests");
-			generator.writeStartArray();
-			for (RankEvalRequestItem item0 : this.requests) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RankEvalRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankEvalRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		private List<String> index;
-
-		@Nullable
-		private RankEvalMetric metric;
-
-		private List<RankEvalRequestItem> requests;
-
-		@Nullable
-		private String searchType;
-
-		/**
-		 * If false, the request returns an error if any wildcard expression, index
-		 * alias, or _all value targets only missing or closed indices. This behavior
-		 * applies even if the request targets other open indices. For example, a
-		 * request targeting foo*,bar* returns an error if an index starts with foo but
-		 * no index starts with bar.
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * If true, missing or closed indices are not included in the response.
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Required - Comma-separated list of data streams, indices, and index aliases
-		 * used to limit the request. Wildcard (*) expressions are supported. To target
-		 * all data streams and indices in a cluster, omit this parameter or use _all or
-		 * *.
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * Required - Comma-separated list of data streams, indices, and index aliases
-		 * used to limit the request. Wildcard (*) expressions are supported. To target
-		 * all data streams and indices in a cluster, omit this parameter or use _all or
-		 * *.
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Definition of the evaluation metric to calculate
-		 * <p>
-		 * API name: {@code metric}
-		 */
-		public final Builder metric(@Nullable RankEvalMetric value) {
-			this.metric = value;
-			return this;
-		}
-
-		/**
-		 * Definition of the evaluation metric to calculate
-		 * <p>
-		 * API name: {@code metric}
-		 */
-		public final Builder metric(Function<RankEvalMetric.Builder, ObjectBuilder<RankEvalMetric>> fn) {
-			return this.metric(fn.apply(new RankEvalMetric.Builder()).build());
-		}
-
-		/**
-		 * Required - A set of typical search requests, together with their provided
-		 * ratings
-		 * <p>
-		 * API name: {@code requests}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>requests</code>.
-		 */
-		public final Builder requests(List<RankEvalRequestItem> list) {
-			this.requests = _listAddAll(this.requests, list);
-			return this;
-		}
-
-		/**
-		 * Required - A set of typical search requests, together with their provided
-		 * ratings
-		 * <p>
-		 * API name: {@code requests}
-		 * <p>
-		 * Adds one or more values to <code>requests</code>.
-		 */
-		public final Builder requests(RankEvalRequestItem value, RankEvalRequestItem... values) {
-			this.requests = _listAdd(this.requests, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - A set of typical search requests, together with their provided
-		 * ratings
-		 * <p>
-		 * API name: {@code requests}
-		 * <p>
-		 * Adds a value to <code>requests</code> using a builder lambda.
-		 */
-		public final Builder requests(Function<RankEvalRequestItem.Builder, ObjectBuilder<RankEvalRequestItem>> fn) {
-			return requests(fn.apply(new RankEvalRequestItem.Builder()).build());
-		}
-
-		/**
-		 * Search operation type
-		 * <p>
-		 * API name: {@code search_type}
-		 */
-		public final Builder searchType(@Nullable String value) {
-			this.searchType = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RankEvalRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RankEvalRequest build() {
-			_checkSingleUse();
-
-			return new RankEvalRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RankEvalRequest}
-	 */
-	public static final JsonpDeserializer<RankEvalRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RankEvalRequest::setupRankEvalRequestDeserializer);
-
-	protected static void setupRankEvalRequestDeserializer(ObjectDeserializer<RankEvalRequest.Builder> op) {
-
-		op.add(Builder::metric, RankEvalMetric._DESERIALIZER, "metric");
-		op.add(Builder::requests, JsonpDeserializer.arrayDeserializer(RankEvalRequestItem._DESERIALIZER), "requests");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code rank_eval}".
-	 */
-	public static final Endpoint<RankEvalRequest, RankEvalResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_rank_eval");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_rank_eval");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.searchType != null) {
-					params.put("search_type", request.searchType);
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, RankEvalResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    @Nullable
+    private final RankEvalMetric metric;
+
+    private final List<RankEvalRequestItem> requests;
+
+    @Nullable
+    private final String searchType;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RankEvalRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
+        this.metric = builder.metric;
+        this.requests = ApiTypeHelper.unmodifiableRequired(builder.requests, this, "requests");
+        this.searchType = builder.searchType;
+
+    }
+
+    public static RankEvalRequest of(Function<Builder, ObjectBuilder<RankEvalRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * If false, the request returns an error if any wildcard expression, index
+     * alias, or _all value targets only missing or closed indices. This behavior
+     * applies even if the request targets other open indices. For example, a
+     * request targeting foo*,bar* returns an error if an index starts with foo but
+     * no index starts with bar.
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * If true, missing or closed indices are not included in the response.
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * Required - Comma-separated list of data streams, indices, and index aliases
+     * used to limit the request. Wildcard (*) expressions are supported. To target
+     * all data streams and indices in a cluster, omit this parameter or use _all or
+     * *.
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Definition of the evaluation metric to calculate
+     * <p>
+     * API name: {@code metric}
+     */
+    @Nullable
+    public final RankEvalMetric metric() {
+        return this.metric;
+    }
+
+    /**
+     * Required - A set of typical search requests, together with their provided
+     * ratings
+     * <p>
+     * API name: {@code requests}
+     */
+    public final List<RankEvalRequestItem> requests() {
+        return this.requests;
+    }
+
+    /**
+     * Search operation type
+     * <p>
+     * API name: {@code search_type}
+     */
+    @Nullable
+    public final String searchType() {
+        return this.searchType;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.metric != null) {
+            generator.writeKey("metric");
+            this.metric.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.requests)) {
+            generator.writeKey("requests");
+            generator.writeStartArray();
+            for (RankEvalRequestItem item0 : this.requests) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RankEvalRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankEvalRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        private List<String> index;
+
+        @Nullable
+        private RankEvalMetric metric;
+
+        private List<RankEvalRequestItem> requests;
+
+        @Nullable
+        private String searchType;
+
+        /**
+         * If false, the request returns an error if any wildcard expression, index
+         * alias, or _all value targets only missing or closed indices. This behavior
+         * applies even if the request targets other open indices. For example, a
+         * request targeting foo*,bar* returns an error if an index starts with foo but
+         * no index starts with bar.
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * If true, missing or closed indices are not included in the response.
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Required - Comma-separated list of data streams, indices, and index aliases
+         * used to limit the request. Wildcard (*) expressions are supported. To target
+         * all data streams and indices in a cluster, omit this parameter or use _all or
+         * *.
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * Required - Comma-separated list of data streams, indices, and index aliases
+         * used to limit the request. Wildcard (*) expressions are supported. To target
+         * all data streams and indices in a cluster, omit this parameter or use _all or
+         * *.
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Definition of the evaluation metric to calculate
+         * <p>
+         * API name: {@code metric}
+         */
+        public final Builder metric(@Nullable RankEvalMetric value) {
+            this.metric = value;
+            return this;
+        }
+
+        /**
+         * Definition of the evaluation metric to calculate
+         * <p>
+         * API name: {@code metric}
+         */
+        public final Builder metric(Function<RankEvalMetric.Builder, ObjectBuilder<RankEvalMetric>> fn) {
+            return this.metric(fn.apply(new RankEvalMetric.Builder()).build());
+        }
+
+        /**
+         * Required - A set of typical search requests, together with their provided
+         * ratings
+         * <p>
+         * API name: {@code requests}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>requests</code>.
+         */
+        public final Builder requests(List<RankEvalRequestItem> list) {
+            this.requests = _listAddAll(this.requests, list);
+            return this;
+        }
+
+        /**
+         * Required - A set of typical search requests, together with their provided
+         * ratings
+         * <p>
+         * API name: {@code requests}
+         * <p>
+         * Adds one or more values to <code>requests</code>.
+         */
+        public final Builder requests(RankEvalRequestItem value, RankEvalRequestItem... values) {
+            this.requests = _listAdd(this.requests, value, values);
+            return this;
+        }
+
+        /**
+         * Required - A set of typical search requests, together with their provided
+         * ratings
+         * <p>
+         * API name: {@code requests}
+         * <p>
+         * Adds a value to <code>requests</code> using a builder lambda.
+         */
+        public final Builder requests(Function<RankEvalRequestItem.Builder, ObjectBuilder<RankEvalRequestItem>> fn) {
+            return requests(fn.apply(new RankEvalRequestItem.Builder()).build());
+        }
+
+        /**
+         * Search operation type
+         * <p>
+         * API name: {@code search_type}
+         */
+        public final Builder searchType(@Nullable String value) {
+            this.searchType = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RankEvalRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RankEvalRequest build() {
+            _checkSingleUse();
+
+            return new RankEvalRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RankEvalRequest}
+     */
+    public static final JsonpDeserializer<RankEvalRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RankEvalRequest::setupRankEvalRequestDeserializer
+    );
+
+    protected static void setupRankEvalRequestDeserializer(ObjectDeserializer<RankEvalRequest.Builder> op) {
+
+        op.add(Builder::metric, RankEvalMetric._DESERIALIZER, "metric");
+        op.add(Builder::requests, JsonpDeserializer.arrayDeserializer(RankEvalRequestItem._DESERIALIZER), "requests");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code rank_eval}".
+     */
+    public static final Endpoint<RankEvalRequest, RankEvalResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_rank_eval");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_rank_eval");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.searchType != null) {
+                params.put("search_type", request.searchType);
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        RankEvalResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/RankEvalResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/RankEvalResponse.java
index 0ac249bbda..4d5a6dd747 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/RankEvalResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/RankEvalResponse.java
@@ -32,7 +32,9 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch.core.rank_eval.RankEvalMetricDetail;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,213 +42,210 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.rank_eval.RankEvalMetricDetail;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _global.rank_eval.Response
 
 @JsonpDeserializable
 public class RankEvalResponse implements JsonpSerializable {
-	private final double metricScore;
+    private final double metricScore;
 
-	private final Map<String, RankEvalMetricDetail> details;
-
-	private final Map<String, JsonData> failures;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RankEvalResponse(Builder builder) {
-
-		this.metricScore = ApiTypeHelper.requireNonNull(builder.metricScore, this, "metricScore");
-		this.details = ApiTypeHelper.unmodifiableRequired(builder.details, this, "details");
-		this.failures = ApiTypeHelper.unmodifiableRequired(builder.failures, this, "failures");
-
-	}
-
-	public static RankEvalResponse of(Function<Builder, ObjectBuilder<RankEvalResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - The overall evaluation quality calculated by the defined metric
-	 * <p>
-	 * API name: {@code metric_score}
-	 */
-	public final double metricScore() {
-		return this.metricScore;
-	}
-
-	/**
-	 * Required - The details section contains one entry for every query in the
-	 * original requests section, keyed by the search request id
-	 * <p>
-	 * API name: {@code details}
-	 */
-	public final Map<String, RankEvalMetricDetail> details() {
-		return this.details;
-	}
-
-	/**
-	 * Required - API name: {@code failures}
-	 */
-	public final Map<String, JsonData> failures() {
-		return this.failures;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("metric_score");
-		generator.write(this.metricScore);
-
-		if (ApiTypeHelper.isDefined(this.details)) {
-			generator.writeKey("details");
-			generator.writeStartObject();
-			for (Map.Entry<String, RankEvalMetricDetail> item0 : this.details.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.failures)) {
-			generator.writeKey("failures");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.failures.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RankEvalResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankEvalResponse> {
-		private Double metricScore;
-
-		private Map<String, RankEvalMetricDetail> details;
-
-		private Map<String, JsonData> failures;
-
-		/**
-		 * Required - The overall evaluation quality calculated by the defined metric
-		 * <p>
-		 * API name: {@code metric_score}
-		 */
-		public final Builder metricScore(double value) {
-			this.metricScore = value;
-			return this;
-		}
-
-		/**
-		 * Required - The details section contains one entry for every query in the
-		 * original requests section, keyed by the search request id
-		 * <p>
-		 * API name: {@code details}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>details</code>.
-		 */
-		public final Builder details(Map<String, RankEvalMetricDetail> map) {
-			this.details = _mapPutAll(this.details, map);
-			return this;
-		}
-
-		/**
-		 * Required - The details section contains one entry for every query in the
-		 * original requests section, keyed by the search request id
-		 * <p>
-		 * API name: {@code details}
-		 * <p>
-		 * Adds an entry to <code>details</code>.
-		 */
-		public final Builder details(String key, RankEvalMetricDetail value) {
-			this.details = _mapPut(this.details, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - The details section contains one entry for every query in the
-		 * original requests section, keyed by the search request id
-		 * <p>
-		 * API name: {@code details}
-		 * <p>
-		 * Adds an entry to <code>details</code> using a builder lambda.
-		 */
-		public final Builder details(String key,
-				Function<RankEvalMetricDetail.Builder, ObjectBuilder<RankEvalMetricDetail>> fn) {
-			return details(key, fn.apply(new RankEvalMetricDetail.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code failures}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>failures</code>.
-		 */
-		public final Builder failures(Map<String, JsonData> map) {
-			this.failures = _mapPutAll(this.failures, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code failures}
-		 * <p>
-		 * Adds an entry to <code>failures</code>.
-		 */
-		public final Builder failures(String key, JsonData value) {
-			this.failures = _mapPut(this.failures, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RankEvalResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RankEvalResponse build() {
-			_checkSingleUse();
-
-			return new RankEvalResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RankEvalResponse}
-	 */
-	public static final JsonpDeserializer<RankEvalResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RankEvalResponse::setupRankEvalResponseDeserializer);
-
-	protected static void setupRankEvalResponseDeserializer(ObjectDeserializer<RankEvalResponse.Builder> op) {
-
-		op.add(Builder::metricScore, JsonpDeserializer.doubleDeserializer(), "metric_score");
-		op.add(Builder::details, JsonpDeserializer.stringMapDeserializer(RankEvalMetricDetail._DESERIALIZER),
-				"details");
-		op.add(Builder::failures, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "failures");
-
-	}
+    private final Map<String, RankEvalMetricDetail> details;
+
+    private final Map<String, JsonData> failures;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RankEvalResponse(Builder builder) {
+
+        this.metricScore = ApiTypeHelper.requireNonNull(builder.metricScore, this, "metricScore");
+        this.details = ApiTypeHelper.unmodifiableRequired(builder.details, this, "details");
+        this.failures = ApiTypeHelper.unmodifiableRequired(builder.failures, this, "failures");
+
+    }
+
+    public static RankEvalResponse of(Function<Builder, ObjectBuilder<RankEvalResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - The overall evaluation quality calculated by the defined metric
+     * <p>
+     * API name: {@code metric_score}
+     */
+    public final double metricScore() {
+        return this.metricScore;
+    }
+
+    /**
+     * Required - The details section contains one entry for every query in the
+     * original requests section, keyed by the search request id
+     * <p>
+     * API name: {@code details}
+     */
+    public final Map<String, RankEvalMetricDetail> details() {
+        return this.details;
+    }
+
+    /**
+     * Required - API name: {@code failures}
+     */
+    public final Map<String, JsonData> failures() {
+        return this.failures;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("metric_score");
+        generator.write(this.metricScore);
+
+        if (ApiTypeHelper.isDefined(this.details)) {
+            generator.writeKey("details");
+            generator.writeStartObject();
+            for (Map.Entry<String, RankEvalMetricDetail> item0 : this.details.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.failures)) {
+            generator.writeKey("failures");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.failures.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RankEvalResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankEvalResponse> {
+        private Double metricScore;
+
+        private Map<String, RankEvalMetricDetail> details;
+
+        private Map<String, JsonData> failures;
+
+        /**
+         * Required - The overall evaluation quality calculated by the defined metric
+         * <p>
+         * API name: {@code metric_score}
+         */
+        public final Builder metricScore(double value) {
+            this.metricScore = value;
+            return this;
+        }
+
+        /**
+         * Required - The details section contains one entry for every query in the
+         * original requests section, keyed by the search request id
+         * <p>
+         * API name: {@code details}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>details</code>.
+         */
+        public final Builder details(Map<String, RankEvalMetricDetail> map) {
+            this.details = _mapPutAll(this.details, map);
+            return this;
+        }
+
+        /**
+         * Required - The details section contains one entry for every query in the
+         * original requests section, keyed by the search request id
+         * <p>
+         * API name: {@code details}
+         * <p>
+         * Adds an entry to <code>details</code>.
+         */
+        public final Builder details(String key, RankEvalMetricDetail value) {
+            this.details = _mapPut(this.details, key, value);
+            return this;
+        }
+
+        /**
+         * Required - The details section contains one entry for every query in the
+         * original requests section, keyed by the search request id
+         * <p>
+         * API name: {@code details}
+         * <p>
+         * Adds an entry to <code>details</code> using a builder lambda.
+         */
+        public final Builder details(String key, Function<RankEvalMetricDetail.Builder, ObjectBuilder<RankEvalMetricDetail>> fn) {
+            return details(key, fn.apply(new RankEvalMetricDetail.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code failures}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>failures</code>.
+         */
+        public final Builder failures(Map<String, JsonData> map) {
+            this.failures = _mapPutAll(this.failures, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code failures}
+         * <p>
+         * Adds an entry to <code>failures</code>.
+         */
+        public final Builder failures(String key, JsonData value) {
+            this.failures = _mapPut(this.failures, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link RankEvalResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RankEvalResponse build() {
+            _checkSingleUse();
+
+            return new RankEvalResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RankEvalResponse}
+     */
+    public static final JsonpDeserializer<RankEvalResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RankEvalResponse::setupRankEvalResponseDeserializer
+    );
+
+    protected static void setupRankEvalResponseDeserializer(ObjectDeserializer<RankEvalResponse.Builder> op) {
+
+        op.add(Builder::metricScore, JsonpDeserializer.doubleDeserializer(), "metric_score");
+        op.add(Builder::details, JsonpDeserializer.stringMapDeserializer(RankEvalMetricDetail._DESERIALIZER), "details");
+        op.add(Builder::failures, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "failures");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/ReindexRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/ReindexRequest.java
index 821d14024e..15e1998f11 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/ReindexRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/ReindexRequest.java
@@ -32,6 +32,17 @@
 
 package org.opensearch.client.opensearch.core;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpDeserializable;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.json.ObjectBuilderDeserializer;
+import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.opensearch._types.Conflicts;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -40,22 +51,10 @@
 import org.opensearch.client.opensearch._types.WaitForActiveShards;
 import org.opensearch.client.opensearch.core.reindex.Destination;
 import org.opensearch.client.opensearch.core.reindex.Source;
-import org.opensearch.client.json.JsonpDeserializable;
-import org.opensearch.client.json.JsonpDeserializer;
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
-import org.opensearch.client.json.ObjectBuilderDeserializer;
-import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.reindex.Request
 
@@ -67,564 +66,569 @@
  */
 @JsonpDeserializable
 public class ReindexRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final Conflicts conflicts;
-
-	@Nullable
-	private final Destination dest;
-
-	@Nullable
-	private final Long maxDocs;
-
-	@Nullable
-	private final Boolean refresh;
-
-	@Nullable
-	private final Long requestsPerSecond;
-
-	@Nullable
-	private final Boolean requireAlias;
-
-	@Nullable
-	private final Script script;
-
-	@Nullable
-	private final Time scroll;
-
-	@Nullable
-	private final Long size;
-
-	@Nullable
-	private final Long slices;
-
-	@Nullable
-	private final Source source;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final WaitForActiveShards waitForActiveShards;
-
-	@Nullable
-	private final Boolean waitForCompletion;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ReindexRequest(Builder builder) {
-
-		this.conflicts = builder.conflicts;
-		this.dest = builder.dest;
-		this.maxDocs = builder.maxDocs;
-		this.refresh = builder.refresh;
-		this.requestsPerSecond = builder.requestsPerSecond;
-		this.requireAlias = builder.requireAlias;
-		this.script = builder.script;
-		this.scroll = builder.scroll;
-		this.size = builder.size;
-		this.slices = builder.slices;
-		this.source = builder.source;
-		this.timeout = builder.timeout;
-		this.waitForActiveShards = builder.waitForActiveShards;
-		this.waitForCompletion = builder.waitForCompletion;
-
-	}
-
-	public static ReindexRequest of(Function<Builder, ObjectBuilder<ReindexRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code conflicts}
-	 */
-	@Nullable
-	public final Conflicts conflicts() {
-		return this.conflicts;
-	}
-
-	/**
-	 * API name: {@code dest}
-	 */
-	@Nullable
-	public final Destination dest() {
-		return this.dest;
-	}
-
-	/**
-	 * API name: {@code max_docs}
-	 */
-	@Nullable
-	public final Long maxDocs() {
-		return this.maxDocs;
-	}
-
-	/**
-	 * Should the affected indexes be refreshed?
-	 * <p>
-	 * API name: {@code refresh}
-	 */
-	@Nullable
-	public final Boolean refresh() {
-		return this.refresh;
-	}
-
-	/**
-	 * The throttle to set on this request in sub-requests per second. -1 means no
-	 * throttle.
-	 * <p>
-	 * API name: {@code requests_per_second}
-	 */
-	@Nullable
-	public final Long requestsPerSecond() {
-		return this.requestsPerSecond;
-	}
-
-	/**
-	 * API name: {@code require_alias}
-	 */
-	@Nullable
-	public final Boolean requireAlias() {
-		return this.requireAlias;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final Script script() {
-		return this.script;
-	}
-
-	/**
-	 * Control how long to keep the search context alive
-	 * <p>
-	 * API name: {@code scroll}
-	 */
-	@Nullable
-	public final Time scroll() {
-		return this.scroll;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Long size() {
-		return this.size;
-	}
-
-	/**
-	 * The number of slices this task should be divided into. Defaults to 1, meaning
-	 * the task isn't sliced into subtasks. Can be set to 0 for <code>auto</code>.
-	 * <p>
-	 * API name: {@code slices}
-	 */
-	@Nullable
-	public final Long slices() {
-		return this.slices;
-	}
-
-	/**
-	 * API name: {@code source}
-	 */
-	@Nullable
-	public final Source source() {
-		return this.source;
-	}
-
-	/**
-	 * Time each individual bulk request should wait for shards that are
-	 * unavailable.
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Sets the number of shard copies that must be active before proceeding with
-	 * the reindex operation. Defaults to 1, meaning the primary shard only. Set to
-	 * <code>all</code> for all shard copies, otherwise set to any non-negative
-	 * value less than or equal to the total number of copies for the shard (number
-	 * of replicas + 1)
-	 * <p>
-	 * API name: {@code wait_for_active_shards}
-	 */
-	@Nullable
-	public final WaitForActiveShards waitForActiveShards() {
-		return this.waitForActiveShards;
-	}
-
-	/**
-	 * Should the request should block until the reindex is complete.
-	 * <p>
-	 * API name: {@code wait_for_completion}
-	 */
-	@Nullable
-	public final Boolean waitForCompletion() {
-		return this.waitForCompletion;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.conflicts != null) {
-			generator.writeKey("conflicts");
-			this.conflicts.serialize(generator, mapper);
-		}
-		if (this.dest != null) {
-			generator.writeKey("dest");
-			this.dest.serialize(generator, mapper);
-
-		}
-		if (this.maxDocs != null) {
-			generator.writeKey("max_docs");
-			generator.write(this.maxDocs);
-
-		}
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		if (this.source != null) {
-			generator.writeKey("source");
-			this.source.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ReindexRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ReindexRequest> {
-		@Nullable
-		private Conflicts conflicts;
-
-		@Nullable
-		private Destination dest;
-
-		@Nullable
-		private Long maxDocs;
-
-		@Nullable
-		private Boolean refresh;
-
-		@Nullable
-		private Long requestsPerSecond;
-
-		@Nullable
-		private Boolean requireAlias;
-
-		@Nullable
-		private Script script;
-
-		@Nullable
-		private Time scroll;
-
-		@Nullable
-		private Long size;
-
-		@Nullable
-		private Long slices;
-
-		@Nullable
-		private Source source;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private WaitForActiveShards waitForActiveShards;
-
-		@Nullable
-		private Boolean waitForCompletion;
-
-		/**
-		 * API name: {@code conflicts}
-		 */
-		public final Builder conflicts(@Nullable Conflicts value) {
-			this.conflicts = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code dest}
-		 */
-		public final Builder dest(@Nullable Destination value) {
-			this.dest = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code dest}
-		 */
-		public final Builder dest(Function<Destination.Builder, ObjectBuilder<Destination>> fn) {
-			return this.dest(fn.apply(new Destination.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code max_docs}
-		 */
-		public final Builder maxDocs(@Nullable Long value) {
-			this.maxDocs = value;
-			return this;
-		}
-
-		/**
-		 * Should the affected indexes be refreshed?
-		 * <p>
-		 * API name: {@code refresh}
-		 */
-		public final Builder refresh(@Nullable Boolean value) {
-			this.refresh = value;
-			return this;
-		}
-
-		/**
-		 * The throttle to set on this request in sub-requests per second. -1 means no
-		 * throttle.
-		 * <p>
-		 * API name: {@code requests_per_second}
-		 */
-		public final Builder requestsPerSecond(@Nullable Long value) {
-			this.requestsPerSecond = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code require_alias}
-		 */
-		public final Builder requireAlias(@Nullable Boolean value) {
-			this.requireAlias = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(@Nullable Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		/**
-		 * Control how long to keep the search context alive
-		 * <p>
-		 * API name: {@code scroll}
-		 */
-		public final Builder scroll(@Nullable Time value) {
-			this.scroll = value;
-			return this;
-		}
-
-		/**
-		 * Control how long to keep the search context alive
-		 * <p>
-		 * API name: {@code scroll}
-		 */
-		public final Builder scroll(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.scroll(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Long value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * The number of slices this task should be divided into. Defaults to 1, meaning
-		 * the task isn't sliced into subtasks. Can be set to 0 for <code>auto</code>.
-		 * <p>
-		 * API name: {@code slices}
-		 */
-		public final Builder slices(@Nullable Long value) {
-			this.slices = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code source}
-		 */
-		public final Builder source(@Nullable Source value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code source}
-		 */
-		public final Builder source(Function<Source.Builder, ObjectBuilder<Source>> fn) {
-			return this.source(fn.apply(new Source.Builder()).build());
-		}
-
-		/**
-		 * Time each individual bulk request should wait for shards that are
-		 * unavailable.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Time each individual bulk request should wait for shards that are
-		 * unavailable.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Sets the number of shard copies that must be active before proceeding with
-		 * the reindex operation. Defaults to 1, meaning the primary shard only. Set to
-		 * <code>all</code> for all shard copies, otherwise set to any non-negative
-		 * value less than or equal to the total number of copies for the shard (number
-		 * of replicas + 1)
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
-			this.waitForActiveShards = value;
-			return this;
-		}
-
-		/**
-		 * Sets the number of shard copies that must be active before proceeding with
-		 * the reindex operation. Defaults to 1, meaning the primary shard only. Set to
-		 * <code>all</code> for all shard copies, otherwise set to any non-negative
-		 * value less than or equal to the total number of copies for the shard (number
-		 * of replicas + 1)
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(
-				Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
-			return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
-		}
-
-		/**
-		 * Should the request should block until the reindex is complete.
-		 * <p>
-		 * API name: {@code wait_for_completion}
-		 */
-		public final Builder waitForCompletion(@Nullable Boolean value) {
-			this.waitForCompletion = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ReindexRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ReindexRequest build() {
-			_checkSingleUse();
-
-			return new ReindexRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ReindexRequest}
-	 */
-	public static final JsonpDeserializer<ReindexRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ReindexRequest::setupReindexRequestDeserializer);
-
-	protected static void setupReindexRequestDeserializer(ObjectDeserializer<ReindexRequest.Builder> op) {
-
-		op.add(Builder::conflicts, Conflicts._DESERIALIZER, "conflicts");
-		op.add(Builder::dest, Destination._DESERIALIZER, "dest");
-		op.add(Builder::maxDocs, JsonpDeserializer.longDeserializer(), "max_docs");
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-		op.add(Builder::size, JsonpDeserializer.longDeserializer(), "size");
-		op.add(Builder::source, Source._DESERIALIZER, "source");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code reindex}".
-	 */
-	public static final Endpoint<ReindexRequest, ReindexResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				return "/_reindex";
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.slices != null) {
-					params.put("slices", request.slices == 0 ? "auto" : String.valueOf(request.slices));
-				}
-				if (request.requestsPerSecond != null) {
-					params.put("requests_per_second", String.valueOf(request.requestsPerSecond));
-				}
-				if (request.requireAlias != null) {
-					params.put("require_alias", String.valueOf(request.requireAlias));
-				}
-				if (request.scroll != null) {
-					params.put("scroll", request.scroll._toJsonString());
-				}
-				if (request.refresh != null) {
-					params.put("refresh", String.valueOf(request.refresh));
-				}
-				if (request.waitForActiveShards != null) {
-					params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
-				}
-				if (request.waitForCompletion != null) {
-					params.put("wait_for_completion", String.valueOf(request.waitForCompletion));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, ReindexResponse._DESERIALIZER);
+    @Nullable
+    private final Conflicts conflicts;
+
+    @Nullable
+    private final Destination dest;
+
+    @Nullable
+    private final Long maxDocs;
+
+    @Nullable
+    private final Boolean refresh;
+
+    @Nullable
+    private final Long requestsPerSecond;
+
+    @Nullable
+    private final Boolean requireAlias;
+
+    @Nullable
+    private final Script script;
+
+    @Nullable
+    private final Time scroll;
+
+    @Nullable
+    private final Long size;
+
+    @Nullable
+    private final Long slices;
+
+    @Nullable
+    private final Source source;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final WaitForActiveShards waitForActiveShards;
+
+    @Nullable
+    private final Boolean waitForCompletion;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ReindexRequest(Builder builder) {
+
+        this.conflicts = builder.conflicts;
+        this.dest = builder.dest;
+        this.maxDocs = builder.maxDocs;
+        this.refresh = builder.refresh;
+        this.requestsPerSecond = builder.requestsPerSecond;
+        this.requireAlias = builder.requireAlias;
+        this.script = builder.script;
+        this.scroll = builder.scroll;
+        this.size = builder.size;
+        this.slices = builder.slices;
+        this.source = builder.source;
+        this.timeout = builder.timeout;
+        this.waitForActiveShards = builder.waitForActiveShards;
+        this.waitForCompletion = builder.waitForCompletion;
+
+    }
+
+    public static ReindexRequest of(Function<Builder, ObjectBuilder<ReindexRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code conflicts}
+     */
+    @Nullable
+    public final Conflicts conflicts() {
+        return this.conflicts;
+    }
+
+    /**
+     * API name: {@code dest}
+     */
+    @Nullable
+    public final Destination dest() {
+        return this.dest;
+    }
+
+    /**
+     * API name: {@code max_docs}
+     */
+    @Nullable
+    public final Long maxDocs() {
+        return this.maxDocs;
+    }
+
+    /**
+     * Should the affected indexes be refreshed?
+     * <p>
+     * API name: {@code refresh}
+     */
+    @Nullable
+    public final Boolean refresh() {
+        return this.refresh;
+    }
+
+    /**
+     * The throttle to set on this request in sub-requests per second. -1 means no
+     * throttle.
+     * <p>
+     * API name: {@code requests_per_second}
+     */
+    @Nullable
+    public final Long requestsPerSecond() {
+        return this.requestsPerSecond;
+    }
+
+    /**
+     * API name: {@code require_alias}
+     */
+    @Nullable
+    public final Boolean requireAlias() {
+        return this.requireAlias;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final Script script() {
+        return this.script;
+    }
+
+    /**
+     * Control how long to keep the search context alive
+     * <p>
+     * API name: {@code scroll}
+     */
+    @Nullable
+    public final Time scroll() {
+        return this.scroll;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Long size() {
+        return this.size;
+    }
+
+    /**
+     * The number of slices this task should be divided into. Defaults to 1, meaning
+     * the task isn't sliced into subtasks. Can be set to 0 for <code>auto</code>.
+     * <p>
+     * API name: {@code slices}
+     */
+    @Nullable
+    public final Long slices() {
+        return this.slices;
+    }
+
+    /**
+     * API name: {@code source}
+     */
+    @Nullable
+    public final Source source() {
+        return this.source;
+    }
+
+    /**
+     * Time each individual bulk request should wait for shards that are
+     * unavailable.
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Sets the number of shard copies that must be active before proceeding with
+     * the reindex operation. Defaults to 1, meaning the primary shard only. Set to
+     * <code>all</code> for all shard copies, otherwise set to any non-negative
+     * value less than or equal to the total number of copies for the shard (number
+     * of replicas + 1)
+     * <p>
+     * API name: {@code wait_for_active_shards}
+     */
+    @Nullable
+    public final WaitForActiveShards waitForActiveShards() {
+        return this.waitForActiveShards;
+    }
+
+    /**
+     * Should the request should block until the reindex is complete.
+     * <p>
+     * API name: {@code wait_for_completion}
+     */
+    @Nullable
+    public final Boolean waitForCompletion() {
+        return this.waitForCompletion;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.conflicts != null) {
+            generator.writeKey("conflicts");
+            this.conflicts.serialize(generator, mapper);
+        }
+        if (this.dest != null) {
+            generator.writeKey("dest");
+            this.dest.serialize(generator, mapper);
+
+        }
+        if (this.maxDocs != null) {
+            generator.writeKey("max_docs");
+            generator.write(this.maxDocs);
+
+        }
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        if (this.source != null) {
+            generator.writeKey("source");
+            this.source.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ReindexRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ReindexRequest> {
+        @Nullable
+        private Conflicts conflicts;
+
+        @Nullable
+        private Destination dest;
+
+        @Nullable
+        private Long maxDocs;
+
+        @Nullable
+        private Boolean refresh;
+
+        @Nullable
+        private Long requestsPerSecond;
+
+        @Nullable
+        private Boolean requireAlias;
+
+        @Nullable
+        private Script script;
+
+        @Nullable
+        private Time scroll;
+
+        @Nullable
+        private Long size;
+
+        @Nullable
+        private Long slices;
+
+        @Nullable
+        private Source source;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private WaitForActiveShards waitForActiveShards;
+
+        @Nullable
+        private Boolean waitForCompletion;
+
+        /**
+         * API name: {@code conflicts}
+         */
+        public final Builder conflicts(@Nullable Conflicts value) {
+            this.conflicts = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code dest}
+         */
+        public final Builder dest(@Nullable Destination value) {
+            this.dest = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code dest}
+         */
+        public final Builder dest(Function<Destination.Builder, ObjectBuilder<Destination>> fn) {
+            return this.dest(fn.apply(new Destination.Builder()).build());
+        }
+
+        /**
+         * API name: {@code max_docs}
+         */
+        public final Builder maxDocs(@Nullable Long value) {
+            this.maxDocs = value;
+            return this;
+        }
+
+        /**
+         * Should the affected indexes be refreshed?
+         * <p>
+         * API name: {@code refresh}
+         */
+        public final Builder refresh(@Nullable Boolean value) {
+            this.refresh = value;
+            return this;
+        }
+
+        /**
+         * The throttle to set on this request in sub-requests per second. -1 means no
+         * throttle.
+         * <p>
+         * API name: {@code requests_per_second}
+         */
+        public final Builder requestsPerSecond(@Nullable Long value) {
+            this.requestsPerSecond = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code require_alias}
+         */
+        public final Builder requireAlias(@Nullable Boolean value) {
+            this.requireAlias = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(@Nullable Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * Control how long to keep the search context alive
+         * <p>
+         * API name: {@code scroll}
+         */
+        public final Builder scroll(@Nullable Time value) {
+            this.scroll = value;
+            return this;
+        }
+
+        /**
+         * Control how long to keep the search context alive
+         * <p>
+         * API name: {@code scroll}
+         */
+        public final Builder scroll(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.scroll(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Long value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * The number of slices this task should be divided into. Defaults to 1, meaning
+         * the task isn't sliced into subtasks. Can be set to 0 for <code>auto</code>.
+         * <p>
+         * API name: {@code slices}
+         */
+        public final Builder slices(@Nullable Long value) {
+            this.slices = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code source}
+         */
+        public final Builder source(@Nullable Source value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code source}
+         */
+        public final Builder source(Function<Source.Builder, ObjectBuilder<Source>> fn) {
+            return this.source(fn.apply(new Source.Builder()).build());
+        }
+
+        /**
+         * Time each individual bulk request should wait for shards that are
+         * unavailable.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Time each individual bulk request should wait for shards that are
+         * unavailable.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Sets the number of shard copies that must be active before proceeding with
+         * the reindex operation. Defaults to 1, meaning the primary shard only. Set to
+         * <code>all</code> for all shard copies, otherwise set to any non-negative
+         * value less than or equal to the total number of copies for the shard (number
+         * of replicas + 1)
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
+            this.waitForActiveShards = value;
+            return this;
+        }
+
+        /**
+         * Sets the number of shard copies that must be active before proceeding with
+         * the reindex operation. Defaults to 1, meaning the primary shard only. Set to
+         * <code>all</code> for all shard copies, otherwise set to any non-negative
+         * value less than or equal to the total number of copies for the shard (number
+         * of replicas + 1)
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
+            return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
+        }
+
+        /**
+         * Should the request should block until the reindex is complete.
+         * <p>
+         * API name: {@code wait_for_completion}
+         */
+        public final Builder waitForCompletion(@Nullable Boolean value) {
+            this.waitForCompletion = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ReindexRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ReindexRequest build() {
+            _checkSingleUse();
+
+            return new ReindexRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ReindexRequest}
+     */
+    public static final JsonpDeserializer<ReindexRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ReindexRequest::setupReindexRequestDeserializer
+    );
+
+    protected static void setupReindexRequestDeserializer(ObjectDeserializer<ReindexRequest.Builder> op) {
+
+        op.add(Builder::conflicts, Conflicts._DESERIALIZER, "conflicts");
+        op.add(Builder::dest, Destination._DESERIALIZER, "dest");
+        op.add(Builder::maxDocs, JsonpDeserializer.longDeserializer(), "max_docs");
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+        op.add(Builder::size, JsonpDeserializer.longDeserializer(), "size");
+        op.add(Builder::source, Source._DESERIALIZER, "source");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code reindex}".
+     */
+    public static final Endpoint<ReindexRequest, ReindexResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            return "/_reindex";
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.slices != null) {
+                params.put("slices", request.slices == 0 ? "auto" : String.valueOf(request.slices));
+            }
+            if (request.requestsPerSecond != null) {
+                params.put("requests_per_second", String.valueOf(request.requestsPerSecond));
+            }
+            if (request.requireAlias != null) {
+                params.put("require_alias", String.valueOf(request.requireAlias));
+            }
+            if (request.scroll != null) {
+                params.put("scroll", request.scroll._toJsonString());
+            }
+            if (request.refresh != null) {
+                params.put("refresh", String.valueOf(request.refresh));
+            }
+            if (request.waitForActiveShards != null) {
+                params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
+            }
+            if (request.waitForCompletion != null) {
+                params.put("wait_for_completion", String.valueOf(request.waitForCompletion));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        ReindexResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/ReindexResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/ReindexResponse.java
index 28f670ddae..225d1af6bd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/ReindexResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/ReindexResponse.java
@@ -32,589 +32,587 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.BulkIndexByScrollFailure;
-import org.opensearch.client.opensearch._types.Retries;
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.BulkIndexByScrollFailure;
+import org.opensearch.client.opensearch._types.Retries;
+import org.opensearch.client.opensearch._types.Time;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.reindex.Response
 
-
 @JsonpDeserializable
 public class ReindexResponse implements JsonpSerializable {
-	@Nullable
-	private final Long batches;
-
-	@Nullable
-	private final Long created;
-
-	@Nullable
-	private final Long deleted;
-
-	private final List<BulkIndexByScrollFailure> failures;
-
-	@Nullable
-	private final Long noops;
-
-	@Nullable
-	private final Retries retries;
-
-	@Nullable
-	private final Long requestsPerSecond;
-
-	@Nullable
-	private final Integer sliceId;
-
-	@Nullable
-	private final String task;
-
-	@Nullable
-	private final String throttledMillis;
-
-	@Nullable
-	private final String throttledUntilMillis;
-
-	@Nullable
-	private final Boolean timedOut;
-
-	@Nullable
-	private final Time took;
-
-	@Nullable
-	private final Long total;
-
-	@Nullable
-	private final Long updated;
-
-	@Nullable
-	private final Long versionConflicts;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ReindexResponse(Builder builder) {
-
-		this.batches = builder.batches;
-		this.created = builder.created;
-		this.deleted = builder.deleted;
-		this.failures = ApiTypeHelper.unmodifiable(builder.failures);
-		this.noops = builder.noops;
-		this.retries = builder.retries;
-		this.requestsPerSecond = builder.requestsPerSecond;
-		this.sliceId = builder.sliceId;
-		this.task = builder.task;
-		this.throttledMillis = builder.throttledMillis;
-		this.throttledUntilMillis = builder.throttledUntilMillis;
-		this.timedOut = builder.timedOut;
-		this.took = builder.took;
-		this.total = builder.total;
-		this.updated = builder.updated;
-		this.versionConflicts = builder.versionConflicts;
-
-	}
-
-	public static ReindexResponse of(Function<Builder, ObjectBuilder<ReindexResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code batches}
-	 */
-	@Nullable
-	public final Long batches() {
-		return this.batches;
-	}
-
-	/**
-	 * API name: {@code created}
-	 */
-	@Nullable
-	public final Long created() {
-		return this.created;
-	}
-
-	/**
-	 * API name: {@code deleted}
-	 */
-	@Nullable
-	public final Long deleted() {
-		return this.deleted;
-	}
-
-	/**
-	 * API name: {@code failures}
-	 */
-	public final List<BulkIndexByScrollFailure> failures() {
-		return this.failures;
-	}
-
-	/**
-	 * API name: {@code noops}
-	 */
-	@Nullable
-	public final Long noops() {
-		return this.noops;
-	}
-
-	/**
-	 * API name: {@code retries}
-	 */
-	@Nullable
-	public final Retries retries() {
-		return this.retries;
-	}
-
-	/**
-	 * API name: {@code requests_per_second}
-	 */
-	@Nullable
-	public final Long requestsPerSecond() {
-		return this.requestsPerSecond;
-	}
-
-	/**
-	 * API name: {@code slice_id}
-	 */
-	@Nullable
-	public final Integer sliceId() {
-		return this.sliceId;
-	}
-
-	/**
-	 * API name: {@code task}
-	 */
-	@Nullable
-	public final String task() {
-		return this.task;
-	}
-
-	/**
-	 * API name: {@code throttled_millis}
-	 */
-	@Nullable
-	public final String throttledMillis() {
-		return this.throttledMillis;
-	}
-
-	/**
-	 * API name: {@code throttled_until_millis}
-	 */
-	@Nullable
-	public final String throttledUntilMillis() {
-		return this.throttledUntilMillis;
-	}
-
-	/**
-	 * API name: {@code timed_out}
-	 */
-	@Nullable
-	public final Boolean timedOut() {
-		return this.timedOut;
-	}
-
-	/**
-	 * API name: {@code took}
-	 */
-	@Nullable
-	public final Time took() {
-		return this.took;
-	}
-
-	/**
-	 * API name: {@code total}
-	 */
-	@Nullable
-	public final Long total() {
-		return this.total;
-	}
-
-	/**
-	 * API name: {@code updated}
-	 */
-	@Nullable
-	public final Long updated() {
-		return this.updated;
-	}
-
-	/**
-	 * API name: {@code version_conflicts}
-	 */
-	@Nullable
-	public final Long versionConflicts() {
-		return this.versionConflicts;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.batches != null) {
-			generator.writeKey("batches");
-			generator.write(this.batches);
-
-		}
-		if (this.created != null) {
-			generator.writeKey("created");
-			generator.write(this.created);
-
-		}
-		if (this.deleted != null) {
-			generator.writeKey("deleted");
-			generator.write(this.deleted);
-
-		}
-		if (ApiTypeHelper.isDefined(this.failures)) {
-			generator.writeKey("failures");
-			generator.writeStartArray();
-			for (BulkIndexByScrollFailure item0 : this.failures) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.noops != null) {
-			generator.writeKey("noops");
-			generator.write(this.noops);
-
-		}
-		if (this.retries != null) {
-			generator.writeKey("retries");
-			this.retries.serialize(generator, mapper);
-
-		}
-		if (this.requestsPerSecond != null) {
-			generator.writeKey("requests_per_second");
-			generator.write(this.requestsPerSecond);
-
-		}
-		if (this.sliceId != null) {
-			generator.writeKey("slice_id");
-			generator.write(this.sliceId);
-
-		}
-		if (this.task != null) {
-			generator.writeKey("task");
-			generator.write(this.task);
-
-		}
-		if (this.throttledMillis != null) {
-			generator.writeKey("throttled_millis");
-			generator.write(this.throttledMillis);
-
-		}
-		if (this.throttledUntilMillis != null) {
-			generator.writeKey("throttled_until_millis");
-			generator.write(this.throttledUntilMillis);
-
-		}
-		if (this.timedOut != null) {
-			generator.writeKey("timed_out");
-			generator.write(this.timedOut);
-
-		}
-		if (this.took != null) {
-			generator.writeKey("took");
-			this.took.serialize(generator, mapper);
-
-		}
-		if (this.total != null) {
-			generator.writeKey("total");
-			generator.write(this.total);
-
-		}
-		if (this.updated != null) {
-			generator.writeKey("updated");
-			generator.write(this.updated);
-
-		}
-		if (this.versionConflicts != null) {
-			generator.writeKey("version_conflicts");
-			generator.write(this.versionConflicts);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ReindexResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ReindexResponse> {
-		@Nullable
-		private Long batches;
-
-		@Nullable
-		private Long created;
-
-		@Nullable
-		private Long deleted;
-
-		@Nullable
-		private List<BulkIndexByScrollFailure> failures;
-
-		@Nullable
-		private Long noops;
-
-		@Nullable
-		private Retries retries;
-
-		@Nullable
-		private Long requestsPerSecond;
-
-		@Nullable
-		private Integer sliceId;
-
-		@Nullable
-		private String task;
-
-		@Nullable
-		private String throttledMillis;
-
-		@Nullable
-		private String throttledUntilMillis;
-
-		@Nullable
-		private Boolean timedOut;
-
-		@Nullable
-		private Time took;
-
-		@Nullable
-		private Long total;
-
-		@Nullable
-		private Long updated;
-
-		@Nullable
-		private Long versionConflicts;
-
-		/**
-		 * API name: {@code batches}
-		 */
-		public final Builder batches(@Nullable Long value) {
-			this.batches = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code created}
-		 */
-		public final Builder created(@Nullable Long value) {
-			this.created = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code deleted}
-		 */
-		public final Builder deleted(@Nullable Long value) {
-			this.deleted = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>failures</code>.
-		 */
-		public final Builder failures(List<BulkIndexByScrollFailure> list) {
-			this.failures = _listAddAll(this.failures, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds one or more values to <code>failures</code>.
-		 */
-		public final Builder failures(BulkIndexByScrollFailure value, BulkIndexByScrollFailure... values) {
-			this.failures = _listAdd(this.failures, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds a value to <code>failures</code> using a builder lambda.
-		 */
-		public final Builder failures(
-				Function<BulkIndexByScrollFailure.Builder, ObjectBuilder<BulkIndexByScrollFailure>> fn) {
-			return failures(fn.apply(new BulkIndexByScrollFailure.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code noops}
-		 */
-		public final Builder noops(@Nullable Long value) {
-			this.noops = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code retries}
-		 */
-		public final Builder retries(@Nullable Retries value) {
-			this.retries = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code retries}
-		 */
-		public final Builder retries(Function<Retries.Builder, ObjectBuilder<Retries>> fn) {
-			return this.retries(fn.apply(new Retries.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code requests_per_second}
-		 */
-		public final Builder requestsPerSecond(@Nullable Long value) {
-			this.requestsPerSecond = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code slice_id}
-		 */
-		public final Builder sliceId(@Nullable Integer value) {
-			this.sliceId = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code task}
-		 */
-		public final Builder task(@Nullable String value) {
-			this.task = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code throttled_millis}
-		 */
-		public final Builder throttledMillis(@Nullable String value) {
-			this.throttledMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code throttled_until_millis}
-		 */
-		public final Builder throttledUntilMillis(@Nullable String value) {
-			this.throttledUntilMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code timed_out}
-		 */
-		public final Builder timedOut(@Nullable Boolean value) {
-			this.timedOut = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code took}
-		 */
-		public final Builder took(@Nullable Time value) {
-			this.took = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code took}
-		 */
-		public final Builder took(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.took(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code total}
-		 */
-		public final Builder total(@Nullable Long value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code updated}
-		 */
-		public final Builder updated(@Nullable Long value) {
-			this.updated = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code version_conflicts}
-		 */
-		public final Builder versionConflicts(@Nullable Long value) {
-			this.versionConflicts = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ReindexResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ReindexResponse build() {
-			_checkSingleUse();
-
-			return new ReindexResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ReindexResponse}
-	 */
-	public static final JsonpDeserializer<ReindexResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ReindexResponse::setupReindexResponseDeserializer);
-
-	protected static void setupReindexResponseDeserializer(ObjectDeserializer<ReindexResponse.Builder> op) {
-
-		op.add(Builder::batches, JsonpDeserializer.longDeserializer(), "batches");
-		op.add(Builder::created, JsonpDeserializer.longDeserializer(), "created");
-		op.add(Builder::deleted, JsonpDeserializer.longDeserializer(), "deleted");
-		op.add(Builder::failures, JsonpDeserializer.arrayDeserializer(BulkIndexByScrollFailure._DESERIALIZER),
-				"failures");
-		op.add(Builder::noops, JsonpDeserializer.longDeserializer(), "noops");
-		op.add(Builder::retries, Retries._DESERIALIZER, "retries");
-		op.add(Builder::requestsPerSecond, JsonpDeserializer.longDeserializer(), "requests_per_second");
-		op.add(Builder::sliceId, JsonpDeserializer.integerDeserializer(), "slice_id");
-		op.add(Builder::task, JsonpDeserializer.stringDeserializer(), "task");
-		op.add(Builder::throttledMillis, JsonpDeserializer.stringDeserializer(), "throttled_millis");
-		op.add(Builder::throttledUntilMillis, JsonpDeserializer.stringDeserializer(), "throttled_until_millis");
-		op.add(Builder::timedOut, JsonpDeserializer.booleanDeserializer(), "timed_out");
-		op.add(Builder::took, Time._DESERIALIZER, "took");
-		op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
-		op.add(Builder::updated, JsonpDeserializer.longDeserializer(), "updated");
-		op.add(Builder::versionConflicts, JsonpDeserializer.longDeserializer(), "version_conflicts");
-
-	}
+    @Nullable
+    private final Long batches;
+
+    @Nullable
+    private final Long created;
+
+    @Nullable
+    private final Long deleted;
+
+    private final List<BulkIndexByScrollFailure> failures;
+
+    @Nullable
+    private final Long noops;
+
+    @Nullable
+    private final Retries retries;
+
+    @Nullable
+    private final Long requestsPerSecond;
+
+    @Nullable
+    private final Integer sliceId;
+
+    @Nullable
+    private final String task;
+
+    @Nullable
+    private final String throttledMillis;
+
+    @Nullable
+    private final String throttledUntilMillis;
+
+    @Nullable
+    private final Boolean timedOut;
+
+    @Nullable
+    private final Time took;
+
+    @Nullable
+    private final Long total;
+
+    @Nullable
+    private final Long updated;
+
+    @Nullable
+    private final Long versionConflicts;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ReindexResponse(Builder builder) {
+
+        this.batches = builder.batches;
+        this.created = builder.created;
+        this.deleted = builder.deleted;
+        this.failures = ApiTypeHelper.unmodifiable(builder.failures);
+        this.noops = builder.noops;
+        this.retries = builder.retries;
+        this.requestsPerSecond = builder.requestsPerSecond;
+        this.sliceId = builder.sliceId;
+        this.task = builder.task;
+        this.throttledMillis = builder.throttledMillis;
+        this.throttledUntilMillis = builder.throttledUntilMillis;
+        this.timedOut = builder.timedOut;
+        this.took = builder.took;
+        this.total = builder.total;
+        this.updated = builder.updated;
+        this.versionConflicts = builder.versionConflicts;
+
+    }
+
+    public static ReindexResponse of(Function<Builder, ObjectBuilder<ReindexResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code batches}
+     */
+    @Nullable
+    public final Long batches() {
+        return this.batches;
+    }
+
+    /**
+     * API name: {@code created}
+     */
+    @Nullable
+    public final Long created() {
+        return this.created;
+    }
+
+    /**
+     * API name: {@code deleted}
+     */
+    @Nullable
+    public final Long deleted() {
+        return this.deleted;
+    }
+
+    /**
+     * API name: {@code failures}
+     */
+    public final List<BulkIndexByScrollFailure> failures() {
+        return this.failures;
+    }
+
+    /**
+     * API name: {@code noops}
+     */
+    @Nullable
+    public final Long noops() {
+        return this.noops;
+    }
+
+    /**
+     * API name: {@code retries}
+     */
+    @Nullable
+    public final Retries retries() {
+        return this.retries;
+    }
+
+    /**
+     * API name: {@code requests_per_second}
+     */
+    @Nullable
+    public final Long requestsPerSecond() {
+        return this.requestsPerSecond;
+    }
+
+    /**
+     * API name: {@code slice_id}
+     */
+    @Nullable
+    public final Integer sliceId() {
+        return this.sliceId;
+    }
+
+    /**
+     * API name: {@code task}
+     */
+    @Nullable
+    public final String task() {
+        return this.task;
+    }
+
+    /**
+     * API name: {@code throttled_millis}
+     */
+    @Nullable
+    public final String throttledMillis() {
+        return this.throttledMillis;
+    }
+
+    /**
+     * API name: {@code throttled_until_millis}
+     */
+    @Nullable
+    public final String throttledUntilMillis() {
+        return this.throttledUntilMillis;
+    }
+
+    /**
+     * API name: {@code timed_out}
+     */
+    @Nullable
+    public final Boolean timedOut() {
+        return this.timedOut;
+    }
+
+    /**
+     * API name: {@code took}
+     */
+    @Nullable
+    public final Time took() {
+        return this.took;
+    }
+
+    /**
+     * API name: {@code total}
+     */
+    @Nullable
+    public final Long total() {
+        return this.total;
+    }
+
+    /**
+     * API name: {@code updated}
+     */
+    @Nullable
+    public final Long updated() {
+        return this.updated;
+    }
+
+    /**
+     * API name: {@code version_conflicts}
+     */
+    @Nullable
+    public final Long versionConflicts() {
+        return this.versionConflicts;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.batches != null) {
+            generator.writeKey("batches");
+            generator.write(this.batches);
+
+        }
+        if (this.created != null) {
+            generator.writeKey("created");
+            generator.write(this.created);
+
+        }
+        if (this.deleted != null) {
+            generator.writeKey("deleted");
+            generator.write(this.deleted);
+
+        }
+        if (ApiTypeHelper.isDefined(this.failures)) {
+            generator.writeKey("failures");
+            generator.writeStartArray();
+            for (BulkIndexByScrollFailure item0 : this.failures) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.noops != null) {
+            generator.writeKey("noops");
+            generator.write(this.noops);
+
+        }
+        if (this.retries != null) {
+            generator.writeKey("retries");
+            this.retries.serialize(generator, mapper);
+
+        }
+        if (this.requestsPerSecond != null) {
+            generator.writeKey("requests_per_second");
+            generator.write(this.requestsPerSecond);
+
+        }
+        if (this.sliceId != null) {
+            generator.writeKey("slice_id");
+            generator.write(this.sliceId);
+
+        }
+        if (this.task != null) {
+            generator.writeKey("task");
+            generator.write(this.task);
+
+        }
+        if (this.throttledMillis != null) {
+            generator.writeKey("throttled_millis");
+            generator.write(this.throttledMillis);
+
+        }
+        if (this.throttledUntilMillis != null) {
+            generator.writeKey("throttled_until_millis");
+            generator.write(this.throttledUntilMillis);
+
+        }
+        if (this.timedOut != null) {
+            generator.writeKey("timed_out");
+            generator.write(this.timedOut);
+
+        }
+        if (this.took != null) {
+            generator.writeKey("took");
+            this.took.serialize(generator, mapper);
+
+        }
+        if (this.total != null) {
+            generator.writeKey("total");
+            generator.write(this.total);
+
+        }
+        if (this.updated != null) {
+            generator.writeKey("updated");
+            generator.write(this.updated);
+
+        }
+        if (this.versionConflicts != null) {
+            generator.writeKey("version_conflicts");
+            generator.write(this.versionConflicts);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ReindexResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ReindexResponse> {
+        @Nullable
+        private Long batches;
+
+        @Nullable
+        private Long created;
+
+        @Nullable
+        private Long deleted;
+
+        @Nullable
+        private List<BulkIndexByScrollFailure> failures;
+
+        @Nullable
+        private Long noops;
+
+        @Nullable
+        private Retries retries;
+
+        @Nullable
+        private Long requestsPerSecond;
+
+        @Nullable
+        private Integer sliceId;
+
+        @Nullable
+        private String task;
+
+        @Nullable
+        private String throttledMillis;
+
+        @Nullable
+        private String throttledUntilMillis;
+
+        @Nullable
+        private Boolean timedOut;
+
+        @Nullable
+        private Time took;
+
+        @Nullable
+        private Long total;
+
+        @Nullable
+        private Long updated;
+
+        @Nullable
+        private Long versionConflicts;
+
+        /**
+         * API name: {@code batches}
+         */
+        public final Builder batches(@Nullable Long value) {
+            this.batches = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code created}
+         */
+        public final Builder created(@Nullable Long value) {
+            this.created = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code deleted}
+         */
+        public final Builder deleted(@Nullable Long value) {
+            this.deleted = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>failures</code>.
+         */
+        public final Builder failures(List<BulkIndexByScrollFailure> list) {
+            this.failures = _listAddAll(this.failures, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds one or more values to <code>failures</code>.
+         */
+        public final Builder failures(BulkIndexByScrollFailure value, BulkIndexByScrollFailure... values) {
+            this.failures = _listAdd(this.failures, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds a value to <code>failures</code> using a builder lambda.
+         */
+        public final Builder failures(Function<BulkIndexByScrollFailure.Builder, ObjectBuilder<BulkIndexByScrollFailure>> fn) {
+            return failures(fn.apply(new BulkIndexByScrollFailure.Builder()).build());
+        }
+
+        /**
+         * API name: {@code noops}
+         */
+        public final Builder noops(@Nullable Long value) {
+            this.noops = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code retries}
+         */
+        public final Builder retries(@Nullable Retries value) {
+            this.retries = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code retries}
+         */
+        public final Builder retries(Function<Retries.Builder, ObjectBuilder<Retries>> fn) {
+            return this.retries(fn.apply(new Retries.Builder()).build());
+        }
+
+        /**
+         * API name: {@code requests_per_second}
+         */
+        public final Builder requestsPerSecond(@Nullable Long value) {
+            this.requestsPerSecond = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code slice_id}
+         */
+        public final Builder sliceId(@Nullable Integer value) {
+            this.sliceId = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code task}
+         */
+        public final Builder task(@Nullable String value) {
+            this.task = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code throttled_millis}
+         */
+        public final Builder throttledMillis(@Nullable String value) {
+            this.throttledMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code throttled_until_millis}
+         */
+        public final Builder throttledUntilMillis(@Nullable String value) {
+            this.throttledUntilMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code timed_out}
+         */
+        public final Builder timedOut(@Nullable Boolean value) {
+            this.timedOut = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code took}
+         */
+        public final Builder took(@Nullable Time value) {
+            this.took = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code took}
+         */
+        public final Builder took(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.took(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code total}
+         */
+        public final Builder total(@Nullable Long value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code updated}
+         */
+        public final Builder updated(@Nullable Long value) {
+            this.updated = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code version_conflicts}
+         */
+        public final Builder versionConflicts(@Nullable Long value) {
+            this.versionConflicts = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ReindexResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ReindexResponse build() {
+            _checkSingleUse();
+
+            return new ReindexResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ReindexResponse}
+     */
+    public static final JsonpDeserializer<ReindexResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ReindexResponse::setupReindexResponseDeserializer
+    );
+
+    protected static void setupReindexResponseDeserializer(ObjectDeserializer<ReindexResponse.Builder> op) {
+
+        op.add(Builder::batches, JsonpDeserializer.longDeserializer(), "batches");
+        op.add(Builder::created, JsonpDeserializer.longDeserializer(), "created");
+        op.add(Builder::deleted, JsonpDeserializer.longDeserializer(), "deleted");
+        op.add(Builder::failures, JsonpDeserializer.arrayDeserializer(BulkIndexByScrollFailure._DESERIALIZER), "failures");
+        op.add(Builder::noops, JsonpDeserializer.longDeserializer(), "noops");
+        op.add(Builder::retries, Retries._DESERIALIZER, "retries");
+        op.add(Builder::requestsPerSecond, JsonpDeserializer.longDeserializer(), "requests_per_second");
+        op.add(Builder::sliceId, JsonpDeserializer.integerDeserializer(), "slice_id");
+        op.add(Builder::task, JsonpDeserializer.stringDeserializer(), "task");
+        op.add(Builder::throttledMillis, JsonpDeserializer.stringDeserializer(), "throttled_millis");
+        op.add(Builder::throttledUntilMillis, JsonpDeserializer.stringDeserializer(), "throttled_until_millis");
+        op.add(Builder::timedOut, JsonpDeserializer.booleanDeserializer(), "timed_out");
+        op.add(Builder::took, Time._DESERIALIZER, "took");
+        op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
+        op.add(Builder::updated, JsonpDeserializer.longDeserializer(), "updated");
+        op.add(Builder::versionConflicts, JsonpDeserializer.longDeserializer(), "version_conflicts");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/ReindexRethrottleRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/ReindexRethrottleRequest.java
index c2459968e7..71b506b24b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/ReindexRethrottleRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/ReindexRethrottleRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -40,143 +44,142 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: _global.reindex_rethrottle.Request
 
 /**
  * Changes the number of requests per second for a particular Reindex operation.
- * 
+ *
  */
 
 public class ReindexRethrottleRequest extends RequestBase {
-	@Nullable
-	private final Long requestsPerSecond;
-
-	private final String taskId;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ReindexRethrottleRequest(Builder builder) {
-
-		this.requestsPerSecond = builder.requestsPerSecond;
-		this.taskId = ApiTypeHelper.requireNonNull(builder.taskId, this, "taskId");
-
-	}
-
-	public static ReindexRethrottleRequest of(Function<Builder, ObjectBuilder<ReindexRethrottleRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * The throttle to set on this request in floating sub-requests per second. -1
-	 * means set no throttle.
-	 * <p>
-	 * API name: {@code requests_per_second}
-	 */
-	@Nullable
-	public final Long requestsPerSecond() {
-		return this.requestsPerSecond;
-	}
-
-	/**
-	 * Required - The task id to rethrottle
-	 * <p>
-	 * API name: {@code task_id}
-	 */
-	public final String taskId() {
-		return this.taskId;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ReindexRethrottleRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ReindexRethrottleRequest> {
-		@Nullable
-		private Long requestsPerSecond;
-
-		private String taskId;
-
-		/**
-		 * The throttle to set on this request in floating sub-requests per second. -1
-		 * means set no throttle.
-		 * <p>
-		 * API name: {@code requests_per_second}
-		 */
-		public final Builder requestsPerSecond(@Nullable Long value) {
-			this.requestsPerSecond = value;
-			return this;
-		}
-
-		/**
-		 * Required - The task id to rethrottle
-		 * <p>
-		 * API name: {@code task_id}
-		 */
-		public final Builder taskId(String value) {
-			this.taskId = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ReindexRethrottleRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ReindexRethrottleRequest build() {
-			_checkSingleUse();
-
-			return new ReindexRethrottleRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code reindex_rethrottle}".
-	 */
-	public static final Endpoint<ReindexRethrottleRequest, ReindexRethrottleResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _taskId = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _taskId;
-
-				if (propsSet == (_taskId)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_reindex");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.taskId, buf);
-					buf.append("/_rethrottle");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.requestsPerSecond != null) {
-					params.put("requests_per_second", String.valueOf(request.requestsPerSecond));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, ReindexRethrottleResponse._DESERIALIZER);
+    @Nullable
+    private final Long requestsPerSecond;
+
+    private final String taskId;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ReindexRethrottleRequest(Builder builder) {
+
+        this.requestsPerSecond = builder.requestsPerSecond;
+        this.taskId = ApiTypeHelper.requireNonNull(builder.taskId, this, "taskId");
+
+    }
+
+    public static ReindexRethrottleRequest of(Function<Builder, ObjectBuilder<ReindexRethrottleRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * The throttle to set on this request in floating sub-requests per second. -1
+     * means set no throttle.
+     * <p>
+     * API name: {@code requests_per_second}
+     */
+    @Nullable
+    public final Long requestsPerSecond() {
+        return this.requestsPerSecond;
+    }
+
+    /**
+     * Required - The task id to rethrottle
+     * <p>
+     * API name: {@code task_id}
+     */
+    public final String taskId() {
+        return this.taskId;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ReindexRethrottleRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ReindexRethrottleRequest> {
+        @Nullable
+        private Long requestsPerSecond;
+
+        private String taskId;
+
+        /**
+         * The throttle to set on this request in floating sub-requests per second. -1
+         * means set no throttle.
+         * <p>
+         * API name: {@code requests_per_second}
+         */
+        public final Builder requestsPerSecond(@Nullable Long value) {
+            this.requestsPerSecond = value;
+            return this;
+        }
+
+        /**
+         * Required - The task id to rethrottle
+         * <p>
+         * API name: {@code task_id}
+         */
+        public final Builder taskId(String value) {
+            this.taskId = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ReindexRethrottleRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ReindexRethrottleRequest build() {
+            _checkSingleUse();
+
+            return new ReindexRethrottleRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code reindex_rethrottle}".
+     */
+    public static final Endpoint<ReindexRethrottleRequest, ReindexRethrottleResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _taskId = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _taskId;
+
+            if (propsSet == (_taskId)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_reindex");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.taskId, buf);
+                buf.append("/_rethrottle");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.requestsPerSecond != null) {
+                params.put("requests_per_second", String.valueOf(request.requestsPerSecond));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        ReindexRethrottleResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/ReindexRethrottleResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/ReindexRethrottleResponse.java
index c67ee277e4..a1fde40637 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/ReindexRethrottleResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/ReindexRethrottleResponse.java
@@ -32,135 +32,135 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch.core.reindex_rethrottle.ReindexNode;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.reindex_rethrottle.ReindexNode;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _global.reindex_rethrottle.Response
 
 @JsonpDeserializable
 public class ReindexRethrottleResponse implements JsonpSerializable {
-	private final Map<String, ReindexNode> nodes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ReindexRethrottleResponse(Builder builder) {
-
-		this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
-
-	}
-
-	public static ReindexRethrottleResponse of(Function<Builder, ObjectBuilder<ReindexRethrottleResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code nodes}
-	 */
-	public final Map<String, ReindexNode> nodes() {
-		return this.nodes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.nodes)) {
-			generator.writeKey("nodes");
-			generator.writeStartObject();
-			for (Map.Entry<String, ReindexNode> item0 : this.nodes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ReindexRethrottleResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ReindexRethrottleResponse> {
-		private Map<String, ReindexNode> nodes;
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>nodes</code>.
-		 */
-		public final Builder nodes(Map<String, ReindexNode> map) {
-			this.nodes = _mapPutAll(this.nodes, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code>.
-		 */
-		public final Builder nodes(String key, ReindexNode value) {
-			this.nodes = _mapPut(this.nodes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code> using a builder lambda.
-		 */
-		public final Builder nodes(String key, Function<ReindexNode.Builder, ObjectBuilder<ReindexNode>> fn) {
-			return nodes(key, fn.apply(new ReindexNode.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ReindexRethrottleResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ReindexRethrottleResponse build() {
-			_checkSingleUse();
-
-			return new ReindexRethrottleResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ReindexRethrottleResponse}
-	 */
-	public static final JsonpDeserializer<ReindexRethrottleResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ReindexRethrottleResponse::setupReindexRethrottleResponseDeserializer);
-
-	protected static void setupReindexRethrottleResponseDeserializer(
-			ObjectDeserializer<ReindexRethrottleResponse.Builder> op) {
-
-		op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(ReindexNode._DESERIALIZER), "nodes");
-
-	}
+    private final Map<String, ReindexNode> nodes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ReindexRethrottleResponse(Builder builder) {
+
+        this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
+
+    }
+
+    public static ReindexRethrottleResponse of(Function<Builder, ObjectBuilder<ReindexRethrottleResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code nodes}
+     */
+    public final Map<String, ReindexNode> nodes() {
+        return this.nodes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.nodes)) {
+            generator.writeKey("nodes");
+            generator.writeStartObject();
+            for (Map.Entry<String, ReindexNode> item0 : this.nodes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ReindexRethrottleResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ReindexRethrottleResponse> {
+        private Map<String, ReindexNode> nodes;
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>nodes</code>.
+         */
+        public final Builder nodes(Map<String, ReindexNode> map) {
+            this.nodes = _mapPutAll(this.nodes, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code>.
+         */
+        public final Builder nodes(String key, ReindexNode value) {
+            this.nodes = _mapPut(this.nodes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code> using a builder lambda.
+         */
+        public final Builder nodes(String key, Function<ReindexNode.Builder, ObjectBuilder<ReindexNode>> fn) {
+            return nodes(key, fn.apply(new ReindexNode.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ReindexRethrottleResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ReindexRethrottleResponse build() {
+            _checkSingleUse();
+
+            return new ReindexRethrottleResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ReindexRethrottleResponse}
+     */
+    public static final JsonpDeserializer<ReindexRethrottleResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ReindexRethrottleResponse::setupReindexRethrottleResponseDeserializer
+    );
+
+    protected static void setupReindexRethrottleResponseDeserializer(ObjectDeserializer<ReindexRethrottleResponse.Builder> op) {
+
+        op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(ReindexNode._DESERIALIZER), "nodes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/RenderSearchTemplateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/RenderSearchTemplateRequest.java
index c7078087be..dfb02f44ff 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/RenderSearchTemplateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/RenderSearchTemplateRequest.java
@@ -32,8 +32,11 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Collections;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -41,259 +44,258 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.render_search_template.Request
 
 /**
  * Allows to use the Mustache language to pre-render a search definition.
- * 
+ *
  */
 @JsonpDeserializable
 public class RenderSearchTemplateRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final String file;
-
-	@Nullable
-	private final String id;
-
-	private final Map<String, JsonData> params;
-
-	@Nullable
-	private final String source;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RenderSearchTemplateRequest(Builder builder) {
-
-		this.file = builder.file;
-		this.id = builder.id;
-		this.params = ApiTypeHelper.unmodifiable(builder.params);
-		this.source = builder.source;
-
-	}
-
-	public static RenderSearchTemplateRequest of(Function<Builder, ObjectBuilder<RenderSearchTemplateRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code file}
-	 */
-	@Nullable
-	public final String file() {
-		return this.file;
-	}
-
-	/**
-	 * The id of the stored search template
-	 * <p>
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * API name: {@code params}
-	 */
-	public final Map<String, JsonData> params() {
-		return this.params;
-	}
-
-	/**
-	 * API name: {@code source}
-	 */
-	@Nullable
-	public final String source() {
-		return this.source;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.file != null) {
-			generator.writeKey("file");
-			generator.write(this.file);
-
-		}
-		if (ApiTypeHelper.isDefined(this.params)) {
-			generator.writeKey("params");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.source != null) {
-			generator.writeKey("source");
-			generator.write(this.source);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RenderSearchTemplateRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RenderSearchTemplateRequest> {
-		@Nullable
-		private String file;
-
-		@Nullable
-		private String id;
-
-		@Nullable
-		private Map<String, JsonData> params;
-
-		@Nullable
-		private String source;
-
-		/**
-		 * API name: {@code file}
-		 */
-		public final Builder file(@Nullable String value) {
-			this.file = value;
-			return this;
-		}
-
-		/**
-		 * The id of the stored search template
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code params}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>params</code>.
-		 */
-		public final Builder params(Map<String, JsonData> map) {
-			this.params = _mapPutAll(this.params, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code params}
-		 * <p>
-		 * Adds an entry to <code>params</code>.
-		 */
-		public final Builder params(String key, JsonData value) {
-			this.params = _mapPut(this.params, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code source}
-		 */
-		public final Builder source(@Nullable String value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RenderSearchTemplateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RenderSearchTemplateRequest build() {
-			_checkSingleUse();
-
-			return new RenderSearchTemplateRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RenderSearchTemplateRequest}
-	 */
-	public static final JsonpDeserializer<RenderSearchTemplateRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RenderSearchTemplateRequest::setupRenderSearchTemplateRequestDeserializer);
-
-	protected static void setupRenderSearchTemplateRequestDeserializer(
-			ObjectDeserializer<RenderSearchTemplateRequest.Builder> op) {
-
-		op.add(Builder::file, JsonpDeserializer.stringDeserializer(), "file");
-		op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
-		op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code render_search_template}".
-	 */
-	public static final Endpoint<RenderSearchTemplateRequest, RenderSearchTemplateResponse, ErrorResponse> _ENDPOINT =
-			new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _id = 1 << 0;
-
-				int propsSet = 0;
-
-				if (request.id() != null)
-					propsSet |= _id;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_render");
-					buf.append("/template");
-					return buf.toString();
-				}
-				if (propsSet == (_id)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_render");
-					buf.append("/template");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.id, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
-
-			}, SimpleEndpoint.emptyMap(), true, RenderSearchTemplateResponse._DESERIALIZER);
+    @Nullable
+    private final String file;
+
+    @Nullable
+    private final String id;
+
+    private final Map<String, JsonData> params;
+
+    @Nullable
+    private final String source;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RenderSearchTemplateRequest(Builder builder) {
+
+        this.file = builder.file;
+        this.id = builder.id;
+        this.params = ApiTypeHelper.unmodifiable(builder.params);
+        this.source = builder.source;
+
+    }
+
+    public static RenderSearchTemplateRequest of(Function<Builder, ObjectBuilder<RenderSearchTemplateRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code file}
+     */
+    @Nullable
+    public final String file() {
+        return this.file;
+    }
+
+    /**
+     * The id of the stored search template
+     * <p>
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * API name: {@code params}
+     */
+    public final Map<String, JsonData> params() {
+        return this.params;
+    }
+
+    /**
+     * API name: {@code source}
+     */
+    @Nullable
+    public final String source() {
+        return this.source;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.file != null) {
+            generator.writeKey("file");
+            generator.write(this.file);
+
+        }
+        if (ApiTypeHelper.isDefined(this.params)) {
+            generator.writeKey("params");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.source != null) {
+            generator.writeKey("source");
+            generator.write(this.source);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RenderSearchTemplateRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RenderSearchTemplateRequest> {
+        @Nullable
+        private String file;
+
+        @Nullable
+        private String id;
+
+        @Nullable
+        private Map<String, JsonData> params;
+
+        @Nullable
+        private String source;
+
+        /**
+         * API name: {@code file}
+         */
+        public final Builder file(@Nullable String value) {
+            this.file = value;
+            return this;
+        }
+
+        /**
+         * The id of the stored search template
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code params}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>params</code>.
+         */
+        public final Builder params(Map<String, JsonData> map) {
+            this.params = _mapPutAll(this.params, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code params}
+         * <p>
+         * Adds an entry to <code>params</code>.
+         */
+        public final Builder params(String key, JsonData value) {
+            this.params = _mapPut(this.params, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code source}
+         */
+        public final Builder source(@Nullable String value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RenderSearchTemplateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RenderSearchTemplateRequest build() {
+            _checkSingleUse();
+
+            return new RenderSearchTemplateRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RenderSearchTemplateRequest}
+     */
+    public static final JsonpDeserializer<RenderSearchTemplateRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RenderSearchTemplateRequest::setupRenderSearchTemplateRequestDeserializer
+    );
+
+    protected static void setupRenderSearchTemplateRequestDeserializer(ObjectDeserializer<RenderSearchTemplateRequest.Builder> op) {
+
+        op.add(Builder::file, JsonpDeserializer.stringDeserializer(), "file");
+        op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
+        op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code render_search_template}".
+     */
+    public static final Endpoint<RenderSearchTemplateRequest, RenderSearchTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _id = 1 << 0;
+
+            int propsSet = 0;
+
+            if (request.id() != null) propsSet |= _id;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_render");
+                buf.append("/template");
+                return buf.toString();
+            }
+            if (propsSet == (_id)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_render");
+                buf.append("/template");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.id, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        RenderSearchTemplateResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/RenderSearchTemplateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/RenderSearchTemplateResponse.java
index 5b545efc8d..e0fe2d4176 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/RenderSearchTemplateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/RenderSearchTemplateResponse.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,116 +45,113 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _global.render_search_template.Response
 
 @JsonpDeserializable
 public class RenderSearchTemplateResponse implements JsonpSerializable {
-	private final Map<String, JsonData> templateOutput;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RenderSearchTemplateResponse(Builder builder) {
-
-		this.templateOutput = ApiTypeHelper.unmodifiableRequired(builder.templateOutput, this, "templateOutput");
-
-	}
-
-	public static RenderSearchTemplateResponse of(Function<Builder, ObjectBuilder<RenderSearchTemplateResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code template_output}
-	 */
-	public final Map<String, JsonData> templateOutput() {
-		return this.templateOutput;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.templateOutput)) {
-			generator.writeKey("template_output");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.templateOutput.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RenderSearchTemplateResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RenderSearchTemplateResponse> {
-		private Map<String, JsonData> templateOutput;
-
-		/**
-		 * Required - API name: {@code template_output}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>templateOutput</code>.
-		 */
-		public final Builder templateOutput(Map<String, JsonData> map) {
-			this.templateOutput = _mapPutAll(this.templateOutput, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code template_output}
-		 * <p>
-		 * Adds an entry to <code>templateOutput</code>.
-		 */
-		public final Builder templateOutput(String key, JsonData value) {
-			this.templateOutput = _mapPut(this.templateOutput, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RenderSearchTemplateResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RenderSearchTemplateResponse build() {
-			_checkSingleUse();
-
-			return new RenderSearchTemplateResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RenderSearchTemplateResponse}
-	 */
-	public static final JsonpDeserializer<RenderSearchTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RenderSearchTemplateResponse::setupRenderSearchTemplateResponseDeserializer);
-
-	protected static void setupRenderSearchTemplateResponseDeserializer(
-			ObjectDeserializer<RenderSearchTemplateResponse.Builder> op) {
-
-		op.add(Builder::templateOutput, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER),
-				"template_output");
-
-	}
+    private final Map<String, JsonData> templateOutput;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RenderSearchTemplateResponse(Builder builder) {
+
+        this.templateOutput = ApiTypeHelper.unmodifiableRequired(builder.templateOutput, this, "templateOutput");
+
+    }
+
+    public static RenderSearchTemplateResponse of(Function<Builder, ObjectBuilder<RenderSearchTemplateResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code template_output}
+     */
+    public final Map<String, JsonData> templateOutput() {
+        return this.templateOutput;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.templateOutput)) {
+            generator.writeKey("template_output");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.templateOutput.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RenderSearchTemplateResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RenderSearchTemplateResponse> {
+        private Map<String, JsonData> templateOutput;
+
+        /**
+         * Required - API name: {@code template_output}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>templateOutput</code>.
+         */
+        public final Builder templateOutput(Map<String, JsonData> map) {
+            this.templateOutput = _mapPutAll(this.templateOutput, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code template_output}
+         * <p>
+         * Adds an entry to <code>templateOutput</code>.
+         */
+        public final Builder templateOutput(String key, JsonData value) {
+            this.templateOutput = _mapPut(this.templateOutput, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link RenderSearchTemplateResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RenderSearchTemplateResponse build() {
+            _checkSingleUse();
+
+            return new RenderSearchTemplateResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RenderSearchTemplateResponse}
+     */
+    public static final JsonpDeserializer<RenderSearchTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RenderSearchTemplateResponse::setupRenderSearchTemplateResponseDeserializer
+    );
+
+    protected static void setupRenderSearchTemplateResponseDeserializer(ObjectDeserializer<RenderSearchTemplateResponse.Builder> op) {
+
+        op.add(Builder::templateOutput, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "template_output");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/ScriptsPainlessExecuteRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/ScriptsPainlessExecuteRequest.java
index 31dc338f41..a59a4dcfc2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/ScriptsPainlessExecuteRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/ScriptsPainlessExecuteRequest.java
@@ -32,227 +32,232 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.InlineScript;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch.core.scripts_painless_execute.PainlessContextSetup;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Collections;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.InlineScript;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch.core.scripts_painless_execute.PainlessContextSetup;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Collections;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.scripts_painless_execute.Request
 
 /**
  * Allows an arbitrary script to be executed and a result to be returned
- * 
+ *
  */
 @JsonpDeserializable
 public class ScriptsPainlessExecuteRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final String context;
-
-	@Nullable
-	private final PainlessContextSetup contextSetup;
-
-	@Nullable
-	private final InlineScript script;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ScriptsPainlessExecuteRequest(Builder builder) {
-
-		this.context = builder.context;
-		this.contextSetup = builder.contextSetup;
-		this.script = builder.script;
-
-	}
-
-	public static ScriptsPainlessExecuteRequest of(Function<Builder, ObjectBuilder<ScriptsPainlessExecuteRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code context}
-	 */
-	@Nullable
-	public final String context() {
-		return this.context;
-	}
-
-	/**
-	 * API name: {@code context_setup}
-	 */
-	@Nullable
-	public final PainlessContextSetup contextSetup() {
-		return this.contextSetup;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final InlineScript script() {
-		return this.script;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.context != null) {
-			generator.writeKey("context");
-			generator.write(this.context);
-
-		}
-		if (this.contextSetup != null) {
-			generator.writeKey("context_setup");
-			this.contextSetup.serialize(generator, mapper);
-
-		}
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ScriptsPainlessExecuteRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ScriptsPainlessExecuteRequest> {
-		@Nullable
-		private String context;
-
-		@Nullable
-		private PainlessContextSetup contextSetup;
-
-		@Nullable
-		private InlineScript script;
-
-		/**
-		 * API name: {@code context}
-		 */
-		public final Builder context(@Nullable String value) {
-			this.context = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code context_setup}
-		 */
-		public final Builder contextSetup(@Nullable PainlessContextSetup value) {
-			this.contextSetup = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code context_setup}
-		 */
-		public final Builder contextSetup(
-				Function<PainlessContextSetup.Builder, ObjectBuilder<PainlessContextSetup>> fn) {
-			return this.contextSetup(fn.apply(new PainlessContextSetup.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(@Nullable InlineScript value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(Function<InlineScript.Builder, ObjectBuilder<InlineScript>> fn) {
-			return this.script(fn.apply(new InlineScript.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ScriptsPainlessExecuteRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ScriptsPainlessExecuteRequest build() {
-			_checkSingleUse();
-
-			return new ScriptsPainlessExecuteRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ScriptsPainlessExecuteRequest}
-	 */
-	public static final JsonpDeserializer<ScriptsPainlessExecuteRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ScriptsPainlessExecuteRequest::setupScriptsPainlessExecuteRequestDeserializer);
-
-	protected static void setupScriptsPainlessExecuteRequestDeserializer(
-			ObjectDeserializer<ScriptsPainlessExecuteRequest.Builder> op) {
-
-		op.add(Builder::context, JsonpDeserializer.stringDeserializer(), "context");
-		op.add(Builder::contextSetup, PainlessContextSetup._DESERIALIZER, "context_setup");
-		op.add(Builder::script, InlineScript._DESERIALIZER, "script");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code scripts_painless_execute}".
-	 */
-	public static final SimpleEndpoint<ScriptsPainlessExecuteRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				return "/_scripts/painless/_execute";
-
-			},
-
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
-
-			}, SimpleEndpoint.emptyMap(), true, ScriptsPainlessExecuteResponse._DESERIALIZER);
-
-	/**
-	 * Create an "{@code scripts_painless_execute}" endpoint.
-	 */
-	public static <TResult> Endpoint<ScriptsPainlessExecuteRequest, ScriptsPainlessExecuteResponse<TResult>,
-			ErrorResponse> createScriptsPainlessExecuteEndpoint(
-			JsonpDeserializer<TResult> tResultDeserializer) {
-		return _ENDPOINT.withResponseDeserializer(
-				ScriptsPainlessExecuteResponse.createScriptsPainlessExecuteResponseDeserializer(tResultDeserializer));
-	}
+    @Nullable
+    private final String context;
+
+    @Nullable
+    private final PainlessContextSetup contextSetup;
+
+    @Nullable
+    private final InlineScript script;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ScriptsPainlessExecuteRequest(Builder builder) {
+
+        this.context = builder.context;
+        this.contextSetup = builder.contextSetup;
+        this.script = builder.script;
+
+    }
+
+    public static ScriptsPainlessExecuteRequest of(Function<Builder, ObjectBuilder<ScriptsPainlessExecuteRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code context}
+     */
+    @Nullable
+    public final String context() {
+        return this.context;
+    }
+
+    /**
+     * API name: {@code context_setup}
+     */
+    @Nullable
+    public final PainlessContextSetup contextSetup() {
+        return this.contextSetup;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final InlineScript script() {
+        return this.script;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.context != null) {
+            generator.writeKey("context");
+            generator.write(this.context);
+
+        }
+        if (this.contextSetup != null) {
+            generator.writeKey("context_setup");
+            this.contextSetup.serialize(generator, mapper);
+
+        }
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ScriptsPainlessExecuteRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ScriptsPainlessExecuteRequest> {
+        @Nullable
+        private String context;
+
+        @Nullable
+        private PainlessContextSetup contextSetup;
+
+        @Nullable
+        private InlineScript script;
+
+        /**
+         * API name: {@code context}
+         */
+        public final Builder context(@Nullable String value) {
+            this.context = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code context_setup}
+         */
+        public final Builder contextSetup(@Nullable PainlessContextSetup value) {
+            this.contextSetup = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code context_setup}
+         */
+        public final Builder contextSetup(Function<PainlessContextSetup.Builder, ObjectBuilder<PainlessContextSetup>> fn) {
+            return this.contextSetup(fn.apply(new PainlessContextSetup.Builder()).build());
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(@Nullable InlineScript value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(Function<InlineScript.Builder, ObjectBuilder<InlineScript>> fn) {
+            return this.script(fn.apply(new InlineScript.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ScriptsPainlessExecuteRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ScriptsPainlessExecuteRequest build() {
+            _checkSingleUse();
+
+            return new ScriptsPainlessExecuteRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ScriptsPainlessExecuteRequest}
+     */
+    public static final JsonpDeserializer<ScriptsPainlessExecuteRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ScriptsPainlessExecuteRequest::setupScriptsPainlessExecuteRequestDeserializer
+    );
+
+    protected static void setupScriptsPainlessExecuteRequestDeserializer(ObjectDeserializer<ScriptsPainlessExecuteRequest.Builder> op) {
+
+        op.add(Builder::context, JsonpDeserializer.stringDeserializer(), "context");
+        op.add(Builder::contextSetup, PainlessContextSetup._DESERIALIZER, "context_setup");
+        op.add(Builder::script, InlineScript._DESERIALIZER, "script");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code scripts_painless_execute}".
+     */
+    public static final SimpleEndpoint<ScriptsPainlessExecuteRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            return "/_scripts/painless/_execute";
+
+        },
+
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        ScriptsPainlessExecuteResponse._DESERIALIZER
+    );
+
+    /**
+     * Create an "{@code scripts_painless_execute}" endpoint.
+     */
+    public static <
+        TResult>
+        Endpoint<ScriptsPainlessExecuteRequest, ScriptsPainlessExecuteResponse<TResult>, ErrorResponse>
+        createScriptsPainlessExecuteEndpoint(JsonpDeserializer<TResult> tResultDeserializer) {
+        return _ENDPOINT.withResponseDeserializer(
+            ScriptsPainlessExecuteResponse.createScriptsPainlessExecuteResponseDeserializer(tResultDeserializer)
+        );
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/ScriptsPainlessExecuteResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/ScriptsPainlessExecuteResponse.java
index 977b6b01d6..7d3dc4cc30 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/ScriptsPainlessExecuteResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/ScriptsPainlessExecuteResponse.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -44,128 +48,126 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import java.util.function.Supplier;
-import javax.annotation.Nullable;
 
 // typedef: _global.scripts_painless_execute.Response
 
 @JsonpDeserializable
 public class ScriptsPainlessExecuteResponse<TResult> implements JsonpSerializable {
-	private final TResult result;
-
-	@Nullable
-	private final JsonpSerializer<TResult> tResultSerializer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ScriptsPainlessExecuteResponse(Builder<TResult> builder) {
-
-		this.result = ApiTypeHelper.requireNonNull(builder.result, this, "result");
-		this.tResultSerializer = builder.tResultSerializer;
-
-	}
-
-	public static <TResult> ScriptsPainlessExecuteResponse<TResult> of(
-			Function<Builder<TResult>, ObjectBuilder<ScriptsPainlessExecuteResponse<TResult>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * Required - API name: {@code result}
-	 */
-	public final TResult result() {
-		return this.result;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("result");
-		JsonpUtils.serialize(this.result, generator, tResultSerializer, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ScriptsPainlessExecuteResponse}.
-	 */
-
-	public static class Builder<TResult> extends ObjectBuilderBase
-			implements
-				ObjectBuilder<ScriptsPainlessExecuteResponse<TResult>> {
-		private TResult result;
-
-		@Nullable
-		private JsonpSerializer<TResult> tResultSerializer;
-
-		/**
-		 * Required - API name: {@code result}
-		 */
-		public final Builder<TResult> result(TResult value) {
-			this.result = value;
-			return this;
-		}
-
-		/**
-		 * Serializer for TResult. If not set, an attempt will be made to find a
-		 * serializer from the JSON context.
-		 */
-		public final Builder<TResult> tResultSerializer(@Nullable JsonpSerializer<TResult> value) {
-			this.tResultSerializer = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ScriptsPainlessExecuteResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ScriptsPainlessExecuteResponse<TResult> build() {
-			_checkSingleUse();
-
-			return new ScriptsPainlessExecuteResponse<TResult>(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Create a JSON deserializer for ScriptsPainlessExecuteResponse
-	 */
-	public static <TResult> JsonpDeserializer<ScriptsPainlessExecuteResponse<TResult>> createScriptsPainlessExecuteResponseDeserializer(
-			JsonpDeserializer<TResult> tResultDeserializer) {
-		return ObjectBuilderDeserializer.createForObject((Supplier<Builder<TResult>>) Builder::new,
-				op -> ScriptsPainlessExecuteResponse.setupScriptsPainlessExecuteResponseDeserializer(op,
-						tResultDeserializer));
-	};
-
-	/**
-	 * Json deserializer for {@link ScriptsPainlessExecuteResponse} based on named
-	 * deserializers provided by the calling {@code JsonMapper}.
-	 */
-	public static final JsonpDeserializer<ScriptsPainlessExecuteResponse<Object>> _DESERIALIZER =
-			createScriptsPainlessExecuteResponseDeserializer(
-			new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.scripts_painless_execute.TResult"));
-
-	protected static <TResult> void setupScriptsPainlessExecuteResponseDeserializer(
-			ObjectDeserializer<ScriptsPainlessExecuteResponse.Builder<TResult>> op,
-			JsonpDeserializer<TResult> tResultDeserializer) {
-
-		op.add(Builder::result, tResultDeserializer, "result");
-
-	}
+    private final TResult result;
+
+    @Nullable
+    private final JsonpSerializer<TResult> tResultSerializer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ScriptsPainlessExecuteResponse(Builder<TResult> builder) {
+
+        this.result = ApiTypeHelper.requireNonNull(builder.result, this, "result");
+        this.tResultSerializer = builder.tResultSerializer;
+
+    }
+
+    public static <TResult> ScriptsPainlessExecuteResponse<TResult> of(
+        Function<Builder<TResult>, ObjectBuilder<ScriptsPainlessExecuteResponse<TResult>>> fn
+    ) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * Required - API name: {@code result}
+     */
+    public final TResult result() {
+        return this.result;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("result");
+        JsonpUtils.serialize(this.result, generator, tResultSerializer, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ScriptsPainlessExecuteResponse}.
+     */
+
+    public static class Builder<TResult> extends ObjectBuilderBase implements ObjectBuilder<ScriptsPainlessExecuteResponse<TResult>> {
+        private TResult result;
+
+        @Nullable
+        private JsonpSerializer<TResult> tResultSerializer;
+
+        /**
+         * Required - API name: {@code result}
+         */
+        public final Builder<TResult> result(TResult value) {
+            this.result = value;
+            return this;
+        }
+
+        /**
+         * Serializer for TResult. If not set, an attempt will be made to find a
+         * serializer from the JSON context.
+         */
+        public final Builder<TResult> tResultSerializer(@Nullable JsonpSerializer<TResult> value) {
+            this.tResultSerializer = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ScriptsPainlessExecuteResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ScriptsPainlessExecuteResponse<TResult> build() {
+            _checkSingleUse();
+
+            return new ScriptsPainlessExecuteResponse<TResult>(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Create a JSON deserializer for ScriptsPainlessExecuteResponse
+     */
+    public static <TResult> JsonpDeserializer<ScriptsPainlessExecuteResponse<TResult>> createScriptsPainlessExecuteResponseDeserializer(
+        JsonpDeserializer<TResult> tResultDeserializer
+    ) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<TResult>>) Builder::new,
+            op -> ScriptsPainlessExecuteResponse.setupScriptsPainlessExecuteResponseDeserializer(op, tResultDeserializer)
+        );
+    };
+
+    /**
+     * Json deserializer for {@link ScriptsPainlessExecuteResponse} based on named
+     * deserializers provided by the calling {@code JsonMapper}.
+     */
+    public static final JsonpDeserializer<ScriptsPainlessExecuteResponse<Object>> _DESERIALIZER =
+        createScriptsPainlessExecuteResponseDeserializer(
+            new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.scripts_painless_execute.TResult")
+        );
+
+    protected static <TResult> void setupScriptsPainlessExecuteResponseDeserializer(
+        ObjectDeserializer<ScriptsPainlessExecuteResponse.Builder<TResult>> op,
+        JsonpDeserializer<TResult> tResultDeserializer
+    ) {
+
+        op.add(Builder::result, tResultDeserializer, "result");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/ScrollRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/ScrollRequest.java
index 6e9c7c0b4d..d4c7d534fd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/ScrollRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/ScrollRequest.java
@@ -32,25 +32,24 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Collections;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+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.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Collections;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.scroll.Request
 
@@ -60,164 +59,170 @@
  */
 @JsonpDeserializable
 public class ScrollRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final Time scroll;
-
-	private final String scrollId;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ScrollRequest(Builder builder) {
-
-		this.scroll = builder.scroll;
-		this.scrollId = ApiTypeHelper.requireNonNull(builder.scrollId, this, "scrollId");
-
-	}
-
-	public static ScrollRequest of(Function<Builder, ObjectBuilder<ScrollRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Period to retain the search context for scrolling.
-	 * <p>
-	 * API name: {@code scroll}
-	 */
-	@Nullable
-	public final Time scroll() {
-		return this.scroll;
-	}
-
-	/**
-	 * Required - Scroll ID of the search.
-	 * <p>
-	 * API name: {@code scroll_id}
-	 */
-	public final String scrollId() {
-		return this.scrollId;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.scroll != null) {
-			generator.writeKey("scroll");
-			this.scroll.serialize(generator, mapper);
-
-		}
-		generator.writeKey("scroll_id");
-		generator.write(this.scrollId);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ScrollRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ScrollRequest> {
-		@Nullable
-		private Time scroll;
-
-		private String scrollId;
-
-		/**
-		 * Period to retain the search context for scrolling.
-		 * <p>
-		 * API name: {@code scroll}
-		 */
-		public final Builder scroll(@Nullable Time value) {
-			this.scroll = value;
-			return this;
-		}
-
-		/**
-		 * Period to retain the search context for scrolling.
-		 * <p>
-		 * API name: {@code scroll}
-		 */
-		public final Builder scroll(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.scroll(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - Scroll ID of the search.
-		 * <p>
-		 * API name: {@code scroll_id}
-		 */
-		public final Builder scrollId(String value) {
-			this.scrollId = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ScrollRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ScrollRequest build() {
-			_checkSingleUse();
-
-			return new ScrollRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ScrollRequest}
-	 */
-	public static final JsonpDeserializer<ScrollRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ScrollRequest::setupScrollRequestDeserializer);
-
-	protected static void setupScrollRequestDeserializer(ObjectDeserializer<ScrollRequest.Builder> op) {
-
-		op.add(Builder::scroll, Time._DESERIALIZER, "scroll");
-		op.add(Builder::scrollId, JsonpDeserializer.stringDeserializer(), "scroll_id");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code scroll}".
-	 */
-	public static final SimpleEndpoint<ScrollRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				return "/_search/scroll";
-
-			},
-
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
-
-			}, SimpleEndpoint.emptyMap(), true, ScrollResponse._DESERIALIZER);
-
-	/**
-	 * Create an "{@code scroll}" endpoint.
-	 */
-	public static <TDocument> Endpoint<ScrollRequest, ScrollResponse<TDocument>, ErrorResponse> createScrollEndpoint(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return _ENDPOINT
-				.withResponseDeserializer(ScrollResponse.createScrollResponseDeserializer(tDocumentDeserializer));
-	}
+    @Nullable
+    private final Time scroll;
+
+    private final String scrollId;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ScrollRequest(Builder builder) {
+
+        this.scroll = builder.scroll;
+        this.scrollId = ApiTypeHelper.requireNonNull(builder.scrollId, this, "scrollId");
+
+    }
+
+    public static ScrollRequest of(Function<Builder, ObjectBuilder<ScrollRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Period to retain the search context for scrolling.
+     * <p>
+     * API name: {@code scroll}
+     */
+    @Nullable
+    public final Time scroll() {
+        return this.scroll;
+    }
+
+    /**
+     * Required - Scroll ID of the search.
+     * <p>
+     * API name: {@code scroll_id}
+     */
+    public final String scrollId() {
+        return this.scrollId;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.scroll != null) {
+            generator.writeKey("scroll");
+            this.scroll.serialize(generator, mapper);
+
+        }
+        generator.writeKey("scroll_id");
+        generator.write(this.scrollId);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ScrollRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ScrollRequest> {
+        @Nullable
+        private Time scroll;
+
+        private String scrollId;
+
+        /**
+         * Period to retain the search context for scrolling.
+         * <p>
+         * API name: {@code scroll}
+         */
+        public final Builder scroll(@Nullable Time value) {
+            this.scroll = value;
+            return this;
+        }
+
+        /**
+         * Period to retain the search context for scrolling.
+         * <p>
+         * API name: {@code scroll}
+         */
+        public final Builder scroll(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.scroll(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - Scroll ID of the search.
+         * <p>
+         * API name: {@code scroll_id}
+         */
+        public final Builder scrollId(String value) {
+            this.scrollId = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ScrollRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ScrollRequest build() {
+            _checkSingleUse();
+
+            return new ScrollRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ScrollRequest}
+     */
+    public static final JsonpDeserializer<ScrollRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ScrollRequest::setupScrollRequestDeserializer
+    );
+
+    protected static void setupScrollRequestDeserializer(ObjectDeserializer<ScrollRequest.Builder> op) {
+
+        op.add(Builder::scroll, Time._DESERIALIZER, "scroll");
+        op.add(Builder::scrollId, JsonpDeserializer.stringDeserializer(), "scroll_id");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code scroll}".
+     */
+    public static final SimpleEndpoint<ScrollRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            return "/_search/scroll";
+
+        },
+
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        ScrollResponse._DESERIALIZER
+    );
+
+    /**
+     * Create an "{@code scroll}" endpoint.
+     */
+    public static <TDocument> Endpoint<ScrollRequest, ScrollResponse<TDocument>, ErrorResponse> createScrollEndpoint(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return _ENDPOINT.withResponseDeserializer(ScrollResponse.createScrollResponseDeserializer(tDocumentDeserializer));
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/ScrollResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/ScrollResponse.java
index 72f68e7819..38d56e4b0e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/ScrollResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/ScrollResponse.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.function.Function;
+import java.util.function.Supplier;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.NamedDeserializer;
@@ -39,76 +41,76 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-import java.util.function.Supplier;
-
 // typedef: _global.scroll.Response
 
-
 @JsonpDeserializable
 public class ScrollResponse<TDocument> extends SearchResponse<TDocument> {
-	// ---------------------------------------------------------------------------------------------
-
-	private ScrollResponse(Builder<TDocument> builder) {
-		super(builder);
-
-	}
-
-	public static <TDocument> ScrollResponse<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<ScrollResponse<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ScrollResponse}.
-	 */
-
-	public static class Builder<TDocument> extends SearchResponse.AbstractBuilder<TDocument, Builder<TDocument>>
-			implements
-				ObjectBuilder<ScrollResponse<TDocument>> {
-		@Override
-		protected Builder<TDocument> self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ScrollResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ScrollResponse<TDocument> build() {
-			_checkSingleUse();
-
-			return new ScrollResponse<TDocument>(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Create a JSON deserializer for ScrollResponse
-	 */
-	public static <TDocument> JsonpDeserializer<ScrollResponse<TDocument>> createScrollResponseDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return ObjectBuilderDeserializer.createForObject((Supplier<Builder<TDocument>>) Builder::new,
-				op -> ScrollResponse.setupScrollResponseDeserializer(op, tDocumentDeserializer));
-	};
-
-	/**
-	 * Json deserializer for {@link ScrollResponse} based on named deserializers
-	 * provided by the calling {@code JsonMapper}.
-	 */
-	public static final JsonpDeserializer<ScrollResponse<Object>> _DESERIALIZER = createScrollResponseDeserializer(
-			new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.scroll.TDocument"));
-
-	protected static <TDocument> void setupScrollResponseDeserializer(
-			ObjectDeserializer<ScrollResponse.Builder<TDocument>> op,
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		setupSearchResponseDeserializer(op, tDocumentDeserializer);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private ScrollResponse(Builder<TDocument> builder) {
+        super(builder);
+
+    }
+
+    public static <TDocument> ScrollResponse<TDocument> of(Function<Builder<TDocument>, ObjectBuilder<ScrollResponse<TDocument>>> fn) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ScrollResponse}.
+     */
+
+    public static class Builder<TDocument> extends SearchResponse.AbstractBuilder<TDocument, Builder<TDocument>>
+        implements
+            ObjectBuilder<ScrollResponse<TDocument>> {
+        @Override
+        protected Builder<TDocument> self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ScrollResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ScrollResponse<TDocument> build() {
+            _checkSingleUse();
+
+            return new ScrollResponse<TDocument>(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Create a JSON deserializer for ScrollResponse
+     */
+    public static <TDocument> JsonpDeserializer<ScrollResponse<TDocument>> createScrollResponseDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<TDocument>>) Builder::new,
+            op -> ScrollResponse.setupScrollResponseDeserializer(op, tDocumentDeserializer)
+        );
+    };
+
+    /**
+     * Json deserializer for {@link ScrollResponse} based on named deserializers
+     * provided by the calling {@code JsonMapper}.
+     */
+    public static final JsonpDeserializer<ScrollResponse<Object>> _DESERIALIZER = createScrollResponseDeserializer(
+        new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.scroll.TDocument")
+    );
+
+    protected static <TDocument> void setupScrollResponseDeserializer(
+        ObjectDeserializer<ScrollResponse.Builder<TDocument>> op,
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        setupSearchResponseDeserializer(op, tDocumentDeserializer);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchRequest.java
index 138fe7c104..cccf3e522a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchRequest.java
@@ -32,6 +32,19 @@
 
 package org.opensearch.client.opensearch.core;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpDeserializable;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.json.ObjectBuilderDeserializer;
+import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -52,25 +65,11 @@
 import org.opensearch.client.opensearch.core.search.SourceConfig;
 import org.opensearch.client.opensearch.core.search.Suggester;
 import org.opensearch.client.opensearch.core.search.TrackHits;
-import org.opensearch.client.json.JsonpDeserializable;
-import org.opensearch.client.json.JsonpDeserializer;
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
-import org.opensearch.client.json.ObjectBuilderDeserializer;
-import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: _global.search.Request
 
@@ -80,2206 +79,2203 @@
  */
 @JsonpDeserializable
 public class SearchRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final SourceConfig source;
+    @Nullable
+    private final SourceConfig source;
 
-	private final Map<String, Aggregation> aggregations;
+    private final Map<String, Aggregation> aggregations;
 
-	@Nullable
-	private final Boolean allowNoIndices;
+    @Nullable
+    private final Boolean allowNoIndices;
 
-	@Nullable
-	private final Boolean allowPartialSearchResults;
+    @Nullable
+    private final Boolean allowPartialSearchResults;
 
-	@Nullable
-	private final Boolean analyzeWildcard;
+    @Nullable
+    private final Boolean analyzeWildcard;
 
-	@Nullable
-	private final String analyzer;
+    @Nullable
+    private final String analyzer;
 
-	@Nullable
-	private final Long batchedReduceSize;
+    @Nullable
+    private final Long batchedReduceSize;
 
-	@Nullable
-	private final Boolean ccsMinimizeRoundtrips;
+    @Nullable
+    private final Boolean ccsMinimizeRoundtrips;
 
-	@Nullable
-	private final FieldCollapse collapse;
+    @Nullable
+    private final FieldCollapse collapse;
 
-	@Nullable
-	private final Operator defaultOperator;
+    @Nullable
+    private final Operator defaultOperator;
 
-	@Nullable
-	private final String df;
+    @Nullable
+    private final String df;
 
-	private final List<FieldAndFormat> docvalueFields;
+    private final List<FieldAndFormat> docvalueFields;
 
-	private final List<ExpandWildcard> expandWildcards;
+    private final List<ExpandWildcard> expandWildcards;
 
-	@Nullable
-	private final Boolean explain;
+    @Nullable
+    private final Boolean explain;
 
-	private final List<FieldAndFormat> fields;
+    private final List<FieldAndFormat> fields;
 
-	@Nullable
-	private final Integer from;
+    @Nullable
+    private final Integer from;
 
-	@Nullable
-	private final Highlight highlight;
+    @Nullable
+    private final Highlight highlight;
 
-	@Nullable
-	private final Boolean ignoreThrottled;
+    @Nullable
+    private final Boolean ignoreThrottled;
 
-	@Nullable
-	private final Boolean ignoreUnavailable;
+    @Nullable
+    private final Boolean ignoreUnavailable;
 
-	private final List<String> index;
+    private final List<String> index;
 
-	private final List<Map<String, Double>> indicesBoost;
+    private final List<Map<String, Double>> indicesBoost;
 
-	@Nullable
-	private final Boolean lenient;
+    @Nullable
+    private final Boolean lenient;
 
-	@Nullable
-	private final Long maxConcurrentShardRequests;
+    @Nullable
+    private final Long maxConcurrentShardRequests;
 
-	@Nullable
-	private final String minCompatibleShardNode;
+    @Nullable
+    private final String minCompatibleShardNode;
 
-	@Nullable
-	private final Double minScore;
+    @Nullable
+    private final Double minScore;
 
-	@Nullable
-	private final Pit pit;
+    @Nullable
+    private final Pit pit;
 
-	@Nullable
-	private final Query postFilter;
+    @Nullable
+    private final Query postFilter;
 
-	@Nullable
-	private final Long preFilterShardSize;
+    @Nullable
+    private final Long preFilterShardSize;
 
-	@Nullable
-	private final String preference;
+    @Nullable
+    private final String preference;
 
-	@Nullable
-	private final Boolean profile;
+    @Nullable
+    private final Boolean profile;
 
-	@Nullable
-	private final String q;
+    @Nullable
+    private final String q;
 
-	@Nullable
-	private final Query query;
+    @Nullable
+    private final Query query;
 
-	@Nullable
-	private final Boolean requestCache;
+    @Nullable
+    private final Boolean requestCache;
 
-	private final List<Rescore> rescore;
+    private final List<Rescore> rescore;
 
-	@Nullable
-	private final String routing;
+    @Nullable
+    private final String routing;
 
-	private final Map<String, RuntimeField> runtimeMappings;
+    private final Map<String, RuntimeField> runtimeMappings;
 
-	private final Map<String, ScriptField> scriptFields;
+    private final Map<String, ScriptField> scriptFields;
 
-	@Nullable
-	private final Time scroll;
+    @Nullable
+    private final Time scroll;
 
-	private final List<String> searchAfter;
+    private final List<String> searchAfter;
 
-	@Nullable
-	private final SearchType searchType;
+    @Nullable
+    private final SearchType searchType;
 
-	@Nullable
-	private final Boolean seqNoPrimaryTerm;
+    @Nullable
+    private final Boolean seqNoPrimaryTerm;
 
-	@Nullable
-	private final Integer size;
+    @Nullable
+    private final Integer size;
 
-	@Nullable
-	private final SlicedScroll slice;
+    @Nullable
+    private final SlicedScroll slice;
 
-	private final List<SortOptions> sort;
+    private final List<SortOptions> sort;
 
-	private final List<String> stats;
+    private final List<String> stats;
 
-	private final List<String> storedFields;
+    private final List<String> storedFields;
 
-	@Nullable
-	private final Suggester suggest;
+    @Nullable
+    private final Suggester suggest;
 
-	@Nullable
-	private final Long terminateAfter;
-
-	@Nullable
-	private final String timeout;
-
-	@Nullable
-	private final Boolean trackScores;
-
-	@Nullable
-	private final TrackHits trackTotalHits;
-
-	@Nullable
-	private final Boolean version;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SearchRequest(Builder builder) {
-
-		this.source = builder.source;
-		this.aggregations = ApiTypeHelper.unmodifiable(builder.aggregations);
-		this.allowNoIndices = builder.allowNoIndices;
-		this.allowPartialSearchResults = builder.allowPartialSearchResults;
-		this.analyzeWildcard = builder.analyzeWildcard;
-		this.analyzer = builder.analyzer;
-		this.batchedReduceSize = builder.batchedReduceSize;
-		this.ccsMinimizeRoundtrips = builder.ccsMinimizeRoundtrips;
-		this.collapse = builder.collapse;
-		this.defaultOperator = builder.defaultOperator;
-		this.df = builder.df;
-		this.docvalueFields = ApiTypeHelper.unmodifiable(builder.docvalueFields);
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.explain = builder.explain;
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-		this.from = builder.from;
-		this.highlight = builder.highlight;
-		this.ignoreThrottled = builder.ignoreThrottled;
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.indicesBoost = ApiTypeHelper.unmodifiable(builder.indicesBoost);
-		this.lenient = builder.lenient;
-		this.maxConcurrentShardRequests = builder.maxConcurrentShardRequests;
-		this.minCompatibleShardNode = builder.minCompatibleShardNode;
-		this.minScore = builder.minScore;
-		this.pit = builder.pit;
-		this.postFilter = builder.postFilter;
-		this.preFilterShardSize = builder.preFilterShardSize;
-		this.preference = builder.preference;
-		this.profile = builder.profile;
-		this.q = builder.q;
-		this.query = builder.query;
-		this.requestCache = builder.requestCache;
-		this.rescore = ApiTypeHelper.unmodifiable(builder.rescore);
-		this.routing = builder.routing;
-		this.runtimeMappings = ApiTypeHelper.unmodifiable(builder.runtimeMappings);
-		this.scriptFields = ApiTypeHelper.unmodifiable(builder.scriptFields);
-		this.scroll = builder.scroll;
-		this.searchAfter = ApiTypeHelper.unmodifiable(builder.searchAfter);
-		this.searchType = builder.searchType;
-		this.seqNoPrimaryTerm = builder.seqNoPrimaryTerm;
-		this.size = builder.size;
-		this.slice = builder.slice;
-		this.sort = ApiTypeHelper.unmodifiable(builder.sort);
-		this.stats = ApiTypeHelper.unmodifiable(builder.stats);
-		this.storedFields = ApiTypeHelper.unmodifiable(builder.storedFields);
-		this.suggest = builder.suggest;
-		this.terminateAfter = builder.terminateAfter;
-		this.timeout = builder.timeout;
-		this.trackScores = builder.trackScores;
-		this.trackTotalHits = builder.trackTotalHits;
-		this.version = builder.version;
-
-	}
-
-	public static SearchRequest of(Function<Builder, ObjectBuilder<SearchRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Indicates which source fields are returned for matching documents. These
-	 * fields are returned in the hits._source property of the search response.
-	 * <p>
-	 * API name: {@code _source}
-	 */
-	@Nullable
-	public final SourceConfig source() {
-		return this.source;
-	}
-
-	/**
-	 * API name: {@code aggregations}
-	 */
-	public final Map<String, Aggregation> aggregations() {
-		return this.aggregations;
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Indicate if an error should be returned if there is a partial search failure
-	 * or timeout
-	 * <p>
-	 * API name: {@code allow_partial_search_results}
-	 */
-	@Nullable
-	public final Boolean allowPartialSearchResults() {
-		return this.allowPartialSearchResults;
-	}
-
-	/**
-	 * Specify whether wildcard and prefix queries should be analyzed (default:
-	 * false)
-	 * <p>
-	 * API name: {@code analyze_wildcard}
-	 */
-	@Nullable
-	public final Boolean analyzeWildcard() {
-		return this.analyzeWildcard;
-	}
-
-	/**
-	 * The analyzer to use for the query string
-	 * <p>
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * The number of shard results that should be reduced at once on the
-	 * coordinating node. This value should be used as a protection mechanism to
-	 * reduce the memory overhead per search request if the potential number of
-	 * shards in the request can be large.
-	 * <p>
-	 * API name: {@code batched_reduce_size}
-	 */
-	@Nullable
-	public final Long batchedReduceSize() {
-		return this.batchedReduceSize;
-	}
-
-	/**
-	 * Indicates whether network round-trips should be minimized as part of
-	 * cross-cluster search requests execution
-	 * <p>
-	 * API name: {@code ccs_minimize_roundtrips}
-	 */
-	@Nullable
-	public final Boolean ccsMinimizeRoundtrips() {
-		return this.ccsMinimizeRoundtrips;
-	}
-
-	/**
-	 * API name: {@code collapse}
-	 */
-	@Nullable
-	public final FieldCollapse collapse() {
-		return this.collapse;
-	}
-
-	/**
-	 * The default operator for query string query (AND or OR)
-	 * <p>
-	 * API name: {@code default_operator}
-	 */
-	@Nullable
-	public final Operator defaultOperator() {
-		return this.defaultOperator;
-	}
-
-	/**
-	 * The field to use as default where no field prefix is given in the query
-	 * string
-	 * <p>
-	 * API name: {@code df}
-	 */
-	@Nullable
-	public final String df() {
-		return this.df;
-	}
-
-	/**
-	 * Array of wildcard (*) patterns. The request returns doc values for field
-	 * names matching these patterns in the hits.fields property of the response.
-	 * <p>
-	 * API name: {@code docvalue_fields}
-	 */
-	public final List<FieldAndFormat> docvalueFields() {
-		return this.docvalueFields;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * If true, returns detailed information about score computation as part of a
-	 * hit.
-	 * <p>
-	 * API name: {@code explain}
-	 */
-	@Nullable
-	public final Boolean explain() {
-		return this.explain;
-	}
-
-	/**
-	 * Array of wildcard (*) patterns. The request returns values for field names
-	 * matching these patterns in the hits.fields property of the response.
-	 * <p>
-	 * API name: {@code fields}
-	 */
-	public final List<FieldAndFormat> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * Starting document offset. By default, you cannot page through more than
-	 * 10,000 hits using the from and size parameters. To page through more hits,
-	 * use the search_after parameter.
-	 * <p>
-	 * API name: {@code from}
-	 */
-	@Nullable
-	public final Integer from() {
-		return this.from;
-	}
-
-	/**
-	 * API name: {@code highlight}
-	 */
-	@Nullable
-	public final Highlight highlight() {
-		return this.highlight;
-	}
-
-	/**
-	 * Whether specified concrete, expanded or aliased indices should be ignored
-	 * when throttled
-	 * <p>
-	 * API name: {@code ignore_throttled}
-	 */
-	@Nullable
-	public final Boolean ignoreThrottled() {
-		return this.ignoreThrottled;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * A comma-separated list of index names to search; use <code>_all</code> or
-	 * empty string to perform the operation on all indices
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Boosts the _score of documents from specified indices.
-	 * <p>
-	 * API name: {@code indices_boost}
-	 */
-	public final List<Map<String, Double>> indicesBoost() {
-		return this.indicesBoost;
-	}
-
-	/**
-	 * Specify whether format-based query failures (such as providing text to a
-	 * numeric field) should be ignored
-	 * <p>
-	 * API name: {@code lenient}
-	 */
-	@Nullable
-	public final Boolean lenient() {
-		return this.lenient;
-	}
-
-	/**
-	 * The number of concurrent shard requests per node this search executes
-	 * concurrently. This value should be used to limit the impact of the search on
-	 * the cluster in order to limit the number of concurrent shard requests
-	 * <p>
-	 * API name: {@code max_concurrent_shard_requests}
-	 */
-	@Nullable
-	public final Long maxConcurrentShardRequests() {
-		return this.maxConcurrentShardRequests;
-	}
-
-	/**
-	 * The minimum compatible version that all shards involved in search should have
-	 * for this request to be successful
-	 * <p>
-	 * API name: {@code min_compatible_shard_node}
-	 */
-	@Nullable
-	public final String minCompatibleShardNode() {
-		return this.minCompatibleShardNode;
-	}
-
-	/**
-	 * Minimum _score for matching documents. Documents with a lower _score are not
-	 * included in the search results.
-	 * <p>
-	 * API name: {@code min_score}
-	 */
-	@Nullable
-	public final Double minScore() {
-		return this.minScore;
-	}
-
-	/**
-	 * API name: {@code pit}
-	 */
-	@Nullable
-	public final Pit pit() {
-		return this.pit;
-	}
-
-	/**
-	 * API name: {@code post_filter}
-	 */
-	@Nullable
-	public final Query postFilter() {
-		return this.postFilter;
-	}
-
-	/**
-	 * A threshold that enforces a pre-filter roundtrip to prefilter search shards
-	 * based on query rewriting if the number of shards the search request expands
-	 * to exceeds the threshold. This filter roundtrip can limit the number of
-	 * shards significantly if for instance a shard can not match any documents
-	 * based on its rewrite method ie. if date filters are mandatory to match but
-	 * the shard bounds and the query are disjoint.
-	 * <p>
-	 * API name: {@code pre_filter_shard_size}
-	 */
-	@Nullable
-	public final Long preFilterShardSize() {
-		return this.preFilterShardSize;
-	}
-
-	/**
-	 * Specify the node or shard the operation should be performed on (default:
-	 * random)
-	 * <p>
-	 * API name: {@code preference}
-	 */
-	@Nullable
-	public final String preference() {
-		return this.preference;
-	}
-
-	/**
-	 * API name: {@code profile}
-	 */
-	@Nullable
-	public final Boolean profile() {
-		return this.profile;
-	}
-
-	/**
-	 * Query in the Lucene query string syntax
-	 * <p>
-	 * API name: {@code q}
-	 */
-	@Nullable
-	public final String q() {
-		return this.q;
-	}
-
-	/**
-	 * Defines the search definition using the Query DSL.
-	 * <p>
-	 * API name: {@code query}
-	 */
-	@Nullable
-	public final Query query() {
-		return this.query;
-	}
-
-	/**
-	 * Specify if request cache should be used for this request or not, defaults to
-	 * index level setting
-	 * <p>
-	 * API name: {@code request_cache}
-	 */
-	@Nullable
-	public final Boolean requestCache() {
-		return this.requestCache;
-	}
-
-	/**
-	 * API name: {@code rescore}
-	 */
-	public final List<Rescore> rescore() {
-		return this.rescore;
-	}
-
-	/**
-	 * A comma-separated list of specific routing values
-	 * <p>
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Defines one or more runtime fields in the search request. These fields take
-	 * precedence over mapped fields with the same name.
-	 * <p>
-	 * API name: {@code runtime_mappings}
-	 */
-	public final Map<String, RuntimeField> runtimeMappings() {
-		return this.runtimeMappings;
-	}
-
-	/**
-	 * Retrieve a script evaluation (based on different fields) for each hit.
-	 * <p>
-	 * API name: {@code script_fields}
-	 */
-	public final Map<String, ScriptField> scriptFields() {
-		return this.scriptFields;
-	}
-
-	/**
-	 * Specify how long a consistent view of the index should be maintained for
-	 * scrolled search
-	 * <p>
-	 * API name: {@code scroll}
-	 */
-	@Nullable
-	public final Time scroll() {
-		return this.scroll;
-	}
-
-	/**
-	 * API name: {@code search_after}
-	 */
-	public final List<String> searchAfter() {
-		return this.searchAfter;
-	}
-
-	/**
-	 * Search operation type
-	 * <p>
-	 * API name: {@code search_type}
-	 */
-	@Nullable
-	public final SearchType searchType() {
-		return this.searchType;
-	}
-
-	/**
-	 * If true, returns sequence number and primary term of the last modification of
-	 * each hit. See Optimistic concurrency control.
-	 * <p>
-	 * API name: {@code seq_no_primary_term}
-	 */
-	@Nullable
-	public final Boolean seqNoPrimaryTerm() {
-		return this.seqNoPrimaryTerm;
-	}
-
-	/**
-	 * The number of hits to return. By default, you cannot page through more than
-	 * 10,000 hits using the from and size parameters. To page through more hits,
-	 * use the search_after parameter.
-	 * <p>
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	/**
-	 * API name: {@code slice}
-	 */
-	@Nullable
-	public final SlicedScroll slice() {
-		return this.slice;
-	}
-
-	/**
-	 * API name: {@code sort}
-	 */
-	public final List<SortOptions> sort() {
-		return this.sort;
-	}
-
-	/**
-	 * Stats groups to associate with the search. Each group maintains a statistics
-	 * aggregation for its associated searches. You can retrieve these stats using
-	 * the indices stats API.
-	 * <p>
-	 * API name: {@code stats}
-	 */
-	public final List<String> stats() {
-		return this.stats;
-	}
-
-	/**
-	 * List of stored fields to return as part of a hit. If no fields are specified,
-	 * no stored fields are included in the response. If this field is specified,
-	 * the _source parameter defaults to false. You can pass _source: true to return
-	 * both source fields and stored fields in the search response.
-	 * <p>
-	 * API name: {@code stored_fields}
-	 */
-	public final List<String> storedFields() {
-		return this.storedFields;
-	}
-
-	/**
-	 * API name: {@code suggest}
-	 */
-	@Nullable
-	public final Suggester suggest() {
-		return this.suggest;
-	}
-
-	/**
-	 * Maximum number of documents to collect for each shard. If a query reaches
-	 * this limit, Elasticsearch terminates the query early. Elasticsearch collects
-	 * documents before sorting. Defaults to 0, which does not terminate query
-	 * execution early.
-	 * <p>
-	 * API name: {@code terminate_after}
-	 */
-	@Nullable
-	public final Long terminateAfter() {
-		return this.terminateAfter;
-	}
-
-	/**
-	 * Specifies the period of time to wait for a response from each shard. If no
-	 * response is received before the timeout expires, the request fails and
-	 * returns an error. Defaults to no timeout.
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final String timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * If true, calculate and return document scores, even if the scores are not
-	 * used for sorting.
-	 * <p>
-	 * API name: {@code track_scores}
-	 */
-	@Nullable
-	public final Boolean trackScores() {
-		return this.trackScores;
-	}
-
-	/**
-	 * Number of hits matching the query to count accurately. If true, the exact
-	 * number of hits is returned at the cost of some performance. If false, the
-	 * response does not include the total number of hits matching the query.
-	 * Defaults to 10,000 hits.
-	 * <p>
-	 * API name: {@code track_total_hits}
-	 */
-	@Nullable
-	public final TrackHits trackTotalHits() {
-		return this.trackTotalHits;
-	}
-
-	/**
-	 * If true, returns document version as part of a hit.
-	 * <p>
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Boolean version() {
-		return this.version;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.source != null) {
-			generator.writeKey("_source");
-			this.source.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.aggregations)) {
-			generator.writeKey("aggregations");
-			generator.writeStartObject();
-			for (Map.Entry<String, Aggregation> item0 : this.aggregations.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.collapse != null) {
-			generator.writeKey("collapse");
-			this.collapse.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.docvalueFields)) {
-			generator.writeKey("docvalue_fields");
-			generator.writeStartArray();
-			for (FieldAndFormat item0 : this.docvalueFields) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.explain != null) {
-			generator.writeKey("explain");
-			generator.write(this.explain);
-
-		}
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartArray();
-			for (FieldAndFormat item0 : this.fields) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.from != null) {
-			generator.writeKey("from");
-			generator.write(this.from);
-
-		}
-		if (this.highlight != null) {
-			generator.writeKey("highlight");
-			this.highlight.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.indicesBoost)) {
-			generator.writeKey("indices_boost");
-			generator.writeStartArray();
-			for (Map<String, Double> item0 : this.indicesBoost) {
-				generator.writeStartObject();
-				if (item0 != null) {
-					for (Map.Entry<String, Double> item1 : item0.entrySet()) {
-						generator.writeKey(item1.getKey());
-						generator.write(item1.getValue());
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.minScore != null) {
-			generator.writeKey("min_score");
-			generator.write(this.minScore);
-
-		}
-
-		if (this.pit != null) {
-			generator.writeKey("pit");
-			this.pit.serialize(generator, mapper);
-		}
-
-		if (this.postFilter != null) {
-			generator.writeKey("post_filter");
-			this.postFilter.serialize(generator, mapper);
-
-		}
-		if (this.profile != null) {
-			generator.writeKey("profile");
-			generator.write(this.profile);
-
-		}
-		if (this.query != null) {
-			generator.writeKey("query");
-			this.query.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.rescore)) {
-			generator.writeKey("rescore");
-			generator.writeStartArray();
-			for (Rescore item0 : this.rescore) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.runtimeMappings)) {
-			generator.writeKey("runtime_mappings");
-			generator.writeStartObject();
-			for (Map.Entry<String, RuntimeField> item0 : this.runtimeMappings.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.scriptFields)) {
-			generator.writeKey("script_fields");
-			generator.writeStartObject();
-			for (Map.Entry<String, ScriptField> item0 : this.scriptFields.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.searchAfter)) {
-			generator.writeKey("search_after");
-			generator.writeStartArray();
-			for (String item0 : this.searchAfter) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.seqNoPrimaryTerm != null) {
-			generator.writeKey("seq_no_primary_term");
-			generator.write(this.seqNoPrimaryTerm);
-
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		if (this.slice != null) {
-			generator.writeKey("slice");
-			this.slice.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.sort)) {
-			generator.writeKey("sort");
-			generator.writeStartArray();
-			for (SortOptions item0 : this.sort) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.stats)) {
-			generator.writeKey("stats");
-			generator.writeStartArray();
-			for (String item0 : this.stats) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.storedFields)) {
-			generator.writeKey("stored_fields");
-			generator.writeStartArray();
-			for (String item0 : this.storedFields) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.suggest != null) {
-			generator.writeKey("suggest");
-			this.suggest.serialize(generator, mapper);
+    @Nullable
+    private final Long terminateAfter;
+
+    @Nullable
+    private final String timeout;
+
+    @Nullable
+    private final Boolean trackScores;
+
+    @Nullable
+    private final TrackHits trackTotalHits;
+
+    @Nullable
+    private final Boolean version;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SearchRequest(Builder builder) {
+
+        this.source = builder.source;
+        this.aggregations = ApiTypeHelper.unmodifiable(builder.aggregations);
+        this.allowNoIndices = builder.allowNoIndices;
+        this.allowPartialSearchResults = builder.allowPartialSearchResults;
+        this.analyzeWildcard = builder.analyzeWildcard;
+        this.analyzer = builder.analyzer;
+        this.batchedReduceSize = builder.batchedReduceSize;
+        this.ccsMinimizeRoundtrips = builder.ccsMinimizeRoundtrips;
+        this.collapse = builder.collapse;
+        this.defaultOperator = builder.defaultOperator;
+        this.df = builder.df;
+        this.docvalueFields = ApiTypeHelper.unmodifiable(builder.docvalueFields);
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.explain = builder.explain;
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.from = builder.from;
+        this.highlight = builder.highlight;
+        this.ignoreThrottled = builder.ignoreThrottled;
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.indicesBoost = ApiTypeHelper.unmodifiable(builder.indicesBoost);
+        this.lenient = builder.lenient;
+        this.maxConcurrentShardRequests = builder.maxConcurrentShardRequests;
+        this.minCompatibleShardNode = builder.minCompatibleShardNode;
+        this.minScore = builder.minScore;
+        this.pit = builder.pit;
+        this.postFilter = builder.postFilter;
+        this.preFilterShardSize = builder.preFilterShardSize;
+        this.preference = builder.preference;
+        this.profile = builder.profile;
+        this.q = builder.q;
+        this.query = builder.query;
+        this.requestCache = builder.requestCache;
+        this.rescore = ApiTypeHelper.unmodifiable(builder.rescore);
+        this.routing = builder.routing;
+        this.runtimeMappings = ApiTypeHelper.unmodifiable(builder.runtimeMappings);
+        this.scriptFields = ApiTypeHelper.unmodifiable(builder.scriptFields);
+        this.scroll = builder.scroll;
+        this.searchAfter = ApiTypeHelper.unmodifiable(builder.searchAfter);
+        this.searchType = builder.searchType;
+        this.seqNoPrimaryTerm = builder.seqNoPrimaryTerm;
+        this.size = builder.size;
+        this.slice = builder.slice;
+        this.sort = ApiTypeHelper.unmodifiable(builder.sort);
+        this.stats = ApiTypeHelper.unmodifiable(builder.stats);
+        this.storedFields = ApiTypeHelper.unmodifiable(builder.storedFields);
+        this.suggest = builder.suggest;
+        this.terminateAfter = builder.terminateAfter;
+        this.timeout = builder.timeout;
+        this.trackScores = builder.trackScores;
+        this.trackTotalHits = builder.trackTotalHits;
+        this.version = builder.version;
+
+    }
+
+    public static SearchRequest of(Function<Builder, ObjectBuilder<SearchRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Indicates which source fields are returned for matching documents. These
+     * fields are returned in the hits._source property of the search response.
+     * <p>
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final SourceConfig source() {
+        return this.source;
+    }
+
+    /**
+     * API name: {@code aggregations}
+     */
+    public final Map<String, Aggregation> aggregations() {
+        return this.aggregations;
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Indicate if an error should be returned if there is a partial search failure
+     * or timeout
+     * <p>
+     * API name: {@code allow_partial_search_results}
+     */
+    @Nullable
+    public final Boolean allowPartialSearchResults() {
+        return this.allowPartialSearchResults;
+    }
+
+    /**
+     * Specify whether wildcard and prefix queries should be analyzed (default:
+     * false)
+     * <p>
+     * API name: {@code analyze_wildcard}
+     */
+    @Nullable
+    public final Boolean analyzeWildcard() {
+        return this.analyzeWildcard;
+    }
+
+    /**
+     * The analyzer to use for the query string
+     * <p>
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * The number of shard results that should be reduced at once on the
+     * coordinating node. This value should be used as a protection mechanism to
+     * reduce the memory overhead per search request if the potential number of
+     * shards in the request can be large.
+     * <p>
+     * API name: {@code batched_reduce_size}
+     */
+    @Nullable
+    public final Long batchedReduceSize() {
+        return this.batchedReduceSize;
+    }
+
+    /**
+     * Indicates whether network round-trips should be minimized as part of
+     * cross-cluster search requests execution
+     * <p>
+     * API name: {@code ccs_minimize_roundtrips}
+     */
+    @Nullable
+    public final Boolean ccsMinimizeRoundtrips() {
+        return this.ccsMinimizeRoundtrips;
+    }
+
+    /**
+     * API name: {@code collapse}
+     */
+    @Nullable
+    public final FieldCollapse collapse() {
+        return this.collapse;
+    }
+
+    /**
+     * The default operator for query string query (AND or OR)
+     * <p>
+     * API name: {@code default_operator}
+     */
+    @Nullable
+    public final Operator defaultOperator() {
+        return this.defaultOperator;
+    }
+
+    /**
+     * The field to use as default where no field prefix is given in the query
+     * string
+     * <p>
+     * API name: {@code df}
+     */
+    @Nullable
+    public final String df() {
+        return this.df;
+    }
+
+    /**
+     * Array of wildcard (*) patterns. The request returns doc values for field
+     * names matching these patterns in the hits.fields property of the response.
+     * <p>
+     * API name: {@code docvalue_fields}
+     */
+    public final List<FieldAndFormat> docvalueFields() {
+        return this.docvalueFields;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * If true, returns detailed information about score computation as part of a
+     * hit.
+     * <p>
+     * API name: {@code explain}
+     */
+    @Nullable
+    public final Boolean explain() {
+        return this.explain;
+    }
+
+    /**
+     * Array of wildcard (*) patterns. The request returns values for field names
+     * matching these patterns in the hits.fields property of the response.
+     * <p>
+     * API name: {@code fields}
+     */
+    public final List<FieldAndFormat> fields() {
+        return this.fields;
+    }
+
+    /**
+     * Starting document offset. By default, you cannot page through more than
+     * 10,000 hits using the from and size parameters. To page through more hits,
+     * use the search_after parameter.
+     * <p>
+     * API name: {@code from}
+     */
+    @Nullable
+    public final Integer from() {
+        return this.from;
+    }
+
+    /**
+     * API name: {@code highlight}
+     */
+    @Nullable
+    public final Highlight highlight() {
+        return this.highlight;
+    }
+
+    /**
+     * Whether specified concrete, expanded or aliased indices should be ignored
+     * when throttled
+     * <p>
+     * API name: {@code ignore_throttled}
+     */
+    @Nullable
+    public final Boolean ignoreThrottled() {
+        return this.ignoreThrottled;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * A comma-separated list of index names to search; use <code>_all</code> or
+     * empty string to perform the operation on all indices
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Boosts the _score of documents from specified indices.
+     * <p>
+     * API name: {@code indices_boost}
+     */
+    public final List<Map<String, Double>> indicesBoost() {
+        return this.indicesBoost;
+    }
+
+    /**
+     * Specify whether format-based query failures (such as providing text to a
+     * numeric field) should be ignored
+     * <p>
+     * API name: {@code lenient}
+     */
+    @Nullable
+    public final Boolean lenient() {
+        return this.lenient;
+    }
+
+    /**
+     * The number of concurrent shard requests per node this search executes
+     * concurrently. This value should be used to limit the impact of the search on
+     * the cluster in order to limit the number of concurrent shard requests
+     * <p>
+     * API name: {@code max_concurrent_shard_requests}
+     */
+    @Nullable
+    public final Long maxConcurrentShardRequests() {
+        return this.maxConcurrentShardRequests;
+    }
+
+    /**
+     * The minimum compatible version that all shards involved in search should have
+     * for this request to be successful
+     * <p>
+     * API name: {@code min_compatible_shard_node}
+     */
+    @Nullable
+    public final String minCompatibleShardNode() {
+        return this.minCompatibleShardNode;
+    }
+
+    /**
+     * Minimum _score for matching documents. Documents with a lower _score are not
+     * included in the search results.
+     * <p>
+     * API name: {@code min_score}
+     */
+    @Nullable
+    public final Double minScore() {
+        return this.minScore;
+    }
+
+    /**
+     * API name: {@code pit}
+     */
+    @Nullable
+    public final Pit pit() {
+        return this.pit;
+    }
+
+    /**
+     * API name: {@code post_filter}
+     */
+    @Nullable
+    public final Query postFilter() {
+        return this.postFilter;
+    }
+
+    /**
+     * A threshold that enforces a pre-filter roundtrip to prefilter search shards
+     * based on query rewriting if the number of shards the search request expands
+     * to exceeds the threshold. This filter roundtrip can limit the number of
+     * shards significantly if for instance a shard can not match any documents
+     * based on its rewrite method ie. if date filters are mandatory to match but
+     * the shard bounds and the query are disjoint.
+     * <p>
+     * API name: {@code pre_filter_shard_size}
+     */
+    @Nullable
+    public final Long preFilterShardSize() {
+        return this.preFilterShardSize;
+    }
+
+    /**
+     * Specify the node or shard the operation should be performed on (default:
+     * random)
+     * <p>
+     * API name: {@code preference}
+     */
+    @Nullable
+    public final String preference() {
+        return this.preference;
+    }
+
+    /**
+     * API name: {@code profile}
+     */
+    @Nullable
+    public final Boolean profile() {
+        return this.profile;
+    }
+
+    /**
+     * Query in the Lucene query string syntax
+     * <p>
+     * API name: {@code q}
+     */
+    @Nullable
+    public final String q() {
+        return this.q;
+    }
+
+    /**
+     * Defines the search definition using the Query DSL.
+     * <p>
+     * API name: {@code query}
+     */
+    @Nullable
+    public final Query query() {
+        return this.query;
+    }
+
+    /**
+     * Specify if request cache should be used for this request or not, defaults to
+     * index level setting
+     * <p>
+     * API name: {@code request_cache}
+     */
+    @Nullable
+    public final Boolean requestCache() {
+        return this.requestCache;
+    }
+
+    /**
+     * API name: {@code rescore}
+     */
+    public final List<Rescore> rescore() {
+        return this.rescore;
+    }
+
+    /**
+     * A comma-separated list of specific routing values
+     * <p>
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * Defines one or more runtime fields in the search request. These fields take
+     * precedence over mapped fields with the same name.
+     * <p>
+     * API name: {@code runtime_mappings}
+     */
+    public final Map<String, RuntimeField> runtimeMappings() {
+        return this.runtimeMappings;
+    }
+
+    /**
+     * Retrieve a script evaluation (based on different fields) for each hit.
+     * <p>
+     * API name: {@code script_fields}
+     */
+    public final Map<String, ScriptField> scriptFields() {
+        return this.scriptFields;
+    }
+
+    /**
+     * Specify how long a consistent view of the index should be maintained for
+     * scrolled search
+     * <p>
+     * API name: {@code scroll}
+     */
+    @Nullable
+    public final Time scroll() {
+        return this.scroll;
+    }
+
+    /**
+     * API name: {@code search_after}
+     */
+    public final List<String> searchAfter() {
+        return this.searchAfter;
+    }
+
+    /**
+     * Search operation type
+     * <p>
+     * API name: {@code search_type}
+     */
+    @Nullable
+    public final SearchType searchType() {
+        return this.searchType;
+    }
+
+    /**
+     * If true, returns sequence number and primary term of the last modification of
+     * each hit. See Optimistic concurrency control.
+     * <p>
+     * API name: {@code seq_no_primary_term}
+     */
+    @Nullable
+    public final Boolean seqNoPrimaryTerm() {
+        return this.seqNoPrimaryTerm;
+    }
+
+    /**
+     * The number of hits to return. By default, you cannot page through more than
+     * 10,000 hits using the from and size parameters. To page through more hits,
+     * use the search_after parameter.
+     * <p>
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    /**
+     * API name: {@code slice}
+     */
+    @Nullable
+    public final SlicedScroll slice() {
+        return this.slice;
+    }
+
+    /**
+     * API name: {@code sort}
+     */
+    public final List<SortOptions> sort() {
+        return this.sort;
+    }
+
+    /**
+     * Stats groups to associate with the search. Each group maintains a statistics
+     * aggregation for its associated searches. You can retrieve these stats using
+     * the indices stats API.
+     * <p>
+     * API name: {@code stats}
+     */
+    public final List<String> stats() {
+        return this.stats;
+    }
+
+    /**
+     * List of stored fields to return as part of a hit. If no fields are specified,
+     * no stored fields are included in the response. If this field is specified,
+     * the _source parameter defaults to false. You can pass _source: true to return
+     * both source fields and stored fields in the search response.
+     * <p>
+     * API name: {@code stored_fields}
+     */
+    public final List<String> storedFields() {
+        return this.storedFields;
+    }
+
+    /**
+     * API name: {@code suggest}
+     */
+    @Nullable
+    public final Suggester suggest() {
+        return this.suggest;
+    }
+
+    /**
+     * Maximum number of documents to collect for each shard. If a query reaches
+     * this limit, Elasticsearch terminates the query early. Elasticsearch collects
+     * documents before sorting. Defaults to 0, which does not terminate query
+     * execution early.
+     * <p>
+     * API name: {@code terminate_after}
+     */
+    @Nullable
+    public final Long terminateAfter() {
+        return this.terminateAfter;
+    }
+
+    /**
+     * Specifies the period of time to wait for a response from each shard. If no
+     * response is received before the timeout expires, the request fails and
+     * returns an error. Defaults to no timeout.
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final String timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * If true, calculate and return document scores, even if the scores are not
+     * used for sorting.
+     * <p>
+     * API name: {@code track_scores}
+     */
+    @Nullable
+    public final Boolean trackScores() {
+        return this.trackScores;
+    }
+
+    /**
+     * Number of hits matching the query to count accurately. If true, the exact
+     * number of hits is returned at the cost of some performance. If false, the
+     * response does not include the total number of hits matching the query.
+     * Defaults to 10,000 hits.
+     * <p>
+     * API name: {@code track_total_hits}
+     */
+    @Nullable
+    public final TrackHits trackTotalHits() {
+        return this.trackTotalHits;
+    }
+
+    /**
+     * If true, returns document version as part of a hit.
+     * <p>
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Boolean version() {
+        return this.version;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.source != null) {
+            generator.writeKey("_source");
+            this.source.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.aggregations)) {
+            generator.writeKey("aggregations");
+            generator.writeStartObject();
+            for (Map.Entry<String, Aggregation> item0 : this.aggregations.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.collapse != null) {
+            generator.writeKey("collapse");
+            this.collapse.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.docvalueFields)) {
+            generator.writeKey("docvalue_fields");
+            generator.writeStartArray();
+            for (FieldAndFormat item0 : this.docvalueFields) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.explain != null) {
+            generator.writeKey("explain");
+            generator.write(this.explain);
+
+        }
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartArray();
+            for (FieldAndFormat item0 : this.fields) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.from != null) {
+            generator.writeKey("from");
+            generator.write(this.from);
+
+        }
+        if (this.highlight != null) {
+            generator.writeKey("highlight");
+            this.highlight.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.indicesBoost)) {
+            generator.writeKey("indices_boost");
+            generator.writeStartArray();
+            for (Map<String, Double> item0 : this.indicesBoost) {
+                generator.writeStartObject();
+                if (item0 != null) {
+                    for (Map.Entry<String, Double> item1 : item0.entrySet()) {
+                        generator.writeKey(item1.getKey());
+                        generator.write(item1.getValue());
+
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.minScore != null) {
+            generator.writeKey("min_score");
+            generator.write(this.minScore);
+
+        }
+
+        if (this.pit != null) {
+            generator.writeKey("pit");
+            this.pit.serialize(generator, mapper);
+        }
+
+        if (this.postFilter != null) {
+            generator.writeKey("post_filter");
+            this.postFilter.serialize(generator, mapper);
+
+        }
+        if (this.profile != null) {
+            generator.writeKey("profile");
+            generator.write(this.profile);
+
+        }
+        if (this.query != null) {
+            generator.writeKey("query");
+            this.query.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.rescore)) {
+            generator.writeKey("rescore");
+            generator.writeStartArray();
+            for (Rescore item0 : this.rescore) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.runtimeMappings)) {
+            generator.writeKey("runtime_mappings");
+            generator.writeStartObject();
+            for (Map.Entry<String, RuntimeField> item0 : this.runtimeMappings.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.scriptFields)) {
+            generator.writeKey("script_fields");
+            generator.writeStartObject();
+            for (Map.Entry<String, ScriptField> item0 : this.scriptFields.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.searchAfter)) {
+            generator.writeKey("search_after");
+            generator.writeStartArray();
+            for (String item0 : this.searchAfter) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.seqNoPrimaryTerm != null) {
+            generator.writeKey("seq_no_primary_term");
+            generator.write(this.seqNoPrimaryTerm);
+
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        if (this.slice != null) {
+            generator.writeKey("slice");
+            this.slice.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.sort)) {
+            generator.writeKey("sort");
+            generator.writeStartArray();
+            for (SortOptions item0 : this.sort) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.stats)) {
+            generator.writeKey("stats");
+            generator.writeStartArray();
+            for (String item0 : this.stats) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.storedFields)) {
+            generator.writeKey("stored_fields");
+            generator.writeStartArray();
+            for (String item0 : this.storedFields) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.suggest != null) {
+            generator.writeKey("suggest");
+            this.suggest.serialize(generator, mapper);
 
-		}
-		if (this.terminateAfter != null) {
-			generator.writeKey("terminate_after");
-			generator.write(this.terminateAfter);
+        }
+        if (this.terminateAfter != null) {
+            generator.writeKey("terminate_after");
+            generator.write(this.terminateAfter);
 
-		}
-		if (this.timeout != null) {
-			generator.writeKey("timeout");
-			generator.write(this.timeout);
+        }
+        if (this.timeout != null) {
+            generator.writeKey("timeout");
+            generator.write(this.timeout);
 
-		}
-		if (this.trackScores != null) {
-			generator.writeKey("track_scores");
-			generator.write(this.trackScores);
+        }
+        if (this.trackScores != null) {
+            generator.writeKey("track_scores");
+            generator.write(this.trackScores);
 
-		}
-		if (this.trackTotalHits != null) {
-			generator.writeKey("track_total_hits");
-			this.trackTotalHits.serialize(generator, mapper);
+        }
+        if (this.trackTotalHits != null) {
+            generator.writeKey("track_total_hits");
+            this.trackTotalHits.serialize(generator, mapper);
 
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link SearchRequest}.
-	 */
+    /**
+     * Builder for {@link SearchRequest}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SearchRequest> {
-		@Nullable
-		private SourceConfig source;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SearchRequest> {
+        @Nullable
+        private SourceConfig source;
 
-		@Nullable
-		private Map<String, Aggregation> aggregations;
+        @Nullable
+        private Map<String, Aggregation> aggregations;
 
-		@Nullable
-		private Boolean allowNoIndices;
+        @Nullable
+        private Boolean allowNoIndices;
 
-		@Nullable
-		private Boolean allowPartialSearchResults;
+        @Nullable
+        private Boolean allowPartialSearchResults;
 
-		@Nullable
-		private Boolean analyzeWildcard;
+        @Nullable
+        private Boolean analyzeWildcard;
 
-		@Nullable
-		private String analyzer;
+        @Nullable
+        private String analyzer;
 
-		@Nullable
-		private Long batchedReduceSize;
+        @Nullable
+        private Long batchedReduceSize;
 
-		@Nullable
-		private Boolean ccsMinimizeRoundtrips;
+        @Nullable
+        private Boolean ccsMinimizeRoundtrips;
 
-		@Nullable
-		private FieldCollapse collapse;
+        @Nullable
+        private FieldCollapse collapse;
 
-		@Nullable
-		private Operator defaultOperator;
+        @Nullable
+        private Operator defaultOperator;
 
-		@Nullable
-		private String df;
+        @Nullable
+        private String df;
 
-		@Nullable
-		private List<FieldAndFormat> docvalueFields;
+        @Nullable
+        private List<FieldAndFormat> docvalueFields;
 
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
 
-		@Nullable
-		private Boolean explain;
+        @Nullable
+        private Boolean explain;
 
-		@Nullable
-		private List<FieldAndFormat> fields;
+        @Nullable
+        private List<FieldAndFormat> fields;
 
-		@Nullable
-		private Integer from;
+        @Nullable
+        private Integer from;
 
-		@Nullable
-		private Highlight highlight;
+        @Nullable
+        private Highlight highlight;
 
-		@Nullable
-		private Boolean ignoreThrottled;
+        @Nullable
+        private Boolean ignoreThrottled;
 
-		@Nullable
-		private Boolean ignoreUnavailable;
+        @Nullable
+        private Boolean ignoreUnavailable;
 
-		@Nullable
-		private List<String> index;
+        @Nullable
+        private List<String> index;
 
-		@Nullable
-		private List<Map<String, Double>> indicesBoost;
+        @Nullable
+        private List<Map<String, Double>> indicesBoost;
 
-		@Nullable
-		private Boolean lenient;
+        @Nullable
+        private Boolean lenient;
 
-		@Nullable
-		private Long maxConcurrentShardRequests;
+        @Nullable
+        private Long maxConcurrentShardRequests;
 
-		@Nullable
-		private String minCompatibleShardNode;
+        @Nullable
+        private String minCompatibleShardNode;
 
-		@Nullable
-		private Double minScore;
+        @Nullable
+        private Double minScore;
 
-		@Nullable
-		private Pit pit;
+        @Nullable
+        private Pit pit;
 
-		@Nullable
-		private Query postFilter;
+        @Nullable
+        private Query postFilter;
 
-		@Nullable
-		private Long preFilterShardSize;
+        @Nullable
+        private Long preFilterShardSize;
 
-		@Nullable
-		private String preference;
+        @Nullable
+        private String preference;
 
-		@Nullable
-		private Boolean profile;
+        @Nullable
+        private Boolean profile;
 
-		@Nullable
-		private String q;
+        @Nullable
+        private String q;
 
-		@Nullable
-		private Query query;
+        @Nullable
+        private Query query;
 
-		@Nullable
-		private Boolean requestCache;
+        @Nullable
+        private Boolean requestCache;
 
-		@Nullable
-		private List<Rescore> rescore;
+        @Nullable
+        private List<Rescore> rescore;
 
-		@Nullable
-		private String routing;
+        @Nullable
+        private String routing;
 
-		@Nullable
-		private Map<String, RuntimeField> runtimeMappings;
+        @Nullable
+        private Map<String, RuntimeField> runtimeMappings;
 
-		@Nullable
-		private Map<String, ScriptField> scriptFields;
+        @Nullable
+        private Map<String, ScriptField> scriptFields;
 
-		@Nullable
-		private Time scroll;
+        @Nullable
+        private Time scroll;
 
-		@Nullable
-		private List<String> searchAfter;
+        @Nullable
+        private List<String> searchAfter;
 
-		@Nullable
-		private SearchType searchType;
+        @Nullable
+        private SearchType searchType;
 
-		@Nullable
-		private Boolean seqNoPrimaryTerm;
+        @Nullable
+        private Boolean seqNoPrimaryTerm;
 
-		@Nullable
-		private Integer size;
+        @Nullable
+        private Integer size;
 
-		@Nullable
-		private SlicedScroll slice;
+        @Nullable
+        private SlicedScroll slice;
 
-		@Nullable
-		private List<SortOptions> sort;
-
-		@Nullable
-		private List<String> stats;
-
-		@Nullable
-		private List<String> storedFields;
-
-		@Nullable
-		private Suggester suggest;
-
-		@Nullable
-		private Long terminateAfter;
-
-		@Nullable
-		private String timeout;
-
-		@Nullable
-		private Boolean trackScores;
-
-		@Nullable
-		private TrackHits trackTotalHits;
-
-		@Nullable
-		private Boolean version;
-
-		/**
-		 * Indicates which source fields are returned for matching documents. These
-		 * fields are returned in the hits._source property of the search response.
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(@Nullable SourceConfig value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * Indicates which source fields are returned for matching documents. These
-		 * fields are returned in the hits._source property of the search response.
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(Function<SourceConfig.Builder, ObjectBuilder<SourceConfig>> fn) {
-			return this.source(fn.apply(new SourceConfig.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code aggregations}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aggregations</code>.
-		 */
-		public final Builder aggregations(Map<String, Aggregation> map) {
-			this.aggregations = _mapPutAll(this.aggregations, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aggregations}
-		 * <p>
-		 * Adds an entry to <code>aggregations</code>.
-		 */
-		public final Builder aggregations(String key, Aggregation value) {
-			this.aggregations = _mapPut(this.aggregations, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aggregations}
-		 * <p>
-		 * Adds an entry to <code>aggregations</code> using a builder lambda.
-		 */
-		public final Builder aggregations(String key, Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
-			return aggregations(key, fn.apply(new Aggregation.Builder()).build());
-		}
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Indicate if an error should be returned if there is a partial search failure
-		 * or timeout
-		 * <p>
-		 * API name: {@code allow_partial_search_results}
-		 */
-		public final Builder allowPartialSearchResults(@Nullable Boolean value) {
-			this.allowPartialSearchResults = value;
-			return this;
-		}
-
-		/**
-		 * Specify whether wildcard and prefix queries should be analyzed (default:
-		 * false)
-		 * <p>
-		 * API name: {@code analyze_wildcard}
-		 */
-		public final Builder analyzeWildcard(@Nullable Boolean value) {
-			this.analyzeWildcard = value;
-			return this;
-		}
-
-		/**
-		 * The analyzer to use for the query string
-		 * <p>
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * The number of shard results that should be reduced at once on the
-		 * coordinating node. This value should be used as a protection mechanism to
-		 * reduce the memory overhead per search request if the potential number of
-		 * shards in the request can be large.
-		 * <p>
-		 * API name: {@code batched_reduce_size}
-		 */
-		public final Builder batchedReduceSize(@Nullable Long value) {
-			this.batchedReduceSize = value;
-			return this;
-		}
-
-		/**
-		 * Indicates whether network round-trips should be minimized as part of
-		 * cross-cluster search requests execution
-		 * <p>
-		 * API name: {@code ccs_minimize_roundtrips}
-		 */
-		public final Builder ccsMinimizeRoundtrips(@Nullable Boolean value) {
-			this.ccsMinimizeRoundtrips = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code collapse}
-		 */
-		public final Builder collapse(@Nullable FieldCollapse value) {
-			this.collapse = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code collapse}
-		 */
-		public final Builder collapse(Function<FieldCollapse.Builder, ObjectBuilder<FieldCollapse>> fn) {
-			return this.collapse(fn.apply(new FieldCollapse.Builder()).build());
-		}
-
-		/**
-		 * The default operator for query string query (AND or OR)
-		 * <p>
-		 * API name: {@code default_operator}
-		 */
-		public final Builder defaultOperator(@Nullable Operator value) {
-			this.defaultOperator = value;
-			return this;
-		}
-
-		/**
-		 * The field to use as default where no field prefix is given in the query
-		 * string
-		 * <p>
-		 * API name: {@code df}
-		 */
-		public final Builder df(@Nullable String value) {
-			this.df = value;
-			return this;
-		}
-
-		/**
-		 * Array of wildcard (*) patterns. The request returns doc values for field
-		 * names matching these patterns in the hits.fields property of the response.
-		 * <p>
-		 * API name: {@code docvalue_fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>docvalueFields</code>.
-		 */
-		public final Builder docvalueFields(List<FieldAndFormat> list) {
-			this.docvalueFields = _listAddAll(this.docvalueFields, list);
-			return this;
-		}
-
-		/**
-		 * Array of wildcard (*) patterns. The request returns doc values for field
-		 * names matching these patterns in the hits.fields property of the response.
-		 * <p>
-		 * API name: {@code docvalue_fields}
-		 * <p>
-		 * Adds one or more values to <code>docvalueFields</code>.
-		 */
-		public final Builder docvalueFields(FieldAndFormat value, FieldAndFormat... values) {
-			this.docvalueFields = _listAdd(this.docvalueFields, value, values);
-			return this;
-		}
-
-		/**
-		 * Array of wildcard (*) patterns. The request returns doc values for field
-		 * names matching these patterns in the hits.fields property of the response.
-		 * <p>
-		 * API name: {@code docvalue_fields}
-		 * <p>
-		 * Adds a value to <code>docvalueFields</code> using a builder lambda.
-		 */
-		public final Builder docvalueFields(Function<FieldAndFormat.Builder, ObjectBuilder<FieldAndFormat>> fn) {
-			return docvalueFields(fn.apply(new FieldAndFormat.Builder()).build());
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * If true, returns detailed information about score computation as part of a
-		 * hit.
-		 * <p>
-		 * API name: {@code explain}
-		 */
-		public final Builder explain(@Nullable Boolean value) {
-			this.explain = value;
-			return this;
-		}
-
-		/**
-		 * Array of wildcard (*) patterns. The request returns values for field names
-		 * matching these patterns in the hits.fields property of the response.
-		 * <p>
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fields</code>.
-		 */
-		public final Builder fields(List<FieldAndFormat> list) {
-			this.fields = _listAddAll(this.fields, list);
-			return this;
-		}
-
-		/**
-		 * Array of wildcard (*) patterns. The request returns values for field names
-		 * matching these patterns in the hits.fields property of the response.
-		 * <p>
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds one or more values to <code>fields</code>.
-		 */
-		public final Builder fields(FieldAndFormat value, FieldAndFormat... values) {
-			this.fields = _listAdd(this.fields, value, values);
-			return this;
-		}
-
-		/**
-		 * Array of wildcard (*) patterns. The request returns values for field names
-		 * matching these patterns in the hits.fields property of the response.
-		 * <p>
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds a value to <code>fields</code> using a builder lambda.
-		 */
-		public final Builder fields(Function<FieldAndFormat.Builder, ObjectBuilder<FieldAndFormat>> fn) {
-			return fields(fn.apply(new FieldAndFormat.Builder()).build());
-		}
-
-		/**
-		 * Starting document offset. By default, you cannot page through more than
-		 * 10,000 hits using the from and size parameters. To page through more hits,
-		 * use the search_after parameter.
-		 * <p>
-		 * API name: {@code from}
-		 */
-		public final Builder from(@Nullable Integer value) {
-			this.from = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code highlight}
-		 */
-		public final Builder highlight(@Nullable Highlight value) {
-			this.highlight = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code highlight}
-		 */
-		public final Builder highlight(Function<Highlight.Builder, ObjectBuilder<Highlight>> fn) {
-			return this.highlight(fn.apply(new Highlight.Builder()).build());
-		}
-
-		/**
-		 * Whether specified concrete, expanded or aliased indices should be ignored
-		 * when throttled
-		 * <p>
-		 * API name: {@code ignore_throttled}
-		 */
-		public final Builder ignoreThrottled(@Nullable Boolean value) {
-			this.ignoreThrottled = value;
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names to search; use <code>_all</code> or
-		 * empty string to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names to search; use <code>_all</code> or
-		 * empty string to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Boosts the _score of documents from specified indices.
-		 * <p>
-		 * API name: {@code indices_boost}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indicesBoost</code>.
-		 */
-		public final Builder indicesBoost(List<Map<String, Double>> list) {
-			this.indicesBoost = _listAddAll(this.indicesBoost, list);
-			return this;
-		}
-
-		/**
-		 * Boosts the _score of documents from specified indices.
-		 * <p>
-		 * API name: {@code indices_boost}
-		 * <p>
-		 * Adds one or more values to <code>indicesBoost</code>.
-		 */
-		public final Builder indicesBoost(Map<String, Double> value, Map<String, Double>... values) {
-			this.indicesBoost = _listAdd(this.indicesBoost, value, values);
-			return this;
-		}
-
-		/**
-		 * Specify whether format-based query failures (such as providing text to a
-		 * numeric field) should be ignored
-		 * <p>
-		 * API name: {@code lenient}
-		 */
-		public final Builder lenient(@Nullable Boolean value) {
-			this.lenient = value;
-			return this;
-		}
-
-		/**
-		 * The number of concurrent shard requests per node this search executes
-		 * concurrently. This value should be used to limit the impact of the search on
-		 * the cluster in order to limit the number of concurrent shard requests
-		 * <p>
-		 * API name: {@code max_concurrent_shard_requests}
-		 */
-		public final Builder maxConcurrentShardRequests(@Nullable Long value) {
-			this.maxConcurrentShardRequests = value;
-			return this;
-		}
-
-		/**
-		 * The minimum compatible version that all shards involved in search should have
-		 * for this request to be successful
-		 * <p>
-		 * API name: {@code min_compatible_shard_node}
-		 */
-		public final Builder minCompatibleShardNode(@Nullable String value) {
-			this.minCompatibleShardNode = value;
-			return this;
-		}
-
-		/**
-		 * Minimum _score for matching documents. Documents with a lower _score are not
-		 * included in the search results.
-		 * <p>
-		 * API name: {@code min_score}
-		 */
-		public final Builder minScore(@Nullable Double value) {
-			this.minScore = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code pit}
-		 */
-		public final Builder pit(@Nullable Pit pit) {
-			this.pit = pit;
-			return this;
-		}
-
-		/**
-		 * API name: {@code post_filter}
-		 */
-		public final Builder postFilter(@Nullable Query value) {
-			this.postFilter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code post_filter}
-		 */
-		public final Builder postFilter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.postFilter(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * A threshold that enforces a pre-filter roundtrip to prefilter search shards
-		 * based on query rewriting if the number of shards the search request expands
-		 * to exceeds the threshold. This filter roundtrip can limit the number of
-		 * shards significantly if for instance a shard can not match any documents
-		 * based on its rewrite method ie. if date filters are mandatory to match but
-		 * the shard bounds and the query are disjoint.
-		 * <p>
-		 * API name: {@code pre_filter_shard_size}
-		 */
-		public final Builder preFilterShardSize(@Nullable Long value) {
-			this.preFilterShardSize = value;
-			return this;
-		}
-
-		/**
-		 * Specify the node or shard the operation should be performed on (default:
-		 * random)
-		 * <p>
-		 * API name: {@code preference}
-		 */
-		public final Builder preference(@Nullable String value) {
-			this.preference = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code profile}
-		 */
-		public final Builder profile(@Nullable Boolean value) {
-			this.profile = value;
-			return this;
-		}
-
-		/**
-		 * Query in the Lucene query string syntax
-		 * <p>
-		 * API name: {@code q}
-		 */
-		public final Builder q(@Nullable String value) {
-			this.q = value;
-			return this;
-		}
-
-		/**
-		 * Defines the search definition using the Query DSL.
-		 * <p>
-		 * API name: {@code query}
-		 */
-		public final Builder query(@Nullable Query value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * Defines the search definition using the Query DSL.
-		 * <p>
-		 * API name: {@code query}
-		 */
-		public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.query(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * Specify if request cache should be used for this request or not, defaults to
-		 * index level setting
-		 * <p>
-		 * API name: {@code request_cache}
-		 */
-		public final Builder requestCache(@Nullable Boolean value) {
-			this.requestCache = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code rescore}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>rescore</code>.
-		 */
-		public final Builder rescore(List<Rescore> list) {
-			this.rescore = _listAddAll(this.rescore, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code rescore}
-		 * <p>
-		 * Adds one or more values to <code>rescore</code>.
-		 */
-		public final Builder rescore(Rescore value, Rescore... values) {
-			this.rescore = _listAdd(this.rescore, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code rescore}
-		 * <p>
-		 * Adds a value to <code>rescore</code> using a builder lambda.
-		 */
-		public final Builder rescore(Function<Rescore.Builder, ObjectBuilder<Rescore>> fn) {
-			return rescore(fn.apply(new Rescore.Builder()).build());
-		}
-
-		/**
-		 * A comma-separated list of specific routing values
-		 * <p>
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Defines one or more runtime fields in the search request. These fields take
-		 * precedence over mapped fields with the same name.
-		 * <p>
-		 * API name: {@code runtime_mappings}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>runtimeMappings</code>.
-		 */
-		public final Builder runtimeMappings(Map<String, RuntimeField> map) {
-			this.runtimeMappings = _mapPutAll(this.runtimeMappings, map);
-			return this;
-		}
-
-		/**
-		 * Defines one or more runtime fields in the search request. These fields take
-		 * precedence over mapped fields with the same name.
-		 * <p>
-		 * API name: {@code runtime_mappings}
-		 * <p>
-		 * Adds an entry to <code>runtimeMappings</code>.
-		 */
-		public final Builder runtimeMappings(String key, RuntimeField value) {
-			this.runtimeMappings = _mapPut(this.runtimeMappings, key, value);
-			return this;
-		}
-
-		/**
-		 * Defines one or more runtime fields in the search request. These fields take
-		 * precedence over mapped fields with the same name.
-		 * <p>
-		 * API name: {@code runtime_mappings}
-		 * <p>
-		 * Adds an entry to <code>runtimeMappings</code> using a builder lambda.
-		 */
-		public final Builder runtimeMappings(String key,
-				Function<RuntimeField.Builder, ObjectBuilder<RuntimeField>> fn) {
-			return runtimeMappings(key, fn.apply(new RuntimeField.Builder()).build());
-		}
-
-		/**
-		 * Retrieve a script evaluation (based on different fields) for each hit.
-		 * <p>
-		 * API name: {@code script_fields}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>scriptFields</code>.
-		 */
-		public final Builder scriptFields(Map<String, ScriptField> map) {
-			this.scriptFields = _mapPutAll(this.scriptFields, map);
-			return this;
-		}
-
-		/**
-		 * Retrieve a script evaluation (based on different fields) for each hit.
-		 * <p>
-		 * API name: {@code script_fields}
-		 * <p>
-		 * Adds an entry to <code>scriptFields</code>.
-		 */
-		public final Builder scriptFields(String key, ScriptField value) {
-			this.scriptFields = _mapPut(this.scriptFields, key, value);
-			return this;
-		}
-
-		/**
-		 * Retrieve a script evaluation (based on different fields) for each hit.
-		 * <p>
-		 * API name: {@code script_fields}
-		 * <p>
-		 * Adds an entry to <code>scriptFields</code> using a builder lambda.
-		 */
-		public final Builder scriptFields(String key, Function<ScriptField.Builder, ObjectBuilder<ScriptField>> fn) {
-			return scriptFields(key, fn.apply(new ScriptField.Builder()).build());
-		}
-
-		/**
-		 * Specify how long a consistent view of the index should be maintained for
-		 * scrolled search
-		 * <p>
-		 * API name: {@code scroll}
-		 */
-		public final Builder scroll(@Nullable Time value) {
-			this.scroll = value;
-			return this;
-		}
-
-		/**
-		 * Specify how long a consistent view of the index should be maintained for
-		 * scrolled search
-		 * <p>
-		 * API name: {@code scroll}
-		 */
-		public final Builder scroll(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.scroll(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code search_after}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>searchAfter</code>.
-		 */
-		public final Builder searchAfter(List<String> list) {
-			this.searchAfter = _listAddAll(this.searchAfter, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code search_after}
-		 * <p>
-		 * Adds one or more values to <code>searchAfter</code>.
-		 */
-		public final Builder searchAfter(String value, String... values) {
-			this.searchAfter = _listAdd(this.searchAfter, value, values);
-			return this;
-		}
-
-		/**
-		 * Search operation type
-		 * <p>
-		 * API name: {@code search_type}
-		 */
-		public final Builder searchType(@Nullable SearchType value) {
-			this.searchType = value;
-			return this;
-		}
-
-		/**
-		 * If true, returns sequence number and primary term of the last modification of
-		 * each hit. See Optimistic concurrency control.
-		 * <p>
-		 * API name: {@code seq_no_primary_term}
-		 */
-		public final Builder seqNoPrimaryTerm(@Nullable Boolean value) {
-			this.seqNoPrimaryTerm = value;
-			return this;
-		}
-
-		/**
-		 * The number of hits to return. By default, you cannot page through more than
-		 * 10,000 hits using the from and size parameters. To page through more hits,
-		 * use the search_after parameter.
-		 * <p>
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Integer value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code slice}
-		 */
-		public final Builder slice(@Nullable SlicedScroll value) {
-			this.slice = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code slice}
-		 */
-		public final Builder slice(Function<SlicedScroll.Builder, ObjectBuilder<SlicedScroll>> fn) {
-			return this.slice(fn.apply(new SlicedScroll.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sort</code>.
-		 */
-		public final Builder sort(List<SortOptions> list) {
-			this.sort = _listAddAll(this.sort, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds one or more values to <code>sort</code>.
-		 */
-		public final Builder sort(SortOptions value, SortOptions... values) {
-			this.sort = _listAdd(this.sort, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds a value to <code>sort</code> using a builder lambda.
-		 */
-		public final Builder sort(Function<SortOptions.Builder, ObjectBuilder<SortOptions>> fn) {
-			return sort(fn.apply(new SortOptions.Builder()).build());
-		}
-
-		/**
-		 * Stats groups to associate with the search. Each group maintains a statistics
-		 * aggregation for its associated searches. You can retrieve these stats using
-		 * the indices stats API.
-		 * <p>
-		 * API name: {@code stats}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>stats</code>.
-		 */
-		public final Builder stats(List<String> list) {
-			this.stats = _listAddAll(this.stats, list);
-			return this;
-		}
-
-		/**
-		 * Stats groups to associate with the search. Each group maintains a statistics
-		 * aggregation for its associated searches. You can retrieve these stats using
-		 * the indices stats API.
-		 * <p>
-		 * API name: {@code stats}
-		 * <p>
-		 * Adds one or more values to <code>stats</code>.
-		 */
-		public final Builder stats(String value, String... values) {
-			this.stats = _listAdd(this.stats, value, values);
-			return this;
-		}
-
-		/**
-		 * List of stored fields to return as part of a hit. If no fields are specified,
-		 * no stored fields are included in the response. If this field is specified,
-		 * the _source parameter defaults to false. You can pass _source: true to return
-		 * both source fields and stored fields in the search response.
-		 * <p>
-		 * API name: {@code stored_fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>storedFields</code>.
-		 */
-		public final Builder storedFields(List<String> list) {
-			this.storedFields = _listAddAll(this.storedFields, list);
-			return this;
-		}
-
-		/**
-		 * List of stored fields to return as part of a hit. If no fields are specified,
-		 * no stored fields are included in the response. If this field is specified,
-		 * the _source parameter defaults to false. You can pass _source: true to return
-		 * both source fields and stored fields in the search response.
-		 * <p>
-		 * API name: {@code stored_fields}
-		 * <p>
-		 * Adds one or more values to <code>storedFields</code>.
-		 */
-		public final Builder storedFields(String value, String... values) {
-			this.storedFields = _listAdd(this.storedFields, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code suggest}
-		 */
-		public final Builder suggest(@Nullable Suggester value) {
-			this.suggest = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code suggest}
-		 */
-		public final Builder suggest(Function<Suggester.Builder, ObjectBuilder<Suggester>> fn) {
-			return this.suggest(fn.apply(new Suggester.Builder()).build());
-		}
-
-		/**
-		 * Maximum number of documents to collect for each shard. If a query reaches
-		 * this limit, Elasticsearch terminates the query early. Elasticsearch collects
-		 * documents before sorting. Defaults to 0, which does not terminate query
-		 * execution early.
-		 * <p>
-		 * API name: {@code terminate_after}
-		 */
-		public final Builder terminateAfter(@Nullable Long value) {
-			this.terminateAfter = value;
-			return this;
-		}
-
-		/**
-		 * Specifies the period of time to wait for a response from each shard. If no
-		 * response is received before the timeout expires, the request fails and
-		 * returns an error. Defaults to no timeout.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable String value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * If true, calculate and return document scores, even if the scores are not
-		 * used for sorting.
-		 * <p>
-		 * API name: {@code track_scores}
-		 */
-		public final Builder trackScores(@Nullable Boolean value) {
-			this.trackScores = value;
-			return this;
-		}
-
-		/**
-		 * Number of hits matching the query to count accurately. If true, the exact
-		 * number of hits is returned at the cost of some performance. If false, the
-		 * response does not include the total number of hits matching the query.
-		 * Defaults to 10,000 hits.
-		 * <p>
-		 * API name: {@code track_total_hits}
-		 */
-		public final Builder trackTotalHits(@Nullable TrackHits value) {
-			this.trackTotalHits = value;
-			return this;
-		}
-
-		/**
-		 * Number of hits matching the query to count accurately. If true, the exact
-		 * number of hits is returned at the cost of some performance. If false, the
-		 * response does not include the total number of hits matching the query.
-		 * Defaults to 10,000 hits.
-		 * <p>
-		 * API name: {@code track_total_hits}
-		 */
-		public final Builder trackTotalHits(Function<TrackHits.Builder, ObjectBuilder<TrackHits>> fn) {
-			return this.trackTotalHits(fn.apply(new TrackHits.Builder()).build());
-		}
-
-		/**
-		 * If true, returns document version as part of a hit.
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Boolean value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SearchRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SearchRequest build() {
-			_checkSingleUse();
-
-			return new SearchRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SearchRequest}
-	 */
-	public static final JsonpDeserializer<SearchRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SearchRequest::setupSearchRequestDeserializer);
-
-	protected static void setupSearchRequestDeserializer(ObjectDeserializer<SearchRequest.Builder> op) {
-
-		op.add(Builder::source, SourceConfig._DESERIALIZER, "_source");
-		op.add(Builder::aggregations, JsonpDeserializer.stringMapDeserializer(Aggregation._DESERIALIZER),
-				"aggregations", "aggs");
-		op.add(Builder::collapse, FieldCollapse._DESERIALIZER, "collapse");
-		op.add(Builder::docvalueFields, JsonpDeserializer.arrayDeserializer(FieldAndFormat._DESERIALIZER),
-				"docvalue_fields");
-		op.add(Builder::explain, JsonpDeserializer.booleanDeserializer(), "explain");
-		op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(FieldAndFormat._DESERIALIZER), "fields");
-		op.add(Builder::from, JsonpDeserializer.integerDeserializer(), "from");
-		op.add(Builder::highlight, Highlight._DESERIALIZER, "highlight");
-		op.add(Builder::indicesBoost,
-				JsonpDeserializer.arrayDeserializer(
-						JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.doubleDeserializer())),
-				"indices_boost");
-		op.add(Builder::minScore, JsonpDeserializer.doubleDeserializer(), "min_score");
-		op.add(Builder::pit, Pit._DESERIALIZER, "pit");
-		op.add(Builder::postFilter, Query._DESERIALIZER, "post_filter");
-		op.add(Builder::profile, JsonpDeserializer.booleanDeserializer(), "profile");
-		op.add(Builder::query, Query._DESERIALIZER, "query");
-		op.add(Builder::rescore, JsonpDeserializer.arrayDeserializer(Rescore._DESERIALIZER), "rescore");
-		op.add(Builder::runtimeMappings, JsonpDeserializer.stringMapDeserializer(RuntimeField._DESERIALIZER),
-				"runtime_mappings");
-		op.add(Builder::scriptFields, JsonpDeserializer.stringMapDeserializer(ScriptField._DESERIALIZER),
-				"script_fields");
-		op.add(Builder::searchAfter, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"search_after");
-		op.add(Builder::seqNoPrimaryTerm, JsonpDeserializer.booleanDeserializer(), "seq_no_primary_term");
-		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
-		op.add(Builder::slice, SlicedScroll._DESERIALIZER, "slice");
-		op.add(Builder::sort, JsonpDeserializer.arrayDeserializer(SortOptions._DESERIALIZER), "sort");
-		op.add(Builder::stats, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stats");
-		op.add(Builder::storedFields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"stored_fields");
-		op.add(Builder::suggest, Suggester._DESERIALIZER, "suggest");
-		op.add(Builder::terminateAfter, JsonpDeserializer.longDeserializer(), "terminate_after");
-		op.add(Builder::timeout, JsonpDeserializer.stringDeserializer(), "timeout");
-		op.add(Builder::trackScores, JsonpDeserializer.booleanDeserializer(), "track_scores");
-		op.add(Builder::trackTotalHits, TrackHits._DESERIALIZER, "track_total_hits");
-		op.add(Builder::version, JsonpDeserializer.booleanDeserializer(), "version");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code search}".
-	 */
-	public static final SimpleEndpoint<SearchRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_search");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_search");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				params.put("typed_keys", "true");
-				if (request.df != null) {
-					params.put("df", request.df);
-				}
-				if (request.preFilterShardSize != null) {
-					params.put("pre_filter_shard_size", String.valueOf(request.preFilterShardSize));
-				}
-				if (request.minCompatibleShardNode != null) {
-					params.put("min_compatible_shard_node", request.minCompatibleShardNode);
-				}
-				if (request.lenient != null) {
-					params.put("lenient", String.valueOf(request.lenient));
-				}
-				if (request.routing != null) {
-					params.put("routing", request.routing);
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.analyzer != null) {
-					params.put("analyzer", request.analyzer);
-				}
-				if (request.ignoreThrottled != null) {
-					params.put("ignore_throttled", String.valueOf(request.ignoreThrottled));
-				}
-				if (request.maxConcurrentShardRequests != null) {
-					params.put("max_concurrent_shard_requests", String.valueOf(request.maxConcurrentShardRequests));
-				}
-				if (request.allowPartialSearchResults != null) {
-					params.put("allow_partial_search_results", String.valueOf(request.allowPartialSearchResults));
-				}
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.preference != null) {
-					params.put("preference", request.preference);
-				}
-				if (request.analyzeWildcard != null) {
-					params.put("analyze_wildcard", String.valueOf(request.analyzeWildcard));
-				}
-				if (request.scroll != null) {
-					params.put("scroll", request.scroll._toJsonString());
-				}
-				if (request.searchType != null) {
-					params.put("search_type", request.searchType.jsonValue());
-				}
-				if (request.ccsMinimizeRoundtrips != null) {
-					params.put("ccs_minimize_roundtrips", String.valueOf(request.ccsMinimizeRoundtrips));
-				}
-				if (request.q != null) {
-					params.put("q", request.q);
-				}
-				if (request.defaultOperator != null) {
-					params.put("default_operator", request.defaultOperator.jsonValue());
-				}
-				if (request.requestCache != null) {
-					params.put("request_cache", String.valueOf(request.requestCache));
-				}
-				if (request.batchedReduceSize != null) {
-					params.put("batched_reduce_size", String.valueOf(request.batchedReduceSize));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, SearchResponse._DESERIALIZER);
-
-	/**
-	 * Create an "{@code search}" endpoint.
-	 */
-	public static <TDocument> Endpoint<SearchRequest, SearchResponse<TDocument>, ErrorResponse> createSearchEndpoint(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return _ENDPOINT
-				.withResponseDeserializer(SearchResponse.createSearchResponseDeserializer(tDocumentDeserializer));
-	}
+        @Nullable
+        private List<SortOptions> sort;
+
+        @Nullable
+        private List<String> stats;
+
+        @Nullable
+        private List<String> storedFields;
+
+        @Nullable
+        private Suggester suggest;
+
+        @Nullable
+        private Long terminateAfter;
+
+        @Nullable
+        private String timeout;
+
+        @Nullable
+        private Boolean trackScores;
+
+        @Nullable
+        private TrackHits trackTotalHits;
+
+        @Nullable
+        private Boolean version;
+
+        /**
+         * Indicates which source fields are returned for matching documents. These
+         * fields are returned in the hits._source property of the search response.
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(@Nullable SourceConfig value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * Indicates which source fields are returned for matching documents. These
+         * fields are returned in the hits._source property of the search response.
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(Function<SourceConfig.Builder, ObjectBuilder<SourceConfig>> fn) {
+            return this.source(fn.apply(new SourceConfig.Builder()).build());
+        }
+
+        /**
+         * API name: {@code aggregations}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aggregations</code>.
+         */
+        public final Builder aggregations(Map<String, Aggregation> map) {
+            this.aggregations = _mapPutAll(this.aggregations, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code aggregations}
+         * <p>
+         * Adds an entry to <code>aggregations</code>.
+         */
+        public final Builder aggregations(String key, Aggregation value) {
+            this.aggregations = _mapPut(this.aggregations, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code aggregations}
+         * <p>
+         * Adds an entry to <code>aggregations</code> using a builder lambda.
+         */
+        public final Builder aggregations(String key, Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
+            return aggregations(key, fn.apply(new Aggregation.Builder()).build());
+        }
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Indicate if an error should be returned if there is a partial search failure
+         * or timeout
+         * <p>
+         * API name: {@code allow_partial_search_results}
+         */
+        public final Builder allowPartialSearchResults(@Nullable Boolean value) {
+            this.allowPartialSearchResults = value;
+            return this;
+        }
+
+        /**
+         * Specify whether wildcard and prefix queries should be analyzed (default:
+         * false)
+         * <p>
+         * API name: {@code analyze_wildcard}
+         */
+        public final Builder analyzeWildcard(@Nullable Boolean value) {
+            this.analyzeWildcard = value;
+            return this;
+        }
+
+        /**
+         * The analyzer to use for the query string
+         * <p>
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * The number of shard results that should be reduced at once on the
+         * coordinating node. This value should be used as a protection mechanism to
+         * reduce the memory overhead per search request if the potential number of
+         * shards in the request can be large.
+         * <p>
+         * API name: {@code batched_reduce_size}
+         */
+        public final Builder batchedReduceSize(@Nullable Long value) {
+            this.batchedReduceSize = value;
+            return this;
+        }
+
+        /**
+         * Indicates whether network round-trips should be minimized as part of
+         * cross-cluster search requests execution
+         * <p>
+         * API name: {@code ccs_minimize_roundtrips}
+         */
+        public final Builder ccsMinimizeRoundtrips(@Nullable Boolean value) {
+            this.ccsMinimizeRoundtrips = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code collapse}
+         */
+        public final Builder collapse(@Nullable FieldCollapse value) {
+            this.collapse = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code collapse}
+         */
+        public final Builder collapse(Function<FieldCollapse.Builder, ObjectBuilder<FieldCollapse>> fn) {
+            return this.collapse(fn.apply(new FieldCollapse.Builder()).build());
+        }
+
+        /**
+         * The default operator for query string query (AND or OR)
+         * <p>
+         * API name: {@code default_operator}
+         */
+        public final Builder defaultOperator(@Nullable Operator value) {
+            this.defaultOperator = value;
+            return this;
+        }
+
+        /**
+         * The field to use as default where no field prefix is given in the query
+         * string
+         * <p>
+         * API name: {@code df}
+         */
+        public final Builder df(@Nullable String value) {
+            this.df = value;
+            return this;
+        }
+
+        /**
+         * Array of wildcard (*) patterns. The request returns doc values for field
+         * names matching these patterns in the hits.fields property of the response.
+         * <p>
+         * API name: {@code docvalue_fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>docvalueFields</code>.
+         */
+        public final Builder docvalueFields(List<FieldAndFormat> list) {
+            this.docvalueFields = _listAddAll(this.docvalueFields, list);
+            return this;
+        }
+
+        /**
+         * Array of wildcard (*) patterns. The request returns doc values for field
+         * names matching these patterns in the hits.fields property of the response.
+         * <p>
+         * API name: {@code docvalue_fields}
+         * <p>
+         * Adds one or more values to <code>docvalueFields</code>.
+         */
+        public final Builder docvalueFields(FieldAndFormat value, FieldAndFormat... values) {
+            this.docvalueFields = _listAdd(this.docvalueFields, value, values);
+            return this;
+        }
+
+        /**
+         * Array of wildcard (*) patterns. The request returns doc values for field
+         * names matching these patterns in the hits.fields property of the response.
+         * <p>
+         * API name: {@code docvalue_fields}
+         * <p>
+         * Adds a value to <code>docvalueFields</code> using a builder lambda.
+         */
+        public final Builder docvalueFields(Function<FieldAndFormat.Builder, ObjectBuilder<FieldAndFormat>> fn) {
+            return docvalueFields(fn.apply(new FieldAndFormat.Builder()).build());
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * If true, returns detailed information about score computation as part of a
+         * hit.
+         * <p>
+         * API name: {@code explain}
+         */
+        public final Builder explain(@Nullable Boolean value) {
+            this.explain = value;
+            return this;
+        }
+
+        /**
+         * Array of wildcard (*) patterns. The request returns values for field names
+         * matching these patterns in the hits.fields property of the response.
+         * <p>
+         * API name: {@code fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fields</code>.
+         */
+        public final Builder fields(List<FieldAndFormat> list) {
+            this.fields = _listAddAll(this.fields, list);
+            return this;
+        }
+
+        /**
+         * Array of wildcard (*) patterns. The request returns values for field names
+         * matching these patterns in the hits.fields property of the response.
+         * <p>
+         * API name: {@code fields}
+         * <p>
+         * Adds one or more values to <code>fields</code>.
+         */
+        public final Builder fields(FieldAndFormat value, FieldAndFormat... values) {
+            this.fields = _listAdd(this.fields, value, values);
+            return this;
+        }
+
+        /**
+         * Array of wildcard (*) patterns. The request returns values for field names
+         * matching these patterns in the hits.fields property of the response.
+         * <p>
+         * API name: {@code fields}
+         * <p>
+         * Adds a value to <code>fields</code> using a builder lambda.
+         */
+        public final Builder fields(Function<FieldAndFormat.Builder, ObjectBuilder<FieldAndFormat>> fn) {
+            return fields(fn.apply(new FieldAndFormat.Builder()).build());
+        }
+
+        /**
+         * Starting document offset. By default, you cannot page through more than
+         * 10,000 hits using the from and size parameters. To page through more hits,
+         * use the search_after parameter.
+         * <p>
+         * API name: {@code from}
+         */
+        public final Builder from(@Nullable Integer value) {
+            this.from = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code highlight}
+         */
+        public final Builder highlight(@Nullable Highlight value) {
+            this.highlight = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code highlight}
+         */
+        public final Builder highlight(Function<Highlight.Builder, ObjectBuilder<Highlight>> fn) {
+            return this.highlight(fn.apply(new Highlight.Builder()).build());
+        }
+
+        /**
+         * Whether specified concrete, expanded or aliased indices should be ignored
+         * when throttled
+         * <p>
+         * API name: {@code ignore_throttled}
+         */
+        public final Builder ignoreThrottled(@Nullable Boolean value) {
+            this.ignoreThrottled = value;
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names to search; use <code>_all</code> or
+         * empty string to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names to search; use <code>_all</code> or
+         * empty string to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Boosts the _score of documents from specified indices.
+         * <p>
+         * API name: {@code indices_boost}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indicesBoost</code>.
+         */
+        public final Builder indicesBoost(List<Map<String, Double>> list) {
+            this.indicesBoost = _listAddAll(this.indicesBoost, list);
+            return this;
+        }
+
+        /**
+         * Boosts the _score of documents from specified indices.
+         * <p>
+         * API name: {@code indices_boost}
+         * <p>
+         * Adds one or more values to <code>indicesBoost</code>.
+         */
+        public final Builder indicesBoost(Map<String, Double> value, Map<String, Double>... values) {
+            this.indicesBoost = _listAdd(this.indicesBoost, value, values);
+            return this;
+        }
+
+        /**
+         * Specify whether format-based query failures (such as providing text to a
+         * numeric field) should be ignored
+         * <p>
+         * API name: {@code lenient}
+         */
+        public final Builder lenient(@Nullable Boolean value) {
+            this.lenient = value;
+            return this;
+        }
+
+        /**
+         * The number of concurrent shard requests per node this search executes
+         * concurrently. This value should be used to limit the impact of the search on
+         * the cluster in order to limit the number of concurrent shard requests
+         * <p>
+         * API name: {@code max_concurrent_shard_requests}
+         */
+        public final Builder maxConcurrentShardRequests(@Nullable Long value) {
+            this.maxConcurrentShardRequests = value;
+            return this;
+        }
+
+        /**
+         * The minimum compatible version that all shards involved in search should have
+         * for this request to be successful
+         * <p>
+         * API name: {@code min_compatible_shard_node}
+         */
+        public final Builder minCompatibleShardNode(@Nullable String value) {
+            this.minCompatibleShardNode = value;
+            return this;
+        }
+
+        /**
+         * Minimum _score for matching documents. Documents with a lower _score are not
+         * included in the search results.
+         * <p>
+         * API name: {@code min_score}
+         */
+        public final Builder minScore(@Nullable Double value) {
+            this.minScore = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code pit}
+         */
+        public final Builder pit(@Nullable Pit pit) {
+            this.pit = pit;
+            return this;
+        }
+
+        /**
+         * API name: {@code post_filter}
+         */
+        public final Builder postFilter(@Nullable Query value) {
+            this.postFilter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code post_filter}
+         */
+        public final Builder postFilter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.postFilter(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * A threshold that enforces a pre-filter roundtrip to prefilter search shards
+         * based on query rewriting if the number of shards the search request expands
+         * to exceeds the threshold. This filter roundtrip can limit the number of
+         * shards significantly if for instance a shard can not match any documents
+         * based on its rewrite method ie. if date filters are mandatory to match but
+         * the shard bounds and the query are disjoint.
+         * <p>
+         * API name: {@code pre_filter_shard_size}
+         */
+        public final Builder preFilterShardSize(@Nullable Long value) {
+            this.preFilterShardSize = value;
+            return this;
+        }
+
+        /**
+         * Specify the node or shard the operation should be performed on (default:
+         * random)
+         * <p>
+         * API name: {@code preference}
+         */
+        public final Builder preference(@Nullable String value) {
+            this.preference = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code profile}
+         */
+        public final Builder profile(@Nullable Boolean value) {
+            this.profile = value;
+            return this;
+        }
+
+        /**
+         * Query in the Lucene query string syntax
+         * <p>
+         * API name: {@code q}
+         */
+        public final Builder q(@Nullable String value) {
+            this.q = value;
+            return this;
+        }
+
+        /**
+         * Defines the search definition using the Query DSL.
+         * <p>
+         * API name: {@code query}
+         */
+        public final Builder query(@Nullable Query value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * Defines the search definition using the Query DSL.
+         * <p>
+         * API name: {@code query}
+         */
+        public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.query(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * Specify if request cache should be used for this request or not, defaults to
+         * index level setting
+         * <p>
+         * API name: {@code request_cache}
+         */
+        public final Builder requestCache(@Nullable Boolean value) {
+            this.requestCache = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code rescore}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>rescore</code>.
+         */
+        public final Builder rescore(List<Rescore> list) {
+            this.rescore = _listAddAll(this.rescore, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code rescore}
+         * <p>
+         * Adds one or more values to <code>rescore</code>.
+         */
+        public final Builder rescore(Rescore value, Rescore... values) {
+            this.rescore = _listAdd(this.rescore, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code rescore}
+         * <p>
+         * Adds a value to <code>rescore</code> using a builder lambda.
+         */
+        public final Builder rescore(Function<Rescore.Builder, ObjectBuilder<Rescore>> fn) {
+            return rescore(fn.apply(new Rescore.Builder()).build());
+        }
+
+        /**
+         * A comma-separated list of specific routing values
+         * <p>
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Defines one or more runtime fields in the search request. These fields take
+         * precedence over mapped fields with the same name.
+         * <p>
+         * API name: {@code runtime_mappings}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>runtimeMappings</code>.
+         */
+        public final Builder runtimeMappings(Map<String, RuntimeField> map) {
+            this.runtimeMappings = _mapPutAll(this.runtimeMappings, map);
+            return this;
+        }
+
+        /**
+         * Defines one or more runtime fields in the search request. These fields take
+         * precedence over mapped fields with the same name.
+         * <p>
+         * API name: {@code runtime_mappings}
+         * <p>
+         * Adds an entry to <code>runtimeMappings</code>.
+         */
+        public final Builder runtimeMappings(String key, RuntimeField value) {
+            this.runtimeMappings = _mapPut(this.runtimeMappings, key, value);
+            return this;
+        }
+
+        /**
+         * Defines one or more runtime fields in the search request. These fields take
+         * precedence over mapped fields with the same name.
+         * <p>
+         * API name: {@code runtime_mappings}
+         * <p>
+         * Adds an entry to <code>runtimeMappings</code> using a builder lambda.
+         */
+        public final Builder runtimeMappings(String key, Function<RuntimeField.Builder, ObjectBuilder<RuntimeField>> fn) {
+            return runtimeMappings(key, fn.apply(new RuntimeField.Builder()).build());
+        }
+
+        /**
+         * Retrieve a script evaluation (based on different fields) for each hit.
+         * <p>
+         * API name: {@code script_fields}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>scriptFields</code>.
+         */
+        public final Builder scriptFields(Map<String, ScriptField> map) {
+            this.scriptFields = _mapPutAll(this.scriptFields, map);
+            return this;
+        }
+
+        /**
+         * Retrieve a script evaluation (based on different fields) for each hit.
+         * <p>
+         * API name: {@code script_fields}
+         * <p>
+         * Adds an entry to <code>scriptFields</code>.
+         */
+        public final Builder scriptFields(String key, ScriptField value) {
+            this.scriptFields = _mapPut(this.scriptFields, key, value);
+            return this;
+        }
+
+        /**
+         * Retrieve a script evaluation (based on different fields) for each hit.
+         * <p>
+         * API name: {@code script_fields}
+         * <p>
+         * Adds an entry to <code>scriptFields</code> using a builder lambda.
+         */
+        public final Builder scriptFields(String key, Function<ScriptField.Builder, ObjectBuilder<ScriptField>> fn) {
+            return scriptFields(key, fn.apply(new ScriptField.Builder()).build());
+        }
+
+        /**
+         * Specify how long a consistent view of the index should be maintained for
+         * scrolled search
+         * <p>
+         * API name: {@code scroll}
+         */
+        public final Builder scroll(@Nullable Time value) {
+            this.scroll = value;
+            return this;
+        }
+
+        /**
+         * Specify how long a consistent view of the index should be maintained for
+         * scrolled search
+         * <p>
+         * API name: {@code scroll}
+         */
+        public final Builder scroll(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.scroll(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code search_after}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>searchAfter</code>.
+         */
+        public final Builder searchAfter(List<String> list) {
+            this.searchAfter = _listAddAll(this.searchAfter, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code search_after}
+         * <p>
+         * Adds one or more values to <code>searchAfter</code>.
+         */
+        public final Builder searchAfter(String value, String... values) {
+            this.searchAfter = _listAdd(this.searchAfter, value, values);
+            return this;
+        }
+
+        /**
+         * Search operation type
+         * <p>
+         * API name: {@code search_type}
+         */
+        public final Builder searchType(@Nullable SearchType value) {
+            this.searchType = value;
+            return this;
+        }
+
+        /**
+         * If true, returns sequence number and primary term of the last modification of
+         * each hit. See Optimistic concurrency control.
+         * <p>
+         * API name: {@code seq_no_primary_term}
+         */
+        public final Builder seqNoPrimaryTerm(@Nullable Boolean value) {
+            this.seqNoPrimaryTerm = value;
+            return this;
+        }
+
+        /**
+         * The number of hits to return. By default, you cannot page through more than
+         * 10,000 hits using the from and size parameters. To page through more hits,
+         * use the search_after parameter.
+         * <p>
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Integer value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code slice}
+         */
+        public final Builder slice(@Nullable SlicedScroll value) {
+            this.slice = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code slice}
+         */
+        public final Builder slice(Function<SlicedScroll.Builder, ObjectBuilder<SlicedScroll>> fn) {
+            return this.slice(fn.apply(new SlicedScroll.Builder()).build());
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sort</code>.
+         */
+        public final Builder sort(List<SortOptions> list) {
+            this.sort = _listAddAll(this.sort, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds one or more values to <code>sort</code>.
+         */
+        public final Builder sort(SortOptions value, SortOptions... values) {
+            this.sort = _listAdd(this.sort, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds a value to <code>sort</code> using a builder lambda.
+         */
+        public final Builder sort(Function<SortOptions.Builder, ObjectBuilder<SortOptions>> fn) {
+            return sort(fn.apply(new SortOptions.Builder()).build());
+        }
+
+        /**
+         * Stats groups to associate with the search. Each group maintains a statistics
+         * aggregation for its associated searches. You can retrieve these stats using
+         * the indices stats API.
+         * <p>
+         * API name: {@code stats}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>stats</code>.
+         */
+        public final Builder stats(List<String> list) {
+            this.stats = _listAddAll(this.stats, list);
+            return this;
+        }
+
+        /**
+         * Stats groups to associate with the search. Each group maintains a statistics
+         * aggregation for its associated searches. You can retrieve these stats using
+         * the indices stats API.
+         * <p>
+         * API name: {@code stats}
+         * <p>
+         * Adds one or more values to <code>stats</code>.
+         */
+        public final Builder stats(String value, String... values) {
+            this.stats = _listAdd(this.stats, value, values);
+            return this;
+        }
+
+        /**
+         * List of stored fields to return as part of a hit. If no fields are specified,
+         * no stored fields are included in the response. If this field is specified,
+         * the _source parameter defaults to false. You can pass _source: true to return
+         * both source fields and stored fields in the search response.
+         * <p>
+         * API name: {@code stored_fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>storedFields</code>.
+         */
+        public final Builder storedFields(List<String> list) {
+            this.storedFields = _listAddAll(this.storedFields, list);
+            return this;
+        }
+
+        /**
+         * List of stored fields to return as part of a hit. If no fields are specified,
+         * no stored fields are included in the response. If this field is specified,
+         * the _source parameter defaults to false. You can pass _source: true to return
+         * both source fields and stored fields in the search response.
+         * <p>
+         * API name: {@code stored_fields}
+         * <p>
+         * Adds one or more values to <code>storedFields</code>.
+         */
+        public final Builder storedFields(String value, String... values) {
+            this.storedFields = _listAdd(this.storedFields, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code suggest}
+         */
+        public final Builder suggest(@Nullable Suggester value) {
+            this.suggest = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code suggest}
+         */
+        public final Builder suggest(Function<Suggester.Builder, ObjectBuilder<Suggester>> fn) {
+            return this.suggest(fn.apply(new Suggester.Builder()).build());
+        }
+
+        /**
+         * Maximum number of documents to collect for each shard. If a query reaches
+         * this limit, Elasticsearch terminates the query early. Elasticsearch collects
+         * documents before sorting. Defaults to 0, which does not terminate query
+         * execution early.
+         * <p>
+         * API name: {@code terminate_after}
+         */
+        public final Builder terminateAfter(@Nullable Long value) {
+            this.terminateAfter = value;
+            return this;
+        }
+
+        /**
+         * Specifies the period of time to wait for a response from each shard. If no
+         * response is received before the timeout expires, the request fails and
+         * returns an error. Defaults to no timeout.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable String value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * If true, calculate and return document scores, even if the scores are not
+         * used for sorting.
+         * <p>
+         * API name: {@code track_scores}
+         */
+        public final Builder trackScores(@Nullable Boolean value) {
+            this.trackScores = value;
+            return this;
+        }
+
+        /**
+         * Number of hits matching the query to count accurately. If true, the exact
+         * number of hits is returned at the cost of some performance. If false, the
+         * response does not include the total number of hits matching the query.
+         * Defaults to 10,000 hits.
+         * <p>
+         * API name: {@code track_total_hits}
+         */
+        public final Builder trackTotalHits(@Nullable TrackHits value) {
+            this.trackTotalHits = value;
+            return this;
+        }
+
+        /**
+         * Number of hits matching the query to count accurately. If true, the exact
+         * number of hits is returned at the cost of some performance. If false, the
+         * response does not include the total number of hits matching the query.
+         * Defaults to 10,000 hits.
+         * <p>
+         * API name: {@code track_total_hits}
+         */
+        public final Builder trackTotalHits(Function<TrackHits.Builder, ObjectBuilder<TrackHits>> fn) {
+            return this.trackTotalHits(fn.apply(new TrackHits.Builder()).build());
+        }
+
+        /**
+         * If true, returns document version as part of a hit.
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Boolean value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link SearchRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SearchRequest build() {
+            _checkSingleUse();
+
+            return new SearchRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SearchRequest}
+     */
+    public static final JsonpDeserializer<SearchRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SearchRequest::setupSearchRequestDeserializer
+    );
+
+    protected static void setupSearchRequestDeserializer(ObjectDeserializer<SearchRequest.Builder> op) {
+
+        op.add(Builder::source, SourceConfig._DESERIALIZER, "_source");
+        op.add(Builder::aggregations, JsonpDeserializer.stringMapDeserializer(Aggregation._DESERIALIZER), "aggregations", "aggs");
+        op.add(Builder::collapse, FieldCollapse._DESERIALIZER, "collapse");
+        op.add(Builder::docvalueFields, JsonpDeserializer.arrayDeserializer(FieldAndFormat._DESERIALIZER), "docvalue_fields");
+        op.add(Builder::explain, JsonpDeserializer.booleanDeserializer(), "explain");
+        op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(FieldAndFormat._DESERIALIZER), "fields");
+        op.add(Builder::from, JsonpDeserializer.integerDeserializer(), "from");
+        op.add(Builder::highlight, Highlight._DESERIALIZER, "highlight");
+        op.add(
+            Builder::indicesBoost,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.doubleDeserializer())),
+            "indices_boost"
+        );
+        op.add(Builder::minScore, JsonpDeserializer.doubleDeserializer(), "min_score");
+        op.add(Builder::pit, Pit._DESERIALIZER, "pit");
+        op.add(Builder::postFilter, Query._DESERIALIZER, "post_filter");
+        op.add(Builder::profile, JsonpDeserializer.booleanDeserializer(), "profile");
+        op.add(Builder::query, Query._DESERIALIZER, "query");
+        op.add(Builder::rescore, JsonpDeserializer.arrayDeserializer(Rescore._DESERIALIZER), "rescore");
+        op.add(Builder::runtimeMappings, JsonpDeserializer.stringMapDeserializer(RuntimeField._DESERIALIZER), "runtime_mappings");
+        op.add(Builder::scriptFields, JsonpDeserializer.stringMapDeserializer(ScriptField._DESERIALIZER), "script_fields");
+        op.add(Builder::searchAfter, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "search_after");
+        op.add(Builder::seqNoPrimaryTerm, JsonpDeserializer.booleanDeserializer(), "seq_no_primary_term");
+        op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
+        op.add(Builder::slice, SlicedScroll._DESERIALIZER, "slice");
+        op.add(Builder::sort, JsonpDeserializer.arrayDeserializer(SortOptions._DESERIALIZER), "sort");
+        op.add(Builder::stats, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stats");
+        op.add(Builder::storedFields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stored_fields");
+        op.add(Builder::suggest, Suggester._DESERIALIZER, "suggest");
+        op.add(Builder::terminateAfter, JsonpDeserializer.longDeserializer(), "terminate_after");
+        op.add(Builder::timeout, JsonpDeserializer.stringDeserializer(), "timeout");
+        op.add(Builder::trackScores, JsonpDeserializer.booleanDeserializer(), "track_scores");
+        op.add(Builder::trackTotalHits, TrackHits._DESERIALIZER, "track_total_hits");
+        op.add(Builder::version, JsonpDeserializer.booleanDeserializer(), "version");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code search}".
+     */
+    public static final SimpleEndpoint<SearchRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_search");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_search");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            params.put("typed_keys", "true");
+            if (request.df != null) {
+                params.put("df", request.df);
+            }
+            if (request.preFilterShardSize != null) {
+                params.put("pre_filter_shard_size", String.valueOf(request.preFilterShardSize));
+            }
+            if (request.minCompatibleShardNode != null) {
+                params.put("min_compatible_shard_node", request.minCompatibleShardNode);
+            }
+            if (request.lenient != null) {
+                params.put("lenient", String.valueOf(request.lenient));
+            }
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.analyzer != null) {
+                params.put("analyzer", request.analyzer);
+            }
+            if (request.ignoreThrottled != null) {
+                params.put("ignore_throttled", String.valueOf(request.ignoreThrottled));
+            }
+            if (request.maxConcurrentShardRequests != null) {
+                params.put("max_concurrent_shard_requests", String.valueOf(request.maxConcurrentShardRequests));
+            }
+            if (request.allowPartialSearchResults != null) {
+                params.put("allow_partial_search_results", String.valueOf(request.allowPartialSearchResults));
+            }
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.preference != null) {
+                params.put("preference", request.preference);
+            }
+            if (request.analyzeWildcard != null) {
+                params.put("analyze_wildcard", String.valueOf(request.analyzeWildcard));
+            }
+            if (request.scroll != null) {
+                params.put("scroll", request.scroll._toJsonString());
+            }
+            if (request.searchType != null) {
+                params.put("search_type", request.searchType.jsonValue());
+            }
+            if (request.ccsMinimizeRoundtrips != null) {
+                params.put("ccs_minimize_roundtrips", String.valueOf(request.ccsMinimizeRoundtrips));
+            }
+            if (request.q != null) {
+                params.put("q", request.q);
+            }
+            if (request.defaultOperator != null) {
+                params.put("default_operator", request.defaultOperator.jsonValue());
+            }
+            if (request.requestCache != null) {
+                params.put("request_cache", String.valueOf(request.requestCache));
+            }
+            if (request.batchedReduceSize != null) {
+                params.put("batched_reduce_size", String.valueOf(request.batchedReduceSize));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        SearchResponse._DESERIALIZER
+    );
+
+    /**
+     * Create an "{@code search}" endpoint.
+     */
+    public static <TDocument> Endpoint<SearchRequest, SearchResponse<TDocument>, ErrorResponse> createSearchEndpoint(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return _ENDPOINT.withResponseDeserializer(SearchResponse.createSearchResponseDeserializer(tDocumentDeserializer));
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchResponse.java
index e7157c92c9..daa622cdbc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchResponse.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.function.Function;
+import java.util.function.Supplier;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.NamedDeserializer;
@@ -40,73 +42,77 @@
 import org.opensearch.client.opensearch.core.search.SearchResult;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-import java.util.function.Supplier;
-
 // typedef: _global.search.Response
 
 @JsonpDeserializable
 public class SearchResponse<TDocument> extends SearchResult<TDocument> {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected SearchResponse(SearchResult.AbstractBuilder<TDocument, ?> builder) {
-		super(builder);
+    protected SearchResponse(SearchResult.AbstractBuilder<TDocument, ?> builder) {
+        super(builder);
 
-	}
+    }
 
     public static <TDocument> SearchResponse<TDocument> searchResponseOf(
-            Function<Builder<TDocument>, ObjectBuilder<SearchResponse<TDocument>>> fn) {
+        Function<Builder<TDocument>, ObjectBuilder<SearchResponse<TDocument>>> fn
+    ) {
         return fn.apply(new Builder<>()).build();
     }
 
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SearchResponse}.
-	 */
-	public static class Builder<TDocument> extends SearchResult.AbstractBuilder<TDocument, Builder<TDocument>>
-			implements
-				ObjectBuilder<SearchResponse<TDocument>> {
-		@Override
-		protected Builder<TDocument> self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SearchResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SearchResponse<TDocument> build() {
-			_checkSingleUse();
-
-			return new SearchResponse<TDocument>(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Create a JSON deserializer for SearchResponse
-	 */
-	public static <TDocument> JsonpDeserializer<SearchResponse<TDocument>> createSearchResponseDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return ObjectBuilderDeserializer.createForObject((Supplier<Builder<TDocument>>) Builder::new,
-				op -> SearchResponse.setupSearchResponseDeserializer(op, tDocumentDeserializer));
-	};
-
-	/**
-	 * Json deserializer for {@link SearchResponse} based on named deserializers
-	 * provided by the calling {@code JsonMapper}.
-	 */
-	public static final JsonpDeserializer<SearchResponse<Object>> _DESERIALIZER = createSearchResponseDeserializer(
-			new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.search.TDocument"));
-
-	protected static <TDocument, BuilderT extends SearchResult.AbstractBuilder<TDocument, BuilderT>> void setupSearchResponseDeserializer(
-			ObjectDeserializer<BuilderT> op, JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		SearchResult.setupSearchResultDeserializer(op, tDocumentDeserializer);
-
-	}
-	
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SearchResponse}.
+     */
+    public static class Builder<TDocument> extends SearchResult.AbstractBuilder<TDocument, Builder<TDocument>>
+        implements
+            ObjectBuilder<SearchResponse<TDocument>> {
+        @Override
+        protected Builder<TDocument> self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SearchResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SearchResponse<TDocument> build() {
+            _checkSingleUse();
+
+            return new SearchResponse<TDocument>(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Create a JSON deserializer for SearchResponse
+     */
+    public static <TDocument> JsonpDeserializer<SearchResponse<TDocument>> createSearchResponseDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<TDocument>>) Builder::new,
+            op -> SearchResponse.setupSearchResponseDeserializer(op, tDocumentDeserializer)
+        );
+    };
+
+    /**
+     * Json deserializer for {@link SearchResponse} based on named deserializers
+     * provided by the calling {@code JsonMapper}.
+     */
+    public static final JsonpDeserializer<SearchResponse<Object>> _DESERIALIZER = createSearchResponseDeserializer(
+        new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.search.TDocument")
+    );
+
+    protected static <TDocument, BuilderT extends SearchResult.AbstractBuilder<TDocument, BuilderT>> void setupSearchResponseDeserializer(
+        ObjectDeserializer<BuilderT> op,
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        SearchResult.setupSearchResultDeserializer(op, tDocumentDeserializer);
+
+    }
+
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchShardsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchShardsRequest.java
index b4648b87ac..d04c118c50 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchShardsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchShardsRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -41,344 +47,338 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: _global.search_shards.Request
 
 /**
  * Returns information about the indices and shards that a search request would
  * be executed against.
- * 
+ *
  */
 
 public class SearchShardsRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Boolean local;
-
-	@Nullable
-	private final String preference;
-
-	@Nullable
-	private final String routing;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SearchShardsRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.local = builder.local;
-		this.preference = builder.preference;
-		this.routing = builder.routing;
-
-	}
-
-	public static SearchShardsRequest of(Function<Builder, ObjectBuilder<SearchShardsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * A comma-separated list of index names to search; use <code>_all</code> or
-	 * empty string to perform the operation on all indices
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Return local information, do not retrieve the state from cluster-manager node
-	 * (default: false)
-	 * <p>
-	 * API name: {@code local}
-	 */
-	@Nullable
-	public final Boolean local() {
-		return this.local;
-	}
-
-	/**
-	 * Specify the node or shard the operation should be performed on (default:
-	 * random)
-	 * <p>
-	 * API name: {@code preference}
-	 */
-	@Nullable
-	public final String preference() {
-		return this.preference;
-	}
-
-	/**
-	 * Specific routing value
-	 * <p>
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SearchShardsRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SearchShardsRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private Boolean local;
-
-		@Nullable
-		private String preference;
-
-		@Nullable
-		private String routing;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names to search; use <code>_all</code> or
-		 * empty string to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names to search; use <code>_all</code> or
-		 * empty string to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Return local information, do not retrieve the state from cluster-manager node
-		 * (default: false)
-		 * <p>
-		 * API name: {@code local}
-		 */
-		public final Builder local(@Nullable Boolean value) {
-			this.local = value;
-			return this;
-		}
-
-		/**
-		 * Specify the node or shard the operation should be performed on (default:
-		 * random)
-		 * <p>
-		 * API name: {@code preference}
-		 */
-		public final Builder preference(@Nullable String value) {
-			this.preference = value;
-			return this;
-		}
-
-		/**
-		 * Specific routing value
-		 * <p>
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SearchShardsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SearchShardsRequest build() {
-			_checkSingleUse();
-
-			return new SearchShardsRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code search_shards}".
-	 */
-	public static final Endpoint<SearchShardsRequest, SearchShardsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_search_shards");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_search_shards");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.routing != null) {
-					params.put("routing", request.routing);
-				}
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.preference != null) {
-					params.put("preference", request.preference);
-				}
-				if (request.local != null) {
-					params.put("local", String.valueOf(request.local));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, SearchShardsResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Boolean local;
+
+    @Nullable
+    private final String preference;
+
+    @Nullable
+    private final String routing;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SearchShardsRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.local = builder.local;
+        this.preference = builder.preference;
+        this.routing = builder.routing;
+
+    }
+
+    public static SearchShardsRequest of(Function<Builder, ObjectBuilder<SearchShardsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * A comma-separated list of index names to search; use <code>_all</code> or
+     * empty string to perform the operation on all indices
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Return local information, do not retrieve the state from cluster-manager node
+     * (default: false)
+     * <p>
+     * API name: {@code local}
+     */
+    @Nullable
+    public final Boolean local() {
+        return this.local;
+    }
+
+    /**
+     * Specify the node or shard the operation should be performed on (default:
+     * random)
+     * <p>
+     * API name: {@code preference}
+     */
+    @Nullable
+    public final String preference() {
+        return this.preference;
+    }
+
+    /**
+     * Specific routing value
+     * <p>
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SearchShardsRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SearchShardsRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private Boolean local;
+
+        @Nullable
+        private String preference;
+
+        @Nullable
+        private String routing;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names to search; use <code>_all</code> or
+         * empty string to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names to search; use <code>_all</code> or
+         * empty string to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Return local information, do not retrieve the state from cluster-manager node
+         * (default: false)
+         * <p>
+         * API name: {@code local}
+         */
+        public final Builder local(@Nullable Boolean value) {
+            this.local = value;
+            return this;
+        }
+
+        /**
+         * Specify the node or shard the operation should be performed on (default:
+         * random)
+         * <p>
+         * API name: {@code preference}
+         */
+        public final Builder preference(@Nullable String value) {
+            this.preference = value;
+            return this;
+        }
+
+        /**
+         * Specific routing value
+         * <p>
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link SearchShardsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SearchShardsRequest build() {
+            _checkSingleUse();
+
+            return new SearchShardsRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code search_shards}".
+     */
+    public static final Endpoint<SearchShardsRequest, SearchShardsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_search_shards");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_search_shards");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.preference != null) {
+                params.put("preference", request.preference);
+            }
+            if (request.local != null) {
+                params.put("local", String.valueOf(request.local));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        SearchShardsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchShardsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchShardsResponse.java
index 1c15d06368..f72a9f5785 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchShardsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchShardsResponse.java
@@ -32,242 +32,245 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.NodeAttributes;
-import org.opensearch.client.opensearch._types.NodeShard;
-import org.opensearch.client.opensearch.core.search_shards.ShardStoreIndex;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.NodeAttributes;
+import org.opensearch.client.opensearch._types.NodeShard;
+import org.opensearch.client.opensearch.core.search_shards.ShardStoreIndex;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _global.search_shards.Response
 
 @JsonpDeserializable
 public class SearchShardsResponse implements JsonpSerializable {
-	private final Map<String, NodeAttributes> nodes;
-
-	private final List<List<NodeShard>> shards;
-
-	private final Map<String, ShardStoreIndex> indices;
+    private final Map<String, NodeAttributes> nodes;
+
+    private final List<List<NodeShard>> shards;
+
+    private final Map<String, ShardStoreIndex> indices;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private SearchShardsResponse(Builder builder) {
+    private SearchShardsResponse(Builder builder) {
 
-		this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
-		this.shards = ApiTypeHelper.unmodifiableRequired(builder.shards, this, "shards");
-		this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
-
-	}
-
-	public static SearchShardsResponse of(Function<Builder, ObjectBuilder<SearchShardsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code nodes}
-	 */
-	public final Map<String, NodeAttributes> nodes() {
-		return this.nodes;
-	}
-
-	/**
-	 * Required - API name: {@code shards}
-	 */
-	public final List<List<NodeShard>> shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Required - API name: {@code indices}
-	 */
-	public final Map<String, ShardStoreIndex> indices() {
-		return this.indices;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.nodes)) {
-			generator.writeKey("nodes");
-			generator.writeStartObject();
-			for (Map.Entry<String, NodeAttributes> item0 : this.nodes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.shards)) {
-			generator.writeKey("shards");
-			generator.writeStartArray();
-			for (List<NodeShard> item0 : this.shards) {
-				generator.writeStartArray();
-				if (item0 != null) {
-					for (NodeShard item1 : item0) {
-						item1.serialize(generator, mapper);
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartObject();
-			for (Map.Entry<String, ShardStoreIndex> item0 : this.indices.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SearchShardsResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SearchShardsResponse> {
-		private Map<String, NodeAttributes> nodes;
-
-		private List<List<NodeShard>> shards;
-
-		private Map<String, ShardStoreIndex> indices;
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>nodes</code>.
-		 */
-		public final Builder nodes(Map<String, NodeAttributes> map) {
-			this.nodes = _mapPutAll(this.nodes, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code>.
-		 */
-		public final Builder nodes(String key, NodeAttributes value) {
-			this.nodes = _mapPut(this.nodes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code> using a builder lambda.
-		 */
-		public final Builder nodes(String key, Function<NodeAttributes.Builder, ObjectBuilder<NodeAttributes>> fn) {
-			return nodes(key, fn.apply(new NodeAttributes.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code shards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>shards</code>.
-		 */
-		public final Builder shards(List<List<NodeShard>> list) {
-			this.shards = _listAddAll(this.shards, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards}
-		 * <p>
-		 * Adds one or more values to <code>shards</code>.
-		 */
-		public final Builder shards(List<NodeShard> value, List<NodeShard>... values) {
-			this.shards = _listAdd(this.shards, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>indices</code>.
-		 */
-		public final Builder indices(Map<String, ShardStoreIndex> map) {
-			this.indices = _mapPutAll(this.indices, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds an entry to <code>indices</code>.
-		 */
-		public final Builder indices(String key, ShardStoreIndex value) {
-			this.indices = _mapPut(this.indices, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds an entry to <code>indices</code> using a builder lambda.
-		 */
-		public final Builder indices(String key, Function<ShardStoreIndex.Builder, ObjectBuilder<ShardStoreIndex>> fn) {
-			return indices(key, fn.apply(new ShardStoreIndex.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link SearchShardsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SearchShardsResponse build() {
-			_checkSingleUse();
-
-			return new SearchShardsResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SearchShardsResponse}
-	 */
-	public static final JsonpDeserializer<SearchShardsResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SearchShardsResponse::setupSearchShardsResponseDeserializer);
-
-	protected static void setupSearchShardsResponseDeserializer(ObjectDeserializer<SearchShardsResponse.Builder> op) {
-
-		op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(NodeAttributes._DESERIALIZER), "nodes");
-		op.add(Builder::shards,
-				JsonpDeserializer.arrayDeserializer(JsonpDeserializer.arrayDeserializer(NodeShard._DESERIALIZER)),
-				"shards");
-		op.add(Builder::indices, JsonpDeserializer.stringMapDeserializer(ShardStoreIndex._DESERIALIZER), "indices");
-
-	}
+        this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
+        this.shards = ApiTypeHelper.unmodifiableRequired(builder.shards, this, "shards");
+        this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
+
+    }
+
+    public static SearchShardsResponse of(Function<Builder, ObjectBuilder<SearchShardsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code nodes}
+     */
+    public final Map<String, NodeAttributes> nodes() {
+        return this.nodes;
+    }
+
+    /**
+     * Required - API name: {@code shards}
+     */
+    public final List<List<NodeShard>> shards() {
+        return this.shards;
+    }
+
+    /**
+     * Required - API name: {@code indices}
+     */
+    public final Map<String, ShardStoreIndex> indices() {
+        return this.indices;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.nodes)) {
+            generator.writeKey("nodes");
+            generator.writeStartObject();
+            for (Map.Entry<String, NodeAttributes> item0 : this.nodes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.shards)) {
+            generator.writeKey("shards");
+            generator.writeStartArray();
+            for (List<NodeShard> item0 : this.shards) {
+                generator.writeStartArray();
+                if (item0 != null) {
+                    for (NodeShard item1 : item0) {
+                        item1.serialize(generator, mapper);
+
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartObject();
+            for (Map.Entry<String, ShardStoreIndex> item0 : this.indices.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SearchShardsResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SearchShardsResponse> {
+        private Map<String, NodeAttributes> nodes;
+
+        private List<List<NodeShard>> shards;
+
+        private Map<String, ShardStoreIndex> indices;
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>nodes</code>.
+         */
+        public final Builder nodes(Map<String, NodeAttributes> map) {
+            this.nodes = _mapPutAll(this.nodes, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code>.
+         */
+        public final Builder nodes(String key, NodeAttributes value) {
+            this.nodes = _mapPut(this.nodes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code> using a builder lambda.
+         */
+        public final Builder nodes(String key, Function<NodeAttributes.Builder, ObjectBuilder<NodeAttributes>> fn) {
+            return nodes(key, fn.apply(new NodeAttributes.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code shards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>shards</code>.
+         */
+        public final Builder shards(List<List<NodeShard>> list) {
+            this.shards = _listAddAll(this.shards, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards}
+         * <p>
+         * Adds one or more values to <code>shards</code>.
+         */
+        public final Builder shards(List<NodeShard> value, List<NodeShard>... values) {
+            this.shards = _listAdd(this.shards, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>indices</code>.
+         */
+        public final Builder indices(Map<String, ShardStoreIndex> map) {
+            this.indices = _mapPutAll(this.indices, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds an entry to <code>indices</code>.
+         */
+        public final Builder indices(String key, ShardStoreIndex value) {
+            this.indices = _mapPut(this.indices, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds an entry to <code>indices</code> using a builder lambda.
+         */
+        public final Builder indices(String key, Function<ShardStoreIndex.Builder, ObjectBuilder<ShardStoreIndex>> fn) {
+            return indices(key, fn.apply(new ShardStoreIndex.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link SearchShardsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SearchShardsResponse build() {
+            _checkSingleUse();
+
+            return new SearchShardsResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SearchShardsResponse}
+     */
+    public static final JsonpDeserializer<SearchShardsResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SearchShardsResponse::setupSearchShardsResponseDeserializer
+    );
+
+    protected static void setupSearchShardsResponseDeserializer(ObjectDeserializer<SearchShardsResponse.Builder> op) {
+
+        op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(NodeAttributes._DESERIALIZER), "nodes");
+        op.add(
+            Builder::shards,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.arrayDeserializer(NodeShard._DESERIALIZER)),
+            "shards"
+        );
+        op.add(Builder::indices, JsonpDeserializer.stringMapDeserializer(ShardStoreIndex._DESERIALIZER), "indices");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchTemplateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchTemplateRequest.java
index 86a6b9060d..19fbda0a50 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchTemplateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchTemplateRequest.java
@@ -32,11 +32,13 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.ExpandWildcard;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.SearchType;
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -44,669 +46,669 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.ExpandWildcard;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.SearchType;
+import org.opensearch.client.opensearch._types.Time;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: _global.search_template.Request
 
 /**
  * Allows to use the Mustache language to pre-render a search definition.
- * 
+ *
  */
 @JsonpDeserializable
 public class SearchTemplateRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	@Nullable
-	private final Boolean ccsMinimizeRoundtrips;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean explain;
-
-	@Nullable
-	private final String id;
-
-	@Nullable
-	private final Boolean ignoreThrottled;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	private final Map<String, JsonData> params;
-
-	@Nullable
-	private final String preference;
-
-	@Nullable
-	private final Boolean profile;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final Time scroll;
-
-	@Nullable
-	private final SearchType searchType;
-
-	@Nullable
-	private final String source;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SearchTemplateRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.ccsMinimizeRoundtrips = builder.ccsMinimizeRoundtrips;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.explain = builder.explain;
-		this.id = builder.id;
-		this.ignoreThrottled = builder.ignoreThrottled;
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.params = ApiTypeHelper.unmodifiable(builder.params);
-		this.preference = builder.preference;
-		this.profile = builder.profile;
-		this.routing = builder.routing;
-		this.scroll = builder.scroll;
-		this.searchType = builder.searchType;
-		this.source = builder.source;
-
-	}
-
-	public static SearchTemplateRequest of(Function<Builder, ObjectBuilder<SearchTemplateRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Indicates whether network round-trips should be minimized as part of
-	 * cross-cluster search requests execution
-	 * <p>
-	 * API name: {@code ccs_minimize_roundtrips}
-	 */
-	@Nullable
-	public final Boolean ccsMinimizeRoundtrips() {
-		return this.ccsMinimizeRoundtrips;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * API name: {@code explain}
-	 */
-	@Nullable
-	public final Boolean explain() {
-		return this.explain;
-	}
-
-	/**
-	 * ID of the search template to use. If no source is specified, this parameter
-	 * is required.
-	 * <p>
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Whether specified concrete, expanded or aliased indices should be ignored
-	 * when throttled
-	 * <p>
-	 * API name: {@code ignore_throttled}
-	 */
-	@Nullable
-	public final Boolean ignoreThrottled() {
-		return this.ignoreThrottled;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * Comma-separated list of data streams, indices, and aliases to search.
-	 * Supports wildcards (*).
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code params}
-	 */
-	public final Map<String, JsonData> params() {
-		return this.params;
-	}
-
-	/**
-	 * Specify the node or shard the operation should be performed on (default:
-	 * random)
-	 * <p>
-	 * API name: {@code preference}
-	 */
-	@Nullable
-	public final String preference() {
-		return this.preference;
-	}
-
-	/**
-	 * API name: {@code profile}
-	 */
-	@Nullable
-	public final Boolean profile() {
-		return this.profile;
-	}
-
-	/**
-	 * Custom value used to route operations to a specific shard.
-	 * <p>
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Specifies how long a consistent view of the index should be maintained for
-	 * scrolled search.
-	 * <p>
-	 * API name: {@code scroll}
-	 */
-	@Nullable
-	public final Time scroll() {
-		return this.scroll;
-	}
-
-	/**
-	 * The type of the search operation.
-	 * <p>
-	 * API name: {@code search_type}
-	 */
-	@Nullable
-	public final SearchType searchType() {
-		return this.searchType;
-	}
-
-	/**
-	 * An inline search template. Supports the same parameters as the search API's
-	 * request body. Also supports Mustache variables. If no id is specified, this
-	 * parameter is required.
-	 * <p>
-	 * API name: {@code source}
-	 */
-	@Nullable
-	public final String source() {
-		return this.source;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.explain != null) {
-			generator.writeKey("explain");
-			generator.write(this.explain);
-
-		}
-		if (this.id != null) {
-			generator.writeKey("id");
-			generator.write(this.id);
-
-		}
-		if (ApiTypeHelper.isDefined(this.params)) {
-			generator.writeKey("params");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.profile != null) {
-			generator.writeKey("profile");
-			generator.write(this.profile);
-
-		}
-		if (this.source != null) {
-			generator.writeKey("source");
-			generator.write(this.source);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SearchTemplateRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SearchTemplateRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private Boolean ccsMinimizeRoundtrips;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean explain;
-
-		@Nullable
-		private String id;
-
-		@Nullable
-		private Boolean ignoreThrottled;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private Map<String, JsonData> params;
-
-		@Nullable
-		private String preference;
-
-		@Nullable
-		private Boolean profile;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private Time scroll;
-
-		@Nullable
-		private SearchType searchType;
-
-		@Nullable
-		private String source;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Indicates whether network round-trips should be minimized as part of
-		 * cross-cluster search requests execution
-		 * <p>
-		 * API name: {@code ccs_minimize_roundtrips}
-		 */
-		public final Builder ccsMinimizeRoundtrips(@Nullable Boolean value) {
-			this.ccsMinimizeRoundtrips = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code explain}
-		 */
-		public final Builder explain(@Nullable Boolean value) {
-			this.explain = value;
-			return this;
-		}
-
-		/**
-		 * ID of the search template to use. If no source is specified, this parameter
-		 * is required.
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete, expanded or aliased indices should be ignored
-		 * when throttled
-		 * <p>
-		 * API name: {@code ignore_throttled}
-		 */
-		public final Builder ignoreThrottled(@Nullable Boolean value) {
-			this.ignoreThrottled = value;
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Comma-separated list of data streams, indices, and aliases to search.
-		 * Supports wildcards (*).
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * Comma-separated list of data streams, indices, and aliases to search.
-		 * Supports wildcards (*).
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code params}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>params</code>.
-		 */
-		public final Builder params(Map<String, JsonData> map) {
-			this.params = _mapPutAll(this.params, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code params}
-		 * <p>
-		 * Adds an entry to <code>params</code>.
-		 */
-		public final Builder params(String key, JsonData value) {
-			this.params = _mapPut(this.params, key, value);
-			return this;
-		}
-
-		/**
-		 * Specify the node or shard the operation should be performed on (default:
-		 * random)
-		 * <p>
-		 * API name: {@code preference}
-		 */
-		public final Builder preference(@Nullable String value) {
-			this.preference = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code profile}
-		 */
-		public final Builder profile(@Nullable Boolean value) {
-			this.profile = value;
-			return this;
-		}
-
-		/**
-		 * Custom value used to route operations to a specific shard.
-		 * <p>
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Specifies how long a consistent view of the index should be maintained for
-		 * scrolled search.
-		 * <p>
-		 * API name: {@code scroll}
-		 */
-		public final Builder scroll(@Nullable Time value) {
-			this.scroll = value;
-			return this;
-		}
-
-		/**
-		 * Specifies how long a consistent view of the index should be maintained for
-		 * scrolled search.
-		 * <p>
-		 * API name: {@code scroll}
-		 */
-		public final Builder scroll(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.scroll(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * The type of the search operation.
-		 * <p>
-		 * API name: {@code search_type}
-		 */
-		public final Builder searchType(@Nullable SearchType value) {
-			this.searchType = value;
-			return this;
-		}
-
-		/**
-		 * An inline search template. Supports the same parameters as the search API's
-		 * request body. Also supports Mustache variables. If no id is specified, this
-		 * parameter is required.
-		 * <p>
-		 * API name: {@code source}
-		 */
-		public final Builder source(@Nullable String value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SearchTemplateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SearchTemplateRequest build() {
-			_checkSingleUse();
-
-			return new SearchTemplateRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SearchTemplateRequest}
-	 */
-	public static final JsonpDeserializer<SearchTemplateRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SearchTemplateRequest::setupSearchTemplateRequestDeserializer);
-
-	protected static void setupSearchTemplateRequestDeserializer(ObjectDeserializer<SearchTemplateRequest.Builder> op) {
-
-		op.add(Builder::explain, JsonpDeserializer.booleanDeserializer(), "explain");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
-		op.add(Builder::profile, JsonpDeserializer.booleanDeserializer(), "profile");
-		op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code search_template}".
-	 */
-	public static final SimpleEndpoint<SearchTemplateRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_search");
-					buf.append("/template");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_search");
-					buf.append("/template");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> 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(",")));
-				}
-				if (request.preference != null) {
-					params.put("preference", request.preference);
-				}
-				if (request.scroll != null) {
-					params.put("scroll", request.scroll._toJsonString());
-				}
-				if (request.searchType != null) {
-					params.put("search_type", request.searchType.jsonValue());
-				}
-				if (request.ccsMinimizeRoundtrips != null) {
-					params.put("ccs_minimize_roundtrips", String.valueOf(request.ccsMinimizeRoundtrips));
-				}
-				if (request.routing != null) {
-					params.put("routing", request.routing);
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.ignoreThrottled != null) {
-					params.put("ignore_throttled", String.valueOf(request.ignoreThrottled));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, SearchTemplateResponse._DESERIALIZER);
-
-	/**
-	 * Create an "{@code search_template}" endpoint.
-	 */
-	public static <TDocument> Endpoint<SearchTemplateRequest, SearchTemplateResponse<TDocument>, ErrorResponse>
-	createSearchTemplateEndpoint(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return _ENDPOINT.withResponseDeserializer(
-				SearchTemplateResponse.createSearchTemplateResponseDeserializer(tDocumentDeserializer));
-	}
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    @Nullable
+    private final Boolean ccsMinimizeRoundtrips;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean explain;
+
+    @Nullable
+    private final String id;
+
+    @Nullable
+    private final Boolean ignoreThrottled;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    private final Map<String, JsonData> params;
+
+    @Nullable
+    private final String preference;
+
+    @Nullable
+    private final Boolean profile;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final Time scroll;
+
+    @Nullable
+    private final SearchType searchType;
+
+    @Nullable
+    private final String source;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SearchTemplateRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.ccsMinimizeRoundtrips = builder.ccsMinimizeRoundtrips;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.explain = builder.explain;
+        this.id = builder.id;
+        this.ignoreThrottled = builder.ignoreThrottled;
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.params = ApiTypeHelper.unmodifiable(builder.params);
+        this.preference = builder.preference;
+        this.profile = builder.profile;
+        this.routing = builder.routing;
+        this.scroll = builder.scroll;
+        this.searchType = builder.searchType;
+        this.source = builder.source;
+
+    }
+
+    public static SearchTemplateRequest of(Function<Builder, ObjectBuilder<SearchTemplateRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Indicates whether network round-trips should be minimized as part of
+     * cross-cluster search requests execution
+     * <p>
+     * API name: {@code ccs_minimize_roundtrips}
+     */
+    @Nullable
+    public final Boolean ccsMinimizeRoundtrips() {
+        return this.ccsMinimizeRoundtrips;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * API name: {@code explain}
+     */
+    @Nullable
+    public final Boolean explain() {
+        return this.explain;
+    }
+
+    /**
+     * ID of the search template to use. If no source is specified, this parameter
+     * is required.
+     * <p>
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Whether specified concrete, expanded or aliased indices should be ignored
+     * when throttled
+     * <p>
+     * API name: {@code ignore_throttled}
+     */
+    @Nullable
+    public final Boolean ignoreThrottled() {
+        return this.ignoreThrottled;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * Comma-separated list of data streams, indices, and aliases to search.
+     * Supports wildcards (*).
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code params}
+     */
+    public final Map<String, JsonData> params() {
+        return this.params;
+    }
+
+    /**
+     * Specify the node or shard the operation should be performed on (default:
+     * random)
+     * <p>
+     * API name: {@code preference}
+     */
+    @Nullable
+    public final String preference() {
+        return this.preference;
+    }
+
+    /**
+     * API name: {@code profile}
+     */
+    @Nullable
+    public final Boolean profile() {
+        return this.profile;
+    }
+
+    /**
+     * Custom value used to route operations to a specific shard.
+     * <p>
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * Specifies how long a consistent view of the index should be maintained for
+     * scrolled search.
+     * <p>
+     * API name: {@code scroll}
+     */
+    @Nullable
+    public final Time scroll() {
+        return this.scroll;
+    }
+
+    /**
+     * The type of the search operation.
+     * <p>
+     * API name: {@code search_type}
+     */
+    @Nullable
+    public final SearchType searchType() {
+        return this.searchType;
+    }
+
+    /**
+     * An inline search template. Supports the same parameters as the search API's
+     * request body. Also supports Mustache variables. If no id is specified, this
+     * parameter is required.
+     * <p>
+     * API name: {@code source}
+     */
+    @Nullable
+    public final String source() {
+        return this.source;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.explain != null) {
+            generator.writeKey("explain");
+            generator.write(this.explain);
+
+        }
+        if (this.id != null) {
+            generator.writeKey("id");
+            generator.write(this.id);
+
+        }
+        if (ApiTypeHelper.isDefined(this.params)) {
+            generator.writeKey("params");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.profile != null) {
+            generator.writeKey("profile");
+            generator.write(this.profile);
+
+        }
+        if (this.source != null) {
+            generator.writeKey("source");
+            generator.write(this.source);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SearchTemplateRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SearchTemplateRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private Boolean ccsMinimizeRoundtrips;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean explain;
+
+        @Nullable
+        private String id;
+
+        @Nullable
+        private Boolean ignoreThrottled;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private Map<String, JsonData> params;
+
+        @Nullable
+        private String preference;
+
+        @Nullable
+        private Boolean profile;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private Time scroll;
+
+        @Nullable
+        private SearchType searchType;
+
+        @Nullable
+        private String source;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Indicates whether network round-trips should be minimized as part of
+         * cross-cluster search requests execution
+         * <p>
+         * API name: {@code ccs_minimize_roundtrips}
+         */
+        public final Builder ccsMinimizeRoundtrips(@Nullable Boolean value) {
+            this.ccsMinimizeRoundtrips = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code explain}
+         */
+        public final Builder explain(@Nullable Boolean value) {
+            this.explain = value;
+            return this;
+        }
+
+        /**
+         * ID of the search template to use. If no source is specified, this parameter
+         * is required.
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Whether specified concrete, expanded or aliased indices should be ignored
+         * when throttled
+         * <p>
+         * API name: {@code ignore_throttled}
+         */
+        public final Builder ignoreThrottled(@Nullable Boolean value) {
+            this.ignoreThrottled = value;
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Comma-separated list of data streams, indices, and aliases to search.
+         * Supports wildcards (*).
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * Comma-separated list of data streams, indices, and aliases to search.
+         * Supports wildcards (*).
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code params}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>params</code>.
+         */
+        public final Builder params(Map<String, JsonData> map) {
+            this.params = _mapPutAll(this.params, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code params}
+         * <p>
+         * Adds an entry to <code>params</code>.
+         */
+        public final Builder params(String key, JsonData value) {
+            this.params = _mapPut(this.params, key, value);
+            return this;
+        }
+
+        /**
+         * Specify the node or shard the operation should be performed on (default:
+         * random)
+         * <p>
+         * API name: {@code preference}
+         */
+        public final Builder preference(@Nullable String value) {
+            this.preference = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code profile}
+         */
+        public final Builder profile(@Nullable Boolean value) {
+            this.profile = value;
+            return this;
+        }
+
+        /**
+         * Custom value used to route operations to a specific shard.
+         * <p>
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Specifies how long a consistent view of the index should be maintained for
+         * scrolled search.
+         * <p>
+         * API name: {@code scroll}
+         */
+        public final Builder scroll(@Nullable Time value) {
+            this.scroll = value;
+            return this;
+        }
+
+        /**
+         * Specifies how long a consistent view of the index should be maintained for
+         * scrolled search.
+         * <p>
+         * API name: {@code scroll}
+         */
+        public final Builder scroll(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.scroll(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * The type of the search operation.
+         * <p>
+         * API name: {@code search_type}
+         */
+        public final Builder searchType(@Nullable SearchType value) {
+            this.searchType = value;
+            return this;
+        }
+
+        /**
+         * An inline search template. Supports the same parameters as the search API's
+         * request body. Also supports Mustache variables. If no id is specified, this
+         * parameter is required.
+         * <p>
+         * API name: {@code source}
+         */
+        public final Builder source(@Nullable String value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link SearchTemplateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SearchTemplateRequest build() {
+            _checkSingleUse();
+
+            return new SearchTemplateRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SearchTemplateRequest}
+     */
+    public static final JsonpDeserializer<SearchTemplateRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SearchTemplateRequest::setupSearchTemplateRequestDeserializer
+    );
+
+    protected static void setupSearchTemplateRequestDeserializer(ObjectDeserializer<SearchTemplateRequest.Builder> op) {
+
+        op.add(Builder::explain, JsonpDeserializer.booleanDeserializer(), "explain");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
+        op.add(Builder::profile, JsonpDeserializer.booleanDeserializer(), "profile");
+        op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code search_template}".
+     */
+    public static final SimpleEndpoint<SearchTemplateRequest, ?> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_search");
+                buf.append("/template");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_search");
+                buf.append("/template");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> 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(",")));
+            }
+            if (request.preference != null) {
+                params.put("preference", request.preference);
+            }
+            if (request.scroll != null) {
+                params.put("scroll", request.scroll._toJsonString());
+            }
+            if (request.searchType != null) {
+                params.put("search_type", request.searchType.jsonValue());
+            }
+            if (request.ccsMinimizeRoundtrips != null) {
+                params.put("ccs_minimize_roundtrips", String.valueOf(request.ccsMinimizeRoundtrips));
+            }
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.ignoreThrottled != null) {
+                params.put("ignore_throttled", String.valueOf(request.ignoreThrottled));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        SearchTemplateResponse._DESERIALIZER
+    );
+
+    /**
+     * Create an "{@code search_template}" endpoint.
+     */
+    public static <
+        TDocument> Endpoint<SearchTemplateRequest, SearchTemplateResponse<TDocument>, ErrorResponse> createSearchTemplateEndpoint(
+            JsonpDeserializer<TDocument> tDocumentDeserializer
+        ) {
+        return _ENDPOINT.withResponseDeserializer(SearchTemplateResponse.createSearchTemplateResponseDeserializer(tDocumentDeserializer));
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchTemplateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchTemplateResponse.java
index 3c9e23c2aa..eaf233e3f4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchTemplateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchTemplateResponse.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.function.Function;
+import java.util.function.Supplier;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.NamedDeserializer;
@@ -40,74 +42,77 @@
 import org.opensearch.client.opensearch.core.search.SearchResult;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-import java.util.function.Supplier;
-
 // typedef: _global.search_template.Response
 
 @JsonpDeserializable
 public class SearchTemplateResponse<TDocument> extends SearchResult<TDocument> {
-	// ---------------------------------------------------------------------------------------------
-
-	private SearchTemplateResponse(Builder<TDocument> builder) {
-		super(builder);
-
-	}
-
-	public static <TDocument> SearchTemplateResponse<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<SearchTemplateResponse<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SearchTemplateResponse}.
-	 */
-	public static class Builder<TDocument> extends SearchResult.AbstractBuilder<TDocument, Builder<TDocument>>
-			implements
-				ObjectBuilder<SearchTemplateResponse<TDocument>> {
-		@Override
-		protected Builder<TDocument> self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SearchTemplateResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SearchTemplateResponse<TDocument> build() {
-			_checkSingleUse();
-
-			return new SearchTemplateResponse<TDocument>(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Create a JSON deserializer for SearchTemplateResponse
-	 */
-	public static <TDocument> JsonpDeserializer<SearchTemplateResponse<TDocument>> createSearchTemplateResponseDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return ObjectBuilderDeserializer.createForObject((Supplier<Builder<TDocument>>) Builder::new,
-				op -> SearchTemplateResponse.setupSearchTemplateResponseDeserializer(op, tDocumentDeserializer));
-	};
-
-	/**
-	 * Json deserializer for {@link SearchTemplateResponse} based on named
-	 * deserializers provided by the calling {@code JsonMapper}.
-	 */
-	public static final JsonpDeserializer<SearchTemplateResponse<Object>> _DESERIALIZER = createSearchTemplateResponseDeserializer(
-			new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.search_template.TDocument"));
-
-	protected static <TDocument> void setupSearchTemplateResponseDeserializer(
-			ObjectDeserializer<SearchTemplateResponse.Builder<TDocument>> op,
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-	    SearchResult.setupSearchResultDeserializer(op, tDocumentDeserializer);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private SearchTemplateResponse(Builder<TDocument> builder) {
+        super(builder);
+
+    }
+
+    public static <TDocument> SearchTemplateResponse<TDocument> of(
+        Function<Builder<TDocument>, ObjectBuilder<SearchTemplateResponse<TDocument>>> fn
+    ) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SearchTemplateResponse}.
+     */
+    public static class Builder<TDocument> extends SearchResult.AbstractBuilder<TDocument, Builder<TDocument>>
+        implements
+            ObjectBuilder<SearchTemplateResponse<TDocument>> {
+        @Override
+        protected Builder<TDocument> self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SearchTemplateResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SearchTemplateResponse<TDocument> build() {
+            _checkSingleUse();
+
+            return new SearchTemplateResponse<TDocument>(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Create a JSON deserializer for SearchTemplateResponse
+     */
+    public static <TDocument> JsonpDeserializer<SearchTemplateResponse<TDocument>> createSearchTemplateResponseDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<TDocument>>) Builder::new,
+            op -> SearchTemplateResponse.setupSearchTemplateResponseDeserializer(op, tDocumentDeserializer)
+        );
+    };
+
+    /**
+     * Json deserializer for {@link SearchTemplateResponse} based on named
+     * deserializers provided by the calling {@code JsonMapper}.
+     */
+    public static final JsonpDeserializer<SearchTemplateResponse<Object>> _DESERIALIZER = createSearchTemplateResponseDeserializer(
+        new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.search_template.TDocument")
+    );
+
+    protected static <TDocument> void setupSearchTemplateResponseDeserializer(
+        ObjectDeserializer<SearchTemplateResponse.Builder<TDocument>> op,
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        SearchResult.setupSearchResultDeserializer(op, tDocumentDeserializer);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/TermsEnumRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/TermsEnumRequest.java
index f4f78ec07d..97d669edfa 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/TermsEnumRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/TermsEnumRequest.java
@@ -32,26 +32,25 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Collections;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.Time;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Collections;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.terms_enum.Request
 
@@ -59,383 +58,389 @@
  * The terms enum API can be used to discover terms in the index that begin with
  * the provided string. It is designed for low-latency look-ups used in
  * auto-complete scenarios.
- * 
+ *
  */
 @JsonpDeserializable
 public class TermsEnumRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final Boolean caseInsensitive;
-
-	private final String field;
-
-	private final String index;
-
-	@Nullable
-	private final Query indexFilter;
-
-	@Nullable
-	private final String searchAfter;
-
-	@Nullable
-	private final Integer size;
-
-	@Nullable
-	private final String string;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TermsEnumRequest(Builder builder) {
-
-		this.caseInsensitive = builder.caseInsensitive;
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.indexFilter = builder.indexFilter;
-		this.searchAfter = builder.searchAfter;
-		this.size = builder.size;
-		this.string = builder.string;
-		this.timeout = builder.timeout;
-
-	}
-
-	public static TermsEnumRequest of(Function<Builder, ObjectBuilder<TermsEnumRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * When true the provided search string is matched against index terms without
-	 * case sensitivity.
-	 * <p>
-	 * API name: {@code case_insensitive}
-	 */
-	@Nullable
-	public final Boolean caseInsensitive() {
-		return this.caseInsensitive;
-	}
-
-	/**
-	 * Required - The string to match at the start of indexed terms. If not
-	 * provided, all terms in the field are considered.
-	 * <p>
-	 * API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required - Comma-separated list of data streams, indices, and index aliases
-	 * to search. Wildcard (*) expressions are supported.
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Allows to filter an index shard if the provided query rewrites to match_none.
-	 * <p>
-	 * API name: {@code index_filter}
-	 */
-	@Nullable
-	public final Query indexFilter() {
-		return this.indexFilter;
-	}
-
-	/**
-	 * API name: {@code search_after}
-	 */
-	@Nullable
-	public final String searchAfter() {
-		return this.searchAfter;
-	}
-
-	/**
-	 * How many matching terms to return.
-	 * <p>
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	/**
-	 * The string after which terms in the index should be returned. Allows for a
-	 * form of pagination if the last result from one request is passed as the
-	 * search_after parameter for a subsequent request.
-	 * <p>
-	 * API name: {@code string}
-	 */
-	@Nullable
-	public final String string() {
-		return this.string;
-	}
-
-	/**
-	 * The maximum length of time to spend collecting results. Defaults to
-	 * &quot;1s&quot; (one second). If the timeout is exceeded the complete flag set
-	 * to false in the response and the results may be partial or empty.
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.caseInsensitive != null) {
-			generator.writeKey("case_insensitive");
-			generator.write(this.caseInsensitive);
-
-		}
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.indexFilter != null) {
-			generator.writeKey("index_filter");
-			this.indexFilter.serialize(generator, mapper);
-
-		}
-		if (this.searchAfter != null) {
-			generator.writeKey("search_after");
-			generator.write(this.searchAfter);
-
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		if (this.string != null) {
-			generator.writeKey("string");
-			generator.write(this.string);
-
-		}
-		if (this.timeout != null) {
-			generator.writeKey("timeout");
-			this.timeout.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TermsEnumRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermsEnumRequest> {
-		@Nullable
-		private Boolean caseInsensitive;
-
-		private String field;
-
-		private String index;
-
-		@Nullable
-		private Query indexFilter;
-
-		@Nullable
-		private String searchAfter;
-
-		@Nullable
-		private Integer size;
-
-		@Nullable
-		private String string;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * When true the provided search string is matched against index terms without
-		 * case sensitivity.
-		 * <p>
-		 * API name: {@code case_insensitive}
-		 */
-		public final Builder caseInsensitive(@Nullable Boolean value) {
-			this.caseInsensitive = value;
-			return this;
-		}
-
-		/**
-		 * Required - The string to match at the start of indexed terms. If not
-		 * provided, all terms in the field are considered.
-		 * <p>
-		 * API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required - Comma-separated list of data streams, indices, and index aliases
-		 * to search. Wildcard (*) expressions are supported.
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Allows to filter an index shard if the provided query rewrites to match_none.
-		 * <p>
-		 * API name: {@code index_filter}
-		 */
-		public final Builder indexFilter(@Nullable Query value) {
-			this.indexFilter = value;
-			return this;
-		}
-
-		/**
-		 * Allows to filter an index shard if the provided query rewrites to match_none.
-		 * <p>
-		 * API name: {@code index_filter}
-		 */
-		public final Builder indexFilter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.indexFilter(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code search_after}
-		 */
-		public final Builder searchAfter(@Nullable String value) {
-			this.searchAfter = value;
-			return this;
-		}
-
-		/**
-		 * How many matching terms to return.
-		 * <p>
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Integer value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * The string after which terms in the index should be returned. Allows for a
-		 * form of pagination if the last result from one request is passed as the
-		 * search_after parameter for a subsequent request.
-		 * <p>
-		 * API name: {@code string}
-		 */
-		public final Builder string(@Nullable String value) {
-			this.string = value;
-			return this;
-		}
-
-		/**
-		 * The maximum length of time to spend collecting results. Defaults to
-		 * &quot;1s&quot; (one second). If the timeout is exceeded the complete flag set
-		 * to false in the response and the results may be partial or empty.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * The maximum length of time to spend collecting results. Defaults to
-		 * &quot;1s&quot; (one second). If the timeout is exceeded the complete flag set
-		 * to false in the response and the results may be partial or empty.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link TermsEnumRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TermsEnumRequest build() {
-			_checkSingleUse();
-
-			return new TermsEnumRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TermsEnumRequest}
-	 */
-	public static final JsonpDeserializer<TermsEnumRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TermsEnumRequest::setupTermsEnumRequestDeserializer);
-
-	protected static void setupTermsEnumRequestDeserializer(ObjectDeserializer<TermsEnumRequest.Builder> op) {
-
-		op.add(Builder::caseInsensitive, JsonpDeserializer.booleanDeserializer(), "case_insensitive");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::indexFilter, Query._DESERIALIZER, "index_filter");
-		op.add(Builder::searchAfter, JsonpDeserializer.stringDeserializer(), "search_after");
-		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
-		op.add(Builder::string, JsonpDeserializer.stringDeserializer(), "string");
-		op.add(Builder::timeout, Time._DESERIALIZER, "timeout");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code terms_enum}".
-	 */
-	public static final Endpoint<TermsEnumRequest, TermsEnumResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_terms_enum");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
-
-			}, SimpleEndpoint.emptyMap(), true, TermsEnumResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean caseInsensitive;
+
+    private final String field;
+
+    private final String index;
+
+    @Nullable
+    private final Query indexFilter;
+
+    @Nullable
+    private final String searchAfter;
+
+    @Nullable
+    private final Integer size;
+
+    @Nullable
+    private final String string;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TermsEnumRequest(Builder builder) {
+
+        this.caseInsensitive = builder.caseInsensitive;
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.indexFilter = builder.indexFilter;
+        this.searchAfter = builder.searchAfter;
+        this.size = builder.size;
+        this.string = builder.string;
+        this.timeout = builder.timeout;
+
+    }
+
+    public static TermsEnumRequest of(Function<Builder, ObjectBuilder<TermsEnumRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * When true the provided search string is matched against index terms without
+     * case sensitivity.
+     * <p>
+     * API name: {@code case_insensitive}
+     */
+    @Nullable
+    public final Boolean caseInsensitive() {
+        return this.caseInsensitive;
+    }
+
+    /**
+     * Required - The string to match at the start of indexed terms. If not
+     * provided, all terms in the field are considered.
+     * <p>
+     * API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required - Comma-separated list of data streams, indices, and index aliases
+     * to search. Wildcard (*) expressions are supported.
+     * <p>
+     * API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Allows to filter an index shard if the provided query rewrites to match_none.
+     * <p>
+     * API name: {@code index_filter}
+     */
+    @Nullable
+    public final Query indexFilter() {
+        return this.indexFilter;
+    }
+
+    /**
+     * API name: {@code search_after}
+     */
+    @Nullable
+    public final String searchAfter() {
+        return this.searchAfter;
+    }
+
+    /**
+     * How many matching terms to return.
+     * <p>
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    /**
+     * The string after which terms in the index should be returned. Allows for a
+     * form of pagination if the last result from one request is passed as the
+     * search_after parameter for a subsequent request.
+     * <p>
+     * API name: {@code string}
+     */
+    @Nullable
+    public final String string() {
+        return this.string;
+    }
+
+    /**
+     * The maximum length of time to spend collecting results. Defaults to
+     * &quot;1s&quot; (one second). If the timeout is exceeded the complete flag set
+     * to false in the response and the results may be partial or empty.
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.caseInsensitive != null) {
+            generator.writeKey("case_insensitive");
+            generator.write(this.caseInsensitive);
+
+        }
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.indexFilter != null) {
+            generator.writeKey("index_filter");
+            this.indexFilter.serialize(generator, mapper);
+
+        }
+        if (this.searchAfter != null) {
+            generator.writeKey("search_after");
+            generator.write(this.searchAfter);
+
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        if (this.string != null) {
+            generator.writeKey("string");
+            generator.write(this.string);
+
+        }
+        if (this.timeout != null) {
+            generator.writeKey("timeout");
+            this.timeout.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TermsEnumRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermsEnumRequest> {
+        @Nullable
+        private Boolean caseInsensitive;
+
+        private String field;
+
+        private String index;
+
+        @Nullable
+        private Query indexFilter;
+
+        @Nullable
+        private String searchAfter;
+
+        @Nullable
+        private Integer size;
+
+        @Nullable
+        private String string;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * When true the provided search string is matched against index terms without
+         * case sensitivity.
+         * <p>
+         * API name: {@code case_insensitive}
+         */
+        public final Builder caseInsensitive(@Nullable Boolean value) {
+            this.caseInsensitive = value;
+            return this;
+        }
+
+        /**
+         * Required - The string to match at the start of indexed terms. If not
+         * provided, all terms in the field are considered.
+         * <p>
+         * API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required - Comma-separated list of data streams, indices, and index aliases
+         * to search. Wildcard (*) expressions are supported.
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Allows to filter an index shard if the provided query rewrites to match_none.
+         * <p>
+         * API name: {@code index_filter}
+         */
+        public final Builder indexFilter(@Nullable Query value) {
+            this.indexFilter = value;
+            return this;
+        }
+
+        /**
+         * Allows to filter an index shard if the provided query rewrites to match_none.
+         * <p>
+         * API name: {@code index_filter}
+         */
+        public final Builder indexFilter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.indexFilter(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code search_after}
+         */
+        public final Builder searchAfter(@Nullable String value) {
+            this.searchAfter = value;
+            return this;
+        }
+
+        /**
+         * How many matching terms to return.
+         * <p>
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Integer value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * The string after which terms in the index should be returned. Allows for a
+         * form of pagination if the last result from one request is passed as the
+         * search_after parameter for a subsequent request.
+         * <p>
+         * API name: {@code string}
+         */
+        public final Builder string(@Nullable String value) {
+            this.string = value;
+            return this;
+        }
+
+        /**
+         * The maximum length of time to spend collecting results. Defaults to
+         * &quot;1s&quot; (one second). If the timeout is exceeded the complete flag set
+         * to false in the response and the results may be partial or empty.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * The maximum length of time to spend collecting results. Defaults to
+         * &quot;1s&quot; (one second). If the timeout is exceeded the complete flag set
+         * to false in the response and the results may be partial or empty.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link TermsEnumRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TermsEnumRequest build() {
+            _checkSingleUse();
+
+            return new TermsEnumRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TermsEnumRequest}
+     */
+    public static final JsonpDeserializer<TermsEnumRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TermsEnumRequest::setupTermsEnumRequestDeserializer
+    );
+
+    protected static void setupTermsEnumRequestDeserializer(ObjectDeserializer<TermsEnumRequest.Builder> op) {
+
+        op.add(Builder::caseInsensitive, JsonpDeserializer.booleanDeserializer(), "case_insensitive");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::indexFilter, Query._DESERIALIZER, "index_filter");
+        op.add(Builder::searchAfter, JsonpDeserializer.stringDeserializer(), "search_after");
+        op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
+        op.add(Builder::string, JsonpDeserializer.stringDeserializer(), "string");
+        op.add(Builder::timeout, Time._DESERIALIZER, "timeout");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code terms_enum}".
+     */
+    public static final Endpoint<TermsEnumRequest, TermsEnumResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_terms_enum");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        TermsEnumResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/TermsEnumResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/TermsEnumResponse.java
index d1a4c4cffc..9e07c69a08 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/TermsEnumResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/TermsEnumResponse.java
@@ -32,178 +32,179 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.ShardStatistics;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ShardStatistics;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _global.terms_enum.Response
 
 @JsonpDeserializable
 public class TermsEnumResponse implements JsonpSerializable {
-	private final ShardStatistics shards;
+    private final ShardStatistics shards;
 
-	private final List<String> terms;
-
-	private final boolean complete;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TermsEnumResponse(Builder builder) {
-
-		this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
-		this.terms = ApiTypeHelper.unmodifiableRequired(builder.terms, this, "terms");
-		this.complete = ApiTypeHelper.requireNonNull(builder.complete, this, "complete");
-
-	}
-
-	public static TermsEnumResponse of(Function<Builder, ObjectBuilder<TermsEnumResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code _shards}
-	 */
-	public final ShardStatistics shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Required - API name: {@code terms}
-	 */
-	public final List<String> terms() {
-		return this.terms;
-	}
-
-	/**
-	 * Required - API name: {@code complete}
-	 */
-	public final boolean complete() {
-		return this.complete;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("_shards");
-		this.shards.serialize(generator, mapper);
-
-		if (ApiTypeHelper.isDefined(this.terms)) {
-			generator.writeKey("terms");
-			generator.writeStartArray();
-			for (String item0 : this.terms) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("complete");
-		generator.write(this.complete);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TermsEnumResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermsEnumResponse> {
-		private ShardStatistics shards;
-
-		private List<String> terms;
-
-		private Boolean complete;
-
-		/**
-		 * Required - API name: {@code _shards}
-		 */
-		public final Builder shards(ShardStatistics value) {
-			this.shards = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _shards}
-		 */
-		public final Builder shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
-			return this.shards(fn.apply(new ShardStatistics.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code terms}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>terms</code>.
-		 */
-		public final Builder terms(List<String> list) {
-			this.terms = _listAddAll(this.terms, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code terms}
-		 * <p>
-		 * Adds one or more values to <code>terms</code>.
-		 */
-		public final Builder terms(String value, String... values) {
-			this.terms = _listAdd(this.terms, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code complete}
-		 */
-		public final Builder complete(boolean value) {
-			this.complete = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TermsEnumResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TermsEnumResponse build() {
-			_checkSingleUse();
-
-			return new TermsEnumResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TermsEnumResponse}
-	 */
-	public static final JsonpDeserializer<TermsEnumResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, TermsEnumResponse::setupTermsEnumResponseDeserializer);
-
-	protected static void setupTermsEnumResponseDeserializer(ObjectDeserializer<TermsEnumResponse.Builder> op) {
-
-		op.add(Builder::shards, ShardStatistics._DESERIALIZER, "_shards");
-		op.add(Builder::terms, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "terms");
-		op.add(Builder::complete, JsonpDeserializer.booleanDeserializer(), "complete");
-
-	}
+    private final List<String> terms;
+
+    private final boolean complete;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TermsEnumResponse(Builder builder) {
+
+        this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
+        this.terms = ApiTypeHelper.unmodifiableRequired(builder.terms, this, "terms");
+        this.complete = ApiTypeHelper.requireNonNull(builder.complete, this, "complete");
+
+    }
+
+    public static TermsEnumResponse of(Function<Builder, ObjectBuilder<TermsEnumResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code _shards}
+     */
+    public final ShardStatistics shards() {
+        return this.shards;
+    }
+
+    /**
+     * Required - API name: {@code terms}
+     */
+    public final List<String> terms() {
+        return this.terms;
+    }
+
+    /**
+     * Required - API name: {@code complete}
+     */
+    public final boolean complete() {
+        return this.complete;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("_shards");
+        this.shards.serialize(generator, mapper);
+
+        if (ApiTypeHelper.isDefined(this.terms)) {
+            generator.writeKey("terms");
+            generator.writeStartArray();
+            for (String item0 : this.terms) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("complete");
+        generator.write(this.complete);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TermsEnumResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermsEnumResponse> {
+        private ShardStatistics shards;
+
+        private List<String> terms;
+
+        private Boolean complete;
+
+        /**
+         * Required - API name: {@code _shards}
+         */
+        public final Builder shards(ShardStatistics value) {
+            this.shards = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _shards}
+         */
+        public final Builder shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
+            return this.shards(fn.apply(new ShardStatistics.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code terms}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>terms</code>.
+         */
+        public final Builder terms(List<String> list) {
+            this.terms = _listAddAll(this.terms, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code terms}
+         * <p>
+         * Adds one or more values to <code>terms</code>.
+         */
+        public final Builder terms(String value, String... values) {
+            this.terms = _listAdd(this.terms, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code complete}
+         */
+        public final Builder complete(boolean value) {
+            this.complete = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link TermsEnumResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TermsEnumResponse build() {
+            _checkSingleUse();
+
+            return new TermsEnumResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TermsEnumResponse}
+     */
+    public static final JsonpDeserializer<TermsEnumResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TermsEnumResponse::setupTermsEnumResponseDeserializer
+    );
+
+    protected static void setupTermsEnumResponseDeserializer(ObjectDeserializer<TermsEnumResponse.Builder> op) {
+
+        op.add(Builder::shards, ShardStatistics._DESERIALIZER, "_shards");
+        op.add(Builder::terms, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "terms");
+        op.add(Builder::complete, JsonpDeserializer.booleanDeserializer(), "complete");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/TermvectorsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/TermvectorsRequest.java
index 973a39a15a..1780119dd3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/TermvectorsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/TermvectorsRequest.java
@@ -32,10 +32,14 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.VersionType;
-import org.opensearch.client.opensearch.core.termvectors.Filter;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
@@ -43,670 +47,674 @@
 import org.opensearch.client.json.JsonpUtils;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.VersionType;
+import org.opensearch.client.opensearch.core.termvectors.Filter;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: _global.termvectors.Request
 
 /**
  * Returns information and statistics about terms in the fields of a particular
  * document.
- * 
+ *
  */
 
 public class TermvectorsRequest<TDocument> extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final TDocument doc;
-
-	@Nullable
-	private final Boolean fieldStatistics;
-
-	private final List<String> fields;
-
-	@Nullable
-	private final Filter filter;
-
-	@Nullable
-	private final String id;
-
-	private final String index;
-
-	@Nullable
-	private final Boolean offsets;
-
-	@Nullable
-	private final Boolean payloads;
-
-	private final Map<String, String> perFieldAnalyzer;
-
-	@Nullable
-	private final Boolean positions;
-
-	@Nullable
-	private final String preference;
-
-	@Nullable
-	private final Boolean realtime;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final Boolean termStatistics;
-
-	@Nullable
-	private final Long version;
-
-	@Nullable
-	private final VersionType versionType;
-
-	@Nullable
-	private final JsonpSerializer<TDocument> tDocumentSerializer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TermvectorsRequest(Builder<TDocument> builder) {
-
-		this.doc = builder.doc;
-		this.fieldStatistics = builder.fieldStatistics;
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-		this.filter = builder.filter;
-		this.id = builder.id;
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.offsets = builder.offsets;
-		this.payloads = builder.payloads;
-		this.perFieldAnalyzer = ApiTypeHelper.unmodifiable(builder.perFieldAnalyzer);
-		this.positions = builder.positions;
-		this.preference = builder.preference;
-		this.realtime = builder.realtime;
-		this.routing = builder.routing;
-		this.termStatistics = builder.termStatistics;
-		this.version = builder.version;
-		this.versionType = builder.versionType;
-		this.tDocumentSerializer = builder.tDocumentSerializer;
-
-	}
-
-	public static <TDocument> TermvectorsRequest<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<TermvectorsRequest<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * API name: {@code doc}
-	 */
-	@Nullable
-	public final TDocument doc() {
-		return this.doc;
-	}
-
-	/**
-	 * Specifies if document count, sum of document frequencies and sum of total
-	 * term frequencies should be returned.
-	 * <p>
-	 * API name: {@code field_statistics}
-	 */
-	@Nullable
-	public final Boolean fieldStatistics() {
-		return this.fieldStatistics;
-	}
-
-	/**
-	 * A comma-separated list of fields to return.
-	 * <p>
-	 * API name: {@code fields}
-	 */
-	public final List<String> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * API name: {@code filter}
-	 */
-	@Nullable
-	public final Filter filter() {
-		return this.filter;
-	}
-
-	/**
-	 * The id of the document, when not specified a doc param should be supplied.
-	 * <p>
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - The index in which the document resides.
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Specifies if term offsets should be returned.
-	 * <p>
-	 * API name: {@code offsets}
-	 */
-	@Nullable
-	public final Boolean offsets() {
-		return this.offsets;
-	}
-
-	/**
-	 * Specifies if term payloads should be returned.
-	 * <p>
-	 * API name: {@code payloads}
-	 */
-	@Nullable
-	public final Boolean payloads() {
-		return this.payloads;
-	}
-
-	/**
-	 * API name: {@code per_field_analyzer}
-	 */
-	public final Map<String, String> perFieldAnalyzer() {
-		return this.perFieldAnalyzer;
-	}
-
-	/**
-	 * Specifies if term positions should be returned.
-	 * <p>
-	 * API name: {@code positions}
-	 */
-	@Nullable
-	public final Boolean positions() {
-		return this.positions;
-	}
-
-	/**
-	 * Specify the node or shard the operation should be performed on (default:
-	 * random).
-	 * <p>
-	 * API name: {@code preference}
-	 */
-	@Nullable
-	public final String preference() {
-		return this.preference;
-	}
-
-	/**
-	 * Specifies if request is real-time as opposed to near-real-time (default:
-	 * true).
-	 * <p>
-	 * API name: {@code realtime}
-	 */
-	@Nullable
-	public final Boolean realtime() {
-		return this.realtime;
-	}
-
-	/**
-	 * Specific routing value.
-	 * <p>
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Specifies if total term frequency and document frequency should be returned.
-	 * <p>
-	 * API name: {@code term_statistics}
-	 */
-	@Nullable
-	public final Boolean termStatistics() {
-		return this.termStatistics;
-	}
-
-	/**
-	 * Explicit version number for concurrency control
-	 * <p>
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * Specific version type
-	 * <p>
-	 * API name: {@code version_type}
-	 */
-	@Nullable
-	public final VersionType versionType() {
-		return this.versionType;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.doc != null) {
-			generator.writeKey("doc");
-			JsonpUtils.serialize(this.doc, generator, tDocumentSerializer, mapper);
-
-		}
-		if (this.filter != null) {
-			generator.writeKey("filter");
-			this.filter.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.perFieldAnalyzer)) {
-			generator.writeKey("per_field_analyzer");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.perFieldAnalyzer.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TermvectorsRequest}.
-	 */
-
-	public static class Builder<TDocument> extends ObjectBuilderBase
-			implements
-				ObjectBuilder<TermvectorsRequest<TDocument>> {
-		@Nullable
-		private TDocument doc;
-
-		@Nullable
-		private Boolean fieldStatistics;
-
-		@Nullable
-		private List<String> fields;
-
-		@Nullable
-		private Filter filter;
-
-		@Nullable
-		private String id;
-
-		private String index;
-
-		@Nullable
-		private Boolean offsets;
-
-		@Nullable
-		private Boolean payloads;
-
-		@Nullable
-		private Map<String, String> perFieldAnalyzer;
-
-		@Nullable
-		private Boolean positions;
-
-		@Nullable
-		private String preference;
-
-		@Nullable
-		private Boolean realtime;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private Boolean termStatistics;
-
-		@Nullable
-		private Long version;
-
-		@Nullable
-		private VersionType versionType;
-
-		@Nullable
-		private JsonpSerializer<TDocument> tDocumentSerializer;
-
-		/**
-		 * API name: {@code doc}
-		 */
-		public final Builder<TDocument> doc(@Nullable TDocument value) {
-			this.doc = value;
-			return this;
-		}
-
-		/**
-		 * Specifies if document count, sum of document frequencies and sum of total
-		 * term frequencies should be returned.
-		 * <p>
-		 * API name: {@code field_statistics}
-		 */
-		public final Builder<TDocument> fieldStatistics(@Nullable Boolean value) {
-			this.fieldStatistics = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of fields to return.
-		 * <p>
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fields</code>.
-		 */
-		public final Builder<TDocument> fields(List<String> list) {
-			this.fields = _listAddAll(this.fields, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of fields to return.
-		 * <p>
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds one or more values to <code>fields</code>.
-		 */
-		public final Builder<TDocument> fields(String value, String... values) {
-			this.fields = _listAdd(this.fields, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder<TDocument> filter(@Nullable Filter value) {
-			this.filter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder<TDocument> filter(Function<Filter.Builder, ObjectBuilder<Filter>> fn) {
-			return this.filter(fn.apply(new Filter.Builder()).build());
-		}
-
-		/**
-		 * The id of the document, when not specified a doc param should be supplied.
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder<TDocument> id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - The index in which the document resides.
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder<TDocument> index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Specifies if term offsets should be returned.
-		 * <p>
-		 * API name: {@code offsets}
-		 */
-		public final Builder<TDocument> offsets(@Nullable Boolean value) {
-			this.offsets = value;
-			return this;
-		}
-
-		/**
-		 * Specifies if term payloads should be returned.
-		 * <p>
-		 * API name: {@code payloads}
-		 */
-		public final Builder<TDocument> payloads(@Nullable Boolean value) {
-			this.payloads = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code per_field_analyzer}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>perFieldAnalyzer</code>.
-		 */
-		public final Builder<TDocument> perFieldAnalyzer(Map<String, String> map) {
-			this.perFieldAnalyzer = _mapPutAll(this.perFieldAnalyzer, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code per_field_analyzer}
-		 * <p>
-		 * Adds an entry to <code>perFieldAnalyzer</code>.
-		 */
-		public final Builder<TDocument> perFieldAnalyzer(String key, String value) {
-			this.perFieldAnalyzer = _mapPut(this.perFieldAnalyzer, key, value);
-			return this;
-		}
-
-		/**
-		 * Specifies if term positions should be returned.
-		 * <p>
-		 * API name: {@code positions}
-		 */
-		public final Builder<TDocument> positions(@Nullable Boolean value) {
-			this.positions = value;
-			return this;
-		}
-
-		/**
-		 * Specify the node or shard the operation should be performed on (default:
-		 * random).
-		 * <p>
-		 * API name: {@code preference}
-		 */
-		public final Builder<TDocument> preference(@Nullable String value) {
-			this.preference = value;
-			return this;
-		}
-
-		/**
-		 * Specifies if request is real-time as opposed to near-real-time (default:
-		 * true).
-		 * <p>
-		 * API name: {@code realtime}
-		 */
-		public final Builder<TDocument> realtime(@Nullable Boolean value) {
-			this.realtime = value;
-			return this;
-		}
-
-		/**
-		 * Specific routing value.
-		 * <p>
-		 * API name: {@code routing}
-		 */
-		public final Builder<TDocument> routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Specifies if total term frequency and document frequency should be returned.
-		 * <p>
-		 * API name: {@code term_statistics}
-		 */
-		public final Builder<TDocument> termStatistics(@Nullable Boolean value) {
-			this.termStatistics = value;
-			return this;
-		}
-
-		/**
-		 * Explicit version number for concurrency control
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder<TDocument> version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Specific version type
-		 * <p>
-		 * API name: {@code version_type}
-		 */
-		public final Builder<TDocument> versionType(@Nullable VersionType value) {
-			this.versionType = value;
-			return this;
-		}
-
-		/**
-		 * Serializer for TDocument. If not set, an attempt will be made to find a
-		 * serializer from the JSON context.
-		 */
-		public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
-			this.tDocumentSerializer = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TermvectorsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TermvectorsRequest<TDocument> build() {
-			_checkSingleUse();
-
-			return new TermvectorsRequest<TDocument>(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Create a JSON deserializer for TermvectorsRequest
-	 */
-	public static <TDocument> JsonpDeserializer<TermvectorsRequest<TDocument>> createTermvectorsRequestDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return ObjectBuilderDeserializer.createForObject((Supplier<Builder<TDocument>>) Builder::new,
-				op -> TermvectorsRequest.setupTermvectorsRequestDeserializer(op, tDocumentDeserializer));
-	};
-
-	protected static <TDocument> void setupTermvectorsRequestDeserializer(
-			ObjectDeserializer<TermvectorsRequest.Builder<TDocument>> op,
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-
-		op.add(Builder::doc, tDocumentDeserializer, "doc");
-		op.add(Builder::filter, Filter._DESERIALIZER, "filter");
-		op.add(Builder::perFieldAnalyzer,
-				JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "per_field_analyzer");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code termvectors}".
-	 */
-	public static final Endpoint<TermvectorsRequest<?>, TermvectorsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-				final int _id = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-				if (request.id() != null)
-					propsSet |= _id;
-
-				if (propsSet == (_index | _id)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_termvectors");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.id, buf);
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_termvectors");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.routing != null) {
-					params.put("routing", request.routing);
-				}
-				if (request.realtime != null) {
-					params.put("realtime", String.valueOf(request.realtime));
-				}
-				if (request.termStatistics != null) {
-					params.put("term_statistics", String.valueOf(request.termStatistics));
-				}
-				if (request.offsets != null) {
-					params.put("offsets", String.valueOf(request.offsets));
-				}
-				if (request.payloads != null) {
-					params.put("payloads", String.valueOf(request.payloads));
-				}
-				if (request.versionType != null) {
-					params.put("version_type", request.versionType.jsonValue());
-				}
-				if (request.preference != null) {
-					params.put("preference", request.preference);
-				}
-				if (request.positions != null) {
-					params.put("positions", String.valueOf(request.positions));
-				}
-				if (request.fieldStatistics != null) {
-					params.put("field_statistics", String.valueOf(request.fieldStatistics));
-				}
-				if (ApiTypeHelper.isDefined(request.fields)) {
-					params.put("fields", request.fields.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.version != null) {
-					params.put("version", String.valueOf(request.version));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, TermvectorsResponse._DESERIALIZER);
+    @Nullable
+    private final TDocument doc;
+
+    @Nullable
+    private final Boolean fieldStatistics;
+
+    private final List<String> fields;
+
+    @Nullable
+    private final Filter filter;
+
+    @Nullable
+    private final String id;
+
+    private final String index;
+
+    @Nullable
+    private final Boolean offsets;
+
+    @Nullable
+    private final Boolean payloads;
+
+    private final Map<String, String> perFieldAnalyzer;
+
+    @Nullable
+    private final Boolean positions;
+
+    @Nullable
+    private final String preference;
+
+    @Nullable
+    private final Boolean realtime;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final Boolean termStatistics;
+
+    @Nullable
+    private final Long version;
+
+    @Nullable
+    private final VersionType versionType;
+
+    @Nullable
+    private final JsonpSerializer<TDocument> tDocumentSerializer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TermvectorsRequest(Builder<TDocument> builder) {
+
+        this.doc = builder.doc;
+        this.fieldStatistics = builder.fieldStatistics;
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.filter = builder.filter;
+        this.id = builder.id;
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.offsets = builder.offsets;
+        this.payloads = builder.payloads;
+        this.perFieldAnalyzer = ApiTypeHelper.unmodifiable(builder.perFieldAnalyzer);
+        this.positions = builder.positions;
+        this.preference = builder.preference;
+        this.realtime = builder.realtime;
+        this.routing = builder.routing;
+        this.termStatistics = builder.termStatistics;
+        this.version = builder.version;
+        this.versionType = builder.versionType;
+        this.tDocumentSerializer = builder.tDocumentSerializer;
+
+    }
+
+    public static <TDocument> TermvectorsRequest<TDocument> of(
+        Function<Builder<TDocument>, ObjectBuilder<TermvectorsRequest<TDocument>>> fn
+    ) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * API name: {@code doc}
+     */
+    @Nullable
+    public final TDocument doc() {
+        return this.doc;
+    }
+
+    /**
+     * Specifies if document count, sum of document frequencies and sum of total
+     * term frequencies should be returned.
+     * <p>
+     * API name: {@code field_statistics}
+     */
+    @Nullable
+    public final Boolean fieldStatistics() {
+        return this.fieldStatistics;
+    }
+
+    /**
+     * A comma-separated list of fields to return.
+     * <p>
+     * API name: {@code fields}
+     */
+    public final List<String> fields() {
+        return this.fields;
+    }
+
+    /**
+     * API name: {@code filter}
+     */
+    @Nullable
+    public final Filter filter() {
+        return this.filter;
+    }
+
+    /**
+     * The id of the document, when not specified a doc param should be supplied.
+     * <p>
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - The index in which the document resides.
+     * <p>
+     * API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Specifies if term offsets should be returned.
+     * <p>
+     * API name: {@code offsets}
+     */
+    @Nullable
+    public final Boolean offsets() {
+        return this.offsets;
+    }
+
+    /**
+     * Specifies if term payloads should be returned.
+     * <p>
+     * API name: {@code payloads}
+     */
+    @Nullable
+    public final Boolean payloads() {
+        return this.payloads;
+    }
+
+    /**
+     * API name: {@code per_field_analyzer}
+     */
+    public final Map<String, String> perFieldAnalyzer() {
+        return this.perFieldAnalyzer;
+    }
+
+    /**
+     * Specifies if term positions should be returned.
+     * <p>
+     * API name: {@code positions}
+     */
+    @Nullable
+    public final Boolean positions() {
+        return this.positions;
+    }
+
+    /**
+     * Specify the node or shard the operation should be performed on (default:
+     * random).
+     * <p>
+     * API name: {@code preference}
+     */
+    @Nullable
+    public final String preference() {
+        return this.preference;
+    }
+
+    /**
+     * Specifies if request is real-time as opposed to near-real-time (default:
+     * true).
+     * <p>
+     * API name: {@code realtime}
+     */
+    @Nullable
+    public final Boolean realtime() {
+        return this.realtime;
+    }
+
+    /**
+     * Specific routing value.
+     * <p>
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * Specifies if total term frequency and document frequency should be returned.
+     * <p>
+     * API name: {@code term_statistics}
+     */
+    @Nullable
+    public final Boolean termStatistics() {
+        return this.termStatistics;
+    }
+
+    /**
+     * Explicit version number for concurrency control
+     * <p>
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * Specific version type
+     * <p>
+     * API name: {@code version_type}
+     */
+    @Nullable
+    public final VersionType versionType() {
+        return this.versionType;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.doc != null) {
+            generator.writeKey("doc");
+            JsonpUtils.serialize(this.doc, generator, tDocumentSerializer, mapper);
+
+        }
+        if (this.filter != null) {
+            generator.writeKey("filter");
+            this.filter.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.perFieldAnalyzer)) {
+            generator.writeKey("per_field_analyzer");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.perFieldAnalyzer.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TermvectorsRequest}.
+     */
+
+    public static class Builder<TDocument> extends ObjectBuilderBase implements ObjectBuilder<TermvectorsRequest<TDocument>> {
+        @Nullable
+        private TDocument doc;
+
+        @Nullable
+        private Boolean fieldStatistics;
+
+        @Nullable
+        private List<String> fields;
+
+        @Nullable
+        private Filter filter;
+
+        @Nullable
+        private String id;
+
+        private String index;
+
+        @Nullable
+        private Boolean offsets;
+
+        @Nullable
+        private Boolean payloads;
+
+        @Nullable
+        private Map<String, String> perFieldAnalyzer;
+
+        @Nullable
+        private Boolean positions;
+
+        @Nullable
+        private String preference;
+
+        @Nullable
+        private Boolean realtime;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private Boolean termStatistics;
+
+        @Nullable
+        private Long version;
+
+        @Nullable
+        private VersionType versionType;
+
+        @Nullable
+        private JsonpSerializer<TDocument> tDocumentSerializer;
+
+        /**
+         * API name: {@code doc}
+         */
+        public final Builder<TDocument> doc(@Nullable TDocument value) {
+            this.doc = value;
+            return this;
+        }
+
+        /**
+         * Specifies if document count, sum of document frequencies and sum of total
+         * term frequencies should be returned.
+         * <p>
+         * API name: {@code field_statistics}
+         */
+        public final Builder<TDocument> fieldStatistics(@Nullable Boolean value) {
+            this.fieldStatistics = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of fields to return.
+         * <p>
+         * API name: {@code fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fields</code>.
+         */
+        public final Builder<TDocument> fields(List<String> list) {
+            this.fields = _listAddAll(this.fields, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of fields to return.
+         * <p>
+         * API name: {@code fields}
+         * <p>
+         * Adds one or more values to <code>fields</code>.
+         */
+        public final Builder<TDocument> fields(String value, String... values) {
+            this.fields = _listAdd(this.fields, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder<TDocument> filter(@Nullable Filter value) {
+            this.filter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder<TDocument> filter(Function<Filter.Builder, ObjectBuilder<Filter>> fn) {
+            return this.filter(fn.apply(new Filter.Builder()).build());
+        }
+
+        /**
+         * The id of the document, when not specified a doc param should be supplied.
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder<TDocument> id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - The index in which the document resides.
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder<TDocument> index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Specifies if term offsets should be returned.
+         * <p>
+         * API name: {@code offsets}
+         */
+        public final Builder<TDocument> offsets(@Nullable Boolean value) {
+            this.offsets = value;
+            return this;
+        }
+
+        /**
+         * Specifies if term payloads should be returned.
+         * <p>
+         * API name: {@code payloads}
+         */
+        public final Builder<TDocument> payloads(@Nullable Boolean value) {
+            this.payloads = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code per_field_analyzer}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>perFieldAnalyzer</code>.
+         */
+        public final Builder<TDocument> perFieldAnalyzer(Map<String, String> map) {
+            this.perFieldAnalyzer = _mapPutAll(this.perFieldAnalyzer, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code per_field_analyzer}
+         * <p>
+         * Adds an entry to <code>perFieldAnalyzer</code>.
+         */
+        public final Builder<TDocument> perFieldAnalyzer(String key, String value) {
+            this.perFieldAnalyzer = _mapPut(this.perFieldAnalyzer, key, value);
+            return this;
+        }
+
+        /**
+         * Specifies if term positions should be returned.
+         * <p>
+         * API name: {@code positions}
+         */
+        public final Builder<TDocument> positions(@Nullable Boolean value) {
+            this.positions = value;
+            return this;
+        }
+
+        /**
+         * Specify the node or shard the operation should be performed on (default:
+         * random).
+         * <p>
+         * API name: {@code preference}
+         */
+        public final Builder<TDocument> preference(@Nullable String value) {
+            this.preference = value;
+            return this;
+        }
+
+        /**
+         * Specifies if request is real-time as opposed to near-real-time (default:
+         * true).
+         * <p>
+         * API name: {@code realtime}
+         */
+        public final Builder<TDocument> realtime(@Nullable Boolean value) {
+            this.realtime = value;
+            return this;
+        }
+
+        /**
+         * Specific routing value.
+         * <p>
+         * API name: {@code routing}
+         */
+        public final Builder<TDocument> routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Specifies if total term frequency and document frequency should be returned.
+         * <p>
+         * API name: {@code term_statistics}
+         */
+        public final Builder<TDocument> termStatistics(@Nullable Boolean value) {
+            this.termStatistics = value;
+            return this;
+        }
+
+        /**
+         * Explicit version number for concurrency control
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder<TDocument> version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Specific version type
+         * <p>
+         * API name: {@code version_type}
+         */
+        public final Builder<TDocument> versionType(@Nullable VersionType value) {
+            this.versionType = value;
+            return this;
+        }
+
+        /**
+         * Serializer for TDocument. If not set, an attempt will be made to find a
+         * serializer from the JSON context.
+         */
+        public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
+            this.tDocumentSerializer = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link TermvectorsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TermvectorsRequest<TDocument> build() {
+            _checkSingleUse();
+
+            return new TermvectorsRequest<TDocument>(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Create a JSON deserializer for TermvectorsRequest
+     */
+    public static <TDocument> JsonpDeserializer<TermvectorsRequest<TDocument>> createTermvectorsRequestDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<TDocument>>) Builder::new,
+            op -> TermvectorsRequest.setupTermvectorsRequestDeserializer(op, tDocumentDeserializer)
+        );
+    };
+
+    protected static <TDocument> void setupTermvectorsRequestDeserializer(
+        ObjectDeserializer<TermvectorsRequest.Builder<TDocument>> op,
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+
+        op.add(Builder::doc, tDocumentDeserializer, "doc");
+        op.add(Builder::filter, Filter._DESERIALIZER, "filter");
+        op.add(
+            Builder::perFieldAnalyzer,
+            JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
+            "per_field_analyzer"
+        );
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code termvectors}".
+     */
+    public static final Endpoint<TermvectorsRequest<?>, TermvectorsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+            final int _id = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+            if (request.id() != null) propsSet |= _id;
+
+            if (propsSet == (_index | _id)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_termvectors");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.id, buf);
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_termvectors");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            if (request.realtime != null) {
+                params.put("realtime", String.valueOf(request.realtime));
+            }
+            if (request.termStatistics != null) {
+                params.put("term_statistics", String.valueOf(request.termStatistics));
+            }
+            if (request.offsets != null) {
+                params.put("offsets", String.valueOf(request.offsets));
+            }
+            if (request.payloads != null) {
+                params.put("payloads", String.valueOf(request.payloads));
+            }
+            if (request.versionType != null) {
+                params.put("version_type", request.versionType.jsonValue());
+            }
+            if (request.preference != null) {
+                params.put("preference", request.preference);
+            }
+            if (request.positions != null) {
+                params.put("positions", String.valueOf(request.positions));
+            }
+            if (request.fieldStatistics != null) {
+                params.put("field_statistics", String.valueOf(request.fieldStatistics));
+            }
+            if (ApiTypeHelper.isDefined(request.fields)) {
+                params.put("fields", request.fields.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.version != null) {
+                params.put("version", String.valueOf(request.version));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        TermvectorsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/TermvectorsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/TermvectorsResponse.java
index 8eb6f99b7d..b52a901f58 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/TermvectorsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/TermvectorsResponse.java
@@ -32,255 +32,256 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch.core.termvectors.TermVector;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.termvectors.TermVector;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.termvectors.Response
 
 @JsonpDeserializable
 public class TermvectorsResponse implements JsonpSerializable {
-	private final boolean found;
-
-	private final String id;
-
-	private final String index;
-
-	private final Map<String, TermVector> termVectors;
-
-	private final long took;
+    private final boolean found;
+
+    private final String id;
+
+    private final String index;
+
+    private final Map<String, TermVector> termVectors;
+
+    private final long took;
 
-	private final long version;
+    private final long version;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private TermvectorsResponse(Builder builder) {
+    private TermvectorsResponse(Builder builder) {
 
-		this.found = ApiTypeHelper.requireNonNull(builder.found, this, "found");
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.termVectors = ApiTypeHelper.unmodifiable(builder.termVectors);
-		this.took = ApiTypeHelper.requireNonNull(builder.took, this, "took");
-		this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
+        this.found = ApiTypeHelper.requireNonNull(builder.found, this, "found");
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.termVectors = ApiTypeHelper.unmodifiable(builder.termVectors);
+        this.took = ApiTypeHelper.requireNonNull(builder.took, this, "took");
+        this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
 
-	}
+    }
 
-	public static TermvectorsResponse of(Function<Builder, ObjectBuilder<TermvectorsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static TermvectorsResponse of(Function<Builder, ObjectBuilder<TermvectorsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code found}
-	 */
-	public final boolean found() {
-		return this.found;
-	}
+    /**
+     * Required - API name: {@code found}
+     */
+    public final boolean found() {
+        return this.found;
+    }
 
-	/**
-	 * Required - API name: {@code _id}
-	 */
-	public final String id() {
-		return this.id;
-	}
+    /**
+     * Required - API name: {@code _id}
+     */
+    public final String id() {
+        return this.id;
+    }
 
-	/**
-	 * Required - API name: {@code _index}
-	 */
-	public final String index() {
-		return this.index;
-	}
+    /**
+     * Required - API name: {@code _index}
+     */
+    public final String index() {
+        return this.index;
+    }
 
-	/**
-	 * API name: {@code term_vectors}
-	 */
-	public final Map<String, TermVector> termVectors() {
-		return this.termVectors;
-	}
-
-	/**
-	 * Required - API name: {@code took}
-	 */
-	public final long took() {
-		return this.took;
-	}
-
-	/**
-	 * Required - API name: {@code _version}
-	 */
-	public final long version() {
-		return this.version;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("found");
-		generator.write(this.found);
-
-		generator.writeKey("_id");
-		generator.write(this.id);
-
-		generator.writeKey("_index");
-		generator.write(this.index);
-
-		if (ApiTypeHelper.isDefined(this.termVectors)) {
-			generator.writeKey("term_vectors");
-			generator.writeStartObject();
-			for (Map.Entry<String, TermVector> item0 : this.termVectors.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("took");
-		generator.write(this.took);
-
-		generator.writeKey("_version");
-		generator.write(this.version);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TermvectorsResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermvectorsResponse> {
-		private Boolean found;
-
-		private String id;
-
-		private String index;
-
-		@Nullable
-		private Map<String, TermVector> termVectors;
-
-		private Long took;
-
-		private Long version;
-
-		/**
-		 * Required - API name: {@code found}
-		 */
-		public final Builder found(boolean value) {
-			this.found = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code term_vectors}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>termVectors</code>.
-		 */
-		public final Builder termVectors(Map<String, TermVector> map) {
-			this.termVectors = _mapPutAll(this.termVectors, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code term_vectors}
-		 * <p>
-		 * Adds an entry to <code>termVectors</code>.
-		 */
-		public final Builder termVectors(String key, TermVector value) {
-			this.termVectors = _mapPut(this.termVectors, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code term_vectors}
-		 * <p>
-		 * Adds an entry to <code>termVectors</code> using a builder lambda.
-		 */
-		public final Builder termVectors(String key, Function<TermVector.Builder, ObjectBuilder<TermVector>> fn) {
-			return termVectors(key, fn.apply(new TermVector.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code took}
-		 */
-		public final Builder took(long value) {
-			this.took = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _version}
-		 */
-		public final Builder version(long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TermvectorsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TermvectorsResponse build() {
-			_checkSingleUse();
-
-			return new TermvectorsResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TermvectorsResponse}
-	 */
-	public static final JsonpDeserializer<TermvectorsResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, TermvectorsResponse::setupTermvectorsResponseDeserializer);
-
-	protected static void setupTermvectorsResponseDeserializer(ObjectDeserializer<TermvectorsResponse.Builder> op) {
-
-		op.add(Builder::found, JsonpDeserializer.booleanDeserializer(), "found");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
-		op.add(Builder::termVectors, JsonpDeserializer.stringMapDeserializer(TermVector._DESERIALIZER), "term_vectors");
-		op.add(Builder::took, JsonpDeserializer.longDeserializer(), "took");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "_version");
-
-	}
+    /**
+     * API name: {@code term_vectors}
+     */
+    public final Map<String, TermVector> termVectors() {
+        return this.termVectors;
+    }
+
+    /**
+     * Required - API name: {@code took}
+     */
+    public final long took() {
+        return this.took;
+    }
+
+    /**
+     * Required - API name: {@code _version}
+     */
+    public final long version() {
+        return this.version;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("found");
+        generator.write(this.found);
+
+        generator.writeKey("_id");
+        generator.write(this.id);
+
+        generator.writeKey("_index");
+        generator.write(this.index);
+
+        if (ApiTypeHelper.isDefined(this.termVectors)) {
+            generator.writeKey("term_vectors");
+            generator.writeStartObject();
+            for (Map.Entry<String, TermVector> item0 : this.termVectors.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("took");
+        generator.write(this.took);
+
+        generator.writeKey("_version");
+        generator.write(this.version);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TermvectorsResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermvectorsResponse> {
+        private Boolean found;
+
+        private String id;
+
+        private String index;
+
+        @Nullable
+        private Map<String, TermVector> termVectors;
+
+        private Long took;
+
+        private Long version;
+
+        /**
+         * Required - API name: {@code found}
+         */
+        public final Builder found(boolean value) {
+            this.found = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code term_vectors}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>termVectors</code>.
+         */
+        public final Builder termVectors(Map<String, TermVector> map) {
+            this.termVectors = _mapPutAll(this.termVectors, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code term_vectors}
+         * <p>
+         * Adds an entry to <code>termVectors</code>.
+         */
+        public final Builder termVectors(String key, TermVector value) {
+            this.termVectors = _mapPut(this.termVectors, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code term_vectors}
+         * <p>
+         * Adds an entry to <code>termVectors</code> using a builder lambda.
+         */
+        public final Builder termVectors(String key, Function<TermVector.Builder, ObjectBuilder<TermVector>> fn) {
+            return termVectors(key, fn.apply(new TermVector.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code took}
+         */
+        public final Builder took(long value) {
+            this.took = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _version}
+         */
+        public final Builder version(long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link TermvectorsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TermvectorsResponse build() {
+            _checkSingleUse();
+
+            return new TermvectorsResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TermvectorsResponse}
+     */
+    public static final JsonpDeserializer<TermvectorsResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TermvectorsResponse::setupTermvectorsResponseDeserializer
+    );
+
+    protected static void setupTermvectorsResponseDeserializer(ObjectDeserializer<TermvectorsResponse.Builder> op) {
+
+        op.add(Builder::found, JsonpDeserializer.booleanDeserializer(), "found");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
+        op.add(Builder::termVectors, JsonpDeserializer.stringMapDeserializer(TermVector._DESERIALIZER), "term_vectors");
+        op.add(Builder::took, JsonpDeserializer.longDeserializer(), "took");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "_version");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateByQueryRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateByQueryRequest.java
index 02be7da80b..ad288100d2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateByQueryRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateByQueryRequest.java
@@ -32,6 +32,19 @@
 
 package org.opensearch.client.opensearch.core;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpDeserializable;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.json.ObjectBuilderDeserializer;
+import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.opensearch._types.Conflicts;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
@@ -44,1455 +57,1442 @@
 import org.opensearch.client.opensearch._types.query_dsl.Operator;
 import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.opensearch.core.search.SourceConfigParam;
-import org.opensearch.client.json.JsonpDeserializable;
-import org.opensearch.client.json.JsonpDeserializer;
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
-import org.opensearch.client.json.ObjectBuilderDeserializer;
-import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: _global.update_by_query.Request
 
 /**
  * Performs an update on every document in the index without changing the
  * source, for example to pick up a mapping change.
- * 
+ *
  */
 @JsonpDeserializable
 public class UpdateByQueryRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final SourceConfigParam source;
+    @Nullable
+    private final SourceConfigParam source;
 
-	private final List<String> sourceExcludes;
+    private final List<String> sourceExcludes;
 
-	private final List<String> sourceIncludes;
+    private final List<String> sourceIncludes;
 
-	@Nullable
-	private final Boolean allowNoIndices;
+    @Nullable
+    private final Boolean allowNoIndices;
 
-	@Nullable
-	private final Boolean analyzeWildcard;
+    @Nullable
+    private final Boolean analyzeWildcard;
 
-	@Nullable
-	private final String analyzer;
+    @Nullable
+    private final String analyzer;
 
-	@Nullable
-	private final Conflicts conflicts;
+    @Nullable
+    private final Conflicts conflicts;
 
-	@Nullable
-	private final Operator defaultOperator;
+    @Nullable
+    private final Operator defaultOperator;
 
-	@Nullable
-	private final String df;
+    @Nullable
+    private final String df;
 
-	private final List<ExpandWildcard> expandWildcards;
+    private final List<ExpandWildcard> expandWildcards;
 
-	@Nullable
-	private final Long from;
+    @Nullable
+    private final Long from;
 
-	@Nullable
-	private final Boolean ignoreUnavailable;
+    @Nullable
+    private final Boolean ignoreUnavailable;
 
-	private final List<String> index;
+    private final List<String> index;
 
-	@Nullable
-	private final Boolean lenient;
+    @Nullable
+    private final Boolean lenient;
 
-	@Nullable
-	private final Long maxDocs;
+    @Nullable
+    private final Long maxDocs;
 
-	@Nullable
-	private final String pipeline;
+    @Nullable
+    private final String pipeline;
 
-	@Nullable
-	private final String preference;
+    @Nullable
+    private final String preference;
 
-	@Nullable
-	private final Query query;
+    @Nullable
+    private final Query query;
 
-	@Nullable
-	private final Boolean refresh;
+    @Nullable
+    private final Boolean refresh;
 
-	@Nullable
-	private final Boolean requestCache;
+    @Nullable
+    private final Boolean requestCache;
 
-	@Nullable
-	private final Long requestsPerSecond;
+    @Nullable
+    private final Long requestsPerSecond;
 
-	@Nullable
-	private final String routing;
+    @Nullable
+    private final String routing;
 
-	@Nullable
-	private final Script script;
+    @Nullable
+    private final Script script;
 
-	@Nullable
-	private final Time scroll;
+    @Nullable
+    private final Time scroll;
 
-	@Nullable
-	private final Long scrollSize;
+    @Nullable
+    private final Long scrollSize;
 
-	@Nullable
-	private final Time searchTimeout;
+    @Nullable
+    private final Time searchTimeout;
 
-	@Nullable
-	private final SearchType searchType;
+    @Nullable
+    private final SearchType searchType;
 
-	@Nullable
-	private final Long size;
+    @Nullable
+    private final Long size;
 
-	@Nullable
-	private final SlicedScroll slice;
+    @Nullable
+    private final SlicedScroll slice;
 
-	@Nullable
-	private final Long slices;
+    @Nullable
+    private final Long slices;
 
-	private final List<String> sort;
-
-	private final List<String> stats;
-
-	@Nullable
-	private final Long terminateAfter;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final Boolean version;
-
-	@Nullable
-	private final Boolean versionType;
-
-	@Nullable
-	private final WaitForActiveShards waitForActiveShards;
-
-	@Nullable
-	private final Boolean waitForCompletion;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private UpdateByQueryRequest(Builder builder) {
-
-		this.source = builder.source;
-		this.sourceExcludes = ApiTypeHelper.unmodifiable(builder.sourceExcludes);
-		this.sourceIncludes = ApiTypeHelper.unmodifiable(builder.sourceIncludes);
-		this.allowNoIndices = builder.allowNoIndices;
-		this.analyzeWildcard = builder.analyzeWildcard;
-		this.analyzer = builder.analyzer;
-		this.conflicts = builder.conflicts;
-		this.defaultOperator = builder.defaultOperator;
-		this.df = builder.df;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.from = builder.from;
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
-		this.lenient = builder.lenient;
-		this.maxDocs = builder.maxDocs;
-		this.pipeline = builder.pipeline;
-		this.preference = builder.preference;
-		this.query = builder.query;
-		this.refresh = builder.refresh;
-		this.requestCache = builder.requestCache;
-		this.requestsPerSecond = builder.requestsPerSecond;
-		this.routing = builder.routing;
-		this.script = builder.script;
-		this.scroll = builder.scroll;
-		this.scrollSize = builder.scrollSize;
-		this.searchTimeout = builder.searchTimeout;
-		this.searchType = builder.searchType;
-		this.size = builder.size;
-		this.slice = builder.slice;
-		this.slices = builder.slices;
-		this.sort = ApiTypeHelper.unmodifiable(builder.sort);
-		this.stats = ApiTypeHelper.unmodifiable(builder.stats);
-		this.terminateAfter = builder.terminateAfter;
-		this.timeout = builder.timeout;
-		this.version = builder.version;
-		this.versionType = builder.versionType;
-		this.waitForActiveShards = builder.waitForActiveShards;
-		this.waitForCompletion = builder.waitForCompletion;
-
-	}
-
-	public static UpdateByQueryRequest of(Function<Builder, ObjectBuilder<UpdateByQueryRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * True or false to return the _source field or not, or a list of fields to
-	 * return
-	 * <p>
-	 * API name: {@code _source}
-	 */
-	@Nullable
-	public final SourceConfigParam source() {
-		return this.source;
-	}
-
-	/**
-	 * A list of fields to exclude from the returned _source field
-	 * <p>
-	 * API name: {@code _source_excludes}
-	 */
-	public final List<String> sourceExcludes() {
-		return this.sourceExcludes;
-	}
-
-	/**
-	 * A list of fields to extract and return from the _source field
-	 * <p>
-	 * API name: {@code _source_includes}
-	 */
-	public final List<String> sourceIncludes() {
-		return this.sourceIncludes;
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Specify whether wildcard and prefix queries should be analyzed (default:
-	 * false)
-	 * <p>
-	 * API name: {@code analyze_wildcard}
-	 */
-	@Nullable
-	public final Boolean analyzeWildcard() {
-		return this.analyzeWildcard;
-	}
-
-	/**
-	 * The analyzer to use for the query string
-	 * <p>
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * API name: {@code conflicts}
-	 */
-	@Nullable
-	public final Conflicts conflicts() {
-		return this.conflicts;
-	}
-
-	/**
-	 * The default operator for query string query (AND or OR)
-	 * <p>
-	 * API name: {@code default_operator}
-	 */
-	@Nullable
-	public final Operator defaultOperator() {
-		return this.defaultOperator;
-	}
-
-	/**
-	 * The field to use as default where no field prefix is given in the query
-	 * string
-	 * <p>
-	 * API name: {@code df}
-	 */
-	@Nullable
-	public final String df() {
-		return this.df;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Starting offset (default: 0)
-	 * <p>
-	 * API name: {@code from}
-	 */
-	@Nullable
-	public final Long from() {
-		return this.from;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * Required - A comma-separated list of index names to search; use
-	 * <code>_all</code> or empty string to perform the operation on all indices
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Specify whether format-based query failures (such as providing text to a
-	 * numeric field) should be ignored
-	 * <p>
-	 * API name: {@code lenient}
-	 */
-	@Nullable
-	public final Boolean lenient() {
-		return this.lenient;
-	}
-
-	/**
-	 * API name: {@code max_docs}
-	 */
-	@Nullable
-	public final Long maxDocs() {
-		return this.maxDocs;
-	}
-
-	/**
-	 * Ingest pipeline to set on index requests made by this action. (default: none)
-	 * <p>
-	 * API name: {@code pipeline}
-	 */
-	@Nullable
-	public final String pipeline() {
-		return this.pipeline;
-	}
-
-	/**
-	 * Specify the node or shard the operation should be performed on (default:
-	 * random)
-	 * <p>
-	 * API name: {@code preference}
-	 */
-	@Nullable
-	public final String preference() {
-		return this.preference;
-	}
-
-	/**
-	 * API name: {@code query}
-	 */
-	@Nullable
-	public final Query query() {
-		return this.query;
-	}
-
-	/**
-	 * Should the affected indexes be refreshed?
-	 * <p>
-	 * API name: {@code refresh}
-	 */
-	@Nullable
-	public final Boolean refresh() {
-		return this.refresh;
-	}
-
-	/**
-	 * Specify if request cache should be used for this request or not, defaults to
-	 * index level setting
-	 * <p>
-	 * API name: {@code request_cache}
-	 */
-	@Nullable
-	public final Boolean requestCache() {
-		return this.requestCache;
-	}
-
-	/**
-	 * The throttle to set on this request in sub-requests per second. -1 means no
-	 * throttle.
-	 * <p>
-	 * API name: {@code requests_per_second}
-	 */
-	@Nullable
-	public final Long requestsPerSecond() {
-		return this.requestsPerSecond;
-	}
-
-	/**
-	 * A comma-separated list of specific routing values
-	 * <p>
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final Script script() {
-		return this.script;
-	}
-
-	/**
-	 * Specify how long a consistent view of the index should be maintained for
-	 * scrolled search
-	 * <p>
-	 * API name: {@code scroll}
-	 */
-	@Nullable
-	public final Time scroll() {
-		return this.scroll;
-	}
-
-	/**
-	 * Size on the scroll request powering the update by query
-	 * <p>
-	 * API name: {@code scroll_size}
-	 */
-	@Nullable
-	public final Long scrollSize() {
-		return this.scrollSize;
-	}
-
-	/**
-	 * Explicit timeout for each search request. Defaults to no timeout.
-	 * <p>
-	 * API name: {@code search_timeout}
-	 */
-	@Nullable
-	public final Time searchTimeout() {
-		return this.searchTimeout;
-	}
-
-	/**
-	 * Search operation type
-	 * <p>
-	 * API name: {@code search_type}
-	 */
-	@Nullable
-	public final SearchType searchType() {
-		return this.searchType;
-	}
-
-	/**
-	 * Deprecated, please use <code>max_docs</code> instead
-	 * <p>
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Long size() {
-		return this.size;
-	}
-
-	/**
-	 * API name: {@code slice}
-	 */
-	@Nullable
-	public final SlicedScroll slice() {
-		return this.slice;
-	}
-
-	/**
-	 * The number of slices this task should be divided into. Defaults to 1, meaning
-	 * the task isn't sliced into subtasks. Can be set to 0 for <code>auto</code>.
-	 * <p>
-	 * API name: {@code slices}
-	 */
-	@Nullable
-	public final Long slices() {
-		return this.slices;
-	}
-
-	/**
-	 * A comma-separated list of &lt;field&gt;:&lt;direction&gt; pairs
-	 * <p>
-	 * API name: {@code sort}
-	 */
-	public final List<String> sort() {
-		return this.sort;
-	}
-
-	/**
-	 * Specific 'tag' of the request for logging and statistical purposes
-	 * <p>
-	 * API name: {@code stats}
-	 */
-	public final List<String> stats() {
-		return this.stats;
-	}
-
-	/**
-	 * The maximum number of documents to collect for each shard, upon reaching
-	 * which the query execution will terminate early.
-	 * <p>
-	 * API name: {@code terminate_after}
-	 */
-	@Nullable
-	public final Long terminateAfter() {
-		return this.terminateAfter;
-	}
-
-	/**
-	 * Time each individual bulk request should wait for shards that are
-	 * unavailable.
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Specify whether to return document version as part of a hit
-	 * <p>
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Boolean version() {
-		return this.version;
-	}
-
-	/**
-	 * Should the document increment the version number (internal) on hit or not
-	 * (reindex)
-	 * <p>
-	 * API name: {@code version_type}
-	 */
-	@Nullable
-	public final Boolean versionType() {
-		return this.versionType;
-	}
-
-	/**
-	 * Sets the number of shard copies that must be active before proceeding with
-	 * the update by query operation. Defaults to 1, meaning the primary shard only.
-	 * Set to <code>all</code> for all shard copies, otherwise set to any
-	 * non-negative value less than or equal to the total number of copies for the
-	 * shard (number of replicas + 1)
-	 * <p>
-	 * API name: {@code wait_for_active_shards}
-	 */
-	@Nullable
-	public final WaitForActiveShards waitForActiveShards() {
-		return this.waitForActiveShards;
-	}
-
-	/**
-	 * Should the request should block until the update by query operation is
-	 * complete.
-	 * <p>
-	 * API name: {@code wait_for_completion}
-	 */
-	@Nullable
-	public final Boolean waitForCompletion() {
-		return this.waitForCompletion;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.conflicts != null) {
-			generator.writeKey("conflicts");
-			this.conflicts.serialize(generator, mapper);
-		}
-		if (this.maxDocs != null) {
-			generator.writeKey("max_docs");
-			generator.write(this.maxDocs);
-
-		}
-		if (this.query != null) {
-			generator.writeKey("query");
-			this.query.serialize(generator, mapper);
-
-		}
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-		if (this.slice != null) {
-			generator.writeKey("slice");
-			this.slice.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UpdateByQueryRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<UpdateByQueryRequest> {
-		@Nullable
-		private SourceConfigParam source;
-
-		@Nullable
-		private List<String> sourceExcludes;
+    private final List<String> sort;
+
+    private final List<String> stats;
+
+    @Nullable
+    private final Long terminateAfter;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final Boolean version;
+
+    @Nullable
+    private final Boolean versionType;
+
+    @Nullable
+    private final WaitForActiveShards waitForActiveShards;
+
+    @Nullable
+    private final Boolean waitForCompletion;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private UpdateByQueryRequest(Builder builder) {
+
+        this.source = builder.source;
+        this.sourceExcludes = ApiTypeHelper.unmodifiable(builder.sourceExcludes);
+        this.sourceIncludes = ApiTypeHelper.unmodifiable(builder.sourceIncludes);
+        this.allowNoIndices = builder.allowNoIndices;
+        this.analyzeWildcard = builder.analyzeWildcard;
+        this.analyzer = builder.analyzer;
+        this.conflicts = builder.conflicts;
+        this.defaultOperator = builder.defaultOperator;
+        this.df = builder.df;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.from = builder.from;
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
+        this.lenient = builder.lenient;
+        this.maxDocs = builder.maxDocs;
+        this.pipeline = builder.pipeline;
+        this.preference = builder.preference;
+        this.query = builder.query;
+        this.refresh = builder.refresh;
+        this.requestCache = builder.requestCache;
+        this.requestsPerSecond = builder.requestsPerSecond;
+        this.routing = builder.routing;
+        this.script = builder.script;
+        this.scroll = builder.scroll;
+        this.scrollSize = builder.scrollSize;
+        this.searchTimeout = builder.searchTimeout;
+        this.searchType = builder.searchType;
+        this.size = builder.size;
+        this.slice = builder.slice;
+        this.slices = builder.slices;
+        this.sort = ApiTypeHelper.unmodifiable(builder.sort);
+        this.stats = ApiTypeHelper.unmodifiable(builder.stats);
+        this.terminateAfter = builder.terminateAfter;
+        this.timeout = builder.timeout;
+        this.version = builder.version;
+        this.versionType = builder.versionType;
+        this.waitForActiveShards = builder.waitForActiveShards;
+        this.waitForCompletion = builder.waitForCompletion;
+
+    }
+
+    public static UpdateByQueryRequest of(Function<Builder, ObjectBuilder<UpdateByQueryRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * True or false to return the _source field or not, or a list of fields to
+     * return
+     * <p>
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final SourceConfigParam source() {
+        return this.source;
+    }
+
+    /**
+     * A list of fields to exclude from the returned _source field
+     * <p>
+     * API name: {@code _source_excludes}
+     */
+    public final List<String> sourceExcludes() {
+        return this.sourceExcludes;
+    }
+
+    /**
+     * A list of fields to extract and return from the _source field
+     * <p>
+     * API name: {@code _source_includes}
+     */
+    public final List<String> sourceIncludes() {
+        return this.sourceIncludes;
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Specify whether wildcard and prefix queries should be analyzed (default:
+     * false)
+     * <p>
+     * API name: {@code analyze_wildcard}
+     */
+    @Nullable
+    public final Boolean analyzeWildcard() {
+        return this.analyzeWildcard;
+    }
+
+    /**
+     * The analyzer to use for the query string
+     * <p>
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * API name: {@code conflicts}
+     */
+    @Nullable
+    public final Conflicts conflicts() {
+        return this.conflicts;
+    }
+
+    /**
+     * The default operator for query string query (AND or OR)
+     * <p>
+     * API name: {@code default_operator}
+     */
+    @Nullable
+    public final Operator defaultOperator() {
+        return this.defaultOperator;
+    }
+
+    /**
+     * The field to use as default where no field prefix is given in the query
+     * string
+     * <p>
+     * API name: {@code df}
+     */
+    @Nullable
+    public final String df() {
+        return this.df;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Starting offset (default: 0)
+     * <p>
+     * API name: {@code from}
+     */
+    @Nullable
+    public final Long from() {
+        return this.from;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * Required - A comma-separated list of index names to search; use
+     * <code>_all</code> or empty string to perform the operation on all indices
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Specify whether format-based query failures (such as providing text to a
+     * numeric field) should be ignored
+     * <p>
+     * API name: {@code lenient}
+     */
+    @Nullable
+    public final Boolean lenient() {
+        return this.lenient;
+    }
+
+    /**
+     * API name: {@code max_docs}
+     */
+    @Nullable
+    public final Long maxDocs() {
+        return this.maxDocs;
+    }
+
+    /**
+     * Ingest pipeline to set on index requests made by this action. (default: none)
+     * <p>
+     * API name: {@code pipeline}
+     */
+    @Nullable
+    public final String pipeline() {
+        return this.pipeline;
+    }
+
+    /**
+     * Specify the node or shard the operation should be performed on (default:
+     * random)
+     * <p>
+     * API name: {@code preference}
+     */
+    @Nullable
+    public final String preference() {
+        return this.preference;
+    }
+
+    /**
+     * API name: {@code query}
+     */
+    @Nullable
+    public final Query query() {
+        return this.query;
+    }
+
+    /**
+     * Should the affected indexes be refreshed?
+     * <p>
+     * API name: {@code refresh}
+     */
+    @Nullable
+    public final Boolean refresh() {
+        return this.refresh;
+    }
+
+    /**
+     * Specify if request cache should be used for this request or not, defaults to
+     * index level setting
+     * <p>
+     * API name: {@code request_cache}
+     */
+    @Nullable
+    public final Boolean requestCache() {
+        return this.requestCache;
+    }
+
+    /**
+     * The throttle to set on this request in sub-requests per second. -1 means no
+     * throttle.
+     * <p>
+     * API name: {@code requests_per_second}
+     */
+    @Nullable
+    public final Long requestsPerSecond() {
+        return this.requestsPerSecond;
+    }
+
+    /**
+     * A comma-separated list of specific routing values
+     * <p>
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final Script script() {
+        return this.script;
+    }
+
+    /**
+     * Specify how long a consistent view of the index should be maintained for
+     * scrolled search
+     * <p>
+     * API name: {@code scroll}
+     */
+    @Nullable
+    public final Time scroll() {
+        return this.scroll;
+    }
+
+    /**
+     * Size on the scroll request powering the update by query
+     * <p>
+     * API name: {@code scroll_size}
+     */
+    @Nullable
+    public final Long scrollSize() {
+        return this.scrollSize;
+    }
+
+    /**
+     * Explicit timeout for each search request. Defaults to no timeout.
+     * <p>
+     * API name: {@code search_timeout}
+     */
+    @Nullable
+    public final Time searchTimeout() {
+        return this.searchTimeout;
+    }
+
+    /**
+     * Search operation type
+     * <p>
+     * API name: {@code search_type}
+     */
+    @Nullable
+    public final SearchType searchType() {
+        return this.searchType;
+    }
+
+    /**
+     * Deprecated, please use <code>max_docs</code> instead
+     * <p>
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Long size() {
+        return this.size;
+    }
+
+    /**
+     * API name: {@code slice}
+     */
+    @Nullable
+    public final SlicedScroll slice() {
+        return this.slice;
+    }
+
+    /**
+     * The number of slices this task should be divided into. Defaults to 1, meaning
+     * the task isn't sliced into subtasks. Can be set to 0 for <code>auto</code>.
+     * <p>
+     * API name: {@code slices}
+     */
+    @Nullable
+    public final Long slices() {
+        return this.slices;
+    }
+
+    /**
+     * A comma-separated list of &lt;field&gt;:&lt;direction&gt; pairs
+     * <p>
+     * API name: {@code sort}
+     */
+    public final List<String> sort() {
+        return this.sort;
+    }
+
+    /**
+     * Specific 'tag' of the request for logging and statistical purposes
+     * <p>
+     * API name: {@code stats}
+     */
+    public final List<String> stats() {
+        return this.stats;
+    }
+
+    /**
+     * The maximum number of documents to collect for each shard, upon reaching
+     * which the query execution will terminate early.
+     * <p>
+     * API name: {@code terminate_after}
+     */
+    @Nullable
+    public final Long terminateAfter() {
+        return this.terminateAfter;
+    }
+
+    /**
+     * Time each individual bulk request should wait for shards that are
+     * unavailable.
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Specify whether to return document version as part of a hit
+     * <p>
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Boolean version() {
+        return this.version;
+    }
+
+    /**
+     * Should the document increment the version number (internal) on hit or not
+     * (reindex)
+     * <p>
+     * API name: {@code version_type}
+     */
+    @Nullable
+    public final Boolean versionType() {
+        return this.versionType;
+    }
+
+    /**
+     * Sets the number of shard copies that must be active before proceeding with
+     * the update by query operation. Defaults to 1, meaning the primary shard only.
+     * Set to <code>all</code> for all shard copies, otherwise set to any
+     * non-negative value less than or equal to the total number of copies for the
+     * shard (number of replicas + 1)
+     * <p>
+     * API name: {@code wait_for_active_shards}
+     */
+    @Nullable
+    public final WaitForActiveShards waitForActiveShards() {
+        return this.waitForActiveShards;
+    }
+
+    /**
+     * Should the request should block until the update by query operation is
+     * complete.
+     * <p>
+     * API name: {@code wait_for_completion}
+     */
+    @Nullable
+    public final Boolean waitForCompletion() {
+        return this.waitForCompletion;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.conflicts != null) {
+            generator.writeKey("conflicts");
+            this.conflicts.serialize(generator, mapper);
+        }
+        if (this.maxDocs != null) {
+            generator.writeKey("max_docs");
+            generator.write(this.maxDocs);
+
+        }
+        if (this.query != null) {
+            generator.writeKey("query");
+            this.query.serialize(generator, mapper);
+
+        }
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+        if (this.slice != null) {
+            generator.writeKey("slice");
+            this.slice.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UpdateByQueryRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<UpdateByQueryRequest> {
+        @Nullable
+        private SourceConfigParam source;
+
+        @Nullable
+        private List<String> sourceExcludes;
 
-		@Nullable
-		private List<String> sourceIncludes;
+        @Nullable
+        private List<String> sourceIncludes;
 
-		@Nullable
-		private Boolean allowNoIndices;
+        @Nullable
+        private Boolean allowNoIndices;
 
-		@Nullable
-		private Boolean analyzeWildcard;
+        @Nullable
+        private Boolean analyzeWildcard;
 
-		@Nullable
-		private String analyzer;
+        @Nullable
+        private String analyzer;
 
-		@Nullable
-		private Conflicts conflicts;
+        @Nullable
+        private Conflicts conflicts;
 
-		@Nullable
-		private Operator defaultOperator;
+        @Nullable
+        private Operator defaultOperator;
 
-		@Nullable
-		private String df;
+        @Nullable
+        private String df;
 
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
 
-		@Nullable
-		private Long from;
+        @Nullable
+        private Long from;
 
-		@Nullable
-		private Boolean ignoreUnavailable;
+        @Nullable
+        private Boolean ignoreUnavailable;
 
-		private List<String> index;
+        private List<String> index;
 
-		@Nullable
-		private Boolean lenient;
+        @Nullable
+        private Boolean lenient;
 
-		@Nullable
-		private Long maxDocs;
+        @Nullable
+        private Long maxDocs;
 
-		@Nullable
-		private String pipeline;
+        @Nullable
+        private String pipeline;
 
-		@Nullable
-		private String preference;
+        @Nullable
+        private String preference;
 
-		@Nullable
-		private Query query;
+        @Nullable
+        private Query query;
 
-		@Nullable
-		private Boolean refresh;
+        @Nullable
+        private Boolean refresh;
 
-		@Nullable
-		private Boolean requestCache;
+        @Nullable
+        private Boolean requestCache;
 
-		@Nullable
-		private Long requestsPerSecond;
+        @Nullable
+        private Long requestsPerSecond;
 
-		@Nullable
-		private String routing;
+        @Nullable
+        private String routing;
 
-		@Nullable
-		private Script script;
+        @Nullable
+        private Script script;
 
-		@Nullable
-		private Time scroll;
+        @Nullable
+        private Time scroll;
 
-		@Nullable
-		private Long scrollSize;
+        @Nullable
+        private Long scrollSize;
 
-		@Nullable
-		private Time searchTimeout;
+        @Nullable
+        private Time searchTimeout;
 
-		@Nullable
-		private SearchType searchType;
-
-		@Nullable
-		private Long size;
+        @Nullable
+        private SearchType searchType;
+
+        @Nullable
+        private Long size;
 
-		@Nullable
-		private SlicedScroll slice;
-
-		@Nullable
-		private Long slices;
-
-		@Nullable
-		private List<String> sort;
-
-		@Nullable
-		private List<String> stats;
-
-		@Nullable
-		private Long terminateAfter;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private Boolean version;
-
-		@Nullable
-		private Boolean versionType;
-
-		@Nullable
-		private WaitForActiveShards waitForActiveShards;
-
-		@Nullable
-		private Boolean waitForCompletion;
-
-		/**
-		 * True or false to return the _source field or not, or a list of fields to
-		 * return
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(@Nullable SourceConfigParam value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * True or false to return the _source field or not, or a list of fields to
-		 * return
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(Function<SourceConfigParam.Builder, ObjectBuilder<SourceConfigParam>> fn) {
-			return this.source(fn.apply(new SourceConfigParam.Builder()).build());
-		}
-
-		/**
-		 * A list of fields to exclude from the returned _source field
-		 * <p>
-		 * API name: {@code _source_excludes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceExcludes</code>.
-		 */
-		public final Builder sourceExcludes(List<String> list) {
-			this.sourceExcludes = _listAddAll(this.sourceExcludes, list);
-			return this;
-		}
-
-		/**
-		 * A list of fields to exclude from the returned _source field
-		 * <p>
-		 * API name: {@code _source_excludes}
-		 * <p>
-		 * Adds one or more values to <code>sourceExcludes</code>.
-		 */
-		public final Builder sourceExcludes(String value, String... values) {
-			this.sourceExcludes = _listAdd(this.sourceExcludes, value, values);
-			return this;
-		}
-
-		/**
-		 * A list of fields to extract and return from the _source field
-		 * <p>
-		 * API name: {@code _source_includes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceIncludes</code>.
-		 */
-		public final Builder sourceIncludes(List<String> list) {
-			this.sourceIncludes = _listAddAll(this.sourceIncludes, list);
-			return this;
-		}
-
-		/**
-		 * A list of fields to extract and return from the _source field
-		 * <p>
-		 * API name: {@code _source_includes}
-		 * <p>
-		 * Adds one or more values to <code>sourceIncludes</code>.
-		 */
-		public final Builder sourceIncludes(String value, String... values) {
-			this.sourceIncludes = _listAdd(this.sourceIncludes, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Specify whether wildcard and prefix queries should be analyzed (default:
-		 * false)
-		 * <p>
-		 * API name: {@code analyze_wildcard}
-		 */
-		public final Builder analyzeWildcard(@Nullable Boolean value) {
-			this.analyzeWildcard = value;
-			return this;
-		}
-
-		/**
-		 * The analyzer to use for the query string
-		 * <p>
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code conflicts}
-		 */
-		public final Builder conflicts(@Nullable Conflicts value) {
-			this.conflicts = value;
-			return this;
-		}
-
-		/**
-		 * The default operator for query string query (AND or OR)
-		 * <p>
-		 * API name: {@code default_operator}
-		 */
-		public final Builder defaultOperator(@Nullable Operator value) {
-			this.defaultOperator = value;
-			return this;
-		}
-
-		/**
-		 * The field to use as default where no field prefix is given in the query
-		 * string
-		 * <p>
-		 * API name: {@code df}
-		 */
-		public final Builder df(@Nullable String value) {
-			this.df = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Starting offset (default: 0)
-		 * <p>
-		 * API name: {@code from}
-		 */
-		public final Builder from(@Nullable Long value) {
-			this.from = value;
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Required - A comma-separated list of index names to search; use
-		 * <code>_all</code> or empty string to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * Required - A comma-separated list of index names to search; use
-		 * <code>_all</code> or empty string to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Specify whether format-based query failures (such as providing text to a
-		 * numeric field) should be ignored
-		 * <p>
-		 * API name: {@code lenient}
-		 */
-		public final Builder lenient(@Nullable Boolean value) {
-			this.lenient = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_docs}
-		 */
-		public final Builder maxDocs(@Nullable Long value) {
-			this.maxDocs = value;
-			return this;
-		}
-
-		/**
-		 * Ingest pipeline to set on index requests made by this action. (default: none)
-		 * <p>
-		 * API name: {@code pipeline}
-		 */
-		public final Builder pipeline(@Nullable String value) {
-			this.pipeline = value;
-			return this;
-		}
-
-		/**
-		 * Specify the node or shard the operation should be performed on (default:
-		 * random)
-		 * <p>
-		 * API name: {@code preference}
-		 */
-		public final Builder preference(@Nullable String value) {
-			this.preference = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code query}
-		 */
-		public final Builder query(@Nullable Query value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code query}
-		 */
-		public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.query(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * Should the affected indexes be refreshed?
-		 * <p>
-		 * API name: {@code refresh}
-		 */
-		public final Builder refresh(@Nullable Boolean value) {
-			this.refresh = value;
-			return this;
-		}
-
-		/**
-		 * Specify if request cache should be used for this request or not, defaults to
-		 * index level setting
-		 * <p>
-		 * API name: {@code request_cache}
-		 */
-		public final Builder requestCache(@Nullable Boolean value) {
-			this.requestCache = value;
-			return this;
-		}
-
-		/**
-		 * The throttle to set on this request in sub-requests per second. -1 means no
-		 * throttle.
-		 * <p>
-		 * API name: {@code requests_per_second}
-		 */
-		public final Builder requestsPerSecond(@Nullable Long value) {
-			this.requestsPerSecond = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of specific routing values
-		 * <p>
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(@Nullable Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		/**
-		 * Specify how long a consistent view of the index should be maintained for
-		 * scrolled search
-		 * <p>
-		 * API name: {@code scroll}
-		 */
-		public final Builder scroll(@Nullable Time value) {
-			this.scroll = value;
-			return this;
-		}
-
-		/**
-		 * Specify how long a consistent view of the index should be maintained for
-		 * scrolled search
-		 * <p>
-		 * API name: {@code scroll}
-		 */
-		public final Builder scroll(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.scroll(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Size on the scroll request powering the update by query
-		 * <p>
-		 * API name: {@code scroll_size}
-		 */
-		public final Builder scrollSize(@Nullable Long value) {
-			this.scrollSize = value;
-			return this;
-		}
-
-		/**
-		 * Explicit timeout for each search request. Defaults to no timeout.
-		 * <p>
-		 * API name: {@code search_timeout}
-		 */
-		public final Builder searchTimeout(@Nullable Time value) {
-			this.searchTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit timeout for each search request. Defaults to no timeout.
-		 * <p>
-		 * API name: {@code search_timeout}
-		 */
-		public final Builder searchTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.searchTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Search operation type
-		 * <p>
-		 * API name: {@code search_type}
-		 */
-		public final Builder searchType(@Nullable SearchType value) {
-			this.searchType = value;
-			return this;
-		}
-
-		/**
-		 * Deprecated, please use <code>max_docs</code> instead
-		 * <p>
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Long value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code slice}
-		 */
-		public final Builder slice(@Nullable SlicedScroll value) {
-			this.slice = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code slice}
-		 */
-		public final Builder slice(Function<SlicedScroll.Builder, ObjectBuilder<SlicedScroll>> fn) {
-			return this.slice(fn.apply(new SlicedScroll.Builder()).build());
-		}
-
-		/**
-		 * The number of slices this task should be divided into. Defaults to 1, meaning
-		 * the task isn't sliced into subtasks. Can be set to 0 for <code>auto</code>.
-		 * <p>
-		 * API name: {@code slices}
-		 */
-		public final Builder slices(@Nullable Long value) {
-			this.slices = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of &lt;field&gt;:&lt;direction&gt; pairs
-		 * <p>
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sort</code>.
-		 */
-		public final Builder sort(List<String> list) {
-			this.sort = _listAddAll(this.sort, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of &lt;field&gt;:&lt;direction&gt; pairs
-		 * <p>
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds one or more values to <code>sort</code>.
-		 */
-		public final Builder sort(String value, String... values) {
-			this.sort = _listAdd(this.sort, value, values);
-			return this;
-		}
-
-		/**
-		 * Specific 'tag' of the request for logging and statistical purposes
-		 * <p>
-		 * API name: {@code stats}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>stats</code>.
-		 */
-		public final Builder stats(List<String> list) {
-			this.stats = _listAddAll(this.stats, list);
-			return this;
-		}
-
-		/**
-		 * Specific 'tag' of the request for logging and statistical purposes
-		 * <p>
-		 * API name: {@code stats}
-		 * <p>
-		 * Adds one or more values to <code>stats</code>.
-		 */
-		public final Builder stats(String value, String... values) {
-			this.stats = _listAdd(this.stats, value, values);
-			return this;
-		}
-
-		/**
-		 * The maximum number of documents to collect for each shard, upon reaching
-		 * which the query execution will terminate early.
-		 * <p>
-		 * API name: {@code terminate_after}
-		 */
-		public final Builder terminateAfter(@Nullable Long value) {
-			this.terminateAfter = value;
-			return this;
-		}
-
-		/**
-		 * Time each individual bulk request should wait for shards that are
-		 * unavailable.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Time each individual bulk request should wait for shards that are
-		 * unavailable.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify whether to return document version as part of a hit
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Boolean value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Should the document increment the version number (internal) on hit or not
-		 * (reindex)
-		 * <p>
-		 * API name: {@code version_type}
-		 */
-		public final Builder versionType(@Nullable Boolean value) {
-			this.versionType = value;
-			return this;
-		}
-
-		/**
-		 * Sets the number of shard copies that must be active before proceeding with
-		 * the update by query operation. Defaults to 1, meaning the primary shard only.
-		 * Set to <code>all</code> for all shard copies, otherwise set to any
-		 * non-negative value less than or equal to the total number of copies for the
-		 * shard (number of replicas + 1)
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
-			this.waitForActiveShards = value;
-			return this;
-		}
-
-		/**
-		 * Sets the number of shard copies that must be active before proceeding with
-		 * the update by query operation. Defaults to 1, meaning the primary shard only.
-		 * Set to <code>all</code> for all shard copies, otherwise set to any
-		 * non-negative value less than or equal to the total number of copies for the
-		 * shard (number of replicas + 1)
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(
-				Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
-			return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
-		}
-
-		/**
-		 * Should the request should block until the update by query operation is
-		 * complete.
-		 * <p>
-		 * API name: {@code wait_for_completion}
-		 */
-		public final Builder waitForCompletion(@Nullable Boolean value) {
-			this.waitForCompletion = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link UpdateByQueryRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UpdateByQueryRequest build() {
-			_checkSingleUse();
-
-			return new UpdateByQueryRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link UpdateByQueryRequest}
-	 */
-	public static final JsonpDeserializer<UpdateByQueryRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, UpdateByQueryRequest::setupUpdateByQueryRequestDeserializer);
-
-	protected static void setupUpdateByQueryRequestDeserializer(ObjectDeserializer<UpdateByQueryRequest.Builder> op) {
-
-		op.add(Builder::conflicts, Conflicts._DESERIALIZER, "conflicts");
-		op.add(Builder::maxDocs, JsonpDeserializer.longDeserializer(), "max_docs");
-		op.add(Builder::query, Query._DESERIALIZER, "query");
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-		op.add(Builder::slice, SlicedScroll._DESERIALIZER, "slice");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code update_by_query}".
-	 */
-	public static final Endpoint<UpdateByQueryRequest, UpdateByQueryResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_update_by_query");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.slices != null) {
-					params.put("slices", request.slices == 0 ? "auto" : String.valueOf(request.slices));
-				}
-				if (request.df != null) {
-					params.put("df", request.df);
-				}
-				if (request.terminateAfter != null) {
-					params.put("terminate_after", String.valueOf(request.terminateAfter));
-				}
-				if (request.waitForCompletion != null) {
-					params.put("wait_for_completion", String.valueOf(request.waitForCompletion));
-				}
-				if (request.lenient != null) {
-					params.put("lenient", String.valueOf(request.lenient));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				if (request.routing != null) {
-					params.put("routing", request.routing);
-				}
-				if (request.requestsPerSecond != null) {
-					params.put("requests_per_second", String.valueOf(request.requestsPerSecond));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (ApiTypeHelper.isDefined(request.stats)) {
-					params.put("stats", request.stats.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.analyzer != null) {
-					params.put("analyzer", request.analyzer);
-				}
-				if (request.from != null) {
-					params.put("from", String.valueOf(request.from));
-				}
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.versionType != null) {
-					params.put("version_type", String.valueOf(request.versionType));
-				}
-				if (request.preference != null) {
-					params.put("preference", request.preference);
-				}
-				if (request.searchTimeout != null) {
-					params.put("search_timeout", request.searchTimeout._toJsonString());
-				}
-				if (request.analyzeWildcard != null) {
-					params.put("analyze_wildcard", String.valueOf(request.analyzeWildcard));
-				}
-				if (request.scroll != null) {
-					params.put("scroll", request.scroll._toJsonString());
-				}
-				if (request.scrollSize != null) {
-					params.put("scroll_size", String.valueOf(request.scrollSize));
-				}
-				if (request.refresh != null) {
-					params.put("refresh", String.valueOf(request.refresh));
-				}
-				if (ApiTypeHelper.isDefined(request.sort)) {
-					params.put("sort", request.sort.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.searchType != null) {
-					params.put("search_type", request.searchType.jsonValue());
-				}
-				if (request.version != null) {
-					params.put("version", String.valueOf(request.version));
-				}
-				if (request.pipeline != null) {
-					params.put("pipeline", request.pipeline);
-				}
-				if (request.defaultOperator != null) {
-					params.put("default_operator", request.defaultOperator.jsonValue());
-				}
-				if (request.size != null) {
-					params.put("size", String.valueOf(request.size));
-				}
-				if (request.waitForActiveShards != null) {
-					params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
-				}
-				if (request.source != null) {
-					params.put("_source", request.source._toJsonString());
-				}
-				if (ApiTypeHelper.isDefined(request.sourceExcludes)) {
-					params.put("_source_excludes",
-							request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.requestCache != null) {
-					params.put("request_cache", String.valueOf(request.requestCache));
-				}
-				if (ApiTypeHelper.isDefined(request.sourceIncludes)) {
-					params.put("_source_includes",
-							request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, UpdateByQueryResponse._DESERIALIZER);
+        @Nullable
+        private SlicedScroll slice;
+
+        @Nullable
+        private Long slices;
+
+        @Nullable
+        private List<String> sort;
+
+        @Nullable
+        private List<String> stats;
+
+        @Nullable
+        private Long terminateAfter;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private Boolean version;
+
+        @Nullable
+        private Boolean versionType;
+
+        @Nullable
+        private WaitForActiveShards waitForActiveShards;
+
+        @Nullable
+        private Boolean waitForCompletion;
+
+        /**
+         * True or false to return the _source field or not, or a list of fields to
+         * return
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(@Nullable SourceConfigParam value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * True or false to return the _source field or not, or a list of fields to
+         * return
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(Function<SourceConfigParam.Builder, ObjectBuilder<SourceConfigParam>> fn) {
+            return this.source(fn.apply(new SourceConfigParam.Builder()).build());
+        }
+
+        /**
+         * A list of fields to exclude from the returned _source field
+         * <p>
+         * API name: {@code _source_excludes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceExcludes</code>.
+         */
+        public final Builder sourceExcludes(List<String> list) {
+            this.sourceExcludes = _listAddAll(this.sourceExcludes, list);
+            return this;
+        }
+
+        /**
+         * A list of fields to exclude from the returned _source field
+         * <p>
+         * API name: {@code _source_excludes}
+         * <p>
+         * Adds one or more values to <code>sourceExcludes</code>.
+         */
+        public final Builder sourceExcludes(String value, String... values) {
+            this.sourceExcludes = _listAdd(this.sourceExcludes, value, values);
+            return this;
+        }
+
+        /**
+         * A list of fields to extract and return from the _source field
+         * <p>
+         * API name: {@code _source_includes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceIncludes</code>.
+         */
+        public final Builder sourceIncludes(List<String> list) {
+            this.sourceIncludes = _listAddAll(this.sourceIncludes, list);
+            return this;
+        }
+
+        /**
+         * A list of fields to extract and return from the _source field
+         * <p>
+         * API name: {@code _source_includes}
+         * <p>
+         * Adds one or more values to <code>sourceIncludes</code>.
+         */
+        public final Builder sourceIncludes(String value, String... values) {
+            this.sourceIncludes = _listAdd(this.sourceIncludes, value, values);
+            return this;
+        }
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Specify whether wildcard and prefix queries should be analyzed (default:
+         * false)
+         * <p>
+         * API name: {@code analyze_wildcard}
+         */
+        public final Builder analyzeWildcard(@Nullable Boolean value) {
+            this.analyzeWildcard = value;
+            return this;
+        }
+
+        /**
+         * The analyzer to use for the query string
+         * <p>
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code conflicts}
+         */
+        public final Builder conflicts(@Nullable Conflicts value) {
+            this.conflicts = value;
+            return this;
+        }
+
+        /**
+         * The default operator for query string query (AND or OR)
+         * <p>
+         * API name: {@code default_operator}
+         */
+        public final Builder defaultOperator(@Nullable Operator value) {
+            this.defaultOperator = value;
+            return this;
+        }
+
+        /**
+         * The field to use as default where no field prefix is given in the query
+         * string
+         * <p>
+         * API name: {@code df}
+         */
+        public final Builder df(@Nullable String value) {
+            this.df = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Starting offset (default: 0)
+         * <p>
+         * API name: {@code from}
+         */
+        public final Builder from(@Nullable Long value) {
+            this.from = value;
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Required - A comma-separated list of index names to search; use
+         * <code>_all</code> or empty string to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * Required - A comma-separated list of index names to search; use
+         * <code>_all</code> or empty string to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Specify whether format-based query failures (such as providing text to a
+         * numeric field) should be ignored
+         * <p>
+         * API name: {@code lenient}
+         */
+        public final Builder lenient(@Nullable Boolean value) {
+            this.lenient = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_docs}
+         */
+        public final Builder maxDocs(@Nullable Long value) {
+            this.maxDocs = value;
+            return this;
+        }
+
+        /**
+         * Ingest pipeline to set on index requests made by this action. (default: none)
+         * <p>
+         * API name: {@code pipeline}
+         */
+        public final Builder pipeline(@Nullable String value) {
+            this.pipeline = value;
+            return this;
+        }
+
+        /**
+         * Specify the node or shard the operation should be performed on (default:
+         * random)
+         * <p>
+         * API name: {@code preference}
+         */
+        public final Builder preference(@Nullable String value) {
+            this.preference = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code query}
+         */
+        public final Builder query(@Nullable Query value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code query}
+         */
+        public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.query(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * Should the affected indexes be refreshed?
+         * <p>
+         * API name: {@code refresh}
+         */
+        public final Builder refresh(@Nullable Boolean value) {
+            this.refresh = value;
+            return this;
+        }
+
+        /**
+         * Specify if request cache should be used for this request or not, defaults to
+         * index level setting
+         * <p>
+         * API name: {@code request_cache}
+         */
+        public final Builder requestCache(@Nullable Boolean value) {
+            this.requestCache = value;
+            return this;
+        }
+
+        /**
+         * The throttle to set on this request in sub-requests per second. -1 means no
+         * throttle.
+         * <p>
+         * API name: {@code requests_per_second}
+         */
+        public final Builder requestsPerSecond(@Nullable Long value) {
+            this.requestsPerSecond = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of specific routing values
+         * <p>
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(@Nullable Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * Specify how long a consistent view of the index should be maintained for
+         * scrolled search
+         * <p>
+         * API name: {@code scroll}
+         */
+        public final Builder scroll(@Nullable Time value) {
+            this.scroll = value;
+            return this;
+        }
+
+        /**
+         * Specify how long a consistent view of the index should be maintained for
+         * scrolled search
+         * <p>
+         * API name: {@code scroll}
+         */
+        public final Builder scroll(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.scroll(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Size on the scroll request powering the update by query
+         * <p>
+         * API name: {@code scroll_size}
+         */
+        public final Builder scrollSize(@Nullable Long value) {
+            this.scrollSize = value;
+            return this;
+        }
+
+        /**
+         * Explicit timeout for each search request. Defaults to no timeout.
+         * <p>
+         * API name: {@code search_timeout}
+         */
+        public final Builder searchTimeout(@Nullable Time value) {
+            this.searchTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit timeout for each search request. Defaults to no timeout.
+         * <p>
+         * API name: {@code search_timeout}
+         */
+        public final Builder searchTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.searchTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Search operation type
+         * <p>
+         * API name: {@code search_type}
+         */
+        public final Builder searchType(@Nullable SearchType value) {
+            this.searchType = value;
+            return this;
+        }
+
+        /**
+         * Deprecated, please use <code>max_docs</code> instead
+         * <p>
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Long value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code slice}
+         */
+        public final Builder slice(@Nullable SlicedScroll value) {
+            this.slice = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code slice}
+         */
+        public final Builder slice(Function<SlicedScroll.Builder, ObjectBuilder<SlicedScroll>> fn) {
+            return this.slice(fn.apply(new SlicedScroll.Builder()).build());
+        }
+
+        /**
+         * The number of slices this task should be divided into. Defaults to 1, meaning
+         * the task isn't sliced into subtasks. Can be set to 0 for <code>auto</code>.
+         * <p>
+         * API name: {@code slices}
+         */
+        public final Builder slices(@Nullable Long value) {
+            this.slices = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of &lt;field&gt;:&lt;direction&gt; pairs
+         * <p>
+         * API name: {@code sort}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sort</code>.
+         */
+        public final Builder sort(List<String> list) {
+            this.sort = _listAddAll(this.sort, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of &lt;field&gt;:&lt;direction&gt; pairs
+         * <p>
+         * API name: {@code sort}
+         * <p>
+         * Adds one or more values to <code>sort</code>.
+         */
+        public final Builder sort(String value, String... values) {
+            this.sort = _listAdd(this.sort, value, values);
+            return this;
+        }
+
+        /**
+         * Specific 'tag' of the request for logging and statistical purposes
+         * <p>
+         * API name: {@code stats}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>stats</code>.
+         */
+        public final Builder stats(List<String> list) {
+            this.stats = _listAddAll(this.stats, list);
+            return this;
+        }
+
+        /**
+         * Specific 'tag' of the request for logging and statistical purposes
+         * <p>
+         * API name: {@code stats}
+         * <p>
+         * Adds one or more values to <code>stats</code>.
+         */
+        public final Builder stats(String value, String... values) {
+            this.stats = _listAdd(this.stats, value, values);
+            return this;
+        }
+
+        /**
+         * The maximum number of documents to collect for each shard, upon reaching
+         * which the query execution will terminate early.
+         * <p>
+         * API name: {@code terminate_after}
+         */
+        public final Builder terminateAfter(@Nullable Long value) {
+            this.terminateAfter = value;
+            return this;
+        }
+
+        /**
+         * Time each individual bulk request should wait for shards that are
+         * unavailable.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Time each individual bulk request should wait for shards that are
+         * unavailable.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify whether to return document version as part of a hit
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Boolean value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Should the document increment the version number (internal) on hit or not
+         * (reindex)
+         * <p>
+         * API name: {@code version_type}
+         */
+        public final Builder versionType(@Nullable Boolean value) {
+            this.versionType = value;
+            return this;
+        }
+
+        /**
+         * Sets the number of shard copies that must be active before proceeding with
+         * the update by query operation. Defaults to 1, meaning the primary shard only.
+         * Set to <code>all</code> for all shard copies, otherwise set to any
+         * non-negative value less than or equal to the total number of copies for the
+         * shard (number of replicas + 1)
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
+            this.waitForActiveShards = value;
+            return this;
+        }
+
+        /**
+         * Sets the number of shard copies that must be active before proceeding with
+         * the update by query operation. Defaults to 1, meaning the primary shard only.
+         * Set to <code>all</code> for all shard copies, otherwise set to any
+         * non-negative value less than or equal to the total number of copies for the
+         * shard (number of replicas + 1)
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
+            return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
+        }
+
+        /**
+         * Should the request should block until the update by query operation is
+         * complete.
+         * <p>
+         * API name: {@code wait_for_completion}
+         */
+        public final Builder waitForCompletion(@Nullable Boolean value) {
+            this.waitForCompletion = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link UpdateByQueryRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UpdateByQueryRequest build() {
+            _checkSingleUse();
+
+            return new UpdateByQueryRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link UpdateByQueryRequest}
+     */
+    public static final JsonpDeserializer<UpdateByQueryRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        UpdateByQueryRequest::setupUpdateByQueryRequestDeserializer
+    );
+
+    protected static void setupUpdateByQueryRequestDeserializer(ObjectDeserializer<UpdateByQueryRequest.Builder> op) {
+
+        op.add(Builder::conflicts, Conflicts._DESERIALIZER, "conflicts");
+        op.add(Builder::maxDocs, JsonpDeserializer.longDeserializer(), "max_docs");
+        op.add(Builder::query, Query._DESERIALIZER, "query");
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+        op.add(Builder::slice, SlicedScroll._DESERIALIZER, "slice");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code update_by_query}".
+     */
+    public static final Endpoint<UpdateByQueryRequest, UpdateByQueryResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_update_by_query");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.slices != null) {
+                params.put("slices", request.slices == 0 ? "auto" : String.valueOf(request.slices));
+            }
+            if (request.df != null) {
+                params.put("df", request.df);
+            }
+            if (request.terminateAfter != null) {
+                params.put("terminate_after", String.valueOf(request.terminateAfter));
+            }
+            if (request.waitForCompletion != null) {
+                params.put("wait_for_completion", String.valueOf(request.waitForCompletion));
+            }
+            if (request.lenient != null) {
+                params.put("lenient", String.valueOf(request.lenient));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            if (request.requestsPerSecond != null) {
+                params.put("requests_per_second", String.valueOf(request.requestsPerSecond));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (ApiTypeHelper.isDefined(request.stats)) {
+                params.put("stats", request.stats.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.analyzer != null) {
+                params.put("analyzer", request.analyzer);
+            }
+            if (request.from != null) {
+                params.put("from", String.valueOf(request.from));
+            }
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.versionType != null) {
+                params.put("version_type", String.valueOf(request.versionType));
+            }
+            if (request.preference != null) {
+                params.put("preference", request.preference);
+            }
+            if (request.searchTimeout != null) {
+                params.put("search_timeout", request.searchTimeout._toJsonString());
+            }
+            if (request.analyzeWildcard != null) {
+                params.put("analyze_wildcard", String.valueOf(request.analyzeWildcard));
+            }
+            if (request.scroll != null) {
+                params.put("scroll", request.scroll._toJsonString());
+            }
+            if (request.scrollSize != null) {
+                params.put("scroll_size", String.valueOf(request.scrollSize));
+            }
+            if (request.refresh != null) {
+                params.put("refresh", String.valueOf(request.refresh));
+            }
+            if (ApiTypeHelper.isDefined(request.sort)) {
+                params.put("sort", request.sort.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.searchType != null) {
+                params.put("search_type", request.searchType.jsonValue());
+            }
+            if (request.version != null) {
+                params.put("version", String.valueOf(request.version));
+            }
+            if (request.pipeline != null) {
+                params.put("pipeline", request.pipeline);
+            }
+            if (request.defaultOperator != null) {
+                params.put("default_operator", request.defaultOperator.jsonValue());
+            }
+            if (request.size != null) {
+                params.put("size", String.valueOf(request.size));
+            }
+            if (request.waitForActiveShards != null) {
+                params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
+            }
+            if (request.source != null) {
+                params.put("_source", request.source._toJsonString());
+            }
+            if (ApiTypeHelper.isDefined(request.sourceExcludes)) {
+                params.put("_source_excludes", request.sourceExcludes.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.requestCache != null) {
+                params.put("request_cache", String.valueOf(request.requestCache));
+            }
+            if (ApiTypeHelper.isDefined(request.sourceIncludes)) {
+                params.put("_source_includes", request.sourceIncludes.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        UpdateByQueryResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateByQueryResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateByQueryResponse.java
index a5abe88b7c..821bed0b73 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateByQueryResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateByQueryResponse.java
@@ -32,522 +32,521 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.BulkIndexByScrollFailure;
-import org.opensearch.client.opensearch._types.Retries;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.BulkIndexByScrollFailure;
+import org.opensearch.client.opensearch._types.Retries;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.update_by_query.Response
 
 @JsonpDeserializable
 public class UpdateByQueryResponse implements JsonpSerializable {
-	@Nullable
-	private final Long batches;
-
-	private final List<BulkIndexByScrollFailure> failures;
-
-	@Nullable
-	private final Long noops;
-
-	@Nullable
-	private final Long deleted;
-
-	@Nullable
-	private final Float requestsPerSecond;
-
-	@Nullable
-	private final Retries retries;
-
-	@Nullable
-	private final String task;
-
-	@Nullable
-	private final Boolean timedOut;
-
-	@Nullable
-	private final Long took;
-
-	@Nullable
-	private final Long total;
-
-	@Nullable
-	private final Long updated;
-
-	@Nullable
-	private final Long versionConflicts;
-
-	@Nullable
-	private final Number throttledMillis;
-
-	@Nullable
-	private final Number throttledUntilMillis;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private UpdateByQueryResponse(Builder builder) {
-
-		this.batches = builder.batches;
-		this.failures = ApiTypeHelper.unmodifiable(builder.failures);
-		this.noops = builder.noops;
-		this.deleted = builder.deleted;
-		this.requestsPerSecond = builder.requestsPerSecond;
-		this.retries = builder.retries;
-		this.task = builder.task;
-		this.timedOut = builder.timedOut;
-		this.took = builder.took;
-		this.total = builder.total;
-		this.updated = builder.updated;
-		this.versionConflicts = builder.versionConflicts;
-		this.throttledMillis = builder.throttledMillis;
-		this.throttledUntilMillis = builder.throttledUntilMillis;
-
-	}
-
-	public static UpdateByQueryResponse of(Function<Builder, ObjectBuilder<UpdateByQueryResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code batches}
-	 */
-	@Nullable
-	public final Long batches() {
-		return this.batches;
-	}
-
-	/**
-	 * API name: {@code failures}
-	 */
-	public final List<BulkIndexByScrollFailure> failures() {
-		return this.failures;
-	}
-
-	/**
-	 * API name: {@code noops}
-	 */
-	@Nullable
-	public final Long noops() {
-		return this.noops;
-	}
-
-	/**
-	 * API name: {@code deleted}
-	 */
-	@Nullable
-	public final Long deleted() {
-		return this.deleted;
-	}
-
-	/**
-	 * API name: {@code requests_per_second}
-	 */
-	@Nullable
-	public final Float requestsPerSecond() {
-		return this.requestsPerSecond;
-	}
-
-	/**
-	 * API name: {@code retries}
-	 */
-	@Nullable
-	public final Retries retries() {
-		return this.retries;
-	}
-
-	/**
-	 * API name: {@code task}
-	 */
-	@Nullable
-	public final String task() {
-		return this.task;
-	}
-
-	/**
-	 * API name: {@code timed_out}
-	 */
-	@Nullable
-	public final Boolean timedOut() {
-		return this.timedOut;
-	}
-
-	/**
-	 * API name: {@code took}
-	 */
-	@Nullable
-	public final Long took() {
-		return this.took;
-	}
-
-	/**
-	 * API name: {@code total}
-	 */
-	@Nullable
-	public final Long total() {
-		return this.total;
-	}
-
-	/**
-	 * API name: {@code updated}
-	 */
-	@Nullable
-	public final Long updated() {
-		return this.updated;
-	}
-
-	/**
-	 * API name: {@code version_conflicts}
-	 */
-	@Nullable
-	public final Long versionConflicts() {
-		return this.versionConflicts;
-	}
-
-	/**
-	 * API name: {@code throttled_millis}
-	 */
-	@Nullable
-	public final Number throttledMillis() {
-		return this.throttledMillis;
-	}
-
-	/**
-	 * API name: {@code throttled_until_millis}
-	 */
-	@Nullable
-	public final Number throttledUntilMillis() {
-		return this.throttledUntilMillis;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.batches != null) {
-			generator.writeKey("batches");
-			generator.write(this.batches);
-
-		}
-		if (ApiTypeHelper.isDefined(this.failures)) {
-			generator.writeKey("failures");
-			generator.writeStartArray();
-			for (BulkIndexByScrollFailure item0 : this.failures) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.noops != null) {
-			generator.writeKey("noops");
-			generator.write(this.noops);
-
-		}
-		if (this.deleted != null) {
-			generator.writeKey("deleted");
-			generator.write(this.deleted);
-
-		}
-		if (this.requestsPerSecond != null) {
-			generator.writeKey("requests_per_second");
-			generator.write(this.requestsPerSecond);
-
-		}
-		if (this.retries != null) {
-			generator.writeKey("retries");
-			this.retries.serialize(generator, mapper);
-
-		}
-		if (this.task != null) {
-			generator.writeKey("task");
-			generator.write(this.task);
-
-		}
-		if (this.timedOut != null) {
-			generator.writeKey("timed_out");
-			generator.write(this.timedOut);
-
-		}
-		if (this.took != null) {
-			generator.writeKey("took");
-			generator.write(this.took);
-
-		}
-		if (this.total != null) {
-			generator.writeKey("total");
-			generator.write(this.total);
-
-		}
-		if (this.updated != null) {
-			generator.writeKey("updated");
-			generator.write(this.updated);
-
-		}
-		if (this.versionConflicts != null) {
-			generator.writeKey("version_conflicts");
-			generator.write(this.versionConflicts);
-
-		}
-		if (this.throttledMillis != null) {
-			generator.writeKey("throttled_millis");
-			generator.write(this.throttledMillis.doubleValue());
-
-		}
-		if (this.throttledUntilMillis != null) {
-			generator.writeKey("throttled_until_millis");
-			generator.write(this.throttledUntilMillis.doubleValue());
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UpdateByQueryResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<UpdateByQueryResponse> {
-		@Nullable
-		private Long batches;
-
-		@Nullable
-		private List<BulkIndexByScrollFailure> failures;
-
-		@Nullable
-		private Long noops;
-
-		@Nullable
-		private Long deleted;
-
-		@Nullable
-		private Float requestsPerSecond;
-
-		@Nullable
-		private Retries retries;
-
-		@Nullable
-		private String task;
-
-		@Nullable
-		private Boolean timedOut;
-
-		@Nullable
-		private Long took;
-
-		@Nullable
-		private Long total;
-
-		@Nullable
-		private Long updated;
-
-		@Nullable
-		private Long versionConflicts;
-
-		@Nullable
-		private Number throttledMillis;
-
-		@Nullable
-		private Number throttledUntilMillis;
-
-		/**
-		 * API name: {@code batches}
-		 */
-		public final Builder batches(@Nullable Long value) {
-			this.batches = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>failures</code>.
-		 */
-		public final Builder failures(List<BulkIndexByScrollFailure> list) {
-			this.failures = _listAddAll(this.failures, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds one or more values to <code>failures</code>.
-		 */
-		public final Builder failures(BulkIndexByScrollFailure value, BulkIndexByScrollFailure... values) {
-			this.failures = _listAdd(this.failures, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds a value to <code>failures</code> using a builder lambda.
-		 */
-		public final Builder failures(
-				Function<BulkIndexByScrollFailure.Builder, ObjectBuilder<BulkIndexByScrollFailure>> fn) {
-			return failures(fn.apply(new BulkIndexByScrollFailure.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code noops}
-		 */
-		public final Builder noops(@Nullable Long value) {
-			this.noops = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code deleted}
-		 */
-		public final Builder deleted(@Nullable Long value) {
-			this.deleted = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code requests_per_second}
-		 */
-		public final Builder requestsPerSecond(@Nullable Float value) {
-			this.requestsPerSecond = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code retries}
-		 */
-		public final Builder retries(@Nullable Retries value) {
-			this.retries = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code retries}
-		 */
-		public final Builder retries(Function<Retries.Builder, ObjectBuilder<Retries>> fn) {
-			return this.retries(fn.apply(new Retries.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code task}
-		 */
-		public final Builder task(@Nullable String value) {
-			this.task = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code timed_out}
-		 */
-		public final Builder timedOut(@Nullable Boolean value) {
-			this.timedOut = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code took}
-		 */
-		public final Builder took(@Nullable Long value) {
-			this.took = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total}
-		 */
-		public final Builder total(@Nullable Long value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code updated}
-		 */
-		public final Builder updated(@Nullable Long value) {
-			this.updated = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code version_conflicts}
-		 */
-		public final Builder versionConflicts(@Nullable Long value) {
-			this.versionConflicts = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code throttled_millis}
-		 */
-		public final Builder throttledMillis(@Nullable Number value) {
-			this.throttledMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code throttled_until_millis}
-		 */
-		public final Builder throttledUntilMillis(@Nullable Number value) {
-			this.throttledUntilMillis = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link UpdateByQueryResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UpdateByQueryResponse build() {
-			_checkSingleUse();
-
-			return new UpdateByQueryResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link UpdateByQueryResponse}
-	 */
-	public static final JsonpDeserializer<UpdateByQueryResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, UpdateByQueryResponse::setupUpdateByQueryResponseDeserializer);
-
-	protected static void setupUpdateByQueryResponseDeserializer(ObjectDeserializer<UpdateByQueryResponse.Builder> op) {
-
-		op.add(Builder::batches, JsonpDeserializer.longDeserializer(), "batches");
-		op.add(Builder::failures, JsonpDeserializer.arrayDeserializer(BulkIndexByScrollFailure._DESERIALIZER),
-				"failures");
-		op.add(Builder::noops, JsonpDeserializer.longDeserializer(), "noops");
-		op.add(Builder::deleted, JsonpDeserializer.longDeserializer(), "deleted");
-		op.add(Builder::requestsPerSecond, JsonpDeserializer.floatDeserializer(), "requests_per_second");
-		op.add(Builder::retries, Retries._DESERIALIZER, "retries");
-		op.add(Builder::task, JsonpDeserializer.stringDeserializer(), "task");
-		op.add(Builder::timedOut, JsonpDeserializer.booleanDeserializer(), "timed_out");
-		op.add(Builder::took, JsonpDeserializer.longDeserializer(), "took");
-		op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
-		op.add(Builder::updated, JsonpDeserializer.longDeserializer(), "updated");
-		op.add(Builder::versionConflicts, JsonpDeserializer.longDeserializer(), "version_conflicts");
-		op.add(Builder::throttledMillis, JsonpDeserializer.numberDeserializer(), "throttled_millis");
-		op.add(Builder::throttledUntilMillis, JsonpDeserializer.numberDeserializer(), "throttled_until_millis");
-
-	}
+    @Nullable
+    private final Long batches;
+
+    private final List<BulkIndexByScrollFailure> failures;
+
+    @Nullable
+    private final Long noops;
+
+    @Nullable
+    private final Long deleted;
+
+    @Nullable
+    private final Float requestsPerSecond;
+
+    @Nullable
+    private final Retries retries;
+
+    @Nullable
+    private final String task;
+
+    @Nullable
+    private final Boolean timedOut;
+
+    @Nullable
+    private final Long took;
+
+    @Nullable
+    private final Long total;
+
+    @Nullable
+    private final Long updated;
+
+    @Nullable
+    private final Long versionConflicts;
+
+    @Nullable
+    private final Number throttledMillis;
+
+    @Nullable
+    private final Number throttledUntilMillis;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private UpdateByQueryResponse(Builder builder) {
+
+        this.batches = builder.batches;
+        this.failures = ApiTypeHelper.unmodifiable(builder.failures);
+        this.noops = builder.noops;
+        this.deleted = builder.deleted;
+        this.requestsPerSecond = builder.requestsPerSecond;
+        this.retries = builder.retries;
+        this.task = builder.task;
+        this.timedOut = builder.timedOut;
+        this.took = builder.took;
+        this.total = builder.total;
+        this.updated = builder.updated;
+        this.versionConflicts = builder.versionConflicts;
+        this.throttledMillis = builder.throttledMillis;
+        this.throttledUntilMillis = builder.throttledUntilMillis;
+
+    }
+
+    public static UpdateByQueryResponse of(Function<Builder, ObjectBuilder<UpdateByQueryResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code batches}
+     */
+    @Nullable
+    public final Long batches() {
+        return this.batches;
+    }
+
+    /**
+     * API name: {@code failures}
+     */
+    public final List<BulkIndexByScrollFailure> failures() {
+        return this.failures;
+    }
+
+    /**
+     * API name: {@code noops}
+     */
+    @Nullable
+    public final Long noops() {
+        return this.noops;
+    }
+
+    /**
+     * API name: {@code deleted}
+     */
+    @Nullable
+    public final Long deleted() {
+        return this.deleted;
+    }
+
+    /**
+     * API name: {@code requests_per_second}
+     */
+    @Nullable
+    public final Float requestsPerSecond() {
+        return this.requestsPerSecond;
+    }
+
+    /**
+     * API name: {@code retries}
+     */
+    @Nullable
+    public final Retries retries() {
+        return this.retries;
+    }
+
+    /**
+     * API name: {@code task}
+     */
+    @Nullable
+    public final String task() {
+        return this.task;
+    }
+
+    /**
+     * API name: {@code timed_out}
+     */
+    @Nullable
+    public final Boolean timedOut() {
+        return this.timedOut;
+    }
+
+    /**
+     * API name: {@code took}
+     */
+    @Nullable
+    public final Long took() {
+        return this.took;
+    }
+
+    /**
+     * API name: {@code total}
+     */
+    @Nullable
+    public final Long total() {
+        return this.total;
+    }
+
+    /**
+     * API name: {@code updated}
+     */
+    @Nullable
+    public final Long updated() {
+        return this.updated;
+    }
+
+    /**
+     * API name: {@code version_conflicts}
+     */
+    @Nullable
+    public final Long versionConflicts() {
+        return this.versionConflicts;
+    }
+
+    /**
+     * API name: {@code throttled_millis}
+     */
+    @Nullable
+    public final Number throttledMillis() {
+        return this.throttledMillis;
+    }
+
+    /**
+     * API name: {@code throttled_until_millis}
+     */
+    @Nullable
+    public final Number throttledUntilMillis() {
+        return this.throttledUntilMillis;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.batches != null) {
+            generator.writeKey("batches");
+            generator.write(this.batches);
+
+        }
+        if (ApiTypeHelper.isDefined(this.failures)) {
+            generator.writeKey("failures");
+            generator.writeStartArray();
+            for (BulkIndexByScrollFailure item0 : this.failures) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.noops != null) {
+            generator.writeKey("noops");
+            generator.write(this.noops);
+
+        }
+        if (this.deleted != null) {
+            generator.writeKey("deleted");
+            generator.write(this.deleted);
+
+        }
+        if (this.requestsPerSecond != null) {
+            generator.writeKey("requests_per_second");
+            generator.write(this.requestsPerSecond);
+
+        }
+        if (this.retries != null) {
+            generator.writeKey("retries");
+            this.retries.serialize(generator, mapper);
+
+        }
+        if (this.task != null) {
+            generator.writeKey("task");
+            generator.write(this.task);
+
+        }
+        if (this.timedOut != null) {
+            generator.writeKey("timed_out");
+            generator.write(this.timedOut);
+
+        }
+        if (this.took != null) {
+            generator.writeKey("took");
+            generator.write(this.took);
+
+        }
+        if (this.total != null) {
+            generator.writeKey("total");
+            generator.write(this.total);
+
+        }
+        if (this.updated != null) {
+            generator.writeKey("updated");
+            generator.write(this.updated);
+
+        }
+        if (this.versionConflicts != null) {
+            generator.writeKey("version_conflicts");
+            generator.write(this.versionConflicts);
+
+        }
+        if (this.throttledMillis != null) {
+            generator.writeKey("throttled_millis");
+            generator.write(this.throttledMillis.doubleValue());
+
+        }
+        if (this.throttledUntilMillis != null) {
+            generator.writeKey("throttled_until_millis");
+            generator.write(this.throttledUntilMillis.doubleValue());
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UpdateByQueryResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<UpdateByQueryResponse> {
+        @Nullable
+        private Long batches;
+
+        @Nullable
+        private List<BulkIndexByScrollFailure> failures;
+
+        @Nullable
+        private Long noops;
+
+        @Nullable
+        private Long deleted;
+
+        @Nullable
+        private Float requestsPerSecond;
+
+        @Nullable
+        private Retries retries;
+
+        @Nullable
+        private String task;
+
+        @Nullable
+        private Boolean timedOut;
+
+        @Nullable
+        private Long took;
+
+        @Nullable
+        private Long total;
+
+        @Nullable
+        private Long updated;
+
+        @Nullable
+        private Long versionConflicts;
+
+        @Nullable
+        private Number throttledMillis;
+
+        @Nullable
+        private Number throttledUntilMillis;
+
+        /**
+         * API name: {@code batches}
+         */
+        public final Builder batches(@Nullable Long value) {
+            this.batches = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>failures</code>.
+         */
+        public final Builder failures(List<BulkIndexByScrollFailure> list) {
+            this.failures = _listAddAll(this.failures, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds one or more values to <code>failures</code>.
+         */
+        public final Builder failures(BulkIndexByScrollFailure value, BulkIndexByScrollFailure... values) {
+            this.failures = _listAdd(this.failures, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds a value to <code>failures</code> using a builder lambda.
+         */
+        public final Builder failures(Function<BulkIndexByScrollFailure.Builder, ObjectBuilder<BulkIndexByScrollFailure>> fn) {
+            return failures(fn.apply(new BulkIndexByScrollFailure.Builder()).build());
+        }
+
+        /**
+         * API name: {@code noops}
+         */
+        public final Builder noops(@Nullable Long value) {
+            this.noops = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code deleted}
+         */
+        public final Builder deleted(@Nullable Long value) {
+            this.deleted = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code requests_per_second}
+         */
+        public final Builder requestsPerSecond(@Nullable Float value) {
+            this.requestsPerSecond = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code retries}
+         */
+        public final Builder retries(@Nullable Retries value) {
+            this.retries = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code retries}
+         */
+        public final Builder retries(Function<Retries.Builder, ObjectBuilder<Retries>> fn) {
+            return this.retries(fn.apply(new Retries.Builder()).build());
+        }
+
+        /**
+         * API name: {@code task}
+         */
+        public final Builder task(@Nullable String value) {
+            this.task = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code timed_out}
+         */
+        public final Builder timedOut(@Nullable Boolean value) {
+            this.timedOut = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code took}
+         */
+        public final Builder took(@Nullable Long value) {
+            this.took = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total}
+         */
+        public final Builder total(@Nullable Long value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code updated}
+         */
+        public final Builder updated(@Nullable Long value) {
+            this.updated = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code version_conflicts}
+         */
+        public final Builder versionConflicts(@Nullable Long value) {
+            this.versionConflicts = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code throttled_millis}
+         */
+        public final Builder throttledMillis(@Nullable Number value) {
+            this.throttledMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code throttled_until_millis}
+         */
+        public final Builder throttledUntilMillis(@Nullable Number value) {
+            this.throttledUntilMillis = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link UpdateByQueryResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UpdateByQueryResponse build() {
+            _checkSingleUse();
+
+            return new UpdateByQueryResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link UpdateByQueryResponse}
+     */
+    public static final JsonpDeserializer<UpdateByQueryResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        UpdateByQueryResponse::setupUpdateByQueryResponseDeserializer
+    );
+
+    protected static void setupUpdateByQueryResponseDeserializer(ObjectDeserializer<UpdateByQueryResponse.Builder> op) {
+
+        op.add(Builder::batches, JsonpDeserializer.longDeserializer(), "batches");
+        op.add(Builder::failures, JsonpDeserializer.arrayDeserializer(BulkIndexByScrollFailure._DESERIALIZER), "failures");
+        op.add(Builder::noops, JsonpDeserializer.longDeserializer(), "noops");
+        op.add(Builder::deleted, JsonpDeserializer.longDeserializer(), "deleted");
+        op.add(Builder::requestsPerSecond, JsonpDeserializer.floatDeserializer(), "requests_per_second");
+        op.add(Builder::retries, Retries._DESERIALIZER, "retries");
+        op.add(Builder::task, JsonpDeserializer.stringDeserializer(), "task");
+        op.add(Builder::timedOut, JsonpDeserializer.booleanDeserializer(), "timed_out");
+        op.add(Builder::took, JsonpDeserializer.longDeserializer(), "took");
+        op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
+        op.add(Builder::updated, JsonpDeserializer.longDeserializer(), "updated");
+        op.add(Builder::versionConflicts, JsonpDeserializer.longDeserializer(), "version_conflicts");
+        op.add(Builder::throttledMillis, JsonpDeserializer.numberDeserializer(), "throttled_millis");
+        op.add(Builder::throttledUntilMillis, JsonpDeserializer.numberDeserializer(), "throttled_until_millis");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateByQueryRethrottleRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateByQueryRethrottleRequest.java
index 94d0def42b..f11a0d4a32 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateByQueryRethrottleRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateByQueryRethrottleRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -40,146 +44,144 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: _global.update_by_query_rethrottle.Request
 
 /**
  * Changes the number of requests per second for a particular Update By Query
  * operation.
- * 
+ *
  */
 
 public class UpdateByQueryRethrottleRequest extends RequestBase {
-	@Nullable
-	private final Long requestsPerSecond;
-
-	private final String taskId;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private UpdateByQueryRethrottleRequest(Builder builder) {
-
-		this.requestsPerSecond = builder.requestsPerSecond;
-		this.taskId = ApiTypeHelper.requireNonNull(builder.taskId, this, "taskId");
-
-	}
-
-	public static UpdateByQueryRethrottleRequest of(
-			Function<Builder, ObjectBuilder<UpdateByQueryRethrottleRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * The throttle to set on this request in floating sub-requests per second. -1
-	 * means set no throttle.
-	 * <p>
-	 * API name: {@code requests_per_second}
-	 */
-	@Nullable
-	public final Long requestsPerSecond() {
-		return this.requestsPerSecond;
-	}
-
-	/**
-	 * Required - The task id to rethrottle
-	 * <p>
-	 * API name: {@code task_id}
-	 */
-	public final String taskId() {
-		return this.taskId;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UpdateByQueryRethrottleRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<UpdateByQueryRethrottleRequest> {
-		@Nullable
-		private Long requestsPerSecond;
-
-		private String taskId;
-
-		/**
-		 * The throttle to set on this request in floating sub-requests per second. -1
-		 * means set no throttle.
-		 * <p>
-		 * API name: {@code requests_per_second}
-		 */
-		public final Builder requestsPerSecond(@Nullable Long value) {
-			this.requestsPerSecond = value;
-			return this;
-		}
-
-		/**
-		 * Required - The task id to rethrottle
-		 * <p>
-		 * API name: {@code task_id}
-		 */
-		public final Builder taskId(String value) {
-			this.taskId = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link UpdateByQueryRethrottleRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UpdateByQueryRethrottleRequest build() {
-			_checkSingleUse();
-
-			return new UpdateByQueryRethrottleRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code update_by_query_rethrottle}".
-	 */
-	public static final Endpoint<UpdateByQueryRethrottleRequest, UpdateByQueryRethrottleResponse, ErrorResponse>
-			_ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _taskId = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _taskId;
-
-				if (propsSet == (_taskId)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_update_by_query");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.taskId, buf);
-					buf.append("/_rethrottle");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.requestsPerSecond != null) {
-					params.put("requests_per_second", String.valueOf(request.requestsPerSecond));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, UpdateByQueryRethrottleResponse._DESERIALIZER);
+    @Nullable
+    private final Long requestsPerSecond;
+
+    private final String taskId;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private UpdateByQueryRethrottleRequest(Builder builder) {
+
+        this.requestsPerSecond = builder.requestsPerSecond;
+        this.taskId = ApiTypeHelper.requireNonNull(builder.taskId, this, "taskId");
+
+    }
+
+    public static UpdateByQueryRethrottleRequest of(Function<Builder, ObjectBuilder<UpdateByQueryRethrottleRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * The throttle to set on this request in floating sub-requests per second. -1
+     * means set no throttle.
+     * <p>
+     * API name: {@code requests_per_second}
+     */
+    @Nullable
+    public final Long requestsPerSecond() {
+        return this.requestsPerSecond;
+    }
+
+    /**
+     * Required - The task id to rethrottle
+     * <p>
+     * API name: {@code task_id}
+     */
+    public final String taskId() {
+        return this.taskId;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UpdateByQueryRethrottleRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<UpdateByQueryRethrottleRequest> {
+        @Nullable
+        private Long requestsPerSecond;
+
+        private String taskId;
+
+        /**
+         * The throttle to set on this request in floating sub-requests per second. -1
+         * means set no throttle.
+         * <p>
+         * API name: {@code requests_per_second}
+         */
+        public final Builder requestsPerSecond(@Nullable Long value) {
+            this.requestsPerSecond = value;
+            return this;
+        }
+
+        /**
+         * Required - The task id to rethrottle
+         * <p>
+         * API name: {@code task_id}
+         */
+        public final Builder taskId(String value) {
+            this.taskId = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link UpdateByQueryRethrottleRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UpdateByQueryRethrottleRequest build() {
+            _checkSingleUse();
+
+            return new UpdateByQueryRethrottleRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code update_by_query_rethrottle}".
+     */
+    public static final Endpoint<UpdateByQueryRethrottleRequest, UpdateByQueryRethrottleResponse, ErrorResponse> _ENDPOINT =
+        new SimpleEndpoint<>(
+
+            // Request method
+            request -> {
+                return "POST";
+
+            },
+
+            // Request path
+            request -> {
+                final int _taskId = 1 << 0;
+
+                int propsSet = 0;
+
+                propsSet |= _taskId;
+
+                if (propsSet == (_taskId)) {
+                    StringBuilder buf = new StringBuilder();
+                    buf.append("/_update_by_query");
+                    buf.append("/");
+                    SimpleEndpoint.pathEncode(request.taskId, buf);
+                    buf.append("/_rethrottle");
+                    return buf.toString();
+                }
+                throw SimpleEndpoint.noPathTemplateFound("path");
+
+            },
+
+            // Request parameters
+            request -> {
+                Map<String, String> params = new HashMap<>();
+                if (request.requestsPerSecond != null) {
+                    params.put("requests_per_second", String.valueOf(request.requestsPerSecond));
+                }
+                return params;
+
+            },
+            SimpleEndpoint.emptyMap(),
+            false,
+            UpdateByQueryRethrottleResponse._DESERIALIZER
+        );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateByQueryRethrottleResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateByQueryRethrottleResponse.java
index a93ee0bbfd..6cf3448af6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateByQueryRethrottleResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateByQueryRethrottleResponse.java
@@ -32,138 +32,138 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch.core.update_by_query_rethrottle.UpdateByQueryRethrottleNode;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.update_by_query_rethrottle.UpdateByQueryRethrottleNode;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _global.update_by_query_rethrottle.Response
 
 @JsonpDeserializable
 public class UpdateByQueryRethrottleResponse implements JsonpSerializable {
-	private final Map<String, UpdateByQueryRethrottleNode> nodes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private UpdateByQueryRethrottleResponse(Builder builder) {
-
-		this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
-
-	}
-
-	public static UpdateByQueryRethrottleResponse of(
-			Function<Builder, ObjectBuilder<UpdateByQueryRethrottleResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code nodes}
-	 */
-	public final Map<String, UpdateByQueryRethrottleNode> nodes() {
-		return this.nodes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.nodes)) {
-			generator.writeKey("nodes");
-			generator.writeStartObject();
-			for (Map.Entry<String, UpdateByQueryRethrottleNode> item0 : this.nodes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UpdateByQueryRethrottleResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<UpdateByQueryRethrottleResponse> {
-		private Map<String, UpdateByQueryRethrottleNode> nodes;
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>nodes</code>.
-		 */
-		public final Builder nodes(Map<String, UpdateByQueryRethrottleNode> map) {
-			this.nodes = _mapPutAll(this.nodes, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code>.
-		 */
-		public final Builder nodes(String key, UpdateByQueryRethrottleNode value) {
-			this.nodes = _mapPut(this.nodes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code> using a builder lambda.
-		 */
-		public final Builder nodes(String key,
-				Function<UpdateByQueryRethrottleNode.Builder, ObjectBuilder<UpdateByQueryRethrottleNode>> fn) {
-			return nodes(key, fn.apply(new UpdateByQueryRethrottleNode.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link UpdateByQueryRethrottleResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UpdateByQueryRethrottleResponse build() {
-			_checkSingleUse();
-
-			return new UpdateByQueryRethrottleResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link UpdateByQueryRethrottleResponse}
-	 */
-	public static final JsonpDeserializer<UpdateByQueryRethrottleResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, UpdateByQueryRethrottleResponse::setupUpdateByQueryRethrottleResponseDeserializer);
-
-	protected static void setupUpdateByQueryRethrottleResponseDeserializer(
-			ObjectDeserializer<UpdateByQueryRethrottleResponse.Builder> op) {
-
-		op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(UpdateByQueryRethrottleNode._DESERIALIZER),
-				"nodes");
-
-	}
+    private final Map<String, UpdateByQueryRethrottleNode> nodes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private UpdateByQueryRethrottleResponse(Builder builder) {
+
+        this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
+
+    }
+
+    public static UpdateByQueryRethrottleResponse of(Function<Builder, ObjectBuilder<UpdateByQueryRethrottleResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code nodes}
+     */
+    public final Map<String, UpdateByQueryRethrottleNode> nodes() {
+        return this.nodes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.nodes)) {
+            generator.writeKey("nodes");
+            generator.writeStartObject();
+            for (Map.Entry<String, UpdateByQueryRethrottleNode> item0 : this.nodes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UpdateByQueryRethrottleResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<UpdateByQueryRethrottleResponse> {
+        private Map<String, UpdateByQueryRethrottleNode> nodes;
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>nodes</code>.
+         */
+        public final Builder nodes(Map<String, UpdateByQueryRethrottleNode> map) {
+            this.nodes = _mapPutAll(this.nodes, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code>.
+         */
+        public final Builder nodes(String key, UpdateByQueryRethrottleNode value) {
+            this.nodes = _mapPut(this.nodes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code> using a builder lambda.
+         */
+        public final Builder nodes(
+            String key,
+            Function<UpdateByQueryRethrottleNode.Builder, ObjectBuilder<UpdateByQueryRethrottleNode>> fn
+        ) {
+            return nodes(key, fn.apply(new UpdateByQueryRethrottleNode.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link UpdateByQueryRethrottleResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UpdateByQueryRethrottleResponse build() {
+            _checkSingleUse();
+
+            return new UpdateByQueryRethrottleResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link UpdateByQueryRethrottleResponse}
+     */
+    public static final JsonpDeserializer<UpdateByQueryRethrottleResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        UpdateByQueryRethrottleResponse::setupUpdateByQueryRethrottleResponseDeserializer
+    );
+
+    protected static void setupUpdateByQueryRethrottleResponseDeserializer(ObjectDeserializer<UpdateByQueryRethrottleResponse.Builder> op) {
+
+        op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(UpdateByQueryRethrottleNode._DESERIALIZER), "nodes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateRequest.java
index 45eae4b9a2..1c426e18f4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateRequest.java
@@ -32,13 +32,12 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.Refresh;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Script;
-import org.opensearch.client.opensearch._types.Time;
-import org.opensearch.client.opensearch._types.WaitForActiveShards;
-import org.opensearch.client.opensearch.core.search.SourceConfig;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
@@ -46,18 +45,18 @@
 import org.opensearch.client.json.JsonpUtils;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.Refresh;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.Script;
+import org.opensearch.client.opensearch._types.Time;
+import org.opensearch.client.opensearch._types.WaitForActiveShards;
+import org.opensearch.client.opensearch.core.search.SourceConfig;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import javax.annotation.Nullable;
 
 // typedef: _global.update.Request
 
@@ -67,774 +66,781 @@
  */
 
 public class UpdateRequest<TDocument, TPartialDocument> extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final SourceConfig source;
+    @Nullable
+    private final SourceConfig source;
 
-	@Nullable
-	private final Boolean detectNoop;
+    @Nullable
+    private final Boolean detectNoop;
 
-	@Nullable
-	private final TPartialDocument doc;
-
-	@Nullable
-	private final Boolean docAsUpsert;
-
-	private final String id;
-
-	@Nullable
-	private final Long ifPrimaryTerm;
-
-	@Nullable
-	private final Long ifSeqNo;
-
-	private final String index;
-
-	@Nullable
-	private final String lang;
-
-	@Nullable
-	private final Refresh refresh;
-
-	@Nullable
-	private final Boolean requireAlias;
-
-	@Nullable
-	private final Integer retryOnConflict;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final Script script;
-
-	@Nullable
-	private final Boolean scriptedUpsert;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final TDocument upsert;
-
-	@Nullable
-	private final WaitForActiveShards waitForActiveShards;
-
-	@Nullable
-	private final JsonpSerializer<TDocument> tDocumentSerializer;
-
-	@Nullable
-	private final JsonpSerializer<TPartialDocument> tPartialDocumentSerializer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private UpdateRequest(Builder<TDocument, TPartialDocument> builder) {
-
-		this.source = builder.source;
-		this.detectNoop = builder.detectNoop;
-		this.doc = builder.doc;
-		this.docAsUpsert = builder.docAsUpsert;
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.ifPrimaryTerm = builder.ifPrimaryTerm;
-		this.ifSeqNo = builder.ifSeqNo;
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.lang = builder.lang;
-		this.refresh = builder.refresh;
-		this.requireAlias = builder.requireAlias;
-		this.retryOnConflict = builder.retryOnConflict;
-		this.routing = builder.routing;
-		this.script = builder.script;
-		this.scriptedUpsert = builder.scriptedUpsert;
-		this.timeout = builder.timeout;
-		this.upsert = builder.upsert;
-		this.waitForActiveShards = builder.waitForActiveShards;
-		this.tDocumentSerializer = builder.tDocumentSerializer;
-		this.tPartialDocumentSerializer = builder.tPartialDocumentSerializer;
-
-	}
-
-	public static <TDocument, TPartialDocument> UpdateRequest<TDocument, TPartialDocument> of(
-			Function<Builder<TDocument, TPartialDocument>, ObjectBuilder<UpdateRequest<TDocument, TPartialDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * Set to false to disable source retrieval. You can also specify a
-	 * comma-separated list of the fields you want to retrieve.
-	 * <p>
-	 * API name: {@code _source}
-	 */
-	@Nullable
-	public final SourceConfig source() {
-		return this.source;
-	}
-
-	/**
-	 * Set to false to disable setting 'result' in the response to 'noop' if no
-	 * change to the document occurred.
-	 * <p>
-	 * API name: {@code detect_noop}
-	 */
-	@Nullable
-	public final Boolean detectNoop() {
-		return this.detectNoop;
-	}
-
-	/**
-	 * A partial update to an existing document.
-	 * <p>
-	 * API name: {@code doc}
-	 */
-	@Nullable
-	public final TPartialDocument doc() {
-		return this.doc;
-	}
-
-	/**
-	 * Set to true to use the contents of 'doc' as the value of 'upsert'
-	 * <p>
-	 * API name: {@code doc_as_upsert}
-	 */
-	@Nullable
-	public final Boolean docAsUpsert() {
-		return this.docAsUpsert;
-	}
-
-	/**
-	 * Required - Document ID
-	 * <p>
-	 * API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Only perform the operation if the document has this primary term.
-	 * <p>
-	 * API name: {@code if_primary_term}
-	 */
-	@Nullable
-	public final Long ifPrimaryTerm() {
-		return this.ifPrimaryTerm;
-	}
-
-	/**
-	 * Only perform the operation if the document has this sequence number.
-	 * <p>
-	 * API name: {@code if_seq_no}
-	 */
-	@Nullable
-	public final Long ifSeqNo() {
-		return this.ifSeqNo;
-	}
-
-	/**
-	 * Required - The name of the index
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * The script language.
-	 * <p>
-	 * API name: {@code lang}
-	 */
-	@Nullable
-	public final String lang() {
-		return this.lang;
-	}
-
-	/**
-	 * If 'true', Elasticsearch refreshes the affected shards to make this operation
-	 * visible to search, if 'wait_for' then wait for a refresh to make this
-	 * operation visible to search, if 'false' do nothing with refreshes.
-	 * <p>
-	 * API name: {@code refresh}
-	 */
-	@Nullable
-	public final Refresh refresh() {
-		return this.refresh;
-	}
-
-	/**
-	 * If true, the destination must be an index alias.
-	 * <p>
-	 * API name: {@code require_alias}
-	 */
-	@Nullable
-	public final Boolean requireAlias() {
-		return this.requireAlias;
-	}
-
-	/**
-	 * Specify how many times should the operation be retried when a conflict
-	 * occurs.
-	 * <p>
-	 * API name: {@code retry_on_conflict}
-	 */
-	@Nullable
-	public final Integer retryOnConflict() {
-		return this.retryOnConflict;
-	}
-
-	/**
-	 * Custom value used to route operations to a specific shard.
-	 * <p>
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Script to execute to update the document.
-	 * <p>
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final Script script() {
-		return this.script;
-	}
-
-	/**
-	 * Set to true to execute the script whether or not the document exists.
-	 * <p>
-	 * API name: {@code scripted_upsert}
-	 */
-	@Nullable
-	public final Boolean scriptedUpsert() {
-		return this.scriptedUpsert;
-	}
-
-	/**
-	 * Period to wait for dynamic mapping updates and active shards. This guarantees
-	 * Elasticsearch waits for at least the timeout before failing. The actual wait
-	 * time could be longer, particularly when multiple waits occur.
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * If the document does not already exist, the contents of 'upsert' are inserted
-	 * as a new document. If the document exists, the 'script' is executed.
-	 * <p>
-	 * API name: {@code upsert}
-	 */
-	@Nullable
-	public final TDocument upsert() {
-		return this.upsert;
-	}
-
-	/**
-	 * The number of shard copies that must be active before proceeding with the
-	 * operations. Set to 'all' or any positive integer up to the total number of
-	 * shards in the index (number_of_replicas+1). Defaults to 1 meaning the primary
-	 * shard.
-	 * <p>
-	 * API name: {@code wait_for_active_shards}
-	 */
-	@Nullable
-	public final WaitForActiveShards waitForActiveShards() {
-		return this.waitForActiveShards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.source != null) {
-			generator.writeKey("_source");
-			this.source.serialize(generator, mapper);
-
-		}
-		if (this.detectNoop != null) {
-			generator.writeKey("detect_noop");
-			generator.write(this.detectNoop);
-
-		}
-		if (this.doc != null) {
-			generator.writeKey("doc");
-			JsonpUtils.serialize(this.doc, generator, tPartialDocumentSerializer, mapper);
-
-		}
-		if (this.docAsUpsert != null) {
-			generator.writeKey("doc_as_upsert");
-			generator.write(this.docAsUpsert);
-
-		}
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-		if (this.scriptedUpsert != null) {
-			generator.writeKey("scripted_upsert");
-			generator.write(this.scriptedUpsert);
-
-		}
-		if (this.upsert != null) {
-			generator.writeKey("upsert");
-			JsonpUtils.serialize(this.upsert, generator, tDocumentSerializer, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UpdateRequest}.
-	 */
-
-	public static class Builder<TDocument, TPartialDocument> extends ObjectBuilderBase
-			implements
-				ObjectBuilder<UpdateRequest<TDocument, TPartialDocument>> {
-		@Nullable
-		private SourceConfig source;
-
-		@Nullable
-		private Boolean detectNoop;
-
-		@Nullable
-		private TPartialDocument doc;
-
-		@Nullable
-		private Boolean docAsUpsert;
-
-		private String id;
-
-		@Nullable
-		private Long ifPrimaryTerm;
-
-		@Nullable
-		private Long ifSeqNo;
-
-		private String index;
-
-		@Nullable
-		private String lang;
-
-		@Nullable
-		private Refresh refresh;
-
-		@Nullable
-		private Boolean requireAlias;
-
-		@Nullable
-		private Integer retryOnConflict;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private Script script;
-
-		@Nullable
-		private Boolean scriptedUpsert;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private TDocument upsert;
-
-		@Nullable
-		private WaitForActiveShards waitForActiveShards;
-
-		@Nullable
-		private JsonpSerializer<TDocument> tDocumentSerializer;
-
-		@Nullable
-		private JsonpSerializer<TPartialDocument> tPartialDocumentSerializer;
-
-		/**
-		 * Set to false to disable source retrieval. You can also specify a
-		 * comma-separated list of the fields you want to retrieve.
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder<TDocument, TPartialDocument> source(@Nullable SourceConfig value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * Set to false to disable source retrieval. You can also specify a
-		 * comma-separated list of the fields you want to retrieve.
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder<TDocument, TPartialDocument> source(
-				Function<SourceConfig.Builder, ObjectBuilder<SourceConfig>> fn) {
-			return this.source(fn.apply(new SourceConfig.Builder()).build());
-		}
-
-		/**
-		 * Set to false to disable setting 'result' in the response to 'noop' if no
-		 * change to the document occurred.
-		 * <p>
-		 * API name: {@code detect_noop}
-		 */
-		public final Builder<TDocument, TPartialDocument> detectNoop(@Nullable Boolean value) {
-			this.detectNoop = value;
-			return this;
-		}
-
-		/**
-		 * A partial update to an existing document.
-		 * <p>
-		 * API name: {@code doc}
-		 */
-		public final Builder<TDocument, TPartialDocument> doc(@Nullable TPartialDocument value) {
-			this.doc = value;
-			return this;
-		}
-
-		/**
-		 * Set to true to use the contents of 'doc' as the value of 'upsert'
-		 * <p>
-		 * API name: {@code doc_as_upsert}
-		 */
-		public final Builder<TDocument, TPartialDocument> docAsUpsert(@Nullable Boolean value) {
-			this.docAsUpsert = value;
-			return this;
-		}
-
-		/**
-		 * Required - Document ID
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder<TDocument, TPartialDocument> id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Only perform the operation if the document has this primary term.
-		 * <p>
-		 * API name: {@code if_primary_term}
-		 */
-		public final Builder<TDocument, TPartialDocument> ifPrimaryTerm(@Nullable Long value) {
-			this.ifPrimaryTerm = value;
-			return this;
-		}
-
-		/**
-		 * Only perform the operation if the document has this sequence number.
-		 * <p>
-		 * API name: {@code if_seq_no}
-		 */
-		public final Builder<TDocument, TPartialDocument> ifSeqNo(@Nullable Long value) {
-			this.ifSeqNo = value;
-			return this;
-		}
-
-		/**
-		 * Required - The name of the index
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder<TDocument, TPartialDocument> index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * The script language.
-		 * <p>
-		 * API name: {@code lang}
-		 */
-		public final Builder<TDocument, TPartialDocument> lang(@Nullable String value) {
-			this.lang = value;
-			return this;
-		}
-
-		/**
-		 * If 'true', Elasticsearch refreshes the affected shards to make this operation
-		 * visible to search, if 'wait_for' then wait for a refresh to make this
-		 * operation visible to search, if 'false' do nothing with refreshes.
-		 * <p>
-		 * API name: {@code refresh}
-		 */
-		public final Builder<TDocument, TPartialDocument> refresh(@Nullable Refresh value) {
-			this.refresh = value;
-			return this;
-		}
-
-		/**
-		 * If true, the destination must be an index alias.
-		 * <p>
-		 * API name: {@code require_alias}
-		 */
-		public final Builder<TDocument, TPartialDocument> requireAlias(@Nullable Boolean value) {
-			this.requireAlias = value;
-			return this;
-		}
-
-		/**
-		 * Specify how many times should the operation be retried when a conflict
-		 * occurs.
-		 * <p>
-		 * API name: {@code retry_on_conflict}
-		 */
-		public final Builder<TDocument, TPartialDocument> retryOnConflict(@Nullable Integer value) {
-			this.retryOnConflict = value;
-			return this;
-		}
-
-		/**
-		 * Custom value used to route operations to a specific shard.
-		 * <p>
-		 * API name: {@code routing}
-		 */
-		public final Builder<TDocument, TPartialDocument> routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Script to execute to update the document.
-		 * <p>
-		 * API name: {@code script}
-		 */
-		public final Builder<TDocument, TPartialDocument> script(@Nullable Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * Script to execute to update the document.
-		 * <p>
-		 * API name: {@code script}
-		 */
-		public final Builder<TDocument, TPartialDocument> script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		/**
-		 * Set to true to execute the script whether or not the document exists.
-		 * <p>
-		 * API name: {@code scripted_upsert}
-		 */
-		public final Builder<TDocument, TPartialDocument> scriptedUpsert(@Nullable Boolean value) {
-			this.scriptedUpsert = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for dynamic mapping updates and active shards. This guarantees
-		 * Elasticsearch waits for at least the timeout before failing. The actual wait
-		 * time could be longer, particularly when multiple waits occur.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder<TDocument, TPartialDocument> timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for dynamic mapping updates and active shards. This guarantees
-		 * Elasticsearch waits for at least the timeout before failing. The actual wait
-		 * time could be longer, particularly when multiple waits occur.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder<TDocument, TPartialDocument> timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * If the document does not already exist, the contents of 'upsert' are inserted
-		 * as a new document. If the document exists, the 'script' is executed.
-		 * <p>
-		 * API name: {@code upsert}
-		 */
-		public final Builder<TDocument, TPartialDocument> upsert(@Nullable TDocument value) {
-			this.upsert = value;
-			return this;
-		}
-
-		/**
-		 * The number of shard copies that must be active before proceeding with the
-		 * operations. Set to 'all' or any positive integer up to the total number of
-		 * shards in the index (number_of_replicas+1). Defaults to 1 meaning the primary
-		 * shard.
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder<TDocument, TPartialDocument> waitForActiveShards(@Nullable WaitForActiveShards value) {
-			this.waitForActiveShards = value;
-			return this;
-		}
-
-		/**
-		 * The number of shard copies that must be active before proceeding with the
-		 * operations. Set to 'all' or any positive integer up to the total number of
-		 * shards in the index (number_of_replicas+1). Defaults to 1 meaning the primary
-		 * shard.
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder<TDocument, TPartialDocument> waitForActiveShards(
-				Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
-			return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
-		}
-
-		/**
-		 * Serializer for TDocument. If not set, an attempt will be made to find a
-		 * serializer from the JSON context.
-		 */
-		public final Builder<TDocument, TPartialDocument> tDocumentSerializer(
-				@Nullable JsonpSerializer<TDocument> value) {
-			this.tDocumentSerializer = value;
-			return this;
-		}
-
-		/**
-		 * Serializer for TPartialDocument. If not set, an attempt will be made to find
-		 * a serializer from the JSON context.
-		 */
-		public final Builder<TDocument, TPartialDocument> tPartialDocumentSerializer(
-				@Nullable JsonpSerializer<TPartialDocument> value) {
-			this.tPartialDocumentSerializer = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link UpdateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UpdateRequest<TDocument, TPartialDocument> build() {
-			_checkSingleUse();
-
-			return new UpdateRequest<TDocument, TPartialDocument>(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Create a JSON deserializer for UpdateRequest
-	 */
-	public static <TDocument, TPartialDocument>
-	JsonpDeserializer<UpdateRequest<TDocument, TPartialDocument>> createUpdateRequestDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer,
-			JsonpDeserializer<TPartialDocument> tPartialDocumentDeserializer) {
-		return ObjectBuilderDeserializer.createForObject((Supplier<Builder<TDocument, TPartialDocument>>) Builder::new,
-				op -> UpdateRequest.setupUpdateRequestDeserializer(op, tDocumentDeserializer,
-						tPartialDocumentDeserializer));
-	};
-
-	protected static <TDocument, TPartialDocument> void setupUpdateRequestDeserializer(
-			ObjectDeserializer<UpdateRequest.Builder<TDocument, TPartialDocument>> op,
-			JsonpDeserializer<TDocument> tDocumentDeserializer,
-			JsonpDeserializer<TPartialDocument> tPartialDocumentDeserializer) {
-
-		op.add(Builder::source, SourceConfig._DESERIALIZER, "_source");
-		op.add(Builder::detectNoop, JsonpDeserializer.booleanDeserializer(), "detect_noop");
-		op.add(Builder::doc, tPartialDocumentDeserializer, "doc");
-		op.add(Builder::docAsUpsert, JsonpDeserializer.booleanDeserializer(), "doc_as_upsert");
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-		op.add(Builder::scriptedUpsert, JsonpDeserializer.booleanDeserializer(), "scripted_upsert");
-		op.add(Builder::upsert, tDocumentDeserializer, "upsert");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code update}".
-	 */
-	public static final SimpleEndpoint<UpdateRequest<?, ?>, ?> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-				final int _id = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-				propsSet |= _id;
-
-				if (propsSet == (_index | _id)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_update");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.id, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.routing != null) {
-					params.put("routing", request.routing);
-				}
-				if (request.requireAlias != null) {
-					params.put("require_alias", String.valueOf(request.requireAlias));
-				}
-				if (request.ifPrimaryTerm != null) {
-					params.put("if_primary_term", String.valueOf(request.ifPrimaryTerm));
-				}
-				if (request.ifSeqNo != null) {
-					params.put("if_seq_no", String.valueOf(request.ifSeqNo));
-				}
-				if (request.refresh != null) {
-					params.put("refresh", request.refresh.jsonValue());
-				}
-				if (request.waitForActiveShards != null) {
-					params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
-				}
-				if (request.lang != null) {
-					params.put("lang", request.lang);
-				}
-				if (request.retryOnConflict != null) {
-					params.put("retry_on_conflict", String.valueOf(request.retryOnConflict));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, UpdateResponse._DESERIALIZER);
-
-	/**
-	 * Create an "{@code update}" endpoint.
-	 */
-	public static <TDocument> Endpoint<UpdateRequest<?, ?>, UpdateResponse<TDocument>, ErrorResponse> createUpdateEndpoint(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return _ENDPOINT
-				.withResponseDeserializer(UpdateResponse.createUpdateResponseDeserializer(tDocumentDeserializer));
-	}
+    @Nullable
+    private final TPartialDocument doc;
+
+    @Nullable
+    private final Boolean docAsUpsert;
+
+    private final String id;
+
+    @Nullable
+    private final Long ifPrimaryTerm;
+
+    @Nullable
+    private final Long ifSeqNo;
+
+    private final String index;
+
+    @Nullable
+    private final String lang;
+
+    @Nullable
+    private final Refresh refresh;
+
+    @Nullable
+    private final Boolean requireAlias;
+
+    @Nullable
+    private final Integer retryOnConflict;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final Script script;
+
+    @Nullable
+    private final Boolean scriptedUpsert;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final TDocument upsert;
+
+    @Nullable
+    private final WaitForActiveShards waitForActiveShards;
+
+    @Nullable
+    private final JsonpSerializer<TDocument> tDocumentSerializer;
+
+    @Nullable
+    private final JsonpSerializer<TPartialDocument> tPartialDocumentSerializer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private UpdateRequest(Builder<TDocument, TPartialDocument> builder) {
+
+        this.source = builder.source;
+        this.detectNoop = builder.detectNoop;
+        this.doc = builder.doc;
+        this.docAsUpsert = builder.docAsUpsert;
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.ifPrimaryTerm = builder.ifPrimaryTerm;
+        this.ifSeqNo = builder.ifSeqNo;
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.lang = builder.lang;
+        this.refresh = builder.refresh;
+        this.requireAlias = builder.requireAlias;
+        this.retryOnConflict = builder.retryOnConflict;
+        this.routing = builder.routing;
+        this.script = builder.script;
+        this.scriptedUpsert = builder.scriptedUpsert;
+        this.timeout = builder.timeout;
+        this.upsert = builder.upsert;
+        this.waitForActiveShards = builder.waitForActiveShards;
+        this.tDocumentSerializer = builder.tDocumentSerializer;
+        this.tPartialDocumentSerializer = builder.tPartialDocumentSerializer;
+
+    }
+
+    public static <TDocument, TPartialDocument> UpdateRequest<TDocument, TPartialDocument> of(
+        Function<Builder<TDocument, TPartialDocument>, ObjectBuilder<UpdateRequest<TDocument, TPartialDocument>>> fn
+    ) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * Set to false to disable source retrieval. You can also specify a
+     * comma-separated list of the fields you want to retrieve.
+     * <p>
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final SourceConfig source() {
+        return this.source;
+    }
+
+    /**
+     * Set to false to disable setting 'result' in the response to 'noop' if no
+     * change to the document occurred.
+     * <p>
+     * API name: {@code detect_noop}
+     */
+    @Nullable
+    public final Boolean detectNoop() {
+        return this.detectNoop;
+    }
+
+    /**
+     * A partial update to an existing document.
+     * <p>
+     * API name: {@code doc}
+     */
+    @Nullable
+    public final TPartialDocument doc() {
+        return this.doc;
+    }
+
+    /**
+     * Set to true to use the contents of 'doc' as the value of 'upsert'
+     * <p>
+     * API name: {@code doc_as_upsert}
+     */
+    @Nullable
+    public final Boolean docAsUpsert() {
+        return this.docAsUpsert;
+    }
+
+    /**
+     * Required - Document ID
+     * <p>
+     * API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Only perform the operation if the document has this primary term.
+     * <p>
+     * API name: {@code if_primary_term}
+     */
+    @Nullable
+    public final Long ifPrimaryTerm() {
+        return this.ifPrimaryTerm;
+    }
+
+    /**
+     * Only perform the operation if the document has this sequence number.
+     * <p>
+     * API name: {@code if_seq_no}
+     */
+    @Nullable
+    public final Long ifSeqNo() {
+        return this.ifSeqNo;
+    }
+
+    /**
+     * Required - The name of the index
+     * <p>
+     * API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * The script language.
+     * <p>
+     * API name: {@code lang}
+     */
+    @Nullable
+    public final String lang() {
+        return this.lang;
+    }
+
+    /**
+     * If 'true', Elasticsearch refreshes the affected shards to make this operation
+     * visible to search, if 'wait_for' then wait for a refresh to make this
+     * operation visible to search, if 'false' do nothing with refreshes.
+     * <p>
+     * API name: {@code refresh}
+     */
+    @Nullable
+    public final Refresh refresh() {
+        return this.refresh;
+    }
+
+    /**
+     * If true, the destination must be an index alias.
+     * <p>
+     * API name: {@code require_alias}
+     */
+    @Nullable
+    public final Boolean requireAlias() {
+        return this.requireAlias;
+    }
+
+    /**
+     * Specify how many times should the operation be retried when a conflict
+     * occurs.
+     * <p>
+     * API name: {@code retry_on_conflict}
+     */
+    @Nullable
+    public final Integer retryOnConflict() {
+        return this.retryOnConflict;
+    }
+
+    /**
+     * Custom value used to route operations to a specific shard.
+     * <p>
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * Script to execute to update the document.
+     * <p>
+     * API name: {@code script}
+     */
+    @Nullable
+    public final Script script() {
+        return this.script;
+    }
+
+    /**
+     * Set to true to execute the script whether or not the document exists.
+     * <p>
+     * API name: {@code scripted_upsert}
+     */
+    @Nullable
+    public final Boolean scriptedUpsert() {
+        return this.scriptedUpsert;
+    }
+
+    /**
+     * Period to wait for dynamic mapping updates and active shards. This guarantees
+     * Elasticsearch waits for at least the timeout before failing. The actual wait
+     * time could be longer, particularly when multiple waits occur.
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * If the document does not already exist, the contents of 'upsert' are inserted
+     * as a new document. If the document exists, the 'script' is executed.
+     * <p>
+     * API name: {@code upsert}
+     */
+    @Nullable
+    public final TDocument upsert() {
+        return this.upsert;
+    }
+
+    /**
+     * The number of shard copies that must be active before proceeding with the
+     * operations. Set to 'all' or any positive integer up to the total number of
+     * shards in the index (number_of_replicas+1). Defaults to 1 meaning the primary
+     * shard.
+     * <p>
+     * API name: {@code wait_for_active_shards}
+     */
+    @Nullable
+    public final WaitForActiveShards waitForActiveShards() {
+        return this.waitForActiveShards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.source != null) {
+            generator.writeKey("_source");
+            this.source.serialize(generator, mapper);
+
+        }
+        if (this.detectNoop != null) {
+            generator.writeKey("detect_noop");
+            generator.write(this.detectNoop);
+
+        }
+        if (this.doc != null) {
+            generator.writeKey("doc");
+            JsonpUtils.serialize(this.doc, generator, tPartialDocumentSerializer, mapper);
+
+        }
+        if (this.docAsUpsert != null) {
+            generator.writeKey("doc_as_upsert");
+            generator.write(this.docAsUpsert);
+
+        }
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+        if (this.scriptedUpsert != null) {
+            generator.writeKey("scripted_upsert");
+            generator.write(this.scriptedUpsert);
+
+        }
+        if (this.upsert != null) {
+            generator.writeKey("upsert");
+            JsonpUtils.serialize(this.upsert, generator, tDocumentSerializer, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UpdateRequest}.
+     */
+
+    public static class Builder<TDocument, TPartialDocument> extends ObjectBuilderBase
+        implements
+            ObjectBuilder<UpdateRequest<TDocument, TPartialDocument>> {
+        @Nullable
+        private SourceConfig source;
+
+        @Nullable
+        private Boolean detectNoop;
+
+        @Nullable
+        private TPartialDocument doc;
+
+        @Nullable
+        private Boolean docAsUpsert;
+
+        private String id;
+
+        @Nullable
+        private Long ifPrimaryTerm;
+
+        @Nullable
+        private Long ifSeqNo;
+
+        private String index;
+
+        @Nullable
+        private String lang;
+
+        @Nullable
+        private Refresh refresh;
+
+        @Nullable
+        private Boolean requireAlias;
+
+        @Nullable
+        private Integer retryOnConflict;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private Script script;
+
+        @Nullable
+        private Boolean scriptedUpsert;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private TDocument upsert;
+
+        @Nullable
+        private WaitForActiveShards waitForActiveShards;
+
+        @Nullable
+        private JsonpSerializer<TDocument> tDocumentSerializer;
+
+        @Nullable
+        private JsonpSerializer<TPartialDocument> tPartialDocumentSerializer;
+
+        /**
+         * Set to false to disable source retrieval. You can also specify a
+         * comma-separated list of the fields you want to retrieve.
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder<TDocument, TPartialDocument> source(@Nullable SourceConfig value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * Set to false to disable source retrieval. You can also specify a
+         * comma-separated list of the fields you want to retrieve.
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder<TDocument, TPartialDocument> source(Function<SourceConfig.Builder, ObjectBuilder<SourceConfig>> fn) {
+            return this.source(fn.apply(new SourceConfig.Builder()).build());
+        }
+
+        /**
+         * Set to false to disable setting 'result' in the response to 'noop' if no
+         * change to the document occurred.
+         * <p>
+         * API name: {@code detect_noop}
+         */
+        public final Builder<TDocument, TPartialDocument> detectNoop(@Nullable Boolean value) {
+            this.detectNoop = value;
+            return this;
+        }
+
+        /**
+         * A partial update to an existing document.
+         * <p>
+         * API name: {@code doc}
+         */
+        public final Builder<TDocument, TPartialDocument> doc(@Nullable TPartialDocument value) {
+            this.doc = value;
+            return this;
+        }
+
+        /**
+         * Set to true to use the contents of 'doc' as the value of 'upsert'
+         * <p>
+         * API name: {@code doc_as_upsert}
+         */
+        public final Builder<TDocument, TPartialDocument> docAsUpsert(@Nullable Boolean value) {
+            this.docAsUpsert = value;
+            return this;
+        }
+
+        /**
+         * Required - Document ID
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder<TDocument, TPartialDocument> id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Only perform the operation if the document has this primary term.
+         * <p>
+         * API name: {@code if_primary_term}
+         */
+        public final Builder<TDocument, TPartialDocument> ifPrimaryTerm(@Nullable Long value) {
+            this.ifPrimaryTerm = value;
+            return this;
+        }
+
+        /**
+         * Only perform the operation if the document has this sequence number.
+         * <p>
+         * API name: {@code if_seq_no}
+         */
+        public final Builder<TDocument, TPartialDocument> ifSeqNo(@Nullable Long value) {
+            this.ifSeqNo = value;
+            return this;
+        }
+
+        /**
+         * Required - The name of the index
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder<TDocument, TPartialDocument> index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * The script language.
+         * <p>
+         * API name: {@code lang}
+         */
+        public final Builder<TDocument, TPartialDocument> lang(@Nullable String value) {
+            this.lang = value;
+            return this;
+        }
+
+        /**
+         * If 'true', Elasticsearch refreshes the affected shards to make this operation
+         * visible to search, if 'wait_for' then wait for a refresh to make this
+         * operation visible to search, if 'false' do nothing with refreshes.
+         * <p>
+         * API name: {@code refresh}
+         */
+        public final Builder<TDocument, TPartialDocument> refresh(@Nullable Refresh value) {
+            this.refresh = value;
+            return this;
+        }
+
+        /**
+         * If true, the destination must be an index alias.
+         * <p>
+         * API name: {@code require_alias}
+         */
+        public final Builder<TDocument, TPartialDocument> requireAlias(@Nullable Boolean value) {
+            this.requireAlias = value;
+            return this;
+        }
+
+        /**
+         * Specify how many times should the operation be retried when a conflict
+         * occurs.
+         * <p>
+         * API name: {@code retry_on_conflict}
+         */
+        public final Builder<TDocument, TPartialDocument> retryOnConflict(@Nullable Integer value) {
+            this.retryOnConflict = value;
+            return this;
+        }
+
+        /**
+         * Custom value used to route operations to a specific shard.
+         * <p>
+         * API name: {@code routing}
+         */
+        public final Builder<TDocument, TPartialDocument> routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Script to execute to update the document.
+         * <p>
+         * API name: {@code script}
+         */
+        public final Builder<TDocument, TPartialDocument> script(@Nullable Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * Script to execute to update the document.
+         * <p>
+         * API name: {@code script}
+         */
+        public final Builder<TDocument, TPartialDocument> script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        /**
+         * Set to true to execute the script whether or not the document exists.
+         * <p>
+         * API name: {@code scripted_upsert}
+         */
+        public final Builder<TDocument, TPartialDocument> scriptedUpsert(@Nullable Boolean value) {
+            this.scriptedUpsert = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for dynamic mapping updates and active shards. This guarantees
+         * Elasticsearch waits for at least the timeout before failing. The actual wait
+         * time could be longer, particularly when multiple waits occur.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder<TDocument, TPartialDocument> timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for dynamic mapping updates and active shards. This guarantees
+         * Elasticsearch waits for at least the timeout before failing. The actual wait
+         * time could be longer, particularly when multiple waits occur.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder<TDocument, TPartialDocument> timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * If the document does not already exist, the contents of 'upsert' are inserted
+         * as a new document. If the document exists, the 'script' is executed.
+         * <p>
+         * API name: {@code upsert}
+         */
+        public final Builder<TDocument, TPartialDocument> upsert(@Nullable TDocument value) {
+            this.upsert = value;
+            return this;
+        }
+
+        /**
+         * The number of shard copies that must be active before proceeding with the
+         * operations. Set to 'all' or any positive integer up to the total number of
+         * shards in the index (number_of_replicas+1). Defaults to 1 meaning the primary
+         * shard.
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder<TDocument, TPartialDocument> waitForActiveShards(@Nullable WaitForActiveShards value) {
+            this.waitForActiveShards = value;
+            return this;
+        }
+
+        /**
+         * The number of shard copies that must be active before proceeding with the
+         * operations. Set to 'all' or any positive integer up to the total number of
+         * shards in the index (number_of_replicas+1). Defaults to 1 meaning the primary
+         * shard.
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder<TDocument, TPartialDocument> waitForActiveShards(
+            Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn
+        ) {
+            return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
+        }
+
+        /**
+         * Serializer for TDocument. If not set, an attempt will be made to find a
+         * serializer from the JSON context.
+         */
+        public final Builder<TDocument, TPartialDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
+            this.tDocumentSerializer = value;
+            return this;
+        }
+
+        /**
+         * Serializer for TPartialDocument. If not set, an attempt will be made to find
+         * a serializer from the JSON context.
+         */
+        public final Builder<TDocument, TPartialDocument> tPartialDocumentSerializer(@Nullable JsonpSerializer<TPartialDocument> value) {
+            this.tPartialDocumentSerializer = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link UpdateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UpdateRequest<TDocument, TPartialDocument> build() {
+            _checkSingleUse();
+
+            return new UpdateRequest<TDocument, TPartialDocument>(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Create a JSON deserializer for UpdateRequest
+     */
+    public static <
+        TDocument,
+        TPartialDocument> JsonpDeserializer<UpdateRequest<TDocument, TPartialDocument>> createUpdateRequestDeserializer(
+            JsonpDeserializer<TDocument> tDocumentDeserializer,
+            JsonpDeserializer<TPartialDocument> tPartialDocumentDeserializer
+        ) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<TDocument, TPartialDocument>>) Builder::new,
+            op -> UpdateRequest.setupUpdateRequestDeserializer(op, tDocumentDeserializer, tPartialDocumentDeserializer)
+        );
+    };
+
+    protected static <TDocument, TPartialDocument> void setupUpdateRequestDeserializer(
+        ObjectDeserializer<UpdateRequest.Builder<TDocument, TPartialDocument>> op,
+        JsonpDeserializer<TDocument> tDocumentDeserializer,
+        JsonpDeserializer<TPartialDocument> tPartialDocumentDeserializer
+    ) {
+
+        op.add(Builder::source, SourceConfig._DESERIALIZER, "_source");
+        op.add(Builder::detectNoop, JsonpDeserializer.booleanDeserializer(), "detect_noop");
+        op.add(Builder::doc, tPartialDocumentDeserializer, "doc");
+        op.add(Builder::docAsUpsert, JsonpDeserializer.booleanDeserializer(), "doc_as_upsert");
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+        op.add(Builder::scriptedUpsert, JsonpDeserializer.booleanDeserializer(), "scripted_upsert");
+        op.add(Builder::upsert, tDocumentDeserializer, "upsert");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code update}".
+     */
+    public static final SimpleEndpoint<UpdateRequest<?, ?>, ?> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+            final int _id = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+            propsSet |= _id;
+
+            if (propsSet == (_index | _id)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_update");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.id, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            if (request.requireAlias != null) {
+                params.put("require_alias", String.valueOf(request.requireAlias));
+            }
+            if (request.ifPrimaryTerm != null) {
+                params.put("if_primary_term", String.valueOf(request.ifPrimaryTerm));
+            }
+            if (request.ifSeqNo != null) {
+                params.put("if_seq_no", String.valueOf(request.ifSeqNo));
+            }
+            if (request.refresh != null) {
+                params.put("refresh", request.refresh.jsonValue());
+            }
+            if (request.waitForActiveShards != null) {
+                params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
+            }
+            if (request.lang != null) {
+                params.put("lang", request.lang);
+            }
+            if (request.retryOnConflict != null) {
+                params.put("retry_on_conflict", String.valueOf(request.retryOnConflict));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        UpdateResponse._DESERIALIZER
+    );
+
+    /**
+     * Create an "{@code update}" endpoint.
+     */
+    public static <TDocument> Endpoint<UpdateRequest<?, ?>, UpdateResponse<TDocument>, ErrorResponse> createUpdateEndpoint(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return _ENDPOINT.withResponseDeserializer(UpdateResponse.createUpdateResponseDeserializer(tDocumentDeserializer));
+    }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateResponse.java
index 4ef62727da..bc3c6ab25b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateResponse.java
@@ -32,8 +32,10 @@
 
 package org.opensearch.client.opensearch.core;
 
-import org.opensearch.client.opensearch._types.InlineGet;
-import org.opensearch.client.opensearch._types.WriteResponseBase;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,140 +43,139 @@
 import org.opensearch.client.json.NamedDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.InlineGet;
+import org.opensearch.client.opensearch._types.WriteResponseBase;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import java.util.function.Supplier;
-import javax.annotation.Nullable;
 
 // typedef: _global.update.Response
 
-
 @JsonpDeserializable
 public class UpdateResponse<TDocument> extends WriteResponseBase {
-	@Nullable
-	private final InlineGet<TDocument> get;
-
-	@Nullable
-	private final JsonpSerializer<TDocument> tDocumentSerializer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private UpdateResponse(Builder<TDocument> builder) {
-		super(builder);
-
-		this.get = builder.get;
-		this.tDocumentSerializer = builder.tDocumentSerializer;
-
-	}
-
-	public static <TDocument> UpdateResponse<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<UpdateResponse<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * API name: {@code get}
-	 */
-	@Nullable
-	public final InlineGet<TDocument> get() {
-		return this.get;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.get != null) {
-			generator.writeKey("get");
-			this.get.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UpdateResponse}.
-	 */
-
-	public static class Builder<TDocument> extends WriteResponseBase.AbstractBuilder<Builder<TDocument>>
-			implements
-				ObjectBuilder<UpdateResponse<TDocument>> {
-		@Nullable
-		private InlineGet<TDocument> get;
-
-		@Nullable
-		private JsonpSerializer<TDocument> tDocumentSerializer;
-
-		/**
-		 * API name: {@code get}
-		 */
-		public final Builder<TDocument> get(@Nullable InlineGet<TDocument> value) {
-			this.get = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code get}
-		 */
-		public final Builder<TDocument> get(
-				Function<InlineGet.Builder<TDocument>, ObjectBuilder<InlineGet<TDocument>>> fn) {
-			return this.get(fn.apply(new InlineGet.Builder<TDocument>()).build());
-		}
-
-		/**
-		 * Serializer for TDocument. If not set, an attempt will be made to find a
-		 * serializer from the JSON context.
-		 */
-		public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
-			this.tDocumentSerializer = value;
-			return this;
-		}
-
-		@Override
-		protected Builder<TDocument> self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link UpdateResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UpdateResponse<TDocument> build() {
-			_checkSingleUse();
-
-			return new UpdateResponse<TDocument>(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Create a JSON deserializer for UpdateResponse
-	 */
-	public static <TDocument> JsonpDeserializer<UpdateResponse<TDocument>> createUpdateResponseDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return ObjectBuilderDeserializer.createForObject((Supplier<Builder<TDocument>>) Builder::new,
-				op -> UpdateResponse.setupUpdateResponseDeserializer(op, tDocumentDeserializer));
-	};
-
-	/**
-	 * Json deserializer for {@link UpdateResponse} based on named deserializers
-	 * provided by the calling {@code JsonMapper}.
-	 */
-	public static final JsonpDeserializer<UpdateResponse<Object>> _DESERIALIZER = createUpdateResponseDeserializer(
-			new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.update.TDocument"));
-
-	protected static <TDocument> void setupUpdateResponseDeserializer(
-			ObjectDeserializer<UpdateResponse.Builder<TDocument>> op,
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		WriteResponseBase.setupWriteResponseBaseDeserializer(op);
-		op.add(Builder::get, InlineGet.createInlineGetDeserializer(tDocumentDeserializer), "get");
-
-	}
+    @Nullable
+    private final InlineGet<TDocument> get;
+
+    @Nullable
+    private final JsonpSerializer<TDocument> tDocumentSerializer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private UpdateResponse(Builder<TDocument> builder) {
+        super(builder);
+
+        this.get = builder.get;
+        this.tDocumentSerializer = builder.tDocumentSerializer;
+
+    }
+
+    public static <TDocument> UpdateResponse<TDocument> of(Function<Builder<TDocument>, ObjectBuilder<UpdateResponse<TDocument>>> fn) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * API name: {@code get}
+     */
+    @Nullable
+    public final InlineGet<TDocument> get() {
+        return this.get;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.get != null) {
+            generator.writeKey("get");
+            this.get.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UpdateResponse}.
+     */
+
+    public static class Builder<TDocument> extends WriteResponseBase.AbstractBuilder<Builder<TDocument>>
+        implements
+            ObjectBuilder<UpdateResponse<TDocument>> {
+        @Nullable
+        private InlineGet<TDocument> get;
+
+        @Nullable
+        private JsonpSerializer<TDocument> tDocumentSerializer;
+
+        /**
+         * API name: {@code get}
+         */
+        public final Builder<TDocument> get(@Nullable InlineGet<TDocument> value) {
+            this.get = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code get}
+         */
+        public final Builder<TDocument> get(Function<InlineGet.Builder<TDocument>, ObjectBuilder<InlineGet<TDocument>>> fn) {
+            return this.get(fn.apply(new InlineGet.Builder<TDocument>()).build());
+        }
+
+        /**
+         * Serializer for TDocument. If not set, an attempt will be made to find a
+         * serializer from the JSON context.
+         */
+        public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
+            this.tDocumentSerializer = value;
+            return this;
+        }
+
+        @Override
+        protected Builder<TDocument> self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link UpdateResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UpdateResponse<TDocument> build() {
+            _checkSingleUse();
+
+            return new UpdateResponse<TDocument>(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Create a JSON deserializer for UpdateResponse
+     */
+    public static <TDocument> JsonpDeserializer<UpdateResponse<TDocument>> createUpdateResponseDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<TDocument>>) Builder::new,
+            op -> UpdateResponse.setupUpdateResponseDeserializer(op, tDocumentDeserializer)
+        );
+    };
+
+    /**
+     * Json deserializer for {@link UpdateResponse} based on named deserializers
+     * provided by the calling {@code JsonMapper}.
+     */
+    public static final JsonpDeserializer<UpdateResponse<Object>> _DESERIALIZER = createUpdateResponseDeserializer(
+        new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.update.TDocument")
+    );
+
+    protected static <TDocument> void setupUpdateResponseDeserializer(
+        ObjectDeserializer<UpdateResponse.Builder<TDocument>> op,
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        WriteResponseBase.setupWriteResponseBaseDeserializer(op);
+        op.add(Builder::get, InlineGet.createInlineGetDeserializer(tDocumentDeserializer), "get");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkOperation.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkOperation.java
index 755ad6ad2a..20add0112d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkOperation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkOperation.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.bulk;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Iterator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
@@ -41,219 +44,215 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Iterator;
-import java.util.function.Function;
 
 // typedef: _global.bulk.OperationContainer
 
-
-
 public class BulkOperation implements TaggedUnion<BulkOperation.Kind, Object>, NdJsonpSerializable, JsonpSerializable {
 
-	/**
-	 * {@link BulkOperation} variant kinds.
-	 */
-	/**
-	 * {@link BulkOperation} variant kinds.
-	 */
+    /**
+     * {@link BulkOperation} variant kinds.
+     */
+    /**
+     * {@link BulkOperation} variant kinds.
+     */
 
-	public enum Kind implements JsonEnum {
-		Index("index"),
+    public enum Kind implements JsonEnum {
+        Index("index"),
 
-		Create("create"),
-
-		Update("update"),
-
-		Delete("delete"),
-
-		;
-
-		private final String jsonValue;
-
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
-
-		public String jsonValue() {
-			return this.jsonValue;
-		}
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	public BulkOperation(BulkOperationVariant value) {
-
-		this._kind = ApiTypeHelper.requireNonNull(value._bulkOperationKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
-
-	}
-
-	private BulkOperation(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static BulkOperation of(Function<Builder, ObjectBuilder<BulkOperation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	@Override
-	public Iterator<?> _serializables() {
-		return TaggedUnionUtils.ndJsonIterator(this);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code index}?
-	 */
-	public boolean isIndex() {
-		return _kind == Kind.Index;
-	}
-
-	/**
-	 * Get the {@code index} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code index} kind.
-	 */
-	public <TDocument> IndexOperation<TDocument> index() {
-		return TaggedUnionUtils.get(this, Kind.Index);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code create}?
-	 */
-	public boolean isCreate() {
-		return _kind == Kind.Create;
-	}
-
-	/**
-	 * Get the {@code create} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code create} kind.
-	 */
-	public <TDocument> CreateOperation<TDocument> create() {
-		return TaggedUnionUtils.get(this, Kind.Create);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code update}?
-	 */
-	public boolean isUpdate() {
-		return _kind == Kind.Update;
-	}
-
-	/**
-	 * Get the {@code update} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code update} kind.
-	 */
-	public <TDocument> UpdateOperation<TDocument> update() {
-		return TaggedUnionUtils.get(this, Kind.Update);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code delete}?
-	 */
-	public boolean isDelete() {
-		return _kind == Kind.Delete;
-	}
-
-	/**
-	 * Get the {@code delete} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code delete} kind.
-	 */
-	public DeleteOperation delete() {
-		return TaggedUnionUtils.get(this, Kind.Delete);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeStartObject();
-
-		generator.writeKey(_kind.jsonValue());
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		}
-
-		generator.writeEnd();
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<BulkOperation> {
-		private Kind _kind;
-		private Object _value;
-
-		public <TDocument> ObjectBuilder<BulkOperation> index(IndexOperation<TDocument> v) {
-			this._kind = Kind.Index;
-			this._value = v;
-			return this;
-		}
-
-		public <TDocument> ObjectBuilder<BulkOperation> index(
-				Function<IndexOperation.Builder<TDocument>, ObjectBuilder<IndexOperation<TDocument>>> fn) {
-			return this.index(fn.apply(new IndexOperation.Builder<TDocument>()).build());
-		}
-
-		public <TDocument> ObjectBuilder<BulkOperation> create(CreateOperation<TDocument> v) {
-			this._kind = Kind.Create;
-			this._value = v;
-			return this;
-		}
-
-		public <TDocument> ObjectBuilder<BulkOperation> create(
-				Function<CreateOperation.Builder<TDocument>, ObjectBuilder<CreateOperation<TDocument>>> fn) {
-			return this.create(fn.apply(new CreateOperation.Builder<TDocument>()).build());
-		}
-
-		public <TDocument> ObjectBuilder<BulkOperation> update(UpdateOperation<TDocument> v) {
-			this._kind = Kind.Update;
-			this._value = v;
-			return this;
-		}
-
-		public <TDocument> ObjectBuilder<BulkOperation> update(
-				Function<UpdateOperation.Builder<TDocument>, ObjectBuilder<UpdateOperation<TDocument>>> fn) {
-			return this.update(fn.apply(new UpdateOperation.Builder<TDocument>()).build());
-		}
-
-		public ObjectBuilder<BulkOperation> delete(DeleteOperation v) {
-			this._kind = Kind.Delete;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<BulkOperation> delete(
-				Function<DeleteOperation.Builder, ObjectBuilder<DeleteOperation>> fn) {
-			return this.delete(fn.apply(new DeleteOperation.Builder()).build());
-		}
-
-		public BulkOperation build() {
-			_checkSingleUse();
-			return new BulkOperation(this);
-		}
-
-	}
+        Create("create"),
+
+        Update("update"),
+
+        Delete("delete"),
+
+        ;
+
+        private final String jsonValue;
+
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
+
+        public String jsonValue() {
+            return this.jsonValue;
+        }
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    public BulkOperation(BulkOperationVariant value) {
+
+        this._kind = ApiTypeHelper.requireNonNull(value._bulkOperationKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+
+    }
+
+    private BulkOperation(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static BulkOperation of(Function<Builder, ObjectBuilder<BulkOperation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    @Override
+    public Iterator<?> _serializables() {
+        return TaggedUnionUtils.ndJsonIterator(this);
+    }
+
+    /**
+     * Is this variant instance of kind {@code index}?
+     */
+    public boolean isIndex() {
+        return _kind == Kind.Index;
+    }
+
+    /**
+     * Get the {@code index} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code index} kind.
+     */
+    public <TDocument> IndexOperation<TDocument> index() {
+        return TaggedUnionUtils.get(this, Kind.Index);
+    }
+
+    /**
+     * Is this variant instance of kind {@code create}?
+     */
+    public boolean isCreate() {
+        return _kind == Kind.Create;
+    }
+
+    /**
+     * Get the {@code create} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code create} kind.
+     */
+    public <TDocument> CreateOperation<TDocument> create() {
+        return TaggedUnionUtils.get(this, Kind.Create);
+    }
+
+    /**
+     * Is this variant instance of kind {@code update}?
+     */
+    public boolean isUpdate() {
+        return _kind == Kind.Update;
+    }
+
+    /**
+     * Get the {@code update} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code update} kind.
+     */
+    public <TDocument> UpdateOperation<TDocument> update() {
+        return TaggedUnionUtils.get(this, Kind.Update);
+    }
+
+    /**
+     * Is this variant instance of kind {@code delete}?
+     */
+    public boolean isDelete() {
+        return _kind == Kind.Delete;
+    }
+
+    /**
+     * Get the {@code delete} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code delete} kind.
+     */
+    public DeleteOperation delete() {
+        return TaggedUnionUtils.get(this, Kind.Delete);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeStartObject();
+
+        generator.writeKey(_kind.jsonValue());
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        }
+
+        generator.writeEnd();
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<BulkOperation> {
+        private Kind _kind;
+        private Object _value;
+
+        public <TDocument> ObjectBuilder<BulkOperation> index(IndexOperation<TDocument> v) {
+            this._kind = Kind.Index;
+            this._value = v;
+            return this;
+        }
+
+        public <TDocument> ObjectBuilder<BulkOperation> index(
+            Function<IndexOperation.Builder<TDocument>, ObjectBuilder<IndexOperation<TDocument>>> fn
+        ) {
+            return this.index(fn.apply(new IndexOperation.Builder<TDocument>()).build());
+        }
+
+        public <TDocument> ObjectBuilder<BulkOperation> create(CreateOperation<TDocument> v) {
+            this._kind = Kind.Create;
+            this._value = v;
+            return this;
+        }
+
+        public <TDocument> ObjectBuilder<BulkOperation> create(
+            Function<CreateOperation.Builder<TDocument>, ObjectBuilder<CreateOperation<TDocument>>> fn
+        ) {
+            return this.create(fn.apply(new CreateOperation.Builder<TDocument>()).build());
+        }
+
+        public <TDocument> ObjectBuilder<BulkOperation> update(UpdateOperation<TDocument> v) {
+            this._kind = Kind.Update;
+            this._value = v;
+            return this;
+        }
+
+        public <TDocument> ObjectBuilder<BulkOperation> update(
+            Function<UpdateOperation.Builder<TDocument>, ObjectBuilder<UpdateOperation<TDocument>>> fn
+        ) {
+            return this.update(fn.apply(new UpdateOperation.Builder<TDocument>()).build());
+        }
+
+        public ObjectBuilder<BulkOperation> delete(DeleteOperation v) {
+            this._kind = Kind.Delete;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<BulkOperation> delete(Function<DeleteOperation.Builder, ObjectBuilder<DeleteOperation>> fn) {
+            return this.delete(fn.apply(new DeleteOperation.Builder()).build());
+        }
+
+        public BulkOperation build() {
+            _checkSingleUse();
+            return new BulkOperation(this);
+        }
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkOperationBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkOperationBase.java
index c5371baa35..85cf013009 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkOperationBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkOperationBase.java
@@ -32,255 +32,250 @@
 
 package org.opensearch.client.opensearch.core.bulk;
 
-import org.opensearch.client.opensearch._types.VersionType;
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.VersionType;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import javax.annotation.Nullable;
 
 // typedef: _global.bulk.OperationBase
 
-
-
 public abstract class BulkOperationBase implements JsonpSerializable {
-	@Nullable
-	private final String id;
-
-	@Nullable
-	private final String index;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final Long ifPrimaryTerm;
-
-	@Nullable
-	private final Long ifSeqNo;
-
-	@Nullable
-	private final Long version;
-
-	@Nullable
-	private final VersionType versionType;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected BulkOperationBase(AbstractBuilder<?> builder) {
-
-		this.id = builder.id;
-		this.index = builder.index;
-		this.routing = builder.routing;
-		this.ifPrimaryTerm = builder.ifPrimaryTerm;
-		this.ifSeqNo = builder.ifSeqNo;
-		this.version = builder.version;
-		this.versionType = builder.versionType;
-
-	}
-
-	/**
-	 * API name: {@code _id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * API name: {@code _index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * API name: {@code if_primary_term}
-	 */
-	@Nullable
-	public final Long ifPrimaryTerm() {
-		return this.ifPrimaryTerm;
-	}
-
-	/**
-	 * API name: {@code if_seq_no}
-	 */
-	@Nullable
-	public final Long ifSeqNo() {
-		return this.ifSeqNo;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * API name: {@code version_type}
-	 */
-	@Nullable
-	public final VersionType versionType() {
-		return this.versionType;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.id != null) {
-			generator.writeKey("_id");
-			generator.write(this.id);
-
-		}
-		if (this.index != null) {
-			generator.writeKey("_index");
-			generator.write(this.index);
-
-		}
-		if (this.routing != null) {
-			generator.writeKey("routing");
-			generator.write(this.routing);
-
-		}
-		if (this.ifPrimaryTerm != null) {
-			generator.writeKey("if_primary_term");
-			generator.write(this.ifPrimaryTerm);
-
-		}
-		if (this.ifSeqNo != null) {
-			generator.writeKey("if_seq_no");
-			generator.write(this.ifSeqNo);
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		if (this.versionType != null) {
-			generator.writeKey("version_type");
-			this.versionType.serialize(generator, mapper);
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		@Nullable
-		private String id;
-
-		@Nullable
-		private String index;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private Long ifPrimaryTerm;
-
-		@Nullable
-		private Long ifSeqNo;
-
-		@Nullable
-		private Long version;
-
-		@Nullable
-		private VersionType versionType;
-
-		/**
-		 * API name: {@code _id}
-		 */
-		public final BuilderT id(@Nullable String value) {
-			this.id = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code _index}
-		 */
-		public final BuilderT index(@Nullable String value) {
-			this.index = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code routing}
-		 */
-		public final BuilderT routing(@Nullable String value) {
-			this.routing = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code if_primary_term}
-		 */
-		public final BuilderT ifPrimaryTerm(@Nullable Long value) {
-			this.ifPrimaryTerm = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code if_seq_no}
-		 */
-		public final BuilderT ifSeqNo(@Nullable Long value) {
-			this.ifSeqNo = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final BuilderT version(@Nullable Long value) {
-			this.version = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code version_type}
-		 */
-		public final BuilderT versionType(@Nullable VersionType value) {
-			this.versionType = value;
-			return self();
-		}
-
-		protected abstract BuilderT self();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupBulkOperationBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-
-		op.add(AbstractBuilder::id, JsonpDeserializer.stringDeserializer(), "_id");
-		op.add(AbstractBuilder::index, JsonpDeserializer.stringDeserializer(), "_index");
-		op.add(AbstractBuilder::routing, JsonpDeserializer.stringDeserializer(), "routing");
-		op.add(AbstractBuilder::ifPrimaryTerm, JsonpDeserializer.longDeserializer(), "if_primary_term");
-		op.add(AbstractBuilder::ifSeqNo, JsonpDeserializer.longDeserializer(), "if_seq_no");
-		op.add(AbstractBuilder::version, JsonpDeserializer.longDeserializer(), "version");
-		op.add(AbstractBuilder::versionType, VersionType._DESERIALIZER, "version_type");
-
-	}
+    @Nullable
+    private final String id;
+
+    @Nullable
+    private final String index;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final Long ifPrimaryTerm;
+
+    @Nullable
+    private final Long ifSeqNo;
+
+    @Nullable
+    private final Long version;
+
+    @Nullable
+    private final VersionType versionType;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected BulkOperationBase(AbstractBuilder<?> builder) {
+
+        this.id = builder.id;
+        this.index = builder.index;
+        this.routing = builder.routing;
+        this.ifPrimaryTerm = builder.ifPrimaryTerm;
+        this.ifSeqNo = builder.ifSeqNo;
+        this.version = builder.version;
+        this.versionType = builder.versionType;
+
+    }
+
+    /**
+     * API name: {@code _id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * API name: {@code _index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * API name: {@code if_primary_term}
+     */
+    @Nullable
+    public final Long ifPrimaryTerm() {
+        return this.ifPrimaryTerm;
+    }
+
+    /**
+     * API name: {@code if_seq_no}
+     */
+    @Nullable
+    public final Long ifSeqNo() {
+        return this.ifSeqNo;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * API name: {@code version_type}
+     */
+    @Nullable
+    public final VersionType versionType() {
+        return this.versionType;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.id != null) {
+            generator.writeKey("_id");
+            generator.write(this.id);
+
+        }
+        if (this.index != null) {
+            generator.writeKey("_index");
+            generator.write(this.index);
+
+        }
+        if (this.routing != null) {
+            generator.writeKey("routing");
+            generator.write(this.routing);
+
+        }
+        if (this.ifPrimaryTerm != null) {
+            generator.writeKey("if_primary_term");
+            generator.write(this.ifPrimaryTerm);
+
+        }
+        if (this.ifSeqNo != null) {
+            generator.writeKey("if_seq_no");
+            generator.write(this.ifSeqNo);
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        if (this.versionType != null) {
+            generator.writeKey("version_type");
+            this.versionType.serialize(generator, mapper);
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        @Nullable
+        private String id;
+
+        @Nullable
+        private String index;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private Long ifPrimaryTerm;
+
+        @Nullable
+        private Long ifSeqNo;
+
+        @Nullable
+        private Long version;
+
+        @Nullable
+        private VersionType versionType;
+
+        /**
+         * API name: {@code _id}
+         */
+        public final BuilderT id(@Nullable String value) {
+            this.id = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code _index}
+         */
+        public final BuilderT index(@Nullable String value) {
+            this.index = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code routing}
+         */
+        public final BuilderT routing(@Nullable String value) {
+            this.routing = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code if_primary_term}
+         */
+        public final BuilderT ifPrimaryTerm(@Nullable Long value) {
+            this.ifPrimaryTerm = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code if_seq_no}
+         */
+        public final BuilderT ifSeqNo(@Nullable Long value) {
+            this.ifSeqNo = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final BuilderT version(@Nullable Long value) {
+            this.version = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code version_type}
+         */
+        public final BuilderT versionType(@Nullable VersionType value) {
+            this.versionType = value;
+            return self();
+        }
+
+        protected abstract BuilderT self();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupBulkOperationBaseDeserializer(ObjectDeserializer<BuilderT> op) {
+
+        op.add(AbstractBuilder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(AbstractBuilder::index, JsonpDeserializer.stringDeserializer(), "_index");
+        op.add(AbstractBuilder::routing, JsonpDeserializer.stringDeserializer(), "routing");
+        op.add(AbstractBuilder::ifPrimaryTerm, JsonpDeserializer.longDeserializer(), "if_primary_term");
+        op.add(AbstractBuilder::ifSeqNo, JsonpDeserializer.longDeserializer(), "if_seq_no");
+        op.add(AbstractBuilder::version, JsonpDeserializer.longDeserializer(), "version");
+        op.add(AbstractBuilder::versionType, VersionType._DESERIALIZER, "version_type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkOperationBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkOperationBuilders.java
index 20aec02142..808da4ac78 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkOperationBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkOperationBuilders.java
@@ -36,39 +36,38 @@
  * Builders for {@link BulkOperation} variants.
  */
 public class BulkOperationBuilders {
-	private BulkOperationBuilders() {
-	}
+    private BulkOperationBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link IndexOperation index} {@code BulkOperation}
-	 * variant.
-	 */
-	public static IndexOperation.Builder index() {
-		return new IndexOperation.Builder();
-	}
+    /**
+     * Creates a builder for the {@link IndexOperation index} {@code BulkOperation}
+     * variant.
+     */
+    public static IndexOperation.Builder index() {
+        return new IndexOperation.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link CreateOperation create}
-	 * {@code BulkOperation} variant.
-	 */
-	public static CreateOperation.Builder create() {
-		return new CreateOperation.Builder();
-	}
+    /**
+     * Creates a builder for the {@link CreateOperation create}
+     * {@code BulkOperation} variant.
+     */
+    public static CreateOperation.Builder create() {
+        return new CreateOperation.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link UpdateOperation update}
-	 * {@code BulkOperation} variant.
-	 */
-	public static UpdateOperation.Builder update() {
-		return new UpdateOperation.Builder();
-	}
+    /**
+     * Creates a builder for the {@link UpdateOperation update}
+     * {@code BulkOperation} variant.
+     */
+    public static UpdateOperation.Builder update() {
+        return new UpdateOperation.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link DeleteOperation delete}
-	 * {@code BulkOperation} variant.
-	 */
-	public static DeleteOperation.Builder delete() {
-		return new DeleteOperation.Builder();
-	}
+    /**
+     * Creates a builder for the {@link DeleteOperation delete}
+     * {@code BulkOperation} variant.
+     */
+    public static DeleteOperation.Builder delete() {
+        return new DeleteOperation.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkOperationVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkOperationVariant.java
index e450a5125e..e1a7a12473 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkOperationVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkOperationVariant.java
@@ -37,10 +37,10 @@
  */
 public interface BulkOperationVariant {
 
-	BulkOperation.Kind _bulkOperationKind();
+    BulkOperation.Kind _bulkOperationKind();
 
-	default BulkOperation _toBulkOperation() {
-		return new BulkOperation(this);
-	}
+    default BulkOperation _toBulkOperation() {
+        return new BulkOperation(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkResponseItem.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkResponseItem.java
index 22c0648f3f..32bc0bb6b8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkResponseItem.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkResponseItem.java
@@ -32,9 +32,10 @@
 
 package org.opensearch.client.opensearch.core.bulk;
 
-import org.opensearch.client.opensearch._types.ErrorCause;
-import org.opensearch.client.opensearch._types.InlineGet;
-import org.opensearch.client.opensearch._types.ShardStatistics;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,435 +43,432 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorCause;
+import org.opensearch.client.opensearch._types.InlineGet;
+import org.opensearch.client.opensearch._types.ShardStatistics;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.bulk.ResponseItem
 
-
 @JsonpDeserializable
 public class BulkResponseItem implements JsonpSerializable {
-	// Single key dictionary
-	private final OperationType operationType;
-
-	@Nullable
-	private final String id;
-
-	private final String index;
-
-	private final int status;
-
-	@Nullable
-	private final ErrorCause error;
-
-	@Nullable
-	private final Long primaryTerm;
-
-	@Nullable
-	private final String result;
-
-	@Nullable
-	private final Long seqNo;
-
-	@Nullable
-	private final ShardStatistics shards;
-
-	@Nullable
-	private final Long version;
-
-	@Nullable
-	private final Boolean forcedRefresh;
-
-	@Nullable
-	private final InlineGet<Map<String, JsonData>> get;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private BulkResponseItem(Builder builder) {
-
-		this.operationType = ApiTypeHelper.requireNonNull(builder.operationType, this, "operationType");
-
-		this.id = builder.id;
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
-		this.error = builder.error;
-		this.primaryTerm = builder.primaryTerm;
-		this.result = builder.result;
-		this.seqNo = builder.seqNo;
-		this.shards = builder.shards;
-		this.version = builder.version;
-		this.forcedRefresh = builder.forcedRefresh;
-		this.get = builder.get;
-
-	}
-
-	public static BulkResponseItem of(Function<Builder, ObjectBuilder<BulkResponseItem>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required -
-	 */
-	public final OperationType operationType() {
-		return this.operationType;
-	}
-
-	/**
-	 * API name: {@code _id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - API name: {@code _index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Required - API name: {@code status}
-	 */
-	public final int status() {
-		return this.status;
-	}
-
-	/**
-	 * API name: {@code error}
-	 */
-	@Nullable
-	public final ErrorCause error() {
-		return this.error;
-	}
-
-	/**
-	 * API name: {@code _primary_term}
-	 */
-	@Nullable
-	public final Long primaryTerm() {
-		return this.primaryTerm;
-	}
-
-	/**
-	 * API name: {@code result}
-	 */
-	@Nullable
-	public final String result() {
-		return this.result;
-	}
-
-	/**
-	 * API name: {@code _seq_no}
-	 */
-	@Nullable
-	public final Long seqNo() {
-		return this.seqNo;
-	}
-
-	/**
-	 * API name: {@code _shards}
-	 */
-	@Nullable
-	public final ShardStatistics shards() {
-		return this.shards;
-	}
-
-	/**
-	 * API name: {@code _version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * API name: {@code forced_refresh}
-	 */
-	@Nullable
-	public final Boolean forcedRefresh() {
-		return this.forcedRefresh;
-	}
-
-	/**
-	 * API name: {@code get}
-	 */
-	@Nullable
-	public final InlineGet<Map<String, JsonData>> get() {
-		return this.get;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject(this.operationType.jsonValue());
-
-		if (this.id != null) {
-			generator.writeKey("_id");
-			generator.write(this.id);
-
-		}
-		generator.writeKey("_index");
-		generator.write(this.index);
-
-		generator.writeKey("status");
-		generator.write(this.status);
-
-		if (this.error != null) {
-			generator.writeKey("error");
-			this.error.serialize(generator, mapper);
-
-		}
-		if (this.primaryTerm != null) {
-			generator.writeKey("_primary_term");
-			generator.write(this.primaryTerm);
-
-		}
-		if (this.result != null) {
-			generator.writeKey("result");
-			generator.write(this.result);
-
-		}
-		if (this.seqNo != null) {
-			generator.writeKey("_seq_no");
-			generator.write(this.seqNo);
-
-		}
-		if (this.shards != null) {
-			generator.writeKey("_shards");
-			this.shards.serialize(generator, mapper);
-
-		}
-		if (this.version != null) {
-			generator.writeKey("_version");
-			generator.write(this.version);
-
-		}
-		if (this.forcedRefresh != null) {
-			generator.writeKey("forced_refresh");
-			generator.write(this.forcedRefresh);
-
-		}
-		if (this.get != null) {
-			generator.writeKey("get");
-			this.get.serialize(generator, mapper);
-
-		}
-
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link BulkResponseItem}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<BulkResponseItem> {
-		private OperationType operationType;
-
-		/**
-		 * Required -
-		 */
-		public final Builder operationType(OperationType value) {
-			this.operationType = value;
-			return this;
-		}
-
-		@Nullable
-		private String id;
-
-		private String index;
-
-		private Integer status;
-
-		@Nullable
-		private ErrorCause error;
-
-		@Nullable
-		private Long primaryTerm;
-
-		@Nullable
-		private String result;
-
-		@Nullable
-		private Long seqNo;
-
-		@Nullable
-		private ShardStatistics shards;
-
-		@Nullable
-		private Long version;
-
-		@Nullable
-		private Boolean forcedRefresh;
-
-		@Nullable
-		private InlineGet<Map<String, JsonData>> get;
-
-		/**
-		 * API name: {@code _id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code status}
-		 */
-		public final Builder status(int value) {
-			this.status = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code error}
-		 */
-		public final Builder error(@Nullable ErrorCause value) {
-			this.error = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code error}
-		 */
-		public final Builder error(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
-			return this.error(fn.apply(new ErrorCause.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code _primary_term}
-		 */
-		public final Builder primaryTerm(@Nullable Long value) {
-			this.primaryTerm = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code result}
-		 */
-		public final Builder result(@Nullable String value) {
-			this.result = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _seq_no}
-		 */
-		public final Builder seqNo(@Nullable Long value) {
-			this.seqNo = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _shards}
-		 */
-		public final Builder shards(@Nullable ShardStatistics value) {
-			this.shards = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _shards}
-		 */
-		public final Builder shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
-			return this.shards(fn.apply(new ShardStatistics.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code _version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code forced_refresh}
-		 */
-		public final Builder forcedRefresh(@Nullable Boolean value) {
-			this.forcedRefresh = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code get}
-		 */
-		public final Builder get(@Nullable InlineGet<Map<String, JsonData>> value) {
-			this.get = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code get}
-		 */
-		public final Builder get(
-				Function<InlineGet.Builder<Map<String, JsonData>>, ObjectBuilder<InlineGet<Map<String, JsonData>>>> fn) {
-			return this.get(fn.apply(new InlineGet.Builder<Map<String, JsonData>>()).build());
-		}
-
-		/**
-		 * Builds a {@link BulkResponseItem}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public BulkResponseItem build() {
-			_checkSingleUse();
-
-			return new BulkResponseItem(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link BulkResponseItem}
-	 */
-	public static final JsonpDeserializer<BulkResponseItem> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			BulkResponseItem::setupBulkResponseItemDeserializer);
-
-	protected static void setupBulkResponseItemDeserializer(ObjectDeserializer<BulkResponseItem.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
-		op.add(Builder::status, JsonpDeserializer.integerDeserializer(), "status");
-		op.add(Builder::error, ErrorCause._DESERIALIZER, "error");
-		op.add(Builder::primaryTerm, JsonpDeserializer.longDeserializer(), "_primary_term");
-		op.add(Builder::result, JsonpDeserializer.stringDeserializer(), "result");
-		op.add(Builder::seqNo, JsonpDeserializer.longDeserializer(), "_seq_no");
-		op.add(Builder::shards, ShardStatistics._DESERIALIZER, "_shards");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "_version");
-		op.add(Builder::forcedRefresh, JsonpDeserializer.booleanDeserializer(), "forced_refresh");
-		op.add(Builder::get,
-				InlineGet.createInlineGetDeserializer(JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER)),
-				"get");
-
-		op.setKey(Builder::operationType, OperationType._DESERIALIZER);
-
-	}
+    // Single key dictionary
+    private final OperationType operationType;
+
+    @Nullable
+    private final String id;
+
+    private final String index;
+
+    private final int status;
+
+    @Nullable
+    private final ErrorCause error;
+
+    @Nullable
+    private final Long primaryTerm;
+
+    @Nullable
+    private final String result;
+
+    @Nullable
+    private final Long seqNo;
+
+    @Nullable
+    private final ShardStatistics shards;
+
+    @Nullable
+    private final Long version;
+
+    @Nullable
+    private final Boolean forcedRefresh;
+
+    @Nullable
+    private final InlineGet<Map<String, JsonData>> get;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private BulkResponseItem(Builder builder) {
+
+        this.operationType = ApiTypeHelper.requireNonNull(builder.operationType, this, "operationType");
+
+        this.id = builder.id;
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
+        this.error = builder.error;
+        this.primaryTerm = builder.primaryTerm;
+        this.result = builder.result;
+        this.seqNo = builder.seqNo;
+        this.shards = builder.shards;
+        this.version = builder.version;
+        this.forcedRefresh = builder.forcedRefresh;
+        this.get = builder.get;
+
+    }
+
+    public static BulkResponseItem of(Function<Builder, ObjectBuilder<BulkResponseItem>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required -
+     */
+    public final OperationType operationType() {
+        return this.operationType;
+    }
+
+    /**
+     * API name: {@code _id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - API name: {@code _index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Required - API name: {@code status}
+     */
+    public final int status() {
+        return this.status;
+    }
+
+    /**
+     * API name: {@code error}
+     */
+    @Nullable
+    public final ErrorCause error() {
+        return this.error;
+    }
+
+    /**
+     * API name: {@code _primary_term}
+     */
+    @Nullable
+    public final Long primaryTerm() {
+        return this.primaryTerm;
+    }
+
+    /**
+     * API name: {@code result}
+     */
+    @Nullable
+    public final String result() {
+        return this.result;
+    }
+
+    /**
+     * API name: {@code _seq_no}
+     */
+    @Nullable
+    public final Long seqNo() {
+        return this.seqNo;
+    }
+
+    /**
+     * API name: {@code _shards}
+     */
+    @Nullable
+    public final ShardStatistics shards() {
+        return this.shards;
+    }
+
+    /**
+     * API name: {@code _version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * API name: {@code forced_refresh}
+     */
+    @Nullable
+    public final Boolean forcedRefresh() {
+        return this.forcedRefresh;
+    }
+
+    /**
+     * API name: {@code get}
+     */
+    @Nullable
+    public final InlineGet<Map<String, JsonData>> get() {
+        return this.get;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject(this.operationType.jsonValue());
+
+        if (this.id != null) {
+            generator.writeKey("_id");
+            generator.write(this.id);
+
+        }
+        generator.writeKey("_index");
+        generator.write(this.index);
+
+        generator.writeKey("status");
+        generator.write(this.status);
+
+        if (this.error != null) {
+            generator.writeKey("error");
+            this.error.serialize(generator, mapper);
+
+        }
+        if (this.primaryTerm != null) {
+            generator.writeKey("_primary_term");
+            generator.write(this.primaryTerm);
+
+        }
+        if (this.result != null) {
+            generator.writeKey("result");
+            generator.write(this.result);
+
+        }
+        if (this.seqNo != null) {
+            generator.writeKey("_seq_no");
+            generator.write(this.seqNo);
+
+        }
+        if (this.shards != null) {
+            generator.writeKey("_shards");
+            this.shards.serialize(generator, mapper);
+
+        }
+        if (this.version != null) {
+            generator.writeKey("_version");
+            generator.write(this.version);
+
+        }
+        if (this.forcedRefresh != null) {
+            generator.writeKey("forced_refresh");
+            generator.write(this.forcedRefresh);
+
+        }
+        if (this.get != null) {
+            generator.writeKey("get");
+            this.get.serialize(generator, mapper);
+
+        }
+
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link BulkResponseItem}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<BulkResponseItem> {
+        private OperationType operationType;
+
+        /**
+         * Required -
+         */
+        public final Builder operationType(OperationType value) {
+            this.operationType = value;
+            return this;
+        }
+
+        @Nullable
+        private String id;
+
+        private String index;
+
+        private Integer status;
+
+        @Nullable
+        private ErrorCause error;
+
+        @Nullable
+        private Long primaryTerm;
+
+        @Nullable
+        private String result;
+
+        @Nullable
+        private Long seqNo;
+
+        @Nullable
+        private ShardStatistics shards;
+
+        @Nullable
+        private Long version;
+
+        @Nullable
+        private Boolean forcedRefresh;
+
+        @Nullable
+        private InlineGet<Map<String, JsonData>> get;
+
+        /**
+         * API name: {@code _id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code status}
+         */
+        public final Builder status(int value) {
+            this.status = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code error}
+         */
+        public final Builder error(@Nullable ErrorCause value) {
+            this.error = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code error}
+         */
+        public final Builder error(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
+            return this.error(fn.apply(new ErrorCause.Builder()).build());
+        }
+
+        /**
+         * API name: {@code _primary_term}
+         */
+        public final Builder primaryTerm(@Nullable Long value) {
+            this.primaryTerm = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code result}
+         */
+        public final Builder result(@Nullable String value) {
+            this.result = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _seq_no}
+         */
+        public final Builder seqNo(@Nullable Long value) {
+            this.seqNo = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _shards}
+         */
+        public final Builder shards(@Nullable ShardStatistics value) {
+            this.shards = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _shards}
+         */
+        public final Builder shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
+            return this.shards(fn.apply(new ShardStatistics.Builder()).build());
+        }
+
+        /**
+         * API name: {@code _version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code forced_refresh}
+         */
+        public final Builder forcedRefresh(@Nullable Boolean value) {
+            this.forcedRefresh = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code get}
+         */
+        public final Builder get(@Nullable InlineGet<Map<String, JsonData>> value) {
+            this.get = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code get}
+         */
+        public final Builder get(Function<InlineGet.Builder<Map<String, JsonData>>, ObjectBuilder<InlineGet<Map<String, JsonData>>>> fn) {
+            return this.get(fn.apply(new InlineGet.Builder<Map<String, JsonData>>()).build());
+        }
+
+        /**
+         * Builds a {@link BulkResponseItem}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public BulkResponseItem build() {
+            _checkSingleUse();
+
+            return new BulkResponseItem(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link BulkResponseItem}
+     */
+    public static final JsonpDeserializer<BulkResponseItem> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        BulkResponseItem::setupBulkResponseItemDeserializer
+    );
+
+    protected static void setupBulkResponseItemDeserializer(ObjectDeserializer<BulkResponseItem.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
+        op.add(Builder::status, JsonpDeserializer.integerDeserializer(), "status");
+        op.add(Builder::error, ErrorCause._DESERIALIZER, "error");
+        op.add(Builder::primaryTerm, JsonpDeserializer.longDeserializer(), "_primary_term");
+        op.add(Builder::result, JsonpDeserializer.stringDeserializer(), "result");
+        op.add(Builder::seqNo, JsonpDeserializer.longDeserializer(), "_seq_no");
+        op.add(Builder::shards, ShardStatistics._DESERIALIZER, "_shards");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "_version");
+        op.add(Builder::forcedRefresh, JsonpDeserializer.booleanDeserializer(), "forced_refresh");
+        op.add(Builder::get, InlineGet.createInlineGetDeserializer(JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER)), "get");
+
+        op.setKey(Builder::operationType, OperationType._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/CreateOperation.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/CreateOperation.java
index ecf6464a9c..fb858f7a70 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/CreateOperation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/CreateOperation.java
@@ -32,108 +32,104 @@
 
 package org.opensearch.client.opensearch.core.bulk;
 
-import org.opensearch.client.json.JsonpSerializer;
-import org.opensearch.client.json.NdJsonpSerializable;
-import org.opensearch.client.util.ApiTypeHelper;
-import org.opensearch.client.util.ObjectBuilder;
-
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.function.Function;
 import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpSerializer;
+import org.opensearch.client.json.NdJsonpSerializable;
+import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.ObjectBuilder;
 
 // typedef: _global.bulk.CreateOperation
 
-
-
 public class CreateOperation<TDocument> extends WriteOperation implements NdJsonpSerializable, BulkOperationVariant {
-	private final TDocument document;
-
-	@Nullable
-	private final JsonpSerializer<TDocument> tDocumentSerializer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CreateOperation(Builder<TDocument> builder) {
-		super(builder);
-		this.document = ApiTypeHelper.requireNonNull(builder.document, this, "document");
-
-		this.tDocumentSerializer = builder.tDocumentSerializer;
-
-	}
-
-	public static <TDocument> CreateOperation<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<CreateOperation<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * BulkOperation variant kind.
-	 */
-	@Override
-	public BulkOperation.Kind _bulkOperationKind() {
-		return BulkOperation.Kind.Create;
-	}
-
-	/**
-	 * Required - API name: {@code document}
-	 */
-	public final TDocument document() {
-		return this.document;
-	}
-
-	@Override
-	public Iterator<?> _serializables() {
-		return Arrays.asList(this, this.document).iterator();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CreateOperation}.
-	 */
-
-	public static class Builder<TDocument> extends WriteOperation.AbstractBuilder<Builder<TDocument>>
-			implements
-				ObjectBuilder<CreateOperation<TDocument>> {
-		private TDocument document;
-
-		/**
-		 * Required - API name: {@code document}
-		 */
-		public final Builder<TDocument> document(TDocument value) {
-			this.document = value;
-			return this;
-		}
-
-		@Nullable
-		private JsonpSerializer<TDocument> tDocumentSerializer;
-
-		/**
-		 * Serializer for TDocument. If not set, an attempt will be made to find a
-		 * serializer from the JSON context.
-		 */
-		public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
-			this.tDocumentSerializer = value;
-			return this;
-		}
-
-		@Override
-		protected Builder<TDocument> self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CreateOperation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CreateOperation<TDocument> build() {
-			_checkSingleUse();
-
-			return new CreateOperation<TDocument>(this);
-		}
-	}
+    private final TDocument document;
+
+    @Nullable
+    private final JsonpSerializer<TDocument> tDocumentSerializer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CreateOperation(Builder<TDocument> builder) {
+        super(builder);
+        this.document = ApiTypeHelper.requireNonNull(builder.document, this, "document");
+
+        this.tDocumentSerializer = builder.tDocumentSerializer;
+
+    }
+
+    public static <TDocument> CreateOperation<TDocument> of(Function<Builder<TDocument>, ObjectBuilder<CreateOperation<TDocument>>> fn) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * BulkOperation variant kind.
+     */
+    @Override
+    public BulkOperation.Kind _bulkOperationKind() {
+        return BulkOperation.Kind.Create;
+    }
+
+    /**
+     * Required - API name: {@code document}
+     */
+    public final TDocument document() {
+        return this.document;
+    }
+
+    @Override
+    public Iterator<?> _serializables() {
+        return Arrays.asList(this, this.document).iterator();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CreateOperation}.
+     */
+
+    public static class Builder<TDocument> extends WriteOperation.AbstractBuilder<Builder<TDocument>>
+        implements
+            ObjectBuilder<CreateOperation<TDocument>> {
+        private TDocument document;
+
+        /**
+         * Required - API name: {@code document}
+         */
+        public final Builder<TDocument> document(TDocument value) {
+            this.document = value;
+            return this;
+        }
+
+        @Nullable
+        private JsonpSerializer<TDocument> tDocumentSerializer;
+
+        /**
+         * Serializer for TDocument. If not set, an attempt will be made to find a
+         * serializer from the JSON context.
+         */
+        public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
+            this.tDocumentSerializer = value;
+            return this;
+        }
+
+        @Override
+        protected Builder<TDocument> self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CreateOperation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CreateOperation<TDocument> build() {
+            _checkSingleUse();
+
+            return new CreateOperation<TDocument>(this);
+        }
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/DeleteOperation.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/DeleteOperation.java
index e8b4d96d17..ddb800249f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/DeleteOperation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/DeleteOperation.java
@@ -32,76 +32,74 @@
 
 package org.opensearch.client.opensearch.core.bulk;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _global.bulk.DeleteOperation
 
-
 @JsonpDeserializable
 public class DeleteOperation extends BulkOperationBase implements BulkOperationVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteOperation(Builder builder) {
-		super(builder);
-
-	}
-
-	public static DeleteOperation of(Function<Builder, ObjectBuilder<DeleteOperation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * BulkOperation variant kind.
-	 */
-	@Override
-	public BulkOperation.Kind _bulkOperationKind() {
-		return BulkOperation.Kind.Delete;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteOperation}.
-	 */
-
-	public static class Builder extends BulkOperationBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DeleteOperation> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DeleteOperation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteOperation build() {
-			_checkSingleUse();
-
-			return new DeleteOperation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DeleteOperation}
-	 */
-	public static final JsonpDeserializer<DeleteOperation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			DeleteOperation::setupDeleteOperationDeserializer);
-
-	protected static void setupDeleteOperationDeserializer(ObjectDeserializer<DeleteOperation.Builder> op) {
-		setupBulkOperationBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteOperation(Builder builder) {
+        super(builder);
+
+    }
+
+    public static DeleteOperation of(Function<Builder, ObjectBuilder<DeleteOperation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * BulkOperation variant kind.
+     */
+    @Override
+    public BulkOperation.Kind _bulkOperationKind() {
+        return BulkOperation.Kind.Delete;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteOperation}.
+     */
+
+    public static class Builder extends BulkOperationBase.AbstractBuilder<Builder> implements ObjectBuilder<DeleteOperation> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DeleteOperation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteOperation build() {
+            _checkSingleUse();
+
+            return new DeleteOperation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DeleteOperation}
+     */
+    public static final JsonpDeserializer<DeleteOperation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DeleteOperation::setupDeleteOperationDeserializer
+    );
+
+    protected static void setupDeleteOperationDeserializer(ObjectDeserializer<DeleteOperation.Builder> op) {
+        setupBulkOperationBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/IndexOperation.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/IndexOperation.java
index 1529e4c151..f8ffd70a0a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/IndexOperation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/IndexOperation.java
@@ -32,108 +32,104 @@
 
 package org.opensearch.client.opensearch.core.bulk;
 
-import org.opensearch.client.json.JsonpSerializer;
-import org.opensearch.client.json.NdJsonpSerializable;
-import org.opensearch.client.util.ApiTypeHelper;
-import org.opensearch.client.util.ObjectBuilder;
-
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.function.Function;
 import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpSerializer;
+import org.opensearch.client.json.NdJsonpSerializable;
+import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.ObjectBuilder;
 
 // typedef: _global.bulk.IndexOperation
 
-
-
 public class IndexOperation<TDocument> extends WriteOperation implements NdJsonpSerializable, BulkOperationVariant {
-	private final TDocument document;
-
-	@Nullable
-	private final JsonpSerializer<TDocument> tDocumentSerializer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexOperation(Builder<TDocument> builder) {
-		super(builder);
-		this.document = ApiTypeHelper.requireNonNull(builder.document, this, "document");
-
-		this.tDocumentSerializer = builder.tDocumentSerializer;
-
-	}
-
-	public static <TDocument> IndexOperation<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<IndexOperation<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * BulkOperation variant kind.
-	 */
-	@Override
-	public BulkOperation.Kind _bulkOperationKind() {
-		return BulkOperation.Kind.Index;
-	}
-
-	/**
-	 * Required - API name: {@code document}
-	 */
-	public final TDocument document() {
-		return this.document;
-	}
-
-	@Override
-	public Iterator<?> _serializables() {
-		return Arrays.asList(this, this.document).iterator();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexOperation}.
-	 */
-
-	public static class Builder<TDocument> extends WriteOperation.AbstractBuilder<Builder<TDocument>>
-			implements
-				ObjectBuilder<IndexOperation<TDocument>> {
-		private TDocument document;
-
-		/**
-		 * Required - API name: {@code document}
-		 */
-		public final Builder<TDocument> document(TDocument value) {
-			this.document = value;
-			return this;
-		}
-
-		@Nullable
-		private JsonpSerializer<TDocument> tDocumentSerializer;
-
-		/**
-		 * Serializer for TDocument. If not set, an attempt will be made to find a
-		 * serializer from the JSON context.
-		 */
-		public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
-			this.tDocumentSerializer = value;
-			return this;
-		}
-
-		@Override
-		protected Builder<TDocument> self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IndexOperation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexOperation<TDocument> build() {
-			_checkSingleUse();
-
-			return new IndexOperation<TDocument>(this);
-		}
-	}
+    private final TDocument document;
+
+    @Nullable
+    private final JsonpSerializer<TDocument> tDocumentSerializer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexOperation(Builder<TDocument> builder) {
+        super(builder);
+        this.document = ApiTypeHelper.requireNonNull(builder.document, this, "document");
+
+        this.tDocumentSerializer = builder.tDocumentSerializer;
+
+    }
+
+    public static <TDocument> IndexOperation<TDocument> of(Function<Builder<TDocument>, ObjectBuilder<IndexOperation<TDocument>>> fn) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * BulkOperation variant kind.
+     */
+    @Override
+    public BulkOperation.Kind _bulkOperationKind() {
+        return BulkOperation.Kind.Index;
+    }
+
+    /**
+     * Required - API name: {@code document}
+     */
+    public final TDocument document() {
+        return this.document;
+    }
+
+    @Override
+    public Iterator<?> _serializables() {
+        return Arrays.asList(this, this.document).iterator();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexOperation}.
+     */
+
+    public static class Builder<TDocument> extends WriteOperation.AbstractBuilder<Builder<TDocument>>
+        implements
+            ObjectBuilder<IndexOperation<TDocument>> {
+        private TDocument document;
+
+        /**
+         * Required - API name: {@code document}
+         */
+        public final Builder<TDocument> document(TDocument value) {
+            this.document = value;
+            return this;
+        }
+
+        @Nullable
+        private JsonpSerializer<TDocument> tDocumentSerializer;
+
+        /**
+         * Serializer for TDocument. If not set, an attempt will be made to find a
+         * serializer from the JSON context.
+         */
+        public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
+            this.tDocumentSerializer = value;
+            return this;
+        }
+
+        @Override
+        protected Builder<TDocument> self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link IndexOperation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexOperation<TDocument> build() {
+            _checkSingleUse();
+
+            return new IndexOperation<TDocument>(this);
+        }
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/OperationType.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/OperationType.java
index bf99067ac9..da29e9c09c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/OperationType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/OperationType.java
@@ -35,29 +35,27 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum OperationType implements JsonEnum {
-	Index("index"),
+    Index("index"),
 
-	Create("create"),
+    Create("create"),
 
-	Update("update"),
+    Update("update"),
 
-	Delete("delete"),
+    Delete("delete"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	OperationType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    OperationType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<OperationType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			OperationType.values());
+    public static final JsonEnum.Deserializer<OperationType> _DESERIALIZER = new JsonEnum.Deserializer<>(OperationType.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/UpdateOperation.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/UpdateOperation.java
index ccbe942172..15d30fe0c4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/UpdateOperation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/UpdateOperation.java
@@ -32,208 +32,204 @@
 
 package org.opensearch.client.opensearch.core.bulk;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializer;
 import org.opensearch.client.json.NdJsonpSerializable;
 import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.bulk.UpdateOperation
 
+public class UpdateOperation<TDocument> extends BulkOperationBase implements NdJsonpSerializable, BulkOperationVariant {
+    private final UpdateOperationData<TDocument> data;
 
+    @Nullable
+    private final Boolean requireAlias;
 
-public class UpdateOperation<TDocument> extends BulkOperationBase implements NdJsonpSerializable, BulkOperationVariant {
-	private final UpdateOperationData<TDocument> data;
+    @Nullable
+    private final Integer retryOnConflict;
+
+    @Nullable
+    private final JsonpSerializer<TDocument> tDocumentSerializer;
 
-	@Nullable
-	private final Boolean requireAlias;
+    // ---------------------------------------------------------------------------------------------
 
-	@Nullable
-	private final Integer retryOnConflict;
-
-	@Nullable
-	private final JsonpSerializer<TDocument> tDocumentSerializer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private UpdateOperation(Builder<TDocument> builder) {
-		super(builder);
-		this.data = ApiTypeHelper.requireNonNull(builder.data, this, "data");
-		this.requireAlias = builder.requireAlias;
-		this.retryOnConflict = builder.retryOnConflict;
-		this.tDocumentSerializer = builder.tDocumentSerializer;
-
-	}
-
-	public static <TDocument> UpdateOperation<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<UpdateOperation<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * BulkOperation variant kind.
-	 */
-	@Override
-	public BulkOperation.Kind _bulkOperationKind() {
-		return BulkOperation.Kind.Update;
-	}
-
-	@Override
-	public Iterator<?> _serializables() {
-		return Arrays.asList(this, this.data).iterator();
-	}
-
-	/**
-	 * API name: {@code require_alias}
-	 */
-	@Nullable
-	public final Boolean requireAlias() {
-		return this.requireAlias;
-	}
-
-	/**
-	 * API name: {@code retry_on_conflict}
-	 */
-	@Nullable
-	public final Integer retryOnConflict() {
-		return this.retryOnConflict;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.requireAlias != null) {
-			generator.writeKey("require_alias");
-			generator.write(this.requireAlias);
-
-		}
-		if (this.retryOnConflict != null) {
-			generator.writeKey("retry_on_conflict");
-			generator.write(this.retryOnConflict);
-
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UpdateOperation}.
-	 */
-
-	public static class Builder<TDocument> extends BulkOperationBase.AbstractBuilder<Builder<TDocument>>
-			implements
-				ObjectBuilder<UpdateOperation<TDocument>> {
-
-		private UpdateOperationData<TDocument> data;
-
-		@Nullable
-		private TDocument document;
-
-		@Nullable
-		private Boolean requireAlias;
-
-		@Nullable
-		private Integer retryOnConflict;
-
-		@Nullable
-		private JsonpSerializer<TDocument> tDocumentSerializer;
-
-		@Nullable
-		private Boolean docAsUpsert;
-
-		@Nullable
-		private TDocument upsert;
-		
-		@Nullable
-		private Script script;
-
-		/**
-		 * API name: {@code document}
-		 */
-		public final Builder<TDocument> document(TDocument value) {
-			this.document = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code docAsUpsert}
-		 */
-		public final Builder<TDocument> docAsUpsert(@Nullable Boolean value) {
-			this.docAsUpsert = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code upsert}
-		 */
-		public final Builder<TDocument> upsert(@Nullable TDocument value) {
-			this.upsert = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder<TDocument> script(@Nullable Script value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code require_alias}
-		 */
-		public final Builder<TDocument> requireAlias(@Nullable Boolean value) {
-			this.requireAlias = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code retry_on_conflict}
-		 */
-		public final Builder<TDocument> retryOnConflict(@Nullable Integer value) {
-			this.retryOnConflict = value;
-			return this;
-		}
-
-		/**
-		 * Serializer for TDocument. If not set, an attempt will be made to find a
-		 * serializer from the JSON context.
-		 */
-		public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
-			this.tDocumentSerializer = value;
-			return this;
-		}
-
-		@Override
-		protected Builder<TDocument> self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link UpdateOperation}.
-		 *
-		 * @throws NullPointerException
-		 *			 if some of the required fields are null.
-		 */
-		public UpdateOperation<TDocument> build() {
-			_checkSingleUse();
-
-			data = new UpdateOperationData.Builder<TDocument>()
-					.document(document)
-					.docAsUpsert(docAsUpsert)
-					.script(script)
-					.upsert(upsert)
-					.tDocumentSerializer(tDocumentSerializer)
-					.build();
-
-			return new UpdateOperation<TDocument>(this);
-		}
-	}
+    private UpdateOperation(Builder<TDocument> builder) {
+        super(builder);
+        this.data = ApiTypeHelper.requireNonNull(builder.data, this, "data");
+        this.requireAlias = builder.requireAlias;
+        this.retryOnConflict = builder.retryOnConflict;
+        this.tDocumentSerializer = builder.tDocumentSerializer;
+
+    }
+
+    public static <TDocument> UpdateOperation<TDocument> of(Function<Builder<TDocument>, ObjectBuilder<UpdateOperation<TDocument>>> fn) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * BulkOperation variant kind.
+     */
+    @Override
+    public BulkOperation.Kind _bulkOperationKind() {
+        return BulkOperation.Kind.Update;
+    }
+
+    @Override
+    public Iterator<?> _serializables() {
+        return Arrays.asList(this, this.data).iterator();
+    }
+
+    /**
+     * API name: {@code require_alias}
+     */
+    @Nullable
+    public final Boolean requireAlias() {
+        return this.requireAlias;
+    }
+
+    /**
+     * API name: {@code retry_on_conflict}
+     */
+    @Nullable
+    public final Integer retryOnConflict() {
+        return this.retryOnConflict;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.requireAlias != null) {
+            generator.writeKey("require_alias");
+            generator.write(this.requireAlias);
+
+        }
+        if (this.retryOnConflict != null) {
+            generator.writeKey("retry_on_conflict");
+            generator.write(this.retryOnConflict);
+
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UpdateOperation}.
+     */
+
+    public static class Builder<TDocument> extends BulkOperationBase.AbstractBuilder<Builder<TDocument>>
+        implements
+            ObjectBuilder<UpdateOperation<TDocument>> {
+
+        private UpdateOperationData<TDocument> data;
+
+        @Nullable
+        private TDocument document;
+
+        @Nullable
+        private Boolean requireAlias;
+
+        @Nullable
+        private Integer retryOnConflict;
+
+        @Nullable
+        private JsonpSerializer<TDocument> tDocumentSerializer;
+
+        @Nullable
+        private Boolean docAsUpsert;
+
+        @Nullable
+        private TDocument upsert;
+
+        @Nullable
+        private Script script;
+
+        /**
+         * API name: {@code document}
+         */
+        public final Builder<TDocument> document(TDocument value) {
+            this.document = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code docAsUpsert}
+         */
+        public final Builder<TDocument> docAsUpsert(@Nullable Boolean value) {
+            this.docAsUpsert = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code upsert}
+         */
+        public final Builder<TDocument> upsert(@Nullable TDocument value) {
+            this.upsert = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder<TDocument> script(@Nullable Script value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code require_alias}
+         */
+        public final Builder<TDocument> requireAlias(@Nullable Boolean value) {
+            this.requireAlias = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code retry_on_conflict}
+         */
+        public final Builder<TDocument> retryOnConflict(@Nullable Integer value) {
+            this.retryOnConflict = value;
+            return this;
+        }
+
+        /**
+         * Serializer for TDocument. If not set, an attempt will be made to find a
+         * serializer from the JSON context.
+         */
+        public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
+            this.tDocumentSerializer = value;
+            return this;
+        }
+
+        @Override
+        protected Builder<TDocument> self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link UpdateOperation}.
+         *
+         * @throws NullPointerException
+         *			 if some of the required fields are null.
+         */
+        public UpdateOperation<TDocument> build() {
+            _checkSingleUse();
+
+            data = new UpdateOperationData.Builder<TDocument>().document(document)
+                .docAsUpsert(docAsUpsert)
+                .script(script)
+                .upsert(upsert)
+                .tDocumentSerializer(tDocumentSerializer)
+                .build();
+
+            return new UpdateOperation<TDocument>(this);
+        }
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/UpdateOperationData.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/UpdateOperationData.java
index e29ba6e630..572930d0fd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/UpdateOperationData.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/UpdateOperationData.java
@@ -8,8 +8,8 @@
 
 package org.opensearch.client.opensearch.core.bulk;
 
+import jakarta.json.stream.JsonGenerator;
 import javax.annotation.Nullable;
-
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.JsonpSerializer;
@@ -17,18 +17,16 @@
 import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ObjectBuilder;
 
-import jakarta.json.stream.JsonGenerator;
-
 public class UpdateOperationData<TDocument> implements JsonpSerializable {
     @Nullable
     private final TDocument document;
 
     @Nullable
     private final Boolean docAsUpsert;
-    
+
     @Nullable
     private final TDocument upsert;
-    
+
     @Nullable
     private final Script script;
 
@@ -77,9 +75,9 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
      * Builder for {@link UpdateOperationData}.
      */
     public static class Builder<TDocument> extends BulkOperationBase.AbstractBuilder<Builder<TDocument>>
-            implements
-                ObjectBuilder<UpdateOperationData<TDocument>> {
-        
+        implements
+            ObjectBuilder<UpdateOperationData<TDocument>> {
+
         @Nullable
         private TDocument document;
 
@@ -92,7 +90,6 @@ public static class Builder<TDocument> extends BulkOperationBase.AbstractBuilder
         @Nullable
         private TDocument upsert;
 
-
         @Nullable
         private Script script;
 
@@ -104,7 +101,6 @@ public final Builder<TDocument> document(TDocument value) {
             return this;
         }
 
-
         /**
          * API name: {@code docAsUpsert}
          */
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/WriteOperation.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/WriteOperation.java
index cc9b818aaf..5d21523756 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/WriteOperation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/WriteOperation.java
@@ -32,98 +32,94 @@
 
 package org.opensearch.client.opensearch.core.bulk;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectDeserializer;
-import jakarta.json.stream.JsonGenerator;
-import javax.annotation.Nullable;
 
 // typedef: _global.bulk.WriteOperation
 
-
-
 public abstract class WriteOperation extends BulkOperationBase {
 
-	@Nullable
-	private final String pipeline;
+    @Nullable
+    private final String pipeline;
 
-	@Nullable
-	private final Boolean requireAlias;
+    @Nullable
+    private final Boolean requireAlias;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected WriteOperation(AbstractBuilder<?> builder) {
-		super(builder);
+    protected WriteOperation(AbstractBuilder<?> builder) {
+        super(builder);
 
-		this.pipeline = builder.pipeline;
-		this.requireAlias = builder.requireAlias;
+        this.pipeline = builder.pipeline;
+        this.requireAlias = builder.requireAlias;
 
-	}
+    }
 
-	@Nullable
-	public final String pipeline() {
-		return this.pipeline;
-	}
+    @Nullable
+    public final String pipeline() {
+        return this.pipeline;
+    }
 
-	/**
-	 * API name: {@code require_alias}
-	 */
-	@Nullable
-	public final Boolean requireAlias() {
-		return this.requireAlias;
-	}
+    /**
+     * API name: {@code require_alias}
+     */
+    @Nullable
+    public final Boolean requireAlias() {
+        return this.requireAlias;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		super.serializeInternal(generator, mapper);
-		if (this.pipeline != null) {
-			generator.writeKey("pipeline");
-			generator.write(this.pipeline);
+        super.serializeInternal(generator, mapper);
+        if (this.pipeline != null) {
+            generator.writeKey("pipeline");
+            generator.write(this.pipeline);
 
-		}
-		if (this.requireAlias != null) {
-			generator.writeKey("require_alias");
-			generator.write(this.requireAlias);
+        }
+        if (this.requireAlias != null) {
+            generator.writeKey("require_alias");
+            generator.write(this.requireAlias);
 
-		}
+        }
 
-	}
+    }
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				BulkOperationBase.AbstractBuilder<BuilderT> {
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends BulkOperationBase.AbstractBuilder<
+        BuilderT> {
 
-		@Nullable
-		private String pipeline;
+        @Nullable
+        private String pipeline;
 
-		@Nullable
-		private Boolean requireAlias;
+        @Nullable
+        private Boolean requireAlias;
 
-		/**
-		 * API name: {@code pipeline}
-		 */
-		public final BuilderT pipeline(@Nullable String value) {
-			this.pipeline = value;
-			return self();
-		}
+        /**
+         * API name: {@code pipeline}
+         */
+        public final BuilderT pipeline(@Nullable String value) {
+            this.pipeline = value;
+            return self();
+        }
 
-		/**
-		 * API name: {@code require_alias}
-		 */
-		public final BuilderT requireAlias(@Nullable Boolean value) {
-			this.requireAlias = value;
-			return self();
-		}
+        /**
+         * API name: {@code require_alias}
+         */
+        public final BuilderT requireAlias(@Nullable Boolean value) {
+            this.requireAlias = value;
+            return self();
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupWriteOperationDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		BulkOperationBase.setupBulkOperationBaseDeserializer(op);
-		op.add(AbstractBuilder::pipeline, JsonpDeserializer.stringDeserializer(), "pipeline");
-		op.add(AbstractBuilder::requireAlias, JsonpDeserializer.booleanDeserializer(), "require_alias");
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupWriteOperationDeserializer(ObjectDeserializer<BuilderT> op) {
+        BulkOperationBase.setupBulkOperationBaseDeserializer(op);
+        op.add(AbstractBuilder::pipeline, JsonpDeserializer.stringDeserializer(), "pipeline");
+        op.add(AbstractBuilder::requireAlias, JsonpDeserializer.booleanDeserializer(), "require_alias");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/explain/Explanation.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/explain/Explanation.java
index d1c83b97c7..8470299d76 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/explain/Explanation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/explain/Explanation.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.explain;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,170 +44,168 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _global.explain.Explanation
 
-
 @JsonpDeserializable
 public class Explanation implements JsonpSerializable {
-	private final String description;
+    private final String description;
 
-	private final List<ExplanationDetail> details;
-
-	private final float value;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Explanation(Builder builder) {
-
-		this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
-		this.details = ApiTypeHelper.unmodifiableRequired(builder.details, this, "details");
-		this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
-
-	}
-
-	public static Explanation of(Function<Builder, ObjectBuilder<Explanation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code description}
-	 */
-	public final String description() {
-		return this.description;
-	}
-
-	/**
-	 * Required - API name: {@code details}
-	 */
-	public final List<ExplanationDetail> details() {
-		return this.details;
-	}
-
-	/**
-	 * Required - API name: {@code value}
-	 */
-	public final float value() {
-		return this.value;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("description");
-		generator.write(this.description);
-
-		if (ApiTypeHelper.isDefined(this.details)) {
-			generator.writeKey("details");
-			generator.writeStartArray();
-			for (ExplanationDetail item0 : this.details) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("value");
-		generator.write(this.value);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Explanation}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Explanation> {
-		private String description;
-
-		private List<ExplanationDetail> details;
-
-		private Float value;
-
-		/**
-		 * Required - API name: {@code description}
-		 */
-		public final Builder description(String value) {
-			this.description = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code details}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>details</code>.
-		 */
-		public final Builder details(List<ExplanationDetail> list) {
-			this.details = _listAddAll(this.details, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code details}
-		 * <p>
-		 * Adds one or more values to <code>details</code>.
-		 */
-		public final Builder details(ExplanationDetail value, ExplanationDetail... values) {
-			this.details = _listAdd(this.details, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code details}
-		 * <p>
-		 * Adds a value to <code>details</code> using a builder lambda.
-		 */
-		public final Builder details(Function<ExplanationDetail.Builder, ObjectBuilder<ExplanationDetail>> fn) {
-			return details(fn.apply(new ExplanationDetail.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code value}
-		 */
-		public final Builder value(float value) {
-			this.value = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Explanation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Explanation build() {
-			_checkSingleUse();
-
-			return new Explanation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Explanation}
-	 */
-	public static final JsonpDeserializer<Explanation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Explanation::setupExplanationDeserializer);
-
-	protected static void setupExplanationDeserializer(ObjectDeserializer<Explanation.Builder> op) {
-
-		op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
-		op.add(Builder::details, JsonpDeserializer.arrayDeserializer(ExplanationDetail._DESERIALIZER), "details");
-		op.add(Builder::value, JsonpDeserializer.floatDeserializer(), "value");
-
-	}
+    private final List<ExplanationDetail> details;
+
+    private final float value;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Explanation(Builder builder) {
+
+        this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
+        this.details = ApiTypeHelper.unmodifiableRequired(builder.details, this, "details");
+        this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
+
+    }
+
+    public static Explanation of(Function<Builder, ObjectBuilder<Explanation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code description}
+     */
+    public final String description() {
+        return this.description;
+    }
+
+    /**
+     * Required - API name: {@code details}
+     */
+    public final List<ExplanationDetail> details() {
+        return this.details;
+    }
+
+    /**
+     * Required - API name: {@code value}
+     */
+    public final float value() {
+        return this.value;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("description");
+        generator.write(this.description);
+
+        if (ApiTypeHelper.isDefined(this.details)) {
+            generator.writeKey("details");
+            generator.writeStartArray();
+            for (ExplanationDetail item0 : this.details) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("value");
+        generator.write(this.value);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Explanation}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Explanation> {
+        private String description;
+
+        private List<ExplanationDetail> details;
+
+        private Float value;
+
+        /**
+         * Required - API name: {@code description}
+         */
+        public final Builder description(String value) {
+            this.description = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code details}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>details</code>.
+         */
+        public final Builder details(List<ExplanationDetail> list) {
+            this.details = _listAddAll(this.details, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code details}
+         * <p>
+         * Adds one or more values to <code>details</code>.
+         */
+        public final Builder details(ExplanationDetail value, ExplanationDetail... values) {
+            this.details = _listAdd(this.details, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code details}
+         * <p>
+         * Adds a value to <code>details</code> using a builder lambda.
+         */
+        public final Builder details(Function<ExplanationDetail.Builder, ObjectBuilder<ExplanationDetail>> fn) {
+            return details(fn.apply(new ExplanationDetail.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code value}
+         */
+        public final Builder value(float value) {
+            this.value = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Explanation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Explanation build() {
+            _checkSingleUse();
+
+            return new Explanation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Explanation}
+     */
+    public static final JsonpDeserializer<Explanation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Explanation::setupExplanationDeserializer
+    );
+
+    protected static void setupExplanationDeserializer(ObjectDeserializer<Explanation.Builder> op) {
+
+        op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
+        op.add(Builder::details, JsonpDeserializer.arrayDeserializer(ExplanationDetail._DESERIALIZER), "details");
+        op.add(Builder::value, JsonpDeserializer.floatDeserializer(), "value");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/explain/ExplanationDetail.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/explain/ExplanationDetail.java
index 12358064f9..606a598fbf 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/explain/ExplanationDetail.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/explain/ExplanationDetail.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core.explain;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,172 +45,169 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.explain.ExplanationDetail
 
-
 @JsonpDeserializable
 public class ExplanationDetail implements JsonpSerializable {
-	private final String description;
+    private final String description;
 
-	private final List<ExplanationDetail> details;
-
-	private final float value;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ExplanationDetail(Builder builder) {
-
-		this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
-		this.details = ApiTypeHelper.unmodifiable(builder.details);
-		this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
-
-	}
-
-	public static ExplanationDetail of(Function<Builder, ObjectBuilder<ExplanationDetail>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code description}
-	 */
-	public final String description() {
-		return this.description;
-	}
-
-	/**
-	 * API name: {@code details}
-	 */
-	public final List<ExplanationDetail> details() {
-		return this.details;
-	}
-
-	/**
-	 * Required - API name: {@code value}
-	 */
-	public final float value() {
-		return this.value;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("description");
-		generator.write(this.description);
-
-		if (ApiTypeHelper.isDefined(this.details)) {
-			generator.writeKey("details");
-			generator.writeStartArray();
-			for (ExplanationDetail item0 : this.details) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("value");
-		generator.write(this.value);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ExplanationDetail}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExplanationDetail> {
-		private String description;
-
-		@Nullable
-		private List<ExplanationDetail> details;
-
-		private Float value;
-
-		/**
-		 * Required - API name: {@code description}
-		 */
-		public final Builder description(String value) {
-			this.description = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code details}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>details</code>.
-		 */
-		public final Builder details(List<ExplanationDetail> list) {
-			this.details = _listAddAll(this.details, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code details}
-		 * <p>
-		 * Adds one or more values to <code>details</code>.
-		 */
-		public final Builder details(ExplanationDetail value, ExplanationDetail... values) {
-			this.details = _listAdd(this.details, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code details}
-		 * <p>
-		 * Adds a value to <code>details</code> using a builder lambda.
-		 */
-		public final Builder details(Function<ExplanationDetail.Builder, ObjectBuilder<ExplanationDetail>> fn) {
-			return details(fn.apply(new ExplanationDetail.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code value}
-		 */
-		public final Builder value(float value) {
-			this.value = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ExplanationDetail}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ExplanationDetail build() {
-			_checkSingleUse();
-
-			return new ExplanationDetail(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ExplanationDetail}
-	 */
-	public static final JsonpDeserializer<ExplanationDetail> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ExplanationDetail::setupExplanationDetailDeserializer);
-
-	protected static void setupExplanationDetailDeserializer(ObjectDeserializer<ExplanationDetail.Builder> op) {
-
-		op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
-		op.add(Builder::details, JsonpDeserializer.arrayDeserializer(ExplanationDetail._DESERIALIZER), "details");
-		op.add(Builder::value, JsonpDeserializer.floatDeserializer(), "value");
-
-	}
+    private final List<ExplanationDetail> details;
+
+    private final float value;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ExplanationDetail(Builder builder) {
+
+        this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
+        this.details = ApiTypeHelper.unmodifiable(builder.details);
+        this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
+
+    }
+
+    public static ExplanationDetail of(Function<Builder, ObjectBuilder<ExplanationDetail>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code description}
+     */
+    public final String description() {
+        return this.description;
+    }
+
+    /**
+     * API name: {@code details}
+     */
+    public final List<ExplanationDetail> details() {
+        return this.details;
+    }
+
+    /**
+     * Required - API name: {@code value}
+     */
+    public final float value() {
+        return this.value;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("description");
+        generator.write(this.description);
+
+        if (ApiTypeHelper.isDefined(this.details)) {
+            generator.writeKey("details");
+            generator.writeStartArray();
+            for (ExplanationDetail item0 : this.details) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("value");
+        generator.write(this.value);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ExplanationDetail}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExplanationDetail> {
+        private String description;
+
+        @Nullable
+        private List<ExplanationDetail> details;
+
+        private Float value;
+
+        /**
+         * Required - API name: {@code description}
+         */
+        public final Builder description(String value) {
+            this.description = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code details}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>details</code>.
+         */
+        public final Builder details(List<ExplanationDetail> list) {
+            this.details = _listAddAll(this.details, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code details}
+         * <p>
+         * Adds one or more values to <code>details</code>.
+         */
+        public final Builder details(ExplanationDetail value, ExplanationDetail... values) {
+            this.details = _listAdd(this.details, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code details}
+         * <p>
+         * Adds a value to <code>details</code> using a builder lambda.
+         */
+        public final Builder details(Function<ExplanationDetail.Builder, ObjectBuilder<ExplanationDetail>> fn) {
+            return details(fn.apply(new ExplanationDetail.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code value}
+         */
+        public final Builder value(float value) {
+            this.value = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ExplanationDetail}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ExplanationDetail build() {
+            _checkSingleUse();
+
+            return new ExplanationDetail(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ExplanationDetail}
+     */
+    public static final JsonpDeserializer<ExplanationDetail> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ExplanationDetail::setupExplanationDetailDeserializer
+    );
+
+    protected static void setupExplanationDetailDeserializer(ObjectDeserializer<ExplanationDetail.Builder> op) {
+
+        op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
+        op.add(Builder::details, JsonpDeserializer.arrayDeserializer(ExplanationDetail._DESERIALIZER), "details");
+        op.add(Builder::value, JsonpDeserializer.floatDeserializer(), "value");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/field_caps/FieldCapability.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/field_caps/FieldCapability.java
index 2e91085dc2..82c361fc8a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/field_caps/FieldCapability.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/field_caps/FieldCapability.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch.core.field_caps;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,364 +46,367 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.field_caps.FieldCapability
 
-
 @JsonpDeserializable
 public class FieldCapability implements JsonpSerializable {
-	private final boolean aggregatable;
-
-	private final List<String> indices;
-
-	private final Map<String, List<String>> meta;
-
-	private final List<String> nonAggregatableIndices;
-
-	private final List<String> nonSearchableIndices;
-
-	private final boolean searchable;
-
-	private final String type;
-
-	@Nullable
-	private final Boolean metadataField;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FieldCapability(Builder builder) {
-
-		this.aggregatable = ApiTypeHelper.requireNonNull(builder.aggregatable, this, "aggregatable");
-		this.indices = ApiTypeHelper.unmodifiable(builder.indices);
-		this.meta = ApiTypeHelper.unmodifiable(builder.meta);
-		this.nonAggregatableIndices = ApiTypeHelper.unmodifiable(builder.nonAggregatableIndices);
-		this.nonSearchableIndices = ApiTypeHelper.unmodifiable(builder.nonSearchableIndices);
-		this.searchable = ApiTypeHelper.requireNonNull(builder.searchable, this, "searchable");
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-		this.metadataField = builder.metadataField;
-
-	}
-
-	public static FieldCapability of(Function<Builder, ObjectBuilder<FieldCapability>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code aggregatable}
-	 */
-	public final boolean aggregatable() {
-		return this.aggregatable;
-	}
-
-	/**
-	 * API name: {@code indices}
-	 */
-	public final List<String> indices() {
-		return this.indices;
-	}
-
-	/**
-	 * API name: {@code meta}
-	 */
-	public final Map<String, List<String>> meta() {
-		return this.meta;
-	}
-
-	/**
-	 * API name: {@code non_aggregatable_indices}
-	 */
-	public final List<String> nonAggregatableIndices() {
-		return this.nonAggregatableIndices;
-	}
-
-	/**
-	 * API name: {@code non_searchable_indices}
-	 */
-	public final List<String> nonSearchableIndices() {
-		return this.nonSearchableIndices;
-	}
-
-	/**
-	 * Required - API name: {@code searchable}
-	 */
-	public final boolean searchable() {
-		return this.searchable;
-	}
-
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * API name: {@code metadata_field}
-	 */
-	@Nullable
-	public final Boolean metadataField() {
-		return this.metadataField;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("aggregatable");
-		generator.write(this.aggregatable);
-
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartArray();
-			for (String item0 : this.indices) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.meta)) {
-			generator.writeKey("meta");
-			generator.writeStartObject();
-			for (Map.Entry<String, List<String>> item0 : this.meta.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.writeStartArray();
-				if (item0.getValue() != null) {
-					for (String item1 : item0.getValue()) {
-						generator.write(item1);
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.nonAggregatableIndices)) {
-			generator.writeKey("non_aggregatable_indices");
-			generator.writeStartArray();
-			for (String item0 : this.nonAggregatableIndices) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.nonSearchableIndices)) {
-			generator.writeKey("non_searchable_indices");
-			generator.writeStartArray();
-			for (String item0 : this.nonSearchableIndices) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("searchable");
-		generator.write(this.searchable);
-
-		generator.writeKey("type");
-		generator.write(this.type);
-
-		if (this.metadataField != null) {
-			generator.writeKey("metadata_field");
-			generator.write(this.metadataField);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FieldCapability}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldCapability> {
-		private Boolean aggregatable;
-
-		@Nullable
-		private List<String> indices;
-
-		@Nullable
-		private Map<String, List<String>> meta;
-
-		@Nullable
-		private List<String> nonAggregatableIndices;
-
-		@Nullable
-		private List<String> nonSearchableIndices;
-
-		private Boolean searchable;
-
-		private String type;
-
-		@Nullable
-		private Boolean metadataField;
-
-		/**
-		 * Required - API name: {@code aggregatable}
-		 */
-		public final Builder aggregatable(boolean value) {
-			this.aggregatable = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code indices}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indices</code>.
-		 */
-		public final Builder indices(List<String> list) {
-			this.indices = _listAddAll(this.indices, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code indices}
-		 * <p>
-		 * Adds one or more values to <code>indices</code>.
-		 */
-		public final Builder indices(String value, String... values) {
-			this.indices = _listAdd(this.indices, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code meta}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>meta</code>.
-		 */
-		public final Builder meta(Map<String, List<String>> map) {
-			this.meta = _mapPutAll(this.meta, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code meta}
-		 * <p>
-		 * Adds an entry to <code>meta</code>.
-		 */
-		public final Builder meta(String key, List<String> value) {
-			this.meta = _mapPut(this.meta, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code non_aggregatable_indices}
-		 * <p>
-		 * Adds all elements of <code>list</code> to
-		 * <code>nonAggregatableIndices</code>.
-		 */
-		public final Builder nonAggregatableIndices(List<String> list) {
-			this.nonAggregatableIndices = _listAddAll(this.nonAggregatableIndices, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code non_aggregatable_indices}
-		 * <p>
-		 * Adds one or more values to <code>nonAggregatableIndices</code>.
-		 */
-		public final Builder nonAggregatableIndices(String value, String... values) {
-			this.nonAggregatableIndices = _listAdd(this.nonAggregatableIndices, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code non_searchable_indices}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>nonSearchableIndices</code>.
-		 */
-		public final Builder nonSearchableIndices(List<String> list) {
-			this.nonSearchableIndices = _listAddAll(this.nonSearchableIndices, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code non_searchable_indices}
-		 * <p>
-		 * Adds one or more values to <code>nonSearchableIndices</code>.
-		 */
-		public final Builder nonSearchableIndices(String value, String... values) {
-			this.nonSearchableIndices = _listAdd(this.nonSearchableIndices, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code searchable}
-		 */
-		public final Builder searchable(boolean value) {
-			this.searchable = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code metadata_field}
-		 */
-		public final Builder metadataField(@Nullable Boolean value) {
-			this.metadataField = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FieldCapability}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FieldCapability build() {
-			_checkSingleUse();
-
-			return new FieldCapability(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FieldCapability}
-	 */
-	public static final JsonpDeserializer<FieldCapability> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FieldCapability::setupFieldCapabilityDeserializer);
-
-	protected static void setupFieldCapabilityDeserializer(ObjectDeserializer<FieldCapability.Builder> op) {
-
-		op.add(Builder::aggregatable, JsonpDeserializer.booleanDeserializer(), "aggregatable");
-		op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"indices");
-		op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(
-				JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer())), "meta");
-		op.add(Builder::nonAggregatableIndices,
-				JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"non_aggregatable_indices");
-		op.add(Builder::nonSearchableIndices,
-				JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "non_searchable_indices");
-		op.add(Builder::searchable, JsonpDeserializer.booleanDeserializer(), "searchable");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-		op.add(Builder::metadataField, JsonpDeserializer.booleanDeserializer(), "metadata_field");
-
-	}
+    private final boolean aggregatable;
+
+    private final List<String> indices;
+
+    private final Map<String, List<String>> meta;
+
+    private final List<String> nonAggregatableIndices;
+
+    private final List<String> nonSearchableIndices;
+
+    private final boolean searchable;
+
+    private final String type;
+
+    @Nullable
+    private final Boolean metadataField;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FieldCapability(Builder builder) {
+
+        this.aggregatable = ApiTypeHelper.requireNonNull(builder.aggregatable, this, "aggregatable");
+        this.indices = ApiTypeHelper.unmodifiable(builder.indices);
+        this.meta = ApiTypeHelper.unmodifiable(builder.meta);
+        this.nonAggregatableIndices = ApiTypeHelper.unmodifiable(builder.nonAggregatableIndices);
+        this.nonSearchableIndices = ApiTypeHelper.unmodifiable(builder.nonSearchableIndices);
+        this.searchable = ApiTypeHelper.requireNonNull(builder.searchable, this, "searchable");
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.metadataField = builder.metadataField;
+
+    }
+
+    public static FieldCapability of(Function<Builder, ObjectBuilder<FieldCapability>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code aggregatable}
+     */
+    public final boolean aggregatable() {
+        return this.aggregatable;
+    }
+
+    /**
+     * API name: {@code indices}
+     */
+    public final List<String> indices() {
+        return this.indices;
+    }
+
+    /**
+     * API name: {@code meta}
+     */
+    public final Map<String, List<String>> meta() {
+        return this.meta;
+    }
+
+    /**
+     * API name: {@code non_aggregatable_indices}
+     */
+    public final List<String> nonAggregatableIndices() {
+        return this.nonAggregatableIndices;
+    }
+
+    /**
+     * API name: {@code non_searchable_indices}
+     */
+    public final List<String> nonSearchableIndices() {
+        return this.nonSearchableIndices;
+    }
+
+    /**
+     * Required - API name: {@code searchable}
+     */
+    public final boolean searchable() {
+        return this.searchable;
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * API name: {@code metadata_field}
+     */
+    @Nullable
+    public final Boolean metadataField() {
+        return this.metadataField;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("aggregatable");
+        generator.write(this.aggregatable);
+
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartArray();
+            for (String item0 : this.indices) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.meta)) {
+            generator.writeKey("meta");
+            generator.writeStartObject();
+            for (Map.Entry<String, List<String>> item0 : this.meta.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.writeStartArray();
+                if (item0.getValue() != null) {
+                    for (String item1 : item0.getValue()) {
+                        generator.write(item1);
+
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.nonAggregatableIndices)) {
+            generator.writeKey("non_aggregatable_indices");
+            generator.writeStartArray();
+            for (String item0 : this.nonAggregatableIndices) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.nonSearchableIndices)) {
+            generator.writeKey("non_searchable_indices");
+            generator.writeStartArray();
+            for (String item0 : this.nonSearchableIndices) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("searchable");
+        generator.write(this.searchable);
+
+        generator.writeKey("type");
+        generator.write(this.type);
+
+        if (this.metadataField != null) {
+            generator.writeKey("metadata_field");
+            generator.write(this.metadataField);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FieldCapability}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldCapability> {
+        private Boolean aggregatable;
+
+        @Nullable
+        private List<String> indices;
+
+        @Nullable
+        private Map<String, List<String>> meta;
+
+        @Nullable
+        private List<String> nonAggregatableIndices;
+
+        @Nullable
+        private List<String> nonSearchableIndices;
+
+        private Boolean searchable;
+
+        private String type;
+
+        @Nullable
+        private Boolean metadataField;
+
+        /**
+         * Required - API name: {@code aggregatable}
+         */
+        public final Builder aggregatable(boolean value) {
+            this.aggregatable = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code indices}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indices</code>.
+         */
+        public final Builder indices(List<String> list) {
+            this.indices = _listAddAll(this.indices, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code indices}
+         * <p>
+         * Adds one or more values to <code>indices</code>.
+         */
+        public final Builder indices(String value, String... values) {
+            this.indices = _listAdd(this.indices, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code meta}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>meta</code>.
+         */
+        public final Builder meta(Map<String, List<String>> map) {
+            this.meta = _mapPutAll(this.meta, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code meta}
+         * <p>
+         * Adds an entry to <code>meta</code>.
+         */
+        public final Builder meta(String key, List<String> value) {
+            this.meta = _mapPut(this.meta, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code non_aggregatable_indices}
+         * <p>
+         * Adds all elements of <code>list</code> to
+         * <code>nonAggregatableIndices</code>.
+         */
+        public final Builder nonAggregatableIndices(List<String> list) {
+            this.nonAggregatableIndices = _listAddAll(this.nonAggregatableIndices, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code non_aggregatable_indices}
+         * <p>
+         * Adds one or more values to <code>nonAggregatableIndices</code>.
+         */
+        public final Builder nonAggregatableIndices(String value, String... values) {
+            this.nonAggregatableIndices = _listAdd(this.nonAggregatableIndices, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code non_searchable_indices}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>nonSearchableIndices</code>.
+         */
+        public final Builder nonSearchableIndices(List<String> list) {
+            this.nonSearchableIndices = _listAddAll(this.nonSearchableIndices, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code non_searchable_indices}
+         * <p>
+         * Adds one or more values to <code>nonSearchableIndices</code>.
+         */
+        public final Builder nonSearchableIndices(String value, String... values) {
+            this.nonSearchableIndices = _listAdd(this.nonSearchableIndices, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code searchable}
+         */
+        public final Builder searchable(boolean value) {
+            this.searchable = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code metadata_field}
+         */
+        public final Builder metadataField(@Nullable Boolean value) {
+            this.metadataField = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link FieldCapability}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FieldCapability build() {
+            _checkSingleUse();
+
+            return new FieldCapability(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FieldCapability}
+     */
+    public static final JsonpDeserializer<FieldCapability> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FieldCapability::setupFieldCapabilityDeserializer
+    );
+
+    protected static void setupFieldCapabilityDeserializer(ObjectDeserializer<FieldCapability.Builder> op) {
+
+        op.add(Builder::aggregatable, JsonpDeserializer.booleanDeserializer(), "aggregatable");
+        op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "indices");
+        op.add(
+            Builder::meta,
+            JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer())),
+            "meta"
+        );
+        op.add(
+            Builder::nonAggregatableIndices,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
+            "non_aggregatable_indices"
+        );
+        op.add(
+            Builder::nonSearchableIndices,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
+            "non_searchable_indices"
+        );
+        op.add(Builder::searchable, JsonpDeserializer.booleanDeserializer(), "searchable");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+        op.add(Builder::metadataField, JsonpDeserializer.booleanDeserializer(), "metadata_field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/get/GetResult.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/get/GetResult.java
index c12baa34f3..521218c19c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/get/GetResult.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/get/GetResult.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch.core.get;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -43,370 +48,366 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import javax.annotation.Nullable;
 
 // typedef: _global.get.GetResult
 
-
-
 public class GetResult<TDocument> implements JsonpSerializable {
-	private final String index;
-
-	private final Map<String, JsonData> fields;
-
-	private final boolean found;
-
-	private final String id;
-
-	@Nullable
-	private final Long primaryTerm;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final Long seqNo;
-
-	@Nullable
-	private final TDocument source;
-
-	@Nullable
-	private final Long version;
-
-	@Nullable
-	private final JsonpSerializer<TDocument> tDocumentSerializer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected GetResult(AbstractBuilder<TDocument, ?> builder) {
-
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-		this.found = ApiTypeHelper.requireNonNull(builder.found, this, "found");
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.primaryTerm = builder.primaryTerm;
-		this.routing = builder.routing;
-		this.seqNo = builder.seqNo;
-		this.source = builder.source;
-		this.version = builder.version;
-		this.tDocumentSerializer = builder.tDocumentSerializer;
-
-	}
-
-	public static <TDocument> GetResult<TDocument> getResultOf(
-			Function<Builder<TDocument>, ObjectBuilder<GetResult<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * Required - API name: {@code _index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code fields}
-	 */
-	public final Map<String, JsonData> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * Required - API name: {@code found}
-	 */
-	public final boolean found() {
-		return this.found;
-	}
-
-	/**
-	 * Required - API name: {@code _id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * API name: {@code _primary_term}
-	 */
-	@Nullable
-	public final Long primaryTerm() {
-		return this.primaryTerm;
-	}
-
-	/**
-	 * API name: {@code _routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * API name: {@code _seq_no}
-	 */
-	@Nullable
-	public final Long seqNo() {
-		return this.seqNo;
-	}
-
-	/**
-	 * API name: {@code _source}
-	 */
-	@Nullable
-	public final TDocument source() {
-		return this.source;
-	}
-
-	/**
-	 * API name: {@code _version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("_index");
-		generator.write(this.index);
-
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.fields.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("found");
-		generator.write(this.found);
-
-		generator.writeKey("_id");
-		generator.write(this.id);
-
-		if (this.primaryTerm != null) {
-			generator.writeKey("_primary_term");
-			generator.write(this.primaryTerm);
-
-		}
-		if (this.routing != null) {
-			generator.writeKey("_routing");
-			generator.write(this.routing);
-
-		}
-		if (this.seqNo != null) {
-			generator.writeKey("_seq_no");
-			generator.write(this.seqNo);
-
-		}
-		if (this.source != null) {
-			generator.writeKey("_source");
-			JsonpUtils.serialize(this.source, generator, tDocumentSerializer, mapper);
-
-		}
-		if (this.version != null) {
-			generator.writeKey("_version");
-			generator.write(this.version);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetResult}.
-	 */
-
-	public static class Builder<TDocument> extends GetResult.AbstractBuilder<TDocument, Builder<TDocument>>
-			implements
-				ObjectBuilder<GetResult<TDocument>> {
-		@Override
-		protected Builder<TDocument> self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetResult}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetResult<TDocument> build() {
-			_checkSingleUse();
-
-			return new GetResult<TDocument>(this);
-		}
-	}
-
-	protected abstract static class AbstractBuilder<TDocument, BuilderT extends AbstractBuilder<TDocument, BuilderT>>
-			extends
-				ObjectBuilderBase {
-		private String index;
-
-		@Nullable
-		private Map<String, JsonData> fields;
-
-		private Boolean found;
-
-		private String id;
-
-		@Nullable
-		private Long primaryTerm;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private Long seqNo;
-
-		@Nullable
-		private TDocument source;
-
-		@Nullable
-		private Long version;
-
-		@Nullable
-		private JsonpSerializer<TDocument> tDocumentSerializer;
-
-		/**
-		 * Required - API name: {@code _index}
-		 */
-		public final BuilderT index(String value) {
-			this.index = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>fields</code>.
-		 */
-		public final BuilderT fields(Map<String, JsonData> map) {
-			this.fields = _mapPutAll(this.fields, map);
-			return self();
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds an entry to <code>fields</code>.
-		 */
-		public final BuilderT fields(String key, JsonData value) {
-			this.fields = _mapPut(this.fields, key, value);
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code found}
-		 */
-		public final BuilderT found(boolean value) {
-			this.found = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code _id}
-		 */
-		public final BuilderT id(String value) {
-			this.id = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code _primary_term}
-		 */
-		public final BuilderT primaryTerm(@Nullable Long value) {
-			this.primaryTerm = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code _routing}
-		 */
-		public final BuilderT routing(@Nullable String value) {
-			this.routing = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code _seq_no}
-		 */
-		public final BuilderT seqNo(@Nullable Long value) {
-			this.seqNo = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code _source}
-		 */
-		public final BuilderT source(@Nullable TDocument value) {
-			this.source = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code _version}
-		 */
-		public final BuilderT version(@Nullable Long value) {
-			this.version = value;
-			return self();
-		}
-
-		/**
-		 * Serializer for TDocument. If not set, an attempt will be made to find a
-		 * serializer from the JSON context.
-		 */
-		public final BuilderT tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
-			this.tDocumentSerializer = value;
-			return self();
-		}
-
-		protected abstract BuilderT self();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Create a JSON deserializer for GetResult
-	 */
-	public static <TDocument> JsonpDeserializer<GetResult<TDocument>> createGetResultDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return ObjectBuilderDeserializer.createForObject((Supplier<Builder<TDocument>>) Builder::new,
-				op -> GetResult.setupGetResultDeserializer(op, tDocumentDeserializer));
-	};
-
-	protected static <TDocument, BuilderT extends AbstractBuilder<TDocument, BuilderT>> void setupGetResultDeserializer(
-			ObjectDeserializer<BuilderT> op, JsonpDeserializer<TDocument> tDocumentDeserializer) {
-
-		op.add(AbstractBuilder::index, JsonpDeserializer.stringDeserializer(), "_index");
-		op.add(AbstractBuilder::fields, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "fields");
-		op.add(AbstractBuilder::found, JsonpDeserializer.booleanDeserializer(), "found");
-		op.add(AbstractBuilder::id, JsonpDeserializer.stringDeserializer(), "_id");
-		op.add(AbstractBuilder::primaryTerm, JsonpDeserializer.longDeserializer(), "_primary_term");
-		op.add(AbstractBuilder::routing, JsonpDeserializer.stringDeserializer(), "_routing");
-		op.add(AbstractBuilder::seqNo, JsonpDeserializer.longDeserializer(), "_seq_no");
-		op.add(AbstractBuilder::source, tDocumentDeserializer, "_source");
-		op.add(AbstractBuilder::version, JsonpDeserializer.longDeserializer(), "_version");
-
-	}
+    private final String index;
+
+    private final Map<String, JsonData> fields;
+
+    private final boolean found;
+
+    private final String id;
+
+    @Nullable
+    private final Long primaryTerm;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final Long seqNo;
+
+    @Nullable
+    private final TDocument source;
+
+    @Nullable
+    private final Long version;
+
+    @Nullable
+    private final JsonpSerializer<TDocument> tDocumentSerializer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected GetResult(AbstractBuilder<TDocument, ?> builder) {
+
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.found = ApiTypeHelper.requireNonNull(builder.found, this, "found");
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.primaryTerm = builder.primaryTerm;
+        this.routing = builder.routing;
+        this.seqNo = builder.seqNo;
+        this.source = builder.source;
+        this.version = builder.version;
+        this.tDocumentSerializer = builder.tDocumentSerializer;
+
+    }
+
+    public static <TDocument> GetResult<TDocument> getResultOf(Function<Builder<TDocument>, ObjectBuilder<GetResult<TDocument>>> fn) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * Required - API name: {@code _index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code fields}
+     */
+    public final Map<String, JsonData> fields() {
+        return this.fields;
+    }
+
+    /**
+     * Required - API name: {@code found}
+     */
+    public final boolean found() {
+        return this.found;
+    }
+
+    /**
+     * Required - API name: {@code _id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * API name: {@code _primary_term}
+     */
+    @Nullable
+    public final Long primaryTerm() {
+        return this.primaryTerm;
+    }
+
+    /**
+     * API name: {@code _routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * API name: {@code _seq_no}
+     */
+    @Nullable
+    public final Long seqNo() {
+        return this.seqNo;
+    }
+
+    /**
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final TDocument source() {
+        return this.source;
+    }
+
+    /**
+     * API name: {@code _version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("_index");
+        generator.write(this.index);
+
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.fields.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("found");
+        generator.write(this.found);
+
+        generator.writeKey("_id");
+        generator.write(this.id);
+
+        if (this.primaryTerm != null) {
+            generator.writeKey("_primary_term");
+            generator.write(this.primaryTerm);
+
+        }
+        if (this.routing != null) {
+            generator.writeKey("_routing");
+            generator.write(this.routing);
+
+        }
+        if (this.seqNo != null) {
+            generator.writeKey("_seq_no");
+            generator.write(this.seqNo);
+
+        }
+        if (this.source != null) {
+            generator.writeKey("_source");
+            JsonpUtils.serialize(this.source, generator, tDocumentSerializer, mapper);
+
+        }
+        if (this.version != null) {
+            generator.writeKey("_version");
+            generator.write(this.version);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetResult}.
+     */
+
+    public static class Builder<TDocument> extends GetResult.AbstractBuilder<TDocument, Builder<TDocument>>
+        implements
+            ObjectBuilder<GetResult<TDocument>> {
+        @Override
+        protected Builder<TDocument> self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetResult}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetResult<TDocument> build() {
+            _checkSingleUse();
+
+            return new GetResult<TDocument>(this);
+        }
+    }
+
+    protected abstract static class AbstractBuilder<TDocument, BuilderT extends AbstractBuilder<TDocument, BuilderT>> extends
+        ObjectBuilderBase {
+        private String index;
+
+        @Nullable
+        private Map<String, JsonData> fields;
+
+        private Boolean found;
+
+        private String id;
+
+        @Nullable
+        private Long primaryTerm;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private Long seqNo;
+
+        @Nullable
+        private TDocument source;
+
+        @Nullable
+        private Long version;
+
+        @Nullable
+        private JsonpSerializer<TDocument> tDocumentSerializer;
+
+        /**
+         * Required - API name: {@code _index}
+         */
+        public final BuilderT index(String value) {
+            this.index = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>fields</code>.
+         */
+        public final BuilderT fields(Map<String, JsonData> map) {
+            this.fields = _mapPutAll(this.fields, map);
+            return self();
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds an entry to <code>fields</code>.
+         */
+        public final BuilderT fields(String key, JsonData value) {
+            this.fields = _mapPut(this.fields, key, value);
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code found}
+         */
+        public final BuilderT found(boolean value) {
+            this.found = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code _id}
+         */
+        public final BuilderT id(String value) {
+            this.id = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code _primary_term}
+         */
+        public final BuilderT primaryTerm(@Nullable Long value) {
+            this.primaryTerm = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code _routing}
+         */
+        public final BuilderT routing(@Nullable String value) {
+            this.routing = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code _seq_no}
+         */
+        public final BuilderT seqNo(@Nullable Long value) {
+            this.seqNo = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code _source}
+         */
+        public final BuilderT source(@Nullable TDocument value) {
+            this.source = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code _version}
+         */
+        public final BuilderT version(@Nullable Long value) {
+            this.version = value;
+            return self();
+        }
+
+        /**
+         * Serializer for TDocument. If not set, an attempt will be made to find a
+         * serializer from the JSON context.
+         */
+        public final BuilderT tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
+            this.tDocumentSerializer = value;
+            return self();
+        }
+
+        protected abstract BuilderT self();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Create a JSON deserializer for GetResult
+     */
+    public static <TDocument> JsonpDeserializer<GetResult<TDocument>> createGetResultDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<TDocument>>) Builder::new,
+            op -> GetResult.setupGetResultDeserializer(op, tDocumentDeserializer)
+        );
+    };
+
+    protected static <TDocument, BuilderT extends AbstractBuilder<TDocument, BuilderT>> void setupGetResultDeserializer(
+        ObjectDeserializer<BuilderT> op,
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+
+        op.add(AbstractBuilder::index, JsonpDeserializer.stringDeserializer(), "_index");
+        op.add(AbstractBuilder::fields, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "fields");
+        op.add(AbstractBuilder::found, JsonpDeserializer.booleanDeserializer(), "found");
+        op.add(AbstractBuilder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(AbstractBuilder::primaryTerm, JsonpDeserializer.longDeserializer(), "_primary_term");
+        op.add(AbstractBuilder::routing, JsonpDeserializer.stringDeserializer(), "_routing");
+        op.add(AbstractBuilder::seqNo, JsonpDeserializer.longDeserializer(), "_seq_no");
+        op.add(AbstractBuilder::source, tDocumentDeserializer, "_source");
+        op.add(AbstractBuilder::version, JsonpDeserializer.longDeserializer(), "_version");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/get_script_context/Context.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/get_script_context/Context.java
index cda3309f26..3c2e2eaf24 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/get_script_context/Context.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/get_script_context/Context.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.get_script_context;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,146 +44,144 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _global.get_script_context.Context
 
-
 @JsonpDeserializable
 public class Context implements JsonpSerializable {
-	private final List<ContextMethod> methods;
-
-	private final String name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Context(Builder builder) {
-
-		this.methods = ApiTypeHelper.unmodifiableRequired(builder.methods, this, "methods");
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-
-	}
-
-	public static Context of(Function<Builder, ObjectBuilder<Context>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code methods}
-	 */
-	public final List<ContextMethod> methods() {
-		return this.methods;
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.methods)) {
-			generator.writeKey("methods");
-			generator.writeStartArray();
-			for (ContextMethod item0 : this.methods) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("name");
-		generator.write(this.name);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Context}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Context> {
-		private List<ContextMethod> methods;
-
-		private String name;
-
-		/**
-		 * Required - API name: {@code methods}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>methods</code>.
-		 */
-		public final Builder methods(List<ContextMethod> list) {
-			this.methods = _listAddAll(this.methods, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code methods}
-		 * <p>
-		 * Adds one or more values to <code>methods</code>.
-		 */
-		public final Builder methods(ContextMethod value, ContextMethod... values) {
-			this.methods = _listAdd(this.methods, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code methods}
-		 * <p>
-		 * Adds a value to <code>methods</code> using a builder lambda.
-		 */
-		public final Builder methods(Function<ContextMethod.Builder, ObjectBuilder<ContextMethod>> fn) {
-			return methods(fn.apply(new ContextMethod.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Context}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Context build() {
-			_checkSingleUse();
-
-			return new Context(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Context}
-	 */
-	public static final JsonpDeserializer<Context> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Context::setupContextDeserializer);
-
-	protected static void setupContextDeserializer(ObjectDeserializer<Context.Builder> op) {
-
-		op.add(Builder::methods, JsonpDeserializer.arrayDeserializer(ContextMethod._DESERIALIZER), "methods");
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-
-	}
+    private final List<ContextMethod> methods;
+
+    private final String name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Context(Builder builder) {
+
+        this.methods = ApiTypeHelper.unmodifiableRequired(builder.methods, this, "methods");
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+
+    }
+
+    public static Context of(Function<Builder, ObjectBuilder<Context>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code methods}
+     */
+    public final List<ContextMethod> methods() {
+        return this.methods;
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.methods)) {
+            generator.writeKey("methods");
+            generator.writeStartArray();
+            for (ContextMethod item0 : this.methods) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("name");
+        generator.write(this.name);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Context}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Context> {
+        private List<ContextMethod> methods;
+
+        private String name;
+
+        /**
+         * Required - API name: {@code methods}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>methods</code>.
+         */
+        public final Builder methods(List<ContextMethod> list) {
+            this.methods = _listAddAll(this.methods, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code methods}
+         * <p>
+         * Adds one or more values to <code>methods</code>.
+         */
+        public final Builder methods(ContextMethod value, ContextMethod... values) {
+            this.methods = _listAdd(this.methods, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code methods}
+         * <p>
+         * Adds a value to <code>methods</code> using a builder lambda.
+         */
+        public final Builder methods(Function<ContextMethod.Builder, ObjectBuilder<ContextMethod>> fn) {
+            return methods(fn.apply(new ContextMethod.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Context}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Context build() {
+            _checkSingleUse();
+
+            return new Context(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Context}
+     */
+    public static final JsonpDeserializer<Context> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Context::setupContextDeserializer
+    );
+
+    protected static void setupContextDeserializer(ObjectDeserializer<Context.Builder> op) {
+
+        op.add(Builder::methods, JsonpDeserializer.arrayDeserializer(ContextMethod._DESERIALIZER), "methods");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/get_script_context/ContextMethod.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/get_script_context/ContextMethod.java
index c2643f7bce..5a15d7136d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/get_script_context/ContextMethod.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/get_script_context/ContextMethod.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.get_script_context;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,171 +44,169 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _global.get_script_context.ContextMethod
 
-
 @JsonpDeserializable
 public class ContextMethod implements JsonpSerializable {
-	private final String name;
+    private final String name;
 
-	private final String returnType;
+    private final String returnType;
 
-	private final List<ContextMethodParam> params;
+    private final List<ContextMethodParam> params;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private ContextMethod(Builder builder) {
+    // ---------------------------------------------------------------------------------------------
+
+    private ContextMethod(Builder builder) {
 
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.returnType = ApiTypeHelper.requireNonNull(builder.returnType, this, "returnType");
-		this.params = ApiTypeHelper.unmodifiableRequired(builder.params, this, "params");
-
-	}
-
-	public static ContextMethod of(Function<Builder, ObjectBuilder<ContextMethod>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Required - API name: {@code return_type}
-	 */
-	public final String returnType() {
-		return this.returnType;
-	}
-
-	/**
-	 * Required - API name: {@code params}
-	 */
-	public final List<ContextMethodParam> params() {
-		return this.params;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		generator.writeKey("return_type");
-		generator.write(this.returnType);
-
-		if (ApiTypeHelper.isDefined(this.params)) {
-			generator.writeKey("params");
-			generator.writeStartArray();
-			for (ContextMethodParam item0 : this.params) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ContextMethod}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ContextMethod> {
-		private String name;
-
-		private String returnType;
-
-		private List<ContextMethodParam> params;
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code return_type}
-		 */
-		public final Builder returnType(String value) {
-			this.returnType = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code params}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>params</code>.
-		 */
-		public final Builder params(List<ContextMethodParam> list) {
-			this.params = _listAddAll(this.params, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code params}
-		 * <p>
-		 * Adds one or more values to <code>params</code>.
-		 */
-		public final Builder params(ContextMethodParam value, ContextMethodParam... values) {
-			this.params = _listAdd(this.params, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code params}
-		 * <p>
-		 * Adds a value to <code>params</code> using a builder lambda.
-		 */
-		public final Builder params(Function<ContextMethodParam.Builder, ObjectBuilder<ContextMethodParam>> fn) {
-			return params(fn.apply(new ContextMethodParam.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ContextMethod}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ContextMethod build() {
-			_checkSingleUse();
-
-			return new ContextMethod(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ContextMethod}
-	 */
-	public static final JsonpDeserializer<ContextMethod> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ContextMethod::setupContextMethodDeserializer);
-
-	protected static void setupContextMethodDeserializer(ObjectDeserializer<ContextMethod.Builder> op) {
-
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::returnType, JsonpDeserializer.stringDeserializer(), "return_type");
-		op.add(Builder::params, JsonpDeserializer.arrayDeserializer(ContextMethodParam._DESERIALIZER), "params");
-
-	}
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.returnType = ApiTypeHelper.requireNonNull(builder.returnType, this, "returnType");
+        this.params = ApiTypeHelper.unmodifiableRequired(builder.params, this, "params");
+
+    }
+
+    public static ContextMethod of(Function<Builder, ObjectBuilder<ContextMethod>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Required - API name: {@code return_type}
+     */
+    public final String returnType() {
+        return this.returnType;
+    }
+
+    /**
+     * Required - API name: {@code params}
+     */
+    public final List<ContextMethodParam> params() {
+        return this.params;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        generator.writeKey("return_type");
+        generator.write(this.returnType);
+
+        if (ApiTypeHelper.isDefined(this.params)) {
+            generator.writeKey("params");
+            generator.writeStartArray();
+            for (ContextMethodParam item0 : this.params) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ContextMethod}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ContextMethod> {
+        private String name;
+
+        private String returnType;
+
+        private List<ContextMethodParam> params;
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code return_type}
+         */
+        public final Builder returnType(String value) {
+            this.returnType = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code params}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>params</code>.
+         */
+        public final Builder params(List<ContextMethodParam> list) {
+            this.params = _listAddAll(this.params, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code params}
+         * <p>
+         * Adds one or more values to <code>params</code>.
+         */
+        public final Builder params(ContextMethodParam value, ContextMethodParam... values) {
+            this.params = _listAdd(this.params, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code params}
+         * <p>
+         * Adds a value to <code>params</code> using a builder lambda.
+         */
+        public final Builder params(Function<ContextMethodParam.Builder, ObjectBuilder<ContextMethodParam>> fn) {
+            return params(fn.apply(new ContextMethodParam.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ContextMethod}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ContextMethod build() {
+            _checkSingleUse();
+
+            return new ContextMethod(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ContextMethod}
+     */
+    public static final JsonpDeserializer<ContextMethod> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ContextMethod::setupContextMethodDeserializer
+    );
+
+    protected static void setupContextMethodDeserializer(ObjectDeserializer<ContextMethod.Builder> op) {
+
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::returnType, JsonpDeserializer.stringDeserializer(), "return_type");
+        op.add(Builder::params, JsonpDeserializer.arrayDeserializer(ContextMethodParam._DESERIALIZER), "params");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/get_script_context/ContextMethodParam.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/get_script_context/ContextMethodParam.java
index c4e80d5e99..b761b535ec 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/get_script_context/ContextMethodParam.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/get_script_context/ContextMethodParam.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core.get_script_context;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,117 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.get_script_context.ContextMethodParam
 
-
 @JsonpDeserializable
 public class ContextMethodParam implements JsonpSerializable {
-	private final String name;
-
-	private final String type;
-
-	// ---------------------------------------------------------------------------------------------
+    private final String name;
 
-	private ContextMethodParam(Builder builder) {
+    private final String type;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+    private ContextMethodParam(Builder builder) {
 
-	}
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
 
-	public static ContextMethodParam of(Function<Builder, ObjectBuilder<ContextMethodParam>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
+    public static ContextMethodParam of(Function<Builder, ObjectBuilder<ContextMethodParam>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("name");
-		generator.write(this.name);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("type");
-		generator.write(this.type);
+        generator.writeKey("name");
+        generator.write(this.name);
 
-	}
+        generator.writeKey("type");
+        generator.write(this.type);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link ContextMethodParam}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ContextMethodParam> {
-		private String name;
+    /**
+     * Builder for {@link ContextMethodParam}.
+     */
 
-		private String type;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ContextMethodParam> {
+        private String name;
 
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
+        private String type;
 
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link ContextMethodParam}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ContextMethodParam build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
 
-			return new ContextMethodParam(this);
-		}
-	}
+        /**
+         * Builds a {@link ContextMethodParam}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ContextMethodParam build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new ContextMethodParam(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link ContextMethodParam}
-	 */
-	public static final JsonpDeserializer<ContextMethodParam> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ContextMethodParam::setupContextMethodParamDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupContextMethodParamDeserializer(ObjectDeserializer<ContextMethodParam.Builder> op) {
+    /**
+     * Json deserializer for {@link ContextMethodParam}
+     */
+    public static final JsonpDeserializer<ContextMethodParam> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ContextMethodParam::setupContextMethodParamDeserializer
+    );
 
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+    protected static void setupContextMethodParamDeserializer(ObjectDeserializer<ContextMethodParam.Builder> op) {
 
-	}
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/get_script_languages/LanguageContext.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/get_script_languages/LanguageContext.java
index 9dc8b0a543..bf5fbe226f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/get_script_languages/LanguageContext.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/get_script_languages/LanguageContext.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.get_script_languages;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,137 +44,135 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _global.get_script_languages.LanguageContext
 
 @JsonpDeserializable
 public class LanguageContext implements JsonpSerializable {
-	private final List<String> contexts;
-
-	private final String language;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private LanguageContext(Builder builder) {
-
-		this.contexts = ApiTypeHelper.unmodifiableRequired(builder.contexts, this, "contexts");
-		this.language = ApiTypeHelper.requireNonNull(builder.language, this, "language");
-
-	}
-
-	public static LanguageContext of(Function<Builder, ObjectBuilder<LanguageContext>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code contexts}
-	 */
-	public final List<String> contexts() {
-		return this.contexts;
-	}
-
-	/**
-	 * Required - API name: {@code language}
-	 */
-	public final String language() {
-		return this.language;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.contexts)) {
-			generator.writeKey("contexts");
-			generator.writeStartArray();
-			for (String item0 : this.contexts) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("language");
-		generator.write(this.language);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link LanguageContext}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<LanguageContext> {
-		private List<String> contexts;
-
-		private String language;
-
-		/**
-		 * Required - API name: {@code contexts}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>contexts</code>.
-		 */
-		public final Builder contexts(List<String> list) {
-			this.contexts = _listAddAll(this.contexts, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code contexts}
-		 * <p>
-		 * Adds one or more values to <code>contexts</code>.
-		 */
-		public final Builder contexts(String value, String... values) {
-			this.contexts = _listAdd(this.contexts, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code language}
-		 */
-		public final Builder language(String value) {
-			this.language = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link LanguageContext}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LanguageContext build() {
-			_checkSingleUse();
-
-			return new LanguageContext(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link LanguageContext}
-	 */
-	public static final JsonpDeserializer<LanguageContext> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			LanguageContext::setupLanguageContextDeserializer);
-
-	protected static void setupLanguageContextDeserializer(ObjectDeserializer<LanguageContext.Builder> op) {
-
-		op.add(Builder::contexts, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"contexts");
-		op.add(Builder::language, JsonpDeserializer.stringDeserializer(), "language");
-
-	}
+    private final List<String> contexts;
+
+    private final String language;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private LanguageContext(Builder builder) {
+
+        this.contexts = ApiTypeHelper.unmodifiableRequired(builder.contexts, this, "contexts");
+        this.language = ApiTypeHelper.requireNonNull(builder.language, this, "language");
+
+    }
+
+    public static LanguageContext of(Function<Builder, ObjectBuilder<LanguageContext>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code contexts}
+     */
+    public final List<String> contexts() {
+        return this.contexts;
+    }
+
+    /**
+     * Required - API name: {@code language}
+     */
+    public final String language() {
+        return this.language;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.contexts)) {
+            generator.writeKey("contexts");
+            generator.writeStartArray();
+            for (String item0 : this.contexts) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("language");
+        generator.write(this.language);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link LanguageContext}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<LanguageContext> {
+        private List<String> contexts;
+
+        private String language;
+
+        /**
+         * Required - API name: {@code contexts}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>contexts</code>.
+         */
+        public final Builder contexts(List<String> list) {
+            this.contexts = _listAddAll(this.contexts, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code contexts}
+         * <p>
+         * Adds one or more values to <code>contexts</code>.
+         */
+        public final Builder contexts(String value, String... values) {
+            this.contexts = _listAdd(this.contexts, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code language}
+         */
+        public final Builder language(String value) {
+            this.language = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link LanguageContext}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LanguageContext build() {
+            _checkSingleUse();
+
+            return new LanguageContext(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link LanguageContext}
+     */
+    public static final JsonpDeserializer<LanguageContext> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LanguageContext::setupLanguageContextDeserializer
+    );
+
+    protected static void setupLanguageContextDeserializer(ObjectDeserializer<LanguageContext.Builder> op) {
+
+        op.add(Builder::contexts, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "contexts");
+        op.add(Builder::language, JsonpDeserializer.stringDeserializer(), "language");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/mget/MultiGetError.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/mget/MultiGetError.java
index 533684401b..74dd084717 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/mget/MultiGetError.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/mget/MultiGetError.java
@@ -32,159 +32,159 @@
 
 package org.opensearch.client.opensearch.core.mget;
 
-import org.opensearch.client.opensearch._types.ErrorCause;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorCause;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.mget.MultiGetError
 
-
 @JsonpDeserializable
 public class MultiGetError implements JsonpSerializable {
-	private final ErrorCause error;
+    private final ErrorCause error;
 
-	private final String id;
-
-	private final String index;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MultiGetError(Builder builder) {
-
-		this.error = ApiTypeHelper.requireNonNull(builder.error, this, "error");
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-
-	}
-
-	public static MultiGetError of(Function<Builder, ObjectBuilder<MultiGetError>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code error}
-	 */
-	public final ErrorCause error() {
-		return this.error;
-	}
-
-	/**
-	 * Required - API name: {@code _id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - API name: {@code _index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("error");
-		this.error.serialize(generator, mapper);
-
-		generator.writeKey("_id");
-		generator.write(this.id);
-
-		generator.writeKey("_index");
-		generator.write(this.index);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MultiGetError}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MultiGetError> {
-		private ErrorCause error;
-
-		private String id;
-
-		private String index;
-
-		/**
-		 * Required - API name: {@code error}
-		 */
-		public final Builder error(ErrorCause value) {
-			this.error = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code error}
-		 */
-		public final Builder error(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
-			return this.error(fn.apply(new ErrorCause.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code _id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MultiGetError}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MultiGetError build() {
-			_checkSingleUse();
-
-			return new MultiGetError(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MultiGetError}
-	 */
-	public static final JsonpDeserializer<MultiGetError> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			MultiGetError::setupMultiGetErrorDeserializer);
-
-	protected static void setupMultiGetErrorDeserializer(ObjectDeserializer<MultiGetError.Builder> op) {
-
-		op.add(Builder::error, ErrorCause._DESERIALIZER, "error");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
-
-	}
+    private final String id;
+
+    private final String index;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MultiGetError(Builder builder) {
+
+        this.error = ApiTypeHelper.requireNonNull(builder.error, this, "error");
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+
+    }
+
+    public static MultiGetError of(Function<Builder, ObjectBuilder<MultiGetError>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code error}
+     */
+    public final ErrorCause error() {
+        return this.error;
+    }
+
+    /**
+     * Required - API name: {@code _id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - API name: {@code _index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("error");
+        this.error.serialize(generator, mapper);
+
+        generator.writeKey("_id");
+        generator.write(this.id);
+
+        generator.writeKey("_index");
+        generator.write(this.index);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MultiGetError}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MultiGetError> {
+        private ErrorCause error;
+
+        private String id;
+
+        private String index;
+
+        /**
+         * Required - API name: {@code error}
+         */
+        public final Builder error(ErrorCause value) {
+            this.error = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code error}
+         */
+        public final Builder error(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
+            return this.error(fn.apply(new ErrorCause.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code _id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link MultiGetError}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MultiGetError build() {
+            _checkSingleUse();
+
+            return new MultiGetError(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MultiGetError}
+     */
+    public static final JsonpDeserializer<MultiGetError> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MultiGetError::setupMultiGetErrorDeserializer
+    );
+
+    protected static void setupMultiGetErrorDeserializer(ObjectDeserializer<MultiGetError.Builder> op) {
+
+        op.add(Builder::error, ErrorCause._DESERIALIZER, "error");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/mget/MultiGetOperation.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/mget/MultiGetOperation.java
index fd3c294544..6accd89974 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/mget/MultiGetOperation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/mget/MultiGetOperation.java
@@ -32,304 +32,303 @@
 
 package org.opensearch.client.opensearch.core.mget;
 
-import org.opensearch.client.opensearch._types.VersionType;
-import org.opensearch.client.opensearch.core.search.SourceConfig;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.VersionType;
+import org.opensearch.client.opensearch.core.search.SourceConfig;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.mget.Operation
 
-
 @JsonpDeserializable
 public class MultiGetOperation implements JsonpSerializable {
-	private final String id;
-
-	@Nullable
-	private final String index;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final SourceConfig source;
-
-	private final List<String> storedFields;
-
-	@Nullable
-	private final Long version;
-
-	@Nullable
-	private final VersionType versionType;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MultiGetOperation(Builder builder) {
-
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = builder.index;
-		this.routing = builder.routing;
-		this.source = builder.source;
-		this.storedFields = ApiTypeHelper.unmodifiable(builder.storedFields);
-		this.version = builder.version;
-		this.versionType = builder.versionType;
-
-	}
-
-	public static MultiGetOperation of(Function<Builder, ObjectBuilder<MultiGetOperation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code _id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * API name: {@code _index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * API name: {@code _source}
-	 */
-	@Nullable
-	public final SourceConfig source() {
-		return this.source;
-	}
-
-	/**
-	 * API name: {@code stored_fields}
-	 */
-	public final List<String> storedFields() {
-		return this.storedFields;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * API name: {@code version_type}
-	 */
-	@Nullable
-	public final VersionType versionType() {
-		return this.versionType;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("_id");
-		generator.write(this.id);
-
-		if (this.index != null) {
-			generator.writeKey("_index");
-			generator.write(this.index);
-
-		}
-		if (this.routing != null) {
-			generator.writeKey("routing");
-			generator.write(this.routing);
-
-		}
-		if (this.source != null) {
-			generator.writeKey("_source");
-			this.source.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.storedFields)) {
-			generator.writeKey("stored_fields");
-			generator.writeStartArray();
-			for (String item0 : this.storedFields) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		if (this.versionType != null) {
-			generator.writeKey("version_type");
-			this.versionType.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MultiGetOperation}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MultiGetOperation> {
-		private String id;
-
-		@Nullable
-		private String index;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private SourceConfig source;
-
-		@Nullable
-		private List<String> storedFields;
-
-		@Nullable
-		private Long version;
-
-		@Nullable
-		private VersionType versionType;
-
-		/**
-		 * Required - API name: {@code _id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _source}
-		 */
-		public final Builder source(@Nullable SourceConfig value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _source}
-		 */
-		public final Builder source(Function<SourceConfig.Builder, ObjectBuilder<SourceConfig>> fn) {
-			return this.source(fn.apply(new SourceConfig.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code stored_fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>storedFields</code>.
-		 */
-		public final Builder storedFields(List<String> list) {
-			this.storedFields = _listAddAll(this.storedFields, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stored_fields}
-		 * <p>
-		 * Adds one or more values to <code>storedFields</code>.
-		 */
-		public final Builder storedFields(String value, String... values) {
-			this.storedFields = _listAdd(this.storedFields, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code version_type}
-		 */
-		public final Builder versionType(@Nullable VersionType value) {
-			this.versionType = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MultiGetOperation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MultiGetOperation build() {
-			_checkSingleUse();
-
-			return new MultiGetOperation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MultiGetOperation}
-	 */
-	public static final JsonpDeserializer<MultiGetOperation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MultiGetOperation::setupMultiGetOperationDeserializer);
-
-	protected static void setupMultiGetOperationDeserializer(ObjectDeserializer<MultiGetOperation.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
-		op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
-		op.add(Builder::source, SourceConfig._DESERIALIZER, "_source");
-		op.add(Builder::storedFields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"stored_fields");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
-		op.add(Builder::versionType, VersionType._DESERIALIZER, "version_type");
-
-	}
+    private final String id;
+
+    @Nullable
+    private final String index;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final SourceConfig source;
+
+    private final List<String> storedFields;
+
+    @Nullable
+    private final Long version;
+
+    @Nullable
+    private final VersionType versionType;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MultiGetOperation(Builder builder) {
+
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = builder.index;
+        this.routing = builder.routing;
+        this.source = builder.source;
+        this.storedFields = ApiTypeHelper.unmodifiable(builder.storedFields);
+        this.version = builder.version;
+        this.versionType = builder.versionType;
+
+    }
+
+    public static MultiGetOperation of(Function<Builder, ObjectBuilder<MultiGetOperation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code _id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * API name: {@code _index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final SourceConfig source() {
+        return this.source;
+    }
+
+    /**
+     * API name: {@code stored_fields}
+     */
+    public final List<String> storedFields() {
+        return this.storedFields;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * API name: {@code version_type}
+     */
+    @Nullable
+    public final VersionType versionType() {
+        return this.versionType;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("_id");
+        generator.write(this.id);
+
+        if (this.index != null) {
+            generator.writeKey("_index");
+            generator.write(this.index);
+
+        }
+        if (this.routing != null) {
+            generator.writeKey("routing");
+            generator.write(this.routing);
+
+        }
+        if (this.source != null) {
+            generator.writeKey("_source");
+            this.source.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.storedFields)) {
+            generator.writeKey("stored_fields");
+            generator.writeStartArray();
+            for (String item0 : this.storedFields) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        if (this.versionType != null) {
+            generator.writeKey("version_type");
+            this.versionType.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MultiGetOperation}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MultiGetOperation> {
+        private String id;
+
+        @Nullable
+        private String index;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private SourceConfig source;
+
+        @Nullable
+        private List<String> storedFields;
+
+        @Nullable
+        private Long version;
+
+        @Nullable
+        private VersionType versionType;
+
+        /**
+         * Required - API name: {@code _id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _source}
+         */
+        public final Builder source(@Nullable SourceConfig value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _source}
+         */
+        public final Builder source(Function<SourceConfig.Builder, ObjectBuilder<SourceConfig>> fn) {
+            return this.source(fn.apply(new SourceConfig.Builder()).build());
+        }
+
+        /**
+         * API name: {@code stored_fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>storedFields</code>.
+         */
+        public final Builder storedFields(List<String> list) {
+            this.storedFields = _listAddAll(this.storedFields, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code stored_fields}
+         * <p>
+         * Adds one or more values to <code>storedFields</code>.
+         */
+        public final Builder storedFields(String value, String... values) {
+            this.storedFields = _listAdd(this.storedFields, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code version_type}
+         */
+        public final Builder versionType(@Nullable VersionType value) {
+            this.versionType = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link MultiGetOperation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MultiGetOperation build() {
+            _checkSingleUse();
+
+            return new MultiGetOperation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MultiGetOperation}
+     */
+    public static final JsonpDeserializer<MultiGetOperation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MultiGetOperation::setupMultiGetOperationDeserializer
+    );
+
+    protected static void setupMultiGetOperationDeserializer(ObjectDeserializer<MultiGetOperation.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
+        op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
+        op.add(Builder::source, SourceConfig._DESERIALIZER, "_source");
+        op.add(Builder::storedFields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stored_fields");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
+        op.add(Builder::versionType, VersionType._DESERIALIZER, "version_type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/mget/MultiGetResponseItem.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/mget/MultiGetResponseItem.java
index 33c8e463d8..74c7da673d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/mget/MultiGetResponseItem.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/mget/MultiGetResponseItem.java
@@ -32,149 +32,145 @@
 
 package org.opensearch.client.opensearch.core.mget;
 
-import org.opensearch.client.opensearch.core.get.GetResult;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.JsonpSerializer;
 import org.opensearch.client.json.UnionDeserializer;
+import org.opensearch.client.opensearch.core.get.GetResult;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.mget.ResponseItem
 
-
-
-public class MultiGetResponseItem<TDocument>
-		implements
-			TaggedUnion<MultiGetResponseItem.Kind, Object>,
-			JsonpSerializable {
-
-	public enum Kind {
-		Result, Failure
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private final JsonpSerializer<TDocument> tDocumentSerializer = null;
-
-	private MultiGetResponseItem(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	private MultiGetResponseItem(Builder<TDocument> builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static <TDocument> MultiGetResponseItem<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<MultiGetResponseItem<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code result}?
-	 */
-	public boolean isResult() {
-		return _kind == Kind.Result;
-	}
-
-	/**
-	 * Get the {@code result} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code result} kind.
-	 */
-	public GetResult<TDocument> result() {
-		return TaggedUnionUtils.get(this, Kind.Result);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code failure}?
-	 */
-	public boolean isFailure() {
-		return _kind == Kind.Failure;
-	}
-
-	/**
-	 * Get the {@code failure} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code failure} kind.
-	 */
-	public MultiGetError failure() {
-		return TaggedUnionUtils.get(this, Kind.Failure);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		}
-
-	}
-
-	public static class Builder<TDocument> extends ObjectBuilderBase
-			implements
-				ObjectBuilder<MultiGetResponseItem<TDocument>> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<MultiGetResponseItem<TDocument>> result(GetResult<TDocument> v) {
-			this._kind = Kind.Result;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<MultiGetResponseItem<TDocument>> result(
-				Function<GetResult.Builder<TDocument>, ObjectBuilder<GetResult<TDocument>>> fn) {
-			return this.result(fn.apply(new GetResult.Builder<TDocument>()).build());
-		}
-
-		public ObjectBuilder<MultiGetResponseItem<TDocument>> failure(MultiGetError v) {
-			this._kind = Kind.Failure;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<MultiGetResponseItem<TDocument>> failure(
-				Function<MultiGetError.Builder, ObjectBuilder<MultiGetError>> fn) {
-			return this.failure(fn.apply(new MultiGetError.Builder()).build());
-		}
-
-		public MultiGetResponseItem<TDocument> build() {
-			_checkSingleUse();
-			return new MultiGetResponseItem<>(this);
-		}
-
-	}
-
-	public static <TDocument> JsonpDeserializer<MultiGetResponseItem<TDocument>> createMultiGetResponseItemDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return new UnionDeserializer.Builder<MultiGetResponseItem<TDocument>, Kind, Object>(
-				MultiGetResponseItem<TDocument>::new, false)
-						.addMember(Kind.Result, GetResult.createGetResultDeserializer(tDocumentDeserializer))
-						.addMember(Kind.Failure, MultiGetError._DESERIALIZER).build();
-	}
+public class MultiGetResponseItem<TDocument> implements TaggedUnion<MultiGetResponseItem.Kind, Object>, JsonpSerializable {
+
+    public enum Kind {
+        Result,
+        Failure
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private final JsonpSerializer<TDocument> tDocumentSerializer = null;
+
+    private MultiGetResponseItem(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private MultiGetResponseItem(Builder<TDocument> builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static <TDocument> MultiGetResponseItem<TDocument> of(
+        Function<Builder<TDocument>, ObjectBuilder<MultiGetResponseItem<TDocument>>> fn
+    ) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code result}?
+     */
+    public boolean isResult() {
+        return _kind == Kind.Result;
+    }
+
+    /**
+     * Get the {@code result} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code result} kind.
+     */
+    public GetResult<TDocument> result() {
+        return TaggedUnionUtils.get(this, Kind.Result);
+    }
+
+    /**
+     * Is this variant instance of kind {@code failure}?
+     */
+    public boolean isFailure() {
+        return _kind == Kind.Failure;
+    }
+
+    /**
+     * Get the {@code failure} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code failure} kind.
+     */
+    public MultiGetError failure() {
+        return TaggedUnionUtils.get(this, Kind.Failure);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        }
+
+    }
+
+    public static class Builder<TDocument> extends ObjectBuilderBase implements ObjectBuilder<MultiGetResponseItem<TDocument>> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<MultiGetResponseItem<TDocument>> result(GetResult<TDocument> v) {
+            this._kind = Kind.Result;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<MultiGetResponseItem<TDocument>> result(
+            Function<GetResult.Builder<TDocument>, ObjectBuilder<GetResult<TDocument>>> fn
+        ) {
+            return this.result(fn.apply(new GetResult.Builder<TDocument>()).build());
+        }
+
+        public ObjectBuilder<MultiGetResponseItem<TDocument>> failure(MultiGetError v) {
+            this._kind = Kind.Failure;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<MultiGetResponseItem<TDocument>> failure(Function<MultiGetError.Builder, ObjectBuilder<MultiGetError>> fn) {
+            return this.failure(fn.apply(new MultiGetError.Builder()).build());
+        }
+
+        public MultiGetResponseItem<TDocument> build() {
+            _checkSingleUse();
+            return new MultiGetResponseItem<>(this);
+        }
+
+    }
+
+    public static <TDocument> JsonpDeserializer<MultiGetResponseItem<TDocument>> createMultiGetResponseItemDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return new UnionDeserializer.Builder<MultiGetResponseItem<TDocument>, Kind, Object>(MultiGetResponseItem<TDocument>::new, false)
+            .addMember(Kind.Result, GetResult.createGetResultDeserializer(tDocumentDeserializer))
+            .addMember(Kind.Failure, MultiGetError._DESERIALIZER)
+            .build();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/mget/MultiGetResponseItemBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/mget/MultiGetResponseItemBuilders.java
index b552bc4731..57a0403bc5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/mget/MultiGetResponseItemBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/mget/MultiGetResponseItemBuilders.java
@@ -38,23 +38,22 @@
  * Builders for {@link MultiGetResponseItem} variants.
  */
 public class MultiGetResponseItemBuilders {
-	private MultiGetResponseItemBuilders() {
-	}
-
-	/**
-	 * Creates a builder for the {@link GetResult result}
-	 * {@code MultiGetResponseItem} variant.
-	 */
-	public static <TDocument> GetResult.Builder<TDocument> result() {
-		return new GetResult.Builder<TDocument>();
-	}
-
-	/**
-	 * Creates a builder for the {@link MultiGetError failure}
-	 * {@code MultiGetResponseItem} variant.
-	 */
-	public static <TDocument> MultiGetError.Builder failure() {
-		return new MultiGetError.Builder();
-	}
+    private MultiGetResponseItemBuilders() {}
+
+    /**
+     * Creates a builder for the {@link GetResult result}
+     * {@code MultiGetResponseItem} variant.
+     */
+    public static <TDocument> GetResult.Builder<TDocument> result() {
+        return new GetResult.Builder<TDocument>();
+    }
+
+    /**
+     * Creates a builder for the {@link MultiGetError failure}
+     * {@code MultiGetResponseItem} variant.
+     */
+    public static <TDocument> MultiGetError.Builder failure() {
+        return new MultiGetError.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultiSearchItem.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultiSearchItem.java
index 54ddc5f1ce..65007621c4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultiSearchItem.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultiSearchItem.java
@@ -32,107 +32,108 @@
 
 package org.opensearch.client.opensearch.core.msearch;
 
-import org.opensearch.client.opensearch.core.SearchResponse;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import java.util.function.Supplier;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.SearchResponse;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import java.util.function.Supplier;
 
 // typedef: _global.msearch.MultiSearchItem
 
-
-
 public class MultiSearchItem<TDocument> extends SearchResponse<TDocument> {
-	private final int status;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MultiSearchItem(Builder<TDocument> builder) {
-		super(builder);
-
-		this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
-
-	}
-
-	public static <TDocument> MultiSearchItem<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<MultiSearchItem<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * Required - API name: {@code status}
-	 */
-	public final int status() {
-		return this.status;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("status");
-		generator.write(this.status);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MultiSearchItem}.
-	 */
-
-	public static class Builder<TDocument> extends SearchResponse.AbstractBuilder<TDocument, Builder<TDocument>>
-			implements
-				ObjectBuilder<MultiSearchItem<TDocument>> {
-		private Integer status;
-
-		/**
-		 * Required - API name: {@code status}
-		 */
-		public final Builder<TDocument> status(int value) {
-			this.status = value;
-			return this;
-		}
-
-		@Override
-		protected Builder<TDocument> self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MultiSearchItem}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MultiSearchItem<TDocument> build() {
-			_checkSingleUse();
-
-			return new MultiSearchItem<TDocument>(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Create a JSON deserializer for MultiSearchItem
-	 */
-	public static <TDocument> JsonpDeserializer<MultiSearchItem<TDocument>> createMultiSearchItemDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return ObjectBuilderDeserializer.createForObject((Supplier<Builder<TDocument>>) Builder::new,
-				op -> MultiSearchItem.setupMultiSearchItemDeserializer(op, tDocumentDeserializer));
-	};
-
-	protected static <TDocument> void setupMultiSearchItemDeserializer(
-			ObjectDeserializer<MultiSearchItem.Builder<TDocument>> op,
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		SearchResponse.setupSearchResponseDeserializer(op, tDocumentDeserializer);
-		op.add(Builder::status, JsonpDeserializer.integerDeserializer(), "status");
-
-	}
+    private final int status;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MultiSearchItem(Builder<TDocument> builder) {
+        super(builder);
+
+        this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
+
+    }
+
+    public static <TDocument> MultiSearchItem<TDocument> of(Function<Builder<TDocument>, ObjectBuilder<MultiSearchItem<TDocument>>> fn) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * Required - API name: {@code status}
+     */
+    public final int status() {
+        return this.status;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("status");
+        generator.write(this.status);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MultiSearchItem}.
+     */
+
+    public static class Builder<TDocument> extends SearchResponse.AbstractBuilder<TDocument, Builder<TDocument>>
+        implements
+            ObjectBuilder<MultiSearchItem<TDocument>> {
+        private Integer status;
+
+        /**
+         * Required - API name: {@code status}
+         */
+        public final Builder<TDocument> status(int value) {
+            this.status = value;
+            return this;
+        }
+
+        @Override
+        protected Builder<TDocument> self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MultiSearchItem}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MultiSearchItem<TDocument> build() {
+            _checkSingleUse();
+
+            return new MultiSearchItem<TDocument>(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Create a JSON deserializer for MultiSearchItem
+     */
+    public static <TDocument> JsonpDeserializer<MultiSearchItem<TDocument>> createMultiSearchItemDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<TDocument>>) Builder::new,
+            op -> MultiSearchItem.setupMultiSearchItemDeserializer(op, tDocumentDeserializer)
+        );
+    };
+
+    protected static <TDocument> void setupMultiSearchItemDeserializer(
+        ObjectDeserializer<MultiSearchItem.Builder<TDocument>> op,
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        SearchResponse.setupSearchResponseDeserializer(op, tDocumentDeserializer);
+        op.add(Builder::status, JsonpDeserializer.integerDeserializer(), "status");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultiSearchResponseItem.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultiSearchResponseItem.java
index 5714678966..e7f7bed8d6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultiSearchResponseItem.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultiSearchResponseItem.java
@@ -32,150 +32,147 @@
 
 package org.opensearch.client.opensearch.core.msearch;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.JsonpSerializer;
 import org.opensearch.client.json.UnionDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.msearch.ResponseItem
 
-
-
-public class MultiSearchResponseItem<TDocument>
-		implements
-			TaggedUnion<MultiSearchResponseItem.Kind, Object>,
-			JsonpSerializable {
-
-	public enum Kind {
-		Result, Failure
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private final JsonpSerializer<TDocument> tDocumentSerializer = null;
-
-	private MultiSearchResponseItem(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	private MultiSearchResponseItem(Builder<TDocument> builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static <TDocument> MultiSearchResponseItem<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<MultiSearchResponseItem<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code result}?
-	 */
-	public boolean isResult() {
-		return _kind == Kind.Result;
-	}
-
-	/**
-	 * Get the {@code result} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code result} kind.
-	 */
-	public MultiSearchItem<TDocument> result() {
-		return TaggedUnionUtils.get(this, Kind.Result);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code failure}?
-	 */
-	public boolean isFailure() {
-		return _kind == Kind.Failure;
-	}
-
-	/**
-	 * Get the {@code failure} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code failure} kind.
-	 */
-	public ErrorResponse failure() {
-		return TaggedUnionUtils.get(this, Kind.Failure);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		}
-
-	}
-
-	public static class Builder<TDocument> extends ObjectBuilderBase
-			implements
-				ObjectBuilder<MultiSearchResponseItem<TDocument>> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<MultiSearchResponseItem<TDocument>> result(MultiSearchItem<TDocument> v) {
-			this._kind = Kind.Result;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<MultiSearchResponseItem<TDocument>> result(
-				Function<MultiSearchItem.Builder<TDocument>, ObjectBuilder<MultiSearchItem<TDocument>>> fn) {
-			return this.result(fn.apply(new MultiSearchItem.Builder<TDocument>()).build());
-		}
-
-		public ObjectBuilder<MultiSearchResponseItem<TDocument>> failure(ErrorResponse v) {
-			this._kind = Kind.Failure;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<MultiSearchResponseItem<TDocument>> failure(
-				Function<ErrorResponse.Builder, ObjectBuilder<ErrorResponse>> fn) {
-			return this.failure(fn.apply(new ErrorResponse.Builder()).build());
-		}
-
-		public MultiSearchResponseItem<TDocument> build() {
-			_checkSingleUse();
-			return new MultiSearchResponseItem<>(this);
-		}
-
-	}
-
-	public static <TDocument> JsonpDeserializer<MultiSearchResponseItem<TDocument>> createMultiSearchResponseItemDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return new UnionDeserializer.Builder<MultiSearchResponseItem<TDocument>, Kind, Object>(
-				MultiSearchResponseItem<TDocument>::new, false)
-						.addMember(Kind.Result,
-								MultiSearchItem.createMultiSearchItemDeserializer(tDocumentDeserializer))
-						.addMember(Kind.Failure, ErrorResponse._DESERIALIZER).build();
-	}
+public class MultiSearchResponseItem<TDocument> implements TaggedUnion<MultiSearchResponseItem.Kind, Object>, JsonpSerializable {
+
+    public enum Kind {
+        Result,
+        Failure
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private final JsonpSerializer<TDocument> tDocumentSerializer = null;
+
+    private MultiSearchResponseItem(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private MultiSearchResponseItem(Builder<TDocument> builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static <TDocument> MultiSearchResponseItem<TDocument> of(
+        Function<Builder<TDocument>, ObjectBuilder<MultiSearchResponseItem<TDocument>>> fn
+    ) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code result}?
+     */
+    public boolean isResult() {
+        return _kind == Kind.Result;
+    }
+
+    /**
+     * Get the {@code result} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code result} kind.
+     */
+    public MultiSearchItem<TDocument> result() {
+        return TaggedUnionUtils.get(this, Kind.Result);
+    }
+
+    /**
+     * Is this variant instance of kind {@code failure}?
+     */
+    public boolean isFailure() {
+        return _kind == Kind.Failure;
+    }
+
+    /**
+     * Get the {@code failure} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code failure} kind.
+     */
+    public ErrorResponse failure() {
+        return TaggedUnionUtils.get(this, Kind.Failure);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        }
+
+    }
+
+    public static class Builder<TDocument> extends ObjectBuilderBase implements ObjectBuilder<MultiSearchResponseItem<TDocument>> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<MultiSearchResponseItem<TDocument>> result(MultiSearchItem<TDocument> v) {
+            this._kind = Kind.Result;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<MultiSearchResponseItem<TDocument>> result(
+            Function<MultiSearchItem.Builder<TDocument>, ObjectBuilder<MultiSearchItem<TDocument>>> fn
+        ) {
+            return this.result(fn.apply(new MultiSearchItem.Builder<TDocument>()).build());
+        }
+
+        public ObjectBuilder<MultiSearchResponseItem<TDocument>> failure(ErrorResponse v) {
+            this._kind = Kind.Failure;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<MultiSearchResponseItem<TDocument>> failure(Function<ErrorResponse.Builder, ObjectBuilder<ErrorResponse>> fn) {
+            return this.failure(fn.apply(new ErrorResponse.Builder()).build());
+        }
+
+        public MultiSearchResponseItem<TDocument> build() {
+            _checkSingleUse();
+            return new MultiSearchResponseItem<>(this);
+        }
+
+    }
+
+    public static <TDocument> JsonpDeserializer<MultiSearchResponseItem<TDocument>> createMultiSearchResponseItemDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return new UnionDeserializer.Builder<MultiSearchResponseItem<TDocument>, Kind, Object>(
+            MultiSearchResponseItem<TDocument>::new,
+            false
+        ).addMember(Kind.Result, MultiSearchItem.createMultiSearchItemDeserializer(tDocumentDeserializer))
+            .addMember(Kind.Failure, ErrorResponse._DESERIALIZER)
+            .build();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultiSearchResponseItemBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultiSearchResponseItemBuilders.java
index ae4a5bcf90..67166d3135 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultiSearchResponseItemBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultiSearchResponseItemBuilders.java
@@ -38,23 +38,22 @@
  * Builders for {@link MultiSearchResponseItem} variants.
  */
 public class MultiSearchResponseItemBuilders {
-	private MultiSearchResponseItemBuilders() {
-	}
-
-	/**
-	 * Creates a builder for the {@link MultiSearchItem result}
-	 * {@code MultiSearchResponseItem} variant.
-	 */
-	public static <TDocument> MultiSearchItem.Builder<TDocument> result() {
-		return new MultiSearchItem.Builder<TDocument>();
-	}
-
-	/**
-	 * Creates a builder for the {@link ErrorResponse failure}
-	 * {@code MultiSearchResponseItem} variant.
-	 */
-	public static <TDocument> ErrorResponse.Builder failure() {
-		return new ErrorResponse.Builder();
-	}
+    private MultiSearchResponseItemBuilders() {}
+
+    /**
+     * Creates a builder for the {@link MultiSearchItem result}
+     * {@code MultiSearchResponseItem} variant.
+     */
+    public static <TDocument> MultiSearchItem.Builder<TDocument> result() {
+        return new MultiSearchItem.Builder<TDocument>();
+    }
+
+    /**
+     * Creates a builder for the {@link ErrorResponse failure}
+     * {@code MultiSearchResponseItem} variant.
+     */
+    public static <TDocument> ErrorResponse.Builder failure() {
+        return new ErrorResponse.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultiSearchResult.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultiSearchResult.java
index f6dcdee03d..42e65b9012 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultiSearchResult.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultiSearchResult.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core.msearch;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
@@ -40,147 +44,142 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.msearch.MultiSearchResult
 
-
-
 public abstract class MultiSearchResult<TDocument> implements JsonpSerializable {
-	private final long took;
-
-	private final List<MultiSearchResponseItem<TDocument>> responses;
-
-	@Nullable
-	private final JsonpSerializer<TDocument> tDocumentSerializer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected MultiSearchResult(AbstractBuilder<TDocument, ?> builder) {
-
-		this.took = ApiTypeHelper.requireNonNull(builder.took, this, "took");
-		this.responses = ApiTypeHelper.unmodifiableRequired(builder.responses, this, "responses");
-		this.tDocumentSerializer = builder.tDocumentSerializer;
-
-	}
-
-	/**
-	 * Required - API name: {@code took}
-	 */
-	public final long took() {
-		return this.took;
-	}
-
-	/**
-	 * Required - API name: {@code responses}
-	 */
-	public final List<MultiSearchResponseItem<TDocument>> responses() {
-		return this.responses;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("took");
-		generator.write(this.took);
-
-		if (ApiTypeHelper.isDefined(this.responses)) {
-			generator.writeKey("responses");
-			generator.writeStartArray();
-			for (MultiSearchResponseItem<TDocument> item0 : this.responses) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<TDocument, BuilderT extends AbstractBuilder<TDocument, BuilderT>>
-			extends
-				ObjectBuilderBase {
-		private Long took;
-
-		private List<MultiSearchResponseItem<TDocument>> responses;
-
-		@Nullable
-		private JsonpSerializer<TDocument> tDocumentSerializer;
-
-		/**
-		 * Required - API name: {@code took}
-		 */
-		public final BuilderT took(long value) {
-			this.took = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code responses}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>responses</code>.
-		 */
-		public final BuilderT responses(List<MultiSearchResponseItem<TDocument>> list) {
-			this.responses = _listAddAll(this.responses, list);
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code responses}
-		 * <p>
-		 * Adds one or more values to <code>responses</code>.
-		 */
-		public final BuilderT responses(MultiSearchResponseItem<TDocument> value,
-				MultiSearchResponseItem<TDocument>... values) {
-			this.responses = _listAdd(this.responses, value, values);
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code responses}
-		 * <p>
-		 * Adds a value to <code>responses</code> using a builder lambda.
-		 */
-		public final BuilderT responses(
-				Function<MultiSearchResponseItem.Builder<TDocument>,
-						ObjectBuilder<MultiSearchResponseItem<TDocument>>> fn) {
-			return responses(fn.apply(new MultiSearchResponseItem.Builder<TDocument>()).build());
-		}
-
-		/**
-		 * Serializer for TDocument. If not set, an attempt will be made to find a
-		 * serializer from the JSON context.
-		 */
-		public final BuilderT tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
-			this.tDocumentSerializer = value;
-			return self();
-		}
-
-		protected abstract BuilderT self();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <TDocument, BuilderT extends AbstractBuilder<TDocument, BuilderT>> void setupMultiSearchResultDeserializer(
-			ObjectDeserializer<BuilderT> op, JsonpDeserializer<TDocument> tDocumentDeserializer) {
-
-		op.add(AbstractBuilder::took, JsonpDeserializer.longDeserializer(), "took");
-		op.add(AbstractBuilder::responses,
-				JsonpDeserializer.arrayDeserializer(
-						MultiSearchResponseItem.createMultiSearchResponseItemDeserializer(tDocumentDeserializer)),
-				"responses");
-
-	}
+    private final long took;
+
+    private final List<MultiSearchResponseItem<TDocument>> responses;
+
+    @Nullable
+    private final JsonpSerializer<TDocument> tDocumentSerializer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected MultiSearchResult(AbstractBuilder<TDocument, ?> builder) {
+
+        this.took = ApiTypeHelper.requireNonNull(builder.took, this, "took");
+        this.responses = ApiTypeHelper.unmodifiableRequired(builder.responses, this, "responses");
+        this.tDocumentSerializer = builder.tDocumentSerializer;
+
+    }
+
+    /**
+     * Required - API name: {@code took}
+     */
+    public final long took() {
+        return this.took;
+    }
+
+    /**
+     * Required - API name: {@code responses}
+     */
+    public final List<MultiSearchResponseItem<TDocument>> responses() {
+        return this.responses;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("took");
+        generator.write(this.took);
+
+        if (ApiTypeHelper.isDefined(this.responses)) {
+            generator.writeKey("responses");
+            generator.writeStartArray();
+            for (MultiSearchResponseItem<TDocument> item0 : this.responses) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<TDocument, BuilderT extends AbstractBuilder<TDocument, BuilderT>> extends
+        ObjectBuilderBase {
+        private Long took;
+
+        private List<MultiSearchResponseItem<TDocument>> responses;
+
+        @Nullable
+        private JsonpSerializer<TDocument> tDocumentSerializer;
+
+        /**
+         * Required - API name: {@code took}
+         */
+        public final BuilderT took(long value) {
+            this.took = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code responses}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>responses</code>.
+         */
+        public final BuilderT responses(List<MultiSearchResponseItem<TDocument>> list) {
+            this.responses = _listAddAll(this.responses, list);
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code responses}
+         * <p>
+         * Adds one or more values to <code>responses</code>.
+         */
+        public final BuilderT responses(MultiSearchResponseItem<TDocument> value, MultiSearchResponseItem<TDocument>... values) {
+            this.responses = _listAdd(this.responses, value, values);
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code responses}
+         * <p>
+         * Adds a value to <code>responses</code> using a builder lambda.
+         */
+        public final BuilderT responses(
+            Function<MultiSearchResponseItem.Builder<TDocument>, ObjectBuilder<MultiSearchResponseItem<TDocument>>> fn
+        ) {
+            return responses(fn.apply(new MultiSearchResponseItem.Builder<TDocument>()).build());
+        }
+
+        /**
+         * Serializer for TDocument. If not set, an attempt will be made to find a
+         * serializer from the JSON context.
+         */
+        public final BuilderT tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
+            this.tDocumentSerializer = value;
+            return self();
+        }
+
+        protected abstract BuilderT self();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <TDocument, BuilderT extends AbstractBuilder<TDocument, BuilderT>> void setupMultiSearchResultDeserializer(
+        ObjectDeserializer<BuilderT> op,
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+
+        op.add(AbstractBuilder::took, JsonpDeserializer.longDeserializer(), "took");
+        op.add(
+            AbstractBuilder::responses,
+            JsonpDeserializer.arrayDeserializer(MultiSearchResponseItem.createMultiSearchResponseItemDeserializer(tDocumentDeserializer)),
+            "responses"
+        );
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultisearchBody.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultisearchBody.java
index e03538d484..812377e3a8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultisearchBody.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultisearchBody.java
@@ -32,6 +32,17 @@
 
 package org.opensearch.client.opensearch.core.msearch;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpDeserializable;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.json.ObjectBuilderDeserializer;
+import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.opensearch._types.ScriptField;
 import org.opensearch.client.opensearch._types.SortOptions;
 import org.opensearch.client.opensearch._types.aggregations.Aggregation;
@@ -40,622 +51,607 @@
 import org.opensearch.client.opensearch.core.search.SourceConfig;
 import org.opensearch.client.opensearch.core.search.Suggester;
 import org.opensearch.client.opensearch.core.search.TrackHits;
-import org.opensearch.client.json.JsonpDeserializable;
-import org.opensearch.client.json.JsonpDeserializer;
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
-import org.opensearch.client.json.ObjectBuilderDeserializer;
-import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.msearch.MultisearchBody
 
-
 @JsonpDeserializable
 public class MultisearchBody implements JsonpSerializable {
-	private final Map<String, Aggregation> aggregations;
-
-	@Nullable
-	private final Query query;
-
-	@Nullable
-	private final Integer from;
-
-	@Nullable
-	private final Double minScore;
-
-	@Nullable
-	private final Query postFilter;
-
-	private final List<String> searchAfter;
-
-	@Nullable
-	private final Integer size;
-
-	private final List<SortOptions> sort;
-
-	@Nullable
-	private final Boolean trackScores;
-
-	@Nullable
-	private final TrackHits trackTotalHits;
-
-	@Nullable
-	private final Suggester suggest;
-
-	@Nullable
-	private Highlight highlight;
-
-	@Nullable
-	private SourceConfig source;
-
-	private final Map<String, ScriptField> scriptFields;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MultisearchBody(Builder builder) {
-
-		this.aggregations = ApiTypeHelper.unmodifiable(builder.aggregations);
-		this.query = builder.query;
-		this.from = builder.from;
-		this.minScore = builder.minScore;
-		this.postFilter = builder.postFilter;
-		this.searchAfter = ApiTypeHelper.unmodifiable(builder.searchAfter);
-		this.size = builder.size;
-		this.sort = ApiTypeHelper.unmodifiable(builder.sort);
-		this.trackScores = builder.trackScores;
-		this.trackTotalHits = builder.trackTotalHits;
-		this.suggest = builder.suggest;
-		this.highlight = builder.highlight;
-		this.source = builder.source;
-		this.scriptFields = ApiTypeHelper.unmodifiable(builder.scriptFields);
-	}
-
-	public static MultisearchBody of(Function<Builder, ObjectBuilder<MultisearchBody>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code aggregations}
-	 */
-	public final Map<String, Aggregation> aggregations() {
-		return this.aggregations;
-	}
-
-	/**
-	 * API name: {@code query}
-	 */
-	@Nullable
-	public final Query query() {
-		return this.query;
-	}
-
-	/**
-	 * API name: {@code from}
-	 */
-	@Nullable
-	public final Integer from() {
-		return this.from;
-	}
-
-	/**
-	 * API name: {@code from}
-	 */
-	@Nullable
-	public final Double minScore() {
-		return this.minScore;
-	}
-
-	/**
-	 * API name: {@code post_filter}
-	 */
-	@Nullable
-	public final Query postFilter() {
-		return this.postFilter;
-	}
-
-	/**
-	 * API name: {@code search_after}
-	 */
-	public final List<String> searchAfter() {
-		return this.searchAfter;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	/**
-	 * API name: {@code sort}
-	 */
-	public final List<SortOptions> sort() {
-		return this.sort;
-	}
-
-	/**
-	 * API name: {@code track_scores}
-	 */
-	@Nullable
-	public final Boolean trackScores() {
-		return this.trackScores;
-	}
-
-	/**
-	 * API name: {@code track_total_hits}
-	 */
-	@Nullable
-	public final TrackHits trackTotalHits() {
-		return this.trackTotalHits;
-	}
-
-	/**
-	 * API name: {@code suggest}
-	 */
-	@Nullable
-	public final Suggester suggest() {
-		return this.suggest;
-	}
-
-	/**
-	 * API name: {@code highlight}
-	 */
-	@Nullable
-	public final Highlight highlight() {
-		return this.highlight;
-	}
-
-	/**
-	 * API name: {@code _source}
-	 */
-	@Nullable
-	public final SourceConfig source() {
-		return this.source;
-	}
-
-	public final Map<String, ScriptField> scriptFields() {
-		return this.scriptFields;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.aggregations)) {
-			generator.writeKey("aggregations");
-			generator.writeStartObject();
-			for (Map.Entry<String, Aggregation> item0 : this.aggregations.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.query != null) {
-			generator.writeKey("query");
-			this.query.serialize(generator, mapper);
-
-		}
-		if (this.from != null) {
-			generator.writeKey("from");
-			generator.write(this.from);
-
-		}
-		if (this.minScore != null) {
-			generator.writeKey("min_score");
-			generator.write(this.minScore);
-
-		}
-		if (this.postFilter != null) {
-			generator.writeKey("post_filter");
-			this.postFilter.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.searchAfter)) {
-			generator.writeKey("search_after");
-			generator.writeStartArray();
-			for (String item0 : this.searchAfter) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		if (ApiTypeHelper.isDefined(this.sort)) {
-			generator.writeKey("sort");
-			generator.writeStartArray();
-			for (SortOptions item0 : this.sort) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.trackScores != null) {
-			generator.writeKey("track_scores");
-			generator.write(this.trackScores);
-
-		}
-		if (this.trackTotalHits != null) {
-			generator.writeKey("track_total_hits");
-			this.trackTotalHits.serialize(generator, mapper);
-
-		}
-		if (this.suggest != null) {
-			generator.writeKey("suggest");
-			this.suggest.serialize(generator, mapper);
-
-		}
-
-		if (this.highlight != null) {
-			generator.writeKey("highlight");
-			this.highlight.serialize(generator, mapper);
-
-		}
-
-		if (this.source != null) {
-			generator.writeKey("_source");
-			this.source.serialize(generator, mapper);
-
-		}
-
-		if (ApiTypeHelper.isDefined(this.scriptFields)) {
-			generator.writeKey("script_fields");
-			generator.writeStartObject();
-			for (Map.Entry<String, ScriptField> item0 : this.scriptFields.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MultisearchBody}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MultisearchBody> {
-		@Nullable
-		private Map<String, Aggregation> aggregations;
-
-		@Nullable
-		private Query query;
-
-		@Nullable
-		private Integer from;
-
-		@Nullable
-		private Double minScore;
-
-		@Nullable
-		private Query postFilter;
-
-		@Nullable
-		private List<String> searchAfter;
-
-		@Nullable
-		private Integer size;
-
-		@Nullable
-		private List<SortOptions> sort;
-
-		@Nullable
-		private Boolean trackScores;
-
-		@Nullable
-		private TrackHits trackTotalHits;
-
-		@Nullable
-		private Suggester suggest;
-
-		@Nullable
-		private Highlight highlight;
-
-		@Nullable
-		private SourceConfig source;
-
-		private Map<String, ScriptField> scriptFields;
-
-
-		/**
-		 * API name: {@code aggregations}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aggregations</code>.
-		 */
-		public final Builder aggregations(Map<String, Aggregation> map) {
-			this.aggregations = _mapPutAll(this.aggregations, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aggregations}
-		 * <p>
-		 * Adds an entry to <code>aggregations</code>.
-		 */
-		public final Builder aggregations(String key, Aggregation value) {
-			this.aggregations = _mapPut(this.aggregations, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aggregations}
-		 * <p>
-		 * Adds an entry to <code>aggregations</code> using a builder lambda.
-		 */
-		public final Builder aggregations(String key, Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
-			return aggregations(key, fn.apply(new Aggregation.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code query}
-		 */
-		public final Builder query(@Nullable Query value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code query}
-		 */
-		public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.query(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code from}
-		 */
-		public final Builder from(@Nullable Integer value) {
-			this.from = value;
-			return this;
-		}
-
-		/**
-		 * Minimum _score for matching documents. Documents with a lower _score are not
-		 * included in the search results.
-		 * <p>
-		 * API name: {@code min_score}
-		 */
-		public final Builder minScore(@Nullable Double value) {
-			this.minScore = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code post_filter}
-		 */
-		public final Builder postFilter(@Nullable Query value) {
-			this.postFilter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code post_filter}
-		 */
-		public final Builder postFilter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.postFilter(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code search_after}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>searchAfter</code>.
-		 */
-		public final Builder searchAfter(List<String> list) {
-			this.searchAfter = _listAddAll(this.searchAfter, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code search_after}
-		 * <p>
-		 * Adds one or more values to <code>searchAfter</code>.
-		 */
-		public final Builder searchAfter(String value, String... values) {
-			this.searchAfter = _listAdd(this.searchAfter, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Integer value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sort</code>.
-		 */
-		public final Builder sort(List<SortOptions> list) {
-			this.sort = _listAddAll(this.sort, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds one or more values to <code>sort</code>.
-		 */
-		public final Builder sort(SortOptions value, SortOptions... values) {
-			this.sort = _listAdd(this.sort, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds a value to <code>sort</code> using a builder lambda.
-		 */
-		public final Builder sort(Function<SortOptions.Builder, ObjectBuilder<SortOptions>> fn) {
-			return sort(fn.apply(new SortOptions.Builder()).build());
-		}
-
-		/**
-		 * If true, calculate and return document scores, even if the scores are not
-		 * used for sorting.
-		 * <p>
-		 * API name: {@code track_scores}
-		 */
-		public final Builder trackScores(@Nullable Boolean value) {
-			this.trackScores = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code track_total_hits}
-		 */
-		public final Builder trackTotalHits(@Nullable TrackHits value) {
-			this.trackTotalHits = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code track_total_hits}
-		 */
-		public final Builder trackTotalHits(Function<TrackHits.Builder, ObjectBuilder<TrackHits>> fn) {
-			return this.trackTotalHits(fn.apply(new TrackHits.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code suggest}
-		 */
-		public final Builder suggest(@Nullable Suggester value) {
-			this.suggest = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code suggest}
-		 */
-		public final Builder suggest(Function<Suggester.Builder, ObjectBuilder<Suggester>> fn) {
-			return this.suggest(fn.apply(new Suggester.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code highlight}
-		 */
-		public final Builder highlight(@Nullable Highlight value) {
-			this.highlight = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code highlight}
-		 */
-		public final Builder highlight(Function<Highlight.Builder, ObjectBuilder<Highlight>> fn) {
-			return this.highlight(fn.apply(new Highlight.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code _source}
-		 */
-		public final Builder source(@Nullable SourceConfig value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _source}
-		 */
-		public final Builder source(Function<SourceConfig.Builder, ObjectBuilder<SourceConfig>> fn) {
-			return this.source(fn.apply(new SourceConfig.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code script_fields}
-		 */
-		public final Builder scriptFields(Map<String, ScriptField> map) {
-			this.scriptFields = _mapPutAll(this.scriptFields, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code script_fields}
-		 */
-		public final Builder scriptFields(String key, ScriptField value) {
-			this.scriptFields = _mapPut(this.scriptFields, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code script_fields}
-		 */
-		public final Builder scriptFields(String key, Function<ScriptField.Builder, ObjectBuilder<ScriptField>> fn) {
-			return scriptFields(key, fn.apply(new ScriptField.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link MultisearchBody}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MultisearchBody build() {
-			_checkSingleUse();
-
-			return new MultisearchBody(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MultisearchBody}
-	 */
-	public static final JsonpDeserializer<MultisearchBody> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			MultisearchBody::setupMultisearchBodyDeserializer);
-
-	protected static void setupMultisearchBodyDeserializer(ObjectDeserializer<MultisearchBody.Builder> op) {
-
-		op.add(Builder::aggregations, JsonpDeserializer.stringMapDeserializer(Aggregation._DESERIALIZER),
-				"aggregations", "aggs");
-		op.add(Builder::query, Query._DESERIALIZER, "query");
-		op.add(Builder::from, JsonpDeserializer.integerDeserializer(), "from");
-		op.add(Builder::minScore, JsonpDeserializer.doubleDeserializer(), "min_score");
-		op.add(Builder::postFilter, Query._DESERIALIZER, "post_filter");
-		op.add(Builder::searchAfter, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"search_after");
-		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
-		op.add(Builder::sort, JsonpDeserializer.arrayDeserializer(SortOptions._DESERIALIZER), "sort");
-		op.add(Builder::trackScores, JsonpDeserializer.booleanDeserializer(), "track_scores");
-		op.add(Builder::trackTotalHits, TrackHits._DESERIALIZER, "track_total_hits");
-		op.add(Builder::suggest, Suggester._DESERIALIZER, "suggest");
-		op.add(Builder::highlight, Highlight._DESERIALIZER, "highlight");
-		op.add(Builder::source, SourceConfig._DESERIALIZER, "_source");
-		op.add(Builder::scriptFields, JsonpDeserializer.stringMapDeserializer(ScriptField._DESERIALIZER),
-				"script_fields");
-
-	}
+    private final Map<String, Aggregation> aggregations;
+
+    @Nullable
+    private final Query query;
+
+    @Nullable
+    private final Integer from;
+
+    @Nullable
+    private final Double minScore;
+
+    @Nullable
+    private final Query postFilter;
+
+    private final List<String> searchAfter;
+
+    @Nullable
+    private final Integer size;
+
+    private final List<SortOptions> sort;
+
+    @Nullable
+    private final Boolean trackScores;
+
+    @Nullable
+    private final TrackHits trackTotalHits;
+
+    @Nullable
+    private final Suggester suggest;
+
+    @Nullable
+    private Highlight highlight;
+
+    @Nullable
+    private SourceConfig source;
+
+    private final Map<String, ScriptField> scriptFields;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MultisearchBody(Builder builder) {
+
+        this.aggregations = ApiTypeHelper.unmodifiable(builder.aggregations);
+        this.query = builder.query;
+        this.from = builder.from;
+        this.minScore = builder.minScore;
+        this.postFilter = builder.postFilter;
+        this.searchAfter = ApiTypeHelper.unmodifiable(builder.searchAfter);
+        this.size = builder.size;
+        this.sort = ApiTypeHelper.unmodifiable(builder.sort);
+        this.trackScores = builder.trackScores;
+        this.trackTotalHits = builder.trackTotalHits;
+        this.suggest = builder.suggest;
+        this.highlight = builder.highlight;
+        this.source = builder.source;
+        this.scriptFields = ApiTypeHelper.unmodifiable(builder.scriptFields);
+    }
+
+    public static MultisearchBody of(Function<Builder, ObjectBuilder<MultisearchBody>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code aggregations}
+     */
+    public final Map<String, Aggregation> aggregations() {
+        return this.aggregations;
+    }
+
+    /**
+     * API name: {@code query}
+     */
+    @Nullable
+    public final Query query() {
+        return this.query;
+    }
+
+    /**
+     * API name: {@code from}
+     */
+    @Nullable
+    public final Integer from() {
+        return this.from;
+    }
+
+    /**
+     * API name: {@code from}
+     */
+    @Nullable
+    public final Double minScore() {
+        return this.minScore;
+    }
+
+    /**
+     * API name: {@code post_filter}
+     */
+    @Nullable
+    public final Query postFilter() {
+        return this.postFilter;
+    }
+
+    /**
+     * API name: {@code search_after}
+     */
+    public final List<String> searchAfter() {
+        return this.searchAfter;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    /**
+     * API name: {@code sort}
+     */
+    public final List<SortOptions> sort() {
+        return this.sort;
+    }
+
+    /**
+     * API name: {@code track_scores}
+     */
+    @Nullable
+    public final Boolean trackScores() {
+        return this.trackScores;
+    }
+
+    /**
+     * API name: {@code track_total_hits}
+     */
+    @Nullable
+    public final TrackHits trackTotalHits() {
+        return this.trackTotalHits;
+    }
+
+    /**
+     * API name: {@code suggest}
+     */
+    @Nullable
+    public final Suggester suggest() {
+        return this.suggest;
+    }
+
+    /**
+     * API name: {@code highlight}
+     */
+    @Nullable
+    public final Highlight highlight() {
+        return this.highlight;
+    }
+
+    /**
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final SourceConfig source() {
+        return this.source;
+    }
+
+    public final Map<String, ScriptField> scriptFields() {
+        return this.scriptFields;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.aggregations)) {
+            generator.writeKey("aggregations");
+            generator.writeStartObject();
+            for (Map.Entry<String, Aggregation> item0 : this.aggregations.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.query != null) {
+            generator.writeKey("query");
+            this.query.serialize(generator, mapper);
+
+        }
+        if (this.from != null) {
+            generator.writeKey("from");
+            generator.write(this.from);
+
+        }
+        if (this.minScore != null) {
+            generator.writeKey("min_score");
+            generator.write(this.minScore);
+
+        }
+        if (this.postFilter != null) {
+            generator.writeKey("post_filter");
+            this.postFilter.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.searchAfter)) {
+            generator.writeKey("search_after");
+            generator.writeStartArray();
+            for (String item0 : this.searchAfter) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        if (ApiTypeHelper.isDefined(this.sort)) {
+            generator.writeKey("sort");
+            generator.writeStartArray();
+            for (SortOptions item0 : this.sort) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.trackScores != null) {
+            generator.writeKey("track_scores");
+            generator.write(this.trackScores);
+
+        }
+        if (this.trackTotalHits != null) {
+            generator.writeKey("track_total_hits");
+            this.trackTotalHits.serialize(generator, mapper);
+
+        }
+        if (this.suggest != null) {
+            generator.writeKey("suggest");
+            this.suggest.serialize(generator, mapper);
+
+        }
+
+        if (this.highlight != null) {
+            generator.writeKey("highlight");
+            this.highlight.serialize(generator, mapper);
+
+        }
+
+        if (this.source != null) {
+            generator.writeKey("_source");
+            this.source.serialize(generator, mapper);
+
+        }
+
+        if (ApiTypeHelper.isDefined(this.scriptFields)) {
+            generator.writeKey("script_fields");
+            generator.writeStartObject();
+            for (Map.Entry<String, ScriptField> item0 : this.scriptFields.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MultisearchBody}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MultisearchBody> {
+        @Nullable
+        private Map<String, Aggregation> aggregations;
+
+        @Nullable
+        private Query query;
+
+        @Nullable
+        private Integer from;
+
+        @Nullable
+        private Double minScore;
+
+        @Nullable
+        private Query postFilter;
+
+        @Nullable
+        private List<String> searchAfter;
+
+        @Nullable
+        private Integer size;
+
+        @Nullable
+        private List<SortOptions> sort;
+
+        @Nullable
+        private Boolean trackScores;
+
+        @Nullable
+        private TrackHits trackTotalHits;
+
+        @Nullable
+        private Suggester suggest;
+
+        @Nullable
+        private Highlight highlight;
+
+        @Nullable
+        private SourceConfig source;
+
+        private Map<String, ScriptField> scriptFields;
+
+        /**
+         * API name: {@code aggregations}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aggregations</code>.
+         */
+        public final Builder aggregations(Map<String, Aggregation> map) {
+            this.aggregations = _mapPutAll(this.aggregations, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code aggregations}
+         * <p>
+         * Adds an entry to <code>aggregations</code>.
+         */
+        public final Builder aggregations(String key, Aggregation value) {
+            this.aggregations = _mapPut(this.aggregations, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code aggregations}
+         * <p>
+         * Adds an entry to <code>aggregations</code> using a builder lambda.
+         */
+        public final Builder aggregations(String key, Function<Aggregation.Builder, ObjectBuilder<Aggregation>> fn) {
+            return aggregations(key, fn.apply(new Aggregation.Builder()).build());
+        }
+
+        /**
+         * API name: {@code query}
+         */
+        public final Builder query(@Nullable Query value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code query}
+         */
+        public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.query(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code from}
+         */
+        public final Builder from(@Nullable Integer value) {
+            this.from = value;
+            return this;
+        }
+
+        /**
+         * Minimum _score for matching documents. Documents with a lower _score are not
+         * included in the search results.
+         * <p>
+         * API name: {@code min_score}
+         */
+        public final Builder minScore(@Nullable Double value) {
+            this.minScore = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code post_filter}
+         */
+        public final Builder postFilter(@Nullable Query value) {
+            this.postFilter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code post_filter}
+         */
+        public final Builder postFilter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.postFilter(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code search_after}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>searchAfter</code>.
+         */
+        public final Builder searchAfter(List<String> list) {
+            this.searchAfter = _listAddAll(this.searchAfter, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code search_after}
+         * <p>
+         * Adds one or more values to <code>searchAfter</code>.
+         */
+        public final Builder searchAfter(String value, String... values) {
+            this.searchAfter = _listAdd(this.searchAfter, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Integer value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sort</code>.
+         */
+        public final Builder sort(List<SortOptions> list) {
+            this.sort = _listAddAll(this.sort, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds one or more values to <code>sort</code>.
+         */
+        public final Builder sort(SortOptions value, SortOptions... values) {
+            this.sort = _listAdd(this.sort, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds a value to <code>sort</code> using a builder lambda.
+         */
+        public final Builder sort(Function<SortOptions.Builder, ObjectBuilder<SortOptions>> fn) {
+            return sort(fn.apply(new SortOptions.Builder()).build());
+        }
+
+        /**
+         * If true, calculate and return document scores, even if the scores are not
+         * used for sorting.
+         * <p>
+         * API name: {@code track_scores}
+         */
+        public final Builder trackScores(@Nullable Boolean value) {
+            this.trackScores = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code track_total_hits}
+         */
+        public final Builder trackTotalHits(@Nullable TrackHits value) {
+            this.trackTotalHits = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code track_total_hits}
+         */
+        public final Builder trackTotalHits(Function<TrackHits.Builder, ObjectBuilder<TrackHits>> fn) {
+            return this.trackTotalHits(fn.apply(new TrackHits.Builder()).build());
+        }
+
+        /**
+         * API name: {@code suggest}
+         */
+        public final Builder suggest(@Nullable Suggester value) {
+            this.suggest = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code suggest}
+         */
+        public final Builder suggest(Function<Suggester.Builder, ObjectBuilder<Suggester>> fn) {
+            return this.suggest(fn.apply(new Suggester.Builder()).build());
+        }
+
+        /**
+         * API name: {@code highlight}
+         */
+        public final Builder highlight(@Nullable Highlight value) {
+            this.highlight = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code highlight}
+         */
+        public final Builder highlight(Function<Highlight.Builder, ObjectBuilder<Highlight>> fn) {
+            return this.highlight(fn.apply(new Highlight.Builder()).build());
+        }
+
+        /**
+         * API name: {@code _source}
+         */
+        public final Builder source(@Nullable SourceConfig value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _source}
+         */
+        public final Builder source(Function<SourceConfig.Builder, ObjectBuilder<SourceConfig>> fn) {
+            return this.source(fn.apply(new SourceConfig.Builder()).build());
+        }
+
+        /**
+         * API name: {@code script_fields}
+         */
+        public final Builder scriptFields(Map<String, ScriptField> map) {
+            this.scriptFields = _mapPutAll(this.scriptFields, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code script_fields}
+         */
+        public final Builder scriptFields(String key, ScriptField value) {
+            this.scriptFields = _mapPut(this.scriptFields, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code script_fields}
+         */
+        public final Builder scriptFields(String key, Function<ScriptField.Builder, ObjectBuilder<ScriptField>> fn) {
+            return scriptFields(key, fn.apply(new ScriptField.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link MultisearchBody}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MultisearchBody build() {
+            _checkSingleUse();
+
+            return new MultisearchBody(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MultisearchBody}
+     */
+    public static final JsonpDeserializer<MultisearchBody> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MultisearchBody::setupMultisearchBodyDeserializer
+    );
+
+    protected static void setupMultisearchBodyDeserializer(ObjectDeserializer<MultisearchBody.Builder> op) {
+
+        op.add(Builder::aggregations, JsonpDeserializer.stringMapDeserializer(Aggregation._DESERIALIZER), "aggregations", "aggs");
+        op.add(Builder::query, Query._DESERIALIZER, "query");
+        op.add(Builder::from, JsonpDeserializer.integerDeserializer(), "from");
+        op.add(Builder::minScore, JsonpDeserializer.doubleDeserializer(), "min_score");
+        op.add(Builder::postFilter, Query._DESERIALIZER, "post_filter");
+        op.add(Builder::searchAfter, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "search_after");
+        op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
+        op.add(Builder::sort, JsonpDeserializer.arrayDeserializer(SortOptions._DESERIALIZER), "sort");
+        op.add(Builder::trackScores, JsonpDeserializer.booleanDeserializer(), "track_scores");
+        op.add(Builder::trackTotalHits, TrackHits._DESERIALIZER, "track_total_hits");
+        op.add(Builder::suggest, Suggester._DESERIALIZER, "suggest");
+        op.add(Builder::highlight, Highlight._DESERIALIZER, "highlight");
+        op.add(Builder::source, SourceConfig._DESERIALIZER, "_source");
+        op.add(Builder::scriptFields, JsonpDeserializer.stringMapDeserializer(ScriptField._DESERIALIZER), "script_fields");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultisearchHeader.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultisearchHeader.java
index d170e3d833..5f7cc4fedd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultisearchHeader.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultisearchHeader.java
@@ -32,21 +32,21 @@
 
 package org.opensearch.client.opensearch.core.msearch;
 
-import org.opensearch.client.opensearch._types.ExpandWildcard;
-import org.opensearch.client.opensearch._types.SearchType;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ExpandWildcard;
+import org.opensearch.client.opensearch._types.SearchType;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.msearch.MultisearchHeader
 
@@ -57,323 +57,324 @@
  */
 @JsonpDeserializable
 public class MultisearchHeader implements JsonpSerializable {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	@Nullable
-	private final String preference;
-
-	@Nullable
-	private final Boolean requestCache;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final SearchType searchType;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MultisearchHeader(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.preference = builder.preference;
-		this.requestCache = builder.requestCache;
-		this.routing = builder.routing;
-		this.searchType = builder.searchType;
-
-	}
-
-	public static MultisearchHeader of(Function<Builder, ObjectBuilder<MultisearchHeader>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code preference}
-	 */
-	@Nullable
-	public final String preference() {
-		return this.preference;
-	}
-
-	/**
-	 * API name: {@code request_cache}
-	 */
-	@Nullable
-	public final Boolean requestCache() {
-		return this.requestCache;
-	}
-
-	/**
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * API name: {@code search_type}
-	 */
-	@Nullable
-	public final SearchType searchType() {
-		return this.searchType;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.allowNoIndices != null) {
-			generator.writeKey("allow_no_indices");
-			generator.write(this.allowNoIndices);
-
-		}
-		if (ApiTypeHelper.isDefined(this.expandWildcards)) {
-			generator.writeKey("expand_wildcards");
-			generator.writeStartArray();
-			for (ExpandWildcard item0 : this.expandWildcards) {
-				item0.serialize(generator, mapper);
-			}
-			generator.writeEnd();
-
-		}
-		if (this.ignoreUnavailable != null) {
-			generator.writeKey("ignore_unavailable");
-			generator.write(this.ignoreUnavailable);
-
-		}
-		if (ApiTypeHelper.isDefined(this.index)) {
-			generator.writeKey("index");
-			generator.writeStartArray();
-			for (String item0 : this.index) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.preference != null) {
-			generator.writeKey("preference");
-			generator.write(this.preference);
-
-		}
-		if (this.requestCache != null) {
-			generator.writeKey("request_cache");
-			generator.write(this.requestCache);
-
-		}
-		if (this.routing != null) {
-			generator.writeKey("routing");
-			generator.write(this.routing);
-
-		}
-		if (this.searchType != null) {
-			generator.writeKey("search_type");
-			this.searchType.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MultisearchHeader}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MultisearchHeader> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private String preference;
-
-		@Nullable
-		private Boolean requestCache;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private SearchType searchType;
-
-		/**
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code preference}
-		 */
-		public final Builder preference(@Nullable String value) {
-			this.preference = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code request_cache}
-		 */
-		public final Builder requestCache(@Nullable Boolean value) {
-			this.requestCache = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code search_type}
-		 */
-		public final Builder searchType(@Nullable SearchType value) {
-			this.searchType = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MultisearchHeader}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MultisearchHeader build() {
-			_checkSingleUse();
-
-			return new MultisearchHeader(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MultisearchHeader}
-	 */
-	public static final JsonpDeserializer<MultisearchHeader> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MultisearchHeader::setupMultisearchHeaderDeserializer);
-
-	protected static void setupMultisearchHeaderDeserializer(ObjectDeserializer<MultisearchHeader.Builder> op) {
-
-		op.add(Builder::allowNoIndices, JsonpDeserializer.booleanDeserializer(), "allow_no_indices");
-		op.add(Builder::expandWildcards, JsonpDeserializer.arrayDeserializer(ExpandWildcard._DESERIALIZER),
-				"expand_wildcards");
-		op.add(Builder::ignoreUnavailable, JsonpDeserializer.booleanDeserializer(), "ignore_unavailable");
-		op.add(Builder::index, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "index");
-		op.add(Builder::preference, JsonpDeserializer.stringDeserializer(), "preference");
-		op.add(Builder::requestCache, JsonpDeserializer.booleanDeserializer(), "request_cache");
-		op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
-		op.add(Builder::searchType, SearchType._DESERIALIZER, "search_type");
-
-	}
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    @Nullable
+    private final String preference;
+
+    @Nullable
+    private final Boolean requestCache;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final SearchType searchType;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MultisearchHeader(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.preference = builder.preference;
+        this.requestCache = builder.requestCache;
+        this.routing = builder.routing;
+        this.searchType = builder.searchType;
+
+    }
+
+    public static MultisearchHeader of(Function<Builder, ObjectBuilder<MultisearchHeader>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code preference}
+     */
+    @Nullable
+    public final String preference() {
+        return this.preference;
+    }
+
+    /**
+     * API name: {@code request_cache}
+     */
+    @Nullable
+    public final Boolean requestCache() {
+        return this.requestCache;
+    }
+
+    /**
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * API name: {@code search_type}
+     */
+    @Nullable
+    public final SearchType searchType() {
+        return this.searchType;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.allowNoIndices != null) {
+            generator.writeKey("allow_no_indices");
+            generator.write(this.allowNoIndices);
+
+        }
+        if (ApiTypeHelper.isDefined(this.expandWildcards)) {
+            generator.writeKey("expand_wildcards");
+            generator.writeStartArray();
+            for (ExpandWildcard item0 : this.expandWildcards) {
+                item0.serialize(generator, mapper);
+            }
+            generator.writeEnd();
+
+        }
+        if (this.ignoreUnavailable != null) {
+            generator.writeKey("ignore_unavailable");
+            generator.write(this.ignoreUnavailable);
+
+        }
+        if (ApiTypeHelper.isDefined(this.index)) {
+            generator.writeKey("index");
+            generator.writeStartArray();
+            for (String item0 : this.index) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.preference != null) {
+            generator.writeKey("preference");
+            generator.write(this.preference);
+
+        }
+        if (this.requestCache != null) {
+            generator.writeKey("request_cache");
+            generator.write(this.requestCache);
+
+        }
+        if (this.routing != null) {
+            generator.writeKey("routing");
+            generator.write(this.routing);
+
+        }
+        if (this.searchType != null) {
+            generator.writeKey("search_type");
+            this.searchType.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MultisearchHeader}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MultisearchHeader> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private String preference;
+
+        @Nullable
+        private Boolean requestCache;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private SearchType searchType;
+
+        /**
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code preference}
+         */
+        public final Builder preference(@Nullable String value) {
+            this.preference = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code request_cache}
+         */
+        public final Builder requestCache(@Nullable Boolean value) {
+            this.requestCache = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code search_type}
+         */
+        public final Builder searchType(@Nullable SearchType value) {
+            this.searchType = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link MultisearchHeader}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MultisearchHeader build() {
+            _checkSingleUse();
+
+            return new MultisearchHeader(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MultisearchHeader}
+     */
+    public static final JsonpDeserializer<MultisearchHeader> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MultisearchHeader::setupMultisearchHeaderDeserializer
+    );
+
+    protected static void setupMultisearchHeaderDeserializer(ObjectDeserializer<MultisearchHeader.Builder> op) {
+
+        op.add(Builder::allowNoIndices, JsonpDeserializer.booleanDeserializer(), "allow_no_indices");
+        op.add(Builder::expandWildcards, JsonpDeserializer.arrayDeserializer(ExpandWildcard._DESERIALIZER), "expand_wildcards");
+        op.add(Builder::ignoreUnavailable, JsonpDeserializer.booleanDeserializer(), "ignore_unavailable");
+        op.add(Builder::index, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "index");
+        op.add(Builder::preference, JsonpDeserializer.stringDeserializer(), "preference");
+        op.add(Builder::requestCache, JsonpDeserializer.booleanDeserializer(), "request_cache");
+        op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
+        op.add(Builder::searchType, SearchType._DESERIALIZER, "search_type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/RequestItem.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/RequestItem.java
index 890fc208be..5ef2669170 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/RequestItem.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/RequestItem.java
@@ -32,127 +32,127 @@
 
 package org.opensearch.client.opensearch.core.msearch;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.NdJsonpSerializable;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.function.Function;
 
 // typedef: _global.msearch.RequestItem
 
 public class RequestItem implements NdJsonpSerializable, JsonpSerializable {
-	private final MultisearchHeader header;
-
-	private final MultisearchBody body;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RequestItem(Builder builder) {
-
-		this.header = ApiTypeHelper.requireNonNull(builder.header, this, "header");
-		this.body = ApiTypeHelper.requireNonNull(builder.body, this, "body");
-
-	}
-
-	public static RequestItem of(Function<Builder, ObjectBuilder<RequestItem>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	@Override
-	public Iterator<?> _serializables() {
-		return Arrays.asList(header, body).iterator();
-	}
-
-	/**
-	 * Required - API name: {@code header}
-	 */
-	public final MultisearchHeader header() {
-		return this.header;
-	}
-
-	/**
-	 * Required - API name: {@code body}
-	 */
-	public final MultisearchBody body() {
-		return this.body;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("header");
-		this.header.serialize(generator, mapper);
-
-		generator.writeKey("body");
-		this.body.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RequestItem}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RequestItem> {
-		private MultisearchHeader header;
-
-		private MultisearchBody body;
-
-		/**
-		 * Required - API name: {@code header}
-		 */
-		public final Builder header(MultisearchHeader value) {
-			this.header = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code header}
-		 */
-		public final Builder header(Function<MultisearchHeader.Builder, ObjectBuilder<MultisearchHeader>> fn) {
-			return this.header(fn.apply(new MultisearchHeader.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code body}
-		 */
-		public final Builder body(MultisearchBody value) {
-			this.body = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code body}
-		 */
-		public final Builder body(Function<MultisearchBody.Builder, ObjectBuilder<MultisearchBody>> fn) {
-			return this.body(fn.apply(new MultisearchBody.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link RequestItem}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RequestItem build() {
-			_checkSingleUse();
-
-			return new RequestItem(this);
-		}
-	}
+    private final MultisearchHeader header;
+
+    private final MultisearchBody body;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RequestItem(Builder builder) {
+
+        this.header = ApiTypeHelper.requireNonNull(builder.header, this, "header");
+        this.body = ApiTypeHelper.requireNonNull(builder.body, this, "body");
+
+    }
+
+    public static RequestItem of(Function<Builder, ObjectBuilder<RequestItem>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    @Override
+    public Iterator<?> _serializables() {
+        return Arrays.asList(header, body).iterator();
+    }
+
+    /**
+     * Required - API name: {@code header}
+     */
+    public final MultisearchHeader header() {
+        return this.header;
+    }
+
+    /**
+     * Required - API name: {@code body}
+     */
+    public final MultisearchBody body() {
+        return this.body;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("header");
+        this.header.serialize(generator, mapper);
+
+        generator.writeKey("body");
+        this.body.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RequestItem}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RequestItem> {
+        private MultisearchHeader header;
+
+        private MultisearchBody body;
+
+        /**
+         * Required - API name: {@code header}
+         */
+        public final Builder header(MultisearchHeader value) {
+            this.header = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code header}
+         */
+        public final Builder header(Function<MultisearchHeader.Builder, ObjectBuilder<MultisearchHeader>> fn) {
+            return this.header(fn.apply(new MultisearchHeader.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code body}
+         */
+        public final Builder body(MultisearchBody value) {
+            this.body = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code body}
+         */
+        public final Builder body(Function<MultisearchBody.Builder, ObjectBuilder<MultisearchBody>> fn) {
+            return this.body(fn.apply(new MultisearchBody.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link RequestItem}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RequestItem build() {
+            _checkSingleUse();
+
+            return new RequestItem(this);
+        }
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch_template/RequestItem.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch_template/RequestItem.java
index 87a8921686..e9f824a913 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch_template/RequestItem.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch_template/RequestItem.java
@@ -32,128 +32,128 @@
 
 package org.opensearch.client.opensearch.core.msearch_template;
 
-import org.opensearch.client.opensearch.core.msearch.MultisearchHeader;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.NdJsonpSerializable;
+import org.opensearch.client.opensearch.core.msearch.MultisearchHeader;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.function.Function;
 
 // typedef: _global.msearch_template.RequestItem
 
 public class RequestItem implements NdJsonpSerializable, JsonpSerializable {
-	private final MultisearchHeader header;
-
-	private final TemplateConfig body;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RequestItem(Builder builder) {
-
-		this.header = ApiTypeHelper.requireNonNull(builder.header, this, "header");
-		this.body = ApiTypeHelper.requireNonNull(builder.body, this, "body");
-
-	}
-
-	public static RequestItem of(Function<Builder, ObjectBuilder<RequestItem>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	@Override
-	public Iterator<?> _serializables() {
-		return Arrays.asList(header, body).iterator();
-	}
-
-	/**
-	 * Required - API name: {@code header}
-	 */
-	public final MultisearchHeader header() {
-		return this.header;
-	}
-
-	/**
-	 * Required - API name: {@code body}
-	 */
-	public final TemplateConfig body() {
-		return this.body;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("header");
-		this.header.serialize(generator, mapper);
-
-		generator.writeKey("body");
-		this.body.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RequestItem}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RequestItem> {
-		private MultisearchHeader header;
-
-		private TemplateConfig body;
-
-		/**
-		 * Required - API name: {@code header}
-		 */
-		public final Builder header(MultisearchHeader value) {
-			this.header = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code header}
-		 */
-		public final Builder header(Function<MultisearchHeader.Builder, ObjectBuilder<MultisearchHeader>> fn) {
-			return this.header(fn.apply(new MultisearchHeader.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code body}
-		 */
-		public final Builder body(TemplateConfig value) {
-			this.body = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code body}
-		 */
-		public final Builder body(Function<TemplateConfig.Builder, ObjectBuilder<TemplateConfig>> fn) {
-			return this.body(fn.apply(new TemplateConfig.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link RequestItem}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RequestItem build() {
-			_checkSingleUse();
-
-			return new RequestItem(this);
-		}
-	}
+    private final MultisearchHeader header;
+
+    private final TemplateConfig body;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RequestItem(Builder builder) {
+
+        this.header = ApiTypeHelper.requireNonNull(builder.header, this, "header");
+        this.body = ApiTypeHelper.requireNonNull(builder.body, this, "body");
+
+    }
+
+    public static RequestItem of(Function<Builder, ObjectBuilder<RequestItem>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    @Override
+    public Iterator<?> _serializables() {
+        return Arrays.asList(header, body).iterator();
+    }
+
+    /**
+     * Required - API name: {@code header}
+     */
+    public final MultisearchHeader header() {
+        return this.header;
+    }
+
+    /**
+     * Required - API name: {@code body}
+     */
+    public final TemplateConfig body() {
+        return this.body;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("header");
+        this.header.serialize(generator, mapper);
+
+        generator.writeKey("body");
+        this.body.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RequestItem}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RequestItem> {
+        private MultisearchHeader header;
+
+        private TemplateConfig body;
+
+        /**
+         * Required - API name: {@code header}
+         */
+        public final Builder header(MultisearchHeader value) {
+            this.header = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code header}
+         */
+        public final Builder header(Function<MultisearchHeader.Builder, ObjectBuilder<MultisearchHeader>> fn) {
+            return this.header(fn.apply(new MultisearchHeader.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code body}
+         */
+        public final Builder body(TemplateConfig value) {
+            this.body = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code body}
+         */
+        public final Builder body(Function<TemplateConfig.Builder, ObjectBuilder<TemplateConfig>> fn) {
+            return this.body(fn.apply(new TemplateConfig.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link RequestItem}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RequestItem build() {
+            _checkSingleUse();
+
+            return new RequestItem(this);
+        }
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch_template/TemplateConfig.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch_template/TemplateConfig.java
index 6825fa7b4b..74c1e6fb4e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch_template/TemplateConfig.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch_template/TemplateConfig.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core.msearch_template;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,247 +46,244 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.msearch_template.TemplateConfig
 
-
 @JsonpDeserializable
 public class TemplateConfig implements JsonpSerializable {
-	@Nullable
-	private final Boolean explain;
-
-	@Nullable
-	private final String id;
-
-	private final Map<String, JsonData> params;
-
-	@Nullable
-	private final Boolean profile;
-
-	@Nullable
-	private final String source;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TemplateConfig(Builder builder) {
-
-		this.explain = builder.explain;
-		this.id = builder.id;
-		this.params = ApiTypeHelper.unmodifiable(builder.params);
-		this.profile = builder.profile;
-		this.source = builder.source;
-
-	}
-
-	public static TemplateConfig of(Function<Builder, ObjectBuilder<TemplateConfig>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code explain}
-	 */
-	@Nullable
-	public final Boolean explain() {
-		return this.explain;
-	}
-
-	/**
-	 * ID of the search template to use. If no source is specified, this parameter
-	 * is required.
-	 * <p>
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * API name: {@code params}
-	 */
-	public final Map<String, JsonData> params() {
-		return this.params;
-	}
-
-	/**
-	 * API name: {@code profile}
-	 */
-	@Nullable
-	public final Boolean profile() {
-		return this.profile;
-	}
-
-	/**
-	 * An inline search template. Supports the same parameters as the search API's
-	 * request body. Also supports Mustache variables. If no id is specified, this
-	 * parameter is required.
-	 * <p>
-	 * API name: {@code source}
-	 */
-	@Nullable
-	public final String source() {
-		return this.source;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.explain != null) {
-			generator.writeKey("explain");
-			generator.write(this.explain);
-
-		}
-		if (this.id != null) {
-			generator.writeKey("id");
-			generator.write(this.id);
-
-		}
-		if (ApiTypeHelper.isDefined(this.params)) {
-			generator.writeKey("params");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.profile != null) {
-			generator.writeKey("profile");
-			generator.write(this.profile);
-
-		}
-		if (this.source != null) {
-			generator.writeKey("source");
-			generator.write(this.source);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TemplateConfig}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TemplateConfig> {
-		@Nullable
-		private Boolean explain;
-
-		@Nullable
-		private String id;
-
-		@Nullable
-		private Map<String, JsonData> params;
-
-		@Nullable
-		private Boolean profile;
-
-		@Nullable
-		private String source;
-
-		/**
-		 * API name: {@code explain}
-		 */
-		public final Builder explain(@Nullable Boolean value) {
-			this.explain = value;
-			return this;
-		}
-
-		/**
-		 * ID of the search template to use. If no source is specified, this parameter
-		 * is required.
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code params}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>params</code>.
-		 */
-		public final Builder params(Map<String, JsonData> map) {
-			this.params = _mapPutAll(this.params, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code params}
-		 * <p>
-		 * Adds an entry to <code>params</code>.
-		 */
-		public final Builder params(String key, JsonData value) {
-			this.params = _mapPut(this.params, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code profile}
-		 */
-		public final Builder profile(@Nullable Boolean value) {
-			this.profile = value;
-			return this;
-		}
-
-		/**
-		 * An inline search template. Supports the same parameters as the search API's
-		 * request body. Also supports Mustache variables. If no id is specified, this
-		 * parameter is required.
-		 * <p>
-		 * API name: {@code source}
-		 */
-		public final Builder source(@Nullable String value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TemplateConfig}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TemplateConfig build() {
-			_checkSingleUse();
-
-			return new TemplateConfig(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TemplateConfig}
-	 */
-	public static final JsonpDeserializer<TemplateConfig> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TemplateConfig::setupTemplateConfigDeserializer);
-
-	protected static void setupTemplateConfigDeserializer(ObjectDeserializer<TemplateConfig.Builder> op) {
-
-		op.add(Builder::explain, JsonpDeserializer.booleanDeserializer(), "explain");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
-		op.add(Builder::profile, JsonpDeserializer.booleanDeserializer(), "profile");
-		op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source");
-
-	}
+    @Nullable
+    private final Boolean explain;
+
+    @Nullable
+    private final String id;
+
+    private final Map<String, JsonData> params;
+
+    @Nullable
+    private final Boolean profile;
+
+    @Nullable
+    private final String source;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TemplateConfig(Builder builder) {
+
+        this.explain = builder.explain;
+        this.id = builder.id;
+        this.params = ApiTypeHelper.unmodifiable(builder.params);
+        this.profile = builder.profile;
+        this.source = builder.source;
+
+    }
+
+    public static TemplateConfig of(Function<Builder, ObjectBuilder<TemplateConfig>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code explain}
+     */
+    @Nullable
+    public final Boolean explain() {
+        return this.explain;
+    }
+
+    /**
+     * ID of the search template to use. If no source is specified, this parameter
+     * is required.
+     * <p>
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * API name: {@code params}
+     */
+    public final Map<String, JsonData> params() {
+        return this.params;
+    }
+
+    /**
+     * API name: {@code profile}
+     */
+    @Nullable
+    public final Boolean profile() {
+        return this.profile;
+    }
+
+    /**
+     * An inline search template. Supports the same parameters as the search API's
+     * request body. Also supports Mustache variables. If no id is specified, this
+     * parameter is required.
+     * <p>
+     * API name: {@code source}
+     */
+    @Nullable
+    public final String source() {
+        return this.source;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.explain != null) {
+            generator.writeKey("explain");
+            generator.write(this.explain);
+
+        }
+        if (this.id != null) {
+            generator.writeKey("id");
+            generator.write(this.id);
+
+        }
+        if (ApiTypeHelper.isDefined(this.params)) {
+            generator.writeKey("params");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.profile != null) {
+            generator.writeKey("profile");
+            generator.write(this.profile);
+
+        }
+        if (this.source != null) {
+            generator.writeKey("source");
+            generator.write(this.source);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TemplateConfig}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TemplateConfig> {
+        @Nullable
+        private Boolean explain;
+
+        @Nullable
+        private String id;
+
+        @Nullable
+        private Map<String, JsonData> params;
+
+        @Nullable
+        private Boolean profile;
+
+        @Nullable
+        private String source;
+
+        /**
+         * API name: {@code explain}
+         */
+        public final Builder explain(@Nullable Boolean value) {
+            this.explain = value;
+            return this;
+        }
+
+        /**
+         * ID of the search template to use. If no source is specified, this parameter
+         * is required.
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code params}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>params</code>.
+         */
+        public final Builder params(Map<String, JsonData> map) {
+            this.params = _mapPutAll(this.params, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code params}
+         * <p>
+         * Adds an entry to <code>params</code>.
+         */
+        public final Builder params(String key, JsonData value) {
+            this.params = _mapPut(this.params, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code profile}
+         */
+        public final Builder profile(@Nullable Boolean value) {
+            this.profile = value;
+            return this;
+        }
+
+        /**
+         * An inline search template. Supports the same parameters as the search API's
+         * request body. Also supports Mustache variables. If no id is specified, this
+         * parameter is required.
+         * <p>
+         * API name: {@code source}
+         */
+        public final Builder source(@Nullable String value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link TemplateConfig}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TemplateConfig build() {
+            _checkSingleUse();
+
+            return new TemplateConfig(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TemplateConfig}
+     */
+    public static final JsonpDeserializer<TemplateConfig> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TemplateConfig::setupTemplateConfigDeserializer
+    );
+
+    protected static void setupTemplateConfigDeserializer(ObjectDeserializer<TemplateConfig.Builder> op) {
+
+        op.add(Builder::explain, JsonpDeserializer.booleanDeserializer(), "explain");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
+        op.add(Builder::profile, JsonpDeserializer.booleanDeserializer(), "profile");
+        op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/mtermvectors/MultiTermVectorsOperation.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/mtermvectors/MultiTermVectorsOperation.java
index ff70f4ff6c..295c1d57aa 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/mtermvectors/MultiTermVectorsOperation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/mtermvectors/MultiTermVectorsOperation.java
@@ -32,8 +32,9 @@
 
 package org.opensearch.client.opensearch.core.mtermvectors;
 
-import org.opensearch.client.opensearch._types.VersionType;
-import org.opensearch.client.opensearch.core.termvectors.Filter;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -41,411 +42,411 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.VersionType;
+import org.opensearch.client.opensearch.core.termvectors.Filter;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _global.mtermvectors.Operation
 
 @JsonpDeserializable
 public class MultiTermVectorsOperation implements JsonpSerializable {
-	private final JsonData doc;
+    private final JsonData doc;
 
-	private final List<String> fields;
-
-	private final boolean fieldStatistics;
+    private final List<String> fields;
+
+    private final boolean fieldStatistics;
 
-	private final Filter filter;
-
-	private final String id;
-
-	private final String index;
-
-	private final boolean offsets;
-
-	private final boolean payloads;
-
-	private final boolean positions;
-
-	private final String routing;
-
-	private final boolean termStatistics;
-
-	private final long version;
-
-	private final VersionType versionType;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private MultiTermVectorsOperation(Builder builder) {
-
-		this.doc = ApiTypeHelper.requireNonNull(builder.doc, this, "doc");
-		this.fields = ApiTypeHelper.unmodifiableRequired(builder.fields, this, "fields");
-		this.fieldStatistics = ApiTypeHelper.requireNonNull(builder.fieldStatistics, this, "fieldStatistics");
-		this.filter = ApiTypeHelper.requireNonNull(builder.filter, this, "filter");
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.offsets = ApiTypeHelper.requireNonNull(builder.offsets, this, "offsets");
-		this.payloads = ApiTypeHelper.requireNonNull(builder.payloads, this, "payloads");
-		this.positions = ApiTypeHelper.requireNonNull(builder.positions, this, "positions");
-		this.routing = ApiTypeHelper.requireNonNull(builder.routing, this, "routing");
-		this.termStatistics = ApiTypeHelper.requireNonNull(builder.termStatistics, this, "termStatistics");
-		this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
-		this.versionType = ApiTypeHelper.requireNonNull(builder.versionType, this, "versionType");
-
-	}
-
-	public static MultiTermVectorsOperation of(Function<Builder, ObjectBuilder<MultiTermVectorsOperation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code doc}
-	 */
-	public final JsonData doc() {
-		return this.doc;
-	}
-
-	/**
-	 * Required - API name: {@code fields}
-	 */
-	public final List<String> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * Required - API name: {@code field_statistics}
-	 */
-	public final boolean fieldStatistics() {
-		return this.fieldStatistics;
-	}
-
-	/**
-	 * Required - API name: {@code filter}
-	 */
-	public final Filter filter() {
-		return this.filter;
-	}
-
-	/**
-	 * Required - API name: {@code _id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - API name: {@code _index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Required - API name: {@code offsets}
-	 */
-	public final boolean offsets() {
-		return this.offsets;
-	}
-
-	/**
-	 * Required - API name: {@code payloads}
-	 */
-	public final boolean payloads() {
-		return this.payloads;
-	}
-
-	/**
-	 * Required - API name: {@code positions}
-	 */
-	public final boolean positions() {
-		return this.positions;
-	}
-
-	/**
-	 * Required - API name: {@code routing}
-	 */
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Required - API name: {@code term_statistics}
-	 */
-	public final boolean termStatistics() {
-		return this.termStatistics;
-	}
-
-	/**
-	 * Required - API name: {@code version}
-	 */
-	public final long version() {
-		return this.version;
-	}
-
-	/**
-	 * Required - API name: {@code version_type}
-	 */
-	public final VersionType versionType() {
-		return this.versionType;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("doc");
-		this.doc.serialize(generator, mapper);
-
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartArray();
-			for (String item0 : this.fields) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("field_statistics");
-		generator.write(this.fieldStatistics);
-
-		generator.writeKey("filter");
-		this.filter.serialize(generator, mapper);
-
-		generator.writeKey("_id");
-		generator.write(this.id);
-
-		generator.writeKey("_index");
-		generator.write(this.index);
-
-		generator.writeKey("offsets");
-		generator.write(this.offsets);
-
-		generator.writeKey("payloads");
-		generator.write(this.payloads);
-
-		generator.writeKey("positions");
-		generator.write(this.positions);
-
-		generator.writeKey("routing");
-		generator.write(this.routing);
-
-		generator.writeKey("term_statistics");
-		generator.write(this.termStatistics);
-
-		generator.writeKey("version");
-		generator.write(this.version);
-
-		generator.writeKey("version_type");
-		this.versionType.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MultiTermVectorsOperation}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MultiTermVectorsOperation> {
-		private JsonData doc;
-
-		private List<String> fields;
-
-		private Boolean fieldStatistics;
-
-		private Filter filter;
-
-		private String id;
-
-		private String index;
-
-		private Boolean offsets;
-
-		private Boolean payloads;
-
-		private Boolean positions;
-
-		private String routing;
-
-		private Boolean termStatistics;
-
-		private Long version;
-
-		private VersionType versionType;
-
-		/**
-		 * Required - API name: {@code doc}
-		 */
-		public final Builder doc(JsonData value) {
-			this.doc = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fields</code>.
-		 */
-		public final Builder fields(List<String> list) {
-			this.fields = _listAddAll(this.fields, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code fields}
-		 * <p>
-		 * Adds one or more values to <code>fields</code>.
-		 */
-		public final Builder fields(String value, String... values) {
-			this.fields = _listAdd(this.fields, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code field_statistics}
-		 */
-		public final Builder fieldStatistics(boolean value) {
-			this.fieldStatistics = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code filter}
-		 */
-		public final Builder filter(Filter value) {
-			this.filter = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code filter}
-		 */
-		public final Builder filter(Function<Filter.Builder, ObjectBuilder<Filter>> fn) {
-			return this.filter(fn.apply(new Filter.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code _id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code offsets}
-		 */
-		public final Builder offsets(boolean value) {
-			this.offsets = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code payloads}
-		 */
-		public final Builder payloads(boolean value) {
-			this.payloads = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code positions}
-		 */
-		public final Builder positions(boolean value) {
-			this.positions = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code routing}
-		 */
-		public final Builder routing(String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code term_statistics}
-		 */
-		public final Builder termStatistics(boolean value) {
-			this.termStatistics = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code version}
-		 */
-		public final Builder version(long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code version_type}
-		 */
-		public final Builder versionType(VersionType value) {
-			this.versionType = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MultiTermVectorsOperation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MultiTermVectorsOperation build() {
-			_checkSingleUse();
-
-			return new MultiTermVectorsOperation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MultiTermVectorsOperation}
-	 */
-	public static final JsonpDeserializer<MultiTermVectorsOperation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MultiTermVectorsOperation::setupMultiTermVectorsOperationDeserializer);
-
-	protected static void setupMultiTermVectorsOperationDeserializer(
-			ObjectDeserializer<MultiTermVectorsOperation.Builder> op) {
-
-		op.add(Builder::doc, JsonData._DESERIALIZER, "doc");
-		op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "fields");
-		op.add(Builder::fieldStatistics, JsonpDeserializer.booleanDeserializer(), "field_statistics");
-		op.add(Builder::filter, Filter._DESERIALIZER, "filter");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
-		op.add(Builder::offsets, JsonpDeserializer.booleanDeserializer(), "offsets");
-		op.add(Builder::payloads, JsonpDeserializer.booleanDeserializer(), "payloads");
-		op.add(Builder::positions, JsonpDeserializer.booleanDeserializer(), "positions");
-		op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
-		op.add(Builder::termStatistics, JsonpDeserializer.booleanDeserializer(), "term_statistics");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
-		op.add(Builder::versionType, VersionType._DESERIALIZER, "version_type");
-
-	}
+    private final Filter filter;
+
+    private final String id;
+
+    private final String index;
+
+    private final boolean offsets;
+
+    private final boolean payloads;
+
+    private final boolean positions;
+
+    private final String routing;
+
+    private final boolean termStatistics;
+
+    private final long version;
+
+    private final VersionType versionType;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private MultiTermVectorsOperation(Builder builder) {
+
+        this.doc = ApiTypeHelper.requireNonNull(builder.doc, this, "doc");
+        this.fields = ApiTypeHelper.unmodifiableRequired(builder.fields, this, "fields");
+        this.fieldStatistics = ApiTypeHelper.requireNonNull(builder.fieldStatistics, this, "fieldStatistics");
+        this.filter = ApiTypeHelper.requireNonNull(builder.filter, this, "filter");
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.offsets = ApiTypeHelper.requireNonNull(builder.offsets, this, "offsets");
+        this.payloads = ApiTypeHelper.requireNonNull(builder.payloads, this, "payloads");
+        this.positions = ApiTypeHelper.requireNonNull(builder.positions, this, "positions");
+        this.routing = ApiTypeHelper.requireNonNull(builder.routing, this, "routing");
+        this.termStatistics = ApiTypeHelper.requireNonNull(builder.termStatistics, this, "termStatistics");
+        this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
+        this.versionType = ApiTypeHelper.requireNonNull(builder.versionType, this, "versionType");
+
+    }
+
+    public static MultiTermVectorsOperation of(Function<Builder, ObjectBuilder<MultiTermVectorsOperation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code doc}
+     */
+    public final JsonData doc() {
+        return this.doc;
+    }
+
+    /**
+     * Required - API name: {@code fields}
+     */
+    public final List<String> fields() {
+        return this.fields;
+    }
+
+    /**
+     * Required - API name: {@code field_statistics}
+     */
+    public final boolean fieldStatistics() {
+        return this.fieldStatistics;
+    }
+
+    /**
+     * Required - API name: {@code filter}
+     */
+    public final Filter filter() {
+        return this.filter;
+    }
+
+    /**
+     * Required - API name: {@code _id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - API name: {@code _index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Required - API name: {@code offsets}
+     */
+    public final boolean offsets() {
+        return this.offsets;
+    }
+
+    /**
+     * Required - API name: {@code payloads}
+     */
+    public final boolean payloads() {
+        return this.payloads;
+    }
+
+    /**
+     * Required - API name: {@code positions}
+     */
+    public final boolean positions() {
+        return this.positions;
+    }
+
+    /**
+     * Required - API name: {@code routing}
+     */
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * Required - API name: {@code term_statistics}
+     */
+    public final boolean termStatistics() {
+        return this.termStatistics;
+    }
+
+    /**
+     * Required - API name: {@code version}
+     */
+    public final long version() {
+        return this.version;
+    }
+
+    /**
+     * Required - API name: {@code version_type}
+     */
+    public final VersionType versionType() {
+        return this.versionType;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("doc");
+        this.doc.serialize(generator, mapper);
+
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartArray();
+            for (String item0 : this.fields) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("field_statistics");
+        generator.write(this.fieldStatistics);
+
+        generator.writeKey("filter");
+        this.filter.serialize(generator, mapper);
+
+        generator.writeKey("_id");
+        generator.write(this.id);
+
+        generator.writeKey("_index");
+        generator.write(this.index);
+
+        generator.writeKey("offsets");
+        generator.write(this.offsets);
+
+        generator.writeKey("payloads");
+        generator.write(this.payloads);
+
+        generator.writeKey("positions");
+        generator.write(this.positions);
+
+        generator.writeKey("routing");
+        generator.write(this.routing);
+
+        generator.writeKey("term_statistics");
+        generator.write(this.termStatistics);
+
+        generator.writeKey("version");
+        generator.write(this.version);
+
+        generator.writeKey("version_type");
+        this.versionType.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MultiTermVectorsOperation}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MultiTermVectorsOperation> {
+        private JsonData doc;
+
+        private List<String> fields;
+
+        private Boolean fieldStatistics;
+
+        private Filter filter;
+
+        private String id;
+
+        private String index;
+
+        private Boolean offsets;
+
+        private Boolean payloads;
+
+        private Boolean positions;
+
+        private String routing;
+
+        private Boolean termStatistics;
+
+        private Long version;
+
+        private VersionType versionType;
+
+        /**
+         * Required - API name: {@code doc}
+         */
+        public final Builder doc(JsonData value) {
+            this.doc = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fields</code>.
+         */
+        public final Builder fields(List<String> list) {
+            this.fields = _listAddAll(this.fields, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code fields}
+         * <p>
+         * Adds one or more values to <code>fields</code>.
+         */
+        public final Builder fields(String value, String... values) {
+            this.fields = _listAdd(this.fields, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code field_statistics}
+         */
+        public final Builder fieldStatistics(boolean value) {
+            this.fieldStatistics = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code filter}
+         */
+        public final Builder filter(Filter value) {
+            this.filter = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code filter}
+         */
+        public final Builder filter(Function<Filter.Builder, ObjectBuilder<Filter>> fn) {
+            return this.filter(fn.apply(new Filter.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code _id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code offsets}
+         */
+        public final Builder offsets(boolean value) {
+            this.offsets = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code payloads}
+         */
+        public final Builder payloads(boolean value) {
+            this.payloads = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code positions}
+         */
+        public final Builder positions(boolean value) {
+            this.positions = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code routing}
+         */
+        public final Builder routing(String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code term_statistics}
+         */
+        public final Builder termStatistics(boolean value) {
+            this.termStatistics = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code version}
+         */
+        public final Builder version(long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code version_type}
+         */
+        public final Builder versionType(VersionType value) {
+            this.versionType = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link MultiTermVectorsOperation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MultiTermVectorsOperation build() {
+            _checkSingleUse();
+
+            return new MultiTermVectorsOperation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MultiTermVectorsOperation}
+     */
+    public static final JsonpDeserializer<MultiTermVectorsOperation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MultiTermVectorsOperation::setupMultiTermVectorsOperationDeserializer
+    );
+
+    protected static void setupMultiTermVectorsOperationDeserializer(ObjectDeserializer<MultiTermVectorsOperation.Builder> op) {
+
+        op.add(Builder::doc, JsonData._DESERIALIZER, "doc");
+        op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "fields");
+        op.add(Builder::fieldStatistics, JsonpDeserializer.booleanDeserializer(), "field_statistics");
+        op.add(Builder::filter, Filter._DESERIALIZER, "filter");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
+        op.add(Builder::offsets, JsonpDeserializer.booleanDeserializer(), "offsets");
+        op.add(Builder::payloads, JsonpDeserializer.booleanDeserializer(), "payloads");
+        op.add(Builder::positions, JsonpDeserializer.booleanDeserializer(), "positions");
+        op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
+        op.add(Builder::termStatistics, JsonpDeserializer.booleanDeserializer(), "term_statistics");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
+        op.add(Builder::versionType, VersionType._DESERIALIZER, "version_type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/mtermvectors/MultiTermVectorsResult.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/mtermvectors/MultiTermVectorsResult.java
index 95e90147fe..34b5b06646 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/mtermvectors/MultiTermVectorsResult.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/mtermvectors/MultiTermVectorsResult.java
@@ -32,254 +32,254 @@
 
 package org.opensearch.client.opensearch.core.mtermvectors;
 
-import org.opensearch.client.opensearch.core.termvectors.TermVector;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.termvectors.TermVector;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _global.mtermvectors.TermVectorsResult
 
-
 @JsonpDeserializable
 public class MultiTermVectorsResult implements JsonpSerializable {
-	private final boolean found;
-
-	private final String id;
-
-	private final String index;
-
-	private final Map<String, TermVector> termVectors;
-
-	private final long took;
+    private final boolean found;
+
+    private final String id;
+
+    private final String index;
+
+    private final Map<String, TermVector> termVectors;
+
+    private final long took;
 
-	private final long version;
+    private final long version;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private MultiTermVectorsResult(Builder builder) {
+    private MultiTermVectorsResult(Builder builder) {
 
-		this.found = ApiTypeHelper.requireNonNull(builder.found, this, "found");
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.termVectors = ApiTypeHelper.unmodifiableRequired(builder.termVectors, this, "termVectors");
-		this.took = ApiTypeHelper.requireNonNull(builder.took, this, "took");
-		this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
+        this.found = ApiTypeHelper.requireNonNull(builder.found, this, "found");
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.termVectors = ApiTypeHelper.unmodifiableRequired(builder.termVectors, this, "termVectors");
+        this.took = ApiTypeHelper.requireNonNull(builder.took, this, "took");
+        this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
 
-	}
+    }
 
-	public static MultiTermVectorsResult of(Function<Builder, ObjectBuilder<MultiTermVectorsResult>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static MultiTermVectorsResult of(Function<Builder, ObjectBuilder<MultiTermVectorsResult>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code found}
-	 */
-	public final boolean found() {
-		return this.found;
-	}
+    /**
+     * Required - API name: {@code found}
+     */
+    public final boolean found() {
+        return this.found;
+    }
 
-	/**
-	 * Required - API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
+    /**
+     * Required - API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
 
-	/**
-	 * Required - API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
+    /**
+     * Required - API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
 
-	/**
-	 * Required - API name: {@code term_vectors}
-	 */
-	public final Map<String, TermVector> termVectors() {
-		return this.termVectors;
-	}
-
-	/**
-	 * Required - API name: {@code took}
-	 */
-	public final long took() {
-		return this.took;
-	}
-
-	/**
-	 * Required - API name: {@code version}
-	 */
-	public final long version() {
-		return this.version;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("found");
-		generator.write(this.found);
-
-		generator.writeKey("id");
-		generator.write(this.id);
-
-		generator.writeKey("index");
-		generator.write(this.index);
-
-		if (ApiTypeHelper.isDefined(this.termVectors)) {
-			generator.writeKey("term_vectors");
-			generator.writeStartObject();
-			for (Map.Entry<String, TermVector> item0 : this.termVectors.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("took");
-		generator.write(this.took);
-
-		generator.writeKey("version");
-		generator.write(this.version);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MultiTermVectorsResult}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MultiTermVectorsResult> {
-		private Boolean found;
-
-		private String id;
-
-		private String index;
-
-		private Map<String, TermVector> termVectors;
-
-		private Long took;
-
-		private Long version;
-
-		/**
-		 * Required - API name: {@code found}
-		 */
-		public final Builder found(boolean value) {
-			this.found = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code term_vectors}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>termVectors</code>.
-		 */
-		public final Builder termVectors(Map<String, TermVector> map) {
-			this.termVectors = _mapPutAll(this.termVectors, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code term_vectors}
-		 * <p>
-		 * Adds an entry to <code>termVectors</code>.
-		 */
-		public final Builder termVectors(String key, TermVector value) {
-			this.termVectors = _mapPut(this.termVectors, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code term_vectors}
-		 * <p>
-		 * Adds an entry to <code>termVectors</code> using a builder lambda.
-		 */
-		public final Builder termVectors(String key, Function<TermVector.Builder, ObjectBuilder<TermVector>> fn) {
-			return termVectors(key, fn.apply(new TermVector.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code took}
-		 */
-		public final Builder took(long value) {
-			this.took = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code version}
-		 */
-		public final Builder version(long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MultiTermVectorsResult}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MultiTermVectorsResult build() {
-			_checkSingleUse();
-
-			return new MultiTermVectorsResult(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MultiTermVectorsResult}
-	 */
-	public static final JsonpDeserializer<MultiTermVectorsResult> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, MultiTermVectorsResult::setupMultiTermVectorsResultDeserializer);
-
-	protected static void setupMultiTermVectorsResultDeserializer(
-			ObjectDeserializer<MultiTermVectorsResult.Builder> op) {
-
-		op.add(Builder::found, JsonpDeserializer.booleanDeserializer(), "found");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::termVectors, JsonpDeserializer.stringMapDeserializer(TermVector._DESERIALIZER), "term_vectors");
-		op.add(Builder::took, JsonpDeserializer.longDeserializer(), "took");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
-
-	}
+    /**
+     * Required - API name: {@code term_vectors}
+     */
+    public final Map<String, TermVector> termVectors() {
+        return this.termVectors;
+    }
+
+    /**
+     * Required - API name: {@code took}
+     */
+    public final long took() {
+        return this.took;
+    }
+
+    /**
+     * Required - API name: {@code version}
+     */
+    public final long version() {
+        return this.version;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("found");
+        generator.write(this.found);
+
+        generator.writeKey("id");
+        generator.write(this.id);
+
+        generator.writeKey("index");
+        generator.write(this.index);
+
+        if (ApiTypeHelper.isDefined(this.termVectors)) {
+            generator.writeKey("term_vectors");
+            generator.writeStartObject();
+            for (Map.Entry<String, TermVector> item0 : this.termVectors.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("took");
+        generator.write(this.took);
+
+        generator.writeKey("version");
+        generator.write(this.version);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MultiTermVectorsResult}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<MultiTermVectorsResult> {
+        private Boolean found;
+
+        private String id;
+
+        private String index;
+
+        private Map<String, TermVector> termVectors;
+
+        private Long took;
+
+        private Long version;
+
+        /**
+         * Required - API name: {@code found}
+         */
+        public final Builder found(boolean value) {
+            this.found = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code term_vectors}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>termVectors</code>.
+         */
+        public final Builder termVectors(Map<String, TermVector> map) {
+            this.termVectors = _mapPutAll(this.termVectors, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code term_vectors}
+         * <p>
+         * Adds an entry to <code>termVectors</code>.
+         */
+        public final Builder termVectors(String key, TermVector value) {
+            this.termVectors = _mapPut(this.termVectors, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code term_vectors}
+         * <p>
+         * Adds an entry to <code>termVectors</code> using a builder lambda.
+         */
+        public final Builder termVectors(String key, Function<TermVector.Builder, ObjectBuilder<TermVector>> fn) {
+            return termVectors(key, fn.apply(new TermVector.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code took}
+         */
+        public final Builder took(long value) {
+            this.took = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code version}
+         */
+        public final Builder version(long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link MultiTermVectorsResult}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MultiTermVectorsResult build() {
+            _checkSingleUse();
+
+            return new MultiTermVectorsResult(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MultiTermVectorsResult}
+     */
+    public static final JsonpDeserializer<MultiTermVectorsResult> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MultiTermVectorsResult::setupMultiTermVectorsResultDeserializer
+    );
+
+    protected static void setupMultiTermVectorsResultDeserializer(ObjectDeserializer<MultiTermVectorsResult.Builder> op) {
+
+        op.add(Builder::found, JsonpDeserializer.booleanDeserializer(), "found");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::termVectors, JsonpDeserializer.stringMapDeserializer(TermVector._DESERIALIZER), "term_vectors");
+        op.add(Builder::took, JsonpDeserializer.longDeserializer(), "took");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/CreatePitRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/CreatePitRequest.java
index c2590f0e13..36b0e80ae9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/CreatePitRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/CreatePitRequest.java
@@ -13,9 +13,7 @@
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
 import javax.annotation.Nullable;
-
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -26,10 +24,9 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-
 /**
  * Creates a Point In Time attribute on Search
- * 
+ *
  */
 public class CreatePitRequest extends RequestBase {
 
@@ -281,7 +278,7 @@ public final Builder allowPartialPitCreation(@Nullable Boolean allowPartialPitCr
 
         /**
          * Builds a {@link CreatePitRequest}.
-         * 
+         *
          * @throws NullPointerException if some of the required fields are null.
          */
         public CreatePitRequest build() {
@@ -291,47 +288,47 @@ public CreatePitRequest build() {
     }
 
     public static final Endpoint<CreatePitRequest, CreatePitResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-            // Request method
-            request -> {
-                return "POST";
-            },
-
-            // Request Path
-            request -> {
-
-                final int _targetIndexes = 1 << 0;
-
-                int propsSet = 0;
-
-                propsSet |= _targetIndexes;
-
-                if (propsSet == (_targetIndexes)) {
-                    StringBuilder buf = new StringBuilder();
-                    buf.append("/");
-                    SimpleEndpoint.pathEncode(
-                            request.targetIndexes.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-                    buf.append("/_search/point_in_time");
-                    return buf.toString();
-                }
-                throw SimpleEndpoint.noPathTemplateFound("path");
-            }, request -> {
-                Map<String, String> params = new HashMap<>();
-                params.put("keep_alive", request.keepAlive._toJsonString());
-
-                if (request.preference != null) {
-                    params.put("preference", request.preference);
-                }
-                if (request.routing != null) {
-                    params.put("routing", request.routing);
-                }
-                if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-                    params.put("expand_wildcards",
-                            request.expandWildcards.stream()
-                                    .map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-                }
-                if (request.allowPartialPitCreation != null) {
-                    params.put("allow_partial_pit_creation", String.valueOf(request.allowPartialPitCreation));
-                }
-                return params;
-            }, SimpleEndpoint.emptyMap(), false, CreatePitResponse._DESERIALIZER);
+        // Request method
+        request -> { return "POST"; },
+
+        // Request Path
+        request -> {
+
+            final int _targetIndexes = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _targetIndexes;
+
+            if (propsSet == (_targetIndexes)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.targetIndexes.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_search/point_in_time");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+        },
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            params.put("keep_alive", request.keepAlive._toJsonString());
+
+            if (request.preference != null) {
+                params.put("preference", request.preference);
+            }
+            if (request.routing != null) {
+                params.put("routing", request.routing);
+            }
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.allowPartialPitCreation != null) {
+                params.put("allow_partial_pit_creation", String.valueOf(request.allowPartialPitCreation));
+            }
+            return params;
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        CreatePitResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/CreatePitResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/CreatePitResponse.java
index 4897a96477..7027720f6a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/CreatePitResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/CreatePitResponse.java
@@ -8,8 +8,8 @@
 
 package org.opensearch.client.opensearch.core.pit;
 
+import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
-
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -21,9 +21,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import jakarta.json.stream.JsonGenerator;
-
-
 @JsonpDeserializable
 public class CreatePitResponse implements JsonpSerializable {
 
@@ -142,16 +139,16 @@ public CreatePitResponse build() {
     /**
      * Json deserializer for {@link CreatePitResponse}
      */
-    public static final JsonpDeserializer<CreatePitResponse> _DESERIALIZER = ObjectBuilderDeserializer
-            .lazy(Builder::new, CreatePitResponse::setupCreatePitResponseDeserializer);
+    public static final JsonpDeserializer<CreatePitResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CreatePitResponse::setupCreatePitResponseDeserializer
+    );
 
     protected static void setupCreatePitResponseDeserializer(ObjectDeserializer<CreatePitResponse.Builder> op) {
 
         op.add(Builder::pitId, JsonpDeserializer.stringDeserializer(), "pit_id");
-        op.add(Builder::shards,
-                ShardStatistics._DESERIALIZER,
-                "_shards");
+        op.add(Builder::shards, ShardStatistics._DESERIALIZER, "_shards");
         op.add(Builder::creationTime, JsonpDeserializer.longDeserializer(), "creation_time");
 
     }
-}
\ No newline at end of file
+}
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/DeletePitRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/DeletePitRecord.java
index f107f52e10..1b8ff592db 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/DeletePitRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/DeletePitRecord.java
@@ -8,8 +8,8 @@
 
 package org.opensearch.client.opensearch.core.pit;
 
+import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
-
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -19,8 +19,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import jakarta.json.stream.JsonGenerator;
-
 @JsonpDeserializable
 public class DeletePitRecord implements JsonpSerializable {
 
@@ -114,11 +112,11 @@ public DeletePitRecord build() {
      * Json deserializer for {@link DeletePitRecord}
      */
     public static final JsonpDeserializer<DeletePitRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
-            Builder::new,
-            DeletePitRecord::setupDeletePitRecordDeserializer);
+        Builder::new,
+        DeletePitRecord::setupDeletePitRecordDeserializer
+    );
 
-    protected static void setupDeletePitRecordDeserializer(
-            ObjectDeserializer<DeletePitRecord.Builder> op) {
+    protected static void setupDeletePitRecordDeserializer(ObjectDeserializer<DeletePitRecord.Builder> op) {
 
         op.add(Builder::pitId, JsonpDeserializer.stringDeserializer(), "pit_id");
         op.add(Builder::successful, JsonpDeserializer.booleanDeserializer(), "successful");
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/DeletePitRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/DeletePitRequest.java
index 5ad4a39447..ad0a2812fa 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/DeletePitRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/DeletePitRequest.java
@@ -8,11 +8,10 @@
 
 package org.opensearch.client.opensearch.core.pit;
 
+import jakarta.json.stream.JsonGenerator;
 import java.util.List;
 import java.util.function.Function;
-
 import javax.annotation.Nullable;
-
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
@@ -23,12 +22,9 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import jakarta.json.stream.JsonGenerator;
-
-
 /**
  * Deletes PITs on the OpenSearch cluster
- * 
+ *
  */
 public class DeletePitRequest extends RequestBase implements JsonpSerializable {
 
@@ -94,7 +90,7 @@ public final Builder pitId(@Nullable List<String> pitId) {
 
         /**
          * Builds a {@link DeletePitRequest}.
-         * 
+         *
          * @throws NullPointerException if some of the required fields are null.
          */
         public DeletePitRequest build() {
@@ -104,26 +100,28 @@ public DeletePitRequest build() {
     }
 
     public static final Endpoint<DeletePitRequest, DeletePitResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-            // Request Method
-            request -> {
-                return "DELETE";
-            },
-
-            // Request Path
-            request -> {
-                final int _all = 1 << 0;
-
-                int propsSet = 0;
-
-                if (request.pitId() == null) {
-                    propsSet |= _all;
-                }
-                if (propsSet == 0) {
-                    return "/_search/point_in_time";
-                } else {
-                    return "/_search/point_in_time/_all";
-                }
-            },
-            SimpleEndpoint.emptyMap(), SimpleEndpoint.emptyMap(), true, DeletePitResponse._DESERIALIZER);
+        // Request Method
+        request -> { return "DELETE"; },
+
+        // Request Path
+        request -> {
+            final int _all = 1 << 0;
+
+            int propsSet = 0;
+
+            if (request.pitId() == null) {
+                propsSet |= _all;
+            }
+            if (propsSet == 0) {
+                return "/_search/point_in_time";
+            } else {
+                return "/_search/point_in_time/_all";
+            }
+        },
+        SimpleEndpoint.emptyMap(),
+        SimpleEndpoint.emptyMap(),
+        true,
+        DeletePitResponse._DESERIALIZER
+    );
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/DeletePitResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/DeletePitResponse.java
index bac4f55bd5..38376d56d4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/DeletePitResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/DeletePitResponse.java
@@ -8,9 +8,9 @@
 
 package org.opensearch.client.opensearch.core.pit;
 
+import jakarta.json.stream.JsonGenerator;
 import java.util.List;
 import java.util.function.Function;
-
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -21,8 +21,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import jakarta.json.stream.JsonGenerator;
-
 @JsonpDeserializable
 public class DeletePitResponse implements JsonpSerializable {
     private final List<DeletePitRecord> pits;
@@ -30,7 +28,7 @@ public class DeletePitResponse implements JsonpSerializable {
     private DeletePitResponse(Builder builder) {
         this.pits = ApiTypeHelper.unmodifiableRequired(builder.pits, this, "pits");
     }
-    
+
     public static DeletePitResponse of(Function<Builder, ObjectBuilder<DeletePitResponse>> fn) {
         return fn.apply(new Builder()).build();
     }
@@ -111,14 +109,14 @@ public DeletePitResponse build() {
         }
     }
 
-    public static final JsonpDeserializer<DeletePitResponse> _DESERIALIZER = ObjectBuilderDeserializer
-            .lazy(Builder::new, DeletePitResponse::createDeletePitResponseDeserializer);
+    public static final JsonpDeserializer<DeletePitResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DeletePitResponse::createDeletePitResponseDeserializer
+    );
 
-    protected static void createDeletePitResponseDeserializer(
-            ObjectDeserializer<DeletePitResponse.Builder> op) {
+    protected static void createDeletePitResponseDeserializer(ObjectDeserializer<DeletePitResponse.Builder> op) {
 
-        JsonpDeserializer<List<DeletePitRecord>> valueDeserializer = JsonpDeserializer
-                .arrayDeserializer(DeletePitRecord._DESERIALIZER);
+        JsonpDeserializer<List<DeletePitRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(DeletePitRecord._DESERIALIZER);
 
         op.add(Builder::pits, valueDeserializer, "pits");
     }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/ListAllPitRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/ListAllPitRequest.java
index 1391046f69..a281deb86f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/ListAllPitRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/ListAllPitRequest.java
@@ -12,10 +12,9 @@
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 
-
 /**
  * Lists all PITs on the OpenSearch cluster
- * 
+ *
  */
 public class ListAllPitRequest {
     public ListAllPitRequest() {
@@ -28,13 +27,14 @@ public ListAllPitRequest() {
     public static final ListAllPitRequest _INSTANCE = new ListAllPitRequest();
 
     public static final Endpoint<ListAllPitRequest, ListAllPitResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-            // Request method
-            request -> {
-                return "GET";
-            },
-
-            // Request Path
-            request -> {
-                return "/_search/point_in_time/_all";
-            }, SimpleEndpoint.emptyMap(), SimpleEndpoint.emptyMap(), false, ListAllPitResponse._DESERIALIZER);
+        // Request method
+        request -> { return "GET"; },
+
+        // Request Path
+        request -> { return "/_search/point_in_time/_all"; },
+        SimpleEndpoint.emptyMap(),
+        SimpleEndpoint.emptyMap(),
+        false,
+        ListAllPitResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/ListAllPitResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/ListAllPitResponse.java
index 8e3ce672b3..330c9c4d46 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/ListAllPitResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/ListAllPitResponse.java
@@ -8,9 +8,9 @@
 
 package org.opensearch.client.opensearch.core.pit;
 
+import jakarta.json.stream.JsonGenerator;
 import java.util.List;
 import java.util.function.Function;
-
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -21,8 +21,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import jakarta.json.stream.JsonGenerator;
-
 @JsonpDeserializable
 public class ListAllPitResponse implements JsonpSerializable {
     private final List<PitRecord> pits;
@@ -30,7 +28,7 @@ public class ListAllPitResponse implements JsonpSerializable {
     private ListAllPitResponse(Builder builder) {
         this.pits = ApiTypeHelper.unmodifiableRequired(builder.pits, this, "pits");
     }
-    
+
     public static ListAllPitResponse of(Function<Builder, ObjectBuilder<ListAllPitResponse>> fn) {
         return fn.apply(new Builder()).build();
     }
@@ -111,15 +109,15 @@ public ListAllPitResponse build() {
         }
     }
 
-    public static final JsonpDeserializer<ListAllPitResponse> _DESERIALIZER = ObjectBuilderDeserializer
-            .lazy(Builder::new, ListAllPitResponse::createListAllPitResponseDeserializer);
+    public static final JsonpDeserializer<ListAllPitResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ListAllPitResponse::createListAllPitResponseDeserializer
+    );
+
+    protected static void createListAllPitResponseDeserializer(ObjectDeserializer<ListAllPitResponse.Builder> op) {
 
-    protected static  void createListAllPitResponseDeserializer(
-            ObjectDeserializer<ListAllPitResponse.Builder> op) {
+        JsonpDeserializer<List<PitRecord>> valueDeserializer = JsonpDeserializer.arrayDeserializer(PitRecord._DESERIALIZER);
 
-        JsonpDeserializer<List<PitRecord>> valueDeserializer = JsonpDeserializer
-                .arrayDeserializer(PitRecord._DESERIALIZER);
-                
         op.add(Builder::pits, valueDeserializer, "pits");
     }
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/PitRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/PitRecord.java
index 52ad829fbd..1d30e0a83d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/PitRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/pit/PitRecord.java
@@ -8,8 +8,8 @@
 
 package org.opensearch.client.opensearch.core.pit;
 
+import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
-
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -19,8 +19,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import jakarta.json.stream.JsonGenerator;
-
 @JsonpDeserializable
 public class PitRecord implements JsonpSerializable {
 
@@ -139,11 +137,11 @@ public PitRecord build() {
      * Json deserializer for {@link PitRecord}
      */
     public static final JsonpDeserializer<PitRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
-            Builder::new,
-            PitRecord::setupPitRecordDeserializer);
+        Builder::new,
+        PitRecord::setupPitRecordDeserializer
+    );
 
-    protected static void setupPitRecordDeserializer(
-            ObjectDeserializer<PitRecord.Builder> op) {
+    protected static void setupPitRecordDeserializer(ObjectDeserializer<PitRecord.Builder> op) {
 
         op.add(Builder::pitId, JsonpDeserializer.stringDeserializer(), "pit_id");
         op.add(Builder::creationTime, JsonpDeserializer.longDeserializer(), "creation_time");
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/DocumentRating.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/DocumentRating.java
index efcace6633..59900e339c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/DocumentRating.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/DocumentRating.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core.rank_eval;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,155 +43,154 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.rank_eval.DocumentRating
 
-
 @JsonpDeserializable
 public class DocumentRating implements JsonpSerializable {
-	private final String id;
-
-	private final String index;
-
-	private final int rating;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DocumentRating(Builder builder) {
-
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.rating = ApiTypeHelper.requireNonNull(builder.rating, this, "rating");
-
-	}
-
-	public static DocumentRating of(Function<Builder, ObjectBuilder<DocumentRating>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - The document ID.
-	 * <p>
-	 * API name: {@code _id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - The document's index. For data streams, this should be the
-	 * document's backing index.
-	 * <p>
-	 * API name: {@code _index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Required - The document's relevance with regard to this search request.
-	 * <p>
-	 * API name: {@code rating}
-	 */
-	public final int rating() {
-		return this.rating;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("_id");
-		generator.write(this.id);
-
-		generator.writeKey("_index");
-		generator.write(this.index);
-
-		generator.writeKey("rating");
-		generator.write(this.rating);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DocumentRating}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DocumentRating> {
-		private String id;
-
-		private String index;
-
-		private Integer rating;
-
-		/**
-		 * Required - The document ID.
-		 * <p>
-		 * API name: {@code _id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - The document's index. For data streams, this should be the
-		 * document's backing index.
-		 * <p>
-		 * API name: {@code _index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - The document's relevance with regard to this search request.
-		 * <p>
-		 * API name: {@code rating}
-		 */
-		public final Builder rating(int value) {
-			this.rating = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DocumentRating}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DocumentRating build() {
-			_checkSingleUse();
-
-			return new DocumentRating(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DocumentRating}
-	 */
-	public static final JsonpDeserializer<DocumentRating> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			DocumentRating::setupDocumentRatingDeserializer);
-
-	protected static void setupDocumentRatingDeserializer(ObjectDeserializer<DocumentRating.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
-		op.add(Builder::rating, JsonpDeserializer.integerDeserializer(), "rating");
-
-	}
+    private final String id;
+
+    private final String index;
+
+    private final int rating;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DocumentRating(Builder builder) {
+
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.rating = ApiTypeHelper.requireNonNull(builder.rating, this, "rating");
+
+    }
+
+    public static DocumentRating of(Function<Builder, ObjectBuilder<DocumentRating>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - The document ID.
+     * <p>
+     * API name: {@code _id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - The document's index. For data streams, this should be the
+     * document's backing index.
+     * <p>
+     * API name: {@code _index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Required - The document's relevance with regard to this search request.
+     * <p>
+     * API name: {@code rating}
+     */
+    public final int rating() {
+        return this.rating;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("_id");
+        generator.write(this.id);
+
+        generator.writeKey("_index");
+        generator.write(this.index);
+
+        generator.writeKey("rating");
+        generator.write(this.rating);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DocumentRating}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DocumentRating> {
+        private String id;
+
+        private String index;
+
+        private Integer rating;
+
+        /**
+         * Required - The document ID.
+         * <p>
+         * API name: {@code _id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - The document's index. For data streams, this should be the
+         * document's backing index.
+         * <p>
+         * API name: {@code _index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - The document's relevance with regard to this search request.
+         * <p>
+         * API name: {@code rating}
+         */
+        public final Builder rating(int value) {
+            this.rating = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link DocumentRating}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DocumentRating build() {
+            _checkSingleUse();
+
+            return new DocumentRating(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DocumentRating}
+     */
+    public static final JsonpDeserializer<DocumentRating> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DocumentRating::setupDocumentRatingDeserializer
+    );
+
+    protected static void setupDocumentRatingDeserializer(ObjectDeserializer<DocumentRating.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
+        op.add(Builder::rating, JsonpDeserializer.integerDeserializer(), "rating");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalHit.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalHit.java
index c3f3bddb82..62817bbe5a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalHit.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalHit.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core.rank_eval;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,142 +43,140 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.rank_eval.RankEvalHit
 
-
 @JsonpDeserializable
 public class RankEvalHit implements JsonpSerializable {
-	private final String id;
-
-	private final String index;
-
-	private final double score;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RankEvalHit(Builder builder) {
-
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.score = ApiTypeHelper.requireNonNull(builder.score, this, "score");
-
-	}
-
-	public static RankEvalHit of(Function<Builder, ObjectBuilder<RankEvalHit>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code _id}
-	 */
-	public final String id() {
-		return this.id;
-	}
+    private final String id;
 
-	/**
-	 * Required - API name: {@code _index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Required - API name: {@code _score}
-	 */
-	public final double score() {
-		return this.score;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("_id");
-		generator.write(this.id);
-
-		generator.writeKey("_index");
-		generator.write(this.index);
-
-		generator.writeKey("_score");
-		generator.write(this.score);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RankEvalHit}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankEvalHit> {
-		private String id;
-
-		private String index;
-
-		private Double score;
-
-		/**
-		 * Required - API name: {@code _id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _score}
-		 */
-		public final Builder score(double value) {
-			this.score = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RankEvalHit}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RankEvalHit build() {
-			_checkSingleUse();
-
-			return new RankEvalHit(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RankEvalHit}
-	 */
-	public static final JsonpDeserializer<RankEvalHit> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RankEvalHit::setupRankEvalHitDeserializer);
-
-	protected static void setupRankEvalHitDeserializer(ObjectDeserializer<RankEvalHit.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
-		op.add(Builder::score, JsonpDeserializer.doubleDeserializer(), "_score");
-
-	}
+    private final String index;
+
+    private final double score;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RankEvalHit(Builder builder) {
+
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.score = ApiTypeHelper.requireNonNull(builder.score, this, "score");
+
+    }
+
+    public static RankEvalHit of(Function<Builder, ObjectBuilder<RankEvalHit>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code _id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - API name: {@code _index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Required - API name: {@code _score}
+     */
+    public final double score() {
+        return this.score;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("_id");
+        generator.write(this.id);
+
+        generator.writeKey("_index");
+        generator.write(this.index);
+
+        generator.writeKey("_score");
+        generator.write(this.score);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RankEvalHit}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankEvalHit> {
+        private String id;
+
+        private String index;
+
+        private Double score;
+
+        /**
+         * Required - API name: {@code _id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _score}
+         */
+        public final Builder score(double value) {
+            this.score = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RankEvalHit}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RankEvalHit build() {
+            _checkSingleUse();
+
+            return new RankEvalHit(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RankEvalHit}
+     */
+    public static final JsonpDeserializer<RankEvalHit> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RankEvalHit::setupRankEvalHitDeserializer
+    );
+
+    protected static void setupRankEvalHitDeserializer(ObjectDeserializer<RankEvalHit.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
+        op.add(Builder::score, JsonpDeserializer.doubleDeserializer(), "_score");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalHitItem.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalHitItem.java
index 65fb91a508..e55cdeca50 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalHitItem.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalHitItem.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.rank_eval;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,131 +44,129 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.rank_eval.RankEvalHitItem
 
-
 @JsonpDeserializable
 public class RankEvalHitItem implements JsonpSerializable {
-	private final RankEvalHit hit;
-
-	@Nullable
-	private final Double rating;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RankEvalHitItem(Builder builder) {
-
-		this.hit = ApiTypeHelper.requireNonNull(builder.hit, this, "hit");
-		this.rating = builder.rating;
-
-	}
-
-	public static RankEvalHitItem of(Function<Builder, ObjectBuilder<RankEvalHitItem>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code hit}
-	 */
-	public final RankEvalHit hit() {
-		return this.hit;
-	}
-
-	/**
-	 * API name: {@code rating}
-	 */
-	@Nullable
-	public final Double rating() {
-		return this.rating;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("hit");
-		this.hit.serialize(generator, mapper);
-
-		if (this.rating != null) {
-			generator.writeKey("rating");
-			generator.write(this.rating);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RankEvalHitItem}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankEvalHitItem> {
-		private RankEvalHit hit;
-
-		@Nullable
-		private Double rating;
-
-		/**
-		 * Required - API name: {@code hit}
-		 */
-		public final Builder hit(RankEvalHit value) {
-			this.hit = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code hit}
-		 */
-		public final Builder hit(Function<RankEvalHit.Builder, ObjectBuilder<RankEvalHit>> fn) {
-			return this.hit(fn.apply(new RankEvalHit.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code rating}
-		 */
-		public final Builder rating(@Nullable Double value) {
-			this.rating = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RankEvalHitItem}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RankEvalHitItem build() {
-			_checkSingleUse();
-
-			return new RankEvalHitItem(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RankEvalHitItem}
-	 */
-	public static final JsonpDeserializer<RankEvalHitItem> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RankEvalHitItem::setupRankEvalHitItemDeserializer);
-
-	protected static void setupRankEvalHitItemDeserializer(ObjectDeserializer<RankEvalHitItem.Builder> op) {
-
-		op.add(Builder::hit, RankEvalHit._DESERIALIZER, "hit");
-		op.add(Builder::rating, JsonpDeserializer.doubleDeserializer(), "rating");
-
-	}
+    private final RankEvalHit hit;
+
+    @Nullable
+    private final Double rating;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RankEvalHitItem(Builder builder) {
+
+        this.hit = ApiTypeHelper.requireNonNull(builder.hit, this, "hit");
+        this.rating = builder.rating;
+
+    }
+
+    public static RankEvalHitItem of(Function<Builder, ObjectBuilder<RankEvalHitItem>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code hit}
+     */
+    public final RankEvalHit hit() {
+        return this.hit;
+    }
+
+    /**
+     * API name: {@code rating}
+     */
+    @Nullable
+    public final Double rating() {
+        return this.rating;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("hit");
+        this.hit.serialize(generator, mapper);
+
+        if (this.rating != null) {
+            generator.writeKey("rating");
+            generator.write(this.rating);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RankEvalHitItem}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankEvalHitItem> {
+        private RankEvalHit hit;
+
+        @Nullable
+        private Double rating;
+
+        /**
+         * Required - API name: {@code hit}
+         */
+        public final Builder hit(RankEvalHit value) {
+            this.hit = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code hit}
+         */
+        public final Builder hit(Function<RankEvalHit.Builder, ObjectBuilder<RankEvalHit>> fn) {
+            return this.hit(fn.apply(new RankEvalHit.Builder()).build());
+        }
+
+        /**
+         * API name: {@code rating}
+         */
+        public final Builder rating(@Nullable Double value) {
+            this.rating = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RankEvalHitItem}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RankEvalHitItem build() {
+            _checkSingleUse();
+
+            return new RankEvalHitItem(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RankEvalHitItem}
+     */
+    public static final JsonpDeserializer<RankEvalHitItem> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RankEvalHitItem::setupRankEvalHitItemDeserializer
+    );
+
+    protected static void setupRankEvalHitItemDeserializer(ObjectDeserializer<RankEvalHitItem.Builder> op) {
+
+        op.add(Builder::hit, RankEvalHit._DESERIALIZER, "hit");
+        op.add(Builder::rating, JsonpDeserializer.doubleDeserializer(), "rating");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetric.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetric.java
index 566a95f122..7ea001cbfa 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetric.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetric.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.rank_eval;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,259 +43,255 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.rank_eval.RankEvalMetric
 
-
 @JsonpDeserializable
 public class RankEvalMetric implements JsonpSerializable {
-	@Nullable
-	private final RankEvalMetricPrecision precision;
-
-	@Nullable
-	private final RankEvalMetricRecall recall;
-
-	@Nullable
-	private final RankEvalMetricMeanReciprocalRank meanReciprocalRank;
-
-	@Nullable
-	private final RankEvalMetricDiscountedCumulativeGain dcg;
-
-	@Nullable
-	private final RankEvalMetricExpectedReciprocalRank expectedReciprocalRank;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RankEvalMetric(Builder builder) {
-
-		this.precision = builder.precision;
-		this.recall = builder.recall;
-		this.meanReciprocalRank = builder.meanReciprocalRank;
-		this.dcg = builder.dcg;
-		this.expectedReciprocalRank = builder.expectedReciprocalRank;
-
-	}
-
-	public static RankEvalMetric of(Function<Builder, ObjectBuilder<RankEvalMetric>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code precision}
-	 */
-	@Nullable
-	public final RankEvalMetricPrecision precision() {
-		return this.precision;
-	}
-
-	/**
-	 * API name: {@code recall}
-	 */
-	@Nullable
-	public final RankEvalMetricRecall recall() {
-		return this.recall;
-	}
-
-	/**
-	 * API name: {@code mean_reciprocal_rank}
-	 */
-	@Nullable
-	public final RankEvalMetricMeanReciprocalRank meanReciprocalRank() {
-		return this.meanReciprocalRank;
-	}
-
-	/**
-	 * API name: {@code dcg}
-	 */
-	@Nullable
-	public final RankEvalMetricDiscountedCumulativeGain dcg() {
-		return this.dcg;
-	}
-
-	/**
-	 * API name: {@code expected_reciprocal_rank}
-	 */
-	@Nullable
-	public final RankEvalMetricExpectedReciprocalRank expectedReciprocalRank() {
-		return this.expectedReciprocalRank;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.precision != null) {
-			generator.writeKey("precision");
-			this.precision.serialize(generator, mapper);
-
-		}
-		if (this.recall != null) {
-			generator.writeKey("recall");
-			this.recall.serialize(generator, mapper);
-
-		}
-		if (this.meanReciprocalRank != null) {
-			generator.writeKey("mean_reciprocal_rank");
-			this.meanReciprocalRank.serialize(generator, mapper);
-
-		}
-		if (this.dcg != null) {
-			generator.writeKey("dcg");
-			this.dcg.serialize(generator, mapper);
-
-		}
-		if (this.expectedReciprocalRank != null) {
-			generator.writeKey("expected_reciprocal_rank");
-			this.expectedReciprocalRank.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RankEvalMetric}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankEvalMetric> {
-		@Nullable
-		private RankEvalMetricPrecision precision;
-
-		@Nullable
-		private RankEvalMetricRecall recall;
-
-		@Nullable
-		private RankEvalMetricMeanReciprocalRank meanReciprocalRank;
-
-		@Nullable
-		private RankEvalMetricDiscountedCumulativeGain dcg;
-
-		@Nullable
-		private RankEvalMetricExpectedReciprocalRank expectedReciprocalRank;
-
-		/**
-		 * API name: {@code precision}
-		 */
-		public final Builder precision(@Nullable RankEvalMetricPrecision value) {
-			this.precision = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code precision}
-		 */
-		public final Builder precision(
-				Function<RankEvalMetricPrecision.Builder, ObjectBuilder<RankEvalMetricPrecision>> fn) {
-			return this.precision(fn.apply(new RankEvalMetricPrecision.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code recall}
-		 */
-		public final Builder recall(@Nullable RankEvalMetricRecall value) {
-			this.recall = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code recall}
-		 */
-		public final Builder recall(Function<RankEvalMetricRecall.Builder, ObjectBuilder<RankEvalMetricRecall>> fn) {
-			return this.recall(fn.apply(new RankEvalMetricRecall.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code mean_reciprocal_rank}
-		 */
-		public final Builder meanReciprocalRank(@Nullable RankEvalMetricMeanReciprocalRank value) {
-			this.meanReciprocalRank = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mean_reciprocal_rank}
-		 */
-		public final Builder meanReciprocalRank(
-				Function<RankEvalMetricMeanReciprocalRank.Builder, ObjectBuilder<RankEvalMetricMeanReciprocalRank>> fn) {
-			return this.meanReciprocalRank(fn.apply(new RankEvalMetricMeanReciprocalRank.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code dcg}
-		 */
-		public final Builder dcg(@Nullable RankEvalMetricDiscountedCumulativeGain value) {
-			this.dcg = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code dcg}
-		 */
-		public final Builder dcg(
-				Function<RankEvalMetricDiscountedCumulativeGain.Builder,
-						ObjectBuilder<RankEvalMetricDiscountedCumulativeGain>> fn) {
-			return this.dcg(fn.apply(new RankEvalMetricDiscountedCumulativeGain.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code expected_reciprocal_rank}
-		 */
-		public final Builder expectedReciprocalRank(@Nullable RankEvalMetricExpectedReciprocalRank value) {
-			this.expectedReciprocalRank = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code expected_reciprocal_rank}
-		 */
-		public final Builder expectedReciprocalRank(
-				Function<RankEvalMetricExpectedReciprocalRank.Builder,
-						ObjectBuilder<RankEvalMetricExpectedReciprocalRank>> fn) {
-			return this.expectedReciprocalRank(fn.apply(new RankEvalMetricExpectedReciprocalRank.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link RankEvalMetric}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RankEvalMetric build() {
-			_checkSingleUse();
-
-			return new RankEvalMetric(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RankEvalMetric}
-	 */
-	public static final JsonpDeserializer<RankEvalMetric> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RankEvalMetric::setupRankEvalMetricDeserializer);
-
-	protected static void setupRankEvalMetricDeserializer(ObjectDeserializer<RankEvalMetric.Builder> op) {
-
-		op.add(Builder::precision, RankEvalMetricPrecision._DESERIALIZER, "precision");
-		op.add(Builder::recall, RankEvalMetricRecall._DESERIALIZER, "recall");
-		op.add(Builder::meanReciprocalRank, RankEvalMetricMeanReciprocalRank._DESERIALIZER, "mean_reciprocal_rank");
-		op.add(Builder::dcg, RankEvalMetricDiscountedCumulativeGain._DESERIALIZER, "dcg");
-		op.add(Builder::expectedReciprocalRank, RankEvalMetricExpectedReciprocalRank._DESERIALIZER,
-				"expected_reciprocal_rank");
-
-	}
+    @Nullable
+    private final RankEvalMetricPrecision precision;
+
+    @Nullable
+    private final RankEvalMetricRecall recall;
+
+    @Nullable
+    private final RankEvalMetricMeanReciprocalRank meanReciprocalRank;
+
+    @Nullable
+    private final RankEvalMetricDiscountedCumulativeGain dcg;
+
+    @Nullable
+    private final RankEvalMetricExpectedReciprocalRank expectedReciprocalRank;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RankEvalMetric(Builder builder) {
+
+        this.precision = builder.precision;
+        this.recall = builder.recall;
+        this.meanReciprocalRank = builder.meanReciprocalRank;
+        this.dcg = builder.dcg;
+        this.expectedReciprocalRank = builder.expectedReciprocalRank;
+
+    }
+
+    public static RankEvalMetric of(Function<Builder, ObjectBuilder<RankEvalMetric>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code precision}
+     */
+    @Nullable
+    public final RankEvalMetricPrecision precision() {
+        return this.precision;
+    }
+
+    /**
+     * API name: {@code recall}
+     */
+    @Nullable
+    public final RankEvalMetricRecall recall() {
+        return this.recall;
+    }
+
+    /**
+     * API name: {@code mean_reciprocal_rank}
+     */
+    @Nullable
+    public final RankEvalMetricMeanReciprocalRank meanReciprocalRank() {
+        return this.meanReciprocalRank;
+    }
+
+    /**
+     * API name: {@code dcg}
+     */
+    @Nullable
+    public final RankEvalMetricDiscountedCumulativeGain dcg() {
+        return this.dcg;
+    }
+
+    /**
+     * API name: {@code expected_reciprocal_rank}
+     */
+    @Nullable
+    public final RankEvalMetricExpectedReciprocalRank expectedReciprocalRank() {
+        return this.expectedReciprocalRank;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.precision != null) {
+            generator.writeKey("precision");
+            this.precision.serialize(generator, mapper);
+
+        }
+        if (this.recall != null) {
+            generator.writeKey("recall");
+            this.recall.serialize(generator, mapper);
+
+        }
+        if (this.meanReciprocalRank != null) {
+            generator.writeKey("mean_reciprocal_rank");
+            this.meanReciprocalRank.serialize(generator, mapper);
+
+        }
+        if (this.dcg != null) {
+            generator.writeKey("dcg");
+            this.dcg.serialize(generator, mapper);
+
+        }
+        if (this.expectedReciprocalRank != null) {
+            generator.writeKey("expected_reciprocal_rank");
+            this.expectedReciprocalRank.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RankEvalMetric}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankEvalMetric> {
+        @Nullable
+        private RankEvalMetricPrecision precision;
+
+        @Nullable
+        private RankEvalMetricRecall recall;
+
+        @Nullable
+        private RankEvalMetricMeanReciprocalRank meanReciprocalRank;
+
+        @Nullable
+        private RankEvalMetricDiscountedCumulativeGain dcg;
+
+        @Nullable
+        private RankEvalMetricExpectedReciprocalRank expectedReciprocalRank;
+
+        /**
+         * API name: {@code precision}
+         */
+        public final Builder precision(@Nullable RankEvalMetricPrecision value) {
+            this.precision = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code precision}
+         */
+        public final Builder precision(Function<RankEvalMetricPrecision.Builder, ObjectBuilder<RankEvalMetricPrecision>> fn) {
+            return this.precision(fn.apply(new RankEvalMetricPrecision.Builder()).build());
+        }
+
+        /**
+         * API name: {@code recall}
+         */
+        public final Builder recall(@Nullable RankEvalMetricRecall value) {
+            this.recall = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code recall}
+         */
+        public final Builder recall(Function<RankEvalMetricRecall.Builder, ObjectBuilder<RankEvalMetricRecall>> fn) {
+            return this.recall(fn.apply(new RankEvalMetricRecall.Builder()).build());
+        }
+
+        /**
+         * API name: {@code mean_reciprocal_rank}
+         */
+        public final Builder meanReciprocalRank(@Nullable RankEvalMetricMeanReciprocalRank value) {
+            this.meanReciprocalRank = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mean_reciprocal_rank}
+         */
+        public final Builder meanReciprocalRank(
+            Function<RankEvalMetricMeanReciprocalRank.Builder, ObjectBuilder<RankEvalMetricMeanReciprocalRank>> fn
+        ) {
+            return this.meanReciprocalRank(fn.apply(new RankEvalMetricMeanReciprocalRank.Builder()).build());
+        }
+
+        /**
+         * API name: {@code dcg}
+         */
+        public final Builder dcg(@Nullable RankEvalMetricDiscountedCumulativeGain value) {
+            this.dcg = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code dcg}
+         */
+        public final Builder dcg(
+            Function<RankEvalMetricDiscountedCumulativeGain.Builder, ObjectBuilder<RankEvalMetricDiscountedCumulativeGain>> fn
+        ) {
+            return this.dcg(fn.apply(new RankEvalMetricDiscountedCumulativeGain.Builder()).build());
+        }
+
+        /**
+         * API name: {@code expected_reciprocal_rank}
+         */
+        public final Builder expectedReciprocalRank(@Nullable RankEvalMetricExpectedReciprocalRank value) {
+            this.expectedReciprocalRank = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code expected_reciprocal_rank}
+         */
+        public final Builder expectedReciprocalRank(
+            Function<RankEvalMetricExpectedReciprocalRank.Builder, ObjectBuilder<RankEvalMetricExpectedReciprocalRank>> fn
+        ) {
+            return this.expectedReciprocalRank(fn.apply(new RankEvalMetricExpectedReciprocalRank.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link RankEvalMetric}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RankEvalMetric build() {
+            _checkSingleUse();
+
+            return new RankEvalMetric(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RankEvalMetric}
+     */
+    public static final JsonpDeserializer<RankEvalMetric> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RankEvalMetric::setupRankEvalMetricDeserializer
+    );
+
+    protected static void setupRankEvalMetricDeserializer(ObjectDeserializer<RankEvalMetric.Builder> op) {
+
+        op.add(Builder::precision, RankEvalMetricPrecision._DESERIALIZER, "precision");
+        op.add(Builder::recall, RankEvalMetricRecall._DESERIALIZER, "recall");
+        op.add(Builder::meanReciprocalRank, RankEvalMetricMeanReciprocalRank._DESERIALIZER, "mean_reciprocal_rank");
+        op.add(Builder::dcg, RankEvalMetricDiscountedCumulativeGain._DESERIALIZER, "dcg");
+        op.add(Builder::expectedReciprocalRank, RankEvalMetricExpectedReciprocalRank._DESERIALIZER, "expected_reciprocal_rank");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricBase.java
index 175f4cc232..8531dddecc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricBase.java
@@ -32,87 +32,84 @@
 
 package org.opensearch.client.opensearch.core.rank_eval;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import javax.annotation.Nullable;
 
 // typedef: _global.rank_eval.RankEvalMetricBase
 
-
-
 public abstract class RankEvalMetricBase implements JsonpSerializable {
-	@Nullable
-	private final Integer k;
+    @Nullable
+    private final Integer k;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	protected RankEvalMetricBase(AbstractBuilder<?> builder) {
+    protected RankEvalMetricBase(AbstractBuilder<?> builder) {
 
-		this.k = builder.k;
+        this.k = builder.k;
 
-	}
+    }
 
-	/**
-	 * Sets the maximum number of documents retrieved per query. This value will act
-	 * in place of the usual size parameter in the query.
-	 * <p>
-	 * API name: {@code k}
-	 */
-	@Nullable
-	public final Integer k() {
-		return this.k;
-	}
+    /**
+     * Sets the maximum number of documents retrieved per query. This value will act
+     * in place of the usual size parameter in the query.
+     * <p>
+     * API name: {@code k}
+     */
+    @Nullable
+    public final Integer k() {
+        return this.k;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		if (this.k != null) {
-			generator.writeKey("k");
-			generator.write(this.k);
+        if (this.k != null) {
+            generator.writeKey("k");
+            generator.write(this.k);
 
-		}
+        }
 
-	}
+    }
 
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		@Nullable
-		private Integer k;
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        @Nullable
+        private Integer k;
 
-		/**
-		 * Sets the maximum number of documents retrieved per query. This value will act
-		 * in place of the usual size parameter in the query.
-		 * <p>
-		 * API name: {@code k}
-		 */
-		public final BuilderT k(@Nullable Integer value) {
-			this.k = value;
-			return self();
-		}
+        /**
+         * Sets the maximum number of documents retrieved per query. This value will act
+         * in place of the usual size parameter in the query.
+         * <p>
+         * API name: {@code k}
+         */
+        public final BuilderT k(@Nullable Integer value) {
+            this.k = value;
+            return self();
+        }
 
-		protected abstract BuilderT self();
+        protected abstract BuilderT self();
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupRankEvalMetricBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupRankEvalMetricBaseDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
 
-		op.add(AbstractBuilder::k, JsonpDeserializer.integerDeserializer(), "k");
+        op.add(AbstractBuilder::k, JsonpDeserializer.integerDeserializer(), "k");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricDetail.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricDetail.java
index 1d0927790e..e7b0b58bee 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricDetail.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricDetail.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core.rank_eval;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,303 +46,302 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _global.rank_eval.RankEvalMetricDetail
 
-
 @JsonpDeserializable
 public class RankEvalMetricDetail implements JsonpSerializable {
-	private final double metricScore;
-
-	private final List<UnratedDocument> unratedDocs;
-
-	private final List<RankEvalHitItem> hits;
-
-	private final Map<String, Map<String, JsonData>> metricDetails;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RankEvalMetricDetail(Builder builder) {
-
-		this.metricScore = ApiTypeHelper.requireNonNull(builder.metricScore, this, "metricScore");
-		this.unratedDocs = ApiTypeHelper.unmodifiableRequired(builder.unratedDocs, this, "unratedDocs");
-		this.hits = ApiTypeHelper.unmodifiableRequired(builder.hits, this, "hits");
-		this.metricDetails = ApiTypeHelper.unmodifiableRequired(builder.metricDetails, this, "metricDetails");
-
-	}
-
-	public static RankEvalMetricDetail of(Function<Builder, ObjectBuilder<RankEvalMetricDetail>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - The metric_score in the details section shows the contribution of
-	 * this query to the global quality metric score
-	 * <p>
-	 * API name: {@code metric_score}
-	 */
-	public final double metricScore() {
-		return this.metricScore;
-	}
-
-	/**
-	 * Required - The unrated_docs section contains an _index and _id entry for each
-	 * document in the search result for this query that didn't have a ratings
-	 * value. This can be used to ask the user to supply ratings for these documents
-	 * <p>
-	 * API name: {@code unrated_docs}
-	 */
-	public final List<UnratedDocument> unratedDocs() {
-		return this.unratedDocs;
-	}
-
-	/**
-	 * Required - The hits section shows a grouping of the search results with their
-	 * supplied ratings
-	 * <p>
-	 * API name: {@code hits}
-	 */
-	public final List<RankEvalHitItem> hits() {
-		return this.hits;
-	}
-
-	/**
-	 * Required - The metric_details give additional information about the
-	 * calculated quality metric (e.g. how many of the retrieved documents were
-	 * relevant). The content varies for each metric but allows for better
-	 * interpretation of the results
-	 * <p>
-	 * API name: {@code metric_details}
-	 */
-	public final Map<String, Map<String, JsonData>> metricDetails() {
-		return this.metricDetails;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("metric_score");
-		generator.write(this.metricScore);
-
-		if (ApiTypeHelper.isDefined(this.unratedDocs)) {
-			generator.writeKey("unrated_docs");
-			generator.writeStartArray();
-			for (UnratedDocument item0 : this.unratedDocs) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.hits)) {
-			generator.writeKey("hits");
-			generator.writeStartArray();
-			for (RankEvalHitItem item0 : this.hits) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.metricDetails)) {
-			generator.writeKey("metric_details");
-			generator.writeStartObject();
-			for (Map.Entry<String, Map<String, JsonData>> item0 : this.metricDetails.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.writeStartObject();
-				if (item0.getValue() != null) {
-					for (Map.Entry<String, JsonData> item1 : item0.getValue().entrySet()) {
-						generator.writeKey(item1.getKey());
-						item1.getValue().serialize(generator, mapper);
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RankEvalMetricDetail}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankEvalMetricDetail> {
-		private Double metricScore;
-
-		private List<UnratedDocument> unratedDocs;
-
-		private List<RankEvalHitItem> hits;
-
-		private Map<String, Map<String, JsonData>> metricDetails;
-
-		/**
-		 * Required - The metric_score in the details section shows the contribution of
-		 * this query to the global quality metric score
-		 * <p>
-		 * API name: {@code metric_score}
-		 */
-		public final Builder metricScore(double value) {
-			this.metricScore = value;
-			return this;
-		}
-
-		/**
-		 * Required - The unrated_docs section contains an _index and _id entry for each
-		 * document in the search result for this query that didn't have a ratings
-		 * value. This can be used to ask the user to supply ratings for these documents
-		 * <p>
-		 * API name: {@code unrated_docs}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>unratedDocs</code>.
-		 */
-		public final Builder unratedDocs(List<UnratedDocument> list) {
-			this.unratedDocs = _listAddAll(this.unratedDocs, list);
-			return this;
-		}
-
-		/**
-		 * Required - The unrated_docs section contains an _index and _id entry for each
-		 * document in the search result for this query that didn't have a ratings
-		 * value. This can be used to ask the user to supply ratings for these documents
-		 * <p>
-		 * API name: {@code unrated_docs}
-		 * <p>
-		 * Adds one or more values to <code>unratedDocs</code>.
-		 */
-		public final Builder unratedDocs(UnratedDocument value, UnratedDocument... values) {
-			this.unratedDocs = _listAdd(this.unratedDocs, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - The unrated_docs section contains an _index and _id entry for each
-		 * document in the search result for this query that didn't have a ratings
-		 * value. This can be used to ask the user to supply ratings for these documents
-		 * <p>
-		 * API name: {@code unrated_docs}
-		 * <p>
-		 * Adds a value to <code>unratedDocs</code> using a builder lambda.
-		 */
-		public final Builder unratedDocs(Function<UnratedDocument.Builder, ObjectBuilder<UnratedDocument>> fn) {
-			return unratedDocs(fn.apply(new UnratedDocument.Builder()).build());
-		}
-
-		/**
-		 * Required - The hits section shows a grouping of the search results with their
-		 * supplied ratings
-		 * <p>
-		 * API name: {@code hits}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>hits</code>.
-		 */
-		public final Builder hits(List<RankEvalHitItem> list) {
-			this.hits = _listAddAll(this.hits, list);
-			return this;
-		}
-
-		/**
-		 * Required - The hits section shows a grouping of the search results with their
-		 * supplied ratings
-		 * <p>
-		 * API name: {@code hits}
-		 * <p>
-		 * Adds one or more values to <code>hits</code>.
-		 */
-		public final Builder hits(RankEvalHitItem value, RankEvalHitItem... values) {
-			this.hits = _listAdd(this.hits, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - The hits section shows a grouping of the search results with their
-		 * supplied ratings
-		 * <p>
-		 * API name: {@code hits}
-		 * <p>
-		 * Adds a value to <code>hits</code> using a builder lambda.
-		 */
-		public final Builder hits(Function<RankEvalHitItem.Builder, ObjectBuilder<RankEvalHitItem>> fn) {
-			return hits(fn.apply(new RankEvalHitItem.Builder()).build());
-		}
-
-		/**
-		 * Required - The metric_details give additional information about the
-		 * calculated quality metric (e.g. how many of the retrieved documents were
-		 * relevant). The content varies for each metric but allows for better
-		 * interpretation of the results
-		 * <p>
-		 * API name: {@code metric_details}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>metricDetails</code>.
-		 */
-		public final Builder metricDetails(Map<String, Map<String, JsonData>> map) {
-			this.metricDetails = _mapPutAll(this.metricDetails, map);
-			return this;
-		}
-
-		/**
-		 * Required - The metric_details give additional information about the
-		 * calculated quality metric (e.g. how many of the retrieved documents were
-		 * relevant). The content varies for each metric but allows for better
-		 * interpretation of the results
-		 * <p>
-		 * API name: {@code metric_details}
-		 * <p>
-		 * Adds an entry to <code>metricDetails</code>.
-		 */
-		public final Builder metricDetails(String key, Map<String, JsonData> value) {
-			this.metricDetails = _mapPut(this.metricDetails, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RankEvalMetricDetail}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RankEvalMetricDetail build() {
-			_checkSingleUse();
-
-			return new RankEvalMetricDetail(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RankEvalMetricDetail}
-	 */
-	public static final JsonpDeserializer<RankEvalMetricDetail> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RankEvalMetricDetail::setupRankEvalMetricDetailDeserializer);
-
-	protected static void setupRankEvalMetricDetailDeserializer(ObjectDeserializer<RankEvalMetricDetail.Builder> op) {
-
-		op.add(Builder::metricScore, JsonpDeserializer.doubleDeserializer(), "metric_score");
-		op.add(Builder::unratedDocs, JsonpDeserializer.arrayDeserializer(UnratedDocument._DESERIALIZER),
-				"unrated_docs");
-		op.add(Builder::hits, JsonpDeserializer.arrayDeserializer(RankEvalHitItem._DESERIALIZER), "hits");
-		op.add(Builder::metricDetails, JsonpDeserializer.stringMapDeserializer(
-				JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER)), "metric_details");
-
-	}
+    private final double metricScore;
+
+    private final List<UnratedDocument> unratedDocs;
+
+    private final List<RankEvalHitItem> hits;
+
+    private final Map<String, Map<String, JsonData>> metricDetails;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RankEvalMetricDetail(Builder builder) {
+
+        this.metricScore = ApiTypeHelper.requireNonNull(builder.metricScore, this, "metricScore");
+        this.unratedDocs = ApiTypeHelper.unmodifiableRequired(builder.unratedDocs, this, "unratedDocs");
+        this.hits = ApiTypeHelper.unmodifiableRequired(builder.hits, this, "hits");
+        this.metricDetails = ApiTypeHelper.unmodifiableRequired(builder.metricDetails, this, "metricDetails");
+
+    }
+
+    public static RankEvalMetricDetail of(Function<Builder, ObjectBuilder<RankEvalMetricDetail>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - The metric_score in the details section shows the contribution of
+     * this query to the global quality metric score
+     * <p>
+     * API name: {@code metric_score}
+     */
+    public final double metricScore() {
+        return this.metricScore;
+    }
+
+    /**
+     * Required - The unrated_docs section contains an _index and _id entry for each
+     * document in the search result for this query that didn't have a ratings
+     * value. This can be used to ask the user to supply ratings for these documents
+     * <p>
+     * API name: {@code unrated_docs}
+     */
+    public final List<UnratedDocument> unratedDocs() {
+        return this.unratedDocs;
+    }
+
+    /**
+     * Required - The hits section shows a grouping of the search results with their
+     * supplied ratings
+     * <p>
+     * API name: {@code hits}
+     */
+    public final List<RankEvalHitItem> hits() {
+        return this.hits;
+    }
+
+    /**
+     * Required - The metric_details give additional information about the
+     * calculated quality metric (e.g. how many of the retrieved documents were
+     * relevant). The content varies for each metric but allows for better
+     * interpretation of the results
+     * <p>
+     * API name: {@code metric_details}
+     */
+    public final Map<String, Map<String, JsonData>> metricDetails() {
+        return this.metricDetails;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("metric_score");
+        generator.write(this.metricScore);
+
+        if (ApiTypeHelper.isDefined(this.unratedDocs)) {
+            generator.writeKey("unrated_docs");
+            generator.writeStartArray();
+            for (UnratedDocument item0 : this.unratedDocs) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.hits)) {
+            generator.writeKey("hits");
+            generator.writeStartArray();
+            for (RankEvalHitItem item0 : this.hits) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.metricDetails)) {
+            generator.writeKey("metric_details");
+            generator.writeStartObject();
+            for (Map.Entry<String, Map<String, JsonData>> item0 : this.metricDetails.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.writeStartObject();
+                if (item0.getValue() != null) {
+                    for (Map.Entry<String, JsonData> item1 : item0.getValue().entrySet()) {
+                        generator.writeKey(item1.getKey());
+                        item1.getValue().serialize(generator, mapper);
+
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RankEvalMetricDetail}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankEvalMetricDetail> {
+        private Double metricScore;
+
+        private List<UnratedDocument> unratedDocs;
+
+        private List<RankEvalHitItem> hits;
+
+        private Map<String, Map<String, JsonData>> metricDetails;
+
+        /**
+         * Required - The metric_score in the details section shows the contribution of
+         * this query to the global quality metric score
+         * <p>
+         * API name: {@code metric_score}
+         */
+        public final Builder metricScore(double value) {
+            this.metricScore = value;
+            return this;
+        }
+
+        /**
+         * Required - The unrated_docs section contains an _index and _id entry for each
+         * document in the search result for this query that didn't have a ratings
+         * value. This can be used to ask the user to supply ratings for these documents
+         * <p>
+         * API name: {@code unrated_docs}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>unratedDocs</code>.
+         */
+        public final Builder unratedDocs(List<UnratedDocument> list) {
+            this.unratedDocs = _listAddAll(this.unratedDocs, list);
+            return this;
+        }
+
+        /**
+         * Required - The unrated_docs section contains an _index and _id entry for each
+         * document in the search result for this query that didn't have a ratings
+         * value. This can be used to ask the user to supply ratings for these documents
+         * <p>
+         * API name: {@code unrated_docs}
+         * <p>
+         * Adds one or more values to <code>unratedDocs</code>.
+         */
+        public final Builder unratedDocs(UnratedDocument value, UnratedDocument... values) {
+            this.unratedDocs = _listAdd(this.unratedDocs, value, values);
+            return this;
+        }
+
+        /**
+         * Required - The unrated_docs section contains an _index and _id entry for each
+         * document in the search result for this query that didn't have a ratings
+         * value. This can be used to ask the user to supply ratings for these documents
+         * <p>
+         * API name: {@code unrated_docs}
+         * <p>
+         * Adds a value to <code>unratedDocs</code> using a builder lambda.
+         */
+        public final Builder unratedDocs(Function<UnratedDocument.Builder, ObjectBuilder<UnratedDocument>> fn) {
+            return unratedDocs(fn.apply(new UnratedDocument.Builder()).build());
+        }
+
+        /**
+         * Required - The hits section shows a grouping of the search results with their
+         * supplied ratings
+         * <p>
+         * API name: {@code hits}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>hits</code>.
+         */
+        public final Builder hits(List<RankEvalHitItem> list) {
+            this.hits = _listAddAll(this.hits, list);
+            return this;
+        }
+
+        /**
+         * Required - The hits section shows a grouping of the search results with their
+         * supplied ratings
+         * <p>
+         * API name: {@code hits}
+         * <p>
+         * Adds one or more values to <code>hits</code>.
+         */
+        public final Builder hits(RankEvalHitItem value, RankEvalHitItem... values) {
+            this.hits = _listAdd(this.hits, value, values);
+            return this;
+        }
+
+        /**
+         * Required - The hits section shows a grouping of the search results with their
+         * supplied ratings
+         * <p>
+         * API name: {@code hits}
+         * <p>
+         * Adds a value to <code>hits</code> using a builder lambda.
+         */
+        public final Builder hits(Function<RankEvalHitItem.Builder, ObjectBuilder<RankEvalHitItem>> fn) {
+            return hits(fn.apply(new RankEvalHitItem.Builder()).build());
+        }
+
+        /**
+         * Required - The metric_details give additional information about the
+         * calculated quality metric (e.g. how many of the retrieved documents were
+         * relevant). The content varies for each metric but allows for better
+         * interpretation of the results
+         * <p>
+         * API name: {@code metric_details}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>metricDetails</code>.
+         */
+        public final Builder metricDetails(Map<String, Map<String, JsonData>> map) {
+            this.metricDetails = _mapPutAll(this.metricDetails, map);
+            return this;
+        }
+
+        /**
+         * Required - The metric_details give additional information about the
+         * calculated quality metric (e.g. how many of the retrieved documents were
+         * relevant). The content varies for each metric but allows for better
+         * interpretation of the results
+         * <p>
+         * API name: {@code metric_details}
+         * <p>
+         * Adds an entry to <code>metricDetails</code>.
+         */
+        public final Builder metricDetails(String key, Map<String, JsonData> value) {
+            this.metricDetails = _mapPut(this.metricDetails, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link RankEvalMetricDetail}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RankEvalMetricDetail build() {
+            _checkSingleUse();
+
+            return new RankEvalMetricDetail(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RankEvalMetricDetail}
+     */
+    public static final JsonpDeserializer<RankEvalMetricDetail> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RankEvalMetricDetail::setupRankEvalMetricDetailDeserializer
+    );
+
+    protected static void setupRankEvalMetricDetailDeserializer(ObjectDeserializer<RankEvalMetricDetail.Builder> op) {
+
+        op.add(Builder::metricScore, JsonpDeserializer.doubleDeserializer(), "metric_score");
+        op.add(Builder::unratedDocs, JsonpDeserializer.arrayDeserializer(UnratedDocument._DESERIALIZER), "unrated_docs");
+        op.add(Builder::hits, JsonpDeserializer.arrayDeserializer(RankEvalHitItem._DESERIALIZER), "hits");
+        op.add(
+            Builder::metricDetails,
+            JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER)),
+            "metric_details"
+        );
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricDiscountedCumulativeGain.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricDiscountedCumulativeGain.java
index 7abc3a87f5..4cc4c99cce 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricDiscountedCumulativeGain.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricDiscountedCumulativeGain.java
@@ -32,116 +32,117 @@
 
 package org.opensearch.client.opensearch.core.rank_eval;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.rank_eval.RankEvalMetricDiscountedCumulativeGain
 
 /**
  * Discounted cumulative gain (DCG)
- * 
+ *
  */
 @JsonpDeserializable
 public class RankEvalMetricDiscountedCumulativeGain extends RankEvalMetricBase {
-	@Nullable
-	private final Boolean normalize;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RankEvalMetricDiscountedCumulativeGain(Builder builder) {
-		super(builder);
-
-		this.normalize = builder.normalize;
-
-	}
-
-	public static RankEvalMetricDiscountedCumulativeGain of(
-			Function<Builder, ObjectBuilder<RankEvalMetricDiscountedCumulativeGain>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * If set to true, this metric will calculate the Normalized DCG.
-	 * <p>
-	 * API name: {@code normalize}
-	 */
-	@Nullable
-	public final Boolean normalize() {
-		return this.normalize;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.normalize != null) {
-			generator.writeKey("normalize");
-			generator.write(this.normalize);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RankEvalMetricDiscountedCumulativeGain}.
-	 */
-
-	public static class Builder extends RankEvalMetricBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<RankEvalMetricDiscountedCumulativeGain> {
-		@Nullable
-		private Boolean normalize;
-
-		/**
-		 * If set to true, this metric will calculate the Normalized DCG.
-		 * <p>
-		 * API name: {@code normalize}
-		 */
-		public final Builder normalize(@Nullable Boolean value) {
-			this.normalize = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RankEvalMetricDiscountedCumulativeGain}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RankEvalMetricDiscountedCumulativeGain build() {
-			_checkSingleUse();
-
-			return new RankEvalMetricDiscountedCumulativeGain(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RankEvalMetricDiscountedCumulativeGain}
-	 */
-	public static final JsonpDeserializer<RankEvalMetricDiscountedCumulativeGain> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new,
-					RankEvalMetricDiscountedCumulativeGain::setupRankEvalMetricDiscountedCumulativeGainDeserializer);
-
-	protected static void setupRankEvalMetricDiscountedCumulativeGainDeserializer(
-			ObjectDeserializer<RankEvalMetricDiscountedCumulativeGain.Builder> op) {
-		setupRankEvalMetricBaseDeserializer(op);
-		op.add(Builder::normalize, JsonpDeserializer.booleanDeserializer(), "normalize");
-
-	}
+    @Nullable
+    private final Boolean normalize;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RankEvalMetricDiscountedCumulativeGain(Builder builder) {
+        super(builder);
+
+        this.normalize = builder.normalize;
+
+    }
+
+    public static RankEvalMetricDiscountedCumulativeGain of(Function<Builder, ObjectBuilder<RankEvalMetricDiscountedCumulativeGain>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * If set to true, this metric will calculate the Normalized DCG.
+     * <p>
+     * API name: {@code normalize}
+     */
+    @Nullable
+    public final Boolean normalize() {
+        return this.normalize;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.normalize != null) {
+            generator.writeKey("normalize");
+            generator.write(this.normalize);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RankEvalMetricDiscountedCumulativeGain}.
+     */
+
+    public static class Builder extends RankEvalMetricBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<RankEvalMetricDiscountedCumulativeGain> {
+        @Nullable
+        private Boolean normalize;
+
+        /**
+         * If set to true, this metric will calculate the Normalized DCG.
+         * <p>
+         * API name: {@code normalize}
+         */
+        public final Builder normalize(@Nullable Boolean value) {
+            this.normalize = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RankEvalMetricDiscountedCumulativeGain}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RankEvalMetricDiscountedCumulativeGain build() {
+            _checkSingleUse();
+
+            return new RankEvalMetricDiscountedCumulativeGain(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RankEvalMetricDiscountedCumulativeGain}
+     */
+    public static final JsonpDeserializer<RankEvalMetricDiscountedCumulativeGain> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RankEvalMetricDiscountedCumulativeGain::setupRankEvalMetricDiscountedCumulativeGainDeserializer
+    );
+
+    protected static void setupRankEvalMetricDiscountedCumulativeGainDeserializer(
+        ObjectDeserializer<RankEvalMetricDiscountedCumulativeGain.Builder> op
+    ) {
+        setupRankEvalMetricBaseDeserializer(op);
+        op.add(Builder::normalize, JsonpDeserializer.booleanDeserializer(), "normalize");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricExpectedReciprocalRank.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricExpectedReciprocalRank.java
index 65fbf0a033..e44cd54b27 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricExpectedReciprocalRank.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricExpectedReciprocalRank.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core.rank_eval;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,8 +41,6 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.rank_eval.RankEvalMetricExpectedReciprocalRank
 
@@ -50,94 +50,95 @@
  */
 @JsonpDeserializable
 public class RankEvalMetricExpectedReciprocalRank extends RankEvalMetricBase {
-	private final int maximumRelevance;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RankEvalMetricExpectedReciprocalRank(Builder builder) {
-		super(builder);
-
-		this.maximumRelevance = ApiTypeHelper.requireNonNull(builder.maximumRelevance, this, "maximumRelevance");
-
-	}
-
-	public static RankEvalMetricExpectedReciprocalRank of(
-			Function<Builder, ObjectBuilder<RankEvalMetricExpectedReciprocalRank>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - The highest relevance grade used in the user-supplied relevance
-	 * judgments.
-	 * <p>
-	 * API name: {@code maximum_relevance}
-	 */
-	public final int maximumRelevance() {
-		return this.maximumRelevance;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("maximum_relevance");
-		generator.write(this.maximumRelevance);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RankEvalMetricExpectedReciprocalRank}.
-	 */
-
-	public static class Builder extends RankEvalMetricBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<RankEvalMetricExpectedReciprocalRank> {
-		private Integer maximumRelevance;
-
-		/**
-		 * Required - The highest relevance grade used in the user-supplied relevance
-		 * judgments.
-		 * <p>
-		 * API name: {@code maximum_relevance}
-		 */
-		public final Builder maximumRelevance(int value) {
-			this.maximumRelevance = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RankEvalMetricExpectedReciprocalRank}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RankEvalMetricExpectedReciprocalRank build() {
-			_checkSingleUse();
-
-			return new RankEvalMetricExpectedReciprocalRank(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RankEvalMetricExpectedReciprocalRank}
-	 */
-	public static final JsonpDeserializer<RankEvalMetricExpectedReciprocalRank> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new,
-					RankEvalMetricExpectedReciprocalRank::setupRankEvalMetricExpectedReciprocalRankDeserializer);
-
-	protected static void setupRankEvalMetricExpectedReciprocalRankDeserializer(
-			ObjectDeserializer<RankEvalMetricExpectedReciprocalRank.Builder> op) {
-		setupRankEvalMetricBaseDeserializer(op);
-		op.add(Builder::maximumRelevance, JsonpDeserializer.integerDeserializer(), "maximum_relevance");
-
-	}
+    private final int maximumRelevance;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RankEvalMetricExpectedReciprocalRank(Builder builder) {
+        super(builder);
+
+        this.maximumRelevance = ApiTypeHelper.requireNonNull(builder.maximumRelevance, this, "maximumRelevance");
+
+    }
+
+    public static RankEvalMetricExpectedReciprocalRank of(Function<Builder, ObjectBuilder<RankEvalMetricExpectedReciprocalRank>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - The highest relevance grade used in the user-supplied relevance
+     * judgments.
+     * <p>
+     * API name: {@code maximum_relevance}
+     */
+    public final int maximumRelevance() {
+        return this.maximumRelevance;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("maximum_relevance");
+        generator.write(this.maximumRelevance);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RankEvalMetricExpectedReciprocalRank}.
+     */
+
+    public static class Builder extends RankEvalMetricBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<RankEvalMetricExpectedReciprocalRank> {
+        private Integer maximumRelevance;
+
+        /**
+         * Required - The highest relevance grade used in the user-supplied relevance
+         * judgments.
+         * <p>
+         * API name: {@code maximum_relevance}
+         */
+        public final Builder maximumRelevance(int value) {
+            this.maximumRelevance = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RankEvalMetricExpectedReciprocalRank}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RankEvalMetricExpectedReciprocalRank build() {
+            _checkSingleUse();
+
+            return new RankEvalMetricExpectedReciprocalRank(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RankEvalMetricExpectedReciprocalRank}
+     */
+    public static final JsonpDeserializer<RankEvalMetricExpectedReciprocalRank> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RankEvalMetricExpectedReciprocalRank::setupRankEvalMetricExpectedReciprocalRankDeserializer
+    );
+
+    protected static void setupRankEvalMetricExpectedReciprocalRankDeserializer(
+        ObjectDeserializer<RankEvalMetricExpectedReciprocalRank.Builder> op
+    ) {
+        setupRankEvalMetricBaseDeserializer(op);
+        op.add(Builder::maximumRelevance, JsonpDeserializer.integerDeserializer(), "maximum_relevance");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricMeanReciprocalRank.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricMeanReciprocalRank.java
index c89bd1b253..6a09259861 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricMeanReciprocalRank.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricMeanReciprocalRank.java
@@ -32,14 +32,13 @@
 
 package org.opensearch.client.opensearch.core.rank_eval;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _global.rank_eval.RankEvalMetricMeanReciprocalRank
 
 /**
@@ -47,57 +46,59 @@
  */
 @JsonpDeserializable
 public class RankEvalMetricMeanReciprocalRank extends RankEvalMetricRatingTreshold {
-	// ---------------------------------------------------------------------------------------------
-
-	private RankEvalMetricMeanReciprocalRank(Builder builder) {
-		super(builder);
-
-	}
-
-	public static RankEvalMetricMeanReciprocalRank of(
-			Function<Builder, ObjectBuilder<RankEvalMetricMeanReciprocalRank>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RankEvalMetricMeanReciprocalRank}.
-	 */
-
-	public static class Builder extends RankEvalMetricRatingTreshold.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<RankEvalMetricMeanReciprocalRank> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RankEvalMetricMeanReciprocalRank}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RankEvalMetricMeanReciprocalRank build() {
-			_checkSingleUse();
-
-			return new RankEvalMetricMeanReciprocalRank(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RankEvalMetricMeanReciprocalRank}
-	 */
-	public static final JsonpDeserializer<RankEvalMetricMeanReciprocalRank> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RankEvalMetricMeanReciprocalRank::setupRankEvalMetricMeanReciprocalRankDeserializer);
-
-	protected static void setupRankEvalMetricMeanReciprocalRankDeserializer(
-			ObjectDeserializer<RankEvalMetricMeanReciprocalRank.Builder> op) {
-		RankEvalMetricRatingTreshold.setupRankEvalMetricRatingTresholdDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private RankEvalMetricMeanReciprocalRank(Builder builder) {
+        super(builder);
+
+    }
+
+    public static RankEvalMetricMeanReciprocalRank of(Function<Builder, ObjectBuilder<RankEvalMetricMeanReciprocalRank>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RankEvalMetricMeanReciprocalRank}.
+     */
+
+    public static class Builder extends RankEvalMetricRatingTreshold.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<RankEvalMetricMeanReciprocalRank> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RankEvalMetricMeanReciprocalRank}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RankEvalMetricMeanReciprocalRank build() {
+            _checkSingleUse();
+
+            return new RankEvalMetricMeanReciprocalRank(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RankEvalMetricMeanReciprocalRank}
+     */
+    public static final JsonpDeserializer<RankEvalMetricMeanReciprocalRank> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RankEvalMetricMeanReciprocalRank::setupRankEvalMetricMeanReciprocalRankDeserializer
+    );
+
+    protected static void setupRankEvalMetricMeanReciprocalRankDeserializer(
+        ObjectDeserializer<RankEvalMetricMeanReciprocalRank.Builder> op
+    ) {
+        RankEvalMetricRatingTreshold.setupRankEvalMetricRatingTresholdDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricPrecision.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricPrecision.java
index 9f21a7a225..416d08c5f1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricPrecision.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricPrecision.java
@@ -32,118 +32,119 @@
 
 package org.opensearch.client.opensearch.core.rank_eval;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.rank_eval.RankEvalMetricPrecision
 
 /**
  * Precision at K (P@k)
- * 
+ *
  */
 @JsonpDeserializable
 public class RankEvalMetricPrecision extends RankEvalMetricRatingTreshold {
-	@Nullable
-	private final Boolean ignoreUnlabeled;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RankEvalMetricPrecision(Builder builder) {
-		super(builder);
-
-		this.ignoreUnlabeled = builder.ignoreUnlabeled;
-
-	}
-
-	public static RankEvalMetricPrecision of(Function<Builder, ObjectBuilder<RankEvalMetricPrecision>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Controls how unlabeled documents in the search results are counted. If set to
-	 * true, unlabeled documents are ignored and neither count as relevant or
-	 * irrelevant. Set to false (the default), they are treated as irrelevant.
-	 * <p>
-	 * API name: {@code ignore_unlabeled}
-	 */
-	@Nullable
-	public final Boolean ignoreUnlabeled() {
-		return this.ignoreUnlabeled;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.ignoreUnlabeled != null) {
-			generator.writeKey("ignore_unlabeled");
-			generator.write(this.ignoreUnlabeled);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RankEvalMetricPrecision}.
-	 */
-
-	public static class Builder extends RankEvalMetricRatingTreshold.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<RankEvalMetricPrecision> {
-		@Nullable
-		private Boolean ignoreUnlabeled;
-
-		/**
-		 * Controls how unlabeled documents in the search results are counted. If set to
-		 * true, unlabeled documents are ignored and neither count as relevant or
-		 * irrelevant. Set to false (the default), they are treated as irrelevant.
-		 * <p>
-		 * API name: {@code ignore_unlabeled}
-		 */
-		public final Builder ignoreUnlabeled(@Nullable Boolean value) {
-			this.ignoreUnlabeled = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RankEvalMetricPrecision}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RankEvalMetricPrecision build() {
-			_checkSingleUse();
-
-			return new RankEvalMetricPrecision(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RankEvalMetricPrecision}
-	 */
-	public static final JsonpDeserializer<RankEvalMetricPrecision> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RankEvalMetricPrecision::setupRankEvalMetricPrecisionDeserializer);
-
-	protected static void setupRankEvalMetricPrecisionDeserializer(
-			ObjectDeserializer<RankEvalMetricPrecision.Builder> op) {
-		RankEvalMetricRatingTreshold.setupRankEvalMetricRatingTresholdDeserializer(op);
-		op.add(Builder::ignoreUnlabeled, JsonpDeserializer.booleanDeserializer(), "ignore_unlabeled");
-
-	}
+    @Nullable
+    private final Boolean ignoreUnlabeled;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RankEvalMetricPrecision(Builder builder) {
+        super(builder);
+
+        this.ignoreUnlabeled = builder.ignoreUnlabeled;
+
+    }
+
+    public static RankEvalMetricPrecision of(Function<Builder, ObjectBuilder<RankEvalMetricPrecision>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Controls how unlabeled documents in the search results are counted. If set to
+     * true, unlabeled documents are ignored and neither count as relevant or
+     * irrelevant. Set to false (the default), they are treated as irrelevant.
+     * <p>
+     * API name: {@code ignore_unlabeled}
+     */
+    @Nullable
+    public final Boolean ignoreUnlabeled() {
+        return this.ignoreUnlabeled;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.ignoreUnlabeled != null) {
+            generator.writeKey("ignore_unlabeled");
+            generator.write(this.ignoreUnlabeled);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RankEvalMetricPrecision}.
+     */
+
+    public static class Builder extends RankEvalMetricRatingTreshold.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<RankEvalMetricPrecision> {
+        @Nullable
+        private Boolean ignoreUnlabeled;
+
+        /**
+         * Controls how unlabeled documents in the search results are counted. If set to
+         * true, unlabeled documents are ignored and neither count as relevant or
+         * irrelevant. Set to false (the default), they are treated as irrelevant.
+         * <p>
+         * API name: {@code ignore_unlabeled}
+         */
+        public final Builder ignoreUnlabeled(@Nullable Boolean value) {
+            this.ignoreUnlabeled = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RankEvalMetricPrecision}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RankEvalMetricPrecision build() {
+            _checkSingleUse();
+
+            return new RankEvalMetricPrecision(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RankEvalMetricPrecision}
+     */
+    public static final JsonpDeserializer<RankEvalMetricPrecision> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RankEvalMetricPrecision::setupRankEvalMetricPrecisionDeserializer
+    );
+
+    protected static void setupRankEvalMetricPrecisionDeserializer(ObjectDeserializer<RankEvalMetricPrecision.Builder> op) {
+        RankEvalMetricRatingTreshold.setupRankEvalMetricRatingTresholdDeserializer(op);
+        op.add(Builder::ignoreUnlabeled, JsonpDeserializer.booleanDeserializer(), "ignore_unlabeled");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricRatingTreshold.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricRatingTreshold.java
index bc21fb082f..9c1dadce55 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricRatingTreshold.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricRatingTreshold.java
@@ -32,77 +32,74 @@
 
 package org.opensearch.client.opensearch.core.rank_eval;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectDeserializer;
-import jakarta.json.stream.JsonGenerator;
-import javax.annotation.Nullable;
 
 // typedef: _global.rank_eval.RankEvalMetricRatingTreshold
 
-
-
 public abstract class RankEvalMetricRatingTreshold extends RankEvalMetricBase {
-	@Nullable
-	private final Integer relevantRatingThreshold;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected RankEvalMetricRatingTreshold(AbstractBuilder<?> builder) {
-		super(builder);
-
-		this.relevantRatingThreshold = builder.relevantRatingThreshold;
-
-	}
-
-	/**
-	 * Sets the rating threshold above which documents are considered to be
-	 * &quot;relevant&quot;.
-	 * <p>
-	 * API name: {@code relevant_rating_threshold}
-	 */
-	@Nullable
-	public final Integer relevantRatingThreshold() {
-		return this.relevantRatingThreshold;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.relevantRatingThreshold != null) {
-			generator.writeKey("relevant_rating_threshold");
-			generator.write(this.relevantRatingThreshold);
-
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				RankEvalMetricBase.AbstractBuilder<BuilderT> {
-		@Nullable
-		private Integer relevantRatingThreshold;
-
-		/**
-		 * Sets the rating threshold above which documents are considered to be
-		 * &quot;relevant&quot;.
-		 * <p>
-		 * API name: {@code relevant_rating_threshold}
-		 */
-		public final BuilderT relevantRatingThreshold(@Nullable Integer value) {
-			this.relevantRatingThreshold = value;
-			return self();
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupRankEvalMetricRatingTresholdDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-		setupRankEvalMetricBaseDeserializer(op);
-		op.add(AbstractBuilder::relevantRatingThreshold, JsonpDeserializer.integerDeserializer(),
-				"relevant_rating_threshold");
-
-	}
+    @Nullable
+    private final Integer relevantRatingThreshold;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected RankEvalMetricRatingTreshold(AbstractBuilder<?> builder) {
+        super(builder);
+
+        this.relevantRatingThreshold = builder.relevantRatingThreshold;
+
+    }
+
+    /**
+     * Sets the rating threshold above which documents are considered to be
+     * &quot;relevant&quot;.
+     * <p>
+     * API name: {@code relevant_rating_threshold}
+     */
+    @Nullable
+    public final Integer relevantRatingThreshold() {
+        return this.relevantRatingThreshold;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.relevantRatingThreshold != null) {
+            generator.writeKey("relevant_rating_threshold");
+            generator.write(this.relevantRatingThreshold);
+
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends RankEvalMetricBase.AbstractBuilder<
+        BuilderT> {
+        @Nullable
+        private Integer relevantRatingThreshold;
+
+        /**
+         * Sets the rating threshold above which documents are considered to be
+         * &quot;relevant&quot;.
+         * <p>
+         * API name: {@code relevant_rating_threshold}
+         */
+        public final BuilderT relevantRatingThreshold(@Nullable Integer value) {
+            this.relevantRatingThreshold = value;
+            return self();
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupRankEvalMetricRatingTresholdDeserializer(
+        ObjectDeserializer<BuilderT> op
+    ) {
+        setupRankEvalMetricBaseDeserializer(op);
+        op.add(AbstractBuilder::relevantRatingThreshold, JsonpDeserializer.integerDeserializer(), "relevant_rating_threshold");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricRecall.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricRecall.java
index a5b92142a3..207ba669cc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricRecall.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricRecall.java
@@ -32,71 +32,72 @@
 
 package org.opensearch.client.opensearch.core.rank_eval;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: _global.rank_eval.RankEvalMetricRecall
 
 /**
  * Recall at K (R@k)
- * 
+ *
  */
 @JsonpDeserializable
 public class RankEvalMetricRecall extends RankEvalMetricRatingTreshold {
-	// ---------------------------------------------------------------------------------------------
-
-	private RankEvalMetricRecall(Builder builder) {
-		super(builder);
-
-	}
-
-	public static RankEvalMetricRecall of(Function<Builder, ObjectBuilder<RankEvalMetricRecall>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RankEvalMetricRecall}.
-	 */
-
-	public static class Builder extends RankEvalMetricRatingTreshold.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<RankEvalMetricRecall> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RankEvalMetricRecall}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RankEvalMetricRecall build() {
-			_checkSingleUse();
-
-			return new RankEvalMetricRecall(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RankEvalMetricRecall}
-	 */
-	public static final JsonpDeserializer<RankEvalMetricRecall> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RankEvalMetricRecall::setupRankEvalMetricRecallDeserializer);
-
-	protected static void setupRankEvalMetricRecallDeserializer(ObjectDeserializer<RankEvalMetricRecall.Builder> op) {
-		RankEvalMetricRatingTreshold.setupRankEvalMetricRatingTresholdDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private RankEvalMetricRecall(Builder builder) {
+        super(builder);
+
+    }
+
+    public static RankEvalMetricRecall of(Function<Builder, ObjectBuilder<RankEvalMetricRecall>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RankEvalMetricRecall}.
+     */
+
+    public static class Builder extends RankEvalMetricRatingTreshold.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<RankEvalMetricRecall> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RankEvalMetricRecall}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RankEvalMetricRecall build() {
+            _checkSingleUse();
+
+            return new RankEvalMetricRecall(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RankEvalMetricRecall}
+     */
+    public static final JsonpDeserializer<RankEvalMetricRecall> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RankEvalMetricRecall::setupRankEvalMetricRecallDeserializer
+    );
+
+    protected static void setupRankEvalMetricRecallDeserializer(ObjectDeserializer<RankEvalMetricRecall.Builder> op) {
+        RankEvalMetricRatingTreshold.setupRankEvalMetricRatingTresholdDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalQuery.java
index 9025114832..6a45c408e4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalQuery.java
@@ -32,142 +32,142 @@
 
 package org.opensearch.client.opensearch.core.rank_eval;
 
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.rank_eval.RankEvalQuery
 
-
 @JsonpDeserializable
 public class RankEvalQuery implements JsonpSerializable {
-	private final Query query;
-
-	@Nullable
-	private final Integer size;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RankEvalQuery(Builder builder) {
-
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-		this.size = builder.size;
-
-	}
-
-	public static RankEvalQuery of(Function<Builder, ObjectBuilder<RankEvalQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final Query query() {
-		return this.query;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("query");
-		this.query.serialize(generator, mapper);
-
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RankEvalQuery}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankEvalQuery> {
-		private Query query;
-
-		@Nullable
-		private Integer size;
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(Query value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.query(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Integer value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RankEvalQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RankEvalQuery build() {
-			_checkSingleUse();
-
-			return new RankEvalQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RankEvalQuery}
-	 */
-	public static final JsonpDeserializer<RankEvalQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RankEvalQuery::setupRankEvalQueryDeserializer);
-
-	protected static void setupRankEvalQueryDeserializer(ObjectDeserializer<RankEvalQuery.Builder> op) {
-
-		op.add(Builder::query, Query._DESERIALIZER, "query");
-		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
-
-	}
+    private final Query query;
+
+    @Nullable
+    private final Integer size;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RankEvalQuery(Builder builder) {
+
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+        this.size = builder.size;
+
+    }
+
+    public static RankEvalQuery of(Function<Builder, ObjectBuilder<RankEvalQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final Query query() {
+        return this.query;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("query");
+        this.query.serialize(generator, mapper);
+
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RankEvalQuery}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankEvalQuery> {
+        private Query query;
+
+        @Nullable
+        private Integer size;
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(Query value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.query(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Integer value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RankEvalQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RankEvalQuery build() {
+            _checkSingleUse();
+
+            return new RankEvalQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RankEvalQuery}
+     */
+    public static final JsonpDeserializer<RankEvalQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RankEvalQuery::setupRankEvalQueryDeserializer
+    );
+
+    protected static void setupRankEvalQueryDeserializer(ObjectDeserializer<RankEvalQuery.Builder> op) {
+
+        op.add(Builder::query, Query._DESERIALIZER, "query");
+        op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalRequestItem.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalRequestItem.java
index 80d7045779..8d3c23e5b1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalRequestItem.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalRequestItem.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch.core.rank_eval;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,287 +47,283 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.rank_eval.RankEvalRequestItem
 
-
 @JsonpDeserializable
 public class RankEvalRequestItem implements JsonpSerializable {
-	private final String id;
-
-	@Nullable
-	private final RankEvalQuery request;
-
-	private final List<DocumentRating> ratings;
-
-	@Nullable
-	private final String templateId;
-
-	private final Map<String, JsonData> params;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RankEvalRequestItem(Builder builder) {
-
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.request = builder.request;
-		this.ratings = ApiTypeHelper.unmodifiableRequired(builder.ratings, this, "ratings");
-		this.templateId = builder.templateId;
-		this.params = ApiTypeHelper.unmodifiable(builder.params);
-
-	}
-
-	public static RankEvalRequestItem of(Function<Builder, ObjectBuilder<RankEvalRequestItem>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - The search request's ID, used to group result details later.
-	 * <p>
-	 * API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * The query being evaluated.
-	 * <p>
-	 * API name: {@code request}
-	 */
-	@Nullable
-	public final RankEvalQuery request() {
-		return this.request;
-	}
-
-	/**
-	 * Required - List of document ratings
-	 * <p>
-	 * API name: {@code ratings}
-	 */
-	public final List<DocumentRating> ratings() {
-		return this.ratings;
-	}
-
-	/**
-	 * The search template Id
-	 * <p>
-	 * API name: {@code template_id}
-	 */
-	@Nullable
-	public final String templateId() {
-		return this.templateId;
-	}
-
-	/**
-	 * The search template parameters.
-	 * <p>
-	 * API name: {@code params}
-	 */
-	public final Map<String, JsonData> params() {
-		return this.params;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("id");
-		generator.write(this.id);
-
-		if (this.request != null) {
-			generator.writeKey("request");
-			this.request.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.ratings)) {
-			generator.writeKey("ratings");
-			generator.writeStartArray();
-			for (DocumentRating item0 : this.ratings) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.templateId != null) {
-			generator.writeKey("template_id");
-			generator.write(this.templateId);
-
-		}
-		if (ApiTypeHelper.isDefined(this.params)) {
-			generator.writeKey("params");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RankEvalRequestItem}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankEvalRequestItem> {
-		private String id;
-
-		@Nullable
-		private RankEvalQuery request;
-
-		private List<DocumentRating> ratings;
-
-		@Nullable
-		private String templateId;
-
-		@Nullable
-		private Map<String, JsonData> params;
-
-		/**
-		 * Required - The search request's ID, used to group result details later.
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * The query being evaluated.
-		 * <p>
-		 * API name: {@code request}
-		 */
-		public final Builder request(@Nullable RankEvalQuery value) {
-			this.request = value;
-			return this;
-		}
-
-		/**
-		 * The query being evaluated.
-		 * <p>
-		 * API name: {@code request}
-		 */
-		public final Builder request(Function<RankEvalQuery.Builder, ObjectBuilder<RankEvalQuery>> fn) {
-			return this.request(fn.apply(new RankEvalQuery.Builder()).build());
-		}
-
-		/**
-		 * Required - List of document ratings
-		 * <p>
-		 * API name: {@code ratings}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>ratings</code>.
-		 */
-		public final Builder ratings(List<DocumentRating> list) {
-			this.ratings = _listAddAll(this.ratings, list);
-			return this;
-		}
-
-		/**
-		 * Required - List of document ratings
-		 * <p>
-		 * API name: {@code ratings}
-		 * <p>
-		 * Adds one or more values to <code>ratings</code>.
-		 */
-		public final Builder ratings(DocumentRating value, DocumentRating... values) {
-			this.ratings = _listAdd(this.ratings, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - List of document ratings
-		 * <p>
-		 * API name: {@code ratings}
-		 * <p>
-		 * Adds a value to <code>ratings</code> using a builder lambda.
-		 */
-		public final Builder ratings(Function<DocumentRating.Builder, ObjectBuilder<DocumentRating>> fn) {
-			return ratings(fn.apply(new DocumentRating.Builder()).build());
-		}
-
-		/**
-		 * The search template Id
-		 * <p>
-		 * API name: {@code template_id}
-		 */
-		public final Builder templateId(@Nullable String value) {
-			this.templateId = value;
-			return this;
-		}
-
-		/**
-		 * The search template parameters.
-		 * <p>
-		 * API name: {@code params}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>params</code>.
-		 */
-		public final Builder params(Map<String, JsonData> map) {
-			this.params = _mapPutAll(this.params, map);
-			return this;
-		}
-
-		/**
-		 * The search template parameters.
-		 * <p>
-		 * API name: {@code params}
-		 * <p>
-		 * Adds an entry to <code>params</code>.
-		 */
-		public final Builder params(String key, JsonData value) {
-			this.params = _mapPut(this.params, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RankEvalRequestItem}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RankEvalRequestItem build() {
-			_checkSingleUse();
-
-			return new RankEvalRequestItem(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RankEvalRequestItem}
-	 */
-	public static final JsonpDeserializer<RankEvalRequestItem> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RankEvalRequestItem::setupRankEvalRequestItemDeserializer);
-
-	protected static void setupRankEvalRequestItemDeserializer(ObjectDeserializer<RankEvalRequestItem.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::request, RankEvalQuery._DESERIALIZER, "request");
-		op.add(Builder::ratings, JsonpDeserializer.arrayDeserializer(DocumentRating._DESERIALIZER), "ratings");
-		op.add(Builder::templateId, JsonpDeserializer.stringDeserializer(), "template_id");
-		op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
-
-	}
+    private final String id;
+
+    @Nullable
+    private final RankEvalQuery request;
+
+    private final List<DocumentRating> ratings;
+
+    @Nullable
+    private final String templateId;
+
+    private final Map<String, JsonData> params;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RankEvalRequestItem(Builder builder) {
+
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.request = builder.request;
+        this.ratings = ApiTypeHelper.unmodifiableRequired(builder.ratings, this, "ratings");
+        this.templateId = builder.templateId;
+        this.params = ApiTypeHelper.unmodifiable(builder.params);
+
+    }
+
+    public static RankEvalRequestItem of(Function<Builder, ObjectBuilder<RankEvalRequestItem>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - The search request's ID, used to group result details later.
+     * <p>
+     * API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * The query being evaluated.
+     * <p>
+     * API name: {@code request}
+     */
+    @Nullable
+    public final RankEvalQuery request() {
+        return this.request;
+    }
+
+    /**
+     * Required - List of document ratings
+     * <p>
+     * API name: {@code ratings}
+     */
+    public final List<DocumentRating> ratings() {
+        return this.ratings;
+    }
+
+    /**
+     * The search template Id
+     * <p>
+     * API name: {@code template_id}
+     */
+    @Nullable
+    public final String templateId() {
+        return this.templateId;
+    }
+
+    /**
+     * The search template parameters.
+     * <p>
+     * API name: {@code params}
+     */
+    public final Map<String, JsonData> params() {
+        return this.params;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("id");
+        generator.write(this.id);
+
+        if (this.request != null) {
+            generator.writeKey("request");
+            this.request.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.ratings)) {
+            generator.writeKey("ratings");
+            generator.writeStartArray();
+            for (DocumentRating item0 : this.ratings) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.templateId != null) {
+            generator.writeKey("template_id");
+            generator.write(this.templateId);
+
+        }
+        if (ApiTypeHelper.isDefined(this.params)) {
+            generator.writeKey("params");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RankEvalRequestItem}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RankEvalRequestItem> {
+        private String id;
+
+        @Nullable
+        private RankEvalQuery request;
+
+        private List<DocumentRating> ratings;
+
+        @Nullable
+        private String templateId;
+
+        @Nullable
+        private Map<String, JsonData> params;
+
+        /**
+         * Required - The search request's ID, used to group result details later.
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * The query being evaluated.
+         * <p>
+         * API name: {@code request}
+         */
+        public final Builder request(@Nullable RankEvalQuery value) {
+            this.request = value;
+            return this;
+        }
+
+        /**
+         * The query being evaluated.
+         * <p>
+         * API name: {@code request}
+         */
+        public final Builder request(Function<RankEvalQuery.Builder, ObjectBuilder<RankEvalQuery>> fn) {
+            return this.request(fn.apply(new RankEvalQuery.Builder()).build());
+        }
+
+        /**
+         * Required - List of document ratings
+         * <p>
+         * API name: {@code ratings}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>ratings</code>.
+         */
+        public final Builder ratings(List<DocumentRating> list) {
+            this.ratings = _listAddAll(this.ratings, list);
+            return this;
+        }
+
+        /**
+         * Required - List of document ratings
+         * <p>
+         * API name: {@code ratings}
+         * <p>
+         * Adds one or more values to <code>ratings</code>.
+         */
+        public final Builder ratings(DocumentRating value, DocumentRating... values) {
+            this.ratings = _listAdd(this.ratings, value, values);
+            return this;
+        }
+
+        /**
+         * Required - List of document ratings
+         * <p>
+         * API name: {@code ratings}
+         * <p>
+         * Adds a value to <code>ratings</code> using a builder lambda.
+         */
+        public final Builder ratings(Function<DocumentRating.Builder, ObjectBuilder<DocumentRating>> fn) {
+            return ratings(fn.apply(new DocumentRating.Builder()).build());
+        }
+
+        /**
+         * The search template Id
+         * <p>
+         * API name: {@code template_id}
+         */
+        public final Builder templateId(@Nullable String value) {
+            this.templateId = value;
+            return this;
+        }
+
+        /**
+         * The search template parameters.
+         * <p>
+         * API name: {@code params}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>params</code>.
+         */
+        public final Builder params(Map<String, JsonData> map) {
+            this.params = _mapPutAll(this.params, map);
+            return this;
+        }
+
+        /**
+         * The search template parameters.
+         * <p>
+         * API name: {@code params}
+         * <p>
+         * Adds an entry to <code>params</code>.
+         */
+        public final Builder params(String key, JsonData value) {
+            this.params = _mapPut(this.params, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link RankEvalRequestItem}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RankEvalRequestItem build() {
+            _checkSingleUse();
+
+            return new RankEvalRequestItem(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RankEvalRequestItem}
+     */
+    public static final JsonpDeserializer<RankEvalRequestItem> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RankEvalRequestItem::setupRankEvalRequestItemDeserializer
+    );
+
+    protected static void setupRankEvalRequestItemDeserializer(ObjectDeserializer<RankEvalRequestItem.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::request, RankEvalQuery._DESERIALIZER, "request");
+        op.add(Builder::ratings, JsonpDeserializer.arrayDeserializer(DocumentRating._DESERIALIZER), "ratings");
+        op.add(Builder::templateId, JsonpDeserializer.stringDeserializer(), "template_id");
+        op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/UnratedDocument.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/UnratedDocument.java
index 73176b02c9..579d79307b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/UnratedDocument.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/UnratedDocument.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core.rank_eval;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,117 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.rank_eval.UnratedDocument
 
-
 @JsonpDeserializable
 public class UnratedDocument implements JsonpSerializable {
-	private final String id;
-
-	private final String index;
-
-	// ---------------------------------------------------------------------------------------------
+    private final String id;
 
-	private UnratedDocument(Builder builder) {
+    private final String index;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+    private UnratedDocument(Builder builder) {
 
-	}
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
 
-	public static UnratedDocument of(Function<Builder, ObjectBuilder<UnratedDocument>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code _id}
-	 */
-	public final String id() {
-		return this.id;
-	}
+    public static UnratedDocument of(Function<Builder, ObjectBuilder<UnratedDocument>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code _index}
-	 */
-	public final String index() {
-		return this.index;
-	}
+    /**
+     * Required - API name: {@code _id}
+     */
+    public final String id() {
+        return this.id;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code _index}
+     */
+    public final String index() {
+        return this.index;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("_id");
-		generator.write(this.id);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("_index");
-		generator.write(this.index);
+        generator.writeKey("_id");
+        generator.write(this.id);
 
-	}
+        generator.writeKey("_index");
+        generator.write(this.index);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link UnratedDocument}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<UnratedDocument> {
-		private String id;
+    /**
+     * Builder for {@link UnratedDocument}.
+     */
 
-		private String index;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<UnratedDocument> {
+        private String id;
 
-		/**
-		 * Required - API name: {@code _id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
+        private String index;
 
-		/**
-		 * Required - API name: {@code _index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code _id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link UnratedDocument}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UnratedDocument build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code _index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
 
-			return new UnratedDocument(this);
-		}
-	}
+        /**
+         * Builds a {@link UnratedDocument}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UnratedDocument build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new UnratedDocument(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link UnratedDocument}
-	 */
-	public static final JsonpDeserializer<UnratedDocument> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			UnratedDocument::setupUnratedDocumentDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupUnratedDocumentDeserializer(ObjectDeserializer<UnratedDocument.Builder> op) {
+    /**
+     * Json deserializer for {@link UnratedDocument}
+     */
+    public static final JsonpDeserializer<UnratedDocument> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        UnratedDocument::setupUnratedDocumentDeserializer
+    );
 
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
+    protected static void setupUnratedDocumentDeserializer(ObjectDeserializer<UnratedDocument.Builder> op) {
 
-	}
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex/Destination.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex/Destination.java
index 10715f02f4..84717dc6d1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex/Destination.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex/Destination.java
@@ -32,237 +32,239 @@
 
 package org.opensearch.client.opensearch.core.reindex;
 
-import org.opensearch.client.opensearch._types.OpType;
-import org.opensearch.client.opensearch._types.VersionType;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.OpType;
+import org.opensearch.client.opensearch._types.VersionType;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.reindex.Destination
 
 @JsonpDeserializable
 public class Destination implements JsonpSerializable {
-	@Nullable
-	private final String index;
-
-	@Nullable
-	private final OpType opType;
-
-	@Nullable
-	private final String pipeline;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final VersionType versionType;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Destination(Builder builder) {
-
-		this.index = builder.index;
-		this.opType = builder.opType;
-		this.pipeline = builder.pipeline;
-		this.routing = builder.routing;
-		this.versionType = builder.versionType;
-
-	}
-
-	public static Destination of(Function<Builder, ObjectBuilder<Destination>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * The destination index for the transform. The mappings of the destination
-	 * index are deduced based on the source fields when possible. If alternate
-	 * mappings are required, use the Create index API prior to starting the
-	 * transform.
-	 * <p>
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code op_type}
-	 */
-	@Nullable
-	public final OpType opType() {
-		return this.opType;
-	}
-
-	/**
-	 * The unique identifier for an ingest pipeline.
-	 * <p>
-	 * API name: {@code pipeline}
-	 */
-	@Nullable
-	public final String pipeline() {
-		return this.pipeline;
-	}
-
-	/**
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * API name: {@code version_type}
-	 */
-	@Nullable
-	public final VersionType versionType() {
-		return this.versionType;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (this.opType != null) {
-			generator.writeKey("op_type");
-			this.opType.serialize(generator, mapper);
-		}
-		if (this.pipeline != null) {
-			generator.writeKey("pipeline");
-			generator.write(this.pipeline);
-
-		}
-		if (this.routing != null) {
-			generator.writeKey("routing");
-			generator.write(this.routing);
-
-		}
-		if (this.versionType != null) {
-			generator.writeKey("version_type");
-			this.versionType.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Destination}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Destination> {
-		@Nullable
-		private String index;
-
-		@Nullable
-		private OpType opType;
-
-		@Nullable
-		private String pipeline;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private VersionType versionType;
-
-		/**
-		 * The destination index for the transform. The mappings of the destination
-		 * index are deduced based on the source fields when possible. If alternate
-		 * mappings are required, use the Create index API prior to starting the
-		 * transform.
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code op_type}
-		 */
-		public final Builder opType(@Nullable OpType value) {
-			this.opType = value;
-			return this;
-		}
-
-		/**
-		 * The unique identifier for an ingest pipeline.
-		 * <p>
-		 * API name: {@code pipeline}
-		 */
-		public final Builder pipeline(@Nullable String value) {
-			this.pipeline = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code version_type}
-		 */
-		public final Builder versionType(@Nullable VersionType value) {
-			this.versionType = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Destination}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Destination build() {
-			_checkSingleUse();
-
-			return new Destination(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Destination}
-	 */
-	public static final JsonpDeserializer<Destination> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Destination::setupDestinationDeserializer);
-
-	protected static void setupDestinationDeserializer(ObjectDeserializer<Destination.Builder> op) {
-
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::opType, OpType._DESERIALIZER, "op_type");
-		op.add(Builder::pipeline, JsonpDeserializer.stringDeserializer(), "pipeline");
-		op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
-		op.add(Builder::versionType, VersionType._DESERIALIZER, "version_type");
-
-	}
+    @Nullable
+    private final String index;
+
+    @Nullable
+    private final OpType opType;
+
+    @Nullable
+    private final String pipeline;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final VersionType versionType;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Destination(Builder builder) {
+
+        this.index = builder.index;
+        this.opType = builder.opType;
+        this.pipeline = builder.pipeline;
+        this.routing = builder.routing;
+        this.versionType = builder.versionType;
+
+    }
+
+    public static Destination of(Function<Builder, ObjectBuilder<Destination>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * The destination index for the transform. The mappings of the destination
+     * index are deduced based on the source fields when possible. If alternate
+     * mappings are required, use the Create index API prior to starting the
+     * transform.
+     * <p>
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code op_type}
+     */
+    @Nullable
+    public final OpType opType() {
+        return this.opType;
+    }
+
+    /**
+     * The unique identifier for an ingest pipeline.
+     * <p>
+     * API name: {@code pipeline}
+     */
+    @Nullable
+    public final String pipeline() {
+        return this.pipeline;
+    }
+
+    /**
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * API name: {@code version_type}
+     */
+    @Nullable
+    public final VersionType versionType() {
+        return this.versionType;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (this.opType != null) {
+            generator.writeKey("op_type");
+            this.opType.serialize(generator, mapper);
+        }
+        if (this.pipeline != null) {
+            generator.writeKey("pipeline");
+            generator.write(this.pipeline);
+
+        }
+        if (this.routing != null) {
+            generator.writeKey("routing");
+            generator.write(this.routing);
+
+        }
+        if (this.versionType != null) {
+            generator.writeKey("version_type");
+            this.versionType.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Destination}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Destination> {
+        @Nullable
+        private String index;
+
+        @Nullable
+        private OpType opType;
+
+        @Nullable
+        private String pipeline;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private VersionType versionType;
+
+        /**
+         * The destination index for the transform. The mappings of the destination
+         * index are deduced based on the source fields when possible. If alternate
+         * mappings are required, use the Create index API prior to starting the
+         * transform.
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code op_type}
+         */
+        public final Builder opType(@Nullable OpType value) {
+            this.opType = value;
+            return this;
+        }
+
+        /**
+         * The unique identifier for an ingest pipeline.
+         * <p>
+         * API name: {@code pipeline}
+         */
+        public final Builder pipeline(@Nullable String value) {
+            this.pipeline = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code version_type}
+         */
+        public final Builder versionType(@Nullable VersionType value) {
+            this.versionType = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Destination}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Destination build() {
+            _checkSingleUse();
+
+            return new Destination(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Destination}
+     */
+    public static final JsonpDeserializer<Destination> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Destination::setupDestinationDeserializer
+    );
+
+    protected static void setupDestinationDeserializer(ObjectDeserializer<Destination.Builder> op) {
+
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::opType, OpType._DESERIALIZER, "op_type");
+        op.add(Builder::pipeline, JsonpDeserializer.stringDeserializer(), "pipeline");
+        op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
+        op.add(Builder::versionType, VersionType._DESERIALIZER, "version_type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex/RemoteSource.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex/RemoteSource.java
index 01fe6d6d66..ada4adcb2c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex/RemoteSource.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex/RemoteSource.java
@@ -32,213 +32,214 @@
 
 package org.opensearch.client.opensearch.core.reindex;
 
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Time;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.reindex.RemoteSource
 
-
 @JsonpDeserializable
 public class RemoteSource implements JsonpSerializable {
-	private final Time connectTimeout;
+    private final Time connectTimeout;
 
-	private final String host;
+    private final String host;
 
-	private final String username;
+    private final String username;
 
-	private final String password;
+    private final String password;
 
-	private final Time socketTimeout;
+    private final Time socketTimeout;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private RemoteSource(Builder builder) {
+    private RemoteSource(Builder builder) {
 
-		this.connectTimeout = ApiTypeHelper.requireNonNull(builder.connectTimeout, this, "connectTimeout");
-		this.host = ApiTypeHelper.requireNonNull(builder.host, this, "host");
-		this.username = ApiTypeHelper.requireNonNull(builder.username, this, "username");
-		this.password = ApiTypeHelper.requireNonNull(builder.password, this, "password");
-		this.socketTimeout = ApiTypeHelper.requireNonNull(builder.socketTimeout, this, "socketTimeout");
+        this.connectTimeout = ApiTypeHelper.requireNonNull(builder.connectTimeout, this, "connectTimeout");
+        this.host = ApiTypeHelper.requireNonNull(builder.host, this, "host");
+        this.username = ApiTypeHelper.requireNonNull(builder.username, this, "username");
+        this.password = ApiTypeHelper.requireNonNull(builder.password, this, "password");
+        this.socketTimeout = ApiTypeHelper.requireNonNull(builder.socketTimeout, this, "socketTimeout");
 
-	}
+    }
 
-	public static RemoteSource of(Function<Builder, ObjectBuilder<RemoteSource>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static RemoteSource of(Function<Builder, ObjectBuilder<RemoteSource>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code connect_timeout}
-	 */
-	public final Time connectTimeout() {
-		return this.connectTimeout;
-	}
+    /**
+     * Required - API name: {@code connect_timeout}
+     */
+    public final Time connectTimeout() {
+        return this.connectTimeout;
+    }
 
-	/**
-	 * Required - API name: {@code host}
-	 */
-	public final String host() {
-		return this.host;
-	}
-
-	/**
-	 * Required - API name: {@code username}
-	 */
-	public final String username() {
-		return this.username;
-	}
-
-	/**
-	 * Required - API name: {@code password}
-	 */
-	public final String password() {
-		return this.password;
-	}
-
-	/**
-	 * Required - API name: {@code socket_timeout}
-	 */
-	public final Time socketTimeout() {
-		return this.socketTimeout;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("connect_timeout");
-		this.connectTimeout.serialize(generator, mapper);
-
-		generator.writeKey("host");
-		generator.write(this.host);
-
-		generator.writeKey("username");
-		generator.write(this.username);
-
-		generator.writeKey("password");
-		generator.write(this.password);
-
-		generator.writeKey("socket_timeout");
-		this.socketTimeout.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RemoteSource}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RemoteSource> {
-		private Time connectTimeout;
-
-		private String host;
-
-		private String username;
-
-		private String password;
-
-		private Time socketTimeout;
-
-		/**
-		 * Required - API name: {@code connect_timeout}
-		 */
-		public final Builder connectTimeout(Time value) {
-			this.connectTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code connect_timeout}
-		 */
-		public final Builder connectTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.connectTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code host}
-		 */
-		public final Builder host(String value) {
-			this.host = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code username}
-		 */
-		public final Builder username(String value) {
-			this.username = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code password}
-		 */
-		public final Builder password(String value) {
-			this.password = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code socket_timeout}
-		 */
-		public final Builder socketTimeout(Time value) {
-			this.socketTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code socket_timeout}
-		 */
-		public final Builder socketTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.socketTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link RemoteSource}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RemoteSource build() {
-			_checkSingleUse();
-
-			return new RemoteSource(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RemoteSource}
-	 */
-	public static final JsonpDeserializer<RemoteSource> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RemoteSource::setupRemoteSourceDeserializer);
-
-	protected static void setupRemoteSourceDeserializer(ObjectDeserializer<RemoteSource.Builder> op) {
-
-		op.add(Builder::connectTimeout, Time._DESERIALIZER, "connect_timeout");
-		op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host");
-		op.add(Builder::username, JsonpDeserializer.stringDeserializer(), "username");
-		op.add(Builder::password, JsonpDeserializer.stringDeserializer(), "password");
-		op.add(Builder::socketTimeout, Time._DESERIALIZER, "socket_timeout");
-
-	}
+    /**
+     * Required - API name: {@code host}
+     */
+    public final String host() {
+        return this.host;
+    }
+
+    /**
+     * Required - API name: {@code username}
+     */
+    public final String username() {
+        return this.username;
+    }
+
+    /**
+     * Required - API name: {@code password}
+     */
+    public final String password() {
+        return this.password;
+    }
+
+    /**
+     * Required - API name: {@code socket_timeout}
+     */
+    public final Time socketTimeout() {
+        return this.socketTimeout;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("connect_timeout");
+        this.connectTimeout.serialize(generator, mapper);
+
+        generator.writeKey("host");
+        generator.write(this.host);
+
+        generator.writeKey("username");
+        generator.write(this.username);
+
+        generator.writeKey("password");
+        generator.write(this.password);
+
+        generator.writeKey("socket_timeout");
+        this.socketTimeout.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RemoteSource}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RemoteSource> {
+        private Time connectTimeout;
+
+        private String host;
+
+        private String username;
+
+        private String password;
+
+        private Time socketTimeout;
+
+        /**
+         * Required - API name: {@code connect_timeout}
+         */
+        public final Builder connectTimeout(Time value) {
+            this.connectTimeout = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code connect_timeout}
+         */
+        public final Builder connectTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.connectTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code host}
+         */
+        public final Builder host(String value) {
+            this.host = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code username}
+         */
+        public final Builder username(String value) {
+            this.username = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code password}
+         */
+        public final Builder password(String value) {
+            this.password = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code socket_timeout}
+         */
+        public final Builder socketTimeout(Time value) {
+            this.socketTimeout = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code socket_timeout}
+         */
+        public final Builder socketTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.socketTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link RemoteSource}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RemoteSource build() {
+            _checkSingleUse();
+
+            return new RemoteSource(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RemoteSource}
+     */
+    public static final JsonpDeserializer<RemoteSource> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RemoteSource::setupRemoteSourceDeserializer
+    );
+
+    protected static void setupRemoteSourceDeserializer(ObjectDeserializer<RemoteSource.Builder> op) {
+
+        op.add(Builder::connectTimeout, Time._DESERIALIZER, "connect_timeout");
+        op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host");
+        op.add(Builder::username, JsonpDeserializer.stringDeserializer(), "username");
+        op.add(Builder::password, JsonpDeserializer.stringDeserializer(), "password");
+        op.add(Builder::socketTimeout, Time._DESERIALIZER, "socket_timeout");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex/Source.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex/Source.java
index 488403239f..daec4c70ea 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex/Source.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex/Source.java
@@ -32,421 +32,418 @@
 
 package org.opensearch.client.opensearch.core.reindex;
 
-import org.opensearch.client.opensearch._types.SlicedScroll;
-import org.opensearch.client.opensearch._types.SortOptions;
-import org.opensearch.client.opensearch._types.mapping.RuntimeField;
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.SlicedScroll;
+import org.opensearch.client.opensearch._types.SortOptions;
+import org.opensearch.client.opensearch._types.mapping.RuntimeField;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.reindex.Source
 
-
 @JsonpDeserializable
 public class Source implements JsonpSerializable {
-	private final List<String> index;
-
-	@Nullable
-	private final Query query;
-
-	@Nullable
-	private final RemoteSource remote;
-
-	@Nullable
-	private final Integer size;
-
-	@Nullable
-	private final SlicedScroll slice;
-
-	private final List<SortOptions> sort;
-
-	private final List<String> sourceFields;
-
-	private final Map<String, RuntimeField> runtimeMappings;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Source(Builder builder) {
-
-		this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
-		this.query = builder.query;
-		this.remote = builder.remote;
-		this.size = builder.size;
-		this.slice = builder.slice;
-		this.sort = ApiTypeHelper.unmodifiable(builder.sort);
-		this.sourceFields = ApiTypeHelper.unmodifiable(builder.sourceFields);
-		this.runtimeMappings = ApiTypeHelper.unmodifiable(builder.runtimeMappings);
-
-	}
-
-	public static Source of(Function<Builder, ObjectBuilder<Source>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code query}
-	 */
-	@Nullable
-	public final Query query() {
-		return this.query;
-	}
-
-	/**
-	 * API name: {@code remote}
-	 */
-	@Nullable
-	public final RemoteSource remote() {
-		return this.remote;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	/**
-	 * API name: {@code slice}
-	 */
-	@Nullable
-	public final SlicedScroll slice() {
-		return this.slice;
-	}
-
-	/**
-	 * API name: {@code sort}
-	 */
-	public final List<SortOptions> sort() {
-		return this.sort;
-	}
-
-	/**
-	 * API name: {@code _source}
-	 */
-	public final List<String> sourceFields() {
-		return this.sourceFields;
-	}
-
-	/**
-	 * API name: {@code runtime_mappings}
-	 */
-	public final Map<String, RuntimeField> runtimeMappings() {
-		return this.runtimeMappings;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.index)) {
-			generator.writeKey("index");
-			generator.writeStartArray();
-			for (String item0 : this.index) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.query != null) {
-			generator.writeKey("query");
-			this.query.serialize(generator, mapper);
-
-		}
-		if (this.remote != null) {
-			generator.writeKey("remote");
-			this.remote.serialize(generator, mapper);
-
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		if (this.slice != null) {
-			generator.writeKey("slice");
-			this.slice.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.sort)) {
-			generator.writeKey("sort");
-			generator.writeStartArray();
-			for (SortOptions item0 : this.sort) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.sourceFields)) {
-			generator.writeKey("_source");
-			generator.writeStartArray();
-			for (String item0 : this.sourceFields) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.runtimeMappings)) {
-			generator.writeKey("runtime_mappings");
-			generator.writeStartObject();
-			for (Map.Entry<String, RuntimeField> item0 : this.runtimeMappings.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Source}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Source> {
-		private List<String> index;
-
-		@Nullable
-		private Query query;
-
-		@Nullable
-		private RemoteSource remote;
-
-		@Nullable
-		private Integer size;
-
-		@Nullable
-		private SlicedScroll slice;
-
-		@Nullable
-		private List<SortOptions> sort;
-
-		@Nullable
-		private List<String> sourceFields;
-
-		@Nullable
-		private Map<String, RuntimeField> runtimeMappings;
-
-		/**
-		 * Required - API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code query}
-		 */
-		public final Builder query(@Nullable Query value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code query}
-		 */
-		public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.query(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code remote}
-		 */
-		public final Builder remote(@Nullable RemoteSource value) {
-			this.remote = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code remote}
-		 */
-		public final Builder remote(Function<RemoteSource.Builder, ObjectBuilder<RemoteSource>> fn) {
-			return this.remote(fn.apply(new RemoteSource.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Integer value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code slice}
-		 */
-		public final Builder slice(@Nullable SlicedScroll value) {
-			this.slice = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code slice}
-		 */
-		public final Builder slice(Function<SlicedScroll.Builder, ObjectBuilder<SlicedScroll>> fn) {
-			return this.slice(fn.apply(new SlicedScroll.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sort</code>.
-		 */
-		public final Builder sort(List<SortOptions> list) {
-			this.sort = _listAddAll(this.sort, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds one or more values to <code>sort</code>.
-		 */
-		public final Builder sort(SortOptions value, SortOptions... values) {
-			this.sort = _listAdd(this.sort, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds a value to <code>sort</code> using a builder lambda.
-		 */
-		public final Builder sort(Function<SortOptions.Builder, ObjectBuilder<SortOptions>> fn) {
-			return sort(fn.apply(new SortOptions.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code _source}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sourceFields</code>.
-		 */
-		public final Builder sourceFields(List<String> list) {
-			this.sourceFields = _listAddAll(this.sourceFields, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code _source}
-		 * <p>
-		 * Adds one or more values to <code>sourceFields</code>.
-		 */
-		public final Builder sourceFields(String value, String... values) {
-			this.sourceFields = _listAdd(this.sourceFields, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code runtime_mappings}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>runtimeMappings</code>.
-		 */
-		public final Builder runtimeMappings(Map<String, RuntimeField> map) {
-			this.runtimeMappings = _mapPutAll(this.runtimeMappings, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code runtime_mappings}
-		 * <p>
-		 * Adds an entry to <code>runtimeMappings</code>.
-		 */
-		public final Builder runtimeMappings(String key, RuntimeField value) {
-			this.runtimeMappings = _mapPut(this.runtimeMappings, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code runtime_mappings}
-		 * <p>
-		 * Adds an entry to <code>runtimeMappings</code> using a builder lambda.
-		 */
-		public final Builder runtimeMappings(String key,
-				Function<RuntimeField.Builder, ObjectBuilder<RuntimeField>> fn) {
-			return runtimeMappings(key, fn.apply(new RuntimeField.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link Source}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Source build() {
-			_checkSingleUse();
-
-			return new Source(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Source}
-	 */
-	public static final JsonpDeserializer<Source> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Source::setupSourceDeserializer);
-
-	protected static void setupSourceDeserializer(ObjectDeserializer<Source.Builder> op) {
-
-		op.add(Builder::index, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "index");
-		op.add(Builder::query, Query._DESERIALIZER, "query");
-		op.add(Builder::remote, RemoteSource._DESERIALIZER, "remote");
-		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
-		op.add(Builder::slice, SlicedScroll._DESERIALIZER, "slice");
-		op.add(Builder::sort, JsonpDeserializer.arrayDeserializer(SortOptions._DESERIALIZER), "sort");
-		op.add(Builder::sourceFields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"_source");
-		op.add(Builder::runtimeMappings, JsonpDeserializer.stringMapDeserializer(RuntimeField._DESERIALIZER),
-				"runtime_mappings");
-
-	}
+    private final List<String> index;
+
+    @Nullable
+    private final Query query;
+
+    @Nullable
+    private final RemoteSource remote;
+
+    @Nullable
+    private final Integer size;
+
+    @Nullable
+    private final SlicedScroll slice;
+
+    private final List<SortOptions> sort;
+
+    private final List<String> sourceFields;
+
+    private final Map<String, RuntimeField> runtimeMappings;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Source(Builder builder) {
+
+        this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
+        this.query = builder.query;
+        this.remote = builder.remote;
+        this.size = builder.size;
+        this.slice = builder.slice;
+        this.sort = ApiTypeHelper.unmodifiable(builder.sort);
+        this.sourceFields = ApiTypeHelper.unmodifiable(builder.sourceFields);
+        this.runtimeMappings = ApiTypeHelper.unmodifiable(builder.runtimeMappings);
+
+    }
+
+    public static Source of(Function<Builder, ObjectBuilder<Source>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code query}
+     */
+    @Nullable
+    public final Query query() {
+        return this.query;
+    }
+
+    /**
+     * API name: {@code remote}
+     */
+    @Nullable
+    public final RemoteSource remote() {
+        return this.remote;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    /**
+     * API name: {@code slice}
+     */
+    @Nullable
+    public final SlicedScroll slice() {
+        return this.slice;
+    }
+
+    /**
+     * API name: {@code sort}
+     */
+    public final List<SortOptions> sort() {
+        return this.sort;
+    }
+
+    /**
+     * API name: {@code _source}
+     */
+    public final List<String> sourceFields() {
+        return this.sourceFields;
+    }
+
+    /**
+     * API name: {@code runtime_mappings}
+     */
+    public final Map<String, RuntimeField> runtimeMappings() {
+        return this.runtimeMappings;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.index)) {
+            generator.writeKey("index");
+            generator.writeStartArray();
+            for (String item0 : this.index) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.query != null) {
+            generator.writeKey("query");
+            this.query.serialize(generator, mapper);
+
+        }
+        if (this.remote != null) {
+            generator.writeKey("remote");
+            this.remote.serialize(generator, mapper);
+
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        if (this.slice != null) {
+            generator.writeKey("slice");
+            this.slice.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.sort)) {
+            generator.writeKey("sort");
+            generator.writeStartArray();
+            for (SortOptions item0 : this.sort) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.sourceFields)) {
+            generator.writeKey("_source");
+            generator.writeStartArray();
+            for (String item0 : this.sourceFields) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.runtimeMappings)) {
+            generator.writeKey("runtime_mappings");
+            generator.writeStartObject();
+            for (Map.Entry<String, RuntimeField> item0 : this.runtimeMappings.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Source}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Source> {
+        private List<String> index;
+
+        @Nullable
+        private Query query;
+
+        @Nullable
+        private RemoteSource remote;
+
+        @Nullable
+        private Integer size;
+
+        @Nullable
+        private SlicedScroll slice;
+
+        @Nullable
+        private List<SortOptions> sort;
+
+        @Nullable
+        private List<String> sourceFields;
+
+        @Nullable
+        private Map<String, RuntimeField> runtimeMappings;
+
+        /**
+         * Required - API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code query}
+         */
+        public final Builder query(@Nullable Query value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code query}
+         */
+        public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.query(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code remote}
+         */
+        public final Builder remote(@Nullable RemoteSource value) {
+            this.remote = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code remote}
+         */
+        public final Builder remote(Function<RemoteSource.Builder, ObjectBuilder<RemoteSource>> fn) {
+            return this.remote(fn.apply(new RemoteSource.Builder()).build());
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Integer value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code slice}
+         */
+        public final Builder slice(@Nullable SlicedScroll value) {
+            this.slice = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code slice}
+         */
+        public final Builder slice(Function<SlicedScroll.Builder, ObjectBuilder<SlicedScroll>> fn) {
+            return this.slice(fn.apply(new SlicedScroll.Builder()).build());
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sort</code>.
+         */
+        public final Builder sort(List<SortOptions> list) {
+            this.sort = _listAddAll(this.sort, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds one or more values to <code>sort</code>.
+         */
+        public final Builder sort(SortOptions value, SortOptions... values) {
+            this.sort = _listAdd(this.sort, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds a value to <code>sort</code> using a builder lambda.
+         */
+        public final Builder sort(Function<SortOptions.Builder, ObjectBuilder<SortOptions>> fn) {
+            return sort(fn.apply(new SortOptions.Builder()).build());
+        }
+
+        /**
+         * API name: {@code _source}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sourceFields</code>.
+         */
+        public final Builder sourceFields(List<String> list) {
+            this.sourceFields = _listAddAll(this.sourceFields, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code _source}
+         * <p>
+         * Adds one or more values to <code>sourceFields</code>.
+         */
+        public final Builder sourceFields(String value, String... values) {
+            this.sourceFields = _listAdd(this.sourceFields, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code runtime_mappings}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>runtimeMappings</code>.
+         */
+        public final Builder runtimeMappings(Map<String, RuntimeField> map) {
+            this.runtimeMappings = _mapPutAll(this.runtimeMappings, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code runtime_mappings}
+         * <p>
+         * Adds an entry to <code>runtimeMappings</code>.
+         */
+        public final Builder runtimeMappings(String key, RuntimeField value) {
+            this.runtimeMappings = _mapPut(this.runtimeMappings, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code runtime_mappings}
+         * <p>
+         * Adds an entry to <code>runtimeMappings</code> using a builder lambda.
+         */
+        public final Builder runtimeMappings(String key, Function<RuntimeField.Builder, ObjectBuilder<RuntimeField>> fn) {
+            return runtimeMappings(key, fn.apply(new RuntimeField.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link Source}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Source build() {
+            _checkSingleUse();
+
+            return new Source(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Source}
+     */
+    public static final JsonpDeserializer<Source> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Source::setupSourceDeserializer
+    );
+
+    protected static void setupSourceDeserializer(ObjectDeserializer<Source.Builder> op) {
+
+        op.add(Builder::index, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "index");
+        op.add(Builder::query, Query._DESERIALIZER, "query");
+        op.add(Builder::remote, RemoteSource._DESERIALIZER, "remote");
+        op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
+        op.add(Builder::slice, SlicedScroll._DESERIALIZER, "slice");
+        op.add(Builder::sort, JsonpDeserializer.arrayDeserializer(SortOptions._DESERIALIZER), "sort");
+        op.add(Builder::sourceFields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "_source");
+        op.add(Builder::runtimeMappings, JsonpDeserializer.stringMapDeserializer(RuntimeField._DESERIALIZER), "runtime_mappings");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex_rethrottle/ReindexNode.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex_rethrottle/ReindexNode.java
index 5d4f99aaf1..d2fb58f5c2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex_rethrottle/ReindexNode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex_rethrottle/ReindexNode.java
@@ -32,130 +32,131 @@
 
 package org.opensearch.client.opensearch.core.reindex_rethrottle;
 
-import org.opensearch.client.opensearch._types.BaseNode;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.BaseNode;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _global.reindex_rethrottle.ReindexNode
 
-
 @JsonpDeserializable
 public class ReindexNode extends BaseNode {
-	private final Map<String, ReindexTask> tasks;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ReindexNode(Builder builder) {
-		super(builder);
-
-		this.tasks = ApiTypeHelper.unmodifiableRequired(builder.tasks, this, "tasks");
-
-	}
-
-	public static ReindexNode of(Function<Builder, ObjectBuilder<ReindexNode>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code tasks}
-	 */
-	public final Map<String, ReindexTask> tasks() {
-		return this.tasks;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.tasks)) {
-			generator.writeKey("tasks");
-			generator.writeStartObject();
-			for (Map.Entry<String, ReindexTask> item0 : this.tasks.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ReindexNode}.
-	 */
-
-	public static class Builder extends BaseNode.AbstractBuilder<Builder> implements ObjectBuilder<ReindexNode> {
-		private Map<String, ReindexTask> tasks;
-
-		/**
-		 * Required - API name: {@code tasks}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>tasks</code>.
-		 */
-		public final Builder tasks(Map<String, ReindexTask> map) {
-			this.tasks = _mapPutAll(this.tasks, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tasks}
-		 * <p>
-		 * Adds an entry to <code>tasks</code>.
-		 */
-		public final Builder tasks(String key, ReindexTask value) {
-			this.tasks = _mapPut(this.tasks, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tasks}
-		 * <p>
-		 * Adds an entry to <code>tasks</code> using a builder lambda.
-		 */
-		public final Builder tasks(String key, Function<ReindexTask.Builder, ObjectBuilder<ReindexTask>> fn) {
-			return tasks(key, fn.apply(new ReindexTask.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ReindexNode}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ReindexNode build() {
-			_checkSingleUse();
-
-			return new ReindexNode(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ReindexNode}
-	 */
-	public static final JsonpDeserializer<ReindexNode> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ReindexNode::setupReindexNodeDeserializer);
-
-	protected static void setupReindexNodeDeserializer(ObjectDeserializer<ReindexNode.Builder> op) {
-		BaseNode.setupBaseNodeDeserializer(op);
-		op.add(Builder::tasks, JsonpDeserializer.stringMapDeserializer(ReindexTask._DESERIALIZER), "tasks");
-
-	}
+    private final Map<String, ReindexTask> tasks;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ReindexNode(Builder builder) {
+        super(builder);
+
+        this.tasks = ApiTypeHelper.unmodifiableRequired(builder.tasks, this, "tasks");
+
+    }
+
+    public static ReindexNode of(Function<Builder, ObjectBuilder<ReindexNode>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code tasks}
+     */
+    public final Map<String, ReindexTask> tasks() {
+        return this.tasks;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.tasks)) {
+            generator.writeKey("tasks");
+            generator.writeStartObject();
+            for (Map.Entry<String, ReindexTask> item0 : this.tasks.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ReindexNode}.
+     */
+
+    public static class Builder extends BaseNode.AbstractBuilder<Builder> implements ObjectBuilder<ReindexNode> {
+        private Map<String, ReindexTask> tasks;
+
+        /**
+         * Required - API name: {@code tasks}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>tasks</code>.
+         */
+        public final Builder tasks(Map<String, ReindexTask> map) {
+            this.tasks = _mapPutAll(this.tasks, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tasks}
+         * <p>
+         * Adds an entry to <code>tasks</code>.
+         */
+        public final Builder tasks(String key, ReindexTask value) {
+            this.tasks = _mapPut(this.tasks, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tasks}
+         * <p>
+         * Adds an entry to <code>tasks</code> using a builder lambda.
+         */
+        public final Builder tasks(String key, Function<ReindexTask.Builder, ObjectBuilder<ReindexTask>> fn) {
+            return tasks(key, fn.apply(new ReindexTask.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ReindexNode}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ReindexNode build() {
+            _checkSingleUse();
+
+            return new ReindexNode(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ReindexNode}
+     */
+    public static final JsonpDeserializer<ReindexNode> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ReindexNode::setupReindexNodeDeserializer
+    );
+
+    protected static void setupReindexNodeDeserializer(ObjectDeserializer<ReindexNode.Builder> op) {
+        BaseNode.setupBaseNodeDeserializer(op);
+        op.add(Builder::tasks, JsonpDeserializer.stringMapDeserializer(ReindexTask._DESERIALIZER), "tasks");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex_rethrottle/ReindexStatus.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex_rethrottle/ReindexStatus.java
index acef8caa24..a96a09794e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex_rethrottle/ReindexStatus.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex_rethrottle/ReindexStatus.java
@@ -32,351 +32,351 @@
 
 package org.opensearch.client.opensearch.core.reindex_rethrottle;
 
-import org.opensearch.client.opensearch._types.Retries;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Retries;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.reindex_rethrottle.ReindexStatus
 
-
 @JsonpDeserializable
 public class ReindexStatus implements JsonpSerializable {
-	private final long batches;
-
-	private final long created;
-
-	private final long deleted;
-
-	private final long noops;
-
-	private final float requestsPerSecond;
-
-	private final Retries retries;
-
-	private final long throttledMillis;
-
-	private final long throttledUntilMillis;
-
-	private final long total;
-
-	private final long updated;
-
-	private final long versionConflicts;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ReindexStatus(Builder builder) {
-
-		this.batches = ApiTypeHelper.requireNonNull(builder.batches, this, "batches");
-		this.created = ApiTypeHelper.requireNonNull(builder.created, this, "created");
-		this.deleted = ApiTypeHelper.requireNonNull(builder.deleted, this, "deleted");
-		this.noops = ApiTypeHelper.requireNonNull(builder.noops, this, "noops");
-		this.requestsPerSecond = ApiTypeHelper.requireNonNull(builder.requestsPerSecond, this, "requestsPerSecond");
-		this.retries = ApiTypeHelper.requireNonNull(builder.retries, this, "retries");
-		this.throttledMillis = ApiTypeHelper.requireNonNull(builder.throttledMillis, this, "throttledMillis");
-		this.throttledUntilMillis = ApiTypeHelper.requireNonNull(builder.throttledUntilMillis, this,
-				"throttledUntilMillis");
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
-		this.updated = ApiTypeHelper.requireNonNull(builder.updated, this, "updated");
-		this.versionConflicts = ApiTypeHelper.requireNonNull(builder.versionConflicts, this, "versionConflicts");
-
-	}
-
-	public static ReindexStatus of(Function<Builder, ObjectBuilder<ReindexStatus>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code batches}
-	 */
-	public final long batches() {
-		return this.batches;
-	}
-
-	/**
-	 * Required - API name: {@code created}
-	 */
-	public final long created() {
-		return this.created;
-	}
-
-	/**
-	 * Required - API name: {@code deleted}
-	 */
-	public final long deleted() {
-		return this.deleted;
-	}
-
-	/**
-	 * Required - API name: {@code noops}
-	 */
-	public final long noops() {
-		return this.noops;
-	}
-
-	/**
-	 * Required - API name: {@code requests_per_second}
-	 */
-	public final float requestsPerSecond() {
-		return this.requestsPerSecond;
-	}
+    private final long batches;
+
+    private final long created;
+
+    private final long deleted;
+
+    private final long noops;
+
+    private final float requestsPerSecond;
+
+    private final Retries retries;
+
+    private final long throttledMillis;
+
+    private final long throttledUntilMillis;
+
+    private final long total;
+
+    private final long updated;
+
+    private final long versionConflicts;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ReindexStatus(Builder builder) {
+
+        this.batches = ApiTypeHelper.requireNonNull(builder.batches, this, "batches");
+        this.created = ApiTypeHelper.requireNonNull(builder.created, this, "created");
+        this.deleted = ApiTypeHelper.requireNonNull(builder.deleted, this, "deleted");
+        this.noops = ApiTypeHelper.requireNonNull(builder.noops, this, "noops");
+        this.requestsPerSecond = ApiTypeHelper.requireNonNull(builder.requestsPerSecond, this, "requestsPerSecond");
+        this.retries = ApiTypeHelper.requireNonNull(builder.retries, this, "retries");
+        this.throttledMillis = ApiTypeHelper.requireNonNull(builder.throttledMillis, this, "throttledMillis");
+        this.throttledUntilMillis = ApiTypeHelper.requireNonNull(builder.throttledUntilMillis, this, "throttledUntilMillis");
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+        this.updated = ApiTypeHelper.requireNonNull(builder.updated, this, "updated");
+        this.versionConflicts = ApiTypeHelper.requireNonNull(builder.versionConflicts, this, "versionConflicts");
+
+    }
+
+    public static ReindexStatus of(Function<Builder, ObjectBuilder<ReindexStatus>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code batches}
+     */
+    public final long batches() {
+        return this.batches;
+    }
+
+    /**
+     * Required - API name: {@code created}
+     */
+    public final long created() {
+        return this.created;
+    }
+
+    /**
+     * Required - API name: {@code deleted}
+     */
+    public final long deleted() {
+        return this.deleted;
+    }
+
+    /**
+     * Required - API name: {@code noops}
+     */
+    public final long noops() {
+        return this.noops;
+    }
+
+    /**
+     * Required - API name: {@code requests_per_second}
+     */
+    public final float requestsPerSecond() {
+        return this.requestsPerSecond;
+    }
+
+    /**
+     * Required - API name: {@code retries}
+     */
+    public final Retries retries() {
+        return this.retries;
+    }
 
-	/**
-	 * Required - API name: {@code retries}
-	 */
-	public final Retries retries() {
-		return this.retries;
-	}
+    /**
+     * Required - API name: {@code throttled_millis}
+     */
+    public final long throttledMillis() {
+        return this.throttledMillis;
+    }
 
-	/**
-	 * Required - API name: {@code throttled_millis}
-	 */
-	public final long throttledMillis() {
-		return this.throttledMillis;
-	}
+    /**
+     * Required - API name: {@code throttled_until_millis}
+     */
+    public final long throttledUntilMillis() {
+        return this.throttledUntilMillis;
+    }
 
-	/**
-	 * Required - API name: {@code throttled_until_millis}
-	 */
-	public final long throttledUntilMillis() {
-		return this.throttledUntilMillis;
-	}
+    /**
+     * Required - API name: {@code total}
+     */
+    public final long total() {
+        return this.total;
+    }
 
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final long total() {
-		return this.total;
-	}
+    /**
+     * Required - API name: {@code updated}
+     */
+    public final long updated() {
+        return this.updated;
+    }
 
-	/**
-	 * Required - API name: {@code updated}
-	 */
-	public final long updated() {
-		return this.updated;
-	}
-
-	/**
-	 * Required - API name: {@code version_conflicts}
-	 */
-	public final long versionConflicts() {
-		return this.versionConflicts;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("batches");
-		generator.write(this.batches);
-
-		generator.writeKey("created");
-		generator.write(this.created);
-
-		generator.writeKey("deleted");
-		generator.write(this.deleted);
-
-		generator.writeKey("noops");
-		generator.write(this.noops);
-
-		generator.writeKey("requests_per_second");
-		generator.write(this.requestsPerSecond);
-
-		generator.writeKey("retries");
-		this.retries.serialize(generator, mapper);
-
-		generator.writeKey("throttled_millis");
-		generator.write(this.throttledMillis);
-
-		generator.writeKey("throttled_until_millis");
-		generator.write(this.throttledUntilMillis);
-
-		generator.writeKey("total");
-		generator.write(this.total);
-
-		generator.writeKey("updated");
-		generator.write(this.updated);
-
-		generator.writeKey("version_conflicts");
-		generator.write(this.versionConflicts);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ReindexStatus}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ReindexStatus> {
-		private Long batches;
-
-		private Long created;
-
-		private Long deleted;
-
-		private Long noops;
-
-		private Float requestsPerSecond;
-
-		private Retries retries;
-
-		private Long throttledMillis;
-
-		private Long throttledUntilMillis;
-
-		private Long total;
-
-		private Long updated;
-
-		private Long versionConflicts;
-
-		/**
-		 * Required - API name: {@code batches}
-		 */
-		public final Builder batches(long value) {
-			this.batches = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code created}
-		 */
-		public final Builder created(long value) {
-			this.created = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code deleted}
-		 */
-		public final Builder deleted(long value) {
-			this.deleted = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code noops}
-		 */
-		public final Builder noops(long value) {
-			this.noops = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code requests_per_second}
-		 */
-		public final Builder requestsPerSecond(float value) {
-			this.requestsPerSecond = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code retries}
-		 */
-		public final Builder retries(Retries value) {
-			this.retries = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code retries}
-		 */
-		public final Builder retries(Function<Retries.Builder, ObjectBuilder<Retries>> fn) {
-			return this.retries(fn.apply(new Retries.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code throttled_millis}
-		 */
-		public final Builder throttledMillis(long value) {
-			this.throttledMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code throttled_until_millis}
-		 */
-		public final Builder throttledUntilMillis(long value) {
-			this.throttledUntilMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(long value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code updated}
-		 */
-		public final Builder updated(long value) {
-			this.updated = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code version_conflicts}
-		 */
-		public final Builder versionConflicts(long value) {
-			this.versionConflicts = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ReindexStatus}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ReindexStatus build() {
-			_checkSingleUse();
-
-			return new ReindexStatus(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ReindexStatus}
-	 */
-	public static final JsonpDeserializer<ReindexStatus> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ReindexStatus::setupReindexStatusDeserializer);
-
-	protected static void setupReindexStatusDeserializer(ObjectDeserializer<ReindexStatus.Builder> op) {
-
-		op.add(Builder::batches, JsonpDeserializer.longDeserializer(), "batches");
-		op.add(Builder::created, JsonpDeserializer.longDeserializer(), "created");
-		op.add(Builder::deleted, JsonpDeserializer.longDeserializer(), "deleted");
-		op.add(Builder::noops, JsonpDeserializer.longDeserializer(), "noops");
-		op.add(Builder::requestsPerSecond, JsonpDeserializer.floatDeserializer(), "requests_per_second");
-		op.add(Builder::retries, Retries._DESERIALIZER, "retries");
-		op.add(Builder::throttledMillis, JsonpDeserializer.longDeserializer(), "throttled_millis");
-		op.add(Builder::throttledUntilMillis, JsonpDeserializer.longDeserializer(), "throttled_until_millis");
-		op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
-		op.add(Builder::updated, JsonpDeserializer.longDeserializer(), "updated");
-		op.add(Builder::versionConflicts, JsonpDeserializer.longDeserializer(), "version_conflicts");
-
-	}
+    /**
+     * Required - API name: {@code version_conflicts}
+     */
+    public final long versionConflicts() {
+        return this.versionConflicts;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("batches");
+        generator.write(this.batches);
+
+        generator.writeKey("created");
+        generator.write(this.created);
+
+        generator.writeKey("deleted");
+        generator.write(this.deleted);
+
+        generator.writeKey("noops");
+        generator.write(this.noops);
+
+        generator.writeKey("requests_per_second");
+        generator.write(this.requestsPerSecond);
+
+        generator.writeKey("retries");
+        this.retries.serialize(generator, mapper);
+
+        generator.writeKey("throttled_millis");
+        generator.write(this.throttledMillis);
+
+        generator.writeKey("throttled_until_millis");
+        generator.write(this.throttledUntilMillis);
+
+        generator.writeKey("total");
+        generator.write(this.total);
+
+        generator.writeKey("updated");
+        generator.write(this.updated);
+
+        generator.writeKey("version_conflicts");
+        generator.write(this.versionConflicts);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ReindexStatus}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ReindexStatus> {
+        private Long batches;
+
+        private Long created;
+
+        private Long deleted;
+
+        private Long noops;
+
+        private Float requestsPerSecond;
+
+        private Retries retries;
+
+        private Long throttledMillis;
+
+        private Long throttledUntilMillis;
+
+        private Long total;
+
+        private Long updated;
+
+        private Long versionConflicts;
+
+        /**
+         * Required - API name: {@code batches}
+         */
+        public final Builder batches(long value) {
+            this.batches = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code created}
+         */
+        public final Builder created(long value) {
+            this.created = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code deleted}
+         */
+        public final Builder deleted(long value) {
+            this.deleted = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code noops}
+         */
+        public final Builder noops(long value) {
+            this.noops = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code requests_per_second}
+         */
+        public final Builder requestsPerSecond(float value) {
+            this.requestsPerSecond = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code retries}
+         */
+        public final Builder retries(Retries value) {
+            this.retries = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code retries}
+         */
+        public final Builder retries(Function<Retries.Builder, ObjectBuilder<Retries>> fn) {
+            return this.retries(fn.apply(new Retries.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code throttled_millis}
+         */
+        public final Builder throttledMillis(long value) {
+            this.throttledMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code throttled_until_millis}
+         */
+        public final Builder throttledUntilMillis(long value) {
+            this.throttledUntilMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(long value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code updated}
+         */
+        public final Builder updated(long value) {
+            this.updated = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code version_conflicts}
+         */
+        public final Builder versionConflicts(long value) {
+            this.versionConflicts = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ReindexStatus}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ReindexStatus build() {
+            _checkSingleUse();
+
+            return new ReindexStatus(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ReindexStatus}
+     */
+    public static final JsonpDeserializer<ReindexStatus> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ReindexStatus::setupReindexStatusDeserializer
+    );
+
+    protected static void setupReindexStatusDeserializer(ObjectDeserializer<ReindexStatus.Builder> op) {
+
+        op.add(Builder::batches, JsonpDeserializer.longDeserializer(), "batches");
+        op.add(Builder::created, JsonpDeserializer.longDeserializer(), "created");
+        op.add(Builder::deleted, JsonpDeserializer.longDeserializer(), "deleted");
+        op.add(Builder::noops, JsonpDeserializer.longDeserializer(), "noops");
+        op.add(Builder::requestsPerSecond, JsonpDeserializer.floatDeserializer(), "requests_per_second");
+        op.add(Builder::retries, Retries._DESERIALIZER, "retries");
+        op.add(Builder::throttledMillis, JsonpDeserializer.longDeserializer(), "throttled_millis");
+        op.add(Builder::throttledUntilMillis, JsonpDeserializer.longDeserializer(), "throttled_until_millis");
+        op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
+        op.add(Builder::updated, JsonpDeserializer.longDeserializer(), "updated");
+        op.add(Builder::versionConflicts, JsonpDeserializer.longDeserializer(), "version_conflicts");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex_rethrottle/ReindexTask.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex_rethrottle/ReindexTask.java
index a360ec90aa..4b3f4b44af 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex_rethrottle/ReindexTask.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/reindex_rethrottle/ReindexTask.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core.reindex_rethrottle;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,347 +45,347 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _global.reindex_rethrottle.ReindexTask
 
-
 @JsonpDeserializable
 public class ReindexTask implements JsonpSerializable {
-	private final String action;
-
-	private final boolean cancellable;
-
-	private final String description;
-
-	private final long id;
-
-	private final String node;
-
-	private final long runningTimeInNanos;
-
-	private final long startTimeInMillis;
-
-	private final ReindexStatus status;
-
-	private final String type;
-
-	private final Map<String, List<String>> headers;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ReindexTask(Builder builder) {
-
-		this.action = ApiTypeHelper.requireNonNull(builder.action, this, "action");
-		this.cancellable = ApiTypeHelper.requireNonNull(builder.cancellable, this, "cancellable");
-		this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
-		this.runningTimeInNanos = ApiTypeHelper.requireNonNull(builder.runningTimeInNanos, this, "runningTimeInNanos");
-		this.startTimeInMillis = ApiTypeHelper.requireNonNull(builder.startTimeInMillis, this, "startTimeInMillis");
-		this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-		this.headers = ApiTypeHelper.unmodifiableRequired(builder.headers, this, "headers");
-
-	}
-
-	public static ReindexTask of(Function<Builder, ObjectBuilder<ReindexTask>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code action}
-	 */
-	public final String action() {
-		return this.action;
-	}
-
-	/**
-	 * Required - API name: {@code cancellable}
-	 */
-	public final boolean cancellable() {
-		return this.cancellable;
-	}
-
-	/**
-	 * Required - API name: {@code description}
-	 */
-	public final String description() {
-		return this.description;
-	}
-
-	/**
-	 * Required - API name: {@code id}
-	 */
-	public final long id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - API name: {@code node}
-	 */
-	public final String node() {
-		return this.node;
-	}
-
-	/**
-	 * Required - API name: {@code running_time_in_nanos}
-	 */
-	public final long runningTimeInNanos() {
-		return this.runningTimeInNanos;
-	}
+    private final String action;
+
+    private final boolean cancellable;
+
+    private final String description;
+
+    private final long id;
+
+    private final String node;
+
+    private final long runningTimeInNanos;
+
+    private final long startTimeInMillis;
+
+    private final ReindexStatus status;
+
+    private final String type;
+
+    private final Map<String, List<String>> headers;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ReindexTask(Builder builder) {
+
+        this.action = ApiTypeHelper.requireNonNull(builder.action, this, "action");
+        this.cancellable = ApiTypeHelper.requireNonNull(builder.cancellable, this, "cancellable");
+        this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
+        this.runningTimeInNanos = ApiTypeHelper.requireNonNull(builder.runningTimeInNanos, this, "runningTimeInNanos");
+        this.startTimeInMillis = ApiTypeHelper.requireNonNull(builder.startTimeInMillis, this, "startTimeInMillis");
+        this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.headers = ApiTypeHelper.unmodifiableRequired(builder.headers, this, "headers");
+
+    }
+
+    public static ReindexTask of(Function<Builder, ObjectBuilder<ReindexTask>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code action}
+     */
+    public final String action() {
+        return this.action;
+    }
+
+    /**
+     * Required - API name: {@code cancellable}
+     */
+    public final boolean cancellable() {
+        return this.cancellable;
+    }
+
+    /**
+     * Required - API name: {@code description}
+     */
+    public final String description() {
+        return this.description;
+    }
+
+    /**
+     * Required - API name: {@code id}
+     */
+    public final long id() {
+        return this.id;
+    }
+
+    /**
+     * Required - API name: {@code node}
+     */
+    public final String node() {
+        return this.node;
+    }
+
+    /**
+     * Required - API name: {@code running_time_in_nanos}
+     */
+    public final long runningTimeInNanos() {
+        return this.runningTimeInNanos;
+    }
 
-	/**
-	 * Required - API name: {@code start_time_in_millis}
-	 */
-	public final long startTimeInMillis() {
-		return this.startTimeInMillis;
-	}
+    /**
+     * Required - API name: {@code start_time_in_millis}
+     */
+    public final long startTimeInMillis() {
+        return this.startTimeInMillis;
+    }
 
-	/**
-	 * Required - API name: {@code status}
-	 */
-	public final ReindexStatus status() {
-		return this.status;
-	}
+    /**
+     * Required - API name: {@code status}
+     */
+    public final ReindexStatus status() {
+        return this.status;
+    }
 
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
 
-	/**
-	 * Required - API name: {@code headers}
-	 */
-	public final Map<String, List<String>> headers() {
-		return this.headers;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("action");
-		generator.write(this.action);
-
-		generator.writeKey("cancellable");
-		generator.write(this.cancellable);
-
-		generator.writeKey("description");
-		generator.write(this.description);
-
-		generator.writeKey("id");
-		generator.write(this.id);
-
-		generator.writeKey("node");
-		generator.write(this.node);
-
-		generator.writeKey("running_time_in_nanos");
-		generator.write(this.runningTimeInNanos);
-
-		generator.writeKey("start_time_in_millis");
-		generator.write(this.startTimeInMillis);
-
-		generator.writeKey("status");
-		this.status.serialize(generator, mapper);
-
-		generator.writeKey("type");
-		generator.write(this.type);
-
-		if (ApiTypeHelper.isDefined(this.headers)) {
-			generator.writeKey("headers");
-			generator.writeStartObject();
-			for (Map.Entry<String, List<String>> item0 : this.headers.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.writeStartArray();
-				if (item0.getValue() != null) {
-					for (String item1 : item0.getValue()) {
-						generator.write(item1);
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ReindexTask}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ReindexTask> {
-		private String action;
-
-		private Boolean cancellable;
-
-		private String description;
-
-		private Long id;
-
-		private String node;
-
-		private Long runningTimeInNanos;
-
-		private Long startTimeInMillis;
-
-		private ReindexStatus status;
-
-		private String type;
-
-		private Map<String, List<String>> headers;
-
-		/**
-		 * Required - API name: {@code action}
-		 */
-		public final Builder action(String value) {
-			this.action = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code cancellable}
-		 */
-		public final Builder cancellable(boolean value) {
-			this.cancellable = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code description}
-		 */
-		public final Builder description(String value) {
-			this.description = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code id}
-		 */
-		public final Builder id(long value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code node}
-		 */
-		public final Builder node(String value) {
-			this.node = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code running_time_in_nanos}
-		 */
-		public final Builder runningTimeInNanos(long value) {
-			this.runningTimeInNanos = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code start_time_in_millis}
-		 */
-		public final Builder startTimeInMillis(long value) {
-			this.startTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code status}
-		 */
-		public final Builder status(ReindexStatus value) {
-			this.status = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code status}
-		 */
-		public final Builder status(Function<ReindexStatus.Builder, ObjectBuilder<ReindexStatus>> fn) {
-			return this.status(fn.apply(new ReindexStatus.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code headers}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>headers</code>.
-		 */
-		public final Builder headers(Map<String, List<String>> map) {
-			this.headers = _mapPutAll(this.headers, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code headers}
-		 * <p>
-		 * Adds an entry to <code>headers</code>.
-		 */
-		public final Builder headers(String key, List<String> value) {
-			this.headers = _mapPut(this.headers, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ReindexTask}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ReindexTask build() {
-			_checkSingleUse();
-
-			return new ReindexTask(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ReindexTask}
-	 */
-	public static final JsonpDeserializer<ReindexTask> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ReindexTask::setupReindexTaskDeserializer);
-
-	protected static void setupReindexTaskDeserializer(ObjectDeserializer<ReindexTask.Builder> op) {
-
-		op.add(Builder::action, JsonpDeserializer.stringDeserializer(), "action");
-		op.add(Builder::cancellable, JsonpDeserializer.booleanDeserializer(), "cancellable");
-		op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
-		op.add(Builder::id, JsonpDeserializer.longDeserializer(), "id");
-		op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
-		op.add(Builder::runningTimeInNanos, JsonpDeserializer.longDeserializer(), "running_time_in_nanos");
-		op.add(Builder::startTimeInMillis, JsonpDeserializer.longDeserializer(), "start_time_in_millis");
-		op.add(Builder::status, ReindexStatus._DESERIALIZER, "status");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-		op.add(Builder::headers, JsonpDeserializer.stringMapDeserializer(
-				JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer())), "headers");
-
-	}
+    /**
+     * Required - API name: {@code headers}
+     */
+    public final Map<String, List<String>> headers() {
+        return this.headers;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("action");
+        generator.write(this.action);
+
+        generator.writeKey("cancellable");
+        generator.write(this.cancellable);
+
+        generator.writeKey("description");
+        generator.write(this.description);
+
+        generator.writeKey("id");
+        generator.write(this.id);
+
+        generator.writeKey("node");
+        generator.write(this.node);
+
+        generator.writeKey("running_time_in_nanos");
+        generator.write(this.runningTimeInNanos);
+
+        generator.writeKey("start_time_in_millis");
+        generator.write(this.startTimeInMillis);
+
+        generator.writeKey("status");
+        this.status.serialize(generator, mapper);
+
+        generator.writeKey("type");
+        generator.write(this.type);
+
+        if (ApiTypeHelper.isDefined(this.headers)) {
+            generator.writeKey("headers");
+            generator.writeStartObject();
+            for (Map.Entry<String, List<String>> item0 : this.headers.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.writeStartArray();
+                if (item0.getValue() != null) {
+                    for (String item1 : item0.getValue()) {
+                        generator.write(item1);
+
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ReindexTask}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ReindexTask> {
+        private String action;
+
+        private Boolean cancellable;
+
+        private String description;
+
+        private Long id;
+
+        private String node;
+
+        private Long runningTimeInNanos;
+
+        private Long startTimeInMillis;
+
+        private ReindexStatus status;
+
+        private String type;
+
+        private Map<String, List<String>> headers;
+
+        /**
+         * Required - API name: {@code action}
+         */
+        public final Builder action(String value) {
+            this.action = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code cancellable}
+         */
+        public final Builder cancellable(boolean value) {
+            this.cancellable = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code description}
+         */
+        public final Builder description(String value) {
+            this.description = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code id}
+         */
+        public final Builder id(long value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code node}
+         */
+        public final Builder node(String value) {
+            this.node = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code running_time_in_nanos}
+         */
+        public final Builder runningTimeInNanos(long value) {
+            this.runningTimeInNanos = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code start_time_in_millis}
+         */
+        public final Builder startTimeInMillis(long value) {
+            this.startTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code status}
+         */
+        public final Builder status(ReindexStatus value) {
+            this.status = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code status}
+         */
+        public final Builder status(Function<ReindexStatus.Builder, ObjectBuilder<ReindexStatus>> fn) {
+            return this.status(fn.apply(new ReindexStatus.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code headers}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>headers</code>.
+         */
+        public final Builder headers(Map<String, List<String>> map) {
+            this.headers = _mapPutAll(this.headers, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code headers}
+         * <p>
+         * Adds an entry to <code>headers</code>.
+         */
+        public final Builder headers(String key, List<String> value) {
+            this.headers = _mapPut(this.headers, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link ReindexTask}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ReindexTask build() {
+            _checkSingleUse();
+
+            return new ReindexTask(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ReindexTask}
+     */
+    public static final JsonpDeserializer<ReindexTask> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ReindexTask::setupReindexTaskDeserializer
+    );
+
+    protected static void setupReindexTaskDeserializer(ObjectDeserializer<ReindexTask.Builder> op) {
+
+        op.add(Builder::action, JsonpDeserializer.stringDeserializer(), "action");
+        op.add(Builder::cancellable, JsonpDeserializer.booleanDeserializer(), "cancellable");
+        op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
+        op.add(Builder::id, JsonpDeserializer.longDeserializer(), "id");
+        op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
+        op.add(Builder::runningTimeInNanos, JsonpDeserializer.longDeserializer(), "running_time_in_nanos");
+        op.add(Builder::startTimeInMillis, JsonpDeserializer.longDeserializer(), "start_time_in_millis");
+        op.add(Builder::status, ReindexStatus._DESERIALIZER, "status");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+        op.add(
+            Builder::headers,
+            JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer())),
+            "headers"
+        );
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/scripts_painless_execute/PainlessContextSetup.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/scripts_painless_execute/PainlessContextSetup.java
index 2a2a20f4fe..c82ff76620 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/scripts_painless_execute/PainlessContextSetup.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/scripts_painless_execute/PainlessContextSetup.java
@@ -32,7 +32,8 @@
 
 package org.opensearch.client.opensearch.core.scripts_painless_execute;
 
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,150 +41,151 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.scripts_painless_execute.PainlessContextSetup
 
 @JsonpDeserializable
 public class PainlessContextSetup implements JsonpSerializable {
-	private final JsonData document;
+    private final JsonData document;
 
-	private final String index;
-
-	private final Query query;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PainlessContextSetup(Builder builder) {
-
-		this.document = ApiTypeHelper.requireNonNull(builder.document, this, "document");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-
-	}
-
-	public static PainlessContextSetup of(Function<Builder, ObjectBuilder<PainlessContextSetup>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code document}
-	 */
-	public final JsonData document() {
-		return this.document;
-	}
-
-	/**
-	 * Required - API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final Query query() {
-		return this.query;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("document");
-		this.document.serialize(generator, mapper);
-
-		generator.writeKey("index");
-		generator.write(this.index);
-
-		generator.writeKey("query");
-		this.query.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PainlessContextSetup}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PainlessContextSetup> {
-		private JsonData document;
-
-		private String index;
-
-		private Query query;
-
-		/**
-		 * Required - API name: {@code document}
-		 */
-		public final Builder document(JsonData value) {
-			this.document = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(Query value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.query(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link PainlessContextSetup}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PainlessContextSetup build() {
-			_checkSingleUse();
-
-			return new PainlessContextSetup(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PainlessContextSetup}
-	 */
-	public static final JsonpDeserializer<PainlessContextSetup> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PainlessContextSetup::setupPainlessContextSetupDeserializer);
-
-	protected static void setupPainlessContextSetupDeserializer(ObjectDeserializer<PainlessContextSetup.Builder> op) {
-
-		op.add(Builder::document, JsonData._DESERIALIZER, "document");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::query, Query._DESERIALIZER, "query");
-
-	}
+    private final String index;
+
+    private final Query query;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PainlessContextSetup(Builder builder) {
+
+        this.document = ApiTypeHelper.requireNonNull(builder.document, this, "document");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+
+    }
+
+    public static PainlessContextSetup of(Function<Builder, ObjectBuilder<PainlessContextSetup>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code document}
+     */
+    public final JsonData document() {
+        return this.document;
+    }
+
+    /**
+     * Required - API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final Query query() {
+        return this.query;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("document");
+        this.document.serialize(generator, mapper);
+
+        generator.writeKey("index");
+        generator.write(this.index);
+
+        generator.writeKey("query");
+        this.query.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PainlessContextSetup}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PainlessContextSetup> {
+        private JsonData document;
+
+        private String index;
+
+        private Query query;
+
+        /**
+         * Required - API name: {@code document}
+         */
+        public final Builder document(JsonData value) {
+            this.document = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(Query value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.query(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link PainlessContextSetup}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PainlessContextSetup build() {
+            _checkSingleUse();
+
+            return new PainlessContextSetup(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PainlessContextSetup}
+     */
+    public static final JsonpDeserializer<PainlessContextSetup> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PainlessContextSetup::setupPainlessContextSetupDeserializer
+    );
+
+    protected static void setupPainlessContextSetupDeserializer(ObjectDeserializer<PainlessContextSetup.Builder> op) {
+
+        op.add(Builder::document, JsonData._DESERIALIZER, "document");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::query, Query._DESERIALIZER, "query");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationBreakdown.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationBreakdown.java
index 4d28fbec19..125b84176d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationBreakdown.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationBreakdown.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,370 +44,366 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.AggregationBreakdown
 
-
 @JsonpDeserializable
 public class AggregationBreakdown implements JsonpSerializable {
-	private final long buildAggregation;
-
-	private final long buildAggregationCount;
-
-	private final long buildLeafCollector;
-
-	private final long buildLeafCollectorCount;
-
-	private final long collect;
-
-	private final long collectCount;
-
-	private final long initialize;
-
-	private final long initializeCount;
-
-	@Nullable
-	private final Long postCollection;
-
-	@Nullable
-	private final Long postCollectionCount;
-
-	private final long reduce;
-
-	private final long reduceCount;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AggregationBreakdown(Builder builder) {
-
-		this.buildAggregation = ApiTypeHelper.requireNonNull(builder.buildAggregation, this, "buildAggregation");
-		this.buildAggregationCount = ApiTypeHelper.requireNonNull(builder.buildAggregationCount, this,
-				"buildAggregationCount");
-		this.buildLeafCollector = ApiTypeHelper.requireNonNull(builder.buildLeafCollector, this, "buildLeafCollector");
-		this.buildLeafCollectorCount = ApiTypeHelper.requireNonNull(builder.buildLeafCollectorCount, this,
-				"buildLeafCollectorCount");
-		this.collect = ApiTypeHelper.requireNonNull(builder.collect, this, "collect");
-		this.collectCount = ApiTypeHelper.requireNonNull(builder.collectCount, this, "collectCount");
-		this.initialize = ApiTypeHelper.requireNonNull(builder.initialize, this, "initialize");
-		this.initializeCount = ApiTypeHelper.requireNonNull(builder.initializeCount, this, "initializeCount");
-		this.postCollection = builder.postCollection;
-		this.postCollectionCount = builder.postCollectionCount;
-		this.reduce = ApiTypeHelper.requireNonNull(builder.reduce, this, "reduce");
-		this.reduceCount = ApiTypeHelper.requireNonNull(builder.reduceCount, this, "reduceCount");
-
-	}
-
-	public static AggregationBreakdown of(Function<Builder, ObjectBuilder<AggregationBreakdown>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code build_aggregation}
-	 */
-	public final long buildAggregation() {
-		return this.buildAggregation;
-	}
-
-	/**
-	 * Required - API name: {@code build_aggregation_count}
-	 */
-	public final long buildAggregationCount() {
-		return this.buildAggregationCount;
-	}
-
-	/**
-	 * Required - API name: {@code build_leaf_collector}
-	 */
-	public final long buildLeafCollector() {
-		return this.buildLeafCollector;
-	}
-
-	/**
-	 * Required - API name: {@code build_leaf_collector_count}
-	 */
-	public final long buildLeafCollectorCount() {
-		return this.buildLeafCollectorCount;
-	}
-
-	/**
-	 * Required - API name: {@code collect}
-	 */
-	public final long collect() {
-		return this.collect;
-	}
-
-	/**
-	 * Required - API name: {@code collect_count}
-	 */
-	public final long collectCount() {
-		return this.collectCount;
-	}
-
-	/**
-	 * Required - API name: {@code initialize}
-	 */
-	public final long initialize() {
-		return this.initialize;
-	}
-
-	/**
-	 * Required - API name: {@code initialize_count}
-	 */
-	public final long initializeCount() {
-		return this.initializeCount;
-	}
-
-	/**
-	 * API name: {@code post_collection}
-	 */
-	@Nullable
-	public final Long postCollection() {
-		return this.postCollection;
-	}
-
-	/**
-	 * API name: {@code post_collection_count}
-	 */
-	@Nullable
-	public final Long postCollectionCount() {
-		return this.postCollectionCount;
-	}
-
-	/**
-	 * Required - API name: {@code reduce}
-	 */
-	public final long reduce() {
-		return this.reduce;
-	}
-
-	/**
-	 * Required - API name: {@code reduce_count}
-	 */
-	public final long reduceCount() {
-		return this.reduceCount;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("build_aggregation");
-		generator.write(this.buildAggregation);
-
-		generator.writeKey("build_aggregation_count");
-		generator.write(this.buildAggregationCount);
-
-		generator.writeKey("build_leaf_collector");
-		generator.write(this.buildLeafCollector);
-
-		generator.writeKey("build_leaf_collector_count");
-		generator.write(this.buildLeafCollectorCount);
-
-		generator.writeKey("collect");
-		generator.write(this.collect);
-
-		generator.writeKey("collect_count");
-		generator.write(this.collectCount);
-
-		generator.writeKey("initialize");
-		generator.write(this.initialize);
-
-		generator.writeKey("initialize_count");
-		generator.write(this.initializeCount);
-
-		if (this.postCollection != null) {
-			generator.writeKey("post_collection");
-			generator.write(this.postCollection);
-
-		}
-		if (this.postCollectionCount != null) {
-			generator.writeKey("post_collection_count");
-			generator.write(this.postCollectionCount);
-
-		}
-		generator.writeKey("reduce");
-		generator.write(this.reduce);
-
-		generator.writeKey("reduce_count");
-		generator.write(this.reduceCount);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AggregationBreakdown}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AggregationBreakdown> {
-		private Long buildAggregation;
-
-		private Long buildAggregationCount;
-
-		private Long buildLeafCollector;
-
-		private Long buildLeafCollectorCount;
-
-		private Long collect;
-
-		private Long collectCount;
-
-		private Long initialize;
-
-		private Long initializeCount;
-
-		@Nullable
-		private Long postCollection;
-
-		@Nullable
-		private Long postCollectionCount;
-
-		private Long reduce;
-
-		private Long reduceCount;
-
-		/**
-		 * Required - API name: {@code build_aggregation}
-		 */
-		public final Builder buildAggregation(long value) {
-			this.buildAggregation = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code build_aggregation_count}
-		 */
-		public final Builder buildAggregationCount(long value) {
-			this.buildAggregationCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code build_leaf_collector}
-		 */
-		public final Builder buildLeafCollector(long value) {
-			this.buildLeafCollector = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code build_leaf_collector_count}
-		 */
-		public final Builder buildLeafCollectorCount(long value) {
-			this.buildLeafCollectorCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code collect}
-		 */
-		public final Builder collect(long value) {
-			this.collect = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code collect_count}
-		 */
-		public final Builder collectCount(long value) {
-			this.collectCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code initialize}
-		 */
-		public final Builder initialize(long value) {
-			this.initialize = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code initialize_count}
-		 */
-		public final Builder initializeCount(long value) {
-			this.initializeCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code post_collection}
-		 */
-		public final Builder postCollection(@Nullable Long value) {
-			this.postCollection = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code post_collection_count}
-		 */
-		public final Builder postCollectionCount(@Nullable Long value) {
-			this.postCollectionCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code reduce}
-		 */
-		public final Builder reduce(long value) {
-			this.reduce = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code reduce_count}
-		 */
-		public final Builder reduceCount(long value) {
-			this.reduceCount = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AggregationBreakdown}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AggregationBreakdown build() {
-			_checkSingleUse();
-
-			return new AggregationBreakdown(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AggregationBreakdown}
-	 */
-	public static final JsonpDeserializer<AggregationBreakdown> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, AggregationBreakdown::setupAggregationBreakdownDeserializer);
-
-	protected static void setupAggregationBreakdownDeserializer(ObjectDeserializer<AggregationBreakdown.Builder> op) {
-
-		op.add(Builder::buildAggregation, JsonpDeserializer.longDeserializer(), "build_aggregation");
-		op.add(Builder::buildAggregationCount, JsonpDeserializer.longDeserializer(), "build_aggregation_count");
-		op.add(Builder::buildLeafCollector, JsonpDeserializer.longDeserializer(), "build_leaf_collector");
-		op.add(Builder::buildLeafCollectorCount, JsonpDeserializer.longDeserializer(), "build_leaf_collector_count");
-		op.add(Builder::collect, JsonpDeserializer.longDeserializer(), "collect");
-		op.add(Builder::collectCount, JsonpDeserializer.longDeserializer(), "collect_count");
-		op.add(Builder::initialize, JsonpDeserializer.longDeserializer(), "initialize");
-		op.add(Builder::initializeCount, JsonpDeserializer.longDeserializer(), "initialize_count");
-		op.add(Builder::postCollection, JsonpDeserializer.longDeserializer(), "post_collection");
-		op.add(Builder::postCollectionCount, JsonpDeserializer.longDeserializer(), "post_collection_count");
-		op.add(Builder::reduce, JsonpDeserializer.longDeserializer(), "reduce");
-		op.add(Builder::reduceCount, JsonpDeserializer.longDeserializer(), "reduce_count");
-
-	}
+    private final long buildAggregation;
+
+    private final long buildAggregationCount;
+
+    private final long buildLeafCollector;
+
+    private final long buildLeafCollectorCount;
+
+    private final long collect;
+
+    private final long collectCount;
+
+    private final long initialize;
+
+    private final long initializeCount;
+
+    @Nullable
+    private final Long postCollection;
+
+    @Nullable
+    private final Long postCollectionCount;
+
+    private final long reduce;
+
+    private final long reduceCount;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AggregationBreakdown(Builder builder) {
+
+        this.buildAggregation = ApiTypeHelper.requireNonNull(builder.buildAggregation, this, "buildAggregation");
+        this.buildAggregationCount = ApiTypeHelper.requireNonNull(builder.buildAggregationCount, this, "buildAggregationCount");
+        this.buildLeafCollector = ApiTypeHelper.requireNonNull(builder.buildLeafCollector, this, "buildLeafCollector");
+        this.buildLeafCollectorCount = ApiTypeHelper.requireNonNull(builder.buildLeafCollectorCount, this, "buildLeafCollectorCount");
+        this.collect = ApiTypeHelper.requireNonNull(builder.collect, this, "collect");
+        this.collectCount = ApiTypeHelper.requireNonNull(builder.collectCount, this, "collectCount");
+        this.initialize = ApiTypeHelper.requireNonNull(builder.initialize, this, "initialize");
+        this.initializeCount = ApiTypeHelper.requireNonNull(builder.initializeCount, this, "initializeCount");
+        this.postCollection = builder.postCollection;
+        this.postCollectionCount = builder.postCollectionCount;
+        this.reduce = ApiTypeHelper.requireNonNull(builder.reduce, this, "reduce");
+        this.reduceCount = ApiTypeHelper.requireNonNull(builder.reduceCount, this, "reduceCount");
+
+    }
+
+    public static AggregationBreakdown of(Function<Builder, ObjectBuilder<AggregationBreakdown>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code build_aggregation}
+     */
+    public final long buildAggregation() {
+        return this.buildAggregation;
+    }
+
+    /**
+     * Required - API name: {@code build_aggregation_count}
+     */
+    public final long buildAggregationCount() {
+        return this.buildAggregationCount;
+    }
+
+    /**
+     * Required - API name: {@code build_leaf_collector}
+     */
+    public final long buildLeafCollector() {
+        return this.buildLeafCollector;
+    }
+
+    /**
+     * Required - API name: {@code build_leaf_collector_count}
+     */
+    public final long buildLeafCollectorCount() {
+        return this.buildLeafCollectorCount;
+    }
+
+    /**
+     * Required - API name: {@code collect}
+     */
+    public final long collect() {
+        return this.collect;
+    }
+
+    /**
+     * Required - API name: {@code collect_count}
+     */
+    public final long collectCount() {
+        return this.collectCount;
+    }
+
+    /**
+     * Required - API name: {@code initialize}
+     */
+    public final long initialize() {
+        return this.initialize;
+    }
+
+    /**
+     * Required - API name: {@code initialize_count}
+     */
+    public final long initializeCount() {
+        return this.initializeCount;
+    }
+
+    /**
+     * API name: {@code post_collection}
+     */
+    @Nullable
+    public final Long postCollection() {
+        return this.postCollection;
+    }
+
+    /**
+     * API name: {@code post_collection_count}
+     */
+    @Nullable
+    public final Long postCollectionCount() {
+        return this.postCollectionCount;
+    }
+
+    /**
+     * Required - API name: {@code reduce}
+     */
+    public final long reduce() {
+        return this.reduce;
+    }
+
+    /**
+     * Required - API name: {@code reduce_count}
+     */
+    public final long reduceCount() {
+        return this.reduceCount;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("build_aggregation");
+        generator.write(this.buildAggregation);
+
+        generator.writeKey("build_aggregation_count");
+        generator.write(this.buildAggregationCount);
+
+        generator.writeKey("build_leaf_collector");
+        generator.write(this.buildLeafCollector);
+
+        generator.writeKey("build_leaf_collector_count");
+        generator.write(this.buildLeafCollectorCount);
+
+        generator.writeKey("collect");
+        generator.write(this.collect);
+
+        generator.writeKey("collect_count");
+        generator.write(this.collectCount);
+
+        generator.writeKey("initialize");
+        generator.write(this.initialize);
+
+        generator.writeKey("initialize_count");
+        generator.write(this.initializeCount);
+
+        if (this.postCollection != null) {
+            generator.writeKey("post_collection");
+            generator.write(this.postCollection);
+
+        }
+        if (this.postCollectionCount != null) {
+            generator.writeKey("post_collection_count");
+            generator.write(this.postCollectionCount);
+
+        }
+        generator.writeKey("reduce");
+        generator.write(this.reduce);
+
+        generator.writeKey("reduce_count");
+        generator.write(this.reduceCount);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AggregationBreakdown}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AggregationBreakdown> {
+        private Long buildAggregation;
+
+        private Long buildAggregationCount;
+
+        private Long buildLeafCollector;
+
+        private Long buildLeafCollectorCount;
+
+        private Long collect;
+
+        private Long collectCount;
+
+        private Long initialize;
+
+        private Long initializeCount;
+
+        @Nullable
+        private Long postCollection;
+
+        @Nullable
+        private Long postCollectionCount;
+
+        private Long reduce;
+
+        private Long reduceCount;
+
+        /**
+         * Required - API name: {@code build_aggregation}
+         */
+        public final Builder buildAggregation(long value) {
+            this.buildAggregation = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code build_aggregation_count}
+         */
+        public final Builder buildAggregationCount(long value) {
+            this.buildAggregationCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code build_leaf_collector}
+         */
+        public final Builder buildLeafCollector(long value) {
+            this.buildLeafCollector = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code build_leaf_collector_count}
+         */
+        public final Builder buildLeafCollectorCount(long value) {
+            this.buildLeafCollectorCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code collect}
+         */
+        public final Builder collect(long value) {
+            this.collect = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code collect_count}
+         */
+        public final Builder collectCount(long value) {
+            this.collectCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code initialize}
+         */
+        public final Builder initialize(long value) {
+            this.initialize = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code initialize_count}
+         */
+        public final Builder initializeCount(long value) {
+            this.initializeCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code post_collection}
+         */
+        public final Builder postCollection(@Nullable Long value) {
+            this.postCollection = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code post_collection_count}
+         */
+        public final Builder postCollectionCount(@Nullable Long value) {
+            this.postCollectionCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code reduce}
+         */
+        public final Builder reduce(long value) {
+            this.reduce = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code reduce_count}
+         */
+        public final Builder reduceCount(long value) {
+            this.reduceCount = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link AggregationBreakdown}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AggregationBreakdown build() {
+            _checkSingleUse();
+
+            return new AggregationBreakdown(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AggregationBreakdown}
+     */
+    public static final JsonpDeserializer<AggregationBreakdown> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AggregationBreakdown::setupAggregationBreakdownDeserializer
+    );
+
+    protected static void setupAggregationBreakdownDeserializer(ObjectDeserializer<AggregationBreakdown.Builder> op) {
+
+        op.add(Builder::buildAggregation, JsonpDeserializer.longDeserializer(), "build_aggregation");
+        op.add(Builder::buildAggregationCount, JsonpDeserializer.longDeserializer(), "build_aggregation_count");
+        op.add(Builder::buildLeafCollector, JsonpDeserializer.longDeserializer(), "build_leaf_collector");
+        op.add(Builder::buildLeafCollectorCount, JsonpDeserializer.longDeserializer(), "build_leaf_collector_count");
+        op.add(Builder::collect, JsonpDeserializer.longDeserializer(), "collect");
+        op.add(Builder::collectCount, JsonpDeserializer.longDeserializer(), "collect_count");
+        op.add(Builder::initialize, JsonpDeserializer.longDeserializer(), "initialize");
+        op.add(Builder::initializeCount, JsonpDeserializer.longDeserializer(), "initialize_count");
+        op.add(Builder::postCollection, JsonpDeserializer.longDeserializer(), "post_collection");
+        op.add(Builder::postCollectionCount, JsonpDeserializer.longDeserializer(), "post_collection_count");
+        op.add(Builder::reduce, JsonpDeserializer.longDeserializer(), "reduce");
+        op.add(Builder::reduceCount, JsonpDeserializer.longDeserializer(), "reduce_count");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationProfile.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationProfile.java
index 190ec1c57a..19403cf024 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationProfile.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationProfile.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,265 +45,261 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.AggregationProfile
 
-
 @JsonpDeserializable
 public class AggregationProfile implements JsonpSerializable {
-	private final AggregationBreakdown breakdown;
-
-	private final String description;
-
-	private final long timeInNanos;
-
-	private final String type;
-
-	@Nullable
-	private final AggregationProfileDebug debug;
-
-	private final List<AggregationProfile> children;
-
-	// ---------------------------------------------------------------------------------------------
+    private final AggregationBreakdown breakdown;
+
+    private final String description;
+
+    private final long timeInNanos;
+
+    private final String type;
+
+    @Nullable
+    private final AggregationProfileDebug debug;
+
+    private final List<AggregationProfile> children;
+
+    // ---------------------------------------------------------------------------------------------
 
-	private AggregationProfile(Builder builder) {
+    private AggregationProfile(Builder builder) {
 
-		this.breakdown = ApiTypeHelper.requireNonNull(builder.breakdown, this, "breakdown");
-		this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
-		this.timeInNanos = ApiTypeHelper.requireNonNull(builder.timeInNanos, this, "timeInNanos");
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-		this.debug = builder.debug;
-		this.children = ApiTypeHelper.unmodifiable(builder.children);
+        this.breakdown = ApiTypeHelper.requireNonNull(builder.breakdown, this, "breakdown");
+        this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
+        this.timeInNanos = ApiTypeHelper.requireNonNull(builder.timeInNanos, this, "timeInNanos");
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.debug = builder.debug;
+        this.children = ApiTypeHelper.unmodifiable(builder.children);
 
-	}
+    }
 
-	public static AggregationProfile of(Function<Builder, ObjectBuilder<AggregationProfile>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static AggregationProfile of(Function<Builder, ObjectBuilder<AggregationProfile>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code breakdown}
-	 */
-	public final AggregationBreakdown breakdown() {
-		return this.breakdown;
-	}
+    /**
+     * Required - API name: {@code breakdown}
+     */
+    public final AggregationBreakdown breakdown() {
+        return this.breakdown;
+    }
 
-	/**
-	 * Required - API name: {@code description}
-	 */
-	public final String description() {
-		return this.description;
-	}
+    /**
+     * Required - API name: {@code description}
+     */
+    public final String description() {
+        return this.description;
+    }
 
-	/**
-	 * Required - API name: {@code time_in_nanos}
-	 */
-	public final long timeInNanos() {
-		return this.timeInNanos;
-	}
+    /**
+     * Required - API name: {@code time_in_nanos}
+     */
+    public final long timeInNanos() {
+        return this.timeInNanos;
+    }
 
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
 
-	/**
-	 * API name: {@code debug}
-	 */
-	@Nullable
-	public final AggregationProfileDebug debug() {
-		return this.debug;
-	}
-
-	/**
-	 * API name: {@code children}
-	 */
-	public final List<AggregationProfile> children() {
-		return this.children;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("breakdown");
-		this.breakdown.serialize(generator, mapper);
-
-		generator.writeKey("description");
-		generator.write(this.description);
-
-		generator.writeKey("time_in_nanos");
-		generator.write(this.timeInNanos);
-
-		generator.writeKey("type");
-		generator.write(this.type);
-
-		if (this.debug != null) {
-			generator.writeKey("debug");
-			this.debug.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.children)) {
-			generator.writeKey("children");
-			generator.writeStartArray();
-			for (AggregationProfile item0 : this.children) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AggregationProfile}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AggregationProfile> {
-		private AggregationBreakdown breakdown;
-
-		private String description;
-
-		private Long timeInNanos;
-
-		private String type;
-
-		@Nullable
-		private AggregationProfileDebug debug;
-
-		@Nullable
-		private List<AggregationProfile> children;
-
-		/**
-		 * Required - API name: {@code breakdown}
-		 */
-		public final Builder breakdown(AggregationBreakdown value) {
-			this.breakdown = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code breakdown}
-		 */
-		public final Builder breakdown(Function<AggregationBreakdown.Builder, ObjectBuilder<AggregationBreakdown>> fn) {
-			return this.breakdown(fn.apply(new AggregationBreakdown.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code description}
-		 */
-		public final Builder description(String value) {
-			this.description = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code time_in_nanos}
-		 */
-		public final Builder timeInNanos(long value) {
-			this.timeInNanos = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code debug}
-		 */
-		public final Builder debug(@Nullable AggregationProfileDebug value) {
-			this.debug = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code debug}
-		 */
-		public final Builder debug(
-				Function<AggregationProfileDebug.Builder, ObjectBuilder<AggregationProfileDebug>> fn) {
-			return this.debug(fn.apply(new AggregationProfileDebug.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code children}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>children</code>.
-		 */
-		public final Builder children(List<AggregationProfile> list) {
-			this.children = _listAddAll(this.children, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code children}
-		 * <p>
-		 * Adds one or more values to <code>children</code>.
-		 */
-		public final Builder children(AggregationProfile value, AggregationProfile... values) {
-			this.children = _listAdd(this.children, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code children}
-		 * <p>
-		 * Adds a value to <code>children</code> using a builder lambda.
-		 */
-		public final Builder children(Function<AggregationProfile.Builder, ObjectBuilder<AggregationProfile>> fn) {
-			return children(fn.apply(new AggregationProfile.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link AggregationProfile}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AggregationProfile build() {
-			_checkSingleUse();
-
-			return new AggregationProfile(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AggregationProfile}
-	 */
-	public static final JsonpDeserializer<AggregationProfile> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, AggregationProfile::setupAggregationProfileDeserializer);
-
-	protected static void setupAggregationProfileDeserializer(ObjectDeserializer<AggregationProfile.Builder> op) {
-
-		op.add(Builder::breakdown, AggregationBreakdown._DESERIALIZER, "breakdown");
-		op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
-		op.add(Builder::timeInNanos, JsonpDeserializer.longDeserializer(), "time_in_nanos");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-		op.add(Builder::debug, AggregationProfileDebug._DESERIALIZER, "debug");
-		op.add(Builder::children, JsonpDeserializer.arrayDeserializer(AggregationProfile._DESERIALIZER), "children");
-
-	}
+    /**
+     * API name: {@code debug}
+     */
+    @Nullable
+    public final AggregationProfileDebug debug() {
+        return this.debug;
+    }
+
+    /**
+     * API name: {@code children}
+     */
+    public final List<AggregationProfile> children() {
+        return this.children;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("breakdown");
+        this.breakdown.serialize(generator, mapper);
+
+        generator.writeKey("description");
+        generator.write(this.description);
+
+        generator.writeKey("time_in_nanos");
+        generator.write(this.timeInNanos);
+
+        generator.writeKey("type");
+        generator.write(this.type);
+
+        if (this.debug != null) {
+            generator.writeKey("debug");
+            this.debug.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.children)) {
+            generator.writeKey("children");
+            generator.writeStartArray();
+            for (AggregationProfile item0 : this.children) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AggregationProfile}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AggregationProfile> {
+        private AggregationBreakdown breakdown;
+
+        private String description;
+
+        private Long timeInNanos;
+
+        private String type;
+
+        @Nullable
+        private AggregationProfileDebug debug;
+
+        @Nullable
+        private List<AggregationProfile> children;
+
+        /**
+         * Required - API name: {@code breakdown}
+         */
+        public final Builder breakdown(AggregationBreakdown value) {
+            this.breakdown = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code breakdown}
+         */
+        public final Builder breakdown(Function<AggregationBreakdown.Builder, ObjectBuilder<AggregationBreakdown>> fn) {
+            return this.breakdown(fn.apply(new AggregationBreakdown.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code description}
+         */
+        public final Builder description(String value) {
+            this.description = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code time_in_nanos}
+         */
+        public final Builder timeInNanos(long value) {
+            this.timeInNanos = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code debug}
+         */
+        public final Builder debug(@Nullable AggregationProfileDebug value) {
+            this.debug = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code debug}
+         */
+        public final Builder debug(Function<AggregationProfileDebug.Builder, ObjectBuilder<AggregationProfileDebug>> fn) {
+            return this.debug(fn.apply(new AggregationProfileDebug.Builder()).build());
+        }
+
+        /**
+         * API name: {@code children}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>children</code>.
+         */
+        public final Builder children(List<AggregationProfile> list) {
+            this.children = _listAddAll(this.children, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code children}
+         * <p>
+         * Adds one or more values to <code>children</code>.
+         */
+        public final Builder children(AggregationProfile value, AggregationProfile... values) {
+            this.children = _listAdd(this.children, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code children}
+         * <p>
+         * Adds a value to <code>children</code> using a builder lambda.
+         */
+        public final Builder children(Function<AggregationProfile.Builder, ObjectBuilder<AggregationProfile>> fn) {
+            return children(fn.apply(new AggregationProfile.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link AggregationProfile}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AggregationProfile build() {
+            _checkSingleUse();
+
+            return new AggregationProfile(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AggregationProfile}
+     */
+    public static final JsonpDeserializer<AggregationProfile> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AggregationProfile::setupAggregationProfileDeserializer
+    );
+
+    protected static void setupAggregationProfileDeserializer(ObjectDeserializer<AggregationProfile.Builder> op) {
+
+        op.add(Builder::breakdown, AggregationBreakdown._DESERIALIZER, "breakdown");
+        op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
+        op.add(Builder::timeInNanos, JsonpDeserializer.longDeserializer(), "time_in_nanos");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+        op.add(Builder::debug, AggregationProfileDebug._DESERIALIZER, "debug");
+        op.add(Builder::children, JsonpDeserializer.arrayDeserializer(AggregationProfile._DESERIALIZER), "children");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationProfileDebug.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationProfileDebug.java
index 1c5f0a34a2..ea7dd35929 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationProfileDebug.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationProfileDebug.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,739 +45,739 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.AggregationProfileDebug
 
-
 @JsonpDeserializable
 public class AggregationProfileDebug implements JsonpSerializable {
-	@Nullable
-	private final Integer segmentsWithMultiValuedOrds;
+    @Nullable
+    private final Integer segmentsWithMultiValuedOrds;
 
-	@Nullable
-	private final String collectionStrategy;
+    @Nullable
+    private final String collectionStrategy;
 
-	@Nullable
-	private final Integer segmentsWithSingleValuedOrds;
+    @Nullable
+    private final Integer segmentsWithSingleValuedOrds;
 
-	@Nullable
-	private final Integer totalBuckets;
+    @Nullable
+    private final Integer totalBuckets;
 
-	@Nullable
-	private final Integer builtBuckets;
+    @Nullable
+    private final Integer builtBuckets;
 
-	@Nullable
-	private final String resultStrategy;
+    @Nullable
+    private final String resultStrategy;
 
-	@Nullable
-	private final Boolean hasFilter;
-
-	@Nullable
-	private final String delegate;
-
-	@Nullable
-	private final AggregationProfileDelegateDebug delegateDebug;
-
-	@Nullable
-	private final Integer charsFetched;
-
-	@Nullable
-	private final Integer extractCount;
-
-	@Nullable
-	private final Integer extractNs;
-
-	@Nullable
-	private final Integer valuesFetched;
-
-	@Nullable
-	private final Integer collectAnalyzedNs;
-
-	@Nullable
-	private final Integer collectAnalyzedCount;
-
-	@Nullable
-	private final Integer survivingBuckets;
-
-	@Nullable
-	private final Integer ordinalsCollectorsUsed;
-
-	@Nullable
-	private final Integer ordinalsCollectorsOverheadTooHigh;
-
-	@Nullable
-	private final Integer stringHashingCollectorsUsed;
-
-	@Nullable
-	private final Integer numericCollectorsUsed;
-
-	@Nullable
-	private final Integer emptyCollectorsUsed;
-
-	private final List<String> deferredAggregators;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AggregationProfileDebug(Builder builder) {
-
-		this.segmentsWithMultiValuedOrds = builder.segmentsWithMultiValuedOrds;
-		this.collectionStrategy = builder.collectionStrategy;
-		this.segmentsWithSingleValuedOrds = builder.segmentsWithSingleValuedOrds;
-		this.totalBuckets = builder.totalBuckets;
-		this.builtBuckets = builder.builtBuckets;
-		this.resultStrategy = builder.resultStrategy;
-		this.hasFilter = builder.hasFilter;
-		this.delegate = builder.delegate;
-		this.delegateDebug = builder.delegateDebug;
-		this.charsFetched = builder.charsFetched;
-		this.extractCount = builder.extractCount;
-		this.extractNs = builder.extractNs;
-		this.valuesFetched = builder.valuesFetched;
-		this.collectAnalyzedNs = builder.collectAnalyzedNs;
-		this.collectAnalyzedCount = builder.collectAnalyzedCount;
-		this.survivingBuckets = builder.survivingBuckets;
-		this.ordinalsCollectorsUsed = builder.ordinalsCollectorsUsed;
-		this.ordinalsCollectorsOverheadTooHigh = builder.ordinalsCollectorsOverheadTooHigh;
-		this.stringHashingCollectorsUsed = builder.stringHashingCollectorsUsed;
-		this.numericCollectorsUsed = builder.numericCollectorsUsed;
-		this.emptyCollectorsUsed = builder.emptyCollectorsUsed;
-		this.deferredAggregators = ApiTypeHelper.unmodifiable(builder.deferredAggregators);
-
-	}
-
-	public static AggregationProfileDebug of(Function<Builder, ObjectBuilder<AggregationProfileDebug>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code segments_with_multi_valued_ords}
-	 */
-	@Nullable
-	public final Integer segmentsWithMultiValuedOrds() {
-		return this.segmentsWithMultiValuedOrds;
-	}
-
-	/**
-	 * API name: {@code collection_strategy}
-	 */
-	@Nullable
-	public final String collectionStrategy() {
-		return this.collectionStrategy;
-	}
-
-	/**
-	 * API name: {@code segments_with_single_valued_ords}
-	 */
-	@Nullable
-	public final Integer segmentsWithSingleValuedOrds() {
-		return this.segmentsWithSingleValuedOrds;
-	}
-
-	/**
-	 * API name: {@code total_buckets}
-	 */
-	@Nullable
-	public final Integer totalBuckets() {
-		return this.totalBuckets;
-	}
-
-	/**
-	 * API name: {@code built_buckets}
-	 */
-	@Nullable
-	public final Integer builtBuckets() {
-		return this.builtBuckets;
-	}
-
-	/**
-	 * API name: {@code result_strategy}
-	 */
-	@Nullable
-	public final String resultStrategy() {
-		return this.resultStrategy;
-	}
-
-	/**
-	 * API name: {@code has_filter}
-	 */
-	@Nullable
-	public final Boolean hasFilter() {
-		return this.hasFilter;
-	}
-
-	/**
-	 * API name: {@code delegate}
-	 */
-	@Nullable
-	public final String delegate() {
-		return this.delegate;
-	}
-
-	/**
-	 * API name: {@code delegate_debug}
-	 */
-	@Nullable
-	public final AggregationProfileDelegateDebug delegateDebug() {
-		return this.delegateDebug;
-	}
-
-	/**
-	 * API name: {@code chars_fetched}
-	 */
-	@Nullable
-	public final Integer charsFetched() {
-		return this.charsFetched;
-	}
-
-	/**
-	 * API name: {@code extract_count}
-	 */
-	@Nullable
-	public final Integer extractCount() {
-		return this.extractCount;
-	}
-
-	/**
-	 * API name: {@code extract_ns}
-	 */
-	@Nullable
-	public final Integer extractNs() {
-		return this.extractNs;
-	}
-
-	/**
-	 * API name: {@code values_fetched}
-	 */
-	@Nullable
-	public final Integer valuesFetched() {
-		return this.valuesFetched;
-	}
-
-	/**
-	 * API name: {@code collect_analyzed_ns}
-	 */
-	@Nullable
-	public final Integer collectAnalyzedNs() {
-		return this.collectAnalyzedNs;
-	}
-
-	/**
-	 * API name: {@code collect_analyzed_count}
-	 */
-	@Nullable
-	public final Integer collectAnalyzedCount() {
-		return this.collectAnalyzedCount;
-	}
-
-	/**
-	 * API name: {@code surviving_buckets}
-	 */
-	@Nullable
-	public final Integer survivingBuckets() {
-		return this.survivingBuckets;
-	}
-
-	/**
-	 * API name: {@code ordinals_collectors_used}
-	 */
-	@Nullable
-	public final Integer ordinalsCollectorsUsed() {
-		return this.ordinalsCollectorsUsed;
-	}
-
-	/**
-	 * API name: {@code ordinals_collectors_overhead_too_high}
-	 */
-	@Nullable
-	public final Integer ordinalsCollectorsOverheadTooHigh() {
-		return this.ordinalsCollectorsOverheadTooHigh;
-	}
-
-	/**
-	 * API name: {@code string_hashing_collectors_used}
-	 */
-	@Nullable
-	public final Integer stringHashingCollectorsUsed() {
-		return this.stringHashingCollectorsUsed;
-	}
-
-	/**
-	 * API name: {@code numeric_collectors_used}
-	 */
-	@Nullable
-	public final Integer numericCollectorsUsed() {
-		return this.numericCollectorsUsed;
-	}
-
-	/**
-	 * API name: {@code empty_collectors_used}
-	 */
-	@Nullable
-	public final Integer emptyCollectorsUsed() {
-		return this.emptyCollectorsUsed;
-	}
-
-	/**
-	 * API name: {@code deferred_aggregators}
-	 */
-	public final List<String> deferredAggregators() {
-		return this.deferredAggregators;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.segmentsWithMultiValuedOrds != null) {
-			generator.writeKey("segments_with_multi_valued_ords");
-			generator.write(this.segmentsWithMultiValuedOrds);
-
-		}
-		if (this.collectionStrategy != null) {
-			generator.writeKey("collection_strategy");
-			generator.write(this.collectionStrategy);
-
-		}
-		if (this.segmentsWithSingleValuedOrds != null) {
-			generator.writeKey("segments_with_single_valued_ords");
-			generator.write(this.segmentsWithSingleValuedOrds);
-
-		}
-		if (this.totalBuckets != null) {
-			generator.writeKey("total_buckets");
-			generator.write(this.totalBuckets);
-
-		}
-		if (this.builtBuckets != null) {
-			generator.writeKey("built_buckets");
-			generator.write(this.builtBuckets);
-
-		}
-		if (this.resultStrategy != null) {
-			generator.writeKey("result_strategy");
-			generator.write(this.resultStrategy);
-
-		}
-		if (this.hasFilter != null) {
-			generator.writeKey("has_filter");
-			generator.write(this.hasFilter);
-
-		}
-		if (this.delegate != null) {
-			generator.writeKey("delegate");
-			generator.write(this.delegate);
-
-		}
-		if (this.delegateDebug != null) {
-			generator.writeKey("delegate_debug");
-			this.delegateDebug.serialize(generator, mapper);
-
-		}
-		if (this.charsFetched != null) {
-			generator.writeKey("chars_fetched");
-			generator.write(this.charsFetched);
-
-		}
-		if (this.extractCount != null) {
-			generator.writeKey("extract_count");
-			generator.write(this.extractCount);
-
-		}
-		if (this.extractNs != null) {
-			generator.writeKey("extract_ns");
-			generator.write(this.extractNs);
-
-		}
-		if (this.valuesFetched != null) {
-			generator.writeKey("values_fetched");
-			generator.write(this.valuesFetched);
-
-		}
-		if (this.collectAnalyzedNs != null) {
-			generator.writeKey("collect_analyzed_ns");
-			generator.write(this.collectAnalyzedNs);
-
-		}
-		if (this.collectAnalyzedCount != null) {
-			generator.writeKey("collect_analyzed_count");
-			generator.write(this.collectAnalyzedCount);
-
-		}
-		if (this.survivingBuckets != null) {
-			generator.writeKey("surviving_buckets");
-			generator.write(this.survivingBuckets);
-
-		}
-		if (this.ordinalsCollectorsUsed != null) {
-			generator.writeKey("ordinals_collectors_used");
-			generator.write(this.ordinalsCollectorsUsed);
-
-		}
-		if (this.ordinalsCollectorsOverheadTooHigh != null) {
-			generator.writeKey("ordinals_collectors_overhead_too_high");
-			generator.write(this.ordinalsCollectorsOverheadTooHigh);
+    @Nullable
+    private final Boolean hasFilter;
+
+    @Nullable
+    private final String delegate;
+
+    @Nullable
+    private final AggregationProfileDelegateDebug delegateDebug;
+
+    @Nullable
+    private final Integer charsFetched;
+
+    @Nullable
+    private final Integer extractCount;
+
+    @Nullable
+    private final Integer extractNs;
+
+    @Nullable
+    private final Integer valuesFetched;
+
+    @Nullable
+    private final Integer collectAnalyzedNs;
+
+    @Nullable
+    private final Integer collectAnalyzedCount;
+
+    @Nullable
+    private final Integer survivingBuckets;
+
+    @Nullable
+    private final Integer ordinalsCollectorsUsed;
+
+    @Nullable
+    private final Integer ordinalsCollectorsOverheadTooHigh;
+
+    @Nullable
+    private final Integer stringHashingCollectorsUsed;
+
+    @Nullable
+    private final Integer numericCollectorsUsed;
+
+    @Nullable
+    private final Integer emptyCollectorsUsed;
+
+    private final List<String> deferredAggregators;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AggregationProfileDebug(Builder builder) {
+
+        this.segmentsWithMultiValuedOrds = builder.segmentsWithMultiValuedOrds;
+        this.collectionStrategy = builder.collectionStrategy;
+        this.segmentsWithSingleValuedOrds = builder.segmentsWithSingleValuedOrds;
+        this.totalBuckets = builder.totalBuckets;
+        this.builtBuckets = builder.builtBuckets;
+        this.resultStrategy = builder.resultStrategy;
+        this.hasFilter = builder.hasFilter;
+        this.delegate = builder.delegate;
+        this.delegateDebug = builder.delegateDebug;
+        this.charsFetched = builder.charsFetched;
+        this.extractCount = builder.extractCount;
+        this.extractNs = builder.extractNs;
+        this.valuesFetched = builder.valuesFetched;
+        this.collectAnalyzedNs = builder.collectAnalyzedNs;
+        this.collectAnalyzedCount = builder.collectAnalyzedCount;
+        this.survivingBuckets = builder.survivingBuckets;
+        this.ordinalsCollectorsUsed = builder.ordinalsCollectorsUsed;
+        this.ordinalsCollectorsOverheadTooHigh = builder.ordinalsCollectorsOverheadTooHigh;
+        this.stringHashingCollectorsUsed = builder.stringHashingCollectorsUsed;
+        this.numericCollectorsUsed = builder.numericCollectorsUsed;
+        this.emptyCollectorsUsed = builder.emptyCollectorsUsed;
+        this.deferredAggregators = ApiTypeHelper.unmodifiable(builder.deferredAggregators);
+
+    }
+
+    public static AggregationProfileDebug of(Function<Builder, ObjectBuilder<AggregationProfileDebug>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code segments_with_multi_valued_ords}
+     */
+    @Nullable
+    public final Integer segmentsWithMultiValuedOrds() {
+        return this.segmentsWithMultiValuedOrds;
+    }
+
+    /**
+     * API name: {@code collection_strategy}
+     */
+    @Nullable
+    public final String collectionStrategy() {
+        return this.collectionStrategy;
+    }
+
+    /**
+     * API name: {@code segments_with_single_valued_ords}
+     */
+    @Nullable
+    public final Integer segmentsWithSingleValuedOrds() {
+        return this.segmentsWithSingleValuedOrds;
+    }
+
+    /**
+     * API name: {@code total_buckets}
+     */
+    @Nullable
+    public final Integer totalBuckets() {
+        return this.totalBuckets;
+    }
+
+    /**
+     * API name: {@code built_buckets}
+     */
+    @Nullable
+    public final Integer builtBuckets() {
+        return this.builtBuckets;
+    }
+
+    /**
+     * API name: {@code result_strategy}
+     */
+    @Nullable
+    public final String resultStrategy() {
+        return this.resultStrategy;
+    }
+
+    /**
+     * API name: {@code has_filter}
+     */
+    @Nullable
+    public final Boolean hasFilter() {
+        return this.hasFilter;
+    }
+
+    /**
+     * API name: {@code delegate}
+     */
+    @Nullable
+    public final String delegate() {
+        return this.delegate;
+    }
+
+    /**
+     * API name: {@code delegate_debug}
+     */
+    @Nullable
+    public final AggregationProfileDelegateDebug delegateDebug() {
+        return this.delegateDebug;
+    }
+
+    /**
+     * API name: {@code chars_fetched}
+     */
+    @Nullable
+    public final Integer charsFetched() {
+        return this.charsFetched;
+    }
+
+    /**
+     * API name: {@code extract_count}
+     */
+    @Nullable
+    public final Integer extractCount() {
+        return this.extractCount;
+    }
+
+    /**
+     * API name: {@code extract_ns}
+     */
+    @Nullable
+    public final Integer extractNs() {
+        return this.extractNs;
+    }
+
+    /**
+     * API name: {@code values_fetched}
+     */
+    @Nullable
+    public final Integer valuesFetched() {
+        return this.valuesFetched;
+    }
+
+    /**
+     * API name: {@code collect_analyzed_ns}
+     */
+    @Nullable
+    public final Integer collectAnalyzedNs() {
+        return this.collectAnalyzedNs;
+    }
+
+    /**
+     * API name: {@code collect_analyzed_count}
+     */
+    @Nullable
+    public final Integer collectAnalyzedCount() {
+        return this.collectAnalyzedCount;
+    }
+
+    /**
+     * API name: {@code surviving_buckets}
+     */
+    @Nullable
+    public final Integer survivingBuckets() {
+        return this.survivingBuckets;
+    }
+
+    /**
+     * API name: {@code ordinals_collectors_used}
+     */
+    @Nullable
+    public final Integer ordinalsCollectorsUsed() {
+        return this.ordinalsCollectorsUsed;
+    }
+
+    /**
+     * API name: {@code ordinals_collectors_overhead_too_high}
+     */
+    @Nullable
+    public final Integer ordinalsCollectorsOverheadTooHigh() {
+        return this.ordinalsCollectorsOverheadTooHigh;
+    }
+
+    /**
+     * API name: {@code string_hashing_collectors_used}
+     */
+    @Nullable
+    public final Integer stringHashingCollectorsUsed() {
+        return this.stringHashingCollectorsUsed;
+    }
+
+    /**
+     * API name: {@code numeric_collectors_used}
+     */
+    @Nullable
+    public final Integer numericCollectorsUsed() {
+        return this.numericCollectorsUsed;
+    }
+
+    /**
+     * API name: {@code empty_collectors_used}
+     */
+    @Nullable
+    public final Integer emptyCollectorsUsed() {
+        return this.emptyCollectorsUsed;
+    }
+
+    /**
+     * API name: {@code deferred_aggregators}
+     */
+    public final List<String> deferredAggregators() {
+        return this.deferredAggregators;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.segmentsWithMultiValuedOrds != null) {
+            generator.writeKey("segments_with_multi_valued_ords");
+            generator.write(this.segmentsWithMultiValuedOrds);
+
+        }
+        if (this.collectionStrategy != null) {
+            generator.writeKey("collection_strategy");
+            generator.write(this.collectionStrategy);
+
+        }
+        if (this.segmentsWithSingleValuedOrds != null) {
+            generator.writeKey("segments_with_single_valued_ords");
+            generator.write(this.segmentsWithSingleValuedOrds);
+
+        }
+        if (this.totalBuckets != null) {
+            generator.writeKey("total_buckets");
+            generator.write(this.totalBuckets);
+
+        }
+        if (this.builtBuckets != null) {
+            generator.writeKey("built_buckets");
+            generator.write(this.builtBuckets);
+
+        }
+        if (this.resultStrategy != null) {
+            generator.writeKey("result_strategy");
+            generator.write(this.resultStrategy);
+
+        }
+        if (this.hasFilter != null) {
+            generator.writeKey("has_filter");
+            generator.write(this.hasFilter);
+
+        }
+        if (this.delegate != null) {
+            generator.writeKey("delegate");
+            generator.write(this.delegate);
+
+        }
+        if (this.delegateDebug != null) {
+            generator.writeKey("delegate_debug");
+            this.delegateDebug.serialize(generator, mapper);
+
+        }
+        if (this.charsFetched != null) {
+            generator.writeKey("chars_fetched");
+            generator.write(this.charsFetched);
+
+        }
+        if (this.extractCount != null) {
+            generator.writeKey("extract_count");
+            generator.write(this.extractCount);
+
+        }
+        if (this.extractNs != null) {
+            generator.writeKey("extract_ns");
+            generator.write(this.extractNs);
+
+        }
+        if (this.valuesFetched != null) {
+            generator.writeKey("values_fetched");
+            generator.write(this.valuesFetched);
+
+        }
+        if (this.collectAnalyzedNs != null) {
+            generator.writeKey("collect_analyzed_ns");
+            generator.write(this.collectAnalyzedNs);
+
+        }
+        if (this.collectAnalyzedCount != null) {
+            generator.writeKey("collect_analyzed_count");
+            generator.write(this.collectAnalyzedCount);
+
+        }
+        if (this.survivingBuckets != null) {
+            generator.writeKey("surviving_buckets");
+            generator.write(this.survivingBuckets);
+
+        }
+        if (this.ordinalsCollectorsUsed != null) {
+            generator.writeKey("ordinals_collectors_used");
+            generator.write(this.ordinalsCollectorsUsed);
+
+        }
+        if (this.ordinalsCollectorsOverheadTooHigh != null) {
+            generator.writeKey("ordinals_collectors_overhead_too_high");
+            generator.write(this.ordinalsCollectorsOverheadTooHigh);
 
-		}
-		if (this.stringHashingCollectorsUsed != null) {
-			generator.writeKey("string_hashing_collectors_used");
-			generator.write(this.stringHashingCollectorsUsed);
+        }
+        if (this.stringHashingCollectorsUsed != null) {
+            generator.writeKey("string_hashing_collectors_used");
+            generator.write(this.stringHashingCollectorsUsed);
 
-		}
-		if (this.numericCollectorsUsed != null) {
-			generator.writeKey("numeric_collectors_used");
-			generator.write(this.numericCollectorsUsed);
+        }
+        if (this.numericCollectorsUsed != null) {
+            generator.writeKey("numeric_collectors_used");
+            generator.write(this.numericCollectorsUsed);
 
-		}
-		if (this.emptyCollectorsUsed != null) {
-			generator.writeKey("empty_collectors_used");
-			generator.write(this.emptyCollectorsUsed);
+        }
+        if (this.emptyCollectorsUsed != null) {
+            generator.writeKey("empty_collectors_used");
+            generator.write(this.emptyCollectorsUsed);
 
-		}
-		if (ApiTypeHelper.isDefined(this.deferredAggregators)) {
-			generator.writeKey("deferred_aggregators");
-			generator.writeStartArray();
-			for (String item0 : this.deferredAggregators) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AggregationProfileDebug}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AggregationProfileDebug> {
-		@Nullable
-		private Integer segmentsWithMultiValuedOrds;
-
-		@Nullable
-		private String collectionStrategy;
-
-		@Nullable
-		private Integer segmentsWithSingleValuedOrds;
-
-		@Nullable
-		private Integer totalBuckets;
-
-		@Nullable
-		private Integer builtBuckets;
-
-		@Nullable
-		private String resultStrategy;
-
-		@Nullable
-		private Boolean hasFilter;
-
-		@Nullable
-		private String delegate;
-
-		@Nullable
-		private AggregationProfileDelegateDebug delegateDebug;
-
-		@Nullable
-		private Integer charsFetched;
-
-		@Nullable
-		private Integer extractCount;
-
-		@Nullable
-		private Integer extractNs;
-
-		@Nullable
-		private Integer valuesFetched;
-
-		@Nullable
-		private Integer collectAnalyzedNs;
-
-		@Nullable
-		private Integer collectAnalyzedCount;
-
-		@Nullable
-		private Integer survivingBuckets;
-
-		@Nullable
-		private Integer ordinalsCollectorsUsed;
-
-		@Nullable
-		private Integer ordinalsCollectorsOverheadTooHigh;
-
-		@Nullable
-		private Integer stringHashingCollectorsUsed;
-
-		@Nullable
-		private Integer numericCollectorsUsed;
-
-		@Nullable
-		private Integer emptyCollectorsUsed;
-
-		@Nullable
-		private List<String> deferredAggregators;
-
-		/**
-		 * API name: {@code segments_with_multi_valued_ords}
-		 */
-		public final Builder segmentsWithMultiValuedOrds(@Nullable Integer value) {
-			this.segmentsWithMultiValuedOrds = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code collection_strategy}
-		 */
-		public final Builder collectionStrategy(@Nullable String value) {
-			this.collectionStrategy = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code segments_with_single_valued_ords}
-		 */
-		public final Builder segmentsWithSingleValuedOrds(@Nullable Integer value) {
-			this.segmentsWithSingleValuedOrds = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total_buckets}
-		 */
-		public final Builder totalBuckets(@Nullable Integer value) {
-			this.totalBuckets = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code built_buckets}
-		 */
-		public final Builder builtBuckets(@Nullable Integer value) {
-			this.builtBuckets = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code result_strategy}
-		 */
-		public final Builder resultStrategy(@Nullable String value) {
-			this.resultStrategy = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code has_filter}
-		 */
-		public final Builder hasFilter(@Nullable Boolean value) {
-			this.hasFilter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code delegate}
-		 */
-		public final Builder delegate(@Nullable String value) {
-			this.delegate = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code delegate_debug}
-		 */
-		public final Builder delegateDebug(@Nullable AggregationProfileDelegateDebug value) {
-			this.delegateDebug = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code delegate_debug}
-		 */
-		public final Builder delegateDebug(
-				Function<AggregationProfileDelegateDebug.Builder, ObjectBuilder<AggregationProfileDelegateDebug>> fn) {
-			return this.delegateDebug(fn.apply(new AggregationProfileDelegateDebug.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code chars_fetched}
-		 */
-		public final Builder charsFetched(@Nullable Integer value) {
-			this.charsFetched = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code extract_count}
-		 */
-		public final Builder extractCount(@Nullable Integer value) {
-			this.extractCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code extract_ns}
-		 */
-		public final Builder extractNs(@Nullable Integer value) {
-			this.extractNs = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code values_fetched}
-		 */
-		public final Builder valuesFetched(@Nullable Integer value) {
-			this.valuesFetched = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code collect_analyzed_ns}
-		 */
-		public final Builder collectAnalyzedNs(@Nullable Integer value) {
-			this.collectAnalyzedNs = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code collect_analyzed_count}
-		 */
-		public final Builder collectAnalyzedCount(@Nullable Integer value) {
-			this.collectAnalyzedCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code surviving_buckets}
-		 */
-		public final Builder survivingBuckets(@Nullable Integer value) {
-			this.survivingBuckets = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ordinals_collectors_used}
-		 */
-		public final Builder ordinalsCollectorsUsed(@Nullable Integer value) {
-			this.ordinalsCollectorsUsed = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ordinals_collectors_overhead_too_high}
-		 */
-		public final Builder ordinalsCollectorsOverheadTooHigh(@Nullable Integer value) {
-			this.ordinalsCollectorsOverheadTooHigh = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code string_hashing_collectors_used}
-		 */
-		public final Builder stringHashingCollectorsUsed(@Nullable Integer value) {
-			this.stringHashingCollectorsUsed = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code numeric_collectors_used}
-		 */
-		public final Builder numericCollectorsUsed(@Nullable Integer value) {
-			this.numericCollectorsUsed = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code empty_collectors_used}
-		 */
-		public final Builder emptyCollectorsUsed(@Nullable Integer value) {
-			this.emptyCollectorsUsed = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code deferred_aggregators}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>deferredAggregators</code>.
-		 */
-		public final Builder deferredAggregators(List<String> list) {
-			this.deferredAggregators = _listAddAll(this.deferredAggregators, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code deferred_aggregators}
-		 * <p>
-		 * Adds one or more values to <code>deferredAggregators</code>.
-		 */
-		public final Builder deferredAggregators(String value, String... values) {
-			this.deferredAggregators = _listAdd(this.deferredAggregators, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AggregationProfileDebug}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AggregationProfileDebug build() {
-			_checkSingleUse();
-
-			return new AggregationProfileDebug(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AggregationProfileDebug}
-	 */
-	public static final JsonpDeserializer<AggregationProfileDebug> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, AggregationProfileDebug::setupAggregationProfileDebugDeserializer);
-
-	protected static void setupAggregationProfileDebugDeserializer(
-			ObjectDeserializer<AggregationProfileDebug.Builder> op) {
-
-		op.add(Builder::segmentsWithMultiValuedOrds, JsonpDeserializer.integerDeserializer(),
-				"segments_with_multi_valued_ords");
-		op.add(Builder::collectionStrategy, JsonpDeserializer.stringDeserializer(), "collection_strategy");
-		op.add(Builder::segmentsWithSingleValuedOrds, JsonpDeserializer.integerDeserializer(),
-				"segments_with_single_valued_ords");
-		op.add(Builder::totalBuckets, JsonpDeserializer.integerDeserializer(), "total_buckets");
-		op.add(Builder::builtBuckets, JsonpDeserializer.integerDeserializer(), "built_buckets");
-		op.add(Builder::resultStrategy, JsonpDeserializer.stringDeserializer(), "result_strategy");
-		op.add(Builder::hasFilter, JsonpDeserializer.booleanDeserializer(), "has_filter");
-		op.add(Builder::delegate, JsonpDeserializer.stringDeserializer(), "delegate");
-		op.add(Builder::delegateDebug, AggregationProfileDelegateDebug._DESERIALIZER, "delegate_debug");
-		op.add(Builder::charsFetched, JsonpDeserializer.integerDeserializer(), "chars_fetched");
-		op.add(Builder::extractCount, JsonpDeserializer.integerDeserializer(), "extract_count");
-		op.add(Builder::extractNs, JsonpDeserializer.integerDeserializer(), "extract_ns");
-		op.add(Builder::valuesFetched, JsonpDeserializer.integerDeserializer(), "values_fetched");
-		op.add(Builder::collectAnalyzedNs, JsonpDeserializer.integerDeserializer(), "collect_analyzed_ns");
-		op.add(Builder::collectAnalyzedCount, JsonpDeserializer.integerDeserializer(), "collect_analyzed_count");
-		op.add(Builder::survivingBuckets, JsonpDeserializer.integerDeserializer(), "surviving_buckets");
-		op.add(Builder::ordinalsCollectorsUsed, JsonpDeserializer.integerDeserializer(), "ordinals_collectors_used");
-		op.add(Builder::ordinalsCollectorsOverheadTooHigh, JsonpDeserializer.integerDeserializer(),
-				"ordinals_collectors_overhead_too_high");
-		op.add(Builder::stringHashingCollectorsUsed, JsonpDeserializer.integerDeserializer(),
-				"string_hashing_collectors_used");
-		op.add(Builder::numericCollectorsUsed, JsonpDeserializer.integerDeserializer(), "numeric_collectors_used");
-		op.add(Builder::emptyCollectorsUsed, JsonpDeserializer.integerDeserializer(), "empty_collectors_used");
-		op.add(Builder::deferredAggregators,
-				JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "deferred_aggregators");
-
-	}
+        }
+        if (ApiTypeHelper.isDefined(this.deferredAggregators)) {
+            generator.writeKey("deferred_aggregators");
+            generator.writeStartArray();
+            for (String item0 : this.deferredAggregators) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AggregationProfileDebug}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AggregationProfileDebug> {
+        @Nullable
+        private Integer segmentsWithMultiValuedOrds;
+
+        @Nullable
+        private String collectionStrategy;
+
+        @Nullable
+        private Integer segmentsWithSingleValuedOrds;
+
+        @Nullable
+        private Integer totalBuckets;
+
+        @Nullable
+        private Integer builtBuckets;
+
+        @Nullable
+        private String resultStrategy;
+
+        @Nullable
+        private Boolean hasFilter;
+
+        @Nullable
+        private String delegate;
+
+        @Nullable
+        private AggregationProfileDelegateDebug delegateDebug;
+
+        @Nullable
+        private Integer charsFetched;
+
+        @Nullable
+        private Integer extractCount;
+
+        @Nullable
+        private Integer extractNs;
+
+        @Nullable
+        private Integer valuesFetched;
+
+        @Nullable
+        private Integer collectAnalyzedNs;
+
+        @Nullable
+        private Integer collectAnalyzedCount;
+
+        @Nullable
+        private Integer survivingBuckets;
+
+        @Nullable
+        private Integer ordinalsCollectorsUsed;
+
+        @Nullable
+        private Integer ordinalsCollectorsOverheadTooHigh;
+
+        @Nullable
+        private Integer stringHashingCollectorsUsed;
+
+        @Nullable
+        private Integer numericCollectorsUsed;
+
+        @Nullable
+        private Integer emptyCollectorsUsed;
+
+        @Nullable
+        private List<String> deferredAggregators;
+
+        /**
+         * API name: {@code segments_with_multi_valued_ords}
+         */
+        public final Builder segmentsWithMultiValuedOrds(@Nullable Integer value) {
+            this.segmentsWithMultiValuedOrds = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code collection_strategy}
+         */
+        public final Builder collectionStrategy(@Nullable String value) {
+            this.collectionStrategy = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code segments_with_single_valued_ords}
+         */
+        public final Builder segmentsWithSingleValuedOrds(@Nullable Integer value) {
+            this.segmentsWithSingleValuedOrds = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total_buckets}
+         */
+        public final Builder totalBuckets(@Nullable Integer value) {
+            this.totalBuckets = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code built_buckets}
+         */
+        public final Builder builtBuckets(@Nullable Integer value) {
+            this.builtBuckets = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code result_strategy}
+         */
+        public final Builder resultStrategy(@Nullable String value) {
+            this.resultStrategy = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code has_filter}
+         */
+        public final Builder hasFilter(@Nullable Boolean value) {
+            this.hasFilter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code delegate}
+         */
+        public final Builder delegate(@Nullable String value) {
+            this.delegate = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code delegate_debug}
+         */
+        public final Builder delegateDebug(@Nullable AggregationProfileDelegateDebug value) {
+            this.delegateDebug = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code delegate_debug}
+         */
+        public final Builder delegateDebug(
+            Function<AggregationProfileDelegateDebug.Builder, ObjectBuilder<AggregationProfileDelegateDebug>> fn
+        ) {
+            return this.delegateDebug(fn.apply(new AggregationProfileDelegateDebug.Builder()).build());
+        }
+
+        /**
+         * API name: {@code chars_fetched}
+         */
+        public final Builder charsFetched(@Nullable Integer value) {
+            this.charsFetched = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code extract_count}
+         */
+        public final Builder extractCount(@Nullable Integer value) {
+            this.extractCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code extract_ns}
+         */
+        public final Builder extractNs(@Nullable Integer value) {
+            this.extractNs = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code values_fetched}
+         */
+        public final Builder valuesFetched(@Nullable Integer value) {
+            this.valuesFetched = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code collect_analyzed_ns}
+         */
+        public final Builder collectAnalyzedNs(@Nullable Integer value) {
+            this.collectAnalyzedNs = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code collect_analyzed_count}
+         */
+        public final Builder collectAnalyzedCount(@Nullable Integer value) {
+            this.collectAnalyzedCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code surviving_buckets}
+         */
+        public final Builder survivingBuckets(@Nullable Integer value) {
+            this.survivingBuckets = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ordinals_collectors_used}
+         */
+        public final Builder ordinalsCollectorsUsed(@Nullable Integer value) {
+            this.ordinalsCollectorsUsed = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ordinals_collectors_overhead_too_high}
+         */
+        public final Builder ordinalsCollectorsOverheadTooHigh(@Nullable Integer value) {
+            this.ordinalsCollectorsOverheadTooHigh = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code string_hashing_collectors_used}
+         */
+        public final Builder stringHashingCollectorsUsed(@Nullable Integer value) {
+            this.stringHashingCollectorsUsed = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code numeric_collectors_used}
+         */
+        public final Builder numericCollectorsUsed(@Nullable Integer value) {
+            this.numericCollectorsUsed = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code empty_collectors_used}
+         */
+        public final Builder emptyCollectorsUsed(@Nullable Integer value) {
+            this.emptyCollectorsUsed = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code deferred_aggregators}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>deferredAggregators</code>.
+         */
+        public final Builder deferredAggregators(List<String> list) {
+            this.deferredAggregators = _listAddAll(this.deferredAggregators, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code deferred_aggregators}
+         * <p>
+         * Adds one or more values to <code>deferredAggregators</code>.
+         */
+        public final Builder deferredAggregators(String value, String... values) {
+            this.deferredAggregators = _listAdd(this.deferredAggregators, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link AggregationProfileDebug}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AggregationProfileDebug build() {
+            _checkSingleUse();
+
+            return new AggregationProfileDebug(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AggregationProfileDebug}
+     */
+    public static final JsonpDeserializer<AggregationProfileDebug> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AggregationProfileDebug::setupAggregationProfileDebugDeserializer
+    );
+
+    protected static void setupAggregationProfileDebugDeserializer(ObjectDeserializer<AggregationProfileDebug.Builder> op) {
+
+        op.add(Builder::segmentsWithMultiValuedOrds, JsonpDeserializer.integerDeserializer(), "segments_with_multi_valued_ords");
+        op.add(Builder::collectionStrategy, JsonpDeserializer.stringDeserializer(), "collection_strategy");
+        op.add(Builder::segmentsWithSingleValuedOrds, JsonpDeserializer.integerDeserializer(), "segments_with_single_valued_ords");
+        op.add(Builder::totalBuckets, JsonpDeserializer.integerDeserializer(), "total_buckets");
+        op.add(Builder::builtBuckets, JsonpDeserializer.integerDeserializer(), "built_buckets");
+        op.add(Builder::resultStrategy, JsonpDeserializer.stringDeserializer(), "result_strategy");
+        op.add(Builder::hasFilter, JsonpDeserializer.booleanDeserializer(), "has_filter");
+        op.add(Builder::delegate, JsonpDeserializer.stringDeserializer(), "delegate");
+        op.add(Builder::delegateDebug, AggregationProfileDelegateDebug._DESERIALIZER, "delegate_debug");
+        op.add(Builder::charsFetched, JsonpDeserializer.integerDeserializer(), "chars_fetched");
+        op.add(Builder::extractCount, JsonpDeserializer.integerDeserializer(), "extract_count");
+        op.add(Builder::extractNs, JsonpDeserializer.integerDeserializer(), "extract_ns");
+        op.add(Builder::valuesFetched, JsonpDeserializer.integerDeserializer(), "values_fetched");
+        op.add(Builder::collectAnalyzedNs, JsonpDeserializer.integerDeserializer(), "collect_analyzed_ns");
+        op.add(Builder::collectAnalyzedCount, JsonpDeserializer.integerDeserializer(), "collect_analyzed_count");
+        op.add(Builder::survivingBuckets, JsonpDeserializer.integerDeserializer(), "surviving_buckets");
+        op.add(Builder::ordinalsCollectorsUsed, JsonpDeserializer.integerDeserializer(), "ordinals_collectors_used");
+        op.add(
+            Builder::ordinalsCollectorsOverheadTooHigh,
+            JsonpDeserializer.integerDeserializer(),
+            "ordinals_collectors_overhead_too_high"
+        );
+        op.add(Builder::stringHashingCollectorsUsed, JsonpDeserializer.integerDeserializer(), "string_hashing_collectors_used");
+        op.add(Builder::numericCollectorsUsed, JsonpDeserializer.integerDeserializer(), "numeric_collectors_used");
+        op.add(Builder::emptyCollectorsUsed, JsonpDeserializer.integerDeserializer(), "empty_collectors_used");
+        op.add(
+            Builder::deferredAggregators,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
+            "deferred_aggregators"
+        );
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationProfileDelegateDebug.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationProfileDelegateDebug.java
index c73daed9c0..db1f739ef3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationProfileDelegateDebug.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationProfileDelegateDebug.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,248 +45,240 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.AggregationProfileDelegateDebug
 
-
 @JsonpDeserializable
 public class AggregationProfileDelegateDebug implements JsonpSerializable {
-	@Nullable
-	private final Integer segmentsWithDocCountField;
-
-	@Nullable
-	private final Integer segmentsWithDeletedDocs;
-
-	private final List<AggregationProfileDelegateDebugFilter> filters;
-
-	@Nullable
-	private final Integer segmentsCounted;
-
-	@Nullable
-	private final Integer segmentsCollected;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AggregationProfileDelegateDebug(Builder builder) {
-
-		this.segmentsWithDocCountField = builder.segmentsWithDocCountField;
-		this.segmentsWithDeletedDocs = builder.segmentsWithDeletedDocs;
-		this.filters = ApiTypeHelper.unmodifiable(builder.filters);
-		this.segmentsCounted = builder.segmentsCounted;
-		this.segmentsCollected = builder.segmentsCollected;
-
-	}
-
-	public static AggregationProfileDelegateDebug of(
-			Function<Builder, ObjectBuilder<AggregationProfileDelegateDebug>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code segments_with_doc_count_field}
-	 */
-	@Nullable
-	public final Integer segmentsWithDocCountField() {
-		return this.segmentsWithDocCountField;
-	}
-
-	/**
-	 * API name: {@code segments_with_deleted_docs}
-	 */
-	@Nullable
-	public final Integer segmentsWithDeletedDocs() {
-		return this.segmentsWithDeletedDocs;
-	}
-
-	/**
-	 * API name: {@code filters}
-	 */
-	public final List<AggregationProfileDelegateDebugFilter> filters() {
-		return this.filters;
-	}
-
-	/**
-	 * API name: {@code segments_counted}
-	 */
-	@Nullable
-	public final Integer segmentsCounted() {
-		return this.segmentsCounted;
-	}
-
-	/**
-	 * API name: {@code segments_collected}
-	 */
-	@Nullable
-	public final Integer segmentsCollected() {
-		return this.segmentsCollected;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.segmentsWithDocCountField != null) {
-			generator.writeKey("segments_with_doc_count_field");
-			generator.write(this.segmentsWithDocCountField);
-
-		}
-		if (this.segmentsWithDeletedDocs != null) {
-			generator.writeKey("segments_with_deleted_docs");
-			generator.write(this.segmentsWithDeletedDocs);
-
-		}
-		if (ApiTypeHelper.isDefined(this.filters)) {
-			generator.writeKey("filters");
-			generator.writeStartArray();
-			for (AggregationProfileDelegateDebugFilter item0 : this.filters) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.segmentsCounted != null) {
-			generator.writeKey("segments_counted");
-			generator.write(this.segmentsCounted);
-
-		}
-		if (this.segmentsCollected != null) {
-			generator.writeKey("segments_collected");
-			generator.write(this.segmentsCollected);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AggregationProfileDelegateDebug}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AggregationProfileDelegateDebug> {
-		@Nullable
-		private Integer segmentsWithDocCountField;
-
-		@Nullable
-		private Integer segmentsWithDeletedDocs;
-
-		@Nullable
-		private List<AggregationProfileDelegateDebugFilter> filters;
-
-		@Nullable
-		private Integer segmentsCounted;
-
-		@Nullable
-		private Integer segmentsCollected;
-
-		/**
-		 * API name: {@code segments_with_doc_count_field}
-		 */
-		public final Builder segmentsWithDocCountField(@Nullable Integer value) {
-			this.segmentsWithDocCountField = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code segments_with_deleted_docs}
-		 */
-		public final Builder segmentsWithDeletedDocs(@Nullable Integer value) {
-			this.segmentsWithDeletedDocs = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code filters}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>filters</code>.
-		 */
-		public final Builder filters(List<AggregationProfileDelegateDebugFilter> list) {
-			this.filters = _listAddAll(this.filters, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code filters}
-		 * <p>
-		 * Adds one or more values to <code>filters</code>.
-		 */
-		public final Builder filters(AggregationProfileDelegateDebugFilter value,
-				AggregationProfileDelegateDebugFilter... values) {
-			this.filters = _listAdd(this.filters, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code filters}
-		 * <p>
-		 * Adds a value to <code>filters</code> using a builder lambda.
-		 */
-		public final Builder filters(
-				Function<AggregationProfileDelegateDebugFilter.Builder,
-						ObjectBuilder<AggregationProfileDelegateDebugFilter>> fn) {
-			return filters(fn.apply(new AggregationProfileDelegateDebugFilter.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code segments_counted}
-		 */
-		public final Builder segmentsCounted(@Nullable Integer value) {
-			this.segmentsCounted = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code segments_collected}
-		 */
-		public final Builder segmentsCollected(@Nullable Integer value) {
-			this.segmentsCollected = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AggregationProfileDelegateDebug}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AggregationProfileDelegateDebug build() {
-			_checkSingleUse();
-
-			return new AggregationProfileDelegateDebug(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AggregationProfileDelegateDebug}
-	 */
-	public static final JsonpDeserializer<AggregationProfileDelegateDebug> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, AggregationProfileDelegateDebug::setupAggregationProfileDelegateDebugDeserializer);
-
-	protected static void setupAggregationProfileDelegateDebugDeserializer(
-			ObjectDeserializer<AggregationProfileDelegateDebug.Builder> op) {
-
-		op.add(Builder::segmentsWithDocCountField, JsonpDeserializer.integerDeserializer(),
-				"segments_with_doc_count_field");
-		op.add(Builder::segmentsWithDeletedDocs, JsonpDeserializer.integerDeserializer(), "segments_with_deleted_docs");
-		op.add(Builder::filters,
-				JsonpDeserializer.arrayDeserializer(AggregationProfileDelegateDebugFilter._DESERIALIZER), "filters");
-		op.add(Builder::segmentsCounted, JsonpDeserializer.integerDeserializer(), "segments_counted");
-		op.add(Builder::segmentsCollected, JsonpDeserializer.integerDeserializer(), "segments_collected");
-
-	}
+    @Nullable
+    private final Integer segmentsWithDocCountField;
+
+    @Nullable
+    private final Integer segmentsWithDeletedDocs;
+
+    private final List<AggregationProfileDelegateDebugFilter> filters;
+
+    @Nullable
+    private final Integer segmentsCounted;
+
+    @Nullable
+    private final Integer segmentsCollected;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AggregationProfileDelegateDebug(Builder builder) {
+
+        this.segmentsWithDocCountField = builder.segmentsWithDocCountField;
+        this.segmentsWithDeletedDocs = builder.segmentsWithDeletedDocs;
+        this.filters = ApiTypeHelper.unmodifiable(builder.filters);
+        this.segmentsCounted = builder.segmentsCounted;
+        this.segmentsCollected = builder.segmentsCollected;
+
+    }
+
+    public static AggregationProfileDelegateDebug of(Function<Builder, ObjectBuilder<AggregationProfileDelegateDebug>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code segments_with_doc_count_field}
+     */
+    @Nullable
+    public final Integer segmentsWithDocCountField() {
+        return this.segmentsWithDocCountField;
+    }
+
+    /**
+     * API name: {@code segments_with_deleted_docs}
+     */
+    @Nullable
+    public final Integer segmentsWithDeletedDocs() {
+        return this.segmentsWithDeletedDocs;
+    }
+
+    /**
+     * API name: {@code filters}
+     */
+    public final List<AggregationProfileDelegateDebugFilter> filters() {
+        return this.filters;
+    }
+
+    /**
+     * API name: {@code segments_counted}
+     */
+    @Nullable
+    public final Integer segmentsCounted() {
+        return this.segmentsCounted;
+    }
+
+    /**
+     * API name: {@code segments_collected}
+     */
+    @Nullable
+    public final Integer segmentsCollected() {
+        return this.segmentsCollected;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.segmentsWithDocCountField != null) {
+            generator.writeKey("segments_with_doc_count_field");
+            generator.write(this.segmentsWithDocCountField);
+
+        }
+        if (this.segmentsWithDeletedDocs != null) {
+            generator.writeKey("segments_with_deleted_docs");
+            generator.write(this.segmentsWithDeletedDocs);
+
+        }
+        if (ApiTypeHelper.isDefined(this.filters)) {
+            generator.writeKey("filters");
+            generator.writeStartArray();
+            for (AggregationProfileDelegateDebugFilter item0 : this.filters) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.segmentsCounted != null) {
+            generator.writeKey("segments_counted");
+            generator.write(this.segmentsCounted);
+
+        }
+        if (this.segmentsCollected != null) {
+            generator.writeKey("segments_collected");
+            generator.write(this.segmentsCollected);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AggregationProfileDelegateDebug}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AggregationProfileDelegateDebug> {
+        @Nullable
+        private Integer segmentsWithDocCountField;
+
+        @Nullable
+        private Integer segmentsWithDeletedDocs;
+
+        @Nullable
+        private List<AggregationProfileDelegateDebugFilter> filters;
+
+        @Nullable
+        private Integer segmentsCounted;
+
+        @Nullable
+        private Integer segmentsCollected;
+
+        /**
+         * API name: {@code segments_with_doc_count_field}
+         */
+        public final Builder segmentsWithDocCountField(@Nullable Integer value) {
+            this.segmentsWithDocCountField = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code segments_with_deleted_docs}
+         */
+        public final Builder segmentsWithDeletedDocs(@Nullable Integer value) {
+            this.segmentsWithDeletedDocs = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code filters}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>filters</code>.
+         */
+        public final Builder filters(List<AggregationProfileDelegateDebugFilter> list) {
+            this.filters = _listAddAll(this.filters, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code filters}
+         * <p>
+         * Adds one or more values to <code>filters</code>.
+         */
+        public final Builder filters(AggregationProfileDelegateDebugFilter value, AggregationProfileDelegateDebugFilter... values) {
+            this.filters = _listAdd(this.filters, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code filters}
+         * <p>
+         * Adds a value to <code>filters</code> using a builder lambda.
+         */
+        public final Builder filters(
+            Function<AggregationProfileDelegateDebugFilter.Builder, ObjectBuilder<AggregationProfileDelegateDebugFilter>> fn
+        ) {
+            return filters(fn.apply(new AggregationProfileDelegateDebugFilter.Builder()).build());
+        }
+
+        /**
+         * API name: {@code segments_counted}
+         */
+        public final Builder segmentsCounted(@Nullable Integer value) {
+            this.segmentsCounted = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code segments_collected}
+         */
+        public final Builder segmentsCollected(@Nullable Integer value) {
+            this.segmentsCollected = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link AggregationProfileDelegateDebug}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AggregationProfileDelegateDebug build() {
+            _checkSingleUse();
+
+            return new AggregationProfileDelegateDebug(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AggregationProfileDelegateDebug}
+     */
+    public static final JsonpDeserializer<AggregationProfileDelegateDebug> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AggregationProfileDelegateDebug::setupAggregationProfileDelegateDebugDeserializer
+    );
+
+    protected static void setupAggregationProfileDelegateDebugDeserializer(ObjectDeserializer<AggregationProfileDelegateDebug.Builder> op) {
+
+        op.add(Builder::segmentsWithDocCountField, JsonpDeserializer.integerDeserializer(), "segments_with_doc_count_field");
+        op.add(Builder::segmentsWithDeletedDocs, JsonpDeserializer.integerDeserializer(), "segments_with_deleted_docs");
+        op.add(Builder::filters, JsonpDeserializer.arrayDeserializer(AggregationProfileDelegateDebugFilter._DESERIALIZER), "filters");
+        op.add(Builder::segmentsCounted, JsonpDeserializer.integerDeserializer(), "segments_counted");
+        op.add(Builder::segmentsCollected, JsonpDeserializer.integerDeserializer(), "segments_collected");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationProfileDelegateDebugFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationProfileDelegateDebugFilter.java
index ef4f86bd7a..32e577f72d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationProfileDelegateDebugFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/AggregationProfileDelegateDebugFilter.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,163 +43,158 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.AggregationProfileDelegateDebugFilter
 
-
 @JsonpDeserializable
 public class AggregationProfileDelegateDebugFilter implements JsonpSerializable {
-	@Nullable
-	private final Integer resultsFromMetadata;
-
-	@Nullable
-	private final String query;
-
-	@Nullable
-	private final String specializedFor;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AggregationProfileDelegateDebugFilter(Builder builder) {
-
-		this.resultsFromMetadata = builder.resultsFromMetadata;
-		this.query = builder.query;
-		this.specializedFor = builder.specializedFor;
-
-	}
-
-	public static AggregationProfileDelegateDebugFilter of(
-			Function<Builder, ObjectBuilder<AggregationProfileDelegateDebugFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code results_from_metadata}
-	 */
-	@Nullable
-	public final Integer resultsFromMetadata() {
-		return this.resultsFromMetadata;
-	}
-
-	/**
-	 * API name: {@code query}
-	 */
-	@Nullable
-	public final String query() {
-		return this.query;
-	}
-
-	/**
-	 * API name: {@code specialized_for}
-	 */
-	@Nullable
-	public final String specializedFor() {
-		return this.specializedFor;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.resultsFromMetadata != null) {
-			generator.writeKey("results_from_metadata");
-			generator.write(this.resultsFromMetadata);
-
-		}
-		if (this.query != null) {
-			generator.writeKey("query");
-			generator.write(this.query);
-
-		}
-		if (this.specializedFor != null) {
-			generator.writeKey("specialized_for");
-			generator.write(this.specializedFor);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AggregationProfileDelegateDebugFilter}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase
-			implements
-				ObjectBuilder<AggregationProfileDelegateDebugFilter> {
-		@Nullable
-		private Integer resultsFromMetadata;
-
-		@Nullable
-		private String query;
-
-		@Nullable
-		private String specializedFor;
-
-		/**
-		 * API name: {@code results_from_metadata}
-		 */
-		public final Builder resultsFromMetadata(@Nullable Integer value) {
-			this.resultsFromMetadata = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code query}
-		 */
-		public final Builder query(@Nullable String value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code specialized_for}
-		 */
-		public final Builder specializedFor(@Nullable String value) {
-			this.specializedFor = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AggregationProfileDelegateDebugFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AggregationProfileDelegateDebugFilter build() {
-			_checkSingleUse();
-
-			return new AggregationProfileDelegateDebugFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AggregationProfileDelegateDebugFilter}
-	 */
-	public static final JsonpDeserializer<AggregationProfileDelegateDebugFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new,
-					AggregationProfileDelegateDebugFilter::setupAggregationProfileDelegateDebugFilterDeserializer);
-
-	protected static void setupAggregationProfileDelegateDebugFilterDeserializer(
-			ObjectDeserializer<AggregationProfileDelegateDebugFilter.Builder> op) {
-
-		op.add(Builder::resultsFromMetadata, JsonpDeserializer.integerDeserializer(), "results_from_metadata");
-		op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
-		op.add(Builder::specializedFor, JsonpDeserializer.stringDeserializer(), "specialized_for");
-
-	}
+    @Nullable
+    private final Integer resultsFromMetadata;
+
+    @Nullable
+    private final String query;
+
+    @Nullable
+    private final String specializedFor;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AggregationProfileDelegateDebugFilter(Builder builder) {
+
+        this.resultsFromMetadata = builder.resultsFromMetadata;
+        this.query = builder.query;
+        this.specializedFor = builder.specializedFor;
+
+    }
+
+    public static AggregationProfileDelegateDebugFilter of(Function<Builder, ObjectBuilder<AggregationProfileDelegateDebugFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code results_from_metadata}
+     */
+    @Nullable
+    public final Integer resultsFromMetadata() {
+        return this.resultsFromMetadata;
+    }
+
+    /**
+     * API name: {@code query}
+     */
+    @Nullable
+    public final String query() {
+        return this.query;
+    }
+
+    /**
+     * API name: {@code specialized_for}
+     */
+    @Nullable
+    public final String specializedFor() {
+        return this.specializedFor;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.resultsFromMetadata != null) {
+            generator.writeKey("results_from_metadata");
+            generator.write(this.resultsFromMetadata);
+
+        }
+        if (this.query != null) {
+            generator.writeKey("query");
+            generator.write(this.query);
+
+        }
+        if (this.specializedFor != null) {
+            generator.writeKey("specialized_for");
+            generator.write(this.specializedFor);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AggregationProfileDelegateDebugFilter}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AggregationProfileDelegateDebugFilter> {
+        @Nullable
+        private Integer resultsFromMetadata;
+
+        @Nullable
+        private String query;
+
+        @Nullable
+        private String specializedFor;
+
+        /**
+         * API name: {@code results_from_metadata}
+         */
+        public final Builder resultsFromMetadata(@Nullable Integer value) {
+            this.resultsFromMetadata = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code query}
+         */
+        public final Builder query(@Nullable String value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code specialized_for}
+         */
+        public final Builder specializedFor(@Nullable String value) {
+            this.specializedFor = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link AggregationProfileDelegateDebugFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AggregationProfileDelegateDebugFilter build() {
+            _checkSingleUse();
+
+            return new AggregationProfileDelegateDebugFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AggregationProfileDelegateDebugFilter}
+     */
+    public static final JsonpDeserializer<AggregationProfileDelegateDebugFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AggregationProfileDelegateDebugFilter::setupAggregationProfileDelegateDebugFilterDeserializer
+    );
+
+    protected static void setupAggregationProfileDelegateDebugFilterDeserializer(
+        ObjectDeserializer<AggregationProfileDelegateDebugFilter.Builder> op
+    ) {
+
+        op.add(Builder::resultsFromMetadata, JsonpDeserializer.integerDeserializer(), "results_from_metadata");
+        op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
+        op.add(Builder::specializedFor, JsonpDeserializer.stringDeserializer(), "specialized_for");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/BoundaryScanner.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/BoundaryScanner.java
index 47a180ee48..60915738e5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/BoundaryScanner.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/BoundaryScanner.java
@@ -37,24 +37,23 @@
 
 @JsonpDeserializable
 public enum BoundaryScanner implements JsonEnum {
-	Chars("chars"),
+    Chars("chars"),
 
-	Sentence("sentence"),
+    Sentence("sentence"),
 
-	Word("word"),
+    Word("word"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	BoundaryScanner(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    BoundaryScanner(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<BoundaryScanner> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			BoundaryScanner.values());
+    public static final JsonEnum.Deserializer<BoundaryScanner> _DESERIALIZER = new JsonEnum.Deserializer<>(BoundaryScanner.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/BuiltinHighlighterType.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/BuiltinHighlighterType.java
index 65da13e8a1..702de2b3ab 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/BuiltinHighlighterType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/BuiltinHighlighterType.java
@@ -37,24 +37,25 @@
 
 @JsonpDeserializable
 public enum BuiltinHighlighterType implements JsonEnum {
-	Plain("plain"),
+    Plain("plain"),
 
-	FastVector("fvh"),
+    FastVector("fvh"),
 
-	Unified("unified"),
+    Unified("unified"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	BuiltinHighlighterType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    BuiltinHighlighterType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<BuiltinHighlighterType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			BuiltinHighlighterType.values());
+    public static final JsonEnum.Deserializer<BuiltinHighlighterType> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        BuiltinHighlighterType.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Collector.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Collector.java
index 6a738de0a6..33c813dbc0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Collector.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Collector.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,197 +45,194 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.Collector
 
-
 @JsonpDeserializable
 public class Collector implements JsonpSerializable {
-	private final String name;
+    private final String name;
 
-	private final String reason;
+    private final String reason;
 
-	private final long timeInNanos;
+    private final long timeInNanos;
 
-	private final List<Collector> children;
+    private final List<Collector> children;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private Collector(Builder builder) {
+    private Collector(Builder builder) {
 
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.reason = ApiTypeHelper.requireNonNull(builder.reason, this, "reason");
-		this.timeInNanos = ApiTypeHelper.requireNonNull(builder.timeInNanos, this, "timeInNanos");
-		this.children = ApiTypeHelper.unmodifiable(builder.children);
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.reason = ApiTypeHelper.requireNonNull(builder.reason, this, "reason");
+        this.timeInNanos = ApiTypeHelper.requireNonNull(builder.timeInNanos, this, "timeInNanos");
+        this.children = ApiTypeHelper.unmodifiable(builder.children);
 
-	}
+    }
 
-	public static Collector of(Function<Builder, ObjectBuilder<Collector>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static Collector of(Function<Builder, ObjectBuilder<Collector>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Required - API name: {@code reason}
-	 */
-	public final String reason() {
-		return this.reason;
-	}
-
-	/**
-	 * Required - API name: {@code time_in_nanos}
-	 */
-	public final long timeInNanos() {
-		return this.timeInNanos;
-	}
-
-	/**
-	 * API name: {@code children}
-	 */
-	public final List<Collector> children() {
-		return this.children;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		generator.writeKey("reason");
-		generator.write(this.reason);
-
-		generator.writeKey("time_in_nanos");
-		generator.write(this.timeInNanos);
-
-		if (ApiTypeHelper.isDefined(this.children)) {
-			generator.writeKey("children");
-			generator.writeStartArray();
-			for (Collector item0 : this.children) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Collector}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Collector> {
-		private String name;
-
-		private String reason;
-
-		private Long timeInNanos;
-
-		@Nullable
-		private List<Collector> children;
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code reason}
-		 */
-		public final Builder reason(String value) {
-			this.reason = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code time_in_nanos}
-		 */
-		public final Builder timeInNanos(long value) {
-			this.timeInNanos = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code children}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>children</code>.
-		 */
-		public final Builder children(List<Collector> list) {
-			this.children = _listAddAll(this.children, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code children}
-		 * <p>
-		 * Adds one or more values to <code>children</code>.
-		 */
-		public final Builder children(Collector value, Collector... values) {
-			this.children = _listAdd(this.children, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code children}
-		 * <p>
-		 * Adds a value to <code>children</code> using a builder lambda.
-		 */
-		public final Builder children(Function<Collector.Builder, ObjectBuilder<Collector>> fn) {
-			return children(fn.apply(new Collector.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link Collector}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Collector build() {
-			_checkSingleUse();
-
-			return new Collector(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Collector}
-	 */
-	public static final JsonpDeserializer<Collector> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Collector::setupCollectorDeserializer);
-
-	protected static void setupCollectorDeserializer(ObjectDeserializer<Collector.Builder> op) {
-
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::reason, JsonpDeserializer.stringDeserializer(), "reason");
-		op.add(Builder::timeInNanos, JsonpDeserializer.longDeserializer(), "time_in_nanos");
-		op.add(Builder::children, JsonpDeserializer.arrayDeserializer(Collector._DESERIALIZER), "children");
-
-	}
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Required - API name: {@code reason}
+     */
+    public final String reason() {
+        return this.reason;
+    }
+
+    /**
+     * Required - API name: {@code time_in_nanos}
+     */
+    public final long timeInNanos() {
+        return this.timeInNanos;
+    }
+
+    /**
+     * API name: {@code children}
+     */
+    public final List<Collector> children() {
+        return this.children;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        generator.writeKey("reason");
+        generator.write(this.reason);
+
+        generator.writeKey("time_in_nanos");
+        generator.write(this.timeInNanos);
+
+        if (ApiTypeHelper.isDefined(this.children)) {
+            generator.writeKey("children");
+            generator.writeStartArray();
+            for (Collector item0 : this.children) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Collector}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Collector> {
+        private String name;
+
+        private String reason;
+
+        private Long timeInNanos;
+
+        @Nullable
+        private List<Collector> children;
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code reason}
+         */
+        public final Builder reason(String value) {
+            this.reason = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code time_in_nanos}
+         */
+        public final Builder timeInNanos(long value) {
+            this.timeInNanos = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code children}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>children</code>.
+         */
+        public final Builder children(List<Collector> list) {
+            this.children = _listAddAll(this.children, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code children}
+         * <p>
+         * Adds one or more values to <code>children</code>.
+         */
+        public final Builder children(Collector value, Collector... values) {
+            this.children = _listAdd(this.children, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code children}
+         * <p>
+         * Adds a value to <code>children</code> using a builder lambda.
+         */
+        public final Builder children(Function<Collector.Builder, ObjectBuilder<Collector>> fn) {
+            return children(fn.apply(new Collector.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link Collector}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Collector build() {
+            _checkSingleUse();
+
+            return new Collector(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Collector}
+     */
+    public static final JsonpDeserializer<Collector> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Collector::setupCollectorDeserializer
+    );
+
+    protected static void setupCollectorDeserializer(ObjectDeserializer<Collector.Builder> op) {
+
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::reason, JsonpDeserializer.stringDeserializer(), "reason");
+        op.add(Builder::timeInNanos, JsonpDeserializer.longDeserializer(), "time_in_nanos");
+        op.add(Builder::children, JsonpDeserializer.arrayDeserializer(Collector._DESERIALIZER), "children");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionContext.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionContext.java
index 6050189e51..dd29e7bd96 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionContext.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionContext.java
@@ -32,262 +32,263 @@
 
 package org.opensearch.client.opensearch.core.search;
 
-import org.opensearch.client.opensearch._types.GeoHashPrecision;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.GeoHashPrecision;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.CompletionContext
 
-
 @JsonpDeserializable
 public class CompletionContext implements JsonpSerializable {
-	@Nullable
-	private final Double boost;
-
-	private final Context context;
-
-	private final List<GeoHashPrecision> neighbours;
-
-	@Nullable
-	private final GeoHashPrecision precision;
-
-	@Nullable
-	private final Boolean prefix;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CompletionContext(Builder builder) {
-
-		this.boost = builder.boost;
-		this.context = ApiTypeHelper.requireNonNull(builder.context, this, "context");
-		this.neighbours = ApiTypeHelper.unmodifiable(builder.neighbours);
-		this.precision = builder.precision;
-		this.prefix = builder.prefix;
-
-	}
-
-	public static CompletionContext of(Function<Builder, ObjectBuilder<CompletionContext>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code boost}
-	 */
-	@Nullable
-	public final Double boost() {
-		return this.boost;
-	}
-
-	/**
-	 * Required - API name: {@code context}
-	 */
-	public final Context context() {
-		return this.context;
-	}
-
-	/**
-	 * API name: {@code neighbours}
-	 */
-	public final List<GeoHashPrecision> neighbours() {
-		return this.neighbours;
-	}
-
-	/**
-	 * API name: {@code precision}
-	 */
-	@Nullable
-	public final GeoHashPrecision precision() {
-		return this.precision;
-	}
-
-	/**
-	 * API name: {@code prefix}
-	 */
-	@Nullable
-	public final Boolean prefix() {
-		return this.prefix;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.boost != null) {
-			generator.writeKey("boost");
-			generator.write(this.boost);
-
-		}
-		generator.writeKey("context");
-		this.context.serialize(generator, mapper);
-
-		if (ApiTypeHelper.isDefined(this.neighbours)) {
-			generator.writeKey("neighbours");
-			generator.writeStartArray();
-			for (GeoHashPrecision item0 : this.neighbours) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.precision != null) {
-			generator.writeKey("precision");
-			this.precision.serialize(generator, mapper);
-
-		}
-		if (this.prefix != null) {
-			generator.writeKey("prefix");
-			generator.write(this.prefix);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CompletionContext}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CompletionContext> {
-		@Nullable
-		private Double boost;
-
-		private Context context;
-
-		@Nullable
-		private List<GeoHashPrecision> neighbours;
-
-		@Nullable
-		private GeoHashPrecision precision;
-
-		@Nullable
-		private Boolean prefix;
-
-		/**
-		 * API name: {@code boost}
-		 */
-		public final Builder boost(@Nullable Double value) {
-			this.boost = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code context}
-		 */
-		public final Builder context(Context value) {
-			this.context = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code context}
-		 */
-		public final Builder context(Function<Context.Builder, ObjectBuilder<Context>> fn) {
-			return this.context(fn.apply(new Context.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code neighbours}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>neighbours</code>.
-		 */
-		public final Builder neighbours(List<GeoHashPrecision> list) {
-			this.neighbours = _listAddAll(this.neighbours, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code neighbours}
-		 * <p>
-		 * Adds one or more values to <code>neighbours</code>.
-		 */
-		public final Builder neighbours(GeoHashPrecision value, GeoHashPrecision... values) {
-			this.neighbours = _listAdd(this.neighbours, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code neighbours}
-		 * <p>
-		 * Adds a value to <code>neighbours</code> using a builder lambda.
-		 */
-		public final Builder neighbours(Function<GeoHashPrecision.Builder, ObjectBuilder<GeoHashPrecision>> fn) {
-			return neighbours(fn.apply(new GeoHashPrecision.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code precision}
-		 */
-		public final Builder precision(@Nullable GeoHashPrecision value) {
-			this.precision = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code precision}
-		 */
-		public final Builder precision(Function<GeoHashPrecision.Builder, ObjectBuilder<GeoHashPrecision>> fn) {
-			return this.precision(fn.apply(new GeoHashPrecision.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code prefix}
-		 */
-		public final Builder prefix(@Nullable Boolean value) {
-			this.prefix = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CompletionContext}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CompletionContext build() {
-			_checkSingleUse();
-
-			return new CompletionContext(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CompletionContext}
-	 */
-	public static final JsonpDeserializer<CompletionContext> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CompletionContext::setupCompletionContextDeserializer);
-
-	protected static void setupCompletionContextDeserializer(ObjectDeserializer<CompletionContext.Builder> op) {
-
-		op.add(Builder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
-		op.add(Builder::context, Context._DESERIALIZER, "context");
-		op.add(Builder::neighbours, JsonpDeserializer.arrayDeserializer(GeoHashPrecision._DESERIALIZER), "neighbours");
-		op.add(Builder::precision, GeoHashPrecision._DESERIALIZER, "precision");
-		op.add(Builder::prefix, JsonpDeserializer.booleanDeserializer(), "prefix");
-
-		op.shortcutProperty("context");
-
-	}
+    @Nullable
+    private final Double boost;
+
+    private final Context context;
+
+    private final List<GeoHashPrecision> neighbours;
+
+    @Nullable
+    private final GeoHashPrecision precision;
+
+    @Nullable
+    private final Boolean prefix;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CompletionContext(Builder builder) {
+
+        this.boost = builder.boost;
+        this.context = ApiTypeHelper.requireNonNull(builder.context, this, "context");
+        this.neighbours = ApiTypeHelper.unmodifiable(builder.neighbours);
+        this.precision = builder.precision;
+        this.prefix = builder.prefix;
+
+    }
+
+    public static CompletionContext of(Function<Builder, ObjectBuilder<CompletionContext>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code boost}
+     */
+    @Nullable
+    public final Double boost() {
+        return this.boost;
+    }
+
+    /**
+     * Required - API name: {@code context}
+     */
+    public final Context context() {
+        return this.context;
+    }
+
+    /**
+     * API name: {@code neighbours}
+     */
+    public final List<GeoHashPrecision> neighbours() {
+        return this.neighbours;
+    }
+
+    /**
+     * API name: {@code precision}
+     */
+    @Nullable
+    public final GeoHashPrecision precision() {
+        return this.precision;
+    }
+
+    /**
+     * API name: {@code prefix}
+     */
+    @Nullable
+    public final Boolean prefix() {
+        return this.prefix;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.boost != null) {
+            generator.writeKey("boost");
+            generator.write(this.boost);
+
+        }
+        generator.writeKey("context");
+        this.context.serialize(generator, mapper);
+
+        if (ApiTypeHelper.isDefined(this.neighbours)) {
+            generator.writeKey("neighbours");
+            generator.writeStartArray();
+            for (GeoHashPrecision item0 : this.neighbours) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.precision != null) {
+            generator.writeKey("precision");
+            this.precision.serialize(generator, mapper);
+
+        }
+        if (this.prefix != null) {
+            generator.writeKey("prefix");
+            generator.write(this.prefix);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CompletionContext}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CompletionContext> {
+        @Nullable
+        private Double boost;
+
+        private Context context;
+
+        @Nullable
+        private List<GeoHashPrecision> neighbours;
+
+        @Nullable
+        private GeoHashPrecision precision;
+
+        @Nullable
+        private Boolean prefix;
+
+        /**
+         * API name: {@code boost}
+         */
+        public final Builder boost(@Nullable Double value) {
+            this.boost = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code context}
+         */
+        public final Builder context(Context value) {
+            this.context = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code context}
+         */
+        public final Builder context(Function<Context.Builder, ObjectBuilder<Context>> fn) {
+            return this.context(fn.apply(new Context.Builder()).build());
+        }
+
+        /**
+         * API name: {@code neighbours}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>neighbours</code>.
+         */
+        public final Builder neighbours(List<GeoHashPrecision> list) {
+            this.neighbours = _listAddAll(this.neighbours, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code neighbours}
+         * <p>
+         * Adds one or more values to <code>neighbours</code>.
+         */
+        public final Builder neighbours(GeoHashPrecision value, GeoHashPrecision... values) {
+            this.neighbours = _listAdd(this.neighbours, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code neighbours}
+         * <p>
+         * Adds a value to <code>neighbours</code> using a builder lambda.
+         */
+        public final Builder neighbours(Function<GeoHashPrecision.Builder, ObjectBuilder<GeoHashPrecision>> fn) {
+            return neighbours(fn.apply(new GeoHashPrecision.Builder()).build());
+        }
+
+        /**
+         * API name: {@code precision}
+         */
+        public final Builder precision(@Nullable GeoHashPrecision value) {
+            this.precision = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code precision}
+         */
+        public final Builder precision(Function<GeoHashPrecision.Builder, ObjectBuilder<GeoHashPrecision>> fn) {
+            return this.precision(fn.apply(new GeoHashPrecision.Builder()).build());
+        }
+
+        /**
+         * API name: {@code prefix}
+         */
+        public final Builder prefix(@Nullable Boolean value) {
+            this.prefix = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link CompletionContext}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CompletionContext build() {
+            _checkSingleUse();
+
+            return new CompletionContext(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CompletionContext}
+     */
+    public static final JsonpDeserializer<CompletionContext> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CompletionContext::setupCompletionContextDeserializer
+    );
+
+    protected static void setupCompletionContextDeserializer(ObjectDeserializer<CompletionContext.Builder> op) {
+
+        op.add(Builder::boost, JsonpDeserializer.doubleDeserializer(), "boost");
+        op.add(Builder::context, Context._DESERIALIZER, "context");
+        op.add(Builder::neighbours, JsonpDeserializer.arrayDeserializer(GeoHashPrecision._DESERIALIZER), "neighbours");
+        op.add(Builder::precision, GeoHashPrecision._DESERIALIZER, "precision");
+        op.add(Builder::prefix, JsonpDeserializer.booleanDeserializer(), "prefix");
+
+        op.shortcutProperty("context");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionSuggest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionSuggest.java
index 0d94f54e88..36451a7b41 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionSuggest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionSuggest.java
@@ -6,7 +6,7 @@
  * 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
@@ -32,12 +32,11 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
 import java.util.List;
 import java.util.function.Function;
 import java.util.function.Supplier;
-
 import javax.annotation.Nullable;
-
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -49,8 +48,6 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
-import jakarta.json.stream.JsonGenerator;
-
 @JsonpDeserializable
 public class CompletionSuggest<TDocument> extends SuggestBase implements SuggestVariant {
     private final List<CompletionSuggestOption<TDocument>> options;
@@ -67,7 +64,8 @@ private CompletionSuggest(Builder<TDocument> builder) {
     }
 
     public static <TDocument> CompletionSuggest<TDocument> of(
-            Function<Builder<TDocument>, ObjectBuilder<CompletionSuggest<TDocument>>> fn) {
+        Function<Builder<TDocument>, ObjectBuilder<CompletionSuggest<TDocument>>> fn
+    ) {
         return fn.apply(new Builder<>()).build();
     }
 
@@ -92,7 +90,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
     }
 
     public static class Builder<TDocument> extends SuggestBase.AbstractBuilder<Builder<TDocument>>
-            implements
+        implements
             ObjectBuilder<CompletionSuggest<TDocument>> {
         private List<CompletionSuggestOption<TDocument>> options;
 
@@ -104,14 +102,14 @@ public final Builder<TDocument> options(List<CompletionSuggestOption<TDocument>>
             return this;
         }
 
-        public final Builder<TDocument> options(CompletionSuggestOption<TDocument> value,
-                CompletionSuggestOption<TDocument>... values) {
+        public final Builder<TDocument> options(CompletionSuggestOption<TDocument> value, CompletionSuggestOption<TDocument>... values) {
             this.options = _listAdd(this.options, value, values);
             return this;
         }
 
         public final Builder<TDocument> options(
-                Function<CompletionSuggestOption.Builder<TDocument>, ObjectBuilder<CompletionSuggestOption<TDocument>>> fn) {
+            Function<CompletionSuggestOption.Builder<TDocument>, ObjectBuilder<CompletionSuggestOption<TDocument>>> fn
+        ) {
             return options(fn.apply(new CompletionSuggestOption.Builder<TDocument>()).build());
         }
 
@@ -133,23 +131,30 @@ public CompletionSuggest<TDocument> build() {
     }
 
     public static <TDocument> JsonpDeserializer<CompletionSuggest<TDocument>> createCompletionSuggestDeserializer(
-            JsonpDeserializer<TDocument> tDocumentDeserializer) {
-        return ObjectBuilderDeserializer.createForObject((Supplier<Builder<TDocument>>) Builder::new,
-                op -> CompletionSuggest.setupCompletionSuggestDeserializer(op, tDocumentDeserializer));
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<TDocument>>) Builder::new,
+            op -> CompletionSuggest.setupCompletionSuggestDeserializer(op, tDocumentDeserializer)
+        );
     };
 
-    public static final JsonpDeserializer<CompletionSuggest<Object>> _DESERIALIZER = JsonpDeserializer
-            .lazy(() -> createCompletionSuggestDeserializer(
-                    new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.search._types.TDocument")));
+    public static final JsonpDeserializer<CompletionSuggest<Object>> _DESERIALIZER = JsonpDeserializer.lazy(
+        () -> createCompletionSuggestDeserializer(
+            new NamedDeserializer<>("org.opensearch.client:Deserializer:_global.search._types.TDocument")
+        )
+    );
 
     protected static <TDocument> void setupCompletionSuggestDeserializer(
-            ObjectDeserializer<CompletionSuggest.Builder<TDocument>> op,
-            JsonpDeserializer<TDocument> tDocumentDeserializer) {
+        ObjectDeserializer<CompletionSuggest.Builder<TDocument>> op,
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
         SuggestBase.setupSuggestBaseDeserializer(op);
-        op.add(Builder::options,
-                JsonpDeserializer.arrayDeserializer(
-                        CompletionSuggestOption.createCompletionSuggestOptionDeserializer(tDocumentDeserializer)),
-                "options");
+        op.add(
+            Builder::options,
+            JsonpDeserializer.arrayDeserializer(CompletionSuggestOption.createCompletionSuggestOptionDeserializer(tDocumentDeserializer)),
+            "options"
+        );
 
     }
 
@@ -157,5 +162,5 @@ protected static <TDocument> void setupCompletionSuggestDeserializer(
     public Kind _suggestionKind() {
         return Suggest.Kind.Completion;
     }
-    
+
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionSuggestOption.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionSuggestOption.java
index d46452d091..cb697e9334 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionSuggestOption.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionSuggestOption.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -43,374 +49,371 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.CompletionSuggestOption
 
-
-
 public class CompletionSuggestOption<TDocument> implements JsonpSerializable {
-	@Nullable
-	private final Boolean collateMatch;
-
-	private final Map<String, List<Context>> contexts;
-
-	private final Map<String, JsonData> fields;
-
-	private final String id;
-
-	private final String index;
-
-	@Nullable
-	private final String routing;
-
-	private final double score;
-
-	private final TDocument source;
-
-	private final String text;
-
-	@Nullable
-	private final JsonpSerializer<TDocument> tDocumentSerializer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CompletionSuggestOption(Builder<TDocument> builder) {
-
-		this.collateMatch = builder.collateMatch;
-		this.contexts = ApiTypeHelper.unmodifiable(builder.contexts);
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.routing = builder.routing;
-		this.score = ApiTypeHelper.requireNonNull(builder.score, this, "score");
-		this.source = ApiTypeHelper.requireNonNull(builder.source, this, "source");
-		this.text = ApiTypeHelper.requireNonNull(builder.text, this, "text");
-		this.tDocumentSerializer = builder.tDocumentSerializer;
-
-	}
-
-	public static <TDocument> CompletionSuggestOption<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<CompletionSuggestOption<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * API name: {@code collate_match}
-	 */
-	@Nullable
-	public final Boolean collateMatch() {
-		return this.collateMatch;
-	}
-
-	/**
-	 * API name: {@code contexts}
-	 */
-	public final Map<String, List<Context>> contexts() {
-		return this.contexts;
-	}
-
-	/**
-	 * API name: {@code fields}
-	 */
-	public final Map<String, JsonData> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * Required - API name: {@code _id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - API name: {@code _index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code _routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Required - API name: {@code _score}
-	 */
-	public final double score() {
-		return this.score;
-	}
-
-	/**
-	 * Required - API name: {@code _source}
-	 */
-	public final TDocument source() {
-		return this.source;
-	}
-
-	/**
-	 * Required - API name: {@code text}
-	 */
-	public final String text() {
-		return this.text;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.collateMatch != null) {
-			generator.writeKey("collate_match");
-			generator.write(this.collateMatch);
-
-		}
-		if (ApiTypeHelper.isDefined(this.contexts)) {
-			generator.writeKey("contexts");
-			generator.writeStartObject();
-			for (Map.Entry<String, List<Context>> item0 : this.contexts.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.writeStartArray();
-				if (item0.getValue() != null) {
-					for (Context item1 : item0.getValue()) {
-						item1.serialize(generator, mapper);
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.fields.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("_id");
-		generator.write(this.id);
-
-		generator.writeKey("_index");
-		generator.write(this.index);
-
-		if (this.routing != null) {
-			generator.writeKey("_routing");
-			generator.write(this.routing);
-
-		}
-		generator.writeKey("_score");
-		generator.write(this.score);
-
-		generator.writeKey("_source");
-		JsonpUtils.serialize(this.source, generator, tDocumentSerializer, mapper);
-
-		generator.writeKey("text");
-		generator.write(this.text);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CompletionSuggestOption}.
-	 */
-
-	public static class Builder<TDocument> extends ObjectBuilderBase
-			implements
-				ObjectBuilder<CompletionSuggestOption<TDocument>> {
-		@Nullable
-		private Boolean collateMatch;
-
-		@Nullable
-		private Map<String, List<Context>> contexts;
-
-		@Nullable
-		private Map<String, JsonData> fields;
-
-		private String id;
-
-		private String index;
-
-		@Nullable
-		private String routing;
-
-		private Double score;
-
-		private TDocument source;
-
-		private String text;
-
-		@Nullable
-		private JsonpSerializer<TDocument> tDocumentSerializer;
-
-		/**
-		 * API name: {@code collate_match}
-		 */
-		public final Builder<TDocument> collateMatch(@Nullable Boolean value) {
-			this.collateMatch = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code contexts}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>contexts</code>.
-		 */
-		public final Builder<TDocument> contexts(Map<String, List<Context>> map) {
-			this.contexts = _mapPutAll(this.contexts, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code contexts}
-		 * <p>
-		 * Adds an entry to <code>contexts</code>.
-		 */
-		public final Builder<TDocument> contexts(String key, List<Context> value) {
-			this.contexts = _mapPut(this.contexts, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>fields</code>.
-		 */
-		public final Builder<TDocument> fields(Map<String, JsonData> map) {
-			this.fields = _mapPutAll(this.fields, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds an entry to <code>fields</code>.
-		 */
-		public final Builder<TDocument> fields(String key, JsonData value) {
-			this.fields = _mapPut(this.fields, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _id}
-		 */
-		public final Builder<TDocument> id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _index}
-		 */
-		public final Builder<TDocument> index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _routing}
-		 */
-		public final Builder<TDocument> routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _score}
-		 */
-		public final Builder<TDocument> score(double value) {
-			this.score = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _source}
-		 */
-		public final Builder<TDocument> source(TDocument value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code text}
-		 */
-		public final Builder<TDocument> text(String value) {
-			this.text = value;
-			return this;
-		}
-
-		/**
-		 * Serializer for TDocument. If not set, an attempt will be made to find a
-		 * serializer from the JSON context.
-		 */
-		public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
-			this.tDocumentSerializer = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CompletionSuggestOption}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CompletionSuggestOption<TDocument> build() {
-			_checkSingleUse();
-
-			return new CompletionSuggestOption<TDocument>(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Create a JSON deserializer for CompletionSuggestOption
-	 */
-	public static <TDocument> JsonpDeserializer<CompletionSuggestOption<TDocument>> createCompletionSuggestOptionDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return ObjectBuilderDeserializer.createForObject((Supplier<Builder<TDocument>>) Builder::new,
-				op -> CompletionSuggestOption.setupCompletionSuggestOptionDeserializer(op, tDocumentDeserializer));
-	};
-
-	protected static <TDocument> void setupCompletionSuggestOptionDeserializer(
-			ObjectDeserializer<CompletionSuggestOption.Builder<TDocument>> op,
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-
-		op.add(Builder::collateMatch, JsonpDeserializer.booleanDeserializer(), "collate_match");
-		op.add(Builder::contexts,
-				JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.arrayDeserializer(Context._DESERIALIZER)),
-				"contexts");
-		op.add(Builder::fields, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "fields");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
-		op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "_routing");
-		op.add(Builder::score, JsonpDeserializer.doubleDeserializer(), "_score");
-		op.add(Builder::source, tDocumentDeserializer, "_source");
-		op.add(Builder::text, JsonpDeserializer.stringDeserializer(), "text");
-
-	}
+    @Nullable
+    private final Boolean collateMatch;
+
+    private final Map<String, List<Context>> contexts;
+
+    private final Map<String, JsonData> fields;
+
+    private final String id;
+
+    private final String index;
+
+    @Nullable
+    private final String routing;
+
+    private final double score;
+
+    private final TDocument source;
+
+    private final String text;
+
+    @Nullable
+    private final JsonpSerializer<TDocument> tDocumentSerializer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CompletionSuggestOption(Builder<TDocument> builder) {
+
+        this.collateMatch = builder.collateMatch;
+        this.contexts = ApiTypeHelper.unmodifiable(builder.contexts);
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.routing = builder.routing;
+        this.score = ApiTypeHelper.requireNonNull(builder.score, this, "score");
+        this.source = ApiTypeHelper.requireNonNull(builder.source, this, "source");
+        this.text = ApiTypeHelper.requireNonNull(builder.text, this, "text");
+        this.tDocumentSerializer = builder.tDocumentSerializer;
+
+    }
+
+    public static <TDocument> CompletionSuggestOption<TDocument> of(
+        Function<Builder<TDocument>, ObjectBuilder<CompletionSuggestOption<TDocument>>> fn
+    ) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * API name: {@code collate_match}
+     */
+    @Nullable
+    public final Boolean collateMatch() {
+        return this.collateMatch;
+    }
+
+    /**
+     * API name: {@code contexts}
+     */
+    public final Map<String, List<Context>> contexts() {
+        return this.contexts;
+    }
+
+    /**
+     * API name: {@code fields}
+     */
+    public final Map<String, JsonData> fields() {
+        return this.fields;
+    }
+
+    /**
+     * Required - API name: {@code _id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - API name: {@code _index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code _routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * Required - API name: {@code _score}
+     */
+    public final double score() {
+        return this.score;
+    }
+
+    /**
+     * Required - API name: {@code _source}
+     */
+    public final TDocument source() {
+        return this.source;
+    }
+
+    /**
+     * Required - API name: {@code text}
+     */
+    public final String text() {
+        return this.text;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.collateMatch != null) {
+            generator.writeKey("collate_match");
+            generator.write(this.collateMatch);
+
+        }
+        if (ApiTypeHelper.isDefined(this.contexts)) {
+            generator.writeKey("contexts");
+            generator.writeStartObject();
+            for (Map.Entry<String, List<Context>> item0 : this.contexts.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.writeStartArray();
+                if (item0.getValue() != null) {
+                    for (Context item1 : item0.getValue()) {
+                        item1.serialize(generator, mapper);
+
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.fields.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("_id");
+        generator.write(this.id);
+
+        generator.writeKey("_index");
+        generator.write(this.index);
+
+        if (this.routing != null) {
+            generator.writeKey("_routing");
+            generator.write(this.routing);
+
+        }
+        generator.writeKey("_score");
+        generator.write(this.score);
+
+        generator.writeKey("_source");
+        JsonpUtils.serialize(this.source, generator, tDocumentSerializer, mapper);
+
+        generator.writeKey("text");
+        generator.write(this.text);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CompletionSuggestOption}.
+     */
+
+    public static class Builder<TDocument> extends ObjectBuilderBase implements ObjectBuilder<CompletionSuggestOption<TDocument>> {
+        @Nullable
+        private Boolean collateMatch;
+
+        @Nullable
+        private Map<String, List<Context>> contexts;
+
+        @Nullable
+        private Map<String, JsonData> fields;
+
+        private String id;
+
+        private String index;
+
+        @Nullable
+        private String routing;
+
+        private Double score;
+
+        private TDocument source;
+
+        private String text;
+
+        @Nullable
+        private JsonpSerializer<TDocument> tDocumentSerializer;
+
+        /**
+         * API name: {@code collate_match}
+         */
+        public final Builder<TDocument> collateMatch(@Nullable Boolean value) {
+            this.collateMatch = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code contexts}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>contexts</code>.
+         */
+        public final Builder<TDocument> contexts(Map<String, List<Context>> map) {
+            this.contexts = _mapPutAll(this.contexts, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code contexts}
+         * <p>
+         * Adds an entry to <code>contexts</code>.
+         */
+        public final Builder<TDocument> contexts(String key, List<Context> value) {
+            this.contexts = _mapPut(this.contexts, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>fields</code>.
+         */
+        public final Builder<TDocument> fields(Map<String, JsonData> map) {
+            this.fields = _mapPutAll(this.fields, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds an entry to <code>fields</code>.
+         */
+        public final Builder<TDocument> fields(String key, JsonData value) {
+            this.fields = _mapPut(this.fields, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _id}
+         */
+        public final Builder<TDocument> id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _index}
+         */
+        public final Builder<TDocument> index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _routing}
+         */
+        public final Builder<TDocument> routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _score}
+         */
+        public final Builder<TDocument> score(double value) {
+            this.score = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _source}
+         */
+        public final Builder<TDocument> source(TDocument value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code text}
+         */
+        public final Builder<TDocument> text(String value) {
+            this.text = value;
+            return this;
+        }
+
+        /**
+         * Serializer for TDocument. If not set, an attempt will be made to find a
+         * serializer from the JSON context.
+         */
+        public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
+            this.tDocumentSerializer = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link CompletionSuggestOption}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CompletionSuggestOption<TDocument> build() {
+            _checkSingleUse();
+
+            return new CompletionSuggestOption<TDocument>(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Create a JSON deserializer for CompletionSuggestOption
+     */
+    public static <TDocument> JsonpDeserializer<CompletionSuggestOption<TDocument>> createCompletionSuggestOptionDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<TDocument>>) Builder::new,
+            op -> CompletionSuggestOption.setupCompletionSuggestOptionDeserializer(op, tDocumentDeserializer)
+        );
+    };
+
+    protected static <TDocument> void setupCompletionSuggestOptionDeserializer(
+        ObjectDeserializer<CompletionSuggestOption.Builder<TDocument>> op,
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+
+        op.add(Builder::collateMatch, JsonpDeserializer.booleanDeserializer(), "collate_match");
+        op.add(
+            Builder::contexts,
+            JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.arrayDeserializer(Context._DESERIALIZER)),
+            "contexts"
+        );
+        op.add(Builder::fields, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "fields");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
+        op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "_routing");
+        op.add(Builder::score, JsonpDeserializer.doubleDeserializer(), "_score");
+        op.add(Builder::source, tDocumentDeserializer, "_source");
+        op.add(Builder::text, JsonpDeserializer.stringDeserializer(), "text");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionSuggester.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionSuggester.java
index c42d512e78..42a7ba1280 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionSuggester.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionSuggester.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,256 +44,254 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.CompletionSuggester
 
 @JsonpDeserializable
 public class CompletionSuggester extends SuggesterBase implements FieldSuggesterVariant {
-	private final Map<String, List<CompletionContext>> contexts;
-
-	@Nullable
-	private final SuggestFuzziness fuzzy;
-
-	@Nullable
-	private final String prefix;
-
-	@Nullable
-	private final String regex;
-
-	@Nullable
-	private final Boolean skipDuplicates;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CompletionSuggester(Builder builder) {
-		super(builder);
-
-		this.contexts = ApiTypeHelper.unmodifiable(builder.contexts);
-		this.fuzzy = builder.fuzzy;
-		this.prefix = builder.prefix;
-		this.regex = builder.regex;
-		this.skipDuplicates = builder.skipDuplicates;
-
-	}
-
-	public static CompletionSuggester of(Function<Builder, ObjectBuilder<CompletionSuggester>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * FieldSuggester variant kind.
-	 */
-	@Override
-	public FieldSuggester.Kind _fieldSuggesterKind() {
-		return FieldSuggester.Kind.Completion;
-	}
-
-	/**
-	 * API name: {@code contexts}
-	 */
-	public final Map<String, List<CompletionContext>> contexts() {
-		return this.contexts;
-	}
-
-	/**
-	 * API name: {@code fuzzy}
-	 */
-	@Nullable
-	public final SuggestFuzziness fuzzy() {
-		return this.fuzzy;
-	}
-
-	/**
-	 * API name: {@code prefix}
-	 */
-	@Nullable
-	public final String prefix() {
-		return this.prefix;
-	}
-
-	/**
-	 * API name: {@code regex}
-	 */
-	@Nullable
-	public final String regex() {
-		return this.regex;
-	}
-
-	/**
-	 * API name: {@code skip_duplicates}
-	 */
-	@Nullable
-	public final Boolean skipDuplicates() {
-		return this.skipDuplicates;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.contexts)) {
-			generator.writeKey("contexts");
-			generator.writeStartObject();
-			for (Map.Entry<String, List<CompletionContext>> item0 : this.contexts.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.writeStartArray();
-				if (item0.getValue() != null) {
-					for (CompletionContext item1 : item0.getValue()) {
-						item1.serialize(generator, mapper);
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.fuzzy != null) {
-			generator.writeKey("fuzzy");
-			this.fuzzy.serialize(generator, mapper);
-
-		}
-		if (this.prefix != null) {
-			generator.writeKey("prefix");
-			generator.write(this.prefix);
-
-		}
-		if (this.regex != null) {
-			generator.writeKey("regex");
-			generator.write(this.regex);
-
-		}
-		if (this.skipDuplicates != null) {
-			generator.writeKey("skip_duplicates");
-			generator.write(this.skipDuplicates);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CompletionSuggester}.
-	 */
-
-	public static class Builder extends SuggesterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<CompletionSuggester> {
-		@Nullable
-		private Map<String, List<CompletionContext>> contexts;
-
-		@Nullable
-		private SuggestFuzziness fuzzy;
-
-		@Nullable
-		private String prefix;
-
-		@Nullable
-		private String regex;
-
-		@Nullable
-		private Boolean skipDuplicates;
-
-		/**
-		 * API name: {@code contexts}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>contexts</code>.
-		 */
-		public final Builder contexts(Map<String, List<CompletionContext>> map) {
-			this.contexts = _mapPutAll(this.contexts, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code contexts}
-		 * <p>
-		 * Adds an entry to <code>contexts</code>.
-		 */
-		public final Builder contexts(String key, List<CompletionContext> value) {
-			this.contexts = _mapPut(this.contexts, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzzy}
-		 */
-		public final Builder fuzzy(@Nullable SuggestFuzziness value) {
-			this.fuzzy = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fuzzy}
-		 */
-		public final Builder fuzzy(Function<SuggestFuzziness.Builder, ObjectBuilder<SuggestFuzziness>> fn) {
-			return this.fuzzy(fn.apply(new SuggestFuzziness.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code prefix}
-		 */
-		public final Builder prefix(@Nullable String value) {
-			this.prefix = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code regex}
-		 */
-		public final Builder regex(@Nullable String value) {
-			this.regex = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code skip_duplicates}
-		 */
-		public final Builder skipDuplicates(@Nullable Boolean value) {
-			this.skipDuplicates = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CompletionSuggester}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CompletionSuggester build() {
-			_checkSingleUse();
-
-			return new CompletionSuggester(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CompletionSuggester}
-	 */
-	public static final JsonpDeserializer<CompletionSuggester> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CompletionSuggester::setupCompletionSuggesterDeserializer);
-
-	protected static void setupCompletionSuggesterDeserializer(ObjectDeserializer<CompletionSuggester.Builder> op) {
-		SuggesterBase.setupSuggesterBaseDeserializer(op);
-		op.add(Builder::contexts, JsonpDeserializer.stringMapDeserializer(
-				JsonpDeserializer.arrayDeserializer(CompletionContext._DESERIALIZER)), "contexts");
-		op.add(Builder::fuzzy, SuggestFuzziness._DESERIALIZER, "fuzzy");
-		op.add(Builder::prefix, JsonpDeserializer.stringDeserializer(), "prefix");
-		op.add(Builder::regex, JsonpDeserializer.stringDeserializer(), "regex");
-		op.add(Builder::skipDuplicates, JsonpDeserializer.booleanDeserializer(), "skip_duplicates");
-
-	}
+    private final Map<String, List<CompletionContext>> contexts;
+
+    @Nullable
+    private final SuggestFuzziness fuzzy;
+
+    @Nullable
+    private final String prefix;
+
+    @Nullable
+    private final String regex;
+
+    @Nullable
+    private final Boolean skipDuplicates;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CompletionSuggester(Builder builder) {
+        super(builder);
+
+        this.contexts = ApiTypeHelper.unmodifiable(builder.contexts);
+        this.fuzzy = builder.fuzzy;
+        this.prefix = builder.prefix;
+        this.regex = builder.regex;
+        this.skipDuplicates = builder.skipDuplicates;
+
+    }
+
+    public static CompletionSuggester of(Function<Builder, ObjectBuilder<CompletionSuggester>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * FieldSuggester variant kind.
+     */
+    @Override
+    public FieldSuggester.Kind _fieldSuggesterKind() {
+        return FieldSuggester.Kind.Completion;
+    }
+
+    /**
+     * API name: {@code contexts}
+     */
+    public final Map<String, List<CompletionContext>> contexts() {
+        return this.contexts;
+    }
+
+    /**
+     * API name: {@code fuzzy}
+     */
+    @Nullable
+    public final SuggestFuzziness fuzzy() {
+        return this.fuzzy;
+    }
+
+    /**
+     * API name: {@code prefix}
+     */
+    @Nullable
+    public final String prefix() {
+        return this.prefix;
+    }
+
+    /**
+     * API name: {@code regex}
+     */
+    @Nullable
+    public final String regex() {
+        return this.regex;
+    }
+
+    /**
+     * API name: {@code skip_duplicates}
+     */
+    @Nullable
+    public final Boolean skipDuplicates() {
+        return this.skipDuplicates;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.contexts)) {
+            generator.writeKey("contexts");
+            generator.writeStartObject();
+            for (Map.Entry<String, List<CompletionContext>> item0 : this.contexts.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.writeStartArray();
+                if (item0.getValue() != null) {
+                    for (CompletionContext item1 : item0.getValue()) {
+                        item1.serialize(generator, mapper);
+
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.fuzzy != null) {
+            generator.writeKey("fuzzy");
+            this.fuzzy.serialize(generator, mapper);
+
+        }
+        if (this.prefix != null) {
+            generator.writeKey("prefix");
+            generator.write(this.prefix);
+
+        }
+        if (this.regex != null) {
+            generator.writeKey("regex");
+            generator.write(this.regex);
+
+        }
+        if (this.skipDuplicates != null) {
+            generator.writeKey("skip_duplicates");
+            generator.write(this.skipDuplicates);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CompletionSuggester}.
+     */
+
+    public static class Builder extends SuggesterBase.AbstractBuilder<Builder> implements ObjectBuilder<CompletionSuggester> {
+        @Nullable
+        private Map<String, List<CompletionContext>> contexts;
+
+        @Nullable
+        private SuggestFuzziness fuzzy;
+
+        @Nullable
+        private String prefix;
+
+        @Nullable
+        private String regex;
+
+        @Nullable
+        private Boolean skipDuplicates;
+
+        /**
+         * API name: {@code contexts}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>contexts</code>.
+         */
+        public final Builder contexts(Map<String, List<CompletionContext>> map) {
+            this.contexts = _mapPutAll(this.contexts, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code contexts}
+         * <p>
+         * Adds an entry to <code>contexts</code>.
+         */
+        public final Builder contexts(String key, List<CompletionContext> value) {
+            this.contexts = _mapPut(this.contexts, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzzy}
+         */
+        public final Builder fuzzy(@Nullable SuggestFuzziness value) {
+            this.fuzzy = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fuzzy}
+         */
+        public final Builder fuzzy(Function<SuggestFuzziness.Builder, ObjectBuilder<SuggestFuzziness>> fn) {
+            return this.fuzzy(fn.apply(new SuggestFuzziness.Builder()).build());
+        }
+
+        /**
+         * API name: {@code prefix}
+         */
+        public final Builder prefix(@Nullable String value) {
+            this.prefix = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code regex}
+         */
+        public final Builder regex(@Nullable String value) {
+            this.regex = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code skip_duplicates}
+         */
+        public final Builder skipDuplicates(@Nullable Boolean value) {
+            this.skipDuplicates = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CompletionSuggester}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CompletionSuggester build() {
+            _checkSingleUse();
+
+            return new CompletionSuggester(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CompletionSuggester}
+     */
+    public static final JsonpDeserializer<CompletionSuggester> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CompletionSuggester::setupCompletionSuggesterDeserializer
+    );
+
+    protected static void setupCompletionSuggesterDeserializer(ObjectDeserializer<CompletionSuggester.Builder> op) {
+        SuggesterBase.setupSuggesterBaseDeserializer(op);
+        op.add(
+            Builder::contexts,
+            JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.arrayDeserializer(CompletionContext._DESERIALIZER)),
+            "contexts"
+        );
+        op.add(Builder::fuzzy, SuggestFuzziness._DESERIALIZER, "fuzzy");
+        op.add(Builder::prefix, JsonpDeserializer.stringDeserializer(), "prefix");
+        op.add(Builder::regex, JsonpDeserializer.stringDeserializer(), "regex");
+        op.add(Builder::skipDuplicates, JsonpDeserializer.booleanDeserializer(), "skip_duplicates");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Context.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Context.java
index 700852ec63..5aaf2780ac 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Context.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Context.java
@@ -32,147 +32,146 @@
 
 package org.opensearch.client.opensearch.core.search;
 
-import org.opensearch.client.opensearch._types.GeoLocation;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.UnionDeserializer;
+import org.opensearch.client.opensearch._types.GeoLocation;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _global.search._types.Context
 
 /**
  * Text or location that we want similar documents for or a lookup to a
  * document's field for the text.
- * 
+ *
  */
 @JsonpDeserializable
 public class Context implements TaggedUnion<Context.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Location, Category
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private Context(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	private Context(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static Context of(Function<Builder, ObjectBuilder<Context>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code location}?
-	 */
-	public boolean isLocation() {
-		return _kind == Kind.Location;
-	}
-
-	/**
-	 * Get the {@code location} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code location} kind.
-	 */
-	public GeoLocation location() {
-		return TaggedUnionUtils.get(this, Kind.Location);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code category}?
-	 */
-	public boolean isCategory() {
-		return _kind == Kind.Category;
-	}
-
-	/**
-	 * Get the {@code category} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code category} kind.
-	 */
-	public String category() {
-		return TaggedUnionUtils.get(this, Kind.Category);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Category :
-					generator.write(((String) this._value));
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Context> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<Context> location(GeoLocation v) {
-			this._kind = Kind.Location;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Context> location(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
-			return this.location(fn.apply(new GeoLocation.Builder()).build());
-		}
-
-		public ObjectBuilder<Context> category(String v) {
-			this._kind = Kind.Category;
-			this._value = v;
-			return this;
-		}
-
-		public Context build() {
-			_checkSingleUse();
-			return new Context(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<Context> buildContextDeserializer() {
-		return new UnionDeserializer.Builder<Context, Kind, Object>(Context::new, true)
-				.addMember(Kind.Location, GeoLocation._DESERIALIZER)
-				.addMember(Kind.Category, JsonpDeserializer.stringDeserializer()).build();
-	}
-
-	public static final JsonpDeserializer<Context> _DESERIALIZER = JsonpDeserializer
-			.lazy(Context::buildContextDeserializer);
+    public enum Kind {
+        Location,
+        Category
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private Context(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private Context(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static Context of(Function<Builder, ObjectBuilder<Context>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code location}?
+     */
+    public boolean isLocation() {
+        return _kind == Kind.Location;
+    }
+
+    /**
+     * Get the {@code location} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code location} kind.
+     */
+    public GeoLocation location() {
+        return TaggedUnionUtils.get(this, Kind.Location);
+    }
+
+    /**
+     * Is this variant instance of kind {@code category}?
+     */
+    public boolean isCategory() {
+        return _kind == Kind.Category;
+    }
+
+    /**
+     * Get the {@code category} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code category} kind.
+     */
+    public String category() {
+        return TaggedUnionUtils.get(this, Kind.Category);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Category:
+                    generator.write(((String) this._value));
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Context> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<Context> location(GeoLocation v) {
+            this._kind = Kind.Location;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Context> location(Function<GeoLocation.Builder, ObjectBuilder<GeoLocation>> fn) {
+            return this.location(fn.apply(new GeoLocation.Builder()).build());
+        }
+
+        public ObjectBuilder<Context> category(String v) {
+            this._kind = Kind.Category;
+            this._value = v;
+            return this;
+        }
+
+        public Context build() {
+            _checkSingleUse();
+            return new Context(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<Context> buildContextDeserializer() {
+        return new UnionDeserializer.Builder<Context, Kind, Object>(Context::new, true).addMember(Kind.Location, GeoLocation._DESERIALIZER)
+            .addMember(Kind.Category, JsonpDeserializer.stringDeserializer())
+            .build();
+    }
+
+    public static final JsonpDeserializer<Context> _DESERIALIZER = JsonpDeserializer.lazy(Context::buildContextDeserializer);
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/ContextBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/ContextBuilders.java
index 6dd1068191..edb8fa1f05 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/ContextBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/ContextBuilders.java
@@ -39,18 +39,17 @@
  * <p>
  * Variants <code>category</code> are not available here as they don't have a
  * dedicated class. Use {@link Context}'s builder for these.
- * 
+ *
  */
 public class ContextBuilders {
-	private ContextBuilders() {
-	}
+    private ContextBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link GeoLocation location} {@code Context}
-	 * variant.
-	 */
-	public static GeoLocation.Builder location() {
-		return new GeoLocation.Builder();
-	}
+    /**
+     * Creates a builder for the {@link GeoLocation location} {@code Context}
+     * variant.
+     */
+    public static GeoLocation.Builder location() {
+        return new GeoLocation.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/DirectGenerator.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/DirectGenerator.java
index d29fb63c8e..797696a76f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/DirectGenerator.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/DirectGenerator.java
@@ -32,394 +32,395 @@
 
 package org.opensearch.client.opensearch.core.search;
 
-import org.opensearch.client.opensearch._types.SuggestMode;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.SuggestMode;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.DirectGenerator
 
-
 @JsonpDeserializable
 public class DirectGenerator implements JsonpSerializable {
-	private final String field;
-
-	@Nullable
-	private final Integer maxEdits;
-
-	@Nullable
-	private final Float maxInspections;
-
-	@Nullable
-	private final Float maxTermFreq;
-
-	@Nullable
-	private final Float minDocFreq;
-
-	@Nullable
-	private final Integer minWordLength;
-
-	@Nullable
-	private final String postFilter;
-
-	@Nullable
-	private final String preFilter;
-
-	@Nullable
-	private final Integer prefixLength;
-
-	@Nullable
-	private final Integer size;
-
-	@Nullable
-	private final SuggestMode suggestMode;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DirectGenerator(Builder builder) {
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.maxEdits = builder.maxEdits;
-		this.maxInspections = builder.maxInspections;
-		this.maxTermFreq = builder.maxTermFreq;
-		this.minDocFreq = builder.minDocFreq;
-		this.minWordLength = builder.minWordLength;
-		this.postFilter = builder.postFilter;
-		this.preFilter = builder.preFilter;
-		this.prefixLength = builder.prefixLength;
-		this.size = builder.size;
-		this.suggestMode = builder.suggestMode;
-
-	}
-
-	public static DirectGenerator of(Function<Builder, ObjectBuilder<DirectGenerator>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code max_edits}
-	 */
-	@Nullable
-	public final Integer maxEdits() {
-		return this.maxEdits;
-	}
-
-	/**
-	 * API name: {@code max_inspections}
-	 */
-	@Nullable
-	public final Float maxInspections() {
-		return this.maxInspections;
-	}
-
-	/**
-	 * API name: {@code max_term_freq}
-	 */
-	@Nullable
-	public final Float maxTermFreq() {
-		return this.maxTermFreq;
-	}
-
-	/**
-	 * API name: {@code min_doc_freq}
-	 */
-	@Nullable
-	public final Float minDocFreq() {
-		return this.minDocFreq;
-	}
-
-	/**
-	 * API name: {@code min_word_length}
-	 */
-	@Nullable
-	public final Integer minWordLength() {
-		return this.minWordLength;
-	}
-
-	/**
-	 * API name: {@code post_filter}
-	 */
-	@Nullable
-	public final String postFilter() {
-		return this.postFilter;
-	}
-
-	/**
-	 * API name: {@code pre_filter}
-	 */
-	@Nullable
-	public final String preFilter() {
-		return this.preFilter;
-	}
-
-	/**
-	 * API name: {@code prefix_length}
-	 */
-	@Nullable
-	public final Integer prefixLength() {
-		return this.prefixLength;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	/**
-	 * API name: {@code suggest_mode}
-	 */
-	@Nullable
-	public final SuggestMode suggestMode() {
-		return this.suggestMode;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.maxEdits != null) {
-			generator.writeKey("max_edits");
-			generator.write(this.maxEdits);
-
-		}
-		if (this.maxInspections != null) {
-			generator.writeKey("max_inspections");
-			generator.write(this.maxInspections);
-
-		}
-		if (this.maxTermFreq != null) {
-			generator.writeKey("max_term_freq");
-			generator.write(this.maxTermFreq);
-
-		}
-		if (this.minDocFreq != null) {
-			generator.writeKey("min_doc_freq");
-			generator.write(this.minDocFreq);
-
-		}
-		if (this.minWordLength != null) {
-			generator.writeKey("min_word_length");
-			generator.write(this.minWordLength);
-
-		}
-		if (this.postFilter != null) {
-			generator.writeKey("post_filter");
-			generator.write(this.postFilter);
-
-		}
-		if (this.preFilter != null) {
-			generator.writeKey("pre_filter");
-			generator.write(this.preFilter);
-
-		}
-		if (this.prefixLength != null) {
-			generator.writeKey("prefix_length");
-			generator.write(this.prefixLength);
-
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		if (this.suggestMode != null) {
-			generator.writeKey("suggest_mode");
-			this.suggestMode.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DirectGenerator}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DirectGenerator> {
-		private String field;
-
-		@Nullable
-		private Integer maxEdits;
-
-		@Nullable
-		private Float maxInspections;
-
-		@Nullable
-		private Float maxTermFreq;
-
-		@Nullable
-		private Float minDocFreq;
-
-		@Nullable
-		private Integer minWordLength;
-
-		@Nullable
-		private String postFilter;
-
-		@Nullable
-		private String preFilter;
-
-		@Nullable
-		private Integer prefixLength;
-
-		@Nullable
-		private Integer size;
-
-		@Nullable
-		private SuggestMode suggestMode;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_edits}
-		 */
-		public final Builder maxEdits(@Nullable Integer value) {
-			this.maxEdits = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_inspections}
-		 */
-		public final Builder maxInspections(@Nullable Float value) {
-			this.maxInspections = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_term_freq}
-		 */
-		public final Builder maxTermFreq(@Nullable Float value) {
-			this.maxTermFreq = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_doc_freq}
-		 */
-		public final Builder minDocFreq(@Nullable Float value) {
-			this.minDocFreq = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_word_length}
-		 */
-		public final Builder minWordLength(@Nullable Integer value) {
-			this.minWordLength = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code post_filter}
-		 */
-		public final Builder postFilter(@Nullable String value) {
-			this.postFilter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code pre_filter}
-		 */
-		public final Builder preFilter(@Nullable String value) {
-			this.preFilter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code prefix_length}
-		 */
-		public final Builder prefixLength(@Nullable Integer value) {
-			this.prefixLength = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Integer value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code suggest_mode}
-		 */
-		public final Builder suggestMode(@Nullable SuggestMode value) {
-			this.suggestMode = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DirectGenerator}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DirectGenerator build() {
-			_checkSingleUse();
-
-			return new DirectGenerator(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DirectGenerator}
-	 */
-	public static final JsonpDeserializer<DirectGenerator> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			DirectGenerator::setupDirectGeneratorDeserializer);
-
-	protected static void setupDirectGeneratorDeserializer(ObjectDeserializer<DirectGenerator.Builder> op) {
-
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::maxEdits, JsonpDeserializer.integerDeserializer(), "max_edits");
-		op.add(Builder::maxInspections, JsonpDeserializer.floatDeserializer(), "max_inspections");
-		op.add(Builder::maxTermFreq, JsonpDeserializer.floatDeserializer(), "max_term_freq");
-		op.add(Builder::minDocFreq, JsonpDeserializer.floatDeserializer(), "min_doc_freq");
-		op.add(Builder::minWordLength, JsonpDeserializer.integerDeserializer(), "min_word_length");
-		op.add(Builder::postFilter, JsonpDeserializer.stringDeserializer(), "post_filter");
-		op.add(Builder::preFilter, JsonpDeserializer.stringDeserializer(), "pre_filter");
-		op.add(Builder::prefixLength, JsonpDeserializer.integerDeserializer(), "prefix_length");
-		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
-		op.add(Builder::suggestMode, SuggestMode._DESERIALIZER, "suggest_mode");
-
-	}
+    private final String field;
+
+    @Nullable
+    private final Integer maxEdits;
+
+    @Nullable
+    private final Float maxInspections;
+
+    @Nullable
+    private final Float maxTermFreq;
+
+    @Nullable
+    private final Float minDocFreq;
+
+    @Nullable
+    private final Integer minWordLength;
+
+    @Nullable
+    private final String postFilter;
+
+    @Nullable
+    private final String preFilter;
+
+    @Nullable
+    private final Integer prefixLength;
+
+    @Nullable
+    private final Integer size;
+
+    @Nullable
+    private final SuggestMode suggestMode;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DirectGenerator(Builder builder) {
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.maxEdits = builder.maxEdits;
+        this.maxInspections = builder.maxInspections;
+        this.maxTermFreq = builder.maxTermFreq;
+        this.minDocFreq = builder.minDocFreq;
+        this.minWordLength = builder.minWordLength;
+        this.postFilter = builder.postFilter;
+        this.preFilter = builder.preFilter;
+        this.prefixLength = builder.prefixLength;
+        this.size = builder.size;
+        this.suggestMode = builder.suggestMode;
+
+    }
+
+    public static DirectGenerator of(Function<Builder, ObjectBuilder<DirectGenerator>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code max_edits}
+     */
+    @Nullable
+    public final Integer maxEdits() {
+        return this.maxEdits;
+    }
+
+    /**
+     * API name: {@code max_inspections}
+     */
+    @Nullable
+    public final Float maxInspections() {
+        return this.maxInspections;
+    }
+
+    /**
+     * API name: {@code max_term_freq}
+     */
+    @Nullable
+    public final Float maxTermFreq() {
+        return this.maxTermFreq;
+    }
+
+    /**
+     * API name: {@code min_doc_freq}
+     */
+    @Nullable
+    public final Float minDocFreq() {
+        return this.minDocFreq;
+    }
+
+    /**
+     * API name: {@code min_word_length}
+     */
+    @Nullable
+    public final Integer minWordLength() {
+        return this.minWordLength;
+    }
+
+    /**
+     * API name: {@code post_filter}
+     */
+    @Nullable
+    public final String postFilter() {
+        return this.postFilter;
+    }
+
+    /**
+     * API name: {@code pre_filter}
+     */
+    @Nullable
+    public final String preFilter() {
+        return this.preFilter;
+    }
+
+    /**
+     * API name: {@code prefix_length}
+     */
+    @Nullable
+    public final Integer prefixLength() {
+        return this.prefixLength;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    /**
+     * API name: {@code suggest_mode}
+     */
+    @Nullable
+    public final SuggestMode suggestMode() {
+        return this.suggestMode;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.maxEdits != null) {
+            generator.writeKey("max_edits");
+            generator.write(this.maxEdits);
+
+        }
+        if (this.maxInspections != null) {
+            generator.writeKey("max_inspections");
+            generator.write(this.maxInspections);
+
+        }
+        if (this.maxTermFreq != null) {
+            generator.writeKey("max_term_freq");
+            generator.write(this.maxTermFreq);
+
+        }
+        if (this.minDocFreq != null) {
+            generator.writeKey("min_doc_freq");
+            generator.write(this.minDocFreq);
+
+        }
+        if (this.minWordLength != null) {
+            generator.writeKey("min_word_length");
+            generator.write(this.minWordLength);
+
+        }
+        if (this.postFilter != null) {
+            generator.writeKey("post_filter");
+            generator.write(this.postFilter);
+
+        }
+        if (this.preFilter != null) {
+            generator.writeKey("pre_filter");
+            generator.write(this.preFilter);
+
+        }
+        if (this.prefixLength != null) {
+            generator.writeKey("prefix_length");
+            generator.write(this.prefixLength);
+
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        if (this.suggestMode != null) {
+            generator.writeKey("suggest_mode");
+            this.suggestMode.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DirectGenerator}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DirectGenerator> {
+        private String field;
+
+        @Nullable
+        private Integer maxEdits;
+
+        @Nullable
+        private Float maxInspections;
+
+        @Nullable
+        private Float maxTermFreq;
+
+        @Nullable
+        private Float minDocFreq;
+
+        @Nullable
+        private Integer minWordLength;
+
+        @Nullable
+        private String postFilter;
+
+        @Nullable
+        private String preFilter;
+
+        @Nullable
+        private Integer prefixLength;
+
+        @Nullable
+        private Integer size;
+
+        @Nullable
+        private SuggestMode suggestMode;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_edits}
+         */
+        public final Builder maxEdits(@Nullable Integer value) {
+            this.maxEdits = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_inspections}
+         */
+        public final Builder maxInspections(@Nullable Float value) {
+            this.maxInspections = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_term_freq}
+         */
+        public final Builder maxTermFreq(@Nullable Float value) {
+            this.maxTermFreq = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code min_doc_freq}
+         */
+        public final Builder minDocFreq(@Nullable Float value) {
+            this.minDocFreq = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code min_word_length}
+         */
+        public final Builder minWordLength(@Nullable Integer value) {
+            this.minWordLength = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code post_filter}
+         */
+        public final Builder postFilter(@Nullable String value) {
+            this.postFilter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code pre_filter}
+         */
+        public final Builder preFilter(@Nullable String value) {
+            this.preFilter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code prefix_length}
+         */
+        public final Builder prefixLength(@Nullable Integer value) {
+            this.prefixLength = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Integer value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code suggest_mode}
+         */
+        public final Builder suggestMode(@Nullable SuggestMode value) {
+            this.suggestMode = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link DirectGenerator}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DirectGenerator build() {
+            _checkSingleUse();
+
+            return new DirectGenerator(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DirectGenerator}
+     */
+    public static final JsonpDeserializer<DirectGenerator> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DirectGenerator::setupDirectGeneratorDeserializer
+    );
+
+    protected static void setupDirectGeneratorDeserializer(ObjectDeserializer<DirectGenerator.Builder> op) {
+
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::maxEdits, JsonpDeserializer.integerDeserializer(), "max_edits");
+        op.add(Builder::maxInspections, JsonpDeserializer.floatDeserializer(), "max_inspections");
+        op.add(Builder::maxTermFreq, JsonpDeserializer.floatDeserializer(), "max_term_freq");
+        op.add(Builder::minDocFreq, JsonpDeserializer.floatDeserializer(), "min_doc_freq");
+        op.add(Builder::minWordLength, JsonpDeserializer.integerDeserializer(), "min_word_length");
+        op.add(Builder::postFilter, JsonpDeserializer.stringDeserializer(), "post_filter");
+        op.add(Builder::preFilter, JsonpDeserializer.stringDeserializer(), "pre_filter");
+        op.add(Builder::prefixLength, JsonpDeserializer.integerDeserializer(), "prefix_length");
+        op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
+        op.add(Builder::suggestMode, SuggestMode._DESERIALIZER, "suggest_mode");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FetchProfile.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FetchProfile.java
index 3794de7a1f..10b0ac2de3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FetchProfile.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FetchProfile.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,265 +45,261 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.FetchProfile
 
-
 @JsonpDeserializable
 public class FetchProfile implements JsonpSerializable {
-	private final String type;
-
-	private final String description;
-
-	private final long timeInNanos;
-
-	private final FetchProfileBreakdown breakdown;
-
-	@Nullable
-	private final FetchProfileDebug debug;
-
-	private final List<FetchProfile> children;
-
-	// ---------------------------------------------------------------------------------------------
+    private final String type;
+
+    private final String description;
+
+    private final long timeInNanos;
+
+    private final FetchProfileBreakdown breakdown;
+
+    @Nullable
+    private final FetchProfileDebug debug;
+
+    private final List<FetchProfile> children;
+
+    // ---------------------------------------------------------------------------------------------
 
-	private FetchProfile(Builder builder) {
+    private FetchProfile(Builder builder) {
 
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-		this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
-		this.timeInNanos = ApiTypeHelper.requireNonNull(builder.timeInNanos, this, "timeInNanos");
-		this.breakdown = ApiTypeHelper.requireNonNull(builder.breakdown, this, "breakdown");
-		this.debug = builder.debug;
-		this.children = ApiTypeHelper.unmodifiable(builder.children);
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
+        this.timeInNanos = ApiTypeHelper.requireNonNull(builder.timeInNanos, this, "timeInNanos");
+        this.breakdown = ApiTypeHelper.requireNonNull(builder.breakdown, this, "breakdown");
+        this.debug = builder.debug;
+        this.children = ApiTypeHelper.unmodifiable(builder.children);
 
-	}
+    }
 
-	public static FetchProfile of(Function<Builder, ObjectBuilder<FetchProfile>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static FetchProfile of(Function<Builder, ObjectBuilder<FetchProfile>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
 
-	/**
-	 * Required - API name: {@code description}
-	 */
-	public final String description() {
-		return this.description;
-	}
+    /**
+     * Required - API name: {@code description}
+     */
+    public final String description() {
+        return this.description;
+    }
 
-	/**
-	 * Required - API name: {@code time_in_nanos}
-	 */
-	public final long timeInNanos() {
-		return this.timeInNanos;
-	}
+    /**
+     * Required - API name: {@code time_in_nanos}
+     */
+    public final long timeInNanos() {
+        return this.timeInNanos;
+    }
 
-	/**
-	 * Required - API name: {@code breakdown}
-	 */
-	public final FetchProfileBreakdown breakdown() {
-		return this.breakdown;
-	}
-
-	/**
-	 * API name: {@code debug}
-	 */
-	@Nullable
-	public final FetchProfileDebug debug() {
-		return this.debug;
-	}
-
-	/**
-	 * API name: {@code children}
-	 */
-	public final List<FetchProfile> children() {
-		return this.children;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("type");
-		generator.write(this.type);
-
-		generator.writeKey("description");
-		generator.write(this.description);
-
-		generator.writeKey("time_in_nanos");
-		generator.write(this.timeInNanos);
-
-		generator.writeKey("breakdown");
-		this.breakdown.serialize(generator, mapper);
-
-		if (this.debug != null) {
-			generator.writeKey("debug");
-			this.debug.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.children)) {
-			generator.writeKey("children");
-			generator.writeStartArray();
-			for (FetchProfile item0 : this.children) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FetchProfile}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FetchProfile> {
-		private String type;
-
-		private String description;
-
-		private Long timeInNanos;
-
-		private FetchProfileBreakdown breakdown;
-
-		@Nullable
-		private FetchProfileDebug debug;
-
-		@Nullable
-		private List<FetchProfile> children;
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code description}
-		 */
-		public final Builder description(String value) {
-			this.description = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code time_in_nanos}
-		 */
-		public final Builder timeInNanos(long value) {
-			this.timeInNanos = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code breakdown}
-		 */
-		public final Builder breakdown(FetchProfileBreakdown value) {
-			this.breakdown = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code breakdown}
-		 */
-		public final Builder breakdown(
-				Function<FetchProfileBreakdown.Builder, ObjectBuilder<FetchProfileBreakdown>> fn) {
-			return this.breakdown(fn.apply(new FetchProfileBreakdown.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code debug}
-		 */
-		public final Builder debug(@Nullable FetchProfileDebug value) {
-			this.debug = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code debug}
-		 */
-		public final Builder debug(Function<FetchProfileDebug.Builder, ObjectBuilder<FetchProfileDebug>> fn) {
-			return this.debug(fn.apply(new FetchProfileDebug.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code children}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>children</code>.
-		 */
-		public final Builder children(List<FetchProfile> list) {
-			this.children = _listAddAll(this.children, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code children}
-		 * <p>
-		 * Adds one or more values to <code>children</code>.
-		 */
-		public final Builder children(FetchProfile value, FetchProfile... values) {
-			this.children = _listAdd(this.children, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code children}
-		 * <p>
-		 * Adds a value to <code>children</code> using a builder lambda.
-		 */
-		public final Builder children(Function<FetchProfile.Builder, ObjectBuilder<FetchProfile>> fn) {
-			return children(fn.apply(new FetchProfile.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link FetchProfile}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FetchProfile build() {
-			_checkSingleUse();
-
-			return new FetchProfile(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FetchProfile}
-	 */
-	public static final JsonpDeserializer<FetchProfile> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FetchProfile::setupFetchProfileDeserializer);
-
-	protected static void setupFetchProfileDeserializer(ObjectDeserializer<FetchProfile.Builder> op) {
-
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-		op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
-		op.add(Builder::timeInNanos, JsonpDeserializer.longDeserializer(), "time_in_nanos");
-		op.add(Builder::breakdown, FetchProfileBreakdown._DESERIALIZER, "breakdown");
-		op.add(Builder::debug, FetchProfileDebug._DESERIALIZER, "debug");
-		op.add(Builder::children, JsonpDeserializer.arrayDeserializer(FetchProfile._DESERIALIZER), "children");
-
-	}
+    /**
+     * Required - API name: {@code breakdown}
+     */
+    public final FetchProfileBreakdown breakdown() {
+        return this.breakdown;
+    }
+
+    /**
+     * API name: {@code debug}
+     */
+    @Nullable
+    public final FetchProfileDebug debug() {
+        return this.debug;
+    }
+
+    /**
+     * API name: {@code children}
+     */
+    public final List<FetchProfile> children() {
+        return this.children;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("type");
+        generator.write(this.type);
+
+        generator.writeKey("description");
+        generator.write(this.description);
+
+        generator.writeKey("time_in_nanos");
+        generator.write(this.timeInNanos);
+
+        generator.writeKey("breakdown");
+        this.breakdown.serialize(generator, mapper);
+
+        if (this.debug != null) {
+            generator.writeKey("debug");
+            this.debug.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.children)) {
+            generator.writeKey("children");
+            generator.writeStartArray();
+            for (FetchProfile item0 : this.children) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FetchProfile}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FetchProfile> {
+        private String type;
+
+        private String description;
+
+        private Long timeInNanos;
+
+        private FetchProfileBreakdown breakdown;
+
+        @Nullable
+        private FetchProfileDebug debug;
+
+        @Nullable
+        private List<FetchProfile> children;
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code description}
+         */
+        public final Builder description(String value) {
+            this.description = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code time_in_nanos}
+         */
+        public final Builder timeInNanos(long value) {
+            this.timeInNanos = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code breakdown}
+         */
+        public final Builder breakdown(FetchProfileBreakdown value) {
+            this.breakdown = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code breakdown}
+         */
+        public final Builder breakdown(Function<FetchProfileBreakdown.Builder, ObjectBuilder<FetchProfileBreakdown>> fn) {
+            return this.breakdown(fn.apply(new FetchProfileBreakdown.Builder()).build());
+        }
+
+        /**
+         * API name: {@code debug}
+         */
+        public final Builder debug(@Nullable FetchProfileDebug value) {
+            this.debug = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code debug}
+         */
+        public final Builder debug(Function<FetchProfileDebug.Builder, ObjectBuilder<FetchProfileDebug>> fn) {
+            return this.debug(fn.apply(new FetchProfileDebug.Builder()).build());
+        }
+
+        /**
+         * API name: {@code children}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>children</code>.
+         */
+        public final Builder children(List<FetchProfile> list) {
+            this.children = _listAddAll(this.children, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code children}
+         * <p>
+         * Adds one or more values to <code>children</code>.
+         */
+        public final Builder children(FetchProfile value, FetchProfile... values) {
+            this.children = _listAdd(this.children, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code children}
+         * <p>
+         * Adds a value to <code>children</code> using a builder lambda.
+         */
+        public final Builder children(Function<FetchProfile.Builder, ObjectBuilder<FetchProfile>> fn) {
+            return children(fn.apply(new FetchProfile.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link FetchProfile}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FetchProfile build() {
+            _checkSingleUse();
+
+            return new FetchProfile(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FetchProfile}
+     */
+    public static final JsonpDeserializer<FetchProfile> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FetchProfile::setupFetchProfileDeserializer
+    );
+
+    protected static void setupFetchProfileDeserializer(ObjectDeserializer<FetchProfile.Builder> op) {
+
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+        op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
+        op.add(Builder::timeInNanos, JsonpDeserializer.longDeserializer(), "time_in_nanos");
+        op.add(Builder::breakdown, FetchProfileBreakdown._DESERIALIZER, "breakdown");
+        op.add(Builder::debug, FetchProfileDebug._DESERIALIZER, "debug");
+        op.add(Builder::children, JsonpDeserializer.arrayDeserializer(FetchProfile._DESERIALIZER), "children");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FetchProfileBreakdown.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FetchProfileBreakdown.java
index 79b286f2b6..9a8ce17a88 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FetchProfileBreakdown.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FetchProfileBreakdown.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,245 +43,243 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.FetchProfileBreakdown
 
-
 @JsonpDeserializable
 public class FetchProfileBreakdown implements JsonpSerializable {
-	@Nullable
-	private final Integer loadStoredFields;
-
-	@Nullable
-	private final Integer loadStoredFieldsCount;
-
-	@Nullable
-	private final Integer nextReader;
-
-	@Nullable
-	private final Integer nextReaderCount;
-
-	@Nullable
-	private final Integer processCount;
-
-	@Nullable
-	private final Integer process;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FetchProfileBreakdown(Builder builder) {
-
-		this.loadStoredFields = builder.loadStoredFields;
-		this.loadStoredFieldsCount = builder.loadStoredFieldsCount;
-		this.nextReader = builder.nextReader;
-		this.nextReaderCount = builder.nextReaderCount;
-		this.processCount = builder.processCount;
-		this.process = builder.process;
-
-	}
-
-	public static FetchProfileBreakdown of(Function<Builder, ObjectBuilder<FetchProfileBreakdown>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code load_stored_fields}
-	 */
-	@Nullable
-	public final Integer loadStoredFields() {
-		return this.loadStoredFields;
-	}
-
-	/**
-	 * API name: {@code load_stored_fields_count}
-	 */
-	@Nullable
-	public final Integer loadStoredFieldsCount() {
-		return this.loadStoredFieldsCount;
-	}
-
-	/**
-	 * API name: {@code next_reader}
-	 */
-	@Nullable
-	public final Integer nextReader() {
-		return this.nextReader;
-	}
-
-	/**
-	 * API name: {@code next_reader_count}
-	 */
-	@Nullable
-	public final Integer nextReaderCount() {
-		return this.nextReaderCount;
-	}
-
-	/**
-	 * API name: {@code process_count}
-	 */
-	@Nullable
-	public final Integer processCount() {
-		return this.processCount;
-	}
-
-	/**
-	 * API name: {@code process}
-	 */
-	@Nullable
-	public final Integer process() {
-		return this.process;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.loadStoredFields != null) {
-			generator.writeKey("load_stored_fields");
-			generator.write(this.loadStoredFields);
-
-		}
-		if (this.loadStoredFieldsCount != null) {
-			generator.writeKey("load_stored_fields_count");
-			generator.write(this.loadStoredFieldsCount);
-
-		}
-		if (this.nextReader != null) {
-			generator.writeKey("next_reader");
-			generator.write(this.nextReader);
-
-		}
-		if (this.nextReaderCount != null) {
-			generator.writeKey("next_reader_count");
-			generator.write(this.nextReaderCount);
-
-		}
-		if (this.processCount != null) {
-			generator.writeKey("process_count");
-			generator.write(this.processCount);
-
-		}
-		if (this.process != null) {
-			generator.writeKey("process");
-			generator.write(this.process);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FetchProfileBreakdown}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FetchProfileBreakdown> {
-		@Nullable
-		private Integer loadStoredFields;
-
-		@Nullable
-		private Integer loadStoredFieldsCount;
-
-		@Nullable
-		private Integer nextReader;
-
-		@Nullable
-		private Integer nextReaderCount;
-
-		@Nullable
-		private Integer processCount;
-
-		@Nullable
-		private Integer process;
-
-		/**
-		 * API name: {@code load_stored_fields}
-		 */
-		public final Builder loadStoredFields(@Nullable Integer value) {
-			this.loadStoredFields = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code load_stored_fields_count}
-		 */
-		public final Builder loadStoredFieldsCount(@Nullable Integer value) {
-			this.loadStoredFieldsCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code next_reader}
-		 */
-		public final Builder nextReader(@Nullable Integer value) {
-			this.nextReader = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code next_reader_count}
-		 */
-		public final Builder nextReaderCount(@Nullable Integer value) {
-			this.nextReaderCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code process_count}
-		 */
-		public final Builder processCount(@Nullable Integer value) {
-			this.processCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code process}
-		 */
-		public final Builder process(@Nullable Integer value) {
-			this.process = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FetchProfileBreakdown}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FetchProfileBreakdown build() {
-			_checkSingleUse();
-
-			return new FetchProfileBreakdown(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FetchProfileBreakdown}
-	 */
-	public static final JsonpDeserializer<FetchProfileBreakdown> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, FetchProfileBreakdown::setupFetchProfileBreakdownDeserializer);
-
-	protected static void setupFetchProfileBreakdownDeserializer(ObjectDeserializer<FetchProfileBreakdown.Builder> op) {
-
-		op.add(Builder::loadStoredFields, JsonpDeserializer.integerDeserializer(), "load_stored_fields");
-		op.add(Builder::loadStoredFieldsCount, JsonpDeserializer.integerDeserializer(), "load_stored_fields_count");
-		op.add(Builder::nextReader, JsonpDeserializer.integerDeserializer(), "next_reader");
-		op.add(Builder::nextReaderCount, JsonpDeserializer.integerDeserializer(), "next_reader_count");
-		op.add(Builder::processCount, JsonpDeserializer.integerDeserializer(), "process_count");
-		op.add(Builder::process, JsonpDeserializer.integerDeserializer(), "process");
-
-	}
+    @Nullable
+    private final Integer loadStoredFields;
+
+    @Nullable
+    private final Integer loadStoredFieldsCount;
+
+    @Nullable
+    private final Integer nextReader;
+
+    @Nullable
+    private final Integer nextReaderCount;
+
+    @Nullable
+    private final Integer processCount;
+
+    @Nullable
+    private final Integer process;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FetchProfileBreakdown(Builder builder) {
+
+        this.loadStoredFields = builder.loadStoredFields;
+        this.loadStoredFieldsCount = builder.loadStoredFieldsCount;
+        this.nextReader = builder.nextReader;
+        this.nextReaderCount = builder.nextReaderCount;
+        this.processCount = builder.processCount;
+        this.process = builder.process;
+
+    }
+
+    public static FetchProfileBreakdown of(Function<Builder, ObjectBuilder<FetchProfileBreakdown>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code load_stored_fields}
+     */
+    @Nullable
+    public final Integer loadStoredFields() {
+        return this.loadStoredFields;
+    }
+
+    /**
+     * API name: {@code load_stored_fields_count}
+     */
+    @Nullable
+    public final Integer loadStoredFieldsCount() {
+        return this.loadStoredFieldsCount;
+    }
+
+    /**
+     * API name: {@code next_reader}
+     */
+    @Nullable
+    public final Integer nextReader() {
+        return this.nextReader;
+    }
+
+    /**
+     * API name: {@code next_reader_count}
+     */
+    @Nullable
+    public final Integer nextReaderCount() {
+        return this.nextReaderCount;
+    }
+
+    /**
+     * API name: {@code process_count}
+     */
+    @Nullable
+    public final Integer processCount() {
+        return this.processCount;
+    }
+
+    /**
+     * API name: {@code process}
+     */
+    @Nullable
+    public final Integer process() {
+        return this.process;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.loadStoredFields != null) {
+            generator.writeKey("load_stored_fields");
+            generator.write(this.loadStoredFields);
+
+        }
+        if (this.loadStoredFieldsCount != null) {
+            generator.writeKey("load_stored_fields_count");
+            generator.write(this.loadStoredFieldsCount);
+
+        }
+        if (this.nextReader != null) {
+            generator.writeKey("next_reader");
+            generator.write(this.nextReader);
+
+        }
+        if (this.nextReaderCount != null) {
+            generator.writeKey("next_reader_count");
+            generator.write(this.nextReaderCount);
+
+        }
+        if (this.processCount != null) {
+            generator.writeKey("process_count");
+            generator.write(this.processCount);
+
+        }
+        if (this.process != null) {
+            generator.writeKey("process");
+            generator.write(this.process);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FetchProfileBreakdown}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FetchProfileBreakdown> {
+        @Nullable
+        private Integer loadStoredFields;
+
+        @Nullable
+        private Integer loadStoredFieldsCount;
+
+        @Nullable
+        private Integer nextReader;
+
+        @Nullable
+        private Integer nextReaderCount;
+
+        @Nullable
+        private Integer processCount;
+
+        @Nullable
+        private Integer process;
+
+        /**
+         * API name: {@code load_stored_fields}
+         */
+        public final Builder loadStoredFields(@Nullable Integer value) {
+            this.loadStoredFields = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code load_stored_fields_count}
+         */
+        public final Builder loadStoredFieldsCount(@Nullable Integer value) {
+            this.loadStoredFieldsCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code next_reader}
+         */
+        public final Builder nextReader(@Nullable Integer value) {
+            this.nextReader = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code next_reader_count}
+         */
+        public final Builder nextReaderCount(@Nullable Integer value) {
+            this.nextReaderCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code process_count}
+         */
+        public final Builder processCount(@Nullable Integer value) {
+            this.processCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code process}
+         */
+        public final Builder process(@Nullable Integer value) {
+            this.process = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link FetchProfileBreakdown}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FetchProfileBreakdown build() {
+            _checkSingleUse();
+
+            return new FetchProfileBreakdown(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FetchProfileBreakdown}
+     */
+    public static final JsonpDeserializer<FetchProfileBreakdown> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FetchProfileBreakdown::setupFetchProfileBreakdownDeserializer
+    );
+
+    protected static void setupFetchProfileBreakdownDeserializer(ObjectDeserializer<FetchProfileBreakdown.Builder> op) {
+
+        op.add(Builder::loadStoredFields, JsonpDeserializer.integerDeserializer(), "load_stored_fields");
+        op.add(Builder::loadStoredFieldsCount, JsonpDeserializer.integerDeserializer(), "load_stored_fields_count");
+        op.add(Builder::nextReader, JsonpDeserializer.integerDeserializer(), "next_reader");
+        op.add(Builder::nextReaderCount, JsonpDeserializer.integerDeserializer(), "next_reader_count");
+        op.add(Builder::processCount, JsonpDeserializer.integerDeserializer(), "process_count");
+        op.add(Builder::process, JsonpDeserializer.integerDeserializer(), "process");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FetchProfileDebug.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FetchProfileDebug.java
index ec0c1e70c1..a6de778fa0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FetchProfileDebug.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FetchProfileDebug.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,146 +45,142 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.FetchProfileDebug
 
-
 @JsonpDeserializable
 public class FetchProfileDebug implements JsonpSerializable {
-	private final List<String> storedFields;
-
-	@Nullable
-	private final Integer fastPath;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FetchProfileDebug(Builder builder) {
-
-		this.storedFields = ApiTypeHelper.unmodifiable(builder.storedFields);
-		this.fastPath = builder.fastPath;
-
-	}
-
-	public static FetchProfileDebug of(Function<Builder, ObjectBuilder<FetchProfileDebug>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code stored_fields}
-	 */
-	public final List<String> storedFields() {
-		return this.storedFields;
-	}
-
-	/**
-	 * API name: {@code fast_path}
-	 */
-	@Nullable
-	public final Integer fastPath() {
-		return this.fastPath;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.storedFields)) {
-			generator.writeKey("stored_fields");
-			generator.writeStartArray();
-			for (String item0 : this.storedFields) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.fastPath != null) {
-			generator.writeKey("fast_path");
-			generator.write(this.fastPath);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FetchProfileDebug}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FetchProfileDebug> {
-		@Nullable
-		private List<String> storedFields;
-
-		@Nullable
-		private Integer fastPath;
-
-		/**
-		 * API name: {@code stored_fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>storedFields</code>.
-		 */
-		public final Builder storedFields(List<String> list) {
-			this.storedFields = _listAddAll(this.storedFields, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stored_fields}
-		 * <p>
-		 * Adds one or more values to <code>storedFields</code>.
-		 */
-		public final Builder storedFields(String value, String... values) {
-			this.storedFields = _listAdd(this.storedFields, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code fast_path}
-		 */
-		public final Builder fastPath(@Nullable Integer value) {
-			this.fastPath = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FetchProfileDebug}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FetchProfileDebug build() {
-			_checkSingleUse();
-
-			return new FetchProfileDebug(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FetchProfileDebug}
-	 */
-	public static final JsonpDeserializer<FetchProfileDebug> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, FetchProfileDebug::setupFetchProfileDebugDeserializer);
-
-	protected static void setupFetchProfileDebugDeserializer(ObjectDeserializer<FetchProfileDebug.Builder> op) {
-
-		op.add(Builder::storedFields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"stored_fields");
-		op.add(Builder::fastPath, JsonpDeserializer.integerDeserializer(), "fast_path");
-
-	}
+    private final List<String> storedFields;
+
+    @Nullable
+    private final Integer fastPath;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FetchProfileDebug(Builder builder) {
+
+        this.storedFields = ApiTypeHelper.unmodifiable(builder.storedFields);
+        this.fastPath = builder.fastPath;
+
+    }
+
+    public static FetchProfileDebug of(Function<Builder, ObjectBuilder<FetchProfileDebug>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code stored_fields}
+     */
+    public final List<String> storedFields() {
+        return this.storedFields;
+    }
+
+    /**
+     * API name: {@code fast_path}
+     */
+    @Nullable
+    public final Integer fastPath() {
+        return this.fastPath;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.storedFields)) {
+            generator.writeKey("stored_fields");
+            generator.writeStartArray();
+            for (String item0 : this.storedFields) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.fastPath != null) {
+            generator.writeKey("fast_path");
+            generator.write(this.fastPath);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FetchProfileDebug}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FetchProfileDebug> {
+        @Nullable
+        private List<String> storedFields;
+
+        @Nullable
+        private Integer fastPath;
+
+        /**
+         * API name: {@code stored_fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>storedFields</code>.
+         */
+        public final Builder storedFields(List<String> list) {
+            this.storedFields = _listAddAll(this.storedFields, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code stored_fields}
+         * <p>
+         * Adds one or more values to <code>storedFields</code>.
+         */
+        public final Builder storedFields(String value, String... values) {
+            this.storedFields = _listAdd(this.storedFields, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code fast_path}
+         */
+        public final Builder fastPath(@Nullable Integer value) {
+            this.fastPath = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link FetchProfileDebug}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FetchProfileDebug build() {
+            _checkSingleUse();
+
+            return new FetchProfileDebug(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FetchProfileDebug}
+     */
+    public static final JsonpDeserializer<FetchProfileDebug> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FetchProfileDebug::setupFetchProfileDebugDeserializer
+    );
+
+    protected static void setupFetchProfileDebugDeserializer(ObjectDeserializer<FetchProfileDebug.Builder> op) {
+
+        op.add(Builder::storedFields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stored_fields");
+        op.add(Builder::fastPath, JsonpDeserializer.integerDeserializer(), "fast_path");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FieldCollapse.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FieldCollapse.java
index 7b73fb5591..cb21767229 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FieldCollapse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FieldCollapse.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,178 +45,175 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.FieldCollapse
 
 @JsonpDeserializable
 public class FieldCollapse implements JsonpSerializable {
-	private final String field;
+    private final String field;
 
-	private final List<InnerHits> innerHits;
-
-	@Nullable
-	private final Integer maxConcurrentGroupSearches;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FieldCollapse(Builder builder) {
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.innerHits = ApiTypeHelper.unmodifiable(builder.innerHits);
-		this.maxConcurrentGroupSearches = builder.maxConcurrentGroupSearches;
-
-	}
-
-	public static FieldCollapse of(Function<Builder, ObjectBuilder<FieldCollapse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code inner_hits}
-	 */
-	public final List<InnerHits> innerHits() {
-		return this.innerHits;
-	}
-
-	/**
-	 * API name: {@code max_concurrent_group_searches}
-	 */
-	@Nullable
-	public final Integer maxConcurrentGroupSearches() {
-		return this.maxConcurrentGroupSearches;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (ApiTypeHelper.isDefined(this.innerHits)) {
-			generator.writeKey("inner_hits");
-			generator.writeStartArray();
-			for (InnerHits item0 : this.innerHits) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.maxConcurrentGroupSearches != null) {
-			generator.writeKey("max_concurrent_group_searches");
-			generator.write(this.maxConcurrentGroupSearches);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FieldCollapse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldCollapse> {
-		private String field;
-
-		@Nullable
-		private List<InnerHits> innerHits;
-
-		@Nullable
-		private Integer maxConcurrentGroupSearches;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code inner_hits}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>innerHits</code>.
-		 */
-		public final Builder innerHits(List<InnerHits> list) {
-			this.innerHits = _listAddAll(this.innerHits, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code inner_hits}
-		 * <p>
-		 * Adds one or more values to <code>innerHits</code>.
-		 */
-		public final Builder innerHits(InnerHits value, InnerHits... values) {
-			this.innerHits = _listAdd(this.innerHits, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code inner_hits}
-		 * <p>
-		 * Adds a value to <code>innerHits</code> using a builder lambda.
-		 */
-		public final Builder innerHits(Function<InnerHits.Builder, ObjectBuilder<InnerHits>> fn) {
-			return innerHits(fn.apply(new InnerHits.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code max_concurrent_group_searches}
-		 */
-		public final Builder maxConcurrentGroupSearches(@Nullable Integer value) {
-			this.maxConcurrentGroupSearches = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FieldCollapse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FieldCollapse build() {
-			_checkSingleUse();
-
-			return new FieldCollapse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FieldCollapse}
-	 */
-	public static final JsonpDeserializer<FieldCollapse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FieldCollapse::setupFieldCollapseDeserializer);
-
-	protected static void setupFieldCollapseDeserializer(ObjectDeserializer<FieldCollapse.Builder> op) {
-
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::innerHits, JsonpDeserializer.arrayDeserializer(InnerHits._DESERIALIZER), "inner_hits");
-		op.add(Builder::maxConcurrentGroupSearches, JsonpDeserializer.integerDeserializer(),
-				"max_concurrent_group_searches");
-
-	}
+    private final List<InnerHits> innerHits;
+
+    @Nullable
+    private final Integer maxConcurrentGroupSearches;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FieldCollapse(Builder builder) {
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.innerHits = ApiTypeHelper.unmodifiable(builder.innerHits);
+        this.maxConcurrentGroupSearches = builder.maxConcurrentGroupSearches;
+
+    }
+
+    public static FieldCollapse of(Function<Builder, ObjectBuilder<FieldCollapse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code inner_hits}
+     */
+    public final List<InnerHits> innerHits() {
+        return this.innerHits;
+    }
+
+    /**
+     * API name: {@code max_concurrent_group_searches}
+     */
+    @Nullable
+    public final Integer maxConcurrentGroupSearches() {
+        return this.maxConcurrentGroupSearches;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (ApiTypeHelper.isDefined(this.innerHits)) {
+            generator.writeKey("inner_hits");
+            generator.writeStartArray();
+            for (InnerHits item0 : this.innerHits) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.maxConcurrentGroupSearches != null) {
+            generator.writeKey("max_concurrent_group_searches");
+            generator.write(this.maxConcurrentGroupSearches);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FieldCollapse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldCollapse> {
+        private String field;
+
+        @Nullable
+        private List<InnerHits> innerHits;
+
+        @Nullable
+        private Integer maxConcurrentGroupSearches;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code inner_hits}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>innerHits</code>.
+         */
+        public final Builder innerHits(List<InnerHits> list) {
+            this.innerHits = _listAddAll(this.innerHits, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code inner_hits}
+         * <p>
+         * Adds one or more values to <code>innerHits</code>.
+         */
+        public final Builder innerHits(InnerHits value, InnerHits... values) {
+            this.innerHits = _listAdd(this.innerHits, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code inner_hits}
+         * <p>
+         * Adds a value to <code>innerHits</code> using a builder lambda.
+         */
+        public final Builder innerHits(Function<InnerHits.Builder, ObjectBuilder<InnerHits>> fn) {
+            return innerHits(fn.apply(new InnerHits.Builder()).build());
+        }
+
+        /**
+         * API name: {@code max_concurrent_group_searches}
+         */
+        public final Builder maxConcurrentGroupSearches(@Nullable Integer value) {
+            this.maxConcurrentGroupSearches = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link FieldCollapse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FieldCollapse build() {
+            _checkSingleUse();
+
+            return new FieldCollapse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FieldCollapse}
+     */
+    public static final JsonpDeserializer<FieldCollapse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FieldCollapse::setupFieldCollapseDeserializer
+    );
+
+    protected static void setupFieldCollapseDeserializer(ObjectDeserializer<FieldCollapse.Builder> op) {
+
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::innerHits, JsonpDeserializer.arrayDeserializer(InnerHits._DESERIALIZER), "inner_hits");
+        op.add(Builder::maxConcurrentGroupSearches, JsonpDeserializer.integerDeserializer(), "max_concurrent_group_searches");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FieldSuggester.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FieldSuggester.java
index 4112a0dfa9..5eac398730 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FieldSuggester.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FieldSuggester.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -43,284 +46,279 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.FieldSuggester
 
-
 @JsonpDeserializable
 public class FieldSuggester implements TaggedUnion<FieldSuggester.Kind, Object>, JsonpSerializable {
 
-	/**
-	 * {@link FieldSuggester} variant kinds.
-	 */
-	/**
-	 * {@link FieldSuggester} variant kinds.
-	 */
-
-	public enum Kind implements JsonEnum {
-		Completion("completion"),
-
-		Phrase("phrase"),
-
-		Term("term"),
-		;
-
-		private final String jsonValue;
-
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
-
-		public String jsonValue() {
-			return this.jsonValue;
-		}
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Nullable
-	private final String prefix;
-
-	@Nullable
-	private final String regex;
-
-	@Nullable
-	private final String text;
-	
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	public FieldSuggester(FieldSuggesterVariant value) {
-
-		this._kind = ApiTypeHelper.requireNonNull(value._fieldSuggesterKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
-		this.prefix = null;
-		this.regex = null;
-		this.text = null;
-
-	}
-
-	private FieldSuggester(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-		this.prefix = builder.prefix;
-		this.regex = builder.regex;
-		this.text = builder.text;
-
-	}
-
-	public static FieldSuggester of(Function<Builder, ObjectBuilder<FieldSuggester>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code prefix}
-	 */
-	@Nullable
-	public final String prefix() {
-		return this.prefix;
-	}
-
-	/**
-	 * API name: {@code regex}
-	 */
-	@Nullable
-	public final String regex() {
-		return this.regex;
-	}
-
-	/**
-	 * API name: {@code text}
-	 */
-	@Nullable
-	public final String text() {
-		return this.text;
-	}
-
-	/**
-	 * Is this variant instance of kind {@code completion}?
-	 */
-	public boolean isCompletion() {
-		return _kind == Kind.Completion;
-	}
-
-	/**
-	 * Get the {@code completion} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code completion} kind.
-	 */
-	public CompletionSuggester completion() {
-		return TaggedUnionUtils.get(this, Kind.Completion);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code phrase}?
-	 */
-	public boolean isPhrase() {
-		return _kind == Kind.Phrase;
-	}
-
-	/**
-	 * Get the {@code phrase} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code phrase} kind.
-	 */
-	public PhraseSuggester phrase() {
-		return TaggedUnionUtils.get(this, Kind.Phrase);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code term}?
-	 */
-	public boolean isTerm() {
-		return _kind == Kind.Term;
-	}
-
-	/**
-	 * Get the {@code term} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code term} kind.
-	 */
-	public TermSuggester term() {
-		return TaggedUnionUtils.get(this, Kind.Term);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeStartObject();
-
-		generator.writeKey(_kind.jsonValue());
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		}
-		if (this.prefix != null) {
-			generator.writeKey("prefix");
-			generator.write(this.prefix);
-		}
-		if (this.regex != null) {
-			generator.writeKey("regex");
-			generator.write(this.regex);
-		}
-		if (this.text != null) {
-			generator.writeKey("text");
-			generator.write(this.text);
-		}
-
-		generator.writeEnd();
-
-	}
-
-	public static class Builder extends SuggesterBase.AbstractBuilder<Builder> implements ObjectBuilder<FieldSuggester> {
-		private Kind _kind;
-		private Object _value;
-		
-		@Nullable
-		private String prefix;
-
-		@Nullable
-		private String regex;
-
-		@Nullable
-		private String text;
-
-		public ObjectBuilder<FieldSuggester> completion(CompletionSuggester v) {
-			this._kind = Kind.Completion;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<FieldSuggester> completion(
-				Function<CompletionSuggester.Builder, ObjectBuilder<CompletionSuggester>> fn) {
-			return this.completion(fn.apply(new CompletionSuggester.Builder()).build());
-		}
-
-		public ObjectBuilder<FieldSuggester> phrase(PhraseSuggester v) {
-			this._kind = Kind.Phrase;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<FieldSuggester> phrase(
-				Function<PhraseSuggester.Builder, ObjectBuilder<PhraseSuggester>> fn) {
-			return this.phrase(fn.apply(new PhraseSuggester.Builder()).build());
-		}
-
-		public ObjectBuilder<FieldSuggester> term(TermSuggester v) {
-			this._kind = Kind.Term;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<FieldSuggester> term(Function<TermSuggester.Builder, ObjectBuilder<TermSuggester>> fn) {
-			return this.term(fn.apply(new TermSuggester.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code prefix}
-		 */
-		public final Builder prefix(@Nullable String value) {
-			this.prefix = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code regex}
-		 */
-		public final Builder regex(@Nullable String value) {
-			this.regex = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code text}
-		 */
-		public final Builder text(@Nullable String value) {
-			this.text = value;
-			return this;
-		}
-
-		public FieldSuggester build() {
-			_checkSingleUse();
-			return new FieldSuggester(this);
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-	}
-
-	protected static void setupFieldSuggesterDeserializer(ObjectDeserializer<Builder> op) {
-
-		op.add(Builder::completion, CompletionSuggester._DESERIALIZER, "completion");
-		op.add(Builder::phrase, PhraseSuggester._DESERIALIZER, "phrase");
-		op.add(Builder::term, TermSuggester._DESERIALIZER, "term");
-		op.add(Builder::prefix, JsonpDeserializer.stringDeserializer(), "prefix");
-		op.add(Builder::regex, JsonpDeserializer.stringDeserializer(), "regex");
-		op.add(Builder::text, JsonpDeserializer.stringDeserializer(), "text");
-
-	}
-
-	public static final JsonpDeserializer<FieldSuggester> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FieldSuggester::setupFieldSuggesterDeserializer, Builder::build);
+    /**
+     * {@link FieldSuggester} variant kinds.
+     */
+    /**
+     * {@link FieldSuggester} variant kinds.
+     */
+
+    public enum Kind implements JsonEnum {
+        Completion("completion"),
+
+        Phrase("phrase"),
+
+        Term("term"),;
+
+        private final String jsonValue;
+
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
+
+        public String jsonValue() {
+            return this.jsonValue;
+        }
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Nullable
+    private final String prefix;
+
+    @Nullable
+    private final String regex;
+
+    @Nullable
+    private final String text;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    public FieldSuggester(FieldSuggesterVariant value) {
+
+        this._kind = ApiTypeHelper.requireNonNull(value._fieldSuggesterKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+        this.prefix = null;
+        this.regex = null;
+        this.text = null;
+
+    }
+
+    private FieldSuggester(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+        this.prefix = builder.prefix;
+        this.regex = builder.regex;
+        this.text = builder.text;
+
+    }
+
+    public static FieldSuggester of(Function<Builder, ObjectBuilder<FieldSuggester>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code prefix}
+     */
+    @Nullable
+    public final String prefix() {
+        return this.prefix;
+    }
+
+    /**
+     * API name: {@code regex}
+     */
+    @Nullable
+    public final String regex() {
+        return this.regex;
+    }
+
+    /**
+     * API name: {@code text}
+     */
+    @Nullable
+    public final String text() {
+        return this.text;
+    }
+
+    /**
+     * Is this variant instance of kind {@code completion}?
+     */
+    public boolean isCompletion() {
+        return _kind == Kind.Completion;
+    }
+
+    /**
+     * Get the {@code completion} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code completion} kind.
+     */
+    public CompletionSuggester completion() {
+        return TaggedUnionUtils.get(this, Kind.Completion);
+    }
+
+    /**
+     * Is this variant instance of kind {@code phrase}?
+     */
+    public boolean isPhrase() {
+        return _kind == Kind.Phrase;
+    }
+
+    /**
+     * Get the {@code phrase} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code phrase} kind.
+     */
+    public PhraseSuggester phrase() {
+        return TaggedUnionUtils.get(this, Kind.Phrase);
+    }
+
+    /**
+     * Is this variant instance of kind {@code term}?
+     */
+    public boolean isTerm() {
+        return _kind == Kind.Term;
+    }
+
+    /**
+     * Get the {@code term} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code term} kind.
+     */
+    public TermSuggester term() {
+        return TaggedUnionUtils.get(this, Kind.Term);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeStartObject();
+
+        generator.writeKey(_kind.jsonValue());
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        }
+        if (this.prefix != null) {
+            generator.writeKey("prefix");
+            generator.write(this.prefix);
+        }
+        if (this.regex != null) {
+            generator.writeKey("regex");
+            generator.write(this.regex);
+        }
+        if (this.text != null) {
+            generator.writeKey("text");
+            generator.write(this.text);
+        }
+
+        generator.writeEnd();
+
+    }
+
+    public static class Builder extends SuggesterBase.AbstractBuilder<Builder> implements ObjectBuilder<FieldSuggester> {
+        private Kind _kind;
+        private Object _value;
+
+        @Nullable
+        private String prefix;
+
+        @Nullable
+        private String regex;
+
+        @Nullable
+        private String text;
+
+        public ObjectBuilder<FieldSuggester> completion(CompletionSuggester v) {
+            this._kind = Kind.Completion;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<FieldSuggester> completion(Function<CompletionSuggester.Builder, ObjectBuilder<CompletionSuggester>> fn) {
+            return this.completion(fn.apply(new CompletionSuggester.Builder()).build());
+        }
+
+        public ObjectBuilder<FieldSuggester> phrase(PhraseSuggester v) {
+            this._kind = Kind.Phrase;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<FieldSuggester> phrase(Function<PhraseSuggester.Builder, ObjectBuilder<PhraseSuggester>> fn) {
+            return this.phrase(fn.apply(new PhraseSuggester.Builder()).build());
+        }
+
+        public ObjectBuilder<FieldSuggester> term(TermSuggester v) {
+            this._kind = Kind.Term;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<FieldSuggester> term(Function<TermSuggester.Builder, ObjectBuilder<TermSuggester>> fn) {
+            return this.term(fn.apply(new TermSuggester.Builder()).build());
+        }
+
+        /**
+         * API name: {@code prefix}
+         */
+        public final Builder prefix(@Nullable String value) {
+            this.prefix = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code regex}
+         */
+        public final Builder regex(@Nullable String value) {
+            this.regex = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code text}
+         */
+        public final Builder text(@Nullable String value) {
+            this.text = value;
+            return this;
+        }
+
+        public FieldSuggester build() {
+            _checkSingleUse();
+            return new FieldSuggester(this);
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+    }
+
+    protected static void setupFieldSuggesterDeserializer(ObjectDeserializer<Builder> op) {
+
+        op.add(Builder::completion, CompletionSuggester._DESERIALIZER, "completion");
+        op.add(Builder::phrase, PhraseSuggester._DESERIALIZER, "phrase");
+        op.add(Builder::term, TermSuggester._DESERIALIZER, "term");
+        op.add(Builder::prefix, JsonpDeserializer.stringDeserializer(), "prefix");
+        op.add(Builder::regex, JsonpDeserializer.stringDeserializer(), "regex");
+        op.add(Builder::text, JsonpDeserializer.stringDeserializer(), "text");
+
+    }
+
+    public static final JsonpDeserializer<FieldSuggester> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FieldSuggester::setupFieldSuggesterDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FieldSuggesterBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FieldSuggesterBuilders.java
index 0331a3c9e9..a92e1135fc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FieldSuggesterBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FieldSuggesterBuilders.java
@@ -38,34 +38,33 @@
  * Variants <code>prefix</code>, <code>regex</code>, <code>text</code> are not
  * available here as they don't have a dedicated class. Use
  * {@link FieldSuggester}'s builder for these.
- * 
+ *
  */
 public class FieldSuggesterBuilders {
-	private FieldSuggesterBuilders() {
-	}
+    private FieldSuggesterBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link CompletionSuggester completion}
-	 * {@code FieldSuggester} variant.
-	 */
-	public static CompletionSuggester.Builder completion() {
-		return new CompletionSuggester.Builder();
-	}
+    /**
+     * Creates a builder for the {@link CompletionSuggester completion}
+     * {@code FieldSuggester} variant.
+     */
+    public static CompletionSuggester.Builder completion() {
+        return new CompletionSuggester.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link PhraseSuggester phrase}
-	 * {@code FieldSuggester} variant.
-	 */
-	public static PhraseSuggester.Builder phrase() {
-		return new PhraseSuggester.Builder();
-	}
+    /**
+     * Creates a builder for the {@link PhraseSuggester phrase}
+     * {@code FieldSuggester} variant.
+     */
+    public static PhraseSuggester.Builder phrase() {
+        return new PhraseSuggester.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link TermSuggester term} {@code FieldSuggester}
-	 * variant.
-	 */
-	public static TermSuggester.Builder term() {
-		return new TermSuggester.Builder();
-	}
+    /**
+     * Creates a builder for the {@link TermSuggester term} {@code FieldSuggester}
+     * variant.
+     */
+    public static TermSuggester.Builder term() {
+        return new TermSuggester.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FieldSuggesterVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FieldSuggesterVariant.java
index 871364689a..42e666c47f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FieldSuggesterVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/FieldSuggesterVariant.java
@@ -37,10 +37,10 @@
  */
 public interface FieldSuggesterVariant {
 
-	FieldSuggester.Kind _fieldSuggesterKind();
+    FieldSuggester.Kind _fieldSuggesterKind();
 
-	default FieldSuggester _toFieldSuggester() {
-		return new FieldSuggester(this);
-	}
+    default FieldSuggester _toFieldSuggester() {
+        return new FieldSuggester(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Highlight.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Highlight.java
index 632b545bf3..203f842d76 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Highlight.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Highlight.java
@@ -32,728 +32,727 @@
 
 package org.opensearch.client.opensearch.core.search;
 
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.Highlight
 
 @JsonpDeserializable
 public class Highlight implements JsonpSerializable {
-	private final Map<String, HighlightField> fields;
+    private final Map<String, HighlightField> fields;
 
-	@Nullable
-	private final HighlighterType type;
+    @Nullable
+    private final HighlighterType type;
 
-	@Nullable
-	private final String boundaryChars;
+    @Nullable
+    private final String boundaryChars;
 
-	@Nullable
-	private final Integer boundaryMaxScan;
+    @Nullable
+    private final Integer boundaryMaxScan;
 
-	@Nullable
-	private final BoundaryScanner boundaryScanner;
+    @Nullable
+    private final BoundaryScanner boundaryScanner;
 
-	@Nullable
-	private final String boundaryScannerLocale;
-
-	@Nullable
-	private final HighlighterEncoder encoder;
-
-	@Nullable
-	private final HighlighterFragmenter fragmenter;
-
-	@Nullable
-	private final Integer fragmentOffset;
-
-	@Nullable
-	private final Integer fragmentSize;
-
-	@Nullable
-	private final Integer maxFragmentLength;
-
-	@Nullable
-	private final Integer noMatchSize;
-
-	@Nullable
-	private final Integer numberOfFragments;
-
-	@Nullable
-	private final HighlighterOrder order;
-
-	private final List<String> postTags;
-
-	private final List<String> preTags;
-
-	@Nullable
-	private final Boolean requireFieldMatch;
-
-	@Nullable
-	private final HighlighterTagsSchema tagsSchema;
-
-	@Nullable
-	private final Query highlightQuery;
-
-	@Nullable
-	private final String maxAnalyzerOffset;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Highlight(Builder builder) {
-
-		this.fields = ApiTypeHelper.unmodifiableRequired(builder.fields, this, "fields");
-		this.type = builder.type;
-		this.boundaryChars = builder.boundaryChars;
-		this.boundaryMaxScan = builder.boundaryMaxScan;
-		this.boundaryScanner = builder.boundaryScanner;
-		this.boundaryScannerLocale = builder.boundaryScannerLocale;
-		this.encoder = builder.encoder;
-		this.fragmenter = builder.fragmenter;
-		this.fragmentOffset = builder.fragmentOffset;
-		this.fragmentSize = builder.fragmentSize;
-		this.maxFragmentLength = builder.maxFragmentLength;
-		this.noMatchSize = builder.noMatchSize;
-		this.numberOfFragments = builder.numberOfFragments;
-		this.order = builder.order;
-		this.postTags = ApiTypeHelper.unmodifiable(builder.postTags);
-		this.preTags = ApiTypeHelper.unmodifiable(builder.preTags);
-		this.requireFieldMatch = builder.requireFieldMatch;
-		this.tagsSchema = builder.tagsSchema;
-		this.highlightQuery = builder.highlightQuery;
-		this.maxAnalyzerOffset = builder.maxAnalyzerOffset;
-
-	}
-
-	public static Highlight of(Function<Builder, ObjectBuilder<Highlight>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code fields}
-	 */
-	public final Map<String, HighlightField> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * API name: {@code type}
-	 */
-	@Nullable
-	public final HighlighterType type() {
-		return this.type;
-	}
-
-	/**
-	 * API name: {@code boundary_chars}
-	 */
-	@Nullable
-	public final String boundaryChars() {
-		return this.boundaryChars;
-	}
-
-	/**
-	 * API name: {@code boundary_max_scan}
-	 */
-	@Nullable
-	public final Integer boundaryMaxScan() {
-		return this.boundaryMaxScan;
-	}
-
-	/**
-	 * API name: {@code boundary_scanner}
-	 */
-	@Nullable
-	public final BoundaryScanner boundaryScanner() {
-		return this.boundaryScanner;
-	}
-
-	/**
-	 * API name: {@code boundary_scanner_locale}
-	 */
-	@Nullable
-	public final String boundaryScannerLocale() {
-		return this.boundaryScannerLocale;
-	}
-
-	/**
-	 * API name: {@code encoder}
-	 */
-	@Nullable
-	public final HighlighterEncoder encoder() {
-		return this.encoder;
-	}
-
-	/**
-	 * API name: {@code fragmenter}
-	 */
-	@Nullable
-	public final HighlighterFragmenter fragmenter() {
-		return this.fragmenter;
-	}
-
-	/**
-	 * API name: {@code fragment_offset}
-	 */
-	@Nullable
-	public final Integer fragmentOffset() {
-		return this.fragmentOffset;
-	}
-
-	/**
-	 * API name: {@code fragment_size}
-	 */
-	@Nullable
-	public final Integer fragmentSize() {
-		return this.fragmentSize;
-	}
-
-	/**
-	 * API name: {@code max_fragment_length}
-	 */
-	@Nullable
-	public final Integer maxFragmentLength() {
-		return this.maxFragmentLength;
-	}
-
-	/**
-	 * API name: {@code no_match_size}
-	 */
-	@Nullable
-	public final Integer noMatchSize() {
-		return this.noMatchSize;
-	}
-
-	/**
-	 * API name: {@code number_of_fragments}
-	 */
-	@Nullable
-	public final Integer numberOfFragments() {
-		return this.numberOfFragments;
-	}
-
-	/**
-	 * API name: {@code order}
-	 */
-	@Nullable
-	public final HighlighterOrder order() {
-		return this.order;
-	}
-
-	/**
-	 * API name: {@code post_tags}
-	 */
-	public final List<String> postTags() {
-		return this.postTags;
-	}
-
-	/**
-	 * API name: {@code pre_tags}
-	 */
-	public final List<String> preTags() {
-		return this.preTags;
-	}
-
-	/**
-	 * API name: {@code require_field_match}
-	 */
-	@Nullable
-	public final Boolean requireFieldMatch() {
-		return this.requireFieldMatch;
-	}
-
-	/**
-	 * API name: {@code tags_schema}
-	 */
-	@Nullable
-	public final HighlighterTagsSchema tagsSchema() {
-		return this.tagsSchema;
-	}
-
-	/**
-	 * API name: {@code highlight_query}
-	 */
-	@Nullable
-	public final Query highlightQuery() {
-		return this.highlightQuery;
-	}
-
-	/**
-	 * API name: {@code max_analyzer_offset}
-	 */
-	@Nullable
-	public final String maxAnalyzerOffset() {
-		return this.maxAnalyzerOffset;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartObject();
-			for (Map.Entry<String, HighlightField> item0 : this.fields.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.type != null) {
-			generator.writeKey("type");
-			this.type.serialize(generator, mapper);
-
-		}
-		if (this.boundaryChars != null) {
-			generator.writeKey("boundary_chars");
-			generator.write(this.boundaryChars);
-
-		}
-		if (this.boundaryMaxScan != null) {
-			generator.writeKey("boundary_max_scan");
-			generator.write(this.boundaryMaxScan);
-
-		}
-		if (this.boundaryScanner != null) {
-			generator.writeKey("boundary_scanner");
-			this.boundaryScanner.serialize(generator, mapper);
-		}
-		if (this.boundaryScannerLocale != null) {
-			generator.writeKey("boundary_scanner_locale");
-			generator.write(this.boundaryScannerLocale);
-
-		}
-		if (this.encoder != null) {
-			generator.writeKey("encoder");
-			this.encoder.serialize(generator, mapper);
-		}
-		if (this.fragmenter != null) {
-			generator.writeKey("fragmenter");
-			this.fragmenter.serialize(generator, mapper);
-		}
-		if (this.fragmentOffset != null) {
-			generator.writeKey("fragment_offset");
-			generator.write(this.fragmentOffset);
-
-		}
-		if (this.fragmentSize != null) {
-			generator.writeKey("fragment_size");
-			generator.write(this.fragmentSize);
-
-		}
-		if (this.maxFragmentLength != null) {
-			generator.writeKey("max_fragment_length");
-			generator.write(this.maxFragmentLength);
-
-		}
-		if (this.noMatchSize != null) {
-			generator.writeKey("no_match_size");
-			generator.write(this.noMatchSize);
-
-		}
-		if (this.numberOfFragments != null) {
-			generator.writeKey("number_of_fragments");
-			generator.write(this.numberOfFragments);
-
-		}
-		if (this.order != null) {
-			generator.writeKey("order");
-			this.order.serialize(generator, mapper);
-		}
-		if (ApiTypeHelper.isDefined(this.postTags)) {
-			generator.writeKey("post_tags");
-			generator.writeStartArray();
-			for (String item0 : this.postTags) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.preTags)) {
-			generator.writeKey("pre_tags");
-			generator.writeStartArray();
-			for (String item0 : this.preTags) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.requireFieldMatch != null) {
-			generator.writeKey("require_field_match");
-			generator.write(this.requireFieldMatch);
-
-		}
-		if (this.tagsSchema != null) {
-			generator.writeKey("tags_schema");
-			this.tagsSchema.serialize(generator, mapper);
-		}
-		if (this.highlightQuery != null) {
-			generator.writeKey("highlight_query");
-			this.highlightQuery.serialize(generator, mapper);
-
-		}
-		if (this.maxAnalyzerOffset != null) {
-			generator.writeKey("max_analyzer_offset");
-			generator.write(this.maxAnalyzerOffset);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Highlight}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Highlight> {
-		private Map<String, HighlightField> fields;
-
-		@Nullable
-		private HighlighterType type;
-
-		@Nullable
-		private String boundaryChars;
-
-		@Nullable
-		private Integer boundaryMaxScan;
-
-		@Nullable
-		private BoundaryScanner boundaryScanner;
-
-		@Nullable
-		private String boundaryScannerLocale;
-
-		@Nullable
-		private HighlighterEncoder encoder;
-
-		@Nullable
-		private HighlighterFragmenter fragmenter;
-
-		@Nullable
-		private Integer fragmentOffset;
-
-		@Nullable
-		private Integer fragmentSize;
-
-		@Nullable
-		private Integer maxFragmentLength;
-
-		@Nullable
-		private Integer noMatchSize;
-
-		@Nullable
-		private Integer numberOfFragments;
-
-		@Nullable
-		private HighlighterOrder order;
-
-		@Nullable
-		private List<String> postTags;
-
-		@Nullable
-		private List<String> preTags;
-
-		@Nullable
-		private Boolean requireFieldMatch;
-
-		@Nullable
-		private HighlighterTagsSchema tagsSchema;
-
-		@Nullable
-		private Query highlightQuery;
-
-		@Nullable
-		private String maxAnalyzerOffset;
-
-		/**
-		 * Required - API name: {@code fields}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>fields</code>.
-		 */
-		public final Builder fields(Map<String, HighlightField> map) {
-			this.fields = _mapPutAll(this.fields, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code fields}
-		 * <p>
-		 * Adds an entry to <code>fields</code>.
-		 */
-		public final Builder fields(String key, HighlightField value) {
-			this.fields = _mapPut(this.fields, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code fields}
-		 * <p>
-		 * Adds an entry to <code>fields</code> using a builder lambda.
-		 */
-		public final Builder fields(String key, Function<HighlightField.Builder, ObjectBuilder<HighlightField>> fn) {
-			return fields(key, fn.apply(new HighlightField.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code type}
-		 */
-		public final Builder type(@Nullable HighlighterType value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code type}
-		 */
-		public final Builder type(Function<HighlighterType.Builder, ObjectBuilder<HighlighterType>> fn) {
-			return this.type(fn.apply(new HighlighterType.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code boundary_chars}
-		 */
-		public final Builder boundaryChars(@Nullable String value) {
-			this.boundaryChars = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code boundary_max_scan}
-		 */
-		public final Builder boundaryMaxScan(@Nullable Integer value) {
-			this.boundaryMaxScan = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code boundary_scanner}
-		 */
-		public final Builder boundaryScanner(@Nullable BoundaryScanner value) {
-			this.boundaryScanner = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code boundary_scanner_locale}
-		 */
-		public final Builder boundaryScannerLocale(@Nullable String value) {
-			this.boundaryScannerLocale = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code encoder}
-		 */
-		public final Builder encoder(@Nullable HighlighterEncoder value) {
-			this.encoder = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fragmenter}
-		 */
-		public final Builder fragmenter(@Nullable HighlighterFragmenter value) {
-			this.fragmenter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fragment_offset}
-		 */
-		public final Builder fragmentOffset(@Nullable Integer value) {
-			this.fragmentOffset = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fragment_size}
-		 */
-		public final Builder fragmentSize(@Nullable Integer value) {
-			this.fragmentSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_fragment_length}
-		 */
-		public final Builder maxFragmentLength(@Nullable Integer value) {
-			this.maxFragmentLength = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code no_match_size}
-		 */
-		public final Builder noMatchSize(@Nullable Integer value) {
-			this.noMatchSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code number_of_fragments}
-		 */
-		public final Builder numberOfFragments(@Nullable Integer value) {
-			this.numberOfFragments = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code order}
-		 */
-		public final Builder order(@Nullable HighlighterOrder value) {
-			this.order = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code post_tags}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>postTags</code>.
-		 */
-		public final Builder postTags(List<String> list) {
-			this.postTags = _listAddAll(this.postTags, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code post_tags}
-		 * <p>
-		 * Adds one or more values to <code>postTags</code>.
-		 */
-		public final Builder postTags(String value, String... values) {
-			this.postTags = _listAdd(this.postTags, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code pre_tags}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>preTags</code>.
-		 */
-		public final Builder preTags(List<String> list) {
-			this.preTags = _listAddAll(this.preTags, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code pre_tags}
-		 * <p>
-		 * Adds one or more values to <code>preTags</code>.
-		 */
-		public final Builder preTags(String value, String... values) {
-			this.preTags = _listAdd(this.preTags, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code require_field_match}
-		 */
-		public final Builder requireFieldMatch(@Nullable Boolean value) {
-			this.requireFieldMatch = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code tags_schema}
-		 */
-		public final Builder tagsSchema(@Nullable HighlighterTagsSchema value) {
-			this.tagsSchema = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code highlight_query}
-		 */
-		public final Builder highlightQuery(@Nullable Query value) {
-			this.highlightQuery = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code highlight_query}
-		 */
-		public final Builder highlightQuery(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.highlightQuery(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code max_analyzer_offset}
-		 */
-		public final Builder maxAnalyzerOffset(@Nullable String value) {
-			this.maxAnalyzerOffset = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Highlight}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Highlight build() {
-			_checkSingleUse();
-
-			return new Highlight(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Highlight}
-	 */
-	public static final JsonpDeserializer<Highlight> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Highlight::setupHighlightDeserializer);
-
-	protected static void setupHighlightDeserializer(ObjectDeserializer<Highlight.Builder> op) {
-
-		op.add(Builder::fields, JsonpDeserializer.stringMapDeserializer(HighlightField._DESERIALIZER), "fields");
-		op.add(Builder::type, HighlighterType._DESERIALIZER, "type");
-		op.add(Builder::boundaryChars, JsonpDeserializer.stringDeserializer(), "boundary_chars");
-		op.add(Builder::boundaryMaxScan, JsonpDeserializer.integerDeserializer(), "boundary_max_scan");
-		op.add(Builder::boundaryScanner, BoundaryScanner._DESERIALIZER, "boundary_scanner");
-		op.add(Builder::boundaryScannerLocale, JsonpDeserializer.stringDeserializer(), "boundary_scanner_locale");
-		op.add(Builder::encoder, HighlighterEncoder._DESERIALIZER, "encoder");
-		op.add(Builder::fragmenter, HighlighterFragmenter._DESERIALIZER, "fragmenter");
-		op.add(Builder::fragmentOffset, JsonpDeserializer.integerDeserializer(), "fragment_offset");
-		op.add(Builder::fragmentSize, JsonpDeserializer.integerDeserializer(), "fragment_size");
-		op.add(Builder::maxFragmentLength, JsonpDeserializer.integerDeserializer(), "max_fragment_length");
-		op.add(Builder::noMatchSize, JsonpDeserializer.integerDeserializer(), "no_match_size");
-		op.add(Builder::numberOfFragments, JsonpDeserializer.integerDeserializer(), "number_of_fragments");
-		op.add(Builder::order, HighlighterOrder._DESERIALIZER, "order");
-		op.add(Builder::postTags, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"post_tags");
-		op.add(Builder::preTags, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"pre_tags");
-		op.add(Builder::requireFieldMatch, JsonpDeserializer.booleanDeserializer(), "require_field_match");
-		op.add(Builder::tagsSchema, HighlighterTagsSchema._DESERIALIZER, "tags_schema");
-		op.add(Builder::highlightQuery, Query._DESERIALIZER, "highlight_query");
-		op.add(Builder::maxAnalyzerOffset, JsonpDeserializer.stringDeserializer(), "max_analyzer_offset");
-
-	}
+    @Nullable
+    private final String boundaryScannerLocale;
+
+    @Nullable
+    private final HighlighterEncoder encoder;
+
+    @Nullable
+    private final HighlighterFragmenter fragmenter;
+
+    @Nullable
+    private final Integer fragmentOffset;
+
+    @Nullable
+    private final Integer fragmentSize;
+
+    @Nullable
+    private final Integer maxFragmentLength;
+
+    @Nullable
+    private final Integer noMatchSize;
+
+    @Nullable
+    private final Integer numberOfFragments;
+
+    @Nullable
+    private final HighlighterOrder order;
+
+    private final List<String> postTags;
+
+    private final List<String> preTags;
+
+    @Nullable
+    private final Boolean requireFieldMatch;
+
+    @Nullable
+    private final HighlighterTagsSchema tagsSchema;
+
+    @Nullable
+    private final Query highlightQuery;
+
+    @Nullable
+    private final String maxAnalyzerOffset;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Highlight(Builder builder) {
+
+        this.fields = ApiTypeHelper.unmodifiableRequired(builder.fields, this, "fields");
+        this.type = builder.type;
+        this.boundaryChars = builder.boundaryChars;
+        this.boundaryMaxScan = builder.boundaryMaxScan;
+        this.boundaryScanner = builder.boundaryScanner;
+        this.boundaryScannerLocale = builder.boundaryScannerLocale;
+        this.encoder = builder.encoder;
+        this.fragmenter = builder.fragmenter;
+        this.fragmentOffset = builder.fragmentOffset;
+        this.fragmentSize = builder.fragmentSize;
+        this.maxFragmentLength = builder.maxFragmentLength;
+        this.noMatchSize = builder.noMatchSize;
+        this.numberOfFragments = builder.numberOfFragments;
+        this.order = builder.order;
+        this.postTags = ApiTypeHelper.unmodifiable(builder.postTags);
+        this.preTags = ApiTypeHelper.unmodifiable(builder.preTags);
+        this.requireFieldMatch = builder.requireFieldMatch;
+        this.tagsSchema = builder.tagsSchema;
+        this.highlightQuery = builder.highlightQuery;
+        this.maxAnalyzerOffset = builder.maxAnalyzerOffset;
+
+    }
+
+    public static Highlight of(Function<Builder, ObjectBuilder<Highlight>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code fields}
+     */
+    public final Map<String, HighlightField> fields() {
+        return this.fields;
+    }
+
+    /**
+     * API name: {@code type}
+     */
+    @Nullable
+    public final HighlighterType type() {
+        return this.type;
+    }
+
+    /**
+     * API name: {@code boundary_chars}
+     */
+    @Nullable
+    public final String boundaryChars() {
+        return this.boundaryChars;
+    }
+
+    /**
+     * API name: {@code boundary_max_scan}
+     */
+    @Nullable
+    public final Integer boundaryMaxScan() {
+        return this.boundaryMaxScan;
+    }
+
+    /**
+     * API name: {@code boundary_scanner}
+     */
+    @Nullable
+    public final BoundaryScanner boundaryScanner() {
+        return this.boundaryScanner;
+    }
+
+    /**
+     * API name: {@code boundary_scanner_locale}
+     */
+    @Nullable
+    public final String boundaryScannerLocale() {
+        return this.boundaryScannerLocale;
+    }
+
+    /**
+     * API name: {@code encoder}
+     */
+    @Nullable
+    public final HighlighterEncoder encoder() {
+        return this.encoder;
+    }
+
+    /**
+     * API name: {@code fragmenter}
+     */
+    @Nullable
+    public final HighlighterFragmenter fragmenter() {
+        return this.fragmenter;
+    }
+
+    /**
+     * API name: {@code fragment_offset}
+     */
+    @Nullable
+    public final Integer fragmentOffset() {
+        return this.fragmentOffset;
+    }
+
+    /**
+     * API name: {@code fragment_size}
+     */
+    @Nullable
+    public final Integer fragmentSize() {
+        return this.fragmentSize;
+    }
+
+    /**
+     * API name: {@code max_fragment_length}
+     */
+    @Nullable
+    public final Integer maxFragmentLength() {
+        return this.maxFragmentLength;
+    }
+
+    /**
+     * API name: {@code no_match_size}
+     */
+    @Nullable
+    public final Integer noMatchSize() {
+        return this.noMatchSize;
+    }
+
+    /**
+     * API name: {@code number_of_fragments}
+     */
+    @Nullable
+    public final Integer numberOfFragments() {
+        return this.numberOfFragments;
+    }
+
+    /**
+     * API name: {@code order}
+     */
+    @Nullable
+    public final HighlighterOrder order() {
+        return this.order;
+    }
+
+    /**
+     * API name: {@code post_tags}
+     */
+    public final List<String> postTags() {
+        return this.postTags;
+    }
+
+    /**
+     * API name: {@code pre_tags}
+     */
+    public final List<String> preTags() {
+        return this.preTags;
+    }
+
+    /**
+     * API name: {@code require_field_match}
+     */
+    @Nullable
+    public final Boolean requireFieldMatch() {
+        return this.requireFieldMatch;
+    }
+
+    /**
+     * API name: {@code tags_schema}
+     */
+    @Nullable
+    public final HighlighterTagsSchema tagsSchema() {
+        return this.tagsSchema;
+    }
+
+    /**
+     * API name: {@code highlight_query}
+     */
+    @Nullable
+    public final Query highlightQuery() {
+        return this.highlightQuery;
+    }
+
+    /**
+     * API name: {@code max_analyzer_offset}
+     */
+    @Nullable
+    public final String maxAnalyzerOffset() {
+        return this.maxAnalyzerOffset;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartObject();
+            for (Map.Entry<String, HighlightField> item0 : this.fields.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.type != null) {
+            generator.writeKey("type");
+            this.type.serialize(generator, mapper);
+
+        }
+        if (this.boundaryChars != null) {
+            generator.writeKey("boundary_chars");
+            generator.write(this.boundaryChars);
+
+        }
+        if (this.boundaryMaxScan != null) {
+            generator.writeKey("boundary_max_scan");
+            generator.write(this.boundaryMaxScan);
+
+        }
+        if (this.boundaryScanner != null) {
+            generator.writeKey("boundary_scanner");
+            this.boundaryScanner.serialize(generator, mapper);
+        }
+        if (this.boundaryScannerLocale != null) {
+            generator.writeKey("boundary_scanner_locale");
+            generator.write(this.boundaryScannerLocale);
+
+        }
+        if (this.encoder != null) {
+            generator.writeKey("encoder");
+            this.encoder.serialize(generator, mapper);
+        }
+        if (this.fragmenter != null) {
+            generator.writeKey("fragmenter");
+            this.fragmenter.serialize(generator, mapper);
+        }
+        if (this.fragmentOffset != null) {
+            generator.writeKey("fragment_offset");
+            generator.write(this.fragmentOffset);
+
+        }
+        if (this.fragmentSize != null) {
+            generator.writeKey("fragment_size");
+            generator.write(this.fragmentSize);
+
+        }
+        if (this.maxFragmentLength != null) {
+            generator.writeKey("max_fragment_length");
+            generator.write(this.maxFragmentLength);
+
+        }
+        if (this.noMatchSize != null) {
+            generator.writeKey("no_match_size");
+            generator.write(this.noMatchSize);
+
+        }
+        if (this.numberOfFragments != null) {
+            generator.writeKey("number_of_fragments");
+            generator.write(this.numberOfFragments);
+
+        }
+        if (this.order != null) {
+            generator.writeKey("order");
+            this.order.serialize(generator, mapper);
+        }
+        if (ApiTypeHelper.isDefined(this.postTags)) {
+            generator.writeKey("post_tags");
+            generator.writeStartArray();
+            for (String item0 : this.postTags) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.preTags)) {
+            generator.writeKey("pre_tags");
+            generator.writeStartArray();
+            for (String item0 : this.preTags) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.requireFieldMatch != null) {
+            generator.writeKey("require_field_match");
+            generator.write(this.requireFieldMatch);
+
+        }
+        if (this.tagsSchema != null) {
+            generator.writeKey("tags_schema");
+            this.tagsSchema.serialize(generator, mapper);
+        }
+        if (this.highlightQuery != null) {
+            generator.writeKey("highlight_query");
+            this.highlightQuery.serialize(generator, mapper);
+
+        }
+        if (this.maxAnalyzerOffset != null) {
+            generator.writeKey("max_analyzer_offset");
+            generator.write(this.maxAnalyzerOffset);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Highlight}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Highlight> {
+        private Map<String, HighlightField> fields;
+
+        @Nullable
+        private HighlighterType type;
+
+        @Nullable
+        private String boundaryChars;
+
+        @Nullable
+        private Integer boundaryMaxScan;
+
+        @Nullable
+        private BoundaryScanner boundaryScanner;
+
+        @Nullable
+        private String boundaryScannerLocale;
+
+        @Nullable
+        private HighlighterEncoder encoder;
+
+        @Nullable
+        private HighlighterFragmenter fragmenter;
+
+        @Nullable
+        private Integer fragmentOffset;
+
+        @Nullable
+        private Integer fragmentSize;
+
+        @Nullable
+        private Integer maxFragmentLength;
+
+        @Nullable
+        private Integer noMatchSize;
+
+        @Nullable
+        private Integer numberOfFragments;
+
+        @Nullable
+        private HighlighterOrder order;
+
+        @Nullable
+        private List<String> postTags;
+
+        @Nullable
+        private List<String> preTags;
+
+        @Nullable
+        private Boolean requireFieldMatch;
+
+        @Nullable
+        private HighlighterTagsSchema tagsSchema;
+
+        @Nullable
+        private Query highlightQuery;
+
+        @Nullable
+        private String maxAnalyzerOffset;
+
+        /**
+         * Required - API name: {@code fields}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>fields</code>.
+         */
+        public final Builder fields(Map<String, HighlightField> map) {
+            this.fields = _mapPutAll(this.fields, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code fields}
+         * <p>
+         * Adds an entry to <code>fields</code>.
+         */
+        public final Builder fields(String key, HighlightField value) {
+            this.fields = _mapPut(this.fields, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code fields}
+         * <p>
+         * Adds an entry to <code>fields</code> using a builder lambda.
+         */
+        public final Builder fields(String key, Function<HighlightField.Builder, ObjectBuilder<HighlightField>> fn) {
+            return fields(key, fn.apply(new HighlightField.Builder()).build());
+        }
+
+        /**
+         * API name: {@code type}
+         */
+        public final Builder type(@Nullable HighlighterType value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code type}
+         */
+        public final Builder type(Function<HighlighterType.Builder, ObjectBuilder<HighlighterType>> fn) {
+            return this.type(fn.apply(new HighlighterType.Builder()).build());
+        }
+
+        /**
+         * API name: {@code boundary_chars}
+         */
+        public final Builder boundaryChars(@Nullable String value) {
+            this.boundaryChars = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code boundary_max_scan}
+         */
+        public final Builder boundaryMaxScan(@Nullable Integer value) {
+            this.boundaryMaxScan = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code boundary_scanner}
+         */
+        public final Builder boundaryScanner(@Nullable BoundaryScanner value) {
+            this.boundaryScanner = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code boundary_scanner_locale}
+         */
+        public final Builder boundaryScannerLocale(@Nullable String value) {
+            this.boundaryScannerLocale = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code encoder}
+         */
+        public final Builder encoder(@Nullable HighlighterEncoder value) {
+            this.encoder = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fragmenter}
+         */
+        public final Builder fragmenter(@Nullable HighlighterFragmenter value) {
+            this.fragmenter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fragment_offset}
+         */
+        public final Builder fragmentOffset(@Nullable Integer value) {
+            this.fragmentOffset = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fragment_size}
+         */
+        public final Builder fragmentSize(@Nullable Integer value) {
+            this.fragmentSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_fragment_length}
+         */
+        public final Builder maxFragmentLength(@Nullable Integer value) {
+            this.maxFragmentLength = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code no_match_size}
+         */
+        public final Builder noMatchSize(@Nullable Integer value) {
+            this.noMatchSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code number_of_fragments}
+         */
+        public final Builder numberOfFragments(@Nullable Integer value) {
+            this.numberOfFragments = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code order}
+         */
+        public final Builder order(@Nullable HighlighterOrder value) {
+            this.order = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code post_tags}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>postTags</code>.
+         */
+        public final Builder postTags(List<String> list) {
+            this.postTags = _listAddAll(this.postTags, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code post_tags}
+         * <p>
+         * Adds one or more values to <code>postTags</code>.
+         */
+        public final Builder postTags(String value, String... values) {
+            this.postTags = _listAdd(this.postTags, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code pre_tags}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>preTags</code>.
+         */
+        public final Builder preTags(List<String> list) {
+            this.preTags = _listAddAll(this.preTags, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code pre_tags}
+         * <p>
+         * Adds one or more values to <code>preTags</code>.
+         */
+        public final Builder preTags(String value, String... values) {
+            this.preTags = _listAdd(this.preTags, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code require_field_match}
+         */
+        public final Builder requireFieldMatch(@Nullable Boolean value) {
+            this.requireFieldMatch = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code tags_schema}
+         */
+        public final Builder tagsSchema(@Nullable HighlighterTagsSchema value) {
+            this.tagsSchema = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code highlight_query}
+         */
+        public final Builder highlightQuery(@Nullable Query value) {
+            this.highlightQuery = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code highlight_query}
+         */
+        public final Builder highlightQuery(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.highlightQuery(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code max_analyzer_offset}
+         */
+        public final Builder maxAnalyzerOffset(@Nullable String value) {
+            this.maxAnalyzerOffset = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Highlight}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Highlight build() {
+            _checkSingleUse();
+
+            return new Highlight(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Highlight}
+     */
+    public static final JsonpDeserializer<Highlight> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Highlight::setupHighlightDeserializer
+    );
+
+    protected static void setupHighlightDeserializer(ObjectDeserializer<Highlight.Builder> op) {
+
+        op.add(Builder::fields, JsonpDeserializer.stringMapDeserializer(HighlightField._DESERIALIZER), "fields");
+        op.add(Builder::type, HighlighterType._DESERIALIZER, "type");
+        op.add(Builder::boundaryChars, JsonpDeserializer.stringDeserializer(), "boundary_chars");
+        op.add(Builder::boundaryMaxScan, JsonpDeserializer.integerDeserializer(), "boundary_max_scan");
+        op.add(Builder::boundaryScanner, BoundaryScanner._DESERIALIZER, "boundary_scanner");
+        op.add(Builder::boundaryScannerLocale, JsonpDeserializer.stringDeserializer(), "boundary_scanner_locale");
+        op.add(Builder::encoder, HighlighterEncoder._DESERIALIZER, "encoder");
+        op.add(Builder::fragmenter, HighlighterFragmenter._DESERIALIZER, "fragmenter");
+        op.add(Builder::fragmentOffset, JsonpDeserializer.integerDeserializer(), "fragment_offset");
+        op.add(Builder::fragmentSize, JsonpDeserializer.integerDeserializer(), "fragment_size");
+        op.add(Builder::maxFragmentLength, JsonpDeserializer.integerDeserializer(), "max_fragment_length");
+        op.add(Builder::noMatchSize, JsonpDeserializer.integerDeserializer(), "no_match_size");
+        op.add(Builder::numberOfFragments, JsonpDeserializer.integerDeserializer(), "number_of_fragments");
+        op.add(Builder::order, HighlighterOrder._DESERIALIZER, "order");
+        op.add(Builder::postTags, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "post_tags");
+        op.add(Builder::preTags, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "pre_tags");
+        op.add(Builder::requireFieldMatch, JsonpDeserializer.booleanDeserializer(), "require_field_match");
+        op.add(Builder::tagsSchema, HighlighterTagsSchema._DESERIALIZER, "tags_schema");
+        op.add(Builder::highlightQuery, Query._DESERIALIZER, "highlight_query");
+        op.add(Builder::maxAnalyzerOffset, JsonpDeserializer.stringDeserializer(), "max_analyzer_offset");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlightField.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlightField.java
index 89994c2f37..537cad7267 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlightField.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlightField.java
@@ -32,749 +32,747 @@
 
 package org.opensearch.client.opensearch.core.search;
 
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.HighlightField
 
 @JsonpDeserializable
 public class HighlightField implements JsonpSerializable {
-	@Nullable
-	private final String boundaryChars;
+    @Nullable
+    private final String boundaryChars;
 
-	@Nullable
-	private final Integer boundaryMaxScan;
+    @Nullable
+    private final Integer boundaryMaxScan;
 
-	@Nullable
-	private final BoundaryScanner boundaryScanner;
+    @Nullable
+    private final BoundaryScanner boundaryScanner;
 
-	@Nullable
-	private final String boundaryScannerLocale;
+    @Nullable
+    private final String boundaryScannerLocale;
 
-	@Nullable
-	private final String field;
+    @Nullable
+    private final String field;
 
-	@Nullable
-	private final Boolean forceSource;
+    @Nullable
+    private final Boolean forceSource;
 
-	@Nullable
-	private final HighlighterFragmenter fragmenter;
-
-	@Nullable
-	private final Integer fragmentOffset;
-
-	@Nullable
-	private final Integer fragmentSize;
-
-	@Nullable
-	private final Query highlightQuery;
-
-	private final List<String> matchedFields;
-
-	@Nullable
-	private final Integer maxFragmentLength;
-
-	@Nullable
-	private final Integer noMatchSize;
-
-	@Nullable
-	private final Integer numberOfFragments;
-
-	@Nullable
-	private final HighlighterOrder order;
-
-	@Nullable
-	private final Integer phraseLimit;
-
-	private final List<String> postTags;
-
-	private final List<String> preTags;
-
-	@Nullable
-	private final Boolean requireFieldMatch;
-
-	@Nullable
-	private final HighlighterTagsSchema tagsSchema;
-
-	@Nullable
-	private final HighlighterType type;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HighlightField(Builder builder) {
-
-		this.boundaryChars = builder.boundaryChars;
-		this.boundaryMaxScan = builder.boundaryMaxScan;
-		this.boundaryScanner = builder.boundaryScanner;
-		this.boundaryScannerLocale = builder.boundaryScannerLocale;
-		this.field = builder.field;
-		this.forceSource = builder.forceSource;
-		this.fragmenter = builder.fragmenter;
-		this.fragmentOffset = builder.fragmentOffset;
-		this.fragmentSize = builder.fragmentSize;
-		this.highlightQuery = builder.highlightQuery;
-		this.matchedFields = ApiTypeHelper.unmodifiable(builder.matchedFields);
-		this.maxFragmentLength = builder.maxFragmentLength;
-		this.noMatchSize = builder.noMatchSize;
-		this.numberOfFragments = builder.numberOfFragments;
-		this.order = builder.order;
-		this.phraseLimit = builder.phraseLimit;
-		this.postTags = ApiTypeHelper.unmodifiable(builder.postTags);
-		this.preTags = ApiTypeHelper.unmodifiable(builder.preTags);
-		this.requireFieldMatch = builder.requireFieldMatch;
-		this.tagsSchema = builder.tagsSchema;
-		this.type = builder.type;
-
-	}
-
-	public static HighlightField of(Function<Builder, ObjectBuilder<HighlightField>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code boundary_chars}
-	 */
-	@Nullable
-	public final String boundaryChars() {
-		return this.boundaryChars;
-	}
-
-	/**
-	 * API name: {@code boundary_max_scan}
-	 */
-	@Nullable
-	public final Integer boundaryMaxScan() {
-		return this.boundaryMaxScan;
-	}
-
-	/**
-	 * API name: {@code boundary_scanner}
-	 */
-	@Nullable
-	public final BoundaryScanner boundaryScanner() {
-		return this.boundaryScanner;
-	}
-
-	/**
-	 * API name: {@code boundary_scanner_locale}
-	 */
-	@Nullable
-	public final String boundaryScannerLocale() {
-		return this.boundaryScannerLocale;
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code force_source}
-	 */
-	@Nullable
-	public final Boolean forceSource() {
-		return this.forceSource;
-	}
-
-	/**
-	 * API name: {@code fragmenter}
-	 */
-	@Nullable
-	public final HighlighterFragmenter fragmenter() {
-		return this.fragmenter;
-	}
-
-	/**
-	 * API name: {@code fragment_offset}
-	 */
-	@Nullable
-	public final Integer fragmentOffset() {
-		return this.fragmentOffset;
-	}
-
-	/**
-	 * API name: {@code fragment_size}
-	 */
-	@Nullable
-	public final Integer fragmentSize() {
-		return this.fragmentSize;
-	}
-
-	/**
-	 * API name: {@code highlight_query}
-	 */
-	@Nullable
-	public final Query highlightQuery() {
-		return this.highlightQuery;
-	}
-
-	/**
-	 * API name: {@code matched_fields}
-	 */
-	public final List<String> matchedFields() {
-		return this.matchedFields;
-	}
-
-	/**
-	 * API name: {@code max_fragment_length}
-	 */
-	@Nullable
-	public final Integer maxFragmentLength() {
-		return this.maxFragmentLength;
-	}
-
-	/**
-	 * API name: {@code no_match_size}
-	 */
-	@Nullable
-	public final Integer noMatchSize() {
-		return this.noMatchSize;
-	}
-
-	/**
-	 * API name: {@code number_of_fragments}
-	 */
-	@Nullable
-	public final Integer numberOfFragments() {
-		return this.numberOfFragments;
-	}
-
-	/**
-	 * API name: {@code order}
-	 */
-	@Nullable
-	public final HighlighterOrder order() {
-		return this.order;
-	}
-
-	/**
-	 * API name: {@code phrase_limit}
-	 */
-	@Nullable
-	public final Integer phraseLimit() {
-		return this.phraseLimit;
-	}
-
-	/**
-	 * API name: {@code post_tags}
-	 */
-	public final List<String> postTags() {
-		return this.postTags;
-	}
-
-	/**
-	 * API name: {@code pre_tags}
-	 */
-	public final List<String> preTags() {
-		return this.preTags;
-	}
-
-	/**
-	 * API name: {@code require_field_match}
-	 */
-	@Nullable
-	public final Boolean requireFieldMatch() {
-		return this.requireFieldMatch;
-	}
-
-	/**
-	 * API name: {@code tags_schema}
-	 */
-	@Nullable
-	public final HighlighterTagsSchema tagsSchema() {
-		return this.tagsSchema;
-	}
-
-	/**
-	 * API name: {@code type}
-	 */
-	@Nullable
-	public final HighlighterType type() {
-		return this.type;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.boundaryChars != null) {
-			generator.writeKey("boundary_chars");
-			generator.write(this.boundaryChars);
-
-		}
-		if (this.boundaryMaxScan != null) {
-			generator.writeKey("boundary_max_scan");
-			generator.write(this.boundaryMaxScan);
-
-		}
-		if (this.boundaryScanner != null) {
-			generator.writeKey("boundary_scanner");
-			this.boundaryScanner.serialize(generator, mapper);
-		}
-		if (this.boundaryScannerLocale != null) {
-			generator.writeKey("boundary_scanner_locale");
-			generator.write(this.boundaryScannerLocale);
-
-		}
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (this.forceSource != null) {
-			generator.writeKey("force_source");
-			generator.write(this.forceSource);
-
-		}
-		if (this.fragmenter != null) {
-			generator.writeKey("fragmenter");
-			this.fragmenter.serialize(generator, mapper);
-		}
-		if (this.fragmentOffset != null) {
-			generator.writeKey("fragment_offset");
-			generator.write(this.fragmentOffset);
-
-		}
-		if (this.fragmentSize != null) {
-			generator.writeKey("fragment_size");
-			generator.write(this.fragmentSize);
-
-		}
-		if (this.highlightQuery != null) {
-			generator.writeKey("highlight_query");
-			this.highlightQuery.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.matchedFields)) {
-			generator.writeKey("matched_fields");
-			generator.writeStartArray();
-			for (String item0 : this.matchedFields) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.maxFragmentLength != null) {
-			generator.writeKey("max_fragment_length");
-			generator.write(this.maxFragmentLength);
-
-		}
-		if (this.noMatchSize != null) {
-			generator.writeKey("no_match_size");
-			generator.write(this.noMatchSize);
-
-		}
-		if (this.numberOfFragments != null) {
-			generator.writeKey("number_of_fragments");
-			generator.write(this.numberOfFragments);
-
-		}
-		if (this.order != null) {
-			generator.writeKey("order");
-			this.order.serialize(generator, mapper);
-		}
-		if (this.phraseLimit != null) {
-			generator.writeKey("phrase_limit");
-			generator.write(this.phraseLimit);
-
-		}
-		if (ApiTypeHelper.isDefined(this.postTags)) {
-			generator.writeKey("post_tags");
-			generator.writeStartArray();
-			for (String item0 : this.postTags) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.preTags)) {
-			generator.writeKey("pre_tags");
-			generator.writeStartArray();
-			for (String item0 : this.preTags) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.requireFieldMatch != null) {
-			generator.writeKey("require_field_match");
-			generator.write(this.requireFieldMatch);
-
-		}
-		if (this.tagsSchema != null) {
-			generator.writeKey("tags_schema");
-			this.tagsSchema.serialize(generator, mapper);
-		}
-		if (this.type != null) {
-			generator.writeKey("type");
-			this.type.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HighlightField}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HighlightField> {
-		@Nullable
-		private String boundaryChars;
-
-		@Nullable
-		private Integer boundaryMaxScan;
-
-		@Nullable
-		private BoundaryScanner boundaryScanner;
-
-		@Nullable
-		private String boundaryScannerLocale;
-
-		@Nullable
-		private String field;
-
-		@Nullable
-		private Boolean forceSource;
-
-		@Nullable
-		private HighlighterFragmenter fragmenter;
-
-		@Nullable
-		private Integer fragmentOffset;
-
-		@Nullable
-		private Integer fragmentSize;
-
-		@Nullable
-		private Query highlightQuery;
-
-		@Nullable
-		private List<String> matchedFields;
-
-		@Nullable
-		private Integer maxFragmentLength;
-
-		@Nullable
-		private Integer noMatchSize;
-
-		@Nullable
-		private Integer numberOfFragments;
-
-		@Nullable
-		private HighlighterOrder order;
-
-		@Nullable
-		private Integer phraseLimit;
-
-		@Nullable
-		private List<String> postTags;
-
-		@Nullable
-		private List<String> preTags;
-
-		@Nullable
-		private Boolean requireFieldMatch;
-
-		@Nullable
-		private HighlighterTagsSchema tagsSchema;
-
-		@Nullable
-		private HighlighterType type;
-
-		/**
-		 * API name: {@code boundary_chars}
-		 */
-		public final Builder boundaryChars(@Nullable String value) {
-			this.boundaryChars = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code boundary_max_scan}
-		 */
-		public final Builder boundaryMaxScan(@Nullable Integer value) {
-			this.boundaryMaxScan = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code boundary_scanner}
-		 */
-		public final Builder boundaryScanner(@Nullable BoundaryScanner value) {
-			this.boundaryScanner = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code boundary_scanner_locale}
-		 */
-		public final Builder boundaryScannerLocale(@Nullable String value) {
-			this.boundaryScannerLocale = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code force_source}
-		 */
-		public final Builder forceSource(@Nullable Boolean value) {
-			this.forceSource = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fragmenter}
-		 */
-		public final Builder fragmenter(@Nullable HighlighterFragmenter value) {
-			this.fragmenter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fragment_offset}
-		 */
-		public final Builder fragmentOffset(@Nullable Integer value) {
-			this.fragmentOffset = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fragment_size}
-		 */
-		public final Builder fragmentSize(@Nullable Integer value) {
-			this.fragmentSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code highlight_query}
-		 */
-		public final Builder highlightQuery(@Nullable Query value) {
-			this.highlightQuery = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code highlight_query}
-		 */
-		public final Builder highlightQuery(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.highlightQuery(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code matched_fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>matchedFields</code>.
-		 */
-		public final Builder matchedFields(List<String> list) {
-			this.matchedFields = _listAddAll(this.matchedFields, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code matched_fields}
-		 * <p>
-		 * Adds one or more values to <code>matchedFields</code>.
-		 */
-		public final Builder matchedFields(String value, String... values) {
-			this.matchedFields = _listAdd(this.matchedFields, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_fragment_length}
-		 */
-		public final Builder maxFragmentLength(@Nullable Integer value) {
-			this.maxFragmentLength = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code no_match_size}
-		 */
-		public final Builder noMatchSize(@Nullable Integer value) {
-			this.noMatchSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code number_of_fragments}
-		 */
-		public final Builder numberOfFragments(@Nullable Integer value) {
-			this.numberOfFragments = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code order}
-		 */
-		public final Builder order(@Nullable HighlighterOrder value) {
-			this.order = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code phrase_limit}
-		 */
-		public final Builder phraseLimit(@Nullable Integer value) {
-			this.phraseLimit = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code post_tags}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>postTags</code>.
-		 */
-		public final Builder postTags(List<String> list) {
-			this.postTags = _listAddAll(this.postTags, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code post_tags}
-		 * <p>
-		 * Adds one or more values to <code>postTags</code>.
-		 */
-		public final Builder postTags(String value, String... values) {
-			this.postTags = _listAdd(this.postTags, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code pre_tags}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>preTags</code>.
-		 */
-		public final Builder preTags(List<String> list) {
-			this.preTags = _listAddAll(this.preTags, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code pre_tags}
-		 * <p>
-		 * Adds one or more values to <code>preTags</code>.
-		 */
-		public final Builder preTags(String value, String... values) {
-			this.preTags = _listAdd(this.preTags, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code require_field_match}
-		 */
-		public final Builder requireFieldMatch(@Nullable Boolean value) {
-			this.requireFieldMatch = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code tags_schema}
-		 */
-		public final Builder tagsSchema(@Nullable HighlighterTagsSchema value) {
-			this.tagsSchema = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code type}
-		 */
-		public final Builder type(@Nullable HighlighterType value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code type}
-		 */
-		public final Builder type(Function<HighlighterType.Builder, ObjectBuilder<HighlighterType>> fn) {
-			return this.type(fn.apply(new HighlighterType.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link HighlightField}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HighlightField build() {
-			_checkSingleUse();
-
-			return new HighlightField(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HighlightField}
-	 */
-	public static final JsonpDeserializer<HighlightField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			HighlightField::setupHighlightFieldDeserializer);
-
-	protected static void setupHighlightFieldDeserializer(ObjectDeserializer<HighlightField.Builder> op) {
-
-		op.add(Builder::boundaryChars, JsonpDeserializer.stringDeserializer(), "boundary_chars");
-		op.add(Builder::boundaryMaxScan, JsonpDeserializer.integerDeserializer(), "boundary_max_scan");
-		op.add(Builder::boundaryScanner, BoundaryScanner._DESERIALIZER, "boundary_scanner");
-		op.add(Builder::boundaryScannerLocale, JsonpDeserializer.stringDeserializer(), "boundary_scanner_locale");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::forceSource, JsonpDeserializer.booleanDeserializer(), "force_source");
-		op.add(Builder::fragmenter, HighlighterFragmenter._DESERIALIZER, "fragmenter");
-		op.add(Builder::fragmentOffset, JsonpDeserializer.integerDeserializer(), "fragment_offset");
-		op.add(Builder::fragmentSize, JsonpDeserializer.integerDeserializer(), "fragment_size");
-		op.add(Builder::highlightQuery, Query._DESERIALIZER, "highlight_query");
-		op.add(Builder::matchedFields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"matched_fields");
-		op.add(Builder::maxFragmentLength, JsonpDeserializer.integerDeserializer(), "max_fragment_length");
-		op.add(Builder::noMatchSize, JsonpDeserializer.integerDeserializer(), "no_match_size");
-		op.add(Builder::numberOfFragments, JsonpDeserializer.integerDeserializer(), "number_of_fragments");
-		op.add(Builder::order, HighlighterOrder._DESERIALIZER, "order");
-		op.add(Builder::phraseLimit, JsonpDeserializer.integerDeserializer(), "phrase_limit");
-		op.add(Builder::postTags, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"post_tags");
-		op.add(Builder::preTags, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"pre_tags");
-		op.add(Builder::requireFieldMatch, JsonpDeserializer.booleanDeserializer(), "require_field_match");
-		op.add(Builder::tagsSchema, HighlighterTagsSchema._DESERIALIZER, "tags_schema");
-		op.add(Builder::type, HighlighterType._DESERIALIZER, "type");
-
-	}
+    @Nullable
+    private final HighlighterFragmenter fragmenter;
+
+    @Nullable
+    private final Integer fragmentOffset;
+
+    @Nullable
+    private final Integer fragmentSize;
+
+    @Nullable
+    private final Query highlightQuery;
+
+    private final List<String> matchedFields;
+
+    @Nullable
+    private final Integer maxFragmentLength;
+
+    @Nullable
+    private final Integer noMatchSize;
+
+    @Nullable
+    private final Integer numberOfFragments;
+
+    @Nullable
+    private final HighlighterOrder order;
+
+    @Nullable
+    private final Integer phraseLimit;
+
+    private final List<String> postTags;
+
+    private final List<String> preTags;
+
+    @Nullable
+    private final Boolean requireFieldMatch;
+
+    @Nullable
+    private final HighlighterTagsSchema tagsSchema;
+
+    @Nullable
+    private final HighlighterType type;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HighlightField(Builder builder) {
+
+        this.boundaryChars = builder.boundaryChars;
+        this.boundaryMaxScan = builder.boundaryMaxScan;
+        this.boundaryScanner = builder.boundaryScanner;
+        this.boundaryScannerLocale = builder.boundaryScannerLocale;
+        this.field = builder.field;
+        this.forceSource = builder.forceSource;
+        this.fragmenter = builder.fragmenter;
+        this.fragmentOffset = builder.fragmentOffset;
+        this.fragmentSize = builder.fragmentSize;
+        this.highlightQuery = builder.highlightQuery;
+        this.matchedFields = ApiTypeHelper.unmodifiable(builder.matchedFields);
+        this.maxFragmentLength = builder.maxFragmentLength;
+        this.noMatchSize = builder.noMatchSize;
+        this.numberOfFragments = builder.numberOfFragments;
+        this.order = builder.order;
+        this.phraseLimit = builder.phraseLimit;
+        this.postTags = ApiTypeHelper.unmodifiable(builder.postTags);
+        this.preTags = ApiTypeHelper.unmodifiable(builder.preTags);
+        this.requireFieldMatch = builder.requireFieldMatch;
+        this.tagsSchema = builder.tagsSchema;
+        this.type = builder.type;
+
+    }
+
+    public static HighlightField of(Function<Builder, ObjectBuilder<HighlightField>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code boundary_chars}
+     */
+    @Nullable
+    public final String boundaryChars() {
+        return this.boundaryChars;
+    }
+
+    /**
+     * API name: {@code boundary_max_scan}
+     */
+    @Nullable
+    public final Integer boundaryMaxScan() {
+        return this.boundaryMaxScan;
+    }
+
+    /**
+     * API name: {@code boundary_scanner}
+     */
+    @Nullable
+    public final BoundaryScanner boundaryScanner() {
+        return this.boundaryScanner;
+    }
+
+    /**
+     * API name: {@code boundary_scanner_locale}
+     */
+    @Nullable
+    public final String boundaryScannerLocale() {
+        return this.boundaryScannerLocale;
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code force_source}
+     */
+    @Nullable
+    public final Boolean forceSource() {
+        return this.forceSource;
+    }
+
+    /**
+     * API name: {@code fragmenter}
+     */
+    @Nullable
+    public final HighlighterFragmenter fragmenter() {
+        return this.fragmenter;
+    }
+
+    /**
+     * API name: {@code fragment_offset}
+     */
+    @Nullable
+    public final Integer fragmentOffset() {
+        return this.fragmentOffset;
+    }
+
+    /**
+     * API name: {@code fragment_size}
+     */
+    @Nullable
+    public final Integer fragmentSize() {
+        return this.fragmentSize;
+    }
+
+    /**
+     * API name: {@code highlight_query}
+     */
+    @Nullable
+    public final Query highlightQuery() {
+        return this.highlightQuery;
+    }
+
+    /**
+     * API name: {@code matched_fields}
+     */
+    public final List<String> matchedFields() {
+        return this.matchedFields;
+    }
+
+    /**
+     * API name: {@code max_fragment_length}
+     */
+    @Nullable
+    public final Integer maxFragmentLength() {
+        return this.maxFragmentLength;
+    }
+
+    /**
+     * API name: {@code no_match_size}
+     */
+    @Nullable
+    public final Integer noMatchSize() {
+        return this.noMatchSize;
+    }
+
+    /**
+     * API name: {@code number_of_fragments}
+     */
+    @Nullable
+    public final Integer numberOfFragments() {
+        return this.numberOfFragments;
+    }
+
+    /**
+     * API name: {@code order}
+     */
+    @Nullable
+    public final HighlighterOrder order() {
+        return this.order;
+    }
+
+    /**
+     * API name: {@code phrase_limit}
+     */
+    @Nullable
+    public final Integer phraseLimit() {
+        return this.phraseLimit;
+    }
+
+    /**
+     * API name: {@code post_tags}
+     */
+    public final List<String> postTags() {
+        return this.postTags;
+    }
+
+    /**
+     * API name: {@code pre_tags}
+     */
+    public final List<String> preTags() {
+        return this.preTags;
+    }
+
+    /**
+     * API name: {@code require_field_match}
+     */
+    @Nullable
+    public final Boolean requireFieldMatch() {
+        return this.requireFieldMatch;
+    }
+
+    /**
+     * API name: {@code tags_schema}
+     */
+    @Nullable
+    public final HighlighterTagsSchema tagsSchema() {
+        return this.tagsSchema;
+    }
+
+    /**
+     * API name: {@code type}
+     */
+    @Nullable
+    public final HighlighterType type() {
+        return this.type;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.boundaryChars != null) {
+            generator.writeKey("boundary_chars");
+            generator.write(this.boundaryChars);
+
+        }
+        if (this.boundaryMaxScan != null) {
+            generator.writeKey("boundary_max_scan");
+            generator.write(this.boundaryMaxScan);
+
+        }
+        if (this.boundaryScanner != null) {
+            generator.writeKey("boundary_scanner");
+            this.boundaryScanner.serialize(generator, mapper);
+        }
+        if (this.boundaryScannerLocale != null) {
+            generator.writeKey("boundary_scanner_locale");
+            generator.write(this.boundaryScannerLocale);
+
+        }
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (this.forceSource != null) {
+            generator.writeKey("force_source");
+            generator.write(this.forceSource);
+
+        }
+        if (this.fragmenter != null) {
+            generator.writeKey("fragmenter");
+            this.fragmenter.serialize(generator, mapper);
+        }
+        if (this.fragmentOffset != null) {
+            generator.writeKey("fragment_offset");
+            generator.write(this.fragmentOffset);
+
+        }
+        if (this.fragmentSize != null) {
+            generator.writeKey("fragment_size");
+            generator.write(this.fragmentSize);
+
+        }
+        if (this.highlightQuery != null) {
+            generator.writeKey("highlight_query");
+            this.highlightQuery.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.matchedFields)) {
+            generator.writeKey("matched_fields");
+            generator.writeStartArray();
+            for (String item0 : this.matchedFields) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.maxFragmentLength != null) {
+            generator.writeKey("max_fragment_length");
+            generator.write(this.maxFragmentLength);
+
+        }
+        if (this.noMatchSize != null) {
+            generator.writeKey("no_match_size");
+            generator.write(this.noMatchSize);
+
+        }
+        if (this.numberOfFragments != null) {
+            generator.writeKey("number_of_fragments");
+            generator.write(this.numberOfFragments);
+
+        }
+        if (this.order != null) {
+            generator.writeKey("order");
+            this.order.serialize(generator, mapper);
+        }
+        if (this.phraseLimit != null) {
+            generator.writeKey("phrase_limit");
+            generator.write(this.phraseLimit);
+
+        }
+        if (ApiTypeHelper.isDefined(this.postTags)) {
+            generator.writeKey("post_tags");
+            generator.writeStartArray();
+            for (String item0 : this.postTags) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.preTags)) {
+            generator.writeKey("pre_tags");
+            generator.writeStartArray();
+            for (String item0 : this.preTags) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.requireFieldMatch != null) {
+            generator.writeKey("require_field_match");
+            generator.write(this.requireFieldMatch);
+
+        }
+        if (this.tagsSchema != null) {
+            generator.writeKey("tags_schema");
+            this.tagsSchema.serialize(generator, mapper);
+        }
+        if (this.type != null) {
+            generator.writeKey("type");
+            this.type.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HighlightField}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HighlightField> {
+        @Nullable
+        private String boundaryChars;
+
+        @Nullable
+        private Integer boundaryMaxScan;
+
+        @Nullable
+        private BoundaryScanner boundaryScanner;
+
+        @Nullable
+        private String boundaryScannerLocale;
+
+        @Nullable
+        private String field;
+
+        @Nullable
+        private Boolean forceSource;
+
+        @Nullable
+        private HighlighterFragmenter fragmenter;
+
+        @Nullable
+        private Integer fragmentOffset;
+
+        @Nullable
+        private Integer fragmentSize;
+
+        @Nullable
+        private Query highlightQuery;
+
+        @Nullable
+        private List<String> matchedFields;
+
+        @Nullable
+        private Integer maxFragmentLength;
+
+        @Nullable
+        private Integer noMatchSize;
+
+        @Nullable
+        private Integer numberOfFragments;
+
+        @Nullable
+        private HighlighterOrder order;
+
+        @Nullable
+        private Integer phraseLimit;
+
+        @Nullable
+        private List<String> postTags;
+
+        @Nullable
+        private List<String> preTags;
+
+        @Nullable
+        private Boolean requireFieldMatch;
+
+        @Nullable
+        private HighlighterTagsSchema tagsSchema;
+
+        @Nullable
+        private HighlighterType type;
+
+        /**
+         * API name: {@code boundary_chars}
+         */
+        public final Builder boundaryChars(@Nullable String value) {
+            this.boundaryChars = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code boundary_max_scan}
+         */
+        public final Builder boundaryMaxScan(@Nullable Integer value) {
+            this.boundaryMaxScan = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code boundary_scanner}
+         */
+        public final Builder boundaryScanner(@Nullable BoundaryScanner value) {
+            this.boundaryScanner = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code boundary_scanner_locale}
+         */
+        public final Builder boundaryScannerLocale(@Nullable String value) {
+            this.boundaryScannerLocale = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code force_source}
+         */
+        public final Builder forceSource(@Nullable Boolean value) {
+            this.forceSource = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fragmenter}
+         */
+        public final Builder fragmenter(@Nullable HighlighterFragmenter value) {
+            this.fragmenter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fragment_offset}
+         */
+        public final Builder fragmentOffset(@Nullable Integer value) {
+            this.fragmentOffset = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fragment_size}
+         */
+        public final Builder fragmentSize(@Nullable Integer value) {
+            this.fragmentSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code highlight_query}
+         */
+        public final Builder highlightQuery(@Nullable Query value) {
+            this.highlightQuery = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code highlight_query}
+         */
+        public final Builder highlightQuery(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.highlightQuery(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code matched_fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>matchedFields</code>.
+         */
+        public final Builder matchedFields(List<String> list) {
+            this.matchedFields = _listAddAll(this.matchedFields, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code matched_fields}
+         * <p>
+         * Adds one or more values to <code>matchedFields</code>.
+         */
+        public final Builder matchedFields(String value, String... values) {
+            this.matchedFields = _listAdd(this.matchedFields, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code max_fragment_length}
+         */
+        public final Builder maxFragmentLength(@Nullable Integer value) {
+            this.maxFragmentLength = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code no_match_size}
+         */
+        public final Builder noMatchSize(@Nullable Integer value) {
+            this.noMatchSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code number_of_fragments}
+         */
+        public final Builder numberOfFragments(@Nullable Integer value) {
+            this.numberOfFragments = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code order}
+         */
+        public final Builder order(@Nullable HighlighterOrder value) {
+            this.order = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code phrase_limit}
+         */
+        public final Builder phraseLimit(@Nullable Integer value) {
+            this.phraseLimit = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code post_tags}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>postTags</code>.
+         */
+        public final Builder postTags(List<String> list) {
+            this.postTags = _listAddAll(this.postTags, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code post_tags}
+         * <p>
+         * Adds one or more values to <code>postTags</code>.
+         */
+        public final Builder postTags(String value, String... values) {
+            this.postTags = _listAdd(this.postTags, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code pre_tags}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>preTags</code>.
+         */
+        public final Builder preTags(List<String> list) {
+            this.preTags = _listAddAll(this.preTags, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code pre_tags}
+         * <p>
+         * Adds one or more values to <code>preTags</code>.
+         */
+        public final Builder preTags(String value, String... values) {
+            this.preTags = _listAdd(this.preTags, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code require_field_match}
+         */
+        public final Builder requireFieldMatch(@Nullable Boolean value) {
+            this.requireFieldMatch = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code tags_schema}
+         */
+        public final Builder tagsSchema(@Nullable HighlighterTagsSchema value) {
+            this.tagsSchema = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code type}
+         */
+        public final Builder type(@Nullable HighlighterType value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code type}
+         */
+        public final Builder type(Function<HighlighterType.Builder, ObjectBuilder<HighlighterType>> fn) {
+            return this.type(fn.apply(new HighlighterType.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link HighlightField}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HighlightField build() {
+            _checkSingleUse();
+
+            return new HighlightField(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HighlightField}
+     */
+    public static final JsonpDeserializer<HighlightField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HighlightField::setupHighlightFieldDeserializer
+    );
+
+    protected static void setupHighlightFieldDeserializer(ObjectDeserializer<HighlightField.Builder> op) {
+
+        op.add(Builder::boundaryChars, JsonpDeserializer.stringDeserializer(), "boundary_chars");
+        op.add(Builder::boundaryMaxScan, JsonpDeserializer.integerDeserializer(), "boundary_max_scan");
+        op.add(Builder::boundaryScanner, BoundaryScanner._DESERIALIZER, "boundary_scanner");
+        op.add(Builder::boundaryScannerLocale, JsonpDeserializer.stringDeserializer(), "boundary_scanner_locale");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::forceSource, JsonpDeserializer.booleanDeserializer(), "force_source");
+        op.add(Builder::fragmenter, HighlighterFragmenter._DESERIALIZER, "fragmenter");
+        op.add(Builder::fragmentOffset, JsonpDeserializer.integerDeserializer(), "fragment_offset");
+        op.add(Builder::fragmentSize, JsonpDeserializer.integerDeserializer(), "fragment_size");
+        op.add(Builder::highlightQuery, Query._DESERIALIZER, "highlight_query");
+        op.add(Builder::matchedFields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "matched_fields");
+        op.add(Builder::maxFragmentLength, JsonpDeserializer.integerDeserializer(), "max_fragment_length");
+        op.add(Builder::noMatchSize, JsonpDeserializer.integerDeserializer(), "no_match_size");
+        op.add(Builder::numberOfFragments, JsonpDeserializer.integerDeserializer(), "number_of_fragments");
+        op.add(Builder::order, HighlighterOrder._DESERIALIZER, "order");
+        op.add(Builder::phraseLimit, JsonpDeserializer.integerDeserializer(), "phrase_limit");
+        op.add(Builder::postTags, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "post_tags");
+        op.add(Builder::preTags, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "pre_tags");
+        op.add(Builder::requireFieldMatch, JsonpDeserializer.booleanDeserializer(), "require_field_match");
+        op.add(Builder::tagsSchema, HighlighterTagsSchema._DESERIALIZER, "tags_schema");
+        op.add(Builder::type, HighlighterType._DESERIALIZER, "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterEncoder.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterEncoder.java
index 6504b5f6e2..7547fa50d9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterEncoder.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterEncoder.java
@@ -37,22 +37,21 @@
 
 @JsonpDeserializable
 public enum HighlighterEncoder implements JsonEnum {
-	Default("default"),
+    Default("default"),
 
-	Html("html"),
+    Html("html"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	HighlighterEncoder(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    HighlighterEncoder(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<HighlighterEncoder> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			HighlighterEncoder.values());
+    public static final JsonEnum.Deserializer<HighlighterEncoder> _DESERIALIZER = new JsonEnum.Deserializer<>(HighlighterEncoder.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterFragmenter.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterFragmenter.java
index 92e0f4c7ec..0042a91f84 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterFragmenter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterFragmenter.java
@@ -37,22 +37,23 @@
 
 @JsonpDeserializable
 public enum HighlighterFragmenter implements JsonEnum {
-	Simple("simple"),
+    Simple("simple"),
 
-	Span("span"),
+    Span("span"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	HighlighterFragmenter(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    HighlighterFragmenter(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<HighlighterFragmenter> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			HighlighterFragmenter.values());
+    public static final JsonEnum.Deserializer<HighlighterFragmenter> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        HighlighterFragmenter.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterOrder.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterOrder.java
index 9ce7e9b5d8..580770e521 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterOrder.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterOrder.java
@@ -37,20 +37,19 @@
 
 @JsonpDeserializable
 public enum HighlighterOrder implements JsonEnum {
-	Score("score"),
+    Score("score"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	HighlighterOrder(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    HighlighterOrder(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<HighlighterOrder> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			HighlighterOrder.values());
+    public static final JsonEnum.Deserializer<HighlighterOrder> _DESERIALIZER = new JsonEnum.Deserializer<>(HighlighterOrder.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterTagsSchema.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterTagsSchema.java
index 8287d0624c..d98d06497d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterTagsSchema.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterTagsSchema.java
@@ -37,20 +37,21 @@
 
 @JsonpDeserializable
 public enum HighlighterTagsSchema implements JsonEnum {
-	Styled("styled"),
+    Styled("styled"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	HighlighterTagsSchema(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    HighlighterTagsSchema(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<HighlighterTagsSchema> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			HighlighterTagsSchema.values());
+    public static final JsonEnum.Deserializer<HighlighterTagsSchema> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        HighlighterTagsSchema.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterType.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterType.java
index def80bd1c5..fcb563783e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterType.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,138 +44,139 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.search._types.HighlighterType
 
 @JsonpDeserializable
 public class HighlighterType implements TaggedUnion<HighlighterType.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Builtin, Custom
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private HighlighterType(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	public String _toJsonString() {
-		switch (_kind) {
-			case Builtin :
-				return this.builtin().jsonValue();
-			case Custom :
-				return this.custom();
-
-			default :
-				throw new IllegalStateException("Unknown kind " + _kind);
-		}
-	}
-
-	private HighlighterType(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static HighlighterType of(Function<Builder, ObjectBuilder<HighlighterType>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code builtin}?
-	 */
-	public boolean isBuiltin() {
-		return _kind == Kind.Builtin;
-	}
-
-	/**
-	 * Get the {@code builtin} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code builtin} kind.
-	 */
-	public BuiltinHighlighterType builtin() {
-		return TaggedUnionUtils.get(this, Kind.Builtin);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code custom}?
-	 */
-	public boolean isCustom() {
-		return _kind == Kind.Custom;
-	}
-
-	/**
-	 * Get the {@code custom} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code custom} kind.
-	 */
-	public String custom() {
-		return TaggedUnionUtils.get(this, Kind.Custom);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Custom :
-					generator.write(((String) this._value));
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HighlighterType> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<HighlighterType> builtin(BuiltinHighlighterType v) {
-			this._kind = Kind.Builtin;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<HighlighterType> custom(String v) {
-			this._kind = Kind.Custom;
-			this._value = v;
-			return this;
-		}
-
-		public HighlighterType build() {
-			_checkSingleUse();
-			return new HighlighterType(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<HighlighterType> buildHighlighterTypeDeserializer() {
-		return new UnionDeserializer.Builder<HighlighterType, Kind, Object>(HighlighterType::new, true)
-				.addMember(Kind.Builtin, BuiltinHighlighterType._DESERIALIZER)
-				.addMember(Kind.Custom, JsonpDeserializer.stringDeserializer()).build();
-	}
-
-	public static final JsonpDeserializer<HighlighterType> _DESERIALIZER = JsonpDeserializer
-			.lazy(HighlighterType::buildHighlighterTypeDeserializer);
+    public enum Kind {
+        Builtin,
+        Custom
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private HighlighterType(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    public String _toJsonString() {
+        switch (_kind) {
+            case Builtin:
+                return this.builtin().jsonValue();
+            case Custom:
+                return this.custom();
+
+            default:
+                throw new IllegalStateException("Unknown kind " + _kind);
+        }
+    }
+
+    private HighlighterType(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static HighlighterType of(Function<Builder, ObjectBuilder<HighlighterType>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code builtin}?
+     */
+    public boolean isBuiltin() {
+        return _kind == Kind.Builtin;
+    }
+
+    /**
+     * Get the {@code builtin} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code builtin} kind.
+     */
+    public BuiltinHighlighterType builtin() {
+        return TaggedUnionUtils.get(this, Kind.Builtin);
+    }
+
+    /**
+     * Is this variant instance of kind {@code custom}?
+     */
+    public boolean isCustom() {
+        return _kind == Kind.Custom;
+    }
+
+    /**
+     * Get the {@code custom} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code custom} kind.
+     */
+    public String custom() {
+        return TaggedUnionUtils.get(this, Kind.Custom);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Custom:
+                    generator.write(((String) this._value));
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HighlighterType> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<HighlighterType> builtin(BuiltinHighlighterType v) {
+            this._kind = Kind.Builtin;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<HighlighterType> custom(String v) {
+            this._kind = Kind.Custom;
+            this._value = v;
+            return this;
+        }
+
+        public HighlighterType build() {
+            _checkSingleUse();
+            return new HighlighterType(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<HighlighterType> buildHighlighterTypeDeserializer() {
+        return new UnionDeserializer.Builder<HighlighterType, Kind, Object>(HighlighterType::new, true).addMember(
+            Kind.Builtin,
+            BuiltinHighlighterType._DESERIALIZER
+        ).addMember(Kind.Custom, JsonpDeserializer.stringDeserializer()).build();
+    }
+
+    public static final JsonpDeserializer<HighlighterType> _DESERIALIZER = JsonpDeserializer.lazy(
+        HighlighterType::buildHighlighterTypeDeserializer
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterTypeBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterTypeBuilders.java
index f1d441f886..449adeb8fc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterTypeBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HighlighterTypeBuilders.java
@@ -38,10 +38,9 @@
  * Variants <code>builtin</code>, <code>custom</code> are not available here as
  * they don't have a dedicated class. Use {@link HighlighterType}'s builder for
  * these.
- * 
+ *
  */
 public class HighlighterTypeBuilders {
-	private HighlighterTypeBuilders() {
-	}
+    private HighlighterTypeBuilders() {}
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Hit.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Hit.java
index 5791f98d70..0050f9da69 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Hit.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Hit.java
@@ -32,7 +32,12 @@
 
 package org.opensearch.client.opensearch.core.search;
 
-import org.opensearch.client.opensearch.core.explain.Explanation;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,738 +46,732 @@
 import org.opensearch.client.json.JsonpUtils;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.core.explain.Explanation;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.Hit
 
-
-
 public class Hit<TDocument> implements JsonpSerializable {
-	private final String index;
+    private final String index;
 
-	private final String id;
+    private final String id;
 
-	@Nullable
-	private final Double score;
+    @Nullable
+    private final Double score;
 
-	@Nullable
-	private final Explanation explanation;
+    @Nullable
+    private final Explanation explanation;
 
-	private final Map<String, JsonData> fields;
+    private final Map<String, JsonData> fields;
 
-	private final Map<String, List<String>> highlight;
+    private final Map<String, List<String>> highlight;
 
-	private final Map<String, InnerHitsResult> innerHits;
+    private final Map<String, InnerHitsResult> innerHits;
 
-	private final List<String> matchedQueries;
+    private final List<String> matchedQueries;
 
-	@Nullable
-	private final NestedIdentity nested;
-
-	private final List<String> ignored;
+    @Nullable
+    private final NestedIdentity nested;
+
+    private final List<String> ignored;
 
-	@Nullable
-	private final String shard;
-
-	@Nullable
-	private final String node;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final TDocument source;
-
-	@Nullable
-	private final Long seqNo;
-
-	@Nullable
-	private final Long primaryTerm;
-
-	@Nullable
-	private final Long version;
-
-	private final List<String> sort;
-
-	@Nullable
-	private final JsonpSerializer<TDocument> tDocumentSerializer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Hit(Builder<TDocument> builder) {
-
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.score = builder.score;
-		this.explanation = builder.explanation;
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-		this.highlight = ApiTypeHelper.unmodifiable(builder.highlight);
-		this.innerHits = ApiTypeHelper.unmodifiable(builder.innerHits);
-		this.matchedQueries = ApiTypeHelper.unmodifiable(builder.matchedQueries);
-		this.nested = builder.nested;
-		this.ignored = ApiTypeHelper.unmodifiable(builder.ignored);
-		this.shard = builder.shard;
-		this.node = builder.node;
-		this.routing = builder.routing;
-		this.source = builder.source;
-		this.seqNo = builder.seqNo;
-		this.primaryTerm = builder.primaryTerm;
-		this.version = builder.version;
-		this.sort = ApiTypeHelper.unmodifiable(builder.sort);
-		this.tDocumentSerializer = builder.tDocumentSerializer;
-
-	}
-
-	public static <TDocument> Hit<TDocument> of(Function<Builder<TDocument>, ObjectBuilder<Hit<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * Required - API name: {@code _index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Required - API name: {@code _id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * API name: {@code _score}
-	 */
-	@Nullable
-	public final Double score() {
-		return this.score;
-	}
-
-	/**
-	 * API name: {@code _explanation}
-	 */
-	@Nullable
-	public final Explanation explanation() {
-		return this.explanation;
-	}
-
-	/**
-	 * API name: {@code fields}
-	 */
-	public final Map<String, JsonData> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * API name: {@code highlight}
-	 */
-	public final Map<String, List<String>> highlight() {
-		return this.highlight;
-	}
-
-	/**
-	 * API name: {@code inner_hits}
-	 */
-	public final Map<String, InnerHitsResult> innerHits() {
-		return this.innerHits;
-	}
-
-	/**
-	 * API name: {@code matched_queries}
-	 */
-	public final List<String> matchedQueries() {
-		return this.matchedQueries;
-	}
-
-	/**
-	 * API name: {@code _nested}
-	 */
-	@Nullable
-	public final NestedIdentity nested() {
-		return this.nested;
-	}
-
-	/**
-	 * API name: {@code _ignored}
-	 */
-	public final List<String> ignored() {
-		return this.ignored;
-	}
-
-	/**
-	 * API name: {@code _shard}
-	 */
-	@Nullable
-	public final String shard() {
-		return this.shard;
-	}
-
-	/**
-	 * API name: {@code _node}
-	 */
-	@Nullable
-	public final String node() {
-		return this.node;
-	}
-
-	/**
-	 * API name: {@code _routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * API name: {@code _source}
-	 */
-	@Nullable
-	public final TDocument source() {
-		return this.source;
-	}
-
-	/**
-	 * API name: {@code _seq_no}
-	 */
-	@Nullable
-	public final Long seqNo() {
-		return this.seqNo;
-	}
-
-	/**
-	 * API name: {@code _primary_term}
-	 */
-	@Nullable
-	public final Long primaryTerm() {
-		return this.primaryTerm;
-	}
-
-	/**
-	 * API name: {@code _version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * API name: {@code sort}
-	 */
-	public final List<String> sort() {
-		return this.sort;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("_index");
-		generator.write(this.index);
-
-		generator.writeKey("_id");
-		generator.write(this.id);
-
-		if (this.score != null) {
-			generator.writeKey("_score");
-			generator.write(this.score);
-
-		}
-		if (this.explanation != null) {
-			generator.writeKey("_explanation");
-			this.explanation.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.fields.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.highlight)) {
-			generator.writeKey("highlight");
-			generator.writeStartObject();
-			for (Map.Entry<String, List<String>> item0 : this.highlight.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.writeStartArray();
-				if (item0.getValue() != null) {
-					for (String item1 : item0.getValue()) {
-						generator.write(item1);
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.innerHits)) {
-			generator.writeKey("inner_hits");
-			generator.writeStartObject();
-			for (Map.Entry<String, InnerHitsResult> item0 : this.innerHits.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.matchedQueries)) {
-			generator.writeKey("matched_queries");
-			generator.writeStartArray();
-			for (String item0 : this.matchedQueries) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.nested != null) {
-			generator.writeKey("_nested");
-			this.nested.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.ignored)) {
-			generator.writeKey("_ignored");
-			generator.writeStartArray();
-			for (String item0 : this.ignored) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.shard != null) {
-			generator.writeKey("_shard");
-			generator.write(this.shard);
-
-		}
-		if (this.node != null) {
-			generator.writeKey("_node");
-			generator.write(this.node);
-
-		}
-		if (this.routing != null) {
-			generator.writeKey("_routing");
-			generator.write(this.routing);
+    @Nullable
+    private final String shard;
+
+    @Nullable
+    private final String node;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final TDocument source;
+
+    @Nullable
+    private final Long seqNo;
+
+    @Nullable
+    private final Long primaryTerm;
+
+    @Nullable
+    private final Long version;
+
+    private final List<String> sort;
+
+    @Nullable
+    private final JsonpSerializer<TDocument> tDocumentSerializer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Hit(Builder<TDocument> builder) {
+
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.score = builder.score;
+        this.explanation = builder.explanation;
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.highlight = ApiTypeHelper.unmodifiable(builder.highlight);
+        this.innerHits = ApiTypeHelper.unmodifiable(builder.innerHits);
+        this.matchedQueries = ApiTypeHelper.unmodifiable(builder.matchedQueries);
+        this.nested = builder.nested;
+        this.ignored = ApiTypeHelper.unmodifiable(builder.ignored);
+        this.shard = builder.shard;
+        this.node = builder.node;
+        this.routing = builder.routing;
+        this.source = builder.source;
+        this.seqNo = builder.seqNo;
+        this.primaryTerm = builder.primaryTerm;
+        this.version = builder.version;
+        this.sort = ApiTypeHelper.unmodifiable(builder.sort);
+        this.tDocumentSerializer = builder.tDocumentSerializer;
+
+    }
+
+    public static <TDocument> Hit<TDocument> of(Function<Builder<TDocument>, ObjectBuilder<Hit<TDocument>>> fn) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * Required - API name: {@code _index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Required - API name: {@code _id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * API name: {@code _score}
+     */
+    @Nullable
+    public final Double score() {
+        return this.score;
+    }
+
+    /**
+     * API name: {@code _explanation}
+     */
+    @Nullable
+    public final Explanation explanation() {
+        return this.explanation;
+    }
+
+    /**
+     * API name: {@code fields}
+     */
+    public final Map<String, JsonData> fields() {
+        return this.fields;
+    }
+
+    /**
+     * API name: {@code highlight}
+     */
+    public final Map<String, List<String>> highlight() {
+        return this.highlight;
+    }
+
+    /**
+     * API name: {@code inner_hits}
+     */
+    public final Map<String, InnerHitsResult> innerHits() {
+        return this.innerHits;
+    }
+
+    /**
+     * API name: {@code matched_queries}
+     */
+    public final List<String> matchedQueries() {
+        return this.matchedQueries;
+    }
+
+    /**
+     * API name: {@code _nested}
+     */
+    @Nullable
+    public final NestedIdentity nested() {
+        return this.nested;
+    }
+
+    /**
+     * API name: {@code _ignored}
+     */
+    public final List<String> ignored() {
+        return this.ignored;
+    }
+
+    /**
+     * API name: {@code _shard}
+     */
+    @Nullable
+    public final String shard() {
+        return this.shard;
+    }
+
+    /**
+     * API name: {@code _node}
+     */
+    @Nullable
+    public final String node() {
+        return this.node;
+    }
+
+    /**
+     * API name: {@code _routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final TDocument source() {
+        return this.source;
+    }
+
+    /**
+     * API name: {@code _seq_no}
+     */
+    @Nullable
+    public final Long seqNo() {
+        return this.seqNo;
+    }
+
+    /**
+     * API name: {@code _primary_term}
+     */
+    @Nullable
+    public final Long primaryTerm() {
+        return this.primaryTerm;
+    }
+
+    /**
+     * API name: {@code _version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * API name: {@code sort}
+     */
+    public final List<String> sort() {
+        return this.sort;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("_index");
+        generator.write(this.index);
+
+        generator.writeKey("_id");
+        generator.write(this.id);
+
+        if (this.score != null) {
+            generator.writeKey("_score");
+            generator.write(this.score);
+
+        }
+        if (this.explanation != null) {
+            generator.writeKey("_explanation");
+            this.explanation.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.fields.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.highlight)) {
+            generator.writeKey("highlight");
+            generator.writeStartObject();
+            for (Map.Entry<String, List<String>> item0 : this.highlight.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.writeStartArray();
+                if (item0.getValue() != null) {
+                    for (String item1 : item0.getValue()) {
+                        generator.write(item1);
+
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.innerHits)) {
+            generator.writeKey("inner_hits");
+            generator.writeStartObject();
+            for (Map.Entry<String, InnerHitsResult> item0 : this.innerHits.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.matchedQueries)) {
+            generator.writeKey("matched_queries");
+            generator.writeStartArray();
+            for (String item0 : this.matchedQueries) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.nested != null) {
+            generator.writeKey("_nested");
+            this.nested.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.ignored)) {
+            generator.writeKey("_ignored");
+            generator.writeStartArray();
+            for (String item0 : this.ignored) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.shard != null) {
+            generator.writeKey("_shard");
+            generator.write(this.shard);
+
+        }
+        if (this.node != null) {
+            generator.writeKey("_node");
+            generator.write(this.node);
+
+        }
+        if (this.routing != null) {
+            generator.writeKey("_routing");
+            generator.write(this.routing);
 
-		}
-		if (this.source != null) {
-			generator.writeKey("_source");
-			JsonpUtils.serialize(this.source, generator, tDocumentSerializer, mapper);
+        }
+        if (this.source != null) {
+            generator.writeKey("_source");
+            JsonpUtils.serialize(this.source, generator, tDocumentSerializer, mapper);
 
-		}
-		if (this.seqNo != null) {
-			generator.writeKey("_seq_no");
-			generator.write(this.seqNo);
-
-		}
-		if (this.primaryTerm != null) {
-			generator.writeKey("_primary_term");
-			generator.write(this.primaryTerm);
-
-		}
-		if (this.version != null) {
-			generator.writeKey("_version");
-			generator.write(this.version);
-
-		}
-		if (ApiTypeHelper.isDefined(this.sort)) {
-			generator.writeKey("sort");
-			generator.writeStartArray();
-			for (String item0 : this.sort) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Hit}.
-	 */
-
-	public static class Builder<TDocument> extends ObjectBuilderBase implements ObjectBuilder<Hit<TDocument>> {
-		private String index;
-
-		private String id;
-
-		@Nullable
-		private Double score;
-
-		@Nullable
-		private Explanation explanation;
-
-		@Nullable
-		private Map<String, JsonData> fields;
-
-		@Nullable
-		private Map<String, List<String>> highlight;
-
-		@Nullable
-		private Map<String, InnerHitsResult> innerHits;
-
-		@Nullable
-		private List<String> matchedQueries;
-
-		@Nullable
-		private NestedIdentity nested;
-
-		@Nullable
-		private List<String> ignored;
-
-		@Nullable
-		private String shard;
-
-		@Nullable
-		private String node;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private TDocument source;
-
-		@Nullable
-		private Long seqNo;
-
-		@Nullable
-		private Long primaryTerm;
-
-		@Nullable
-		private Long version;
-
-		@Nullable
-		private List<String> sort;
-
-		@Nullable
-		private JsonpSerializer<TDocument> tDocumentSerializer;
-
-		/**
-		 * Required - API name: {@code _index}
-		 */
-		public final Builder<TDocument> index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _id}
-		 */
-		public final Builder<TDocument> id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _score}
-		 */
-		public final Builder<TDocument> score(@Nullable Double value) {
-			this.score = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _explanation}
-		 */
-		public final Builder<TDocument> explanation(@Nullable Explanation value) {
-			this.explanation = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _explanation}
-		 */
-		public final Builder<TDocument> explanation(Function<Explanation.Builder, ObjectBuilder<Explanation>> fn) {
-			return this.explanation(fn.apply(new Explanation.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>fields</code>.
-		 */
-		public final Builder<TDocument> fields(Map<String, JsonData> map) {
-			this.fields = _mapPutAll(this.fields, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds an entry to <code>fields</code>.
-		 */
-		public final Builder<TDocument> fields(String key, JsonData value) {
-			this.fields = _mapPut(this.fields, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code highlight}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>highlight</code>.
-		 */
-		public final Builder<TDocument> highlight(Map<String, List<String>> map) {
-			this.highlight = _mapPutAll(this.highlight, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code highlight}
-		 * <p>
-		 * Adds an entry to <code>highlight</code>.
-		 */
-		public final Builder<TDocument> highlight(String key, List<String> value) {
-			this.highlight = _mapPut(this.highlight, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code inner_hits}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>innerHits</code>.
-		 */
-		public final Builder<TDocument> innerHits(Map<String, InnerHitsResult> map) {
-			this.innerHits = _mapPutAll(this.innerHits, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code inner_hits}
-		 * <p>
-		 * Adds an entry to <code>innerHits</code>.
-		 */
-		public final Builder<TDocument> innerHits(String key, InnerHitsResult value) {
-			this.innerHits = _mapPut(this.innerHits, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code inner_hits}
-		 * <p>
-		 * Adds an entry to <code>innerHits</code> using a builder lambda.
-		 */
-		public final Builder<TDocument> innerHits(String key,
-				Function<InnerHitsResult.Builder, ObjectBuilder<InnerHitsResult>> fn) {
-			return innerHits(key, fn.apply(new InnerHitsResult.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code matched_queries}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>matchedQueries</code>.
-		 */
-		public final Builder<TDocument> matchedQueries(List<String> list) {
-			this.matchedQueries = _listAddAll(this.matchedQueries, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code matched_queries}
-		 * <p>
-		 * Adds one or more values to <code>matchedQueries</code>.
-		 */
-		public final Builder<TDocument> matchedQueries(String value, String... values) {
-			this.matchedQueries = _listAdd(this.matchedQueries, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code _nested}
-		 */
-		public final Builder<TDocument> nested(@Nullable NestedIdentity value) {
-			this.nested = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _nested}
-		 */
-		public final Builder<TDocument> nested(Function<NestedIdentity.Builder, ObjectBuilder<NestedIdentity>> fn) {
-			return this.nested(fn.apply(new NestedIdentity.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code _ignored}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>ignored</code>.
-		 */
-		public final Builder<TDocument> ignored(List<String> list) {
-			this.ignored = _listAddAll(this.ignored, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code _ignored}
-		 * <p>
-		 * Adds one or more values to <code>ignored</code>.
-		 */
-		public final Builder<TDocument> ignored(String value, String... values) {
-			this.ignored = _listAdd(this.ignored, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code _shard}
-		 */
-		public final Builder<TDocument> shard(@Nullable String value) {
-			this.shard = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _node}
-		 */
-		public final Builder<TDocument> node(@Nullable String value) {
-			this.node = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _routing}
-		 */
-		public final Builder<TDocument> routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _source}
-		 */
-		public final Builder<TDocument> source(@Nullable TDocument value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _seq_no}
-		 */
-		public final Builder<TDocument> seqNo(@Nullable Long value) {
-			this.seqNo = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _primary_term}
-		 */
-		public final Builder<TDocument> primaryTerm(@Nullable Long value) {
-			this.primaryTerm = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _version}
-		 */
-		public final Builder<TDocument> version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sort</code>.
-		 */
-		public final Builder<TDocument> sort(List<String> list) {
-			this.sort = _listAddAll(this.sort, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds one or more values to <code>sort</code>.
-		 */
-		public final Builder<TDocument> sort(String value, String... values) {
-			this.sort = _listAdd(this.sort, value, values);
-			return this;
-		}
-
-		/**
-		 * Serializer for TDocument. If not set, an attempt will be made to find a
-		 * serializer from the JSON context.
-		 */
-		public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
-			this.tDocumentSerializer = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Hit}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Hit<TDocument> build() {
-			_checkSingleUse();
-
-			return new Hit<TDocument>(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Create a JSON deserializer for Hit
-	 */
-	public static <TDocument> JsonpDeserializer<Hit<TDocument>> createHitDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		return ObjectBuilderDeserializer.createForObject((Supplier<Builder<TDocument>>) Builder::new,
-				op -> Hit.setupHitDeserializer(op, tDocumentDeserializer));
-	};
-
-	protected static <TDocument> void setupHitDeserializer(ObjectDeserializer<Hit.Builder<TDocument>> op,
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
-		op.add(Builder::score, JsonpDeserializer.doubleDeserializer(), "_score");
-		op.add(Builder::explanation, Explanation._DESERIALIZER, "_explanation");
-		op.add(Builder::fields, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "fields");
-		op.add(Builder::highlight, JsonpDeserializer.stringMapDeserializer(
-				JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer())), "highlight");
-		op.add(Builder::innerHits, JsonpDeserializer.stringMapDeserializer(InnerHitsResult._DESERIALIZER),
-				"inner_hits");
-		op.add(Builder::matchedQueries, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"matched_queries");
-		op.add(Builder::nested, NestedIdentity._DESERIALIZER, "_nested");
-		op.add(Builder::ignored, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"_ignored");
-		op.add(Builder::shard, JsonpDeserializer.stringDeserializer(), "_shard");
-		op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "_node");
-		op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "_routing");
-		op.add(Builder::source, tDocumentDeserializer, "_source");
-		op.add(Builder::seqNo, JsonpDeserializer.longDeserializer(), "_seq_no");
-		op.add(Builder::primaryTerm, JsonpDeserializer.longDeserializer(), "_primary_term");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "_version");
-		op.add(Builder::sort, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringOrNullDeserializer()), "sort");
-
-	}
+        }
+        if (this.seqNo != null) {
+            generator.writeKey("_seq_no");
+            generator.write(this.seqNo);
+
+        }
+        if (this.primaryTerm != null) {
+            generator.writeKey("_primary_term");
+            generator.write(this.primaryTerm);
+
+        }
+        if (this.version != null) {
+            generator.writeKey("_version");
+            generator.write(this.version);
+
+        }
+        if (ApiTypeHelper.isDefined(this.sort)) {
+            generator.writeKey("sort");
+            generator.writeStartArray();
+            for (String item0 : this.sort) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Hit}.
+     */
+
+    public static class Builder<TDocument> extends ObjectBuilderBase implements ObjectBuilder<Hit<TDocument>> {
+        private String index;
+
+        private String id;
+
+        @Nullable
+        private Double score;
+
+        @Nullable
+        private Explanation explanation;
+
+        @Nullable
+        private Map<String, JsonData> fields;
+
+        @Nullable
+        private Map<String, List<String>> highlight;
+
+        @Nullable
+        private Map<String, InnerHitsResult> innerHits;
+
+        @Nullable
+        private List<String> matchedQueries;
+
+        @Nullable
+        private NestedIdentity nested;
+
+        @Nullable
+        private List<String> ignored;
+
+        @Nullable
+        private String shard;
+
+        @Nullable
+        private String node;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private TDocument source;
+
+        @Nullable
+        private Long seqNo;
+
+        @Nullable
+        private Long primaryTerm;
+
+        @Nullable
+        private Long version;
+
+        @Nullable
+        private List<String> sort;
+
+        @Nullable
+        private JsonpSerializer<TDocument> tDocumentSerializer;
+
+        /**
+         * Required - API name: {@code _index}
+         */
+        public final Builder<TDocument> index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _id}
+         */
+        public final Builder<TDocument> id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _score}
+         */
+        public final Builder<TDocument> score(@Nullable Double value) {
+            this.score = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _explanation}
+         */
+        public final Builder<TDocument> explanation(@Nullable Explanation value) {
+            this.explanation = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _explanation}
+         */
+        public final Builder<TDocument> explanation(Function<Explanation.Builder, ObjectBuilder<Explanation>> fn) {
+            return this.explanation(fn.apply(new Explanation.Builder()).build());
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>fields</code>.
+         */
+        public final Builder<TDocument> fields(Map<String, JsonData> map) {
+            this.fields = _mapPutAll(this.fields, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds an entry to <code>fields</code>.
+         */
+        public final Builder<TDocument> fields(String key, JsonData value) {
+            this.fields = _mapPut(this.fields, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code highlight}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>highlight</code>.
+         */
+        public final Builder<TDocument> highlight(Map<String, List<String>> map) {
+            this.highlight = _mapPutAll(this.highlight, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code highlight}
+         * <p>
+         * Adds an entry to <code>highlight</code>.
+         */
+        public final Builder<TDocument> highlight(String key, List<String> value) {
+            this.highlight = _mapPut(this.highlight, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code inner_hits}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>innerHits</code>.
+         */
+        public final Builder<TDocument> innerHits(Map<String, InnerHitsResult> map) {
+            this.innerHits = _mapPutAll(this.innerHits, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code inner_hits}
+         * <p>
+         * Adds an entry to <code>innerHits</code>.
+         */
+        public final Builder<TDocument> innerHits(String key, InnerHitsResult value) {
+            this.innerHits = _mapPut(this.innerHits, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code inner_hits}
+         * <p>
+         * Adds an entry to <code>innerHits</code> using a builder lambda.
+         */
+        public final Builder<TDocument> innerHits(String key, Function<InnerHitsResult.Builder, ObjectBuilder<InnerHitsResult>> fn) {
+            return innerHits(key, fn.apply(new InnerHitsResult.Builder()).build());
+        }
+
+        /**
+         * API name: {@code matched_queries}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>matchedQueries</code>.
+         */
+        public final Builder<TDocument> matchedQueries(List<String> list) {
+            this.matchedQueries = _listAddAll(this.matchedQueries, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code matched_queries}
+         * <p>
+         * Adds one or more values to <code>matchedQueries</code>.
+         */
+        public final Builder<TDocument> matchedQueries(String value, String... values) {
+            this.matchedQueries = _listAdd(this.matchedQueries, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code _nested}
+         */
+        public final Builder<TDocument> nested(@Nullable NestedIdentity value) {
+            this.nested = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _nested}
+         */
+        public final Builder<TDocument> nested(Function<NestedIdentity.Builder, ObjectBuilder<NestedIdentity>> fn) {
+            return this.nested(fn.apply(new NestedIdentity.Builder()).build());
+        }
+
+        /**
+         * API name: {@code _ignored}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>ignored</code>.
+         */
+        public final Builder<TDocument> ignored(List<String> list) {
+            this.ignored = _listAddAll(this.ignored, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code _ignored}
+         * <p>
+         * Adds one or more values to <code>ignored</code>.
+         */
+        public final Builder<TDocument> ignored(String value, String... values) {
+            this.ignored = _listAdd(this.ignored, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code _shard}
+         */
+        public final Builder<TDocument> shard(@Nullable String value) {
+            this.shard = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _node}
+         */
+        public final Builder<TDocument> node(@Nullable String value) {
+            this.node = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _routing}
+         */
+        public final Builder<TDocument> routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _source}
+         */
+        public final Builder<TDocument> source(@Nullable TDocument value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _seq_no}
+         */
+        public final Builder<TDocument> seqNo(@Nullable Long value) {
+            this.seqNo = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _primary_term}
+         */
+        public final Builder<TDocument> primaryTerm(@Nullable Long value) {
+            this.primaryTerm = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _version}
+         */
+        public final Builder<TDocument> version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sort</code>.
+         */
+        public final Builder<TDocument> sort(List<String> list) {
+            this.sort = _listAddAll(this.sort, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds one or more values to <code>sort</code>.
+         */
+        public final Builder<TDocument> sort(String value, String... values) {
+            this.sort = _listAdd(this.sort, value, values);
+            return this;
+        }
+
+        /**
+         * Serializer for TDocument. If not set, an attempt will be made to find a
+         * serializer from the JSON context.
+         */
+        public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
+            this.tDocumentSerializer = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Hit}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Hit<TDocument> build() {
+            _checkSingleUse();
+
+            return new Hit<TDocument>(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Create a JSON deserializer for Hit
+     */
+    public static <TDocument> JsonpDeserializer<Hit<TDocument>> createHitDeserializer(JsonpDeserializer<TDocument> tDocumentDeserializer) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<TDocument>>) Builder::new,
+            op -> Hit.setupHitDeserializer(op, tDocumentDeserializer)
+        );
+    };
+
+    protected static <TDocument> void setupHitDeserializer(
+        ObjectDeserializer<Hit.Builder<TDocument>> op,
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(Builder::score, JsonpDeserializer.doubleDeserializer(), "_score");
+        op.add(Builder::explanation, Explanation._DESERIALIZER, "_explanation");
+        op.add(Builder::fields, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "fields");
+        op.add(
+            Builder::highlight,
+            JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer())),
+            "highlight"
+        );
+        op.add(Builder::innerHits, JsonpDeserializer.stringMapDeserializer(InnerHitsResult._DESERIALIZER), "inner_hits");
+        op.add(Builder::matchedQueries, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "matched_queries");
+        op.add(Builder::nested, NestedIdentity._DESERIALIZER, "_nested");
+        op.add(Builder::ignored, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "_ignored");
+        op.add(Builder::shard, JsonpDeserializer.stringDeserializer(), "_shard");
+        op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "_node");
+        op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "_routing");
+        op.add(Builder::source, tDocumentDeserializer, "_source");
+        op.add(Builder::seqNo, JsonpDeserializer.longDeserializer(), "_seq_no");
+        op.add(Builder::primaryTerm, JsonpDeserializer.longDeserializer(), "_primary_term");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "_version");
+        op.add(Builder::sort, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringOrNullDeserializer()), "sort");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HitsMetadata.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HitsMetadata.java
index 21e43775c2..0126da8699 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HitsMetadata.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/HitsMetadata.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
@@ -41,209 +46,205 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.HitsMetadata
 
-
-
 public class HitsMetadata<T> implements JsonpSerializable {
-	@Nullable
-	private final TotalHits total;
+    @Nullable
+    private final TotalHits total;
 
-	private final List<Hit<T>> hits;
+    private final List<Hit<T>> hits;
 
-	@Nullable
-	private final Double maxScore;
+    @Nullable
+    private final Double maxScore;
 
-	@Nullable
-	private final JsonpSerializer<T> tSerializer;
+    @Nullable
+    private final JsonpSerializer<T> tSerializer;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private HitsMetadata(Builder<T> builder) {
+    // ---------------------------------------------------------------------------------------------
+
+    private HitsMetadata(Builder<T> builder) {
 
-		this.total = builder.total;
-		this.hits = ApiTypeHelper.unmodifiableRequired(builder.hits, this, "hits");
-		this.maxScore = builder.maxScore;
-		this.tSerializer = builder.tSerializer;
-
-	}
-
-	public static <T> HitsMetadata<T> of(Function<Builder<T>, ObjectBuilder<HitsMetadata<T>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * API name: {@code total}
-	 */
-	public final TotalHits total() {
-		return this.total;
-	}
-
-	/**
-	 * Required - API name: {@code hits}
-	 */
-	public final List<Hit<T>> hits() {
-		return this.hits;
-	}
-
-	/**
-	 * API name: {@code max_score}
-	 */
-	@Nullable
-	public final Double maxScore() {
-		return this.maxScore;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.total != null) {
-			generator.writeKey("total");
-			this.total.serialize(generator, mapper);
-		}
-
-		if (ApiTypeHelper.isDefined(this.hits)) {
-			generator.writeKey("hits");
-			generator.writeStartArray();
-			for (Hit<T> item0 : this.hits) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.maxScore != null) {
-			generator.writeKey("max_score");
-			generator.write(this.maxScore);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HitsMetadata}.
-	 */
-
-	public static class Builder<T> extends ObjectBuilderBase implements ObjectBuilder<HitsMetadata<T>> {
-		@Nullable
-		private TotalHits total;
-
-		private List<Hit<T>> hits;
-
-		@Nullable
-		private Double maxScore;
-
-		@Nullable
-		private JsonpSerializer<T> tSerializer;
-
-		/**
-		 * API name: {@code total}
-		 */
-		public final Builder<T> total(TotalHits value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total}
-		 */
-		public final Builder<T> total(Function<TotalHits.Builder, ObjectBuilder<TotalHits>> fn) {
-			return this.total(fn.apply(new TotalHits.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code hits}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>hits</code>.
-		 */
-		public final Builder<T> hits(List<Hit<T>> list) {
-			this.hits = _listAddAll(this.hits, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code hits}
-		 * <p>
-		 * Adds one or more values to <code>hits</code>.
-		 */
-		public final Builder<T> hits(Hit<T> value, Hit<T>... values) {
-			this.hits = _listAdd(this.hits, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code hits}
-		 * <p>
-		 * Adds a value to <code>hits</code> using a builder lambda.
-		 */
-		public final Builder<T> hits(Function<Hit.Builder<T>, ObjectBuilder<Hit<T>>> fn) {
-			return hits(fn.apply(new Hit.Builder<T>()).build());
-		}
-
-		/**
-		 * API name: {@code max_score}
-		 */
-		public final Builder<T> maxScore(@Nullable Double value) {
-			this.maxScore = value;
-			return this;
-		}
-
-		/**
-		 * Serializer for T. If not set, an attempt will be made to find a serializer
-		 * from the JSON context.
-		 */
-		public final Builder<T> tSerializer(@Nullable JsonpSerializer<T> value) {
-			this.tSerializer = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HitsMetadata}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HitsMetadata<T> build() {
-			_checkSingleUse();
-
-			return new HitsMetadata<T>(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Create a JSON deserializer for HitsMetadata
-	 */
-	public static <T> JsonpDeserializer<HitsMetadata<T>> createHitsMetadataDeserializer(
-			JsonpDeserializer<T> tDeserializer) {
-		return ObjectBuilderDeserializer.createForObject((Supplier<Builder<T>>) Builder::new,
-				op -> HitsMetadata.setupHitsMetadataDeserializer(op, tDeserializer));
-	};
-
-	protected static <T> void setupHitsMetadataDeserializer(ObjectDeserializer<HitsMetadata.Builder<T>> op,
-			JsonpDeserializer<T> tDeserializer) {
-
-		op.add(Builder::total, TotalHits._DESERIALIZER, "total");
-		op.add(Builder::hits, JsonpDeserializer.arrayDeserializer(Hit.createHitDeserializer(tDeserializer)), "hits");
-		op.add(Builder::maxScore, JsonpDeserializer.doubleDeserializer(), "max_score");
-
-	}
+        this.total = builder.total;
+        this.hits = ApiTypeHelper.unmodifiableRequired(builder.hits, this, "hits");
+        this.maxScore = builder.maxScore;
+        this.tSerializer = builder.tSerializer;
+
+    }
+
+    public static <T> HitsMetadata<T> of(Function<Builder<T>, ObjectBuilder<HitsMetadata<T>>> fn) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * API name: {@code total}
+     */
+    public final TotalHits total() {
+        return this.total;
+    }
+
+    /**
+     * Required - API name: {@code hits}
+     */
+    public final List<Hit<T>> hits() {
+        return this.hits;
+    }
+
+    /**
+     * API name: {@code max_score}
+     */
+    @Nullable
+    public final Double maxScore() {
+        return this.maxScore;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.total != null) {
+            generator.writeKey("total");
+            this.total.serialize(generator, mapper);
+        }
+
+        if (ApiTypeHelper.isDefined(this.hits)) {
+            generator.writeKey("hits");
+            generator.writeStartArray();
+            for (Hit<T> item0 : this.hits) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.maxScore != null) {
+            generator.writeKey("max_score");
+            generator.write(this.maxScore);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HitsMetadata}.
+     */
+
+    public static class Builder<T> extends ObjectBuilderBase implements ObjectBuilder<HitsMetadata<T>> {
+        @Nullable
+        private TotalHits total;
+
+        private List<Hit<T>> hits;
+
+        @Nullable
+        private Double maxScore;
+
+        @Nullable
+        private JsonpSerializer<T> tSerializer;
+
+        /**
+         * API name: {@code total}
+         */
+        public final Builder<T> total(TotalHits value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total}
+         */
+        public final Builder<T> total(Function<TotalHits.Builder, ObjectBuilder<TotalHits>> fn) {
+            return this.total(fn.apply(new TotalHits.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code hits}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>hits</code>.
+         */
+        public final Builder<T> hits(List<Hit<T>> list) {
+            this.hits = _listAddAll(this.hits, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code hits}
+         * <p>
+         * Adds one or more values to <code>hits</code>.
+         */
+        public final Builder<T> hits(Hit<T> value, Hit<T>... values) {
+            this.hits = _listAdd(this.hits, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code hits}
+         * <p>
+         * Adds a value to <code>hits</code> using a builder lambda.
+         */
+        public final Builder<T> hits(Function<Hit.Builder<T>, ObjectBuilder<Hit<T>>> fn) {
+            return hits(fn.apply(new Hit.Builder<T>()).build());
+        }
+
+        /**
+         * API name: {@code max_score}
+         */
+        public final Builder<T> maxScore(@Nullable Double value) {
+            this.maxScore = value;
+            return this;
+        }
+
+        /**
+         * Serializer for T. If not set, an attempt will be made to find a serializer
+         * from the JSON context.
+         */
+        public final Builder<T> tSerializer(@Nullable JsonpSerializer<T> value) {
+            this.tSerializer = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link HitsMetadata}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HitsMetadata<T> build() {
+            _checkSingleUse();
+
+            return new HitsMetadata<T>(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Create a JSON deserializer for HitsMetadata
+     */
+    public static <T> JsonpDeserializer<HitsMetadata<T>> createHitsMetadataDeserializer(JsonpDeserializer<T> tDeserializer) {
+        return ObjectBuilderDeserializer.createForObject(
+            (Supplier<Builder<T>>) Builder::new,
+            op -> HitsMetadata.setupHitsMetadataDeserializer(op, tDeserializer)
+        );
+    };
+
+    protected static <T> void setupHitsMetadataDeserializer(
+        ObjectDeserializer<HitsMetadata.Builder<T>> op,
+        JsonpDeserializer<T> tDeserializer
+    ) {
+
+        op.add(Builder::total, TotalHits._DESERIALIZER, "total");
+        op.add(Builder::hits, JsonpDeserializer.arrayDeserializer(Hit.createHitDeserializer(tDeserializer)), "hits");
+        op.add(Builder::maxScore, JsonpDeserializer.doubleDeserializer(), "max_score");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/InnerHits.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/InnerHits.java
index 27d5bcfa93..a99c9a4315 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/InnerHits.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/InnerHits.java
@@ -32,677 +32,674 @@
 
 package org.opensearch.client.opensearch.core.search;
 
-import org.opensearch.client.opensearch._types.ScriptField;
-import org.opensearch.client.opensearch._types.SortOptions;
-import org.opensearch.client.opensearch._types.query_dsl.FieldAndFormat;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ScriptField;
+import org.opensearch.client.opensearch._types.SortOptions;
+import org.opensearch.client.opensearch._types.query_dsl.FieldAndFormat;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.InnerHits
 
-
 @JsonpDeserializable
 public class InnerHits implements JsonpSerializable {
-	@Nullable
-	private final String name;
+    @Nullable
+    private final String name;
 
-	@Nullable
-	private final Integer size;
-
-	@Nullable
-	private final Integer from;
-
-	@Nullable
-	private final FieldCollapse collapse;
-
-	private final List<FieldAndFormat> docvalueFields;
-
-	@Nullable
-	private final Boolean explain;
-
-	@Nullable
-	private final Highlight highlight;
-
-	@Nullable
-	private final Boolean ignoreUnmapped;
-
-	private final Map<String, ScriptField> scriptFields;
-
-	@Nullable
-	private final Boolean seqNoPrimaryTerm;
-
-	private final List<String> fields;
-
-	private final List<SortOptions> sort;
-
-	@Nullable
-	private final SourceConfig source;
-
-	private final List<String> storedField;
-
-	@Nullable
-	private final Boolean trackScores;
-
-	@Nullable
-	private final Boolean version;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private InnerHits(Builder builder) {
-
-		this.name = builder.name;
-		this.size = builder.size;
-		this.from = builder.from;
-		this.collapse = builder.collapse;
-		this.docvalueFields = ApiTypeHelper.unmodifiable(builder.docvalueFields);
-		this.explain = builder.explain;
-		this.highlight = builder.highlight;
-		this.ignoreUnmapped = builder.ignoreUnmapped;
-		this.scriptFields = ApiTypeHelper.unmodifiable(builder.scriptFields);
-		this.seqNoPrimaryTerm = builder.seqNoPrimaryTerm;
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-		this.sort = ApiTypeHelper.unmodifiable(builder.sort);
-		this.source = builder.source;
-		this.storedField = ApiTypeHelper.unmodifiable(builder.storedField);
-		this.trackScores = builder.trackScores;
-		this.version = builder.version;
-
-	}
-
-	public static InnerHits of(Function<Builder, ObjectBuilder<InnerHits>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code name}
-	 */
-	@Nullable
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	/**
-	 * API name: {@code from}
-	 */
-	@Nullable
-	public final Integer from() {
-		return this.from;
-	}
-
-	/**
-	 * API name: {@code collapse}
-	 */
-	@Nullable
-	public final FieldCollapse collapse() {
-		return this.collapse;
-	}
-
-	/**
-	 * API name: {@code docvalue_fields}
-	 */
-	public final List<FieldAndFormat> docvalueFields() {
-		return this.docvalueFields;
-	}
-
-	/**
-	 * API name: {@code explain}
-	 */
-	@Nullable
-	public final Boolean explain() {
-		return this.explain;
-	}
-
-	/**
-	 * API name: {@code highlight}
-	 */
-	@Nullable
-	public final Highlight highlight() {
-		return this.highlight;
-	}
-
-	/**
-	 * API name: {@code ignore_unmapped}
-	 */
-	@Nullable
-	public final Boolean ignoreUnmapped() {
-		return this.ignoreUnmapped;
-	}
-
-	/**
-	 * API name: {@code script_fields}
-	 */
-	public final Map<String, ScriptField> scriptFields() {
-		return this.scriptFields;
-	}
-
-	/**
-	 * API name: {@code seq_no_primary_term}
-	 */
-	@Nullable
-	public final Boolean seqNoPrimaryTerm() {
-		return this.seqNoPrimaryTerm;
-	}
-
-	/**
-	 * API name: {@code fields}
-	 */
-	public final List<String> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * API name: {@code sort}
-	 */
-	public final List<SortOptions> sort() {
-		return this.sort;
-	}
-
-	/**
-	 * API name: {@code _source}
-	 */
-	@Nullable
-	public final SourceConfig source() {
-		return this.source;
-	}
-
-	/**
-	 * API name: {@code stored_field}
-	 */
-	public final List<String> storedField() {
-		return this.storedField;
-	}
-
-	/**
-	 * API name: {@code track_scores}
-	 */
-	@Nullable
-	public final Boolean trackScores() {
-		return this.trackScores;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Boolean version() {
-		return this.version;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.name != null) {
-			generator.writeKey("name");
-			generator.write(this.name);
-
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		if (this.from != null) {
-			generator.writeKey("from");
-			generator.write(this.from);
-
-		}
-		if (this.collapse != null) {
-			generator.writeKey("collapse");
-			this.collapse.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.docvalueFields)) {
-			generator.writeKey("docvalue_fields");
-			generator.writeStartArray();
-			for (FieldAndFormat item0 : this.docvalueFields) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.explain != null) {
-			generator.writeKey("explain");
-			generator.write(this.explain);
-
-		}
-		if (this.highlight != null) {
-			generator.writeKey("highlight");
-			this.highlight.serialize(generator, mapper);
-
-		}
-		if (this.ignoreUnmapped != null) {
-			generator.writeKey("ignore_unmapped");
-			generator.write(this.ignoreUnmapped);
-
-		}
-		if (ApiTypeHelper.isDefined(this.scriptFields)) {
-			generator.writeKey("script_fields");
-			generator.writeStartObject();
-			for (Map.Entry<String, ScriptField> item0 : this.scriptFields.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.seqNoPrimaryTerm != null) {
-			generator.writeKey("seq_no_primary_term");
-			generator.write(this.seqNoPrimaryTerm);
-
-		}
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartArray();
-			for (String item0 : this.fields) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.sort)) {
-			generator.writeKey("sort");
-			generator.writeStartArray();
-			for (SortOptions item0 : this.sort) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.source != null) {
-			generator.writeKey("_source");
-			this.source.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.storedField)) {
-			generator.writeKey("stored_field");
-			generator.writeStartArray();
-			for (String item0 : this.storedField) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.trackScores != null) {
-			generator.writeKey("track_scores");
-			generator.write(this.trackScores);
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link InnerHits}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InnerHits> {
-		@Nullable
-		private String name;
-
-		@Nullable
-		private Integer size;
-
-		@Nullable
-		private Integer from;
-
-		@Nullable
-		private FieldCollapse collapse;
-
-		@Nullable
-		private List<FieldAndFormat> docvalueFields;
-
-		@Nullable
-		private Boolean explain;
-
-		@Nullable
-		private Highlight highlight;
-
-		@Nullable
-		private Boolean ignoreUnmapped;
-
-		@Nullable
-		private Map<String, ScriptField> scriptFields;
-
-		@Nullable
-		private Boolean seqNoPrimaryTerm;
-
-		@Nullable
-		private List<String> fields;
-
-		@Nullable
-		private List<SortOptions> sort;
-
-		@Nullable
-		private SourceConfig source;
-
-		@Nullable
-		private List<String> storedField;
-
-		@Nullable
-		private Boolean trackScores;
-
-		@Nullable
-		private Boolean version;
-
-		/**
-		 * API name: {@code name}
-		 */
-		public final Builder name(@Nullable String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Integer value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code from}
-		 */
-		public final Builder from(@Nullable Integer value) {
-			this.from = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code collapse}
-		 */
-		public final Builder collapse(@Nullable FieldCollapse value) {
-			this.collapse = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code collapse}
-		 */
-		public final Builder collapse(Function<FieldCollapse.Builder, ObjectBuilder<FieldCollapse>> fn) {
-			return this.collapse(fn.apply(new FieldCollapse.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code docvalue_fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>docvalueFields</code>.
-		 */
-		public final Builder docvalueFields(List<FieldAndFormat> list) {
-			this.docvalueFields = _listAddAll(this.docvalueFields, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code docvalue_fields}
-		 * <p>
-		 * Adds one or more values to <code>docvalueFields</code>.
-		 */
-		public final Builder docvalueFields(FieldAndFormat value, FieldAndFormat... values) {
-			this.docvalueFields = _listAdd(this.docvalueFields, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code docvalue_fields}
-		 * <p>
-		 * Adds a value to <code>docvalueFields</code> using a builder lambda.
-		 */
-		public final Builder docvalueFields(Function<FieldAndFormat.Builder, ObjectBuilder<FieldAndFormat>> fn) {
-			return docvalueFields(fn.apply(new FieldAndFormat.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code explain}
-		 */
-		public final Builder explain(@Nullable Boolean value) {
-			this.explain = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code highlight}
-		 */
-		public final Builder highlight(@Nullable Highlight value) {
-			this.highlight = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code highlight}
-		 */
-		public final Builder highlight(Function<Highlight.Builder, ObjectBuilder<Highlight>> fn) {
-			return this.highlight(fn.apply(new Highlight.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code ignore_unmapped}
-		 */
-		public final Builder ignoreUnmapped(@Nullable Boolean value) {
-			this.ignoreUnmapped = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script_fields}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>scriptFields</code>.
-		 */
-		public final Builder scriptFields(Map<String, ScriptField> map) {
-			this.scriptFields = _mapPutAll(this.scriptFields, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code script_fields}
-		 * <p>
-		 * Adds an entry to <code>scriptFields</code>.
-		 */
-		public final Builder scriptFields(String key, ScriptField value) {
-			this.scriptFields = _mapPut(this.scriptFields, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code script_fields}
-		 * <p>
-		 * Adds an entry to <code>scriptFields</code> using a builder lambda.
-		 */
-		public final Builder scriptFields(String key, Function<ScriptField.Builder, ObjectBuilder<ScriptField>> fn) {
-			return scriptFields(key, fn.apply(new ScriptField.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code seq_no_primary_term}
-		 */
-		public final Builder seqNoPrimaryTerm(@Nullable Boolean value) {
-			this.seqNoPrimaryTerm = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fields</code>.
-		 */
-		public final Builder fields(List<String> list) {
-			this.fields = _listAddAll(this.fields, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds one or more values to <code>fields</code>.
-		 */
-		public final Builder fields(String value, String... values) {
-			this.fields = _listAdd(this.fields, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>sort</code>.
-		 */
-		public final Builder sort(List<SortOptions> list) {
-			this.sort = _listAddAll(this.sort, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds one or more values to <code>sort</code>.
-		 */
-		public final Builder sort(SortOptions value, SortOptions... values) {
-			this.sort = _listAdd(this.sort, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 * <p>
-		 * Adds a value to <code>sort</code> using a builder lambda.
-		 */
-		public final Builder sort(Function<SortOptions.Builder, ObjectBuilder<SortOptions>> fn) {
-			return sort(fn.apply(new SortOptions.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code _source}
-		 */
-		public final Builder source(@Nullable SourceConfig value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _source}
-		 */
-		public final Builder source(Function<SourceConfig.Builder, ObjectBuilder<SourceConfig>> fn) {
-			return this.source(fn.apply(new SourceConfig.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code stored_field}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>storedField</code>.
-		 */
-		public final Builder storedField(List<String> list) {
-			this.storedField = _listAddAll(this.storedField, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code stored_field}
-		 * <p>
-		 * Adds one or more values to <code>storedField</code>.
-		 */
-		public final Builder storedField(String value, String... values) {
-			this.storedField = _listAdd(this.storedField, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code track_scores}
-		 */
-		public final Builder trackScores(@Nullable Boolean value) {
-			this.trackScores = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Boolean value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link InnerHits}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public InnerHits build() {
-			_checkSingleUse();
-
-			return new InnerHits(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link InnerHits}
-	 */
-	public static final JsonpDeserializer<InnerHits> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			InnerHits::setupInnerHitsDeserializer);
-
-	protected static void setupInnerHitsDeserializer(ObjectDeserializer<InnerHits.Builder> op) {
-
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
-		op.add(Builder::from, JsonpDeserializer.integerDeserializer(), "from");
-		op.add(Builder::collapse, FieldCollapse._DESERIALIZER, "collapse");
-		op.add(Builder::docvalueFields, JsonpDeserializer.arrayDeserializer(FieldAndFormat._DESERIALIZER),
-				"docvalue_fields");
-		op.add(Builder::explain, JsonpDeserializer.booleanDeserializer(), "explain");
-		op.add(Builder::highlight, Highlight._DESERIALIZER, "highlight");
-		op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
-		op.add(Builder::scriptFields, JsonpDeserializer.stringMapDeserializer(ScriptField._DESERIALIZER),
-				"script_fields");
-		op.add(Builder::seqNoPrimaryTerm, JsonpDeserializer.booleanDeserializer(), "seq_no_primary_term");
-		op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "fields");
-		op.add(Builder::sort, JsonpDeserializer.arrayDeserializer(SortOptions._DESERIALIZER), "sort");
-		op.add(Builder::source, SourceConfig._DESERIALIZER, "_source");
-		op.add(Builder::storedField, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"stored_field");
-		op.add(Builder::trackScores, JsonpDeserializer.booleanDeserializer(), "track_scores");
-		op.add(Builder::version, JsonpDeserializer.booleanDeserializer(), "version");
-
-	}
+    @Nullable
+    private final Integer size;
+
+    @Nullable
+    private final Integer from;
+
+    @Nullable
+    private final FieldCollapse collapse;
+
+    private final List<FieldAndFormat> docvalueFields;
+
+    @Nullable
+    private final Boolean explain;
+
+    @Nullable
+    private final Highlight highlight;
+
+    @Nullable
+    private final Boolean ignoreUnmapped;
+
+    private final Map<String, ScriptField> scriptFields;
+
+    @Nullable
+    private final Boolean seqNoPrimaryTerm;
+
+    private final List<String> fields;
+
+    private final List<SortOptions> sort;
+
+    @Nullable
+    private final SourceConfig source;
+
+    private final List<String> storedField;
+
+    @Nullable
+    private final Boolean trackScores;
+
+    @Nullable
+    private final Boolean version;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private InnerHits(Builder builder) {
+
+        this.name = builder.name;
+        this.size = builder.size;
+        this.from = builder.from;
+        this.collapse = builder.collapse;
+        this.docvalueFields = ApiTypeHelper.unmodifiable(builder.docvalueFields);
+        this.explain = builder.explain;
+        this.highlight = builder.highlight;
+        this.ignoreUnmapped = builder.ignoreUnmapped;
+        this.scriptFields = ApiTypeHelper.unmodifiable(builder.scriptFields);
+        this.seqNoPrimaryTerm = builder.seqNoPrimaryTerm;
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.sort = ApiTypeHelper.unmodifiable(builder.sort);
+        this.source = builder.source;
+        this.storedField = ApiTypeHelper.unmodifiable(builder.storedField);
+        this.trackScores = builder.trackScores;
+        this.version = builder.version;
+
+    }
+
+    public static InnerHits of(Function<Builder, ObjectBuilder<InnerHits>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code name}
+     */
+    @Nullable
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    /**
+     * API name: {@code from}
+     */
+    @Nullable
+    public final Integer from() {
+        return this.from;
+    }
+
+    /**
+     * API name: {@code collapse}
+     */
+    @Nullable
+    public final FieldCollapse collapse() {
+        return this.collapse;
+    }
+
+    /**
+     * API name: {@code docvalue_fields}
+     */
+    public final List<FieldAndFormat> docvalueFields() {
+        return this.docvalueFields;
+    }
+
+    /**
+     * API name: {@code explain}
+     */
+    @Nullable
+    public final Boolean explain() {
+        return this.explain;
+    }
+
+    /**
+     * API name: {@code highlight}
+     */
+    @Nullable
+    public final Highlight highlight() {
+        return this.highlight;
+    }
+
+    /**
+     * API name: {@code ignore_unmapped}
+     */
+    @Nullable
+    public final Boolean ignoreUnmapped() {
+        return this.ignoreUnmapped;
+    }
+
+    /**
+     * API name: {@code script_fields}
+     */
+    public final Map<String, ScriptField> scriptFields() {
+        return this.scriptFields;
+    }
+
+    /**
+     * API name: {@code seq_no_primary_term}
+     */
+    @Nullable
+    public final Boolean seqNoPrimaryTerm() {
+        return this.seqNoPrimaryTerm;
+    }
+
+    /**
+     * API name: {@code fields}
+     */
+    public final List<String> fields() {
+        return this.fields;
+    }
+
+    /**
+     * API name: {@code sort}
+     */
+    public final List<SortOptions> sort() {
+        return this.sort;
+    }
+
+    /**
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final SourceConfig source() {
+        return this.source;
+    }
+
+    /**
+     * API name: {@code stored_field}
+     */
+    public final List<String> storedField() {
+        return this.storedField;
+    }
+
+    /**
+     * API name: {@code track_scores}
+     */
+    @Nullable
+    public final Boolean trackScores() {
+        return this.trackScores;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Boolean version() {
+        return this.version;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.name != null) {
+            generator.writeKey("name");
+            generator.write(this.name);
+
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        if (this.from != null) {
+            generator.writeKey("from");
+            generator.write(this.from);
+
+        }
+        if (this.collapse != null) {
+            generator.writeKey("collapse");
+            this.collapse.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.docvalueFields)) {
+            generator.writeKey("docvalue_fields");
+            generator.writeStartArray();
+            for (FieldAndFormat item0 : this.docvalueFields) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.explain != null) {
+            generator.writeKey("explain");
+            generator.write(this.explain);
+
+        }
+        if (this.highlight != null) {
+            generator.writeKey("highlight");
+            this.highlight.serialize(generator, mapper);
+
+        }
+        if (this.ignoreUnmapped != null) {
+            generator.writeKey("ignore_unmapped");
+            generator.write(this.ignoreUnmapped);
+
+        }
+        if (ApiTypeHelper.isDefined(this.scriptFields)) {
+            generator.writeKey("script_fields");
+            generator.writeStartObject();
+            for (Map.Entry<String, ScriptField> item0 : this.scriptFields.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.seqNoPrimaryTerm != null) {
+            generator.writeKey("seq_no_primary_term");
+            generator.write(this.seqNoPrimaryTerm);
+
+        }
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartArray();
+            for (String item0 : this.fields) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.sort)) {
+            generator.writeKey("sort");
+            generator.writeStartArray();
+            for (SortOptions item0 : this.sort) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.source != null) {
+            generator.writeKey("_source");
+            this.source.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.storedField)) {
+            generator.writeKey("stored_field");
+            generator.writeStartArray();
+            for (String item0 : this.storedField) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.trackScores != null) {
+            generator.writeKey("track_scores");
+            generator.write(this.trackScores);
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link InnerHits}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InnerHits> {
+        @Nullable
+        private String name;
+
+        @Nullable
+        private Integer size;
+
+        @Nullable
+        private Integer from;
+
+        @Nullable
+        private FieldCollapse collapse;
+
+        @Nullable
+        private List<FieldAndFormat> docvalueFields;
+
+        @Nullable
+        private Boolean explain;
+
+        @Nullable
+        private Highlight highlight;
+
+        @Nullable
+        private Boolean ignoreUnmapped;
+
+        @Nullable
+        private Map<String, ScriptField> scriptFields;
+
+        @Nullable
+        private Boolean seqNoPrimaryTerm;
+
+        @Nullable
+        private List<String> fields;
+
+        @Nullable
+        private List<SortOptions> sort;
+
+        @Nullable
+        private SourceConfig source;
+
+        @Nullable
+        private List<String> storedField;
+
+        @Nullable
+        private Boolean trackScores;
+
+        @Nullable
+        private Boolean version;
+
+        /**
+         * API name: {@code name}
+         */
+        public final Builder name(@Nullable String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Integer value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code from}
+         */
+        public final Builder from(@Nullable Integer value) {
+            this.from = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code collapse}
+         */
+        public final Builder collapse(@Nullable FieldCollapse value) {
+            this.collapse = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code collapse}
+         */
+        public final Builder collapse(Function<FieldCollapse.Builder, ObjectBuilder<FieldCollapse>> fn) {
+            return this.collapse(fn.apply(new FieldCollapse.Builder()).build());
+        }
+
+        /**
+         * API name: {@code docvalue_fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>docvalueFields</code>.
+         */
+        public final Builder docvalueFields(List<FieldAndFormat> list) {
+            this.docvalueFields = _listAddAll(this.docvalueFields, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code docvalue_fields}
+         * <p>
+         * Adds one or more values to <code>docvalueFields</code>.
+         */
+        public final Builder docvalueFields(FieldAndFormat value, FieldAndFormat... values) {
+            this.docvalueFields = _listAdd(this.docvalueFields, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code docvalue_fields}
+         * <p>
+         * Adds a value to <code>docvalueFields</code> using a builder lambda.
+         */
+        public final Builder docvalueFields(Function<FieldAndFormat.Builder, ObjectBuilder<FieldAndFormat>> fn) {
+            return docvalueFields(fn.apply(new FieldAndFormat.Builder()).build());
+        }
+
+        /**
+         * API name: {@code explain}
+         */
+        public final Builder explain(@Nullable Boolean value) {
+            this.explain = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code highlight}
+         */
+        public final Builder highlight(@Nullable Highlight value) {
+            this.highlight = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code highlight}
+         */
+        public final Builder highlight(Function<Highlight.Builder, ObjectBuilder<Highlight>> fn) {
+            return this.highlight(fn.apply(new Highlight.Builder()).build());
+        }
+
+        /**
+         * API name: {@code ignore_unmapped}
+         */
+        public final Builder ignoreUnmapped(@Nullable Boolean value) {
+            this.ignoreUnmapped = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script_fields}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>scriptFields</code>.
+         */
+        public final Builder scriptFields(Map<String, ScriptField> map) {
+            this.scriptFields = _mapPutAll(this.scriptFields, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code script_fields}
+         * <p>
+         * Adds an entry to <code>scriptFields</code>.
+         */
+        public final Builder scriptFields(String key, ScriptField value) {
+            this.scriptFields = _mapPut(this.scriptFields, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code script_fields}
+         * <p>
+         * Adds an entry to <code>scriptFields</code> using a builder lambda.
+         */
+        public final Builder scriptFields(String key, Function<ScriptField.Builder, ObjectBuilder<ScriptField>> fn) {
+            return scriptFields(key, fn.apply(new ScriptField.Builder()).build());
+        }
+
+        /**
+         * API name: {@code seq_no_primary_term}
+         */
+        public final Builder seqNoPrimaryTerm(@Nullable Boolean value) {
+            this.seqNoPrimaryTerm = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fields</code>.
+         */
+        public final Builder fields(List<String> list) {
+            this.fields = _listAddAll(this.fields, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds one or more values to <code>fields</code>.
+         */
+        public final Builder fields(String value, String... values) {
+            this.fields = _listAdd(this.fields, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>sort</code>.
+         */
+        public final Builder sort(List<SortOptions> list) {
+            this.sort = _listAddAll(this.sort, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds one or more values to <code>sort</code>.
+         */
+        public final Builder sort(SortOptions value, SortOptions... values) {
+            this.sort = _listAdd(this.sort, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         * <p>
+         * Adds a value to <code>sort</code> using a builder lambda.
+         */
+        public final Builder sort(Function<SortOptions.Builder, ObjectBuilder<SortOptions>> fn) {
+            return sort(fn.apply(new SortOptions.Builder()).build());
+        }
+
+        /**
+         * API name: {@code _source}
+         */
+        public final Builder source(@Nullable SourceConfig value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _source}
+         */
+        public final Builder source(Function<SourceConfig.Builder, ObjectBuilder<SourceConfig>> fn) {
+            return this.source(fn.apply(new SourceConfig.Builder()).build());
+        }
+
+        /**
+         * API name: {@code stored_field}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>storedField</code>.
+         */
+        public final Builder storedField(List<String> list) {
+            this.storedField = _listAddAll(this.storedField, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code stored_field}
+         * <p>
+         * Adds one or more values to <code>storedField</code>.
+         */
+        public final Builder storedField(String value, String... values) {
+            this.storedField = _listAdd(this.storedField, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code track_scores}
+         */
+        public final Builder trackScores(@Nullable Boolean value) {
+            this.trackScores = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Boolean value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link InnerHits}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public InnerHits build() {
+            _checkSingleUse();
+
+            return new InnerHits(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link InnerHits}
+     */
+    public static final JsonpDeserializer<InnerHits> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        InnerHits::setupInnerHitsDeserializer
+    );
+
+    protected static void setupInnerHitsDeserializer(ObjectDeserializer<InnerHits.Builder> op) {
+
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
+        op.add(Builder::from, JsonpDeserializer.integerDeserializer(), "from");
+        op.add(Builder::collapse, FieldCollapse._DESERIALIZER, "collapse");
+        op.add(Builder::docvalueFields, JsonpDeserializer.arrayDeserializer(FieldAndFormat._DESERIALIZER), "docvalue_fields");
+        op.add(Builder::explain, JsonpDeserializer.booleanDeserializer(), "explain");
+        op.add(Builder::highlight, Highlight._DESERIALIZER, "highlight");
+        op.add(Builder::ignoreUnmapped, JsonpDeserializer.booleanDeserializer(), "ignore_unmapped");
+        op.add(Builder::scriptFields, JsonpDeserializer.stringMapDeserializer(ScriptField._DESERIALIZER), "script_fields");
+        op.add(Builder::seqNoPrimaryTerm, JsonpDeserializer.booleanDeserializer(), "seq_no_primary_term");
+        op.add(Builder::fields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "fields");
+        op.add(Builder::sort, JsonpDeserializer.arrayDeserializer(SortOptions._DESERIALIZER), "sort");
+        op.add(Builder::source, SourceConfig._DESERIALIZER, "_source");
+        op.add(Builder::storedField, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "stored_field");
+        op.add(Builder::trackScores, JsonpDeserializer.booleanDeserializer(), "track_scores");
+        op.add(Builder::version, JsonpDeserializer.booleanDeserializer(), "version");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/InnerHitsResult.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/InnerHitsResult.java
index e866b7b990..996acac607 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/InnerHitsResult.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/InnerHitsResult.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,101 +44,99 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: _global.search._types.InnerHitsResult
 
-
 @JsonpDeserializable
 public class InnerHitsResult implements JsonpSerializable {
-	private final HitsMetadata<JsonData> hits;
+    private final HitsMetadata<JsonData> hits;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private InnerHitsResult(Builder builder) {
+    private InnerHitsResult(Builder builder) {
 
-		this.hits = ApiTypeHelper.requireNonNull(builder.hits, this, "hits");
+        this.hits = ApiTypeHelper.requireNonNull(builder.hits, this, "hits");
 
-	}
+    }
 
-	public static InnerHitsResult of(Function<Builder, ObjectBuilder<InnerHitsResult>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static InnerHitsResult of(Function<Builder, ObjectBuilder<InnerHitsResult>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code hits}
-	 */
-	public final HitsMetadata<JsonData> hits() {
-		return this.hits;
-	}
+    /**
+     * Required - API name: {@code hits}
+     */
+    public final HitsMetadata<JsonData> hits() {
+        return this.hits;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("hits");
-		this.hits.serialize(generator, mapper);
+        generator.writeKey("hits");
+        this.hits.serialize(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link InnerHitsResult}.
-	 */
+    /**
+     * Builder for {@link InnerHitsResult}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InnerHitsResult> {
-		private HitsMetadata<JsonData> hits;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InnerHitsResult> {
+        private HitsMetadata<JsonData> hits;
 
-		/**
-		 * Required - API name: {@code hits}
-		 */
-		public final Builder hits(HitsMetadata<JsonData> value) {
-			this.hits = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code hits}
+         */
+        public final Builder hits(HitsMetadata<JsonData> value) {
+            this.hits = value;
+            return this;
+        }
 
-		/**
-		 * Required - API name: {@code hits}
-		 */
-		public final Builder hits(Function<HitsMetadata.Builder<JsonData>, ObjectBuilder<HitsMetadata<JsonData>>> fn) {
-			return this.hits(fn.apply(new HitsMetadata.Builder<JsonData>()).build());
-		}
+        /**
+         * Required - API name: {@code hits}
+         */
+        public final Builder hits(Function<HitsMetadata.Builder<JsonData>, ObjectBuilder<HitsMetadata<JsonData>>> fn) {
+            return this.hits(fn.apply(new HitsMetadata.Builder<JsonData>()).build());
+        }
 
-		/**
-		 * Builds a {@link InnerHitsResult}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public InnerHitsResult build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link InnerHitsResult}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public InnerHitsResult build() {
+            _checkSingleUse();
 
-			return new InnerHitsResult(this);
-		}
-	}
+            return new InnerHitsResult(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link InnerHitsResult}
-	 */
-	public static final JsonpDeserializer<InnerHitsResult> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			InnerHitsResult::setupInnerHitsResultDeserializer);
+    /**
+     * Json deserializer for {@link InnerHitsResult}
+     */
+    public static final JsonpDeserializer<InnerHitsResult> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        InnerHitsResult::setupInnerHitsResultDeserializer
+    );
 
-	protected static void setupInnerHitsResultDeserializer(ObjectDeserializer<InnerHitsResult.Builder> op) {
+    protected static void setupInnerHitsResultDeserializer(ObjectDeserializer<InnerHitsResult.Builder> op) {
 
-		op.add(Builder::hits, HitsMetadata.createHitsMetadataDeserializer(JsonData._DESERIALIZER), "hits");
+        op.add(Builder::hits, HitsMetadata.createHitsMetadataDeserializer(JsonData._DESERIALIZER), "hits");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/LaplaceSmoothingModel.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/LaplaceSmoothingModel.java
index 002609e0e6..71322c7030 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/LaplaceSmoothingModel.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/LaplaceSmoothingModel.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,101 +43,100 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.search._types.LaplaceSmoothingModel
 
-
 @JsonpDeserializable
 public class LaplaceSmoothingModel implements SmoothingModelVariant, JsonpSerializable {
-	private final double alpha;
+    private final double alpha;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private LaplaceSmoothingModel(Builder builder) {
+    private LaplaceSmoothingModel(Builder builder) {
 
-		this.alpha = ApiTypeHelper.requireNonNull(builder.alpha, this, "alpha");
+        this.alpha = ApiTypeHelper.requireNonNull(builder.alpha, this, "alpha");
 
-	}
+    }
 
-	public static LaplaceSmoothingModel of(Function<Builder, ObjectBuilder<LaplaceSmoothingModel>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static LaplaceSmoothingModel of(Function<Builder, ObjectBuilder<LaplaceSmoothingModel>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * SmoothingModel variant kind.
-	 */
-	@Override
-	public SmoothingModel.Kind _smoothingModelKind() {
-		return SmoothingModel.Kind.Laplace;
-	}
+    /**
+     * SmoothingModel variant kind.
+     */
+    @Override
+    public SmoothingModel.Kind _smoothingModelKind() {
+        return SmoothingModel.Kind.Laplace;
+    }
 
-	/**
-	 * Required - API name: {@code alpha}
-	 */
-	public final double alpha() {
-		return this.alpha;
-	}
+    /**
+     * Required - API name: {@code alpha}
+     */
+    public final double alpha() {
+        return this.alpha;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("alpha");
-		generator.write(this.alpha);
+        generator.writeKey("alpha");
+        generator.write(this.alpha);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link LaplaceSmoothingModel}.
-	 */
+    /**
+     * Builder for {@link LaplaceSmoothingModel}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<LaplaceSmoothingModel> {
-		private Double alpha;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<LaplaceSmoothingModel> {
+        private Double alpha;
 
-		/**
-		 * Required - API name: {@code alpha}
-		 */
-		public final Builder alpha(double value) {
-			this.alpha = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code alpha}
+         */
+        public final Builder alpha(double value) {
+            this.alpha = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link LaplaceSmoothingModel}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LaplaceSmoothingModel build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link LaplaceSmoothingModel}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LaplaceSmoothingModel build() {
+            _checkSingleUse();
 
-			return new LaplaceSmoothingModel(this);
-		}
-	}
+            return new LaplaceSmoothingModel(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link LaplaceSmoothingModel}
-	 */
-	public static final JsonpDeserializer<LaplaceSmoothingModel> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, LaplaceSmoothingModel::setupLaplaceSmoothingModelDeserializer);
+    /**
+     * Json deserializer for {@link LaplaceSmoothingModel}
+     */
+    public static final JsonpDeserializer<LaplaceSmoothingModel> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LaplaceSmoothingModel::setupLaplaceSmoothingModelDeserializer
+    );
 
-	protected static void setupLaplaceSmoothingModelDeserializer(ObjectDeserializer<LaplaceSmoothingModel.Builder> op) {
+    protected static void setupLaplaceSmoothingModelDeserializer(ObjectDeserializer<LaplaceSmoothingModel.Builder> op) {
 
-		op.add(Builder::alpha, JsonpDeserializer.doubleDeserializer(), "alpha");
+        op.add(Builder::alpha, JsonpDeserializer.doubleDeserializer(), "alpha");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/LinearInterpolationSmoothingModel.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/LinearInterpolationSmoothingModel.java
index 5be358cd3e..3c206cb1df 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/LinearInterpolationSmoothingModel.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/LinearInterpolationSmoothingModel.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,151 +43,150 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.search._types.LinearInterpolationSmoothingModel
 
-
 @JsonpDeserializable
 public class LinearInterpolationSmoothingModel implements SmoothingModelVariant, JsonpSerializable {
-	private final double bigramLambda;
+    private final double bigramLambda;
 
-	private final double trigramLambda;
-
-	private final double unigramLambda;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private LinearInterpolationSmoothingModel(Builder builder) {
-
-		this.bigramLambda = ApiTypeHelper.requireNonNull(builder.bigramLambda, this, "bigramLambda");
-		this.trigramLambda = ApiTypeHelper.requireNonNull(builder.trigramLambda, this, "trigramLambda");
-		this.unigramLambda = ApiTypeHelper.requireNonNull(builder.unigramLambda, this, "unigramLambda");
-
-	}
-
-	public static LinearInterpolationSmoothingModel of(
-			Function<Builder, ObjectBuilder<LinearInterpolationSmoothingModel>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * SmoothingModel variant kind.
-	 */
-	@Override
-	public SmoothingModel.Kind _smoothingModelKind() {
-		return SmoothingModel.Kind.LinearInterpolation;
-	}
-
-	/**
-	 * Required - API name: {@code bigram_lambda}
-	 */
-	public final double bigramLambda() {
-		return this.bigramLambda;
-	}
-
-	/**
-	 * Required - API name: {@code trigram_lambda}
-	 */
-	public final double trigramLambda() {
-		return this.trigramLambda;
-	}
-
-	/**
-	 * Required - API name: {@code unigram_lambda}
-	 */
-	public final double unigramLambda() {
-		return this.unigramLambda;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("bigram_lambda");
-		generator.write(this.bigramLambda);
-
-		generator.writeKey("trigram_lambda");
-		generator.write(this.trigramLambda);
-
-		generator.writeKey("unigram_lambda");
-		generator.write(this.unigramLambda);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link LinearInterpolationSmoothingModel}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<LinearInterpolationSmoothingModel> {
-		private Double bigramLambda;
-
-		private Double trigramLambda;
-
-		private Double unigramLambda;
-
-		/**
-		 * Required - API name: {@code bigram_lambda}
-		 */
-		public final Builder bigramLambda(double value) {
-			this.bigramLambda = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code trigram_lambda}
-		 */
-		public final Builder trigramLambda(double value) {
-			this.trigramLambda = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code unigram_lambda}
-		 */
-		public final Builder unigramLambda(double value) {
-			this.unigramLambda = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link LinearInterpolationSmoothingModel}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LinearInterpolationSmoothingModel build() {
-			_checkSingleUse();
-
-			return new LinearInterpolationSmoothingModel(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link LinearInterpolationSmoothingModel}
-	 */
-	public static final JsonpDeserializer<LinearInterpolationSmoothingModel> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, LinearInterpolationSmoothingModel::setupLinearInterpolationSmoothingModelDeserializer);
-
-	protected static void setupLinearInterpolationSmoothingModelDeserializer(
-			ObjectDeserializer<LinearInterpolationSmoothingModel.Builder> op) {
-
-		op.add(Builder::bigramLambda, JsonpDeserializer.doubleDeserializer(), "bigram_lambda");
-		op.add(Builder::trigramLambda, JsonpDeserializer.doubleDeserializer(), "trigram_lambda");
-		op.add(Builder::unigramLambda, JsonpDeserializer.doubleDeserializer(), "unigram_lambda");
-
-	}
+    private final double trigramLambda;
+
+    private final double unigramLambda;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private LinearInterpolationSmoothingModel(Builder builder) {
+
+        this.bigramLambda = ApiTypeHelper.requireNonNull(builder.bigramLambda, this, "bigramLambda");
+        this.trigramLambda = ApiTypeHelper.requireNonNull(builder.trigramLambda, this, "trigramLambda");
+        this.unigramLambda = ApiTypeHelper.requireNonNull(builder.unigramLambda, this, "unigramLambda");
+
+    }
+
+    public static LinearInterpolationSmoothingModel of(Function<Builder, ObjectBuilder<LinearInterpolationSmoothingModel>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * SmoothingModel variant kind.
+     */
+    @Override
+    public SmoothingModel.Kind _smoothingModelKind() {
+        return SmoothingModel.Kind.LinearInterpolation;
+    }
+
+    /**
+     * Required - API name: {@code bigram_lambda}
+     */
+    public final double bigramLambda() {
+        return this.bigramLambda;
+    }
+
+    /**
+     * Required - API name: {@code trigram_lambda}
+     */
+    public final double trigramLambda() {
+        return this.trigramLambda;
+    }
+
+    /**
+     * Required - API name: {@code unigram_lambda}
+     */
+    public final double unigramLambda() {
+        return this.unigramLambda;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("bigram_lambda");
+        generator.write(this.bigramLambda);
+
+        generator.writeKey("trigram_lambda");
+        generator.write(this.trigramLambda);
+
+        generator.writeKey("unigram_lambda");
+        generator.write(this.unigramLambda);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link LinearInterpolationSmoothingModel}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<LinearInterpolationSmoothingModel> {
+        private Double bigramLambda;
+
+        private Double trigramLambda;
+
+        private Double unigramLambda;
+
+        /**
+         * Required - API name: {@code bigram_lambda}
+         */
+        public final Builder bigramLambda(double value) {
+            this.bigramLambda = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code trigram_lambda}
+         */
+        public final Builder trigramLambda(double value) {
+            this.trigramLambda = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code unigram_lambda}
+         */
+        public final Builder unigramLambda(double value) {
+            this.unigramLambda = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link LinearInterpolationSmoothingModel}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LinearInterpolationSmoothingModel build() {
+            _checkSingleUse();
+
+            return new LinearInterpolationSmoothingModel(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link LinearInterpolationSmoothingModel}
+     */
+    public static final JsonpDeserializer<LinearInterpolationSmoothingModel> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LinearInterpolationSmoothingModel::setupLinearInterpolationSmoothingModelDeserializer
+    );
+
+    protected static void setupLinearInterpolationSmoothingModelDeserializer(
+        ObjectDeserializer<LinearInterpolationSmoothingModel.Builder> op
+    ) {
+
+        op.add(Builder::bigramLambda, JsonpDeserializer.doubleDeserializer(), "bigram_lambda");
+        op.add(Builder::trigramLambda, JsonpDeserializer.doubleDeserializer(), "trigram_lambda");
+        op.add(Builder::unigramLambda, JsonpDeserializer.doubleDeserializer(), "unigram_lambda");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/NestedIdentity.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/NestedIdentity.java
index d19f8c7f21..628a316e0a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/NestedIdentity.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/NestedIdentity.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,155 +44,153 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.NestedIdentity
 
-
 @JsonpDeserializable
 public class NestedIdentity implements JsonpSerializable {
-	private final String field;
+    private final String field;
 
-	private final int offset;
-
-	@Nullable
-	private final NestedIdentity nested;
+    private final int offset;
+
+    @Nullable
+    private final NestedIdentity nested;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private NestedIdentity(Builder builder) {
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.offset = ApiTypeHelper.requireNonNull(builder.offset, this, "offset");
-		this.nested = builder.nested;
-
-	}
-
-	public static NestedIdentity of(Function<Builder, ObjectBuilder<NestedIdentity>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required - API name: {@code offset}
-	 */
-	public final int offset() {
-		return this.offset;
-	}
-
-	/**
-	 * API name: {@code _nested}
-	 */
-	@Nullable
-	public final NestedIdentity nested() {
-		return this.nested;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		generator.writeKey("offset");
-		generator.write(this.offset);
-
-		if (this.nested != null) {
-			generator.writeKey("_nested");
-			this.nested.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NestedIdentity}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NestedIdentity> {
-		private String field;
-
-		private Integer offset;
-
-		@Nullable
-		private NestedIdentity nested;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code offset}
-		 */
-		public final Builder offset(int value) {
-			this.offset = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _nested}
-		 */
-		public final Builder nested(@Nullable NestedIdentity value) {
-			this.nested = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _nested}
-		 */
-		public final Builder nested(Function<NestedIdentity.Builder, ObjectBuilder<NestedIdentity>> fn) {
-			return this.nested(fn.apply(new NestedIdentity.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link NestedIdentity}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NestedIdentity build() {
-			_checkSingleUse();
-
-			return new NestedIdentity(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NestedIdentity}
-	 */
-	public static final JsonpDeserializer<NestedIdentity> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NestedIdentity::setupNestedIdentityDeserializer);
-
-	protected static void setupNestedIdentityDeserializer(ObjectDeserializer<NestedIdentity.Builder> op) {
-
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::offset, JsonpDeserializer.integerDeserializer(), "offset");
-		op.add(Builder::nested, NestedIdentity._DESERIALIZER, "_nested");
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private NestedIdentity(Builder builder) {
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.offset = ApiTypeHelper.requireNonNull(builder.offset, this, "offset");
+        this.nested = builder.nested;
+
+    }
+
+    public static NestedIdentity of(Function<Builder, ObjectBuilder<NestedIdentity>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required - API name: {@code offset}
+     */
+    public final int offset() {
+        return this.offset;
+    }
+
+    /**
+     * API name: {@code _nested}
+     */
+    @Nullable
+    public final NestedIdentity nested() {
+        return this.nested;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        generator.writeKey("offset");
+        generator.write(this.offset);
+
+        if (this.nested != null) {
+            generator.writeKey("_nested");
+            this.nested.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NestedIdentity}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NestedIdentity> {
+        private String field;
+
+        private Integer offset;
+
+        @Nullable
+        private NestedIdentity nested;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code offset}
+         */
+        public final Builder offset(int value) {
+            this.offset = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _nested}
+         */
+        public final Builder nested(@Nullable NestedIdentity value) {
+            this.nested = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _nested}
+         */
+        public final Builder nested(Function<NestedIdentity.Builder, ObjectBuilder<NestedIdentity>> fn) {
+            return this.nested(fn.apply(new NestedIdentity.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link NestedIdentity}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NestedIdentity build() {
+            _checkSingleUse();
+
+            return new NestedIdentity(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NestedIdentity}
+     */
+    public static final JsonpDeserializer<NestedIdentity> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NestedIdentity::setupNestedIdentityDeserializer
+    );
+
+    protected static void setupNestedIdentityDeserializer(ObjectDeserializer<NestedIdentity.Builder> op) {
+
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::offset, JsonpDeserializer.integerDeserializer(), "offset");
+        op.add(Builder::nested, NestedIdentity._DESERIALIZER, "_nested");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggest.java
index b52cbe63e3..d1fdddf136 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggest.java
@@ -6,7 +6,7 @@
  * 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
@@ -32,9 +32,9 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
 import java.util.List;
 import java.util.function.Function;
-
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -44,13 +44,10 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
-import jakarta.json.stream.JsonGenerator;
-
 @JsonpDeserializable
 public class PhraseSuggest extends SuggestBase implements SuggestVariant {
     private final List<PhraseSuggestOption> options;
 
-
     private PhraseSuggest(Builder builder) {
         super(builder);
 
@@ -111,8 +108,10 @@ public PhraseSuggest build() {
         }
     }
 
-    public static final JsonpDeserializer<PhraseSuggest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-            PhraseSuggest::setupPhraseSuggestDeserializer);
+    public static final JsonpDeserializer<PhraseSuggest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PhraseSuggest::setupPhraseSuggestDeserializer
+    );
 
     protected static void setupPhraseSuggestDeserializer(ObjectDeserializer<PhraseSuggest.Builder> op) {
         SuggestBase.setupSuggestBaseDeserializer(op);
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggestCollate.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggestCollate.java
index 81c541e4a0..1c5864bcb7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggestCollate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggestCollate.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,177 +46,173 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.PhraseSuggestCollate
 
-
 @JsonpDeserializable
 public class PhraseSuggestCollate implements JsonpSerializable {
-	private final Map<String, JsonData> params;
-
-	@Nullable
-	private final Boolean prune;
-
-	private final PhraseSuggestCollateQuery query;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PhraseSuggestCollate(Builder builder) {
-
-		this.params = ApiTypeHelper.unmodifiable(builder.params);
-		this.prune = builder.prune;
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-
-	}
-
-	public static PhraseSuggestCollate of(Function<Builder, ObjectBuilder<PhraseSuggestCollate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code params}
-	 */
-	public final Map<String, JsonData> params() {
-		return this.params;
-	}
-
-	/**
-	 * API name: {@code prune}
-	 */
-	@Nullable
-	public final Boolean prune() {
-		return this.prune;
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final PhraseSuggestCollateQuery query() {
-		return this.query;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.params)) {
-			generator.writeKey("params");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.prune != null) {
-			generator.writeKey("prune");
-			generator.write(this.prune);
-
-		}
-		generator.writeKey("query");
-		this.query.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PhraseSuggestCollate}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PhraseSuggestCollate> {
-		@Nullable
-		private Map<String, JsonData> params;
-
-		@Nullable
-		private Boolean prune;
-
-		private PhraseSuggestCollateQuery query;
-
-		/**
-		 * API name: {@code params}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>params</code>.
-		 */
-		public final Builder params(Map<String, JsonData> map) {
-			this.params = _mapPutAll(this.params, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code params}
-		 * <p>
-		 * Adds an entry to <code>params</code>.
-		 */
-		public final Builder params(String key, JsonData value) {
-			this.params = _mapPut(this.params, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code prune}
-		 */
-		public final Builder prune(@Nullable Boolean value) {
-			this.prune = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(PhraseSuggestCollateQuery value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(
-				Function<PhraseSuggestCollateQuery.Builder, ObjectBuilder<PhraseSuggestCollateQuery>> fn) {
-			return this.query(fn.apply(new PhraseSuggestCollateQuery.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link PhraseSuggestCollate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PhraseSuggestCollate build() {
-			_checkSingleUse();
-
-			return new PhraseSuggestCollate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PhraseSuggestCollate}
-	 */
-	public static final JsonpDeserializer<PhraseSuggestCollate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PhraseSuggestCollate::setupPhraseSuggestCollateDeserializer);
-
-	protected static void setupPhraseSuggestCollateDeserializer(ObjectDeserializer<PhraseSuggestCollate.Builder> op) {
-
-		op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
-		op.add(Builder::prune, JsonpDeserializer.booleanDeserializer(), "prune");
-		op.add(Builder::query, PhraseSuggestCollateQuery._DESERIALIZER, "query");
-
-	}
+    private final Map<String, JsonData> params;
+
+    @Nullable
+    private final Boolean prune;
+
+    private final PhraseSuggestCollateQuery query;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PhraseSuggestCollate(Builder builder) {
+
+        this.params = ApiTypeHelper.unmodifiable(builder.params);
+        this.prune = builder.prune;
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+
+    }
+
+    public static PhraseSuggestCollate of(Function<Builder, ObjectBuilder<PhraseSuggestCollate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code params}
+     */
+    public final Map<String, JsonData> params() {
+        return this.params;
+    }
+
+    /**
+     * API name: {@code prune}
+     */
+    @Nullable
+    public final Boolean prune() {
+        return this.prune;
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final PhraseSuggestCollateQuery query() {
+        return this.query;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.params)) {
+            generator.writeKey("params");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.params.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.prune != null) {
+            generator.writeKey("prune");
+            generator.write(this.prune);
+
+        }
+        generator.writeKey("query");
+        this.query.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PhraseSuggestCollate}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PhraseSuggestCollate> {
+        @Nullable
+        private Map<String, JsonData> params;
+
+        @Nullable
+        private Boolean prune;
+
+        private PhraseSuggestCollateQuery query;
+
+        /**
+         * API name: {@code params}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>params</code>.
+         */
+        public final Builder params(Map<String, JsonData> map) {
+            this.params = _mapPutAll(this.params, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code params}
+         * <p>
+         * Adds an entry to <code>params</code>.
+         */
+        public final Builder params(String key, JsonData value) {
+            this.params = _mapPut(this.params, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code prune}
+         */
+        public final Builder prune(@Nullable Boolean value) {
+            this.prune = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(PhraseSuggestCollateQuery value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(Function<PhraseSuggestCollateQuery.Builder, ObjectBuilder<PhraseSuggestCollateQuery>> fn) {
+            return this.query(fn.apply(new PhraseSuggestCollateQuery.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link PhraseSuggestCollate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PhraseSuggestCollate build() {
+            _checkSingleUse();
+
+            return new PhraseSuggestCollate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PhraseSuggestCollate}
+     */
+    public static final JsonpDeserializer<PhraseSuggestCollate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PhraseSuggestCollate::setupPhraseSuggestCollateDeserializer
+    );
+
+    protected static void setupPhraseSuggestCollateDeserializer(ObjectDeserializer<PhraseSuggestCollate.Builder> op) {
+
+        op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
+        op.add(Builder::prune, JsonpDeserializer.booleanDeserializer(), "prune");
+        op.add(Builder::query, PhraseSuggestCollateQuery._DESERIALIZER, "query");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggestCollateQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggestCollateQuery.java
index dd728bd48f..c6403eead0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggestCollateQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggestCollateQuery.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,9 +43,6 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.PhraseSuggestCollateQuery
 
@@ -154,15 +154,16 @@ public PhraseSuggestCollateQuery build() {
     /**
      * Json deserializer for {@link PhraseSuggestCollateQuery}
      */
-    public static final JsonpDeserializer<PhraseSuggestCollateQuery> _DESERIALIZER = ObjectBuilderDeserializer
-            .lazy(Builder::new, PhraseSuggestCollateQuery::setupPhraseSuggestCollateQueryDeserializer);
+    public static final JsonpDeserializer<PhraseSuggestCollateQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PhraseSuggestCollateQuery::setupPhraseSuggestCollateQueryDeserializer
+    );
 
-    protected static void setupPhraseSuggestCollateQueryDeserializer(
-            ObjectDeserializer<PhraseSuggestCollateQuery.Builder> op) {
+    protected static void setupPhraseSuggestCollateQueryDeserializer(ObjectDeserializer<PhraseSuggestCollateQuery.Builder> op) {
 
         op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
         op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source");
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggestHighlight.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggestHighlight.java
index 05593b9d5a..7cb5427c00 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggestHighlight.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggestHighlight.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,118 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.search._types.PhraseSuggestHighlight
 
-
 @JsonpDeserializable
 public class PhraseSuggestHighlight implements JsonpSerializable {
-	private final String postTag;
-
-	private final String preTag;
-
-	// ---------------------------------------------------------------------------------------------
+    private final String postTag;
 
-	private PhraseSuggestHighlight(Builder builder) {
+    private final String preTag;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.postTag = ApiTypeHelper.requireNonNull(builder.postTag, this, "postTag");
-		this.preTag = ApiTypeHelper.requireNonNull(builder.preTag, this, "preTag");
+    private PhraseSuggestHighlight(Builder builder) {
 
-	}
+        this.postTag = ApiTypeHelper.requireNonNull(builder.postTag, this, "postTag");
+        this.preTag = ApiTypeHelper.requireNonNull(builder.preTag, this, "preTag");
 
-	public static PhraseSuggestHighlight of(Function<Builder, ObjectBuilder<PhraseSuggestHighlight>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code post_tag}
-	 */
-	public final String postTag() {
-		return this.postTag;
-	}
+    public static PhraseSuggestHighlight of(Function<Builder, ObjectBuilder<PhraseSuggestHighlight>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code pre_tag}
-	 */
-	public final String preTag() {
-		return this.preTag;
-	}
+    /**
+     * Required - API name: {@code post_tag}
+     */
+    public final String postTag() {
+        return this.postTag;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code pre_tag}
+     */
+    public final String preTag() {
+        return this.preTag;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("post_tag");
-		generator.write(this.postTag);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("pre_tag");
-		generator.write(this.preTag);
+        generator.writeKey("post_tag");
+        generator.write(this.postTag);
 
-	}
+        generator.writeKey("pre_tag");
+        generator.write(this.preTag);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link PhraseSuggestHighlight}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PhraseSuggestHighlight> {
-		private String postTag;
+    /**
+     * Builder for {@link PhraseSuggestHighlight}.
+     */
 
-		private String preTag;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PhraseSuggestHighlight> {
+        private String postTag;
 
-		/**
-		 * Required - API name: {@code post_tag}
-		 */
-		public final Builder postTag(String value) {
-			this.postTag = value;
-			return this;
-		}
+        private String preTag;
 
-		/**
-		 * Required - API name: {@code pre_tag}
-		 */
-		public final Builder preTag(String value) {
-			this.preTag = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code post_tag}
+         */
+        public final Builder postTag(String value) {
+            this.postTag = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link PhraseSuggestHighlight}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PhraseSuggestHighlight build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code pre_tag}
+         */
+        public final Builder preTag(String value) {
+            this.preTag = value;
+            return this;
+        }
 
-			return new PhraseSuggestHighlight(this);
-		}
-	}
+        /**
+         * Builds a {@link PhraseSuggestHighlight}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PhraseSuggestHighlight build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new PhraseSuggestHighlight(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link PhraseSuggestHighlight}
-	 */
-	public static final JsonpDeserializer<PhraseSuggestHighlight> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PhraseSuggestHighlight::setupPhraseSuggestHighlightDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupPhraseSuggestHighlightDeserializer(
-			ObjectDeserializer<PhraseSuggestHighlight.Builder> op) {
+    /**
+     * Json deserializer for {@link PhraseSuggestHighlight}
+     */
+    public static final JsonpDeserializer<PhraseSuggestHighlight> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PhraseSuggestHighlight::setupPhraseSuggestHighlightDeserializer
+    );
 
-		op.add(Builder::postTag, JsonpDeserializer.stringDeserializer(), "post_tag");
-		op.add(Builder::preTag, JsonpDeserializer.stringDeserializer(), "pre_tag");
+    protected static void setupPhraseSuggestHighlightDeserializer(ObjectDeserializer<PhraseSuggestHighlight.Builder> op) {
 
-	}
+        op.add(Builder::postTag, JsonpDeserializer.stringDeserializer(), "post_tag");
+        op.add(Builder::preTag, JsonpDeserializer.stringDeserializer(), "pre_tag");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggestOption.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggestOption.java
index 0cc39945c8..21b2bdee0e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggestOption.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggestOption.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,148 +44,145 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.PhraseSuggestOption
 
-
 @JsonpDeserializable
 public class PhraseSuggestOption implements JsonpSerializable {
-	private final String text;
-
-	@Nullable
-	private final String highlighted;
-
-	private final double score;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PhraseSuggestOption(Builder builder) {
-
-		this.text = ApiTypeHelper.requireNonNull(builder.text, this, "text");
-		this.highlighted = builder.highlighted;
-		this.score = ApiTypeHelper.requireNonNull(builder.score, this, "score");
-
-	}
-
-	public static PhraseSuggestOption of(Function<Builder, ObjectBuilder<PhraseSuggestOption>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code text}
-	 */
-	public final String text() {
-		return this.text;
-	}
-
-	/**
-	 * API name: {@code highlighted}
-	 */
-	@Nullable
-	public final String highlighted() {
-		return this.highlighted;
-	}
-
-	/**
-	 * Required - API name: {@code score}
-	 */
-	public final double score() {
-		return this.score;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("text");
-		generator.write(this.text);
-
-		if (this.highlighted != null) {
-			generator.writeKey("highlighted");
-			generator.write(this.highlighted);			
-		}
-
-		generator.writeKey("score");
-		generator.write(this.score);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PhraseSuggestOption}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PhraseSuggestOption> {
-		private String text;
-
-		@Nullable
-		private String highlighted;
-
-		private Double score;
-
-		/**
-		 * Required - API name: {@code text}
-		 */
-		public final Builder text(String value) {
-			this.text = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code highlighted}
-		 */
-		public final Builder highlighted(@Nullable String value) {
-			this.highlighted = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code score}
-		 */
-		public final Builder score(double value) {
-			this.score = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PhraseSuggestOption}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PhraseSuggestOption build() {
-			_checkSingleUse();
-
-			return new PhraseSuggestOption(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PhraseSuggestOption}
-	 */
-	public static final JsonpDeserializer<PhraseSuggestOption> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PhraseSuggestOption::setupPhraseSuggestOptionDeserializer);
-
-	protected static void setupPhraseSuggestOptionDeserializer(ObjectDeserializer<PhraseSuggestOption.Builder> op) {
-
-		op.add(Builder::text, JsonpDeserializer.stringDeserializer(), "text");
-		op.add(Builder::highlighted, JsonpDeserializer.stringDeserializer(), "highlighted");
-		op.add(Builder::score, JsonpDeserializer.doubleDeserializer(), "score");
-
-	}
+    private final String text;
+
+    @Nullable
+    private final String highlighted;
+
+    private final double score;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PhraseSuggestOption(Builder builder) {
+
+        this.text = ApiTypeHelper.requireNonNull(builder.text, this, "text");
+        this.highlighted = builder.highlighted;
+        this.score = ApiTypeHelper.requireNonNull(builder.score, this, "score");
+
+    }
+
+    public static PhraseSuggestOption of(Function<Builder, ObjectBuilder<PhraseSuggestOption>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code text}
+     */
+    public final String text() {
+        return this.text;
+    }
+
+    /**
+     * API name: {@code highlighted}
+     */
+    @Nullable
+    public final String highlighted() {
+        return this.highlighted;
+    }
+
+    /**
+     * Required - API name: {@code score}
+     */
+    public final double score() {
+        return this.score;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("text");
+        generator.write(this.text);
+
+        if (this.highlighted != null) {
+            generator.writeKey("highlighted");
+            generator.write(this.highlighted);
+        }
+
+        generator.writeKey("score");
+        generator.write(this.score);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PhraseSuggestOption}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PhraseSuggestOption> {
+        private String text;
+
+        @Nullable
+        private String highlighted;
+
+        private Double score;
+
+        /**
+         * Required - API name: {@code text}
+         */
+        public final Builder text(String value) {
+            this.text = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code highlighted}
+         */
+        public final Builder highlighted(@Nullable String value) {
+            this.highlighted = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code score}
+         */
+        public final Builder score(double value) {
+            this.score = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link PhraseSuggestOption}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PhraseSuggestOption build() {
+            _checkSingleUse();
+
+            return new PhraseSuggestOption(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PhraseSuggestOption}
+     */
+    public static final JsonpDeserializer<PhraseSuggestOption> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PhraseSuggestOption::setupPhraseSuggestOptionDeserializer
+    );
+
+    protected static void setupPhraseSuggestOptionDeserializer(ObjectDeserializer<PhraseSuggestOption.Builder> op) {
+
+        op.add(Builder::text, JsonpDeserializer.stringDeserializer(), "text");
+        op.add(Builder::highlighted, JsonpDeserializer.stringDeserializer(), "highlighted");
+        op.add(Builder::score, JsonpDeserializer.doubleDeserializer(), "score");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggester.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggester.java
index e97b843fad..447aaf6f47 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggester.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/PhraseSuggester.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,504 +43,497 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.PhraseSuggester
 
-
 @JsonpDeserializable
 public class PhraseSuggester extends SuggesterBase implements FieldSuggesterVariant {
-	@Nullable
-	private final PhraseSuggestCollate collate;
-
-	@Nullable
-	private final Double confidence;
-
-	private final List<DirectGenerator> directGenerator;
-
-	@Nullable
-	private final Boolean forceUnigrams;
-
-	@Nullable
-	private final Integer gramSize;
-
-	@Nullable
-	private final PhraseSuggestHighlight highlight;
-
-	@Nullable
-	private final Double maxErrors;
-
-	@Nullable
-	private final Double realWordErrorLikelihood;
-
-	@Nullable
-	private final String separator;
-
-	@Nullable
-	private final Integer shardSize;
-
-	@Nullable
-	private final SmoothingModel smoothing;
-
-	@Nullable
-	private final String text;
-
-	@Nullable
-	private final Integer tokenLimit;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PhraseSuggester(Builder builder) {
-		super(builder);
-
-		this.collate = builder.collate;
-		this.confidence = builder.confidence;
-		this.directGenerator = ApiTypeHelper.unmodifiable(builder.directGenerator);
-		this.forceUnigrams = builder.forceUnigrams;
-		this.gramSize = builder.gramSize;
-		this.highlight = builder.highlight;
-		this.maxErrors = builder.maxErrors;
-		this.realWordErrorLikelihood = builder.realWordErrorLikelihood;
-		this.separator = builder.separator;
-		this.shardSize = builder.shardSize;
-		this.smoothing = builder.smoothing;
-		this.text = builder.text;
-		this.tokenLimit = builder.tokenLimit;
-
-	}
-
-	public static PhraseSuggester of(Function<Builder, ObjectBuilder<PhraseSuggester>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * FieldSuggester variant kind.
-	 */
-	@Override
-	public FieldSuggester.Kind _fieldSuggesterKind() {
-		return FieldSuggester.Kind.Phrase;
-	}
-
-	/**
-	 * API name: {@code collate}
-	 */
-	@Nullable
-	public final PhraseSuggestCollate collate() {
-		return this.collate;
-	}
-
-	/**
-	 * API name: {@code confidence}
-	 */
-	@Nullable
-	public final Double confidence() {
-		return this.confidence;
-	}
-
-	/**
-	 * API name: {@code direct_generator}
-	 */
-	public final List<DirectGenerator> directGenerator() {
-		return this.directGenerator;
-	}
-
-	/**
-	 * API name: {@code force_unigrams}
-	 */
-	@Nullable
-	public final Boolean forceUnigrams() {
-		return this.forceUnigrams;
-	}
-
-	/**
-	 * API name: {@code gram_size}
-	 */
-	@Nullable
-	public final Integer gramSize() {
-		return this.gramSize;
-	}
-
-	/**
-	 * API name: {@code highlight}
-	 */
-	@Nullable
-	public final PhraseSuggestHighlight highlight() {
-		return this.highlight;
-	}
-
-	/**
-	 * API name: {@code max_errors}
-	 */
-	@Nullable
-	public final Double maxErrors() {
-		return this.maxErrors;
-	}
-
-	/**
-	 * API name: {@code real_word_error_likelihood}
-	 */
-	@Nullable
-	public final Double realWordErrorLikelihood() {
-		return this.realWordErrorLikelihood;
-	}
-
-	/**
-	 * API name: {@code separator}
-	 */
-	@Nullable
-	public final String separator() {
-		return this.separator;
-	}
-
-	/**
-	 * API name: {@code shard_size}
-	 */
-	@Nullable
-	public final Integer shardSize() {
-		return this.shardSize;
-	}
-
-	/**
-	 * API name: {@code smoothing}
-	 */
-	@Nullable
-	public final SmoothingModel smoothing() {
-		return this.smoothing;
-	}
-
-	/**
-	 * API name: {@code text}
-	 */
-	@Nullable
-	public final String text() {
-		return this.text;
-	}
-
-	/**
-	 * API name: {@code token_limit}
-	 */
-	@Nullable
-	public final Integer tokenLimit() {
-		return this.tokenLimit;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.collate != null) {
-			generator.writeKey("collate");
-			this.collate.serialize(generator, mapper);
-
-		}
-		if (this.confidence != null) {
-			generator.writeKey("confidence");
-			generator.write(this.confidence);
-
-		}
-		if (ApiTypeHelper.isDefined(this.directGenerator)) {
-			generator.writeKey("direct_generator");
-			generator.writeStartArray();
-			for (DirectGenerator item0 : this.directGenerator) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.forceUnigrams != null) {
-			generator.writeKey("force_unigrams");
-			generator.write(this.forceUnigrams);
-
-		}
-		if (this.gramSize != null) {
-			generator.writeKey("gram_size");
-			generator.write(this.gramSize);
-
-		}
-		if (this.highlight != null) {
-			generator.writeKey("highlight");
-			this.highlight.serialize(generator, mapper);
-
-		}
-		if (this.maxErrors != null) {
-			generator.writeKey("max_errors");
-			generator.write(this.maxErrors);
-
-		}
-		if (this.realWordErrorLikelihood != null) {
-			generator.writeKey("real_word_error_likelihood");
-			generator.write(this.realWordErrorLikelihood);
-
-		}
-		if (this.separator != null) {
-			generator.writeKey("separator");
-			generator.write(this.separator);
-
-		}
-		if (this.shardSize != null) {
-			generator.writeKey("shard_size");
-			generator.write(this.shardSize);
-
-		}
-		if (this.smoothing != null) {
-			generator.writeKey("smoothing");
-			this.smoothing.serialize(generator, mapper);
-
-		}
-		if (this.text != null) {
-			generator.writeKey("text");
-			generator.write(this.text);
-
-		}
-		if (this.tokenLimit != null) {
-			generator.writeKey("token_limit");
-			generator.write(this.tokenLimit);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PhraseSuggester}.
-	 */
-
-	public static class Builder extends SuggesterBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PhraseSuggester> {
-		@Nullable
-		private PhraseSuggestCollate collate;
-
-		@Nullable
-		private Double confidence;
-
-		@Nullable
-		private List<DirectGenerator> directGenerator;
-
-		@Nullable
-		private Boolean forceUnigrams;
-
-		@Nullable
-		private Integer gramSize;
-
-		@Nullable
-		private PhraseSuggestHighlight highlight;
-
-		@Nullable
-		private Double maxErrors;
-
-		@Nullable
-		private Double realWordErrorLikelihood;
-
-		@Nullable
-		private String separator;
-
-		@Nullable
-		private Integer shardSize;
-
-		@Nullable
-		private SmoothingModel smoothing;
-
-		@Nullable
-		private String text;
-
-		@Nullable
-		private Integer tokenLimit;
-
-		/**
-		 * API name: {@code collate}
-		 */
-		public final Builder collate(@Nullable PhraseSuggestCollate value) {
-			this.collate = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code collate}
-		 */
-		public final Builder collate(Function<PhraseSuggestCollate.Builder, ObjectBuilder<PhraseSuggestCollate>> fn) {
-			return this.collate(fn.apply(new PhraseSuggestCollate.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code confidence}
-		 */
-		public final Builder confidence(@Nullable Double value) {
-			this.confidence = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code direct_generator}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>directGenerator</code>.
-		 */
-		public final Builder directGenerator(List<DirectGenerator> list) {
-			this.directGenerator = _listAddAll(this.directGenerator, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code direct_generator}
-		 * <p>
-		 * Adds one or more values to <code>directGenerator</code>.
-		 */
-		public final Builder directGenerator(DirectGenerator value, DirectGenerator... values) {
-			this.directGenerator = _listAdd(this.directGenerator, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code direct_generator}
-		 * <p>
-		 * Adds a value to <code>directGenerator</code> using a builder lambda.
-		 */
-		public final Builder directGenerator(Function<DirectGenerator.Builder, ObjectBuilder<DirectGenerator>> fn) {
-			return directGenerator(fn.apply(new DirectGenerator.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code force_unigrams}
-		 */
-		public final Builder forceUnigrams(@Nullable Boolean value) {
-			this.forceUnigrams = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code gram_size}
-		 */
-		public final Builder gramSize(@Nullable Integer value) {
-			this.gramSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code highlight}
-		 */
-		public final Builder highlight(@Nullable PhraseSuggestHighlight value) {
-			this.highlight = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code highlight}
-		 */
-		public final Builder highlight(
-				Function<PhraseSuggestHighlight.Builder, ObjectBuilder<PhraseSuggestHighlight>> fn) {
-			return this.highlight(fn.apply(new PhraseSuggestHighlight.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code max_errors}
-		 */
-		public final Builder maxErrors(@Nullable Double value) {
-			this.maxErrors = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code real_word_error_likelihood}
-		 */
-		public final Builder realWordErrorLikelihood(@Nullable Double value) {
-			this.realWordErrorLikelihood = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code separator}
-		 */
-		public final Builder separator(@Nullable String value) {
-			this.separator = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code shard_size}
-		 */
-		public final Builder shardSize(@Nullable Integer value) {
-			this.shardSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code smoothing}
-		 */
-		public final Builder smoothing(@Nullable SmoothingModel value) {
-			this.smoothing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code smoothing}
-		 */
-		public final Builder smoothing(Function<SmoothingModel.Builder, ObjectBuilder<SmoothingModel>> fn) {
-			return this.smoothing(fn.apply(new SmoothingModel.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code text}
-		 */
-		public final Builder text(@Nullable String value) {
-			this.text = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code token_limit}
-		 */
-		public final Builder tokenLimit(@Nullable Integer value) {
-			this.tokenLimit = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PhraseSuggester}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PhraseSuggester build() {
-			_checkSingleUse();
-
-			return new PhraseSuggester(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PhraseSuggester}
-	 */
-	public static final JsonpDeserializer<PhraseSuggester> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			PhraseSuggester::setupPhraseSuggesterDeserializer);
-
-	protected static void setupPhraseSuggesterDeserializer(ObjectDeserializer<PhraseSuggester.Builder> op) {
-		SuggesterBase.setupSuggesterBaseDeserializer(op);
-		op.add(Builder::collate, PhraseSuggestCollate._DESERIALIZER, "collate");
-		op.add(Builder::confidence, JsonpDeserializer.doubleDeserializer(), "confidence");
-		op.add(Builder::directGenerator, JsonpDeserializer.arrayDeserializer(DirectGenerator._DESERIALIZER),
-				"direct_generator");
-		op.add(Builder::forceUnigrams, JsonpDeserializer.booleanDeserializer(), "force_unigrams");
-		op.add(Builder::gramSize, JsonpDeserializer.integerDeserializer(), "gram_size");
-		op.add(Builder::highlight, PhraseSuggestHighlight._DESERIALIZER, "highlight");
-		op.add(Builder::maxErrors, JsonpDeserializer.doubleDeserializer(), "max_errors");
-		op.add(Builder::realWordErrorLikelihood, JsonpDeserializer.doubleDeserializer(), "real_word_error_likelihood");
-		op.add(Builder::separator, JsonpDeserializer.stringDeserializer(), "separator");
-		op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
-		op.add(Builder::smoothing, SmoothingModel._DESERIALIZER, "smoothing");
-		op.add(Builder::text, JsonpDeserializer.stringDeserializer(), "text");
-		op.add(Builder::tokenLimit, JsonpDeserializer.integerDeserializer(), "token_limit");
-
-	}
+    @Nullable
+    private final PhraseSuggestCollate collate;
+
+    @Nullable
+    private final Double confidence;
+
+    private final List<DirectGenerator> directGenerator;
+
+    @Nullable
+    private final Boolean forceUnigrams;
+
+    @Nullable
+    private final Integer gramSize;
+
+    @Nullable
+    private final PhraseSuggestHighlight highlight;
+
+    @Nullable
+    private final Double maxErrors;
+
+    @Nullable
+    private final Double realWordErrorLikelihood;
+
+    @Nullable
+    private final String separator;
+
+    @Nullable
+    private final Integer shardSize;
+
+    @Nullable
+    private final SmoothingModel smoothing;
+
+    @Nullable
+    private final String text;
+
+    @Nullable
+    private final Integer tokenLimit;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PhraseSuggester(Builder builder) {
+        super(builder);
+
+        this.collate = builder.collate;
+        this.confidence = builder.confidence;
+        this.directGenerator = ApiTypeHelper.unmodifiable(builder.directGenerator);
+        this.forceUnigrams = builder.forceUnigrams;
+        this.gramSize = builder.gramSize;
+        this.highlight = builder.highlight;
+        this.maxErrors = builder.maxErrors;
+        this.realWordErrorLikelihood = builder.realWordErrorLikelihood;
+        this.separator = builder.separator;
+        this.shardSize = builder.shardSize;
+        this.smoothing = builder.smoothing;
+        this.text = builder.text;
+        this.tokenLimit = builder.tokenLimit;
+
+    }
+
+    public static PhraseSuggester of(Function<Builder, ObjectBuilder<PhraseSuggester>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * FieldSuggester variant kind.
+     */
+    @Override
+    public FieldSuggester.Kind _fieldSuggesterKind() {
+        return FieldSuggester.Kind.Phrase;
+    }
+
+    /**
+     * API name: {@code collate}
+     */
+    @Nullable
+    public final PhraseSuggestCollate collate() {
+        return this.collate;
+    }
+
+    /**
+     * API name: {@code confidence}
+     */
+    @Nullable
+    public final Double confidence() {
+        return this.confidence;
+    }
+
+    /**
+     * API name: {@code direct_generator}
+     */
+    public final List<DirectGenerator> directGenerator() {
+        return this.directGenerator;
+    }
+
+    /**
+     * API name: {@code force_unigrams}
+     */
+    @Nullable
+    public final Boolean forceUnigrams() {
+        return this.forceUnigrams;
+    }
+
+    /**
+     * API name: {@code gram_size}
+     */
+    @Nullable
+    public final Integer gramSize() {
+        return this.gramSize;
+    }
+
+    /**
+     * API name: {@code highlight}
+     */
+    @Nullable
+    public final PhraseSuggestHighlight highlight() {
+        return this.highlight;
+    }
+
+    /**
+     * API name: {@code max_errors}
+     */
+    @Nullable
+    public final Double maxErrors() {
+        return this.maxErrors;
+    }
+
+    /**
+     * API name: {@code real_word_error_likelihood}
+     */
+    @Nullable
+    public final Double realWordErrorLikelihood() {
+        return this.realWordErrorLikelihood;
+    }
+
+    /**
+     * API name: {@code separator}
+     */
+    @Nullable
+    public final String separator() {
+        return this.separator;
+    }
+
+    /**
+     * API name: {@code shard_size}
+     */
+    @Nullable
+    public final Integer shardSize() {
+        return this.shardSize;
+    }
+
+    /**
+     * API name: {@code smoothing}
+     */
+    @Nullable
+    public final SmoothingModel smoothing() {
+        return this.smoothing;
+    }
+
+    /**
+     * API name: {@code text}
+     */
+    @Nullable
+    public final String text() {
+        return this.text;
+    }
+
+    /**
+     * API name: {@code token_limit}
+     */
+    @Nullable
+    public final Integer tokenLimit() {
+        return this.tokenLimit;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.collate != null) {
+            generator.writeKey("collate");
+            this.collate.serialize(generator, mapper);
+
+        }
+        if (this.confidence != null) {
+            generator.writeKey("confidence");
+            generator.write(this.confidence);
+
+        }
+        if (ApiTypeHelper.isDefined(this.directGenerator)) {
+            generator.writeKey("direct_generator");
+            generator.writeStartArray();
+            for (DirectGenerator item0 : this.directGenerator) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.forceUnigrams != null) {
+            generator.writeKey("force_unigrams");
+            generator.write(this.forceUnigrams);
+
+        }
+        if (this.gramSize != null) {
+            generator.writeKey("gram_size");
+            generator.write(this.gramSize);
+
+        }
+        if (this.highlight != null) {
+            generator.writeKey("highlight");
+            this.highlight.serialize(generator, mapper);
+
+        }
+        if (this.maxErrors != null) {
+            generator.writeKey("max_errors");
+            generator.write(this.maxErrors);
+
+        }
+        if (this.realWordErrorLikelihood != null) {
+            generator.writeKey("real_word_error_likelihood");
+            generator.write(this.realWordErrorLikelihood);
+
+        }
+        if (this.separator != null) {
+            generator.writeKey("separator");
+            generator.write(this.separator);
+
+        }
+        if (this.shardSize != null) {
+            generator.writeKey("shard_size");
+            generator.write(this.shardSize);
+
+        }
+        if (this.smoothing != null) {
+            generator.writeKey("smoothing");
+            this.smoothing.serialize(generator, mapper);
+
+        }
+        if (this.text != null) {
+            generator.writeKey("text");
+            generator.write(this.text);
+
+        }
+        if (this.tokenLimit != null) {
+            generator.writeKey("token_limit");
+            generator.write(this.tokenLimit);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PhraseSuggester}.
+     */
+
+    public static class Builder extends SuggesterBase.AbstractBuilder<Builder> implements ObjectBuilder<PhraseSuggester> {
+        @Nullable
+        private PhraseSuggestCollate collate;
+
+        @Nullable
+        private Double confidence;
+
+        @Nullable
+        private List<DirectGenerator> directGenerator;
+
+        @Nullable
+        private Boolean forceUnigrams;
+
+        @Nullable
+        private Integer gramSize;
+
+        @Nullable
+        private PhraseSuggestHighlight highlight;
+
+        @Nullable
+        private Double maxErrors;
+
+        @Nullable
+        private Double realWordErrorLikelihood;
+
+        @Nullable
+        private String separator;
+
+        @Nullable
+        private Integer shardSize;
+
+        @Nullable
+        private SmoothingModel smoothing;
+
+        @Nullable
+        private String text;
+
+        @Nullable
+        private Integer tokenLimit;
+
+        /**
+         * API name: {@code collate}
+         */
+        public final Builder collate(@Nullable PhraseSuggestCollate value) {
+            this.collate = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code collate}
+         */
+        public final Builder collate(Function<PhraseSuggestCollate.Builder, ObjectBuilder<PhraseSuggestCollate>> fn) {
+            return this.collate(fn.apply(new PhraseSuggestCollate.Builder()).build());
+        }
+
+        /**
+         * API name: {@code confidence}
+         */
+        public final Builder confidence(@Nullable Double value) {
+            this.confidence = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code direct_generator}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>directGenerator</code>.
+         */
+        public final Builder directGenerator(List<DirectGenerator> list) {
+            this.directGenerator = _listAddAll(this.directGenerator, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code direct_generator}
+         * <p>
+         * Adds one or more values to <code>directGenerator</code>.
+         */
+        public final Builder directGenerator(DirectGenerator value, DirectGenerator... values) {
+            this.directGenerator = _listAdd(this.directGenerator, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code direct_generator}
+         * <p>
+         * Adds a value to <code>directGenerator</code> using a builder lambda.
+         */
+        public final Builder directGenerator(Function<DirectGenerator.Builder, ObjectBuilder<DirectGenerator>> fn) {
+            return directGenerator(fn.apply(new DirectGenerator.Builder()).build());
+        }
+
+        /**
+         * API name: {@code force_unigrams}
+         */
+        public final Builder forceUnigrams(@Nullable Boolean value) {
+            this.forceUnigrams = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code gram_size}
+         */
+        public final Builder gramSize(@Nullable Integer value) {
+            this.gramSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code highlight}
+         */
+        public final Builder highlight(@Nullable PhraseSuggestHighlight value) {
+            this.highlight = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code highlight}
+         */
+        public final Builder highlight(Function<PhraseSuggestHighlight.Builder, ObjectBuilder<PhraseSuggestHighlight>> fn) {
+            return this.highlight(fn.apply(new PhraseSuggestHighlight.Builder()).build());
+        }
+
+        /**
+         * API name: {@code max_errors}
+         */
+        public final Builder maxErrors(@Nullable Double value) {
+            this.maxErrors = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code real_word_error_likelihood}
+         */
+        public final Builder realWordErrorLikelihood(@Nullable Double value) {
+            this.realWordErrorLikelihood = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code separator}
+         */
+        public final Builder separator(@Nullable String value) {
+            this.separator = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code shard_size}
+         */
+        public final Builder shardSize(@Nullable Integer value) {
+            this.shardSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code smoothing}
+         */
+        public final Builder smoothing(@Nullable SmoothingModel value) {
+            this.smoothing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code smoothing}
+         */
+        public final Builder smoothing(Function<SmoothingModel.Builder, ObjectBuilder<SmoothingModel>> fn) {
+            return this.smoothing(fn.apply(new SmoothingModel.Builder()).build());
+        }
+
+        /**
+         * API name: {@code text}
+         */
+        public final Builder text(@Nullable String value) {
+            this.text = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code token_limit}
+         */
+        public final Builder tokenLimit(@Nullable Integer value) {
+            this.tokenLimit = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PhraseSuggester}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PhraseSuggester build() {
+            _checkSingleUse();
+
+            return new PhraseSuggester(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PhraseSuggester}
+     */
+    public static final JsonpDeserializer<PhraseSuggester> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PhraseSuggester::setupPhraseSuggesterDeserializer
+    );
+
+    protected static void setupPhraseSuggesterDeserializer(ObjectDeserializer<PhraseSuggester.Builder> op) {
+        SuggesterBase.setupSuggesterBaseDeserializer(op);
+        op.add(Builder::collate, PhraseSuggestCollate._DESERIALIZER, "collate");
+        op.add(Builder::confidence, JsonpDeserializer.doubleDeserializer(), "confidence");
+        op.add(Builder::directGenerator, JsonpDeserializer.arrayDeserializer(DirectGenerator._DESERIALIZER), "direct_generator");
+        op.add(Builder::forceUnigrams, JsonpDeserializer.booleanDeserializer(), "force_unigrams");
+        op.add(Builder::gramSize, JsonpDeserializer.integerDeserializer(), "gram_size");
+        op.add(Builder::highlight, PhraseSuggestHighlight._DESERIALIZER, "highlight");
+        op.add(Builder::maxErrors, JsonpDeserializer.doubleDeserializer(), "max_errors");
+        op.add(Builder::realWordErrorLikelihood, JsonpDeserializer.doubleDeserializer(), "real_word_error_likelihood");
+        op.add(Builder::separator, JsonpDeserializer.stringDeserializer(), "separator");
+        op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
+        op.add(Builder::smoothing, SmoothingModel._DESERIALIZER, "smoothing");
+        op.add(Builder::text, JsonpDeserializer.stringDeserializer(), "text");
+        op.add(Builder::tokenLimit, JsonpDeserializer.integerDeserializer(), "token_limit");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Pit.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Pit.java
index acc4d47376..990145915b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Pit.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Pit.java
@@ -8,10 +8,9 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
 import java.util.function.Function;
-
 import javax.annotation.Nullable;
-
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -22,8 +21,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import jakarta.json.stream.JsonGenerator;
-
 @JsonpDeserializable
 public class Pit implements JsonpSerializable {
     private final String id;
@@ -115,8 +112,7 @@ public Pit build() {
     /**
      * Json deserializer for {@link Pit}
      */
-    public static final JsonpDeserializer<Pit> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-            Pit::setupPitDeserializer);
+    public static final JsonpDeserializer<Pit> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new, Pit::setupPitDeserializer);
 
     protected static void setupPitDeserializer(ObjectDeserializer<Pit.Builder> op) {
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Profile.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Profile.java
index f532d1a3ec..2a03bf448c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Profile.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Profile.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,122 +44,121 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _global.search._types.Profile
 
 @JsonpDeserializable
 public class Profile implements JsonpSerializable {
-	private final List<ShardProfile> shards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Profile(Builder builder) {
-
-		this.shards = ApiTypeHelper.unmodifiableRequired(builder.shards, this, "shards");
-
-	}
-
-	public static Profile of(Function<Builder, ObjectBuilder<Profile>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code shards}
-	 */
-	public final List<ShardProfile> shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.shards)) {
-			generator.writeKey("shards");
-			generator.writeStartArray();
-			for (ShardProfile item0 : this.shards) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Profile}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Profile> {
-		private List<ShardProfile> shards;
-
-		/**
-		 * Required - API name: {@code shards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>shards</code>.
-		 */
-		public final Builder shards(List<ShardProfile> list) {
-			this.shards = _listAddAll(this.shards, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards}
-		 * <p>
-		 * Adds one or more values to <code>shards</code>.
-		 */
-		public final Builder shards(ShardProfile value, ShardProfile... values) {
-			this.shards = _listAdd(this.shards, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards}
-		 * <p>
-		 * Adds a value to <code>shards</code> using a builder lambda.
-		 */
-		public final Builder shards(Function<ShardProfile.Builder, ObjectBuilder<ShardProfile>> fn) {
-			return shards(fn.apply(new ShardProfile.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link Profile}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Profile build() {
-			_checkSingleUse();
-
-			return new Profile(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Profile}
-	 */
-	public static final JsonpDeserializer<Profile> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Profile::setupProfileDeserializer);
-
-	protected static void setupProfileDeserializer(ObjectDeserializer<Profile.Builder> op) {
-
-		op.add(Builder::shards, JsonpDeserializer.arrayDeserializer(ShardProfile._DESERIALIZER), "shards");
-
-	}
+    private final List<ShardProfile> shards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Profile(Builder builder) {
+
+        this.shards = ApiTypeHelper.unmodifiableRequired(builder.shards, this, "shards");
+
+    }
+
+    public static Profile of(Function<Builder, ObjectBuilder<Profile>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code shards}
+     */
+    public final List<ShardProfile> shards() {
+        return this.shards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.shards)) {
+            generator.writeKey("shards");
+            generator.writeStartArray();
+            for (ShardProfile item0 : this.shards) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Profile}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Profile> {
+        private List<ShardProfile> shards;
+
+        /**
+         * Required - API name: {@code shards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>shards</code>.
+         */
+        public final Builder shards(List<ShardProfile> list) {
+            this.shards = _listAddAll(this.shards, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards}
+         * <p>
+         * Adds one or more values to <code>shards</code>.
+         */
+        public final Builder shards(ShardProfile value, ShardProfile... values) {
+            this.shards = _listAdd(this.shards, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards}
+         * <p>
+         * Adds a value to <code>shards</code> using a builder lambda.
+         */
+        public final Builder shards(Function<ShardProfile.Builder, ObjectBuilder<ShardProfile>> fn) {
+            return shards(fn.apply(new ShardProfile.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link Profile}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Profile build() {
+            _checkSingleUse();
+
+            return new Profile(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Profile}
+     */
+    public static final JsonpDeserializer<Profile> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Profile::setupProfileDeserializer
+    );
+
+    protected static void setupProfileDeserializer(ObjectDeserializer<Profile.Builder> op) {
+
+        op.add(Builder::shards, JsonpDeserializer.arrayDeserializer(ShardProfile._DESERIALIZER), "shards");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/QueryBreakdown.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/QueryBreakdown.java
index 6586bc8152..3149ae2c3a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/QueryBreakdown.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/QueryBreakdown.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,506 +43,504 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.search._types.QueryBreakdown
 
-
 @JsonpDeserializable
 public class QueryBreakdown implements JsonpSerializable {
-	private final long advance;
+    private final long advance;
 
-	private final long advanceCount;
+    private final long advanceCount;
 
-	private final long buildScorer;
+    private final long buildScorer;
 
-	private final long buildScorerCount;
+    private final long buildScorerCount;
 
-	private final long createWeight;
+    private final long createWeight;
 
-	private final long createWeightCount;
+    private final long createWeightCount;
 
-	private final long match;
+    private final long match;
 
-	private final long matchCount;
+    private final long matchCount;
 
-	private final long shallowAdvance;
+    private final long shallowAdvance;
 
-	private final long shallowAdvanceCount;
+    private final long shallowAdvanceCount;
 
-	private final long nextDoc;
+    private final long nextDoc;
 
-	private final long nextDocCount;
-
-	private final long score;
+    private final long nextDocCount;
+
+    private final long score;
 
-	private final long scoreCount;
-
-	private final long computeMaxScore;
-
-	private final long computeMaxScoreCount;
-
-	private final long setMinCompetitiveScore;
-
-	private final long setMinCompetitiveScoreCount;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private QueryBreakdown(Builder builder) {
-
-		this.advance = ApiTypeHelper.requireNonNull(builder.advance, this, "advance");
-		this.advanceCount = ApiTypeHelper.requireNonNull(builder.advanceCount, this, "advanceCount");
-		this.buildScorer = ApiTypeHelper.requireNonNull(builder.buildScorer, this, "buildScorer");
-		this.buildScorerCount = ApiTypeHelper.requireNonNull(builder.buildScorerCount, this, "buildScorerCount");
-		this.createWeight = ApiTypeHelper.requireNonNull(builder.createWeight, this, "createWeight");
-		this.createWeightCount = ApiTypeHelper.requireNonNull(builder.createWeightCount, this, "createWeightCount");
-		this.match = ApiTypeHelper.requireNonNull(builder.match, this, "match");
-		this.matchCount = ApiTypeHelper.requireNonNull(builder.matchCount, this, "matchCount");
-		this.shallowAdvance = ApiTypeHelper.requireNonNull(builder.shallowAdvance, this, "shallowAdvance");
-		this.shallowAdvanceCount = ApiTypeHelper.requireNonNull(builder.shallowAdvanceCount, this,
-				"shallowAdvanceCount");
-		this.nextDoc = ApiTypeHelper.requireNonNull(builder.nextDoc, this, "nextDoc");
-		this.nextDocCount = ApiTypeHelper.requireNonNull(builder.nextDocCount, this, "nextDocCount");
-		this.score = ApiTypeHelper.requireNonNull(builder.score, this, "score");
-		this.scoreCount = ApiTypeHelper.requireNonNull(builder.scoreCount, this, "scoreCount");
-		this.computeMaxScore = ApiTypeHelper.requireNonNull(builder.computeMaxScore, this, "computeMaxScore");
-		this.computeMaxScoreCount = ApiTypeHelper.requireNonNull(builder.computeMaxScoreCount, this,
-				"computeMaxScoreCount");
-		this.setMinCompetitiveScore = ApiTypeHelper.requireNonNull(builder.setMinCompetitiveScore, this,
-				"setMinCompetitiveScore");
-		this.setMinCompetitiveScoreCount = ApiTypeHelper.requireNonNull(builder.setMinCompetitiveScoreCount, this,
-				"setMinCompetitiveScoreCount");
-
-	}
-
-	public static QueryBreakdown of(Function<Builder, ObjectBuilder<QueryBreakdown>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code advance}
-	 */
-	public final long advance() {
-		return this.advance;
-	}
-
-	/**
-	 * Required - API name: {@code advance_count}
-	 */
-	public final long advanceCount() {
-		return this.advanceCount;
-	}
-
-	/**
-	 * Required - API name: {@code build_scorer}
-	 */
-	public final long buildScorer() {
-		return this.buildScorer;
-	}
-
-	/**
-	 * Required - API name: {@code build_scorer_count}
-	 */
-	public final long buildScorerCount() {
-		return this.buildScorerCount;
-	}
-
-	/**
-	 * Required - API name: {@code create_weight}
-	 */
-	public final long createWeight() {
-		return this.createWeight;
-	}
-
-	/**
-	 * Required - API name: {@code create_weight_count}
-	 */
-	public final long createWeightCount() {
-		return this.createWeightCount;
-	}
-
-	/**
-	 * Required - API name: {@code match}
-	 */
-	public final long match() {
-		return this.match;
-	}
-
-	/**
-	 * Required - API name: {@code match_count}
-	 */
-	public final long matchCount() {
-		return this.matchCount;
-	}
-
-	/**
-	 * Required - API name: {@code shallow_advance}
-	 */
-	public final long shallowAdvance() {
-		return this.shallowAdvance;
-	}
-
-	/**
-	 * Required - API name: {@code shallow_advance_count}
-	 */
-	public final long shallowAdvanceCount() {
-		return this.shallowAdvanceCount;
-	}
-
-	/**
-	 * Required - API name: {@code next_doc}
-	 */
-	public final long nextDoc() {
-		return this.nextDoc;
-	}
-
-	/**
-	 * Required - API name: {@code next_doc_count}
-	 */
-	public final long nextDocCount() {
-		return this.nextDocCount;
-	}
-
-	/**
-	 * Required - API name: {@code score}
-	 */
-	public final long score() {
-		return this.score;
-	}
-
-	/**
-	 * Required - API name: {@code score_count}
-	 */
-	public final long scoreCount() {
-		return this.scoreCount;
-	}
-
-	/**
-	 * Required - API name: {@code compute_max_score}
-	 */
-	public final long computeMaxScore() {
-		return this.computeMaxScore;
-	}
-
-	/**
-	 * Required - API name: {@code compute_max_score_count}
-	 */
-	public final long computeMaxScoreCount() {
-		return this.computeMaxScoreCount;
-	}
-
-	/**
-	 * Required - API name: {@code set_min_competitive_score}
-	 */
-	public final long setMinCompetitiveScore() {
-		return this.setMinCompetitiveScore;
-	}
-
-	/**
-	 * Required - API name: {@code set_min_competitive_score_count}
-	 */
-	public final long setMinCompetitiveScoreCount() {
-		return this.setMinCompetitiveScoreCount;
-	}
+    private final long scoreCount;
+
+    private final long computeMaxScore;
+
+    private final long computeMaxScoreCount;
+
+    private final long setMinCompetitiveScore;
+
+    private final long setMinCompetitiveScoreCount;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private QueryBreakdown(Builder builder) {
+
+        this.advance = ApiTypeHelper.requireNonNull(builder.advance, this, "advance");
+        this.advanceCount = ApiTypeHelper.requireNonNull(builder.advanceCount, this, "advanceCount");
+        this.buildScorer = ApiTypeHelper.requireNonNull(builder.buildScorer, this, "buildScorer");
+        this.buildScorerCount = ApiTypeHelper.requireNonNull(builder.buildScorerCount, this, "buildScorerCount");
+        this.createWeight = ApiTypeHelper.requireNonNull(builder.createWeight, this, "createWeight");
+        this.createWeightCount = ApiTypeHelper.requireNonNull(builder.createWeightCount, this, "createWeightCount");
+        this.match = ApiTypeHelper.requireNonNull(builder.match, this, "match");
+        this.matchCount = ApiTypeHelper.requireNonNull(builder.matchCount, this, "matchCount");
+        this.shallowAdvance = ApiTypeHelper.requireNonNull(builder.shallowAdvance, this, "shallowAdvance");
+        this.shallowAdvanceCount = ApiTypeHelper.requireNonNull(builder.shallowAdvanceCount, this, "shallowAdvanceCount");
+        this.nextDoc = ApiTypeHelper.requireNonNull(builder.nextDoc, this, "nextDoc");
+        this.nextDocCount = ApiTypeHelper.requireNonNull(builder.nextDocCount, this, "nextDocCount");
+        this.score = ApiTypeHelper.requireNonNull(builder.score, this, "score");
+        this.scoreCount = ApiTypeHelper.requireNonNull(builder.scoreCount, this, "scoreCount");
+        this.computeMaxScore = ApiTypeHelper.requireNonNull(builder.computeMaxScore, this, "computeMaxScore");
+        this.computeMaxScoreCount = ApiTypeHelper.requireNonNull(builder.computeMaxScoreCount, this, "computeMaxScoreCount");
+        this.setMinCompetitiveScore = ApiTypeHelper.requireNonNull(builder.setMinCompetitiveScore, this, "setMinCompetitiveScore");
+        this.setMinCompetitiveScoreCount = ApiTypeHelper.requireNonNull(
+            builder.setMinCompetitiveScoreCount,
+            this,
+            "setMinCompetitiveScoreCount"
+        );
+
+    }
+
+    public static QueryBreakdown of(Function<Builder, ObjectBuilder<QueryBreakdown>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code advance}
+     */
+    public final long advance() {
+        return this.advance;
+    }
+
+    /**
+     * Required - API name: {@code advance_count}
+     */
+    public final long advanceCount() {
+        return this.advanceCount;
+    }
+
+    /**
+     * Required - API name: {@code build_scorer}
+     */
+    public final long buildScorer() {
+        return this.buildScorer;
+    }
+
+    /**
+     * Required - API name: {@code build_scorer_count}
+     */
+    public final long buildScorerCount() {
+        return this.buildScorerCount;
+    }
+
+    /**
+     * Required - API name: {@code create_weight}
+     */
+    public final long createWeight() {
+        return this.createWeight;
+    }
+
+    /**
+     * Required - API name: {@code create_weight_count}
+     */
+    public final long createWeightCount() {
+        return this.createWeightCount;
+    }
+
+    /**
+     * Required - API name: {@code match}
+     */
+    public final long match() {
+        return this.match;
+    }
+
+    /**
+     * Required - API name: {@code match_count}
+     */
+    public final long matchCount() {
+        return this.matchCount;
+    }
+
+    /**
+     * Required - API name: {@code shallow_advance}
+     */
+    public final long shallowAdvance() {
+        return this.shallowAdvance;
+    }
+
+    /**
+     * Required - API name: {@code shallow_advance_count}
+     */
+    public final long shallowAdvanceCount() {
+        return this.shallowAdvanceCount;
+    }
+
+    /**
+     * Required - API name: {@code next_doc}
+     */
+    public final long nextDoc() {
+        return this.nextDoc;
+    }
+
+    /**
+     * Required - API name: {@code next_doc_count}
+     */
+    public final long nextDocCount() {
+        return this.nextDocCount;
+    }
+
+    /**
+     * Required - API name: {@code score}
+     */
+    public final long score() {
+        return this.score;
+    }
+
+    /**
+     * Required - API name: {@code score_count}
+     */
+    public final long scoreCount() {
+        return this.scoreCount;
+    }
+
+    /**
+     * Required - API name: {@code compute_max_score}
+     */
+    public final long computeMaxScore() {
+        return this.computeMaxScore;
+    }
+
+    /**
+     * Required - API name: {@code compute_max_score_count}
+     */
+    public final long computeMaxScoreCount() {
+        return this.computeMaxScoreCount;
+    }
+
+    /**
+     * Required - API name: {@code set_min_competitive_score}
+     */
+    public final long setMinCompetitiveScore() {
+        return this.setMinCompetitiveScore;
+    }
+
+    /**
+     * Required - API name: {@code set_min_competitive_score_count}
+     */
+    public final long setMinCompetitiveScoreCount() {
+        return this.setMinCompetitiveScoreCount;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("advance");
-		generator.write(this.advance);
+        generator.writeKey("advance");
+        generator.write(this.advance);
 
-		generator.writeKey("advance_count");
-		generator.write(this.advanceCount);
+        generator.writeKey("advance_count");
+        generator.write(this.advanceCount);
 
-		generator.writeKey("build_scorer");
-		generator.write(this.buildScorer);
+        generator.writeKey("build_scorer");
+        generator.write(this.buildScorer);
 
-		generator.writeKey("build_scorer_count");
-		generator.write(this.buildScorerCount);
+        generator.writeKey("build_scorer_count");
+        generator.write(this.buildScorerCount);
 
-		generator.writeKey("create_weight");
-		generator.write(this.createWeight);
+        generator.writeKey("create_weight");
+        generator.write(this.createWeight);
 
-		generator.writeKey("create_weight_count");
-		generator.write(this.createWeightCount);
+        generator.writeKey("create_weight_count");
+        generator.write(this.createWeightCount);
 
-		generator.writeKey("match");
-		generator.write(this.match);
+        generator.writeKey("match");
+        generator.write(this.match);
 
-		generator.writeKey("match_count");
-		generator.write(this.matchCount);
+        generator.writeKey("match_count");
+        generator.write(this.matchCount);
 
-		generator.writeKey("shallow_advance");
-		generator.write(this.shallowAdvance);
+        generator.writeKey("shallow_advance");
+        generator.write(this.shallowAdvance);
 
-		generator.writeKey("shallow_advance_count");
-		generator.write(this.shallowAdvanceCount);
+        generator.writeKey("shallow_advance_count");
+        generator.write(this.shallowAdvanceCount);
 
-		generator.writeKey("next_doc");
-		generator.write(this.nextDoc);
+        generator.writeKey("next_doc");
+        generator.write(this.nextDoc);
 
-		generator.writeKey("next_doc_count");
-		generator.write(this.nextDocCount);
+        generator.writeKey("next_doc_count");
+        generator.write(this.nextDocCount);
 
-		generator.writeKey("score");
-		generator.write(this.score);
+        generator.writeKey("score");
+        generator.write(this.score);
 
-		generator.writeKey("score_count");
-		generator.write(this.scoreCount);
+        generator.writeKey("score_count");
+        generator.write(this.scoreCount);
 
-		generator.writeKey("compute_max_score");
-		generator.write(this.computeMaxScore);
+        generator.writeKey("compute_max_score");
+        generator.write(this.computeMaxScore);
 
-		generator.writeKey("compute_max_score_count");
-		generator.write(this.computeMaxScoreCount);
+        generator.writeKey("compute_max_score_count");
+        generator.write(this.computeMaxScoreCount);
 
-		generator.writeKey("set_min_competitive_score");
-		generator.write(this.setMinCompetitiveScore);
+        generator.writeKey("set_min_competitive_score");
+        generator.write(this.setMinCompetitiveScore);
 
-		generator.writeKey("set_min_competitive_score_count");
-		generator.write(this.setMinCompetitiveScoreCount);
+        generator.writeKey("set_min_competitive_score_count");
+        generator.write(this.setMinCompetitiveScoreCount);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link QueryBreakdown}.
-	 */
+    /**
+     * Builder for {@link QueryBreakdown}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<QueryBreakdown> {
-		private Long advance;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<QueryBreakdown> {
+        private Long advance;
 
-		private Long advanceCount;
+        private Long advanceCount;
 
-		private Long buildScorer;
+        private Long buildScorer;
 
-		private Long buildScorerCount;
+        private Long buildScorerCount;
 
-		private Long createWeight;
+        private Long createWeight;
 
-		private Long createWeightCount;
+        private Long createWeightCount;
 
-		private Long match;
+        private Long match;
 
-		private Long matchCount;
+        private Long matchCount;
 
-		private Long shallowAdvance;
+        private Long shallowAdvance;
 
-		private Long shallowAdvanceCount;
+        private Long shallowAdvanceCount;
 
-		private Long nextDoc;
+        private Long nextDoc;
 
-		private Long nextDocCount;
+        private Long nextDocCount;
 
-		private Long score;
+        private Long score;
 
-		private Long scoreCount;
+        private Long scoreCount;
 
-		private Long computeMaxScore;
+        private Long computeMaxScore;
 
-		private Long computeMaxScoreCount;
+        private Long computeMaxScoreCount;
 
-		private Long setMinCompetitiveScore;
+        private Long setMinCompetitiveScore;
 
-		private Long setMinCompetitiveScoreCount;
+        private Long setMinCompetitiveScoreCount;
 
-		/**
-		 * Required - API name: {@code advance}
-		 */
-		public final Builder advance(long value) {
-			this.advance = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code advance}
+         */
+        public final Builder advance(long value) {
+            this.advance = value;
+            return this;
+        }
 
-		/**
-		 * Required - API name: {@code advance_count}
-		 */
-		public final Builder advanceCount(long value) {
-			this.advanceCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code build_scorer}
-		 */
-		public final Builder buildScorer(long value) {
-			this.buildScorer = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code build_scorer_count}
-		 */
-		public final Builder buildScorerCount(long value) {
-			this.buildScorerCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code create_weight}
-		 */
-		public final Builder createWeight(long value) {
-			this.createWeight = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code create_weight_count}
-		 */
-		public final Builder createWeightCount(long value) {
-			this.createWeightCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code match}
-		 */
-		public final Builder match(long value) {
-			this.match = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code match_count}
-		 */
-		public final Builder matchCount(long value) {
-			this.matchCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shallow_advance}
-		 */
-		public final Builder shallowAdvance(long value) {
-			this.shallowAdvance = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shallow_advance_count}
-		 */
-		public final Builder shallowAdvanceCount(long value) {
-			this.shallowAdvanceCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code next_doc}
-		 */
-		public final Builder nextDoc(long value) {
-			this.nextDoc = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code next_doc_count}
-		 */
-		public final Builder nextDocCount(long value) {
-			this.nextDocCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code score}
-		 */
-		public final Builder score(long value) {
-			this.score = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code score_count}
-		 */
-		public final Builder scoreCount(long value) {
-			this.scoreCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code compute_max_score}
-		 */
-		public final Builder computeMaxScore(long value) {
-			this.computeMaxScore = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code compute_max_score_count}
-		 */
-		public final Builder computeMaxScoreCount(long value) {
-			this.computeMaxScoreCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code set_min_competitive_score}
-		 */
-		public final Builder setMinCompetitiveScore(long value) {
-			this.setMinCompetitiveScore = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code set_min_competitive_score_count}
-		 */
-		public final Builder setMinCompetitiveScoreCount(long value) {
-			this.setMinCompetitiveScoreCount = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link QueryBreakdown}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public QueryBreakdown build() {
-			_checkSingleUse();
-
-			return new QueryBreakdown(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link QueryBreakdown}
-	 */
-	public static final JsonpDeserializer<QueryBreakdown> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			QueryBreakdown::setupQueryBreakdownDeserializer);
-
-	protected static void setupQueryBreakdownDeserializer(ObjectDeserializer<QueryBreakdown.Builder> op) {
-
-		op.add(Builder::advance, JsonpDeserializer.longDeserializer(), "advance");
-		op.add(Builder::advanceCount, JsonpDeserializer.longDeserializer(), "advance_count");
-		op.add(Builder::buildScorer, JsonpDeserializer.longDeserializer(), "build_scorer");
-		op.add(Builder::buildScorerCount, JsonpDeserializer.longDeserializer(), "build_scorer_count");
-		op.add(Builder::createWeight, JsonpDeserializer.longDeserializer(), "create_weight");
-		op.add(Builder::createWeightCount, JsonpDeserializer.longDeserializer(), "create_weight_count");
-		op.add(Builder::match, JsonpDeserializer.longDeserializer(), "match");
-		op.add(Builder::matchCount, JsonpDeserializer.longDeserializer(), "match_count");
-		op.add(Builder::shallowAdvance, JsonpDeserializer.longDeserializer(), "shallow_advance");
-		op.add(Builder::shallowAdvanceCount, JsonpDeserializer.longDeserializer(), "shallow_advance_count");
-		op.add(Builder::nextDoc, JsonpDeserializer.longDeserializer(), "next_doc");
-		op.add(Builder::nextDocCount, JsonpDeserializer.longDeserializer(), "next_doc_count");
-		op.add(Builder::score, JsonpDeserializer.longDeserializer(), "score");
-		op.add(Builder::scoreCount, JsonpDeserializer.longDeserializer(), "score_count");
-		op.add(Builder::computeMaxScore, JsonpDeserializer.longDeserializer(), "compute_max_score");
-		op.add(Builder::computeMaxScoreCount, JsonpDeserializer.longDeserializer(), "compute_max_score_count");
-		op.add(Builder::setMinCompetitiveScore, JsonpDeserializer.longDeserializer(), "set_min_competitive_score");
-		op.add(Builder::setMinCompetitiveScoreCount, JsonpDeserializer.longDeserializer(),
-				"set_min_competitive_score_count");
-
-	}
+        /**
+         * Required - API name: {@code advance_count}
+         */
+        public final Builder advanceCount(long value) {
+            this.advanceCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code build_scorer}
+         */
+        public final Builder buildScorer(long value) {
+            this.buildScorer = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code build_scorer_count}
+         */
+        public final Builder buildScorerCount(long value) {
+            this.buildScorerCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code create_weight}
+         */
+        public final Builder createWeight(long value) {
+            this.createWeight = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code create_weight_count}
+         */
+        public final Builder createWeightCount(long value) {
+            this.createWeightCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code match}
+         */
+        public final Builder match(long value) {
+            this.match = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code match_count}
+         */
+        public final Builder matchCount(long value) {
+            this.matchCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shallow_advance}
+         */
+        public final Builder shallowAdvance(long value) {
+            this.shallowAdvance = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shallow_advance_count}
+         */
+        public final Builder shallowAdvanceCount(long value) {
+            this.shallowAdvanceCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code next_doc}
+         */
+        public final Builder nextDoc(long value) {
+            this.nextDoc = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code next_doc_count}
+         */
+        public final Builder nextDocCount(long value) {
+            this.nextDocCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code score}
+         */
+        public final Builder score(long value) {
+            this.score = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code score_count}
+         */
+        public final Builder scoreCount(long value) {
+            this.scoreCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code compute_max_score}
+         */
+        public final Builder computeMaxScore(long value) {
+            this.computeMaxScore = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code compute_max_score_count}
+         */
+        public final Builder computeMaxScoreCount(long value) {
+            this.computeMaxScoreCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code set_min_competitive_score}
+         */
+        public final Builder setMinCompetitiveScore(long value) {
+            this.setMinCompetitiveScore = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code set_min_competitive_score_count}
+         */
+        public final Builder setMinCompetitiveScoreCount(long value) {
+            this.setMinCompetitiveScoreCount = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link QueryBreakdown}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public QueryBreakdown build() {
+            _checkSingleUse();
+
+            return new QueryBreakdown(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link QueryBreakdown}
+     */
+    public static final JsonpDeserializer<QueryBreakdown> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        QueryBreakdown::setupQueryBreakdownDeserializer
+    );
+
+    protected static void setupQueryBreakdownDeserializer(ObjectDeserializer<QueryBreakdown.Builder> op) {
+
+        op.add(Builder::advance, JsonpDeserializer.longDeserializer(), "advance");
+        op.add(Builder::advanceCount, JsonpDeserializer.longDeserializer(), "advance_count");
+        op.add(Builder::buildScorer, JsonpDeserializer.longDeserializer(), "build_scorer");
+        op.add(Builder::buildScorerCount, JsonpDeserializer.longDeserializer(), "build_scorer_count");
+        op.add(Builder::createWeight, JsonpDeserializer.longDeserializer(), "create_weight");
+        op.add(Builder::createWeightCount, JsonpDeserializer.longDeserializer(), "create_weight_count");
+        op.add(Builder::match, JsonpDeserializer.longDeserializer(), "match");
+        op.add(Builder::matchCount, JsonpDeserializer.longDeserializer(), "match_count");
+        op.add(Builder::shallowAdvance, JsonpDeserializer.longDeserializer(), "shallow_advance");
+        op.add(Builder::shallowAdvanceCount, JsonpDeserializer.longDeserializer(), "shallow_advance_count");
+        op.add(Builder::nextDoc, JsonpDeserializer.longDeserializer(), "next_doc");
+        op.add(Builder::nextDocCount, JsonpDeserializer.longDeserializer(), "next_doc_count");
+        op.add(Builder::score, JsonpDeserializer.longDeserializer(), "score");
+        op.add(Builder::scoreCount, JsonpDeserializer.longDeserializer(), "score_count");
+        op.add(Builder::computeMaxScore, JsonpDeserializer.longDeserializer(), "compute_max_score");
+        op.add(Builder::computeMaxScoreCount, JsonpDeserializer.longDeserializer(), "compute_max_score_count");
+        op.add(Builder::setMinCompetitiveScore, JsonpDeserializer.longDeserializer(), "set_min_competitive_score");
+        op.add(Builder::setMinCompetitiveScoreCount, JsonpDeserializer.longDeserializer(), "set_min_competitive_score_count");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/QueryProfile.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/QueryProfile.java
index 57c34a5da4..9c78a35ee6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/QueryProfile.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/QueryProfile.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,228 +45,225 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.QueryProfile
 
-
 @JsonpDeserializable
 public class QueryProfile implements JsonpSerializable {
-	private final QueryBreakdown breakdown;
+    private final QueryBreakdown breakdown;
 
-	private final String description;
+    private final String description;
 
-	private final long timeInNanos;
+    private final long timeInNanos;
 
-	private final String type;
+    private final String type;
 
-	private final List<QueryProfile> children;
+    private final List<QueryProfile> children;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private QueryProfile(Builder builder) {
+    private QueryProfile(Builder builder) {
 
-		this.breakdown = ApiTypeHelper.requireNonNull(builder.breakdown, this, "breakdown");
-		this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
-		this.timeInNanos = ApiTypeHelper.requireNonNull(builder.timeInNanos, this, "timeInNanos");
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-		this.children = ApiTypeHelper.unmodifiable(builder.children);
+        this.breakdown = ApiTypeHelper.requireNonNull(builder.breakdown, this, "breakdown");
+        this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
+        this.timeInNanos = ApiTypeHelper.requireNonNull(builder.timeInNanos, this, "timeInNanos");
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.children = ApiTypeHelper.unmodifiable(builder.children);
 
-	}
+    }
 
-	public static QueryProfile of(Function<Builder, ObjectBuilder<QueryProfile>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static QueryProfile of(Function<Builder, ObjectBuilder<QueryProfile>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code breakdown}
-	 */
-	public final QueryBreakdown breakdown() {
-		return this.breakdown;
-	}
+    /**
+     * Required - API name: {@code breakdown}
+     */
+    public final QueryBreakdown breakdown() {
+        return this.breakdown;
+    }
 
-	/**
-	 * Required - API name: {@code description}
-	 */
-	public final String description() {
-		return this.description;
-	}
+    /**
+     * Required - API name: {@code description}
+     */
+    public final String description() {
+        return this.description;
+    }
 
-	/**
-	 * Required - API name: {@code time_in_nanos}
-	 */
-	public final long timeInNanos() {
-		return this.timeInNanos;
-	}
+    /**
+     * Required - API name: {@code time_in_nanos}
+     */
+    public final long timeInNanos() {
+        return this.timeInNanos;
+    }
 
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * API name: {@code children}
-	 */
-	public final List<QueryProfile> children() {
-		return this.children;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("breakdown");
-		this.breakdown.serialize(generator, mapper);
-
-		generator.writeKey("description");
-		generator.write(this.description);
-
-		generator.writeKey("time_in_nanos");
-		generator.write(this.timeInNanos);
-
-		generator.writeKey("type");
-		generator.write(this.type);
-
-		if (ApiTypeHelper.isDefined(this.children)) {
-			generator.writeKey("children");
-			generator.writeStartArray();
-			for (QueryProfile item0 : this.children) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link QueryProfile}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<QueryProfile> {
-		private QueryBreakdown breakdown;
-
-		private String description;
-
-		private Long timeInNanos;
-
-		private String type;
-
-		@Nullable
-		private List<QueryProfile> children;
-
-		/**
-		 * Required - API name: {@code breakdown}
-		 */
-		public final Builder breakdown(QueryBreakdown value) {
-			this.breakdown = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code breakdown}
-		 */
-		public final Builder breakdown(Function<QueryBreakdown.Builder, ObjectBuilder<QueryBreakdown>> fn) {
-			return this.breakdown(fn.apply(new QueryBreakdown.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code description}
-		 */
-		public final Builder description(String value) {
-			this.description = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code time_in_nanos}
-		 */
-		public final Builder timeInNanos(long value) {
-			this.timeInNanos = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code children}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>children</code>.
-		 */
-		public final Builder children(List<QueryProfile> list) {
-			this.children = _listAddAll(this.children, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code children}
-		 * <p>
-		 * Adds one or more values to <code>children</code>.
-		 */
-		public final Builder children(QueryProfile value, QueryProfile... values) {
-			this.children = _listAdd(this.children, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code children}
-		 * <p>
-		 * Adds a value to <code>children</code> using a builder lambda.
-		 */
-		public final Builder children(Function<QueryProfile.Builder, ObjectBuilder<QueryProfile>> fn) {
-			return children(fn.apply(new QueryProfile.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link QueryProfile}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public QueryProfile build() {
-			_checkSingleUse();
-
-			return new QueryProfile(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link QueryProfile}
-	 */
-	public static final JsonpDeserializer<QueryProfile> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			QueryProfile::setupQueryProfileDeserializer);
-
-	protected static void setupQueryProfileDeserializer(ObjectDeserializer<QueryProfile.Builder> op) {
-
-		op.add(Builder::breakdown, QueryBreakdown._DESERIALIZER, "breakdown");
-		op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
-		op.add(Builder::timeInNanos, JsonpDeserializer.longDeserializer(), "time_in_nanos");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-		op.add(Builder::children, JsonpDeserializer.arrayDeserializer(QueryProfile._DESERIALIZER), "children");
-
-	}
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * API name: {@code children}
+     */
+    public final List<QueryProfile> children() {
+        return this.children;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("breakdown");
+        this.breakdown.serialize(generator, mapper);
+
+        generator.writeKey("description");
+        generator.write(this.description);
+
+        generator.writeKey("time_in_nanos");
+        generator.write(this.timeInNanos);
+
+        generator.writeKey("type");
+        generator.write(this.type);
+
+        if (ApiTypeHelper.isDefined(this.children)) {
+            generator.writeKey("children");
+            generator.writeStartArray();
+            for (QueryProfile item0 : this.children) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link QueryProfile}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<QueryProfile> {
+        private QueryBreakdown breakdown;
+
+        private String description;
+
+        private Long timeInNanos;
+
+        private String type;
+
+        @Nullable
+        private List<QueryProfile> children;
+
+        /**
+         * Required - API name: {@code breakdown}
+         */
+        public final Builder breakdown(QueryBreakdown value) {
+            this.breakdown = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code breakdown}
+         */
+        public final Builder breakdown(Function<QueryBreakdown.Builder, ObjectBuilder<QueryBreakdown>> fn) {
+            return this.breakdown(fn.apply(new QueryBreakdown.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code description}
+         */
+        public final Builder description(String value) {
+            this.description = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code time_in_nanos}
+         */
+        public final Builder timeInNanos(long value) {
+            this.timeInNanos = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code children}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>children</code>.
+         */
+        public final Builder children(List<QueryProfile> list) {
+            this.children = _listAddAll(this.children, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code children}
+         * <p>
+         * Adds one or more values to <code>children</code>.
+         */
+        public final Builder children(QueryProfile value, QueryProfile... values) {
+            this.children = _listAdd(this.children, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code children}
+         * <p>
+         * Adds a value to <code>children</code> using a builder lambda.
+         */
+        public final Builder children(Function<QueryProfile.Builder, ObjectBuilder<QueryProfile>> fn) {
+            return children(fn.apply(new QueryProfile.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link QueryProfile}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public QueryProfile build() {
+            _checkSingleUse();
+
+            return new QueryProfile(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link QueryProfile}
+     */
+    public static final JsonpDeserializer<QueryProfile> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        QueryProfile::setupQueryProfileDeserializer
+    );
+
+    protected static void setupQueryProfileDeserializer(ObjectDeserializer<QueryProfile.Builder> op) {
+
+        op.add(Builder::breakdown, QueryBreakdown._DESERIALIZER, "breakdown");
+        op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
+        op.add(Builder::timeInNanos, JsonpDeserializer.longDeserializer(), "time_in_nanos");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+        op.add(Builder::children, JsonpDeserializer.arrayDeserializer(QueryProfile._DESERIALIZER), "children");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Rescore.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Rescore.java
index 9a3e3a0c19..1c76382df4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Rescore.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Rescore.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,131 +44,129 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.Rescore
 
-
 @JsonpDeserializable
 public class Rescore implements JsonpSerializable {
-	private final RescoreQuery query;
-
-	@Nullable
-	private final Integer windowSize;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Rescore(Builder builder) {
-
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-		this.windowSize = builder.windowSize;
-
-	}
-
-	public static Rescore of(Function<Builder, ObjectBuilder<Rescore>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final RescoreQuery query() {
-		return this.query;
-	}
-
-	/**
-	 * API name: {@code window_size}
-	 */
-	@Nullable
-	public final Integer windowSize() {
-		return this.windowSize;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("query");
-		this.query.serialize(generator, mapper);
-
-		if (this.windowSize != null) {
-			generator.writeKey("window_size");
-			generator.write(this.windowSize);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Rescore}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Rescore> {
-		private RescoreQuery query;
-
-		@Nullable
-		private Integer windowSize;
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(RescoreQuery value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 */
-		public final Builder query(Function<RescoreQuery.Builder, ObjectBuilder<RescoreQuery>> fn) {
-			return this.query(fn.apply(new RescoreQuery.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code window_size}
-		 */
-		public final Builder windowSize(@Nullable Integer value) {
-			this.windowSize = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Rescore}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Rescore build() {
-			_checkSingleUse();
-
-			return new Rescore(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Rescore}
-	 */
-	public static final JsonpDeserializer<Rescore> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Rescore::setupRescoreDeserializer);
-
-	protected static void setupRescoreDeserializer(ObjectDeserializer<Rescore.Builder> op) {
-
-		op.add(Builder::query, RescoreQuery._DESERIALIZER, "query");
-		op.add(Builder::windowSize, JsonpDeserializer.integerDeserializer(), "window_size");
-
-	}
+    private final RescoreQuery query;
+
+    @Nullable
+    private final Integer windowSize;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Rescore(Builder builder) {
+
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+        this.windowSize = builder.windowSize;
+
+    }
+
+    public static Rescore of(Function<Builder, ObjectBuilder<Rescore>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final RescoreQuery query() {
+        return this.query;
+    }
+
+    /**
+     * API name: {@code window_size}
+     */
+    @Nullable
+    public final Integer windowSize() {
+        return this.windowSize;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("query");
+        this.query.serialize(generator, mapper);
+
+        if (this.windowSize != null) {
+            generator.writeKey("window_size");
+            generator.write(this.windowSize);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Rescore}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Rescore> {
+        private RescoreQuery query;
+
+        @Nullable
+        private Integer windowSize;
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(RescoreQuery value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         */
+        public final Builder query(Function<RescoreQuery.Builder, ObjectBuilder<RescoreQuery>> fn) {
+            return this.query(fn.apply(new RescoreQuery.Builder()).build());
+        }
+
+        /**
+         * API name: {@code window_size}
+         */
+        public final Builder windowSize(@Nullable Integer value) {
+            this.windowSize = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Rescore}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Rescore build() {
+            _checkSingleUse();
+
+            return new Rescore(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Rescore}
+     */
+    public static final JsonpDeserializer<Rescore> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Rescore::setupRescoreDeserializer
+    );
+
+    protected static void setupRescoreDeserializer(ObjectDeserializer<Rescore.Builder> op) {
+
+        op.add(Builder::query, RescoreQuery._DESERIALIZER, "query");
+        op.add(Builder::windowSize, JsonpDeserializer.integerDeserializer(), "window_size");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/RescoreQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/RescoreQuery.java
index ee51838bf7..ef930172ad 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/RescoreQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/RescoreQuery.java
@@ -32,198 +32,199 @@
 
 package org.opensearch.client.opensearch.core.search;
 
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.RescoreQuery
 
 @JsonpDeserializable
 public class RescoreQuery implements JsonpSerializable {
-	private final Query query;
-
-	@Nullable
-	private final Double queryWeight;
-
-	@Nullable
-	private final Double rescoreQueryWeight;
-
-	@Nullable
-	private final ScoreMode scoreMode;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RescoreQuery(Builder builder) {
-
-		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
-		this.queryWeight = builder.queryWeight;
-		this.rescoreQueryWeight = builder.rescoreQueryWeight;
-		this.scoreMode = builder.scoreMode;
-
-	}
-
-	public static RescoreQuery of(Function<Builder, ObjectBuilder<RescoreQuery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code rescore_query}
-	 */
-	public final Query query() {
-		return this.query;
-	}
-
-	/**
-	 * API name: {@code query_weight}
-	 */
-	@Nullable
-	public final Double queryWeight() {
-		return this.queryWeight;
-	}
-
-	/**
-	 * API name: {@code rescore_query_weight}
-	 */
-	@Nullable
-	public final Double rescoreQueryWeight() {
-		return this.rescoreQueryWeight;
-	}
-
-	/**
-	 * API name: {@code score_mode}
-	 */
-	@Nullable
-	public final ScoreMode scoreMode() {
-		return this.scoreMode;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("rescore_query");
-		this.query.serialize(generator, mapper);
-
-		if (this.queryWeight != null) {
-			generator.writeKey("query_weight");
-			generator.write(this.queryWeight);
-
-		}
-		if (this.rescoreQueryWeight != null) {
-			generator.writeKey("rescore_query_weight");
-			generator.write(this.rescoreQueryWeight);
-
-		}
-		if (this.scoreMode != null) {
-			generator.writeKey("score_mode");
-			this.scoreMode.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RescoreQuery}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RescoreQuery> {
-		private Query query;
-
-		@Nullable
-		private Double queryWeight;
-
-		@Nullable
-		private Double rescoreQueryWeight;
-
-		@Nullable
-		private ScoreMode scoreMode;
-
-		/**
-		 * Required - API name: {@code rescore_query}
-		 */
-		public final Builder query(Query value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code rescore_query}
-		 */
-		public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.query(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code query_weight}
-		 */
-		public final Builder queryWeight(@Nullable Double value) {
-			this.queryWeight = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code rescore_query_weight}
-		 */
-		public final Builder rescoreQueryWeight(@Nullable Double value) {
-			this.rescoreQueryWeight = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code score_mode}
-		 */
-		public final Builder scoreMode(@Nullable ScoreMode value) {
-			this.scoreMode = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RescoreQuery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RescoreQuery build() {
-			_checkSingleUse();
-
-			return new RescoreQuery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RescoreQuery}
-	 */
-	public static final JsonpDeserializer<RescoreQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RescoreQuery::setupRescoreQueryDeserializer);
-
-	protected static void setupRescoreQueryDeserializer(ObjectDeserializer<RescoreQuery.Builder> op) {
-
-		op.add(Builder::query, Query._DESERIALIZER, "rescore_query");
-		op.add(Builder::queryWeight, JsonpDeserializer.doubleDeserializer(), "query_weight");
-		op.add(Builder::rescoreQueryWeight, JsonpDeserializer.doubleDeserializer(), "rescore_query_weight");
-		op.add(Builder::scoreMode, ScoreMode._DESERIALIZER, "score_mode");
-
-	}
+    private final Query query;
+
+    @Nullable
+    private final Double queryWeight;
+
+    @Nullable
+    private final Double rescoreQueryWeight;
+
+    @Nullable
+    private final ScoreMode scoreMode;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RescoreQuery(Builder builder) {
+
+        this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+        this.queryWeight = builder.queryWeight;
+        this.rescoreQueryWeight = builder.rescoreQueryWeight;
+        this.scoreMode = builder.scoreMode;
+
+    }
+
+    public static RescoreQuery of(Function<Builder, ObjectBuilder<RescoreQuery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code rescore_query}
+     */
+    public final Query query() {
+        return this.query;
+    }
+
+    /**
+     * API name: {@code query_weight}
+     */
+    @Nullable
+    public final Double queryWeight() {
+        return this.queryWeight;
+    }
+
+    /**
+     * API name: {@code rescore_query_weight}
+     */
+    @Nullable
+    public final Double rescoreQueryWeight() {
+        return this.rescoreQueryWeight;
+    }
+
+    /**
+     * API name: {@code score_mode}
+     */
+    @Nullable
+    public final ScoreMode scoreMode() {
+        return this.scoreMode;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("rescore_query");
+        this.query.serialize(generator, mapper);
+
+        if (this.queryWeight != null) {
+            generator.writeKey("query_weight");
+            generator.write(this.queryWeight);
+
+        }
+        if (this.rescoreQueryWeight != null) {
+            generator.writeKey("rescore_query_weight");
+            generator.write(this.rescoreQueryWeight);
+
+        }
+        if (this.scoreMode != null) {
+            generator.writeKey("score_mode");
+            this.scoreMode.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RescoreQuery}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RescoreQuery> {
+        private Query query;
+
+        @Nullable
+        private Double queryWeight;
+
+        @Nullable
+        private Double rescoreQueryWeight;
+
+        @Nullable
+        private ScoreMode scoreMode;
+
+        /**
+         * Required - API name: {@code rescore_query}
+         */
+        public final Builder query(Query value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code rescore_query}
+         */
+        public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.query(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code query_weight}
+         */
+        public final Builder queryWeight(@Nullable Double value) {
+            this.queryWeight = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code rescore_query_weight}
+         */
+        public final Builder rescoreQueryWeight(@Nullable Double value) {
+            this.rescoreQueryWeight = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code score_mode}
+         */
+        public final Builder scoreMode(@Nullable ScoreMode value) {
+            this.scoreMode = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RescoreQuery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RescoreQuery build() {
+            _checkSingleUse();
+
+            return new RescoreQuery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RescoreQuery}
+     */
+    public static final JsonpDeserializer<RescoreQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RescoreQuery::setupRescoreQueryDeserializer
+    );
+
+    protected static void setupRescoreQueryDeserializer(ObjectDeserializer<RescoreQuery.Builder> op) {
+
+        op.add(Builder::query, Query._DESERIALIZER, "rescore_query");
+        op.add(Builder::queryWeight, JsonpDeserializer.doubleDeserializer(), "query_weight");
+        op.add(Builder::rescoreQueryWeight, JsonpDeserializer.doubleDeserializer(), "rescore_query_weight");
+        op.add(Builder::scoreMode, ScoreMode._DESERIALIZER, "score_mode");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/ScoreMode.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/ScoreMode.java
index 6017c76af9..c3163f148d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/ScoreMode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/ScoreMode.java
@@ -35,31 +35,29 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum ScoreMode implements JsonEnum {
-	Avg("avg"),
+    Avg("avg"),
 
-	Max("max"),
+    Max("max"),
 
-	Min("min"),
+    Min("min"),
 
-	Multiply("multiply"),
+    Multiply("multiply"),
 
-	Total("total"),
+    Total("total"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	ScoreMode(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    ScoreMode(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<ScoreMode> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			ScoreMode.values());
+    public static final JsonEnum.Deserializer<ScoreMode> _DESERIALIZER = new JsonEnum.Deserializer<>(ScoreMode.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SearchProfile.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SearchProfile.java
index f91cb73228..af3f8d4aa3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SearchProfile.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SearchProfile.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,198 +44,196 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: _global.search._types.SearchProfile
 
-
 @JsonpDeserializable
 public class SearchProfile implements JsonpSerializable {
-	private final List<Collector> collector;
+    private final List<Collector> collector;
 
-	private final List<QueryProfile> query;
-
-	private final long rewriteTime;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SearchProfile(Builder builder) {
-
-		this.collector = ApiTypeHelper.unmodifiableRequired(builder.collector, this, "collector");
-		this.query = ApiTypeHelper.unmodifiableRequired(builder.query, this, "query");
-		this.rewriteTime = ApiTypeHelper.requireNonNull(builder.rewriteTime, this, "rewriteTime");
-
-	}
-
-	public static SearchProfile of(Function<Builder, ObjectBuilder<SearchProfile>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code collector}
-	 */
-	public final List<Collector> collector() {
-		return this.collector;
-	}
-
-	/**
-	 * Required - API name: {@code query}
-	 */
-	public final List<QueryProfile> query() {
-		return this.query;
-	}
-
-	/**
-	 * Required - API name: {@code rewrite_time}
-	 */
-	public final long rewriteTime() {
-		return this.rewriteTime;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.collector)) {
-			generator.writeKey("collector");
-			generator.writeStartArray();
-			for (Collector item0 : this.collector) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.query)) {
-			generator.writeKey("query");
-			generator.writeStartArray();
-			for (QueryProfile item0 : this.query) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("rewrite_time");
-		generator.write(this.rewriteTime);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SearchProfile}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SearchProfile> {
-		private List<Collector> collector;
-
-		private List<QueryProfile> query;
-
-		private Long rewriteTime;
-
-		/**
-		 * Required - API name: {@code collector}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>collector</code>.
-		 */
-		public final Builder collector(List<Collector> list) {
-			this.collector = _listAddAll(this.collector, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code collector}
-		 * <p>
-		 * Adds one or more values to <code>collector</code>.
-		 */
-		public final Builder collector(Collector value, Collector... values) {
-			this.collector = _listAdd(this.collector, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code collector}
-		 * <p>
-		 * Adds a value to <code>collector</code> using a builder lambda.
-		 */
-		public final Builder collector(Function<Collector.Builder, ObjectBuilder<Collector>> fn) {
-			return collector(fn.apply(new Collector.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>query</code>.
-		 */
-		public final Builder query(List<QueryProfile> list) {
-			this.query = _listAddAll(this.query, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 * <p>
-		 * Adds one or more values to <code>query</code>.
-		 */
-		public final Builder query(QueryProfile value, QueryProfile... values) {
-			this.query = _listAdd(this.query, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query}
-		 * <p>
-		 * Adds a value to <code>query</code> using a builder lambda.
-		 */
-		public final Builder query(Function<QueryProfile.Builder, ObjectBuilder<QueryProfile>> fn) {
-			return query(fn.apply(new QueryProfile.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code rewrite_time}
-		 */
-		public final Builder rewriteTime(long value) {
-			this.rewriteTime = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SearchProfile}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SearchProfile build() {
-			_checkSingleUse();
-
-			return new SearchProfile(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SearchProfile}
-	 */
-	public static final JsonpDeserializer<SearchProfile> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SearchProfile::setupSearchProfileDeserializer);
-
-	protected static void setupSearchProfileDeserializer(ObjectDeserializer<SearchProfile.Builder> op) {
-
-		op.add(Builder::collector, JsonpDeserializer.arrayDeserializer(Collector._DESERIALIZER), "collector");
-		op.add(Builder::query, JsonpDeserializer.arrayDeserializer(QueryProfile._DESERIALIZER), "query");
-		op.add(Builder::rewriteTime, JsonpDeserializer.longDeserializer(), "rewrite_time");
-
-	}
+    private final List<QueryProfile> query;
+
+    private final long rewriteTime;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SearchProfile(Builder builder) {
+
+        this.collector = ApiTypeHelper.unmodifiableRequired(builder.collector, this, "collector");
+        this.query = ApiTypeHelper.unmodifiableRequired(builder.query, this, "query");
+        this.rewriteTime = ApiTypeHelper.requireNonNull(builder.rewriteTime, this, "rewriteTime");
+
+    }
+
+    public static SearchProfile of(Function<Builder, ObjectBuilder<SearchProfile>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code collector}
+     */
+    public final List<Collector> collector() {
+        return this.collector;
+    }
+
+    /**
+     * Required - API name: {@code query}
+     */
+    public final List<QueryProfile> query() {
+        return this.query;
+    }
+
+    /**
+     * Required - API name: {@code rewrite_time}
+     */
+    public final long rewriteTime() {
+        return this.rewriteTime;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.collector)) {
+            generator.writeKey("collector");
+            generator.writeStartArray();
+            for (Collector item0 : this.collector) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.query)) {
+            generator.writeKey("query");
+            generator.writeStartArray();
+            for (QueryProfile item0 : this.query) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("rewrite_time");
+        generator.write(this.rewriteTime);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SearchProfile}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SearchProfile> {
+        private List<Collector> collector;
+
+        private List<QueryProfile> query;
+
+        private Long rewriteTime;
+
+        /**
+         * Required - API name: {@code collector}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>collector</code>.
+         */
+        public final Builder collector(List<Collector> list) {
+            this.collector = _listAddAll(this.collector, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code collector}
+         * <p>
+         * Adds one or more values to <code>collector</code>.
+         */
+        public final Builder collector(Collector value, Collector... values) {
+            this.collector = _listAdd(this.collector, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code collector}
+         * <p>
+         * Adds a value to <code>collector</code> using a builder lambda.
+         */
+        public final Builder collector(Function<Collector.Builder, ObjectBuilder<Collector>> fn) {
+            return collector(fn.apply(new Collector.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code query}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>query</code>.
+         */
+        public final Builder query(List<QueryProfile> list) {
+            this.query = _listAddAll(this.query, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         * <p>
+         * Adds one or more values to <code>query</code>.
+         */
+        public final Builder query(QueryProfile value, QueryProfile... values) {
+            this.query = _listAdd(this.query, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query}
+         * <p>
+         * Adds a value to <code>query</code> using a builder lambda.
+         */
+        public final Builder query(Function<QueryProfile.Builder, ObjectBuilder<QueryProfile>> fn) {
+            return query(fn.apply(new QueryProfile.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code rewrite_time}
+         */
+        public final Builder rewriteTime(long value) {
+            this.rewriteTime = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link SearchProfile}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SearchProfile build() {
+            _checkSingleUse();
+
+            return new SearchProfile(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SearchProfile}
+     */
+    public static final JsonpDeserializer<SearchProfile> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SearchProfile::setupSearchProfileDeserializer
+    );
+
+    protected static void setupSearchProfileDeserializer(ObjectDeserializer<SearchProfile.Builder> op) {
+
+        op.add(Builder::collector, JsonpDeserializer.arrayDeserializer(Collector._DESERIALIZER), "collector");
+        op.add(Builder::query, JsonpDeserializer.arrayDeserializer(QueryProfile._DESERIALIZER), "query");
+        op.add(Builder::rewriteTime, JsonpDeserializer.longDeserializer(), "rewrite_time");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SearchResult.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SearchResult.java
index 7d3d084dd9..9932ed817e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SearchResult.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SearchResult.java
@@ -12,609 +12,604 @@
  */
 package org.opensearch.client.opensearch.core.search;
 
-import org.opensearch.client.opensearch._types.ClusterStatistics;
-import org.opensearch.client.opensearch._types.ShardStatistics;
-import org.opensearch.client.opensearch._types.aggregations.Aggregate;
-import org.opensearch.client.opensearch.core.search.HitsMetadata;
-import org.opensearch.client.opensearch.core.search.Profile;
-import org.opensearch.client.opensearch.core.search.Suggest;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.ExternallyTaggedUnion;
 import org.opensearch.client.json.JsonData;
-import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.JsonpSerializer;
 import org.opensearch.client.json.JsonpUtils;
-import org.opensearch.client.json.NamedDeserializer;
-import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ClusterStatistics;
+import org.opensearch.client.opensearch._types.ShardStatistics;
+import org.opensearch.client.opensearch._types.aggregations.Aggregate;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import javax.annotation.Nullable;
 
 //typedef: _global.search.SearchResult
 
 public abstract class SearchResult<TDocument> implements JsonpSerializable {
 
-	private final long took;
+    private final long took;
 
-	private final boolean timedOut;
+    private final boolean timedOut;
 
-	private final ShardStatistics shards;
+    private final ShardStatistics shards;
 
-	private final HitsMetadata<TDocument> hits;
+    private final HitsMetadata<TDocument> hits;
 
-	private final Map<String, Aggregate> aggregations;
+    private final Map<String, Aggregate> aggregations;
 
-	@Nullable
-	private final ClusterStatistics clusters;
+    @Nullable
+    private final ClusterStatistics clusters;
 
-	private final List<TDocument> documents;
-
-	private final Map<String, JsonData> fields;
-
-	@Nullable
-	private final Double maxScore;
-
-	@Nullable
-	private final Long numReducePhases;
-
-	@Nullable
-	private final Profile profile;
-
-	@Nullable
-	private final String pitId;
-
-	@Nullable
-	private final String scrollId;
-
-	private final Map<String, List<Suggest<TDocument>>> suggest;
-
-	@Nullable
-	private final Boolean terminatedEarly;
-
-	@Nullable
-	private final JsonpSerializer<TDocument> tDocumentSerializer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected SearchResult(AbstractBuilder<TDocument, ?> builder) {
-
-		this.took = ApiTypeHelper.requireNonNull(builder.took, this, "took");
-		this.timedOut = ApiTypeHelper.requireNonNull(builder.timedOut, this, "timedOut");
-		this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
-		this.hits = ApiTypeHelper.requireNonNull(builder.hits, this, "hits");
-		this.aggregations = ApiTypeHelper.unmodifiable(builder.aggregations);
-		this.clusters = builder.clusters;
-		this.documents = ApiTypeHelper.unmodifiable(builder.documents);
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-		this.maxScore = builder.maxScore;
-		this.numReducePhases = builder.numReducePhases;
-		this.profile = builder.profile;
-		this.pitId = builder.pitId;
-		this.scrollId = builder.scrollId;
-		this.suggest = ApiTypeHelper.unmodifiable(builder.suggest);
-		this.terminatedEarly = builder.terminatedEarly;
-		this.tDocumentSerializer = builder.tDocumentSerializer;
-
-	}
-
-	/**
-	 * Required - API name: {@code took}
-	 */
-	public final long took() {
-		return this.took;
-	}
-
-	/**
-	 * Required - API name: {@code timed_out}
-	 */
-	public final boolean timedOut() {
-		return this.timedOut;
-	}
-
-	/**
-	 * Required - API name: {@code _shards}
-	 */
-	public final ShardStatistics shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Required - API name: {@code hits}
-	 */
-	public final HitsMetadata<TDocument> hits() {
-		return this.hits;
-	}
-
-	/**
-	 * API name: {@code aggregations}
-	 */
-	public final Map<String, Aggregate> aggregations() {
-		return this.aggregations;
-	}
-
-	/**
-	 * API name: {@code _clusters}
-	 */
-	@Nullable
-	public final ClusterStatistics clusters() {
-		return this.clusters;
-	}
-
-	/**
-	 * API name: {@code documents}
-	 */
-	public final List<TDocument> documents() {
-		return this.documents;
-	}
-
-	/**
-	 * API name: {@code fields}
-	 */
-	public final Map<String, JsonData> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * API name: {@code max_score}
-	 */
-	@Nullable
-	public final Double maxScore() {
-		return this.maxScore;
-	}
-
-	/**
-	 * API name: {@code num_reduce_phases}
-	 */
-	@Nullable
-	public final Long numReducePhases() {
-		return this.numReducePhases;
-	}
-
-	/**
-	 * API name: {@code profile}
-	 */
-	@Nullable
-	public final Profile profile() {
-		return this.profile;
-	}
-
-	/**
-	 * API name: {@code pit_id}
-	 */
-	@Nullable
-	public final String pitId() {
-		return this.pitId;
-	}
-
-	/**
-	 * API name: {@code _scroll_id}
-	 */
-	@Nullable
-	public final String scrollId() {
-		return this.scrollId;
-	}
-
-	/**
-	 * API name: {@code suggest}
-	 */
-	public final Map<String, List<Suggest<TDocument>>> suggest() {
-		return this.suggest;
-	}
-
-	/**
-	 * API name: {@code terminated_early}
-	 */
-	@Nullable
-	public final Boolean terminatedEarly() {
-		return this.terminatedEarly;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("took");
-		generator.write(this.took);
-
-		generator.writeKey("timed_out");
-		generator.write(this.timedOut);
-
-		generator.writeKey("_shards");
-		this.shards.serialize(generator, mapper);
-
-		generator.writeKey("hits");
-		this.hits.serialize(generator, mapper);
-
-		if (ApiTypeHelper.isDefined(this.aggregations)) {
-			generator.writeKey("aggregations");
-			ExternallyTaggedUnion.serializeTypedKeys(this.aggregations, generator, mapper);
-
-		}
-		if (this.clusters != null) {
-			generator.writeKey("_clusters");
-			this.clusters.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.documents)) {
-			generator.writeKey("documents");
-			generator.writeStartArray();
-			for (TDocument item0 : this.documents) {
-				JsonpUtils.serialize(item0, generator, tDocumentSerializer, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.fields)) {
-			generator.writeKey("fields");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.fields.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.maxScore != null) {
-			generator.writeKey("max_score");
-			generator.write(this.maxScore);
-
-		}
-		if (this.numReducePhases != null) {
-			generator.writeKey("num_reduce_phases");
-			generator.write(this.numReducePhases);
-
-		}
-		if (this.profile != null) {
-			generator.writeKey("profile");
-			this.profile.serialize(generator, mapper);
-
-		}
-		if (this.pitId != null) {
-			generator.writeKey("pit_id");
-			generator.write(this.pitId);
-
-		}
-		if (this.scrollId != null) {
-			generator.writeKey("_scroll_id");
-			generator.write(this.scrollId);
-
-		}
-		if (ApiTypeHelper.isDefined(this.suggest)) {
-			generator.writeKey("suggest");
-			generator.writeStartObject();
-			for (Map.Entry<String, List<Suggest<TDocument>>> item0 : this.suggest.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.writeStartArray();
-				if (item0.getValue() != null) {
-					for (Suggest<TDocument> item1 : item0.getValue()) {
-						item1.serialize(generator, mapper);
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.terminatedEarly != null) {
-			generator.writeKey("terminated_early");
-			generator.write(this.terminatedEarly);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected abstract static class AbstractBuilder<TDocument, BuilderT extends AbstractBuilder<TDocument, BuilderT>>
-			extends
-				ObjectBuilderBase {
-		private Long took;
-
-		private Boolean timedOut;
-
-		private ShardStatistics shards;
-
-		private HitsMetadata<TDocument> hits;
-
-		@Nullable
-		private Map<String, Aggregate> aggregations;
-
-		@Nullable
-		private ClusterStatistics clusters;
-
-		@Nullable
-		private List<TDocument> documents;
-
-		@Nullable
-		private Map<String, JsonData> fields;
-
-		@Nullable
-		private Double maxScore;
-
-		@Nullable
-		private Long numReducePhases;
-
-		@Nullable
-		private Profile profile;
-
-		@Nullable
-		private String pitId;
-
-		@Nullable
-		private String scrollId;
-
-		@Nullable
-		private Map<String, List<Suggest<TDocument>>> suggest;
-
-		@Nullable
-		private Boolean terminatedEarly;
-
-		@Nullable
-		private JsonpSerializer<TDocument> tDocumentSerializer;
-
-		/**
-		 * Required - API name: {@code took}
-		 */
-		public final BuilderT took(long value) {
-			this.took = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code timed_out}
-		 */
-		public final BuilderT timedOut(boolean value) {
-			this.timedOut = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code _shards}
-		 */
-		public final BuilderT shards(ShardStatistics value) {
-			this.shards = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code _shards}
-		 */
-		public final BuilderT shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
-			return this.shards(fn.apply(new ShardStatistics.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code hits}
-		 */
-		public final BuilderT hits(HitsMetadata<TDocument> value) {
-			this.hits = value;
-			return self();
-		}
-
-		/**
-		 * Required - API name: {@code hits}
-		 */
-		public final BuilderT hits(
-				Function<HitsMetadata.Builder<TDocument>, ObjectBuilder<HitsMetadata<TDocument>>> fn) {
-			return this.hits(fn.apply(new HitsMetadata.Builder<TDocument>()).build());
-		}
-
-		/**
-		 * API name: {@code aggregations}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aggregations</code>.
-		 */
-		public final BuilderT aggregations(Map<String, Aggregate> map) {
-			this.aggregations = _mapPutAll(this.aggregations, map);
-			return self();
-		}
-
-		/**
-		 * API name: {@code aggregations}
-		 * <p>
-		 * Adds an entry to <code>aggregations</code>.
-		 */
-		public final BuilderT aggregations(String key, Aggregate value) {
-			this.aggregations = _mapPut(this.aggregations, key, value);
-			return self();
-		}
-
-		/**
-		 * API name: {@code aggregations}
-		 * <p>
-		 * Adds an entry to <code>aggregations</code> using a builder lambda.
-		 */
-		public final BuilderT aggregations(String key, Function<Aggregate.Builder, ObjectBuilder<Aggregate>> fn) {
-			return aggregations(key, fn.apply(new Aggregate.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code _clusters}
-		 */
-		public final BuilderT clusters(@Nullable ClusterStatistics value) {
-			this.clusters = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code _clusters}
-		 */
-		public final BuilderT clusters(Function<ClusterStatistics.Builder, ObjectBuilder<ClusterStatistics>> fn) {
-			return this.clusters(fn.apply(new ClusterStatistics.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code documents}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>documents</code>.
-		 */
-		public final BuilderT documents(List<TDocument> list) {
-			this.documents = _listAddAll(this.documents, list);
-			return self();
-		}
-
-		/**
-		 * API name: {@code documents}
-		 * <p>
-		 * Adds one or more values to <code>documents</code>.
-		 */
-		public final BuilderT documents(TDocument value, TDocument... values) {
-			this.documents = _listAdd(this.documents, value, values);
-			return self();
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>fields</code>.
-		 */
-		public final BuilderT fields(Map<String, JsonData> map) {
-			this.fields = _mapPutAll(this.fields, map);
-			return self();
-		}
-
-		/**
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds an entry to <code>fields</code>.
-		 */
-		public final BuilderT fields(String key, JsonData value) {
-			this.fields = _mapPut(this.fields, key, value);
-			return self();
-		}
-
-		/**
-		 * API name: {@code max_score}
-		 */
-		public final BuilderT maxScore(@Nullable Double value) {
-			this.maxScore = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code num_reduce_phases}
-		 */
-		public final BuilderT numReducePhases(@Nullable Long value) {
-			this.numReducePhases = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code profile}
-		 */
-		public final BuilderT profile(@Nullable Profile value) {
-			this.profile = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code profile}
-		 */
-		public final BuilderT profile(Function<Profile.Builder, ObjectBuilder<Profile>> fn) {
-			return this.profile(fn.apply(new Profile.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code pit_id}
-		 */
-		public final BuilderT pitId(@Nullable String value) {
-			this.pitId = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code _scroll_id}
-		 */
-		public final BuilderT scrollId(@Nullable String value) {
-			this.scrollId = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code suggest}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>suggest</code>.
-		 */
-		public final BuilderT suggest(Map<String, List<Suggest<TDocument>>> map) {
-			this.suggest = _mapPutAll(this.suggest, map);
-			return self();
-		}
-
-		/**
-		 * API name: {@code suggest}
-		 * <p>
-		 * Adds an entry to <code>suggest</code>.
-		 */
-		public final BuilderT suggest(String key, List<Suggest<TDocument>> value) {
-			this.suggest = _mapPut(this.suggest, key, value);
-			return self();
-		}
-
-		/**
-		 * API name: {@code terminated_early}
-		 */
-		public final BuilderT terminatedEarly(@Nullable Boolean value) {
-			this.terminatedEarly = value;
-			return self();
-		}
-
-		/**
-		 * Serializer for TDocument. If not set, an attempt will be made to find a
-		 * serializer from the JSON context.
-		 */
-		public final BuilderT tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
-			this.tDocumentSerializer = value;
-			return self();
-		}
-
-		protected abstract BuilderT self();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected static <TDocument, BuilderT extends AbstractBuilder<TDocument, BuilderT>> void setupSearchResultDeserializer(
-			ObjectDeserializer<BuilderT> op, JsonpDeserializer<TDocument> tDocumentDeserializer) {
-
-		op.add(AbstractBuilder::took, JsonpDeserializer.longDeserializer(), "took");
-		op.add(AbstractBuilder::timedOut, JsonpDeserializer.booleanDeserializer(), "timed_out");
-		op.add(AbstractBuilder::shards, ShardStatistics._DESERIALIZER, "_shards");
-		op.add(AbstractBuilder::hits, HitsMetadata.createHitsMetadataDeserializer(tDocumentDeserializer), "hits");
-		op.add(AbstractBuilder::aggregations, Aggregate._TYPED_KEYS_DESERIALIZER, "aggregations");
-		op.add(AbstractBuilder::clusters, ClusterStatistics._DESERIALIZER, "_clusters");
-		op.add(AbstractBuilder::documents, JsonpDeserializer.arrayDeserializer(tDocumentDeserializer), "documents");
-		op.add(AbstractBuilder::fields, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "fields");
-		op.add(AbstractBuilder::maxScore, JsonpDeserializer.doubleDeserializer(), "max_score");
-		op.add(AbstractBuilder::numReducePhases, JsonpDeserializer.longDeserializer(), "num_reduce_phases");
-		op.add(AbstractBuilder::profile, Profile._DESERIALIZER, "profile");
-		op.add(AbstractBuilder::pitId, JsonpDeserializer.stringDeserializer(), "pit_id");
-		op.add(AbstractBuilder::scrollId, JsonpDeserializer.stringDeserializer(), "_scroll_id");
-		op.add(AbstractBuilder::suggest, ExternallyTaggedUnion.<Suggest<TDocument>>arrayDeserializer(
-				Suggest.createSuggestDeserializer(tDocumentDeserializer)), "suggest");
-		;
-		op.add(AbstractBuilder::terminatedEarly, JsonpDeserializer.booleanDeserializer(), "terminated_early");
-
-	}
+    private final List<TDocument> documents;
+
+    private final Map<String, JsonData> fields;
+
+    @Nullable
+    private final Double maxScore;
+
+    @Nullable
+    private final Long numReducePhases;
+
+    @Nullable
+    private final Profile profile;
+
+    @Nullable
+    private final String pitId;
+
+    @Nullable
+    private final String scrollId;
+
+    private final Map<String, List<Suggest<TDocument>>> suggest;
+
+    @Nullable
+    private final Boolean terminatedEarly;
+
+    @Nullable
+    private final JsonpSerializer<TDocument> tDocumentSerializer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected SearchResult(AbstractBuilder<TDocument, ?> builder) {
+
+        this.took = ApiTypeHelper.requireNonNull(builder.took, this, "took");
+        this.timedOut = ApiTypeHelper.requireNonNull(builder.timedOut, this, "timedOut");
+        this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
+        this.hits = ApiTypeHelper.requireNonNull(builder.hits, this, "hits");
+        this.aggregations = ApiTypeHelper.unmodifiable(builder.aggregations);
+        this.clusters = builder.clusters;
+        this.documents = ApiTypeHelper.unmodifiable(builder.documents);
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.maxScore = builder.maxScore;
+        this.numReducePhases = builder.numReducePhases;
+        this.profile = builder.profile;
+        this.pitId = builder.pitId;
+        this.scrollId = builder.scrollId;
+        this.suggest = ApiTypeHelper.unmodifiable(builder.suggest);
+        this.terminatedEarly = builder.terminatedEarly;
+        this.tDocumentSerializer = builder.tDocumentSerializer;
+
+    }
+
+    /**
+     * Required - API name: {@code took}
+     */
+    public final long took() {
+        return this.took;
+    }
+
+    /**
+     * Required - API name: {@code timed_out}
+     */
+    public final boolean timedOut() {
+        return this.timedOut;
+    }
+
+    /**
+     * Required - API name: {@code _shards}
+     */
+    public final ShardStatistics shards() {
+        return this.shards;
+    }
+
+    /**
+     * Required - API name: {@code hits}
+     */
+    public final HitsMetadata<TDocument> hits() {
+        return this.hits;
+    }
+
+    /**
+     * API name: {@code aggregations}
+     */
+    public final Map<String, Aggregate> aggregations() {
+        return this.aggregations;
+    }
+
+    /**
+     * API name: {@code _clusters}
+     */
+    @Nullable
+    public final ClusterStatistics clusters() {
+        return this.clusters;
+    }
+
+    /**
+     * API name: {@code documents}
+     */
+    public final List<TDocument> documents() {
+        return this.documents;
+    }
+
+    /**
+     * API name: {@code fields}
+     */
+    public final Map<String, JsonData> fields() {
+        return this.fields;
+    }
+
+    /**
+     * API name: {@code max_score}
+     */
+    @Nullable
+    public final Double maxScore() {
+        return this.maxScore;
+    }
+
+    /**
+     * API name: {@code num_reduce_phases}
+     */
+    @Nullable
+    public final Long numReducePhases() {
+        return this.numReducePhases;
+    }
+
+    /**
+     * API name: {@code profile}
+     */
+    @Nullable
+    public final Profile profile() {
+        return this.profile;
+    }
+
+    /**
+     * API name: {@code pit_id}
+     */
+    @Nullable
+    public final String pitId() {
+        return this.pitId;
+    }
+
+    /**
+     * API name: {@code _scroll_id}
+     */
+    @Nullable
+    public final String scrollId() {
+        return this.scrollId;
+    }
+
+    /**
+     * API name: {@code suggest}
+     */
+    public final Map<String, List<Suggest<TDocument>>> suggest() {
+        return this.suggest;
+    }
+
+    /**
+     * API name: {@code terminated_early}
+     */
+    @Nullable
+    public final Boolean terminatedEarly() {
+        return this.terminatedEarly;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("took");
+        generator.write(this.took);
+
+        generator.writeKey("timed_out");
+        generator.write(this.timedOut);
+
+        generator.writeKey("_shards");
+        this.shards.serialize(generator, mapper);
+
+        generator.writeKey("hits");
+        this.hits.serialize(generator, mapper);
+
+        if (ApiTypeHelper.isDefined(this.aggregations)) {
+            generator.writeKey("aggregations");
+            ExternallyTaggedUnion.serializeTypedKeys(this.aggregations, generator, mapper);
+
+        }
+        if (this.clusters != null) {
+            generator.writeKey("_clusters");
+            this.clusters.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.documents)) {
+            generator.writeKey("documents");
+            generator.writeStartArray();
+            for (TDocument item0 : this.documents) {
+                JsonpUtils.serialize(item0, generator, tDocumentSerializer, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.fields)) {
+            generator.writeKey("fields");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.fields.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.maxScore != null) {
+            generator.writeKey("max_score");
+            generator.write(this.maxScore);
+
+        }
+        if (this.numReducePhases != null) {
+            generator.writeKey("num_reduce_phases");
+            generator.write(this.numReducePhases);
+
+        }
+        if (this.profile != null) {
+            generator.writeKey("profile");
+            this.profile.serialize(generator, mapper);
+
+        }
+        if (this.pitId != null) {
+            generator.writeKey("pit_id");
+            generator.write(this.pitId);
+
+        }
+        if (this.scrollId != null) {
+            generator.writeKey("_scroll_id");
+            generator.write(this.scrollId);
+
+        }
+        if (ApiTypeHelper.isDefined(this.suggest)) {
+            generator.writeKey("suggest");
+            generator.writeStartObject();
+            for (Map.Entry<String, List<Suggest<TDocument>>> item0 : this.suggest.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.writeStartArray();
+                if (item0.getValue() != null) {
+                    for (Suggest<TDocument> item1 : item0.getValue()) {
+                        item1.serialize(generator, mapper);
+
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.terminatedEarly != null) {
+            generator.writeKey("terminated_early");
+            generator.write(this.terminatedEarly);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected abstract static class AbstractBuilder<TDocument, BuilderT extends AbstractBuilder<TDocument, BuilderT>> extends
+        ObjectBuilderBase {
+        private Long took;
+
+        private Boolean timedOut;
+
+        private ShardStatistics shards;
+
+        private HitsMetadata<TDocument> hits;
+
+        @Nullable
+        private Map<String, Aggregate> aggregations;
+
+        @Nullable
+        private ClusterStatistics clusters;
+
+        @Nullable
+        private List<TDocument> documents;
+
+        @Nullable
+        private Map<String, JsonData> fields;
+
+        @Nullable
+        private Double maxScore;
+
+        @Nullable
+        private Long numReducePhases;
+
+        @Nullable
+        private Profile profile;
+
+        @Nullable
+        private String pitId;
+
+        @Nullable
+        private String scrollId;
+
+        @Nullable
+        private Map<String, List<Suggest<TDocument>>> suggest;
+
+        @Nullable
+        private Boolean terminatedEarly;
+
+        @Nullable
+        private JsonpSerializer<TDocument> tDocumentSerializer;
+
+        /**
+         * Required - API name: {@code took}
+         */
+        public final BuilderT took(long value) {
+            this.took = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code timed_out}
+         */
+        public final BuilderT timedOut(boolean value) {
+            this.timedOut = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code _shards}
+         */
+        public final BuilderT shards(ShardStatistics value) {
+            this.shards = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code _shards}
+         */
+        public final BuilderT shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
+            return this.shards(fn.apply(new ShardStatistics.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code hits}
+         */
+        public final BuilderT hits(HitsMetadata<TDocument> value) {
+            this.hits = value;
+            return self();
+        }
+
+        /**
+         * Required - API name: {@code hits}
+         */
+        public final BuilderT hits(Function<HitsMetadata.Builder<TDocument>, ObjectBuilder<HitsMetadata<TDocument>>> fn) {
+            return this.hits(fn.apply(new HitsMetadata.Builder<TDocument>()).build());
+        }
+
+        /**
+         * API name: {@code aggregations}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aggregations</code>.
+         */
+        public final BuilderT aggregations(Map<String, Aggregate> map) {
+            this.aggregations = _mapPutAll(this.aggregations, map);
+            return self();
+        }
+
+        /**
+         * API name: {@code aggregations}
+         * <p>
+         * Adds an entry to <code>aggregations</code>.
+         */
+        public final BuilderT aggregations(String key, Aggregate value) {
+            this.aggregations = _mapPut(this.aggregations, key, value);
+            return self();
+        }
+
+        /**
+         * API name: {@code aggregations}
+         * <p>
+         * Adds an entry to <code>aggregations</code> using a builder lambda.
+         */
+        public final BuilderT aggregations(String key, Function<Aggregate.Builder, ObjectBuilder<Aggregate>> fn) {
+            return aggregations(key, fn.apply(new Aggregate.Builder()).build());
+        }
+
+        /**
+         * API name: {@code _clusters}
+         */
+        public final BuilderT clusters(@Nullable ClusterStatistics value) {
+            this.clusters = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code _clusters}
+         */
+        public final BuilderT clusters(Function<ClusterStatistics.Builder, ObjectBuilder<ClusterStatistics>> fn) {
+            return this.clusters(fn.apply(new ClusterStatistics.Builder()).build());
+        }
+
+        /**
+         * API name: {@code documents}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>documents</code>.
+         */
+        public final BuilderT documents(List<TDocument> list) {
+            this.documents = _listAddAll(this.documents, list);
+            return self();
+        }
+
+        /**
+         * API name: {@code documents}
+         * <p>
+         * Adds one or more values to <code>documents</code>.
+         */
+        public final BuilderT documents(TDocument value, TDocument... values) {
+            this.documents = _listAdd(this.documents, value, values);
+            return self();
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>fields</code>.
+         */
+        public final BuilderT fields(Map<String, JsonData> map) {
+            this.fields = _mapPutAll(this.fields, map);
+            return self();
+        }
+
+        /**
+         * API name: {@code fields}
+         * <p>
+         * Adds an entry to <code>fields</code>.
+         */
+        public final BuilderT fields(String key, JsonData value) {
+            this.fields = _mapPut(this.fields, key, value);
+            return self();
+        }
+
+        /**
+         * API name: {@code max_score}
+         */
+        public final BuilderT maxScore(@Nullable Double value) {
+            this.maxScore = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code num_reduce_phases}
+         */
+        public final BuilderT numReducePhases(@Nullable Long value) {
+            this.numReducePhases = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code profile}
+         */
+        public final BuilderT profile(@Nullable Profile value) {
+            this.profile = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code profile}
+         */
+        public final BuilderT profile(Function<Profile.Builder, ObjectBuilder<Profile>> fn) {
+            return this.profile(fn.apply(new Profile.Builder()).build());
+        }
+
+        /**
+         * API name: {@code pit_id}
+         */
+        public final BuilderT pitId(@Nullable String value) {
+            this.pitId = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code _scroll_id}
+         */
+        public final BuilderT scrollId(@Nullable String value) {
+            this.scrollId = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code suggest}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>suggest</code>.
+         */
+        public final BuilderT suggest(Map<String, List<Suggest<TDocument>>> map) {
+            this.suggest = _mapPutAll(this.suggest, map);
+            return self();
+        }
+
+        /**
+         * API name: {@code suggest}
+         * <p>
+         * Adds an entry to <code>suggest</code>.
+         */
+        public final BuilderT suggest(String key, List<Suggest<TDocument>> value) {
+            this.suggest = _mapPut(this.suggest, key, value);
+            return self();
+        }
+
+        /**
+         * API name: {@code terminated_early}
+         */
+        public final BuilderT terminatedEarly(@Nullable Boolean value) {
+            this.terminatedEarly = value;
+            return self();
+        }
+
+        /**
+         * Serializer for TDocument. If not set, an attempt will be made to find a
+         * serializer from the JSON context.
+         */
+        public final BuilderT tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) {
+            this.tDocumentSerializer = value;
+            return self();
+        }
+
+        protected abstract BuilderT self();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected static <TDocument, BuilderT extends AbstractBuilder<TDocument, BuilderT>> void setupSearchResultDeserializer(
+        ObjectDeserializer<BuilderT> op,
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+
+        op.add(AbstractBuilder::took, JsonpDeserializer.longDeserializer(), "took");
+        op.add(AbstractBuilder::timedOut, JsonpDeserializer.booleanDeserializer(), "timed_out");
+        op.add(AbstractBuilder::shards, ShardStatistics._DESERIALIZER, "_shards");
+        op.add(AbstractBuilder::hits, HitsMetadata.createHitsMetadataDeserializer(tDocumentDeserializer), "hits");
+        op.add(AbstractBuilder::aggregations, Aggregate._TYPED_KEYS_DESERIALIZER, "aggregations");
+        op.add(AbstractBuilder::clusters, ClusterStatistics._DESERIALIZER, "_clusters");
+        op.add(AbstractBuilder::documents, JsonpDeserializer.arrayDeserializer(tDocumentDeserializer), "documents");
+        op.add(AbstractBuilder::fields, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "fields");
+        op.add(AbstractBuilder::maxScore, JsonpDeserializer.doubleDeserializer(), "max_score");
+        op.add(AbstractBuilder::numReducePhases, JsonpDeserializer.longDeserializer(), "num_reduce_phases");
+        op.add(AbstractBuilder::profile, Profile._DESERIALIZER, "profile");
+        op.add(AbstractBuilder::pitId, JsonpDeserializer.stringDeserializer(), "pit_id");
+        op.add(AbstractBuilder::scrollId, JsonpDeserializer.stringDeserializer(), "_scroll_id");
+        op.add(
+            AbstractBuilder::suggest,
+            ExternallyTaggedUnion.<Suggest<TDocument>>arrayDeserializer(Suggest.createSuggestDeserializer(tDocumentDeserializer)),
+            "suggest"
+        );
+        ;
+        op.add(AbstractBuilder::terminatedEarly, JsonpDeserializer.booleanDeserializer(), "terminated_early");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/ShardProfile.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/ShardProfile.java
index c3f864b91e..9d369cef60 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/ShardProfile.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/ShardProfile.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,237 +45,233 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.ShardProfile
 
-
 @JsonpDeserializable
 public class ShardProfile implements JsonpSerializable {
-	private final List<AggregationProfile> aggregations;
+    private final List<AggregationProfile> aggregations;
 
-	private final String id;
+    private final String id;
 
-	private final List<SearchProfile> searches;
+    private final List<SearchProfile> searches;
 
-	@Nullable
-	private final FetchProfile fetch;
+    @Nullable
+    private final FetchProfile fetch;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ShardProfile(Builder builder) {
+    private ShardProfile(Builder builder) {
 
-		this.aggregations = ApiTypeHelper.unmodifiableRequired(builder.aggregations, this, "aggregations");
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.searches = ApiTypeHelper.unmodifiableRequired(builder.searches, this, "searches");
-		this.fetch = builder.fetch;
+        this.aggregations = ApiTypeHelper.unmodifiableRequired(builder.aggregations, this, "aggregations");
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.searches = ApiTypeHelper.unmodifiableRequired(builder.searches, this, "searches");
+        this.fetch = builder.fetch;
 
-	}
-
-	public static ShardProfile of(Function<Builder, ObjectBuilder<ShardProfile>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code aggregations}
-	 */
-	public final List<AggregationProfile> aggregations() {
-		return this.aggregations;
-	}
-
-	/**
-	 * Required - API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - API name: {@code searches}
-	 */
-	public final List<SearchProfile> searches() {
-		return this.searches;
-	}
-
-	/**
-	 * API name: {@code fetch}
-	 */
-	@Nullable
-	public final FetchProfile fetch() {
-		return this.fetch;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.aggregations)) {
-			generator.writeKey("aggregations");
-			generator.writeStartArray();
-			for (AggregationProfile item0 : this.aggregations) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("id");
-		generator.write(this.id);
-
-		if (ApiTypeHelper.isDefined(this.searches)) {
-			generator.writeKey("searches");
-			generator.writeStartArray();
-			for (SearchProfile item0 : this.searches) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.fetch != null) {
-			generator.writeKey("fetch");
-			this.fetch.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardProfile}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardProfile> {
-		private List<AggregationProfile> aggregations;
-
-		private String id;
-
-		private List<SearchProfile> searches;
-
-		@Nullable
-		private FetchProfile fetch;
-
-		/**
-		 * Required - API name: {@code aggregations}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>aggregations</code>.
-		 */
-		public final Builder aggregations(List<AggregationProfile> list) {
-			this.aggregations = _listAddAll(this.aggregations, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code aggregations}
-		 * <p>
-		 * Adds one or more values to <code>aggregations</code>.
-		 */
-		public final Builder aggregations(AggregationProfile value, AggregationProfile... values) {
-			this.aggregations = _listAdd(this.aggregations, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code aggregations}
-		 * <p>
-		 * Adds a value to <code>aggregations</code> using a builder lambda.
-		 */
-		public final Builder aggregations(Function<AggregationProfile.Builder, ObjectBuilder<AggregationProfile>> fn) {
-			return aggregations(fn.apply(new AggregationProfile.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code searches}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>searches</code>.
-		 */
-		public final Builder searches(List<SearchProfile> list) {
-			this.searches = _listAddAll(this.searches, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code searches}
-		 * <p>
-		 * Adds one or more values to <code>searches</code>.
-		 */
-		public final Builder searches(SearchProfile value, SearchProfile... values) {
-			this.searches = _listAdd(this.searches, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code searches}
-		 * <p>
-		 * Adds a value to <code>searches</code> using a builder lambda.
-		 */
-		public final Builder searches(Function<SearchProfile.Builder, ObjectBuilder<SearchProfile>> fn) {
-			return searches(fn.apply(new SearchProfile.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code fetch}
-		 */
-		public final Builder fetch(@Nullable FetchProfile value) {
-			this.fetch = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fetch}
-		 */
-		public final Builder fetch(Function<FetchProfile.Builder, ObjectBuilder<FetchProfile>> fn) {
-			return this.fetch(fn.apply(new FetchProfile.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ShardProfile}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardProfile build() {
-			_checkSingleUse();
-
-			return new ShardProfile(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardProfile}
-	 */
-	public static final JsonpDeserializer<ShardProfile> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShardProfile::setupShardProfileDeserializer);
-
-	protected static void setupShardProfileDeserializer(ObjectDeserializer<ShardProfile.Builder> op) {
-
-		op.add(Builder::aggregations, JsonpDeserializer.arrayDeserializer(AggregationProfile._DESERIALIZER),
-				"aggregations");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::searches, JsonpDeserializer.arrayDeserializer(SearchProfile._DESERIALIZER), "searches");
-		op.add(Builder::fetch, FetchProfile._DESERIALIZER, "fetch");
-
-	}
+    }
+
+    public static ShardProfile of(Function<Builder, ObjectBuilder<ShardProfile>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code aggregations}
+     */
+    public final List<AggregationProfile> aggregations() {
+        return this.aggregations;
+    }
+
+    /**
+     * Required - API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - API name: {@code searches}
+     */
+    public final List<SearchProfile> searches() {
+        return this.searches;
+    }
+
+    /**
+     * API name: {@code fetch}
+     */
+    @Nullable
+    public final FetchProfile fetch() {
+        return this.fetch;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.aggregations)) {
+            generator.writeKey("aggregations");
+            generator.writeStartArray();
+            for (AggregationProfile item0 : this.aggregations) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("id");
+        generator.write(this.id);
+
+        if (ApiTypeHelper.isDefined(this.searches)) {
+            generator.writeKey("searches");
+            generator.writeStartArray();
+            for (SearchProfile item0 : this.searches) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.fetch != null) {
+            generator.writeKey("fetch");
+            this.fetch.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardProfile}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardProfile> {
+        private List<AggregationProfile> aggregations;
+
+        private String id;
+
+        private List<SearchProfile> searches;
+
+        @Nullable
+        private FetchProfile fetch;
+
+        /**
+         * Required - API name: {@code aggregations}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>aggregations</code>.
+         */
+        public final Builder aggregations(List<AggregationProfile> list) {
+            this.aggregations = _listAddAll(this.aggregations, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code aggregations}
+         * <p>
+         * Adds one or more values to <code>aggregations</code>.
+         */
+        public final Builder aggregations(AggregationProfile value, AggregationProfile... values) {
+            this.aggregations = _listAdd(this.aggregations, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code aggregations}
+         * <p>
+         * Adds a value to <code>aggregations</code> using a builder lambda.
+         */
+        public final Builder aggregations(Function<AggregationProfile.Builder, ObjectBuilder<AggregationProfile>> fn) {
+            return aggregations(fn.apply(new AggregationProfile.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code searches}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>searches</code>.
+         */
+        public final Builder searches(List<SearchProfile> list) {
+            this.searches = _listAddAll(this.searches, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code searches}
+         * <p>
+         * Adds one or more values to <code>searches</code>.
+         */
+        public final Builder searches(SearchProfile value, SearchProfile... values) {
+            this.searches = _listAdd(this.searches, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code searches}
+         * <p>
+         * Adds a value to <code>searches</code> using a builder lambda.
+         */
+        public final Builder searches(Function<SearchProfile.Builder, ObjectBuilder<SearchProfile>> fn) {
+            return searches(fn.apply(new SearchProfile.Builder()).build());
+        }
+
+        /**
+         * API name: {@code fetch}
+         */
+        public final Builder fetch(@Nullable FetchProfile value) {
+            this.fetch = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fetch}
+         */
+        public final Builder fetch(Function<FetchProfile.Builder, ObjectBuilder<FetchProfile>> fn) {
+            return this.fetch(fn.apply(new FetchProfile.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ShardProfile}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardProfile build() {
+            _checkSingleUse();
+
+            return new ShardProfile(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardProfile}
+     */
+    public static final JsonpDeserializer<ShardProfile> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardProfile::setupShardProfileDeserializer
+    );
+
+    protected static void setupShardProfileDeserializer(ObjectDeserializer<ShardProfile.Builder> op) {
+
+        op.add(Builder::aggregations, JsonpDeserializer.arrayDeserializer(AggregationProfile._DESERIALIZER), "aggregations");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::searches, JsonpDeserializer.arrayDeserializer(SearchProfile._DESERIALIZER), "searches");
+        op.add(Builder::fetch, FetchProfile._DESERIALIZER, "fetch");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SmoothingModel.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SmoothingModel.java
index d2d3967998..a5bddd2d38 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SmoothingModel.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SmoothingModel.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -44,193 +46,194 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.search._types.SmoothingModelContainer
 
-
 @JsonpDeserializable
 public class SmoothingModel implements TaggedUnion<SmoothingModel.Kind, Object>, JsonpSerializable {
 
-	/**
-	 * {@link SmoothingModel} variant kinds.
-	 */
-	/**
-	 * {@link SmoothingModel} variant kinds.
-	 */
-
-	public enum Kind implements JsonEnum {
-		Laplace("laplace"),
-
-		LinearInterpolation("linear_interpolation"),
-
-		StupidBackoff("stupid_backoff"),
-
-		;
-
-		private final String jsonValue;
-
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
-
-		public String jsonValue() {
-			return this.jsonValue;
-		}
+    /**
+     * {@link SmoothingModel} variant kinds.
+     */
+    /**
+     * {@link SmoothingModel} variant kinds.
+     */
+
+    public enum Kind implements JsonEnum {
+        Laplace("laplace"),
+
+        LinearInterpolation("linear_interpolation"),
+
+        StupidBackoff("stupid_backoff"),
+
+        ;
+
+        private final String jsonValue;
+
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
+
+        public String jsonValue() {
+            return this.jsonValue;
+        }
 
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	public SmoothingModel(SmoothingModelVariant value) {
-
-		this._kind = ApiTypeHelper.requireNonNull(value._smoothingModelKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
-
-	}
-
-	private SmoothingModel(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static SmoothingModel of(Function<Builder, ObjectBuilder<SmoothingModel>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code laplace}?
-	 */
-	public boolean isLaplace() {
-		return _kind == Kind.Laplace;
-	}
-
-	/**
-	 * Get the {@code laplace} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code laplace} kind.
-	 */
-	public LaplaceSmoothingModel laplace() {
-		return TaggedUnionUtils.get(this, Kind.Laplace);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code linear_interpolation}?
-	 */
-	public boolean isLinearInterpolation() {
-		return _kind == Kind.LinearInterpolation;
-	}
-
-	/**
-	 * Get the {@code linear_interpolation} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code linear_interpolation}
-	 *             kind.
-	 */
-	public LinearInterpolationSmoothingModel linearInterpolation() {
-		return TaggedUnionUtils.get(this, Kind.LinearInterpolation);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code stupid_backoff}?
-	 */
-	public boolean isStupidBackoff() {
-		return _kind == Kind.StupidBackoff;
-	}
-
-	/**
-	 * Get the {@code stupid_backoff} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code stupid_backoff} kind.
-	 */
-	public StupidBackoffSmoothingModel stupidBackoff() {
-		return TaggedUnionUtils.get(this, Kind.StupidBackoff);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeStartObject();
-
-		generator.writeKey(_kind.jsonValue());
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		}
-
-		generator.writeEnd();
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SmoothingModel> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<SmoothingModel> laplace(LaplaceSmoothingModel v) {
-			this._kind = Kind.Laplace;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SmoothingModel> laplace(
-				Function<LaplaceSmoothingModel.Builder, ObjectBuilder<LaplaceSmoothingModel>> fn) {
-			return this.laplace(fn.apply(new LaplaceSmoothingModel.Builder()).build());
-		}
-
-		public ObjectBuilder<SmoothingModel> linearInterpolation(LinearInterpolationSmoothingModel v) {
-			this._kind = Kind.LinearInterpolation;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SmoothingModel> linearInterpolation(
-				Function<LinearInterpolationSmoothingModel.Builder, ObjectBuilder<LinearInterpolationSmoothingModel>> fn) {
-			return this.linearInterpolation(fn.apply(new LinearInterpolationSmoothingModel.Builder()).build());
-		}
-
-		public ObjectBuilder<SmoothingModel> stupidBackoff(StupidBackoffSmoothingModel v) {
-			this._kind = Kind.StupidBackoff;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SmoothingModel> stupidBackoff(
-				Function<StupidBackoffSmoothingModel.Builder, ObjectBuilder<StupidBackoffSmoothingModel>> fn) {
-			return this.stupidBackoff(fn.apply(new StupidBackoffSmoothingModel.Builder()).build());
-		}
-
-		public SmoothingModel build() {
-			_checkSingleUse();
-			return new SmoothingModel(this);
-		}
-
-	}
-
-	protected static void setupSmoothingModelDeserializer(ObjectDeserializer<Builder> op) {
-
-		op.add(Builder::laplace, LaplaceSmoothingModel._DESERIALIZER, "laplace");
-		op.add(Builder::linearInterpolation, LinearInterpolationSmoothingModel._DESERIALIZER, "linear_interpolation");
-		op.add(Builder::stupidBackoff, StupidBackoffSmoothingModel._DESERIALIZER, "stupid_backoff");
-
-	}
-
-	public static final JsonpDeserializer<SmoothingModel> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SmoothingModel::setupSmoothingModelDeserializer, Builder::build);
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    public SmoothingModel(SmoothingModelVariant value) {
+
+        this._kind = ApiTypeHelper.requireNonNull(value._smoothingModelKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+
+    }
+
+    private SmoothingModel(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static SmoothingModel of(Function<Builder, ObjectBuilder<SmoothingModel>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code laplace}?
+     */
+    public boolean isLaplace() {
+        return _kind == Kind.Laplace;
+    }
+
+    /**
+     * Get the {@code laplace} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code laplace} kind.
+     */
+    public LaplaceSmoothingModel laplace() {
+        return TaggedUnionUtils.get(this, Kind.Laplace);
+    }
+
+    /**
+     * Is this variant instance of kind {@code linear_interpolation}?
+     */
+    public boolean isLinearInterpolation() {
+        return _kind == Kind.LinearInterpolation;
+    }
+
+    /**
+     * Get the {@code linear_interpolation} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code linear_interpolation}
+     *             kind.
+     */
+    public LinearInterpolationSmoothingModel linearInterpolation() {
+        return TaggedUnionUtils.get(this, Kind.LinearInterpolation);
+    }
+
+    /**
+     * Is this variant instance of kind {@code stupid_backoff}?
+     */
+    public boolean isStupidBackoff() {
+        return _kind == Kind.StupidBackoff;
+    }
+
+    /**
+     * Get the {@code stupid_backoff} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code stupid_backoff} kind.
+     */
+    public StupidBackoffSmoothingModel stupidBackoff() {
+        return TaggedUnionUtils.get(this, Kind.StupidBackoff);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeStartObject();
+
+        generator.writeKey(_kind.jsonValue());
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        }
+
+        generator.writeEnd();
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SmoothingModel> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<SmoothingModel> laplace(LaplaceSmoothingModel v) {
+            this._kind = Kind.Laplace;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SmoothingModel> laplace(Function<LaplaceSmoothingModel.Builder, ObjectBuilder<LaplaceSmoothingModel>> fn) {
+            return this.laplace(fn.apply(new LaplaceSmoothingModel.Builder()).build());
+        }
+
+        public ObjectBuilder<SmoothingModel> linearInterpolation(LinearInterpolationSmoothingModel v) {
+            this._kind = Kind.LinearInterpolation;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SmoothingModel> linearInterpolation(
+            Function<LinearInterpolationSmoothingModel.Builder, ObjectBuilder<LinearInterpolationSmoothingModel>> fn
+        ) {
+            return this.linearInterpolation(fn.apply(new LinearInterpolationSmoothingModel.Builder()).build());
+        }
+
+        public ObjectBuilder<SmoothingModel> stupidBackoff(StupidBackoffSmoothingModel v) {
+            this._kind = Kind.StupidBackoff;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SmoothingModel> stupidBackoff(
+            Function<StupidBackoffSmoothingModel.Builder, ObjectBuilder<StupidBackoffSmoothingModel>> fn
+        ) {
+            return this.stupidBackoff(fn.apply(new StupidBackoffSmoothingModel.Builder()).build());
+        }
+
+        public SmoothingModel build() {
+            _checkSingleUse();
+            return new SmoothingModel(this);
+        }
+
+    }
+
+    protected static void setupSmoothingModelDeserializer(ObjectDeserializer<Builder> op) {
+
+        op.add(Builder::laplace, LaplaceSmoothingModel._DESERIALIZER, "laplace");
+        op.add(Builder::linearInterpolation, LinearInterpolationSmoothingModel._DESERIALIZER, "linear_interpolation");
+        op.add(Builder::stupidBackoff, StupidBackoffSmoothingModel._DESERIALIZER, "stupid_backoff");
+
+    }
+
+    public static final JsonpDeserializer<SmoothingModel> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SmoothingModel::setupSmoothingModelDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SmoothingModelBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SmoothingModelBuilders.java
index db4c422712..03ec1d420e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SmoothingModelBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SmoothingModelBuilders.java
@@ -36,31 +36,30 @@
  * Builders for {@link SmoothingModel} variants.
  */
 public class SmoothingModelBuilders {
-	private SmoothingModelBuilders() {
-	}
+    private SmoothingModelBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link LaplaceSmoothingModel laplace}
-	 * {@code SmoothingModel} variant.
-	 */
-	public static LaplaceSmoothingModel.Builder laplace() {
-		return new LaplaceSmoothingModel.Builder();
-	}
+    /**
+     * Creates a builder for the {@link LaplaceSmoothingModel laplace}
+     * {@code SmoothingModel} variant.
+     */
+    public static LaplaceSmoothingModel.Builder laplace() {
+        return new LaplaceSmoothingModel.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link LinearInterpolationSmoothingModel
-	 * linear_interpolation} {@code SmoothingModel} variant.
-	 */
-	public static LinearInterpolationSmoothingModel.Builder linearInterpolation() {
-		return new LinearInterpolationSmoothingModel.Builder();
-	}
+    /**
+     * Creates a builder for the {@link LinearInterpolationSmoothingModel
+     * linear_interpolation} {@code SmoothingModel} variant.
+     */
+    public static LinearInterpolationSmoothingModel.Builder linearInterpolation() {
+        return new LinearInterpolationSmoothingModel.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link StupidBackoffSmoothingModel stupid_backoff}
-	 * {@code SmoothingModel} variant.
-	 */
-	public static StupidBackoffSmoothingModel.Builder stupidBackoff() {
-		return new StupidBackoffSmoothingModel.Builder();
-	}
+    /**
+     * Creates a builder for the {@link StupidBackoffSmoothingModel stupid_backoff}
+     * {@code SmoothingModel} variant.
+     */
+    public static StupidBackoffSmoothingModel.Builder stupidBackoff() {
+        return new StupidBackoffSmoothingModel.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SmoothingModelVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SmoothingModelVariant.java
index 61e5546d44..5a1626bd76 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SmoothingModelVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SmoothingModelVariant.java
@@ -37,10 +37,10 @@
  */
 public interface SmoothingModelVariant {
 
-	SmoothingModel.Kind _smoothingModelKind();
+    SmoothingModel.Kind _smoothingModelKind();
 
-	default SmoothingModel _toSmoothingModel() {
-		return new SmoothingModel(this);
-	}
+    default SmoothingModel _toSmoothingModel() {
+        return new SmoothingModel(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceConfig.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceConfig.java
index dbd9c86e19..e36355c404 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceConfig.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceConfig.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,135 +44,134 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.search._types.SourceConfig
 
 /**
  * Defines how to fetch a source. Fetching can be disabled entirely, or the
  * source can be filtered.
- * 
+ *
  */
 @JsonpDeserializable
 public class SourceConfig implements TaggedUnion<SourceConfig.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Filter, Fetch
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private SourceConfig(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	private SourceConfig(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static SourceConfig of(Function<Builder, ObjectBuilder<SourceConfig>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code filter}?
-	 */
-	public boolean isFilter() {
-		return _kind == Kind.Filter;
-	}
-
-	/**
-	 * Get the {@code filter} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code filter} kind.
-	 */
-	public SourceFilter filter() {
-		return TaggedUnionUtils.get(this, Kind.Filter);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code fetch}?
-	 */
-	public boolean isFetch() {
-		return _kind == Kind.Fetch;
-	}
-
-	/**
-	 * Get the {@code fetch} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code fetch} kind.
-	 */
-	public Boolean fetch() {
-		return TaggedUnionUtils.get(this, Kind.Fetch);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Fetch :
-					generator.write(((Boolean) this._value));
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SourceConfig> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<SourceConfig> filter(SourceFilter v) {
-			this._kind = Kind.Filter;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SourceConfig> filter(Function<SourceFilter.Builder, ObjectBuilder<SourceFilter>> fn) {
-			return this.filter(fn.apply(new SourceFilter.Builder()).build());
-		}
-
-		public ObjectBuilder<SourceConfig> fetch(Boolean v) {
-			this._kind = Kind.Fetch;
-			this._value = v;
-			return this;
-		}
-
-		public SourceConfig build() {
-			_checkSingleUse();
-			return new SourceConfig(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<SourceConfig> buildSourceConfigDeserializer() {
-		return new UnionDeserializer.Builder<SourceConfig, Kind, Object>(SourceConfig::new, false)
-				.addMember(Kind.Filter, SourceFilter._DESERIALIZER)
-				.addMember(Kind.Fetch, JsonpDeserializer.booleanDeserializer()).build();
-	}
-
-	public static final JsonpDeserializer<SourceConfig> _DESERIALIZER = JsonpDeserializer
-			.lazy(SourceConfig::buildSourceConfigDeserializer);
+    public enum Kind {
+        Filter,
+        Fetch
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private SourceConfig(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private SourceConfig(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static SourceConfig of(Function<Builder, ObjectBuilder<SourceConfig>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code filter}?
+     */
+    public boolean isFilter() {
+        return _kind == Kind.Filter;
+    }
+
+    /**
+     * Get the {@code filter} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code filter} kind.
+     */
+    public SourceFilter filter() {
+        return TaggedUnionUtils.get(this, Kind.Filter);
+    }
+
+    /**
+     * Is this variant instance of kind {@code fetch}?
+     */
+    public boolean isFetch() {
+        return _kind == Kind.Fetch;
+    }
+
+    /**
+     * Get the {@code fetch} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code fetch} kind.
+     */
+    public Boolean fetch() {
+        return TaggedUnionUtils.get(this, Kind.Fetch);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Fetch:
+                    generator.write(((Boolean) this._value));
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SourceConfig> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<SourceConfig> filter(SourceFilter v) {
+            this._kind = Kind.Filter;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SourceConfig> filter(Function<SourceFilter.Builder, ObjectBuilder<SourceFilter>> fn) {
+            return this.filter(fn.apply(new SourceFilter.Builder()).build());
+        }
+
+        public ObjectBuilder<SourceConfig> fetch(Boolean v) {
+            this._kind = Kind.Fetch;
+            this._value = v;
+            return this;
+        }
+
+        public SourceConfig build() {
+            _checkSingleUse();
+            return new SourceConfig(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<SourceConfig> buildSourceConfigDeserializer() {
+        return new UnionDeserializer.Builder<SourceConfig, Kind, Object>(SourceConfig::new, false).addMember(
+            Kind.Filter,
+            SourceFilter._DESERIALIZER
+        ).addMember(Kind.Fetch, JsonpDeserializer.booleanDeserializer()).build();
+    }
+
+    public static final JsonpDeserializer<SourceConfig> _DESERIALIZER = JsonpDeserializer.lazy(SourceConfig::buildSourceConfigDeserializer);
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceConfigBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceConfigBuilders.java
index 4ce81619cd..1ebe593b5b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceConfigBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceConfigBuilders.java
@@ -37,18 +37,17 @@
  * <p>
  * Variants <code>fetch</code> are not available here as they don't have a
  * dedicated class. Use {@link SourceConfig}'s builder for these.
- * 
+ *
  */
 public class SourceConfigBuilders {
-	private SourceConfigBuilders() {
-	}
+    private SourceConfigBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link SourceFilter filter} {@code SourceConfig}
-	 * variant.
-	 */
-	public static SourceFilter.Builder filter() {
-		return new SourceFilter.Builder();
-	}
+    /**
+     * Creates a builder for the {@link SourceFilter filter} {@code SourceConfig}
+     * variant.
+     */
+    public static SourceFilter.Builder filter() {
+        return new SourceFilter.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceConfigParam.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceConfigParam.java
index d727d53cff..bbe6d0c1c0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceConfigParam.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceConfigParam.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,10 +46,6 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 // typedef: _global.search._types.SourceConfigParam
 
@@ -53,144 +53,147 @@
  * Defines how to fetch a source. Fetching can be disabled entirely, or the
  * source can be filtered. Used as a query parameter along with the
  * <code>_source_includes</code> and <code>_source_excludes</code> parameters.
- * 
+ *
  */
 @JsonpDeserializable
 public class SourceConfigParam implements TaggedUnion<SourceConfigParam.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Fields, Fetch
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private SourceConfigParam(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	public String _toJsonString() {
-		switch (_kind) {
-			case Fields :
-				return this.fields().stream().map(v -> v).collect(Collectors.joining(","));
-			case Fetch :
-				return String.valueOf(this.fetch());
-
-			default :
-				throw new IllegalStateException("Unknown kind " + _kind);
-		}
-	}
-
-	private SourceConfigParam(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static SourceConfigParam of(Function<Builder, ObjectBuilder<SourceConfigParam>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code fields}?
-	 */
-	public boolean isFields() {
-		return _kind == Kind.Fields;
-	}
-
-	/**
-	 * Get the {@code fields} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code fields} kind.
-	 */
-	public List<String> fields() {
-		return TaggedUnionUtils.get(this, Kind.Fields);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code fetch}?
-	 */
-	public boolean isFetch() {
-		return _kind == Kind.Fetch;
-	}
-
-	/**
-	 * Get the {@code fetch} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code fetch} kind.
-	 */
-	public Boolean fetch() {
-		return TaggedUnionUtils.get(this, Kind.Fetch);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Fields :
-					generator.writeStartArray();
-					for (String item0 : ((List<String>) this._value)) {
-						generator.write(item0);
-
-					}
-					generator.writeEnd();
-
-					break;
-				case Fetch :
-					generator.write(((Boolean) this._value));
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SourceConfigParam> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<SourceConfigParam> fields(List<String> v) {
-			this._kind = Kind.Fields;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<SourceConfigParam> fetch(Boolean v) {
-			this._kind = Kind.Fetch;
-			this._value = v;
-			return this;
-		}
-
-		public SourceConfigParam build() {
-			_checkSingleUse();
-			return new SourceConfigParam(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<SourceConfigParam> buildSourceConfigParamDeserializer() {
-		return new UnionDeserializer.Builder<SourceConfigParam, Kind, Object>(SourceConfigParam::new, false)
-				.addMember(Kind.Fields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()))
-				.addMember(Kind.Fetch, JsonpDeserializer.booleanDeserializer()).build();
-	}
-
-	public static final JsonpDeserializer<SourceConfigParam> _DESERIALIZER = JsonpDeserializer
-			.lazy(SourceConfigParam::buildSourceConfigParamDeserializer);
+    public enum Kind {
+        Fields,
+        Fetch
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private SourceConfigParam(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    public String _toJsonString() {
+        switch (_kind) {
+            case Fields:
+                return this.fields().stream().map(v -> v).collect(Collectors.joining(","));
+            case Fetch:
+                return String.valueOf(this.fetch());
+
+            default:
+                throw new IllegalStateException("Unknown kind " + _kind);
+        }
+    }
+
+    private SourceConfigParam(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static SourceConfigParam of(Function<Builder, ObjectBuilder<SourceConfigParam>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code fields}?
+     */
+    public boolean isFields() {
+        return _kind == Kind.Fields;
+    }
+
+    /**
+     * Get the {@code fields} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code fields} kind.
+     */
+    public List<String> fields() {
+        return TaggedUnionUtils.get(this, Kind.Fields);
+    }
+
+    /**
+     * Is this variant instance of kind {@code fetch}?
+     */
+    public boolean isFetch() {
+        return _kind == Kind.Fetch;
+    }
+
+    /**
+     * Get the {@code fetch} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code fetch} kind.
+     */
+    public Boolean fetch() {
+        return TaggedUnionUtils.get(this, Kind.Fetch);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Fields:
+                    generator.writeStartArray();
+                    for (String item0 : ((List<String>) this._value)) {
+                        generator.write(item0);
+
+                    }
+                    generator.writeEnd();
+
+                    break;
+                case Fetch:
+                    generator.write(((Boolean) this._value));
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SourceConfigParam> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<SourceConfigParam> fields(List<String> v) {
+            this._kind = Kind.Fields;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<SourceConfigParam> fetch(Boolean v) {
+            this._kind = Kind.Fetch;
+            this._value = v;
+            return this;
+        }
+
+        public SourceConfigParam build() {
+            _checkSingleUse();
+            return new SourceConfigParam(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<SourceConfigParam> buildSourceConfigParamDeserializer() {
+        return new UnionDeserializer.Builder<SourceConfigParam, Kind, Object>(SourceConfigParam::new, false).addMember(
+            Kind.Fields,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer())
+        ).addMember(Kind.Fetch, JsonpDeserializer.booleanDeserializer()).build();
+    }
+
+    public static final JsonpDeserializer<SourceConfigParam> _DESERIALIZER = JsonpDeserializer.lazy(
+        SourceConfigParam::buildSourceConfigParamDeserializer
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceConfigParamBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceConfigParamBuilders.java
index 792fc3ba78..30ce9e79ea 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceConfigParamBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceConfigParamBuilders.java
@@ -38,10 +38,9 @@
  * Variants <code>fields</code>, <code>fetch</code> are not available here as
  * they don't have a dedicated class. Use {@link SourceConfigParam}'s builder
  * for these.
- * 
+ *
  */
 public class SourceConfigParamBuilders {
-	private SourceConfigParamBuilders() {
-	}
+    private SourceConfigParamBuilders() {}
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceFilter.java
index a23a650e0c..6d085167be 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SourceFilter.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,163 +45,159 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.SourceFilter
 
 @JsonpDeserializable
 public class SourceFilter implements JsonpSerializable {
-	private final List<String> excludes;
-
-	private final List<String> includes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SourceFilter(Builder builder) {
-
-		this.excludes = ApiTypeHelper.unmodifiable(builder.excludes);
-		this.includes = ApiTypeHelper.unmodifiable(builder.includes);
-
-	}
-
-	public static SourceFilter of(Function<Builder, ObjectBuilder<SourceFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code excludes}
-	 */
-	public final List<String> excludes() {
-		return this.excludes;
-	}
-
-	/**
-	 * API name: {@code includes}
-	 */
-	public final List<String> includes() {
-		return this.includes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.excludes)) {
-			generator.writeKey("excludes");
-			generator.writeStartArray();
-			for (String item0 : this.excludes) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.includes)) {
-			generator.writeKey("includes");
-			generator.writeStartArray();
-			for (String item0 : this.includes) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SourceFilter}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SourceFilter> {
-		@Nullable
-		private List<String> excludes;
-
-		@Nullable
-		private List<String> includes;
-
-		/**
-		 * API name: {@code excludes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>excludes</code>.
-		 */
-		public final Builder excludes(List<String> list) {
-			this.excludes = _listAddAll(this.excludes, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code excludes}
-		 * <p>
-		 * Adds one or more values to <code>excludes</code>.
-		 */
-		public final Builder excludes(String value, String... values) {
-			this.excludes = _listAdd(this.excludes, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code includes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>includes</code>.
-		 */
-		public final Builder includes(List<String> list) {
-			this.includes = _listAddAll(this.includes, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code includes}
-		 * <p>
-		 * Adds one or more values to <code>includes</code>.
-		 */
-		public final Builder includes(String value, String... values) {
-			this.includes = _listAdd(this.includes, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SourceFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SourceFilter build() {
-			_checkSingleUse();
-
-			return new SourceFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SourceFilter}
-	 */
-	public static final JsonpDeserializer<SourceFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SourceFilter::setupSourceFilterDeserializer);
-
-	protected static void setupSourceFilterDeserializer(ObjectDeserializer<SourceFilter.Builder> op) {
-
-		op.add(Builder::excludes, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"excludes", "exclude");
-		op.add(Builder::includes, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"includes", "include");
-
-		op.shortcutProperty("includes");
-
-	}
+    private final List<String> excludes;
+
+    private final List<String> includes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SourceFilter(Builder builder) {
+
+        this.excludes = ApiTypeHelper.unmodifiable(builder.excludes);
+        this.includes = ApiTypeHelper.unmodifiable(builder.includes);
+
+    }
+
+    public static SourceFilter of(Function<Builder, ObjectBuilder<SourceFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code excludes}
+     */
+    public final List<String> excludes() {
+        return this.excludes;
+    }
+
+    /**
+     * API name: {@code includes}
+     */
+    public final List<String> includes() {
+        return this.includes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.excludes)) {
+            generator.writeKey("excludes");
+            generator.writeStartArray();
+            for (String item0 : this.excludes) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.includes)) {
+            generator.writeKey("includes");
+            generator.writeStartArray();
+            for (String item0 : this.includes) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SourceFilter}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SourceFilter> {
+        @Nullable
+        private List<String> excludes;
+
+        @Nullable
+        private List<String> includes;
+
+        /**
+         * API name: {@code excludes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>excludes</code>.
+         */
+        public final Builder excludes(List<String> list) {
+            this.excludes = _listAddAll(this.excludes, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code excludes}
+         * <p>
+         * Adds one or more values to <code>excludes</code>.
+         */
+        public final Builder excludes(String value, String... values) {
+            this.excludes = _listAdd(this.excludes, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code includes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>includes</code>.
+         */
+        public final Builder includes(List<String> list) {
+            this.includes = _listAddAll(this.includes, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code includes}
+         * <p>
+         * Adds one or more values to <code>includes</code>.
+         */
+        public final Builder includes(String value, String... values) {
+            this.includes = _listAdd(this.includes, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link SourceFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SourceFilter build() {
+            _checkSingleUse();
+
+            return new SourceFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SourceFilter}
+     */
+    public static final JsonpDeserializer<SourceFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SourceFilter::setupSourceFilterDeserializer
+    );
+
+    protected static void setupSourceFilterDeserializer(ObjectDeserializer<SourceFilter.Builder> op) {
+
+        op.add(Builder::excludes, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "excludes", "exclude");
+        op.add(Builder::includes, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "includes", "include");
+
+        op.shortcutProperty("includes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/StringDistance.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/StringDistance.java
index f36cc382db..14525d47fd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/StringDistance.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/StringDistance.java
@@ -35,31 +35,29 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum StringDistance implements JsonEnum {
-	Internal("internal"),
+    Internal("internal"),
 
-	DamerauLevenshtein("damerau_levenshtein"),
+    DamerauLevenshtein("damerau_levenshtein"),
 
-	Levenshtein("levenshtein"),
+    Levenshtein("levenshtein"),
 
-	JaroWinkler("jaro_winkler"),
+    JaroWinkler("jaro_winkler"),
 
-	Ngram("ngram"),
+    Ngram("ngram"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	StringDistance(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    StringDistance(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<StringDistance> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			StringDistance.values());
+    public static final JsonEnum.Deserializer<StringDistance> _DESERIALIZER = new JsonEnum.Deserializer<>(StringDistance.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/StupidBackoffSmoothingModel.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/StupidBackoffSmoothingModel.java
index cd9897567f..736bc24deb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/StupidBackoffSmoothingModel.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/StupidBackoffSmoothingModel.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,8 +43,6 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.search._types.StupidBackoffSmoothingModel
 
@@ -128,14 +128,15 @@ public StupidBackoffSmoothingModel build() {
     /**
      * Json deserializer for {@link StupidBackoffSmoothingModel}
      */
-    public static final JsonpDeserializer<StupidBackoffSmoothingModel> _DESERIALIZER = ObjectBuilderDeserializer
-            .lazy(Builder::new, StupidBackoffSmoothingModel::setupStupidBackoffSmoothingModelDeserializer);
+    public static final JsonpDeserializer<StupidBackoffSmoothingModel> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        StupidBackoffSmoothingModel::setupStupidBackoffSmoothingModelDeserializer
+    );
 
-    protected static void setupStupidBackoffSmoothingModelDeserializer(
-            ObjectDeserializer<StupidBackoffSmoothingModel.Builder> op) {
+    protected static void setupStupidBackoffSmoothingModelDeserializer(ObjectDeserializer<StupidBackoffSmoothingModel.Builder> op) {
 
         op.add(Builder::discount, JsonpDeserializer.doubleDeserializer(), "discount");
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Suggest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Suggest.java
index 33a7f2b08d..f770d300ec 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Suggest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Suggest.java
@@ -32,180 +32,171 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
-
 import org.opensearch.client.json.ExternallyTaggedUnion;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
-
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
 
-import jakarta.json.stream.JsonGenerator;
-
 // typedef: _global.search._types.SuggestOption
 
-
-
 public class Suggest<TDocument> implements TaggedUnion<Suggest.Kind, SuggestVariant>, JsonpSerializable {
 
-	public enum Kind {
-		Completion, Phrase, Term
-
-	}
-
-	private final Kind _kind;
-	private final SuggestVariant _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final SuggestVariant _get() {
-		return _value;
-	}
-
-
-	public Suggest(SuggestVariant value) {
-		this._kind = ApiTypeHelper.requireNonNull(value._suggestionKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
-	}
-
-	private Suggest(Builder<TDocument> builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static <TDocument> Suggest<TDocument> of(
-			Function<Builder<TDocument>, ObjectBuilder<Suggest<TDocument>>> fn) {
-		return fn.apply(new Builder<>()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code completion}?
-	 */
-	public boolean isCompletion() {
-		return _kind == Kind.Completion;
-	}
-
-	/**
-	 * Get the {@code completion} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code completion} kind.
-	 */
-	public CompletionSuggest<TDocument> completion() {
-		return TaggedUnionUtils.get(this, Kind.Completion);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code phrase}?
-	 */
-	public boolean isPhrase() {
-		return _kind == Kind.Phrase;
-	}
-
-	/**
-	 * Get the {@code phrase} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code phrase} kind.
-	 */
-	public PhraseSuggest phrase() {
-		return TaggedUnionUtils.get(this, Kind.Phrase);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code term}?
-	 */
-	public boolean isTerm() {
-		return _kind == Kind.Term;
-	}
-
-	/**
-	 * Get the {@code term} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code term} kind.
-	 */
-	public TermSuggest term() {
-		return TaggedUnionUtils.get(this, Kind.Term);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		}
-
-	}
-
-	public static class Builder<TDocument> extends ObjectBuilderBase
-			implements
-				ObjectBuilder<Suggest<TDocument>> {
-		private Kind _kind;
-		private SuggestVariant _value;
-
-		public ObjectBuilder<Suggest<TDocument>> completion(CompletionSuggest<TDocument> v) {
-			this._kind = Kind.Completion;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Suggest<TDocument>> completion(
-				Function<CompletionSuggest.Builder<TDocument>,
-						ObjectBuilder<CompletionSuggest<TDocument>>> fn) {
-			return this.completion(fn.apply(new CompletionSuggest.Builder<TDocument>()).build());
-		}
-
-		public ObjectBuilder<Suggest<TDocument>> phrase(PhraseSuggest v) {
-			this._kind = Kind.Phrase;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Suggest<TDocument>> phrase(
-				Function<PhraseSuggest.Builder, ObjectBuilder<PhraseSuggest>> fn) {
-			return this.phrase(fn.apply(new PhraseSuggest.Builder()).build());
-		}
-
-		public ObjectBuilder<Suggest<TDocument>> term(TermSuggest v) {
-			this._kind = Kind.Term;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Suggest<TDocument>> term(
-				Function<TermSuggest.Builder, ObjectBuilder<TermSuggest>> fn) {
-			return this.term(fn.apply(new TermSuggest.Builder()).build());
-		}
-
-		public Suggest<TDocument> build() {
-			_checkSingleUse();
-			return new Suggest<>(this);
-		}
-
-	}
-
-	public static <TDocument> ExternallyTaggedUnion.TypedKeysDeserializer<Suggest<TDocument>> createSuggestDeserializer(
-			JsonpDeserializer<TDocument> tDocumentDeserializer) {
-		Map<String, JsonpDeserializer<? extends SuggestVariant>> deserializers = new HashMap<>();
-		deserializers.put("completion", CompletionSuggest.createCompletionSuggestDeserializer(tDocumentDeserializer));
-		deserializers.put("phrase", PhraseSuggest._DESERIALIZER);
-		deserializers.put("term", TermSuggest._DESERIALIZER);
-
-		return new ExternallyTaggedUnion.Deserializer<Suggest<TDocument>, SuggestVariant>(deserializers,
-				Suggest::new).typedKeys();
-	}
+    public enum Kind {
+        Completion,
+        Phrase,
+        Term
+
+    }
+
+    private final Kind _kind;
+    private final SuggestVariant _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final SuggestVariant _get() {
+        return _value;
+    }
+
+    public Suggest(SuggestVariant value) {
+        this._kind = ApiTypeHelper.requireNonNull(value._suggestionKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+    }
+
+    private Suggest(Builder<TDocument> builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static <TDocument> Suggest<TDocument> of(Function<Builder<TDocument>, ObjectBuilder<Suggest<TDocument>>> fn) {
+        return fn.apply(new Builder<>()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code completion}?
+     */
+    public boolean isCompletion() {
+        return _kind == Kind.Completion;
+    }
+
+    /**
+     * Get the {@code completion} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code completion} kind.
+     */
+    public CompletionSuggest<TDocument> completion() {
+        return TaggedUnionUtils.get(this, Kind.Completion);
+    }
+
+    /**
+     * Is this variant instance of kind {@code phrase}?
+     */
+    public boolean isPhrase() {
+        return _kind == Kind.Phrase;
+    }
+
+    /**
+     * Get the {@code phrase} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code phrase} kind.
+     */
+    public PhraseSuggest phrase() {
+        return TaggedUnionUtils.get(this, Kind.Phrase);
+    }
+
+    /**
+     * Is this variant instance of kind {@code term}?
+     */
+    public boolean isTerm() {
+        return _kind == Kind.Term;
+    }
+
+    /**
+     * Get the {@code term} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code term} kind.
+     */
+    public TermSuggest term() {
+        return TaggedUnionUtils.get(this, Kind.Term);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        }
+
+    }
+
+    public static class Builder<TDocument> extends ObjectBuilderBase implements ObjectBuilder<Suggest<TDocument>> {
+        private Kind _kind;
+        private SuggestVariant _value;
+
+        public ObjectBuilder<Suggest<TDocument>> completion(CompletionSuggest<TDocument> v) {
+            this._kind = Kind.Completion;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Suggest<TDocument>> completion(
+            Function<CompletionSuggest.Builder<TDocument>, ObjectBuilder<CompletionSuggest<TDocument>>> fn
+        ) {
+            return this.completion(fn.apply(new CompletionSuggest.Builder<TDocument>()).build());
+        }
+
+        public ObjectBuilder<Suggest<TDocument>> phrase(PhraseSuggest v) {
+            this._kind = Kind.Phrase;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Suggest<TDocument>> phrase(Function<PhraseSuggest.Builder, ObjectBuilder<PhraseSuggest>> fn) {
+            return this.phrase(fn.apply(new PhraseSuggest.Builder()).build());
+        }
+
+        public ObjectBuilder<Suggest<TDocument>> term(TermSuggest v) {
+            this._kind = Kind.Term;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Suggest<TDocument>> term(Function<TermSuggest.Builder, ObjectBuilder<TermSuggest>> fn) {
+            return this.term(fn.apply(new TermSuggest.Builder()).build());
+        }
+
+        public Suggest<TDocument> build() {
+            _checkSingleUse();
+            return new Suggest<>(this);
+        }
+
+    }
+
+    public static <TDocument> ExternallyTaggedUnion.TypedKeysDeserializer<Suggest<TDocument>> createSuggestDeserializer(
+        JsonpDeserializer<TDocument> tDocumentDeserializer
+    ) {
+        Map<String, JsonpDeserializer<? extends SuggestVariant>> deserializers = new HashMap<>();
+        deserializers.put("completion", CompletionSuggest.createCompletionSuggestDeserializer(tDocumentDeserializer));
+        deserializers.put("phrase", PhraseSuggest._DESERIALIZER);
+        deserializers.put("term", TermSuggest._DESERIALIZER);
+
+        return new ExternallyTaggedUnion.Deserializer<Suggest<TDocument>, SuggestVariant>(deserializers, Suggest::new).typedKeys();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestBase.java
index b6898ea6af..5df148c0b4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestBase.java
@@ -32,130 +32,123 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
-import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import jakarta.json.stream.JsonGenerator;
-
 // typedef: _global.search._types.Suggest
 
-
-
 public abstract class SuggestBase implements JsonpSerializable {
-	private final int length;
-
-	private final int offset;
-
-	private final String text;
+    private final int length;
 
-	// ---------------------------------------------------------------------------------------------
+    private final int offset;
 
-	protected SuggestBase(AbstractBuilder<?> builder) {
+    private final String text;
 
-		this.length = ApiTypeHelper.requireNonNull(builder.length, this, "length");
-		this.offset = ApiTypeHelper.requireNonNull(builder.offset, this, "offset");
-		this.text = ApiTypeHelper.requireNonNull(builder.text, this, "text");
+    // ---------------------------------------------------------------------------------------------
 
-	}
+    protected SuggestBase(AbstractBuilder<?> builder) {
 
-	/**
-	 * Required - API name: {@code length}
-	 */
-	public final int length() {
-		return this.length;
-	}
+        this.length = ApiTypeHelper.requireNonNull(builder.length, this, "length");
+        this.offset = ApiTypeHelper.requireNonNull(builder.offset, this, "offset");
+        this.text = ApiTypeHelper.requireNonNull(builder.text, this, "text");
 
-	/**
-	 * Required - API name: {@code offset}
-	 */
-	public final int offset() {
-		return this.offset;
-	}
+    }
 
-	/**
-	 * Required - API name: {@code text}
-	 */
-	public final String text() {
-		return this.text;
-	}
+    /**
+     * Required - API name: {@code length}
+     */
+    public final int length() {
+        return this.length;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code offset}
+     */
+    public final int offset() {
+        return this.offset;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Required - API name: {@code text}
+     */
+    public final String text() {
+        return this.text;
+    }
 
-		generator.writeKey("length");
-		generator.write(this.length);
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("offset");
-		generator.write(this.offset);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("text");
-		generator.write(this.text);
+        generator.writeKey("length");
+        generator.write(this.length);
 
-	}
+        generator.writeKey("offset");
+        generator.write(this.offset);
 
-	// ---------------------------------------------------------------------------------------------
+        generator.writeKey("text");
+        generator.write(this.text);
 
-	/**
-	 * Builder for {@link SuggestBase}.
-	 */
+    }
 
-	public abstract static class  AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
-		private Integer length;
+    // ---------------------------------------------------------------------------------------------
 
-		private Integer offset;
+    /**
+     * Builder for {@link SuggestBase}.
+     */
 
-		private String text;
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        private Integer length;
 
-		/**
-		 * Required - API name: {@code length}
-		 */
-		public final BuilderT length(int value) {
-			this.length = value;
-			return self();
-		}
+        private Integer offset;
 
-		/**
-		 * Required - API name: {@code offset}
-		 */
-		public final BuilderT offset(int value) {
-			this.offset = value;
-			return self();
-		}
+        private String text;
 
-		/**
-		 * Required - API name: {@code text}
-		 */
-		public final BuilderT text(String value) {
-			this.text = value;
-			return self();
-		}
+        /**
+         * Required - API name: {@code length}
+         */
+        public final BuilderT length(int value) {
+            this.length = value;
+            return self();
+        }
 
+        /**
+         * Required - API name: {@code offset}
+         */
+        public final BuilderT offset(int value) {
+            this.offset = value;
+            return self();
+        }
 
-		protected abstract BuilderT self();
+        /**
+         * Required - API name: {@code text}
+         */
+        public final BuilderT text(String value) {
+            this.text = value;
+            return self();
+        }
 
-	}
+        protected abstract BuilderT self();
 
+    }
 
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupSuggestBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupSuggestBaseDeserializer(ObjectDeserializer<BuilderT> op) {
 
-		op.add(AbstractBuilder::length, JsonpDeserializer.integerDeserializer(), "length");
-		op.add(AbstractBuilder::offset, JsonpDeserializer.integerDeserializer(), "offset");
-		op.add(AbstractBuilder::text, JsonpDeserializer.stringDeserializer(), "text");
+        op.add(AbstractBuilder::length, JsonpDeserializer.integerDeserializer(), "length");
+        op.add(AbstractBuilder::offset, JsonpDeserializer.integerDeserializer(), "offset");
+        op.add(AbstractBuilder::text, JsonpDeserializer.stringDeserializer(), "text");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestFuzziness.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestFuzziness.java
index b870217f10..bd3651d74e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestFuzziness.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestFuzziness.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,189 +43,188 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.search._types.SuggestFuzziness
 
-
 @JsonpDeserializable
 public class SuggestFuzziness implements JsonpSerializable {
-	private final String fuzziness;
+    private final String fuzziness;
 
-	private final int minLength;
+    private final int minLength;
 
-	private final int prefixLength;
+    private final int prefixLength;
 
-	private final boolean transpositions;
+    private final boolean transpositions;
 
-	private final boolean unicodeAware;
+    private final boolean unicodeAware;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private SuggestFuzziness(Builder builder) {
+    private SuggestFuzziness(Builder builder) {
 
-		this.fuzziness = ApiTypeHelper.requireNonNull(builder.fuzziness, this, "fuzziness");
-		this.minLength = ApiTypeHelper.requireNonNull(builder.minLength, this, "minLength");
-		this.prefixLength = ApiTypeHelper.requireNonNull(builder.prefixLength, this, "prefixLength");
-		this.transpositions = ApiTypeHelper.requireNonNull(builder.transpositions, this, "transpositions");
-		this.unicodeAware = ApiTypeHelper.requireNonNull(builder.unicodeAware, this, "unicodeAware");
+        this.fuzziness = ApiTypeHelper.requireNonNull(builder.fuzziness, this, "fuzziness");
+        this.minLength = ApiTypeHelper.requireNonNull(builder.minLength, this, "minLength");
+        this.prefixLength = ApiTypeHelper.requireNonNull(builder.prefixLength, this, "prefixLength");
+        this.transpositions = ApiTypeHelper.requireNonNull(builder.transpositions, this, "transpositions");
+        this.unicodeAware = ApiTypeHelper.requireNonNull(builder.unicodeAware, this, "unicodeAware");
 
-	}
+    }
 
-	public static SuggestFuzziness of(Function<Builder, ObjectBuilder<SuggestFuzziness>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static SuggestFuzziness of(Function<Builder, ObjectBuilder<SuggestFuzziness>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code fuzziness}
-	 */
-	public final String fuzziness() {
-		return this.fuzziness;
-	}
+    /**
+     * Required - API name: {@code fuzziness}
+     */
+    public final String fuzziness() {
+        return this.fuzziness;
+    }
 
-	/**
-	 * Required - API name: {@code min_length}
-	 */
-	public final int minLength() {
-		return this.minLength;
-	}
-
-	/**
-	 * Required - API name: {@code prefix_length}
-	 */
-	public final int prefixLength() {
-		return this.prefixLength;
-	}
-
-	/**
-	 * Required - API name: {@code transpositions}
-	 */
-	public final boolean transpositions() {
-		return this.transpositions;
-	}
-
-	/**
-	 * Required - API name: {@code unicode_aware}
-	 */
-	public final boolean unicodeAware() {
-		return this.unicodeAware;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("fuzziness");
-		generator.write(this.fuzziness);
-
-		generator.writeKey("min_length");
-		generator.write(this.minLength);
-
-		generator.writeKey("prefix_length");
-		generator.write(this.prefixLength);
-
-		generator.writeKey("transpositions");
-		generator.write(this.transpositions);
-
-		generator.writeKey("unicode_aware");
-		generator.write(this.unicodeAware);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SuggestFuzziness}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SuggestFuzziness> {
-		private String fuzziness;
-
-		private Integer minLength;
-
-		private Integer prefixLength;
-
-		private Boolean transpositions;
-
-		private Boolean unicodeAware;
-
-		/**
-		 * Required - API name: {@code fuzziness}
-		 */
-		public final Builder fuzziness(String value) {
-			this.fuzziness = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code min_length}
-		 */
-		public final Builder minLength(int value) {
-			this.minLength = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code prefix_length}
-		 */
-		public final Builder prefixLength(int value) {
-			this.prefixLength = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code transpositions}
-		 */
-		public final Builder transpositions(boolean value) {
-			this.transpositions = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code unicode_aware}
-		 */
-		public final Builder unicodeAware(boolean value) {
-			this.unicodeAware = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SuggestFuzziness}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SuggestFuzziness build() {
-			_checkSingleUse();
-
-			return new SuggestFuzziness(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SuggestFuzziness}
-	 */
-	public static final JsonpDeserializer<SuggestFuzziness> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SuggestFuzziness::setupSuggestFuzzinessDeserializer);
-
-	protected static void setupSuggestFuzzinessDeserializer(ObjectDeserializer<SuggestFuzziness.Builder> op) {
-
-		op.add(Builder::fuzziness, JsonpDeserializer.stringDeserializer(), "fuzziness");
-		op.add(Builder::minLength, JsonpDeserializer.integerDeserializer(), "min_length");
-		op.add(Builder::prefixLength, JsonpDeserializer.integerDeserializer(), "prefix_length");
-		op.add(Builder::transpositions, JsonpDeserializer.booleanDeserializer(), "transpositions");
-		op.add(Builder::unicodeAware, JsonpDeserializer.booleanDeserializer(), "unicode_aware");
-
-	}
+    /**
+     * Required - API name: {@code min_length}
+     */
+    public final int minLength() {
+        return this.minLength;
+    }
+
+    /**
+     * Required - API name: {@code prefix_length}
+     */
+    public final int prefixLength() {
+        return this.prefixLength;
+    }
+
+    /**
+     * Required - API name: {@code transpositions}
+     */
+    public final boolean transpositions() {
+        return this.transpositions;
+    }
+
+    /**
+     * Required - API name: {@code unicode_aware}
+     */
+    public final boolean unicodeAware() {
+        return this.unicodeAware;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("fuzziness");
+        generator.write(this.fuzziness);
+
+        generator.writeKey("min_length");
+        generator.write(this.minLength);
+
+        generator.writeKey("prefix_length");
+        generator.write(this.prefixLength);
+
+        generator.writeKey("transpositions");
+        generator.write(this.transpositions);
+
+        generator.writeKey("unicode_aware");
+        generator.write(this.unicodeAware);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SuggestFuzziness}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SuggestFuzziness> {
+        private String fuzziness;
+
+        private Integer minLength;
+
+        private Integer prefixLength;
+
+        private Boolean transpositions;
+
+        private Boolean unicodeAware;
+
+        /**
+         * Required - API name: {@code fuzziness}
+         */
+        public final Builder fuzziness(String value) {
+            this.fuzziness = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code min_length}
+         */
+        public final Builder minLength(int value) {
+            this.minLength = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code prefix_length}
+         */
+        public final Builder prefixLength(int value) {
+            this.prefixLength = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code transpositions}
+         */
+        public final Builder transpositions(boolean value) {
+            this.transpositions = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code unicode_aware}
+         */
+        public final Builder unicodeAware(boolean value) {
+            this.unicodeAware = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link SuggestFuzziness}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SuggestFuzziness build() {
+            _checkSingleUse();
+
+            return new SuggestFuzziness(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SuggestFuzziness}
+     */
+    public static final JsonpDeserializer<SuggestFuzziness> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SuggestFuzziness::setupSuggestFuzzinessDeserializer
+    );
+
+    protected static void setupSuggestFuzzinessDeserializer(ObjectDeserializer<SuggestFuzziness.Builder> op) {
+
+        op.add(Builder::fuzziness, JsonpDeserializer.stringDeserializer(), "fuzziness");
+        op.add(Builder::minLength, JsonpDeserializer.integerDeserializer(), "min_length");
+        op.add(Builder::prefixLength, JsonpDeserializer.integerDeserializer(), "prefix_length");
+        op.add(Builder::transpositions, JsonpDeserializer.booleanDeserializer(), "transpositions");
+        op.add(Builder::unicodeAware, JsonpDeserializer.booleanDeserializer(), "unicode_aware");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestOptionBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestOptionBuilders.java
index 06e270c67b..309236bea7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestOptionBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestOptionBuilders.java
@@ -36,31 +36,30 @@
  * Builders for {@link Suggest} variants.
  */
 public class SuggestOptionBuilders {
-	private SuggestOptionBuilders() {
-	}
+    private SuggestOptionBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link CompletionSuggestOption completion}
-	 * {@code SuggestOption} variant.
-	 */
-	public static <TDocument> CompletionSuggestOption.Builder<TDocument> completion() {
-		return new CompletionSuggestOption.Builder<TDocument>();
-	}
+    /**
+     * Creates a builder for the {@link CompletionSuggestOption completion}
+     * {@code SuggestOption} variant.
+     */
+    public static <TDocument> CompletionSuggestOption.Builder<TDocument> completion() {
+        return new CompletionSuggestOption.Builder<TDocument>();
+    }
 
-	/**
-	 * Creates a builder for the {@link PhraseSuggestOption phrase}
-	 * {@code SuggestOption} variant.
-	 */
-	public static <TDocument> PhraseSuggestOption.Builder phrase() {
-		return new PhraseSuggestOption.Builder();
-	}
+    /**
+     * Creates a builder for the {@link PhraseSuggestOption phrase}
+     * {@code SuggestOption} variant.
+     */
+    public static <TDocument> PhraseSuggestOption.Builder phrase() {
+        return new PhraseSuggestOption.Builder();
+    }
 
-	/**
-	 * Creates a builder for the {@link TermSuggestOption term}
-	 * {@code SuggestOption} variant.
-	 */
-	public static <TDocument> TermSuggestOption.Builder term() {
-		return new TermSuggestOption.Builder();
-	}
+    /**
+     * Creates a builder for the {@link TermSuggestOption term}
+     * {@code SuggestOption} variant.
+     */
+    public static <TDocument> TermSuggestOption.Builder term() {
+        return new TermSuggestOption.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestSort.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestSort.java
index dc417d531c..093dab8189 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestSort.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestSort.java
@@ -35,25 +35,23 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum SuggestSort implements JsonEnum {
-	Score("score"),
+    Score("score"),
 
-	Frequency("frequency"),
+    Frequency("frequency"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	SuggestSort(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    SuggestSort(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<SuggestSort> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			SuggestSort.values());
+    public static final JsonEnum.Deserializer<SuggestSort> _DESERIALIZER = new JsonEnum.Deserializer<>(SuggestSort.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestVariant.java
index f3230775d6..841a5c446b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggestVariant.java
@@ -6,7 +6,7 @@
  * 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
@@ -40,4 +40,4 @@ default Suggest _toSuggestion() {
         return new Suggest(this);
     }
 
-}
\ No newline at end of file
+}
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Suggester.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Suggester.java
index 64b2ba2d87..2cfe2a14e2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Suggester.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/Suggester.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,165 +46,160 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.Suggester
 
-
 @JsonpDeserializable
 public class Suggester implements JsonpSerializable {
-	private final Map<String, FieldSuggester> suggesters;
-
-	@Nullable
-	private final String text;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Suggester(Builder builder) {
-
-		this.suggesters = ApiTypeHelper.unmodifiable(builder.suggesters);
-
-		this.text = builder.text;
-
-	}
-
-	public static Suggester of(Function<Builder, ObjectBuilder<Suggester>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * The named suggesters
-	 */
-	public final Map<String, FieldSuggester> suggesters() {
-		return this.suggesters;
-	}
-
-	/**
-	 * Global suggest text, to avoid repetition when the same text is used in
-	 * several suggesters
-	 * <p>
-	 * API name: {@code text}
-	 */
-	@Nullable
-	public final String text() {
-		return this.text;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		for (Map.Entry<String, FieldSuggester> item0 : this.suggesters.entrySet()) {
-			generator.writeKey(item0.getKey());
-			item0.getValue().serialize(generator, mapper);
-
-		}
-
-		if (this.text != null) {
-			generator.writeKey("text");
-			generator.write(this.text);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Suggester}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Suggester> {
-		@Nullable
-		private Map<String, FieldSuggester> suggesters = new HashMap<>();
-
-		/**
-		 * The named suggesters
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>suggesters</code>.
-		 */
-		public final Builder suggesters(Map<String, FieldSuggester> map) {
-			this.suggesters = _mapPutAll(this.suggesters, map);
-			return this;
-		}
-
-		/**
-		 * The named suggesters
-		 * <p>
-		 * Adds an entry to <code>suggesters</code>.
-		 */
-		public final Builder suggesters(String key, FieldSuggester value) {
-			this.suggesters = _mapPut(this.suggesters, key, value);
-			return this;
-		}
-
-		/**
-		 * The named suggesters
-		 * <p>
-		 * Adds an entry to <code>suggesters</code> using a builder lambda.
-		 */
-		public final Builder suggesters(String key,
-				Function<FieldSuggester.Builder, ObjectBuilder<FieldSuggester>> fn) {
-			return suggesters(key, fn.apply(new FieldSuggester.Builder()).build());
-		}
-
-		@Nullable
-		private String text;
-
-		/**
-		 * Global suggest text, to avoid repetition when the same text is used in
-		 * several suggesters
-		 * <p>
-		 * API name: {@code text}
-		 */
-		public final Builder text(@Nullable String value) {
-			this.text = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Suggester}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Suggester build() {
-			_checkSingleUse();
-
-			return new Suggester(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Suggester}
-	 */
-	public static final JsonpDeserializer<Suggester> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Suggester::setupSuggesterDeserializer);
-
-	protected static void setupSuggesterDeserializer(ObjectDeserializer<Suggester.Builder> op) {
-
-		op.add(Builder::text, JsonpDeserializer.stringDeserializer(), "text");
-
-		op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
-			if (builder.suggesters == null) {
-				builder.suggesters = new HashMap<>();
-			}
-			builder.suggesters.put(name, FieldSuggester._DESERIALIZER.deserialize(parser, mapper));
-		});
-
-	}
+    private final Map<String, FieldSuggester> suggesters;
+
+    @Nullable
+    private final String text;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Suggester(Builder builder) {
+
+        this.suggesters = ApiTypeHelper.unmodifiable(builder.suggesters);
+
+        this.text = builder.text;
+
+    }
+
+    public static Suggester of(Function<Builder, ObjectBuilder<Suggester>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * The named suggesters
+     */
+    public final Map<String, FieldSuggester> suggesters() {
+        return this.suggesters;
+    }
+
+    /**
+     * Global suggest text, to avoid repetition when the same text is used in
+     * several suggesters
+     * <p>
+     * API name: {@code text}
+     */
+    @Nullable
+    public final String text() {
+        return this.text;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        for (Map.Entry<String, FieldSuggester> item0 : this.suggesters.entrySet()) {
+            generator.writeKey(item0.getKey());
+            item0.getValue().serialize(generator, mapper);
+
+        }
+
+        if (this.text != null) {
+            generator.writeKey("text");
+            generator.write(this.text);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Suggester}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Suggester> {
+        @Nullable
+        private Map<String, FieldSuggester> suggesters = new HashMap<>();
+
+        /**
+         * The named suggesters
+         * <p>
+         * Adds all entries of <code>map</code> to <code>suggesters</code>.
+         */
+        public final Builder suggesters(Map<String, FieldSuggester> map) {
+            this.suggesters = _mapPutAll(this.suggesters, map);
+            return this;
+        }
+
+        /**
+         * The named suggesters
+         * <p>
+         * Adds an entry to <code>suggesters</code>.
+         */
+        public final Builder suggesters(String key, FieldSuggester value) {
+            this.suggesters = _mapPut(this.suggesters, key, value);
+            return this;
+        }
+
+        /**
+         * The named suggesters
+         * <p>
+         * Adds an entry to <code>suggesters</code> using a builder lambda.
+         */
+        public final Builder suggesters(String key, Function<FieldSuggester.Builder, ObjectBuilder<FieldSuggester>> fn) {
+            return suggesters(key, fn.apply(new FieldSuggester.Builder()).build());
+        }
+
+        @Nullable
+        private String text;
+
+        /**
+         * Global suggest text, to avoid repetition when the same text is used in
+         * several suggesters
+         * <p>
+         * API name: {@code text}
+         */
+        public final Builder text(@Nullable String value) {
+            this.text = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Suggester}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Suggester build() {
+            _checkSingleUse();
+
+            return new Suggester(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Suggester}
+     */
+    public static final JsonpDeserializer<Suggester> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Suggester::setupSuggesterDeserializer
+    );
+
+    protected static void setupSuggesterDeserializer(ObjectDeserializer<Suggester.Builder> op) {
+
+        op.add(Builder::text, JsonpDeserializer.stringDeserializer(), "text");
+
+        op.setUnknownFieldHandler((builder, name, parser, mapper) -> {
+            if (builder.suggesters == null) {
+                builder.suggesters = new HashMap<>();
+            }
+            builder.suggesters.put(name, FieldSuggester._DESERIALIZER.deserialize(parser, mapper));
+        });
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggesterBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggesterBase.java
index 36fa611c4a..029fe2a879 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggesterBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggesterBase.java
@@ -32,135 +32,130 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.SuggesterBase
 
-
-
 public abstract class SuggesterBase implements JsonpSerializable {
-	private final String field;
-
-	@Nullable
-	private final String analyzer;
-
-	@Nullable
-	private final Integer size;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected SuggesterBase(AbstractBuilder<?> builder) {
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.analyzer = builder.analyzer;
-		this.size = builder.size;
-
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			generator.write(this.analyzer);
-
-		}
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		private String field;
-
-		@Nullable
-		private String analyzer;
-
-		@Nullable
-		private Integer size;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final BuilderT field(String value) {
-			this.field = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final BuilderT analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final BuilderT size(@Nullable Integer value) {
-			this.size = value;
-			return self();
-		}
-
-		protected abstract BuilderT self();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupSuggesterBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-
-		op.add(AbstractBuilder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(AbstractBuilder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(AbstractBuilder::size, JsonpDeserializer.integerDeserializer(), "size");
-
-	}
+    private final String field;
+
+    @Nullable
+    private final String analyzer;
+
+    @Nullable
+    private final Integer size;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected SuggesterBase(AbstractBuilder<?> builder) {
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.analyzer = builder.analyzer;
+        this.size = builder.size;
+
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            generator.write(this.analyzer);
+
+        }
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        private String field;
+
+        @Nullable
+        private String analyzer;
+
+        @Nullable
+        private Integer size;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final BuilderT field(String value) {
+            this.field = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final BuilderT analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final BuilderT size(@Nullable Integer value) {
+            this.size = value;
+            return self();
+        }
+
+        protected abstract BuilderT self();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupSuggesterBaseDeserializer(ObjectDeserializer<BuilderT> op) {
+
+        op.add(AbstractBuilder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(AbstractBuilder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(AbstractBuilder::size, JsonpDeserializer.integerDeserializer(), "size");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TermSuggest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TermSuggest.java
index 37ebdbb17c..1327e44a8a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TermSuggest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TermSuggest.java
@@ -6,7 +6,7 @@
  * 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
@@ -32,9 +32,9 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
 import java.util.List;
 import java.util.function.Function;
-
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -44,8 +44,6 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 
-import jakarta.json.stream.JsonGenerator;
-
 @JsonpDeserializable
 public class TermSuggest extends SuggestBase implements SuggestVariant {
     private final List<TermSuggestOption> options;
@@ -110,8 +108,10 @@ public TermSuggest build() {
         }
     }
 
-    public static final JsonpDeserializer<TermSuggest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-            TermSuggest::setupTermSuggestDeserializer);
+    public static final JsonpDeserializer<TermSuggest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TermSuggest::setupTermSuggestDeserializer
+    );
 
     protected static void setupTermSuggestDeserializer(ObjectDeserializer<TermSuggest.Builder> op) {
         SuggestBase.setupSuggestBaseDeserializer(op);
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TermSuggestOption.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TermSuggestOption.java
index d43cc55c4f..5658a5cddf 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TermSuggestOption.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TermSuggestOption.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,146 +44,145 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.TermSuggestOption
 
 @JsonpDeserializable
 public class TermSuggestOption implements JsonpSerializable {
-	private final String text;
-
-	@Nullable
-	private final Long freq;
-
-	private final double score;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TermSuggestOption(Builder builder) {
-
-		this.text = ApiTypeHelper.requireNonNull(builder.text, this, "text");
-		this.freq = builder.freq;
-		this.score = ApiTypeHelper.requireNonNull(builder.score, this, "score");
-
-	}
-
-	public static TermSuggestOption of(Function<Builder, ObjectBuilder<TermSuggestOption>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code text}
-	 */
-	public final String text() {
-		return this.text;
-	}
-
-	/**
-	 * API name: {@code freq}
-	 */
-	@Nullable
-	public final Long freq() {
-		return this.freq;
-	}
-
-	/**
-	 * Required - API name: {@code score}
-	 */
-	public final double score() {
-		return this.score;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("text");
-		generator.write(this.text);
-
-		if (this.freq != null) {
-			generator.writeKey("freq");
-			generator.write(this.freq);
-
-		}
-		generator.writeKey("score");
-		generator.write(this.score);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TermSuggestOption}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermSuggestOption> {
-		private String text;
-
-		@Nullable
-		private Long freq;
-
-		private Double score;
-
-		/**
-		 * Required - API name: {@code text}
-		 */
-		public final Builder text(String value) {
-			this.text = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code freq}
-		 */
-		public final Builder freq(@Nullable Long value) {
-			this.freq = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code score}
-		 */
-		public final Builder score(double value) {
-			this.score = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TermSuggestOption}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TermSuggestOption build() {
-			_checkSingleUse();
-
-			return new TermSuggestOption(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TermSuggestOption}
-	 */
-	public static final JsonpDeserializer<TermSuggestOption> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, TermSuggestOption::setupTermSuggestOptionDeserializer);
-
-	protected static void setupTermSuggestOptionDeserializer(ObjectDeserializer<TermSuggestOption.Builder> op) {
-
-		op.add(Builder::text, JsonpDeserializer.stringDeserializer(), "text");
-		op.add(Builder::freq, JsonpDeserializer.longDeserializer(), "freq");
-		op.add(Builder::score, JsonpDeserializer.doubleDeserializer(), "score");
-
-	}
+    private final String text;
+
+    @Nullable
+    private final Long freq;
+
+    private final double score;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TermSuggestOption(Builder builder) {
+
+        this.text = ApiTypeHelper.requireNonNull(builder.text, this, "text");
+        this.freq = builder.freq;
+        this.score = ApiTypeHelper.requireNonNull(builder.score, this, "score");
+
+    }
+
+    public static TermSuggestOption of(Function<Builder, ObjectBuilder<TermSuggestOption>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code text}
+     */
+    public final String text() {
+        return this.text;
+    }
+
+    /**
+     * API name: {@code freq}
+     */
+    @Nullable
+    public final Long freq() {
+        return this.freq;
+    }
+
+    /**
+     * Required - API name: {@code score}
+     */
+    public final double score() {
+        return this.score;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("text");
+        generator.write(this.text);
+
+        if (this.freq != null) {
+            generator.writeKey("freq");
+            generator.write(this.freq);
+
+        }
+        generator.writeKey("score");
+        generator.write(this.score);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TermSuggestOption}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermSuggestOption> {
+        private String text;
+
+        @Nullable
+        private Long freq;
+
+        private Double score;
+
+        /**
+         * Required - API name: {@code text}
+         */
+        public final Builder text(String value) {
+            this.text = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code freq}
+         */
+        public final Builder freq(@Nullable Long value) {
+            this.freq = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code score}
+         */
+        public final Builder score(double value) {
+            this.score = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link TermSuggestOption}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TermSuggestOption build() {
+            _checkSingleUse();
+
+            return new TermSuggestOption(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TermSuggestOption}
+     */
+    public static final JsonpDeserializer<TermSuggestOption> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TermSuggestOption::setupTermSuggestOptionDeserializer
+    );
+
+    protected static void setupTermSuggestOptionDeserializer(ObjectDeserializer<TermSuggestOption.Builder> op) {
+
+        op.add(Builder::text, JsonpDeserializer.stringDeserializer(), "text");
+        op.add(Builder::freq, JsonpDeserializer.longDeserializer(), "freq");
+        op.add(Builder::score, JsonpDeserializer.doubleDeserializer(), "score");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TermSuggester.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TermSuggester.java
index 43638b695d..fc3ea64ca0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TermSuggester.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TermSuggester.java
@@ -32,429 +32,430 @@
 
 package org.opensearch.client.opensearch.core.search;
 
-import org.opensearch.client.opensearch._types.SuggestMode;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.SuggestMode;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search._types.TermSuggester
 
-
 @JsonpDeserializable
 public class TermSuggester extends SuggesterBase implements FieldSuggesterVariant {
-	@Nullable
-	private final Boolean lowercaseTerms;
-
-	@Nullable
-	private final Integer maxEdits;
-
-	@Nullable
-	private final Integer maxInspections;
-
-	@Nullable
-	private final Float maxTermFreq;
-
-	@Nullable
-	private final Float minDocFreq;
-
-	@Nullable
-	private final Integer minWordLength;
-
-	@Nullable
-	private final Integer prefixLength;
-
-	@Nullable
-	private final Integer shardSize;
-
-	@Nullable
-	private final SuggestSort sort;
-
-	@Nullable
-	private final StringDistance stringDistance;
-
-	@Nullable
-	private final SuggestMode suggestMode;
-
-	@Nullable
-	private final String text;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TermSuggester(Builder builder) {
-		super(builder);
-
-		this.lowercaseTerms = builder.lowercaseTerms;
-		this.maxEdits = builder.maxEdits;
-		this.maxInspections = builder.maxInspections;
-		this.maxTermFreq = builder.maxTermFreq;
-		this.minDocFreq = builder.minDocFreq;
-		this.minWordLength = builder.minWordLength;
-		this.prefixLength = builder.prefixLength;
-		this.shardSize = builder.shardSize;
-		this.sort = builder.sort;
-		this.stringDistance = builder.stringDistance;
-		this.suggestMode = builder.suggestMode;
-		this.text = builder.text;
-
-	}
-
-	public static TermSuggester of(Function<Builder, ObjectBuilder<TermSuggester>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * FieldSuggester variant kind.
-	 */
-	@Override
-	public FieldSuggester.Kind _fieldSuggesterKind() {
-		return FieldSuggester.Kind.Term;
-	}
-
-	/**
-	 * API name: {@code lowercase_terms}
-	 */
-	@Nullable
-	public final Boolean lowercaseTerms() {
-		return this.lowercaseTerms;
-	}
-
-	/**
-	 * API name: {@code max_edits}
-	 */
-	@Nullable
-	public final Integer maxEdits() {
-		return this.maxEdits;
-	}
-
-	/**
-	 * API name: {@code max_inspections}
-	 */
-	@Nullable
-	public final Integer maxInspections() {
-		return this.maxInspections;
-	}
-
-	/**
-	 * API name: {@code max_term_freq}
-	 */
-	@Nullable
-	public final Float maxTermFreq() {
-		return this.maxTermFreq;
-	}
-
-	/**
-	 * API name: {@code min_doc_freq}
-	 */
-	@Nullable
-	public final Float minDocFreq() {
-		return this.minDocFreq;
-	}
-
-	/**
-	 * API name: {@code min_word_length}
-	 */
-	@Nullable
-	public final Integer minWordLength() {
-		return this.minWordLength;
-	}
-
-	/**
-	 * API name: {@code prefix_length}
-	 */
-	@Nullable
-	public final Integer prefixLength() {
-		return this.prefixLength;
-	}
-
-	/**
-	 * API name: {@code shard_size}
-	 */
-	@Nullable
-	public final Integer shardSize() {
-		return this.shardSize;
-	}
-
-	/**
-	 * API name: {@code sort}
-	 */
-	@Nullable
-	public final SuggestSort sort() {
-		return this.sort;
-	}
-
-	/**
-	 * API name: {@code string_distance}
-	 */
-	@Nullable
-	public final StringDistance stringDistance() {
-		return this.stringDistance;
-	}
-
-	/**
-	 * API name: {@code suggest_mode}
-	 */
-	@Nullable
-	public final SuggestMode suggestMode() {
-		return this.suggestMode;
-	}
-
-	/**
-	 * API name: {@code text}
-	 */
-	@Nullable
-	public final String text() {
-		return this.text;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.lowercaseTerms != null) {
-			generator.writeKey("lowercase_terms");
-			generator.write(this.lowercaseTerms);
-
-		}
-		if (this.maxEdits != null) {
-			generator.writeKey("max_edits");
-			generator.write(this.maxEdits);
-
-		}
-		if (this.maxInspections != null) {
-			generator.writeKey("max_inspections");
-			generator.write(this.maxInspections);
-
-		}
-		if (this.maxTermFreq != null) {
-			generator.writeKey("max_term_freq");
-			generator.write(this.maxTermFreq);
-
-		}
-		if (this.minDocFreq != null) {
-			generator.writeKey("min_doc_freq");
-			generator.write(this.minDocFreq);
-
-		}
-		if (this.minWordLength != null) {
-			generator.writeKey("min_word_length");
-			generator.write(this.minWordLength);
-
-		}
-		if (this.prefixLength != null) {
-			generator.writeKey("prefix_length");
-			generator.write(this.prefixLength);
-
-		}
-		if (this.shardSize != null) {
-			generator.writeKey("shard_size");
-			generator.write(this.shardSize);
-
-		}
-		if (this.sort != null) {
-			generator.writeKey("sort");
-			this.sort.serialize(generator, mapper);
-		}
-		if (this.stringDistance != null) {
-			generator.writeKey("string_distance");
-			this.stringDistance.serialize(generator, mapper);
-		}
-		if (this.suggestMode != null) {
-			generator.writeKey("suggest_mode");
-			this.suggestMode.serialize(generator, mapper);
-		}
-		if (this.text != null) {
-			generator.writeKey("text");
-			generator.write(this.text);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TermSuggester}.
-	 */
-
-	public static class Builder extends SuggesterBase.AbstractBuilder<Builder> implements ObjectBuilder<TermSuggester> {
-		@Nullable
-		private Boolean lowercaseTerms;
-
-		@Nullable
-		private Integer maxEdits;
-
-		@Nullable
-		private Integer maxInspections;
-
-		@Nullable
-		private Float maxTermFreq;
-
-		@Nullable
-		private Float minDocFreq;
-
-		@Nullable
-		private Integer minWordLength;
-
-		@Nullable
-		private Integer prefixLength;
-
-		@Nullable
-		private Integer shardSize;
-
-		@Nullable
-		private SuggestSort sort;
-
-		@Nullable
-		private StringDistance stringDistance;
-
-		@Nullable
-		private SuggestMode suggestMode;
-
-		@Nullable
-		private String text;
-
-		/**
-		 * API name: {@code lowercase_terms}
-		 */
-		public final Builder lowercaseTerms(@Nullable Boolean value) {
-			this.lowercaseTerms = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_edits}
-		 */
-		public final Builder maxEdits(@Nullable Integer value) {
-			this.maxEdits = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_inspections}
-		 */
-		public final Builder maxInspections(@Nullable Integer value) {
-			this.maxInspections = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_term_freq}
-		 */
-		public final Builder maxTermFreq(@Nullable Float value) {
-			this.maxTermFreq = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_doc_freq}
-		 */
-		public final Builder minDocFreq(@Nullable Float value) {
-			this.minDocFreq = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_word_length}
-		 */
-		public final Builder minWordLength(@Nullable Integer value) {
-			this.minWordLength = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code prefix_length}
-		 */
-		public final Builder prefixLength(@Nullable Integer value) {
-			this.prefixLength = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code shard_size}
-		 */
-		public final Builder shardSize(@Nullable Integer value) {
-			this.shardSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 */
-		public final Builder sort(@Nullable SuggestSort value) {
-			this.sort = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code string_distance}
-		 */
-		public final Builder stringDistance(@Nullable StringDistance value) {
-			this.stringDistance = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code suggest_mode}
-		 */
-		public final Builder suggestMode(@Nullable SuggestMode value) {
-			this.suggestMode = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code text}
-		 */
-		public final Builder text(@Nullable String value) {
-			this.text = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TermSuggester}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TermSuggester build() {
-			_checkSingleUse();
-
-			return new TermSuggester(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TermSuggester}
-	 */
-	public static final JsonpDeserializer<TermSuggester> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TermSuggester::setupTermSuggesterDeserializer);
-
-	protected static void setupTermSuggesterDeserializer(ObjectDeserializer<TermSuggester.Builder> op) {
-		SuggesterBase.setupSuggesterBaseDeserializer(op);
-		op.add(Builder::lowercaseTerms, JsonpDeserializer.booleanDeserializer(), "lowercase_terms");
-		op.add(Builder::maxEdits, JsonpDeserializer.integerDeserializer(), "max_edits");
-		op.add(Builder::maxInspections, JsonpDeserializer.integerDeserializer(), "max_inspections");
-		op.add(Builder::maxTermFreq, JsonpDeserializer.floatDeserializer(), "max_term_freq");
-		op.add(Builder::minDocFreq, JsonpDeserializer.floatDeserializer(), "min_doc_freq");
-		op.add(Builder::minWordLength, JsonpDeserializer.integerDeserializer(), "min_word_length");
-		op.add(Builder::prefixLength, JsonpDeserializer.integerDeserializer(), "prefix_length");
-		op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
-		op.add(Builder::sort, SuggestSort._DESERIALIZER, "sort");
-		op.add(Builder::stringDistance, StringDistance._DESERIALIZER, "string_distance");
-		op.add(Builder::suggestMode, SuggestMode._DESERIALIZER, "suggest_mode");
-		op.add(Builder::text, JsonpDeserializer.stringDeserializer(), "text");
-
-	}
+    @Nullable
+    private final Boolean lowercaseTerms;
+
+    @Nullable
+    private final Integer maxEdits;
+
+    @Nullable
+    private final Integer maxInspections;
+
+    @Nullable
+    private final Float maxTermFreq;
+
+    @Nullable
+    private final Float minDocFreq;
+
+    @Nullable
+    private final Integer minWordLength;
+
+    @Nullable
+    private final Integer prefixLength;
+
+    @Nullable
+    private final Integer shardSize;
+
+    @Nullable
+    private final SuggestSort sort;
+
+    @Nullable
+    private final StringDistance stringDistance;
+
+    @Nullable
+    private final SuggestMode suggestMode;
+
+    @Nullable
+    private final String text;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TermSuggester(Builder builder) {
+        super(builder);
+
+        this.lowercaseTerms = builder.lowercaseTerms;
+        this.maxEdits = builder.maxEdits;
+        this.maxInspections = builder.maxInspections;
+        this.maxTermFreq = builder.maxTermFreq;
+        this.minDocFreq = builder.minDocFreq;
+        this.minWordLength = builder.minWordLength;
+        this.prefixLength = builder.prefixLength;
+        this.shardSize = builder.shardSize;
+        this.sort = builder.sort;
+        this.stringDistance = builder.stringDistance;
+        this.suggestMode = builder.suggestMode;
+        this.text = builder.text;
+
+    }
+
+    public static TermSuggester of(Function<Builder, ObjectBuilder<TermSuggester>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * FieldSuggester variant kind.
+     */
+    @Override
+    public FieldSuggester.Kind _fieldSuggesterKind() {
+        return FieldSuggester.Kind.Term;
+    }
+
+    /**
+     * API name: {@code lowercase_terms}
+     */
+    @Nullable
+    public final Boolean lowercaseTerms() {
+        return this.lowercaseTerms;
+    }
+
+    /**
+     * API name: {@code max_edits}
+     */
+    @Nullable
+    public final Integer maxEdits() {
+        return this.maxEdits;
+    }
+
+    /**
+     * API name: {@code max_inspections}
+     */
+    @Nullable
+    public final Integer maxInspections() {
+        return this.maxInspections;
+    }
+
+    /**
+     * API name: {@code max_term_freq}
+     */
+    @Nullable
+    public final Float maxTermFreq() {
+        return this.maxTermFreq;
+    }
+
+    /**
+     * API name: {@code min_doc_freq}
+     */
+    @Nullable
+    public final Float minDocFreq() {
+        return this.minDocFreq;
+    }
+
+    /**
+     * API name: {@code min_word_length}
+     */
+    @Nullable
+    public final Integer minWordLength() {
+        return this.minWordLength;
+    }
+
+    /**
+     * API name: {@code prefix_length}
+     */
+    @Nullable
+    public final Integer prefixLength() {
+        return this.prefixLength;
+    }
+
+    /**
+     * API name: {@code shard_size}
+     */
+    @Nullable
+    public final Integer shardSize() {
+        return this.shardSize;
+    }
+
+    /**
+     * API name: {@code sort}
+     */
+    @Nullable
+    public final SuggestSort sort() {
+        return this.sort;
+    }
+
+    /**
+     * API name: {@code string_distance}
+     */
+    @Nullable
+    public final StringDistance stringDistance() {
+        return this.stringDistance;
+    }
+
+    /**
+     * API name: {@code suggest_mode}
+     */
+    @Nullable
+    public final SuggestMode suggestMode() {
+        return this.suggestMode;
+    }
+
+    /**
+     * API name: {@code text}
+     */
+    @Nullable
+    public final String text() {
+        return this.text;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (this.lowercaseTerms != null) {
+            generator.writeKey("lowercase_terms");
+            generator.write(this.lowercaseTerms);
+
+        }
+        if (this.maxEdits != null) {
+            generator.writeKey("max_edits");
+            generator.write(this.maxEdits);
+
+        }
+        if (this.maxInspections != null) {
+            generator.writeKey("max_inspections");
+            generator.write(this.maxInspections);
+
+        }
+        if (this.maxTermFreq != null) {
+            generator.writeKey("max_term_freq");
+            generator.write(this.maxTermFreq);
+
+        }
+        if (this.minDocFreq != null) {
+            generator.writeKey("min_doc_freq");
+            generator.write(this.minDocFreq);
+
+        }
+        if (this.minWordLength != null) {
+            generator.writeKey("min_word_length");
+            generator.write(this.minWordLength);
+
+        }
+        if (this.prefixLength != null) {
+            generator.writeKey("prefix_length");
+            generator.write(this.prefixLength);
+
+        }
+        if (this.shardSize != null) {
+            generator.writeKey("shard_size");
+            generator.write(this.shardSize);
+
+        }
+        if (this.sort != null) {
+            generator.writeKey("sort");
+            this.sort.serialize(generator, mapper);
+        }
+        if (this.stringDistance != null) {
+            generator.writeKey("string_distance");
+            this.stringDistance.serialize(generator, mapper);
+        }
+        if (this.suggestMode != null) {
+            generator.writeKey("suggest_mode");
+            this.suggestMode.serialize(generator, mapper);
+        }
+        if (this.text != null) {
+            generator.writeKey("text");
+            generator.write(this.text);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TermSuggester}.
+     */
+
+    public static class Builder extends SuggesterBase.AbstractBuilder<Builder> implements ObjectBuilder<TermSuggester> {
+        @Nullable
+        private Boolean lowercaseTerms;
+
+        @Nullable
+        private Integer maxEdits;
+
+        @Nullable
+        private Integer maxInspections;
+
+        @Nullable
+        private Float maxTermFreq;
+
+        @Nullable
+        private Float minDocFreq;
+
+        @Nullable
+        private Integer minWordLength;
+
+        @Nullable
+        private Integer prefixLength;
+
+        @Nullable
+        private Integer shardSize;
+
+        @Nullable
+        private SuggestSort sort;
+
+        @Nullable
+        private StringDistance stringDistance;
+
+        @Nullable
+        private SuggestMode suggestMode;
+
+        @Nullable
+        private String text;
+
+        /**
+         * API name: {@code lowercase_terms}
+         */
+        public final Builder lowercaseTerms(@Nullable Boolean value) {
+            this.lowercaseTerms = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_edits}
+         */
+        public final Builder maxEdits(@Nullable Integer value) {
+            this.maxEdits = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_inspections}
+         */
+        public final Builder maxInspections(@Nullable Integer value) {
+            this.maxInspections = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_term_freq}
+         */
+        public final Builder maxTermFreq(@Nullable Float value) {
+            this.maxTermFreq = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code min_doc_freq}
+         */
+        public final Builder minDocFreq(@Nullable Float value) {
+            this.minDocFreq = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code min_word_length}
+         */
+        public final Builder minWordLength(@Nullable Integer value) {
+            this.minWordLength = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code prefix_length}
+         */
+        public final Builder prefixLength(@Nullable Integer value) {
+            this.prefixLength = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code shard_size}
+         */
+        public final Builder shardSize(@Nullable Integer value) {
+            this.shardSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         */
+        public final Builder sort(@Nullable SuggestSort value) {
+            this.sort = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code string_distance}
+         */
+        public final Builder stringDistance(@Nullable StringDistance value) {
+            this.stringDistance = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code suggest_mode}
+         */
+        public final Builder suggestMode(@Nullable SuggestMode value) {
+            this.suggestMode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code text}
+         */
+        public final Builder text(@Nullable String value) {
+            this.text = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TermSuggester}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TermSuggester build() {
+            _checkSingleUse();
+
+            return new TermSuggester(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TermSuggester}
+     */
+    public static final JsonpDeserializer<TermSuggester> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TermSuggester::setupTermSuggesterDeserializer
+    );
+
+    protected static void setupTermSuggesterDeserializer(ObjectDeserializer<TermSuggester.Builder> op) {
+        SuggesterBase.setupSuggesterBaseDeserializer(op);
+        op.add(Builder::lowercaseTerms, JsonpDeserializer.booleanDeserializer(), "lowercase_terms");
+        op.add(Builder::maxEdits, JsonpDeserializer.integerDeserializer(), "max_edits");
+        op.add(Builder::maxInspections, JsonpDeserializer.integerDeserializer(), "max_inspections");
+        op.add(Builder::maxTermFreq, JsonpDeserializer.floatDeserializer(), "max_term_freq");
+        op.add(Builder::minDocFreq, JsonpDeserializer.floatDeserializer(), "min_doc_freq");
+        op.add(Builder::minWordLength, JsonpDeserializer.integerDeserializer(), "min_word_length");
+        op.add(Builder::prefixLength, JsonpDeserializer.integerDeserializer(), "prefix_length");
+        op.add(Builder::shardSize, JsonpDeserializer.integerDeserializer(), "shard_size");
+        op.add(Builder::sort, SuggestSort._DESERIALIZER, "sort");
+        op.add(Builder::stringDistance, StringDistance._DESERIALIZER, "string_distance");
+        op.add(Builder::suggestMode, SuggestMode._DESERIALIZER, "suggest_mode");
+        op.add(Builder::text, JsonpDeserializer.stringDeserializer(), "text");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TotalHits.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TotalHits.java
index 712f5a3a0f..8d43610809 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TotalHits.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TotalHits.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,116 +43,115 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.search._types.TotalHits
 
-
 @JsonpDeserializable
 public class TotalHits implements JsonpSerializable {
-	private final TotalHitsRelation relation;
-
-	private final long value;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TotalHits(Builder builder) {
-
-		this.relation = ApiTypeHelper.requireNonNull(builder.relation, this, "relation");
-		this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
-
-	}
-
-	public static TotalHits of(Function<Builder, ObjectBuilder<TotalHits>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code relation}
-	 */
-	public final TotalHitsRelation relation() {
-		return this.relation;
-	}
-
-	/**
-	 * Required - API name: {@code value}
-	 */
-	public final long value() {
-		return this.value;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("relation");
-		this.relation.serialize(generator, mapper);
-		generator.writeKey("value");
-		generator.write(this.value);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TotalHits}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TotalHits> {
-		private TotalHitsRelation relation;
-
-		private Long value;
-
-		/**
-		 * Required - API name: {@code relation}
-		 */
-		public final Builder relation(TotalHitsRelation value) {
-			this.relation = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code value}
-		 */
-		public final Builder value(long value) {
-			this.value = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TotalHits}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TotalHits build() {
-			_checkSingleUse();
-
-			return new TotalHits(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TotalHits}
-	 */
-	public static final JsonpDeserializer<TotalHits> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TotalHits::setupTotalHitsDeserializer);
-
-	protected static void setupTotalHitsDeserializer(ObjectDeserializer<TotalHits.Builder> op) {
-
-		op.add(Builder::relation, TotalHitsRelation._DESERIALIZER, "relation");
-		op.add(Builder::value, JsonpDeserializer.longDeserializer(), "value");
-
-	}
+    private final TotalHitsRelation relation;
+
+    private final long value;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TotalHits(Builder builder) {
+
+        this.relation = ApiTypeHelper.requireNonNull(builder.relation, this, "relation");
+        this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
+
+    }
+
+    public static TotalHits of(Function<Builder, ObjectBuilder<TotalHits>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code relation}
+     */
+    public final TotalHitsRelation relation() {
+        return this.relation;
+    }
+
+    /**
+     * Required - API name: {@code value}
+     */
+    public final long value() {
+        return this.value;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("relation");
+        this.relation.serialize(generator, mapper);
+        generator.writeKey("value");
+        generator.write(this.value);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TotalHits}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TotalHits> {
+        private TotalHitsRelation relation;
+
+        private Long value;
+
+        /**
+         * Required - API name: {@code relation}
+         */
+        public final Builder relation(TotalHitsRelation value) {
+            this.relation = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code value}
+         */
+        public final Builder value(long value) {
+            this.value = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link TotalHits}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TotalHits build() {
+            _checkSingleUse();
+
+            return new TotalHits(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TotalHits}
+     */
+    public static final JsonpDeserializer<TotalHits> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TotalHits::setupTotalHitsDeserializer
+    );
+
+    protected static void setupTotalHitsDeserializer(ObjectDeserializer<TotalHits.Builder> op) {
+
+        op.add(Builder::relation, TotalHitsRelation._DESERIALIZER, "relation");
+        op.add(Builder::value, JsonpDeserializer.longDeserializer(), "value");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TotalHitsRelation.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TotalHitsRelation.java
index b7e7bf6fac..d454d43a01 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TotalHitsRelation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TotalHitsRelation.java
@@ -35,31 +35,29 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum TotalHitsRelation implements JsonEnum {
-	/**
-	 * Accurate
-	 */
-	Eq("eq"),
+    /**
+     * Accurate
+     */
+    Eq("eq"),
 
-	/**
-	 * Lower bound, including returned events or sequences
-	 */
-	Gte("gte"),
+    /**
+     * Lower bound, including returned events or sequences
+     */
+    Gte("gte"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	TotalHitsRelation(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    TotalHitsRelation(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<TotalHitsRelation> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			TotalHitsRelation.values());
+    public static final JsonEnum.Deserializer<TotalHitsRelation> _DESERIALIZER = new JsonEnum.Deserializer<>(TotalHitsRelation.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TrackHits.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TrackHits.java
index 912b2fa1c4..e20ec2c5e5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TrackHits.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TrackHits.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core.search;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,8 +44,6 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.search._types.TrackHits
 
@@ -57,134 +57,135 @@
 @JsonpDeserializable
 public class TrackHits implements TaggedUnion<TrackHits.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Count, Enabled
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private TrackHits(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	public String _toJsonString() {
-		switch (_kind) {
-			case Count :
-				return String.valueOf(this.count());
-			case Enabled :
-				return String.valueOf(this.enabled());
-
-			default :
-				throw new IllegalStateException("Unknown kind " + _kind);
-		}
-	}
-
-	private TrackHits(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static TrackHits of(Function<Builder, ObjectBuilder<TrackHits>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code count}?
-	 */
-	public boolean isCount() {
-		return _kind == Kind.Count;
-	}
-
-	/**
-	 * Get the {@code count} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code count} kind.
-	 */
-	public Integer count() {
-		return TaggedUnionUtils.get(this, Kind.Count);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code enabled}?
-	 */
-	public boolean isEnabled() {
-		return _kind == Kind.Enabled;
-	}
-
-	/**
-	 * Get the {@code enabled} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code enabled} kind.
-	 */
-	public Boolean enabled() {
-		return TaggedUnionUtils.get(this, Kind.Enabled);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Count :
-					generator.write(((Integer) this._value));
-
-					break;
-				case Enabled :
-					generator.write(((Boolean) this._value));
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TrackHits> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<TrackHits> count(Integer v) {
-			this._kind = Kind.Count;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TrackHits> enabled(Boolean v) {
-			this._kind = Kind.Enabled;
-			this._value = v;
-			return this;
-		}
-
-		public TrackHits build() {
-			_checkSingleUse();
-			return new TrackHits(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<TrackHits> buildTrackHitsDeserializer() {
-		return new UnionDeserializer.Builder<TrackHits, Kind, Object>(TrackHits::new, false)
-				.addMember(Kind.Count, JsonpDeserializer.integerDeserializer())
-				.addMember(Kind.Enabled, JsonpDeserializer.booleanDeserializer()).build();
-	}
-
-	public static final JsonpDeserializer<TrackHits> _DESERIALIZER = JsonpDeserializer
-			.lazy(TrackHits::buildTrackHitsDeserializer);
+    public enum Kind {
+        Count,
+        Enabled
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private TrackHits(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    public String _toJsonString() {
+        switch (_kind) {
+            case Count:
+                return String.valueOf(this.count());
+            case Enabled:
+                return String.valueOf(this.enabled());
+
+            default:
+                throw new IllegalStateException("Unknown kind " + _kind);
+        }
+    }
+
+    private TrackHits(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static TrackHits of(Function<Builder, ObjectBuilder<TrackHits>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code count}?
+     */
+    public boolean isCount() {
+        return _kind == Kind.Count;
+    }
+
+    /**
+     * Get the {@code count} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code count} kind.
+     */
+    public Integer count() {
+        return TaggedUnionUtils.get(this, Kind.Count);
+    }
+
+    /**
+     * Is this variant instance of kind {@code enabled}?
+     */
+    public boolean isEnabled() {
+        return _kind == Kind.Enabled;
+    }
+
+    /**
+     * Get the {@code enabled} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code enabled} kind.
+     */
+    public Boolean enabled() {
+        return TaggedUnionUtils.get(this, Kind.Enabled);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Count:
+                    generator.write(((Integer) this._value));
+
+                    break;
+                case Enabled:
+                    generator.write(((Boolean) this._value));
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TrackHits> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<TrackHits> count(Integer v) {
+            this._kind = Kind.Count;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TrackHits> enabled(Boolean v) {
+            this._kind = Kind.Enabled;
+            this._value = v;
+            return this;
+        }
+
+        public TrackHits build() {
+            _checkSingleUse();
+            return new TrackHits(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<TrackHits> buildTrackHitsDeserializer() {
+        return new UnionDeserializer.Builder<TrackHits, Kind, Object>(TrackHits::new, false).addMember(
+            Kind.Count,
+            JsonpDeserializer.integerDeserializer()
+        ).addMember(Kind.Enabled, JsonpDeserializer.booleanDeserializer()).build();
+    }
+
+    public static final JsonpDeserializer<TrackHits> _DESERIALIZER = JsonpDeserializer.lazy(TrackHits::buildTrackHitsDeserializer);
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TrackHitsBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TrackHitsBuilders.java
index 27093f8db2..c1dfd39b22 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TrackHitsBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/TrackHitsBuilders.java
@@ -37,10 +37,9 @@
  * <p>
  * Variants <code>count</code>, <code>enabled</code> are not available here as
  * they don't have a dedicated class. Use {@link TrackHits}'s builder for these.
- * 
+ *
  */
 public class TrackHitsBuilders {
-	private TrackHitsBuilders() {
-	}
+    private TrackHitsBuilders() {}
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search_shards/ShardStoreIndex.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search_shards/ShardStoreIndex.java
index eaf821f191..532055ebc1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search_shards/ShardStoreIndex.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search_shards/ShardStoreIndex.java
@@ -32,163 +32,163 @@
 
 package org.opensearch.client.opensearch.core.search_shards;
 
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.search_shards.ShardStoreIndex
 
 @JsonpDeserializable
 public class ShardStoreIndex implements JsonpSerializable {
-	private final List<String> aliases;
-
-	@Nullable
-	private final Query filter;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShardStoreIndex(Builder builder) {
-
-		this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
-		this.filter = builder.filter;
-
-	}
-
-	public static ShardStoreIndex of(Function<Builder, ObjectBuilder<ShardStoreIndex>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code aliases}
-	 */
-	public final List<String> aliases() {
-		return this.aliases;
-	}
-
-	/**
-	 * API name: {@code filter}
-	 */
-	@Nullable
-	public final Query filter() {
-		return this.filter;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.aliases)) {
-			generator.writeKey("aliases");
-			generator.writeStartArray();
-			for (String item0 : this.aliases) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.filter != null) {
-			generator.writeKey("filter");
-			this.filter.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardStoreIndex}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardStoreIndex> {
-		@Nullable
-		private List<String> aliases;
-
-		@Nullable
-		private Query filter;
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>aliases</code>.
-		 */
-		public final Builder aliases(List<String> list) {
-			this.aliases = _listAddAll(this.aliases, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds one or more values to <code>aliases</code>.
-		 */
-		public final Builder aliases(String value, String... values) {
-			this.aliases = _listAdd(this.aliases, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(@Nullable Query value) {
-			this.filter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.filter(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ShardStoreIndex}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardStoreIndex build() {
-			_checkSingleUse();
-
-			return new ShardStoreIndex(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardStoreIndex}
-	 */
-	public static final JsonpDeserializer<ShardStoreIndex> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShardStoreIndex::setupShardStoreIndexDeserializer);
-
-	protected static void setupShardStoreIndexDeserializer(ObjectDeserializer<ShardStoreIndex.Builder> op) {
-
-		op.add(Builder::aliases, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"aliases");
-		op.add(Builder::filter, Query._DESERIALIZER, "filter");
-
-	}
+    private final List<String> aliases;
+
+    @Nullable
+    private final Query filter;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShardStoreIndex(Builder builder) {
+
+        this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
+        this.filter = builder.filter;
+
+    }
+
+    public static ShardStoreIndex of(Function<Builder, ObjectBuilder<ShardStoreIndex>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code aliases}
+     */
+    public final List<String> aliases() {
+        return this.aliases;
+    }
+
+    /**
+     * API name: {@code filter}
+     */
+    @Nullable
+    public final Query filter() {
+        return this.filter;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.aliases)) {
+            generator.writeKey("aliases");
+            generator.writeStartArray();
+            for (String item0 : this.aliases) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.filter != null) {
+            generator.writeKey("filter");
+            this.filter.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardStoreIndex}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardStoreIndex> {
+        @Nullable
+        private List<String> aliases;
+
+        @Nullable
+        private Query filter;
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>aliases</code>.
+         */
+        public final Builder aliases(List<String> list) {
+            this.aliases = _listAddAll(this.aliases, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds one or more values to <code>aliases</code>.
+         */
+        public final Builder aliases(String value, String... values) {
+            this.aliases = _listAdd(this.aliases, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(@Nullable Query value) {
+            this.filter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.filter(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ShardStoreIndex}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardStoreIndex build() {
+            _checkSingleUse();
+
+            return new ShardStoreIndex(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardStoreIndex}
+     */
+    public static final JsonpDeserializer<ShardStoreIndex> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardStoreIndex::setupShardStoreIndexDeserializer
+    );
+
+    protected static void setupShardStoreIndexDeserializer(ObjectDeserializer<ShardStoreIndex.Builder> op) {
+
+        op.add(Builder::aliases, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "aliases");
+        op.add(Builder::filter, Query._DESERIALIZER, "filter");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/FieldStatistics.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/FieldStatistics.java
index 1f51d0de9d..e1008aa068 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/FieldStatistics.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/FieldStatistics.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.core.termvectors;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,141 +43,140 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: _global.termvectors.FieldStatistics
 
-
 @JsonpDeserializable
 public class FieldStatistics implements JsonpSerializable {
-	private final int docCount;
-
-	private final long sumDocFreq;
-
-	private final long sumTtf;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FieldStatistics(Builder builder) {
-
-		this.docCount = ApiTypeHelper.requireNonNull(builder.docCount, this, "docCount");
-		this.sumDocFreq = ApiTypeHelper.requireNonNull(builder.sumDocFreq, this, "sumDocFreq");
-		this.sumTtf = ApiTypeHelper.requireNonNull(builder.sumTtf, this, "sumTtf");
-
-	}
-
-	public static FieldStatistics of(Function<Builder, ObjectBuilder<FieldStatistics>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code doc_count}
-	 */
-	public final int docCount() {
-		return this.docCount;
-	}
+    private final int docCount;
 
-	/**
-	 * Required - API name: {@code sum_doc_freq}
-	 */
-	public final long sumDocFreq() {
-		return this.sumDocFreq;
-	}
-
-	/**
-	 * Required - API name: {@code sum_ttf}
-	 */
-	public final long sumTtf() {
-		return this.sumTtf;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("doc_count");
-		generator.write(this.docCount);
-
-		generator.writeKey("sum_doc_freq");
-		generator.write(this.sumDocFreq);
-
-		generator.writeKey("sum_ttf");
-		generator.write(this.sumTtf);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FieldStatistics}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldStatistics> {
-		private Integer docCount;
-
-		private Long sumDocFreq;
-
-		private Long sumTtf;
-
-		/**
-		 * Required - API name: {@code doc_count}
-		 */
-		public final Builder docCount(int value) {
-			this.docCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code sum_doc_freq}
-		 */
-		public final Builder sumDocFreq(long value) {
-			this.sumDocFreq = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code sum_ttf}
-		 */
-		public final Builder sumTtf(long value) {
-			this.sumTtf = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FieldStatistics}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FieldStatistics build() {
-			_checkSingleUse();
-
-			return new FieldStatistics(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FieldStatistics}
-	 */
-	public static final JsonpDeserializer<FieldStatistics> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FieldStatistics::setupFieldStatisticsDeserializer);
-
-	protected static void setupFieldStatisticsDeserializer(ObjectDeserializer<FieldStatistics.Builder> op) {
-
-		op.add(Builder::docCount, JsonpDeserializer.integerDeserializer(), "doc_count");
-		op.add(Builder::sumDocFreq, JsonpDeserializer.longDeserializer(), "sum_doc_freq");
-		op.add(Builder::sumTtf, JsonpDeserializer.longDeserializer(), "sum_ttf");
-
-	}
+    private final long sumDocFreq;
+
+    private final long sumTtf;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FieldStatistics(Builder builder) {
+
+        this.docCount = ApiTypeHelper.requireNonNull(builder.docCount, this, "docCount");
+        this.sumDocFreq = ApiTypeHelper.requireNonNull(builder.sumDocFreq, this, "sumDocFreq");
+        this.sumTtf = ApiTypeHelper.requireNonNull(builder.sumTtf, this, "sumTtf");
+
+    }
+
+    public static FieldStatistics of(Function<Builder, ObjectBuilder<FieldStatistics>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code doc_count}
+     */
+    public final int docCount() {
+        return this.docCount;
+    }
+
+    /**
+     * Required - API name: {@code sum_doc_freq}
+     */
+    public final long sumDocFreq() {
+        return this.sumDocFreq;
+    }
+
+    /**
+     * Required - API name: {@code sum_ttf}
+     */
+    public final long sumTtf() {
+        return this.sumTtf;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("doc_count");
+        generator.write(this.docCount);
+
+        generator.writeKey("sum_doc_freq");
+        generator.write(this.sumDocFreq);
+
+        generator.writeKey("sum_ttf");
+        generator.write(this.sumTtf);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FieldStatistics}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldStatistics> {
+        private Integer docCount;
+
+        private Long sumDocFreq;
+
+        private Long sumTtf;
+
+        /**
+         * Required - API name: {@code doc_count}
+         */
+        public final Builder docCount(int value) {
+            this.docCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code sum_doc_freq}
+         */
+        public final Builder sumDocFreq(long value) {
+            this.sumDocFreq = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code sum_ttf}
+         */
+        public final Builder sumTtf(long value) {
+            this.sumTtf = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link FieldStatistics}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FieldStatistics build() {
+            _checkSingleUse();
+
+            return new FieldStatistics(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FieldStatistics}
+     */
+    public static final JsonpDeserializer<FieldStatistics> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FieldStatistics::setupFieldStatisticsDeserializer
+    );
+
+    protected static void setupFieldStatisticsDeserializer(ObjectDeserializer<FieldStatistics.Builder> op) {
+
+        op.add(Builder::docCount, JsonpDeserializer.integerDeserializer(), "doc_count");
+        op.add(Builder::sumDocFreq, JsonpDeserializer.longDeserializer(), "sum_doc_freq");
+        op.add(Builder::sumTtf, JsonpDeserializer.longDeserializer(), "sum_ttf");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/Filter.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/Filter.java
index c11333e209..3c7f915bd7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/Filter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/Filter.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.termvectors;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,273 +43,272 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.termvectors.Filter
 
 @JsonpDeserializable
 public class Filter implements JsonpSerializable {
-	@Nullable
-	private final Integer maxDocFreq;
-
-	@Nullable
-	private final Integer maxNumTerms;
-
-	@Nullable
-	private final Integer maxTermFreq;
-
-	@Nullable
-	private final Integer maxWordLength;
-
-	@Nullable
-	private final Integer minDocFreq;
-
-	@Nullable
-	private final Integer minTermFreq;
-
-	@Nullable
-	private final Integer minWordLength;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Filter(Builder builder) {
-
-		this.maxDocFreq = builder.maxDocFreq;
-		this.maxNumTerms = builder.maxNumTerms;
-		this.maxTermFreq = builder.maxTermFreq;
-		this.maxWordLength = builder.maxWordLength;
-		this.minDocFreq = builder.minDocFreq;
-		this.minTermFreq = builder.minTermFreq;
-		this.minWordLength = builder.minWordLength;
-
-	}
-
-	public static Filter of(Function<Builder, ObjectBuilder<Filter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code max_doc_freq}
-	 */
-	@Nullable
-	public final Integer maxDocFreq() {
-		return this.maxDocFreq;
-	}
-
-	/**
-	 * API name: {@code max_num_terms}
-	 */
-	@Nullable
-	public final Integer maxNumTerms() {
-		return this.maxNumTerms;
-	}
-
-	/**
-	 * API name: {@code max_term_freq}
-	 */
-	@Nullable
-	public final Integer maxTermFreq() {
-		return this.maxTermFreq;
-	}
-
-	/**
-	 * API name: {@code max_word_length}
-	 */
-	@Nullable
-	public final Integer maxWordLength() {
-		return this.maxWordLength;
-	}
-
-	/**
-	 * API name: {@code min_doc_freq}
-	 */
-	@Nullable
-	public final Integer minDocFreq() {
-		return this.minDocFreq;
-	}
-
-	/**
-	 * API name: {@code min_term_freq}
-	 */
-	@Nullable
-	public final Integer minTermFreq() {
-		return this.minTermFreq;
-	}
-
-	/**
-	 * API name: {@code min_word_length}
-	 */
-	@Nullable
-	public final Integer minWordLength() {
-		return this.minWordLength;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.maxDocFreq != null) {
-			generator.writeKey("max_doc_freq");
-			generator.write(this.maxDocFreq);
-
-		}
-		if (this.maxNumTerms != null) {
-			generator.writeKey("max_num_terms");
-			generator.write(this.maxNumTerms);
-
-		}
-		if (this.maxTermFreq != null) {
-			generator.writeKey("max_term_freq");
-			generator.write(this.maxTermFreq);
-
-		}
-		if (this.maxWordLength != null) {
-			generator.writeKey("max_word_length");
-			generator.write(this.maxWordLength);
-
-		}
-		if (this.minDocFreq != null) {
-			generator.writeKey("min_doc_freq");
-			generator.write(this.minDocFreq);
-
-		}
-		if (this.minTermFreq != null) {
-			generator.writeKey("min_term_freq");
-			generator.write(this.minTermFreq);
-
-		}
-		if (this.minWordLength != null) {
-			generator.writeKey("min_word_length");
-			generator.write(this.minWordLength);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Filter}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Filter> {
-		@Nullable
-		private Integer maxDocFreq;
-
-		@Nullable
-		private Integer maxNumTerms;
-
-		@Nullable
-		private Integer maxTermFreq;
-
-		@Nullable
-		private Integer maxWordLength;
-
-		@Nullable
-		private Integer minDocFreq;
-
-		@Nullable
-		private Integer minTermFreq;
-
-		@Nullable
-		private Integer minWordLength;
-
-		/**
-		 * API name: {@code max_doc_freq}
-		 */
-		public final Builder maxDocFreq(@Nullable Integer value) {
-			this.maxDocFreq = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_num_terms}
-		 */
-		public final Builder maxNumTerms(@Nullable Integer value) {
-			this.maxNumTerms = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_term_freq}
-		 */
-		public final Builder maxTermFreq(@Nullable Integer value) {
-			this.maxTermFreq = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_word_length}
-		 */
-		public final Builder maxWordLength(@Nullable Integer value) {
-			this.maxWordLength = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_doc_freq}
-		 */
-		public final Builder minDocFreq(@Nullable Integer value) {
-			this.minDocFreq = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_term_freq}
-		 */
-		public final Builder minTermFreq(@Nullable Integer value) {
-			this.minTermFreq = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_word_length}
-		 */
-		public final Builder minWordLength(@Nullable Integer value) {
-			this.minWordLength = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Filter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Filter build() {
-			_checkSingleUse();
-
-			return new Filter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Filter}
-	 */
-	public static final JsonpDeserializer<Filter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Filter::setupFilterDeserializer);
-
-	protected static void setupFilterDeserializer(ObjectDeserializer<Filter.Builder> op) {
-
-		op.add(Builder::maxDocFreq, JsonpDeserializer.integerDeserializer(), "max_doc_freq");
-		op.add(Builder::maxNumTerms, JsonpDeserializer.integerDeserializer(), "max_num_terms");
-		op.add(Builder::maxTermFreq, JsonpDeserializer.integerDeserializer(), "max_term_freq");
-		op.add(Builder::maxWordLength, JsonpDeserializer.integerDeserializer(), "max_word_length");
-		op.add(Builder::minDocFreq, JsonpDeserializer.integerDeserializer(), "min_doc_freq");
-		op.add(Builder::minTermFreq, JsonpDeserializer.integerDeserializer(), "min_term_freq");
-		op.add(Builder::minWordLength, JsonpDeserializer.integerDeserializer(), "min_word_length");
-
-	}
+    @Nullable
+    private final Integer maxDocFreq;
+
+    @Nullable
+    private final Integer maxNumTerms;
+
+    @Nullable
+    private final Integer maxTermFreq;
+
+    @Nullable
+    private final Integer maxWordLength;
+
+    @Nullable
+    private final Integer minDocFreq;
+
+    @Nullable
+    private final Integer minTermFreq;
+
+    @Nullable
+    private final Integer minWordLength;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Filter(Builder builder) {
+
+        this.maxDocFreq = builder.maxDocFreq;
+        this.maxNumTerms = builder.maxNumTerms;
+        this.maxTermFreq = builder.maxTermFreq;
+        this.maxWordLength = builder.maxWordLength;
+        this.minDocFreq = builder.minDocFreq;
+        this.minTermFreq = builder.minTermFreq;
+        this.minWordLength = builder.minWordLength;
+
+    }
+
+    public static Filter of(Function<Builder, ObjectBuilder<Filter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code max_doc_freq}
+     */
+    @Nullable
+    public final Integer maxDocFreq() {
+        return this.maxDocFreq;
+    }
+
+    /**
+     * API name: {@code max_num_terms}
+     */
+    @Nullable
+    public final Integer maxNumTerms() {
+        return this.maxNumTerms;
+    }
+
+    /**
+     * API name: {@code max_term_freq}
+     */
+    @Nullable
+    public final Integer maxTermFreq() {
+        return this.maxTermFreq;
+    }
+
+    /**
+     * API name: {@code max_word_length}
+     */
+    @Nullable
+    public final Integer maxWordLength() {
+        return this.maxWordLength;
+    }
+
+    /**
+     * API name: {@code min_doc_freq}
+     */
+    @Nullable
+    public final Integer minDocFreq() {
+        return this.minDocFreq;
+    }
+
+    /**
+     * API name: {@code min_term_freq}
+     */
+    @Nullable
+    public final Integer minTermFreq() {
+        return this.minTermFreq;
+    }
+
+    /**
+     * API name: {@code min_word_length}
+     */
+    @Nullable
+    public final Integer minWordLength() {
+        return this.minWordLength;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.maxDocFreq != null) {
+            generator.writeKey("max_doc_freq");
+            generator.write(this.maxDocFreq);
+
+        }
+        if (this.maxNumTerms != null) {
+            generator.writeKey("max_num_terms");
+            generator.write(this.maxNumTerms);
+
+        }
+        if (this.maxTermFreq != null) {
+            generator.writeKey("max_term_freq");
+            generator.write(this.maxTermFreq);
+
+        }
+        if (this.maxWordLength != null) {
+            generator.writeKey("max_word_length");
+            generator.write(this.maxWordLength);
+
+        }
+        if (this.minDocFreq != null) {
+            generator.writeKey("min_doc_freq");
+            generator.write(this.minDocFreq);
+
+        }
+        if (this.minTermFreq != null) {
+            generator.writeKey("min_term_freq");
+            generator.write(this.minTermFreq);
+
+        }
+        if (this.minWordLength != null) {
+            generator.writeKey("min_word_length");
+            generator.write(this.minWordLength);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Filter}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Filter> {
+        @Nullable
+        private Integer maxDocFreq;
+
+        @Nullable
+        private Integer maxNumTerms;
+
+        @Nullable
+        private Integer maxTermFreq;
+
+        @Nullable
+        private Integer maxWordLength;
+
+        @Nullable
+        private Integer minDocFreq;
+
+        @Nullable
+        private Integer minTermFreq;
+
+        @Nullable
+        private Integer minWordLength;
+
+        /**
+         * API name: {@code max_doc_freq}
+         */
+        public final Builder maxDocFreq(@Nullable Integer value) {
+            this.maxDocFreq = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_num_terms}
+         */
+        public final Builder maxNumTerms(@Nullable Integer value) {
+            this.maxNumTerms = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_term_freq}
+         */
+        public final Builder maxTermFreq(@Nullable Integer value) {
+            this.maxTermFreq = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_word_length}
+         */
+        public final Builder maxWordLength(@Nullable Integer value) {
+            this.maxWordLength = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code min_doc_freq}
+         */
+        public final Builder minDocFreq(@Nullable Integer value) {
+            this.minDocFreq = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code min_term_freq}
+         */
+        public final Builder minTermFreq(@Nullable Integer value) {
+            this.minTermFreq = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code min_word_length}
+         */
+        public final Builder minWordLength(@Nullable Integer value) {
+            this.minWordLength = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Filter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Filter build() {
+            _checkSingleUse();
+
+            return new Filter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Filter}
+     */
+    public static final JsonpDeserializer<Filter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Filter::setupFilterDeserializer
+    );
+
+    protected static void setupFilterDeserializer(ObjectDeserializer<Filter.Builder> op) {
+
+        op.add(Builder::maxDocFreq, JsonpDeserializer.integerDeserializer(), "max_doc_freq");
+        op.add(Builder::maxNumTerms, JsonpDeserializer.integerDeserializer(), "max_num_terms");
+        op.add(Builder::maxTermFreq, JsonpDeserializer.integerDeserializer(), "max_term_freq");
+        op.add(Builder::maxWordLength, JsonpDeserializer.integerDeserializer(), "max_word_length");
+        op.add(Builder::minDocFreq, JsonpDeserializer.integerDeserializer(), "min_doc_freq");
+        op.add(Builder::minTermFreq, JsonpDeserializer.integerDeserializer(), "min_term_freq");
+        op.add(Builder::minWordLength, JsonpDeserializer.integerDeserializer(), "min_word_length");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/Term.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/Term.java
index d82d483a44..733704de66 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/Term.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/Term.java
@@ -48,230 +48,228 @@
 
 // typedef: _global.termvectors.Term
 
-
 @JsonpDeserializable
 public class Term implements JsonpSerializable {
-	@Nullable
-	private final Integer docFreq;
-
-	@Nullable
-	private final Double score;
-
-	private final Integer termFreq;
-
-	private final List<Token> tokens;
-
-	@Nullable
-	private final Integer ttf;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Term(Builder builder) {
-
-		this.docFreq = builder.docFreq;
-		this.score = builder.score;
-		this.termFreq = builder.termFreq;
-		this.tokens = ApiTypeHelper.unmodifiable(builder.tokens);
-		this.ttf = builder.ttf;
-
-	}
-
-	public static Term of(Function<Builder, ObjectBuilder<Term>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code doc_freq}
-	 */
-	@Nullable
-	public final Integer docFreq() {
-		return this.docFreq;
-	}
-
-	/**
-	 * API name: {@code score}
-	 */
-	@Nullable
-	public final Double score() {
-		return this.score;
-	}
-
-	/**
-	 * Required - API name: {@code term_freq}
-	 */
-	public final int termFreq() {
-		return this.termFreq;
-	}
-
-	/**
-	 * Required - API name: {@code tokens}
-	 */
-	public final List<Token> tokens() {
-		return this.tokens;
-	}
-
-	/**
-	 * API name: {@code ttf}
-	 */
-	@Nullable
-	public final Integer ttf() {
-		return this.ttf;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.docFreq != null) {
-			generator.writeKey("doc_freq");
-			generator.write(this.docFreq);
-
-		}
-		if (this.score != null) {
-			generator.writeKey("score");
-			generator.write(this.score);
-
-		}
-		if (null != this.termFreq) {
-			generator.writeKey("term_freq");
-			generator.write(this.termFreq);
-		}
-
-		if (ApiTypeHelper.isDefined(this.tokens)) {
-			generator.writeKey("tokens");
-			generator.writeStartArray();
-			for (Token item0 : this.tokens) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.ttf != null) {
-			generator.writeKey("ttf");
-			generator.write(this.ttf);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Term}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Term> {
-		@Nullable
-		private Integer docFreq;
-
-		@Nullable
-		private Double score;
-
-		private Integer termFreq;
-
-		private List<Token> tokens;
-
-		@Nullable
-		private Integer ttf;
-
-		/**
-		 * API name: {@code doc_freq}
-		 */
-		public final Builder docFreq(@Nullable Integer value) {
-			this.docFreq = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code score}
-		 */
-		public final Builder score(@Nullable Double value) {
-			this.score = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code term_freq}
-		 */
-		public final Builder termFreq(int value) {
-			this.termFreq = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tokens}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>tokens</code>.
-		 */
-		public final Builder tokens(List<Token> list) {
-			this.tokens = _listAddAll(this.tokens, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tokens}
-		 * <p>
-		 * Adds one or more values to <code>tokens</code>.
-		 */
-		public final Builder tokens(Token value, Token... values) {
-			this.tokens = _listAdd(this.tokens, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tokens}
-		 * <p>
-		 * Adds a value to <code>tokens</code> using a builder lambda.
-		 */
-		public final Builder tokens(Function<Token.Builder, ObjectBuilder<Token>> fn) {
-			return tokens(fn.apply(new Token.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code ttf}
-		 */
-		public final Builder ttf(@Nullable Integer value) {
-			this.ttf = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Term}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Term build() {
-			_checkSingleUse();
-
-			return new Term(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Term}
-	 */
-	public static final JsonpDeserializer<Term> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Term::setupTermDeserializer);
-
-	protected static void setupTermDeserializer(ObjectDeserializer<Term.Builder> op) {
-
-		op.add(Builder::docFreq, JsonpDeserializer.integerDeserializer(), "doc_freq");
-		op.add(Builder::score, JsonpDeserializer.doubleDeserializer(), "score");
-		op.add(Builder::termFreq, JsonpDeserializer.integerDeserializer(), "term_freq");
-		op.add(Builder::tokens, JsonpDeserializer.arrayDeserializer(Token._DESERIALIZER), "tokens");
-		op.add(Builder::ttf, JsonpDeserializer.integerDeserializer(), "ttf");
-
-	}
+    @Nullable
+    private final Integer docFreq;
+
+    @Nullable
+    private final Double score;
+
+    private final Integer termFreq;
+
+    private final List<Token> tokens;
+
+    @Nullable
+    private final Integer ttf;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Term(Builder builder) {
+
+        this.docFreq = builder.docFreq;
+        this.score = builder.score;
+        this.termFreq = builder.termFreq;
+        this.tokens = ApiTypeHelper.unmodifiable(builder.tokens);
+        this.ttf = builder.ttf;
+
+    }
+
+    public static Term of(Function<Builder, ObjectBuilder<Term>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code doc_freq}
+     */
+    @Nullable
+    public final Integer docFreq() {
+        return this.docFreq;
+    }
+
+    /**
+     * API name: {@code score}
+     */
+    @Nullable
+    public final Double score() {
+        return this.score;
+    }
+
+    /**
+     * Required - API name: {@code term_freq}
+     */
+    public final int termFreq() {
+        return this.termFreq;
+    }
+
+    /**
+     * Required - API name: {@code tokens}
+     */
+    public final List<Token> tokens() {
+        return this.tokens;
+    }
+
+    /**
+     * API name: {@code ttf}
+     */
+    @Nullable
+    public final Integer ttf() {
+        return this.ttf;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.docFreq != null) {
+            generator.writeKey("doc_freq");
+            generator.write(this.docFreq);
+
+        }
+        if (this.score != null) {
+            generator.writeKey("score");
+            generator.write(this.score);
+
+        }
+        if (null != this.termFreq) {
+            generator.writeKey("term_freq");
+            generator.write(this.termFreq);
+        }
+
+        if (ApiTypeHelper.isDefined(this.tokens)) {
+            generator.writeKey("tokens");
+            generator.writeStartArray();
+            for (Token item0 : this.tokens) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.ttf != null) {
+            generator.writeKey("ttf");
+            generator.write(this.ttf);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Term}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Term> {
+        @Nullable
+        private Integer docFreq;
+
+        @Nullable
+        private Double score;
+
+        private Integer termFreq;
+
+        private List<Token> tokens;
+
+        @Nullable
+        private Integer ttf;
+
+        /**
+         * API name: {@code doc_freq}
+         */
+        public final Builder docFreq(@Nullable Integer value) {
+            this.docFreq = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code score}
+         */
+        public final Builder score(@Nullable Double value) {
+            this.score = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code term_freq}
+         */
+        public final Builder termFreq(int value) {
+            this.termFreq = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tokens}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>tokens</code>.
+         */
+        public final Builder tokens(List<Token> list) {
+            this.tokens = _listAddAll(this.tokens, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tokens}
+         * <p>
+         * Adds one or more values to <code>tokens</code>.
+         */
+        public final Builder tokens(Token value, Token... values) {
+            this.tokens = _listAdd(this.tokens, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tokens}
+         * <p>
+         * Adds a value to <code>tokens</code> using a builder lambda.
+         */
+        public final Builder tokens(Function<Token.Builder, ObjectBuilder<Token>> fn) {
+            return tokens(fn.apply(new Token.Builder()).build());
+        }
+
+        /**
+         * API name: {@code ttf}
+         */
+        public final Builder ttf(@Nullable Integer value) {
+            this.ttf = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Term}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Term build() {
+            _checkSingleUse();
+
+            return new Term(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Term}
+     */
+    public static final JsonpDeserializer<Term> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new, Term::setupTermDeserializer);
+
+    protected static void setupTermDeserializer(ObjectDeserializer<Term.Builder> op) {
+
+        op.add(Builder::docFreq, JsonpDeserializer.integerDeserializer(), "doc_freq");
+        op.add(Builder::score, JsonpDeserializer.doubleDeserializer(), "score");
+        op.add(Builder::termFreq, JsonpDeserializer.integerDeserializer(), "term_freq");
+        op.add(Builder::tokens, JsonpDeserializer.arrayDeserializer(Token._DESERIALIZER), "tokens");
+        op.add(Builder::ttf, JsonpDeserializer.integerDeserializer(), "ttf");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/TermVector.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/TermVector.java
index 26d0c006f9..55b7f0aeff 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/TermVector.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/TermVector.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.termvectors;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,157 +44,155 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _global.termvectors.TermVector
 
-
 @JsonpDeserializable
 public class TermVector implements JsonpSerializable {
-	private final FieldStatistics fieldStatistics;
-
-	private final Map<String, Term> terms;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TermVector(Builder builder) {
-
-		this.fieldStatistics = builder.fieldStatistics;
-		this.terms = ApiTypeHelper.unmodifiableRequired(builder.terms, this, "terms");
-
-	}
-
-	public static TermVector of(Function<Builder, ObjectBuilder<TermVector>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code field_statistics}
-	 */
-	public final FieldStatistics fieldStatistics() {
-		return this.fieldStatistics;
-	}
-
-	/**
-	 * Required - API name: {@code terms}
-	 */
-	public final Map<String, Term> terms() {
-		return this.terms;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (null != this.fieldStatistics) {
-			generator.writeKey("field_statistics");
-			this.fieldStatistics.serialize(generator, mapper);
-		}
-
-		if (ApiTypeHelper.isDefined(this.terms)) {
-			generator.writeKey("terms");
-			generator.writeStartObject();
-			for (Map.Entry<String, Term> item0 : this.terms.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TermVector}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermVector> {
-		private FieldStatistics fieldStatistics;
-
-		private Map<String, Term> terms;
-
-		/**
-		 * Required - API name: {@code field_statistics}
-		 */
-		public final Builder fieldStatistics(FieldStatistics value) {
-			this.fieldStatistics = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code field_statistics}
-		 */
-		public final Builder fieldStatistics(Function<FieldStatistics.Builder, ObjectBuilder<FieldStatistics>> fn) {
-			return this.fieldStatistics(fn.apply(new FieldStatistics.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code terms}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>terms</code>.
-		 */
-		public final Builder terms(Map<String, Term> map) {
-			this.terms = _mapPutAll(this.terms, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code terms}
-		 * <p>
-		 * Adds an entry to <code>terms</code>.
-		 */
-		public final Builder terms(String key, Term value) {
-			this.terms = _mapPut(this.terms, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code terms}
-		 * <p>
-		 * Adds an entry to <code>terms</code> using a builder lambda.
-		 */
-		public final Builder terms(String key, Function<Term.Builder, ObjectBuilder<Term>> fn) {
-			return terms(key, fn.apply(new Term.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link TermVector}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TermVector build() {
-			_checkSingleUse();
-
-			return new TermVector(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TermVector}
-	 */
-	public static final JsonpDeserializer<TermVector> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TermVector::setupTermVectorDeserializer);
-
-	protected static void setupTermVectorDeserializer(ObjectDeserializer<TermVector.Builder> op) {
-
-		op.add(Builder::fieldStatistics, FieldStatistics._DESERIALIZER, "field_statistics");
-		op.add(Builder::terms, JsonpDeserializer.stringMapDeserializer(Term._DESERIALIZER), "terms");
-
-	}
+    private final FieldStatistics fieldStatistics;
+
+    private final Map<String, Term> terms;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TermVector(Builder builder) {
+
+        this.fieldStatistics = builder.fieldStatistics;
+        this.terms = ApiTypeHelper.unmodifiableRequired(builder.terms, this, "terms");
+
+    }
+
+    public static TermVector of(Function<Builder, ObjectBuilder<TermVector>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code field_statistics}
+     */
+    public final FieldStatistics fieldStatistics() {
+        return this.fieldStatistics;
+    }
+
+    /**
+     * Required - API name: {@code terms}
+     */
+    public final Map<String, Term> terms() {
+        return this.terms;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (null != this.fieldStatistics) {
+            generator.writeKey("field_statistics");
+            this.fieldStatistics.serialize(generator, mapper);
+        }
+
+        if (ApiTypeHelper.isDefined(this.terms)) {
+            generator.writeKey("terms");
+            generator.writeStartObject();
+            for (Map.Entry<String, Term> item0 : this.terms.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TermVector}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermVector> {
+        private FieldStatistics fieldStatistics;
+
+        private Map<String, Term> terms;
+
+        /**
+         * Required - API name: {@code field_statistics}
+         */
+        public final Builder fieldStatistics(FieldStatistics value) {
+            this.fieldStatistics = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code field_statistics}
+         */
+        public final Builder fieldStatistics(Function<FieldStatistics.Builder, ObjectBuilder<FieldStatistics>> fn) {
+            return this.fieldStatistics(fn.apply(new FieldStatistics.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code terms}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>terms</code>.
+         */
+        public final Builder terms(Map<String, Term> map) {
+            this.terms = _mapPutAll(this.terms, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code terms}
+         * <p>
+         * Adds an entry to <code>terms</code>.
+         */
+        public final Builder terms(String key, Term value) {
+            this.terms = _mapPut(this.terms, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code terms}
+         * <p>
+         * Adds an entry to <code>terms</code> using a builder lambda.
+         */
+        public final Builder terms(String key, Function<Term.Builder, ObjectBuilder<Term>> fn) {
+            return terms(key, fn.apply(new Term.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link TermVector}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TermVector build() {
+            _checkSingleUse();
+
+            return new TermVector(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TermVector}
+     */
+    public static final JsonpDeserializer<TermVector> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TermVector::setupTermVectorDeserializer
+    );
+
+    protected static void setupTermVectorDeserializer(ObjectDeserializer<TermVector.Builder> op) {
+
+        op.add(Builder::fieldStatistics, FieldStatistics._DESERIALIZER, "field_statistics");
+        op.add(Builder::terms, JsonpDeserializer.stringMapDeserializer(Term._DESERIALIZER), "terms");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/Token.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/Token.java
index 492a1b9942..7ebd429df1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/Token.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/termvectors/Token.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.core.termvectors;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,182 +44,180 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: _global.termvectors.Token
 
-
 @JsonpDeserializable
 public class Token implements JsonpSerializable {
-	@Nullable
-	private final Integer endOffset;
+    @Nullable
+    private final Integer endOffset;
 
-	@Nullable
-	private final String payload;
+    @Nullable
+    private final String payload;
 
-	private final int position;
+    private final int position;
 
-	@Nullable
-	private final Integer startOffset;
+    @Nullable
+    private final Integer startOffset;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private Token(Builder builder) {
+    // ---------------------------------------------------------------------------------------------
+
+    private Token(Builder builder) {
 
-		this.endOffset = builder.endOffset;
-		this.payload = builder.payload;
-		this.position = ApiTypeHelper.requireNonNull(builder.position, this, "position");
-		this.startOffset = builder.startOffset;
-
-	}
-
-	public static Token of(Function<Builder, ObjectBuilder<Token>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code end_offset}
-	 */
-	@Nullable
-	public final Integer endOffset() {
-		return this.endOffset;
-	}
-
-	/**
-	 * API name: {@code payload}
-	 */
-	@Nullable
-	public final String payload() {
-		return this.payload;
-	}
-
-	/**
-	 * Required - API name: {@code position}
-	 */
-	public final int position() {
-		return this.position;
-	}
-
-	/**
-	 * API name: {@code start_offset}
-	 */
-	@Nullable
-	public final Integer startOffset() {
-		return this.startOffset;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.endOffset != null) {
-			generator.writeKey("end_offset");
-			generator.write(this.endOffset);
-
-		}
-		if (this.payload != null) {
-			generator.writeKey("payload");
-			generator.write(this.payload);
-
-		}
-		generator.writeKey("position");
-		generator.write(this.position);
-
-		if (this.startOffset != null) {
-			generator.writeKey("start_offset");
-			generator.write(this.startOffset);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Token}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Token> {
-		@Nullable
-		private Integer endOffset;
-
-		@Nullable
-		private String payload;
-
-		private Integer position;
-
-		@Nullable
-		private Integer startOffset;
-
-		/**
-		 * API name: {@code end_offset}
-		 */
-		public final Builder endOffset(@Nullable Integer value) {
-			this.endOffset = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code payload}
-		 */
-		public final Builder payload(@Nullable String value) {
-			this.payload = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code position}
-		 */
-		public final Builder position(int value) {
-			this.position = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code start_offset}
-		 */
-		public final Builder startOffset(@Nullable Integer value) {
-			this.startOffset = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Token}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Token build() {
-			_checkSingleUse();
-
-			return new Token(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Token}
-	 */
-	public static final JsonpDeserializer<Token> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Token::setupTokenDeserializer);
-
-	protected static void setupTokenDeserializer(ObjectDeserializer<Token.Builder> op) {
-
-		op.add(Builder::endOffset, JsonpDeserializer.integerDeserializer(), "end_offset");
-		op.add(Builder::payload, JsonpDeserializer.stringDeserializer(), "payload");
-		op.add(Builder::position, JsonpDeserializer.integerDeserializer(), "position");
-		op.add(Builder::startOffset, JsonpDeserializer.integerDeserializer(), "start_offset");
-
-	}
+        this.endOffset = builder.endOffset;
+        this.payload = builder.payload;
+        this.position = ApiTypeHelper.requireNonNull(builder.position, this, "position");
+        this.startOffset = builder.startOffset;
+
+    }
+
+    public static Token of(Function<Builder, ObjectBuilder<Token>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code end_offset}
+     */
+    @Nullable
+    public final Integer endOffset() {
+        return this.endOffset;
+    }
+
+    /**
+     * API name: {@code payload}
+     */
+    @Nullable
+    public final String payload() {
+        return this.payload;
+    }
+
+    /**
+     * Required - API name: {@code position}
+     */
+    public final int position() {
+        return this.position;
+    }
+
+    /**
+     * API name: {@code start_offset}
+     */
+    @Nullable
+    public final Integer startOffset() {
+        return this.startOffset;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.endOffset != null) {
+            generator.writeKey("end_offset");
+            generator.write(this.endOffset);
+
+        }
+        if (this.payload != null) {
+            generator.writeKey("payload");
+            generator.write(this.payload);
+
+        }
+        generator.writeKey("position");
+        generator.write(this.position);
+
+        if (this.startOffset != null) {
+            generator.writeKey("start_offset");
+            generator.write(this.startOffset);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Token}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Token> {
+        @Nullable
+        private Integer endOffset;
+
+        @Nullable
+        private String payload;
+
+        private Integer position;
+
+        @Nullable
+        private Integer startOffset;
+
+        /**
+         * API name: {@code end_offset}
+         */
+        public final Builder endOffset(@Nullable Integer value) {
+            this.endOffset = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code payload}
+         */
+        public final Builder payload(@Nullable String value) {
+            this.payload = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code position}
+         */
+        public final Builder position(int value) {
+            this.position = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code start_offset}
+         */
+        public final Builder startOffset(@Nullable Integer value) {
+            this.startOffset = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Token}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Token build() {
+            _checkSingleUse();
+
+            return new Token(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Token}
+     */
+    public static final JsonpDeserializer<Token> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Token::setupTokenDeserializer
+    );
+
+    protected static void setupTokenDeserializer(ObjectDeserializer<Token.Builder> op) {
+
+        op.add(Builder::endOffset, JsonpDeserializer.integerDeserializer(), "end_offset");
+        op.add(Builder::payload, JsonpDeserializer.stringDeserializer(), "payload");
+        op.add(Builder::position, JsonpDeserializer.integerDeserializer(), "position");
+        op.add(Builder::startOffset, JsonpDeserializer.integerDeserializer(), "start_offset");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/update_by_query_rethrottle/UpdateByQueryRethrottleNode.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/update_by_query_rethrottle/UpdateByQueryRethrottleNode.java
index affd7801a4..bbb2f678d9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/update_by_query_rethrottle/UpdateByQueryRethrottleNode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/update_by_query_rethrottle/UpdateByQueryRethrottleNode.java
@@ -32,133 +32,132 @@
 
 package org.opensearch.client.opensearch.core.update_by_query_rethrottle;
 
-import org.opensearch.client.opensearch._types.BaseNode;
-import org.opensearch.client.opensearch.tasks.Info;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.BaseNode;
+import org.opensearch.client.opensearch.tasks.Info;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: _global.update_by_query_rethrottle.UpdateByQueryRethrottleNode
 
 @JsonpDeserializable
 public class UpdateByQueryRethrottleNode extends BaseNode {
-	private final Map<String, Info> tasks;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private UpdateByQueryRethrottleNode(Builder builder) {
-		super(builder);
-
-		this.tasks = ApiTypeHelper.unmodifiableRequired(builder.tasks, this, "tasks");
-
-	}
-
-	public static UpdateByQueryRethrottleNode of(Function<Builder, ObjectBuilder<UpdateByQueryRethrottleNode>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code tasks}
-	 */
-	public final Map<String, Info> tasks() {
-		return this.tasks;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.tasks)) {
-			generator.writeKey("tasks");
-			generator.writeStartObject();
-			for (Map.Entry<String, Info> item0 : this.tasks.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UpdateByQueryRethrottleNode}.
-	 */
-
-	public static class Builder extends BaseNode.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<UpdateByQueryRethrottleNode> {
-		private Map<String, Info> tasks;
-
-		/**
-		 * Required - API name: {@code tasks}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>tasks</code>.
-		 */
-		public final Builder tasks(Map<String, Info> map) {
-			this.tasks = _mapPutAll(this.tasks, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tasks}
-		 * <p>
-		 * Adds an entry to <code>tasks</code>.
-		 */
-		public final Builder tasks(String key, Info value) {
-			this.tasks = _mapPut(this.tasks, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tasks}
-		 * <p>
-		 * Adds an entry to <code>tasks</code> using a builder lambda.
-		 */
-		public final Builder tasks(String key, Function<Info.Builder, ObjectBuilder<Info>> fn) {
-			return tasks(key, fn.apply(new Info.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link UpdateByQueryRethrottleNode}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UpdateByQueryRethrottleNode build() {
-			_checkSingleUse();
-
-			return new UpdateByQueryRethrottleNode(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link UpdateByQueryRethrottleNode}
-	 */
-	public static final JsonpDeserializer<UpdateByQueryRethrottleNode> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, UpdateByQueryRethrottleNode::setupUpdateByQueryRethrottleNodeDeserializer);
-
-	protected static void setupUpdateByQueryRethrottleNodeDeserializer(
-			ObjectDeserializer<UpdateByQueryRethrottleNode.Builder> op) {
-		BaseNode.setupBaseNodeDeserializer(op);
-		op.add(Builder::tasks, JsonpDeserializer.stringMapDeserializer(Info._DESERIALIZER), "tasks");
-
-	}
+    private final Map<String, Info> tasks;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private UpdateByQueryRethrottleNode(Builder builder) {
+        super(builder);
+
+        this.tasks = ApiTypeHelper.unmodifiableRequired(builder.tasks, this, "tasks");
+
+    }
+
+    public static UpdateByQueryRethrottleNode of(Function<Builder, ObjectBuilder<UpdateByQueryRethrottleNode>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code tasks}
+     */
+    public final Map<String, Info> tasks() {
+        return this.tasks;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.tasks)) {
+            generator.writeKey("tasks");
+            generator.writeStartObject();
+            for (Map.Entry<String, Info> item0 : this.tasks.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UpdateByQueryRethrottleNode}.
+     */
+
+    public static class Builder extends BaseNode.AbstractBuilder<Builder> implements ObjectBuilder<UpdateByQueryRethrottleNode> {
+        private Map<String, Info> tasks;
+
+        /**
+         * Required - API name: {@code tasks}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>tasks</code>.
+         */
+        public final Builder tasks(Map<String, Info> map) {
+            this.tasks = _mapPutAll(this.tasks, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tasks}
+         * <p>
+         * Adds an entry to <code>tasks</code>.
+         */
+        public final Builder tasks(String key, Info value) {
+            this.tasks = _mapPut(this.tasks, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tasks}
+         * <p>
+         * Adds an entry to <code>tasks</code> using a builder lambda.
+         */
+        public final Builder tasks(String key, Function<Info.Builder, ObjectBuilder<Info>> fn) {
+            return tasks(key, fn.apply(new Info.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link UpdateByQueryRethrottleNode}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UpdateByQueryRethrottleNode build() {
+            _checkSingleUse();
+
+            return new UpdateByQueryRethrottleNode(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link UpdateByQueryRethrottleNode}
+     */
+    public static final JsonpDeserializer<UpdateByQueryRethrottleNode> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        UpdateByQueryRethrottleNode::setupUpdateByQueryRethrottleNodeDeserializer
+    );
+
+    protected static void setupUpdateByQueryRethrottleNodeDeserializer(ObjectDeserializer<UpdateByQueryRethrottleNode.Builder> op) {
+        BaseNode.setupBaseNodeDeserializer(op);
+        op.add(Builder::tasks, JsonpDeserializer.stringMapDeserializer(Info._DESERIALIZER), "tasks");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexRequest.java
index 2416f3d5f2..6a17b033b8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.dangling_indices;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,257 +45,255 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: dangling_indices.delete_dangling_index.Request
 
 /**
  * Deletes the specified dangling index
- * 
+ *
  */
 
 public class DeleteDanglingIndexRequest extends RequestBase {
-	private final boolean acceptDataLoss;
-
-	private final String indexUuid;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteDanglingIndexRequest(Builder builder) {
-
-		this.acceptDataLoss = ApiTypeHelper.requireNonNull(builder.acceptDataLoss, this, "acceptDataLoss");
-		this.indexUuid = ApiTypeHelper.requireNonNull(builder.indexUuid, this, "indexUuid");
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.timeout = builder.timeout;
-
-	}
-
-	public static DeleteDanglingIndexRequest of(Function<Builder, ObjectBuilder<DeleteDanglingIndexRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Must be set to true in order to delete the dangling index
-	 * <p>
-	 * API name: {@code accept_data_loss}
-	 */
-	public final boolean acceptDataLoss() {
-		return this.acceptDataLoss;
-	}
-
-	/**
-	 * Required - The UUID of the dangling index
-	 * <p>
-	 * API name: {@code index_uuid}
-	 */
-	public final String indexUuid() {
-		return this.indexUuid;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteDanglingIndexRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteDanglingIndexRequest> {
-		private Boolean acceptDataLoss;
-
-		private String indexUuid;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * Required - Must be set to true in order to delete the dangling index
-		 * <p>
-		 * API name: {@code accept_data_loss}
-		 */
-		public final Builder acceptDataLoss(boolean value) {
-			this.acceptDataLoss = value;
-			return this;
-		}
-
-		/**
-		 * Required - The UUID of the dangling index
-		 * <p>
-		 * API name: {@code index_uuid}
-		 */
-		public final Builder indexUuid(String value) {
-			this.indexUuid = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link DeleteDanglingIndexRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteDanglingIndexRequest build() {
-			_checkSingleUse();
-
-			return new DeleteDanglingIndexRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code dangling_indices.delete_dangling_index}".
-	 */
-	public static final Endpoint<DeleteDanglingIndexRequest, DeleteDanglingIndexResponse, ErrorResponse> _ENDPOINT =
-			new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "DELETE";
-
-			},
-
-			// Request path
-			request -> {
-				final int _indexUuid = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _indexUuid;
-
-				if (propsSet == (_indexUuid)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_dangling");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.indexUuid, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				params.put("accept_data_loss", String.valueOf(request.acceptDataLoss));
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, DeleteDanglingIndexResponse._DESERIALIZER);
+    private final boolean acceptDataLoss;
+
+    private final String indexUuid;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteDanglingIndexRequest(Builder builder) {
+
+        this.acceptDataLoss = ApiTypeHelper.requireNonNull(builder.acceptDataLoss, this, "acceptDataLoss");
+        this.indexUuid = ApiTypeHelper.requireNonNull(builder.indexUuid, this, "indexUuid");
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.timeout = builder.timeout;
+
+    }
+
+    public static DeleteDanglingIndexRequest of(Function<Builder, ObjectBuilder<DeleteDanglingIndexRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Must be set to true in order to delete the dangling index
+     * <p>
+     * API name: {@code accept_data_loss}
+     */
+    public final boolean acceptDataLoss() {
+        return this.acceptDataLoss;
+    }
+
+    /**
+     * Required - The UUID of the dangling index
+     * <p>
+     * API name: {@code index_uuid}
+     */
+    public final String indexUuid() {
+        return this.indexUuid;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteDanglingIndexRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteDanglingIndexRequest> {
+        private Boolean acceptDataLoss;
+
+        private String indexUuid;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * Required - Must be set to true in order to delete the dangling index
+         * <p>
+         * API name: {@code accept_data_loss}
+         */
+        public final Builder acceptDataLoss(boolean value) {
+            this.acceptDataLoss = value;
+            return this;
+        }
+
+        /**
+         * Required - The UUID of the dangling index
+         * <p>
+         * API name: {@code index_uuid}
+         */
+        public final Builder indexUuid(String value) {
+            this.indexUuid = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link DeleteDanglingIndexRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteDanglingIndexRequest build() {
+            _checkSingleUse();
+
+            return new DeleteDanglingIndexRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code dangling_indices.delete_dangling_index}".
+     */
+    public static final Endpoint<DeleteDanglingIndexRequest, DeleteDanglingIndexResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "DELETE";
+
+        },
+
+        // Request path
+        request -> {
+            final int _indexUuid = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _indexUuid;
+
+            if (propsSet == (_indexUuid)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_dangling");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.indexUuid, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            params.put("accept_data_loss", String.valueOf(request.acceptDataLoss));
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        DeleteDanglingIndexResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexResponse.java
index 7de44993aa..f2e55aa97b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/DeleteDanglingIndexResponse.java
@@ -32,69 +32,69 @@
 
 package org.opensearch.client.opensearch.dangling_indices;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: dangling_indices.delete_dangling_index.Response
 
 @JsonpDeserializable
 public class DeleteDanglingIndexResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteDanglingIndexResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static DeleteDanglingIndexResponse of(Function<Builder, ObjectBuilder<DeleteDanglingIndexResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteDanglingIndexResponse}.
-	 */
-
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DeleteDanglingIndexResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DeleteDanglingIndexResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteDanglingIndexResponse build() {
-			_checkSingleUse();
-
-			return new DeleteDanglingIndexResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DeleteDanglingIndexResponse}
-	 */
-	public static final JsonpDeserializer<DeleteDanglingIndexResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DeleteDanglingIndexResponse::setupDeleteDanglingIndexResponseDeserializer);
-
-	protected static void setupDeleteDanglingIndexResponseDeserializer(
-			ObjectDeserializer<DeleteDanglingIndexResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteDanglingIndexResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static DeleteDanglingIndexResponse of(Function<Builder, ObjectBuilder<DeleteDanglingIndexResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteDanglingIndexResponse}.
+     */
+
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<DeleteDanglingIndexResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DeleteDanglingIndexResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteDanglingIndexResponse build() {
+            _checkSingleUse();
+
+            return new DeleteDanglingIndexResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DeleteDanglingIndexResponse}
+     */
+    public static final JsonpDeserializer<DeleteDanglingIndexResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DeleteDanglingIndexResponse::setupDeleteDanglingIndexResponseDeserializer
+    );
+
+    protected static void setupDeleteDanglingIndexResponseDeserializer(ObjectDeserializer<DeleteDanglingIndexResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexRequest.java
index 818566242c..e0635576b9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.dangling_indices;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,258 +45,256 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: dangling_indices.import_dangling_index.Request
 
 /**
  * Imports the specified dangling index
- * 
+ *
  */
 
 public class ImportDanglingIndexRequest extends RequestBase {
-	private final boolean acceptDataLoss;
-
-	private final String indexUuid;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ImportDanglingIndexRequest(Builder builder) {
-
-		this.acceptDataLoss = ApiTypeHelper.requireNonNull(builder.acceptDataLoss, this, "acceptDataLoss");
-		this.indexUuid = ApiTypeHelper.requireNonNull(builder.indexUuid, this, "indexUuid");
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.timeout = builder.timeout;
-
-	}
-
-	public static ImportDanglingIndexRequest of(Function<Builder, ObjectBuilder<ImportDanglingIndexRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Must be set to true in order to import the dangling index
-	 * <p>
-	 * API name: {@code accept_data_loss}
-	 */
-	public final boolean acceptDataLoss() {
-		return this.acceptDataLoss;
-	}
-
-	/**
-	 * Required - The UUID of the dangling index
-	 * <p>
-	 * API name: {@code index_uuid}
-	 */
-	public final String indexUuid() {
-		return this.indexUuid;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ImportDanglingIndexRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ImportDanglingIndexRequest> {
-		private Boolean acceptDataLoss;
-
-		private String indexUuid;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * Required - Must be set to true in order to import the dangling index
-		 * <p>
-		 * API name: {@code accept_data_loss}
-		 */
-		public final Builder acceptDataLoss(boolean value) {
-			this.acceptDataLoss = value;
-			return this;
-		}
-
-		/**
-		 * Required - The UUID of the dangling index
-		 * <p>
-		 * API name: {@code index_uuid}
-		 */
-		public final Builder indexUuid(String value) {
-			this.indexUuid = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ImportDanglingIndexRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ImportDanglingIndexRequest build() {
-			_checkSingleUse();
-
-			return new ImportDanglingIndexRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code dangling_indices.import_dangling_index}".
-	 */
-	public static final Endpoint<ImportDanglingIndexRequest, ImportDanglingIndexResponse, ErrorResponse> _ENDPOINT =
-			new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _indexUuid = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _indexUuid;
-
-				if (propsSet == (_indexUuid)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_dangling");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.indexUuid, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				params.put("accept_data_loss", String.valueOf(request.acceptDataLoss));
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, ImportDanglingIndexResponse._DESERIALIZER);
+    private final boolean acceptDataLoss;
+
+    private final String indexUuid;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ImportDanglingIndexRequest(Builder builder) {
+
+        this.acceptDataLoss = ApiTypeHelper.requireNonNull(builder.acceptDataLoss, this, "acceptDataLoss");
+        this.indexUuid = ApiTypeHelper.requireNonNull(builder.indexUuid, this, "indexUuid");
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.timeout = builder.timeout;
+
+    }
+
+    public static ImportDanglingIndexRequest of(Function<Builder, ObjectBuilder<ImportDanglingIndexRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Must be set to true in order to import the dangling index
+     * <p>
+     * API name: {@code accept_data_loss}
+     */
+    public final boolean acceptDataLoss() {
+        return this.acceptDataLoss;
+    }
+
+    /**
+     * Required - The UUID of the dangling index
+     * <p>
+     * API name: {@code index_uuid}
+     */
+    public final String indexUuid() {
+        return this.indexUuid;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ImportDanglingIndexRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ImportDanglingIndexRequest> {
+        private Boolean acceptDataLoss;
+
+        private String indexUuid;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * Required - Must be set to true in order to import the dangling index
+         * <p>
+         * API name: {@code accept_data_loss}
+         */
+        public final Builder acceptDataLoss(boolean value) {
+            this.acceptDataLoss = value;
+            return this;
+        }
+
+        /**
+         * Required - The UUID of the dangling index
+         * <p>
+         * API name: {@code index_uuid}
+         */
+        public final Builder indexUuid(String value) {
+            this.indexUuid = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ImportDanglingIndexRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ImportDanglingIndexRequest build() {
+            _checkSingleUse();
+
+            return new ImportDanglingIndexRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code dangling_indices.import_dangling_index}".
+     */
+    public static final Endpoint<ImportDanglingIndexRequest, ImportDanglingIndexResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _indexUuid = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _indexUuid;
+
+            if (propsSet == (_indexUuid)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_dangling");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.indexUuid, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            params.put("accept_data_loss", String.valueOf(request.acceptDataLoss));
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        ImportDanglingIndexResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexResponse.java
index a22ca6078e..413913a404 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/ImportDanglingIndexResponse.java
@@ -32,69 +32,69 @@
 
 package org.opensearch.client.opensearch.dangling_indices;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: dangling_indices.import_dangling_index.Response
 
 @JsonpDeserializable
 public class ImportDanglingIndexResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
-
-	private ImportDanglingIndexResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static ImportDanglingIndexResponse of(Function<Builder, ObjectBuilder<ImportDanglingIndexResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ImportDanglingIndexResponse}.
-	 */
-
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ImportDanglingIndexResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ImportDanglingIndexResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ImportDanglingIndexResponse build() {
-			_checkSingleUse();
-
-			return new ImportDanglingIndexResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ImportDanglingIndexResponse}
-	 */
-	public static final JsonpDeserializer<ImportDanglingIndexResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ImportDanglingIndexResponse::setupImportDanglingIndexResponseDeserializer);
-
-	protected static void setupImportDanglingIndexResponseDeserializer(
-			ObjectDeserializer<ImportDanglingIndexResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private ImportDanglingIndexResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static ImportDanglingIndexResponse of(Function<Builder, ObjectBuilder<ImportDanglingIndexResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ImportDanglingIndexResponse}.
+     */
+
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<ImportDanglingIndexResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ImportDanglingIndexResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ImportDanglingIndexResponse build() {
+            _checkSingleUse();
+
+            return new ImportDanglingIndexResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ImportDanglingIndexResponse}
+     */
+    public static final JsonpDeserializer<ImportDanglingIndexResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ImportDanglingIndexResponse::setupImportDanglingIndexResponseDeserializer
+    );
+
+    protected static void setupImportDanglingIndexResponseDeserializer(ObjectDeserializer<ImportDanglingIndexResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/ListDanglingIndicesRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/ListDanglingIndicesRequest.java
index 974de601f6..5e7f0b48c2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/ListDanglingIndicesRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/ListDanglingIndicesRequest.java
@@ -32,52 +32,53 @@
 
 package org.opensearch.client.opensearch.dangling_indices;
 
+import java.util.Collections;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 
-import java.util.Collections;
-
 // typedef: dangling_indices.list_dangling_indices.Request
 
 /**
  * Returns all dangling indices.
- * 
+ *
  */
 
 public class ListDanglingIndicesRequest extends RequestBase {
-	public ListDanglingIndicesRequest() {
-	}
+    public ListDanglingIndicesRequest() {}
 
-	/**
-	 * Singleton instance for {@link ListDanglingIndicesRequest}.
-	 */
-	public static final ListDanglingIndicesRequest _INSTANCE = new ListDanglingIndicesRequest();
+    /**
+     * Singleton instance for {@link ListDanglingIndicesRequest}.
+     */
+    public static final ListDanglingIndicesRequest _INSTANCE = new ListDanglingIndicesRequest();
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Endpoint "{@code dangling_indices.list_dangling_indices}".
-	 */
-	public static final Endpoint<ListDanglingIndicesRequest, ListDanglingIndicesResponse, ErrorResponse> _ENDPOINT =
-			new SimpleEndpoint<>(
+    /**
+     * Endpoint "{@code dangling_indices.list_dangling_indices}".
+     */
+    public static final Endpoint<ListDanglingIndicesRequest, ListDanglingIndicesResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
 
-			// Request method
-			request -> {
-				return "GET";
+        // Request method
+        request -> {
+            return "GET";
 
-			},
+        },
 
-			// Request path
-			request -> {
-				return "/_dangling";
+        // Request path
+        request -> {
+            return "/_dangling";
 
-			},
+        },
 
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
 
-			}, SimpleEndpoint.emptyMap(), false, ListDanglingIndicesResponse._DESERIALIZER);
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        ListDanglingIndicesResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/ListDanglingIndicesResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/ListDanglingIndicesResponse.java
index f5aab99f1c..a0defeb65f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/ListDanglingIndicesResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/ListDanglingIndicesResponse.java
@@ -32,135 +32,134 @@
 
 package org.opensearch.client.opensearch.dangling_indices;
 
-import org.opensearch.client.opensearch.dangling_indices.list_dangling_indices.DanglingIndex;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.dangling_indices.list_dangling_indices.DanglingIndex;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: dangling_indices.list_dangling_indices.Response
 
 @JsonpDeserializable
 public class ListDanglingIndicesResponse implements JsonpSerializable {
-	private final List<DanglingIndex> danglingIndices;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ListDanglingIndicesResponse(Builder builder) {
-
-		this.danglingIndices = ApiTypeHelper.unmodifiableRequired(builder.danglingIndices, this, "danglingIndices");
-
-	}
-
-	public static ListDanglingIndicesResponse of(Function<Builder, ObjectBuilder<ListDanglingIndicesResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code dangling_indices}
-	 */
-	public final List<DanglingIndex> danglingIndices() {
-		return this.danglingIndices;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.danglingIndices)) {
-			generator.writeKey("dangling_indices");
-			generator.writeStartArray();
-			for (DanglingIndex item0 : this.danglingIndices) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ListDanglingIndicesResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ListDanglingIndicesResponse> {
-		private List<DanglingIndex> danglingIndices;
-
-		/**
-		 * Required - API name: {@code dangling_indices}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>danglingIndices</code>.
-		 */
-		public final Builder danglingIndices(List<DanglingIndex> list) {
-			this.danglingIndices = _listAddAll(this.danglingIndices, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code dangling_indices}
-		 * <p>
-		 * Adds one or more values to <code>danglingIndices</code>.
-		 */
-		public final Builder danglingIndices(DanglingIndex value, DanglingIndex... values) {
-			this.danglingIndices = _listAdd(this.danglingIndices, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code dangling_indices}
-		 * <p>
-		 * Adds a value to <code>danglingIndices</code> using a builder lambda.
-		 */
-		public final Builder danglingIndices(Function<DanglingIndex.Builder, ObjectBuilder<DanglingIndex>> fn) {
-			return danglingIndices(fn.apply(new DanglingIndex.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ListDanglingIndicesResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ListDanglingIndicesResponse build() {
-			_checkSingleUse();
-
-			return new ListDanglingIndicesResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ListDanglingIndicesResponse}
-	 */
-	public static final JsonpDeserializer<ListDanglingIndicesResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ListDanglingIndicesResponse::setupListDanglingIndicesResponseDeserializer);
-
-	protected static void setupListDanglingIndicesResponseDeserializer(
-			ObjectDeserializer<ListDanglingIndicesResponse.Builder> op) {
-
-		op.add(Builder::danglingIndices, JsonpDeserializer.arrayDeserializer(DanglingIndex._DESERIALIZER),
-				"dangling_indices");
-
-	}
+    private final List<DanglingIndex> danglingIndices;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ListDanglingIndicesResponse(Builder builder) {
+
+        this.danglingIndices = ApiTypeHelper.unmodifiableRequired(builder.danglingIndices, this, "danglingIndices");
+
+    }
+
+    public static ListDanglingIndicesResponse of(Function<Builder, ObjectBuilder<ListDanglingIndicesResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code dangling_indices}
+     */
+    public final List<DanglingIndex> danglingIndices() {
+        return this.danglingIndices;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.danglingIndices)) {
+            generator.writeKey("dangling_indices");
+            generator.writeStartArray();
+            for (DanglingIndex item0 : this.danglingIndices) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ListDanglingIndicesResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ListDanglingIndicesResponse> {
+        private List<DanglingIndex> danglingIndices;
+
+        /**
+         * Required - API name: {@code dangling_indices}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>danglingIndices</code>.
+         */
+        public final Builder danglingIndices(List<DanglingIndex> list) {
+            this.danglingIndices = _listAddAll(this.danglingIndices, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code dangling_indices}
+         * <p>
+         * Adds one or more values to <code>danglingIndices</code>.
+         */
+        public final Builder danglingIndices(DanglingIndex value, DanglingIndex... values) {
+            this.danglingIndices = _listAdd(this.danglingIndices, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code dangling_indices}
+         * <p>
+         * Adds a value to <code>danglingIndices</code> using a builder lambda.
+         */
+        public final Builder danglingIndices(Function<DanglingIndex.Builder, ObjectBuilder<DanglingIndex>> fn) {
+            return danglingIndices(fn.apply(new DanglingIndex.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ListDanglingIndicesResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ListDanglingIndicesResponse build() {
+            _checkSingleUse();
+
+            return new ListDanglingIndicesResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ListDanglingIndicesResponse}
+     */
+    public static final JsonpDeserializer<ListDanglingIndicesResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ListDanglingIndicesResponse::setupListDanglingIndicesResponseDeserializer
+    );
+
+    protected static void setupListDanglingIndicesResponseDeserializer(ObjectDeserializer<ListDanglingIndicesResponse.Builder> op) {
+
+        op.add(Builder::danglingIndices, JsonpDeserializer.arrayDeserializer(DanglingIndex._DESERIALIZER), "dangling_indices");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/OpenSearchDanglingIndicesAsyncClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/OpenSearchDanglingIndicesAsyncClient.java
index c3d6da1752..402839470c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/OpenSearchDanglingIndicesAsyncClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/OpenSearchDanglingIndicesAsyncClient.java
@@ -32,115 +32,116 @@
 
 package org.opensearch.client.opensearch.dangling_indices;
 
+import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
+import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.TransportOptions;
 import org.opensearch.client.util.ObjectBuilder;
-import java.io.IOException;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 /**
  * Client for the dangling_indices namespace.
  */
-public class OpenSearchDanglingIndicesAsyncClient
-		extends
-			ApiClient<OpenSearchTransport, OpenSearchDanglingIndicesAsyncClient> {
-
-	public OpenSearchDanglingIndicesAsyncClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchDanglingIndicesAsyncClient(OpenSearchTransport transport,
-                                                @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchDanglingIndicesAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchDanglingIndicesAsyncClient(this.transport, transportOptions);
-	}
-
-	// ----- Endpoint: dangling_indices.delete_dangling_index
-
-	/**
-	 * Deletes the specified dangling index
-	 * 
-	 */
-
-	public CompletableFuture<DeleteDanglingIndexResponse> deleteDanglingIndex(DeleteDanglingIndexRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteDanglingIndexRequest, DeleteDanglingIndexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteDanglingIndexRequest, DeleteDanglingIndexResponse, ErrorResponse>)
-						DeleteDanglingIndexRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes the specified dangling index
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteDanglingIndexRequest}
-	 *
-	 */
-
-	public final CompletableFuture<DeleteDanglingIndexResponse> deleteDanglingIndex(
-			Function<DeleteDanglingIndexRequest.Builder, ObjectBuilder<DeleteDanglingIndexRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteDanglingIndex(fn.apply(new DeleteDanglingIndexRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: dangling_indices.import_dangling_index
-
-	/**
-	 * Imports the specified dangling index
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ImportDanglingIndexResponse> importDanglingIndex(ImportDanglingIndexRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ImportDanglingIndexRequest, ImportDanglingIndexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ImportDanglingIndexRequest, ImportDanglingIndexResponse, ErrorResponse>)
-						ImportDanglingIndexRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Imports the specified dangling index
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ImportDanglingIndexRequest}
-	 *
-	 */
-
-	public final CompletableFuture<ImportDanglingIndexResponse> importDanglingIndex(
-			Function<ImportDanglingIndexRequest.Builder, ObjectBuilder<ImportDanglingIndexRequest>> fn)
-			throws IOException, OpenSearchException {
-		return importDanglingIndex(fn.apply(new ImportDanglingIndexRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: dangling_indices.list_dangling_indices
-
-	/**
-	 * Returns all dangling indices.
-	 * 
-	 *
-	 */
-	public CompletableFuture<ListDanglingIndicesResponse> listDanglingIndices()
-			throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(ListDanglingIndicesRequest._INSTANCE,
-				ListDanglingIndicesRequest._ENDPOINT, this.transportOptions);
-	}
+public class OpenSearchDanglingIndicesAsyncClient extends ApiClient<OpenSearchTransport, OpenSearchDanglingIndicesAsyncClient> {
+
+    public OpenSearchDanglingIndicesAsyncClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchDanglingIndicesAsyncClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchDanglingIndicesAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchDanglingIndicesAsyncClient(this.transport, transportOptions);
+    }
+
+    // ----- Endpoint: dangling_indices.delete_dangling_index
+
+    /**
+     * Deletes the specified dangling index
+     *
+     */
+
+    public CompletableFuture<DeleteDanglingIndexResponse> deleteDanglingIndex(DeleteDanglingIndexRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteDanglingIndexRequest, DeleteDanglingIndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteDanglingIndexRequest,
+            DeleteDanglingIndexResponse,
+            ErrorResponse>) DeleteDanglingIndexRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes the specified dangling index
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteDanglingIndexRequest}
+     *
+     */
+
+    public final CompletableFuture<DeleteDanglingIndexResponse> deleteDanglingIndex(
+        Function<DeleteDanglingIndexRequest.Builder, ObjectBuilder<DeleteDanglingIndexRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deleteDanglingIndex(fn.apply(new DeleteDanglingIndexRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: dangling_indices.import_dangling_index
+
+    /**
+     * Imports the specified dangling index
+     *
+     *
+     */
+
+    public CompletableFuture<ImportDanglingIndexResponse> importDanglingIndex(ImportDanglingIndexRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ImportDanglingIndexRequest, ImportDanglingIndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ImportDanglingIndexRequest,
+            ImportDanglingIndexResponse,
+            ErrorResponse>) ImportDanglingIndexRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Imports the specified dangling index
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ImportDanglingIndexRequest}
+     *
+     */
+
+    public final CompletableFuture<ImportDanglingIndexResponse> importDanglingIndex(
+        Function<ImportDanglingIndexRequest.Builder, ObjectBuilder<ImportDanglingIndexRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return importDanglingIndex(fn.apply(new ImportDanglingIndexRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: dangling_indices.list_dangling_indices
+
+    /**
+     * Returns all dangling indices.
+     *
+     *
+     */
+    public CompletableFuture<ListDanglingIndicesResponse> listDanglingIndices() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            ListDanglingIndicesRequest._INSTANCE,
+            ListDanglingIndicesRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/OpenSearchDanglingIndicesClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/OpenSearchDanglingIndicesClient.java
index 6b58708f47..5c9e4985db 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/OpenSearchDanglingIndicesClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/OpenSearchDanglingIndicesClient.java
@@ -32,114 +32,114 @@
 
 package org.opensearch.client.opensearch.dangling_indices;
 
+import java.io.IOException;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
+import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.TransportOptions;
 import org.opensearch.client.util.ObjectBuilder;
-import java.io.IOException;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 /**
  * Client for the dangling_indices namespace.
  */
-public class OpenSearchDanglingIndicesClient
-		extends
-			ApiClient<OpenSearchTransport, OpenSearchDanglingIndicesClient> {
-
-	public OpenSearchDanglingIndicesClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchDanglingIndicesClient(OpenSearchTransport transport,
-                                           @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchDanglingIndicesClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchDanglingIndicesClient(this.transport, transportOptions);
-	}
-
-	// ----- Endpoint: dangling_indices.delete_dangling_index
-
-	/**
-	 * Deletes the specified dangling index
-	 * 
-	 *
-	 */
-
-	public DeleteDanglingIndexResponse deleteDanglingIndex(DeleteDanglingIndexRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteDanglingIndexRequest, DeleteDanglingIndexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteDanglingIndexRequest, DeleteDanglingIndexResponse, ErrorResponse>)
-						DeleteDanglingIndexRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes the specified dangling index
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteDanglingIndexRequest}
-	 *
-	 */
-
-	public final DeleteDanglingIndexResponse deleteDanglingIndex(
-			Function<DeleteDanglingIndexRequest.Builder, ObjectBuilder<DeleteDanglingIndexRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteDanglingIndex(fn.apply(new DeleteDanglingIndexRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: dangling_indices.import_dangling_index
-
-	/**
-	 * Imports the specified dangling index
-	 * 
-	 *
-	 */
-
-	public ImportDanglingIndexResponse importDanglingIndex(ImportDanglingIndexRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ImportDanglingIndexRequest, ImportDanglingIndexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ImportDanglingIndexRequest, ImportDanglingIndexResponse, ErrorResponse>)
-						ImportDanglingIndexRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Imports the specified dangling index
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ImportDanglingIndexRequest}
-	 *
-	 */
-
-	public final ImportDanglingIndexResponse importDanglingIndex(
-			Function<ImportDanglingIndexRequest.Builder, ObjectBuilder<ImportDanglingIndexRequest>> fn)
-			throws IOException, OpenSearchException {
-		return importDanglingIndex(fn.apply(new ImportDanglingIndexRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: dangling_indices.list_dangling_indices
-
-	/**
-	 * Returns all dangling indices.
-	 * 
-	 *
-	 */
-	public ListDanglingIndicesResponse listDanglingIndices() throws IOException, OpenSearchException {
-		return this.transport.performRequest(ListDanglingIndicesRequest._INSTANCE, ListDanglingIndicesRequest._ENDPOINT,
-				this.transportOptions);
-	}
+public class OpenSearchDanglingIndicesClient extends ApiClient<OpenSearchTransport, OpenSearchDanglingIndicesClient> {
+
+    public OpenSearchDanglingIndicesClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchDanglingIndicesClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchDanglingIndicesClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchDanglingIndicesClient(this.transport, transportOptions);
+    }
+
+    // ----- Endpoint: dangling_indices.delete_dangling_index
+
+    /**
+     * Deletes the specified dangling index
+     *
+     *
+     */
+
+    public DeleteDanglingIndexResponse deleteDanglingIndex(DeleteDanglingIndexRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteDanglingIndexRequest, DeleteDanglingIndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteDanglingIndexRequest,
+            DeleteDanglingIndexResponse,
+            ErrorResponse>) DeleteDanglingIndexRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes the specified dangling index
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteDanglingIndexRequest}
+     *
+     */
+
+    public final DeleteDanglingIndexResponse deleteDanglingIndex(
+        Function<DeleteDanglingIndexRequest.Builder, ObjectBuilder<DeleteDanglingIndexRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deleteDanglingIndex(fn.apply(new DeleteDanglingIndexRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: dangling_indices.import_dangling_index
+
+    /**
+     * Imports the specified dangling index
+     *
+     *
+     */
+
+    public ImportDanglingIndexResponse importDanglingIndex(ImportDanglingIndexRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ImportDanglingIndexRequest, ImportDanglingIndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ImportDanglingIndexRequest,
+            ImportDanglingIndexResponse,
+            ErrorResponse>) ImportDanglingIndexRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Imports the specified dangling index
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ImportDanglingIndexRequest}
+     *
+     */
+
+    public final ImportDanglingIndexResponse importDanglingIndex(
+        Function<ImportDanglingIndexRequest.Builder, ObjectBuilder<ImportDanglingIndexRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return importDanglingIndex(fn.apply(new ImportDanglingIndexRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: dangling_indices.list_dangling_indices
+
+    /**
+     * Returns all dangling indices.
+     *
+     *
+     */
+    public ListDanglingIndicesResponse listDanglingIndices() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            ListDanglingIndicesRequest._INSTANCE,
+            ListDanglingIndicesRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/list_dangling_indices/DanglingIndex.java b/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/list_dangling_indices/DanglingIndex.java
index 0ae12275be..c8781c2b3e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/list_dangling_indices/DanglingIndex.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/dangling_indices/list_dangling_indices/DanglingIndex.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.dangling_indices.list_dangling_indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,186 +44,184 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: dangling_indices.list_dangling_indices.DanglingIndex
 
 @JsonpDeserializable
 public class DanglingIndex implements JsonpSerializable {
-	private final String indexName;
+    private final String indexName;
 
-	private final String indexUuid;
+    private final String indexUuid;
 
-	private final String creationDateMillis;
+    private final String creationDateMillis;
 
-	private final List<String> nodeIds;
+    private final List<String> nodeIds;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private DanglingIndex(Builder builder) {
+    private DanglingIndex(Builder builder) {
 
-		this.indexName = ApiTypeHelper.requireNonNull(builder.indexName, this, "indexName");
-		this.indexUuid = ApiTypeHelper.requireNonNull(builder.indexUuid, this, "indexUuid");
-		this.creationDateMillis = ApiTypeHelper.requireNonNull(builder.creationDateMillis, this, "creationDateMillis");
-		this.nodeIds = ApiTypeHelper.unmodifiableRequired(builder.nodeIds, this, "nodeIds");
+        this.indexName = ApiTypeHelper.requireNonNull(builder.indexName, this, "indexName");
+        this.indexUuid = ApiTypeHelper.requireNonNull(builder.indexUuid, this, "indexUuid");
+        this.creationDateMillis = ApiTypeHelper.requireNonNull(builder.creationDateMillis, this, "creationDateMillis");
+        this.nodeIds = ApiTypeHelper.unmodifiableRequired(builder.nodeIds, this, "nodeIds");
 
-	}
+    }
 
-	public static DanglingIndex of(Function<Builder, ObjectBuilder<DanglingIndex>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static DanglingIndex of(Function<Builder, ObjectBuilder<DanglingIndex>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code index_name}
-	 */
-	public final String indexName() {
-		return this.indexName;
-	}
-
-	/**
-	 * Required - API name: {@code index_uuid}
-	 */
-	public final String indexUuid() {
-		return this.indexUuid;
-	}
-
-	/**
-	 * Required - API name: {@code creation_date_millis}
-	 */
-	public final String creationDateMillis() {
-		return this.creationDateMillis;
-	}
-
-	/**
-	 * Required - API name: {@code node_ids}
-	 */
-	public final List<String> nodeIds() {
-		return this.nodeIds;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("index_name");
-		generator.write(this.indexName);
-
-		generator.writeKey("index_uuid");
-		generator.write(this.indexUuid);
-
-		generator.writeKey("creation_date_millis");
-		generator.write(this.creationDateMillis);
-
-		if (ApiTypeHelper.isDefined(this.nodeIds)) {
-			generator.writeKey("node_ids");
-			generator.writeStartArray();
-			for (String item0 : this.nodeIds) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DanglingIndex}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DanglingIndex> {
-		private String indexName;
-
-		private String indexUuid;
-
-		private String creationDateMillis;
-
-		private List<String> nodeIds;
-
-		/**
-		 * Required - API name: {@code index_name}
-		 */
-		public final Builder indexName(String value) {
-			this.indexName = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index_uuid}
-		 */
-		public final Builder indexUuid(String value) {
-			this.indexUuid = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code creation_date_millis}
-		 */
-		public final Builder creationDateMillis(String value) {
-			this.creationDateMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code node_ids}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>nodeIds</code>.
-		 */
-		public final Builder nodeIds(List<String> list) {
-			this.nodeIds = _listAddAll(this.nodeIds, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code node_ids}
-		 * <p>
-		 * Adds one or more values to <code>nodeIds</code>.
-		 */
-		public final Builder nodeIds(String value, String... values) {
-			this.nodeIds = _listAdd(this.nodeIds, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DanglingIndex}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DanglingIndex build() {
-			_checkSingleUse();
-
-			return new DanglingIndex(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DanglingIndex}
-	 */
-	public static final JsonpDeserializer<DanglingIndex> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			DanglingIndex::setupDanglingIndexDeserializer);
-
-	protected static void setupDanglingIndexDeserializer(ObjectDeserializer<DanglingIndex.Builder> op) {
-
-		op.add(Builder::indexName, JsonpDeserializer.stringDeserializer(), "index_name");
-		op.add(Builder::indexUuid, JsonpDeserializer.stringDeserializer(), "index_uuid");
-		op.add(Builder::creationDateMillis, JsonpDeserializer.stringDeserializer(), "creation_date_millis");
-		op.add(Builder::nodeIds, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"node_ids");
-
-	}
+    /**
+     * Required - API name: {@code index_name}
+     */
+    public final String indexName() {
+        return this.indexName;
+    }
+
+    /**
+     * Required - API name: {@code index_uuid}
+     */
+    public final String indexUuid() {
+        return this.indexUuid;
+    }
+
+    /**
+     * Required - API name: {@code creation_date_millis}
+     */
+    public final String creationDateMillis() {
+        return this.creationDateMillis;
+    }
+
+    /**
+     * Required - API name: {@code node_ids}
+     */
+    public final List<String> nodeIds() {
+        return this.nodeIds;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("index_name");
+        generator.write(this.indexName);
+
+        generator.writeKey("index_uuid");
+        generator.write(this.indexUuid);
+
+        generator.writeKey("creation_date_millis");
+        generator.write(this.creationDateMillis);
+
+        if (ApiTypeHelper.isDefined(this.nodeIds)) {
+            generator.writeKey("node_ids");
+            generator.writeStartArray();
+            for (String item0 : this.nodeIds) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DanglingIndex}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DanglingIndex> {
+        private String indexName;
+
+        private String indexUuid;
+
+        private String creationDateMillis;
+
+        private List<String> nodeIds;
+
+        /**
+         * Required - API name: {@code index_name}
+         */
+        public final Builder indexName(String value) {
+            this.indexName = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index_uuid}
+         */
+        public final Builder indexUuid(String value) {
+            this.indexUuid = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code creation_date_millis}
+         */
+        public final Builder creationDateMillis(String value) {
+            this.creationDateMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code node_ids}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>nodeIds</code>.
+         */
+        public final Builder nodeIds(List<String> list) {
+            this.nodeIds = _listAddAll(this.nodeIds, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code node_ids}
+         * <p>
+         * Adds one or more values to <code>nodeIds</code>.
+         */
+        public final Builder nodeIds(String value, String... values) {
+            this.nodeIds = _listAdd(this.nodeIds, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link DanglingIndex}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DanglingIndex build() {
+            _checkSingleUse();
+
+            return new DanglingIndex(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DanglingIndex}
+     */
+    public static final JsonpDeserializer<DanglingIndex> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DanglingIndex::setupDanglingIndexDeserializer
+    );
+
+    protected static void setupDanglingIndexDeserializer(ObjectDeserializer<DanglingIndex.Builder> op) {
+
+        op.add(Builder::indexName, JsonpDeserializer.stringDeserializer(), "index_name");
+        op.add(Builder::indexUuid, JsonpDeserializer.stringDeserializer(), "index_uuid");
+        op.add(Builder::creationDateMillis, JsonpDeserializer.stringDeserializer(), "creation_date_millis");
+        op.add(Builder::nodeIds, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "node_ids");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/features/Feature.java b/java-client/src/main/java/org/opensearch/client/opensearch/features/Feature.java
index 75d1a71624..aae7f5355d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/features/Feature.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/features/Feature.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.features;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,117 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: features._types.Feature
 
-
 @JsonpDeserializable
 public class Feature implements JsonpSerializable {
-	private final String name;
-
-	private final String description;
-
-	// ---------------------------------------------------------------------------------------------
+    private final String name;
 
-	private Feature(Builder builder) {
+    private final String description;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
+    private Feature(Builder builder) {
 
-	}
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
 
-	public static Feature of(Function<Builder, ObjectBuilder<Feature>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
+    public static Feature of(Function<Builder, ObjectBuilder<Feature>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code description}
-	 */
-	public final String description() {
-		return this.description;
-	}
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code description}
+     */
+    public final String description() {
+        return this.description;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("name");
-		generator.write(this.name);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("description");
-		generator.write(this.description);
+        generator.writeKey("name");
+        generator.write(this.name);
 
-	}
+        generator.writeKey("description");
+        generator.write(this.description);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link Feature}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Feature> {
-		private String name;
+    /**
+     * Builder for {@link Feature}.
+     */
 
-		private String description;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Feature> {
+        private String name;
 
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
+        private String description;
 
-		/**
-		 * Required - API name: {@code description}
-		 */
-		public final Builder description(String value) {
-			this.description = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link Feature}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Feature build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code description}
+         */
+        public final Builder description(String value) {
+            this.description = value;
+            return this;
+        }
 
-			return new Feature(this);
-		}
-	}
+        /**
+         * Builds a {@link Feature}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Feature build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new Feature(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link Feature}
-	 */
-	public static final JsonpDeserializer<Feature> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Feature::setupFeatureDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupFeatureDeserializer(ObjectDeserializer<Feature.Builder> op) {
+    /**
+     * Json deserializer for {@link Feature}
+     */
+    public static final JsonpDeserializer<Feature> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Feature::setupFeatureDeserializer
+    );
 
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
+    protected static void setupFeatureDeserializer(ObjectDeserializer<Feature.Builder> op) {
 
-	}
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/features/GetFeaturesRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/features/GetFeaturesRequest.java
index a809cc6a5d..59208c008e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/features/GetFeaturesRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/features/GetFeaturesRequest.java
@@ -32,52 +32,54 @@
 
 package org.opensearch.client.opensearch.features;
 
+import java.util.Collections;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 
-import java.util.Collections;
-
 // typedef: features.get_features.Request
 
 /**
  * Gets a list of features which can be included in snapshots using the
  * feature_states field when creating a snapshot
- * 
+ *
  */
 
 public class GetFeaturesRequest extends RequestBase {
-	public GetFeaturesRequest() {
-	}
+    public GetFeaturesRequest() {}
 
-	/**
-	 * Singleton instance for {@link GetFeaturesRequest}.
-	 */
-	public static final GetFeaturesRequest _INSTANCE = new GetFeaturesRequest();
+    /**
+     * Singleton instance for {@link GetFeaturesRequest}.
+     */
+    public static final GetFeaturesRequest _INSTANCE = new GetFeaturesRequest();
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Endpoint "{@code features.get_features}".
-	 */
-	public static final Endpoint<GetFeaturesRequest, GetFeaturesResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+    /**
+     * Endpoint "{@code features.get_features}".
+     */
+    public static final Endpoint<GetFeaturesRequest, GetFeaturesResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
 
-			// Request method
-			request -> {
-				return "GET";
+        // Request method
+        request -> {
+            return "GET";
 
-			},
+        },
 
-			// Request path
-			request -> {
-				return "/_features";
+        // Request path
+        request -> {
+            return "/_features";
 
-			},
+        },
 
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
 
-			}, SimpleEndpoint.emptyMap(), false, GetFeaturesResponse._DESERIALIZER);
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetFeaturesResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/features/GetFeaturesResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/features/GetFeaturesResponse.java
index 3ece8c6245..65161b0e88 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/features/GetFeaturesResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/features/GetFeaturesResponse.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.features;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,122 +44,121 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: features.get_features.Response
 
 @JsonpDeserializable
 public class GetFeaturesResponse implements JsonpSerializable {
-	private final List<Feature> features;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetFeaturesResponse(Builder builder) {
-
-		this.features = ApiTypeHelper.unmodifiableRequired(builder.features, this, "features");
-
-	}
-
-	public static GetFeaturesResponse of(Function<Builder, ObjectBuilder<GetFeaturesResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code features}
-	 */
-	public final List<Feature> features() {
-		return this.features;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.features)) {
-			generator.writeKey("features");
-			generator.writeStartArray();
-			for (Feature item0 : this.features) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetFeaturesResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetFeaturesResponse> {
-		private List<Feature> features;
-
-		/**
-		 * Required - API name: {@code features}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>features</code>.
-		 */
-		public final Builder features(List<Feature> list) {
-			this.features = _listAddAll(this.features, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code features}
-		 * <p>
-		 * Adds one or more values to <code>features</code>.
-		 */
-		public final Builder features(Feature value, Feature... values) {
-			this.features = _listAdd(this.features, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code features}
-		 * <p>
-		 * Adds a value to <code>features</code> using a builder lambda.
-		 */
-		public final Builder features(Function<Feature.Builder, ObjectBuilder<Feature>> fn) {
-			return features(fn.apply(new Feature.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link GetFeaturesResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetFeaturesResponse build() {
-			_checkSingleUse();
-
-			return new GetFeaturesResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetFeaturesResponse}
-	 */
-	public static final JsonpDeserializer<GetFeaturesResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GetFeaturesResponse::setupGetFeaturesResponseDeserializer);
-
-	protected static void setupGetFeaturesResponseDeserializer(ObjectDeserializer<GetFeaturesResponse.Builder> op) {
-
-		op.add(Builder::features, JsonpDeserializer.arrayDeserializer(Feature._DESERIALIZER), "features");
-
-	}
+    private final List<Feature> features;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetFeaturesResponse(Builder builder) {
+
+        this.features = ApiTypeHelper.unmodifiableRequired(builder.features, this, "features");
+
+    }
+
+    public static GetFeaturesResponse of(Function<Builder, ObjectBuilder<GetFeaturesResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code features}
+     */
+    public final List<Feature> features() {
+        return this.features;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.features)) {
+            generator.writeKey("features");
+            generator.writeStartArray();
+            for (Feature item0 : this.features) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetFeaturesResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetFeaturesResponse> {
+        private List<Feature> features;
+
+        /**
+         * Required - API name: {@code features}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>features</code>.
+         */
+        public final Builder features(List<Feature> list) {
+            this.features = _listAddAll(this.features, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code features}
+         * <p>
+         * Adds one or more values to <code>features</code>.
+         */
+        public final Builder features(Feature value, Feature... values) {
+            this.features = _listAdd(this.features, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code features}
+         * <p>
+         * Adds a value to <code>features</code> using a builder lambda.
+         */
+        public final Builder features(Function<Feature.Builder, ObjectBuilder<Feature>> fn) {
+            return features(fn.apply(new Feature.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link GetFeaturesResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetFeaturesResponse build() {
+            _checkSingleUse();
+
+            return new GetFeaturesResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetFeaturesResponse}
+     */
+    public static final JsonpDeserializer<GetFeaturesResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetFeaturesResponse::setupGetFeaturesResponseDeserializer
+    );
+
+    protected static void setupGetFeaturesResponseDeserializer(ObjectDeserializer<GetFeaturesResponse.Builder> op) {
+
+        op.add(Builder::features, JsonpDeserializer.arrayDeserializer(Feature._DESERIALIZER), "features");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/features/OpenSearchFeaturesAsyncClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/features/OpenSearchFeaturesAsyncClient.java
index 91a029d8c8..621138bd80 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/features/OpenSearchFeaturesAsyncClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/features/OpenSearchFeaturesAsyncClient.java
@@ -32,59 +32,53 @@
 
 package org.opensearch.client.opensearch.features;
 
+import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
 import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.TransportOptions;
 
-import java.io.IOException;
-import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nullable;
-
 /**
  * Client for the features namespace.
  */
-public class OpenSearchFeaturesAsyncClient
-		extends
-			ApiClient<OpenSearchTransport, OpenSearchFeaturesAsyncClient> {
+public class OpenSearchFeaturesAsyncClient extends ApiClient<OpenSearchTransport, OpenSearchFeaturesAsyncClient> {
 
-	public OpenSearchFeaturesAsyncClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
+    public OpenSearchFeaturesAsyncClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
 
-	public OpenSearchFeaturesAsyncClient(OpenSearchTransport transport,
-                                         @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
+    public OpenSearchFeaturesAsyncClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
 
-	@Override
-	public OpenSearchFeaturesAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchFeaturesAsyncClient(this.transport, transportOptions);
-	}
+    @Override
+    public OpenSearchFeaturesAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchFeaturesAsyncClient(this.transport, transportOptions);
+    }
 
-	// ----- Endpoint: features.get_features
+    // ----- Endpoint: features.get_features
 
-	/**
-	 * Gets a list of features which can be included in snapshots using the
-	 * feature_states field when creating a snapshot
-	 * 
-	 *
-	 */
-	public CompletableFuture<GetFeaturesResponse> getFeatures() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(GetFeaturesRequest._INSTANCE, GetFeaturesRequest._ENDPOINT,
-				this.transportOptions);
-	}
+    /**
+     * Gets a list of features which can be included in snapshots using the
+     * feature_states field when creating a snapshot
+     *
+     *
+     */
+    public CompletableFuture<GetFeaturesResponse> getFeatures() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(GetFeaturesRequest._INSTANCE, GetFeaturesRequest._ENDPOINT, this.transportOptions);
+    }
 
-	// ----- Endpoint: features.reset_features
+    // ----- Endpoint: features.reset_features
 
-	/**
-	 * Resets the internal state of features, usually by deleting system indices
-	 * 
-	 *
-	 */
-	public CompletableFuture<ResetFeaturesResponse> resetFeatures() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(ResetFeaturesRequest._INSTANCE, ResetFeaturesRequest._ENDPOINT,
-				this.transportOptions);
-	}
+    /**
+     * Resets the internal state of features, usually by deleting system indices
+     *
+     *
+     */
+    public CompletableFuture<ResetFeaturesResponse> resetFeatures() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(ResetFeaturesRequest._INSTANCE, ResetFeaturesRequest._ENDPOINT, this.transportOptions);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/features/OpenSearchFeaturesClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/features/OpenSearchFeaturesClient.java
index 53e485f45c..5ea86d58a2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/features/OpenSearchFeaturesClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/features/OpenSearchFeaturesClient.java
@@ -32,55 +32,52 @@
 
 package org.opensearch.client.opensearch.features;
 
+import java.io.IOException;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
 import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.TransportOptions;
 
-import java.io.IOException;
-import javax.annotation.Nullable;
-
 /**
  * Client for the features namespace.
  */
 public class OpenSearchFeaturesClient extends ApiClient<OpenSearchTransport, OpenSearchFeaturesClient> {
 
-	public OpenSearchFeaturesClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
+    public OpenSearchFeaturesClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
 
-	public OpenSearchFeaturesClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
+    public OpenSearchFeaturesClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
 
-	@Override
-	public OpenSearchFeaturesClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchFeaturesClient(this.transport, transportOptions);
-	}
+    @Override
+    public OpenSearchFeaturesClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchFeaturesClient(this.transport, transportOptions);
+    }
 
-	// ----- Endpoint: features.get_features
+    // ----- Endpoint: features.get_features
 
-	/**
-	 * Gets a list of features which can be included in snapshots using the
-	 * feature_states field when creating a snapshot
-	 * 
-	 *
-	 */
-	public GetFeaturesResponse getFeatures() throws IOException, OpenSearchException {
-		return this.transport.performRequest(GetFeaturesRequest._INSTANCE, GetFeaturesRequest._ENDPOINT,
-				this.transportOptions);
-	}
+    /**
+     * Gets a list of features which can be included in snapshots using the
+     * feature_states field when creating a snapshot
+     *
+     *
+     */
+    public GetFeaturesResponse getFeatures() throws IOException, OpenSearchException {
+        return this.transport.performRequest(GetFeaturesRequest._INSTANCE, GetFeaturesRequest._ENDPOINT, this.transportOptions);
+    }
 
-	// ----- Endpoint: features.reset_features
+    // ----- Endpoint: features.reset_features
 
-	/**
-	 * Resets the internal state of features, usually by deleting system indices
-	 * 
-	 *
-	 */
-	public ResetFeaturesResponse resetFeatures() throws IOException, OpenSearchException {
-		return this.transport.performRequest(ResetFeaturesRequest._INSTANCE, ResetFeaturesRequest._ENDPOINT,
-				this.transportOptions);
-	}
+    /**
+     * Resets the internal state of features, usually by deleting system indices
+     *
+     *
+     */
+    public ResetFeaturesResponse resetFeatures() throws IOException, OpenSearchException {
+        return this.transport.performRequest(ResetFeaturesRequest._INSTANCE, ResetFeaturesRequest._ENDPOINT, this.transportOptions);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/features/ResetFeaturesRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/features/ResetFeaturesRequest.java
index da428439d5..bb5c275634 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/features/ResetFeaturesRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/features/ResetFeaturesRequest.java
@@ -32,51 +32,53 @@
 
 package org.opensearch.client.opensearch.features;
 
+import java.util.Collections;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 
-import java.util.Collections;
-
 // typedef: features.reset_features.Request
 
 /**
  * Resets the internal state of features, usually by deleting system indices
- * 
+ *
  */
 
 public class ResetFeaturesRequest extends RequestBase {
-	public ResetFeaturesRequest() {
-	}
+    public ResetFeaturesRequest() {}
 
-	/**
-	 * Singleton instance for {@link ResetFeaturesRequest}.
-	 */
-	public static final ResetFeaturesRequest _INSTANCE = new ResetFeaturesRequest();
+    /**
+     * Singleton instance for {@link ResetFeaturesRequest}.
+     */
+    public static final ResetFeaturesRequest _INSTANCE = new ResetFeaturesRequest();
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Endpoint "{@code features.reset_features}".
-	 */
-	public static final Endpoint<ResetFeaturesRequest, ResetFeaturesResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+    /**
+     * Endpoint "{@code features.reset_features}".
+     */
+    public static final Endpoint<ResetFeaturesRequest, ResetFeaturesResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
 
-			// Request method
-			request -> {
-				return "POST";
+        // Request method
+        request -> {
+            return "POST";
 
-			},
+        },
 
-			// Request path
-			request -> {
-				return "/_features/_reset";
+        // Request path
+        request -> {
+            return "/_features/_reset";
 
-			},
+        },
 
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
 
-			}, SimpleEndpoint.emptyMap(), false, ResetFeaturesResponse._DESERIALIZER);
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        ResetFeaturesResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/features/ResetFeaturesResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/features/ResetFeaturesResponse.java
index 8096756c27..3ba6108dcf 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/features/ResetFeaturesResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/features/ResetFeaturesResponse.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.features;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,122 +44,121 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: features.reset_features.Response
 
 @JsonpDeserializable
 public class ResetFeaturesResponse implements JsonpSerializable {
-	private final List<Feature> features;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ResetFeaturesResponse(Builder builder) {
-
-		this.features = ApiTypeHelper.unmodifiableRequired(builder.features, this, "features");
-
-	}
-
-	public static ResetFeaturesResponse of(Function<Builder, ObjectBuilder<ResetFeaturesResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code features}
-	 */
-	public final List<Feature> features() {
-		return this.features;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.features)) {
-			generator.writeKey("features");
-			generator.writeStartArray();
-			for (Feature item0 : this.features) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ResetFeaturesResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ResetFeaturesResponse> {
-		private List<Feature> features;
-
-		/**
-		 * Required - API name: {@code features}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>features</code>.
-		 */
-		public final Builder features(List<Feature> list) {
-			this.features = _listAddAll(this.features, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code features}
-		 * <p>
-		 * Adds one or more values to <code>features</code>.
-		 */
-		public final Builder features(Feature value, Feature... values) {
-			this.features = _listAdd(this.features, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code features}
-		 * <p>
-		 * Adds a value to <code>features</code> using a builder lambda.
-		 */
-		public final Builder features(Function<Feature.Builder, ObjectBuilder<Feature>> fn) {
-			return features(fn.apply(new Feature.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ResetFeaturesResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ResetFeaturesResponse build() {
-			_checkSingleUse();
-
-			return new ResetFeaturesResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ResetFeaturesResponse}
-	 */
-	public static final JsonpDeserializer<ResetFeaturesResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ResetFeaturesResponse::setupResetFeaturesResponseDeserializer);
-
-	protected static void setupResetFeaturesResponseDeserializer(ObjectDeserializer<ResetFeaturesResponse.Builder> op) {
-
-		op.add(Builder::features, JsonpDeserializer.arrayDeserializer(Feature._DESERIALIZER), "features");
-
-	}
+    private final List<Feature> features;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ResetFeaturesResponse(Builder builder) {
+
+        this.features = ApiTypeHelper.unmodifiableRequired(builder.features, this, "features");
+
+    }
+
+    public static ResetFeaturesResponse of(Function<Builder, ObjectBuilder<ResetFeaturesResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code features}
+     */
+    public final List<Feature> features() {
+        return this.features;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.features)) {
+            generator.writeKey("features");
+            generator.writeStartArray();
+            for (Feature item0 : this.features) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ResetFeaturesResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ResetFeaturesResponse> {
+        private List<Feature> features;
+
+        /**
+         * Required - API name: {@code features}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>features</code>.
+         */
+        public final Builder features(List<Feature> list) {
+            this.features = _listAddAll(this.features, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code features}
+         * <p>
+         * Adds one or more values to <code>features</code>.
+         */
+        public final Builder features(Feature value, Feature... values) {
+            this.features = _listAdd(this.features, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code features}
+         * <p>
+         * Adds a value to <code>features</code> using a builder lambda.
+         */
+        public final Builder features(Function<Feature.Builder, ObjectBuilder<Feature>> fn) {
+            return features(fn.apply(new Feature.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ResetFeaturesResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ResetFeaturesResponse build() {
+            _checkSingleUse();
+
+            return new ResetFeaturesResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ResetFeaturesResponse}
+     */
+    public static final JsonpDeserializer<ResetFeaturesResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ResetFeaturesResponse::setupResetFeaturesResponseDeserializer
+    );
+
+    protected static void setupResetFeaturesResponseDeserializer(ObjectDeserializer<ResetFeaturesResponse.Builder> op) {
+
+        op.add(Builder::features, JsonpDeserializer.arrayDeserializer(Feature._DESERIALIZER), "features");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/AddBlockRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/AddBlockRequest.java
index fd060da430..00895d4883 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/AddBlockRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/AddBlockRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -43,375 +49,370 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.add_block.Request
 
 /**
  * Adds a block to an index.
- * 
+ *
  */
 
 public class AddBlockRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final IndicesBlockOptions block;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final String index;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AddBlockRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.block = ApiTypeHelper.requireNonNull(builder.block, this, "block");
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.timeout = builder.timeout;
-
-	}
-
-	public static AddBlockRequest of(Function<Builder, ObjectBuilder<AddBlockRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Required - The block to add (one of read, write, read_only or metadata)
-	 * <p>
-	 * API name: {@code block}
-	 */
-	public final IndicesBlockOptions block() {
-		return this.block;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * Required - A comma separated list of indices to add a block to
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AddBlockRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AddBlockRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		private IndicesBlockOptions block;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		private String index;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Required - The block to add (one of read, write, read_only or metadata)
-		 * <p>
-		 * API name: {@code block}
-		 */
-		public final Builder block(IndicesBlockOptions value) {
-			this.block = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Required - A comma separated list of indices to add a block to
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link AddBlockRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AddBlockRequest build() {
-			_checkSingleUse();
-
-			return new AddBlockRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.add_block}".
-	 */
-	public static final Endpoint<AddBlockRequest, AddBlockResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "PUT";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-				final int _block = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-				propsSet |= _block;
-
-				if (propsSet == (_index | _block)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_block");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.block.jsonValue(), buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, AddBlockResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final IndicesBlockOptions block;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final String index;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AddBlockRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.block = ApiTypeHelper.requireNonNull(builder.block, this, "block");
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.timeout = builder.timeout;
+
+    }
+
+    public static AddBlockRequest of(Function<Builder, ObjectBuilder<AddBlockRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Required - The block to add (one of read, write, read_only or metadata)
+     * <p>
+     * API name: {@code block}
+     */
+    public final IndicesBlockOptions block() {
+        return this.block;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * Required - A comma separated list of indices to add a block to
+     * <p>
+     * API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AddBlockRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AddBlockRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        private IndicesBlockOptions block;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        private String index;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Required - The block to add (one of read, write, read_only or metadata)
+         * <p>
+         * API name: {@code block}
+         */
+        public final Builder block(IndicesBlockOptions value) {
+            this.block = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Required - A comma separated list of indices to add a block to
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link AddBlockRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AddBlockRequest build() {
+            _checkSingleUse();
+
+            return new AddBlockRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.add_block}".
+     */
+    public static final Endpoint<AddBlockRequest, AddBlockResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "PUT";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+            final int _block = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+            propsSet |= _block;
+
+            if (propsSet == (_index | _block)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_block");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.block.jsonValue(), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        AddBlockResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/AddBlockResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/AddBlockResponse.java
index 0688a6cd25..aa32491d36 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/AddBlockResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/AddBlockResponse.java
@@ -32,156 +32,155 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
-import org.opensearch.client.opensearch.indices.add_block.IndicesBlockStatus;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import org.opensearch.client.opensearch.indices.add_block.IndicesBlockStatus;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: indices.add_block.Response
 
 @JsonpDeserializable
 public class AddBlockResponse extends AcknowledgedResponseBase {
-	private final boolean shardsAcknowledged;
-
-	private final List<IndicesBlockStatus> indices;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AddBlockResponse(Builder builder) {
-		super(builder);
-
-		this.shardsAcknowledged = ApiTypeHelper.requireNonNull(builder.shardsAcknowledged, this, "shardsAcknowledged");
-		this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
-
-	}
-
-	public static AddBlockResponse of(Function<Builder, ObjectBuilder<AddBlockResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code shards_acknowledged}
-	 */
-	public final boolean shardsAcknowledged() {
-		return this.shardsAcknowledged;
-	}
-
-	/**
-	 * Required - API name: {@code indices}
-	 */
-	public final List<IndicesBlockStatus> indices() {
-		return this.indices;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("shards_acknowledged");
-		generator.write(this.shardsAcknowledged);
-
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartArray();
-			for (IndicesBlockStatus item0 : this.indices) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AddBlockResponse}.
-	 */
-
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<AddBlockResponse> {
-		private Boolean shardsAcknowledged;
-
-		private List<IndicesBlockStatus> indices;
-
-		/**
-		 * Required - API name: {@code shards_acknowledged}
-		 */
-		public final Builder shardsAcknowledged(boolean value) {
-			this.shardsAcknowledged = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indices</code>.
-		 */
-		public final Builder indices(List<IndicesBlockStatus> list) {
-			this.indices = _listAddAll(this.indices, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds one or more values to <code>indices</code>.
-		 */
-		public final Builder indices(IndicesBlockStatus value, IndicesBlockStatus... values) {
-			this.indices = _listAdd(this.indices, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds a value to <code>indices</code> using a builder lambda.
-		 */
-		public final Builder indices(Function<IndicesBlockStatus.Builder, ObjectBuilder<IndicesBlockStatus>> fn) {
-			return indices(fn.apply(new IndicesBlockStatus.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AddBlockResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AddBlockResponse build() {
-			_checkSingleUse();
-
-			return new AddBlockResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AddBlockResponse}
-	 */
-	public static final JsonpDeserializer<AddBlockResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			AddBlockResponse::setupAddBlockResponseDeserializer);
-
-	protected static void setupAddBlockResponseDeserializer(ObjectDeserializer<AddBlockResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
-		op.add(Builder::shardsAcknowledged, JsonpDeserializer.booleanDeserializer(), "shards_acknowledged");
-		op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(IndicesBlockStatus._DESERIALIZER), "indices");
-
-	}
+    private final boolean shardsAcknowledged;
+
+    private final List<IndicesBlockStatus> indices;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AddBlockResponse(Builder builder) {
+        super(builder);
+
+        this.shardsAcknowledged = ApiTypeHelper.requireNonNull(builder.shardsAcknowledged, this, "shardsAcknowledged");
+        this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
+
+    }
+
+    public static AddBlockResponse of(Function<Builder, ObjectBuilder<AddBlockResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code shards_acknowledged}
+     */
+    public final boolean shardsAcknowledged() {
+        return this.shardsAcknowledged;
+    }
+
+    /**
+     * Required - API name: {@code indices}
+     */
+    public final List<IndicesBlockStatus> indices() {
+        return this.indices;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("shards_acknowledged");
+        generator.write(this.shardsAcknowledged);
+
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartArray();
+            for (IndicesBlockStatus item0 : this.indices) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AddBlockResponse}.
+     */
+
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<AddBlockResponse> {
+        private Boolean shardsAcknowledged;
+
+        private List<IndicesBlockStatus> indices;
+
+        /**
+         * Required - API name: {@code shards_acknowledged}
+         */
+        public final Builder shardsAcknowledged(boolean value) {
+            this.shardsAcknowledged = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indices</code>.
+         */
+        public final Builder indices(List<IndicesBlockStatus> list) {
+            this.indices = _listAddAll(this.indices, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds one or more values to <code>indices</code>.
+         */
+        public final Builder indices(IndicesBlockStatus value, IndicesBlockStatus... values) {
+            this.indices = _listAdd(this.indices, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds a value to <code>indices</code> using a builder lambda.
+         */
+        public final Builder indices(Function<IndicesBlockStatus.Builder, ObjectBuilder<IndicesBlockStatus>> fn) {
+            return indices(fn.apply(new IndicesBlockStatus.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link AddBlockResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AddBlockResponse build() {
+            _checkSingleUse();
+
+            return new AddBlockResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AddBlockResponse}
+     */
+    public static final JsonpDeserializer<AddBlockResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AddBlockResponse::setupAddBlockResponseDeserializer
+    );
+
+    protected static void setupAddBlockResponseDeserializer(ObjectDeserializer<AddBlockResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+        op.add(Builder::shardsAcknowledged, JsonpDeserializer.booleanDeserializer(), "shards_acknowledged");
+        op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(IndicesBlockStatus._DESERIALIZER), "indices");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/Alias.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/Alias.java
index 9b85a3426c..3297490e23 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/Alias.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/Alias.java
@@ -32,261 +32,262 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices._types.Alias
 
-
 @JsonpDeserializable
 public class Alias implements JsonpSerializable {
-	@Nullable
-	private final Query filter;
-
-	@Nullable
-	private final String indexRouting;
-
-	@Nullable
-	private final Boolean isHidden;
-
-	@Nullable
-	private final Boolean isWriteIndex;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final String searchRouting;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Alias(Builder builder) {
-
-		this.filter = builder.filter;
-		this.indexRouting = builder.indexRouting;
-		this.isHidden = builder.isHidden;
-		this.isWriteIndex = builder.isWriteIndex;
-		this.routing = builder.routing;
-		this.searchRouting = builder.searchRouting;
-
-	}
-
-	public static Alias of(Function<Builder, ObjectBuilder<Alias>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code filter}
-	 */
-	@Nullable
-	public final Query filter() {
-		return this.filter;
-	}
-
-	/**
-	 * API name: {@code index_routing}
-	 */
-	@Nullable
-	public final String indexRouting() {
-		return this.indexRouting;
-	}
-
-	/**
-	 * API name: {@code is_hidden}
-	 */
-	@Nullable
-	public final Boolean isHidden() {
-		return this.isHidden;
-	}
-
-	/**
-	 * API name: {@code is_write_index}
-	 */
-	@Nullable
-	public final Boolean isWriteIndex() {
-		return this.isWriteIndex;
-	}
-
-	/**
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * API name: {@code search_routing}
-	 */
-	@Nullable
-	public final String searchRouting() {
-		return this.searchRouting;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.filter != null) {
-			generator.writeKey("filter");
-			this.filter.serialize(generator, mapper);
-
-		}
-		if (this.indexRouting != null) {
-			generator.writeKey("index_routing");
-			generator.write(this.indexRouting);
-
-		}
-		if (this.isHidden != null) {
-			generator.writeKey("is_hidden");
-			generator.write(this.isHidden);
-
-		}
-		if (this.isWriteIndex != null) {
-			generator.writeKey("is_write_index");
-			generator.write(this.isWriteIndex);
-
-		}
-		if (this.routing != null) {
-			generator.writeKey("routing");
-			generator.write(this.routing);
-
-		}
-		if (this.searchRouting != null) {
-			generator.writeKey("search_routing");
-			generator.write(this.searchRouting);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Alias}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Alias> {
-		@Nullable
-		private Query filter;
-
-		@Nullable
-		private String indexRouting;
-
-		@Nullable
-		private Boolean isHidden;
-
-		@Nullable
-		private Boolean isWriteIndex;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private String searchRouting;
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(@Nullable Query value) {
-			this.filter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.filter(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code index_routing}
-		 */
-		public final Builder indexRouting(@Nullable String value) {
-			this.indexRouting = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code is_hidden}
-		 */
-		public final Builder isHidden(@Nullable Boolean value) {
-			this.isHidden = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code is_write_index}
-		 */
-		public final Builder isWriteIndex(@Nullable Boolean value) {
-			this.isWriteIndex = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code search_routing}
-		 */
-		public final Builder searchRouting(@Nullable String value) {
-			this.searchRouting = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Alias}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Alias build() {
-			_checkSingleUse();
-
-			return new Alias(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Alias}
-	 */
-	public static final JsonpDeserializer<Alias> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Alias::setupAliasDeserializer);
-
-	protected static void setupAliasDeserializer(ObjectDeserializer<Alias.Builder> op) {
-
-		op.add(Builder::filter, Query._DESERIALIZER, "filter");
-		op.add(Builder::indexRouting, JsonpDeserializer.stringDeserializer(), "index_routing");
-		op.add(Builder::isHidden, JsonpDeserializer.booleanDeserializer(), "is_hidden");
-		op.add(Builder::isWriteIndex, JsonpDeserializer.booleanDeserializer(), "is_write_index");
-		op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
-		op.add(Builder::searchRouting, JsonpDeserializer.stringDeserializer(), "search_routing");
-
-	}
+    @Nullable
+    private final Query filter;
+
+    @Nullable
+    private final String indexRouting;
+
+    @Nullable
+    private final Boolean isHidden;
+
+    @Nullable
+    private final Boolean isWriteIndex;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final String searchRouting;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Alias(Builder builder) {
+
+        this.filter = builder.filter;
+        this.indexRouting = builder.indexRouting;
+        this.isHidden = builder.isHidden;
+        this.isWriteIndex = builder.isWriteIndex;
+        this.routing = builder.routing;
+        this.searchRouting = builder.searchRouting;
+
+    }
+
+    public static Alias of(Function<Builder, ObjectBuilder<Alias>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code filter}
+     */
+    @Nullable
+    public final Query filter() {
+        return this.filter;
+    }
+
+    /**
+     * API name: {@code index_routing}
+     */
+    @Nullable
+    public final String indexRouting() {
+        return this.indexRouting;
+    }
+
+    /**
+     * API name: {@code is_hidden}
+     */
+    @Nullable
+    public final Boolean isHidden() {
+        return this.isHidden;
+    }
+
+    /**
+     * API name: {@code is_write_index}
+     */
+    @Nullable
+    public final Boolean isWriteIndex() {
+        return this.isWriteIndex;
+    }
+
+    /**
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * API name: {@code search_routing}
+     */
+    @Nullable
+    public final String searchRouting() {
+        return this.searchRouting;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.filter != null) {
+            generator.writeKey("filter");
+            this.filter.serialize(generator, mapper);
+
+        }
+        if (this.indexRouting != null) {
+            generator.writeKey("index_routing");
+            generator.write(this.indexRouting);
+
+        }
+        if (this.isHidden != null) {
+            generator.writeKey("is_hidden");
+            generator.write(this.isHidden);
+
+        }
+        if (this.isWriteIndex != null) {
+            generator.writeKey("is_write_index");
+            generator.write(this.isWriteIndex);
+
+        }
+        if (this.routing != null) {
+            generator.writeKey("routing");
+            generator.write(this.routing);
+
+        }
+        if (this.searchRouting != null) {
+            generator.writeKey("search_routing");
+            generator.write(this.searchRouting);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Alias}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Alias> {
+        @Nullable
+        private Query filter;
+
+        @Nullable
+        private String indexRouting;
+
+        @Nullable
+        private Boolean isHidden;
+
+        @Nullable
+        private Boolean isWriteIndex;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private String searchRouting;
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(@Nullable Query value) {
+            this.filter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.filter(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code index_routing}
+         */
+        public final Builder indexRouting(@Nullable String value) {
+            this.indexRouting = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code is_hidden}
+         */
+        public final Builder isHidden(@Nullable Boolean value) {
+            this.isHidden = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code is_write_index}
+         */
+        public final Builder isWriteIndex(@Nullable Boolean value) {
+            this.isWriteIndex = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code search_routing}
+         */
+        public final Builder searchRouting(@Nullable String value) {
+            this.searchRouting = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Alias}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Alias build() {
+            _checkSingleUse();
+
+            return new Alias(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Alias}
+     */
+    public static final JsonpDeserializer<Alias> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Alias::setupAliasDeserializer
+    );
+
+    protected static void setupAliasDeserializer(ObjectDeserializer<Alias.Builder> op) {
+
+        op.add(Builder::filter, Query._DESERIALIZER, "filter");
+        op.add(Builder::indexRouting, JsonpDeserializer.stringDeserializer(), "index_routing");
+        op.add(Builder::isHidden, JsonpDeserializer.booleanDeserializer(), "is_hidden");
+        op.add(Builder::isWriteIndex, JsonpDeserializer.booleanDeserializer(), "is_write_index");
+        op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
+        op.add(Builder::searchRouting, JsonpDeserializer.stringDeserializer(), "search_routing");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/AliasDefinition.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/AliasDefinition.java
index 4fb23cc7a8..cad15ee5cf 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/AliasDefinition.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/AliasDefinition.java
@@ -32,232 +32,233 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices._types.AliasDefinition
 
-
 @JsonpDeserializable
 public class AliasDefinition implements JsonpSerializable {
-	@Nullable
-	private final Query filter;
-
-	@Nullable
-	private final String indexRouting;
-
-	@Nullable
-	private final Boolean isWriteIndex;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final String searchRouting;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AliasDefinition(Builder builder) {
-
-		this.filter = builder.filter;
-		this.indexRouting = builder.indexRouting;
-		this.isWriteIndex = builder.isWriteIndex;
-		this.routing = builder.routing;
-		this.searchRouting = builder.searchRouting;
-
-	}
-
-	public static AliasDefinition of(Function<Builder, ObjectBuilder<AliasDefinition>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code filter}
-	 */
-	@Nullable
-	public final Query filter() {
-		return this.filter;
-	}
-
-	/**
-	 * API name: {@code index_routing}
-	 */
-	@Nullable
-	public final String indexRouting() {
-		return this.indexRouting;
-	}
-
-	/**
-	 * API name: {@code is_write_index}
-	 */
-	@Nullable
-	public final Boolean isWriteIndex() {
-		return this.isWriteIndex;
-	}
-
-	/**
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * API name: {@code search_routing}
-	 */
-	@Nullable
-	public final String searchRouting() {
-		return this.searchRouting;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.filter != null) {
-			generator.writeKey("filter");
-			this.filter.serialize(generator, mapper);
-
-		}
-		if (this.indexRouting != null) {
-			generator.writeKey("index_routing");
-			generator.write(this.indexRouting);
-
-		}
-		if (this.isWriteIndex != null) {
-			generator.writeKey("is_write_index");
-			generator.write(this.isWriteIndex);
-
-		}
-		if (this.routing != null) {
-			generator.writeKey("routing");
-			generator.write(this.routing);
-
-		}
-		if (this.searchRouting != null) {
-			generator.writeKey("search_routing");
-			generator.write(this.searchRouting);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AliasDefinition}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AliasDefinition> {
-		@Nullable
-		private Query filter;
-
-		@Nullable
-		private String indexRouting;
-
-		@Nullable
-		private Boolean isWriteIndex;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private String searchRouting;
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(@Nullable Query value) {
-			this.filter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.filter(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code index_routing}
-		 */
-		public final Builder indexRouting(@Nullable String value) {
-			this.indexRouting = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code is_write_index}
-		 */
-		public final Builder isWriteIndex(@Nullable Boolean value) {
-			this.isWriteIndex = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code search_routing}
-		 */
-		public final Builder searchRouting(@Nullable String value) {
-			this.searchRouting = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AliasDefinition}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AliasDefinition build() {
-			_checkSingleUse();
-
-			return new AliasDefinition(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AliasDefinition}
-	 */
-	public static final JsonpDeserializer<AliasDefinition> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			AliasDefinition::setupAliasDefinitionDeserializer);
-
-	protected static void setupAliasDefinitionDeserializer(ObjectDeserializer<AliasDefinition.Builder> op) {
-
-		op.add(Builder::filter, Query._DESERIALIZER, "filter");
-		op.add(Builder::indexRouting, JsonpDeserializer.stringDeserializer(), "index_routing");
-		op.add(Builder::isWriteIndex, JsonpDeserializer.booleanDeserializer(), "is_write_index");
-		op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
-		op.add(Builder::searchRouting, JsonpDeserializer.stringDeserializer(), "search_routing");
-
-	}
+    @Nullable
+    private final Query filter;
+
+    @Nullable
+    private final String indexRouting;
+
+    @Nullable
+    private final Boolean isWriteIndex;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final String searchRouting;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AliasDefinition(Builder builder) {
+
+        this.filter = builder.filter;
+        this.indexRouting = builder.indexRouting;
+        this.isWriteIndex = builder.isWriteIndex;
+        this.routing = builder.routing;
+        this.searchRouting = builder.searchRouting;
+
+    }
+
+    public static AliasDefinition of(Function<Builder, ObjectBuilder<AliasDefinition>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code filter}
+     */
+    @Nullable
+    public final Query filter() {
+        return this.filter;
+    }
+
+    /**
+     * API name: {@code index_routing}
+     */
+    @Nullable
+    public final String indexRouting() {
+        return this.indexRouting;
+    }
+
+    /**
+     * API name: {@code is_write_index}
+     */
+    @Nullable
+    public final Boolean isWriteIndex() {
+        return this.isWriteIndex;
+    }
+
+    /**
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * API name: {@code search_routing}
+     */
+    @Nullable
+    public final String searchRouting() {
+        return this.searchRouting;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.filter != null) {
+            generator.writeKey("filter");
+            this.filter.serialize(generator, mapper);
+
+        }
+        if (this.indexRouting != null) {
+            generator.writeKey("index_routing");
+            generator.write(this.indexRouting);
+
+        }
+        if (this.isWriteIndex != null) {
+            generator.writeKey("is_write_index");
+            generator.write(this.isWriteIndex);
+
+        }
+        if (this.routing != null) {
+            generator.writeKey("routing");
+            generator.write(this.routing);
+
+        }
+        if (this.searchRouting != null) {
+            generator.writeKey("search_routing");
+            generator.write(this.searchRouting);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AliasDefinition}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AliasDefinition> {
+        @Nullable
+        private Query filter;
+
+        @Nullable
+        private String indexRouting;
+
+        @Nullable
+        private Boolean isWriteIndex;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private String searchRouting;
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(@Nullable Query value) {
+            this.filter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.filter(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code index_routing}
+         */
+        public final Builder indexRouting(@Nullable String value) {
+            this.indexRouting = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code is_write_index}
+         */
+        public final Builder isWriteIndex(@Nullable Boolean value) {
+            this.isWriteIndex = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code search_routing}
+         */
+        public final Builder searchRouting(@Nullable String value) {
+            this.searchRouting = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link AliasDefinition}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AliasDefinition build() {
+            _checkSingleUse();
+
+            return new AliasDefinition(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AliasDefinition}
+     */
+    public static final JsonpDeserializer<AliasDefinition> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AliasDefinition::setupAliasDefinitionDeserializer
+    );
+
+    protected static void setupAliasDefinitionDeserializer(ObjectDeserializer<AliasDefinition.Builder> op) {
+
+        op.add(Builder::filter, Query._DESERIALIZER, "filter");
+        op.add(Builder::indexRouting, JsonpDeserializer.stringDeserializer(), "index_routing");
+        op.add(Builder::isWriteIndex, JsonpDeserializer.booleanDeserializer(), "is_write_index");
+        op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
+        op.add(Builder::searchRouting, JsonpDeserializer.stringDeserializer(), "search_routing");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/AnalyzeRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/AnalyzeRequest.java
index c8c3e1f24a..f035939058 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/AnalyzeRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/AnalyzeRequest.java
@@ -32,511 +32,514 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.analysis.CharFilter;
-import org.opensearch.client.opensearch._types.analysis.TokenFilter;
-import org.opensearch.client.opensearch._types.analysis.Tokenizer;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.analysis.CharFilter;
+import org.opensearch.client.opensearch._types.analysis.TokenFilter;
+import org.opensearch.client.opensearch._types.analysis.Tokenizer;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.analyze.Request
 
 /**
  * Performs the analysis process on a text and return the tokens breakdown of
  * the text.
- * 
+ *
  */
 @JsonpDeserializable
 public class AnalyzeRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final String analyzer;
-
-	private final List<String> attributes;
-
-	private final List<CharFilter> charFilter;
-
-	@Nullable
-	private final Boolean explain;
-
-	@Nullable
-	private final String field;
-
-	private final List<TokenFilter> filter;
-
-	@Nullable
-	private final String index;
-
-	@Nullable
-	private final String normalizer;
-
-	private final List<String> text;
-
-	@Nullable
-	private final Tokenizer tokenizer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AnalyzeRequest(Builder builder) {
-
-		this.analyzer = builder.analyzer;
-		this.attributes = ApiTypeHelper.unmodifiable(builder.attributes);
-		this.charFilter = ApiTypeHelper.unmodifiable(builder.charFilter);
-		this.explain = builder.explain;
-		this.field = builder.field;
-		this.filter = ApiTypeHelper.unmodifiable(builder.filter);
-		this.index = builder.index;
-		this.normalizer = builder.normalizer;
-		this.text = ApiTypeHelper.unmodifiable(builder.text);
-		this.tokenizer = builder.tokenizer;
-
-	}
-
-	public static AnalyzeRequest of(Function<Builder, ObjectBuilder<AnalyzeRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * API name: {@code attributes}
-	 */
-	public final List<String> attributes() {
-		return this.attributes;
-	}
-
-	/**
-	 * API name: {@code char_filter}
-	 */
-	public final List<CharFilter> charFilter() {
-		return this.charFilter;
-	}
-
-	/**
-	 * API name: {@code explain}
-	 */
-	@Nullable
-	public final Boolean explain() {
-		return this.explain;
-	}
-
-	/**
-	 * API name: {@code field}
-	 */
-	@Nullable
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code filter}
-	 */
-	public final List<TokenFilter> filter() {
-		return this.filter;
-	}
-
-	/**
-	 * The name of the index to scope the operation
-	 * <p>
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code normalizer}
-	 */
-	@Nullable
-	public final String normalizer() {
-		return this.normalizer;
-	}
-
-	/**
-	 * API name: {@code text}
-	 */
-	public final List<String> text() {
-		return this.text;
-	}
-
-	/**
-	 * API name: {@code tokenizer}
-	 */
-	@Nullable
-	public final Tokenizer tokenizer() {
-		return this.tokenizer;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			generator.write(this.analyzer);
-
-		}
-		if (ApiTypeHelper.isDefined(this.attributes)) {
-			generator.writeKey("attributes");
-			generator.writeStartArray();
-			for (String item0 : this.attributes) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.charFilter)) {
-			generator.writeKey("char_filter");
-			generator.writeStartArray();
-			for (CharFilter item0 : this.charFilter) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.explain != null) {
-			generator.writeKey("explain");
-			generator.write(this.explain);
-
-		}
-		if (this.field != null) {
-			generator.writeKey("field");
-			generator.write(this.field);
-
-		}
-		if (ApiTypeHelper.isDefined(this.filter)) {
-			generator.writeKey("filter");
-			generator.writeStartArray();
-			for (TokenFilter item0 : this.filter) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.normalizer != null) {
-			generator.writeKey("normalizer");
-			generator.write(this.normalizer);
-
-		}
-		if (ApiTypeHelper.isDefined(this.text)) {
-			generator.writeKey("text");
-			generator.writeStartArray();
-			for (String item0 : this.text) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.tokenizer != null) {
-			generator.writeKey("tokenizer");
-			this.tokenizer.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AnalyzeRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AnalyzeRequest> {
-		@Nullable
-		private String analyzer;
-
-		@Nullable
-		private List<String> attributes;
-
-		@Nullable
-		private List<CharFilter> charFilter;
-
-		@Nullable
-		private Boolean explain;
-
-		@Nullable
-		private String field;
-
-		@Nullable
-		private List<TokenFilter> filter;
-
-		@Nullable
-		private String index;
-
-		@Nullable
-		private String normalizer;
-
-		@Nullable
-		private List<String> text;
-
-		@Nullable
-		private Tokenizer tokenizer;
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code attributes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>attributes</code>.
-		 */
-		public final Builder attributes(List<String> list) {
-			this.attributes = _listAddAll(this.attributes, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code attributes}
-		 * <p>
-		 * Adds one or more values to <code>attributes</code>.
-		 */
-		public final Builder attributes(String value, String... values) {
-			this.attributes = _listAdd(this.attributes, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code char_filter}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>charFilter</code>.
-		 */
-		public final Builder charFilter(List<CharFilter> list) {
-			this.charFilter = _listAddAll(this.charFilter, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code char_filter}
-		 * <p>
-		 * Adds one or more values to <code>charFilter</code>.
-		 */
-		public final Builder charFilter(CharFilter value, CharFilter... values) {
-			this.charFilter = _listAdd(this.charFilter, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code char_filter}
-		 * <p>
-		 * Adds a value to <code>charFilter</code> using a builder lambda.
-		 */
-		public final Builder charFilter(Function<CharFilter.Builder, ObjectBuilder<CharFilter>> fn) {
-			return charFilter(fn.apply(new CharFilter.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code explain}
-		 */
-		public final Builder explain(@Nullable Boolean value) {
-			this.explain = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code field}
-		 */
-		public final Builder field(@Nullable String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>filter</code>.
-		 */
-		public final Builder filter(List<TokenFilter> list) {
-			this.filter = _listAddAll(this.filter, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 * <p>
-		 * Adds one or more values to <code>filter</code>.
-		 */
-		public final Builder filter(TokenFilter value, TokenFilter... values) {
-			this.filter = _listAdd(this.filter, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 * <p>
-		 * Adds a value to <code>filter</code> using a builder lambda.
-		 */
-		public final Builder filter(Function<TokenFilter.Builder, ObjectBuilder<TokenFilter>> fn) {
-			return filter(fn.apply(new TokenFilter.Builder()).build());
-		}
-
-		/**
-		 * The name of the index to scope the operation
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code normalizer}
-		 */
-		public final Builder normalizer(@Nullable String value) {
-			this.normalizer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code text}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>text</code>.
-		 */
-		public final Builder text(List<String> list) {
-			this.text = _listAddAll(this.text, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code text}
-		 * <p>
-		 * Adds one or more values to <code>text</code>.
-		 */
-		public final Builder text(String value, String... values) {
-			this.text = _listAdd(this.text, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code tokenizer}
-		 */
-		public final Builder tokenizer(@Nullable Tokenizer value) {
-			this.tokenizer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code tokenizer}
-		 */
-		public final Builder tokenizer(Function<Tokenizer.Builder, ObjectBuilder<Tokenizer>> fn) {
-			return this.tokenizer(fn.apply(new Tokenizer.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link AnalyzeRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AnalyzeRequest build() {
-			_checkSingleUse();
-
-			return new AnalyzeRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AnalyzeRequest}
-	 */
-	public static final JsonpDeserializer<AnalyzeRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			AnalyzeRequest::setupAnalyzeRequestDeserializer);
-
-	protected static void setupAnalyzeRequestDeserializer(ObjectDeserializer<AnalyzeRequest.Builder> op) {
-
-		op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
-		op.add(Builder::attributes, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"attributes");
-		op.add(Builder::charFilter, JsonpDeserializer.arrayDeserializer(CharFilter._DESERIALIZER), "char_filter");
-		op.add(Builder::explain, JsonpDeserializer.booleanDeserializer(), "explain");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::filter, JsonpDeserializer.arrayDeserializer(TokenFilter._DESERIALIZER), "filter");
-		op.add(Builder::normalizer, JsonpDeserializer.stringDeserializer(), "normalizer");
-		op.add(Builder::text, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "text");
-		op.add(Builder::tokenizer, Tokenizer._DESERIALIZER, "tokenizer");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.analyze}".
-	 */
-	public static final Endpoint<AnalyzeRequest, AnalyzeResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (request.index() != null)
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_analyze");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_analyze");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
-
-			}, SimpleEndpoint.emptyMap(), true, AnalyzeResponse._DESERIALIZER);
+    @Nullable
+    private final String analyzer;
+
+    private final List<String> attributes;
+
+    private final List<CharFilter> charFilter;
+
+    @Nullable
+    private final Boolean explain;
+
+    @Nullable
+    private final String field;
+
+    private final List<TokenFilter> filter;
+
+    @Nullable
+    private final String index;
+
+    @Nullable
+    private final String normalizer;
+
+    private final List<String> text;
+
+    @Nullable
+    private final Tokenizer tokenizer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AnalyzeRequest(Builder builder) {
+
+        this.analyzer = builder.analyzer;
+        this.attributes = ApiTypeHelper.unmodifiable(builder.attributes);
+        this.charFilter = ApiTypeHelper.unmodifiable(builder.charFilter);
+        this.explain = builder.explain;
+        this.field = builder.field;
+        this.filter = ApiTypeHelper.unmodifiable(builder.filter);
+        this.index = builder.index;
+        this.normalizer = builder.normalizer;
+        this.text = ApiTypeHelper.unmodifiable(builder.text);
+        this.tokenizer = builder.tokenizer;
+
+    }
+
+    public static AnalyzeRequest of(Function<Builder, ObjectBuilder<AnalyzeRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * API name: {@code attributes}
+     */
+    public final List<String> attributes() {
+        return this.attributes;
+    }
+
+    /**
+     * API name: {@code char_filter}
+     */
+    public final List<CharFilter> charFilter() {
+        return this.charFilter;
+    }
+
+    /**
+     * API name: {@code explain}
+     */
+    @Nullable
+    public final Boolean explain() {
+        return this.explain;
+    }
+
+    /**
+     * API name: {@code field}
+     */
+    @Nullable
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code filter}
+     */
+    public final List<TokenFilter> filter() {
+        return this.filter;
+    }
+
+    /**
+     * The name of the index to scope the operation
+     * <p>
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code normalizer}
+     */
+    @Nullable
+    public final String normalizer() {
+        return this.normalizer;
+    }
+
+    /**
+     * API name: {@code text}
+     */
+    public final List<String> text() {
+        return this.text;
+    }
+
+    /**
+     * API name: {@code tokenizer}
+     */
+    @Nullable
+    public final Tokenizer tokenizer() {
+        return this.tokenizer;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            generator.write(this.analyzer);
+
+        }
+        if (ApiTypeHelper.isDefined(this.attributes)) {
+            generator.writeKey("attributes");
+            generator.writeStartArray();
+            for (String item0 : this.attributes) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.charFilter)) {
+            generator.writeKey("char_filter");
+            generator.writeStartArray();
+            for (CharFilter item0 : this.charFilter) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.explain != null) {
+            generator.writeKey("explain");
+            generator.write(this.explain);
+
+        }
+        if (this.field != null) {
+            generator.writeKey("field");
+            generator.write(this.field);
+
+        }
+        if (ApiTypeHelper.isDefined(this.filter)) {
+            generator.writeKey("filter");
+            generator.writeStartArray();
+            for (TokenFilter item0 : this.filter) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.normalizer != null) {
+            generator.writeKey("normalizer");
+            generator.write(this.normalizer);
+
+        }
+        if (ApiTypeHelper.isDefined(this.text)) {
+            generator.writeKey("text");
+            generator.writeStartArray();
+            for (String item0 : this.text) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.tokenizer != null) {
+            generator.writeKey("tokenizer");
+            this.tokenizer.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AnalyzeRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AnalyzeRequest> {
+        @Nullable
+        private String analyzer;
+
+        @Nullable
+        private List<String> attributes;
+
+        @Nullable
+        private List<CharFilter> charFilter;
+
+        @Nullable
+        private Boolean explain;
+
+        @Nullable
+        private String field;
+
+        @Nullable
+        private List<TokenFilter> filter;
+
+        @Nullable
+        private String index;
+
+        @Nullable
+        private String normalizer;
+
+        @Nullable
+        private List<String> text;
+
+        @Nullable
+        private Tokenizer tokenizer;
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code attributes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>attributes</code>.
+         */
+        public final Builder attributes(List<String> list) {
+            this.attributes = _listAddAll(this.attributes, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code attributes}
+         * <p>
+         * Adds one or more values to <code>attributes</code>.
+         */
+        public final Builder attributes(String value, String... values) {
+            this.attributes = _listAdd(this.attributes, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code char_filter}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>charFilter</code>.
+         */
+        public final Builder charFilter(List<CharFilter> list) {
+            this.charFilter = _listAddAll(this.charFilter, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code char_filter}
+         * <p>
+         * Adds one or more values to <code>charFilter</code>.
+         */
+        public final Builder charFilter(CharFilter value, CharFilter... values) {
+            this.charFilter = _listAdd(this.charFilter, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code char_filter}
+         * <p>
+         * Adds a value to <code>charFilter</code> using a builder lambda.
+         */
+        public final Builder charFilter(Function<CharFilter.Builder, ObjectBuilder<CharFilter>> fn) {
+            return charFilter(fn.apply(new CharFilter.Builder()).build());
+        }
+
+        /**
+         * API name: {@code explain}
+         */
+        public final Builder explain(@Nullable Boolean value) {
+            this.explain = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code field}
+         */
+        public final Builder field(@Nullable String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>filter</code>.
+         */
+        public final Builder filter(List<TokenFilter> list) {
+            this.filter = _listAddAll(this.filter, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         * <p>
+         * Adds one or more values to <code>filter</code>.
+         */
+        public final Builder filter(TokenFilter value, TokenFilter... values) {
+            this.filter = _listAdd(this.filter, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         * <p>
+         * Adds a value to <code>filter</code> using a builder lambda.
+         */
+        public final Builder filter(Function<TokenFilter.Builder, ObjectBuilder<TokenFilter>> fn) {
+            return filter(fn.apply(new TokenFilter.Builder()).build());
+        }
+
+        /**
+         * The name of the index to scope the operation
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code normalizer}
+         */
+        public final Builder normalizer(@Nullable String value) {
+            this.normalizer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code text}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>text</code>.
+         */
+        public final Builder text(List<String> list) {
+            this.text = _listAddAll(this.text, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code text}
+         * <p>
+         * Adds one or more values to <code>text</code>.
+         */
+        public final Builder text(String value, String... values) {
+            this.text = _listAdd(this.text, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code tokenizer}
+         */
+        public final Builder tokenizer(@Nullable Tokenizer value) {
+            this.tokenizer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code tokenizer}
+         */
+        public final Builder tokenizer(Function<Tokenizer.Builder, ObjectBuilder<Tokenizer>> fn) {
+            return this.tokenizer(fn.apply(new Tokenizer.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link AnalyzeRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AnalyzeRequest build() {
+            _checkSingleUse();
+
+            return new AnalyzeRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AnalyzeRequest}
+     */
+    public static final JsonpDeserializer<AnalyzeRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AnalyzeRequest::setupAnalyzeRequestDeserializer
+    );
+
+    protected static void setupAnalyzeRequestDeserializer(ObjectDeserializer<AnalyzeRequest.Builder> op) {
+
+        op.add(Builder::analyzer, JsonpDeserializer.stringDeserializer(), "analyzer");
+        op.add(Builder::attributes, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "attributes");
+        op.add(Builder::charFilter, JsonpDeserializer.arrayDeserializer(CharFilter._DESERIALIZER), "char_filter");
+        op.add(Builder::explain, JsonpDeserializer.booleanDeserializer(), "explain");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::filter, JsonpDeserializer.arrayDeserializer(TokenFilter._DESERIALIZER), "filter");
+        op.add(Builder::normalizer, JsonpDeserializer.stringDeserializer(), "normalizer");
+        op.add(Builder::text, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "text");
+        op.add(Builder::tokenizer, Tokenizer._DESERIALIZER, "tokenizer");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.analyze}".
+     */
+    public static final Endpoint<AnalyzeRequest, AnalyzeResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (request.index() != null) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_analyze");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_analyze");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        AnalyzeResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/AnalyzeResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/AnalyzeResponse.java
index 314ea9c94b..f977af5085 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/AnalyzeResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/AnalyzeResponse.java
@@ -32,172 +32,173 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch.indices.analyze.AnalyzeDetail;
-import org.opensearch.client.opensearch.indices.analyze.AnalyzeToken;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.indices.analyze.AnalyzeDetail;
+import org.opensearch.client.opensearch.indices.analyze.AnalyzeToken;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.analyze.Response
 
 @JsonpDeserializable
 public class AnalyzeResponse implements JsonpSerializable {
-	@Nullable
-	private final AnalyzeDetail detail;
-
-	private final List<AnalyzeToken> tokens;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AnalyzeResponse(Builder builder) {
-
-		this.detail = builder.detail;
-		this.tokens = ApiTypeHelper.unmodifiable(builder.tokens);
-
-	}
-
-	public static AnalyzeResponse of(Function<Builder, ObjectBuilder<AnalyzeResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code detail}
-	 */
-	@Nullable
-	public final AnalyzeDetail detail() {
-		return this.detail;
-	}
-
-	/**
-	 * API name: {@code tokens}
-	 */
-	public final List<AnalyzeToken> tokens() {
-		return this.tokens;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.detail != null) {
-			generator.writeKey("detail");
-			this.detail.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.tokens)) {
-			generator.writeKey("tokens");
-			generator.writeStartArray();
-			for (AnalyzeToken item0 : this.tokens) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AnalyzeResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AnalyzeResponse> {
-		@Nullable
-		private AnalyzeDetail detail;
-
-		@Nullable
-		private List<AnalyzeToken> tokens;
-
-		/**
-		 * API name: {@code detail}
-		 */
-		public final Builder detail(@Nullable AnalyzeDetail value) {
-			this.detail = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code detail}
-		 */
-		public final Builder detail(Function<AnalyzeDetail.Builder, ObjectBuilder<AnalyzeDetail>> fn) {
-			return this.detail(fn.apply(new AnalyzeDetail.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code tokens}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>tokens</code>.
-		 */
-		public final Builder tokens(List<AnalyzeToken> list) {
-			this.tokens = _listAddAll(this.tokens, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code tokens}
-		 * <p>
-		 * Adds one or more values to <code>tokens</code>.
-		 */
-		public final Builder tokens(AnalyzeToken value, AnalyzeToken... values) {
-			this.tokens = _listAdd(this.tokens, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code tokens}
-		 * <p>
-		 * Adds a value to <code>tokens</code> using a builder lambda.
-		 */
-		public final Builder tokens(Function<AnalyzeToken.Builder, ObjectBuilder<AnalyzeToken>> fn) {
-			return tokens(fn.apply(new AnalyzeToken.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link AnalyzeResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AnalyzeResponse build() {
-			_checkSingleUse();
-
-			return new AnalyzeResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AnalyzeResponse}
-	 */
-	public static final JsonpDeserializer<AnalyzeResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			AnalyzeResponse::setupAnalyzeResponseDeserializer);
-
-	protected static void setupAnalyzeResponseDeserializer(ObjectDeserializer<AnalyzeResponse.Builder> op) {
-
-		op.add(Builder::detail, AnalyzeDetail._DESERIALIZER, "detail");
-		op.add(Builder::tokens, JsonpDeserializer.arrayDeserializer(AnalyzeToken._DESERIALIZER), "tokens");
-
-	}
+    @Nullable
+    private final AnalyzeDetail detail;
+
+    private final List<AnalyzeToken> tokens;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AnalyzeResponse(Builder builder) {
+
+        this.detail = builder.detail;
+        this.tokens = ApiTypeHelper.unmodifiable(builder.tokens);
+
+    }
+
+    public static AnalyzeResponse of(Function<Builder, ObjectBuilder<AnalyzeResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code detail}
+     */
+    @Nullable
+    public final AnalyzeDetail detail() {
+        return this.detail;
+    }
+
+    /**
+     * API name: {@code tokens}
+     */
+    public final List<AnalyzeToken> tokens() {
+        return this.tokens;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.detail != null) {
+            generator.writeKey("detail");
+            this.detail.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.tokens)) {
+            generator.writeKey("tokens");
+            generator.writeStartArray();
+            for (AnalyzeToken item0 : this.tokens) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AnalyzeResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AnalyzeResponse> {
+        @Nullable
+        private AnalyzeDetail detail;
+
+        @Nullable
+        private List<AnalyzeToken> tokens;
+
+        /**
+         * API name: {@code detail}
+         */
+        public final Builder detail(@Nullable AnalyzeDetail value) {
+            this.detail = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code detail}
+         */
+        public final Builder detail(Function<AnalyzeDetail.Builder, ObjectBuilder<AnalyzeDetail>> fn) {
+            return this.detail(fn.apply(new AnalyzeDetail.Builder()).build());
+        }
+
+        /**
+         * API name: {@code tokens}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>tokens</code>.
+         */
+        public final Builder tokens(List<AnalyzeToken> list) {
+            this.tokens = _listAddAll(this.tokens, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code tokens}
+         * <p>
+         * Adds one or more values to <code>tokens</code>.
+         */
+        public final Builder tokens(AnalyzeToken value, AnalyzeToken... values) {
+            this.tokens = _listAdd(this.tokens, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code tokens}
+         * <p>
+         * Adds a value to <code>tokens</code> using a builder lambda.
+         */
+        public final Builder tokens(Function<AnalyzeToken.Builder, ObjectBuilder<AnalyzeToken>> fn) {
+            return tokens(fn.apply(new AnalyzeToken.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link AnalyzeResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AnalyzeResponse build() {
+            _checkSingleUse();
+
+            return new AnalyzeResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AnalyzeResponse}
+     */
+    public static final JsonpDeserializer<AnalyzeResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AnalyzeResponse::setupAnalyzeResponseDeserializer
+    );
+
+    protected static void setupAnalyzeResponseDeserializer(ObjectDeserializer<AnalyzeResponse.Builder> op) {
+
+        op.add(Builder::detail, AnalyzeDetail._DESERIALIZER, "detail");
+        op.add(Builder::tokens, JsonpDeserializer.arrayDeserializer(AnalyzeToken._DESERIALIZER), "tokens");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ClearCacheRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ClearCacheRequest.java
index 8d036efcc9..d49e35482b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ClearCacheRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ClearCacheRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -41,383 +47,377 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.clear_cache.Request
 
 /**
  * Clears all or specific caches for one or more indices.
- * 
+ *
  */
 
 public class ClearCacheRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean fielddata;
-
-	private final List<String> fields;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Boolean query;
-
-	@Nullable
-	private final Boolean request;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ClearCacheRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.fielddata = builder.fielddata;
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.query = builder.query;
-		this.request = builder.request;
-
-	}
-
-	public static ClearCacheRequest of(Function<Builder, ObjectBuilder<ClearCacheRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Clear field data
-	 * <p>
-	 * API name: {@code fielddata}
-	 */
-	@Nullable
-	public final Boolean fielddata() {
-		return this.fielddata;
-	}
-
-	/**
-	 * A comma-separated list of fields to clear when using the
-	 * <code>fielddata</code> parameter (default: all)
-	 * <p>
-	 * API name: {@code fields}
-	 */
-	public final List<String> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * A comma-separated list of index name to limit the operation
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Clear query caches
-	 * <p>
-	 * API name: {@code query}
-	 */
-	@Nullable
-	public final Boolean query() {
-		return this.query;
-	}
-
-	/**
-	 * Clear request cache
-	 * <p>
-	 * API name: {@code request}
-	 */
-	@Nullable
-	public final Boolean request() {
-		return this.request;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ClearCacheRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClearCacheRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean fielddata;
-
-		@Nullable
-		private List<String> fields;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private Boolean query;
-
-		@Nullable
-		private Boolean request;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Clear field data
-		 * <p>
-		 * API name: {@code fielddata}
-		 */
-		public final Builder fielddata(@Nullable Boolean value) {
-			this.fielddata = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of fields to clear when using the
-		 * <code>fielddata</code> parameter (default: all)
-		 * <p>
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fields</code>.
-		 */
-		public final Builder fields(List<String> list) {
-			this.fields = _listAddAll(this.fields, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of fields to clear when using the
-		 * <code>fielddata</code> parameter (default: all)
-		 * <p>
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds one or more values to <code>fields</code>.
-		 */
-		public final Builder fields(String value, String... values) {
-			this.fields = _listAdd(this.fields, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index name to limit the operation
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index name to limit the operation
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Clear query caches
-		 * <p>
-		 * API name: {@code query}
-		 */
-		public final Builder query(@Nullable Boolean value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * Clear request cache
-		 * <p>
-		 * API name: {@code request}
-		 */
-		public final Builder request(@Nullable Boolean value) {
-			this.request = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ClearCacheRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClearCacheRequest build() {
-			_checkSingleUse();
-
-			return new ClearCacheRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.clear_cache}".
-	 */
-	public static final Endpoint<ClearCacheRequest, ClearCacheResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cache");
-					buf.append("/clear");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_cache");
-					buf.append("/clear");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.request != null) {
-					params.put("request", String.valueOf(request.request));
-				}
-				if (request.fielddata != null) {
-					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(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.query != null) {
-					params.put("query", String.valueOf(request.query));
-				}
-				if (ApiTypeHelper.isDefined(request.fields)) {
-					params.put("fields", request.fields.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, ClearCacheResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean fielddata;
+
+    private final List<String> fields;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Boolean query;
+
+    @Nullable
+    private final Boolean request;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ClearCacheRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.fielddata = builder.fielddata;
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.query = builder.query;
+        this.request = builder.request;
+
+    }
+
+    public static ClearCacheRequest of(Function<Builder, ObjectBuilder<ClearCacheRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Clear field data
+     * <p>
+     * API name: {@code fielddata}
+     */
+    @Nullable
+    public final Boolean fielddata() {
+        return this.fielddata;
+    }
+
+    /**
+     * A comma-separated list of fields to clear when using the
+     * <code>fielddata</code> parameter (default: all)
+     * <p>
+     * API name: {@code fields}
+     */
+    public final List<String> fields() {
+        return this.fields;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * A comma-separated list of index name to limit the operation
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Clear query caches
+     * <p>
+     * API name: {@code query}
+     */
+    @Nullable
+    public final Boolean query() {
+        return this.query;
+    }
+
+    /**
+     * Clear request cache
+     * <p>
+     * API name: {@code request}
+     */
+    @Nullable
+    public final Boolean request() {
+        return this.request;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ClearCacheRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClearCacheRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean fielddata;
+
+        @Nullable
+        private List<String> fields;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private Boolean query;
+
+        @Nullable
+        private Boolean request;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Clear field data
+         * <p>
+         * API name: {@code fielddata}
+         */
+        public final Builder fielddata(@Nullable Boolean value) {
+            this.fielddata = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of fields to clear when using the
+         * <code>fielddata</code> parameter (default: all)
+         * <p>
+         * API name: {@code fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fields</code>.
+         */
+        public final Builder fields(List<String> list) {
+            this.fields = _listAddAll(this.fields, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of fields to clear when using the
+         * <code>fielddata</code> parameter (default: all)
+         * <p>
+         * API name: {@code fields}
+         * <p>
+         * Adds one or more values to <code>fields</code>.
+         */
+        public final Builder fields(String value, String... values) {
+            this.fields = _listAdd(this.fields, value, values);
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index name to limit the operation
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index name to limit the operation
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Clear query caches
+         * <p>
+         * API name: {@code query}
+         */
+        public final Builder query(@Nullable Boolean value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * Clear request cache
+         * <p>
+         * API name: {@code request}
+         */
+        public final Builder request(@Nullable Boolean value) {
+            this.request = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ClearCacheRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClearCacheRequest build() {
+            _checkSingleUse();
+
+            return new ClearCacheRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.clear_cache}".
+     */
+    public static final Endpoint<ClearCacheRequest, ClearCacheResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cache");
+                buf.append("/clear");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_cache");
+                buf.append("/clear");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.request != null) {
+                params.put("request", String.valueOf(request.request));
+            }
+            if (request.fielddata != null) {
+                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(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.query != null) {
+                params.put("query", String.valueOf(request.query));
+            }
+            if (ApiTypeHelper.isDefined(request.fields)) {
+                params.put("fields", request.fields.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        ClearCacheResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ClearCacheResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ClearCacheResponse.java
index d7fff6d8b4..59c73cca02 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ClearCacheResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ClearCacheResponse.java
@@ -32,68 +32,67 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ShardsOperationResponseBase;
+import java.util.function.Function;
 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.ShardsOperationResponseBase;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.clear_cache.Response
 
 @JsonpDeserializable
 public class ClearCacheResponse extends ShardsOperationResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ClearCacheResponse(Builder builder) {
-		super(builder);
+    private ClearCacheResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static ClearCacheResponse of(Function<Builder, ObjectBuilder<ClearCacheResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ClearCacheResponse of(Function<Builder, ObjectBuilder<ClearCacheResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link ClearCacheResponse}.
-	 */
+    /**
+     * Builder for {@link ClearCacheResponse}.
+     */
 
-	public static class Builder extends ShardsOperationResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ClearCacheResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends ShardsOperationResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<ClearCacheResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link ClearCacheResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ClearCacheResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link ClearCacheResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ClearCacheResponse build() {
+            _checkSingleUse();
 
-			return new ClearCacheResponse(this);
-		}
-	}
+            return new ClearCacheResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link ClearCacheResponse}
-	 */
-	public static final JsonpDeserializer<ClearCacheResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ClearCacheResponse::setupClearCacheResponseDeserializer);
+    /**
+     * Json deserializer for {@link ClearCacheResponse}
+     */
+    public static final JsonpDeserializer<ClearCacheResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ClearCacheResponse::setupClearCacheResponseDeserializer
+    );
 
-	protected static void setupClearCacheResponseDeserializer(ObjectDeserializer<ClearCacheResponse.Builder> op) {
-		ShardsOperationResponseBase.setupShardsOperationResponseBaseDeserializer(op);
+    protected static void setupClearCacheResponseDeserializer(ObjectDeserializer<ClearCacheResponse.Builder> op) {
+        ShardsOperationResponseBase.setupShardsOperationResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/CloneIndexRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/CloneIndexRequest.java
index 5347788c45..b81df1dceb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/CloneIndexRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/CloneIndexRequest.java
@@ -32,10 +32,11 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
-import org.opensearch.client.opensearch._types.WaitForActiveShards;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -43,434 +44,438 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.Time;
+import org.opensearch.client.opensearch._types.WaitForActiveShards;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.clone.Request
 
 /**
  * Clones an index
- * 
+ *
  */
 @JsonpDeserializable
 public class CloneIndexRequest extends RequestBase implements JsonpSerializable {
-	private final Map<String, Alias> aliases;
-
-	private final String index;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final Map<String, JsonData> settings;
-
-	private final String target;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final WaitForActiveShards waitForActiveShards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CloneIndexRequest(Builder builder) {
-
-		this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.settings = ApiTypeHelper.unmodifiable(builder.settings);
-		this.target = ApiTypeHelper.requireNonNull(builder.target, this, "target");
-		this.timeout = builder.timeout;
-		this.waitForActiveShards = builder.waitForActiveShards;
-
-	}
-
-	public static CloneIndexRequest of(Function<Builder, ObjectBuilder<CloneIndexRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code aliases}
-	 */
-	public final Map<String, Alias> aliases() {
-		return this.aliases;
-	}
-
-	/**
-	 * Required - The name of the source index to clone
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * API name: {@code settings}
-	 */
-	public final Map<String, JsonData> settings() {
-		return this.settings;
-	}
-
-	/**
-	 * Required - The name of the target index to clone into
-	 * <p>
-	 * API name: {@code target}
-	 */
-	public final String target() {
-		return this.target;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Set the number of active shards to wait for on the cloned index before the
-	 * operation returns.
-	 * <p>
-	 * API name: {@code wait_for_active_shards}
-	 */
-	@Nullable
-	public final WaitForActiveShards waitForActiveShards() {
-		return this.waitForActiveShards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.aliases)) {
-			generator.writeKey("aliases");
-			generator.writeStartObject();
-			for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.settings)) {
-			generator.writeKey("settings");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CloneIndexRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CloneIndexRequest> {
-		@Nullable
-		private Map<String, Alias> aliases;
-
-		private String index;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Map<String, JsonData> settings;
-
-		private String target;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private WaitForActiveShards waitForActiveShards;
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aliases</code>.
-		 */
-		public final Builder aliases(Map<String, Alias> map) {
-			this.aliases = _mapPutAll(this.aliases, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code>.
-		 */
-		public final Builder aliases(String key, Alias value) {
-			this.aliases = _mapPut(this.aliases, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code> using a builder lambda.
-		 */
-		public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
-			return aliases(key, fn.apply(new Alias.Builder()).build());
-		}
-
-		/**
-		 * Required - The name of the source index to clone
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code settings}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>settings</code>.
-		 */
-		public final Builder settings(Map<String, JsonData> map) {
-			this.settings = _mapPutAll(this.settings, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code settings}
-		 * <p>
-		 * Adds an entry to <code>settings</code>.
-		 */
-		public final Builder settings(String key, JsonData value) {
-			this.settings = _mapPut(this.settings, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - The name of the target index to clone into
-		 * <p>
-		 * API name: {@code target}
-		 */
-		public final Builder target(String value) {
-			this.target = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Set the number of active shards to wait for on the cloned index before the
-		 * operation returns.
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
-			this.waitForActiveShards = value;
-			return this;
-		}
-
-		/**
-		 * Set the number of active shards to wait for on the cloned index before the
-		 * operation returns.
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(
-				Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
-			return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link CloneIndexRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CloneIndexRequest build() {
-			_checkSingleUse();
-
-			return new CloneIndexRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CloneIndexRequest}
-	 */
-	public static final JsonpDeserializer<CloneIndexRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CloneIndexRequest::setupCloneIndexRequestDeserializer);
-
-	protected static void setupCloneIndexRequestDeserializer(ObjectDeserializer<CloneIndexRequest.Builder> op) {
-
-		op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
-		op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "settings");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.clone}".
-	 */
-	public static final Endpoint<CloneIndexRequest, CloneIndexResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "PUT";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-				final int _target = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-				propsSet |= _target;
-
-				if (propsSet == (_index | _target)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_clone");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.target, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.waitForActiveShards != null) {
-					params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, CloneIndexResponse._DESERIALIZER);
+    private final Map<String, Alias> aliases;
+
+    private final String index;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final Map<String, JsonData> settings;
+
+    private final String target;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final WaitForActiveShards waitForActiveShards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CloneIndexRequest(Builder builder) {
+
+        this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.settings = ApiTypeHelper.unmodifiable(builder.settings);
+        this.target = ApiTypeHelper.requireNonNull(builder.target, this, "target");
+        this.timeout = builder.timeout;
+        this.waitForActiveShards = builder.waitForActiveShards;
+
+    }
+
+    public static CloneIndexRequest of(Function<Builder, ObjectBuilder<CloneIndexRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code aliases}
+     */
+    public final Map<String, Alias> aliases() {
+        return this.aliases;
+    }
+
+    /**
+     * Required - The name of the source index to clone
+     * <p>
+     * API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * API name: {@code settings}
+     */
+    public final Map<String, JsonData> settings() {
+        return this.settings;
+    }
+
+    /**
+     * Required - The name of the target index to clone into
+     * <p>
+     * API name: {@code target}
+     */
+    public final String target() {
+        return this.target;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Set the number of active shards to wait for on the cloned index before the
+     * operation returns.
+     * <p>
+     * API name: {@code wait_for_active_shards}
+     */
+    @Nullable
+    public final WaitForActiveShards waitForActiveShards() {
+        return this.waitForActiveShards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.aliases)) {
+            generator.writeKey("aliases");
+            generator.writeStartObject();
+            for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.settings)) {
+            generator.writeKey("settings");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CloneIndexRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CloneIndexRequest> {
+        @Nullable
+        private Map<String, Alias> aliases;
+
+        private String index;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Map<String, JsonData> settings;
+
+        private String target;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private WaitForActiveShards waitForActiveShards;
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aliases</code>.
+         */
+        public final Builder aliases(Map<String, Alias> map) {
+            this.aliases = _mapPutAll(this.aliases, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code>.
+         */
+        public final Builder aliases(String key, Alias value) {
+            this.aliases = _mapPut(this.aliases, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code> using a builder lambda.
+         */
+        public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
+            return aliases(key, fn.apply(new Alias.Builder()).build());
+        }
+
+        /**
+         * Required - The name of the source index to clone
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code settings}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>settings</code>.
+         */
+        public final Builder settings(Map<String, JsonData> map) {
+            this.settings = _mapPutAll(this.settings, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code settings}
+         * <p>
+         * Adds an entry to <code>settings</code>.
+         */
+        public final Builder settings(String key, JsonData value) {
+            this.settings = _mapPut(this.settings, key, value);
+            return this;
+        }
+
+        /**
+         * Required - The name of the target index to clone into
+         * <p>
+         * API name: {@code target}
+         */
+        public final Builder target(String value) {
+            this.target = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Set the number of active shards to wait for on the cloned index before the
+         * operation returns.
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
+            this.waitForActiveShards = value;
+            return this;
+        }
+
+        /**
+         * Set the number of active shards to wait for on the cloned index before the
+         * operation returns.
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
+            return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link CloneIndexRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CloneIndexRequest build() {
+            _checkSingleUse();
+
+            return new CloneIndexRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CloneIndexRequest}
+     */
+    public static final JsonpDeserializer<CloneIndexRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CloneIndexRequest::setupCloneIndexRequestDeserializer
+    );
+
+    protected static void setupCloneIndexRequestDeserializer(ObjectDeserializer<CloneIndexRequest.Builder> op) {
+
+        op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
+        op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "settings");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.clone}".
+     */
+    public static final Endpoint<CloneIndexRequest, CloneIndexResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "PUT";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+            final int _target = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+            propsSet |= _target;
+
+            if (propsSet == (_index | _target)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_clone");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.target, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.waitForActiveShards != null) {
+                params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        CloneIndexResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/CloneIndexResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/CloneIndexResponse.java
index d6c525adeb..2a9f28571a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/CloneIndexResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/CloneIndexResponse.java
@@ -32,124 +32,124 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: indices.clone.Response
 
 @JsonpDeserializable
 public class CloneIndexResponse extends AcknowledgedResponseBase {
-	private final String index;
-
-	private final boolean shardsAcknowledged;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CloneIndexResponse(Builder builder) {
-		super(builder);
-
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.shardsAcknowledged = ApiTypeHelper.requireNonNull(builder.shardsAcknowledged, this, "shardsAcknowledged");
-
-	}
-
-	public static CloneIndexResponse of(Function<Builder, ObjectBuilder<CloneIndexResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Required - API name: {@code shards_acknowledged}
-	 */
-	public final boolean shardsAcknowledged() {
-		return this.shardsAcknowledged;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("index");
-		generator.write(this.index);
-
-		generator.writeKey("shards_acknowledged");
-		generator.write(this.shardsAcknowledged);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CloneIndexResponse}.
-	 */
-
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<CloneIndexResponse> {
-		private String index;
-
-		private Boolean shardsAcknowledged;
-
-		/**
-		 * Required - API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards_acknowledged}
-		 */
-		public final Builder shardsAcknowledged(boolean value) {
-			this.shardsAcknowledged = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CloneIndexResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CloneIndexResponse build() {
-			_checkSingleUse();
-
-			return new CloneIndexResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CloneIndexResponse}
-	 */
-	public static final JsonpDeserializer<CloneIndexResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CloneIndexResponse::setupCloneIndexResponseDeserializer);
-
-	protected static void setupCloneIndexResponseDeserializer(ObjectDeserializer<CloneIndexResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::shardsAcknowledged, JsonpDeserializer.booleanDeserializer(), "shards_acknowledged");
-
-	}
+    private final String index;
+
+    private final boolean shardsAcknowledged;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CloneIndexResponse(Builder builder) {
+        super(builder);
+
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.shardsAcknowledged = ApiTypeHelper.requireNonNull(builder.shardsAcknowledged, this, "shardsAcknowledged");
+
+    }
+
+    public static CloneIndexResponse of(Function<Builder, ObjectBuilder<CloneIndexResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Required - API name: {@code shards_acknowledged}
+     */
+    public final boolean shardsAcknowledged() {
+        return this.shardsAcknowledged;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("index");
+        generator.write(this.index);
+
+        generator.writeKey("shards_acknowledged");
+        generator.write(this.shardsAcknowledged);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CloneIndexResponse}.
+     */
+
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<CloneIndexResponse> {
+        private String index;
+
+        private Boolean shardsAcknowledged;
+
+        /**
+         * Required - API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards_acknowledged}
+         */
+        public final Builder shardsAcknowledged(boolean value) {
+            this.shardsAcknowledged = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CloneIndexResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CloneIndexResponse build() {
+            _checkSingleUse();
+
+            return new CloneIndexResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CloneIndexResponse}
+     */
+    public static final JsonpDeserializer<CloneIndexResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CloneIndexResponse::setupCloneIndexResponseDeserializer
+    );
+
+    protected static void setupCloneIndexResponseDeserializer(ObjectDeserializer<CloneIndexResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::shardsAcknowledged, JsonpDeserializer.booleanDeserializer(), "shards_acknowledged");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/CloseIndexRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/CloseIndexRequest.java
index 0d0891ecf3..d2ecd16df6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/CloseIndexRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/CloseIndexRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -43,13 +49,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.close.Request
 
 /**
@@ -58,395 +57,396 @@
  */
 
 public class CloseIndexRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final WaitForActiveShards waitForActiveShards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CloseIndexRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.timeout = builder.timeout;
-		this.waitForActiveShards = builder.waitForActiveShards;
-
-	}
-
-	public static CloseIndexRequest of(Function<Builder, ObjectBuilder<CloseIndexRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * Required - A comma separated list of indices to close
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Sets the number of active shards to wait for before the operation returns.
-	 * Set to <code>index-setting</code> to wait according to the index setting
-	 * <code>index.write.wait_for_active_shards</code>, or <code>all</code> to wait
-	 * for all shards, or an integer. Defaults to <code>0</code>.
-	 * <p>
-	 * API name: {@code wait_for_active_shards}
-	 */
-	@Nullable
-	public final WaitForActiveShards waitForActiveShards() {
-		return this.waitForActiveShards;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CloseIndexRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CloseIndexRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		private List<String> index;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private WaitForActiveShards waitForActiveShards;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Required - A comma separated list of indices to close
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * Required - A comma separated list of indices to close
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Sets the number of active shards to wait for before the operation returns.
-		 * Set to <code>index-setting</code> to wait according to the index setting
-		 * <code>index.write.wait_for_active_shards</code>, or <code>all</code> to wait
-		 * for all shards, or an integer. Defaults to <code>0</code>.
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
-			this.waitForActiveShards = value;
-			return this;
-		}
-
-		/**
-		 * Sets the number of active shards to wait for before the operation returns.
-		 * Set to <code>index-setting</code> to wait according to the index setting
-		 * <code>index.write.wait_for_active_shards</code>, or <code>all</code> to wait
-		 * for all shards, or an integer. Defaults to <code>0</code>.
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(
-				Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
-			return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link CloseIndexRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CloseIndexRequest build() {
-			_checkSingleUse();
-
-			return new CloseIndexRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.close}".
-	 */
-	public static final Endpoint<CloseIndexRequest, CloseIndexResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_close");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.waitForActiveShards != null) {
-					params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, CloseIndexResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final WaitForActiveShards waitForActiveShards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CloseIndexRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.timeout = builder.timeout;
+        this.waitForActiveShards = builder.waitForActiveShards;
+
+    }
+
+    public static CloseIndexRequest of(Function<Builder, ObjectBuilder<CloseIndexRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * Required - A comma separated list of indices to close
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Sets the number of active shards to wait for before the operation returns.
+     * Set to <code>index-setting</code> to wait according to the index setting
+     * <code>index.write.wait_for_active_shards</code>, or <code>all</code> to wait
+     * for all shards, or an integer. Defaults to <code>0</code>.
+     * <p>
+     * API name: {@code wait_for_active_shards}
+     */
+    @Nullable
+    public final WaitForActiveShards waitForActiveShards() {
+        return this.waitForActiveShards;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CloseIndexRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CloseIndexRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        private List<String> index;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private WaitForActiveShards waitForActiveShards;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Required - A comma separated list of indices to close
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * Required - A comma separated list of indices to close
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Sets the number of active shards to wait for before the operation returns.
+         * Set to <code>index-setting</code> to wait according to the index setting
+         * <code>index.write.wait_for_active_shards</code>, or <code>all</code> to wait
+         * for all shards, or an integer. Defaults to <code>0</code>.
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
+            this.waitForActiveShards = value;
+            return this;
+        }
+
+        /**
+         * Sets the number of active shards to wait for before the operation returns.
+         * Set to <code>index-setting</code> to wait according to the index setting
+         * <code>index.write.wait_for_active_shards</code>, or <code>all</code> to wait
+         * for all shards, or an integer. Defaults to <code>0</code>.
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
+            return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link CloseIndexRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CloseIndexRequest build() {
+            _checkSingleUse();
+
+            return new CloseIndexRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.close}".
+     */
+    public static final Endpoint<CloseIndexRequest, CloseIndexResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_close");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.waitForActiveShards != null) {
+                params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        CloseIndexResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/CloseIndexResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/CloseIndexResponse.java
index 61c6dc9c09..c48bbde5c6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/CloseIndexResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/CloseIndexResponse.java
@@ -32,158 +32,155 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
-import org.opensearch.client.opensearch.indices.close.CloseIndexResult;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import org.opensearch.client.opensearch.indices.close.CloseIndexResult;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: indices.close.Response
 
-
 @JsonpDeserializable
 public class CloseIndexResponse extends AcknowledgedResponseBase {
-	private final Map<String, CloseIndexResult> indices;
-
-	private final boolean shardsAcknowledged;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CloseIndexResponse(Builder builder) {
-		super(builder);
-
-		this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
-		this.shardsAcknowledged = ApiTypeHelper.requireNonNull(builder.shardsAcknowledged, this, "shardsAcknowledged");
-
-	}
-
-	public static CloseIndexResponse of(Function<Builder, ObjectBuilder<CloseIndexResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code indices}
-	 */
-	public final Map<String, CloseIndexResult> indices() {
-		return this.indices;
-	}
-
-	/**
-	 * Required - API name: {@code shards_acknowledged}
-	 */
-	public final boolean shardsAcknowledged() {
-		return this.shardsAcknowledged;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartObject();
-			for (Map.Entry<String, CloseIndexResult> item0 : this.indices.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("shards_acknowledged");
-		generator.write(this.shardsAcknowledged);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CloseIndexResponse}.
-	 */
-
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<CloseIndexResponse> {
-		private Map<String, CloseIndexResult> indices;
-
-		private Boolean shardsAcknowledged;
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>indices</code>.
-		 */
-		public final Builder indices(Map<String, CloseIndexResult> map) {
-			this.indices = _mapPutAll(this.indices, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds an entry to <code>indices</code>.
-		 */
-		public final Builder indices(String key, CloseIndexResult value) {
-			this.indices = _mapPut(this.indices, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds an entry to <code>indices</code> using a builder lambda.
-		 */
-		public final Builder indices(String key,
-				Function<CloseIndexResult.Builder, ObjectBuilder<CloseIndexResult>> fn) {
-			return indices(key, fn.apply(new CloseIndexResult.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code shards_acknowledged}
-		 */
-		public final Builder shardsAcknowledged(boolean value) {
-			this.shardsAcknowledged = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CloseIndexResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CloseIndexResponse build() {
-			_checkSingleUse();
-
-			return new CloseIndexResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CloseIndexResponse}
-	 */
-	public static final JsonpDeserializer<CloseIndexResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CloseIndexResponse::setupCloseIndexResponseDeserializer);
-
-	protected static void setupCloseIndexResponseDeserializer(ObjectDeserializer<CloseIndexResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
-		op.add(Builder::indices, JsonpDeserializer.stringMapDeserializer(CloseIndexResult._DESERIALIZER), "indices");
-		op.add(Builder::shardsAcknowledged, JsonpDeserializer.booleanDeserializer(), "shards_acknowledged");
-
-	}
+    private final Map<String, CloseIndexResult> indices;
+
+    private final boolean shardsAcknowledged;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CloseIndexResponse(Builder builder) {
+        super(builder);
+
+        this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
+        this.shardsAcknowledged = ApiTypeHelper.requireNonNull(builder.shardsAcknowledged, this, "shardsAcknowledged");
+
+    }
+
+    public static CloseIndexResponse of(Function<Builder, ObjectBuilder<CloseIndexResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code indices}
+     */
+    public final Map<String, CloseIndexResult> indices() {
+        return this.indices;
+    }
+
+    /**
+     * Required - API name: {@code shards_acknowledged}
+     */
+    public final boolean shardsAcknowledged() {
+        return this.shardsAcknowledged;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartObject();
+            for (Map.Entry<String, CloseIndexResult> item0 : this.indices.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("shards_acknowledged");
+        generator.write(this.shardsAcknowledged);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CloseIndexResponse}.
+     */
+
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<CloseIndexResponse> {
+        private Map<String, CloseIndexResult> indices;
+
+        private Boolean shardsAcknowledged;
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>indices</code>.
+         */
+        public final Builder indices(Map<String, CloseIndexResult> map) {
+            this.indices = _mapPutAll(this.indices, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds an entry to <code>indices</code>.
+         */
+        public final Builder indices(String key, CloseIndexResult value) {
+            this.indices = _mapPut(this.indices, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds an entry to <code>indices</code> using a builder lambda.
+         */
+        public final Builder indices(String key, Function<CloseIndexResult.Builder, ObjectBuilder<CloseIndexResult>> fn) {
+            return indices(key, fn.apply(new CloseIndexResult.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code shards_acknowledged}
+         */
+        public final Builder shardsAcknowledged(boolean value) {
+            this.shardsAcknowledged = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CloseIndexResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CloseIndexResponse build() {
+            _checkSingleUse();
+
+            return new CloseIndexResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CloseIndexResponse}
+     */
+    public static final JsonpDeserializer<CloseIndexResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CloseIndexResponse::setupCloseIndexResponseDeserializer
+    );
+
+    protected static void setupCloseIndexResponseDeserializer(ObjectDeserializer<CloseIndexResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+        op.add(Builder::indices, JsonpDeserializer.stringMapDeserializer(CloseIndexResult._DESERIALIZER), "indices");
+        op.add(Builder::shardsAcknowledged, JsonpDeserializer.booleanDeserializer(), "shards_acknowledged");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/CreateDataStreamRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/CreateDataStreamRequest.java
index 0b474f71a4..04314828f7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/CreateDataStreamRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/CreateDataStreamRequest.java
@@ -8,6 +8,7 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.function.Function;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -16,8 +17,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.function.Function;
-
 // typedef: indices.create_data_stream.Request
 
 /**
@@ -78,29 +77,30 @@ public CreateDataStreamRequest build() {
      * Endpoint "{@code indices.create_data_stream}".
      */
     public static final Endpoint<CreateDataStreamRequest, CreateDataStreamResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-            // Request method
-            request -> {
-                return "PUT";
-            },
-
-            // Request path
-            request -> {
-                final int _name = 1 << 0;
-                int propsSet = 0;
-                propsSet |= _name;
-
-                if (propsSet == (_name)) {
-                    StringBuilder sbd = new StringBuilder();
-                    sbd.append("/_data_stream");
-                    sbd.append("/");
-                    SimpleEndpoint.pathEncode(request.name, sbd);
-                    return sbd.toString();
-                }
-                throw SimpleEndpoint.noPathTemplateFound("path");
-            },
-
-            // Request parameters
-            SimpleEndpoint.emptyMap(),
-
-            SimpleEndpoint.emptyMap(), false, CreateDataStreamResponse._DESERIALIZER);
+        // Request method
+        request -> { return "PUT"; },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+            int propsSet = 0;
+            propsSet |= _name;
+
+            if (propsSet == (_name)) {
+                StringBuilder sbd = new StringBuilder();
+                sbd.append("/_data_stream");
+                sbd.append("/");
+                SimpleEndpoint.pathEncode(request.name, sbd);
+                return sbd.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+        },
+
+        // Request parameters
+        SimpleEndpoint.emptyMap(),
+
+        SimpleEndpoint.emptyMap(),
+        false,
+        CreateDataStreamResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/CreateDataStreamResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/CreateDataStreamResponse.java
index 7ab364de6e..7fc25ffe68 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/CreateDataStreamResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/CreateDataStreamResponse.java
@@ -8,6 +8,7 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
@@ -15,8 +16,6 @@
 import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.create_data_stream.Response
 
 @JsonpDeserializable
@@ -38,7 +37,8 @@ public static CreateDataStreamResponse of(Function<Builder, ObjectBuilder<Create
      * Builder for {@link CreateDataStreamResponse}
      */
     public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-            implements ObjectBuilder<CreateDataStreamResponse> {
+        implements
+            ObjectBuilder<CreateDataStreamResponse> {
 
         @Override
         protected Builder self() {
@@ -58,14 +58,15 @@ public CreateDataStreamResponse build() {
         }
     }
 
-
     // ---------------------------------------------------------------------------------------------
 
     /**
      * Json deserializer for {@link CreateDataStreamResponse}
      */
-    public static final JsonpDeserializer<CreateDataStreamResponse> _DESERIALIZER = ObjectBuilderDeserializer
-            .lazy(Builder::new, CreateDataStreamResponse::setupCreateDataStreamResponseDeserializer);
+    public static final JsonpDeserializer<CreateDataStreamResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CreateDataStreamResponse::setupCreateDataStreamResponseDeserializer
+    );
 
     protected static void setupCreateDataStreamResponseDeserializer(ObjectDeserializer<CreateDataStreamResponse.Builder> op) {
         AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/CreateIndexRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/CreateIndexRequest.java
index 7fc33c47fe..512f0e77f9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/CreateIndexRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/CreateIndexRequest.java
@@ -32,462 +32,467 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
-import org.opensearch.client.opensearch._types.WaitForActiveShards;
-import org.opensearch.client.opensearch._types.mapping.TypeMapping;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.Time;
+import org.opensearch.client.opensearch._types.WaitForActiveShards;
+import org.opensearch.client.opensearch._types.mapping.TypeMapping;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.create.Request
 
 /**
  * Creates an index with optional settings and mappings.
- * 
+ *
  */
 @JsonpDeserializable
 public class CreateIndexRequest extends RequestBase implements JsonpSerializable {
-	private final Map<String, Alias> aliases;
-
-	private final String index;
-
-	@Nullable
-	private final TypeMapping mappings;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final IndexSettings settings;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final WaitForActiveShards waitForActiveShards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CreateIndexRequest(Builder builder) {
-
-		this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.mappings = builder.mappings;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.settings = builder.settings;
-		this.timeout = builder.timeout;
-		this.waitForActiveShards = builder.waitForActiveShards;
-
-	}
-
-	public static CreateIndexRequest of(Function<Builder, ObjectBuilder<CreateIndexRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code aliases}
-	 */
-	public final Map<String, Alias> aliases() {
-		return this.aliases;
-	}
-
-	/**
-	 * Required - The name of the index
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Mapping for fields in the index. If specified, this mapping can include:
-	 * <ul>
-	 * <li>Field names</li>
-	 * <li>Field data types</li>
-	 * <li>Mapping parameters</li>
-	 * </ul>
-	 * <p>
-	 * API name: {@code mappings}
-	 */
-	@Nullable
-	public final TypeMapping mappings() {
-		return this.mappings;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * API name: {@code settings}
-	 */
-	@Nullable
-	public final IndexSettings settings() {
-		return this.settings;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Set the number of active shards to wait for before the operation returns.
-	 * <p>
-	 * API name: {@code wait_for_active_shards}
-	 */
-	@Nullable
-	public final WaitForActiveShards waitForActiveShards() {
-		return this.waitForActiveShards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.aliases)) {
-			generator.writeKey("aliases");
-			generator.writeStartObject();
-			for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.mappings != null) {
-			generator.writeKey("mappings");
-			this.mappings.serialize(generator, mapper);
-
-		}
-		if (this.settings != null) {
-			generator.writeKey("settings");
-			this.settings.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CreateIndexRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CreateIndexRequest> {
-		@Nullable
-		private Map<String, Alias> aliases;
-
-		private String index;
-
-		@Nullable
-		private TypeMapping mappings;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private IndexSettings settings;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private WaitForActiveShards waitForActiveShards;
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aliases</code>.
-		 */
-		public final Builder aliases(Map<String, Alias> map) {
-			this.aliases = _mapPutAll(this.aliases, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code>.
-		 */
-		public final Builder aliases(String key, Alias value) {
-			this.aliases = _mapPut(this.aliases, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code> using a builder lambda.
-		 */
-		public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
-			return aliases(key, fn.apply(new Alias.Builder()).build());
-		}
-
-		/**
-		 * Required - The name of the index
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Mapping for fields in the index. If specified, this mapping can include:
-		 * <ul>
-		 * <li>Field names</li>
-		 * <li>Field data types</li>
-		 * <li>Mapping parameters</li>
-		 * </ul>
-		 * <p>
-		 * API name: {@code mappings}
-		 */
-		public final Builder mappings(@Nullable TypeMapping value) {
-			this.mappings = value;
-			return this;
-		}
-
-		/**
-		 * Mapping for fields in the index. If specified, this mapping can include:
-		 * <ul>
-		 * <li>Field names</li>
-		 * <li>Field data types</li>
-		 * <li>Mapping parameters</li>
-		 * </ul>
-		 * <p>
-		 * API name: {@code mappings}
-		 */
-		public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
-			return this.mappings(fn.apply(new TypeMapping.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code settings}
-		 */
-		public final Builder settings(@Nullable IndexSettings value) {
-			this.settings = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code settings}
-		 */
-		public final Builder settings(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
-			return this.settings(fn.apply(new IndexSettings.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Set the number of active shards to wait for before the operation returns.
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
-			this.waitForActiveShards = value;
-			return this;
-		}
-
-		/**
-		 * Set the number of active shards to wait for before the operation returns.
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(
-				Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
-			return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link CreateIndexRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CreateIndexRequest build() {
-			_checkSingleUse();
-
-			return new CreateIndexRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CreateIndexRequest}
-	 */
-	public static final JsonpDeserializer<CreateIndexRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CreateIndexRequest::setupCreateIndexRequestDeserializer);
-
-	protected static void setupCreateIndexRequestDeserializer(ObjectDeserializer<CreateIndexRequest.Builder> op) {
-
-		op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
-		op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
-		op.add(Builder::settings, IndexSettings._DESERIALIZER, "settings");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.create}".
-	 */
-	public static final Endpoint<CreateIndexRequest, CreateIndexResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "PUT";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.waitForActiveShards != null) {
-					params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, CreateIndexResponse._DESERIALIZER);
+    private final Map<String, Alias> aliases;
+
+    private final String index;
+
+    @Nullable
+    private final TypeMapping mappings;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final IndexSettings settings;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final WaitForActiveShards waitForActiveShards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CreateIndexRequest(Builder builder) {
+
+        this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.mappings = builder.mappings;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.settings = builder.settings;
+        this.timeout = builder.timeout;
+        this.waitForActiveShards = builder.waitForActiveShards;
+
+    }
+
+    public static CreateIndexRequest of(Function<Builder, ObjectBuilder<CreateIndexRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code aliases}
+     */
+    public final Map<String, Alias> aliases() {
+        return this.aliases;
+    }
+
+    /**
+     * Required - The name of the index
+     * <p>
+     * API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Mapping for fields in the index. If specified, this mapping can include:
+     * <ul>
+     * <li>Field names</li>
+     * <li>Field data types</li>
+     * <li>Mapping parameters</li>
+     * </ul>
+     * <p>
+     * API name: {@code mappings}
+     */
+    @Nullable
+    public final TypeMapping mappings() {
+        return this.mappings;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * API name: {@code settings}
+     */
+    @Nullable
+    public final IndexSettings settings() {
+        return this.settings;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Set the number of active shards to wait for before the operation returns.
+     * <p>
+     * API name: {@code wait_for_active_shards}
+     */
+    @Nullable
+    public final WaitForActiveShards waitForActiveShards() {
+        return this.waitForActiveShards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.aliases)) {
+            generator.writeKey("aliases");
+            generator.writeStartObject();
+            for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.mappings != null) {
+            generator.writeKey("mappings");
+            this.mappings.serialize(generator, mapper);
+
+        }
+        if (this.settings != null) {
+            generator.writeKey("settings");
+            this.settings.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CreateIndexRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CreateIndexRequest> {
+        @Nullable
+        private Map<String, Alias> aliases;
+
+        private String index;
+
+        @Nullable
+        private TypeMapping mappings;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private IndexSettings settings;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private WaitForActiveShards waitForActiveShards;
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aliases</code>.
+         */
+        public final Builder aliases(Map<String, Alias> map) {
+            this.aliases = _mapPutAll(this.aliases, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code>.
+         */
+        public final Builder aliases(String key, Alias value) {
+            this.aliases = _mapPut(this.aliases, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code> using a builder lambda.
+         */
+        public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
+            return aliases(key, fn.apply(new Alias.Builder()).build());
+        }
+
+        /**
+         * Required - The name of the index
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Mapping for fields in the index. If specified, this mapping can include:
+         * <ul>
+         * <li>Field names</li>
+         * <li>Field data types</li>
+         * <li>Mapping parameters</li>
+         * </ul>
+         * <p>
+         * API name: {@code mappings}
+         */
+        public final Builder mappings(@Nullable TypeMapping value) {
+            this.mappings = value;
+            return this;
+        }
+
+        /**
+         * Mapping for fields in the index. If specified, this mapping can include:
+         * <ul>
+         * <li>Field names</li>
+         * <li>Field data types</li>
+         * <li>Mapping parameters</li>
+         * </ul>
+         * <p>
+         * API name: {@code mappings}
+         */
+        public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
+            return this.mappings(fn.apply(new TypeMapping.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code settings}
+         */
+        public final Builder settings(@Nullable IndexSettings value) {
+            this.settings = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code settings}
+         */
+        public final Builder settings(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
+            return this.settings(fn.apply(new IndexSettings.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Set the number of active shards to wait for before the operation returns.
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
+            this.waitForActiveShards = value;
+            return this;
+        }
+
+        /**
+         * Set the number of active shards to wait for before the operation returns.
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
+            return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link CreateIndexRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CreateIndexRequest build() {
+            _checkSingleUse();
+
+            return new CreateIndexRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CreateIndexRequest}
+     */
+    public static final JsonpDeserializer<CreateIndexRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CreateIndexRequest::setupCreateIndexRequestDeserializer
+    );
+
+    protected static void setupCreateIndexRequestDeserializer(ObjectDeserializer<CreateIndexRequest.Builder> op) {
+
+        op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
+        op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
+        op.add(Builder::settings, IndexSettings._DESERIALIZER, "settings");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.create}".
+     */
+    public static final Endpoint<CreateIndexRequest, CreateIndexResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "PUT";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.waitForActiveShards != null) {
+                params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        CreateIndexResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/CreateIndexResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/CreateIndexResponse.java
index 2732799abe..dc51f2ee51 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/CreateIndexResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/CreateIndexResponse.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,147 +44,146 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.create.Response
 
 @JsonpDeserializable
 public class CreateIndexResponse implements JsonpSerializable {
-	private final String index;
+    private final String index;
 
-	private final boolean shardsAcknowledged;
-
-	@Nullable
-	private final Boolean acknowledged;
+    private final boolean shardsAcknowledged;
+
+    @Nullable
+    private final Boolean acknowledged;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private CreateIndexResponse(Builder builder) {
-
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.shardsAcknowledged = ApiTypeHelper.requireNonNull(builder.shardsAcknowledged, this, "shardsAcknowledged");
-		this.acknowledged = builder.acknowledged;
-
-	}
-
-	public static CreateIndexResponse of(Function<Builder, ObjectBuilder<CreateIndexResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Required - API name: {@code shards_acknowledged}
-	 */
-	public final boolean shardsAcknowledged() {
-		return this.shardsAcknowledged;
-	}
-
-	/**
-	 * API name: {@code acknowledged}
-	 */
-	@Nullable
-	public final Boolean acknowledged() {
-		return this.acknowledged;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("index");
-		generator.write(this.index);
-
-		generator.writeKey("shards_acknowledged");
-		generator.write(this.shardsAcknowledged);
-
-		if (this.acknowledged != null) {
-			generator.writeKey("acknowledged");
-			generator.write(this.acknowledged);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CreateIndexResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CreateIndexResponse> {
-		private String index;
-
-		private Boolean shardsAcknowledged;
-
-		@Nullable
-		private Boolean acknowledged;
-
-		/**
-		 * Required - API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards_acknowledged}
-		 */
-		public final Builder shardsAcknowledged(boolean value) {
-			this.shardsAcknowledged = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code acknowledged}
-		 */
-		public final Builder acknowledged(@Nullable Boolean value) {
-			this.acknowledged = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CreateIndexResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CreateIndexResponse build() {
-			_checkSingleUse();
-
-			return new CreateIndexResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CreateIndexResponse}
-	 */
-	public static final JsonpDeserializer<CreateIndexResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CreateIndexResponse::setupCreateIndexResponseDeserializer);
-
-	protected static void setupCreateIndexResponseDeserializer(ObjectDeserializer<CreateIndexResponse.Builder> op) {
-
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::shardsAcknowledged, JsonpDeserializer.booleanDeserializer(), "shards_acknowledged");
-		op.add(Builder::acknowledged, JsonpDeserializer.booleanDeserializer(), "acknowledged");
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private CreateIndexResponse(Builder builder) {
+
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.shardsAcknowledged = ApiTypeHelper.requireNonNull(builder.shardsAcknowledged, this, "shardsAcknowledged");
+        this.acknowledged = builder.acknowledged;
+
+    }
+
+    public static CreateIndexResponse of(Function<Builder, ObjectBuilder<CreateIndexResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Required - API name: {@code shards_acknowledged}
+     */
+    public final boolean shardsAcknowledged() {
+        return this.shardsAcknowledged;
+    }
+
+    /**
+     * API name: {@code acknowledged}
+     */
+    @Nullable
+    public final Boolean acknowledged() {
+        return this.acknowledged;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("index");
+        generator.write(this.index);
+
+        generator.writeKey("shards_acknowledged");
+        generator.write(this.shardsAcknowledged);
+
+        if (this.acknowledged != null) {
+            generator.writeKey("acknowledged");
+            generator.write(this.acknowledged);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CreateIndexResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CreateIndexResponse> {
+        private String index;
+
+        private Boolean shardsAcknowledged;
+
+        @Nullable
+        private Boolean acknowledged;
+
+        /**
+         * Required - API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards_acknowledged}
+         */
+        public final Builder shardsAcknowledged(boolean value) {
+            this.shardsAcknowledged = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code acknowledged}
+         */
+        public final Builder acknowledged(@Nullable Boolean value) {
+            this.acknowledged = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link CreateIndexResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CreateIndexResponse build() {
+            _checkSingleUse();
+
+            return new CreateIndexResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CreateIndexResponse}
+     */
+    public static final JsonpDeserializer<CreateIndexResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CreateIndexResponse::setupCreateIndexResponseDeserializer
+    );
+
+    protected static void setupCreateIndexResponseDeserializer(ObjectDeserializer<CreateIndexResponse.Builder> op) {
+
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::shardsAcknowledged, JsonpDeserializer.booleanDeserializer(), "shards_acknowledged");
+        op.add(Builder::acknowledged, JsonpDeserializer.booleanDeserializer(), "acknowledged");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStream.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStream.java
index 80552952ea..dc8ad5b11e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStream.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStream.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,95 +43,91 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices._types.DataStream
 
-
 @JsonpDeserializable
 public class DataStream implements JsonpSerializable {
-	@Nullable
-	private final Boolean hidden;
-
-	@Nullable
-	private final DataStreamTimestampField timestampField;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DataStream(Builder builder) {
-
-		this.hidden = builder.hidden;
-		this.timestampField = builder.timestampField;
-
-	}
-
-	public static DataStream of(Function<Builder, ObjectBuilder<DataStream>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code hidden}
-	 */
-	@Nullable
-	public final Boolean hidden() {
-		return this.hidden;
-	}
-
-	/**
-	 * API name: {@code timestamp_field}
-	 */
-	@Nullable
-	public final DataStreamTimestampField timestampField() {
-		return this.timestampField;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.hidden != null) {
-			generator.writeKey("hidden");
-			generator.write(this.hidden);
-		}
-
-		if (this.timestampField != null) {
-			generator.writeKey("timestamp_field");
-			this.timestampField.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DataStream}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DataStream> {
-		@Nullable
-		private Boolean hidden;
-
-		@Nullable
-		private DataStreamTimestampField timestampField;
-
-		/**
-		 * API name: {@code hidden}
-		 */
-		public final Builder hidden(@Nullable Boolean value) {
-			this.hidden = value;
-			return this;
-		}
-
-		/**
+    @Nullable
+    private final Boolean hidden;
+
+    @Nullable
+    private final DataStreamTimestampField timestampField;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DataStream(Builder builder) {
+
+        this.hidden = builder.hidden;
+        this.timestampField = builder.timestampField;
+
+    }
+
+    public static DataStream of(Function<Builder, ObjectBuilder<DataStream>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code hidden}
+     */
+    @Nullable
+    public final Boolean hidden() {
+        return this.hidden;
+    }
+
+    /**
+     * API name: {@code timestamp_field}
+     */
+    @Nullable
+    public final DataStreamTimestampField timestampField() {
+        return this.timestampField;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.hidden != null) {
+            generator.writeKey("hidden");
+            generator.write(this.hidden);
+        }
+
+        if (this.timestampField != null) {
+            generator.writeKey("timestamp_field");
+            this.timestampField.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DataStream}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DataStream> {
+        @Nullable
+        private Boolean hidden;
+
+        @Nullable
+        private DataStreamTimestampField timestampField;
+
+        /**
+         * API name: {@code hidden}
+         */
+        public final Builder hidden(@Nullable Boolean value) {
+            this.hidden = value;
+            return this;
+        }
+
+        /**
          * API name: {@code timestamp_field}
          */
         public final Builder timestampField(@Nullable DataStreamTimestampField value) {
@@ -143,32 +142,34 @@ public final Builder timestampField(Function<DataStreamTimestampField.Builder, O
             return this.timestampField(fn.apply(new DataStreamTimestampField.Builder()).build());
         }
 
-		/**
-		 * Builds a {@link DataStream}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DataStream build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link DataStream}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DataStream build() {
+            _checkSingleUse();
 
-			return new DataStream(this);
-		}
-	}
+            return new DataStream(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link DataStream}
-	 */
-	public static final JsonpDeserializer<DataStream> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			DataStream::setupDataStreamDeserializer);
+    /**
+     * Json deserializer for {@link DataStream}
+     */
+    public static final JsonpDeserializer<DataStream> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DataStream::setupDataStreamDeserializer
+    );
 
-	protected static void setupDataStreamDeserializer(ObjectDeserializer<DataStream.Builder> op) {
+    protected static void setupDataStreamDeserializer(ObjectDeserializer<DataStream.Builder> op) {
 
-		op.add(Builder::hidden, JsonpDeserializer.booleanDeserializer(), "hidden");
-		op.add(Builder::timestampField, DataStreamTimestampField._DESERIALIZER, "timestamp_field");
+        op.add(Builder::hidden, JsonpDeserializer.booleanDeserializer(), "hidden");
+        op.add(Builder::timestampField, DataStreamTimestampField._DESERIALIZER, "timestamp_field");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamIndexInfo.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamIndexInfo.java
index 759b54d6a0..f07a73743a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamIndexInfo.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamIndexInfo.java
@@ -9,6 +9,7 @@
 package org.opensearch.client.opensearch.indices;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -19,8 +20,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.function.Function;
-
 // typedef: indices._types.DataStreamIndexInfo
 @JsonpDeserializable
 public class DataStreamIndexInfo implements JsonpSerializable {
@@ -128,8 +127,10 @@ public DataStreamIndexInfo build() {
     /**
      * Json deserializer for {@link DataStreamIndexInfo}
      */
-    public static final JsonpDeserializer<DataStreamIndexInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-            DataStreamIndexInfo::setupDataStreamIndexInfoDeserializer);
+    public static final JsonpDeserializer<DataStreamIndexInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DataStreamIndexInfo::setupDataStreamIndexInfoDeserializer
+    );
 
     protected static void setupDataStreamIndexInfoDeserializer(ObjectDeserializer<Builder> op) {
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamInfo.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamInfo.java
index c360cd0a8b..73de13bc22 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamInfo.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamInfo.java
@@ -9,6 +9,8 @@
 package org.opensearch.client.opensearch.indices;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -20,9 +22,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.List;
-import java.util.function.Function;
-
 // typedef: indices._types.DataStreamInfo
 
 @JsonpDeserializable
@@ -213,7 +212,6 @@ public final Builder indices(DataStreamIndexInfo value, DataStreamIndexInfo... v
             return this;
         }
 
-
         /**
          * Required - generation
          * <p>
@@ -262,8 +260,10 @@ public DataStreamInfo build() {
     /**
      * Json deserializer for {@link DataStreamInfo}
      */
-    public static final JsonpDeserializer<DataStreamInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-            DataStreamInfo::setupDataStreamInfoDeserializer);
+    public static final JsonpDeserializer<DataStreamInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DataStreamInfo::setupDataStreamInfoDeserializer
+    );
 
     protected static void setupDataStreamInfoDeserializer(ObjectDeserializer<Builder> op) {
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamStats.java
index 78da87d747..b056babcd7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamStats.java
@@ -9,6 +9,8 @@
 package org.opensearch.client.opensearch.indices;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -19,9 +21,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import javax.annotation.Nullable;
-import java.util.function.Function;
-
 // typedef: indices._types.DataStreamStats
 
 @JsonpDeserializable
@@ -198,8 +197,10 @@ public DataStreamStats build() {
     /**
      * Json deserializer for {@link DataStreamStats}
      */
-    public static final JsonpDeserializer<DataStreamStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-            DataStreamStats::setupDataStreamStatsDeserializer);
+    public static final JsonpDeserializer<DataStreamStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DataStreamStats::setupDataStreamStatsDeserializer
+    );
 
     protected static void setupDataStreamStatsDeserializer(ObjectDeserializer<Builder> op) {
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamTimestampField.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamTimestampField.java
index 626aa8aff2..fb10aa0748 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamTimestampField.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamTimestampField.java
@@ -9,6 +9,8 @@
 package org.opensearch.client.opensearch.indices;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -18,9 +20,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import javax.annotation.Nullable;
-import java.util.function.Function;
-
 // typedef: indices._types.DataStreamTimestampField
 
 @JsonpDeserializable
@@ -103,8 +102,10 @@ public DataStreamTimestampField build() {
     /**
      * Json deserializer for {@link DataStreamTimestampField}
      */
-    public static final JsonpDeserializer<DataStreamTimestampField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-            DataStreamTimestampField::setupDataStreamTimestampFieldDeserializer);
+    public static final JsonpDeserializer<DataStreamTimestampField> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DataStreamTimestampField::setupDataStreamTimestampFieldDeserializer
+    );
 
     protected static void setupDataStreamTimestampFieldDeserializer(ObjectDeserializer<Builder> op) {
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamsStatsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamsStatsRequest.java
index 4923712003..170b134c32 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamsStatsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamsStatsRequest.java
@@ -8,6 +8,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -16,13 +22,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 // typedef: indices.data_streams_stats.Request
 
 /**
@@ -125,45 +124,47 @@ public DataStreamsStatsRequest build() {
      * Endpoint "{@code indices.get_data_stream}".
      */
     public static final Endpoint<DataStreamsStatsRequest, DataStreamsStatsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-            // Request method
-            request -> {
-                return "GET";
-            },
-
-            // Request path
-            request -> {
-                final int _name = 1 << 0;
-                int propsSet = 0;
-
-                if (ApiTypeHelper.isDefined(request.name())) {
-                    propsSet |= _name;
-                }
-
-                if (propsSet == 0) {
-                    StringBuilder sbd = new StringBuilder();
-                    sbd.append("/_data_stream");
-                    sbd.append("/_stats");
-                    return sbd.toString();
-                }
-
-                if (propsSet == (_name)) {
-                    StringBuilder sbd = new StringBuilder();
-                    sbd.append("/_data_stream");
-                    sbd.append("/");
-                    SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), sbd);
-                    sbd.append("/_stats");
-                    return sbd.toString();
-                }
-                throw SimpleEndpoint.noPathTemplateFound("path");
-            },
-
-            // Request parameters
-            request -> {
-                Map<String, String> params = new HashMap<>();
-                if (request.human != null) {
-                    params.put("human", String.valueOf(request.human));
-                }
-                return params;
-            }, SimpleEndpoint.emptyMap(), false, DataStreamsStatsResponse._DESERIALIZER);
+        // Request method
+        request -> { return "GET"; },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.name())) {
+                propsSet |= _name;
+            }
+
+            if (propsSet == 0) {
+                StringBuilder sbd = new StringBuilder();
+                sbd.append("/_data_stream");
+                sbd.append("/_stats");
+                return sbd.toString();
+            }
+
+            if (propsSet == (_name)) {
+                StringBuilder sbd = new StringBuilder();
+                sbd.append("/_data_stream");
+                sbd.append("/");
+                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), sbd);
+                sbd.append("/_stats");
+                return sbd.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.human != null) {
+                params.put("human", String.valueOf(request.human));
+            }
+            return params;
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        DataStreamsStatsResponse._DESERIALIZER
+    );
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamsStatsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamsStatsResponse.java
index df71fcb0cd..02babd00eb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamsStatsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DataStreamsStatsResponse.java
@@ -9,6 +9,9 @@
 package org.opensearch.client.opensearch.indices;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -20,10 +23,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import javax.annotation.Nullable;
-import java.util.List;
-import java.util.function.Function;
-
 // typedef: indices.data_streams_stats.Response
 
 @JsonpDeserializable
@@ -251,8 +250,10 @@ public DataStreamsStatsResponse build() {
     /**
      * Json deserializer for {@link DataStreamsStatsResponse}
      */
-    public static final JsonpDeserializer<DataStreamsStatsResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-            DataStreamsStatsResponse::setupDataStreamStatsResponseDeserializer);
+    public static final JsonpDeserializer<DataStreamsStatsResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DataStreamsStatsResponse::setupDataStreamStatsResponseDeserializer
+    );
 
     protected static void setupDataStreamStatsResponseDeserializer(ObjectDeserializer<Builder> op) {
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteAliasRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteAliasRequest.java
index ae2ecdc28e..9f76067c40 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteAliasRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteAliasRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,305 +47,302 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.delete_alias.Request
 
 /**
  * Deletes an alias.
- * 
+ *
  */
 
 public class DeleteAliasRequest extends RequestBase {
-	private final List<String> index;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final List<String> name;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteAliasRequest(Builder builder) {
-
-		this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = ApiTypeHelper.unmodifiableRequired(builder.name, this, "name");
-		this.timeout = builder.timeout;
-
-	}
-
-	public static DeleteAliasRequest of(Function<Builder, ObjectBuilder<DeleteAliasRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - A comma-separated list of index names (supports wildcards); use
-	 * <code>_all</code> for all indices
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Required - A comma-separated list of aliases to delete (supports wildcards);
-	 * use <code>_all</code> to delete all aliases for the specified indices.
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final List<String> name() {
-		return this.name;
-	}
-
-	/**
-	 * Explicit timestamp for the document
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteAliasRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteAliasRequest> {
-		private List<String> index;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		private List<String> name;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * Required - A comma-separated list of index names (supports wildcards); use
-		 * <code>_all</code> for all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * Required - A comma-separated list of index names (supports wildcards); use
-		 * <code>_all</code> for all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - A comma-separated list of aliases to delete (supports wildcards);
-		 * use <code>_all</code> to delete all aliases for the specified indices.
-		 * <p>
-		 * API name: {@code name}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>name</code>.
-		 */
-		public final Builder name(List<String> list) {
-			this.name = _listAddAll(this.name, list);
-			return this;
-		}
-
-		/**
-		 * Required - A comma-separated list of aliases to delete (supports wildcards);
-		 * use <code>_all</code> to delete all aliases for the specified indices.
-		 * <p>
-		 * API name: {@code name}
-		 * <p>
-		 * Adds one or more values to <code>name</code>.
-		 */
-		public final Builder name(String value, String... values) {
-			this.name = _listAdd(this.name, value, values);
-			return this;
-		}
-
-		/**
-		 * Explicit timestamp for the document
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit timestamp for the document
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link DeleteAliasRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteAliasRequest build() {
-			_checkSingleUse();
-
-			return new DeleteAliasRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.delete_alias}".
-	 */
-	public static final Endpoint<DeleteAliasRequest, DeleteAliasResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "DELETE";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-				final int _index = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _name;
-				propsSet |= _index;
-
-				if (propsSet == (_index | _name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_alias");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).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);
-					buf.append("/_aliases");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, DeleteAliasResponse._DESERIALIZER);
+    private final List<String> index;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final List<String> name;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteAliasRequest(Builder builder) {
+
+        this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = ApiTypeHelper.unmodifiableRequired(builder.name, this, "name");
+        this.timeout = builder.timeout;
+
+    }
+
+    public static DeleteAliasRequest of(Function<Builder, ObjectBuilder<DeleteAliasRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - A comma-separated list of index names (supports wildcards); use
+     * <code>_all</code> for all indices
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Required - A comma-separated list of aliases to delete (supports wildcards);
+     * use <code>_all</code> to delete all aliases for the specified indices.
+     * <p>
+     * API name: {@code name}
+     */
+    public final List<String> name() {
+        return this.name;
+    }
+
+    /**
+     * Explicit timestamp for the document
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteAliasRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteAliasRequest> {
+        private List<String> index;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        private List<String> name;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * Required - A comma-separated list of index names (supports wildcards); use
+         * <code>_all</code> for all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * Required - A comma-separated list of index names (supports wildcards); use
+         * <code>_all</code> for all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - A comma-separated list of aliases to delete (supports wildcards);
+         * use <code>_all</code> to delete all aliases for the specified indices.
+         * <p>
+         * API name: {@code name}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>name</code>.
+         */
+        public final Builder name(List<String> list) {
+            this.name = _listAddAll(this.name, list);
+            return this;
+        }
+
+        /**
+         * Required - A comma-separated list of aliases to delete (supports wildcards);
+         * use <code>_all</code> to delete all aliases for the specified indices.
+         * <p>
+         * API name: {@code name}
+         * <p>
+         * Adds one or more values to <code>name</code>.
+         */
+        public final Builder name(String value, String... values) {
+            this.name = _listAdd(this.name, value, values);
+            return this;
+        }
+
+        /**
+         * Explicit timestamp for the document
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit timestamp for the document
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link DeleteAliasRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteAliasRequest build() {
+            _checkSingleUse();
+
+            return new DeleteAliasRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.delete_alias}".
+     */
+    public static final Endpoint<DeleteAliasRequest, DeleteAliasResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "DELETE";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+            final int _index = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _name;
+            propsSet |= _index;
+
+            if (propsSet == (_index | _name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_alias");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).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);
+                buf.append("/_aliases");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        DeleteAliasResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteAliasResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteAliasResponse.java
index 8d484c9b07..45f9a398d2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteAliasResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteAliasResponse.java
@@ -32,68 +32,67 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.delete_alias.Response
 
 @JsonpDeserializable
 public class DeleteAliasResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private DeleteAliasResponse(Builder builder) {
-		super(builder);
+    private DeleteAliasResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static DeleteAliasResponse of(Function<Builder, ObjectBuilder<DeleteAliasResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static DeleteAliasResponse of(Function<Builder, ObjectBuilder<DeleteAliasResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link DeleteAliasResponse}.
-	 */
+    /**
+     * Builder for {@link DeleteAliasResponse}.
+     */
 
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DeleteAliasResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<DeleteAliasResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link DeleteAliasResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteAliasResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link DeleteAliasResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteAliasResponse build() {
+            _checkSingleUse();
 
-			return new DeleteAliasResponse(this);
-		}
-	}
+            return new DeleteAliasResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link DeleteAliasResponse}
-	 */
-	public static final JsonpDeserializer<DeleteAliasResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DeleteAliasResponse::setupDeleteAliasResponseDeserializer);
+    /**
+     * Json deserializer for {@link DeleteAliasResponse}
+     */
+    public static final JsonpDeserializer<DeleteAliasResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DeleteAliasResponse::setupDeleteAliasResponseDeserializer
+    );
 
-	protected static void setupDeleteAliasResponseDeserializer(ObjectDeserializer<DeleteAliasResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+    protected static void setupDeleteAliasResponseDeserializer(ObjectDeserializer<DeleteAliasResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteDataStreamRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteDataStreamRequest.java
index 3a579b8c1e..25420a23d2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteDataStreamRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteDataStreamRequest.java
@@ -8,6 +8,9 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -16,10 +19,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 // typedef: indices.delete_data_stream.Request
 
 /**
@@ -94,30 +93,31 @@ public DeleteDataStreamRequest build() {
      * Endpoint "{@code indices.delete_data_stream}".
      */
     public static final Endpoint<DeleteDataStreamRequest, DeleteDataStreamResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-            // Request method
-            request -> {
-                return "DELETE";
-            },
-
-            // Request path
-            request -> {
-                final int _name = 1 << 0;
-                int propsSet = 0;
-                propsSet |= _name;
-
-                if (propsSet == (_name)) {
-                    StringBuilder sbd = new StringBuilder();
-                    sbd.append("/_data_stream");
-                    sbd.append("/");
-                    SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), sbd);
-                    return sbd.toString();
-                }
-                throw SimpleEndpoint.noPathTemplateFound("path");
-            },
-
-            // Request parameters
-            SimpleEndpoint.emptyMap(),
-
-            SimpleEndpoint.emptyMap(), false, DeleteDataStreamResponse._DESERIALIZER);
+        // Request method
+        request -> { return "DELETE"; },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+            int propsSet = 0;
+            propsSet |= _name;
+
+            if (propsSet == (_name)) {
+                StringBuilder sbd = new StringBuilder();
+                sbd.append("/_data_stream");
+                sbd.append("/");
+                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), sbd);
+                return sbd.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+        },
+
+        // Request parameters
+        SimpleEndpoint.emptyMap(),
+
+        SimpleEndpoint.emptyMap(),
+        false,
+        DeleteDataStreamResponse._DESERIALIZER
+    );
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteDataStreamResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteDataStreamResponse.java
index c566895e50..2ed7e00422 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteDataStreamResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteDataStreamResponse.java
@@ -8,6 +8,7 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
@@ -15,13 +16,11 @@
 import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.delete_data_stream.Response
 
 @JsonpDeserializable
 public class DeleteDataStreamResponse extends AcknowledgedResponseBase {
-    
+
     // ---------------------------------------------------------------------------------------------
 
     private DeleteDataStreamResponse(Builder builder) {
@@ -38,7 +37,8 @@ public static DeleteDataStreamResponse of(Function<Builder, ObjectBuilder<Delete
      * Builder for {@link DeleteDataStreamResponse}
      */
     public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-            implements ObjectBuilder<DeleteDataStreamResponse> {
+        implements
+            ObjectBuilder<DeleteDataStreamResponse> {
 
         @Override
         protected Builder self() {
@@ -58,14 +58,15 @@ public DeleteDataStreamResponse build() {
         }
     }
 
-
     // ---------------------------------------------------------------------------------------------
 
     /**
      * Json deserializer for {@link DeleteDataStreamResponse}
      */
-    public static final JsonpDeserializer<DeleteDataStreamResponse> _DESERIALIZER = ObjectBuilderDeserializer
-            .lazy(Builder::new, DeleteDataStreamResponse::setupDeleteDataStreamResponseDeserializer);
+    public static final JsonpDeserializer<DeleteDataStreamResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DeleteDataStreamResponse::setupDeleteDataStreamResponseDeserializer
+    );
 
     protected static void setupDeleteDataStreamResponseDeserializer(ObjectDeserializer<DeleteDataStreamResponse.Builder> op) {
         AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteIndexRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteIndexRequest.java
index 379a09a8d1..c3f7bf09db 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteIndexRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteIndexRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -42,359 +48,354 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.delete.Request
 
 /**
  * Deletes an index.
- * 
+ *
  */
 
 public class DeleteIndexRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteIndexRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.timeout = builder.timeout;
-
-	}
-
-	public static DeleteIndexRequest of(Function<Builder, ObjectBuilder<DeleteIndexRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Ignore if a wildcard expression resolves to no concrete indices (default:
-	 * false)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether wildcard expressions should get expanded to open, closed, or hidden
-	 * indices
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Ignore unavailable indexes (default: false)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * Required - A comma-separated list of indices to delete; use <code>_all</code>
-	 * or <code>*</code> string to delete all indices
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteIndexRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteIndexRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		private List<String> index;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * Ignore if a wildcard expression resolves to no concrete indices (default:
-		 * false)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether wildcard expressions should get expanded to open, closed, or hidden
-		 * indices
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether wildcard expressions should get expanded to open, closed, or hidden
-		 * indices
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Ignore unavailable indexes (default: false)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Required - A comma-separated list of indices to delete; use <code>_all</code>
-		 * or <code>*</code> string to delete all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * Required - A comma-separated list of indices to delete; use <code>_all</code>
-		 * or <code>*</code> string to delete all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link DeleteIndexRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteIndexRequest build() {
-			_checkSingleUse();
-
-			return new DeleteIndexRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.delete}".
-	 */
-	public static final Endpoint<DeleteIndexRequest, DeleteIndexResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "DELETE";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, DeleteIndexResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteIndexRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.timeout = builder.timeout;
+
+    }
+
+    public static DeleteIndexRequest of(Function<Builder, ObjectBuilder<DeleteIndexRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Ignore if a wildcard expression resolves to no concrete indices (default:
+     * false)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether wildcard expressions should get expanded to open, closed, or hidden
+     * indices
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Ignore unavailable indexes (default: false)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * Required - A comma-separated list of indices to delete; use <code>_all</code>
+     * or <code>*</code> string to delete all indices
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteIndexRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteIndexRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        private List<String> index;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * Ignore if a wildcard expression resolves to no concrete indices (default:
+         * false)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether wildcard expressions should get expanded to open, closed, or hidden
+         * indices
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether wildcard expressions should get expanded to open, closed, or hidden
+         * indices
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Ignore unavailable indexes (default: false)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Required - A comma-separated list of indices to delete; use <code>_all</code>
+         * or <code>*</code> string to delete all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * Required - A comma-separated list of indices to delete; use <code>_all</code>
+         * or <code>*</code> string to delete all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link DeleteIndexRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteIndexRequest build() {
+            _checkSingleUse();
+
+            return new DeleteIndexRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.delete}".
+     */
+    public static final Endpoint<DeleteIndexRequest, DeleteIndexResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "DELETE";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        DeleteIndexResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteIndexResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteIndexResponse.java
index 30d08cd3c6..27bb751b42 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteIndexResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteIndexResponse.java
@@ -32,68 +32,67 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.IndicesResponseBase;
+import java.util.function.Function;
 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.IndicesResponseBase;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.delete.Response
 
 @JsonpDeserializable
 public class DeleteIndexResponse extends IndicesResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private DeleteIndexResponse(Builder builder) {
-		super(builder);
+    private DeleteIndexResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static DeleteIndexResponse of(Function<Builder, ObjectBuilder<DeleteIndexResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static DeleteIndexResponse of(Function<Builder, ObjectBuilder<DeleteIndexResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link DeleteIndexResponse}.
-	 */
+    /**
+     * Builder for {@link DeleteIndexResponse}.
+     */
 
-	public static class Builder extends IndicesResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DeleteIndexResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends IndicesResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<DeleteIndexResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link DeleteIndexResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteIndexResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link DeleteIndexResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteIndexResponse build() {
+            _checkSingleUse();
 
-			return new DeleteIndexResponse(this);
-		}
-	}
+            return new DeleteIndexResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link DeleteIndexResponse}
-	 */
-	public static final JsonpDeserializer<DeleteIndexResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DeleteIndexResponse::setupDeleteIndexResponseDeserializer);
+    /**
+     * Json deserializer for {@link DeleteIndexResponse}
+     */
+    public static final JsonpDeserializer<DeleteIndexResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DeleteIndexResponse::setupDeleteIndexResponseDeserializer
+    );
 
-	protected static void setupDeleteIndexResponseDeserializer(ObjectDeserializer<DeleteIndexResponse.Builder> op) {
-		IndicesResponseBase.setupIndicesResponseBaseDeserializer(op);
+    protected static void setupDeleteIndexResponseDeserializer(ObjectDeserializer<DeleteIndexResponse.Builder> op) {
+        IndicesResponseBase.setupIndicesResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteIndexTemplateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteIndexTemplateRequest.java
index 6a4cd1073e..f8599d2069 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteIndexTemplateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteIndexTemplateRequest.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.Collections;
+import java.util.function.Function;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -40,108 +42,108 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.Collections;
-import java.util.function.Function;
-
 // typedef: indices.delete_index_template.Request
 
 /**
  * Deletes an index template.
- * 
+ *
  */
 
 public class DeleteIndexTemplateRequest extends RequestBase {
-	private final String name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteIndexTemplateRequest(Builder builder) {
-
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-
-	}
-
-	public static DeleteIndexTemplateRequest of(Function<Builder, ObjectBuilder<DeleteIndexTemplateRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - The name of the template
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteIndexTemplateRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteIndexTemplateRequest> {
-		private String name;
-
-		/**
-		 * Required - The name of the template
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DeleteIndexTemplateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteIndexTemplateRequest build() {
-			_checkSingleUse();
-
-			return new DeleteIndexTemplateRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.delete_index_template}".
-	 */
-	public static final Endpoint<DeleteIndexTemplateRequest, DeleteIndexTemplateResponse, ErrorResponse> _ENDPOINT =
-			new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "DELETE";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _name;
-
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_index_template");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
-
-			}, SimpleEndpoint.emptyMap(), false, DeleteIndexTemplateResponse._DESERIALIZER);
+    private final String name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteIndexTemplateRequest(Builder builder) {
+
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+
+    }
+
+    public static DeleteIndexTemplateRequest of(Function<Builder, ObjectBuilder<DeleteIndexTemplateRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - The name of the template
+     * <p>
+     * API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteIndexTemplateRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteIndexTemplateRequest> {
+        private String name;
+
+        /**
+         * Required - The name of the template
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link DeleteIndexTemplateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteIndexTemplateRequest build() {
+            _checkSingleUse();
+
+            return new DeleteIndexTemplateRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.delete_index_template}".
+     */
+    public static final Endpoint<DeleteIndexTemplateRequest, DeleteIndexTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "DELETE";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _name;
+
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_index_template");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        DeleteIndexTemplateResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteIndexTemplateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteIndexTemplateResponse.java
index dcc03fad05..01172d3c5f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteIndexTemplateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteIndexTemplateResponse.java
@@ -32,69 +32,69 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.delete_index_template.Response
 
 @JsonpDeserializable
 public class DeleteIndexTemplateResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteIndexTemplateResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static DeleteIndexTemplateResponse of(Function<Builder, ObjectBuilder<DeleteIndexTemplateResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteIndexTemplateResponse}.
-	 */
-
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DeleteIndexTemplateResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DeleteIndexTemplateResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteIndexTemplateResponse build() {
-			_checkSingleUse();
-
-			return new DeleteIndexTemplateResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DeleteIndexTemplateResponse}
-	 */
-	public static final JsonpDeserializer<DeleteIndexTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DeleteIndexTemplateResponse::setupDeleteIndexTemplateResponseDeserializer);
-
-	protected static void setupDeleteIndexTemplateResponseDeserializer(
-			ObjectDeserializer<DeleteIndexTemplateResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteIndexTemplateResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static DeleteIndexTemplateResponse of(Function<Builder, ObjectBuilder<DeleteIndexTemplateResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteIndexTemplateResponse}.
+     */
+
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<DeleteIndexTemplateResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DeleteIndexTemplateResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteIndexTemplateResponse build() {
+            _checkSingleUse();
+
+            return new DeleteIndexTemplateResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DeleteIndexTemplateResponse}
+     */
+    public static final JsonpDeserializer<DeleteIndexTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DeleteIndexTemplateResponse::setupDeleteIndexTemplateResponseDeserializer
+    );
+
+    protected static void setupDeleteIndexTemplateResponseDeserializer(ObjectDeserializer<DeleteIndexTemplateResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteTemplateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteTemplateRequest.java
index 2c2bb8671e..f6994928bb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteTemplateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteTemplateRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,232 +45,231 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: indices.delete_template.Request
 
 /**
  * Deletes an index template.
- * 
+ *
  */
 
 public class DeleteTemplateRequest extends RequestBase {
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final String name;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteTemplateRequest(Builder builder) {
-
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.timeout = builder.timeout;
-
-	}
-
-	public static DeleteTemplateRequest of(Function<Builder, ObjectBuilder<DeleteTemplateRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Required - The name of the template
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteTemplateRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteTemplateRequest> {
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		private String name;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - The name of the template
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link DeleteTemplateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteTemplateRequest build() {
-			_checkSingleUse();
-
-			return new DeleteTemplateRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.delete_template}".
-	 */
-	public static final Endpoint<DeleteTemplateRequest, DeleteTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "DELETE";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _name;
-
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_template");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, DeleteTemplateResponse._DESERIALIZER);
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final String name;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteTemplateRequest(Builder builder) {
+
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.timeout = builder.timeout;
+
+    }
+
+    public static DeleteTemplateRequest of(Function<Builder, ObjectBuilder<DeleteTemplateRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Required - The name of the template
+     * <p>
+     * API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteTemplateRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteTemplateRequest> {
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        private String name;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - The name of the template
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link DeleteTemplateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteTemplateRequest build() {
+            _checkSingleUse();
+
+            return new DeleteTemplateRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.delete_template}".
+     */
+    public static final Endpoint<DeleteTemplateRequest, DeleteTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "DELETE";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _name;
+
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_template");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        DeleteTemplateResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteTemplateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteTemplateResponse.java
index 38f45241cc..84f613a4b2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteTemplateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DeleteTemplateResponse.java
@@ -32,69 +32,67 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.delete_template.Response
 
 @JsonpDeserializable
 public class DeleteTemplateResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private DeleteTemplateResponse(Builder builder) {
-		super(builder);
+    private DeleteTemplateResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static DeleteTemplateResponse of(Function<Builder, ObjectBuilder<DeleteTemplateResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static DeleteTemplateResponse of(Function<Builder, ObjectBuilder<DeleteTemplateResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link DeleteTemplateResponse}.
-	 */
+    /**
+     * Builder for {@link DeleteTemplateResponse}.
+     */
 
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DeleteTemplateResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<DeleteTemplateResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link DeleteTemplateResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteTemplateResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link DeleteTemplateResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteTemplateResponse build() {
+            _checkSingleUse();
 
-			return new DeleteTemplateResponse(this);
-		}
-	}
+            return new DeleteTemplateResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link DeleteTemplateResponse}
-	 */
-	public static final JsonpDeserializer<DeleteTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DeleteTemplateResponse::setupDeleteTemplateResponseDeserializer);
+    /**
+     * Json deserializer for {@link DeleteTemplateResponse}
+     */
+    public static final JsonpDeserializer<DeleteTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DeleteTemplateResponse::setupDeleteTemplateResponseDeserializer
+    );
 
-	protected static void setupDeleteTemplateResponseDeserializer(
-			ObjectDeserializer<DeleteTemplateResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+    protected static void setupDeleteTemplateResponseDeserializer(ObjectDeserializer<DeleteTemplateResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DiskUsageRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DiskUsageRequest.java
index df968ef678..710e0edf57 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DiskUsageRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DiskUsageRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -42,434 +48,429 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.disk_usage.Request
 
 /**
  * Analyzes the disk usage of each field of an index or data stream
- * 
+ *
  */
 
 public class DiskUsageRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean flush;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final String index;
-
-	@Deprecated
-	@Nullable
-	private final TimeUnit masterTimeout;
-
-	@Nullable
-	private final TimeUnit clusterManagerTimeout;
-
-	@Nullable
-	private final Boolean runExpensiveTasks;
-
-	@Nullable
-	private final TimeUnit timeout;
-
-	@Nullable
-	private final String waitForActiveShards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DiskUsageRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.flush = builder.flush;
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.runExpensiveTasks = builder.runExpensiveTasks;
-		this.timeout = builder.timeout;
-		this.waitForActiveShards = builder.waitForActiveShards;
-
-	}
-
-	public static DiskUsageRequest of(Function<Builder, ObjectBuilder<DiskUsageRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * If false, the request returns an error if any wildcard expression, index
-	 * alias, or _all value targets only missing or closed indices. This behavior
-	 * applies even if the request targets other open indices. For example, a
-	 * request targeting foo*,bar* returns an error if an index starts with foo but
-	 * no index starts with bar.
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Type of index that wildcard patterns can match. If the request can target
-	 * data streams, this argument determines whether wildcard expressions match
-	 * hidden data streams. Supports comma-separated values, such as open,hidden.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * If true, the API performs a flush before analysis. If false, the response may
-	 * not include uncommitted data.
-	 * <p>
-	 * API name: {@code flush}
-	 */
-	@Nullable
-	public final Boolean flush() {
-		return this.flush;
-	}
-
-	/**
-	 * If true, missing or closed indices are not included in the response.
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * Required - Comma-separated list of data streams, indices, and aliases used to
-	 * limit the request. It's recommended to execute this API with a single index
-	 * (or the latest backing index of a data stream) as the API consumes resources
-	 * significantly.
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Period to wait for a connection to the master node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final TimeUnit masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Period to wait for a connection to the cluster-manager node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final TimeUnit clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Analyzing field disk usage is resource-intensive. To use the API, this
-	 * parameter must be set to true.
-	 * <p>
-	 * API name: {@code run_expensive_tasks}
-	 */
-	@Nullable
-	public final Boolean runExpensiveTasks() {
-		return this.runExpensiveTasks;
-	}
-
-	/**
-	 * Period to wait for a response. If no response is received before the timeout
-	 * expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final TimeUnit timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * The number of shard copies that must be active before proceeding with the
-	 * operation. Set to all or any positive integer up to the total number of
-	 * shards in the index (number_of_replicas+1). Default: 1, the primary shard.
-	 * <p>
-	 * API name: {@code wait_for_active_shards}
-	 */
-	@Nullable
-	public final String waitForActiveShards() {
-		return this.waitForActiveShards;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DiskUsageRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DiskUsageRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean flush;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		private String index;
-
-		@Deprecated
-		@Nullable
-		private TimeUnit masterTimeout;
-
-		@Nullable
-		private TimeUnit clusterManagerTimeout;
-
-		@Nullable
-		private Boolean runExpensiveTasks;
-
-		@Nullable
-		private TimeUnit timeout;
-
-		@Nullable
-		private String waitForActiveShards;
-
-		/**
-		 * If false, the request returns an error if any wildcard expression, index
-		 * alias, or _all value targets only missing or closed indices. This behavior
-		 * applies even if the request targets other open indices. For example, a
-		 * request targeting foo*,bar* returns an error if an index starts with foo but
-		 * no index starts with bar.
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Type of index that wildcard patterns can match. If the request can target
-		 * data streams, this argument determines whether wildcard expressions match
-		 * hidden data streams. Supports comma-separated values, such as open,hidden.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Type of index that wildcard patterns can match. If the request can target
-		 * data streams, this argument determines whether wildcard expressions match
-		 * hidden data streams. Supports comma-separated values, such as open,hidden.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * If true, the API performs a flush before analysis. If false, the response may
-		 * not include uncommitted data.
-		 * <p>
-		 * API name: {@code flush}
-		 */
-		public final Builder flush(@Nullable Boolean value) {
-			this.flush = value;
-			return this;
-		}
-
-		/**
-		 * If true, missing or closed indices are not included in the response.
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Required - Comma-separated list of data streams, indices, and aliases used to
-		 * limit the request. It's recommended to execute this API with a single index
-		 * (or the latest backing index of a data stream) as the API consumes resources
-		 * significantly.
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable TimeUnit value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable TimeUnit value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Analyzing field disk usage is resource-intensive. To use the API, this
-		 * parameter must be set to true.
-		 * <p>
-		 * API name: {@code run_expensive_tasks}
-		 */
-		public final Builder runExpensiveTasks(@Nullable Boolean value) {
-			this.runExpensiveTasks = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a response. If no response is received before the timeout
-		 * expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable TimeUnit value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * The number of shard copies that must be active before proceeding with the
-		 * operation. Set to all or any positive integer up to the total number of
-		 * shards in the index (number_of_replicas+1). Default: 1, the primary shard.
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(@Nullable String value) {
-			this.waitForActiveShards = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DiskUsageRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DiskUsageRequest build() {
-			_checkSingleUse();
-
-			return new DiskUsageRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.disk_usage}".
-	 */
-	public static final Endpoint<DiskUsageRequest, DiskUsageResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_disk_usage");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout.jsonValue());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout.jsonValue());
-				}
-				if (request.flush != null) {
-					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(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.waitForActiveShards != null) {
-					params.put("wait_for_active_shards", request.waitForActiveShards);
-				}
-				if (request.runExpensiveTasks != null) {
-					params.put("run_expensive_tasks", String.valueOf(request.runExpensiveTasks));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout.jsonValue());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, DiskUsageResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean flush;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final String index;
+
+    @Deprecated
+    @Nullable
+    private final TimeUnit masterTimeout;
+
+    @Nullable
+    private final TimeUnit clusterManagerTimeout;
+
+    @Nullable
+    private final Boolean runExpensiveTasks;
+
+    @Nullable
+    private final TimeUnit timeout;
+
+    @Nullable
+    private final String waitForActiveShards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DiskUsageRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.flush = builder.flush;
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.runExpensiveTasks = builder.runExpensiveTasks;
+        this.timeout = builder.timeout;
+        this.waitForActiveShards = builder.waitForActiveShards;
+
+    }
+
+    public static DiskUsageRequest of(Function<Builder, ObjectBuilder<DiskUsageRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * If false, the request returns an error if any wildcard expression, index
+     * alias, or _all value targets only missing or closed indices. This behavior
+     * applies even if the request targets other open indices. For example, a
+     * request targeting foo*,bar* returns an error if an index starts with foo but
+     * no index starts with bar.
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Type of index that wildcard patterns can match. If the request can target
+     * data streams, this argument determines whether wildcard expressions match
+     * hidden data streams. Supports comma-separated values, such as open,hidden.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * If true, the API performs a flush before analysis. If false, the response may
+     * not include uncommitted data.
+     * <p>
+     * API name: {@code flush}
+     */
+    @Nullable
+    public final Boolean flush() {
+        return this.flush;
+    }
+
+    /**
+     * If true, missing or closed indices are not included in the response.
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * Required - Comma-separated list of data streams, indices, and aliases used to
+     * limit the request. It's recommended to execute this API with a single index
+     * (or the latest backing index of a data stream) as the API consumes resources
+     * significantly.
+     * <p>
+     * API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Period to wait for a connection to the master node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final TimeUnit masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Period to wait for a connection to the cluster-manager node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final TimeUnit clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Analyzing field disk usage is resource-intensive. To use the API, this
+     * parameter must be set to true.
+     * <p>
+     * API name: {@code run_expensive_tasks}
+     */
+    @Nullable
+    public final Boolean runExpensiveTasks() {
+        return this.runExpensiveTasks;
+    }
+
+    /**
+     * Period to wait for a response. If no response is received before the timeout
+     * expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final TimeUnit timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * The number of shard copies that must be active before proceeding with the
+     * operation. Set to all or any positive integer up to the total number of
+     * shards in the index (number_of_replicas+1). Default: 1, the primary shard.
+     * <p>
+     * API name: {@code wait_for_active_shards}
+     */
+    @Nullable
+    public final String waitForActiveShards() {
+        return this.waitForActiveShards;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DiskUsageRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DiskUsageRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean flush;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        private String index;
+
+        @Deprecated
+        @Nullable
+        private TimeUnit masterTimeout;
+
+        @Nullable
+        private TimeUnit clusterManagerTimeout;
+
+        @Nullable
+        private Boolean runExpensiveTasks;
+
+        @Nullable
+        private TimeUnit timeout;
+
+        @Nullable
+        private String waitForActiveShards;
+
+        /**
+         * If false, the request returns an error if any wildcard expression, index
+         * alias, or _all value targets only missing or closed indices. This behavior
+         * applies even if the request targets other open indices. For example, a
+         * request targeting foo*,bar* returns an error if an index starts with foo but
+         * no index starts with bar.
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Type of index that wildcard patterns can match. If the request can target
+         * data streams, this argument determines whether wildcard expressions match
+         * hidden data streams. Supports comma-separated values, such as open,hidden.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Type of index that wildcard patterns can match. If the request can target
+         * data streams, this argument determines whether wildcard expressions match
+         * hidden data streams. Supports comma-separated values, such as open,hidden.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * If true, the API performs a flush before analysis. If false, the response may
+         * not include uncommitted data.
+         * <p>
+         * API name: {@code flush}
+         */
+        public final Builder flush(@Nullable Boolean value) {
+            this.flush = value;
+            return this;
+        }
+
+        /**
+         * If true, missing or closed indices are not included in the response.
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Required - Comma-separated list of data streams, indices, and aliases used to
+         * limit the request. It's recommended to execute this API with a single index
+         * (or the latest backing index of a data stream) as the API consumes resources
+         * significantly.
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable TimeUnit value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable TimeUnit value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Analyzing field disk usage is resource-intensive. To use the API, this
+         * parameter must be set to true.
+         * <p>
+         * API name: {@code run_expensive_tasks}
+         */
+        public final Builder runExpensiveTasks(@Nullable Boolean value) {
+            this.runExpensiveTasks = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a response. If no response is received before the timeout
+         * expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable TimeUnit value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * The number of shard copies that must be active before proceeding with the
+         * operation. Set to all or any positive integer up to the total number of
+         * shards in the index (number_of_replicas+1). Default: 1, the primary shard.
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(@Nullable String value) {
+            this.waitForActiveShards = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link DiskUsageRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DiskUsageRequest build() {
+            _checkSingleUse();
+
+            return new DiskUsageRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.disk_usage}".
+     */
+    public static final Endpoint<DiskUsageRequest, DiskUsageResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_disk_usage");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout.jsonValue());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout.jsonValue());
+            }
+            if (request.flush != null) {
+                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(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.waitForActiveShards != null) {
+                params.put("wait_for_active_shards", request.waitForActiveShards);
+            }
+            if (request.runExpensiveTasks != null) {
+                params.put("run_expensive_tasks", String.valueOf(request.runExpensiveTasks));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout.jsonValue());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        DiskUsageResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DiskUsageResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DiskUsageResponse.java
index 2ca716205c..3af03fdf6b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/DiskUsageResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/DiskUsageResponse.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,84 +42,84 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: indices.disk_usage.Response
 
 @JsonpDeserializable
 public class DiskUsageResponse implements JsonpSerializable {
-	private final JsonData valueBody;
+    private final JsonData valueBody;
+
+    // ---------------------------------------------------------------------------------------------
 
-	// ---------------------------------------------------------------------------------------------
+    private DiskUsageResponse(Builder builder) {
 
-	private DiskUsageResponse(Builder builder) {
+        this.valueBody = ApiTypeHelper.requireNonNull(builder.valueBody, this, "valueBody");
 
-		this.valueBody = ApiTypeHelper.requireNonNull(builder.valueBody, this, "valueBody");
+    }
 
-	}
+    public static DiskUsageResponse of(Function<Builder, ObjectBuilder<DiskUsageResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	public static DiskUsageResponse of(Function<Builder, ObjectBuilder<DiskUsageResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    /**
+     * Required - Response value.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final JsonData valueBody() {
+        return this.valueBody;
+    }
 
-	/**
-	 * Required - Response value.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final JsonData valueBody() {
-		return this.valueBody;
-	}
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        this.valueBody.serialize(generator, mapper);
 
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		this.valueBody.serialize(generator, mapper);
+    }
 
-	}
+    // ---------------------------------------------------------------------------------------------
 
-	// ---------------------------------------------------------------------------------------------
+    /**
+     * Builder for {@link DiskUsageResponse}.
+     */
 
-	/**
-	 * Builder for {@link DiskUsageResponse}.
-	 */
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DiskUsageResponse> {
+        private JsonData valueBody;
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DiskUsageResponse> {
-		private JsonData valueBody;
+        /**
+         * Required - Response value.
+         * <p>
+         * API name: {@code _value_body}
+         */
+        public final Builder valueBody(JsonData value) {
+            this.valueBody = value;
+            return this;
+        }
 
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * API name: {@code _value_body}
-		 */
-		public final Builder valueBody(JsonData value) {
-			this.valueBody = value;
-			return this;
-		}
+        /**
+         * Builds a {@link DiskUsageResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DiskUsageResponse build() {
+            _checkSingleUse();
 
-		/**
-		 * Builds a {@link DiskUsageResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DiskUsageResponse build() {
-			_checkSingleUse();
+            return new DiskUsageResponse(this);
+        }
+    }
 
-			return new DiskUsageResponse(this);
-		}
-	}
+    public static final JsonpDeserializer<DiskUsageResponse> _DESERIALIZER = createDiskUsageResponseDeserializer();
 
-	public static final JsonpDeserializer<DiskUsageResponse> _DESERIALIZER = createDiskUsageResponseDeserializer();
-	protected static JsonpDeserializer<DiskUsageResponse> createDiskUsageResponseDeserializer() {
+    protected static JsonpDeserializer<DiskUsageResponse> createDiskUsageResponseDeserializer() {
 
-		JsonpDeserializer<JsonData> valueDeserializer = JsonData._DESERIALIZER;
+        JsonpDeserializer<JsonData> valueDeserializer = JsonData._DESERIALIZER;
 
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build());
-	}
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().valueBody(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsAliasRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsAliasRequest.java
index 3ebb9a5507..225a5f1717 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsAliasRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsAliasRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -43,323 +49,317 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.exists_alias.Request
 
 /**
  * Returns information about whether a particular alias exists.
- * 
+ *
  */
 
 public class ExistsAliasRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Boolean local;
-
-	private final List<String> name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ExistsAliasRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.local = builder.local;
-		this.name = ApiTypeHelper.unmodifiableRequired(builder.name, this, "name");
-
-	}
-
-	public static ExistsAliasRequest of(Function<Builder, ObjectBuilder<ExistsAliasRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * A comma-separated list of index names to filter aliases
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Return local information, do not retrieve the state from cluster-manager node
-	 * (default: false)
-	 * <p>
-	 * API name: {@code local}
-	 */
-	@Nullable
-	public final Boolean local() {
-		return this.local;
-	}
-
-	/**
-	 * Required - A comma-separated list of alias names to return
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final List<String> name() {
-		return this.name;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ExistsAliasRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExistsAliasRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private Boolean local;
-
-		private List<String> name;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names to filter aliases
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names to filter aliases
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Return local information, do not retrieve the state from cluster-manager node
-		 * (default: false)
-		 * <p>
-		 * API name: {@code local}
-		 */
-		public final Builder local(@Nullable Boolean value) {
-			this.local = value;
-			return this;
-		}
-
-		/**
-		 * Required - A comma-separated list of alias names to return
-		 * <p>
-		 * API name: {@code name}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>name</code>.
-		 */
-		public final Builder name(List<String> list) {
-			this.name = _listAddAll(this.name, list);
-			return this;
-		}
-
-		/**
-		 * Required - A comma-separated list of alias names to return
-		 * <p>
-		 * API name: {@code name}
-		 * <p>
-		 * Adds one or more values to <code>name</code>.
-		 */
-		public final Builder name(String value, String... values) {
-			this.name = _listAdd(this.name, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ExistsAliasRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ExistsAliasRequest build() {
-			_checkSingleUse();
-
-			return new ExistsAliasRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.exists_alias}".
-	 */
-	public static final Endpoint<ExistsAliasRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
-			"opensearch/indices.exists_alias",
-
-			// Request method
-			request -> {
-				return "HEAD";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-				final int _index = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _name;
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_alias");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).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);
-					buf.append("/_alias");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.local != null) {
-					params.put("local", String.valueOf(request.local));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, null);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Boolean local;
+
+    private final List<String> name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ExistsAliasRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.local = builder.local;
+        this.name = ApiTypeHelper.unmodifiableRequired(builder.name, this, "name");
+
+    }
+
+    public static ExistsAliasRequest of(Function<Builder, ObjectBuilder<ExistsAliasRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * A comma-separated list of index names to filter aliases
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Return local information, do not retrieve the state from cluster-manager node
+     * (default: false)
+     * <p>
+     * API name: {@code local}
+     */
+    @Nullable
+    public final Boolean local() {
+        return this.local;
+    }
+
+    /**
+     * Required - A comma-separated list of alias names to return
+     * <p>
+     * API name: {@code name}
+     */
+    public final List<String> name() {
+        return this.name;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ExistsAliasRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExistsAliasRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private Boolean local;
+
+        private List<String> name;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names to filter aliases
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names to filter aliases
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Return local information, do not retrieve the state from cluster-manager node
+         * (default: false)
+         * <p>
+         * API name: {@code local}
+         */
+        public final Builder local(@Nullable Boolean value) {
+            this.local = value;
+            return this;
+        }
+
+        /**
+         * Required - A comma-separated list of alias names to return
+         * <p>
+         * API name: {@code name}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>name</code>.
+         */
+        public final Builder name(List<String> list) {
+            this.name = _listAddAll(this.name, list);
+            return this;
+        }
+
+        /**
+         * Required - A comma-separated list of alias names to return
+         * <p>
+         * API name: {@code name}
+         * <p>
+         * Adds one or more values to <code>name</code>.
+         */
+        public final Builder name(String value, String... values) {
+            this.name = _listAdd(this.name, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link ExistsAliasRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ExistsAliasRequest build() {
+            _checkSingleUse();
+
+            return new ExistsAliasRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.exists_alias}".
+     */
+    public static final Endpoint<ExistsAliasRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
+        "opensearch/indices.exists_alias",
+
+        // Request method
+        request -> {
+            return "HEAD";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+            final int _index = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _name;
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_alias");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).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);
+                buf.append("/_alias");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.local != null) {
+                params.put("local", String.valueOf(request.local));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        null
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsAliasResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsAliasResponse.java
index c791d97c9a..266bf5a10b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsAliasResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsAliasResponse.java
@@ -36,17 +36,14 @@
 
 // typedef: indices.exists_alias.Response
 
-
 public class ExistsAliasResponse {
-	public ExistsAliasResponse() {
-	}
+    public ExistsAliasResponse() {}
 
-	/**
-	 * Singleton instance for {@link ExistsAliasResponse}.
-	 */
-	public static final ExistsAliasResponse _INSTANCE = new ExistsAliasResponse();
+    /**
+     * Singleton instance for {@link ExistsAliasResponse}.
+     */
+    public static final ExistsAliasResponse _INSTANCE = new ExistsAliasResponse();
 
-	public static final JsonpDeserializer<ExistsAliasResponse> _DESERIALIZER = JsonpDeserializer
-			.fixedValue(ExistsAliasResponse._INSTANCE);
+    public static final JsonpDeserializer<ExistsAliasResponse> _DESERIALIZER = JsonpDeserializer.fixedValue(ExistsAliasResponse._INSTANCE);
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsIndexTemplateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsIndexTemplateRequest.java
index fe8fba2838..a50df663c5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsIndexTemplateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsIndexTemplateRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -43,202 +47,201 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: indices.exists_index_template.Request
 
 /**
  * Returns information about whether a particular index template exists.
- * 
+ *
  */
 
 public class ExistsIndexTemplateRequest extends RequestBase {
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final String name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ExistsIndexTemplateRequest(Builder builder) {
-
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-
-	}
-
-	public static ExistsIndexTemplateRequest of(Function<Builder, ObjectBuilder<ExistsIndexTemplateRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Period to wait for a connection to the master node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Period to wait for a connection to the cluster-manager node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Required - Comma-separated list of index template names used to limit the
-	 * request. Wildcard (*) expressions are supported.
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ExistsIndexTemplateRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExistsIndexTemplateRequest> {
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		private String name;
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - Comma-separated list of index template names used to limit the
-		 * request. Wildcard (*) expressions are supported.
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ExistsIndexTemplateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ExistsIndexTemplateRequest build() {
-			_checkSingleUse();
-
-			return new ExistsIndexTemplateRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.exists_index_template}".
-	 */
-	public static final Endpoint<ExistsIndexTemplateRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
-			"opensearch/indices.exists_index_template",
-
-			// Request method
-			request -> {
-				return "HEAD";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _name;
-
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_index_template");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, null);
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final String name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ExistsIndexTemplateRequest(Builder builder) {
+
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+
+    }
+
+    public static ExistsIndexTemplateRequest of(Function<Builder, ObjectBuilder<ExistsIndexTemplateRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Period to wait for a connection to the master node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Period to wait for a connection to the cluster-manager node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Required - Comma-separated list of index template names used to limit the
+     * request. Wildcard (*) expressions are supported.
+     * <p>
+     * API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ExistsIndexTemplateRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExistsIndexTemplateRequest> {
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        private String name;
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - Comma-separated list of index template names used to limit the
+         * request. Wildcard (*) expressions are supported.
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ExistsIndexTemplateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ExistsIndexTemplateRequest build() {
+            _checkSingleUse();
+
+            return new ExistsIndexTemplateRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.exists_index_template}".
+     */
+    public static final Endpoint<ExistsIndexTemplateRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
+        "opensearch/indices.exists_index_template",
+
+        // Request method
+        request -> {
+            return "HEAD";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _name;
+
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_index_template");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        null
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsIndexTemplateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsIndexTemplateResponse.java
index 4a957b75bb..951a32012f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsIndexTemplateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsIndexTemplateResponse.java
@@ -36,17 +36,16 @@
 
 // typedef: indices.exists_index_template.Response
 
-
 public class ExistsIndexTemplateResponse {
-	public ExistsIndexTemplateResponse() {
-	}
+    public ExistsIndexTemplateResponse() {}
 
-	/**
-	 * Singleton instance for {@link ExistsIndexTemplateResponse}.
-	 */
-	public static final ExistsIndexTemplateResponse _INSTANCE = new ExistsIndexTemplateResponse();
+    /**
+     * Singleton instance for {@link ExistsIndexTemplateResponse}.
+     */
+    public static final ExistsIndexTemplateResponse _INSTANCE = new ExistsIndexTemplateResponse();
 
-	public static final JsonpDeserializer<ExistsIndexTemplateResponse> _DESERIALIZER = JsonpDeserializer
-			.fixedValue(ExistsIndexTemplateResponse._INSTANCE);
+    public static final JsonpDeserializer<ExistsIndexTemplateResponse> _DESERIALIZER = JsonpDeserializer.fixedValue(
+        ExistsIndexTemplateResponse._INSTANCE
+    );
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsRequest.java
index 239965a2b0..5cd06ef799 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -43,327 +49,322 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.exists.Request
 
 /**
  * Returns information about whether a particular index exists.
- * 
+ *
  */
 
 public class ExistsRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean flatSettings;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	@Nullable
-	private final Boolean includeDefaults;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Boolean local;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ExistsRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.flatSettings = builder.flatSettings;
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.includeDefaults = builder.includeDefaults;
-		this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
-		this.local = builder.local;
-
-	}
-
-	public static ExistsRequest of(Function<Builder, ObjectBuilder<ExistsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Ignore if a wildcard expression resolves to no concrete indices (default:
-	 * false)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether wildcard expressions should get expanded to open or closed indices
-	 * (default: open)
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Return settings in flat format (default: false)
-	 * <p>
-	 * API name: {@code flat_settings}
-	 */
-	@Nullable
-	public final Boolean flatSettings() {
-		return this.flatSettings;
-	}
-
-	/**
-	 * Ignore unavailable indexes (default: false)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * Whether to return all default setting for each of the indices.
-	 * <p>
-	 * API name: {@code include_defaults}
-	 */
-	@Nullable
-	public final Boolean includeDefaults() {
-		return this.includeDefaults;
-	}
-
-	/**
-	 * Required - A comma-separated list of index names
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Return local information, do not retrieve the state from cluster-manager node
-	 * (default: false)
-	 * <p>
-	 * API name: {@code local}
-	 */
-	@Nullable
-	public final Boolean local() {
-		return this.local;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ExistsRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExistsRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean flatSettings;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private Boolean includeDefaults;
-
-		private List<String> index;
-
-		@Nullable
-		private Boolean local;
-
-		/**
-		 * Ignore if a wildcard expression resolves to no concrete indices (default:
-		 * false)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether wildcard expressions should get expanded to open or closed indices
-		 * (default: open)
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether wildcard expressions should get expanded to open or closed indices
-		 * (default: open)
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Return settings in flat format (default: false)
-		 * <p>
-		 * API name: {@code flat_settings}
-		 */
-		public final Builder flatSettings(@Nullable Boolean value) {
-			this.flatSettings = value;
-			return this;
-		}
-
-		/**
-		 * Ignore unavailable indexes (default: false)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Whether to return all default setting for each of the indices.
-		 * <p>
-		 * API name: {@code include_defaults}
-		 */
-		public final Builder includeDefaults(@Nullable Boolean value) {
-			this.includeDefaults = value;
-			return this;
-		}
-
-		/**
-		 * Required - A comma-separated list of index names
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * Required - A comma-separated list of index names
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Return local information, do not retrieve the state from cluster-manager node
-		 * (default: false)
-		 * <p>
-		 * API name: {@code local}
-		 */
-		public final Builder local(@Nullable Boolean value) {
-			this.local = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ExistsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ExistsRequest build() {
-			_checkSingleUse();
-
-			return new ExistsRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.exists}".
-	 */
-	public static final Endpoint<ExistsRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
-			"opensearch/indices.exists",
-
-			// Request method
-			request -> {
-				return "HEAD";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				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(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.includeDefaults != null) {
-					params.put("include_defaults", String.valueOf(request.includeDefaults));
-				}
-				if (request.local != null) {
-					params.put("local", String.valueOf(request.local));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, null);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean flatSettings;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    @Nullable
+    private final Boolean includeDefaults;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Boolean local;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ExistsRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.flatSettings = builder.flatSettings;
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.includeDefaults = builder.includeDefaults;
+        this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
+        this.local = builder.local;
+
+    }
+
+    public static ExistsRequest of(Function<Builder, ObjectBuilder<ExistsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Ignore if a wildcard expression resolves to no concrete indices (default:
+     * false)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether wildcard expressions should get expanded to open or closed indices
+     * (default: open)
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Return settings in flat format (default: false)
+     * <p>
+     * API name: {@code flat_settings}
+     */
+    @Nullable
+    public final Boolean flatSettings() {
+        return this.flatSettings;
+    }
+
+    /**
+     * Ignore unavailable indexes (default: false)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * Whether to return all default setting for each of the indices.
+     * <p>
+     * API name: {@code include_defaults}
+     */
+    @Nullable
+    public final Boolean includeDefaults() {
+        return this.includeDefaults;
+    }
+
+    /**
+     * Required - A comma-separated list of index names
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Return local information, do not retrieve the state from cluster-manager node
+     * (default: false)
+     * <p>
+     * API name: {@code local}
+     */
+    @Nullable
+    public final Boolean local() {
+        return this.local;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ExistsRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExistsRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean flatSettings;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private Boolean includeDefaults;
+
+        private List<String> index;
+
+        @Nullable
+        private Boolean local;
+
+        /**
+         * Ignore if a wildcard expression resolves to no concrete indices (default:
+         * false)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether wildcard expressions should get expanded to open or closed indices
+         * (default: open)
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether wildcard expressions should get expanded to open or closed indices
+         * (default: open)
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Return settings in flat format (default: false)
+         * <p>
+         * API name: {@code flat_settings}
+         */
+        public final Builder flatSettings(@Nullable Boolean value) {
+            this.flatSettings = value;
+            return this;
+        }
+
+        /**
+         * Ignore unavailable indexes (default: false)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Whether to return all default setting for each of the indices.
+         * <p>
+         * API name: {@code include_defaults}
+         */
+        public final Builder includeDefaults(@Nullable Boolean value) {
+            this.includeDefaults = value;
+            return this;
+        }
+
+        /**
+         * Required - A comma-separated list of index names
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * Required - A comma-separated list of index names
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Return local information, do not retrieve the state from cluster-manager node
+         * (default: false)
+         * <p>
+         * API name: {@code local}
+         */
+        public final Builder local(@Nullable Boolean value) {
+            this.local = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ExistsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ExistsRequest build() {
+            _checkSingleUse();
+
+            return new ExistsRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.exists}".
+     */
+    public static final Endpoint<ExistsRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
+        "opensearch/indices.exists",
+
+        // Request method
+        request -> {
+            return "HEAD";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            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(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.includeDefaults != null) {
+                params.put("include_defaults", String.valueOf(request.includeDefaults));
+            }
+            if (request.local != null) {
+                params.put("local", String.valueOf(request.local));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        null
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsResponse.java
index 1db47b2a33..1c51f63584 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsResponse.java
@@ -36,17 +36,14 @@
 
 // typedef: indices.exists.Response
 
-
 public class ExistsResponse {
-	public ExistsResponse() {
-	}
+    public ExistsResponse() {}
 
-	/**
-	 * Singleton instance for {@link ExistsResponse}.
-	 */
-	public static final ExistsResponse _INSTANCE = new ExistsResponse();
+    /**
+     * Singleton instance for {@link ExistsResponse}.
+     */
+    public static final ExistsResponse _INSTANCE = new ExistsResponse();
 
-	public static final JsonpDeserializer<ExistsResponse> _DESERIALIZER = JsonpDeserializer
-			.fixedValue(ExistsResponse._INSTANCE);
+    public static final JsonpDeserializer<ExistsResponse> _DESERIALIZER = JsonpDeserializer.fixedValue(ExistsResponse._INSTANCE);
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsTemplateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsTemplateRequest.java
index 6b9ce69776..52a4d5b0b0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsTemplateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsTemplateRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -43,272 +49,269 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.exists_template.Request
 
 /**
  * Returns information about whether a particular index template exists.
- * 
+ *
  */
 
 public class ExistsTemplateRequest extends RequestBase {
-	@Nullable
-	private final Boolean flatSettings;
-
-	@Nullable
-	private final Boolean local;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final List<String> name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ExistsTemplateRequest(Builder builder) {
-
-		this.flatSettings = builder.flatSettings;
-		this.local = builder.local;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = ApiTypeHelper.unmodifiableRequired(builder.name, this, "name");
-
-	}
-
-	public static ExistsTemplateRequest of(Function<Builder, ObjectBuilder<ExistsTemplateRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Return settings in flat format (default: false)
-	 * <p>
-	 * API name: {@code flat_settings}
-	 */
-	@Nullable
-	public final Boolean flatSettings() {
-		return this.flatSettings;
-	}
-
-	/**
-	 * Return local information, do not retrieve the state from cluster-manager node
-	 * (default: false)
-	 * <p>
-	 * API name: {@code local}
-	 */
-	@Nullable
-	public final Boolean local() {
-		return this.local;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to master node
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to cluster-manager node
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Required - The comma separated names of the index templates
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final List<String> name() {
-		return this.name;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ExistsTemplateRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExistsTemplateRequest> {
-		@Nullable
-		private Boolean flatSettings;
-
-		@Nullable
-		private Boolean local;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		private List<String> name;
-
-		/**
-		 * Return settings in flat format (default: false)
-		 * <p>
-		 * API name: {@code flat_settings}
-		 */
-		public final Builder flatSettings(@Nullable Boolean value) {
-			this.flatSettings = value;
-			return this;
-		}
-
-		/**
-		 * Return local information, do not retrieve the state from cluster-manager node
-		 * (default: false)
-		 * <p>
-		 * API name: {@code local}
-		 */
-		public final Builder local(@Nullable Boolean value) {
-			this.local = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - The comma separated names of the index templates
-		 * <p>
-		 * API name: {@code name}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>name</code>.
-		 */
-		public final Builder name(List<String> list) {
-			this.name = _listAddAll(this.name, list);
-			return this;
-		}
-
-		/**
-		 * Required - The comma separated names of the index templates
-		 * <p>
-		 * API name: {@code name}
-		 * <p>
-		 * Adds one or more values to <code>name</code>.
-		 */
-		public final Builder name(String value, String... values) {
-			this.name = _listAdd(this.name, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ExistsTemplateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ExistsTemplateRequest build() {
-			_checkSingleUse();
-
-			return new ExistsTemplateRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.exists_template}".
-	 */
-	public static final Endpoint<ExistsTemplateRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
-			"opensearch/indices.exists_template",
-
-			// Request method
-			request -> {
-				return "HEAD";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _name;
-
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_template");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.flatSettings != null) {
-					params.put("flat_settings", String.valueOf(request.flatSettings));
-				}
-				if (request.local != null) {
-					params.put("local", String.valueOf(request.local));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, null);
+    @Nullable
+    private final Boolean flatSettings;
+
+    @Nullable
+    private final Boolean local;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final List<String> name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ExistsTemplateRequest(Builder builder) {
+
+        this.flatSettings = builder.flatSettings;
+        this.local = builder.local;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = ApiTypeHelper.unmodifiableRequired(builder.name, this, "name");
+
+    }
+
+    public static ExistsTemplateRequest of(Function<Builder, ObjectBuilder<ExistsTemplateRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Return settings in flat format (default: false)
+     * <p>
+     * API name: {@code flat_settings}
+     */
+    @Nullable
+    public final Boolean flatSettings() {
+        return this.flatSettings;
+    }
+
+    /**
+     * Return local information, do not retrieve the state from cluster-manager node
+     * (default: false)
+     * <p>
+     * API name: {@code local}
+     */
+    @Nullable
+    public final Boolean local() {
+        return this.local;
+    }
+
+    /**
+     * Explicit operation timeout for connection to master node
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Explicit operation timeout for connection to cluster-manager node
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Required - The comma separated names of the index templates
+     * <p>
+     * API name: {@code name}
+     */
+    public final List<String> name() {
+        return this.name;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ExistsTemplateRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExistsTemplateRequest> {
+        @Nullable
+        private Boolean flatSettings;
+
+        @Nullable
+        private Boolean local;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        private List<String> name;
+
+        /**
+         * Return settings in flat format (default: false)
+         * <p>
+         * API name: {@code flat_settings}
+         */
+        public final Builder flatSettings(@Nullable Boolean value) {
+            this.flatSettings = value;
+            return this;
+        }
+
+        /**
+         * Return local information, do not retrieve the state from cluster-manager node
+         * (default: false)
+         * <p>
+         * API name: {@code local}
+         */
+        public final Builder local(@Nullable Boolean value) {
+            this.local = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - The comma separated names of the index templates
+         * <p>
+         * API name: {@code name}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>name</code>.
+         */
+        public final Builder name(List<String> list) {
+            this.name = _listAddAll(this.name, list);
+            return this;
+        }
+
+        /**
+         * Required - The comma separated names of the index templates
+         * <p>
+         * API name: {@code name}
+         * <p>
+         * Adds one or more values to <code>name</code>.
+         */
+        public final Builder name(String value, String... values) {
+            this.name = _listAdd(this.name, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link ExistsTemplateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ExistsTemplateRequest build() {
+            _checkSingleUse();
+
+            return new ExistsTemplateRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.exists_template}".
+     */
+    public static final Endpoint<ExistsTemplateRequest, BooleanResponse, ErrorResponse> _ENDPOINT = new BooleanEndpoint<>(
+        "opensearch/indices.exists_template",
+
+        // Request method
+        request -> {
+            return "HEAD";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _name;
+
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_template");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.flatSettings != null) {
+                params.put("flat_settings", String.valueOf(request.flatSettings));
+            }
+            if (request.local != null) {
+                params.put("local", String.valueOf(request.local));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        null
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsTemplateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsTemplateResponse.java
index d5c30f2f64..0f850ff737 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsTemplateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ExistsTemplateResponse.java
@@ -36,17 +36,16 @@
 
 // typedef: indices.exists_template.Response
 
-
 public class ExistsTemplateResponse {
-	public ExistsTemplateResponse() {
-	}
+    public ExistsTemplateResponse() {}
 
-	/**
-	 * Singleton instance for {@link ExistsTemplateResponse}.
-	 */
-	public static final ExistsTemplateResponse _INSTANCE = new ExistsTemplateResponse();
+    /**
+     * Singleton instance for {@link ExistsTemplateResponse}.
+     */
+    public static final ExistsTemplateResponse _INSTANCE = new ExistsTemplateResponse();
 
-	public static final JsonpDeserializer<ExistsTemplateResponse> _DESERIALIZER = JsonpDeserializer
-			.fixedValue(ExistsTemplateResponse._INSTANCE);
+    public static final JsonpDeserializer<ExistsTemplateResponse> _DESERIALIZER = JsonpDeserializer.fixedValue(
+        ExistsTemplateResponse._INSTANCE
+    );
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/FielddataFrequencyFilter.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/FielddataFrequencyFilter.java
index 4e41bb0d6c..55018efcb4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/FielddataFrequencyFilter.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/FielddataFrequencyFilter.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,141 +43,140 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: indices._types.FielddataFrequencyFilter
 
 @JsonpDeserializable
 public class FielddataFrequencyFilter implements JsonpSerializable {
-	private final double max;
+    private final double max;
 
-	private final double min;
-
-	private final int minSegmentSize;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FielddataFrequencyFilter(Builder builder) {
-
-		this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
-		this.min = ApiTypeHelper.requireNonNull(builder.min, this, "min");
-		this.minSegmentSize = ApiTypeHelper.requireNonNull(builder.minSegmentSize, this, "minSegmentSize");
-
-	}
-
-	public static FielddataFrequencyFilter of(Function<Builder, ObjectBuilder<FielddataFrequencyFilter>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code max}
-	 */
-	public final double max() {
-		return this.max;
-	}
-
-	/**
-	 * Required - API name: {@code min}
-	 */
-	public final double min() {
-		return this.min;
-	}
-
-	/**
-	 * Required - API name: {@code min_segment_size}
-	 */
-	public final int minSegmentSize() {
-		return this.minSegmentSize;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("max");
-		generator.write(this.max);
-
-		generator.writeKey("min");
-		generator.write(this.min);
-
-		generator.writeKey("min_segment_size");
-		generator.write(this.minSegmentSize);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FielddataFrequencyFilter}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FielddataFrequencyFilter> {
-		private Double max;
-
-		private Double min;
-
-		private Integer minSegmentSize;
-
-		/**
-		 * Required - API name: {@code max}
-		 */
-		public final Builder max(double value) {
-			this.max = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code min}
-		 */
-		public final Builder min(double value) {
-			this.min = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code min_segment_size}
-		 */
-		public final Builder minSegmentSize(int value) {
-			this.minSegmentSize = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FielddataFrequencyFilter}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FielddataFrequencyFilter build() {
-			_checkSingleUse();
-
-			return new FielddataFrequencyFilter(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FielddataFrequencyFilter}
-	 */
-	public static final JsonpDeserializer<FielddataFrequencyFilter> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, FielddataFrequencyFilter::setupFielddataFrequencyFilterDeserializer);
-
-	protected static void setupFielddataFrequencyFilterDeserializer(
-			ObjectDeserializer<FielddataFrequencyFilter.Builder> op) {
-
-		op.add(Builder::max, JsonpDeserializer.doubleDeserializer(), "max");
-		op.add(Builder::min, JsonpDeserializer.doubleDeserializer(), "min");
-		op.add(Builder::minSegmentSize, JsonpDeserializer.integerDeserializer(), "min_segment_size");
-
-	}
+    private final double min;
+
+    private final int minSegmentSize;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FielddataFrequencyFilter(Builder builder) {
+
+        this.max = ApiTypeHelper.requireNonNull(builder.max, this, "max");
+        this.min = ApiTypeHelper.requireNonNull(builder.min, this, "min");
+        this.minSegmentSize = ApiTypeHelper.requireNonNull(builder.minSegmentSize, this, "minSegmentSize");
+
+    }
+
+    public static FielddataFrequencyFilter of(Function<Builder, ObjectBuilder<FielddataFrequencyFilter>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code max}
+     */
+    public final double max() {
+        return this.max;
+    }
+
+    /**
+     * Required - API name: {@code min}
+     */
+    public final double min() {
+        return this.min;
+    }
+
+    /**
+     * Required - API name: {@code min_segment_size}
+     */
+    public final int minSegmentSize() {
+        return this.minSegmentSize;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("max");
+        generator.write(this.max);
+
+        generator.writeKey("min");
+        generator.write(this.min);
+
+        generator.writeKey("min_segment_size");
+        generator.write(this.minSegmentSize);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FielddataFrequencyFilter}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FielddataFrequencyFilter> {
+        private Double max;
+
+        private Double min;
+
+        private Integer minSegmentSize;
+
+        /**
+         * Required - API name: {@code max}
+         */
+        public final Builder max(double value) {
+            this.max = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code min}
+         */
+        public final Builder min(double value) {
+            this.min = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code min_segment_size}
+         */
+        public final Builder minSegmentSize(int value) {
+            this.minSegmentSize = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link FielddataFrequencyFilter}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FielddataFrequencyFilter build() {
+            _checkSingleUse();
+
+            return new FielddataFrequencyFilter(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FielddataFrequencyFilter}
+     */
+    public static final JsonpDeserializer<FielddataFrequencyFilter> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FielddataFrequencyFilter::setupFielddataFrequencyFilterDeserializer
+    );
+
+    protected static void setupFielddataFrequencyFilterDeserializer(ObjectDeserializer<FielddataFrequencyFilter.Builder> op) {
+
+        op.add(Builder::max, JsonpDeserializer.doubleDeserializer(), "max");
+        op.add(Builder::min, JsonpDeserializer.doubleDeserializer(), "min");
+        op.add(Builder::minSegmentSize, JsonpDeserializer.integerDeserializer(), "min_segment_size");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/FlushRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/FlushRequest.java
index 603cdafd0c..330af6a6d0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/FlushRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/FlushRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -41,13 +47,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.flush.Request
 
 /**
@@ -56,306 +55,307 @@
  */
 
 public class FlushRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean force;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Boolean waitIfOngoing;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FlushRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.force = builder.force;
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.waitIfOngoing = builder.waitIfOngoing;
-
-	}
-
-	public static FlushRequest of(Function<Builder, ObjectBuilder<FlushRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Whether a flush should be forced even if it is not necessarily needed ie. if
-	 * no changes will be committed to the index. This is useful if transaction log
-	 * IDs should be incremented even if no uncommitted changes are present. (This
-	 * setting can be considered as internal)
-	 * <p>
-	 * API name: {@code force}
-	 */
-	@Nullable
-	public final Boolean force() {
-		return this.force;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * A comma-separated list of index names; use <code>_all</code> or empty string
-	 * for all indices
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * If set to true the flush operation will block until the flush can be executed
-	 * if another flush operation is already executing. The default is true. If set
-	 * to false the flush will be skipped iff if another flush operation is already
-	 * running.
-	 * <p>
-	 * API name: {@code wait_if_ongoing}
-	 */
-	@Nullable
-	public final Boolean waitIfOngoing() {
-		return this.waitIfOngoing;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FlushRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FlushRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean force;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private Boolean waitIfOngoing;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether a flush should be forced even if it is not necessarily needed ie. if
-		 * no changes will be committed to the index. This is useful if transaction log
-		 * IDs should be incremented even if no uncommitted changes are present. (This
-		 * setting can be considered as internal)
-		 * <p>
-		 * API name: {@code force}
-		 */
-		public final Builder force(@Nullable Boolean value) {
-			this.force = value;
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * for all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * for all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * If set to true the flush operation will block until the flush can be executed
-		 * if another flush operation is already executing. The default is true. If set
-		 * to false the flush will be skipped iff if another flush operation is already
-		 * running.
-		 * <p>
-		 * API name: {@code wait_if_ongoing}
-		 */
-		public final Builder waitIfOngoing(@Nullable Boolean value) {
-			this.waitIfOngoing = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FlushRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FlushRequest build() {
-			_checkSingleUse();
-
-			return new FlushRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.flush}".
-	 */
-	public static final Endpoint<FlushRequest, FlushResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_flush");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_flush");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.force != null) {
-					params.put("force", String.valueOf(request.force));
-				}
-				if (request.waitIfOngoing != null) {
-					params.put("wait_if_ongoing", String.valueOf(request.waitIfOngoing));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, FlushResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean force;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Boolean waitIfOngoing;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FlushRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.force = builder.force;
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.waitIfOngoing = builder.waitIfOngoing;
+
+    }
+
+    public static FlushRequest of(Function<Builder, ObjectBuilder<FlushRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Whether a flush should be forced even if it is not necessarily needed ie. if
+     * no changes will be committed to the index. This is useful if transaction log
+     * IDs should be incremented even if no uncommitted changes are present. (This
+     * setting can be considered as internal)
+     * <p>
+     * API name: {@code force}
+     */
+    @Nullable
+    public final Boolean force() {
+        return this.force;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * A comma-separated list of index names; use <code>_all</code> or empty string
+     * for all indices
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * If set to true the flush operation will block until the flush can be executed
+     * if another flush operation is already executing. The default is true. If set
+     * to false the flush will be skipped iff if another flush operation is already
+     * running.
+     * <p>
+     * API name: {@code wait_if_ongoing}
+     */
+    @Nullable
+    public final Boolean waitIfOngoing() {
+        return this.waitIfOngoing;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FlushRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FlushRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean force;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private Boolean waitIfOngoing;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Whether a flush should be forced even if it is not necessarily needed ie. if
+         * no changes will be committed to the index. This is useful if transaction log
+         * IDs should be incremented even if no uncommitted changes are present. (This
+         * setting can be considered as internal)
+         * <p>
+         * API name: {@code force}
+         */
+        public final Builder force(@Nullable Boolean value) {
+            this.force = value;
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * for all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * for all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * If set to true the flush operation will block until the flush can be executed
+         * if another flush operation is already executing. The default is true. If set
+         * to false the flush will be skipped iff if another flush operation is already
+         * running.
+         * <p>
+         * API name: {@code wait_if_ongoing}
+         */
+        public final Builder waitIfOngoing(@Nullable Boolean value) {
+            this.waitIfOngoing = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link FlushRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FlushRequest build() {
+            _checkSingleUse();
+
+            return new FlushRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.flush}".
+     */
+    public static final Endpoint<FlushRequest, FlushResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_flush");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_flush");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.force != null) {
+                params.put("force", String.valueOf(request.force));
+            }
+            if (request.waitIfOngoing != null) {
+                params.put("wait_if_ongoing", String.valueOf(request.waitIfOngoing));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        FlushResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/FlushResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/FlushResponse.java
index 8f0d29362a..28e99a9077 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/FlushResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/FlushResponse.java
@@ -32,68 +32,67 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ShardsOperationResponseBase;
+import java.util.function.Function;
 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.ShardsOperationResponseBase;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.flush.Response
 
 @JsonpDeserializable
 public class FlushResponse extends ShardsOperationResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private FlushResponse(Builder builder) {
-		super(builder);
+    private FlushResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static FlushResponse of(Function<Builder, ObjectBuilder<FlushResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static FlushResponse of(Function<Builder, ObjectBuilder<FlushResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link FlushResponse}.
-	 */
+    /**
+     * Builder for {@link FlushResponse}.
+     */
 
-	public static class Builder extends ShardsOperationResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<FlushResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends ShardsOperationResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<FlushResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link FlushResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FlushResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link FlushResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FlushResponse build() {
+            _checkSingleUse();
 
-			return new FlushResponse(this);
-		}
-	}
+            return new FlushResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link FlushResponse}
-	 */
-	public static final JsonpDeserializer<FlushResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FlushResponse::setupFlushResponseDeserializer);
+    /**
+     * Json deserializer for {@link FlushResponse}
+     */
+    public static final JsonpDeserializer<FlushResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FlushResponse::setupFlushResponseDeserializer
+    );
 
-	protected static void setupFlushResponseDeserializer(ObjectDeserializer<FlushResponse.Builder> op) {
-		ShardsOperationResponseBase.setupShardsOperationResponseBaseDeserializer(op);
+    protected static void setupFlushResponseDeserializer(ObjectDeserializer<FlushResponse.Builder> op) {
+        ShardsOperationResponseBase.setupShardsOperationResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ForcemergeRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ForcemergeRequest.java
index c23fd9f2f6..16d521bef9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ForcemergeRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ForcemergeRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -41,341 +47,335 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.forcemerge.Request
 
 /**
  * Performs the force merge operation on one or more indices.
- * 
+ *
  */
 
 public class ForcemergeRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean flush;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Long maxNumSegments;
-
-	@Nullable
-	private final Boolean onlyExpungeDeletes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ForcemergeRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.flush = builder.flush;
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.maxNumSegments = builder.maxNumSegments;
-		this.onlyExpungeDeletes = builder.onlyExpungeDeletes;
-
-	}
-
-	public static ForcemergeRequest of(Function<Builder, ObjectBuilder<ForcemergeRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Specify whether the index should be flushed after performing the operation
-	 * (default: true)
-	 * <p>
-	 * API name: {@code flush}
-	 */
-	@Nullable
-	public final Boolean flush() {
-		return this.flush;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * A comma-separated list of index names; use <code>_all</code> or empty string
-	 * to perform the operation on all indices
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * The number of segments the index should be merged into (default: dynamic)
-	 * <p>
-	 * API name: {@code max_num_segments}
-	 */
-	@Nullable
-	public final Long maxNumSegments() {
-		return this.maxNumSegments;
-	}
-
-	/**
-	 * Specify whether the operation should only expunge deleted documents
-	 * <p>
-	 * API name: {@code only_expunge_deletes}
-	 */
-	@Nullable
-	public final Boolean onlyExpungeDeletes() {
-		return this.onlyExpungeDeletes;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ForcemergeRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ForcemergeRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean flush;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private Long maxNumSegments;
-
-		@Nullable
-		private Boolean onlyExpungeDeletes;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Specify whether the index should be flushed after performing the operation
-		 * (default: true)
-		 * <p>
-		 * API name: {@code flush}
-		 */
-		public final Builder flush(@Nullable Boolean value) {
-			this.flush = value;
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * The number of segments the index should be merged into (default: dynamic)
-		 * <p>
-		 * API name: {@code max_num_segments}
-		 */
-		public final Builder maxNumSegments(@Nullable Long value) {
-			this.maxNumSegments = value;
-			return this;
-		}
-
-		/**
-		 * Specify whether the operation should only expunge deleted documents
-		 * <p>
-		 * API name: {@code only_expunge_deletes}
-		 */
-		public final Builder onlyExpungeDeletes(@Nullable Boolean value) {
-			this.onlyExpungeDeletes = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ForcemergeRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ForcemergeRequest build() {
-			_checkSingleUse();
-
-			return new ForcemergeRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.forcemerge}".
-	 */
-	public static final Endpoint<ForcemergeRequest, ForcemergeResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_forcemerge");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_forcemerge");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.flush != null) {
-					params.put("flush", String.valueOf(request.flush));
-				}
-				if (request.onlyExpungeDeletes != null) {
-					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(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.maxNumSegments != null) {
-					params.put("max_num_segments", String.valueOf(request.maxNumSegments));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, ForcemergeResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean flush;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Long maxNumSegments;
+
+    @Nullable
+    private final Boolean onlyExpungeDeletes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ForcemergeRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.flush = builder.flush;
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.maxNumSegments = builder.maxNumSegments;
+        this.onlyExpungeDeletes = builder.onlyExpungeDeletes;
+
+    }
+
+    public static ForcemergeRequest of(Function<Builder, ObjectBuilder<ForcemergeRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Specify whether the index should be flushed after performing the operation
+     * (default: true)
+     * <p>
+     * API name: {@code flush}
+     */
+    @Nullable
+    public final Boolean flush() {
+        return this.flush;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * A comma-separated list of index names; use <code>_all</code> or empty string
+     * to perform the operation on all indices
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * The number of segments the index should be merged into (default: dynamic)
+     * <p>
+     * API name: {@code max_num_segments}
+     */
+    @Nullable
+    public final Long maxNumSegments() {
+        return this.maxNumSegments;
+    }
+
+    /**
+     * Specify whether the operation should only expunge deleted documents
+     * <p>
+     * API name: {@code only_expunge_deletes}
+     */
+    @Nullable
+    public final Boolean onlyExpungeDeletes() {
+        return this.onlyExpungeDeletes;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ForcemergeRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ForcemergeRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean flush;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private Long maxNumSegments;
+
+        @Nullable
+        private Boolean onlyExpungeDeletes;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Specify whether the index should be flushed after performing the operation
+         * (default: true)
+         * <p>
+         * API name: {@code flush}
+         */
+        public final Builder flush(@Nullable Boolean value) {
+            this.flush = value;
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * The number of segments the index should be merged into (default: dynamic)
+         * <p>
+         * API name: {@code max_num_segments}
+         */
+        public final Builder maxNumSegments(@Nullable Long value) {
+            this.maxNumSegments = value;
+            return this;
+        }
+
+        /**
+         * Specify whether the operation should only expunge deleted documents
+         * <p>
+         * API name: {@code only_expunge_deletes}
+         */
+        public final Builder onlyExpungeDeletes(@Nullable Boolean value) {
+            this.onlyExpungeDeletes = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ForcemergeRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ForcemergeRequest build() {
+            _checkSingleUse();
+
+            return new ForcemergeRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.forcemerge}".
+     */
+    public static final Endpoint<ForcemergeRequest, ForcemergeResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_forcemerge");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_forcemerge");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.flush != null) {
+                params.put("flush", String.valueOf(request.flush));
+            }
+            if (request.onlyExpungeDeletes != null) {
+                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(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.maxNumSegments != null) {
+                params.put("max_num_segments", String.valueOf(request.maxNumSegments));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        ForcemergeResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ForcemergeResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ForcemergeResponse.java
index b7dd81d17e..14473d8e24 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ForcemergeResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ForcemergeResponse.java
@@ -32,68 +32,67 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ShardsOperationResponseBase;
+import java.util.function.Function;
 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.ShardsOperationResponseBase;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.forcemerge.Response
 
 @JsonpDeserializable
 public class ForcemergeResponse extends ShardsOperationResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ForcemergeResponse(Builder builder) {
-		super(builder);
+    private ForcemergeResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static ForcemergeResponse of(Function<Builder, ObjectBuilder<ForcemergeResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ForcemergeResponse of(Function<Builder, ObjectBuilder<ForcemergeResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link ForcemergeResponse}.
-	 */
+    /**
+     * Builder for {@link ForcemergeResponse}.
+     */
 
-	public static class Builder extends ShardsOperationResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ForcemergeResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends ShardsOperationResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<ForcemergeResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link ForcemergeResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ForcemergeResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link ForcemergeResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ForcemergeResponse build() {
+            _checkSingleUse();
 
-			return new ForcemergeResponse(this);
-		}
-	}
+            return new ForcemergeResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link ForcemergeResponse}
-	 */
-	public static final JsonpDeserializer<ForcemergeResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ForcemergeResponse::setupForcemergeResponseDeserializer);
+    /**
+     * Json deserializer for {@link ForcemergeResponse}
+     */
+    public static final JsonpDeserializer<ForcemergeResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ForcemergeResponse::setupForcemergeResponseDeserializer
+    );
 
-	protected static void setupForcemergeResponseDeserializer(ObjectDeserializer<ForcemergeResponse.Builder> op) {
-		ShardsOperationResponseBase.setupShardsOperationResponseBaseDeserializer(op);
+    protected static void setupForcemergeResponseDeserializer(ObjectDeserializer<ForcemergeResponse.Builder> op) {
+        ShardsOperationResponseBase.setupShardsOperationResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetAliasRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetAliasRequest.java
index 086190adab..391c6a635d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetAliasRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetAliasRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -41,336 +47,329 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.get_alias.Request
 
 /**
  * Returns an alias.
- * 
+ *
  */
 
 public class GetAliasRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Boolean local;
-
-	private final List<String> name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetAliasRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.local = builder.local;
-		this.name = ApiTypeHelper.unmodifiable(builder.name);
-
-	}
-
-	public static GetAliasRequest of(Function<Builder, ObjectBuilder<GetAliasRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * A comma-separated list of index names to filter aliases
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Return local information, do not retrieve the state from cluster-manager node
-	 * (default: false)
-	 * <p>
-	 * API name: {@code local}
-	 */
-	@Nullable
-	public final Boolean local() {
-		return this.local;
-	}
-
-	/**
-	 * A comma-separated list of alias names to return
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final List<String> name() {
-		return this.name;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetAliasRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetAliasRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private Boolean local;
-
-		@Nullable
-		private List<String> name;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names to filter aliases
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names to filter aliases
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Return local information, do not retrieve the state from cluster-manager node
-		 * (default: false)
-		 * <p>
-		 * API name: {@code local}
-		 */
-		public final Builder local(@Nullable Boolean value) {
-			this.local = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of alias names to return
-		 * <p>
-		 * API name: {@code name}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>name</code>.
-		 */
-		public final Builder name(List<String> list) {
-			this.name = _listAddAll(this.name, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of alias names to return
-		 * <p>
-		 * API name: {@code name}
-		 * <p>
-		 * Adds one or more values to <code>name</code>.
-		 */
-		public final Builder name(String value, String... values) {
-			this.name = _listAdd(this.name, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetAliasRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetAliasRequest build() {
-			_checkSingleUse();
-
-			return new GetAliasRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.get_alias}".
-	 */
-	public static final Endpoint<GetAliasRequest, GetAliasResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-				final int _index = 1 << 1;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.name()))
-					propsSet |= _name;
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_alias");
-					return buf.toString();
-				}
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_alias");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).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);
-					buf.append("/_alias");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).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);
-					buf.append("/_alias");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.local != null) {
-					params.put("local", String.valueOf(request.local));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, GetAliasResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Boolean local;
+
+    private final List<String> name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetAliasRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.local = builder.local;
+        this.name = ApiTypeHelper.unmodifiable(builder.name);
+
+    }
+
+    public static GetAliasRequest of(Function<Builder, ObjectBuilder<GetAliasRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * A comma-separated list of index names to filter aliases
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Return local information, do not retrieve the state from cluster-manager node
+     * (default: false)
+     * <p>
+     * API name: {@code local}
+     */
+    @Nullable
+    public final Boolean local() {
+        return this.local;
+    }
+
+    /**
+     * A comma-separated list of alias names to return
+     * <p>
+     * API name: {@code name}
+     */
+    public final List<String> name() {
+        return this.name;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetAliasRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetAliasRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private Boolean local;
+
+        @Nullable
+        private List<String> name;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names to filter aliases
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names to filter aliases
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Return local information, do not retrieve the state from cluster-manager node
+         * (default: false)
+         * <p>
+         * API name: {@code local}
+         */
+        public final Builder local(@Nullable Boolean value) {
+            this.local = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of alias names to return
+         * <p>
+         * API name: {@code name}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>name</code>.
+         */
+        public final Builder name(List<String> list) {
+            this.name = _listAddAll(this.name, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of alias names to return
+         * <p>
+         * API name: {@code name}
+         * <p>
+         * Adds one or more values to <code>name</code>.
+         */
+        public final Builder name(String value, String... values) {
+            this.name = _listAdd(this.name, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetAliasRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetAliasRequest build() {
+            _checkSingleUse();
+
+            return new GetAliasRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.get_alias}".
+     */
+    public static final Endpoint<GetAliasRequest, GetAliasResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+            final int _index = 1 << 1;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.name())) propsSet |= _name;
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_alias");
+                return buf.toString();
+            }
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_alias");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).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);
+                buf.append("/_alias");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).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);
+                buf.append("/_alias");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.local != null) {
+                params.put("local", String.valueOf(request.local));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetAliasResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetAliasResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetAliasResponse.java
index e225b27ee1..5ffbe81dee 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetAliasResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetAliasResponse.java
@@ -32,72 +32,72 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch.indices.get_alias.IndexAliases;
+import java.util.function.Function;
 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.indices.get_alias.IndexAliases;
 import org.opensearch.client.transport.endpoints.DictionaryResponse;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.get_alias.Response
 
 @JsonpDeserializable
 public class GetAliasResponse extends DictionaryResponse<String, IndexAliases> {
-	// ---------------------------------------------------------------------------------------------
-
-	private GetAliasResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static GetAliasResponse of(Function<Builder, ObjectBuilder<GetAliasResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetAliasResponse}.
-	 */
-
-	public static class Builder extends DictionaryResponse.AbstractBuilder<String, IndexAliases, Builder>
-			implements
-				ObjectBuilder<GetAliasResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetAliasResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetAliasResponse build() {
-			_checkSingleUse();
-			super.tKeySerializer(null);
-			super.tValueSerializer(null);
-
-			return new GetAliasResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetAliasResponse}
-	 */
-	public static final JsonpDeserializer<GetAliasResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GetAliasResponse::setupGetAliasResponseDeserializer);
-
-	protected static void setupGetAliasResponseDeserializer(ObjectDeserializer<GetAliasResponse.Builder> op) {
-		DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(),
-				IndexAliases._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private GetAliasResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static GetAliasResponse of(Function<Builder, ObjectBuilder<GetAliasResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetAliasResponse}.
+     */
+
+    public static class Builder extends DictionaryResponse.AbstractBuilder<String, IndexAliases, Builder>
+        implements
+            ObjectBuilder<GetAliasResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetAliasResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetAliasResponse build() {
+            _checkSingleUse();
+            super.tKeySerializer(null);
+            super.tValueSerializer(null);
+
+            return new GetAliasResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetAliasResponse}
+     */
+    public static final JsonpDeserializer<GetAliasResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetAliasResponse::setupGetAliasResponseDeserializer
+    );
+
+    protected static void setupGetAliasResponseDeserializer(ObjectDeserializer<GetAliasResponse.Builder> op) {
+        DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(), IndexAliases._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetDataStreamRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetDataStreamRequest.java
index ef12ea6c22..61293727ae 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetDataStreamRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetDataStreamRequest.java
@@ -8,6 +8,10 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -16,11 +20,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import javax.annotation.Nullable;
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 // typedef: indices.get_data_stream.Request
 
 /**
@@ -96,39 +95,40 @@ public GetDataStreamRequest build() {
      * Endpoint "{@code indices.get_data_stream}".
      */
     public static final Endpoint<GetDataStreamRequest, GetDataStreamResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-            // Request method
-            request -> {
-                return "GET";
-            },
-
-            // Request path
-            request -> {
-                final int _name = 1 << 0;
-                int propsSet = 0;
-
-                if (ApiTypeHelper.isDefined(request.name())) {
-                    propsSet |= _name;
-                }
-
-                if (propsSet == 0) {
-                    StringBuilder sbd = new StringBuilder();
-                    sbd.append("/_data_stream");
-                    return sbd.toString();
-                }
-
-                if (propsSet == (_name)) {
-                    StringBuilder sbd = new StringBuilder();
-                    sbd.append("/_data_stream");
-                    sbd.append("/");
-                    SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), sbd);
-                    return sbd.toString();
-                }
-                throw SimpleEndpoint.noPathTemplateFound("path");
-            },
-
-            // Request parameters
-            SimpleEndpoint.emptyMap(),
-
-            SimpleEndpoint.emptyMap(), false, GetDataStreamResponse._DESERIALIZER);
+        // Request method
+        request -> { return "GET"; },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.name())) {
+                propsSet |= _name;
+            }
+
+            if (propsSet == 0) {
+                StringBuilder sbd = new StringBuilder();
+                sbd.append("/_data_stream");
+                return sbd.toString();
+            }
+
+            if (propsSet == (_name)) {
+                StringBuilder sbd = new StringBuilder();
+                sbd.append("/_data_stream");
+                sbd.append("/");
+                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), sbd);
+                return sbd.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+        },
+
+        // Request parameters
+        SimpleEndpoint.emptyMap(),
+
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetDataStreamResponse._DESERIALIZER
+    );
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetDataStreamResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetDataStreamResponse.java
index 9651fb371a..4a52e8bf90 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetDataStreamResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetDataStreamResponse.java
@@ -9,6 +9,8 @@
 package org.opensearch.client.opensearch.indices;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -19,9 +21,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.List;
-import java.util.function.Function;
-
 // typedef: indices.get_data_stream.Response
 
 @JsonpDeserializable
@@ -105,8 +104,10 @@ public GetDataStreamResponse build() {
     /**
      * Json deserializer for {@link GetDataStreamResponse}
      */
-    public static final JsonpDeserializer<GetDataStreamResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-            GetDataStreamResponse::setupGetDataStreamResponseDeserializer);
+    public static final JsonpDeserializer<GetDataStreamResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetDataStreamResponse::setupGetDataStreamResponseDeserializer
+    );
 
     protected static void setupGetDataStreamResponseDeserializer(ObjectDeserializer<Builder> op) {
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetFieldMappingRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetFieldMappingRequest.java
index 584f66969f..2993da7a67 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetFieldMappingRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetFieldMappingRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -41,356 +47,348 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.get_field_mapping.Request
 
 /**
  * Returns mapping for one or more fields.
- * 
+ *
  */
 
 public class GetFieldMappingRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	private final List<String> fields;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	@Nullable
-	private final Boolean includeDefaults;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Boolean local;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetFieldMappingRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.fields = ApiTypeHelper.unmodifiableRequired(builder.fields, this, "fields");
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.includeDefaults = builder.includeDefaults;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.local = builder.local;
-
-	}
-
-	public static GetFieldMappingRequest of(Function<Builder, ObjectBuilder<GetFieldMappingRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Required - A comma-separated list of fields
-	 * <p>
-	 * API name: {@code fields}
-	 */
-	public final List<String> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * Whether the default mapping values should be returned as well
-	 * <p>
-	 * API name: {@code include_defaults}
-	 */
-	@Nullable
-	public final Boolean includeDefaults() {
-		return this.includeDefaults;
-	}
-
-	/**
-	 * A comma-separated list of index names
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Return local information, do not retrieve the state from cluster-manager node
-	 * (default: false)
-	 * <p>
-	 * API name: {@code local}
-	 */
-	@Nullable
-	public final Boolean local() {
-		return this.local;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetFieldMappingRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetFieldMappingRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		private List<String> fields;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private Boolean includeDefaults;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private Boolean local;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - A comma-separated list of fields
-		 * <p>
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fields</code>.
-		 */
-		public final Builder fields(List<String> list) {
-			this.fields = _listAddAll(this.fields, list);
-			return this;
-		}
-
-		/**
-		 * Required - A comma-separated list of fields
-		 * <p>
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds one or more values to <code>fields</code>.
-		 */
-		public final Builder fields(String value, String... values) {
-			this.fields = _listAdd(this.fields, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Whether the default mapping values should be returned as well
-		 * <p>
-		 * API name: {@code include_defaults}
-		 */
-		public final Builder includeDefaults(@Nullable Boolean value) {
-			this.includeDefaults = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Return local information, do not retrieve the state from cluster-manager node
-		 * (default: false)
-		 * <p>
-		 * API name: {@code local}
-		 */
-		public final Builder local(@Nullable Boolean value) {
-			this.local = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetFieldMappingRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetFieldMappingRequest build() {
-			_checkSingleUse();
-
-			return new GetFieldMappingRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.get_field_mapping}".
-	 */
-	public static final Endpoint<GetFieldMappingRequest, GetFieldMappingResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-				final int _fields = 1 << 1;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-				propsSet |= _fields;
-
-				if (propsSet == (_fields)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_mapping");
-					buf.append("/field");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.fields.stream().map(v -> v).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);
-					buf.append("/_mapping");
-					buf.append("/field");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.fields.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.includeDefaults != null) {
-					params.put("include_defaults", String.valueOf(request.includeDefaults));
-				}
-				if (request.local != null) {
-					params.put("local", String.valueOf(request.local));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, GetFieldMappingResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    private final List<String> fields;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    @Nullable
+    private final Boolean includeDefaults;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Boolean local;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetFieldMappingRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.fields = ApiTypeHelper.unmodifiableRequired(builder.fields, this, "fields");
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.includeDefaults = builder.includeDefaults;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.local = builder.local;
+
+    }
+
+    public static GetFieldMappingRequest of(Function<Builder, ObjectBuilder<GetFieldMappingRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Required - A comma-separated list of fields
+     * <p>
+     * API name: {@code fields}
+     */
+    public final List<String> fields() {
+        return this.fields;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * Whether the default mapping values should be returned as well
+     * <p>
+     * API name: {@code include_defaults}
+     */
+    @Nullable
+    public final Boolean includeDefaults() {
+        return this.includeDefaults;
+    }
+
+    /**
+     * A comma-separated list of index names
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Return local information, do not retrieve the state from cluster-manager node
+     * (default: false)
+     * <p>
+     * API name: {@code local}
+     */
+    @Nullable
+    public final Boolean local() {
+        return this.local;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetFieldMappingRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetFieldMappingRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        private List<String> fields;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private Boolean includeDefaults;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private Boolean local;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Required - A comma-separated list of fields
+         * <p>
+         * API name: {@code fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fields</code>.
+         */
+        public final Builder fields(List<String> list) {
+            this.fields = _listAddAll(this.fields, list);
+            return this;
+        }
+
+        /**
+         * Required - A comma-separated list of fields
+         * <p>
+         * API name: {@code fields}
+         * <p>
+         * Adds one or more values to <code>fields</code>.
+         */
+        public final Builder fields(String value, String... values) {
+            this.fields = _listAdd(this.fields, value, values);
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Whether the default mapping values should be returned as well
+         * <p>
+         * API name: {@code include_defaults}
+         */
+        public final Builder includeDefaults(@Nullable Boolean value) {
+            this.includeDefaults = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Return local information, do not retrieve the state from cluster-manager node
+         * (default: false)
+         * <p>
+         * API name: {@code local}
+         */
+        public final Builder local(@Nullable Boolean value) {
+            this.local = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetFieldMappingRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetFieldMappingRequest build() {
+            _checkSingleUse();
+
+            return new GetFieldMappingRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.get_field_mapping}".
+     */
+    public static final Endpoint<GetFieldMappingRequest, GetFieldMappingResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+            final int _fields = 1 << 1;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+            propsSet |= _fields;
+
+            if (propsSet == (_fields)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_mapping");
+                buf.append("/field");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.fields.stream().map(v -> v).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);
+                buf.append("/_mapping");
+                buf.append("/field");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.fields.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.includeDefaults != null) {
+                params.put("include_defaults", String.valueOf(request.includeDefaults));
+            }
+            if (request.local != null) {
+                params.put("local", String.valueOf(request.local));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetFieldMappingResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetFieldMappingResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetFieldMappingResponse.java
index c2031513db..299d4b22a3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetFieldMappingResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetFieldMappingResponse.java
@@ -32,73 +32,72 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch.indices.get_field_mapping.TypeFieldMappings;
+import java.util.function.Function;
 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.indices.get_field_mapping.TypeFieldMappings;
 import org.opensearch.client.transport.endpoints.DictionaryResponse;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.get_field_mapping.Response
 
 @JsonpDeserializable
 public class GetFieldMappingResponse extends DictionaryResponse<String, TypeFieldMappings> {
-	// ---------------------------------------------------------------------------------------------
-
-	private GetFieldMappingResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static GetFieldMappingResponse of(Function<Builder, ObjectBuilder<GetFieldMappingResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetFieldMappingResponse}.
-	 */
-
-	public static class Builder extends DictionaryResponse.AbstractBuilder<String, TypeFieldMappings, Builder>
-			implements
-				ObjectBuilder<GetFieldMappingResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetFieldMappingResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetFieldMappingResponse build() {
-			_checkSingleUse();
-			super.tKeySerializer(null);
-			super.tValueSerializer(null);
-
-			return new GetFieldMappingResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetFieldMappingResponse}
-	 */
-	public static final JsonpDeserializer<GetFieldMappingResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GetFieldMappingResponse::setupGetFieldMappingResponseDeserializer);
-
-	protected static void setupGetFieldMappingResponseDeserializer(
-			ObjectDeserializer<GetFieldMappingResponse.Builder> op) {
-		DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(),
-				TypeFieldMappings._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private GetFieldMappingResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static GetFieldMappingResponse of(Function<Builder, ObjectBuilder<GetFieldMappingResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetFieldMappingResponse}.
+     */
+
+    public static class Builder extends DictionaryResponse.AbstractBuilder<String, TypeFieldMappings, Builder>
+        implements
+            ObjectBuilder<GetFieldMappingResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetFieldMappingResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetFieldMappingResponse build() {
+            _checkSingleUse();
+            super.tKeySerializer(null);
+            super.tValueSerializer(null);
+
+            return new GetFieldMappingResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetFieldMappingResponse}
+     */
+    public static final JsonpDeserializer<GetFieldMappingResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetFieldMappingResponse::setupGetFieldMappingResponseDeserializer
+    );
+
+    protected static void setupGetFieldMappingResponseDeserializer(ObjectDeserializer<GetFieldMappingResponse.Builder> op) {
+        DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(), TypeFieldMappings._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexRequest.java
index 49d5208b06..4049613f69 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -42,421 +48,416 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.get.Request
 
 /**
  * Returns information about one or more indices.
- * 
+ *
  */
 
 public class GetIndexRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean flatSettings;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	@Nullable
-	private final Boolean includeDefaults;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Boolean local;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetIndexRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.flatSettings = builder.flatSettings;
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.includeDefaults = builder.includeDefaults;
-		this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
-		this.local = builder.local;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-
-	}
-
-	public static GetIndexRequest of(Function<Builder, ObjectBuilder<GetIndexRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Ignore if a wildcard expression resolves to no concrete indices (default:
-	 * false)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Type of index that wildcard expressions can match. If the request can target
-	 * data streams, this argument determines whether wildcard expressions match
-	 * hidden data streams. Supports comma-separated values, such as open,hidden.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * If true, returns settings in flat format.
-	 * <p>
-	 * API name: {@code flat_settings}
-	 */
-	@Nullable
-	public final Boolean flatSettings() {
-		return this.flatSettings;
-	}
-
-	/**
-	 * If false, requests that target a missing index return an error.
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * If true, return all default settings in the response.
-	 * <p>
-	 * API name: {@code include_defaults}
-	 */
-	@Nullable
-	public final Boolean includeDefaults() {
-		return this.includeDefaults;
-	}
-
-	/**
-	 * Required - Comma-separated list of data streams, indices, and index aliases
-	 * used to limit the request. Wildcard expressions (*) are supported.
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * If true, the request retrieves information from the local node only. Defaults
-	 * to false, which means information is retrieved from the cluster-manager node.
-	 * <p>
-	 * API name: {@code local}
-	 */
-	@Nullable
-	public final Boolean local() {
-		return this.local;
-	}
-
-	/**
-	 * Period to wait for a connection to the master node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Period to wait for a connection to the cluster-manager node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetIndexRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetIndexRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean flatSettings;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private Boolean includeDefaults;
-
-		private List<String> index;
-
-		@Nullable
-		private Boolean local;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		/**
-		 * Ignore if a wildcard expression resolves to no concrete indices (default:
-		 * false)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Type of index that wildcard expressions can match. If the request can target
-		 * data streams, this argument determines whether wildcard expressions match
-		 * hidden data streams. Supports comma-separated values, such as open,hidden.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Type of index that wildcard expressions can match. If the request can target
-		 * data streams, this argument determines whether wildcard expressions match
-		 * hidden data streams. Supports comma-separated values, such as open,hidden.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * If true, returns settings in flat format.
-		 * <p>
-		 * API name: {@code flat_settings}
-		 */
-		public final Builder flatSettings(@Nullable Boolean value) {
-			this.flatSettings = value;
-			return this;
-		}
-
-		/**
-		 * If false, requests that target a missing index return an error.
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * If true, return all default settings in the response.
-		 * <p>
-		 * API name: {@code include_defaults}
-		 */
-		public final Builder includeDefaults(@Nullable Boolean value) {
-			this.includeDefaults = value;
-			return this;
-		}
-
-		/**
-		 * Required - Comma-separated list of data streams, indices, and index aliases
-		 * used to limit the request. Wildcard expressions (*) are supported.
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * Required - Comma-separated list of data streams, indices, and index aliases
-		 * used to limit the request. Wildcard expressions (*) are supported.
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * If true, the request retrieves information from the local node only. Defaults
-		 * to false, which means information is retrieved from the cluster-manager node.
-		 * <p>
-		 * API name: {@code local}
-		 */
-		public final Builder local(@Nullable Boolean value) {
-			this.local = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link GetIndexRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetIndexRequest build() {
-			_checkSingleUse();
-
-			return new GetIndexRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.get}".
-	 */
-	public static final Endpoint<GetIndexRequest, GetIndexResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				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(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.includeDefaults != null) {
-					params.put("include_defaults", String.valueOf(request.includeDefaults));
-				}
-				if (request.local != null) {
-					params.put("local", String.valueOf(request.local));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, GetIndexResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean flatSettings;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    @Nullable
+    private final Boolean includeDefaults;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Boolean local;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetIndexRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.flatSettings = builder.flatSettings;
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.includeDefaults = builder.includeDefaults;
+        this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
+        this.local = builder.local;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+
+    }
+
+    public static GetIndexRequest of(Function<Builder, ObjectBuilder<GetIndexRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Ignore if a wildcard expression resolves to no concrete indices (default:
+     * false)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Type of index that wildcard expressions can match. If the request can target
+     * data streams, this argument determines whether wildcard expressions match
+     * hidden data streams. Supports comma-separated values, such as open,hidden.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * If true, returns settings in flat format.
+     * <p>
+     * API name: {@code flat_settings}
+     */
+    @Nullable
+    public final Boolean flatSettings() {
+        return this.flatSettings;
+    }
+
+    /**
+     * If false, requests that target a missing index return an error.
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * If true, return all default settings in the response.
+     * <p>
+     * API name: {@code include_defaults}
+     */
+    @Nullable
+    public final Boolean includeDefaults() {
+        return this.includeDefaults;
+    }
+
+    /**
+     * Required - Comma-separated list of data streams, indices, and index aliases
+     * used to limit the request. Wildcard expressions (*) are supported.
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * If true, the request retrieves information from the local node only. Defaults
+     * to false, which means information is retrieved from the cluster-manager node.
+     * <p>
+     * API name: {@code local}
+     */
+    @Nullable
+    public final Boolean local() {
+        return this.local;
+    }
+
+    /**
+     * Period to wait for a connection to the master node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Period to wait for a connection to the cluster-manager node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetIndexRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetIndexRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean flatSettings;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private Boolean includeDefaults;
+
+        private List<String> index;
+
+        @Nullable
+        private Boolean local;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        /**
+         * Ignore if a wildcard expression resolves to no concrete indices (default:
+         * false)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Type of index that wildcard expressions can match. If the request can target
+         * data streams, this argument determines whether wildcard expressions match
+         * hidden data streams. Supports comma-separated values, such as open,hidden.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Type of index that wildcard expressions can match. If the request can target
+         * data streams, this argument determines whether wildcard expressions match
+         * hidden data streams. Supports comma-separated values, such as open,hidden.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * If true, returns settings in flat format.
+         * <p>
+         * API name: {@code flat_settings}
+         */
+        public final Builder flatSettings(@Nullable Boolean value) {
+            this.flatSettings = value;
+            return this;
+        }
+
+        /**
+         * If false, requests that target a missing index return an error.
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * If true, return all default settings in the response.
+         * <p>
+         * API name: {@code include_defaults}
+         */
+        public final Builder includeDefaults(@Nullable Boolean value) {
+            this.includeDefaults = value;
+            return this;
+        }
+
+        /**
+         * Required - Comma-separated list of data streams, indices, and index aliases
+         * used to limit the request. Wildcard expressions (*) are supported.
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * Required - Comma-separated list of data streams, indices, and index aliases
+         * used to limit the request. Wildcard expressions (*) are supported.
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * If true, the request retrieves information from the local node only. Defaults
+         * to false, which means information is retrieved from the cluster-manager node.
+         * <p>
+         * API name: {@code local}
+         */
+        public final Builder local(@Nullable Boolean value) {
+            this.local = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link GetIndexRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetIndexRequest build() {
+            _checkSingleUse();
+
+            return new GetIndexRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.get}".
+     */
+    public static final Endpoint<GetIndexRequest, GetIndexResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            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(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.includeDefaults != null) {
+                params.put("include_defaults", String.valueOf(request.includeDefaults));
+            }
+            if (request.local != null) {
+                params.put("local", String.valueOf(request.local));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetIndexResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexResponse.java
index 10e0882619..5cd71afc55 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexResponse.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
@@ -39,65 +40,63 @@
 import org.opensearch.client.transport.endpoints.DictionaryResponse;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.get.Response
 
-
 @JsonpDeserializable
 public class GetIndexResponse extends DictionaryResponse<String, IndexState> {
-	// ---------------------------------------------------------------------------------------------
-
-	private GetIndexResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static GetIndexResponse of(Function<Builder, ObjectBuilder<GetIndexResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetIndexResponse}.
-	 */
-
-	public static class Builder extends DictionaryResponse.AbstractBuilder<String, IndexState, Builder>
-			implements
-				ObjectBuilder<GetIndexResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetIndexResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetIndexResponse build() {
-			_checkSingleUse();
-			super.tKeySerializer(null);
-			super.tValueSerializer(null);
-
-			return new GetIndexResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetIndexResponse}
-	 */
-	public static final JsonpDeserializer<GetIndexResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GetIndexResponse::setupGetIndexResponseDeserializer);
-
-	protected static void setupGetIndexResponseDeserializer(ObjectDeserializer<GetIndexResponse.Builder> op) {
-		DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(),
-				IndexState._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private GetIndexResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static GetIndexResponse of(Function<Builder, ObjectBuilder<GetIndexResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetIndexResponse}.
+     */
+
+    public static class Builder extends DictionaryResponse.AbstractBuilder<String, IndexState, Builder>
+        implements
+            ObjectBuilder<GetIndexResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetIndexResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetIndexResponse build() {
+            _checkSingleUse();
+            super.tKeySerializer(null);
+            super.tValueSerializer(null);
+
+            return new GetIndexResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetIndexResponse}
+     */
+    public static final JsonpDeserializer<GetIndexResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetIndexResponse::setupGetIndexResponseDeserializer
+    );
+
+    protected static void setupGetIndexResponseDeserializer(ObjectDeserializer<GetIndexResponse.Builder> op) {
+        DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(), IndexState._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexTemplateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexTemplateRequest.java
index a48abbbd2e..df8a55d999 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexTemplateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexTemplateRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -40,272 +44,270 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: indices.get_index_template.Request
 
 /**
  * Returns an index template.
- * 
+ *
  */
 
 public class GetIndexTemplateRequest extends RequestBase {
-	@Nullable
-	private final Boolean flatSettings;
-
-	@Nullable
-	private final Boolean local;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final String name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetIndexTemplateRequest(Builder builder) {
-
-		this.flatSettings = builder.flatSettings;
-		this.local = builder.local;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = builder.name;
-
-	}
-
-	public static GetIndexTemplateRequest of(Function<Builder, ObjectBuilder<GetIndexTemplateRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * If true, returns settings in flat format.
-	 * <p>
-	 * API name: {@code flat_settings}
-	 */
-	@Nullable
-	public final Boolean flatSettings() {
-		return this.flatSettings;
-	}
-
-	/**
-	 * If true, the request retrieves information from the local node only. Defaults
-	 * to false, which means information is retrieved from the cluster-manager node.
-	 * <p>
-	 * API name: {@code local}
-	 */
-	@Nullable
-	public final Boolean local() {
-		return this.local;
-	}
-
-	/**
-	 * Period to wait for a connection to the master node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Period to wait for a connection to the cluster-manager node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Comma-separated list of index template names used to limit the request.
-	 * Wildcard (*) expressions are supported.
-	 * <p>
-	 * API name: {@code name}
-	 */
-	@Nullable
-	public final String name() {
-		return this.name;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetIndexTemplateRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetIndexTemplateRequest> {
-		@Nullable
-		private Boolean flatSettings;
-
-		@Nullable
-		private Boolean local;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private String name;
-
-		/**
-		 * If true, returns settings in flat format.
-		 * <p>
-		 * API name: {@code flat_settings}
-		 */
-		public final Builder flatSettings(@Nullable Boolean value) {
-			this.flatSettings = value;
-			return this;
-		}
-
-		/**
-		 * If true, the request retrieves information from the local node only. Defaults
-		 * to false, which means information is retrieved from the cluster-manager node.
-		 * <p>
-		 * API name: {@code local}
-		 */
-		public final Builder local(@Nullable Boolean value) {
-			this.local = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Comma-separated list of index template names used to limit the request.
-		 * Wildcard (*) expressions are supported.
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(@Nullable String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetIndexTemplateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetIndexTemplateRequest build() {
-			_checkSingleUse();
-
-			return new GetIndexTemplateRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.get_index_template}".
-	 */
-	public static final Endpoint<GetIndexTemplateRequest, GetIndexTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				if (request.name() != null)
-					propsSet |= _name;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_index_template");
-					return buf.toString();
-				}
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_index_template");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.flatSettings != null) {
-					params.put("flat_settings", String.valueOf(request.flatSettings));
-				}
-				if (request.local != null) {
-					params.put("local", String.valueOf(request.local));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, GetIndexTemplateResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean flatSettings;
+
+    @Nullable
+    private final Boolean local;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final String name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetIndexTemplateRequest(Builder builder) {
+
+        this.flatSettings = builder.flatSettings;
+        this.local = builder.local;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = builder.name;
+
+    }
+
+    public static GetIndexTemplateRequest of(Function<Builder, ObjectBuilder<GetIndexTemplateRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * If true, returns settings in flat format.
+     * <p>
+     * API name: {@code flat_settings}
+     */
+    @Nullable
+    public final Boolean flatSettings() {
+        return this.flatSettings;
+    }
+
+    /**
+     * If true, the request retrieves information from the local node only. Defaults
+     * to false, which means information is retrieved from the cluster-manager node.
+     * <p>
+     * API name: {@code local}
+     */
+    @Nullable
+    public final Boolean local() {
+        return this.local;
+    }
+
+    /**
+     * Period to wait for a connection to the master node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Period to wait for a connection to the cluster-manager node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Comma-separated list of index template names used to limit the request.
+     * Wildcard (*) expressions are supported.
+     * <p>
+     * API name: {@code name}
+     */
+    @Nullable
+    public final String name() {
+        return this.name;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetIndexTemplateRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetIndexTemplateRequest> {
+        @Nullable
+        private Boolean flatSettings;
+
+        @Nullable
+        private Boolean local;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private String name;
+
+        /**
+         * If true, returns settings in flat format.
+         * <p>
+         * API name: {@code flat_settings}
+         */
+        public final Builder flatSettings(@Nullable Boolean value) {
+            this.flatSettings = value;
+            return this;
+        }
+
+        /**
+         * If true, the request retrieves information from the local node only. Defaults
+         * to false, which means information is retrieved from the cluster-manager node.
+         * <p>
+         * API name: {@code local}
+         */
+        public final Builder local(@Nullable Boolean value) {
+            this.local = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Comma-separated list of index template names used to limit the request.
+         * Wildcard (*) expressions are supported.
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(@Nullable String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetIndexTemplateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetIndexTemplateRequest build() {
+            _checkSingleUse();
+
+            return new GetIndexTemplateRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.get_index_template}".
+     */
+    public static final Endpoint<GetIndexTemplateRequest, GetIndexTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            if (request.name() != null) propsSet |= _name;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_index_template");
+                return buf.toString();
+            }
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_index_template");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.flatSettings != null) {
+                params.put("flat_settings", String.valueOf(request.flatSettings));
+            }
+            if (request.local != null) {
+                params.put("local", String.valueOf(request.local));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetIndexTemplateResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexTemplateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexTemplateResponse.java
index 3a6769d188..21b0d63c71 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexTemplateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndexTemplateResponse.java
@@ -32,135 +32,134 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch.indices.get_index_template.IndexTemplateItem;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.indices.get_index_template.IndexTemplateItem;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: indices.get_index_template.Response
 
 @JsonpDeserializable
 public class GetIndexTemplateResponse implements JsonpSerializable {
-	private final List<IndexTemplateItem> indexTemplates;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetIndexTemplateResponse(Builder builder) {
-
-		this.indexTemplates = ApiTypeHelper.unmodifiableRequired(builder.indexTemplates, this, "indexTemplates");
-
-	}
-
-	public static GetIndexTemplateResponse of(Function<Builder, ObjectBuilder<GetIndexTemplateResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code index_templates}
-	 */
-	public final List<IndexTemplateItem> indexTemplates() {
-		return this.indexTemplates;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.indexTemplates)) {
-			generator.writeKey("index_templates");
-			generator.writeStartArray();
-			for (IndexTemplateItem item0 : this.indexTemplates) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetIndexTemplateResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetIndexTemplateResponse> {
-		private List<IndexTemplateItem> indexTemplates;
-
-		/**
-		 * Required - API name: {@code index_templates}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indexTemplates</code>.
-		 */
-		public final Builder indexTemplates(List<IndexTemplateItem> list) {
-			this.indexTemplates = _listAddAll(this.indexTemplates, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index_templates}
-		 * <p>
-		 * Adds one or more values to <code>indexTemplates</code>.
-		 */
-		public final Builder indexTemplates(IndexTemplateItem value, IndexTemplateItem... values) {
-			this.indexTemplates = _listAdd(this.indexTemplates, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index_templates}
-		 * <p>
-		 * Adds a value to <code>indexTemplates</code> using a builder lambda.
-		 */
-		public final Builder indexTemplates(Function<IndexTemplateItem.Builder, ObjectBuilder<IndexTemplateItem>> fn) {
-			return indexTemplates(fn.apply(new IndexTemplateItem.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link GetIndexTemplateResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetIndexTemplateResponse build() {
-			_checkSingleUse();
-
-			return new GetIndexTemplateResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetIndexTemplateResponse}
-	 */
-	public static final JsonpDeserializer<GetIndexTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GetIndexTemplateResponse::setupGetIndexTemplateResponseDeserializer);
-
-	protected static void setupGetIndexTemplateResponseDeserializer(
-			ObjectDeserializer<GetIndexTemplateResponse.Builder> op) {
-
-		op.add(Builder::indexTemplates, JsonpDeserializer.arrayDeserializer(IndexTemplateItem._DESERIALIZER),
-				"index_templates");
-
-	}
+    private final List<IndexTemplateItem> indexTemplates;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetIndexTemplateResponse(Builder builder) {
+
+        this.indexTemplates = ApiTypeHelper.unmodifiableRequired(builder.indexTemplates, this, "indexTemplates");
+
+    }
+
+    public static GetIndexTemplateResponse of(Function<Builder, ObjectBuilder<GetIndexTemplateResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code index_templates}
+     */
+    public final List<IndexTemplateItem> indexTemplates() {
+        return this.indexTemplates;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.indexTemplates)) {
+            generator.writeKey("index_templates");
+            generator.writeStartArray();
+            for (IndexTemplateItem item0 : this.indexTemplates) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetIndexTemplateResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetIndexTemplateResponse> {
+        private List<IndexTemplateItem> indexTemplates;
+
+        /**
+         * Required - API name: {@code index_templates}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indexTemplates</code>.
+         */
+        public final Builder indexTemplates(List<IndexTemplateItem> list) {
+            this.indexTemplates = _listAddAll(this.indexTemplates, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index_templates}
+         * <p>
+         * Adds one or more values to <code>indexTemplates</code>.
+         */
+        public final Builder indexTemplates(IndexTemplateItem value, IndexTemplateItem... values) {
+            this.indexTemplates = _listAdd(this.indexTemplates, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index_templates}
+         * <p>
+         * Adds a value to <code>indexTemplates</code> using a builder lambda.
+         */
+        public final Builder indexTemplates(Function<IndexTemplateItem.Builder, ObjectBuilder<IndexTemplateItem>> fn) {
+            return indexTemplates(fn.apply(new IndexTemplateItem.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link GetIndexTemplateResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetIndexTemplateResponse build() {
+            _checkSingleUse();
+
+            return new GetIndexTemplateResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetIndexTemplateResponse}
+     */
+    public static final JsonpDeserializer<GetIndexTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetIndexTemplateResponse::setupGetIndexTemplateResponseDeserializer
+    );
+
+    protected static void setupGetIndexTemplateResponseDeserializer(ObjectDeserializer<GetIndexTemplateResponse.Builder> op) {
+
+        op.add(Builder::indexTemplates, JsonpDeserializer.arrayDeserializer(IndexTemplateItem._DESERIALIZER), "index_templates");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsRequest.java
index df4c0b2feb..d19083af7d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -42,482 +48,475 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.get_settings.Request
 
 /**
  * Returns settings for one or more indices.
- * 
+ *
  */
 
 public class GetIndicesSettingsRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean flatSettings;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	@Nullable
-	private final Boolean includeDefaults;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Boolean local;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final List<String> name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetIndicesSettingsRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.flatSettings = builder.flatSettings;
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.includeDefaults = builder.includeDefaults;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.local = builder.local;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = ApiTypeHelper.unmodifiable(builder.name);
-
-	}
-
-	public static GetIndicesSettingsRequest of(Function<Builder, ObjectBuilder<GetIndicesSettingsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Return settings in flat format (default: false)
-	 * <p>
-	 * API name: {@code flat_settings}
-	 */
-	@Nullable
-	public final Boolean flatSettings() {
-		return this.flatSettings;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * Whether to return all default setting for each of the indices.
-	 * <p>
-	 * API name: {@code include_defaults}
-	 */
-	@Nullable
-	public final Boolean includeDefaults() {
-		return this.includeDefaults;
-	}
-
-	/**
-	 * A comma-separated list of index names; use <code>_all</code> or empty string
-	 * to perform the operation on all indices
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Return local information, do not retrieve the state from cluster-manager node
-	 * (default: false)
-	 * <p>
-	 * API name: {@code local}
-	 */
-	@Nullable
-	public final Boolean local() {
-		return this.local;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * The name of the settings that should be included
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final List<String> name() {
-		return this.name;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetIndicesSettingsRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetIndicesSettingsRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean flatSettings;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private Boolean includeDefaults;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private Boolean local;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private List<String> name;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Return settings in flat format (default: false)
-		 * <p>
-		 * API name: {@code flat_settings}
-		 */
-		public final Builder flatSettings(@Nullable Boolean value) {
-			this.flatSettings = value;
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Whether to return all default setting for each of the indices.
-		 * <p>
-		 * API name: {@code include_defaults}
-		 */
-		public final Builder includeDefaults(@Nullable Boolean value) {
-			this.includeDefaults = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Return local information, do not retrieve the state from cluster-manager node
-		 * (default: false)
-		 * <p>
-		 * API name: {@code local}
-		 */
-		public final Builder local(@Nullable Boolean value) {
-			this.local = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * The name of the settings that should be included
-		 * <p>
-		 * API name: {@code name}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>name</code>.
-		 */
-		public final Builder name(List<String> list) {
-			this.name = _listAddAll(this.name, list);
-			return this;
-		}
-
-		/**
-		 * The name of the settings that should be included
-		 * <p>
-		 * API name: {@code name}
-		 * <p>
-		 * Adds one or more values to <code>name</code>.
-		 */
-		public final Builder name(String value, String... values) {
-			this.name = _listAdd(this.name, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetIndicesSettingsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetIndicesSettingsRequest build() {
-			_checkSingleUse();
-
-			return new GetIndicesSettingsRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.get_settings}".
-	 */
-	public static final Endpoint<GetIndicesSettingsRequest, GetIndicesSettingsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-				final int _index = 1 << 1;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.name()))
-					propsSet |= _name;
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_settings");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).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);
-					buf.append("/_settings");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).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);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				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(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.includeDefaults != null) {
-					params.put("include_defaults", String.valueOf(request.includeDefaults));
-				}
-				if (request.local != null) {
-					params.put("local", String.valueOf(request.local));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, GetIndicesSettingsResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean flatSettings;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    @Nullable
+    private final Boolean includeDefaults;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Boolean local;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final List<String> name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetIndicesSettingsRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.flatSettings = builder.flatSettings;
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.includeDefaults = builder.includeDefaults;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.local = builder.local;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = ApiTypeHelper.unmodifiable(builder.name);
+
+    }
+
+    public static GetIndicesSettingsRequest of(Function<Builder, ObjectBuilder<GetIndicesSettingsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Return settings in flat format (default: false)
+     * <p>
+     * API name: {@code flat_settings}
+     */
+    @Nullable
+    public final Boolean flatSettings() {
+        return this.flatSettings;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * Whether to return all default setting for each of the indices.
+     * <p>
+     * API name: {@code include_defaults}
+     */
+    @Nullable
+    public final Boolean includeDefaults() {
+        return this.includeDefaults;
+    }
+
+    /**
+     * A comma-separated list of index names; use <code>_all</code> or empty string
+     * to perform the operation on all indices
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Return local information, do not retrieve the state from cluster-manager node
+     * (default: false)
+     * <p>
+     * API name: {@code local}
+     */
+    @Nullable
+    public final Boolean local() {
+        return this.local;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * The name of the settings that should be included
+     * <p>
+     * API name: {@code name}
+     */
+    public final List<String> name() {
+        return this.name;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetIndicesSettingsRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetIndicesSettingsRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean flatSettings;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private Boolean includeDefaults;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private Boolean local;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private List<String> name;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Return settings in flat format (default: false)
+         * <p>
+         * API name: {@code flat_settings}
+         */
+        public final Builder flatSettings(@Nullable Boolean value) {
+            this.flatSettings = value;
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Whether to return all default setting for each of the indices.
+         * <p>
+         * API name: {@code include_defaults}
+         */
+        public final Builder includeDefaults(@Nullable Boolean value) {
+            this.includeDefaults = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Return local information, do not retrieve the state from cluster-manager node
+         * (default: false)
+         * <p>
+         * API name: {@code local}
+         */
+        public final Builder local(@Nullable Boolean value) {
+            this.local = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * The name of the settings that should be included
+         * <p>
+         * API name: {@code name}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>name</code>.
+         */
+        public final Builder name(List<String> list) {
+            this.name = _listAddAll(this.name, list);
+            return this;
+        }
+
+        /**
+         * The name of the settings that should be included
+         * <p>
+         * API name: {@code name}
+         * <p>
+         * Adds one or more values to <code>name</code>.
+         */
+        public final Builder name(String value, String... values) {
+            this.name = _listAdd(this.name, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetIndicesSettingsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetIndicesSettingsRequest build() {
+            _checkSingleUse();
+
+            return new GetIndicesSettingsRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.get_settings}".
+     */
+    public static final Endpoint<GetIndicesSettingsRequest, GetIndicesSettingsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+            final int _index = 1 << 1;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.name())) propsSet |= _name;
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_settings");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).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);
+                buf.append("/_settings");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).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);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            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(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.includeDefaults != null) {
+                params.put("include_defaults", String.valueOf(request.includeDefaults));
+            }
+            if (request.local != null) {
+                params.put("local", String.valueOf(request.local));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetIndicesSettingsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsResponse.java
index 1c45ecea1b..88528509e1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetIndicesSettingsResponse.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
@@ -39,65 +40,63 @@
 import org.opensearch.client.transport.endpoints.DictionaryResponse;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.get_settings.Response
 
 @JsonpDeserializable
 public class GetIndicesSettingsResponse extends DictionaryResponse<String, IndexState> {
-	// ---------------------------------------------------------------------------------------------
-
-	private GetIndicesSettingsResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static GetIndicesSettingsResponse of(Function<Builder, ObjectBuilder<GetIndicesSettingsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetIndicesSettingsResponse}.
-	 */
-
-	public static class Builder extends DictionaryResponse.AbstractBuilder<String, IndexState, Builder>
-			implements
-				ObjectBuilder<GetIndicesSettingsResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetIndicesSettingsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetIndicesSettingsResponse build() {
-			_checkSingleUse();
-			super.tKeySerializer(null);
-			super.tValueSerializer(null);
-
-			return new GetIndicesSettingsResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetIndicesSettingsResponse}
-	 */
-	public static final JsonpDeserializer<GetIndicesSettingsResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GetIndicesSettingsResponse::setupGetIndicesSettingsResponseDeserializer);
-
-	protected static void setupGetIndicesSettingsResponseDeserializer(
-			ObjectDeserializer<GetIndicesSettingsResponse.Builder> op) {
-		DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(),
-				IndexState._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private GetIndicesSettingsResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static GetIndicesSettingsResponse of(Function<Builder, ObjectBuilder<GetIndicesSettingsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetIndicesSettingsResponse}.
+     */
+
+    public static class Builder extends DictionaryResponse.AbstractBuilder<String, IndexState, Builder>
+        implements
+            ObjectBuilder<GetIndicesSettingsResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetIndicesSettingsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetIndicesSettingsResponse build() {
+            _checkSingleUse();
+            super.tKeySerializer(null);
+            super.tValueSerializer(null);
+
+            return new GetIndicesSettingsResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetIndicesSettingsResponse}
+     */
+    public static final JsonpDeserializer<GetIndicesSettingsResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetIndicesSettingsResponse::setupGetIndicesSettingsResponseDeserializer
+    );
+
+    protected static void setupGetIndicesSettingsResponseDeserializer(ObjectDeserializer<GetIndicesSettingsResponse.Builder> op) {
+        DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(), IndexState._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetMappingRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetMappingRequest.java
index a2133d1463..86dad6e8e4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetMappingRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetMappingRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -42,361 +48,355 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.get_mapping.Request
 
 /**
  * Returns mappings for one or more indices.
- * 
+ *
  */
 
 public class GetMappingRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Boolean local;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetMappingRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.local = builder.local;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-
-	}
-
-	public static GetMappingRequest of(Function<Builder, ObjectBuilder<GetMappingRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * A comma-separated list of index names
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Return local information, do not retrieve the state from cluster-manager node
-	 * (default: false)
-	 * <p>
-	 * API name: {@code local}
-	 */
-	@Nullable
-	public final Boolean local() {
-		return this.local;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetMappingRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetMappingRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private Boolean local;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Return local information, do not retrieve the state from cluster-manager node
-		 * (default: false)
-		 * <p>
-		 * API name: {@code local}
-		 */
-		public final Builder local(@Nullable Boolean value) {
-			this.local = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link GetMappingRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetMappingRequest build() {
-			_checkSingleUse();
-
-			return new GetMappingRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.get_mapping}".
-	 */
-	public static final Endpoint<GetMappingRequest, GetMappingResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_mapping");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_mapping");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.local != null) {
-					params.put("local", String.valueOf(request.local));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, GetMappingResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Boolean local;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetMappingRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.local = builder.local;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+
+    }
+
+    public static GetMappingRequest of(Function<Builder, ObjectBuilder<GetMappingRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * A comma-separated list of index names
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Return local information, do not retrieve the state from cluster-manager node
+     * (default: false)
+     * <p>
+     * API name: {@code local}
+     */
+    @Nullable
+    public final Boolean local() {
+        return this.local;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetMappingRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetMappingRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private Boolean local;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Return local information, do not retrieve the state from cluster-manager node
+         * (default: false)
+         * <p>
+         * API name: {@code local}
+         */
+        public final Builder local(@Nullable Boolean value) {
+            this.local = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link GetMappingRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetMappingRequest build() {
+            _checkSingleUse();
+
+            return new GetMappingRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.get_mapping}".
+     */
+    public static final Endpoint<GetMappingRequest, GetMappingResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_mapping");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_mapping");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.local != null) {
+                params.put("local", String.valueOf(request.local));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetMappingResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetMappingResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetMappingResponse.java
index 3a4aa18869..0f36d4121e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetMappingResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetMappingResponse.java
@@ -32,72 +32,76 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch.indices.get_mapping.IndexMappingRecord;
+import java.util.function.Function;
 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.indices.get_mapping.IndexMappingRecord;
 import org.opensearch.client.transport.endpoints.DictionaryResponse;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.get_mapping.Response
 
 @JsonpDeserializable
 public class GetMappingResponse extends DictionaryResponse<String, IndexMappingRecord> {
-	// ---------------------------------------------------------------------------------------------
-
-	private GetMappingResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static GetMappingResponse of(Function<Builder, ObjectBuilder<GetMappingResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetMappingResponse}.
-	 */
-
-	public static class Builder extends DictionaryResponse.AbstractBuilder<String, IndexMappingRecord, Builder>
-			implements
-				ObjectBuilder<GetMappingResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetMappingResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetMappingResponse build() {
-			_checkSingleUse();
-			super.tKeySerializer(null);
-			super.tValueSerializer(null);
-
-			return new GetMappingResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetMappingResponse}
-	 */
-	public static final JsonpDeserializer<GetMappingResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GetMappingResponse::setupGetMappingResponseDeserializer);
-
-	protected static void setupGetMappingResponseDeserializer(ObjectDeserializer<GetMappingResponse.Builder> op) {
-		DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(),
-				IndexMappingRecord._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private GetMappingResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static GetMappingResponse of(Function<Builder, ObjectBuilder<GetMappingResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetMappingResponse}.
+     */
+
+    public static class Builder extends DictionaryResponse.AbstractBuilder<String, IndexMappingRecord, Builder>
+        implements
+            ObjectBuilder<GetMappingResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetMappingResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetMappingResponse build() {
+            _checkSingleUse();
+            super.tKeySerializer(null);
+            super.tValueSerializer(null);
+
+            return new GetMappingResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetMappingResponse}
+     */
+    public static final JsonpDeserializer<GetMappingResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetMappingResponse::setupGetMappingResponseDeserializer
+    );
+
+    protected static void setupGetMappingResponseDeserializer(ObjectDeserializer<GetMappingResponse.Builder> op) {
+        DictionaryResponse.setupDictionaryResponseDeserializer(
+            op,
+            JsonpDeserializer.stringDeserializer(),
+            IndexMappingRecord._DESERIALIZER
+        );
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetTemplateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetTemplateRequest.java
index d83b27c74b..fffb7b92ce 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetTemplateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetTemplateRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,278 +47,274 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.get_template.Request
 
 /**
  * Returns an index template.
- * 
+ *
  */
 
 public class GetTemplateRequest extends RequestBase {
-	@Nullable
-	private final Boolean flatSettings;
-
-	@Nullable
-	private final Boolean local;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final List<String> name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetTemplateRequest(Builder builder) {
-
-		this.flatSettings = builder.flatSettings;
-		this.local = builder.local;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = ApiTypeHelper.unmodifiable(builder.name);
-
-	}
-
-	public static GetTemplateRequest of(Function<Builder, ObjectBuilder<GetTemplateRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Return settings in flat format (default: false)
-	 * <p>
-	 * API name: {@code flat_settings}
-	 */
-	@Nullable
-	public final Boolean flatSettings() {
-		return this.flatSettings;
-	}
-
-	/**
-	 * Return local information, do not retrieve the state from cluster-manager node
-	 * (default: false)
-	 * <p>
-	 * API name: {@code local}
-	 */
-	@Nullable
-	public final Boolean local() {
-		return this.local;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to master node
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to cluster-manager node
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * The comma separated names of the index templates
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final List<String> name() {
-		return this.name;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetTemplateRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetTemplateRequest> {
-		@Nullable
-		private Boolean flatSettings;
-
-		@Nullable
-		private Boolean local;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private List<String> name;
-
-		/**
-		 * Return settings in flat format (default: false)
-		 * <p>
-		 * API name: {@code flat_settings}
-		 */
-		public final Builder flatSettings(@Nullable Boolean value) {
-			this.flatSettings = value;
-			return this;
-		}
-
-		/**
-		 * Return local information, do not retrieve the state from cluster-manager node
-		 * (default: false)
-		 * <p>
-		 * API name: {@code local}
-		 */
-		public final Builder local(@Nullable Boolean value) {
-			this.local = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * The comma separated names of the index templates
-		 * <p>
-		 * API name: {@code name}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>name</code>.
-		 */
-		public final Builder name(List<String> list) {
-			this.name = _listAddAll(this.name, list);
-			return this;
-		}
-
-		/**
-		 * The comma separated names of the index templates
-		 * <p>
-		 * API name: {@code name}
-		 * <p>
-		 * Adds one or more values to <code>name</code>.
-		 */
-		public final Builder name(String value, String... values) {
-			this.name = _listAdd(this.name, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetTemplateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetTemplateRequest build() {
-			_checkSingleUse();
-
-			return new GetTemplateRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.get_template}".
-	 */
-	public static final Endpoint<GetTemplateRequest, GetTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.name()))
-					propsSet |= _name;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_template");
-					return buf.toString();
-				}
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_template");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.flatSettings != null) {
-					params.put("flat_settings", String.valueOf(request.flatSettings));
-				}
-				if (request.local != null) {
-					params.put("local", String.valueOf(request.local));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, GetTemplateResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean flatSettings;
+
+    @Nullable
+    private final Boolean local;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final List<String> name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetTemplateRequest(Builder builder) {
+
+        this.flatSettings = builder.flatSettings;
+        this.local = builder.local;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = ApiTypeHelper.unmodifiable(builder.name);
+
+    }
+
+    public static GetTemplateRequest of(Function<Builder, ObjectBuilder<GetTemplateRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Return settings in flat format (default: false)
+     * <p>
+     * API name: {@code flat_settings}
+     */
+    @Nullable
+    public final Boolean flatSettings() {
+        return this.flatSettings;
+    }
+
+    /**
+     * Return local information, do not retrieve the state from cluster-manager node
+     * (default: false)
+     * <p>
+     * API name: {@code local}
+     */
+    @Nullable
+    public final Boolean local() {
+        return this.local;
+    }
+
+    /**
+     * Explicit operation timeout for connection to master node
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Explicit operation timeout for connection to cluster-manager node
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * The comma separated names of the index templates
+     * <p>
+     * API name: {@code name}
+     */
+    public final List<String> name() {
+        return this.name;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetTemplateRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetTemplateRequest> {
+        @Nullable
+        private Boolean flatSettings;
+
+        @Nullable
+        private Boolean local;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private List<String> name;
+
+        /**
+         * Return settings in flat format (default: false)
+         * <p>
+         * API name: {@code flat_settings}
+         */
+        public final Builder flatSettings(@Nullable Boolean value) {
+            this.flatSettings = value;
+            return this;
+        }
+
+        /**
+         * Return local information, do not retrieve the state from cluster-manager node
+         * (default: false)
+         * <p>
+         * API name: {@code local}
+         */
+        public final Builder local(@Nullable Boolean value) {
+            this.local = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * The comma separated names of the index templates
+         * <p>
+         * API name: {@code name}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>name</code>.
+         */
+        public final Builder name(List<String> list) {
+            this.name = _listAddAll(this.name, list);
+            return this;
+        }
+
+        /**
+         * The comma separated names of the index templates
+         * <p>
+         * API name: {@code name}
+         * <p>
+         * Adds one or more values to <code>name</code>.
+         */
+        public final Builder name(String value, String... values) {
+            this.name = _listAdd(this.name, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetTemplateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetTemplateRequest build() {
+            _checkSingleUse();
+
+            return new GetTemplateRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.get_template}".
+     */
+    public static final Endpoint<GetTemplateRequest, GetTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.name())) propsSet |= _name;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_template");
+                return buf.toString();
+            }
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_template");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.flatSettings != null) {
+                params.put("flat_settings", String.valueOf(request.flatSettings));
+            }
+            if (request.local != null) {
+                params.put("local", String.valueOf(request.local));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetTemplateResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetTemplateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetTemplateResponse.java
index 6d6b35e485..590cb1a696 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetTemplateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetTemplateResponse.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
@@ -39,64 +40,63 @@
 import org.opensearch.client.transport.endpoints.DictionaryResponse;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.get_template.Response
 
 @JsonpDeserializable
 public class GetTemplateResponse extends DictionaryResponse<String, TemplateMapping> {
-	// ---------------------------------------------------------------------------------------------
-
-	private GetTemplateResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static GetTemplateResponse of(Function<Builder, ObjectBuilder<GetTemplateResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetTemplateResponse}.
-	 */
-
-	public static class Builder extends DictionaryResponse.AbstractBuilder<String, TemplateMapping, Builder>
-			implements
-				ObjectBuilder<GetTemplateResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetTemplateResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetTemplateResponse build() {
-			_checkSingleUse();
-			super.tKeySerializer(null);
-			super.tValueSerializer(null);
-
-			return new GetTemplateResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetTemplateResponse}
-	 */
-	public static final JsonpDeserializer<GetTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GetTemplateResponse::setupGetTemplateResponseDeserializer);
-
-	protected static void setupGetTemplateResponseDeserializer(ObjectDeserializer<GetTemplateResponse.Builder> op) {
-		DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(),
-				TemplateMapping._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private GetTemplateResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static GetTemplateResponse of(Function<Builder, ObjectBuilder<GetTemplateResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetTemplateResponse}.
+     */
+
+    public static class Builder extends DictionaryResponse.AbstractBuilder<String, TemplateMapping, Builder>
+        implements
+            ObjectBuilder<GetTemplateResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetTemplateResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetTemplateResponse build() {
+            _checkSingleUse();
+            super.tKeySerializer(null);
+            super.tValueSerializer(null);
+
+            return new GetTemplateResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetTemplateResponse}
+     */
+    public static final JsonpDeserializer<GetTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetTemplateResponse::setupGetTemplateResponseDeserializer
+    );
+
+    protected static void setupGetTemplateResponseDeserializer(ObjectDeserializer<GetTemplateResponse.Builder> op) {
+        DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(), TemplateMapping._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetUpgradeRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetUpgradeRequest.java
index 62ee10e441..31c8497f7b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetUpgradeRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetUpgradeRequest.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.Collections;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -39,119 +42,118 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.Collections;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: indices.get_upgrade.Request
 
 /**
  * DEPRECATED Returns a progress status of current upgrade.
- * 
+ *
  */
 
 public class GetUpgradeRequest extends RequestBase {
-	@Nullable
-	private final String index;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetUpgradeRequest(Builder builder) {
-
-		this.index = builder.index;
-
-	}
-
-	public static GetUpgradeRequest of(Function<Builder, ObjectBuilder<GetUpgradeRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * A comma-separated list of index names; use <code>_all</code> or empty string
-	 * to perform the operation on all indices
-	 * <p>
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetUpgradeRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetUpgradeRequest> {
-		@Nullable
-		private String index;
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetUpgradeRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetUpgradeRequest build() {
-			_checkSingleUse();
-
-			return new GetUpgradeRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.get_upgrade}".
-	 */
-	public static final Endpoint<GetUpgradeRequest, GetUpgradeResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (request.index() != null)
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_upgrade");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_upgrade");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
-
-			}, SimpleEndpoint.emptyMap(), false, GetUpgradeResponse._DESERIALIZER);
+    @Nullable
+    private final String index;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetUpgradeRequest(Builder builder) {
+
+        this.index = builder.index;
+
+    }
+
+    public static GetUpgradeRequest of(Function<Builder, ObjectBuilder<GetUpgradeRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * A comma-separated list of index names; use <code>_all</code> or empty string
+     * to perform the operation on all indices
+     * <p>
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetUpgradeRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetUpgradeRequest> {
+        @Nullable
+        private String index;
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetUpgradeRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetUpgradeRequest build() {
+            _checkSingleUse();
+
+            return new GetUpgradeRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.get_upgrade}".
+     */
+    public static final Endpoint<GetUpgradeRequest, GetUpgradeResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (request.index() != null) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_upgrade");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_upgrade");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetUpgradeResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetUpgradeResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetUpgradeResponse.java
index 8298e6d565..0c11d1452d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetUpgradeResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/GetUpgradeResponse.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,180 +45,175 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.get_upgrade.Response
 
 @JsonpDeserializable
 public class GetUpgradeResponse implements JsonpSerializable {
-	private final List<OverlappingIndexTemplate> overlapping;
-
-	@Nullable
-	private final TemplateMapping template;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetUpgradeResponse(Builder builder) {
-
-		this.overlapping = ApiTypeHelper.unmodifiable(builder.overlapping);
-		this.template = builder.template;
-
-	}
-
-	public static GetUpgradeResponse of(Function<Builder, ObjectBuilder<GetUpgradeResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Any templates that were superseded by the specified template.
-	 * <p>
-	 * API name: {@code overlapping}
-	 */
-	public final List<OverlappingIndexTemplate> overlapping() {
-		return this.overlapping;
-	}
-
-	/**
-	 * The settings, mappings, and aliases that would be applied to matching
-	 * indices.
-	 * <p>
-	 * API name: {@code template}
-	 */
-	@Nullable
-	public final TemplateMapping template() {
-		return this.template;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.overlapping)) {
-			generator.writeKey("overlapping");
-			generator.writeStartArray();
-			for (OverlappingIndexTemplate item0 : this.overlapping) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.template != null) {
-			generator.writeKey("template");
-			this.template.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetUpgradeResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetUpgradeResponse> {
-		@Nullable
-		private List<OverlappingIndexTemplate> overlapping;
-
-		@Nullable
-		private TemplateMapping template;
-
-		/**
-		 * Any templates that were superseded by the specified template.
-		 * <p>
-		 * API name: {@code overlapping}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>overlapping</code>.
-		 */
-		public final Builder overlapping(List<OverlappingIndexTemplate> list) {
-			this.overlapping = _listAddAll(this.overlapping, list);
-			return this;
-		}
-
-		/**
-		 * Any templates that were superseded by the specified template.
-		 * <p>
-		 * API name: {@code overlapping}
-		 * <p>
-		 * Adds one or more values to <code>overlapping</code>.
-		 */
-		public final Builder overlapping(OverlappingIndexTemplate value, OverlappingIndexTemplate... values) {
-			this.overlapping = _listAdd(this.overlapping, value, values);
-			return this;
-		}
-
-		/**
-		 * Any templates that were superseded by the specified template.
-		 * <p>
-		 * API name: {@code overlapping}
-		 * <p>
-		 * Adds a value to <code>overlapping</code> using a builder lambda.
-		 */
-		public final Builder overlapping(
-				Function<OverlappingIndexTemplate.Builder, ObjectBuilder<OverlappingIndexTemplate>> fn) {
-			return overlapping(fn.apply(new OverlappingIndexTemplate.Builder()).build());
-		}
-
-		/**
-		 * The settings, mappings, and aliases that would be applied to matching
-		 * indices.
-		 * <p>
-		 * API name: {@code template}
-		 */
-		public final Builder template(@Nullable TemplateMapping value) {
-			this.template = value;
-			return this;
-		}
-
-		/**
-		 * The settings, mappings, and aliases that would be applied to matching
-		 * indices.
-		 * <p>
-		 * API name: {@code template}
-		 */
-		public final Builder template(Function<TemplateMapping.Builder, ObjectBuilder<TemplateMapping>> fn) {
-			return this.template(fn.apply(new TemplateMapping.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link GetUpgradeResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetUpgradeResponse build() {
-			_checkSingleUse();
-
-			return new GetUpgradeResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetUpgradeResponse}
-	 */
-	public static final JsonpDeserializer<GetUpgradeResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GetUpgradeResponse::setupGetUpgradeResponseDeserializer);
-
-	protected static void setupGetUpgradeResponseDeserializer(ObjectDeserializer<GetUpgradeResponse.Builder> op) {
-
-		op.add(Builder::overlapping, JsonpDeserializer.arrayDeserializer(OverlappingIndexTemplate._DESERIALIZER),
-				"overlapping");
-		op.add(Builder::template, TemplateMapping._DESERIALIZER, "template");
-
-	}
+    private final List<OverlappingIndexTemplate> overlapping;
+
+    @Nullable
+    private final TemplateMapping template;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetUpgradeResponse(Builder builder) {
+
+        this.overlapping = ApiTypeHelper.unmodifiable(builder.overlapping);
+        this.template = builder.template;
+
+    }
+
+    public static GetUpgradeResponse of(Function<Builder, ObjectBuilder<GetUpgradeResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Any templates that were superseded by the specified template.
+     * <p>
+     * API name: {@code overlapping}
+     */
+    public final List<OverlappingIndexTemplate> overlapping() {
+        return this.overlapping;
+    }
+
+    /**
+     * The settings, mappings, and aliases that would be applied to matching
+     * indices.
+     * <p>
+     * API name: {@code template}
+     */
+    @Nullable
+    public final TemplateMapping template() {
+        return this.template;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.overlapping)) {
+            generator.writeKey("overlapping");
+            generator.writeStartArray();
+            for (OverlappingIndexTemplate item0 : this.overlapping) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.template != null) {
+            generator.writeKey("template");
+            this.template.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetUpgradeResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetUpgradeResponse> {
+        @Nullable
+        private List<OverlappingIndexTemplate> overlapping;
+
+        @Nullable
+        private TemplateMapping template;
+
+        /**
+         * Any templates that were superseded by the specified template.
+         * <p>
+         * API name: {@code overlapping}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>overlapping</code>.
+         */
+        public final Builder overlapping(List<OverlappingIndexTemplate> list) {
+            this.overlapping = _listAddAll(this.overlapping, list);
+            return this;
+        }
+
+        /**
+         * Any templates that were superseded by the specified template.
+         * <p>
+         * API name: {@code overlapping}
+         * <p>
+         * Adds one or more values to <code>overlapping</code>.
+         */
+        public final Builder overlapping(OverlappingIndexTemplate value, OverlappingIndexTemplate... values) {
+            this.overlapping = _listAdd(this.overlapping, value, values);
+            return this;
+        }
+
+        /**
+         * Any templates that were superseded by the specified template.
+         * <p>
+         * API name: {@code overlapping}
+         * <p>
+         * Adds a value to <code>overlapping</code> using a builder lambda.
+         */
+        public final Builder overlapping(Function<OverlappingIndexTemplate.Builder, ObjectBuilder<OverlappingIndexTemplate>> fn) {
+            return overlapping(fn.apply(new OverlappingIndexTemplate.Builder()).build());
+        }
+
+        /**
+         * The settings, mappings, and aliases that would be applied to matching
+         * indices.
+         * <p>
+         * API name: {@code template}
+         */
+        public final Builder template(@Nullable TemplateMapping value) {
+            this.template = value;
+            return this;
+        }
+
+        /**
+         * The settings, mappings, and aliases that would be applied to matching
+         * indices.
+         * <p>
+         * API name: {@code template}
+         */
+        public final Builder template(Function<TemplateMapping.Builder, ObjectBuilder<TemplateMapping>> fn) {
+            return this.template(fn.apply(new TemplateMapping.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link GetUpgradeResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetUpgradeResponse build() {
+            _checkSingleUse();
+
+            return new GetUpgradeResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetUpgradeResponse}
+     */
+    public static final JsonpDeserializer<GetUpgradeResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetUpgradeResponse::setupGetUpgradeResponseDeserializer
+    );
+
+    protected static void setupGetUpgradeResponseDeserializer(ObjectDeserializer<GetUpgradeResponse.Builder> op) {
+
+        op.add(Builder::overlapping, JsonpDeserializer.arrayDeserializer(OverlappingIndexTemplate._DESERIALIZER), "overlapping");
+        op.add(Builder::template, TemplateMapping._DESERIALIZER, "template");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexCheckOnStartup.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexCheckOnStartup.java
index bb8467c71e..9bb217fad3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexCheckOnStartup.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexCheckOnStartup.java
@@ -35,27 +35,27 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum IndexCheckOnStartup implements JsonEnum {
-	False("false"),
+    False("false"),
 
-	Checksum("checksum"),
+    Checksum("checksum"),
 
-	True("true"),
+    True("true"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	IndexCheckOnStartup(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    IndexCheckOnStartup(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<IndexCheckOnStartup> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			IndexCheckOnStartup.values());
+    public static final JsonEnum.Deserializer<IndexCheckOnStartup> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        IndexCheckOnStartup.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRouting.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRouting.java
index d91078db83..99d9897cdc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRouting.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRouting.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,146 +43,141 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices._types.IndexRouting
 
-
 @JsonpDeserializable
 public class IndexRouting implements JsonpSerializable {
-	@Nullable
-	private final IndexRoutingAllocation allocation;
-
-	@Nullable
-	private final IndexRoutingRebalance rebalance;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexRouting(Builder builder) {
-
-		this.allocation = builder.allocation;
-		this.rebalance = builder.rebalance;
-
-	}
-
-	public static IndexRouting of(Function<Builder, ObjectBuilder<IndexRouting>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code allocation}
-	 */
-	@Nullable
-	public final IndexRoutingAllocation allocation() {
-		return this.allocation;
-	}
-
-	/**
-	 * API name: {@code rebalance}
-	 */
-	@Nullable
-	public final IndexRoutingRebalance rebalance() {
-		return this.rebalance;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.allocation != null) {
-			generator.writeKey("allocation");
-			this.allocation.serialize(generator, mapper);
-
-		}
-		if (this.rebalance != null) {
-			generator.writeKey("rebalance");
-			this.rebalance.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexRouting}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexRouting> {
-		@Nullable
-		private IndexRoutingAllocation allocation;
-
-		@Nullable
-		private IndexRoutingRebalance rebalance;
-
-		/**
-		 * API name: {@code allocation}
-		 */
-		public final Builder allocation(@Nullable IndexRoutingAllocation value) {
-			this.allocation = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code allocation}
-		 */
-		public final Builder allocation(
-				Function<IndexRoutingAllocation.Builder, ObjectBuilder<IndexRoutingAllocation>> fn) {
-			return this.allocation(fn.apply(new IndexRoutingAllocation.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code rebalance}
-		 */
-		public final Builder rebalance(@Nullable IndexRoutingRebalance value) {
-			this.rebalance = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code rebalance}
-		 */
-		public final Builder rebalance(
-				Function<IndexRoutingRebalance.Builder, ObjectBuilder<IndexRoutingRebalance>> fn) {
-			return this.rebalance(fn.apply(new IndexRoutingRebalance.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link IndexRouting}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexRouting build() {
-			_checkSingleUse();
-
-			return new IndexRouting(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndexRouting}
-	 */
-	public static final JsonpDeserializer<IndexRouting> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IndexRouting::setupIndexRoutingDeserializer);
-
-	protected static void setupIndexRoutingDeserializer(ObjectDeserializer<IndexRouting.Builder> op) {
-
-		op.add(Builder::allocation, IndexRoutingAllocation._DESERIALIZER, "allocation");
-		op.add(Builder::rebalance, IndexRoutingRebalance._DESERIALIZER, "rebalance");
-
-	}
+    @Nullable
+    private final IndexRoutingAllocation allocation;
+
+    @Nullable
+    private final IndexRoutingRebalance rebalance;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexRouting(Builder builder) {
+
+        this.allocation = builder.allocation;
+        this.rebalance = builder.rebalance;
+
+    }
+
+    public static IndexRouting of(Function<Builder, ObjectBuilder<IndexRouting>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code allocation}
+     */
+    @Nullable
+    public final IndexRoutingAllocation allocation() {
+        return this.allocation;
+    }
+
+    /**
+     * API name: {@code rebalance}
+     */
+    @Nullable
+    public final IndexRoutingRebalance rebalance() {
+        return this.rebalance;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.allocation != null) {
+            generator.writeKey("allocation");
+            this.allocation.serialize(generator, mapper);
+
+        }
+        if (this.rebalance != null) {
+            generator.writeKey("rebalance");
+            this.rebalance.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexRouting}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexRouting> {
+        @Nullable
+        private IndexRoutingAllocation allocation;
+
+        @Nullable
+        private IndexRoutingRebalance rebalance;
+
+        /**
+         * API name: {@code allocation}
+         */
+        public final Builder allocation(@Nullable IndexRoutingAllocation value) {
+            this.allocation = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code allocation}
+         */
+        public final Builder allocation(Function<IndexRoutingAllocation.Builder, ObjectBuilder<IndexRoutingAllocation>> fn) {
+            return this.allocation(fn.apply(new IndexRoutingAllocation.Builder()).build());
+        }
+
+        /**
+         * API name: {@code rebalance}
+         */
+        public final Builder rebalance(@Nullable IndexRoutingRebalance value) {
+            this.rebalance = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code rebalance}
+         */
+        public final Builder rebalance(Function<IndexRoutingRebalance.Builder, ObjectBuilder<IndexRoutingRebalance>> fn) {
+            return this.rebalance(fn.apply(new IndexRoutingRebalance.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link IndexRouting}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexRouting build() {
+            _checkSingleUse();
+
+            return new IndexRouting(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndexRouting}
+     */
+    public static final JsonpDeserializer<IndexRouting> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexRouting::setupIndexRoutingDeserializer
+    );
+
+    protected static void setupIndexRoutingDeserializer(ObjectDeserializer<IndexRouting.Builder> op) {
+
+        op.add(Builder::allocation, IndexRoutingAllocation._DESERIALIZER, "allocation");
+        op.add(Builder::rebalance, IndexRoutingRebalance._DESERIALIZER, "rebalance");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocation.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocation.java
index d4c0589a7c..a934ce3600 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocation.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,213 +43,207 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices._types.IndexRoutingAllocation
 
-
 @JsonpDeserializable
 public class IndexRoutingAllocation implements JsonpSerializable {
-	@Nullable
-	private final IndexRoutingAllocationOptions enable;
-
-	@Nullable
-	private final IndexRoutingAllocationInclude include;
-
-	@Nullable
-	private final IndexRoutingAllocationInitialRecovery initialRecovery;
-
-	@Nullable
-	private final IndexRoutingAllocationDisk disk;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexRoutingAllocation(Builder builder) {
-
-		this.enable = builder.enable;
-		this.include = builder.include;
-		this.initialRecovery = builder.initialRecovery;
-		this.disk = builder.disk;
-
-	}
-
-	public static IndexRoutingAllocation of(Function<Builder, ObjectBuilder<IndexRoutingAllocation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code enable}
-	 */
-	@Nullable
-	public final IndexRoutingAllocationOptions enable() {
-		return this.enable;
-	}
-
-	/**
-	 * API name: {@code include}
-	 */
-	@Nullable
-	public final IndexRoutingAllocationInclude include() {
-		return this.include;
-	}
-
-	/**
-	 * API name: {@code initial_recovery}
-	 */
-	@Nullable
-	public final IndexRoutingAllocationInitialRecovery initialRecovery() {
-		return this.initialRecovery;
-	}
-
-	/**
-	 * API name: {@code disk}
-	 */
-	@Nullable
-	public final IndexRoutingAllocationDisk disk() {
-		return this.disk;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.enable != null) {
-			generator.writeKey("enable");
-			this.enable.serialize(generator, mapper);
-		}
-		if (this.include != null) {
-			generator.writeKey("include");
-			this.include.serialize(generator, mapper);
-
-		}
-		if (this.initialRecovery != null) {
-			generator.writeKey("initial_recovery");
-			this.initialRecovery.serialize(generator, mapper);
-
-		}
-		if (this.disk != null) {
-			generator.writeKey("disk");
-			this.disk.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexRoutingAllocation}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexRoutingAllocation> {
-		@Nullable
-		private IndexRoutingAllocationOptions enable;
-
-		@Nullable
-		private IndexRoutingAllocationInclude include;
-
-		@Nullable
-		private IndexRoutingAllocationInitialRecovery initialRecovery;
-
-		@Nullable
-		private IndexRoutingAllocationDisk disk;
-
-		/**
-		 * API name: {@code enable}
-		 */
-		public final Builder enable(@Nullable IndexRoutingAllocationOptions value) {
-			this.enable = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code include}
-		 */
-		public final Builder include(@Nullable IndexRoutingAllocationInclude value) {
-			this.include = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code include}
-		 */
-		public final Builder include(
-				Function<IndexRoutingAllocationInclude.Builder, ObjectBuilder<IndexRoutingAllocationInclude>> fn) {
-			return this.include(fn.apply(new IndexRoutingAllocationInclude.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code initial_recovery}
-		 */
-		public final Builder initialRecovery(@Nullable IndexRoutingAllocationInitialRecovery value) {
-			this.initialRecovery = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code initial_recovery}
-		 */
-		public final Builder initialRecovery(
-				Function<IndexRoutingAllocationInitialRecovery.Builder
-						, ObjectBuilder<IndexRoutingAllocationInitialRecovery>> fn) {
-			return this.initialRecovery(fn.apply(new IndexRoutingAllocationInitialRecovery.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code disk}
-		 */
-		public final Builder disk(@Nullable IndexRoutingAllocationDisk value) {
-			this.disk = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code disk}
-		 */
-		public final Builder disk(
-				Function<IndexRoutingAllocationDisk.Builder, ObjectBuilder<IndexRoutingAllocationDisk>> fn) {
-			return this.disk(fn.apply(new IndexRoutingAllocationDisk.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link IndexRoutingAllocation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexRoutingAllocation build() {
-			_checkSingleUse();
-
-			return new IndexRoutingAllocation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndexRoutingAllocation}
-	 */
-	public static final JsonpDeserializer<IndexRoutingAllocation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IndexRoutingAllocation::setupIndexRoutingAllocationDeserializer);
-
-	protected static void setupIndexRoutingAllocationDeserializer(
-			ObjectDeserializer<IndexRoutingAllocation.Builder> op) {
-
-		op.add(Builder::enable, IndexRoutingAllocationOptions._DESERIALIZER, "enable");
-		op.add(Builder::include, IndexRoutingAllocationInclude._DESERIALIZER, "include");
-		op.add(Builder::initialRecovery, IndexRoutingAllocationInitialRecovery._DESERIALIZER, "initial_recovery");
-		op.add(Builder::disk, IndexRoutingAllocationDisk._DESERIALIZER, "disk");
-
-	}
+    @Nullable
+    private final IndexRoutingAllocationOptions enable;
+
+    @Nullable
+    private final IndexRoutingAllocationInclude include;
+
+    @Nullable
+    private final IndexRoutingAllocationInitialRecovery initialRecovery;
+
+    @Nullable
+    private final IndexRoutingAllocationDisk disk;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexRoutingAllocation(Builder builder) {
+
+        this.enable = builder.enable;
+        this.include = builder.include;
+        this.initialRecovery = builder.initialRecovery;
+        this.disk = builder.disk;
+
+    }
+
+    public static IndexRoutingAllocation of(Function<Builder, ObjectBuilder<IndexRoutingAllocation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code enable}
+     */
+    @Nullable
+    public final IndexRoutingAllocationOptions enable() {
+        return this.enable;
+    }
+
+    /**
+     * API name: {@code include}
+     */
+    @Nullable
+    public final IndexRoutingAllocationInclude include() {
+        return this.include;
+    }
+
+    /**
+     * API name: {@code initial_recovery}
+     */
+    @Nullable
+    public final IndexRoutingAllocationInitialRecovery initialRecovery() {
+        return this.initialRecovery;
+    }
+
+    /**
+     * API name: {@code disk}
+     */
+    @Nullable
+    public final IndexRoutingAllocationDisk disk() {
+        return this.disk;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.enable != null) {
+            generator.writeKey("enable");
+            this.enable.serialize(generator, mapper);
+        }
+        if (this.include != null) {
+            generator.writeKey("include");
+            this.include.serialize(generator, mapper);
+
+        }
+        if (this.initialRecovery != null) {
+            generator.writeKey("initial_recovery");
+            this.initialRecovery.serialize(generator, mapper);
+
+        }
+        if (this.disk != null) {
+            generator.writeKey("disk");
+            this.disk.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexRoutingAllocation}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexRoutingAllocation> {
+        @Nullable
+        private IndexRoutingAllocationOptions enable;
+
+        @Nullable
+        private IndexRoutingAllocationInclude include;
+
+        @Nullable
+        private IndexRoutingAllocationInitialRecovery initialRecovery;
+
+        @Nullable
+        private IndexRoutingAllocationDisk disk;
+
+        /**
+         * API name: {@code enable}
+         */
+        public final Builder enable(@Nullable IndexRoutingAllocationOptions value) {
+            this.enable = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code include}
+         */
+        public final Builder include(@Nullable IndexRoutingAllocationInclude value) {
+            this.include = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code include}
+         */
+        public final Builder include(Function<IndexRoutingAllocationInclude.Builder, ObjectBuilder<IndexRoutingAllocationInclude>> fn) {
+            return this.include(fn.apply(new IndexRoutingAllocationInclude.Builder()).build());
+        }
+
+        /**
+         * API name: {@code initial_recovery}
+         */
+        public final Builder initialRecovery(@Nullable IndexRoutingAllocationInitialRecovery value) {
+            this.initialRecovery = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code initial_recovery}
+         */
+        public final Builder initialRecovery(
+            Function<IndexRoutingAllocationInitialRecovery.Builder, ObjectBuilder<IndexRoutingAllocationInitialRecovery>> fn
+        ) {
+            return this.initialRecovery(fn.apply(new IndexRoutingAllocationInitialRecovery.Builder()).build());
+        }
+
+        /**
+         * API name: {@code disk}
+         */
+        public final Builder disk(@Nullable IndexRoutingAllocationDisk value) {
+            this.disk = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code disk}
+         */
+        public final Builder disk(Function<IndexRoutingAllocationDisk.Builder, ObjectBuilder<IndexRoutingAllocationDisk>> fn) {
+            return this.disk(fn.apply(new IndexRoutingAllocationDisk.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link IndexRoutingAllocation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexRoutingAllocation build() {
+            _checkSingleUse();
+
+            return new IndexRoutingAllocation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndexRoutingAllocation}
+     */
+    public static final JsonpDeserializer<IndexRoutingAllocation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexRoutingAllocation::setupIndexRoutingAllocationDeserializer
+    );
+
+    protected static void setupIndexRoutingAllocationDeserializer(ObjectDeserializer<IndexRoutingAllocation.Builder> op) {
+
+        op.add(Builder::enable, IndexRoutingAllocationOptions._DESERIALIZER, "enable");
+        op.add(Builder::include, IndexRoutingAllocationInclude._DESERIALIZER, "include");
+        op.add(Builder::initialRecovery, IndexRoutingAllocationInitialRecovery._DESERIALIZER, "initial_recovery");
+        op.add(Builder::disk, IndexRoutingAllocationDisk._DESERIALIZER, "disk");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocationDisk.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocationDisk.java
index c06e5f2fd3..5a2350132a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocationDisk.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocationDisk.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,101 +43,98 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices._types.IndexRoutingAllocationDisk
 
-
 @JsonpDeserializable
 public class IndexRoutingAllocationDisk implements JsonpSerializable {
-	@Nullable
-	private final Boolean thresholdEnabled;
+    @Nullable
+    private final Boolean thresholdEnabled;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private IndexRoutingAllocationDisk(Builder builder) {
+    private IndexRoutingAllocationDisk(Builder builder) {
 
-		this.thresholdEnabled = builder.thresholdEnabled;
+        this.thresholdEnabled = builder.thresholdEnabled;
 
-	}
+    }
 
-	public static IndexRoutingAllocationDisk of(Function<Builder, ObjectBuilder<IndexRoutingAllocationDisk>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static IndexRoutingAllocationDisk of(Function<Builder, ObjectBuilder<IndexRoutingAllocationDisk>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * API name: {@code threshold_enabled}
-	 */
-	@Nullable
-	public final Boolean thresholdEnabled() {
-		return this.thresholdEnabled;
-	}
+    /**
+     * API name: {@code threshold_enabled}
+     */
+    @Nullable
+    public final Boolean thresholdEnabled() {
+        return this.thresholdEnabled;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		if (this.thresholdEnabled != null) {
-			generator.writeKey("threshold_enabled");
-			generator.write(this.thresholdEnabled);
+        if (this.thresholdEnabled != null) {
+            generator.writeKey("threshold_enabled");
+            generator.write(this.thresholdEnabled);
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link IndexRoutingAllocationDisk}.
-	 */
+    /**
+     * Builder for {@link IndexRoutingAllocationDisk}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexRoutingAllocationDisk> {
-		@Nullable
-		private Boolean thresholdEnabled;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexRoutingAllocationDisk> {
+        @Nullable
+        private Boolean thresholdEnabled;
 
-		/**
-		 * API name: {@code threshold_enabled}
-		 */
-		public final Builder thresholdEnabled(@Nullable Boolean value) {
-			this.thresholdEnabled = value;
-			return this;
-		}
+        /**
+         * API name: {@code threshold_enabled}
+         */
+        public final Builder thresholdEnabled(@Nullable Boolean value) {
+            this.thresholdEnabled = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link IndexRoutingAllocationDisk}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexRoutingAllocationDisk build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link IndexRoutingAllocationDisk}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexRoutingAllocationDisk build() {
+            _checkSingleUse();
 
-			return new IndexRoutingAllocationDisk(this);
-		}
-	}
+            return new IndexRoutingAllocationDisk(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link IndexRoutingAllocationDisk}
-	 */
-	public static final JsonpDeserializer<IndexRoutingAllocationDisk> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IndexRoutingAllocationDisk::setupIndexRoutingAllocationDiskDeserializer);
+    /**
+     * Json deserializer for {@link IndexRoutingAllocationDisk}
+     */
+    public static final JsonpDeserializer<IndexRoutingAllocationDisk> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexRoutingAllocationDisk::setupIndexRoutingAllocationDiskDeserializer
+    );
 
-	protected static void setupIndexRoutingAllocationDiskDeserializer(
-			ObjectDeserializer<IndexRoutingAllocationDisk.Builder> op) {
+    protected static void setupIndexRoutingAllocationDiskDeserializer(ObjectDeserializer<IndexRoutingAllocationDisk.Builder> op) {
 
-		op.add(Builder::thresholdEnabled, JsonpDeserializer.booleanDeserializer(), "threshold_enabled");
+        op.add(Builder::thresholdEnabled, JsonpDeserializer.booleanDeserializer(), "threshold_enabled");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocationInclude.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocationInclude.java
index 9a2d2fbc8b..36dbdbee4b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocationInclude.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocationInclude.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,130 +43,127 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices._types.IndexRoutingAllocationInclude
 
-
 @JsonpDeserializable
 public class IndexRoutingAllocationInclude implements JsonpSerializable {
-	@Nullable
-	private final String tierPreference;
-
-	@Nullable
-	private final String id;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexRoutingAllocationInclude(Builder builder) {
-
-		this.tierPreference = builder.tierPreference;
-		this.id = builder.id;
-
-	}
-
-	public static IndexRoutingAllocationInclude of(Function<Builder, ObjectBuilder<IndexRoutingAllocationInclude>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code _tier_preference}
-	 */
-	@Nullable
-	public final String tierPreference() {
-		return this.tierPreference;
-	}
-
-	/**
-	 * API name: {@code _id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.tierPreference != null) {
-			generator.writeKey("_tier_preference");
-			generator.write(this.tierPreference);
-
-		}
-		if (this.id != null) {
-			generator.writeKey("_id");
-			generator.write(this.id);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexRoutingAllocationInclude}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexRoutingAllocationInclude> {
-		@Nullable
-		private String tierPreference;
-
-		@Nullable
-		private String id;
-
-		/**
-		 * API name: {@code _tier_preference}
-		 */
-		public final Builder tierPreference(@Nullable String value) {
-			this.tierPreference = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IndexRoutingAllocationInclude}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexRoutingAllocationInclude build() {
-			_checkSingleUse();
-
-			return new IndexRoutingAllocationInclude(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndexRoutingAllocationInclude}
-	 */
-	public static final JsonpDeserializer<IndexRoutingAllocationInclude> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IndexRoutingAllocationInclude::setupIndexRoutingAllocationIncludeDeserializer);
-
-	protected static void setupIndexRoutingAllocationIncludeDeserializer(
-			ObjectDeserializer<IndexRoutingAllocationInclude.Builder> op) {
-
-		op.add(Builder::tierPreference, JsonpDeserializer.stringDeserializer(), "_tier_preference");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
-
-	}
+    @Nullable
+    private final String tierPreference;
+
+    @Nullable
+    private final String id;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexRoutingAllocationInclude(Builder builder) {
+
+        this.tierPreference = builder.tierPreference;
+        this.id = builder.id;
+
+    }
+
+    public static IndexRoutingAllocationInclude of(Function<Builder, ObjectBuilder<IndexRoutingAllocationInclude>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code _tier_preference}
+     */
+    @Nullable
+    public final String tierPreference() {
+        return this.tierPreference;
+    }
+
+    /**
+     * API name: {@code _id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.tierPreference != null) {
+            generator.writeKey("_tier_preference");
+            generator.write(this.tierPreference);
+
+        }
+        if (this.id != null) {
+            generator.writeKey("_id");
+            generator.write(this.id);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexRoutingAllocationInclude}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexRoutingAllocationInclude> {
+        @Nullable
+        private String tierPreference;
+
+        @Nullable
+        private String id;
+
+        /**
+         * API name: {@code _tier_preference}
+         */
+        public final Builder tierPreference(@Nullable String value) {
+            this.tierPreference = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link IndexRoutingAllocationInclude}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexRoutingAllocationInclude build() {
+            _checkSingleUse();
+
+            return new IndexRoutingAllocationInclude(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndexRoutingAllocationInclude}
+     */
+    public static final JsonpDeserializer<IndexRoutingAllocationInclude> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexRoutingAllocationInclude::setupIndexRoutingAllocationIncludeDeserializer
+    );
+
+    protected static void setupIndexRoutingAllocationIncludeDeserializer(ObjectDeserializer<IndexRoutingAllocationInclude.Builder> op) {
+
+        op.add(Builder::tierPreference, JsonpDeserializer.stringDeserializer(), "_tier_preference");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocationInitialRecovery.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocationInitialRecovery.java
index 8052ef6cec..2a63777e11 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocationInitialRecovery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocationInitialRecovery.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,105 +43,100 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices._types.IndexRoutingAllocationInitialRecovery
 
-
 @JsonpDeserializable
 public class IndexRoutingAllocationInitialRecovery implements JsonpSerializable {
-	@Nullable
-	private final String id;
+    @Nullable
+    private final String id;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private IndexRoutingAllocationInitialRecovery(Builder builder) {
+    private IndexRoutingAllocationInitialRecovery(Builder builder) {
 
-		this.id = builder.id;
+        this.id = builder.id;
 
-	}
+    }
 
-	public static IndexRoutingAllocationInitialRecovery of(
-			Function<Builder, ObjectBuilder<IndexRoutingAllocationInitialRecovery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static IndexRoutingAllocationInitialRecovery of(Function<Builder, ObjectBuilder<IndexRoutingAllocationInitialRecovery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * API name: {@code _id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
+    /**
+     * API name: {@code _id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		if (this.id != null) {
-			generator.writeKey("_id");
-			generator.write(this.id);
+        if (this.id != null) {
+            generator.writeKey("_id");
+            generator.write(this.id);
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link IndexRoutingAllocationInitialRecovery}.
-	 */
+    /**
+     * Builder for {@link IndexRoutingAllocationInitialRecovery}.
+     */
 
-	public static class Builder extends ObjectBuilderBase
-			implements
-				ObjectBuilder<IndexRoutingAllocationInitialRecovery> {
-		@Nullable
-		private String id;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexRoutingAllocationInitialRecovery> {
+        @Nullable
+        private String id;
 
-		/**
-		 * API name: {@code _id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
+        /**
+         * API name: {@code _id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link IndexRoutingAllocationInitialRecovery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexRoutingAllocationInitialRecovery build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link IndexRoutingAllocationInitialRecovery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexRoutingAllocationInitialRecovery build() {
+            _checkSingleUse();
 
-			return new IndexRoutingAllocationInitialRecovery(this);
-		}
-	}
+            return new IndexRoutingAllocationInitialRecovery(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link IndexRoutingAllocationInitialRecovery}
-	 */
-	public static final JsonpDeserializer<IndexRoutingAllocationInitialRecovery> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new,
-					IndexRoutingAllocationInitialRecovery::setupIndexRoutingAllocationInitialRecoveryDeserializer);
+    /**
+     * Json deserializer for {@link IndexRoutingAllocationInitialRecovery}
+     */
+    public static final JsonpDeserializer<IndexRoutingAllocationInitialRecovery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexRoutingAllocationInitialRecovery::setupIndexRoutingAllocationInitialRecoveryDeserializer
+    );
 
-	protected static void setupIndexRoutingAllocationInitialRecoveryDeserializer(
-			ObjectDeserializer<IndexRoutingAllocationInitialRecovery.Builder> op) {
+    protected static void setupIndexRoutingAllocationInitialRecoveryDeserializer(
+        ObjectDeserializer<IndexRoutingAllocationInitialRecovery.Builder> op
+    ) {
 
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocationOptions.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocationOptions.java
index b0a23c10d0..bcfa2e5599 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocationOptions.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingAllocationOptions.java
@@ -35,29 +35,29 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum IndexRoutingAllocationOptions implements JsonEnum {
-	All("all"),
+    All("all"),
 
-	Primaries("primaries"),
+    Primaries("primaries"),
 
-	NewPrimaries("new_primaries"),
+    NewPrimaries("new_primaries"),
 
-	None("none"),
+    None("none"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	IndexRoutingAllocationOptions(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    IndexRoutingAllocationOptions(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<IndexRoutingAllocationOptions> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			IndexRoutingAllocationOptions.values());
+    public static final JsonEnum.Deserializer<IndexRoutingAllocationOptions> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        IndexRoutingAllocationOptions.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingRebalance.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingRebalance.java
index 6d10a68b17..70e7c2499e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingRebalance.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingRebalance.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,94 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: indices._types.IndexRoutingRebalance
 
-
 @JsonpDeserializable
 public class IndexRoutingRebalance implements JsonpSerializable {
-	private final IndexRoutingRebalanceOptions enable;
+    private final IndexRoutingRebalanceOptions enable;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private IndexRoutingRebalance(Builder builder) {
+    private IndexRoutingRebalance(Builder builder) {
 
-		this.enable = ApiTypeHelper.requireNonNull(builder.enable, this, "enable");
+        this.enable = ApiTypeHelper.requireNonNull(builder.enable, this, "enable");
 
-	}
+    }
 
-	public static IndexRoutingRebalance of(Function<Builder, ObjectBuilder<IndexRoutingRebalance>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static IndexRoutingRebalance of(Function<Builder, ObjectBuilder<IndexRoutingRebalance>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code enable}
-	 */
-	public final IndexRoutingRebalanceOptions enable() {
-		return this.enable;
-	}
+    /**
+     * Required - API name: {@code enable}
+     */
+    public final IndexRoutingRebalanceOptions enable() {
+        return this.enable;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("enable");
-		this.enable.serialize(generator, mapper);
+        generator.writeKey("enable");
+        this.enable.serialize(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link IndexRoutingRebalance}.
-	 */
+    /**
+     * Builder for {@link IndexRoutingRebalance}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexRoutingRebalance> {
-		private IndexRoutingRebalanceOptions enable;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexRoutingRebalance> {
+        private IndexRoutingRebalanceOptions enable;
 
-		/**
-		 * Required - API name: {@code enable}
-		 */
-		public final Builder enable(IndexRoutingRebalanceOptions value) {
-			this.enable = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code enable}
+         */
+        public final Builder enable(IndexRoutingRebalanceOptions value) {
+            this.enable = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link IndexRoutingRebalance}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexRoutingRebalance build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link IndexRoutingRebalance}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexRoutingRebalance build() {
+            _checkSingleUse();
 
-			return new IndexRoutingRebalance(this);
-		}
-	}
+            return new IndexRoutingRebalance(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link IndexRoutingRebalance}
-	 */
-	public static final JsonpDeserializer<IndexRoutingRebalance> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IndexRoutingRebalance::setupIndexRoutingRebalanceDeserializer);
+    /**
+     * Json deserializer for {@link IndexRoutingRebalance}
+     */
+    public static final JsonpDeserializer<IndexRoutingRebalance> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexRoutingRebalance::setupIndexRoutingRebalanceDeserializer
+    );
 
-	protected static void setupIndexRoutingRebalanceDeserializer(ObjectDeserializer<IndexRoutingRebalance.Builder> op) {
+    protected static void setupIndexRoutingRebalanceDeserializer(ObjectDeserializer<IndexRoutingRebalance.Builder> op) {
 
-		op.add(Builder::enable, IndexRoutingRebalanceOptions._DESERIALIZER, "enable");
+        op.add(Builder::enable, IndexRoutingRebalanceOptions._DESERIALIZER, "enable");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingRebalanceOptions.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingRebalanceOptions.java
index b4f63ad609..a98781fd7e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingRebalanceOptions.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexRoutingRebalanceOptions.java
@@ -35,29 +35,29 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum IndexRoutingRebalanceOptions implements JsonEnum {
-	All("all"),
+    All("all"),
 
-	Primaries("primaries"),
+    Primaries("primaries"),
 
-	Replicas("replicas"),
+    Replicas("replicas"),
 
-	None("none"),
+    None("none"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	IndexRoutingRebalanceOptions(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    IndexRoutingRebalanceOptions(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<IndexRoutingRebalanceOptions> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			IndexRoutingRebalanceOptions.values());
+    public static final JsonEnum.Deserializer<IndexRoutingRebalanceOptions> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        IndexRoutingRebalanceOptions.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSegmentSort.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSegmentSort.java
index 487c0ef3b7..f651d8dc14 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSegmentSort.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSegmentSort.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,243 +45,240 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices._types.IndexSegmentSort
 
-
 @JsonpDeserializable
 public class IndexSegmentSort implements JsonpSerializable {
-	private final List<String> field;
-
-	private final List<SegmentSortOrder> order;
-
-	private final List<SegmentSortMode> mode;
-
-	private final List<SegmentSortMissing> missing;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexSegmentSort(Builder builder) {
-
-		this.field = ApiTypeHelper.unmodifiableRequired(builder.field, this, "field");
-		this.order = ApiTypeHelper.unmodifiableRequired(builder.order, this, "order");
-		this.mode = ApiTypeHelper.unmodifiable(builder.mode);
-		this.missing = ApiTypeHelper.unmodifiable(builder.missing);
-
-	}
-
-	public static IndexSegmentSort of(Function<Builder, ObjectBuilder<IndexSegmentSort>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final List<String> field() {
-		return this.field;
-	}
-
-	/**
-	 * Required - API name: {@code order}
-	 */
-	public final List<SegmentSortOrder> order() {
-		return this.order;
-	}
-
-	/**
-	 * API name: {@code mode}
-	 */
-	public final List<SegmentSortMode> mode() {
-		return this.mode;
-	}
-
-	/**
-	 * API name: {@code missing}
-	 */
-	public final List<SegmentSortMissing> missing() {
-		return this.missing;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.field)) {
-			generator.writeKey("field");
-			generator.writeStartArray();
-			for (String item0 : this.field) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.order)) {
-			generator.writeKey("order");
-			generator.writeStartArray();
-			for (SegmentSortOrder item0 : this.order) {
-				item0.serialize(generator, mapper);
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.mode)) {
-			generator.writeKey("mode");
-			generator.writeStartArray();
-			for (SegmentSortMode item0 : this.mode) {
-				item0.serialize(generator, mapper);
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.missing)) {
-			generator.writeKey("missing");
-			generator.writeStartArray();
-			for (SegmentSortMissing item0 : this.missing) {
-				item0.serialize(generator, mapper);
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexSegmentSort}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexSegmentSort> {
-		private List<String> field;
-
-		private List<SegmentSortOrder> order;
-
-		@Nullable
-		private List<SegmentSortMode> mode;
-
-		@Nullable
-		private List<SegmentSortMissing> missing;
-
-		/**
-		 * Required - API name: {@code field}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>field</code>.
-		 */
-		public final Builder field(List<String> list) {
-			this.field = _listAddAll(this.field, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code field}
-		 * <p>
-		 * Adds one or more values to <code>field</code>.
-		 */
-		public final Builder field(String value, String... values) {
-			this.field = _listAdd(this.field, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code order}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>order</code>.
-		 */
-		public final Builder order(List<SegmentSortOrder> list) {
-			this.order = _listAddAll(this.order, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code order}
-		 * <p>
-		 * Adds one or more values to <code>order</code>.
-		 */
-		public final Builder order(SegmentSortOrder value, SegmentSortOrder... values) {
-			this.order = _listAdd(this.order, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code mode}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>mode</code>.
-		 */
-		public final Builder mode(List<SegmentSortMode> list) {
-			this.mode = _listAddAll(this.mode, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code mode}
-		 * <p>
-		 * Adds one or more values to <code>mode</code>.
-		 */
-		public final Builder mode(SegmentSortMode value, SegmentSortMode... values) {
-			this.mode = _listAdd(this.mode, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code missing}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>missing</code>.
-		 */
-		public final Builder missing(List<SegmentSortMissing> list) {
-			this.missing = _listAddAll(this.missing, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code missing}
-		 * <p>
-		 * Adds one or more values to <code>missing</code>.
-		 */
-		public final Builder missing(SegmentSortMissing value, SegmentSortMissing... values) {
-			this.missing = _listAdd(this.missing, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IndexSegmentSort}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexSegmentSort build() {
-			_checkSingleUse();
-
-			return new IndexSegmentSort(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndexSegmentSort}
-	 */
-	public static final JsonpDeserializer<IndexSegmentSort> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IndexSegmentSort::setupIndexSegmentSortDeserializer);
-
-	protected static void setupIndexSegmentSortDeserializer(ObjectDeserializer<IndexSegmentSort.Builder> op) {
-
-		op.add(Builder::field, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "field");
-		op.add(Builder::order, JsonpDeserializer.arrayDeserializer(SegmentSortOrder._DESERIALIZER), "order");
-		op.add(Builder::mode, JsonpDeserializer.arrayDeserializer(SegmentSortMode._DESERIALIZER), "mode");
-		op.add(Builder::missing, JsonpDeserializer.arrayDeserializer(SegmentSortMissing._DESERIALIZER), "missing");
-
-	}
+    private final List<String> field;
+
+    private final List<SegmentSortOrder> order;
+
+    private final List<SegmentSortMode> mode;
+
+    private final List<SegmentSortMissing> missing;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexSegmentSort(Builder builder) {
+
+        this.field = ApiTypeHelper.unmodifiableRequired(builder.field, this, "field");
+        this.order = ApiTypeHelper.unmodifiableRequired(builder.order, this, "order");
+        this.mode = ApiTypeHelper.unmodifiable(builder.mode);
+        this.missing = ApiTypeHelper.unmodifiable(builder.missing);
+
+    }
+
+    public static IndexSegmentSort of(Function<Builder, ObjectBuilder<IndexSegmentSort>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final List<String> field() {
+        return this.field;
+    }
+
+    /**
+     * Required - API name: {@code order}
+     */
+    public final List<SegmentSortOrder> order() {
+        return this.order;
+    }
+
+    /**
+     * API name: {@code mode}
+     */
+    public final List<SegmentSortMode> mode() {
+        return this.mode;
+    }
+
+    /**
+     * API name: {@code missing}
+     */
+    public final List<SegmentSortMissing> missing() {
+        return this.missing;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.field)) {
+            generator.writeKey("field");
+            generator.writeStartArray();
+            for (String item0 : this.field) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.order)) {
+            generator.writeKey("order");
+            generator.writeStartArray();
+            for (SegmentSortOrder item0 : this.order) {
+                item0.serialize(generator, mapper);
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.mode)) {
+            generator.writeKey("mode");
+            generator.writeStartArray();
+            for (SegmentSortMode item0 : this.mode) {
+                item0.serialize(generator, mapper);
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.missing)) {
+            generator.writeKey("missing");
+            generator.writeStartArray();
+            for (SegmentSortMissing item0 : this.missing) {
+                item0.serialize(generator, mapper);
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexSegmentSort}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexSegmentSort> {
+        private List<String> field;
+
+        private List<SegmentSortOrder> order;
+
+        @Nullable
+        private List<SegmentSortMode> mode;
+
+        @Nullable
+        private List<SegmentSortMissing> missing;
+
+        /**
+         * Required - API name: {@code field}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>field</code>.
+         */
+        public final Builder field(List<String> list) {
+            this.field = _listAddAll(this.field, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code field}
+         * <p>
+         * Adds one or more values to <code>field</code>.
+         */
+        public final Builder field(String value, String... values) {
+            this.field = _listAdd(this.field, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code order}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>order</code>.
+         */
+        public final Builder order(List<SegmentSortOrder> list) {
+            this.order = _listAddAll(this.order, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code order}
+         * <p>
+         * Adds one or more values to <code>order</code>.
+         */
+        public final Builder order(SegmentSortOrder value, SegmentSortOrder... values) {
+            this.order = _listAdd(this.order, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code mode}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>mode</code>.
+         */
+        public final Builder mode(List<SegmentSortMode> list) {
+            this.mode = _listAddAll(this.mode, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code mode}
+         * <p>
+         * Adds one or more values to <code>mode</code>.
+         */
+        public final Builder mode(SegmentSortMode value, SegmentSortMode... values) {
+            this.mode = _listAdd(this.mode, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code missing}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>missing</code>.
+         */
+        public final Builder missing(List<SegmentSortMissing> list) {
+            this.missing = _listAddAll(this.missing, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code missing}
+         * <p>
+         * Adds one or more values to <code>missing</code>.
+         */
+        public final Builder missing(SegmentSortMissing value, SegmentSortMissing... values) {
+            this.missing = _listAdd(this.missing, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link IndexSegmentSort}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexSegmentSort build() {
+            _checkSingleUse();
+
+            return new IndexSegmentSort(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndexSegmentSort}
+     */
+    public static final JsonpDeserializer<IndexSegmentSort> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexSegmentSort::setupIndexSegmentSortDeserializer
+    );
+
+    protected static void setupIndexSegmentSortDeserializer(ObjectDeserializer<IndexSegmentSort.Builder> op) {
+
+        op.add(Builder::field, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "field");
+        op.add(Builder::order, JsonpDeserializer.arrayDeserializer(SegmentSortOrder._DESERIALIZER), "order");
+        op.add(Builder::mode, JsonpDeserializer.arrayDeserializer(SegmentSortMode._DESERIALIZER), "mode");
+        op.add(Builder::missing, JsonpDeserializer.arrayDeserializer(SegmentSortMissing._DESERIALIZER), "missing");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingBlocks.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingBlocks.java
index bf36e6ec14..bea892babf 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingBlocks.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingBlocks.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,216 +43,214 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices._types.IndexSettingBlocks
 
-
 @JsonpDeserializable
 public class IndexSettingBlocks implements JsonpSerializable {
-	@Nullable
-	private final Boolean readOnly;
-
-	@Nullable
-	private final Boolean readOnlyAllowDelete;
-
-	@Nullable
-	private final Boolean read;
-
-	@Nullable
-	private final Boolean write;
-
-	@Nullable
-	private final Boolean metadata;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexSettingBlocks(Builder builder) {
-
-		this.readOnly = builder.readOnly;
-		this.readOnlyAllowDelete = builder.readOnlyAllowDelete;
-		this.read = builder.read;
-		this.write = builder.write;
-		this.metadata = builder.metadata;
-
-	}
-
-	public static IndexSettingBlocks of(Function<Builder, ObjectBuilder<IndexSettingBlocks>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code read_only}
-	 */
-	@Nullable
-	public final Boolean readOnly() {
-		return this.readOnly;
-	}
-
-	/**
-	 * API name: {@code read_only_allow_delete}
-	 */
-	@Nullable
-	public final Boolean readOnlyAllowDelete() {
-		return this.readOnlyAllowDelete;
-	}
-
-	/**
-	 * API name: {@code read}
-	 */
-	@Nullable
-	public final Boolean read() {
-		return this.read;
-	}
-
-	/**
-	 * API name: {@code write}
-	 */
-	@Nullable
-	public final Boolean write() {
-		return this.write;
-	}
-
-	/**
-	 * API name: {@code metadata}
-	 */
-	@Nullable
-	public final Boolean metadata() {
-		return this.metadata;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.readOnly != null) {
-			generator.writeKey("read_only");
-			generator.write(this.readOnly);
-
-		}
-		if (this.readOnlyAllowDelete != null) {
-			generator.writeKey("read_only_allow_delete");
-			generator.write(this.readOnlyAllowDelete);
-
-		}
-		if (this.read != null) {
-			generator.writeKey("read");
-			generator.write(this.read);
-
-		}
-		if (this.write != null) {
-			generator.writeKey("write");
-			generator.write(this.write);
-
-		}
-		if (this.metadata != null) {
-			generator.writeKey("metadata");
-			generator.write(this.metadata);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexSettingBlocks}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexSettingBlocks> {
-		@Nullable
-		private Boolean readOnly;
-
-		@Nullable
-		private Boolean readOnlyAllowDelete;
-
-		@Nullable
-		private Boolean read;
-
-		@Nullable
-		private Boolean write;
-
-		@Nullable
-		private Boolean metadata;
-
-		/**
-		 * API name: {@code read_only}
-		 */
-		public final Builder readOnly(@Nullable Boolean value) {
-			this.readOnly = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code read_only_allow_delete}
-		 */
-		public final Builder readOnlyAllowDelete(@Nullable Boolean value) {
-			this.readOnlyAllowDelete = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code read}
-		 */
-		public final Builder read(@Nullable Boolean value) {
-			this.read = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code write}
-		 */
-		public final Builder write(@Nullable Boolean value) {
-			this.write = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code metadata}
-		 */
-		public final Builder metadata(@Nullable Boolean value) {
-			this.metadata = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IndexSettingBlocks}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexSettingBlocks build() {
-			_checkSingleUse();
-
-			return new IndexSettingBlocks(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndexSettingBlocks}
-	 */
-	public static final JsonpDeserializer<IndexSettingBlocks> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IndexSettingBlocks::setupIndexSettingBlocksDeserializer);
-
-	protected static void setupIndexSettingBlocksDeserializer(ObjectDeserializer<IndexSettingBlocks.Builder> op) {
-
-		op.add(Builder::readOnly, JsonpDeserializer.booleanDeserializer(), "read_only");
-		op.add(Builder::readOnlyAllowDelete, JsonpDeserializer.booleanDeserializer(), "read_only_allow_delete");
-		op.add(Builder::read, JsonpDeserializer.booleanDeserializer(), "read");
-		op.add(Builder::write, JsonpDeserializer.booleanDeserializer(), "write");
-		op.add(Builder::metadata, JsonpDeserializer.booleanDeserializer(), "metadata");
-
-	}
+    @Nullable
+    private final Boolean readOnly;
+
+    @Nullable
+    private final Boolean readOnlyAllowDelete;
+
+    @Nullable
+    private final Boolean read;
+
+    @Nullable
+    private final Boolean write;
+
+    @Nullable
+    private final Boolean metadata;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexSettingBlocks(Builder builder) {
+
+        this.readOnly = builder.readOnly;
+        this.readOnlyAllowDelete = builder.readOnlyAllowDelete;
+        this.read = builder.read;
+        this.write = builder.write;
+        this.metadata = builder.metadata;
+
+    }
+
+    public static IndexSettingBlocks of(Function<Builder, ObjectBuilder<IndexSettingBlocks>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code read_only}
+     */
+    @Nullable
+    public final Boolean readOnly() {
+        return this.readOnly;
+    }
+
+    /**
+     * API name: {@code read_only_allow_delete}
+     */
+    @Nullable
+    public final Boolean readOnlyAllowDelete() {
+        return this.readOnlyAllowDelete;
+    }
+
+    /**
+     * API name: {@code read}
+     */
+    @Nullable
+    public final Boolean read() {
+        return this.read;
+    }
+
+    /**
+     * API name: {@code write}
+     */
+    @Nullable
+    public final Boolean write() {
+        return this.write;
+    }
+
+    /**
+     * API name: {@code metadata}
+     */
+    @Nullable
+    public final Boolean metadata() {
+        return this.metadata;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.readOnly != null) {
+            generator.writeKey("read_only");
+            generator.write(this.readOnly);
+
+        }
+        if (this.readOnlyAllowDelete != null) {
+            generator.writeKey("read_only_allow_delete");
+            generator.write(this.readOnlyAllowDelete);
+
+        }
+        if (this.read != null) {
+            generator.writeKey("read");
+            generator.write(this.read);
+
+        }
+        if (this.write != null) {
+            generator.writeKey("write");
+            generator.write(this.write);
+
+        }
+        if (this.metadata != null) {
+            generator.writeKey("metadata");
+            generator.write(this.metadata);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexSettingBlocks}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexSettingBlocks> {
+        @Nullable
+        private Boolean readOnly;
+
+        @Nullable
+        private Boolean readOnlyAllowDelete;
+
+        @Nullable
+        private Boolean read;
+
+        @Nullable
+        private Boolean write;
+
+        @Nullable
+        private Boolean metadata;
+
+        /**
+         * API name: {@code read_only}
+         */
+        public final Builder readOnly(@Nullable Boolean value) {
+            this.readOnly = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code read_only_allow_delete}
+         */
+        public final Builder readOnlyAllowDelete(@Nullable Boolean value) {
+            this.readOnlyAllowDelete = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code read}
+         */
+        public final Builder read(@Nullable Boolean value) {
+            this.read = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code write}
+         */
+        public final Builder write(@Nullable Boolean value) {
+            this.write = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code metadata}
+         */
+        public final Builder metadata(@Nullable Boolean value) {
+            this.metadata = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link IndexSettingBlocks}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexSettingBlocks build() {
+            _checkSingleUse();
+
+            return new IndexSettingBlocks(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndexSettingBlocks}
+     */
+    public static final JsonpDeserializer<IndexSettingBlocks> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexSettingBlocks::setupIndexSettingBlocksDeserializer
+    );
+
+    protected static void setupIndexSettingBlocksDeserializer(ObjectDeserializer<IndexSettingBlocks.Builder> op) {
+
+        op.add(Builder::readOnly, JsonpDeserializer.booleanDeserializer(), "read_only");
+        op.add(Builder::readOnlyAllowDelete, JsonpDeserializer.booleanDeserializer(), "read_only_allow_delete");
+        op.add(Builder::read, JsonpDeserializer.booleanDeserializer(), "read");
+        op.add(Builder::write, JsonpDeserializer.booleanDeserializer(), "write");
+        op.add(Builder::metadata, JsonpDeserializer.booleanDeserializer(), "metadata");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettings.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettings.java
index acffec9688..509c0fcb4e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettings.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettings.java
@@ -33,6 +33,9 @@
 package org.opensearch.client.opensearch.indices;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -44,1919 +47,1962 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import javax.annotation.Nullable;
-import java.util.List;
-import java.util.function.Function;
-
 // typedef: indices._types.IndexSettings
 
 @JsonpDeserializable
 public class IndexSettings implements JsonpSerializable {
-	@Nullable
-	private final IndexSettings index;
+    @Nullable
+    private final IndexSettings index;
 
-	@Nullable
-	private final String mode;
+    @Nullable
+    private final String mode;
 
-	private final List<String> routingPath;
+    private final List<String> routingPath;
 
-	@Nullable
-	private final SoftDeletes softDeletes;
+    @Nullable
+    private final SoftDeletes softDeletes;
 
-	@Nullable
-	private final IndexSegmentSort sort;
+    @Nullable
+    private final IndexSegmentSort sort;
 
-	@Nullable
-	private final String numberOfShards;
+    @Nullable
+    private final String numberOfShards;
 
-	@Nullable
-	private final String numberOfReplicas;
+    @Nullable
+    private final String numberOfReplicas;
 
-	@Nullable
-	private final Integer numberOfRoutingShards;
+    @Nullable
+    private final Integer numberOfRoutingShards;
 
-	@Nullable
-	private final IndexCheckOnStartup checkOnStartup;
+    @Nullable
+    private final IndexCheckOnStartup checkOnStartup;
 
-	@Nullable
-	private final String codec;
+    @Nullable
+    private final String codec;
 
-	@Nullable
-	private final Integer routingPartitionSize;
+    @Nullable
+    private final Integer routingPartitionSize;
 
-	@Nullable
-	private final Time softDeletesRetentionLeasePeriod;
+    @Nullable
+    private final Time softDeletesRetentionLeasePeriod;
 
-	@Nullable
-	private final Boolean loadFixedBitsetFiltersEagerly;
+    @Nullable
+    private final Boolean loadFixedBitsetFiltersEagerly;
 
-	@Nullable
-	private final Boolean hidden;
+    @Nullable
+    private final Boolean hidden;
 
-	@Nullable
-	private final String autoExpandReplicas;
+    @Nullable
+    private final String autoExpandReplicas;
 
-	@Nullable
-	private final Integer mergeSchedulerMaxThreadCount;
+    @Nullable
+    private final Integer mergeSchedulerMaxThreadCount;
 
-	@Nullable
-	private final Time searchIdleAfter;
+    @Nullable
+    private final Time searchIdleAfter;
 
-	@Nullable
-	private final Time refreshInterval;
+    @Nullable
+    private final Time refreshInterval;
 
-	@Nullable
-	private final Integer maxResultWindow;
+    @Nullable
+    private final Integer maxResultWindow;
 
-	@Nullable
-	private final Integer maxInnerResultWindow;
+    @Nullable
+    private final Integer maxInnerResultWindow;
 
-	@Nullable
-	private final Integer maxRescoreWindow;
+    @Nullable
+    private final Integer maxRescoreWindow;
 
-	@Nullable
-	private final Integer maxDocvalueFieldsSearch;
+    @Nullable
+    private final Integer maxDocvalueFieldsSearch;
 
-	@Nullable
-	private final Integer maxScriptFields;
+    @Nullable
+    private final Integer maxScriptFields;
 
-	@Nullable
-	private final Integer maxNgramDiff;
+    @Nullable
+    private final Integer maxNgramDiff;
 
-	@Nullable
-	private final Integer maxShingleDiff;
+    @Nullable
+    private final Integer maxShingleDiff;
 
-	@Nullable
-	private final IndexSettingBlocks blocks;
+    @Nullable
+    private final IndexSettingBlocks blocks;
 
-	@Nullable
-	private final Boolean blocksReadOnly;
+    @Nullable
+    private final Boolean blocksReadOnly;
 
-	@Nullable
-	private final Boolean blocksReadOnlyAllowDelete;
+    @Nullable
+    private final Boolean blocksReadOnlyAllowDelete;
 
-	@Nullable
-	private final Boolean blocksRead;
+    @Nullable
+    private final Boolean blocksRead;
 
-	@Nullable
-	private final Boolean blocksWrite;
+    @Nullable
+    private final Boolean blocksWrite;
 
-	@Nullable
-	private final Boolean blocksMetadata;
+    @Nullable
+    private final Boolean blocksMetadata;
 
-	@Nullable
-	private final Integer maxRefreshListeners;
+    @Nullable
+    private final Integer maxRefreshListeners;
 
-	@Nullable
-	private final Integer analyzeMaxTokenCount;
+    @Nullable
+    private final Integer analyzeMaxTokenCount;
 
-	@Nullable
-	private final Integer highlightMaxAnalyzedOffset;
+    @Nullable
+    private final Integer highlightMaxAnalyzedOffset;
 
-	@Nullable
-	private final Integer maxTermsCount;
+    @Nullable
+    private final Integer maxTermsCount;
 
-	@Nullable
-	private final Integer maxRegexLength;
+    @Nullable
+    private final Integer maxRegexLength;
 
-	@Nullable
-	private final IndexRouting routing;
+    @Nullable
+    private final IndexRouting routing;
 
-	@Nullable
-	private final Time gcDeletes;
+    @Nullable
+    private final Time gcDeletes;
 
-	@Nullable
-	private final String defaultPipeline;
+    @Nullable
+    private final String defaultPipeline;
 
-	@Nullable
-	private final String finalPipeline;
+    @Nullable
+    private final String finalPipeline;
 
-	@Nullable
-	private final String lifecycleName;
+    @Nullable
+    private final String lifecycleName;
 
-	@Nullable
-	private final String providedName;
+    @Nullable
+    private final String providedName;
 
-	@Nullable
-	private final String creationDate;
+    @Nullable
+    private final String creationDate;
 
-	@Nullable
-	private final String uuid;
-
-	@Nullable
-	private final IndexVersioning version;
+    @Nullable
+    private final String uuid;
+
+    @Nullable
+    private final IndexVersioning version;
 
-	@Nullable
-	private final Boolean verifiedBeforeClose;
-
-	@Nullable
-	private final String format;
-
-	@Nullable
-	private final Integer maxSlicesPerScroll;
-
-	@Nullable
-	private final Translog translog;
-
-	@Nullable
-	private final Boolean queryStringLenient;
-
-	@Nullable
-	private final String priority;
-
-	@Nullable
-	private final Integer topMetricsMaxSize;
-
-	@Nullable
-	private final IndexSettingsAnalysis analysis;
-
-	@Nullable
-	private final IndexSettings settings;
-
-	@Nullable
-	private final IndexSettingsMapping mapping;
-
-	@Nullable
-	private final Boolean knn;
-
-	@Nullable
-	private final Integer knnAlgoParamEfSearch;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexSettings(Builder builder) {
-
-		this.index = builder.index;
-		this.mode = builder.mode;
-		this.routingPath = ApiTypeHelper.unmodifiable(builder.routingPath);
-		this.softDeletes = builder.softDeletes;
-		this.sort = builder.sort;
-		this.numberOfShards = builder.numberOfShards;
-		this.numberOfReplicas = builder.numberOfReplicas;
-		this.numberOfRoutingShards = builder.numberOfRoutingShards;
-		this.checkOnStartup = builder.checkOnStartup;
-		this.codec = builder.codec;
-		this.routingPartitionSize = builder.routingPartitionSize;
-		this.softDeletesRetentionLeasePeriod = builder.softDeletesRetentionLeasePeriod;
-		this.loadFixedBitsetFiltersEagerly = builder.loadFixedBitsetFiltersEagerly;
-		this.hidden = builder.hidden;
-		this.autoExpandReplicas = builder.autoExpandReplicas;
-		this.mergeSchedulerMaxThreadCount = builder.mergeSchedulerMaxThreadCount;
-		this.searchIdleAfter = builder.searchIdleAfter;
-		this.refreshInterval = builder.refreshInterval;
-		this.maxResultWindow = builder.maxResultWindow;
-		this.maxInnerResultWindow = builder.maxInnerResultWindow;
-		this.maxRescoreWindow = builder.maxRescoreWindow;
-		this.maxDocvalueFieldsSearch = builder.maxDocvalueFieldsSearch;
-		this.maxScriptFields = builder.maxScriptFields;
-		this.maxNgramDiff = builder.maxNgramDiff;
-		this.maxShingleDiff = builder.maxShingleDiff;
-		this.blocks = builder.blocks;
-		this.blocksReadOnly = builder.blocksReadOnly;
-		this.blocksReadOnlyAllowDelete = builder.blocksReadOnlyAllowDelete;
-		this.blocksRead = builder.blocksRead;
-		this.blocksWrite = builder.blocksWrite;
-		this.blocksMetadata = builder.blocksMetadata;
-		this.maxRefreshListeners = builder.maxRefreshListeners;
-		this.analyzeMaxTokenCount = builder.analyzeMaxTokenCount;
-		this.highlightMaxAnalyzedOffset = builder.highlightMaxAnalyzedOffset;
-		this.maxTermsCount = builder.maxTermsCount;
-		this.maxRegexLength = builder.maxRegexLength;
-		this.routing = builder.routing;
-		this.gcDeletes = builder.gcDeletes;
-		this.defaultPipeline = builder.defaultPipeline;
-		this.finalPipeline = builder.finalPipeline;
-		this.lifecycleName = builder.lifecycleName;
-		this.providedName = builder.providedName;
-		this.creationDate = builder.creationDate;
-		this.uuid = builder.uuid;
-		this.version = builder.version;
-		this.verifiedBeforeClose = builder.verifiedBeforeClose;
-		this.format = builder.format;
-		this.maxSlicesPerScroll = builder.maxSlicesPerScroll;
-		this.translog = builder.translog;
-		this.queryStringLenient = builder.queryStringLenient;
-		this.priority = builder.priority;
-		this.topMetricsMaxSize = builder.topMetricsMaxSize;
-		this.analysis = builder.analysis;
-		this.settings = builder.settings;
-		this.mapping = builder.mapping;
-		this.knn = builder.knn;
-		this.knnAlgoParamEfSearch = builder.knnAlgoParamEfSearch;
-
-	}
-
-	public static IndexSettings of(Function<Builder, ObjectBuilder<IndexSettings>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final IndexSettings index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code mode}
-	 */
-	@Nullable
-	public final String mode() {
-		return this.mode;
-	}
-
-	/**
-	 * API name: {@code routing_path}
-	 */
-	public final List<String> routingPath() {
-		return this.routingPath;
-	}
-
-	/**
-	 * API name: {@code soft_deletes}
-	 */
-	@Nullable
-	public final SoftDeletes softDeletes() {
-		return this.softDeletes;
-	}
-
-	/**
-	 * API name: {@code sort}
-	 */
-	@Nullable
-	public final IndexSegmentSort sort() {
-		return this.sort;
-	}
-
-	/**
-	 * API name: {@code number_of_shards}
-	 */
-	@Nullable
-	public final String numberOfShards() {
-		return this.numberOfShards;
-	}
-
-	/**
-	 * API name: {@code number_of_replicas}
-	 */
-	@Nullable
-	public final String numberOfReplicas() {
-		return this.numberOfReplicas;
-	}
-
-	/**
-	 * API name: {@code number_of_routing_shards}
-	 */
-	@Nullable
-	public final Integer numberOfRoutingShards() {
-		return this.numberOfRoutingShards;
-	}
-
-	/**
-	 * API name: {@code check_on_startup}
-	 */
-	@Nullable
-	public final IndexCheckOnStartup checkOnStartup() {
-		return this.checkOnStartup;
-	}
-
-	/**
-	 * API name: {@code codec}
-	 */
-	@Nullable
-	public final String codec() {
-		return this.codec;
-	}
-
-	/**
-	 * API name: {@code routing_partition_size}
-	 */
-	@Nullable
-	public final Integer routingPartitionSize() {
-		return this.routingPartitionSize;
-	}
-
-	/**
-	 * API name: {@code soft_deletes.retention_lease.period}
-	 */
-	@Nullable
-	public final Time softDeletesRetentionLeasePeriod() {
-		return this.softDeletesRetentionLeasePeriod;
-	}
-
-	/**
-	 * API name: {@code load_fixed_bitset_filters_eagerly}
-	 */
-	@Nullable
-	public final Boolean loadFixedBitsetFiltersEagerly() {
-		return this.loadFixedBitsetFiltersEagerly;
-	}
-
-	/**
-	 * API name: {@code hidden}
-	 */
-	@Nullable
-	public final Boolean hidden() {
-		return this.hidden;
-	}
-
-	/**
-	 * API name: {@code auto_expand_replicas}
-	 */
-	@Nullable
-	public final String autoExpandReplicas() {
-		return this.autoExpandReplicas;
-	}
-
-	/**
-	 * API name: {@code merge.scheduler.max_thread_count}
-	 */
-	@Nullable
-	public final Integer mergeSchedulerMaxThreadCount() {
-		return this.mergeSchedulerMaxThreadCount;
-	}
-
-	/**
-	 * API name: {@code search.idle.after}
-	 */
-	@Nullable
-	public final Time searchIdleAfter() {
-		return this.searchIdleAfter;
-	}
-
-	/**
-	 * API name: {@code refresh_interval}
-	 */
-	@Nullable
-	public final Time refreshInterval() {
-		return this.refreshInterval;
-	}
-
-	/**
-	 * API name: {@code max_result_window}
-	 */
-	@Nullable
-	public final Integer maxResultWindow() {
-		return this.maxResultWindow;
-	}
-
-	/**
-	 * API name: {@code max_inner_result_window}
-	 */
-	@Nullable
-	public final Integer maxInnerResultWindow() {
-		return this.maxInnerResultWindow;
-	}
-
-	/**
-	 * API name: {@code max_rescore_window}
-	 */
-	@Nullable
-	public final Integer maxRescoreWindow() {
-		return this.maxRescoreWindow;
-	}
-
-	/**
-	 * API name: {@code max_docvalue_fields_search}
-	 */
-	@Nullable
-	public final Integer maxDocvalueFieldsSearch() {
-		return this.maxDocvalueFieldsSearch;
-	}
-
-	/**
-	 * API name: {@code max_script_fields}
-	 */
-	@Nullable
-	public final Integer maxScriptFields() {
-		return this.maxScriptFields;
-	}
-
-	/**
-	 * API name: {@code max_ngram_diff}
-	 */
-	@Nullable
-	public final Integer maxNgramDiff() {
-		return this.maxNgramDiff;
-	}
-
-	/**
-	 * API name: {@code max_shingle_diff}
-	 */
-	@Nullable
-	public final Integer maxShingleDiff() {
-		return this.maxShingleDiff;
-	}
-
-	/**
-	 * API name: {@code blocks}
-	 */
-	@Nullable
-	public final IndexSettingBlocks blocks() {
-		return this.blocks;
-	}
-
-	/**
-	 * API name: {@code blocks.read_only}
-	 */
-	@Nullable
-	public final Boolean blocksReadOnly() {
-		return this.blocksReadOnly;
-	}
-
-	/**
-	 * API name: {@code blocks.read_only_allow_delete}
-	 */
-	@Nullable
-	public final Boolean blocksReadOnlyAllowDelete() {
-		return this.blocksReadOnlyAllowDelete;
-	}
-
-	/**
-	 * API name: {@code blocks.read}
-	 */
-	@Nullable
-	public final Boolean blocksRead() {
-		return this.blocksRead;
-	}
-
-	/**
-	 * API name: {@code blocks.write}
-	 */
-	@Nullable
-	public final Boolean blocksWrite() {
-		return this.blocksWrite;
-	}
-
-	/**
-	 * API name: {@code blocks.metadata}
-	 */
-	@Nullable
-	public final Boolean blocksMetadata() {
-		return this.blocksMetadata;
-	}
-
-	/**
-	 * API name: {@code max_refresh_listeners}
-	 */
-	@Nullable
-	public final Integer maxRefreshListeners() {
-		return this.maxRefreshListeners;
-	}
-
-	/**
-	 * API name: {@code analyze.max_token_count}
-	 */
-	@Nullable
-	public final Integer analyzeMaxTokenCount() {
-		return this.analyzeMaxTokenCount;
-	}
-
-	/**
-	 * API name: {@code highlight.max_analyzed_offset}
-	 */
-	@Nullable
-	public final Integer highlightMaxAnalyzedOffset() {
-		return this.highlightMaxAnalyzedOffset;
-	}
-
-	/**
-	 * API name: {@code max_terms_count}
-	 */
-	@Nullable
-	public final Integer maxTermsCount() {
-		return this.maxTermsCount;
-	}
-
-	/**
-	 * API name: {@code max_regex_length}
-	 */
-	@Nullable
-	public final Integer maxRegexLength() {
-		return this.maxRegexLength;
-	}
-
-	/**
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final IndexRouting routing() {
-		return this.routing;
-	}
-
-	/**
-	 * API name: {@code gc_deletes}
-	 */
-	@Nullable
-	public final Time gcDeletes() {
-		return this.gcDeletes;
-	}
-
-	/**
-	 * API name: {@code default_pipeline}
-	 */
-	@Nullable
-	public final String defaultPipeline() {
-		return this.defaultPipeline;
-	}
-
-	/**
-	 * API name: {@code final_pipeline}
-	 */
-	@Nullable
-	public final String finalPipeline() {
-		return this.finalPipeline;
-	}
-
-	/**
-	 * API name: {@code lifecycle.name}
-	 */
-	@Nullable
-	public final String lifecycleName() {
-		return this.lifecycleName;
-	}
-
-	/**
-	 * API name: {@code provided_name}
-	 */
-	@Nullable
-	public final String providedName() {
-		return this.providedName;
-	}
-
-	/**
-	 * API name: {@code creation_date}
-	 */
-	@Nullable
-	public final String creationDate() {
-		return this.creationDate;
-	}
-
-	/**
-	 * API name: {@code uuid}
-	 */
-	@Nullable
-	public final String uuid() {
-		return this.uuid;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final IndexVersioning version() {
-		return this.version;
-	}
-
-	/**
-	 * API name: {@code verified_before_close}
-	 */
-	@Nullable
-	public final Boolean verifiedBeforeClose() {
-		return this.verifiedBeforeClose;
-	}
-
-	/**
-	 * API name: {@code format}
-	 */
-	@Nullable
-	public final String format() {
-		return this.format;
-	}
-
-	/**
-	 * API name: {@code max_slices_per_scroll}
-	 */
-	@Nullable
-	public final Integer maxSlicesPerScroll() {
-		return this.maxSlicesPerScroll;
-	}
-
-	/**
-	 * API name: {@code translog}
-	 */
-	@Nullable
-	public final Translog translog() {
-		return this.translog;
-	}
-
-	/**
-	 * API name: {@code translog.durability}
-	 * @deprecated use {@link #translog()} instead
-	 */
-	@Deprecated
-	@Nullable
-	public final String translogDurability() {
-		return this.translog != null ? this.translog.durability() : null;
-	}
-
-	/**
-	 * API name: {@code translog.flush_threshold_size}
-	 * @deprecated use {@link #translog()} instead
-	 */
-	@Deprecated
-	@Nullable
-	public final String translogFlushThresholdSize() {
-		return this.translog != null ? this.translog.flushThresholdSize() : null;
-	}
-
-	/**
-	 * API name: {@code query_string.lenient}
-	 */
-	@Nullable
-	public final Boolean queryStringLenient() {
-		return this.queryStringLenient;
-	}
-
-	/**
-	 * API name: {@code priority}
-	 */
-	@Nullable
-	public final String priority() {
-		return this.priority;
-	}
-
-	/**
-	 * API name: {@code top_metrics_max_size}
-	 */
-	@Nullable
-	public final Integer topMetricsMaxSize() {
-		return this.topMetricsMaxSize;
-	}
-
-	/**
-	 * API name: {@code analysis}
-	 */
-	@Nullable
-	public final IndexSettingsAnalysis analysis() {
-		return this.analysis;
-	}
-
-	/**
-	 * API name: {@code settings}
-	 */
-	@Nullable
-	public final IndexSettings settings() {
-		return this.settings;
-	}
-
-	/**
-	 * API name: {@code mapping}
-	 */
-	@Nullable
-	public final IndexSettingsMapping mapping() {
-		return this.mapping;
-	}
-
-	/**
-	 * API name: {@code knn}
-	 */
-	@Nullable
-	public final Boolean knn() {
-		return this.knn;
-	}
-
-	/**
-	 * API name: {@code knn.algo_param.ef_search}
-	 */
-	@Nullable
-	public final Integer knnAlgoParamEfSearch() {
-		return this.knnAlgoParamEfSearch;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.index != null) {
-			generator.writeKey("index");
-			this.index.serialize(generator, mapper);
-
-		}
-		if (this.mode != null) {
-			generator.writeKey("mode");
-			generator.write(this.mode);
-
-		}
-		if (ApiTypeHelper.isDefined(this.routingPath)) {
-			generator.writeKey("routing_path");
-			generator.writeStartArray();
-			for (String item0 : this.routingPath) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.softDeletes != null) {
-			generator.writeKey("soft_deletes");
-			this.softDeletes.serialize(generator, mapper);
-
-		}
-		if (this.sort != null) {
-			generator.writeKey("sort");
-			this.sort.serialize(generator, mapper);
-
-		}
-		if (this.numberOfShards != null) {
-			generator.writeKey("number_of_shards");
-			generator.write(this.numberOfShards);
-
-		}
-		if (this.numberOfReplicas != null) {
-			generator.writeKey("number_of_replicas");
-			generator.write(this.numberOfReplicas);
-
-		}
-		if (this.numberOfRoutingShards != null) {
-			generator.writeKey("number_of_routing_shards");
-			generator.write(this.numberOfRoutingShards);
-
-		}
-		if (this.checkOnStartup != null) {
-			generator.writeKey("check_on_startup");
-			this.checkOnStartup.serialize(generator, mapper);
-		}
-		if (this.codec != null) {
-			generator.writeKey("codec");
-			generator.write(this.codec);
-
-		}
-		if (this.routingPartitionSize != null) {
-			generator.writeKey("routing_partition_size");
-			generator.write(this.routingPartitionSize);
-
-		}
-		if (this.softDeletesRetentionLeasePeriod != null) {
-			generator.writeKey("soft_deletes.retention_lease.period");
-			this.softDeletesRetentionLeasePeriod.serialize(generator, mapper);
-
-		}
-		if (this.loadFixedBitsetFiltersEagerly != null) {
-			generator.writeKey("load_fixed_bitset_filters_eagerly");
-			generator.write(this.loadFixedBitsetFiltersEagerly);
-
-		}
-		if (this.hidden != null) {
-			generator.writeKey("hidden");
-			generator.write(this.hidden);
-
-		}
-		if (this.autoExpandReplicas != null) {
-			generator.writeKey("auto_expand_replicas");
-			generator.write(this.autoExpandReplicas);
-
-		}
-		if (this.mergeSchedulerMaxThreadCount != null) {
-			generator.writeKey("merge.scheduler.max_thread_count");
-			generator.write(this.mergeSchedulerMaxThreadCount);
-
-		}
-		if (this.searchIdleAfter != null) {
-			generator.writeKey("search.idle.after");
-			this.searchIdleAfter.serialize(generator, mapper);
-
-		}
-		if (this.refreshInterval != null) {
-			generator.writeKey("refresh_interval");
-			this.refreshInterval.serialize(generator, mapper);
-
-		}
-		if (this.maxResultWindow != null) {
-			generator.writeKey("max_result_window");
-			generator.write(this.maxResultWindow);
-
-		}
-		if (this.maxInnerResultWindow != null) {
-			generator.writeKey("max_inner_result_window");
-			generator.write(this.maxInnerResultWindow);
-
-		}
-		if (this.maxRescoreWindow != null) {
-			generator.writeKey("max_rescore_window");
-			generator.write(this.maxRescoreWindow);
-
-		}
-		if (this.maxDocvalueFieldsSearch != null) {
-			generator.writeKey("max_docvalue_fields_search");
-			generator.write(this.maxDocvalueFieldsSearch);
-
-		}
-		if (this.maxScriptFields != null) {
-			generator.writeKey("max_script_fields");
-			generator.write(this.maxScriptFields);
-
-		}
-		if (this.maxNgramDiff != null) {
-			generator.writeKey("max_ngram_diff");
-			generator.write(this.maxNgramDiff);
-
-		}
-		if (this.maxShingleDiff != null) {
-			generator.writeKey("max_shingle_diff");
-			generator.write(this.maxShingleDiff);
-
-		}
-		if (this.blocks != null) {
-			generator.writeKey("blocks");
-			this.blocks.serialize(generator, mapper);
-
-		}
-		if (this.blocksReadOnly != null) {
-			generator.writeKey("blocks.read_only");
-			generator.write(this.blocksReadOnly);
-
-		}
-		if (this.blocksReadOnlyAllowDelete != null) {
-			generator.writeKey("blocks.read_only_allow_delete");
-			generator.write(this.blocksReadOnlyAllowDelete);
-
-		}
-		if (this.blocksRead != null) {
-			generator.writeKey("blocks.read");
-			generator.write(this.blocksRead);
-
-		}
-		if (this.blocksWrite != null) {
-			generator.writeKey("blocks.write");
-			generator.write(this.blocksWrite);
-
-		}
-		if (this.blocksMetadata != null) {
-			generator.writeKey("blocks.metadata");
-			generator.write(this.blocksMetadata);
-
-		}
-		if (this.maxRefreshListeners != null) {
-			generator.writeKey("max_refresh_listeners");
-			generator.write(this.maxRefreshListeners);
-
-		}
-		if (this.analyzeMaxTokenCount != null) {
-			generator.writeKey("analyze.max_token_count");
-			generator.write(this.analyzeMaxTokenCount);
-
-		}
-		if (this.highlightMaxAnalyzedOffset != null) {
-			generator.writeKey("highlight.max_analyzed_offset");
-			generator.write(this.highlightMaxAnalyzedOffset);
-
-		}
-		if (this.maxTermsCount != null) {
-			generator.writeKey("max_terms_count");
-			generator.write(this.maxTermsCount);
-
-		}
-		if (this.maxRegexLength != null) {
-			generator.writeKey("max_regex_length");
-			generator.write(this.maxRegexLength);
-
-		}
-		if (this.routing != null) {
-			generator.writeKey("routing");
-			this.routing.serialize(generator, mapper);
-
-		}
-		if (this.gcDeletes != null) {
-			generator.writeKey("gc_deletes");
-			this.gcDeletes.serialize(generator, mapper);
-
-		}
-		if (this.defaultPipeline != null) {
-			generator.writeKey("default_pipeline");
-			generator.write(this.defaultPipeline);
-
-		}
-		if (this.finalPipeline != null) {
-			generator.writeKey("final_pipeline");
-			generator.write(this.finalPipeline);
-
-		}
-
-		if (this.lifecycleName != null) {
-			generator.writeKey("lifecycle.name");
-			generator.write(this.lifecycleName);
-
-		}
-		if (this.providedName != null) {
-			generator.writeKey("provided_name");
-			generator.write(this.providedName);
-
-		}
-		if (this.creationDate != null) {
-			generator.writeKey("creation_date");
-			generator.write(this.creationDate);
-
-		}
-		if (this.uuid != null) {
-			generator.writeKey("uuid");
-			generator.write(this.uuid);
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			this.version.serialize(generator, mapper);
-
-		}
-		if (this.verifiedBeforeClose != null) {
-			generator.writeKey("verified_before_close");
-			generator.write(this.verifiedBeforeClose);
-
-		}
-		if (this.format != null) {
-			generator.writeKey("format");
-			generator.write(this.format);
-
-		}
-		if (this.maxSlicesPerScroll != null) {
-			generator.writeKey("max_slices_per_scroll");
-			generator.write(this.maxSlicesPerScroll);
-
-		}
-		if (this.translog != null) {
-			generator.writeKey("translog");
-			this.translog.serialize(generator, mapper);
-
-		}
-		if (this.queryStringLenient != null) {
-			generator.writeKey("query_string.lenient");
-			generator.write(this.queryStringLenient);
+    @Nullable
+    private final Boolean verifiedBeforeClose;
+
+    @Nullable
+    private final String format;
+
+    @Nullable
+    private final Integer maxSlicesPerScroll;
+
+    @Nullable
+    private final Translog translog;
+
+    @Nullable
+    private final Boolean queryStringLenient;
+
+    @Nullable
+    private final String priority;
+
+    @Nullable
+    private final Integer topMetricsMaxSize;
+
+    @Nullable
+    private final IndexSettingsAnalysis analysis;
+
+    @Nullable
+    private final IndexSettings settings;
+
+    @Nullable
+    private final IndexSettingsMapping mapping;
+
+    @Nullable
+    private final Boolean knn;
+
+    @Nullable
+    private final Integer knnAlgoParamEfSearch;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexSettings(Builder builder) {
+
+        this.index = builder.index;
+        this.mode = builder.mode;
+        this.routingPath = ApiTypeHelper.unmodifiable(builder.routingPath);
+        this.softDeletes = builder.softDeletes;
+        this.sort = builder.sort;
+        this.numberOfShards = builder.numberOfShards;
+        this.numberOfReplicas = builder.numberOfReplicas;
+        this.numberOfRoutingShards = builder.numberOfRoutingShards;
+        this.checkOnStartup = builder.checkOnStartup;
+        this.codec = builder.codec;
+        this.routingPartitionSize = builder.routingPartitionSize;
+        this.softDeletesRetentionLeasePeriod = builder.softDeletesRetentionLeasePeriod;
+        this.loadFixedBitsetFiltersEagerly = builder.loadFixedBitsetFiltersEagerly;
+        this.hidden = builder.hidden;
+        this.autoExpandReplicas = builder.autoExpandReplicas;
+        this.mergeSchedulerMaxThreadCount = builder.mergeSchedulerMaxThreadCount;
+        this.searchIdleAfter = builder.searchIdleAfter;
+        this.refreshInterval = builder.refreshInterval;
+        this.maxResultWindow = builder.maxResultWindow;
+        this.maxInnerResultWindow = builder.maxInnerResultWindow;
+        this.maxRescoreWindow = builder.maxRescoreWindow;
+        this.maxDocvalueFieldsSearch = builder.maxDocvalueFieldsSearch;
+        this.maxScriptFields = builder.maxScriptFields;
+        this.maxNgramDiff = builder.maxNgramDiff;
+        this.maxShingleDiff = builder.maxShingleDiff;
+        this.blocks = builder.blocks;
+        this.blocksReadOnly = builder.blocksReadOnly;
+        this.blocksReadOnlyAllowDelete = builder.blocksReadOnlyAllowDelete;
+        this.blocksRead = builder.blocksRead;
+        this.blocksWrite = builder.blocksWrite;
+        this.blocksMetadata = builder.blocksMetadata;
+        this.maxRefreshListeners = builder.maxRefreshListeners;
+        this.analyzeMaxTokenCount = builder.analyzeMaxTokenCount;
+        this.highlightMaxAnalyzedOffset = builder.highlightMaxAnalyzedOffset;
+        this.maxTermsCount = builder.maxTermsCount;
+        this.maxRegexLength = builder.maxRegexLength;
+        this.routing = builder.routing;
+        this.gcDeletes = builder.gcDeletes;
+        this.defaultPipeline = builder.defaultPipeline;
+        this.finalPipeline = builder.finalPipeline;
+        this.lifecycleName = builder.lifecycleName;
+        this.providedName = builder.providedName;
+        this.creationDate = builder.creationDate;
+        this.uuid = builder.uuid;
+        this.version = builder.version;
+        this.verifiedBeforeClose = builder.verifiedBeforeClose;
+        this.format = builder.format;
+        this.maxSlicesPerScroll = builder.maxSlicesPerScroll;
+        this.translog = builder.translog;
+        this.queryStringLenient = builder.queryStringLenient;
+        this.priority = builder.priority;
+        this.topMetricsMaxSize = builder.topMetricsMaxSize;
+        this.analysis = builder.analysis;
+        this.settings = builder.settings;
+        this.mapping = builder.mapping;
+        this.knn = builder.knn;
+        this.knnAlgoParamEfSearch = builder.knnAlgoParamEfSearch;
+
+    }
+
+    public static IndexSettings of(Function<Builder, ObjectBuilder<IndexSettings>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    @Nullable
+    public final IndexSettings index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code mode}
+     */
+    @Nullable
+    public final String mode() {
+        return this.mode;
+    }
+
+    /**
+     * API name: {@code routing_path}
+     */
+    public final List<String> routingPath() {
+        return this.routingPath;
+    }
+
+    /**
+     * API name: {@code soft_deletes}
+     */
+    @Nullable
+    public final SoftDeletes softDeletes() {
+        return this.softDeletes;
+    }
+
+    /**
+     * API name: {@code sort}
+     */
+    @Nullable
+    public final IndexSegmentSort sort() {
+        return this.sort;
+    }
+
+    /**
+     * API name: {@code number_of_shards}
+     */
+    @Nullable
+    public final String numberOfShards() {
+        return this.numberOfShards;
+    }
+
+    /**
+     * API name: {@code number_of_replicas}
+     */
+    @Nullable
+    public final String numberOfReplicas() {
+        return this.numberOfReplicas;
+    }
+
+    /**
+     * API name: {@code number_of_routing_shards}
+     */
+    @Nullable
+    public final Integer numberOfRoutingShards() {
+        return this.numberOfRoutingShards;
+    }
+
+    /**
+     * API name: {@code check_on_startup}
+     */
+    @Nullable
+    public final IndexCheckOnStartup checkOnStartup() {
+        return this.checkOnStartup;
+    }
+
+    /**
+     * API name: {@code codec}
+     */
+    @Nullable
+    public final String codec() {
+        return this.codec;
+    }
+
+    /**
+     * API name: {@code routing_partition_size}
+     */
+    @Nullable
+    public final Integer routingPartitionSize() {
+        return this.routingPartitionSize;
+    }
+
+    /**
+     * API name: {@code soft_deletes.retention_lease.period}
+     */
+    @Nullable
+    public final Time softDeletesRetentionLeasePeriod() {
+        return this.softDeletesRetentionLeasePeriod;
+    }
+
+    /**
+     * API name: {@code load_fixed_bitset_filters_eagerly}
+     */
+    @Nullable
+    public final Boolean loadFixedBitsetFiltersEagerly() {
+        return this.loadFixedBitsetFiltersEagerly;
+    }
+
+    /**
+     * API name: {@code hidden}
+     */
+    @Nullable
+    public final Boolean hidden() {
+        return this.hidden;
+    }
+
+    /**
+     * API name: {@code auto_expand_replicas}
+     */
+    @Nullable
+    public final String autoExpandReplicas() {
+        return this.autoExpandReplicas;
+    }
+
+    /**
+     * API name: {@code merge.scheduler.max_thread_count}
+     */
+    @Nullable
+    public final Integer mergeSchedulerMaxThreadCount() {
+        return this.mergeSchedulerMaxThreadCount;
+    }
+
+    /**
+     * API name: {@code search.idle.after}
+     */
+    @Nullable
+    public final Time searchIdleAfter() {
+        return this.searchIdleAfter;
+    }
+
+    /**
+     * API name: {@code refresh_interval}
+     */
+    @Nullable
+    public final Time refreshInterval() {
+        return this.refreshInterval;
+    }
+
+    /**
+     * API name: {@code max_result_window}
+     */
+    @Nullable
+    public final Integer maxResultWindow() {
+        return this.maxResultWindow;
+    }
+
+    /**
+     * API name: {@code max_inner_result_window}
+     */
+    @Nullable
+    public final Integer maxInnerResultWindow() {
+        return this.maxInnerResultWindow;
+    }
+
+    /**
+     * API name: {@code max_rescore_window}
+     */
+    @Nullable
+    public final Integer maxRescoreWindow() {
+        return this.maxRescoreWindow;
+    }
+
+    /**
+     * API name: {@code max_docvalue_fields_search}
+     */
+    @Nullable
+    public final Integer maxDocvalueFieldsSearch() {
+        return this.maxDocvalueFieldsSearch;
+    }
+
+    /**
+     * API name: {@code max_script_fields}
+     */
+    @Nullable
+    public final Integer maxScriptFields() {
+        return this.maxScriptFields;
+    }
+
+    /**
+     * API name: {@code max_ngram_diff}
+     */
+    @Nullable
+    public final Integer maxNgramDiff() {
+        return this.maxNgramDiff;
+    }
+
+    /**
+     * API name: {@code max_shingle_diff}
+     */
+    @Nullable
+    public final Integer maxShingleDiff() {
+        return this.maxShingleDiff;
+    }
+
+    /**
+     * API name: {@code blocks}
+     */
+    @Nullable
+    public final IndexSettingBlocks blocks() {
+        return this.blocks;
+    }
+
+    /**
+     * API name: {@code blocks.read_only}
+     */
+    @Nullable
+    public final Boolean blocksReadOnly() {
+        return this.blocksReadOnly;
+    }
+
+    /**
+     * API name: {@code blocks.read_only_allow_delete}
+     */
+    @Nullable
+    public final Boolean blocksReadOnlyAllowDelete() {
+        return this.blocksReadOnlyAllowDelete;
+    }
+
+    /**
+     * API name: {@code blocks.read}
+     */
+    @Nullable
+    public final Boolean blocksRead() {
+        return this.blocksRead;
+    }
+
+    /**
+     * API name: {@code blocks.write}
+     */
+    @Nullable
+    public final Boolean blocksWrite() {
+        return this.blocksWrite;
+    }
+
+    /**
+     * API name: {@code blocks.metadata}
+     */
+    @Nullable
+    public final Boolean blocksMetadata() {
+        return this.blocksMetadata;
+    }
+
+    /**
+     * API name: {@code max_refresh_listeners}
+     */
+    @Nullable
+    public final Integer maxRefreshListeners() {
+        return this.maxRefreshListeners;
+    }
+
+    /**
+     * API name: {@code analyze.max_token_count}
+     */
+    @Nullable
+    public final Integer analyzeMaxTokenCount() {
+        return this.analyzeMaxTokenCount;
+    }
+
+    /**
+     * API name: {@code highlight.max_analyzed_offset}
+     */
+    @Nullable
+    public final Integer highlightMaxAnalyzedOffset() {
+        return this.highlightMaxAnalyzedOffset;
+    }
+
+    /**
+     * API name: {@code max_terms_count}
+     */
+    @Nullable
+    public final Integer maxTermsCount() {
+        return this.maxTermsCount;
+    }
+
+    /**
+     * API name: {@code max_regex_length}
+     */
+    @Nullable
+    public final Integer maxRegexLength() {
+        return this.maxRegexLength;
+    }
+
+    /**
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final IndexRouting routing() {
+        return this.routing;
+    }
+
+    /**
+     * API name: {@code gc_deletes}
+     */
+    @Nullable
+    public final Time gcDeletes() {
+        return this.gcDeletes;
+    }
+
+    /**
+     * API name: {@code default_pipeline}
+     */
+    @Nullable
+    public final String defaultPipeline() {
+        return this.defaultPipeline;
+    }
+
+    /**
+     * API name: {@code final_pipeline}
+     */
+    @Nullable
+    public final String finalPipeline() {
+        return this.finalPipeline;
+    }
+
+    /**
+     * API name: {@code lifecycle.name}
+     */
+    @Nullable
+    public final String lifecycleName() {
+        return this.lifecycleName;
+    }
+
+    /**
+     * API name: {@code provided_name}
+     */
+    @Nullable
+    public final String providedName() {
+        return this.providedName;
+    }
+
+    /**
+     * API name: {@code creation_date}
+     */
+    @Nullable
+    public final String creationDate() {
+        return this.creationDate;
+    }
+
+    /**
+     * API name: {@code uuid}
+     */
+    @Nullable
+    public final String uuid() {
+        return this.uuid;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final IndexVersioning version() {
+        return this.version;
+    }
+
+    /**
+     * API name: {@code verified_before_close}
+     */
+    @Nullable
+    public final Boolean verifiedBeforeClose() {
+        return this.verifiedBeforeClose;
+    }
+
+    /**
+     * API name: {@code format}
+     */
+    @Nullable
+    public final String format() {
+        return this.format;
+    }
+
+    /**
+     * API name: {@code max_slices_per_scroll}
+     */
+    @Nullable
+    public final Integer maxSlicesPerScroll() {
+        return this.maxSlicesPerScroll;
+    }
+
+    /**
+     * API name: {@code translog}
+     */
+    @Nullable
+    public final Translog translog() {
+        return this.translog;
+    }
+
+    /**
+     * API name: {@code translog.durability}
+     * @deprecated use {@link #translog()} instead
+     */
+    @Deprecated
+    @Nullable
+    public final String translogDurability() {
+        return this.translog != null ? this.translog.durability() : null;
+    }
+
+    /**
+     * API name: {@code translog.flush_threshold_size}
+     * @deprecated use {@link #translog()} instead
+     */
+    @Deprecated
+    @Nullable
+    public final String translogFlushThresholdSize() {
+        return this.translog != null ? this.translog.flushThresholdSize() : null;
+    }
+
+    /**
+     * API name: {@code query_string.lenient}
+     */
+    @Nullable
+    public final Boolean queryStringLenient() {
+        return this.queryStringLenient;
+    }
+
+    /**
+     * API name: {@code priority}
+     */
+    @Nullable
+    public final String priority() {
+        return this.priority;
+    }
+
+    /**
+     * API name: {@code top_metrics_max_size}
+     */
+    @Nullable
+    public final Integer topMetricsMaxSize() {
+        return this.topMetricsMaxSize;
+    }
+
+    /**
+     * API name: {@code analysis}
+     */
+    @Nullable
+    public final IndexSettingsAnalysis analysis() {
+        return this.analysis;
+    }
+
+    /**
+     * API name: {@code settings}
+     */
+    @Nullable
+    public final IndexSettings settings() {
+        return this.settings;
+    }
+
+    /**
+     * API name: {@code mapping}
+     */
+    @Nullable
+    public final IndexSettingsMapping mapping() {
+        return this.mapping;
+    }
+
+    /**
+     * API name: {@code knn}
+     */
+    @Nullable
+    public final Boolean knn() {
+        return this.knn;
+    }
+
+    /**
+     * API name: {@code knn.algo_param.ef_search}
+     */
+    @Nullable
+    public final Integer knnAlgoParamEfSearch() {
+        return this.knnAlgoParamEfSearch;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.index != null) {
+            generator.writeKey("index");
+            this.index.serialize(generator, mapper);
+
+        }
+        if (this.mode != null) {
+            generator.writeKey("mode");
+            generator.write(this.mode);
+
+        }
+        if (ApiTypeHelper.isDefined(this.routingPath)) {
+            generator.writeKey("routing_path");
+            generator.writeStartArray();
+            for (String item0 : this.routingPath) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.softDeletes != null) {
+            generator.writeKey("soft_deletes");
+            this.softDeletes.serialize(generator, mapper);
+
+        }
+        if (this.sort != null) {
+            generator.writeKey("sort");
+            this.sort.serialize(generator, mapper);
+
+        }
+        if (this.numberOfShards != null) {
+            generator.writeKey("number_of_shards");
+            generator.write(this.numberOfShards);
+
+        }
+        if (this.numberOfReplicas != null) {
+            generator.writeKey("number_of_replicas");
+            generator.write(this.numberOfReplicas);
+
+        }
+        if (this.numberOfRoutingShards != null) {
+            generator.writeKey("number_of_routing_shards");
+            generator.write(this.numberOfRoutingShards);
+
+        }
+        if (this.checkOnStartup != null) {
+            generator.writeKey("check_on_startup");
+            this.checkOnStartup.serialize(generator, mapper);
+        }
+        if (this.codec != null) {
+            generator.writeKey("codec");
+            generator.write(this.codec);
+
+        }
+        if (this.routingPartitionSize != null) {
+            generator.writeKey("routing_partition_size");
+            generator.write(this.routingPartitionSize);
+
+        }
+        if (this.softDeletesRetentionLeasePeriod != null) {
+            generator.writeKey("soft_deletes.retention_lease.period");
+            this.softDeletesRetentionLeasePeriod.serialize(generator, mapper);
+
+        }
+        if (this.loadFixedBitsetFiltersEagerly != null) {
+            generator.writeKey("load_fixed_bitset_filters_eagerly");
+            generator.write(this.loadFixedBitsetFiltersEagerly);
+
+        }
+        if (this.hidden != null) {
+            generator.writeKey("hidden");
+            generator.write(this.hidden);
+
+        }
+        if (this.autoExpandReplicas != null) {
+            generator.writeKey("auto_expand_replicas");
+            generator.write(this.autoExpandReplicas);
+
+        }
+        if (this.mergeSchedulerMaxThreadCount != null) {
+            generator.writeKey("merge.scheduler.max_thread_count");
+            generator.write(this.mergeSchedulerMaxThreadCount);
+
+        }
+        if (this.searchIdleAfter != null) {
+            generator.writeKey("search.idle.after");
+            this.searchIdleAfter.serialize(generator, mapper);
+
+        }
+        if (this.refreshInterval != null) {
+            generator.writeKey("refresh_interval");
+            this.refreshInterval.serialize(generator, mapper);
+
+        }
+        if (this.maxResultWindow != null) {
+            generator.writeKey("max_result_window");
+            generator.write(this.maxResultWindow);
+
+        }
+        if (this.maxInnerResultWindow != null) {
+            generator.writeKey("max_inner_result_window");
+            generator.write(this.maxInnerResultWindow);
+
+        }
+        if (this.maxRescoreWindow != null) {
+            generator.writeKey("max_rescore_window");
+            generator.write(this.maxRescoreWindow);
+
+        }
+        if (this.maxDocvalueFieldsSearch != null) {
+            generator.writeKey("max_docvalue_fields_search");
+            generator.write(this.maxDocvalueFieldsSearch);
+
+        }
+        if (this.maxScriptFields != null) {
+            generator.writeKey("max_script_fields");
+            generator.write(this.maxScriptFields);
+
+        }
+        if (this.maxNgramDiff != null) {
+            generator.writeKey("max_ngram_diff");
+            generator.write(this.maxNgramDiff);
+
+        }
+        if (this.maxShingleDiff != null) {
+            generator.writeKey("max_shingle_diff");
+            generator.write(this.maxShingleDiff);
+
+        }
+        if (this.blocks != null) {
+            generator.writeKey("blocks");
+            this.blocks.serialize(generator, mapper);
+
+        }
+        if (this.blocksReadOnly != null) {
+            generator.writeKey("blocks.read_only");
+            generator.write(this.blocksReadOnly);
+
+        }
+        if (this.blocksReadOnlyAllowDelete != null) {
+            generator.writeKey("blocks.read_only_allow_delete");
+            generator.write(this.blocksReadOnlyAllowDelete);
+
+        }
+        if (this.blocksRead != null) {
+            generator.writeKey("blocks.read");
+            generator.write(this.blocksRead);
+
+        }
+        if (this.blocksWrite != null) {
+            generator.writeKey("blocks.write");
+            generator.write(this.blocksWrite);
+
+        }
+        if (this.blocksMetadata != null) {
+            generator.writeKey("blocks.metadata");
+            generator.write(this.blocksMetadata);
+
+        }
+        if (this.maxRefreshListeners != null) {
+            generator.writeKey("max_refresh_listeners");
+            generator.write(this.maxRefreshListeners);
+
+        }
+        if (this.analyzeMaxTokenCount != null) {
+            generator.writeKey("analyze.max_token_count");
+            generator.write(this.analyzeMaxTokenCount);
+
+        }
+        if (this.highlightMaxAnalyzedOffset != null) {
+            generator.writeKey("highlight.max_analyzed_offset");
+            generator.write(this.highlightMaxAnalyzedOffset);
+
+        }
+        if (this.maxTermsCount != null) {
+            generator.writeKey("max_terms_count");
+            generator.write(this.maxTermsCount);
+
+        }
+        if (this.maxRegexLength != null) {
+            generator.writeKey("max_regex_length");
+            generator.write(this.maxRegexLength);
+
+        }
+        if (this.routing != null) {
+            generator.writeKey("routing");
+            this.routing.serialize(generator, mapper);
+
+        }
+        if (this.gcDeletes != null) {
+            generator.writeKey("gc_deletes");
+            this.gcDeletes.serialize(generator, mapper);
+
+        }
+        if (this.defaultPipeline != null) {
+            generator.writeKey("default_pipeline");
+            generator.write(this.defaultPipeline);
+
+        }
+        if (this.finalPipeline != null) {
+            generator.writeKey("final_pipeline");
+            generator.write(this.finalPipeline);
+
+        }
+
+        if (this.lifecycleName != null) {
+            generator.writeKey("lifecycle.name");
+            generator.write(this.lifecycleName);
+
+        }
+        if (this.providedName != null) {
+            generator.writeKey("provided_name");
+            generator.write(this.providedName);
+
+        }
+        if (this.creationDate != null) {
+            generator.writeKey("creation_date");
+            generator.write(this.creationDate);
+
+        }
+        if (this.uuid != null) {
+            generator.writeKey("uuid");
+            generator.write(this.uuid);
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            this.version.serialize(generator, mapper);
+
+        }
+        if (this.verifiedBeforeClose != null) {
+            generator.writeKey("verified_before_close");
+            generator.write(this.verifiedBeforeClose);
+
+        }
+        if (this.format != null) {
+            generator.writeKey("format");
+            generator.write(this.format);
+
+        }
+        if (this.maxSlicesPerScroll != null) {
+            generator.writeKey("max_slices_per_scroll");
+            generator.write(this.maxSlicesPerScroll);
+
+        }
+        if (this.translog != null) {
+            generator.writeKey("translog");
+            this.translog.serialize(generator, mapper);
+
+        }
+        if (this.queryStringLenient != null) {
+            generator.writeKey("query_string.lenient");
+            generator.write(this.queryStringLenient);
 
-		}
-		if (this.priority != null) {
-			generator.writeKey("priority");
-			generator.write(this.priority);
+        }
+        if (this.priority != null) {
+            generator.writeKey("priority");
+            generator.write(this.priority);
 
-		}
-		if (this.topMetricsMaxSize != null) {
-			generator.writeKey("top_metrics_max_size");
-			generator.write(this.topMetricsMaxSize);
+        }
+        if (this.topMetricsMaxSize != null) {
+            generator.writeKey("top_metrics_max_size");
+            generator.write(this.topMetricsMaxSize);
 
-		}
-		if (this.analysis != null) {
-			generator.writeKey("analysis");
-			this.analysis.serialize(generator, mapper);
+        }
+        if (this.analysis != null) {
+            generator.writeKey("analysis");
+            this.analysis.serialize(generator, mapper);
 
-		}
-		if (this.settings != null) {
-			generator.writeKey("settings");
-			this.settings.serialize(generator, mapper);
+        }
+        if (this.settings != null) {
+            generator.writeKey("settings");
+            this.settings.serialize(generator, mapper);
 
-		}
-		if (this.mapping != null) {
-			generator.writeKey("mapping");
-			this.mapping.serialize(generator, mapper);
+        }
+        if (this.mapping != null) {
+            generator.writeKey("mapping");
+            this.mapping.serialize(generator, mapper);
 
-		}
-		if (this.knn != null) {
-			generator.writeKey("knn");
-			generator.write(this.knn);
+        }
+        if (this.knn != null) {
+            generator.writeKey("knn");
+            generator.write(this.knn);
 
-		}
-		if (this.knnAlgoParamEfSearch != null) {
-			generator.writeKey("knn.algo_param.ef_search");
-			generator.write(this.knnAlgoParamEfSearch);
+        }
+        if (this.knnAlgoParamEfSearch != null) {
+            generator.writeKey("knn.algo_param.ef_search");
+            generator.write(this.knnAlgoParamEfSearch);
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link IndexSettings}.
-	 */
+    /**
+     * Builder for {@link IndexSettings}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexSettings> {
-		@Nullable
-		private IndexSettings index;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexSettings> {
+        @Nullable
+        private IndexSettings index;
 
-		@Nullable
-		private String mode;
+        @Nullable
+        private String mode;
 
-		@Nullable
-		private List<String> routingPath;
+        @Nullable
+        private List<String> routingPath;
 
-		@Nullable
-		private SoftDeletes softDeletes;
+        @Nullable
+        private SoftDeletes softDeletes;
 
-		@Nullable
-		private IndexSegmentSort sort;
+        @Nullable
+        private IndexSegmentSort sort;
 
-		@Nullable
-		private String numberOfShards;
+        @Nullable
+        private String numberOfShards;
 
-		@Nullable
-		private String numberOfReplicas;
+        @Nullable
+        private String numberOfReplicas;
 
-		@Nullable
-		private Integer numberOfRoutingShards;
+        @Nullable
+        private Integer numberOfRoutingShards;
 
-		@Nullable
-		private IndexCheckOnStartup checkOnStartup;
+        @Nullable
+        private IndexCheckOnStartup checkOnStartup;
 
-		@Nullable
-		private String codec;
+        @Nullable
+        private String codec;
 
-		@Nullable
-		private Integer routingPartitionSize;
+        @Nullable
+        private Integer routingPartitionSize;
 
-		@Nullable
-		private Time softDeletesRetentionLeasePeriod;
+        @Nullable
+        private Time softDeletesRetentionLeasePeriod;
 
-		@Nullable
-		private Boolean loadFixedBitsetFiltersEagerly;
+        @Nullable
+        private Boolean loadFixedBitsetFiltersEagerly;
 
-		@Nullable
-		private Boolean hidden;
+        @Nullable
+        private Boolean hidden;
 
-		@Nullable
-		private String autoExpandReplicas;
+        @Nullable
+        private String autoExpandReplicas;
 
-		@Nullable
-		private Integer mergeSchedulerMaxThreadCount;
+        @Nullable
+        private Integer mergeSchedulerMaxThreadCount;
 
-		@Nullable
-		private Time searchIdleAfter;
+        @Nullable
+        private Time searchIdleAfter;
 
-		@Nullable
-		private Time refreshInterval;
+        @Nullable
+        private Time refreshInterval;
 
-		@Nullable
-		private Integer maxResultWindow;
+        @Nullable
+        private Integer maxResultWindow;
 
-		@Nullable
-		private Integer maxInnerResultWindow;
+        @Nullable
+        private Integer maxInnerResultWindow;
 
-		@Nullable
-		private Integer maxRescoreWindow;
+        @Nullable
+        private Integer maxRescoreWindow;
 
-		@Nullable
-		private Integer maxDocvalueFieldsSearch;
+        @Nullable
+        private Integer maxDocvalueFieldsSearch;
 
-		@Nullable
-		private Integer maxScriptFields;
+        @Nullable
+        private Integer maxScriptFields;
 
-		@Nullable
-		private Integer maxNgramDiff;
+        @Nullable
+        private Integer maxNgramDiff;
 
-		@Nullable
-		private Integer maxShingleDiff;
+        @Nullable
+        private Integer maxShingleDiff;
 
-		@Nullable
-		private IndexSettingBlocks blocks;
+        @Nullable
+        private IndexSettingBlocks blocks;
 
-		@Nullable
-		private Boolean blocksReadOnly;
+        @Nullable
+        private Boolean blocksReadOnly;
 
-		@Nullable
-		private Boolean blocksReadOnlyAllowDelete;
+        @Nullable
+        private Boolean blocksReadOnlyAllowDelete;
 
-		@Nullable
-		private Boolean blocksRead;
+        @Nullable
+        private Boolean blocksRead;
 
-		@Nullable
-		private Boolean blocksWrite;
+        @Nullable
+        private Boolean blocksWrite;
 
-		@Nullable
-		private Boolean blocksMetadata;
+        @Nullable
+        private Boolean blocksMetadata;
 
-		@Nullable
-		private Integer maxRefreshListeners;
+        @Nullable
+        private Integer maxRefreshListeners;
 
-		@Nullable
-		private Integer analyzeMaxTokenCount;
+        @Nullable
+        private Integer analyzeMaxTokenCount;
 
-		@Nullable
-		private Integer highlightMaxAnalyzedOffset;
+        @Nullable
+        private Integer highlightMaxAnalyzedOffset;
 
-		@Nullable
-		private Integer maxTermsCount;
+        @Nullable
+        private Integer maxTermsCount;
 
-		@Nullable
-		private Integer maxRegexLength;
+        @Nullable
+        private Integer maxRegexLength;
 
-		@Nullable
-		private IndexRouting routing;
+        @Nullable
+        private IndexRouting routing;
 
-		@Nullable
-		private Time gcDeletes;
+        @Nullable
+        private Time gcDeletes;
 
-		@Nullable
-		private String defaultPipeline;
+        @Nullable
+        private String defaultPipeline;
 
-		@Nullable
-		private String finalPipeline;
+        @Nullable
+        private String finalPipeline;
 
-		@Nullable
-		private String lifecycleName;
+        @Nullable
+        private String lifecycleName;
 
-		@Nullable
-		private String providedName;
+        @Nullable
+        private String providedName;
 
-		@Nullable
-		private String creationDate;
+        @Nullable
+        private String creationDate;
 
-		@Nullable
-		private String uuid;
+        @Nullable
+        private String uuid;
 
-		@Nullable
-		private IndexVersioning version;
+        @Nullable
+        private IndexVersioning version;
 
-		@Nullable
-		private Boolean verifiedBeforeClose;
+        @Nullable
+        private Boolean verifiedBeforeClose;
 
-		@Nullable
-		private String format;
+        @Nullable
+        private String format;
 
-		@Nullable
-		private Integer maxSlicesPerScroll;
+        @Nullable
+        private Integer maxSlicesPerScroll;
 
-		@Nullable
-		private Translog translog;
+        @Nullable
+        private Translog translog;
 
-		@Nullable
-		private Boolean queryStringLenient;
+        @Nullable
+        private Boolean queryStringLenient;
 
-		@Nullable
-		private String priority;
+        @Nullable
+        private String priority;
 
-		@Nullable
-		private Integer topMetricsMaxSize;
-
-		@Nullable
-		private IndexSettingsAnalysis analysis;
-
-		@Nullable
-		private IndexSettings settings;
-
-		@Nullable
-		private IndexSettingsMapping mapping;
-
-		@Nullable
-		private Boolean knn;
-
-		@Nullable
-		private Integer knnAlgoParamEfSearch;
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable IndexSettings value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final Builder index(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
-			return this.index(fn.apply(new IndexSettings.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code mode}
-		 */
-		public final Builder mode(@Nullable String value) {
-			this.mode = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code routing_path}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>routingPath</code>.
-		 */
-		public final Builder routingPath(List<String> list) {
-			this.routingPath = _listAddAll(this.routingPath, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code routing_path}
-		 * <p>
-		 * Adds one or more values to <code>routingPath</code>.
-		 */
-		public final Builder routingPath(String value, String... values) {
-			this.routingPath = _listAdd(this.routingPath, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code soft_deletes}
-		 */
-		public final Builder softDeletes(@Nullable SoftDeletes value) {
-			this.softDeletes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code soft_deletes}
-		 */
-		public final Builder softDeletes(Function<SoftDeletes.Builder, ObjectBuilder<SoftDeletes>> fn) {
-			return this.softDeletes(fn.apply(new SoftDeletes.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code sort}
-		 */
-		public final Builder sort(@Nullable IndexSegmentSort value) {
-			this.sort = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 */
-		public final Builder sort(Function<IndexSegmentSort.Builder, ObjectBuilder<IndexSegmentSort>> fn) {
-			return this.sort(fn.apply(new IndexSegmentSort.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code number_of_shards}
-		 */
-		public final Builder numberOfShards(@Nullable String value) {
-			this.numberOfShards = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code number_of_replicas}
-		 */
-		public final Builder numberOfReplicas(@Nullable String value) {
-			this.numberOfReplicas = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code number_of_routing_shards}
-		 */
-		public final Builder numberOfRoutingShards(@Nullable Integer value) {
-			this.numberOfRoutingShards = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code check_on_startup}
-		 */
-		public final Builder checkOnStartup(@Nullable IndexCheckOnStartup value) {
-			this.checkOnStartup = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code codec}
-		 */
-		public final Builder codec(@Nullable String value) {
-			this.codec = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code routing_partition_size}
-		 */
-		public final Builder routingPartitionSize(@Nullable Integer value) {
-			this.routingPartitionSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code soft_deletes.retention_lease.period}
-		 */
-		public final Builder softDeletesRetentionLeasePeriod(@Nullable Time value) {
-			this.softDeletesRetentionLeasePeriod = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code soft_deletes.retention_lease.period}
-		 */
-		public final Builder softDeletesRetentionLeasePeriod(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.softDeletesRetentionLeasePeriod(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code load_fixed_bitset_filters_eagerly}
-		 */
-		public final Builder loadFixedBitsetFiltersEagerly(@Nullable Boolean value) {
-			this.loadFixedBitsetFiltersEagerly = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code hidden}
-		 */
-		public final Builder hidden(@Nullable Boolean value) {
-			this.hidden = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code auto_expand_replicas}
-		 */
-		public final Builder autoExpandReplicas(@Nullable String value) {
-			this.autoExpandReplicas = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code merge.scheduler.max_thread_count}
-		 */
-		public final Builder mergeSchedulerMaxThreadCount(@Nullable Integer value) {
-			this.mergeSchedulerMaxThreadCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code search.idle.after}
-		 */
-		public final Builder searchIdleAfter(@Nullable Time value) {
-			this.searchIdleAfter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code search.idle.after}
-		 */
-		public final Builder searchIdleAfter(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.searchIdleAfter(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code refresh_interval}
-		 */
-		public final Builder refreshInterval(@Nullable Time value) {
-			this.refreshInterval = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code refresh_interval}
-		 */
-		public final Builder refreshInterval(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.refreshInterval(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code max_result_window}
-		 */
-		public final Builder maxResultWindow(@Nullable Integer value) {
-			this.maxResultWindow = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_inner_result_window}
-		 */
-		public final Builder maxInnerResultWindow(@Nullable Integer value) {
-			this.maxInnerResultWindow = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_rescore_window}
-		 */
-		public final Builder maxRescoreWindow(@Nullable Integer value) {
-			this.maxRescoreWindow = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_docvalue_fields_search}
-		 */
-		public final Builder maxDocvalueFieldsSearch(@Nullable Integer value) {
-			this.maxDocvalueFieldsSearch = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_script_fields}
-		 */
-		public final Builder maxScriptFields(@Nullable Integer value) {
-			this.maxScriptFields = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_ngram_diff}
-		 */
-		public final Builder maxNgramDiff(@Nullable Integer value) {
-			this.maxNgramDiff = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_shingle_diff}
-		 */
-		public final Builder maxShingleDiff(@Nullable Integer value) {
-			this.maxShingleDiff = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code blocks}
-		 */
-		public final Builder blocks(@Nullable IndexSettingBlocks value) {
-			this.blocks = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code blocks}
-		 */
-		public final Builder blocks(Function<IndexSettingBlocks.Builder, ObjectBuilder<IndexSettingBlocks>> fn) {
-			return this.blocks(fn.apply(new IndexSettingBlocks.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code blocks.read_only}
-		 */
-		public final Builder blocksReadOnly(@Nullable Boolean value) {
-			this.blocksReadOnly = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code blocks.read_only_allow_delete}
-		 */
-		public final Builder blocksReadOnlyAllowDelete(@Nullable Boolean value) {
-			this.blocksReadOnlyAllowDelete = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code blocks.read}
-		 */
-		public final Builder blocksRead(@Nullable Boolean value) {
-			this.blocksRead = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code blocks.write}
-		 */
-		public final Builder blocksWrite(@Nullable Boolean value) {
-			this.blocksWrite = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code blocks.metadata}
-		 */
-		public final Builder blocksMetadata(@Nullable Boolean value) {
-			this.blocksMetadata = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_refresh_listeners}
-		 */
-		public final Builder maxRefreshListeners(@Nullable Integer value) {
-			this.maxRefreshListeners = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code analyze.max_token_count}
-		 */
-		public final Builder analyzeMaxTokenCount(@Nullable Integer value) {
-			this.analyzeMaxTokenCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code highlight.max_analyzed_offset}
-		 */
-		public final Builder highlightMaxAnalyzedOffset(@Nullable Integer value) {
-			this.highlightMaxAnalyzedOffset = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_terms_count}
-		 */
-		public final Builder maxTermsCount(@Nullable Integer value) {
-			this.maxTermsCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_regex_length}
-		 */
-		public final Builder maxRegexLength(@Nullable Integer value) {
-			this.maxRegexLength = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable IndexRouting value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(Function<IndexRouting.Builder, ObjectBuilder<IndexRouting>> fn) {
-			return this.routing(fn.apply(new IndexRouting.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code gc_deletes}
-		 */
-		public final Builder gcDeletes(@Nullable Time value) {
-			this.gcDeletes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code gc_deletes}
-		 */
-		public final Builder gcDeletes(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.gcDeletes(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code default_pipeline}
-		 */
-		public final Builder defaultPipeline(@Nullable String value) {
-			this.defaultPipeline = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code final_pipeline}
-		 */
-		public final Builder finalPipeline(@Nullable String value) {
-			this.finalPipeline = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code lifecycle.name}
-		 */
-		public final Builder lifecycleName(@Nullable String value) {
-			this.lifecycleName = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code provided_name}
-		 */
-		public final Builder providedName(@Nullable String value) {
-			this.providedName = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code creation_date}
-		 */
-		public final Builder creationDate(@Nullable String value) {
-			this.creationDate = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code uuid}
-		 */
-		public final Builder uuid(@Nullable String value) {
-			this.uuid = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable IndexVersioning value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(Function<IndexVersioning.Builder, ObjectBuilder<IndexVersioning>> fn) {
-			return this.version(fn.apply(new IndexVersioning.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code verified_before_close}
-		 */
-		public final Builder verifiedBeforeClose(@Nullable Boolean value) {
-			this.verifiedBeforeClose = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code format}
-		 */
-		public final Builder format(@Nullable String value) {
-			this.format = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_slices_per_scroll}
-		 */
-		public final Builder maxSlicesPerScroll(@Nullable Integer value) {
-			this.maxSlicesPerScroll = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code translog}
-		 */
-		public final Builder translog(@Nullable Translog value) {
-			this.translog = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code translog.durability}
-		 * @deprecated use {@link #translog()} instead
-		 */
-		@Deprecated
-		public final Builder translogDurability(@Nullable String value) {
-			if (translog == null) {
-				translog = Translog.of(b -> b.durability(value));
-			} else {
-				translog = Translog.of(b -> b.durability(value)
-						.flushThresholdSize(translog.flushThresholdSize())
-						.syncInterval(translog.syncInterval()));
-			}
-			return this;
-		}
-
-		/**
-		 * API name: {@code translog.flush_threshold_size}
-		 * @deprecated use {@link #translog()} instead
-		 */
-		@Deprecated
-		public final Builder translogFlushThresholdSize(@Nullable String value) {
-			if (translog == null) {
-				translog = Translog.of(b -> b.flushThresholdSize(value));
-			} else {
-				translog = Translog.of(b -> b.flushThresholdSize(value)
-						.durability(translog.durability())
-						.syncInterval(translog.syncInterval()));
-			}
-			return this;
-		}
-
-		/**
-		 * API name: {@code query_string.lenient}
-		 */
-		public final Builder queryStringLenient(@Nullable Boolean value) {
-			this.queryStringLenient = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code priority}
-		 */
-		public final Builder priority(@Nullable String value) {
-			this.priority = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code top_metrics_max_size}
-		 */
-		public final Builder topMetricsMaxSize(@Nullable Integer value) {
-			this.topMetricsMaxSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code analysis}
-		 */
-		public final Builder analysis(@Nullable IndexSettingsAnalysis value) {
-			this.analysis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code analysis}
-		 */
-		public final Builder analysis(
-				Function<IndexSettingsAnalysis.Builder, ObjectBuilder<IndexSettingsAnalysis>> fn) {
-			return this.analysis(fn.apply(new IndexSettingsAnalysis.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code settings}
-		 */
-		public final Builder settings(@Nullable IndexSettings value) {
-			this.settings = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code settings}
-		 */
-		public final Builder settings(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
-			return this.settings(fn.apply(new IndexSettings.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code mapping}
-		 */
-		public final Builder mapping(@Nullable IndexSettingsMapping value) {
-			this.mapping = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mapping}
-		 */
-		public final Builder mapping(Function<IndexSettingsMapping.Builder, ObjectBuilder<IndexSettingsMapping>> fn) {
-			return this.mapping(fn.apply(new IndexSettingsMapping.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link IndexSettings}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexSettings build() {
-			_checkSingleUse();
-
-			return new IndexSettings(this);
-		}
-
-		/**
-		 *  API name: {@code knn}
-		 */
-		public final Builder knn(@Nullable Boolean value) {
-			this.knn = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code knn.algo_param.ef_search}
-		 */
-		public final Builder knnAlgoParamEfSearch(@Nullable Integer value) {
-			this.knnAlgoParamEfSearch = value;
-			return this;
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndexSettings}
-	 */
-	public static final JsonpDeserializer<IndexSettings> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IndexSettings::setupIndexSettingsDeserializer);
-
-	protected static void setupIndexSettingsDeserializer(ObjectDeserializer<IndexSettings.Builder> op) {
-
-		op.add(Builder::index, IndexSettings._DESERIALIZER, "index");
-		op.add(Builder::mode, JsonpDeserializer.stringDeserializer(), "mode", "index.mode");
-		op.add(Builder::routingPath, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"routing_path", "index.routing_path");
-		op.add(Builder::softDeletes, SoftDeletes._DESERIALIZER, "soft_deletes", "index.soft_deletes");
-		op.add(Builder::sort, IndexSegmentSort._DESERIALIZER, "sort", "index.sort");
-		op.add(Builder::numberOfShards, JsonpDeserializer.stringDeserializer(), "number_of_shards",
-				"index.number_of_shards");
-		op.add(Builder::numberOfReplicas, JsonpDeserializer.stringDeserializer(), "number_of_replicas",
-				"index.number_of_replicas");
-		op.add(Builder::numberOfRoutingShards, JsonpDeserializer.integerDeserializer(), "number_of_routing_shards",
-				"index.number_of_routing_shards");
-		op.add(Builder::checkOnStartup, IndexCheckOnStartup._DESERIALIZER, "check_on_startup",
-				"index.check_on_startup");
-		op.add(Builder::codec, JsonpDeserializer.stringDeserializer(), "codec", "index.codec");
-		op.add(Builder::routingPartitionSize, JsonpDeserializer.integerDeserializer(), "routing_partition_size",
-				"index.routing_partition_size");
-		op.add(Builder::softDeletesRetentionLeasePeriod, Time._DESERIALIZER, "soft_deletes.retention_lease.period",
-				"index.soft_deletes.retention_lease.period");
-		op.add(Builder::loadFixedBitsetFiltersEagerly, JsonpDeserializer.booleanDeserializer(),
-				"load_fixed_bitset_filters_eagerly", "index.load_fixed_bitset_filters_eagerly");
-		op.add(Builder::hidden, JsonpDeserializer.booleanDeserializer(), "hidden", "index.hidden");
-		op.add(Builder::autoExpandReplicas, JsonpDeserializer.stringDeserializer(), "auto_expand_replicas",
-				"index.auto_expand_replicas");
-		op.add(Builder::mergeSchedulerMaxThreadCount, JsonpDeserializer.integerDeserializer(),
-				"merge.scheduler.max_thread_count", "index.merge.scheduler.max_thread_count");
-		op.add(Builder::searchIdleAfter, Time._DESERIALIZER, "search.idle.after", "index.search.idle.after");
-		op.add(Builder::refreshInterval, Time._DESERIALIZER, "refresh_interval", "index.refresh_interval");
-		op.add(Builder::maxResultWindow, JsonpDeserializer.integerDeserializer(), "max_result_window",
-				"index.max_result_window");
-		op.add(Builder::maxInnerResultWindow, JsonpDeserializer.integerDeserializer(), "max_inner_result_window",
-				"index.max_inner_result_window");
-		op.add(Builder::maxRescoreWindow, JsonpDeserializer.integerDeserializer(), "max_rescore_window",
-				"index.max_rescore_window");
-		op.add(Builder::maxDocvalueFieldsSearch, JsonpDeserializer.integerDeserializer(), "max_docvalue_fields_search",
-				"index.max_docvalue_fields_search");
-		op.add(Builder::maxScriptFields, JsonpDeserializer.integerDeserializer(), "max_script_fields",
-				"index.max_script_fields");
-		op.add(Builder::maxNgramDiff, JsonpDeserializer.integerDeserializer(), "max_ngram_diff",
-				"index.max_ngram_diff");
-		op.add(Builder::maxShingleDiff, JsonpDeserializer.integerDeserializer(), "max_shingle_diff",
-				"index.max_shingle_diff");
-		op.add(Builder::blocks, IndexSettingBlocks._DESERIALIZER, "blocks", "index.blocks");
-		op.add(Builder::blocksReadOnly, JsonpDeserializer.booleanDeserializer(), "blocks.read_only",
-				"index.blocks.read_only");
-		op.add(Builder::blocksReadOnlyAllowDelete, JsonpDeserializer.booleanDeserializer(),
-				"blocks.read_only_allow_delete", "index.blocks.read_only_allow_delete");
-		op.add(Builder::blocksRead, JsonpDeserializer.booleanDeserializer(), "blocks.read", "index.blocks.read");
-		op.add(Builder::blocksWrite, JsonpDeserializer.booleanDeserializer(), "blocks.write", "index.blocks.write");
-		op.add(Builder::blocksMetadata, JsonpDeserializer.booleanDeserializer(), "blocks.metadata",
-				"index.blocks.metadata");
-		op.add(Builder::maxRefreshListeners, JsonpDeserializer.integerDeserializer(), "max_refresh_listeners",
-				"index.max_refresh_listeners");
-		op.add(Builder::analyzeMaxTokenCount, JsonpDeserializer.integerDeserializer(), "analyze.max_token_count",
-				"index.analyze.max_token_count");
-		op.add(Builder::highlightMaxAnalyzedOffset, JsonpDeserializer.integerDeserializer(),
-				"highlight.max_analyzed_offset", "index.highlight.max_analyzed_offset");
-		op.add(Builder::maxTermsCount, JsonpDeserializer.integerDeserializer(), "max_terms_count",
-				"index.max_terms_count");
-		op.add(Builder::maxRegexLength, JsonpDeserializer.integerDeserializer(), "max_regex_length",
-				"index.max_regex_length");
-		op.add(Builder::routing, IndexRouting._DESERIALIZER, "routing", "index.routing");
-		op.add(Builder::gcDeletes, Time._DESERIALIZER, "gc_deletes", "index.gc_deletes");
-		op.add(Builder::defaultPipeline, JsonpDeserializer.stringDeserializer(), "default_pipeline",
-				"index.default_pipeline");
-		op.add(Builder::finalPipeline, JsonpDeserializer.stringDeserializer(), "final_pipeline",
-				"index.final_pipeline");
-		op.add(Builder::lifecycleName, JsonpDeserializer.stringDeserializer(), "lifecycle.name",
-				"index.lifecycle.name");
-		op.add(Builder::providedName, JsonpDeserializer.stringDeserializer(), "provided_name", "index.provided_name");
-		op.add(Builder::creationDate, JsonpDeserializer.stringDeserializer(), "creation_date", "index.creation_date");
-		op.add(Builder::uuid, JsonpDeserializer.stringDeserializer(), "uuid", "index.uuid");
-		op.add(Builder::version, IndexVersioning._DESERIALIZER, "version", "index.version");
-		op.add(Builder::verifiedBeforeClose, JsonpDeserializer.booleanDeserializer(), "verified_before_close",
-				"index.verified_before_close");
-		op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format", "index.format");
-		op.add(Builder::maxSlicesPerScroll, JsonpDeserializer.integerDeserializer(), "max_slices_per_scroll",
-				"index.max_slices_per_scroll");
-		op.add(Builder::translog, Translog._DESERIALIZER, "translog", "index.translog");
-		op.add(Builder::translogDurability, JsonpDeserializer.stringDeserializer(), "translog.durability",
-				"index.translog.durability");
-		op.add(Builder::translogFlushThresholdSize, JsonpDeserializer.stringDeserializer(),
-				"translog.flush_threshold_size", "index.translog.flush_threshold_size");
-		op.add(Builder::queryStringLenient, JsonpDeserializer.booleanDeserializer(), "query_string.lenient",
-				"index.query_string.lenient");
-		op.add(Builder::priority, JsonpDeserializer.stringDeserializer(), "priority", "index.priority");
-		op.add(Builder::topMetricsMaxSize, JsonpDeserializer.integerDeserializer(), "top_metrics_max_size");
-		op.add(Builder::analysis, IndexSettingsAnalysis._DESERIALIZER, "analysis", "index.analysis");
-		op.add(Builder::settings, IndexSettings._DESERIALIZER, "settings");
-		op.add(Builder::mapping, IndexSettingsMapping._DESERIALIZER, "mapping");
-		op.add(Builder::knn, JsonpDeserializer.booleanDeserializer(), "knn", "index.knn");
-		op.add(Builder::knnAlgoParamEfSearch, JsonpDeserializer.integerDeserializer(), "knn.algo_param.ef_search",
-				"index.knn.algo_param.ef_search");
-
-	}
+        @Nullable
+        private Integer topMetricsMaxSize;
+
+        @Nullable
+        private IndexSettingsAnalysis analysis;
+
+        @Nullable
+        private IndexSettings settings;
+
+        @Nullable
+        private IndexSettingsMapping mapping;
+
+        @Nullable
+        private Boolean knn;
+
+        @Nullable
+        private Integer knnAlgoParamEfSearch;
+
+        /**
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable IndexSettings value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index}
+         */
+        public final Builder index(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
+            return this.index(fn.apply(new IndexSettings.Builder()).build());
+        }
+
+        /**
+         * API name: {@code mode}
+         */
+        public final Builder mode(@Nullable String value) {
+            this.mode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code routing_path}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>routingPath</code>.
+         */
+        public final Builder routingPath(List<String> list) {
+            this.routingPath = _listAddAll(this.routingPath, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code routing_path}
+         * <p>
+         * Adds one or more values to <code>routingPath</code>.
+         */
+        public final Builder routingPath(String value, String... values) {
+            this.routingPath = _listAdd(this.routingPath, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code soft_deletes}
+         */
+        public final Builder softDeletes(@Nullable SoftDeletes value) {
+            this.softDeletes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code soft_deletes}
+         */
+        public final Builder softDeletes(Function<SoftDeletes.Builder, ObjectBuilder<SoftDeletes>> fn) {
+            return this.softDeletes(fn.apply(new SoftDeletes.Builder()).build());
+        }
+
+        /**
+         * API name: {@code sort}
+         */
+        public final Builder sort(@Nullable IndexSegmentSort value) {
+            this.sort = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         */
+        public final Builder sort(Function<IndexSegmentSort.Builder, ObjectBuilder<IndexSegmentSort>> fn) {
+            return this.sort(fn.apply(new IndexSegmentSort.Builder()).build());
+        }
+
+        /**
+         * API name: {@code number_of_shards}
+         */
+        public final Builder numberOfShards(@Nullable String value) {
+            this.numberOfShards = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code number_of_replicas}
+         */
+        public final Builder numberOfReplicas(@Nullable String value) {
+            this.numberOfReplicas = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code number_of_routing_shards}
+         */
+        public final Builder numberOfRoutingShards(@Nullable Integer value) {
+            this.numberOfRoutingShards = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code check_on_startup}
+         */
+        public final Builder checkOnStartup(@Nullable IndexCheckOnStartup value) {
+            this.checkOnStartup = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code codec}
+         */
+        public final Builder codec(@Nullable String value) {
+            this.codec = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code routing_partition_size}
+         */
+        public final Builder routingPartitionSize(@Nullable Integer value) {
+            this.routingPartitionSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code soft_deletes.retention_lease.period}
+         */
+        public final Builder softDeletesRetentionLeasePeriod(@Nullable Time value) {
+            this.softDeletesRetentionLeasePeriod = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code soft_deletes.retention_lease.period}
+         */
+        public final Builder softDeletesRetentionLeasePeriod(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.softDeletesRetentionLeasePeriod(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code load_fixed_bitset_filters_eagerly}
+         */
+        public final Builder loadFixedBitsetFiltersEagerly(@Nullable Boolean value) {
+            this.loadFixedBitsetFiltersEagerly = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code hidden}
+         */
+        public final Builder hidden(@Nullable Boolean value) {
+            this.hidden = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code auto_expand_replicas}
+         */
+        public final Builder autoExpandReplicas(@Nullable String value) {
+            this.autoExpandReplicas = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code merge.scheduler.max_thread_count}
+         */
+        public final Builder mergeSchedulerMaxThreadCount(@Nullable Integer value) {
+            this.mergeSchedulerMaxThreadCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code search.idle.after}
+         */
+        public final Builder searchIdleAfter(@Nullable Time value) {
+            this.searchIdleAfter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code search.idle.after}
+         */
+        public final Builder searchIdleAfter(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.searchIdleAfter(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code refresh_interval}
+         */
+        public final Builder refreshInterval(@Nullable Time value) {
+            this.refreshInterval = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code refresh_interval}
+         */
+        public final Builder refreshInterval(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.refreshInterval(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code max_result_window}
+         */
+        public final Builder maxResultWindow(@Nullable Integer value) {
+            this.maxResultWindow = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_inner_result_window}
+         */
+        public final Builder maxInnerResultWindow(@Nullable Integer value) {
+            this.maxInnerResultWindow = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_rescore_window}
+         */
+        public final Builder maxRescoreWindow(@Nullable Integer value) {
+            this.maxRescoreWindow = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_docvalue_fields_search}
+         */
+        public final Builder maxDocvalueFieldsSearch(@Nullable Integer value) {
+            this.maxDocvalueFieldsSearch = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_script_fields}
+         */
+        public final Builder maxScriptFields(@Nullable Integer value) {
+            this.maxScriptFields = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_ngram_diff}
+         */
+        public final Builder maxNgramDiff(@Nullable Integer value) {
+            this.maxNgramDiff = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_shingle_diff}
+         */
+        public final Builder maxShingleDiff(@Nullable Integer value) {
+            this.maxShingleDiff = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code blocks}
+         */
+        public final Builder blocks(@Nullable IndexSettingBlocks value) {
+            this.blocks = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code blocks}
+         */
+        public final Builder blocks(Function<IndexSettingBlocks.Builder, ObjectBuilder<IndexSettingBlocks>> fn) {
+            return this.blocks(fn.apply(new IndexSettingBlocks.Builder()).build());
+        }
+
+        /**
+         * API name: {@code blocks.read_only}
+         */
+        public final Builder blocksReadOnly(@Nullable Boolean value) {
+            this.blocksReadOnly = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code blocks.read_only_allow_delete}
+         */
+        public final Builder blocksReadOnlyAllowDelete(@Nullable Boolean value) {
+            this.blocksReadOnlyAllowDelete = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code blocks.read}
+         */
+        public final Builder blocksRead(@Nullable Boolean value) {
+            this.blocksRead = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code blocks.write}
+         */
+        public final Builder blocksWrite(@Nullable Boolean value) {
+            this.blocksWrite = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code blocks.metadata}
+         */
+        public final Builder blocksMetadata(@Nullable Boolean value) {
+            this.blocksMetadata = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_refresh_listeners}
+         */
+        public final Builder maxRefreshListeners(@Nullable Integer value) {
+            this.maxRefreshListeners = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code analyze.max_token_count}
+         */
+        public final Builder analyzeMaxTokenCount(@Nullable Integer value) {
+            this.analyzeMaxTokenCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code highlight.max_analyzed_offset}
+         */
+        public final Builder highlightMaxAnalyzedOffset(@Nullable Integer value) {
+            this.highlightMaxAnalyzedOffset = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_terms_count}
+         */
+        public final Builder maxTermsCount(@Nullable Integer value) {
+            this.maxTermsCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_regex_length}
+         */
+        public final Builder maxRegexLength(@Nullable Integer value) {
+            this.maxRegexLength = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable IndexRouting value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code routing}
+         */
+        public final Builder routing(Function<IndexRouting.Builder, ObjectBuilder<IndexRouting>> fn) {
+            return this.routing(fn.apply(new IndexRouting.Builder()).build());
+        }
+
+        /**
+         * API name: {@code gc_deletes}
+         */
+        public final Builder gcDeletes(@Nullable Time value) {
+            this.gcDeletes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code gc_deletes}
+         */
+        public final Builder gcDeletes(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.gcDeletes(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code default_pipeline}
+         */
+        public final Builder defaultPipeline(@Nullable String value) {
+            this.defaultPipeline = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code final_pipeline}
+         */
+        public final Builder finalPipeline(@Nullable String value) {
+            this.finalPipeline = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code lifecycle.name}
+         */
+        public final Builder lifecycleName(@Nullable String value) {
+            this.lifecycleName = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code provided_name}
+         */
+        public final Builder providedName(@Nullable String value) {
+            this.providedName = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code creation_date}
+         */
+        public final Builder creationDate(@Nullable String value) {
+            this.creationDate = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code uuid}
+         */
+        public final Builder uuid(@Nullable String value) {
+            this.uuid = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable IndexVersioning value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(Function<IndexVersioning.Builder, ObjectBuilder<IndexVersioning>> fn) {
+            return this.version(fn.apply(new IndexVersioning.Builder()).build());
+        }
+
+        /**
+         * API name: {@code verified_before_close}
+         */
+        public final Builder verifiedBeforeClose(@Nullable Boolean value) {
+            this.verifiedBeforeClose = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code format}
+         */
+        public final Builder format(@Nullable String value) {
+            this.format = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_slices_per_scroll}
+         */
+        public final Builder maxSlicesPerScroll(@Nullable Integer value) {
+            this.maxSlicesPerScroll = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code translog}
+         */
+        public final Builder translog(@Nullable Translog value) {
+            this.translog = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code translog.durability}
+         * @deprecated use {@link #translog()} instead
+         */
+        @Deprecated
+        public final Builder translogDurability(@Nullable String value) {
+            if (translog == null) {
+                translog = Translog.of(b -> b.durability(value));
+            } else {
+                translog = Translog.of(
+                    b -> b.durability(value).flushThresholdSize(translog.flushThresholdSize()).syncInterval(translog.syncInterval())
+                );
+            }
+            return this;
+        }
+
+        /**
+         * API name: {@code translog.flush_threshold_size}
+         * @deprecated use {@link #translog()} instead
+         */
+        @Deprecated
+        public final Builder translogFlushThresholdSize(@Nullable String value) {
+            if (translog == null) {
+                translog = Translog.of(b -> b.flushThresholdSize(value));
+            } else {
+                translog = Translog.of(
+                    b -> b.flushThresholdSize(value).durability(translog.durability()).syncInterval(translog.syncInterval())
+                );
+            }
+            return this;
+        }
+
+        /**
+         * API name: {@code query_string.lenient}
+         */
+        public final Builder queryStringLenient(@Nullable Boolean value) {
+            this.queryStringLenient = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code priority}
+         */
+        public final Builder priority(@Nullable String value) {
+            this.priority = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code top_metrics_max_size}
+         */
+        public final Builder topMetricsMaxSize(@Nullable Integer value) {
+            this.topMetricsMaxSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code analysis}
+         */
+        public final Builder analysis(@Nullable IndexSettingsAnalysis value) {
+            this.analysis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code analysis}
+         */
+        public final Builder analysis(Function<IndexSettingsAnalysis.Builder, ObjectBuilder<IndexSettingsAnalysis>> fn) {
+            return this.analysis(fn.apply(new IndexSettingsAnalysis.Builder()).build());
+        }
+
+        /**
+         * API name: {@code settings}
+         */
+        public final Builder settings(@Nullable IndexSettings value) {
+            this.settings = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code settings}
+         */
+        public final Builder settings(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
+            return this.settings(fn.apply(new IndexSettings.Builder()).build());
+        }
+
+        /**
+         * API name: {@code mapping}
+         */
+        public final Builder mapping(@Nullable IndexSettingsMapping value) {
+            this.mapping = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mapping}
+         */
+        public final Builder mapping(Function<IndexSettingsMapping.Builder, ObjectBuilder<IndexSettingsMapping>> fn) {
+            return this.mapping(fn.apply(new IndexSettingsMapping.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link IndexSettings}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexSettings build() {
+            _checkSingleUse();
+
+            return new IndexSettings(this);
+        }
+
+        /**
+         *  API name: {@code knn}
+         */
+        public final Builder knn(@Nullable Boolean value) {
+            this.knn = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code knn.algo_param.ef_search}
+         */
+        public final Builder knnAlgoParamEfSearch(@Nullable Integer value) {
+            this.knnAlgoParamEfSearch = value;
+            return this;
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndexSettings}
+     */
+    public static final JsonpDeserializer<IndexSettings> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexSettings::setupIndexSettingsDeserializer
+    );
+
+    protected static void setupIndexSettingsDeserializer(ObjectDeserializer<IndexSettings.Builder> op) {
+
+        op.add(Builder::index, IndexSettings._DESERIALIZER, "index");
+        op.add(Builder::mode, JsonpDeserializer.stringDeserializer(), "mode", "index.mode");
+        op.add(
+            Builder::routingPath,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
+            "routing_path",
+            "index.routing_path"
+        );
+        op.add(Builder::softDeletes, SoftDeletes._DESERIALIZER, "soft_deletes", "index.soft_deletes");
+        op.add(Builder::sort, IndexSegmentSort._DESERIALIZER, "sort", "index.sort");
+        op.add(Builder::numberOfShards, JsonpDeserializer.stringDeserializer(), "number_of_shards", "index.number_of_shards");
+        op.add(Builder::numberOfReplicas, JsonpDeserializer.stringDeserializer(), "number_of_replicas", "index.number_of_replicas");
+        op.add(
+            Builder::numberOfRoutingShards,
+            JsonpDeserializer.integerDeserializer(),
+            "number_of_routing_shards",
+            "index.number_of_routing_shards"
+        );
+        op.add(Builder::checkOnStartup, IndexCheckOnStartup._DESERIALIZER, "check_on_startup", "index.check_on_startup");
+        op.add(Builder::codec, JsonpDeserializer.stringDeserializer(), "codec", "index.codec");
+        op.add(
+            Builder::routingPartitionSize,
+            JsonpDeserializer.integerDeserializer(),
+            "routing_partition_size",
+            "index.routing_partition_size"
+        );
+        op.add(
+            Builder::softDeletesRetentionLeasePeriod,
+            Time._DESERIALIZER,
+            "soft_deletes.retention_lease.period",
+            "index.soft_deletes.retention_lease.period"
+        );
+        op.add(
+            Builder::loadFixedBitsetFiltersEagerly,
+            JsonpDeserializer.booleanDeserializer(),
+            "load_fixed_bitset_filters_eagerly",
+            "index.load_fixed_bitset_filters_eagerly"
+        );
+        op.add(Builder::hidden, JsonpDeserializer.booleanDeserializer(), "hidden", "index.hidden");
+        op.add(Builder::autoExpandReplicas, JsonpDeserializer.stringDeserializer(), "auto_expand_replicas", "index.auto_expand_replicas");
+        op.add(
+            Builder::mergeSchedulerMaxThreadCount,
+            JsonpDeserializer.integerDeserializer(),
+            "merge.scheduler.max_thread_count",
+            "index.merge.scheduler.max_thread_count"
+        );
+        op.add(Builder::searchIdleAfter, Time._DESERIALIZER, "search.idle.after", "index.search.idle.after");
+        op.add(Builder::refreshInterval, Time._DESERIALIZER, "refresh_interval", "index.refresh_interval");
+        op.add(Builder::maxResultWindow, JsonpDeserializer.integerDeserializer(), "max_result_window", "index.max_result_window");
+        op.add(
+            Builder::maxInnerResultWindow,
+            JsonpDeserializer.integerDeserializer(),
+            "max_inner_result_window",
+            "index.max_inner_result_window"
+        );
+        op.add(Builder::maxRescoreWindow, JsonpDeserializer.integerDeserializer(), "max_rescore_window", "index.max_rescore_window");
+        op.add(
+            Builder::maxDocvalueFieldsSearch,
+            JsonpDeserializer.integerDeserializer(),
+            "max_docvalue_fields_search",
+            "index.max_docvalue_fields_search"
+        );
+        op.add(Builder::maxScriptFields, JsonpDeserializer.integerDeserializer(), "max_script_fields", "index.max_script_fields");
+        op.add(Builder::maxNgramDiff, JsonpDeserializer.integerDeserializer(), "max_ngram_diff", "index.max_ngram_diff");
+        op.add(Builder::maxShingleDiff, JsonpDeserializer.integerDeserializer(), "max_shingle_diff", "index.max_shingle_diff");
+        op.add(Builder::blocks, IndexSettingBlocks._DESERIALIZER, "blocks", "index.blocks");
+        op.add(Builder::blocksReadOnly, JsonpDeserializer.booleanDeserializer(), "blocks.read_only", "index.blocks.read_only");
+        op.add(
+            Builder::blocksReadOnlyAllowDelete,
+            JsonpDeserializer.booleanDeserializer(),
+            "blocks.read_only_allow_delete",
+            "index.blocks.read_only_allow_delete"
+        );
+        op.add(Builder::blocksRead, JsonpDeserializer.booleanDeserializer(), "blocks.read", "index.blocks.read");
+        op.add(Builder::blocksWrite, JsonpDeserializer.booleanDeserializer(), "blocks.write", "index.blocks.write");
+        op.add(Builder::blocksMetadata, JsonpDeserializer.booleanDeserializer(), "blocks.metadata", "index.blocks.metadata");
+        op.add(
+            Builder::maxRefreshListeners,
+            JsonpDeserializer.integerDeserializer(),
+            "max_refresh_listeners",
+            "index.max_refresh_listeners"
+        );
+        op.add(
+            Builder::analyzeMaxTokenCount,
+            JsonpDeserializer.integerDeserializer(),
+            "analyze.max_token_count",
+            "index.analyze.max_token_count"
+        );
+        op.add(
+            Builder::highlightMaxAnalyzedOffset,
+            JsonpDeserializer.integerDeserializer(),
+            "highlight.max_analyzed_offset",
+            "index.highlight.max_analyzed_offset"
+        );
+        op.add(Builder::maxTermsCount, JsonpDeserializer.integerDeserializer(), "max_terms_count", "index.max_terms_count");
+        op.add(Builder::maxRegexLength, JsonpDeserializer.integerDeserializer(), "max_regex_length", "index.max_regex_length");
+        op.add(Builder::routing, IndexRouting._DESERIALIZER, "routing", "index.routing");
+        op.add(Builder::gcDeletes, Time._DESERIALIZER, "gc_deletes", "index.gc_deletes");
+        op.add(Builder::defaultPipeline, JsonpDeserializer.stringDeserializer(), "default_pipeline", "index.default_pipeline");
+        op.add(Builder::finalPipeline, JsonpDeserializer.stringDeserializer(), "final_pipeline", "index.final_pipeline");
+        op.add(Builder::lifecycleName, JsonpDeserializer.stringDeserializer(), "lifecycle.name", "index.lifecycle.name");
+        op.add(Builder::providedName, JsonpDeserializer.stringDeserializer(), "provided_name", "index.provided_name");
+        op.add(Builder::creationDate, JsonpDeserializer.stringDeserializer(), "creation_date", "index.creation_date");
+        op.add(Builder::uuid, JsonpDeserializer.stringDeserializer(), "uuid", "index.uuid");
+        op.add(Builder::version, IndexVersioning._DESERIALIZER, "version", "index.version");
+        op.add(
+            Builder::verifiedBeforeClose,
+            JsonpDeserializer.booleanDeserializer(),
+            "verified_before_close",
+            "index.verified_before_close"
+        );
+        op.add(Builder::format, JsonpDeserializer.stringDeserializer(), "format", "index.format");
+        op.add(
+            Builder::maxSlicesPerScroll,
+            JsonpDeserializer.integerDeserializer(),
+            "max_slices_per_scroll",
+            "index.max_slices_per_scroll"
+        );
+        op.add(Builder::translog, Translog._DESERIALIZER, "translog", "index.translog");
+        op.add(Builder::translogDurability, JsonpDeserializer.stringDeserializer(), "translog.durability", "index.translog.durability");
+        op.add(
+            Builder::translogFlushThresholdSize,
+            JsonpDeserializer.stringDeserializer(),
+            "translog.flush_threshold_size",
+            "index.translog.flush_threshold_size"
+        );
+        op.add(Builder::queryStringLenient, JsonpDeserializer.booleanDeserializer(), "query_string.lenient", "index.query_string.lenient");
+        op.add(Builder::priority, JsonpDeserializer.stringDeserializer(), "priority", "index.priority");
+        op.add(Builder::topMetricsMaxSize, JsonpDeserializer.integerDeserializer(), "top_metrics_max_size");
+        op.add(Builder::analysis, IndexSettingsAnalysis._DESERIALIZER, "analysis", "index.analysis");
+        op.add(Builder::settings, IndexSettings._DESERIALIZER, "settings");
+        op.add(Builder::mapping, IndexSettingsMapping._DESERIALIZER, "mapping");
+        op.add(Builder::knn, JsonpDeserializer.booleanDeserializer(), "knn", "index.knn");
+        op.add(
+            Builder::knnAlgoParamEfSearch,
+            JsonpDeserializer.integerDeserializer(),
+            "knn.algo_param.ef_search",
+            "index.knn.algo_param.ef_search"
+        );
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsAnalysis.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsAnalysis.java
index 0df6c234ff..1e9148849d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsAnalysis.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsAnalysis.java
@@ -32,357 +32,357 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.analysis.Analyzer;
-import org.opensearch.client.opensearch._types.analysis.CharFilter;
-import org.opensearch.client.opensearch._types.analysis.Normalizer;
-import org.opensearch.client.opensearch._types.analysis.TokenFilter;
-import org.opensearch.client.opensearch._types.analysis.Tokenizer;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.analysis.Analyzer;
+import org.opensearch.client.opensearch._types.analysis.CharFilter;
+import org.opensearch.client.opensearch._types.analysis.Normalizer;
+import org.opensearch.client.opensearch._types.analysis.TokenFilter;
+import org.opensearch.client.opensearch._types.analysis.Tokenizer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices._types.IndexSettingsAnalysis
 
-
 @JsonpDeserializable
 public class IndexSettingsAnalysis implements JsonpSerializable {
-	private final Map<String, Analyzer> analyzer;
-
-	private final Map<String, CharFilter> charFilter;
-
-	private final Map<String, TokenFilter> filter;
-
-	private final Map<String, Normalizer> normalizer;
-
-	private final Map<String, Tokenizer> tokenizer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexSettingsAnalysis(Builder builder) {
-
-		this.analyzer = ApiTypeHelper.unmodifiable(builder.analyzer);
-		this.charFilter = ApiTypeHelper.unmodifiable(builder.charFilter);
-		this.filter = ApiTypeHelper.unmodifiable(builder.filter);
-		this.normalizer = ApiTypeHelper.unmodifiable(builder.normalizer);
-		this.tokenizer = ApiTypeHelper.unmodifiable(builder.tokenizer);
-
-	}
-
-	public static IndexSettingsAnalysis of(Function<Builder, ObjectBuilder<IndexSettingsAnalysis>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	public final Map<String, Analyzer> analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * API name: {@code char_filter}
-	 */
-	public final Map<String, CharFilter> charFilter() {
-		return this.charFilter;
-	}
-
-	/**
-	 * API name: {@code filter}
-	 */
-	public final Map<String, TokenFilter> filter() {
-		return this.filter;
-	}
-
-	/**
-	 * API name: {@code normalizer}
-	 */
-	public final Map<String, Normalizer> normalizer() {
-		return this.normalizer;
-	}
-
-	/**
-	 * API name: {@code tokenizer}
-	 */
-	public final Map<String, Tokenizer> tokenizer() {
-		return this.tokenizer;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.analyzer)) {
-			generator.writeKey("analyzer");
-			generator.writeStartObject();
-			for (Map.Entry<String, Analyzer> item0 : this.analyzer.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.charFilter)) {
-			generator.writeKey("char_filter");
-			generator.writeStartObject();
-			for (Map.Entry<String, CharFilter> item0 : this.charFilter.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.filter)) {
-			generator.writeKey("filter");
-			generator.writeStartObject();
-			for (Map.Entry<String, TokenFilter> item0 : this.filter.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.normalizer)) {
-			generator.writeKey("normalizer");
-			generator.writeStartObject();
-			for (Map.Entry<String, Normalizer> item0 : this.normalizer.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.tokenizer)) {
-			generator.writeKey("tokenizer");
-			generator.writeStartObject();
-			for (Map.Entry<String, Tokenizer> item0 : this.tokenizer.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexSettingsAnalysis}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexSettingsAnalysis> {
-		@Nullable
-		private Map<String, Analyzer> analyzer;
-
-		@Nullable
-		private Map<String, CharFilter> charFilter;
-
-		@Nullable
-		private Map<String, TokenFilter> filter;
-
-		@Nullable
-		private Map<String, Normalizer> normalizer;
-
-		@Nullable
-		private Map<String, Tokenizer> tokenizer;
-
-		/**
-		 * API name: {@code analyzer}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>analyzer</code>.
-		 */
-		public final Builder analyzer(Map<String, Analyzer> map) {
-			this.analyzer = _mapPutAll(this.analyzer, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code analyzer}
-		 * <p>
-		 * Adds an entry to <code>analyzer</code>.
-		 */
-		public final Builder analyzer(String key, Analyzer value) {
-			this.analyzer = _mapPut(this.analyzer, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code analyzer}
-		 * <p>
-		 * Adds an entry to <code>analyzer</code> using a builder lambda.
-		 */
-		public final Builder analyzer(String key, Function<Analyzer.Builder, ObjectBuilder<Analyzer>> fn) {
-			return analyzer(key, fn.apply(new Analyzer.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code char_filter}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>charFilter</code>.
-		 */
-		public final Builder charFilter(Map<String, CharFilter> map) {
-			this.charFilter = _mapPutAll(this.charFilter, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code char_filter}
-		 * <p>
-		 * Adds an entry to <code>charFilter</code>.
-		 */
-		public final Builder charFilter(String key, CharFilter value) {
-			this.charFilter = _mapPut(this.charFilter, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code char_filter}
-		 * <p>
-		 * Adds an entry to <code>charFilter</code> using a builder lambda.
-		 */
-		public final Builder charFilter(String key, Function<CharFilter.Builder, ObjectBuilder<CharFilter>> fn) {
-			return charFilter(key, fn.apply(new CharFilter.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code filter}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>filter</code>.
-		 */
-		public final Builder filter(Map<String, TokenFilter> map) {
-			this.filter = _mapPutAll(this.filter, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 * <p>
-		 * Adds an entry to <code>filter</code>.
-		 */
-		public final Builder filter(String key, TokenFilter value) {
-			this.filter = _mapPut(this.filter, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 * <p>
-		 * Adds an entry to <code>filter</code> using a builder lambda.
-		 */
-		public final Builder filter(String key, Function<TokenFilter.Builder, ObjectBuilder<TokenFilter>> fn) {
-			return filter(key, fn.apply(new TokenFilter.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code normalizer}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>normalizer</code>.
-		 */
-		public final Builder normalizer(Map<String, Normalizer> map) {
-			this.normalizer = _mapPutAll(this.normalizer, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code normalizer}
-		 * <p>
-		 * Adds an entry to <code>normalizer</code>.
-		 */
-		public final Builder normalizer(String key, Normalizer value) {
-			this.normalizer = _mapPut(this.normalizer, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code normalizer}
-		 * <p>
-		 * Adds an entry to <code>normalizer</code> using a builder lambda.
-		 */
-		public final Builder normalizer(String key, Function<Normalizer.Builder, ObjectBuilder<Normalizer>> fn) {
-			return normalizer(key, fn.apply(new Normalizer.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code tokenizer}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>tokenizer</code>.
-		 */
-		public final Builder tokenizer(Map<String, Tokenizer> map) {
-			this.tokenizer = _mapPutAll(this.tokenizer, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code tokenizer}
-		 * <p>
-		 * Adds an entry to <code>tokenizer</code>.
-		 */
-		public final Builder tokenizer(String key, Tokenizer value) {
-			this.tokenizer = _mapPut(this.tokenizer, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code tokenizer}
-		 * <p>
-		 * Adds an entry to <code>tokenizer</code> using a builder lambda.
-		 */
-		public final Builder tokenizer(String key, Function<Tokenizer.Builder, ObjectBuilder<Tokenizer>> fn) {
-			return tokenizer(key, fn.apply(new Tokenizer.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link IndexSettingsAnalysis}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexSettingsAnalysis build() {
-			_checkSingleUse();
-
-			return new IndexSettingsAnalysis(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndexSettingsAnalysis}
-	 */
-	public static final JsonpDeserializer<IndexSettingsAnalysis> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IndexSettingsAnalysis::setupIndexSettingsAnalysisDeserializer);
-
-	protected static void setupIndexSettingsAnalysisDeserializer(ObjectDeserializer<IndexSettingsAnalysis.Builder> op) {
-
-		op.add(Builder::analyzer, JsonpDeserializer.stringMapDeserializer(Analyzer._DESERIALIZER), "analyzer");
-		op.add(Builder::charFilter, JsonpDeserializer.stringMapDeserializer(CharFilter._DESERIALIZER), "char_filter");
-		op.add(Builder::filter, JsonpDeserializer.stringMapDeserializer(TokenFilter._DESERIALIZER), "filter");
-		op.add(Builder::normalizer, JsonpDeserializer.stringMapDeserializer(Normalizer._DESERIALIZER), "normalizer");
-		op.add(Builder::tokenizer, JsonpDeserializer.stringMapDeserializer(Tokenizer._DESERIALIZER), "tokenizer");
-
-	}
+    private final Map<String, Analyzer> analyzer;
+
+    private final Map<String, CharFilter> charFilter;
+
+    private final Map<String, TokenFilter> filter;
+
+    private final Map<String, Normalizer> normalizer;
+
+    private final Map<String, Tokenizer> tokenizer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexSettingsAnalysis(Builder builder) {
+
+        this.analyzer = ApiTypeHelper.unmodifiable(builder.analyzer);
+        this.charFilter = ApiTypeHelper.unmodifiable(builder.charFilter);
+        this.filter = ApiTypeHelper.unmodifiable(builder.filter);
+        this.normalizer = ApiTypeHelper.unmodifiable(builder.normalizer);
+        this.tokenizer = ApiTypeHelper.unmodifiable(builder.tokenizer);
+
+    }
+
+    public static IndexSettingsAnalysis of(Function<Builder, ObjectBuilder<IndexSettingsAnalysis>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    public final Map<String, Analyzer> analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * API name: {@code char_filter}
+     */
+    public final Map<String, CharFilter> charFilter() {
+        return this.charFilter;
+    }
+
+    /**
+     * API name: {@code filter}
+     */
+    public final Map<String, TokenFilter> filter() {
+        return this.filter;
+    }
+
+    /**
+     * API name: {@code normalizer}
+     */
+    public final Map<String, Normalizer> normalizer() {
+        return this.normalizer;
+    }
+
+    /**
+     * API name: {@code tokenizer}
+     */
+    public final Map<String, Tokenizer> tokenizer() {
+        return this.tokenizer;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.analyzer)) {
+            generator.writeKey("analyzer");
+            generator.writeStartObject();
+            for (Map.Entry<String, Analyzer> item0 : this.analyzer.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.charFilter)) {
+            generator.writeKey("char_filter");
+            generator.writeStartObject();
+            for (Map.Entry<String, CharFilter> item0 : this.charFilter.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.filter)) {
+            generator.writeKey("filter");
+            generator.writeStartObject();
+            for (Map.Entry<String, TokenFilter> item0 : this.filter.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.normalizer)) {
+            generator.writeKey("normalizer");
+            generator.writeStartObject();
+            for (Map.Entry<String, Normalizer> item0 : this.normalizer.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.tokenizer)) {
+            generator.writeKey("tokenizer");
+            generator.writeStartObject();
+            for (Map.Entry<String, Tokenizer> item0 : this.tokenizer.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexSettingsAnalysis}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexSettingsAnalysis> {
+        @Nullable
+        private Map<String, Analyzer> analyzer;
+
+        @Nullable
+        private Map<String, CharFilter> charFilter;
+
+        @Nullable
+        private Map<String, TokenFilter> filter;
+
+        @Nullable
+        private Map<String, Normalizer> normalizer;
+
+        @Nullable
+        private Map<String, Tokenizer> tokenizer;
+
+        /**
+         * API name: {@code analyzer}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>analyzer</code>.
+         */
+        public final Builder analyzer(Map<String, Analyzer> map) {
+            this.analyzer = _mapPutAll(this.analyzer, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code analyzer}
+         * <p>
+         * Adds an entry to <code>analyzer</code>.
+         */
+        public final Builder analyzer(String key, Analyzer value) {
+            this.analyzer = _mapPut(this.analyzer, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code analyzer}
+         * <p>
+         * Adds an entry to <code>analyzer</code> using a builder lambda.
+         */
+        public final Builder analyzer(String key, Function<Analyzer.Builder, ObjectBuilder<Analyzer>> fn) {
+            return analyzer(key, fn.apply(new Analyzer.Builder()).build());
+        }
+
+        /**
+         * API name: {@code char_filter}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>charFilter</code>.
+         */
+        public final Builder charFilter(Map<String, CharFilter> map) {
+            this.charFilter = _mapPutAll(this.charFilter, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code char_filter}
+         * <p>
+         * Adds an entry to <code>charFilter</code>.
+         */
+        public final Builder charFilter(String key, CharFilter value) {
+            this.charFilter = _mapPut(this.charFilter, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code char_filter}
+         * <p>
+         * Adds an entry to <code>charFilter</code> using a builder lambda.
+         */
+        public final Builder charFilter(String key, Function<CharFilter.Builder, ObjectBuilder<CharFilter>> fn) {
+            return charFilter(key, fn.apply(new CharFilter.Builder()).build());
+        }
+
+        /**
+         * API name: {@code filter}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>filter</code>.
+         */
+        public final Builder filter(Map<String, TokenFilter> map) {
+            this.filter = _mapPutAll(this.filter, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         * <p>
+         * Adds an entry to <code>filter</code>.
+         */
+        public final Builder filter(String key, TokenFilter value) {
+            this.filter = _mapPut(this.filter, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         * <p>
+         * Adds an entry to <code>filter</code> using a builder lambda.
+         */
+        public final Builder filter(String key, Function<TokenFilter.Builder, ObjectBuilder<TokenFilter>> fn) {
+            return filter(key, fn.apply(new TokenFilter.Builder()).build());
+        }
+
+        /**
+         * API name: {@code normalizer}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>normalizer</code>.
+         */
+        public final Builder normalizer(Map<String, Normalizer> map) {
+            this.normalizer = _mapPutAll(this.normalizer, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code normalizer}
+         * <p>
+         * Adds an entry to <code>normalizer</code>.
+         */
+        public final Builder normalizer(String key, Normalizer value) {
+            this.normalizer = _mapPut(this.normalizer, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code normalizer}
+         * <p>
+         * Adds an entry to <code>normalizer</code> using a builder lambda.
+         */
+        public final Builder normalizer(String key, Function<Normalizer.Builder, ObjectBuilder<Normalizer>> fn) {
+            return normalizer(key, fn.apply(new Normalizer.Builder()).build());
+        }
+
+        /**
+         * API name: {@code tokenizer}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>tokenizer</code>.
+         */
+        public final Builder tokenizer(Map<String, Tokenizer> map) {
+            this.tokenizer = _mapPutAll(this.tokenizer, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code tokenizer}
+         * <p>
+         * Adds an entry to <code>tokenizer</code>.
+         */
+        public final Builder tokenizer(String key, Tokenizer value) {
+            this.tokenizer = _mapPut(this.tokenizer, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code tokenizer}
+         * <p>
+         * Adds an entry to <code>tokenizer</code> using a builder lambda.
+         */
+        public final Builder tokenizer(String key, Function<Tokenizer.Builder, ObjectBuilder<Tokenizer>> fn) {
+            return tokenizer(key, fn.apply(new Tokenizer.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link IndexSettingsAnalysis}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexSettingsAnalysis build() {
+            _checkSingleUse();
+
+            return new IndexSettingsAnalysis(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndexSettingsAnalysis}
+     */
+    public static final JsonpDeserializer<IndexSettingsAnalysis> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexSettingsAnalysis::setupIndexSettingsAnalysisDeserializer
+    );
+
+    protected static void setupIndexSettingsAnalysisDeserializer(ObjectDeserializer<IndexSettingsAnalysis.Builder> op) {
+
+        op.add(Builder::analyzer, JsonpDeserializer.stringMapDeserializer(Analyzer._DESERIALIZER), "analyzer");
+        op.add(Builder::charFilter, JsonpDeserializer.stringMapDeserializer(CharFilter._DESERIALIZER), "char_filter");
+        op.add(Builder::filter, JsonpDeserializer.stringMapDeserializer(TokenFilter._DESERIALIZER), "filter");
+        op.add(Builder::normalizer, JsonpDeserializer.stringMapDeserializer(Normalizer._DESERIALIZER), "normalizer");
+        op.add(Builder::tokenizer, JsonpDeserializer.stringMapDeserializer(Tokenizer._DESERIALIZER), "tokenizer");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsMapping.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsMapping.java
index 171cbc7c28..5b369d8e27 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsMapping.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsMapping.java
@@ -9,254 +9,252 @@
 package org.opensearch.client.opensearch.indices;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
-import org.opensearch.client.opensearch._types.Time;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import javax.annotation.Nullable;
-import java.util.List;
-import java.util.function.Function;
-
-
 @JsonpDeserializable
 public class IndexSettingsMapping implements JsonpSerializable {
 
-	@Nullable
-	private final IndexSettingsMappingLimit totalFields;
-
-	@Nullable
-	private final IndexSettingsMappingLimit depth;
-
-	@Nullable
-	private final IndexSettingsMappingLimit nestedFields;
-
-	@Nullable
-	private final IndexSettingsMappingLimit nestedObjects;
-
-	@Nullable
-	private final IndexSettingsMappingLimit fieldNameLength;
-
-	private IndexSettingsMapping(Builder builder) {
-
-		this.totalFields = builder.totalFields;
-		this.depth = builder.depth;
-		this.nestedFields = builder.nestedFields;
-		this.nestedObjects = builder.nestedObjects;
-		this.fieldNameLength = builder.fieldNameLength;
-
-	}
-
-	public static IndexSettingsMapping of(Function<Builder, ObjectBuilder<IndexSettingsMapping>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code total_fields}
-	 */
-	@Nullable
-	public final IndexSettingsMappingLimit totalFields() {
-		return this.totalFields;
-	}
-
-	/**
-	 * API name: {@code depth}
-	 */
-	@Nullable
-	public final IndexSettingsMappingLimit depth() {
-		return this.depth;
-	}
-
-	/**
-	 * API name: {@code nested_fields}
-	 */
-	@Nullable
-	public final IndexSettingsMappingLimit nestedFields() {
-		return this.nestedFields;
-	}
-
-	/**
-	 * API name: {@code nested_objects}
-	 */
-	@Nullable
-	public final IndexSettingsMappingLimit nestedObjects() {
-		return this.nestedObjects;
-	}
-
-	/**
-	 * API name: {@code field_name_length}
-	 */
-	@Nullable
-	public final IndexSettingsMappingLimit fieldNameLength() {
-		return this.fieldNameLength;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-		if (this.totalFields != null) {
-			generator.writeKey("total_fields");
-			this.totalFields.serialize(generator, mapper);
-
-		}
-		if (this.depth != null) {
-			generator.writeKey("depth");
-			this.depth.serialize(generator, mapper);
-
-		}
-		if (this.nestedFields != null) {
-			generator.writeKey("nested_fields");
-			this.nestedFields.serialize(generator, mapper);
-
-		}
-		if (this.nestedObjects != null) {
-			generator.writeKey("nested_objects");
-			this.nestedObjects.serialize(generator, mapper);
-
-		}
-		if (this.fieldNameLength != null) {
-			generator.writeKey("field_name_length");
-			this.fieldNameLength.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexSettingsMapping}.
-	 */
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexSettingsMapping> {
-		@Nullable
-		private IndexSettingsMappingLimit totalFields;
-
-		@Nullable
-		private IndexSettingsMappingLimit depth;
-
-		@Nullable
-		private IndexSettingsMappingLimit nestedFields;
-
-		@Nullable
-		private IndexSettingsMappingLimit nestedObjects;
-
-		@Nullable
-		private IndexSettingsMappingLimit fieldNameLength;
-
-		/**
-		 * API name: {@code total_fields}
-		 */
-		public final Builder totalFields(@Nullable IndexSettingsMappingLimit value) {
-			this.totalFields = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total_fields}
-		 */
-		public final Builder totalFields(Function<IndexSettingsMappingLimit.Builder, ObjectBuilder<IndexSettingsMappingLimit>> fn) {
-			return this.totalFields(fn.apply(new IndexSettingsMappingLimit.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code depth}
-		 */
-		public final Builder depth(@Nullable IndexSettingsMappingLimit value) {
-			this.depth = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code depth}
-		 */
-		public final Builder depth(Function<IndexSettingsMappingLimit.Builder, ObjectBuilder<IndexSettingsMappingLimit>> fn) {
-			return this.depth(fn.apply(new IndexSettingsMappingLimit.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code nested_fields}
-		 */
-		public final Builder nestedFields(@Nullable IndexSettingsMappingLimit value) {
-			this.nestedFields = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code nested_fields}
-		 */
-		public final Builder nestedFields(Function<IndexSettingsMappingLimit.Builder, ObjectBuilder<IndexSettingsMappingLimit>> fn) {
-			return this.nestedFields(fn.apply(new IndexSettingsMappingLimit.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code nested_objects}
-		 */
-		public final Builder nestedObjects(@Nullable IndexSettingsMappingLimit value) {
-			this.nestedObjects = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code nested_objects}
-		 */
-		public final Builder nestedObjects(Function<IndexSettingsMappingLimit.Builder, ObjectBuilder<IndexSettingsMappingLimit>> fn) {
-			return this.nestedObjects(fn.apply(new IndexSettingsMappingLimit.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code field_name_length}
-		 */
-		public final Builder fieldNameLength(@Nullable IndexSettingsMappingLimit value) {
-			this.fieldNameLength = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code field_name_length}
-		 */
-		public final Builder fieldNameLength(Function<IndexSettingsMappingLimit.Builder, ObjectBuilder<IndexSettingsMappingLimit>> fn) {
-			return this.fieldNameLength(fn.apply(new IndexSettingsMappingLimit.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link IndexSettingsMapping}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexSettingsMapping build() {
-			_checkSingleUse();
-
-			return new IndexSettingsMapping(this);
-		}
-	}
-
-	/**
-	 * Json deserializer for {@link IndexSettingsMapping}
-	 */
-	public static final JsonpDeserializer<IndexSettingsMapping> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IndexSettingsMapping::setupIndexSettingsDeserializer);
-
-	protected static void setupIndexSettingsDeserializer(ObjectDeserializer<IndexSettingsMapping.Builder> op) {
-
-		op.add(Builder::totalFields, IndexSettingsMappingLimit._DESERIALIZER, "total_fields");
-		op.add(Builder::depth, IndexSettingsMappingLimit._DESERIALIZER, "depth");
-		op.add(Builder::nestedFields, IndexSettingsMappingLimit._DESERIALIZER, "nested_fields");
-		op.add(Builder::nestedObjects, IndexSettingsMappingLimit._DESERIALIZER, "nested_objects");
-		op.add(Builder::fieldNameLength, IndexSettingsMappingLimit._DESERIALIZER, "field_name_length");
-
-	}
+    @Nullable
+    private final IndexSettingsMappingLimit totalFields;
+
+    @Nullable
+    private final IndexSettingsMappingLimit depth;
+
+    @Nullable
+    private final IndexSettingsMappingLimit nestedFields;
+
+    @Nullable
+    private final IndexSettingsMappingLimit nestedObjects;
+
+    @Nullable
+    private final IndexSettingsMappingLimit fieldNameLength;
+
+    private IndexSettingsMapping(Builder builder) {
+
+        this.totalFields = builder.totalFields;
+        this.depth = builder.depth;
+        this.nestedFields = builder.nestedFields;
+        this.nestedObjects = builder.nestedObjects;
+        this.fieldNameLength = builder.fieldNameLength;
+
+    }
+
+    public static IndexSettingsMapping of(Function<Builder, ObjectBuilder<IndexSettingsMapping>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code total_fields}
+     */
+    @Nullable
+    public final IndexSettingsMappingLimit totalFields() {
+        return this.totalFields;
+    }
+
+    /**
+     * API name: {@code depth}
+     */
+    @Nullable
+    public final IndexSettingsMappingLimit depth() {
+        return this.depth;
+    }
+
+    /**
+     * API name: {@code nested_fields}
+     */
+    @Nullable
+    public final IndexSettingsMappingLimit nestedFields() {
+        return this.nestedFields;
+    }
+
+    /**
+     * API name: {@code nested_objects}
+     */
+    @Nullable
+    public final IndexSettingsMappingLimit nestedObjects() {
+        return this.nestedObjects;
+    }
+
+    /**
+     * API name: {@code field_name_length}
+     */
+    @Nullable
+    public final IndexSettingsMappingLimit fieldNameLength() {
+        return this.fieldNameLength;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        if (this.totalFields != null) {
+            generator.writeKey("total_fields");
+            this.totalFields.serialize(generator, mapper);
+
+        }
+        if (this.depth != null) {
+            generator.writeKey("depth");
+            this.depth.serialize(generator, mapper);
+
+        }
+        if (this.nestedFields != null) {
+            generator.writeKey("nested_fields");
+            this.nestedFields.serialize(generator, mapper);
+
+        }
+        if (this.nestedObjects != null) {
+            generator.writeKey("nested_objects");
+            this.nestedObjects.serialize(generator, mapper);
+
+        }
+        if (this.fieldNameLength != null) {
+            generator.writeKey("field_name_length");
+            this.fieldNameLength.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexSettingsMapping}.
+     */
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexSettingsMapping> {
+        @Nullable
+        private IndexSettingsMappingLimit totalFields;
+
+        @Nullable
+        private IndexSettingsMappingLimit depth;
+
+        @Nullable
+        private IndexSettingsMappingLimit nestedFields;
+
+        @Nullable
+        private IndexSettingsMappingLimit nestedObjects;
+
+        @Nullable
+        private IndexSettingsMappingLimit fieldNameLength;
+
+        /**
+         * API name: {@code total_fields}
+         */
+        public final Builder totalFields(@Nullable IndexSettingsMappingLimit value) {
+            this.totalFields = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total_fields}
+         */
+        public final Builder totalFields(Function<IndexSettingsMappingLimit.Builder, ObjectBuilder<IndexSettingsMappingLimit>> fn) {
+            return this.totalFields(fn.apply(new IndexSettingsMappingLimit.Builder()).build());
+        }
+
+        /**
+         * API name: {@code depth}
+         */
+        public final Builder depth(@Nullable IndexSettingsMappingLimit value) {
+            this.depth = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code depth}
+         */
+        public final Builder depth(Function<IndexSettingsMappingLimit.Builder, ObjectBuilder<IndexSettingsMappingLimit>> fn) {
+            return this.depth(fn.apply(new IndexSettingsMappingLimit.Builder()).build());
+        }
+
+        /**
+         * API name: {@code nested_fields}
+         */
+        public final Builder nestedFields(@Nullable IndexSettingsMappingLimit value) {
+            this.nestedFields = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code nested_fields}
+         */
+        public final Builder nestedFields(Function<IndexSettingsMappingLimit.Builder, ObjectBuilder<IndexSettingsMappingLimit>> fn) {
+            return this.nestedFields(fn.apply(new IndexSettingsMappingLimit.Builder()).build());
+        }
+
+        /**
+         * API name: {@code nested_objects}
+         */
+        public final Builder nestedObjects(@Nullable IndexSettingsMappingLimit value) {
+            this.nestedObjects = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code nested_objects}
+         */
+        public final Builder nestedObjects(Function<IndexSettingsMappingLimit.Builder, ObjectBuilder<IndexSettingsMappingLimit>> fn) {
+            return this.nestedObjects(fn.apply(new IndexSettingsMappingLimit.Builder()).build());
+        }
+
+        /**
+         * API name: {@code field_name_length}
+         */
+        public final Builder fieldNameLength(@Nullable IndexSettingsMappingLimit value) {
+            this.fieldNameLength = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code field_name_length}
+         */
+        public final Builder fieldNameLength(Function<IndexSettingsMappingLimit.Builder, ObjectBuilder<IndexSettingsMappingLimit>> fn) {
+            return this.fieldNameLength(fn.apply(new IndexSettingsMappingLimit.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link IndexSettingsMapping}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexSettingsMapping build() {
+            _checkSingleUse();
+
+            return new IndexSettingsMapping(this);
+        }
+    }
+
+    /**
+     * Json deserializer for {@link IndexSettingsMapping}
+     */
+    public static final JsonpDeserializer<IndexSettingsMapping> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexSettingsMapping::setupIndexSettingsDeserializer
+    );
+
+    protected static void setupIndexSettingsDeserializer(ObjectDeserializer<IndexSettingsMapping.Builder> op) {
+
+        op.add(Builder::totalFields, IndexSettingsMappingLimit._DESERIALIZER, "total_fields");
+        op.add(Builder::depth, IndexSettingsMappingLimit._DESERIALIZER, "depth");
+        op.add(Builder::nestedFields, IndexSettingsMappingLimit._DESERIALIZER, "nested_fields");
+        op.add(Builder::nestedObjects, IndexSettingsMappingLimit._DESERIALIZER, "nested_objects");
+        op.add(Builder::fieldNameLength, IndexSettingsMappingLimit._DESERIALIZER, "field_name_length");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsMappingLimit.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsMappingLimit.java
index b20238701b..fce4e94c77 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsMappingLimit.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsMappingLimit.java
@@ -9,6 +9,8 @@
 package org.opensearch.client.opensearch.indices;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -18,89 +20,88 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import javax.annotation.Nullable;
-import java.util.function.Function;
-
 @JsonpDeserializable
 public class IndexSettingsMappingLimit implements JsonpSerializable {
 
-	@Nullable
-	private final Long limit;
-
-	private IndexSettingsMappingLimit(Builder builder) {
-
-		this.limit = builder.limit;
-
-	}
-
-	public static IndexSettingsMappingLimit of(Function<Builder, ObjectBuilder<IndexSettingsMappingLimit>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code limit}
-	 */
-	@Nullable
-	public final Long limit() {
-		return this.limit;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator) {
-
-		if (this.limit != null) {
-			generator.writeKey("limit");
-			generator.write(this.limit);
-		}
-
-	}
-
-	/**
-	 * Builder for {@link IndexSettingsMappingLimit}.
-	 */
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexSettingsMappingLimit> {
-		@Nullable
-		private Long limit;
-
-		/**
-		 * API name: {@code limit}
-		 */
-		public final Builder limit(@Nullable Long value) {
-			this.limit = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IndexSettingsMappingLimit}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexSettingsMappingLimit build() {
-			_checkSingleUse();
-
-			return new IndexSettingsMappingLimit(this);
-		}
-	}
-
-	/**
-	 * Json deserializer for {@link IndexSettingsMappingLimit}
-	 */
-	public static final JsonpDeserializer<IndexSettingsMappingLimit> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IndexSettingsMappingLimit::setupIndexSettingsMappingLimitDeserializer);
-
-	protected static void setupIndexSettingsMappingLimitDeserializer(ObjectDeserializer<IndexSettingsMappingLimit.Builder> op) {
-
-		op.add(Builder::limit, JsonpDeserializer.longDeserializer(), "limit");
-
-	}
+    @Nullable
+    private final Long limit;
+
+    private IndexSettingsMappingLimit(Builder builder) {
+
+        this.limit = builder.limit;
+
+    }
+
+    public static IndexSettingsMappingLimit of(Function<Builder, ObjectBuilder<IndexSettingsMappingLimit>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code limit}
+     */
+    @Nullable
+    public final Long limit() {
+        return this.limit;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator) {
+
+        if (this.limit != null) {
+            generator.writeKey("limit");
+            generator.write(this.limit);
+        }
+
+    }
+
+    /**
+     * Builder for {@link IndexSettingsMappingLimit}.
+     */
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexSettingsMappingLimit> {
+        @Nullable
+        private Long limit;
+
+        /**
+         * API name: {@code limit}
+         */
+        public final Builder limit(@Nullable Long value) {
+            this.limit = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link IndexSettingsMappingLimit}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexSettingsMappingLimit build() {
+            _checkSingleUse();
+
+            return new IndexSettingsMappingLimit(this);
+        }
+    }
+
+    /**
+     * Json deserializer for {@link IndexSettingsMappingLimit}
+     */
+    public static final JsonpDeserializer<IndexSettingsMappingLimit> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexSettingsMappingLimit::setupIndexSettingsMappingLimitDeserializer
+    );
+
+    protected static void setupIndexSettingsMappingLimitDeserializer(ObjectDeserializer<IndexSettingsMappingLimit.Builder> op) {
+
+        op.add(Builder::limit, JsonpDeserializer.longDeserializer(), "limit");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexState.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexState.java
index 438493ddd4..615b320cc2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexState.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexState.java
@@ -32,283 +32,283 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.mapping.TypeMapping;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.mapping.TypeMapping;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices._types.IndexState
 
-
 @JsonpDeserializable
 public class IndexState implements JsonpSerializable {
-	private final Map<String, Alias> aliases;
-
-	@Nullable
-	private final TypeMapping mappings;
-
-	@Nullable
-	private final IndexSettings settings;
-
-	@Nullable
-	private final IndexSettings defaults;
-
-	@Nullable
-	private final String dataStream;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexState(Builder builder) {
-
-		this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
-		this.mappings = builder.mappings;
-		this.settings = builder.settings;
-		this.defaults = builder.defaults;
-		this.dataStream = builder.dataStream;
-
-	}
-
-	public static IndexState of(Function<Builder, ObjectBuilder<IndexState>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code aliases}
-	 */
-	public final Map<String, Alias> aliases() {
-		return this.aliases;
-	}
-
-	/**
-	 * API name: {@code mappings}
-	 */
-	@Nullable
-	public final TypeMapping mappings() {
-		return this.mappings;
-	}
-
-	/**
-	 * API name: {@code settings}
-	 */
-	@Nullable
-	public final IndexSettings settings() {
-		return this.settings;
-	}
-
-	/**
-	 * Default settings, included when the request's <code>include_default</code> is
-	 * <code>true</code>.
-	 * <p>
-	 * API name: {@code defaults}
-	 */
-	@Nullable
-	public final IndexSettings defaults() {
-		return this.defaults;
-	}
-
-	/**
-	 * API name: {@code data_stream}
-	 */
-	@Nullable
-	public final String dataStream() {
-		return this.dataStream;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.aliases)) {
-			generator.writeKey("aliases");
-			generator.writeStartObject();
-			for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.mappings != null) {
-			generator.writeKey("mappings");
-			this.mappings.serialize(generator, mapper);
-
-		}
-		if (this.settings != null) {
-			generator.writeKey("settings");
-			this.settings.serialize(generator, mapper);
-
-		}
-		if (this.defaults != null) {
-			generator.writeKey("defaults");
-			this.defaults.serialize(generator, mapper);
-
-		}
-		if (this.dataStream != null) {
-			generator.writeKey("data_stream");
-			generator.write(this.dataStream);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexState}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexState> {
-		@Nullable
-		private Map<String, Alias> aliases;
-
-		@Nullable
-		private TypeMapping mappings;
-
-		@Nullable
-		private IndexSettings settings;
-
-		@Nullable
-		private IndexSettings defaults;
-
-		@Nullable
-		private String dataStream;
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aliases</code>.
-		 */
-		public final Builder aliases(Map<String, Alias> map) {
-			this.aliases = _mapPutAll(this.aliases, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code>.
-		 */
-		public final Builder aliases(String key, Alias value) {
-			this.aliases = _mapPut(this.aliases, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code> using a builder lambda.
-		 */
-		public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
-			return aliases(key, fn.apply(new Alias.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code mappings}
-		 */
-		public final Builder mappings(@Nullable TypeMapping value) {
-			this.mappings = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mappings}
-		 */
-		public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
-			return this.mappings(fn.apply(new TypeMapping.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code settings}
-		 */
-		public final Builder settings(@Nullable IndexSettings value) {
-			this.settings = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code settings}
-		 */
-		public final Builder settings(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
-			return this.settings(fn.apply(new IndexSettings.Builder()).build());
-		}
-
-		/**
-		 * Default settings, included when the request's <code>include_default</code> is
-		 * <code>true</code>.
-		 * <p>
-		 * API name: {@code defaults}
-		 */
-		public final Builder defaults(@Nullable IndexSettings value) {
-			this.defaults = value;
-			return this;
-		}
-
-		/**
-		 * Default settings, included when the request's <code>include_default</code> is
-		 * <code>true</code>.
-		 * <p>
-		 * API name: {@code defaults}
-		 */
-		public final Builder defaults(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
-			return this.defaults(fn.apply(new IndexSettings.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code data_stream}
-		 */
-		public final Builder dataStream(@Nullable String value) {
-			this.dataStream = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IndexState}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexState build() {
-			_checkSingleUse();
-
-			return new IndexState(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndexState}
-	 */
-	public static final JsonpDeserializer<IndexState> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IndexState::setupIndexStateDeserializer);
-
-	protected static void setupIndexStateDeserializer(ObjectDeserializer<IndexState.Builder> op) {
-
-		op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
-		op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
-		op.add(Builder::settings, IndexSettings._DESERIALIZER, "settings");
-		op.add(Builder::defaults, IndexSettings._DESERIALIZER, "defaults");
-		op.add(Builder::dataStream, JsonpDeserializer.stringDeserializer(), "data_stream");
-
-	}
+    private final Map<String, Alias> aliases;
+
+    @Nullable
+    private final TypeMapping mappings;
+
+    @Nullable
+    private final IndexSettings settings;
+
+    @Nullable
+    private final IndexSettings defaults;
+
+    @Nullable
+    private final String dataStream;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexState(Builder builder) {
+
+        this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
+        this.mappings = builder.mappings;
+        this.settings = builder.settings;
+        this.defaults = builder.defaults;
+        this.dataStream = builder.dataStream;
+
+    }
+
+    public static IndexState of(Function<Builder, ObjectBuilder<IndexState>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code aliases}
+     */
+    public final Map<String, Alias> aliases() {
+        return this.aliases;
+    }
+
+    /**
+     * API name: {@code mappings}
+     */
+    @Nullable
+    public final TypeMapping mappings() {
+        return this.mappings;
+    }
+
+    /**
+     * API name: {@code settings}
+     */
+    @Nullable
+    public final IndexSettings settings() {
+        return this.settings;
+    }
+
+    /**
+     * Default settings, included when the request's <code>include_default</code> is
+     * <code>true</code>.
+     * <p>
+     * API name: {@code defaults}
+     */
+    @Nullable
+    public final IndexSettings defaults() {
+        return this.defaults;
+    }
+
+    /**
+     * API name: {@code data_stream}
+     */
+    @Nullable
+    public final String dataStream() {
+        return this.dataStream;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.aliases)) {
+            generator.writeKey("aliases");
+            generator.writeStartObject();
+            for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.mappings != null) {
+            generator.writeKey("mappings");
+            this.mappings.serialize(generator, mapper);
+
+        }
+        if (this.settings != null) {
+            generator.writeKey("settings");
+            this.settings.serialize(generator, mapper);
+
+        }
+        if (this.defaults != null) {
+            generator.writeKey("defaults");
+            this.defaults.serialize(generator, mapper);
+
+        }
+        if (this.dataStream != null) {
+            generator.writeKey("data_stream");
+            generator.write(this.dataStream);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexState}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexState> {
+        @Nullable
+        private Map<String, Alias> aliases;
+
+        @Nullable
+        private TypeMapping mappings;
+
+        @Nullable
+        private IndexSettings settings;
+
+        @Nullable
+        private IndexSettings defaults;
+
+        @Nullable
+        private String dataStream;
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aliases</code>.
+         */
+        public final Builder aliases(Map<String, Alias> map) {
+            this.aliases = _mapPutAll(this.aliases, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code>.
+         */
+        public final Builder aliases(String key, Alias value) {
+            this.aliases = _mapPut(this.aliases, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code> using a builder lambda.
+         */
+        public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
+            return aliases(key, fn.apply(new Alias.Builder()).build());
+        }
+
+        /**
+         * API name: {@code mappings}
+         */
+        public final Builder mappings(@Nullable TypeMapping value) {
+            this.mappings = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mappings}
+         */
+        public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
+            return this.mappings(fn.apply(new TypeMapping.Builder()).build());
+        }
+
+        /**
+         * API name: {@code settings}
+         */
+        public final Builder settings(@Nullable IndexSettings value) {
+            this.settings = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code settings}
+         */
+        public final Builder settings(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
+            return this.settings(fn.apply(new IndexSettings.Builder()).build());
+        }
+
+        /**
+         * Default settings, included when the request's <code>include_default</code> is
+         * <code>true</code>.
+         * <p>
+         * API name: {@code defaults}
+         */
+        public final Builder defaults(@Nullable IndexSettings value) {
+            this.defaults = value;
+            return this;
+        }
+
+        /**
+         * Default settings, included when the request's <code>include_default</code> is
+         * <code>true</code>.
+         * <p>
+         * API name: {@code defaults}
+         */
+        public final Builder defaults(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
+            return this.defaults(fn.apply(new IndexSettings.Builder()).build());
+        }
+
+        /**
+         * API name: {@code data_stream}
+         */
+        public final Builder dataStream(@Nullable String value) {
+            this.dataStream = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link IndexState}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexState build() {
+            _checkSingleUse();
+
+            return new IndexState(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndexState}
+     */
+    public static final JsonpDeserializer<IndexState> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexState::setupIndexStateDeserializer
+    );
+
+    protected static void setupIndexStateDeserializer(ObjectDeserializer<IndexState.Builder> op) {
+
+        op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
+        op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
+        op.add(Builder::settings, IndexSettings._DESERIALIZER, "settings");
+        op.add(Builder::defaults, IndexSettings._DESERIALIZER, "defaults");
+        op.add(Builder::dataStream, JsonpDeserializer.stringDeserializer(), "data_stream");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexVersioning.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexVersioning.java
index 630949df23..4e03470d69 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexVersioning.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexVersioning.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,93 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: indices._types.IndexVersioning
 
-
 @JsonpDeserializable
 public class IndexVersioning implements JsonpSerializable {
-	private final String created;
+    private final String created;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private IndexVersioning(Builder builder) {
+    private IndexVersioning(Builder builder) {
 
-		this.created = ApiTypeHelper.requireNonNull(builder.created, this, "created");
+        this.created = ApiTypeHelper.requireNonNull(builder.created, this, "created");
 
-	}
+    }
 
-	public static IndexVersioning of(Function<Builder, ObjectBuilder<IndexVersioning>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static IndexVersioning of(Function<Builder, ObjectBuilder<IndexVersioning>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code created}
-	 */
-	public final String created() {
-		return this.created;
-	}
+    /**
+     * Required - API name: {@code created}
+     */
+    public final String created() {
+        return this.created;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("created");
-		generator.write(this.created);
+        generator.writeKey("created");
+        generator.write(this.created);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link IndexVersioning}.
-	 */
+    /**
+     * Builder for {@link IndexVersioning}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexVersioning> {
-		private String created;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexVersioning> {
+        private String created;
 
-		/**
-		 * Required - API name: {@code created}
-		 */
-		public final Builder created(String value) {
-			this.created = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code created}
+         */
+        public final Builder created(String value) {
+            this.created = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link IndexVersioning}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexVersioning build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link IndexVersioning}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexVersioning build() {
+            _checkSingleUse();
 
-			return new IndexVersioning(this);
-		}
-	}
+            return new IndexVersioning(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link IndexVersioning}
-	 */
-	public static final JsonpDeserializer<IndexVersioning> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IndexVersioning::setupIndexVersioningDeserializer);
+    /**
+     * Json deserializer for {@link IndexVersioning}
+     */
+    public static final JsonpDeserializer<IndexVersioning> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexVersioning::setupIndexVersioningDeserializer
+    );
 
-	protected static void setupIndexVersioningDeserializer(ObjectDeserializer<IndexVersioning.Builder> op) {
+    protected static void setupIndexVersioningDeserializer(ObjectDeserializer<IndexVersioning.Builder> op) {
 
-		op.add(Builder::created, JsonpDeserializer.stringDeserializer(), "created");
+        op.add(Builder::created, JsonpDeserializer.stringDeserializer(), "created");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndicesStatsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndicesStatsRequest.java
index e11b76c218..29a3f10078 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndicesStatsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndicesStatsRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.Level;
@@ -42,13 +48,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.stats.Request
 
 /**
@@ -57,578 +56,574 @@
  */
 
 public class IndicesStatsRequest extends RequestBase {
-	private final List<String> completionFields;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	private final List<String> fielddataFields;
-
-	private final List<String> fields;
-
-	@Nullable
-	private final Boolean forbidClosedIndices;
-
-	private final List<String> groups;
-
-	@Nullable
-	private final Boolean includeSegmentFileSizes;
-
-	@Nullable
-	private final Boolean includeUnloadedSegments;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Level level;
-
-	private final List<String> metric;
-
-	private final List<String> types;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndicesStatsRequest(Builder builder) {
-
-		this.completionFields = ApiTypeHelper.unmodifiable(builder.completionFields);
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.fielddataFields = ApiTypeHelper.unmodifiable(builder.fielddataFields);
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-		this.forbidClosedIndices = builder.forbidClosedIndices;
-		this.groups = ApiTypeHelper.unmodifiable(builder.groups);
-		this.includeSegmentFileSizes = builder.includeSegmentFileSizes;
-		this.includeUnloadedSegments = builder.includeUnloadedSegments;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.level = builder.level;
-		this.metric = ApiTypeHelper.unmodifiable(builder.metric);
-		this.types = ApiTypeHelper.unmodifiable(builder.types);
-
-	}
-
-	public static IndicesStatsRequest of(Function<Builder, ObjectBuilder<IndicesStatsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * A comma-separated list of fields for <code>fielddata</code> and
-	 * <code>suggest</code> index metric (supports wildcards)
-	 * <p>
-	 * API name: {@code completion_fields}
-	 */
-	public final List<String> completionFields() {
-		return this.completionFields;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * A comma-separated list of fields for <code>fielddata</code> index metric
-	 * (supports wildcards)
-	 * <p>
-	 * API name: {@code fielddata_fields}
-	 */
-	public final List<String> fielddataFields() {
-		return this.fielddataFields;
-	}
-
-	/**
-	 * A comma-separated list of fields for <code>fielddata</code> and
-	 * <code>completion</code> index metric (supports wildcards)
-	 * <p>
-	 * API name: {@code fields}
-	 */
-	public final List<String> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * If set to false stats will also collected from closed indices if explicitly
-	 * specified or if expand_wildcards expands to closed indices
-	 * <p>
-	 * API name: {@code forbid_closed_indices}
-	 */
-	@Nullable
-	public final Boolean forbidClosedIndices() {
-		return this.forbidClosedIndices;
-	}
-
-	/**
-	 * A comma-separated list of search groups for <code>search</code> index metric
-	 * <p>
-	 * API name: {@code groups}
-	 */
-	public final List<String> groups() {
-		return this.groups;
-	}
-
-	/**
-	 * Whether to report the aggregated disk usage of each one of the Lucene index
-	 * files (only applies if segment stats are requested)
-	 * <p>
-	 * API name: {@code include_segment_file_sizes}
-	 */
-	@Nullable
-	public final Boolean includeSegmentFileSizes() {
-		return this.includeSegmentFileSizes;
-	}
-
-	/**
-	 * If set to true segment stats will include stats for segments that are not
-	 * currently loaded into memory
-	 * <p>
-	 * API name: {@code include_unloaded_segments}
-	 */
-	@Nullable
-	public final Boolean includeUnloadedSegments() {
-		return this.includeUnloadedSegments;
-	}
-
-	/**
-	 * A comma-separated list of index names; use <code>_all</code> or empty string
-	 * to perform the operation on all indices
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Return stats aggregated at cluster, index or shard level
-	 * <p>
-	 * API name: {@code level}
-	 */
-	@Nullable
-	public final Level level() {
-		return this.level;
-	}
-
-	/**
-	 * Limit the information returned the specific metrics.
-	 * <p>
-	 * API name: {@code metric}
-	 */
-	public final List<String> metric() {
-		return this.metric;
-	}
-
-	/**
-	 * A comma-separated list of document types for the <code>indexing</code> index
-	 * metric
-	 * <p>
-	 * API name: {@code types}
-	 */
-	public final List<String> types() {
-		return this.types;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndicesStatsRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesStatsRequest> {
-		@Nullable
-		private List<String> completionFields;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private List<String> fielddataFields;
-
-		@Nullable
-		private List<String> fields;
-
-		@Nullable
-		private Boolean forbidClosedIndices;
-
-		@Nullable
-		private List<String> groups;
-
-		@Nullable
-		private Boolean includeSegmentFileSizes;
-
-		@Nullable
-		private Boolean includeUnloadedSegments;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private Level level;
-
-		@Nullable
-		private List<String> metric;
-
-		@Nullable
-		private List<String> types;
-
-		/**
-		 * A comma-separated list of fields for <code>fielddata</code> and
-		 * <code>suggest</code> index metric (supports wildcards)
-		 * <p>
-		 * API name: {@code completion_fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>completionFields</code>.
-		 */
-		public final Builder completionFields(List<String> list) {
-			this.completionFields = _listAddAll(this.completionFields, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of fields for <code>fielddata</code> and
-		 * <code>suggest</code> index metric (supports wildcards)
-		 * <p>
-		 * API name: {@code completion_fields}
-		 * <p>
-		 * Adds one or more values to <code>completionFields</code>.
-		 */
-		public final Builder completionFields(String value, String... values) {
-			this.completionFields = _listAdd(this.completionFields, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of fields for <code>fielddata</code> index metric
-		 * (supports wildcards)
-		 * <p>
-		 * API name: {@code fielddata_fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fielddataFields</code>.
-		 */
-		public final Builder fielddataFields(List<String> list) {
-			this.fielddataFields = _listAddAll(this.fielddataFields, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of fields for <code>fielddata</code> index metric
-		 * (supports wildcards)
-		 * <p>
-		 * API name: {@code fielddata_fields}
-		 * <p>
-		 * Adds one or more values to <code>fielddataFields</code>.
-		 */
-		public final Builder fielddataFields(String value, String... values) {
-			this.fielddataFields = _listAdd(this.fielddataFields, value, values);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of fields for <code>fielddata</code> and
-		 * <code>completion</code> index metric (supports wildcards)
-		 * <p>
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fields</code>.
-		 */
-		public final Builder fields(List<String> list) {
-			this.fields = _listAddAll(this.fields, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of fields for <code>fielddata</code> and
-		 * <code>completion</code> index metric (supports wildcards)
-		 * <p>
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds one or more values to <code>fields</code>.
-		 */
-		public final Builder fields(String value, String... values) {
-			this.fields = _listAdd(this.fields, value, values);
-			return this;
-		}
-
-		/**
-		 * If set to false stats will also collected from closed indices if explicitly
-		 * specified or if expand_wildcards expands to closed indices
-		 * <p>
-		 * API name: {@code forbid_closed_indices}
-		 */
-		public final Builder forbidClosedIndices(@Nullable Boolean value) {
-			this.forbidClosedIndices = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of search groups for <code>search</code> index metric
-		 * <p>
-		 * API name: {@code groups}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>groups</code>.
-		 */
-		public final Builder groups(List<String> list) {
-			this.groups = _listAddAll(this.groups, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of search groups for <code>search</code> index metric
-		 * <p>
-		 * API name: {@code groups}
-		 * <p>
-		 * Adds one or more values to <code>groups</code>.
-		 */
-		public final Builder groups(String value, String... values) {
-			this.groups = _listAdd(this.groups, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether to report the aggregated disk usage of each one of the Lucene index
-		 * files (only applies if segment stats are requested)
-		 * <p>
-		 * API name: {@code include_segment_file_sizes}
-		 */
-		public final Builder includeSegmentFileSizes(@Nullable Boolean value) {
-			this.includeSegmentFileSizes = value;
-			return this;
-		}
-
-		/**
-		 * If set to true segment stats will include stats for segments that are not
-		 * currently loaded into memory
-		 * <p>
-		 * API name: {@code include_unloaded_segments}
-		 */
-		public final Builder includeUnloadedSegments(@Nullable Boolean value) {
-			this.includeUnloadedSegments = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Return stats aggregated at cluster, index or shard level
-		 * <p>
-		 * API name: {@code level}
-		 */
-		public final Builder level(@Nullable Level value) {
-			this.level = value;
-			return this;
-		}
-
-		/**
-		 * Limit the information returned the specific metrics.
-		 * <p>
-		 * API name: {@code metric}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>metric</code>.
-		 */
-		public final Builder metric(List<String> list) {
-			this.metric = _listAddAll(this.metric, list);
-			return this;
-		}
-
-		/**
-		 * Limit the information returned the specific metrics.
-		 * <p>
-		 * API name: {@code metric}
-		 * <p>
-		 * Adds one or more values to <code>metric</code>.
-		 */
-		public final Builder metric(String value, String... values) {
-			this.metric = _listAdd(this.metric, value, values);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of document types for the <code>indexing</code> index
-		 * metric
-		 * <p>
-		 * API name: {@code types}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>types</code>.
-		 */
-		public final Builder types(List<String> list) {
-			this.types = _listAddAll(this.types, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of document types for the <code>indexing</code> index
-		 * metric
-		 * <p>
-		 * API name: {@code types}
-		 * <p>
-		 * Adds one or more values to <code>types</code>.
-		 */
-		public final Builder types(String value, String... values) {
-			this.types = _listAdd(this.types, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IndicesStatsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndicesStatsRequest build() {
-			_checkSingleUse();
-
-			return new IndicesStatsRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.stats}".
-	 */
-	public static final Endpoint<IndicesStatsRequest, IndicesStatsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _metric = 1 << 0;
-				final int _index = 1 << 1;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.metric()))
-					propsSet |= _metric;
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_stats");
-					return buf.toString();
-				}
-				if (propsSet == (_metric)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_stats");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).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);
-					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);
-					buf.append("/_stats");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (ApiTypeHelper.isDefined(request.types)) {
-					params.put("types", request.types.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).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(",")));
-				}
-				if (ApiTypeHelper.isDefined(request.fielddataFields)) {
-					params.put("fielddata_fields",
-							request.fielddataFields.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (ApiTypeHelper.isDefined(request.groups)) {
-					params.put("groups", request.groups.stream().map(v -> v).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(",")));
-				}
-				if (request.forbidClosedIndices != null) {
-					params.put("forbid_closed_indices", String.valueOf(request.forbidClosedIndices));
-				}
-				if (request.includeSegmentFileSizes != null) {
-					params.put("include_segment_file_sizes", String.valueOf(request.includeSegmentFileSizes));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, IndicesStatsResponse._DESERIALIZER);
+    private final List<String> completionFields;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    private final List<String> fielddataFields;
+
+    private final List<String> fields;
+
+    @Nullable
+    private final Boolean forbidClosedIndices;
+
+    private final List<String> groups;
+
+    @Nullable
+    private final Boolean includeSegmentFileSizes;
+
+    @Nullable
+    private final Boolean includeUnloadedSegments;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Level level;
+
+    private final List<String> metric;
+
+    private final List<String> types;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndicesStatsRequest(Builder builder) {
+
+        this.completionFields = ApiTypeHelper.unmodifiable(builder.completionFields);
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.fielddataFields = ApiTypeHelper.unmodifiable(builder.fielddataFields);
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.forbidClosedIndices = builder.forbidClosedIndices;
+        this.groups = ApiTypeHelper.unmodifiable(builder.groups);
+        this.includeSegmentFileSizes = builder.includeSegmentFileSizes;
+        this.includeUnloadedSegments = builder.includeUnloadedSegments;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.level = builder.level;
+        this.metric = ApiTypeHelper.unmodifiable(builder.metric);
+        this.types = ApiTypeHelper.unmodifiable(builder.types);
+
+    }
+
+    public static IndicesStatsRequest of(Function<Builder, ObjectBuilder<IndicesStatsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * A comma-separated list of fields for <code>fielddata</code> and
+     * <code>suggest</code> index metric (supports wildcards)
+     * <p>
+     * API name: {@code completion_fields}
+     */
+    public final List<String> completionFields() {
+        return this.completionFields;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * A comma-separated list of fields for <code>fielddata</code> index metric
+     * (supports wildcards)
+     * <p>
+     * API name: {@code fielddata_fields}
+     */
+    public final List<String> fielddataFields() {
+        return this.fielddataFields;
+    }
+
+    /**
+     * A comma-separated list of fields for <code>fielddata</code> and
+     * <code>completion</code> index metric (supports wildcards)
+     * <p>
+     * API name: {@code fields}
+     */
+    public final List<String> fields() {
+        return this.fields;
+    }
+
+    /**
+     * If set to false stats will also collected from closed indices if explicitly
+     * specified or if expand_wildcards expands to closed indices
+     * <p>
+     * API name: {@code forbid_closed_indices}
+     */
+    @Nullable
+    public final Boolean forbidClosedIndices() {
+        return this.forbidClosedIndices;
+    }
+
+    /**
+     * A comma-separated list of search groups for <code>search</code> index metric
+     * <p>
+     * API name: {@code groups}
+     */
+    public final List<String> groups() {
+        return this.groups;
+    }
+
+    /**
+     * Whether to report the aggregated disk usage of each one of the Lucene index
+     * files (only applies if segment stats are requested)
+     * <p>
+     * API name: {@code include_segment_file_sizes}
+     */
+    @Nullable
+    public final Boolean includeSegmentFileSizes() {
+        return this.includeSegmentFileSizes;
+    }
+
+    /**
+     * If set to true segment stats will include stats for segments that are not
+     * currently loaded into memory
+     * <p>
+     * API name: {@code include_unloaded_segments}
+     */
+    @Nullable
+    public final Boolean includeUnloadedSegments() {
+        return this.includeUnloadedSegments;
+    }
+
+    /**
+     * A comma-separated list of index names; use <code>_all</code> or empty string
+     * to perform the operation on all indices
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Return stats aggregated at cluster, index or shard level
+     * <p>
+     * API name: {@code level}
+     */
+    @Nullable
+    public final Level level() {
+        return this.level;
+    }
+
+    /**
+     * Limit the information returned the specific metrics.
+     * <p>
+     * API name: {@code metric}
+     */
+    public final List<String> metric() {
+        return this.metric;
+    }
+
+    /**
+     * A comma-separated list of document types for the <code>indexing</code> index
+     * metric
+     * <p>
+     * API name: {@code types}
+     */
+    public final List<String> types() {
+        return this.types;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndicesStatsRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesStatsRequest> {
+        @Nullable
+        private List<String> completionFields;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private List<String> fielddataFields;
+
+        @Nullable
+        private List<String> fields;
+
+        @Nullable
+        private Boolean forbidClosedIndices;
+
+        @Nullable
+        private List<String> groups;
+
+        @Nullable
+        private Boolean includeSegmentFileSizes;
+
+        @Nullable
+        private Boolean includeUnloadedSegments;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private Level level;
+
+        @Nullable
+        private List<String> metric;
+
+        @Nullable
+        private List<String> types;
+
+        /**
+         * A comma-separated list of fields for <code>fielddata</code> and
+         * <code>suggest</code> index metric (supports wildcards)
+         * <p>
+         * API name: {@code completion_fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>completionFields</code>.
+         */
+        public final Builder completionFields(List<String> list) {
+            this.completionFields = _listAddAll(this.completionFields, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of fields for <code>fielddata</code> and
+         * <code>suggest</code> index metric (supports wildcards)
+         * <p>
+         * API name: {@code completion_fields}
+         * <p>
+         * Adds one or more values to <code>completionFields</code>.
+         */
+        public final Builder completionFields(String value, String... values) {
+            this.completionFields = _listAdd(this.completionFields, value, values);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of fields for <code>fielddata</code> index metric
+         * (supports wildcards)
+         * <p>
+         * API name: {@code fielddata_fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fielddataFields</code>.
+         */
+        public final Builder fielddataFields(List<String> list) {
+            this.fielddataFields = _listAddAll(this.fielddataFields, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of fields for <code>fielddata</code> index metric
+         * (supports wildcards)
+         * <p>
+         * API name: {@code fielddata_fields}
+         * <p>
+         * Adds one or more values to <code>fielddataFields</code>.
+         */
+        public final Builder fielddataFields(String value, String... values) {
+            this.fielddataFields = _listAdd(this.fielddataFields, value, values);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of fields for <code>fielddata</code> and
+         * <code>completion</code> index metric (supports wildcards)
+         * <p>
+         * API name: {@code fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fields</code>.
+         */
+        public final Builder fields(List<String> list) {
+            this.fields = _listAddAll(this.fields, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of fields for <code>fielddata</code> and
+         * <code>completion</code> index metric (supports wildcards)
+         * <p>
+         * API name: {@code fields}
+         * <p>
+         * Adds one or more values to <code>fields</code>.
+         */
+        public final Builder fields(String value, String... values) {
+            this.fields = _listAdd(this.fields, value, values);
+            return this;
+        }
+
+        /**
+         * If set to false stats will also collected from closed indices if explicitly
+         * specified or if expand_wildcards expands to closed indices
+         * <p>
+         * API name: {@code forbid_closed_indices}
+         */
+        public final Builder forbidClosedIndices(@Nullable Boolean value) {
+            this.forbidClosedIndices = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of search groups for <code>search</code> index metric
+         * <p>
+         * API name: {@code groups}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>groups</code>.
+         */
+        public final Builder groups(List<String> list) {
+            this.groups = _listAddAll(this.groups, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of search groups for <code>search</code> index metric
+         * <p>
+         * API name: {@code groups}
+         * <p>
+         * Adds one or more values to <code>groups</code>.
+         */
+        public final Builder groups(String value, String... values) {
+            this.groups = _listAdd(this.groups, value, values);
+            return this;
+        }
+
+        /**
+         * Whether to report the aggregated disk usage of each one of the Lucene index
+         * files (only applies if segment stats are requested)
+         * <p>
+         * API name: {@code include_segment_file_sizes}
+         */
+        public final Builder includeSegmentFileSizes(@Nullable Boolean value) {
+            this.includeSegmentFileSizes = value;
+            return this;
+        }
+
+        /**
+         * If set to true segment stats will include stats for segments that are not
+         * currently loaded into memory
+         * <p>
+         * API name: {@code include_unloaded_segments}
+         */
+        public final Builder includeUnloadedSegments(@Nullable Boolean value) {
+            this.includeUnloadedSegments = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Return stats aggregated at cluster, index or shard level
+         * <p>
+         * API name: {@code level}
+         */
+        public final Builder level(@Nullable Level value) {
+            this.level = value;
+            return this;
+        }
+
+        /**
+         * Limit the information returned the specific metrics.
+         * <p>
+         * API name: {@code metric}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>metric</code>.
+         */
+        public final Builder metric(List<String> list) {
+            this.metric = _listAddAll(this.metric, list);
+            return this;
+        }
+
+        /**
+         * Limit the information returned the specific metrics.
+         * <p>
+         * API name: {@code metric}
+         * <p>
+         * Adds one or more values to <code>metric</code>.
+         */
+        public final Builder metric(String value, String... values) {
+            this.metric = _listAdd(this.metric, value, values);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of document types for the <code>indexing</code> index
+         * metric
+         * <p>
+         * API name: {@code types}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>types</code>.
+         */
+        public final Builder types(List<String> list) {
+            this.types = _listAddAll(this.types, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of document types for the <code>indexing</code> index
+         * metric
+         * <p>
+         * API name: {@code types}
+         * <p>
+         * Adds one or more values to <code>types</code>.
+         */
+        public final Builder types(String value, String... values) {
+            this.types = _listAdd(this.types, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link IndicesStatsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndicesStatsRequest build() {
+            _checkSingleUse();
+
+            return new IndicesStatsRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.stats}".
+     */
+    public static final Endpoint<IndicesStatsRequest, IndicesStatsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _metric = 1 << 0;
+            final int _index = 1 << 1;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.metric())) propsSet |= _metric;
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_stats");
+                return buf.toString();
+            }
+            if (propsSet == (_metric)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_stats");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).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);
+                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);
+                buf.append("/_stats");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (ApiTypeHelper.isDefined(request.types)) {
+                params.put("types", request.types.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).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(",")));
+            }
+            if (ApiTypeHelper.isDefined(request.fielddataFields)) {
+                params.put("fielddata_fields", request.fielddataFields.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (ApiTypeHelper.isDefined(request.groups)) {
+                params.put("groups", request.groups.stream().map(v -> v).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(",")));
+            }
+            if (request.forbidClosedIndices != null) {
+                params.put("forbid_closed_indices", String.valueOf(request.forbidClosedIndices));
+            }
+            if (request.includeSegmentFileSizes != null) {
+                params.put("include_segment_file_sizes", String.valueOf(request.includeSegmentFileSizes));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        IndicesStatsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndicesStatsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndicesStatsResponse.java
index 08e45497e1..135e6de736 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndicesStatsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndicesStatsResponse.java
@@ -32,198 +32,199 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ShardStatistics;
-import org.opensearch.client.opensearch.indices.stats.IndicesStats;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ShardStatistics;
+import org.opensearch.client.opensearch.indices.stats.IndicesStats;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.stats.Response
 
 @JsonpDeserializable
 public class IndicesStatsResponse implements JsonpSerializable {
-	private final Map<String, IndicesStats> indices;
-
-	private final ShardStatistics shards;
-
-	private final IndicesStats all;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndicesStatsResponse(Builder builder) {
-
-		this.indices = ApiTypeHelper.unmodifiable(builder.indices);
-		this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
-		this.all = ApiTypeHelper.requireNonNull(builder.all, this, "all");
-
-	}
-
-	public static IndicesStatsResponse of(Function<Builder, ObjectBuilder<IndicesStatsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code indices}
-	 */
-	public final Map<String, IndicesStats> indices() {
-		return this.indices;
-	}
-
-	/**
-	 * Required - API name: {@code _shards}
-	 */
-	public final ShardStatistics shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Required - API name: {@code _all}
-	 */
-	public final IndicesStats all() {
-		return this.all;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartObject();
-			for (Map.Entry<String, IndicesStats> item0 : this.indices.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("_shards");
-		this.shards.serialize(generator, mapper);
-
-		generator.writeKey("_all");
-		this.all.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndicesStatsResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesStatsResponse> {
-		@Nullable
-		private Map<String, IndicesStats> indices;
-
-		private ShardStatistics shards;
-
-		private IndicesStats all;
-
-		/**
-		 * API name: {@code indices}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>indices</code>.
-		 */
-		public final Builder indices(Map<String, IndicesStats> map) {
-			this.indices = _mapPutAll(this.indices, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code indices}
-		 * <p>
-		 * Adds an entry to <code>indices</code>.
-		 */
-		public final Builder indices(String key, IndicesStats value) {
-			this.indices = _mapPut(this.indices, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code indices}
-		 * <p>
-		 * Adds an entry to <code>indices</code> using a builder lambda.
-		 */
-		public final Builder indices(String key, Function<IndicesStats.Builder, ObjectBuilder<IndicesStats>> fn) {
-			return indices(key, fn.apply(new IndicesStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code _shards}
-		 */
-		public final Builder shards(ShardStatistics value) {
-			this.shards = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _shards}
-		 */
-		public final Builder shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
-			return this.shards(fn.apply(new ShardStatistics.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code _all}
-		 */
-		public final Builder all(IndicesStats value) {
-			this.all = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _all}
-		 */
-		public final Builder all(Function<IndicesStats.Builder, ObjectBuilder<IndicesStats>> fn) {
-			return this.all(fn.apply(new IndicesStats.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link IndicesStatsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndicesStatsResponse build() {
-			_checkSingleUse();
-
-			return new IndicesStatsResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndicesStatsResponse}
-	 */
-	public static final JsonpDeserializer<IndicesStatsResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IndicesStatsResponse::setupIndicesStatsResponseDeserializer);
-
-	protected static void setupIndicesStatsResponseDeserializer(ObjectDeserializer<IndicesStatsResponse.Builder> op) {
-
-		op.add(Builder::indices, JsonpDeserializer.stringMapDeserializer(IndicesStats._DESERIALIZER), "indices");
-		op.add(Builder::shards, ShardStatistics._DESERIALIZER, "_shards");
-		op.add(Builder::all, IndicesStats._DESERIALIZER, "_all");
-
-	}
+    private final Map<String, IndicesStats> indices;
+
+    private final ShardStatistics shards;
+
+    private final IndicesStats all;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndicesStatsResponse(Builder builder) {
+
+        this.indices = ApiTypeHelper.unmodifiable(builder.indices);
+        this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
+        this.all = ApiTypeHelper.requireNonNull(builder.all, this, "all");
+
+    }
+
+    public static IndicesStatsResponse of(Function<Builder, ObjectBuilder<IndicesStatsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code indices}
+     */
+    public final Map<String, IndicesStats> indices() {
+        return this.indices;
+    }
+
+    /**
+     * Required - API name: {@code _shards}
+     */
+    public final ShardStatistics shards() {
+        return this.shards;
+    }
+
+    /**
+     * Required - API name: {@code _all}
+     */
+    public final IndicesStats all() {
+        return this.all;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartObject();
+            for (Map.Entry<String, IndicesStats> item0 : this.indices.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("_shards");
+        this.shards.serialize(generator, mapper);
+
+        generator.writeKey("_all");
+        this.all.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndicesStatsResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesStatsResponse> {
+        @Nullable
+        private Map<String, IndicesStats> indices;
+
+        private ShardStatistics shards;
+
+        private IndicesStats all;
+
+        /**
+         * API name: {@code indices}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>indices</code>.
+         */
+        public final Builder indices(Map<String, IndicesStats> map) {
+            this.indices = _mapPutAll(this.indices, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code indices}
+         * <p>
+         * Adds an entry to <code>indices</code>.
+         */
+        public final Builder indices(String key, IndicesStats value) {
+            this.indices = _mapPut(this.indices, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code indices}
+         * <p>
+         * Adds an entry to <code>indices</code> using a builder lambda.
+         */
+        public final Builder indices(String key, Function<IndicesStats.Builder, ObjectBuilder<IndicesStats>> fn) {
+            return indices(key, fn.apply(new IndicesStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code _shards}
+         */
+        public final Builder shards(ShardStatistics value) {
+            this.shards = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _shards}
+         */
+        public final Builder shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
+            return this.shards(fn.apply(new ShardStatistics.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code _all}
+         */
+        public final Builder all(IndicesStats value) {
+            this.all = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _all}
+         */
+        public final Builder all(Function<IndicesStats.Builder, ObjectBuilder<IndicesStats>> fn) {
+            return this.all(fn.apply(new IndicesStats.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link IndicesStatsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndicesStatsResponse build() {
+            _checkSingleUse();
+
+            return new IndicesStatsResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndicesStatsResponse}
+     */
+    public static final JsonpDeserializer<IndicesStatsResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndicesStatsResponse::setupIndicesStatsResponseDeserializer
+    );
+
+    protected static void setupIndicesStatsResponseDeserializer(ObjectDeserializer<IndicesStatsResponse.Builder> op) {
+
+        op.add(Builder::indices, JsonpDeserializer.stringMapDeserializer(IndicesStats._DESERIALIZER), "indices");
+        op.add(Builder::shards, ShardStatistics._DESERIALIZER, "_shards");
+        op.add(Builder::all, IndicesStats._DESERIALIZER, "_all");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/NumericFielddata.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/NumericFielddata.java
index 1821e27ef9..45f8c5f423 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/NumericFielddata.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/NumericFielddata.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,94 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: indices._types.NumericFielddata
 
-
 @JsonpDeserializable
 public class NumericFielddata implements JsonpSerializable {
-	private final NumericFielddataFormat format;
+    private final NumericFielddataFormat format;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private NumericFielddata(Builder builder) {
+    private NumericFielddata(Builder builder) {
 
-		this.format = ApiTypeHelper.requireNonNull(builder.format, this, "format");
+        this.format = ApiTypeHelper.requireNonNull(builder.format, this, "format");
 
-	}
+    }
 
-	public static NumericFielddata of(Function<Builder, ObjectBuilder<NumericFielddata>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static NumericFielddata of(Function<Builder, ObjectBuilder<NumericFielddata>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code format}
-	 */
-	public final NumericFielddataFormat format() {
-		return this.format;
-	}
+    /**
+     * Required - API name: {@code format}
+     */
+    public final NumericFielddataFormat format() {
+        return this.format;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("format");
-		this.format.serialize(generator, mapper);
+        generator.writeKey("format");
+        this.format.serialize(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link NumericFielddata}.
-	 */
+    /**
+     * Builder for {@link NumericFielddata}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NumericFielddata> {
-		private NumericFielddataFormat format;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NumericFielddata> {
+        private NumericFielddataFormat format;
 
-		/**
-		 * Required - API name: {@code format}
-		 */
-		public final Builder format(NumericFielddataFormat value) {
-			this.format = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code format}
+         */
+        public final Builder format(NumericFielddataFormat value) {
+            this.format = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link NumericFielddata}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NumericFielddata build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link NumericFielddata}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NumericFielddata build() {
+            _checkSingleUse();
 
-			return new NumericFielddata(this);
-		}
-	}
+            return new NumericFielddata(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link NumericFielddata}
-	 */
-	public static final JsonpDeserializer<NumericFielddata> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NumericFielddata::setupNumericFielddataDeserializer);
+    /**
+     * Json deserializer for {@link NumericFielddata}
+     */
+    public static final JsonpDeserializer<NumericFielddata> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NumericFielddata::setupNumericFielddataDeserializer
+    );
 
-	protected static void setupNumericFielddataDeserializer(ObjectDeserializer<NumericFielddata.Builder> op) {
+    protected static void setupNumericFielddataDeserializer(ObjectDeserializer<NumericFielddata.Builder> op) {
 
-		op.add(Builder::format, NumericFielddataFormat._DESERIALIZER, "format");
+        op.add(Builder::format, NumericFielddataFormat._DESERIALIZER, "format");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/NumericFielddataFormat.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/NumericFielddataFormat.java
index 0b6ee76cb4..15b2fd64ee 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/NumericFielddataFormat.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/NumericFielddataFormat.java
@@ -37,22 +37,23 @@
 
 @JsonpDeserializable
 public enum NumericFielddataFormat implements JsonEnum {
-	Array("array"),
+    Array("array"),
 
-	Disabled("disabled"),
+    Disabled("disabled"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	NumericFielddataFormat(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    NumericFielddataFormat(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<NumericFielddataFormat> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			NumericFielddataFormat.values());
+    public static final JsonEnum.Deserializer<NumericFielddataFormat> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        NumericFielddataFormat.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenRequest.java
index 6594887f53..d8a94582ce 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -43,13 +49,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.open.Request
 
 /**
@@ -58,386 +57,387 @@
  */
 
 public class OpenRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final WaitForActiveShards waitForActiveShards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private OpenRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.timeout = builder.timeout;
-		this.waitForActiveShards = builder.waitForActiveShards;
-
-	}
-
-	public static OpenRequest of(Function<Builder, ObjectBuilder<OpenRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * Required - A comma separated list of indices to open
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Sets the number of active shards to wait for before the operation returns.
-	 * <p>
-	 * API name: {@code wait_for_active_shards}
-	 */
-	@Nullable
-	public final WaitForActiveShards waitForActiveShards() {
-		return this.waitForActiveShards;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link OpenRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<OpenRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		private List<String> index;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private WaitForActiveShards waitForActiveShards;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Required - A comma separated list of indices to open
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * Required - A comma separated list of indices to open
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Sets the number of active shards to wait for before the operation returns.
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
-			this.waitForActiveShards = value;
-			return this;
-		}
-
-		/**
-		 * Sets the number of active shards to wait for before the operation returns.
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(
-				Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
-			return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link OpenRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public OpenRequest build() {
-			_checkSingleUse();
-
-			return new OpenRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.open}".
-	 */
-	public static final Endpoint<OpenRequest, OpenResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_open");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.waitForActiveShards != null) {
-					params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, OpenResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final WaitForActiveShards waitForActiveShards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private OpenRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.timeout = builder.timeout;
+        this.waitForActiveShards = builder.waitForActiveShards;
+
+    }
+
+    public static OpenRequest of(Function<Builder, ObjectBuilder<OpenRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * Required - A comma separated list of indices to open
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Sets the number of active shards to wait for before the operation returns.
+     * <p>
+     * API name: {@code wait_for_active_shards}
+     */
+    @Nullable
+    public final WaitForActiveShards waitForActiveShards() {
+        return this.waitForActiveShards;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link OpenRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<OpenRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        private List<String> index;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private WaitForActiveShards waitForActiveShards;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Required - A comma separated list of indices to open
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * Required - A comma separated list of indices to open
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Sets the number of active shards to wait for before the operation returns.
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
+            this.waitForActiveShards = value;
+            return this;
+        }
+
+        /**
+         * Sets the number of active shards to wait for before the operation returns.
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
+            return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link OpenRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public OpenRequest build() {
+            _checkSingleUse();
+
+            return new OpenRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.open}".
+     */
+    public static final Endpoint<OpenRequest, OpenResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_open");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.waitForActiveShards != null) {
+                params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        OpenResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenResponse.java
index e1f6feab31..fa348fb709 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenResponse.java
@@ -32,101 +32,100 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: indices.open.Response
 
-
 @JsonpDeserializable
 public class OpenResponse extends AcknowledgedResponseBase {
-	private final boolean shardsAcknowledged;
+    private final boolean shardsAcknowledged;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private OpenResponse(Builder builder) {
-		super(builder);
+    private OpenResponse(Builder builder) {
+        super(builder);
 
-		this.shardsAcknowledged = ApiTypeHelper.requireNonNull(builder.shardsAcknowledged, this, "shardsAcknowledged");
+        this.shardsAcknowledged = ApiTypeHelper.requireNonNull(builder.shardsAcknowledged, this, "shardsAcknowledged");
 
-	}
+    }
 
-	public static OpenResponse of(Function<Builder, ObjectBuilder<OpenResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static OpenResponse of(Function<Builder, ObjectBuilder<OpenResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code shards_acknowledged}
-	 */
-	public final boolean shardsAcknowledged() {
-		return this.shardsAcknowledged;
-	}
+    /**
+     * Required - API name: {@code shards_acknowledged}
+     */
+    public final boolean shardsAcknowledged() {
+        return this.shardsAcknowledged;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("shards_acknowledged");
-		generator.write(this.shardsAcknowledged);
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("shards_acknowledged");
+        generator.write(this.shardsAcknowledged);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link OpenResponse}.
-	 */
+    /**
+     * Builder for {@link OpenResponse}.
+     */
 
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<OpenResponse> {
-		private Boolean shardsAcknowledged;
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<OpenResponse> {
+        private Boolean shardsAcknowledged;
 
-		/**
-		 * Required - API name: {@code shards_acknowledged}
-		 */
-		public final Builder shardsAcknowledged(boolean value) {
-			this.shardsAcknowledged = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code shards_acknowledged}
+         */
+        public final Builder shardsAcknowledged(boolean value) {
+            this.shardsAcknowledged = value;
+            return this;
+        }
 
-		@Override
-		protected Builder self() {
-			return this;
-		}
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link OpenResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public OpenResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link OpenResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public OpenResponse build() {
+            _checkSingleUse();
 
-			return new OpenResponse(this);
-		}
-	}
+            return new OpenResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link OpenResponse}
-	 */
-	public static final JsonpDeserializer<OpenResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			OpenResponse::setupOpenResponseDeserializer);
+    /**
+     * Json deserializer for {@link OpenResponse}
+     */
+    public static final JsonpDeserializer<OpenResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        OpenResponse::setupOpenResponseDeserializer
+    );
 
-	protected static void setupOpenResponseDeserializer(ObjectDeserializer<OpenResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
-		op.add(Builder::shardsAcknowledged, JsonpDeserializer.booleanDeserializer(), "shards_acknowledged");
+    protected static void setupOpenResponseDeserializer(ObjectDeserializer<OpenResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+        op.add(Builder::shardsAcknowledged, JsonpDeserializer.booleanDeserializer(), "shards_acknowledged");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesAsyncClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesAsyncClient.java
index 986f6e8f8e..d2a4087e40 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesAsyncClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesAsyncClient.java
@@ -32,1851 +32,1919 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
+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;
 
-import java.io.IOException;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 /**
  * Client for the indices namespace.
  */
-public class OpenSearchIndicesAsyncClient
-		extends
-			ApiClient<OpenSearchTransport, OpenSearchIndicesAsyncClient> {
-
-	public OpenSearchIndicesAsyncClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchIndicesAsyncClient(OpenSearchTransport transport,
-                                        @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchIndicesAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchIndicesAsyncClient(this.transport, transportOptions);
-	}
-
-	// ----- Endpoint: indices.add_block
-
-	/**
-	 * Adds a block to an index.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<AddBlockResponse> addBlock(AddBlockRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<AddBlockRequest, AddBlockResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<AddBlockRequest, AddBlockResponse, ErrorResponse>) AddBlockRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Adds a block to an index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link AddBlockRequest}
-	 *
-	 */
-
-	public final CompletableFuture<AddBlockResponse> addBlock(
-			Function<AddBlockRequest.Builder, ObjectBuilder<AddBlockRequest>> fn)
-			throws IOException, OpenSearchException {
-		return addBlock(fn.apply(new AddBlockRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.analyze
-
-	/**
-	 * Performs the analysis process on a text and return the tokens breakdown of
-	 * the text.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<AnalyzeResponse> analyze(AnalyzeRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<AnalyzeRequest, AnalyzeResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<AnalyzeRequest, AnalyzeResponse, ErrorResponse>) AnalyzeRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Performs the analysis process on a text and return the tokens breakdown of
-	 * the text.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link AnalyzeRequest}
-	 *
-	 */
-
-	public final CompletableFuture<AnalyzeResponse> analyze(
-			Function<AnalyzeRequest.Builder, ObjectBuilder<AnalyzeRequest>> fn)
-			throws IOException, OpenSearchException {
-		return analyze(fn.apply(new AnalyzeRequest.Builder()).build());
-	}
-
-	/**
-	 * Performs the analysis process on a text and return the tokens breakdown of
-	 * the text.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<AnalyzeResponse> analyze() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new AnalyzeRequest.Builder().build(), AnalyzeRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.clear_cache
-
-	/**
-	 * Clears all or specific caches for one or more indices.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ClearCacheResponse> clearCache(ClearCacheRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ClearCacheRequest, ClearCacheResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ClearCacheRequest, ClearCacheResponse, ErrorResponse>) ClearCacheRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Clears all or specific caches for one or more indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ClearCacheRequest}
-	 *
-	 */
-
-	public final CompletableFuture<ClearCacheResponse> clearCache(
-			Function<ClearCacheRequest.Builder, ObjectBuilder<ClearCacheRequest>> fn)
-			throws IOException, OpenSearchException {
-		return clearCache(fn.apply(new ClearCacheRequest.Builder()).build());
-	}
-
-	/**
-	 * Clears all or specific caches for one or more indices.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ClearCacheResponse> clearCache() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new ClearCacheRequest.Builder().build(), ClearCacheRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.clone
-
-	/**
-	 * Clones an index
-	 *
-	 */
-
-	public CompletableFuture<CloneIndexResponse> clone(CloneIndexRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CloneIndexRequest, CloneIndexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CloneIndexRequest, CloneIndexResponse, ErrorResponse>) CloneIndexRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Clones an index
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CloneIndexRequest}
-	 *
-	 */
-
-	public final CompletableFuture<CloneIndexResponse> clone(
-			Function<CloneIndexRequest.Builder, ObjectBuilder<CloneIndexRequest>> fn)
-			throws IOException, OpenSearchException {
-		return clone(fn.apply(new CloneIndexRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.close
-
-	/**
-	 * Closes an index.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<CloseIndexResponse> close(CloseIndexRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CloseIndexRequest, CloseIndexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CloseIndexRequest, CloseIndexResponse, ErrorResponse>) CloseIndexRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Closes an index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CloseIndexRequest}
-	 *
-	 */
-
-	public final CompletableFuture<CloseIndexResponse> close(
-			Function<CloseIndexRequest.Builder, ObjectBuilder<CloseIndexRequest>> fn)
-			throws IOException, OpenSearchException {
-		return close(fn.apply(new CloseIndexRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.create
-
-	/**
-	 * Creates an index with optional settings and mappings.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<CreateIndexResponse> create(CreateIndexRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CreateIndexRequest, CreateIndexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CreateIndexRequest, CreateIndexResponse, ErrorResponse>) CreateIndexRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates an index with optional settings and mappings.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CreateIndexRequest}
-	 *
-	 */
-
-	public final CompletableFuture<CreateIndexResponse> create(
-			Function<CreateIndexRequest.Builder, ObjectBuilder<CreateIndexRequest>> fn)
-			throws IOException, OpenSearchException {
-		return create(fn.apply(new CreateIndexRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.create_data_stream
-
-	/**
-	 * Creates a data stream
-	 */
-
-	public CompletableFuture<CreateDataStreamResponse> createDataStream(CreateDataStreamRequest request)
-		throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CreateDataStreamRequest, CreateDataStreamResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CreateDataStreamRequest, CreateDataStreamResponse, ErrorResponse>) CreateDataStreamRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates a data stream
-	 *
-	 * @param fn
-	 * 				a function that initializes a builder to create the {@link CreateDataStreamRequest}
-	 */
-
-	public CompletableFuture<CreateDataStreamResponse> createDataStream(
-			Function<CreateDataStreamRequest.Builder, ObjectBuilder<CreateDataStreamRequest>> fn)
-			throws IOException, OpenSearchException {
-		return createDataStream(fn.apply(new CreateDataStreamRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.delete
-
-	/**
-	 * Deletes an index.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<DeleteIndexResponse> delete(DeleteIndexRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteIndexRequest, DeleteIndexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteIndexRequest, DeleteIndexResponse, ErrorResponse>) DeleteIndexRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes an index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteIndexRequest}
-	 *
-	 */
-
-	public final CompletableFuture<DeleteIndexResponse> delete(
-			Function<DeleteIndexRequest.Builder, ObjectBuilder<DeleteIndexRequest>> fn)
-			throws IOException, OpenSearchException {
-		return delete(fn.apply(new DeleteIndexRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.delete_data_stream
-
-	/**
-	 * Deletes one or more data streams and their backing indices.
-	 */
-
-	public CompletableFuture<DeleteDataStreamResponse> deleteDataStream(DeleteDataStreamRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteDataStreamRequest, DeleteDataStreamResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteDataStreamRequest, DeleteDataStreamResponse, ErrorResponse>) DeleteDataStreamRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes one or more data streams and their backing indices.
-	 *
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteDataStreamRequest}
-	 *
-	 */
-
-	public final CompletableFuture<DeleteDataStreamResponse> deleteDataStream(
-			Function<DeleteDataStreamRequest.Builder, ObjectBuilder<DeleteDataStreamRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteDataStream(fn.apply(new DeleteDataStreamRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.delete_alias
-
-	/**
-	 * Deletes an alias.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<DeleteAliasResponse> deleteAlias(DeleteAliasRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteAliasRequest, DeleteAliasResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteAliasRequest, DeleteAliasResponse, ErrorResponse>) DeleteAliasRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes an alias.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteAliasRequest}
-	 *
-	 */
-
-	public final CompletableFuture<DeleteAliasResponse> deleteAlias(
-			Function<DeleteAliasRequest.Builder, ObjectBuilder<DeleteAliasRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteAlias(fn.apply(new DeleteAliasRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.delete_index_template
-
-	/**
-	 * Deletes an index template.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<DeleteIndexTemplateResponse> deleteIndexTemplate(DeleteIndexTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteIndexTemplateRequest, DeleteIndexTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteIndexTemplateRequest, DeleteIndexTemplateResponse, ErrorResponse>)
-						DeleteIndexTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes an index template.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteIndexTemplateRequest}
-	 *
-	 */
-
-	public final CompletableFuture<DeleteIndexTemplateResponse> deleteIndexTemplate(
-			Function<DeleteIndexTemplateRequest.Builder, ObjectBuilder<DeleteIndexTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteIndexTemplate(fn.apply(new DeleteIndexTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.delete_template
-
-	/**
-	 * Deletes an index template.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<DeleteTemplateResponse> deleteTemplate(DeleteTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteTemplateRequest, DeleteTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteTemplateRequest, DeleteTemplateResponse, ErrorResponse>)
-						DeleteTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes an index template.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteTemplateRequest}
-	 *
-	 */
-
-	public final CompletableFuture<DeleteTemplateResponse> deleteTemplate(
-			Function<DeleteTemplateRequest.Builder, ObjectBuilder<DeleteTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteTemplate(fn.apply(new DeleteTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.disk_usage
-
-	/**
-	 * Analyzes the disk usage of each field of an index or data stream
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<DiskUsageResponse> diskUsage(DiskUsageRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DiskUsageRequest, DiskUsageResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DiskUsageRequest, DiskUsageResponse, ErrorResponse>) DiskUsageRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Analyzes the disk usage of each field of an index or data stream
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DiskUsageRequest}
-	 *
-	 */
-
-	public final CompletableFuture<DiskUsageResponse> diskUsage(
-			Function<DiskUsageRequest.Builder, ObjectBuilder<DiskUsageRequest>> fn)
-			throws IOException, OpenSearchException {
-		return diskUsage(fn.apply(new DiskUsageRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.exists
-
-	/**
-	 * Returns information about whether a particular index exists.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<BooleanResponse> exists(ExistsRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ExistsRequest, BooleanResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ExistsRequest, BooleanResponse, ErrorResponse>) ExistsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about whether a particular index exists.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ExistsRequest}
-	 *
-	 */
-
-	public final CompletableFuture<BooleanResponse> exists(
-			Function<ExistsRequest.Builder, ObjectBuilder<ExistsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return exists(fn.apply(new ExistsRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.exists_alias
-
-	/**
-	 * Returns information about whether a particular alias exists.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<BooleanResponse> existsAlias(ExistsAliasRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ExistsAliasRequest, BooleanResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ExistsAliasRequest, BooleanResponse, ErrorResponse>) ExistsAliasRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about whether a particular alias exists.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ExistsAliasRequest}
-	 *
-	 */
-
-	public final CompletableFuture<BooleanResponse> existsAlias(
-			Function<ExistsAliasRequest.Builder, ObjectBuilder<ExistsAliasRequest>> fn)
-			throws IOException, OpenSearchException {
-		return existsAlias(fn.apply(new ExistsAliasRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.exists_index_template
-
-	/**
-	 * Returns information about whether a particular index template exists.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<BooleanResponse> existsIndexTemplate(ExistsIndexTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ExistsIndexTemplateRequest, BooleanResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ExistsIndexTemplateRequest, BooleanResponse, ErrorResponse>)
-						ExistsIndexTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about whether a particular index template exists.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ExistsIndexTemplateRequest}
-	 *
-	 */
-
-	public final CompletableFuture<BooleanResponse> existsIndexTemplate(
-			Function<ExistsIndexTemplateRequest.Builder, ObjectBuilder<ExistsIndexTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return existsIndexTemplate(fn.apply(new ExistsIndexTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.exists_template
-
-	/**
-	 * Returns information about whether a particular index template exists.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<BooleanResponse> existsTemplate(ExistsTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ExistsTemplateRequest, BooleanResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ExistsTemplateRequest, BooleanResponse, ErrorResponse>) ExistsTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about whether a particular index template exists.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ExistsTemplateRequest}
-	 *
-	 */
-
-	public final CompletableFuture<BooleanResponse> existsTemplate(
-			Function<ExistsTemplateRequest.Builder, ObjectBuilder<ExistsTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return existsTemplate(fn.apply(new ExistsTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.flush
-
-	/**
-	 * Performs the flush operation on one or more indices.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<FlushResponse> flush(FlushRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<FlushRequest, FlushResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<FlushRequest, FlushResponse, ErrorResponse>) FlushRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Performs the flush operation on one or more indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link FlushRequest}
-	 *
-	 */
-
-	public final CompletableFuture<FlushResponse> flush(Function<FlushRequest.Builder, ObjectBuilder<FlushRequest>> fn)
-			throws IOException, OpenSearchException {
-		return flush(fn.apply(new FlushRequest.Builder()).build());
-	}
-
-	/**
-	 * Performs the flush operation on one or more indices.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<FlushResponse> flush() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new FlushRequest.Builder().build(), FlushRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.forcemerge
-
-	/**
-	 * Performs the force merge operation on one or more indices.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ForcemergeResponse> forcemerge(ForcemergeRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ForcemergeRequest, ForcemergeResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ForcemergeRequest, ForcemergeResponse, ErrorResponse>) ForcemergeRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Performs the force merge operation on one or more indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ForcemergeRequest}
-	 *
-	 */
-
-	public final CompletableFuture<ForcemergeResponse> forcemerge(
-			Function<ForcemergeRequest.Builder, ObjectBuilder<ForcemergeRequest>> fn)
-			throws IOException, OpenSearchException {
-		return forcemerge(fn.apply(new ForcemergeRequest.Builder()).build());
-	}
-
-	/**
-	 * Performs the force merge operation on one or more indices.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ForcemergeResponse> forcemerge() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new ForcemergeRequest.Builder().build(), ForcemergeRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.get
-
-	/**
-	 * Returns information about one or more indices.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetIndexResponse> get(GetIndexRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetIndexRequest, GetIndexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetIndexRequest, GetIndexResponse, ErrorResponse>) GetIndexRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about one or more indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetIndexRequest}
-	 *
-	 */
-
-	public final CompletableFuture<GetIndexResponse> get(
-			Function<GetIndexRequest.Builder, ObjectBuilder<GetIndexRequest>> fn)
-			throws IOException, OpenSearchException {
-		return get(fn.apply(new GetIndexRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.get_data_stream
-
-	/**
-	 * Returns information about one or more data streams.
-	 *
-	 *
-	 */
-
-	public CompletableFuture<GetDataStreamResponse> getDataStream(GetDataStreamRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetDataStreamRequest, GetDataStreamResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetDataStreamRequest, GetDataStreamResponse, ErrorResponse>) GetDataStreamRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about one or more data streams.
-	 *
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetDataStreamRequest}
-	 *
-	 */
-
-	public final CompletableFuture<GetDataStreamResponse> getDataStream(
-			Function<GetDataStreamRequest.Builder, ObjectBuilder<GetDataStreamRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getDataStream(fn.apply(new GetDataStreamRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about one or more data streams.
-	 *
-	 *
-	 */
-
-	public CompletableFuture<GetDataStreamResponse> getDataStream() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new GetDataStreamRequest.Builder().build(), GetDataStreamRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.get_alias
-
-	/**
-	 * Returns an alias.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetAliasResponse> getAlias(GetAliasRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetAliasRequest, GetAliasResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetAliasRequest, GetAliasResponse, ErrorResponse>) GetAliasRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns an alias.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetAliasRequest}
-	 *
-	 */
-
-	public final CompletableFuture<GetAliasResponse> getAlias(
-			Function<GetAliasRequest.Builder, ObjectBuilder<GetAliasRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getAlias(fn.apply(new GetAliasRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns an alias.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetAliasResponse> getAlias() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new GetAliasRequest.Builder().build(), GetAliasRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.get_field_mapping
-
-	/**
-	 * Returns mapping for one or more fields.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetFieldMappingResponse> getFieldMapping(GetFieldMappingRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetFieldMappingRequest, GetFieldMappingResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetFieldMappingRequest, GetFieldMappingResponse, ErrorResponse>)
-						GetFieldMappingRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns mapping for one or more fields.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetFieldMappingRequest}
-	 *
-	 */
-
-	public final CompletableFuture<GetFieldMappingResponse> getFieldMapping(
-			Function<GetFieldMappingRequest.Builder, ObjectBuilder<GetFieldMappingRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getFieldMapping(fn.apply(new GetFieldMappingRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.get_index_template
-
-	/**
-	 * Returns an index template.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetIndexTemplateResponse> getIndexTemplate(GetIndexTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetIndexTemplateRequest, GetIndexTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetIndexTemplateRequest, GetIndexTemplateResponse, ErrorResponse>)
-						GetIndexTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns an index template.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetIndexTemplateRequest}
-	 *
-	 */
-
-	public final CompletableFuture<GetIndexTemplateResponse> getIndexTemplate(
-			Function<GetIndexTemplateRequest.Builder, ObjectBuilder<GetIndexTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getIndexTemplate(fn.apply(new GetIndexTemplateRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns an index template.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetIndexTemplateResponse> getIndexTemplate() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new GetIndexTemplateRequest.Builder().build(),
-				GetIndexTemplateRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.get_mapping
-
-	/**
-	 * Returns mappings for one or more indices.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetMappingResponse> getMapping(GetMappingRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetMappingRequest, GetMappingResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetMappingRequest, GetMappingResponse, ErrorResponse>) GetMappingRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns mappings for one or more indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetMappingRequest}
-	 *
-	 */
-
-	public final CompletableFuture<GetMappingResponse> getMapping(
-			Function<GetMappingRequest.Builder, ObjectBuilder<GetMappingRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getMapping(fn.apply(new GetMappingRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns mappings for one or more indices.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetMappingResponse> getMapping() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new GetMappingRequest.Builder().build(), GetMappingRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.get_settings
-
-	/**
-	 * Returns settings for one or more indices.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetIndicesSettingsResponse> getSettings(GetIndicesSettingsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetIndicesSettingsRequest, GetIndicesSettingsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetIndicesSettingsRequest, GetIndicesSettingsResponse, ErrorResponse>)
-						GetIndicesSettingsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns settings for one or more indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetIndicesSettingsRequest}
-	 *
-	 */
-
-	public final CompletableFuture<GetIndicesSettingsResponse> getSettings(
-			Function<GetIndicesSettingsRequest.Builder, ObjectBuilder<GetIndicesSettingsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getSettings(fn.apply(new GetIndicesSettingsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns settings for one or more indices.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetIndicesSettingsResponse> getSettings() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new GetIndicesSettingsRequest.Builder().build(),
-				GetIndicesSettingsRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.get_template
-
-	/**
-	 * Returns an index template.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetTemplateResponse> getTemplate(GetTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetTemplateRequest, GetTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetTemplateRequest, GetTemplateResponse, ErrorResponse>) GetTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns an index template.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetTemplateRequest}
-	 *
-	 */
-
-	public final CompletableFuture<GetTemplateResponse> getTemplate(
-			Function<GetTemplateRequest.Builder, ObjectBuilder<GetTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getTemplate(fn.apply(new GetTemplateRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns an index template.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetTemplateResponse> getTemplate() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new GetTemplateRequest.Builder().build(),
-				GetTemplateRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.get_upgrade
-
-	/**
-	 * DEPRECATED Returns a progress status of current upgrade.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetUpgradeResponse> getUpgrade(GetUpgradeRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetUpgradeRequest, GetUpgradeResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetUpgradeRequest, GetUpgradeResponse, ErrorResponse>) GetUpgradeRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * DEPRECATED Returns a progress status of current upgrade.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetUpgradeRequest}
-	 *
-	 */
-
-	public final CompletableFuture<GetUpgradeResponse> getUpgrade(
-			Function<GetUpgradeRequest.Builder, ObjectBuilder<GetUpgradeRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getUpgrade(fn.apply(new GetUpgradeRequest.Builder()).build());
-	}
-
-	/**
-	 * DEPRECATED Returns a progress status of current upgrade.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetUpgradeResponse> getUpgrade() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new GetUpgradeRequest.Builder().build(), GetUpgradeRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.open
-
-	/**
-	 * Opens an index.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<OpenResponse> open(OpenRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<OpenRequest, OpenResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<OpenRequest, OpenResponse, ErrorResponse>) OpenRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Opens an index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link OpenRequest}
-	 *
-	 */
-
-	public final CompletableFuture<OpenResponse> open(Function<OpenRequest.Builder, ObjectBuilder<OpenRequest>> fn)
-			throws IOException, OpenSearchException {
-		return open(fn.apply(new OpenRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.put_alias
-
-	/**
-	 * Creates or updates an alias.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<PutAliasResponse> putAlias(PutAliasRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutAliasRequest, PutAliasResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutAliasRequest, PutAliasResponse, ErrorResponse>) PutAliasRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates or updates an alias.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutAliasRequest}
-	 *
-	 */
-
-	public final CompletableFuture<PutAliasResponse> putAlias(
-			Function<PutAliasRequest.Builder, ObjectBuilder<PutAliasRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putAlias(fn.apply(new PutAliasRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.put_index_template
-
-	/**
-	 * Creates or updates an index template.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<PutIndexTemplateResponse> putIndexTemplate(PutIndexTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutIndexTemplateRequest, PutIndexTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutIndexTemplateRequest, PutIndexTemplateResponse, ErrorResponse>)
-						PutIndexTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates or updates an index template.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutIndexTemplateRequest}
-	 *
-	 */
-
-	public final CompletableFuture<PutIndexTemplateResponse> putIndexTemplate(
-			Function<PutIndexTemplateRequest.Builder, ObjectBuilder<PutIndexTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putIndexTemplate(fn.apply(new PutIndexTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.put_mapping
-
-	/**
-	 * Updates the index mappings.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<PutMappingResponse> putMapping(PutMappingRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutMappingRequest, PutMappingResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutMappingRequest, PutMappingResponse, ErrorResponse>) PutMappingRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Updates the index mappings.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutMappingRequest}
-	 *
-	 */
-
-	public final CompletableFuture<PutMappingResponse> putMapping(
-			Function<PutMappingRequest.Builder, ObjectBuilder<PutMappingRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putMapping(fn.apply(new PutMappingRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.put_settings
-
-	/**
-	 * Updates the index settings.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<PutIndicesSettingsResponse> putSettings(PutIndicesSettingsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutIndicesSettingsRequest, PutIndicesSettingsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutIndicesSettingsRequest, PutIndicesSettingsResponse, ErrorResponse>)
-						PutIndicesSettingsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Updates the index settings.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutIndicesSettingsRequest}
-	 *
-	 */
-
-	public final CompletableFuture<PutIndicesSettingsResponse> putSettings(
-			Function<PutIndicesSettingsRequest.Builder, ObjectBuilder<PutIndicesSettingsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putSettings(fn.apply(new PutIndicesSettingsRequest.Builder()).build());
-	}
-
-	/**
-	 * Updates the index settings.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<PutIndicesSettingsResponse> putSettings() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new PutIndicesSettingsRequest.Builder().build(),
-				PutIndicesSettingsRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.put_template
-
-	/**
-	 * Creates or updates an index template.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<PutTemplateResponse> putTemplate(PutTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutTemplateRequest, PutTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutTemplateRequest, PutTemplateResponse, ErrorResponse>) PutTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates or updates an index template.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutTemplateRequest}
-	 *
-	 */
-
-	public final CompletableFuture<PutTemplateResponse> putTemplate(
-			Function<PutTemplateRequest.Builder, ObjectBuilder<PutTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putTemplate(fn.apply(new PutTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.recovery
-
-	/**
-	 * Returns information about ongoing index shard recoveries.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<RecoveryResponse> recovery(RecoveryRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<RecoveryRequest, RecoveryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<RecoveryRequest, RecoveryResponse, ErrorResponse>) RecoveryRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about ongoing index shard recoveries.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link RecoveryRequest}
-	 *
-	 */
-
-	public final CompletableFuture<RecoveryResponse> recovery(
-			Function<RecoveryRequest.Builder, ObjectBuilder<RecoveryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return recovery(fn.apply(new RecoveryRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about ongoing index shard recoveries.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<RecoveryResponse> recovery() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new RecoveryRequest.Builder().build(), RecoveryRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.refresh
-
-	/**
-	 * Performs the refresh operation in one or more indices.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<RefreshResponse> refresh(RefreshRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<RefreshRequest, RefreshResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<RefreshRequest, RefreshResponse, ErrorResponse>) RefreshRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Performs the refresh operation in one or more indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link RefreshRequest}
-	 *
-	 */
-
-	public final CompletableFuture<RefreshResponse> refresh(
-			Function<RefreshRequest.Builder, ObjectBuilder<RefreshRequest>> fn)
-			throws IOException, OpenSearchException {
-		return refresh(fn.apply(new RefreshRequest.Builder()).build());
-	}
-
-	/**
-	 * Performs the refresh operation in one or more indices.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<RefreshResponse> refresh() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new RefreshRequest.Builder().build(), RefreshRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.resolve_index
-
-	/**
-	 * Returns information about any matching indices, aliases, and data streams
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ResolveIndexResponse> resolveIndex(ResolveIndexRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ResolveIndexRequest, ResolveIndexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ResolveIndexRequest, ResolveIndexResponse, ErrorResponse>) ResolveIndexRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about any matching indices, aliases, and data streams
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ResolveIndexRequest}
-	 *
-	 */
-
-	public final CompletableFuture<ResolveIndexResponse> resolveIndex(
-			Function<ResolveIndexRequest.Builder, ObjectBuilder<ResolveIndexRequest>> fn)
-			throws IOException, OpenSearchException {
-		return resolveIndex(fn.apply(new ResolveIndexRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.rollover
-
-	/**
-	 * Updates an alias to point to a new index when the existing index is
-	 * considered to be too large or too old.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<RolloverResponse> rollover(RolloverRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<RolloverRequest, RolloverResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<RolloverRequest, RolloverResponse, ErrorResponse>) RolloverRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Updates an alias to point to a new index when the existing index is
-	 * considered to be too large or too old.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link RolloverRequest}
-	 *
-	 */
-
-	public final CompletableFuture<RolloverResponse> rollover(
-			Function<RolloverRequest.Builder, ObjectBuilder<RolloverRequest>> fn)
-			throws IOException, OpenSearchException {
-		return rollover(fn.apply(new RolloverRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.segments
-
-	/**
-	 * Provides low-level information about segments in a Lucene index.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<SegmentsResponse> segments(SegmentsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SegmentsRequest, SegmentsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<SegmentsRequest, SegmentsResponse, ErrorResponse>) SegmentsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Provides low-level information about segments in a Lucene index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SegmentsRequest}
-	 *
-	 */
-
-	public final CompletableFuture<SegmentsResponse> segments(
-			Function<SegmentsRequest.Builder, ObjectBuilder<SegmentsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return segments(fn.apply(new SegmentsRequest.Builder()).build());
-	}
-
-	/**
-	 * Provides low-level information about segments in a Lucene index.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<SegmentsResponse> segments() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new SegmentsRequest.Builder().build(), SegmentsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.shard_stores
-
-	/**
-	 * Provides store information for shard copies of indices.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ShardStoresResponse> shardStores(ShardStoresRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ShardStoresRequest, ShardStoresResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ShardStoresRequest, ShardStoresResponse, ErrorResponse>) ShardStoresRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Provides store information for shard copies of indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ShardStoresRequest}
-	 *
-	 */
-
-	public final CompletableFuture<ShardStoresResponse> shardStores(
-			Function<ShardStoresRequest.Builder, ObjectBuilder<ShardStoresRequest>> fn)
-			throws IOException, OpenSearchException {
-		return shardStores(fn.apply(new ShardStoresRequest.Builder()).build());
-	}
-
-	/**
-	 * Provides store information for shard copies of indices.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ShardStoresResponse> shardStores() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new ShardStoresRequest.Builder().build(),
-				ShardStoresRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.shrink
-
-	/**
-	 * Allow to shrink an existing index into a new index with fewer primary shards.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ShrinkResponse> shrink(ShrinkRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ShrinkRequest, ShrinkResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ShrinkRequest, ShrinkResponse, ErrorResponse>) ShrinkRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allow to shrink an existing index into a new index with fewer primary shards.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ShrinkRequest}
-	 *
-	 */
-
-	public final CompletableFuture<ShrinkResponse> shrink(
-			Function<ShrinkRequest.Builder, ObjectBuilder<ShrinkRequest>> fn)
-			throws IOException, OpenSearchException {
-		return shrink(fn.apply(new ShrinkRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.simulate_index_template
-
-	/**
-	 * Simulate matching the given index name against the index templates in the
-	 * system
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<SimulateIndexTemplateResponse> simulateIndexTemplate(SimulateIndexTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SimulateIndexTemplateRequest, SimulateIndexTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<SimulateIndexTemplateRequest, SimulateIndexTemplateResponse, ErrorResponse>)
-						SimulateIndexTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Simulate matching the given index name against the index templates in the
-	 * system
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SimulateIndexTemplateRequest}
-	 *
-	 */
-
-	public final CompletableFuture<SimulateIndexTemplateResponse> simulateIndexTemplate(
-			Function<SimulateIndexTemplateRequest.Builder, ObjectBuilder<SimulateIndexTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return simulateIndexTemplate(fn.apply(new SimulateIndexTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.simulate_template
-
-	/**
-	 * Simulate resolving the given template name or body
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<SimulateTemplateResponse> simulateTemplate(SimulateTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SimulateTemplateRequest, SimulateTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<SimulateTemplateRequest, SimulateTemplateResponse, ErrorResponse>)
-						SimulateTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Simulate resolving the given template name or body
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SimulateTemplateRequest}
-	 *
-	 */
-
-	public final CompletableFuture<SimulateTemplateResponse> simulateTemplate(
-			Function<SimulateTemplateRequest.Builder, ObjectBuilder<SimulateTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return simulateTemplate(fn.apply(new SimulateTemplateRequest.Builder()).build());
-	}
-
-	/**
-	 * Simulate resolving the given template name or body
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<SimulateTemplateResponse> simulateTemplate() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new SimulateTemplateRequest.Builder().build(),
-				SimulateTemplateRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.split
-
-	/**
-	 * Allows you to split an existing index into a new index with more primary
-	 * shards.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<SplitResponse> split(SplitRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SplitRequest, SplitResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<SplitRequest, SplitResponse, ErrorResponse>) SplitRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows you to split an existing index into a new index with more primary
-	 * shards.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SplitRequest}
-	 *
-	 */
-
-	public final CompletableFuture<SplitResponse> split(Function<SplitRequest.Builder, ObjectBuilder<SplitRequest>> fn)
-			throws IOException, OpenSearchException {
-		return split(fn.apply(new SplitRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.stats
-
-	/**
-	 * Provides statistics on operations happening in an index.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<IndicesStatsResponse> stats(IndicesStatsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<IndicesStatsRequest, IndicesStatsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<IndicesStatsRequest, IndicesStatsResponse, ErrorResponse>) IndicesStatsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Provides statistics on operations happening in an index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link IndicesStatsRequest}
-	 *
-	 */
-
-	public final CompletableFuture<IndicesStatsResponse> stats(
-			Function<IndicesStatsRequest.Builder, ObjectBuilder<IndicesStatsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return stats(fn.apply(new IndicesStatsRequest.Builder()).build());
-	}
-
-	/**
-	 * Provides statistics on operations happening in an index.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<IndicesStatsResponse> stats() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new IndicesStatsRequest.Builder().build(),
-				IndicesStatsRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.data_streams_stats
-
-	/**
-	 * Returns statistics of data streams
-	 *
-	 *
-	 */
-
-	public CompletableFuture<DataStreamsStatsResponse> dataStreamsStats(
-			DataStreamsStatsRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DataStreamsStatsRequest, DataStreamsStatsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DataStreamsStatsRequest, DataStreamsStatsResponse, ErrorResponse>) DataStreamsStatsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns statistics of data streams
-	 *
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DataStreamsStatsRequest}
-	 *
-	 */
-
-	public final CompletableFuture<DataStreamsStatsResponse> dataStreamsStats(
-			Function<DataStreamsStatsRequest.Builder, ObjectBuilder<DataStreamsStatsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return dataStreamsStats(fn.apply(new DataStreamsStatsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns statistics of data streams
-	 *
-	 *
-	 */
-
-	public CompletableFuture<DataStreamsStatsResponse> dataStreamsStats() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new DataStreamsStatsRequest.Builder().build(), DataStreamsStatsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.update_aliases
-
-	/**
-	 * Updates index aliases.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<UpdateAliasesResponse> updateAliases(UpdateAliasesRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<UpdateAliasesRequest, UpdateAliasesResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<UpdateAliasesRequest, UpdateAliasesResponse, ErrorResponse>) UpdateAliasesRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Updates index aliases.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link UpdateAliasesRequest}
-	 *
-	 */
-
-	public final CompletableFuture<UpdateAliasesResponse> updateAliases(
-			Function<UpdateAliasesRequest.Builder, ObjectBuilder<UpdateAliasesRequest>> fn)
-			throws IOException, OpenSearchException {
-		return updateAliases(fn.apply(new UpdateAliasesRequest.Builder()).build());
-	}
-
-	/**
-	 * Updates index aliases.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<UpdateAliasesResponse> updateAliases() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new UpdateAliasesRequest.Builder().build(),
-				UpdateAliasesRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.upgrade
-
-	/**
-	 * DEPRECATED Upgrades to the current version of Lucene.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<UpgradeResponse> upgrade(UpgradeRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<UpgradeRequest, UpgradeResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<UpgradeRequest, UpgradeResponse, ErrorResponse>) UpgradeRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * DEPRECATED Upgrades to the current version of Lucene.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link UpgradeRequest}
-	 *
-	 */
-
-	public final CompletableFuture<UpgradeResponse> upgrade(
-			Function<UpgradeRequest.Builder, ObjectBuilder<UpgradeRequest>> fn)
-			throws IOException, OpenSearchException {
-		return upgrade(fn.apply(new UpgradeRequest.Builder()).build());
-	}
-
-	/**
-	 * DEPRECATED Upgrades to the current version of Lucene.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<UpgradeResponse> upgrade() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new UpgradeRequest.Builder().build(), UpgradeRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.validate_query
-
-	/**
-	 * Allows a user to validate a potentially expensive query without executing it.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ValidateQueryResponse> validateQuery(ValidateQueryRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ValidateQueryRequest, ValidateQueryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ValidateQueryRequest, ValidateQueryResponse, ErrorResponse>) ValidateQueryRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows a user to validate a potentially expensive query without executing it.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ValidateQueryRequest}
-	 *
-	 */
-
-	public final CompletableFuture<ValidateQueryResponse> validateQuery(
-			Function<ValidateQueryRequest.Builder, ObjectBuilder<ValidateQueryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return validateQuery(fn.apply(new ValidateQueryRequest.Builder()).build());
-	}
-
-	/**
-	 * Allows a user to validate a potentially expensive query without executing it.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<ValidateQueryResponse> validateQuery() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new ValidateQueryRequest.Builder().build(),
-				ValidateQueryRequest._ENDPOINT, this.transportOptions);
-	}
+public class OpenSearchIndicesAsyncClient extends ApiClient<OpenSearchTransport, OpenSearchIndicesAsyncClient> {
+
+    public OpenSearchIndicesAsyncClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchIndicesAsyncClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchIndicesAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchIndicesAsyncClient(this.transport, transportOptions);
+    }
+
+    // ----- Endpoint: indices.add_block
+
+    /**
+     * Adds a block to an index.
+     *
+     *
+     */
+
+    public CompletableFuture<AddBlockResponse> addBlock(AddBlockRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<AddBlockRequest, AddBlockResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            AddBlockRequest,
+            AddBlockResponse,
+            ErrorResponse>) AddBlockRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Adds a block to an index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link AddBlockRequest}
+     *
+     */
+
+    public final CompletableFuture<AddBlockResponse> addBlock(Function<AddBlockRequest.Builder, ObjectBuilder<AddBlockRequest>> fn)
+        throws IOException, OpenSearchException {
+        return addBlock(fn.apply(new AddBlockRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.analyze
+
+    /**
+     * Performs the analysis process on a text and return the tokens breakdown of
+     * the text.
+     *
+     *
+     */
+
+    public CompletableFuture<AnalyzeResponse> analyze(AnalyzeRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<AnalyzeRequest, AnalyzeResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            AnalyzeRequest,
+            AnalyzeResponse,
+            ErrorResponse>) AnalyzeRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Performs the analysis process on a text and return the tokens breakdown of
+     * the text.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link AnalyzeRequest}
+     *
+     */
+
+    public final CompletableFuture<AnalyzeResponse> analyze(Function<AnalyzeRequest.Builder, ObjectBuilder<AnalyzeRequest>> fn)
+        throws IOException, OpenSearchException {
+        return analyze(fn.apply(new AnalyzeRequest.Builder()).build());
+    }
+
+    /**
+     * Performs the analysis process on a text and return the tokens breakdown of
+     * the text.
+     *
+     *
+     */
+
+    public CompletableFuture<AnalyzeResponse> analyze() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new AnalyzeRequest.Builder().build(), AnalyzeRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.clear_cache
+
+    /**
+     * Clears all or specific caches for one or more indices.
+     *
+     *
+     */
+
+    public CompletableFuture<ClearCacheResponse> clearCache(ClearCacheRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ClearCacheRequest, ClearCacheResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ClearCacheRequest,
+            ClearCacheResponse,
+            ErrorResponse>) ClearCacheRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Clears all or specific caches for one or more indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ClearCacheRequest}
+     *
+     */
+
+    public final CompletableFuture<ClearCacheResponse> clearCache(Function<ClearCacheRequest.Builder, ObjectBuilder<ClearCacheRequest>> fn)
+        throws IOException, OpenSearchException {
+        return clearCache(fn.apply(new ClearCacheRequest.Builder()).build());
+    }
+
+    /**
+     * Clears all or specific caches for one or more indices.
+     *
+     *
+     */
+
+    public CompletableFuture<ClearCacheResponse> clearCache() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new ClearCacheRequest.Builder().build(),
+            ClearCacheRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.clone
+
+    /**
+     * Clones an index
+     *
+     */
+
+    public CompletableFuture<CloneIndexResponse> clone(CloneIndexRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CloneIndexRequest, CloneIndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CloneIndexRequest,
+            CloneIndexResponse,
+            ErrorResponse>) CloneIndexRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Clones an index
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CloneIndexRequest}
+     *
+     */
+
+    public final CompletableFuture<CloneIndexResponse> clone(Function<CloneIndexRequest.Builder, ObjectBuilder<CloneIndexRequest>> fn)
+        throws IOException, OpenSearchException {
+        return clone(fn.apply(new CloneIndexRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.close
+
+    /**
+     * Closes an index.
+     *
+     *
+     */
+
+    public CompletableFuture<CloseIndexResponse> close(CloseIndexRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CloseIndexRequest, CloseIndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CloseIndexRequest,
+            CloseIndexResponse,
+            ErrorResponse>) CloseIndexRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Closes an index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CloseIndexRequest}
+     *
+     */
+
+    public final CompletableFuture<CloseIndexResponse> close(Function<CloseIndexRequest.Builder, ObjectBuilder<CloseIndexRequest>> fn)
+        throws IOException, OpenSearchException {
+        return close(fn.apply(new CloseIndexRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.create
+
+    /**
+     * Creates an index with optional settings and mappings.
+     *
+     *
+     */
+
+    public CompletableFuture<CreateIndexResponse> create(CreateIndexRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CreateIndexRequest, CreateIndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CreateIndexRequest,
+            CreateIndexResponse,
+            ErrorResponse>) CreateIndexRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates an index with optional settings and mappings.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CreateIndexRequest}
+     *
+     */
+
+    public final CompletableFuture<CreateIndexResponse> create(Function<CreateIndexRequest.Builder, ObjectBuilder<CreateIndexRequest>> fn)
+        throws IOException, OpenSearchException {
+        return create(fn.apply(new CreateIndexRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.create_data_stream
+
+    /**
+     * Creates a data stream
+     */
+
+    public CompletableFuture<CreateDataStreamResponse> createDataStream(CreateDataStreamRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CreateDataStreamRequest, CreateDataStreamResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CreateDataStreamRequest,
+            CreateDataStreamResponse,
+            ErrorResponse>) CreateDataStreamRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates a data stream
+     *
+     * @param fn
+     * 				a function that initializes a builder to create the {@link CreateDataStreamRequest}
+     */
+
+    public CompletableFuture<CreateDataStreamResponse> createDataStream(
+        Function<CreateDataStreamRequest.Builder, ObjectBuilder<CreateDataStreamRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return createDataStream(fn.apply(new CreateDataStreamRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.delete
+
+    /**
+     * Deletes an index.
+     *
+     *
+     */
+
+    public CompletableFuture<DeleteIndexResponse> delete(DeleteIndexRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteIndexRequest, DeleteIndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteIndexRequest,
+            DeleteIndexResponse,
+            ErrorResponse>) DeleteIndexRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes an index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteIndexRequest}
+     *
+     */
+
+    public final CompletableFuture<DeleteIndexResponse> delete(Function<DeleteIndexRequest.Builder, ObjectBuilder<DeleteIndexRequest>> fn)
+        throws IOException, OpenSearchException {
+        return delete(fn.apply(new DeleteIndexRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.delete_data_stream
+
+    /**
+     * Deletes one or more data streams and their backing indices.
+     */
+
+    public CompletableFuture<DeleteDataStreamResponse> deleteDataStream(DeleteDataStreamRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteDataStreamRequest, DeleteDataStreamResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteDataStreamRequest,
+            DeleteDataStreamResponse,
+            ErrorResponse>) DeleteDataStreamRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes one or more data streams and their backing indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteDataStreamRequest}
+     *
+     */
+
+    public final CompletableFuture<DeleteDataStreamResponse> deleteDataStream(
+        Function<DeleteDataStreamRequest.Builder, ObjectBuilder<DeleteDataStreamRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deleteDataStream(fn.apply(new DeleteDataStreamRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.delete_alias
+
+    /**
+     * Deletes an alias.
+     *
+     *
+     */
+
+    public CompletableFuture<DeleteAliasResponse> deleteAlias(DeleteAliasRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteAliasRequest, DeleteAliasResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteAliasRequest,
+            DeleteAliasResponse,
+            ErrorResponse>) DeleteAliasRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes an alias.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteAliasRequest}
+     *
+     */
+
+    public final CompletableFuture<DeleteAliasResponse> deleteAlias(
+        Function<DeleteAliasRequest.Builder, ObjectBuilder<DeleteAliasRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deleteAlias(fn.apply(new DeleteAliasRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.delete_index_template
+
+    /**
+     * Deletes an index template.
+     *
+     *
+     */
+
+    public CompletableFuture<DeleteIndexTemplateResponse> deleteIndexTemplate(DeleteIndexTemplateRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteIndexTemplateRequest, DeleteIndexTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteIndexTemplateRequest,
+            DeleteIndexTemplateResponse,
+            ErrorResponse>) DeleteIndexTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes an index template.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteIndexTemplateRequest}
+     *
+     */
+
+    public final CompletableFuture<DeleteIndexTemplateResponse> deleteIndexTemplate(
+        Function<DeleteIndexTemplateRequest.Builder, ObjectBuilder<DeleteIndexTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deleteIndexTemplate(fn.apply(new DeleteIndexTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.delete_template
+
+    /**
+     * Deletes an index template.
+     *
+     *
+     */
+
+    public CompletableFuture<DeleteTemplateResponse> deleteTemplate(DeleteTemplateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteTemplateRequest, DeleteTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteTemplateRequest,
+            DeleteTemplateResponse,
+            ErrorResponse>) DeleteTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes an index template.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteTemplateRequest}
+     *
+     */
+
+    public final CompletableFuture<DeleteTemplateResponse> deleteTemplate(
+        Function<DeleteTemplateRequest.Builder, ObjectBuilder<DeleteTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deleteTemplate(fn.apply(new DeleteTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.disk_usage
+
+    /**
+     * Analyzes the disk usage of each field of an index or data stream
+     *
+     *
+     */
+
+    public CompletableFuture<DiskUsageResponse> diskUsage(DiskUsageRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DiskUsageRequest, DiskUsageResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DiskUsageRequest,
+            DiskUsageResponse,
+            ErrorResponse>) DiskUsageRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Analyzes the disk usage of each field of an index or data stream
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DiskUsageRequest}
+     *
+     */
+
+    public final CompletableFuture<DiskUsageResponse> diskUsage(Function<DiskUsageRequest.Builder, ObjectBuilder<DiskUsageRequest>> fn)
+        throws IOException, OpenSearchException {
+        return diskUsage(fn.apply(new DiskUsageRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.exists
+
+    /**
+     * Returns information about whether a particular index exists.
+     *
+     *
+     */
+
+    public CompletableFuture<BooleanResponse> exists(ExistsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ExistsRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ExistsRequest,
+            BooleanResponse,
+            ErrorResponse>) ExistsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about whether a particular index exists.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ExistsRequest}
+     *
+     */
+
+    public final CompletableFuture<BooleanResponse> exists(Function<ExistsRequest.Builder, ObjectBuilder<ExistsRequest>> fn)
+        throws IOException, OpenSearchException {
+        return exists(fn.apply(new ExistsRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.exists_alias
+
+    /**
+     * Returns information about whether a particular alias exists.
+     *
+     *
+     */
+
+    public CompletableFuture<BooleanResponse> existsAlias(ExistsAliasRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ExistsAliasRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ExistsAliasRequest,
+            BooleanResponse,
+            ErrorResponse>) ExistsAliasRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about whether a particular alias exists.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ExistsAliasRequest}
+     *
+     */
+
+    public final CompletableFuture<BooleanResponse> existsAlias(Function<ExistsAliasRequest.Builder, ObjectBuilder<ExistsAliasRequest>> fn)
+        throws IOException, OpenSearchException {
+        return existsAlias(fn.apply(new ExistsAliasRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.exists_index_template
+
+    /**
+     * Returns information about whether a particular index template exists.
+     *
+     *
+     */
+
+    public CompletableFuture<BooleanResponse> existsIndexTemplate(ExistsIndexTemplateRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ExistsIndexTemplateRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ExistsIndexTemplateRequest,
+            BooleanResponse,
+            ErrorResponse>) ExistsIndexTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about whether a particular index template exists.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ExistsIndexTemplateRequest}
+     *
+     */
+
+    public final CompletableFuture<BooleanResponse> existsIndexTemplate(
+        Function<ExistsIndexTemplateRequest.Builder, ObjectBuilder<ExistsIndexTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return existsIndexTemplate(fn.apply(new ExistsIndexTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.exists_template
+
+    /**
+     * Returns information about whether a particular index template exists.
+     *
+     *
+     */
+
+    public CompletableFuture<BooleanResponse> existsTemplate(ExistsTemplateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ExistsTemplateRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ExistsTemplateRequest,
+            BooleanResponse,
+            ErrorResponse>) ExistsTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about whether a particular index template exists.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ExistsTemplateRequest}
+     *
+     */
+
+    public final CompletableFuture<BooleanResponse> existsTemplate(
+        Function<ExistsTemplateRequest.Builder, ObjectBuilder<ExistsTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return existsTemplate(fn.apply(new ExistsTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.flush
+
+    /**
+     * Performs the flush operation on one or more indices.
+     *
+     *
+     */
+
+    public CompletableFuture<FlushResponse> flush(FlushRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<FlushRequest, FlushResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            FlushRequest,
+            FlushResponse,
+            ErrorResponse>) FlushRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Performs the flush operation on one or more indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link FlushRequest}
+     *
+     */
+
+    public final CompletableFuture<FlushResponse> flush(Function<FlushRequest.Builder, ObjectBuilder<FlushRequest>> fn) throws IOException,
+        OpenSearchException {
+        return flush(fn.apply(new FlushRequest.Builder()).build());
+    }
+
+    /**
+     * Performs the flush operation on one or more indices.
+     *
+     *
+     */
+
+    public CompletableFuture<FlushResponse> flush() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new FlushRequest.Builder().build(), FlushRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.forcemerge
+
+    /**
+     * Performs the force merge operation on one or more indices.
+     *
+     *
+     */
+
+    public CompletableFuture<ForcemergeResponse> forcemerge(ForcemergeRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ForcemergeRequest, ForcemergeResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ForcemergeRequest,
+            ForcemergeResponse,
+            ErrorResponse>) ForcemergeRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Performs the force merge operation on one or more indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ForcemergeRequest}
+     *
+     */
+
+    public final CompletableFuture<ForcemergeResponse> forcemerge(Function<ForcemergeRequest.Builder, ObjectBuilder<ForcemergeRequest>> fn)
+        throws IOException, OpenSearchException {
+        return forcemerge(fn.apply(new ForcemergeRequest.Builder()).build());
+    }
+
+    /**
+     * Performs the force merge operation on one or more indices.
+     *
+     *
+     */
+
+    public CompletableFuture<ForcemergeResponse> forcemerge() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new ForcemergeRequest.Builder().build(),
+            ForcemergeRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.get
+
+    /**
+     * Returns information about one or more indices.
+     *
+     *
+     */
+
+    public CompletableFuture<GetIndexResponse> get(GetIndexRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetIndexRequest, GetIndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetIndexRequest,
+            GetIndexResponse,
+            ErrorResponse>) GetIndexRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about one or more indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetIndexRequest}
+     *
+     */
+
+    public final CompletableFuture<GetIndexResponse> get(Function<GetIndexRequest.Builder, ObjectBuilder<GetIndexRequest>> fn)
+        throws IOException, OpenSearchException {
+        return get(fn.apply(new GetIndexRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.get_data_stream
+
+    /**
+     * Returns information about one or more data streams.
+     *
+     *
+     */
+
+    public CompletableFuture<GetDataStreamResponse> getDataStream(GetDataStreamRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetDataStreamRequest, GetDataStreamResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetDataStreamRequest,
+            GetDataStreamResponse,
+            ErrorResponse>) GetDataStreamRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about one or more data streams.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetDataStreamRequest}
+     *
+     */
+
+    public final CompletableFuture<GetDataStreamResponse> getDataStream(
+        Function<GetDataStreamRequest.Builder, ObjectBuilder<GetDataStreamRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return getDataStream(fn.apply(new GetDataStreamRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about one or more data streams.
+     *
+     *
+     */
+
+    public CompletableFuture<GetDataStreamResponse> getDataStream() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new GetDataStreamRequest.Builder().build(),
+            GetDataStreamRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.get_alias
+
+    /**
+     * Returns an alias.
+     *
+     *
+     */
+
+    public CompletableFuture<GetAliasResponse> getAlias(GetAliasRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetAliasRequest, GetAliasResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetAliasRequest,
+            GetAliasResponse,
+            ErrorResponse>) GetAliasRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns an alias.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetAliasRequest}
+     *
+     */
+
+    public final CompletableFuture<GetAliasResponse> getAlias(Function<GetAliasRequest.Builder, ObjectBuilder<GetAliasRequest>> fn)
+        throws IOException, OpenSearchException {
+        return getAlias(fn.apply(new GetAliasRequest.Builder()).build());
+    }
+
+    /**
+     * Returns an alias.
+     *
+     *
+     */
+
+    public CompletableFuture<GetAliasResponse> getAlias() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new GetAliasRequest.Builder().build(), GetAliasRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.get_field_mapping
+
+    /**
+     * Returns mapping for one or more fields.
+     *
+     *
+     */
+
+    public CompletableFuture<GetFieldMappingResponse> getFieldMapping(GetFieldMappingRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetFieldMappingRequest, GetFieldMappingResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetFieldMappingRequest,
+            GetFieldMappingResponse,
+            ErrorResponse>) GetFieldMappingRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns mapping for one or more fields.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetFieldMappingRequest}
+     *
+     */
+
+    public final CompletableFuture<GetFieldMappingResponse> getFieldMapping(
+        Function<GetFieldMappingRequest.Builder, ObjectBuilder<GetFieldMappingRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return getFieldMapping(fn.apply(new GetFieldMappingRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.get_index_template
+
+    /**
+     * Returns an index template.
+     *
+     *
+     */
+
+    public CompletableFuture<GetIndexTemplateResponse> getIndexTemplate(GetIndexTemplateRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetIndexTemplateRequest, GetIndexTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetIndexTemplateRequest,
+            GetIndexTemplateResponse,
+            ErrorResponse>) GetIndexTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns an index template.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetIndexTemplateRequest}
+     *
+     */
+
+    public final CompletableFuture<GetIndexTemplateResponse> getIndexTemplate(
+        Function<GetIndexTemplateRequest.Builder, ObjectBuilder<GetIndexTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return getIndexTemplate(fn.apply(new GetIndexTemplateRequest.Builder()).build());
+    }
+
+    /**
+     * Returns an index template.
+     *
+     *
+     */
+
+    public CompletableFuture<GetIndexTemplateResponse> getIndexTemplate() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new GetIndexTemplateRequest.Builder().build(),
+            GetIndexTemplateRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.get_mapping
+
+    /**
+     * Returns mappings for one or more indices.
+     *
+     *
+     */
+
+    public CompletableFuture<GetMappingResponse> getMapping(GetMappingRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetMappingRequest, GetMappingResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetMappingRequest,
+            GetMappingResponse,
+            ErrorResponse>) GetMappingRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns mappings for one or more indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetMappingRequest}
+     *
+     */
+
+    public final CompletableFuture<GetMappingResponse> getMapping(Function<GetMappingRequest.Builder, ObjectBuilder<GetMappingRequest>> fn)
+        throws IOException, OpenSearchException {
+        return getMapping(fn.apply(new GetMappingRequest.Builder()).build());
+    }
+
+    /**
+     * Returns mappings for one or more indices.
+     *
+     *
+     */
+
+    public CompletableFuture<GetMappingResponse> getMapping() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new GetMappingRequest.Builder().build(),
+            GetMappingRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.get_settings
+
+    /**
+     * Returns settings for one or more indices.
+     *
+     *
+     */
+
+    public CompletableFuture<GetIndicesSettingsResponse> getSettings(GetIndicesSettingsRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetIndicesSettingsRequest, GetIndicesSettingsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetIndicesSettingsRequest,
+            GetIndicesSettingsResponse,
+            ErrorResponse>) GetIndicesSettingsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns settings for one or more indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetIndicesSettingsRequest}
+     *
+     */
+
+    public final CompletableFuture<GetIndicesSettingsResponse> getSettings(
+        Function<GetIndicesSettingsRequest.Builder, ObjectBuilder<GetIndicesSettingsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return getSettings(fn.apply(new GetIndicesSettingsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns settings for one or more indices.
+     *
+     *
+     */
+
+    public CompletableFuture<GetIndicesSettingsResponse> getSettings() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new GetIndicesSettingsRequest.Builder().build(),
+            GetIndicesSettingsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.get_template
+
+    /**
+     * Returns an index template.
+     *
+     *
+     */
+
+    public CompletableFuture<GetTemplateResponse> getTemplate(GetTemplateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetTemplateRequest, GetTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetTemplateRequest,
+            GetTemplateResponse,
+            ErrorResponse>) GetTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns an index template.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetTemplateRequest}
+     *
+     */
+
+    public final CompletableFuture<GetTemplateResponse> getTemplate(
+        Function<GetTemplateRequest.Builder, ObjectBuilder<GetTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return getTemplate(fn.apply(new GetTemplateRequest.Builder()).build());
+    }
+
+    /**
+     * Returns an index template.
+     *
+     *
+     */
+
+    public CompletableFuture<GetTemplateResponse> getTemplate() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new GetTemplateRequest.Builder().build(),
+            GetTemplateRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.get_upgrade
+
+    /**
+     * DEPRECATED Returns a progress status of current upgrade.
+     *
+     *
+     */
+
+    public CompletableFuture<GetUpgradeResponse> getUpgrade(GetUpgradeRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetUpgradeRequest, GetUpgradeResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetUpgradeRequest,
+            GetUpgradeResponse,
+            ErrorResponse>) GetUpgradeRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * DEPRECATED Returns a progress status of current upgrade.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetUpgradeRequest}
+     *
+     */
+
+    public final CompletableFuture<GetUpgradeResponse> getUpgrade(Function<GetUpgradeRequest.Builder, ObjectBuilder<GetUpgradeRequest>> fn)
+        throws IOException, OpenSearchException {
+        return getUpgrade(fn.apply(new GetUpgradeRequest.Builder()).build());
+    }
+
+    /**
+     * DEPRECATED Returns a progress status of current upgrade.
+     *
+     *
+     */
+
+    public CompletableFuture<GetUpgradeResponse> getUpgrade() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new GetUpgradeRequest.Builder().build(),
+            GetUpgradeRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.open
+
+    /**
+     * Opens an index.
+     *
+     *
+     */
+
+    public CompletableFuture<OpenResponse> open(OpenRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<OpenRequest, OpenResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            OpenRequest,
+            OpenResponse,
+            ErrorResponse>) OpenRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Opens an index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link OpenRequest}
+     *
+     */
+
+    public final CompletableFuture<OpenResponse> open(Function<OpenRequest.Builder, ObjectBuilder<OpenRequest>> fn) throws IOException,
+        OpenSearchException {
+        return open(fn.apply(new OpenRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.put_alias
+
+    /**
+     * Creates or updates an alias.
+     *
+     *
+     */
+
+    public CompletableFuture<PutAliasResponse> putAlias(PutAliasRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutAliasRequest, PutAliasResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutAliasRequest,
+            PutAliasResponse,
+            ErrorResponse>) PutAliasRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates or updates an alias.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutAliasRequest}
+     *
+     */
+
+    public final CompletableFuture<PutAliasResponse> putAlias(Function<PutAliasRequest.Builder, ObjectBuilder<PutAliasRequest>> fn)
+        throws IOException, OpenSearchException {
+        return putAlias(fn.apply(new PutAliasRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.put_index_template
+
+    /**
+     * Creates or updates an index template.
+     *
+     *
+     */
+
+    public CompletableFuture<PutIndexTemplateResponse> putIndexTemplate(PutIndexTemplateRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutIndexTemplateRequest, PutIndexTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutIndexTemplateRequest,
+            PutIndexTemplateResponse,
+            ErrorResponse>) PutIndexTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates or updates an index template.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutIndexTemplateRequest}
+     *
+     */
+
+    public final CompletableFuture<PutIndexTemplateResponse> putIndexTemplate(
+        Function<PutIndexTemplateRequest.Builder, ObjectBuilder<PutIndexTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return putIndexTemplate(fn.apply(new PutIndexTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.put_mapping
+
+    /**
+     * Updates the index mappings.
+     *
+     *
+     */
+
+    public CompletableFuture<PutMappingResponse> putMapping(PutMappingRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutMappingRequest, PutMappingResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutMappingRequest,
+            PutMappingResponse,
+            ErrorResponse>) PutMappingRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Updates the index mappings.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutMappingRequest}
+     *
+     */
+
+    public final CompletableFuture<PutMappingResponse> putMapping(Function<PutMappingRequest.Builder, ObjectBuilder<PutMappingRequest>> fn)
+        throws IOException, OpenSearchException {
+        return putMapping(fn.apply(new PutMappingRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.put_settings
+
+    /**
+     * Updates the index settings.
+     *
+     *
+     */
+
+    public CompletableFuture<PutIndicesSettingsResponse> putSettings(PutIndicesSettingsRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutIndicesSettingsRequest, PutIndicesSettingsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutIndicesSettingsRequest,
+            PutIndicesSettingsResponse,
+            ErrorResponse>) PutIndicesSettingsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Updates the index settings.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutIndicesSettingsRequest}
+     *
+     */
+
+    public final CompletableFuture<PutIndicesSettingsResponse> putSettings(
+        Function<PutIndicesSettingsRequest.Builder, ObjectBuilder<PutIndicesSettingsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return putSettings(fn.apply(new PutIndicesSettingsRequest.Builder()).build());
+    }
+
+    /**
+     * Updates the index settings.
+     *
+     *
+     */
+
+    public CompletableFuture<PutIndicesSettingsResponse> putSettings() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new PutIndicesSettingsRequest.Builder().build(),
+            PutIndicesSettingsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.put_template
+
+    /**
+     * Creates or updates an index template.
+     *
+     *
+     */
+
+    public CompletableFuture<PutTemplateResponse> putTemplate(PutTemplateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutTemplateRequest, PutTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutTemplateRequest,
+            PutTemplateResponse,
+            ErrorResponse>) PutTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates or updates an index template.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutTemplateRequest}
+     *
+     */
+
+    public final CompletableFuture<PutTemplateResponse> putTemplate(
+        Function<PutTemplateRequest.Builder, ObjectBuilder<PutTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return putTemplate(fn.apply(new PutTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.recovery
+
+    /**
+     * Returns information about ongoing index shard recoveries.
+     *
+     *
+     */
+
+    public CompletableFuture<RecoveryResponse> recovery(RecoveryRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<RecoveryRequest, RecoveryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            RecoveryRequest,
+            RecoveryResponse,
+            ErrorResponse>) RecoveryRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about ongoing index shard recoveries.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link RecoveryRequest}
+     *
+     */
+
+    public final CompletableFuture<RecoveryResponse> recovery(Function<RecoveryRequest.Builder, ObjectBuilder<RecoveryRequest>> fn)
+        throws IOException, OpenSearchException {
+        return recovery(fn.apply(new RecoveryRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about ongoing index shard recoveries.
+     *
+     *
+     */
+
+    public CompletableFuture<RecoveryResponse> recovery() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new RecoveryRequest.Builder().build(), RecoveryRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.refresh
+
+    /**
+     * Performs the refresh operation in one or more indices.
+     *
+     *
+     */
+
+    public CompletableFuture<RefreshResponse> refresh(RefreshRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<RefreshRequest, RefreshResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            RefreshRequest,
+            RefreshResponse,
+            ErrorResponse>) RefreshRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Performs the refresh operation in one or more indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link RefreshRequest}
+     *
+     */
+
+    public final CompletableFuture<RefreshResponse> refresh(Function<RefreshRequest.Builder, ObjectBuilder<RefreshRequest>> fn)
+        throws IOException, OpenSearchException {
+        return refresh(fn.apply(new RefreshRequest.Builder()).build());
+    }
+
+    /**
+     * Performs the refresh operation in one or more indices.
+     *
+     *
+     */
+
+    public CompletableFuture<RefreshResponse> refresh() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new RefreshRequest.Builder().build(), RefreshRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.resolve_index
+
+    /**
+     * Returns information about any matching indices, aliases, and data streams
+     *
+     *
+     */
+
+    public CompletableFuture<ResolveIndexResponse> resolveIndex(ResolveIndexRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ResolveIndexRequest, ResolveIndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ResolveIndexRequest,
+            ResolveIndexResponse,
+            ErrorResponse>) ResolveIndexRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about any matching indices, aliases, and data streams
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ResolveIndexRequest}
+     *
+     */
+
+    public final CompletableFuture<ResolveIndexResponse> resolveIndex(
+        Function<ResolveIndexRequest.Builder, ObjectBuilder<ResolveIndexRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return resolveIndex(fn.apply(new ResolveIndexRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.rollover
+
+    /**
+     * Updates an alias to point to a new index when the existing index is
+     * considered to be too large or too old.
+     *
+     *
+     */
+
+    public CompletableFuture<RolloverResponse> rollover(RolloverRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<RolloverRequest, RolloverResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            RolloverRequest,
+            RolloverResponse,
+            ErrorResponse>) RolloverRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Updates an alias to point to a new index when the existing index is
+     * considered to be too large or too old.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link RolloverRequest}
+     *
+     */
+
+    public final CompletableFuture<RolloverResponse> rollover(Function<RolloverRequest.Builder, ObjectBuilder<RolloverRequest>> fn)
+        throws IOException, OpenSearchException {
+        return rollover(fn.apply(new RolloverRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.segments
+
+    /**
+     * Provides low-level information about segments in a Lucene index.
+     *
+     *
+     */
+
+    public CompletableFuture<SegmentsResponse> segments(SegmentsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SegmentsRequest, SegmentsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            SegmentsRequest,
+            SegmentsResponse,
+            ErrorResponse>) SegmentsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Provides low-level information about segments in a Lucene index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SegmentsRequest}
+     *
+     */
+
+    public final CompletableFuture<SegmentsResponse> segments(Function<SegmentsRequest.Builder, ObjectBuilder<SegmentsRequest>> fn)
+        throws IOException, OpenSearchException {
+        return segments(fn.apply(new SegmentsRequest.Builder()).build());
+    }
+
+    /**
+     * Provides low-level information about segments in a Lucene index.
+     *
+     *
+     */
+
+    public CompletableFuture<SegmentsResponse> segments() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new SegmentsRequest.Builder().build(), SegmentsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.shard_stores
+
+    /**
+     * Provides store information for shard copies of indices.
+     *
+     *
+     */
+
+    public CompletableFuture<ShardStoresResponse> shardStores(ShardStoresRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ShardStoresRequest, ShardStoresResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ShardStoresRequest,
+            ShardStoresResponse,
+            ErrorResponse>) ShardStoresRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Provides store information for shard copies of indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ShardStoresRequest}
+     *
+     */
+
+    public final CompletableFuture<ShardStoresResponse> shardStores(
+        Function<ShardStoresRequest.Builder, ObjectBuilder<ShardStoresRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return shardStores(fn.apply(new ShardStoresRequest.Builder()).build());
+    }
+
+    /**
+     * Provides store information for shard copies of indices.
+     *
+     *
+     */
+
+    public CompletableFuture<ShardStoresResponse> shardStores() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new ShardStoresRequest.Builder().build(),
+            ShardStoresRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.shrink
+
+    /**
+     * Allow to shrink an existing index into a new index with fewer primary shards.
+     *
+     *
+     */
+
+    public CompletableFuture<ShrinkResponse> shrink(ShrinkRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ShrinkRequest, ShrinkResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ShrinkRequest,
+            ShrinkResponse,
+            ErrorResponse>) ShrinkRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allow to shrink an existing index into a new index with fewer primary shards.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ShrinkRequest}
+     *
+     */
+
+    public final CompletableFuture<ShrinkResponse> shrink(Function<ShrinkRequest.Builder, ObjectBuilder<ShrinkRequest>> fn)
+        throws IOException, OpenSearchException {
+        return shrink(fn.apply(new ShrinkRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.simulate_index_template
+
+    /**
+     * Simulate matching the given index name against the index templates in the
+     * system
+     *
+     *
+     */
+
+    public CompletableFuture<SimulateIndexTemplateResponse> simulateIndexTemplate(SimulateIndexTemplateRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SimulateIndexTemplateRequest, SimulateIndexTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            SimulateIndexTemplateRequest,
+            SimulateIndexTemplateResponse,
+            ErrorResponse>) SimulateIndexTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Simulate matching the given index name against the index templates in the
+     * system
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SimulateIndexTemplateRequest}
+     *
+     */
+
+    public final CompletableFuture<SimulateIndexTemplateResponse> simulateIndexTemplate(
+        Function<SimulateIndexTemplateRequest.Builder, ObjectBuilder<SimulateIndexTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return simulateIndexTemplate(fn.apply(new SimulateIndexTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.simulate_template
+
+    /**
+     * Simulate resolving the given template name or body
+     *
+     *
+     */
+
+    public CompletableFuture<SimulateTemplateResponse> simulateTemplate(SimulateTemplateRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SimulateTemplateRequest, SimulateTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            SimulateTemplateRequest,
+            SimulateTemplateResponse,
+            ErrorResponse>) SimulateTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Simulate resolving the given template name or body
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SimulateTemplateRequest}
+     *
+     */
+
+    public final CompletableFuture<SimulateTemplateResponse> simulateTemplate(
+        Function<SimulateTemplateRequest.Builder, ObjectBuilder<SimulateTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return simulateTemplate(fn.apply(new SimulateTemplateRequest.Builder()).build());
+    }
+
+    /**
+     * Simulate resolving the given template name or body
+     *
+     *
+     */
+
+    public CompletableFuture<SimulateTemplateResponse> simulateTemplate() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new SimulateTemplateRequest.Builder().build(),
+            SimulateTemplateRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.split
+
+    /**
+     * Allows you to split an existing index into a new index with more primary
+     * shards.
+     *
+     *
+     */
+
+    public CompletableFuture<SplitResponse> split(SplitRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SplitRequest, SplitResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            SplitRequest,
+            SplitResponse,
+            ErrorResponse>) SplitRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows you to split an existing index into a new index with more primary
+     * shards.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SplitRequest}
+     *
+     */
+
+    public final CompletableFuture<SplitResponse> split(Function<SplitRequest.Builder, ObjectBuilder<SplitRequest>> fn) throws IOException,
+        OpenSearchException {
+        return split(fn.apply(new SplitRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.stats
+
+    /**
+     * Provides statistics on operations happening in an index.
+     *
+     *
+     */
+
+    public CompletableFuture<IndicesStatsResponse> stats(IndicesStatsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<IndicesStatsRequest, IndicesStatsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            IndicesStatsRequest,
+            IndicesStatsResponse,
+            ErrorResponse>) IndicesStatsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Provides statistics on operations happening in an index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link IndicesStatsRequest}
+     *
+     */
+
+    public final CompletableFuture<IndicesStatsResponse> stats(Function<IndicesStatsRequest.Builder, ObjectBuilder<IndicesStatsRequest>> fn)
+        throws IOException, OpenSearchException {
+        return stats(fn.apply(new IndicesStatsRequest.Builder()).build());
+    }
+
+    /**
+     * Provides statistics on operations happening in an index.
+     *
+     *
+     */
+
+    public CompletableFuture<IndicesStatsResponse> stats() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new IndicesStatsRequest.Builder().build(),
+            IndicesStatsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.data_streams_stats
+
+    /**
+     * Returns statistics of data streams
+     *
+     *
+     */
+
+    public CompletableFuture<DataStreamsStatsResponse> dataStreamsStats(DataStreamsStatsRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DataStreamsStatsRequest, DataStreamsStatsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DataStreamsStatsRequest,
+            DataStreamsStatsResponse,
+            ErrorResponse>) DataStreamsStatsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns statistics of data streams
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DataStreamsStatsRequest}
+     *
+     */
+
+    public final CompletableFuture<DataStreamsStatsResponse> dataStreamsStats(
+        Function<DataStreamsStatsRequest.Builder, ObjectBuilder<DataStreamsStatsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return dataStreamsStats(fn.apply(new DataStreamsStatsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns statistics of data streams
+     *
+     *
+     */
+
+    public CompletableFuture<DataStreamsStatsResponse> dataStreamsStats() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new DataStreamsStatsRequest.Builder().build(),
+            DataStreamsStatsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.update_aliases
+
+    /**
+     * Updates index aliases.
+     *
+     *
+     */
+
+    public CompletableFuture<UpdateAliasesResponse> updateAliases(UpdateAliasesRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<UpdateAliasesRequest, UpdateAliasesResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            UpdateAliasesRequest,
+            UpdateAliasesResponse,
+            ErrorResponse>) UpdateAliasesRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Updates index aliases.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link UpdateAliasesRequest}
+     *
+     */
+
+    public final CompletableFuture<UpdateAliasesResponse> updateAliases(
+        Function<UpdateAliasesRequest.Builder, ObjectBuilder<UpdateAliasesRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return updateAliases(fn.apply(new UpdateAliasesRequest.Builder()).build());
+    }
+
+    /**
+     * Updates index aliases.
+     *
+     *
+     */
+
+    public CompletableFuture<UpdateAliasesResponse> updateAliases() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new UpdateAliasesRequest.Builder().build(),
+            UpdateAliasesRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.upgrade
+
+    /**
+     * DEPRECATED Upgrades to the current version of Lucene.
+     *
+     *
+     */
+
+    public CompletableFuture<UpgradeResponse> upgrade(UpgradeRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<UpgradeRequest, UpgradeResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            UpgradeRequest,
+            UpgradeResponse,
+            ErrorResponse>) UpgradeRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * DEPRECATED Upgrades to the current version of Lucene.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link UpgradeRequest}
+     *
+     */
+
+    public final CompletableFuture<UpgradeResponse> upgrade(Function<UpgradeRequest.Builder, ObjectBuilder<UpgradeRequest>> fn)
+        throws IOException, OpenSearchException {
+        return upgrade(fn.apply(new UpgradeRequest.Builder()).build());
+    }
+
+    /**
+     * DEPRECATED Upgrades to the current version of Lucene.
+     *
+     *
+     */
+
+    public CompletableFuture<UpgradeResponse> upgrade() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new UpgradeRequest.Builder().build(), UpgradeRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.validate_query
+
+    /**
+     * Allows a user to validate a potentially expensive query without executing it.
+     *
+     *
+     */
+
+    public CompletableFuture<ValidateQueryResponse> validateQuery(ValidateQueryRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ValidateQueryRequest, ValidateQueryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ValidateQueryRequest,
+            ValidateQueryResponse,
+            ErrorResponse>) ValidateQueryRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows a user to validate a potentially expensive query without executing it.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ValidateQueryRequest}
+     *
+     */
+
+    public final CompletableFuture<ValidateQueryResponse> validateQuery(
+        Function<ValidateQueryRequest.Builder, ObjectBuilder<ValidateQueryRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return validateQuery(fn.apply(new ValidateQueryRequest.Builder()).build());
+    }
+
+    /**
+     * Allows a user to validate a potentially expensive query without executing it.
+     *
+     *
+     */
+
+    public CompletableFuture<ValidateQueryResponse> validateQuery() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new ValidateQueryRequest.Builder().build(),
+            ValidateQueryRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesClient.java
index 3d7d6ec9ac..a3bdd52d4e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/OpenSearchIndicesClient.java
@@ -32,1784 +32,1863 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.io.IOException;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
+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;
-import java.io.IOException;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 /**
  * Client for the indices namespace.
  */
 public class OpenSearchIndicesClient extends ApiClient<OpenSearchTransport, OpenSearchIndicesClient> {
 
-	public OpenSearchIndicesClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchIndicesClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchIndicesClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchIndicesClient(this.transport, transportOptions);
-	}
-
-	// ----- Endpoint: indices.add_block
-
-	/**
-	 * Adds a block to an index.
-	 * 
-	 */
-
-	public AddBlockResponse addBlock(AddBlockRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<AddBlockRequest, AddBlockResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<AddBlockRequest, AddBlockResponse, ErrorResponse>) AddBlockRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Adds a block to an index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link AddBlockRequest}
-	 */
-
-	public final AddBlockResponse addBlock(Function<AddBlockRequest.Builder, ObjectBuilder<AddBlockRequest>> fn)
-			throws IOException, OpenSearchException {
-		return addBlock(fn.apply(new AddBlockRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.analyze
-
-	/**
-	 * Performs the analysis process on a text and return the tokens breakdown of
-	 * the text.
-	 * 
-	 */
-
-	public AnalyzeResponse analyze(AnalyzeRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<AnalyzeRequest, AnalyzeResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<AnalyzeRequest, AnalyzeResponse, ErrorResponse>) AnalyzeRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Performs the analysis process on a text and return the tokens breakdown of
-	 * the text.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link AnalyzeRequest}
-	 */
-
-	public final AnalyzeResponse analyze(Function<AnalyzeRequest.Builder, ObjectBuilder<AnalyzeRequest>> fn)
-			throws IOException, OpenSearchException {
-		return analyze(fn.apply(new AnalyzeRequest.Builder()).build());
-	}
-
-	/**
-	 * Performs the analysis process on a text and return the tokens breakdown of
-	 * the text.
-	 * 
-	 */
-
-	public AnalyzeResponse analyze() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new AnalyzeRequest.Builder().build(), AnalyzeRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.clear_cache
-
-	/**
-	 * Clears all or specific caches for one or more indices.
-	 * 
-	 */
-
-	public ClearCacheResponse clearCache(ClearCacheRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ClearCacheRequest, ClearCacheResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ClearCacheRequest, ClearCacheResponse, ErrorResponse>) ClearCacheRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Clears all or specific caches for one or more indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ClearCacheRequest}
-	 */
-
-	public final ClearCacheResponse clearCache(Function<ClearCacheRequest.Builder, ObjectBuilder<ClearCacheRequest>> fn)
-			throws IOException, OpenSearchException {
-		return clearCache(fn.apply(new ClearCacheRequest.Builder()).build());
-	}
-
-	/**
-	 * Clears all or specific caches for one or more indices.
-	 * 
-	 */
-
-	public ClearCacheResponse clearCache() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new ClearCacheRequest.Builder().build(), ClearCacheRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.clone
-
-	/**
-	 * Clones an index
-	 *
-	 */
-
-	public CloneIndexResponse clone(CloneIndexRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CloneIndexRequest, CloneIndexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CloneIndexRequest, CloneIndexResponse, ErrorResponse>) CloneIndexRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Clones an index
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CloneIndexRequest}
-	 *
-	 */
-
-	public final CloneIndexResponse clone(Function<CloneIndexRequest.Builder, ObjectBuilder<CloneIndexRequest>> fn)
-			throws IOException, OpenSearchException {
-		return clone(fn.apply(new CloneIndexRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.close
-
-	/**
-	 * Closes an index.
-	 * 
-	 *
-	 */
-
-	public CloseIndexResponse close(CloseIndexRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CloseIndexRequest, CloseIndexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CloseIndexRequest, CloseIndexResponse, ErrorResponse>) CloseIndexRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Closes an index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CloseIndexRequest}
-	 *
-	 */
-
-	public final CloseIndexResponse close(Function<CloseIndexRequest.Builder, ObjectBuilder<CloseIndexRequest>> fn)
-			throws IOException, OpenSearchException {
-		return close(fn.apply(new CloseIndexRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.create
-
-	/**
-	 * Creates an index with optional settings and mappings.
-	 * 
-	 *
-	 */
-
-	public CreateIndexResponse create(CreateIndexRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CreateIndexRequest, CreateIndexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CreateIndexRequest, CreateIndexResponse, ErrorResponse>) CreateIndexRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates an index with optional settings and mappings.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CreateIndexRequest}
-	 *
-	 */
-
-	public final CreateIndexResponse create(Function<CreateIndexRequest.Builder, ObjectBuilder<CreateIndexRequest>> fn)
-			throws IOException, OpenSearchException {
-		return create(fn.apply(new CreateIndexRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.create_data_stream
-
-	/**
-	 * Creates a data stream
-	 */
-
-	public CreateDataStreamResponse createDataStream(CreateDataStreamRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CreateDataStreamRequest, CreateDataStreamResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CreateDataStreamRequest, CreateDataStreamResponse, ErrorResponse>) CreateDataStreamRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates a data stream
-	 *
-	 * @param fn
-	 * 				a function that initializes a builder to create the {@link CreateDataStreamRequest}
-	 */
-
-	public final CreateDataStreamResponse createDataStream(
-			Function<CreateDataStreamRequest.Builder, ObjectBuilder<CreateDataStreamRequest>> fn)
-			throws IOException, OpenSearchException {
-		return createDataStream(fn.apply(new CreateDataStreamRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.delete
-
-	/**
-	 * Deletes an index.
-	 * 
-	 *
-	 */
-
-	public DeleteIndexResponse delete(DeleteIndexRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteIndexRequest, DeleteIndexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteIndexRequest, DeleteIndexResponse, ErrorResponse>) DeleteIndexRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes an index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteIndexRequest}
-	 *
-	 */
-
-	public final DeleteIndexResponse delete(Function<DeleteIndexRequest.Builder, ObjectBuilder<DeleteIndexRequest>> fn)
-			throws IOException, OpenSearchException {
-		return delete(fn.apply(new DeleteIndexRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.delete_data_stream
-
-	/**
-	 * Deletes one or more data streams and their backing indices.
-	 */
-
-	public DeleteDataStreamResponse deleteDataStream(DeleteDataStreamRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteDataStreamRequest, DeleteDataStreamResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteDataStreamRequest, DeleteDataStreamResponse, ErrorResponse>) DeleteDataStreamRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes one or more data streams and their backing indices.
-	 *
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteDataStreamRequest}
-	 *
-	 */
-
-	public final DeleteDataStreamResponse deleteDataStream(
-			Function<DeleteDataStreamRequest.Builder, ObjectBuilder<DeleteDataStreamRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteDataStream(fn.apply(new DeleteDataStreamRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.delete_alias
-
-	/**
-	 * Deletes an alias.
-	 * 
-	 *
-	 */
-
-	public DeleteAliasResponse deleteAlias(DeleteAliasRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteAliasRequest, DeleteAliasResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteAliasRequest, DeleteAliasResponse, ErrorResponse>) DeleteAliasRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes an alias.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteAliasRequest}
-	 *
-	 */
-
-	public final DeleteAliasResponse deleteAlias(
-			Function<DeleteAliasRequest.Builder, ObjectBuilder<DeleteAliasRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteAlias(fn.apply(new DeleteAliasRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.delete_index_template
-
-	/**
-	 * Deletes an index template.
-	 * 
-	 *
-	 */
-
-	public DeleteIndexTemplateResponse deleteIndexTemplate(DeleteIndexTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteIndexTemplateRequest, DeleteIndexTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteIndexTemplateRequest, DeleteIndexTemplateResponse, ErrorResponse>)
-						DeleteIndexTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes an index template.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteIndexTemplateRequest}
-	 *
-	 */
-
-	public final DeleteIndexTemplateResponse deleteIndexTemplate(
-			Function<DeleteIndexTemplateRequest.Builder, ObjectBuilder<DeleteIndexTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteIndexTemplate(fn.apply(new DeleteIndexTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.delete_template
-
-	/**
-	 * Deletes an index template.
-	 * 
-	 *
-	 */
-
-	public DeleteTemplateResponse deleteTemplate(DeleteTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteTemplateRequest, DeleteTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteTemplateRequest, DeleteTemplateResponse, ErrorResponse>)
-						DeleteTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes an index template.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteTemplateRequest}
-	 *
-	 */
-
-	public final DeleteTemplateResponse deleteTemplate(
-			Function<DeleteTemplateRequest.Builder, ObjectBuilder<DeleteTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteTemplate(fn.apply(new DeleteTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.disk_usage
-
-	/**
-	 * Analyzes the disk usage of each field of an index or data stream
-	 * 
-	 *
-	 */
-
-	public DiskUsageResponse diskUsage(DiskUsageRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DiskUsageRequest, DiskUsageResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DiskUsageRequest, DiskUsageResponse, ErrorResponse>) DiskUsageRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Analyzes the disk usage of each field of an index or data stream
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DiskUsageRequest}
-	 *
-	 */
-
-	public final DiskUsageResponse diskUsage(Function<DiskUsageRequest.Builder, ObjectBuilder<DiskUsageRequest>> fn)
-			throws IOException, OpenSearchException {
-		return diskUsage(fn.apply(new DiskUsageRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.exists
-
-	/**
-	 * Returns information about whether a particular index exists.
-	 * 
-	 *
-	 */
-
-	public BooleanResponse exists(ExistsRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ExistsRequest, BooleanResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ExistsRequest, BooleanResponse, ErrorResponse>) ExistsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about whether a particular index exists.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ExistsRequest}
-	 *
-	 */
-
-	public final BooleanResponse exists(Function<ExistsRequest.Builder, ObjectBuilder<ExistsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return exists(fn.apply(new ExistsRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.exists_alias
-
-	/**
-	 * Returns information about whether a particular alias exists.
-	 * 
-	 *
-	 */
-
-	public BooleanResponse existsAlias(ExistsAliasRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ExistsAliasRequest, BooleanResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ExistsAliasRequest, BooleanResponse, ErrorResponse>) ExistsAliasRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about whether a particular alias exists.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ExistsAliasRequest}
-	 *
-	 */
-
-	public final BooleanResponse existsAlias(Function<ExistsAliasRequest.Builder, ObjectBuilder<ExistsAliasRequest>> fn)
-			throws IOException, OpenSearchException {
-		return existsAlias(fn.apply(new ExistsAliasRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.exists_index_template
-
-	/**
-	 * Returns information about whether a particular index template exists.
-	 * 
-	 *
-	 */
-
-	public BooleanResponse existsIndexTemplate(ExistsIndexTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ExistsIndexTemplateRequest, BooleanResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ExistsIndexTemplateRequest, BooleanResponse, ErrorResponse>)
-						ExistsIndexTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about whether a particular index template exists.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ExistsIndexTemplateRequest}
-	 *
-	 */
-
-	public final BooleanResponse existsIndexTemplate(
-			Function<ExistsIndexTemplateRequest.Builder, ObjectBuilder<ExistsIndexTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return existsIndexTemplate(fn.apply(new ExistsIndexTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.exists_template
-
-	/**
-	 * Returns information about whether a particular index template exists.
-	 * 
-	 *
-	 */
-
-	public BooleanResponse existsTemplate(ExistsTemplateRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ExistsTemplateRequest, BooleanResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ExistsTemplateRequest, BooleanResponse, ErrorResponse>) ExistsTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about whether a particular index template exists.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ExistsTemplateRequest}
-	 *
-	 */
-
-	public final BooleanResponse existsTemplate(
-			Function<ExistsTemplateRequest.Builder, ObjectBuilder<ExistsTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return existsTemplate(fn.apply(new ExistsTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.flush
-
-	/**
-	 * Performs the flush operation on one or more indices.
-	 * 
-	 *
-	 */
-
-	public FlushResponse flush(FlushRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<FlushRequest, FlushResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<FlushRequest, FlushResponse, ErrorResponse>) FlushRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Performs the flush operation on one or more indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link FlushRequest}
-	 *
-	 */
-
-	public final FlushResponse flush(Function<FlushRequest.Builder, ObjectBuilder<FlushRequest>> fn)
-			throws IOException, OpenSearchException {
-		return flush(fn.apply(new FlushRequest.Builder()).build());
-	}
-
-	/**
-	 * Performs the flush operation on one or more indices.
-	 * 
-	 *
-	 */
-
-	public FlushResponse flush() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new FlushRequest.Builder().build(), FlushRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.forcemerge
-
-	/**
-	 * Performs the force merge operation on one or more indices.
-	 * 
-	 *
-	 */
-
-	public ForcemergeResponse forcemerge(ForcemergeRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ForcemergeRequest, ForcemergeResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ForcemergeRequest, ForcemergeResponse, ErrorResponse>) ForcemergeRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Performs the force merge operation on one or more indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ForcemergeRequest}
-	 *
-	 */
-
-	public final ForcemergeResponse forcemerge(Function<ForcemergeRequest.Builder, ObjectBuilder<ForcemergeRequest>> fn)
-			throws IOException, OpenSearchException {
-		return forcemerge(fn.apply(new ForcemergeRequest.Builder()).build());
-	}
-
-	/**
-	 * Performs the force merge operation on one or more indices.
-	 * 
-	 *
-	 */
-
-	public ForcemergeResponse forcemerge() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new ForcemergeRequest.Builder().build(), ForcemergeRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.get
-
-	/**
-	 * Returns information about one or more indices.
-	 * 
-	 *
-	 */
-
-	public GetIndexResponse get(GetIndexRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetIndexRequest, GetIndexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetIndexRequest, GetIndexResponse, ErrorResponse>) GetIndexRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about one or more indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetIndexRequest}
-	 *
-	 */
-
-	public final GetIndexResponse get(Function<GetIndexRequest.Builder, ObjectBuilder<GetIndexRequest>> fn)
-			throws IOException, OpenSearchException {
-		return get(fn.apply(new GetIndexRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.get_data_stream
-
-	/**
-	 * Returns information about one or more data streams.
-	 *
-	 *
-	 */
-
-	public GetDataStreamResponse getDataStream(GetDataStreamRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetDataStreamRequest, GetDataStreamResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetDataStreamRequest, GetDataStreamResponse, ErrorResponse>) GetDataStreamRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about one or more data streams.
-	 *
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetDataStreamRequest}
-	 *
-	 */
-
-	public final GetDataStreamResponse getDataStream(Function<GetDataStreamRequest.Builder, ObjectBuilder<GetDataStreamRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getDataStream(fn.apply(new GetDataStreamRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about one or more data streams.
-	 *
-	 *
-	 */
-
-	public GetDataStreamResponse getDataStream() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new GetDataStreamRequest.Builder().build(), GetDataStreamRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.get_alias
-
-	/**
-	 * Returns an alias.
-	 * 
-	 *
-	 */
-
-	public GetAliasResponse getAlias(GetAliasRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetAliasRequest, GetAliasResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetAliasRequest, GetAliasResponse, ErrorResponse>) GetAliasRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns an alias.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetAliasRequest}
-	 *
-	 */
-
-	public final GetAliasResponse getAlias(Function<GetAliasRequest.Builder, ObjectBuilder<GetAliasRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getAlias(fn.apply(new GetAliasRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns an alias.
-	 * 
-	 *
-	 */
-
-	public GetAliasResponse getAlias() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new GetAliasRequest.Builder().build(), GetAliasRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.get_field_mapping
-
-	/**
-	 * Returns mapping for one or more fields.
-	 * 
-	 *
-	 */
-
-	public GetFieldMappingResponse getFieldMapping(GetFieldMappingRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetFieldMappingRequest, GetFieldMappingResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetFieldMappingRequest, GetFieldMappingResponse, ErrorResponse>)
-						GetFieldMappingRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns mapping for one or more fields.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetFieldMappingRequest}
-	 *
-	 */
-
-	public final GetFieldMappingResponse getFieldMapping(
-			Function<GetFieldMappingRequest.Builder, ObjectBuilder<GetFieldMappingRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getFieldMapping(fn.apply(new GetFieldMappingRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.get_index_template
-
-	/**
-	 * Returns an index template.
-	 * 
-	 *
-	 */
-
-	public GetIndexTemplateResponse getIndexTemplate(GetIndexTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetIndexTemplateRequest, GetIndexTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetIndexTemplateRequest, GetIndexTemplateResponse, ErrorResponse>)
-						GetIndexTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns an index template.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetIndexTemplateRequest}
-	 *
-	 */
-
-	public final GetIndexTemplateResponse getIndexTemplate(
-			Function<GetIndexTemplateRequest.Builder, ObjectBuilder<GetIndexTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getIndexTemplate(fn.apply(new GetIndexTemplateRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns an index template.
-	 * 
-	 *
-	 */
-
-	public GetIndexTemplateResponse getIndexTemplate() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new GetIndexTemplateRequest.Builder().build(),
-				GetIndexTemplateRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.get_mapping
-
-	/**
-	 * Returns mappings for one or more indices.
-	 * 
-	 *
-	 */
-
-	public GetMappingResponse getMapping(GetMappingRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetMappingRequest, GetMappingResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetMappingRequest, GetMappingResponse, ErrorResponse>) GetMappingRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns mappings for one or more indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetMappingRequest}
-	 *
-	 */
-
-	public final GetMappingResponse getMapping(Function<GetMappingRequest.Builder, ObjectBuilder<GetMappingRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getMapping(fn.apply(new GetMappingRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns mappings for one or more indices.
-	 * 
-	 *
-	 */
-
-	public GetMappingResponse getMapping() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new GetMappingRequest.Builder().build(), GetMappingRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.get_settings
-
-	/**
-	 * Returns settings for one or more indices.
-	 * 
-	 *
-	 */
-
-	public GetIndicesSettingsResponse getSettings(GetIndicesSettingsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetIndicesSettingsRequest, GetIndicesSettingsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetIndicesSettingsRequest, GetIndicesSettingsResponse, ErrorResponse>)
-						GetIndicesSettingsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns settings for one or more indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetIndicesSettingsRequest}
-	 *
-	 */
-
-	public final GetIndicesSettingsResponse getSettings(
-			Function<GetIndicesSettingsRequest.Builder, ObjectBuilder<GetIndicesSettingsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getSettings(fn.apply(new GetIndicesSettingsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns settings for one or more indices.
-	 * 
-	 *
-	 */
-
-	public GetIndicesSettingsResponse getSettings() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new GetIndicesSettingsRequest.Builder().build(),
-				GetIndicesSettingsRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.get_template
-
-	/**
-	 * Returns an index template.
-	 * 
-	 *
-	 */
-
-	public GetTemplateResponse getTemplate(GetTemplateRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetTemplateRequest, GetTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetTemplateRequest, GetTemplateResponse, ErrorResponse>) GetTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns an index template.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetTemplateRequest}
-	 *
-	 */
-
-	public final GetTemplateResponse getTemplate(
-			Function<GetTemplateRequest.Builder, ObjectBuilder<GetTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getTemplate(fn.apply(new GetTemplateRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns an index template.
-	 * 
-	 *
-	 */
-
-	public GetTemplateResponse getTemplate() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new GetTemplateRequest.Builder().build(), GetTemplateRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.get_upgrade
-
-	/**
-	 * DEPRECATED Returns a progress status of current upgrade.
-	 * 
-	 *
-	 */
-
-	public GetUpgradeResponse getUpgrade(GetUpgradeRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetUpgradeRequest, GetUpgradeResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetUpgradeRequest, GetUpgradeResponse, ErrorResponse>) GetUpgradeRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * DEPRECATED Returns a progress status of current upgrade.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetUpgradeRequest}
-	 *
-	 */
-
-	public final GetUpgradeResponse getUpgrade(Function<GetUpgradeRequest.Builder, ObjectBuilder<GetUpgradeRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getUpgrade(fn.apply(new GetUpgradeRequest.Builder()).build());
-	}
-
-	/**
-	 * DEPRECATED Returns a progress status of current upgrade.
-	 * 
-	 *
-	 */
-
-	public GetUpgradeResponse getUpgrade() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new GetUpgradeRequest.Builder().build(), GetUpgradeRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.open
-
-	/**
-	 * Opens an index.
-	 * 
-	 *
-	 */
-
-	public OpenResponse open(OpenRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<OpenRequest, OpenResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<OpenRequest, OpenResponse, ErrorResponse>) OpenRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Opens an index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link OpenRequest}
-	 *
-	 */
-
-	public final OpenResponse open(Function<OpenRequest.Builder, ObjectBuilder<OpenRequest>> fn)
-			throws IOException, OpenSearchException {
-		return open(fn.apply(new OpenRequest.Builder()).build());
-	}
-
-
-	// ----- Endpoint: indices.put_alias
-
-	/**
-	 * Creates or updates an alias.
-	 * 
-	 *
-	 */
-
-	public PutAliasResponse putAlias(PutAliasRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutAliasRequest, PutAliasResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutAliasRequest, PutAliasResponse, ErrorResponse>) PutAliasRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates or updates an alias.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutAliasRequest}
-	 *
-	 */
-
-	public final PutAliasResponse putAlias(Function<PutAliasRequest.Builder, ObjectBuilder<PutAliasRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putAlias(fn.apply(new PutAliasRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.put_index_template
-
-	/**
-	 * Creates or updates an index template.
-	 * 
-	 *
-	 */
-
-	public PutIndexTemplateResponse putIndexTemplate(PutIndexTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutIndexTemplateRequest, PutIndexTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutIndexTemplateRequest, PutIndexTemplateResponse, ErrorResponse>)
-						PutIndexTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates or updates an index template.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutIndexTemplateRequest}
-	 *
-	 */
-
-	public final PutIndexTemplateResponse putIndexTemplate(
-			Function<PutIndexTemplateRequest.Builder, ObjectBuilder<PutIndexTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putIndexTemplate(fn.apply(new PutIndexTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.put_mapping
-
-	/**
-	 * Updates the index mappings.
-	 * 
-	 *
-	 */
-
-	public PutMappingResponse putMapping(PutMappingRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutMappingRequest, PutMappingResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutMappingRequest, PutMappingResponse, ErrorResponse>) PutMappingRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Updates the index mappings.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutMappingRequest}
-	 *
-	 */
-
-	public final PutMappingResponse putMapping(Function<PutMappingRequest.Builder, ObjectBuilder<PutMappingRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putMapping(fn.apply(new PutMappingRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.put_settings
-
-	/**
-	 * Updates the index settings.
-	 * 
-	 *
-	 */
-
-	public PutIndicesSettingsResponse putSettings(PutIndicesSettingsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutIndicesSettingsRequest, PutIndicesSettingsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutIndicesSettingsRequest, PutIndicesSettingsResponse, ErrorResponse>)
-						PutIndicesSettingsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Updates the index settings.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutIndicesSettingsRequest}
-	 *
-	 */
-
-	public final PutIndicesSettingsResponse putSettings(
-			Function<PutIndicesSettingsRequest.Builder, ObjectBuilder<PutIndicesSettingsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putSettings(fn.apply(new PutIndicesSettingsRequest.Builder()).build());
-	}
-
-	/**
-	 * Updates the index settings.
-	 * 
-	 *
-	 */
-
-	public PutIndicesSettingsResponse putSettings() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new PutIndicesSettingsRequest.Builder().build(),
-				PutIndicesSettingsRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.put_template
-
-	/**
-	 * Creates or updates an index template.
-	 * 
-	 *
-	 */
-
-	public PutTemplateResponse putTemplate(PutTemplateRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutTemplateRequest, PutTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutTemplateRequest, PutTemplateResponse, ErrorResponse>) PutTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates or updates an index template.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutTemplateRequest}
-	 *
-	 */
-
-	public final PutTemplateResponse putTemplate(
-			Function<PutTemplateRequest.Builder, ObjectBuilder<PutTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putTemplate(fn.apply(new PutTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.recovery
-
-	/**
-	 * Returns information about ongoing index shard recoveries.
-	 * 
-	 *
-	 */
-
-	public RecoveryResponse recovery(RecoveryRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<RecoveryRequest, RecoveryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<RecoveryRequest, RecoveryResponse, ErrorResponse>) RecoveryRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about ongoing index shard recoveries.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link RecoveryRequest}
-	 *
-	 */
-
-	public final RecoveryResponse recovery(Function<RecoveryRequest.Builder, ObjectBuilder<RecoveryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return recovery(fn.apply(new RecoveryRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about ongoing index shard recoveries.
-	 * 
-	 *
-	 */
-
-	public RecoveryResponse recovery() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new RecoveryRequest.Builder().build(), RecoveryRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.refresh
-
-	/**
-	 * Performs the refresh operation in one or more indices.
-	 * 
-	 *
-	 */
-
-	public RefreshResponse refresh(RefreshRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<RefreshRequest, RefreshResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<RefreshRequest, RefreshResponse, ErrorResponse>) RefreshRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Performs the refresh operation in one or more indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link RefreshRequest}
-	 *
-	 */
-
-	public final RefreshResponse refresh(Function<RefreshRequest.Builder, ObjectBuilder<RefreshRequest>> fn)
-			throws IOException, OpenSearchException {
-		return refresh(fn.apply(new RefreshRequest.Builder()).build());
-	}
-
-	/**
-	 * Performs the refresh operation in one or more indices.
-	 * 
-	 *
-	 */
-
-	public RefreshResponse refresh() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new RefreshRequest.Builder().build(), RefreshRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.resolve_index
-
-	/**
-	 * Returns information about any matching indices, aliases, and data streams
-	 * 
-	 *
-	 */
-
-	public ResolveIndexResponse resolveIndex(ResolveIndexRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ResolveIndexRequest, ResolveIndexResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ResolveIndexRequest, ResolveIndexResponse, ErrorResponse>) ResolveIndexRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about any matching indices, aliases, and data streams
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ResolveIndexRequest}
-	 *
-	 */
-
-	public final ResolveIndexResponse resolveIndex(
-			Function<ResolveIndexRequest.Builder, ObjectBuilder<ResolveIndexRequest>> fn)
-			throws IOException, OpenSearchException {
-		return resolveIndex(fn.apply(new ResolveIndexRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.rollover
-
-	/**
-	 * Updates an alias to point to a new index when the existing index is
-	 * considered to be too large or too old.
-	 * 
-	 *
-	 */
-
-	public RolloverResponse rollover(RolloverRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<RolloverRequest, RolloverResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<RolloverRequest, RolloverResponse, ErrorResponse>) RolloverRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Updates an alias to point to a new index when the existing index is
-	 * considered to be too large or too old.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link RolloverRequest}
-	 *
-	 */
-
-	public final RolloverResponse rollover(Function<RolloverRequest.Builder, ObjectBuilder<RolloverRequest>> fn)
-			throws IOException, OpenSearchException {
-		return rollover(fn.apply(new RolloverRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.segments
-
-	/**
-	 * Provides low-level information about segments in a Lucene index.
-	 * 
-	 *
-	 */
-
-	public SegmentsResponse segments(SegmentsRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SegmentsRequest, SegmentsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<SegmentsRequest, SegmentsResponse, ErrorResponse>) SegmentsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Provides low-level information about segments in a Lucene index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SegmentsRequest}
-	 *
-	 */
-
-	public final SegmentsResponse segments(Function<SegmentsRequest.Builder, ObjectBuilder<SegmentsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return segments(fn.apply(new SegmentsRequest.Builder()).build());
-	}
-
-	/**
-	 * Provides low-level information about segments in a Lucene index.
-	 * 
-	 *
-	 */
-
-	public SegmentsResponse segments() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new SegmentsRequest.Builder().build(), SegmentsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.shard_stores
-
-	/**
-	 * Provides store information for shard copies of indices.
-	 * 
-	 *
-	 */
-
-	public ShardStoresResponse shardStores(ShardStoresRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ShardStoresRequest, ShardStoresResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ShardStoresRequest, ShardStoresResponse, ErrorResponse>) ShardStoresRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Provides store information for shard copies of indices.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ShardStoresRequest}
-	 *
-	 */
-
-	public final ShardStoresResponse shardStores(
-			Function<ShardStoresRequest.Builder, ObjectBuilder<ShardStoresRequest>> fn)
-			throws IOException, OpenSearchException {
-		return shardStores(fn.apply(new ShardStoresRequest.Builder()).build());
-	}
-
-	/**
-	 * Provides store information for shard copies of indices.
-	 * 
-	 *
-	 */
-
-	public ShardStoresResponse shardStores() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new ShardStoresRequest.Builder().build(), ShardStoresRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.shrink
-
-	/**
-	 * Allow to shrink an existing index into a new index with fewer primary shards.
-	 * 
-	 *
-	 */
-
-	public ShrinkResponse shrink(ShrinkRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ShrinkRequest, ShrinkResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ShrinkRequest, ShrinkResponse, ErrorResponse>) ShrinkRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allow to shrink an existing index into a new index with fewer primary shards.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ShrinkRequest}
-	 *
-	 */
-
-	public final ShrinkResponse shrink(Function<ShrinkRequest.Builder, ObjectBuilder<ShrinkRequest>> fn)
-			throws IOException, OpenSearchException {
-		return shrink(fn.apply(new ShrinkRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.simulate_index_template
-
-	/**
-	 * Simulate matching the given index name against the index templates in the
-	 * system
-	 * 
-	 *
-	 */
-
-	public SimulateIndexTemplateResponse simulateIndexTemplate(SimulateIndexTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SimulateIndexTemplateRequest, SimulateIndexTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<SimulateIndexTemplateRequest, SimulateIndexTemplateResponse, ErrorResponse>)
-						SimulateIndexTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Simulate matching the given index name against the index templates in the
-	 * system
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SimulateIndexTemplateRequest}
-	 *
-	 */
-
-	public final SimulateIndexTemplateResponse simulateIndexTemplate(
-			Function<SimulateIndexTemplateRequest.Builder, ObjectBuilder<SimulateIndexTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return simulateIndexTemplate(fn.apply(new SimulateIndexTemplateRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.simulate_template
-
-	/**
-	 * Simulate resolving the given template name or body
-	 * 
-	 *
-	 */
-
-	public SimulateTemplateResponse simulateTemplate(SimulateTemplateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SimulateTemplateRequest, SimulateTemplateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<SimulateTemplateRequest, SimulateTemplateResponse, ErrorResponse>)
-						SimulateTemplateRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Simulate resolving the given template name or body
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SimulateTemplateRequest}
-	 *
-	 */
-
-	public final SimulateTemplateResponse simulateTemplate(
-			Function<SimulateTemplateRequest.Builder, ObjectBuilder<SimulateTemplateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return simulateTemplate(fn.apply(new SimulateTemplateRequest.Builder()).build());
-	}
-
-	/**
-	 * Simulate resolving the given template name or body
-	 * 
-	 *
-	 */
-
-	public SimulateTemplateResponse simulateTemplate() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new SimulateTemplateRequest.Builder().build(),
-				SimulateTemplateRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.split
-
-	/**
-	 * Allows you to split an existing index into a new index with more primary
-	 * shards.
-	 * 
-	 *
-	 */
-
-	public SplitResponse split(SplitRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SplitRequest, SplitResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<SplitRequest, SplitResponse, ErrorResponse>) SplitRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows you to split an existing index into a new index with more primary
-	 * shards.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SplitRequest}
-	 *
-	 */
-
-	public final SplitResponse split(Function<SplitRequest.Builder, ObjectBuilder<SplitRequest>> fn)
-			throws IOException, OpenSearchException {
-		return split(fn.apply(new SplitRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: indices.stats
-
-	/**
-	 * Provides statistics on operations happening in an index.
-	 * 
-	 *
-	 */
-
-	public IndicesStatsResponse stats(IndicesStatsRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<IndicesStatsRequest, IndicesStatsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<IndicesStatsRequest, IndicesStatsResponse, ErrorResponse>) IndicesStatsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Provides statistics on operations happening in an index.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link IndicesStatsRequest}
-	 *
-	 */
-
-	public final IndicesStatsResponse stats(
-			Function<IndicesStatsRequest.Builder, ObjectBuilder<IndicesStatsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return stats(fn.apply(new IndicesStatsRequest.Builder()).build());
-	}
-
-	/**
-	 * Provides statistics on operations happening in an index.
-	 * 
-	 *
-	 */
-
-	public IndicesStatsResponse stats() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new IndicesStatsRequest.Builder().build(), IndicesStatsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.data_streams_stats
-
-	/**
-	 * Returns statistics of data streams
-	 *
-	 *
-	 */
-
-	public DataStreamsStatsResponse dataStreamsStats(DataStreamsStatsRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DataStreamsStatsRequest, DataStreamsStatsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DataStreamsStatsRequest, DataStreamsStatsResponse, ErrorResponse>) DataStreamsStatsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns statistics of data streams
-	 *
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DataStreamsStatsRequest}
-	 *
-	 */
-
-	public final DataStreamsStatsResponse dataStreamsStats(Function<DataStreamsStatsRequest.Builder, ObjectBuilder<DataStreamsStatsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return dataStreamsStats(fn.apply(new DataStreamsStatsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns statistics of data streams
-	 *
-	 *
-	 */
-
-	public DataStreamsStatsResponse dataStreamsStats() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new DataStreamsStatsRequest.Builder().build(), DataStreamsStatsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.update_aliases
-
-	/**
-	 * Updates index aliases.
-	 * 
-	 *
-	 */
-
-	public UpdateAliasesResponse updateAliases(UpdateAliasesRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<UpdateAliasesRequest, UpdateAliasesResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<UpdateAliasesRequest, UpdateAliasesResponse, ErrorResponse>) UpdateAliasesRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Updates index aliases.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link UpdateAliasesRequest}
-	 *
-	 */
-
-	public final UpdateAliasesResponse updateAliases(
-			Function<UpdateAliasesRequest.Builder, ObjectBuilder<UpdateAliasesRequest>> fn)
-			throws IOException, OpenSearchException {
-		return updateAliases(fn.apply(new UpdateAliasesRequest.Builder()).build());
-	}
-
-	/**
-	 * Updates index aliases.
-	 * 
-	 *
-	 */
-
-	public UpdateAliasesResponse updateAliases() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new UpdateAliasesRequest.Builder().build(), UpdateAliasesRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.upgrade
-
-	/**
-	 * DEPRECATED Upgrades to the current version of Lucene.
-	 * 
-	 *
-	 */
-
-	public UpgradeResponse upgrade(UpgradeRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<UpgradeRequest, UpgradeResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<UpgradeRequest, UpgradeResponse, ErrorResponse>) UpgradeRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * DEPRECATED Upgrades to the current version of Lucene.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link UpgradeRequest}
-	 *
-	 */
-
-	public final UpgradeResponse upgrade(Function<UpgradeRequest.Builder, ObjectBuilder<UpgradeRequest>> fn)
-			throws IOException, OpenSearchException {
-		return upgrade(fn.apply(new UpgradeRequest.Builder()).build());
-	}
-
-	/**
-	 * DEPRECATED Upgrades to the current version of Lucene.
-	 * 
-	 *
-	 */
-
-	public UpgradeResponse upgrade() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new UpgradeRequest.Builder().build(), UpgradeRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: indices.validate_query
-
-	/**
-	 * Allows a user to validate a potentially expensive query without executing it.
-	 * 
-	 *
-	 */
-
-	public ValidateQueryResponse validateQuery(ValidateQueryRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ValidateQueryRequest, ValidateQueryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ValidateQueryRequest, ValidateQueryResponse, ErrorResponse>) ValidateQueryRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows a user to validate a potentially expensive query without executing it.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ValidateQueryRequest}
-	 *
-	 */
-
-	public final ValidateQueryResponse validateQuery(
-			Function<ValidateQueryRequest.Builder, ObjectBuilder<ValidateQueryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return validateQuery(fn.apply(new ValidateQueryRequest.Builder()).build());
-	}
-
-	/**
-	 * Allows a user to validate a potentially expensive query without executing it.
-	 * 
-	 *
-	 */
-
-	public ValidateQueryResponse validateQuery() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new ValidateQueryRequest.Builder().build(), ValidateQueryRequest._ENDPOINT,
-				this.transportOptions);
-	}
+    public OpenSearchIndicesClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchIndicesClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchIndicesClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchIndicesClient(this.transport, transportOptions);
+    }
+
+    // ----- Endpoint: indices.add_block
+
+    /**
+     * Adds a block to an index.
+     *
+     */
+
+    public AddBlockResponse addBlock(AddBlockRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<AddBlockRequest, AddBlockResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            AddBlockRequest,
+            AddBlockResponse,
+            ErrorResponse>) AddBlockRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Adds a block to an index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link AddBlockRequest}
+     */
+
+    public final AddBlockResponse addBlock(Function<AddBlockRequest.Builder, ObjectBuilder<AddBlockRequest>> fn) throws IOException,
+        OpenSearchException {
+        return addBlock(fn.apply(new AddBlockRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.analyze
+
+    /**
+     * Performs the analysis process on a text and return the tokens breakdown of
+     * the text.
+     *
+     */
+
+    public AnalyzeResponse analyze(AnalyzeRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<AnalyzeRequest, AnalyzeResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            AnalyzeRequest,
+            AnalyzeResponse,
+            ErrorResponse>) AnalyzeRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Performs the analysis process on a text and return the tokens breakdown of
+     * the text.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link AnalyzeRequest}
+     */
+
+    public final AnalyzeResponse analyze(Function<AnalyzeRequest.Builder, ObjectBuilder<AnalyzeRequest>> fn) throws IOException,
+        OpenSearchException {
+        return analyze(fn.apply(new AnalyzeRequest.Builder()).build());
+    }
+
+    /**
+     * Performs the analysis process on a text and return the tokens breakdown of
+     * the text.
+     *
+     */
+
+    public AnalyzeResponse analyze() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new AnalyzeRequest.Builder().build(), AnalyzeRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.clear_cache
+
+    /**
+     * Clears all or specific caches for one or more indices.
+     *
+     */
+
+    public ClearCacheResponse clearCache(ClearCacheRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ClearCacheRequest, ClearCacheResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ClearCacheRequest,
+            ClearCacheResponse,
+            ErrorResponse>) ClearCacheRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Clears all or specific caches for one or more indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ClearCacheRequest}
+     */
+
+    public final ClearCacheResponse clearCache(Function<ClearCacheRequest.Builder, ObjectBuilder<ClearCacheRequest>> fn) throws IOException,
+        OpenSearchException {
+        return clearCache(fn.apply(new ClearCacheRequest.Builder()).build());
+    }
+
+    /**
+     * Clears all or specific caches for one or more indices.
+     *
+     */
+
+    public ClearCacheResponse clearCache() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new ClearCacheRequest.Builder().build(), ClearCacheRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.clone
+
+    /**
+     * Clones an index
+     *
+     */
+
+    public CloneIndexResponse clone(CloneIndexRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CloneIndexRequest, CloneIndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CloneIndexRequest,
+            CloneIndexResponse,
+            ErrorResponse>) CloneIndexRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Clones an index
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CloneIndexRequest}
+     *
+     */
+
+    public final CloneIndexResponse clone(Function<CloneIndexRequest.Builder, ObjectBuilder<CloneIndexRequest>> fn) throws IOException,
+        OpenSearchException {
+        return clone(fn.apply(new CloneIndexRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.close
+
+    /**
+     * Closes an index.
+     *
+     *
+     */
+
+    public CloseIndexResponse close(CloseIndexRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CloseIndexRequest, CloseIndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CloseIndexRequest,
+            CloseIndexResponse,
+            ErrorResponse>) CloseIndexRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Closes an index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CloseIndexRequest}
+     *
+     */
+
+    public final CloseIndexResponse close(Function<CloseIndexRequest.Builder, ObjectBuilder<CloseIndexRequest>> fn) throws IOException,
+        OpenSearchException {
+        return close(fn.apply(new CloseIndexRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.create
+
+    /**
+     * Creates an index with optional settings and mappings.
+     *
+     *
+     */
+
+    public CreateIndexResponse create(CreateIndexRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CreateIndexRequest, CreateIndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CreateIndexRequest,
+            CreateIndexResponse,
+            ErrorResponse>) CreateIndexRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates an index with optional settings and mappings.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CreateIndexRequest}
+     *
+     */
+
+    public final CreateIndexResponse create(Function<CreateIndexRequest.Builder, ObjectBuilder<CreateIndexRequest>> fn) throws IOException,
+        OpenSearchException {
+        return create(fn.apply(new CreateIndexRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.create_data_stream
+
+    /**
+     * Creates a data stream
+     */
+
+    public CreateDataStreamResponse createDataStream(CreateDataStreamRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CreateDataStreamRequest, CreateDataStreamResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CreateDataStreamRequest,
+            CreateDataStreamResponse,
+            ErrorResponse>) CreateDataStreamRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates a data stream
+     *
+     * @param fn
+     * 				a function that initializes a builder to create the {@link CreateDataStreamRequest}
+     */
+
+    public final CreateDataStreamResponse createDataStream(
+        Function<CreateDataStreamRequest.Builder, ObjectBuilder<CreateDataStreamRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return createDataStream(fn.apply(new CreateDataStreamRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.delete
+
+    /**
+     * Deletes an index.
+     *
+     *
+     */
+
+    public DeleteIndexResponse delete(DeleteIndexRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteIndexRequest, DeleteIndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteIndexRequest,
+            DeleteIndexResponse,
+            ErrorResponse>) DeleteIndexRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes an index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteIndexRequest}
+     *
+     */
+
+    public final DeleteIndexResponse delete(Function<DeleteIndexRequest.Builder, ObjectBuilder<DeleteIndexRequest>> fn) throws IOException,
+        OpenSearchException {
+        return delete(fn.apply(new DeleteIndexRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.delete_data_stream
+
+    /**
+     * Deletes one or more data streams and their backing indices.
+     */
+
+    public DeleteDataStreamResponse deleteDataStream(DeleteDataStreamRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteDataStreamRequest, DeleteDataStreamResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteDataStreamRequest,
+            DeleteDataStreamResponse,
+            ErrorResponse>) DeleteDataStreamRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes one or more data streams and their backing indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteDataStreamRequest}
+     *
+     */
+
+    public final DeleteDataStreamResponse deleteDataStream(
+        Function<DeleteDataStreamRequest.Builder, ObjectBuilder<DeleteDataStreamRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deleteDataStream(fn.apply(new DeleteDataStreamRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.delete_alias
+
+    /**
+     * Deletes an alias.
+     *
+     *
+     */
+
+    public DeleteAliasResponse deleteAlias(DeleteAliasRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteAliasRequest, DeleteAliasResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteAliasRequest,
+            DeleteAliasResponse,
+            ErrorResponse>) DeleteAliasRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes an alias.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteAliasRequest}
+     *
+     */
+
+    public final DeleteAliasResponse deleteAlias(Function<DeleteAliasRequest.Builder, ObjectBuilder<DeleteAliasRequest>> fn)
+        throws IOException, OpenSearchException {
+        return deleteAlias(fn.apply(new DeleteAliasRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.delete_index_template
+
+    /**
+     * Deletes an index template.
+     *
+     *
+     */
+
+    public DeleteIndexTemplateResponse deleteIndexTemplate(DeleteIndexTemplateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteIndexTemplateRequest, DeleteIndexTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteIndexTemplateRequest,
+            DeleteIndexTemplateResponse,
+            ErrorResponse>) DeleteIndexTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes an index template.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteIndexTemplateRequest}
+     *
+     */
+
+    public final DeleteIndexTemplateResponse deleteIndexTemplate(
+        Function<DeleteIndexTemplateRequest.Builder, ObjectBuilder<DeleteIndexTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deleteIndexTemplate(fn.apply(new DeleteIndexTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.delete_template
+
+    /**
+     * Deletes an index template.
+     *
+     *
+     */
+
+    public DeleteTemplateResponse deleteTemplate(DeleteTemplateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteTemplateRequest, DeleteTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteTemplateRequest,
+            DeleteTemplateResponse,
+            ErrorResponse>) DeleteTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes an index template.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteTemplateRequest}
+     *
+     */
+
+    public final DeleteTemplateResponse deleteTemplate(Function<DeleteTemplateRequest.Builder, ObjectBuilder<DeleteTemplateRequest>> fn)
+        throws IOException, OpenSearchException {
+        return deleteTemplate(fn.apply(new DeleteTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.disk_usage
+
+    /**
+     * Analyzes the disk usage of each field of an index or data stream
+     *
+     *
+     */
+
+    public DiskUsageResponse diskUsage(DiskUsageRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DiskUsageRequest, DiskUsageResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DiskUsageRequest,
+            DiskUsageResponse,
+            ErrorResponse>) DiskUsageRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Analyzes the disk usage of each field of an index or data stream
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DiskUsageRequest}
+     *
+     */
+
+    public final DiskUsageResponse diskUsage(Function<DiskUsageRequest.Builder, ObjectBuilder<DiskUsageRequest>> fn) throws IOException,
+        OpenSearchException {
+        return diskUsage(fn.apply(new DiskUsageRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.exists
+
+    /**
+     * Returns information about whether a particular index exists.
+     *
+     *
+     */
+
+    public BooleanResponse exists(ExistsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ExistsRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ExistsRequest,
+            BooleanResponse,
+            ErrorResponse>) ExistsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about whether a particular index exists.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ExistsRequest}
+     *
+     */
+
+    public final BooleanResponse exists(Function<ExistsRequest.Builder, ObjectBuilder<ExistsRequest>> fn) throws IOException,
+        OpenSearchException {
+        return exists(fn.apply(new ExistsRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.exists_alias
+
+    /**
+     * Returns information about whether a particular alias exists.
+     *
+     *
+     */
+
+    public BooleanResponse existsAlias(ExistsAliasRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ExistsAliasRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ExistsAliasRequest,
+            BooleanResponse,
+            ErrorResponse>) ExistsAliasRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about whether a particular alias exists.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ExistsAliasRequest}
+     *
+     */
+
+    public final BooleanResponse existsAlias(Function<ExistsAliasRequest.Builder, ObjectBuilder<ExistsAliasRequest>> fn) throws IOException,
+        OpenSearchException {
+        return existsAlias(fn.apply(new ExistsAliasRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.exists_index_template
+
+    /**
+     * Returns information about whether a particular index template exists.
+     *
+     *
+     */
+
+    public BooleanResponse existsIndexTemplate(ExistsIndexTemplateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ExistsIndexTemplateRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ExistsIndexTemplateRequest,
+            BooleanResponse,
+            ErrorResponse>) ExistsIndexTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about whether a particular index template exists.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ExistsIndexTemplateRequest}
+     *
+     */
+
+    public final BooleanResponse existsIndexTemplate(
+        Function<ExistsIndexTemplateRequest.Builder, ObjectBuilder<ExistsIndexTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return existsIndexTemplate(fn.apply(new ExistsIndexTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.exists_template
+
+    /**
+     * Returns information about whether a particular index template exists.
+     *
+     *
+     */
+
+    public BooleanResponse existsTemplate(ExistsTemplateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ExistsTemplateRequest, BooleanResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ExistsTemplateRequest,
+            BooleanResponse,
+            ErrorResponse>) ExistsTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about whether a particular index template exists.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ExistsTemplateRequest}
+     *
+     */
+
+    public final BooleanResponse existsTemplate(Function<ExistsTemplateRequest.Builder, ObjectBuilder<ExistsTemplateRequest>> fn)
+        throws IOException, OpenSearchException {
+        return existsTemplate(fn.apply(new ExistsTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.flush
+
+    /**
+     * Performs the flush operation on one or more indices.
+     *
+     *
+     */
+
+    public FlushResponse flush(FlushRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<FlushRequest, FlushResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            FlushRequest,
+            FlushResponse,
+            ErrorResponse>) FlushRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Performs the flush operation on one or more indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link FlushRequest}
+     *
+     */
+
+    public final FlushResponse flush(Function<FlushRequest.Builder, ObjectBuilder<FlushRequest>> fn) throws IOException,
+        OpenSearchException {
+        return flush(fn.apply(new FlushRequest.Builder()).build());
+    }
+
+    /**
+     * Performs the flush operation on one or more indices.
+     *
+     *
+     */
+
+    public FlushResponse flush() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new FlushRequest.Builder().build(), FlushRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.forcemerge
+
+    /**
+     * Performs the force merge operation on one or more indices.
+     *
+     *
+     */
+
+    public ForcemergeResponse forcemerge(ForcemergeRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ForcemergeRequest, ForcemergeResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ForcemergeRequest,
+            ForcemergeResponse,
+            ErrorResponse>) ForcemergeRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Performs the force merge operation on one or more indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ForcemergeRequest}
+     *
+     */
+
+    public final ForcemergeResponse forcemerge(Function<ForcemergeRequest.Builder, ObjectBuilder<ForcemergeRequest>> fn) throws IOException,
+        OpenSearchException {
+        return forcemerge(fn.apply(new ForcemergeRequest.Builder()).build());
+    }
+
+    /**
+     * Performs the force merge operation on one or more indices.
+     *
+     *
+     */
+
+    public ForcemergeResponse forcemerge() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new ForcemergeRequest.Builder().build(), ForcemergeRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.get
+
+    /**
+     * Returns information about one or more indices.
+     *
+     *
+     */
+
+    public GetIndexResponse get(GetIndexRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetIndexRequest, GetIndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetIndexRequest,
+            GetIndexResponse,
+            ErrorResponse>) GetIndexRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about one or more indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetIndexRequest}
+     *
+     */
+
+    public final GetIndexResponse get(Function<GetIndexRequest.Builder, ObjectBuilder<GetIndexRequest>> fn) throws IOException,
+        OpenSearchException {
+        return get(fn.apply(new GetIndexRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.get_data_stream
+
+    /**
+     * Returns information about one or more data streams.
+     *
+     *
+     */
+
+    public GetDataStreamResponse getDataStream(GetDataStreamRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetDataStreamRequest, GetDataStreamResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetDataStreamRequest,
+            GetDataStreamResponse,
+            ErrorResponse>) GetDataStreamRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about one or more data streams.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetDataStreamRequest}
+     *
+     */
+
+    public final GetDataStreamResponse getDataStream(Function<GetDataStreamRequest.Builder, ObjectBuilder<GetDataStreamRequest>> fn)
+        throws IOException, OpenSearchException {
+        return getDataStream(fn.apply(new GetDataStreamRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about one or more data streams.
+     *
+     *
+     */
+
+    public GetDataStreamResponse getDataStream() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new GetDataStreamRequest.Builder().build(),
+            GetDataStreamRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.get_alias
+
+    /**
+     * Returns an alias.
+     *
+     *
+     */
+
+    public GetAliasResponse getAlias(GetAliasRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetAliasRequest, GetAliasResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetAliasRequest,
+            GetAliasResponse,
+            ErrorResponse>) GetAliasRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns an alias.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetAliasRequest}
+     *
+     */
+
+    public final GetAliasResponse getAlias(Function<GetAliasRequest.Builder, ObjectBuilder<GetAliasRequest>> fn) throws IOException,
+        OpenSearchException {
+        return getAlias(fn.apply(new GetAliasRequest.Builder()).build());
+    }
+
+    /**
+     * Returns an alias.
+     *
+     *
+     */
+
+    public GetAliasResponse getAlias() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new GetAliasRequest.Builder().build(), GetAliasRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.get_field_mapping
+
+    /**
+     * Returns mapping for one or more fields.
+     *
+     *
+     */
+
+    public GetFieldMappingResponse getFieldMapping(GetFieldMappingRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetFieldMappingRequest, GetFieldMappingResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetFieldMappingRequest,
+            GetFieldMappingResponse,
+            ErrorResponse>) GetFieldMappingRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns mapping for one or more fields.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetFieldMappingRequest}
+     *
+     */
+
+    public final GetFieldMappingResponse getFieldMapping(Function<GetFieldMappingRequest.Builder, ObjectBuilder<GetFieldMappingRequest>> fn)
+        throws IOException, OpenSearchException {
+        return getFieldMapping(fn.apply(new GetFieldMappingRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.get_index_template
+
+    /**
+     * Returns an index template.
+     *
+     *
+     */
+
+    public GetIndexTemplateResponse getIndexTemplate(GetIndexTemplateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetIndexTemplateRequest, GetIndexTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetIndexTemplateRequest,
+            GetIndexTemplateResponse,
+            ErrorResponse>) GetIndexTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns an index template.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetIndexTemplateRequest}
+     *
+     */
+
+    public final GetIndexTemplateResponse getIndexTemplate(
+        Function<GetIndexTemplateRequest.Builder, ObjectBuilder<GetIndexTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return getIndexTemplate(fn.apply(new GetIndexTemplateRequest.Builder()).build());
+    }
+
+    /**
+     * Returns an index template.
+     *
+     *
+     */
+
+    public GetIndexTemplateResponse getIndexTemplate() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new GetIndexTemplateRequest.Builder().build(),
+            GetIndexTemplateRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.get_mapping
+
+    /**
+     * Returns mappings for one or more indices.
+     *
+     *
+     */
+
+    public GetMappingResponse getMapping(GetMappingRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetMappingRequest, GetMappingResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetMappingRequest,
+            GetMappingResponse,
+            ErrorResponse>) GetMappingRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns mappings for one or more indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetMappingRequest}
+     *
+     */
+
+    public final GetMappingResponse getMapping(Function<GetMappingRequest.Builder, ObjectBuilder<GetMappingRequest>> fn) throws IOException,
+        OpenSearchException {
+        return getMapping(fn.apply(new GetMappingRequest.Builder()).build());
+    }
+
+    /**
+     * Returns mappings for one or more indices.
+     *
+     *
+     */
+
+    public GetMappingResponse getMapping() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new GetMappingRequest.Builder().build(), GetMappingRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.get_settings
+
+    /**
+     * Returns settings for one or more indices.
+     *
+     *
+     */
+
+    public GetIndicesSettingsResponse getSettings(GetIndicesSettingsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetIndicesSettingsRequest, GetIndicesSettingsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetIndicesSettingsRequest,
+            GetIndicesSettingsResponse,
+            ErrorResponse>) GetIndicesSettingsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns settings for one or more indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetIndicesSettingsRequest}
+     *
+     */
+
+    public final GetIndicesSettingsResponse getSettings(
+        Function<GetIndicesSettingsRequest.Builder, ObjectBuilder<GetIndicesSettingsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return getSettings(fn.apply(new GetIndicesSettingsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns settings for one or more indices.
+     *
+     *
+     */
+
+    public GetIndicesSettingsResponse getSettings() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new GetIndicesSettingsRequest.Builder().build(),
+            GetIndicesSettingsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.get_template
+
+    /**
+     * Returns an index template.
+     *
+     *
+     */
+
+    public GetTemplateResponse getTemplate(GetTemplateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetTemplateRequest, GetTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetTemplateRequest,
+            GetTemplateResponse,
+            ErrorResponse>) GetTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns an index template.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetTemplateRequest}
+     *
+     */
+
+    public final GetTemplateResponse getTemplate(Function<GetTemplateRequest.Builder, ObjectBuilder<GetTemplateRequest>> fn)
+        throws IOException, OpenSearchException {
+        return getTemplate(fn.apply(new GetTemplateRequest.Builder()).build());
+    }
+
+    /**
+     * Returns an index template.
+     *
+     *
+     */
+
+    public GetTemplateResponse getTemplate() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new GetTemplateRequest.Builder().build(), GetTemplateRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.get_upgrade
+
+    /**
+     * DEPRECATED Returns a progress status of current upgrade.
+     *
+     *
+     */
+
+    public GetUpgradeResponse getUpgrade(GetUpgradeRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetUpgradeRequest, GetUpgradeResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetUpgradeRequest,
+            GetUpgradeResponse,
+            ErrorResponse>) GetUpgradeRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * DEPRECATED Returns a progress status of current upgrade.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetUpgradeRequest}
+     *
+     */
+
+    public final GetUpgradeResponse getUpgrade(Function<GetUpgradeRequest.Builder, ObjectBuilder<GetUpgradeRequest>> fn) throws IOException,
+        OpenSearchException {
+        return getUpgrade(fn.apply(new GetUpgradeRequest.Builder()).build());
+    }
+
+    /**
+     * DEPRECATED Returns a progress status of current upgrade.
+     *
+     *
+     */
+
+    public GetUpgradeResponse getUpgrade() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new GetUpgradeRequest.Builder().build(), GetUpgradeRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.open
+
+    /**
+     * Opens an index.
+     *
+     *
+     */
+
+    public OpenResponse open(OpenRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<OpenRequest, OpenResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            OpenRequest,
+            OpenResponse,
+            ErrorResponse>) OpenRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Opens an index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link OpenRequest}
+     *
+     */
+
+    public final OpenResponse open(Function<OpenRequest.Builder, ObjectBuilder<OpenRequest>> fn) throws IOException, OpenSearchException {
+        return open(fn.apply(new OpenRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.put_alias
+
+    /**
+     * Creates or updates an alias.
+     *
+     *
+     */
+
+    public PutAliasResponse putAlias(PutAliasRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutAliasRequest, PutAliasResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutAliasRequest,
+            PutAliasResponse,
+            ErrorResponse>) PutAliasRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates or updates an alias.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutAliasRequest}
+     *
+     */
+
+    public final PutAliasResponse putAlias(Function<PutAliasRequest.Builder, ObjectBuilder<PutAliasRequest>> fn) throws IOException,
+        OpenSearchException {
+        return putAlias(fn.apply(new PutAliasRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.put_index_template
+
+    /**
+     * Creates or updates an index template.
+     *
+     *
+     */
+
+    public PutIndexTemplateResponse putIndexTemplate(PutIndexTemplateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutIndexTemplateRequest, PutIndexTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutIndexTemplateRequest,
+            PutIndexTemplateResponse,
+            ErrorResponse>) PutIndexTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates or updates an index template.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutIndexTemplateRequest}
+     *
+     */
+
+    public final PutIndexTemplateResponse putIndexTemplate(
+        Function<PutIndexTemplateRequest.Builder, ObjectBuilder<PutIndexTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return putIndexTemplate(fn.apply(new PutIndexTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.put_mapping
+
+    /**
+     * Updates the index mappings.
+     *
+     *
+     */
+
+    public PutMappingResponse putMapping(PutMappingRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutMappingRequest, PutMappingResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutMappingRequest,
+            PutMappingResponse,
+            ErrorResponse>) PutMappingRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Updates the index mappings.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutMappingRequest}
+     *
+     */
+
+    public final PutMappingResponse putMapping(Function<PutMappingRequest.Builder, ObjectBuilder<PutMappingRequest>> fn) throws IOException,
+        OpenSearchException {
+        return putMapping(fn.apply(new PutMappingRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.put_settings
+
+    /**
+     * Updates the index settings.
+     *
+     *
+     */
+
+    public PutIndicesSettingsResponse putSettings(PutIndicesSettingsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutIndicesSettingsRequest, PutIndicesSettingsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutIndicesSettingsRequest,
+            PutIndicesSettingsResponse,
+            ErrorResponse>) PutIndicesSettingsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Updates the index settings.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutIndicesSettingsRequest}
+     *
+     */
+
+    public final PutIndicesSettingsResponse putSettings(
+        Function<PutIndicesSettingsRequest.Builder, ObjectBuilder<PutIndicesSettingsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return putSettings(fn.apply(new PutIndicesSettingsRequest.Builder()).build());
+    }
+
+    /**
+     * Updates the index settings.
+     *
+     *
+     */
+
+    public PutIndicesSettingsResponse putSettings() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new PutIndicesSettingsRequest.Builder().build(),
+            PutIndicesSettingsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.put_template
+
+    /**
+     * Creates or updates an index template.
+     *
+     *
+     */
+
+    public PutTemplateResponse putTemplate(PutTemplateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutTemplateRequest, PutTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutTemplateRequest,
+            PutTemplateResponse,
+            ErrorResponse>) PutTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates or updates an index template.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutTemplateRequest}
+     *
+     */
+
+    public final PutTemplateResponse putTemplate(Function<PutTemplateRequest.Builder, ObjectBuilder<PutTemplateRequest>> fn)
+        throws IOException, OpenSearchException {
+        return putTemplate(fn.apply(new PutTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.recovery
+
+    /**
+     * Returns information about ongoing index shard recoveries.
+     *
+     *
+     */
+
+    public RecoveryResponse recovery(RecoveryRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<RecoveryRequest, RecoveryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            RecoveryRequest,
+            RecoveryResponse,
+            ErrorResponse>) RecoveryRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about ongoing index shard recoveries.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link RecoveryRequest}
+     *
+     */
+
+    public final RecoveryResponse recovery(Function<RecoveryRequest.Builder, ObjectBuilder<RecoveryRequest>> fn) throws IOException,
+        OpenSearchException {
+        return recovery(fn.apply(new RecoveryRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about ongoing index shard recoveries.
+     *
+     *
+     */
+
+    public RecoveryResponse recovery() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new RecoveryRequest.Builder().build(), RecoveryRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.refresh
+
+    /**
+     * Performs the refresh operation in one or more indices.
+     *
+     *
+     */
+
+    public RefreshResponse refresh(RefreshRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<RefreshRequest, RefreshResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            RefreshRequest,
+            RefreshResponse,
+            ErrorResponse>) RefreshRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Performs the refresh operation in one or more indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link RefreshRequest}
+     *
+     */
+
+    public final RefreshResponse refresh(Function<RefreshRequest.Builder, ObjectBuilder<RefreshRequest>> fn) throws IOException,
+        OpenSearchException {
+        return refresh(fn.apply(new RefreshRequest.Builder()).build());
+    }
+
+    /**
+     * Performs the refresh operation in one or more indices.
+     *
+     *
+     */
+
+    public RefreshResponse refresh() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new RefreshRequest.Builder().build(), RefreshRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.resolve_index
+
+    /**
+     * Returns information about any matching indices, aliases, and data streams
+     *
+     *
+     */
+
+    public ResolveIndexResponse resolveIndex(ResolveIndexRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ResolveIndexRequest, ResolveIndexResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ResolveIndexRequest,
+            ResolveIndexResponse,
+            ErrorResponse>) ResolveIndexRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about any matching indices, aliases, and data streams
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ResolveIndexRequest}
+     *
+     */
+
+    public final ResolveIndexResponse resolveIndex(Function<ResolveIndexRequest.Builder, ObjectBuilder<ResolveIndexRequest>> fn)
+        throws IOException, OpenSearchException {
+        return resolveIndex(fn.apply(new ResolveIndexRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.rollover
+
+    /**
+     * Updates an alias to point to a new index when the existing index is
+     * considered to be too large or too old.
+     *
+     *
+     */
+
+    public RolloverResponse rollover(RolloverRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<RolloverRequest, RolloverResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            RolloverRequest,
+            RolloverResponse,
+            ErrorResponse>) RolloverRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Updates an alias to point to a new index when the existing index is
+     * considered to be too large or too old.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link RolloverRequest}
+     *
+     */
+
+    public final RolloverResponse rollover(Function<RolloverRequest.Builder, ObjectBuilder<RolloverRequest>> fn) throws IOException,
+        OpenSearchException {
+        return rollover(fn.apply(new RolloverRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.segments
+
+    /**
+     * Provides low-level information about segments in a Lucene index.
+     *
+     *
+     */
+
+    public SegmentsResponse segments(SegmentsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SegmentsRequest, SegmentsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            SegmentsRequest,
+            SegmentsResponse,
+            ErrorResponse>) SegmentsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Provides low-level information about segments in a Lucene index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SegmentsRequest}
+     *
+     */
+
+    public final SegmentsResponse segments(Function<SegmentsRequest.Builder, ObjectBuilder<SegmentsRequest>> fn) throws IOException,
+        OpenSearchException {
+        return segments(fn.apply(new SegmentsRequest.Builder()).build());
+    }
+
+    /**
+     * Provides low-level information about segments in a Lucene index.
+     *
+     *
+     */
+
+    public SegmentsResponse segments() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new SegmentsRequest.Builder().build(), SegmentsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.shard_stores
+
+    /**
+     * Provides store information for shard copies of indices.
+     *
+     *
+     */
+
+    public ShardStoresResponse shardStores(ShardStoresRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ShardStoresRequest, ShardStoresResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ShardStoresRequest,
+            ShardStoresResponse,
+            ErrorResponse>) ShardStoresRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Provides store information for shard copies of indices.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ShardStoresRequest}
+     *
+     */
+
+    public final ShardStoresResponse shardStores(Function<ShardStoresRequest.Builder, ObjectBuilder<ShardStoresRequest>> fn)
+        throws IOException, OpenSearchException {
+        return shardStores(fn.apply(new ShardStoresRequest.Builder()).build());
+    }
+
+    /**
+     * Provides store information for shard copies of indices.
+     *
+     *
+     */
+
+    public ShardStoresResponse shardStores() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new ShardStoresRequest.Builder().build(), ShardStoresRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.shrink
+
+    /**
+     * Allow to shrink an existing index into a new index with fewer primary shards.
+     *
+     *
+     */
+
+    public ShrinkResponse shrink(ShrinkRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ShrinkRequest, ShrinkResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ShrinkRequest,
+            ShrinkResponse,
+            ErrorResponse>) ShrinkRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allow to shrink an existing index into a new index with fewer primary shards.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ShrinkRequest}
+     *
+     */
+
+    public final ShrinkResponse shrink(Function<ShrinkRequest.Builder, ObjectBuilder<ShrinkRequest>> fn) throws IOException,
+        OpenSearchException {
+        return shrink(fn.apply(new ShrinkRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.simulate_index_template
+
+    /**
+     * Simulate matching the given index name against the index templates in the
+     * system
+     *
+     *
+     */
+
+    public SimulateIndexTemplateResponse simulateIndexTemplate(SimulateIndexTemplateRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SimulateIndexTemplateRequest, SimulateIndexTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            SimulateIndexTemplateRequest,
+            SimulateIndexTemplateResponse,
+            ErrorResponse>) SimulateIndexTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Simulate matching the given index name against the index templates in the
+     * system
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SimulateIndexTemplateRequest}
+     *
+     */
+
+    public final SimulateIndexTemplateResponse simulateIndexTemplate(
+        Function<SimulateIndexTemplateRequest.Builder, ObjectBuilder<SimulateIndexTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return simulateIndexTemplate(fn.apply(new SimulateIndexTemplateRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.simulate_template
+
+    /**
+     * Simulate resolving the given template name or body
+     *
+     *
+     */
+
+    public SimulateTemplateResponse simulateTemplate(SimulateTemplateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SimulateTemplateRequest, SimulateTemplateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            SimulateTemplateRequest,
+            SimulateTemplateResponse,
+            ErrorResponse>) SimulateTemplateRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Simulate resolving the given template name or body
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SimulateTemplateRequest}
+     *
+     */
+
+    public final SimulateTemplateResponse simulateTemplate(
+        Function<SimulateTemplateRequest.Builder, ObjectBuilder<SimulateTemplateRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return simulateTemplate(fn.apply(new SimulateTemplateRequest.Builder()).build());
+    }
+
+    /**
+     * Simulate resolving the given template name or body
+     *
+     *
+     */
+
+    public SimulateTemplateResponse simulateTemplate() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new SimulateTemplateRequest.Builder().build(),
+            SimulateTemplateRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.split
+
+    /**
+     * Allows you to split an existing index into a new index with more primary
+     * shards.
+     *
+     *
+     */
+
+    public SplitResponse split(SplitRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SplitRequest, SplitResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            SplitRequest,
+            SplitResponse,
+            ErrorResponse>) SplitRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows you to split an existing index into a new index with more primary
+     * shards.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SplitRequest}
+     *
+     */
+
+    public final SplitResponse split(Function<SplitRequest.Builder, ObjectBuilder<SplitRequest>> fn) throws IOException,
+        OpenSearchException {
+        return split(fn.apply(new SplitRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: indices.stats
+
+    /**
+     * Provides statistics on operations happening in an index.
+     *
+     *
+     */
+
+    public IndicesStatsResponse stats(IndicesStatsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<IndicesStatsRequest, IndicesStatsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            IndicesStatsRequest,
+            IndicesStatsResponse,
+            ErrorResponse>) IndicesStatsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Provides statistics on operations happening in an index.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link IndicesStatsRequest}
+     *
+     */
+
+    public final IndicesStatsResponse stats(Function<IndicesStatsRequest.Builder, ObjectBuilder<IndicesStatsRequest>> fn)
+        throws IOException, OpenSearchException {
+        return stats(fn.apply(new IndicesStatsRequest.Builder()).build());
+    }
+
+    /**
+     * Provides statistics on operations happening in an index.
+     *
+     *
+     */
+
+    public IndicesStatsResponse stats() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new IndicesStatsRequest.Builder().build(),
+            IndicesStatsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.data_streams_stats
+
+    /**
+     * Returns statistics of data streams
+     *
+     *
+     */
+
+    public DataStreamsStatsResponse dataStreamsStats(DataStreamsStatsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DataStreamsStatsRequest, DataStreamsStatsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DataStreamsStatsRequest,
+            DataStreamsStatsResponse,
+            ErrorResponse>) DataStreamsStatsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns statistics of data streams
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DataStreamsStatsRequest}
+     *
+     */
+
+    public final DataStreamsStatsResponse dataStreamsStats(
+        Function<DataStreamsStatsRequest.Builder, ObjectBuilder<DataStreamsStatsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return dataStreamsStats(fn.apply(new DataStreamsStatsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns statistics of data streams
+     *
+     *
+     */
+
+    public DataStreamsStatsResponse dataStreamsStats() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new DataStreamsStatsRequest.Builder().build(),
+            DataStreamsStatsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.update_aliases
+
+    /**
+     * Updates index aliases.
+     *
+     *
+     */
+
+    public UpdateAliasesResponse updateAliases(UpdateAliasesRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<UpdateAliasesRequest, UpdateAliasesResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            UpdateAliasesRequest,
+            UpdateAliasesResponse,
+            ErrorResponse>) UpdateAliasesRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Updates index aliases.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link UpdateAliasesRequest}
+     *
+     */
+
+    public final UpdateAliasesResponse updateAliases(Function<UpdateAliasesRequest.Builder, ObjectBuilder<UpdateAliasesRequest>> fn)
+        throws IOException, OpenSearchException {
+        return updateAliases(fn.apply(new UpdateAliasesRequest.Builder()).build());
+    }
+
+    /**
+     * Updates index aliases.
+     *
+     *
+     */
+
+    public UpdateAliasesResponse updateAliases() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new UpdateAliasesRequest.Builder().build(),
+            UpdateAliasesRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: indices.upgrade
+
+    /**
+     * DEPRECATED Upgrades to the current version of Lucene.
+     *
+     *
+     */
+
+    public UpgradeResponse upgrade(UpgradeRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<UpgradeRequest, UpgradeResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            UpgradeRequest,
+            UpgradeResponse,
+            ErrorResponse>) UpgradeRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * DEPRECATED Upgrades to the current version of Lucene.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link UpgradeRequest}
+     *
+     */
+
+    public final UpgradeResponse upgrade(Function<UpgradeRequest.Builder, ObjectBuilder<UpgradeRequest>> fn) throws IOException,
+        OpenSearchException {
+        return upgrade(fn.apply(new UpgradeRequest.Builder()).build());
+    }
+
+    /**
+     * DEPRECATED Upgrades to the current version of Lucene.
+     *
+     *
+     */
+
+    public UpgradeResponse upgrade() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new UpgradeRequest.Builder().build(), UpgradeRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: indices.validate_query
+
+    /**
+     * Allows a user to validate a potentially expensive query without executing it.
+     *
+     *
+     */
+
+    public ValidateQueryResponse validateQuery(ValidateQueryRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ValidateQueryRequest, ValidateQueryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ValidateQueryRequest,
+            ValidateQueryResponse,
+            ErrorResponse>) ValidateQueryRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows a user to validate a potentially expensive query without executing it.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ValidateQueryRequest}
+     *
+     */
+
+    public final ValidateQueryResponse validateQuery(Function<ValidateQueryRequest.Builder, ObjectBuilder<ValidateQueryRequest>> fn)
+        throws IOException, OpenSearchException {
+        return validateQuery(fn.apply(new ValidateQueryRequest.Builder()).build());
+    }
+
+    /**
+     * Allows a user to validate a potentially expensive query without executing it.
+     *
+     *
+     */
+
+    public ValidateQueryResponse validateQuery() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new ValidateQueryRequest.Builder().build(),
+            ValidateQueryRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/OverlappingIndexTemplate.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/OverlappingIndexTemplate.java
index a1fec4227d..6224720570 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/OverlappingIndexTemplate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/OverlappingIndexTemplate.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,142 +45,137 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices._types.OverlappingIndexTemplate
 
 @JsonpDeserializable
 public class OverlappingIndexTemplate implements JsonpSerializable {
-	private final String name;
-
-	private final List<String> indexPatterns;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private OverlappingIndexTemplate(Builder builder) {
-
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.indexPatterns = ApiTypeHelper.unmodifiable(builder.indexPatterns);
-
-	}
-
-	public static OverlappingIndexTemplate of(Function<Builder, ObjectBuilder<OverlappingIndexTemplate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * API name: {@code index_patterns}
-	 */
-	public final List<String> indexPatterns() {
-		return this.indexPatterns;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		if (ApiTypeHelper.isDefined(this.indexPatterns)) {
-			generator.writeKey("index_patterns");
-			generator.writeStartArray();
-			for (String item0 : this.indexPatterns) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link OverlappingIndexTemplate}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<OverlappingIndexTemplate> {
-		private String name;
-
-		@Nullable
-		private List<String> indexPatterns;
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_patterns}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indexPatterns</code>.
-		 */
-		public final Builder indexPatterns(List<String> list) {
-			this.indexPatterns = _listAddAll(this.indexPatterns, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_patterns}
-		 * <p>
-		 * Adds one or more values to <code>indexPatterns</code>.
-		 */
-		public final Builder indexPatterns(String value, String... values) {
-			this.indexPatterns = _listAdd(this.indexPatterns, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link OverlappingIndexTemplate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public OverlappingIndexTemplate build() {
-			_checkSingleUse();
-
-			return new OverlappingIndexTemplate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link OverlappingIndexTemplate}
-	 */
-	public static final JsonpDeserializer<OverlappingIndexTemplate> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, OverlappingIndexTemplate::setupOverlappingIndexTemplateDeserializer);
-
-	protected static void setupOverlappingIndexTemplateDeserializer(
-			ObjectDeserializer<OverlappingIndexTemplate.Builder> op) {
-
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::indexPatterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"index_patterns");
-
-	}
+    private final String name;
+
+    private final List<String> indexPatterns;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private OverlappingIndexTemplate(Builder builder) {
+
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.indexPatterns = ApiTypeHelper.unmodifiable(builder.indexPatterns);
+
+    }
+
+    public static OverlappingIndexTemplate of(Function<Builder, ObjectBuilder<OverlappingIndexTemplate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * API name: {@code index_patterns}
+     */
+    public final List<String> indexPatterns() {
+        return this.indexPatterns;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        if (ApiTypeHelper.isDefined(this.indexPatterns)) {
+            generator.writeKey("index_patterns");
+            generator.writeStartArray();
+            for (String item0 : this.indexPatterns) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link OverlappingIndexTemplate}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<OverlappingIndexTemplate> {
+        private String name;
+
+        @Nullable
+        private List<String> indexPatterns;
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index_patterns}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indexPatterns</code>.
+         */
+        public final Builder indexPatterns(List<String> list) {
+            this.indexPatterns = _listAddAll(this.indexPatterns, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code index_patterns}
+         * <p>
+         * Adds one or more values to <code>indexPatterns</code>.
+         */
+        public final Builder indexPatterns(String value, String... values) {
+            this.indexPatterns = _listAdd(this.indexPatterns, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link OverlappingIndexTemplate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public OverlappingIndexTemplate build() {
+            _checkSingleUse();
+
+            return new OverlappingIndexTemplate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link OverlappingIndexTemplate}
+     */
+    public static final JsonpDeserializer<OverlappingIndexTemplate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        OverlappingIndexTemplate::setupOverlappingIndexTemplateDeserializer
+    );
+
+    protected static void setupOverlappingIndexTemplateDeserializer(ObjectDeserializer<OverlappingIndexTemplate.Builder> op) {
+
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::indexPatterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "index_patterns");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutAliasRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutAliasRequest.java
index ade44beb3f..7fd574d7b3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutAliasRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutAliasRequest.java
@@ -32,486 +32,492 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.Time;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: indices.put_alias.Request
 
 /**
  * Creates or updates an alias.
- * 
+ *
  */
 @JsonpDeserializable
 public class PutAliasRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final Query filter;
-
-	private final List<String> index;
-
-	@Nullable
-	private final String indexRouting;
-
-	@Nullable
-	private final Boolean isWriteIndex;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final String name;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final String searchRouting;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PutAliasRequest(Builder builder) {
-
-		this.filter = builder.filter;
-		this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
-		this.indexRouting = builder.indexRouting;
-		this.isWriteIndex = builder.isWriteIndex;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.routing = builder.routing;
-		this.searchRouting = builder.searchRouting;
-		this.timeout = builder.timeout;
-
-	}
-
-	public static PutAliasRequest of(Function<Builder, ObjectBuilder<PutAliasRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code filter}
-	 */
-	@Nullable
-	public final Query filter() {
-		return this.filter;
-	}
-
-	/**
-	 * Required - A comma-separated list of index names the alias should point to
-	 * (supports wildcards); use <code>_all</code> to perform the operation on all
-	 * indices.
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code index_routing}
-	 */
-	@Nullable
-	public final String indexRouting() {
-		return this.indexRouting;
-	}
-
-	/**
-	 * API name: {@code is_write_index}
-	 */
-	@Nullable
-	public final Boolean isWriteIndex() {
-		return this.isWriteIndex;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Required - The name of the alias to be created or updated
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * API name: {@code search_routing}
-	 */
-	@Nullable
-	public final String searchRouting() {
-		return this.searchRouting;
-	}
-
-	/**
-	 * Explicit timestamp for the document
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.filter != null) {
-			generator.writeKey("filter");
-			this.filter.serialize(generator, mapper);
-
-		}
-		if (this.indexRouting != null) {
-			generator.writeKey("index_routing");
-			generator.write(this.indexRouting);
-
-		}
-		if (this.isWriteIndex != null) {
-			generator.writeKey("is_write_index");
-			generator.write(this.isWriteIndex);
-
-		}
-		if (this.routing != null) {
-			generator.writeKey("routing");
-			generator.write(this.routing);
-
-		}
-		if (this.searchRouting != null) {
-			generator.writeKey("search_routing");
-			generator.write(this.searchRouting);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PutAliasRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutAliasRequest> {
-		@Nullable
-		private Query filter;
-
-		private List<String> index;
-
-		@Nullable
-		private String indexRouting;
-
-		@Nullable
-		private Boolean isWriteIndex;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		private String name;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private String searchRouting;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(@Nullable Query value) {
-			this.filter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.filter(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * Required - A comma-separated list of index names the alias should point to
-		 * (supports wildcards); use <code>_all</code> to perform the operation on all
-		 * indices.
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * Required - A comma-separated list of index names the alias should point to
-		 * (supports wildcards); use <code>_all</code> to perform the operation on all
-		 * indices.
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_routing}
-		 */
-		public final Builder indexRouting(@Nullable String value) {
-			this.indexRouting = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code is_write_index}
-		 */
-		public final Builder isWriteIndex(@Nullable Boolean value) {
-			this.isWriteIndex = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - The name of the alias to be created or updated
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code search_routing}
-		 */
-		public final Builder searchRouting(@Nullable String value) {
-			this.searchRouting = value;
-			return this;
-		}
-
-		/**
-		 * Explicit timestamp for the document
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit timestamp for the document
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link PutAliasRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutAliasRequest build() {
-			_checkSingleUse();
-
-			return new PutAliasRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PutAliasRequest}
-	 */
-	public static final JsonpDeserializer<PutAliasRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			PutAliasRequest::setupPutAliasRequestDeserializer);
-
-	protected static void setupPutAliasRequestDeserializer(ObjectDeserializer<PutAliasRequest.Builder> op) {
-
-		op.add(Builder::filter, Query._DESERIALIZER, "filter");
-		op.add(Builder::indexRouting, JsonpDeserializer.stringDeserializer(), "index_routing");
-		op.add(Builder::isWriteIndex, JsonpDeserializer.booleanDeserializer(), "is_write_index");
-		op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
-		op.add(Builder::searchRouting, JsonpDeserializer.stringDeserializer(), "search_routing");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.put_alias}".
-	 */
-	public static final Endpoint<PutAliasRequest, PutAliasResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "PUT";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-				final int _index = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _name;
-				propsSet |= _index;
-
-				if (propsSet == (_index | _name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_alias");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name, 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);
-					buf.append("/_aliases");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, PutAliasResponse._DESERIALIZER);
+    @Nullable
+    private final Query filter;
+
+    private final List<String> index;
+
+    @Nullable
+    private final String indexRouting;
+
+    @Nullable
+    private final Boolean isWriteIndex;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final String name;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final String searchRouting;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PutAliasRequest(Builder builder) {
+
+        this.filter = builder.filter;
+        this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
+        this.indexRouting = builder.indexRouting;
+        this.isWriteIndex = builder.isWriteIndex;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.routing = builder.routing;
+        this.searchRouting = builder.searchRouting;
+        this.timeout = builder.timeout;
+
+    }
+
+    public static PutAliasRequest of(Function<Builder, ObjectBuilder<PutAliasRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code filter}
+     */
+    @Nullable
+    public final Query filter() {
+        return this.filter;
+    }
+
+    /**
+     * Required - A comma-separated list of index names the alias should point to
+     * (supports wildcards); use <code>_all</code> to perform the operation on all
+     * indices.
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code index_routing}
+     */
+    @Nullable
+    public final String indexRouting() {
+        return this.indexRouting;
+    }
+
+    /**
+     * API name: {@code is_write_index}
+     */
+    @Nullable
+    public final Boolean isWriteIndex() {
+        return this.isWriteIndex;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Required - The name of the alias to be created or updated
+     * <p>
+     * API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * API name: {@code search_routing}
+     */
+    @Nullable
+    public final String searchRouting() {
+        return this.searchRouting;
+    }
+
+    /**
+     * Explicit timestamp for the document
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.filter != null) {
+            generator.writeKey("filter");
+            this.filter.serialize(generator, mapper);
+
+        }
+        if (this.indexRouting != null) {
+            generator.writeKey("index_routing");
+            generator.write(this.indexRouting);
+
+        }
+        if (this.isWriteIndex != null) {
+            generator.writeKey("is_write_index");
+            generator.write(this.isWriteIndex);
+
+        }
+        if (this.routing != null) {
+            generator.writeKey("routing");
+            generator.write(this.routing);
+
+        }
+        if (this.searchRouting != null) {
+            generator.writeKey("search_routing");
+            generator.write(this.searchRouting);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PutAliasRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutAliasRequest> {
+        @Nullable
+        private Query filter;
+
+        private List<String> index;
+
+        @Nullable
+        private String indexRouting;
+
+        @Nullable
+        private Boolean isWriteIndex;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        private String name;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private String searchRouting;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(@Nullable Query value) {
+            this.filter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.filter(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * Required - A comma-separated list of index names the alias should point to
+         * (supports wildcards); use <code>_all</code> to perform the operation on all
+         * indices.
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * Required - A comma-separated list of index names the alias should point to
+         * (supports wildcards); use <code>_all</code> to perform the operation on all
+         * indices.
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code index_routing}
+         */
+        public final Builder indexRouting(@Nullable String value) {
+            this.indexRouting = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code is_write_index}
+         */
+        public final Builder isWriteIndex(@Nullable Boolean value) {
+            this.isWriteIndex = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - The name of the alias to be created or updated
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code search_routing}
+         */
+        public final Builder searchRouting(@Nullable String value) {
+            this.searchRouting = value;
+            return this;
+        }
+
+        /**
+         * Explicit timestamp for the document
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit timestamp for the document
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link PutAliasRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutAliasRequest build() {
+            _checkSingleUse();
+
+            return new PutAliasRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PutAliasRequest}
+     */
+    public static final JsonpDeserializer<PutAliasRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PutAliasRequest::setupPutAliasRequestDeserializer
+    );
+
+    protected static void setupPutAliasRequestDeserializer(ObjectDeserializer<PutAliasRequest.Builder> op) {
+
+        op.add(Builder::filter, Query._DESERIALIZER, "filter");
+        op.add(Builder::indexRouting, JsonpDeserializer.stringDeserializer(), "index_routing");
+        op.add(Builder::isWriteIndex, JsonpDeserializer.booleanDeserializer(), "is_write_index");
+        op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
+        op.add(Builder::searchRouting, JsonpDeserializer.stringDeserializer(), "search_routing");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.put_alias}".
+     */
+    public static final Endpoint<PutAliasRequest, PutAliasResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "PUT";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+            final int _index = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _name;
+            propsSet |= _index;
+
+            if (propsSet == (_index | _name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_alias");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name, 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);
+                buf.append("/_aliases");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        PutAliasResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutAliasResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutAliasResponse.java
index fc94771ce2..aee5a38a9b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutAliasResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutAliasResponse.java
@@ -32,68 +32,67 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.put_alias.Response
 
 @JsonpDeserializable
 public class PutAliasResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private PutAliasResponse(Builder builder) {
-		super(builder);
+    private PutAliasResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static PutAliasResponse of(Function<Builder, ObjectBuilder<PutAliasResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static PutAliasResponse of(Function<Builder, ObjectBuilder<PutAliasResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link PutAliasResponse}.
-	 */
+    /**
+     * Builder for {@link PutAliasResponse}.
+     */
 
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PutAliasResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<PutAliasResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link PutAliasResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutAliasResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link PutAliasResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutAliasResponse build() {
+            _checkSingleUse();
 
-			return new PutAliasResponse(this);
-		}
-	}
+            return new PutAliasResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link PutAliasResponse}
-	 */
-	public static final JsonpDeserializer<PutAliasResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			PutAliasResponse::setupPutAliasResponseDeserializer);
+    /**
+     * Json deserializer for {@link PutAliasResponse}
+     */
+    public static final JsonpDeserializer<PutAliasResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PutAliasResponse::setupPutAliasResponseDeserializer
+    );
 
-	protected static void setupPutAliasResponseDeserializer(ObjectDeserializer<PutAliasResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+    protected static void setupPutAliasResponseDeserializer(ObjectDeserializer<PutAliasResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndexTemplateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndexTemplateRequest.java
index 4fd03a126f..91b61e989d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndexTemplateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndexTemplateRequest.java
@@ -32,9 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch.indices.put_index_template.IndexTemplateMapping;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,410 +45,409 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch.indices.put_index_template.IndexTemplateMapping;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.put_index_template.Request
 
 /**
  * Creates or updates an index template.
- * 
+ *
  */
 @JsonpDeserializable
 public class PutIndexTemplateRequest extends RequestBase implements JsonpSerializable {
-	private final Map<String, JsonData> meta;
-
-	private final List<String> composedOf;
-
-	@Nullable
-	private final DataStream dataStream;
-
-	private final List<String> indexPatterns;
-
-	private final String name;
-
-	@Nullable
-	private final Integer priority;
-
-	@Nullable
-	private final IndexTemplateMapping template;
-
-	@Nullable
-	private final Long version;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PutIndexTemplateRequest(Builder builder) {
-
-		this.meta = ApiTypeHelper.unmodifiable(builder.meta);
-		this.composedOf = ApiTypeHelper.unmodifiable(builder.composedOf);
-		this.dataStream = builder.dataStream;
-		this.indexPatterns = ApiTypeHelper.unmodifiable(builder.indexPatterns);
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.priority = builder.priority;
-		this.template = builder.template;
-		this.version = builder.version;
-
-	}
-
-	public static PutIndexTemplateRequest of(Function<Builder, ObjectBuilder<PutIndexTemplateRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code _meta}
-	 */
-	public final Map<String, JsonData> meta() {
-		return this.meta;
-	}
-
-	/**
-	 * API name: {@code composed_of}
-	 */
-	public final List<String> composedOf() {
-		return this.composedOf;
-	}
-
-	/**
-	 * API name: {@code data_stream}
-	 */
-	@Nullable
-	public final DataStream dataStream() {
-		return this.dataStream;
-	}
-
-	/**
-	 * API name: {@code index_patterns}
-	 */
-	public final List<String> indexPatterns() {
-		return this.indexPatterns;
-	}
-
-	/**
-	 * Required - Index or template name
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * API name: {@code priority}
-	 */
-	@Nullable
-	public final Integer priority() {
-		return this.priority;
-	}
-
-	/**
-	 * API name: {@code template}
-	 */
-	@Nullable
-	public final IndexTemplateMapping template() {
-		return this.template;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.meta)) {
-			generator.writeKey("_meta");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.composedOf)) {
-			generator.writeKey("composed_of");
-			generator.writeStartArray();
-			for (String item0 : this.composedOf) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.dataStream != null) {
-			generator.writeKey("data_stream");
-			this.dataStream.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.indexPatterns)) {
-			generator.writeKey("index_patterns");
-			generator.writeStartArray();
-			for (String item0 : this.indexPatterns) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.priority != null) {
-			generator.writeKey("priority");
-			generator.write(this.priority);
-
-		}
-		if (this.template != null) {
-			generator.writeKey("template");
-			this.template.serialize(generator, mapper);
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PutIndexTemplateRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutIndexTemplateRequest> {
-		@Nullable
-		private Map<String, JsonData> meta;
-
-		@Nullable
-		private List<String> composedOf;
-
-		@Nullable
-		private DataStream dataStream;
-
-		@Nullable
-		private List<String> indexPatterns;
-
-		private String name;
-
-		@Nullable
-		private Integer priority;
-
-		@Nullable
-		private IndexTemplateMapping template;
-
-		@Nullable
-		private Long version;
-
-		/**
-		 * API name: {@code _meta}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>meta</code>.
-		 */
-		public final Builder meta(Map<String, JsonData> map) {
-			this.meta = _mapPutAll(this.meta, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code _meta}
-		 * <p>
-		 * Adds an entry to <code>meta</code>.
-		 */
-		public final Builder meta(String key, JsonData value) {
-			this.meta = _mapPut(this.meta, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code composed_of}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>composedOf</code>.
-		 */
-		public final Builder composedOf(List<String> list) {
-			this.composedOf = _listAddAll(this.composedOf, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code composed_of}
-		 * <p>
-		 * Adds one or more values to <code>composedOf</code>.
-		 */
-		public final Builder composedOf(String value, String... values) {
-			this.composedOf = _listAdd(this.composedOf, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code data_stream}
-		 */
-		public final Builder dataStream(@Nullable DataStream value) {
-			this.dataStream = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code data_stream}
-		 */
-		public final Builder dataStream(Function<DataStream.Builder, ObjectBuilder<DataStream>> fn) {
-			return this.dataStream(fn.apply(new DataStream.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code index_patterns}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indexPatterns</code>.
-		 */
-		public final Builder indexPatterns(List<String> list) {
-			this.indexPatterns = _listAddAll(this.indexPatterns, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_patterns}
-		 * <p>
-		 * Adds one or more values to <code>indexPatterns</code>.
-		 */
-		public final Builder indexPatterns(String value, String... values) {
-			this.indexPatterns = _listAdd(this.indexPatterns, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Index or template name
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code priority}
-		 */
-		public final Builder priority(@Nullable Integer value) {
-			this.priority = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code template}
-		 */
-		public final Builder template(@Nullable IndexTemplateMapping value) {
-			this.template = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code template}
-		 */
-		public final Builder template(Function<IndexTemplateMapping.Builder, ObjectBuilder<IndexTemplateMapping>> fn) {
-			return this.template(fn.apply(new IndexTemplateMapping.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PutIndexTemplateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutIndexTemplateRequest build() {
-			_checkSingleUse();
-
-			return new PutIndexTemplateRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PutIndexTemplateRequest}
-	 */
-	public static final JsonpDeserializer<PutIndexTemplateRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PutIndexTemplateRequest::setupPutIndexTemplateRequestDeserializer);
-
-	protected static void setupPutIndexTemplateRequestDeserializer(
-			ObjectDeserializer<PutIndexTemplateRequest.Builder> op) {
-
-		op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
-		op.add(Builder::composedOf, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"composed_of");
-		op.add(Builder::dataStream, DataStream._DESERIALIZER, "data_stream");
-		op.add(Builder::indexPatterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"index_patterns");
-		op.add(Builder::priority, JsonpDeserializer.integerDeserializer(), "priority");
-		op.add(Builder::template, IndexTemplateMapping._DESERIALIZER, "template");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.put_index_template}".
-	 */
-	public static final Endpoint<PutIndexTemplateRequest, PutIndexTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "PUT";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _name;
-
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_index_template");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
-
-			}, SimpleEndpoint.emptyMap(), true, PutIndexTemplateResponse._DESERIALIZER);
+    private final Map<String, JsonData> meta;
+
+    private final List<String> composedOf;
+
+    @Nullable
+    private final DataStream dataStream;
+
+    private final List<String> indexPatterns;
+
+    private final String name;
+
+    @Nullable
+    private final Integer priority;
+
+    @Nullable
+    private final IndexTemplateMapping template;
+
+    @Nullable
+    private final Long version;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PutIndexTemplateRequest(Builder builder) {
+
+        this.meta = ApiTypeHelper.unmodifiable(builder.meta);
+        this.composedOf = ApiTypeHelper.unmodifiable(builder.composedOf);
+        this.dataStream = builder.dataStream;
+        this.indexPatterns = ApiTypeHelper.unmodifiable(builder.indexPatterns);
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.priority = builder.priority;
+        this.template = builder.template;
+        this.version = builder.version;
+
+    }
+
+    public static PutIndexTemplateRequest of(Function<Builder, ObjectBuilder<PutIndexTemplateRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code _meta}
+     */
+    public final Map<String, JsonData> meta() {
+        return this.meta;
+    }
+
+    /**
+     * API name: {@code composed_of}
+     */
+    public final List<String> composedOf() {
+        return this.composedOf;
+    }
+
+    /**
+     * API name: {@code data_stream}
+     */
+    @Nullable
+    public final DataStream dataStream() {
+        return this.dataStream;
+    }
+
+    /**
+     * API name: {@code index_patterns}
+     */
+    public final List<String> indexPatterns() {
+        return this.indexPatterns;
+    }
+
+    /**
+     * Required - Index or template name
+     * <p>
+     * API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * API name: {@code priority}
+     */
+    @Nullable
+    public final Integer priority() {
+        return this.priority;
+    }
+
+    /**
+     * API name: {@code template}
+     */
+    @Nullable
+    public final IndexTemplateMapping template() {
+        return this.template;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.meta)) {
+            generator.writeKey("_meta");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.composedOf)) {
+            generator.writeKey("composed_of");
+            generator.writeStartArray();
+            for (String item0 : this.composedOf) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.dataStream != null) {
+            generator.writeKey("data_stream");
+            this.dataStream.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.indexPatterns)) {
+            generator.writeKey("index_patterns");
+            generator.writeStartArray();
+            for (String item0 : this.indexPatterns) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.priority != null) {
+            generator.writeKey("priority");
+            generator.write(this.priority);
+
+        }
+        if (this.template != null) {
+            generator.writeKey("template");
+            this.template.serialize(generator, mapper);
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PutIndexTemplateRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutIndexTemplateRequest> {
+        @Nullable
+        private Map<String, JsonData> meta;
+
+        @Nullable
+        private List<String> composedOf;
+
+        @Nullable
+        private DataStream dataStream;
+
+        @Nullable
+        private List<String> indexPatterns;
+
+        private String name;
+
+        @Nullable
+        private Integer priority;
+
+        @Nullable
+        private IndexTemplateMapping template;
+
+        @Nullable
+        private Long version;
+
+        /**
+         * API name: {@code _meta}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>meta</code>.
+         */
+        public final Builder meta(Map<String, JsonData> map) {
+            this.meta = _mapPutAll(this.meta, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code _meta}
+         * <p>
+         * Adds an entry to <code>meta</code>.
+         */
+        public final Builder meta(String key, JsonData value) {
+            this.meta = _mapPut(this.meta, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code composed_of}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>composedOf</code>.
+         */
+        public final Builder composedOf(List<String> list) {
+            this.composedOf = _listAddAll(this.composedOf, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code composed_of}
+         * <p>
+         * Adds one or more values to <code>composedOf</code>.
+         */
+        public final Builder composedOf(String value, String... values) {
+            this.composedOf = _listAdd(this.composedOf, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code data_stream}
+         */
+        public final Builder dataStream(@Nullable DataStream value) {
+            this.dataStream = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code data_stream}
+         */
+        public final Builder dataStream(Function<DataStream.Builder, ObjectBuilder<DataStream>> fn) {
+            return this.dataStream(fn.apply(new DataStream.Builder()).build());
+        }
+
+        /**
+         * API name: {@code index_patterns}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indexPatterns</code>.
+         */
+        public final Builder indexPatterns(List<String> list) {
+            this.indexPatterns = _listAddAll(this.indexPatterns, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code index_patterns}
+         * <p>
+         * Adds one or more values to <code>indexPatterns</code>.
+         */
+        public final Builder indexPatterns(String value, String... values) {
+            this.indexPatterns = _listAdd(this.indexPatterns, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Index or template name
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code priority}
+         */
+        public final Builder priority(@Nullable Integer value) {
+            this.priority = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code template}
+         */
+        public final Builder template(@Nullable IndexTemplateMapping value) {
+            this.template = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code template}
+         */
+        public final Builder template(Function<IndexTemplateMapping.Builder, ObjectBuilder<IndexTemplateMapping>> fn) {
+            return this.template(fn.apply(new IndexTemplateMapping.Builder()).build());
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link PutIndexTemplateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutIndexTemplateRequest build() {
+            _checkSingleUse();
+
+            return new PutIndexTemplateRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PutIndexTemplateRequest}
+     */
+    public static final JsonpDeserializer<PutIndexTemplateRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PutIndexTemplateRequest::setupPutIndexTemplateRequestDeserializer
+    );
+
+    protected static void setupPutIndexTemplateRequestDeserializer(ObjectDeserializer<PutIndexTemplateRequest.Builder> op) {
+
+        op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
+        op.add(Builder::composedOf, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "composed_of");
+        op.add(Builder::dataStream, DataStream._DESERIALIZER, "data_stream");
+        op.add(Builder::indexPatterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "index_patterns");
+        op.add(Builder::priority, JsonpDeserializer.integerDeserializer(), "priority");
+        op.add(Builder::template, IndexTemplateMapping._DESERIALIZER, "template");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.put_index_template}".
+     */
+    public static final Endpoint<PutIndexTemplateRequest, PutIndexTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "PUT";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _name;
+
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_index_template");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        PutIndexTemplateResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndexTemplateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndexTemplateResponse.java
index 90fd7f4da4..8c979c1c9e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndexTemplateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndexTemplateResponse.java
@@ -32,69 +32,69 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.put_index_template.Response
 
 @JsonpDeserializable
 public class PutIndexTemplateResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
-
-	private PutIndexTemplateResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static PutIndexTemplateResponse of(Function<Builder, ObjectBuilder<PutIndexTemplateResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PutIndexTemplateResponse}.
-	 */
-
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PutIndexTemplateResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PutIndexTemplateResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutIndexTemplateResponse build() {
-			_checkSingleUse();
-
-			return new PutIndexTemplateResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PutIndexTemplateResponse}
-	 */
-	public static final JsonpDeserializer<PutIndexTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PutIndexTemplateResponse::setupPutIndexTemplateResponseDeserializer);
-
-	protected static void setupPutIndexTemplateResponseDeserializer(
-			ObjectDeserializer<PutIndexTemplateResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private PutIndexTemplateResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static PutIndexTemplateResponse of(Function<Builder, ObjectBuilder<PutIndexTemplateResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PutIndexTemplateResponse}.
+     */
+
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<PutIndexTemplateResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PutIndexTemplateResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutIndexTemplateResponse build() {
+            _checkSingleUse();
+
+            return new PutIndexTemplateResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PutIndexTemplateResponse}
+     */
+    public static final JsonpDeserializer<PutIndexTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PutIndexTemplateResponse::setupPutIndexTemplateResponseDeserializer
+    );
+
+    protected static void setupPutIndexTemplateResponseDeserializer(ObjectDeserializer<PutIndexTemplateResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsRequest.java
index e2f5d78000..354737287c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsRequest.java
@@ -32,497 +32,501 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.ExpandWildcard;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.ExpandWildcard;
+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.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: indices.put_settings.Request
 
 /**
  * Updates the index settings.
- * 
+ *
  */
 @JsonpDeserializable
 public class PutIndicesSettingsRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean flatSettings;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final Boolean preserveExisting;
-
-	@Nullable
-	private final Time timeout;
-
-	private final IndexSettings settings;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PutIndicesSettingsRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.flatSettings = builder.flatSettings;
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.preserveExisting = builder.preserveExisting;
-		this.timeout = builder.timeout;
-		this.settings = ApiTypeHelper.requireNonNull(builder.settings, this, "settings");
-
-	}
-
-	public static PutIndicesSettingsRequest of(Function<Builder, ObjectBuilder<PutIndicesSettingsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Return settings in flat format (default: false)
-	 * <p>
-	 * API name: {@code flat_settings}
-	 */
-	@Nullable
-	public final Boolean flatSettings() {
-		return this.flatSettings;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * A comma-separated list of index names; use <code>_all</code> or empty string
-	 * to perform the operation on all indices
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Whether to update existing settings. If set to <code>true</code> existing
-	 * settings on an index remain unchanged, the default is <code>false</code>
-	 * <p>
-	 * API name: {@code preserve_existing}
-	 */
-	@Nullable
-	public final Boolean preserveExisting() {
-		return this.preserveExisting;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Required - Request body.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final IndexSettings settings() {
-		return this.settings;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		this.settings.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PutIndicesSettingsRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutIndicesSettingsRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean flatSettings;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private List<String> index;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Boolean preserveExisting;
-
-		@Nullable
-		private Time timeout;
-
-		private IndexSettings settings;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Return settings in flat format (default: false)
-		 * <p>
-		 * API name: {@code flat_settings}
-		 */
-		public final Builder flatSettings(@Nullable Boolean value) {
-			this.flatSettings = value;
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Whether to update existing settings. If set to <code>true</code> existing
-		 * settings on an index remain unchanged, the default is <code>false</code>
-		 * <p>
-		 * API name: {@code preserve_existing}
-		 */
-		public final Builder preserveExisting(@Nullable Boolean value) {
-			this.preserveExisting = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - Request body.
-		 * <p>
-		 * API name: {@code _value_body}
-		 */
-		public final Builder settings(IndexSettings value) {
-			this.settings = value;
-			return this;
-		}
-
-		/**
-		 * Required - Request body.
-		 * <p>
-		 * API name: {@code _value_body}
-		 */
-		public final Builder settings(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
-			return this.settings(fn.apply(new IndexSettings.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link PutIndicesSettingsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutIndicesSettingsRequest build() {
-			_checkSingleUse();
-
-			return new PutIndicesSettingsRequest(this);
-		}
-	}
-
-	public static final JsonpDeserializer<PutIndicesSettingsRequest> _DESERIALIZER = createPutIndicesSettingsRequestDeserializer();
-	protected static JsonpDeserializer<PutIndicesSettingsRequest> createPutIndicesSettingsRequestDeserializer() {
-
-		JsonpDeserializer<IndexSettings> valueDeserializer = IndexSettings._DESERIALIZER;
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().settings(valueDeserializer.deserialize(parser, mapper)).build());
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.put_settings}".
-	 */
-	public static final Endpoint<PutIndicesSettingsRequest, PutIndicesSettingsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "PUT";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_settings");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_settings");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				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(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.preserveExisting != null) {
-					params.put("preserve_existing", String.valueOf(request.preserveExisting));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, PutIndicesSettingsResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean flatSettings;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final Boolean preserveExisting;
+
+    @Nullable
+    private final Time timeout;
+
+    private final IndexSettings settings;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PutIndicesSettingsRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.flatSettings = builder.flatSettings;
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.preserveExisting = builder.preserveExisting;
+        this.timeout = builder.timeout;
+        this.settings = ApiTypeHelper.requireNonNull(builder.settings, this, "settings");
+
+    }
+
+    public static PutIndicesSettingsRequest of(Function<Builder, ObjectBuilder<PutIndicesSettingsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Return settings in flat format (default: false)
+     * <p>
+     * API name: {@code flat_settings}
+     */
+    @Nullable
+    public final Boolean flatSettings() {
+        return this.flatSettings;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * A comma-separated list of index names; use <code>_all</code> or empty string
+     * to perform the operation on all indices
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Whether to update existing settings. If set to <code>true</code> existing
+     * settings on an index remain unchanged, the default is <code>false</code>
+     * <p>
+     * API name: {@code preserve_existing}
+     */
+    @Nullable
+    public final Boolean preserveExisting() {
+        return this.preserveExisting;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Required - Request body.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final IndexSettings settings() {
+        return this.settings;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        this.settings.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PutIndicesSettingsRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutIndicesSettingsRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean flatSettings;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private List<String> index;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Boolean preserveExisting;
+
+        @Nullable
+        private Time timeout;
+
+        private IndexSettings settings;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Return settings in flat format (default: false)
+         * <p>
+         * API name: {@code flat_settings}
+         */
+        public final Builder flatSettings(@Nullable Boolean value) {
+            this.flatSettings = value;
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Whether to update existing settings. If set to <code>true</code> existing
+         * settings on an index remain unchanged, the default is <code>false</code>
+         * <p>
+         * API name: {@code preserve_existing}
+         */
+        public final Builder preserveExisting(@Nullable Boolean value) {
+            this.preserveExisting = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - Request body.
+         * <p>
+         * API name: {@code _value_body}
+         */
+        public final Builder settings(IndexSettings value) {
+            this.settings = value;
+            return this;
+        }
+
+        /**
+         * Required - Request body.
+         * <p>
+         * API name: {@code _value_body}
+         */
+        public final Builder settings(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
+            return this.settings(fn.apply(new IndexSettings.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link PutIndicesSettingsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutIndicesSettingsRequest build() {
+            _checkSingleUse();
+
+            return new PutIndicesSettingsRequest(this);
+        }
+    }
+
+    public static final JsonpDeserializer<PutIndicesSettingsRequest> _DESERIALIZER = createPutIndicesSettingsRequestDeserializer();
+
+    protected static JsonpDeserializer<PutIndicesSettingsRequest> createPutIndicesSettingsRequestDeserializer() {
+
+        JsonpDeserializer<IndexSettings> valueDeserializer = IndexSettings._DESERIALIZER;
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().settings(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.put_settings}".
+     */
+    public static final Endpoint<PutIndicesSettingsRequest, PutIndicesSettingsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "PUT";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_settings");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_settings");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            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(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.preserveExisting != null) {
+                params.put("preserve_existing", String.valueOf(request.preserveExisting));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        PutIndicesSettingsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsResponse.java
index 68a62809b1..39a4a769cf 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutIndicesSettingsResponse.java
@@ -32,69 +32,69 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.put_settings.Response
 
 @JsonpDeserializable
 public class PutIndicesSettingsResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
-
-	private PutIndicesSettingsResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static PutIndicesSettingsResponse of(Function<Builder, ObjectBuilder<PutIndicesSettingsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PutIndicesSettingsResponse}.
-	 */
-
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PutIndicesSettingsResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PutIndicesSettingsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutIndicesSettingsResponse build() {
-			_checkSingleUse();
-
-			return new PutIndicesSettingsResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PutIndicesSettingsResponse}
-	 */
-	public static final JsonpDeserializer<PutIndicesSettingsResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PutIndicesSettingsResponse::setupPutIndicesSettingsResponseDeserializer);
-
-	protected static void setupPutIndicesSettingsResponseDeserializer(
-			ObjectDeserializer<PutIndicesSettingsResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private PutIndicesSettingsResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static PutIndicesSettingsResponse of(Function<Builder, ObjectBuilder<PutIndicesSettingsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PutIndicesSettingsResponse}.
+     */
+
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<PutIndicesSettingsResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PutIndicesSettingsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutIndicesSettingsResponse build() {
+            _checkSingleUse();
+
+            return new PutIndicesSettingsResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PutIndicesSettingsResponse}
+     */
+    public static final JsonpDeserializer<PutIndicesSettingsResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PutIndicesSettingsResponse::setupPutIndicesSettingsResponseDeserializer
+    );
+
+    protected static void setupPutIndicesSettingsResponseDeserializer(ObjectDeserializer<PutIndicesSettingsResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutMappingRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutMappingRequest.java
index 99b2951846..a3ba45706d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutMappingRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutMappingRequest.java
@@ -32,6 +32,20 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonData;
+import org.opensearch.client.json.JsonpDeserializable;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.json.ObjectBuilderDeserializer;
+import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -41,927 +55,920 @@
 import org.opensearch.client.opensearch._types.mapping.FieldNamesField;
 import org.opensearch.client.opensearch._types.mapping.Property;
 import org.opensearch.client.opensearch._types.mapping.RoutingField;
-import org.opensearch.client.opensearch._types.mapping.RuntimeField;
 import org.opensearch.client.opensearch._types.mapping.SourceField;
-import org.opensearch.client.json.JsonData;
-import org.opensearch.client.json.JsonpDeserializable;
-import org.opensearch.client.json.JsonpDeserializer;
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
-import org.opensearch.client.json.ObjectBuilderDeserializer;
-import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: indices.put_mapping.Request
 
 /**
  * Updates the index mappings.
- * 
+ *
  */
 @JsonpDeserializable
 public class PutMappingRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final FieldNamesField fieldNames;
+    @Nullable
+    private final FieldNamesField fieldNames;
 
-	private final Map<String, JsonData> meta;
-
-	@Nullable
-	private final RoutingField routing;
-
-	@Nullable
-	private final SourceField source;
-
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	@Nullable
-	private final Boolean dateDetection;
-
-	@Nullable
-	private final DynamicMapping dynamic;
-
-	private final List<String> dynamicDateFormats;
-
-	private final List<Map<String, DynamicTemplate>> dynamicTemplates;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final Boolean numericDetection;
-
-	private final Map<String, Property> properties;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final Boolean writeIndexOnly;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PutMappingRequest(Builder builder) {
-
-		this.fieldNames = builder.fieldNames;
-		this.meta = ApiTypeHelper.unmodifiable(builder.meta);
-		this.routing = builder.routing;
-		this.source = builder.source;
-		this.allowNoIndices = builder.allowNoIndices;
-		this.dateDetection = builder.dateDetection;
-		this.dynamic = builder.dynamic;
-		this.dynamicDateFormats = ApiTypeHelper.unmodifiable(builder.dynamicDateFormats);
-		this.dynamicTemplates = ApiTypeHelper.unmodifiable(builder.dynamicTemplates);
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.numericDetection = builder.numericDetection;
-		this.properties = ApiTypeHelper.unmodifiable(builder.properties);
-		this.timeout = builder.timeout;
-		this.writeIndexOnly = builder.writeIndexOnly;
-
-	}
-
-	public static PutMappingRequest of(Function<Builder, ObjectBuilder<PutMappingRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Control whether field names are enabled for the index.
-	 * <p>
-	 * API name: {@code _field_names}
-	 */
-	@Nullable
-	public final FieldNamesField fieldNames() {
-		return this.fieldNames;
-	}
-
-	/**
-	 * A mapping type can have custom meta data associated with it. These are not
-	 * used at all by Elasticsearch, but can be used to store application-specific
-	 * metadata.
-	 * <p>
-	 * API name: {@code _meta}
-	 */
-	public final Map<String, JsonData> meta() {
-		return this.meta;
-	}
-
-	/**
-	 * Enable making a routing value required on indexed documents.
-	 * <p>
-	 * API name: {@code _routing}
-	 */
-	@Nullable
-	public final RoutingField routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Control whether the _source field is enabled on the index.
-	 * <p>
-	 * API name: {@code _source}
-	 */
-	@Nullable
-	public final SourceField source() {
-		return this.source;
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Controls whether dynamic date detection is enabled.
-	 * <p>
-	 * API name: {@code date_detection}
-	 */
-	@Nullable
-	public final Boolean dateDetection() {
-		return this.dateDetection;
-	}
-
-	/**
-	 * Controls whether new fields are added dynamically.
-	 * <p>
-	 * API name: {@code dynamic}
-	 */
-	@Nullable
-	public final DynamicMapping dynamic() {
-		return this.dynamic;
-	}
-
-	/**
-	 * If date detection is enabled then new string fields are checked against
-	 * 'dynamic_date_formats' and if the value matches then a new date field is
-	 * added instead of string.
-	 * <p>
-	 * API name: {@code dynamic_date_formats}
-	 */
-	public final List<String> dynamicDateFormats() {
-		return this.dynamicDateFormats;
-	}
-
-	/**
-	 * Specify dynamic templates for the mapping.
-	 * <p>
-	 * API name: {@code dynamic_templates}
-	 */
-	public final List<Map<String, DynamicTemplate>> dynamicTemplates() {
-		return this.dynamicTemplates;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * Required - A comma-separated list of index names the mapping should be added
-	 * to (supports wildcards); use <code>_all</code> or omit to add the mapping on
-	 * all indices.
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Automatically map strings into numeric data types for all fields.
-	 * <p>
-	 * API name: {@code numeric_detection}
-	 */
-	@Nullable
-	public final Boolean numericDetection() {
-		return this.numericDetection;
-	}
-
-	/**
-	 * Mapping for a field. For new fields, this mapping can include:
-	 * <ul>
-	 * <li>Field name</li>
-	 * <li>Field data type</li>
-	 * <li>Mapping parameters</li>
-	 * </ul>
-	 * <p>
-	 * API name: {@code properties}
-	 */
-	public final Map<String, Property> properties() {
-		return this.properties;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * When true, applies mappings only to the write index of an alias or data
-	 * stream
-	 * <p>
-	 * API name: {@code write_index_only}
-	 */
-	@Nullable
-	public final Boolean writeIndexOnly() {
-		return this.writeIndexOnly;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.fieldNames != null) {
-			generator.writeKey("_field_names");
-			this.fieldNames.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.meta)) {
-			generator.writeKey("_meta");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.routing != null) {
-			generator.writeKey("_routing");
-			this.routing.serialize(generator, mapper);
-
-		}
-		if (this.source != null) {
-			generator.writeKey("_source");
-			this.source.serialize(generator, mapper);
-
-		}
-		if (this.dateDetection != null) {
-			generator.writeKey("date_detection");
-			generator.write(this.dateDetection);
-
-		}
-		if (this.dynamic != null) {
-			generator.writeKey("dynamic");
-			this.dynamic.serialize(generator, mapper);
-		}
-		if (ApiTypeHelper.isDefined(this.dynamicDateFormats)) {
-			generator.writeKey("dynamic_date_formats");
-			generator.writeStartArray();
-			for (String item0 : this.dynamicDateFormats) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.dynamicTemplates)) {
-			generator.writeKey("dynamic_templates");
-			generator.writeStartArray();
-			for (Map<String, DynamicTemplate> item0 : this.dynamicTemplates) {
-				generator.writeStartObject();
-				if (item0 != null) {
-					for (Map.Entry<String, DynamicTemplate> item1 : item0.entrySet()) {
-						generator.writeKey(item1.getKey());
-						item1.getValue().serialize(generator, mapper);
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.numericDetection != null) {
-			generator.writeKey("numeric_detection");
-			generator.write(this.numericDetection);
-
-		}
-		if (ApiTypeHelper.isDefined(this.properties)) {
-			generator.writeKey("properties");
-			generator.writeStartObject();
-			for (Map.Entry<String, Property> item0 : this.properties.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PutMappingRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutMappingRequest> {
-		@Nullable
-		private FieldNamesField fieldNames;
-
-		@Nullable
-		private Map<String, JsonData> meta;
-
-		@Nullable
-		private RoutingField routing;
-
-		@Nullable
-		private SourceField source;
-
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private Boolean dateDetection;
-
-		@Nullable
-		private DynamicMapping dynamic;
-
-		@Nullable
-		private List<String> dynamicDateFormats;
-
-		@Nullable
-		private List<Map<String, DynamicTemplate>> dynamicTemplates;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		private List<String> index;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Boolean numericDetection;
-
-		@Nullable
-		private Map<String, Property> properties;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private Boolean writeIndexOnly;
-
-		/**
-		 * Control whether field names are enabled for the index.
-		 * <p>
-		 * API name: {@code _field_names}
-		 */
-		public final Builder fieldNames(@Nullable FieldNamesField value) {
-			this.fieldNames = value;
-			return this;
-		}
-
-		/**
-		 * Control whether field names are enabled for the index.
-		 * <p>
-		 * API name: {@code _field_names}
-		 */
-		public final Builder fieldNames(Function<FieldNamesField.Builder, ObjectBuilder<FieldNamesField>> fn) {
-			return this.fieldNames(fn.apply(new FieldNamesField.Builder()).build());
-		}
-
-		/**
-		 * A mapping type can have custom meta data associated with it. These are not
-		 * used at all by Elasticsearch, but can be used to store application-specific
-		 * metadata.
-		 * <p>
-		 * API name: {@code _meta}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>meta</code>.
-		 */
-		public final Builder meta(Map<String, JsonData> map) {
-			this.meta = _mapPutAll(this.meta, map);
-			return this;
-		}
-
-		/**
-		 * A mapping type can have custom meta data associated with it. These are not
-		 * used at all by Elasticsearch, but can be used to store application-specific
-		 * metadata.
-		 * <p>
-		 * API name: {@code _meta}
-		 * <p>
-		 * Adds an entry to <code>meta</code>.
-		 */
-		public final Builder meta(String key, JsonData value) {
-			this.meta = _mapPut(this.meta, key, value);
-			return this;
-		}
-
-		/**
-		 * Enable making a routing value required on indexed documents.
-		 * <p>
-		 * API name: {@code _routing}
-		 */
-		public final Builder routing(@Nullable RoutingField value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Enable making a routing value required on indexed documents.
-		 * <p>
-		 * API name: {@code _routing}
-		 */
-		public final Builder routing(Function<RoutingField.Builder, ObjectBuilder<RoutingField>> fn) {
-			return this.routing(fn.apply(new RoutingField.Builder()).build());
-		}
-
-		/**
-		 * Control whether the _source field is enabled on the index.
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(@Nullable SourceField value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * Control whether the _source field is enabled on the index.
-		 * <p>
-		 * API name: {@code _source}
-		 */
-		public final Builder source(Function<SourceField.Builder, ObjectBuilder<SourceField>> fn) {
-			return this.source(fn.apply(new SourceField.Builder()).build());
-		}
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Controls whether dynamic date detection is enabled.
-		 * <p>
-		 * API name: {@code date_detection}
-		 */
-		public final Builder dateDetection(@Nullable Boolean value) {
-			this.dateDetection = value;
-			return this;
-		}
-
-		/**
-		 * Controls whether new fields are added dynamically.
-		 * <p>
-		 * API name: {@code dynamic}
-		 */
-		public final Builder dynamic(@Nullable DynamicMapping value) {
-			this.dynamic = value;
-			return this;
-		}
-
-		/**
-		 * If date detection is enabled then new string fields are checked against
-		 * 'dynamic_date_formats' and if the value matches then a new date field is
-		 * added instead of string.
-		 * <p>
-		 * API name: {@code dynamic_date_formats}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>dynamicDateFormats</code>.
-		 */
-		public final Builder dynamicDateFormats(List<String> list) {
-			this.dynamicDateFormats = _listAddAll(this.dynamicDateFormats, list);
-			return this;
-		}
-
-		/**
-		 * If date detection is enabled then new string fields are checked against
-		 * 'dynamic_date_formats' and if the value matches then a new date field is
-		 * added instead of string.
-		 * <p>
-		 * API name: {@code dynamic_date_formats}
-		 * <p>
-		 * Adds one or more values to <code>dynamicDateFormats</code>.
-		 */
-		public final Builder dynamicDateFormats(String value, String... values) {
-			this.dynamicDateFormats = _listAdd(this.dynamicDateFormats, value, values);
-			return this;
-		}
-
-		/**
-		 * Specify dynamic templates for the mapping.
-		 * <p>
-		 * API name: {@code dynamic_templates}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>dynamicTemplates</code>.
-		 */
-		public final Builder dynamicTemplates(List<Map<String, DynamicTemplate>> list) {
-			this.dynamicTemplates = _listAddAll(this.dynamicTemplates, list);
-			return this;
-		}
-
-		/**
-		 * Specify dynamic templates for the mapping.
-		 * <p>
-		 * API name: {@code dynamic_templates}
-		 * <p>
-		 * Adds one or more values to <code>dynamicTemplates</code>.
-		 */
-		public final Builder dynamicTemplates(Map<String, DynamicTemplate> value,
-				Map<String, DynamicTemplate>... values) {
-			this.dynamicTemplates = _listAdd(this.dynamicTemplates, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Required - A comma-separated list of index names the mapping should be added
-		 * to (supports wildcards); use <code>_all</code> or omit to add the mapping on
-		 * all indices.
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * Required - A comma-separated list of index names the mapping should be added
-		 * to (supports wildcards); use <code>_all</code> or omit to add the mapping on
-		 * all indices.
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Automatically map strings into numeric data types for all fields.
-		 * <p>
-		 * API name: {@code numeric_detection}
-		 */
-		public final Builder numericDetection(@Nullable Boolean value) {
-			this.numericDetection = value;
-			return this;
-		}
-
-		/**
-		 * Mapping for a field. For new fields, this mapping can include:
-		 * <ul>
-		 * <li>Field name</li>
-		 * <li>Field data type</li>
-		 * <li>Mapping parameters</li>
-		 * </ul>
-		 * <p>
-		 * API name: {@code properties}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>properties</code>.
-		 */
-		public final Builder properties(Map<String, Property> map) {
-			this.properties = _mapPutAll(this.properties, map);
-			return this;
-		}
-
-		/**
-		 * Mapping for a field. For new fields, this mapping can include:
-		 * <ul>
-		 * <li>Field name</li>
-		 * <li>Field data type</li>
-		 * <li>Mapping parameters</li>
-		 * </ul>
-		 * <p>
-		 * API name: {@code properties}
-		 * <p>
-		 * Adds an entry to <code>properties</code>.
-		 */
-		public final Builder properties(String key, Property value) {
-			this.properties = _mapPut(this.properties, key, value);
-			return this;
-		}
-
-		/**
-		 * Mapping for a field. For new fields, this mapping can include:
-		 * <ul>
-		 * <li>Field name</li>
-		 * <li>Field data type</li>
-		 * <li>Mapping parameters</li>
-		 * </ul>
-		 * <p>
-		 * API name: {@code properties}
-		 * <p>
-		 * Adds an entry to <code>properties</code> using a builder lambda.
-		 */
-		public final Builder properties(String key, Function<Property.Builder, ObjectBuilder<Property>> fn) {
-			return properties(key, fn.apply(new Property.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * When true, applies mappings only to the write index of an alias or data
-		 * stream
-		 * <p>
-		 * API name: {@code write_index_only}
-		 */
-		public final Builder writeIndexOnly(@Nullable Boolean value) {
-			this.writeIndexOnly = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PutMappingRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutMappingRequest build() {
-			_checkSingleUse();
-
-			return new PutMappingRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PutMappingRequest}
-	 */
-	public static final JsonpDeserializer<PutMappingRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PutMappingRequest::setupPutMappingRequestDeserializer);
-
-	protected static void setupPutMappingRequestDeserializer(ObjectDeserializer<PutMappingRequest.Builder> op) {
-
-		op.add(Builder::fieldNames, FieldNamesField._DESERIALIZER, "_field_names");
-		op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
-		op.add(Builder::routing, RoutingField._DESERIALIZER, "_routing");
-		op.add(Builder::source, SourceField._DESERIALIZER, "_source");
-		op.add(Builder::dateDetection, JsonpDeserializer.booleanDeserializer(), "date_detection");
-		op.add(Builder::dynamic, DynamicMapping._DESERIALIZER, "dynamic");
-		op.add(Builder::dynamicDateFormats, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"dynamic_date_formats");
-		op.add(Builder::dynamicTemplates, JsonpDeserializer.arrayDeserializer(
-				JsonpDeserializer.stringMapDeserializer(DynamicTemplate._DESERIALIZER)), "dynamic_templates");
-		op.add(Builder::numericDetection, JsonpDeserializer.booleanDeserializer(), "numeric_detection");
-		op.add(Builder::properties, JsonpDeserializer.stringMapDeserializer(Property._DESERIALIZER), "properties");
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.put_mapping}".
-	 */
-	public static final Endpoint<PutMappingRequest, PutMappingResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "PUT";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_mapping");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_mappings");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.writeIndexOnly != null) {
-					params.put("write_index_only", String.valueOf(request.writeIndexOnly));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, PutMappingResponse._DESERIALIZER);
+    private final Map<String, JsonData> meta;
+
+    @Nullable
+    private final RoutingField routing;
+
+    @Nullable
+    private final SourceField source;
+
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    @Nullable
+    private final Boolean dateDetection;
+
+    @Nullable
+    private final DynamicMapping dynamic;
+
+    private final List<String> dynamicDateFormats;
+
+    private final List<Map<String, DynamicTemplate>> dynamicTemplates;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final Boolean numericDetection;
+
+    private final Map<String, Property> properties;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final Boolean writeIndexOnly;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PutMappingRequest(Builder builder) {
+
+        this.fieldNames = builder.fieldNames;
+        this.meta = ApiTypeHelper.unmodifiable(builder.meta);
+        this.routing = builder.routing;
+        this.source = builder.source;
+        this.allowNoIndices = builder.allowNoIndices;
+        this.dateDetection = builder.dateDetection;
+        this.dynamic = builder.dynamic;
+        this.dynamicDateFormats = ApiTypeHelper.unmodifiable(builder.dynamicDateFormats);
+        this.dynamicTemplates = ApiTypeHelper.unmodifiable(builder.dynamicTemplates);
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.numericDetection = builder.numericDetection;
+        this.properties = ApiTypeHelper.unmodifiable(builder.properties);
+        this.timeout = builder.timeout;
+        this.writeIndexOnly = builder.writeIndexOnly;
+
+    }
+
+    public static PutMappingRequest of(Function<Builder, ObjectBuilder<PutMappingRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Control whether field names are enabled for the index.
+     * <p>
+     * API name: {@code _field_names}
+     */
+    @Nullable
+    public final FieldNamesField fieldNames() {
+        return this.fieldNames;
+    }
+
+    /**
+     * A mapping type can have custom meta data associated with it. These are not
+     * used at all by Elasticsearch, but can be used to store application-specific
+     * metadata.
+     * <p>
+     * API name: {@code _meta}
+     */
+    public final Map<String, JsonData> meta() {
+        return this.meta;
+    }
+
+    /**
+     * Enable making a routing value required on indexed documents.
+     * <p>
+     * API name: {@code _routing}
+     */
+    @Nullable
+    public final RoutingField routing() {
+        return this.routing;
+    }
+
+    /**
+     * Control whether the _source field is enabled on the index.
+     * <p>
+     * API name: {@code _source}
+     */
+    @Nullable
+    public final SourceField source() {
+        return this.source;
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Controls whether dynamic date detection is enabled.
+     * <p>
+     * API name: {@code date_detection}
+     */
+    @Nullable
+    public final Boolean dateDetection() {
+        return this.dateDetection;
+    }
+
+    /**
+     * Controls whether new fields are added dynamically.
+     * <p>
+     * API name: {@code dynamic}
+     */
+    @Nullable
+    public final DynamicMapping dynamic() {
+        return this.dynamic;
+    }
+
+    /**
+     * If date detection is enabled then new string fields are checked against
+     * 'dynamic_date_formats' and if the value matches then a new date field is
+     * added instead of string.
+     * <p>
+     * API name: {@code dynamic_date_formats}
+     */
+    public final List<String> dynamicDateFormats() {
+        return this.dynamicDateFormats;
+    }
+
+    /**
+     * Specify dynamic templates for the mapping.
+     * <p>
+     * API name: {@code dynamic_templates}
+     */
+    public final List<Map<String, DynamicTemplate>> dynamicTemplates() {
+        return this.dynamicTemplates;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * Required - A comma-separated list of index names the mapping should be added
+     * to (supports wildcards); use <code>_all</code> or omit to add the mapping on
+     * all indices.
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Automatically map strings into numeric data types for all fields.
+     * <p>
+     * API name: {@code numeric_detection}
+     */
+    @Nullable
+    public final Boolean numericDetection() {
+        return this.numericDetection;
+    }
+
+    /**
+     * Mapping for a field. For new fields, this mapping can include:
+     * <ul>
+     * <li>Field name</li>
+     * <li>Field data type</li>
+     * <li>Mapping parameters</li>
+     * </ul>
+     * <p>
+     * API name: {@code properties}
+     */
+    public final Map<String, Property> properties() {
+        return this.properties;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * When true, applies mappings only to the write index of an alias or data
+     * stream
+     * <p>
+     * API name: {@code write_index_only}
+     */
+    @Nullable
+    public final Boolean writeIndexOnly() {
+        return this.writeIndexOnly;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.fieldNames != null) {
+            generator.writeKey("_field_names");
+            this.fieldNames.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.meta)) {
+            generator.writeKey("_meta");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.routing != null) {
+            generator.writeKey("_routing");
+            this.routing.serialize(generator, mapper);
+
+        }
+        if (this.source != null) {
+            generator.writeKey("_source");
+            this.source.serialize(generator, mapper);
+
+        }
+        if (this.dateDetection != null) {
+            generator.writeKey("date_detection");
+            generator.write(this.dateDetection);
+
+        }
+        if (this.dynamic != null) {
+            generator.writeKey("dynamic");
+            this.dynamic.serialize(generator, mapper);
+        }
+        if (ApiTypeHelper.isDefined(this.dynamicDateFormats)) {
+            generator.writeKey("dynamic_date_formats");
+            generator.writeStartArray();
+            for (String item0 : this.dynamicDateFormats) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.dynamicTemplates)) {
+            generator.writeKey("dynamic_templates");
+            generator.writeStartArray();
+            for (Map<String, DynamicTemplate> item0 : this.dynamicTemplates) {
+                generator.writeStartObject();
+                if (item0 != null) {
+                    for (Map.Entry<String, DynamicTemplate> item1 : item0.entrySet()) {
+                        generator.writeKey(item1.getKey());
+                        item1.getValue().serialize(generator, mapper);
+
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.numericDetection != null) {
+            generator.writeKey("numeric_detection");
+            generator.write(this.numericDetection);
+
+        }
+        if (ApiTypeHelper.isDefined(this.properties)) {
+            generator.writeKey("properties");
+            generator.writeStartObject();
+            for (Map.Entry<String, Property> item0 : this.properties.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PutMappingRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutMappingRequest> {
+        @Nullable
+        private FieldNamesField fieldNames;
+
+        @Nullable
+        private Map<String, JsonData> meta;
+
+        @Nullable
+        private RoutingField routing;
+
+        @Nullable
+        private SourceField source;
+
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private Boolean dateDetection;
+
+        @Nullable
+        private DynamicMapping dynamic;
+
+        @Nullable
+        private List<String> dynamicDateFormats;
+
+        @Nullable
+        private List<Map<String, DynamicTemplate>> dynamicTemplates;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        private List<String> index;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Boolean numericDetection;
+
+        @Nullable
+        private Map<String, Property> properties;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private Boolean writeIndexOnly;
+
+        /**
+         * Control whether field names are enabled for the index.
+         * <p>
+         * API name: {@code _field_names}
+         */
+        public final Builder fieldNames(@Nullable FieldNamesField value) {
+            this.fieldNames = value;
+            return this;
+        }
+
+        /**
+         * Control whether field names are enabled for the index.
+         * <p>
+         * API name: {@code _field_names}
+         */
+        public final Builder fieldNames(Function<FieldNamesField.Builder, ObjectBuilder<FieldNamesField>> fn) {
+            return this.fieldNames(fn.apply(new FieldNamesField.Builder()).build());
+        }
+
+        /**
+         * A mapping type can have custom meta data associated with it. These are not
+         * used at all by Elasticsearch, but can be used to store application-specific
+         * metadata.
+         * <p>
+         * API name: {@code _meta}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>meta</code>.
+         */
+        public final Builder meta(Map<String, JsonData> map) {
+            this.meta = _mapPutAll(this.meta, map);
+            return this;
+        }
+
+        /**
+         * A mapping type can have custom meta data associated with it. These are not
+         * used at all by Elasticsearch, but can be used to store application-specific
+         * metadata.
+         * <p>
+         * API name: {@code _meta}
+         * <p>
+         * Adds an entry to <code>meta</code>.
+         */
+        public final Builder meta(String key, JsonData value) {
+            this.meta = _mapPut(this.meta, key, value);
+            return this;
+        }
+
+        /**
+         * Enable making a routing value required on indexed documents.
+         * <p>
+         * API name: {@code _routing}
+         */
+        public final Builder routing(@Nullable RoutingField value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Enable making a routing value required on indexed documents.
+         * <p>
+         * API name: {@code _routing}
+         */
+        public final Builder routing(Function<RoutingField.Builder, ObjectBuilder<RoutingField>> fn) {
+            return this.routing(fn.apply(new RoutingField.Builder()).build());
+        }
+
+        /**
+         * Control whether the _source field is enabled on the index.
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(@Nullable SourceField value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * Control whether the _source field is enabled on the index.
+         * <p>
+         * API name: {@code _source}
+         */
+        public final Builder source(Function<SourceField.Builder, ObjectBuilder<SourceField>> fn) {
+            return this.source(fn.apply(new SourceField.Builder()).build());
+        }
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Controls whether dynamic date detection is enabled.
+         * <p>
+         * API name: {@code date_detection}
+         */
+        public final Builder dateDetection(@Nullable Boolean value) {
+            this.dateDetection = value;
+            return this;
+        }
+
+        /**
+         * Controls whether new fields are added dynamically.
+         * <p>
+         * API name: {@code dynamic}
+         */
+        public final Builder dynamic(@Nullable DynamicMapping value) {
+            this.dynamic = value;
+            return this;
+        }
+
+        /**
+         * If date detection is enabled then new string fields are checked against
+         * 'dynamic_date_formats' and if the value matches then a new date field is
+         * added instead of string.
+         * <p>
+         * API name: {@code dynamic_date_formats}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>dynamicDateFormats</code>.
+         */
+        public final Builder dynamicDateFormats(List<String> list) {
+            this.dynamicDateFormats = _listAddAll(this.dynamicDateFormats, list);
+            return this;
+        }
+
+        /**
+         * If date detection is enabled then new string fields are checked against
+         * 'dynamic_date_formats' and if the value matches then a new date field is
+         * added instead of string.
+         * <p>
+         * API name: {@code dynamic_date_formats}
+         * <p>
+         * Adds one or more values to <code>dynamicDateFormats</code>.
+         */
+        public final Builder dynamicDateFormats(String value, String... values) {
+            this.dynamicDateFormats = _listAdd(this.dynamicDateFormats, value, values);
+            return this;
+        }
+
+        /**
+         * Specify dynamic templates for the mapping.
+         * <p>
+         * API name: {@code dynamic_templates}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>dynamicTemplates</code>.
+         */
+        public final Builder dynamicTemplates(List<Map<String, DynamicTemplate>> list) {
+            this.dynamicTemplates = _listAddAll(this.dynamicTemplates, list);
+            return this;
+        }
+
+        /**
+         * Specify dynamic templates for the mapping.
+         * <p>
+         * API name: {@code dynamic_templates}
+         * <p>
+         * Adds one or more values to <code>dynamicTemplates</code>.
+         */
+        public final Builder dynamicTemplates(Map<String, DynamicTemplate> value, Map<String, DynamicTemplate>... values) {
+            this.dynamicTemplates = _listAdd(this.dynamicTemplates, value, values);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Required - A comma-separated list of index names the mapping should be added
+         * to (supports wildcards); use <code>_all</code> or omit to add the mapping on
+         * all indices.
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * Required - A comma-separated list of index names the mapping should be added
+         * to (supports wildcards); use <code>_all</code> or omit to add the mapping on
+         * all indices.
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Automatically map strings into numeric data types for all fields.
+         * <p>
+         * API name: {@code numeric_detection}
+         */
+        public final Builder numericDetection(@Nullable Boolean value) {
+            this.numericDetection = value;
+            return this;
+        }
+
+        /**
+         * Mapping for a field. For new fields, this mapping can include:
+         * <ul>
+         * <li>Field name</li>
+         * <li>Field data type</li>
+         * <li>Mapping parameters</li>
+         * </ul>
+         * <p>
+         * API name: {@code properties}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>properties</code>.
+         */
+        public final Builder properties(Map<String, Property> map) {
+            this.properties = _mapPutAll(this.properties, map);
+            return this;
+        }
+
+        /**
+         * Mapping for a field. For new fields, this mapping can include:
+         * <ul>
+         * <li>Field name</li>
+         * <li>Field data type</li>
+         * <li>Mapping parameters</li>
+         * </ul>
+         * <p>
+         * API name: {@code properties}
+         * <p>
+         * Adds an entry to <code>properties</code>.
+         */
+        public final Builder properties(String key, Property value) {
+            this.properties = _mapPut(this.properties, key, value);
+            return this;
+        }
+
+        /**
+         * Mapping for a field. For new fields, this mapping can include:
+         * <ul>
+         * <li>Field name</li>
+         * <li>Field data type</li>
+         * <li>Mapping parameters</li>
+         * </ul>
+         * <p>
+         * API name: {@code properties}
+         * <p>
+         * Adds an entry to <code>properties</code> using a builder lambda.
+         */
+        public final Builder properties(String key, Function<Property.Builder, ObjectBuilder<Property>> fn) {
+            return properties(key, fn.apply(new Property.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * When true, applies mappings only to the write index of an alias or data
+         * stream
+         * <p>
+         * API name: {@code write_index_only}
+         */
+        public final Builder writeIndexOnly(@Nullable Boolean value) {
+            this.writeIndexOnly = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link PutMappingRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutMappingRequest build() {
+            _checkSingleUse();
+
+            return new PutMappingRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PutMappingRequest}
+     */
+    public static final JsonpDeserializer<PutMappingRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PutMappingRequest::setupPutMappingRequestDeserializer
+    );
+
+    protected static void setupPutMappingRequestDeserializer(ObjectDeserializer<PutMappingRequest.Builder> op) {
+
+        op.add(Builder::fieldNames, FieldNamesField._DESERIALIZER, "_field_names");
+        op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
+        op.add(Builder::routing, RoutingField._DESERIALIZER, "_routing");
+        op.add(Builder::source, SourceField._DESERIALIZER, "_source");
+        op.add(Builder::dateDetection, JsonpDeserializer.booleanDeserializer(), "date_detection");
+        op.add(Builder::dynamic, DynamicMapping._DESERIALIZER, "dynamic");
+        op.add(
+            Builder::dynamicDateFormats,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
+            "dynamic_date_formats"
+        );
+        op.add(
+            Builder::dynamicTemplates,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringMapDeserializer(DynamicTemplate._DESERIALIZER)),
+            "dynamic_templates"
+        );
+        op.add(Builder::numericDetection, JsonpDeserializer.booleanDeserializer(), "numeric_detection");
+        op.add(Builder::properties, JsonpDeserializer.stringMapDeserializer(Property._DESERIALIZER), "properties");
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.put_mapping}".
+     */
+    public static final Endpoint<PutMappingRequest, PutMappingResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "PUT";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_mapping");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_mappings");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.writeIndexOnly != null) {
+                params.put("write_index_only", String.valueOf(request.writeIndexOnly));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        PutMappingResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutMappingResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutMappingResponse.java
index 7fc8256c6e..87dbdba7ce 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutMappingResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutMappingResponse.java
@@ -32,68 +32,67 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.IndicesResponseBase;
+import java.util.function.Function;
 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.IndicesResponseBase;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.put_mapping.Response
 
 @JsonpDeserializable
 public class PutMappingResponse extends IndicesResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private PutMappingResponse(Builder builder) {
-		super(builder);
+    private PutMappingResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static PutMappingResponse of(Function<Builder, ObjectBuilder<PutMappingResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static PutMappingResponse of(Function<Builder, ObjectBuilder<PutMappingResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link PutMappingResponse}.
-	 */
+    /**
+     * Builder for {@link PutMappingResponse}.
+     */
 
-	public static class Builder extends IndicesResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PutMappingResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends IndicesResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<PutMappingResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link PutMappingResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutMappingResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link PutMappingResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutMappingResponse build() {
+            _checkSingleUse();
 
-			return new PutMappingResponse(this);
-		}
-	}
+            return new PutMappingResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link PutMappingResponse}
-	 */
-	public static final JsonpDeserializer<PutMappingResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PutMappingResponse::setupPutMappingResponseDeserializer);
+    /**
+     * Json deserializer for {@link PutMappingResponse}
+     */
+    public static final JsonpDeserializer<PutMappingResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PutMappingResponse::setupPutMappingResponseDeserializer
+    );
 
-	protected static void setupPutMappingResponseDeserializer(ObjectDeserializer<PutMappingResponse.Builder> op) {
-		IndicesResponseBase.setupIndicesResponseBaseDeserializer(op);
+    protected static void setupPutMappingResponseDeserializer(ObjectDeserializer<PutMappingResponse.Builder> op) {
+        IndicesResponseBase.setupIndicesResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutTemplateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutTemplateRequest.java
index 4cef1b74d4..9ba6e65283 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutTemplateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutTemplateRequest.java
@@ -32,10 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
-import org.opensearch.client.opensearch._types.mapping.TypeMapping;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -43,607 +45,610 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.Time;
+import org.opensearch.client.opensearch._types.mapping.TypeMapping;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.put_template.Request
 
 /**
  * Creates or updates an index template.
- * 
+ *
  */
 @JsonpDeserializable
 public class PutTemplateRequest extends RequestBase implements JsonpSerializable {
-	private final Map<String, Alias> aliases;
-
-	@Nullable
-	private final Boolean create;
-
-	@Nullable
-	private final Boolean flatSettings;
-
-	private final List<String> indexPatterns;
-
-	@Nullable
-	private final TypeMapping mappings;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final String name;
-
-	@Nullable
-	private final Integer order;
-
-	private final Map<String, JsonData> settings;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final Long version;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PutTemplateRequest(Builder builder) {
-
-		this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
-		this.create = builder.create;
-		this.flatSettings = builder.flatSettings;
-		this.indexPatterns = ApiTypeHelper.unmodifiable(builder.indexPatterns);
-		this.mappings = builder.mappings;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.order = builder.order;
-		this.settings = ApiTypeHelper.unmodifiable(builder.settings);
-		this.timeout = builder.timeout;
-		this.version = builder.version;
-
-	}
-
-	public static PutTemplateRequest of(Function<Builder, ObjectBuilder<PutTemplateRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Aliases for the index.
-	 * <p>
-	 * API name: {@code aliases}
-	 */
-	public final Map<String, Alias> aliases() {
-		return this.aliases;
-	}
-
-	/**
-	 * If true, this request cannot replace or update existing index templates.
-	 * <p>
-	 * API name: {@code create}
-	 */
-	@Nullable
-	public final Boolean create() {
-		return this.create;
-	}
-
-	/**
-	 * API name: {@code flat_settings}
-	 */
-	@Nullable
-	public final Boolean flatSettings() {
-		return this.flatSettings;
-	}
-
-	/**
-	 * Array of wildcard expressions used to match the names of indices during
-	 * creation.
-	 * <p>
-	 * API name: {@code index_patterns}
-	 */
-	public final List<String> indexPatterns() {
-		return this.indexPatterns;
-	}
-
-	/**
-	 * Mapping for fields in the index.
-	 * <p>
-	 * API name: {@code mappings}
-	 */
-	@Nullable
-	public final TypeMapping mappings() {
-		return this.mappings;
-	}
-
-	/**
-	 * Period to wait for a connection to the master node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Period to wait for a connection to the cluster-manager node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Required - The name of the template
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Order in which Elasticsearch applies this template if index matches multiple
-	 * templates.
-	 * <p>
-	 * Templates with lower 'order' values are merged first. Templates with higher
-	 * 'order' values are merged later, overriding templates with lower values.
-	 * <p>
-	 * API name: {@code order}
-	 */
-	@Nullable
-	public final Integer order() {
-		return this.order;
-	}
-
-	/**
-	 * Configuration options for the index.
-	 * <p>
-	 * API name: {@code settings}
-	 */
-	public final Map<String, JsonData> settings() {
-		return this.settings;
-	}
-
-	/**
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Version number used to manage index templates externally. This number is not
-	 * automatically generated by Elasticsearch.
-	 * <p>
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.aliases)) {
-			generator.writeKey("aliases");
-			generator.writeStartObject();
-			for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.indexPatterns)) {
-			generator.writeKey("index_patterns");
-			generator.writeStartArray();
-			for (String item0 : this.indexPatterns) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.mappings != null) {
-			generator.writeKey("mappings");
-			this.mappings.serialize(generator, mapper);
-
-		}
-		if (this.order != null) {
-			generator.writeKey("order");
-			generator.write(this.order);
-
-		}
-		if (ApiTypeHelper.isDefined(this.settings)) {
-			generator.writeKey("settings");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PutTemplateRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutTemplateRequest> {
-		@Nullable
-		private Map<String, Alias> aliases;
-
-		@Nullable
-		private Boolean create;
-
-		@Nullable
-		private Boolean flatSettings;
-
-		@Nullable
-		private List<String> indexPatterns;
-
-		@Nullable
-		private TypeMapping mappings;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		private String name;
-
-		@Nullable
-		private Integer order;
-
-		@Nullable
-		private Map<String, JsonData> settings;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private Long version;
-
-		/**
-		 * Aliases for the index.
-		 * <p>
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aliases</code>.
-		 */
-		public final Builder aliases(Map<String, Alias> map) {
-			this.aliases = _mapPutAll(this.aliases, map);
-			return this;
-		}
-
-		/**
-		 * Aliases for the index.
-		 * <p>
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code>.
-		 */
-		public final Builder aliases(String key, Alias value) {
-			this.aliases = _mapPut(this.aliases, key, value);
-			return this;
-		}
-
-		/**
-		 * Aliases for the index.
-		 * <p>
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code> using a builder lambda.
-		 */
-		public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
-			return aliases(key, fn.apply(new Alias.Builder()).build());
-		}
-
-		/**
-		 * If true, this request cannot replace or update existing index templates.
-		 * <p>
-		 * API name: {@code create}
-		 */
-		public final Builder create(@Nullable Boolean value) {
-			this.create = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code flat_settings}
-		 */
-		public final Builder flatSettings(@Nullable Boolean value) {
-			this.flatSettings = value;
-			return this;
-		}
-
-		/**
-		 * Array of wildcard expressions used to match the names of indices during
-		 * creation.
-		 * <p>
-		 * API name: {@code index_patterns}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indexPatterns</code>.
-		 */
-		public final Builder indexPatterns(List<String> list) {
-			this.indexPatterns = _listAddAll(this.indexPatterns, list);
-			return this;
-		}
-
-		/**
-		 * Array of wildcard expressions used to match the names of indices during
-		 * creation.
-		 * <p>
-		 * API name: {@code index_patterns}
-		 * <p>
-		 * Adds one or more values to <code>indexPatterns</code>.
-		 */
-		public final Builder indexPatterns(String value, String... values) {
-			this.indexPatterns = _listAdd(this.indexPatterns, value, values);
-			return this;
-		}
-
-		/**
-		 * Mapping for fields in the index.
-		 * <p>
-		 * API name: {@code mappings}
-		 */
-		public final Builder mappings(@Nullable TypeMapping value) {
-			this.mappings = value;
-			return this;
-		}
-
-		/**
-		 * Mapping for fields in the index.
-		 * <p>
-		 * API name: {@code mappings}
-		 */
-		public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
-			return this.mappings(fn.apply(new TypeMapping.Builder()).build());
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - The name of the template
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Order in which Elasticsearch applies this template if index matches multiple
-		 * templates.
-		 * <p>
-		 * Templates with lower 'order' values are merged first. Templates with higher
-		 * 'order' values are merged later, overriding templates with lower values.
-		 * <p>
-		 * API name: {@code order}
-		 */
-		public final Builder order(@Nullable Integer value) {
-			this.order = value;
-			return this;
-		}
-
-		/**
-		 * Configuration options for the index.
-		 * <p>
-		 * API name: {@code settings}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>settings</code>.
-		 */
-		public final Builder settings(Map<String, JsonData> map) {
-			this.settings = _mapPutAll(this.settings, map);
-			return this;
-		}
-
-		/**
-		 * Configuration options for the index.
-		 * <p>
-		 * API name: {@code settings}
-		 * <p>
-		 * Adds an entry to <code>settings</code>.
-		 */
-		public final Builder settings(String key, JsonData value) {
-			this.settings = _mapPut(this.settings, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Version number used to manage index templates externally. This number is not
-		 * automatically generated by Elasticsearch.
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PutTemplateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutTemplateRequest build() {
-			_checkSingleUse();
-
-			return new PutTemplateRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PutTemplateRequest}
-	 */
-	public static final JsonpDeserializer<PutTemplateRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PutTemplateRequest::setupPutTemplateRequestDeserializer);
-
-	protected static void setupPutTemplateRequestDeserializer(ObjectDeserializer<PutTemplateRequest.Builder> op) {
-
-		op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
-		op.add(Builder::indexPatterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"index_patterns");
-		op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
-		op.add(Builder::order, JsonpDeserializer.integerDeserializer(), "order");
-		op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "settings");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.put_template}".
-	 */
-	public static final Endpoint<PutTemplateRequest, PutTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "PUT";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _name;
-
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_template");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.flatSettings != null) {
-					params.put("flat_settings", String.valueOf(request.flatSettings));
-				}
-				if (request.create != null) {
-					params.put("create", String.valueOf(request.create));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, PutTemplateResponse._DESERIALIZER);
+    private final Map<String, Alias> aliases;
+
+    @Nullable
+    private final Boolean create;
+
+    @Nullable
+    private final Boolean flatSettings;
+
+    private final List<String> indexPatterns;
+
+    @Nullable
+    private final TypeMapping mappings;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final String name;
+
+    @Nullable
+    private final Integer order;
+
+    private final Map<String, JsonData> settings;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final Long version;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PutTemplateRequest(Builder builder) {
+
+        this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
+        this.create = builder.create;
+        this.flatSettings = builder.flatSettings;
+        this.indexPatterns = ApiTypeHelper.unmodifiable(builder.indexPatterns);
+        this.mappings = builder.mappings;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.order = builder.order;
+        this.settings = ApiTypeHelper.unmodifiable(builder.settings);
+        this.timeout = builder.timeout;
+        this.version = builder.version;
+
+    }
+
+    public static PutTemplateRequest of(Function<Builder, ObjectBuilder<PutTemplateRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Aliases for the index.
+     * <p>
+     * API name: {@code aliases}
+     */
+    public final Map<String, Alias> aliases() {
+        return this.aliases;
+    }
+
+    /**
+     * If true, this request cannot replace or update existing index templates.
+     * <p>
+     * API name: {@code create}
+     */
+    @Nullable
+    public final Boolean create() {
+        return this.create;
+    }
+
+    /**
+     * API name: {@code flat_settings}
+     */
+    @Nullable
+    public final Boolean flatSettings() {
+        return this.flatSettings;
+    }
+
+    /**
+     * Array of wildcard expressions used to match the names of indices during
+     * creation.
+     * <p>
+     * API name: {@code index_patterns}
+     */
+    public final List<String> indexPatterns() {
+        return this.indexPatterns;
+    }
+
+    /**
+     * Mapping for fields in the index.
+     * <p>
+     * API name: {@code mappings}
+     */
+    @Nullable
+    public final TypeMapping mappings() {
+        return this.mappings;
+    }
+
+    /**
+     * Period to wait for a connection to the master node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Period to wait for a connection to the cluster-manager node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Required - The name of the template
+     * <p>
+     * API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Order in which Elasticsearch applies this template if index matches multiple
+     * templates.
+     * <p>
+     * Templates with lower 'order' values are merged first. Templates with higher
+     * 'order' values are merged later, overriding templates with lower values.
+     * <p>
+     * API name: {@code order}
+     */
+    @Nullable
+    public final Integer order() {
+        return this.order;
+    }
+
+    /**
+     * Configuration options for the index.
+     * <p>
+     * API name: {@code settings}
+     */
+    public final Map<String, JsonData> settings() {
+        return this.settings;
+    }
+
+    /**
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Version number used to manage index templates externally. This number is not
+     * automatically generated by Elasticsearch.
+     * <p>
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.aliases)) {
+            generator.writeKey("aliases");
+            generator.writeStartObject();
+            for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.indexPatterns)) {
+            generator.writeKey("index_patterns");
+            generator.writeStartArray();
+            for (String item0 : this.indexPatterns) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.mappings != null) {
+            generator.writeKey("mappings");
+            this.mappings.serialize(generator, mapper);
+
+        }
+        if (this.order != null) {
+            generator.writeKey("order");
+            generator.write(this.order);
+
+        }
+        if (ApiTypeHelper.isDefined(this.settings)) {
+            generator.writeKey("settings");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PutTemplateRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutTemplateRequest> {
+        @Nullable
+        private Map<String, Alias> aliases;
+
+        @Nullable
+        private Boolean create;
+
+        @Nullable
+        private Boolean flatSettings;
+
+        @Nullable
+        private List<String> indexPatterns;
+
+        @Nullable
+        private TypeMapping mappings;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        private String name;
+
+        @Nullable
+        private Integer order;
+
+        @Nullable
+        private Map<String, JsonData> settings;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private Long version;
+
+        /**
+         * Aliases for the index.
+         * <p>
+         * API name: {@code aliases}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aliases</code>.
+         */
+        public final Builder aliases(Map<String, Alias> map) {
+            this.aliases = _mapPutAll(this.aliases, map);
+            return this;
+        }
+
+        /**
+         * Aliases for the index.
+         * <p>
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code>.
+         */
+        public final Builder aliases(String key, Alias value) {
+            this.aliases = _mapPut(this.aliases, key, value);
+            return this;
+        }
+
+        /**
+         * Aliases for the index.
+         * <p>
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code> using a builder lambda.
+         */
+        public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
+            return aliases(key, fn.apply(new Alias.Builder()).build());
+        }
+
+        /**
+         * If true, this request cannot replace or update existing index templates.
+         * <p>
+         * API name: {@code create}
+         */
+        public final Builder create(@Nullable Boolean value) {
+            this.create = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code flat_settings}
+         */
+        public final Builder flatSettings(@Nullable Boolean value) {
+            this.flatSettings = value;
+            return this;
+        }
+
+        /**
+         * Array of wildcard expressions used to match the names of indices during
+         * creation.
+         * <p>
+         * API name: {@code index_patterns}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indexPatterns</code>.
+         */
+        public final Builder indexPatterns(List<String> list) {
+            this.indexPatterns = _listAddAll(this.indexPatterns, list);
+            return this;
+        }
+
+        /**
+         * Array of wildcard expressions used to match the names of indices during
+         * creation.
+         * <p>
+         * API name: {@code index_patterns}
+         * <p>
+         * Adds one or more values to <code>indexPatterns</code>.
+         */
+        public final Builder indexPatterns(String value, String... values) {
+            this.indexPatterns = _listAdd(this.indexPatterns, value, values);
+            return this;
+        }
+
+        /**
+         * Mapping for fields in the index.
+         * <p>
+         * API name: {@code mappings}
+         */
+        public final Builder mappings(@Nullable TypeMapping value) {
+            this.mappings = value;
+            return this;
+        }
+
+        /**
+         * Mapping for fields in the index.
+         * <p>
+         * API name: {@code mappings}
+         */
+        public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
+            return this.mappings(fn.apply(new TypeMapping.Builder()).build());
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - The name of the template
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Order in which Elasticsearch applies this template if index matches multiple
+         * templates.
+         * <p>
+         * Templates with lower 'order' values are merged first. Templates with higher
+         * 'order' values are merged later, overriding templates with lower values.
+         * <p>
+         * API name: {@code order}
+         */
+        public final Builder order(@Nullable Integer value) {
+            this.order = value;
+            return this;
+        }
+
+        /**
+         * Configuration options for the index.
+         * <p>
+         * API name: {@code settings}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>settings</code>.
+         */
+        public final Builder settings(Map<String, JsonData> map) {
+            this.settings = _mapPutAll(this.settings, map);
+            return this;
+        }
+
+        /**
+         * Configuration options for the index.
+         * <p>
+         * API name: {@code settings}
+         * <p>
+         * Adds an entry to <code>settings</code>.
+         */
+        public final Builder settings(String key, JsonData value) {
+            this.settings = _mapPut(this.settings, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Version number used to manage index templates externally. This number is not
+         * automatically generated by Elasticsearch.
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link PutTemplateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutTemplateRequest build() {
+            _checkSingleUse();
+
+            return new PutTemplateRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PutTemplateRequest}
+     */
+    public static final JsonpDeserializer<PutTemplateRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PutTemplateRequest::setupPutTemplateRequestDeserializer
+    );
+
+    protected static void setupPutTemplateRequestDeserializer(ObjectDeserializer<PutTemplateRequest.Builder> op) {
+
+        op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
+        op.add(Builder::indexPatterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "index_patterns");
+        op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
+        op.add(Builder::order, JsonpDeserializer.integerDeserializer(), "order");
+        op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "settings");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.put_template}".
+     */
+    public static final Endpoint<PutTemplateRequest, PutTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "PUT";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _name;
+
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_template");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.flatSettings != null) {
+                params.put("flat_settings", String.valueOf(request.flatSettings));
+            }
+            if (request.create != null) {
+                params.put("create", String.valueOf(request.create));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        PutTemplateResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutTemplateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutTemplateResponse.java
index 8fefbbe9e6..0a278cc917 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutTemplateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutTemplateResponse.java
@@ -32,68 +32,67 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.put_template.Response
 
 @JsonpDeserializable
 public class PutTemplateResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private PutTemplateResponse(Builder builder) {
-		super(builder);
+    private PutTemplateResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static PutTemplateResponse of(Function<Builder, ObjectBuilder<PutTemplateResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static PutTemplateResponse of(Function<Builder, ObjectBuilder<PutTemplateResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link PutTemplateResponse}.
-	 */
+    /**
+     * Builder for {@link PutTemplateResponse}.
+     */
 
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PutTemplateResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<PutTemplateResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link PutTemplateResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutTemplateResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link PutTemplateResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutTemplateResponse build() {
+            _checkSingleUse();
 
-			return new PutTemplateResponse(this);
-		}
-	}
+            return new PutTemplateResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link PutTemplateResponse}
-	 */
-	public static final JsonpDeserializer<PutTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PutTemplateResponse::setupPutTemplateResponseDeserializer);
+    /**
+     * Json deserializer for {@link PutTemplateResponse}
+     */
+    public static final JsonpDeserializer<PutTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PutTemplateResponse::setupPutTemplateResponseDeserializer
+    );
 
-	protected static void setupPutTemplateResponseDeserializer(ObjectDeserializer<PutTemplateResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+    protected static void setupPutTemplateResponseDeserializer(ObjectDeserializer<PutTemplateResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/RecoveryRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/RecoveryRequest.java
index 375d7fd7e6..16e50ced97 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/RecoveryRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/RecoveryRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -40,196 +46,192 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.recovery.Request
 
 /**
  * Returns information about ongoing index shard recoveries.
- * 
+ *
  */
 
 public class RecoveryRequest extends RequestBase {
-	@Nullable
-	private final Boolean activeOnly;
-
-	@Nullable
-	private final Boolean detailed;
-
-	private final List<String> index;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RecoveryRequest(Builder builder) {
-
-		this.activeOnly = builder.activeOnly;
-		this.detailed = builder.detailed;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-
-	}
-
-	public static RecoveryRequest of(Function<Builder, ObjectBuilder<RecoveryRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Display only those recoveries that are currently on-going
-	 * <p>
-	 * API name: {@code active_only}
-	 */
-	@Nullable
-	public final Boolean activeOnly() {
-		return this.activeOnly;
-	}
-
-	/**
-	 * Whether to display detailed information about shard recovery
-	 * <p>
-	 * API name: {@code detailed}
-	 */
-	@Nullable
-	public final Boolean detailed() {
-		return this.detailed;
-	}
-
-	/**
-	 * A comma-separated list of index names; use <code>_all</code> or empty string
-	 * to perform the operation on all indices
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RecoveryRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryRequest> {
-		@Nullable
-		private Boolean activeOnly;
-
-		@Nullable
-		private Boolean detailed;
-
-		@Nullable
-		private List<String> index;
-
-		/**
-		 * Display only those recoveries that are currently on-going
-		 * <p>
-		 * API name: {@code active_only}
-		 */
-		public final Builder activeOnly(@Nullable Boolean value) {
-			this.activeOnly = value;
-			return this;
-		}
-
-		/**
-		 * Whether to display detailed information about shard recovery
-		 * <p>
-		 * API name: {@code detailed}
-		 */
-		public final Builder detailed(@Nullable Boolean value) {
-			this.detailed = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RecoveryRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RecoveryRequest build() {
-			_checkSingleUse();
-
-			return new RecoveryRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.recovery}".
-	 */
-	public static final Endpoint<RecoveryRequest, RecoveryResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_recovery");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_recovery");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.detailed != null) {
-					params.put("detailed", String.valueOf(request.detailed));
-				}
-				if (request.activeOnly != null) {
-					params.put("active_only", String.valueOf(request.activeOnly));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, RecoveryResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean activeOnly;
+
+    @Nullable
+    private final Boolean detailed;
+
+    private final List<String> index;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RecoveryRequest(Builder builder) {
+
+        this.activeOnly = builder.activeOnly;
+        this.detailed = builder.detailed;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+
+    }
+
+    public static RecoveryRequest of(Function<Builder, ObjectBuilder<RecoveryRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Display only those recoveries that are currently on-going
+     * <p>
+     * API name: {@code active_only}
+     */
+    @Nullable
+    public final Boolean activeOnly() {
+        return this.activeOnly;
+    }
+
+    /**
+     * Whether to display detailed information about shard recovery
+     * <p>
+     * API name: {@code detailed}
+     */
+    @Nullable
+    public final Boolean detailed() {
+        return this.detailed;
+    }
+
+    /**
+     * A comma-separated list of index names; use <code>_all</code> or empty string
+     * to perform the operation on all indices
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RecoveryRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryRequest> {
+        @Nullable
+        private Boolean activeOnly;
+
+        @Nullable
+        private Boolean detailed;
+
+        @Nullable
+        private List<String> index;
+
+        /**
+         * Display only those recoveries that are currently on-going
+         * <p>
+         * API name: {@code active_only}
+         */
+        public final Builder activeOnly(@Nullable Boolean value) {
+            this.activeOnly = value;
+            return this;
+        }
+
+        /**
+         * Whether to display detailed information about shard recovery
+         * <p>
+         * API name: {@code detailed}
+         */
+        public final Builder detailed(@Nullable Boolean value) {
+            this.detailed = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link RecoveryRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RecoveryRequest build() {
+            _checkSingleUse();
+
+            return new RecoveryRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.recovery}".
+     */
+    public static final Endpoint<RecoveryRequest, RecoveryResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_recovery");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_recovery");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.detailed != null) {
+                params.put("detailed", String.valueOf(request.detailed));
+            }
+            if (request.activeOnly != null) {
+                params.put("active_only", String.valueOf(request.activeOnly));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        RecoveryResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/RecoveryResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/RecoveryResponse.java
index 67bedb8468..ec15818d08 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/RecoveryResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/RecoveryResponse.java
@@ -32,72 +32,72 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch.indices.recovery.RecoveryStatus;
+import java.util.function.Function;
 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.indices.recovery.RecoveryStatus;
 import org.opensearch.client.transport.endpoints.DictionaryResponse;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.recovery.Response
 
 @JsonpDeserializable
 public class RecoveryResponse extends DictionaryResponse<String, RecoveryStatus> {
-	// ---------------------------------------------------------------------------------------------
-
-	private RecoveryResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static RecoveryResponse of(Function<Builder, ObjectBuilder<RecoveryResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RecoveryResponse}.
-	 */
-
-	public static class Builder extends DictionaryResponse.AbstractBuilder<String, RecoveryStatus, Builder>
-			implements
-				ObjectBuilder<RecoveryResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RecoveryResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RecoveryResponse build() {
-			_checkSingleUse();
-			super.tKeySerializer(null);
-			super.tValueSerializer(null);
-
-			return new RecoveryResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RecoveryResponse}
-	 */
-	public static final JsonpDeserializer<RecoveryResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RecoveryResponse::setupRecoveryResponseDeserializer);
-
-	protected static void setupRecoveryResponseDeserializer(ObjectDeserializer<RecoveryResponse.Builder> op) {
-		DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(),
-				RecoveryStatus._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private RecoveryResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static RecoveryResponse of(Function<Builder, ObjectBuilder<RecoveryResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RecoveryResponse}.
+     */
+
+    public static class Builder extends DictionaryResponse.AbstractBuilder<String, RecoveryStatus, Builder>
+        implements
+            ObjectBuilder<RecoveryResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RecoveryResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RecoveryResponse build() {
+            _checkSingleUse();
+            super.tKeySerializer(null);
+            super.tValueSerializer(null);
+
+            return new RecoveryResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RecoveryResponse}
+     */
+    public static final JsonpDeserializer<RecoveryResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RecoveryResponse::setupRecoveryResponseDeserializer
+    );
+
+    protected static void setupRecoveryResponseDeserializer(ObjectDeserializer<RecoveryResponse.Builder> op) {
+        DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(), RecoveryStatus._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/RefreshRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/RefreshRequest.java
index d79ad608a4..4f87dd0d4d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/RefreshRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/RefreshRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -41,249 +47,243 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.refresh.Request
 
 /**
  * Performs the refresh operation in one or more indices.
- * 
+ *
  */
 
 public class RefreshRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RefreshRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-
-	}
-
-	public static RefreshRequest of(Function<Builder, ObjectBuilder<RefreshRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * A comma-separated list of index names; use <code>_all</code> or empty string
-	 * to perform the operation on all indices
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RefreshRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RefreshRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private List<String> index;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RefreshRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RefreshRequest build() {
-			_checkSingleUse();
-
-			return new RefreshRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.refresh}".
-	 */
-	public static final Endpoint<RefreshRequest, RefreshResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_refresh");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_refresh");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, RefreshResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RefreshRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+
+    }
+
+    public static RefreshRequest of(Function<Builder, ObjectBuilder<RefreshRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * A comma-separated list of index names; use <code>_all</code> or empty string
+     * to perform the operation on all indices
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RefreshRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RefreshRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private List<String> index;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link RefreshRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RefreshRequest build() {
+            _checkSingleUse();
+
+            return new RefreshRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.refresh}".
+     */
+    public static final Endpoint<RefreshRequest, RefreshResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_refresh");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_refresh");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        RefreshResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/RefreshResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/RefreshResponse.java
index 8f879ff59b..6d14ef7f8f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/RefreshResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/RefreshResponse.java
@@ -32,68 +32,67 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ShardsOperationResponseBase;
+import java.util.function.Function;
 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.ShardsOperationResponseBase;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.refresh.Response
 
 @JsonpDeserializable
 public class RefreshResponse extends ShardsOperationResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private RefreshResponse(Builder builder) {
-		super(builder);
+    private RefreshResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static RefreshResponse of(Function<Builder, ObjectBuilder<RefreshResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static RefreshResponse of(Function<Builder, ObjectBuilder<RefreshResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link RefreshResponse}.
-	 */
+    /**
+     * Builder for {@link RefreshResponse}.
+     */
 
-	public static class Builder extends ShardsOperationResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<RefreshResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends ShardsOperationResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<RefreshResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link RefreshResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RefreshResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link RefreshResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RefreshResponse build() {
+            _checkSingleUse();
 
-			return new RefreshResponse(this);
-		}
-	}
+            return new RefreshResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link RefreshResponse}
-	 */
-	public static final JsonpDeserializer<RefreshResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RefreshResponse::setupRefreshResponseDeserializer);
+    /**
+     * Json deserializer for {@link RefreshResponse}
+     */
+    public static final JsonpDeserializer<RefreshResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RefreshResponse::setupRefreshResponseDeserializer
+    );
 
-	protected static void setupRefreshResponseDeserializer(ObjectDeserializer<RefreshResponse.Builder> op) {
-		ShardsOperationResponseBase.setupShardsOperationResponseBaseDeserializer(op);
+    protected static void setupRefreshResponseDeserializer(ObjectDeserializer<RefreshResponse.Builder> op) {
+        ShardsOperationResponseBase.setupShardsOperationResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ResolveIndexRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ResolveIndexRequest.java
index 4ba46e52ed..743b65bd5c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ResolveIndexRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ResolveIndexRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -41,174 +47,169 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.resolve_index.Request
 
 /**
  * Returns information about any matching indices, aliases, and data streams
- * 
+ *
  */
 
 public class ResolveIndexRequest extends RequestBase {
-	private final List<ExpandWildcard> expandWildcards;
-
-	private final List<String> name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ResolveIndexRequest(Builder builder) {
-
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.name = ApiTypeHelper.unmodifiableRequired(builder.name, this, "name");
-
-	}
-
-	public static ResolveIndexRequest of(Function<Builder, ObjectBuilder<ResolveIndexRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether wildcard expressions should get expanded to open or closed indices
-	 * (default: open)
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Required - A comma-separated list of names or wildcard expressions
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final List<String> name() {
-		return this.name;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ResolveIndexRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ResolveIndexRequest> {
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		private List<String> name;
-
-		/**
-		 * Whether wildcard expressions should get expanded to open or closed indices
-		 * (default: open)
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether wildcard expressions should get expanded to open or closed indices
-		 * (default: open)
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - A comma-separated list of names or wildcard expressions
-		 * <p>
-		 * API name: {@code name}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>name</code>.
-		 */
-		public final Builder name(List<String> list) {
-			this.name = _listAddAll(this.name, list);
-			return this;
-		}
-
-		/**
-		 * Required - A comma-separated list of names or wildcard expressions
-		 * <p>
-		 * API name: {@code name}
-		 * <p>
-		 * Adds one or more values to <code>name</code>.
-		 */
-		public final Builder name(String value, String... values) {
-			this.name = _listAdd(this.name, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ResolveIndexRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ResolveIndexRequest build() {
-			_checkSingleUse();
-
-			return new ResolveIndexRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.resolve_index}".
-	 */
-	public static final Endpoint<ResolveIndexRequest, ResolveIndexResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _name;
-
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_resolve");
-					buf.append("/index");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, ResolveIndexResponse._DESERIALIZER);
+    private final List<ExpandWildcard> expandWildcards;
+
+    private final List<String> name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ResolveIndexRequest(Builder builder) {
+
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.name = ApiTypeHelper.unmodifiableRequired(builder.name, this, "name");
+
+    }
+
+    public static ResolveIndexRequest of(Function<Builder, ObjectBuilder<ResolveIndexRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether wildcard expressions should get expanded to open or closed indices
+     * (default: open)
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Required - A comma-separated list of names or wildcard expressions
+     * <p>
+     * API name: {@code name}
+     */
+    public final List<String> name() {
+        return this.name;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ResolveIndexRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ResolveIndexRequest> {
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        private List<String> name;
+
+        /**
+         * Whether wildcard expressions should get expanded to open or closed indices
+         * (default: open)
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether wildcard expressions should get expanded to open or closed indices
+         * (default: open)
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Required - A comma-separated list of names or wildcard expressions
+         * <p>
+         * API name: {@code name}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>name</code>.
+         */
+        public final Builder name(List<String> list) {
+            this.name = _listAddAll(this.name, list);
+            return this;
+        }
+
+        /**
+         * Required - A comma-separated list of names or wildcard expressions
+         * <p>
+         * API name: {@code name}
+         * <p>
+         * Adds one or more values to <code>name</code>.
+         */
+        public final Builder name(String value, String... values) {
+            this.name = _listAdd(this.name, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link ResolveIndexRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ResolveIndexRequest build() {
+            _checkSingleUse();
+
+            return new ResolveIndexRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.resolve_index}".
+     */
+    public static final Endpoint<ResolveIndexRequest, ResolveIndexResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _name;
+
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_resolve");
+                buf.append("/index");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        ResolveIndexResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ResolveIndexResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ResolveIndexResponse.java
index d89df41d9c..76871e26ac 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ResolveIndexResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ResolveIndexResponse.java
@@ -32,186 +32,187 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch.indices.resolve_index.ResolveIndexAliasItem;
-import org.opensearch.client.opensearch.indices.resolve_index.ResolveIndexItem;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.indices.resolve_index.ResolveIndexAliasItem;
+import org.opensearch.client.opensearch.indices.resolve_index.ResolveIndexItem;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: indices.resolve_index.Response
 
 @JsonpDeserializable
 public class ResolveIndexResponse implements JsonpSerializable {
-	private final List<ResolveIndexItem> indices;
-
-	private final List<ResolveIndexAliasItem> aliases;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ResolveIndexResponse(Builder builder) {
-
-		this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
-		this.aliases = ApiTypeHelper.unmodifiableRequired(builder.aliases, this, "aliases");
-
-	}
-
-	public static ResolveIndexResponse of(Function<Builder, ObjectBuilder<ResolveIndexResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code indices}
-	 */
-	public final List<ResolveIndexItem> indices() {
-		return this.indices;
-	}
-
-	/**
-	 * Required - API name: {@code aliases}
-	 */
-	public final List<ResolveIndexAliasItem> aliases() {
-		return this.aliases;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartArray();
-			for (ResolveIndexItem item0 : this.indices) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.aliases)) {
-			generator.writeKey("aliases");
-			generator.writeStartArray();
-			for (ResolveIndexAliasItem item0 : this.aliases) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ResolveIndexResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ResolveIndexResponse> {
-		private List<ResolveIndexItem> indices;
-
-		private List<ResolveIndexAliasItem> aliases;
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indices</code>.
-		 */
-		public final Builder indices(List<ResolveIndexItem> list) {
-			this.indices = _listAddAll(this.indices, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds one or more values to <code>indices</code>.
-		 */
-		public final Builder indices(ResolveIndexItem value, ResolveIndexItem... values) {
-			this.indices = _listAdd(this.indices, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds a value to <code>indices</code> using a builder lambda.
-		 */
-		public final Builder indices(Function<ResolveIndexItem.Builder, ObjectBuilder<ResolveIndexItem>> fn) {
-			return indices(fn.apply(new ResolveIndexItem.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code aliases}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>aliases</code>.
-		 */
-		public final Builder aliases(List<ResolveIndexAliasItem> list) {
-			this.aliases = _listAddAll(this.aliases, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code aliases}
-		 * <p>
-		 * Adds one or more values to <code>aliases</code>.
-		 */
-		public final Builder aliases(ResolveIndexAliasItem value, ResolveIndexAliasItem... values) {
-			this.aliases = _listAdd(this.aliases, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code aliases}
-		 * <p>
-		 * Adds a value to <code>aliases</code> using a builder lambda.
-		 */
-		public final Builder aliases(Function<ResolveIndexAliasItem.Builder, ObjectBuilder<ResolveIndexAliasItem>> fn) {
-			return aliases(fn.apply(new ResolveIndexAliasItem.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ResolveIndexResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ResolveIndexResponse build() {
-			_checkSingleUse();
-
-			return new ResolveIndexResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ResolveIndexResponse}
-	 */
-	public static final JsonpDeserializer<ResolveIndexResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ResolveIndexResponse::setupResolveIndexResponseDeserializer);
-
-	protected static void setupResolveIndexResponseDeserializer(ObjectDeserializer<ResolveIndexResponse.Builder> op) {
-
-		op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(ResolveIndexItem._DESERIALIZER), "indices");
-		op.add(Builder::aliases, JsonpDeserializer.arrayDeserializer(ResolveIndexAliasItem._DESERIALIZER), "aliases");
-
-	}
+    private final List<ResolveIndexItem> indices;
+
+    private final List<ResolveIndexAliasItem> aliases;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ResolveIndexResponse(Builder builder) {
+
+        this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
+        this.aliases = ApiTypeHelper.unmodifiableRequired(builder.aliases, this, "aliases");
+
+    }
+
+    public static ResolveIndexResponse of(Function<Builder, ObjectBuilder<ResolveIndexResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code indices}
+     */
+    public final List<ResolveIndexItem> indices() {
+        return this.indices;
+    }
+
+    /**
+     * Required - API name: {@code aliases}
+     */
+    public final List<ResolveIndexAliasItem> aliases() {
+        return this.aliases;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartArray();
+            for (ResolveIndexItem item0 : this.indices) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.aliases)) {
+            generator.writeKey("aliases");
+            generator.writeStartArray();
+            for (ResolveIndexAliasItem item0 : this.aliases) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ResolveIndexResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ResolveIndexResponse> {
+        private List<ResolveIndexItem> indices;
+
+        private List<ResolveIndexAliasItem> aliases;
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indices</code>.
+         */
+        public final Builder indices(List<ResolveIndexItem> list) {
+            this.indices = _listAddAll(this.indices, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds one or more values to <code>indices</code>.
+         */
+        public final Builder indices(ResolveIndexItem value, ResolveIndexItem... values) {
+            this.indices = _listAdd(this.indices, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds a value to <code>indices</code> using a builder lambda.
+         */
+        public final Builder indices(Function<ResolveIndexItem.Builder, ObjectBuilder<ResolveIndexItem>> fn) {
+            return indices(fn.apply(new ResolveIndexItem.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code aliases}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>aliases</code>.
+         */
+        public final Builder aliases(List<ResolveIndexAliasItem> list) {
+            this.aliases = _listAddAll(this.aliases, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code aliases}
+         * <p>
+         * Adds one or more values to <code>aliases</code>.
+         */
+        public final Builder aliases(ResolveIndexAliasItem value, ResolveIndexAliasItem... values) {
+            this.aliases = _listAdd(this.aliases, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code aliases}
+         * <p>
+         * Adds a value to <code>aliases</code> using a builder lambda.
+         */
+        public final Builder aliases(Function<ResolveIndexAliasItem.Builder, ObjectBuilder<ResolveIndexAliasItem>> fn) {
+            return aliases(fn.apply(new ResolveIndexAliasItem.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ResolveIndexResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ResolveIndexResponse build() {
+            _checkSingleUse();
+
+            return new ResolveIndexResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ResolveIndexResponse}
+     */
+    public static final JsonpDeserializer<ResolveIndexResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ResolveIndexResponse::setupResolveIndexResponseDeserializer
+    );
+
+    protected static void setupResolveIndexResponseDeserializer(ObjectDeserializer<ResolveIndexResponse.Builder> op) {
+
+        op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(ResolveIndexItem._DESERIALIZER), "indices");
+        op.add(Builder::aliases, JsonpDeserializer.arrayDeserializer(ResolveIndexAliasItem._DESERIALIZER), "aliases");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/RolloverRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/RolloverRequest.java
index 061e75da0d..1f5b973d71 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/RolloverRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/RolloverRequest.java
@@ -32,12 +32,11 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
-import org.opensearch.client.opensearch._types.WaitForActiveShards;
-import org.opensearch.client.opensearch.indices.rollover.IndexRolloverMapping;
-import org.opensearch.client.opensearch.indices.rollover.RolloverConditions;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -45,552 +44,556 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.Time;
+import org.opensearch.client.opensearch._types.WaitForActiveShards;
+import org.opensearch.client.opensearch.indices.rollover.IndexRolloverMapping;
+import org.opensearch.client.opensearch.indices.rollover.RolloverConditions;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.rollover.Request
 
 /**
  * Updates an alias to point to a new index when the existing index is
  * considered to be too large or too old.
- * 
+ *
  */
 @JsonpDeserializable
 public class RolloverRequest extends RequestBase implements JsonpSerializable {
-	private final String alias;
-
-	private final Map<String, Alias> aliases;
-
-	@Nullable
-	private final RolloverConditions conditions;
-
-	@Nullable
-	private final Boolean dryRun;
-
-	@Nullable
-	private final IndexRolloverMapping mappings;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final String newIndex;
-
-	private final Map<String, JsonData> settings;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final WaitForActiveShards waitForActiveShards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RolloverRequest(Builder builder) {
-
-		this.alias = ApiTypeHelper.requireNonNull(builder.alias, this, "alias");
-		this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
-		this.conditions = builder.conditions;
-		this.dryRun = builder.dryRun;
-		this.mappings = builder.mappings;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.newIndex = builder.newIndex;
-		this.settings = ApiTypeHelper.unmodifiable(builder.settings);
-		this.timeout = builder.timeout;
-		this.waitForActiveShards = builder.waitForActiveShards;
-
-	}
-
-	public static RolloverRequest of(Function<Builder, ObjectBuilder<RolloverRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - The name of the alias to rollover
-	 * <p>
-	 * API name: {@code alias}
-	 */
-	public final String alias() {
-		return this.alias;
-	}
-
-	/**
-	 * API name: {@code aliases}
-	 */
-	public final Map<String, Alias> aliases() {
-		return this.aliases;
-	}
-
-	/**
-	 * API name: {@code conditions}
-	 */
-	@Nullable
-	public final RolloverConditions conditions() {
-		return this.conditions;
-	}
-
-	/**
-	 * If set to true the rollover action will only be validated but not actually
-	 * performed even if a condition matches. The default is false
-	 * <p>
-	 * API name: {@code dry_run}
-	 */
-	@Nullable
-	public final Boolean dryRun() {
-		return this.dryRun;
-	}
-
-	/**
-	 * API name: {@code mappings}
-	 */
-	@Nullable
-	public final IndexRolloverMapping mappings() {
-		return this.mappings;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * The name of the rollover index
-	 * <p>
-	 * API name: {@code new_index}
-	 */
-	@Nullable
-	public final String newIndex() {
-		return this.newIndex;
-	}
-
-	/**
-	 * API name: {@code settings}
-	 */
-	public final Map<String, JsonData> settings() {
-		return this.settings;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Set the number of active shards to wait for on the newly created rollover
-	 * index before the operation returns.
-	 * <p>
-	 * API name: {@code wait_for_active_shards}
-	 */
-	@Nullable
-	public final WaitForActiveShards waitForActiveShards() {
-		return this.waitForActiveShards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.aliases)) {
-			generator.writeKey("aliases");
-			generator.writeStartObject();
-			for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.conditions != null) {
-			generator.writeKey("conditions");
-			this.conditions.serialize(generator, mapper);
-
-		}
-		if (this.mappings != null) {
-			generator.writeKey("mappings");
-			this.mappings.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.settings)) {
-			generator.writeKey("settings");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RolloverRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RolloverRequest> {
-		private String alias;
-
-		@Nullable
-		private Map<String, Alias> aliases;
-
-		@Nullable
-		private RolloverConditions conditions;
-
-		@Nullable
-		private Boolean dryRun;
-
-		@Nullable
-		private IndexRolloverMapping mappings;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private String newIndex;
-
-		@Nullable
-		private Map<String, JsonData> settings;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private WaitForActiveShards waitForActiveShards;
-
-		/**
-		 * Required - The name of the alias to rollover
-		 * <p>
-		 * API name: {@code alias}
-		 */
-		public final Builder alias(String value) {
-			this.alias = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aliases</code>.
-		 */
-		public final Builder aliases(Map<String, Alias> map) {
-			this.aliases = _mapPutAll(this.aliases, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code>.
-		 */
-		public final Builder aliases(String key, Alias value) {
-			this.aliases = _mapPut(this.aliases, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code> using a builder lambda.
-		 */
-		public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
-			return aliases(key, fn.apply(new Alias.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code conditions}
-		 */
-		public final Builder conditions(@Nullable RolloverConditions value) {
-			this.conditions = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code conditions}
-		 */
-		public final Builder conditions(Function<RolloverConditions.Builder, ObjectBuilder<RolloverConditions>> fn) {
-			return this.conditions(fn.apply(new RolloverConditions.Builder()).build());
-		}
-
-		/**
-		 * If set to true the rollover action will only be validated but not actually
-		 * performed even if a condition matches. The default is false
-		 * <p>
-		 * API name: {@code dry_run}
-		 */
-		public final Builder dryRun(@Nullable Boolean value) {
-			this.dryRun = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mappings}
-		 */
-		public final Builder mappings(@Nullable IndexRolloverMapping value) {
-			this.mappings = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mappings}
-		 */
-		public final Builder mappings(Function<IndexRolloverMapping.Builder, ObjectBuilder<IndexRolloverMapping>> fn) {
-			return this.mappings(fn.apply(new IndexRolloverMapping.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * The name of the rollover index
-		 * <p>
-		 * API name: {@code new_index}
-		 */
-		public final Builder newIndex(@Nullable String value) {
-			this.newIndex = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code settings}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>settings</code>.
-		 */
-		public final Builder settings(Map<String, JsonData> map) {
-			this.settings = _mapPutAll(this.settings, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code settings}
-		 * <p>
-		 * Adds an entry to <code>settings</code>.
-		 */
-		public final Builder settings(String key, JsonData value) {
-			this.settings = _mapPut(this.settings, key, value);
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Set the number of active shards to wait for on the newly created rollover
-		 * index before the operation returns.
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
-			this.waitForActiveShards = value;
-			return this;
-		}
-
-		/**
-		 * Set the number of active shards to wait for on the newly created rollover
-		 * index before the operation returns.
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(
-				Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
-			return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link RolloverRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RolloverRequest build() {
-			_checkSingleUse();
-
-			return new RolloverRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RolloverRequest}
-	 */
-	public static final JsonpDeserializer<RolloverRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RolloverRequest::setupRolloverRequestDeserializer);
-
-	protected static void setupRolloverRequestDeserializer(ObjectDeserializer<RolloverRequest.Builder> op) {
-
-		op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
-		op.add(Builder::conditions, RolloverConditions._DESERIALIZER, "conditions");
-		op.add(Builder::mappings, IndexRolloverMapping._DESERIALIZER, "mappings");
-		op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "settings");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.rollover}".
-	 */
-	public static final Endpoint<RolloverRequest, RolloverResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _newIndex = 1 << 0;
-				final int _alias = 1 << 1;
-
-				int propsSet = 0;
-
-				if (request.newIndex() != null)
-					propsSet |= _newIndex;
-				propsSet |= _alias;
-
-				if (propsSet == (_alias)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.alias, buf);
-					buf.append("/_rollover");
-					return buf.toString();
-				}
-				if (propsSet == (_alias | _newIndex)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.alias, buf);
-					buf.append("/_rollover");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.newIndex, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.waitForActiveShards != null) {
-					params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
-				}
-				if (request.dryRun != null) {
-					params.put("dry_run", String.valueOf(request.dryRun));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, RolloverResponse._DESERIALIZER);
+    private final String alias;
+
+    private final Map<String, Alias> aliases;
+
+    @Nullable
+    private final RolloverConditions conditions;
+
+    @Nullable
+    private final Boolean dryRun;
+
+    @Nullable
+    private final IndexRolloverMapping mappings;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final String newIndex;
+
+    private final Map<String, JsonData> settings;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final WaitForActiveShards waitForActiveShards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RolloverRequest(Builder builder) {
+
+        this.alias = ApiTypeHelper.requireNonNull(builder.alias, this, "alias");
+        this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
+        this.conditions = builder.conditions;
+        this.dryRun = builder.dryRun;
+        this.mappings = builder.mappings;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.newIndex = builder.newIndex;
+        this.settings = ApiTypeHelper.unmodifiable(builder.settings);
+        this.timeout = builder.timeout;
+        this.waitForActiveShards = builder.waitForActiveShards;
+
+    }
+
+    public static RolloverRequest of(Function<Builder, ObjectBuilder<RolloverRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - The name of the alias to rollover
+     * <p>
+     * API name: {@code alias}
+     */
+    public final String alias() {
+        return this.alias;
+    }
+
+    /**
+     * API name: {@code aliases}
+     */
+    public final Map<String, Alias> aliases() {
+        return this.aliases;
+    }
+
+    /**
+     * API name: {@code conditions}
+     */
+    @Nullable
+    public final RolloverConditions conditions() {
+        return this.conditions;
+    }
+
+    /**
+     * If set to true the rollover action will only be validated but not actually
+     * performed even if a condition matches. The default is false
+     * <p>
+     * API name: {@code dry_run}
+     */
+    @Nullable
+    public final Boolean dryRun() {
+        return this.dryRun;
+    }
+
+    /**
+     * API name: {@code mappings}
+     */
+    @Nullable
+    public final IndexRolloverMapping mappings() {
+        return this.mappings;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * The name of the rollover index
+     * <p>
+     * API name: {@code new_index}
+     */
+    @Nullable
+    public final String newIndex() {
+        return this.newIndex;
+    }
+
+    /**
+     * API name: {@code settings}
+     */
+    public final Map<String, JsonData> settings() {
+        return this.settings;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Set the number of active shards to wait for on the newly created rollover
+     * index before the operation returns.
+     * <p>
+     * API name: {@code wait_for_active_shards}
+     */
+    @Nullable
+    public final WaitForActiveShards waitForActiveShards() {
+        return this.waitForActiveShards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.aliases)) {
+            generator.writeKey("aliases");
+            generator.writeStartObject();
+            for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.conditions != null) {
+            generator.writeKey("conditions");
+            this.conditions.serialize(generator, mapper);
+
+        }
+        if (this.mappings != null) {
+            generator.writeKey("mappings");
+            this.mappings.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.settings)) {
+            generator.writeKey("settings");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RolloverRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RolloverRequest> {
+        private String alias;
+
+        @Nullable
+        private Map<String, Alias> aliases;
+
+        @Nullable
+        private RolloverConditions conditions;
+
+        @Nullable
+        private Boolean dryRun;
+
+        @Nullable
+        private IndexRolloverMapping mappings;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private String newIndex;
+
+        @Nullable
+        private Map<String, JsonData> settings;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private WaitForActiveShards waitForActiveShards;
+
+        /**
+         * Required - The name of the alias to rollover
+         * <p>
+         * API name: {@code alias}
+         */
+        public final Builder alias(String value) {
+            this.alias = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aliases</code>.
+         */
+        public final Builder aliases(Map<String, Alias> map) {
+            this.aliases = _mapPutAll(this.aliases, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code>.
+         */
+        public final Builder aliases(String key, Alias value) {
+            this.aliases = _mapPut(this.aliases, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code> using a builder lambda.
+         */
+        public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
+            return aliases(key, fn.apply(new Alias.Builder()).build());
+        }
+
+        /**
+         * API name: {@code conditions}
+         */
+        public final Builder conditions(@Nullable RolloverConditions value) {
+            this.conditions = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code conditions}
+         */
+        public final Builder conditions(Function<RolloverConditions.Builder, ObjectBuilder<RolloverConditions>> fn) {
+            return this.conditions(fn.apply(new RolloverConditions.Builder()).build());
+        }
+
+        /**
+         * If set to true the rollover action will only be validated but not actually
+         * performed even if a condition matches. The default is false
+         * <p>
+         * API name: {@code dry_run}
+         */
+        public final Builder dryRun(@Nullable Boolean value) {
+            this.dryRun = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mappings}
+         */
+        public final Builder mappings(@Nullable IndexRolloverMapping value) {
+            this.mappings = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mappings}
+         */
+        public final Builder mappings(Function<IndexRolloverMapping.Builder, ObjectBuilder<IndexRolloverMapping>> fn) {
+            return this.mappings(fn.apply(new IndexRolloverMapping.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * The name of the rollover index
+         * <p>
+         * API name: {@code new_index}
+         */
+        public final Builder newIndex(@Nullable String value) {
+            this.newIndex = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code settings}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>settings</code>.
+         */
+        public final Builder settings(Map<String, JsonData> map) {
+            this.settings = _mapPutAll(this.settings, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code settings}
+         * <p>
+         * Adds an entry to <code>settings</code>.
+         */
+        public final Builder settings(String key, JsonData value) {
+            this.settings = _mapPut(this.settings, key, value);
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Set the number of active shards to wait for on the newly created rollover
+         * index before the operation returns.
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
+            this.waitForActiveShards = value;
+            return this;
+        }
+
+        /**
+         * Set the number of active shards to wait for on the newly created rollover
+         * index before the operation returns.
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
+            return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link RolloverRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RolloverRequest build() {
+            _checkSingleUse();
+
+            return new RolloverRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RolloverRequest}
+     */
+    public static final JsonpDeserializer<RolloverRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RolloverRequest::setupRolloverRequestDeserializer
+    );
+
+    protected static void setupRolloverRequestDeserializer(ObjectDeserializer<RolloverRequest.Builder> op) {
+
+        op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
+        op.add(Builder::conditions, RolloverConditions._DESERIALIZER, "conditions");
+        op.add(Builder::mappings, IndexRolloverMapping._DESERIALIZER, "mappings");
+        op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "settings");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.rollover}".
+     */
+    public static final Endpoint<RolloverRequest, RolloverResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _newIndex = 1 << 0;
+            final int _alias = 1 << 1;
+
+            int propsSet = 0;
+
+            if (request.newIndex() != null) propsSet |= _newIndex;
+            propsSet |= _alias;
+
+            if (propsSet == (_alias)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.alias, buf);
+                buf.append("/_rollover");
+                return buf.toString();
+            }
+            if (propsSet == (_alias | _newIndex)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.alias, buf);
+                buf.append("/_rollover");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.newIndex, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.waitForActiveShards != null) {
+                params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
+            }
+            if (request.dryRun != null) {
+                params.put("dry_run", String.valueOf(request.dryRun));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        RolloverResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/RolloverResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/RolloverResponse.java
index 1879481dc8..6cf397d85c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/RolloverResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/RolloverResponse.java
@@ -32,242 +32,241 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: indices.rollover.Response
 
 @JsonpDeserializable
 public class RolloverResponse extends AcknowledgedResponseBase {
-	private final Map<String, Boolean> conditions;
+    private final Map<String, Boolean> conditions;
+
+    private final boolean dryRun;
 
-	private final boolean dryRun;
+    private final String newIndex;
 
-	private final String newIndex;
+    private final String oldIndex;
 
-	private final String oldIndex;
+    private final boolean rolledOver;
 
-	private final boolean rolledOver;
+    private final boolean shardsAcknowledged;
 
-	private final boolean shardsAcknowledged;
+    // ---------------------------------------------------------------------------------------------
 
-	// ---------------------------------------------------------------------------------------------
+    private RolloverResponse(Builder builder) {
+        super(builder);
 
-	private RolloverResponse(Builder builder) {
-		super(builder);
+        this.conditions = ApiTypeHelper.unmodifiableRequired(builder.conditions, this, "conditions");
+        this.dryRun = ApiTypeHelper.requireNonNull(builder.dryRun, this, "dryRun");
+        this.newIndex = ApiTypeHelper.requireNonNull(builder.newIndex, this, "newIndex");
+        this.oldIndex = ApiTypeHelper.requireNonNull(builder.oldIndex, this, "oldIndex");
+        this.rolledOver = ApiTypeHelper.requireNonNull(builder.rolledOver, this, "rolledOver");
+        this.shardsAcknowledged = ApiTypeHelper.requireNonNull(builder.shardsAcknowledged, this, "shardsAcknowledged");
 
-		this.conditions = ApiTypeHelper.unmodifiableRequired(builder.conditions, this, "conditions");
-		this.dryRun = ApiTypeHelper.requireNonNull(builder.dryRun, this, "dryRun");
-		this.newIndex = ApiTypeHelper.requireNonNull(builder.newIndex, this, "newIndex");
-		this.oldIndex = ApiTypeHelper.requireNonNull(builder.oldIndex, this, "oldIndex");
-		this.rolledOver = ApiTypeHelper.requireNonNull(builder.rolledOver, this, "rolledOver");
-		this.shardsAcknowledged = ApiTypeHelper.requireNonNull(builder.shardsAcknowledged, this, "shardsAcknowledged");
+    }
 
-	}
+    public static RolloverResponse of(Function<Builder, ObjectBuilder<RolloverResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	public static RolloverResponse of(Function<Builder, ObjectBuilder<RolloverResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    /**
+     * Required - API name: {@code conditions}
+     */
+    public final Map<String, Boolean> conditions() {
+        return this.conditions;
+    }
 
-	/**
-	 * Required - API name: {@code conditions}
-	 */
-	public final Map<String, Boolean> conditions() {
-		return this.conditions;
-	}
+    /**
+     * Required - API name: {@code dry_run}
+     */
+    public final boolean dryRun() {
+        return this.dryRun;
+    }
 
-	/**
-	 * Required - API name: {@code dry_run}
-	 */
-	public final boolean dryRun() {
-		return this.dryRun;
-	}
+    /**
+     * Required - API name: {@code new_index}
+     */
+    public final String newIndex() {
+        return this.newIndex;
+    }
 
-	/**
-	 * Required - API name: {@code new_index}
-	 */
-	public final String newIndex() {
-		return this.newIndex;
-	}
-
-	/**
-	 * Required - API name: {@code old_index}
-	 */
-	public final String oldIndex() {
-		return this.oldIndex;
-	}
-
-	/**
-	 * Required - API name: {@code rolled_over}
-	 */
-	public final boolean rolledOver() {
-		return this.rolledOver;
-	}
-
-	/**
-	 * Required - API name: {@code shards_acknowledged}
-	 */
-	public final boolean shardsAcknowledged() {
-		return this.shardsAcknowledged;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.conditions)) {
-			generator.writeKey("conditions");
-			generator.writeStartObject();
-			for (Map.Entry<String, Boolean> item0 : this.conditions.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("dry_run");
-		generator.write(this.dryRun);
-
-		generator.writeKey("new_index");
-		generator.write(this.newIndex);
-
-		generator.writeKey("old_index");
-		generator.write(this.oldIndex);
-
-		generator.writeKey("rolled_over");
-		generator.write(this.rolledOver);
-
-		generator.writeKey("shards_acknowledged");
-		generator.write(this.shardsAcknowledged);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RolloverResponse}.
-	 */
-
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<RolloverResponse> {
-		private Map<String, Boolean> conditions;
-
-		private Boolean dryRun;
-
-		private String newIndex;
-
-		private String oldIndex;
-
-		private Boolean rolledOver;
-
-		private Boolean shardsAcknowledged;
-
-		/**
-		 * Required - API name: {@code conditions}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>conditions</code>.
-		 */
-		public final Builder conditions(Map<String, Boolean> map) {
-			this.conditions = _mapPutAll(this.conditions, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code conditions}
-		 * <p>
-		 * Adds an entry to <code>conditions</code>.
-		 */
-		public final Builder conditions(String key, Boolean value) {
-			this.conditions = _mapPut(this.conditions, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code dry_run}
-		 */
-		public final Builder dryRun(boolean value) {
-			this.dryRun = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code new_index}
-		 */
-		public final Builder newIndex(String value) {
-			this.newIndex = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code old_index}
-		 */
-		public final Builder oldIndex(String value) {
-			this.oldIndex = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code rolled_over}
-		 */
-		public final Builder rolledOver(boolean value) {
-			this.rolledOver = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards_acknowledged}
-		 */
-		public final Builder shardsAcknowledged(boolean value) {
-			this.shardsAcknowledged = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RolloverResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RolloverResponse build() {
-			_checkSingleUse();
-
-			return new RolloverResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RolloverResponse}
-	 */
-	public static final JsonpDeserializer<RolloverResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RolloverResponse::setupRolloverResponseDeserializer);
-
-	protected static void setupRolloverResponseDeserializer(ObjectDeserializer<RolloverResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
-		op.add(Builder::conditions, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.booleanDeserializer()),
-				"conditions");
-		op.add(Builder::dryRun, JsonpDeserializer.booleanDeserializer(), "dry_run");
-		op.add(Builder::newIndex, JsonpDeserializer.stringDeserializer(), "new_index");
-		op.add(Builder::oldIndex, JsonpDeserializer.stringDeserializer(), "old_index");
-		op.add(Builder::rolledOver, JsonpDeserializer.booleanDeserializer(), "rolled_over");
-		op.add(Builder::shardsAcknowledged, JsonpDeserializer.booleanDeserializer(), "shards_acknowledged");
-
-	}
+    /**
+     * Required - API name: {@code old_index}
+     */
+    public final String oldIndex() {
+        return this.oldIndex;
+    }
+
+    /**
+     * Required - API name: {@code rolled_over}
+     */
+    public final boolean rolledOver() {
+        return this.rolledOver;
+    }
+
+    /**
+     * Required - API name: {@code shards_acknowledged}
+     */
+    public final boolean shardsAcknowledged() {
+        return this.shardsAcknowledged;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.conditions)) {
+            generator.writeKey("conditions");
+            generator.writeStartObject();
+            for (Map.Entry<String, Boolean> item0 : this.conditions.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("dry_run");
+        generator.write(this.dryRun);
+
+        generator.writeKey("new_index");
+        generator.write(this.newIndex);
+
+        generator.writeKey("old_index");
+        generator.write(this.oldIndex);
+
+        generator.writeKey("rolled_over");
+        generator.write(this.rolledOver);
+
+        generator.writeKey("shards_acknowledged");
+        generator.write(this.shardsAcknowledged);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RolloverResponse}.
+     */
+
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<RolloverResponse> {
+        private Map<String, Boolean> conditions;
+
+        private Boolean dryRun;
+
+        private String newIndex;
+
+        private String oldIndex;
+
+        private Boolean rolledOver;
+
+        private Boolean shardsAcknowledged;
+
+        /**
+         * Required - API name: {@code conditions}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>conditions</code>.
+         */
+        public final Builder conditions(Map<String, Boolean> map) {
+            this.conditions = _mapPutAll(this.conditions, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code conditions}
+         * <p>
+         * Adds an entry to <code>conditions</code>.
+         */
+        public final Builder conditions(String key, Boolean value) {
+            this.conditions = _mapPut(this.conditions, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code dry_run}
+         */
+        public final Builder dryRun(boolean value) {
+            this.dryRun = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code new_index}
+         */
+        public final Builder newIndex(String value) {
+            this.newIndex = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code old_index}
+         */
+        public final Builder oldIndex(String value) {
+            this.oldIndex = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code rolled_over}
+         */
+        public final Builder rolledOver(boolean value) {
+            this.rolledOver = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards_acknowledged}
+         */
+        public final Builder shardsAcknowledged(boolean value) {
+            this.shardsAcknowledged = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RolloverResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RolloverResponse build() {
+            _checkSingleUse();
+
+            return new RolloverResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RolloverResponse}
+     */
+    public static final JsonpDeserializer<RolloverResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RolloverResponse::setupRolloverResponseDeserializer
+    );
+
+    protected static void setupRolloverResponseDeserializer(ObjectDeserializer<RolloverResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+        op.add(Builder::conditions, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.booleanDeserializer()), "conditions");
+        op.add(Builder::dryRun, JsonpDeserializer.booleanDeserializer(), "dry_run");
+        op.add(Builder::newIndex, JsonpDeserializer.stringDeserializer(), "new_index");
+        op.add(Builder::oldIndex, JsonpDeserializer.stringDeserializer(), "old_index");
+        op.add(Builder::rolledOver, JsonpDeserializer.booleanDeserializer(), "rolled_over");
+        op.add(Builder::shardsAcknowledged, JsonpDeserializer.booleanDeserializer(), "shards_acknowledged");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentSortMissing.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentSortMissing.java
index cfe9047ec7..f429e2d273 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentSortMissing.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentSortMissing.java
@@ -35,25 +35,23 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum SegmentSortMissing implements JsonEnum {
-	Last("_last"),
+    Last("_last"),
 
-	First("_first"),
+    First("_first"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	SegmentSortMissing(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    SegmentSortMissing(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<SegmentSortMissing> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			SegmentSortMissing.values());
+    public static final JsonEnum.Deserializer<SegmentSortMissing> _DESERIALIZER = new JsonEnum.Deserializer<>(SegmentSortMissing.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentSortMode.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentSortMode.java
index 7cb1ef31d2..350de9369f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentSortMode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentSortMode.java
@@ -35,25 +35,23 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum SegmentSortMode implements JsonEnum {
-	Min("min"),
+    Min("min"),
 
-	Max("max"),
+    Max("max"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	SegmentSortMode(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    SegmentSortMode(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<SegmentSortMode> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			SegmentSortMode.values());
+    public static final JsonEnum.Deserializer<SegmentSortMode> _DESERIALIZER = new JsonEnum.Deserializer<>(SegmentSortMode.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentSortOrder.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentSortOrder.java
index 3a99e37bf8..fc74f723a1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentSortOrder.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentSortOrder.java
@@ -35,25 +35,23 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum SegmentSortOrder implements JsonEnum {
-	Asc("asc"),
+    Asc("asc"),
 
-	Desc("desc"),
+    Desc("desc"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	SegmentSortOrder(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    SegmentSortOrder(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<SegmentSortOrder> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			SegmentSortOrder.values());
+    public static final JsonEnum.Deserializer<SegmentSortOrder> _DESERIALIZER = new JsonEnum.Deserializer<>(SegmentSortOrder.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentsRequest.java
index 083e75085c..59c539a754 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentsRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -41,279 +47,273 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.segments.Request
 
 /**
  * Provides low-level information about segments in a Lucene index.
- * 
+ *
  */
 
 public class SegmentsRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Boolean verbose;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SegmentsRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.verbose = builder.verbose;
-
-	}
-
-	public static SegmentsRequest of(Function<Builder, ObjectBuilder<SegmentsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * A comma-separated list of index names; use <code>_all</code> or empty string
-	 * to perform the operation on all indices
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Includes detailed memory usage by Lucene.
-	 * <p>
-	 * API name: {@code verbose}
-	 */
-	@Nullable
-	public final Boolean verbose() {
-		return this.verbose;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SegmentsRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SegmentsRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private Boolean verbose;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Includes detailed memory usage by Lucene.
-		 * <p>
-		 * API name: {@code verbose}
-		 */
-		public final Builder verbose(@Nullable Boolean value) {
-			this.verbose = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SegmentsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SegmentsRequest build() {
-			_checkSingleUse();
-
-			return new SegmentsRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.segments}".
-	 */
-	public static final Endpoint<SegmentsRequest, SegmentsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_segments");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_segments");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.verbose != null) {
-					params.put("verbose", String.valueOf(request.verbose));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, SegmentsResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Boolean verbose;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SegmentsRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.verbose = builder.verbose;
+
+    }
+
+    public static SegmentsRequest of(Function<Builder, ObjectBuilder<SegmentsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * A comma-separated list of index names; use <code>_all</code> or empty string
+     * to perform the operation on all indices
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Includes detailed memory usage by Lucene.
+     * <p>
+     * API name: {@code verbose}
+     */
+    @Nullable
+    public final Boolean verbose() {
+        return this.verbose;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SegmentsRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SegmentsRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private Boolean verbose;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Includes detailed memory usage by Lucene.
+         * <p>
+         * API name: {@code verbose}
+         */
+        public final Builder verbose(@Nullable Boolean value) {
+            this.verbose = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link SegmentsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SegmentsRequest build() {
+            _checkSingleUse();
+
+            return new SegmentsRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.segments}".
+     */
+    public static final Endpoint<SegmentsRequest, SegmentsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_segments");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_segments");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.verbose != null) {
+                params.put("verbose", String.valueOf(request.verbose));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        SegmentsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentsResponse.java
index 7c575aaff7..a6824ab753 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SegmentsResponse.java
@@ -32,165 +32,166 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ShardStatistics;
-import org.opensearch.client.opensearch.indices.segments.IndexSegment;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ShardStatistics;
+import org.opensearch.client.opensearch.indices.segments.IndexSegment;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: indices.segments.Response
 
 @JsonpDeserializable
 public class SegmentsResponse implements JsonpSerializable {
-	private final Map<String, IndexSegment> indices;
-
-	private final ShardStatistics shards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SegmentsResponse(Builder builder) {
-
-		this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
-		this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
-
-	}
-
-	public static SegmentsResponse of(Function<Builder, ObjectBuilder<SegmentsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code indices}
-	 */
-	public final Map<String, IndexSegment> indices() {
-		return this.indices;
-	}
-
-	/**
-	 * Required - API name: {@code _shards}
-	 */
-	public final ShardStatistics shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartObject();
-			for (Map.Entry<String, IndexSegment> item0 : this.indices.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("_shards");
-		this.shards.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SegmentsResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SegmentsResponse> {
-		private Map<String, IndexSegment> indices;
-
-		private ShardStatistics shards;
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>indices</code>.
-		 */
-		public final Builder indices(Map<String, IndexSegment> map) {
-			this.indices = _mapPutAll(this.indices, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds an entry to <code>indices</code>.
-		 */
-		public final Builder indices(String key, IndexSegment value) {
-			this.indices = _mapPut(this.indices, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds an entry to <code>indices</code> using a builder lambda.
-		 */
-		public final Builder indices(String key, Function<IndexSegment.Builder, ObjectBuilder<IndexSegment>> fn) {
-			return indices(key, fn.apply(new IndexSegment.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code _shards}
-		 */
-		public final Builder shards(ShardStatistics value) {
-			this.shards = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _shards}
-		 */
-		public final Builder shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
-			return this.shards(fn.apply(new ShardStatistics.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link SegmentsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SegmentsResponse build() {
-			_checkSingleUse();
-
-			return new SegmentsResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SegmentsResponse}
-	 */
-	public static final JsonpDeserializer<SegmentsResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SegmentsResponse::setupSegmentsResponseDeserializer);
-
-	protected static void setupSegmentsResponseDeserializer(ObjectDeserializer<SegmentsResponse.Builder> op) {
-
-		op.add(Builder::indices, JsonpDeserializer.stringMapDeserializer(IndexSegment._DESERIALIZER), "indices");
-		op.add(Builder::shards, ShardStatistics._DESERIALIZER, "_shards");
-
-	}
+    private final Map<String, IndexSegment> indices;
+
+    private final ShardStatistics shards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SegmentsResponse(Builder builder) {
+
+        this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
+        this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
+
+    }
+
+    public static SegmentsResponse of(Function<Builder, ObjectBuilder<SegmentsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code indices}
+     */
+    public final Map<String, IndexSegment> indices() {
+        return this.indices;
+    }
+
+    /**
+     * Required - API name: {@code _shards}
+     */
+    public final ShardStatistics shards() {
+        return this.shards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartObject();
+            for (Map.Entry<String, IndexSegment> item0 : this.indices.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("_shards");
+        this.shards.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SegmentsResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SegmentsResponse> {
+        private Map<String, IndexSegment> indices;
+
+        private ShardStatistics shards;
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>indices</code>.
+         */
+        public final Builder indices(Map<String, IndexSegment> map) {
+            this.indices = _mapPutAll(this.indices, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds an entry to <code>indices</code>.
+         */
+        public final Builder indices(String key, IndexSegment value) {
+            this.indices = _mapPut(this.indices, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds an entry to <code>indices</code> using a builder lambda.
+         */
+        public final Builder indices(String key, Function<IndexSegment.Builder, ObjectBuilder<IndexSegment>> fn) {
+            return indices(key, fn.apply(new IndexSegment.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code _shards}
+         */
+        public final Builder shards(ShardStatistics value) {
+            this.shards = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _shards}
+         */
+        public final Builder shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
+            return this.shards(fn.apply(new ShardStatistics.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link SegmentsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SegmentsResponse build() {
+            _checkSingleUse();
+
+            return new SegmentsResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SegmentsResponse}
+     */
+    public static final JsonpDeserializer<SegmentsResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SegmentsResponse::setupSegmentsResponseDeserializer
+    );
+
+    protected static void setupSegmentsResponseDeserializer(ObjectDeserializer<SegmentsResponse.Builder> op) {
+
+        op.add(Builder::indices, JsonpDeserializer.stringMapDeserializer(IndexSegment._DESERIALIZER), "indices");
+        op.add(Builder::shards, ShardStatistics._DESERIALIZER, "_shards");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ShardStoresRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ShardStoresRequest.java
index bfe6d132ed..e43950f0ac 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ShardStoresRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ShardStoresRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -42,290 +48,283 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.shard_stores.Request
 
 /**
  * Provides store information for shard copies of indices.
- * 
+ *
  */
 
 public class ShardStoresRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	private final List<ShardStoreStatus> status;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShardStoresRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.status = ApiTypeHelper.unmodifiable(builder.status);
-
-	}
-
-	public static ShardStoresRequest of(Function<Builder, ObjectBuilder<ShardStoresRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * If false, the request returns an error if any wildcard expression, index
-	 * alias, or _all value targets only missing or closed indices. This behavior
-	 * applies even if the request targets other open indices.
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Type of index that wildcard patterns can match. If the request can target
-	 * data streams, this argument determines whether wildcard expressions match
-	 * hidden data streams.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * If true, missing or closed indices are not included in the response.
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * List of data streams, indices, and aliases used to limit the request.
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * List of shard health statuses used to limit the request.
-	 * <p>
-	 * API name: {@code status}
-	 */
-	public final List<ShardStoreStatus> status() {
-		return this.status;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardStoresRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardStoresRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private List<ShardStoreStatus> status;
-
-		/**
-		 * If false, the request returns an error if any wildcard expression, index
-		 * alias, or _all value targets only missing or closed indices. This behavior
-		 * applies even if the request targets other open indices.
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Type of index that wildcard patterns can match. If the request can target
-		 * data streams, this argument determines whether wildcard expressions match
-		 * hidden data streams.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Type of index that wildcard patterns can match. If the request can target
-		 * data streams, this argument determines whether wildcard expressions match
-		 * hidden data streams.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * If true, missing or closed indices are not included in the response.
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * List of data streams, indices, and aliases used to limit the request.
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * List of data streams, indices, and aliases used to limit the request.
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * List of shard health statuses used to limit the request.
-		 * <p>
-		 * API name: {@code status}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>status</code>.
-		 */
-		public final Builder status(List<ShardStoreStatus> list) {
-			this.status = _listAddAll(this.status, list);
-			return this;
-		}
-
-		/**
-		 * List of shard health statuses used to limit the request.
-		 * <p>
-		 * API name: {@code status}
-		 * <p>
-		 * Adds one or more values to <code>status</code>.
-		 */
-		public final Builder status(ShardStoreStatus value, ShardStoreStatus... values) {
-			this.status = _listAdd(this.status, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShardStoresRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardStoresRequest build() {
-			_checkSingleUse();
-
-			return new ShardStoresRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.shard_stores}".
-	 */
-	public static final Endpoint<ShardStoresRequest, ShardStoresResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_shard_stores");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_shard_stores");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					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(",")));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, ShardStoresResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    private final List<ShardStoreStatus> status;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShardStoresRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.status = ApiTypeHelper.unmodifiable(builder.status);
+
+    }
+
+    public static ShardStoresRequest of(Function<Builder, ObjectBuilder<ShardStoresRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * If false, the request returns an error if any wildcard expression, index
+     * alias, or _all value targets only missing or closed indices. This behavior
+     * applies even if the request targets other open indices.
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Type of index that wildcard patterns can match. If the request can target
+     * data streams, this argument determines whether wildcard expressions match
+     * hidden data streams.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * If true, missing or closed indices are not included in the response.
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * List of data streams, indices, and aliases used to limit the request.
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * List of shard health statuses used to limit the request.
+     * <p>
+     * API name: {@code status}
+     */
+    public final List<ShardStoreStatus> status() {
+        return this.status;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardStoresRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardStoresRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private List<ShardStoreStatus> status;
+
+        /**
+         * If false, the request returns an error if any wildcard expression, index
+         * alias, or _all value targets only missing or closed indices. This behavior
+         * applies even if the request targets other open indices.
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Type of index that wildcard patterns can match. If the request can target
+         * data streams, this argument determines whether wildcard expressions match
+         * hidden data streams.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Type of index that wildcard patterns can match. If the request can target
+         * data streams, this argument determines whether wildcard expressions match
+         * hidden data streams.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * If true, missing or closed indices are not included in the response.
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * List of data streams, indices, and aliases used to limit the request.
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * List of data streams, indices, and aliases used to limit the request.
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * List of shard health statuses used to limit the request.
+         * <p>
+         * API name: {@code status}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>status</code>.
+         */
+        public final Builder status(List<ShardStoreStatus> list) {
+            this.status = _listAddAll(this.status, list);
+            return this;
+        }
+
+        /**
+         * List of shard health statuses used to limit the request.
+         * <p>
+         * API name: {@code status}
+         * <p>
+         * Adds one or more values to <code>status</code>.
+         */
+        public final Builder status(ShardStoreStatus value, ShardStoreStatus... values) {
+            this.status = _listAdd(this.status, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShardStoresRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardStoresRequest build() {
+            _checkSingleUse();
+
+            return new ShardStoresRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.shard_stores}".
+     */
+    public static final Endpoint<ShardStoresRequest, ShardStoresResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_shard_stores");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_shard_stores");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                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(",")));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        ShardStoresResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ShardStoresResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ShardStoresResponse.java
index 8d39cbe910..77550b3f8c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ShardStoresResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ShardStoresResponse.java
@@ -32,135 +32,135 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch.indices.shard_stores.IndicesShardStores;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.indices.shard_stores.IndicesShardStores;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: indices.shard_stores.Response
 
 @JsonpDeserializable
 public class ShardStoresResponse implements JsonpSerializable {
-	private final Map<String, IndicesShardStores> indices;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShardStoresResponse(Builder builder) {
-
-		this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
-
-	}
-
-	public static ShardStoresResponse of(Function<Builder, ObjectBuilder<ShardStoresResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code indices}
-	 */
-	public final Map<String, IndicesShardStores> indices() {
-		return this.indices;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartObject();
-			for (Map.Entry<String, IndicesShardStores> item0 : this.indices.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardStoresResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardStoresResponse> {
-		private Map<String, IndicesShardStores> indices;
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>indices</code>.
-		 */
-		public final Builder indices(Map<String, IndicesShardStores> map) {
-			this.indices = _mapPutAll(this.indices, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds an entry to <code>indices</code>.
-		 */
-		public final Builder indices(String key, IndicesShardStores value) {
-			this.indices = _mapPut(this.indices, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds an entry to <code>indices</code> using a builder lambda.
-		 */
-		public final Builder indices(String key,
-				Function<IndicesShardStores.Builder, ObjectBuilder<IndicesShardStores>> fn) {
-			return indices(key, fn.apply(new IndicesShardStores.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ShardStoresResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardStoresResponse build() {
-			_checkSingleUse();
-
-			return new ShardStoresResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardStoresResponse}
-	 */
-	public static final JsonpDeserializer<ShardStoresResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ShardStoresResponse::setupShardStoresResponseDeserializer);
-
-	protected static void setupShardStoresResponseDeserializer(ObjectDeserializer<ShardStoresResponse.Builder> op) {
-
-		op.add(Builder::indices, JsonpDeserializer.stringMapDeserializer(IndicesShardStores._DESERIALIZER), "indices");
-
-	}
+    private final Map<String, IndicesShardStores> indices;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShardStoresResponse(Builder builder) {
+
+        this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
+
+    }
+
+    public static ShardStoresResponse of(Function<Builder, ObjectBuilder<ShardStoresResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code indices}
+     */
+    public final Map<String, IndicesShardStores> indices() {
+        return this.indices;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartObject();
+            for (Map.Entry<String, IndicesShardStores> item0 : this.indices.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardStoresResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardStoresResponse> {
+        private Map<String, IndicesShardStores> indices;
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>indices</code>.
+         */
+        public final Builder indices(Map<String, IndicesShardStores> map) {
+            this.indices = _mapPutAll(this.indices, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds an entry to <code>indices</code>.
+         */
+        public final Builder indices(String key, IndicesShardStores value) {
+            this.indices = _mapPut(this.indices, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds an entry to <code>indices</code> using a builder lambda.
+         */
+        public final Builder indices(String key, Function<IndicesShardStores.Builder, ObjectBuilder<IndicesShardStores>> fn) {
+            return indices(key, fn.apply(new IndicesShardStores.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ShardStoresResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardStoresResponse build() {
+            _checkSingleUse();
+
+            return new ShardStoresResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardStoresResponse}
+     */
+    public static final JsonpDeserializer<ShardStoresResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardStoresResponse::setupShardStoresResponseDeserializer
+    );
+
+    protected static void setupShardStoresResponseDeserializer(ObjectDeserializer<ShardStoresResponse.Builder> op) {
+
+        op.add(Builder::indices, JsonpDeserializer.stringMapDeserializer(IndicesShardStores._DESERIALIZER), "indices");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ShrinkRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ShrinkRequest.java
index 547beb6085..802704f857 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ShrinkRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ShrinkRequest.java
@@ -32,10 +32,11 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
-import org.opensearch.client.opensearch._types.WaitForActiveShards;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -43,435 +44,439 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.Time;
+import org.opensearch.client.opensearch._types.WaitForActiveShards;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.shrink.Request
 
 /**
  * Allow to shrink an existing index into a new index with fewer primary shards.
- * 
+ *
  */
 @JsonpDeserializable
 public class ShrinkRequest extends RequestBase implements JsonpSerializable {
-	private final Map<String, Alias> aliases;
-
-	private final String index;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final Map<String, JsonData> settings;
-
-	private final String target;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final WaitForActiveShards waitForActiveShards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShrinkRequest(Builder builder) {
-
-		this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.settings = ApiTypeHelper.unmodifiable(builder.settings);
-		this.target = ApiTypeHelper.requireNonNull(builder.target, this, "target");
-		this.timeout = builder.timeout;
-		this.waitForActiveShards = builder.waitForActiveShards;
-
-	}
-
-	public static ShrinkRequest of(Function<Builder, ObjectBuilder<ShrinkRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code aliases}
-	 */
-	public final Map<String, Alias> aliases() {
-		return this.aliases;
-	}
-
-	/**
-	 * Required - The name of the source index to shrink
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * API name: {@code settings}
-	 */
-	public final Map<String, JsonData> settings() {
-		return this.settings;
-	}
-
-	/**
-	 * Required - The name of the target index to shrink into
-	 * <p>
-	 * API name: {@code target}
-	 */
-	public final String target() {
-		return this.target;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Set the number of active shards to wait for on the shrunken index before the
-	 * operation returns.
-	 * <p>
-	 * API name: {@code wait_for_active_shards}
-	 */
-	@Nullable
-	public final WaitForActiveShards waitForActiveShards() {
-		return this.waitForActiveShards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.aliases)) {
-			generator.writeKey("aliases");
-			generator.writeStartObject();
-			for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.settings)) {
-			generator.writeKey("settings");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShrinkRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShrinkRequest> {
-		@Nullable
-		private Map<String, Alias> aliases;
-
-		private String index;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Map<String, JsonData> settings;
-
-		private String target;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private WaitForActiveShards waitForActiveShards;
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aliases</code>.
-		 */
-		public final Builder aliases(Map<String, Alias> map) {
-			this.aliases = _mapPutAll(this.aliases, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code>.
-		 */
-		public final Builder aliases(String key, Alias value) {
-			this.aliases = _mapPut(this.aliases, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code> using a builder lambda.
-		 */
-		public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
-			return aliases(key, fn.apply(new Alias.Builder()).build());
-		}
-
-		/**
-		 * Required - The name of the source index to shrink
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code settings}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>settings</code>.
-		 */
-		public final Builder settings(Map<String, JsonData> map) {
-			this.settings = _mapPutAll(this.settings, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code settings}
-		 * <p>
-		 * Adds an entry to <code>settings</code>.
-		 */
-		public final Builder settings(String key, JsonData value) {
-			this.settings = _mapPut(this.settings, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - The name of the target index to shrink into
-		 * <p>
-		 * API name: {@code target}
-		 */
-		public final Builder target(String value) {
-			this.target = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Set the number of active shards to wait for on the shrunken index before the
-		 * operation returns.
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
-			this.waitForActiveShards = value;
-			return this;
-		}
-
-		/**
-		 * Set the number of active shards to wait for on the shrunken index before the
-		 * operation returns.
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(
-				Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
-			return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ShrinkRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShrinkRequest build() {
-			_checkSingleUse();
-
-			return new ShrinkRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShrinkRequest}
-	 */
-	public static final JsonpDeserializer<ShrinkRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShrinkRequest::setupShrinkRequestDeserializer);
-
-	protected static void setupShrinkRequestDeserializer(ObjectDeserializer<ShrinkRequest.Builder> op) {
-
-		op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
-		op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "settings");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.shrink}".
-	 */
-	public static final Endpoint<ShrinkRequest, ShrinkResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "PUT";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-				final int _target = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-				propsSet |= _target;
-
-				if (propsSet == (_index | _target)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_shrink");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.target, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.waitForActiveShards != null) {
-					params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, ShrinkResponse._DESERIALIZER);
+    private final Map<String, Alias> aliases;
+
+    private final String index;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final Map<String, JsonData> settings;
+
+    private final String target;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final WaitForActiveShards waitForActiveShards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShrinkRequest(Builder builder) {
+
+        this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.settings = ApiTypeHelper.unmodifiable(builder.settings);
+        this.target = ApiTypeHelper.requireNonNull(builder.target, this, "target");
+        this.timeout = builder.timeout;
+        this.waitForActiveShards = builder.waitForActiveShards;
+
+    }
+
+    public static ShrinkRequest of(Function<Builder, ObjectBuilder<ShrinkRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code aliases}
+     */
+    public final Map<String, Alias> aliases() {
+        return this.aliases;
+    }
+
+    /**
+     * Required - The name of the source index to shrink
+     * <p>
+     * API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * API name: {@code settings}
+     */
+    public final Map<String, JsonData> settings() {
+        return this.settings;
+    }
+
+    /**
+     * Required - The name of the target index to shrink into
+     * <p>
+     * API name: {@code target}
+     */
+    public final String target() {
+        return this.target;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Set the number of active shards to wait for on the shrunken index before the
+     * operation returns.
+     * <p>
+     * API name: {@code wait_for_active_shards}
+     */
+    @Nullable
+    public final WaitForActiveShards waitForActiveShards() {
+        return this.waitForActiveShards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.aliases)) {
+            generator.writeKey("aliases");
+            generator.writeStartObject();
+            for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.settings)) {
+            generator.writeKey("settings");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShrinkRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShrinkRequest> {
+        @Nullable
+        private Map<String, Alias> aliases;
+
+        private String index;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Map<String, JsonData> settings;
+
+        private String target;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private WaitForActiveShards waitForActiveShards;
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aliases</code>.
+         */
+        public final Builder aliases(Map<String, Alias> map) {
+            this.aliases = _mapPutAll(this.aliases, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code>.
+         */
+        public final Builder aliases(String key, Alias value) {
+            this.aliases = _mapPut(this.aliases, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code> using a builder lambda.
+         */
+        public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
+            return aliases(key, fn.apply(new Alias.Builder()).build());
+        }
+
+        /**
+         * Required - The name of the source index to shrink
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code settings}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>settings</code>.
+         */
+        public final Builder settings(Map<String, JsonData> map) {
+            this.settings = _mapPutAll(this.settings, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code settings}
+         * <p>
+         * Adds an entry to <code>settings</code>.
+         */
+        public final Builder settings(String key, JsonData value) {
+            this.settings = _mapPut(this.settings, key, value);
+            return this;
+        }
+
+        /**
+         * Required - The name of the target index to shrink into
+         * <p>
+         * API name: {@code target}
+         */
+        public final Builder target(String value) {
+            this.target = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Set the number of active shards to wait for on the shrunken index before the
+         * operation returns.
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
+            this.waitForActiveShards = value;
+            return this;
+        }
+
+        /**
+         * Set the number of active shards to wait for on the shrunken index before the
+         * operation returns.
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
+            return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ShrinkRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShrinkRequest build() {
+            _checkSingleUse();
+
+            return new ShrinkRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShrinkRequest}
+     */
+    public static final JsonpDeserializer<ShrinkRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShrinkRequest::setupShrinkRequestDeserializer
+    );
+
+    protected static void setupShrinkRequestDeserializer(ObjectDeserializer<ShrinkRequest.Builder> op) {
+
+        op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
+        op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "settings");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.shrink}".
+     */
+    public static final Endpoint<ShrinkRequest, ShrinkResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "PUT";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+            final int _target = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+            propsSet |= _target;
+
+            if (propsSet == (_index | _target)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_shrink");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.target, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.waitForActiveShards != null) {
+                params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        ShrinkResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ShrinkResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ShrinkResponse.java
index 153dd0ab8c..abf8f1d5c1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ShrinkResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ShrinkResponse.java
@@ -32,124 +32,124 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: indices.shrink.Response
 
 @JsonpDeserializable
 public class ShrinkResponse extends AcknowledgedResponseBase {
-	private final boolean shardsAcknowledged;
-
-	private final String index;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShrinkResponse(Builder builder) {
-		super(builder);
-
-		this.shardsAcknowledged = ApiTypeHelper.requireNonNull(builder.shardsAcknowledged, this, "shardsAcknowledged");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-
-	}
-
-	public static ShrinkResponse of(Function<Builder, ObjectBuilder<ShrinkResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code shards_acknowledged}
-	 */
-	public final boolean shardsAcknowledged() {
-		return this.shardsAcknowledged;
-	}
-
-	/**
-	 * Required - API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("shards_acknowledged");
-		generator.write(this.shardsAcknowledged);
-
-		generator.writeKey("index");
-		generator.write(this.index);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShrinkResponse}.
-	 */
-
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ShrinkResponse> {
-		private Boolean shardsAcknowledged;
-
-		private String index;
-
-		/**
-		 * Required - API name: {@code shards_acknowledged}
-		 */
-		public final Builder shardsAcknowledged(boolean value) {
-			this.shardsAcknowledged = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShrinkResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShrinkResponse build() {
-			_checkSingleUse();
-
-			return new ShrinkResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShrinkResponse}
-	 */
-	public static final JsonpDeserializer<ShrinkResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShrinkResponse::setupShrinkResponseDeserializer);
-
-	protected static void setupShrinkResponseDeserializer(ObjectDeserializer<ShrinkResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
-		op.add(Builder::shardsAcknowledged, JsonpDeserializer.booleanDeserializer(), "shards_acknowledged");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-
-	}
+    private final boolean shardsAcknowledged;
+
+    private final String index;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShrinkResponse(Builder builder) {
+        super(builder);
+
+        this.shardsAcknowledged = ApiTypeHelper.requireNonNull(builder.shardsAcknowledged, this, "shardsAcknowledged");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+
+    }
+
+    public static ShrinkResponse of(Function<Builder, ObjectBuilder<ShrinkResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code shards_acknowledged}
+     */
+    public final boolean shardsAcknowledged() {
+        return this.shardsAcknowledged;
+    }
+
+    /**
+     * Required - API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("shards_acknowledged");
+        generator.write(this.shardsAcknowledged);
+
+        generator.writeKey("index");
+        generator.write(this.index);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShrinkResponse}.
+     */
+
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<ShrinkResponse> {
+        private Boolean shardsAcknowledged;
+
+        private String index;
+
+        /**
+         * Required - API name: {@code shards_acknowledged}
+         */
+        public final Builder shardsAcknowledged(boolean value) {
+            this.shardsAcknowledged = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShrinkResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShrinkResponse build() {
+            _checkSingleUse();
+
+            return new ShrinkResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShrinkResponse}
+     */
+    public static final JsonpDeserializer<ShrinkResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShrinkResponse::setupShrinkResponseDeserializer
+    );
+
+    protected static void setupShrinkResponseDeserializer(ObjectDeserializer<ShrinkResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+        op.add(Builder::shardsAcknowledged, JsonpDeserializer.booleanDeserializer(), "shards_acknowledged");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateIndexTemplateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateIndexTemplateRequest.java
index 703369a2a9..f750910f80 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateIndexTemplateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateIndexTemplateRequest.java
@@ -32,10 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
-import org.opensearch.client.opensearch.indices.put_index_template.IndexTemplateMapping;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -43,570 +45,570 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.Time;
+import org.opensearch.client.opensearch.indices.put_index_template.IndexTemplateMapping;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.simulate_index_template.Request
 
 /**
  * Simulate matching the given index name against the index templates in the
  * system
- * 
+ *
  */
 @JsonpDeserializable
 public class SimulateIndexTemplateRequest extends RequestBase implements JsonpSerializable {
-	private final Map<String, JsonData> meta;
-
-	@Nullable
-	private final Boolean allowAutoCreate;
-
-	private final List<String> composedOf;
-
-	@Nullable
-	private final Boolean create;
-
-	@Nullable
-	private final DataStream dataStream;
-
-	private final List<String> indexPatterns;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final String name;
-
-	@Nullable
-	private final Integer priority;
-
-	@Nullable
-	private final IndexTemplateMapping template;
-
-	@Nullable
-	private final Long version;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SimulateIndexTemplateRequest(Builder builder) {
-
-		this.meta = ApiTypeHelper.unmodifiable(builder.meta);
-		this.allowAutoCreate = builder.allowAutoCreate;
-		this.composedOf = ApiTypeHelper.unmodifiable(builder.composedOf);
-		this.create = builder.create;
-		this.dataStream = builder.dataStream;
-		this.indexPatterns = ApiTypeHelper.unmodifiable(builder.indexPatterns);
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.priority = builder.priority;
-		this.template = builder.template;
-		this.version = builder.version;
-
-	}
-
-	public static SimulateIndexTemplateRequest of(Function<Builder, ObjectBuilder<SimulateIndexTemplateRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code _meta}
-	 */
-	public final Map<String, JsonData> meta() {
-		return this.meta;
-	}
-
-	/**
-	 * API name: {@code allow_auto_create}
-	 */
-	@Nullable
-	public final Boolean allowAutoCreate() {
-		return this.allowAutoCreate;
-	}
-
-	/**
-	 * API name: {@code composed_of}
-	 */
-	public final List<String> composedOf() {
-		return this.composedOf;
-	}
-
-	/**
-	 * If <code>true</code>, the template passed in the body is only used if no
-	 * existing templates match the same index patterns. If <code>false</code>, the
-	 * simulation uses the template with the highest priority. Note that the
-	 * template is not permanently added or updated in either case; it is only used
-	 * for the simulation.
-	 * <p>
-	 * API name: {@code create}
-	 */
-	@Nullable
-	public final Boolean create() {
-		return this.create;
-	}
-
-	/**
-	 * API name: {@code data_stream}
-	 */
-	@Nullable
-	public final DataStream dataStream() {
-		return this.dataStream;
-	}
-
-	/**
-	 * API name: {@code index_patterns}
-	 */
-	public final List<String> indexPatterns() {
-		return this.indexPatterns;
-	}
-
-	/**
-	 * Period to wait for a connection to the master node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Period to wait for a connection to the cluster-manager node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Required - Index or template name to simulate
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * API name: {@code priority}
-	 */
-	@Nullable
-	public final Integer priority() {
-		return this.priority;
-	}
-
-	/**
-	 * API name: {@code template}
-	 */
-	@Nullable
-	public final IndexTemplateMapping template() {
-		return this.template;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.meta)) {
-			generator.writeKey("_meta");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.allowAutoCreate != null) {
-			generator.writeKey("allow_auto_create");
-			generator.write(this.allowAutoCreate);
-
-		}
-		if (ApiTypeHelper.isDefined(this.composedOf)) {
-			generator.writeKey("composed_of");
-			generator.writeStartArray();
-			for (String item0 : this.composedOf) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.dataStream != null) {
-			generator.writeKey("data_stream");
-			this.dataStream.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.indexPatterns)) {
-			generator.writeKey("index_patterns");
-			generator.writeStartArray();
-			for (String item0 : this.indexPatterns) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.priority != null) {
-			generator.writeKey("priority");
-			generator.write(this.priority);
-
-		}
-		if (this.template != null) {
-			generator.writeKey("template");
-			this.template.serialize(generator, mapper);
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SimulateIndexTemplateRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SimulateIndexTemplateRequest> {
-		@Nullable
-		private Map<String, JsonData> meta;
-
-		@Nullable
-		private Boolean allowAutoCreate;
-
-		@Nullable
-		private List<String> composedOf;
-
-		@Nullable
-		private Boolean create;
-
-		@Nullable
-		private DataStream dataStream;
-
-		@Nullable
-		private List<String> indexPatterns;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		private String name;
-
-		@Nullable
-		private Integer priority;
-
-		@Nullable
-		private IndexTemplateMapping template;
-
-		@Nullable
-		private Long version;
-
-		/**
-		 * API name: {@code _meta}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>meta</code>.
-		 */
-		public final Builder meta(Map<String, JsonData> map) {
-			this.meta = _mapPutAll(this.meta, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code _meta}
-		 * <p>
-		 * Adds an entry to <code>meta</code>.
-		 */
-		public final Builder meta(String key, JsonData value) {
-			this.meta = _mapPut(this.meta, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code allow_auto_create}
-		 */
-		public final Builder allowAutoCreate(@Nullable Boolean value) {
-			this.allowAutoCreate = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code composed_of}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>composedOf</code>.
-		 */
-		public final Builder composedOf(List<String> list) {
-			this.composedOf = _listAddAll(this.composedOf, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code composed_of}
-		 * <p>
-		 * Adds one or more values to <code>composedOf</code>.
-		 */
-		public final Builder composedOf(String value, String... values) {
-			this.composedOf = _listAdd(this.composedOf, value, values);
-			return this;
-		}
-
-		/**
-		 * If <code>true</code>, the template passed in the body is only used if no
-		 * existing templates match the same index patterns. If <code>false</code>, the
-		 * simulation uses the template with the highest priority. Note that the
-		 * template is not permanently added or updated in either case; it is only used
-		 * for the simulation.
-		 * <p>
-		 * API name: {@code create}
-		 */
-		public final Builder create(@Nullable Boolean value) {
-			this.create = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code data_stream}
-		 */
-		public final Builder dataStream(@Nullable DataStream value) {
-			this.dataStream = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code data_stream}
-		 */
-		public final Builder dataStream(Function<DataStream.Builder, ObjectBuilder<DataStream>> fn) {
-			return this.dataStream(fn.apply(new DataStream.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code index_patterns}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indexPatterns</code>.
-		 */
-		public final Builder indexPatterns(List<String> list) {
-			this.indexPatterns = _listAddAll(this.indexPatterns, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_patterns}
-		 * <p>
-		 * Adds one or more values to <code>indexPatterns</code>.
-		 */
-		public final Builder indexPatterns(String value, String... values) {
-			this.indexPatterns = _listAdd(this.indexPatterns, value, values);
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - Index or template name to simulate
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code priority}
-		 */
-		public final Builder priority(@Nullable Integer value) {
-			this.priority = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code template}
-		 */
-		public final Builder template(@Nullable IndexTemplateMapping value) {
-			this.template = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code template}
-		 */
-		public final Builder template(Function<IndexTemplateMapping.Builder, ObjectBuilder<IndexTemplateMapping>> fn) {
-			return this.template(fn.apply(new IndexTemplateMapping.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SimulateIndexTemplateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SimulateIndexTemplateRequest build() {
-			_checkSingleUse();
-
-			return new SimulateIndexTemplateRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SimulateIndexTemplateRequest}
-	 */
-	public static final JsonpDeserializer<SimulateIndexTemplateRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SimulateIndexTemplateRequest::setupSimulateIndexTemplateRequestDeserializer);
-
-	protected static void setupSimulateIndexTemplateRequestDeserializer(
-			ObjectDeserializer<SimulateIndexTemplateRequest.Builder> op) {
-
-		op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
-		op.add(Builder::allowAutoCreate, JsonpDeserializer.booleanDeserializer(), "allow_auto_create");
-		op.add(Builder::composedOf, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"composed_of");
-		op.add(Builder::dataStream, DataStream._DESERIALIZER, "data_stream");
-		op.add(Builder::indexPatterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"index_patterns");
-		op.add(Builder::priority, JsonpDeserializer.integerDeserializer(), "priority");
-		op.add(Builder::template, IndexTemplateMapping._DESERIALIZER, "template");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.simulate_index_template}".
-	 */
-	public static final Endpoint<SimulateIndexTemplateRequest, SimulateIndexTemplateResponse, ErrorResponse> _ENDPOINT =
-			new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _name;
-
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_index_template");
-					buf.append("/_simulate_index");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.create != null) {
-					params.put("create", String.valueOf(request.create));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, SimulateIndexTemplateResponse._DESERIALIZER);
+    private final Map<String, JsonData> meta;
+
+    @Nullable
+    private final Boolean allowAutoCreate;
+
+    private final List<String> composedOf;
+
+    @Nullable
+    private final Boolean create;
+
+    @Nullable
+    private final DataStream dataStream;
+
+    private final List<String> indexPatterns;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final String name;
+
+    @Nullable
+    private final Integer priority;
+
+    @Nullable
+    private final IndexTemplateMapping template;
+
+    @Nullable
+    private final Long version;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SimulateIndexTemplateRequest(Builder builder) {
+
+        this.meta = ApiTypeHelper.unmodifiable(builder.meta);
+        this.allowAutoCreate = builder.allowAutoCreate;
+        this.composedOf = ApiTypeHelper.unmodifiable(builder.composedOf);
+        this.create = builder.create;
+        this.dataStream = builder.dataStream;
+        this.indexPatterns = ApiTypeHelper.unmodifiable(builder.indexPatterns);
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.priority = builder.priority;
+        this.template = builder.template;
+        this.version = builder.version;
+
+    }
+
+    public static SimulateIndexTemplateRequest of(Function<Builder, ObjectBuilder<SimulateIndexTemplateRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code _meta}
+     */
+    public final Map<String, JsonData> meta() {
+        return this.meta;
+    }
+
+    /**
+     * API name: {@code allow_auto_create}
+     */
+    @Nullable
+    public final Boolean allowAutoCreate() {
+        return this.allowAutoCreate;
+    }
+
+    /**
+     * API name: {@code composed_of}
+     */
+    public final List<String> composedOf() {
+        return this.composedOf;
+    }
+
+    /**
+     * If <code>true</code>, the template passed in the body is only used if no
+     * existing templates match the same index patterns. If <code>false</code>, the
+     * simulation uses the template with the highest priority. Note that the
+     * template is not permanently added or updated in either case; it is only used
+     * for the simulation.
+     * <p>
+     * API name: {@code create}
+     */
+    @Nullable
+    public final Boolean create() {
+        return this.create;
+    }
+
+    /**
+     * API name: {@code data_stream}
+     */
+    @Nullable
+    public final DataStream dataStream() {
+        return this.dataStream;
+    }
+
+    /**
+     * API name: {@code index_patterns}
+     */
+    public final List<String> indexPatterns() {
+        return this.indexPatterns;
+    }
+
+    /**
+     * Period to wait for a connection to the master node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Period to wait for a connection to the cluster-manager node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Required - Index or template name to simulate
+     * <p>
+     * API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * API name: {@code priority}
+     */
+    @Nullable
+    public final Integer priority() {
+        return this.priority;
+    }
+
+    /**
+     * API name: {@code template}
+     */
+    @Nullable
+    public final IndexTemplateMapping template() {
+        return this.template;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.meta)) {
+            generator.writeKey("_meta");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.allowAutoCreate != null) {
+            generator.writeKey("allow_auto_create");
+            generator.write(this.allowAutoCreate);
+
+        }
+        if (ApiTypeHelper.isDefined(this.composedOf)) {
+            generator.writeKey("composed_of");
+            generator.writeStartArray();
+            for (String item0 : this.composedOf) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.dataStream != null) {
+            generator.writeKey("data_stream");
+            this.dataStream.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.indexPatterns)) {
+            generator.writeKey("index_patterns");
+            generator.writeStartArray();
+            for (String item0 : this.indexPatterns) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.priority != null) {
+            generator.writeKey("priority");
+            generator.write(this.priority);
+
+        }
+        if (this.template != null) {
+            generator.writeKey("template");
+            this.template.serialize(generator, mapper);
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SimulateIndexTemplateRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SimulateIndexTemplateRequest> {
+        @Nullable
+        private Map<String, JsonData> meta;
+
+        @Nullable
+        private Boolean allowAutoCreate;
+
+        @Nullable
+        private List<String> composedOf;
+
+        @Nullable
+        private Boolean create;
+
+        @Nullable
+        private DataStream dataStream;
+
+        @Nullable
+        private List<String> indexPatterns;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        private String name;
+
+        @Nullable
+        private Integer priority;
+
+        @Nullable
+        private IndexTemplateMapping template;
+
+        @Nullable
+        private Long version;
+
+        /**
+         * API name: {@code _meta}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>meta</code>.
+         */
+        public final Builder meta(Map<String, JsonData> map) {
+            this.meta = _mapPutAll(this.meta, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code _meta}
+         * <p>
+         * Adds an entry to <code>meta</code>.
+         */
+        public final Builder meta(String key, JsonData value) {
+            this.meta = _mapPut(this.meta, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code allow_auto_create}
+         */
+        public final Builder allowAutoCreate(@Nullable Boolean value) {
+            this.allowAutoCreate = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code composed_of}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>composedOf</code>.
+         */
+        public final Builder composedOf(List<String> list) {
+            this.composedOf = _listAddAll(this.composedOf, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code composed_of}
+         * <p>
+         * Adds one or more values to <code>composedOf</code>.
+         */
+        public final Builder composedOf(String value, String... values) {
+            this.composedOf = _listAdd(this.composedOf, value, values);
+            return this;
+        }
+
+        /**
+         * If <code>true</code>, the template passed in the body is only used if no
+         * existing templates match the same index patterns. If <code>false</code>, the
+         * simulation uses the template with the highest priority. Note that the
+         * template is not permanently added or updated in either case; it is only used
+         * for the simulation.
+         * <p>
+         * API name: {@code create}
+         */
+        public final Builder create(@Nullable Boolean value) {
+            this.create = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code data_stream}
+         */
+        public final Builder dataStream(@Nullable DataStream value) {
+            this.dataStream = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code data_stream}
+         */
+        public final Builder dataStream(Function<DataStream.Builder, ObjectBuilder<DataStream>> fn) {
+            return this.dataStream(fn.apply(new DataStream.Builder()).build());
+        }
+
+        /**
+         * API name: {@code index_patterns}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indexPatterns</code>.
+         */
+        public final Builder indexPatterns(List<String> list) {
+            this.indexPatterns = _listAddAll(this.indexPatterns, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code index_patterns}
+         * <p>
+         * Adds one or more values to <code>indexPatterns</code>.
+         */
+        public final Builder indexPatterns(String value, String... values) {
+            this.indexPatterns = _listAdd(this.indexPatterns, value, values);
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - Index or template name to simulate
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code priority}
+         */
+        public final Builder priority(@Nullable Integer value) {
+            this.priority = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code template}
+         */
+        public final Builder template(@Nullable IndexTemplateMapping value) {
+            this.template = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code template}
+         */
+        public final Builder template(Function<IndexTemplateMapping.Builder, ObjectBuilder<IndexTemplateMapping>> fn) {
+            return this.template(fn.apply(new IndexTemplateMapping.Builder()).build());
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link SimulateIndexTemplateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SimulateIndexTemplateRequest build() {
+            _checkSingleUse();
+
+            return new SimulateIndexTemplateRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SimulateIndexTemplateRequest}
+     */
+    public static final JsonpDeserializer<SimulateIndexTemplateRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SimulateIndexTemplateRequest::setupSimulateIndexTemplateRequestDeserializer
+    );
+
+    protected static void setupSimulateIndexTemplateRequestDeserializer(ObjectDeserializer<SimulateIndexTemplateRequest.Builder> op) {
+
+        op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
+        op.add(Builder::allowAutoCreate, JsonpDeserializer.booleanDeserializer(), "allow_auto_create");
+        op.add(Builder::composedOf, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "composed_of");
+        op.add(Builder::dataStream, DataStream._DESERIALIZER, "data_stream");
+        op.add(Builder::indexPatterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "index_patterns");
+        op.add(Builder::priority, JsonpDeserializer.integerDeserializer(), "priority");
+        op.add(Builder::template, IndexTemplateMapping._DESERIALIZER, "template");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.simulate_index_template}".
+     */
+    public static final Endpoint<SimulateIndexTemplateRequest, SimulateIndexTemplateResponse, ErrorResponse> _ENDPOINT =
+        new SimpleEndpoint<>(
+
+            // Request method
+            request -> {
+                return "POST";
+
+            },
+
+            // Request path
+            request -> {
+                final int _name = 1 << 0;
+
+                int propsSet = 0;
+
+                propsSet |= _name;
+
+                if (propsSet == (_name)) {
+                    StringBuilder buf = new StringBuilder();
+                    buf.append("/_index_template");
+                    buf.append("/_simulate_index");
+                    buf.append("/");
+                    SimpleEndpoint.pathEncode(request.name, buf);
+                    return buf.toString();
+                }
+                throw SimpleEndpoint.noPathTemplateFound("path");
+
+            },
+
+            // Request parameters
+            request -> {
+                Map<String, String> params = new HashMap<>();
+                if (request.masterTimeout != null) {
+                    params.put("master_timeout", request.masterTimeout._toJsonString());
+                }
+                if (request.clusterManagerTimeout != null) {
+                    params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+                }
+                if (request.create != null) {
+                    params.put("create", String.valueOf(request.create));
+                }
+                return params;
+
+            },
+            SimpleEndpoint.emptyMap(),
+            true,
+            SimulateIndexTemplateResponse._DESERIALIZER
+        );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateIndexTemplateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateIndexTemplateResponse.java
index 221ee60f38..4bbb597ad1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateIndexTemplateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateIndexTemplateResponse.java
@@ -36,17 +36,16 @@
 
 // typedef: indices.simulate_index_template.Response
 
-
 public class SimulateIndexTemplateResponse {
-	public SimulateIndexTemplateResponse() {
-	}
+    public SimulateIndexTemplateResponse() {}
 
-	/**
-	 * Singleton instance for {@link SimulateIndexTemplateResponse}.
-	 */
-	public static final SimulateIndexTemplateResponse _INSTANCE = new SimulateIndexTemplateResponse();
+    /**
+     * Singleton instance for {@link SimulateIndexTemplateResponse}.
+     */
+    public static final SimulateIndexTemplateResponse _INSTANCE = new SimulateIndexTemplateResponse();
 
-	public static final JsonpDeserializer<SimulateIndexTemplateResponse> _DESERIALIZER = JsonpDeserializer
-			.fixedValue(SimulateIndexTemplateResponse._INSTANCE);
+    public static final JsonpDeserializer<SimulateIndexTemplateResponse> _DESERIALIZER = JsonpDeserializer.fixedValue(
+        SimulateIndexTemplateResponse._INSTANCE
+    );
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateTemplateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateTemplateRequest.java
index 4c009743c6..610da404cb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateTemplateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateTemplateRequest.java
@@ -32,315 +32,320 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
-import org.opensearch.client.opensearch.indices.get_index_template.IndexTemplate;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.Time;
+import org.opensearch.client.opensearch.indices.get_index_template.IndexTemplate;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.simulate_template.Request
 
 /**
  * Simulate resolving the given template name or body
- * 
+ *
  */
 @JsonpDeserializable
 public class SimulateTemplateRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final Boolean create;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final String name;
-
-	private final IndexTemplate template;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SimulateTemplateRequest(Builder builder) {
-
-		this.create = builder.create;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = builder.name;
-		this.template = ApiTypeHelper.requireNonNull(builder.template, this, "template");
-
-	}
-
-	public static SimulateTemplateRequest of(Function<Builder, ObjectBuilder<SimulateTemplateRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * If true, the template passed in the body is only used if no existing
-	 * templates match the same index patterns. If false, the simulation uses the
-	 * template with the highest priority. Note that the template is not permanently
-	 * added or updated in either case; it is only used for the simulation.
-	 * <p>
-	 * API name: {@code create}
-	 */
-	@Nullable
-	public final Boolean create() {
-		return this.create;
-	}
-
-	/**
-	 * Period to wait for a connection to the master node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Period to wait for a connection to the cluster-manager node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Name of the index template to simulate. To test a template configuration
-	 * before you add it to the cluster, omit this parameter and specify the
-	 * template configuration in the request body.
-	 * <p>
-	 * API name: {@code name}
-	 */
-	@Nullable
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Required - Request body.
-	 * <p>
-	 * API name: {@code _value_body}
-	 */
-	public final IndexTemplate template() {
-		return this.template;
-	}
-
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		this.template.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SimulateTemplateRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SimulateTemplateRequest> {
-		@Nullable
-		private Boolean create;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private String name;
-
-		private IndexTemplate template;
-
-		/**
-		 * If true, the template passed in the body is only used if no existing
-		 * templates match the same index patterns. If false, the simulation uses the
-		 * template with the highest priority. Note that the template is not permanently
-		 * added or updated in either case; it is only used for the simulation.
-		 * <p>
-		 * API name: {@code create}
-		 */
-		public final Builder create(@Nullable Boolean value) {
-			this.create = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Name of the index template to simulate. To test a template configuration
-		 * before you add it to the cluster, omit this parameter and specify the
-		 * template configuration in the request body.
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(@Nullable String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - Request body.
-		 * <p>
-		 * API name: {@code _value_body}
-		 */
-		public final Builder template(IndexTemplate value) {
-			this.template = value;
-			return this;
-		}
-
-		/**
-		 * Required - Request body.
-		 * <p>
-		 * API name: {@code _value_body}
-		 */
-		public final Builder template(Function<IndexTemplate.Builder, ObjectBuilder<IndexTemplate>> fn) {
-			return this.template(fn.apply(new IndexTemplate.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link SimulateTemplateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SimulateTemplateRequest build() {
-			_checkSingleUse();
-
-			return new SimulateTemplateRequest(this);
-		}
-	}
-
-	public static final JsonpDeserializer<SimulateTemplateRequest> _DESERIALIZER = createSimulateTemplateRequestDeserializer();
-	protected static JsonpDeserializer<SimulateTemplateRequest> createSimulateTemplateRequestDeserializer() {
-
-		JsonpDeserializer<IndexTemplate> valueDeserializer = IndexTemplate._DESERIALIZER;
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(),
-				(parser, mapper) -> new Builder().template(valueDeserializer.deserialize(parser, mapper)).build());
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.simulate_template}".
-	 */
-	public static final Endpoint<SimulateTemplateRequest, SimulateTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				if (request.name() != null)
-					propsSet |= _name;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_index_template");
-					buf.append("/_simulate");
-					return buf.toString();
-				}
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_index_template");
-					buf.append("/_simulate");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.create != null) {
-					params.put("create", String.valueOf(request.create));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, SimulateTemplateResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean create;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final String name;
+
+    private final IndexTemplate template;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SimulateTemplateRequest(Builder builder) {
+
+        this.create = builder.create;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = builder.name;
+        this.template = ApiTypeHelper.requireNonNull(builder.template, this, "template");
+
+    }
+
+    public static SimulateTemplateRequest of(Function<Builder, ObjectBuilder<SimulateTemplateRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * If true, the template passed in the body is only used if no existing
+     * templates match the same index patterns. If false, the simulation uses the
+     * template with the highest priority. Note that the template is not permanently
+     * added or updated in either case; it is only used for the simulation.
+     * <p>
+     * API name: {@code create}
+     */
+    @Nullable
+    public final Boolean create() {
+        return this.create;
+    }
+
+    /**
+     * Period to wait for a connection to the master node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Period to wait for a connection to the cluster-manager node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Name of the index template to simulate. To test a template configuration
+     * before you add it to the cluster, omit this parameter and specify the
+     * template configuration in the request body.
+     * <p>
+     * API name: {@code name}
+     */
+    @Nullable
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Required - Request body.
+     * <p>
+     * API name: {@code _value_body}
+     */
+    public final IndexTemplate template() {
+        return this.template;
+    }
+
+    /**
+     * Serialize this value to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        this.template.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SimulateTemplateRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SimulateTemplateRequest> {
+        @Nullable
+        private Boolean create;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private String name;
+
+        private IndexTemplate template;
+
+        /**
+         * If true, the template passed in the body is only used if no existing
+         * templates match the same index patterns. If false, the simulation uses the
+         * template with the highest priority. Note that the template is not permanently
+         * added or updated in either case; it is only used for the simulation.
+         * <p>
+         * API name: {@code create}
+         */
+        public final Builder create(@Nullable Boolean value) {
+            this.create = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Name of the index template to simulate. To test a template configuration
+         * before you add it to the cluster, omit this parameter and specify the
+         * template configuration in the request body.
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(@Nullable String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - Request body.
+         * <p>
+         * API name: {@code _value_body}
+         */
+        public final Builder template(IndexTemplate value) {
+            this.template = value;
+            return this;
+        }
+
+        /**
+         * Required - Request body.
+         * <p>
+         * API name: {@code _value_body}
+         */
+        public final Builder template(Function<IndexTemplate.Builder, ObjectBuilder<IndexTemplate>> fn) {
+            return this.template(fn.apply(new IndexTemplate.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link SimulateTemplateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SimulateTemplateRequest build() {
+            _checkSingleUse();
+
+            return new SimulateTemplateRequest(this);
+        }
+    }
+
+    public static final JsonpDeserializer<SimulateTemplateRequest> _DESERIALIZER = createSimulateTemplateRequestDeserializer();
+
+    protected static JsonpDeserializer<SimulateTemplateRequest> createSimulateTemplateRequestDeserializer() {
+
+        JsonpDeserializer<IndexTemplate> valueDeserializer = IndexTemplate._DESERIALIZER;
+
+        return JsonpDeserializer.of(
+            valueDeserializer.acceptedEvents(),
+            (parser, mapper) -> new Builder().template(valueDeserializer.deserialize(parser, mapper)).build()
+        );
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.simulate_template}".
+     */
+    public static final Endpoint<SimulateTemplateRequest, SimulateTemplateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            if (request.name() != null) propsSet |= _name;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_index_template");
+                buf.append("/_simulate");
+                return buf.toString();
+            }
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_index_template");
+                buf.append("/_simulate");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.create != null) {
+                params.put("create", String.valueOf(request.create));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        SimulateTemplateResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateTemplateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateTemplateResponse.java
index 5ffc079d72..9d75d95267 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateTemplateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SimulateTemplateResponse.java
@@ -32,111 +32,111 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch.indices.simulate_template.Template;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.indices.simulate_template.Template;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: indices.simulate_template.Response
 
 @JsonpDeserializable
 public class SimulateTemplateResponse implements JsonpSerializable {
-	private final Template template;
+    private final Template template;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private SimulateTemplateResponse(Builder builder) {
+    private SimulateTemplateResponse(Builder builder) {
 
-		this.template = ApiTypeHelper.requireNonNull(builder.template, this, "template");
+        this.template = ApiTypeHelper.requireNonNull(builder.template, this, "template");
 
-	}
+    }
 
-	public static SimulateTemplateResponse of(Function<Builder, ObjectBuilder<SimulateTemplateResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static SimulateTemplateResponse of(Function<Builder, ObjectBuilder<SimulateTemplateResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code template}
-	 */
-	public final Template template() {
-		return this.template;
-	}
+    /**
+     * Required - API name: {@code template}
+     */
+    public final Template template() {
+        return this.template;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("template");
-		this.template.serialize(generator, mapper);
+        generator.writeKey("template");
+        this.template.serialize(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link SimulateTemplateResponse}.
-	 */
+    /**
+     * Builder for {@link SimulateTemplateResponse}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SimulateTemplateResponse> {
-		private Template template;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SimulateTemplateResponse> {
+        private Template template;
 
-		/**
-		 * Required - API name: {@code template}
-		 */
-		public final Builder template(Template value) {
-			this.template = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code template}
+         */
+        public final Builder template(Template value) {
+            this.template = value;
+            return this;
+        }
 
-		/**
-		 * Required - API name: {@code template}
-		 */
-		public final Builder template(Function<Template.Builder, ObjectBuilder<Template>> fn) {
-			return this.template(fn.apply(new Template.Builder()).build());
-		}
+        /**
+         * Required - API name: {@code template}
+         */
+        public final Builder template(Function<Template.Builder, ObjectBuilder<Template>> fn) {
+            return this.template(fn.apply(new Template.Builder()).build());
+        }
 
-		/**
-		 * Builds a {@link SimulateTemplateResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SimulateTemplateResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link SimulateTemplateResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SimulateTemplateResponse build() {
+            _checkSingleUse();
 
-			return new SimulateTemplateResponse(this);
-		}
-	}
+            return new SimulateTemplateResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link SimulateTemplateResponse}
-	 */
-	public static final JsonpDeserializer<SimulateTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SimulateTemplateResponse::setupSimulateTemplateResponseDeserializer);
+    /**
+     * Json deserializer for {@link SimulateTemplateResponse}
+     */
+    public static final JsonpDeserializer<SimulateTemplateResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SimulateTemplateResponse::setupSimulateTemplateResponseDeserializer
+    );
 
-	protected static void setupSimulateTemplateResponseDeserializer(
-			ObjectDeserializer<SimulateTemplateResponse.Builder> op) {
+    protected static void setupSimulateTemplateResponseDeserializer(ObjectDeserializer<SimulateTemplateResponse.Builder> op) {
 
-		op.add(Builder::template, Template._DESERIALIZER, "template");
+        op.add(Builder::template, Template._DESERIALIZER, "template");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SoftDeletes.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SoftDeletes.java
index 3edc5add2b..7c5310c466 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SoftDeletes.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SoftDeletes.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,93 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: indices._types.SoftDeletes
 
-
 @JsonpDeserializable
 public class SoftDeletes implements JsonpSerializable {
-	private final boolean enabled;
+    private final boolean enabled;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private SoftDeletes(Builder builder) {
+    private SoftDeletes(Builder builder) {
 
-		this.enabled = ApiTypeHelper.requireNonNull(builder.enabled, this, "enabled");
+        this.enabled = ApiTypeHelper.requireNonNull(builder.enabled, this, "enabled");
 
-	}
+    }
 
-	public static SoftDeletes of(Function<Builder, ObjectBuilder<SoftDeletes>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static SoftDeletes of(Function<Builder, ObjectBuilder<SoftDeletes>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code enabled}
-	 */
-	public final boolean enabled() {
-		return this.enabled;
-	}
+    /**
+     * Required - API name: {@code enabled}
+     */
+    public final boolean enabled() {
+        return this.enabled;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("enabled");
-		generator.write(this.enabled);
+        generator.writeKey("enabled");
+        generator.write(this.enabled);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link SoftDeletes}.
-	 */
+    /**
+     * Builder for {@link SoftDeletes}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SoftDeletes> {
-		private Boolean enabled;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SoftDeletes> {
+        private Boolean enabled;
 
-		/**
-		 * Required - API name: {@code enabled}
-		 */
-		public final Builder enabled(boolean value) {
-			this.enabled = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code enabled}
+         */
+        public final Builder enabled(boolean value) {
+            this.enabled = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link SoftDeletes}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SoftDeletes build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link SoftDeletes}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SoftDeletes build() {
+            _checkSingleUse();
 
-			return new SoftDeletes(this);
-		}
-	}
+            return new SoftDeletes(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link SoftDeletes}
-	 */
-	public static final JsonpDeserializer<SoftDeletes> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SoftDeletes::setupSoftDeletesDeserializer);
+    /**
+     * Json deserializer for {@link SoftDeletes}
+     */
+    public static final JsonpDeserializer<SoftDeletes> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SoftDeletes::setupSoftDeletesDeserializer
+    );
 
-	protected static void setupSoftDeletesDeserializer(ObjectDeserializer<SoftDeletes.Builder> op) {
+    protected static void setupSoftDeletesDeserializer(ObjectDeserializer<SoftDeletes.Builder> op) {
 
-		op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
+        op.add(Builder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SplitRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SplitRequest.java
index f6009b5e84..97c3b8c941 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SplitRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SplitRequest.java
@@ -32,10 +32,11 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
-import org.opensearch.client.opensearch._types.WaitForActiveShards;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -43,16 +44,15 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.Time;
+import org.opensearch.client.opensearch._types.WaitForActiveShards;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.split.Request
 
@@ -63,416 +63,421 @@
  */
 @JsonpDeserializable
 public class SplitRequest extends RequestBase implements JsonpSerializable {
-	private final Map<String, Alias> aliases;
-
-	private final String index;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final Map<String, JsonData> settings;
-
-	private final String target;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final WaitForActiveShards waitForActiveShards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SplitRequest(Builder builder) {
-
-		this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.settings = ApiTypeHelper.unmodifiable(builder.settings);
-		this.target = ApiTypeHelper.requireNonNull(builder.target, this, "target");
-		this.timeout = builder.timeout;
-		this.waitForActiveShards = builder.waitForActiveShards;
-
-	}
-
-	public static SplitRequest of(Function<Builder, ObjectBuilder<SplitRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code aliases}
-	 */
-	public final Map<String, Alias> aliases() {
-		return this.aliases;
-	}
-
-	/**
-	 * Required - The name of the source index to split
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * API name: {@code settings}
-	 */
-	public final Map<String, JsonData> settings() {
-		return this.settings;
-	}
-
-	/**
-	 * Required - The name of the target index to split into
-	 * <p>
-	 * API name: {@code target}
-	 */
-	public final String target() {
-		return this.target;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Set the number of active shards to wait for on the shrunken index before the
-	 * operation returns.
-	 * <p>
-	 * API name: {@code wait_for_active_shards}
-	 */
-	@Nullable
-	public final WaitForActiveShards waitForActiveShards() {
-		return this.waitForActiveShards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.aliases)) {
-			generator.writeKey("aliases");
-			generator.writeStartObject();
-			for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.settings)) {
-			generator.writeKey("settings");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SplitRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SplitRequest> {
-		@Nullable
-		private Map<String, Alias> aliases;
-
-		private String index;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Map<String, JsonData> settings;
-
-		private String target;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private WaitForActiveShards waitForActiveShards;
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aliases</code>.
-		 */
-		public final Builder aliases(Map<String, Alias> map) {
-			this.aliases = _mapPutAll(this.aliases, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code>.
-		 */
-		public final Builder aliases(String key, Alias value) {
-			this.aliases = _mapPut(this.aliases, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code> using a builder lambda.
-		 */
-		public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
-			return aliases(key, fn.apply(new Alias.Builder()).build());
-		}
-
-		/**
-		 * Required - The name of the source index to split
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code settings}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>settings</code>.
-		 */
-		public final Builder settings(Map<String, JsonData> map) {
-			this.settings = _mapPutAll(this.settings, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code settings}
-		 * <p>
-		 * Adds an entry to <code>settings</code>.
-		 */
-		public final Builder settings(String key, JsonData value) {
-			this.settings = _mapPut(this.settings, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - The name of the target index to split into
-		 * <p>
-		 * API name: {@code target}
-		 */
-		public final Builder target(String value) {
-			this.target = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Set the number of active shards to wait for on the shrunken index before the
-		 * operation returns.
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
-			this.waitForActiveShards = value;
-			return this;
-		}
-
-		/**
-		 * Set the number of active shards to wait for on the shrunken index before the
-		 * operation returns.
-		 * <p>
-		 * API name: {@code wait_for_active_shards}
-		 */
-		public final Builder waitForActiveShards(
-				Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
-			return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link SplitRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SplitRequest build() {
-			_checkSingleUse();
-
-			return new SplitRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SplitRequest}
-	 */
-	public static final JsonpDeserializer<SplitRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SplitRequest::setupSplitRequestDeserializer);
-
-	protected static void setupSplitRequestDeserializer(ObjectDeserializer<SplitRequest.Builder> op) {
-
-		op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
-		op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "settings");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.split}".
-	 */
-	public static final Endpoint<SplitRequest, SplitResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "PUT";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-				final int _target = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _index;
-				propsSet |= _target;
-
-				if (propsSet == (_index | _target)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_split");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.target, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.waitForActiveShards != null) {
-					params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, SplitResponse._DESERIALIZER);
+    private final Map<String, Alias> aliases;
+
+    private final String index;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final Map<String, JsonData> settings;
+
+    private final String target;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final WaitForActiveShards waitForActiveShards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SplitRequest(Builder builder) {
+
+        this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.settings = ApiTypeHelper.unmodifiable(builder.settings);
+        this.target = ApiTypeHelper.requireNonNull(builder.target, this, "target");
+        this.timeout = builder.timeout;
+        this.waitForActiveShards = builder.waitForActiveShards;
+
+    }
+
+    public static SplitRequest of(Function<Builder, ObjectBuilder<SplitRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code aliases}
+     */
+    public final Map<String, Alias> aliases() {
+        return this.aliases;
+    }
+
+    /**
+     * Required - The name of the source index to split
+     * <p>
+     * API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * API name: {@code settings}
+     */
+    public final Map<String, JsonData> settings() {
+        return this.settings;
+    }
+
+    /**
+     * Required - The name of the target index to split into
+     * <p>
+     * API name: {@code target}
+     */
+    public final String target() {
+        return this.target;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Set the number of active shards to wait for on the shrunken index before the
+     * operation returns.
+     * <p>
+     * API name: {@code wait_for_active_shards}
+     */
+    @Nullable
+    public final WaitForActiveShards waitForActiveShards() {
+        return this.waitForActiveShards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.aliases)) {
+            generator.writeKey("aliases");
+            generator.writeStartObject();
+            for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.settings)) {
+            generator.writeKey("settings");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SplitRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SplitRequest> {
+        @Nullable
+        private Map<String, Alias> aliases;
+
+        private String index;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Map<String, JsonData> settings;
+
+        private String target;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private WaitForActiveShards waitForActiveShards;
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aliases</code>.
+         */
+        public final Builder aliases(Map<String, Alias> map) {
+            this.aliases = _mapPutAll(this.aliases, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code>.
+         */
+        public final Builder aliases(String key, Alias value) {
+            this.aliases = _mapPut(this.aliases, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code> using a builder lambda.
+         */
+        public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
+            return aliases(key, fn.apply(new Alias.Builder()).build());
+        }
+
+        /**
+         * Required - The name of the source index to split
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code settings}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>settings</code>.
+         */
+        public final Builder settings(Map<String, JsonData> map) {
+            this.settings = _mapPutAll(this.settings, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code settings}
+         * <p>
+         * Adds an entry to <code>settings</code>.
+         */
+        public final Builder settings(String key, JsonData value) {
+            this.settings = _mapPut(this.settings, key, value);
+            return this;
+        }
+
+        /**
+         * Required - The name of the target index to split into
+         * <p>
+         * API name: {@code target}
+         */
+        public final Builder target(String value) {
+            this.target = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Set the number of active shards to wait for on the shrunken index before the
+         * operation returns.
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
+            this.waitForActiveShards = value;
+            return this;
+        }
+
+        /**
+         * Set the number of active shards to wait for on the shrunken index before the
+         * operation returns.
+         * <p>
+         * API name: {@code wait_for_active_shards}
+         */
+        public final Builder waitForActiveShards(Function<WaitForActiveShards.Builder, ObjectBuilder<WaitForActiveShards>> fn) {
+            return this.waitForActiveShards(fn.apply(new WaitForActiveShards.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link SplitRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SplitRequest build() {
+            _checkSingleUse();
+
+            return new SplitRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SplitRequest}
+     */
+    public static final JsonpDeserializer<SplitRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SplitRequest::setupSplitRequestDeserializer
+    );
+
+    protected static void setupSplitRequestDeserializer(ObjectDeserializer<SplitRequest.Builder> op) {
+
+        op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
+        op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "settings");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.split}".
+     */
+    public static final Endpoint<SplitRequest, SplitResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "PUT";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+            final int _target = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _index;
+            propsSet |= _target;
+
+            if (propsSet == (_index | _target)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_split");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.target, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.waitForActiveShards != null) {
+                params.put("wait_for_active_shards", request.waitForActiveShards._toJsonString());
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        SplitResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SplitResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SplitResponse.java
index 9f177168c1..d7685dcf03 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SplitResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SplitResponse.java
@@ -32,124 +32,124 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: indices.split.Response
 
 @JsonpDeserializable
 public class SplitResponse extends AcknowledgedResponseBase {
-	private final boolean shardsAcknowledged;
-
-	private final String index;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SplitResponse(Builder builder) {
-		super(builder);
-
-		this.shardsAcknowledged = ApiTypeHelper.requireNonNull(builder.shardsAcknowledged, this, "shardsAcknowledged");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-
-	}
-
-	public static SplitResponse of(Function<Builder, ObjectBuilder<SplitResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code shards_acknowledged}
-	 */
-	public final boolean shardsAcknowledged() {
-		return this.shardsAcknowledged;
-	}
-
-	/**
-	 * Required - API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("shards_acknowledged");
-		generator.write(this.shardsAcknowledged);
-
-		generator.writeKey("index");
-		generator.write(this.index);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SplitResponse}.
-	 */
-
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SplitResponse> {
-		private Boolean shardsAcknowledged;
-
-		private String index;
-
-		/**
-		 * Required - API name: {@code shards_acknowledged}
-		 */
-		public final Builder shardsAcknowledged(boolean value) {
-			this.shardsAcknowledged = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SplitResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SplitResponse build() {
-			_checkSingleUse();
-
-			return new SplitResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SplitResponse}
-	 */
-	public static final JsonpDeserializer<SplitResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SplitResponse::setupSplitResponseDeserializer);
-
-	protected static void setupSplitResponseDeserializer(ObjectDeserializer<SplitResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
-		op.add(Builder::shardsAcknowledged, JsonpDeserializer.booleanDeserializer(), "shards_acknowledged");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-
-	}
+    private final boolean shardsAcknowledged;
+
+    private final String index;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SplitResponse(Builder builder) {
+        super(builder);
+
+        this.shardsAcknowledged = ApiTypeHelper.requireNonNull(builder.shardsAcknowledged, this, "shardsAcknowledged");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+
+    }
+
+    public static SplitResponse of(Function<Builder, ObjectBuilder<SplitResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code shards_acknowledged}
+     */
+    public final boolean shardsAcknowledged() {
+        return this.shardsAcknowledged;
+    }
+
+    /**
+     * Required - API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("shards_acknowledged");
+        generator.write(this.shardsAcknowledged);
+
+        generator.writeKey("index");
+        generator.write(this.index);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SplitResponse}.
+     */
+
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<SplitResponse> {
+        private Boolean shardsAcknowledged;
+
+        private String index;
+
+        /**
+         * Required - API name: {@code shards_acknowledged}
+         */
+        public final Builder shardsAcknowledged(boolean value) {
+            this.shardsAcknowledged = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SplitResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SplitResponse build() {
+            _checkSingleUse();
+
+            return new SplitResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SplitResponse}
+     */
+    public static final JsonpDeserializer<SplitResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SplitResponse::setupSplitResponseDeserializer
+    );
+
+    protected static void setupSplitResponseDeserializer(ObjectDeserializer<SplitResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+        op.add(Builder::shardsAcknowledged, JsonpDeserializer.booleanDeserializer(), "shards_acknowledged");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/TemplateMapping.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/TemplateMapping.java
index fd36f3aac7..c102ab266e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/TemplateMapping.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/TemplateMapping.java
@@ -32,7 +32,11 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.mapping.TypeMapping;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,302 +44,297 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.mapping.TypeMapping;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices._types.TemplateMapping
 
-
 @JsonpDeserializable
 public class TemplateMapping implements JsonpSerializable {
-	private final Map<String, Alias> aliases;
-
-	private final List<String> indexPatterns;
-
-	private final TypeMapping mappings;
-
-	private final int order;
-
-	private final Map<String, JsonData> settings;
-
-	@Nullable
-	private final Long version;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TemplateMapping(Builder builder) {
-
-		this.aliases = ApiTypeHelper.unmodifiableRequired(builder.aliases, this, "aliases");
-		this.indexPatterns = ApiTypeHelper.unmodifiableRequired(builder.indexPatterns, this, "indexPatterns");
-		this.mappings = ApiTypeHelper.requireNonNull(builder.mappings, this, "mappings");
-		this.order = ApiTypeHelper.requireNonNull(builder.order, this, "order");
-		this.settings = ApiTypeHelper.unmodifiableRequired(builder.settings, this, "settings");
-		this.version = builder.version;
-
-	}
-
-	public static TemplateMapping of(Function<Builder, ObjectBuilder<TemplateMapping>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code aliases}
-	 */
-	public final Map<String, Alias> aliases() {
-		return this.aliases;
-	}
-
-	/**
-	 * Required - API name: {@code index_patterns}
-	 */
-	public final List<String> indexPatterns() {
-		return this.indexPatterns;
-	}
-
-	/**
-	 * Required - API name: {@code mappings}
-	 */
-	public final TypeMapping mappings() {
-		return this.mappings;
-	}
+    private final Map<String, Alias> aliases;
+
+    private final List<String> indexPatterns;
+
+    private final TypeMapping mappings;
+
+    private final int order;
+
+    private final Map<String, JsonData> settings;
+
+    @Nullable
+    private final Long version;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TemplateMapping(Builder builder) {
+
+        this.aliases = ApiTypeHelper.unmodifiableRequired(builder.aliases, this, "aliases");
+        this.indexPatterns = ApiTypeHelper.unmodifiableRequired(builder.indexPatterns, this, "indexPatterns");
+        this.mappings = ApiTypeHelper.requireNonNull(builder.mappings, this, "mappings");
+        this.order = ApiTypeHelper.requireNonNull(builder.order, this, "order");
+        this.settings = ApiTypeHelper.unmodifiableRequired(builder.settings, this, "settings");
+        this.version = builder.version;
+
+    }
+
+    public static TemplateMapping of(Function<Builder, ObjectBuilder<TemplateMapping>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code aliases}
+     */
+    public final Map<String, Alias> aliases() {
+        return this.aliases;
+    }
+
+    /**
+     * Required - API name: {@code index_patterns}
+     */
+    public final List<String> indexPatterns() {
+        return this.indexPatterns;
+    }
+
+    /**
+     * Required - API name: {@code mappings}
+     */
+    public final TypeMapping mappings() {
+        return this.mappings;
+    }
 
-	/**
-	 * Required - API name: {@code order}
-	 */
-	public final int order() {
-		return this.order;
-	}
-
-	/**
-	 * Required - API name: {@code settings}
-	 */
-	public final Map<String, JsonData> settings() {
-		return this.settings;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.aliases)) {
-			generator.writeKey("aliases");
-			generator.writeStartObject();
-			for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.indexPatterns)) {
-			generator.writeKey("index_patterns");
-			generator.writeStartArray();
-			for (String item0 : this.indexPatterns) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("mappings");
-		this.mappings.serialize(generator, mapper);
-
-		generator.writeKey("order");
-		generator.write(this.order);
-
-		if (ApiTypeHelper.isDefined(this.settings)) {
-			generator.writeKey("settings");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TemplateMapping}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TemplateMapping> {
-		private Map<String, Alias> aliases;
-
-		private List<String> indexPatterns;
-
-		private TypeMapping mappings;
-
-		private Integer order;
-
-		private Map<String, JsonData> settings;
-
-		@Nullable
-		private Long version;
-
-		/**
-		 * Required - API name: {@code aliases}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aliases</code>.
-		 */
-		public final Builder aliases(Map<String, Alias> map) {
-			this.aliases = _mapPutAll(this.aliases, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code>.
-		 */
-		public final Builder aliases(String key, Alias value) {
-			this.aliases = _mapPut(this.aliases, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code> using a builder lambda.
-		 */
-		public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
-			return aliases(key, fn.apply(new Alias.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code index_patterns}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indexPatterns</code>.
-		 */
-		public final Builder indexPatterns(List<String> list) {
-			this.indexPatterns = _listAddAll(this.indexPatterns, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index_patterns}
-		 * <p>
-		 * Adds one or more values to <code>indexPatterns</code>.
-		 */
-		public final Builder indexPatterns(String value, String... values) {
-			this.indexPatterns = _listAdd(this.indexPatterns, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mappings}
-		 */
-		public final Builder mappings(TypeMapping value) {
-			this.mappings = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mappings}
-		 */
-		public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
-			return this.mappings(fn.apply(new TypeMapping.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code order}
-		 */
-		public final Builder order(int value) {
-			this.order = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code settings}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>settings</code>.
-		 */
-		public final Builder settings(Map<String, JsonData> map) {
-			this.settings = _mapPutAll(this.settings, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code settings}
-		 * <p>
-		 * Adds an entry to <code>settings</code>.
-		 */
-		public final Builder settings(String key, JsonData value) {
-			this.settings = _mapPut(this.settings, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TemplateMapping}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TemplateMapping build() {
-			_checkSingleUse();
-
-			return new TemplateMapping(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TemplateMapping}
-	 */
-	public static final JsonpDeserializer<TemplateMapping> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TemplateMapping::setupTemplateMappingDeserializer);
-
-	protected static void setupTemplateMappingDeserializer(ObjectDeserializer<TemplateMapping.Builder> op) {
-
-		op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
-		op.add(Builder::indexPatterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"index_patterns");
-		op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
-		op.add(Builder::order, JsonpDeserializer.integerDeserializer(), "order");
-		op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "settings");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
-
-	}
+    /**
+     * Required - API name: {@code order}
+     */
+    public final int order() {
+        return this.order;
+    }
+
+    /**
+     * Required - API name: {@code settings}
+     */
+    public final Map<String, JsonData> settings() {
+        return this.settings;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.aliases)) {
+            generator.writeKey("aliases");
+            generator.writeStartObject();
+            for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.indexPatterns)) {
+            generator.writeKey("index_patterns");
+            generator.writeStartArray();
+            for (String item0 : this.indexPatterns) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("mappings");
+        this.mappings.serialize(generator, mapper);
+
+        generator.writeKey("order");
+        generator.write(this.order);
+
+        if (ApiTypeHelper.isDefined(this.settings)) {
+            generator.writeKey("settings");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TemplateMapping}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TemplateMapping> {
+        private Map<String, Alias> aliases;
+
+        private List<String> indexPatterns;
+
+        private TypeMapping mappings;
+
+        private Integer order;
+
+        private Map<String, JsonData> settings;
+
+        @Nullable
+        private Long version;
+
+        /**
+         * Required - API name: {@code aliases}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aliases</code>.
+         */
+        public final Builder aliases(Map<String, Alias> map) {
+            this.aliases = _mapPutAll(this.aliases, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code>.
+         */
+        public final Builder aliases(String key, Alias value) {
+            this.aliases = _mapPut(this.aliases, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code> using a builder lambda.
+         */
+        public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
+            return aliases(key, fn.apply(new Alias.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code index_patterns}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indexPatterns</code>.
+         */
+        public final Builder indexPatterns(List<String> list) {
+            this.indexPatterns = _listAddAll(this.indexPatterns, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index_patterns}
+         * <p>
+         * Adds one or more values to <code>indexPatterns</code>.
+         */
+        public final Builder indexPatterns(String value, String... values) {
+            this.indexPatterns = _listAdd(this.indexPatterns, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mappings}
+         */
+        public final Builder mappings(TypeMapping value) {
+            this.mappings = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mappings}
+         */
+        public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
+            return this.mappings(fn.apply(new TypeMapping.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code order}
+         */
+        public final Builder order(int value) {
+            this.order = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code settings}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>settings</code>.
+         */
+        public final Builder settings(Map<String, JsonData> map) {
+            this.settings = _mapPutAll(this.settings, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code settings}
+         * <p>
+         * Adds an entry to <code>settings</code>.
+         */
+        public final Builder settings(String key, JsonData value) {
+            this.settings = _mapPut(this.settings, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link TemplateMapping}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TemplateMapping build() {
+            _checkSingleUse();
+
+            return new TemplateMapping(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TemplateMapping}
+     */
+    public static final JsonpDeserializer<TemplateMapping> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TemplateMapping::setupTemplateMappingDeserializer
+    );
+
+    protected static void setupTemplateMappingDeserializer(ObjectDeserializer<TemplateMapping.Builder> op) {
+
+        op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
+        op.add(Builder::indexPatterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "index_patterns");
+        op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
+        op.add(Builder::order, JsonpDeserializer.integerDeserializer(), "order");
+        op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "settings");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/Translog.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/Translog.java
index bc45c503e2..1009e61661 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/Translog.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/Translog.java
@@ -9,6 +9,8 @@
 package org.opensearch.client.opensearch.indices;
 
 import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -19,10 +21,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import javax.annotation.Nullable;
-import java.util.function.Function;
-
-
 @JsonpDeserializable
 public class Translog implements JsonpSerializable {
 
@@ -156,8 +154,10 @@ public Translog build() {
     /**
      * Json deserializer for {@link Translog}
      */
-    public static final JsonpDeserializer<Translog> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-            Translog::setupTranslogDeserializer);
+    public static final JsonpDeserializer<Translog> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Translog::setupTranslogDeserializer
+    );
 
     protected static void setupTranslogDeserializer(ObjectDeserializer<Translog.Builder> op) {
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/UpdateAliasesRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/UpdateAliasesRequest.java
index ca604c8b2e..6c8c5b1f24 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/UpdateAliasesRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/UpdateAliasesRequest.java
@@ -32,293 +32,298 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
-import org.opensearch.client.opensearch.indices.update_aliases.Action;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.Time;
+import org.opensearch.client.opensearch.indices.update_aliases.Action;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.update_aliases.Request
 
 /**
  * Updates index aliases.
- * 
+ *
  */
 @JsonpDeserializable
 public class UpdateAliasesRequest extends RequestBase implements JsonpSerializable {
-	private final List<Action> actions;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private UpdateAliasesRequest(Builder builder) {
-
-		this.actions = ApiTypeHelper.unmodifiable(builder.actions);
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.timeout = builder.timeout;
-
-	}
-
-	public static UpdateAliasesRequest of(Function<Builder, ObjectBuilder<UpdateAliasesRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code actions}
-	 */
-	public final List<Action> actions() {
-		return this.actions;
-	}
-
-	/**
-	 * Specify timeout for connection to master
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Specify timeout for connection to cluster-manager
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Request timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.actions)) {
-			generator.writeKey("actions");
-			generator.writeStartArray();
-			for (Action item0 : this.actions) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UpdateAliasesRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<UpdateAliasesRequest> {
-		@Nullable
-		private List<Action> actions;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * API name: {@code actions}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>actions</code>.
-		 */
-		public final Builder actions(List<Action> list) {
-			this.actions = _listAddAll(this.actions, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code actions}
-		 * <p>
-		 * Adds one or more values to <code>actions</code>.
-		 */
-		public final Builder actions(Action value, Action... values) {
-			this.actions = _listAdd(this.actions, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code actions}
-		 * <p>
-		 * Adds a value to <code>actions</code> using a builder lambda.
-		 */
-		public final Builder actions(Function<Action.Builder, ObjectBuilder<Action>> fn) {
-			return actions(fn.apply(new Action.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to master
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Specify timeout for connection to cluster-manager
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Request timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Request timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link UpdateAliasesRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UpdateAliasesRequest build() {
-			_checkSingleUse();
-
-			return new UpdateAliasesRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link UpdateAliasesRequest}
-	 */
-	public static final JsonpDeserializer<UpdateAliasesRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, UpdateAliasesRequest::setupUpdateAliasesRequestDeserializer);
-
-	protected static void setupUpdateAliasesRequestDeserializer(ObjectDeserializer<UpdateAliasesRequest.Builder> op) {
-
-		op.add(Builder::actions, JsonpDeserializer.arrayDeserializer(Action._DESERIALIZER), "actions");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.update_aliases}".
-	 */
-	public static final Endpoint<UpdateAliasesRequest, UpdateAliasesResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				return "/_aliases";
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, UpdateAliasesResponse._DESERIALIZER);
+    private final List<Action> actions;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private UpdateAliasesRequest(Builder builder) {
+
+        this.actions = ApiTypeHelper.unmodifiable(builder.actions);
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.timeout = builder.timeout;
+
+    }
+
+    public static UpdateAliasesRequest of(Function<Builder, ObjectBuilder<UpdateAliasesRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code actions}
+     */
+    public final List<Action> actions() {
+        return this.actions;
+    }
+
+    /**
+     * Specify timeout for connection to master
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Specify timeout for connection to cluster-manager
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Request timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.actions)) {
+            generator.writeKey("actions");
+            generator.writeStartArray();
+            for (Action item0 : this.actions) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UpdateAliasesRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<UpdateAliasesRequest> {
+        @Nullable
+        private List<Action> actions;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * API name: {@code actions}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>actions</code>.
+         */
+        public final Builder actions(List<Action> list) {
+            this.actions = _listAddAll(this.actions, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code actions}
+         * <p>
+         * Adds one or more values to <code>actions</code>.
+         */
+        public final Builder actions(Action value, Action... values) {
+            this.actions = _listAdd(this.actions, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code actions}
+         * <p>
+         * Adds a value to <code>actions</code> using a builder lambda.
+         */
+        public final Builder actions(Function<Action.Builder, ObjectBuilder<Action>> fn) {
+            return actions(fn.apply(new Action.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to master
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Specify timeout for connection to cluster-manager
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Request timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Request timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link UpdateAliasesRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UpdateAliasesRequest build() {
+            _checkSingleUse();
+
+            return new UpdateAliasesRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link UpdateAliasesRequest}
+     */
+    public static final JsonpDeserializer<UpdateAliasesRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        UpdateAliasesRequest::setupUpdateAliasesRequestDeserializer
+    );
+
+    protected static void setupUpdateAliasesRequestDeserializer(ObjectDeserializer<UpdateAliasesRequest.Builder> op) {
+
+        op.add(Builder::actions, JsonpDeserializer.arrayDeserializer(Action._DESERIALIZER), "actions");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.update_aliases}".
+     */
+    public static final Endpoint<UpdateAliasesRequest, UpdateAliasesResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            return "/_aliases";
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        UpdateAliasesResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/UpdateAliasesResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/UpdateAliasesResponse.java
index f9746fc372..c2d4e215b4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/UpdateAliasesResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/UpdateAliasesResponse.java
@@ -32,68 +32,67 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.update_aliases.Response
 
 @JsonpDeserializable
 public class UpdateAliasesResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private UpdateAliasesResponse(Builder builder) {
-		super(builder);
+    private UpdateAliasesResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static UpdateAliasesResponse of(Function<Builder, ObjectBuilder<UpdateAliasesResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static UpdateAliasesResponse of(Function<Builder, ObjectBuilder<UpdateAliasesResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link UpdateAliasesResponse}.
-	 */
+    /**
+     * Builder for {@link UpdateAliasesResponse}.
+     */
 
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<UpdateAliasesResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<UpdateAliasesResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link UpdateAliasesResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UpdateAliasesResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link UpdateAliasesResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UpdateAliasesResponse build() {
+            _checkSingleUse();
 
-			return new UpdateAliasesResponse(this);
-		}
-	}
+            return new UpdateAliasesResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link UpdateAliasesResponse}
-	 */
-	public static final JsonpDeserializer<UpdateAliasesResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, UpdateAliasesResponse::setupUpdateAliasesResponseDeserializer);
+    /**
+     * Json deserializer for {@link UpdateAliasesResponse}
+     */
+    public static final JsonpDeserializer<UpdateAliasesResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        UpdateAliasesResponse::setupUpdateAliasesResponseDeserializer
+    );
 
-	protected static void setupUpdateAliasesResponseDeserializer(ObjectDeserializer<UpdateAliasesResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+    protected static void setupUpdateAliasesResponseDeserializer(ObjectDeserializer<UpdateAliasesResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/UpgradeRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/UpgradeRequest.java
index ffa508afb6..e8e47973e1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/UpgradeRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/UpgradeRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.indices;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.ExpandWildcard;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -41,300 +47,294 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: indices.upgrade.Request
 
 /**
  * DEPRECATED Upgrades to the current version of Lucene.
- * 
+ *
  */
 
 public class UpgradeRequest extends RequestBase {
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	@Nullable
-	private final String index;
-
-	@Nullable
-	private final Boolean onlyAncientSegments;
-
-	@Nullable
-	private final Boolean waitForCompletion;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private UpgradeRequest(Builder builder) {
-
-		this.allowNoIndices = builder.allowNoIndices;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = builder.index;
-		this.onlyAncientSegments = builder.onlyAncientSegments;
-		this.waitForCompletion = builder.waitForCompletion;
-
-	}
-
-	public static UpgradeRequest of(Function<Builder, ObjectBuilder<UpgradeRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * A comma-separated list of index names; use <code>_all</code> or empty string
-	 * to perform the operation on all indices
-	 * <p>
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * If true, only ancient (an older Lucene major release) segments will be
-	 * upgraded
-	 * <p>
-	 * API name: {@code only_ancient_segments}
-	 */
-	@Nullable
-	public final Boolean onlyAncientSegments() {
-		return this.onlyAncientSegments;
-	}
-
-	/**
-	 * Specify whether the request should block until the all segments are upgraded
-	 * (default: false)
-	 * <p>
-	 * API name: {@code wait_for_completion}
-	 */
-	@Nullable
-	public final Boolean waitForCompletion() {
-		return this.waitForCompletion;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UpgradeRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<UpgradeRequest> {
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private String index;
-
-		@Nullable
-		private Boolean onlyAncientSegments;
-
-		@Nullable
-		private Boolean waitForCompletion;
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names; use <code>_all</code> or empty string
-		 * to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * If true, only ancient (an older Lucene major release) segments will be
-		 * upgraded
-		 * <p>
-		 * API name: {@code only_ancient_segments}
-		 */
-		public final Builder onlyAncientSegments(@Nullable Boolean value) {
-			this.onlyAncientSegments = value;
-			return this;
-		}
-
-		/**
-		 * Specify whether the request should block until the all segments are upgraded
-		 * (default: false)
-		 * <p>
-		 * API name: {@code wait_for_completion}
-		 */
-		public final Builder waitForCompletion(@Nullable Boolean value) {
-			this.waitForCompletion = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link UpgradeRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UpgradeRequest build() {
-			_checkSingleUse();
-
-			return new UpgradeRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.upgrade}".
-	 */
-	public static final Endpoint<UpgradeRequest, UpgradeResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (request.index() != null)
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_upgrade");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index, buf);
-					buf.append("/_upgrade");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.onlyAncientSegments != null) {
-					params.put("only_ancient_segments", String.valueOf(request.onlyAncientSegments));
-				}
-				if (request.waitForCompletion != null) {
-					params.put("wait_for_completion", String.valueOf(request.waitForCompletion));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, UpgradeResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    @Nullable
+    private final String index;
+
+    @Nullable
+    private final Boolean onlyAncientSegments;
+
+    @Nullable
+    private final Boolean waitForCompletion;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private UpgradeRequest(Builder builder) {
+
+        this.allowNoIndices = builder.allowNoIndices;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = builder.index;
+        this.onlyAncientSegments = builder.onlyAncientSegments;
+        this.waitForCompletion = builder.waitForCompletion;
+
+    }
+
+    public static UpgradeRequest of(Function<Builder, ObjectBuilder<UpgradeRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * A comma-separated list of index names; use <code>_all</code> or empty string
+     * to perform the operation on all indices
+     * <p>
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * If true, only ancient (an older Lucene major release) segments will be
+     * upgraded
+     * <p>
+     * API name: {@code only_ancient_segments}
+     */
+    @Nullable
+    public final Boolean onlyAncientSegments() {
+        return this.onlyAncientSegments;
+    }
+
+    /**
+     * Specify whether the request should block until the all segments are upgraded
+     * (default: false)
+     * <p>
+     * API name: {@code wait_for_completion}
+     */
+    @Nullable
+    public final Boolean waitForCompletion() {
+        return this.waitForCompletion;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UpgradeRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<UpgradeRequest> {
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private String index;
+
+        @Nullable
+        private Boolean onlyAncientSegments;
+
+        @Nullable
+        private Boolean waitForCompletion;
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names; use <code>_all</code> or empty string
+         * to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * If true, only ancient (an older Lucene major release) segments will be
+         * upgraded
+         * <p>
+         * API name: {@code only_ancient_segments}
+         */
+        public final Builder onlyAncientSegments(@Nullable Boolean value) {
+            this.onlyAncientSegments = value;
+            return this;
+        }
+
+        /**
+         * Specify whether the request should block until the all segments are upgraded
+         * (default: false)
+         * <p>
+         * API name: {@code wait_for_completion}
+         */
+        public final Builder waitForCompletion(@Nullable Boolean value) {
+            this.waitForCompletion = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link UpgradeRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UpgradeRequest build() {
+            _checkSingleUse();
+
+            return new UpgradeRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.upgrade}".
+     */
+    public static final Endpoint<UpgradeRequest, UpgradeResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (request.index() != null) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_upgrade");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index, buf);
+                buf.append("/_upgrade");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.onlyAncientSegments != null) {
+                params.put("only_ancient_segments", String.valueOf(request.onlyAncientSegments));
+            }
+            if (request.waitForCompletion != null) {
+                params.put("wait_for_completion", String.valueOf(request.waitForCompletion));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        UpgradeResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/UpgradeResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/UpgradeResponse.java
index 9d768a7b6e..71d8b706cd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/UpgradeResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/UpgradeResponse.java
@@ -32,68 +32,67 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: indices.upgrade.Response
 
 @JsonpDeserializable
 public class UpgradeResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private UpgradeResponse(Builder builder) {
-		super(builder);
+    private UpgradeResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static UpgradeResponse of(Function<Builder, ObjectBuilder<UpgradeResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static UpgradeResponse of(Function<Builder, ObjectBuilder<UpgradeResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link UpgradeResponse}.
-	 */
+    /**
+     * Builder for {@link UpgradeResponse}.
+     */
 
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<UpgradeResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<UpgradeResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link UpgradeResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UpgradeResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link UpgradeResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UpgradeResponse build() {
+            _checkSingleUse();
 
-			return new UpgradeResponse(this);
-		}
-	}
+            return new UpgradeResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link UpgradeResponse}
-	 */
-	public static final JsonpDeserializer<UpgradeResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			UpgradeResponse::setupUpgradeResponseDeserializer);
+    /**
+     * Json deserializer for {@link UpgradeResponse}
+     */
+    public static final JsonpDeserializer<UpgradeResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        UpgradeResponse::setupUpgradeResponseDeserializer
+    );
 
-	protected static void setupUpgradeResponseDeserializer(ObjectDeserializer<Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+    protected static void setupUpgradeResponseDeserializer(ObjectDeserializer<Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ValidateQueryRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ValidateQueryRequest.java
index d259a2b587..fee5c1e527 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ValidateQueryRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ValidateQueryRequest.java
@@ -32,609 +32,612 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.ExpandWildcard;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.query_dsl.Operator;
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.ExpandWildcard;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.query_dsl.Operator;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: indices.validate_query.Request
 
 /**
  * Allows a user to validate a potentially expensive query without executing it.
- * 
+ *
  */
 @JsonpDeserializable
 public class ValidateQueryRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final Boolean allShards;
-
-	@Nullable
-	private final Boolean allowNoIndices;
-
-	@Nullable
-	private final Boolean analyzeWildcard;
-
-	@Nullable
-	private final String analyzer;
-
-	@Nullable
-	private final Operator defaultOperator;
-
-	@Nullable
-	private final String df;
-
-	private final List<ExpandWildcard> expandWildcards;
-
-	@Nullable
-	private final Boolean explain;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	private final List<String> index;
-
-	@Nullable
-	private final Boolean lenient;
-
-	@Nullable
-	private final String q;
-
-	@Nullable
-	private final Query query;
-
-	@Nullable
-	private final Boolean rewrite;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ValidateQueryRequest(Builder builder) {
-
-		this.allShards = builder.allShards;
-		this.allowNoIndices = builder.allowNoIndices;
-		this.analyzeWildcard = builder.analyzeWildcard;
-		this.analyzer = builder.analyzer;
-		this.defaultOperator = builder.defaultOperator;
-		this.df = builder.df;
-		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
-		this.explain = builder.explain;
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.lenient = builder.lenient;
-		this.q = builder.q;
-		this.query = builder.query;
-		this.rewrite = builder.rewrite;
-
-	}
-
-	public static ValidateQueryRequest of(Function<Builder, ObjectBuilder<ValidateQueryRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Execute validation on all shards instead of one random shard per index
-	 * <p>
-	 * API name: {@code all_shards}
-	 */
-	@Nullable
-	public final Boolean allShards() {
-		return this.allShards;
-	}
-
-	/**
-	 * Whether to ignore if a wildcard indices expression resolves into no concrete
-	 * indices. (This includes <code>_all</code> string or when no indices have been
-	 * specified)
-	 * <p>
-	 * API name: {@code allow_no_indices}
-	 */
-	@Nullable
-	public final Boolean allowNoIndices() {
-		return this.allowNoIndices;
-	}
-
-	/**
-	 * Specify whether wildcard and prefix queries should be analyzed (default:
-	 * false)
-	 * <p>
-	 * API name: {@code analyze_wildcard}
-	 */
-	@Nullable
-	public final Boolean analyzeWildcard() {
-		return this.analyzeWildcard;
-	}
-
-	/**
-	 * The analyzer to use for the query string
-	 * <p>
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final String analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * The default operator for query string query (AND or OR)
-	 * <p>
-	 * API name: {@code default_operator}
-	 */
-	@Nullable
-	public final Operator defaultOperator() {
-		return this.defaultOperator;
-	}
-
-	/**
-	 * The field to use as default where no field prefix is given in the query
-	 * string
-	 * <p>
-	 * API name: {@code df}
-	 */
-	@Nullable
-	public final String df() {
-		return this.df;
-	}
-
-	/**
-	 * Whether to expand wildcard expression to concrete indices that are open,
-	 * closed or both.
-	 * <p>
-	 * API name: {@code expand_wildcards}
-	 */
-	public final List<ExpandWildcard> expandWildcards() {
-		return this.expandWildcards;
-	}
-
-	/**
-	 * Return detailed information about the error
-	 * <p>
-	 * API name: {@code explain}
-	 */
-	@Nullable
-	public final Boolean explain() {
-		return this.explain;
-	}
-
-	/**
-	 * Whether specified concrete indices should be ignored when unavailable
-	 * (missing or closed)
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * A comma-separated list of index names to restrict the operation; use
-	 * <code>_all</code> or empty string to perform the operation on all indices
-	 * <p>
-	 * API name: {@code index}
-	 */
-	public final List<String> index() {
-		return this.index;
-	}
-
-	/**
-	 * Specify whether format-based query failures (such as providing text to a
-	 * numeric field) should be ignored
-	 * <p>
-	 * API name: {@code lenient}
-	 */
-	@Nullable
-	public final Boolean lenient() {
-		return this.lenient;
-	}
-
-	/**
-	 * Query in the Lucene query string syntax
-	 * <p>
-	 * API name: {@code q}
-	 */
-	@Nullable
-	public final String q() {
-		return this.q;
-	}
-
-	/**
-	 * API name: {@code query}
-	 */
-	@Nullable
-	public final Query query() {
-		return this.query;
-	}
-
-	/**
-	 * Provide a more detailed explanation showing the actual Lucene query that will
-	 * be executed.
-	 * <p>
-	 * API name: {@code rewrite}
-	 */
-	@Nullable
-	public final Boolean rewrite() {
-		return this.rewrite;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.query != null) {
-			generator.writeKey("query");
-			this.query.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ValidateQueryRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ValidateQueryRequest> {
-		@Nullable
-		private Boolean allShards;
-
-		@Nullable
-		private Boolean allowNoIndices;
-
-		@Nullable
-		private Boolean analyzeWildcard;
-
-		@Nullable
-		private String analyzer;
-
-		@Nullable
-		private Operator defaultOperator;
-
-		@Nullable
-		private String df;
-
-		@Nullable
-		private List<ExpandWildcard> expandWildcards;
-
-		@Nullable
-		private Boolean explain;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private List<String> index;
-
-		@Nullable
-		private Boolean lenient;
-
-		@Nullable
-		private String q;
-
-		@Nullable
-		private Query query;
-
-		@Nullable
-		private Boolean rewrite;
-
-		/**
-		 * Execute validation on all shards instead of one random shard per index
-		 * <p>
-		 * API name: {@code all_shards}
-		 */
-		public final Builder allShards(@Nullable Boolean value) {
-			this.allShards = value;
-			return this;
-		}
-
-		/**
-		 * Whether to ignore if a wildcard indices expression resolves into no concrete
-		 * indices. (This includes <code>_all</code> string or when no indices have been
-		 * specified)
-		 * <p>
-		 * API name: {@code allow_no_indices}
-		 */
-		public final Builder allowNoIndices(@Nullable Boolean value) {
-			this.allowNoIndices = value;
-			return this;
-		}
-
-		/**
-		 * Specify whether wildcard and prefix queries should be analyzed (default:
-		 * false)
-		 * <p>
-		 * API name: {@code analyze_wildcard}
-		 */
-		public final Builder analyzeWildcard(@Nullable Boolean value) {
-			this.analyzeWildcard = value;
-			return this;
-		}
-
-		/**
-		 * The analyzer to use for the query string
-		 * <p>
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable String value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * The default operator for query string query (AND or OR)
-		 * <p>
-		 * API name: {@code default_operator}
-		 */
-		public final Builder defaultOperator(@Nullable Operator value) {
-			this.defaultOperator = value;
-			return this;
-		}
-
-		/**
-		 * The field to use as default where no field prefix is given in the query
-		 * string
-		 * <p>
-		 * API name: {@code df}
-		 */
-		public final Builder df(@Nullable String value) {
-			this.df = value;
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(List<ExpandWildcard> list) {
-			this.expandWildcards = _listAddAll(this.expandWildcards, list);
-			return this;
-		}
-
-		/**
-		 * Whether to expand wildcard expression to concrete indices that are open,
-		 * closed or both.
-		 * <p>
-		 * API name: {@code expand_wildcards}
-		 * <p>
-		 * Adds one or more values to <code>expandWildcards</code>.
-		 */
-		public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
-			this.expandWildcards = _listAdd(this.expandWildcards, value, values);
-			return this;
-		}
-
-		/**
-		 * Return detailed information about the error
-		 * <p>
-		 * API name: {@code explain}
-		 */
-		public final Builder explain(@Nullable Boolean value) {
-			this.explain = value;
-			return this;
-		}
-
-		/**
-		 * Whether specified concrete indices should be ignored when unavailable
-		 * (missing or closed)
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names to restrict the operation; use
-		 * <code>_all</code> or empty string to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>index</code>.
-		 */
-		public final Builder index(List<String> list) {
-			this.index = _listAddAll(this.index, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of index names to restrict the operation; use
-		 * <code>_all</code> or empty string to perform the operation on all indices
-		 * <p>
-		 * API name: {@code index}
-		 * <p>
-		 * Adds one or more values to <code>index</code>.
-		 */
-		public final Builder index(String value, String... values) {
-			this.index = _listAdd(this.index, value, values);
-			return this;
-		}
-
-		/**
-		 * Specify whether format-based query failures (such as providing text to a
-		 * numeric field) should be ignored
-		 * <p>
-		 * API name: {@code lenient}
-		 */
-		public final Builder lenient(@Nullable Boolean value) {
-			this.lenient = value;
-			return this;
-		}
-
-		/**
-		 * Query in the Lucene query string syntax
-		 * <p>
-		 * API name: {@code q}
-		 */
-		public final Builder q(@Nullable String value) {
-			this.q = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code query}
-		 */
-		public final Builder query(@Nullable Query value) {
-			this.query = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code query}
-		 */
-		public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.query(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * Provide a more detailed explanation showing the actual Lucene query that will
-		 * be executed.
-		 * <p>
-		 * API name: {@code rewrite}
-		 */
-		public final Builder rewrite(@Nullable Boolean value) {
-			this.rewrite = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ValidateQueryRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ValidateQueryRequest build() {
-			_checkSingleUse();
-
-			return new ValidateQueryRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ValidateQueryRequest}
-	 */
-	public static final JsonpDeserializer<ValidateQueryRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ValidateQueryRequest::setupValidateQueryRequestDeserializer);
-
-	protected static void setupValidateQueryRequestDeserializer(ObjectDeserializer<ValidateQueryRequest.Builder> op) {
-
-		op.add(Builder::query, Query._DESERIALIZER, "query");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code indices.validate_query}".
-	 */
-	public static final Endpoint<ValidateQueryRequest, ValidateQueryResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _index = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.index()))
-					propsSet |= _index;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_validate");
-					buf.append("/query");
-					return buf.toString();
-				}
-				if (propsSet == (_index)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					buf.append("/_validate");
-					buf.append("/query");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.explain != null) {
-					params.put("explain", String.valueOf(request.explain));
-				}
-				if (request.q != null) {
-					params.put("q", request.q);
-				}
-				if (request.df != null) {
-					params.put("df", request.df);
-				}
-				if (request.defaultOperator != null) {
-					params.put("default_operator", request.defaultOperator.jsonValue());
-				}
-				if (request.allShards != null) {
-					params.put("all_shards", String.valueOf(request.allShards));
-				}
-				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
-					params.put("expand_wildcards",
-							request.expandWildcards.stream()
-									.map(v -> v.jsonValue()).collect(Collectors.joining(",")));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.allowNoIndices != null) {
-					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
-				}
-				if (request.analyzer != null) {
-					params.put("analyzer", request.analyzer);
-				}
-				if (request.analyzeWildcard != null) {
-					params.put("analyze_wildcard", String.valueOf(request.analyzeWildcard));
-				}
-				if (request.lenient != null) {
-					params.put("lenient", String.valueOf(request.lenient));
-				}
-				if (request.rewrite != null) {
-					params.put("rewrite", String.valueOf(request.rewrite));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, ValidateQueryResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean allShards;
+
+    @Nullable
+    private final Boolean allowNoIndices;
+
+    @Nullable
+    private final Boolean analyzeWildcard;
+
+    @Nullable
+    private final String analyzer;
+
+    @Nullable
+    private final Operator defaultOperator;
+
+    @Nullable
+    private final String df;
+
+    private final List<ExpandWildcard> expandWildcards;
+
+    @Nullable
+    private final Boolean explain;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    private final List<String> index;
+
+    @Nullable
+    private final Boolean lenient;
+
+    @Nullable
+    private final String q;
+
+    @Nullable
+    private final Query query;
+
+    @Nullable
+    private final Boolean rewrite;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ValidateQueryRequest(Builder builder) {
+
+        this.allShards = builder.allShards;
+        this.allowNoIndices = builder.allowNoIndices;
+        this.analyzeWildcard = builder.analyzeWildcard;
+        this.analyzer = builder.analyzer;
+        this.defaultOperator = builder.defaultOperator;
+        this.df = builder.df;
+        this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+        this.explain = builder.explain;
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.index = ApiTypeHelper.unmodifiable(builder.index);
+        this.lenient = builder.lenient;
+        this.q = builder.q;
+        this.query = builder.query;
+        this.rewrite = builder.rewrite;
+
+    }
+
+    public static ValidateQueryRequest of(Function<Builder, ObjectBuilder<ValidateQueryRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Execute validation on all shards instead of one random shard per index
+     * <p>
+     * API name: {@code all_shards}
+     */
+    @Nullable
+    public final Boolean allShards() {
+        return this.allShards;
+    }
+
+    /**
+     * Whether to ignore if a wildcard indices expression resolves into no concrete
+     * indices. (This includes <code>_all</code> string or when no indices have been
+     * specified)
+     * <p>
+     * API name: {@code allow_no_indices}
+     */
+    @Nullable
+    public final Boolean allowNoIndices() {
+        return this.allowNoIndices;
+    }
+
+    /**
+     * Specify whether wildcard and prefix queries should be analyzed (default:
+     * false)
+     * <p>
+     * API name: {@code analyze_wildcard}
+     */
+    @Nullable
+    public final Boolean analyzeWildcard() {
+        return this.analyzeWildcard;
+    }
+
+    /**
+     * The analyzer to use for the query string
+     * <p>
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final String analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * The default operator for query string query (AND or OR)
+     * <p>
+     * API name: {@code default_operator}
+     */
+    @Nullable
+    public final Operator defaultOperator() {
+        return this.defaultOperator;
+    }
+
+    /**
+     * The field to use as default where no field prefix is given in the query
+     * string
+     * <p>
+     * API name: {@code df}
+     */
+    @Nullable
+    public final String df() {
+        return this.df;
+    }
+
+    /**
+     * Whether to expand wildcard expression to concrete indices that are open,
+     * closed or both.
+     * <p>
+     * API name: {@code expand_wildcards}
+     */
+    public final List<ExpandWildcard> expandWildcards() {
+        return this.expandWildcards;
+    }
+
+    /**
+     * Return detailed information about the error
+     * <p>
+     * API name: {@code explain}
+     */
+    @Nullable
+    public final Boolean explain() {
+        return this.explain;
+    }
+
+    /**
+     * Whether specified concrete indices should be ignored when unavailable
+     * (missing or closed)
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * A comma-separated list of index names to restrict the operation; use
+     * <code>_all</code> or empty string to perform the operation on all indices
+     * <p>
+     * API name: {@code index}
+     */
+    public final List<String> index() {
+        return this.index;
+    }
+
+    /**
+     * Specify whether format-based query failures (such as providing text to a
+     * numeric field) should be ignored
+     * <p>
+     * API name: {@code lenient}
+     */
+    @Nullable
+    public final Boolean lenient() {
+        return this.lenient;
+    }
+
+    /**
+     * Query in the Lucene query string syntax
+     * <p>
+     * API name: {@code q}
+     */
+    @Nullable
+    public final String q() {
+        return this.q;
+    }
+
+    /**
+     * API name: {@code query}
+     */
+    @Nullable
+    public final Query query() {
+        return this.query;
+    }
+
+    /**
+     * Provide a more detailed explanation showing the actual Lucene query that will
+     * be executed.
+     * <p>
+     * API name: {@code rewrite}
+     */
+    @Nullable
+    public final Boolean rewrite() {
+        return this.rewrite;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.query != null) {
+            generator.writeKey("query");
+            this.query.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ValidateQueryRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ValidateQueryRequest> {
+        @Nullable
+        private Boolean allShards;
+
+        @Nullable
+        private Boolean allowNoIndices;
+
+        @Nullable
+        private Boolean analyzeWildcard;
+
+        @Nullable
+        private String analyzer;
+
+        @Nullable
+        private Operator defaultOperator;
+
+        @Nullable
+        private String df;
+
+        @Nullable
+        private List<ExpandWildcard> expandWildcards;
+
+        @Nullable
+        private Boolean explain;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private List<String> index;
+
+        @Nullable
+        private Boolean lenient;
+
+        @Nullable
+        private String q;
+
+        @Nullable
+        private Query query;
+
+        @Nullable
+        private Boolean rewrite;
+
+        /**
+         * Execute validation on all shards instead of one random shard per index
+         * <p>
+         * API name: {@code all_shards}
+         */
+        public final Builder allShards(@Nullable Boolean value) {
+            this.allShards = value;
+            return this;
+        }
+
+        /**
+         * Whether to ignore if a wildcard indices expression resolves into no concrete
+         * indices. (This includes <code>_all</code> string or when no indices have been
+         * specified)
+         * <p>
+         * API name: {@code allow_no_indices}
+         */
+        public final Builder allowNoIndices(@Nullable Boolean value) {
+            this.allowNoIndices = value;
+            return this;
+        }
+
+        /**
+         * Specify whether wildcard and prefix queries should be analyzed (default:
+         * false)
+         * <p>
+         * API name: {@code analyze_wildcard}
+         */
+        public final Builder analyzeWildcard(@Nullable Boolean value) {
+            this.analyzeWildcard = value;
+            return this;
+        }
+
+        /**
+         * The analyzer to use for the query string
+         * <p>
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable String value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * The default operator for query string query (AND or OR)
+         * <p>
+         * API name: {@code default_operator}
+         */
+        public final Builder defaultOperator(@Nullable Operator value) {
+            this.defaultOperator = value;
+            return this;
+        }
+
+        /**
+         * The field to use as default where no field prefix is given in the query
+         * string
+         * <p>
+         * API name: {@code df}
+         */
+        public final Builder df(@Nullable String value) {
+            this.df = value;
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(List<ExpandWildcard> list) {
+            this.expandWildcards = _listAddAll(this.expandWildcards, list);
+            return this;
+        }
+
+        /**
+         * Whether to expand wildcard expression to concrete indices that are open,
+         * closed or both.
+         * <p>
+         * API name: {@code expand_wildcards}
+         * <p>
+         * Adds one or more values to <code>expandWildcards</code>.
+         */
+        public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... values) {
+            this.expandWildcards = _listAdd(this.expandWildcards, value, values);
+            return this;
+        }
+
+        /**
+         * Return detailed information about the error
+         * <p>
+         * API name: {@code explain}
+         */
+        public final Builder explain(@Nullable Boolean value) {
+            this.explain = value;
+            return this;
+        }
+
+        /**
+         * Whether specified concrete indices should be ignored when unavailable
+         * (missing or closed)
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names to restrict the operation; use
+         * <code>_all</code> or empty string to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>index</code>.
+         */
+        public final Builder index(List<String> list) {
+            this.index = _listAddAll(this.index, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of index names to restrict the operation; use
+         * <code>_all</code> or empty string to perform the operation on all indices
+         * <p>
+         * API name: {@code index}
+         * <p>
+         * Adds one or more values to <code>index</code>.
+         */
+        public final Builder index(String value, String... values) {
+            this.index = _listAdd(this.index, value, values);
+            return this;
+        }
+
+        /**
+         * Specify whether format-based query failures (such as providing text to a
+         * numeric field) should be ignored
+         * <p>
+         * API name: {@code lenient}
+         */
+        public final Builder lenient(@Nullable Boolean value) {
+            this.lenient = value;
+            return this;
+        }
+
+        /**
+         * Query in the Lucene query string syntax
+         * <p>
+         * API name: {@code q}
+         */
+        public final Builder q(@Nullable String value) {
+            this.q = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code query}
+         */
+        public final Builder query(@Nullable Query value) {
+            this.query = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code query}
+         */
+        public final Builder query(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.query(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * Provide a more detailed explanation showing the actual Lucene query that will
+         * be executed.
+         * <p>
+         * API name: {@code rewrite}
+         */
+        public final Builder rewrite(@Nullable Boolean value) {
+            this.rewrite = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ValidateQueryRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ValidateQueryRequest build() {
+            _checkSingleUse();
+
+            return new ValidateQueryRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ValidateQueryRequest}
+     */
+    public static final JsonpDeserializer<ValidateQueryRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ValidateQueryRequest::setupValidateQueryRequestDeserializer
+    );
+
+    protected static void setupValidateQueryRequestDeserializer(ObjectDeserializer<ValidateQueryRequest.Builder> op) {
+
+        op.add(Builder::query, Query._DESERIALIZER, "query");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code indices.validate_query}".
+     */
+    public static final Endpoint<ValidateQueryRequest, ValidateQueryResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _index = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.index())) propsSet |= _index;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_validate");
+                buf.append("/query");
+                return buf.toString();
+            }
+            if (propsSet == (_index)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.index.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_validate");
+                buf.append("/query");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.explain != null) {
+                params.put("explain", String.valueOf(request.explain));
+            }
+            if (request.q != null) {
+                params.put("q", request.q);
+            }
+            if (request.df != null) {
+                params.put("df", request.df);
+            }
+            if (request.defaultOperator != null) {
+                params.put("default_operator", request.defaultOperator.jsonValue());
+            }
+            if (request.allShards != null) {
+                params.put("all_shards", String.valueOf(request.allShards));
+            }
+            if (ApiTypeHelper.isDefined(request.expandWildcards)) {
+                params.put("expand_wildcards", request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.allowNoIndices != null) {
+                params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
+            }
+            if (request.analyzer != null) {
+                params.put("analyzer", request.analyzer);
+            }
+            if (request.analyzeWildcard != null) {
+                params.put("analyze_wildcard", String.valueOf(request.analyzeWildcard));
+            }
+            if (request.lenient != null) {
+                params.put("lenient", String.valueOf(request.lenient));
+            }
+            if (request.rewrite != null) {
+                params.put("rewrite", String.valueOf(request.rewrite));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        ValidateQueryResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ValidateQueryResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ValidateQueryResponse.java
index 070ef2d88f..5bc71ccf0b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/ValidateQueryResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/ValidateQueryResponse.java
@@ -32,227 +32,226 @@
 
 package org.opensearch.client.opensearch.indices;
 
-import org.opensearch.client.opensearch._types.ShardStatistics;
-import org.opensearch.client.opensearch.indices.validate_query.IndicesValidationExplanation;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ShardStatistics;
+import org.opensearch.client.opensearch.indices.validate_query.IndicesValidationExplanation;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.validate_query.Response
 
 @JsonpDeserializable
 public class ValidateQueryResponse implements JsonpSerializable {
-	private final List<IndicesValidationExplanation> explanations;
+    private final List<IndicesValidationExplanation> explanations;
 
-	@Nullable
-	private final ShardStatistics shards;
+    @Nullable
+    private final ShardStatistics shards;
 
-	private final boolean valid;
+    private final boolean valid;
 
-	@Nullable
-	private final String error;
+    @Nullable
+    private final String error;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ValidateQueryResponse(Builder builder) {
+    private ValidateQueryResponse(Builder builder) {
 
-		this.explanations = ApiTypeHelper.unmodifiable(builder.explanations);
-		this.shards = builder.shards;
-		this.valid = ApiTypeHelper.requireNonNull(builder.valid, this, "valid");
-		this.error = builder.error;
-
-	}
-
-	public static ValidateQueryResponse of(Function<Builder, ObjectBuilder<ValidateQueryResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code explanations}
-	 */
-	public final List<IndicesValidationExplanation> explanations() {
-		return this.explanations;
-	}
-
-	/**
-	 * API name: {@code _shards}
-	 */
-	@Nullable
-	public final ShardStatistics shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Required - API name: {@code valid}
-	 */
-	public final boolean valid() {
-		return this.valid;
-	}
-
-	/**
-	 * API name: {@code error}
-	 */
-	@Nullable
-	public final String error() {
-		return this.error;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.explanations)) {
-			generator.writeKey("explanations");
-			generator.writeStartArray();
-			for (IndicesValidationExplanation item0 : this.explanations) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.shards != null) {
-			generator.writeKey("_shards");
-			this.shards.serialize(generator, mapper);
-
-		}
-		generator.writeKey("valid");
-		generator.write(this.valid);
-
-		if (this.error != null) {
-			generator.writeKey("error");
-			generator.write(this.error);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ValidateQueryResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ValidateQueryResponse> {
-		@Nullable
-		private List<IndicesValidationExplanation> explanations;
-
-		@Nullable
-		private ShardStatistics shards;
-
-		private Boolean valid;
-
-		@Nullable
-		private String error;
-
-		/**
-		 * API name: {@code explanations}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>explanations</code>.
-		 */
-		public final Builder explanations(List<IndicesValidationExplanation> list) {
-			this.explanations = _listAddAll(this.explanations, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code explanations}
-		 * <p>
-		 * Adds one or more values to <code>explanations</code>.
-		 */
-		public final Builder explanations(IndicesValidationExplanation value, IndicesValidationExplanation... values) {
-			this.explanations = _listAdd(this.explanations, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code explanations}
-		 * <p>
-		 * Adds a value to <code>explanations</code> using a builder lambda.
-		 */
-		public final Builder explanations(
-				Function<IndicesValidationExplanation.Builder, ObjectBuilder<IndicesValidationExplanation>> fn) {
-			return explanations(fn.apply(new IndicesValidationExplanation.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code _shards}
-		 */
-		public final Builder shards(@Nullable ShardStatistics value) {
-			this.shards = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _shards}
-		 */
-		public final Builder shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
-			return this.shards(fn.apply(new ShardStatistics.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code valid}
-		 */
-		public final Builder valid(boolean value) {
-			this.valid = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code error}
-		 */
-		public final Builder error(@Nullable String value) {
-			this.error = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ValidateQueryResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ValidateQueryResponse build() {
-			_checkSingleUse();
-
-			return new ValidateQueryResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ValidateQueryResponse}
-	 */
-	public static final JsonpDeserializer<ValidateQueryResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ValidateQueryResponse::setupValidateQueryResponseDeserializer);
-
-	protected static void setupValidateQueryResponseDeserializer(ObjectDeserializer<ValidateQueryResponse.Builder> op) {
-
-		op.add(Builder::explanations, JsonpDeserializer.arrayDeserializer(IndicesValidationExplanation._DESERIALIZER),
-				"explanations");
-		op.add(Builder::shards, ShardStatistics._DESERIALIZER, "_shards");
-		op.add(Builder::valid, JsonpDeserializer.booleanDeserializer(), "valid");
-		op.add(Builder::error, JsonpDeserializer.stringDeserializer(), "error");
-
-	}
+        this.explanations = ApiTypeHelper.unmodifiable(builder.explanations);
+        this.shards = builder.shards;
+        this.valid = ApiTypeHelper.requireNonNull(builder.valid, this, "valid");
+        this.error = builder.error;
+
+    }
+
+    public static ValidateQueryResponse of(Function<Builder, ObjectBuilder<ValidateQueryResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code explanations}
+     */
+    public final List<IndicesValidationExplanation> explanations() {
+        return this.explanations;
+    }
+
+    /**
+     * API name: {@code _shards}
+     */
+    @Nullable
+    public final ShardStatistics shards() {
+        return this.shards;
+    }
+
+    /**
+     * Required - API name: {@code valid}
+     */
+    public final boolean valid() {
+        return this.valid;
+    }
+
+    /**
+     * API name: {@code error}
+     */
+    @Nullable
+    public final String error() {
+        return this.error;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.explanations)) {
+            generator.writeKey("explanations");
+            generator.writeStartArray();
+            for (IndicesValidationExplanation item0 : this.explanations) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.shards != null) {
+            generator.writeKey("_shards");
+            this.shards.serialize(generator, mapper);
+
+        }
+        generator.writeKey("valid");
+        generator.write(this.valid);
+
+        if (this.error != null) {
+            generator.writeKey("error");
+            generator.write(this.error);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ValidateQueryResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ValidateQueryResponse> {
+        @Nullable
+        private List<IndicesValidationExplanation> explanations;
+
+        @Nullable
+        private ShardStatistics shards;
+
+        private Boolean valid;
+
+        @Nullable
+        private String error;
+
+        /**
+         * API name: {@code explanations}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>explanations</code>.
+         */
+        public final Builder explanations(List<IndicesValidationExplanation> list) {
+            this.explanations = _listAddAll(this.explanations, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code explanations}
+         * <p>
+         * Adds one or more values to <code>explanations</code>.
+         */
+        public final Builder explanations(IndicesValidationExplanation value, IndicesValidationExplanation... values) {
+            this.explanations = _listAdd(this.explanations, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code explanations}
+         * <p>
+         * Adds a value to <code>explanations</code> using a builder lambda.
+         */
+        public final Builder explanations(Function<IndicesValidationExplanation.Builder, ObjectBuilder<IndicesValidationExplanation>> fn) {
+            return explanations(fn.apply(new IndicesValidationExplanation.Builder()).build());
+        }
+
+        /**
+         * API name: {@code _shards}
+         */
+        public final Builder shards(@Nullable ShardStatistics value) {
+            this.shards = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _shards}
+         */
+        public final Builder shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
+            return this.shards(fn.apply(new ShardStatistics.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code valid}
+         */
+        public final Builder valid(boolean value) {
+            this.valid = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code error}
+         */
+        public final Builder error(@Nullable String value) {
+            this.error = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ValidateQueryResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ValidateQueryResponse build() {
+            _checkSingleUse();
+
+            return new ValidateQueryResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ValidateQueryResponse}
+     */
+    public static final JsonpDeserializer<ValidateQueryResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ValidateQueryResponse::setupValidateQueryResponseDeserializer
+    );
+
+    protected static void setupValidateQueryResponseDeserializer(ObjectDeserializer<ValidateQueryResponse.Builder> op) {
+
+        op.add(Builder::explanations, JsonpDeserializer.arrayDeserializer(IndicesValidationExplanation._DESERIALIZER), "explanations");
+        op.add(Builder::shards, ShardStatistics._DESERIALIZER, "_shards");
+        op.add(Builder::valid, JsonpDeserializer.booleanDeserializer(), "valid");
+        op.add(Builder::error, JsonpDeserializer.stringDeserializer(), "error");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/add_block/IndicesBlockOptions.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/add_block/IndicesBlockOptions.java
index 6846d2a253..f8f767129e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/add_block/IndicesBlockOptions.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/add_block/IndicesBlockOptions.java
@@ -37,26 +37,27 @@
 
 @JsonpDeserializable
 public enum IndicesBlockOptions implements JsonEnum {
-	Metadata("metadata"),
+    Metadata("metadata"),
 
-	Read("read"),
+    Read("read"),
 
-	ReadOnly("read_only"),
+    ReadOnly("read_only"),
 
-	Write("write"),
+    Write("write"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	IndicesBlockOptions(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    IndicesBlockOptions(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<IndicesBlockOptions> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			IndicesBlockOptions.values());
+    public static final JsonEnum.Deserializer<IndicesBlockOptions> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        IndicesBlockOptions.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/add_block/IndicesBlockStatus.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/add_block/IndicesBlockStatus.java
index 57a3034a6a..e7e48748c5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/add_block/IndicesBlockStatus.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/add_block/IndicesBlockStatus.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.indices.add_block;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,116 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: indices.add_block.IndicesBlockStatus
 
 @JsonpDeserializable
 public class IndicesBlockStatus implements JsonpSerializable {
-	private final String name;
-
-	private final boolean blocked;
-
-	// ---------------------------------------------------------------------------------------------
+    private final String name;
 
-	private IndicesBlockStatus(Builder builder) {
+    private final boolean blocked;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.blocked = ApiTypeHelper.requireNonNull(builder.blocked, this, "blocked");
+    private IndicesBlockStatus(Builder builder) {
 
-	}
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.blocked = ApiTypeHelper.requireNonNull(builder.blocked, this, "blocked");
 
-	public static IndicesBlockStatus of(Function<Builder, ObjectBuilder<IndicesBlockStatus>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
+    public static IndicesBlockStatus of(Function<Builder, ObjectBuilder<IndicesBlockStatus>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code blocked}
-	 */
-	public final boolean blocked() {
-		return this.blocked;
-	}
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code blocked}
+     */
+    public final boolean blocked() {
+        return this.blocked;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("name");
-		generator.write(this.name);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("blocked");
-		generator.write(this.blocked);
+        generator.writeKey("name");
+        generator.write(this.name);
 
-	}
+        generator.writeKey("blocked");
+        generator.write(this.blocked);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link IndicesBlockStatus}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesBlockStatus> {
-		private String name;
+    /**
+     * Builder for {@link IndicesBlockStatus}.
+     */
 
-		private Boolean blocked;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesBlockStatus> {
+        private String name;
 
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
+        private Boolean blocked;
 
-		/**
-		 * Required - API name: {@code blocked}
-		 */
-		public final Builder blocked(boolean value) {
-			this.blocked = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link IndicesBlockStatus}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndicesBlockStatus build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code blocked}
+         */
+        public final Builder blocked(boolean value) {
+            this.blocked = value;
+            return this;
+        }
 
-			return new IndicesBlockStatus(this);
-		}
-	}
+        /**
+         * Builds a {@link IndicesBlockStatus}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndicesBlockStatus build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new IndicesBlockStatus(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link IndicesBlockStatus}
-	 */
-	public static final JsonpDeserializer<IndicesBlockStatus> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IndicesBlockStatus::setupIndicesBlockStatusDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupIndicesBlockStatusDeserializer(ObjectDeserializer<IndicesBlockStatus.Builder> op) {
+    /**
+     * Json deserializer for {@link IndicesBlockStatus}
+     */
+    public static final JsonpDeserializer<IndicesBlockStatus> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndicesBlockStatus::setupIndicesBlockStatusDeserializer
+    );
 
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::blocked, JsonpDeserializer.booleanDeserializer(), "blocked");
+    protected static void setupIndicesBlockStatusDeserializer(ObjectDeserializer<IndicesBlockStatus.Builder> op) {
 
-	}
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::blocked, JsonpDeserializer.booleanDeserializer(), "blocked");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/AnalyzeDetail.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/AnalyzeDetail.java
index 4cabd3343a..f79787c819 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/AnalyzeDetail.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/AnalyzeDetail.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.indices.analyze;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,275 +45,271 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.analyze.AnalyzeDetail
 
-
 @JsonpDeserializable
 public class AnalyzeDetail implements JsonpSerializable {
-	@Nullable
-	private final AnalyzerDetail analyzer;
-
-	private final List<CharFilterDetail> charfilters;
-
-	private final boolean customAnalyzer;
-
-	private final List<TokenDetail> tokenfilters;
-
-	@Nullable
-	private final TokenDetail tokenizer;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AnalyzeDetail(Builder builder) {
-
-		this.analyzer = builder.analyzer;
-		this.charfilters = ApiTypeHelper.unmodifiable(builder.charfilters);
-		this.customAnalyzer = ApiTypeHelper.requireNonNull(builder.customAnalyzer, this, "customAnalyzer");
-		this.tokenfilters = ApiTypeHelper.unmodifiable(builder.tokenfilters);
-		this.tokenizer = builder.tokenizer;
-
-	}
-
-	public static AnalyzeDetail of(Function<Builder, ObjectBuilder<AnalyzeDetail>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code analyzer}
-	 */
-	@Nullable
-	public final AnalyzerDetail analyzer() {
-		return this.analyzer;
-	}
-
-	/**
-	 * API name: {@code charfilters}
-	 */
-	public final List<CharFilterDetail> charfilters() {
-		return this.charfilters;
-	}
-
-	/**
-	 * Required - API name: {@code custom_analyzer}
-	 */
-	public final boolean customAnalyzer() {
-		return this.customAnalyzer;
-	}
-
-	/**
-	 * API name: {@code tokenfilters}
-	 */
-	public final List<TokenDetail> tokenfilters() {
-		return this.tokenfilters;
-	}
-
-	/**
-	 * API name: {@code tokenizer}
-	 */
-	@Nullable
-	public final TokenDetail tokenizer() {
-		return this.tokenizer;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.analyzer != null) {
-			generator.writeKey("analyzer");
-			this.analyzer.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.charfilters)) {
-			generator.writeKey("charfilters");
-			generator.writeStartArray();
-			for (CharFilterDetail item0 : this.charfilters) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("custom_analyzer");
-		generator.write(this.customAnalyzer);
-
-		if (ApiTypeHelper.isDefined(this.tokenfilters)) {
-			generator.writeKey("tokenfilters");
-			generator.writeStartArray();
-			for (TokenDetail item0 : this.tokenfilters) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.tokenizer != null) {
-			generator.writeKey("tokenizer");
-			this.tokenizer.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AnalyzeDetail}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AnalyzeDetail> {
-		@Nullable
-		private AnalyzerDetail analyzer;
-
-		@Nullable
-		private List<CharFilterDetail> charfilters;
-
-		private Boolean customAnalyzer;
-
-		@Nullable
-		private List<TokenDetail> tokenfilters;
-
-		@Nullable
-		private TokenDetail tokenizer;
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(@Nullable AnalyzerDetail value) {
-			this.analyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code analyzer}
-		 */
-		public final Builder analyzer(Function<AnalyzerDetail.Builder, ObjectBuilder<AnalyzerDetail>> fn) {
-			return this.analyzer(fn.apply(new AnalyzerDetail.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code charfilters}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>charfilters</code>.
-		 */
-		public final Builder charfilters(List<CharFilterDetail> list) {
-			this.charfilters = _listAddAll(this.charfilters, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code charfilters}
-		 * <p>
-		 * Adds one or more values to <code>charfilters</code>.
-		 */
-		public final Builder charfilters(CharFilterDetail value, CharFilterDetail... values) {
-			this.charfilters = _listAdd(this.charfilters, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code charfilters}
-		 * <p>
-		 * Adds a value to <code>charfilters</code> using a builder lambda.
-		 */
-		public final Builder charfilters(Function<CharFilterDetail.Builder, ObjectBuilder<CharFilterDetail>> fn) {
-			return charfilters(fn.apply(new CharFilterDetail.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code custom_analyzer}
-		 */
-		public final Builder customAnalyzer(boolean value) {
-			this.customAnalyzer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code tokenfilters}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>tokenfilters</code>.
-		 */
-		public final Builder tokenfilters(List<TokenDetail> list) {
-			this.tokenfilters = _listAddAll(this.tokenfilters, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code tokenfilters}
-		 * <p>
-		 * Adds one or more values to <code>tokenfilters</code>.
-		 */
-		public final Builder tokenfilters(TokenDetail value, TokenDetail... values) {
-			this.tokenfilters = _listAdd(this.tokenfilters, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code tokenfilters}
-		 * <p>
-		 * Adds a value to <code>tokenfilters</code> using a builder lambda.
-		 */
-		public final Builder tokenfilters(Function<TokenDetail.Builder, ObjectBuilder<TokenDetail>> fn) {
-			return tokenfilters(fn.apply(new TokenDetail.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code tokenizer}
-		 */
-		public final Builder tokenizer(@Nullable TokenDetail value) {
-			this.tokenizer = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code tokenizer}
-		 */
-		public final Builder tokenizer(Function<TokenDetail.Builder, ObjectBuilder<TokenDetail>> fn) {
-			return this.tokenizer(fn.apply(new TokenDetail.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link AnalyzeDetail}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AnalyzeDetail build() {
-			_checkSingleUse();
-
-			return new AnalyzeDetail(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AnalyzeDetail}
-	 */
-	public static final JsonpDeserializer<AnalyzeDetail> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			AnalyzeDetail::setupAnalyzeDetailDeserializer);
-
-	protected static void setupAnalyzeDetailDeserializer(ObjectDeserializer<AnalyzeDetail.Builder> op) {
-
-		op.add(Builder::analyzer, AnalyzerDetail._DESERIALIZER, "analyzer");
-		op.add(Builder::charfilters, JsonpDeserializer.arrayDeserializer(CharFilterDetail._DESERIALIZER),
-				"charfilters");
-		op.add(Builder::customAnalyzer, JsonpDeserializer.booleanDeserializer(), "custom_analyzer");
-		op.add(Builder::tokenfilters, JsonpDeserializer.arrayDeserializer(TokenDetail._DESERIALIZER), "tokenfilters");
-		op.add(Builder::tokenizer, TokenDetail._DESERIALIZER, "tokenizer");
-
-	}
+    @Nullable
+    private final AnalyzerDetail analyzer;
+
+    private final List<CharFilterDetail> charfilters;
+
+    private final boolean customAnalyzer;
+
+    private final List<TokenDetail> tokenfilters;
+
+    @Nullable
+    private final TokenDetail tokenizer;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AnalyzeDetail(Builder builder) {
+
+        this.analyzer = builder.analyzer;
+        this.charfilters = ApiTypeHelper.unmodifiable(builder.charfilters);
+        this.customAnalyzer = ApiTypeHelper.requireNonNull(builder.customAnalyzer, this, "customAnalyzer");
+        this.tokenfilters = ApiTypeHelper.unmodifiable(builder.tokenfilters);
+        this.tokenizer = builder.tokenizer;
+
+    }
+
+    public static AnalyzeDetail of(Function<Builder, ObjectBuilder<AnalyzeDetail>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code analyzer}
+     */
+    @Nullable
+    public final AnalyzerDetail analyzer() {
+        return this.analyzer;
+    }
+
+    /**
+     * API name: {@code charfilters}
+     */
+    public final List<CharFilterDetail> charfilters() {
+        return this.charfilters;
+    }
+
+    /**
+     * Required - API name: {@code custom_analyzer}
+     */
+    public final boolean customAnalyzer() {
+        return this.customAnalyzer;
+    }
+
+    /**
+     * API name: {@code tokenfilters}
+     */
+    public final List<TokenDetail> tokenfilters() {
+        return this.tokenfilters;
+    }
+
+    /**
+     * API name: {@code tokenizer}
+     */
+    @Nullable
+    public final TokenDetail tokenizer() {
+        return this.tokenizer;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.analyzer != null) {
+            generator.writeKey("analyzer");
+            this.analyzer.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.charfilters)) {
+            generator.writeKey("charfilters");
+            generator.writeStartArray();
+            for (CharFilterDetail item0 : this.charfilters) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("custom_analyzer");
+        generator.write(this.customAnalyzer);
+
+        if (ApiTypeHelper.isDefined(this.tokenfilters)) {
+            generator.writeKey("tokenfilters");
+            generator.writeStartArray();
+            for (TokenDetail item0 : this.tokenfilters) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.tokenizer != null) {
+            generator.writeKey("tokenizer");
+            this.tokenizer.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AnalyzeDetail}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AnalyzeDetail> {
+        @Nullable
+        private AnalyzerDetail analyzer;
+
+        @Nullable
+        private List<CharFilterDetail> charfilters;
+
+        private Boolean customAnalyzer;
+
+        @Nullable
+        private List<TokenDetail> tokenfilters;
+
+        @Nullable
+        private TokenDetail tokenizer;
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(@Nullable AnalyzerDetail value) {
+            this.analyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code analyzer}
+         */
+        public final Builder analyzer(Function<AnalyzerDetail.Builder, ObjectBuilder<AnalyzerDetail>> fn) {
+            return this.analyzer(fn.apply(new AnalyzerDetail.Builder()).build());
+        }
+
+        /**
+         * API name: {@code charfilters}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>charfilters</code>.
+         */
+        public final Builder charfilters(List<CharFilterDetail> list) {
+            this.charfilters = _listAddAll(this.charfilters, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code charfilters}
+         * <p>
+         * Adds one or more values to <code>charfilters</code>.
+         */
+        public final Builder charfilters(CharFilterDetail value, CharFilterDetail... values) {
+            this.charfilters = _listAdd(this.charfilters, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code charfilters}
+         * <p>
+         * Adds a value to <code>charfilters</code> using a builder lambda.
+         */
+        public final Builder charfilters(Function<CharFilterDetail.Builder, ObjectBuilder<CharFilterDetail>> fn) {
+            return charfilters(fn.apply(new CharFilterDetail.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code custom_analyzer}
+         */
+        public final Builder customAnalyzer(boolean value) {
+            this.customAnalyzer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code tokenfilters}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>tokenfilters</code>.
+         */
+        public final Builder tokenfilters(List<TokenDetail> list) {
+            this.tokenfilters = _listAddAll(this.tokenfilters, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code tokenfilters}
+         * <p>
+         * Adds one or more values to <code>tokenfilters</code>.
+         */
+        public final Builder tokenfilters(TokenDetail value, TokenDetail... values) {
+            this.tokenfilters = _listAdd(this.tokenfilters, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code tokenfilters}
+         * <p>
+         * Adds a value to <code>tokenfilters</code> using a builder lambda.
+         */
+        public final Builder tokenfilters(Function<TokenDetail.Builder, ObjectBuilder<TokenDetail>> fn) {
+            return tokenfilters(fn.apply(new TokenDetail.Builder()).build());
+        }
+
+        /**
+         * API name: {@code tokenizer}
+         */
+        public final Builder tokenizer(@Nullable TokenDetail value) {
+            this.tokenizer = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code tokenizer}
+         */
+        public final Builder tokenizer(Function<TokenDetail.Builder, ObjectBuilder<TokenDetail>> fn) {
+            return this.tokenizer(fn.apply(new TokenDetail.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link AnalyzeDetail}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AnalyzeDetail build() {
+            _checkSingleUse();
+
+            return new AnalyzeDetail(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AnalyzeDetail}
+     */
+    public static final JsonpDeserializer<AnalyzeDetail> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AnalyzeDetail::setupAnalyzeDetailDeserializer
+    );
+
+    protected static void setupAnalyzeDetailDeserializer(ObjectDeserializer<AnalyzeDetail.Builder> op) {
+
+        op.add(Builder::analyzer, AnalyzerDetail._DESERIALIZER, "analyzer");
+        op.add(Builder::charfilters, JsonpDeserializer.arrayDeserializer(CharFilterDetail._DESERIALIZER), "charfilters");
+        op.add(Builder::customAnalyzer, JsonpDeserializer.booleanDeserializer(), "custom_analyzer");
+        op.add(Builder::tokenfilters, JsonpDeserializer.arrayDeserializer(TokenDetail._DESERIALIZER), "tokenfilters");
+        op.add(Builder::tokenizer, TokenDetail._DESERIALIZER, "tokenizer");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/AnalyzeToken.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/AnalyzeToken.java
index 0c0a1f6787..d554157a7d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/AnalyzeToken.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/AnalyzeToken.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.analyze;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,219 +44,217 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.analyze.AnalyzeToken
 
-
 @JsonpDeserializable
 public class AnalyzeToken implements JsonpSerializable {
-	private final long endOffset;
-
-	private final long position;
-
-	@Nullable
-	private final Long positionLength;
+    private final long endOffset;
+
+    private final long position;
+
+    @Nullable
+    private final Long positionLength;
 
-	private final long startOffset;
+    private final long startOffset;
 
-	private final String token;
+    private final String token;
 
-	private final String type;
+    private final String type;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private AnalyzeToken(Builder builder) {
+    private AnalyzeToken(Builder builder) {
 
-		this.endOffset = ApiTypeHelper.requireNonNull(builder.endOffset, this, "endOffset");
-		this.position = ApiTypeHelper.requireNonNull(builder.position, this, "position");
-		this.positionLength = builder.positionLength;
-		this.startOffset = ApiTypeHelper.requireNonNull(builder.startOffset, this, "startOffset");
-		this.token = ApiTypeHelper.requireNonNull(builder.token, this, "token");
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.endOffset = ApiTypeHelper.requireNonNull(builder.endOffset, this, "endOffset");
+        this.position = ApiTypeHelper.requireNonNull(builder.position, this, "position");
+        this.positionLength = builder.positionLength;
+        this.startOffset = ApiTypeHelper.requireNonNull(builder.startOffset, this, "startOffset");
+        this.token = ApiTypeHelper.requireNonNull(builder.token, this, "token");
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
 
-	}
+    }
 
-	public static AnalyzeToken of(Function<Builder, ObjectBuilder<AnalyzeToken>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static AnalyzeToken of(Function<Builder, ObjectBuilder<AnalyzeToken>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code end_offset}
-	 */
-	public final long endOffset() {
-		return this.endOffset;
-	}
+    /**
+     * Required - API name: {@code end_offset}
+     */
+    public final long endOffset() {
+        return this.endOffset;
+    }
 
-	/**
-	 * Required - API name: {@code position}
-	 */
-	public final long position() {
-		return this.position;
-	}
+    /**
+     * Required - API name: {@code position}
+     */
+    public final long position() {
+        return this.position;
+    }
 
-	/**
-	 * API name: {@code position_length}
-	 */
-	@Nullable
-	public final Long positionLength() {
-		return this.positionLength;
-	}
-
-	/**
-	 * Required - API name: {@code start_offset}
-	 */
-	public final long startOffset() {
-		return this.startOffset;
-	}
-
-	/**
-	 * Required - API name: {@code token}
-	 */
-	public final String token() {
-		return this.token;
-	}
-
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("end_offset");
-		generator.write(this.endOffset);
-
-		generator.writeKey("position");
-		generator.write(this.position);
-
-		if (this.positionLength != null) {
-			generator.writeKey("position_length");
-			generator.write(this.positionLength);
-
-		}
-		generator.writeKey("start_offset");
-		generator.write(this.startOffset);
-
-		generator.writeKey("token");
-		generator.write(this.token);
-
-		generator.writeKey("type");
-		generator.write(this.type);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AnalyzeToken}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AnalyzeToken> {
-		private Long endOffset;
-
-		private Long position;
-
-		@Nullable
-		private Long positionLength;
-
-		private Long startOffset;
-
-		private String token;
-
-		private String type;
-
-		/**
-		 * Required - API name: {@code end_offset}
-		 */
-		public final Builder endOffset(long value) {
-			this.endOffset = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code position}
-		 */
-		public final Builder position(long value) {
-			this.position = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code position_length}
-		 */
-		public final Builder positionLength(@Nullable Long value) {
-			this.positionLength = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code start_offset}
-		 */
-		public final Builder startOffset(long value) {
-			this.startOffset = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code token}
-		 */
-		public final Builder token(String value) {
-			this.token = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AnalyzeToken}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AnalyzeToken build() {
-			_checkSingleUse();
-
-			return new AnalyzeToken(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AnalyzeToken}
-	 */
-	public static final JsonpDeserializer<AnalyzeToken> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			AnalyzeToken::setupAnalyzeTokenDeserializer);
-
-	protected static void setupAnalyzeTokenDeserializer(ObjectDeserializer<AnalyzeToken.Builder> op) {
-
-		op.add(Builder::endOffset, JsonpDeserializer.longDeserializer(), "end_offset");
-		op.add(Builder::position, JsonpDeserializer.longDeserializer(), "position");
-		op.add(Builder::positionLength, JsonpDeserializer.longDeserializer(), "position_length");
-		op.add(Builder::startOffset, JsonpDeserializer.longDeserializer(), "start_offset");
-		op.add(Builder::token, JsonpDeserializer.stringDeserializer(), "token");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-
-	}
+    /**
+     * API name: {@code position_length}
+     */
+    @Nullable
+    public final Long positionLength() {
+        return this.positionLength;
+    }
+
+    /**
+     * Required - API name: {@code start_offset}
+     */
+    public final long startOffset() {
+        return this.startOffset;
+    }
+
+    /**
+     * Required - API name: {@code token}
+     */
+    public final String token() {
+        return this.token;
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("end_offset");
+        generator.write(this.endOffset);
+
+        generator.writeKey("position");
+        generator.write(this.position);
+
+        if (this.positionLength != null) {
+            generator.writeKey("position_length");
+            generator.write(this.positionLength);
+
+        }
+        generator.writeKey("start_offset");
+        generator.write(this.startOffset);
+
+        generator.writeKey("token");
+        generator.write(this.token);
+
+        generator.writeKey("type");
+        generator.write(this.type);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AnalyzeToken}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AnalyzeToken> {
+        private Long endOffset;
+
+        private Long position;
+
+        @Nullable
+        private Long positionLength;
+
+        private Long startOffset;
+
+        private String token;
+
+        private String type;
+
+        /**
+         * Required - API name: {@code end_offset}
+         */
+        public final Builder endOffset(long value) {
+            this.endOffset = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code position}
+         */
+        public final Builder position(long value) {
+            this.position = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code position_length}
+         */
+        public final Builder positionLength(@Nullable Long value) {
+            this.positionLength = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code start_offset}
+         */
+        public final Builder startOffset(long value) {
+            this.startOffset = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code token}
+         */
+        public final Builder token(String value) {
+            this.token = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link AnalyzeToken}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AnalyzeToken build() {
+            _checkSingleUse();
+
+            return new AnalyzeToken(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AnalyzeToken}
+     */
+    public static final JsonpDeserializer<AnalyzeToken> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AnalyzeToken::setupAnalyzeTokenDeserializer
+    );
+
+    protected static void setupAnalyzeTokenDeserializer(ObjectDeserializer<AnalyzeToken.Builder> op) {
+
+        op.add(Builder::endOffset, JsonpDeserializer.longDeserializer(), "end_offset");
+        op.add(Builder::position, JsonpDeserializer.longDeserializer(), "position");
+        op.add(Builder::positionLength, JsonpDeserializer.longDeserializer(), "position_length");
+        op.add(Builder::startOffset, JsonpDeserializer.longDeserializer(), "start_offset");
+        op.add(Builder::token, JsonpDeserializer.stringDeserializer(), "token");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/AnalyzerDetail.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/AnalyzerDetail.java
index 99a2a84bd6..e569133020 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/AnalyzerDetail.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/AnalyzerDetail.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.analyze;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,147 +44,145 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: indices.analyze.AnalyzerDetail
 
-
 @JsonpDeserializable
 public class AnalyzerDetail implements JsonpSerializable {
-	private final String name;
-
-	private final List<ExplainAnalyzeToken> tokens;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AnalyzerDetail(Builder builder) {
-
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.tokens = ApiTypeHelper.unmodifiableRequired(builder.tokens, this, "tokens");
-
-	}
-
-	public static AnalyzerDetail of(Function<Builder, ObjectBuilder<AnalyzerDetail>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Required - API name: {@code tokens}
-	 */
-	public final List<ExplainAnalyzeToken> tokens() {
-		return this.tokens;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		if (ApiTypeHelper.isDefined(this.tokens)) {
-			generator.writeKey("tokens");
-			generator.writeStartArray();
-			for (ExplainAnalyzeToken item0 : this.tokens) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AnalyzerDetail}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AnalyzerDetail> {
-		private String name;
-
-		private List<ExplainAnalyzeToken> tokens;
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tokens}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>tokens</code>.
-		 */
-		public final Builder tokens(List<ExplainAnalyzeToken> list) {
-			this.tokens = _listAddAll(this.tokens, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tokens}
-		 * <p>
-		 * Adds one or more values to <code>tokens</code>.
-		 */
-		public final Builder tokens(ExplainAnalyzeToken value, ExplainAnalyzeToken... values) {
-			this.tokens = _listAdd(this.tokens, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tokens}
-		 * <p>
-		 * Adds a value to <code>tokens</code> using a builder lambda.
-		 */
-		public final Builder tokens(Function<ExplainAnalyzeToken.Builder, ObjectBuilder<ExplainAnalyzeToken>> fn) {
-			return tokens(fn.apply(new ExplainAnalyzeToken.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link AnalyzerDetail}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AnalyzerDetail build() {
-			_checkSingleUse();
-
-			return new AnalyzerDetail(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AnalyzerDetail}
-	 */
-	public static final JsonpDeserializer<AnalyzerDetail> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			AnalyzerDetail::setupAnalyzerDetailDeserializer);
-
-	protected static void setupAnalyzerDetailDeserializer(ObjectDeserializer<AnalyzerDetail.Builder> op) {
-
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::tokens, JsonpDeserializer.arrayDeserializer(ExplainAnalyzeToken._DESERIALIZER), "tokens");
-
-	}
+    private final String name;
+
+    private final List<ExplainAnalyzeToken> tokens;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AnalyzerDetail(Builder builder) {
+
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.tokens = ApiTypeHelper.unmodifiableRequired(builder.tokens, this, "tokens");
+
+    }
+
+    public static AnalyzerDetail of(Function<Builder, ObjectBuilder<AnalyzerDetail>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Required - API name: {@code tokens}
+     */
+    public final List<ExplainAnalyzeToken> tokens() {
+        return this.tokens;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        if (ApiTypeHelper.isDefined(this.tokens)) {
+            generator.writeKey("tokens");
+            generator.writeStartArray();
+            for (ExplainAnalyzeToken item0 : this.tokens) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AnalyzerDetail}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AnalyzerDetail> {
+        private String name;
+
+        private List<ExplainAnalyzeToken> tokens;
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tokens}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>tokens</code>.
+         */
+        public final Builder tokens(List<ExplainAnalyzeToken> list) {
+            this.tokens = _listAddAll(this.tokens, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tokens}
+         * <p>
+         * Adds one or more values to <code>tokens</code>.
+         */
+        public final Builder tokens(ExplainAnalyzeToken value, ExplainAnalyzeToken... values) {
+            this.tokens = _listAdd(this.tokens, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tokens}
+         * <p>
+         * Adds a value to <code>tokens</code> using a builder lambda.
+         */
+        public final Builder tokens(Function<ExplainAnalyzeToken.Builder, ObjectBuilder<ExplainAnalyzeToken>> fn) {
+            return tokens(fn.apply(new ExplainAnalyzeToken.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link AnalyzerDetail}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AnalyzerDetail build() {
+            _checkSingleUse();
+
+            return new AnalyzerDetail(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AnalyzerDetail}
+     */
+    public static final JsonpDeserializer<AnalyzerDetail> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AnalyzerDetail::setupAnalyzerDetailDeserializer
+    );
+
+    protected static void setupAnalyzerDetailDeserializer(ObjectDeserializer<AnalyzerDetail.Builder> op) {
+
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::tokens, JsonpDeserializer.arrayDeserializer(ExplainAnalyzeToken._DESERIALIZER), "tokens");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/CharFilterDetail.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/CharFilterDetail.java
index 7fc5689269..eb1656fe68 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/CharFilterDetail.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/CharFilterDetail.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.analyze;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,138 +44,135 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: indices.analyze.CharFilterDetail
 
-
 @JsonpDeserializable
 public class CharFilterDetail implements JsonpSerializable {
-	private final List<String> filteredText;
-
-	private final String name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CharFilterDetail(Builder builder) {
-
-		this.filteredText = ApiTypeHelper.unmodifiableRequired(builder.filteredText, this, "filteredText");
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-
-	}
-
-	public static CharFilterDetail of(Function<Builder, ObjectBuilder<CharFilterDetail>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code filtered_text}
-	 */
-	public final List<String> filteredText() {
-		return this.filteredText;
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.filteredText)) {
-			generator.writeKey("filtered_text");
-			generator.writeStartArray();
-			for (String item0 : this.filteredText) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("name");
-		generator.write(this.name);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CharFilterDetail}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CharFilterDetail> {
-		private List<String> filteredText;
-
-		private String name;
-
-		/**
-		 * Required - API name: {@code filtered_text}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>filteredText</code>.
-		 */
-		public final Builder filteredText(List<String> list) {
-			this.filteredText = _listAddAll(this.filteredText, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code filtered_text}
-		 * <p>
-		 * Adds one or more values to <code>filteredText</code>.
-		 */
-		public final Builder filteredText(String value, String... values) {
-			this.filteredText = _listAdd(this.filteredText, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CharFilterDetail}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CharFilterDetail build() {
-			_checkSingleUse();
-
-			return new CharFilterDetail(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CharFilterDetail}
-	 */
-	public static final JsonpDeserializer<CharFilterDetail> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CharFilterDetail::setupCharFilterDetailDeserializer);
-
-	protected static void setupCharFilterDetailDeserializer(ObjectDeserializer<CharFilterDetail.Builder> op) {
-
-		op.add(Builder::filteredText, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"filtered_text");
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-
-	}
+    private final List<String> filteredText;
+
+    private final String name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CharFilterDetail(Builder builder) {
+
+        this.filteredText = ApiTypeHelper.unmodifiableRequired(builder.filteredText, this, "filteredText");
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+
+    }
+
+    public static CharFilterDetail of(Function<Builder, ObjectBuilder<CharFilterDetail>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code filtered_text}
+     */
+    public final List<String> filteredText() {
+        return this.filteredText;
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.filteredText)) {
+            generator.writeKey("filtered_text");
+            generator.writeStartArray();
+            for (String item0 : this.filteredText) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("name");
+        generator.write(this.name);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CharFilterDetail}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CharFilterDetail> {
+        private List<String> filteredText;
+
+        private String name;
+
+        /**
+         * Required - API name: {@code filtered_text}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>filteredText</code>.
+         */
+        public final Builder filteredText(List<String> list) {
+            this.filteredText = _listAddAll(this.filteredText, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code filtered_text}
+         * <p>
+         * Adds one or more values to <code>filteredText</code>.
+         */
+        public final Builder filteredText(String value, String... values) {
+            this.filteredText = _listAdd(this.filteredText, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link CharFilterDetail}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CharFilterDetail build() {
+            _checkSingleUse();
+
+            return new CharFilterDetail(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CharFilterDetail}
+     */
+    public static final JsonpDeserializer<CharFilterDetail> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CharFilterDetail::setupCharFilterDetailDeserializer
+    );
+
+    protected static void setupCharFilterDetailDeserializer(ObjectDeserializer<CharFilterDetail.Builder> op) {
+
+        op.add(Builder::filteredText, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "filtered_text");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/ExplainAnalyzeToken.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/ExplainAnalyzeToken.java
index fb58ae2e17..906402720a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/ExplainAnalyzeToken.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/ExplainAnalyzeToken.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.analyze;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,291 +44,289 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.analyze.ExplainAnalyzeToken
 
-
 @JsonpDeserializable
 public class ExplainAnalyzeToken implements JsonpSerializable {
-	private final String bytes;
-
-	private final long endOffset;
-
-	@Nullable
-	private final Boolean keyword;
-
-	private final long position;
-
-	private final long positionlength;
-
-	private final long startOffset;
-
-	private final long termfrequency;
-
-	private final String token;
-
-	private final String type;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ExplainAnalyzeToken(Builder builder) {
-
-		this.bytes = ApiTypeHelper.requireNonNull(builder.bytes, this, "bytes");
-		this.endOffset = ApiTypeHelper.requireNonNull(builder.endOffset, this, "endOffset");
-		this.keyword = builder.keyword;
-		this.position = ApiTypeHelper.requireNonNull(builder.position, this, "position");
-		this.positionlength = ApiTypeHelper.requireNonNull(builder.positionlength, this, "positionlength");
-		this.startOffset = ApiTypeHelper.requireNonNull(builder.startOffset, this, "startOffset");
-		this.termfrequency = ApiTypeHelper.requireNonNull(builder.termfrequency, this, "termfrequency");
-		this.token = ApiTypeHelper.requireNonNull(builder.token, this, "token");
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-
-	}
-
-	public static ExplainAnalyzeToken of(Function<Builder, ObjectBuilder<ExplainAnalyzeToken>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code bytes}
-	 */
-	public final String bytes() {
-		return this.bytes;
-	}
-
-	/**
-	 * Required - API name: {@code end_offset}
-	 */
-	public final long endOffset() {
-		return this.endOffset;
-	}
-
-	/**
-	 * API name: {@code keyword}
-	 */
-	@Nullable
-	public final Boolean keyword() {
-		return this.keyword;
-	}
+    private final String bytes;
+
+    private final long endOffset;
+
+    @Nullable
+    private final Boolean keyword;
+
+    private final long position;
+
+    private final long positionlength;
+
+    private final long startOffset;
+
+    private final long termfrequency;
+
+    private final String token;
+
+    private final String type;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ExplainAnalyzeToken(Builder builder) {
+
+        this.bytes = ApiTypeHelper.requireNonNull(builder.bytes, this, "bytes");
+        this.endOffset = ApiTypeHelper.requireNonNull(builder.endOffset, this, "endOffset");
+        this.keyword = builder.keyword;
+        this.position = ApiTypeHelper.requireNonNull(builder.position, this, "position");
+        this.positionlength = ApiTypeHelper.requireNonNull(builder.positionlength, this, "positionlength");
+        this.startOffset = ApiTypeHelper.requireNonNull(builder.startOffset, this, "startOffset");
+        this.termfrequency = ApiTypeHelper.requireNonNull(builder.termfrequency, this, "termfrequency");
+        this.token = ApiTypeHelper.requireNonNull(builder.token, this, "token");
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+
+    }
+
+    public static ExplainAnalyzeToken of(Function<Builder, ObjectBuilder<ExplainAnalyzeToken>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code bytes}
+     */
+    public final String bytes() {
+        return this.bytes;
+    }
+
+    /**
+     * Required - API name: {@code end_offset}
+     */
+    public final long endOffset() {
+        return this.endOffset;
+    }
+
+    /**
+     * API name: {@code keyword}
+     */
+    @Nullable
+    public final Boolean keyword() {
+        return this.keyword;
+    }
 
-	/**
-	 * Required - API name: {@code position}
-	 */
-	public final long position() {
-		return this.position;
-	}
+    /**
+     * Required - API name: {@code position}
+     */
+    public final long position() {
+        return this.position;
+    }
 
-	/**
-	 * Required - API name: {@code positionLength}
-	 */
-	public final long positionlength() {
-		return this.positionlength;
-	}
+    /**
+     * Required - API name: {@code positionLength}
+     */
+    public final long positionlength() {
+        return this.positionlength;
+    }
 
-	/**
-	 * Required - API name: {@code start_offset}
-	 */
-	public final long startOffset() {
-		return this.startOffset;
-	}
+    /**
+     * Required - API name: {@code start_offset}
+     */
+    public final long startOffset() {
+        return this.startOffset;
+    }
 
-	/**
-	 * Required - API name: {@code termFrequency}
-	 */
-	public final long termfrequency() {
-		return this.termfrequency;
-	}
+    /**
+     * Required - API name: {@code termFrequency}
+     */
+    public final long termfrequency() {
+        return this.termfrequency;
+    }
 
-	/**
-	 * Required - API name: {@code token}
-	 */
-	public final String token() {
-		return this.token;
-	}
+    /**
+     * Required - API name: {@code token}
+     */
+    public final String token() {
+        return this.token;
+    }
 
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("bytes");
-		generator.write(this.bytes);
-
-		generator.writeKey("end_offset");
-		generator.write(this.endOffset);
-
-		if (this.keyword != null) {
-			generator.writeKey("keyword");
-			generator.write(this.keyword);
-
-		}
-		generator.writeKey("position");
-		generator.write(this.position);
-
-		generator.writeKey("positionLength");
-		generator.write(this.positionlength);
-
-		generator.writeKey("start_offset");
-		generator.write(this.startOffset);
-
-		generator.writeKey("termFrequency");
-		generator.write(this.termfrequency);
-
-		generator.writeKey("token");
-		generator.write(this.token);
-
-		generator.writeKey("type");
-		generator.write(this.type);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ExplainAnalyzeToken}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExplainAnalyzeToken> {
-		private String bytes;
-
-		private Long endOffset;
-
-		@Nullable
-		private Boolean keyword;
-
-		private Long position;
-
-		private Long positionlength;
-
-		private Long startOffset;
-
-		private Long termfrequency;
-
-		private String token;
-
-		private String type;
-
-		/**
-		 * Required - API name: {@code bytes}
-		 */
-		public final Builder bytes(String value) {
-			this.bytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code end_offset}
-		 */
-		public final Builder endOffset(long value) {
-			this.endOffset = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code keyword}
-		 */
-		public final Builder keyword(@Nullable Boolean value) {
-			this.keyword = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code position}
-		 */
-		public final Builder position(long value) {
-			this.position = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code positionLength}
-		 */
-		public final Builder positionlength(long value) {
-			this.positionlength = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code start_offset}
-		 */
-		public final Builder startOffset(long value) {
-			this.startOffset = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code termFrequency}
-		 */
-		public final Builder termfrequency(long value) {
-			this.termfrequency = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code token}
-		 */
-		public final Builder token(String value) {
-			this.token = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ExplainAnalyzeToken}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ExplainAnalyzeToken build() {
-			_checkSingleUse();
-
-			return new ExplainAnalyzeToken(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ExplainAnalyzeToken}
-	 */
-	public static final JsonpDeserializer<ExplainAnalyzeToken> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ExplainAnalyzeToken::setupExplainAnalyzeTokenDeserializer);
-
-	protected static void setupExplainAnalyzeTokenDeserializer(ObjectDeserializer<ExplainAnalyzeToken.Builder> op) {
-
-		op.add(Builder::bytes, JsonpDeserializer.stringDeserializer(), "bytes");
-		op.add(Builder::endOffset, JsonpDeserializer.longDeserializer(), "end_offset");
-		op.add(Builder::keyword, JsonpDeserializer.booleanDeserializer(), "keyword");
-		op.add(Builder::position, JsonpDeserializer.longDeserializer(), "position");
-		op.add(Builder::positionlength, JsonpDeserializer.longDeserializer(), "positionLength");
-		op.add(Builder::startOffset, JsonpDeserializer.longDeserializer(), "start_offset");
-		op.add(Builder::termfrequency, JsonpDeserializer.longDeserializer(), "termFrequency");
-		op.add(Builder::token, JsonpDeserializer.stringDeserializer(), "token");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-
-	}
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("bytes");
+        generator.write(this.bytes);
+
+        generator.writeKey("end_offset");
+        generator.write(this.endOffset);
+
+        if (this.keyword != null) {
+            generator.writeKey("keyword");
+            generator.write(this.keyword);
+
+        }
+        generator.writeKey("position");
+        generator.write(this.position);
+
+        generator.writeKey("positionLength");
+        generator.write(this.positionlength);
+
+        generator.writeKey("start_offset");
+        generator.write(this.startOffset);
+
+        generator.writeKey("termFrequency");
+        generator.write(this.termfrequency);
+
+        generator.writeKey("token");
+        generator.write(this.token);
+
+        generator.writeKey("type");
+        generator.write(this.type);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ExplainAnalyzeToken}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ExplainAnalyzeToken> {
+        private String bytes;
+
+        private Long endOffset;
+
+        @Nullable
+        private Boolean keyword;
+
+        private Long position;
+
+        private Long positionlength;
+
+        private Long startOffset;
+
+        private Long termfrequency;
+
+        private String token;
+
+        private String type;
+
+        /**
+         * Required - API name: {@code bytes}
+         */
+        public final Builder bytes(String value) {
+            this.bytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code end_offset}
+         */
+        public final Builder endOffset(long value) {
+            this.endOffset = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code keyword}
+         */
+        public final Builder keyword(@Nullable Boolean value) {
+            this.keyword = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code position}
+         */
+        public final Builder position(long value) {
+            this.position = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code positionLength}
+         */
+        public final Builder positionlength(long value) {
+            this.positionlength = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code start_offset}
+         */
+        public final Builder startOffset(long value) {
+            this.startOffset = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code termFrequency}
+         */
+        public final Builder termfrequency(long value) {
+            this.termfrequency = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code token}
+         */
+        public final Builder token(String value) {
+            this.token = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ExplainAnalyzeToken}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ExplainAnalyzeToken build() {
+            _checkSingleUse();
+
+            return new ExplainAnalyzeToken(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ExplainAnalyzeToken}
+     */
+    public static final JsonpDeserializer<ExplainAnalyzeToken> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ExplainAnalyzeToken::setupExplainAnalyzeTokenDeserializer
+    );
+
+    protected static void setupExplainAnalyzeTokenDeserializer(ObjectDeserializer<ExplainAnalyzeToken.Builder> op) {
+
+        op.add(Builder::bytes, JsonpDeserializer.stringDeserializer(), "bytes");
+        op.add(Builder::endOffset, JsonpDeserializer.longDeserializer(), "end_offset");
+        op.add(Builder::keyword, JsonpDeserializer.booleanDeserializer(), "keyword");
+        op.add(Builder::position, JsonpDeserializer.longDeserializer(), "position");
+        op.add(Builder::positionlength, JsonpDeserializer.longDeserializer(), "positionLength");
+        op.add(Builder::startOffset, JsonpDeserializer.longDeserializer(), "start_offset");
+        op.add(Builder::termfrequency, JsonpDeserializer.longDeserializer(), "termFrequency");
+        op.add(Builder::token, JsonpDeserializer.stringDeserializer(), "token");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/TokenDetail.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/TokenDetail.java
index c18211d512..9683a4aae2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/TokenDetail.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/analyze/TokenDetail.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.analyze;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,147 +44,145 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: indices.analyze.TokenDetail
 
-
 @JsonpDeserializable
 public class TokenDetail implements JsonpSerializable {
-	private final String name;
-
-	private final List<ExplainAnalyzeToken> tokens;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TokenDetail(Builder builder) {
-
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.tokens = ApiTypeHelper.unmodifiableRequired(builder.tokens, this, "tokens");
-
-	}
-
-	public static TokenDetail of(Function<Builder, ObjectBuilder<TokenDetail>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Required - API name: {@code tokens}
-	 */
-	public final List<ExplainAnalyzeToken> tokens() {
-		return this.tokens;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		if (ApiTypeHelper.isDefined(this.tokens)) {
-			generator.writeKey("tokens");
-			generator.writeStartArray();
-			for (ExplainAnalyzeToken item0 : this.tokens) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TokenDetail}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TokenDetail> {
-		private String name;
-
-		private List<ExplainAnalyzeToken> tokens;
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tokens}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>tokens</code>.
-		 */
-		public final Builder tokens(List<ExplainAnalyzeToken> list) {
-			this.tokens = _listAddAll(this.tokens, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tokens}
-		 * <p>
-		 * Adds one or more values to <code>tokens</code>.
-		 */
-		public final Builder tokens(ExplainAnalyzeToken value, ExplainAnalyzeToken... values) {
-			this.tokens = _listAdd(this.tokens, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tokens}
-		 * <p>
-		 * Adds a value to <code>tokens</code> using a builder lambda.
-		 */
-		public final Builder tokens(Function<ExplainAnalyzeToken.Builder, ObjectBuilder<ExplainAnalyzeToken>> fn) {
-			return tokens(fn.apply(new ExplainAnalyzeToken.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link TokenDetail}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TokenDetail build() {
-			_checkSingleUse();
-
-			return new TokenDetail(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TokenDetail}
-	 */
-	public static final JsonpDeserializer<TokenDetail> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TokenDetail::setupTokenDetailDeserializer);
-
-	protected static void setupTokenDetailDeserializer(ObjectDeserializer<TokenDetail.Builder> op) {
-
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::tokens, JsonpDeserializer.arrayDeserializer(ExplainAnalyzeToken._DESERIALIZER), "tokens");
-
-	}
+    private final String name;
+
+    private final List<ExplainAnalyzeToken> tokens;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TokenDetail(Builder builder) {
+
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.tokens = ApiTypeHelper.unmodifiableRequired(builder.tokens, this, "tokens");
+
+    }
+
+    public static TokenDetail of(Function<Builder, ObjectBuilder<TokenDetail>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Required - API name: {@code tokens}
+     */
+    public final List<ExplainAnalyzeToken> tokens() {
+        return this.tokens;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        if (ApiTypeHelper.isDefined(this.tokens)) {
+            generator.writeKey("tokens");
+            generator.writeStartArray();
+            for (ExplainAnalyzeToken item0 : this.tokens) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TokenDetail}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TokenDetail> {
+        private String name;
+
+        private List<ExplainAnalyzeToken> tokens;
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tokens}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>tokens</code>.
+         */
+        public final Builder tokens(List<ExplainAnalyzeToken> list) {
+            this.tokens = _listAddAll(this.tokens, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tokens}
+         * <p>
+         * Adds one or more values to <code>tokens</code>.
+         */
+        public final Builder tokens(ExplainAnalyzeToken value, ExplainAnalyzeToken... values) {
+            this.tokens = _listAdd(this.tokens, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tokens}
+         * <p>
+         * Adds a value to <code>tokens</code> using a builder lambda.
+         */
+        public final Builder tokens(Function<ExplainAnalyzeToken.Builder, ObjectBuilder<ExplainAnalyzeToken>> fn) {
+            return tokens(fn.apply(new ExplainAnalyzeToken.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link TokenDetail}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TokenDetail build() {
+            _checkSingleUse();
+
+            return new TokenDetail(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TokenDetail}
+     */
+    public static final JsonpDeserializer<TokenDetail> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TokenDetail::setupTokenDetailDeserializer
+    );
+
+    protected static void setupTokenDetailDeserializer(ObjectDeserializer<TokenDetail.Builder> op) {
+
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::tokens, JsonpDeserializer.arrayDeserializer(ExplainAnalyzeToken._DESERIALIZER), "tokens");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/close/CloseIndexResult.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/close/CloseIndexResult.java
index cb5fd7484b..2ef1d4c2aa 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/close/CloseIndexResult.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/close/CloseIndexResult.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.indices.close;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,150 +45,147 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.close.CloseIndexResult
 
 @JsonpDeserializable
 public class CloseIndexResult implements JsonpSerializable {
-	private final boolean closed;
-
-	private final Map<String, CloseShardResult> shards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CloseIndexResult(Builder builder) {
-
-		this.closed = ApiTypeHelper.requireNonNull(builder.closed, this, "closed");
-		this.shards = ApiTypeHelper.unmodifiable(builder.shards);
-
-	}
-
-	public static CloseIndexResult of(Function<Builder, ObjectBuilder<CloseIndexResult>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code closed}
-	 */
-	public final boolean closed() {
-		return this.closed;
-	}
-
-	/**
-	 * API name: {@code shards}
-	 */
-	public final Map<String, CloseShardResult> shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("closed");
-		generator.write(this.closed);
-
-		if (ApiTypeHelper.isDefined(this.shards)) {
-			generator.writeKey("shards");
-			generator.writeStartObject();
-			for (Map.Entry<String, CloseShardResult> item0 : this.shards.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CloseIndexResult}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CloseIndexResult> {
-		private Boolean closed;
-
-		@Nullable
-		private Map<String, CloseShardResult> shards;
-
-		/**
-		 * Required - API name: {@code closed}
-		 */
-		public final Builder closed(boolean value) {
-			this.closed = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code shards}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>shards</code>.
-		 */
-		public final Builder shards(Map<String, CloseShardResult> map) {
-			this.shards = _mapPutAll(this.shards, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code shards}
-		 * <p>
-		 * Adds an entry to <code>shards</code>.
-		 */
-		public final Builder shards(String key, CloseShardResult value) {
-			this.shards = _mapPut(this.shards, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code shards}
-		 * <p>
-		 * Adds an entry to <code>shards</code> using a builder lambda.
-		 */
-		public final Builder shards(String key,
-				Function<CloseShardResult.Builder, ObjectBuilder<CloseShardResult>> fn) {
-			return shards(key, fn.apply(new CloseShardResult.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link CloseIndexResult}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CloseIndexResult build() {
-			_checkSingleUse();
-
-			return new CloseIndexResult(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CloseIndexResult}
-	 */
-	public static final JsonpDeserializer<CloseIndexResult> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CloseIndexResult::setupCloseIndexResultDeserializer);
-
-	protected static void setupCloseIndexResultDeserializer(ObjectDeserializer<CloseIndexResult.Builder> op) {
-
-		op.add(Builder::closed, JsonpDeserializer.booleanDeserializer(), "closed");
-		op.add(Builder::shards, JsonpDeserializer.stringMapDeserializer(CloseShardResult._DESERIALIZER), "shards");
-
-	}
+    private final boolean closed;
+
+    private final Map<String, CloseShardResult> shards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CloseIndexResult(Builder builder) {
+
+        this.closed = ApiTypeHelper.requireNonNull(builder.closed, this, "closed");
+        this.shards = ApiTypeHelper.unmodifiable(builder.shards);
+
+    }
+
+    public static CloseIndexResult of(Function<Builder, ObjectBuilder<CloseIndexResult>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code closed}
+     */
+    public final boolean closed() {
+        return this.closed;
+    }
+
+    /**
+     * API name: {@code shards}
+     */
+    public final Map<String, CloseShardResult> shards() {
+        return this.shards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("closed");
+        generator.write(this.closed);
+
+        if (ApiTypeHelper.isDefined(this.shards)) {
+            generator.writeKey("shards");
+            generator.writeStartObject();
+            for (Map.Entry<String, CloseShardResult> item0 : this.shards.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CloseIndexResult}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CloseIndexResult> {
+        private Boolean closed;
+
+        @Nullable
+        private Map<String, CloseShardResult> shards;
+
+        /**
+         * Required - API name: {@code closed}
+         */
+        public final Builder closed(boolean value) {
+            this.closed = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code shards}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>shards</code>.
+         */
+        public final Builder shards(Map<String, CloseShardResult> map) {
+            this.shards = _mapPutAll(this.shards, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code shards}
+         * <p>
+         * Adds an entry to <code>shards</code>.
+         */
+        public final Builder shards(String key, CloseShardResult value) {
+            this.shards = _mapPut(this.shards, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code shards}
+         * <p>
+         * Adds an entry to <code>shards</code> using a builder lambda.
+         */
+        public final Builder shards(String key, Function<CloseShardResult.Builder, ObjectBuilder<CloseShardResult>> fn) {
+            return shards(key, fn.apply(new CloseShardResult.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link CloseIndexResult}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CloseIndexResult build() {
+            _checkSingleUse();
+
+            return new CloseIndexResult(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CloseIndexResult}
+     */
+    public static final JsonpDeserializer<CloseIndexResult> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CloseIndexResult::setupCloseIndexResultDeserializer
+    );
+
+    protected static void setupCloseIndexResultDeserializer(ObjectDeserializer<CloseIndexResult.Builder> op) {
+
+        op.add(Builder::closed, JsonpDeserializer.booleanDeserializer(), "closed");
+        op.add(Builder::shards, JsonpDeserializer.stringMapDeserializer(CloseShardResult._DESERIALIZER), "shards");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/close/CloseShardResult.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/close/CloseShardResult.java
index 4c60e9fe79..9db2ea7d4a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/close/CloseShardResult.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/close/CloseShardResult.java
@@ -32,132 +32,134 @@
 
 package org.opensearch.client.opensearch.indices.close;
 
-import org.opensearch.client.opensearch._types.ShardFailure;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ShardFailure;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: indices.close.CloseShardResult
 
 @JsonpDeserializable
 public class CloseShardResult implements JsonpSerializable {
-	private final List<ShardFailure> failures;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CloseShardResult(Builder builder) {
-
-		this.failures = ApiTypeHelper.unmodifiableRequired(builder.failures, this, "failures");
-
-	}
-
-	public static CloseShardResult of(Function<Builder, ObjectBuilder<CloseShardResult>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code failures}
-	 */
-	public final List<ShardFailure> failures() {
-		return this.failures;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.failures)) {
-			generator.writeKey("failures");
-			generator.writeStartArray();
-			for (ShardFailure item0 : this.failures) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CloseShardResult}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CloseShardResult> {
-		private List<ShardFailure> failures;
-
-		/**
-		 * Required - API name: {@code failures}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>failures</code>.
-		 */
-		public final Builder failures(List<ShardFailure> list) {
-			this.failures = _listAddAll(this.failures, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code failures}
-		 * <p>
-		 * Adds one or more values to <code>failures</code>.
-		 */
-		public final Builder failures(ShardFailure value, ShardFailure... values) {
-			this.failures = _listAdd(this.failures, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code failures}
-		 * <p>
-		 * Adds a value to <code>failures</code> using a builder lambda.
-		 */
-		public final Builder failures(Function<ShardFailure.Builder, ObjectBuilder<ShardFailure>> fn) {
-			return failures(fn.apply(new ShardFailure.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link CloseShardResult}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CloseShardResult build() {
-			_checkSingleUse();
-
-			return new CloseShardResult(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CloseShardResult}
-	 */
-	public static final JsonpDeserializer<CloseShardResult> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CloseShardResult::setupCloseShardResultDeserializer);
-
-	protected static void setupCloseShardResultDeserializer(ObjectDeserializer<CloseShardResult.Builder> op) {
-
-		op.add(Builder::failures, JsonpDeserializer.arrayDeserializer(ShardFailure._DESERIALIZER), "failures");
-
-	}
+    private final List<ShardFailure> failures;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CloseShardResult(Builder builder) {
+
+        this.failures = ApiTypeHelper.unmodifiableRequired(builder.failures, this, "failures");
+
+    }
+
+    public static CloseShardResult of(Function<Builder, ObjectBuilder<CloseShardResult>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code failures}
+     */
+    public final List<ShardFailure> failures() {
+        return this.failures;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.failures)) {
+            generator.writeKey("failures");
+            generator.writeStartArray();
+            for (ShardFailure item0 : this.failures) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CloseShardResult}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CloseShardResult> {
+        private List<ShardFailure> failures;
+
+        /**
+         * Required - API name: {@code failures}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>failures</code>.
+         */
+        public final Builder failures(List<ShardFailure> list) {
+            this.failures = _listAddAll(this.failures, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code failures}
+         * <p>
+         * Adds one or more values to <code>failures</code>.
+         */
+        public final Builder failures(ShardFailure value, ShardFailure... values) {
+            this.failures = _listAdd(this.failures, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code failures}
+         * <p>
+         * Adds a value to <code>failures</code> using a builder lambda.
+         */
+        public final Builder failures(Function<ShardFailure.Builder, ObjectBuilder<ShardFailure>> fn) {
+            return failures(fn.apply(new ShardFailure.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link CloseShardResult}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CloseShardResult build() {
+            _checkSingleUse();
+
+            return new CloseShardResult(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CloseShardResult}
+     */
+    public static final JsonpDeserializer<CloseShardResult> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CloseShardResult::setupCloseShardResultDeserializer
+    );
+
+    protected static void setupCloseShardResultDeserializer(ObjectDeserializer<CloseShardResult.Builder> op) {
+
+        op.add(Builder::failures, JsonpDeserializer.arrayDeserializer(ShardFailure._DESERIALIZER), "failures");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_alias/IndexAliases.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_alias/IndexAliases.java
index d702065821..e05bb9c968 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_alias/IndexAliases.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_alias/IndexAliases.java
@@ -32,133 +32,135 @@
 
 package org.opensearch.client.opensearch.indices.get_alias;
 
-import org.opensearch.client.opensearch.indices.AliasDefinition;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.indices.AliasDefinition;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: indices.get_alias.IndexAliases
 
 @JsonpDeserializable
 public class IndexAliases implements JsonpSerializable {
-	private final Map<String, AliasDefinition> aliases;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexAliases(Builder builder) {
-
-		this.aliases = ApiTypeHelper.unmodifiableRequired(builder.aliases, this, "aliases");
-
-	}
-
-	public static IndexAliases of(Function<Builder, ObjectBuilder<IndexAliases>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code aliases}
-	 */
-	public final Map<String, AliasDefinition> aliases() {
-		return this.aliases;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.aliases)) {
-			generator.writeKey("aliases");
-			generator.writeStartObject();
-			for (Map.Entry<String, AliasDefinition> item0 : this.aliases.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexAliases}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexAliases> {
-		private Map<String, AliasDefinition> aliases;
-
-		/**
-		 * Required - API name: {@code aliases}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aliases</code>.
-		 */
-		public final Builder aliases(Map<String, AliasDefinition> map) {
-			this.aliases = _mapPutAll(this.aliases, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code>.
-		 */
-		public final Builder aliases(String key, AliasDefinition value) {
-			this.aliases = _mapPut(this.aliases, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code> using a builder lambda.
-		 */
-		public final Builder aliases(String key, Function<AliasDefinition.Builder, ObjectBuilder<AliasDefinition>> fn) {
-			return aliases(key, fn.apply(new AliasDefinition.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link IndexAliases}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexAliases build() {
-			_checkSingleUse();
-
-			return new IndexAliases(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndexAliases}
-	 */
-	public static final JsonpDeserializer<IndexAliases> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IndexAliases::setupIndexAliasesDeserializer);
-
-	protected static void setupIndexAliasesDeserializer(ObjectDeserializer<IndexAliases.Builder> op) {
-
-		op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(AliasDefinition._DESERIALIZER), "aliases");
-
-	}
+    private final Map<String, AliasDefinition> aliases;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexAliases(Builder builder) {
+
+        this.aliases = ApiTypeHelper.unmodifiableRequired(builder.aliases, this, "aliases");
+
+    }
+
+    public static IndexAliases of(Function<Builder, ObjectBuilder<IndexAliases>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code aliases}
+     */
+    public final Map<String, AliasDefinition> aliases() {
+        return this.aliases;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.aliases)) {
+            generator.writeKey("aliases");
+            generator.writeStartObject();
+            for (Map.Entry<String, AliasDefinition> item0 : this.aliases.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexAliases}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexAliases> {
+        private Map<String, AliasDefinition> aliases;
+
+        /**
+         * Required - API name: {@code aliases}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aliases</code>.
+         */
+        public final Builder aliases(Map<String, AliasDefinition> map) {
+            this.aliases = _mapPutAll(this.aliases, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code>.
+         */
+        public final Builder aliases(String key, AliasDefinition value) {
+            this.aliases = _mapPut(this.aliases, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code> using a builder lambda.
+         */
+        public final Builder aliases(String key, Function<AliasDefinition.Builder, ObjectBuilder<AliasDefinition>> fn) {
+            return aliases(key, fn.apply(new AliasDefinition.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link IndexAliases}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexAliases build() {
+            _checkSingleUse();
+
+            return new IndexAliases(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndexAliases}
+     */
+    public static final JsonpDeserializer<IndexAliases> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexAliases::setupIndexAliasesDeserializer
+    );
+
+    protected static void setupIndexAliasesDeserializer(ObjectDeserializer<IndexAliases.Builder> op) {
+
+        op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(AliasDefinition._DESERIALIZER), "aliases");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_field_mapping/TypeFieldMappings.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_field_mapping/TypeFieldMappings.java
index f78353b09c..6172bdc937 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_field_mapping/TypeFieldMappings.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_field_mapping/TypeFieldMappings.java
@@ -32,138 +32,138 @@
 
 package org.opensearch.client.opensearch.indices.get_field_mapping;
 
+import jakarta.json.stream.JsonGenerator;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import org.opensearch.client.opensearch._types.mapping.FieldMapping;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.mapping.FieldMapping;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: indices.get_field_mapping.TypeFieldMappings
 
-
 @JsonpDeserializable
 public class TypeFieldMappings implements JsonpSerializable {
-	private final Map<String, FieldMapping> mappings;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TypeFieldMappings(Builder builder) {
-
-		this.mappings = ApiTypeHelper.unmodifiableRequired(builder.mappings, this, "mappings");
-
-	}
-
-	public static TypeFieldMappings of(Function<Builder, ObjectBuilder<TypeFieldMappings>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code mappings}
-	 */
-	public final Map<String, FieldMapping> mappings() {
-		return this.mappings;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("mappings");
-		generator.writeStartObject();
-		for (Map.Entry<String, FieldMapping> item0 : this.mappings.entrySet()) {
-			generator.writeKey(item0.getKey());
-			item0.getValue().serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TypeFieldMappings}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TypeFieldMappings> {
-		private Map<String, FieldMapping> mappings;
-
-		/**
-		 * Required - API name: {@code mappings}
-		 */
-		public Builder mappings(Map<String, FieldMapping> value) {
-			this.mappings = value;
-			return this;
-		}
-
-		/**
-		 * Add a key/value to {@link #mappings(Map)}, creating the map if needed.
-		 */
-		public Builder putMappings(String key, FieldMapping value) {
-			if (this.mappings == null) {
-				this.mappings = new HashMap<>();
-			}
-			this.mappings.put(key, value);
-			return this;
-		}
-
-		/**
-		 * Set {@link #mappings(Map)} to a singleton map.
-		 */
-		public Builder mappings(String key, Function<FieldMapping.Builder, ObjectBuilder<FieldMapping>> fn) {
-			return this.mappings(Collections.singletonMap(key, fn.apply(new FieldMapping.Builder()).build()));
-		}
-
-		/**
-		 * Add a key/value to {@link #mappings(Map)}, creating the map if needed.
-		 */
-		public Builder putMappings(String key, Function<FieldMapping.Builder, ObjectBuilder<FieldMapping>> fn) {
-			return this.putMappings(key, fn.apply(new FieldMapping.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link TypeFieldMappings}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TypeFieldMappings build() {
-			_checkSingleUse();
-
-			return new TypeFieldMappings(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TypeFieldMappings}
-	 */
-	public static final JsonpDeserializer<TypeFieldMappings> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, TypeFieldMappings::setupTypeFieldMappingsDeserializer);
-
-	protected static void setupTypeFieldMappingsDeserializer(ObjectDeserializer<TypeFieldMappings.Builder> op) {
-
-		op.add(Builder::mappings, JsonpDeserializer.stringMapDeserializer(FieldMapping._DESERIALIZER), "mappings");
-
-	}
+    private final Map<String, FieldMapping> mappings;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TypeFieldMappings(Builder builder) {
+
+        this.mappings = ApiTypeHelper.unmodifiableRequired(builder.mappings, this, "mappings");
+
+    }
+
+    public static TypeFieldMappings of(Function<Builder, ObjectBuilder<TypeFieldMappings>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code mappings}
+     */
+    public final Map<String, FieldMapping> mappings() {
+        return this.mappings;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("mappings");
+        generator.writeStartObject();
+        for (Map.Entry<String, FieldMapping> item0 : this.mappings.entrySet()) {
+            generator.writeKey(item0.getKey());
+            item0.getValue().serialize(generator, mapper);
+
+        }
+        generator.writeEnd();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TypeFieldMappings}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TypeFieldMappings> {
+        private Map<String, FieldMapping> mappings;
+
+        /**
+         * Required - API name: {@code mappings}
+         */
+        public Builder mappings(Map<String, FieldMapping> value) {
+            this.mappings = value;
+            return this;
+        }
+
+        /**
+         * Add a key/value to {@link #mappings(Map)}, creating the map if needed.
+         */
+        public Builder putMappings(String key, FieldMapping value) {
+            if (this.mappings == null) {
+                this.mappings = new HashMap<>();
+            }
+            this.mappings.put(key, value);
+            return this;
+        }
+
+        /**
+         * Set {@link #mappings(Map)} to a singleton map.
+         */
+        public Builder mappings(String key, Function<FieldMapping.Builder, ObjectBuilder<FieldMapping>> fn) {
+            return this.mappings(Collections.singletonMap(key, fn.apply(new FieldMapping.Builder()).build()));
+        }
+
+        /**
+         * Add a key/value to {@link #mappings(Map)}, creating the map if needed.
+         */
+        public Builder putMappings(String key, Function<FieldMapping.Builder, ObjectBuilder<FieldMapping>> fn) {
+            return this.putMappings(key, fn.apply(new FieldMapping.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link TypeFieldMappings}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TypeFieldMappings build() {
+            _checkSingleUse();
+
+            return new TypeFieldMappings(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TypeFieldMappings}
+     */
+    public static final JsonpDeserializer<TypeFieldMappings> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TypeFieldMappings::setupTypeFieldMappingsDeserializer
+    );
+
+    protected static void setupTypeFieldMappingsDeserializer(ObjectDeserializer<TypeFieldMappings.Builder> op) {
+
+        op.add(Builder::mappings, JsonpDeserializer.stringMapDeserializer(FieldMapping._DESERIALIZER), "mappings");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_index_template/IndexTemplate.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_index_template/IndexTemplate.java
index 913e57e995..2c460ab0e5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_index_template/IndexTemplate.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_index_template/IndexTemplate.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch.indices.get_index_template;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,373 +47,368 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.get_index_template.IndexTemplate
 
 @JsonpDeserializable
 public class IndexTemplate implements JsonpSerializable {
-	private final List<String> indexPatterns;
-
-	private final List<String> composedOf;
-
-	@Nullable
-	private final IndexTemplateSummary template;
-
-	@Nullable
-	private final Long version;
-
-	@Nullable
-	private final Long priority;
-
-	private final Map<String, JsonData> meta;
-
-	@Nullable
-	private final Boolean allowAutoCreate;
-
-	private final Map<String, JsonData> dataStream;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexTemplate(Builder builder) {
-
-		this.indexPatterns = ApiTypeHelper.unmodifiableRequired(builder.indexPatterns, this, "indexPatterns");
-		this.composedOf = ApiTypeHelper.unmodifiableRequired(builder.composedOf, this, "composedOf");
-		this.template = builder.template;
-		this.version = builder.version;
-		this.priority = builder.priority;
-		this.meta = ApiTypeHelper.unmodifiable(builder.meta);
-		this.allowAutoCreate = builder.allowAutoCreate;
-		this.dataStream = ApiTypeHelper.unmodifiable(builder.dataStream);
-
-	}
-
-	public static IndexTemplate of(Function<Builder, ObjectBuilder<IndexTemplate>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code index_patterns}
-	 */
-	public final List<String> indexPatterns() {
-		return this.indexPatterns;
-	}
-
-	/**
-	 * Required - API name: {@code composed_of}
-	 */
-	public final List<String> composedOf() {
-		return this.composedOf;
-	}
-
-	/**
-	 * API name: {@code template}
-	 */
-	@Nullable
-	public final IndexTemplateSummary template() {
-		return this.template;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * API name: {@code priority}
-	 */
-	@Nullable
-	public final Long priority() {
-		return this.priority;
-	}
-
-	/**
-	 * API name: {@code _meta}
-	 */
-	public final Map<String, JsonData> meta() {
-		return this.meta;
-	}
-
-	/**
-	 * API name: {@code allow_auto_create}
-	 */
-	@Nullable
-	public final Boolean allowAutoCreate() {
-		return this.allowAutoCreate;
-	}
-
-	/**
-	 * API name: {@code data_stream}
-	 */
-	public final Map<String, JsonData> dataStream() {
-		return this.dataStream;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.indexPatterns)) {
-			generator.writeKey("index_patterns");
-			generator.writeStartArray();
-			for (String item0 : this.indexPatterns) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.composedOf)) {
-			generator.writeKey("composed_of");
-			generator.writeStartArray();
-			for (String item0 : this.composedOf) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.template != null) {
-			generator.writeKey("template");
-			this.template.serialize(generator, mapper);
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		if (this.priority != null) {
-			generator.writeKey("priority");
-			generator.write(this.priority);
-
-		}
-		if (ApiTypeHelper.isDefined(this.meta)) {
-			generator.writeKey("_meta");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.allowAutoCreate != null) {
-			generator.writeKey("allow_auto_create");
-			generator.write(this.allowAutoCreate);
-
-		}
-		if (ApiTypeHelper.isDefined(this.dataStream)) {
-			generator.writeKey("data_stream");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.dataStream.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexTemplate}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexTemplate> {
-		private List<String> indexPatterns;
-
-		private List<String> composedOf;
-
-		@Nullable
-		private IndexTemplateSummary template;
-
-		@Nullable
-		private Long version;
-
-		@Nullable
-		private Long priority;
-
-		@Nullable
-		private Map<String, JsonData> meta;
-
-		@Nullable
-		private Boolean allowAutoCreate;
-
-		@Nullable
-		private Map<String, JsonData> dataStream;
-
-		/**
-		 * Required - API name: {@code index_patterns}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indexPatterns</code>.
-		 */
-		public final Builder indexPatterns(List<String> list) {
-			this.indexPatterns = _listAddAll(this.indexPatterns, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index_patterns}
-		 * <p>
-		 * Adds one or more values to <code>indexPatterns</code>.
-		 */
-		public final Builder indexPatterns(String value, String... values) {
-			this.indexPatterns = _listAdd(this.indexPatterns, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code composed_of}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>composedOf</code>.
-		 */
-		public final Builder composedOf(List<String> list) {
-			this.composedOf = _listAddAll(this.composedOf, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code composed_of}
-		 * <p>
-		 * Adds one or more values to <code>composedOf</code>.
-		 */
-		public final Builder composedOf(String value, String... values) {
-			this.composedOf = _listAdd(this.composedOf, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code template}
-		 */
-		public final Builder template(@Nullable IndexTemplateSummary value) {
-			this.template = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code template}
-		 */
-		public final Builder template(Function<IndexTemplateSummary.Builder, ObjectBuilder<IndexTemplateSummary>> fn) {
-			return this.template(fn.apply(new IndexTemplateSummary.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code priority}
-		 */
-		public final Builder priority(@Nullable Long value) {
-			this.priority = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _meta}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>meta</code>.
-		 */
-		public final Builder meta(Map<String, JsonData> map) {
-			this.meta = _mapPutAll(this.meta, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code _meta}
-		 * <p>
-		 * Adds an entry to <code>meta</code>.
-		 */
-		public final Builder meta(String key, JsonData value) {
-			this.meta = _mapPut(this.meta, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code allow_auto_create}
-		 */
-		public final Builder allowAutoCreate(@Nullable Boolean value) {
-			this.allowAutoCreate = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code data_stream}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>dataStream</code>.
-		 */
-		public final Builder dataStream(Map<String, JsonData> map) {
-			this.dataStream = _mapPutAll(this.dataStream, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code data_stream}
-		 * <p>
-		 * Adds an entry to <code>dataStream</code>.
-		 */
-		public final Builder dataStream(String key, JsonData value) {
-			this.dataStream = _mapPut(this.dataStream, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IndexTemplate}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexTemplate build() {
-			_checkSingleUse();
-
-			return new IndexTemplate(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndexTemplate}
-	 */
-	public static final JsonpDeserializer<IndexTemplate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IndexTemplate::setupIndexTemplateDeserializer);
-
-	protected static void setupIndexTemplateDeserializer(ObjectDeserializer<IndexTemplate.Builder> op) {
-
-		op.add(Builder::indexPatterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"index_patterns");
-		op.add(Builder::composedOf, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"composed_of");
-		op.add(Builder::template, IndexTemplateSummary._DESERIALIZER, "template");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
-		op.add(Builder::priority, JsonpDeserializer.longDeserializer(), "priority");
-		op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
-		op.add(Builder::allowAutoCreate, JsonpDeserializer.booleanDeserializer(), "allow_auto_create");
-		op.add(Builder::dataStream, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "data_stream");
-
-	}
+    private final List<String> indexPatterns;
+
+    private final List<String> composedOf;
+
+    @Nullable
+    private final IndexTemplateSummary template;
+
+    @Nullable
+    private final Long version;
+
+    @Nullable
+    private final Long priority;
+
+    private final Map<String, JsonData> meta;
+
+    @Nullable
+    private final Boolean allowAutoCreate;
+
+    private final Map<String, JsonData> dataStream;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexTemplate(Builder builder) {
+
+        this.indexPatterns = ApiTypeHelper.unmodifiableRequired(builder.indexPatterns, this, "indexPatterns");
+        this.composedOf = ApiTypeHelper.unmodifiableRequired(builder.composedOf, this, "composedOf");
+        this.template = builder.template;
+        this.version = builder.version;
+        this.priority = builder.priority;
+        this.meta = ApiTypeHelper.unmodifiable(builder.meta);
+        this.allowAutoCreate = builder.allowAutoCreate;
+        this.dataStream = ApiTypeHelper.unmodifiable(builder.dataStream);
+
+    }
+
+    public static IndexTemplate of(Function<Builder, ObjectBuilder<IndexTemplate>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code index_patterns}
+     */
+    public final List<String> indexPatterns() {
+        return this.indexPatterns;
+    }
+
+    /**
+     * Required - API name: {@code composed_of}
+     */
+    public final List<String> composedOf() {
+        return this.composedOf;
+    }
+
+    /**
+     * API name: {@code template}
+     */
+    @Nullable
+    public final IndexTemplateSummary template() {
+        return this.template;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * API name: {@code priority}
+     */
+    @Nullable
+    public final Long priority() {
+        return this.priority;
+    }
+
+    /**
+     * API name: {@code _meta}
+     */
+    public final Map<String, JsonData> meta() {
+        return this.meta;
+    }
+
+    /**
+     * API name: {@code allow_auto_create}
+     */
+    @Nullable
+    public final Boolean allowAutoCreate() {
+        return this.allowAutoCreate;
+    }
+
+    /**
+     * API name: {@code data_stream}
+     */
+    public final Map<String, JsonData> dataStream() {
+        return this.dataStream;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.indexPatterns)) {
+            generator.writeKey("index_patterns");
+            generator.writeStartArray();
+            for (String item0 : this.indexPatterns) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.composedOf)) {
+            generator.writeKey("composed_of");
+            generator.writeStartArray();
+            for (String item0 : this.composedOf) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.template != null) {
+            generator.writeKey("template");
+            this.template.serialize(generator, mapper);
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        if (this.priority != null) {
+            generator.writeKey("priority");
+            generator.write(this.priority);
+
+        }
+        if (ApiTypeHelper.isDefined(this.meta)) {
+            generator.writeKey("_meta");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.allowAutoCreate != null) {
+            generator.writeKey("allow_auto_create");
+            generator.write(this.allowAutoCreate);
+
+        }
+        if (ApiTypeHelper.isDefined(this.dataStream)) {
+            generator.writeKey("data_stream");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.dataStream.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexTemplate}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexTemplate> {
+        private List<String> indexPatterns;
+
+        private List<String> composedOf;
+
+        @Nullable
+        private IndexTemplateSummary template;
+
+        @Nullable
+        private Long version;
+
+        @Nullable
+        private Long priority;
+
+        @Nullable
+        private Map<String, JsonData> meta;
+
+        @Nullable
+        private Boolean allowAutoCreate;
+
+        @Nullable
+        private Map<String, JsonData> dataStream;
+
+        /**
+         * Required - API name: {@code index_patterns}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indexPatterns</code>.
+         */
+        public final Builder indexPatterns(List<String> list) {
+            this.indexPatterns = _listAddAll(this.indexPatterns, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index_patterns}
+         * <p>
+         * Adds one or more values to <code>indexPatterns</code>.
+         */
+        public final Builder indexPatterns(String value, String... values) {
+            this.indexPatterns = _listAdd(this.indexPatterns, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code composed_of}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>composedOf</code>.
+         */
+        public final Builder composedOf(List<String> list) {
+            this.composedOf = _listAddAll(this.composedOf, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code composed_of}
+         * <p>
+         * Adds one or more values to <code>composedOf</code>.
+         */
+        public final Builder composedOf(String value, String... values) {
+            this.composedOf = _listAdd(this.composedOf, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code template}
+         */
+        public final Builder template(@Nullable IndexTemplateSummary value) {
+            this.template = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code template}
+         */
+        public final Builder template(Function<IndexTemplateSummary.Builder, ObjectBuilder<IndexTemplateSummary>> fn) {
+            return this.template(fn.apply(new IndexTemplateSummary.Builder()).build());
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code priority}
+         */
+        public final Builder priority(@Nullable Long value) {
+            this.priority = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _meta}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>meta</code>.
+         */
+        public final Builder meta(Map<String, JsonData> map) {
+            this.meta = _mapPutAll(this.meta, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code _meta}
+         * <p>
+         * Adds an entry to <code>meta</code>.
+         */
+        public final Builder meta(String key, JsonData value) {
+            this.meta = _mapPut(this.meta, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code allow_auto_create}
+         */
+        public final Builder allowAutoCreate(@Nullable Boolean value) {
+            this.allowAutoCreate = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code data_stream}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>dataStream</code>.
+         */
+        public final Builder dataStream(Map<String, JsonData> map) {
+            this.dataStream = _mapPutAll(this.dataStream, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code data_stream}
+         * <p>
+         * Adds an entry to <code>dataStream</code>.
+         */
+        public final Builder dataStream(String key, JsonData value) {
+            this.dataStream = _mapPut(this.dataStream, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link IndexTemplate}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexTemplate build() {
+            _checkSingleUse();
+
+            return new IndexTemplate(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndexTemplate}
+     */
+    public static final JsonpDeserializer<IndexTemplate> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexTemplate::setupIndexTemplateDeserializer
+    );
+
+    protected static void setupIndexTemplateDeserializer(ObjectDeserializer<IndexTemplate.Builder> op) {
+
+        op.add(Builder::indexPatterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "index_patterns");
+        op.add(Builder::composedOf, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "composed_of");
+        op.add(Builder::template, IndexTemplateSummary._DESERIALIZER, "template");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
+        op.add(Builder::priority, JsonpDeserializer.longDeserializer(), "priority");
+        op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
+        op.add(Builder::allowAutoCreate, JsonpDeserializer.booleanDeserializer(), "allow_auto_create");
+        op.add(Builder::dataStream, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "data_stream");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_index_template/IndexTemplateItem.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_index_template/IndexTemplateItem.java
index c66587d045..07bff447fb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_index_template/IndexTemplateItem.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_index_template/IndexTemplateItem.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.indices.get_index_template;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,123 +43,123 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: indices.get_index_template.IndexTemplateItem
 
 @JsonpDeserializable
 public class IndexTemplateItem implements JsonpSerializable {
-	private final String name;
-
-	private final IndexTemplate indexTemplate;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexTemplateItem(Builder builder) {
-
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.indexTemplate = ApiTypeHelper.requireNonNull(builder.indexTemplate, this, "indexTemplate");
-
-	}
-
-	public static IndexTemplateItem of(Function<Builder, ObjectBuilder<IndexTemplateItem>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Required - API name: {@code index_template}
-	 */
-	public final IndexTemplate indexTemplate() {
-		return this.indexTemplate;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		generator.writeKey("index_template");
-		this.indexTemplate.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexTemplateItem}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexTemplateItem> {
-		private String name;
-
-		private IndexTemplate indexTemplate;
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index_template}
-		 */
-		public final Builder indexTemplate(IndexTemplate value) {
-			this.indexTemplate = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index_template}
-		 */
-		public final Builder indexTemplate(Function<IndexTemplate.Builder, ObjectBuilder<IndexTemplate>> fn) {
-			return this.indexTemplate(fn.apply(new IndexTemplate.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link IndexTemplateItem}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexTemplateItem build() {
-			_checkSingleUse();
-
-			return new IndexTemplateItem(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndexTemplateItem}
-	 */
-	public static final JsonpDeserializer<IndexTemplateItem> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IndexTemplateItem::setupIndexTemplateItemDeserializer);
-
-	protected static void setupIndexTemplateItemDeserializer(ObjectDeserializer<IndexTemplateItem.Builder> op) {
-
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::indexTemplate, IndexTemplate._DESERIALIZER, "index_template");
-
-	}
+    private final String name;
+
+    private final IndexTemplate indexTemplate;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexTemplateItem(Builder builder) {
+
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.indexTemplate = ApiTypeHelper.requireNonNull(builder.indexTemplate, this, "indexTemplate");
+
+    }
+
+    public static IndexTemplateItem of(Function<Builder, ObjectBuilder<IndexTemplateItem>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Required - API name: {@code index_template}
+     */
+    public final IndexTemplate indexTemplate() {
+        return this.indexTemplate;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        generator.writeKey("index_template");
+        this.indexTemplate.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexTemplateItem}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexTemplateItem> {
+        private String name;
+
+        private IndexTemplate indexTemplate;
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index_template}
+         */
+        public final Builder indexTemplate(IndexTemplate value) {
+            this.indexTemplate = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index_template}
+         */
+        public final Builder indexTemplate(Function<IndexTemplate.Builder, ObjectBuilder<IndexTemplate>> fn) {
+            return this.indexTemplate(fn.apply(new IndexTemplate.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link IndexTemplateItem}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexTemplateItem build() {
+            _checkSingleUse();
+
+            return new IndexTemplateItem(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndexTemplateItem}
+     */
+    public static final JsonpDeserializer<IndexTemplateItem> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexTemplateItem::setupIndexTemplateItemDeserializer
+    );
+
+    protected static void setupIndexTemplateItemDeserializer(ObjectDeserializer<IndexTemplateItem.Builder> op) {
+
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::indexTemplate, IndexTemplate._DESERIALIZER, "index_template");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_index_template/IndexTemplateSummary.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_index_template/IndexTemplateSummary.java
index 393b1445b2..ebe223d121 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_index_template/IndexTemplateSummary.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_index_template/IndexTemplateSummary.java
@@ -32,8 +32,10 @@
 
 package org.opensearch.client.opensearch.indices.get_index_template;
 
-import org.opensearch.client.opensearch._types.mapping.TypeMapping;
-import org.opensearch.client.opensearch.indices.Alias;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -41,209 +43,209 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.mapping.TypeMapping;
+import org.opensearch.client.opensearch.indices.Alias;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.get_index_template.IndexTemplateSummary
 
 @JsonpDeserializable
 public class IndexTemplateSummary implements JsonpSerializable {
-	private final Map<String, Alias> aliases;
+    private final Map<String, Alias> aliases;
 
-	@Nullable
-	private final TypeMapping mappings;
-
-	private final Map<String, JsonData> settings;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexTemplateSummary(Builder builder) {
-
-		this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
-		this.mappings = builder.mappings;
-		this.settings = ApiTypeHelper.unmodifiable(builder.settings);
-
-	}
-
-	public static IndexTemplateSummary of(Function<Builder, ObjectBuilder<IndexTemplateSummary>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code aliases}
-	 */
-	public final Map<String, Alias> aliases() {
-		return this.aliases;
-	}
-
-	/**
-	 * API name: {@code mappings}
-	 */
-	@Nullable
-	public final TypeMapping mappings() {
-		return this.mappings;
-	}
-
-	/**
-	 * API name: {@code settings}
-	 */
-	public final Map<String, JsonData> settings() {
-		return this.settings;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.aliases)) {
-			generator.writeKey("aliases");
-			generator.writeStartObject();
-			for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.mappings != null) {
-			generator.writeKey("mappings");
-			this.mappings.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.settings)) {
-			generator.writeKey("settings");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexTemplateSummary}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexTemplateSummary> {
-		@Nullable
-		private Map<String, Alias> aliases;
-
-		@Nullable
-		private TypeMapping mappings;
-
-		@Nullable
-		private Map<String, JsonData> settings;
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aliases</code>.
-		 */
-		public final Builder aliases(Map<String, Alias> map) {
-			this.aliases = _mapPutAll(this.aliases, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code>.
-		 */
-		public final Builder aliases(String key, Alias value) {
-			this.aliases = _mapPut(this.aliases, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code> using a builder lambda.
-		 */
-		public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
-			return aliases(key, fn.apply(new Alias.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code mappings}
-		 */
-		public final Builder mappings(@Nullable TypeMapping value) {
-			this.mappings = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mappings}
-		 */
-		public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
-			return this.mappings(fn.apply(new TypeMapping.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code settings}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>settings</code>.
-		 */
-		public final Builder settings(Map<String, JsonData> map) {
-			this.settings = _mapPutAll(this.settings, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code settings}
-		 * <p>
-		 * Adds an entry to <code>settings</code>.
-		 */
-		public final Builder settings(String key, JsonData value) {
-			this.settings = _mapPut(this.settings, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IndexTemplateSummary}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexTemplateSummary build() {
-			_checkSingleUse();
-
-			return new IndexTemplateSummary(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndexTemplateSummary}
-	 */
-	public static final JsonpDeserializer<IndexTemplateSummary> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IndexTemplateSummary::setupIndexTemplateSummaryDeserializer);
-
-	protected static void setupIndexTemplateSummaryDeserializer(ObjectDeserializer<IndexTemplateSummary.Builder> op) {
-
-		op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
-		op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
-		op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "settings");
-
-	}
+    @Nullable
+    private final TypeMapping mappings;
+
+    private final Map<String, JsonData> settings;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexTemplateSummary(Builder builder) {
+
+        this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
+        this.mappings = builder.mappings;
+        this.settings = ApiTypeHelper.unmodifiable(builder.settings);
+
+    }
+
+    public static IndexTemplateSummary of(Function<Builder, ObjectBuilder<IndexTemplateSummary>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code aliases}
+     */
+    public final Map<String, Alias> aliases() {
+        return this.aliases;
+    }
+
+    /**
+     * API name: {@code mappings}
+     */
+    @Nullable
+    public final TypeMapping mappings() {
+        return this.mappings;
+    }
+
+    /**
+     * API name: {@code settings}
+     */
+    public final Map<String, JsonData> settings() {
+        return this.settings;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.aliases)) {
+            generator.writeKey("aliases");
+            generator.writeStartObject();
+            for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.mappings != null) {
+            generator.writeKey("mappings");
+            this.mappings.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.settings)) {
+            generator.writeKey("settings");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexTemplateSummary}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexTemplateSummary> {
+        @Nullable
+        private Map<String, Alias> aliases;
+
+        @Nullable
+        private TypeMapping mappings;
+
+        @Nullable
+        private Map<String, JsonData> settings;
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aliases</code>.
+         */
+        public final Builder aliases(Map<String, Alias> map) {
+            this.aliases = _mapPutAll(this.aliases, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code>.
+         */
+        public final Builder aliases(String key, Alias value) {
+            this.aliases = _mapPut(this.aliases, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code> using a builder lambda.
+         */
+        public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
+            return aliases(key, fn.apply(new Alias.Builder()).build());
+        }
+
+        /**
+         * API name: {@code mappings}
+         */
+        public final Builder mappings(@Nullable TypeMapping value) {
+            this.mappings = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mappings}
+         */
+        public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
+            return this.mappings(fn.apply(new TypeMapping.Builder()).build());
+        }
+
+        /**
+         * API name: {@code settings}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>settings</code>.
+         */
+        public final Builder settings(Map<String, JsonData> map) {
+            this.settings = _mapPutAll(this.settings, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code settings}
+         * <p>
+         * Adds an entry to <code>settings</code>.
+         */
+        public final Builder settings(String key, JsonData value) {
+            this.settings = _mapPut(this.settings, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link IndexTemplateSummary}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexTemplateSummary build() {
+            _checkSingleUse();
+
+            return new IndexTemplateSummary(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndexTemplateSummary}
+     */
+    public static final JsonpDeserializer<IndexTemplateSummary> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexTemplateSummary::setupIndexTemplateSummaryDeserializer
+    );
+
+    protected static void setupIndexTemplateSummaryDeserializer(ObjectDeserializer<IndexTemplateSummary.Builder> op) {
+
+        op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
+        op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
+        op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "settings");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_mapping/IndexMappingRecord.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_mapping/IndexMappingRecord.java
index 9042c2953e..fefaa61d20 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_mapping/IndexMappingRecord.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/get_mapping/IndexMappingRecord.java
@@ -32,147 +32,148 @@
 
 package org.opensearch.client.opensearch.indices.get_mapping;
 
-import org.opensearch.client.opensearch._types.mapping.TypeMapping;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.mapping.TypeMapping;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.get_mapping.IndexMappingRecord
 
 @JsonpDeserializable
 public class IndexMappingRecord implements JsonpSerializable {
-	@Nullable
-	private final TypeMapping item;
-
-	private final TypeMapping mappings;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexMappingRecord(Builder builder) {
-
-		this.item = builder.item;
-		this.mappings = ApiTypeHelper.requireNonNull(builder.mappings, this, "mappings");
-
-	}
-
-	public static IndexMappingRecord of(Function<Builder, ObjectBuilder<IndexMappingRecord>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code item}
-	 */
-	@Nullable
-	public final TypeMapping item() {
-		return this.item;
-	}
-
-	/**
-	 * Required - API name: {@code mappings}
-	 */
-	public final TypeMapping mappings() {
-		return this.mappings;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.item != null) {
-			generator.writeKey("item");
-			this.item.serialize(generator, mapper);
-
-		}
-		generator.writeKey("mappings");
-		this.mappings.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexMappingRecord}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexMappingRecord> {
-		@Nullable
-		private TypeMapping item;
-
-		private TypeMapping mappings;
-
-		/**
-		 * API name: {@code item}
-		 */
-		public final Builder item(@Nullable TypeMapping value) {
-			this.item = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code item}
-		 */
-		public final Builder item(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
-			return this.item(fn.apply(new TypeMapping.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code mappings}
-		 */
-		public final Builder mappings(TypeMapping value) {
-			this.mappings = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mappings}
-		 */
-		public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
-			return this.mappings(fn.apply(new TypeMapping.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link IndexMappingRecord}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexMappingRecord build() {
-			_checkSingleUse();
-
-			return new IndexMappingRecord(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndexMappingRecord}
-	 */
-	public static final JsonpDeserializer<IndexMappingRecord> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IndexMappingRecord::setupIndexMappingRecordDeserializer);
-
-	protected static void setupIndexMappingRecordDeserializer(ObjectDeserializer<IndexMappingRecord.Builder> op) {
-
-		op.add(Builder::item, TypeMapping._DESERIALIZER, "item");
-		op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
-
-	}
+    @Nullable
+    private final TypeMapping item;
+
+    private final TypeMapping mappings;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexMappingRecord(Builder builder) {
+
+        this.item = builder.item;
+        this.mappings = ApiTypeHelper.requireNonNull(builder.mappings, this, "mappings");
+
+    }
+
+    public static IndexMappingRecord of(Function<Builder, ObjectBuilder<IndexMappingRecord>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code item}
+     */
+    @Nullable
+    public final TypeMapping item() {
+        return this.item;
+    }
+
+    /**
+     * Required - API name: {@code mappings}
+     */
+    public final TypeMapping mappings() {
+        return this.mappings;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.item != null) {
+            generator.writeKey("item");
+            this.item.serialize(generator, mapper);
+
+        }
+        generator.writeKey("mappings");
+        this.mappings.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexMappingRecord}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexMappingRecord> {
+        @Nullable
+        private TypeMapping item;
+
+        private TypeMapping mappings;
+
+        /**
+         * API name: {@code item}
+         */
+        public final Builder item(@Nullable TypeMapping value) {
+            this.item = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code item}
+         */
+        public final Builder item(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
+            return this.item(fn.apply(new TypeMapping.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code mappings}
+         */
+        public final Builder mappings(TypeMapping value) {
+            this.mappings = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mappings}
+         */
+        public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
+            return this.mappings(fn.apply(new TypeMapping.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link IndexMappingRecord}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexMappingRecord build() {
+            _checkSingleUse();
+
+            return new IndexMappingRecord(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndexMappingRecord}
+     */
+    public static final JsonpDeserializer<IndexMappingRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexMappingRecord::setupIndexMappingRecordDeserializer
+    );
+
+    protected static void setupIndexMappingRecordDeserializer(ObjectDeserializer<IndexMappingRecord.Builder> op) {
+
+        op.add(Builder::item, TypeMapping._DESERIALIZER, "item");
+        op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/put_index_template/IndexTemplateMapping.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/put_index_template/IndexTemplateMapping.java
index 80d6042764..b2b182bd73 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/put_index_template/IndexTemplateMapping.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/put_index_template/IndexTemplateMapping.java
@@ -32,209 +32,211 @@
 
 package org.opensearch.client.opensearch.indices.put_index_template;
 
-import org.opensearch.client.opensearch._types.mapping.TypeMapping;
-import org.opensearch.client.opensearch.indices.Alias;
-import org.opensearch.client.opensearch.indices.IndexSettings;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.mapping.TypeMapping;
+import org.opensearch.client.opensearch.indices.Alias;
+import org.opensearch.client.opensearch.indices.IndexSettings;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.put_index_template.IndexTemplateMapping
 
 @JsonpDeserializable
 public class IndexTemplateMapping implements JsonpSerializable {
-	private final Map<String, Alias> aliases;
-
-	@Nullable
-	private final TypeMapping mappings;
-
-	@Nullable
-	private final IndexSettings settings;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexTemplateMapping(Builder builder) {
-
-		this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
-		this.mappings = builder.mappings;
-		this.settings = builder.settings;
-
-	}
-
-	public static IndexTemplateMapping of(Function<Builder, ObjectBuilder<IndexTemplateMapping>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code aliases}
-	 */
-	public final Map<String, Alias> aliases() {
-		return this.aliases;
-	}
-
-	/**
-	 * API name: {@code mappings}
-	 */
-	@Nullable
-	public final TypeMapping mappings() {
-		return this.mappings;
-	}
-
-	/**
-	 * API name: {@code settings}
-	 */
-	@Nullable
-	public final IndexSettings settings() {
-		return this.settings;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.aliases)) {
-			generator.writeKey("aliases");
-			generator.writeStartObject();
-			for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.mappings != null) {
-			generator.writeKey("mappings");
-			this.mappings.serialize(generator, mapper);
-
-		}
-		if (this.settings != null) {
-			generator.writeKey("settings");
-			this.settings.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexTemplateMapping}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexTemplateMapping> {
-		@Nullable
-		private Map<String, Alias> aliases;
-
-		@Nullable
-		private TypeMapping mappings;
-
-		@Nullable
-		private IndexSettings settings;
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aliases</code>.
-		 */
-		public final Builder aliases(Map<String, Alias> map) {
-			this.aliases = _mapPutAll(this.aliases, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code>.
-		 */
-		public final Builder aliases(String key, Alias value) {
-			this.aliases = _mapPut(this.aliases, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code> using a builder lambda.
-		 */
-		public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
-			return aliases(key, fn.apply(new Alias.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code mappings}
-		 */
-		public final Builder mappings(@Nullable TypeMapping value) {
-			this.mappings = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mappings}
-		 */
-		public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
-			return this.mappings(fn.apply(new TypeMapping.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code settings}
-		 */
-		public final Builder settings(@Nullable IndexSettings value) {
-			this.settings = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code settings}
-		 */
-		public final Builder settings(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
-			return this.settings(fn.apply(new IndexSettings.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link IndexTemplateMapping}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexTemplateMapping build() {
-			_checkSingleUse();
-
-			return new IndexTemplateMapping(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndexTemplateMapping}
-	 */
-	public static final JsonpDeserializer<IndexTemplateMapping> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IndexTemplateMapping::setupIndexTemplateMappingDeserializer);
-
-	protected static void setupIndexTemplateMappingDeserializer(ObjectDeserializer<IndexTemplateMapping.Builder> op) {
-
-		op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
-		op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
-		op.add(Builder::settings, IndexSettings._DESERIALIZER, "settings");
-
-	}
+    private final Map<String, Alias> aliases;
+
+    @Nullable
+    private final TypeMapping mappings;
+
+    @Nullable
+    private final IndexSettings settings;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexTemplateMapping(Builder builder) {
+
+        this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
+        this.mappings = builder.mappings;
+        this.settings = builder.settings;
+
+    }
+
+    public static IndexTemplateMapping of(Function<Builder, ObjectBuilder<IndexTemplateMapping>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code aliases}
+     */
+    public final Map<String, Alias> aliases() {
+        return this.aliases;
+    }
+
+    /**
+     * API name: {@code mappings}
+     */
+    @Nullable
+    public final TypeMapping mappings() {
+        return this.mappings;
+    }
+
+    /**
+     * API name: {@code settings}
+     */
+    @Nullable
+    public final IndexSettings settings() {
+        return this.settings;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.aliases)) {
+            generator.writeKey("aliases");
+            generator.writeStartObject();
+            for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.mappings != null) {
+            generator.writeKey("mappings");
+            this.mappings.serialize(generator, mapper);
+
+        }
+        if (this.settings != null) {
+            generator.writeKey("settings");
+            this.settings.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexTemplateMapping}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexTemplateMapping> {
+        @Nullable
+        private Map<String, Alias> aliases;
+
+        @Nullable
+        private TypeMapping mappings;
+
+        @Nullable
+        private IndexSettings settings;
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aliases</code>.
+         */
+        public final Builder aliases(Map<String, Alias> map) {
+            this.aliases = _mapPutAll(this.aliases, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code>.
+         */
+        public final Builder aliases(String key, Alias value) {
+            this.aliases = _mapPut(this.aliases, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code> using a builder lambda.
+         */
+        public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
+            return aliases(key, fn.apply(new Alias.Builder()).build());
+        }
+
+        /**
+         * API name: {@code mappings}
+         */
+        public final Builder mappings(@Nullable TypeMapping value) {
+            this.mappings = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mappings}
+         */
+        public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
+            return this.mappings(fn.apply(new TypeMapping.Builder()).build());
+        }
+
+        /**
+         * API name: {@code settings}
+         */
+        public final Builder settings(@Nullable IndexSettings value) {
+            this.settings = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code settings}
+         */
+        public final Builder settings(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
+            return this.settings(fn.apply(new IndexSettings.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link IndexTemplateMapping}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexTemplateMapping build() {
+            _checkSingleUse();
+
+            return new IndexTemplateMapping(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndexTemplateMapping}
+     */
+    public static final JsonpDeserializer<IndexTemplateMapping> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexTemplateMapping::setupIndexTemplateMappingDeserializer
+    );
+
+    protected static void setupIndexTemplateMappingDeserializer(ObjectDeserializer<IndexTemplateMapping.Builder> op) {
+
+        op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
+        op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
+        op.add(Builder::settings, IndexSettings._DESERIALIZER, "settings");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/FileDetails.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/FileDetails.java
index 5750955286..40e0d7b358 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/FileDetails.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/FileDetails.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.indices.recovery;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,141 +43,140 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: indices.recovery.FileDetails
 
-
 @JsonpDeserializable
 public class FileDetails implements JsonpSerializable {
-	private final long length;
-
-	private final String name;
-
-	private final long recovered;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FileDetails(Builder builder) {
-
-		this.length = ApiTypeHelper.requireNonNull(builder.length, this, "length");
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.recovered = ApiTypeHelper.requireNonNull(builder.recovered, this, "recovered");
-
-	}
-
-	public static FileDetails of(Function<Builder, ObjectBuilder<FileDetails>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code length}
-	 */
-	public final long length() {
-		return this.length;
-	}
+    private final long length;
 
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Required - API name: {@code recovered}
-	 */
-	public final long recovered() {
-		return this.recovered;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("length");
-		generator.write(this.length);
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		generator.writeKey("recovered");
-		generator.write(this.recovered);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FileDetails}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FileDetails> {
-		private Long length;
-
-		private String name;
-
-		private Long recovered;
-
-		/**
-		 * Required - API name: {@code length}
-		 */
-		public final Builder length(long value) {
-			this.length = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code recovered}
-		 */
-		public final Builder recovered(long value) {
-			this.recovered = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FileDetails}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FileDetails build() {
-			_checkSingleUse();
-
-			return new FileDetails(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FileDetails}
-	 */
-	public static final JsonpDeserializer<FileDetails> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FileDetails::setupFileDetailsDeserializer);
-
-	protected static void setupFileDetailsDeserializer(ObjectDeserializer<FileDetails.Builder> op) {
-
-		op.add(Builder::length, JsonpDeserializer.longDeserializer(), "length");
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::recovered, JsonpDeserializer.longDeserializer(), "recovered");
-
-	}
+    private final String name;
+
+    private final long recovered;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FileDetails(Builder builder) {
+
+        this.length = ApiTypeHelper.requireNonNull(builder.length, this, "length");
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.recovered = ApiTypeHelper.requireNonNull(builder.recovered, this, "recovered");
+
+    }
+
+    public static FileDetails of(Function<Builder, ObjectBuilder<FileDetails>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code length}
+     */
+    public final long length() {
+        return this.length;
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Required - API name: {@code recovered}
+     */
+    public final long recovered() {
+        return this.recovered;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("length");
+        generator.write(this.length);
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        generator.writeKey("recovered");
+        generator.write(this.recovered);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FileDetails}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FileDetails> {
+        private Long length;
+
+        private String name;
+
+        private Long recovered;
+
+        /**
+         * Required - API name: {@code length}
+         */
+        public final Builder length(long value) {
+            this.length = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code recovered}
+         */
+        public final Builder recovered(long value) {
+            this.recovered = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link FileDetails}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FileDetails build() {
+            _checkSingleUse();
+
+            return new FileDetails(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FileDetails}
+     */
+    public static final JsonpDeserializer<FileDetails> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FileDetails::setupFileDetailsDeserializer
+    );
+
+    protected static void setupFileDetailsDeserializer(ObjectDeserializer<FileDetails.Builder> op) {
+
+        op.add(Builder::length, JsonpDeserializer.longDeserializer(), "length");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::recovered, JsonpDeserializer.longDeserializer(), "recovered");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryBytes.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryBytes.java
index fd1b912083..84472fa161 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryBytes.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryBytes.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.recovery;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,312 +44,309 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.recovery.RecoveryBytes
 
-
 @JsonpDeserializable
 public class RecoveryBytes implements JsonpSerializable {
-	private final String percent;
-
-	@Nullable
-	private final String recovered;
-
-	private final String recoveredInBytes;
-
-	@Nullable
-	private final String recoveredFromSnapshot;
-
-	@Nullable
-	private final String recoveredFromSnapshotInBytes;
-
-	@Nullable
-	private final String reused;
-
-	private final String reusedInBytes;
-
-	@Nullable
-	private final String total;
-
-	private final String totalInBytes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RecoveryBytes(Builder builder) {
-
-		this.percent = ApiTypeHelper.requireNonNull(builder.percent, this, "percent");
-		this.recovered = builder.recovered;
-		this.recoveredInBytes = ApiTypeHelper.requireNonNull(builder.recoveredInBytes, this, "recoveredInBytes");
-		this.recoveredFromSnapshot = builder.recoveredFromSnapshot;
-		this.recoveredFromSnapshotInBytes = builder.recoveredFromSnapshotInBytes;
-		this.reused = builder.reused;
-		this.reusedInBytes = ApiTypeHelper.requireNonNull(builder.reusedInBytes, this, "reusedInBytes");
-		this.total = builder.total;
-		this.totalInBytes = ApiTypeHelper.requireNonNull(builder.totalInBytes, this, "totalInBytes");
-
-	}
-
-	public static RecoveryBytes of(Function<Builder, ObjectBuilder<RecoveryBytes>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code percent}
-	 */
-	public final String percent() {
-		return this.percent;
-	}
-
-	/**
-	 * API name: {@code recovered}
-	 */
-	@Nullable
-	public final String recovered() {
-		return this.recovered;
-	}
-
-	/**
-	 * Required - API name: {@code recovered_in_bytes}
-	 */
-	public final String recoveredInBytes() {
-		return this.recoveredInBytes;
-	}
-
-	/**
-	 * API name: {@code recovered_from_snapshot}
-	 */
-	@Nullable
-	public final String recoveredFromSnapshot() {
-		return this.recoveredFromSnapshot;
-	}
-
-	/**
-	 * API name: {@code recovered_from_snapshot_in_bytes}
-	 */
-	@Nullable
-	public final String recoveredFromSnapshotInBytes() {
-		return this.recoveredFromSnapshotInBytes;
-	}
-
-	/**
-	 * API name: {@code reused}
-	 */
-	@Nullable
-	public final String reused() {
-		return this.reused;
-	}
-
-	/**
-	 * Required - API name: {@code reused_in_bytes}
-	 */
-	public final String reusedInBytes() {
-		return this.reusedInBytes;
-	}
-
-	/**
-	 * API name: {@code total}
-	 */
-	@Nullable
-	public final String total() {
-		return this.total;
-	}
-
-	/**
-	 * Required - API name: {@code total_in_bytes}
-	 */
-	public final String totalInBytes() {
-		return this.totalInBytes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("percent");
-		generator.write(this.percent);
-
-		if (this.recovered != null) {
-			generator.writeKey("recovered");
-			generator.write(this.recovered);
-
-		}
-		generator.writeKey("recovered_in_bytes");
-		generator.write(this.recoveredInBytes);
-
-		if (this.recoveredFromSnapshot != null) {
-			generator.writeKey("recovered_from_snapshot");
-			generator.write(this.recoveredFromSnapshot);
-
-		}
-		if (this.recoveredFromSnapshotInBytes != null) {
-			generator.writeKey("recovered_from_snapshot_in_bytes");
-			generator.write(this.recoveredFromSnapshotInBytes);
-
-		}
-		if (this.reused != null) {
-			generator.writeKey("reused");
-			generator.write(this.reused);
-
-		}
-		generator.writeKey("reused_in_bytes");
-		generator.write(this.reusedInBytes);
-
-		if (this.total != null) {
-			generator.writeKey("total");
-			generator.write(this.total);
-
-		}
-		generator.writeKey("total_in_bytes");
-		generator.write(this.totalInBytes);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RecoveryBytes}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryBytes> {
-		private String percent;
-
-		@Nullable
-		private String recovered;
-
-		private String recoveredInBytes;
-
-		@Nullable
-		private String recoveredFromSnapshot;
-
-		@Nullable
-		private String recoveredFromSnapshotInBytes;
-
-		@Nullable
-		private String reused;
-
-		private String reusedInBytes;
-
-		@Nullable
-		private String total;
-
-		private String totalInBytes;
-
-		/**
-		 * Required - API name: {@code percent}
-		 */
-		public final Builder percent(String value) {
-			this.percent = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code recovered}
-		 */
-		public final Builder recovered(@Nullable String value) {
-			this.recovered = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code recovered_in_bytes}
-		 */
-		public final Builder recoveredInBytes(String value) {
-			this.recoveredInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code recovered_from_snapshot}
-		 */
-		public final Builder recoveredFromSnapshot(@Nullable String value) {
-			this.recoveredFromSnapshot = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code recovered_from_snapshot_in_bytes}
-		 */
-		public final Builder recoveredFromSnapshotInBytes(@Nullable String value) {
-			this.recoveredFromSnapshotInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code reused}
-		 */
-		public final Builder reused(@Nullable String value) {
-			this.reused = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code reused_in_bytes}
-		 */
-		public final Builder reusedInBytes(String value) {
-			this.reusedInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total}
-		 */
-		public final Builder total(@Nullable String value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_in_bytes}
-		 */
-		public final Builder totalInBytes(String value) {
-			this.totalInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RecoveryBytes}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RecoveryBytes build() {
-			_checkSingleUse();
-
-			return new RecoveryBytes(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RecoveryBytes}
-	 */
-	public static final JsonpDeserializer<RecoveryBytes> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RecoveryBytes::setupRecoveryBytesDeserializer);
-
-	protected static void setupRecoveryBytesDeserializer(ObjectDeserializer<RecoveryBytes.Builder> op) {
-
-		op.add(Builder::percent, JsonpDeserializer.stringDeserializer(), "percent");
-		op.add(Builder::recovered, JsonpDeserializer.stringDeserializer(), "recovered");
-		op.add(Builder::recoveredInBytes, JsonpDeserializer.stringDeserializer(), "recovered_in_bytes");
-		op.add(Builder::recoveredFromSnapshot, JsonpDeserializer.stringDeserializer(), "recovered_from_snapshot");
-		op.add(Builder::recoveredFromSnapshotInBytes, JsonpDeserializer.stringDeserializer(),
-				"recovered_from_snapshot_in_bytes");
-		op.add(Builder::reused, JsonpDeserializer.stringDeserializer(), "reused");
-		op.add(Builder::reusedInBytes, JsonpDeserializer.stringDeserializer(), "reused_in_bytes");
-		op.add(Builder::total, JsonpDeserializer.stringDeserializer(), "total");
-		op.add(Builder::totalInBytes, JsonpDeserializer.stringDeserializer(), "total_in_bytes");
-
-	}
+    private final String percent;
+
+    @Nullable
+    private final String recovered;
+
+    private final String recoveredInBytes;
+
+    @Nullable
+    private final String recoveredFromSnapshot;
+
+    @Nullable
+    private final String recoveredFromSnapshotInBytes;
+
+    @Nullable
+    private final String reused;
+
+    private final String reusedInBytes;
+
+    @Nullable
+    private final String total;
+
+    private final String totalInBytes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RecoveryBytes(Builder builder) {
+
+        this.percent = ApiTypeHelper.requireNonNull(builder.percent, this, "percent");
+        this.recovered = builder.recovered;
+        this.recoveredInBytes = ApiTypeHelper.requireNonNull(builder.recoveredInBytes, this, "recoveredInBytes");
+        this.recoveredFromSnapshot = builder.recoveredFromSnapshot;
+        this.recoveredFromSnapshotInBytes = builder.recoveredFromSnapshotInBytes;
+        this.reused = builder.reused;
+        this.reusedInBytes = ApiTypeHelper.requireNonNull(builder.reusedInBytes, this, "reusedInBytes");
+        this.total = builder.total;
+        this.totalInBytes = ApiTypeHelper.requireNonNull(builder.totalInBytes, this, "totalInBytes");
+
+    }
+
+    public static RecoveryBytes of(Function<Builder, ObjectBuilder<RecoveryBytes>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code percent}
+     */
+    public final String percent() {
+        return this.percent;
+    }
+
+    /**
+     * API name: {@code recovered}
+     */
+    @Nullable
+    public final String recovered() {
+        return this.recovered;
+    }
+
+    /**
+     * Required - API name: {@code recovered_in_bytes}
+     */
+    public final String recoveredInBytes() {
+        return this.recoveredInBytes;
+    }
+
+    /**
+     * API name: {@code recovered_from_snapshot}
+     */
+    @Nullable
+    public final String recoveredFromSnapshot() {
+        return this.recoveredFromSnapshot;
+    }
+
+    /**
+     * API name: {@code recovered_from_snapshot_in_bytes}
+     */
+    @Nullable
+    public final String recoveredFromSnapshotInBytes() {
+        return this.recoveredFromSnapshotInBytes;
+    }
+
+    /**
+     * API name: {@code reused}
+     */
+    @Nullable
+    public final String reused() {
+        return this.reused;
+    }
+
+    /**
+     * Required - API name: {@code reused_in_bytes}
+     */
+    public final String reusedInBytes() {
+        return this.reusedInBytes;
+    }
+
+    /**
+     * API name: {@code total}
+     */
+    @Nullable
+    public final String total() {
+        return this.total;
+    }
+
+    /**
+     * Required - API name: {@code total_in_bytes}
+     */
+    public final String totalInBytes() {
+        return this.totalInBytes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("percent");
+        generator.write(this.percent);
+
+        if (this.recovered != null) {
+            generator.writeKey("recovered");
+            generator.write(this.recovered);
+
+        }
+        generator.writeKey("recovered_in_bytes");
+        generator.write(this.recoveredInBytes);
+
+        if (this.recoveredFromSnapshot != null) {
+            generator.writeKey("recovered_from_snapshot");
+            generator.write(this.recoveredFromSnapshot);
+
+        }
+        if (this.recoveredFromSnapshotInBytes != null) {
+            generator.writeKey("recovered_from_snapshot_in_bytes");
+            generator.write(this.recoveredFromSnapshotInBytes);
+
+        }
+        if (this.reused != null) {
+            generator.writeKey("reused");
+            generator.write(this.reused);
+
+        }
+        generator.writeKey("reused_in_bytes");
+        generator.write(this.reusedInBytes);
+
+        if (this.total != null) {
+            generator.writeKey("total");
+            generator.write(this.total);
+
+        }
+        generator.writeKey("total_in_bytes");
+        generator.write(this.totalInBytes);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RecoveryBytes}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryBytes> {
+        private String percent;
+
+        @Nullable
+        private String recovered;
+
+        private String recoveredInBytes;
+
+        @Nullable
+        private String recoveredFromSnapshot;
+
+        @Nullable
+        private String recoveredFromSnapshotInBytes;
+
+        @Nullable
+        private String reused;
+
+        private String reusedInBytes;
+
+        @Nullable
+        private String total;
+
+        private String totalInBytes;
+
+        /**
+         * Required - API name: {@code percent}
+         */
+        public final Builder percent(String value) {
+            this.percent = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code recovered}
+         */
+        public final Builder recovered(@Nullable String value) {
+            this.recovered = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code recovered_in_bytes}
+         */
+        public final Builder recoveredInBytes(String value) {
+            this.recoveredInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code recovered_from_snapshot}
+         */
+        public final Builder recoveredFromSnapshot(@Nullable String value) {
+            this.recoveredFromSnapshot = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code recovered_from_snapshot_in_bytes}
+         */
+        public final Builder recoveredFromSnapshotInBytes(@Nullable String value) {
+            this.recoveredFromSnapshotInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code reused}
+         */
+        public final Builder reused(@Nullable String value) {
+            this.reused = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code reused_in_bytes}
+         */
+        public final Builder reusedInBytes(String value) {
+            this.reusedInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total}
+         */
+        public final Builder total(@Nullable String value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_in_bytes}
+         */
+        public final Builder totalInBytes(String value) {
+            this.totalInBytes = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RecoveryBytes}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RecoveryBytes build() {
+            _checkSingleUse();
+
+            return new RecoveryBytes(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RecoveryBytes}
+     */
+    public static final JsonpDeserializer<RecoveryBytes> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RecoveryBytes::setupRecoveryBytesDeserializer
+    );
+
+    protected static void setupRecoveryBytesDeserializer(ObjectDeserializer<RecoveryBytes.Builder> op) {
+
+        op.add(Builder::percent, JsonpDeserializer.stringDeserializer(), "percent");
+        op.add(Builder::recovered, JsonpDeserializer.stringDeserializer(), "recovered");
+        op.add(Builder::recoveredInBytes, JsonpDeserializer.stringDeserializer(), "recovered_in_bytes");
+        op.add(Builder::recoveredFromSnapshot, JsonpDeserializer.stringDeserializer(), "recovered_from_snapshot");
+        op.add(Builder::recoveredFromSnapshotInBytes, JsonpDeserializer.stringDeserializer(), "recovered_from_snapshot_in_bytes");
+        op.add(Builder::reused, JsonpDeserializer.stringDeserializer(), "reused");
+        op.add(Builder::reusedInBytes, JsonpDeserializer.stringDeserializer(), "reused_in_bytes");
+        op.add(Builder::total, JsonpDeserializer.stringDeserializer(), "total");
+        op.add(Builder::totalInBytes, JsonpDeserializer.stringDeserializer(), "total_in_bytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryFiles.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryFiles.java
index af4f8bcf04..8b08e99a5c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryFiles.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryFiles.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.indices.recovery;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,219 +45,217 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.recovery.RecoveryFiles
 
 @JsonpDeserializable
 public class RecoveryFiles implements JsonpSerializable {
-	private final List<FileDetails> details;
+    private final List<FileDetails> details;
 
-	private final String percent;
+    private final String percent;
 
-	private final long recovered;
+    private final long recovered;
 
-	private final long reused;
+    private final long reused;
 
-	private final long total;
+    private final long total;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private RecoveryFiles(Builder builder) {
+    private RecoveryFiles(Builder builder) {
 
-		this.details = ApiTypeHelper.unmodifiable(builder.details);
-		this.percent = ApiTypeHelper.requireNonNull(builder.percent, this, "percent");
-		this.recovered = ApiTypeHelper.requireNonNull(builder.recovered, this, "recovered");
-		this.reused = ApiTypeHelper.requireNonNull(builder.reused, this, "reused");
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+        this.details = ApiTypeHelper.unmodifiable(builder.details);
+        this.percent = ApiTypeHelper.requireNonNull(builder.percent, this, "percent");
+        this.recovered = ApiTypeHelper.requireNonNull(builder.recovered, this, "recovered");
+        this.reused = ApiTypeHelper.requireNonNull(builder.reused, this, "reused");
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
 
-	}
+    }
 
-	public static RecoveryFiles of(Function<Builder, ObjectBuilder<RecoveryFiles>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static RecoveryFiles of(Function<Builder, ObjectBuilder<RecoveryFiles>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * API name: {@code details}
-	 */
-	public final List<FileDetails> details() {
-		return this.details;
-	}
-
-	/**
-	 * Required - API name: {@code percent}
-	 */
-	public final String percent() {
-		return this.percent;
-	}
-
-	/**
-	 * Required - API name: {@code recovered}
-	 */
-	public final long recovered() {
-		return this.recovered;
-	}
-
-	/**
-	 * Required - API name: {@code reused}
-	 */
-	public final long reused() {
-		return this.reused;
-	}
-
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final long total() {
-		return this.total;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.details)) {
-			generator.writeKey("details");
-			generator.writeStartArray();
-			for (FileDetails item0 : this.details) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("percent");
-		generator.write(this.percent);
-
-		generator.writeKey("recovered");
-		generator.write(this.recovered);
-
-		generator.writeKey("reused");
-		generator.write(this.reused);
-
-		generator.writeKey("total");
-		generator.write(this.total);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RecoveryFiles}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryFiles> {
-		@Nullable
-		private List<FileDetails> details;
-
-		private String percent;
-
-		private Long recovered;
-
-		private Long reused;
-
-		private Long total;
-
-		/**
-		 * API name: {@code details}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>details</code>.
-		 */
-		public final Builder details(List<FileDetails> list) {
-			this.details = _listAddAll(this.details, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code details}
-		 * <p>
-		 * Adds one or more values to <code>details</code>.
-		 */
-		public final Builder details(FileDetails value, FileDetails... values) {
-			this.details = _listAdd(this.details, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code details}
-		 * <p>
-		 * Adds a value to <code>details</code> using a builder lambda.
-		 */
-		public final Builder details(Function<FileDetails.Builder, ObjectBuilder<FileDetails>> fn) {
-			return details(fn.apply(new FileDetails.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code percent}
-		 */
-		public final Builder percent(String value) {
-			this.percent = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code recovered}
-		 */
-		public final Builder recovered(long value) {
-			this.recovered = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code reused}
-		 */
-		public final Builder reused(long value) {
-			this.reused = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(long value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RecoveryFiles}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RecoveryFiles build() {
-			_checkSingleUse();
-
-			return new RecoveryFiles(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RecoveryFiles}
-	 */
-	public static final JsonpDeserializer<RecoveryFiles> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RecoveryFiles::setupRecoveryFilesDeserializer);
-
-	protected static void setupRecoveryFilesDeserializer(ObjectDeserializer<RecoveryFiles.Builder> op) {
-
-		op.add(Builder::details, JsonpDeserializer.arrayDeserializer(FileDetails._DESERIALIZER), "details");
-		op.add(Builder::percent, JsonpDeserializer.stringDeserializer(), "percent");
-		op.add(Builder::recovered, JsonpDeserializer.longDeserializer(), "recovered");
-		op.add(Builder::reused, JsonpDeserializer.longDeserializer(), "reused");
-		op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
-
-	}
+    /**
+     * API name: {@code details}
+     */
+    public final List<FileDetails> details() {
+        return this.details;
+    }
+
+    /**
+     * Required - API name: {@code percent}
+     */
+    public final String percent() {
+        return this.percent;
+    }
+
+    /**
+     * Required - API name: {@code recovered}
+     */
+    public final long recovered() {
+        return this.recovered;
+    }
+
+    /**
+     * Required - API name: {@code reused}
+     */
+    public final long reused() {
+        return this.reused;
+    }
+
+    /**
+     * Required - API name: {@code total}
+     */
+    public final long total() {
+        return this.total;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.details)) {
+            generator.writeKey("details");
+            generator.writeStartArray();
+            for (FileDetails item0 : this.details) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("percent");
+        generator.write(this.percent);
+
+        generator.writeKey("recovered");
+        generator.write(this.recovered);
+
+        generator.writeKey("reused");
+        generator.write(this.reused);
+
+        generator.writeKey("total");
+        generator.write(this.total);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RecoveryFiles}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryFiles> {
+        @Nullable
+        private List<FileDetails> details;
+
+        private String percent;
+
+        private Long recovered;
+
+        private Long reused;
+
+        private Long total;
+
+        /**
+         * API name: {@code details}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>details</code>.
+         */
+        public final Builder details(List<FileDetails> list) {
+            this.details = _listAddAll(this.details, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code details}
+         * <p>
+         * Adds one or more values to <code>details</code>.
+         */
+        public final Builder details(FileDetails value, FileDetails... values) {
+            this.details = _listAdd(this.details, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code details}
+         * <p>
+         * Adds a value to <code>details</code> using a builder lambda.
+         */
+        public final Builder details(Function<FileDetails.Builder, ObjectBuilder<FileDetails>> fn) {
+            return details(fn.apply(new FileDetails.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code percent}
+         */
+        public final Builder percent(String value) {
+            this.percent = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code recovered}
+         */
+        public final Builder recovered(long value) {
+            this.recovered = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code reused}
+         */
+        public final Builder reused(long value) {
+            this.reused = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(long value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RecoveryFiles}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RecoveryFiles build() {
+            _checkSingleUse();
+
+            return new RecoveryFiles(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RecoveryFiles}
+     */
+    public static final JsonpDeserializer<RecoveryFiles> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RecoveryFiles::setupRecoveryFilesDeserializer
+    );
+
+    protected static void setupRecoveryFilesDeserializer(ObjectDeserializer<RecoveryFiles.Builder> op) {
+
+        op.add(Builder::details, JsonpDeserializer.arrayDeserializer(FileDetails._DESERIALIZER), "details");
+        op.add(Builder::percent, JsonpDeserializer.stringDeserializer(), "percent");
+        op.add(Builder::recovered, JsonpDeserializer.longDeserializer(), "recovered");
+        op.add(Builder::reused, JsonpDeserializer.longDeserializer(), "reused");
+        op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryIndexStatus.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryIndexStatus.java
index fa31925a21..44d573e7f1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryIndexStatus.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryIndexStatus.java
@@ -32,363 +32,368 @@
 
 package org.opensearch.client.opensearch.indices.recovery;
 
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Time;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.recovery.RecoveryIndexStatus
 
-
 @JsonpDeserializable
 public class RecoveryIndexStatus implements JsonpSerializable {
-	@Nullable
-	private final RecoveryBytes bytes;
-
-	private final RecoveryFiles files;
-
-	private final RecoveryBytes size;
-
-	@Nullable
-	private final Time sourceThrottleTime;
-
-	private final String sourceThrottleTimeInMillis;
-
-	@Nullable
-	private final Time targetThrottleTime;
-
-	private final String targetThrottleTimeInMillis;
-
-	private final String totalTimeInMillis;
-
-	@Nullable
-	private final Time totalTime;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RecoveryIndexStatus(Builder builder) {
-
-		this.bytes = builder.bytes;
-		this.files = ApiTypeHelper.requireNonNull(builder.files, this, "files");
-		this.size = ApiTypeHelper.requireNonNull(builder.size, this, "size");
-		this.sourceThrottleTime = builder.sourceThrottleTime;
-		this.sourceThrottleTimeInMillis = ApiTypeHelper.requireNonNull(builder.sourceThrottleTimeInMillis, this,
-				"sourceThrottleTimeInMillis");
-		this.targetThrottleTime = builder.targetThrottleTime;
-		this.targetThrottleTimeInMillis = ApiTypeHelper.requireNonNull(builder.targetThrottleTimeInMillis, this,
-				"targetThrottleTimeInMillis");
-		this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
-		this.totalTime = builder.totalTime;
-
-	}
-
-	public static RecoveryIndexStatus of(Function<Builder, ObjectBuilder<RecoveryIndexStatus>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code bytes}
-	 */
-	@Nullable
-	public final RecoveryBytes bytes() {
-		return this.bytes;
-	}
-
-	/**
-	 * Required - API name: {@code files}
-	 */
-	public final RecoveryFiles files() {
-		return this.files;
-	}
-
-	/**
-	 * Required - API name: {@code size}
-	 */
-	public final RecoveryBytes size() {
-		return this.size;
-	}
-
-	/**
-	 * API name: {@code source_throttle_time}
-	 */
-	@Nullable
-	public final Time sourceThrottleTime() {
-		return this.sourceThrottleTime;
-	}
-
-	/**
-	 * Required - API name: {@code source_throttle_time_in_millis}
-	 */
-	public final String sourceThrottleTimeInMillis() {
-		return this.sourceThrottleTimeInMillis;
-	}
-
-	/**
-	 * API name: {@code target_throttle_time}
-	 */
-	@Nullable
-	public final Time targetThrottleTime() {
-		return this.targetThrottleTime;
-	}
-
-	/**
-	 * Required - API name: {@code target_throttle_time_in_millis}
-	 */
-	public final String targetThrottleTimeInMillis() {
-		return this.targetThrottleTimeInMillis;
-	}
-
-	/**
-	 * Required - API name: {@code total_time_in_millis}
-	 */
-	public final String totalTimeInMillis() {
-		return this.totalTimeInMillis;
-	}
-
-	/**
-	 * API name: {@code total_time}
-	 */
-	@Nullable
-	public final Time totalTime() {
-		return this.totalTime;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.bytes != null) {
-			generator.writeKey("bytes");
-			this.bytes.serialize(generator, mapper);
-
-		}
-		generator.writeKey("files");
-		this.files.serialize(generator, mapper);
-
-		generator.writeKey("size");
-		this.size.serialize(generator, mapper);
-
-		if (this.sourceThrottleTime != null) {
-			generator.writeKey("source_throttle_time");
-			this.sourceThrottleTime.serialize(generator, mapper);
-
-		}
-		generator.writeKey("source_throttle_time_in_millis");
-		generator.write(this.sourceThrottleTimeInMillis);
-
-		if (this.targetThrottleTime != null) {
-			generator.writeKey("target_throttle_time");
-			this.targetThrottleTime.serialize(generator, mapper);
-
-		}
-		generator.writeKey("target_throttle_time_in_millis");
-		generator.write(this.targetThrottleTimeInMillis);
-
-		generator.writeKey("total_time_in_millis");
-		generator.write(this.totalTimeInMillis);
-
-		if (this.totalTime != null) {
-			generator.writeKey("total_time");
-			this.totalTime.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RecoveryIndexStatus}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryIndexStatus> {
-		@Nullable
-		private RecoveryBytes bytes;
-
-		private RecoveryFiles files;
-
-		private RecoveryBytes size;
-
-		@Nullable
-		private Time sourceThrottleTime;
-
-		private String sourceThrottleTimeInMillis;
-
-		@Nullable
-		private Time targetThrottleTime;
-
-		private String targetThrottleTimeInMillis;
-
-		private String totalTimeInMillis;
-
-		@Nullable
-		private Time totalTime;
-
-		/**
-		 * API name: {@code bytes}
-		 */
-		public final Builder bytes(@Nullable RecoveryBytes value) {
-			this.bytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code bytes}
-		 */
-		public final Builder bytes(Function<RecoveryBytes.Builder, ObjectBuilder<RecoveryBytes>> fn) {
-			return this.bytes(fn.apply(new RecoveryBytes.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code files}
-		 */
-		public final Builder files(RecoveryFiles value) {
-			this.files = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code files}
-		 */
-		public final Builder files(Function<RecoveryFiles.Builder, ObjectBuilder<RecoveryFiles>> fn) {
-			return this.files(fn.apply(new RecoveryFiles.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code size}
-		 */
-		public final Builder size(RecoveryBytes value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code size}
-		 */
-		public final Builder size(Function<RecoveryBytes.Builder, ObjectBuilder<RecoveryBytes>> fn) {
-			return this.size(fn.apply(new RecoveryBytes.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code source_throttle_time}
-		 */
-		public final Builder sourceThrottleTime(@Nullable Time value) {
-			this.sourceThrottleTime = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code source_throttle_time}
-		 */
-		public final Builder sourceThrottleTime(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.sourceThrottleTime(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code source_throttle_time_in_millis}
-		 */
-		public final Builder sourceThrottleTimeInMillis(String value) {
-			this.sourceThrottleTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code target_throttle_time}
-		 */
-		public final Builder targetThrottleTime(@Nullable Time value) {
-			this.targetThrottleTime = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code target_throttle_time}
-		 */
-		public final Builder targetThrottleTime(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.targetThrottleTime(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code target_throttle_time_in_millis}
-		 */
-		public final Builder targetThrottleTimeInMillis(String value) {
-			this.targetThrottleTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_time_in_millis}
-		 */
-		public final Builder totalTimeInMillis(String value) {
-			this.totalTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total_time}
-		 */
-		public final Builder totalTime(@Nullable Time value) {
-			this.totalTime = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total_time}
-		 */
-		public final Builder totalTime(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.totalTime(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link RecoveryIndexStatus}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RecoveryIndexStatus build() {
-			_checkSingleUse();
-
-			return new RecoveryIndexStatus(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RecoveryIndexStatus}
-	 */
-	public static final JsonpDeserializer<RecoveryIndexStatus> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RecoveryIndexStatus::setupRecoveryIndexStatusDeserializer);
-
-	protected static void setupRecoveryIndexStatusDeserializer(ObjectDeserializer<RecoveryIndexStatus.Builder> op) {
-
-		op.add(Builder::bytes, RecoveryBytes._DESERIALIZER, "bytes");
-		op.add(Builder::files, RecoveryFiles._DESERIALIZER, "files");
-		op.add(Builder::size, RecoveryBytes._DESERIALIZER, "size");
-		op.add(Builder::sourceThrottleTime, Time._DESERIALIZER, "source_throttle_time");
-		op.add(Builder::sourceThrottleTimeInMillis, JsonpDeserializer.stringDeserializer(),
-				"source_throttle_time_in_millis");
-		op.add(Builder::targetThrottleTime, Time._DESERIALIZER, "target_throttle_time");
-		op.add(Builder::targetThrottleTimeInMillis, JsonpDeserializer.stringDeserializer(),
-				"target_throttle_time_in_millis");
-		op.add(Builder::totalTimeInMillis, JsonpDeserializer.stringDeserializer(), "total_time_in_millis");
-		op.add(Builder::totalTime, Time._DESERIALIZER, "total_time");
-
-	}
+    @Nullable
+    private final RecoveryBytes bytes;
+
+    private final RecoveryFiles files;
+
+    private final RecoveryBytes size;
+
+    @Nullable
+    private final Time sourceThrottleTime;
+
+    private final String sourceThrottleTimeInMillis;
+
+    @Nullable
+    private final Time targetThrottleTime;
+
+    private final String targetThrottleTimeInMillis;
+
+    private final String totalTimeInMillis;
+
+    @Nullable
+    private final Time totalTime;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RecoveryIndexStatus(Builder builder) {
+
+        this.bytes = builder.bytes;
+        this.files = ApiTypeHelper.requireNonNull(builder.files, this, "files");
+        this.size = ApiTypeHelper.requireNonNull(builder.size, this, "size");
+        this.sourceThrottleTime = builder.sourceThrottleTime;
+        this.sourceThrottleTimeInMillis = ApiTypeHelper.requireNonNull(
+            builder.sourceThrottleTimeInMillis,
+            this,
+            "sourceThrottleTimeInMillis"
+        );
+        this.targetThrottleTime = builder.targetThrottleTime;
+        this.targetThrottleTimeInMillis = ApiTypeHelper.requireNonNull(
+            builder.targetThrottleTimeInMillis,
+            this,
+            "targetThrottleTimeInMillis"
+        );
+        this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
+        this.totalTime = builder.totalTime;
+
+    }
+
+    public static RecoveryIndexStatus of(Function<Builder, ObjectBuilder<RecoveryIndexStatus>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code bytes}
+     */
+    @Nullable
+    public final RecoveryBytes bytes() {
+        return this.bytes;
+    }
+
+    /**
+     * Required - API name: {@code files}
+     */
+    public final RecoveryFiles files() {
+        return this.files;
+    }
+
+    /**
+     * Required - API name: {@code size}
+     */
+    public final RecoveryBytes size() {
+        return this.size;
+    }
+
+    /**
+     * API name: {@code source_throttle_time}
+     */
+    @Nullable
+    public final Time sourceThrottleTime() {
+        return this.sourceThrottleTime;
+    }
+
+    /**
+     * Required - API name: {@code source_throttle_time_in_millis}
+     */
+    public final String sourceThrottleTimeInMillis() {
+        return this.sourceThrottleTimeInMillis;
+    }
+
+    /**
+     * API name: {@code target_throttle_time}
+     */
+    @Nullable
+    public final Time targetThrottleTime() {
+        return this.targetThrottleTime;
+    }
+
+    /**
+     * Required - API name: {@code target_throttle_time_in_millis}
+     */
+    public final String targetThrottleTimeInMillis() {
+        return this.targetThrottleTimeInMillis;
+    }
+
+    /**
+     * Required - API name: {@code total_time_in_millis}
+     */
+    public final String totalTimeInMillis() {
+        return this.totalTimeInMillis;
+    }
+
+    /**
+     * API name: {@code total_time}
+     */
+    @Nullable
+    public final Time totalTime() {
+        return this.totalTime;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.bytes != null) {
+            generator.writeKey("bytes");
+            this.bytes.serialize(generator, mapper);
+
+        }
+        generator.writeKey("files");
+        this.files.serialize(generator, mapper);
+
+        generator.writeKey("size");
+        this.size.serialize(generator, mapper);
+
+        if (this.sourceThrottleTime != null) {
+            generator.writeKey("source_throttle_time");
+            this.sourceThrottleTime.serialize(generator, mapper);
+
+        }
+        generator.writeKey("source_throttle_time_in_millis");
+        generator.write(this.sourceThrottleTimeInMillis);
+
+        if (this.targetThrottleTime != null) {
+            generator.writeKey("target_throttle_time");
+            this.targetThrottleTime.serialize(generator, mapper);
+
+        }
+        generator.writeKey("target_throttle_time_in_millis");
+        generator.write(this.targetThrottleTimeInMillis);
+
+        generator.writeKey("total_time_in_millis");
+        generator.write(this.totalTimeInMillis);
+
+        if (this.totalTime != null) {
+            generator.writeKey("total_time");
+            this.totalTime.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RecoveryIndexStatus}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryIndexStatus> {
+        @Nullable
+        private RecoveryBytes bytes;
+
+        private RecoveryFiles files;
+
+        private RecoveryBytes size;
+
+        @Nullable
+        private Time sourceThrottleTime;
+
+        private String sourceThrottleTimeInMillis;
+
+        @Nullable
+        private Time targetThrottleTime;
+
+        private String targetThrottleTimeInMillis;
+
+        private String totalTimeInMillis;
+
+        @Nullable
+        private Time totalTime;
+
+        /**
+         * API name: {@code bytes}
+         */
+        public final Builder bytes(@Nullable RecoveryBytes value) {
+            this.bytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code bytes}
+         */
+        public final Builder bytes(Function<RecoveryBytes.Builder, ObjectBuilder<RecoveryBytes>> fn) {
+            return this.bytes(fn.apply(new RecoveryBytes.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code files}
+         */
+        public final Builder files(RecoveryFiles value) {
+            this.files = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code files}
+         */
+        public final Builder files(Function<RecoveryFiles.Builder, ObjectBuilder<RecoveryFiles>> fn) {
+            return this.files(fn.apply(new RecoveryFiles.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code size}
+         */
+        public final Builder size(RecoveryBytes value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code size}
+         */
+        public final Builder size(Function<RecoveryBytes.Builder, ObjectBuilder<RecoveryBytes>> fn) {
+            return this.size(fn.apply(new RecoveryBytes.Builder()).build());
+        }
+
+        /**
+         * API name: {@code source_throttle_time}
+         */
+        public final Builder sourceThrottleTime(@Nullable Time value) {
+            this.sourceThrottleTime = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code source_throttle_time}
+         */
+        public final Builder sourceThrottleTime(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.sourceThrottleTime(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code source_throttle_time_in_millis}
+         */
+        public final Builder sourceThrottleTimeInMillis(String value) {
+            this.sourceThrottleTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code target_throttle_time}
+         */
+        public final Builder targetThrottleTime(@Nullable Time value) {
+            this.targetThrottleTime = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code target_throttle_time}
+         */
+        public final Builder targetThrottleTime(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.targetThrottleTime(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code target_throttle_time_in_millis}
+         */
+        public final Builder targetThrottleTimeInMillis(String value) {
+            this.targetThrottleTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_time_in_millis}
+         */
+        public final Builder totalTimeInMillis(String value) {
+            this.totalTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total_time}
+         */
+        public final Builder totalTime(@Nullable Time value) {
+            this.totalTime = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total_time}
+         */
+        public final Builder totalTime(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.totalTime(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link RecoveryIndexStatus}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RecoveryIndexStatus build() {
+            _checkSingleUse();
+
+            return new RecoveryIndexStatus(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RecoveryIndexStatus}
+     */
+    public static final JsonpDeserializer<RecoveryIndexStatus> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RecoveryIndexStatus::setupRecoveryIndexStatusDeserializer
+    );
+
+    protected static void setupRecoveryIndexStatusDeserializer(ObjectDeserializer<RecoveryIndexStatus.Builder> op) {
+
+        op.add(Builder::bytes, RecoveryBytes._DESERIALIZER, "bytes");
+        op.add(Builder::files, RecoveryFiles._DESERIALIZER, "files");
+        op.add(Builder::size, RecoveryBytes._DESERIALIZER, "size");
+        op.add(Builder::sourceThrottleTime, Time._DESERIALIZER, "source_throttle_time");
+        op.add(Builder::sourceThrottleTimeInMillis, JsonpDeserializer.stringDeserializer(), "source_throttle_time_in_millis");
+        op.add(Builder::targetThrottleTime, Time._DESERIALIZER, "target_throttle_time");
+        op.add(Builder::targetThrottleTimeInMillis, JsonpDeserializer.stringDeserializer(), "target_throttle_time_in_millis");
+        op.add(Builder::totalTimeInMillis, JsonpDeserializer.stringDeserializer(), "total_time_in_millis");
+        op.add(Builder::totalTime, Time._DESERIALIZER, "total_time");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryOrigin.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryOrigin.java
index d2f09e7427..bed827725f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryOrigin.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryOrigin.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.recovery;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,419 +43,417 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.recovery.RecoveryOrigin
 
-
 @JsonpDeserializable
 public class RecoveryOrigin implements JsonpSerializable {
-	@Nullable
-	private final String hostname;
-
-	@Nullable
-	private final String host;
-
-	@Nullable
-	private final String transportAddress;
-
-	@Nullable
-	private final String id;
-
-	@Nullable
-	private final String ip;
-
-	@Nullable
-	private final String name;
-
-	@Nullable
-	private final Boolean bootstrapNewHistoryUuid;
-
-	@Nullable
-	private final String repository;
-
-	@Nullable
-	private final String snapshot;
-
-	@Nullable
-	private final String version;
-
-	@Nullable
-	private final String restoreuuid;
-
-	@Nullable
-	private final String index;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RecoveryOrigin(Builder builder) {
-
-		this.hostname = builder.hostname;
-		this.host = builder.host;
-		this.transportAddress = builder.transportAddress;
-		this.id = builder.id;
-		this.ip = builder.ip;
-		this.name = builder.name;
-		this.bootstrapNewHistoryUuid = builder.bootstrapNewHistoryUuid;
-		this.repository = builder.repository;
-		this.snapshot = builder.snapshot;
-		this.version = builder.version;
-		this.restoreuuid = builder.restoreuuid;
-		this.index = builder.index;
-
-	}
-
-	public static RecoveryOrigin of(Function<Builder, ObjectBuilder<RecoveryOrigin>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code hostname}
-	 */
-	@Nullable
-	public final String hostname() {
-		return this.hostname;
-	}
-
-	/**
-	 * API name: {@code host}
-	 */
-	@Nullable
-	public final String host() {
-		return this.host;
-	}
-
-	/**
-	 * API name: {@code transport_address}
-	 */
-	@Nullable
-	public final String transportAddress() {
-		return this.transportAddress;
-	}
-
-	/**
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * API name: {@code ip}
-	 */
-	@Nullable
-	public final String ip() {
-		return this.ip;
-	}
-
-	/**
-	 * API name: {@code name}
-	 */
-	@Nullable
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * API name: {@code bootstrap_new_history_uuid}
-	 */
-	@Nullable
-	public final Boolean bootstrapNewHistoryUuid() {
-		return this.bootstrapNewHistoryUuid;
-	}
-
-	/**
-	 * API name: {@code repository}
-	 */
-	@Nullable
-	public final String repository() {
-		return this.repository;
-	}
-
-	/**
-	 * API name: {@code snapshot}
-	 */
-	@Nullable
-	public final String snapshot() {
-		return this.snapshot;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final String version() {
-		return this.version;
-	}
-
-	/**
-	 * API name: {@code restoreUUID}
-	 */
-	@Nullable
-	public final String restoreuuid() {
-		return this.restoreuuid;
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.hostname != null) {
-			generator.writeKey("hostname");
-			generator.write(this.hostname);
-
-		}
-		if (this.host != null) {
-			generator.writeKey("host");
-			generator.write(this.host);
-
-		}
-		if (this.transportAddress != null) {
-			generator.writeKey("transport_address");
-			generator.write(this.transportAddress);
-
-		}
-		if (this.id != null) {
-			generator.writeKey("id");
-			generator.write(this.id);
-
-		}
-		if (this.ip != null) {
-			generator.writeKey("ip");
-			generator.write(this.ip);
-
-		}
-		if (this.name != null) {
-			generator.writeKey("name");
-			generator.write(this.name);
-
-		}
-		if (this.bootstrapNewHistoryUuid != null) {
-			generator.writeKey("bootstrap_new_history_uuid");
-			generator.write(this.bootstrapNewHistoryUuid);
-
-		}
-		if (this.repository != null) {
-			generator.writeKey("repository");
-			generator.write(this.repository);
-
-		}
-		if (this.snapshot != null) {
-			generator.writeKey("snapshot");
-			generator.write(this.snapshot);
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-		if (this.restoreuuid != null) {
-			generator.writeKey("restoreUUID");
-			generator.write(this.restoreuuid);
-
-		}
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RecoveryOrigin}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryOrigin> {
-		@Nullable
-		private String hostname;
-
-		@Nullable
-		private String host;
-
-		@Nullable
-		private String transportAddress;
-
-		@Nullable
-		private String id;
-
-		@Nullable
-		private String ip;
-
-		@Nullable
-		private String name;
-
-		@Nullable
-		private Boolean bootstrapNewHistoryUuid;
-
-		@Nullable
-		private String repository;
-
-		@Nullable
-		private String snapshot;
-
-		@Nullable
-		private String version;
-
-		@Nullable
-		private String restoreuuid;
-
-		@Nullable
-		private String index;
-
-		/**
-		 * API name: {@code hostname}
-		 */
-		public final Builder hostname(@Nullable String value) {
-			this.hostname = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code host}
-		 */
-		public final Builder host(@Nullable String value) {
-			this.host = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code transport_address}
-		 */
-		public final Builder transportAddress(@Nullable String value) {
-			this.transportAddress = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ip}
-		 */
-		public final Builder ip(@Nullable String value) {
-			this.ip = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code name}
-		 */
-		public final Builder name(@Nullable String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code bootstrap_new_history_uuid}
-		 */
-		public final Builder bootstrapNewHistoryUuid(@Nullable Boolean value) {
-			this.bootstrapNewHistoryUuid = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code repository}
-		 */
-		public final Builder repository(@Nullable String value) {
-			this.repository = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code snapshot}
-		 */
-		public final Builder snapshot(@Nullable String value) {
-			this.snapshot = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code restoreUUID}
-		 */
-		public final Builder restoreuuid(@Nullable String value) {
-			this.restoreuuid = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RecoveryOrigin}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RecoveryOrigin build() {
-			_checkSingleUse();
-
-			return new RecoveryOrigin(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RecoveryOrigin}
-	 */
-	public static final JsonpDeserializer<RecoveryOrigin> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RecoveryOrigin::setupRecoveryOriginDeserializer);
-
-	protected static void setupRecoveryOriginDeserializer(ObjectDeserializer<RecoveryOrigin.Builder> op) {
-
-		op.add(Builder::hostname, JsonpDeserializer.stringDeserializer(), "hostname");
-		op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host");
-		op.add(Builder::transportAddress, JsonpDeserializer.stringDeserializer(), "transport_address");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip");
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::bootstrapNewHistoryUuid, JsonpDeserializer.booleanDeserializer(), "bootstrap_new_history_uuid");
-		op.add(Builder::repository, JsonpDeserializer.stringDeserializer(), "repository");
-		op.add(Builder::snapshot, JsonpDeserializer.stringDeserializer(), "snapshot");
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
-		op.add(Builder::restoreuuid, JsonpDeserializer.stringDeserializer(), "restoreUUID");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-
-	}
+    @Nullable
+    private final String hostname;
+
+    @Nullable
+    private final String host;
+
+    @Nullable
+    private final String transportAddress;
+
+    @Nullable
+    private final String id;
+
+    @Nullable
+    private final String ip;
+
+    @Nullable
+    private final String name;
+
+    @Nullable
+    private final Boolean bootstrapNewHistoryUuid;
+
+    @Nullable
+    private final String repository;
+
+    @Nullable
+    private final String snapshot;
+
+    @Nullable
+    private final String version;
+
+    @Nullable
+    private final String restoreuuid;
+
+    @Nullable
+    private final String index;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RecoveryOrigin(Builder builder) {
+
+        this.hostname = builder.hostname;
+        this.host = builder.host;
+        this.transportAddress = builder.transportAddress;
+        this.id = builder.id;
+        this.ip = builder.ip;
+        this.name = builder.name;
+        this.bootstrapNewHistoryUuid = builder.bootstrapNewHistoryUuid;
+        this.repository = builder.repository;
+        this.snapshot = builder.snapshot;
+        this.version = builder.version;
+        this.restoreuuid = builder.restoreuuid;
+        this.index = builder.index;
+
+    }
+
+    public static RecoveryOrigin of(Function<Builder, ObjectBuilder<RecoveryOrigin>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code hostname}
+     */
+    @Nullable
+    public final String hostname() {
+        return this.hostname;
+    }
+
+    /**
+     * API name: {@code host}
+     */
+    @Nullable
+    public final String host() {
+        return this.host;
+    }
+
+    /**
+     * API name: {@code transport_address}
+     */
+    @Nullable
+    public final String transportAddress() {
+        return this.transportAddress;
+    }
+
+    /**
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * API name: {@code ip}
+     */
+    @Nullable
+    public final String ip() {
+        return this.ip;
+    }
+
+    /**
+     * API name: {@code name}
+     */
+    @Nullable
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * API name: {@code bootstrap_new_history_uuid}
+     */
+    @Nullable
+    public final Boolean bootstrapNewHistoryUuid() {
+        return this.bootstrapNewHistoryUuid;
+    }
+
+    /**
+     * API name: {@code repository}
+     */
+    @Nullable
+    public final String repository() {
+        return this.repository;
+    }
+
+    /**
+     * API name: {@code snapshot}
+     */
+    @Nullable
+    public final String snapshot() {
+        return this.snapshot;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final String version() {
+        return this.version;
+    }
+
+    /**
+     * API name: {@code restoreUUID}
+     */
+    @Nullable
+    public final String restoreuuid() {
+        return this.restoreuuid;
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.hostname != null) {
+            generator.writeKey("hostname");
+            generator.write(this.hostname);
+
+        }
+        if (this.host != null) {
+            generator.writeKey("host");
+            generator.write(this.host);
+
+        }
+        if (this.transportAddress != null) {
+            generator.writeKey("transport_address");
+            generator.write(this.transportAddress);
+
+        }
+        if (this.id != null) {
+            generator.writeKey("id");
+            generator.write(this.id);
+
+        }
+        if (this.ip != null) {
+            generator.writeKey("ip");
+            generator.write(this.ip);
+
+        }
+        if (this.name != null) {
+            generator.writeKey("name");
+            generator.write(this.name);
+
+        }
+        if (this.bootstrapNewHistoryUuid != null) {
+            generator.writeKey("bootstrap_new_history_uuid");
+            generator.write(this.bootstrapNewHistoryUuid);
+
+        }
+        if (this.repository != null) {
+            generator.writeKey("repository");
+            generator.write(this.repository);
+
+        }
+        if (this.snapshot != null) {
+            generator.writeKey("snapshot");
+            generator.write(this.snapshot);
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+        if (this.restoreuuid != null) {
+            generator.writeKey("restoreUUID");
+            generator.write(this.restoreuuid);
+
+        }
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RecoveryOrigin}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryOrigin> {
+        @Nullable
+        private String hostname;
+
+        @Nullable
+        private String host;
+
+        @Nullable
+        private String transportAddress;
+
+        @Nullable
+        private String id;
+
+        @Nullable
+        private String ip;
+
+        @Nullable
+        private String name;
+
+        @Nullable
+        private Boolean bootstrapNewHistoryUuid;
+
+        @Nullable
+        private String repository;
+
+        @Nullable
+        private String snapshot;
+
+        @Nullable
+        private String version;
+
+        @Nullable
+        private String restoreuuid;
+
+        @Nullable
+        private String index;
+
+        /**
+         * API name: {@code hostname}
+         */
+        public final Builder hostname(@Nullable String value) {
+            this.hostname = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code host}
+         */
+        public final Builder host(@Nullable String value) {
+            this.host = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code transport_address}
+         */
+        public final Builder transportAddress(@Nullable String value) {
+            this.transportAddress = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ip}
+         */
+        public final Builder ip(@Nullable String value) {
+            this.ip = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code name}
+         */
+        public final Builder name(@Nullable String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code bootstrap_new_history_uuid}
+         */
+        public final Builder bootstrapNewHistoryUuid(@Nullable Boolean value) {
+            this.bootstrapNewHistoryUuid = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code repository}
+         */
+        public final Builder repository(@Nullable String value) {
+            this.repository = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code snapshot}
+         */
+        public final Builder snapshot(@Nullable String value) {
+            this.snapshot = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code restoreUUID}
+         */
+        public final Builder restoreuuid(@Nullable String value) {
+            this.restoreuuid = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RecoveryOrigin}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RecoveryOrigin build() {
+            _checkSingleUse();
+
+            return new RecoveryOrigin(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RecoveryOrigin}
+     */
+    public static final JsonpDeserializer<RecoveryOrigin> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RecoveryOrigin::setupRecoveryOriginDeserializer
+    );
+
+    protected static void setupRecoveryOriginDeserializer(ObjectDeserializer<RecoveryOrigin.Builder> op) {
+
+        op.add(Builder::hostname, JsonpDeserializer.stringDeserializer(), "hostname");
+        op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host");
+        op.add(Builder::transportAddress, JsonpDeserializer.stringDeserializer(), "transport_address");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::bootstrapNewHistoryUuid, JsonpDeserializer.booleanDeserializer(), "bootstrap_new_history_uuid");
+        op.add(Builder::repository, JsonpDeserializer.stringDeserializer(), "repository");
+        op.add(Builder::snapshot, JsonpDeserializer.stringDeserializer(), "snapshot");
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
+        op.add(Builder::restoreuuid, JsonpDeserializer.stringDeserializer(), "restoreUUID");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryStartStatus.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryStartStatus.java
index d9b0d36740..5f712c2f43 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryStartStatus.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryStartStatus.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.indices.recovery;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,117 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: indices.recovery.RecoveryStartStatus
 
-
 @JsonpDeserializable
 public class RecoveryStartStatus implements JsonpSerializable {
-	private final long checkIndexTime;
-
-	private final String totalTimeInMillis;
-
-	// ---------------------------------------------------------------------------------------------
+    private final long checkIndexTime;
 
-	private RecoveryStartStatus(Builder builder) {
+    private final String totalTimeInMillis;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.checkIndexTime = ApiTypeHelper.requireNonNull(builder.checkIndexTime, this, "checkIndexTime");
-		this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
+    private RecoveryStartStatus(Builder builder) {
 
-	}
+        this.checkIndexTime = ApiTypeHelper.requireNonNull(builder.checkIndexTime, this, "checkIndexTime");
+        this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
 
-	public static RecoveryStartStatus of(Function<Builder, ObjectBuilder<RecoveryStartStatus>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code check_index_time}
-	 */
-	public final long checkIndexTime() {
-		return this.checkIndexTime;
-	}
+    public static RecoveryStartStatus of(Function<Builder, ObjectBuilder<RecoveryStartStatus>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code total_time_in_millis}
-	 */
-	public final String totalTimeInMillis() {
-		return this.totalTimeInMillis;
-	}
+    /**
+     * Required - API name: {@code check_index_time}
+     */
+    public final long checkIndexTime() {
+        return this.checkIndexTime;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code total_time_in_millis}
+     */
+    public final String totalTimeInMillis() {
+        return this.totalTimeInMillis;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("check_index_time");
-		generator.write(this.checkIndexTime);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("total_time_in_millis");
-		generator.write(this.totalTimeInMillis);
+        generator.writeKey("check_index_time");
+        generator.write(this.checkIndexTime);
 
-	}
+        generator.writeKey("total_time_in_millis");
+        generator.write(this.totalTimeInMillis);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link RecoveryStartStatus}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryStartStatus> {
-		private Long checkIndexTime;
+    /**
+     * Builder for {@link RecoveryStartStatus}.
+     */
 
-		private String totalTimeInMillis;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryStartStatus> {
+        private Long checkIndexTime;
 
-		/**
-		 * Required - API name: {@code check_index_time}
-		 */
-		public final Builder checkIndexTime(long value) {
-			this.checkIndexTime = value;
-			return this;
-		}
+        private String totalTimeInMillis;
 
-		/**
-		 * Required - API name: {@code total_time_in_millis}
-		 */
-		public final Builder totalTimeInMillis(String value) {
-			this.totalTimeInMillis = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code check_index_time}
+         */
+        public final Builder checkIndexTime(long value) {
+            this.checkIndexTime = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link RecoveryStartStatus}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RecoveryStartStatus build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code total_time_in_millis}
+         */
+        public final Builder totalTimeInMillis(String value) {
+            this.totalTimeInMillis = value;
+            return this;
+        }
 
-			return new RecoveryStartStatus(this);
-		}
-	}
+        /**
+         * Builds a {@link RecoveryStartStatus}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RecoveryStartStatus build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new RecoveryStartStatus(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link RecoveryStartStatus}
-	 */
-	public static final JsonpDeserializer<RecoveryStartStatus> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RecoveryStartStatus::setupRecoveryStartStatusDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupRecoveryStartStatusDeserializer(ObjectDeserializer<RecoveryStartStatus.Builder> op) {
+    /**
+     * Json deserializer for {@link RecoveryStartStatus}
+     */
+    public static final JsonpDeserializer<RecoveryStartStatus> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RecoveryStartStatus::setupRecoveryStartStatusDeserializer
+    );
 
-		op.add(Builder::checkIndexTime, JsonpDeserializer.longDeserializer(), "check_index_time");
-		op.add(Builder::totalTimeInMillis, JsonpDeserializer.stringDeserializer(), "total_time_in_millis");
+    protected static void setupRecoveryStartStatusDeserializer(ObjectDeserializer<RecoveryStartStatus.Builder> op) {
 
-	}
+        op.add(Builder::checkIndexTime, JsonpDeserializer.longDeserializer(), "check_index_time");
+        op.add(Builder::totalTimeInMillis, JsonpDeserializer.stringDeserializer(), "total_time_in_millis");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryStatus.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryStatus.java
index 5195bf68ce..1b2324515e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryStatus.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/RecoveryStatus.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.recovery;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,123 +44,121 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: indices.recovery.RecoveryStatus
 
-
 @JsonpDeserializable
 public class RecoveryStatus implements JsonpSerializable {
-	private final List<ShardRecovery> shards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RecoveryStatus(Builder builder) {
-
-		this.shards = ApiTypeHelper.unmodifiableRequired(builder.shards, this, "shards");
-
-	}
-
-	public static RecoveryStatus of(Function<Builder, ObjectBuilder<RecoveryStatus>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code shards}
-	 */
-	public final List<ShardRecovery> shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.shards)) {
-			generator.writeKey("shards");
-			generator.writeStartArray();
-			for (ShardRecovery item0 : this.shards) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RecoveryStatus}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryStatus> {
-		private List<ShardRecovery> shards;
-
-		/**
-		 * Required - API name: {@code shards}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>shards</code>.
-		 */
-		public final Builder shards(List<ShardRecovery> list) {
-			this.shards = _listAddAll(this.shards, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards}
-		 * <p>
-		 * Adds one or more values to <code>shards</code>.
-		 */
-		public final Builder shards(ShardRecovery value, ShardRecovery... values) {
-			this.shards = _listAdd(this.shards, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards}
-		 * <p>
-		 * Adds a value to <code>shards</code> using a builder lambda.
-		 */
-		public final Builder shards(Function<ShardRecovery.Builder, ObjectBuilder<ShardRecovery>> fn) {
-			return shards(fn.apply(new ShardRecovery.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link RecoveryStatus}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RecoveryStatus build() {
-			_checkSingleUse();
-
-			return new RecoveryStatus(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RecoveryStatus}
-	 */
-	public static final JsonpDeserializer<RecoveryStatus> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RecoveryStatus::setupRecoveryStatusDeserializer);
-
-	protected static void setupRecoveryStatusDeserializer(ObjectDeserializer<RecoveryStatus.Builder> op) {
-
-		op.add(Builder::shards, JsonpDeserializer.arrayDeserializer(ShardRecovery._DESERIALIZER), "shards");
-
-	}
+    private final List<ShardRecovery> shards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RecoveryStatus(Builder builder) {
+
+        this.shards = ApiTypeHelper.unmodifiableRequired(builder.shards, this, "shards");
+
+    }
+
+    public static RecoveryStatus of(Function<Builder, ObjectBuilder<RecoveryStatus>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code shards}
+     */
+    public final List<ShardRecovery> shards() {
+        return this.shards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.shards)) {
+            generator.writeKey("shards");
+            generator.writeStartArray();
+            for (ShardRecovery item0 : this.shards) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RecoveryStatus}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RecoveryStatus> {
+        private List<ShardRecovery> shards;
+
+        /**
+         * Required - API name: {@code shards}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>shards</code>.
+         */
+        public final Builder shards(List<ShardRecovery> list) {
+            this.shards = _listAddAll(this.shards, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards}
+         * <p>
+         * Adds one or more values to <code>shards</code>.
+         */
+        public final Builder shards(ShardRecovery value, ShardRecovery... values) {
+            this.shards = _listAdd(this.shards, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards}
+         * <p>
+         * Adds a value to <code>shards</code> using a builder lambda.
+         */
+        public final Builder shards(Function<ShardRecovery.Builder, ObjectBuilder<ShardRecovery>> fn) {
+            return shards(fn.apply(new ShardRecovery.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link RecoveryStatus}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RecoveryStatus build() {
+            _checkSingleUse();
+
+            return new RecoveryStatus(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RecoveryStatus}
+     */
+    public static final JsonpDeserializer<RecoveryStatus> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RecoveryStatus::setupRecoveryStatusDeserializer
+    );
+
+    protected static void setupRecoveryStatusDeserializer(ObjectDeserializer<RecoveryStatus.Builder> op) {
+
+        op.add(Builder::shards, JsonpDeserializer.arrayDeserializer(ShardRecovery._DESERIALIZER), "shards");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/ShardRecovery.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/ShardRecovery.java
index f47d3d9be2..78ef2987f8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/ShardRecovery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/ShardRecovery.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.recovery;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,516 +44,514 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.recovery.ShardRecovery
 
-
 @JsonpDeserializable
 public class ShardRecovery implements JsonpSerializable {
-	private final long id;
+    private final long id;
 
-	private final RecoveryIndexStatus index;
+    private final RecoveryIndexStatus index;
 
-	private final boolean primary;
+    private final boolean primary;
 
-	private final RecoveryOrigin source;
+    private final RecoveryOrigin source;
 
-	private final String stage;
+    private final String stage;
 
-	@Nullable
-	private final RecoveryStartStatus start;
-
-	@Nullable
-	private final String startTime;
-
-	private final String startTimeInMillis;
-
-	@Nullable
-	private final String stopTime;
-
-	private final String stopTimeInMillis;
-
-	private final RecoveryOrigin target;
-
-	@Nullable
-	private final String totalTime;
-
-	private final String totalTimeInMillis;
-
-	private final TranslogStatus translog;
-
-	private final String type;
-
-	private final VerifyIndex verifyIndex;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShardRecovery(Builder builder) {
-
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.primary = ApiTypeHelper.requireNonNull(builder.primary, this, "primary");
-		this.source = ApiTypeHelper.requireNonNull(builder.source, this, "source");
-		this.stage = ApiTypeHelper.requireNonNull(builder.stage, this, "stage");
-		this.start = builder.start;
-		this.startTime = builder.startTime;
-		this.startTimeInMillis = ApiTypeHelper.requireNonNull(builder.startTimeInMillis, this, "startTimeInMillis");
-		this.stopTime = builder.stopTime;
-		this.stopTimeInMillis = ApiTypeHelper.requireNonNull(builder.stopTimeInMillis, this, "stopTimeInMillis");
-		this.target = ApiTypeHelper.requireNonNull(builder.target, this, "target");
-		this.totalTime = builder.totalTime;
-		this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
-		this.translog = ApiTypeHelper.requireNonNull(builder.translog, this, "translog");
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-		this.verifyIndex = ApiTypeHelper.requireNonNull(builder.verifyIndex, this, "verifyIndex");
-
-	}
-
-	public static ShardRecovery of(Function<Builder, ObjectBuilder<ShardRecovery>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code id}
-	 */
-	public final long id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - API name: {@code index}
-	 */
-	public final RecoveryIndexStatus index() {
-		return this.index;
-	}
-
-	/**
-	 * Required - API name: {@code primary}
-	 */
-	public final boolean primary() {
-		return this.primary;
-	}
-
-	/**
-	 * Required - API name: {@code source}
-	 */
-	public final RecoveryOrigin source() {
-		return this.source;
-	}
-
-	/**
-	 * Required - API name: {@code stage}
-	 */
-	public final String stage() {
-		return this.stage;
-	}
-
-	/**
-	 * API name: {@code start}
-	 */
-	@Nullable
-	public final RecoveryStartStatus start() {
-		return this.start;
-	}
-
-	/**
-	 * API name: {@code start_time}
-	 */
-	@Nullable
-	public final String startTime() {
-		return this.startTime;
-	}
-
-	/**
-	 * Required - API name: {@code start_time_in_millis}
-	 */
-	public final String startTimeInMillis() {
-		return this.startTimeInMillis;
-	}
-
-	/**
-	 * API name: {@code stop_time}
-	 */
-	@Nullable
-	public final String stopTime() {
-		return this.stopTime;
-	}
-
-	/**
-	 * Required - API name: {@code stop_time_in_millis}
-	 */
-	public final String stopTimeInMillis() {
-		return this.stopTimeInMillis;
-	}
-
-	/**
-	 * Required - API name: {@code target}
-	 */
-	public final RecoveryOrigin target() {
-		return this.target;
-	}
-
-	/**
-	 * API name: {@code total_time}
-	 */
-	@Nullable
-	public final String totalTime() {
-		return this.totalTime;
-	}
-
-	/**
-	 * Required - API name: {@code total_time_in_millis}
-	 */
-	public final String totalTimeInMillis() {
-		return this.totalTimeInMillis;
-	}
-
-	/**
-	 * Required - API name: {@code translog}
-	 */
-	public final TranslogStatus translog() {
-		return this.translog;
-	}
-
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * Required - API name: {@code verify_index}
-	 */
-	public final VerifyIndex verifyIndex() {
-		return this.verifyIndex;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("id");
-		generator.write(this.id);
-
-		generator.writeKey("index");
-		this.index.serialize(generator, mapper);
-
-		generator.writeKey("primary");
-		generator.write(this.primary);
-
-		generator.writeKey("source");
-		this.source.serialize(generator, mapper);
-
-		generator.writeKey("stage");
-		generator.write(this.stage);
-
-		if (this.start != null) {
-			generator.writeKey("start");
-			this.start.serialize(generator, mapper);
-
-		}
-		if (this.startTime != null) {
-			generator.writeKey("start_time");
-			generator.write(this.startTime);
+    @Nullable
+    private final RecoveryStartStatus start;
+
+    @Nullable
+    private final String startTime;
+
+    private final String startTimeInMillis;
+
+    @Nullable
+    private final String stopTime;
+
+    private final String stopTimeInMillis;
+
+    private final RecoveryOrigin target;
+
+    @Nullable
+    private final String totalTime;
+
+    private final String totalTimeInMillis;
+
+    private final TranslogStatus translog;
+
+    private final String type;
+
+    private final VerifyIndex verifyIndex;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShardRecovery(Builder builder) {
+
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.primary = ApiTypeHelper.requireNonNull(builder.primary, this, "primary");
+        this.source = ApiTypeHelper.requireNonNull(builder.source, this, "source");
+        this.stage = ApiTypeHelper.requireNonNull(builder.stage, this, "stage");
+        this.start = builder.start;
+        this.startTime = builder.startTime;
+        this.startTimeInMillis = ApiTypeHelper.requireNonNull(builder.startTimeInMillis, this, "startTimeInMillis");
+        this.stopTime = builder.stopTime;
+        this.stopTimeInMillis = ApiTypeHelper.requireNonNull(builder.stopTimeInMillis, this, "stopTimeInMillis");
+        this.target = ApiTypeHelper.requireNonNull(builder.target, this, "target");
+        this.totalTime = builder.totalTime;
+        this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
+        this.translog = ApiTypeHelper.requireNonNull(builder.translog, this, "translog");
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.verifyIndex = ApiTypeHelper.requireNonNull(builder.verifyIndex, this, "verifyIndex");
+
+    }
+
+    public static ShardRecovery of(Function<Builder, ObjectBuilder<ShardRecovery>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code id}
+     */
+    public final long id() {
+        return this.id;
+    }
+
+    /**
+     * Required - API name: {@code index}
+     */
+    public final RecoveryIndexStatus index() {
+        return this.index;
+    }
+
+    /**
+     * Required - API name: {@code primary}
+     */
+    public final boolean primary() {
+        return this.primary;
+    }
+
+    /**
+     * Required - API name: {@code source}
+     */
+    public final RecoveryOrigin source() {
+        return this.source;
+    }
+
+    /**
+     * Required - API name: {@code stage}
+     */
+    public final String stage() {
+        return this.stage;
+    }
+
+    /**
+     * API name: {@code start}
+     */
+    @Nullable
+    public final RecoveryStartStatus start() {
+        return this.start;
+    }
+
+    /**
+     * API name: {@code start_time}
+     */
+    @Nullable
+    public final String startTime() {
+        return this.startTime;
+    }
+
+    /**
+     * Required - API name: {@code start_time_in_millis}
+     */
+    public final String startTimeInMillis() {
+        return this.startTimeInMillis;
+    }
+
+    /**
+     * API name: {@code stop_time}
+     */
+    @Nullable
+    public final String stopTime() {
+        return this.stopTime;
+    }
+
+    /**
+     * Required - API name: {@code stop_time_in_millis}
+     */
+    public final String stopTimeInMillis() {
+        return this.stopTimeInMillis;
+    }
+
+    /**
+     * Required - API name: {@code target}
+     */
+    public final RecoveryOrigin target() {
+        return this.target;
+    }
+
+    /**
+     * API name: {@code total_time}
+     */
+    @Nullable
+    public final String totalTime() {
+        return this.totalTime;
+    }
+
+    /**
+     * Required - API name: {@code total_time_in_millis}
+     */
+    public final String totalTimeInMillis() {
+        return this.totalTimeInMillis;
+    }
+
+    /**
+     * Required - API name: {@code translog}
+     */
+    public final TranslogStatus translog() {
+        return this.translog;
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * Required - API name: {@code verify_index}
+     */
+    public final VerifyIndex verifyIndex() {
+        return this.verifyIndex;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("id");
+        generator.write(this.id);
+
+        generator.writeKey("index");
+        this.index.serialize(generator, mapper);
+
+        generator.writeKey("primary");
+        generator.write(this.primary);
+
+        generator.writeKey("source");
+        this.source.serialize(generator, mapper);
+
+        generator.writeKey("stage");
+        generator.write(this.stage);
+
+        if (this.start != null) {
+            generator.writeKey("start");
+            this.start.serialize(generator, mapper);
+
+        }
+        if (this.startTime != null) {
+            generator.writeKey("start_time");
+            generator.write(this.startTime);
 
-		}
-		generator.writeKey("start_time_in_millis");
-		generator.write(this.startTimeInMillis);
-
-		if (this.stopTime != null) {
-			generator.writeKey("stop_time");
-			generator.write(this.stopTime);
-
-		}
-		generator.writeKey("stop_time_in_millis");
-		generator.write(this.stopTimeInMillis);
-
-		generator.writeKey("target");
-		this.target.serialize(generator, mapper);
-
-		if (this.totalTime != null) {
-			generator.writeKey("total_time");
-			generator.write(this.totalTime);
-
-		}
-		generator.writeKey("total_time_in_millis");
-		generator.write(this.totalTimeInMillis);
-
-		generator.writeKey("translog");
-		this.translog.serialize(generator, mapper);
-
-		generator.writeKey("type");
-		generator.write(this.type);
-
-		generator.writeKey("verify_index");
-		this.verifyIndex.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardRecovery}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardRecovery> {
-		private Long id;
-
-		private RecoveryIndexStatus index;
-
-		private Boolean primary;
-
-		private RecoveryOrigin source;
-
-		private String stage;
-
-		@Nullable
-		private RecoveryStartStatus start;
-
-		@Nullable
-		private String startTime;
-
-		private String startTimeInMillis;
-
-		@Nullable
-		private String stopTime;
-
-		private String stopTimeInMillis;
-
-		private RecoveryOrigin target;
-
-		@Nullable
-		private String totalTime;
-
-		private String totalTimeInMillis;
-
-		private TranslogStatus translog;
-
-		private String type;
-
-		private VerifyIndex verifyIndex;
-
-		/**
-		 * Required - API name: {@code id}
-		 */
-		public final Builder id(long value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index}
-		 */
-		public final Builder index(RecoveryIndexStatus value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index}
-		 */
-		public final Builder index(Function<RecoveryIndexStatus.Builder, ObjectBuilder<RecoveryIndexStatus>> fn) {
-			return this.index(fn.apply(new RecoveryIndexStatus.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code primary}
-		 */
-		public final Builder primary(boolean value) {
-			this.primary = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code source}
-		 */
-		public final Builder source(RecoveryOrigin value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code source}
-		 */
-		public final Builder source(Function<RecoveryOrigin.Builder, ObjectBuilder<RecoveryOrigin>> fn) {
-			return this.source(fn.apply(new RecoveryOrigin.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code stage}
-		 */
-		public final Builder stage(String value) {
-			this.stage = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code start}
-		 */
-		public final Builder start(@Nullable RecoveryStartStatus value) {
-			this.start = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code start}
-		 */
-		public final Builder start(Function<RecoveryStartStatus.Builder, ObjectBuilder<RecoveryStartStatus>> fn) {
-			return this.start(fn.apply(new RecoveryStartStatus.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code start_time}
-		 */
-		public final Builder startTime(@Nullable String value) {
-			this.startTime = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code start_time_in_millis}
-		 */
-		public final Builder startTimeInMillis(String value) {
-			this.startTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code stop_time}
-		 */
-		public final Builder stopTime(@Nullable String value) {
-			this.stopTime = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code stop_time_in_millis}
-		 */
-		public final Builder stopTimeInMillis(String value) {
-			this.stopTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code target}
-		 */
-		public final Builder target(RecoveryOrigin value) {
-			this.target = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code target}
-		 */
-		public final Builder target(Function<RecoveryOrigin.Builder, ObjectBuilder<RecoveryOrigin>> fn) {
-			return this.target(fn.apply(new RecoveryOrigin.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code total_time}
-		 */
-		public final Builder totalTime(@Nullable String value) {
-			this.totalTime = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_time_in_millis}
-		 */
-		public final Builder totalTimeInMillis(String value) {
-			this.totalTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code translog}
-		 */
-		public final Builder translog(TranslogStatus value) {
-			this.translog = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code translog}
-		 */
-		public final Builder translog(Function<TranslogStatus.Builder, ObjectBuilder<TranslogStatus>> fn) {
-			return this.translog(fn.apply(new TranslogStatus.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code verify_index}
-		 */
-		public final Builder verifyIndex(VerifyIndex value) {
-			this.verifyIndex = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code verify_index}
-		 */
-		public final Builder verifyIndex(Function<VerifyIndex.Builder, ObjectBuilder<VerifyIndex>> fn) {
-			return this.verifyIndex(fn.apply(new VerifyIndex.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ShardRecovery}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardRecovery build() {
-			_checkSingleUse();
-
-			return new ShardRecovery(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardRecovery}
-	 */
-	public static final JsonpDeserializer<ShardRecovery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShardRecovery::setupShardRecoveryDeserializer);
-
-	protected static void setupShardRecoveryDeserializer(ObjectDeserializer<ShardRecovery.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.longDeserializer(), "id");
-		op.add(Builder::index, RecoveryIndexStatus._DESERIALIZER, "index");
-		op.add(Builder::primary, JsonpDeserializer.booleanDeserializer(), "primary");
-		op.add(Builder::source, RecoveryOrigin._DESERIALIZER, "source");
-		op.add(Builder::stage, JsonpDeserializer.stringDeserializer(), "stage");
-		op.add(Builder::start, RecoveryStartStatus._DESERIALIZER, "start");
-		op.add(Builder::startTime, JsonpDeserializer.stringDeserializer(), "start_time");
-		op.add(Builder::startTimeInMillis, JsonpDeserializer.stringDeserializer(), "start_time_in_millis");
-		op.add(Builder::stopTime, JsonpDeserializer.stringDeserializer(), "stop_time");
-		op.add(Builder::stopTimeInMillis, JsonpDeserializer.stringDeserializer(), "stop_time_in_millis");
-		op.add(Builder::target, RecoveryOrigin._DESERIALIZER, "target");
-		op.add(Builder::totalTime, JsonpDeserializer.stringDeserializer(), "total_time");
-		op.add(Builder::totalTimeInMillis, JsonpDeserializer.stringDeserializer(), "total_time_in_millis");
-		op.add(Builder::translog, TranslogStatus._DESERIALIZER, "translog");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-		op.add(Builder::verifyIndex, VerifyIndex._DESERIALIZER, "verify_index");
-
-	}
+        }
+        generator.writeKey("start_time_in_millis");
+        generator.write(this.startTimeInMillis);
+
+        if (this.stopTime != null) {
+            generator.writeKey("stop_time");
+            generator.write(this.stopTime);
+
+        }
+        generator.writeKey("stop_time_in_millis");
+        generator.write(this.stopTimeInMillis);
+
+        generator.writeKey("target");
+        this.target.serialize(generator, mapper);
+
+        if (this.totalTime != null) {
+            generator.writeKey("total_time");
+            generator.write(this.totalTime);
+
+        }
+        generator.writeKey("total_time_in_millis");
+        generator.write(this.totalTimeInMillis);
+
+        generator.writeKey("translog");
+        this.translog.serialize(generator, mapper);
+
+        generator.writeKey("type");
+        generator.write(this.type);
+
+        generator.writeKey("verify_index");
+        this.verifyIndex.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardRecovery}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardRecovery> {
+        private Long id;
+
+        private RecoveryIndexStatus index;
+
+        private Boolean primary;
+
+        private RecoveryOrigin source;
+
+        private String stage;
+
+        @Nullable
+        private RecoveryStartStatus start;
+
+        @Nullable
+        private String startTime;
+
+        private String startTimeInMillis;
+
+        @Nullable
+        private String stopTime;
+
+        private String stopTimeInMillis;
+
+        private RecoveryOrigin target;
+
+        @Nullable
+        private String totalTime;
+
+        private String totalTimeInMillis;
+
+        private TranslogStatus translog;
+
+        private String type;
+
+        private VerifyIndex verifyIndex;
+
+        /**
+         * Required - API name: {@code id}
+         */
+        public final Builder id(long value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index}
+         */
+        public final Builder index(RecoveryIndexStatus value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index}
+         */
+        public final Builder index(Function<RecoveryIndexStatus.Builder, ObjectBuilder<RecoveryIndexStatus>> fn) {
+            return this.index(fn.apply(new RecoveryIndexStatus.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code primary}
+         */
+        public final Builder primary(boolean value) {
+            this.primary = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code source}
+         */
+        public final Builder source(RecoveryOrigin value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code source}
+         */
+        public final Builder source(Function<RecoveryOrigin.Builder, ObjectBuilder<RecoveryOrigin>> fn) {
+            return this.source(fn.apply(new RecoveryOrigin.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code stage}
+         */
+        public final Builder stage(String value) {
+            this.stage = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code start}
+         */
+        public final Builder start(@Nullable RecoveryStartStatus value) {
+            this.start = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code start}
+         */
+        public final Builder start(Function<RecoveryStartStatus.Builder, ObjectBuilder<RecoveryStartStatus>> fn) {
+            return this.start(fn.apply(new RecoveryStartStatus.Builder()).build());
+        }
+
+        /**
+         * API name: {@code start_time}
+         */
+        public final Builder startTime(@Nullable String value) {
+            this.startTime = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code start_time_in_millis}
+         */
+        public final Builder startTimeInMillis(String value) {
+            this.startTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code stop_time}
+         */
+        public final Builder stopTime(@Nullable String value) {
+            this.stopTime = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code stop_time_in_millis}
+         */
+        public final Builder stopTimeInMillis(String value) {
+            this.stopTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code target}
+         */
+        public final Builder target(RecoveryOrigin value) {
+            this.target = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code target}
+         */
+        public final Builder target(Function<RecoveryOrigin.Builder, ObjectBuilder<RecoveryOrigin>> fn) {
+            return this.target(fn.apply(new RecoveryOrigin.Builder()).build());
+        }
+
+        /**
+         * API name: {@code total_time}
+         */
+        public final Builder totalTime(@Nullable String value) {
+            this.totalTime = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_time_in_millis}
+         */
+        public final Builder totalTimeInMillis(String value) {
+            this.totalTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code translog}
+         */
+        public final Builder translog(TranslogStatus value) {
+            this.translog = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code translog}
+         */
+        public final Builder translog(Function<TranslogStatus.Builder, ObjectBuilder<TranslogStatus>> fn) {
+            return this.translog(fn.apply(new TranslogStatus.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code verify_index}
+         */
+        public final Builder verifyIndex(VerifyIndex value) {
+            this.verifyIndex = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code verify_index}
+         */
+        public final Builder verifyIndex(Function<VerifyIndex.Builder, ObjectBuilder<VerifyIndex>> fn) {
+            return this.verifyIndex(fn.apply(new VerifyIndex.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ShardRecovery}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardRecovery build() {
+            _checkSingleUse();
+
+            return new ShardRecovery(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardRecovery}
+     */
+    public static final JsonpDeserializer<ShardRecovery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardRecovery::setupShardRecoveryDeserializer
+    );
+
+    protected static void setupShardRecoveryDeserializer(ObjectDeserializer<ShardRecovery.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.longDeserializer(), "id");
+        op.add(Builder::index, RecoveryIndexStatus._DESERIALIZER, "index");
+        op.add(Builder::primary, JsonpDeserializer.booleanDeserializer(), "primary");
+        op.add(Builder::source, RecoveryOrigin._DESERIALIZER, "source");
+        op.add(Builder::stage, JsonpDeserializer.stringDeserializer(), "stage");
+        op.add(Builder::start, RecoveryStartStatus._DESERIALIZER, "start");
+        op.add(Builder::startTime, JsonpDeserializer.stringDeserializer(), "start_time");
+        op.add(Builder::startTimeInMillis, JsonpDeserializer.stringDeserializer(), "start_time_in_millis");
+        op.add(Builder::stopTime, JsonpDeserializer.stringDeserializer(), "stop_time");
+        op.add(Builder::stopTimeInMillis, JsonpDeserializer.stringDeserializer(), "stop_time_in_millis");
+        op.add(Builder::target, RecoveryOrigin._DESERIALIZER, "target");
+        op.add(Builder::totalTime, JsonpDeserializer.stringDeserializer(), "total_time");
+        op.add(Builder::totalTimeInMillis, JsonpDeserializer.stringDeserializer(), "total_time_in_millis");
+        op.add(Builder::translog, TranslogStatus._DESERIALIZER, "translog");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+        op.add(Builder::verifyIndex, VerifyIndex._DESERIALIZER, "verify_index");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/TranslogStatus.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/TranslogStatus.java
index 92c29ff6c1..5254bfab24 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/TranslogStatus.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/TranslogStatus.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.recovery;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,219 +44,217 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.recovery.TranslogStatus
 
-
 @JsonpDeserializable
 public class TranslogStatus implements JsonpSerializable {
-	private final String percent;
-
-	private final long recovered;
-
-	private final long total;
+    private final String percent;
+
+    private final long recovered;
+
+    private final long total;
 
-	private final long totalOnStart;
+    private final long totalOnStart;
 
-	@Nullable
-	private final String totalTime;
+    @Nullable
+    private final String totalTime;
 
-	private final String totalTimeInMillis;
+    private final String totalTimeInMillis;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private TranslogStatus(Builder builder) {
+    private TranslogStatus(Builder builder) {
 
-		this.percent = ApiTypeHelper.requireNonNull(builder.percent, this, "percent");
-		this.recovered = ApiTypeHelper.requireNonNull(builder.recovered, this, "recovered");
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
-		this.totalOnStart = ApiTypeHelper.requireNonNull(builder.totalOnStart, this, "totalOnStart");
-		this.totalTime = builder.totalTime;
-		this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
+        this.percent = ApiTypeHelper.requireNonNull(builder.percent, this, "percent");
+        this.recovered = ApiTypeHelper.requireNonNull(builder.recovered, this, "recovered");
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+        this.totalOnStart = ApiTypeHelper.requireNonNull(builder.totalOnStart, this, "totalOnStart");
+        this.totalTime = builder.totalTime;
+        this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
 
-	}
+    }
 
-	public static TranslogStatus of(Function<Builder, ObjectBuilder<TranslogStatus>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static TranslogStatus of(Function<Builder, ObjectBuilder<TranslogStatus>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code percent}
-	 */
-	public final String percent() {
-		return this.percent;
-	}
+    /**
+     * Required - API name: {@code percent}
+     */
+    public final String percent() {
+        return this.percent;
+    }
 
-	/**
-	 * Required - API name: {@code recovered}
-	 */
-	public final long recovered() {
-		return this.recovered;
-	}
+    /**
+     * Required - API name: {@code recovered}
+     */
+    public final long recovered() {
+        return this.recovered;
+    }
 
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final long total() {
-		return this.total;
-	}
+    /**
+     * Required - API name: {@code total}
+     */
+    public final long total() {
+        return this.total;
+    }
 
-	/**
-	 * Required - API name: {@code total_on_start}
-	 */
-	public final long totalOnStart() {
-		return this.totalOnStart;
-	}
-
-	/**
-	 * API name: {@code total_time}
-	 */
-	@Nullable
-	public final String totalTime() {
-		return this.totalTime;
-	}
-
-	/**
-	 * Required - API name: {@code total_time_in_millis}
-	 */
-	public final String totalTimeInMillis() {
-		return this.totalTimeInMillis;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("percent");
-		generator.write(this.percent);
-
-		generator.writeKey("recovered");
-		generator.write(this.recovered);
-
-		generator.writeKey("total");
-		generator.write(this.total);
-
-		generator.writeKey("total_on_start");
-		generator.write(this.totalOnStart);
-
-		if (this.totalTime != null) {
-			generator.writeKey("total_time");
-			generator.write(this.totalTime);
-
-		}
-		generator.writeKey("total_time_in_millis");
-		generator.write(this.totalTimeInMillis);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TranslogStatus}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TranslogStatus> {
-		private String percent;
-
-		private Long recovered;
-
-		private Long total;
-
-		private Long totalOnStart;
-
-		@Nullable
-		private String totalTime;
-
-		private String totalTimeInMillis;
-
-		/**
-		 * Required - API name: {@code percent}
-		 */
-		public final Builder percent(String value) {
-			this.percent = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code recovered}
-		 */
-		public final Builder recovered(long value) {
-			this.recovered = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(long value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_on_start}
-		 */
-		public final Builder totalOnStart(long value) {
-			this.totalOnStart = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total_time}
-		 */
-		public final Builder totalTime(@Nullable String value) {
-			this.totalTime = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_time_in_millis}
-		 */
-		public final Builder totalTimeInMillis(String value) {
-			this.totalTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TranslogStatus}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TranslogStatus build() {
-			_checkSingleUse();
-
-			return new TranslogStatus(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TranslogStatus}
-	 */
-	public static final JsonpDeserializer<TranslogStatus> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TranslogStatus::setupTranslogStatusDeserializer);
-
-	protected static void setupTranslogStatusDeserializer(ObjectDeserializer<TranslogStatus.Builder> op) {
-
-		op.add(Builder::percent, JsonpDeserializer.stringDeserializer(), "percent");
-		op.add(Builder::recovered, JsonpDeserializer.longDeserializer(), "recovered");
-		op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
-		op.add(Builder::totalOnStart, JsonpDeserializer.longDeserializer(), "total_on_start");
-		op.add(Builder::totalTime, JsonpDeserializer.stringDeserializer(), "total_time");
-		op.add(Builder::totalTimeInMillis, JsonpDeserializer.stringDeserializer(), "total_time_in_millis");
-
-	}
+    /**
+     * Required - API name: {@code total_on_start}
+     */
+    public final long totalOnStart() {
+        return this.totalOnStart;
+    }
+
+    /**
+     * API name: {@code total_time}
+     */
+    @Nullable
+    public final String totalTime() {
+        return this.totalTime;
+    }
+
+    /**
+     * Required - API name: {@code total_time_in_millis}
+     */
+    public final String totalTimeInMillis() {
+        return this.totalTimeInMillis;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("percent");
+        generator.write(this.percent);
+
+        generator.writeKey("recovered");
+        generator.write(this.recovered);
+
+        generator.writeKey("total");
+        generator.write(this.total);
+
+        generator.writeKey("total_on_start");
+        generator.write(this.totalOnStart);
+
+        if (this.totalTime != null) {
+            generator.writeKey("total_time");
+            generator.write(this.totalTime);
+
+        }
+        generator.writeKey("total_time_in_millis");
+        generator.write(this.totalTimeInMillis);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TranslogStatus}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TranslogStatus> {
+        private String percent;
+
+        private Long recovered;
+
+        private Long total;
+
+        private Long totalOnStart;
+
+        @Nullable
+        private String totalTime;
+
+        private String totalTimeInMillis;
+
+        /**
+         * Required - API name: {@code percent}
+         */
+        public final Builder percent(String value) {
+            this.percent = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code recovered}
+         */
+        public final Builder recovered(long value) {
+            this.recovered = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(long value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_on_start}
+         */
+        public final Builder totalOnStart(long value) {
+            this.totalOnStart = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total_time}
+         */
+        public final Builder totalTime(@Nullable String value) {
+            this.totalTime = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_time_in_millis}
+         */
+        public final Builder totalTimeInMillis(String value) {
+            this.totalTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link TranslogStatus}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TranslogStatus build() {
+            _checkSingleUse();
+
+            return new TranslogStatus(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TranslogStatus}
+     */
+    public static final JsonpDeserializer<TranslogStatus> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TranslogStatus::setupTranslogStatusDeserializer
+    );
+
+    protected static void setupTranslogStatusDeserializer(ObjectDeserializer<TranslogStatus.Builder> op) {
+
+        op.add(Builder::percent, JsonpDeserializer.stringDeserializer(), "percent");
+        op.add(Builder::recovered, JsonpDeserializer.longDeserializer(), "recovered");
+        op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
+        op.add(Builder::totalOnStart, JsonpDeserializer.longDeserializer(), "total_on_start");
+        op.add(Builder::totalTime, JsonpDeserializer.stringDeserializer(), "total_time");
+        op.add(Builder::totalTimeInMillis, JsonpDeserializer.stringDeserializer(), "total_time_in_millis");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/VerifyIndex.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/VerifyIndex.java
index 52040418b6..9b1377ae64 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/VerifyIndex.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/recovery/VerifyIndex.java
@@ -32,201 +32,201 @@
 
 package org.opensearch.client.opensearch.indices.recovery;
 
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Time;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.recovery.VerifyIndex
 
-
 @JsonpDeserializable
 public class VerifyIndex implements JsonpSerializable {
-	@Nullable
-	private final Time checkIndexTime;
+    @Nullable
+    private final Time checkIndexTime;
 
-	private final String checkIndexTimeInMillis;
+    private final String checkIndexTimeInMillis;
 
-	@Nullable
-	private final Time totalTime;
-
-	private final String totalTimeInMillis;
+    @Nullable
+    private final Time totalTime;
+
+    private final String totalTimeInMillis;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private VerifyIndex(Builder builder) {
-
-		this.checkIndexTime = builder.checkIndexTime;
-		this.checkIndexTimeInMillis = ApiTypeHelper.requireNonNull(builder.checkIndexTimeInMillis, this,
-				"checkIndexTimeInMillis");
-		this.totalTime = builder.totalTime;
-		this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
-
-	}
-
-	public static VerifyIndex of(Function<Builder, ObjectBuilder<VerifyIndex>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code check_index_time}
-	 */
-	@Nullable
-	public final Time checkIndexTime() {
-		return this.checkIndexTime;
-	}
-
-	/**
-	 * Required - API name: {@code check_index_time_in_millis}
-	 */
-	public final String checkIndexTimeInMillis() {
-		return this.checkIndexTimeInMillis;
-	}
-
-	/**
-	 * API name: {@code total_time}
-	 */
-	@Nullable
-	public final Time totalTime() {
-		return this.totalTime;
-	}
-
-	/**
-	 * Required - API name: {@code total_time_in_millis}
-	 */
-	public final String totalTimeInMillis() {
-		return this.totalTimeInMillis;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.checkIndexTime != null) {
-			generator.writeKey("check_index_time");
-			this.checkIndexTime.serialize(generator, mapper);
-
-		}
-		generator.writeKey("check_index_time_in_millis");
-		generator.write(this.checkIndexTimeInMillis);
-
-		if (this.totalTime != null) {
-			generator.writeKey("total_time");
-			this.totalTime.serialize(generator, mapper);
-
-		}
-		generator.writeKey("total_time_in_millis");
-		generator.write(this.totalTimeInMillis);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link VerifyIndex}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<VerifyIndex> {
-		@Nullable
-		private Time checkIndexTime;
-
-		private String checkIndexTimeInMillis;
-
-		@Nullable
-		private Time totalTime;
-
-		private String totalTimeInMillis;
-
-		/**
-		 * API name: {@code check_index_time}
-		 */
-		public final Builder checkIndexTime(@Nullable Time value) {
-			this.checkIndexTime = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code check_index_time}
-		 */
-		public final Builder checkIndexTime(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.checkIndexTime(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code check_index_time_in_millis}
-		 */
-		public final Builder checkIndexTimeInMillis(String value) {
-			this.checkIndexTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total_time}
-		 */
-		public final Builder totalTime(@Nullable Time value) {
-			this.totalTime = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total_time}
-		 */
-		public final Builder totalTime(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.totalTime(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code total_time_in_millis}
-		 */
-		public final Builder totalTimeInMillis(String value) {
-			this.totalTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link VerifyIndex}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public VerifyIndex build() {
-			_checkSingleUse();
-
-			return new VerifyIndex(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link VerifyIndex}
-	 */
-	public static final JsonpDeserializer<VerifyIndex> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			VerifyIndex::setupVerifyIndexDeserializer);
-
-	protected static void setupVerifyIndexDeserializer(ObjectDeserializer<VerifyIndex.Builder> op) {
-
-		op.add(Builder::checkIndexTime, Time._DESERIALIZER, "check_index_time");
-		op.add(Builder::checkIndexTimeInMillis, JsonpDeserializer.stringDeserializer(), "check_index_time_in_millis");
-		op.add(Builder::totalTime, Time._DESERIALIZER, "total_time");
-		op.add(Builder::totalTimeInMillis, JsonpDeserializer.stringDeserializer(), "total_time_in_millis");
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private VerifyIndex(Builder builder) {
+
+        this.checkIndexTime = builder.checkIndexTime;
+        this.checkIndexTimeInMillis = ApiTypeHelper.requireNonNull(builder.checkIndexTimeInMillis, this, "checkIndexTimeInMillis");
+        this.totalTime = builder.totalTime;
+        this.totalTimeInMillis = ApiTypeHelper.requireNonNull(builder.totalTimeInMillis, this, "totalTimeInMillis");
+
+    }
+
+    public static VerifyIndex of(Function<Builder, ObjectBuilder<VerifyIndex>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code check_index_time}
+     */
+    @Nullable
+    public final Time checkIndexTime() {
+        return this.checkIndexTime;
+    }
+
+    /**
+     * Required - API name: {@code check_index_time_in_millis}
+     */
+    public final String checkIndexTimeInMillis() {
+        return this.checkIndexTimeInMillis;
+    }
+
+    /**
+     * API name: {@code total_time}
+     */
+    @Nullable
+    public final Time totalTime() {
+        return this.totalTime;
+    }
+
+    /**
+     * Required - API name: {@code total_time_in_millis}
+     */
+    public final String totalTimeInMillis() {
+        return this.totalTimeInMillis;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.checkIndexTime != null) {
+            generator.writeKey("check_index_time");
+            this.checkIndexTime.serialize(generator, mapper);
+
+        }
+        generator.writeKey("check_index_time_in_millis");
+        generator.write(this.checkIndexTimeInMillis);
+
+        if (this.totalTime != null) {
+            generator.writeKey("total_time");
+            this.totalTime.serialize(generator, mapper);
+
+        }
+        generator.writeKey("total_time_in_millis");
+        generator.write(this.totalTimeInMillis);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link VerifyIndex}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<VerifyIndex> {
+        @Nullable
+        private Time checkIndexTime;
+
+        private String checkIndexTimeInMillis;
+
+        @Nullable
+        private Time totalTime;
+
+        private String totalTimeInMillis;
+
+        /**
+         * API name: {@code check_index_time}
+         */
+        public final Builder checkIndexTime(@Nullable Time value) {
+            this.checkIndexTime = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code check_index_time}
+         */
+        public final Builder checkIndexTime(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.checkIndexTime(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code check_index_time_in_millis}
+         */
+        public final Builder checkIndexTimeInMillis(String value) {
+            this.checkIndexTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total_time}
+         */
+        public final Builder totalTime(@Nullable Time value) {
+            this.totalTime = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total_time}
+         */
+        public final Builder totalTime(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.totalTime(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code total_time_in_millis}
+         */
+        public final Builder totalTimeInMillis(String value) {
+            this.totalTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link VerifyIndex}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public VerifyIndex build() {
+            _checkSingleUse();
+
+            return new VerifyIndex(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link VerifyIndex}
+     */
+    public static final JsonpDeserializer<VerifyIndex> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        VerifyIndex::setupVerifyIndexDeserializer
+    );
+
+    protected static void setupVerifyIndexDeserializer(ObjectDeserializer<VerifyIndex.Builder> op) {
+
+        op.add(Builder::checkIndexTime, Time._DESERIALIZER, "check_index_time");
+        op.add(Builder::checkIndexTimeInMillis, JsonpDeserializer.stringDeserializer(), "check_index_time_in_millis");
+        op.add(Builder::totalTime, Time._DESERIALIZER, "total_time");
+        op.add(Builder::totalTimeInMillis, JsonpDeserializer.stringDeserializer(), "total_time_in_millis");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/resolve_index/ResolveIndexAliasItem.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/resolve_index/ResolveIndexAliasItem.java
index 149469e065..c89f84781d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/resolve_index/ResolveIndexAliasItem.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/resolve_index/ResolveIndexAliasItem.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.resolve_index;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,138 +44,136 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: indices.resolve_index.ResolveIndexAliasItem
 
 @JsonpDeserializable
 public class ResolveIndexAliasItem implements JsonpSerializable {
-	private final String name;
-
-	private final List<String> indices;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ResolveIndexAliasItem(Builder builder) {
-
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
-
-	}
-
-	public static ResolveIndexAliasItem of(Function<Builder, ObjectBuilder<ResolveIndexAliasItem>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Required - API name: {@code indices}
-	 */
-	public final List<String> indices() {
-		return this.indices;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartArray();
-			for (String item0 : this.indices) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ResolveIndexAliasItem}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ResolveIndexAliasItem> {
-		private String name;
-
-		private List<String> indices;
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indices</code>.
-		 */
-		public final Builder indices(List<String> list) {
-			this.indices = _listAddAll(this.indices, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds one or more values to <code>indices</code>.
-		 */
-		public final Builder indices(String value, String... values) {
-			this.indices = _listAdd(this.indices, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ResolveIndexAliasItem}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ResolveIndexAliasItem build() {
-			_checkSingleUse();
-
-			return new ResolveIndexAliasItem(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ResolveIndexAliasItem}
-	 */
-	public static final JsonpDeserializer<ResolveIndexAliasItem> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ResolveIndexAliasItem::setupResolveIndexAliasItemDeserializer);
-
-	protected static void setupResolveIndexAliasItemDeserializer(ObjectDeserializer<ResolveIndexAliasItem.Builder> op) {
-
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"indices");
-
-	}
+    private final String name;
+
+    private final List<String> indices;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ResolveIndexAliasItem(Builder builder) {
+
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
+
+    }
+
+    public static ResolveIndexAliasItem of(Function<Builder, ObjectBuilder<ResolveIndexAliasItem>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Required - API name: {@code indices}
+     */
+    public final List<String> indices() {
+        return this.indices;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartArray();
+            for (String item0 : this.indices) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ResolveIndexAliasItem}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ResolveIndexAliasItem> {
+        private String name;
+
+        private List<String> indices;
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indices</code>.
+         */
+        public final Builder indices(List<String> list) {
+            this.indices = _listAddAll(this.indices, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds one or more values to <code>indices</code>.
+         */
+        public final Builder indices(String value, String... values) {
+            this.indices = _listAdd(this.indices, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link ResolveIndexAliasItem}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ResolveIndexAliasItem build() {
+            _checkSingleUse();
+
+            return new ResolveIndexAliasItem(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ResolveIndexAliasItem}
+     */
+    public static final JsonpDeserializer<ResolveIndexAliasItem> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ResolveIndexAliasItem::setupResolveIndexAliasItemDeserializer
+    );
+
+    protected static void setupResolveIndexAliasItemDeserializer(ObjectDeserializer<ResolveIndexAliasItem.Builder> op) {
+
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "indices");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/resolve_index/ResolveIndexItem.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/resolve_index/ResolveIndexItem.java
index 0063b0979e..29330d36d2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/resolve_index/ResolveIndexItem.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/resolve_index/ResolveIndexItem.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.indices.resolve_index;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,213 +45,209 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.resolve_index.ResolveIndexItem
 
 @JsonpDeserializable
 public class ResolveIndexItem implements JsonpSerializable {
-	private final String name;
+    private final String name;
 
-	private final List<String> aliases;
+    private final List<String> aliases;
 
-	private final List<String> attributes;
+    private final List<String> attributes;
 
-	@Nullable
-	private final String dataStream;
+    @Nullable
+    private final String dataStream;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ResolveIndexItem(Builder builder) {
+    private ResolveIndexItem(Builder builder) {
 
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
-		this.attributes = ApiTypeHelper.unmodifiableRequired(builder.attributes, this, "attributes");
-		this.dataStream = builder.dataStream;
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
+        this.attributes = ApiTypeHelper.unmodifiableRequired(builder.attributes, this, "attributes");
+        this.dataStream = builder.dataStream;
 
-	}
+    }
 
-	public static ResolveIndexItem of(Function<Builder, ObjectBuilder<ResolveIndexItem>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * API name: {@code aliases}
-	 */
-	public final List<String> aliases() {
-		return this.aliases;
-	}
-
-	/**
-	 * Required - API name: {@code attributes}
-	 */
-	public final List<String> attributes() {
-		return this.attributes;
-	}
-
-	/**
-	 * API name: {@code data_stream}
-	 */
-	@Nullable
-	public final String dataStream() {
-		return this.dataStream;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		if (ApiTypeHelper.isDefined(this.aliases)) {
-			generator.writeKey("aliases");
-			generator.writeStartArray();
-			for (String item0 : this.aliases) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.attributes)) {
-			generator.writeKey("attributes");
-			generator.writeStartArray();
-			for (String item0 : this.attributes) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.dataStream != null) {
-			generator.writeKey("data_stream");
-			generator.write(this.dataStream);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ResolveIndexItem}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ResolveIndexItem> {
-		private String name;
-
-		@Nullable
-		private List<String> aliases;
-
-		private List<String> attributes;
-
-		@Nullable
-		private String dataStream;
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>aliases</code>.
-		 */
-		public final Builder aliases(List<String> list) {
-			this.aliases = _listAddAll(this.aliases, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds one or more values to <code>aliases</code>.
-		 */
-		public final Builder aliases(String value, String... values) {
-			this.aliases = _listAdd(this.aliases, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code attributes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>attributes</code>.
-		 */
-		public final Builder attributes(List<String> list) {
-			this.attributes = _listAddAll(this.attributes, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code attributes}
-		 * <p>
-		 * Adds one or more values to <code>attributes</code>.
-		 */
-		public final Builder attributes(String value, String... values) {
-			this.attributes = _listAdd(this.attributes, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code data_stream}
-		 */
-		public final Builder dataStream(@Nullable String value) {
-			this.dataStream = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ResolveIndexItem}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ResolveIndexItem build() {
-			_checkSingleUse();
-
-			return new ResolveIndexItem(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ResolveIndexItem}
-	 */
-	public static final JsonpDeserializer<ResolveIndexItem> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ResolveIndexItem::setupResolveIndexItemDeserializer);
-
-	protected static void setupResolveIndexItemDeserializer(ObjectDeserializer<ResolveIndexItem.Builder> op) {
-
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::aliases, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"aliases");
-		op.add(Builder::attributes, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"attributes");
-		op.add(Builder::dataStream, JsonpDeserializer.stringDeserializer(), "data_stream");
-
-	}
+    public static ResolveIndexItem of(Function<Builder, ObjectBuilder<ResolveIndexItem>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * API name: {@code aliases}
+     */
+    public final List<String> aliases() {
+        return this.aliases;
+    }
+
+    /**
+     * Required - API name: {@code attributes}
+     */
+    public final List<String> attributes() {
+        return this.attributes;
+    }
+
+    /**
+     * API name: {@code data_stream}
+     */
+    @Nullable
+    public final String dataStream() {
+        return this.dataStream;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        if (ApiTypeHelper.isDefined(this.aliases)) {
+            generator.writeKey("aliases");
+            generator.writeStartArray();
+            for (String item0 : this.aliases) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.attributes)) {
+            generator.writeKey("attributes");
+            generator.writeStartArray();
+            for (String item0 : this.attributes) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.dataStream != null) {
+            generator.writeKey("data_stream");
+            generator.write(this.dataStream);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ResolveIndexItem}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ResolveIndexItem> {
+        private String name;
+
+        @Nullable
+        private List<String> aliases;
+
+        private List<String> attributes;
+
+        @Nullable
+        private String dataStream;
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>aliases</code>.
+         */
+        public final Builder aliases(List<String> list) {
+            this.aliases = _listAddAll(this.aliases, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds one or more values to <code>aliases</code>.
+         */
+        public final Builder aliases(String value, String... values) {
+            this.aliases = _listAdd(this.aliases, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code attributes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>attributes</code>.
+         */
+        public final Builder attributes(List<String> list) {
+            this.attributes = _listAddAll(this.attributes, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code attributes}
+         * <p>
+         * Adds one or more values to <code>attributes</code>.
+         */
+        public final Builder attributes(String value, String... values) {
+            this.attributes = _listAdd(this.attributes, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code data_stream}
+         */
+        public final Builder dataStream(@Nullable String value) {
+            this.dataStream = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ResolveIndexItem}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ResolveIndexItem build() {
+            _checkSingleUse();
+
+            return new ResolveIndexItem(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ResolveIndexItem}
+     */
+    public static final JsonpDeserializer<ResolveIndexItem> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ResolveIndexItem::setupResolveIndexItemDeserializer
+    );
+
+    protected static void setupResolveIndexItemDeserializer(ObjectDeserializer<ResolveIndexItem.Builder> op) {
+
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::aliases, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "aliases");
+        op.add(Builder::attributes, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "attributes");
+        op.add(Builder::dataStream, JsonpDeserializer.stringDeserializer(), "data_stream");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/rollover/IndexRolloverMapping.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/rollover/IndexRolloverMapping.java
index 65fe1b7e92..0869f58eaf 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/rollover/IndexRolloverMapping.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/rollover/IndexRolloverMapping.java
@@ -32,150 +32,151 @@
 
 package org.opensearch.client.opensearch.indices.rollover;
 
-import org.opensearch.client.opensearch._types.mapping.TypeMapping;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.UnionDeserializer;
+import org.opensearch.client.opensearch._types.mapping.TypeMapping;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: indices.rollover.IndexRolloverMapping
 
-
 @JsonpDeserializable
 public class IndexRolloverMapping implements TaggedUnion<IndexRolloverMapping.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		ByType, Single
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private IndexRolloverMapping(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	private IndexRolloverMapping(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static IndexRolloverMapping of(Function<Builder, ObjectBuilder<IndexRolloverMapping>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code by_type}?
-	 */
-	public boolean isByType() {
-		return _kind == Kind.ByType;
-	}
-
-	/**
-	 * Get the {@code by_type} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code by_type} kind.
-	 */
-	public Map<String, TypeMapping> byType() {
-		return TaggedUnionUtils.get(this, Kind.ByType);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code single}?
-	 */
-	public boolean isSingle() {
-		return _kind == Kind.Single;
-	}
-
-	/**
-	 * Get the {@code single} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code single} kind.
-	 */
-	public TypeMapping single() {
-		return TaggedUnionUtils.get(this, Kind.Single);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case ByType :
-					generator.writeStartObject();
-					for (Map.Entry<String, TypeMapping> item0 : ((Map<String, TypeMapping>) this._value).entrySet()) {
-						generator.writeKey(item0.getKey());
-						item0.getValue().serialize(generator, mapper);
-
-					}
-					generator.writeEnd();
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexRolloverMapping> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<IndexRolloverMapping> byType(Map<String, TypeMapping> v) {
-			this._kind = Kind.ByType;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<IndexRolloverMapping> single(TypeMapping v) {
-			this._kind = Kind.Single;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<IndexRolloverMapping> single(
-				Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
-			return this.single(fn.apply(new TypeMapping.Builder()).build());
-		}
-
-		public IndexRolloverMapping build() {
-			_checkSingleUse();
-			return new IndexRolloverMapping(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<IndexRolloverMapping> buildIndexRolloverMappingDeserializer() {
-		return new UnionDeserializer.Builder<IndexRolloverMapping, Kind, Object>(IndexRolloverMapping::new, false)
-				.addMember(Kind.ByType, JsonpDeserializer.stringMapDeserializer(TypeMapping._DESERIALIZER))
-				.addMember(Kind.Single, TypeMapping._DESERIALIZER).build();
-	}
-
-	public static final JsonpDeserializer<IndexRolloverMapping> _DESERIALIZER = JsonpDeserializer
-			.lazy(IndexRolloverMapping::buildIndexRolloverMappingDeserializer);
+    public enum Kind {
+        ByType,
+        Single
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private IndexRolloverMapping(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private IndexRolloverMapping(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static IndexRolloverMapping of(Function<Builder, ObjectBuilder<IndexRolloverMapping>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code by_type}?
+     */
+    public boolean isByType() {
+        return _kind == Kind.ByType;
+    }
+
+    /**
+     * Get the {@code by_type} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code by_type} kind.
+     */
+    public Map<String, TypeMapping> byType() {
+        return TaggedUnionUtils.get(this, Kind.ByType);
+    }
+
+    /**
+     * Is this variant instance of kind {@code single}?
+     */
+    public boolean isSingle() {
+        return _kind == Kind.Single;
+    }
+
+    /**
+     * Get the {@code single} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code single} kind.
+     */
+    public TypeMapping single() {
+        return TaggedUnionUtils.get(this, Kind.Single);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case ByType:
+                    generator.writeStartObject();
+                    for (Map.Entry<String, TypeMapping> item0 : ((Map<String, TypeMapping>) this._value).entrySet()) {
+                        generator.writeKey(item0.getKey());
+                        item0.getValue().serialize(generator, mapper);
+
+                    }
+                    generator.writeEnd();
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexRolloverMapping> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<IndexRolloverMapping> byType(Map<String, TypeMapping> v) {
+            this._kind = Kind.ByType;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<IndexRolloverMapping> single(TypeMapping v) {
+            this._kind = Kind.Single;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<IndexRolloverMapping> single(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
+            return this.single(fn.apply(new TypeMapping.Builder()).build());
+        }
+
+        public IndexRolloverMapping build() {
+            _checkSingleUse();
+            return new IndexRolloverMapping(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<IndexRolloverMapping> buildIndexRolloverMappingDeserializer() {
+        return new UnionDeserializer.Builder<IndexRolloverMapping, Kind, Object>(IndexRolloverMapping::new, false).addMember(
+            Kind.ByType,
+            JsonpDeserializer.stringMapDeserializer(TypeMapping._DESERIALIZER)
+        ).addMember(Kind.Single, TypeMapping._DESERIALIZER).build();
+    }
+
+    public static final JsonpDeserializer<IndexRolloverMapping> _DESERIALIZER = JsonpDeserializer.lazy(
+        IndexRolloverMapping::buildIndexRolloverMappingDeserializer
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/rollover/IndexRolloverMappingBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/rollover/IndexRolloverMappingBuilders.java
index 85ee1fa0dc..aafd1149b2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/rollover/IndexRolloverMappingBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/rollover/IndexRolloverMappingBuilders.java
@@ -39,18 +39,17 @@
  * <p>
  * Variants <code>by_type</code> are not available here as they don't have a
  * dedicated class. Use {@link IndexRolloverMapping}'s builder for these.
- * 
+ *
  */
 public class IndexRolloverMappingBuilders {
-	private IndexRolloverMappingBuilders() {
-	}
+    private IndexRolloverMappingBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link TypeMapping single}
-	 * {@code IndexRolloverMapping} variant.
-	 */
-	public static TypeMapping.Builder single() {
-		return new TypeMapping.Builder();
-	}
+    /**
+     * Creates a builder for the {@link TypeMapping single}
+     * {@code IndexRolloverMapping} variant.
+     */
+    public static TypeMapping.Builder single() {
+        return new TypeMapping.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/rollover/RolloverConditions.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/rollover/RolloverConditions.java
index 42608fcee1..8f87f783d7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/rollover/RolloverConditions.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/rollover/RolloverConditions.java
@@ -32,203 +32,204 @@
 
 package org.opensearch.client.opensearch.indices.rollover;
 
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Time;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.rollover.RolloverConditions
 
-
 @JsonpDeserializable
 public class RolloverConditions implements JsonpSerializable {
-	@Nullable
-	private final Time maxAge;
-
-	@Nullable
-	private final Long maxDocs;
-
-	@Nullable
-	private final String maxSize;
-
-	@Nullable
-	private final String maxPrimaryShardSize;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RolloverConditions(Builder builder) {
-
-		this.maxAge = builder.maxAge;
-		this.maxDocs = builder.maxDocs;
-		this.maxSize = builder.maxSize;
-		this.maxPrimaryShardSize = builder.maxPrimaryShardSize;
-
-	}
-
-	public static RolloverConditions of(Function<Builder, ObjectBuilder<RolloverConditions>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code max_age}
-	 */
-	@Nullable
-	public final Time maxAge() {
-		return this.maxAge;
-	}
-
-	/**
-	 * API name: {@code max_docs}
-	 */
-	@Nullable
-	public final Long maxDocs() {
-		return this.maxDocs;
-	}
-
-	/**
-	 * API name: {@code max_size}
-	 */
-	@Nullable
-	public final String maxSize() {
-		return this.maxSize;
-	}
-
-	/**
-	 * API name: {@code max_primary_shard_size}
-	 */
-	@Nullable
-	public final String maxPrimaryShardSize() {
-		return this.maxPrimaryShardSize;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.maxAge != null) {
-			generator.writeKey("max_age");
-			this.maxAge.serialize(generator, mapper);
-
-		}
-		if (this.maxDocs != null) {
-			generator.writeKey("max_docs");
-			generator.write(this.maxDocs);
-
-		}
-		if (this.maxSize != null) {
-			generator.writeKey("max_size");
-			generator.write(this.maxSize);
-
-		}
-		if (this.maxPrimaryShardSize != null) {
-			generator.writeKey("max_primary_shard_size");
-			generator.write(this.maxPrimaryShardSize);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RolloverConditions}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RolloverConditions> {
-		@Nullable
-		private Time maxAge;
-
-		@Nullable
-		private Long maxDocs;
-
-		@Nullable
-		private String maxSize;
-
-		@Nullable
-		private String maxPrimaryShardSize;
-
-		/**
-		 * API name: {@code max_age}
-		 */
-		public final Builder maxAge(@Nullable Time value) {
-			this.maxAge = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_age}
-		 */
-		public final Builder maxAge(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.maxAge(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code max_docs}
-		 */
-		public final Builder maxDocs(@Nullable Long value) {
-			this.maxDocs = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_size}
-		 */
-		public final Builder maxSize(@Nullable String value) {
-			this.maxSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_primary_shard_size}
-		 */
-		public final Builder maxPrimaryShardSize(@Nullable String value) {
-			this.maxPrimaryShardSize = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RolloverConditions}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RolloverConditions build() {
-			_checkSingleUse();
-
-			return new RolloverConditions(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RolloverConditions}
-	 */
-	public static final JsonpDeserializer<RolloverConditions> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RolloverConditions::setupRolloverConditionsDeserializer);
-
-	protected static void setupRolloverConditionsDeserializer(ObjectDeserializer<RolloverConditions.Builder> op) {
-
-		op.add(Builder::maxAge, Time._DESERIALIZER, "max_age");
-		op.add(Builder::maxDocs, JsonpDeserializer.longDeserializer(), "max_docs");
-		op.add(Builder::maxSize, JsonpDeserializer.stringDeserializer(), "max_size");
-		op.add(Builder::maxPrimaryShardSize, JsonpDeserializer.stringDeserializer(), "max_primary_shard_size");
-
-	}
+    @Nullable
+    private final Time maxAge;
+
+    @Nullable
+    private final Long maxDocs;
+
+    @Nullable
+    private final String maxSize;
+
+    @Nullable
+    private final String maxPrimaryShardSize;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RolloverConditions(Builder builder) {
+
+        this.maxAge = builder.maxAge;
+        this.maxDocs = builder.maxDocs;
+        this.maxSize = builder.maxSize;
+        this.maxPrimaryShardSize = builder.maxPrimaryShardSize;
+
+    }
+
+    public static RolloverConditions of(Function<Builder, ObjectBuilder<RolloverConditions>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code max_age}
+     */
+    @Nullable
+    public final Time maxAge() {
+        return this.maxAge;
+    }
+
+    /**
+     * API name: {@code max_docs}
+     */
+    @Nullable
+    public final Long maxDocs() {
+        return this.maxDocs;
+    }
+
+    /**
+     * API name: {@code max_size}
+     */
+    @Nullable
+    public final String maxSize() {
+        return this.maxSize;
+    }
+
+    /**
+     * API name: {@code max_primary_shard_size}
+     */
+    @Nullable
+    public final String maxPrimaryShardSize() {
+        return this.maxPrimaryShardSize;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.maxAge != null) {
+            generator.writeKey("max_age");
+            this.maxAge.serialize(generator, mapper);
+
+        }
+        if (this.maxDocs != null) {
+            generator.writeKey("max_docs");
+            generator.write(this.maxDocs);
+
+        }
+        if (this.maxSize != null) {
+            generator.writeKey("max_size");
+            generator.write(this.maxSize);
+
+        }
+        if (this.maxPrimaryShardSize != null) {
+            generator.writeKey("max_primary_shard_size");
+            generator.write(this.maxPrimaryShardSize);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RolloverConditions}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RolloverConditions> {
+        @Nullable
+        private Time maxAge;
+
+        @Nullable
+        private Long maxDocs;
+
+        @Nullable
+        private String maxSize;
+
+        @Nullable
+        private String maxPrimaryShardSize;
+
+        /**
+         * API name: {@code max_age}
+         */
+        public final Builder maxAge(@Nullable Time value) {
+            this.maxAge = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_age}
+         */
+        public final Builder maxAge(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.maxAge(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code max_docs}
+         */
+        public final Builder maxDocs(@Nullable Long value) {
+            this.maxDocs = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_size}
+         */
+        public final Builder maxSize(@Nullable String value) {
+            this.maxSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_primary_shard_size}
+         */
+        public final Builder maxPrimaryShardSize(@Nullable String value) {
+            this.maxPrimaryShardSize = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RolloverConditions}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RolloverConditions build() {
+            _checkSingleUse();
+
+            return new RolloverConditions(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RolloverConditions}
+     */
+    public static final JsonpDeserializer<RolloverConditions> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RolloverConditions::setupRolloverConditionsDeserializer
+    );
+
+    protected static void setupRolloverConditionsDeserializer(ObjectDeserializer<RolloverConditions.Builder> op) {
+
+        op.add(Builder::maxAge, Time._DESERIALIZER, "max_age");
+        op.add(Builder::maxDocs, JsonpDeserializer.longDeserializer(), "max_docs");
+        op.add(Builder::maxSize, JsonpDeserializer.stringDeserializer(), "max_size");
+        op.add(Builder::maxPrimaryShardSize, JsonpDeserializer.stringDeserializer(), "max_primary_shard_size");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/segments/IndexSegment.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/segments/IndexSegment.java
index 4c5de193bd..92bc9f0ea8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/segments/IndexSegment.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/segments/IndexSegment.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.indices.segments;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,123 +45,124 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: indices.segments.IndexSegment
 
 @JsonpDeserializable
 public class IndexSegment implements JsonpSerializable {
-	private final Map<String, List<ShardsSegment>> shards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexSegment(Builder builder) {
-
-		this.shards = ApiTypeHelper.unmodifiableRequired(builder.shards, this, "shards");
-
-	}
-
-	public static IndexSegment of(Function<Builder, ObjectBuilder<IndexSegment>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code shards}
-	 */
-	public final Map<String, List<ShardsSegment>> shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.shards)) {
-			generator.writeKey("shards");
-			generator.writeStartObject();
-			for (Map.Entry<String, List<ShardsSegment>> item0 : this.shards.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.writeStartArray();
-				if (item0.getValue() != null) {
-					for (ShardsSegment item1 : item0.getValue()) {
-						item1.serialize(generator, mapper);
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexSegment}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexSegment> {
-		private Map<String, List<ShardsSegment>> shards;
-
-		/**
-		 * Required - API name: {@code shards}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>shards</code>.
-		 */
-		public final Builder shards(Map<String, List<ShardsSegment>> map) {
-			this.shards = _mapPutAll(this.shards, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards}
-		 * <p>
-		 * Adds an entry to <code>shards</code>.
-		 */
-		public final Builder shards(String key, List<ShardsSegment> value) {
-			this.shards = _mapPut(this.shards, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IndexSegment}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexSegment build() {
-			_checkSingleUse();
-
-			return new IndexSegment(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndexSegment}
-	 */
-	public static final JsonpDeserializer<IndexSegment> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IndexSegment::setupIndexSegmentDeserializer);
-
-	protected static void setupIndexSegmentDeserializer(ObjectDeserializer<IndexSegment.Builder> op) {
-
-		op.add(Builder::shards, JsonpDeserializer
-				.stringMapDeserializer(JsonpDeserializer.arrayDeserializer(ShardsSegment._DESERIALIZER)), "shards");
-
-	}
+    private final Map<String, List<ShardsSegment>> shards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexSegment(Builder builder) {
+
+        this.shards = ApiTypeHelper.unmodifiableRequired(builder.shards, this, "shards");
+
+    }
+
+    public static IndexSegment of(Function<Builder, ObjectBuilder<IndexSegment>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code shards}
+     */
+    public final Map<String, List<ShardsSegment>> shards() {
+        return this.shards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.shards)) {
+            generator.writeKey("shards");
+            generator.writeStartObject();
+            for (Map.Entry<String, List<ShardsSegment>> item0 : this.shards.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.writeStartArray();
+                if (item0.getValue() != null) {
+                    for (ShardsSegment item1 : item0.getValue()) {
+                        item1.serialize(generator, mapper);
+
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexSegment}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexSegment> {
+        private Map<String, List<ShardsSegment>> shards;
+
+        /**
+         * Required - API name: {@code shards}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>shards</code>.
+         */
+        public final Builder shards(Map<String, List<ShardsSegment>> map) {
+            this.shards = _mapPutAll(this.shards, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards}
+         * <p>
+         * Adds an entry to <code>shards</code>.
+         */
+        public final Builder shards(String key, List<ShardsSegment> value) {
+            this.shards = _mapPut(this.shards, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link IndexSegment}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexSegment build() {
+            _checkSingleUse();
+
+            return new IndexSegment(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndexSegment}
+     */
+    public static final JsonpDeserializer<IndexSegment> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexSegment::setupIndexSegmentDeserializer
+    );
+
+    protected static void setupIndexSegmentDeserializer(ObjectDeserializer<IndexSegment.Builder> op) {
+
+        op.add(
+            Builder::shards,
+            JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.arrayDeserializer(ShardsSegment._DESERIALIZER)),
+            "shards"
+        );
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/segments/Segment.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/segments/Segment.java
index 69dbb007da..5035142ed3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/segments/Segment.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/segments/Segment.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.segments;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,331 +44,328 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: indices.segments.Segment
 
-
 @JsonpDeserializable
 public class Segment implements JsonpSerializable {
-	private final Map<String, String> attributes;
-
-	private final boolean committed;
-
-	private final boolean compound;
-
-	private final long deletedDocs;
-
-	private final int generation;
-
-	private final double memoryInBytes;
-
-	private final boolean search;
-
-	private final double sizeInBytes;
-
-	private final long numDocs;
-
-	private final String version;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Segment(Builder builder) {
-
-		this.attributes = ApiTypeHelper.unmodifiableRequired(builder.attributes, this, "attributes");
-		this.committed = ApiTypeHelper.requireNonNull(builder.committed, this, "committed");
-		this.compound = ApiTypeHelper.requireNonNull(builder.compound, this, "compound");
-		this.deletedDocs = ApiTypeHelper.requireNonNull(builder.deletedDocs, this, "deletedDocs");
-		this.generation = ApiTypeHelper.requireNonNull(builder.generation, this, "generation");
-		this.memoryInBytes = ApiTypeHelper.requireNonNull(builder.memoryInBytes, this, "memoryInBytes");
-		this.search = ApiTypeHelper.requireNonNull(builder.search, this, "search");
-		this.sizeInBytes = ApiTypeHelper.requireNonNull(builder.sizeInBytes, this, "sizeInBytes");
-		this.numDocs = ApiTypeHelper.requireNonNull(builder.numDocs, this, "numDocs");
-		this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
-
-	}
-
-	public static Segment of(Function<Builder, ObjectBuilder<Segment>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code attributes}
-	 */
-	public final Map<String, String> attributes() {
-		return this.attributes;
-	}
-
-	/**
-	 * Required - API name: {@code committed}
-	 */
-	public final boolean committed() {
-		return this.committed;
-	}
-
-	/**
-	 * Required - API name: {@code compound}
-	 */
-	public final boolean compound() {
-		return this.compound;
-	}
-
-	/**
-	 * Required - API name: {@code deleted_docs}
-	 */
-	public final long deletedDocs() {
-		return this.deletedDocs;
-	}
-
-	/**
-	 * Required - API name: {@code generation}
-	 */
-	public final int generation() {
-		return this.generation;
-	}
+    private final Map<String, String> attributes;
+
+    private final boolean committed;
+
+    private final boolean compound;
+
+    private final long deletedDocs;
+
+    private final int generation;
+
+    private final double memoryInBytes;
+
+    private final boolean search;
+
+    private final double sizeInBytes;
+
+    private final long numDocs;
+
+    private final String version;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Segment(Builder builder) {
+
+        this.attributes = ApiTypeHelper.unmodifiableRequired(builder.attributes, this, "attributes");
+        this.committed = ApiTypeHelper.requireNonNull(builder.committed, this, "committed");
+        this.compound = ApiTypeHelper.requireNonNull(builder.compound, this, "compound");
+        this.deletedDocs = ApiTypeHelper.requireNonNull(builder.deletedDocs, this, "deletedDocs");
+        this.generation = ApiTypeHelper.requireNonNull(builder.generation, this, "generation");
+        this.memoryInBytes = ApiTypeHelper.requireNonNull(builder.memoryInBytes, this, "memoryInBytes");
+        this.search = ApiTypeHelper.requireNonNull(builder.search, this, "search");
+        this.sizeInBytes = ApiTypeHelper.requireNonNull(builder.sizeInBytes, this, "sizeInBytes");
+        this.numDocs = ApiTypeHelper.requireNonNull(builder.numDocs, this, "numDocs");
+        this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
+
+    }
+
+    public static Segment of(Function<Builder, ObjectBuilder<Segment>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code attributes}
+     */
+    public final Map<String, String> attributes() {
+        return this.attributes;
+    }
+
+    /**
+     * Required - API name: {@code committed}
+     */
+    public final boolean committed() {
+        return this.committed;
+    }
+
+    /**
+     * Required - API name: {@code compound}
+     */
+    public final boolean compound() {
+        return this.compound;
+    }
+
+    /**
+     * Required - API name: {@code deleted_docs}
+     */
+    public final long deletedDocs() {
+        return this.deletedDocs;
+    }
+
+    /**
+     * Required - API name: {@code generation}
+     */
+    public final int generation() {
+        return this.generation;
+    }
 
-	/**
-	 * Required - API name: {@code memory_in_bytes}
-	 */
-	public final double memoryInBytes() {
-		return this.memoryInBytes;
-	}
+    /**
+     * Required - API name: {@code memory_in_bytes}
+     */
+    public final double memoryInBytes() {
+        return this.memoryInBytes;
+    }
 
-	/**
-	 * Required - API name: {@code search}
-	 */
-	public final boolean search() {
-		return this.search;
-	}
+    /**
+     * Required - API name: {@code search}
+     */
+    public final boolean search() {
+        return this.search;
+    }
 
-	/**
-	 * Required - API name: {@code size_in_bytes}
-	 */
-	public final double sizeInBytes() {
-		return this.sizeInBytes;
-	}
+    /**
+     * Required - API name: {@code size_in_bytes}
+     */
+    public final double sizeInBytes() {
+        return this.sizeInBytes;
+    }
 
-	/**
-	 * Required - API name: {@code num_docs}
-	 */
-	public final long numDocs() {
-		return this.numDocs;
-	}
+    /**
+     * Required - API name: {@code num_docs}
+     */
+    public final long numDocs() {
+        return this.numDocs;
+    }
 
-	/**
-	 * Required - API name: {@code version}
-	 */
-	public final String version() {
-		return this.version;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.attributes)) {
-			generator.writeKey("attributes");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.attributes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("committed");
-		generator.write(this.committed);
-
-		generator.writeKey("compound");
-		generator.write(this.compound);
-
-		generator.writeKey("deleted_docs");
-		generator.write(this.deletedDocs);
-
-		generator.writeKey("generation");
-		generator.write(this.generation);
-
-		generator.writeKey("memory_in_bytes");
-		generator.write(this.memoryInBytes);
-
-		generator.writeKey("search");
-		generator.write(this.search);
-
-		generator.writeKey("size_in_bytes");
-		generator.write(this.sizeInBytes);
-
-		generator.writeKey("num_docs");
-		generator.write(this.numDocs);
-
-		generator.writeKey("version");
-		generator.write(this.version);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Segment}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Segment> {
-		private Map<String, String> attributes;
-
-		private Boolean committed;
-
-		private Boolean compound;
-
-		private Long deletedDocs;
-
-		private Integer generation;
-
-		private Double memoryInBytes;
-
-		private Boolean search;
-
-		private Double sizeInBytes;
-
-		private Long numDocs;
-
-		private String version;
-
-		/**
-		 * Required - API name: {@code attributes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>attributes</code>.
-		 */
-		public final Builder attributes(Map<String, String> map) {
-			this.attributes = _mapPutAll(this.attributes, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code attributes}
-		 * <p>
-		 * Adds an entry to <code>attributes</code>.
-		 */
-		public final Builder attributes(String key, String value) {
-			this.attributes = _mapPut(this.attributes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code committed}
-		 */
-		public final Builder committed(boolean value) {
-			this.committed = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code compound}
-		 */
-		public final Builder compound(boolean value) {
-			this.compound = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code deleted_docs}
-		 */
-		public final Builder deletedDocs(long value) {
-			this.deletedDocs = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code generation}
-		 */
-		public final Builder generation(int value) {
-			this.generation = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code memory_in_bytes}
-		 */
-		public final Builder memoryInBytes(double value) {
-			this.memoryInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code search}
-		 */
-		public final Builder search(boolean value) {
-			this.search = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code size_in_bytes}
-		 */
-		public final Builder sizeInBytes(double value) {
-			this.sizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code num_docs}
-		 */
-		public final Builder numDocs(long value) {
-			this.numDocs = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code version}
-		 */
-		public final Builder version(String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Segment}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Segment build() {
-			_checkSingleUse();
-
-			return new Segment(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Segment}
-	 */
-	public static final JsonpDeserializer<Segment> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Segment::setupSegmentDeserializer);
-
-	protected static void setupSegmentDeserializer(ObjectDeserializer<Segment.Builder> op) {
-
-		op.add(Builder::attributes, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
-				"attributes");
-		op.add(Builder::committed, JsonpDeserializer.booleanDeserializer(), "committed");
-		op.add(Builder::compound, JsonpDeserializer.booleanDeserializer(), "compound");
-		op.add(Builder::deletedDocs, JsonpDeserializer.longDeserializer(), "deleted_docs");
-		op.add(Builder::generation, JsonpDeserializer.integerDeserializer(), "generation");
-		op.add(Builder::memoryInBytes, JsonpDeserializer.doubleDeserializer(), "memory_in_bytes");
-		op.add(Builder::search, JsonpDeserializer.booleanDeserializer(), "search");
-		op.add(Builder::sizeInBytes, JsonpDeserializer.doubleDeserializer(), "size_in_bytes");
-		op.add(Builder::numDocs, JsonpDeserializer.longDeserializer(), "num_docs");
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
-
-	}
+    /**
+     * Required - API name: {@code version}
+     */
+    public final String version() {
+        return this.version;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.attributes)) {
+            generator.writeKey("attributes");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.attributes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("committed");
+        generator.write(this.committed);
+
+        generator.writeKey("compound");
+        generator.write(this.compound);
+
+        generator.writeKey("deleted_docs");
+        generator.write(this.deletedDocs);
+
+        generator.writeKey("generation");
+        generator.write(this.generation);
+
+        generator.writeKey("memory_in_bytes");
+        generator.write(this.memoryInBytes);
+
+        generator.writeKey("search");
+        generator.write(this.search);
+
+        generator.writeKey("size_in_bytes");
+        generator.write(this.sizeInBytes);
+
+        generator.writeKey("num_docs");
+        generator.write(this.numDocs);
+
+        generator.writeKey("version");
+        generator.write(this.version);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Segment}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Segment> {
+        private Map<String, String> attributes;
+
+        private Boolean committed;
+
+        private Boolean compound;
+
+        private Long deletedDocs;
+
+        private Integer generation;
+
+        private Double memoryInBytes;
+
+        private Boolean search;
+
+        private Double sizeInBytes;
+
+        private Long numDocs;
+
+        private String version;
+
+        /**
+         * Required - API name: {@code attributes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>attributes</code>.
+         */
+        public final Builder attributes(Map<String, String> map) {
+            this.attributes = _mapPutAll(this.attributes, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code attributes}
+         * <p>
+         * Adds an entry to <code>attributes</code>.
+         */
+        public final Builder attributes(String key, String value) {
+            this.attributes = _mapPut(this.attributes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code committed}
+         */
+        public final Builder committed(boolean value) {
+            this.committed = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code compound}
+         */
+        public final Builder compound(boolean value) {
+            this.compound = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code deleted_docs}
+         */
+        public final Builder deletedDocs(long value) {
+            this.deletedDocs = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code generation}
+         */
+        public final Builder generation(int value) {
+            this.generation = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code memory_in_bytes}
+         */
+        public final Builder memoryInBytes(double value) {
+            this.memoryInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code search}
+         */
+        public final Builder search(boolean value) {
+            this.search = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code size_in_bytes}
+         */
+        public final Builder sizeInBytes(double value) {
+            this.sizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code num_docs}
+         */
+        public final Builder numDocs(long value) {
+            this.numDocs = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code version}
+         */
+        public final Builder version(String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Segment}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Segment build() {
+            _checkSingleUse();
+
+            return new Segment(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Segment}
+     */
+    public static final JsonpDeserializer<Segment> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Segment::setupSegmentDeserializer
+    );
+
+    protected static void setupSegmentDeserializer(ObjectDeserializer<Segment.Builder> op) {
+
+        op.add(Builder::attributes, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "attributes");
+        op.add(Builder::committed, JsonpDeserializer.booleanDeserializer(), "committed");
+        op.add(Builder::compound, JsonpDeserializer.booleanDeserializer(), "compound");
+        op.add(Builder::deletedDocs, JsonpDeserializer.longDeserializer(), "deleted_docs");
+        op.add(Builder::generation, JsonpDeserializer.integerDeserializer(), "generation");
+        op.add(Builder::memoryInBytes, JsonpDeserializer.doubleDeserializer(), "memory_in_bytes");
+        op.add(Builder::search, JsonpDeserializer.booleanDeserializer(), "search");
+        op.add(Builder::sizeInBytes, JsonpDeserializer.doubleDeserializer(), "size_in_bytes");
+        op.add(Builder::numDocs, JsonpDeserializer.longDeserializer(), "num_docs");
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/segments/ShardSegmentRouting.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/segments/ShardSegmentRouting.java
index 1124ef9a45..f655ca174f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/segments/ShardSegmentRouting.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/segments/ShardSegmentRouting.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.indices.segments;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,141 +43,140 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: indices.segments.ShardSegmentRouting
 
-
 @JsonpDeserializable
 public class ShardSegmentRouting implements JsonpSerializable {
-	private final String node;
-
-	private final boolean primary;
-
-	private final String state;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShardSegmentRouting(Builder builder) {
-
-		this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
-		this.primary = ApiTypeHelper.requireNonNull(builder.primary, this, "primary");
-		this.state = ApiTypeHelper.requireNonNull(builder.state, this, "state");
-
-	}
-
-	public static ShardSegmentRouting of(Function<Builder, ObjectBuilder<ShardSegmentRouting>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code node}
-	 */
-	public final String node() {
-		return this.node;
-	}
+    private final String node;
 
-	/**
-	 * Required - API name: {@code primary}
-	 */
-	public final boolean primary() {
-		return this.primary;
-	}
-
-	/**
-	 * Required - API name: {@code state}
-	 */
-	public final String state() {
-		return this.state;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("node");
-		generator.write(this.node);
-
-		generator.writeKey("primary");
-		generator.write(this.primary);
-
-		generator.writeKey("state");
-		generator.write(this.state);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardSegmentRouting}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardSegmentRouting> {
-		private String node;
-
-		private Boolean primary;
-
-		private String state;
-
-		/**
-		 * Required - API name: {@code node}
-		 */
-		public final Builder node(String value) {
-			this.node = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code primary}
-		 */
-		public final Builder primary(boolean value) {
-			this.primary = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code state}
-		 */
-		public final Builder state(String value) {
-			this.state = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShardSegmentRouting}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardSegmentRouting build() {
-			_checkSingleUse();
-
-			return new ShardSegmentRouting(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardSegmentRouting}
-	 */
-	public static final JsonpDeserializer<ShardSegmentRouting> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ShardSegmentRouting::setupShardSegmentRoutingDeserializer);
-
-	protected static void setupShardSegmentRoutingDeserializer(ObjectDeserializer<ShardSegmentRouting.Builder> op) {
-
-		op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
-		op.add(Builder::primary, JsonpDeserializer.booleanDeserializer(), "primary");
-		op.add(Builder::state, JsonpDeserializer.stringDeserializer(), "state");
-
-	}
+    private final boolean primary;
+
+    private final String state;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShardSegmentRouting(Builder builder) {
+
+        this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
+        this.primary = ApiTypeHelper.requireNonNull(builder.primary, this, "primary");
+        this.state = ApiTypeHelper.requireNonNull(builder.state, this, "state");
+
+    }
+
+    public static ShardSegmentRouting of(Function<Builder, ObjectBuilder<ShardSegmentRouting>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code node}
+     */
+    public final String node() {
+        return this.node;
+    }
+
+    /**
+     * Required - API name: {@code primary}
+     */
+    public final boolean primary() {
+        return this.primary;
+    }
+
+    /**
+     * Required - API name: {@code state}
+     */
+    public final String state() {
+        return this.state;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("node");
+        generator.write(this.node);
+
+        generator.writeKey("primary");
+        generator.write(this.primary);
+
+        generator.writeKey("state");
+        generator.write(this.state);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardSegmentRouting}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardSegmentRouting> {
+        private String node;
+
+        private Boolean primary;
+
+        private String state;
+
+        /**
+         * Required - API name: {@code node}
+         */
+        public final Builder node(String value) {
+            this.node = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code primary}
+         */
+        public final Builder primary(boolean value) {
+            this.primary = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code state}
+         */
+        public final Builder state(String value) {
+            this.state = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShardSegmentRouting}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardSegmentRouting build() {
+            _checkSingleUse();
+
+            return new ShardSegmentRouting(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardSegmentRouting}
+     */
+    public static final JsonpDeserializer<ShardSegmentRouting> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardSegmentRouting::setupShardSegmentRoutingDeserializer
+    );
+
+    protected static void setupShardSegmentRoutingDeserializer(ObjectDeserializer<ShardSegmentRouting.Builder> op) {
+
+        op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
+        op.add(Builder::primary, JsonpDeserializer.booleanDeserializer(), "primary");
+        op.add(Builder::state, JsonpDeserializer.stringDeserializer(), "state");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/segments/ShardsSegment.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/segments/ShardsSegment.java
index 0b5cdd6da5..5d26d2e8a8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/segments/ShardsSegment.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/segments/ShardsSegment.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.segments;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,204 +44,201 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: indices.segments.ShardsSegment
 
-
 @JsonpDeserializable
 public class ShardsSegment implements JsonpSerializable {
-	private final int numCommittedSegments;
+    private final int numCommittedSegments;
 
-	private final ShardSegmentRouting routing;
+    private final ShardSegmentRouting routing;
 
-	private final int numSearchSegments;
+    private final int numSearchSegments;
 
-	private final Map<String, Segment> segments;
+    private final Map<String, Segment> segments;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ShardsSegment(Builder builder) {
+    private ShardsSegment(Builder builder) {
 
-		this.numCommittedSegments = ApiTypeHelper.requireNonNull(builder.numCommittedSegments, this,
-				"numCommittedSegments");
-		this.routing = ApiTypeHelper.requireNonNull(builder.routing, this, "routing");
-		this.numSearchSegments = ApiTypeHelper.requireNonNull(builder.numSearchSegments, this, "numSearchSegments");
-		this.segments = ApiTypeHelper.unmodifiableRequired(builder.segments, this, "segments");
+        this.numCommittedSegments = ApiTypeHelper.requireNonNull(builder.numCommittedSegments, this, "numCommittedSegments");
+        this.routing = ApiTypeHelper.requireNonNull(builder.routing, this, "routing");
+        this.numSearchSegments = ApiTypeHelper.requireNonNull(builder.numSearchSegments, this, "numSearchSegments");
+        this.segments = ApiTypeHelper.unmodifiableRequired(builder.segments, this, "segments");
 
-	}
+    }
 
-	public static ShardsSegment of(Function<Builder, ObjectBuilder<ShardsSegment>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ShardsSegment of(Function<Builder, ObjectBuilder<ShardsSegment>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code num_committed_segments}
-	 */
-	public final int numCommittedSegments() {
-		return this.numCommittedSegments;
-	}
-
-	/**
-	 * Required - API name: {@code routing}
-	 */
-	public final ShardSegmentRouting routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Required - API name: {@code num_search_segments}
-	 */
-	public final int numSearchSegments() {
-		return this.numSearchSegments;
-	}
-
-	/**
-	 * Required - API name: {@code segments}
-	 */
-	public final Map<String, Segment> segments() {
-		return this.segments;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("num_committed_segments");
-		generator.write(this.numCommittedSegments);
-
-		generator.writeKey("routing");
-		this.routing.serialize(generator, mapper);
-
-		generator.writeKey("num_search_segments");
-		generator.write(this.numSearchSegments);
-
-		if (ApiTypeHelper.isDefined(this.segments)) {
-			generator.writeKey("segments");
-			generator.writeStartObject();
-			for (Map.Entry<String, Segment> item0 : this.segments.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardsSegment}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardsSegment> {
-		private Integer numCommittedSegments;
-
-		private ShardSegmentRouting routing;
-
-		private Integer numSearchSegments;
-
-		private Map<String, Segment> segments;
-
-		/**
-		 * Required - API name: {@code num_committed_segments}
-		 */
-		public final Builder numCommittedSegments(int value) {
-			this.numCommittedSegments = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code routing}
-		 */
-		public final Builder routing(ShardSegmentRouting value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code routing}
-		 */
-		public final Builder routing(Function<ShardSegmentRouting.Builder, ObjectBuilder<ShardSegmentRouting>> fn) {
-			return this.routing(fn.apply(new ShardSegmentRouting.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code num_search_segments}
-		 */
-		public final Builder numSearchSegments(int value) {
-			this.numSearchSegments = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code segments}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>segments</code>.
-		 */
-		public final Builder segments(Map<String, Segment> map) {
-			this.segments = _mapPutAll(this.segments, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code segments}
-		 * <p>
-		 * Adds an entry to <code>segments</code>.
-		 */
-		public final Builder segments(String key, Segment value) {
-			this.segments = _mapPut(this.segments, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code segments}
-		 * <p>
-		 * Adds an entry to <code>segments</code> using a builder lambda.
-		 */
-		public final Builder segments(String key, Function<Segment.Builder, ObjectBuilder<Segment>> fn) {
-			return segments(key, fn.apply(new Segment.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ShardsSegment}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardsSegment build() {
-			_checkSingleUse();
-
-			return new ShardsSegment(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardsSegment}
-	 */
-	public static final JsonpDeserializer<ShardsSegment> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShardsSegment::setupShardsSegmentDeserializer);
-
-	protected static void setupShardsSegmentDeserializer(ObjectDeserializer<ShardsSegment.Builder> op) {
-
-		op.add(Builder::numCommittedSegments, JsonpDeserializer.integerDeserializer(), "num_committed_segments");
-		op.add(Builder::routing, ShardSegmentRouting._DESERIALIZER, "routing");
-		op.add(Builder::numSearchSegments, JsonpDeserializer.integerDeserializer(), "num_search_segments");
-		op.add(Builder::segments, JsonpDeserializer.stringMapDeserializer(Segment._DESERIALIZER), "segments");
-
-	}
+    /**
+     * Required - API name: {@code num_committed_segments}
+     */
+    public final int numCommittedSegments() {
+        return this.numCommittedSegments;
+    }
+
+    /**
+     * Required - API name: {@code routing}
+     */
+    public final ShardSegmentRouting routing() {
+        return this.routing;
+    }
+
+    /**
+     * Required - API name: {@code num_search_segments}
+     */
+    public final int numSearchSegments() {
+        return this.numSearchSegments;
+    }
+
+    /**
+     * Required - API name: {@code segments}
+     */
+    public final Map<String, Segment> segments() {
+        return this.segments;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("num_committed_segments");
+        generator.write(this.numCommittedSegments);
+
+        generator.writeKey("routing");
+        this.routing.serialize(generator, mapper);
+
+        generator.writeKey("num_search_segments");
+        generator.write(this.numSearchSegments);
+
+        if (ApiTypeHelper.isDefined(this.segments)) {
+            generator.writeKey("segments");
+            generator.writeStartObject();
+            for (Map.Entry<String, Segment> item0 : this.segments.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardsSegment}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardsSegment> {
+        private Integer numCommittedSegments;
+
+        private ShardSegmentRouting routing;
+
+        private Integer numSearchSegments;
+
+        private Map<String, Segment> segments;
+
+        /**
+         * Required - API name: {@code num_committed_segments}
+         */
+        public final Builder numCommittedSegments(int value) {
+            this.numCommittedSegments = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code routing}
+         */
+        public final Builder routing(ShardSegmentRouting value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code routing}
+         */
+        public final Builder routing(Function<ShardSegmentRouting.Builder, ObjectBuilder<ShardSegmentRouting>> fn) {
+            return this.routing(fn.apply(new ShardSegmentRouting.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code num_search_segments}
+         */
+        public final Builder numSearchSegments(int value) {
+            this.numSearchSegments = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code segments}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>segments</code>.
+         */
+        public final Builder segments(Map<String, Segment> map) {
+            this.segments = _mapPutAll(this.segments, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code segments}
+         * <p>
+         * Adds an entry to <code>segments</code>.
+         */
+        public final Builder segments(String key, Segment value) {
+            this.segments = _mapPut(this.segments, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code segments}
+         * <p>
+         * Adds an entry to <code>segments</code> using a builder lambda.
+         */
+        public final Builder segments(String key, Function<Segment.Builder, ObjectBuilder<Segment>> fn) {
+            return segments(key, fn.apply(new Segment.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ShardsSegment}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardsSegment build() {
+            _checkSingleUse();
+
+            return new ShardsSegment(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardsSegment}
+     */
+    public static final JsonpDeserializer<ShardsSegment> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardsSegment::setupShardsSegmentDeserializer
+    );
+
+    protected static void setupShardsSegmentDeserializer(ObjectDeserializer<ShardsSegment.Builder> op) {
+
+        op.add(Builder::numCommittedSegments, JsonpDeserializer.integerDeserializer(), "num_committed_segments");
+        op.add(Builder::routing, ShardSegmentRouting._DESERIALIZER, "routing");
+        op.add(Builder::numSearchSegments, JsonpDeserializer.integerDeserializer(), "num_search_segments");
+        op.add(Builder::segments, JsonpDeserializer.stringMapDeserializer(Segment._DESERIALIZER), "segments");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/IndicesShardStores.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/IndicesShardStores.java
index a6db7179fe..d2a92f4de0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/IndicesShardStores.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/IndicesShardStores.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.shard_stores;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,125 +44,122 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: indices.shard_stores.IndicesShardStores
 
-
 @JsonpDeserializable
 public class IndicesShardStores implements JsonpSerializable {
-	private final Map<String, ShardStoreWrapper> shards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndicesShardStores(Builder builder) {
-
-		this.shards = ApiTypeHelper.unmodifiableRequired(builder.shards, this, "shards");
-
-	}
-
-	public static IndicesShardStores of(Function<Builder, ObjectBuilder<IndicesShardStores>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code shards}
-	 */
-	public final Map<String, ShardStoreWrapper> shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.shards)) {
-			generator.writeKey("shards");
-			generator.writeStartObject();
-			for (Map.Entry<String, ShardStoreWrapper> item0 : this.shards.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndicesShardStores}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesShardStores> {
-		private Map<String, ShardStoreWrapper> shards;
-
-		/**
-		 * Required - API name: {@code shards}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>shards</code>.
-		 */
-		public final Builder shards(Map<String, ShardStoreWrapper> map) {
-			this.shards = _mapPutAll(this.shards, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards}
-		 * <p>
-		 * Adds an entry to <code>shards</code>.
-		 */
-		public final Builder shards(String key, ShardStoreWrapper value) {
-			this.shards = _mapPut(this.shards, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards}
-		 * <p>
-		 * Adds an entry to <code>shards</code> using a builder lambda.
-		 */
-		public final Builder shards(String key,
-				Function<ShardStoreWrapper.Builder, ObjectBuilder<ShardStoreWrapper>> fn) {
-			return shards(key, fn.apply(new ShardStoreWrapper.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link IndicesShardStores}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndicesShardStores build() {
-			_checkSingleUse();
-
-			return new IndicesShardStores(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndicesShardStores}
-	 */
-	public static final JsonpDeserializer<IndicesShardStores> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IndicesShardStores::setupIndicesShardStoresDeserializer);
-
-	protected static void setupIndicesShardStoresDeserializer(ObjectDeserializer<IndicesShardStores.Builder> op) {
-
-		op.add(Builder::shards, JsonpDeserializer.stringMapDeserializer(ShardStoreWrapper._DESERIALIZER), "shards");
-
-	}
+    private final Map<String, ShardStoreWrapper> shards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndicesShardStores(Builder builder) {
+
+        this.shards = ApiTypeHelper.unmodifiableRequired(builder.shards, this, "shards");
+
+    }
+
+    public static IndicesShardStores of(Function<Builder, ObjectBuilder<IndicesShardStores>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code shards}
+     */
+    public final Map<String, ShardStoreWrapper> shards() {
+        return this.shards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.shards)) {
+            generator.writeKey("shards");
+            generator.writeStartObject();
+            for (Map.Entry<String, ShardStoreWrapper> item0 : this.shards.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndicesShardStores}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesShardStores> {
+        private Map<String, ShardStoreWrapper> shards;
+
+        /**
+         * Required - API name: {@code shards}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>shards</code>.
+         */
+        public final Builder shards(Map<String, ShardStoreWrapper> map) {
+            this.shards = _mapPutAll(this.shards, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards}
+         * <p>
+         * Adds an entry to <code>shards</code>.
+         */
+        public final Builder shards(String key, ShardStoreWrapper value) {
+            this.shards = _mapPut(this.shards, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards}
+         * <p>
+         * Adds an entry to <code>shards</code> using a builder lambda.
+         */
+        public final Builder shards(String key, Function<ShardStoreWrapper.Builder, ObjectBuilder<ShardStoreWrapper>> fn) {
+            return shards(key, fn.apply(new ShardStoreWrapper.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link IndicesShardStores}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndicesShardStores build() {
+            _checkSingleUse();
+
+            return new IndicesShardStores(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndicesShardStores}
+     */
+    public static final JsonpDeserializer<IndicesShardStores> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndicesShardStores::setupIndicesShardStoresDeserializer
+    );
+
+    protected static void setupIndicesShardStoresDeserializer(ObjectDeserializer<IndicesShardStores.Builder> op) {
+
+        op.add(Builder::shards, JsonpDeserializer.stringMapDeserializer(ShardStoreWrapper._DESERIALIZER), "shards");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStore.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStore.java
index 7e19fe2e81..d98a4cba3c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStore.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStore.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.shard_stores;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,289 +45,286 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: indices.shard_stores.ShardStore
 
-
 @JsonpDeserializable
 public class ShardStore implements JsonpSerializable {
-	private final ShardStoreAllocation allocation;
-
-	private final String allocationId;
-
-	private final Map<String, JsonData> attributes;
-
-	private final String id;
-
-	private final long legacyVersion;
-
-	private final String name;
-
-	private final ShardStoreException storeException;
-
-	private final String transportAddress;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShardStore(Builder builder) {
-
-		this.allocation = ApiTypeHelper.requireNonNull(builder.allocation, this, "allocation");
-		this.allocationId = ApiTypeHelper.requireNonNull(builder.allocationId, this, "allocationId");
-		this.attributes = ApiTypeHelper.unmodifiableRequired(builder.attributes, this, "attributes");
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.legacyVersion = ApiTypeHelper.requireNonNull(builder.legacyVersion, this, "legacyVersion");
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.storeException = ApiTypeHelper.requireNonNull(builder.storeException, this, "storeException");
-		this.transportAddress = ApiTypeHelper.requireNonNull(builder.transportAddress, this, "transportAddress");
-
-	}
-
-	public static ShardStore of(Function<Builder, ObjectBuilder<ShardStore>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code allocation}
-	 */
-	public final ShardStoreAllocation allocation() {
-		return this.allocation;
-	}
-
-	/**
-	 * Required - API name: {@code allocation_id}
-	 */
-	public final String allocationId() {
-		return this.allocationId;
-	}
+    private final ShardStoreAllocation allocation;
+
+    private final String allocationId;
+
+    private final Map<String, JsonData> attributes;
+
+    private final String id;
+
+    private final long legacyVersion;
+
+    private final String name;
+
+    private final ShardStoreException storeException;
+
+    private final String transportAddress;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShardStore(Builder builder) {
+
+        this.allocation = ApiTypeHelper.requireNonNull(builder.allocation, this, "allocation");
+        this.allocationId = ApiTypeHelper.requireNonNull(builder.allocationId, this, "allocationId");
+        this.attributes = ApiTypeHelper.unmodifiableRequired(builder.attributes, this, "attributes");
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.legacyVersion = ApiTypeHelper.requireNonNull(builder.legacyVersion, this, "legacyVersion");
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.storeException = ApiTypeHelper.requireNonNull(builder.storeException, this, "storeException");
+        this.transportAddress = ApiTypeHelper.requireNonNull(builder.transportAddress, this, "transportAddress");
+
+    }
+
+    public static ShardStore of(Function<Builder, ObjectBuilder<ShardStore>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code allocation}
+     */
+    public final ShardStoreAllocation allocation() {
+        return this.allocation;
+    }
+
+    /**
+     * Required - API name: {@code allocation_id}
+     */
+    public final String allocationId() {
+        return this.allocationId;
+    }
 
-	/**
-	 * Required - API name: {@code attributes}
-	 */
-	public final Map<String, JsonData> attributes() {
-		return this.attributes;
-	}
+    /**
+     * Required - API name: {@code attributes}
+     */
+    public final Map<String, JsonData> attributes() {
+        return this.attributes;
+    }
 
-	/**
-	 * Required - API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
+    /**
+     * Required - API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
 
-	/**
-	 * Required - API name: {@code legacy_version}
-	 */
-	public final long legacyVersion() {
-		return this.legacyVersion;
-	}
+    /**
+     * Required - API name: {@code legacy_version}
+     */
+    public final long legacyVersion() {
+        return this.legacyVersion;
+    }
 
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
 
-	/**
-	 * Required - API name: {@code store_exception}
-	 */
-	public final ShardStoreException storeException() {
-		return this.storeException;
-	}
-
-	/**
-	 * Required - API name: {@code transport_address}
-	 */
-	public final String transportAddress() {
-		return this.transportAddress;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("allocation");
-		this.allocation.serialize(generator, mapper);
-		generator.writeKey("allocation_id");
-		generator.write(this.allocationId);
-
-		if (ApiTypeHelper.isDefined(this.attributes)) {
-			generator.writeKey("attributes");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.attributes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("id");
-		generator.write(this.id);
-
-		generator.writeKey("legacy_version");
-		generator.write(this.legacyVersion);
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		generator.writeKey("store_exception");
-		this.storeException.serialize(generator, mapper);
-
-		generator.writeKey("transport_address");
-		generator.write(this.transportAddress);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardStore}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardStore> {
-		private ShardStoreAllocation allocation;
-
-		private String allocationId;
-
-		private Map<String, JsonData> attributes;
-
-		private String id;
-
-		private Long legacyVersion;
-
-		private String name;
-
-		private ShardStoreException storeException;
-
-		private String transportAddress;
-
-		/**
-		 * Required - API name: {@code allocation}
-		 */
-		public final Builder allocation(ShardStoreAllocation value) {
-			this.allocation = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code allocation_id}
-		 */
-		public final Builder allocationId(String value) {
-			this.allocationId = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code attributes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>attributes</code>.
-		 */
-		public final Builder attributes(Map<String, JsonData> map) {
-			this.attributes = _mapPutAll(this.attributes, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code attributes}
-		 * <p>
-		 * Adds an entry to <code>attributes</code>.
-		 */
-		public final Builder attributes(String key, JsonData value) {
-			this.attributes = _mapPut(this.attributes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code legacy_version}
-		 */
-		public final Builder legacyVersion(long value) {
-			this.legacyVersion = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code store_exception}
-		 */
-		public final Builder storeException(ShardStoreException value) {
-			this.storeException = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code store_exception}
-		 */
-		public final Builder storeException(
-				Function<ShardStoreException.Builder, ObjectBuilder<ShardStoreException>> fn) {
-			return this.storeException(fn.apply(new ShardStoreException.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code transport_address}
-		 */
-		public final Builder transportAddress(String value) {
-			this.transportAddress = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShardStore}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardStore build() {
-			_checkSingleUse();
-
-			return new ShardStore(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardStore}
-	 */
-	public static final JsonpDeserializer<ShardStore> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShardStore::setupShardStoreDeserializer);
-
-	protected static void setupShardStoreDeserializer(ObjectDeserializer<ShardStore.Builder> op) {
-
-		op.add(Builder::allocation, ShardStoreAllocation._DESERIALIZER, "allocation");
-		op.add(Builder::allocationId, JsonpDeserializer.stringDeserializer(), "allocation_id");
-		op.add(Builder::attributes, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "attributes");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::legacyVersion, JsonpDeserializer.longDeserializer(), "legacy_version");
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::storeException, ShardStoreException._DESERIALIZER, "store_exception");
-		op.add(Builder::transportAddress, JsonpDeserializer.stringDeserializer(), "transport_address");
-
-	}
+    /**
+     * Required - API name: {@code store_exception}
+     */
+    public final ShardStoreException storeException() {
+        return this.storeException;
+    }
+
+    /**
+     * Required - API name: {@code transport_address}
+     */
+    public final String transportAddress() {
+        return this.transportAddress;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("allocation");
+        this.allocation.serialize(generator, mapper);
+        generator.writeKey("allocation_id");
+        generator.write(this.allocationId);
+
+        if (ApiTypeHelper.isDefined(this.attributes)) {
+            generator.writeKey("attributes");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.attributes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("id");
+        generator.write(this.id);
+
+        generator.writeKey("legacy_version");
+        generator.write(this.legacyVersion);
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        generator.writeKey("store_exception");
+        this.storeException.serialize(generator, mapper);
+
+        generator.writeKey("transport_address");
+        generator.write(this.transportAddress);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardStore}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardStore> {
+        private ShardStoreAllocation allocation;
+
+        private String allocationId;
+
+        private Map<String, JsonData> attributes;
+
+        private String id;
+
+        private Long legacyVersion;
+
+        private String name;
+
+        private ShardStoreException storeException;
+
+        private String transportAddress;
+
+        /**
+         * Required - API name: {@code allocation}
+         */
+        public final Builder allocation(ShardStoreAllocation value) {
+            this.allocation = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code allocation_id}
+         */
+        public final Builder allocationId(String value) {
+            this.allocationId = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code attributes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>attributes</code>.
+         */
+        public final Builder attributes(Map<String, JsonData> map) {
+            this.attributes = _mapPutAll(this.attributes, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code attributes}
+         * <p>
+         * Adds an entry to <code>attributes</code>.
+         */
+        public final Builder attributes(String key, JsonData value) {
+            this.attributes = _mapPut(this.attributes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code legacy_version}
+         */
+        public final Builder legacyVersion(long value) {
+            this.legacyVersion = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code store_exception}
+         */
+        public final Builder storeException(ShardStoreException value) {
+            this.storeException = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code store_exception}
+         */
+        public final Builder storeException(Function<ShardStoreException.Builder, ObjectBuilder<ShardStoreException>> fn) {
+            return this.storeException(fn.apply(new ShardStoreException.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code transport_address}
+         */
+        public final Builder transportAddress(String value) {
+            this.transportAddress = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShardStore}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardStore build() {
+            _checkSingleUse();
+
+            return new ShardStore(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardStore}
+     */
+    public static final JsonpDeserializer<ShardStore> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardStore::setupShardStoreDeserializer
+    );
+
+    protected static void setupShardStoreDeserializer(ObjectDeserializer<ShardStore.Builder> op) {
+
+        op.add(Builder::allocation, ShardStoreAllocation._DESERIALIZER, "allocation");
+        op.add(Builder::allocationId, JsonpDeserializer.stringDeserializer(), "allocation_id");
+        op.add(Builder::attributes, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "attributes");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::legacyVersion, JsonpDeserializer.longDeserializer(), "legacy_version");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::storeException, ShardStoreException._DESERIALIZER, "store_exception");
+        op.add(Builder::transportAddress, JsonpDeserializer.stringDeserializer(), "transport_address");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStoreAllocation.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStoreAllocation.java
index e744f625cc..a4c4d479e9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStoreAllocation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStoreAllocation.java
@@ -37,24 +37,25 @@
 
 @JsonpDeserializable
 public enum ShardStoreAllocation implements JsonEnum {
-	Primary("primary"),
+    Primary("primary"),
 
-	Replica("replica"),
+    Replica("replica"),
 
-	Unused("unused"),
+    Unused("unused"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	ShardStoreAllocation(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    ShardStoreAllocation(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<ShardStoreAllocation> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			ShardStoreAllocation.values());
+    public static final JsonEnum.Deserializer<ShardStoreAllocation> _DESERIALIZER = new JsonEnum.Deserializer<>(
+        ShardStoreAllocation.values()
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStoreException.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStoreException.java
index 7a140e1dbf..ce621ca944 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStoreException.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStoreException.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.indices.shard_stores;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,117 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: indices.shard_stores.ShardStoreException
 
-
 @JsonpDeserializable
 public class ShardStoreException implements JsonpSerializable {
-	private final String reason;
-
-	private final String type;
-
-	// ---------------------------------------------------------------------------------------------
+    private final String reason;
 
-	private ShardStoreException(Builder builder) {
+    private final String type;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.reason = ApiTypeHelper.requireNonNull(builder.reason, this, "reason");
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+    private ShardStoreException(Builder builder) {
 
-	}
+        this.reason = ApiTypeHelper.requireNonNull(builder.reason, this, "reason");
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
 
-	public static ShardStoreException of(Function<Builder, ObjectBuilder<ShardStoreException>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code reason}
-	 */
-	public final String reason() {
-		return this.reason;
-	}
+    public static ShardStoreException of(Function<Builder, ObjectBuilder<ShardStoreException>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
+    /**
+     * Required - API name: {@code reason}
+     */
+    public final String reason() {
+        return this.reason;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("reason");
-		generator.write(this.reason);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("type");
-		generator.write(this.type);
+        generator.writeKey("reason");
+        generator.write(this.reason);
 
-	}
+        generator.writeKey("type");
+        generator.write(this.type);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link ShardStoreException}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardStoreException> {
-		private String reason;
+    /**
+     * Builder for {@link ShardStoreException}.
+     */
 
-		private String type;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardStoreException> {
+        private String reason;
 
-		/**
-		 * Required - API name: {@code reason}
-		 */
-		public final Builder reason(String value) {
-			this.reason = value;
-			return this;
-		}
+        private String type;
 
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code reason}
+         */
+        public final Builder reason(String value) {
+            this.reason = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link ShardStoreException}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardStoreException build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
 
-			return new ShardStoreException(this);
-		}
-	}
+        /**
+         * Builds a {@link ShardStoreException}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardStoreException build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new ShardStoreException(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link ShardStoreException}
-	 */
-	public static final JsonpDeserializer<ShardStoreException> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ShardStoreException::setupShardStoreExceptionDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupShardStoreExceptionDeserializer(ObjectDeserializer<ShardStoreException.Builder> op) {
+    /**
+     * Json deserializer for {@link ShardStoreException}
+     */
+    public static final JsonpDeserializer<ShardStoreException> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardStoreException::setupShardStoreExceptionDeserializer
+    );
 
-		op.add(Builder::reason, JsonpDeserializer.stringDeserializer(), "reason");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+    protected static void setupShardStoreExceptionDeserializer(ObjectDeserializer<ShardStoreException.Builder> op) {
 
-	}
+        op.add(Builder::reason, JsonpDeserializer.stringDeserializer(), "reason");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStoreStatus.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStoreStatus.java
index 7b49c5eabd..7bb25e7aea 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStoreStatus.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStoreStatus.java
@@ -35,41 +35,39 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum ShardStoreStatus implements JsonEnum {
-	/**
-	 * The primary shard and all replica shards are assigned.
-	 */
-	Green("green"),
+    /**
+     * The primary shard and all replica shards are assigned.
+     */
+    Green("green"),
 
-	/**
-	 * One or more replica shards are unassigned.
-	 */
-	Yellow("yellow"),
+    /**
+     * One or more replica shards are unassigned.
+     */
+    Yellow("yellow"),
 
-	/**
-	 * The primary shard is unassigned.
-	 */
-	Red("red"),
+    /**
+     * The primary shard is unassigned.
+     */
+    Red("red"),
 
-	/**
-	 * Return all shards, regardless of health status.
-	 */
-	All("all"),
+    /**
+     * Return all shards, regardless of health status.
+     */
+    All("all"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	ShardStoreStatus(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    ShardStoreStatus(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<ShardStoreStatus> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			ShardStoreStatus.values());
+    public static final JsonEnum.Deserializer<ShardStoreStatus> _DESERIALIZER = new JsonEnum.Deserializer<>(ShardStoreStatus.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStoreWrapper.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStoreWrapper.java
index cd863c8377..e88aacc955 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStoreWrapper.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/shard_stores/ShardStoreWrapper.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.shard_stores;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,123 +44,121 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: indices.shard_stores.ShardStoreWrapper
 
-
 @JsonpDeserializable
 public class ShardStoreWrapper implements JsonpSerializable {
-	private final List<ShardStore> stores;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShardStoreWrapper(Builder builder) {
-
-		this.stores = ApiTypeHelper.unmodifiableRequired(builder.stores, this, "stores");
-
-	}
-
-	public static ShardStoreWrapper of(Function<Builder, ObjectBuilder<ShardStoreWrapper>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code stores}
-	 */
-	public final List<ShardStore> stores() {
-		return this.stores;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.stores)) {
-			generator.writeKey("stores");
-			generator.writeStartArray();
-			for (ShardStore item0 : this.stores) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardStoreWrapper}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardStoreWrapper> {
-		private List<ShardStore> stores;
-
-		/**
-		 * Required - API name: {@code stores}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>stores</code>.
-		 */
-		public final Builder stores(List<ShardStore> list) {
-			this.stores = _listAddAll(this.stores, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code stores}
-		 * <p>
-		 * Adds one or more values to <code>stores</code>.
-		 */
-		public final Builder stores(ShardStore value, ShardStore... values) {
-			this.stores = _listAdd(this.stores, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code stores}
-		 * <p>
-		 * Adds a value to <code>stores</code> using a builder lambda.
-		 */
-		public final Builder stores(Function<ShardStore.Builder, ObjectBuilder<ShardStore>> fn) {
-			return stores(fn.apply(new ShardStore.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ShardStoreWrapper}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardStoreWrapper build() {
-			_checkSingleUse();
-
-			return new ShardStoreWrapper(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardStoreWrapper}
-	 */
-	public static final JsonpDeserializer<ShardStoreWrapper> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ShardStoreWrapper::setupShardStoreWrapperDeserializer);
-
-	protected static void setupShardStoreWrapperDeserializer(ObjectDeserializer<ShardStoreWrapper.Builder> op) {
-
-		op.add(Builder::stores, JsonpDeserializer.arrayDeserializer(ShardStore._DESERIALIZER), "stores");
-
-	}
+    private final List<ShardStore> stores;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShardStoreWrapper(Builder builder) {
+
+        this.stores = ApiTypeHelper.unmodifiableRequired(builder.stores, this, "stores");
+
+    }
+
+    public static ShardStoreWrapper of(Function<Builder, ObjectBuilder<ShardStoreWrapper>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code stores}
+     */
+    public final List<ShardStore> stores() {
+        return this.stores;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.stores)) {
+            generator.writeKey("stores");
+            generator.writeStartArray();
+            for (ShardStore item0 : this.stores) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardStoreWrapper}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardStoreWrapper> {
+        private List<ShardStore> stores;
+
+        /**
+         * Required - API name: {@code stores}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>stores</code>.
+         */
+        public final Builder stores(List<ShardStore> list) {
+            this.stores = _listAddAll(this.stores, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code stores}
+         * <p>
+         * Adds one or more values to <code>stores</code>.
+         */
+        public final Builder stores(ShardStore value, ShardStore... values) {
+            this.stores = _listAdd(this.stores, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code stores}
+         * <p>
+         * Adds a value to <code>stores</code> using a builder lambda.
+         */
+        public final Builder stores(Function<ShardStore.Builder, ObjectBuilder<ShardStore>> fn) {
+            return stores(fn.apply(new ShardStore.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ShardStoreWrapper}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardStoreWrapper build() {
+            _checkSingleUse();
+
+            return new ShardStoreWrapper(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardStoreWrapper}
+     */
+    public static final JsonpDeserializer<ShardStoreWrapper> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardStoreWrapper::setupShardStoreWrapperDeserializer
+    );
+
+    protected static void setupShardStoreWrapperDeserializer(ObjectDeserializer<ShardStoreWrapper.Builder> op) {
+
+        op.add(Builder::stores, JsonpDeserializer.arrayDeserializer(ShardStore._DESERIALIZER), "stores");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/simulate_template/Overlapping.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/simulate_template/Overlapping.java
index 6488997a4d..a47a9196bd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/simulate_template/Overlapping.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/simulate_template/Overlapping.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.simulate_template;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,138 +44,136 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: indices.simulate_template.Overlapping
 
 @JsonpDeserializable
 public class Overlapping implements JsonpSerializable {
-	private final String name;
-
-	private final List<String> indexPatterns;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Overlapping(Builder builder) {
-
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.indexPatterns = ApiTypeHelper.unmodifiableRequired(builder.indexPatterns, this, "indexPatterns");
-
-	}
-
-	public static Overlapping of(Function<Builder, ObjectBuilder<Overlapping>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Required - API name: {@code index_patterns}
-	 */
-	public final List<String> indexPatterns() {
-		return this.indexPatterns;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		if (ApiTypeHelper.isDefined(this.indexPatterns)) {
-			generator.writeKey("index_patterns");
-			generator.writeStartArray();
-			for (String item0 : this.indexPatterns) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Overlapping}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Overlapping> {
-		private String name;
-
-		private List<String> indexPatterns;
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index_patterns}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indexPatterns</code>.
-		 */
-		public final Builder indexPatterns(List<String> list) {
-			this.indexPatterns = _listAddAll(this.indexPatterns, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index_patterns}
-		 * <p>
-		 * Adds one or more values to <code>indexPatterns</code>.
-		 */
-		public final Builder indexPatterns(String value, String... values) {
-			this.indexPatterns = _listAdd(this.indexPatterns, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Overlapping}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Overlapping build() {
-			_checkSingleUse();
-
-			return new Overlapping(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Overlapping}
-	 */
-	public static final JsonpDeserializer<Overlapping> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Overlapping::setupOverlappingDeserializer);
-
-	protected static void setupOverlappingDeserializer(ObjectDeserializer<Overlapping.Builder> op) {
-
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::indexPatterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"index_patterns");
-
-	}
+    private final String name;
+
+    private final List<String> indexPatterns;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Overlapping(Builder builder) {
+
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.indexPatterns = ApiTypeHelper.unmodifiableRequired(builder.indexPatterns, this, "indexPatterns");
+
+    }
+
+    public static Overlapping of(Function<Builder, ObjectBuilder<Overlapping>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Required - API name: {@code index_patterns}
+     */
+    public final List<String> indexPatterns() {
+        return this.indexPatterns;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        if (ApiTypeHelper.isDefined(this.indexPatterns)) {
+            generator.writeKey("index_patterns");
+            generator.writeStartArray();
+            for (String item0 : this.indexPatterns) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Overlapping}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Overlapping> {
+        private String name;
+
+        private List<String> indexPatterns;
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index_patterns}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indexPatterns</code>.
+         */
+        public final Builder indexPatterns(List<String> list) {
+            this.indexPatterns = _listAddAll(this.indexPatterns, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index_patterns}
+         * <p>
+         * Adds one or more values to <code>indexPatterns</code>.
+         */
+        public final Builder indexPatterns(String value, String... values) {
+            this.indexPatterns = _listAdd(this.indexPatterns, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link Overlapping}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Overlapping build() {
+            _checkSingleUse();
+
+            return new Overlapping(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Overlapping}
+     */
+    public static final JsonpDeserializer<Overlapping> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Overlapping::setupOverlappingDeserializer
+    );
+
+    protected static void setupOverlappingDeserializer(ObjectDeserializer<Overlapping.Builder> op) {
+
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::indexPatterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "index_patterns");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/simulate_template/Template.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/simulate_template/Template.java
index b5d6129f70..832f1d8857 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/simulate_template/Template.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/simulate_template/Template.java
@@ -32,8 +32,10 @@
 
 package org.opensearch.client.opensearch.indices.simulate_template;
 
-import org.opensearch.client.opensearch._types.mapping.TypeMapping;
-import org.opensearch.client.opensearch.indices.Alias;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -41,254 +43,254 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.mapping.TypeMapping;
+import org.opensearch.client.opensearch.indices.Alias;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: indices.simulate_template.Template
 
 @JsonpDeserializable
 public class Template implements JsonpSerializable {
-	private final Map<String, Alias> aliases;
+    private final Map<String, Alias> aliases;
 
-	private final TypeMapping mappings;
-
-	private final Map<String, JsonData> settings;
+    private final TypeMapping mappings;
+
+    private final Map<String, JsonData> settings;
 
-	private final List<Overlapping> overlapping;
-
-	// ---------------------------------------------------------------------------------------------
+    private final List<Overlapping> overlapping;
+
+    // ---------------------------------------------------------------------------------------------
 
-	private Template(Builder builder) {
+    private Template(Builder builder) {
 
-		this.aliases = ApiTypeHelper.unmodifiableRequired(builder.aliases, this, "aliases");
-		this.mappings = ApiTypeHelper.requireNonNull(builder.mappings, this, "mappings");
-		this.settings = ApiTypeHelper.unmodifiableRequired(builder.settings, this, "settings");
-		this.overlapping = ApiTypeHelper.unmodifiableRequired(builder.overlapping, this, "overlapping");
+        this.aliases = ApiTypeHelper.unmodifiableRequired(builder.aliases, this, "aliases");
+        this.mappings = ApiTypeHelper.requireNonNull(builder.mappings, this, "mappings");
+        this.settings = ApiTypeHelper.unmodifiableRequired(builder.settings, this, "settings");
+        this.overlapping = ApiTypeHelper.unmodifiableRequired(builder.overlapping, this, "overlapping");
 
-	}
+    }
 
-	public static Template of(Function<Builder, ObjectBuilder<Template>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static Template of(Function<Builder, ObjectBuilder<Template>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code aliases}
-	 */
-	public final Map<String, Alias> aliases() {
-		return this.aliases;
-	}
-
-	/**
-	 * Required - API name: {@code mappings}
-	 */
-	public final TypeMapping mappings() {
-		return this.mappings;
-	}
-
-	/**
-	 * Required - API name: {@code settings}
-	 */
-	public final Map<String, JsonData> settings() {
-		return this.settings;
-	}
-
-	/**
-	 * Required - API name: {@code overlapping}
-	 */
-	public final List<Overlapping> overlapping() {
-		return this.overlapping;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.aliases)) {
-			generator.writeKey("aliases");
-			generator.writeStartObject();
-			for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("mappings");
-		this.mappings.serialize(generator, mapper);
-
-		if (ApiTypeHelper.isDefined(this.settings)) {
-			generator.writeKey("settings");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.overlapping)) {
-			generator.writeKey("overlapping");
-			generator.writeStartArray();
-			for (Overlapping item0 : this.overlapping) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Template}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Template> {
-		private Map<String, Alias> aliases;
-
-		private TypeMapping mappings;
-
-		private Map<String, JsonData> settings;
-
-		private List<Overlapping> overlapping;
-
-		/**
-		 * Required - API name: {@code aliases}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aliases</code>.
-		 */
-		public final Builder aliases(Map<String, Alias> map) {
-			this.aliases = _mapPutAll(this.aliases, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code>.
-		 */
-		public final Builder aliases(String key, Alias value) {
-			this.aliases = _mapPut(this.aliases, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code aliases}
-		 * <p>
-		 * Adds an entry to <code>aliases</code> using a builder lambda.
-		 */
-		public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
-			return aliases(key, fn.apply(new Alias.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code mappings}
-		 */
-		public final Builder mappings(TypeMapping value) {
-			this.mappings = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mappings}
-		 */
-		public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
-			return this.mappings(fn.apply(new TypeMapping.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code settings}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>settings</code>.
-		 */
-		public final Builder settings(Map<String, JsonData> map) {
-			this.settings = _mapPutAll(this.settings, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code settings}
-		 * <p>
-		 * Adds an entry to <code>settings</code>.
-		 */
-		public final Builder settings(String key, JsonData value) {
-			this.settings = _mapPut(this.settings, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code overlapping}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>overlapping</code>.
-		 */
-		public final Builder overlapping(List<Overlapping> list) {
-			this.overlapping = _listAddAll(this.overlapping, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code overlapping}
-		 * <p>
-		 * Adds one or more values to <code>overlapping</code>.
-		 */
-		public final Builder overlapping(Overlapping value, Overlapping... values) {
-			this.overlapping = _listAdd(this.overlapping, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code overlapping}
-		 * <p>
-		 * Adds a value to <code>overlapping</code> using a builder lambda.
-		 */
-		public final Builder overlapping(Function<Overlapping.Builder, ObjectBuilder<Overlapping>> fn) {
-			return overlapping(fn.apply(new Overlapping.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link Template}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Template build() {
-			_checkSingleUse();
-
-			return new Template(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Template}
-	 */
-	public static final JsonpDeserializer<Template> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Template::setupTemplateDeserializer);
-
-	protected static void setupTemplateDeserializer(ObjectDeserializer<Template.Builder> op) {
-
-		op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
-		op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
-		op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "settings");
-		op.add(Builder::overlapping, JsonpDeserializer.arrayDeserializer(Overlapping._DESERIALIZER), "overlapping");
-
-	}
+    /**
+     * Required - API name: {@code aliases}
+     */
+    public final Map<String, Alias> aliases() {
+        return this.aliases;
+    }
+
+    /**
+     * Required - API name: {@code mappings}
+     */
+    public final TypeMapping mappings() {
+        return this.mappings;
+    }
+
+    /**
+     * Required - API name: {@code settings}
+     */
+    public final Map<String, JsonData> settings() {
+        return this.settings;
+    }
+
+    /**
+     * Required - API name: {@code overlapping}
+     */
+    public final List<Overlapping> overlapping() {
+        return this.overlapping;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.aliases)) {
+            generator.writeKey("aliases");
+            generator.writeStartObject();
+            for (Map.Entry<String, Alias> item0 : this.aliases.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("mappings");
+        this.mappings.serialize(generator, mapper);
+
+        if (ApiTypeHelper.isDefined(this.settings)) {
+            generator.writeKey("settings");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.settings.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.overlapping)) {
+            generator.writeKey("overlapping");
+            generator.writeStartArray();
+            for (Overlapping item0 : this.overlapping) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Template}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Template> {
+        private Map<String, Alias> aliases;
+
+        private TypeMapping mappings;
+
+        private Map<String, JsonData> settings;
+
+        private List<Overlapping> overlapping;
+
+        /**
+         * Required - API name: {@code aliases}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aliases</code>.
+         */
+        public final Builder aliases(Map<String, Alias> map) {
+            this.aliases = _mapPutAll(this.aliases, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code>.
+         */
+        public final Builder aliases(String key, Alias value) {
+            this.aliases = _mapPut(this.aliases, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code aliases}
+         * <p>
+         * Adds an entry to <code>aliases</code> using a builder lambda.
+         */
+        public final Builder aliases(String key, Function<Alias.Builder, ObjectBuilder<Alias>> fn) {
+            return aliases(key, fn.apply(new Alias.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code mappings}
+         */
+        public final Builder mappings(TypeMapping value) {
+            this.mappings = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mappings}
+         */
+        public final Builder mappings(Function<TypeMapping.Builder, ObjectBuilder<TypeMapping>> fn) {
+            return this.mappings(fn.apply(new TypeMapping.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code settings}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>settings</code>.
+         */
+        public final Builder settings(Map<String, JsonData> map) {
+            this.settings = _mapPutAll(this.settings, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code settings}
+         * <p>
+         * Adds an entry to <code>settings</code>.
+         */
+        public final Builder settings(String key, JsonData value) {
+            this.settings = _mapPut(this.settings, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code overlapping}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>overlapping</code>.
+         */
+        public final Builder overlapping(List<Overlapping> list) {
+            this.overlapping = _listAddAll(this.overlapping, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code overlapping}
+         * <p>
+         * Adds one or more values to <code>overlapping</code>.
+         */
+        public final Builder overlapping(Overlapping value, Overlapping... values) {
+            this.overlapping = _listAdd(this.overlapping, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code overlapping}
+         * <p>
+         * Adds a value to <code>overlapping</code> using a builder lambda.
+         */
+        public final Builder overlapping(Function<Overlapping.Builder, ObjectBuilder<Overlapping>> fn) {
+            return overlapping(fn.apply(new Overlapping.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link Template}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Template build() {
+            _checkSingleUse();
+
+            return new Template(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Template}
+     */
+    public static final JsonpDeserializer<Template> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Template::setupTemplateDeserializer
+    );
+
+    protected static void setupTemplateDeserializer(ObjectDeserializer<Template.Builder> op) {
+
+        op.add(Builder::aliases, JsonpDeserializer.stringMapDeserializer(Alias._DESERIALIZER), "aliases");
+        op.add(Builder::mappings, TypeMapping._DESERIALIZER, "mappings");
+        op.add(Builder::settings, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "settings");
+        op.add(Builder::overlapping, JsonpDeserializer.arrayDeserializer(Overlapping._DESERIALIZER), "overlapping");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/IndexStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/IndexStats.java
index 23333a9712..dc123f4b25 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/IndexStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/IndexStats.java
@@ -32,6 +32,15 @@
 
 package org.opensearch.client.opensearch.indices.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpDeserializable;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.json.ObjectBuilderDeserializer;
+import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.opensearch._types.BulkStats;
 import org.opensearch.client.opensearch._types.CompletionStats;
 import org.opensearch.client.opensearch._types.DocStats;
@@ -49,836 +58,827 @@
 import org.opensearch.client.opensearch._types.StoreStats;
 import org.opensearch.client.opensearch._types.TranslogStats;
 import org.opensearch.client.opensearch._types.WarmerStats;
-import org.opensearch.client.json.JsonpDeserializable;
-import org.opensearch.client.json.JsonpDeserializer;
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
-import org.opensearch.client.json.ObjectBuilderDeserializer;
-import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.stats.IndexStats
 
-
 @JsonpDeserializable
 public class IndexStats implements JsonpSerializable {
-	@Nullable
-	private final CompletionStats completion;
-
-	@Nullable
-	private final DocStats docs;
-
-	@Nullable
-	private final FielddataStats fielddata;
-
-	@Nullable
-	private final FlushStats flush;
-
-	@Nullable
-	private final GetStats get;
-
-	@Nullable
-	private final IndexingStats indexing;
-
-	@Nullable
-	private final MergesStats merges;
-
-	@Nullable
-	private final QueryCacheStats queryCache;
-
-	@Nullable
-	private final RecoveryStats recovery;
-
-	@Nullable
-	private final RefreshStats refresh;
-
-	@Nullable
-	private final RequestCacheStats requestCache;
-
-	@Nullable
-	private final SearchStats search;
-
-	@Nullable
-	private final SegmentsStats segments;
-
-	@Nullable
-	private final StoreStats store;
-
-	@Nullable
-	private final TranslogStats translog;
-
-	@Nullable
-	private final WarmerStats warmer;
-
-	@Nullable
-	private final BulkStats bulk;
-
-	@Nullable
-	private final ShardsTotalStats shards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private IndexStats(Builder builder) {
-
-		this.completion = builder.completion;
-		this.docs = builder.docs;
-		this.fielddata = builder.fielddata;
-		this.flush = builder.flush;
-		this.get = builder.get;
-		this.indexing = builder.indexing;
-		this.merges = builder.merges;
-		this.queryCache = builder.queryCache;
-		this.recovery = builder.recovery;
-		this.refresh = builder.refresh;
-		this.requestCache = builder.requestCache;
-		this.search = builder.search;
-		this.segments = builder.segments;
-		this.store = builder.store;
-		this.translog = builder.translog;
-		this.warmer = builder.warmer;
-		this.bulk = builder.bulk;
-		this.shards = builder.shards;
-
-	}
-
-	public static IndexStats of(Function<Builder, ObjectBuilder<IndexStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Contains statistics about completions across all shards assigned to the node.
-	 * <p>
-	 * API name: {@code completion}
-	 */
-	@Nullable
-	public final CompletionStats completion() {
-		return this.completion;
-	}
-
-	/**
-	 * Contains statistics about documents across all primary shards assigned to the
-	 * node.
-	 * <p>
-	 * API name: {@code docs}
-	 */
-	@Nullable
-	public final DocStats docs() {
-		return this.docs;
-	}
-
-	/**
-	 * Contains statistics about the field data cache across all shards assigned to
-	 * the node.
-	 * <p>
-	 * API name: {@code fielddata}
-	 */
-	@Nullable
-	public final FielddataStats fielddata() {
-		return this.fielddata;
-	}
-
-	/**
-	 * Contains statistics about flush operations for the node.
-	 * <p>
-	 * API name: {@code flush}
-	 */
-	@Nullable
-	public final FlushStats flush() {
-		return this.flush;
-	}
-
-	/**
-	 * Contains statistics about get operations for the node.
-	 * <p>
-	 * API name: {@code get}
-	 */
-	@Nullable
-	public final GetStats get() {
-		return this.get;
-	}
-
-	/**
-	 * Contains statistics about indexing operations for the node.
-	 * <p>
-	 * API name: {@code indexing}
-	 */
-	@Nullable
-	public final IndexingStats indexing() {
-		return this.indexing;
-	}
-
-	/**
-	 * Contains statistics about merge operations for the node.
-	 * <p>
-	 * API name: {@code merges}
-	 */
-	@Nullable
-	public final MergesStats merges() {
-		return this.merges;
-	}
-
-	/**
-	 * Contains statistics about the query cache across all shards assigned to the
-	 * node.
-	 * <p>
-	 * API name: {@code query_cache}
-	 */
-	@Nullable
-	public final QueryCacheStats queryCache() {
-		return this.queryCache;
-	}
-
-	/**
-	 * Contains statistics about recovery operations for the node.
-	 * <p>
-	 * API name: {@code recovery}
-	 */
-	@Nullable
-	public final RecoveryStats recovery() {
-		return this.recovery;
-	}
-
-	/**
-	 * Contains statistics about refresh operations for the node.
-	 * <p>
-	 * API name: {@code refresh}
-	 */
-	@Nullable
-	public final RefreshStats refresh() {
-		return this.refresh;
-	}
-
-	/**
-	 * Contains statistics about the request cache across all shards assigned to the
-	 * node.
-	 * <p>
-	 * API name: {@code request_cache}
-	 */
-	@Nullable
-	public final RequestCacheStats requestCache() {
-		return this.requestCache;
-	}
-
-	/**
-	 * Contains statistics about search operations for the node.
-	 * <p>
-	 * API name: {@code search}
-	 */
-	@Nullable
-	public final SearchStats search() {
-		return this.search;
-	}
-
-	/**
-	 * Contains statistics about segments across all shards assigned to the node.
-	 * <p>
-	 * API name: {@code segments}
-	 */
-	@Nullable
-	public final SegmentsStats segments() {
-		return this.segments;
-	}
-
-	/**
-	 * Contains statistics about the size of shards assigned to the node.
-	 * <p>
-	 * API name: {@code store}
-	 */
-	@Nullable
-	public final StoreStats store() {
-		return this.store;
-	}
-
-	/**
-	 * Contains statistics about transaction log operations for the node.
-	 * <p>
-	 * API name: {@code translog}
-	 */
-	@Nullable
-	public final TranslogStats translog() {
-		return this.translog;
-	}
-
-	/**
-	 * Contains statistics about index warming operations for the node.
-	 * <p>
-	 * API name: {@code warmer}
-	 */
-	@Nullable
-	public final WarmerStats warmer() {
-		return this.warmer;
-	}
-
-	/**
-	 * API name: {@code bulk}
-	 */
-	@Nullable
-	public final BulkStats bulk() {
-		return this.bulk;
-	}
-
-	/**
-	 * API name: {@code shards}
-	 */
-	@Nullable
-	public final ShardsTotalStats shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.completion != null) {
-			generator.writeKey("completion");
-			this.completion.serialize(generator, mapper);
-
-		}
-		if (this.docs != null) {
-			generator.writeKey("docs");
-			this.docs.serialize(generator, mapper);
-
-		}
-		if (this.fielddata != null) {
-			generator.writeKey("fielddata");
-			this.fielddata.serialize(generator, mapper);
-
-		}
-		if (this.flush != null) {
-			generator.writeKey("flush");
-			this.flush.serialize(generator, mapper);
-
-		}
-		if (this.get != null) {
-			generator.writeKey("get");
-			this.get.serialize(generator, mapper);
-
-		}
-		if (this.indexing != null) {
-			generator.writeKey("indexing");
-			this.indexing.serialize(generator, mapper);
-
-		}
-		if (this.merges != null) {
-			generator.writeKey("merges");
-			this.merges.serialize(generator, mapper);
-
-		}
-		if (this.queryCache != null) {
-			generator.writeKey("query_cache");
-			this.queryCache.serialize(generator, mapper);
-
-		}
-		if (this.recovery != null) {
-			generator.writeKey("recovery");
-			this.recovery.serialize(generator, mapper);
-
-		}
-		if (this.refresh != null) {
-			generator.writeKey("refresh");
-			this.refresh.serialize(generator, mapper);
-
-		}
-		if (this.requestCache != null) {
-			generator.writeKey("request_cache");
-			this.requestCache.serialize(generator, mapper);
-
-		}
-		if (this.search != null) {
-			generator.writeKey("search");
-			this.search.serialize(generator, mapper);
-
-		}
-		if (this.segments != null) {
-			generator.writeKey("segments");
-			this.segments.serialize(generator, mapper);
-
-		}
-		if (this.store != null) {
-			generator.writeKey("store");
-			this.store.serialize(generator, mapper);
-
-		}
-		if (this.translog != null) {
-			generator.writeKey("translog");
-			this.translog.serialize(generator, mapper);
-
-		}
-		if (this.warmer != null) {
-			generator.writeKey("warmer");
-			this.warmer.serialize(generator, mapper);
-
-		}
-		if (this.bulk != null) {
-			generator.writeKey("bulk");
-			this.bulk.serialize(generator, mapper);
-
-		}
-		if (this.shards != null) {
-			generator.writeKey("shards");
-			this.shards.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexStats> {
-		@Nullable
-		private CompletionStats completion;
-
-		@Nullable
-		private DocStats docs;
-
-		@Nullable
-		private FielddataStats fielddata;
-
-		@Nullable
-		private FlushStats flush;
-
-		@Nullable
-		private GetStats get;
-
-		@Nullable
-		private IndexingStats indexing;
-
-		@Nullable
-		private MergesStats merges;
-
-		@Nullable
-		private QueryCacheStats queryCache;
-
-		@Nullable
-		private RecoveryStats recovery;
-
-		@Nullable
-		private RefreshStats refresh;
-
-		@Nullable
-		private RequestCacheStats requestCache;
-
-		@Nullable
-		private SearchStats search;
-
-		@Nullable
-		private SegmentsStats segments;
-
-		@Nullable
-		private StoreStats store;
-
-		@Nullable
-		private TranslogStats translog;
-
-		@Nullable
-		private WarmerStats warmer;
-
-		@Nullable
-		private BulkStats bulk;
-
-		@Nullable
-		private ShardsTotalStats shards;
-
-		/**
-		 * Contains statistics about completions across all shards assigned to the node.
-		 * <p>
-		 * API name: {@code completion}
-		 */
-		public final Builder completion(@Nullable CompletionStats value) {
-			this.completion = value;
-			return this;
-		}
-
-		/**
-		 * Contains statistics about completions across all shards assigned to the node.
-		 * <p>
-		 * API name: {@code completion}
-		 */
-		public final Builder completion(Function<CompletionStats.Builder, ObjectBuilder<CompletionStats>> fn) {
-			return this.completion(fn.apply(new CompletionStats.Builder()).build());
-		}
-
-		/**
-		 * Contains statistics about documents across all primary shards assigned to the
-		 * node.
-		 * <p>
-		 * API name: {@code docs}
-		 */
-		public final Builder docs(@Nullable DocStats value) {
-			this.docs = value;
-			return this;
-		}
-
-		/**
-		 * Contains statistics about documents across all primary shards assigned to the
-		 * node.
-		 * <p>
-		 * API name: {@code docs}
-		 */
-		public final Builder docs(Function<DocStats.Builder, ObjectBuilder<DocStats>> fn) {
-			return this.docs(fn.apply(new DocStats.Builder()).build());
-		}
-
-		/**
-		 * Contains statistics about the field data cache across all shards assigned to
-		 * the node.
-		 * <p>
-		 * API name: {@code fielddata}
-		 */
-		public final Builder fielddata(@Nullable FielddataStats value) {
-			this.fielddata = value;
-			return this;
-		}
-
-		/**
-		 * Contains statistics about the field data cache across all shards assigned to
-		 * the node.
-		 * <p>
-		 * API name: {@code fielddata}
-		 */
-		public final Builder fielddata(Function<FielddataStats.Builder, ObjectBuilder<FielddataStats>> fn) {
-			return this.fielddata(fn.apply(new FielddataStats.Builder()).build());
-		}
-
-		/**
-		 * Contains statistics about flush operations for the node.
-		 * <p>
-		 * API name: {@code flush}
-		 */
-		public final Builder flush(@Nullable FlushStats value) {
-			this.flush = value;
-			return this;
-		}
-
-		/**
-		 * Contains statistics about flush operations for the node.
-		 * <p>
-		 * API name: {@code flush}
-		 */
-		public final Builder flush(Function<FlushStats.Builder, ObjectBuilder<FlushStats>> fn) {
-			return this.flush(fn.apply(new FlushStats.Builder()).build());
-		}
-
-		/**
-		 * Contains statistics about get operations for the node.
-		 * <p>
-		 * API name: {@code get}
-		 */
-		public final Builder get(@Nullable GetStats value) {
-			this.get = value;
-			return this;
-		}
-
-		/**
-		 * Contains statistics about get operations for the node.
-		 * <p>
-		 * API name: {@code get}
-		 */
-		public final Builder get(Function<GetStats.Builder, ObjectBuilder<GetStats>> fn) {
-			return this.get(fn.apply(new GetStats.Builder()).build());
-		}
-
-		/**
-		 * Contains statistics about indexing operations for the node.
-		 * <p>
-		 * API name: {@code indexing}
-		 */
-		public final Builder indexing(@Nullable IndexingStats value) {
-			this.indexing = value;
-			return this;
-		}
-
-		/**
-		 * Contains statistics about indexing operations for the node.
-		 * <p>
-		 * API name: {@code indexing}
-		 */
-		public final Builder indexing(Function<IndexingStats.Builder, ObjectBuilder<IndexingStats>> fn) {
-			return this.indexing(fn.apply(new IndexingStats.Builder()).build());
-		}
-
-		/**
-		 * Contains statistics about merge operations for the node.
-		 * <p>
-		 * API name: {@code merges}
-		 */
-		public final Builder merges(@Nullable MergesStats value) {
-			this.merges = value;
-			return this;
-		}
-
-		/**
-		 * Contains statistics about merge operations for the node.
-		 * <p>
-		 * API name: {@code merges}
-		 */
-		public final Builder merges(Function<MergesStats.Builder, ObjectBuilder<MergesStats>> fn) {
-			return this.merges(fn.apply(new MergesStats.Builder()).build());
-		}
-
-		/**
-		 * Contains statistics about the query cache across all shards assigned to the
-		 * node.
-		 * <p>
-		 * API name: {@code query_cache}
-		 */
-		public final Builder queryCache(@Nullable QueryCacheStats value) {
-			this.queryCache = value;
-			return this;
-		}
-
-		/**
-		 * Contains statistics about the query cache across all shards assigned to the
-		 * node.
-		 * <p>
-		 * API name: {@code query_cache}
-		 */
-		public final Builder queryCache(Function<QueryCacheStats.Builder, ObjectBuilder<QueryCacheStats>> fn) {
-			return this.queryCache(fn.apply(new QueryCacheStats.Builder()).build());
-		}
-
-		/**
-		 * Contains statistics about recovery operations for the node.
-		 * <p>
-		 * API name: {@code recovery}
-		 */
-		public final Builder recovery(@Nullable RecoveryStats value) {
-			this.recovery = value;
-			return this;
-		}
-
-		/**
-		 * Contains statistics about recovery operations for the node.
-		 * <p>
-		 * API name: {@code recovery}
-		 */
-		public final Builder recovery(Function<RecoveryStats.Builder, ObjectBuilder<RecoveryStats>> fn) {
-			return this.recovery(fn.apply(new RecoveryStats.Builder()).build());
-		}
-
-		/**
-		 * Contains statistics about refresh operations for the node.
-		 * <p>
-		 * API name: {@code refresh}
-		 */
-		public final Builder refresh(@Nullable RefreshStats value) {
-			this.refresh = value;
-			return this;
-		}
-
-		/**
-		 * Contains statistics about refresh operations for the node.
-		 * <p>
-		 * API name: {@code refresh}
-		 */
-		public final Builder refresh(Function<RefreshStats.Builder, ObjectBuilder<RefreshStats>> fn) {
-			return this.refresh(fn.apply(new RefreshStats.Builder()).build());
-		}
-
-		/**
-		 * Contains statistics about the request cache across all shards assigned to the
-		 * node.
-		 * <p>
-		 * API name: {@code request_cache}
-		 */
-		public final Builder requestCache(@Nullable RequestCacheStats value) {
-			this.requestCache = value;
-			return this;
-		}
-
-		/**
-		 * Contains statistics about the request cache across all shards assigned to the
-		 * node.
-		 * <p>
-		 * API name: {@code request_cache}
-		 */
-		public final Builder requestCache(Function<RequestCacheStats.Builder, ObjectBuilder<RequestCacheStats>> fn) {
-			return this.requestCache(fn.apply(new RequestCacheStats.Builder()).build());
-		}
-
-		/**
-		 * Contains statistics about search operations for the node.
-		 * <p>
-		 * API name: {@code search}
-		 */
-		public final Builder search(@Nullable SearchStats value) {
-			this.search = value;
-			return this;
-		}
-
-		/**
-		 * Contains statistics about search operations for the node.
-		 * <p>
-		 * API name: {@code search}
-		 */
-		public final Builder search(Function<SearchStats.Builder, ObjectBuilder<SearchStats>> fn) {
-			return this.search(fn.apply(new SearchStats.Builder()).build());
-		}
-
-		/**
-		 * Contains statistics about segments across all shards assigned to the node.
-		 * <p>
-		 * API name: {@code segments}
-		 */
-		public final Builder segments(@Nullable SegmentsStats value) {
-			this.segments = value;
-			return this;
-		}
-
-		/**
-		 * Contains statistics about segments across all shards assigned to the node.
-		 * <p>
-		 * API name: {@code segments}
-		 */
-		public final Builder segments(Function<SegmentsStats.Builder, ObjectBuilder<SegmentsStats>> fn) {
-			return this.segments(fn.apply(new SegmentsStats.Builder()).build());
-		}
-
-		/**
-		 * Contains statistics about the size of shards assigned to the node.
-		 * <p>
-		 * API name: {@code store}
-		 */
-		public final Builder store(@Nullable StoreStats value) {
-			this.store = value;
-			return this;
-		}
-
-		/**
-		 * Contains statistics about the size of shards assigned to the node.
-		 * <p>
-		 * API name: {@code store}
-		 */
-		public final Builder store(Function<StoreStats.Builder, ObjectBuilder<StoreStats>> fn) {
-			return this.store(fn.apply(new StoreStats.Builder()).build());
-		}
-
-		/**
-		 * Contains statistics about transaction log operations for the node.
-		 * <p>
-		 * API name: {@code translog}
-		 */
-		public final Builder translog(@Nullable TranslogStats value) {
-			this.translog = value;
-			return this;
-		}
-
-		/**
-		 * Contains statistics about transaction log operations for the node.
-		 * <p>
-		 * API name: {@code translog}
-		 */
-		public final Builder translog(Function<TranslogStats.Builder, ObjectBuilder<TranslogStats>> fn) {
-			return this.translog(fn.apply(new TranslogStats.Builder()).build());
-		}
-
-		/**
-		 * Contains statistics about index warming operations for the node.
-		 * <p>
-		 * API name: {@code warmer}
-		 */
-		public final Builder warmer(@Nullable WarmerStats value) {
-			this.warmer = value;
-			return this;
-		}
-
-		/**
-		 * Contains statistics about index warming operations for the node.
-		 * <p>
-		 * API name: {@code warmer}
-		 */
-		public final Builder warmer(Function<WarmerStats.Builder, ObjectBuilder<WarmerStats>> fn) {
-			return this.warmer(fn.apply(new WarmerStats.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code bulk}
-		 */
-		public final Builder bulk(@Nullable BulkStats value) {
-			this.bulk = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code bulk}
-		 */
-		public final Builder bulk(Function<BulkStats.Builder, ObjectBuilder<BulkStats>> fn) {
-			return this.bulk(fn.apply(new BulkStats.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code shards}
-		 */
-		public final Builder shards(@Nullable ShardsTotalStats value) {
-			this.shards = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code shards}
-		 */
-		public final Builder shards(Function<ShardsTotalStats.Builder, ObjectBuilder<ShardsTotalStats>> fn) {
-			return this.shards(fn.apply(new ShardsTotalStats.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link IndexStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexStats build() {
-			_checkSingleUse();
-
-			return new IndexStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndexStats}
-	 */
-	public static final JsonpDeserializer<IndexStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IndexStats::setupIndexStatsDeserializer);
-
-	protected static void setupIndexStatsDeserializer(ObjectDeserializer<IndexStats.Builder> op) {
-
-		op.add(Builder::completion, CompletionStats._DESERIALIZER, "completion");
-		op.add(Builder::docs, DocStats._DESERIALIZER, "docs");
-		op.add(Builder::fielddata, FielddataStats._DESERIALIZER, "fielddata");
-		op.add(Builder::flush, FlushStats._DESERIALIZER, "flush");
-		op.add(Builder::get, GetStats._DESERIALIZER, "get");
-		op.add(Builder::indexing, IndexingStats._DESERIALIZER, "indexing");
-		op.add(Builder::merges, MergesStats._DESERIALIZER, "merges");
-		op.add(Builder::queryCache, QueryCacheStats._DESERIALIZER, "query_cache");
-		op.add(Builder::recovery, RecoveryStats._DESERIALIZER, "recovery");
-		op.add(Builder::refresh, RefreshStats._DESERIALIZER, "refresh");
-		op.add(Builder::requestCache, RequestCacheStats._DESERIALIZER, "request_cache");
-		op.add(Builder::search, SearchStats._DESERIALIZER, "search");
-		op.add(Builder::segments, SegmentsStats._DESERIALIZER, "segments");
-		op.add(Builder::store, StoreStats._DESERIALIZER, "store");
-		op.add(Builder::translog, TranslogStats._DESERIALIZER, "translog");
-		op.add(Builder::warmer, WarmerStats._DESERIALIZER, "warmer");
-		op.add(Builder::bulk, BulkStats._DESERIALIZER, "bulk");
-		op.add(Builder::shards, ShardsTotalStats._DESERIALIZER, "shards");
-
-	}
+    @Nullable
+    private final CompletionStats completion;
+
+    @Nullable
+    private final DocStats docs;
+
+    @Nullable
+    private final FielddataStats fielddata;
+
+    @Nullable
+    private final FlushStats flush;
+
+    @Nullable
+    private final GetStats get;
+
+    @Nullable
+    private final IndexingStats indexing;
+
+    @Nullable
+    private final MergesStats merges;
+
+    @Nullable
+    private final QueryCacheStats queryCache;
+
+    @Nullable
+    private final RecoveryStats recovery;
+
+    @Nullable
+    private final RefreshStats refresh;
+
+    @Nullable
+    private final RequestCacheStats requestCache;
+
+    @Nullable
+    private final SearchStats search;
+
+    @Nullable
+    private final SegmentsStats segments;
+
+    @Nullable
+    private final StoreStats store;
+
+    @Nullable
+    private final TranslogStats translog;
+
+    @Nullable
+    private final WarmerStats warmer;
+
+    @Nullable
+    private final BulkStats bulk;
+
+    @Nullable
+    private final ShardsTotalStats shards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private IndexStats(Builder builder) {
+
+        this.completion = builder.completion;
+        this.docs = builder.docs;
+        this.fielddata = builder.fielddata;
+        this.flush = builder.flush;
+        this.get = builder.get;
+        this.indexing = builder.indexing;
+        this.merges = builder.merges;
+        this.queryCache = builder.queryCache;
+        this.recovery = builder.recovery;
+        this.refresh = builder.refresh;
+        this.requestCache = builder.requestCache;
+        this.search = builder.search;
+        this.segments = builder.segments;
+        this.store = builder.store;
+        this.translog = builder.translog;
+        this.warmer = builder.warmer;
+        this.bulk = builder.bulk;
+        this.shards = builder.shards;
+
+    }
+
+    public static IndexStats of(Function<Builder, ObjectBuilder<IndexStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Contains statistics about completions across all shards assigned to the node.
+     * <p>
+     * API name: {@code completion}
+     */
+    @Nullable
+    public final CompletionStats completion() {
+        return this.completion;
+    }
+
+    /**
+     * Contains statistics about documents across all primary shards assigned to the
+     * node.
+     * <p>
+     * API name: {@code docs}
+     */
+    @Nullable
+    public final DocStats docs() {
+        return this.docs;
+    }
+
+    /**
+     * Contains statistics about the field data cache across all shards assigned to
+     * the node.
+     * <p>
+     * API name: {@code fielddata}
+     */
+    @Nullable
+    public final FielddataStats fielddata() {
+        return this.fielddata;
+    }
+
+    /**
+     * Contains statistics about flush operations for the node.
+     * <p>
+     * API name: {@code flush}
+     */
+    @Nullable
+    public final FlushStats flush() {
+        return this.flush;
+    }
+
+    /**
+     * Contains statistics about get operations for the node.
+     * <p>
+     * API name: {@code get}
+     */
+    @Nullable
+    public final GetStats get() {
+        return this.get;
+    }
+
+    /**
+     * Contains statistics about indexing operations for the node.
+     * <p>
+     * API name: {@code indexing}
+     */
+    @Nullable
+    public final IndexingStats indexing() {
+        return this.indexing;
+    }
+
+    /**
+     * Contains statistics about merge operations for the node.
+     * <p>
+     * API name: {@code merges}
+     */
+    @Nullable
+    public final MergesStats merges() {
+        return this.merges;
+    }
+
+    /**
+     * Contains statistics about the query cache across all shards assigned to the
+     * node.
+     * <p>
+     * API name: {@code query_cache}
+     */
+    @Nullable
+    public final QueryCacheStats queryCache() {
+        return this.queryCache;
+    }
+
+    /**
+     * Contains statistics about recovery operations for the node.
+     * <p>
+     * API name: {@code recovery}
+     */
+    @Nullable
+    public final RecoveryStats recovery() {
+        return this.recovery;
+    }
+
+    /**
+     * Contains statistics about refresh operations for the node.
+     * <p>
+     * API name: {@code refresh}
+     */
+    @Nullable
+    public final RefreshStats refresh() {
+        return this.refresh;
+    }
+
+    /**
+     * Contains statistics about the request cache across all shards assigned to the
+     * node.
+     * <p>
+     * API name: {@code request_cache}
+     */
+    @Nullable
+    public final RequestCacheStats requestCache() {
+        return this.requestCache;
+    }
+
+    /**
+     * Contains statistics about search operations for the node.
+     * <p>
+     * API name: {@code search}
+     */
+    @Nullable
+    public final SearchStats search() {
+        return this.search;
+    }
+
+    /**
+     * Contains statistics about segments across all shards assigned to the node.
+     * <p>
+     * API name: {@code segments}
+     */
+    @Nullable
+    public final SegmentsStats segments() {
+        return this.segments;
+    }
+
+    /**
+     * Contains statistics about the size of shards assigned to the node.
+     * <p>
+     * API name: {@code store}
+     */
+    @Nullable
+    public final StoreStats store() {
+        return this.store;
+    }
+
+    /**
+     * Contains statistics about transaction log operations for the node.
+     * <p>
+     * API name: {@code translog}
+     */
+    @Nullable
+    public final TranslogStats translog() {
+        return this.translog;
+    }
+
+    /**
+     * Contains statistics about index warming operations for the node.
+     * <p>
+     * API name: {@code warmer}
+     */
+    @Nullable
+    public final WarmerStats warmer() {
+        return this.warmer;
+    }
+
+    /**
+     * API name: {@code bulk}
+     */
+    @Nullable
+    public final BulkStats bulk() {
+        return this.bulk;
+    }
+
+    /**
+     * API name: {@code shards}
+     */
+    @Nullable
+    public final ShardsTotalStats shards() {
+        return this.shards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.completion != null) {
+            generator.writeKey("completion");
+            this.completion.serialize(generator, mapper);
+
+        }
+        if (this.docs != null) {
+            generator.writeKey("docs");
+            this.docs.serialize(generator, mapper);
+
+        }
+        if (this.fielddata != null) {
+            generator.writeKey("fielddata");
+            this.fielddata.serialize(generator, mapper);
+
+        }
+        if (this.flush != null) {
+            generator.writeKey("flush");
+            this.flush.serialize(generator, mapper);
+
+        }
+        if (this.get != null) {
+            generator.writeKey("get");
+            this.get.serialize(generator, mapper);
+
+        }
+        if (this.indexing != null) {
+            generator.writeKey("indexing");
+            this.indexing.serialize(generator, mapper);
+
+        }
+        if (this.merges != null) {
+            generator.writeKey("merges");
+            this.merges.serialize(generator, mapper);
+
+        }
+        if (this.queryCache != null) {
+            generator.writeKey("query_cache");
+            this.queryCache.serialize(generator, mapper);
+
+        }
+        if (this.recovery != null) {
+            generator.writeKey("recovery");
+            this.recovery.serialize(generator, mapper);
+
+        }
+        if (this.refresh != null) {
+            generator.writeKey("refresh");
+            this.refresh.serialize(generator, mapper);
+
+        }
+        if (this.requestCache != null) {
+            generator.writeKey("request_cache");
+            this.requestCache.serialize(generator, mapper);
+
+        }
+        if (this.search != null) {
+            generator.writeKey("search");
+            this.search.serialize(generator, mapper);
+
+        }
+        if (this.segments != null) {
+            generator.writeKey("segments");
+            this.segments.serialize(generator, mapper);
+
+        }
+        if (this.store != null) {
+            generator.writeKey("store");
+            this.store.serialize(generator, mapper);
+
+        }
+        if (this.translog != null) {
+            generator.writeKey("translog");
+            this.translog.serialize(generator, mapper);
+
+        }
+        if (this.warmer != null) {
+            generator.writeKey("warmer");
+            this.warmer.serialize(generator, mapper);
+
+        }
+        if (this.bulk != null) {
+            generator.writeKey("bulk");
+            this.bulk.serialize(generator, mapper);
+
+        }
+        if (this.shards != null) {
+            generator.writeKey("shards");
+            this.shards.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexStats> {
+        @Nullable
+        private CompletionStats completion;
+
+        @Nullable
+        private DocStats docs;
+
+        @Nullable
+        private FielddataStats fielddata;
+
+        @Nullable
+        private FlushStats flush;
+
+        @Nullable
+        private GetStats get;
+
+        @Nullable
+        private IndexingStats indexing;
+
+        @Nullable
+        private MergesStats merges;
+
+        @Nullable
+        private QueryCacheStats queryCache;
+
+        @Nullable
+        private RecoveryStats recovery;
+
+        @Nullable
+        private RefreshStats refresh;
+
+        @Nullable
+        private RequestCacheStats requestCache;
+
+        @Nullable
+        private SearchStats search;
+
+        @Nullable
+        private SegmentsStats segments;
+
+        @Nullable
+        private StoreStats store;
+
+        @Nullable
+        private TranslogStats translog;
+
+        @Nullable
+        private WarmerStats warmer;
+
+        @Nullable
+        private BulkStats bulk;
+
+        @Nullable
+        private ShardsTotalStats shards;
+
+        /**
+         * Contains statistics about completions across all shards assigned to the node.
+         * <p>
+         * API name: {@code completion}
+         */
+        public final Builder completion(@Nullable CompletionStats value) {
+            this.completion = value;
+            return this;
+        }
+
+        /**
+         * Contains statistics about completions across all shards assigned to the node.
+         * <p>
+         * API name: {@code completion}
+         */
+        public final Builder completion(Function<CompletionStats.Builder, ObjectBuilder<CompletionStats>> fn) {
+            return this.completion(fn.apply(new CompletionStats.Builder()).build());
+        }
+
+        /**
+         * Contains statistics about documents across all primary shards assigned to the
+         * node.
+         * <p>
+         * API name: {@code docs}
+         */
+        public final Builder docs(@Nullable DocStats value) {
+            this.docs = value;
+            return this;
+        }
+
+        /**
+         * Contains statistics about documents across all primary shards assigned to the
+         * node.
+         * <p>
+         * API name: {@code docs}
+         */
+        public final Builder docs(Function<DocStats.Builder, ObjectBuilder<DocStats>> fn) {
+            return this.docs(fn.apply(new DocStats.Builder()).build());
+        }
+
+        /**
+         * Contains statistics about the field data cache across all shards assigned to
+         * the node.
+         * <p>
+         * API name: {@code fielddata}
+         */
+        public final Builder fielddata(@Nullable FielddataStats value) {
+            this.fielddata = value;
+            return this;
+        }
+
+        /**
+         * Contains statistics about the field data cache across all shards assigned to
+         * the node.
+         * <p>
+         * API name: {@code fielddata}
+         */
+        public final Builder fielddata(Function<FielddataStats.Builder, ObjectBuilder<FielddataStats>> fn) {
+            return this.fielddata(fn.apply(new FielddataStats.Builder()).build());
+        }
+
+        /**
+         * Contains statistics about flush operations for the node.
+         * <p>
+         * API name: {@code flush}
+         */
+        public final Builder flush(@Nullable FlushStats value) {
+            this.flush = value;
+            return this;
+        }
+
+        /**
+         * Contains statistics about flush operations for the node.
+         * <p>
+         * API name: {@code flush}
+         */
+        public final Builder flush(Function<FlushStats.Builder, ObjectBuilder<FlushStats>> fn) {
+            return this.flush(fn.apply(new FlushStats.Builder()).build());
+        }
+
+        /**
+         * Contains statistics about get operations for the node.
+         * <p>
+         * API name: {@code get}
+         */
+        public final Builder get(@Nullable GetStats value) {
+            this.get = value;
+            return this;
+        }
+
+        /**
+         * Contains statistics about get operations for the node.
+         * <p>
+         * API name: {@code get}
+         */
+        public final Builder get(Function<GetStats.Builder, ObjectBuilder<GetStats>> fn) {
+            return this.get(fn.apply(new GetStats.Builder()).build());
+        }
+
+        /**
+         * Contains statistics about indexing operations for the node.
+         * <p>
+         * API name: {@code indexing}
+         */
+        public final Builder indexing(@Nullable IndexingStats value) {
+            this.indexing = value;
+            return this;
+        }
+
+        /**
+         * Contains statistics about indexing operations for the node.
+         * <p>
+         * API name: {@code indexing}
+         */
+        public final Builder indexing(Function<IndexingStats.Builder, ObjectBuilder<IndexingStats>> fn) {
+            return this.indexing(fn.apply(new IndexingStats.Builder()).build());
+        }
+
+        /**
+         * Contains statistics about merge operations for the node.
+         * <p>
+         * API name: {@code merges}
+         */
+        public final Builder merges(@Nullable MergesStats value) {
+            this.merges = value;
+            return this;
+        }
+
+        /**
+         * Contains statistics about merge operations for the node.
+         * <p>
+         * API name: {@code merges}
+         */
+        public final Builder merges(Function<MergesStats.Builder, ObjectBuilder<MergesStats>> fn) {
+            return this.merges(fn.apply(new MergesStats.Builder()).build());
+        }
+
+        /**
+         * Contains statistics about the query cache across all shards assigned to the
+         * node.
+         * <p>
+         * API name: {@code query_cache}
+         */
+        public final Builder queryCache(@Nullable QueryCacheStats value) {
+            this.queryCache = value;
+            return this;
+        }
+
+        /**
+         * Contains statistics about the query cache across all shards assigned to the
+         * node.
+         * <p>
+         * API name: {@code query_cache}
+         */
+        public final Builder queryCache(Function<QueryCacheStats.Builder, ObjectBuilder<QueryCacheStats>> fn) {
+            return this.queryCache(fn.apply(new QueryCacheStats.Builder()).build());
+        }
+
+        /**
+         * Contains statistics about recovery operations for the node.
+         * <p>
+         * API name: {@code recovery}
+         */
+        public final Builder recovery(@Nullable RecoveryStats value) {
+            this.recovery = value;
+            return this;
+        }
+
+        /**
+         * Contains statistics about recovery operations for the node.
+         * <p>
+         * API name: {@code recovery}
+         */
+        public final Builder recovery(Function<RecoveryStats.Builder, ObjectBuilder<RecoveryStats>> fn) {
+            return this.recovery(fn.apply(new RecoveryStats.Builder()).build());
+        }
+
+        /**
+         * Contains statistics about refresh operations for the node.
+         * <p>
+         * API name: {@code refresh}
+         */
+        public final Builder refresh(@Nullable RefreshStats value) {
+            this.refresh = value;
+            return this;
+        }
+
+        /**
+         * Contains statistics about refresh operations for the node.
+         * <p>
+         * API name: {@code refresh}
+         */
+        public final Builder refresh(Function<RefreshStats.Builder, ObjectBuilder<RefreshStats>> fn) {
+            return this.refresh(fn.apply(new RefreshStats.Builder()).build());
+        }
+
+        /**
+         * Contains statistics about the request cache across all shards assigned to the
+         * node.
+         * <p>
+         * API name: {@code request_cache}
+         */
+        public final Builder requestCache(@Nullable RequestCacheStats value) {
+            this.requestCache = value;
+            return this;
+        }
+
+        /**
+         * Contains statistics about the request cache across all shards assigned to the
+         * node.
+         * <p>
+         * API name: {@code request_cache}
+         */
+        public final Builder requestCache(Function<RequestCacheStats.Builder, ObjectBuilder<RequestCacheStats>> fn) {
+            return this.requestCache(fn.apply(new RequestCacheStats.Builder()).build());
+        }
+
+        /**
+         * Contains statistics about search operations for the node.
+         * <p>
+         * API name: {@code search}
+         */
+        public final Builder search(@Nullable SearchStats value) {
+            this.search = value;
+            return this;
+        }
+
+        /**
+         * Contains statistics about search operations for the node.
+         * <p>
+         * API name: {@code search}
+         */
+        public final Builder search(Function<SearchStats.Builder, ObjectBuilder<SearchStats>> fn) {
+            return this.search(fn.apply(new SearchStats.Builder()).build());
+        }
+
+        /**
+         * Contains statistics about segments across all shards assigned to the node.
+         * <p>
+         * API name: {@code segments}
+         */
+        public final Builder segments(@Nullable SegmentsStats value) {
+            this.segments = value;
+            return this;
+        }
+
+        /**
+         * Contains statistics about segments across all shards assigned to the node.
+         * <p>
+         * API name: {@code segments}
+         */
+        public final Builder segments(Function<SegmentsStats.Builder, ObjectBuilder<SegmentsStats>> fn) {
+            return this.segments(fn.apply(new SegmentsStats.Builder()).build());
+        }
+
+        /**
+         * Contains statistics about the size of shards assigned to the node.
+         * <p>
+         * API name: {@code store}
+         */
+        public final Builder store(@Nullable StoreStats value) {
+            this.store = value;
+            return this;
+        }
+
+        /**
+         * Contains statistics about the size of shards assigned to the node.
+         * <p>
+         * API name: {@code store}
+         */
+        public final Builder store(Function<StoreStats.Builder, ObjectBuilder<StoreStats>> fn) {
+            return this.store(fn.apply(new StoreStats.Builder()).build());
+        }
+
+        /**
+         * Contains statistics about transaction log operations for the node.
+         * <p>
+         * API name: {@code translog}
+         */
+        public final Builder translog(@Nullable TranslogStats value) {
+            this.translog = value;
+            return this;
+        }
+
+        /**
+         * Contains statistics about transaction log operations for the node.
+         * <p>
+         * API name: {@code translog}
+         */
+        public final Builder translog(Function<TranslogStats.Builder, ObjectBuilder<TranslogStats>> fn) {
+            return this.translog(fn.apply(new TranslogStats.Builder()).build());
+        }
+
+        /**
+         * Contains statistics about index warming operations for the node.
+         * <p>
+         * API name: {@code warmer}
+         */
+        public final Builder warmer(@Nullable WarmerStats value) {
+            this.warmer = value;
+            return this;
+        }
+
+        /**
+         * Contains statistics about index warming operations for the node.
+         * <p>
+         * API name: {@code warmer}
+         */
+        public final Builder warmer(Function<WarmerStats.Builder, ObjectBuilder<WarmerStats>> fn) {
+            return this.warmer(fn.apply(new WarmerStats.Builder()).build());
+        }
+
+        /**
+         * API name: {@code bulk}
+         */
+        public final Builder bulk(@Nullable BulkStats value) {
+            this.bulk = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code bulk}
+         */
+        public final Builder bulk(Function<BulkStats.Builder, ObjectBuilder<BulkStats>> fn) {
+            return this.bulk(fn.apply(new BulkStats.Builder()).build());
+        }
+
+        /**
+         * API name: {@code shards}
+         */
+        public final Builder shards(@Nullable ShardsTotalStats value) {
+            this.shards = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code shards}
+         */
+        public final Builder shards(Function<ShardsTotalStats.Builder, ObjectBuilder<ShardsTotalStats>> fn) {
+            return this.shards(fn.apply(new ShardsTotalStats.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link IndexStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexStats build() {
+            _checkSingleUse();
+
+            return new IndexStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndexStats}
+     */
+    public static final JsonpDeserializer<IndexStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexStats::setupIndexStatsDeserializer
+    );
+
+    protected static void setupIndexStatsDeserializer(ObjectDeserializer<IndexStats.Builder> op) {
+
+        op.add(Builder::completion, CompletionStats._DESERIALIZER, "completion");
+        op.add(Builder::docs, DocStats._DESERIALIZER, "docs");
+        op.add(Builder::fielddata, FielddataStats._DESERIALIZER, "fielddata");
+        op.add(Builder::flush, FlushStats._DESERIALIZER, "flush");
+        op.add(Builder::get, GetStats._DESERIALIZER, "get");
+        op.add(Builder::indexing, IndexingStats._DESERIALIZER, "indexing");
+        op.add(Builder::merges, MergesStats._DESERIALIZER, "merges");
+        op.add(Builder::queryCache, QueryCacheStats._DESERIALIZER, "query_cache");
+        op.add(Builder::recovery, RecoveryStats._DESERIALIZER, "recovery");
+        op.add(Builder::refresh, RefreshStats._DESERIALIZER, "refresh");
+        op.add(Builder::requestCache, RequestCacheStats._DESERIALIZER, "request_cache");
+        op.add(Builder::search, SearchStats._DESERIALIZER, "search");
+        op.add(Builder::segments, SegmentsStats._DESERIALIZER, "segments");
+        op.add(Builder::store, StoreStats._DESERIALIZER, "store");
+        op.add(Builder::translog, TranslogStats._DESERIALIZER, "translog");
+        op.add(Builder::warmer, WarmerStats._DESERIALIZER, "warmer");
+        op.add(Builder::bulk, BulkStats._DESERIALIZER, "bulk");
+        op.add(Builder::shards, ShardsTotalStats._DESERIALIZER, "shards");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/IndicesStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/IndicesStats.java
index 02c0c3b983..ced21fc9ba 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/IndicesStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/IndicesStats.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch.indices.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,218 +46,216 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.stats.IndicesStats
 
-
 @JsonpDeserializable
 public class IndicesStats implements JsonpSerializable {
-	private final IndexStats primaries;
+    private final IndexStats primaries;
 
-	private final Map<String, List<ShardStats>> shards;
-
-	private final IndexStats total;
+    private final Map<String, List<ShardStats>> shards;
+
+    private final IndexStats total;
 
-	@Nullable
-	private final String uuid;
+    @Nullable
+    private final String uuid;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private IndicesStats(Builder builder) {
+    private IndicesStats(Builder builder) {
 
-		this.primaries = ApiTypeHelper.requireNonNull(builder.primaries, this, "primaries");
-		this.shards = ApiTypeHelper.unmodifiable(builder.shards);
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
-		this.uuid = builder.uuid;
+        this.primaries = ApiTypeHelper.requireNonNull(builder.primaries, this, "primaries");
+        this.shards = ApiTypeHelper.unmodifiable(builder.shards);
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+        this.uuid = builder.uuid;
 
-	}
-
-	public static IndicesStats of(Function<Builder, ObjectBuilder<IndicesStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code primaries}
-	 */
-	public final IndexStats primaries() {
-		return this.primaries;
-	}
-
-	/**
-	 * API name: {@code shards}
-	 */
-	public final Map<String, List<ShardStats>> shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final IndexStats total() {
-		return this.total;
-	}
-
-	/**
-	 * API name: {@code uuid}
-	 */
-	@Nullable
-	public final String uuid() {
-		return this.uuid;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("primaries");
-		this.primaries.serialize(generator, mapper);
-
-		if (ApiTypeHelper.isDefined(this.shards)) {
-			generator.writeKey("shards");
-			generator.writeStartObject();
-			for (Map.Entry<String, List<ShardStats>> item0 : this.shards.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.writeStartArray();
-				if (item0.getValue() != null) {
-					for (ShardStats item1 : item0.getValue()) {
-						item1.serialize(generator, mapper);
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("total");
-		this.total.serialize(generator, mapper);
-
-		if (this.uuid != null) {
-			generator.writeKey("uuid");
-			generator.write(this.uuid);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndicesStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesStats> {
-		private IndexStats primaries;
-
-		@Nullable
-		private Map<String, List<ShardStats>> shards;
-
-		private IndexStats total;
-
-		@Nullable
-		private String uuid;
-
-		/**
-		 * Required - API name: {@code primaries}
-		 */
-		public final Builder primaries(IndexStats value) {
-			this.primaries = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code primaries}
-		 */
-		public final Builder primaries(Function<IndexStats.Builder, ObjectBuilder<IndexStats>> fn) {
-			return this.primaries(fn.apply(new IndexStats.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code shards}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>shards</code>.
-		 */
-		public final Builder shards(Map<String, List<ShardStats>> map) {
-			this.shards = _mapPutAll(this.shards, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code shards}
-		 * <p>
-		 * Adds an entry to <code>shards</code>.
-		 */
-		public final Builder shards(String key, List<ShardStats> value) {
-			this.shards = _mapPut(this.shards, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(IndexStats value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(Function<IndexStats.Builder, ObjectBuilder<IndexStats>> fn) {
-			return this.total(fn.apply(new IndexStats.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code uuid}
-		 */
-		public final Builder uuid(@Nullable String value) {
-			this.uuid = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IndicesStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndicesStats build() {
-			_checkSingleUse();
-
-			return new IndicesStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndicesStats}
-	 */
-	public static final JsonpDeserializer<IndicesStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IndicesStats::setupIndicesStatsDeserializer);
-
-	protected static void setupIndicesStatsDeserializer(ObjectDeserializer<IndicesStats.Builder> op) {
-
-		op.add(Builder::primaries, IndexStats._DESERIALIZER, "primaries");
-		op.add(Builder::shards,
-				JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.arrayDeserializer(ShardStats._DESERIALIZER)),
-				"shards");
-		op.add(Builder::total, IndexStats._DESERIALIZER, "total");
-		op.add(Builder::uuid, JsonpDeserializer.stringDeserializer(), "uuid");
-
-	}
+    }
+
+    public static IndicesStats of(Function<Builder, ObjectBuilder<IndicesStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code primaries}
+     */
+    public final IndexStats primaries() {
+        return this.primaries;
+    }
+
+    /**
+     * API name: {@code shards}
+     */
+    public final Map<String, List<ShardStats>> shards() {
+        return this.shards;
+    }
+
+    /**
+     * Required - API name: {@code total}
+     */
+    public final IndexStats total() {
+        return this.total;
+    }
+
+    /**
+     * API name: {@code uuid}
+     */
+    @Nullable
+    public final String uuid() {
+        return this.uuid;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("primaries");
+        this.primaries.serialize(generator, mapper);
+
+        if (ApiTypeHelper.isDefined(this.shards)) {
+            generator.writeKey("shards");
+            generator.writeStartObject();
+            for (Map.Entry<String, List<ShardStats>> item0 : this.shards.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.writeStartArray();
+                if (item0.getValue() != null) {
+                    for (ShardStats item1 : item0.getValue()) {
+                        item1.serialize(generator, mapper);
+
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("total");
+        this.total.serialize(generator, mapper);
+
+        if (this.uuid != null) {
+            generator.writeKey("uuid");
+            generator.write(this.uuid);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndicesStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesStats> {
+        private IndexStats primaries;
+
+        @Nullable
+        private Map<String, List<ShardStats>> shards;
+
+        private IndexStats total;
+
+        @Nullable
+        private String uuid;
+
+        /**
+         * Required - API name: {@code primaries}
+         */
+        public final Builder primaries(IndexStats value) {
+            this.primaries = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code primaries}
+         */
+        public final Builder primaries(Function<IndexStats.Builder, ObjectBuilder<IndexStats>> fn) {
+            return this.primaries(fn.apply(new IndexStats.Builder()).build());
+        }
+
+        /**
+         * API name: {@code shards}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>shards</code>.
+         */
+        public final Builder shards(Map<String, List<ShardStats>> map) {
+            this.shards = _mapPutAll(this.shards, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code shards}
+         * <p>
+         * Adds an entry to <code>shards</code>.
+         */
+        public final Builder shards(String key, List<ShardStats> value) {
+            this.shards = _mapPut(this.shards, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(IndexStats value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(Function<IndexStats.Builder, ObjectBuilder<IndexStats>> fn) {
+            return this.total(fn.apply(new IndexStats.Builder()).build());
+        }
+
+        /**
+         * API name: {@code uuid}
+         */
+        public final Builder uuid(@Nullable String value) {
+            this.uuid = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link IndicesStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndicesStats build() {
+            _checkSingleUse();
+
+            return new IndicesStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndicesStats}
+     */
+    public static final JsonpDeserializer<IndicesStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndicesStats::setupIndicesStatsDeserializer
+    );
+
+    protected static void setupIndicesStatsDeserializer(ObjectDeserializer<IndicesStats.Builder> op) {
+
+        op.add(Builder::primaries, IndexStats._DESERIALIZER, "primaries");
+        op.add(
+            Builder::shards,
+            JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.arrayDeserializer(ShardStats._DESERIALIZER)),
+            "shards"
+        );
+        op.add(Builder::total, IndexStats._DESERIALIZER, "total");
+        op.add(Builder::uuid, JsonpDeserializer.stringDeserializer(), "uuid");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardCommit.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardCommit.java
index d4b076cc77..75b593c04e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardCommit.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardCommit.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,188 +44,185 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: indices.stats.ShardCommit
 
-
 @JsonpDeserializable
 public class ShardCommit implements JsonpSerializable {
-	private final int generation;
+    private final int generation;
 
-	private final String id;
+    private final String id;
 
-	private final long numDocs;
+    private final long numDocs;
 
-	private final Map<String, String> userData;
+    private final Map<String, String> userData;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ShardCommit(Builder builder) {
+    private ShardCommit(Builder builder) {
 
-		this.generation = ApiTypeHelper.requireNonNull(builder.generation, this, "generation");
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.numDocs = ApiTypeHelper.requireNonNull(builder.numDocs, this, "numDocs");
-		this.userData = ApiTypeHelper.unmodifiableRequired(builder.userData, this, "userData");
+        this.generation = ApiTypeHelper.requireNonNull(builder.generation, this, "generation");
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.numDocs = ApiTypeHelper.requireNonNull(builder.numDocs, this, "numDocs");
+        this.userData = ApiTypeHelper.unmodifiableRequired(builder.userData, this, "userData");
 
-	}
+    }
 
-	public static ShardCommit of(Function<Builder, ObjectBuilder<ShardCommit>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ShardCommit of(Function<Builder, ObjectBuilder<ShardCommit>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code generation}
-	 */
-	public final int generation() {
-		return this.generation;
-	}
-
-	/**
-	 * Required - API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - API name: {@code num_docs}
-	 */
-	public final long numDocs() {
-		return this.numDocs;
-	}
-
-	/**
-	 * Required - API name: {@code user_data}
-	 */
-	public final Map<String, String> userData() {
-		return this.userData;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("generation");
-		generator.write(this.generation);
-
-		generator.writeKey("id");
-		generator.write(this.id);
-
-		generator.writeKey("num_docs");
-		generator.write(this.numDocs);
-
-		if (ApiTypeHelper.isDefined(this.userData)) {
-			generator.writeKey("user_data");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.userData.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardCommit}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardCommit> {
-		private Integer generation;
-
-		private String id;
-
-		private Long numDocs;
-
-		private Map<String, String> userData;
-
-		/**
-		 * Required - API name: {@code generation}
-		 */
-		public final Builder generation(int value) {
-			this.generation = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code num_docs}
-		 */
-		public final Builder numDocs(long value) {
-			this.numDocs = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code user_data}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>userData</code>.
-		 */
-		public final Builder userData(Map<String, String> map) {
-			this.userData = _mapPutAll(this.userData, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code user_data}
-		 * <p>
-		 * Adds an entry to <code>userData</code>.
-		 */
-		public final Builder userData(String key, String value) {
-			this.userData = _mapPut(this.userData, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShardCommit}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardCommit build() {
-			_checkSingleUse();
-
-			return new ShardCommit(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardCommit}
-	 */
-	public static final JsonpDeserializer<ShardCommit> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShardCommit::setupShardCommitDeserializer);
-
-	protected static void setupShardCommitDeserializer(ObjectDeserializer<ShardCommit.Builder> op) {
-
-		op.add(Builder::generation, JsonpDeserializer.integerDeserializer(), "generation");
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::numDocs, JsonpDeserializer.longDeserializer(), "num_docs");
-		op.add(Builder::userData, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
-				"user_data");
-
-	}
+    /**
+     * Required - API name: {@code generation}
+     */
+    public final int generation() {
+        return this.generation;
+    }
+
+    /**
+     * Required - API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - API name: {@code num_docs}
+     */
+    public final long numDocs() {
+        return this.numDocs;
+    }
+
+    /**
+     * Required - API name: {@code user_data}
+     */
+    public final Map<String, String> userData() {
+        return this.userData;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("generation");
+        generator.write(this.generation);
+
+        generator.writeKey("id");
+        generator.write(this.id);
+
+        generator.writeKey("num_docs");
+        generator.write(this.numDocs);
+
+        if (ApiTypeHelper.isDefined(this.userData)) {
+            generator.writeKey("user_data");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.userData.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardCommit}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardCommit> {
+        private Integer generation;
+
+        private String id;
+
+        private Long numDocs;
+
+        private Map<String, String> userData;
+
+        /**
+         * Required - API name: {@code generation}
+         */
+        public final Builder generation(int value) {
+            this.generation = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code num_docs}
+         */
+        public final Builder numDocs(long value) {
+            this.numDocs = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code user_data}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>userData</code>.
+         */
+        public final Builder userData(Map<String, String> map) {
+            this.userData = _mapPutAll(this.userData, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code user_data}
+         * <p>
+         * Adds an entry to <code>userData</code>.
+         */
+        public final Builder userData(String key, String value) {
+            this.userData = _mapPut(this.userData, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShardCommit}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardCommit build() {
+            _checkSingleUse();
+
+            return new ShardCommit(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardCommit}
+     */
+    public static final JsonpDeserializer<ShardCommit> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardCommit::setupShardCommitDeserializer
+    );
+
+    protected static void setupShardCommitDeserializer(ObjectDeserializer<ShardCommit.Builder> op) {
+
+        op.add(Builder::generation, JsonpDeserializer.integerDeserializer(), "generation");
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::numDocs, JsonpDeserializer.longDeserializer(), "num_docs");
+        op.add(Builder::userData, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "user_data");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardFileSizeInfo.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardFileSizeInfo.java
index e4abcdba2c..a24eda914e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardFileSizeInfo.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardFileSizeInfo.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,235 +44,233 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.stats.ShardFileSizeInfo
 
-
 @JsonpDeserializable
 public class ShardFileSizeInfo implements JsonpSerializable {
-	private final String description;
-
-	private final long sizeInBytes;
-
-	@Nullable
-	private final Long minSizeInBytes;
-
-	@Nullable
-	private final Long maxSizeInBytes;
-
-	@Nullable
-	private final Long averageSizeInBytes;
-
-	@Nullable
-	private final Long count;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShardFileSizeInfo(Builder builder) {
-
-		this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
-		this.sizeInBytes = ApiTypeHelper.requireNonNull(builder.sizeInBytes, this, "sizeInBytes");
-		this.minSizeInBytes = builder.minSizeInBytes;
-		this.maxSizeInBytes = builder.maxSizeInBytes;
-		this.averageSizeInBytes = builder.averageSizeInBytes;
-		this.count = builder.count;
-
-	}
-
-	public static ShardFileSizeInfo of(Function<Builder, ObjectBuilder<ShardFileSizeInfo>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code description}
-	 */
-	public final String description() {
-		return this.description;
-	}
-
-	/**
-	 * Required - API name: {@code size_in_bytes}
-	 */
-	public final long sizeInBytes() {
-		return this.sizeInBytes;
-	}
-
-	/**
-	 * API name: {@code min_size_in_bytes}
-	 */
-	@Nullable
-	public final Long minSizeInBytes() {
-		return this.minSizeInBytes;
-	}
-
-	/**
-	 * API name: {@code max_size_in_bytes}
-	 */
-	@Nullable
-	public final Long maxSizeInBytes() {
-		return this.maxSizeInBytes;
-	}
-
-	/**
-	 * API name: {@code average_size_in_bytes}
-	 */
-	@Nullable
-	public final Long averageSizeInBytes() {
-		return this.averageSizeInBytes;
-	}
-
-	/**
-	 * API name: {@code count}
-	 */
-	@Nullable
-	public final Long count() {
-		return this.count;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("description");
-		generator.write(this.description);
-
-		generator.writeKey("size_in_bytes");
-		generator.write(this.sizeInBytes);
-
-		if (this.minSizeInBytes != null) {
-			generator.writeKey("min_size_in_bytes");
-			generator.write(this.minSizeInBytes);
-
-		}
-		if (this.maxSizeInBytes != null) {
-			generator.writeKey("max_size_in_bytes");
-			generator.write(this.maxSizeInBytes);
-
-		}
-		if (this.averageSizeInBytes != null) {
-			generator.writeKey("average_size_in_bytes");
-			generator.write(this.averageSizeInBytes);
-
-		}
-		if (this.count != null) {
-			generator.writeKey("count");
-			generator.write(this.count);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardFileSizeInfo}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardFileSizeInfo> {
-		private String description;
-
-		private Long sizeInBytes;
-
-		@Nullable
-		private Long minSizeInBytes;
-
-		@Nullable
-		private Long maxSizeInBytes;
-
-		@Nullable
-		private Long averageSizeInBytes;
-
-		@Nullable
-		private Long count;
-
-		/**
-		 * Required - API name: {@code description}
-		 */
-		public final Builder description(String value) {
-			this.description = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code size_in_bytes}
-		 */
-		public final Builder sizeInBytes(long value) {
-			this.sizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code min_size_in_bytes}
-		 */
-		public final Builder minSizeInBytes(@Nullable Long value) {
-			this.minSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_size_in_bytes}
-		 */
-		public final Builder maxSizeInBytes(@Nullable Long value) {
-			this.maxSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code average_size_in_bytes}
-		 */
-		public final Builder averageSizeInBytes(@Nullable Long value) {
-			this.averageSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code count}
-		 */
-		public final Builder count(@Nullable Long value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShardFileSizeInfo}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardFileSizeInfo build() {
-			_checkSingleUse();
-
-			return new ShardFileSizeInfo(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardFileSizeInfo}
-	 */
-	public static final JsonpDeserializer<ShardFileSizeInfo> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ShardFileSizeInfo::setupShardFileSizeInfoDeserializer);
-
-	protected static void setupShardFileSizeInfoDeserializer(ObjectDeserializer<ShardFileSizeInfo.Builder> op) {
-
-		op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
-		op.add(Builder::sizeInBytes, JsonpDeserializer.longDeserializer(), "size_in_bytes");
-		op.add(Builder::minSizeInBytes, JsonpDeserializer.longDeserializer(), "min_size_in_bytes");
-		op.add(Builder::maxSizeInBytes, JsonpDeserializer.longDeserializer(), "max_size_in_bytes");
-		op.add(Builder::averageSizeInBytes, JsonpDeserializer.longDeserializer(), "average_size_in_bytes");
-		op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
-
-	}
+    private final String description;
+
+    private final long sizeInBytes;
+
+    @Nullable
+    private final Long minSizeInBytes;
+
+    @Nullable
+    private final Long maxSizeInBytes;
+
+    @Nullable
+    private final Long averageSizeInBytes;
+
+    @Nullable
+    private final Long count;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShardFileSizeInfo(Builder builder) {
+
+        this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
+        this.sizeInBytes = ApiTypeHelper.requireNonNull(builder.sizeInBytes, this, "sizeInBytes");
+        this.minSizeInBytes = builder.minSizeInBytes;
+        this.maxSizeInBytes = builder.maxSizeInBytes;
+        this.averageSizeInBytes = builder.averageSizeInBytes;
+        this.count = builder.count;
+
+    }
+
+    public static ShardFileSizeInfo of(Function<Builder, ObjectBuilder<ShardFileSizeInfo>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code description}
+     */
+    public final String description() {
+        return this.description;
+    }
+
+    /**
+     * Required - API name: {@code size_in_bytes}
+     */
+    public final long sizeInBytes() {
+        return this.sizeInBytes;
+    }
+
+    /**
+     * API name: {@code min_size_in_bytes}
+     */
+    @Nullable
+    public final Long minSizeInBytes() {
+        return this.minSizeInBytes;
+    }
+
+    /**
+     * API name: {@code max_size_in_bytes}
+     */
+    @Nullable
+    public final Long maxSizeInBytes() {
+        return this.maxSizeInBytes;
+    }
+
+    /**
+     * API name: {@code average_size_in_bytes}
+     */
+    @Nullable
+    public final Long averageSizeInBytes() {
+        return this.averageSizeInBytes;
+    }
+
+    /**
+     * API name: {@code count}
+     */
+    @Nullable
+    public final Long count() {
+        return this.count;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("description");
+        generator.write(this.description);
+
+        generator.writeKey("size_in_bytes");
+        generator.write(this.sizeInBytes);
+
+        if (this.minSizeInBytes != null) {
+            generator.writeKey("min_size_in_bytes");
+            generator.write(this.minSizeInBytes);
+
+        }
+        if (this.maxSizeInBytes != null) {
+            generator.writeKey("max_size_in_bytes");
+            generator.write(this.maxSizeInBytes);
+
+        }
+        if (this.averageSizeInBytes != null) {
+            generator.writeKey("average_size_in_bytes");
+            generator.write(this.averageSizeInBytes);
+
+        }
+        if (this.count != null) {
+            generator.writeKey("count");
+            generator.write(this.count);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardFileSizeInfo}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardFileSizeInfo> {
+        private String description;
+
+        private Long sizeInBytes;
+
+        @Nullable
+        private Long minSizeInBytes;
+
+        @Nullable
+        private Long maxSizeInBytes;
+
+        @Nullable
+        private Long averageSizeInBytes;
+
+        @Nullable
+        private Long count;
+
+        /**
+         * Required - API name: {@code description}
+         */
+        public final Builder description(String value) {
+            this.description = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code size_in_bytes}
+         */
+        public final Builder sizeInBytes(long value) {
+            this.sizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code min_size_in_bytes}
+         */
+        public final Builder minSizeInBytes(@Nullable Long value) {
+            this.minSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max_size_in_bytes}
+         */
+        public final Builder maxSizeInBytes(@Nullable Long value) {
+            this.maxSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code average_size_in_bytes}
+         */
+        public final Builder averageSizeInBytes(@Nullable Long value) {
+            this.averageSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code count}
+         */
+        public final Builder count(@Nullable Long value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShardFileSizeInfo}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardFileSizeInfo build() {
+            _checkSingleUse();
+
+            return new ShardFileSizeInfo(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardFileSizeInfo}
+     */
+    public static final JsonpDeserializer<ShardFileSizeInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardFileSizeInfo::setupShardFileSizeInfoDeserializer
+    );
+
+    protected static void setupShardFileSizeInfoDeserializer(ObjectDeserializer<ShardFileSizeInfo.Builder> op) {
+
+        op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
+        op.add(Builder::sizeInBytes, JsonpDeserializer.longDeserializer(), "size_in_bytes");
+        op.add(Builder::minSizeInBytes, JsonpDeserializer.longDeserializer(), "min_size_in_bytes");
+        op.add(Builder::maxSizeInBytes, JsonpDeserializer.longDeserializer(), "max_size_in_bytes");
+        op.add(Builder::averageSizeInBytes, JsonpDeserializer.longDeserializer(), "average_size_in_bytes");
+        op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardLease.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardLease.java
index baa64f353d..b946fe60f1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardLease.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardLease.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.indices.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,165 +43,164 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: indices.stats.ShardLease
 
-
 @JsonpDeserializable
 public class ShardLease implements JsonpSerializable {
-	private final String id;
+    private final String id;
 
-	private final long retainingSeqNo;
+    private final long retainingSeqNo;
 
-	private final long timestamp;
+    private final long timestamp;
 
-	private final String source;
+    private final String source;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ShardLease(Builder builder) {
+    private ShardLease(Builder builder) {
 
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.retainingSeqNo = ApiTypeHelper.requireNonNull(builder.retainingSeqNo, this, "retainingSeqNo");
-		this.timestamp = ApiTypeHelper.requireNonNull(builder.timestamp, this, "timestamp");
-		this.source = ApiTypeHelper.requireNonNull(builder.source, this, "source");
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.retainingSeqNo = ApiTypeHelper.requireNonNull(builder.retainingSeqNo, this, "retainingSeqNo");
+        this.timestamp = ApiTypeHelper.requireNonNull(builder.timestamp, this, "timestamp");
+        this.source = ApiTypeHelper.requireNonNull(builder.source, this, "source");
 
-	}
+    }
 
-	public static ShardLease of(Function<Builder, ObjectBuilder<ShardLease>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ShardLease of(Function<Builder, ObjectBuilder<ShardLease>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - API name: {@code retaining_seq_no}
-	 */
-	public final long retainingSeqNo() {
-		return this.retainingSeqNo;
-	}
-
-	/**
-	 * Required - API name: {@code timestamp}
-	 */
-	public final long timestamp() {
-		return this.timestamp;
-	}
-
-	/**
-	 * Required - API name: {@code source}
-	 */
-	public final String source() {
-		return this.source;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("id");
-		generator.write(this.id);
-
-		generator.writeKey("retaining_seq_no");
-		generator.write(this.retainingSeqNo);
-
-		generator.writeKey("timestamp");
-		generator.write(this.timestamp);
-
-		generator.writeKey("source");
-		generator.write(this.source);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardLease}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardLease> {
-		private String id;
-
-		private Long retainingSeqNo;
-
-		private Long timestamp;
-
-		private String source;
-
-		/**
-		 * Required - API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code retaining_seq_no}
-		 */
-		public final Builder retainingSeqNo(long value) {
-			this.retainingSeqNo = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code timestamp}
-		 */
-		public final Builder timestamp(long value) {
-			this.timestamp = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code source}
-		 */
-		public final Builder source(String value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShardLease}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardLease build() {
-			_checkSingleUse();
-
-			return new ShardLease(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardLease}
-	 */
-	public static final JsonpDeserializer<ShardLease> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShardLease::setupShardLeaseDeserializer);
-
-	protected static void setupShardLeaseDeserializer(ObjectDeserializer<ShardLease.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
-		op.add(Builder::retainingSeqNo, JsonpDeserializer.longDeserializer(), "retaining_seq_no");
-		op.add(Builder::timestamp, JsonpDeserializer.longDeserializer(), "timestamp");
-		op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source");
-
-	}
+    /**
+     * Required - API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - API name: {@code retaining_seq_no}
+     */
+    public final long retainingSeqNo() {
+        return this.retainingSeqNo;
+    }
+
+    /**
+     * Required - API name: {@code timestamp}
+     */
+    public final long timestamp() {
+        return this.timestamp;
+    }
+
+    /**
+     * Required - API name: {@code source}
+     */
+    public final String source() {
+        return this.source;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("id");
+        generator.write(this.id);
+
+        generator.writeKey("retaining_seq_no");
+        generator.write(this.retainingSeqNo);
+
+        generator.writeKey("timestamp");
+        generator.write(this.timestamp);
+
+        generator.writeKey("source");
+        generator.write(this.source);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardLease}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardLease> {
+        private String id;
+
+        private Long retainingSeqNo;
+
+        private Long timestamp;
+
+        private String source;
+
+        /**
+         * Required - API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code retaining_seq_no}
+         */
+        public final Builder retainingSeqNo(long value) {
+            this.retainingSeqNo = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code timestamp}
+         */
+        public final Builder timestamp(long value) {
+            this.timestamp = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code source}
+         */
+        public final Builder source(String value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShardLease}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardLease build() {
+            _checkSingleUse();
+
+            return new ShardLease(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardLease}
+     */
+    public static final JsonpDeserializer<ShardLease> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardLease::setupShardLeaseDeserializer
+    );
+
+    protected static void setupShardLeaseDeserializer(ObjectDeserializer<ShardLease.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+        op.add(Builder::retainingSeqNo, JsonpDeserializer.longDeserializer(), "retaining_seq_no");
+        op.add(Builder::timestamp, JsonpDeserializer.longDeserializer(), "timestamp");
+        op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardPath.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardPath.java
index 4b83ccae80..4703b36255 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardPath.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardPath.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.indices.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,141 +43,140 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: indices.stats.ShardPath
 
-
 @JsonpDeserializable
 public class ShardPath implements JsonpSerializable {
-	private final String dataPath;
-
-	private final boolean isCustomDataPath;
-
-	private final String statePath;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShardPath(Builder builder) {
-
-		this.dataPath = ApiTypeHelper.requireNonNull(builder.dataPath, this, "dataPath");
-		this.isCustomDataPath = ApiTypeHelper.requireNonNull(builder.isCustomDataPath, this, "isCustomDataPath");
-		this.statePath = ApiTypeHelper.requireNonNull(builder.statePath, this, "statePath");
-
-	}
-
-	public static ShardPath of(Function<Builder, ObjectBuilder<ShardPath>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code data_path}
-	 */
-	public final String dataPath() {
-		return this.dataPath;
-	}
+    private final String dataPath;
 
-	/**
-	 * Required - API name: {@code is_custom_data_path}
-	 */
-	public final boolean isCustomDataPath() {
-		return this.isCustomDataPath;
-	}
-
-	/**
-	 * Required - API name: {@code state_path}
-	 */
-	public final String statePath() {
-		return this.statePath;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("data_path");
-		generator.write(this.dataPath);
-
-		generator.writeKey("is_custom_data_path");
-		generator.write(this.isCustomDataPath);
-
-		generator.writeKey("state_path");
-		generator.write(this.statePath);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardPath}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardPath> {
-		private String dataPath;
-
-		private Boolean isCustomDataPath;
-
-		private String statePath;
-
-		/**
-		 * Required - API name: {@code data_path}
-		 */
-		public final Builder dataPath(String value) {
-			this.dataPath = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code is_custom_data_path}
-		 */
-		public final Builder isCustomDataPath(boolean value) {
-			this.isCustomDataPath = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code state_path}
-		 */
-		public final Builder statePath(String value) {
-			this.statePath = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShardPath}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardPath build() {
-			_checkSingleUse();
-
-			return new ShardPath(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardPath}
-	 */
-	public static final JsonpDeserializer<ShardPath> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShardPath::setupShardPathDeserializer);
-
-	protected static void setupShardPathDeserializer(ObjectDeserializer<ShardPath.Builder> op) {
-
-		op.add(Builder::dataPath, JsonpDeserializer.stringDeserializer(), "data_path");
-		op.add(Builder::isCustomDataPath, JsonpDeserializer.booleanDeserializer(), "is_custom_data_path");
-		op.add(Builder::statePath, JsonpDeserializer.stringDeserializer(), "state_path");
-
-	}
+    private final boolean isCustomDataPath;
+
+    private final String statePath;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShardPath(Builder builder) {
+
+        this.dataPath = ApiTypeHelper.requireNonNull(builder.dataPath, this, "dataPath");
+        this.isCustomDataPath = ApiTypeHelper.requireNonNull(builder.isCustomDataPath, this, "isCustomDataPath");
+        this.statePath = ApiTypeHelper.requireNonNull(builder.statePath, this, "statePath");
+
+    }
+
+    public static ShardPath of(Function<Builder, ObjectBuilder<ShardPath>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code data_path}
+     */
+    public final String dataPath() {
+        return this.dataPath;
+    }
+
+    /**
+     * Required - API name: {@code is_custom_data_path}
+     */
+    public final boolean isCustomDataPath() {
+        return this.isCustomDataPath;
+    }
+
+    /**
+     * Required - API name: {@code state_path}
+     */
+    public final String statePath() {
+        return this.statePath;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("data_path");
+        generator.write(this.dataPath);
+
+        generator.writeKey("is_custom_data_path");
+        generator.write(this.isCustomDataPath);
+
+        generator.writeKey("state_path");
+        generator.write(this.statePath);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardPath}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardPath> {
+        private String dataPath;
+
+        private Boolean isCustomDataPath;
+
+        private String statePath;
+
+        /**
+         * Required - API name: {@code data_path}
+         */
+        public final Builder dataPath(String value) {
+            this.dataPath = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code is_custom_data_path}
+         */
+        public final Builder isCustomDataPath(boolean value) {
+            this.isCustomDataPath = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code state_path}
+         */
+        public final Builder statePath(String value) {
+            this.statePath = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShardPath}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardPath build() {
+            _checkSingleUse();
+
+            return new ShardPath(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardPath}
+     */
+    public static final JsonpDeserializer<ShardPath> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardPath::setupShardPathDeserializer
+    );
+
+    protected static void setupShardPathDeserializer(ObjectDeserializer<ShardPath.Builder> op) {
+
+        op.add(Builder::dataPath, JsonpDeserializer.stringDeserializer(), "data_path");
+        op.add(Builder::isCustomDataPath, JsonpDeserializer.booleanDeserializer(), "is_custom_data_path");
+        op.add(Builder::statePath, JsonpDeserializer.stringDeserializer(), "state_path");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardQueryCache.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardQueryCache.java
index 5df7edad57..8819b2c232 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardQueryCache.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardQueryCache.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.indices.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,236 +43,236 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: indices.stats.ShardQueryCache
 
 @JsonpDeserializable
 public class ShardQueryCache implements JsonpSerializable {
-	private final long cacheCount;
-
-	private final long cacheSize;
-
-	private final long evictions;
-
-	private final long hitCount;
-
-	private final long memorySizeInBytes;
+    private final long cacheCount;
+
+    private final long cacheSize;
+
+    private final long evictions;
+
+    private final long hitCount;
+
+    private final long memorySizeInBytes;
 
-	private final long missCount;
-
-	private final long totalCount;
+    private final long missCount;
+
+    private final long totalCount;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ShardQueryCache(Builder builder) {
+    private ShardQueryCache(Builder builder) {
 
-		this.cacheCount = ApiTypeHelper.requireNonNull(builder.cacheCount, this, "cacheCount");
-		this.cacheSize = ApiTypeHelper.requireNonNull(builder.cacheSize, this, "cacheSize");
-		this.evictions = ApiTypeHelper.requireNonNull(builder.evictions, this, "evictions");
-		this.hitCount = ApiTypeHelper.requireNonNull(builder.hitCount, this, "hitCount");
-		this.memorySizeInBytes = ApiTypeHelper.requireNonNull(builder.memorySizeInBytes, this, "memorySizeInBytes");
-		this.missCount = ApiTypeHelper.requireNonNull(builder.missCount, this, "missCount");
-		this.totalCount = ApiTypeHelper.requireNonNull(builder.totalCount, this, "totalCount");
+        this.cacheCount = ApiTypeHelper.requireNonNull(builder.cacheCount, this, "cacheCount");
+        this.cacheSize = ApiTypeHelper.requireNonNull(builder.cacheSize, this, "cacheSize");
+        this.evictions = ApiTypeHelper.requireNonNull(builder.evictions, this, "evictions");
+        this.hitCount = ApiTypeHelper.requireNonNull(builder.hitCount, this, "hitCount");
+        this.memorySizeInBytes = ApiTypeHelper.requireNonNull(builder.memorySizeInBytes, this, "memorySizeInBytes");
+        this.missCount = ApiTypeHelper.requireNonNull(builder.missCount, this, "missCount");
+        this.totalCount = ApiTypeHelper.requireNonNull(builder.totalCount, this, "totalCount");
 
-	}
+    }
 
-	public static ShardQueryCache of(Function<Builder, ObjectBuilder<ShardQueryCache>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ShardQueryCache of(Function<Builder, ObjectBuilder<ShardQueryCache>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code cache_count}
-	 */
-	public final long cacheCount() {
-		return this.cacheCount;
-	}
+    /**
+     * Required - API name: {@code cache_count}
+     */
+    public final long cacheCount() {
+        return this.cacheCount;
+    }
 
-	/**
-	 * Required - API name: {@code cache_size}
-	 */
-	public final long cacheSize() {
-		return this.cacheSize;
-	}
+    /**
+     * Required - API name: {@code cache_size}
+     */
+    public final long cacheSize() {
+        return this.cacheSize;
+    }
 
-	/**
-	 * Required - API name: {@code evictions}
-	 */
-	public final long evictions() {
-		return this.evictions;
-	}
+    /**
+     * Required - API name: {@code evictions}
+     */
+    public final long evictions() {
+        return this.evictions;
+    }
 
-	/**
-	 * Required - API name: {@code hit_count}
-	 */
-	public final long hitCount() {
-		return this.hitCount;
-	}
+    /**
+     * Required - API name: {@code hit_count}
+     */
+    public final long hitCount() {
+        return this.hitCount;
+    }
 
-	/**
-	 * Required - API name: {@code memory_size_in_bytes}
-	 */
-	public final long memorySizeInBytes() {
-		return this.memorySizeInBytes;
-	}
+    /**
+     * Required - API name: {@code memory_size_in_bytes}
+     */
+    public final long memorySizeInBytes() {
+        return this.memorySizeInBytes;
+    }
 
-	/**
-	 * Required - API name: {@code miss_count}
-	 */
-	public final long missCount() {
-		return this.missCount;
-	}
-
-	/**
-	 * Required - API name: {@code total_count}
-	 */
-	public final long totalCount() {
-		return this.totalCount;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("cache_count");
-		generator.write(this.cacheCount);
-
-		generator.writeKey("cache_size");
-		generator.write(this.cacheSize);
-
-		generator.writeKey("evictions");
-		generator.write(this.evictions);
-
-		generator.writeKey("hit_count");
-		generator.write(this.hitCount);
-
-		generator.writeKey("memory_size_in_bytes");
-		generator.write(this.memorySizeInBytes);
-
-		generator.writeKey("miss_count");
-		generator.write(this.missCount);
-
-		generator.writeKey("total_count");
-		generator.write(this.totalCount);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardQueryCache}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardQueryCache> {
-		private Long cacheCount;
-
-		private Long cacheSize;
-
-		private Long evictions;
-
-		private Long hitCount;
-
-		private Long memorySizeInBytes;
-
-		private Long missCount;
-
-		private Long totalCount;
-
-		/**
-		 * Required - API name: {@code cache_count}
-		 */
-		public final Builder cacheCount(long value) {
-			this.cacheCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code cache_size}
-		 */
-		public final Builder cacheSize(long value) {
-			this.cacheSize = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code evictions}
-		 */
-		public final Builder evictions(long value) {
-			this.evictions = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code hit_count}
-		 */
-		public final Builder hitCount(long value) {
-			this.hitCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code memory_size_in_bytes}
-		 */
-		public final Builder memorySizeInBytes(long value) {
-			this.memorySizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code miss_count}
-		 */
-		public final Builder missCount(long value) {
-			this.missCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_count}
-		 */
-		public final Builder totalCount(long value) {
-			this.totalCount = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShardQueryCache}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardQueryCache build() {
-			_checkSingleUse();
-
-			return new ShardQueryCache(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardQueryCache}
-	 */
-	public static final JsonpDeserializer<ShardQueryCache> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShardQueryCache::setupShardQueryCacheDeserializer);
-
-	protected static void setupShardQueryCacheDeserializer(ObjectDeserializer<ShardQueryCache.Builder> op) {
-
-		op.add(Builder::cacheCount, JsonpDeserializer.longDeserializer(), "cache_count");
-		op.add(Builder::cacheSize, JsonpDeserializer.longDeserializer(), "cache_size");
-		op.add(Builder::evictions, JsonpDeserializer.longDeserializer(), "evictions");
-		op.add(Builder::hitCount, JsonpDeserializer.longDeserializer(), "hit_count");
-		op.add(Builder::memorySizeInBytes, JsonpDeserializer.longDeserializer(), "memory_size_in_bytes");
-		op.add(Builder::missCount, JsonpDeserializer.longDeserializer(), "miss_count");
-		op.add(Builder::totalCount, JsonpDeserializer.longDeserializer(), "total_count");
-
-	}
+    /**
+     * Required - API name: {@code miss_count}
+     */
+    public final long missCount() {
+        return this.missCount;
+    }
+
+    /**
+     * Required - API name: {@code total_count}
+     */
+    public final long totalCount() {
+        return this.totalCount;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("cache_count");
+        generator.write(this.cacheCount);
+
+        generator.writeKey("cache_size");
+        generator.write(this.cacheSize);
+
+        generator.writeKey("evictions");
+        generator.write(this.evictions);
+
+        generator.writeKey("hit_count");
+        generator.write(this.hitCount);
+
+        generator.writeKey("memory_size_in_bytes");
+        generator.write(this.memorySizeInBytes);
+
+        generator.writeKey("miss_count");
+        generator.write(this.missCount);
+
+        generator.writeKey("total_count");
+        generator.write(this.totalCount);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardQueryCache}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardQueryCache> {
+        private Long cacheCount;
+
+        private Long cacheSize;
+
+        private Long evictions;
+
+        private Long hitCount;
+
+        private Long memorySizeInBytes;
+
+        private Long missCount;
+
+        private Long totalCount;
+
+        /**
+         * Required - API name: {@code cache_count}
+         */
+        public final Builder cacheCount(long value) {
+            this.cacheCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code cache_size}
+         */
+        public final Builder cacheSize(long value) {
+            this.cacheSize = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code evictions}
+         */
+        public final Builder evictions(long value) {
+            this.evictions = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code hit_count}
+         */
+        public final Builder hitCount(long value) {
+            this.hitCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code memory_size_in_bytes}
+         */
+        public final Builder memorySizeInBytes(long value) {
+            this.memorySizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code miss_count}
+         */
+        public final Builder missCount(long value) {
+            this.missCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_count}
+         */
+        public final Builder totalCount(long value) {
+            this.totalCount = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShardQueryCache}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardQueryCache build() {
+            _checkSingleUse();
+
+            return new ShardQueryCache(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardQueryCache}
+     */
+    public static final JsonpDeserializer<ShardQueryCache> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardQueryCache::setupShardQueryCacheDeserializer
+    );
+
+    protected static void setupShardQueryCacheDeserializer(ObjectDeserializer<ShardQueryCache.Builder> op) {
+
+        op.add(Builder::cacheCount, JsonpDeserializer.longDeserializer(), "cache_count");
+        op.add(Builder::cacheSize, JsonpDeserializer.longDeserializer(), "cache_size");
+        op.add(Builder::evictions, JsonpDeserializer.longDeserializer(), "evictions");
+        op.add(Builder::hitCount, JsonpDeserializer.longDeserializer(), "hit_count");
+        op.add(Builder::memorySizeInBytes, JsonpDeserializer.longDeserializer(), "memory_size_in_bytes");
+        op.add(Builder::missCount, JsonpDeserializer.longDeserializer(), "miss_count");
+        op.add(Builder::totalCount, JsonpDeserializer.longDeserializer(), "total_count");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardRetentionLeases.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardRetentionLeases.java
index 807514447f..893ac2243f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardRetentionLeases.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardRetentionLeases.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,171 +44,169 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: indices.stats.ShardRetentionLeases
 
-
 @JsonpDeserializable
 public class ShardRetentionLeases implements JsonpSerializable {
-	private final long primaryTerm;
+    private final long primaryTerm;
 
-	private final long version;
+    private final long version;
 
-	private final List<ShardLease> leases;
+    private final List<ShardLease> leases;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private ShardRetentionLeases(Builder builder) {
+    // ---------------------------------------------------------------------------------------------
+
+    private ShardRetentionLeases(Builder builder) {
 
-		this.primaryTerm = ApiTypeHelper.requireNonNull(builder.primaryTerm, this, "primaryTerm");
-		this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
-		this.leases = ApiTypeHelper.unmodifiableRequired(builder.leases, this, "leases");
-
-	}
-
-	public static ShardRetentionLeases of(Function<Builder, ObjectBuilder<ShardRetentionLeases>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code primary_term}
-	 */
-	public final long primaryTerm() {
-		return this.primaryTerm;
-	}
-
-	/**
-	 * Required - API name: {@code version}
-	 */
-	public final long version() {
-		return this.version;
-	}
-
-	/**
-	 * Required - API name: {@code leases}
-	 */
-	public final List<ShardLease> leases() {
-		return this.leases;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("primary_term");
-		generator.write(this.primaryTerm);
-
-		generator.writeKey("version");
-		generator.write(this.version);
-
-		if (ApiTypeHelper.isDefined(this.leases)) {
-			generator.writeKey("leases");
-			generator.writeStartArray();
-			for (ShardLease item0 : this.leases) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardRetentionLeases}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardRetentionLeases> {
-		private Long primaryTerm;
-
-		private Long version;
-
-		private List<ShardLease> leases;
-
-		/**
-		 * Required - API name: {@code primary_term}
-		 */
-		public final Builder primaryTerm(long value) {
-			this.primaryTerm = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code version}
-		 */
-		public final Builder version(long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code leases}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>leases</code>.
-		 */
-		public final Builder leases(List<ShardLease> list) {
-			this.leases = _listAddAll(this.leases, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code leases}
-		 * <p>
-		 * Adds one or more values to <code>leases</code>.
-		 */
-		public final Builder leases(ShardLease value, ShardLease... values) {
-			this.leases = _listAdd(this.leases, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code leases}
-		 * <p>
-		 * Adds a value to <code>leases</code> using a builder lambda.
-		 */
-		public final Builder leases(Function<ShardLease.Builder, ObjectBuilder<ShardLease>> fn) {
-			return leases(fn.apply(new ShardLease.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ShardRetentionLeases}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardRetentionLeases build() {
-			_checkSingleUse();
-
-			return new ShardRetentionLeases(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardRetentionLeases}
-	 */
-	public static final JsonpDeserializer<ShardRetentionLeases> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ShardRetentionLeases::setupShardRetentionLeasesDeserializer);
-
-	protected static void setupShardRetentionLeasesDeserializer(ObjectDeserializer<ShardRetentionLeases.Builder> op) {
-
-		op.add(Builder::primaryTerm, JsonpDeserializer.longDeserializer(), "primary_term");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
-		op.add(Builder::leases, JsonpDeserializer.arrayDeserializer(ShardLease._DESERIALIZER), "leases");
-
-	}
+        this.primaryTerm = ApiTypeHelper.requireNonNull(builder.primaryTerm, this, "primaryTerm");
+        this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
+        this.leases = ApiTypeHelper.unmodifiableRequired(builder.leases, this, "leases");
+
+    }
+
+    public static ShardRetentionLeases of(Function<Builder, ObjectBuilder<ShardRetentionLeases>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code primary_term}
+     */
+    public final long primaryTerm() {
+        return this.primaryTerm;
+    }
+
+    /**
+     * Required - API name: {@code version}
+     */
+    public final long version() {
+        return this.version;
+    }
+
+    /**
+     * Required - API name: {@code leases}
+     */
+    public final List<ShardLease> leases() {
+        return this.leases;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("primary_term");
+        generator.write(this.primaryTerm);
+
+        generator.writeKey("version");
+        generator.write(this.version);
+
+        if (ApiTypeHelper.isDefined(this.leases)) {
+            generator.writeKey("leases");
+            generator.writeStartArray();
+            for (ShardLease item0 : this.leases) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardRetentionLeases}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardRetentionLeases> {
+        private Long primaryTerm;
+
+        private Long version;
+
+        private List<ShardLease> leases;
+
+        /**
+         * Required - API name: {@code primary_term}
+         */
+        public final Builder primaryTerm(long value) {
+            this.primaryTerm = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code version}
+         */
+        public final Builder version(long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code leases}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>leases</code>.
+         */
+        public final Builder leases(List<ShardLease> list) {
+            this.leases = _listAddAll(this.leases, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code leases}
+         * <p>
+         * Adds one or more values to <code>leases</code>.
+         */
+        public final Builder leases(ShardLease value, ShardLease... values) {
+            this.leases = _listAdd(this.leases, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code leases}
+         * <p>
+         * Adds a value to <code>leases</code> using a builder lambda.
+         */
+        public final Builder leases(Function<ShardLease.Builder, ObjectBuilder<ShardLease>> fn) {
+            return leases(fn.apply(new ShardLease.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ShardRetentionLeases}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardRetentionLeases build() {
+            _checkSingleUse();
+
+            return new ShardRetentionLeases(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardRetentionLeases}
+     */
+    public static final JsonpDeserializer<ShardRetentionLeases> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardRetentionLeases::setupShardRetentionLeasesDeserializer
+    );
+
+    protected static void setupShardRetentionLeasesDeserializer(ObjectDeserializer<ShardRetentionLeases.Builder> op) {
+
+        op.add(Builder::primaryTerm, JsonpDeserializer.longDeserializer(), "primary_term");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
+        op.add(Builder::leases, JsonpDeserializer.arrayDeserializer(ShardLease._DESERIALIZER), "leases");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardRouting.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardRouting.java
index 44c5235915..a120000d29 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardRouting.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardRouting.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,171 +44,169 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.stats.ShardRouting
 
-
 @JsonpDeserializable
 public class ShardRouting implements JsonpSerializable {
-	private final String node;
+    private final String node;
 
-	private final boolean primary;
+    private final boolean primary;
 
-	@Nullable
-	private final String relocatingNode;
+    @Nullable
+    private final String relocatingNode;
 
-	private final ShardRoutingState state;
+    private final ShardRoutingState state;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ShardRouting(Builder builder) {
+    private ShardRouting(Builder builder) {
 
-		this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
-		this.primary = ApiTypeHelper.requireNonNull(builder.primary, this, "primary");
-		this.relocatingNode = builder.relocatingNode;
-		this.state = ApiTypeHelper.requireNonNull(builder.state, this, "state");
-
-	}
-
-	public static ShardRouting of(Function<Builder, ObjectBuilder<ShardRouting>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code node}
-	 */
-	public final String node() {
-		return this.node;
-	}
-
-	/**
-	 * Required - API name: {@code primary}
-	 */
-	public final boolean primary() {
-		return this.primary;
-	}
-
-	/**
-	 * API name: {@code relocating_node}
-	 */
-	@Nullable
-	public final String relocatingNode() {
-		return this.relocatingNode;
-	}
-
-	/**
-	 * Required - API name: {@code state}
-	 */
-	public final ShardRoutingState state() {
-		return this.state;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("node");
-		generator.write(this.node);
-
-		generator.writeKey("primary");
-		generator.write(this.primary);
-
-		if (this.relocatingNode != null) {
-			generator.writeKey("relocating_node");
-			generator.write(this.relocatingNode);
-
-		}
-		generator.writeKey("state");
-		this.state.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardRouting}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardRouting> {
-		private String node;
-
-		private Boolean primary;
-
-		@Nullable
-		private String relocatingNode;
-
-		private ShardRoutingState state;
-
-		/**
-		 * Required - API name: {@code node}
-		 */
-		public final Builder node(String value) {
-			this.node = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code primary}
-		 */
-		public final Builder primary(boolean value) {
-			this.primary = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code relocating_node}
-		 */
-		public final Builder relocatingNode(@Nullable String value) {
-			this.relocatingNode = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code state}
-		 */
-		public final Builder state(ShardRoutingState value) {
-			this.state = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShardRouting}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardRouting build() {
-			_checkSingleUse();
-
-			return new ShardRouting(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardRouting}
-	 */
-	public static final JsonpDeserializer<ShardRouting> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShardRouting::setupShardRoutingDeserializer);
-
-	protected static void setupShardRoutingDeserializer(ObjectDeserializer<ShardRouting.Builder> op) {
-
-		op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
-		op.add(Builder::primary, JsonpDeserializer.booleanDeserializer(), "primary");
-		op.add(Builder::relocatingNode, JsonpDeserializer.stringDeserializer(), "relocating_node");
-		op.add(Builder::state, ShardRoutingState._DESERIALIZER, "state");
-
-	}
+        this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
+        this.primary = ApiTypeHelper.requireNonNull(builder.primary, this, "primary");
+        this.relocatingNode = builder.relocatingNode;
+        this.state = ApiTypeHelper.requireNonNull(builder.state, this, "state");
+
+    }
+
+    public static ShardRouting of(Function<Builder, ObjectBuilder<ShardRouting>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code node}
+     */
+    public final String node() {
+        return this.node;
+    }
+
+    /**
+     * Required - API name: {@code primary}
+     */
+    public final boolean primary() {
+        return this.primary;
+    }
+
+    /**
+     * API name: {@code relocating_node}
+     */
+    @Nullable
+    public final String relocatingNode() {
+        return this.relocatingNode;
+    }
+
+    /**
+     * Required - API name: {@code state}
+     */
+    public final ShardRoutingState state() {
+        return this.state;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("node");
+        generator.write(this.node);
+
+        generator.writeKey("primary");
+        generator.write(this.primary);
+
+        if (this.relocatingNode != null) {
+            generator.writeKey("relocating_node");
+            generator.write(this.relocatingNode);
+
+        }
+        generator.writeKey("state");
+        this.state.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardRouting}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardRouting> {
+        private String node;
+
+        private Boolean primary;
+
+        @Nullable
+        private String relocatingNode;
+
+        private ShardRoutingState state;
+
+        /**
+         * Required - API name: {@code node}
+         */
+        public final Builder node(String value) {
+            this.node = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code primary}
+         */
+        public final Builder primary(boolean value) {
+            this.primary = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code relocating_node}
+         */
+        public final Builder relocatingNode(@Nullable String value) {
+            this.relocatingNode = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code state}
+         */
+        public final Builder state(ShardRoutingState value) {
+            this.state = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShardRouting}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardRouting build() {
+            _checkSingleUse();
+
+            return new ShardRouting(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardRouting}
+     */
+    public static final JsonpDeserializer<ShardRouting> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardRouting::setupShardRoutingDeserializer
+    );
+
+    protected static void setupShardRoutingDeserializer(ObjectDeserializer<ShardRouting.Builder> op) {
+
+        op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
+        op.add(Builder::primary, JsonpDeserializer.booleanDeserializer(), "primary");
+        op.add(Builder::relocatingNode, JsonpDeserializer.stringDeserializer(), "relocating_node");
+        op.add(Builder::state, ShardRoutingState._DESERIALIZER, "state");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardRoutingState.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardRoutingState.java
index 32a6aa2ab0..264c7a518e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardRoutingState.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardRoutingState.java
@@ -35,29 +35,27 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum ShardRoutingState implements JsonEnum {
-	Unassigned("UNASSIGNED"),
+    Unassigned("UNASSIGNED"),
 
-	Initializing("INITIALIZING"),
+    Initializing("INITIALIZING"),
 
-	Started("STARTED"),
+    Started("STARTED"),
 
-	Relocating("RELOCATING"),
+    Relocating("RELOCATING"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	ShardRoutingState(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    ShardRoutingState(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<ShardRoutingState> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			ShardRoutingState.values());
+    public static final JsonEnum.Deserializer<ShardRoutingState> _DESERIALIZER = new JsonEnum.Deserializer<>(ShardRoutingState.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardSequenceNumber.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardSequenceNumber.java
index c0c17abd9a..ac75d5b1e3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardSequenceNumber.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardSequenceNumber.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.indices.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,141 +43,140 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: indices.stats.ShardSequenceNumber
 
-
 @JsonpDeserializable
 public class ShardSequenceNumber implements JsonpSerializable {
-	private final long globalCheckpoint;
-
-	private final long localCheckpoint;
-
-	private final long maxSeqNo;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ShardSequenceNumber(Builder builder) {
-
-		this.globalCheckpoint = ApiTypeHelper.requireNonNull(builder.globalCheckpoint, this, "globalCheckpoint");
-		this.localCheckpoint = ApiTypeHelper.requireNonNull(builder.localCheckpoint, this, "localCheckpoint");
-		this.maxSeqNo = ApiTypeHelper.requireNonNull(builder.maxSeqNo, this, "maxSeqNo");
-
-	}
-
-	public static ShardSequenceNumber of(Function<Builder, ObjectBuilder<ShardSequenceNumber>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code global_checkpoint}
-	 */
-	public final long globalCheckpoint() {
-		return this.globalCheckpoint;
-	}
+    private final long globalCheckpoint;
 
-	/**
-	 * Required - API name: {@code local_checkpoint}
-	 */
-	public final long localCheckpoint() {
-		return this.localCheckpoint;
-	}
-
-	/**
-	 * Required - API name: {@code max_seq_no}
-	 */
-	public final long maxSeqNo() {
-		return this.maxSeqNo;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("global_checkpoint");
-		generator.write(this.globalCheckpoint);
-
-		generator.writeKey("local_checkpoint");
-		generator.write(this.localCheckpoint);
-
-		generator.writeKey("max_seq_no");
-		generator.write(this.maxSeqNo);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardSequenceNumber}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardSequenceNumber> {
-		private Long globalCheckpoint;
-
-		private Long localCheckpoint;
-
-		private Long maxSeqNo;
-
-		/**
-		 * Required - API name: {@code global_checkpoint}
-		 */
-		public final Builder globalCheckpoint(long value) {
-			this.globalCheckpoint = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code local_checkpoint}
-		 */
-		public final Builder localCheckpoint(long value) {
-			this.localCheckpoint = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code max_seq_no}
-		 */
-		public final Builder maxSeqNo(long value) {
-			this.maxSeqNo = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShardSequenceNumber}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardSequenceNumber build() {
-			_checkSingleUse();
-
-			return new ShardSequenceNumber(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardSequenceNumber}
-	 */
-	public static final JsonpDeserializer<ShardSequenceNumber> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ShardSequenceNumber::setupShardSequenceNumberDeserializer);
-
-	protected static void setupShardSequenceNumberDeserializer(ObjectDeserializer<ShardSequenceNumber.Builder> op) {
-
-		op.add(Builder::globalCheckpoint, JsonpDeserializer.longDeserializer(), "global_checkpoint");
-		op.add(Builder::localCheckpoint, JsonpDeserializer.longDeserializer(), "local_checkpoint");
-		op.add(Builder::maxSeqNo, JsonpDeserializer.longDeserializer(), "max_seq_no");
-
-	}
+    private final long localCheckpoint;
+
+    private final long maxSeqNo;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ShardSequenceNumber(Builder builder) {
+
+        this.globalCheckpoint = ApiTypeHelper.requireNonNull(builder.globalCheckpoint, this, "globalCheckpoint");
+        this.localCheckpoint = ApiTypeHelper.requireNonNull(builder.localCheckpoint, this, "localCheckpoint");
+        this.maxSeqNo = ApiTypeHelper.requireNonNull(builder.maxSeqNo, this, "maxSeqNo");
+
+    }
+
+    public static ShardSequenceNumber of(Function<Builder, ObjectBuilder<ShardSequenceNumber>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code global_checkpoint}
+     */
+    public final long globalCheckpoint() {
+        return this.globalCheckpoint;
+    }
+
+    /**
+     * Required - API name: {@code local_checkpoint}
+     */
+    public final long localCheckpoint() {
+        return this.localCheckpoint;
+    }
+
+    /**
+     * Required - API name: {@code max_seq_no}
+     */
+    public final long maxSeqNo() {
+        return this.maxSeqNo;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("global_checkpoint");
+        generator.write(this.globalCheckpoint);
+
+        generator.writeKey("local_checkpoint");
+        generator.write(this.localCheckpoint);
+
+        generator.writeKey("max_seq_no");
+        generator.write(this.maxSeqNo);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardSequenceNumber}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardSequenceNumber> {
+        private Long globalCheckpoint;
+
+        private Long localCheckpoint;
+
+        private Long maxSeqNo;
+
+        /**
+         * Required - API name: {@code global_checkpoint}
+         */
+        public final Builder globalCheckpoint(long value) {
+            this.globalCheckpoint = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code local_checkpoint}
+         */
+        public final Builder localCheckpoint(long value) {
+            this.localCheckpoint = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code max_seq_no}
+         */
+        public final Builder maxSeqNo(long value) {
+            this.maxSeqNo = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShardSequenceNumber}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardSequenceNumber build() {
+            _checkSingleUse();
+
+            return new ShardSequenceNumber(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardSequenceNumber}
+     */
+    public static final JsonpDeserializer<ShardSequenceNumber> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardSequenceNumber::setupShardSequenceNumberDeserializer
+    );
+
+    protected static void setupShardSequenceNumberDeserializer(ObjectDeserializer<ShardSequenceNumber.Builder> op) {
+
+        op.add(Builder::globalCheckpoint, JsonpDeserializer.longDeserializer(), "global_checkpoint");
+        op.add(Builder::localCheckpoint, JsonpDeserializer.longDeserializer(), "local_checkpoint");
+        op.add(Builder::maxSeqNo, JsonpDeserializer.longDeserializer(), "max_seq_no");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardStats.java
index 7ea8ac374b..c08d2b2033 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardStats.java
@@ -32,6 +32,15 @@
 
 package org.opensearch.client.opensearch.indices.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpDeserializable;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.json.ObjectBuilderDeserializer;
+import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.opensearch._types.BulkStats;
 import org.opensearch.client.opensearch._types.CompletionStats;
 import org.opensearch.client.opensearch._types.DocStats;
@@ -48,799 +57,789 @@
 import org.opensearch.client.opensearch._types.StoreStats;
 import org.opensearch.client.opensearch._types.TranslogStats;
 import org.opensearch.client.opensearch._types.WarmerStats;
-import org.opensearch.client.json.JsonpDeserializable;
-import org.opensearch.client.json.JsonpDeserializer;
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
-import org.opensearch.client.json.ObjectBuilderDeserializer;
-import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.stats.ShardStats
 
-
 @JsonpDeserializable
 public class ShardStats implements JsonpSerializable {
-	private final ShardCommit commit;
+    private final ShardCommit commit;
 
-	private final CompletionStats completion;
+    private final CompletionStats completion;
 
-	private final DocStats docs;
+    private final DocStats docs;
 
-	private final FielddataStats fielddata;
+    private final FielddataStats fielddata;
 
-	private final FlushStats flush;
+    private final FlushStats flush;
 
-	private final GetStats get;
+    private final GetStats get;
 
-	private final IndexingStats indexing;
+    private final IndexingStats indexing;
 
-	private final MergesStats merges;
+    private final MergesStats merges;
 
-	private final ShardPath shardPath;
+    private final ShardPath shardPath;
 
-	private final ShardQueryCache queryCache;
+    private final ShardQueryCache queryCache;
 
-	private final RecoveryStats recovery;
+    private final RecoveryStats recovery;
 
-	private final RefreshStats refresh;
+    private final RefreshStats refresh;
 
-	private final RequestCacheStats requestCache;
+    private final RequestCacheStats requestCache;
 
-	private final ShardRetentionLeases retentionLeases;
+    private final ShardRetentionLeases retentionLeases;
 
-	private final ShardRouting routing;
+    private final ShardRouting routing;
 
-	private final SearchStats search;
+    private final SearchStats search;
 
-	private final SegmentsStats segments;
+    private final SegmentsStats segments;
 
-	private final ShardSequenceNumber seqNo;
+    private final ShardSequenceNumber seqNo;
 
-	private final StoreStats store;
+    private final StoreStats store;
 
-	private final TranslogStats translog;
+    private final TranslogStats translog;
 
-	private final WarmerStats warmer;
+    private final WarmerStats warmer;
 
-	@Nullable
-	private final BulkStats bulk;
+    @Nullable
+    private final BulkStats bulk;
 
-	private final ShardsTotalStats shards;
+    private final ShardsTotalStats shards;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ShardStats(Builder builder) {
+    private ShardStats(Builder builder) {
 
-		this.commit = ApiTypeHelper.requireNonNull(builder.commit, this, "commit");
-		this.completion = ApiTypeHelper.requireNonNull(builder.completion, this, "completion");
-		this.docs = ApiTypeHelper.requireNonNull(builder.docs, this, "docs");
-		this.fielddata = ApiTypeHelper.requireNonNull(builder.fielddata, this, "fielddata");
-		this.flush = ApiTypeHelper.requireNonNull(builder.flush, this, "flush");
-		this.get = ApiTypeHelper.requireNonNull(builder.get, this, "get");
-		this.indexing = ApiTypeHelper.requireNonNull(builder.indexing, this, "indexing");
-		this.merges = ApiTypeHelper.requireNonNull(builder.merges, this, "merges");
-		this.shardPath = ApiTypeHelper.requireNonNull(builder.shardPath, this, "shardPath");
-		this.queryCache = ApiTypeHelper.requireNonNull(builder.queryCache, this, "queryCache");
-		this.recovery = ApiTypeHelper.requireNonNull(builder.recovery, this, "recovery");
-		this.refresh = ApiTypeHelper.requireNonNull(builder.refresh, this, "refresh");
-		this.requestCache = ApiTypeHelper.requireNonNull(builder.requestCache, this, "requestCache");
-		this.retentionLeases = ApiTypeHelper.requireNonNull(builder.retentionLeases, this, "retentionLeases");
-		this.routing = ApiTypeHelper.requireNonNull(builder.routing, this, "routing");
-		this.search = ApiTypeHelper.requireNonNull(builder.search, this, "search");
-		this.segments = ApiTypeHelper.requireNonNull(builder.segments, this, "segments");
-		this.seqNo = ApiTypeHelper.requireNonNull(builder.seqNo, this, "seqNo");
-		this.store = ApiTypeHelper.requireNonNull(builder.store, this, "store");
-		this.translog = ApiTypeHelper.requireNonNull(builder.translog, this, "translog");
-		this.warmer = ApiTypeHelper.requireNonNull(builder.warmer, this, "warmer");
-		this.bulk = builder.bulk;
-		this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
-
-	}
-
-	public static ShardStats of(Function<Builder, ObjectBuilder<ShardStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code commit}
-	 */
-	public final ShardCommit commit() {
-		return this.commit;
-	}
-
-	/**
-	 * Required - API name: {@code completion}
-	 */
-	public final CompletionStats completion() {
-		return this.completion;
-	}
-
-	/**
-	 * Required - API name: {@code docs}
-	 */
-	public final DocStats docs() {
-		return this.docs;
-	}
-
-	/**
-	 * Required - API name: {@code fielddata}
-	 */
-	public final FielddataStats fielddata() {
-		return this.fielddata;
-	}
-
-	/**
-	 * Required - API name: {@code flush}
-	 */
-	public final FlushStats flush() {
-		return this.flush;
-	}
-
-	/**
-	 * Required - API name: {@code get}
-	 */
-	public final GetStats get() {
-		return this.get;
-	}
-
-	/**
-	 * Required - API name: {@code indexing}
-	 */
-	public final IndexingStats indexing() {
-		return this.indexing;
-	}
-
-	/**
-	 * Required - API name: {@code merges}
-	 */
-	public final MergesStats merges() {
-		return this.merges;
-	}
-
-	/**
-	 * Required - API name: {@code shard_path}
-	 */
-	public final ShardPath shardPath() {
-		return this.shardPath;
-	}
-
-	/**
-	 * Required - API name: {@code query_cache}
-	 */
-	public final ShardQueryCache queryCache() {
-		return this.queryCache;
-	}
-
-	/**
-	 * Required - API name: {@code recovery}
-	 */
-	public final RecoveryStats recovery() {
-		return this.recovery;
-	}
-
-	/**
-	 * Required - API name: {@code refresh}
-	 */
-	public final RefreshStats refresh() {
-		return this.refresh;
-	}
-
-	/**
-	 * Required - API name: {@code request_cache}
-	 */
-	public final RequestCacheStats requestCache() {
-		return this.requestCache;
-	}
-
-	/**
-	 * Required - API name: {@code retention_leases}
-	 */
-	public final ShardRetentionLeases retentionLeases() {
-		return this.retentionLeases;
-	}
-
-	/**
-	 * Required - API name: {@code routing}
-	 */
-	public final ShardRouting routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Required - API name: {@code search}
-	 */
-	public final SearchStats search() {
-		return this.search;
-	}
-
-	/**
-	 * Required - API name: {@code segments}
-	 */
-	public final SegmentsStats segments() {
-		return this.segments;
-	}
-
-	/**
-	 * Required - API name: {@code seq_no}
-	 */
-	public final ShardSequenceNumber seqNo() {
-		return this.seqNo;
-	}
-
-	/**
-	 * Required - API name: {@code store}
-	 */
-	public final StoreStats store() {
-		return this.store;
-	}
-
-	/**
-	 * Required - API name: {@code translog}
-	 */
-	public final TranslogStats translog() {
-		return this.translog;
-	}
-
-	/**
-	 * Required - API name: {@code warmer}
-	 */
-	public final WarmerStats warmer() {
-		return this.warmer;
-	}
-
-	/**
-	 * API name: {@code bulk}
-	 */
-	@Nullable
-	public final BulkStats bulk() {
-		return this.bulk;
-	}
-
-	/**
-	 * Required - API name: {@code shards}
-	 */
-	public final ShardsTotalStats shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+        this.commit = ApiTypeHelper.requireNonNull(builder.commit, this, "commit");
+        this.completion = ApiTypeHelper.requireNonNull(builder.completion, this, "completion");
+        this.docs = ApiTypeHelper.requireNonNull(builder.docs, this, "docs");
+        this.fielddata = ApiTypeHelper.requireNonNull(builder.fielddata, this, "fielddata");
+        this.flush = ApiTypeHelper.requireNonNull(builder.flush, this, "flush");
+        this.get = ApiTypeHelper.requireNonNull(builder.get, this, "get");
+        this.indexing = ApiTypeHelper.requireNonNull(builder.indexing, this, "indexing");
+        this.merges = ApiTypeHelper.requireNonNull(builder.merges, this, "merges");
+        this.shardPath = ApiTypeHelper.requireNonNull(builder.shardPath, this, "shardPath");
+        this.queryCache = ApiTypeHelper.requireNonNull(builder.queryCache, this, "queryCache");
+        this.recovery = ApiTypeHelper.requireNonNull(builder.recovery, this, "recovery");
+        this.refresh = ApiTypeHelper.requireNonNull(builder.refresh, this, "refresh");
+        this.requestCache = ApiTypeHelper.requireNonNull(builder.requestCache, this, "requestCache");
+        this.retentionLeases = ApiTypeHelper.requireNonNull(builder.retentionLeases, this, "retentionLeases");
+        this.routing = ApiTypeHelper.requireNonNull(builder.routing, this, "routing");
+        this.search = ApiTypeHelper.requireNonNull(builder.search, this, "search");
+        this.segments = ApiTypeHelper.requireNonNull(builder.segments, this, "segments");
+        this.seqNo = ApiTypeHelper.requireNonNull(builder.seqNo, this, "seqNo");
+        this.store = ApiTypeHelper.requireNonNull(builder.store, this, "store");
+        this.translog = ApiTypeHelper.requireNonNull(builder.translog, this, "translog");
+        this.warmer = ApiTypeHelper.requireNonNull(builder.warmer, this, "warmer");
+        this.bulk = builder.bulk;
+        this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
+
+    }
+
+    public static ShardStats of(Function<Builder, ObjectBuilder<ShardStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code commit}
+     */
+    public final ShardCommit commit() {
+        return this.commit;
+    }
+
+    /**
+     * Required - API name: {@code completion}
+     */
+    public final CompletionStats completion() {
+        return this.completion;
+    }
+
+    /**
+     * Required - API name: {@code docs}
+     */
+    public final DocStats docs() {
+        return this.docs;
+    }
+
+    /**
+     * Required - API name: {@code fielddata}
+     */
+    public final FielddataStats fielddata() {
+        return this.fielddata;
+    }
+
+    /**
+     * Required - API name: {@code flush}
+     */
+    public final FlushStats flush() {
+        return this.flush;
+    }
+
+    /**
+     * Required - API name: {@code get}
+     */
+    public final GetStats get() {
+        return this.get;
+    }
+
+    /**
+     * Required - API name: {@code indexing}
+     */
+    public final IndexingStats indexing() {
+        return this.indexing;
+    }
+
+    /**
+     * Required - API name: {@code merges}
+     */
+    public final MergesStats merges() {
+        return this.merges;
+    }
+
+    /**
+     * Required - API name: {@code shard_path}
+     */
+    public final ShardPath shardPath() {
+        return this.shardPath;
+    }
+
+    /**
+     * Required - API name: {@code query_cache}
+     */
+    public final ShardQueryCache queryCache() {
+        return this.queryCache;
+    }
+
+    /**
+     * Required - API name: {@code recovery}
+     */
+    public final RecoveryStats recovery() {
+        return this.recovery;
+    }
+
+    /**
+     * Required - API name: {@code refresh}
+     */
+    public final RefreshStats refresh() {
+        return this.refresh;
+    }
+
+    /**
+     * Required - API name: {@code request_cache}
+     */
+    public final RequestCacheStats requestCache() {
+        return this.requestCache;
+    }
+
+    /**
+     * Required - API name: {@code retention_leases}
+     */
+    public final ShardRetentionLeases retentionLeases() {
+        return this.retentionLeases;
+    }
+
+    /**
+     * Required - API name: {@code routing}
+     */
+    public final ShardRouting routing() {
+        return this.routing;
+    }
+
+    /**
+     * Required - API name: {@code search}
+     */
+    public final SearchStats search() {
+        return this.search;
+    }
+
+    /**
+     * Required - API name: {@code segments}
+     */
+    public final SegmentsStats segments() {
+        return this.segments;
+    }
+
+    /**
+     * Required - API name: {@code seq_no}
+     */
+    public final ShardSequenceNumber seqNo() {
+        return this.seqNo;
+    }
+
+    /**
+     * Required - API name: {@code store}
+     */
+    public final StoreStats store() {
+        return this.store;
+    }
+
+    /**
+     * Required - API name: {@code translog}
+     */
+    public final TranslogStats translog() {
+        return this.translog;
+    }
+
+    /**
+     * Required - API name: {@code warmer}
+     */
+    public final WarmerStats warmer() {
+        return this.warmer;
+    }
+
+    /**
+     * API name: {@code bulk}
+     */
+    @Nullable
+    public final BulkStats bulk() {
+        return this.bulk;
+    }
+
+    /**
+     * Required - API name: {@code shards}
+     */
+    public final ShardsTotalStats shards() {
+        return this.shards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("commit");
-		this.commit.serialize(generator, mapper);
+        generator.writeKey("commit");
+        this.commit.serialize(generator, mapper);
 
-		generator.writeKey("completion");
-		this.completion.serialize(generator, mapper);
+        generator.writeKey("completion");
+        this.completion.serialize(generator, mapper);
 
-		generator.writeKey("docs");
-		this.docs.serialize(generator, mapper);
+        generator.writeKey("docs");
+        this.docs.serialize(generator, mapper);
 
-		generator.writeKey("fielddata");
-		this.fielddata.serialize(generator, mapper);
+        generator.writeKey("fielddata");
+        this.fielddata.serialize(generator, mapper);
 
-		generator.writeKey("flush");
-		this.flush.serialize(generator, mapper);
+        generator.writeKey("flush");
+        this.flush.serialize(generator, mapper);
 
-		generator.writeKey("get");
-		this.get.serialize(generator, mapper);
+        generator.writeKey("get");
+        this.get.serialize(generator, mapper);
 
-		generator.writeKey("indexing");
-		this.indexing.serialize(generator, mapper);
+        generator.writeKey("indexing");
+        this.indexing.serialize(generator, mapper);
 
-		generator.writeKey("merges");
-		this.merges.serialize(generator, mapper);
+        generator.writeKey("merges");
+        this.merges.serialize(generator, mapper);
 
-		generator.writeKey("shard_path");
-		this.shardPath.serialize(generator, mapper);
+        generator.writeKey("shard_path");
+        this.shardPath.serialize(generator, mapper);
 
-		generator.writeKey("query_cache");
-		this.queryCache.serialize(generator, mapper);
+        generator.writeKey("query_cache");
+        this.queryCache.serialize(generator, mapper);
 
-		generator.writeKey("recovery");
-		this.recovery.serialize(generator, mapper);
+        generator.writeKey("recovery");
+        this.recovery.serialize(generator, mapper);
 
-		generator.writeKey("refresh");
-		this.refresh.serialize(generator, mapper);
+        generator.writeKey("refresh");
+        this.refresh.serialize(generator, mapper);
 
-		generator.writeKey("request_cache");
-		this.requestCache.serialize(generator, mapper);
+        generator.writeKey("request_cache");
+        this.requestCache.serialize(generator, mapper);
 
-		generator.writeKey("retention_leases");
-		this.retentionLeases.serialize(generator, mapper);
+        generator.writeKey("retention_leases");
+        this.retentionLeases.serialize(generator, mapper);
 
-		generator.writeKey("routing");
-		this.routing.serialize(generator, mapper);
+        generator.writeKey("routing");
+        this.routing.serialize(generator, mapper);
 
-		generator.writeKey("search");
-		this.search.serialize(generator, mapper);
+        generator.writeKey("search");
+        this.search.serialize(generator, mapper);
 
-		generator.writeKey("segments");
-		this.segments.serialize(generator, mapper);
+        generator.writeKey("segments");
+        this.segments.serialize(generator, mapper);
 
-		generator.writeKey("seq_no");
-		this.seqNo.serialize(generator, mapper);
+        generator.writeKey("seq_no");
+        this.seqNo.serialize(generator, mapper);
 
-		generator.writeKey("store");
-		this.store.serialize(generator, mapper);
+        generator.writeKey("store");
+        this.store.serialize(generator, mapper);
 
-		generator.writeKey("translog");
-		this.translog.serialize(generator, mapper);
+        generator.writeKey("translog");
+        this.translog.serialize(generator, mapper);
 
-		generator.writeKey("warmer");
-		this.warmer.serialize(generator, mapper);
+        generator.writeKey("warmer");
+        this.warmer.serialize(generator, mapper);
 
-		if (this.bulk != null) {
-			generator.writeKey("bulk");
-			this.bulk.serialize(generator, mapper);
+        if (this.bulk != null) {
+            generator.writeKey("bulk");
+            this.bulk.serialize(generator, mapper);
 
-		}
-		generator.writeKey("shards");
-		this.shards.serialize(generator, mapper);
+        }
+        generator.writeKey("shards");
+        this.shards.serialize(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link ShardStats}.
-	 */
+    /**
+     * Builder for {@link ShardStats}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardStats> {
-		private ShardCommit commit;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardStats> {
+        private ShardCommit commit;
 
-		private CompletionStats completion;
+        private CompletionStats completion;
 
-		private DocStats docs;
+        private DocStats docs;
 
-		private FielddataStats fielddata;
+        private FielddataStats fielddata;
 
-		private FlushStats flush;
+        private FlushStats flush;
 
-		private GetStats get;
+        private GetStats get;
 
-		private IndexingStats indexing;
+        private IndexingStats indexing;
 
-		private MergesStats merges;
+        private MergesStats merges;
 
-		private ShardPath shardPath;
+        private ShardPath shardPath;
 
-		private ShardQueryCache queryCache;
+        private ShardQueryCache queryCache;
 
-		private RecoveryStats recovery;
+        private RecoveryStats recovery;
 
-		private RefreshStats refresh;
+        private RefreshStats refresh;
 
-		private RequestCacheStats requestCache;
+        private RequestCacheStats requestCache;
 
-		private ShardRetentionLeases retentionLeases;
+        private ShardRetentionLeases retentionLeases;
 
-		private ShardRouting routing;
+        private ShardRouting routing;
 
-		private SearchStats search;
+        private SearchStats search;
 
-		private SegmentsStats segments;
+        private SegmentsStats segments;
 
-		private ShardSequenceNumber seqNo;
+        private ShardSequenceNumber seqNo;
 
-		private StoreStats store;
+        private StoreStats store;
 
-		private TranslogStats translog;
+        private TranslogStats translog;
 
-		private WarmerStats warmer;
+        private WarmerStats warmer;
 
-		@Nullable
-		private BulkStats bulk;
+        @Nullable
+        private BulkStats bulk;
 
-		private ShardsTotalStats shards;
+        private ShardsTotalStats shards;
 
-		/**
-		 * Required - API name: {@code commit}
-		 */
-		public final Builder commit(ShardCommit value) {
-			this.commit = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code commit}
+         */
+        public final Builder commit(ShardCommit value) {
+            this.commit = value;
+            return this;
+        }
 
-		/**
-		 * Required - API name: {@code commit}
-		 */
-		public final Builder commit(Function<ShardCommit.Builder, ObjectBuilder<ShardCommit>> fn) {
-			return this.commit(fn.apply(new ShardCommit.Builder()).build());
-		}
+        /**
+         * Required - API name: {@code commit}
+         */
+        public final Builder commit(Function<ShardCommit.Builder, ObjectBuilder<ShardCommit>> fn) {
+            return this.commit(fn.apply(new ShardCommit.Builder()).build());
+        }
 
-		/**
-		 * Required - API name: {@code completion}
-		 */
-		public final Builder completion(CompletionStats value) {
-			this.completion = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code completion}
-		 */
-		public final Builder completion(Function<CompletionStats.Builder, ObjectBuilder<CompletionStats>> fn) {
-			return this.completion(fn.apply(new CompletionStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code docs}
-		 */
-		public final Builder docs(DocStats value) {
-			this.docs = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code docs}
-		 */
-		public final Builder docs(Function<DocStats.Builder, ObjectBuilder<DocStats>> fn) {
-			return this.docs(fn.apply(new DocStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code fielddata}
-		 */
-		public final Builder fielddata(FielddataStats value) {
-			this.fielddata = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code fielddata}
-		 */
-		public final Builder fielddata(Function<FielddataStats.Builder, ObjectBuilder<FielddataStats>> fn) {
-			return this.fielddata(fn.apply(new FielddataStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code flush}
-		 */
-		public final Builder flush(FlushStats value) {
-			this.flush = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code flush}
-		 */
-		public final Builder flush(Function<FlushStats.Builder, ObjectBuilder<FlushStats>> fn) {
-			return this.flush(fn.apply(new FlushStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code get}
-		 */
-		public final Builder get(GetStats value) {
-			this.get = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code get}
-		 */
-		public final Builder get(Function<GetStats.Builder, ObjectBuilder<GetStats>> fn) {
-			return this.get(fn.apply(new GetStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code indexing}
-		 */
-		public final Builder indexing(IndexingStats value) {
-			this.indexing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indexing}
-		 */
-		public final Builder indexing(Function<IndexingStats.Builder, ObjectBuilder<IndexingStats>> fn) {
-			return this.indexing(fn.apply(new IndexingStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code merges}
-		 */
-		public final Builder merges(MergesStats value) {
-			this.merges = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code merges}
-		 */
-		public final Builder merges(Function<MergesStats.Builder, ObjectBuilder<MergesStats>> fn) {
-			return this.merges(fn.apply(new MergesStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code shard_path}
-		 */
-		public final Builder shardPath(ShardPath value) {
-			this.shardPath = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shard_path}
-		 */
-		public final Builder shardPath(Function<ShardPath.Builder, ObjectBuilder<ShardPath>> fn) {
-			return this.shardPath(fn.apply(new ShardPath.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code query_cache}
-		 */
-		public final Builder queryCache(ShardQueryCache value) {
-			this.queryCache = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code query_cache}
-		 */
-		public final Builder queryCache(Function<ShardQueryCache.Builder, ObjectBuilder<ShardQueryCache>> fn) {
-			return this.queryCache(fn.apply(new ShardQueryCache.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code recovery}
-		 */
-		public final Builder recovery(RecoveryStats value) {
-			this.recovery = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code recovery}
-		 */
-		public final Builder recovery(Function<RecoveryStats.Builder, ObjectBuilder<RecoveryStats>> fn) {
-			return this.recovery(fn.apply(new RecoveryStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code refresh}
-		 */
-		public final Builder refresh(RefreshStats value) {
-			this.refresh = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code refresh}
-		 */
-		public final Builder refresh(Function<RefreshStats.Builder, ObjectBuilder<RefreshStats>> fn) {
-			return this.refresh(fn.apply(new RefreshStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code request_cache}
-		 */
-		public final Builder requestCache(RequestCacheStats value) {
-			this.requestCache = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code request_cache}
-		 */
-		public final Builder requestCache(Function<RequestCacheStats.Builder, ObjectBuilder<RequestCacheStats>> fn) {
-			return this.requestCache(fn.apply(new RequestCacheStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code retention_leases}
-		 */
-		public final Builder retentionLeases(ShardRetentionLeases value) {
-			this.retentionLeases = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code retention_leases}
-		 */
-		public final Builder retentionLeases(
-				Function<ShardRetentionLeases.Builder, ObjectBuilder<ShardRetentionLeases>> fn) {
-			return this.retentionLeases(fn.apply(new ShardRetentionLeases.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code routing}
-		 */
-		public final Builder routing(ShardRouting value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code routing}
-		 */
-		public final Builder routing(Function<ShardRouting.Builder, ObjectBuilder<ShardRouting>> fn) {
-			return this.routing(fn.apply(new ShardRouting.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code search}
-		 */
-		public final Builder search(SearchStats value) {
-			this.search = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code search}
-		 */
-		public final Builder search(Function<SearchStats.Builder, ObjectBuilder<SearchStats>> fn) {
-			return this.search(fn.apply(new SearchStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code segments}
-		 */
-		public final Builder segments(SegmentsStats value) {
-			this.segments = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code segments}
-		 */
-		public final Builder segments(Function<SegmentsStats.Builder, ObjectBuilder<SegmentsStats>> fn) {
-			return this.segments(fn.apply(new SegmentsStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code seq_no}
-		 */
-		public final Builder seqNo(ShardSequenceNumber value) {
-			this.seqNo = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code seq_no}
-		 */
-		public final Builder seqNo(Function<ShardSequenceNumber.Builder, ObjectBuilder<ShardSequenceNumber>> fn) {
-			return this.seqNo(fn.apply(new ShardSequenceNumber.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code store}
-		 */
-		public final Builder store(StoreStats value) {
-			this.store = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code store}
-		 */
-		public final Builder store(Function<StoreStats.Builder, ObjectBuilder<StoreStats>> fn) {
-			return this.store(fn.apply(new StoreStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code translog}
-		 */
-		public final Builder translog(TranslogStats value) {
-			this.translog = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code translog}
-		 */
-		public final Builder translog(Function<TranslogStats.Builder, ObjectBuilder<TranslogStats>> fn) {
-			return this.translog(fn.apply(new TranslogStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code warmer}
-		 */
-		public final Builder warmer(WarmerStats value) {
-			this.warmer = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code warmer}
-		 */
-		public final Builder warmer(Function<WarmerStats.Builder, ObjectBuilder<WarmerStats>> fn) {
-			return this.warmer(fn.apply(new WarmerStats.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code bulk}
-		 */
-		public final Builder bulk(@Nullable BulkStats value) {
-			this.bulk = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code bulk}
-		 */
-		public final Builder bulk(Function<BulkStats.Builder, ObjectBuilder<BulkStats>> fn) {
-			return this.bulk(fn.apply(new BulkStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code shards}
-		 */
-		public final Builder shards(ShardsTotalStats value) {
-			this.shards = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards}
-		 */
-		public final Builder shards(Function<ShardsTotalStats.Builder, ObjectBuilder<ShardsTotalStats>> fn) {
-			return this.shards(fn.apply(new ShardsTotalStats.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ShardStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardStats build() {
-			_checkSingleUse();
-
-			return new ShardStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardStats}
-	 */
-	public static final JsonpDeserializer<ShardStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShardStats::setupShardStatsDeserializer);
-
-	protected static void setupShardStatsDeserializer(ObjectDeserializer<ShardStats.Builder> op) {
-
-		op.add(Builder::commit, ShardCommit._DESERIALIZER, "commit");
-		op.add(Builder::completion, CompletionStats._DESERIALIZER, "completion");
-		op.add(Builder::docs, DocStats._DESERIALIZER, "docs");
-		op.add(Builder::fielddata, FielddataStats._DESERIALIZER, "fielddata");
-		op.add(Builder::flush, FlushStats._DESERIALIZER, "flush");
-		op.add(Builder::get, GetStats._DESERIALIZER, "get");
-		op.add(Builder::indexing, IndexingStats._DESERIALIZER, "indexing");
-		op.add(Builder::merges, MergesStats._DESERIALIZER, "merges");
-		op.add(Builder::shardPath, ShardPath._DESERIALIZER, "shard_path");
-		op.add(Builder::queryCache, ShardQueryCache._DESERIALIZER, "query_cache");
-		op.add(Builder::recovery, RecoveryStats._DESERIALIZER, "recovery");
-		op.add(Builder::refresh, RefreshStats._DESERIALIZER, "refresh");
-		op.add(Builder::requestCache, RequestCacheStats._DESERIALIZER, "request_cache");
-		op.add(Builder::retentionLeases, ShardRetentionLeases._DESERIALIZER, "retention_leases");
-		op.add(Builder::routing, ShardRouting._DESERIALIZER, "routing");
-		op.add(Builder::search, SearchStats._DESERIALIZER, "search");
-		op.add(Builder::segments, SegmentsStats._DESERIALIZER, "segments");
-		op.add(Builder::seqNo, ShardSequenceNumber._DESERIALIZER, "seq_no");
-		op.add(Builder::store, StoreStats._DESERIALIZER, "store");
-		op.add(Builder::translog, TranslogStats._DESERIALIZER, "translog");
-		op.add(Builder::warmer, WarmerStats._DESERIALIZER, "warmer");
-		op.add(Builder::bulk, BulkStats._DESERIALIZER, "bulk");
-		op.add(Builder::shards, ShardsTotalStats._DESERIALIZER, "shards");
-
-	}
+        /**
+         * Required - API name: {@code completion}
+         */
+        public final Builder completion(CompletionStats value) {
+            this.completion = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code completion}
+         */
+        public final Builder completion(Function<CompletionStats.Builder, ObjectBuilder<CompletionStats>> fn) {
+            return this.completion(fn.apply(new CompletionStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code docs}
+         */
+        public final Builder docs(DocStats value) {
+            this.docs = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code docs}
+         */
+        public final Builder docs(Function<DocStats.Builder, ObjectBuilder<DocStats>> fn) {
+            return this.docs(fn.apply(new DocStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code fielddata}
+         */
+        public final Builder fielddata(FielddataStats value) {
+            this.fielddata = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code fielddata}
+         */
+        public final Builder fielddata(Function<FielddataStats.Builder, ObjectBuilder<FielddataStats>> fn) {
+            return this.fielddata(fn.apply(new FielddataStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code flush}
+         */
+        public final Builder flush(FlushStats value) {
+            this.flush = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code flush}
+         */
+        public final Builder flush(Function<FlushStats.Builder, ObjectBuilder<FlushStats>> fn) {
+            return this.flush(fn.apply(new FlushStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code get}
+         */
+        public final Builder get(GetStats value) {
+            this.get = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code get}
+         */
+        public final Builder get(Function<GetStats.Builder, ObjectBuilder<GetStats>> fn) {
+            return this.get(fn.apply(new GetStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code indexing}
+         */
+        public final Builder indexing(IndexingStats value) {
+            this.indexing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indexing}
+         */
+        public final Builder indexing(Function<IndexingStats.Builder, ObjectBuilder<IndexingStats>> fn) {
+            return this.indexing(fn.apply(new IndexingStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code merges}
+         */
+        public final Builder merges(MergesStats value) {
+            this.merges = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code merges}
+         */
+        public final Builder merges(Function<MergesStats.Builder, ObjectBuilder<MergesStats>> fn) {
+            return this.merges(fn.apply(new MergesStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code shard_path}
+         */
+        public final Builder shardPath(ShardPath value) {
+            this.shardPath = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shard_path}
+         */
+        public final Builder shardPath(Function<ShardPath.Builder, ObjectBuilder<ShardPath>> fn) {
+            return this.shardPath(fn.apply(new ShardPath.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code query_cache}
+         */
+        public final Builder queryCache(ShardQueryCache value) {
+            this.queryCache = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code query_cache}
+         */
+        public final Builder queryCache(Function<ShardQueryCache.Builder, ObjectBuilder<ShardQueryCache>> fn) {
+            return this.queryCache(fn.apply(new ShardQueryCache.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code recovery}
+         */
+        public final Builder recovery(RecoveryStats value) {
+            this.recovery = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code recovery}
+         */
+        public final Builder recovery(Function<RecoveryStats.Builder, ObjectBuilder<RecoveryStats>> fn) {
+            return this.recovery(fn.apply(new RecoveryStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code refresh}
+         */
+        public final Builder refresh(RefreshStats value) {
+            this.refresh = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code refresh}
+         */
+        public final Builder refresh(Function<RefreshStats.Builder, ObjectBuilder<RefreshStats>> fn) {
+            return this.refresh(fn.apply(new RefreshStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code request_cache}
+         */
+        public final Builder requestCache(RequestCacheStats value) {
+            this.requestCache = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code request_cache}
+         */
+        public final Builder requestCache(Function<RequestCacheStats.Builder, ObjectBuilder<RequestCacheStats>> fn) {
+            return this.requestCache(fn.apply(new RequestCacheStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code retention_leases}
+         */
+        public final Builder retentionLeases(ShardRetentionLeases value) {
+            this.retentionLeases = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code retention_leases}
+         */
+        public final Builder retentionLeases(Function<ShardRetentionLeases.Builder, ObjectBuilder<ShardRetentionLeases>> fn) {
+            return this.retentionLeases(fn.apply(new ShardRetentionLeases.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code routing}
+         */
+        public final Builder routing(ShardRouting value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code routing}
+         */
+        public final Builder routing(Function<ShardRouting.Builder, ObjectBuilder<ShardRouting>> fn) {
+            return this.routing(fn.apply(new ShardRouting.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code search}
+         */
+        public final Builder search(SearchStats value) {
+            this.search = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code search}
+         */
+        public final Builder search(Function<SearchStats.Builder, ObjectBuilder<SearchStats>> fn) {
+            return this.search(fn.apply(new SearchStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code segments}
+         */
+        public final Builder segments(SegmentsStats value) {
+            this.segments = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code segments}
+         */
+        public final Builder segments(Function<SegmentsStats.Builder, ObjectBuilder<SegmentsStats>> fn) {
+            return this.segments(fn.apply(new SegmentsStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code seq_no}
+         */
+        public final Builder seqNo(ShardSequenceNumber value) {
+            this.seqNo = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code seq_no}
+         */
+        public final Builder seqNo(Function<ShardSequenceNumber.Builder, ObjectBuilder<ShardSequenceNumber>> fn) {
+            return this.seqNo(fn.apply(new ShardSequenceNumber.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code store}
+         */
+        public final Builder store(StoreStats value) {
+            this.store = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code store}
+         */
+        public final Builder store(Function<StoreStats.Builder, ObjectBuilder<StoreStats>> fn) {
+            return this.store(fn.apply(new StoreStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code translog}
+         */
+        public final Builder translog(TranslogStats value) {
+            this.translog = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code translog}
+         */
+        public final Builder translog(Function<TranslogStats.Builder, ObjectBuilder<TranslogStats>> fn) {
+            return this.translog(fn.apply(new TranslogStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code warmer}
+         */
+        public final Builder warmer(WarmerStats value) {
+            this.warmer = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code warmer}
+         */
+        public final Builder warmer(Function<WarmerStats.Builder, ObjectBuilder<WarmerStats>> fn) {
+            return this.warmer(fn.apply(new WarmerStats.Builder()).build());
+        }
+
+        /**
+         * API name: {@code bulk}
+         */
+        public final Builder bulk(@Nullable BulkStats value) {
+            this.bulk = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code bulk}
+         */
+        public final Builder bulk(Function<BulkStats.Builder, ObjectBuilder<BulkStats>> fn) {
+            return this.bulk(fn.apply(new BulkStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code shards}
+         */
+        public final Builder shards(ShardsTotalStats value) {
+            this.shards = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards}
+         */
+        public final Builder shards(Function<ShardsTotalStats.Builder, ObjectBuilder<ShardsTotalStats>> fn) {
+            return this.shards(fn.apply(new ShardsTotalStats.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ShardStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardStats build() {
+            _checkSingleUse();
+
+            return new ShardStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardStats}
+     */
+    public static final JsonpDeserializer<ShardStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardStats::setupShardStatsDeserializer
+    );
+
+    protected static void setupShardStatsDeserializer(ObjectDeserializer<ShardStats.Builder> op) {
+
+        op.add(Builder::commit, ShardCommit._DESERIALIZER, "commit");
+        op.add(Builder::completion, CompletionStats._DESERIALIZER, "completion");
+        op.add(Builder::docs, DocStats._DESERIALIZER, "docs");
+        op.add(Builder::fielddata, FielddataStats._DESERIALIZER, "fielddata");
+        op.add(Builder::flush, FlushStats._DESERIALIZER, "flush");
+        op.add(Builder::get, GetStats._DESERIALIZER, "get");
+        op.add(Builder::indexing, IndexingStats._DESERIALIZER, "indexing");
+        op.add(Builder::merges, MergesStats._DESERIALIZER, "merges");
+        op.add(Builder::shardPath, ShardPath._DESERIALIZER, "shard_path");
+        op.add(Builder::queryCache, ShardQueryCache._DESERIALIZER, "query_cache");
+        op.add(Builder::recovery, RecoveryStats._DESERIALIZER, "recovery");
+        op.add(Builder::refresh, RefreshStats._DESERIALIZER, "refresh");
+        op.add(Builder::requestCache, RequestCacheStats._DESERIALIZER, "request_cache");
+        op.add(Builder::retentionLeases, ShardRetentionLeases._DESERIALIZER, "retention_leases");
+        op.add(Builder::routing, ShardRouting._DESERIALIZER, "routing");
+        op.add(Builder::search, SearchStats._DESERIALIZER, "search");
+        op.add(Builder::segments, SegmentsStats._DESERIALIZER, "segments");
+        op.add(Builder::seqNo, ShardSequenceNumber._DESERIALIZER, "seq_no");
+        op.add(Builder::store, StoreStats._DESERIALIZER, "store");
+        op.add(Builder::translog, TranslogStats._DESERIALIZER, "translog");
+        op.add(Builder::warmer, WarmerStats._DESERIALIZER, "warmer");
+        op.add(Builder::bulk, BulkStats._DESERIALIZER, "bulk");
+        op.add(Builder::shards, ShardsTotalStats._DESERIALIZER, "shards");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardsTotalStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardsTotalStats.java
index 555d4d148e..877a7b8239 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardsTotalStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/stats/ShardsTotalStats.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.indices.stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,93 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: indices.stats.ShardsTotalStats
 
-
 @JsonpDeserializable
 public class ShardsTotalStats implements JsonpSerializable {
-	private final long totalCount;
+    private final long totalCount;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ShardsTotalStats(Builder builder) {
+    private ShardsTotalStats(Builder builder) {
 
-		this.totalCount = ApiTypeHelper.requireNonNull(builder.totalCount, this, "totalCount");
+        this.totalCount = ApiTypeHelper.requireNonNull(builder.totalCount, this, "totalCount");
 
-	}
+    }
 
-	public static ShardsTotalStats of(Function<Builder, ObjectBuilder<ShardsTotalStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ShardsTotalStats of(Function<Builder, ObjectBuilder<ShardsTotalStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code total_count}
-	 */
-	public final long totalCount() {
-		return this.totalCount;
-	}
+    /**
+     * Required - API name: {@code total_count}
+     */
+    public final long totalCount() {
+        return this.totalCount;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("total_count");
-		generator.write(this.totalCount);
+        generator.writeKey("total_count");
+        generator.write(this.totalCount);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link ShardsTotalStats}.
-	 */
+    /**
+     * Builder for {@link ShardsTotalStats}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardsTotalStats> {
-		private Long totalCount;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardsTotalStats> {
+        private Long totalCount;
 
-		/**
-		 * Required - API name: {@code total_count}
-		 */
-		public final Builder totalCount(long value) {
-			this.totalCount = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code total_count}
+         */
+        public final Builder totalCount(long value) {
+            this.totalCount = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link ShardsTotalStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardsTotalStats build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link ShardsTotalStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardsTotalStats build() {
+            _checkSingleUse();
 
-			return new ShardsTotalStats(this);
-		}
-	}
+            return new ShardsTotalStats(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link ShardsTotalStats}
-	 */
-	public static final JsonpDeserializer<ShardsTotalStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShardsTotalStats::setupShardsTotalStatsDeserializer);
+    /**
+     * Json deserializer for {@link ShardsTotalStats}
+     */
+    public static final JsonpDeserializer<ShardsTotalStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardsTotalStats::setupShardsTotalStatsDeserializer
+    );
 
-	protected static void setupShardsTotalStatsDeserializer(ObjectDeserializer<ShardsTotalStats.Builder> op) {
+    protected static void setupShardsTotalStatsDeserializer(ObjectDeserializer<ShardsTotalStats.Builder> op) {
 
-		op.add(Builder::totalCount, JsonpDeserializer.longDeserializer(), "total_count");
+        op.add(Builder::totalCount, JsonpDeserializer.longDeserializer(), "total_count");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/Action.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/Action.java
index dab9cf6edc..708b8a8477 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/Action.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/Action.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.indices.update_aliases;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -44,190 +46,189 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: indices.update_aliases.Action
 
-
 @JsonpDeserializable
 public class Action implements TaggedUnion<Action.Kind, Object>, JsonpSerializable {
 
-	/**
-	 * {@link Action} variant kinds.
-	 */
-	/**
-	 * {@link Action} variant kinds.
-	 */
-
-	public enum Kind implements JsonEnum {
-		Add("add"),
-
-		Remove("remove"),
-
-		RemoveIndex("remove_index"),
-
-		;
-
-		private final String jsonValue;
-
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
-
-		public String jsonValue() {
-			return this.jsonValue;
-		}
+    /**
+     * {@link Action} variant kinds.
+     */
+    /**
+     * {@link Action} variant kinds.
+     */
+
+    public enum Kind implements JsonEnum {
+        Add("add"),
+
+        Remove("remove"),
+
+        RemoveIndex("remove_index"),
+
+        ;
+
+        private final String jsonValue;
+
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
+
+        public String jsonValue() {
+            return this.jsonValue;
+        }
 
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	public Action(ActionVariant value) {
-
-		this._kind = ApiTypeHelper.requireNonNull(value._actionKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
-
-	}
-
-	private Action(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static Action of(Function<Builder, ObjectBuilder<Action>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code add}?
-	 */
-	public boolean isAdd() {
-		return _kind == Kind.Add;
-	}
-
-	/**
-	 * Get the {@code add} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code add} kind.
-	 */
-	public AddAction add() {
-		return TaggedUnionUtils.get(this, Kind.Add);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code remove}?
-	 */
-	public boolean isRemove() {
-		return _kind == Kind.Remove;
-	}
-
-	/**
-	 * Get the {@code remove} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code remove} kind.
-	 */
-	public RemoveAction remove() {
-		return TaggedUnionUtils.get(this, Kind.Remove);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code remove_index}?
-	 */
-	public boolean isRemoveIndex() {
-		return _kind == Kind.RemoveIndex;
-	}
-
-	/**
-	 * Get the {@code remove_index} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code remove_index} kind.
-	 */
-	public RemoveIndexAction removeIndex() {
-		return TaggedUnionUtils.get(this, Kind.RemoveIndex);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeStartObject();
-
-		generator.writeKey(_kind.jsonValue());
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		}
-
-		generator.writeEnd();
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Action> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<Action> add(AddAction v) {
-			this._kind = Kind.Add;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Action> add(Function<AddAction.Builder, ObjectBuilder<AddAction>> fn) {
-			return this.add(fn.apply(new AddAction.Builder()).build());
-		}
-
-		public ObjectBuilder<Action> remove(RemoveAction v) {
-			this._kind = Kind.Remove;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Action> remove(Function<RemoveAction.Builder, ObjectBuilder<RemoveAction>> fn) {
-			return this.remove(fn.apply(new RemoveAction.Builder()).build());
-		}
-
-		public ObjectBuilder<Action> removeIndex(RemoveIndexAction v) {
-			this._kind = Kind.RemoveIndex;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Action> removeIndex(
-				Function<RemoveIndexAction.Builder, ObjectBuilder<RemoveIndexAction>> fn) {
-			return this.removeIndex(fn.apply(new RemoveIndexAction.Builder()).build());
-		}
-
-		public Action build() {
-			_checkSingleUse();
-			return new Action(this);
-		}
-
-	}
-
-	protected static void setupActionDeserializer(ObjectDeserializer<Builder> op) {
-
-		op.add(Builder::add, AddAction._DESERIALIZER, "add");
-		op.add(Builder::remove, RemoveAction._DESERIALIZER, "remove");
-		op.add(Builder::removeIndex, RemoveIndexAction._DESERIALIZER, "remove_index");
-
-	}
-
-	public static final JsonpDeserializer<Action> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Action::setupActionDeserializer, Builder::build);
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    public Action(ActionVariant value) {
+
+        this._kind = ApiTypeHelper.requireNonNull(value._actionKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+
+    }
+
+    private Action(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static Action of(Function<Builder, ObjectBuilder<Action>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code add}?
+     */
+    public boolean isAdd() {
+        return _kind == Kind.Add;
+    }
+
+    /**
+     * Get the {@code add} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code add} kind.
+     */
+    public AddAction add() {
+        return TaggedUnionUtils.get(this, Kind.Add);
+    }
+
+    /**
+     * Is this variant instance of kind {@code remove}?
+     */
+    public boolean isRemove() {
+        return _kind == Kind.Remove;
+    }
+
+    /**
+     * Get the {@code remove} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code remove} kind.
+     */
+    public RemoveAction remove() {
+        return TaggedUnionUtils.get(this, Kind.Remove);
+    }
+
+    /**
+     * Is this variant instance of kind {@code remove_index}?
+     */
+    public boolean isRemoveIndex() {
+        return _kind == Kind.RemoveIndex;
+    }
+
+    /**
+     * Get the {@code remove_index} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code remove_index} kind.
+     */
+    public RemoveIndexAction removeIndex() {
+        return TaggedUnionUtils.get(this, Kind.RemoveIndex);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeStartObject();
+
+        generator.writeKey(_kind.jsonValue());
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        }
+
+        generator.writeEnd();
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Action> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<Action> add(AddAction v) {
+            this._kind = Kind.Add;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Action> add(Function<AddAction.Builder, ObjectBuilder<AddAction>> fn) {
+            return this.add(fn.apply(new AddAction.Builder()).build());
+        }
+
+        public ObjectBuilder<Action> remove(RemoveAction v) {
+            this._kind = Kind.Remove;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Action> remove(Function<RemoveAction.Builder, ObjectBuilder<RemoveAction>> fn) {
+            return this.remove(fn.apply(new RemoveAction.Builder()).build());
+        }
+
+        public ObjectBuilder<Action> removeIndex(RemoveIndexAction v) {
+            this._kind = Kind.RemoveIndex;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Action> removeIndex(Function<RemoveIndexAction.Builder, ObjectBuilder<RemoveIndexAction>> fn) {
+            return this.removeIndex(fn.apply(new RemoveIndexAction.Builder()).build());
+        }
+
+        public Action build() {
+            _checkSingleUse();
+            return new Action(this);
+        }
+
+    }
+
+    protected static void setupActionDeserializer(ObjectDeserializer<Builder> op) {
+
+        op.add(Builder::add, AddAction._DESERIALIZER, "add");
+        op.add(Builder::remove, RemoveAction._DESERIALIZER, "remove");
+        op.add(Builder::removeIndex, RemoveIndexAction._DESERIALIZER, "remove_index");
+
+    }
+
+    public static final JsonpDeserializer<Action> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Action::setupActionDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/ActionBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/ActionBuilders.java
index fdcd8ff65a..eb7408cda7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/ActionBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/ActionBuilders.java
@@ -36,29 +36,28 @@
  * Builders for {@link Action} variants.
  */
 public class ActionBuilders {
-	private ActionBuilders() {
-	}
-
-	/**
-	 * Creates a builder for the {@link AddAction add} {@code Action} variant.
-	 */
-	public static AddAction.Builder add() {
-		return new AddAction.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link RemoveAction remove} {@code Action} variant.
-	 */
-	public static RemoveAction.Builder remove() {
-		return new RemoveAction.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link RemoveIndexAction remove_index}
-	 * {@code Action} variant.
-	 */
-	public static RemoveIndexAction.Builder removeIndex() {
-		return new RemoveIndexAction.Builder();
-	}
+    private ActionBuilders() {}
+
+    /**
+     * Creates a builder for the {@link AddAction add} {@code Action} variant.
+     */
+    public static AddAction.Builder add() {
+        return new AddAction.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link RemoveAction remove} {@code Action} variant.
+     */
+    public static RemoveAction.Builder remove() {
+        return new RemoveAction.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link RemoveIndexAction remove_index}
+     * {@code Action} variant.
+     */
+    public static RemoveIndexAction.Builder removeIndex() {
+        return new RemoveIndexAction.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/ActionVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/ActionVariant.java
index 4211ce7981..a36046777b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/ActionVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/ActionVariant.java
@@ -37,10 +37,10 @@
  */
 public interface ActionVariant {
 
-	Action.Kind _actionKind();
+    Action.Kind _actionKind();
 
-	default Action _toAction() {
-		return new Action(this);
-	}
+    default Action _toAction() {
+        return new Action(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/AddAction.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/AddAction.java
index 9196690fcb..cbbd6ff830 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/AddAction.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/AddAction.java
@@ -32,419 +32,418 @@
 
 package org.opensearch.client.opensearch.indices.update_aliases;
 
-import org.opensearch.client.opensearch._types.query_dsl.Query;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.update_aliases.AddAction
 
-
 @JsonpDeserializable
 public class AddAction implements ActionVariant, JsonpSerializable {
-	@Nullable
-	private final String alias;
-
-	private final List<String> aliases;
-
-	@Nullable
-	private final Query filter;
-
-	@Nullable
-	private final String index;
-
-	private final List<String> indices;
-
-	@Nullable
-	private final String indexRouting;
-
-	@Nullable
-	private final Boolean isHidden;
-
-	@Nullable
-	private final Boolean isWriteIndex;
-
-	@Nullable
-	private final String routing;
-
-	@Nullable
-	private final String searchRouting;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AddAction(Builder builder) {
-
-		this.alias = builder.alias;
-		this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
-		this.filter = builder.filter;
-		this.index = builder.index;
-		this.indices = ApiTypeHelper.unmodifiable(builder.indices);
-		this.indexRouting = builder.indexRouting;
-		this.isHidden = builder.isHidden;
-		this.isWriteIndex = builder.isWriteIndex;
-		this.routing = builder.routing;
-		this.searchRouting = builder.searchRouting;
-
-	}
-
-	public static AddAction of(Function<Builder, ObjectBuilder<AddAction>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Action variant kind.
-	 */
-	@Override
-	public Action.Kind _actionKind() {
-		return Action.Kind.Add;
-	}
-
-	/**
-	 * API name: {@code alias}
-	 */
-	@Nullable
-	public final String alias() {
-		return this.alias;
-	}
-
-	/**
-	 * API name: {@code aliases}
-	 */
-	public final List<String> aliases() {
-		return this.aliases;
-	}
-
-	/**
-	 * API name: {@code filter}
-	 */
-	@Nullable
-	public final Query filter() {
-		return this.filter;
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code indices}
-	 */
-	public final List<String> indices() {
-		return this.indices;
-	}
-
-	/**
-	 * API name: {@code index_routing}
-	 */
-	@Nullable
-	public final String indexRouting() {
-		return this.indexRouting;
-	}
-
-	/**
-	 * API name: {@code is_hidden}
-	 */
-	@Nullable
-	public final Boolean isHidden() {
-		return this.isHidden;
-	}
-
-	/**
-	 * API name: {@code is_write_index}
-	 */
-	@Nullable
-	public final Boolean isWriteIndex() {
-		return this.isWriteIndex;
-	}
-
-	/**
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * API name: {@code search_routing}
-	 */
-	@Nullable
-	public final String searchRouting() {
-		return this.searchRouting;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.alias != null) {
-			generator.writeKey("alias");
-			generator.write(this.alias);
-
-		}
-		if (ApiTypeHelper.isDefined(this.aliases)) {
-			generator.writeKey("aliases");
-			generator.writeStartArray();
-			for (String item0 : this.aliases) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.filter != null) {
-			generator.writeKey("filter");
-			this.filter.serialize(generator, mapper);
-
-		}
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartArray();
-			for (String item0 : this.indices) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.indexRouting != null) {
-			generator.writeKey("index_routing");
-			generator.write(this.indexRouting);
-
-		}
-		if (this.isHidden != null) {
-			generator.writeKey("is_hidden");
-			generator.write(this.isHidden);
-
-		}
-		if (this.isWriteIndex != null) {
-			generator.writeKey("is_write_index");
-			generator.write(this.isWriteIndex);
-
-		}
-		if (this.routing != null) {
-			generator.writeKey("routing");
-			generator.write(this.routing);
-
-		}
-		if (this.searchRouting != null) {
-			generator.writeKey("search_routing");
-			generator.write(this.searchRouting);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AddAction}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AddAction> {
-		@Nullable
-		private String alias;
-
-		@Nullable
-		private List<String> aliases;
-
-		@Nullable
-		private Query filter;
-
-		@Nullable
-		private String index;
-
-		@Nullable
-		private List<String> indices;
-
-		@Nullable
-		private String indexRouting;
-
-		@Nullable
-		private Boolean isHidden;
-
-		@Nullable
-		private Boolean isWriteIndex;
-
-		@Nullable
-		private String routing;
-
-		@Nullable
-		private String searchRouting;
-
-		/**
-		 * API name: {@code alias}
-		 */
-		public final Builder alias(@Nullable String value) {
-			this.alias = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>aliases</code>.
-		 */
-		public final Builder aliases(List<String> list) {
-			this.aliases = _listAddAll(this.aliases, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds one or more values to <code>aliases</code>.
-		 */
-		public final Builder aliases(String value, String... values) {
-			this.aliases = _listAdd(this.aliases, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(@Nullable Query value) {
-			this.filter = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code filter}
-		 */
-		public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
-			return this.filter(fn.apply(new Query.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code indices}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indices</code>.
-		 */
-		public final Builder indices(List<String> list) {
-			this.indices = _listAddAll(this.indices, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code indices}
-		 * <p>
-		 * Adds one or more values to <code>indices</code>.
-		 */
-		public final Builder indices(String value, String... values) {
-			this.indices = _listAdd(this.indices, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_routing}
-		 */
-		public final Builder indexRouting(@Nullable String value) {
-			this.indexRouting = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code is_hidden}
-		 */
-		public final Builder isHidden(@Nullable Boolean value) {
-			this.isHidden = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code is_write_index}
-		 */
-		public final Builder isWriteIndex(@Nullable Boolean value) {
-			this.isWriteIndex = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code search_routing}
-		 */
-		public final Builder searchRouting(@Nullable String value) {
-			this.searchRouting = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AddAction}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AddAction build() {
-			_checkSingleUse();
-
-			return new AddAction(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AddAction}
-	 */
-	public static final JsonpDeserializer<AddAction> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			AddAction::setupAddActionDeserializer);
-
-	protected static void setupAddActionDeserializer(ObjectDeserializer<AddAction.Builder> op) {
-
-		op.add(Builder::alias, JsonpDeserializer.stringDeserializer(), "alias");
-		op.add(Builder::aliases, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"aliases");
-		op.add(Builder::filter, Query._DESERIALIZER, "filter");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"indices");
-		op.add(Builder::indexRouting, JsonpDeserializer.stringDeserializer(), "index_routing");
-		op.add(Builder::isHidden, JsonpDeserializer.booleanDeserializer(), "is_hidden");
-		op.add(Builder::isWriteIndex, JsonpDeserializer.booleanDeserializer(), "is_write_index");
-		op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
-		op.add(Builder::searchRouting, JsonpDeserializer.stringDeserializer(), "search_routing");
-
-	}
+    @Nullable
+    private final String alias;
+
+    private final List<String> aliases;
+
+    @Nullable
+    private final Query filter;
+
+    @Nullable
+    private final String index;
+
+    private final List<String> indices;
+
+    @Nullable
+    private final String indexRouting;
+
+    @Nullable
+    private final Boolean isHidden;
+
+    @Nullable
+    private final Boolean isWriteIndex;
+
+    @Nullable
+    private final String routing;
+
+    @Nullable
+    private final String searchRouting;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AddAction(Builder builder) {
+
+        this.alias = builder.alias;
+        this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
+        this.filter = builder.filter;
+        this.index = builder.index;
+        this.indices = ApiTypeHelper.unmodifiable(builder.indices);
+        this.indexRouting = builder.indexRouting;
+        this.isHidden = builder.isHidden;
+        this.isWriteIndex = builder.isWriteIndex;
+        this.routing = builder.routing;
+        this.searchRouting = builder.searchRouting;
+
+    }
+
+    public static AddAction of(Function<Builder, ObjectBuilder<AddAction>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Action variant kind.
+     */
+    @Override
+    public Action.Kind _actionKind() {
+        return Action.Kind.Add;
+    }
+
+    /**
+     * API name: {@code alias}
+     */
+    @Nullable
+    public final String alias() {
+        return this.alias;
+    }
+
+    /**
+     * API name: {@code aliases}
+     */
+    public final List<String> aliases() {
+        return this.aliases;
+    }
+
+    /**
+     * API name: {@code filter}
+     */
+    @Nullable
+    public final Query filter() {
+        return this.filter;
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code indices}
+     */
+    public final List<String> indices() {
+        return this.indices;
+    }
+
+    /**
+     * API name: {@code index_routing}
+     */
+    @Nullable
+    public final String indexRouting() {
+        return this.indexRouting;
+    }
+
+    /**
+     * API name: {@code is_hidden}
+     */
+    @Nullable
+    public final Boolean isHidden() {
+        return this.isHidden;
+    }
+
+    /**
+     * API name: {@code is_write_index}
+     */
+    @Nullable
+    public final Boolean isWriteIndex() {
+        return this.isWriteIndex;
+    }
+
+    /**
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * API name: {@code search_routing}
+     */
+    @Nullable
+    public final String searchRouting() {
+        return this.searchRouting;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.alias != null) {
+            generator.writeKey("alias");
+            generator.write(this.alias);
+
+        }
+        if (ApiTypeHelper.isDefined(this.aliases)) {
+            generator.writeKey("aliases");
+            generator.writeStartArray();
+            for (String item0 : this.aliases) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.filter != null) {
+            generator.writeKey("filter");
+            this.filter.serialize(generator, mapper);
+
+        }
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartArray();
+            for (String item0 : this.indices) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.indexRouting != null) {
+            generator.writeKey("index_routing");
+            generator.write(this.indexRouting);
+
+        }
+        if (this.isHidden != null) {
+            generator.writeKey("is_hidden");
+            generator.write(this.isHidden);
+
+        }
+        if (this.isWriteIndex != null) {
+            generator.writeKey("is_write_index");
+            generator.write(this.isWriteIndex);
+
+        }
+        if (this.routing != null) {
+            generator.writeKey("routing");
+            generator.write(this.routing);
+
+        }
+        if (this.searchRouting != null) {
+            generator.writeKey("search_routing");
+            generator.write(this.searchRouting);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AddAction}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AddAction> {
+        @Nullable
+        private String alias;
+
+        @Nullable
+        private List<String> aliases;
+
+        @Nullable
+        private Query filter;
+
+        @Nullable
+        private String index;
+
+        @Nullable
+        private List<String> indices;
+
+        @Nullable
+        private String indexRouting;
+
+        @Nullable
+        private Boolean isHidden;
+
+        @Nullable
+        private Boolean isWriteIndex;
+
+        @Nullable
+        private String routing;
+
+        @Nullable
+        private String searchRouting;
+
+        /**
+         * API name: {@code alias}
+         */
+        public final Builder alias(@Nullable String value) {
+            this.alias = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>aliases</code>.
+         */
+        public final Builder aliases(List<String> list) {
+            this.aliases = _listAddAll(this.aliases, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds one or more values to <code>aliases</code>.
+         */
+        public final Builder aliases(String value, String... values) {
+            this.aliases = _listAdd(this.aliases, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(@Nullable Query value) {
+            this.filter = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code filter}
+         */
+        public final Builder filter(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+            return this.filter(fn.apply(new Query.Builder()).build());
+        }
+
+        /**
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code indices}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indices</code>.
+         */
+        public final Builder indices(List<String> list) {
+            this.indices = _listAddAll(this.indices, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code indices}
+         * <p>
+         * Adds one or more values to <code>indices</code>.
+         */
+        public final Builder indices(String value, String... values) {
+            this.indices = _listAdd(this.indices, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code index_routing}
+         */
+        public final Builder indexRouting(@Nullable String value) {
+            this.indexRouting = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code is_hidden}
+         */
+        public final Builder isHidden(@Nullable Boolean value) {
+            this.isHidden = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code is_write_index}
+         */
+        public final Builder isWriteIndex(@Nullable Boolean value) {
+            this.isWriteIndex = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code search_routing}
+         */
+        public final Builder searchRouting(@Nullable String value) {
+            this.searchRouting = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link AddAction}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AddAction build() {
+            _checkSingleUse();
+
+            return new AddAction(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AddAction}
+     */
+    public static final JsonpDeserializer<AddAction> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AddAction::setupAddActionDeserializer
+    );
+
+    protected static void setupAddActionDeserializer(ObjectDeserializer<AddAction.Builder> op) {
+
+        op.add(Builder::alias, JsonpDeserializer.stringDeserializer(), "alias");
+        op.add(Builder::aliases, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "aliases");
+        op.add(Builder::filter, Query._DESERIALIZER, "filter");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "indices");
+        op.add(Builder::indexRouting, JsonpDeserializer.stringDeserializer(), "index_routing");
+        op.add(Builder::isHidden, JsonpDeserializer.booleanDeserializer(), "is_hidden");
+        op.add(Builder::isWriteIndex, JsonpDeserializer.booleanDeserializer(), "is_write_index");
+        op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
+        op.add(Builder::searchRouting, JsonpDeserializer.stringDeserializer(), "search_routing");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/RemoveAction.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/RemoveAction.java
index 90dea4df94..a55048f146 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/RemoveAction.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/RemoveAction.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.indices.update_aliases;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,257 +45,252 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.update_aliases.RemoveAction
 
-
 @JsonpDeserializable
 public class RemoveAction implements ActionVariant, JsonpSerializable {
-	@Nullable
-	private final String alias;
-
-	private final List<String> aliases;
-
-	@Nullable
-	private final String index;
-
-	private final List<String> indices;
-
-	@Nullable
-	private final Boolean mustExist;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RemoveAction(Builder builder) {
-
-		this.alias = builder.alias;
-		this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
-		this.index = builder.index;
-		this.indices = ApiTypeHelper.unmodifiable(builder.indices);
-		this.mustExist = builder.mustExist;
-
-	}
-
-	public static RemoveAction of(Function<Builder, ObjectBuilder<RemoveAction>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Action variant kind.
-	 */
-	@Override
-	public Action.Kind _actionKind() {
-		return Action.Kind.Remove;
-	}
-
-	/**
-	 * API name: {@code alias}
-	 */
-	@Nullable
-	public final String alias() {
-		return this.alias;
-	}
-
-	/**
-	 * API name: {@code aliases}
-	 */
-	public final List<String> aliases() {
-		return this.aliases;
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code indices}
-	 */
-	public final List<String> indices() {
-		return this.indices;
-	}
-
-	/**
-	 * API name: {@code must_exist}
-	 */
-	@Nullable
-	public final Boolean mustExist() {
-		return this.mustExist;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.alias != null) {
-			generator.writeKey("alias");
-			generator.write(this.alias);
-
-		}
-		if (ApiTypeHelper.isDefined(this.aliases)) {
-			generator.writeKey("aliases");
-			generator.writeStartArray();
-			for (String item0 : this.aliases) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartArray();
-			for (String item0 : this.indices) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.mustExist != null) {
-			generator.writeKey("must_exist");
-			generator.write(this.mustExist);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RemoveAction}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RemoveAction> {
-		@Nullable
-		private String alias;
-
-		@Nullable
-		private List<String> aliases;
-
-		@Nullable
-		private String index;
-
-		@Nullable
-		private List<String> indices;
-
-		@Nullable
-		private Boolean mustExist;
-
-		/**
-		 * API name: {@code alias}
-		 */
-		public final Builder alias(@Nullable String value) {
-			this.alias = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>aliases</code>.
-		 */
-		public final Builder aliases(List<String> list) {
-			this.aliases = _listAddAll(this.aliases, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aliases}
-		 * <p>
-		 * Adds one or more values to <code>aliases</code>.
-		 */
-		public final Builder aliases(String value, String... values) {
-			this.aliases = _listAdd(this.aliases, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code indices}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indices</code>.
-		 */
-		public final Builder indices(List<String> list) {
-			this.indices = _listAddAll(this.indices, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code indices}
-		 * <p>
-		 * Adds one or more values to <code>indices</code>.
-		 */
-		public final Builder indices(String value, String... values) {
-			this.indices = _listAdd(this.indices, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code must_exist}
-		 */
-		public final Builder mustExist(@Nullable Boolean value) {
-			this.mustExist = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RemoveAction}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RemoveAction build() {
-			_checkSingleUse();
-
-			return new RemoveAction(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RemoveAction}
-	 */
-	public static final JsonpDeserializer<RemoveAction> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RemoveAction::setupRemoveActionDeserializer);
-
-	protected static void setupRemoveActionDeserializer(ObjectDeserializer<RemoveAction.Builder> op) {
-
-		op.add(Builder::alias, JsonpDeserializer.stringDeserializer(), "alias");
-		op.add(Builder::aliases, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"aliases");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"indices");
-		op.add(Builder::mustExist, JsonpDeserializer.booleanDeserializer(), "must_exist");
-
-	}
+    @Nullable
+    private final String alias;
+
+    private final List<String> aliases;
+
+    @Nullable
+    private final String index;
+
+    private final List<String> indices;
+
+    @Nullable
+    private final Boolean mustExist;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RemoveAction(Builder builder) {
+
+        this.alias = builder.alias;
+        this.aliases = ApiTypeHelper.unmodifiable(builder.aliases);
+        this.index = builder.index;
+        this.indices = ApiTypeHelper.unmodifiable(builder.indices);
+        this.mustExist = builder.mustExist;
+
+    }
+
+    public static RemoveAction of(Function<Builder, ObjectBuilder<RemoveAction>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Action variant kind.
+     */
+    @Override
+    public Action.Kind _actionKind() {
+        return Action.Kind.Remove;
+    }
+
+    /**
+     * API name: {@code alias}
+     */
+    @Nullable
+    public final String alias() {
+        return this.alias;
+    }
+
+    /**
+     * API name: {@code aliases}
+     */
+    public final List<String> aliases() {
+        return this.aliases;
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code indices}
+     */
+    public final List<String> indices() {
+        return this.indices;
+    }
+
+    /**
+     * API name: {@code must_exist}
+     */
+    @Nullable
+    public final Boolean mustExist() {
+        return this.mustExist;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.alias != null) {
+            generator.writeKey("alias");
+            generator.write(this.alias);
+
+        }
+        if (ApiTypeHelper.isDefined(this.aliases)) {
+            generator.writeKey("aliases");
+            generator.writeStartArray();
+            for (String item0 : this.aliases) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartArray();
+            for (String item0 : this.indices) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.mustExist != null) {
+            generator.writeKey("must_exist");
+            generator.write(this.mustExist);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RemoveAction}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RemoveAction> {
+        @Nullable
+        private String alias;
+
+        @Nullable
+        private List<String> aliases;
+
+        @Nullable
+        private String index;
+
+        @Nullable
+        private List<String> indices;
+
+        @Nullable
+        private Boolean mustExist;
+
+        /**
+         * API name: {@code alias}
+         */
+        public final Builder alias(@Nullable String value) {
+            this.alias = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>aliases</code>.
+         */
+        public final Builder aliases(List<String> list) {
+            this.aliases = _listAddAll(this.aliases, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code aliases}
+         * <p>
+         * Adds one or more values to <code>aliases</code>.
+         */
+        public final Builder aliases(String value, String... values) {
+            this.aliases = _listAdd(this.aliases, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code indices}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indices</code>.
+         */
+        public final Builder indices(List<String> list) {
+            this.indices = _listAddAll(this.indices, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code indices}
+         * <p>
+         * Adds one or more values to <code>indices</code>.
+         */
+        public final Builder indices(String value, String... values) {
+            this.indices = _listAdd(this.indices, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code must_exist}
+         */
+        public final Builder mustExist(@Nullable Boolean value) {
+            this.mustExist = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RemoveAction}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RemoveAction build() {
+            _checkSingleUse();
+
+            return new RemoveAction(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RemoveAction}
+     */
+    public static final JsonpDeserializer<RemoveAction> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RemoveAction::setupRemoveActionDeserializer
+    );
+
+    protected static void setupRemoveActionDeserializer(ObjectDeserializer<RemoveAction.Builder> op) {
+
+        op.add(Builder::alias, JsonpDeserializer.stringDeserializer(), "alias");
+        op.add(Builder::aliases, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "aliases");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "indices");
+        op.add(Builder::mustExist, JsonpDeserializer.booleanDeserializer(), "must_exist");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/RemoveIndexAction.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/RemoveIndexAction.java
index fd8bb4a759..f5ce998396 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/RemoveIndexAction.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/update_aliases/RemoveIndexAction.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.indices.update_aliases;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,154 +45,150 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.update_aliases.RemoveIndexAction
 
-
 @JsonpDeserializable
 public class RemoveIndexAction implements ActionVariant, JsonpSerializable {
-	@Nullable
-	private final String index;
-
-	private final List<String> indices;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RemoveIndexAction(Builder builder) {
-
-		this.index = builder.index;
-		this.indices = ApiTypeHelper.unmodifiable(builder.indices);
-
-	}
-
-	public static RemoveIndexAction of(Function<Builder, ObjectBuilder<RemoveIndexAction>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Action variant kind.
-	 */
-	@Override
-	public Action.Kind _actionKind() {
-		return Action.Kind.RemoveIndex;
-	}
-
-	/**
-	 * API name: {@code index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * API name: {@code indices}
-	 */
-	public final List<String> indices() {
-		return this.indices;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.index != null) {
-			generator.writeKey("index");
-			generator.write(this.index);
-
-		}
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartArray();
-			for (String item0 : this.indices) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RemoveIndexAction}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RemoveIndexAction> {
-		@Nullable
-		private String index;
-
-		@Nullable
-		private List<String> indices;
-
-		/**
-		 * API name: {@code index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code indices}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indices</code>.
-		 */
-		public final Builder indices(List<String> list) {
-			this.indices = _listAddAll(this.indices, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code indices}
-		 * <p>
-		 * Adds one or more values to <code>indices</code>.
-		 */
-		public final Builder indices(String value, String... values) {
-			this.indices = _listAdd(this.indices, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RemoveIndexAction}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RemoveIndexAction build() {
-			_checkSingleUse();
-
-			return new RemoveIndexAction(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RemoveIndexAction}
-	 */
-	public static final JsonpDeserializer<RemoveIndexAction> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RemoveIndexAction::setupRemoveIndexActionDeserializer);
-
-	protected static void setupRemoveIndexActionDeserializer(ObjectDeserializer<RemoveIndexAction.Builder> op) {
-
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"indices");
-
-	}
+    @Nullable
+    private final String index;
+
+    private final List<String> indices;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RemoveIndexAction(Builder builder) {
+
+        this.index = builder.index;
+        this.indices = ApiTypeHelper.unmodifiable(builder.indices);
+
+    }
+
+    public static RemoveIndexAction of(Function<Builder, ObjectBuilder<RemoveIndexAction>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Action variant kind.
+     */
+    @Override
+    public Action.Kind _actionKind() {
+        return Action.Kind.RemoveIndex;
+    }
+
+    /**
+     * API name: {@code index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * API name: {@code indices}
+     */
+    public final List<String> indices() {
+        return this.indices;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.index != null) {
+            generator.writeKey("index");
+            generator.write(this.index);
+
+        }
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartArray();
+            for (String item0 : this.indices) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RemoveIndexAction}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RemoveIndexAction> {
+        @Nullable
+        private String index;
+
+        @Nullable
+        private List<String> indices;
+
+        /**
+         * API name: {@code index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code indices}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indices</code>.
+         */
+        public final Builder indices(List<String> list) {
+            this.indices = _listAddAll(this.indices, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code indices}
+         * <p>
+         * Adds one or more values to <code>indices</code>.
+         */
+        public final Builder indices(String value, String... values) {
+            this.indices = _listAdd(this.indices, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link RemoveIndexAction}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RemoveIndexAction build() {
+            _checkSingleUse();
+
+            return new RemoveIndexAction(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RemoveIndexAction}
+     */
+    public static final JsonpDeserializer<RemoveIndexAction> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RemoveIndexAction::setupRemoveIndexActionDeserializer
+    );
+
+    protected static void setupRemoveIndexActionDeserializer(ObjectDeserializer<RemoveIndexAction.Builder> op) {
+
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "indices");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/validate_query/IndicesValidationExplanation.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/validate_query/IndicesValidationExplanation.java
index d4efaf3029..51f71f7ccf 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/validate_query/IndicesValidationExplanation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/validate_query/IndicesValidationExplanation.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.indices.validate_query;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,176 +44,174 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: indices.validate_query.IndicesValidationExplanation
 
 @JsonpDeserializable
 public class IndicesValidationExplanation implements JsonpSerializable {
-	@Nullable
-	private final String error;
+    @Nullable
+    private final String error;
 
-	@Nullable
-	private final String explanation;
+    @Nullable
+    private final String explanation;
 
-	private final String index;
-
-	private final boolean valid;
+    private final String index;
+
+    private final boolean valid;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private IndicesValidationExplanation(Builder builder) {
-
-		this.error = builder.error;
-		this.explanation = builder.explanation;
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.valid = ApiTypeHelper.requireNonNull(builder.valid, this, "valid");
-
-	}
-
-	public static IndicesValidationExplanation of(Function<Builder, ObjectBuilder<IndicesValidationExplanation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code error}
-	 */
-	@Nullable
-	public final String error() {
-		return this.error;
-	}
-
-	/**
-	 * API name: {@code explanation}
-	 */
-	@Nullable
-	public final String explanation() {
-		return this.explanation;
-	}
-
-	/**
-	 * Required - API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Required - API name: {@code valid}
-	 */
-	public final boolean valid() {
-		return this.valid;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.error != null) {
-			generator.writeKey("error");
-			generator.write(this.error);
-
-		}
-		if (this.explanation != null) {
-			generator.writeKey("explanation");
-			generator.write(this.explanation);
-
-		}
-		generator.writeKey("index");
-		generator.write(this.index);
-
-		generator.writeKey("valid");
-		generator.write(this.valid);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndicesValidationExplanation}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesValidationExplanation> {
-		@Nullable
-		private String error;
-
-		@Nullable
-		private String explanation;
-
-		private String index;
-
-		private Boolean valid;
-
-		/**
-		 * API name: {@code error}
-		 */
-		public final Builder error(@Nullable String value) {
-			this.error = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code explanation}
-		 */
-		public final Builder explanation(@Nullable String value) {
-			this.explanation = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code valid}
-		 */
-		public final Builder valid(boolean value) {
-			this.valid = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IndicesValidationExplanation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndicesValidationExplanation build() {
-			_checkSingleUse();
-
-			return new IndicesValidationExplanation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndicesValidationExplanation}
-	 */
-	public static final JsonpDeserializer<IndicesValidationExplanation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, IndicesValidationExplanation::setupIndicesValidationExplanationDeserializer);
-
-	protected static void setupIndicesValidationExplanationDeserializer(
-			ObjectDeserializer<IndicesValidationExplanation.Builder> op) {
-
-		op.add(Builder::error, JsonpDeserializer.stringDeserializer(), "error");
-		op.add(Builder::explanation, JsonpDeserializer.stringDeserializer(), "explanation");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::valid, JsonpDeserializer.booleanDeserializer(), "valid");
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private IndicesValidationExplanation(Builder builder) {
+
+        this.error = builder.error;
+        this.explanation = builder.explanation;
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.valid = ApiTypeHelper.requireNonNull(builder.valid, this, "valid");
+
+    }
+
+    public static IndicesValidationExplanation of(Function<Builder, ObjectBuilder<IndicesValidationExplanation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code error}
+     */
+    @Nullable
+    public final String error() {
+        return this.error;
+    }
+
+    /**
+     * API name: {@code explanation}
+     */
+    @Nullable
+    public final String explanation() {
+        return this.explanation;
+    }
+
+    /**
+     * Required - API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Required - API name: {@code valid}
+     */
+    public final boolean valid() {
+        return this.valid;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.error != null) {
+            generator.writeKey("error");
+            generator.write(this.error);
+
+        }
+        if (this.explanation != null) {
+            generator.writeKey("explanation");
+            generator.write(this.explanation);
+
+        }
+        generator.writeKey("index");
+        generator.write(this.index);
+
+        generator.writeKey("valid");
+        generator.write(this.valid);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndicesValidationExplanation}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesValidationExplanation> {
+        @Nullable
+        private String error;
+
+        @Nullable
+        private String explanation;
+
+        private String index;
+
+        private Boolean valid;
+
+        /**
+         * API name: {@code error}
+         */
+        public final Builder error(@Nullable String value) {
+            this.error = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code explanation}
+         */
+        public final Builder explanation(@Nullable String value) {
+            this.explanation = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code valid}
+         */
+        public final Builder valid(boolean value) {
+            this.valid = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link IndicesValidationExplanation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndicesValidationExplanation build() {
+            _checkSingleUse();
+
+            return new IndicesValidationExplanation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndicesValidationExplanation}
+     */
+    public static final JsonpDeserializer<IndicesValidationExplanation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndicesValidationExplanation::setupIndicesValidationExplanationDeserializer
+    );
+
+    protected static void setupIndicesValidationExplanationDeserializer(ObjectDeserializer<IndicesValidationExplanation.Builder> op) {
+
+        op.add(Builder::error, JsonpDeserializer.stringDeserializer(), "error");
+        op.add(Builder::explanation, JsonpDeserializer.stringDeserializer(), "explanation");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::valid, JsonpDeserializer.booleanDeserializer(), "valid");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/AppendProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/AppendProcessor.java
index 099dc58392..6b71e07008 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/AppendProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/AppendProcessor.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,176 +44,171 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.AppendProcessor
 
-
 @JsonpDeserializable
 public class AppendProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
+    private final String field;
 
-	private final List<JsonData> value;
-
-	@Nullable
-	private final Boolean allowDuplicates;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AppendProcessor(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.value = ApiTypeHelper.unmodifiableRequired(builder.value, this, "value");
-		this.allowDuplicates = builder.allowDuplicates;
-
-	}
-
-	public static AppendProcessor of(Function<Builder, ObjectBuilder<AppendProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Append;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required - API name: {@code value}
-	 */
-	public final List<JsonData> value() {
-		return this.value;
-	}
-
-	/**
-	 * API name: {@code allow_duplicates}
-	 */
-	@Nullable
-	public final Boolean allowDuplicates() {
-		return this.allowDuplicates;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (ApiTypeHelper.isDefined(this.value)) {
-			generator.writeKey("value");
-			generator.writeStartArray();
-			for (JsonData item0 : this.value) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.allowDuplicates != null) {
-			generator.writeKey("allow_duplicates");
-			generator.write(this.allowDuplicates);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AppendProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<AppendProcessor> {
-		private String field;
-
-		private List<JsonData> value;
-
-		@Nullable
-		private Boolean allowDuplicates;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code value}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>value</code>.
-		 */
-		public final Builder value(List<JsonData> list) {
-			this.value = _listAddAll(this.value, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code value}
-		 * <p>
-		 * Adds one or more values to <code>value</code>.
-		 */
-		public final Builder value(JsonData value, JsonData... values) {
-			this.value = _listAdd(this.value, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code allow_duplicates}
-		 */
-		public final Builder allowDuplicates(@Nullable Boolean value) {
-			this.allowDuplicates = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AppendProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AppendProcessor build() {
-			_checkSingleUse();
-
-			return new AppendProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AppendProcessor}
-	 */
-	public static final JsonpDeserializer<AppendProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			AppendProcessor::setupAppendProcessorDeserializer);
-
-	protected static void setupAppendProcessorDeserializer(ObjectDeserializer<AppendProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::value, JsonpDeserializer.arrayDeserializer(JsonData._DESERIALIZER), "value");
-		op.add(Builder::allowDuplicates, JsonpDeserializer.booleanDeserializer(), "allow_duplicates");
-
-	}
+    private final List<JsonData> value;
+
+    @Nullable
+    private final Boolean allowDuplicates;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AppendProcessor(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.value = ApiTypeHelper.unmodifiableRequired(builder.value, this, "value");
+        this.allowDuplicates = builder.allowDuplicates;
+
+    }
+
+    public static AppendProcessor of(Function<Builder, ObjectBuilder<AppendProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Append;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required - API name: {@code value}
+     */
+    public final List<JsonData> value() {
+        return this.value;
+    }
+
+    /**
+     * API name: {@code allow_duplicates}
+     */
+    @Nullable
+    public final Boolean allowDuplicates() {
+        return this.allowDuplicates;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (ApiTypeHelper.isDefined(this.value)) {
+            generator.writeKey("value");
+            generator.writeStartArray();
+            for (JsonData item0 : this.value) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.allowDuplicates != null) {
+            generator.writeKey("allow_duplicates");
+            generator.write(this.allowDuplicates);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AppendProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<AppendProcessor> {
+        private String field;
+
+        private List<JsonData> value;
+
+        @Nullable
+        private Boolean allowDuplicates;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code value}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>value</code>.
+         */
+        public final Builder value(List<JsonData> list) {
+            this.value = _listAddAll(this.value, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code value}
+         * <p>
+         * Adds one or more values to <code>value</code>.
+         */
+        public final Builder value(JsonData value, JsonData... values) {
+            this.value = _listAdd(this.value, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code allow_duplicates}
+         */
+        public final Builder allowDuplicates(@Nullable Boolean value) {
+            this.allowDuplicates = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link AppendProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AppendProcessor build() {
+            _checkSingleUse();
+
+            return new AppendProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AppendProcessor}
+     */
+    public static final JsonpDeserializer<AppendProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AppendProcessor::setupAppendProcessorDeserializer
+    );
+
+    protected static void setupAppendProcessorDeserializer(ObjectDeserializer<AppendProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::value, JsonpDeserializer.arrayDeserializer(JsonData._DESERIALIZER), "value");
+        op.add(Builder::allowDuplicates, JsonpDeserializer.booleanDeserializer(), "allow_duplicates");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/AttachmentProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/AttachmentProcessor.java
index 8a50e6dc0c..427871a9da 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/AttachmentProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/AttachmentProcessor.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,294 +43,288 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.AttachmentProcessor
 
-
 @JsonpDeserializable
 public class AttachmentProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
-
-	@Nullable
-	private final Boolean ignoreMissing;
-
-	@Nullable
-	private final Long indexedChars;
-
-	@Nullable
-	private final String indexedCharsField;
-
-	private final List<String> properties;
-
-	@Nullable
-	private final String targetField;
-
-	@Nullable
-	private final String resourceName;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private AttachmentProcessor(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.ignoreMissing = builder.ignoreMissing;
-		this.indexedChars = builder.indexedChars;
-		this.indexedCharsField = builder.indexedCharsField;
-		this.properties = ApiTypeHelper.unmodifiable(builder.properties);
-		this.targetField = builder.targetField;
-		this.resourceName = builder.resourceName;
-
-	}
-
-	public static AttachmentProcessor of(Function<Builder, ObjectBuilder<AttachmentProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Attachment;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code ignore_missing}
-	 */
-	@Nullable
-	public final Boolean ignoreMissing() {
-		return this.ignoreMissing;
-	}
-
-	/**
-	 * API name: {@code indexed_chars}
-	 */
-	@Nullable
-	public final Long indexedChars() {
-		return this.indexedChars;
-	}
-
-	/**
-	 * API name: {@code indexed_chars_field}
-	 */
-	@Nullable
-	public final String indexedCharsField() {
-		return this.indexedCharsField;
-	}
-
-	/**
-	 * API name: {@code properties}
-	 */
-	public final List<String> properties() {
-		return this.properties;
-	}
-
-	/**
-	 * API name: {@code target_field}
-	 */
-	@Nullable
-	public final String targetField() {
-		return this.targetField;
-	}
-
-	/**
-	 * API name: {@code resource_name}
-	 */
-	@Nullable
-	public final String resourceName() {
-		return this.resourceName;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.ignoreMissing != null) {
-			generator.writeKey("ignore_missing");
-			generator.write(this.ignoreMissing);
-
-		}
-		if (this.indexedChars != null) {
-			generator.writeKey("indexed_chars");
-			generator.write(this.indexedChars);
-
-		}
-		if (this.indexedCharsField != null) {
-			generator.writeKey("indexed_chars_field");
-			generator.write(this.indexedCharsField);
-
-		}
-		if (ApiTypeHelper.isDefined(this.properties)) {
-			generator.writeKey("properties");
-			generator.writeStartArray();
-			for (String item0 : this.properties) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.targetField != null) {
-			generator.writeKey("target_field");
-			generator.write(this.targetField);
-
-		}
-		if (this.resourceName != null) {
-			generator.writeKey("resource_name");
-			generator.write(this.resourceName);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AttachmentProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<AttachmentProcessor> {
-		private String field;
-
-		@Nullable
-		private Boolean ignoreMissing;
-
-		@Nullable
-		private Long indexedChars;
-
-		@Nullable
-		private String indexedCharsField;
-
-		@Nullable
-		private List<String> properties;
-
-		@Nullable
-		private String targetField;
-
-		@Nullable
-		private String resourceName;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_missing}
-		 */
-		public final Builder ignoreMissing(@Nullable Boolean value) {
-			this.ignoreMissing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code indexed_chars}
-		 */
-		public final Builder indexedChars(@Nullable Long value) {
-			this.indexedChars = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code indexed_chars_field}
-		 */
-		public final Builder indexedCharsField(@Nullable String value) {
-			this.indexedCharsField = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code properties}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>properties</code>.
-		 */
-		public final Builder properties(List<String> list) {
-			this.properties = _listAddAll(this.properties, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code properties}
-		 * <p>
-		 * Adds one or more values to <code>properties</code>.
-		 */
-		public final Builder properties(String value, String... values) {
-			this.properties = _listAdd(this.properties, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code target_field}
-		 */
-		public final Builder targetField(@Nullable String value) {
-			this.targetField = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code resource_name}
-		 */
-		public final Builder resourceName(@Nullable String value) {
-			this.resourceName = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AttachmentProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AttachmentProcessor build() {
-			_checkSingleUse();
-
-			return new AttachmentProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AttachmentProcessor}
-	 */
-	public static final JsonpDeserializer<AttachmentProcessor> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, AttachmentProcessor::setupAttachmentProcessorDeserializer);
-
-	protected static void setupAttachmentProcessorDeserializer(ObjectDeserializer<AttachmentProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
-		op.add(Builder::indexedChars, JsonpDeserializer.longDeserializer(), "indexed_chars");
-		op.add(Builder::indexedCharsField, JsonpDeserializer.stringDeserializer(), "indexed_chars_field");
-		op.add(Builder::properties, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"properties");
-		op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
-		op.add(Builder::resourceName, JsonpDeserializer.stringDeserializer(), "resource_name");
-
-	}
+    private final String field;
+
+    @Nullable
+    private final Boolean ignoreMissing;
+
+    @Nullable
+    private final Long indexedChars;
+
+    @Nullable
+    private final String indexedCharsField;
+
+    private final List<String> properties;
+
+    @Nullable
+    private final String targetField;
+
+    @Nullable
+    private final String resourceName;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private AttachmentProcessor(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.ignoreMissing = builder.ignoreMissing;
+        this.indexedChars = builder.indexedChars;
+        this.indexedCharsField = builder.indexedCharsField;
+        this.properties = ApiTypeHelper.unmodifiable(builder.properties);
+        this.targetField = builder.targetField;
+        this.resourceName = builder.resourceName;
+
+    }
+
+    public static AttachmentProcessor of(Function<Builder, ObjectBuilder<AttachmentProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Attachment;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code ignore_missing}
+     */
+    @Nullable
+    public final Boolean ignoreMissing() {
+        return this.ignoreMissing;
+    }
+
+    /**
+     * API name: {@code indexed_chars}
+     */
+    @Nullable
+    public final Long indexedChars() {
+        return this.indexedChars;
+    }
+
+    /**
+     * API name: {@code indexed_chars_field}
+     */
+    @Nullable
+    public final String indexedCharsField() {
+        return this.indexedCharsField;
+    }
+
+    /**
+     * API name: {@code properties}
+     */
+    public final List<String> properties() {
+        return this.properties;
+    }
+
+    /**
+     * API name: {@code target_field}
+     */
+    @Nullable
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    /**
+     * API name: {@code resource_name}
+     */
+    @Nullable
+    public final String resourceName() {
+        return this.resourceName;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.ignoreMissing != null) {
+            generator.writeKey("ignore_missing");
+            generator.write(this.ignoreMissing);
+
+        }
+        if (this.indexedChars != null) {
+            generator.writeKey("indexed_chars");
+            generator.write(this.indexedChars);
+
+        }
+        if (this.indexedCharsField != null) {
+            generator.writeKey("indexed_chars_field");
+            generator.write(this.indexedCharsField);
+
+        }
+        if (ApiTypeHelper.isDefined(this.properties)) {
+            generator.writeKey("properties");
+            generator.writeStartArray();
+            for (String item0 : this.properties) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.targetField != null) {
+            generator.writeKey("target_field");
+            generator.write(this.targetField);
+
+        }
+        if (this.resourceName != null) {
+            generator.writeKey("resource_name");
+            generator.write(this.resourceName);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AttachmentProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<AttachmentProcessor> {
+        private String field;
+
+        @Nullable
+        private Boolean ignoreMissing;
+
+        @Nullable
+        private Long indexedChars;
+
+        @Nullable
+        private String indexedCharsField;
+
+        @Nullable
+        private List<String> properties;
+
+        @Nullable
+        private String targetField;
+
+        @Nullable
+        private String resourceName;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_missing}
+         */
+        public final Builder ignoreMissing(@Nullable Boolean value) {
+            this.ignoreMissing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code indexed_chars}
+         */
+        public final Builder indexedChars(@Nullable Long value) {
+            this.indexedChars = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code indexed_chars_field}
+         */
+        public final Builder indexedCharsField(@Nullable String value) {
+            this.indexedCharsField = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code properties}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>properties</code>.
+         */
+        public final Builder properties(List<String> list) {
+            this.properties = _listAddAll(this.properties, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code properties}
+         * <p>
+         * Adds one or more values to <code>properties</code>.
+         */
+        public final Builder properties(String value, String... values) {
+            this.properties = _listAdd(this.properties, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code target_field}
+         */
+        public final Builder targetField(@Nullable String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code resource_name}
+         */
+        public final Builder resourceName(@Nullable String value) {
+            this.resourceName = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link AttachmentProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AttachmentProcessor build() {
+            _checkSingleUse();
+
+            return new AttachmentProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AttachmentProcessor}
+     */
+    public static final JsonpDeserializer<AttachmentProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AttachmentProcessor::setupAttachmentProcessorDeserializer
+    );
+
+    protected static void setupAttachmentProcessorDeserializer(ObjectDeserializer<AttachmentProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
+        op.add(Builder::indexedChars, JsonpDeserializer.longDeserializer(), "indexed_chars");
+        op.add(Builder::indexedCharsField, JsonpDeserializer.stringDeserializer(), "indexed_chars_field");
+        op.add(Builder::properties, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "properties");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+        op.add(Builder::resourceName, JsonpDeserializer.stringDeserializer(), "resource_name");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/BytesProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/BytesProcessor.java
index 28013c9ca6..d548efc951 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/BytesProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/BytesProcessor.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,161 +42,157 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.BytesProcessor
 
-
 @JsonpDeserializable
 public class BytesProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
-
-	@Nullable
-	private final Boolean ignoreMissing;
-
-	@Nullable
-	private final String targetField;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private BytesProcessor(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.ignoreMissing = builder.ignoreMissing;
-		this.targetField = builder.targetField;
-
-	}
-
-	public static BytesProcessor of(Function<Builder, ObjectBuilder<BytesProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Bytes;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code ignore_missing}
-	 */
-	@Nullable
-	public final Boolean ignoreMissing() {
-		return this.ignoreMissing;
-	}
-
-	/**
-	 * API name: {@code target_field}
-	 */
-	@Nullable
-	public final String targetField() {
-		return this.targetField;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.ignoreMissing != null) {
-			generator.writeKey("ignore_missing");
-			generator.write(this.ignoreMissing);
-
-		}
-		if (this.targetField != null) {
-			generator.writeKey("target_field");
-			generator.write(this.targetField);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link BytesProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<BytesProcessor> {
-		private String field;
-
-		@Nullable
-		private Boolean ignoreMissing;
-
-		@Nullable
-		private String targetField;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_missing}
-		 */
-		public final Builder ignoreMissing(@Nullable Boolean value) {
-			this.ignoreMissing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code target_field}
-		 */
-		public final Builder targetField(@Nullable String value) {
-			this.targetField = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link BytesProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public BytesProcessor build() {
-			_checkSingleUse();
-
-			return new BytesProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link BytesProcessor}
-	 */
-	public static final JsonpDeserializer<BytesProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			BytesProcessor::setupBytesProcessorDeserializer);
-
-	protected static void setupBytesProcessorDeserializer(ObjectDeserializer<BytesProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
-		op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
-
-	}
+    private final String field;
+
+    @Nullable
+    private final Boolean ignoreMissing;
+
+    @Nullable
+    private final String targetField;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private BytesProcessor(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.ignoreMissing = builder.ignoreMissing;
+        this.targetField = builder.targetField;
+
+    }
+
+    public static BytesProcessor of(Function<Builder, ObjectBuilder<BytesProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Bytes;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code ignore_missing}
+     */
+    @Nullable
+    public final Boolean ignoreMissing() {
+        return this.ignoreMissing;
+    }
+
+    /**
+     * API name: {@code target_field}
+     */
+    @Nullable
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.ignoreMissing != null) {
+            generator.writeKey("ignore_missing");
+            generator.write(this.ignoreMissing);
+
+        }
+        if (this.targetField != null) {
+            generator.writeKey("target_field");
+            generator.write(this.targetField);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link BytesProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<BytesProcessor> {
+        private String field;
+
+        @Nullable
+        private Boolean ignoreMissing;
+
+        @Nullable
+        private String targetField;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_missing}
+         */
+        public final Builder ignoreMissing(@Nullable Boolean value) {
+            this.ignoreMissing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code target_field}
+         */
+        public final Builder targetField(@Nullable String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link BytesProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public BytesProcessor build() {
+            _checkSingleUse();
+
+            return new BytesProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link BytesProcessor}
+     */
+    public static final JsonpDeserializer<BytesProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        BytesProcessor::setupBytesProcessorDeserializer
+    );
+
+    protected static void setupBytesProcessorDeserializer(ObjectDeserializer<BytesProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/CircleProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/CircleProcessor.java
index a051994b46..07b17c0d3e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/CircleProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/CircleProcessor.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,196 +41,193 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: ingest._types.CircleProcessor
 
-
 @JsonpDeserializable
 public class CircleProcessor extends ProcessorBase implements ProcessorVariant {
-	private final double errorDistance;
+    private final double errorDistance;
 
-	private final String field;
+    private final String field;
 
-	private final boolean ignoreMissing;
+    private final boolean ignoreMissing;
 
-	private final ShapeType shapeType;
+    private final ShapeType shapeType;
 
-	private final String targetField;
+    private final String targetField;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private CircleProcessor(Builder builder) {
-		super(builder);
+    private CircleProcessor(Builder builder) {
+        super(builder);
 
-		this.errorDistance = ApiTypeHelper.requireNonNull(builder.errorDistance, this, "errorDistance");
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.ignoreMissing = ApiTypeHelper.requireNonNull(builder.ignoreMissing, this, "ignoreMissing");
-		this.shapeType = ApiTypeHelper.requireNonNull(builder.shapeType, this, "shapeType");
-		this.targetField = ApiTypeHelper.requireNonNull(builder.targetField, this, "targetField");
+        this.errorDistance = ApiTypeHelper.requireNonNull(builder.errorDistance, this, "errorDistance");
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.ignoreMissing = ApiTypeHelper.requireNonNull(builder.ignoreMissing, this, "ignoreMissing");
+        this.shapeType = ApiTypeHelper.requireNonNull(builder.shapeType, this, "shapeType");
+        this.targetField = ApiTypeHelper.requireNonNull(builder.targetField, this, "targetField");
 
-	}
+    }
 
-	public static CircleProcessor of(Function<Builder, ObjectBuilder<CircleProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static CircleProcessor of(Function<Builder, ObjectBuilder<CircleProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Circle;
-	}
-
-	/**
-	 * Required - API name: {@code error_distance}
-	 */
-	public final double errorDistance() {
-		return this.errorDistance;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required - API name: {@code ignore_missing}
-	 */
-	public final boolean ignoreMissing() {
-		return this.ignoreMissing;
-	}
-
-	/**
-	 * Required - API name: {@code shape_type}
-	 */
-	public final ShapeType shapeType() {
-		return this.shapeType;
-	}
-
-	/**
-	 * Required - API name: {@code target_field}
-	 */
-	public final String targetField() {
-		return this.targetField;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("error_distance");
-		generator.write(this.errorDistance);
-
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		generator.writeKey("ignore_missing");
-		generator.write(this.ignoreMissing);
-
-		generator.writeKey("shape_type");
-		this.shapeType.serialize(generator, mapper);
-		generator.writeKey("target_field");
-		generator.write(this.targetField);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CircleProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<CircleProcessor> {
-		private Double errorDistance;
-
-		private String field;
-
-		private Boolean ignoreMissing;
-
-		private ShapeType shapeType;
-
-		private String targetField;
-
-		/**
-		 * Required - API name: {@code error_distance}
-		 */
-		public final Builder errorDistance(double value) {
-			this.errorDistance = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code ignore_missing}
-		 */
-		public final Builder ignoreMissing(boolean value) {
-			this.ignoreMissing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shape_type}
-		 */
-		public final Builder shapeType(ShapeType value) {
-			this.shapeType = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code target_field}
-		 */
-		public final Builder targetField(String value) {
-			this.targetField = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CircleProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CircleProcessor build() {
-			_checkSingleUse();
-
-			return new CircleProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CircleProcessor}
-	 */
-	public static final JsonpDeserializer<CircleProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CircleProcessor::setupCircleProcessorDeserializer);
-
-	protected static void setupCircleProcessorDeserializer(ObjectDeserializer<CircleProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::errorDistance, JsonpDeserializer.doubleDeserializer(), "error_distance");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
-		op.add(Builder::shapeType, ShapeType._DESERIALIZER, "shape_type");
-		op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
-
-	}
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Circle;
+    }
+
+    /**
+     * Required - API name: {@code error_distance}
+     */
+    public final double errorDistance() {
+        return this.errorDistance;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required - API name: {@code ignore_missing}
+     */
+    public final boolean ignoreMissing() {
+        return this.ignoreMissing;
+    }
+
+    /**
+     * Required - API name: {@code shape_type}
+     */
+    public final ShapeType shapeType() {
+        return this.shapeType;
+    }
+
+    /**
+     * Required - API name: {@code target_field}
+     */
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("error_distance");
+        generator.write(this.errorDistance);
+
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        generator.writeKey("ignore_missing");
+        generator.write(this.ignoreMissing);
+
+        generator.writeKey("shape_type");
+        this.shapeType.serialize(generator, mapper);
+        generator.writeKey("target_field");
+        generator.write(this.targetField);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CircleProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<CircleProcessor> {
+        private Double errorDistance;
+
+        private String field;
+
+        private Boolean ignoreMissing;
+
+        private ShapeType shapeType;
+
+        private String targetField;
+
+        /**
+         * Required - API name: {@code error_distance}
+         */
+        public final Builder errorDistance(double value) {
+            this.errorDistance = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code ignore_missing}
+         */
+        public final Builder ignoreMissing(boolean value) {
+            this.ignoreMissing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shape_type}
+         */
+        public final Builder shapeType(ShapeType value) {
+            this.shapeType = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code target_field}
+         */
+        public final Builder targetField(String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CircleProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CircleProcessor build() {
+            _checkSingleUse();
+
+            return new CircleProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CircleProcessor}
+     */
+    public static final JsonpDeserializer<CircleProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CircleProcessor::setupCircleProcessorDeserializer
+    );
+
+    protected static void setupCircleProcessorDeserializer(ObjectDeserializer<CircleProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::errorDistance, JsonpDeserializer.doubleDeserializer(), "error_distance");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
+        op.add(Builder::shapeType, ShapeType._DESERIALIZER, "shape_type");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ConvertProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ConvertProcessor.java
index 8e5c01fc35..0a7dba4457 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ConvertProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ConvertProcessor.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,179 +42,175 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.ConvertProcessor
 
-
 @JsonpDeserializable
 public class ConvertProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
+    private final String field;
+
+    @Nullable
+    private final Boolean ignoreMissing;
 
-	@Nullable
-	private final Boolean ignoreMissing;
+    private final String targetField;
 
-	private final String targetField;
+    private final ConvertType type;
 
-	private final ConvertType type;
+    // ---------------------------------------------------------------------------------------------
 
-	// ---------------------------------------------------------------------------------------------
+    private ConvertProcessor(Builder builder) {
+        super(builder);
 
-	private ConvertProcessor(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.ignoreMissing = builder.ignoreMissing;
-		this.targetField = ApiTypeHelper.requireNonNull(builder.targetField, this, "targetField");
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-
-	}
-
-	public static ConvertProcessor of(Function<Builder, ObjectBuilder<ConvertProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Convert;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code ignore_missing}
-	 */
-	@Nullable
-	public final Boolean ignoreMissing() {
-		return this.ignoreMissing;
-	}
-
-	/**
-	 * Required - API name: {@code target_field}
-	 */
-	public final String targetField() {
-		return this.targetField;
-	}
-
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final ConvertType type() {
-		return this.type;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.ignoreMissing != null) {
-			generator.writeKey("ignore_missing");
-			generator.write(this.ignoreMissing);
-
-		}
-		generator.writeKey("target_field");
-		generator.write(this.targetField);
-
-		generator.writeKey("type");
-		this.type.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ConvertProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ConvertProcessor> {
-		private String field;
-
-		@Nullable
-		private Boolean ignoreMissing;
-
-		private String targetField;
-
-		private ConvertType type;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_missing}
-		 */
-		public final Builder ignoreMissing(@Nullable Boolean value) {
-			this.ignoreMissing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code target_field}
-		 */
-		public final Builder targetField(String value) {
-			this.targetField = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(ConvertType value) {
-			this.type = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ConvertProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ConvertProcessor build() {
-			_checkSingleUse();
-
-			return new ConvertProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ConvertProcessor}
-	 */
-	public static final JsonpDeserializer<ConvertProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ConvertProcessor::setupConvertProcessorDeserializer);
-
-	protected static void setupConvertProcessorDeserializer(ObjectDeserializer<ConvertProcessor.Builder> op) {
-		ProcessorBase.setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
-		op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
-		op.add(Builder::type, ConvertType._DESERIALIZER, "type");
-
-	}
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.ignoreMissing = builder.ignoreMissing;
+        this.targetField = ApiTypeHelper.requireNonNull(builder.targetField, this, "targetField");
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+
+    }
+
+    public static ConvertProcessor of(Function<Builder, ObjectBuilder<ConvertProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Convert;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code ignore_missing}
+     */
+    @Nullable
+    public final Boolean ignoreMissing() {
+        return this.ignoreMissing;
+    }
+
+    /**
+     * Required - API name: {@code target_field}
+     */
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    public final ConvertType type() {
+        return this.type;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.ignoreMissing != null) {
+            generator.writeKey("ignore_missing");
+            generator.write(this.ignoreMissing);
+
+        }
+        generator.writeKey("target_field");
+        generator.write(this.targetField);
+
+        generator.writeKey("type");
+        this.type.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ConvertProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<ConvertProcessor> {
+        private String field;
+
+        @Nullable
+        private Boolean ignoreMissing;
+
+        private String targetField;
+
+        private ConvertType type;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_missing}
+         */
+        public final Builder ignoreMissing(@Nullable Boolean value) {
+            this.ignoreMissing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code target_field}
+         */
+        public final Builder targetField(String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(ConvertType value) {
+            this.type = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ConvertProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ConvertProcessor build() {
+            _checkSingleUse();
+
+            return new ConvertProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ConvertProcessor}
+     */
+    public static final JsonpDeserializer<ConvertProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ConvertProcessor::setupConvertProcessorDeserializer
+    );
+
+    protected static void setupConvertProcessorDeserializer(ObjectDeserializer<ConvertProcessor.Builder> op) {
+        ProcessorBase.setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+        op.add(Builder::type, ConvertType._DESERIALIZER, "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ConvertType.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ConvertType.java
index 100319e5a1..1a1e98cdb8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ConvertType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ConvertType.java
@@ -35,35 +35,33 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum ConvertType implements JsonEnum {
-	Integer("integer"),
+    Integer("integer"),
 
-	Long("long"),
+    Long("long"),
 
-	Float("float"),
+    Float("float"),
 
-	Double("double"),
+    Double("double"),
 
-	String("string"),
+    String("string"),
 
-	Boolean("boolean"),
+    Boolean("boolean"),
 
-	Auto("auto"),
+    Auto("auto"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	ConvertType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    ConvertType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<ConvertType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			ConvertType.values());
+    public static final JsonEnum.Deserializer<ConvertType> _DESERIALIZER = new JsonEnum.Deserializer<>(ConvertType.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/CsvProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/CsvProcessor.java
index 82e2c798a8..95d35ea598 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/CsvProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/CsvProcessor.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,309 +44,305 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.CsvProcessor
 
-
 @JsonpDeserializable
 public class CsvProcessor extends ProcessorBase implements ProcessorVariant {
-	private final JsonData emptyValue;
-
-	@Nullable
-	private final String description;
-
-	private final String field;
-
-	@Nullable
-	private final Boolean ignoreMissing;
-
-	@Nullable
-	private final String quote;
-
-	@Nullable
-	private final String separator;
-
-	private final List<String> targetFields;
-
-	private final boolean trim;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CsvProcessor(Builder builder) {
-		super(builder);
-
-		this.emptyValue = ApiTypeHelper.requireNonNull(builder.emptyValue, this, "emptyValue");
-		this.description = builder.description;
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.ignoreMissing = builder.ignoreMissing;
-		this.quote = builder.quote;
-		this.separator = builder.separator;
-		this.targetFields = ApiTypeHelper.unmodifiableRequired(builder.targetFields, this, "targetFields");
-		this.trim = ApiTypeHelper.requireNonNull(builder.trim, this, "trim");
-
-	}
-
-	public static CsvProcessor of(Function<Builder, ObjectBuilder<CsvProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Csv;
-	}
-
-	/**
-	 * Required - API name: {@code empty_value}
-	 */
-	public final JsonData emptyValue() {
-		return this.emptyValue;
-	}
-
-	/**
-	 * API name: {@code description}
-	 */
-	@Nullable
-	public final String description() {
-		return this.description;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code ignore_missing}
-	 */
-	@Nullable
-	public final Boolean ignoreMissing() {
-		return this.ignoreMissing;
-	}
-
-	/**
-	 * API name: {@code quote}
-	 */
-	@Nullable
-	public final String quote() {
-		return this.quote;
-	}
-
-	/**
-	 * API name: {@code separator}
-	 */
-	@Nullable
-	public final String separator() {
-		return this.separator;
-	}
-
-	/**
-	 * Required - API name: {@code target_fields}
-	 */
-	public final List<String> targetFields() {
-		return this.targetFields;
-	}
-
-	/**
-	 * Required - API name: {@code trim}
-	 */
-	public final boolean trim() {
-		return this.trim;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("empty_value");
-		this.emptyValue.serialize(generator, mapper);
-
-		if (this.description != null) {
-			generator.writeKey("description");
-			generator.write(this.description);
-
-		}
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.ignoreMissing != null) {
-			generator.writeKey("ignore_missing");
-			generator.write(this.ignoreMissing);
-
-		}
-		if (this.quote != null) {
-			generator.writeKey("quote");
-			generator.write(this.quote);
-
-		}
-		if (this.separator != null) {
-			generator.writeKey("separator");
-			generator.write(this.separator);
-
-		}
-		if (ApiTypeHelper.isDefined(this.targetFields)) {
-			generator.writeKey("target_fields");
-			generator.writeStartArray();
-			for (String item0 : this.targetFields) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("trim");
-		generator.write(this.trim);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CsvProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<CsvProcessor> {
-		private JsonData emptyValue;
-
-		@Nullable
-		private String description;
-
-		private String field;
-
-		@Nullable
-		private Boolean ignoreMissing;
-
-		@Nullable
-		private String quote;
-
-		@Nullable
-		private String separator;
-
-		private List<String> targetFields;
-
-		private Boolean trim;
-
-		/**
-		 * Required - API name: {@code empty_value}
-		 */
-		public final Builder emptyValue(JsonData value) {
-			this.emptyValue = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code description}
-		 */
-		public final Builder description(@Nullable String value) {
-			this.description = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_missing}
-		 */
-		public final Builder ignoreMissing(@Nullable Boolean value) {
-			this.ignoreMissing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code quote}
-		 */
-		public final Builder quote(@Nullable String value) {
-			this.quote = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code separator}
-		 */
-		public final Builder separator(@Nullable String value) {
-			this.separator = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code target_fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>targetFields</code>.
-		 */
-		public final Builder targetFields(List<String> list) {
-			this.targetFields = _listAddAll(this.targetFields, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code target_fields}
-		 * <p>
-		 * Adds one or more values to <code>targetFields</code>.
-		 */
-		public final Builder targetFields(String value, String... values) {
-			this.targetFields = _listAdd(this.targetFields, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code trim}
-		 */
-		public final Builder trim(boolean value) {
-			this.trim = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CsvProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CsvProcessor build() {
-			_checkSingleUse();
-
-			return new CsvProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CsvProcessor}
-	 */
-	public static final JsonpDeserializer<CsvProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CsvProcessor::setupCsvProcessorDeserializer);
-
-	protected static void setupCsvProcessorDeserializer(ObjectDeserializer<CsvProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::emptyValue, JsonData._DESERIALIZER, "empty_value");
-		op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
-		op.add(Builder::quote, JsonpDeserializer.stringDeserializer(), "quote");
-		op.add(Builder::separator, JsonpDeserializer.stringDeserializer(), "separator");
-		op.add(Builder::targetFields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"target_fields");
-		op.add(Builder::trim, JsonpDeserializer.booleanDeserializer(), "trim");
-
-	}
+    private final JsonData emptyValue;
+
+    @Nullable
+    private final String description;
+
+    private final String field;
+
+    @Nullable
+    private final Boolean ignoreMissing;
+
+    @Nullable
+    private final String quote;
+
+    @Nullable
+    private final String separator;
+
+    private final List<String> targetFields;
+
+    private final boolean trim;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CsvProcessor(Builder builder) {
+        super(builder);
+
+        this.emptyValue = ApiTypeHelper.requireNonNull(builder.emptyValue, this, "emptyValue");
+        this.description = builder.description;
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.ignoreMissing = builder.ignoreMissing;
+        this.quote = builder.quote;
+        this.separator = builder.separator;
+        this.targetFields = ApiTypeHelper.unmodifiableRequired(builder.targetFields, this, "targetFields");
+        this.trim = ApiTypeHelper.requireNonNull(builder.trim, this, "trim");
+
+    }
+
+    public static CsvProcessor of(Function<Builder, ObjectBuilder<CsvProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Csv;
+    }
+
+    /**
+     * Required - API name: {@code empty_value}
+     */
+    public final JsonData emptyValue() {
+        return this.emptyValue;
+    }
+
+    /**
+     * API name: {@code description}
+     */
+    @Nullable
+    public final String description() {
+        return this.description;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code ignore_missing}
+     */
+    @Nullable
+    public final Boolean ignoreMissing() {
+        return this.ignoreMissing;
+    }
+
+    /**
+     * API name: {@code quote}
+     */
+    @Nullable
+    public final String quote() {
+        return this.quote;
+    }
+
+    /**
+     * API name: {@code separator}
+     */
+    @Nullable
+    public final String separator() {
+        return this.separator;
+    }
+
+    /**
+     * Required - API name: {@code target_fields}
+     */
+    public final List<String> targetFields() {
+        return this.targetFields;
+    }
+
+    /**
+     * Required - API name: {@code trim}
+     */
+    public final boolean trim() {
+        return this.trim;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("empty_value");
+        this.emptyValue.serialize(generator, mapper);
+
+        if (this.description != null) {
+            generator.writeKey("description");
+            generator.write(this.description);
+
+        }
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.ignoreMissing != null) {
+            generator.writeKey("ignore_missing");
+            generator.write(this.ignoreMissing);
+
+        }
+        if (this.quote != null) {
+            generator.writeKey("quote");
+            generator.write(this.quote);
+
+        }
+        if (this.separator != null) {
+            generator.writeKey("separator");
+            generator.write(this.separator);
+
+        }
+        if (ApiTypeHelper.isDefined(this.targetFields)) {
+            generator.writeKey("target_fields");
+            generator.writeStartArray();
+            for (String item0 : this.targetFields) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("trim");
+        generator.write(this.trim);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CsvProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<CsvProcessor> {
+        private JsonData emptyValue;
+
+        @Nullable
+        private String description;
+
+        private String field;
+
+        @Nullable
+        private Boolean ignoreMissing;
+
+        @Nullable
+        private String quote;
+
+        @Nullable
+        private String separator;
+
+        private List<String> targetFields;
+
+        private Boolean trim;
+
+        /**
+         * Required - API name: {@code empty_value}
+         */
+        public final Builder emptyValue(JsonData value) {
+            this.emptyValue = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code description}
+         */
+        public final Builder description(@Nullable String value) {
+            this.description = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_missing}
+         */
+        public final Builder ignoreMissing(@Nullable Boolean value) {
+            this.ignoreMissing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code quote}
+         */
+        public final Builder quote(@Nullable String value) {
+            this.quote = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code separator}
+         */
+        public final Builder separator(@Nullable String value) {
+            this.separator = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code target_fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>targetFields</code>.
+         */
+        public final Builder targetFields(List<String> list) {
+            this.targetFields = _listAddAll(this.targetFields, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code target_fields}
+         * <p>
+         * Adds one or more values to <code>targetFields</code>.
+         */
+        public final Builder targetFields(String value, String... values) {
+            this.targetFields = _listAdd(this.targetFields, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code trim}
+         */
+        public final Builder trim(boolean value) {
+            this.trim = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CsvProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CsvProcessor build() {
+            _checkSingleUse();
+
+            return new CsvProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CsvProcessor}
+     */
+    public static final JsonpDeserializer<CsvProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CsvProcessor::setupCsvProcessorDeserializer
+    );
+
+    protected static void setupCsvProcessorDeserializer(ObjectDeserializer<CsvProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::emptyValue, JsonData._DESERIALIZER, "empty_value");
+        op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
+        op.add(Builder::quote, JsonpDeserializer.stringDeserializer(), "quote");
+        op.add(Builder::separator, JsonpDeserializer.stringDeserializer(), "separator");
+        op.add(Builder::targetFields, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "target_fields");
+        op.add(Builder::trim, JsonpDeserializer.booleanDeserializer(), "trim");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DateIndexNameProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DateIndexNameProcessor.java
index 2050e7aeeb..b87d0e3a9d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DateIndexNameProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DateIndexNameProcessor.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,279 +42,273 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: ingest._types.DateIndexNameProcessor
 
-
 @JsonpDeserializable
 public class DateIndexNameProcessor extends ProcessorBase implements ProcessorVariant {
-	private final List<String> dateFormats;
-
-	private final String dateRounding;
-
-	private final String field;
-
-	private final String indexNameFormat;
-
-	private final String indexNamePrefix;
-
-	private final String locale;
-
-	private final String timezone;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DateIndexNameProcessor(Builder builder) {
-		super(builder);
-
-		this.dateFormats = ApiTypeHelper.unmodifiableRequired(builder.dateFormats, this, "dateFormats");
-		this.dateRounding = ApiTypeHelper.requireNonNull(builder.dateRounding, this, "dateRounding");
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.indexNameFormat = ApiTypeHelper.requireNonNull(builder.indexNameFormat, this, "indexNameFormat");
-		this.indexNamePrefix = ApiTypeHelper.requireNonNull(builder.indexNamePrefix, this, "indexNamePrefix");
-		this.locale = ApiTypeHelper.requireNonNull(builder.locale, this, "locale");
-		this.timezone = ApiTypeHelper.requireNonNull(builder.timezone, this, "timezone");
-
-	}
-
-	public static DateIndexNameProcessor of(Function<Builder, ObjectBuilder<DateIndexNameProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.DateIndexName;
-	}
-
-	/**
-	 * Required - API name: {@code date_formats}
-	 */
-	public final List<String> dateFormats() {
-		return this.dateFormats;
-	}
+    private final List<String> dateFormats;
+
+    private final String dateRounding;
+
+    private final String field;
+
+    private final String indexNameFormat;
+
+    private final String indexNamePrefix;
+
+    private final String locale;
+
+    private final String timezone;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DateIndexNameProcessor(Builder builder) {
+        super(builder);
+
+        this.dateFormats = ApiTypeHelper.unmodifiableRequired(builder.dateFormats, this, "dateFormats");
+        this.dateRounding = ApiTypeHelper.requireNonNull(builder.dateRounding, this, "dateRounding");
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.indexNameFormat = ApiTypeHelper.requireNonNull(builder.indexNameFormat, this, "indexNameFormat");
+        this.indexNamePrefix = ApiTypeHelper.requireNonNull(builder.indexNamePrefix, this, "indexNamePrefix");
+        this.locale = ApiTypeHelper.requireNonNull(builder.locale, this, "locale");
+        this.timezone = ApiTypeHelper.requireNonNull(builder.timezone, this, "timezone");
+
+    }
+
+    public static DateIndexNameProcessor of(Function<Builder, ObjectBuilder<DateIndexNameProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.DateIndexName;
+    }
+
+    /**
+     * Required - API name: {@code date_formats}
+     */
+    public final List<String> dateFormats() {
+        return this.dateFormats;
+    }
+
+    /**
+     * Required - How to round the date when formatting the date into the index
+     * name. Valid values are: <code>y</code> (year), <code>M</code> (month),
+     * <code>w</code> (week), <code>d</code> (day), <code>h</code> (hour),
+     * <code>m</code> (minute) and <code>s</code> (second). Supports template
+     * snippets.
+     * <p>
+     * API name: {@code date_rounding}
+     */
+    public final String dateRounding() {
+        return this.dateRounding;
+    }
 
-	/**
-	 * Required - How to round the date when formatting the date into the index
-	 * name. Valid values are: <code>y</code> (year), <code>M</code> (month),
-	 * <code>w</code> (week), <code>d</code> (day), <code>h</code> (hour),
-	 * <code>m</code> (minute) and <code>s</code> (second). Supports template
-	 * snippets.
-	 * <p>
-	 * API name: {@code date_rounding}
-	 */
-	public final String dateRounding() {
-		return this.dateRounding;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required - API name: {@code index_name_format}
-	 */
-	public final String indexNameFormat() {
-		return this.indexNameFormat;
-	}
-
-	/**
-	 * Required - API name: {@code index_name_prefix}
-	 */
-	public final String indexNamePrefix() {
-		return this.indexNamePrefix;
-	}
-
-	/**
-	 * Required - API name: {@code locale}
-	 */
-	public final String locale() {
-		return this.locale;
-	}
-
-	/**
-	 * Required - API name: {@code timezone}
-	 */
-	public final String timezone() {
-		return this.timezone;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.dateFormats)) {
-			generator.writeKey("date_formats");
-			generator.writeStartArray();
-			for (String item0 : this.dateFormats) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("date_rounding");
-		generator.write(this.dateRounding);
-
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		generator.writeKey("index_name_format");
-		generator.write(this.indexNameFormat);
-
-		generator.writeKey("index_name_prefix");
-		generator.write(this.indexNamePrefix);
-
-		generator.writeKey("locale");
-		generator.write(this.locale);
-
-		generator.writeKey("timezone");
-		generator.write(this.timezone);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DateIndexNameProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DateIndexNameProcessor> {
-		private List<String> dateFormats;
-
-		private String dateRounding;
-
-		private String field;
-
-		private String indexNameFormat;
-
-		private String indexNamePrefix;
-
-		private String locale;
-
-		private String timezone;
-
-		/**
-		 * Required - API name: {@code date_formats}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>dateFormats</code>.
-		 */
-		public final Builder dateFormats(List<String> list) {
-			this.dateFormats = _listAddAll(this.dateFormats, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code date_formats}
-		 * <p>
-		 * Adds one or more values to <code>dateFormats</code>.
-		 */
-		public final Builder dateFormats(String value, String... values) {
-			this.dateFormats = _listAdd(this.dateFormats, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - How to round the date when formatting the date into the index
-		 * name. Valid values are: <code>y</code> (year), <code>M</code> (month),
-		 * <code>w</code> (week), <code>d</code> (day), <code>h</code> (hour),
-		 * <code>m</code> (minute) and <code>s</code> (second). Supports template
-		 * snippets.
-		 * <p>
-		 * API name: {@code date_rounding}
-		 */
-		public final Builder dateRounding(String value) {
-			this.dateRounding = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index_name_format}
-		 */
-		public final Builder indexNameFormat(String value) {
-			this.indexNameFormat = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code index_name_prefix}
-		 */
-		public final Builder indexNamePrefix(String value) {
-			this.indexNamePrefix = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code locale}
-		 */
-		public final Builder locale(String value) {
-			this.locale = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code timezone}
-		 */
-		public final Builder timezone(String value) {
-			this.timezone = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DateIndexNameProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DateIndexNameProcessor build() {
-			_checkSingleUse();
-
-			return new DateIndexNameProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DateIndexNameProcessor}
-	 */
-	public static final JsonpDeserializer<DateIndexNameProcessor> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DateIndexNameProcessor::setupDateIndexNameProcessorDeserializer);
-
-	protected static void setupDateIndexNameProcessorDeserializer(
-			ObjectDeserializer<DateIndexNameProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::dateFormats, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"date_formats");
-		op.add(Builder::dateRounding, JsonpDeserializer.stringDeserializer(), "date_rounding");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::indexNameFormat, JsonpDeserializer.stringDeserializer(), "index_name_format");
-		op.add(Builder::indexNamePrefix, JsonpDeserializer.stringDeserializer(), "index_name_prefix");
-		op.add(Builder::locale, JsonpDeserializer.stringDeserializer(), "locale");
-		op.add(Builder::timezone, JsonpDeserializer.stringDeserializer(), "timezone");
-
-	}
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required - API name: {@code index_name_format}
+     */
+    public final String indexNameFormat() {
+        return this.indexNameFormat;
+    }
+
+    /**
+     * Required - API name: {@code index_name_prefix}
+     */
+    public final String indexNamePrefix() {
+        return this.indexNamePrefix;
+    }
+
+    /**
+     * Required - API name: {@code locale}
+     */
+    public final String locale() {
+        return this.locale;
+    }
+
+    /**
+     * Required - API name: {@code timezone}
+     */
+    public final String timezone() {
+        return this.timezone;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.dateFormats)) {
+            generator.writeKey("date_formats");
+            generator.writeStartArray();
+            for (String item0 : this.dateFormats) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("date_rounding");
+        generator.write(this.dateRounding);
+
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        generator.writeKey("index_name_format");
+        generator.write(this.indexNameFormat);
+
+        generator.writeKey("index_name_prefix");
+        generator.write(this.indexNamePrefix);
+
+        generator.writeKey("locale");
+        generator.write(this.locale);
+
+        generator.writeKey("timezone");
+        generator.write(this.timezone);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DateIndexNameProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<DateIndexNameProcessor> {
+        private List<String> dateFormats;
+
+        private String dateRounding;
+
+        private String field;
+
+        private String indexNameFormat;
+
+        private String indexNamePrefix;
+
+        private String locale;
+
+        private String timezone;
+
+        /**
+         * Required - API name: {@code date_formats}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>dateFormats</code>.
+         */
+        public final Builder dateFormats(List<String> list) {
+            this.dateFormats = _listAddAll(this.dateFormats, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code date_formats}
+         * <p>
+         * Adds one or more values to <code>dateFormats</code>.
+         */
+        public final Builder dateFormats(String value, String... values) {
+            this.dateFormats = _listAdd(this.dateFormats, value, values);
+            return this;
+        }
+
+        /**
+         * Required - How to round the date when formatting the date into the index
+         * name. Valid values are: <code>y</code> (year), <code>M</code> (month),
+         * <code>w</code> (week), <code>d</code> (day), <code>h</code> (hour),
+         * <code>m</code> (minute) and <code>s</code> (second). Supports template
+         * snippets.
+         * <p>
+         * API name: {@code date_rounding}
+         */
+        public final Builder dateRounding(String value) {
+            this.dateRounding = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index_name_format}
+         */
+        public final Builder indexNameFormat(String value) {
+            this.indexNameFormat = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code index_name_prefix}
+         */
+        public final Builder indexNamePrefix(String value) {
+            this.indexNamePrefix = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code locale}
+         */
+        public final Builder locale(String value) {
+            this.locale = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code timezone}
+         */
+        public final Builder timezone(String value) {
+            this.timezone = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DateIndexNameProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DateIndexNameProcessor build() {
+            _checkSingleUse();
+
+            return new DateIndexNameProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DateIndexNameProcessor}
+     */
+    public static final JsonpDeserializer<DateIndexNameProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DateIndexNameProcessor::setupDateIndexNameProcessorDeserializer
+    );
+
+    protected static void setupDateIndexNameProcessorDeserializer(ObjectDeserializer<DateIndexNameProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::dateFormats, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "date_formats");
+        op.add(Builder::dateRounding, JsonpDeserializer.stringDeserializer(), "date_rounding");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::indexNameFormat, JsonpDeserializer.stringDeserializer(), "index_name_format");
+        op.add(Builder::indexNamePrefix, JsonpDeserializer.stringDeserializer(), "index_name_prefix");
+        op.add(Builder::locale, JsonpDeserializer.stringDeserializer(), "locale");
+        op.add(Builder::timezone, JsonpDeserializer.stringDeserializer(), "timezone");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DateProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DateProcessor.java
index 9c7eb8cab0..a454dfc6e9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DateProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DateProcessor.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,233 +43,229 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.DateProcessor
 
-
 @JsonpDeserializable
 public class DateProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
-
-	private final List<String> formats;
-
-	@Nullable
-	private final String locale;
-
-	@Nullable
-	private final String targetField;
-
-	@Nullable
-	private final String timezone;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DateProcessor(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.formats = ApiTypeHelper.unmodifiableRequired(builder.formats, this, "formats");
-		this.locale = builder.locale;
-		this.targetField = builder.targetField;
-		this.timezone = builder.timezone;
-
-	}
-
-	public static DateProcessor of(Function<Builder, ObjectBuilder<DateProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    private final String field;
+
+    private final List<String> formats;
+
+    @Nullable
+    private final String locale;
+
+    @Nullable
+    private final String targetField;
+
+    @Nullable
+    private final String timezone;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DateProcessor(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.formats = ApiTypeHelper.unmodifiableRequired(builder.formats, this, "formats");
+        this.locale = builder.locale;
+        this.targetField = builder.targetField;
+        this.timezone = builder.timezone;
+
+    }
+
+    public static DateProcessor of(Function<Builder, ObjectBuilder<DateProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Date;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required - API name: {@code formats}
-	 */
-	public final List<String> formats() {
-		return this.formats;
-	}
-
-	/**
-	 * API name: {@code locale}
-	 */
-	@Nullable
-	public final String locale() {
-		return this.locale;
-	}
-
-	/**
-	 * API name: {@code target_field}
-	 */
-	@Nullable
-	public final String targetField() {
-		return this.targetField;
-	}
-
-	/**
-	 * API name: {@code timezone}
-	 */
-	@Nullable
-	public final String timezone() {
-		return this.timezone;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (ApiTypeHelper.isDefined(this.formats)) {
-			generator.writeKey("formats");
-			generator.writeStartArray();
-			for (String item0 : this.formats) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.locale != null) {
-			generator.writeKey("locale");
-			generator.write(this.locale);
-
-		}
-		if (this.targetField != null) {
-			generator.writeKey("target_field");
-			generator.write(this.targetField);
-
-		}
-		if (this.timezone != null) {
-			generator.writeKey("timezone");
-			generator.write(this.timezone);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DateProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<DateProcessor> {
-		private String field;
-
-		private List<String> formats;
-
-		@Nullable
-		private String locale;
-
-		@Nullable
-		private String targetField;
-
-		@Nullable
-		private String timezone;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code formats}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>formats</code>.
-		 */
-		public final Builder formats(List<String> list) {
-			this.formats = _listAddAll(this.formats, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code formats}
-		 * <p>
-		 * Adds one or more values to <code>formats</code>.
-		 */
-		public final Builder formats(String value, String... values) {
-			this.formats = _listAdd(this.formats, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code locale}
-		 */
-		public final Builder locale(@Nullable String value) {
-			this.locale = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code target_field}
-		 */
-		public final Builder targetField(@Nullable String value) {
-			this.targetField = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code timezone}
-		 */
-		public final Builder timezone(@Nullable String value) {
-			this.timezone = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DateProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DateProcessor build() {
-			_checkSingleUse();
-
-			return new DateProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DateProcessor}
-	 */
-	public static final JsonpDeserializer<DateProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			DateProcessor::setupDateProcessorDeserializer);
-
-	protected static void setupDateProcessorDeserializer(ObjectDeserializer<DateProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::formats, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"formats");
-		op.add(Builder::locale, JsonpDeserializer.stringDeserializer(), "locale");
-		op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
-		op.add(Builder::timezone, JsonpDeserializer.stringDeserializer(), "timezone");
-
-	}
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Date;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required - API name: {@code formats}
+     */
+    public final List<String> formats() {
+        return this.formats;
+    }
+
+    /**
+     * API name: {@code locale}
+     */
+    @Nullable
+    public final String locale() {
+        return this.locale;
+    }
+
+    /**
+     * API name: {@code target_field}
+     */
+    @Nullable
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    /**
+     * API name: {@code timezone}
+     */
+    @Nullable
+    public final String timezone() {
+        return this.timezone;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (ApiTypeHelper.isDefined(this.formats)) {
+            generator.writeKey("formats");
+            generator.writeStartArray();
+            for (String item0 : this.formats) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.locale != null) {
+            generator.writeKey("locale");
+            generator.write(this.locale);
+
+        }
+        if (this.targetField != null) {
+            generator.writeKey("target_field");
+            generator.write(this.targetField);
+
+        }
+        if (this.timezone != null) {
+            generator.writeKey("timezone");
+            generator.write(this.timezone);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DateProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<DateProcessor> {
+        private String field;
+
+        private List<String> formats;
+
+        @Nullable
+        private String locale;
+
+        @Nullable
+        private String targetField;
+
+        @Nullable
+        private String timezone;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code formats}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>formats</code>.
+         */
+        public final Builder formats(List<String> list) {
+            this.formats = _listAddAll(this.formats, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code formats}
+         * <p>
+         * Adds one or more values to <code>formats</code>.
+         */
+        public final Builder formats(String value, String... values) {
+            this.formats = _listAdd(this.formats, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code locale}
+         */
+        public final Builder locale(@Nullable String value) {
+            this.locale = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code target_field}
+         */
+        public final Builder targetField(@Nullable String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code timezone}
+         */
+        public final Builder timezone(@Nullable String value) {
+            this.timezone = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DateProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DateProcessor build() {
+            _checkSingleUse();
+
+            return new DateProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DateProcessor}
+     */
+    public static final JsonpDeserializer<DateProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DateProcessor::setupDateProcessorDeserializer
+    );
+
+    protected static void setupDateProcessorDeserializer(ObjectDeserializer<DateProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::formats, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "formats");
+        op.add(Builder::locale, JsonpDeserializer.stringDeserializer(), "locale");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+        op.add(Builder::timezone, JsonpDeserializer.stringDeserializer(), "timezone");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DeletePipelineRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DeletePipelineRequest.java
index 1b52b30ec7..5ce8b0ce77 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DeletePipelineRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DeletePipelineRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,233 +45,232 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: ingest.delete_pipeline.Request
 
 /**
  * Deletes a pipeline.
- * 
+ *
  */
 
 public class DeletePipelineRequest extends RequestBase {
-	private final String id;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DeletePipelineRequest(Builder builder) {
-
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.timeout = builder.timeout;
-
-	}
-
-	public static DeletePipelineRequest of(Function<Builder, ObjectBuilder<DeletePipelineRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Pipeline ID
-	 * <p>
-	 * API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to master node
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to cluster-manager node
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeletePipelineRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeletePipelineRequest> {
-		private String id;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * Required - Pipeline ID
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link DeletePipelineRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeletePipelineRequest build() {
-			_checkSingleUse();
-
-			return new DeletePipelineRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code ingest.delete_pipeline}".
-	 */
-	public static final Endpoint<DeletePipelineRequest, DeletePipelineResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "DELETE";
-
-			},
-
-			// Request path
-			request -> {
-				final int _id = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _id;
-
-				if (propsSet == (_id)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_ingest");
-					buf.append("/pipeline");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.id, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, DeletePipelineResponse._DESERIALIZER);
+    private final String id;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DeletePipelineRequest(Builder builder) {
+
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.timeout = builder.timeout;
+
+    }
+
+    public static DeletePipelineRequest of(Function<Builder, ObjectBuilder<DeletePipelineRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Pipeline ID
+     * <p>
+     * API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Explicit operation timeout for connection to master node
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Explicit operation timeout for connection to cluster-manager node
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeletePipelineRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeletePipelineRequest> {
+        private String id;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * Required - Pipeline ID
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link DeletePipelineRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeletePipelineRequest build() {
+            _checkSingleUse();
+
+            return new DeletePipelineRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code ingest.delete_pipeline}".
+     */
+    public static final Endpoint<DeletePipelineRequest, DeletePipelineResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "DELETE";
+
+        },
+
+        // Request path
+        request -> {
+            final int _id = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _id;
+
+            if (propsSet == (_id)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_ingest");
+                buf.append("/pipeline");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.id, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        DeletePipelineResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DeletePipelineResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DeletePipelineResponse.java
index 92d70368c1..64d67573e5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DeletePipelineResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DeletePipelineResponse.java
@@ -32,68 +32,65 @@
 
 package org.opensearch.client.opensearch.ingest;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
-import org.opensearch.client.json.JsonpDeserializable;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: ingest.delete_pipeline.Response
 
 public class DeletePipelineResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private DeletePipelineResponse(Builder builder) {
-		super(builder);
+    private DeletePipelineResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static DeletePipelineResponse of(Function<Builder, ObjectBuilder<DeletePipelineResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static DeletePipelineResponse of(Function<Builder, ObjectBuilder<DeletePipelineResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link DeletePipelineResponse}.
-	 */
+    /**
+     * Builder for {@link DeletePipelineResponse}.
+     */
 
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DeletePipelineResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<DeletePipelineResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link DeletePipelineResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeletePipelineResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link DeletePipelineResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeletePipelineResponse build() {
+            _checkSingleUse();
 
-			return new DeletePipelineResponse(this);
-		}
-	}
+            return new DeletePipelineResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link DeletePipelineResponse}
-	 */
-	public static final JsonpDeserializer<DeletePipelineResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DeletePipelineResponse::setupDeletePipelineResponseDeserializer);
+    /**
+     * Json deserializer for {@link DeletePipelineResponse}
+     */
+    public static final JsonpDeserializer<DeletePipelineResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DeletePipelineResponse::setupDeletePipelineResponseDeserializer
+    );
 
-	protected static void setupDeletePipelineResponseDeserializer(
-			ObjectDeserializer<DeletePipelineResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+    protected static void setupDeletePipelineResponseDeserializer(ObjectDeserializer<DeletePipelineResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DissectProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DissectProcessor.java
index d5114dd763..8d1b5e9dbe 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DissectProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DissectProcessor.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,173 +41,170 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: ingest._types.DissectProcessor
 
-
 @JsonpDeserializable
 public class DissectProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String appendSeparator;
+    private final String appendSeparator;
 
-	private final String field;
+    private final String field;
 
-	private final boolean ignoreMissing;
+    private final boolean ignoreMissing;
 
-	private final String pattern;
+    private final String pattern;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private DissectProcessor(Builder builder) {
-		super(builder);
+    private DissectProcessor(Builder builder) {
+        super(builder);
 
-		this.appendSeparator = ApiTypeHelper.requireNonNull(builder.appendSeparator, this, "appendSeparator");
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.ignoreMissing = ApiTypeHelper.requireNonNull(builder.ignoreMissing, this, "ignoreMissing");
-		this.pattern = ApiTypeHelper.requireNonNull(builder.pattern, this, "pattern");
+        this.appendSeparator = ApiTypeHelper.requireNonNull(builder.appendSeparator, this, "appendSeparator");
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.ignoreMissing = ApiTypeHelper.requireNonNull(builder.ignoreMissing, this, "ignoreMissing");
+        this.pattern = ApiTypeHelper.requireNonNull(builder.pattern, this, "pattern");
 
-	}
-
-	public static DissectProcessor of(Function<Builder, ObjectBuilder<DissectProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Dissect;
-	}
-
-	/**
-	 * Required - API name: {@code append_separator}
-	 */
-	public final String appendSeparator() {
-		return this.appendSeparator;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required - API name: {@code ignore_missing}
-	 */
-	public final boolean ignoreMissing() {
-		return this.ignoreMissing;
-	}
-
-	/**
-	 * Required - API name: {@code pattern}
-	 */
-	public final String pattern() {
-		return this.pattern;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("append_separator");
-		generator.write(this.appendSeparator);
-
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		generator.writeKey("ignore_missing");
-		generator.write(this.ignoreMissing);
-
-		generator.writeKey("pattern");
-		generator.write(this.pattern);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DissectProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DissectProcessor> {
-		private String appendSeparator;
-
-		private String field;
-
-		private Boolean ignoreMissing;
-
-		private String pattern;
-
-		/**
-		 * Required - API name: {@code append_separator}
-		 */
-		public final Builder appendSeparator(String value) {
-			this.appendSeparator = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code ignore_missing}
-		 */
-		public final Builder ignoreMissing(boolean value) {
-			this.ignoreMissing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code pattern}
-		 */
-		public final Builder pattern(String value) {
-			this.pattern = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DissectProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DissectProcessor build() {
-			_checkSingleUse();
-
-			return new DissectProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DissectProcessor}
-	 */
-	public static final JsonpDeserializer<DissectProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			DissectProcessor::setupDissectProcessorDeserializer);
-
-	protected static void setupDissectProcessorDeserializer(ObjectDeserializer<DissectProcessor.Builder> op) {
-		ProcessorBase.setupProcessorBaseDeserializer(op);
-		op.add(Builder::appendSeparator, JsonpDeserializer.stringDeserializer(), "append_separator");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
-		op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
-
-	}
+    }
+
+    public static DissectProcessor of(Function<Builder, ObjectBuilder<DissectProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Dissect;
+    }
+
+    /**
+     * Required - API name: {@code append_separator}
+     */
+    public final String appendSeparator() {
+        return this.appendSeparator;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required - API name: {@code ignore_missing}
+     */
+    public final boolean ignoreMissing() {
+        return this.ignoreMissing;
+    }
+
+    /**
+     * Required - API name: {@code pattern}
+     */
+    public final String pattern() {
+        return this.pattern;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("append_separator");
+        generator.write(this.appendSeparator);
+
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        generator.writeKey("ignore_missing");
+        generator.write(this.ignoreMissing);
+
+        generator.writeKey("pattern");
+        generator.write(this.pattern);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DissectProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<DissectProcessor> {
+        private String appendSeparator;
+
+        private String field;
+
+        private Boolean ignoreMissing;
+
+        private String pattern;
+
+        /**
+         * Required - API name: {@code append_separator}
+         */
+        public final Builder appendSeparator(String value) {
+            this.appendSeparator = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code ignore_missing}
+         */
+        public final Builder ignoreMissing(boolean value) {
+            this.ignoreMissing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code pattern}
+         */
+        public final Builder pattern(String value) {
+            this.pattern = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DissectProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DissectProcessor build() {
+            _checkSingleUse();
+
+            return new DissectProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DissectProcessor}
+     */
+    public static final JsonpDeserializer<DissectProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DissectProcessor::setupDissectProcessorDeserializer
+    );
+
+    protected static void setupDissectProcessorDeserializer(ObjectDeserializer<DissectProcessor.Builder> op) {
+        ProcessorBase.setupProcessorBaseDeserializer(op);
+        op.add(Builder::appendSeparator, JsonpDeserializer.stringDeserializer(), "append_separator");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
+        op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DotExpanderProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DotExpanderProcessor.java
index fa7c55dd67..735b18479a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DotExpanderProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DotExpanderProcessor.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,132 +42,128 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.DotExpanderProcessor
 
-
 @JsonpDeserializable
 public class DotExpanderProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
-
-	@Nullable
-	private final String path;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DotExpanderProcessor(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.path = builder.path;
-
-	}
-
-	public static DotExpanderProcessor of(Function<Builder, ObjectBuilder<DotExpanderProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.DotExpander;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code path}
-	 */
-	@Nullable
-	public final String path() {
-		return this.path;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.path != null) {
-			generator.writeKey("path");
-			generator.write(this.path);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DotExpanderProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DotExpanderProcessor> {
-		private String field;
-
-		@Nullable
-		private String path;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code path}
-		 */
-		public final Builder path(@Nullable String value) {
-			this.path = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DotExpanderProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DotExpanderProcessor build() {
-			_checkSingleUse();
-
-			return new DotExpanderProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DotExpanderProcessor}
-	 */
-	public static final JsonpDeserializer<DotExpanderProcessor> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DotExpanderProcessor::setupDotExpanderProcessorDeserializer);
-
-	protected static void setupDotExpanderProcessorDeserializer(ObjectDeserializer<DotExpanderProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
-
-	}
+    private final String field;
+
+    @Nullable
+    private final String path;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DotExpanderProcessor(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.path = builder.path;
+
+    }
+
+    public static DotExpanderProcessor of(Function<Builder, ObjectBuilder<DotExpanderProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.DotExpander;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code path}
+     */
+    @Nullable
+    public final String path() {
+        return this.path;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.path != null) {
+            generator.writeKey("path");
+            generator.write(this.path);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DotExpanderProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<DotExpanderProcessor> {
+        private String field;
+
+        @Nullable
+        private String path;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code path}
+         */
+        public final Builder path(@Nullable String value) {
+            this.path = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DotExpanderProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DotExpanderProcessor build() {
+            _checkSingleUse();
+
+            return new DotExpanderProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DotExpanderProcessor}
+     */
+    public static final JsonpDeserializer<DotExpanderProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DotExpanderProcessor::setupDotExpanderProcessorDeserializer
+    );
+
+    protected static void setupDotExpanderProcessorDeserializer(ObjectDeserializer<DotExpanderProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DropProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DropProcessor.java
index 6de56baeec..456123e7ed 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DropProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/DropProcessor.java
@@ -32,74 +32,74 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import java.util.function.Function;
 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.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: ingest._types.DropProcessor
 
-
 @JsonpDeserializable
 public class DropProcessor extends ProcessorBase implements ProcessorVariant {
-	// ---------------------------------------------------------------------------------------------
-
-	private DropProcessor(Builder builder) {
-		super(builder);
-
-	}
-
-	public static DropProcessor of(Function<Builder, ObjectBuilder<DropProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Drop;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DropProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<DropProcessor> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DropProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DropProcessor build() {
-			_checkSingleUse();
-
-			return new DropProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DropProcessor}
-	 */
-	public static final JsonpDeserializer<DropProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			DropProcessor::setupDropProcessorDeserializer);
-
-	protected static void setupDropProcessorDeserializer(ObjectDeserializer<DropProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private DropProcessor(Builder builder) {
+        super(builder);
+
+    }
+
+    public static DropProcessor of(Function<Builder, ObjectBuilder<DropProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Drop;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DropProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<DropProcessor> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DropProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DropProcessor build() {
+            _checkSingleUse();
+
+            return new DropProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DropProcessor}
+     */
+    public static final JsonpDeserializer<DropProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DropProcessor::setupDropProcessorDeserializer
+    );
+
+    protected static void setupDropProcessorDeserializer(ObjectDeserializer<DropProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/FailProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/FailProcessor.java
index f6a39c9662..57714792b4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/FailProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/FailProcessor.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,99 +41,98 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: ingest._types.FailProcessor
 
-
 @JsonpDeserializable
 public class FailProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String message;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FailProcessor(Builder builder) {
-		super(builder);
-
-		this.message = ApiTypeHelper.requireNonNull(builder.message, this, "message");
-
-	}
-
-	public static FailProcessor of(Function<Builder, ObjectBuilder<FailProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Fail;
-	}
-
-	/**
-	 * Required - API name: {@code message}
-	 */
-	public final String message() {
-		return this.message;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("message");
-		generator.write(this.message);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FailProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<FailProcessor> {
-		private String message;
-
-		/**
-		 * Required - API name: {@code message}
-		 */
-		public final Builder message(String value) {
-			this.message = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link FailProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FailProcessor build() {
-			_checkSingleUse();
-
-			return new FailProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FailProcessor}
-	 */
-	public static final JsonpDeserializer<FailProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FailProcessor::setupFailProcessorDeserializer);
-
-	protected static void setupFailProcessorDeserializer(ObjectDeserializer<FailProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::message, JsonpDeserializer.stringDeserializer(), "message");
-
-	}
+    private final String message;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FailProcessor(Builder builder) {
+        super(builder);
+
+        this.message = ApiTypeHelper.requireNonNull(builder.message, this, "message");
+
+    }
+
+    public static FailProcessor of(Function<Builder, ObjectBuilder<FailProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Fail;
+    }
+
+    /**
+     * Required - API name: {@code message}
+     */
+    public final String message() {
+        return this.message;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("message");
+        generator.write(this.message);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FailProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<FailProcessor> {
+        private String message;
+
+        /**
+         * Required - API name: {@code message}
+         */
+        public final Builder message(String value) {
+            this.message = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link FailProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FailProcessor build() {
+            _checkSingleUse();
+
+            return new FailProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FailProcessor}
+     */
+    public static final JsonpDeserializer<FailProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FailProcessor::setupFailProcessorDeserializer
+    );
+
+    protected static void setupFailProcessorDeserializer(ObjectDeserializer<FailProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::message, JsonpDeserializer.stringDeserializer(), "message");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ForeachProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ForeachProcessor.java
index ef06c8f302..0ca379f39e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ForeachProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ForeachProcessor.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,162 +42,158 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.ForeachProcessor
 
-
 @JsonpDeserializable
 public class ForeachProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
-
-	@Nullable
-	private final Boolean ignoreMissing;
-
-	private final Processor processor;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ForeachProcessor(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.ignoreMissing = builder.ignoreMissing;
-		this.processor = ApiTypeHelper.requireNonNull(builder.processor, this, "processor");
-
-	}
-
-	public static ForeachProcessor of(Function<Builder, ObjectBuilder<ForeachProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Foreach;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code ignore_missing}
-	 */
-	@Nullable
-	public final Boolean ignoreMissing() {
-		return this.ignoreMissing;
-	}
-
-	/**
-	 * Required - API name: {@code processor}
-	 */
-	public final Processor processor() {
-		return this.processor;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.ignoreMissing != null) {
-			generator.writeKey("ignore_missing");
-			generator.write(this.ignoreMissing);
-
-		}
-		generator.writeKey("processor");
-		this.processor.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ForeachProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ForeachProcessor> {
-		private String field;
-
-		@Nullable
-		private Boolean ignoreMissing;
-
-		private Processor processor;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_missing}
-		 */
-		public final Builder ignoreMissing(@Nullable Boolean value) {
-			this.ignoreMissing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code processor}
-		 */
-		public final Builder processor(Processor value) {
-			this.processor = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code processor}
-		 */
-		public final Builder processor(Function<Processor.Builder, ObjectBuilder<Processor>> fn) {
-			return this.processor(fn.apply(new Processor.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ForeachProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ForeachProcessor build() {
-			_checkSingleUse();
-
-			return new ForeachProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ForeachProcessor}
-	 */
-	public static final JsonpDeserializer<ForeachProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ForeachProcessor::setupForeachProcessorDeserializer);
-
-	protected static void setupForeachProcessorDeserializer(ObjectDeserializer<ForeachProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
-		op.add(Builder::processor, Processor._DESERIALIZER, "processor");
-
-	}
+    private final String field;
+
+    @Nullable
+    private final Boolean ignoreMissing;
+
+    private final Processor processor;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ForeachProcessor(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.ignoreMissing = builder.ignoreMissing;
+        this.processor = ApiTypeHelper.requireNonNull(builder.processor, this, "processor");
+
+    }
+
+    public static ForeachProcessor of(Function<Builder, ObjectBuilder<ForeachProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Foreach;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code ignore_missing}
+     */
+    @Nullable
+    public final Boolean ignoreMissing() {
+        return this.ignoreMissing;
+    }
+
+    /**
+     * Required - API name: {@code processor}
+     */
+    public final Processor processor() {
+        return this.processor;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.ignoreMissing != null) {
+            generator.writeKey("ignore_missing");
+            generator.write(this.ignoreMissing);
+
+        }
+        generator.writeKey("processor");
+        this.processor.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ForeachProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<ForeachProcessor> {
+        private String field;
+
+        @Nullable
+        private Boolean ignoreMissing;
+
+        private Processor processor;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_missing}
+         */
+        public final Builder ignoreMissing(@Nullable Boolean value) {
+            this.ignoreMissing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code processor}
+         */
+        public final Builder processor(Processor value) {
+            this.processor = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code processor}
+         */
+        public final Builder processor(Function<Processor.Builder, ObjectBuilder<Processor>> fn) {
+            return this.processor(fn.apply(new Processor.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ForeachProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ForeachProcessor build() {
+            _checkSingleUse();
+
+            return new ForeachProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ForeachProcessor}
+     */
+    public static final JsonpDeserializer<ForeachProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ForeachProcessor::setupForeachProcessorDeserializer
+    );
+
+    protected static void setupForeachProcessorDeserializer(ObjectDeserializer<ForeachProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
+        op.add(Builder::processor, Processor._DESERIALIZER, "processor");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GeoIpProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GeoIpProcessor.java
index 647f4be21c..67493f36ff 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GeoIpProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GeoIpProcessor.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,242 +42,237 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: ingest._types.GeoIpProcessor
 
-
 @JsonpDeserializable
 public class GeoIpProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String databaseFile;
-
-	private final String field;
-
-	private final boolean firstOnly;
-
-	private final boolean ignoreMissing;
-
-	private final List<String> properties;
+    private final String databaseFile;
+
+    private final String field;
+
+    private final boolean firstOnly;
+
+    private final boolean ignoreMissing;
+
+    private final List<String> properties;
 
-	private final String targetField;
+    private final String targetField;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private GeoIpProcessor(Builder builder) {
-		super(builder);
+    private GeoIpProcessor(Builder builder) {
+        super(builder);
 
-		this.databaseFile = ApiTypeHelper.requireNonNull(builder.databaseFile, this, "databaseFile");
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.firstOnly = ApiTypeHelper.requireNonNull(builder.firstOnly, this, "firstOnly");
-		this.ignoreMissing = ApiTypeHelper.requireNonNull(builder.ignoreMissing, this, "ignoreMissing");
-		this.properties = ApiTypeHelper.unmodifiableRequired(builder.properties, this, "properties");
-		this.targetField = ApiTypeHelper.requireNonNull(builder.targetField, this, "targetField");
+        this.databaseFile = ApiTypeHelper.requireNonNull(builder.databaseFile, this, "databaseFile");
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.firstOnly = ApiTypeHelper.requireNonNull(builder.firstOnly, this, "firstOnly");
+        this.ignoreMissing = ApiTypeHelper.requireNonNull(builder.ignoreMissing, this, "ignoreMissing");
+        this.properties = ApiTypeHelper.unmodifiableRequired(builder.properties, this, "properties");
+        this.targetField = ApiTypeHelper.requireNonNull(builder.targetField, this, "targetField");
 
-	}
+    }
 
-	public static GeoIpProcessor of(Function<Builder, ObjectBuilder<GeoIpProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static GeoIpProcessor of(Function<Builder, ObjectBuilder<GeoIpProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Geoip;
-	}
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Geoip;
+    }
 
-	/**
-	 * Required - API name: {@code database_file}
-	 */
-	public final String databaseFile() {
-		return this.databaseFile;
-	}
+    /**
+     * Required - API name: {@code database_file}
+     */
+    public final String databaseFile() {
+        return this.databaseFile;
+    }
 
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required - API name: {@code first_only}
-	 */
-	public final boolean firstOnly() {
-		return this.firstOnly;
-	}
-
-	/**
-	 * Required - API name: {@code ignore_missing}
-	 */
-	public final boolean ignoreMissing() {
-		return this.ignoreMissing;
-	}
-
-	/**
-	 * Required - API name: {@code properties}
-	 */
-	public final List<String> properties() {
-		return this.properties;
-	}
-
-	/**
-	 * Required - API name: {@code target_field}
-	 */
-	public final String targetField() {
-		return this.targetField;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("database_file");
-		generator.write(this.databaseFile);
-
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		generator.writeKey("first_only");
-		generator.write(this.firstOnly);
-
-		generator.writeKey("ignore_missing");
-		generator.write(this.ignoreMissing);
-
-		if (ApiTypeHelper.isDefined(this.properties)) {
-			generator.writeKey("properties");
-			generator.writeStartArray();
-			for (String item0 : this.properties) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("target_field");
-		generator.write(this.targetField);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoIpProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<GeoIpProcessor> {
-		private String databaseFile;
-
-		private String field;
-
-		private Boolean firstOnly;
-
-		private Boolean ignoreMissing;
-
-		private List<String> properties;
-
-		private String targetField;
-
-		/**
-		 * Required - API name: {@code database_file}
-		 */
-		public final Builder databaseFile(String value) {
-			this.databaseFile = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code first_only}
-		 */
-		public final Builder firstOnly(boolean value) {
-			this.firstOnly = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code ignore_missing}
-		 */
-		public final Builder ignoreMissing(boolean value) {
-			this.ignoreMissing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code properties}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>properties</code>.
-		 */
-		public final Builder properties(List<String> list) {
-			this.properties = _listAddAll(this.properties, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code properties}
-		 * <p>
-		 * Adds one or more values to <code>properties</code>.
-		 */
-		public final Builder properties(String value, String... values) {
-			this.properties = _listAdd(this.properties, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code target_field}
-		 */
-		public final Builder targetField(String value) {
-			this.targetField = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoIpProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoIpProcessor build() {
-			_checkSingleUse();
-
-			return new GeoIpProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoIpProcessor}
-	 */
-	public static final JsonpDeserializer<GeoIpProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GeoIpProcessor::setupGeoIpProcessorDeserializer);
-
-	protected static void setupGeoIpProcessorDeserializer(ObjectDeserializer<GeoIpProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::databaseFile, JsonpDeserializer.stringDeserializer(), "database_file");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::firstOnly, JsonpDeserializer.booleanDeserializer(), "first_only");
-		op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
-		op.add(Builder::properties, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"properties");
-		op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
-
-	}
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required - API name: {@code first_only}
+     */
+    public final boolean firstOnly() {
+        return this.firstOnly;
+    }
+
+    /**
+     * Required - API name: {@code ignore_missing}
+     */
+    public final boolean ignoreMissing() {
+        return this.ignoreMissing;
+    }
+
+    /**
+     * Required - API name: {@code properties}
+     */
+    public final List<String> properties() {
+        return this.properties;
+    }
+
+    /**
+     * Required - API name: {@code target_field}
+     */
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("database_file");
+        generator.write(this.databaseFile);
+
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        generator.writeKey("first_only");
+        generator.write(this.firstOnly);
+
+        generator.writeKey("ignore_missing");
+        generator.write(this.ignoreMissing);
+
+        if (ApiTypeHelper.isDefined(this.properties)) {
+            generator.writeKey("properties");
+            generator.writeStartArray();
+            for (String item0 : this.properties) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("target_field");
+        generator.write(this.targetField);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoIpProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<GeoIpProcessor> {
+        private String databaseFile;
+
+        private String field;
+
+        private Boolean firstOnly;
+
+        private Boolean ignoreMissing;
+
+        private List<String> properties;
+
+        private String targetField;
+
+        /**
+         * Required - API name: {@code database_file}
+         */
+        public final Builder databaseFile(String value) {
+            this.databaseFile = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code first_only}
+         */
+        public final Builder firstOnly(boolean value) {
+            this.firstOnly = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code ignore_missing}
+         */
+        public final Builder ignoreMissing(boolean value) {
+            this.ignoreMissing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code properties}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>properties</code>.
+         */
+        public final Builder properties(List<String> list) {
+            this.properties = _listAddAll(this.properties, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code properties}
+         * <p>
+         * Adds one or more values to <code>properties</code>.
+         */
+        public final Builder properties(String value, String... values) {
+            this.properties = _listAdd(this.properties, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code target_field}
+         */
+        public final Builder targetField(String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoIpProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoIpProcessor build() {
+            _checkSingleUse();
+
+            return new GeoIpProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoIpProcessor}
+     */
+    public static final JsonpDeserializer<GeoIpProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoIpProcessor::setupGeoIpProcessorDeserializer
+    );
+
+    protected static void setupGeoIpProcessorDeserializer(ObjectDeserializer<GeoIpProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::databaseFile, JsonpDeserializer.stringDeserializer(), "database_file");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::firstOnly, JsonpDeserializer.booleanDeserializer(), "first_only");
+        op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
+        op.add(Builder::properties, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "properties");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GeoIpStatsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GeoIpStatsRequest.java
index 522802d72e..6ee7add9ef 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GeoIpStatsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GeoIpStatsRequest.java
@@ -32,51 +32,53 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import java.util.Collections;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 
-import java.util.Collections;
-
 // typedef: ingest.geo_ip_stats.Request
 
 /**
  * Returns statistical information about geoip databases
- * 
+ *
  */
 
 public class GeoIpStatsRequest extends RequestBase {
-	public GeoIpStatsRequest() {
-	}
+    public GeoIpStatsRequest() {}
 
-	/**
-	 * Singleton instance for {@link GeoIpStatsRequest}.
-	 */
-	public static final GeoIpStatsRequest _INSTANCE = new GeoIpStatsRequest();
+    /**
+     * Singleton instance for {@link GeoIpStatsRequest}.
+     */
+    public static final GeoIpStatsRequest _INSTANCE = new GeoIpStatsRequest();
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Endpoint "{@code ingest.geo_ip_stats}".
-	 */
-	public static final Endpoint<GeoIpStatsRequest, GeoIpStatsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+    /**
+     * Endpoint "{@code ingest.geo_ip_stats}".
+     */
+    public static final Endpoint<GeoIpStatsRequest, GeoIpStatsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
 
-			// Request method
-			request -> {
-				return "GET";
+        // Request method
+        request -> {
+            return "GET";
 
-			},
+        },
 
-			// Request path
-			request -> {
-				return "/_ingest/geoip/stats";
+        // Request path
+        request -> {
+            return "/_ingest/geoip/stats";
 
-			},
+        },
 
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
 
-			}, SimpleEndpoint.emptyMap(), false, GeoIpStatsResponse._DESERIALIZER);
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GeoIpStatsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GeoIpStatsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GeoIpStatsResponse.java
index fe164a93c8..175cc1340b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GeoIpStatsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GeoIpStatsResponse.java
@@ -32,181 +32,181 @@
 
 package org.opensearch.client.opensearch.ingest;
 
-import org.opensearch.client.opensearch.ingest.geo_ip_stats.GeoIpDownloadStatistics;
-import org.opensearch.client.opensearch.ingest.geo_ip_stats.GeoIpNodeDatabases;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.ingest.geo_ip_stats.GeoIpDownloadStatistics;
+import org.opensearch.client.opensearch.ingest.geo_ip_stats.GeoIpNodeDatabases;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: ingest.geo_ip_stats.Response
 
 @JsonpDeserializable
 public class GeoIpStatsResponse implements JsonpSerializable {
-	private final GeoIpDownloadStatistics stats;
-
-	private final Map<String, GeoIpNodeDatabases> nodes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoIpStatsResponse(Builder builder) {
-
-		this.stats = ApiTypeHelper.requireNonNull(builder.stats, this, "stats");
-		this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
-
-	}
-
-	public static GeoIpStatsResponse of(Function<Builder, ObjectBuilder<GeoIpStatsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Download statistics for all GeoIP2 databases.
-	 * <p>
-	 * API name: {@code stats}
-	 */
-	public final GeoIpDownloadStatistics stats() {
-		return this.stats;
-	}
-
-	/**
-	 * Required - Downloaded GeoIP2 databases for each node.
-	 * <p>
-	 * API name: {@code nodes}
-	 */
-	public final Map<String, GeoIpNodeDatabases> nodes() {
-		return this.nodes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("stats");
-		this.stats.serialize(generator, mapper);
-
-		if (ApiTypeHelper.isDefined(this.nodes)) {
-			generator.writeKey("nodes");
-			generator.writeStartObject();
-			for (Map.Entry<String, GeoIpNodeDatabases> item0 : this.nodes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoIpStatsResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoIpStatsResponse> {
-		private GeoIpDownloadStatistics stats;
-
-		private Map<String, GeoIpNodeDatabases> nodes;
-
-		/**
-		 * Required - Download statistics for all GeoIP2 databases.
-		 * <p>
-		 * API name: {@code stats}
-		 */
-		public final Builder stats(GeoIpDownloadStatistics value) {
-			this.stats = value;
-			return this;
-		}
-
-		/**
-		 * Required - Download statistics for all GeoIP2 databases.
-		 * <p>
-		 * API name: {@code stats}
-		 */
-		public final Builder stats(
-				Function<GeoIpDownloadStatistics.Builder, ObjectBuilder<GeoIpDownloadStatistics>> fn) {
-			return this.stats(fn.apply(new GeoIpDownloadStatistics.Builder()).build());
-		}
-
-		/**
-		 * Required - Downloaded GeoIP2 databases for each node.
-		 * <p>
-		 * API name: {@code nodes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>nodes</code>.
-		 */
-		public final Builder nodes(Map<String, GeoIpNodeDatabases> map) {
-			this.nodes = _mapPutAll(this.nodes, map);
-			return this;
-		}
-
-		/**
-		 * Required - Downloaded GeoIP2 databases for each node.
-		 * <p>
-		 * API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code>.
-		 */
-		public final Builder nodes(String key, GeoIpNodeDatabases value) {
-			this.nodes = _mapPut(this.nodes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - Downloaded GeoIP2 databases for each node.
-		 * <p>
-		 * API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code> using a builder lambda.
-		 */
-		public final Builder nodes(String key,
-				Function<GeoIpNodeDatabases.Builder, ObjectBuilder<GeoIpNodeDatabases>> fn) {
-			return nodes(key, fn.apply(new GeoIpNodeDatabases.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link GeoIpStatsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoIpStatsResponse build() {
-			_checkSingleUse();
-
-			return new GeoIpStatsResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoIpStatsResponse}
-	 */
-	public static final JsonpDeserializer<GeoIpStatsResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GeoIpStatsResponse::setupGeoIpStatsResponseDeserializer);
-
-	protected static void setupGeoIpStatsResponseDeserializer(ObjectDeserializer<GeoIpStatsResponse.Builder> op) {
-
-		op.add(Builder::stats, GeoIpDownloadStatistics._DESERIALIZER, "stats");
-		op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(GeoIpNodeDatabases._DESERIALIZER), "nodes");
-
-	}
+    private final GeoIpDownloadStatistics stats;
+
+    private final Map<String, GeoIpNodeDatabases> nodes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoIpStatsResponse(Builder builder) {
+
+        this.stats = ApiTypeHelper.requireNonNull(builder.stats, this, "stats");
+        this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
+
+    }
+
+    public static GeoIpStatsResponse of(Function<Builder, ObjectBuilder<GeoIpStatsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Download statistics for all GeoIP2 databases.
+     * <p>
+     * API name: {@code stats}
+     */
+    public final GeoIpDownloadStatistics stats() {
+        return this.stats;
+    }
+
+    /**
+     * Required - Downloaded GeoIP2 databases for each node.
+     * <p>
+     * API name: {@code nodes}
+     */
+    public final Map<String, GeoIpNodeDatabases> nodes() {
+        return this.nodes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("stats");
+        this.stats.serialize(generator, mapper);
+
+        if (ApiTypeHelper.isDefined(this.nodes)) {
+            generator.writeKey("nodes");
+            generator.writeStartObject();
+            for (Map.Entry<String, GeoIpNodeDatabases> item0 : this.nodes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoIpStatsResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoIpStatsResponse> {
+        private GeoIpDownloadStatistics stats;
+
+        private Map<String, GeoIpNodeDatabases> nodes;
+
+        /**
+         * Required - Download statistics for all GeoIP2 databases.
+         * <p>
+         * API name: {@code stats}
+         */
+        public final Builder stats(GeoIpDownloadStatistics value) {
+            this.stats = value;
+            return this;
+        }
+
+        /**
+         * Required - Download statistics for all GeoIP2 databases.
+         * <p>
+         * API name: {@code stats}
+         */
+        public final Builder stats(Function<GeoIpDownloadStatistics.Builder, ObjectBuilder<GeoIpDownloadStatistics>> fn) {
+            return this.stats(fn.apply(new GeoIpDownloadStatistics.Builder()).build());
+        }
+
+        /**
+         * Required - Downloaded GeoIP2 databases for each node.
+         * <p>
+         * API name: {@code nodes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>nodes</code>.
+         */
+        public final Builder nodes(Map<String, GeoIpNodeDatabases> map) {
+            this.nodes = _mapPutAll(this.nodes, map);
+            return this;
+        }
+
+        /**
+         * Required - Downloaded GeoIP2 databases for each node.
+         * <p>
+         * API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code>.
+         */
+        public final Builder nodes(String key, GeoIpNodeDatabases value) {
+            this.nodes = _mapPut(this.nodes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - Downloaded GeoIP2 databases for each node.
+         * <p>
+         * API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code> using a builder lambda.
+         */
+        public final Builder nodes(String key, Function<GeoIpNodeDatabases.Builder, ObjectBuilder<GeoIpNodeDatabases>> fn) {
+            return nodes(key, fn.apply(new GeoIpNodeDatabases.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link GeoIpStatsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoIpStatsResponse build() {
+            _checkSingleUse();
+
+            return new GeoIpStatsResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoIpStatsResponse}
+     */
+    public static final JsonpDeserializer<GeoIpStatsResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoIpStatsResponse::setupGeoIpStatsResponseDeserializer
+    );
+
+    protected static void setupGeoIpStatsResponseDeserializer(ObjectDeserializer<GeoIpStatsResponse.Builder> op) {
+
+        op.add(Builder::stats, GeoIpDownloadStatistics._DESERIALIZER, "stats");
+        op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(GeoIpNodeDatabases._DESERIALIZER), "nodes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GetPipelineRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GetPipelineRequest.java
index 3098568448..3dbbdbfe39 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GetPipelineRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GetPipelineRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -40,234 +44,232 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: ingest.get_pipeline.Request
 
 /**
  * Returns a pipeline.
- * 
+ *
  */
 
 public class GetPipelineRequest extends RequestBase {
-	@Nullable
-	private final String id;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final Boolean summary;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetPipelineRequest(Builder builder) {
-
-		this.id = builder.id;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.summary = builder.summary;
-
-	}
-
-	public static GetPipelineRequest of(Function<Builder, ObjectBuilder<GetPipelineRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Comma separated list of pipeline ids. Wildcards supported
-	 * <p>
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to master node
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to cluster-manager node
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Return pipelines without their definitions (default: false)
-	 * <p>
-	 * API name: {@code summary}
-	 */
-	@Nullable
-	public final Boolean summary() {
-		return this.summary;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetPipelineRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetPipelineRequest> {
-		@Nullable
-		private String id;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Boolean summary;
-
-		/**
-		 * Comma separated list of pipeline ids. Wildcards supported
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Return pipelines without their definitions (default: false)
-		 * <p>
-		 * API name: {@code summary}
-		 */
-		public final Builder summary(@Nullable Boolean value) {
-			this.summary = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetPipelineRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetPipelineRequest build() {
-			_checkSingleUse();
-
-			return new GetPipelineRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code ingest.get_pipeline}".
-	 */
-	public static final Endpoint<GetPipelineRequest, GetPipelineResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _id = 1 << 0;
-
-				int propsSet = 0;
-
-				if (request.id() != null)
-					propsSet |= _id;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_ingest");
-					buf.append("/pipeline");
-					return buf.toString();
-				}
-				if (propsSet == (_id)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_ingest");
-					buf.append("/pipeline");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.id, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.summary != null) {
-					params.put("summary", String.valueOf(request.summary));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, GetPipelineResponse._DESERIALIZER);
+    @Nullable
+    private final String id;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final Boolean summary;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetPipelineRequest(Builder builder) {
+
+        this.id = builder.id;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.summary = builder.summary;
+
+    }
+
+    public static GetPipelineRequest of(Function<Builder, ObjectBuilder<GetPipelineRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Comma separated list of pipeline ids. Wildcards supported
+     * <p>
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Explicit operation timeout for connection to master node
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Explicit operation timeout for connection to cluster-manager node
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Return pipelines without their definitions (default: false)
+     * <p>
+     * API name: {@code summary}
+     */
+    @Nullable
+    public final Boolean summary() {
+        return this.summary;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetPipelineRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetPipelineRequest> {
+        @Nullable
+        private String id;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Boolean summary;
+
+        /**
+         * Comma separated list of pipeline ids. Wildcards supported
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Return pipelines without their definitions (default: false)
+         * <p>
+         * API name: {@code summary}
+         */
+        public final Builder summary(@Nullable Boolean value) {
+            this.summary = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetPipelineRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetPipelineRequest build() {
+            _checkSingleUse();
+
+            return new GetPipelineRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code ingest.get_pipeline}".
+     */
+    public static final Endpoint<GetPipelineRequest, GetPipelineResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _id = 1 << 0;
+
+            int propsSet = 0;
+
+            if (request.id() != null) propsSet |= _id;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_ingest");
+                buf.append("/pipeline");
+                return buf.toString();
+            }
+            if (propsSet == (_id)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_ingest");
+                buf.append("/pipeline");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.id, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.summary != null) {
+                params.put("summary", String.valueOf(request.summary));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetPipelineResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GetPipelineResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GetPipelineResponse.java
index 07a780bc92..5b499b1f33 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GetPipelineResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GetPipelineResponse.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
@@ -39,64 +40,63 @@
 import org.opensearch.client.transport.endpoints.DictionaryResponse;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: ingest.get_pipeline.Response
 
 @JsonpDeserializable
 public class GetPipelineResponse extends DictionaryResponse<String, Pipeline> {
-	// ---------------------------------------------------------------------------------------------
-
-	private GetPipelineResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static GetPipelineResponse of(Function<Builder, ObjectBuilder<GetPipelineResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetPipelineResponse}.
-	 */
-
-	public static class Builder extends DictionaryResponse.AbstractBuilder<String, Pipeline, Builder>
-			implements
-				ObjectBuilder<GetPipelineResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetPipelineResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetPipelineResponse build() {
-			_checkSingleUse();
-			super.tKeySerializer(null);
-			super.tValueSerializer(null);
-
-			return new GetPipelineResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetPipelineResponse}
-	 */
-	public static final JsonpDeserializer<GetPipelineResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GetPipelineResponse::setupGetPipelineResponseDeserializer);
-
-	protected static void setupGetPipelineResponseDeserializer(ObjectDeserializer<GetPipelineResponse.Builder> op) {
-		DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(),
-				Pipeline._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private GetPipelineResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static GetPipelineResponse of(Function<Builder, ObjectBuilder<GetPipelineResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetPipelineResponse}.
+     */
+
+    public static class Builder extends DictionaryResponse.AbstractBuilder<String, Pipeline, Builder>
+        implements
+            ObjectBuilder<GetPipelineResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetPipelineResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetPipelineResponse build() {
+            _checkSingleUse();
+            super.tKeySerializer(null);
+            super.tValueSerializer(null);
+
+            return new GetPipelineResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetPipelineResponse}
+     */
+    public static final JsonpDeserializer<GetPipelineResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetPipelineResponse::setupGetPipelineResponseDeserializer
+    );
+
+    protected static void setupGetPipelineResponseDeserializer(ObjectDeserializer<GetPipelineResponse.Builder> op) {
+        DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(), Pipeline._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GrokProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GrokProcessor.java
index 8469d8f0d2..68cefe708c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GrokProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GrokProcessor.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,251 +44,248 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.GrokProcessor
 
-
 @JsonpDeserializable
 public class GrokProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
-
-	@Nullable
-	private final Boolean ignoreMissing;
-
-	private final Map<String, String> patternDefinitions;
-
-	private final List<String> patterns;
-
-	@Nullable
-	private final Boolean traceMatch;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GrokProcessor(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.ignoreMissing = builder.ignoreMissing;
-		this.patternDefinitions = ApiTypeHelper.unmodifiableRequired(builder.patternDefinitions, this,
-				"patternDefinitions");
-		this.patterns = ApiTypeHelper.unmodifiableRequired(builder.patterns, this, "patterns");
-		this.traceMatch = builder.traceMatch;
-
-	}
-
-	public static GrokProcessor of(Function<Builder, ObjectBuilder<GrokProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Grok;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code ignore_missing}
-	 */
-	@Nullable
-	public final Boolean ignoreMissing() {
-		return this.ignoreMissing;
-	}
-
-	/**
-	 * Required - API name: {@code pattern_definitions}
-	 */
-	public final Map<String, String> patternDefinitions() {
-		return this.patternDefinitions;
-	}
-
-	/**
-	 * Required - API name: {@code patterns}
-	 */
-	public final List<String> patterns() {
-		return this.patterns;
-	}
-
-	/**
-	 * API name: {@code trace_match}
-	 */
-	@Nullable
-	public final Boolean traceMatch() {
-		return this.traceMatch;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.ignoreMissing != null) {
-			generator.writeKey("ignore_missing");
-			generator.write(this.ignoreMissing);
-
-		}
-		if (ApiTypeHelper.isDefined(this.patternDefinitions)) {
-			generator.writeKey("pattern_definitions");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.patternDefinitions.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.patterns)) {
-			generator.writeKey("patterns");
-			generator.writeStartArray();
-			for (String item0 : this.patterns) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.traceMatch != null) {
-			generator.writeKey("trace_match");
-			generator.write(this.traceMatch);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GrokProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<GrokProcessor> {
-		private String field;
-
-		@Nullable
-		private Boolean ignoreMissing;
-
-		private Map<String, String> patternDefinitions;
-
-		private List<String> patterns;
-
-		@Nullable
-		private Boolean traceMatch;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_missing}
-		 */
-		public final Builder ignoreMissing(@Nullable Boolean value) {
-			this.ignoreMissing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code pattern_definitions}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>patternDefinitions</code>.
-		 */
-		public final Builder patternDefinitions(Map<String, String> map) {
-			this.patternDefinitions = _mapPutAll(this.patternDefinitions, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code pattern_definitions}
-		 * <p>
-		 * Adds an entry to <code>patternDefinitions</code>.
-		 */
-		public final Builder patternDefinitions(String key, String value) {
-			this.patternDefinitions = _mapPut(this.patternDefinitions, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code patterns}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>patterns</code>.
-		 */
-		public final Builder patterns(List<String> list) {
-			this.patterns = _listAddAll(this.patterns, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code patterns}
-		 * <p>
-		 * Adds one or more values to <code>patterns</code>.
-		 */
-		public final Builder patterns(String value, String... values) {
-			this.patterns = _listAdd(this.patterns, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code trace_match}
-		 */
-		public final Builder traceMatch(@Nullable Boolean value) {
-			this.traceMatch = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GrokProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GrokProcessor build() {
-			_checkSingleUse();
-
-			return new GrokProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GrokProcessor}
-	 */
-	public static final JsonpDeserializer<GrokProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GrokProcessor::setupGrokProcessorDeserializer);
-
-	protected static void setupGrokProcessorDeserializer(ObjectDeserializer<GrokProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
-		op.add(Builder::patternDefinitions,
-				JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "pattern_definitions");
-		op.add(Builder::patterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"patterns");
-		op.add(Builder::traceMatch, JsonpDeserializer.booleanDeserializer(), "trace_match");
-
-	}
+    private final String field;
+
+    @Nullable
+    private final Boolean ignoreMissing;
+
+    private final Map<String, String> patternDefinitions;
+
+    private final List<String> patterns;
+
+    @Nullable
+    private final Boolean traceMatch;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GrokProcessor(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.ignoreMissing = builder.ignoreMissing;
+        this.patternDefinitions = ApiTypeHelper.unmodifiableRequired(builder.patternDefinitions, this, "patternDefinitions");
+        this.patterns = ApiTypeHelper.unmodifiableRequired(builder.patterns, this, "patterns");
+        this.traceMatch = builder.traceMatch;
+
+    }
+
+    public static GrokProcessor of(Function<Builder, ObjectBuilder<GrokProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Grok;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code ignore_missing}
+     */
+    @Nullable
+    public final Boolean ignoreMissing() {
+        return this.ignoreMissing;
+    }
+
+    /**
+     * Required - API name: {@code pattern_definitions}
+     */
+    public final Map<String, String> patternDefinitions() {
+        return this.patternDefinitions;
+    }
+
+    /**
+     * Required - API name: {@code patterns}
+     */
+    public final List<String> patterns() {
+        return this.patterns;
+    }
+
+    /**
+     * API name: {@code trace_match}
+     */
+    @Nullable
+    public final Boolean traceMatch() {
+        return this.traceMatch;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.ignoreMissing != null) {
+            generator.writeKey("ignore_missing");
+            generator.write(this.ignoreMissing);
+
+        }
+        if (ApiTypeHelper.isDefined(this.patternDefinitions)) {
+            generator.writeKey("pattern_definitions");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.patternDefinitions.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.patterns)) {
+            generator.writeKey("patterns");
+            generator.writeStartArray();
+            for (String item0 : this.patterns) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.traceMatch != null) {
+            generator.writeKey("trace_match");
+            generator.write(this.traceMatch);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GrokProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<GrokProcessor> {
+        private String field;
+
+        @Nullable
+        private Boolean ignoreMissing;
+
+        private Map<String, String> patternDefinitions;
+
+        private List<String> patterns;
+
+        @Nullable
+        private Boolean traceMatch;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_missing}
+         */
+        public final Builder ignoreMissing(@Nullable Boolean value) {
+            this.ignoreMissing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code pattern_definitions}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>patternDefinitions</code>.
+         */
+        public final Builder patternDefinitions(Map<String, String> map) {
+            this.patternDefinitions = _mapPutAll(this.patternDefinitions, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code pattern_definitions}
+         * <p>
+         * Adds an entry to <code>patternDefinitions</code>.
+         */
+        public final Builder patternDefinitions(String key, String value) {
+            this.patternDefinitions = _mapPut(this.patternDefinitions, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code patterns}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>patterns</code>.
+         */
+        public final Builder patterns(List<String> list) {
+            this.patterns = _listAddAll(this.patterns, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code patterns}
+         * <p>
+         * Adds one or more values to <code>patterns</code>.
+         */
+        public final Builder patterns(String value, String... values) {
+            this.patterns = _listAdd(this.patterns, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code trace_match}
+         */
+        public final Builder traceMatch(@Nullable Boolean value) {
+            this.traceMatch = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GrokProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GrokProcessor build() {
+            _checkSingleUse();
+
+            return new GrokProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GrokProcessor}
+     */
+    public static final JsonpDeserializer<GrokProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GrokProcessor::setupGrokProcessorDeserializer
+    );
+
+    protected static void setupGrokProcessorDeserializer(ObjectDeserializer<GrokProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
+        op.add(
+            Builder::patternDefinitions,
+            JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
+            "pattern_definitions"
+        );
+        op.add(Builder::patterns, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "patterns");
+        op.add(Builder::traceMatch, JsonpDeserializer.booleanDeserializer(), "trace_match");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GsubProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GsubProcessor.java
index cb0108d03b..97d298212b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GsubProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/GsubProcessor.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,207 +42,205 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.GsubProcessor
 
-
 @JsonpDeserializable
 public class GsubProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
+    private final String field;
 
-	@Nullable
-	private final Boolean ignoreMissing;
+    @Nullable
+    private final Boolean ignoreMissing;
 
-	private final String pattern;
+    private final String pattern;
 
-	private final String replacement;
+    private final String replacement;
 
-	@Nullable
-	private final String targetField;
+    @Nullable
+    private final String targetField;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private GsubProcessor(Builder builder) {
-		super(builder);
+    private GsubProcessor(Builder builder) {
+        super(builder);
 
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.ignoreMissing = builder.ignoreMissing;
-		this.pattern = ApiTypeHelper.requireNonNull(builder.pattern, this, "pattern");
-		this.replacement = ApiTypeHelper.requireNonNull(builder.replacement, this, "replacement");
-		this.targetField = builder.targetField;
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.ignoreMissing = builder.ignoreMissing;
+        this.pattern = ApiTypeHelper.requireNonNull(builder.pattern, this, "pattern");
+        this.replacement = ApiTypeHelper.requireNonNull(builder.replacement, this, "replacement");
+        this.targetField = builder.targetField;
 
-	}
+    }
 
-	public static GsubProcessor of(Function<Builder, ObjectBuilder<GsubProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static GsubProcessor of(Function<Builder, ObjectBuilder<GsubProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Gsub;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code ignore_missing}
-	 */
-	@Nullable
-	public final Boolean ignoreMissing() {
-		return this.ignoreMissing;
-	}
-
-	/**
-	 * Required - API name: {@code pattern}
-	 */
-	public final String pattern() {
-		return this.pattern;
-	}
-
-	/**
-	 * Required - API name: {@code replacement}
-	 */
-	public final String replacement() {
-		return this.replacement;
-	}
-
-	/**
-	 * API name: {@code target_field}
-	 */
-	@Nullable
-	public final String targetField() {
-		return this.targetField;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.ignoreMissing != null) {
-			generator.writeKey("ignore_missing");
-			generator.write(this.ignoreMissing);
-
-		}
-		generator.writeKey("pattern");
-		generator.write(this.pattern);
-
-		generator.writeKey("replacement");
-		generator.write(this.replacement);
-
-		if (this.targetField != null) {
-			generator.writeKey("target_field");
-			generator.write(this.targetField);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GsubProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<GsubProcessor> {
-		private String field;
-
-		@Nullable
-		private Boolean ignoreMissing;
-
-		private String pattern;
-
-		private String replacement;
-
-		@Nullable
-		private String targetField;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_missing}
-		 */
-		public final Builder ignoreMissing(@Nullable Boolean value) {
-			this.ignoreMissing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code pattern}
-		 */
-		public final Builder pattern(String value) {
-			this.pattern = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code replacement}
-		 */
-		public final Builder replacement(String value) {
-			this.replacement = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code target_field}
-		 */
-		public final Builder targetField(@Nullable String value) {
-			this.targetField = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GsubProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GsubProcessor build() {
-			_checkSingleUse();
-
-			return new GsubProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GsubProcessor}
-	 */
-	public static final JsonpDeserializer<GsubProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GsubProcessor::setupGsubProcessorDeserializer);
-
-	protected static void setupGsubProcessorDeserializer(ObjectDeserializer<GsubProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
-		op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
-		op.add(Builder::replacement, JsonpDeserializer.stringDeserializer(), "replacement");
-		op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
-
-	}
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Gsub;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code ignore_missing}
+     */
+    @Nullable
+    public final Boolean ignoreMissing() {
+        return this.ignoreMissing;
+    }
+
+    /**
+     * Required - API name: {@code pattern}
+     */
+    public final String pattern() {
+        return this.pattern;
+    }
+
+    /**
+     * Required - API name: {@code replacement}
+     */
+    public final String replacement() {
+        return this.replacement;
+    }
+
+    /**
+     * API name: {@code target_field}
+     */
+    @Nullable
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.ignoreMissing != null) {
+            generator.writeKey("ignore_missing");
+            generator.write(this.ignoreMissing);
+
+        }
+        generator.writeKey("pattern");
+        generator.write(this.pattern);
+
+        generator.writeKey("replacement");
+        generator.write(this.replacement);
+
+        if (this.targetField != null) {
+            generator.writeKey("target_field");
+            generator.write(this.targetField);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GsubProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<GsubProcessor> {
+        private String field;
+
+        @Nullable
+        private Boolean ignoreMissing;
+
+        private String pattern;
+
+        private String replacement;
+
+        @Nullable
+        private String targetField;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_missing}
+         */
+        public final Builder ignoreMissing(@Nullable Boolean value) {
+            this.ignoreMissing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code pattern}
+         */
+        public final Builder pattern(String value) {
+            this.pattern = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code replacement}
+         */
+        public final Builder replacement(String value) {
+            this.replacement = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code target_field}
+         */
+        public final Builder targetField(@Nullable String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GsubProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GsubProcessor build() {
+            _checkSingleUse();
+
+            return new GsubProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GsubProcessor}
+     */
+    public static final JsonpDeserializer<GsubProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GsubProcessor::setupGsubProcessorDeserializer
+    );
+
+    protected static void setupGsubProcessorDeserializer(ObjectDeserializer<GsubProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
+        op.add(Builder::pattern, JsonpDeserializer.stringDeserializer(), "pattern");
+        op.add(Builder::replacement, JsonpDeserializer.stringDeserializer(), "replacement");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/InferenceConfig.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/InferenceConfig.java
index 11c4e88010..768d32e939 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/InferenceConfig.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/InferenceConfig.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,109 +43,105 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.InferenceConfig
 
-
 @JsonpDeserializable
 public class InferenceConfig implements JsonpSerializable {
-	@Nullable
-	private final InferenceConfigRegression regression;
+    @Nullable
+    private final InferenceConfigRegression regression;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private InferenceConfig(Builder builder) {
+    private InferenceConfig(Builder builder) {
 
-		this.regression = builder.regression;
+        this.regression = builder.regression;
 
-	}
+    }
 
-	public static InferenceConfig of(Function<Builder, ObjectBuilder<InferenceConfig>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static InferenceConfig of(Function<Builder, ObjectBuilder<InferenceConfig>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * API name: {@code regression}
-	 */
-	@Nullable
-	public final InferenceConfigRegression regression() {
-		return this.regression;
-	}
+    /**
+     * API name: {@code regression}
+     */
+    @Nullable
+    public final InferenceConfigRegression regression() {
+        return this.regression;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		if (this.regression != null) {
-			generator.writeKey("regression");
-			this.regression.serialize(generator, mapper);
+        if (this.regression != null) {
+            generator.writeKey("regression");
+            this.regression.serialize(generator, mapper);
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link InferenceConfig}.
-	 */
+    /**
+     * Builder for {@link InferenceConfig}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InferenceConfig> {
-		@Nullable
-		private InferenceConfigRegression regression;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InferenceConfig> {
+        @Nullable
+        private InferenceConfigRegression regression;
 
-		/**
-		 * API name: {@code regression}
-		 */
-		public final Builder regression(@Nullable InferenceConfigRegression value) {
-			this.regression = value;
-			return this;
-		}
+        /**
+         * API name: {@code regression}
+         */
+        public final Builder regression(@Nullable InferenceConfigRegression value) {
+            this.regression = value;
+            return this;
+        }
 
-		/**
-		 * API name: {@code regression}
-		 */
-		public final Builder regression(
-				Function<InferenceConfigRegression.Builder, ObjectBuilder<InferenceConfigRegression>> fn) {
-			return this.regression(fn.apply(new InferenceConfigRegression.Builder()).build());
-		}
+        /**
+         * API name: {@code regression}
+         */
+        public final Builder regression(Function<InferenceConfigRegression.Builder, ObjectBuilder<InferenceConfigRegression>> fn) {
+            return this.regression(fn.apply(new InferenceConfigRegression.Builder()).build());
+        }
 
-		/**
-		 * Builds a {@link InferenceConfig}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public InferenceConfig build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link InferenceConfig}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public InferenceConfig build() {
+            _checkSingleUse();
 
-			return new InferenceConfig(this);
-		}
-	}
+            return new InferenceConfig(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link InferenceConfig}
-	 */
-	public static final JsonpDeserializer<InferenceConfig> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			InferenceConfig::setupInferenceConfigDeserializer);
+    /**
+     * Json deserializer for {@link InferenceConfig}
+     */
+    public static final JsonpDeserializer<InferenceConfig> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        InferenceConfig::setupInferenceConfigDeserializer
+    );
 
-	protected static void setupInferenceConfigDeserializer(ObjectDeserializer<InferenceConfig.Builder> op) {
+    protected static void setupInferenceConfigDeserializer(ObjectDeserializer<InferenceConfig.Builder> op) {
 
-		op.add(Builder::regression, InferenceConfigRegression._DESERIALIZER, "regression");
+        op.add(Builder::regression, InferenceConfigRegression._DESERIALIZER, "regression");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/InferenceConfigRegression.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/InferenceConfigRegression.java
index 824256ee73..fbb9fa9b6a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/InferenceConfigRegression.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/InferenceConfigRegression.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,94 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: ingest._types.InferenceConfigRegression
 
-
 @JsonpDeserializable
 public class InferenceConfigRegression implements JsonpSerializable {
-	private final String resultsField;
+    private final String resultsField;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private InferenceConfigRegression(Builder builder) {
+    private InferenceConfigRegression(Builder builder) {
 
-		this.resultsField = ApiTypeHelper.requireNonNull(builder.resultsField, this, "resultsField");
+        this.resultsField = ApiTypeHelper.requireNonNull(builder.resultsField, this, "resultsField");
 
-	}
+    }
 
-	public static InferenceConfigRegression of(Function<Builder, ObjectBuilder<InferenceConfigRegression>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static InferenceConfigRegression of(Function<Builder, ObjectBuilder<InferenceConfigRegression>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code results_field}
-	 */
-	public final String resultsField() {
-		return this.resultsField;
-	}
+    /**
+     * Required - API name: {@code results_field}
+     */
+    public final String resultsField() {
+        return this.resultsField;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("results_field");
-		generator.write(this.resultsField);
+        generator.writeKey("results_field");
+        generator.write(this.resultsField);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link InferenceConfigRegression}.
-	 */
+    /**
+     * Builder for {@link InferenceConfigRegression}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InferenceConfigRegression> {
-		private String resultsField;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InferenceConfigRegression> {
+        private String resultsField;
 
-		/**
-		 * Required - API name: {@code results_field}
-		 */
-		public final Builder resultsField(String value) {
-			this.resultsField = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code results_field}
+         */
+        public final Builder resultsField(String value) {
+            this.resultsField = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link InferenceConfigRegression}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public InferenceConfigRegression build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link InferenceConfigRegression}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public InferenceConfigRegression build() {
+            _checkSingleUse();
 
-			return new InferenceConfigRegression(this);
-		}
-	}
+            return new InferenceConfigRegression(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link InferenceConfigRegression}
-	 */
-	public static final JsonpDeserializer<InferenceConfigRegression> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, InferenceConfigRegression::setupInferenceConfigRegressionDeserializer);
+    /**
+     * Json deserializer for {@link InferenceConfigRegression}
+     */
+    public static final JsonpDeserializer<InferenceConfigRegression> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        InferenceConfigRegression::setupInferenceConfigRegressionDeserializer
+    );
 
-	protected static void setupInferenceConfigRegressionDeserializer(
-			ObjectDeserializer<InferenceConfigRegression.Builder> op) {
+    protected static void setupInferenceConfigRegressionDeserializer(ObjectDeserializer<InferenceConfigRegression.Builder> op) {
 
-		op.add(Builder::resultsField, JsonpDeserializer.stringDeserializer(), "results_field");
+        op.add(Builder::resultsField, JsonpDeserializer.stringDeserializer(), "results_field");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/InferenceProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/InferenceProcessor.java
index ca45d29944..18a9cf0fd8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/InferenceProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/InferenceProcessor.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,209 +44,204 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.InferenceProcessor
 
-
 @JsonpDeserializable
 public class InferenceProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String modelId;
+    private final String modelId;
 
-	private final String targetField;
+    private final String targetField;
 
-	private final Map<String, JsonData> fieldMap;
+    private final Map<String, JsonData> fieldMap;
 
-	@Nullable
-	private final InferenceConfig inferenceConfig;
+    @Nullable
+    private final InferenceConfig inferenceConfig;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private InferenceProcessor(Builder builder) {
-		super(builder);
+    private InferenceProcessor(Builder builder) {
+        super(builder);
 
-		this.modelId = ApiTypeHelper.requireNonNull(builder.modelId, this, "modelId");
-		this.targetField = ApiTypeHelper.requireNonNull(builder.targetField, this, "targetField");
-		this.fieldMap = ApiTypeHelper.unmodifiable(builder.fieldMap);
-		this.inferenceConfig = builder.inferenceConfig;
+        this.modelId = ApiTypeHelper.requireNonNull(builder.modelId, this, "modelId");
+        this.targetField = ApiTypeHelper.requireNonNull(builder.targetField, this, "targetField");
+        this.fieldMap = ApiTypeHelper.unmodifiable(builder.fieldMap);
+        this.inferenceConfig = builder.inferenceConfig;
 
-	}
-
-	public static InferenceProcessor of(Function<Builder, ObjectBuilder<InferenceProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Inference;
-	}
-
-	/**
-	 * Required - API name: {@code model_id}
-	 */
-	public final String modelId() {
-		return this.modelId;
-	}
-
-	/**
-	 * Required - API name: {@code target_field}
-	 */
-	public final String targetField() {
-		return this.targetField;
-	}
-
-	/**
-	 * API name: {@code field_map}
-	 */
-	public final Map<String, JsonData> fieldMap() {
-		return this.fieldMap;
-	}
-
-	/**
-	 * API name: {@code inference_config}
-	 */
-	@Nullable
-	public final InferenceConfig inferenceConfig() {
-		return this.inferenceConfig;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("model_id");
-		generator.write(this.modelId);
-
-		generator.writeKey("target_field");
-		generator.write(this.targetField);
-
-		if (ApiTypeHelper.isDefined(this.fieldMap)) {
-			generator.writeKey("field_map");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.fieldMap.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.inferenceConfig != null) {
-			generator.writeKey("inference_config");
-			this.inferenceConfig.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link InferenceProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<InferenceProcessor> {
-		private String modelId;
-
-		private String targetField;
-
-		@Nullable
-		private Map<String, JsonData> fieldMap;
-
-		@Nullable
-		private InferenceConfig inferenceConfig;
-
-		/**
-		 * Required - API name: {@code model_id}
-		 */
-		public final Builder modelId(String value) {
-			this.modelId = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code target_field}
-		 */
-		public final Builder targetField(String value) {
-			this.targetField = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code field_map}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>fieldMap</code>.
-		 */
-		public final Builder fieldMap(Map<String, JsonData> map) {
-			this.fieldMap = _mapPutAll(this.fieldMap, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code field_map}
-		 * <p>
-		 * Adds an entry to <code>fieldMap</code>.
-		 */
-		public final Builder fieldMap(String key, JsonData value) {
-			this.fieldMap = _mapPut(this.fieldMap, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code inference_config}
-		 */
-		public final Builder inferenceConfig(@Nullable InferenceConfig value) {
-			this.inferenceConfig = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code inference_config}
-		 */
-		public final Builder inferenceConfig(Function<InferenceConfig.Builder, ObjectBuilder<InferenceConfig>> fn) {
-			return this.inferenceConfig(fn.apply(new InferenceConfig.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link InferenceProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public InferenceProcessor build() {
-			_checkSingleUse();
-
-			return new InferenceProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link InferenceProcessor}
-	 */
-	public static final JsonpDeserializer<InferenceProcessor> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, InferenceProcessor::setupInferenceProcessorDeserializer);
-
-	protected static void setupInferenceProcessorDeserializer(ObjectDeserializer<InferenceProcessor.Builder> op) {
-		ProcessorBase.setupProcessorBaseDeserializer(op);
-		op.add(Builder::modelId, JsonpDeserializer.stringDeserializer(), "model_id");
-		op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
-		op.add(Builder::fieldMap, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "field_map");
-		op.add(Builder::inferenceConfig, InferenceConfig._DESERIALIZER, "inference_config");
-
-	}
+    }
+
+    public static InferenceProcessor of(Function<Builder, ObjectBuilder<InferenceProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Inference;
+    }
+
+    /**
+     * Required - API name: {@code model_id}
+     */
+    public final String modelId() {
+        return this.modelId;
+    }
+
+    /**
+     * Required - API name: {@code target_field}
+     */
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    /**
+     * API name: {@code field_map}
+     */
+    public final Map<String, JsonData> fieldMap() {
+        return this.fieldMap;
+    }
+
+    /**
+     * API name: {@code inference_config}
+     */
+    @Nullable
+    public final InferenceConfig inferenceConfig() {
+        return this.inferenceConfig;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("model_id");
+        generator.write(this.modelId);
+
+        generator.writeKey("target_field");
+        generator.write(this.targetField);
+
+        if (ApiTypeHelper.isDefined(this.fieldMap)) {
+            generator.writeKey("field_map");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.fieldMap.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.inferenceConfig != null) {
+            generator.writeKey("inference_config");
+            this.inferenceConfig.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link InferenceProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<InferenceProcessor> {
+        private String modelId;
+
+        private String targetField;
+
+        @Nullable
+        private Map<String, JsonData> fieldMap;
+
+        @Nullable
+        private InferenceConfig inferenceConfig;
+
+        /**
+         * Required - API name: {@code model_id}
+         */
+        public final Builder modelId(String value) {
+            this.modelId = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code target_field}
+         */
+        public final Builder targetField(String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code field_map}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>fieldMap</code>.
+         */
+        public final Builder fieldMap(Map<String, JsonData> map) {
+            this.fieldMap = _mapPutAll(this.fieldMap, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code field_map}
+         * <p>
+         * Adds an entry to <code>fieldMap</code>.
+         */
+        public final Builder fieldMap(String key, JsonData value) {
+            this.fieldMap = _mapPut(this.fieldMap, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code inference_config}
+         */
+        public final Builder inferenceConfig(@Nullable InferenceConfig value) {
+            this.inferenceConfig = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code inference_config}
+         */
+        public final Builder inferenceConfig(Function<InferenceConfig.Builder, ObjectBuilder<InferenceConfig>> fn) {
+            return this.inferenceConfig(fn.apply(new InferenceConfig.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link InferenceProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public InferenceProcessor build() {
+            _checkSingleUse();
+
+            return new InferenceProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link InferenceProcessor}
+     */
+    public static final JsonpDeserializer<InferenceProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        InferenceProcessor::setupInferenceProcessorDeserializer
+    );
+
+    protected static void setupInferenceProcessorDeserializer(ObjectDeserializer<InferenceProcessor.Builder> op) {
+        ProcessorBase.setupProcessorBaseDeserializer(op);
+        op.add(Builder::modelId, JsonpDeserializer.stringDeserializer(), "model_id");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+        op.add(Builder::fieldMap, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "field_map");
+        op.add(Builder::inferenceConfig, InferenceConfig._DESERIALIZER, "inference_config");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/JoinProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/JoinProcessor.java
index 86d275f9a8..f1a3d6c7a5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/JoinProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/JoinProcessor.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,154 +42,152 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.JoinProcessor
 
-
 @JsonpDeserializable
 public class JoinProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
+    private final String field;
 
-	private final String separator;
-
-	@Nullable
-	private final String targetField;
+    private final String separator;
+
+    @Nullable
+    private final String targetField;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private JoinProcessor(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.separator = ApiTypeHelper.requireNonNull(builder.separator, this, "separator");
-		this.targetField = builder.targetField;
-
-	}
-
-	public static JoinProcessor of(Function<Builder, ObjectBuilder<JoinProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Join;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required - API name: {@code separator}
-	 */
-	public final String separator() {
-		return this.separator;
-	}
-
-	/**
-	 * API name: {@code target_field}
-	 */
-	@Nullable
-	public final String targetField() {
-		return this.targetField;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		generator.writeKey("separator");
-		generator.write(this.separator);
-
-		if (this.targetField != null) {
-			generator.writeKey("target_field");
-			generator.write(this.targetField);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link JoinProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<JoinProcessor> {
-		private String field;
-
-		private String separator;
-
-		@Nullable
-		private String targetField;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code separator}
-		 */
-		public final Builder separator(String value) {
-			this.separator = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code target_field}
-		 */
-		public final Builder targetField(@Nullable String value) {
-			this.targetField = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link JoinProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public JoinProcessor build() {
-			_checkSingleUse();
-
-			return new JoinProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link JoinProcessor}
-	 */
-	public static final JsonpDeserializer<JoinProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			JoinProcessor::setupJoinProcessorDeserializer);
-
-	protected static void setupJoinProcessorDeserializer(ObjectDeserializer<JoinProcessor.Builder> op) {
-		ProcessorBase.setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::separator, JsonpDeserializer.stringDeserializer(), "separator");
-		op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private JoinProcessor(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.separator = ApiTypeHelper.requireNonNull(builder.separator, this, "separator");
+        this.targetField = builder.targetField;
+
+    }
+
+    public static JoinProcessor of(Function<Builder, ObjectBuilder<JoinProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Join;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required - API name: {@code separator}
+     */
+    public final String separator() {
+        return this.separator;
+    }
+
+    /**
+     * API name: {@code target_field}
+     */
+    @Nullable
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        generator.writeKey("separator");
+        generator.write(this.separator);
+
+        if (this.targetField != null) {
+            generator.writeKey("target_field");
+            generator.write(this.targetField);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link JoinProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<JoinProcessor> {
+        private String field;
+
+        private String separator;
+
+        @Nullable
+        private String targetField;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code separator}
+         */
+        public final Builder separator(String value) {
+            this.separator = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code target_field}
+         */
+        public final Builder targetField(@Nullable String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link JoinProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public JoinProcessor build() {
+            _checkSingleUse();
+
+            return new JoinProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link JoinProcessor}
+     */
+    public static final JsonpDeserializer<JoinProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        JoinProcessor::setupJoinProcessorDeserializer
+    );
+
+    protected static void setupJoinProcessorDeserializer(ObjectDeserializer<JoinProcessor.Builder> op) {
+        ProcessorBase.setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::separator, JsonpDeserializer.stringDeserializer(), "separator");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/JsonProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/JsonProcessor.java
index 7e3cce9eaa..4bd395f727 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/JsonProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/JsonProcessor.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,147 +41,146 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: ingest._types.JsonProcessor
 
-
 @JsonpDeserializable
 public class JsonProcessor extends ProcessorBase implements ProcessorVariant {
-	private final boolean addToRoot;
+    private final boolean addToRoot;
 
-	private final String field;
-
-	private final String targetField;
+    private final String field;
+
+    private final String targetField;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private JsonProcessor(Builder builder) {
-		super(builder);
-
-		this.addToRoot = ApiTypeHelper.requireNonNull(builder.addToRoot, this, "addToRoot");
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.targetField = ApiTypeHelper.requireNonNull(builder.targetField, this, "targetField");
-
-	}
-
-	public static JsonProcessor of(Function<Builder, ObjectBuilder<JsonProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Json;
-	}
-
-	/**
-	 * Required - API name: {@code add_to_root}
-	 */
-	public final boolean addToRoot() {
-		return this.addToRoot;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required - API name: {@code target_field}
-	 */
-	public final String targetField() {
-		return this.targetField;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("add_to_root");
-		generator.write(this.addToRoot);
-
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		generator.writeKey("target_field");
-		generator.write(this.targetField);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link JsonProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<JsonProcessor> {
-		private Boolean addToRoot;
-
-		private String field;
-
-		private String targetField;
-
-		/**
-		 * Required - API name: {@code add_to_root}
-		 */
-		public final Builder addToRoot(boolean value) {
-			this.addToRoot = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code target_field}
-		 */
-		public final Builder targetField(String value) {
-			this.targetField = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link JsonProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public JsonProcessor build() {
-			_checkSingleUse();
-
-			return new JsonProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link JsonProcessor}
-	 */
-	public static final JsonpDeserializer<JsonProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			JsonProcessor::setupJsonProcessorDeserializer);
-
-	protected static void setupJsonProcessorDeserializer(ObjectDeserializer<JsonProcessor.Builder> op) {
-		ProcessorBase.setupProcessorBaseDeserializer(op);
-		op.add(Builder::addToRoot, JsonpDeserializer.booleanDeserializer(), "add_to_root");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private JsonProcessor(Builder builder) {
+        super(builder);
+
+        this.addToRoot = ApiTypeHelper.requireNonNull(builder.addToRoot, this, "addToRoot");
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.targetField = ApiTypeHelper.requireNonNull(builder.targetField, this, "targetField");
+
+    }
+
+    public static JsonProcessor of(Function<Builder, ObjectBuilder<JsonProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Json;
+    }
+
+    /**
+     * Required - API name: {@code add_to_root}
+     */
+    public final boolean addToRoot() {
+        return this.addToRoot;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required - API name: {@code target_field}
+     */
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("add_to_root");
+        generator.write(this.addToRoot);
+
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        generator.writeKey("target_field");
+        generator.write(this.targetField);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link JsonProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<JsonProcessor> {
+        private Boolean addToRoot;
+
+        private String field;
+
+        private String targetField;
+
+        /**
+         * Required - API name: {@code add_to_root}
+         */
+        public final Builder addToRoot(boolean value) {
+            this.addToRoot = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code target_field}
+         */
+        public final Builder targetField(String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link JsonProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public JsonProcessor build() {
+            _checkSingleUse();
+
+            return new JsonProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link JsonProcessor}
+     */
+    public static final JsonpDeserializer<JsonProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        JsonProcessor::setupJsonProcessorDeserializer
+    );
+
+    protected static void setupJsonProcessorDeserializer(ObjectDeserializer<JsonProcessor.Builder> op) {
+        ProcessorBase.setupProcessorBaseDeserializer(op);
+        op.add(Builder::addToRoot, JsonpDeserializer.booleanDeserializer(), "add_to_root");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/KeyValueProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/KeyValueProcessor.java
index dea51bc376..dc3302e715 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/KeyValueProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/KeyValueProcessor.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,414 +43,408 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.KeyValueProcessor
 
 @JsonpDeserializable
 public class KeyValueProcessor extends ProcessorBase implements ProcessorVariant {
-	private final List<String> excludeKeys;
-
-	private final String field;
-
-	private final String fieldSplit;
-
-	@Nullable
-	private final Boolean ignoreMissing;
-
-	private final List<String> includeKeys;
-
-	@Nullable
-	private final String prefix;
-
-	@Nullable
-	private final Boolean stripBrackets;
-
-	@Nullable
-	private final String targetField;
-
-	@Nullable
-	private final String trimKey;
-
-	@Nullable
-	private final String trimValue;
-
-	private final String valueSplit;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private KeyValueProcessor(Builder builder) {
-		super(builder);
-
-		this.excludeKeys = ApiTypeHelper.unmodifiable(builder.excludeKeys);
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.fieldSplit = ApiTypeHelper.requireNonNull(builder.fieldSplit, this, "fieldSplit");
-		this.ignoreMissing = builder.ignoreMissing;
-		this.includeKeys = ApiTypeHelper.unmodifiable(builder.includeKeys);
-		this.prefix = builder.prefix;
-		this.stripBrackets = builder.stripBrackets;
-		this.targetField = builder.targetField;
-		this.trimKey = builder.trimKey;
-		this.trimValue = builder.trimValue;
-		this.valueSplit = ApiTypeHelper.requireNonNull(builder.valueSplit, this, "valueSplit");
-
-	}
-
-	public static KeyValueProcessor of(Function<Builder, ObjectBuilder<KeyValueProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Kv;
-	}
-
-	/**
-	 * API name: {@code exclude_keys}
-	 */
-	public final List<String> excludeKeys() {
-		return this.excludeKeys;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required - API name: {@code field_split}
-	 */
-	public final String fieldSplit() {
-		return this.fieldSplit;
-	}
-
-	/**
-	 * API name: {@code ignore_missing}
-	 */
-	@Nullable
-	public final Boolean ignoreMissing() {
-		return this.ignoreMissing;
-	}
-
-	/**
-	 * API name: {@code include_keys}
-	 */
-	public final List<String> includeKeys() {
-		return this.includeKeys;
-	}
-
-	/**
-	 * API name: {@code prefix}
-	 */
-	@Nullable
-	public final String prefix() {
-		return this.prefix;
-	}
-
-	/**
-	 * API name: {@code strip_brackets}
-	 */
-	@Nullable
-	public final Boolean stripBrackets() {
-		return this.stripBrackets;
-	}
-
-	/**
-	 * API name: {@code target_field}
-	 */
-	@Nullable
-	public final String targetField() {
-		return this.targetField;
-	}
-
-	/**
-	 * API name: {@code trim_key}
-	 */
-	@Nullable
-	public final String trimKey() {
-		return this.trimKey;
-	}
-
-	/**
-	 * API name: {@code trim_value}
-	 */
-	@Nullable
-	public final String trimValue() {
-		return this.trimValue;
-	}
-
-	/**
-	 * Required - API name: {@code value_split}
-	 */
-	public final String valueSplit() {
-		return this.valueSplit;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.excludeKeys)) {
-			generator.writeKey("exclude_keys");
-			generator.writeStartArray();
-			for (String item0 : this.excludeKeys) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		generator.writeKey("field_split");
-		generator.write(this.fieldSplit);
-
-		if (this.ignoreMissing != null) {
-			generator.writeKey("ignore_missing");
-			generator.write(this.ignoreMissing);
-
-		}
-		if (ApiTypeHelper.isDefined(this.includeKeys)) {
-			generator.writeKey("include_keys");
-			generator.writeStartArray();
-			for (String item0 : this.includeKeys) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.prefix != null) {
-			generator.writeKey("prefix");
-			generator.write(this.prefix);
-
-		}
-		if (this.stripBrackets != null) {
-			generator.writeKey("strip_brackets");
-			generator.write(this.stripBrackets);
-
-		}
-		if (this.targetField != null) {
-			generator.writeKey("target_field");
-			generator.write(this.targetField);
-
-		}
-		if (this.trimKey != null) {
-			generator.writeKey("trim_key");
-			generator.write(this.trimKey);
-
-		}
-		if (this.trimValue != null) {
-			generator.writeKey("trim_value");
-			generator.write(this.trimValue);
-
-		}
-		generator.writeKey("value_split");
-		generator.write(this.valueSplit);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link KeyValueProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<KeyValueProcessor> {
-		@Nullable
-		private List<String> excludeKeys;
-
-		private String field;
-
-		private String fieldSplit;
-
-		@Nullable
-		private Boolean ignoreMissing;
-
-		@Nullable
-		private List<String> includeKeys;
-
-		@Nullable
-		private String prefix;
-
-		@Nullable
-		private Boolean stripBrackets;
-
-		@Nullable
-		private String targetField;
-
-		@Nullable
-		private String trimKey;
-
-		@Nullable
-		private String trimValue;
-
-		private String valueSplit;
-
-		/**
-		 * API name: {@code exclude_keys}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>excludeKeys</code>.
-		 */
-		public final Builder excludeKeys(List<String> list) {
-			this.excludeKeys = _listAddAll(this.excludeKeys, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code exclude_keys}
-		 * <p>
-		 * Adds one or more values to <code>excludeKeys</code>.
-		 */
-		public final Builder excludeKeys(String value, String... values) {
-			this.excludeKeys = _listAdd(this.excludeKeys, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code field_split}
-		 */
-		public final Builder fieldSplit(String value) {
-			this.fieldSplit = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_missing}
-		 */
-		public final Builder ignoreMissing(@Nullable Boolean value) {
-			this.ignoreMissing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code include_keys}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>includeKeys</code>.
-		 */
-		public final Builder includeKeys(List<String> list) {
-			this.includeKeys = _listAddAll(this.includeKeys, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code include_keys}
-		 * <p>
-		 * Adds one or more values to <code>includeKeys</code>.
-		 */
-		public final Builder includeKeys(String value, String... values) {
-			this.includeKeys = _listAdd(this.includeKeys, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code prefix}
-		 */
-		public final Builder prefix(@Nullable String value) {
-			this.prefix = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code strip_brackets}
-		 */
-		public final Builder stripBrackets(@Nullable Boolean value) {
-			this.stripBrackets = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code target_field}
-		 */
-		public final Builder targetField(@Nullable String value) {
-			this.targetField = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code trim_key}
-		 */
-		public final Builder trimKey(@Nullable String value) {
-			this.trimKey = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code trim_value}
-		 */
-		public final Builder trimValue(@Nullable String value) {
-			this.trimValue = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code value_split}
-		 */
-		public final Builder valueSplit(String value) {
-			this.valueSplit = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link KeyValueProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public KeyValueProcessor build() {
-			_checkSingleUse();
-
-			return new KeyValueProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link KeyValueProcessor}
-	 */
-	public static final JsonpDeserializer<KeyValueProcessor> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, KeyValueProcessor::setupKeyValueProcessorDeserializer);
-
-	protected static void setupKeyValueProcessorDeserializer(ObjectDeserializer<KeyValueProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::excludeKeys, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"exclude_keys");
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::fieldSplit, JsonpDeserializer.stringDeserializer(), "field_split");
-		op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
-		op.add(Builder::includeKeys, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"include_keys");
-		op.add(Builder::prefix, JsonpDeserializer.stringDeserializer(), "prefix");
-		op.add(Builder::stripBrackets, JsonpDeserializer.booleanDeserializer(), "strip_brackets");
-		op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
-		op.add(Builder::trimKey, JsonpDeserializer.stringDeserializer(), "trim_key");
-		op.add(Builder::trimValue, JsonpDeserializer.stringDeserializer(), "trim_value");
-		op.add(Builder::valueSplit, JsonpDeserializer.stringDeserializer(), "value_split");
-
-	}
+    private final List<String> excludeKeys;
+
+    private final String field;
+
+    private final String fieldSplit;
+
+    @Nullable
+    private final Boolean ignoreMissing;
+
+    private final List<String> includeKeys;
+
+    @Nullable
+    private final String prefix;
+
+    @Nullable
+    private final Boolean stripBrackets;
+
+    @Nullable
+    private final String targetField;
+
+    @Nullable
+    private final String trimKey;
+
+    @Nullable
+    private final String trimValue;
+
+    private final String valueSplit;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private KeyValueProcessor(Builder builder) {
+        super(builder);
+
+        this.excludeKeys = ApiTypeHelper.unmodifiable(builder.excludeKeys);
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.fieldSplit = ApiTypeHelper.requireNonNull(builder.fieldSplit, this, "fieldSplit");
+        this.ignoreMissing = builder.ignoreMissing;
+        this.includeKeys = ApiTypeHelper.unmodifiable(builder.includeKeys);
+        this.prefix = builder.prefix;
+        this.stripBrackets = builder.stripBrackets;
+        this.targetField = builder.targetField;
+        this.trimKey = builder.trimKey;
+        this.trimValue = builder.trimValue;
+        this.valueSplit = ApiTypeHelper.requireNonNull(builder.valueSplit, this, "valueSplit");
+
+    }
+
+    public static KeyValueProcessor of(Function<Builder, ObjectBuilder<KeyValueProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Kv;
+    }
+
+    /**
+     * API name: {@code exclude_keys}
+     */
+    public final List<String> excludeKeys() {
+        return this.excludeKeys;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required - API name: {@code field_split}
+     */
+    public final String fieldSplit() {
+        return this.fieldSplit;
+    }
+
+    /**
+     * API name: {@code ignore_missing}
+     */
+    @Nullable
+    public final Boolean ignoreMissing() {
+        return this.ignoreMissing;
+    }
+
+    /**
+     * API name: {@code include_keys}
+     */
+    public final List<String> includeKeys() {
+        return this.includeKeys;
+    }
+
+    /**
+     * API name: {@code prefix}
+     */
+    @Nullable
+    public final String prefix() {
+        return this.prefix;
+    }
+
+    /**
+     * API name: {@code strip_brackets}
+     */
+    @Nullable
+    public final Boolean stripBrackets() {
+        return this.stripBrackets;
+    }
+
+    /**
+     * API name: {@code target_field}
+     */
+    @Nullable
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    /**
+     * API name: {@code trim_key}
+     */
+    @Nullable
+    public final String trimKey() {
+        return this.trimKey;
+    }
+
+    /**
+     * API name: {@code trim_value}
+     */
+    @Nullable
+    public final String trimValue() {
+        return this.trimValue;
+    }
+
+    /**
+     * Required - API name: {@code value_split}
+     */
+    public final String valueSplit() {
+        return this.valueSplit;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.excludeKeys)) {
+            generator.writeKey("exclude_keys");
+            generator.writeStartArray();
+            for (String item0 : this.excludeKeys) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        generator.writeKey("field_split");
+        generator.write(this.fieldSplit);
+
+        if (this.ignoreMissing != null) {
+            generator.writeKey("ignore_missing");
+            generator.write(this.ignoreMissing);
+
+        }
+        if (ApiTypeHelper.isDefined(this.includeKeys)) {
+            generator.writeKey("include_keys");
+            generator.writeStartArray();
+            for (String item0 : this.includeKeys) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.prefix != null) {
+            generator.writeKey("prefix");
+            generator.write(this.prefix);
+
+        }
+        if (this.stripBrackets != null) {
+            generator.writeKey("strip_brackets");
+            generator.write(this.stripBrackets);
+
+        }
+        if (this.targetField != null) {
+            generator.writeKey("target_field");
+            generator.write(this.targetField);
+
+        }
+        if (this.trimKey != null) {
+            generator.writeKey("trim_key");
+            generator.write(this.trimKey);
+
+        }
+        if (this.trimValue != null) {
+            generator.writeKey("trim_value");
+            generator.write(this.trimValue);
+
+        }
+        generator.writeKey("value_split");
+        generator.write(this.valueSplit);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link KeyValueProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<KeyValueProcessor> {
+        @Nullable
+        private List<String> excludeKeys;
+
+        private String field;
+
+        private String fieldSplit;
+
+        @Nullable
+        private Boolean ignoreMissing;
+
+        @Nullable
+        private List<String> includeKeys;
+
+        @Nullable
+        private String prefix;
+
+        @Nullable
+        private Boolean stripBrackets;
+
+        @Nullable
+        private String targetField;
+
+        @Nullable
+        private String trimKey;
+
+        @Nullable
+        private String trimValue;
+
+        private String valueSplit;
+
+        /**
+         * API name: {@code exclude_keys}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>excludeKeys</code>.
+         */
+        public final Builder excludeKeys(List<String> list) {
+            this.excludeKeys = _listAddAll(this.excludeKeys, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code exclude_keys}
+         * <p>
+         * Adds one or more values to <code>excludeKeys</code>.
+         */
+        public final Builder excludeKeys(String value, String... values) {
+            this.excludeKeys = _listAdd(this.excludeKeys, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code field_split}
+         */
+        public final Builder fieldSplit(String value) {
+            this.fieldSplit = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_missing}
+         */
+        public final Builder ignoreMissing(@Nullable Boolean value) {
+            this.ignoreMissing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code include_keys}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>includeKeys</code>.
+         */
+        public final Builder includeKeys(List<String> list) {
+            this.includeKeys = _listAddAll(this.includeKeys, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code include_keys}
+         * <p>
+         * Adds one or more values to <code>includeKeys</code>.
+         */
+        public final Builder includeKeys(String value, String... values) {
+            this.includeKeys = _listAdd(this.includeKeys, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code prefix}
+         */
+        public final Builder prefix(@Nullable String value) {
+            this.prefix = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code strip_brackets}
+         */
+        public final Builder stripBrackets(@Nullable Boolean value) {
+            this.stripBrackets = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code target_field}
+         */
+        public final Builder targetField(@Nullable String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code trim_key}
+         */
+        public final Builder trimKey(@Nullable String value) {
+            this.trimKey = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code trim_value}
+         */
+        public final Builder trimValue(@Nullable String value) {
+            this.trimValue = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code value_split}
+         */
+        public final Builder valueSplit(String value) {
+            this.valueSplit = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link KeyValueProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public KeyValueProcessor build() {
+            _checkSingleUse();
+
+            return new KeyValueProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link KeyValueProcessor}
+     */
+    public static final JsonpDeserializer<KeyValueProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        KeyValueProcessor::setupKeyValueProcessorDeserializer
+    );
+
+    protected static void setupKeyValueProcessorDeserializer(ObjectDeserializer<KeyValueProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::excludeKeys, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "exclude_keys");
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::fieldSplit, JsonpDeserializer.stringDeserializer(), "field_split");
+        op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
+        op.add(Builder::includeKeys, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "include_keys");
+        op.add(Builder::prefix, JsonpDeserializer.stringDeserializer(), "prefix");
+        op.add(Builder::stripBrackets, JsonpDeserializer.booleanDeserializer(), "strip_brackets");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+        op.add(Builder::trimKey, JsonpDeserializer.stringDeserializer(), "trim_key");
+        op.add(Builder::trimValue, JsonpDeserializer.stringDeserializer(), "trim_value");
+        op.add(Builder::valueSplit, JsonpDeserializer.stringDeserializer(), "value_split");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/LowercaseProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/LowercaseProcessor.java
index c4231c14a8..0c365b94c8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/LowercaseProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/LowercaseProcessor.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,161 +42,157 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.LowercaseProcessor
 
-
 @JsonpDeserializable
 public class LowercaseProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
-
-	@Nullable
-	private final Boolean ignoreMissing;
-
-	@Nullable
-	private final String targetField;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private LowercaseProcessor(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.ignoreMissing = builder.ignoreMissing;
-		this.targetField = builder.targetField;
-
-	}
-
-	public static LowercaseProcessor of(Function<Builder, ObjectBuilder<LowercaseProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Lowercase;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code ignore_missing}
-	 */
-	@Nullable
-	public final Boolean ignoreMissing() {
-		return this.ignoreMissing;
-	}
-
-	/**
-	 * API name: {@code target_field}
-	 */
-	@Nullable
-	public final String targetField() {
-		return this.targetField;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.ignoreMissing != null) {
-			generator.writeKey("ignore_missing");
-			generator.write(this.ignoreMissing);
-
-		}
-		if (this.targetField != null) {
-			generator.writeKey("target_field");
-			generator.write(this.targetField);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link LowercaseProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<LowercaseProcessor> {
-		private String field;
-
-		@Nullable
-		private Boolean ignoreMissing;
-
-		@Nullable
-		private String targetField;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_missing}
-		 */
-		public final Builder ignoreMissing(@Nullable Boolean value) {
-			this.ignoreMissing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code target_field}
-		 */
-		public final Builder targetField(@Nullable String value) {
-			this.targetField = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link LowercaseProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public LowercaseProcessor build() {
-			_checkSingleUse();
-
-			return new LowercaseProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link LowercaseProcessor}
-	 */
-	public static final JsonpDeserializer<LowercaseProcessor> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, LowercaseProcessor::setupLowercaseProcessorDeserializer);
-
-	protected static void setupLowercaseProcessorDeserializer(ObjectDeserializer<LowercaseProcessor.Builder> op) {
-		ProcessorBase.setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
-		op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
-
-	}
+    private final String field;
+
+    @Nullable
+    private final Boolean ignoreMissing;
+
+    @Nullable
+    private final String targetField;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private LowercaseProcessor(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.ignoreMissing = builder.ignoreMissing;
+        this.targetField = builder.targetField;
+
+    }
+
+    public static LowercaseProcessor of(Function<Builder, ObjectBuilder<LowercaseProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Lowercase;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code ignore_missing}
+     */
+    @Nullable
+    public final Boolean ignoreMissing() {
+        return this.ignoreMissing;
+    }
+
+    /**
+     * API name: {@code target_field}
+     */
+    @Nullable
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.ignoreMissing != null) {
+            generator.writeKey("ignore_missing");
+            generator.write(this.ignoreMissing);
+
+        }
+        if (this.targetField != null) {
+            generator.writeKey("target_field");
+            generator.write(this.targetField);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link LowercaseProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<LowercaseProcessor> {
+        private String field;
+
+        @Nullable
+        private Boolean ignoreMissing;
+
+        @Nullable
+        private String targetField;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_missing}
+         */
+        public final Builder ignoreMissing(@Nullable Boolean value) {
+            this.ignoreMissing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code target_field}
+         */
+        public final Builder targetField(@Nullable String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link LowercaseProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public LowercaseProcessor build() {
+            _checkSingleUse();
+
+            return new LowercaseProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link LowercaseProcessor}
+     */
+    public static final JsonpDeserializer<LowercaseProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        LowercaseProcessor::setupLowercaseProcessorDeserializer
+    );
+
+    protected static void setupLowercaseProcessorDeserializer(ObjectDeserializer<LowercaseProcessor.Builder> op) {
+        ProcessorBase.setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/OpenSearchIngestAsyncClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/OpenSearchIngestAsyncClient.java
index c7be84e8ef..43c48b460f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/OpenSearchIngestAsyncClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/OpenSearchIngestAsyncClient.java
@@ -32,210 +32,211 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
+import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.TransportOptions;
 import org.opensearch.client.util.ObjectBuilder;
-import java.io.IOException;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 /**
  * Client for the ingest namespace.
  */
 public class OpenSearchIngestAsyncClient extends ApiClient<OpenSearchTransport, OpenSearchIngestAsyncClient> {
 
-	public OpenSearchIngestAsyncClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchIngestAsyncClient(OpenSearchTransport transport,
-                                       @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchIngestAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchIngestAsyncClient(this.transport, transportOptions);
-	}
-
-	// ----- Endpoint: ingest.delete_pipeline
-
-	/**
-	 * Deletes a pipeline.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<DeletePipelineResponse> deletePipeline(DeletePipelineRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeletePipelineRequest, DeletePipelineResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeletePipelineRequest, DeletePipelineResponse, ErrorResponse>)
-						DeletePipelineRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes a pipeline.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeletePipelineRequest}
-	 *
-	 */
-
-	public final CompletableFuture<DeletePipelineResponse> deletePipeline(
-			Function<DeletePipelineRequest.Builder, ObjectBuilder<DeletePipelineRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deletePipeline(fn.apply(new DeletePipelineRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: ingest.geo_ip_stats
-
-	/**
-	 * Returns statistical information about geoip databases
-	 * 
-	 *
-	 */
-	public CompletableFuture<GeoIpStatsResponse> geoIpStats() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(GeoIpStatsRequest._INSTANCE, GeoIpStatsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: ingest.get_pipeline
-
-	/**
-	 * Returns a pipeline.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetPipelineResponse> getPipeline(GetPipelineRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetPipelineRequest, GetPipelineResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetPipelineRequest, GetPipelineResponse, ErrorResponse>) GetPipelineRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns a pipeline.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetPipelineRequest}
-	 *
-	 */
-
-	public final CompletableFuture<GetPipelineResponse> getPipeline(
-			Function<GetPipelineRequest.Builder, ObjectBuilder<GetPipelineRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getPipeline(fn.apply(new GetPipelineRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns a pipeline.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetPipelineResponse> getPipeline() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new GetPipelineRequest.Builder().build(),
-				GetPipelineRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: ingest.processor_grok
-
-	/**
-	 * Returns a list of the built-in patterns.
-	 * 
-	 *
-	 */
-	public CompletableFuture<ProcessorGrokResponse> processorGrok() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(ProcessorGrokRequest._INSTANCE, ProcessorGrokRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: ingest.put_pipeline
-
-	/**
-	 * Creates or updates a pipeline.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<PutPipelineResponse> putPipeline(PutPipelineRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutPipelineRequest, PutPipelineResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutPipelineRequest, PutPipelineResponse, ErrorResponse>) PutPipelineRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates or updates a pipeline.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutPipelineRequest}
-	 *
-	 */
-
-	public final CompletableFuture<PutPipelineResponse> putPipeline(
-			Function<PutPipelineRequest.Builder, ObjectBuilder<PutPipelineRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putPipeline(fn.apply(new PutPipelineRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: ingest.simulate
-
-	/**
-	 * Allows to simulate a pipeline with example documents.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<SimulateResponse> simulate(SimulateRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SimulateRequest, SimulateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<SimulateRequest, SimulateResponse, ErrorResponse>) SimulateRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to simulate a pipeline with example documents.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SimulateRequest}
-	 *
-	 */
-
-	public final CompletableFuture<SimulateResponse> simulate(
-			Function<SimulateRequest.Builder, ObjectBuilder<SimulateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return simulate(fn.apply(new SimulateRequest.Builder()).build());
-	}
-
-	/**
-	 * Allows to simulate a pipeline with example documents.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<SimulateResponse> simulate() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new SimulateRequest.Builder().build(), SimulateRequest._ENDPOINT,
-				this.transportOptions);
-	}
+    public OpenSearchIngestAsyncClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchIngestAsyncClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchIngestAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchIngestAsyncClient(this.transport, transportOptions);
+    }
+
+    // ----- Endpoint: ingest.delete_pipeline
+
+    /**
+     * Deletes a pipeline.
+     *
+     *
+     */
+
+    public CompletableFuture<DeletePipelineResponse> deletePipeline(DeletePipelineRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeletePipelineRequest, DeletePipelineResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeletePipelineRequest,
+            DeletePipelineResponse,
+            ErrorResponse>) DeletePipelineRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes a pipeline.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeletePipelineRequest}
+     *
+     */
+
+    public final CompletableFuture<DeletePipelineResponse> deletePipeline(
+        Function<DeletePipelineRequest.Builder, ObjectBuilder<DeletePipelineRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deletePipeline(fn.apply(new DeletePipelineRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: ingest.geo_ip_stats
+
+    /**
+     * Returns statistical information about geoip databases
+     *
+     *
+     */
+    public CompletableFuture<GeoIpStatsResponse> geoIpStats() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(GeoIpStatsRequest._INSTANCE, GeoIpStatsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: ingest.get_pipeline
+
+    /**
+     * Returns a pipeline.
+     *
+     *
+     */
+
+    public CompletableFuture<GetPipelineResponse> getPipeline(GetPipelineRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetPipelineRequest, GetPipelineResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetPipelineRequest,
+            GetPipelineResponse,
+            ErrorResponse>) GetPipelineRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns a pipeline.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetPipelineRequest}
+     *
+     */
+
+    public final CompletableFuture<GetPipelineResponse> getPipeline(
+        Function<GetPipelineRequest.Builder, ObjectBuilder<GetPipelineRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return getPipeline(fn.apply(new GetPipelineRequest.Builder()).build());
+    }
+
+    /**
+     * Returns a pipeline.
+     *
+     *
+     */
+
+    public CompletableFuture<GetPipelineResponse> getPipeline() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new GetPipelineRequest.Builder().build(),
+            GetPipelineRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: ingest.processor_grok
+
+    /**
+     * Returns a list of the built-in patterns.
+     *
+     *
+     */
+    public CompletableFuture<ProcessorGrokResponse> processorGrok() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(ProcessorGrokRequest._INSTANCE, ProcessorGrokRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: ingest.put_pipeline
+
+    /**
+     * Creates or updates a pipeline.
+     *
+     *
+     */
+
+    public CompletableFuture<PutPipelineResponse> putPipeline(PutPipelineRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutPipelineRequest, PutPipelineResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutPipelineRequest,
+            PutPipelineResponse,
+            ErrorResponse>) PutPipelineRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates or updates a pipeline.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutPipelineRequest}
+     *
+     */
+
+    public final CompletableFuture<PutPipelineResponse> putPipeline(
+        Function<PutPipelineRequest.Builder, ObjectBuilder<PutPipelineRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return putPipeline(fn.apply(new PutPipelineRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: ingest.simulate
+
+    /**
+     * Allows to simulate a pipeline with example documents.
+     *
+     *
+     */
+
+    public CompletableFuture<SimulateResponse> simulate(SimulateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SimulateRequest, SimulateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            SimulateRequest,
+            SimulateResponse,
+            ErrorResponse>) SimulateRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to simulate a pipeline with example documents.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SimulateRequest}
+     *
+     */
+
+    public final CompletableFuture<SimulateResponse> simulate(Function<SimulateRequest.Builder, ObjectBuilder<SimulateRequest>> fn)
+        throws IOException, OpenSearchException {
+        return simulate(fn.apply(new SimulateRequest.Builder()).build());
+    }
+
+    /**
+     * Allows to simulate a pipeline with example documents.
+     *
+     *
+     */
+
+    public CompletableFuture<SimulateResponse> simulate() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new SimulateRequest.Builder().build(), SimulateRequest._ENDPOINT, this.transportOptions);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/OpenSearchIngestClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/OpenSearchIngestClient.java
index 2171b2467f..f8448e2f3a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/OpenSearchIngestClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/OpenSearchIngestClient.java
@@ -32,204 +32,203 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import java.io.IOException;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
+import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.TransportOptions;
 import org.opensearch.client.util.ObjectBuilder;
-import java.io.IOException;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 /**
  * Client for the ingest namespace.
  */
 public class OpenSearchIngestClient extends ApiClient<OpenSearchTransport, OpenSearchIngestClient> {
 
-	public OpenSearchIngestClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchIngestClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchIngestClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchIngestClient(this.transport, transportOptions);
-	}
-
-	// ----- Endpoint: ingest.delete_pipeline
-
-	/**
-	 * Deletes a pipeline.
-	 * 
-	 *
-	 */
-
-	public DeletePipelineResponse deletePipeline(DeletePipelineRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeletePipelineRequest, DeletePipelineResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeletePipelineRequest, DeletePipelineResponse, ErrorResponse>)
-						DeletePipelineRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes a pipeline.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeletePipelineRequest}
-	 *
-	 */
-
-	public final DeletePipelineResponse deletePipeline(
-			Function<DeletePipelineRequest.Builder, ObjectBuilder<DeletePipelineRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deletePipeline(fn.apply(new DeletePipelineRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: ingest.geo_ip_stats
-
-	/**
-	 * Returns statistical information about geoip databases
-	 * 
-	 *
-	 */
-	public GeoIpStatsResponse geoIpStats() throws IOException, OpenSearchException {
-		return this.transport.performRequest(GeoIpStatsRequest._INSTANCE, GeoIpStatsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: ingest.get_pipeline
-
-	/**
-	 * Returns a pipeline.
-	 * 
-	 *
-	 */
-
-	public GetPipelineResponse getPipeline(GetPipelineRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetPipelineRequest, GetPipelineResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetPipelineRequest, GetPipelineResponse, ErrorResponse>) GetPipelineRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns a pipeline.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetPipelineRequest}
-	 *
-	 */
-
-	public final GetPipelineResponse getPipeline(
-			Function<GetPipelineRequest.Builder, ObjectBuilder<GetPipelineRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getPipeline(fn.apply(new GetPipelineRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns a pipeline.
-	 * 
-	 *
-	 */
-
-	public GetPipelineResponse getPipeline() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new GetPipelineRequest.Builder().build(), GetPipelineRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: ingest.processor_grok
-
-	/**
-	 * Returns a list of the built-in patterns.
-	 * 
-	 *
-	 */
-	public ProcessorGrokResponse processorGrok() throws IOException, OpenSearchException {
-		return this.transport.performRequest(ProcessorGrokRequest._INSTANCE, ProcessorGrokRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: ingest.put_pipeline
-
-	/**
-	 * Creates or updates a pipeline.
-	 * 
-	 *
-	 */
-
-	public PutPipelineResponse putPipeline(PutPipelineRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutPipelineRequest, PutPipelineResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutPipelineRequest, PutPipelineResponse, ErrorResponse>) PutPipelineRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates or updates a pipeline.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutPipelineRequest}
-	 *
-	 */
-
-	public final PutPipelineResponse putPipeline(
-			Function<PutPipelineRequest.Builder, ObjectBuilder<PutPipelineRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putPipeline(fn.apply(new PutPipelineRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: ingest.simulate
-
-	/**
-	 * Allows to simulate a pipeline with example documents.
-	 * 
-	 *
-	 */
-
-	public SimulateResponse simulate(SimulateRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SimulateRequest, SimulateResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<SimulateRequest, SimulateResponse, ErrorResponse>) SimulateRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Allows to simulate a pipeline with example documents.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SimulateRequest}
-	 *
-	 */
-
-	public final SimulateResponse simulate(Function<SimulateRequest.Builder, ObjectBuilder<SimulateRequest>> fn)
-			throws IOException, OpenSearchException {
-		return simulate(fn.apply(new SimulateRequest.Builder()).build());
-	}
-
-	/**
-	 * Allows to simulate a pipeline with example documents.
-	 * 
-	 *
-	 */
-
-	public SimulateResponse simulate() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new SimulateRequest.Builder().build(), SimulateRequest._ENDPOINT,
-				this.transportOptions);
-	}
+    public OpenSearchIngestClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchIngestClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchIngestClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchIngestClient(this.transport, transportOptions);
+    }
+
+    // ----- Endpoint: ingest.delete_pipeline
+
+    /**
+     * Deletes a pipeline.
+     *
+     *
+     */
+
+    public DeletePipelineResponse deletePipeline(DeletePipelineRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeletePipelineRequest, DeletePipelineResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeletePipelineRequest,
+            DeletePipelineResponse,
+            ErrorResponse>) DeletePipelineRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes a pipeline.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeletePipelineRequest}
+     *
+     */
+
+    public final DeletePipelineResponse deletePipeline(Function<DeletePipelineRequest.Builder, ObjectBuilder<DeletePipelineRequest>> fn)
+        throws IOException, OpenSearchException {
+        return deletePipeline(fn.apply(new DeletePipelineRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: ingest.geo_ip_stats
+
+    /**
+     * Returns statistical information about geoip databases
+     *
+     *
+     */
+    public GeoIpStatsResponse geoIpStats() throws IOException, OpenSearchException {
+        return this.transport.performRequest(GeoIpStatsRequest._INSTANCE, GeoIpStatsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: ingest.get_pipeline
+
+    /**
+     * Returns a pipeline.
+     *
+     *
+     */
+
+    public GetPipelineResponse getPipeline(GetPipelineRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetPipelineRequest, GetPipelineResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetPipelineRequest,
+            GetPipelineResponse,
+            ErrorResponse>) GetPipelineRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns a pipeline.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetPipelineRequest}
+     *
+     */
+
+    public final GetPipelineResponse getPipeline(Function<GetPipelineRequest.Builder, ObjectBuilder<GetPipelineRequest>> fn)
+        throws IOException, OpenSearchException {
+        return getPipeline(fn.apply(new GetPipelineRequest.Builder()).build());
+    }
+
+    /**
+     * Returns a pipeline.
+     *
+     *
+     */
+
+    public GetPipelineResponse getPipeline() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new GetPipelineRequest.Builder().build(), GetPipelineRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: ingest.processor_grok
+
+    /**
+     * Returns a list of the built-in patterns.
+     *
+     *
+     */
+    public ProcessorGrokResponse processorGrok() throws IOException, OpenSearchException {
+        return this.transport.performRequest(ProcessorGrokRequest._INSTANCE, ProcessorGrokRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: ingest.put_pipeline
+
+    /**
+     * Creates or updates a pipeline.
+     *
+     *
+     */
+
+    public PutPipelineResponse putPipeline(PutPipelineRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutPipelineRequest, PutPipelineResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutPipelineRequest,
+            PutPipelineResponse,
+            ErrorResponse>) PutPipelineRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates or updates a pipeline.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutPipelineRequest}
+     *
+     */
+
+    public final PutPipelineResponse putPipeline(Function<PutPipelineRequest.Builder, ObjectBuilder<PutPipelineRequest>> fn)
+        throws IOException, OpenSearchException {
+        return putPipeline(fn.apply(new PutPipelineRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: ingest.simulate
+
+    /**
+     * Allows to simulate a pipeline with example documents.
+     *
+     *
+     */
+
+    public SimulateResponse simulate(SimulateRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SimulateRequest, SimulateResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            SimulateRequest,
+            SimulateResponse,
+            ErrorResponse>) SimulateRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Allows to simulate a pipeline with example documents.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SimulateRequest}
+     *
+     */
+
+    public final SimulateResponse simulate(Function<SimulateRequest.Builder, ObjectBuilder<SimulateRequest>> fn) throws IOException,
+        OpenSearchException {
+        return simulate(fn.apply(new SimulateRequest.Builder()).build());
+    }
+
+    /**
+     * Allows to simulate a pipeline with example documents.
+     *
+     *
+     */
+
+    public SimulateResponse simulate() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new SimulateRequest.Builder().build(), SimulateRequest._ENDPOINT, this.transportOptions);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/Pipeline.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/Pipeline.java
index 2f19139486..05607db39b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/Pipeline.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/Pipeline.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,236 +45,233 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.Pipeline
 
-
 @JsonpDeserializable
 public class Pipeline implements JsonpSerializable {
-	@Nullable
-	private final String description;
-
-	private final List<Processor> onFailure;
-
-	private final List<Processor> processors;
-
-	@Nullable
-	private final Long version;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Pipeline(Builder builder) {
-
-		this.description = builder.description;
-		this.onFailure = ApiTypeHelper.unmodifiable(builder.onFailure);
-		this.processors = ApiTypeHelper.unmodifiable(builder.processors);
-		this.version = builder.version;
+    @Nullable
+    private final String description;
+
+    private final List<Processor> onFailure;
+
+    private final List<Processor> processors;
+
+    @Nullable
+    private final Long version;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Pipeline(Builder builder) {
+
+        this.description = builder.description;
+        this.onFailure = ApiTypeHelper.unmodifiable(builder.onFailure);
+        this.processors = ApiTypeHelper.unmodifiable(builder.processors);
+        this.version = builder.version;
 
-	}
-
-	public static Pipeline of(Function<Builder, ObjectBuilder<Pipeline>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code description}
-	 */
-	@Nullable
-	public final String description() {
-		return this.description;
-	}
-
-	/**
-	 * API name: {@code on_failure}
-	 */
-	public final List<Processor> onFailure() {
-		return this.onFailure;
-	}
-
-	/**
-	 * API name: {@code processors}
-	 */
-	public final List<Processor> processors() {
-		return this.processors;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.description != null) {
-			generator.writeKey("description");
-			generator.write(this.description);
-
-		}
-		if (ApiTypeHelper.isDefined(this.onFailure)) {
-			generator.writeKey("on_failure");
-			generator.writeStartArray();
-			for (Processor item0 : this.onFailure) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.processors)) {
-			generator.writeKey("processors");
-			generator.writeStartArray();
-			for (Processor item0 : this.processors) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Pipeline}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Pipeline> {
-		@Nullable
-		private String description;
-
-		@Nullable
-		private List<Processor> onFailure;
-
-		@Nullable
-		private List<Processor> processors;
-
-		@Nullable
-		private Long version;
-
-		/**
-		 * API name: {@code description}
-		 */
-		public final Builder description(@Nullable String value) {
-			this.description = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code on_failure}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>onFailure</code>.
-		 */
-		public final Builder onFailure(List<Processor> list) {
-			this.onFailure = _listAddAll(this.onFailure, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code on_failure}
-		 * <p>
-		 * Adds one or more values to <code>onFailure</code>.
-		 */
-		public final Builder onFailure(Processor value, Processor... values) {
-			this.onFailure = _listAdd(this.onFailure, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code on_failure}
-		 * <p>
-		 * Adds a value to <code>onFailure</code> using a builder lambda.
-		 */
-		public final Builder onFailure(Function<Processor.Builder, ObjectBuilder<Processor>> fn) {
-			return onFailure(fn.apply(new Processor.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code processors}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>processors</code>.
-		 */
-		public final Builder processors(List<Processor> list) {
-			this.processors = _listAddAll(this.processors, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code processors}
-		 * <p>
-		 * Adds one or more values to <code>processors</code>.
-		 */
-		public final Builder processors(Processor value, Processor... values) {
-			this.processors = _listAdd(this.processors, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code processors}
-		 * <p>
-		 * Adds a value to <code>processors</code> using a builder lambda.
-		 */
-		public final Builder processors(Function<Processor.Builder, ObjectBuilder<Processor>> fn) {
-			return processors(fn.apply(new Processor.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Pipeline}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Pipeline build() {
-			_checkSingleUse();
-
-			return new Pipeline(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Pipeline}
-	 */
-	public static final JsonpDeserializer<Pipeline> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Pipeline::setupPipelineDeserializer);
-
-	protected static void setupPipelineDeserializer(ObjectDeserializer<Pipeline.Builder> op) {
-
-		op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
-		op.add(Builder::onFailure, JsonpDeserializer.arrayDeserializer(Processor._DESERIALIZER), "on_failure");
-		op.add(Builder::processors, JsonpDeserializer.arrayDeserializer(Processor._DESERIALIZER), "processors");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
-
-	}
+    }
+
+    public static Pipeline of(Function<Builder, ObjectBuilder<Pipeline>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code description}
+     */
+    @Nullable
+    public final String description() {
+        return this.description;
+    }
+
+    /**
+     * API name: {@code on_failure}
+     */
+    public final List<Processor> onFailure() {
+        return this.onFailure;
+    }
+
+    /**
+     * API name: {@code processors}
+     */
+    public final List<Processor> processors() {
+        return this.processors;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.description != null) {
+            generator.writeKey("description");
+            generator.write(this.description);
+
+        }
+        if (ApiTypeHelper.isDefined(this.onFailure)) {
+            generator.writeKey("on_failure");
+            generator.writeStartArray();
+            for (Processor item0 : this.onFailure) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.processors)) {
+            generator.writeKey("processors");
+            generator.writeStartArray();
+            for (Processor item0 : this.processors) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Pipeline}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Pipeline> {
+        @Nullable
+        private String description;
+
+        @Nullable
+        private List<Processor> onFailure;
+
+        @Nullable
+        private List<Processor> processors;
+
+        @Nullable
+        private Long version;
+
+        /**
+         * API name: {@code description}
+         */
+        public final Builder description(@Nullable String value) {
+            this.description = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code on_failure}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>onFailure</code>.
+         */
+        public final Builder onFailure(List<Processor> list) {
+            this.onFailure = _listAddAll(this.onFailure, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code on_failure}
+         * <p>
+         * Adds one or more values to <code>onFailure</code>.
+         */
+        public final Builder onFailure(Processor value, Processor... values) {
+            this.onFailure = _listAdd(this.onFailure, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code on_failure}
+         * <p>
+         * Adds a value to <code>onFailure</code> using a builder lambda.
+         */
+        public final Builder onFailure(Function<Processor.Builder, ObjectBuilder<Processor>> fn) {
+            return onFailure(fn.apply(new Processor.Builder()).build());
+        }
+
+        /**
+         * API name: {@code processors}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>processors</code>.
+         */
+        public final Builder processors(List<Processor> list) {
+            this.processors = _listAddAll(this.processors, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code processors}
+         * <p>
+         * Adds one or more values to <code>processors</code>.
+         */
+        public final Builder processors(Processor value, Processor... values) {
+            this.processors = _listAdd(this.processors, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code processors}
+         * <p>
+         * Adds a value to <code>processors</code> using a builder lambda.
+         */
+        public final Builder processors(Function<Processor.Builder, ObjectBuilder<Processor>> fn) {
+            return processors(fn.apply(new Processor.Builder()).build());
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Pipeline}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Pipeline build() {
+            _checkSingleUse();
+
+            return new Pipeline(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Pipeline}
+     */
+    public static final JsonpDeserializer<Pipeline> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Pipeline::setupPipelineDeserializer
+    );
+
+    protected static void setupPipelineDeserializer(ObjectDeserializer<Pipeline.Builder> op) {
+
+        op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
+        op.add(Builder::onFailure, JsonpDeserializer.arrayDeserializer(Processor._DESERIALIZER), "on_failure");
+        op.add(Builder::processors, JsonpDeserializer.arrayDeserializer(Processor._DESERIALIZER), "processors");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/PipelineProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/PipelineProcessor.java
index 369d7b4f53..64266111d4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/PipelineProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/PipelineProcessor.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,101 +41,98 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: ingest._types.PipelineProcessor
 
-
 @JsonpDeserializable
 public class PipelineProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PipelineProcessor(Builder builder) {
-		super(builder);
-
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-
-	}
-
-	public static PipelineProcessor of(Function<Builder, ObjectBuilder<PipelineProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Pipeline;
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("name");
-		generator.write(this.name);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PipelineProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PipelineProcessor> {
-		private String name;
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PipelineProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PipelineProcessor build() {
-			_checkSingleUse();
-
-			return new PipelineProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PipelineProcessor}
-	 */
-	public static final JsonpDeserializer<PipelineProcessor> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PipelineProcessor::setupPipelineProcessorDeserializer);
-
-	protected static void setupPipelineProcessorDeserializer(ObjectDeserializer<PipelineProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-
-	}
+    private final String name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PipelineProcessor(Builder builder) {
+        super(builder);
+
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+
+    }
+
+    public static PipelineProcessor of(Function<Builder, ObjectBuilder<PipelineProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Pipeline;
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("name");
+        generator.write(this.name);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PipelineProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<PipelineProcessor> {
+        private String name;
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link PipelineProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PipelineProcessor build() {
+            _checkSingleUse();
+
+            return new PipelineProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PipelineProcessor}
+     */
+    public static final JsonpDeserializer<PipelineProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PipelineProcessor::setupPipelineProcessorDeserializer
+    );
+
+    protected static void setupPipelineProcessorDeserializer(ObjectDeserializer<PipelineProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/Processor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/Processor.java
index 8cb703f876..c315527ee8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/Processor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/Processor.java
@@ -32,7 +32,8 @@
 
 package org.opensearch.client.opensearch.ingest;
 
-import org.opensearch.client.opensearch._types.Script;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,1108 +41,1099 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: ingest._types.ProcessorContainer
 
 @JsonpDeserializable
 public class Processor implements TaggedUnion<Processor.Kind, Object>, JsonpSerializable {
 
-	/**
-	 * {@link Processor} variant kinds.
-	 */
-	/**
-	 * {@link Processor} variant kinds.
-	 */
+    /**
+     * {@link Processor} variant kinds.
+     */
+    /**
+     * {@link Processor} variant kinds.
+     */
 
-	public enum Kind implements JsonEnum {
-		Attachment("attachment"),
+    public enum Kind implements JsonEnum {
+        Attachment("attachment"),
 
-		Append("append"),
+        Append("append"),
 
-		Csv("csv"),
+        Csv("csv"),
 
-		Convert("convert"),
+        Convert("convert"),
 
-		Date("date"),
+        Date("date"),
 
-		DateIndexName("date_index_name"),
+        DateIndexName("date_index_name"),
 
-		DotExpander("dot_expander"),
+        DotExpander("dot_expander"),
 
-		Fail("fail"),
+        Fail("fail"),
 
-		Foreach("foreach"),
+        Foreach("foreach"),
 
-		Json("json"),
+        Json("json"),
 
-		UserAgent("user_agent"),
+        UserAgent("user_agent"),
 
-		Kv("kv"),
+        Kv("kv"),
 
-		Geoip("geoip"),
+        Geoip("geoip"),
 
-		Grok("grok"),
+        Grok("grok"),
 
-		Gsub("gsub"),
+        Gsub("gsub"),
 
-		Join("join"),
+        Join("join"),
 
-		Lowercase("lowercase"),
+        Lowercase("lowercase"),
 
-		Remove("remove"),
+        Remove("remove"),
 
-		Rename("rename"),
+        Rename("rename"),
 
-		Script("script"),
+        Script("script"),
 
-		Set("set"),
+        Set("set"),
 
-		Sort("sort"),
+        Sort("sort"),
 
-		Split("split"),
+        Split("split"),
 
-		Trim("trim"),
+        Trim("trim"),
 
-		Uppercase("uppercase"),
+        Uppercase("uppercase"),
 
-		Urldecode("urldecode"),
+        Urldecode("urldecode"),
 
-		Bytes("bytes"),
+        Bytes("bytes"),
 
-		Dissect("dissect"),
+        Dissect("dissect"),
 
-		SetSecurityUser("set_security_user"),
+        SetSecurityUser("set_security_user"),
 
-		Pipeline("pipeline"),
+        Pipeline("pipeline"),
 
-		Drop("drop"),
+        Drop("drop"),
 
-		Circle("circle"),
+        Circle("circle"),
 
-		Inference("inference"),
+        Inference("inference"),
 
-		;
+        ;
 
-		private final String jsonValue;
+        private final String jsonValue;
 
-		Kind(String jsonValue) {
-			this.jsonValue = jsonValue;
-		}
+        Kind(String jsonValue) {
+            this.jsonValue = jsonValue;
+        }
 
-		public String jsonValue() {
-			return this.jsonValue;
-		}
+        public String jsonValue() {
+            return this.jsonValue;
+        }
 
-	}
+    }
 
-	private final Kind _kind;
-	private final Object _value;
+    private final Kind _kind;
+    private final Object _value;
 
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
 
-	@Override
-	public final Object _get() {
-		return _value;
-	}
+    @Override
+    public final Object _get() {
+        return _value;
+    }
 
-	public Processor(ProcessorVariant value) {
+    public Processor(ProcessorVariant value) {
 
-		this._kind = ApiTypeHelper.requireNonNull(value._processorKind(), this, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
+        this._kind = ApiTypeHelper.requireNonNull(value._processorKind(), this, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(value, this, "<variant value>");
 
-	}
+    }
 
-	private Processor(Builder builder) {
+    private Processor(Builder builder) {
 
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
 
-	}
+    }
 
-	public static Processor of(Function<Builder, ObjectBuilder<Processor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static Processor of(Function<Builder, ObjectBuilder<Processor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Is this variant instance of kind {@code attachment}?
-	 */
-	public boolean isAttachment() {
-		return _kind == Kind.Attachment;
-	}
+    /**
+     * Is this variant instance of kind {@code attachment}?
+     */
+    public boolean isAttachment() {
+        return _kind == Kind.Attachment;
+    }
 
-	/**
-	 * Get the {@code attachment} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code attachment} kind.
-	 */
-	public AttachmentProcessor attachment() {
-		return TaggedUnionUtils.get(this, Kind.Attachment);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code append}?
-	 */
-	public boolean isAppend() {
-		return _kind == Kind.Append;
-	}
-
-	/**
-	 * Get the {@code append} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code append} kind.
-	 */
-	public AppendProcessor append() {
-		return TaggedUnionUtils.get(this, Kind.Append);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code csv}?
-	 */
-	public boolean isCsv() {
-		return _kind == Kind.Csv;
-	}
-
-	/**
-	 * Get the {@code csv} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code csv} kind.
-	 */
-	public CsvProcessor csv() {
-		return TaggedUnionUtils.get(this, Kind.Csv);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code convert}?
-	 */
-	public boolean isConvert() {
-		return _kind == Kind.Convert;
-	}
-
-	/**
-	 * Get the {@code convert} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code convert} kind.
-	 */
-	public ConvertProcessor convert() {
-		return TaggedUnionUtils.get(this, Kind.Convert);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code date}?
-	 */
-	public boolean isDate() {
-		return _kind == Kind.Date;
-	}
-
-	/**
-	 * Get the {@code date} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code date} kind.
-	 */
-	public DateProcessor date() {
-		return TaggedUnionUtils.get(this, Kind.Date);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code date_index_name}?
-	 */
-	public boolean isDateIndexName() {
-		return _kind == Kind.DateIndexName;
-	}
-
-	/**
-	 * Get the {@code date_index_name} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code date_index_name}
-	 *             kind.
-	 */
-	public DateIndexNameProcessor dateIndexName() {
-		return TaggedUnionUtils.get(this, Kind.DateIndexName);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code dot_expander}?
-	 */
-	public boolean isDotExpander() {
-		return _kind == Kind.DotExpander;
-	}
-
-	/**
-	 * Get the {@code dot_expander} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code dot_expander} kind.
-	 */
-	public DotExpanderProcessor dotExpander() {
-		return TaggedUnionUtils.get(this, Kind.DotExpander);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code fail}?
-	 */
-	public boolean isFail() {
-		return _kind == Kind.Fail;
-	}
-
-	/**
-	 * Get the {@code fail} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code fail} kind.
-	 */
-	public FailProcessor fail() {
-		return TaggedUnionUtils.get(this, Kind.Fail);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code foreach}?
-	 */
-	public boolean isForeach() {
-		return _kind == Kind.Foreach;
-	}
-
-	/**
-	 * Get the {@code foreach} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code foreach} kind.
-	 */
-	public ForeachProcessor foreach() {
-		return TaggedUnionUtils.get(this, Kind.Foreach);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code json}?
-	 */
-	public boolean isJson() {
-		return _kind == Kind.Json;
-	}
-
-	/**
-	 * Get the {@code json} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code json} kind.
-	 */
-	public JsonProcessor json() {
-		return TaggedUnionUtils.get(this, Kind.Json);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code user_agent}?
-	 */
-	public boolean isUserAgent() {
-		return _kind == Kind.UserAgent;
-	}
-
-	/**
-	 * Get the {@code user_agent} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code user_agent} kind.
-	 */
-	public UserAgentProcessor userAgent() {
-		return TaggedUnionUtils.get(this, Kind.UserAgent);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code kv}?
-	 */
-	public boolean isKv() {
-		return _kind == Kind.Kv;
-	}
-
-	/**
-	 * Get the {@code kv} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code kv} kind.
-	 */
-	public KeyValueProcessor kv() {
-		return TaggedUnionUtils.get(this, Kind.Kv);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code geoip}?
-	 */
-	public boolean isGeoip() {
-		return _kind == Kind.Geoip;
-	}
-
-	/**
-	 * Get the {@code geoip} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code geoip} kind.
-	 */
-	public GeoIpProcessor geoip() {
-		return TaggedUnionUtils.get(this, Kind.Geoip);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code grok}?
-	 */
-	public boolean isGrok() {
-		return _kind == Kind.Grok;
-	}
-
-	/**
-	 * Get the {@code grok} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code grok} kind.
-	 */
-	public GrokProcessor grok() {
-		return TaggedUnionUtils.get(this, Kind.Grok);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code gsub}?
-	 */
-	public boolean isGsub() {
-		return _kind == Kind.Gsub;
-	}
-
-	/**
-	 * Get the {@code gsub} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code gsub} kind.
-	 */
-	public GsubProcessor gsub() {
-		return TaggedUnionUtils.get(this, Kind.Gsub);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code join}?
-	 */
-	public boolean isJoin() {
-		return _kind == Kind.Join;
-	}
-
-	/**
-	 * Get the {@code join} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code join} kind.
-	 */
-	public JoinProcessor join() {
-		return TaggedUnionUtils.get(this, Kind.Join);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code lowercase}?
-	 */
-	public boolean isLowercase() {
-		return _kind == Kind.Lowercase;
-	}
-
-	/**
-	 * Get the {@code lowercase} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code lowercase} kind.
-	 */
-	public LowercaseProcessor lowercase() {
-		return TaggedUnionUtils.get(this, Kind.Lowercase);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code remove}?
-	 */
-	public boolean isRemove() {
-		return _kind == Kind.Remove;
-	}
-
-	/**
-	 * Get the {@code remove} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code remove} kind.
-	 */
-	public RemoveProcessor remove() {
-		return TaggedUnionUtils.get(this, Kind.Remove);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code rename}?
-	 */
-	public boolean isRename() {
-		return _kind == Kind.Rename;
-	}
-
-	/**
-	 * Get the {@code rename} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code rename} kind.
-	 */
-	public RenameProcessor rename() {
-		return TaggedUnionUtils.get(this, Kind.Rename);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code script}?
-	 */
-	public boolean isScript() {
-		return _kind == Kind.Script;
-	}
-
-	/**
-	 * Get the {@code script} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code script} kind.
-	 */
-	public Script script() {
-		return TaggedUnionUtils.get(this, Kind.Script);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code set}?
-	 */
-	public boolean isSet() {
-		return _kind == Kind.Set;
-	}
-
-	/**
-	 * Get the {@code set} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code set} kind.
-	 */
-	public SetProcessor set() {
-		return TaggedUnionUtils.get(this, Kind.Set);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code sort}?
-	 */
-	public boolean isSort() {
-		return _kind == Kind.Sort;
-	}
-
-	/**
-	 * Get the {@code sort} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code sort} kind.
-	 */
-	public SortProcessor sort() {
-		return TaggedUnionUtils.get(this, Kind.Sort);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code split}?
-	 */
-	public boolean isSplit() {
-		return _kind == Kind.Split;
-	}
-
-	/**
-	 * Get the {@code split} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code split} kind.
-	 */
-	public SplitProcessor split() {
-		return TaggedUnionUtils.get(this, Kind.Split);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code trim}?
-	 */
-	public boolean isTrim() {
-		return _kind == Kind.Trim;
-	}
-
-	/**
-	 * Get the {@code trim} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code trim} kind.
-	 */
-	public TrimProcessor trim() {
-		return TaggedUnionUtils.get(this, Kind.Trim);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code uppercase}?
-	 */
-	public boolean isUppercase() {
-		return _kind == Kind.Uppercase;
-	}
-
-	/**
-	 * Get the {@code uppercase} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code uppercase} kind.
-	 */
-	public UppercaseProcessor uppercase() {
-		return TaggedUnionUtils.get(this, Kind.Uppercase);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code urldecode}?
-	 */
-	public boolean isUrldecode() {
-		return _kind == Kind.Urldecode;
-	}
-
-	/**
-	 * Get the {@code urldecode} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code urldecode} kind.
-	 */
-	public UrlDecodeProcessor urldecode() {
-		return TaggedUnionUtils.get(this, Kind.Urldecode);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code bytes}?
-	 */
-	public boolean isBytes() {
-		return _kind == Kind.Bytes;
-	}
-
-	/**
-	 * Get the {@code bytes} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code bytes} kind.
-	 */
-	public BytesProcessor bytes() {
-		return TaggedUnionUtils.get(this, Kind.Bytes);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code dissect}?
-	 */
-	public boolean isDissect() {
-		return _kind == Kind.Dissect;
-	}
-
-	/**
-	 * Get the {@code dissect} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code dissect} kind.
-	 */
-	public DissectProcessor dissect() {
-		return TaggedUnionUtils.get(this, Kind.Dissect);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code set_security_user}?
-	 */
-	public boolean isSetSecurityUser() {
-		return _kind == Kind.SetSecurityUser;
-	}
-
-	/**
-	 * Get the {@code set_security_user} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code set_security_user}
-	 *             kind.
-	 */
-	public SetSecurityUserProcessor setSecurityUser() {
-		return TaggedUnionUtils.get(this, Kind.SetSecurityUser);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code pipeline}?
-	 */
-	public boolean isPipeline() {
-		return _kind == Kind.Pipeline;
-	}
-
-	/**
-	 * Get the {@code pipeline} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code pipeline} kind.
-	 */
-	public PipelineProcessor pipeline() {
-		return TaggedUnionUtils.get(this, Kind.Pipeline);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code drop}?
-	 */
-	public boolean isDrop() {
-		return _kind == Kind.Drop;
-	}
-
-	/**
-	 * Get the {@code drop} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code drop} kind.
-	 */
-	public DropProcessor drop() {
-		return TaggedUnionUtils.get(this, Kind.Drop);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code circle}?
-	 */
-	public boolean isCircle() {
-		return _kind == Kind.Circle;
-	}
-
-	/**
-	 * Get the {@code circle} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code circle} kind.
-	 */
-	public CircleProcessor circle() {
-		return TaggedUnionUtils.get(this, Kind.Circle);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code inference}?
-	 */
-	public boolean isInference() {
-		return _kind == Kind.Inference;
-	}
-
-	/**
-	 * Get the {@code inference} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code inference} kind.
-	 */
-	public InferenceProcessor inference() {
-		return TaggedUnionUtils.get(this, Kind.Inference);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeStartObject();
-
-		generator.writeKey(_kind.jsonValue());
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		}
-
-		generator.writeEnd();
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Processor> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<Processor> attachment(AttachmentProcessor v) {
-			this._kind = Kind.Attachment;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> attachment(
-				Function<AttachmentProcessor.Builder, ObjectBuilder<AttachmentProcessor>> fn) {
-			return this.attachment(fn.apply(new AttachmentProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> append(AppendProcessor v) {
-			this._kind = Kind.Append;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> append(Function<AppendProcessor.Builder, ObjectBuilder<AppendProcessor>> fn) {
-			return this.append(fn.apply(new AppendProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> csv(CsvProcessor v) {
-			this._kind = Kind.Csv;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> csv(Function<CsvProcessor.Builder, ObjectBuilder<CsvProcessor>> fn) {
-			return this.csv(fn.apply(new CsvProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> convert(ConvertProcessor v) {
-			this._kind = Kind.Convert;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> convert(
-				Function<ConvertProcessor.Builder, ObjectBuilder<ConvertProcessor>> fn) {
-			return this.convert(fn.apply(new ConvertProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> date(DateProcessor v) {
-			this._kind = Kind.Date;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> date(Function<DateProcessor.Builder, ObjectBuilder<DateProcessor>> fn) {
-			return this.date(fn.apply(new DateProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> dateIndexName(DateIndexNameProcessor v) {
-			this._kind = Kind.DateIndexName;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> dateIndexName(
-				Function<DateIndexNameProcessor.Builder, ObjectBuilder<DateIndexNameProcessor>> fn) {
-			return this.dateIndexName(fn.apply(new DateIndexNameProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> dotExpander(DotExpanderProcessor v) {
-			this._kind = Kind.DotExpander;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> dotExpander(
-				Function<DotExpanderProcessor.Builder, ObjectBuilder<DotExpanderProcessor>> fn) {
-			return this.dotExpander(fn.apply(new DotExpanderProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> fail(FailProcessor v) {
-			this._kind = Kind.Fail;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> fail(Function<FailProcessor.Builder, ObjectBuilder<FailProcessor>> fn) {
-			return this.fail(fn.apply(new FailProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> foreach(ForeachProcessor v) {
-			this._kind = Kind.Foreach;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> foreach(
-				Function<ForeachProcessor.Builder, ObjectBuilder<ForeachProcessor>> fn) {
-			return this.foreach(fn.apply(new ForeachProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> json(JsonProcessor v) {
-			this._kind = Kind.Json;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> json(Function<JsonProcessor.Builder, ObjectBuilder<JsonProcessor>> fn) {
-			return this.json(fn.apply(new JsonProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> userAgent(UserAgentProcessor v) {
-			this._kind = Kind.UserAgent;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> userAgent(
-				Function<UserAgentProcessor.Builder, ObjectBuilder<UserAgentProcessor>> fn) {
-			return this.userAgent(fn.apply(new UserAgentProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> kv(KeyValueProcessor v) {
-			this._kind = Kind.Kv;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> kv(Function<KeyValueProcessor.Builder, ObjectBuilder<KeyValueProcessor>> fn) {
-			return this.kv(fn.apply(new KeyValueProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> geoip(GeoIpProcessor v) {
-			this._kind = Kind.Geoip;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> geoip(Function<GeoIpProcessor.Builder, ObjectBuilder<GeoIpProcessor>> fn) {
-			return this.geoip(fn.apply(new GeoIpProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> grok(GrokProcessor v) {
-			this._kind = Kind.Grok;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> grok(Function<GrokProcessor.Builder, ObjectBuilder<GrokProcessor>> fn) {
-			return this.grok(fn.apply(new GrokProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> gsub(GsubProcessor v) {
-			this._kind = Kind.Gsub;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> gsub(Function<GsubProcessor.Builder, ObjectBuilder<GsubProcessor>> fn) {
-			return this.gsub(fn.apply(new GsubProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> join(JoinProcessor v) {
-			this._kind = Kind.Join;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> join(Function<JoinProcessor.Builder, ObjectBuilder<JoinProcessor>> fn) {
-			return this.join(fn.apply(new JoinProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> lowercase(LowercaseProcessor v) {
-			this._kind = Kind.Lowercase;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> lowercase(
-				Function<LowercaseProcessor.Builder, ObjectBuilder<LowercaseProcessor>> fn) {
-			return this.lowercase(fn.apply(new LowercaseProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> remove(RemoveProcessor v) {
-			this._kind = Kind.Remove;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> remove(Function<RemoveProcessor.Builder, ObjectBuilder<RemoveProcessor>> fn) {
-			return this.remove(fn.apply(new RemoveProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> rename(RenameProcessor v) {
-			this._kind = Kind.Rename;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> rename(Function<RenameProcessor.Builder, ObjectBuilder<RenameProcessor>> fn) {
-			return this.rename(fn.apply(new RenameProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> script(Script v) {
-			this._kind = Kind.Script;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
-			return this.script(fn.apply(new Script.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> set(SetProcessor v) {
-			this._kind = Kind.Set;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> set(Function<SetProcessor.Builder, ObjectBuilder<SetProcessor>> fn) {
-			return this.set(fn.apply(new SetProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> sort(SortProcessor v) {
-			this._kind = Kind.Sort;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> sort(Function<SortProcessor.Builder, ObjectBuilder<SortProcessor>> fn) {
-			return this.sort(fn.apply(new SortProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> split(SplitProcessor v) {
-			this._kind = Kind.Split;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> split(Function<SplitProcessor.Builder, ObjectBuilder<SplitProcessor>> fn) {
-			return this.split(fn.apply(new SplitProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> trim(TrimProcessor v) {
-			this._kind = Kind.Trim;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> trim(Function<TrimProcessor.Builder, ObjectBuilder<TrimProcessor>> fn) {
-			return this.trim(fn.apply(new TrimProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> uppercase(UppercaseProcessor v) {
-			this._kind = Kind.Uppercase;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> uppercase(
-				Function<UppercaseProcessor.Builder, ObjectBuilder<UppercaseProcessor>> fn) {
-			return this.uppercase(fn.apply(new UppercaseProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> urldecode(UrlDecodeProcessor v) {
-			this._kind = Kind.Urldecode;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> urldecode(
-				Function<UrlDecodeProcessor.Builder, ObjectBuilder<UrlDecodeProcessor>> fn) {
-			return this.urldecode(fn.apply(new UrlDecodeProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> bytes(BytesProcessor v) {
-			this._kind = Kind.Bytes;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> bytes(Function<BytesProcessor.Builder, ObjectBuilder<BytesProcessor>> fn) {
-			return this.bytes(fn.apply(new BytesProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> dissect(DissectProcessor v) {
-			this._kind = Kind.Dissect;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> dissect(
-				Function<DissectProcessor.Builder, ObjectBuilder<DissectProcessor>> fn) {
-			return this.dissect(fn.apply(new DissectProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> setSecurityUser(SetSecurityUserProcessor v) {
-			this._kind = Kind.SetSecurityUser;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> setSecurityUser(
-				Function<SetSecurityUserProcessor.Builder, ObjectBuilder<SetSecurityUserProcessor>> fn) {
-			return this.setSecurityUser(fn.apply(new SetSecurityUserProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> pipeline(PipelineProcessor v) {
-			this._kind = Kind.Pipeline;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> pipeline(
-				Function<PipelineProcessor.Builder, ObjectBuilder<PipelineProcessor>> fn) {
-			return this.pipeline(fn.apply(new PipelineProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> drop(DropProcessor v) {
-			this._kind = Kind.Drop;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> drop(Function<DropProcessor.Builder, ObjectBuilder<DropProcessor>> fn) {
-			return this.drop(fn.apply(new DropProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> circle(CircleProcessor v) {
-			this._kind = Kind.Circle;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> circle(Function<CircleProcessor.Builder, ObjectBuilder<CircleProcessor>> fn) {
-			return this.circle(fn.apply(new CircleProcessor.Builder()).build());
-		}
-
-		public ObjectBuilder<Processor> inference(InferenceProcessor v) {
-			this._kind = Kind.Inference;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<Processor> inference(
-				Function<InferenceProcessor.Builder, ObjectBuilder<InferenceProcessor>> fn) {
-			return this.inference(fn.apply(new InferenceProcessor.Builder()).build());
-		}
-
-		public Processor build() {
-			_checkSingleUse();
-			return new Processor(this);
-		}
-
-	}
-
-	protected static void setupProcessorDeserializer(ObjectDeserializer<Builder> op) {
-
-		op.add(Builder::attachment, AttachmentProcessor._DESERIALIZER, "attachment");
-		op.add(Builder::append, AppendProcessor._DESERIALIZER, "append");
-		op.add(Builder::csv, CsvProcessor._DESERIALIZER, "csv");
-		op.add(Builder::convert, ConvertProcessor._DESERIALIZER, "convert");
-		op.add(Builder::date, DateProcessor._DESERIALIZER, "date");
-		op.add(Builder::dateIndexName, DateIndexNameProcessor._DESERIALIZER, "date_index_name");
-		op.add(Builder::dotExpander, DotExpanderProcessor._DESERIALIZER, "dot_expander");
-		op.add(Builder::fail, FailProcessor._DESERIALIZER, "fail");
-		op.add(Builder::foreach, ForeachProcessor._DESERIALIZER, "foreach");
-		op.add(Builder::json, JsonProcessor._DESERIALIZER, "json");
-		op.add(Builder::userAgent, UserAgentProcessor._DESERIALIZER, "user_agent");
-		op.add(Builder::kv, KeyValueProcessor._DESERIALIZER, "kv");
-		op.add(Builder::geoip, GeoIpProcessor._DESERIALIZER, "geoip");
-		op.add(Builder::grok, GrokProcessor._DESERIALIZER, "grok");
-		op.add(Builder::gsub, GsubProcessor._DESERIALIZER, "gsub");
-		op.add(Builder::join, JoinProcessor._DESERIALIZER, "join");
-		op.add(Builder::lowercase, LowercaseProcessor._DESERIALIZER, "lowercase");
-		op.add(Builder::remove, RemoveProcessor._DESERIALIZER, "remove");
-		op.add(Builder::rename, RenameProcessor._DESERIALIZER, "rename");
-		op.add(Builder::script, Script._DESERIALIZER, "script");
-		op.add(Builder::set, SetProcessor._DESERIALIZER, "set");
-		op.add(Builder::sort, SortProcessor._DESERIALIZER, "sort");
-		op.add(Builder::split, SplitProcessor._DESERIALIZER, "split");
-		op.add(Builder::trim, TrimProcessor._DESERIALIZER, "trim");
-		op.add(Builder::uppercase, UppercaseProcessor._DESERIALIZER, "uppercase");
-		op.add(Builder::urldecode, UrlDecodeProcessor._DESERIALIZER, "urldecode");
-		op.add(Builder::bytes, BytesProcessor._DESERIALIZER, "bytes");
-		op.add(Builder::dissect, DissectProcessor._DESERIALIZER, "dissect");
-		op.add(Builder::setSecurityUser, SetSecurityUserProcessor._DESERIALIZER, "set_security_user");
-		op.add(Builder::pipeline, PipelineProcessor._DESERIALIZER, "pipeline");
-		op.add(Builder::drop, DropProcessor._DESERIALIZER, "drop");
-		op.add(Builder::circle, CircleProcessor._DESERIALIZER, "circle");
-		op.add(Builder::inference, InferenceProcessor._DESERIALIZER, "inference");
-
-	}
-
-	public static final JsonpDeserializer<Processor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Processor::setupProcessorDeserializer, Builder::build);
+    /**
+     * Get the {@code attachment} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code attachment} kind.
+     */
+    public AttachmentProcessor attachment() {
+        return TaggedUnionUtils.get(this, Kind.Attachment);
+    }
+
+    /**
+     * Is this variant instance of kind {@code append}?
+     */
+    public boolean isAppend() {
+        return _kind == Kind.Append;
+    }
+
+    /**
+     * Get the {@code append} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code append} kind.
+     */
+    public AppendProcessor append() {
+        return TaggedUnionUtils.get(this, Kind.Append);
+    }
+
+    /**
+     * Is this variant instance of kind {@code csv}?
+     */
+    public boolean isCsv() {
+        return _kind == Kind.Csv;
+    }
+
+    /**
+     * Get the {@code csv} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code csv} kind.
+     */
+    public CsvProcessor csv() {
+        return TaggedUnionUtils.get(this, Kind.Csv);
+    }
+
+    /**
+     * Is this variant instance of kind {@code convert}?
+     */
+    public boolean isConvert() {
+        return _kind == Kind.Convert;
+    }
+
+    /**
+     * Get the {@code convert} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code convert} kind.
+     */
+    public ConvertProcessor convert() {
+        return TaggedUnionUtils.get(this, Kind.Convert);
+    }
+
+    /**
+     * Is this variant instance of kind {@code date}?
+     */
+    public boolean isDate() {
+        return _kind == Kind.Date;
+    }
+
+    /**
+     * Get the {@code date} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code date} kind.
+     */
+    public DateProcessor date() {
+        return TaggedUnionUtils.get(this, Kind.Date);
+    }
+
+    /**
+     * Is this variant instance of kind {@code date_index_name}?
+     */
+    public boolean isDateIndexName() {
+        return _kind == Kind.DateIndexName;
+    }
+
+    /**
+     * Get the {@code date_index_name} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code date_index_name}
+     *             kind.
+     */
+    public DateIndexNameProcessor dateIndexName() {
+        return TaggedUnionUtils.get(this, Kind.DateIndexName);
+    }
+
+    /**
+     * Is this variant instance of kind {@code dot_expander}?
+     */
+    public boolean isDotExpander() {
+        return _kind == Kind.DotExpander;
+    }
+
+    /**
+     * Get the {@code dot_expander} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code dot_expander} kind.
+     */
+    public DotExpanderProcessor dotExpander() {
+        return TaggedUnionUtils.get(this, Kind.DotExpander);
+    }
+
+    /**
+     * Is this variant instance of kind {@code fail}?
+     */
+    public boolean isFail() {
+        return _kind == Kind.Fail;
+    }
+
+    /**
+     * Get the {@code fail} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code fail} kind.
+     */
+    public FailProcessor fail() {
+        return TaggedUnionUtils.get(this, Kind.Fail);
+    }
+
+    /**
+     * Is this variant instance of kind {@code foreach}?
+     */
+    public boolean isForeach() {
+        return _kind == Kind.Foreach;
+    }
+
+    /**
+     * Get the {@code foreach} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code foreach} kind.
+     */
+    public ForeachProcessor foreach() {
+        return TaggedUnionUtils.get(this, Kind.Foreach);
+    }
+
+    /**
+     * Is this variant instance of kind {@code json}?
+     */
+    public boolean isJson() {
+        return _kind == Kind.Json;
+    }
+
+    /**
+     * Get the {@code json} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code json} kind.
+     */
+    public JsonProcessor json() {
+        return TaggedUnionUtils.get(this, Kind.Json);
+    }
+
+    /**
+     * Is this variant instance of kind {@code user_agent}?
+     */
+    public boolean isUserAgent() {
+        return _kind == Kind.UserAgent;
+    }
+
+    /**
+     * Get the {@code user_agent} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code user_agent} kind.
+     */
+    public UserAgentProcessor userAgent() {
+        return TaggedUnionUtils.get(this, Kind.UserAgent);
+    }
+
+    /**
+     * Is this variant instance of kind {@code kv}?
+     */
+    public boolean isKv() {
+        return _kind == Kind.Kv;
+    }
+
+    /**
+     * Get the {@code kv} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code kv} kind.
+     */
+    public KeyValueProcessor kv() {
+        return TaggedUnionUtils.get(this, Kind.Kv);
+    }
+
+    /**
+     * Is this variant instance of kind {@code geoip}?
+     */
+    public boolean isGeoip() {
+        return _kind == Kind.Geoip;
+    }
+
+    /**
+     * Get the {@code geoip} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code geoip} kind.
+     */
+    public GeoIpProcessor geoip() {
+        return TaggedUnionUtils.get(this, Kind.Geoip);
+    }
+
+    /**
+     * Is this variant instance of kind {@code grok}?
+     */
+    public boolean isGrok() {
+        return _kind == Kind.Grok;
+    }
+
+    /**
+     * Get the {@code grok} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code grok} kind.
+     */
+    public GrokProcessor grok() {
+        return TaggedUnionUtils.get(this, Kind.Grok);
+    }
+
+    /**
+     * Is this variant instance of kind {@code gsub}?
+     */
+    public boolean isGsub() {
+        return _kind == Kind.Gsub;
+    }
+
+    /**
+     * Get the {@code gsub} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code gsub} kind.
+     */
+    public GsubProcessor gsub() {
+        return TaggedUnionUtils.get(this, Kind.Gsub);
+    }
+
+    /**
+     * Is this variant instance of kind {@code join}?
+     */
+    public boolean isJoin() {
+        return _kind == Kind.Join;
+    }
+
+    /**
+     * Get the {@code join} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code join} kind.
+     */
+    public JoinProcessor join() {
+        return TaggedUnionUtils.get(this, Kind.Join);
+    }
+
+    /**
+     * Is this variant instance of kind {@code lowercase}?
+     */
+    public boolean isLowercase() {
+        return _kind == Kind.Lowercase;
+    }
+
+    /**
+     * Get the {@code lowercase} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code lowercase} kind.
+     */
+    public LowercaseProcessor lowercase() {
+        return TaggedUnionUtils.get(this, Kind.Lowercase);
+    }
+
+    /**
+     * Is this variant instance of kind {@code remove}?
+     */
+    public boolean isRemove() {
+        return _kind == Kind.Remove;
+    }
+
+    /**
+     * Get the {@code remove} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code remove} kind.
+     */
+    public RemoveProcessor remove() {
+        return TaggedUnionUtils.get(this, Kind.Remove);
+    }
+
+    /**
+     * Is this variant instance of kind {@code rename}?
+     */
+    public boolean isRename() {
+        return _kind == Kind.Rename;
+    }
+
+    /**
+     * Get the {@code rename} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code rename} kind.
+     */
+    public RenameProcessor rename() {
+        return TaggedUnionUtils.get(this, Kind.Rename);
+    }
+
+    /**
+     * Is this variant instance of kind {@code script}?
+     */
+    public boolean isScript() {
+        return _kind == Kind.Script;
+    }
+
+    /**
+     * Get the {@code script} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code script} kind.
+     */
+    public Script script() {
+        return TaggedUnionUtils.get(this, Kind.Script);
+    }
+
+    /**
+     * Is this variant instance of kind {@code set}?
+     */
+    public boolean isSet() {
+        return _kind == Kind.Set;
+    }
+
+    /**
+     * Get the {@code set} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code set} kind.
+     */
+    public SetProcessor set() {
+        return TaggedUnionUtils.get(this, Kind.Set);
+    }
+
+    /**
+     * Is this variant instance of kind {@code sort}?
+     */
+    public boolean isSort() {
+        return _kind == Kind.Sort;
+    }
+
+    /**
+     * Get the {@code sort} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code sort} kind.
+     */
+    public SortProcessor sort() {
+        return TaggedUnionUtils.get(this, Kind.Sort);
+    }
+
+    /**
+     * Is this variant instance of kind {@code split}?
+     */
+    public boolean isSplit() {
+        return _kind == Kind.Split;
+    }
+
+    /**
+     * Get the {@code split} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code split} kind.
+     */
+    public SplitProcessor split() {
+        return TaggedUnionUtils.get(this, Kind.Split);
+    }
+
+    /**
+     * Is this variant instance of kind {@code trim}?
+     */
+    public boolean isTrim() {
+        return _kind == Kind.Trim;
+    }
+
+    /**
+     * Get the {@code trim} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code trim} kind.
+     */
+    public TrimProcessor trim() {
+        return TaggedUnionUtils.get(this, Kind.Trim);
+    }
+
+    /**
+     * Is this variant instance of kind {@code uppercase}?
+     */
+    public boolean isUppercase() {
+        return _kind == Kind.Uppercase;
+    }
+
+    /**
+     * Get the {@code uppercase} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code uppercase} kind.
+     */
+    public UppercaseProcessor uppercase() {
+        return TaggedUnionUtils.get(this, Kind.Uppercase);
+    }
+
+    /**
+     * Is this variant instance of kind {@code urldecode}?
+     */
+    public boolean isUrldecode() {
+        return _kind == Kind.Urldecode;
+    }
+
+    /**
+     * Get the {@code urldecode} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code urldecode} kind.
+     */
+    public UrlDecodeProcessor urldecode() {
+        return TaggedUnionUtils.get(this, Kind.Urldecode);
+    }
+
+    /**
+     * Is this variant instance of kind {@code bytes}?
+     */
+    public boolean isBytes() {
+        return _kind == Kind.Bytes;
+    }
+
+    /**
+     * Get the {@code bytes} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code bytes} kind.
+     */
+    public BytesProcessor bytes() {
+        return TaggedUnionUtils.get(this, Kind.Bytes);
+    }
+
+    /**
+     * Is this variant instance of kind {@code dissect}?
+     */
+    public boolean isDissect() {
+        return _kind == Kind.Dissect;
+    }
+
+    /**
+     * Get the {@code dissect} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code dissect} kind.
+     */
+    public DissectProcessor dissect() {
+        return TaggedUnionUtils.get(this, Kind.Dissect);
+    }
+
+    /**
+     * Is this variant instance of kind {@code set_security_user}?
+     */
+    public boolean isSetSecurityUser() {
+        return _kind == Kind.SetSecurityUser;
+    }
+
+    /**
+     * Get the {@code set_security_user} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code set_security_user}
+     *             kind.
+     */
+    public SetSecurityUserProcessor setSecurityUser() {
+        return TaggedUnionUtils.get(this, Kind.SetSecurityUser);
+    }
+
+    /**
+     * Is this variant instance of kind {@code pipeline}?
+     */
+    public boolean isPipeline() {
+        return _kind == Kind.Pipeline;
+    }
+
+    /**
+     * Get the {@code pipeline} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code pipeline} kind.
+     */
+    public PipelineProcessor pipeline() {
+        return TaggedUnionUtils.get(this, Kind.Pipeline);
+    }
+
+    /**
+     * Is this variant instance of kind {@code drop}?
+     */
+    public boolean isDrop() {
+        return _kind == Kind.Drop;
+    }
+
+    /**
+     * Get the {@code drop} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code drop} kind.
+     */
+    public DropProcessor drop() {
+        return TaggedUnionUtils.get(this, Kind.Drop);
+    }
+
+    /**
+     * Is this variant instance of kind {@code circle}?
+     */
+    public boolean isCircle() {
+        return _kind == Kind.Circle;
+    }
+
+    /**
+     * Get the {@code circle} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code circle} kind.
+     */
+    public CircleProcessor circle() {
+        return TaggedUnionUtils.get(this, Kind.Circle);
+    }
+
+    /**
+     * Is this variant instance of kind {@code inference}?
+     */
+    public boolean isInference() {
+        return _kind == Kind.Inference;
+    }
+
+    /**
+     * Get the {@code inference} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code inference} kind.
+     */
+    public InferenceProcessor inference() {
+        return TaggedUnionUtils.get(this, Kind.Inference);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeStartObject();
+
+        generator.writeKey(_kind.jsonValue());
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        }
+
+        generator.writeEnd();
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Processor> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<Processor> attachment(AttachmentProcessor v) {
+            this._kind = Kind.Attachment;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> attachment(Function<AttachmentProcessor.Builder, ObjectBuilder<AttachmentProcessor>> fn) {
+            return this.attachment(fn.apply(new AttachmentProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> append(AppendProcessor v) {
+            this._kind = Kind.Append;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> append(Function<AppendProcessor.Builder, ObjectBuilder<AppendProcessor>> fn) {
+            return this.append(fn.apply(new AppendProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> csv(CsvProcessor v) {
+            this._kind = Kind.Csv;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> csv(Function<CsvProcessor.Builder, ObjectBuilder<CsvProcessor>> fn) {
+            return this.csv(fn.apply(new CsvProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> convert(ConvertProcessor v) {
+            this._kind = Kind.Convert;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> convert(Function<ConvertProcessor.Builder, ObjectBuilder<ConvertProcessor>> fn) {
+            return this.convert(fn.apply(new ConvertProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> date(DateProcessor v) {
+            this._kind = Kind.Date;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> date(Function<DateProcessor.Builder, ObjectBuilder<DateProcessor>> fn) {
+            return this.date(fn.apply(new DateProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> dateIndexName(DateIndexNameProcessor v) {
+            this._kind = Kind.DateIndexName;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> dateIndexName(Function<DateIndexNameProcessor.Builder, ObjectBuilder<DateIndexNameProcessor>> fn) {
+            return this.dateIndexName(fn.apply(new DateIndexNameProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> dotExpander(DotExpanderProcessor v) {
+            this._kind = Kind.DotExpander;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> dotExpander(Function<DotExpanderProcessor.Builder, ObjectBuilder<DotExpanderProcessor>> fn) {
+            return this.dotExpander(fn.apply(new DotExpanderProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> fail(FailProcessor v) {
+            this._kind = Kind.Fail;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> fail(Function<FailProcessor.Builder, ObjectBuilder<FailProcessor>> fn) {
+            return this.fail(fn.apply(new FailProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> foreach(ForeachProcessor v) {
+            this._kind = Kind.Foreach;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> foreach(Function<ForeachProcessor.Builder, ObjectBuilder<ForeachProcessor>> fn) {
+            return this.foreach(fn.apply(new ForeachProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> json(JsonProcessor v) {
+            this._kind = Kind.Json;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> json(Function<JsonProcessor.Builder, ObjectBuilder<JsonProcessor>> fn) {
+            return this.json(fn.apply(new JsonProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> userAgent(UserAgentProcessor v) {
+            this._kind = Kind.UserAgent;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> userAgent(Function<UserAgentProcessor.Builder, ObjectBuilder<UserAgentProcessor>> fn) {
+            return this.userAgent(fn.apply(new UserAgentProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> kv(KeyValueProcessor v) {
+            this._kind = Kind.Kv;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> kv(Function<KeyValueProcessor.Builder, ObjectBuilder<KeyValueProcessor>> fn) {
+            return this.kv(fn.apply(new KeyValueProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> geoip(GeoIpProcessor v) {
+            this._kind = Kind.Geoip;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> geoip(Function<GeoIpProcessor.Builder, ObjectBuilder<GeoIpProcessor>> fn) {
+            return this.geoip(fn.apply(new GeoIpProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> grok(GrokProcessor v) {
+            this._kind = Kind.Grok;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> grok(Function<GrokProcessor.Builder, ObjectBuilder<GrokProcessor>> fn) {
+            return this.grok(fn.apply(new GrokProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> gsub(GsubProcessor v) {
+            this._kind = Kind.Gsub;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> gsub(Function<GsubProcessor.Builder, ObjectBuilder<GsubProcessor>> fn) {
+            return this.gsub(fn.apply(new GsubProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> join(JoinProcessor v) {
+            this._kind = Kind.Join;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> join(Function<JoinProcessor.Builder, ObjectBuilder<JoinProcessor>> fn) {
+            return this.join(fn.apply(new JoinProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> lowercase(LowercaseProcessor v) {
+            this._kind = Kind.Lowercase;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> lowercase(Function<LowercaseProcessor.Builder, ObjectBuilder<LowercaseProcessor>> fn) {
+            return this.lowercase(fn.apply(new LowercaseProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> remove(RemoveProcessor v) {
+            this._kind = Kind.Remove;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> remove(Function<RemoveProcessor.Builder, ObjectBuilder<RemoveProcessor>> fn) {
+            return this.remove(fn.apply(new RemoveProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> rename(RenameProcessor v) {
+            this._kind = Kind.Rename;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> rename(Function<RenameProcessor.Builder, ObjectBuilder<RenameProcessor>> fn) {
+            return this.rename(fn.apply(new RenameProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> script(Script v) {
+            this._kind = Kind.Script;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> script(Function<Script.Builder, ObjectBuilder<Script>> fn) {
+            return this.script(fn.apply(new Script.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> set(SetProcessor v) {
+            this._kind = Kind.Set;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> set(Function<SetProcessor.Builder, ObjectBuilder<SetProcessor>> fn) {
+            return this.set(fn.apply(new SetProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> sort(SortProcessor v) {
+            this._kind = Kind.Sort;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> sort(Function<SortProcessor.Builder, ObjectBuilder<SortProcessor>> fn) {
+            return this.sort(fn.apply(new SortProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> split(SplitProcessor v) {
+            this._kind = Kind.Split;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> split(Function<SplitProcessor.Builder, ObjectBuilder<SplitProcessor>> fn) {
+            return this.split(fn.apply(new SplitProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> trim(TrimProcessor v) {
+            this._kind = Kind.Trim;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> trim(Function<TrimProcessor.Builder, ObjectBuilder<TrimProcessor>> fn) {
+            return this.trim(fn.apply(new TrimProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> uppercase(UppercaseProcessor v) {
+            this._kind = Kind.Uppercase;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> uppercase(Function<UppercaseProcessor.Builder, ObjectBuilder<UppercaseProcessor>> fn) {
+            return this.uppercase(fn.apply(new UppercaseProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> urldecode(UrlDecodeProcessor v) {
+            this._kind = Kind.Urldecode;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> urldecode(Function<UrlDecodeProcessor.Builder, ObjectBuilder<UrlDecodeProcessor>> fn) {
+            return this.urldecode(fn.apply(new UrlDecodeProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> bytes(BytesProcessor v) {
+            this._kind = Kind.Bytes;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> bytes(Function<BytesProcessor.Builder, ObjectBuilder<BytesProcessor>> fn) {
+            return this.bytes(fn.apply(new BytesProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> dissect(DissectProcessor v) {
+            this._kind = Kind.Dissect;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> dissect(Function<DissectProcessor.Builder, ObjectBuilder<DissectProcessor>> fn) {
+            return this.dissect(fn.apply(new DissectProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> setSecurityUser(SetSecurityUserProcessor v) {
+            this._kind = Kind.SetSecurityUser;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> setSecurityUser(
+            Function<SetSecurityUserProcessor.Builder, ObjectBuilder<SetSecurityUserProcessor>> fn
+        ) {
+            return this.setSecurityUser(fn.apply(new SetSecurityUserProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> pipeline(PipelineProcessor v) {
+            this._kind = Kind.Pipeline;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> pipeline(Function<PipelineProcessor.Builder, ObjectBuilder<PipelineProcessor>> fn) {
+            return this.pipeline(fn.apply(new PipelineProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> drop(DropProcessor v) {
+            this._kind = Kind.Drop;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> drop(Function<DropProcessor.Builder, ObjectBuilder<DropProcessor>> fn) {
+            return this.drop(fn.apply(new DropProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> circle(CircleProcessor v) {
+            this._kind = Kind.Circle;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> circle(Function<CircleProcessor.Builder, ObjectBuilder<CircleProcessor>> fn) {
+            return this.circle(fn.apply(new CircleProcessor.Builder()).build());
+        }
+
+        public ObjectBuilder<Processor> inference(InferenceProcessor v) {
+            this._kind = Kind.Inference;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<Processor> inference(Function<InferenceProcessor.Builder, ObjectBuilder<InferenceProcessor>> fn) {
+            return this.inference(fn.apply(new InferenceProcessor.Builder()).build());
+        }
+
+        public Processor build() {
+            _checkSingleUse();
+            return new Processor(this);
+        }
+
+    }
+
+    protected static void setupProcessorDeserializer(ObjectDeserializer<Builder> op) {
+
+        op.add(Builder::attachment, AttachmentProcessor._DESERIALIZER, "attachment");
+        op.add(Builder::append, AppendProcessor._DESERIALIZER, "append");
+        op.add(Builder::csv, CsvProcessor._DESERIALIZER, "csv");
+        op.add(Builder::convert, ConvertProcessor._DESERIALIZER, "convert");
+        op.add(Builder::date, DateProcessor._DESERIALIZER, "date");
+        op.add(Builder::dateIndexName, DateIndexNameProcessor._DESERIALIZER, "date_index_name");
+        op.add(Builder::dotExpander, DotExpanderProcessor._DESERIALIZER, "dot_expander");
+        op.add(Builder::fail, FailProcessor._DESERIALIZER, "fail");
+        op.add(Builder::foreach, ForeachProcessor._DESERIALIZER, "foreach");
+        op.add(Builder::json, JsonProcessor._DESERIALIZER, "json");
+        op.add(Builder::userAgent, UserAgentProcessor._DESERIALIZER, "user_agent");
+        op.add(Builder::kv, KeyValueProcessor._DESERIALIZER, "kv");
+        op.add(Builder::geoip, GeoIpProcessor._DESERIALIZER, "geoip");
+        op.add(Builder::grok, GrokProcessor._DESERIALIZER, "grok");
+        op.add(Builder::gsub, GsubProcessor._DESERIALIZER, "gsub");
+        op.add(Builder::join, JoinProcessor._DESERIALIZER, "join");
+        op.add(Builder::lowercase, LowercaseProcessor._DESERIALIZER, "lowercase");
+        op.add(Builder::remove, RemoveProcessor._DESERIALIZER, "remove");
+        op.add(Builder::rename, RenameProcessor._DESERIALIZER, "rename");
+        op.add(Builder::script, Script._DESERIALIZER, "script");
+        op.add(Builder::set, SetProcessor._DESERIALIZER, "set");
+        op.add(Builder::sort, SortProcessor._DESERIALIZER, "sort");
+        op.add(Builder::split, SplitProcessor._DESERIALIZER, "split");
+        op.add(Builder::trim, TrimProcessor._DESERIALIZER, "trim");
+        op.add(Builder::uppercase, UppercaseProcessor._DESERIALIZER, "uppercase");
+        op.add(Builder::urldecode, UrlDecodeProcessor._DESERIALIZER, "urldecode");
+        op.add(Builder::bytes, BytesProcessor._DESERIALIZER, "bytes");
+        op.add(Builder::dissect, DissectProcessor._DESERIALIZER, "dissect");
+        op.add(Builder::setSecurityUser, SetSecurityUserProcessor._DESERIALIZER, "set_security_user");
+        op.add(Builder::pipeline, PipelineProcessor._DESERIALIZER, "pipeline");
+        op.add(Builder::drop, DropProcessor._DESERIALIZER, "drop");
+        op.add(Builder::circle, CircleProcessor._DESERIALIZER, "circle");
+        op.add(Builder::inference, InferenceProcessor._DESERIALIZER, "inference");
+
+    }
+
+    public static final JsonpDeserializer<Processor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Processor::setupProcessorDeserializer,
+        Builder::build
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorBase.java
index 7c4613a213..d4e51d1043 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorBase.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
@@ -39,189 +43,180 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.ProcessorBase
 
-
-
 public abstract class ProcessorBase implements JsonpSerializable {
-	@Nullable
-	private final String if_;
-
-	@Nullable
-	private final Boolean ignoreFailure;
-
-	private final List<Processor> onFailure;
-
-	@Nullable
-	private final String tag;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected ProcessorBase(AbstractBuilder<?> builder) {
-
-		this.if_ = builder.if_;
-		this.ignoreFailure = builder.ignoreFailure;
-		this.onFailure = ApiTypeHelper.unmodifiable(builder.onFailure);
-		this.tag = builder.tag;
-
-	}
-
-	/**
-	 * API name: {@code if}
-	 */
-	@Nullable
-	public final String if_() {
-		return this.if_;
-	}
-
-	/**
-	 * API name: {@code ignore_failure}
-	 */
-	@Nullable
-	public final Boolean ignoreFailure() {
-		return this.ignoreFailure;
-	}
-
-	/**
-	 * API name: {@code on_failure}
-	 */
-	public final List<Processor> onFailure() {
-		return this.onFailure;
-	}
-
-	/**
-	 * API name: {@code tag}
-	 */
-	@Nullable
-	public final String tag() {
-		return this.tag;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.if_ != null) {
-			generator.writeKey("if");
-			generator.write(this.if_);
-
-		}
-		if (this.ignoreFailure != null) {
-			generator.writeKey("ignore_failure");
-			generator.write(this.ignoreFailure);
-
-		}
-		if (ApiTypeHelper.isDefined(this.onFailure)) {
-			generator.writeKey("on_failure");
-			generator.writeStartArray();
-			for (Processor item0 : this.onFailure) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.tag != null) {
-			generator.writeKey("tag");
-			generator.write(this.tag);
-
-		}
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		@Nullable
-		private String if_;
-
-		@Nullable
-		private Boolean ignoreFailure;
-
-		@Nullable
-		private List<Processor> onFailure;
-
-		@Nullable
-		private String tag;
-
-		/**
-		 * API name: {@code if}
-		 */
-		public final BuilderT if_(@Nullable String value) {
-			this.if_ = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code ignore_failure}
-		 */
-		public final BuilderT ignoreFailure(@Nullable Boolean value) {
-			this.ignoreFailure = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code on_failure}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>onFailure</code>.
-		 */
-		public final BuilderT onFailure(List<Processor> list) {
-			this.onFailure = _listAddAll(this.onFailure, list);
-			return self();
-		}
-
-		/**
-		 * API name: {@code on_failure}
-		 * <p>
-		 * Adds one or more values to <code>onFailure</code>.
-		 */
-		public final BuilderT onFailure(Processor value, Processor... values) {
-			this.onFailure = _listAdd(this.onFailure, value, values);
-			return self();
-		}
-
-		/**
-		 * API name: {@code on_failure}
-		 * <p>
-		 * Adds a value to <code>onFailure</code> using a builder lambda.
-		 */
-		public final BuilderT onFailure(Function<Processor.Builder, ObjectBuilder<Processor>> fn) {
-			return onFailure(fn.apply(new Processor.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code tag}
-		 */
-		public final BuilderT tag(@Nullable String value) {
-			this.tag = value;
-			return self();
-		}
-
-		protected abstract BuilderT self();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupProcessorBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-
-		op.add(AbstractBuilder::if_, JsonpDeserializer.stringDeserializer(), "if");
-		op.add(AbstractBuilder::ignoreFailure, JsonpDeserializer.booleanDeserializer(), "ignore_failure");
-		op.add(AbstractBuilder::onFailure, JsonpDeserializer.arrayDeserializer(Processor._DESERIALIZER), "on_failure");
-		op.add(AbstractBuilder::tag, JsonpDeserializer.stringDeserializer(), "tag");
-
-	}
+    @Nullable
+    private final String if_;
+
+    @Nullable
+    private final Boolean ignoreFailure;
+
+    private final List<Processor> onFailure;
+
+    @Nullable
+    private final String tag;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected ProcessorBase(AbstractBuilder<?> builder) {
+
+        this.if_ = builder.if_;
+        this.ignoreFailure = builder.ignoreFailure;
+        this.onFailure = ApiTypeHelper.unmodifiable(builder.onFailure);
+        this.tag = builder.tag;
+
+    }
+
+    /**
+     * API name: {@code if}
+     */
+    @Nullable
+    public final String if_() {
+        return this.if_;
+    }
+
+    /**
+     * API name: {@code ignore_failure}
+     */
+    @Nullable
+    public final Boolean ignoreFailure() {
+        return this.ignoreFailure;
+    }
+
+    /**
+     * API name: {@code on_failure}
+     */
+    public final List<Processor> onFailure() {
+        return this.onFailure;
+    }
+
+    /**
+     * API name: {@code tag}
+     */
+    @Nullable
+    public final String tag() {
+        return this.tag;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.if_ != null) {
+            generator.writeKey("if");
+            generator.write(this.if_);
+
+        }
+        if (this.ignoreFailure != null) {
+            generator.writeKey("ignore_failure");
+            generator.write(this.ignoreFailure);
+
+        }
+        if (ApiTypeHelper.isDefined(this.onFailure)) {
+            generator.writeKey("on_failure");
+            generator.writeStartArray();
+            for (Processor item0 : this.onFailure) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.tag != null) {
+            generator.writeKey("tag");
+            generator.write(this.tag);
+
+        }
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        @Nullable
+        private String if_;
+
+        @Nullable
+        private Boolean ignoreFailure;
+
+        @Nullable
+        private List<Processor> onFailure;
+
+        @Nullable
+        private String tag;
+
+        /**
+         * API name: {@code if}
+         */
+        public final BuilderT if_(@Nullable String value) {
+            this.if_ = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code ignore_failure}
+         */
+        public final BuilderT ignoreFailure(@Nullable Boolean value) {
+            this.ignoreFailure = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code on_failure}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>onFailure</code>.
+         */
+        public final BuilderT onFailure(List<Processor> list) {
+            this.onFailure = _listAddAll(this.onFailure, list);
+            return self();
+        }
+
+        /**
+         * API name: {@code on_failure}
+         * <p>
+         * Adds one or more values to <code>onFailure</code>.
+         */
+        public final BuilderT onFailure(Processor value, Processor... values) {
+            this.onFailure = _listAdd(this.onFailure, value, values);
+            return self();
+        }
+
+        /**
+         * API name: {@code on_failure}
+         * <p>
+         * Adds a value to <code>onFailure</code> using a builder lambda.
+         */
+        public final BuilderT onFailure(Function<Processor.Builder, ObjectBuilder<Processor>> fn) {
+            return onFailure(fn.apply(new Processor.Builder()).build());
+        }
+
+        /**
+         * API name: {@code tag}
+         */
+        public final BuilderT tag(@Nullable String value) {
+            this.tag = value;
+            return self();
+        }
+
+        protected abstract BuilderT self();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupProcessorBaseDeserializer(ObjectDeserializer<BuilderT> op) {
+
+        op.add(AbstractBuilder::if_, JsonpDeserializer.stringDeserializer(), "if");
+        op.add(AbstractBuilder::ignoreFailure, JsonpDeserializer.booleanDeserializer(), "ignore_failure");
+        op.add(AbstractBuilder::onFailure, JsonpDeserializer.arrayDeserializer(Processor._DESERIALIZER), "on_failure");
+        op.add(AbstractBuilder::tag, JsonpDeserializer.stringDeserializer(), "tag");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorBuilders.java
index a2e255bced..85f95c4772 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorBuilders.java
@@ -38,268 +38,267 @@
  * Builders for {@link Processor} variants.
  */
 public class ProcessorBuilders {
-	private ProcessorBuilders() {
-	}
-
-	/**
-	 * Creates a builder for the {@link AttachmentProcessor attachment}
-	 * {@code Processor} variant.
-	 */
-	public static AttachmentProcessor.Builder attachment() {
-		return new AttachmentProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link AppendProcessor append} {@code Processor}
-	 * variant.
-	 */
-	public static AppendProcessor.Builder append() {
-		return new AppendProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link CsvProcessor csv} {@code Processor} variant.
-	 */
-	public static CsvProcessor.Builder csv() {
-		return new CsvProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ConvertProcessor convert} {@code Processor}
-	 * variant.
-	 */
-	public static ConvertProcessor.Builder convert() {
-		return new ConvertProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DateProcessor date} {@code Processor}
-	 * variant.
-	 */
-	public static DateProcessor.Builder date() {
-		return new DateProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DateIndexNameProcessor date_index_name}
-	 * {@code Processor} variant.
-	 */
-	public static DateIndexNameProcessor.Builder dateIndexName() {
-		return new DateIndexNameProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DotExpanderProcessor dot_expander}
-	 * {@code Processor} variant.
-	 */
-	public static DotExpanderProcessor.Builder dotExpander() {
-		return new DotExpanderProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link FailProcessor fail} {@code Processor}
-	 * variant.
-	 */
-	public static FailProcessor.Builder fail() {
-		return new FailProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link ForeachProcessor foreach} {@code Processor}
-	 * variant.
-	 */
-	public static ForeachProcessor.Builder foreach() {
-		return new ForeachProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link JsonProcessor json} {@code Processor}
-	 * variant.
-	 */
-	public static JsonProcessor.Builder json() {
-		return new JsonProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link UserAgentProcessor user_agent}
-	 * {@code Processor} variant.
-	 */
-	public static UserAgentProcessor.Builder userAgent() {
-		return new UserAgentProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link KeyValueProcessor kv} {@code Processor}
-	 * variant.
-	 */
-	public static KeyValueProcessor.Builder kv() {
-		return new KeyValueProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GeoIpProcessor geoip} {@code Processor}
-	 * variant.
-	 */
-	public static GeoIpProcessor.Builder geoip() {
-		return new GeoIpProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GrokProcessor grok} {@code Processor}
-	 * variant.
-	 */
-	public static GrokProcessor.Builder grok() {
-		return new GrokProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link GsubProcessor gsub} {@code Processor}
-	 * variant.
-	 */
-	public static GsubProcessor.Builder gsub() {
-		return new GsubProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link JoinProcessor join} {@code Processor}
-	 * variant.
-	 */
-	public static JoinProcessor.Builder join() {
-		return new JoinProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link LowercaseProcessor lowercase}
-	 * {@code Processor} variant.
-	 */
-	public static LowercaseProcessor.Builder lowercase() {
-		return new LowercaseProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link RemoveProcessor remove} {@code Processor}
-	 * variant.
-	 */
-	public static RemoveProcessor.Builder remove() {
-		return new RemoveProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link RenameProcessor rename} {@code Processor}
-	 * variant.
-	 */
-	public static RenameProcessor.Builder rename() {
-		return new RenameProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link Script script} {@code Processor} variant.
-	 */
-	public static Script.Builder script() {
-		return new Script.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SetProcessor set} {@code Processor} variant.
-	 */
-	public static SetProcessor.Builder set() {
-		return new SetProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SortProcessor sort} {@code Processor}
-	 * variant.
-	 */
-	public static SortProcessor.Builder sort() {
-		return new SortProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SplitProcessor split} {@code Processor}
-	 * variant.
-	 */
-	public static SplitProcessor.Builder split() {
-		return new SplitProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link TrimProcessor trim} {@code Processor}
-	 * variant.
-	 */
-	public static TrimProcessor.Builder trim() {
-		return new TrimProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link UppercaseProcessor uppercase}
-	 * {@code Processor} variant.
-	 */
-	public static UppercaseProcessor.Builder uppercase() {
-		return new UppercaseProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link UrlDecodeProcessor urldecode}
-	 * {@code Processor} variant.
-	 */
-	public static UrlDecodeProcessor.Builder urldecode() {
-		return new UrlDecodeProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link BytesProcessor bytes} {@code Processor}
-	 * variant.
-	 */
-	public static BytesProcessor.Builder bytes() {
-		return new BytesProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DissectProcessor dissect} {@code Processor}
-	 * variant.
-	 */
-	public static DissectProcessor.Builder dissect() {
-		return new DissectProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link SetSecurityUserProcessor set_security_user}
-	 * {@code Processor} variant.
-	 */
-	public static SetSecurityUserProcessor.Builder setSecurityUser() {
-		return new SetSecurityUserProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link PipelineProcessor pipeline}
-	 * {@code Processor} variant.
-	 */
-	public static PipelineProcessor.Builder pipeline() {
-		return new PipelineProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link DropProcessor drop} {@code Processor}
-	 * variant.
-	 */
-	public static DropProcessor.Builder drop() {
-		return new DropProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link CircleProcessor circle} {@code Processor}
-	 * variant.
-	 */
-	public static CircleProcessor.Builder circle() {
-		return new CircleProcessor.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link InferenceProcessor inference}
-	 * {@code Processor} variant.
-	 */
-	public static InferenceProcessor.Builder inference() {
-		return new InferenceProcessor.Builder();
-	}
+    private ProcessorBuilders() {}
+
+    /**
+     * Creates a builder for the {@link AttachmentProcessor attachment}
+     * {@code Processor} variant.
+     */
+    public static AttachmentProcessor.Builder attachment() {
+        return new AttachmentProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link AppendProcessor append} {@code Processor}
+     * variant.
+     */
+    public static AppendProcessor.Builder append() {
+        return new AppendProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link CsvProcessor csv} {@code Processor} variant.
+     */
+    public static CsvProcessor.Builder csv() {
+        return new CsvProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ConvertProcessor convert} {@code Processor}
+     * variant.
+     */
+    public static ConvertProcessor.Builder convert() {
+        return new ConvertProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DateProcessor date} {@code Processor}
+     * variant.
+     */
+    public static DateProcessor.Builder date() {
+        return new DateProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DateIndexNameProcessor date_index_name}
+     * {@code Processor} variant.
+     */
+    public static DateIndexNameProcessor.Builder dateIndexName() {
+        return new DateIndexNameProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DotExpanderProcessor dot_expander}
+     * {@code Processor} variant.
+     */
+    public static DotExpanderProcessor.Builder dotExpander() {
+        return new DotExpanderProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link FailProcessor fail} {@code Processor}
+     * variant.
+     */
+    public static FailProcessor.Builder fail() {
+        return new FailProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link ForeachProcessor foreach} {@code Processor}
+     * variant.
+     */
+    public static ForeachProcessor.Builder foreach() {
+        return new ForeachProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link JsonProcessor json} {@code Processor}
+     * variant.
+     */
+    public static JsonProcessor.Builder json() {
+        return new JsonProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link UserAgentProcessor user_agent}
+     * {@code Processor} variant.
+     */
+    public static UserAgentProcessor.Builder userAgent() {
+        return new UserAgentProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link KeyValueProcessor kv} {@code Processor}
+     * variant.
+     */
+    public static KeyValueProcessor.Builder kv() {
+        return new KeyValueProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GeoIpProcessor geoip} {@code Processor}
+     * variant.
+     */
+    public static GeoIpProcessor.Builder geoip() {
+        return new GeoIpProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GrokProcessor grok} {@code Processor}
+     * variant.
+     */
+    public static GrokProcessor.Builder grok() {
+        return new GrokProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link GsubProcessor gsub} {@code Processor}
+     * variant.
+     */
+    public static GsubProcessor.Builder gsub() {
+        return new GsubProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link JoinProcessor join} {@code Processor}
+     * variant.
+     */
+    public static JoinProcessor.Builder join() {
+        return new JoinProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link LowercaseProcessor lowercase}
+     * {@code Processor} variant.
+     */
+    public static LowercaseProcessor.Builder lowercase() {
+        return new LowercaseProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link RemoveProcessor remove} {@code Processor}
+     * variant.
+     */
+    public static RemoveProcessor.Builder remove() {
+        return new RemoveProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link RenameProcessor rename} {@code Processor}
+     * variant.
+     */
+    public static RenameProcessor.Builder rename() {
+        return new RenameProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link Script script} {@code Processor} variant.
+     */
+    public static Script.Builder script() {
+        return new Script.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SetProcessor set} {@code Processor} variant.
+     */
+    public static SetProcessor.Builder set() {
+        return new SetProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SortProcessor sort} {@code Processor}
+     * variant.
+     */
+    public static SortProcessor.Builder sort() {
+        return new SortProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SplitProcessor split} {@code Processor}
+     * variant.
+     */
+    public static SplitProcessor.Builder split() {
+        return new SplitProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link TrimProcessor trim} {@code Processor}
+     * variant.
+     */
+    public static TrimProcessor.Builder trim() {
+        return new TrimProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link UppercaseProcessor uppercase}
+     * {@code Processor} variant.
+     */
+    public static UppercaseProcessor.Builder uppercase() {
+        return new UppercaseProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link UrlDecodeProcessor urldecode}
+     * {@code Processor} variant.
+     */
+    public static UrlDecodeProcessor.Builder urldecode() {
+        return new UrlDecodeProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link BytesProcessor bytes} {@code Processor}
+     * variant.
+     */
+    public static BytesProcessor.Builder bytes() {
+        return new BytesProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DissectProcessor dissect} {@code Processor}
+     * variant.
+     */
+    public static DissectProcessor.Builder dissect() {
+        return new DissectProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link SetSecurityUserProcessor set_security_user}
+     * {@code Processor} variant.
+     */
+    public static SetSecurityUserProcessor.Builder setSecurityUser() {
+        return new SetSecurityUserProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link PipelineProcessor pipeline}
+     * {@code Processor} variant.
+     */
+    public static PipelineProcessor.Builder pipeline() {
+        return new PipelineProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link DropProcessor drop} {@code Processor}
+     * variant.
+     */
+    public static DropProcessor.Builder drop() {
+        return new DropProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link CircleProcessor circle} {@code Processor}
+     * variant.
+     */
+    public static CircleProcessor.Builder circle() {
+        return new CircleProcessor.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link InferenceProcessor inference}
+     * {@code Processor} variant.
+     */
+    public static InferenceProcessor.Builder inference() {
+        return new InferenceProcessor.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorGrokRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorGrokRequest.java
index 4b7c2f0456..b87e3e46d8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorGrokRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorGrokRequest.java
@@ -32,51 +32,53 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import java.util.Collections;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 
-import java.util.Collections;
-
 // typedef: ingest.processor_grok.Request
 
 /**
  * Returns a list of the built-in patterns.
- * 
+ *
  */
 
 public class ProcessorGrokRequest extends RequestBase {
-	public ProcessorGrokRequest() {
-	}
+    public ProcessorGrokRequest() {}
 
-	/**
-	 * Singleton instance for {@link ProcessorGrokRequest}.
-	 */
-	public static final ProcessorGrokRequest _INSTANCE = new ProcessorGrokRequest();
+    /**
+     * Singleton instance for {@link ProcessorGrokRequest}.
+     */
+    public static final ProcessorGrokRequest _INSTANCE = new ProcessorGrokRequest();
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Endpoint "{@code ingest.processor_grok}".
-	 */
-	public static final Endpoint<ProcessorGrokRequest, ProcessorGrokResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+    /**
+     * Endpoint "{@code ingest.processor_grok}".
+     */
+    public static final Endpoint<ProcessorGrokRequest, ProcessorGrokResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
 
-			// Request method
-			request -> {
-				return "GET";
+        // Request method
+        request -> {
+            return "GET";
 
-			},
+        },
 
-			// Request path
-			request -> {
-				return "/_ingest/processor/grok";
+        // Request path
+        request -> {
+            return "/_ingest/processor/grok";
 
-			},
+        },
 
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
 
-			}, SimpleEndpoint.emptyMap(), false, ProcessorGrokResponse._DESERIALIZER);
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        ProcessorGrokResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorGrokResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorGrokResponse.java
index 3faa9d0eac..2e48cae697 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorGrokResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorGrokResponse.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,115 +44,113 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: ingest.processor_grok.Response
 
 @JsonpDeserializable
 public class ProcessorGrokResponse implements JsonpSerializable {
-	private final Map<String, String> patterns;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ProcessorGrokResponse(Builder builder) {
-
-		this.patterns = ApiTypeHelper.unmodifiableRequired(builder.patterns, this, "patterns");
-
-	}
-
-	public static ProcessorGrokResponse of(Function<Builder, ObjectBuilder<ProcessorGrokResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code patterns}
-	 */
-	public final Map<String, String> patterns() {
-		return this.patterns;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.patterns)) {
-			generator.writeKey("patterns");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.patterns.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ProcessorGrokResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ProcessorGrokResponse> {
-		private Map<String, String> patterns;
-
-		/**
-		 * Required - API name: {@code patterns}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>patterns</code>.
-		 */
-		public final Builder patterns(Map<String, String> map) {
-			this.patterns = _mapPutAll(this.patterns, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code patterns}
-		 * <p>
-		 * Adds an entry to <code>patterns</code>.
-		 */
-		public final Builder patterns(String key, String value) {
-			this.patterns = _mapPut(this.patterns, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ProcessorGrokResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ProcessorGrokResponse build() {
-			_checkSingleUse();
-
-			return new ProcessorGrokResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ProcessorGrokResponse}
-	 */
-	public static final JsonpDeserializer<ProcessorGrokResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ProcessorGrokResponse::setupProcessorGrokResponseDeserializer);
-
-	protected static void setupProcessorGrokResponseDeserializer(ObjectDeserializer<ProcessorGrokResponse.Builder> op) {
-
-		op.add(Builder::patterns, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
-				"patterns");
-
-	}
+    private final Map<String, String> patterns;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ProcessorGrokResponse(Builder builder) {
+
+        this.patterns = ApiTypeHelper.unmodifiableRequired(builder.patterns, this, "patterns");
+
+    }
+
+    public static ProcessorGrokResponse of(Function<Builder, ObjectBuilder<ProcessorGrokResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code patterns}
+     */
+    public final Map<String, String> patterns() {
+        return this.patterns;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.patterns)) {
+            generator.writeKey("patterns");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.patterns.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ProcessorGrokResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ProcessorGrokResponse> {
+        private Map<String, String> patterns;
+
+        /**
+         * Required - API name: {@code patterns}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>patterns</code>.
+         */
+        public final Builder patterns(Map<String, String> map) {
+            this.patterns = _mapPutAll(this.patterns, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code patterns}
+         * <p>
+         * Adds an entry to <code>patterns</code>.
+         */
+        public final Builder patterns(String key, String value) {
+            this.patterns = _mapPut(this.patterns, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link ProcessorGrokResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ProcessorGrokResponse build() {
+            _checkSingleUse();
+
+            return new ProcessorGrokResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ProcessorGrokResponse}
+     */
+    public static final JsonpDeserializer<ProcessorGrokResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ProcessorGrokResponse::setupProcessorGrokResponseDeserializer
+    );
+
+    protected static void setupProcessorGrokResponseDeserializer(ObjectDeserializer<ProcessorGrokResponse.Builder> op) {
+
+        op.add(Builder::patterns, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "patterns");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorVariant.java
index c33c819646..b5be715b4a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorVariant.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorVariant.java
@@ -37,10 +37,10 @@
  */
 public interface ProcessorVariant {
 
-	Processor.Kind _processorKind();
+    Processor.Kind _processorKind();
 
-	default Processor _toProcessor() {
-		return new Processor(this);
-	}
+    default Processor _toProcessor() {
+        return new Processor(this);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/PutPipelineRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/PutPipelineRequest.java
index a4229b4855..0df30ee67b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/PutPipelineRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/PutPipelineRequest.java
@@ -32,9 +32,12 @@
 
 package org.opensearch.client.opensearch.ingest;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,495 +45,498 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+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.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest.put_pipeline.Request
 
 /**
  * Creates or updates a pipeline.
- * 
+ *
  */
 @JsonpDeserializable
 public class PutPipelineRequest extends RequestBase implements JsonpSerializable {
-	private final Map<String, JsonData> meta;
-
-	@Nullable
-	private final String description;
-
-	private final String id;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final List<Processor> onFailure;
-
-	private final List<Processor> processors;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final Long version;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PutPipelineRequest(Builder builder) {
-
-		this.meta = ApiTypeHelper.unmodifiable(builder.meta);
-		this.description = builder.description;
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.onFailure = ApiTypeHelper.unmodifiable(builder.onFailure);
-		this.processors = ApiTypeHelper.unmodifiable(builder.processors);
-		this.timeout = builder.timeout;
-		this.version = builder.version;
-
-	}
-
-	public static PutPipelineRequest of(Function<Builder, ObjectBuilder<PutPipelineRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Optional metadata about the ingest pipeline. May have any contents. This map
-	 * is not automatically generated by Elasticsearch.
-	 * <p>
-	 * API name: {@code _meta}
-	 */
-	public final Map<String, JsonData> meta() {
-		return this.meta;
-	}
-
-	/**
-	 * Description of the ingest pipeline.
-	 * <p>
-	 * API name: {@code description}
-	 */
-	@Nullable
-	public final String description() {
-		return this.description;
-	}
-
-	/**
-	 * Required - Pipeline ID
-	 * <p>
-	 * API name: {@code id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Period to wait for a connection to the master node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Period to wait for a connection to the cluster-manager node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * API name: {@code on_failure}
-	 */
-	public final List<Processor> onFailure() {
-		return this.onFailure;
-	}
-
-	/**
-	 * API name: {@code processors}
-	 */
-	public final List<Processor> processors() {
-		return this.processors;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final Long version() {
-		return this.version;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.meta)) {
-			generator.writeKey("_meta");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.description != null) {
-			generator.writeKey("description");
-			generator.write(this.description);
-
-		}
-		if (ApiTypeHelper.isDefined(this.onFailure)) {
-			generator.writeKey("on_failure");
-			generator.writeStartArray();
-			for (Processor item0 : this.onFailure) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.processors)) {
-			generator.writeKey("processors");
-			generator.writeStartArray();
-			for (Processor item0 : this.processors) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PutPipelineRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutPipelineRequest> {
-		@Nullable
-		private Map<String, JsonData> meta;
-
-		@Nullable
-		private String description;
-
-		private String id;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private List<Processor> onFailure;
-
-		@Nullable
-		private List<Processor> processors;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private Long version;
-
-		/**
-		 * Optional metadata about the ingest pipeline. May have any contents. This map
-		 * is not automatically generated by Elasticsearch.
-		 * <p>
-		 * API name: {@code _meta}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>meta</code>.
-		 */
-		public final Builder meta(Map<String, JsonData> map) {
-			this.meta = _mapPutAll(this.meta, map);
-			return this;
-		}
-
-		/**
-		 * Optional metadata about the ingest pipeline. May have any contents. This map
-		 * is not automatically generated by Elasticsearch.
-		 * <p>
-		 * API name: {@code _meta}
-		 * <p>
-		 * Adds an entry to <code>meta</code>.
-		 */
-		public final Builder meta(String key, JsonData value) {
-			this.meta = _mapPut(this.meta, key, value);
-			return this;
-		}
-
-		/**
-		 * Description of the ingest pipeline.
-		 * <p>
-		 * API name: {@code description}
-		 */
-		public final Builder description(@Nullable String value) {
-			this.description = value;
-			return this;
-		}
-
-		/**
-		 * Required - Pipeline ID
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code on_failure}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>onFailure</code>.
-		 */
-		public final Builder onFailure(List<Processor> list) {
-			this.onFailure = _listAddAll(this.onFailure, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code on_failure}
-		 * <p>
-		 * Adds one or more values to <code>onFailure</code>.
-		 */
-		public final Builder onFailure(Processor value, Processor... values) {
-			this.onFailure = _listAdd(this.onFailure, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code on_failure}
-		 * <p>
-		 * Adds a value to <code>onFailure</code> using a builder lambda.
-		 */
-		public final Builder onFailure(Function<Processor.Builder, ObjectBuilder<Processor>> fn) {
-			return onFailure(fn.apply(new Processor.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code processors}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>processors</code>.
-		 */
-		public final Builder processors(List<Processor> list) {
-			this.processors = _listAddAll(this.processors, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code processors}
-		 * <p>
-		 * Adds one or more values to <code>processors</code>.
-		 */
-		public final Builder processors(Processor value, Processor... values) {
-			this.processors = _listAdd(this.processors, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code processors}
-		 * <p>
-		 * Adds a value to <code>processors</code> using a builder lambda.
-		 */
-		public final Builder processors(Function<Processor.Builder, ObjectBuilder<Processor>> fn) {
-			return processors(fn.apply(new Processor.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable Long value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PutPipelineRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutPipelineRequest build() {
-			_checkSingleUse();
-
-			return new PutPipelineRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PutPipelineRequest}
-	 */
-	public static final JsonpDeserializer<PutPipelineRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PutPipelineRequest::setupPutPipelineRequestDeserializer);
-
-	protected static void setupPutPipelineRequestDeserializer(ObjectDeserializer<PutPipelineRequest.Builder> op) {
-
-		op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
-		op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
-		op.add(Builder::onFailure, JsonpDeserializer.arrayDeserializer(Processor._DESERIALIZER), "on_failure");
-		op.add(Builder::processors, JsonpDeserializer.arrayDeserializer(Processor._DESERIALIZER), "processors");
-		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code ingest.put_pipeline}".
-	 */
-	public static final Endpoint<PutPipelineRequest, PutPipelineResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "PUT";
-
-			},
-
-			// Request path
-			request -> {
-				final int _id = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _id;
-
-				if (propsSet == (_id)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_ingest");
-					buf.append("/pipeline");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.id, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, PutPipelineResponse._DESERIALIZER);
+    private final Map<String, JsonData> meta;
+
+    @Nullable
+    private final String description;
+
+    private final String id;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final List<Processor> onFailure;
+
+    private final List<Processor> processors;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final Long version;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PutPipelineRequest(Builder builder) {
+
+        this.meta = ApiTypeHelper.unmodifiable(builder.meta);
+        this.description = builder.description;
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.onFailure = ApiTypeHelper.unmodifiable(builder.onFailure);
+        this.processors = ApiTypeHelper.unmodifiable(builder.processors);
+        this.timeout = builder.timeout;
+        this.version = builder.version;
+
+    }
+
+    public static PutPipelineRequest of(Function<Builder, ObjectBuilder<PutPipelineRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Optional metadata about the ingest pipeline. May have any contents. This map
+     * is not automatically generated by Elasticsearch.
+     * <p>
+     * API name: {@code _meta}
+     */
+    public final Map<String, JsonData> meta() {
+        return this.meta;
+    }
+
+    /**
+     * Description of the ingest pipeline.
+     * <p>
+     * API name: {@code description}
+     */
+    @Nullable
+    public final String description() {
+        return this.description;
+    }
+
+    /**
+     * Required - Pipeline ID
+     * <p>
+     * API name: {@code id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Period to wait for a connection to the master node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Period to wait for a connection to the cluster-manager node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * API name: {@code on_failure}
+     */
+    public final List<Processor> onFailure() {
+        return this.onFailure;
+    }
+
+    /**
+     * API name: {@code processors}
+     */
+    public final List<Processor> processors() {
+        return this.processors;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final Long version() {
+        return this.version;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.meta)) {
+            generator.writeKey("_meta");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.meta.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.description != null) {
+            generator.writeKey("description");
+            generator.write(this.description);
+
+        }
+        if (ApiTypeHelper.isDefined(this.onFailure)) {
+            generator.writeKey("on_failure");
+            generator.writeStartArray();
+            for (Processor item0 : this.onFailure) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.processors)) {
+            generator.writeKey("processors");
+            generator.writeStartArray();
+            for (Processor item0 : this.processors) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PutPipelineRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutPipelineRequest> {
+        @Nullable
+        private Map<String, JsonData> meta;
+
+        @Nullable
+        private String description;
+
+        private String id;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private List<Processor> onFailure;
+
+        @Nullable
+        private List<Processor> processors;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private Long version;
+
+        /**
+         * Optional metadata about the ingest pipeline. May have any contents. This map
+         * is not automatically generated by Elasticsearch.
+         * <p>
+         * API name: {@code _meta}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>meta</code>.
+         */
+        public final Builder meta(Map<String, JsonData> map) {
+            this.meta = _mapPutAll(this.meta, map);
+            return this;
+        }
+
+        /**
+         * Optional metadata about the ingest pipeline. May have any contents. This map
+         * is not automatically generated by Elasticsearch.
+         * <p>
+         * API name: {@code _meta}
+         * <p>
+         * Adds an entry to <code>meta</code>.
+         */
+        public final Builder meta(String key, JsonData value) {
+            this.meta = _mapPut(this.meta, key, value);
+            return this;
+        }
+
+        /**
+         * Description of the ingest pipeline.
+         * <p>
+         * API name: {@code description}
+         */
+        public final Builder description(@Nullable String value) {
+            this.description = value;
+            return this;
+        }
+
+        /**
+         * Required - Pipeline ID
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code on_failure}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>onFailure</code>.
+         */
+        public final Builder onFailure(List<Processor> list) {
+            this.onFailure = _listAddAll(this.onFailure, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code on_failure}
+         * <p>
+         * Adds one or more values to <code>onFailure</code>.
+         */
+        public final Builder onFailure(Processor value, Processor... values) {
+            this.onFailure = _listAdd(this.onFailure, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code on_failure}
+         * <p>
+         * Adds a value to <code>onFailure</code> using a builder lambda.
+         */
+        public final Builder onFailure(Function<Processor.Builder, ObjectBuilder<Processor>> fn) {
+            return onFailure(fn.apply(new Processor.Builder()).build());
+        }
+
+        /**
+         * API name: {@code processors}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>processors</code>.
+         */
+        public final Builder processors(List<Processor> list) {
+            this.processors = _listAddAll(this.processors, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code processors}
+         * <p>
+         * Adds one or more values to <code>processors</code>.
+         */
+        public final Builder processors(Processor value, Processor... values) {
+            this.processors = _listAdd(this.processors, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code processors}
+         * <p>
+         * Adds a value to <code>processors</code> using a builder lambda.
+         */
+        public final Builder processors(Function<Processor.Builder, ObjectBuilder<Processor>> fn) {
+            return processors(fn.apply(new Processor.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable Long value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link PutPipelineRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutPipelineRequest build() {
+            _checkSingleUse();
+
+            return new PutPipelineRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PutPipelineRequest}
+     */
+    public static final JsonpDeserializer<PutPipelineRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PutPipelineRequest::setupPutPipelineRequestDeserializer
+    );
+
+    protected static void setupPutPipelineRequestDeserializer(ObjectDeserializer<PutPipelineRequest.Builder> op) {
+
+        op.add(Builder::meta, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_meta");
+        op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
+        op.add(Builder::onFailure, JsonpDeserializer.arrayDeserializer(Processor._DESERIALIZER), "on_failure");
+        op.add(Builder::processors, JsonpDeserializer.arrayDeserializer(Processor._DESERIALIZER), "processors");
+        op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code ingest.put_pipeline}".
+     */
+    public static final Endpoint<PutPipelineRequest, PutPipelineResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "PUT";
+
+        },
+
+        // Request path
+        request -> {
+            final int _id = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _id;
+
+            if (propsSet == (_id)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_ingest");
+                buf.append("/pipeline");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.id, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        PutPipelineResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/PutPipelineResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/PutPipelineResponse.java
index bf2d39ad82..da8a66dae7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/PutPipelineResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/PutPipelineResponse.java
@@ -32,68 +32,67 @@
 
 package org.opensearch.client.opensearch.ingest;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: ingest.put_pipeline.Response
 
 @JsonpDeserializable
 public class PutPipelineResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private PutPipelineResponse(Builder builder) {
-		super(builder);
+    private PutPipelineResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static PutPipelineResponse of(Function<Builder, ObjectBuilder<PutPipelineResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static PutPipelineResponse of(Function<Builder, ObjectBuilder<PutPipelineResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link PutPipelineResponse}.
-	 */
+    /**
+     * Builder for {@link PutPipelineResponse}.
+     */
 
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PutPipelineResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<PutPipelineResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link PutPipelineResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutPipelineResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link PutPipelineResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutPipelineResponse build() {
+            _checkSingleUse();
 
-			return new PutPipelineResponse(this);
-		}
-	}
+            return new PutPipelineResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link PutPipelineResponse}
-	 */
-	public static final JsonpDeserializer<PutPipelineResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PutPipelineResponse::setupPutPipelineResponseDeserializer);
+    /**
+     * Json deserializer for {@link PutPipelineResponse}
+     */
+    public static final JsonpDeserializer<PutPipelineResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PutPipelineResponse::setupPutPipelineResponseDeserializer
+    );
 
-	protected static void setupPutPipelineResponseDeserializer(ObjectDeserializer<PutPipelineResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+    protected static void setupPutPipelineResponseDeserializer(ObjectDeserializer<PutPipelineResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/RemoveProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/RemoveProcessor.java
index a85a8368b3..8fe8d57565 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/RemoveProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/RemoveProcessor.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,152 +43,147 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.RemoveProcessor
 
-
 @JsonpDeserializable
 public class RemoveProcessor extends ProcessorBase implements ProcessorVariant {
-	private final List<String> field;
-
-	@Nullable
-	private final Boolean ignoreMissing;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RemoveProcessor(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.unmodifiableRequired(builder.field, this, "field");
-		this.ignoreMissing = builder.ignoreMissing;
-
-	}
-
-	public static RemoveProcessor of(Function<Builder, ObjectBuilder<RemoveProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Remove;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final List<String> field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code ignore_missing}
-	 */
-	@Nullable
-	public final Boolean ignoreMissing() {
-		return this.ignoreMissing;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.field)) {
-			generator.writeKey("field");
-			generator.writeStartArray();
-			for (String item0 : this.field) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.ignoreMissing != null) {
-			generator.writeKey("ignore_missing");
-			generator.write(this.ignoreMissing);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RemoveProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<RemoveProcessor> {
-		private List<String> field;
-
-		@Nullable
-		private Boolean ignoreMissing;
-
-		/**
-		 * Required - API name: {@code field}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>field</code>.
-		 */
-		public final Builder field(List<String> list) {
-			this.field = _listAddAll(this.field, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code field}
-		 * <p>
-		 * Adds one or more values to <code>field</code>.
-		 */
-		public final Builder field(String value, String... values) {
-			this.field = _listAdd(this.field, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_missing}
-		 */
-		public final Builder ignoreMissing(@Nullable Boolean value) {
-			this.ignoreMissing = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RemoveProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RemoveProcessor build() {
-			_checkSingleUse();
-
-			return new RemoveProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RemoveProcessor}
-	 */
-	public static final JsonpDeserializer<RemoveProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RemoveProcessor::setupRemoveProcessorDeserializer);
-
-	protected static void setupRemoveProcessorDeserializer(ObjectDeserializer<RemoveProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "field");
-		op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
-
-	}
+    private final List<String> field;
+
+    @Nullable
+    private final Boolean ignoreMissing;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RemoveProcessor(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.unmodifiableRequired(builder.field, this, "field");
+        this.ignoreMissing = builder.ignoreMissing;
+
+    }
+
+    public static RemoveProcessor of(Function<Builder, ObjectBuilder<RemoveProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Remove;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final List<String> field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code ignore_missing}
+     */
+    @Nullable
+    public final Boolean ignoreMissing() {
+        return this.ignoreMissing;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.field)) {
+            generator.writeKey("field");
+            generator.writeStartArray();
+            for (String item0 : this.field) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.ignoreMissing != null) {
+            generator.writeKey("ignore_missing");
+            generator.write(this.ignoreMissing);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RemoveProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<RemoveProcessor> {
+        private List<String> field;
+
+        @Nullable
+        private Boolean ignoreMissing;
+
+        /**
+         * Required - API name: {@code field}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>field</code>.
+         */
+        public final Builder field(List<String> list) {
+            this.field = _listAddAll(this.field, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code field}
+         * <p>
+         * Adds one or more values to <code>field</code>.
+         */
+        public final Builder field(String value, String... values) {
+            this.field = _listAdd(this.field, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_missing}
+         */
+        public final Builder ignoreMissing(@Nullable Boolean value) {
+            this.ignoreMissing = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RemoveProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RemoveProcessor build() {
+            _checkSingleUse();
+
+            return new RemoveProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RemoveProcessor}
+     */
+    public static final JsonpDeserializer<RemoveProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RemoveProcessor::setupRemoveProcessorDeserializer
+    );
+
+    protected static void setupRemoveProcessorDeserializer(ObjectDeserializer<RemoveProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "field");
+        op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/RenameProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/RenameProcessor.java
index 8e6a0aaac2..cd580c92e2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/RenameProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/RenameProcessor.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,155 +42,151 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.RenameProcessor
 
-
 @JsonpDeserializable
 public class RenameProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
-
-	@Nullable
-	private final Boolean ignoreMissing;
-
-	private final String targetField;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RenameProcessor(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.ignoreMissing = builder.ignoreMissing;
-		this.targetField = ApiTypeHelper.requireNonNull(builder.targetField, this, "targetField");
-
-	}
-
-	public static RenameProcessor of(Function<Builder, ObjectBuilder<RenameProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Rename;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code ignore_missing}
-	 */
-	@Nullable
-	public final Boolean ignoreMissing() {
-		return this.ignoreMissing;
-	}
-
-	/**
-	 * Required - API name: {@code target_field}
-	 */
-	public final String targetField() {
-		return this.targetField;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.ignoreMissing != null) {
-			generator.writeKey("ignore_missing");
-			generator.write(this.ignoreMissing);
-
-		}
-		generator.writeKey("target_field");
-		generator.write(this.targetField);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RenameProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<RenameProcessor> {
-		private String field;
-
-		@Nullable
-		private Boolean ignoreMissing;
-
-		private String targetField;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_missing}
-		 */
-		public final Builder ignoreMissing(@Nullable Boolean value) {
-			this.ignoreMissing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code target_field}
-		 */
-		public final Builder targetField(String value) {
-			this.targetField = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RenameProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RenameProcessor build() {
-			_checkSingleUse();
-
-			return new RenameProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RenameProcessor}
-	 */
-	public static final JsonpDeserializer<RenameProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RenameProcessor::setupRenameProcessorDeserializer);
-
-	protected static void setupRenameProcessorDeserializer(ObjectDeserializer<RenameProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
-		op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
-
-	}
+    private final String field;
+
+    @Nullable
+    private final Boolean ignoreMissing;
+
+    private final String targetField;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RenameProcessor(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.ignoreMissing = builder.ignoreMissing;
+        this.targetField = ApiTypeHelper.requireNonNull(builder.targetField, this, "targetField");
+
+    }
+
+    public static RenameProcessor of(Function<Builder, ObjectBuilder<RenameProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Rename;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code ignore_missing}
+     */
+    @Nullable
+    public final Boolean ignoreMissing() {
+        return this.ignoreMissing;
+    }
+
+    /**
+     * Required - API name: {@code target_field}
+     */
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.ignoreMissing != null) {
+            generator.writeKey("ignore_missing");
+            generator.write(this.ignoreMissing);
+
+        }
+        generator.writeKey("target_field");
+        generator.write(this.targetField);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RenameProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<RenameProcessor> {
+        private String field;
+
+        @Nullable
+        private Boolean ignoreMissing;
+
+        private String targetField;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_missing}
+         */
+        public final Builder ignoreMissing(@Nullable Boolean value) {
+            this.ignoreMissing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code target_field}
+         */
+        public final Builder targetField(String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link RenameProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RenameProcessor build() {
+            _checkSingleUse();
+
+            return new RenameProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RenameProcessor}
+     */
+    public static final JsonpDeserializer<RenameProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RenameProcessor::setupRenameProcessorDeserializer
+    );
+
+    protected static void setupRenameProcessorDeserializer(ObjectDeserializer<RenameProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SetProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SetProcessor.java
index 2287c0577e..9c120f31f6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SetProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SetProcessor.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -40,153 +43,151 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.SetProcessor
 
-
 @JsonpDeserializable
 public class SetProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
-
-	@Nullable
-	private final Boolean override;
-
-	private final JsonData value;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SetProcessor(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.override = builder.override;
-		this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
-
-	}
-
-	public static SetProcessor of(Function<Builder, ObjectBuilder<SetProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Set;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code override}
-	 */
-	@Nullable
-	public final Boolean override() {
-		return this.override;
-	}
-
-	/**
-	 * Required - API name: {@code value}
-	 */
-	public final JsonData value() {
-		return this.value;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.override != null) {
-			generator.writeKey("override");
-			generator.write(this.override);
-
-		}
-		generator.writeKey("value");
-		this.value.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SetProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<SetProcessor> {
-		private String field;
-
-		@Nullable
-		private Boolean override;
-
-		private JsonData value;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code override}
-		 */
-		public final Builder override(@Nullable Boolean value) {
-			this.override = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code value}
-		 */
-		public final Builder value(JsonData value) {
-			this.value = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SetProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SetProcessor build() {
-			_checkSingleUse();
-
-			return new SetProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SetProcessor}
-	 */
-	public static final JsonpDeserializer<SetProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SetProcessor::setupSetProcessorDeserializer);
-
-	protected static void setupSetProcessorDeserializer(ObjectDeserializer<SetProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::override, JsonpDeserializer.booleanDeserializer(), "override");
-		op.add(Builder::value, JsonData._DESERIALIZER, "value");
-
-	}
+    private final String field;
+
+    @Nullable
+    private final Boolean override;
+
+    private final JsonData value;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SetProcessor(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.override = builder.override;
+        this.value = ApiTypeHelper.requireNonNull(builder.value, this, "value");
+
+    }
+
+    public static SetProcessor of(Function<Builder, ObjectBuilder<SetProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Set;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code override}
+     */
+    @Nullable
+    public final Boolean override() {
+        return this.override;
+    }
+
+    /**
+     * Required - API name: {@code value}
+     */
+    public final JsonData value() {
+        return this.value;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.override != null) {
+            generator.writeKey("override");
+            generator.write(this.override);
+
+        }
+        generator.writeKey("value");
+        this.value.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SetProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<SetProcessor> {
+        private String field;
+
+        @Nullable
+        private Boolean override;
+
+        private JsonData value;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code override}
+         */
+        public final Builder override(@Nullable Boolean value) {
+            this.override = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code value}
+         */
+        public final Builder value(JsonData value) {
+            this.value = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SetProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SetProcessor build() {
+            _checkSingleUse();
+
+            return new SetProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SetProcessor}
+     */
+    public static final JsonpDeserializer<SetProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SetProcessor::setupSetProcessorDeserializer
+    );
+
+    protected static void setupSetProcessorDeserializer(ObjectDeserializer<SetProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::override, JsonpDeserializer.booleanDeserializer(), "override");
+        op.add(Builder::value, JsonData._DESERIALIZER, "value");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SetSecurityUserProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SetSecurityUserProcessor.java
index a016cd05f0..e53446771e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SetSecurityUserProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SetSecurityUserProcessor.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,150 +43,143 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.SetSecurityUserProcessor
 
-
 @JsonpDeserializable
 public class SetSecurityUserProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
-
-	private final List<String> properties;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SetSecurityUserProcessor(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.properties = ApiTypeHelper.unmodifiable(builder.properties);
-
-	}
-
-	public static SetSecurityUserProcessor of(Function<Builder, ObjectBuilder<SetSecurityUserProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.SetSecurityUser;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code properties}
-	 */
-	public final List<String> properties() {
-		return this.properties;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (ApiTypeHelper.isDefined(this.properties)) {
-			generator.writeKey("properties");
-			generator.writeStartArray();
-			for (String item0 : this.properties) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SetSecurityUserProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SetSecurityUserProcessor> {
-		private String field;
-
-		@Nullable
-		private List<String> properties;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code properties}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>properties</code>.
-		 */
-		public final Builder properties(List<String> list) {
-			this.properties = _listAddAll(this.properties, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code properties}
-		 * <p>
-		 * Adds one or more values to <code>properties</code>.
-		 */
-		public final Builder properties(String value, String... values) {
-			this.properties = _listAdd(this.properties, value, values);
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SetSecurityUserProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SetSecurityUserProcessor build() {
-			_checkSingleUse();
-
-			return new SetSecurityUserProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SetSecurityUserProcessor}
-	 */
-	public static final JsonpDeserializer<SetSecurityUserProcessor> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SetSecurityUserProcessor::setupSetSecurityUserProcessorDeserializer);
-
-	protected static void setupSetSecurityUserProcessorDeserializer(
-			ObjectDeserializer<SetSecurityUserProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::properties, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"properties");
-
-	}
+    private final String field;
+
+    private final List<String> properties;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SetSecurityUserProcessor(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.properties = ApiTypeHelper.unmodifiable(builder.properties);
+
+    }
+
+    public static SetSecurityUserProcessor of(Function<Builder, ObjectBuilder<SetSecurityUserProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.SetSecurityUser;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code properties}
+     */
+    public final List<String> properties() {
+        return this.properties;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (ApiTypeHelper.isDefined(this.properties)) {
+            generator.writeKey("properties");
+            generator.writeStartArray();
+            for (String item0 : this.properties) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SetSecurityUserProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<SetSecurityUserProcessor> {
+        private String field;
+
+        @Nullable
+        private List<String> properties;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code properties}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>properties</code>.
+         */
+        public final Builder properties(List<String> list) {
+            this.properties = _listAddAll(this.properties, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code properties}
+         * <p>
+         * Adds one or more values to <code>properties</code>.
+         */
+        public final Builder properties(String value, String... values) {
+            this.properties = _listAdd(this.properties, value, values);
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SetSecurityUserProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SetSecurityUserProcessor build() {
+            _checkSingleUse();
+
+            return new SetSecurityUserProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SetSecurityUserProcessor}
+     */
+    public static final JsonpDeserializer<SetSecurityUserProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SetSecurityUserProcessor::setupSetSecurityUserProcessorDeserializer
+    );
+
+    protected static void setupSetSecurityUserProcessorDeserializer(ObjectDeserializer<SetSecurityUserProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::properties, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "properties");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ShapeType.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ShapeType.java
index 881fcfc679..f953a99d10 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ShapeType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ShapeType.java
@@ -35,25 +35,23 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum ShapeType implements JsonEnum {
-	GeoShape("geo_shape"),
+    GeoShape("geo_shape"),
 
-	Shape("shape"),
+    Shape("shape"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	ShapeType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    ShapeType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<ShapeType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			ShapeType.values());
+    public static final JsonEnum.Deserializer<ShapeType> _DESERIALIZER = new JsonEnum.Deserializer<>(ShapeType.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SimulateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SimulateRequest.java
index e2bf0af795..c24768ed99 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SimulateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SimulateRequest.java
@@ -32,285 +32,290 @@
 
 package org.opensearch.client.opensearch.ingest;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch.ingest.simulate.Document;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch.ingest.simulate.Document;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest.simulate.Request
 
 /**
  * Allows to simulate a pipeline with example documents.
- * 
+ *
  */
 @JsonpDeserializable
 public class SimulateRequest extends RequestBase implements JsonpSerializable {
-	private final List<Document> docs;
-
-	@Nullable
-	private final String id;
-
-	@Nullable
-	private final Pipeline pipeline;
-
-	@Nullable
-	private final Boolean verbose;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SimulateRequest(Builder builder) {
-
-		this.docs = ApiTypeHelper.unmodifiable(builder.docs);
-		this.id = builder.id;
-		this.pipeline = builder.pipeline;
-		this.verbose = builder.verbose;
-
-	}
-
-	public static SimulateRequest of(Function<Builder, ObjectBuilder<SimulateRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code docs}
-	 */
-	public final List<Document> docs() {
-		return this.docs;
-	}
-
-	/**
-	 * Pipeline ID
-	 * <p>
-	 * API name: {@code id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * API name: {@code pipeline}
-	 */
-	@Nullable
-	public final Pipeline pipeline() {
-		return this.pipeline;
-	}
-
-	/**
-	 * Verbose mode. Display data output for each processor in executed pipeline
-	 * <p>
-	 * API name: {@code verbose}
-	 */
-	@Nullable
-	public final Boolean verbose() {
-		return this.verbose;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.docs)) {
-			generator.writeKey("docs");
-			generator.writeStartArray();
-			for (Document item0 : this.docs) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.pipeline != null) {
-			generator.writeKey("pipeline");
-			this.pipeline.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SimulateRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SimulateRequest> {
-		@Nullable
-		private List<Document> docs;
-
-		@Nullable
-		private String id;
-
-		@Nullable
-		private Pipeline pipeline;
-
-		@Nullable
-		private Boolean verbose;
-
-		/**
-		 * API name: {@code docs}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>docs</code>.
-		 */
-		public final Builder docs(List<Document> list) {
-			this.docs = _listAddAll(this.docs, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code docs}
-		 * <p>
-		 * Adds one or more values to <code>docs</code>.
-		 */
-		public final Builder docs(Document value, Document... values) {
-			this.docs = _listAdd(this.docs, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code docs}
-		 * <p>
-		 * Adds a value to <code>docs</code> using a builder lambda.
-		 */
-		public final Builder docs(Function<Document.Builder, ObjectBuilder<Document>> fn) {
-			return docs(fn.apply(new Document.Builder()).build());
-		}
-
-		/**
-		 * Pipeline ID
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code pipeline}
-		 */
-		public final Builder pipeline(@Nullable Pipeline value) {
-			this.pipeline = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code pipeline}
-		 */
-		public final Builder pipeline(Function<Pipeline.Builder, ObjectBuilder<Pipeline>> fn) {
-			return this.pipeline(fn.apply(new Pipeline.Builder()).build());
-		}
-
-		/**
-		 * Verbose mode. Display data output for each processor in executed pipeline
-		 * <p>
-		 * API name: {@code verbose}
-		 */
-		public final Builder verbose(@Nullable Boolean value) {
-			this.verbose = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SimulateRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SimulateRequest build() {
-			_checkSingleUse();
-
-			return new SimulateRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SimulateRequest}
-	 */
-	public static final JsonpDeserializer<SimulateRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SimulateRequest::setupSimulateRequestDeserializer);
-
-	protected static void setupSimulateRequestDeserializer(ObjectDeserializer<SimulateRequest.Builder> op) {
-
-		op.add(Builder::docs, JsonpDeserializer.arrayDeserializer(Document._DESERIALIZER), "docs");
-		op.add(Builder::pipeline, Pipeline._DESERIALIZER, "pipeline");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code ingest.simulate}".
-	 */
-	public static final Endpoint<SimulateRequest, SimulateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _id = 1 << 0;
-
-				int propsSet = 0;
-
-				if (request.id() != null)
-					propsSet |= _id;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_ingest");
-					buf.append("/pipeline");
-					buf.append("/_simulate");
-					return buf.toString();
-				}
-				if (propsSet == (_id)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_ingest");
-					buf.append("/pipeline");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.id, buf);
-					buf.append("/_simulate");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.verbose != null) {
-					params.put("verbose", String.valueOf(request.verbose));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, SimulateResponse._DESERIALIZER);
+    private final List<Document> docs;
+
+    @Nullable
+    private final String id;
+
+    @Nullable
+    private final Pipeline pipeline;
+
+    @Nullable
+    private final Boolean verbose;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SimulateRequest(Builder builder) {
+
+        this.docs = ApiTypeHelper.unmodifiable(builder.docs);
+        this.id = builder.id;
+        this.pipeline = builder.pipeline;
+        this.verbose = builder.verbose;
+
+    }
+
+    public static SimulateRequest of(Function<Builder, ObjectBuilder<SimulateRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code docs}
+     */
+    public final List<Document> docs() {
+        return this.docs;
+    }
+
+    /**
+     * Pipeline ID
+     * <p>
+     * API name: {@code id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * API name: {@code pipeline}
+     */
+    @Nullable
+    public final Pipeline pipeline() {
+        return this.pipeline;
+    }
+
+    /**
+     * Verbose mode. Display data output for each processor in executed pipeline
+     * <p>
+     * API name: {@code verbose}
+     */
+    @Nullable
+    public final Boolean verbose() {
+        return this.verbose;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.docs)) {
+            generator.writeKey("docs");
+            generator.writeStartArray();
+            for (Document item0 : this.docs) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.pipeline != null) {
+            generator.writeKey("pipeline");
+            this.pipeline.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SimulateRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SimulateRequest> {
+        @Nullable
+        private List<Document> docs;
+
+        @Nullable
+        private String id;
+
+        @Nullable
+        private Pipeline pipeline;
+
+        @Nullable
+        private Boolean verbose;
+
+        /**
+         * API name: {@code docs}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>docs</code>.
+         */
+        public final Builder docs(List<Document> list) {
+            this.docs = _listAddAll(this.docs, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code docs}
+         * <p>
+         * Adds one or more values to <code>docs</code>.
+         */
+        public final Builder docs(Document value, Document... values) {
+            this.docs = _listAdd(this.docs, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code docs}
+         * <p>
+         * Adds a value to <code>docs</code> using a builder lambda.
+         */
+        public final Builder docs(Function<Document.Builder, ObjectBuilder<Document>> fn) {
+            return docs(fn.apply(new Document.Builder()).build());
+        }
+
+        /**
+         * Pipeline ID
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code pipeline}
+         */
+        public final Builder pipeline(@Nullable Pipeline value) {
+            this.pipeline = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code pipeline}
+         */
+        public final Builder pipeline(Function<Pipeline.Builder, ObjectBuilder<Pipeline>> fn) {
+            return this.pipeline(fn.apply(new Pipeline.Builder()).build());
+        }
+
+        /**
+         * Verbose mode. Display data output for each processor in executed pipeline
+         * <p>
+         * API name: {@code verbose}
+         */
+        public final Builder verbose(@Nullable Boolean value) {
+            this.verbose = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link SimulateRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SimulateRequest build() {
+            _checkSingleUse();
+
+            return new SimulateRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SimulateRequest}
+     */
+    public static final JsonpDeserializer<SimulateRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SimulateRequest::setupSimulateRequestDeserializer
+    );
+
+    protected static void setupSimulateRequestDeserializer(ObjectDeserializer<SimulateRequest.Builder> op) {
+
+        op.add(Builder::docs, JsonpDeserializer.arrayDeserializer(Document._DESERIALIZER), "docs");
+        op.add(Builder::pipeline, Pipeline._DESERIALIZER, "pipeline");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code ingest.simulate}".
+     */
+    public static final Endpoint<SimulateRequest, SimulateResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _id = 1 << 0;
+
+            int propsSet = 0;
+
+            if (request.id() != null) propsSet |= _id;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_ingest");
+                buf.append("/pipeline");
+                buf.append("/_simulate");
+                return buf.toString();
+            }
+            if (propsSet == (_id)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_ingest");
+                buf.append("/pipeline");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.id, buf);
+                buf.append("/_simulate");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.verbose != null) {
+                params.put("verbose", String.valueOf(request.verbose));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        SimulateResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SimulateResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SimulateResponse.java
index 2bea634dd1..5ca64baa0a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SimulateResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SimulateResponse.java
@@ -32,132 +32,134 @@
 
 package org.opensearch.client.opensearch.ingest;
 
-import org.opensearch.client.opensearch.ingest.simulate.PipelineSimulation;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.ingest.simulate.PipelineSimulation;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: ingest.simulate.Response
 
 @JsonpDeserializable
 public class SimulateResponse implements JsonpSerializable {
-	private final List<PipelineSimulation> docs;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SimulateResponse(Builder builder) {
-
-		this.docs = ApiTypeHelper.unmodifiableRequired(builder.docs, this, "docs");
-
-	}
-
-	public static SimulateResponse of(Function<Builder, ObjectBuilder<SimulateResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code docs}
-	 */
-	public final List<PipelineSimulation> docs() {
-		return this.docs;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.docs)) {
-			generator.writeKey("docs");
-			generator.writeStartArray();
-			for (PipelineSimulation item0 : this.docs) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SimulateResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SimulateResponse> {
-		private List<PipelineSimulation> docs;
-
-		/**
-		 * Required - API name: {@code docs}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>docs</code>.
-		 */
-		public final Builder docs(List<PipelineSimulation> list) {
-			this.docs = _listAddAll(this.docs, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code docs}
-		 * <p>
-		 * Adds one or more values to <code>docs</code>.
-		 */
-		public final Builder docs(PipelineSimulation value, PipelineSimulation... values) {
-			this.docs = _listAdd(this.docs, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code docs}
-		 * <p>
-		 * Adds a value to <code>docs</code> using a builder lambda.
-		 */
-		public final Builder docs(Function<PipelineSimulation.Builder, ObjectBuilder<PipelineSimulation>> fn) {
-			return docs(fn.apply(new PipelineSimulation.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link SimulateResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SimulateResponse build() {
-			_checkSingleUse();
-
-			return new SimulateResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SimulateResponse}
-	 */
-	public static final JsonpDeserializer<SimulateResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SimulateResponse::setupSimulateResponseDeserializer);
-
-	protected static void setupSimulateResponseDeserializer(ObjectDeserializer<SimulateResponse.Builder> op) {
-
-		op.add(Builder::docs, JsonpDeserializer.arrayDeserializer(PipelineSimulation._DESERIALIZER), "docs");
-
-	}
+    private final List<PipelineSimulation> docs;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SimulateResponse(Builder builder) {
+
+        this.docs = ApiTypeHelper.unmodifiableRequired(builder.docs, this, "docs");
+
+    }
+
+    public static SimulateResponse of(Function<Builder, ObjectBuilder<SimulateResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code docs}
+     */
+    public final List<PipelineSimulation> docs() {
+        return this.docs;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.docs)) {
+            generator.writeKey("docs");
+            generator.writeStartArray();
+            for (PipelineSimulation item0 : this.docs) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SimulateResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SimulateResponse> {
+        private List<PipelineSimulation> docs;
+
+        /**
+         * Required - API name: {@code docs}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>docs</code>.
+         */
+        public final Builder docs(List<PipelineSimulation> list) {
+            this.docs = _listAddAll(this.docs, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code docs}
+         * <p>
+         * Adds one or more values to <code>docs</code>.
+         */
+        public final Builder docs(PipelineSimulation value, PipelineSimulation... values) {
+            this.docs = _listAdd(this.docs, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code docs}
+         * <p>
+         * Adds a value to <code>docs</code> using a builder lambda.
+         */
+        public final Builder docs(Function<PipelineSimulation.Builder, ObjectBuilder<PipelineSimulation>> fn) {
+            return docs(fn.apply(new PipelineSimulation.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link SimulateResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SimulateResponse build() {
+            _checkSingleUse();
+
+            return new SimulateResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SimulateResponse}
+     */
+    public static final JsonpDeserializer<SimulateResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SimulateResponse::setupSimulateResponseDeserializer
+    );
+
+    protected static void setupSimulateResponseDeserializer(ObjectDeserializer<SimulateResponse.Builder> op) {
+
+        op.add(Builder::docs, JsonpDeserializer.arrayDeserializer(PipelineSimulation._DESERIALIZER), "docs");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SortProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SortProcessor.java
index d318f9e35f..4e556cfb8e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SortProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SortProcessor.java
@@ -32,154 +32,155 @@
 
 package org.opensearch.client.opensearch.ingest;
 
-import org.opensearch.client.opensearch._types.SortOrder;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.SortOrder;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: ingest._types.SortProcessor
 
-
 @JsonpDeserializable
 public class SortProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
-
-	private final SortOrder order;
-
-	private final String targetField;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SortProcessor(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.order = ApiTypeHelper.requireNonNull(builder.order, this, "order");
-		this.targetField = ApiTypeHelper.requireNonNull(builder.targetField, this, "targetField");
-
-	}
-
-	public static SortProcessor of(Function<Builder, ObjectBuilder<SortProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Sort;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required - API name: {@code order}
-	 */
-	public final SortOrder order() {
-		return this.order;
-	}
-
-	/**
-	 * Required - API name: {@code target_field}
-	 */
-	public final String targetField() {
-		return this.targetField;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		generator.writeKey("order");
-		this.order.serialize(generator, mapper);
-		generator.writeKey("target_field");
-		generator.write(this.targetField);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SortProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<SortProcessor> {
-		private String field;
-
-		private SortOrder order;
-
-		private String targetField;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code order}
-		 */
-		public final Builder order(SortOrder value) {
-			this.order = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code target_field}
-		 */
-		public final Builder targetField(String value) {
-			this.targetField = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SortProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SortProcessor build() {
-			_checkSingleUse();
-
-			return new SortProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SortProcessor}
-	 */
-	public static final JsonpDeserializer<SortProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SortProcessor::setupSortProcessorDeserializer);
-
-	protected static void setupSortProcessorDeserializer(ObjectDeserializer<SortProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::order, SortOrder._DESERIALIZER, "order");
-		op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
-
-	}
+    private final String field;
+
+    private final SortOrder order;
+
+    private final String targetField;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SortProcessor(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.order = ApiTypeHelper.requireNonNull(builder.order, this, "order");
+        this.targetField = ApiTypeHelper.requireNonNull(builder.targetField, this, "targetField");
+
+    }
+
+    public static SortProcessor of(Function<Builder, ObjectBuilder<SortProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Sort;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required - API name: {@code order}
+     */
+    public final SortOrder order() {
+        return this.order;
+    }
+
+    /**
+     * Required - API name: {@code target_field}
+     */
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        generator.writeKey("order");
+        this.order.serialize(generator, mapper);
+        generator.writeKey("target_field");
+        generator.write(this.targetField);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SortProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<SortProcessor> {
+        private String field;
+
+        private SortOrder order;
+
+        private String targetField;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code order}
+         */
+        public final Builder order(SortOrder value) {
+            this.order = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code target_field}
+         */
+        public final Builder targetField(String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SortProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SortProcessor build() {
+            _checkSingleUse();
+
+            return new SortProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SortProcessor}
+     */
+    public static final JsonpDeserializer<SortProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SortProcessor::setupSortProcessorDeserializer
+    );
+
+    protected static void setupSortProcessorDeserializer(ObjectDeserializer<SortProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::order, SortOrder._DESERIALIZER, "order");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SplitProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SplitProcessor.java
index 67a97ac5c5..4cc9ceed46 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SplitProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/SplitProcessor.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,214 +42,210 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.SplitProcessor
 
-
 @JsonpDeserializable
 public class SplitProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
-
-	@Nullable
-	private final Boolean ignoreMissing;
-
-	@Nullable
-	private final Boolean preserveTrailing;
-
-	private final String separator;
-
-	@Nullable
-	private final String targetField;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SplitProcessor(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.ignoreMissing = builder.ignoreMissing;
-		this.preserveTrailing = builder.preserveTrailing;
-		this.separator = ApiTypeHelper.requireNonNull(builder.separator, this, "separator");
-		this.targetField = builder.targetField;
-
-	}
+    private final String field;
+
+    @Nullable
+    private final Boolean ignoreMissing;
+
+    @Nullable
+    private final Boolean preserveTrailing;
+
+    private final String separator;
+
+    @Nullable
+    private final String targetField;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SplitProcessor(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.ignoreMissing = builder.ignoreMissing;
+        this.preserveTrailing = builder.preserveTrailing;
+        this.separator = ApiTypeHelper.requireNonNull(builder.separator, this, "separator");
+        this.targetField = builder.targetField;
+
+    }
 
-	public static SplitProcessor of(Function<Builder, ObjectBuilder<SplitProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Split;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code ignore_missing}
-	 */
-	@Nullable
-	public final Boolean ignoreMissing() {
-		return this.ignoreMissing;
-	}
-
-	/**
-	 * API name: {@code preserve_trailing}
-	 */
-	@Nullable
-	public final Boolean preserveTrailing() {
-		return this.preserveTrailing;
-	}
-
-	/**
-	 * Required - API name: {@code separator}
-	 */
-	public final String separator() {
-		return this.separator;
-	}
-
-	/**
-	 * API name: {@code target_field}
-	 */
-	@Nullable
-	public final String targetField() {
-		return this.targetField;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.ignoreMissing != null) {
-			generator.writeKey("ignore_missing");
-			generator.write(this.ignoreMissing);
-
-		}
-		if (this.preserveTrailing != null) {
-			generator.writeKey("preserve_trailing");
-			generator.write(this.preserveTrailing);
-
-		}
-		generator.writeKey("separator");
-		generator.write(this.separator);
-
-		if (this.targetField != null) {
-			generator.writeKey("target_field");
-			generator.write(this.targetField);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SplitProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<SplitProcessor> {
-		private String field;
-
-		@Nullable
-		private Boolean ignoreMissing;
-
-		@Nullable
-		private Boolean preserveTrailing;
-
-		private String separator;
-
-		@Nullable
-		private String targetField;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_missing}
-		 */
-		public final Builder ignoreMissing(@Nullable Boolean value) {
-			this.ignoreMissing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code preserve_trailing}
-		 */
-		public final Builder preserveTrailing(@Nullable Boolean value) {
-			this.preserveTrailing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code separator}
-		 */
-		public final Builder separator(String value) {
-			this.separator = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code target_field}
-		 */
-		public final Builder targetField(@Nullable String value) {
-			this.targetField = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SplitProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SplitProcessor build() {
-			_checkSingleUse();
-
-			return new SplitProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SplitProcessor}
-	 */
-	public static final JsonpDeserializer<SplitProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SplitProcessor::setupSplitProcessorDeserializer);
-
-	protected static void setupSplitProcessorDeserializer(ObjectDeserializer<SplitProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
-		op.add(Builder::preserveTrailing, JsonpDeserializer.booleanDeserializer(), "preserve_trailing");
-		op.add(Builder::separator, JsonpDeserializer.stringDeserializer(), "separator");
-		op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
-
-	}
+    public static SplitProcessor of(Function<Builder, ObjectBuilder<SplitProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Split;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code ignore_missing}
+     */
+    @Nullable
+    public final Boolean ignoreMissing() {
+        return this.ignoreMissing;
+    }
+
+    /**
+     * API name: {@code preserve_trailing}
+     */
+    @Nullable
+    public final Boolean preserveTrailing() {
+        return this.preserveTrailing;
+    }
+
+    /**
+     * Required - API name: {@code separator}
+     */
+    public final String separator() {
+        return this.separator;
+    }
+
+    /**
+     * API name: {@code target_field}
+     */
+    @Nullable
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.ignoreMissing != null) {
+            generator.writeKey("ignore_missing");
+            generator.write(this.ignoreMissing);
+
+        }
+        if (this.preserveTrailing != null) {
+            generator.writeKey("preserve_trailing");
+            generator.write(this.preserveTrailing);
+
+        }
+        generator.writeKey("separator");
+        generator.write(this.separator);
+
+        if (this.targetField != null) {
+            generator.writeKey("target_field");
+            generator.write(this.targetField);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SplitProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<SplitProcessor> {
+        private String field;
+
+        @Nullable
+        private Boolean ignoreMissing;
+
+        @Nullable
+        private Boolean preserveTrailing;
+
+        private String separator;
+
+        @Nullable
+        private String targetField;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_missing}
+         */
+        public final Builder ignoreMissing(@Nullable Boolean value) {
+            this.ignoreMissing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code preserve_trailing}
+         */
+        public final Builder preserveTrailing(@Nullable Boolean value) {
+            this.preserveTrailing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code separator}
+         */
+        public final Builder separator(String value) {
+            this.separator = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code target_field}
+         */
+        public final Builder targetField(@Nullable String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link SplitProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SplitProcessor build() {
+            _checkSingleUse();
+
+            return new SplitProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SplitProcessor}
+     */
+    public static final JsonpDeserializer<SplitProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SplitProcessor::setupSplitProcessorDeserializer
+    );
+
+    protected static void setupSplitProcessorDeserializer(ObjectDeserializer<SplitProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
+        op.add(Builder::preserveTrailing, JsonpDeserializer.booleanDeserializer(), "preserve_trailing");
+        op.add(Builder::separator, JsonpDeserializer.stringDeserializer(), "separator");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/TrimProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/TrimProcessor.java
index a07bf5dcaf..ad826e8dbd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/TrimProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/TrimProcessor.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,159 +42,157 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.TrimProcessor
 
-
 @JsonpDeserializable
 public class TrimProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
-
-	@Nullable
-	private final Boolean ignoreMissing;
-
-	@Nullable
-	private final String targetField;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TrimProcessor(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.ignoreMissing = builder.ignoreMissing;
-		this.targetField = builder.targetField;
-
-	}
-
-	public static TrimProcessor of(Function<Builder, ObjectBuilder<TrimProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Trim;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code ignore_missing}
-	 */
-	@Nullable
-	public final Boolean ignoreMissing() {
-		return this.ignoreMissing;
-	}
-
-	/**
-	 * API name: {@code target_field}
-	 */
-	@Nullable
-	public final String targetField() {
-		return this.targetField;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.ignoreMissing != null) {
-			generator.writeKey("ignore_missing");
-			generator.write(this.ignoreMissing);
-
-		}
-		if (this.targetField != null) {
-			generator.writeKey("target_field");
-			generator.write(this.targetField);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TrimProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<TrimProcessor> {
-		private String field;
-
-		@Nullable
-		private Boolean ignoreMissing;
-
-		@Nullable
-		private String targetField;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_missing}
-		 */
-		public final Builder ignoreMissing(@Nullable Boolean value) {
-			this.ignoreMissing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code target_field}
-		 */
-		public final Builder targetField(@Nullable String value) {
-			this.targetField = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TrimProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TrimProcessor build() {
-			_checkSingleUse();
-
-			return new TrimProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TrimProcessor}
-	 */
-	public static final JsonpDeserializer<TrimProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			TrimProcessor::setupTrimProcessorDeserializer);
-
-	protected static void setupTrimProcessorDeserializer(ObjectDeserializer<TrimProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
-		op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
-
-	}
+    private final String field;
+
+    @Nullable
+    private final Boolean ignoreMissing;
+
+    @Nullable
+    private final String targetField;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TrimProcessor(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.ignoreMissing = builder.ignoreMissing;
+        this.targetField = builder.targetField;
+
+    }
+
+    public static TrimProcessor of(Function<Builder, ObjectBuilder<TrimProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Trim;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code ignore_missing}
+     */
+    @Nullable
+    public final Boolean ignoreMissing() {
+        return this.ignoreMissing;
+    }
+
+    /**
+     * API name: {@code target_field}
+     */
+    @Nullable
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.ignoreMissing != null) {
+            generator.writeKey("ignore_missing");
+            generator.write(this.ignoreMissing);
+
+        }
+        if (this.targetField != null) {
+            generator.writeKey("target_field");
+            generator.write(this.targetField);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TrimProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<TrimProcessor> {
+        private String field;
+
+        @Nullable
+        private Boolean ignoreMissing;
+
+        @Nullable
+        private String targetField;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_missing}
+         */
+        public final Builder ignoreMissing(@Nullable Boolean value) {
+            this.ignoreMissing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code target_field}
+         */
+        public final Builder targetField(@Nullable String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TrimProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TrimProcessor build() {
+            _checkSingleUse();
+
+            return new TrimProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TrimProcessor}
+     */
+    public static final JsonpDeserializer<TrimProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TrimProcessor::setupTrimProcessorDeserializer
+    );
+
+    protected static void setupTrimProcessorDeserializer(ObjectDeserializer<TrimProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/UppercaseProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/UppercaseProcessor.java
index 6b709bc41f..a1d33c0468 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/UppercaseProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/UppercaseProcessor.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,161 +42,157 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.UppercaseProcessor
 
-
 @JsonpDeserializable
 public class UppercaseProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
-
-	@Nullable
-	private final Boolean ignoreMissing;
-
-	@Nullable
-	private final String targetField;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private UppercaseProcessor(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.ignoreMissing = builder.ignoreMissing;
-		this.targetField = builder.targetField;
-
-	}
-
-	public static UppercaseProcessor of(Function<Builder, ObjectBuilder<UppercaseProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Uppercase;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code ignore_missing}
-	 */
-	@Nullable
-	public final Boolean ignoreMissing() {
-		return this.ignoreMissing;
-	}
-
-	/**
-	 * API name: {@code target_field}
-	 */
-	@Nullable
-	public final String targetField() {
-		return this.targetField;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.ignoreMissing != null) {
-			generator.writeKey("ignore_missing");
-			generator.write(this.ignoreMissing);
-
-		}
-		if (this.targetField != null) {
-			generator.writeKey("target_field");
-			generator.write(this.targetField);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UppercaseProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<UppercaseProcessor> {
-		private String field;
-
-		@Nullable
-		private Boolean ignoreMissing;
-
-		@Nullable
-		private String targetField;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_missing}
-		 */
-		public final Builder ignoreMissing(@Nullable Boolean value) {
-			this.ignoreMissing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code target_field}
-		 */
-		public final Builder targetField(@Nullable String value) {
-			this.targetField = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link UppercaseProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UppercaseProcessor build() {
-			_checkSingleUse();
-
-			return new UppercaseProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link UppercaseProcessor}
-	 */
-	public static final JsonpDeserializer<UppercaseProcessor> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, UppercaseProcessor::setupUppercaseProcessorDeserializer);
-
-	protected static void setupUppercaseProcessorDeserializer(ObjectDeserializer<UppercaseProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
-		op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
-
-	}
+    private final String field;
+
+    @Nullable
+    private final Boolean ignoreMissing;
+
+    @Nullable
+    private final String targetField;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private UppercaseProcessor(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.ignoreMissing = builder.ignoreMissing;
+        this.targetField = builder.targetField;
+
+    }
+
+    public static UppercaseProcessor of(Function<Builder, ObjectBuilder<UppercaseProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Uppercase;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code ignore_missing}
+     */
+    @Nullable
+    public final Boolean ignoreMissing() {
+        return this.ignoreMissing;
+    }
+
+    /**
+     * API name: {@code target_field}
+     */
+    @Nullable
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.ignoreMissing != null) {
+            generator.writeKey("ignore_missing");
+            generator.write(this.ignoreMissing);
+
+        }
+        if (this.targetField != null) {
+            generator.writeKey("target_field");
+            generator.write(this.targetField);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UppercaseProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<UppercaseProcessor> {
+        private String field;
+
+        @Nullable
+        private Boolean ignoreMissing;
+
+        @Nullable
+        private String targetField;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_missing}
+         */
+        public final Builder ignoreMissing(@Nullable Boolean value) {
+            this.ignoreMissing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code target_field}
+         */
+        public final Builder targetField(@Nullable String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link UppercaseProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UppercaseProcessor build() {
+            _checkSingleUse();
+
+            return new UppercaseProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link UppercaseProcessor}
+     */
+    public static final JsonpDeserializer<UppercaseProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        UppercaseProcessor::setupUppercaseProcessorDeserializer
+    );
+
+    protected static void setupUppercaseProcessorDeserializer(ObjectDeserializer<UppercaseProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/UrlDecodeProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/UrlDecodeProcessor.java
index 45021eeecf..0c92d8fcbf 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/UrlDecodeProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/UrlDecodeProcessor.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,161 +42,157 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest._types.UrlDecodeProcessor
 
-
 @JsonpDeserializable
 public class UrlDecodeProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
-
-	@Nullable
-	private final Boolean ignoreMissing;
-
-	@Nullable
-	private final String targetField;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private UrlDecodeProcessor(Builder builder) {
-		super(builder);
-
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.ignoreMissing = builder.ignoreMissing;
-		this.targetField = builder.targetField;
-
-	}
-
-	public static UrlDecodeProcessor of(Function<Builder, ObjectBuilder<UrlDecodeProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.Urldecode;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * API name: {@code ignore_missing}
-	 */
-	@Nullable
-	public final Boolean ignoreMissing() {
-		return this.ignoreMissing;
-	}
-
-	/**
-	 * API name: {@code target_field}
-	 */
-	@Nullable
-	public final String targetField() {
-		return this.targetField;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		if (this.ignoreMissing != null) {
-			generator.writeKey("ignore_missing");
-			generator.write(this.ignoreMissing);
-
-		}
-		if (this.targetField != null) {
-			generator.writeKey("target_field");
-			generator.write(this.targetField);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UrlDecodeProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<UrlDecodeProcessor> {
-		private String field;
-
-		@Nullable
-		private Boolean ignoreMissing;
-
-		@Nullable
-		private String targetField;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_missing}
-		 */
-		public final Builder ignoreMissing(@Nullable Boolean value) {
-			this.ignoreMissing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code target_field}
-		 */
-		public final Builder targetField(@Nullable String value) {
-			this.targetField = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link UrlDecodeProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UrlDecodeProcessor build() {
-			_checkSingleUse();
-
-			return new UrlDecodeProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link UrlDecodeProcessor}
-	 */
-	public static final JsonpDeserializer<UrlDecodeProcessor> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, UrlDecodeProcessor::setupUrlDecodeProcessorDeserializer);
-
-	protected static void setupUrlDecodeProcessorDeserializer(ObjectDeserializer<UrlDecodeProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
-		op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
-
-	}
+    private final String field;
+
+    @Nullable
+    private final Boolean ignoreMissing;
+
+    @Nullable
+    private final String targetField;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private UrlDecodeProcessor(Builder builder) {
+        super(builder);
+
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.ignoreMissing = builder.ignoreMissing;
+        this.targetField = builder.targetField;
+
+    }
+
+    public static UrlDecodeProcessor of(Function<Builder, ObjectBuilder<UrlDecodeProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.Urldecode;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * API name: {@code ignore_missing}
+     */
+    @Nullable
+    public final Boolean ignoreMissing() {
+        return this.ignoreMissing;
+    }
+
+    /**
+     * API name: {@code target_field}
+     */
+    @Nullable
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        if (this.ignoreMissing != null) {
+            generator.writeKey("ignore_missing");
+            generator.write(this.ignoreMissing);
+
+        }
+        if (this.targetField != null) {
+            generator.writeKey("target_field");
+            generator.write(this.targetField);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UrlDecodeProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<UrlDecodeProcessor> {
+        private String field;
+
+        @Nullable
+        private Boolean ignoreMissing;
+
+        @Nullable
+        private String targetField;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_missing}
+         */
+        public final Builder ignoreMissing(@Nullable Boolean value) {
+            this.ignoreMissing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code target_field}
+         */
+        public final Builder targetField(@Nullable String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link UrlDecodeProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UrlDecodeProcessor build() {
+            _checkSingleUse();
+
+            return new UrlDecodeProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link UrlDecodeProcessor}
+     */
+    public static final JsonpDeserializer<UrlDecodeProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        UrlDecodeProcessor::setupUrlDecodeProcessorDeserializer
+    );
+
+    protected static void setupUrlDecodeProcessorDeserializer(ObjectDeserializer<UrlDecodeProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/UserAgentProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/UserAgentProcessor.java
index 2a79143307..0e1f978869 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/UserAgentProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/UserAgentProcessor.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,216 +42,212 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: ingest._types.UserAgentProcessor
 
-
 @JsonpDeserializable
 public class UserAgentProcessor extends ProcessorBase implements ProcessorVariant {
-	private final String field;
+    private final String field;
+
+    private final boolean ignoreMissing;
+
+    private final List<UserAgentProperty> options;
+
+    private final String regexFile;
 
-	private final boolean ignoreMissing;
-
-	private final List<UserAgentProperty> options;
-
-	private final String regexFile;
-
-	private final String targetField;
+    private final String targetField;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private UserAgentProcessor(Builder builder) {
-		super(builder);
+    private UserAgentProcessor(Builder builder) {
+        super(builder);
 
-		this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
-		this.ignoreMissing = ApiTypeHelper.requireNonNull(builder.ignoreMissing, this, "ignoreMissing");
-		this.options = ApiTypeHelper.unmodifiableRequired(builder.options, this, "options");
-		this.regexFile = ApiTypeHelper.requireNonNull(builder.regexFile, this, "regexFile");
-		this.targetField = ApiTypeHelper.requireNonNull(builder.targetField, this, "targetField");
+        this.field = ApiTypeHelper.requireNonNull(builder.field, this, "field");
+        this.ignoreMissing = ApiTypeHelper.requireNonNull(builder.ignoreMissing, this, "ignoreMissing");
+        this.options = ApiTypeHelper.unmodifiableRequired(builder.options, this, "options");
+        this.regexFile = ApiTypeHelper.requireNonNull(builder.regexFile, this, "regexFile");
+        this.targetField = ApiTypeHelper.requireNonNull(builder.targetField, this, "targetField");
 
-	}
+    }
 
-	public static UserAgentProcessor of(Function<Builder, ObjectBuilder<UserAgentProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static UserAgentProcessor of(Function<Builder, ObjectBuilder<UserAgentProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Processor variant kind.
-	 */
-	@Override
-	public Processor.Kind _processorKind() {
-		return Processor.Kind.UserAgent;
-	}
-
-	/**
-	 * Required - API name: {@code field}
-	 */
-	public final String field() {
-		return this.field;
-	}
-
-	/**
-	 * Required - API name: {@code ignore_missing}
-	 */
-	public final boolean ignoreMissing() {
-		return this.ignoreMissing;
-	}
-
-	/**
-	 * Required - API name: {@code options}
-	 */
-	public final List<UserAgentProperty> options() {
-		return this.options;
-	}
-
-	/**
-	 * Required - API name: {@code regex_file}
-	 */
-	public final String regexFile() {
-		return this.regexFile;
-	}
-
-	/**
-	 * Required - API name: {@code target_field}
-	 */
-	public final String targetField() {
-		return this.targetField;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("field");
-		generator.write(this.field);
-
-		generator.writeKey("ignore_missing");
-		generator.write(this.ignoreMissing);
-
-		if (ApiTypeHelper.isDefined(this.options)) {
-			generator.writeKey("options");
-			generator.writeStartArray();
-			for (UserAgentProperty item0 : this.options) {
-				item0.serialize(generator, mapper);
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("regex_file");
-		generator.write(this.regexFile);
-
-		generator.writeKey("target_field");
-		generator.write(this.targetField);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link UserAgentProcessor}.
-	 */
-
-	public static class Builder extends ProcessorBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<UserAgentProcessor> {
-		private String field;
-
-		private Boolean ignoreMissing;
-
-		private List<UserAgentProperty> options;
-
-		private String regexFile;
-
-		private String targetField;
-
-		/**
-		 * Required - API name: {@code field}
-		 */
-		public final Builder field(String value) {
-			this.field = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code ignore_missing}
-		 */
-		public final Builder ignoreMissing(boolean value) {
-			this.ignoreMissing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code options}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>options</code>.
-		 */
-		public final Builder options(List<UserAgentProperty> list) {
-			this.options = _listAddAll(this.options, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code options}
-		 * <p>
-		 * Adds one or more values to <code>options</code>.
-		 */
-		public final Builder options(UserAgentProperty value, UserAgentProperty... values) {
-			this.options = _listAdd(this.options, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code regex_file}
-		 */
-		public final Builder regexFile(String value) {
-			this.regexFile = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code target_field}
-		 */
-		public final Builder targetField(String value) {
-			this.targetField = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link UserAgentProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public UserAgentProcessor build() {
-			_checkSingleUse();
-
-			return new UserAgentProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link UserAgentProcessor}
-	 */
-	public static final JsonpDeserializer<UserAgentProcessor> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, UserAgentProcessor::setupUserAgentProcessorDeserializer);
-
-	protected static void setupUserAgentProcessorDeserializer(ObjectDeserializer<UserAgentProcessor.Builder> op) {
-		setupProcessorBaseDeserializer(op);
-		op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
-		op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
-		op.add(Builder::options, JsonpDeserializer.arrayDeserializer(UserAgentProperty._DESERIALIZER), "options");
-		op.add(Builder::regexFile, JsonpDeserializer.stringDeserializer(), "regex_file");
-		op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
-
-	}
+    /**
+     * Processor variant kind.
+     */
+    @Override
+    public Processor.Kind _processorKind() {
+        return Processor.Kind.UserAgent;
+    }
+
+    /**
+     * Required - API name: {@code field}
+     */
+    public final String field() {
+        return this.field;
+    }
+
+    /**
+     * Required - API name: {@code ignore_missing}
+     */
+    public final boolean ignoreMissing() {
+        return this.ignoreMissing;
+    }
+
+    /**
+     * Required - API name: {@code options}
+     */
+    public final List<UserAgentProperty> options() {
+        return this.options;
+    }
+
+    /**
+     * Required - API name: {@code regex_file}
+     */
+    public final String regexFile() {
+        return this.regexFile;
+    }
+
+    /**
+     * Required - API name: {@code target_field}
+     */
+    public final String targetField() {
+        return this.targetField;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("field");
+        generator.write(this.field);
+
+        generator.writeKey("ignore_missing");
+        generator.write(this.ignoreMissing);
+
+        if (ApiTypeHelper.isDefined(this.options)) {
+            generator.writeKey("options");
+            generator.writeStartArray();
+            for (UserAgentProperty item0 : this.options) {
+                item0.serialize(generator, mapper);
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("regex_file");
+        generator.write(this.regexFile);
+
+        generator.writeKey("target_field");
+        generator.write(this.targetField);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link UserAgentProcessor}.
+     */
+
+    public static class Builder extends ProcessorBase.AbstractBuilder<Builder> implements ObjectBuilder<UserAgentProcessor> {
+        private String field;
+
+        private Boolean ignoreMissing;
+
+        private List<UserAgentProperty> options;
+
+        private String regexFile;
+
+        private String targetField;
+
+        /**
+         * Required - API name: {@code field}
+         */
+        public final Builder field(String value) {
+            this.field = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code ignore_missing}
+         */
+        public final Builder ignoreMissing(boolean value) {
+            this.ignoreMissing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code options}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>options</code>.
+         */
+        public final Builder options(List<UserAgentProperty> list) {
+            this.options = _listAddAll(this.options, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code options}
+         * <p>
+         * Adds one or more values to <code>options</code>.
+         */
+        public final Builder options(UserAgentProperty value, UserAgentProperty... values) {
+            this.options = _listAdd(this.options, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code regex_file}
+         */
+        public final Builder regexFile(String value) {
+            this.regexFile = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code target_field}
+         */
+        public final Builder targetField(String value) {
+            this.targetField = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link UserAgentProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public UserAgentProcessor build() {
+            _checkSingleUse();
+
+            return new UserAgentProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link UserAgentProcessor}
+     */
+    public static final JsonpDeserializer<UserAgentProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        UserAgentProcessor::setupUserAgentProcessorDeserializer
+    );
+
+    protected static void setupUserAgentProcessorDeserializer(ObjectDeserializer<UserAgentProcessor.Builder> op) {
+        setupProcessorBaseDeserializer(op);
+        op.add(Builder::field, JsonpDeserializer.stringDeserializer(), "field");
+        op.add(Builder::ignoreMissing, JsonpDeserializer.booleanDeserializer(), "ignore_missing");
+        op.add(Builder::options, JsonpDeserializer.arrayDeserializer(UserAgentProperty._DESERIALIZER), "options");
+        op.add(Builder::regexFile, JsonpDeserializer.stringDeserializer(), "regex_file");
+        op.add(Builder::targetField, JsonpDeserializer.stringDeserializer(), "target_field");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/UserAgentProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/UserAgentProperty.java
index f91778538b..a2281ec7f3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/UserAgentProperty.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/UserAgentProperty.java
@@ -35,41 +35,39 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum UserAgentProperty implements JsonEnum {
-	Name("NAME"),
+    Name("NAME"),
 
-	Major("MAJOR"),
+    Major("MAJOR"),
 
-	Minor("MINOR"),
+    Minor("MINOR"),
 
-	Patch("PATCH"),
+    Patch("PATCH"),
 
-	Os("OS"),
+    Os("OS"),
 
-	OsName("OS_NAME"),
+    OsName("OS_NAME"),
 
-	OsMajor("OS_MAJOR"),
+    OsMajor("OS_MAJOR"),
 
-	OsMinor("OS_MINOR"),
+    OsMinor("OS_MINOR"),
 
-	Device("DEVICE"),
+    Device("DEVICE"),
 
-	Build("BUILD"),
+    Build("BUILD"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	UserAgentProperty(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    UserAgentProperty(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<UserAgentProperty> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			UserAgentProperty.values());
+    public static final JsonEnum.Deserializer<UserAgentProperty> _DESERIALIZER = new JsonEnum.Deserializer<>(UserAgentProperty.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/geo_ip_stats/GeoIpDownloadStatistics.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/geo_ip_stats/GeoIpDownloadStatistics.java
index 6a82c7d342..0aceae8857 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/geo_ip_stats/GeoIpDownloadStatistics.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/geo_ip_stats/GeoIpDownloadStatistics.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.ingest.geo_ip_stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,211 +43,208 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: ingest.geo_ip_stats.GeoIpDownloadStatistics
 
-
 @JsonpDeserializable
 public class GeoIpDownloadStatistics implements JsonpSerializable {
-	private final int successfulDownloads;
-
-	private final int failedDownloads;
-
-	private final int totalDownloadTime;
-
-	private final int databaseCount;
-
-	private final int skippedUpdates;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoIpDownloadStatistics(Builder builder) {
+    private final int successfulDownloads;
+
+    private final int failedDownloads;
+
+    private final int totalDownloadTime;
+
+    private final int databaseCount;
+
+    private final int skippedUpdates;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoIpDownloadStatistics(Builder builder) {
 
-		this.successfulDownloads = ApiTypeHelper.requireNonNull(builder.successfulDownloads, this,
-				"successfulDownloads");
-		this.failedDownloads = ApiTypeHelper.requireNonNull(builder.failedDownloads, this, "failedDownloads");
-		this.totalDownloadTime = ApiTypeHelper.requireNonNull(builder.totalDownloadTime, this, "totalDownloadTime");
-		this.databaseCount = ApiTypeHelper.requireNonNull(builder.databaseCount, this, "databaseCount");
-		this.skippedUpdates = ApiTypeHelper.requireNonNull(builder.skippedUpdates, this, "skippedUpdates");
+        this.successfulDownloads = ApiTypeHelper.requireNonNull(builder.successfulDownloads, this, "successfulDownloads");
+        this.failedDownloads = ApiTypeHelper.requireNonNull(builder.failedDownloads, this, "failedDownloads");
+        this.totalDownloadTime = ApiTypeHelper.requireNonNull(builder.totalDownloadTime, this, "totalDownloadTime");
+        this.databaseCount = ApiTypeHelper.requireNonNull(builder.databaseCount, this, "databaseCount");
+        this.skippedUpdates = ApiTypeHelper.requireNonNull(builder.skippedUpdates, this, "skippedUpdates");
 
-	}
+    }
 
-	public static GeoIpDownloadStatistics of(Function<Builder, ObjectBuilder<GeoIpDownloadStatistics>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static GeoIpDownloadStatistics of(Function<Builder, ObjectBuilder<GeoIpDownloadStatistics>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - Total number of successful database downloads.
-	 * <p>
-	 * API name: {@code successful_downloads}
-	 */
-	public final int successfulDownloads() {
-		return this.successfulDownloads;
-	}
-
-	/**
-	 * Required - Total number of failed database downloads.
-	 * <p>
-	 * API name: {@code failed_downloads}
-	 */
-	public final int failedDownloads() {
-		return this.failedDownloads;
-	}
-
-	/**
-	 * Required - Total milliseconds spent downloading databases.
-	 * <p>
-	 * API name: {@code total_download_time}
-	 */
-	public final int totalDownloadTime() {
-		return this.totalDownloadTime;
-	}
-
-	/**
-	 * Required - Current number of databases available for use.
-	 * <p>
-	 * API name: {@code database_count}
-	 */
-	public final int databaseCount() {
-		return this.databaseCount;
-	}
-
-	/**
-	 * Required - Total number of database updates skipped.
-	 * <p>
-	 * API name: {@code skipped_updates}
-	 */
-	public final int skippedUpdates() {
-		return this.skippedUpdates;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("successful_downloads");
-		generator.write(this.successfulDownloads);
-
-		generator.writeKey("failed_downloads");
-		generator.write(this.failedDownloads);
-
-		generator.writeKey("total_download_time");
-		generator.write(this.totalDownloadTime);
-
-		generator.writeKey("database_count");
-		generator.write(this.databaseCount);
-
-		generator.writeKey("skipped_updates");
-		generator.write(this.skippedUpdates);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoIpDownloadStatistics}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoIpDownloadStatistics> {
-		private Integer successfulDownloads;
-
-		private Integer failedDownloads;
-
-		private Integer totalDownloadTime;
-
-		private Integer databaseCount;
-
-		private Integer skippedUpdates;
-
-		/**
-		 * Required - Total number of successful database downloads.
-		 * <p>
-		 * API name: {@code successful_downloads}
-		 */
-		public final Builder successfulDownloads(int value) {
-			this.successfulDownloads = value;
-			return this;
-		}
-
-		/**
-		 * Required - Total number of failed database downloads.
-		 * <p>
-		 * API name: {@code failed_downloads}
-		 */
-		public final Builder failedDownloads(int value) {
-			this.failedDownloads = value;
-			return this;
-		}
-
-		/**
-		 * Required - Total milliseconds spent downloading databases.
-		 * <p>
-		 * API name: {@code total_download_time}
-		 */
-		public final Builder totalDownloadTime(int value) {
-			this.totalDownloadTime = value;
-			return this;
-		}
-
-		/**
-		 * Required - Current number of databases available for use.
-		 * <p>
-		 * API name: {@code database_count}
-		 */
-		public final Builder databaseCount(int value) {
-			this.databaseCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - Total number of database updates skipped.
-		 * <p>
-		 * API name: {@code skipped_updates}
-		 */
-		public final Builder skippedUpdates(int value) {
-			this.skippedUpdates = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoIpDownloadStatistics}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoIpDownloadStatistics build() {
-			_checkSingleUse();
-
-			return new GeoIpDownloadStatistics(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoIpDownloadStatistics}
-	 */
-	public static final JsonpDeserializer<GeoIpDownloadStatistics> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GeoIpDownloadStatistics::setupGeoIpDownloadStatisticsDeserializer);
-
-	protected static void setupGeoIpDownloadStatisticsDeserializer(
-			ObjectDeserializer<GeoIpDownloadStatistics.Builder> op) {
-
-		op.add(Builder::successfulDownloads, JsonpDeserializer.integerDeserializer(), "successful_downloads");
-		op.add(Builder::failedDownloads, JsonpDeserializer.integerDeserializer(), "failed_downloads");
-		op.add(Builder::totalDownloadTime, JsonpDeserializer.integerDeserializer(), "total_download_time");
-		op.add(Builder::databaseCount, JsonpDeserializer.integerDeserializer(), "database_count");
-		op.add(Builder::skippedUpdates, JsonpDeserializer.integerDeserializer(), "skipped_updates");
-
-	}
+    /**
+     * Required - Total number of successful database downloads.
+     * <p>
+     * API name: {@code successful_downloads}
+     */
+    public final int successfulDownloads() {
+        return this.successfulDownloads;
+    }
+
+    /**
+     * Required - Total number of failed database downloads.
+     * <p>
+     * API name: {@code failed_downloads}
+     */
+    public final int failedDownloads() {
+        return this.failedDownloads;
+    }
+
+    /**
+     * Required - Total milliseconds spent downloading databases.
+     * <p>
+     * API name: {@code total_download_time}
+     */
+    public final int totalDownloadTime() {
+        return this.totalDownloadTime;
+    }
+
+    /**
+     * Required - Current number of databases available for use.
+     * <p>
+     * API name: {@code database_count}
+     */
+    public final int databaseCount() {
+        return this.databaseCount;
+    }
+
+    /**
+     * Required - Total number of database updates skipped.
+     * <p>
+     * API name: {@code skipped_updates}
+     */
+    public final int skippedUpdates() {
+        return this.skippedUpdates;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("successful_downloads");
+        generator.write(this.successfulDownloads);
+
+        generator.writeKey("failed_downloads");
+        generator.write(this.failedDownloads);
+
+        generator.writeKey("total_download_time");
+        generator.write(this.totalDownloadTime);
+
+        generator.writeKey("database_count");
+        generator.write(this.databaseCount);
+
+        generator.writeKey("skipped_updates");
+        generator.write(this.skippedUpdates);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoIpDownloadStatistics}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoIpDownloadStatistics> {
+        private Integer successfulDownloads;
+
+        private Integer failedDownloads;
+
+        private Integer totalDownloadTime;
+
+        private Integer databaseCount;
+
+        private Integer skippedUpdates;
+
+        /**
+         * Required - Total number of successful database downloads.
+         * <p>
+         * API name: {@code successful_downloads}
+         */
+        public final Builder successfulDownloads(int value) {
+            this.successfulDownloads = value;
+            return this;
+        }
+
+        /**
+         * Required - Total number of failed database downloads.
+         * <p>
+         * API name: {@code failed_downloads}
+         */
+        public final Builder failedDownloads(int value) {
+            this.failedDownloads = value;
+            return this;
+        }
+
+        /**
+         * Required - Total milliseconds spent downloading databases.
+         * <p>
+         * API name: {@code total_download_time}
+         */
+        public final Builder totalDownloadTime(int value) {
+            this.totalDownloadTime = value;
+            return this;
+        }
+
+        /**
+         * Required - Current number of databases available for use.
+         * <p>
+         * API name: {@code database_count}
+         */
+        public final Builder databaseCount(int value) {
+            this.databaseCount = value;
+            return this;
+        }
+
+        /**
+         * Required - Total number of database updates skipped.
+         * <p>
+         * API name: {@code skipped_updates}
+         */
+        public final Builder skippedUpdates(int value) {
+            this.skippedUpdates = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoIpDownloadStatistics}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoIpDownloadStatistics build() {
+            _checkSingleUse();
+
+            return new GeoIpDownloadStatistics(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoIpDownloadStatistics}
+     */
+    public static final JsonpDeserializer<GeoIpDownloadStatistics> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoIpDownloadStatistics::setupGeoIpDownloadStatisticsDeserializer
+    );
+
+    protected static void setupGeoIpDownloadStatisticsDeserializer(ObjectDeserializer<GeoIpDownloadStatistics.Builder> op) {
+
+        op.add(Builder::successfulDownloads, JsonpDeserializer.integerDeserializer(), "successful_downloads");
+        op.add(Builder::failedDownloads, JsonpDeserializer.integerDeserializer(), "failed_downloads");
+        op.add(Builder::totalDownloadTime, JsonpDeserializer.integerDeserializer(), "total_download_time");
+        op.add(Builder::databaseCount, JsonpDeserializer.integerDeserializer(), "database_count");
+        op.add(Builder::skippedUpdates, JsonpDeserializer.integerDeserializer(), "skipped_updates");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/geo_ip_stats/GeoIpNodeDatabaseName.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/geo_ip_stats/GeoIpNodeDatabaseName.java
index ac66f1f7da..480df1a071 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/geo_ip_stats/GeoIpNodeDatabaseName.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/geo_ip_stats/GeoIpNodeDatabaseName.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.ingest.geo_ip_stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,97 +43,96 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: ingest.geo_ip_stats.GeoIpNodeDatabaseName
 
-
 @JsonpDeserializable
 public class GeoIpNodeDatabaseName implements JsonpSerializable {
-	private final String name;
+    private final String name;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private GeoIpNodeDatabaseName(Builder builder) {
+    private GeoIpNodeDatabaseName(Builder builder) {
 
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
 
-	}
+    }
 
-	public static GeoIpNodeDatabaseName of(Function<Builder, ObjectBuilder<GeoIpNodeDatabaseName>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static GeoIpNodeDatabaseName of(Function<Builder, ObjectBuilder<GeoIpNodeDatabaseName>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - Name of the database.
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
+    /**
+     * Required - Name of the database.
+     * <p>
+     * API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("name");
-		generator.write(this.name);
+        generator.writeKey("name");
+        generator.write(this.name);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link GeoIpNodeDatabaseName}.
-	 */
+    /**
+     * Builder for {@link GeoIpNodeDatabaseName}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoIpNodeDatabaseName> {
-		private String name;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoIpNodeDatabaseName> {
+        private String name;
 
-		/**
-		 * Required - Name of the database.
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
+        /**
+         * Required - Name of the database.
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link GeoIpNodeDatabaseName}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoIpNodeDatabaseName build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link GeoIpNodeDatabaseName}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoIpNodeDatabaseName build() {
+            _checkSingleUse();
 
-			return new GeoIpNodeDatabaseName(this);
-		}
-	}
+            return new GeoIpNodeDatabaseName(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link GeoIpNodeDatabaseName}
-	 */
-	public static final JsonpDeserializer<GeoIpNodeDatabaseName> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GeoIpNodeDatabaseName::setupGeoIpNodeDatabaseNameDeserializer);
+    /**
+     * Json deserializer for {@link GeoIpNodeDatabaseName}
+     */
+    public static final JsonpDeserializer<GeoIpNodeDatabaseName> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoIpNodeDatabaseName::setupGeoIpNodeDatabaseNameDeserializer
+    );
 
-	protected static void setupGeoIpNodeDatabaseNameDeserializer(ObjectDeserializer<GeoIpNodeDatabaseName.Builder> op) {
+    protected static void setupGeoIpNodeDatabaseNameDeserializer(ObjectDeserializer<GeoIpNodeDatabaseName.Builder> op) {
 
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/geo_ip_stats/GeoIpNodeDatabases.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/geo_ip_stats/GeoIpNodeDatabases.java
index 07a2366920..ded9dcdb05 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/geo_ip_stats/GeoIpNodeDatabases.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/geo_ip_stats/GeoIpNodeDatabases.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest.geo_ip_stats;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,9 +44,6 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: ingest.geo_ip_stats.GeoIpNodeDatabases
 
@@ -53,180 +53,179 @@
  */
 @JsonpDeserializable
 public class GeoIpNodeDatabases implements JsonpSerializable {
-	private final List<GeoIpNodeDatabaseName> databases;
-
-	private final List<String> filesInTemp;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GeoIpNodeDatabases(Builder builder) {
-
-		this.databases = ApiTypeHelper.unmodifiableRequired(builder.databases, this, "databases");
-		this.filesInTemp = ApiTypeHelper.unmodifiableRequired(builder.filesInTemp, this, "filesInTemp");
-
-	}
-
-	public static GeoIpNodeDatabases of(Function<Builder, ObjectBuilder<GeoIpNodeDatabases>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Downloaded databases for the node.
-	 * <p>
-	 * API name: {@code databases}
-	 */
-	public final List<GeoIpNodeDatabaseName> databases() {
-		return this.databases;
-	}
-
-	/**
-	 * Required - Downloaded database files, including related license files.
-	 * Elasticsearch stores these files in the node's temporary directory:
-	 * $ES_TMPDIR/geoip-databases/&lt;node_id&gt;.
-	 * <p>
-	 * API name: {@code files_in_temp}
-	 */
-	public final List<String> filesInTemp() {
-		return this.filesInTemp;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.databases)) {
-			generator.writeKey("databases");
-			generator.writeStartArray();
-			for (GeoIpNodeDatabaseName item0 : this.databases) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.filesInTemp)) {
-			generator.writeKey("files_in_temp");
-			generator.writeStartArray();
-			for (String item0 : this.filesInTemp) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GeoIpNodeDatabases}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoIpNodeDatabases> {
-		private List<GeoIpNodeDatabaseName> databases;
-
-		private List<String> filesInTemp;
-
-		/**
-		 * Required - Downloaded databases for the node.
-		 * <p>
-		 * API name: {@code databases}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>databases</code>.
-		 */
-		public final Builder databases(List<GeoIpNodeDatabaseName> list) {
-			this.databases = _listAddAll(this.databases, list);
-			return this;
-		}
-
-		/**
-		 * Required - Downloaded databases for the node.
-		 * <p>
-		 * API name: {@code databases}
-		 * <p>
-		 * Adds one or more values to <code>databases</code>.
-		 */
-		public final Builder databases(GeoIpNodeDatabaseName value, GeoIpNodeDatabaseName... values) {
-			this.databases = _listAdd(this.databases, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Downloaded databases for the node.
-		 * <p>
-		 * API name: {@code databases}
-		 * <p>
-		 * Adds a value to <code>databases</code> using a builder lambda.
-		 */
-		public final Builder databases(
-				Function<GeoIpNodeDatabaseName.Builder, ObjectBuilder<GeoIpNodeDatabaseName>> fn) {
-			return databases(fn.apply(new GeoIpNodeDatabaseName.Builder()).build());
-		}
-
-		/**
-		 * Required - Downloaded database files, including related license files.
-		 * Elasticsearch stores these files in the node's temporary directory:
-		 * $ES_TMPDIR/geoip-databases/&lt;node_id&gt;.
-		 * <p>
-		 * API name: {@code files_in_temp}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>filesInTemp</code>.
-		 */
-		public final Builder filesInTemp(List<String> list) {
-			this.filesInTemp = _listAddAll(this.filesInTemp, list);
-			return this;
-		}
-
-		/**
-		 * Required - Downloaded database files, including related license files.
-		 * Elasticsearch stores these files in the node's temporary directory:
-		 * $ES_TMPDIR/geoip-databases/&lt;node_id&gt;.
-		 * <p>
-		 * API name: {@code files_in_temp}
-		 * <p>
-		 * Adds one or more values to <code>filesInTemp</code>.
-		 */
-		public final Builder filesInTemp(String value, String... values) {
-			this.filesInTemp = _listAdd(this.filesInTemp, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GeoIpNodeDatabases}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GeoIpNodeDatabases build() {
-			_checkSingleUse();
-
-			return new GeoIpNodeDatabases(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GeoIpNodeDatabases}
-	 */
-	public static final JsonpDeserializer<GeoIpNodeDatabases> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GeoIpNodeDatabases::setupGeoIpNodeDatabasesDeserializer);
-
-	protected static void setupGeoIpNodeDatabasesDeserializer(ObjectDeserializer<GeoIpNodeDatabases.Builder> op) {
-
-		op.add(Builder::databases, JsonpDeserializer.arrayDeserializer(GeoIpNodeDatabaseName._DESERIALIZER),
-				"databases");
-		op.add(Builder::filesInTemp, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"files_in_temp");
-
-	}
+    private final List<GeoIpNodeDatabaseName> databases;
+
+    private final List<String> filesInTemp;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GeoIpNodeDatabases(Builder builder) {
+
+        this.databases = ApiTypeHelper.unmodifiableRequired(builder.databases, this, "databases");
+        this.filesInTemp = ApiTypeHelper.unmodifiableRequired(builder.filesInTemp, this, "filesInTemp");
+
+    }
+
+    public static GeoIpNodeDatabases of(Function<Builder, ObjectBuilder<GeoIpNodeDatabases>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Downloaded databases for the node.
+     * <p>
+     * API name: {@code databases}
+     */
+    public final List<GeoIpNodeDatabaseName> databases() {
+        return this.databases;
+    }
+
+    /**
+     * Required - Downloaded database files, including related license files.
+     * Elasticsearch stores these files in the node's temporary directory:
+     * $ES_TMPDIR/geoip-databases/&lt;node_id&gt;.
+     * <p>
+     * API name: {@code files_in_temp}
+     */
+    public final List<String> filesInTemp() {
+        return this.filesInTemp;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.databases)) {
+            generator.writeKey("databases");
+            generator.writeStartArray();
+            for (GeoIpNodeDatabaseName item0 : this.databases) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.filesInTemp)) {
+            generator.writeKey("files_in_temp");
+            generator.writeStartArray();
+            for (String item0 : this.filesInTemp) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GeoIpNodeDatabases}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoIpNodeDatabases> {
+        private List<GeoIpNodeDatabaseName> databases;
+
+        private List<String> filesInTemp;
+
+        /**
+         * Required - Downloaded databases for the node.
+         * <p>
+         * API name: {@code databases}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>databases</code>.
+         */
+        public final Builder databases(List<GeoIpNodeDatabaseName> list) {
+            this.databases = _listAddAll(this.databases, list);
+            return this;
+        }
+
+        /**
+         * Required - Downloaded databases for the node.
+         * <p>
+         * API name: {@code databases}
+         * <p>
+         * Adds one or more values to <code>databases</code>.
+         */
+        public final Builder databases(GeoIpNodeDatabaseName value, GeoIpNodeDatabaseName... values) {
+            this.databases = _listAdd(this.databases, value, values);
+            return this;
+        }
+
+        /**
+         * Required - Downloaded databases for the node.
+         * <p>
+         * API name: {@code databases}
+         * <p>
+         * Adds a value to <code>databases</code> using a builder lambda.
+         */
+        public final Builder databases(Function<GeoIpNodeDatabaseName.Builder, ObjectBuilder<GeoIpNodeDatabaseName>> fn) {
+            return databases(fn.apply(new GeoIpNodeDatabaseName.Builder()).build());
+        }
+
+        /**
+         * Required - Downloaded database files, including related license files.
+         * Elasticsearch stores these files in the node's temporary directory:
+         * $ES_TMPDIR/geoip-databases/&lt;node_id&gt;.
+         * <p>
+         * API name: {@code files_in_temp}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>filesInTemp</code>.
+         */
+        public final Builder filesInTemp(List<String> list) {
+            this.filesInTemp = _listAddAll(this.filesInTemp, list);
+            return this;
+        }
+
+        /**
+         * Required - Downloaded database files, including related license files.
+         * Elasticsearch stores these files in the node's temporary directory:
+         * $ES_TMPDIR/geoip-databases/&lt;node_id&gt;.
+         * <p>
+         * API name: {@code files_in_temp}
+         * <p>
+         * Adds one or more values to <code>filesInTemp</code>.
+         */
+        public final Builder filesInTemp(String value, String... values) {
+            this.filesInTemp = _listAdd(this.filesInTemp, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link GeoIpNodeDatabases}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GeoIpNodeDatabases build() {
+            _checkSingleUse();
+
+            return new GeoIpNodeDatabases(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GeoIpNodeDatabases}
+     */
+    public static final JsonpDeserializer<GeoIpNodeDatabases> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GeoIpNodeDatabases::setupGeoIpNodeDatabasesDeserializer
+    );
+
+    protected static void setupGeoIpNodeDatabasesDeserializer(ObjectDeserializer<GeoIpNodeDatabases.Builder> op) {
+
+        op.add(Builder::databases, JsonpDeserializer.arrayDeserializer(GeoIpNodeDatabaseName._DESERIALIZER), "databases");
+        op.add(Builder::filesInTemp, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "files_in_temp");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/simulate/Document.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/simulate/Document.java
index 3223c5b0c6..53be67c2ce 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/simulate/Document.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/simulate/Document.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest.simulate;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,151 +45,150 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest.simulate.Document
 
 @JsonpDeserializable
 public class Document implements JsonpSerializable {
-	@Nullable
-	private final String id;
-
-	@Nullable
-	private final String index;
-
-	private final JsonData source;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Document(Builder builder) {
-
-		this.id = builder.id;
-		this.index = builder.index;
-		this.source = ApiTypeHelper.requireNonNull(builder.source, this, "source");
-
-	}
-
-	public static Document of(Function<Builder, ObjectBuilder<Document>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code _id}
-	 */
-	@Nullable
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * API name: {@code _index}
-	 */
-	@Nullable
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Required - API name: {@code _source}
-	 */
-	public final JsonData source() {
-		return this.source;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.id != null) {
-			generator.writeKey("_id");
-			generator.write(this.id);
-
-		}
-		if (this.index != null) {
-			generator.writeKey("_index");
-			generator.write(this.index);
-
-		}
-		generator.writeKey("_source");
-		this.source.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Document}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Document> {
-		@Nullable
-		private String id;
-
-		@Nullable
-		private String index;
-
-		private JsonData source;
-
-		/**
-		 * API name: {@code _id}
-		 */
-		public final Builder id(@Nullable String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _index}
-		 */
-		public final Builder index(@Nullable String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _source}
-		 */
-		public final Builder source(JsonData value) {
-			this.source = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Document}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Document build() {
-			_checkSingleUse();
-
-			return new Document(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Document}
-	 */
-	public static final JsonpDeserializer<Document> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Document::setupDocumentDeserializer);
-
-	protected static void setupDocumentDeserializer(ObjectDeserializer<Document.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
-		op.add(Builder::source, JsonData._DESERIALIZER, "_source");
-
-	}
+    @Nullable
+    private final String id;
+
+    @Nullable
+    private final String index;
+
+    private final JsonData source;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Document(Builder builder) {
+
+        this.id = builder.id;
+        this.index = builder.index;
+        this.source = ApiTypeHelper.requireNonNull(builder.source, this, "source");
+
+    }
+
+    public static Document of(Function<Builder, ObjectBuilder<Document>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code _id}
+     */
+    @Nullable
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * API name: {@code _index}
+     */
+    @Nullable
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Required - API name: {@code _source}
+     */
+    public final JsonData source() {
+        return this.source;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.id != null) {
+            generator.writeKey("_id");
+            generator.write(this.id);
+
+        }
+        if (this.index != null) {
+            generator.writeKey("_index");
+            generator.write(this.index);
+
+        }
+        generator.writeKey("_source");
+        this.source.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Document}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Document> {
+        @Nullable
+        private String id;
+
+        @Nullable
+        private String index;
+
+        private JsonData source;
+
+        /**
+         * API name: {@code _id}
+         */
+        public final Builder id(@Nullable String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _index}
+         */
+        public final Builder index(@Nullable String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _source}
+         */
+        public final Builder source(JsonData value) {
+            this.source = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Document}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Document build() {
+            _checkSingleUse();
+
+            return new Document(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Document}
+     */
+    public static final JsonpDeserializer<Document> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Document::setupDocumentDeserializer
+    );
+
+    protected static void setupDocumentDeserializer(ObjectDeserializer<Document.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
+        op.add(Builder::source, JsonData._DESERIALIZER, "_source");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/simulate/DocumentSimulation.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/simulate/DocumentSimulation.java
index 142fb76828..d6c2c3255e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/simulate/DocumentSimulation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/simulate/DocumentSimulation.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.ingest.simulate;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,281 +46,279 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest.simulate.DocumentSimulation
 
 @JsonpDeserializable
 public class DocumentSimulation implements JsonpSerializable {
-	private final String id;
-
-	private final String index;
-
-	private final Ingest ingest;
-
-	@Nullable
-	private final String parent;
-
-	@Nullable
-	private final String routing;
-
-	private final Map<String, JsonData> source;
-
-	@Nullable
-	private final String type;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DocumentSimulation(Builder builder) {
-
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.ingest = ApiTypeHelper.requireNonNull(builder.ingest, this, "ingest");
-		this.parent = builder.parent;
-		this.routing = builder.routing;
-		this.source = ApiTypeHelper.unmodifiableRequired(builder.source, this, "source");
-		this.type = builder.type;
-
-	}
-
-	public static DocumentSimulation of(Function<Builder, ObjectBuilder<DocumentSimulation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code _id}
-	 */
-	public final String id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - API name: {@code _index}
-	 */
-	public final String index() {
-		return this.index;
-	}
-
-	/**
-	 * Required - API name: {@code _ingest}
-	 */
-	public final Ingest ingest() {
-		return this.ingest;
-	}
-
-	/**
-	 * API name: {@code _parent}
-	 */
-	@Nullable
-	public final String parent() {
-		return this.parent;
-	}
-
-	/**
-	 * API name: {@code _routing}
-	 */
-	@Nullable
-	public final String routing() {
-		return this.routing;
-	}
-
-	/**
-	 * Required - API name: {@code _source}
-	 */
-	public final Map<String, JsonData> source() {
-		return this.source;
-	}
-
-	/**
-	 * API name: {@code _type}
-	 */
-	@Nullable
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("_id");
-		generator.write(this.id);
-
-		generator.writeKey("_index");
-		generator.write(this.index);
-
-		generator.writeKey("_ingest");
-		this.ingest.serialize(generator, mapper);
-
-		if (this.parent != null) {
-			generator.writeKey("_parent");
-			generator.write(this.parent);
-
-		}
-		if (this.routing != null) {
-			generator.writeKey("_routing");
-			generator.write(this.routing);
-
-		}
-		if (ApiTypeHelper.isDefined(this.source)) {
-			generator.writeKey("_source");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.source.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.type != null) {
-			generator.writeKey("_type");
-			generator.write(this.type);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DocumentSimulation}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DocumentSimulation> {
-		private String id;
-
-		private String index;
-
-		private Ingest ingest;
-
-		@Nullable
-		private String parent;
-
-		@Nullable
-		private String routing;
-
-		private Map<String, JsonData> source;
-
-		@Nullable
-		private String type;
-
-		/**
-		 * Required - API name: {@code _id}
-		 */
-		public final Builder id(String value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _ingest}
-		 */
-		public final Builder ingest(Ingest value) {
-			this.ingest = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _ingest}
-		 */
-		public final Builder ingest(Function<Ingest.Builder, ObjectBuilder<Ingest>> fn) {
-			return this.ingest(fn.apply(new Ingest.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code _parent}
-		 */
-		public final Builder parent(@Nullable String value) {
-			this.parent = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code _routing}
-		 */
-		public final Builder routing(@Nullable String value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _source}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>source</code>.
-		 */
-		public final Builder source(Map<String, JsonData> map) {
-			this.source = _mapPutAll(this.source, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code _source}
-		 * <p>
-		 * Adds an entry to <code>source</code>.
-		 */
-		public final Builder source(String key, JsonData value) {
-			this.source = _mapPut(this.source, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code _type}
-		 */
-		public final Builder type(@Nullable String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DocumentSimulation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DocumentSimulation build() {
-			_checkSingleUse();
-
-			return new DocumentSimulation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DocumentSimulation}
-	 */
-	public static final JsonpDeserializer<DocumentSimulation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DocumentSimulation::setupDocumentSimulationDeserializer);
-
-	protected static void setupDocumentSimulationDeserializer(ObjectDeserializer<DocumentSimulation.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
-		op.add(Builder::ingest, Ingest._DESERIALIZER, "_ingest");
-		op.add(Builder::parent, JsonpDeserializer.stringDeserializer(), "_parent");
-		op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "_routing");
-		op.add(Builder::source, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_source");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "_type");
-
-	}
+    private final String id;
+
+    private final String index;
+
+    private final Ingest ingest;
+
+    @Nullable
+    private final String parent;
+
+    @Nullable
+    private final String routing;
+
+    private final Map<String, JsonData> source;
+
+    @Nullable
+    private final String type;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DocumentSimulation(Builder builder) {
+
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.ingest = ApiTypeHelper.requireNonNull(builder.ingest, this, "ingest");
+        this.parent = builder.parent;
+        this.routing = builder.routing;
+        this.source = ApiTypeHelper.unmodifiableRequired(builder.source, this, "source");
+        this.type = builder.type;
+
+    }
+
+    public static DocumentSimulation of(Function<Builder, ObjectBuilder<DocumentSimulation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code _id}
+     */
+    public final String id() {
+        return this.id;
+    }
+
+    /**
+     * Required - API name: {@code _index}
+     */
+    public final String index() {
+        return this.index;
+    }
+
+    /**
+     * Required - API name: {@code _ingest}
+     */
+    public final Ingest ingest() {
+        return this.ingest;
+    }
+
+    /**
+     * API name: {@code _parent}
+     */
+    @Nullable
+    public final String parent() {
+        return this.parent;
+    }
+
+    /**
+     * API name: {@code _routing}
+     */
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
+
+    /**
+     * Required - API name: {@code _source}
+     */
+    public final Map<String, JsonData> source() {
+        return this.source;
+    }
+
+    /**
+     * API name: {@code _type}
+     */
+    @Nullable
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("_id");
+        generator.write(this.id);
+
+        generator.writeKey("_index");
+        generator.write(this.index);
+
+        generator.writeKey("_ingest");
+        this.ingest.serialize(generator, mapper);
+
+        if (this.parent != null) {
+            generator.writeKey("_parent");
+            generator.write(this.parent);
+
+        }
+        if (this.routing != null) {
+            generator.writeKey("_routing");
+            generator.write(this.routing);
+
+        }
+        if (ApiTypeHelper.isDefined(this.source)) {
+            generator.writeKey("_source");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.source.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.type != null) {
+            generator.writeKey("_type");
+            generator.write(this.type);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DocumentSimulation}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DocumentSimulation> {
+        private String id;
+
+        private String index;
+
+        private Ingest ingest;
+
+        @Nullable
+        private String parent;
+
+        @Nullable
+        private String routing;
+
+        private Map<String, JsonData> source;
+
+        @Nullable
+        private String type;
+
+        /**
+         * Required - API name: {@code _id}
+         */
+        public final Builder id(String value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _ingest}
+         */
+        public final Builder ingest(Ingest value) {
+            this.ingest = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _ingest}
+         */
+        public final Builder ingest(Function<Ingest.Builder, ObjectBuilder<Ingest>> fn) {
+            return this.ingest(fn.apply(new Ingest.Builder()).build());
+        }
+
+        /**
+         * API name: {@code _parent}
+         */
+        public final Builder parent(@Nullable String value) {
+            this.parent = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code _routing}
+         */
+        public final Builder routing(@Nullable String value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _source}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>source</code>.
+         */
+        public final Builder source(Map<String, JsonData> map) {
+            this.source = _mapPutAll(this.source, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code _source}
+         * <p>
+         * Adds an entry to <code>source</code>.
+         */
+        public final Builder source(String key, JsonData value) {
+            this.source = _mapPut(this.source, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code _type}
+         */
+        public final Builder type(@Nullable String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link DocumentSimulation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DocumentSimulation build() {
+            _checkSingleUse();
+
+            return new DocumentSimulation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DocumentSimulation}
+     */
+    public static final JsonpDeserializer<DocumentSimulation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DocumentSimulation::setupDocumentSimulationDeserializer
+    );
+
+    protected static void setupDocumentSimulationDeserializer(ObjectDeserializer<DocumentSimulation.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "_id");
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "_index");
+        op.add(Builder::ingest, Ingest._DESERIALIZER, "_ingest");
+        op.add(Builder::parent, JsonpDeserializer.stringDeserializer(), "_parent");
+        op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "_routing");
+        op.add(Builder::source, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "_source");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "_type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/simulate/Ingest.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/simulate/Ingest.java
index c0444e169a..37e9304416 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/simulate/Ingest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/simulate/Ingest.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.ingest.simulate;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,123 +44,122 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: ingest.simulate.Ingest
 
 @JsonpDeserializable
 public class Ingest implements JsonpSerializable {
-	private final String timestamp;
-
-	@Nullable
-	private final String pipeline;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Ingest(Builder builder) {
-
-		this.timestamp = ApiTypeHelper.requireNonNull(builder.timestamp, this, "timestamp");
-		this.pipeline = builder.pipeline;
-
-	}
-
-	public static Ingest of(Function<Builder, ObjectBuilder<Ingest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code timestamp}
-	 */
-	public final String timestamp() {
-		return this.timestamp;
-	}
-
-	/**
-	 * API name: {@code pipeline}
-	 */
-	@Nullable
-	public final String pipeline() {
-		return this.pipeline;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("timestamp");
-		generator.write(this.timestamp);
-
-		if (this.pipeline != null) {
-			generator.writeKey("pipeline");
-			generator.write(this.pipeline);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Ingest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Ingest> {
-		private String timestamp;
-
-		@Nullable
-		private String pipeline;
-
-		/**
-		 * Required - API name: {@code timestamp}
-		 */
-		public final Builder timestamp(String value) {
-			this.timestamp = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code pipeline}
-		 */
-		public final Builder pipeline(@Nullable String value) {
-			this.pipeline = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Ingest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Ingest build() {
-			_checkSingleUse();
-
-			return new Ingest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Ingest}
-	 */
-	public static final JsonpDeserializer<Ingest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Ingest::setupIngestDeserializer);
-
-	protected static void setupIngestDeserializer(ObjectDeserializer<Ingest.Builder> op) {
-
-		op.add(Builder::timestamp, JsonpDeserializer.stringDeserializer(), "timestamp");
-		op.add(Builder::pipeline, JsonpDeserializer.stringDeserializer(), "pipeline");
-
-	}
+    private final String timestamp;
+
+    @Nullable
+    private final String pipeline;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Ingest(Builder builder) {
+
+        this.timestamp = ApiTypeHelper.requireNonNull(builder.timestamp, this, "timestamp");
+        this.pipeline = builder.pipeline;
+
+    }
+
+    public static Ingest of(Function<Builder, ObjectBuilder<Ingest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code timestamp}
+     */
+    public final String timestamp() {
+        return this.timestamp;
+    }
+
+    /**
+     * API name: {@code pipeline}
+     */
+    @Nullable
+    public final String pipeline() {
+        return this.pipeline;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("timestamp");
+        generator.write(this.timestamp);
+
+        if (this.pipeline != null) {
+            generator.writeKey("pipeline");
+            generator.write(this.pipeline);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Ingest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Ingest> {
+        private String timestamp;
+
+        @Nullable
+        private String pipeline;
+
+        /**
+         * Required - API name: {@code timestamp}
+         */
+        public final Builder timestamp(String value) {
+            this.timestamp = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code pipeline}
+         */
+        public final Builder pipeline(@Nullable String value) {
+            this.pipeline = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Ingest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Ingest build() {
+            _checkSingleUse();
+
+            return new Ingest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Ingest}
+     */
+    public static final JsonpDeserializer<Ingest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Ingest::setupIngestDeserializer
+    );
+
+    protected static void setupIngestDeserializer(ObjectDeserializer<Ingest.Builder> op) {
+
+        op.add(Builder::timestamp, JsonpDeserializer.stringDeserializer(), "timestamp");
+        op.add(Builder::pipeline, JsonpDeserializer.stringDeserializer(), "pipeline");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/simulate/PipelineSimulation.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/simulate/PipelineSimulation.java
index 80f9815819..c86b1580e7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/simulate/PipelineSimulation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/simulate/PipelineSimulation.java
@@ -32,258 +32,258 @@
 
 package org.opensearch.client.opensearch.ingest.simulate;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.util.ActionStatusOptions;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-import org.opensearch.client.util.ActionStatusOptions;
 
 // typedef: ingest.simulate.PipelineSimulation
 
 @JsonpDeserializable
 public class PipelineSimulation implements JsonpSerializable {
-	@Nullable
-	private final DocumentSimulation doc;
-
-	private final List<PipelineSimulation> processorResults;
-
-	@Nullable
-	private final String tag;
-
-	@Nullable
-	private final String processorType;
-
-	@Nullable
-	private final ActionStatusOptions status;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PipelineSimulation(Builder builder) {
-
-		this.doc = builder.doc;
-		this.processorResults = ApiTypeHelper.unmodifiable(builder.processorResults);
-		this.tag = builder.tag;
-		this.processorType = builder.processorType;
-		this.status = builder.status;
-
-	}
-
-	public static PipelineSimulation of(Function<Builder, ObjectBuilder<PipelineSimulation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code doc}
-	 */
-	@Nullable
-	public final DocumentSimulation doc() {
-		return this.doc;
-	}
-
-	/**
-	 * API name: {@code processor_results}
-	 */
-	public final List<PipelineSimulation> processorResults() {
-		return this.processorResults;
-	}
-
-	/**
-	 * API name: {@code tag}
-	 */
-	@Nullable
-	public final String tag() {
-		return this.tag;
-	}
-
-	/**
-	 * API name: {@code processor_type}
-	 */
-	@Nullable
-	public final String processorType() {
-		return this.processorType;
-	}
-
-	/**
-	 * API name: {@code status}
-	 */
-	@Nullable
-	public final ActionStatusOptions status() {
-		return this.status;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.doc != null) {
-			generator.writeKey("doc");
-			this.doc.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.processorResults)) {
-			generator.writeKey("processor_results");
-			generator.writeStartArray();
-			for (PipelineSimulation item0 : this.processorResults) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.tag != null) {
-			generator.writeKey("tag");
-			generator.write(this.tag);
-
-		}
-		if (this.processorType != null) {
-			generator.writeKey("processor_type");
-			generator.write(this.processorType);
-
-		}
-		if (this.status != null) {
-			generator.writeKey("status");
-			this.status.serialize(generator, mapper);
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PipelineSimulation}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PipelineSimulation> {
-		@Nullable
-		private DocumentSimulation doc;
-
-		@Nullable
-		private List<PipelineSimulation> processorResults;
-
-		@Nullable
-		private String tag;
-
-		@Nullable
-		private String processorType;
-
-		@Nullable
-		private ActionStatusOptions status;
-
-		/**
-		 * API name: {@code doc}
-		 */
-		public final Builder doc(@Nullable DocumentSimulation value) {
-			this.doc = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code doc}
-		 */
-		public final Builder doc(Function<DocumentSimulation.Builder, ObjectBuilder<DocumentSimulation>> fn) {
-			return this.doc(fn.apply(new DocumentSimulation.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code processor_results}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>processorResults</code>.
-		 */
-		public final Builder processorResults(List<PipelineSimulation> list) {
-			this.processorResults = _listAddAll(this.processorResults, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code processor_results}
-		 * <p>
-		 * Adds one or more values to <code>processorResults</code>.
-		 */
-		public final Builder processorResults(PipelineSimulation value, PipelineSimulation... values) {
-			this.processorResults = _listAdd(this.processorResults, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code processor_results}
-		 * <p>
-		 * Adds a value to <code>processorResults</code> using a builder lambda.
-		 */
-		public final Builder processorResults(
-				Function<PipelineSimulation.Builder, ObjectBuilder<PipelineSimulation>> fn) {
-			return processorResults(fn.apply(new PipelineSimulation.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code tag}
-		 */
-		public final Builder tag(@Nullable String value) {
-			this.tag = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code processor_type}
-		 */
-		public final Builder processorType(@Nullable String value) {
-			this.processorType = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code status}
-		 */
-		public final Builder status(@Nullable ActionStatusOptions value) {
-			this.status = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PipelineSimulation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PipelineSimulation build() {
-			_checkSingleUse();
-
-			return new PipelineSimulation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link PipelineSimulation}
-	 */
-	public static final JsonpDeserializer<PipelineSimulation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PipelineSimulation::setupPipelineSimulationDeserializer);
-
-	protected static void setupPipelineSimulationDeserializer(ObjectDeserializer<PipelineSimulation.Builder> op) {
-
-		op.add(Builder::doc, DocumentSimulation._DESERIALIZER, "doc");
-		op.add(Builder::processorResults, JsonpDeserializer.arrayDeserializer(PipelineSimulation._DESERIALIZER),
-				"processor_results");
-		op.add(Builder::tag, JsonpDeserializer.stringDeserializer(), "tag");
-		op.add(Builder::processorType, JsonpDeserializer.stringDeserializer(), "processor_type");
-		op.add(Builder::status, ActionStatusOptions._DESERIALIZER, "status");
-
-	}
+    @Nullable
+    private final DocumentSimulation doc;
+
+    private final List<PipelineSimulation> processorResults;
+
+    @Nullable
+    private final String tag;
+
+    @Nullable
+    private final String processorType;
+
+    @Nullable
+    private final ActionStatusOptions status;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PipelineSimulation(Builder builder) {
+
+        this.doc = builder.doc;
+        this.processorResults = ApiTypeHelper.unmodifiable(builder.processorResults);
+        this.tag = builder.tag;
+        this.processorType = builder.processorType;
+        this.status = builder.status;
+
+    }
+
+    public static PipelineSimulation of(Function<Builder, ObjectBuilder<PipelineSimulation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code doc}
+     */
+    @Nullable
+    public final DocumentSimulation doc() {
+        return this.doc;
+    }
+
+    /**
+     * API name: {@code processor_results}
+     */
+    public final List<PipelineSimulation> processorResults() {
+        return this.processorResults;
+    }
+
+    /**
+     * API name: {@code tag}
+     */
+    @Nullable
+    public final String tag() {
+        return this.tag;
+    }
+
+    /**
+     * API name: {@code processor_type}
+     */
+    @Nullable
+    public final String processorType() {
+        return this.processorType;
+    }
+
+    /**
+     * API name: {@code status}
+     */
+    @Nullable
+    public final ActionStatusOptions status() {
+        return this.status;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.doc != null) {
+            generator.writeKey("doc");
+            this.doc.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.processorResults)) {
+            generator.writeKey("processor_results");
+            generator.writeStartArray();
+            for (PipelineSimulation item0 : this.processorResults) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.tag != null) {
+            generator.writeKey("tag");
+            generator.write(this.tag);
+
+        }
+        if (this.processorType != null) {
+            generator.writeKey("processor_type");
+            generator.write(this.processorType);
+
+        }
+        if (this.status != null) {
+            generator.writeKey("status");
+            this.status.serialize(generator, mapper);
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PipelineSimulation}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PipelineSimulation> {
+        @Nullable
+        private DocumentSimulation doc;
+
+        @Nullable
+        private List<PipelineSimulation> processorResults;
+
+        @Nullable
+        private String tag;
+
+        @Nullable
+        private String processorType;
+
+        @Nullable
+        private ActionStatusOptions status;
+
+        /**
+         * API name: {@code doc}
+         */
+        public final Builder doc(@Nullable DocumentSimulation value) {
+            this.doc = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code doc}
+         */
+        public final Builder doc(Function<DocumentSimulation.Builder, ObjectBuilder<DocumentSimulation>> fn) {
+            return this.doc(fn.apply(new DocumentSimulation.Builder()).build());
+        }
+
+        /**
+         * API name: {@code processor_results}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>processorResults</code>.
+         */
+        public final Builder processorResults(List<PipelineSimulation> list) {
+            this.processorResults = _listAddAll(this.processorResults, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code processor_results}
+         * <p>
+         * Adds one or more values to <code>processorResults</code>.
+         */
+        public final Builder processorResults(PipelineSimulation value, PipelineSimulation... values) {
+            this.processorResults = _listAdd(this.processorResults, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code processor_results}
+         * <p>
+         * Adds a value to <code>processorResults</code> using a builder lambda.
+         */
+        public final Builder processorResults(Function<PipelineSimulation.Builder, ObjectBuilder<PipelineSimulation>> fn) {
+            return processorResults(fn.apply(new PipelineSimulation.Builder()).build());
+        }
+
+        /**
+         * API name: {@code tag}
+         */
+        public final Builder tag(@Nullable String value) {
+            this.tag = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code processor_type}
+         */
+        public final Builder processorType(@Nullable String value) {
+            this.processorType = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code status}
+         */
+        public final Builder status(@Nullable ActionStatusOptions value) {
+            this.status = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link PipelineSimulation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PipelineSimulation build() {
+            _checkSingleUse();
+
+            return new PipelineSimulation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link PipelineSimulation}
+     */
+    public static final JsonpDeserializer<PipelineSimulation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PipelineSimulation::setupPipelineSimulationDeserializer
+    );
+
+    protected static void setupPipelineSimulationDeserializer(ObjectDeserializer<PipelineSimulation.Builder> op) {
+
+        op.add(Builder::doc, DocumentSimulation._DESERIALIZER, "doc");
+        op.add(Builder::processorResults, JsonpDeserializer.arrayDeserializer(PipelineSimulation._DESERIALIZER), "processor_results");
+        op.add(Builder::tag, JsonpDeserializer.stringDeserializer(), "tag");
+        op.add(Builder::processorType, JsonpDeserializer.stringDeserializer(), "processor_type");
+        op.add(Builder::status, ActionStatusOptions._DESERIALIZER, "status");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/AdaptiveSelection.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/AdaptiveSelection.java
index 8883092725..84bc5279f3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/AdaptiveSelection.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/AdaptiveSelection.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,189 +43,188 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes._types.AdaptiveSelection
 
-
 @JsonpDeserializable
 public class AdaptiveSelection implements JsonpSerializable {
-	private final long avgQueueSize;
+    private final long avgQueueSize;
 
-	private final long avgResponseTimeNs;
+    private final long avgResponseTimeNs;
 
-	private final long avgServiceTimeNs;
+    private final long avgServiceTimeNs;
 
-	private final long outgoingSearches;
+    private final long outgoingSearches;
 
-	private final String rank;
+    private final String rank;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private AdaptiveSelection(Builder builder) {
+    private AdaptiveSelection(Builder builder) {
 
-		this.avgQueueSize = ApiTypeHelper.requireNonNull(builder.avgQueueSize, this, "avgQueueSize");
-		this.avgResponseTimeNs = ApiTypeHelper.requireNonNull(builder.avgResponseTimeNs, this, "avgResponseTimeNs");
-		this.avgServiceTimeNs = ApiTypeHelper.requireNonNull(builder.avgServiceTimeNs, this, "avgServiceTimeNs");
-		this.outgoingSearches = ApiTypeHelper.requireNonNull(builder.outgoingSearches, this, "outgoingSearches");
-		this.rank = ApiTypeHelper.requireNonNull(builder.rank, this, "rank");
+        this.avgQueueSize = ApiTypeHelper.requireNonNull(builder.avgQueueSize, this, "avgQueueSize");
+        this.avgResponseTimeNs = ApiTypeHelper.requireNonNull(builder.avgResponseTimeNs, this, "avgResponseTimeNs");
+        this.avgServiceTimeNs = ApiTypeHelper.requireNonNull(builder.avgServiceTimeNs, this, "avgServiceTimeNs");
+        this.outgoingSearches = ApiTypeHelper.requireNonNull(builder.outgoingSearches, this, "outgoingSearches");
+        this.rank = ApiTypeHelper.requireNonNull(builder.rank, this, "rank");
 
-	}
+    }
 
-	public static AdaptiveSelection of(Function<Builder, ObjectBuilder<AdaptiveSelection>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static AdaptiveSelection of(Function<Builder, ObjectBuilder<AdaptiveSelection>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code avg_queue_size}
-	 */
-	public final long avgQueueSize() {
-		return this.avgQueueSize;
-	}
+    /**
+     * Required - API name: {@code avg_queue_size}
+     */
+    public final long avgQueueSize() {
+        return this.avgQueueSize;
+    }
 
-	/**
-	 * Required - API name: {@code avg_response_time_ns}
-	 */
-	public final long avgResponseTimeNs() {
-		return this.avgResponseTimeNs;
-	}
-
-	/**
-	 * Required - API name: {@code avg_service_time_ns}
-	 */
-	public final long avgServiceTimeNs() {
-		return this.avgServiceTimeNs;
-	}
-
-	/**
-	 * Required - API name: {@code outgoing_searches}
-	 */
-	public final long outgoingSearches() {
-		return this.outgoingSearches;
-	}
-
-	/**
-	 * Required - API name: {@code rank}
-	 */
-	public final String rank() {
-		return this.rank;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("avg_queue_size");
-		generator.write(this.avgQueueSize);
-
-		generator.writeKey("avg_response_time_ns");
-		generator.write(this.avgResponseTimeNs);
-
-		generator.writeKey("avg_service_time_ns");
-		generator.write(this.avgServiceTimeNs);
-
-		generator.writeKey("outgoing_searches");
-		generator.write(this.outgoingSearches);
-
-		generator.writeKey("rank");
-		generator.write(this.rank);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link AdaptiveSelection}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AdaptiveSelection> {
-		private Long avgQueueSize;
-
-		private Long avgResponseTimeNs;
-
-		private Long avgServiceTimeNs;
-
-		private Long outgoingSearches;
-
-		private String rank;
-
-		/**
-		 * Required - API name: {@code avg_queue_size}
-		 */
-		public final Builder avgQueueSize(long value) {
-			this.avgQueueSize = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code avg_response_time_ns}
-		 */
-		public final Builder avgResponseTimeNs(long value) {
-			this.avgResponseTimeNs = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code avg_service_time_ns}
-		 */
-		public final Builder avgServiceTimeNs(long value) {
-			this.avgServiceTimeNs = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code outgoing_searches}
-		 */
-		public final Builder outgoingSearches(long value) {
-			this.outgoingSearches = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code rank}
-		 */
-		public final Builder rank(String value) {
-			this.rank = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link AdaptiveSelection}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public AdaptiveSelection build() {
-			_checkSingleUse();
-
-			return new AdaptiveSelection(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link AdaptiveSelection}
-	 */
-	public static final JsonpDeserializer<AdaptiveSelection> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, AdaptiveSelection::setupAdaptiveSelectionDeserializer);
-
-	protected static void setupAdaptiveSelectionDeserializer(ObjectDeserializer<AdaptiveSelection.Builder> op) {
-
-		op.add(Builder::avgQueueSize, JsonpDeserializer.longDeserializer(), "avg_queue_size");
-		op.add(Builder::avgResponseTimeNs, JsonpDeserializer.longDeserializer(), "avg_response_time_ns");
-		op.add(Builder::avgServiceTimeNs, JsonpDeserializer.longDeserializer(), "avg_service_time_ns");
-		op.add(Builder::outgoingSearches, JsonpDeserializer.longDeserializer(), "outgoing_searches");
-		op.add(Builder::rank, JsonpDeserializer.stringDeserializer(), "rank");
-
-	}
+    /**
+     * Required - API name: {@code avg_response_time_ns}
+     */
+    public final long avgResponseTimeNs() {
+        return this.avgResponseTimeNs;
+    }
+
+    /**
+     * Required - API name: {@code avg_service_time_ns}
+     */
+    public final long avgServiceTimeNs() {
+        return this.avgServiceTimeNs;
+    }
+
+    /**
+     * Required - API name: {@code outgoing_searches}
+     */
+    public final long outgoingSearches() {
+        return this.outgoingSearches;
+    }
+
+    /**
+     * Required - API name: {@code rank}
+     */
+    public final String rank() {
+        return this.rank;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("avg_queue_size");
+        generator.write(this.avgQueueSize);
+
+        generator.writeKey("avg_response_time_ns");
+        generator.write(this.avgResponseTimeNs);
+
+        generator.writeKey("avg_service_time_ns");
+        generator.write(this.avgServiceTimeNs);
+
+        generator.writeKey("outgoing_searches");
+        generator.write(this.outgoingSearches);
+
+        generator.writeKey("rank");
+        generator.write(this.rank);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link AdaptiveSelection}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AdaptiveSelection> {
+        private Long avgQueueSize;
+
+        private Long avgResponseTimeNs;
+
+        private Long avgServiceTimeNs;
+
+        private Long outgoingSearches;
+
+        private String rank;
+
+        /**
+         * Required - API name: {@code avg_queue_size}
+         */
+        public final Builder avgQueueSize(long value) {
+            this.avgQueueSize = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code avg_response_time_ns}
+         */
+        public final Builder avgResponseTimeNs(long value) {
+            this.avgResponseTimeNs = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code avg_service_time_ns}
+         */
+        public final Builder avgServiceTimeNs(long value) {
+            this.avgServiceTimeNs = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code outgoing_searches}
+         */
+        public final Builder outgoingSearches(long value) {
+            this.outgoingSearches = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code rank}
+         */
+        public final Builder rank(String value) {
+            this.rank = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link AdaptiveSelection}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public AdaptiveSelection build() {
+            _checkSingleUse();
+
+            return new AdaptiveSelection(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link AdaptiveSelection}
+     */
+    public static final JsonpDeserializer<AdaptiveSelection> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        AdaptiveSelection::setupAdaptiveSelectionDeserializer
+    );
+
+    protected static void setupAdaptiveSelectionDeserializer(ObjectDeserializer<AdaptiveSelection.Builder> op) {
+
+        op.add(Builder::avgQueueSize, JsonpDeserializer.longDeserializer(), "avg_queue_size");
+        op.add(Builder::avgResponseTimeNs, JsonpDeserializer.longDeserializer(), "avg_response_time_ns");
+        op.add(Builder::avgServiceTimeNs, JsonpDeserializer.longDeserializer(), "avg_service_time_ns");
+        op.add(Builder::outgoingSearches, JsonpDeserializer.longDeserializer(), "outgoing_searches");
+        op.add(Builder::rank, JsonpDeserializer.stringDeserializer(), "rank");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Breaker.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Breaker.java
index 30316aa4d4..37543efded 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Breaker.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Breaker.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,213 +43,212 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes._types.Breaker
 
 @JsonpDeserializable
 public class Breaker implements JsonpSerializable {
-	private final String estimatedSize;
+    private final String estimatedSize;
 
-	private final long estimatedSizeInBytes;
+    private final long estimatedSizeInBytes;
 
-	private final String limitSize;
+    private final String limitSize;
 
-	private final long limitSizeInBytes;
+    private final long limitSizeInBytes;
 
-	private final float overhead;
+    private final float overhead;
 
-	private final float tripped;
+    private final float tripped;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private Breaker(Builder builder) {
+    private Breaker(Builder builder) {
 
-		this.estimatedSize = ApiTypeHelper.requireNonNull(builder.estimatedSize, this, "estimatedSize");
-		this.estimatedSizeInBytes = ApiTypeHelper.requireNonNull(builder.estimatedSizeInBytes, this,
-				"estimatedSizeInBytes");
-		this.limitSize = ApiTypeHelper.requireNonNull(builder.limitSize, this, "limitSize");
-		this.limitSizeInBytes = ApiTypeHelper.requireNonNull(builder.limitSizeInBytes, this, "limitSizeInBytes");
-		this.overhead = ApiTypeHelper.requireNonNull(builder.overhead, this, "overhead");
-		this.tripped = ApiTypeHelper.requireNonNull(builder.tripped, this, "tripped");
+        this.estimatedSize = ApiTypeHelper.requireNonNull(builder.estimatedSize, this, "estimatedSize");
+        this.estimatedSizeInBytes = ApiTypeHelper.requireNonNull(builder.estimatedSizeInBytes, this, "estimatedSizeInBytes");
+        this.limitSize = ApiTypeHelper.requireNonNull(builder.limitSize, this, "limitSize");
+        this.limitSizeInBytes = ApiTypeHelper.requireNonNull(builder.limitSizeInBytes, this, "limitSizeInBytes");
+        this.overhead = ApiTypeHelper.requireNonNull(builder.overhead, this, "overhead");
+        this.tripped = ApiTypeHelper.requireNonNull(builder.tripped, this, "tripped");
 
-	}
+    }
 
-	public static Breaker of(Function<Builder, ObjectBuilder<Breaker>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static Breaker of(Function<Builder, ObjectBuilder<Breaker>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code estimated_size}
-	 */
-	public final String estimatedSize() {
-		return this.estimatedSize;
-	}
+    /**
+     * Required - API name: {@code estimated_size}
+     */
+    public final String estimatedSize() {
+        return this.estimatedSize;
+    }
 
-	/**
-	 * Required - API name: {@code estimated_size_in_bytes}
-	 */
-	public final long estimatedSizeInBytes() {
-		return this.estimatedSizeInBytes;
-	}
+    /**
+     * Required - API name: {@code estimated_size_in_bytes}
+     */
+    public final long estimatedSizeInBytes() {
+        return this.estimatedSizeInBytes;
+    }
 
-	/**
-	 * Required - API name: {@code limit_size}
-	 */
-	public final String limitSize() {
-		return this.limitSize;
-	}
+    /**
+     * Required - API name: {@code limit_size}
+     */
+    public final String limitSize() {
+        return this.limitSize;
+    }
 
-	/**
-	 * Required - API name: {@code limit_size_in_bytes}
-	 */
-	public final long limitSizeInBytes() {
-		return this.limitSizeInBytes;
-	}
-
-	/**
-	 * Required - API name: {@code overhead}
-	 */
-	public final float overhead() {
-		return this.overhead;
-	}
-
-	/**
-	 * Required - API name: {@code tripped}
-	 */
-	public final float tripped() {
-		return this.tripped;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("estimated_size");
-		generator.write(this.estimatedSize);
-
-		generator.writeKey("estimated_size_in_bytes");
-		generator.write(this.estimatedSizeInBytes);
-
-		generator.writeKey("limit_size");
-		generator.write(this.limitSize);
-
-		generator.writeKey("limit_size_in_bytes");
-		generator.write(this.limitSizeInBytes);
-
-		generator.writeKey("overhead");
-		generator.write(this.overhead);
-
-		generator.writeKey("tripped");
-		generator.write(this.tripped);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Breaker}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Breaker> {
-		private String estimatedSize;
-
-		private Long estimatedSizeInBytes;
-
-		private String limitSize;
-
-		private Long limitSizeInBytes;
-
-		private Float overhead;
-
-		private Float tripped;
-
-		/**
-		 * Required - API name: {@code estimated_size}
-		 */
-		public final Builder estimatedSize(String value) {
-			this.estimatedSize = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code estimated_size_in_bytes}
-		 */
-		public final Builder estimatedSizeInBytes(long value) {
-			this.estimatedSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code limit_size}
-		 */
-		public final Builder limitSize(String value) {
-			this.limitSize = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code limit_size_in_bytes}
-		 */
-		public final Builder limitSizeInBytes(long value) {
-			this.limitSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code overhead}
-		 */
-		public final Builder overhead(float value) {
-			this.overhead = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tripped}
-		 */
-		public final Builder tripped(float value) {
-			this.tripped = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Breaker}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Breaker build() {
-			_checkSingleUse();
-
-			return new Breaker(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Breaker}
-	 */
-	public static final JsonpDeserializer<Breaker> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Breaker::setupBreakerDeserializer);
-
-	protected static void setupBreakerDeserializer(ObjectDeserializer<Breaker.Builder> op) {
-
-		op.add(Builder::estimatedSize, JsonpDeserializer.stringDeserializer(), "estimated_size");
-		op.add(Builder::estimatedSizeInBytes, JsonpDeserializer.longDeserializer(), "estimated_size_in_bytes");
-		op.add(Builder::limitSize, JsonpDeserializer.stringDeserializer(), "limit_size");
-		op.add(Builder::limitSizeInBytes, JsonpDeserializer.longDeserializer(), "limit_size_in_bytes");
-		op.add(Builder::overhead, JsonpDeserializer.floatDeserializer(), "overhead");
-		op.add(Builder::tripped, JsonpDeserializer.floatDeserializer(), "tripped");
-
-	}
+    /**
+     * Required - API name: {@code limit_size_in_bytes}
+     */
+    public final long limitSizeInBytes() {
+        return this.limitSizeInBytes;
+    }
+
+    /**
+     * Required - API name: {@code overhead}
+     */
+    public final float overhead() {
+        return this.overhead;
+    }
+
+    /**
+     * Required - API name: {@code tripped}
+     */
+    public final float tripped() {
+        return this.tripped;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("estimated_size");
+        generator.write(this.estimatedSize);
+
+        generator.writeKey("estimated_size_in_bytes");
+        generator.write(this.estimatedSizeInBytes);
+
+        generator.writeKey("limit_size");
+        generator.write(this.limitSize);
+
+        generator.writeKey("limit_size_in_bytes");
+        generator.write(this.limitSizeInBytes);
+
+        generator.writeKey("overhead");
+        generator.write(this.overhead);
+
+        generator.writeKey("tripped");
+        generator.write(this.tripped);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Breaker}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Breaker> {
+        private String estimatedSize;
+
+        private Long estimatedSizeInBytes;
+
+        private String limitSize;
+
+        private Long limitSizeInBytes;
+
+        private Float overhead;
+
+        private Float tripped;
+
+        /**
+         * Required - API name: {@code estimated_size}
+         */
+        public final Builder estimatedSize(String value) {
+            this.estimatedSize = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code estimated_size_in_bytes}
+         */
+        public final Builder estimatedSizeInBytes(long value) {
+            this.estimatedSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code limit_size}
+         */
+        public final Builder limitSize(String value) {
+            this.limitSize = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code limit_size_in_bytes}
+         */
+        public final Builder limitSizeInBytes(long value) {
+            this.limitSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code overhead}
+         */
+        public final Builder overhead(float value) {
+            this.overhead = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tripped}
+         */
+        public final Builder tripped(float value) {
+            this.tripped = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Breaker}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Breaker build() {
+            _checkSingleUse();
+
+            return new Breaker(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Breaker}
+     */
+    public static final JsonpDeserializer<Breaker> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Breaker::setupBreakerDeserializer
+    );
+
+    protected static void setupBreakerDeserializer(ObjectDeserializer<Breaker.Builder> op) {
+
+        op.add(Builder::estimatedSize, JsonpDeserializer.stringDeserializer(), "estimated_size");
+        op.add(Builder::estimatedSizeInBytes, JsonpDeserializer.longDeserializer(), "estimated_size_in_bytes");
+        op.add(Builder::limitSize, JsonpDeserializer.stringDeserializer(), "limit_size");
+        op.add(Builder::limitSizeInBytes, JsonpDeserializer.longDeserializer(), "limit_size_in_bytes");
+        op.add(Builder::overhead, JsonpDeserializer.floatDeserializer(), "overhead");
+        op.add(Builder::tripped, JsonpDeserializer.floatDeserializer(), "tripped");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Cpu.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Cpu.java
index ea10c630a9..9b9b43aad0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Cpu.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Cpu.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,315 +45,309 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: nodes._types.Cpu
 
 @JsonpDeserializable
 public class Cpu implements JsonpSerializable {
-	private final int percent;
-
-	@Nullable
-	private final String sys;
-
-	@Nullable
-	private final Long sysInMillis;
-
-	@Nullable
-	private final String total;
-
-	@Nullable
-	private final Long totalInMillis;
-
-	@Nullable
-	private final String user;
-
-	@Nullable
-	private final Long userInMillis;
-
-	private final Map<String, Double> loadAverage;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Cpu(Builder builder) {
-
-		this.percent = ApiTypeHelper.requireNonNull(builder.percent, this, "percent");
-		this.sys = builder.sys;
-		this.sysInMillis = builder.sysInMillis;
-		this.total = builder.total;
-		this.totalInMillis = builder.totalInMillis;
-		this.user = builder.user;
-		this.userInMillis = builder.userInMillis;
-		this.loadAverage = ApiTypeHelper.unmodifiable(builder.loadAverage);
-
-	}
-
-	public static Cpu of(Function<Builder, ObjectBuilder<Cpu>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code percent}
-	 */
-	public final int percent() {
-		return this.percent;
-	}
-
-	/**
-	 * API name: {@code sys}
-	 */
-	@Nullable
-	public final String sys() {
-		return this.sys;
-	}
-
-	/**
-	 * API name: {@code sys_in_millis}
-	 */
-	@Nullable
-	public final Long sysInMillis() {
-		return this.sysInMillis;
-	}
-
-	/**
-	 * API name: {@code total}
-	 */
-	@Nullable
-	public final String total() {
-		return this.total;
-	}
-
-	/**
-	 * API name: {@code total_in_millis}
-	 */
-	@Nullable
-	public final Long totalInMillis() {
-		return this.totalInMillis;
-	}
-
-	/**
-	 * API name: {@code user}
-	 */
-	@Nullable
-	public final String user() {
-		return this.user;
-	}
-
-	/**
-	 * API name: {@code user_in_millis}
-	 */
-	@Nullable
-	public final Long userInMillis() {
-		return this.userInMillis;
-	}
-
-	/**
-	 * API name: {@code load_average}
-	 */
-	public final Map<String, Double> loadAverage() {
-		return this.loadAverage;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("percent");
-		generator.write(this.percent);
-
-		if (this.sys != null) {
-			generator.writeKey("sys");
-			generator.write(this.sys);
-
-		}
-		if (this.sysInMillis != null) {
-			generator.writeKey("sys_in_millis");
-			generator.write(this.sysInMillis);
-
-		}
-		if (this.total != null) {
-			generator.writeKey("total");
-			generator.write(this.total);
-
-		}
-		if (this.totalInMillis != null) {
-			generator.writeKey("total_in_millis");
-			generator.write(this.totalInMillis);
-
-		}
-		if (this.user != null) {
-			generator.writeKey("user");
-			generator.write(this.user);
-
-		}
-		if (this.userInMillis != null) {
-			generator.writeKey("user_in_millis");
-			generator.write(this.userInMillis);
-
-		}
-		if (ApiTypeHelper.isDefined(this.loadAverage)) {
-			generator.writeKey("load_average");
-			generator.writeStartObject();
-			for (Map.Entry<String, Double> item0 : this.loadAverage.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Cpu}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Cpu> {
-		private Integer percent;
-
-		@Nullable
-		private String sys;
-
-		@Nullable
-		private Long sysInMillis;
-
-		@Nullable
-		private String total;
-
-		@Nullable
-		private Long totalInMillis;
-
-		@Nullable
-		private String user;
-
-		@Nullable
-		private Long userInMillis;
-
-		@Nullable
-		private Map<String, Double> loadAverage;
-
-		/**
-		 * Required - API name: {@code percent}
-		 */
-		public final Builder percent(int value) {
-			this.percent = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code sys}
-		 */
-		public final Builder sys(@Nullable String value) {
-			this.sys = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code sys_in_millis}
-		 */
-		public final Builder sysInMillis(@Nullable Long value) {
-			this.sysInMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total}
-		 */
-		public final Builder total(@Nullable String value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code total_in_millis}
-		 */
-		public final Builder totalInMillis(@Nullable Long value) {
-			this.totalInMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code user}
-		 */
-		public final Builder user(@Nullable String value) {
-			this.user = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code user_in_millis}
-		 */
-		public final Builder userInMillis(@Nullable Long value) {
-			this.userInMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code load_average}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>loadAverage</code>.
-		 */
-		public final Builder loadAverage(Map<String, Double> map) {
-			this.loadAverage = _mapPutAll(this.loadAverage, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code load_average}
-		 * <p>
-		 * Adds an entry to <code>loadAverage</code>.
-		 */
-		public final Builder loadAverage(String key, Double value) {
-			this.loadAverage = _mapPut(this.loadAverage, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Cpu}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Cpu build() {
-			_checkSingleUse();
-
-			return new Cpu(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Cpu}
-	 */
-	public static final JsonpDeserializer<Cpu> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Cpu::setupCpuDeserializer);
-
-	protected static void setupCpuDeserializer(ObjectDeserializer<Cpu.Builder> op) {
-
-		op.add(Builder::percent, JsonpDeserializer.integerDeserializer(), "percent");
-		op.add(Builder::sys, JsonpDeserializer.stringDeserializer(), "sys");
-		op.add(Builder::sysInMillis, JsonpDeserializer.longDeserializer(), "sys_in_millis");
-		op.add(Builder::total, JsonpDeserializer.stringDeserializer(), "total");
-		op.add(Builder::totalInMillis, JsonpDeserializer.longDeserializer(), "total_in_millis");
-		op.add(Builder::user, JsonpDeserializer.stringDeserializer(), "user");
-		op.add(Builder::userInMillis, JsonpDeserializer.longDeserializer(), "user_in_millis");
-		op.add(Builder::loadAverage, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.doubleDeserializer()),
-				"load_average");
-
-	}
+    private final int percent;
+
+    @Nullable
+    private final String sys;
+
+    @Nullable
+    private final Long sysInMillis;
+
+    @Nullable
+    private final String total;
+
+    @Nullable
+    private final Long totalInMillis;
+
+    @Nullable
+    private final String user;
+
+    @Nullable
+    private final Long userInMillis;
+
+    private final Map<String, Double> loadAverage;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Cpu(Builder builder) {
+
+        this.percent = ApiTypeHelper.requireNonNull(builder.percent, this, "percent");
+        this.sys = builder.sys;
+        this.sysInMillis = builder.sysInMillis;
+        this.total = builder.total;
+        this.totalInMillis = builder.totalInMillis;
+        this.user = builder.user;
+        this.userInMillis = builder.userInMillis;
+        this.loadAverage = ApiTypeHelper.unmodifiable(builder.loadAverage);
+
+    }
+
+    public static Cpu of(Function<Builder, ObjectBuilder<Cpu>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code percent}
+     */
+    public final int percent() {
+        return this.percent;
+    }
+
+    /**
+     * API name: {@code sys}
+     */
+    @Nullable
+    public final String sys() {
+        return this.sys;
+    }
+
+    /**
+     * API name: {@code sys_in_millis}
+     */
+    @Nullable
+    public final Long sysInMillis() {
+        return this.sysInMillis;
+    }
+
+    /**
+     * API name: {@code total}
+     */
+    @Nullable
+    public final String total() {
+        return this.total;
+    }
+
+    /**
+     * API name: {@code total_in_millis}
+     */
+    @Nullable
+    public final Long totalInMillis() {
+        return this.totalInMillis;
+    }
+
+    /**
+     * API name: {@code user}
+     */
+    @Nullable
+    public final String user() {
+        return this.user;
+    }
+
+    /**
+     * API name: {@code user_in_millis}
+     */
+    @Nullable
+    public final Long userInMillis() {
+        return this.userInMillis;
+    }
+
+    /**
+     * API name: {@code load_average}
+     */
+    public final Map<String, Double> loadAverage() {
+        return this.loadAverage;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("percent");
+        generator.write(this.percent);
+
+        if (this.sys != null) {
+            generator.writeKey("sys");
+            generator.write(this.sys);
+
+        }
+        if (this.sysInMillis != null) {
+            generator.writeKey("sys_in_millis");
+            generator.write(this.sysInMillis);
+
+        }
+        if (this.total != null) {
+            generator.writeKey("total");
+            generator.write(this.total);
+
+        }
+        if (this.totalInMillis != null) {
+            generator.writeKey("total_in_millis");
+            generator.write(this.totalInMillis);
+
+        }
+        if (this.user != null) {
+            generator.writeKey("user");
+            generator.write(this.user);
+
+        }
+        if (this.userInMillis != null) {
+            generator.writeKey("user_in_millis");
+            generator.write(this.userInMillis);
+
+        }
+        if (ApiTypeHelper.isDefined(this.loadAverage)) {
+            generator.writeKey("load_average");
+            generator.writeStartObject();
+            for (Map.Entry<String, Double> item0 : this.loadAverage.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Cpu}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Cpu> {
+        private Integer percent;
+
+        @Nullable
+        private String sys;
+
+        @Nullable
+        private Long sysInMillis;
+
+        @Nullable
+        private String total;
+
+        @Nullable
+        private Long totalInMillis;
+
+        @Nullable
+        private String user;
+
+        @Nullable
+        private Long userInMillis;
+
+        @Nullable
+        private Map<String, Double> loadAverage;
+
+        /**
+         * Required - API name: {@code percent}
+         */
+        public final Builder percent(int value) {
+            this.percent = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code sys}
+         */
+        public final Builder sys(@Nullable String value) {
+            this.sys = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code sys_in_millis}
+         */
+        public final Builder sysInMillis(@Nullable Long value) {
+            this.sysInMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total}
+         */
+        public final Builder total(@Nullable String value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code total_in_millis}
+         */
+        public final Builder totalInMillis(@Nullable Long value) {
+            this.totalInMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code user}
+         */
+        public final Builder user(@Nullable String value) {
+            this.user = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code user_in_millis}
+         */
+        public final Builder userInMillis(@Nullable Long value) {
+            this.userInMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code load_average}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>loadAverage</code>.
+         */
+        public final Builder loadAverage(Map<String, Double> map) {
+            this.loadAverage = _mapPutAll(this.loadAverage, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code load_average}
+         * <p>
+         * Adds an entry to <code>loadAverage</code>.
+         */
+        public final Builder loadAverage(String key, Double value) {
+            this.loadAverage = _mapPut(this.loadAverage, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link Cpu}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Cpu build() {
+            _checkSingleUse();
+
+            return new Cpu(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Cpu}
+     */
+    public static final JsonpDeserializer<Cpu> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new, Cpu::setupCpuDeserializer);
+
+    protected static void setupCpuDeserializer(ObjectDeserializer<Cpu.Builder> op) {
+
+        op.add(Builder::percent, JsonpDeserializer.integerDeserializer(), "percent");
+        op.add(Builder::sys, JsonpDeserializer.stringDeserializer(), "sys");
+        op.add(Builder::sysInMillis, JsonpDeserializer.longDeserializer(), "sys_in_millis");
+        op.add(Builder::total, JsonpDeserializer.stringDeserializer(), "total");
+        op.add(Builder::totalInMillis, JsonpDeserializer.longDeserializer(), "total_in_millis");
+        op.add(Builder::user, JsonpDeserializer.stringDeserializer(), "user");
+        op.add(Builder::userInMillis, JsonpDeserializer.longDeserializer(), "user_in_millis");
+        op.add(Builder::loadAverage, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.doubleDeserializer()), "load_average");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/DataPathStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/DataPathStats.java
index 7f55dbc4cd..735724194e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/DataPathStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/DataPathStats.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,214 +43,213 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes._types.DataPathStats
 
-
 @JsonpDeserializable
 public class DataPathStats implements JsonpSerializable {
-	private final long availableInBytes;
-
-	private final long freeInBytes;
+    private final long availableInBytes;
 
-	private final String mount;
+    private final long freeInBytes;
 
-	private final String path;
+    private final String mount;
 
-	private final long totalInBytes;
+    private final String path;
 
-	private final String type;
+    private final long totalInBytes;
 
-	// ---------------------------------------------------------------------------------------------
+    private final String type;
 
-	private DataPathStats(Builder builder) {
+    // ---------------------------------------------------------------------------------------------
 
-		this.availableInBytes = ApiTypeHelper.requireNonNull(builder.availableInBytes, this, "availableInBytes");
-		this.freeInBytes = ApiTypeHelper.requireNonNull(builder.freeInBytes, this, "freeInBytes");
-		this.mount = ApiTypeHelper.requireNonNull(builder.mount, this, "mount");
-		this.path = ApiTypeHelper.requireNonNull(builder.path, this, "path");
-		this.totalInBytes = ApiTypeHelper.requireNonNull(builder.totalInBytes, this, "totalInBytes");
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+    private DataPathStats(Builder builder) {
 
-	}
+        this.availableInBytes = ApiTypeHelper.requireNonNull(builder.availableInBytes, this, "availableInBytes");
+        this.freeInBytes = ApiTypeHelper.requireNonNull(builder.freeInBytes, this, "freeInBytes");
+        this.mount = ApiTypeHelper.requireNonNull(builder.mount, this, "mount");
+        this.path = ApiTypeHelper.requireNonNull(builder.path, this, "path");
+        this.totalInBytes = ApiTypeHelper.requireNonNull(builder.totalInBytes, this, "totalInBytes");
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
 
-	public static DataPathStats of(Function<Builder, ObjectBuilder<DataPathStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code available_in_bytes}
-	 */
-	public final long availableInBytes() {
-		return this.availableInBytes;
-	}
+    public static DataPathStats of(Function<Builder, ObjectBuilder<DataPathStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code free_in_bytes}
-	 */
-	public final long freeInBytes() {
-		return this.freeInBytes;
-	}
+    /**
+     * Required - API name: {@code available_in_bytes}
+     */
+    public final long availableInBytes() {
+        return this.availableInBytes;
+    }
 
-	/**
-	 * Required - API name: {@code mount}
-	 */
-	public final String mount() {
-		return this.mount;
-	}
+    /**
+     * Required - API name: {@code free_in_bytes}
+     */
+    public final long freeInBytes() {
+        return this.freeInBytes;
+    }
 
-	/**
-	 * Required - API name: {@code path}
-	 */
-	public final String path() {
-		return this.path;
-	}
+    /**
+     * Required - API name: {@code mount}
+     */
+    public final String mount() {
+        return this.mount;
+    }
 
-	/**
-	 * Required - API name: {@code total_in_bytes}
-	 */
-	public final long totalInBytes() {
-		return this.totalInBytes;
-	}
-
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("available_in_bytes");
-		generator.write(this.availableInBytes);
-
-		generator.writeKey("free_in_bytes");
-		generator.write(this.freeInBytes);
-
-		generator.writeKey("mount");
-		generator.write(this.mount);
-
-		generator.writeKey("path");
-		generator.write(this.path);
-
-		generator.writeKey("total_in_bytes");
-		generator.write(this.totalInBytes);
-
-		generator.writeKey("type");
-		generator.write(this.type);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DataPathStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DataPathStats> {
-
-		private Long availableInBytes;
-
-		private Long freeInBytes;
-
-		private String mount;
-
-		private String path;
-
-		private Long totalInBytes;
-
-		private String type;
-
-		/**
-		 * Required - API name: {@code available_in_bytes}
-		 */
-		public final Builder availableInBytes(long value) {
-			this.availableInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code free_in_bytes}
-		 */
-		public final Builder freeInBytes(long value) {
-			this.freeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mount}
-		 */
-		public final Builder mount(String value) {
-			this.mount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code path}
-		 */
-		public final Builder path(String value) {
-			this.path = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_in_bytes}
-		 */
-		public final Builder totalInBytes(long value) {
-			this.totalInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DataPathStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DataPathStats build() {
-			_checkSingleUse();
+    /**
+     * Required - API name: {@code path}
+     */
+    public final String path() {
+        return this.path;
+    }
 
-			return new DataPathStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DataPathStats}
-	 */
-	public static final JsonpDeserializer<DataPathStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			DataPathStats::setupDataPathStatsDeserializer);
-
-	protected static void setupDataPathStatsDeserializer(ObjectDeserializer<DataPathStats.Builder> op) {
-
-		op.add(Builder::availableInBytes, JsonpDeserializer.longDeserializer(), "available_in_bytes");
-		op.add(Builder::freeInBytes, JsonpDeserializer.longDeserializer(), "free_in_bytes");
-		op.add(Builder::mount, JsonpDeserializer.stringDeserializer(), "mount");
-		op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
-		op.add(Builder::totalInBytes, JsonpDeserializer.longDeserializer(), "total_in_bytes");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-
-	}
+    /**
+     * Required - API name: {@code total_in_bytes}
+     */
+    public final long totalInBytes() {
+        return this.totalInBytes;
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("available_in_bytes");
+        generator.write(this.availableInBytes);
+
+        generator.writeKey("free_in_bytes");
+        generator.write(this.freeInBytes);
+
+        generator.writeKey("mount");
+        generator.write(this.mount);
+
+        generator.writeKey("path");
+        generator.write(this.path);
+
+        generator.writeKey("total_in_bytes");
+        generator.write(this.totalInBytes);
+
+        generator.writeKey("type");
+        generator.write(this.type);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DataPathStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DataPathStats> {
+
+        private Long availableInBytes;
+
+        private Long freeInBytes;
+
+        private String mount;
+
+        private String path;
+
+        private Long totalInBytes;
+
+        private String type;
+
+        /**
+         * Required - API name: {@code available_in_bytes}
+         */
+        public final Builder availableInBytes(long value) {
+            this.availableInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code free_in_bytes}
+         */
+        public final Builder freeInBytes(long value) {
+            this.freeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mount}
+         */
+        public final Builder mount(String value) {
+            this.mount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code path}
+         */
+        public final Builder path(String value) {
+            this.path = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_in_bytes}
+         */
+        public final Builder totalInBytes(long value) {
+            this.totalInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link DataPathStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DataPathStats build() {
+            _checkSingleUse();
+
+            return new DataPathStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DataPathStats}
+     */
+    public static final JsonpDeserializer<DataPathStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DataPathStats::setupDataPathStatsDeserializer
+    );
+
+    protected static void setupDataPathStatsDeserializer(ObjectDeserializer<DataPathStats.Builder> op) {
+
+        op.add(Builder::availableInBytes, JsonpDeserializer.longDeserializer(), "available_in_bytes");
+        op.add(Builder::freeInBytes, JsonpDeserializer.longDeserializer(), "free_in_bytes");
+        op.add(Builder::mount, JsonpDeserializer.stringDeserializer(), "mount");
+        op.add(Builder::path, JsonpDeserializer.stringDeserializer(), "path");
+        op.add(Builder::totalInBytes, JsonpDeserializer.longDeserializer(), "total_in_bytes");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/ExtendedMemoryStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/ExtendedMemoryStats.java
index b8945849a7..2a447a0736 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/ExtendedMemoryStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/ExtendedMemoryStats.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,116 +41,114 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes._types.ExtendedMemoryStats
 
 @JsonpDeserializable
 public class ExtendedMemoryStats extends MemoryStats {
-	private final int freePercent;
-
-	private final int usedPercent;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ExtendedMemoryStats(Builder builder) {
-		super(builder);
-
-		this.freePercent = ApiTypeHelper.requireNonNull(builder.freePercent, this, "freePercent");
-		this.usedPercent = ApiTypeHelper.requireNonNull(builder.usedPercent, this, "usedPercent");
-
-	}
-
-	public static ExtendedMemoryStats of(Function<Builder, ObjectBuilder<ExtendedMemoryStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code free_percent}
-	 */
-	public final int freePercent() {
-		return this.freePercent;
-	}
-
-	/**
-	 * Required - API name: {@code used_percent}
-	 */
-	public final int usedPercent() {
-		return this.usedPercent;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("free_percent");
-		generator.write(this.freePercent);
-
-		generator.writeKey("used_percent");
-		generator.write(this.usedPercent);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ExtendedMemoryStats}.
-	 */
-
-	public static class Builder extends MemoryStats.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ExtendedMemoryStats> {
-		private Integer freePercent;
-
-		private Integer usedPercent;
-
-		/**
-		 * Required - API name: {@code free_percent}
-		 */
-		public final Builder freePercent(int value) {
-			this.freePercent = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code used_percent}
-		 */
-		public final Builder usedPercent(int value) {
-			this.usedPercent = value;
-			return this;
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ExtendedMemoryStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ExtendedMemoryStats build() {
-			_checkSingleUse();
-
-			return new ExtendedMemoryStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ExtendedMemoryStats}
-	 */
-	public static final JsonpDeserializer<ExtendedMemoryStats> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ExtendedMemoryStats::setupExtendedMemoryStatsDeserializer);
-
-	protected static void setupExtendedMemoryStatsDeserializer(ObjectDeserializer<ExtendedMemoryStats.Builder> op) {
-		setupMemoryStatsDeserializer(op);
-		op.add(Builder::freePercent, JsonpDeserializer.integerDeserializer(), "free_percent");
-		op.add(Builder::usedPercent, JsonpDeserializer.integerDeserializer(), "used_percent");
-
-	}
+    private final int freePercent;
+
+    private final int usedPercent;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ExtendedMemoryStats(Builder builder) {
+        super(builder);
+
+        this.freePercent = ApiTypeHelper.requireNonNull(builder.freePercent, this, "freePercent");
+        this.usedPercent = ApiTypeHelper.requireNonNull(builder.usedPercent, this, "usedPercent");
+
+    }
+
+    public static ExtendedMemoryStats of(Function<Builder, ObjectBuilder<ExtendedMemoryStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code free_percent}
+     */
+    public final int freePercent() {
+        return this.freePercent;
+    }
+
+    /**
+     * Required - API name: {@code used_percent}
+     */
+    public final int usedPercent() {
+        return this.usedPercent;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("free_percent");
+        generator.write(this.freePercent);
+
+        generator.writeKey("used_percent");
+        generator.write(this.usedPercent);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ExtendedMemoryStats}.
+     */
+
+    public static class Builder extends MemoryStats.AbstractBuilder<Builder> implements ObjectBuilder<ExtendedMemoryStats> {
+        private Integer freePercent;
+
+        private Integer usedPercent;
+
+        /**
+         * Required - API name: {@code free_percent}
+         */
+        public final Builder freePercent(int value) {
+            this.freePercent = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code used_percent}
+         */
+        public final Builder usedPercent(int value) {
+            this.usedPercent = value;
+            return this;
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ExtendedMemoryStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ExtendedMemoryStats build() {
+            _checkSingleUse();
+
+            return new ExtendedMemoryStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ExtendedMemoryStats}
+     */
+    public static final JsonpDeserializer<ExtendedMemoryStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ExtendedMemoryStats::setupExtendedMemoryStatsDeserializer
+    );
+
+    protected static void setupExtendedMemoryStatsDeserializer(ObjectDeserializer<ExtendedMemoryStats.Builder> op) {
+        setupMemoryStatsDeserializer(op);
+        op.add(Builder::freePercent, JsonpDeserializer.integerDeserializer(), "free_percent");
+        op.add(Builder::usedPercent, JsonpDeserializer.integerDeserializer(), "used_percent");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/FileSystem.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/FileSystem.java
index c75f88d5cb..d82c17ae82 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/FileSystem.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/FileSystem.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,177 +44,175 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: nodes._types.FileSystem
 
-
 @JsonpDeserializable
 public class FileSystem implements JsonpSerializable {
-	private final List<DataPathStats> data;
-
-	private final long timestamp;
-
-	private final FileSystemTotal total;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FileSystem(Builder builder) {
-
-		this.data = ApiTypeHelper.unmodifiableRequired(builder.data, this, "data");
-		this.timestamp = ApiTypeHelper.requireNonNull(builder.timestamp, this, "timestamp");
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
-
-	}
-
-	public static FileSystem of(Function<Builder, ObjectBuilder<FileSystem>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code data}
-	 */
-	public final List<DataPathStats> data() {
-		return this.data;
-	}
-
-	/**
-	 * Required - API name: {@code timestamp}
-	 */
-	public final long timestamp() {
-		return this.timestamp;
-	}
-
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final FileSystemTotal total() {
-		return this.total;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.data)) {
-			generator.writeKey("data");
-			generator.writeStartArray();
-			for (DataPathStats item0 : this.data) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("timestamp");
-		generator.write(this.timestamp);
-
-		generator.writeKey("total");
-		this.total.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link FileSystem}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FileSystem> {
-		private List<DataPathStats> data;
-
-		private Long timestamp;
-
-		private FileSystemTotal total;
-
-		/**
-		 * Required - API name: {@code data}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>data</code>.
-		 */
-		public final Builder data(List<DataPathStats> list) {
-			this.data = _listAddAll(this.data, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code data}
-		 * <p>
-		 * Adds one or more values to <code>data</code>.
-		 */
-		public final Builder data(DataPathStats value, DataPathStats... values) {
-			this.data = _listAdd(this.data, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code data}
-		 * <p>
-		 * Adds a value to <code>data</code> using a builder lambda.
-		 */
-		public final Builder data(Function<DataPathStats.Builder, ObjectBuilder<DataPathStats>> fn) {
-			return data(fn.apply(new DataPathStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code timestamp}
-		 */
-		public final Builder timestamp(long value) {
-			this.timestamp = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(FileSystemTotal value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(Function<FileSystemTotal.Builder, ObjectBuilder<FileSystemTotal>> fn) {
-			return this.total(fn.apply(new FileSystemTotal.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link FileSystem}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FileSystem build() {
-			_checkSingleUse();
-
-			return new FileSystem(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FileSystem}
-	 */
-	public static final JsonpDeserializer<FileSystem> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FileSystem::setupFileSystemDeserializer);
-
-	protected static void setupFileSystemDeserializer(ObjectDeserializer<FileSystem.Builder> op) {
-
-		op.add(Builder::data, JsonpDeserializer.arrayDeserializer(DataPathStats._DESERIALIZER), "data");
-		op.add(Builder::timestamp, JsonpDeserializer.longDeserializer(), "timestamp");
-		op.add(Builder::total, FileSystemTotal._DESERIALIZER, "total");
-
-	}
+    private final List<DataPathStats> data;
+
+    private final long timestamp;
+
+    private final FileSystemTotal total;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private FileSystem(Builder builder) {
+
+        this.data = ApiTypeHelper.unmodifiableRequired(builder.data, this, "data");
+        this.timestamp = ApiTypeHelper.requireNonNull(builder.timestamp, this, "timestamp");
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+
+    }
+
+    public static FileSystem of(Function<Builder, ObjectBuilder<FileSystem>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code data}
+     */
+    public final List<DataPathStats> data() {
+        return this.data;
+    }
+
+    /**
+     * Required - API name: {@code timestamp}
+     */
+    public final long timestamp() {
+        return this.timestamp;
+    }
+
+    /**
+     * Required - API name: {@code total}
+     */
+    public final FileSystemTotal total() {
+        return this.total;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.data)) {
+            generator.writeKey("data");
+            generator.writeStartArray();
+            for (DataPathStats item0 : this.data) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("timestamp");
+        generator.write(this.timestamp);
+
+        generator.writeKey("total");
+        this.total.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link FileSystem}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FileSystem> {
+        private List<DataPathStats> data;
+
+        private Long timestamp;
+
+        private FileSystemTotal total;
+
+        /**
+         * Required - API name: {@code data}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>data</code>.
+         */
+        public final Builder data(List<DataPathStats> list) {
+            this.data = _listAddAll(this.data, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code data}
+         * <p>
+         * Adds one or more values to <code>data</code>.
+         */
+        public final Builder data(DataPathStats value, DataPathStats... values) {
+            this.data = _listAdd(this.data, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code data}
+         * <p>
+         * Adds a value to <code>data</code> using a builder lambda.
+         */
+        public final Builder data(Function<DataPathStats.Builder, ObjectBuilder<DataPathStats>> fn) {
+            return data(fn.apply(new DataPathStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code timestamp}
+         */
+        public final Builder timestamp(long value) {
+            this.timestamp = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(FileSystemTotal value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(Function<FileSystemTotal.Builder, ObjectBuilder<FileSystemTotal>> fn) {
+            return this.total(fn.apply(new FileSystemTotal.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link FileSystem}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FileSystem build() {
+            _checkSingleUse();
+
+            return new FileSystem(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FileSystem}
+     */
+    public static final JsonpDeserializer<FileSystem> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FileSystem::setupFileSystemDeserializer
+    );
+
+    protected static void setupFileSystemDeserializer(ObjectDeserializer<FileSystem.Builder> op) {
+
+        op.add(Builder::data, JsonpDeserializer.arrayDeserializer(DataPathStats._DESERIALIZER), "data");
+        op.add(Builder::timestamp, JsonpDeserializer.longDeserializer(), "timestamp");
+        op.add(Builder::total, FileSystemTotal._DESERIALIZER, "total");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/FileSystemTotal.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/FileSystemTotal.java
index 9921140c6f..57d79f9346 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/FileSystemTotal.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/FileSystemTotal.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,144 +43,141 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes._types.FileSystemTotal
 
-
 @JsonpDeserializable
 public class FileSystemTotal implements JsonpSerializable {
-	private final long availableInBytes;
-
-	private final long freeInBytes;
-
-	private final long totalInBytes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private FileSystemTotal(Builder builder) {
-
-		this.availableInBytes = ApiTypeHelper.requireNonNull(builder.availableInBytes, this, "availableInBytes");
-		this.freeInBytes = ApiTypeHelper.requireNonNull(builder.freeInBytes, this, "freeInBytes");
-		this.totalInBytes = ApiTypeHelper.requireNonNull(builder.totalInBytes, this, "totalInBytes");
-
-	}
+    private final long availableInBytes;
 
-	public static FileSystemTotal of(Function<Builder, ObjectBuilder<FileSystemTotal>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    private final long freeInBytes;
 
-	/**
-	 * Required - API name: {@code available_in_bytes}
-	 */
-	public final long availableInBytes() {
-		return this.availableInBytes;
-	}
+    private final long totalInBytes;
 
-	/**
-	 * Required - API name: {@code free_in_bytes}
-	 */
-	public final long freeInBytes() {
-		return this.freeInBytes;
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private FileSystemTotal(Builder builder) {
 
+        this.availableInBytes = ApiTypeHelper.requireNonNull(builder.availableInBytes, this, "availableInBytes");
+        this.freeInBytes = ApiTypeHelper.requireNonNull(builder.freeInBytes, this, "freeInBytes");
+        this.totalInBytes = ApiTypeHelper.requireNonNull(builder.totalInBytes, this, "totalInBytes");
 
-	/**
-	 * Required - API name: {@code total_in_bytes}
-	 */
-	public final long totalInBytes() {
-		return this.totalInBytes;
-	}
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    public static FileSystemTotal of(Function<Builder, ObjectBuilder<FileSystemTotal>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code available_in_bytes}
+     */
+    public final long availableInBytes() {
+        return this.availableInBytes;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Required - API name: {@code free_in_bytes}
+     */
+    public final long freeInBytes() {
+        return this.freeInBytes;
+    }
 
-		generator.writeKey("available_in_bytes");
-		generator.write(this.availableInBytes);
+    /**
+     * Required - API name: {@code total_in_bytes}
+     */
+    public final long totalInBytes() {
+        return this.totalInBytes;
+    }
 
-		generator.writeKey("free_in_bytes");
-		generator.write(this.freeInBytes);
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("total_in_bytes");
-		generator.write(this.totalInBytes);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-	}
+        generator.writeKey("available_in_bytes");
+        generator.write(this.availableInBytes);
 
-	// ---------------------------------------------------------------------------------------------
+        generator.writeKey("free_in_bytes");
+        generator.write(this.freeInBytes);
 
-	/**
-	 * Builder for {@link FileSystemTotal}.
-	 */
+        generator.writeKey("total_in_bytes");
+        generator.write(this.totalInBytes);
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FileSystemTotal> {
+    }
 
-		private Long availableInBytes;
+    // ---------------------------------------------------------------------------------------------
 
-		private Long freeInBytes;
+    /**
+     * Builder for {@link FileSystemTotal}.
+     */
 
-		private Long totalInBytes;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FileSystemTotal> {
 
-		/**
-		 * Required - API name: {@code available_in_bytes}
-		 */
-		public final Builder availableInBytes(long value) {
-			this.availableInBytes = value;
-			return this;
-		}
+        private Long availableInBytes;
 
+        private Long freeInBytes;
 
-		/**
-		 * Required - API name: {@code free_in_bytes}
-		 */
-		public final Builder freeInBytes(long value) {
-			this.freeInBytes = value;
-			return this;
-		}
+        private Long totalInBytes;
 
-		/**
-		 * Required - API name: {@code total_in_bytes}
-		 */
-		public final Builder totalInBytes(long value) {
-			this.totalInBytes = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code available_in_bytes}
+         */
+        public final Builder availableInBytes(long value) {
+            this.availableInBytes = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link FileSystemTotal}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FileSystemTotal build() {
-			_checkSingleUse();
-
-			return new FileSystemTotal(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link FileSystemTotal}
-	 */
-	public static final JsonpDeserializer<FileSystemTotal> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			FileSystemTotal::setupFileSystemTotalDeserializer);
-
-	protected static void setupFileSystemTotalDeserializer(ObjectDeserializer<FileSystemTotal.Builder> op) {
+        /**
+         * Required - API name: {@code free_in_bytes}
+         */
+        public final Builder freeInBytes(long value) {
+            this.freeInBytes = value;
+            return this;
+        }
 
-		op.add(Builder::availableInBytes, JsonpDeserializer.longDeserializer(), "available_in_bytes");
-		op.add(Builder::freeInBytes, JsonpDeserializer.longDeserializer(), "free_in_bytes");
-		op.add(Builder::totalInBytes, JsonpDeserializer.longDeserializer(), "total_in_bytes");
+        /**
+         * Required - API name: {@code total_in_bytes}
+         */
+        public final Builder totalInBytes(long value) {
+            this.totalInBytes = value;
+            return this;
+        }
 
-	}
+        /**
+         * Builds a {@link FileSystemTotal}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FileSystemTotal build() {
+            _checkSingleUse();
+
+            return new FileSystemTotal(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link FileSystemTotal}
+     */
+    public static final JsonpDeserializer<FileSystemTotal> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FileSystemTotal::setupFileSystemTotalDeserializer
+    );
+
+    protected static void setupFileSystemTotalDeserializer(ObjectDeserializer<FileSystemTotal.Builder> op) {
+
+        op.add(Builder::availableInBytes, JsonpDeserializer.longDeserializer(), "available_in_bytes");
+        op.add(Builder::freeInBytes, JsonpDeserializer.longDeserializer(), "free_in_bytes");
+        op.add(Builder::totalInBytes, JsonpDeserializer.longDeserializer(), "total_in_bytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/GarbageCollector.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/GarbageCollector.java
index 1b75213508..b0d91fb8e3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/GarbageCollector.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/GarbageCollector.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,126 +44,122 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: nodes._types.GarbageCollector
 
-
 @JsonpDeserializable
 public class GarbageCollector implements JsonpSerializable {
-	private final Map<String, GarbageCollectorTotal> collectors;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GarbageCollector(Builder builder) {
-
-		this.collectors = ApiTypeHelper.unmodifiableRequired(builder.collectors, this, "collectors");
-
-	}
-
-	public static GarbageCollector of(Function<Builder, ObjectBuilder<GarbageCollector>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code collectors}
-	 */
-	public final Map<String, GarbageCollectorTotal> collectors() {
-		return this.collectors;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.collectors)) {
-			generator.writeKey("collectors");
-			generator.writeStartObject();
-			for (Map.Entry<String, GarbageCollectorTotal> item0 : this.collectors.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GarbageCollector}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GarbageCollector> {
-		private Map<String, GarbageCollectorTotal> collectors;
-
-		/**
-		 * Required - API name: {@code collectors}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>collectors</code>.
-		 */
-		public final Builder collectors(Map<String, GarbageCollectorTotal> map) {
-			this.collectors = _mapPutAll(this.collectors, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code collectors}
-		 * <p>
-		 * Adds an entry to <code>collectors</code>.
-		 */
-		public final Builder collectors(String key, GarbageCollectorTotal value) {
-			this.collectors = _mapPut(this.collectors, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code collectors}
-		 * <p>
-		 * Adds an entry to <code>collectors</code> using a builder lambda.
-		 */
-		public final Builder collectors(String key,
-				Function<GarbageCollectorTotal.Builder, ObjectBuilder<GarbageCollectorTotal>> fn) {
-			return collectors(key, fn.apply(new GarbageCollectorTotal.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link GarbageCollector}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GarbageCollector build() {
-			_checkSingleUse();
-
-			return new GarbageCollector(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GarbageCollector}
-	 */
-	public static final JsonpDeserializer<GarbageCollector> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GarbageCollector::setupGarbageCollectorDeserializer);
-
-	protected static void setupGarbageCollectorDeserializer(ObjectDeserializer<GarbageCollector.Builder> op) {
-
-		op.add(Builder::collectors, JsonpDeserializer.stringMapDeserializer(GarbageCollectorTotal._DESERIALIZER),
-				"collectors");
-
-	}
+    private final Map<String, GarbageCollectorTotal> collectors;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GarbageCollector(Builder builder) {
+
+        this.collectors = ApiTypeHelper.unmodifiableRequired(builder.collectors, this, "collectors");
+
+    }
+
+    public static GarbageCollector of(Function<Builder, ObjectBuilder<GarbageCollector>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code collectors}
+     */
+    public final Map<String, GarbageCollectorTotal> collectors() {
+        return this.collectors;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.collectors)) {
+            generator.writeKey("collectors");
+            generator.writeStartObject();
+            for (Map.Entry<String, GarbageCollectorTotal> item0 : this.collectors.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GarbageCollector}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GarbageCollector> {
+        private Map<String, GarbageCollectorTotal> collectors;
+
+        /**
+         * Required - API name: {@code collectors}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>collectors</code>.
+         */
+        public final Builder collectors(Map<String, GarbageCollectorTotal> map) {
+            this.collectors = _mapPutAll(this.collectors, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code collectors}
+         * <p>
+         * Adds an entry to <code>collectors</code>.
+         */
+        public final Builder collectors(String key, GarbageCollectorTotal value) {
+            this.collectors = _mapPut(this.collectors, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code collectors}
+         * <p>
+         * Adds an entry to <code>collectors</code> using a builder lambda.
+         */
+        public final Builder collectors(String key, Function<GarbageCollectorTotal.Builder, ObjectBuilder<GarbageCollectorTotal>> fn) {
+            return collectors(key, fn.apply(new GarbageCollectorTotal.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link GarbageCollector}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GarbageCollector build() {
+            _checkSingleUse();
+
+            return new GarbageCollector(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GarbageCollector}
+     */
+    public static final JsonpDeserializer<GarbageCollector> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GarbageCollector::setupGarbageCollectorDeserializer
+    );
+
+    protected static void setupGarbageCollectorDeserializer(ObjectDeserializer<GarbageCollector.Builder> op) {
+
+        op.add(Builder::collectors, JsonpDeserializer.stringMapDeserializer(GarbageCollectorTotal._DESERIALIZER), "collectors");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/GarbageCollectorTotal.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/GarbageCollectorTotal.java
index ab76e94074..e8876cb86c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/GarbageCollectorTotal.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/GarbageCollectorTotal.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,118 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes._types.GarbageCollectorTotal
 
-
 @JsonpDeserializable
 public class GarbageCollectorTotal implements JsonpSerializable {
-	private final long collectionCount;
-
-	private final long collectionTimeInMillis;
-
-	// ---------------------------------------------------------------------------------------------
+    private final long collectionCount;
 
-	private GarbageCollectorTotal(Builder builder) {
+    private final long collectionTimeInMillis;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.collectionCount = ApiTypeHelper.requireNonNull(builder.collectionCount, this, "collectionCount");
-		this.collectionTimeInMillis = ApiTypeHelper.requireNonNull(builder.collectionTimeInMillis, this,
-				"collectionTimeInMillis");
+    private GarbageCollectorTotal(Builder builder) {
 
-	}
+        this.collectionCount = ApiTypeHelper.requireNonNull(builder.collectionCount, this, "collectionCount");
+        this.collectionTimeInMillis = ApiTypeHelper.requireNonNull(builder.collectionTimeInMillis, this, "collectionTimeInMillis");
 
-	public static GarbageCollectorTotal of(Function<Builder, ObjectBuilder<GarbageCollectorTotal>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code collection_count}
-	 */
-	public final long collectionCount() {
-		return this.collectionCount;
-	}
+    public static GarbageCollectorTotal of(Function<Builder, ObjectBuilder<GarbageCollectorTotal>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code collection_time_in_millis}
-	 */
-	public final long collectionTimeInMillis() {
-		return this.collectionTimeInMillis;
-	}
+    /**
+     * Required - API name: {@code collection_count}
+     */
+    public final long collectionCount() {
+        return this.collectionCount;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code collection_time_in_millis}
+     */
+    public final long collectionTimeInMillis() {
+        return this.collectionTimeInMillis;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("collection_count");
-		generator.write(this.collectionCount);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("collection_time_in_millis");
-		generator.write(this.collectionTimeInMillis);
+        generator.writeKey("collection_count");
+        generator.write(this.collectionCount);
 
-	}
+        generator.writeKey("collection_time_in_millis");
+        generator.write(this.collectionTimeInMillis);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link GarbageCollectorTotal}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GarbageCollectorTotal> {
-		private Long collectionCount;
+    /**
+     * Builder for {@link GarbageCollectorTotal}.
+     */
 
-		private Long collectionTimeInMillis;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GarbageCollectorTotal> {
+        private Long collectionCount;
 
-		/**
-		 * Required - API name: {@code collection_count}
-		 */
-		public final Builder collectionCount(long value) {
-			this.collectionCount = value;
-			return this;
-		}
+        private Long collectionTimeInMillis;
 
-		/**
-		 * Required - API name: {@code collection_time_in_millis}
-		 */
-		public final Builder collectionTimeInMillis(long value) {
-			this.collectionTimeInMillis = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code collection_count}
+         */
+        public final Builder collectionCount(long value) {
+            this.collectionCount = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link GarbageCollectorTotal}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GarbageCollectorTotal build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code collection_time_in_millis}
+         */
+        public final Builder collectionTimeInMillis(long value) {
+            this.collectionTimeInMillis = value;
+            return this;
+        }
 
-			return new GarbageCollectorTotal(this);
-		}
-	}
+        /**
+         * Builds a {@link GarbageCollectorTotal}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GarbageCollectorTotal build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new GarbageCollectorTotal(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link GarbageCollectorTotal}
-	 */
-	public static final JsonpDeserializer<GarbageCollectorTotal> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GarbageCollectorTotal::setupGarbageCollectorTotalDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupGarbageCollectorTotalDeserializer(ObjectDeserializer<GarbageCollectorTotal.Builder> op) {
+    /**
+     * Json deserializer for {@link GarbageCollectorTotal}
+     */
+    public static final JsonpDeserializer<GarbageCollectorTotal> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GarbageCollectorTotal::setupGarbageCollectorTotalDeserializer
+    );
 
-		op.add(Builder::collectionCount, JsonpDeserializer.longDeserializer(), "collection_count");
-		op.add(Builder::collectionTimeInMillis, JsonpDeserializer.longDeserializer(), "collection_time_in_millis");
+    protected static void setupGarbageCollectorTotalDeserializer(ObjectDeserializer<GarbageCollectorTotal.Builder> op) {
 
-	}
+        op.add(Builder::collectionCount, JsonpDeserializer.longDeserializer(), "collection_count");
+        op.add(Builder::collectionTimeInMillis, JsonpDeserializer.longDeserializer(), "collection_time_in_millis");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/HotThreadsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/HotThreadsRequest.java
index 526e9ad307..60719afeaa 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/HotThreadsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/HotThreadsRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.ThreadType;
@@ -42,477 +48,469 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: nodes.hot_threads.Request
 
 /**
  * Returns information about hot threads on each node in the cluster.
- * 
+ *
  */
 
 public class HotThreadsRequest extends RequestBase {
-	@Nullable
-	private final Boolean ignoreIdleThreads;
-
-	@Nullable
-	private final Time interval;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final List<String> nodeId;
-
-	@Nullable
-	private final Long snapshots;
-
-	@Nullable
-	private final Long threads;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final ThreadType type;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HotThreadsRequest(Builder builder) {
-
-		this.ignoreIdleThreads = builder.ignoreIdleThreads;
-		this.interval = builder.interval;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
-		this.snapshots = builder.snapshots;
-		this.threads = builder.threads;
-		this.timeout = builder.timeout;
-		this.type = builder.type;
-
-	}
-
-	public static HotThreadsRequest of(Function<Builder, ObjectBuilder<HotThreadsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * If true, known idle threads (e.g. waiting in a socket select, or to get a
-	 * task from an empty queue) are filtered out.
-	 * <p>
-	 * API name: {@code ignore_idle_threads}
-	 */
-	@Nullable
-	public final Boolean ignoreIdleThreads() {
-		return this.ignoreIdleThreads;
-	}
-
-	/**
-	 * The interval to do the second sampling of threads.
-	 * <p>
-	 * API name: {@code interval}
-	 */
-	@Nullable
-	public final Time interval() {
-		return this.interval;
-	}
-
-	/**
-	 * Period to wait for a connection to the master node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Period to wait for a connection to the cluster-manager node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * List of node IDs or names used to limit returned information.
-	 * <p>
-	 * API name: {@code node_id}
-	 */
-	public final List<String> nodeId() {
-		return this.nodeId;
-	}
-
-	/**
-	 * Number of samples of thread stacktrace.
-	 * <p>
-	 * API name: {@code snapshots}
-	 */
-	@Nullable
-	public final Long snapshots() {
-		return this.snapshots;
-	}
-
-	/**
-	 * Specifies the number of hot threads to provide information for.
-	 * <p>
-	 * API name: {@code threads}
-	 */
-	@Nullable
-	public final Long threads() {
-		return this.threads;
-	}
-
-	/**
-	 * Period to wait for a response. If no response is received before the timeout
-	 * expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * The type to sample.
-	 * <p>
-	 * API name: {@code type}
-	 */
-	@Nullable
-	public final ThreadType type() {
-		return this.type;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HotThreadsRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HotThreadsRequest> {
-		@Nullable
-		private Boolean ignoreIdleThreads;
-
-		@Nullable
-		private Time interval;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private List<String> nodeId;
-
-		@Nullable
-		private Long snapshots;
-
-		@Nullable
-		private Long threads;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private ThreadType type;
-
-		/**
-		 * If true, known idle threads (e.g. waiting in a socket select, or to get a
-		 * task from an empty queue) are filtered out.
-		 * <p>
-		 * API name: {@code ignore_idle_threads}
-		 */
-		public final Builder ignoreIdleThreads(@Nullable Boolean value) {
-			this.ignoreIdleThreads = value;
-			return this;
-		}
-
-		/**
-		 * The interval to do the second sampling of threads.
-		 * <p>
-		 * API name: {@code interval}
-		 */
-		public final Builder interval(@Nullable Time value) {
-			this.interval = value;
-			return this;
-		}
-
-		/**
-		 * The interval to do the second sampling of threads.
-		 * <p>
-		 * API name: {@code interval}
-		 */
-		public final Builder interval(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.interval(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * List of node IDs or names used to limit returned information.
-		 * <p>
-		 * API name: {@code node_id}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>nodeId</code>.
-		 */
-		public final Builder nodeId(List<String> list) {
-			this.nodeId = _listAddAll(this.nodeId, list);
-			return this;
-		}
-
-		/**
-		 * List of node IDs or names used to limit returned information.
-		 * <p>
-		 * API name: {@code node_id}
-		 * <p>
-		 * Adds one or more values to <code>nodeId</code>.
-		 */
-		public final Builder nodeId(String value, String... values) {
-			this.nodeId = _listAdd(this.nodeId, value, values);
-			return this;
-		}
-
-		/**
-		 * Number of samples of thread stacktrace.
-		 * <p>
-		 * API name: {@code snapshots}
-		 */
-		public final Builder snapshots(@Nullable Long value) {
-			this.snapshots = value;
-			return this;
-		}
-
-		/**
-		 * Specifies the number of hot threads to provide information for.
-		 * <p>
-		 * API name: {@code threads}
-		 */
-		public final Builder threads(@Nullable Long value) {
-			this.threads = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a response. If no response is received before the timeout
-		 * expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a response. If no response is received before the timeout
-		 * expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * The type to sample.
-		 * <p>
-		 * API name: {@code type}
-		 */
-		public final Builder type(@Nullable ThreadType value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HotThreadsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HotThreadsRequest build() {
-			_checkSingleUse();
-
-			return new HotThreadsRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code nodes.hot_threads}".
-	 */
-	public static final Endpoint<HotThreadsRequest, HotThreadsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _nodeId = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.nodeId()))
-					propsSet |= _nodeId;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_nodes");
-					buf.append("/hot_threads");
-					return buf.toString();
-				}
-				if (propsSet == (_nodeId)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_nodes");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					buf.append("/hot_threads");
-					return buf.toString();
-				}
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cluster");
-					buf.append("/nodes");
-					buf.append("/hotthreads");
-					return buf.toString();
-				}
-				if (propsSet == (_nodeId)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cluster");
-					buf.append("/nodes");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					buf.append("/hotthreads");
-					return buf.toString();
-				}
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_nodes");
-					buf.append("/hotthreads");
-					return buf.toString();
-				}
-				if (propsSet == (_nodeId)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_nodes");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					buf.append("/hotthreads");
-					return buf.toString();
-				}
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cluster");
-					buf.append("/nodes");
-					buf.append("/hot_threads");
-					return buf.toString();
-				}
-				if (propsSet == (_nodeId)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_cluster");
-					buf.append("/nodes");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					buf.append("/hot_threads");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.snapshots != null) {
-					params.put("snapshots", String.valueOf(request.snapshots));
-				}
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.threads != null) {
-					params.put("threads", String.valueOf(request.threads));
-				}
-				if (request.interval != null) {
-					params.put("interval", request.interval._toJsonString());
-				}
-				if (request.type != null) {
-					params.put("type", request.type.jsonValue());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				if (request.ignoreIdleThreads != null) {
-					params.put("ignore_idle_threads", String.valueOf(request.ignoreIdleThreads));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, HotThreadsResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean ignoreIdleThreads;
+
+    @Nullable
+    private final Time interval;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final List<String> nodeId;
+
+    @Nullable
+    private final Long snapshots;
+
+    @Nullable
+    private final Long threads;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final ThreadType type;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HotThreadsRequest(Builder builder) {
+
+        this.ignoreIdleThreads = builder.ignoreIdleThreads;
+        this.interval = builder.interval;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
+        this.snapshots = builder.snapshots;
+        this.threads = builder.threads;
+        this.timeout = builder.timeout;
+        this.type = builder.type;
+
+    }
+
+    public static HotThreadsRequest of(Function<Builder, ObjectBuilder<HotThreadsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * If true, known idle threads (e.g. waiting in a socket select, or to get a
+     * task from an empty queue) are filtered out.
+     * <p>
+     * API name: {@code ignore_idle_threads}
+     */
+    @Nullable
+    public final Boolean ignoreIdleThreads() {
+        return this.ignoreIdleThreads;
+    }
+
+    /**
+     * The interval to do the second sampling of threads.
+     * <p>
+     * API name: {@code interval}
+     */
+    @Nullable
+    public final Time interval() {
+        return this.interval;
+    }
+
+    /**
+     * Period to wait for a connection to the master node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Period to wait for a connection to the cluster-manager node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * List of node IDs or names used to limit returned information.
+     * <p>
+     * API name: {@code node_id}
+     */
+    public final List<String> nodeId() {
+        return this.nodeId;
+    }
+
+    /**
+     * Number of samples of thread stacktrace.
+     * <p>
+     * API name: {@code snapshots}
+     */
+    @Nullable
+    public final Long snapshots() {
+        return this.snapshots;
+    }
+
+    /**
+     * Specifies the number of hot threads to provide information for.
+     * <p>
+     * API name: {@code threads}
+     */
+    @Nullable
+    public final Long threads() {
+        return this.threads;
+    }
+
+    /**
+     * Period to wait for a response. If no response is received before the timeout
+     * expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * The type to sample.
+     * <p>
+     * API name: {@code type}
+     */
+    @Nullable
+    public final ThreadType type() {
+        return this.type;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HotThreadsRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HotThreadsRequest> {
+        @Nullable
+        private Boolean ignoreIdleThreads;
+
+        @Nullable
+        private Time interval;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private List<String> nodeId;
+
+        @Nullable
+        private Long snapshots;
+
+        @Nullable
+        private Long threads;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private ThreadType type;
+
+        /**
+         * If true, known idle threads (e.g. waiting in a socket select, or to get a
+         * task from an empty queue) are filtered out.
+         * <p>
+         * API name: {@code ignore_idle_threads}
+         */
+        public final Builder ignoreIdleThreads(@Nullable Boolean value) {
+            this.ignoreIdleThreads = value;
+            return this;
+        }
+
+        /**
+         * The interval to do the second sampling of threads.
+         * <p>
+         * API name: {@code interval}
+         */
+        public final Builder interval(@Nullable Time value) {
+            this.interval = value;
+            return this;
+        }
+
+        /**
+         * The interval to do the second sampling of threads.
+         * <p>
+         * API name: {@code interval}
+         */
+        public final Builder interval(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.interval(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * List of node IDs or names used to limit returned information.
+         * <p>
+         * API name: {@code node_id}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>nodeId</code>.
+         */
+        public final Builder nodeId(List<String> list) {
+            this.nodeId = _listAddAll(this.nodeId, list);
+            return this;
+        }
+
+        /**
+         * List of node IDs or names used to limit returned information.
+         * <p>
+         * API name: {@code node_id}
+         * <p>
+         * Adds one or more values to <code>nodeId</code>.
+         */
+        public final Builder nodeId(String value, String... values) {
+            this.nodeId = _listAdd(this.nodeId, value, values);
+            return this;
+        }
+
+        /**
+         * Number of samples of thread stacktrace.
+         * <p>
+         * API name: {@code snapshots}
+         */
+        public final Builder snapshots(@Nullable Long value) {
+            this.snapshots = value;
+            return this;
+        }
+
+        /**
+         * Specifies the number of hot threads to provide information for.
+         * <p>
+         * API name: {@code threads}
+         */
+        public final Builder threads(@Nullable Long value) {
+            this.threads = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a response. If no response is received before the timeout
+         * expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a response. If no response is received before the timeout
+         * expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * The type to sample.
+         * <p>
+         * API name: {@code type}
+         */
+        public final Builder type(@Nullable ThreadType value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link HotThreadsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HotThreadsRequest build() {
+            _checkSingleUse();
+
+            return new HotThreadsRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code nodes.hot_threads}".
+     */
+    public static final Endpoint<HotThreadsRequest, HotThreadsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _nodeId = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.nodeId())) propsSet |= _nodeId;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_nodes");
+                buf.append("/hot_threads");
+                return buf.toString();
+            }
+            if (propsSet == (_nodeId)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_nodes");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/hot_threads");
+                return buf.toString();
+            }
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cluster");
+                buf.append("/nodes");
+                buf.append("/hotthreads");
+                return buf.toString();
+            }
+            if (propsSet == (_nodeId)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cluster");
+                buf.append("/nodes");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/hotthreads");
+                return buf.toString();
+            }
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_nodes");
+                buf.append("/hotthreads");
+                return buf.toString();
+            }
+            if (propsSet == (_nodeId)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_nodes");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/hotthreads");
+                return buf.toString();
+            }
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cluster");
+                buf.append("/nodes");
+                buf.append("/hot_threads");
+                return buf.toString();
+            }
+            if (propsSet == (_nodeId)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_cluster");
+                buf.append("/nodes");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/hot_threads");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.snapshots != null) {
+                params.put("snapshots", String.valueOf(request.snapshots));
+            }
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.threads != null) {
+                params.put("threads", String.valueOf(request.threads));
+            }
+            if (request.interval != null) {
+                params.put("interval", request.interval._toJsonString());
+            }
+            if (request.type != null) {
+                params.put("type", request.type.jsonValue());
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            if (request.ignoreIdleThreads != null) {
+                params.put("ignore_idle_threads", String.valueOf(request.ignoreIdleThreads));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        HotThreadsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/HotThreadsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/HotThreadsResponse.java
index 53cbd66d3f..6b888c8808 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/HotThreadsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/HotThreadsResponse.java
@@ -32,133 +32,134 @@
 
 package org.opensearch.client.opensearch.nodes;
 
-import org.opensearch.client.opensearch.nodes.hot_threads.HotThread;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.nodes.hot_threads.HotThread;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: nodes.hot_threads.Response
 
 @JsonpDeserializable
 public class HotThreadsResponse implements JsonpSerializable {
-	private final List<HotThread> hotThreads;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HotThreadsResponse(Builder builder) {
-
-		this.hotThreads = ApiTypeHelper.unmodifiableRequired(builder.hotThreads, this, "hotThreads");
-
-	}
-
-	public static HotThreadsResponse of(Function<Builder, ObjectBuilder<HotThreadsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code hot_threads}
-	 */
-	public final List<HotThread> hotThreads() {
-		return this.hotThreads;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.hotThreads)) {
-			generator.writeKey("hot_threads");
-			generator.writeStartArray();
-			for (HotThread item0 : this.hotThreads) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HotThreadsResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HotThreadsResponse> {
-		private List<HotThread> hotThreads;
-
-		/**
-		 * Required - API name: {@code hot_threads}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>hotThreads</code>.
-		 */
-		public final Builder hotThreads(List<HotThread> list) {
-			this.hotThreads = _listAddAll(this.hotThreads, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code hot_threads}
-		 * <p>
-		 * Adds one or more values to <code>hotThreads</code>.
-		 */
-		public final Builder hotThreads(HotThread value, HotThread... values) {
-			this.hotThreads = _listAdd(this.hotThreads, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code hot_threads}
-		 * <p>
-		 * Adds a value to <code>hotThreads</code> using a builder lambda.
-		 */
-		public final Builder hotThreads(Function<HotThread.Builder, ObjectBuilder<HotThread>> fn) {
-			return hotThreads(fn.apply(new HotThread.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link HotThreadsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HotThreadsResponse build() {
-			_checkSingleUse();
-
-			return new HotThreadsResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HotThreadsResponse}
-	 */
-	public static final JsonpDeserializer<HotThreadsResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, HotThreadsResponse::setupHotThreadsResponseDeserializer);
-
-	protected static void setupHotThreadsResponseDeserializer(ObjectDeserializer<HotThreadsResponse.Builder> op) {
-
-		op.add(Builder::hotThreads, JsonpDeserializer.arrayDeserializer(HotThread._DESERIALIZER), "hot_threads");
-
-	}
+    private final List<HotThread> hotThreads;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HotThreadsResponse(Builder builder) {
+
+        this.hotThreads = ApiTypeHelper.unmodifiableRequired(builder.hotThreads, this, "hotThreads");
+
+    }
+
+    public static HotThreadsResponse of(Function<Builder, ObjectBuilder<HotThreadsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code hot_threads}
+     */
+    public final List<HotThread> hotThreads() {
+        return this.hotThreads;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.hotThreads)) {
+            generator.writeKey("hot_threads");
+            generator.writeStartArray();
+            for (HotThread item0 : this.hotThreads) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HotThreadsResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HotThreadsResponse> {
+        private List<HotThread> hotThreads;
+
+        /**
+         * Required - API name: {@code hot_threads}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>hotThreads</code>.
+         */
+        public final Builder hotThreads(List<HotThread> list) {
+            this.hotThreads = _listAddAll(this.hotThreads, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code hot_threads}
+         * <p>
+         * Adds one or more values to <code>hotThreads</code>.
+         */
+        public final Builder hotThreads(HotThread value, HotThread... values) {
+            this.hotThreads = _listAdd(this.hotThreads, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code hot_threads}
+         * <p>
+         * Adds a value to <code>hotThreads</code> using a builder lambda.
+         */
+        public final Builder hotThreads(Function<HotThread.Builder, ObjectBuilder<HotThread>> fn) {
+            return hotThreads(fn.apply(new HotThread.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link HotThreadsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HotThreadsResponse build() {
+            _checkSingleUse();
+
+            return new HotThreadsResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HotThreadsResponse}
+     */
+    public static final JsonpDeserializer<HotThreadsResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HotThreadsResponse::setupHotThreadsResponseDeserializer
+    );
+
+    protected static void setupHotThreadsResponseDeserializer(ObjectDeserializer<HotThreadsResponse.Builder> op) {
+
+        op.add(Builder::hotThreads, JsonpDeserializer.arrayDeserializer(HotThread._DESERIALIZER), "hot_threads");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Http.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Http.java
index a6eaaf75b3..de19c4249b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Http.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Http.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,117 +43,113 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes._types.Http
 
-
 @JsonpDeserializable
 public class Http implements JsonpSerializable {
-	private final int currentOpen;
+    private final int currentOpen;
 
-	private final long totalOpened;
+    private final long totalOpened;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private Http(Builder builder) {
+    private Http(Builder builder) {
 
-		this.currentOpen = ApiTypeHelper.requireNonNull(builder.currentOpen, this, "currentOpen");
-		this.totalOpened = ApiTypeHelper.requireNonNull(builder.totalOpened, this, "totalOpened");
+        this.currentOpen = ApiTypeHelper.requireNonNull(builder.currentOpen, this, "currentOpen");
+        this.totalOpened = ApiTypeHelper.requireNonNull(builder.totalOpened, this, "totalOpened");
 
-	}
+    }
 
-	public static Http of(Function<Builder, ObjectBuilder<Http>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static Http of(Function<Builder, ObjectBuilder<Http>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code current_open}
-	 */
-	public final int currentOpen() {
-		return this.currentOpen;
-	}
+    /**
+     * Required - API name: {@code current_open}
+     */
+    public final int currentOpen() {
+        return this.currentOpen;
+    }
 
-	/**
-	 * Required - API name: {@code total_opened}
-	 */
-	public final long totalOpened() {
-		return this.totalOpened;
-	}
+    /**
+     * Required - API name: {@code total_opened}
+     */
+    public final long totalOpened() {
+        return this.totalOpened;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("current_open");
-		generator.write(this.currentOpen);
+        generator.writeKey("current_open");
+        generator.write(this.currentOpen);
 
-		generator.writeKey("total_opened");
-		generator.write(this.totalOpened);
+        generator.writeKey("total_opened");
+        generator.write(this.totalOpened);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link Http}.
-	 */
+    /**
+     * Builder for {@link Http}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Http> {
-		private Integer currentOpen;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Http> {
+        private Integer currentOpen;
 
-		private Long totalOpened;
+        private Long totalOpened;
 
-		/**
-		 * Required - API name: {@code current_open}
-		 */
-		public final Builder currentOpen(int value) {
-			this.currentOpen = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code current_open}
+         */
+        public final Builder currentOpen(int value) {
+            this.currentOpen = value;
+            return this;
+        }
 
-		/**
-		 * Required - API name: {@code total_opened}
-		 */
-		public final Builder totalOpened(long value) {
-			this.totalOpened = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code total_opened}
+         */
+        public final Builder totalOpened(long value) {
+            this.totalOpened = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link Http}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Http build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link Http}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Http build() {
+            _checkSingleUse();
 
-			return new Http(this);
-		}
-	}
+            return new Http(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link Http}
-	 */
-	public static final JsonpDeserializer<Http> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Http::setupHttpDeserializer);
+    /**
+     * Json deserializer for {@link Http}
+     */
+    public static final JsonpDeserializer<Http> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new, Http::setupHttpDeserializer);
 
-	protected static void setupHttpDeserializer(ObjectDeserializer<Http.Builder> op) {
+    protected static void setupHttpDeserializer(ObjectDeserializer<Http.Builder> op) {
 
-		op.add(Builder::currentOpen, JsonpDeserializer.integerDeserializer(), "current_open");
-		op.add(Builder::totalOpened, JsonpDeserializer.longDeserializer(), "total_opened");
+        op.add(Builder::currentOpen, JsonpDeserializer.integerDeserializer(), "current_open");
+        op.add(Builder::totalOpened, JsonpDeserializer.longDeserializer(), "total_opened");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Ingest.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Ingest.java
index 5fb092c5c2..d5b18efe07 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Ingest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Ingest.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,154 +44,152 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: nodes._types.Ingest
 
-
 @JsonpDeserializable
 public class Ingest implements JsonpSerializable {
-	private final Map<String, IngestTotal> pipelines;
-
-	private final IngestTotal total;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Ingest(Builder builder) {
-
-		this.pipelines = ApiTypeHelper.unmodifiableRequired(builder.pipelines, this, "pipelines");
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
-
-	}
-
-	public static Ingest of(Function<Builder, ObjectBuilder<Ingest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code pipelines}
-	 */
-	public final Map<String, IngestTotal> pipelines() {
-		return this.pipelines;
-	}
-
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final IngestTotal total() {
-		return this.total;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.pipelines)) {
-			generator.writeKey("pipelines");
-			generator.writeStartObject();
-			for (Map.Entry<String, IngestTotal> item0 : this.pipelines.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("total");
-		this.total.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Ingest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Ingest> {
-		private Map<String, IngestTotal> pipelines;
-
-		private IngestTotal total;
-
-		/**
-		 * Required - API name: {@code pipelines}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>pipelines</code>.
-		 */
-		public final Builder pipelines(Map<String, IngestTotal> map) {
-			this.pipelines = _mapPutAll(this.pipelines, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code pipelines}
-		 * <p>
-		 * Adds an entry to <code>pipelines</code>.
-		 */
-		public final Builder pipelines(String key, IngestTotal value) {
-			this.pipelines = _mapPut(this.pipelines, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code pipelines}
-		 * <p>
-		 * Adds an entry to <code>pipelines</code> using a builder lambda.
-		 */
-		public final Builder pipelines(String key, Function<IngestTotal.Builder, ObjectBuilder<IngestTotal>> fn) {
-			return pipelines(key, fn.apply(new IngestTotal.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(IngestTotal value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(Function<IngestTotal.Builder, ObjectBuilder<IngestTotal>> fn) {
-			return this.total(fn.apply(new IngestTotal.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link Ingest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Ingest build() {
-			_checkSingleUse();
-
-			return new Ingest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Ingest}
-	 */
-	public static final JsonpDeserializer<Ingest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Ingest::setupIngestDeserializer);
-
-	protected static void setupIngestDeserializer(ObjectDeserializer<Ingest.Builder> op) {
-
-		op.add(Builder::pipelines, JsonpDeserializer.stringMapDeserializer(IngestTotal._DESERIALIZER), "pipelines");
-		op.add(Builder::total, IngestTotal._DESERIALIZER, "total");
-
-	}
+    private final Map<String, IngestTotal> pipelines;
+
+    private final IngestTotal total;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Ingest(Builder builder) {
+
+        this.pipelines = ApiTypeHelper.unmodifiableRequired(builder.pipelines, this, "pipelines");
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+
+    }
+
+    public static Ingest of(Function<Builder, ObjectBuilder<Ingest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code pipelines}
+     */
+    public final Map<String, IngestTotal> pipelines() {
+        return this.pipelines;
+    }
+
+    /**
+     * Required - API name: {@code total}
+     */
+    public final IngestTotal total() {
+        return this.total;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.pipelines)) {
+            generator.writeKey("pipelines");
+            generator.writeStartObject();
+            for (Map.Entry<String, IngestTotal> item0 : this.pipelines.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("total");
+        this.total.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Ingest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Ingest> {
+        private Map<String, IngestTotal> pipelines;
+
+        private IngestTotal total;
+
+        /**
+         * Required - API name: {@code pipelines}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>pipelines</code>.
+         */
+        public final Builder pipelines(Map<String, IngestTotal> map) {
+            this.pipelines = _mapPutAll(this.pipelines, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code pipelines}
+         * <p>
+         * Adds an entry to <code>pipelines</code>.
+         */
+        public final Builder pipelines(String key, IngestTotal value) {
+            this.pipelines = _mapPut(this.pipelines, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code pipelines}
+         * <p>
+         * Adds an entry to <code>pipelines</code> using a builder lambda.
+         */
+        public final Builder pipelines(String key, Function<IngestTotal.Builder, ObjectBuilder<IngestTotal>> fn) {
+            return pipelines(key, fn.apply(new IngestTotal.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(IngestTotal value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(Function<IngestTotal.Builder, ObjectBuilder<IngestTotal>> fn) {
+            return this.total(fn.apply(new IngestTotal.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link Ingest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Ingest build() {
+            _checkSingleUse();
+
+            return new Ingest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Ingest}
+     */
+    public static final JsonpDeserializer<Ingest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Ingest::setupIngestDeserializer
+    );
+
+    protected static void setupIngestDeserializer(ObjectDeserializer<Ingest.Builder> op) {
+
+        op.add(Builder::pipelines, JsonpDeserializer.stringMapDeserializer(IngestTotal._DESERIALIZER), "pipelines");
+        op.add(Builder::total, IngestTotal._DESERIALIZER, "total");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/IngestTotal.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/IngestTotal.java
index e4ca4e0b87..b82f828722 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/IngestTotal.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/IngestTotal.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,165 +43,164 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: nodes._types.IngestTotal
 
 @JsonpDeserializable
 public class IngestTotal implements JsonpSerializable {
-	private final long count;
+    private final long count;
 
-	private final long current;
+    private final long current;
 
-	private final long failed;
+    private final long failed;
 
-	private final long timeInMillis;
+    private final long timeInMillis;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private IngestTotal(Builder builder) {
+    private IngestTotal(Builder builder) {
 
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.current = ApiTypeHelper.requireNonNull(builder.current, this, "current");
-		this.failed = ApiTypeHelper.requireNonNull(builder.failed, this, "failed");
-		this.timeInMillis = ApiTypeHelper.requireNonNull(builder.timeInMillis, this, "timeInMillis");
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.current = ApiTypeHelper.requireNonNull(builder.current, this, "current");
+        this.failed = ApiTypeHelper.requireNonNull(builder.failed, this, "failed");
+        this.timeInMillis = ApiTypeHelper.requireNonNull(builder.timeInMillis, this, "timeInMillis");
 
-	}
+    }
 
-	public static IngestTotal of(Function<Builder, ObjectBuilder<IngestTotal>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static IngestTotal of(Function<Builder, ObjectBuilder<IngestTotal>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code count}
-	 */
-	public final long count() {
-		return this.count;
-	}
-
-	/**
-	 * Required - API name: {@code current}
-	 */
-	public final long current() {
-		return this.current;
-	}
-
-	/**
-	 * Required - API name: {@code failed}
-	 */
-	public final long failed() {
-		return this.failed;
-	}
-
-	/**
-	 * Required - API name: {@code time_in_millis}
-	 */
-	public final long timeInMillis() {
-		return this.timeInMillis;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("count");
-		generator.write(this.count);
-
-		generator.writeKey("current");
-		generator.write(this.current);
-
-		generator.writeKey("failed");
-		generator.write(this.failed);
-
-		generator.writeKey("time_in_millis");
-		generator.write(this.timeInMillis);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IngestTotal}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IngestTotal> {
-		private Long count;
-
-		private Long current;
-
-		private Long failed;
-
-		private Long timeInMillis;
-
-		/**
-		 * Required - API name: {@code count}
-		 */
-		public final Builder count(long value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code current}
-		 */
-		public final Builder current(long value) {
-			this.current = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code failed}
-		 */
-		public final Builder failed(long value) {
-			this.failed = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code time_in_millis}
-		 */
-		public final Builder timeInMillis(long value) {
-			this.timeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IngestTotal}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IngestTotal build() {
-			_checkSingleUse();
-
-			return new IngestTotal(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IngestTotal}
-	 */
-	public static final JsonpDeserializer<IngestTotal> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IngestTotal::setupIngestTotalDeserializer);
-
-	protected static void setupIngestTotalDeserializer(ObjectDeserializer<IngestTotal.Builder> op) {
-
-		op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
-		op.add(Builder::current, JsonpDeserializer.longDeserializer(), "current");
-		op.add(Builder::failed, JsonpDeserializer.longDeserializer(), "failed");
-		op.add(Builder::timeInMillis, JsonpDeserializer.longDeserializer(), "time_in_millis");
-
-	}
+    /**
+     * Required - API name: {@code count}
+     */
+    public final long count() {
+        return this.count;
+    }
+
+    /**
+     * Required - API name: {@code current}
+     */
+    public final long current() {
+        return this.current;
+    }
+
+    /**
+     * Required - API name: {@code failed}
+     */
+    public final long failed() {
+        return this.failed;
+    }
+
+    /**
+     * Required - API name: {@code time_in_millis}
+     */
+    public final long timeInMillis() {
+        return this.timeInMillis;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("count");
+        generator.write(this.count);
+
+        generator.writeKey("current");
+        generator.write(this.current);
+
+        generator.writeKey("failed");
+        generator.write(this.failed);
+
+        generator.writeKey("time_in_millis");
+        generator.write(this.timeInMillis);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IngestTotal}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IngestTotal> {
+        private Long count;
+
+        private Long current;
+
+        private Long failed;
+
+        private Long timeInMillis;
+
+        /**
+         * Required - API name: {@code count}
+         */
+        public final Builder count(long value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code current}
+         */
+        public final Builder current(long value) {
+            this.current = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code failed}
+         */
+        public final Builder failed(long value) {
+            this.failed = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code time_in_millis}
+         */
+        public final Builder timeInMillis(long value) {
+            this.timeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link IngestTotal}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IngestTotal build() {
+            _checkSingleUse();
+
+            return new IngestTotal(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IngestTotal}
+     */
+    public static final JsonpDeserializer<IngestTotal> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IngestTotal::setupIngestTotalDeserializer
+    );
+
+    protected static void setupIngestTotalDeserializer(ObjectDeserializer<IngestTotal.Builder> op) {
+
+        op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
+        op.add(Builder::current, JsonpDeserializer.longDeserializer(), "current");
+        op.add(Builder::failed, JsonpDeserializer.longDeserializer(), "failed");
+        op.add(Builder::timeInMillis, JsonpDeserializer.longDeserializer(), "time_in_millis");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Jvm.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Jvm.java
index 1ae50d65fb..ec1d18b2cb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Jvm.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Jvm.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,297 +44,290 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: nodes._types.Jvm
 
-
 @JsonpDeserializable
 public class Jvm implements JsonpSerializable {
-	private final Map<String, NodeBufferPool> bufferPools;
-
-	private final JvmClasses classes;
-
-	private final GarbageCollector gc;
-
-	private final MemoryStats mem;
-
-	private final JvmThreads threads;
-
-	private final long timestamp;
-
-	private final long uptimeInMillis;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Jvm(Builder builder) {
-
-		this.bufferPools = ApiTypeHelper.unmodifiableRequired(builder.bufferPools, this, "bufferPools");
-		this.classes = ApiTypeHelper.requireNonNull(builder.classes, this, "classes");
-		this.gc = ApiTypeHelper.requireNonNull(builder.gc, this, "gc");
-		this.mem = ApiTypeHelper.requireNonNull(builder.mem, this, "mem");
-		this.threads = ApiTypeHelper.requireNonNull(builder.threads, this, "threads");
-		this.timestamp = ApiTypeHelper.requireNonNull(builder.timestamp, this, "timestamp");
-		this.uptimeInMillis = ApiTypeHelper.requireNonNull(builder.uptimeInMillis, this, "uptimeInMillis");
+    private final Map<String, NodeBufferPool> bufferPools;
+
+    private final JvmClasses classes;
+
+    private final GarbageCollector gc;
+
+    private final MemoryStats mem;
+
+    private final JvmThreads threads;
+
+    private final long timestamp;
+
+    private final long uptimeInMillis;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Jvm(Builder builder) {
+
+        this.bufferPools = ApiTypeHelper.unmodifiableRequired(builder.bufferPools, this, "bufferPools");
+        this.classes = ApiTypeHelper.requireNonNull(builder.classes, this, "classes");
+        this.gc = ApiTypeHelper.requireNonNull(builder.gc, this, "gc");
+        this.mem = ApiTypeHelper.requireNonNull(builder.mem, this, "mem");
+        this.threads = ApiTypeHelper.requireNonNull(builder.threads, this, "threads");
+        this.timestamp = ApiTypeHelper.requireNonNull(builder.timestamp, this, "timestamp");
+        this.uptimeInMillis = ApiTypeHelper.requireNonNull(builder.uptimeInMillis, this, "uptimeInMillis");
 
-	}
-
-	public static Jvm of(Function<Builder, ObjectBuilder<Jvm>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
+
+    public static Jvm of(Function<Builder, ObjectBuilder<Jvm>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code buffer_pools}
-	 */
-	public final Map<String, NodeBufferPool> bufferPools() {
-		return this.bufferPools;
-	}
+    /**
+     * Required - API name: {@code buffer_pools}
+     */
+    public final Map<String, NodeBufferPool> bufferPools() {
+        return this.bufferPools;
+    }
 
-	/**
-	 * Required - API name: {@code classes}
-	 */
-	public final JvmClasses classes() {
-		return this.classes;
-	}
+    /**
+     * Required - API name: {@code classes}
+     */
+    public final JvmClasses classes() {
+        return this.classes;
+    }
 
-	/**
-	 * Required - API name: {@code gc}
-	 */
-	public final GarbageCollector gc() {
-		return this.gc;
-	}
+    /**
+     * Required - API name: {@code gc}
+     */
+    public final GarbageCollector gc() {
+        return this.gc;
+    }
 
-	/**
-	 * Required - API name: {@code mem}
-	 */
-	public final MemoryStats mem() {
-		return this.mem;
-	}
+    /**
+     * Required - API name: {@code mem}
+     */
+    public final MemoryStats mem() {
+        return this.mem;
+    }
 
-	/**
-	 * Required - API name: {@code threads}
-	 */
-	public final JvmThreads threads() {
-		return this.threads;
-	}
+    /**
+     * Required - API name: {@code threads}
+     */
+    public final JvmThreads threads() {
+        return this.threads;
+    }
 
-	/**
-	 * Required - API name: {@code timestamp}
-	 */
-	public final long timestamp() {
-		return this.timestamp;
-	}
-
-	/**
-	 * Required - API name: {@code uptime_in_millis}
-	 */
-	public final long uptimeInMillis() {
-		return this.uptimeInMillis;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.bufferPools)) {
-			generator.writeKey("buffer_pools");
-			generator.writeStartObject();
-			for (Map.Entry<String, NodeBufferPool> item0 : this.bufferPools.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("classes");
-		this.classes.serialize(generator, mapper);
-
-		generator.writeKey("gc");
-		this.gc.serialize(generator, mapper);
-
-		generator.writeKey("mem");
-		this.mem.serialize(generator, mapper);
-
-		generator.writeKey("threads");
-		this.threads.serialize(generator, mapper);
-
-		generator.writeKey("timestamp");
-		generator.write(this.timestamp);
-
-		generator.writeKey("uptime_in_millis");
-		generator.write(this.uptimeInMillis);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Jvm}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Jvm> {
-		private Map<String, NodeBufferPool> bufferPools;
-
-		private JvmClasses classes;
-
-		private GarbageCollector gc;
-
-		private MemoryStats mem;
-
-		private JvmThreads threads;
-
-		private Long timestamp;
-
-		private Long uptimeInMillis;
-
-		/**
-		 * Required - API name: {@code buffer_pools}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>bufferPools</code>.
-		 */
-		public final Builder bufferPools(Map<String, NodeBufferPool> map) {
-			this.bufferPools = _mapPutAll(this.bufferPools, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code buffer_pools}
-		 * <p>
-		 * Adds an entry to <code>bufferPools</code>.
-		 */
-		public final Builder bufferPools(String key, NodeBufferPool value) {
-			this.bufferPools = _mapPut(this.bufferPools, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code buffer_pools}
-		 * <p>
-		 * Adds an entry to <code>bufferPools</code> using a builder lambda.
-		 */
-		public final Builder bufferPools(String key,
-				Function<NodeBufferPool.Builder, ObjectBuilder<NodeBufferPool>> fn) {
-			return bufferPools(key, fn.apply(new NodeBufferPool.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code classes}
-		 */
-		public final Builder classes(JvmClasses value) {
-			this.classes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code classes}
-		 */
-		public final Builder classes(Function<JvmClasses.Builder, ObjectBuilder<JvmClasses>> fn) {
-			return this.classes(fn.apply(new JvmClasses.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code gc}
-		 */
-		public final Builder gc(GarbageCollector value) {
-			this.gc = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code gc}
-		 */
-		public final Builder gc(Function<GarbageCollector.Builder, ObjectBuilder<GarbageCollector>> fn) {
-			return this.gc(fn.apply(new GarbageCollector.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code mem}
-		 */
-		public final Builder mem(MemoryStats value) {
-			this.mem = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mem}
-		 */
-		public final Builder mem(Function<MemoryStats.Builder, ObjectBuilder<MemoryStats>> fn) {
-			return this.mem(fn.apply(new MemoryStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code threads}
-		 */
-		public final Builder threads(JvmThreads value) {
-			this.threads = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code threads}
-		 */
-		public final Builder threads(Function<JvmThreads.Builder, ObjectBuilder<JvmThreads>> fn) {
-			return this.threads(fn.apply(new JvmThreads.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code timestamp}
-		 */
-		public final Builder timestamp(long value) {
-			this.timestamp = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code uptime_in_millis}
-		 */
-		public final Builder uptimeInMillis(long value) {
-			this.uptimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Jvm}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Jvm build() {
-			_checkSingleUse();
-
-			return new Jvm(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Jvm}
-	 */
-	public static final JsonpDeserializer<Jvm> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Jvm::setupJvmDeserializer);
-
-	protected static void setupJvmDeserializer(ObjectDeserializer<Jvm.Builder> op) {
-
-		op.add(Builder::bufferPools, JsonpDeserializer.stringMapDeserializer(NodeBufferPool._DESERIALIZER),
-				"buffer_pools");
-		op.add(Builder::classes, JvmClasses._DESERIALIZER, "classes");
-		op.add(Builder::gc, GarbageCollector._DESERIALIZER, "gc");
-		op.add(Builder::mem, MemoryStats._DESERIALIZER, "mem");
-		op.add(Builder::threads, JvmThreads._DESERIALIZER, "threads");
-		op.add(Builder::timestamp, JsonpDeserializer.longDeserializer(), "timestamp");
-		op.add(Builder::uptimeInMillis, JsonpDeserializer.longDeserializer(), "uptime_in_millis");
-
-	}
+    /**
+     * Required - API name: {@code timestamp}
+     */
+    public final long timestamp() {
+        return this.timestamp;
+    }
+
+    /**
+     * Required - API name: {@code uptime_in_millis}
+     */
+    public final long uptimeInMillis() {
+        return this.uptimeInMillis;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.bufferPools)) {
+            generator.writeKey("buffer_pools");
+            generator.writeStartObject();
+            for (Map.Entry<String, NodeBufferPool> item0 : this.bufferPools.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("classes");
+        this.classes.serialize(generator, mapper);
+
+        generator.writeKey("gc");
+        this.gc.serialize(generator, mapper);
+
+        generator.writeKey("mem");
+        this.mem.serialize(generator, mapper);
+
+        generator.writeKey("threads");
+        this.threads.serialize(generator, mapper);
+
+        generator.writeKey("timestamp");
+        generator.write(this.timestamp);
+
+        generator.writeKey("uptime_in_millis");
+        generator.write(this.uptimeInMillis);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Jvm}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Jvm> {
+        private Map<String, NodeBufferPool> bufferPools;
+
+        private JvmClasses classes;
+
+        private GarbageCollector gc;
+
+        private MemoryStats mem;
+
+        private JvmThreads threads;
+
+        private Long timestamp;
+
+        private Long uptimeInMillis;
+
+        /**
+         * Required - API name: {@code buffer_pools}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>bufferPools</code>.
+         */
+        public final Builder bufferPools(Map<String, NodeBufferPool> map) {
+            this.bufferPools = _mapPutAll(this.bufferPools, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code buffer_pools}
+         * <p>
+         * Adds an entry to <code>bufferPools</code>.
+         */
+        public final Builder bufferPools(String key, NodeBufferPool value) {
+            this.bufferPools = _mapPut(this.bufferPools, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code buffer_pools}
+         * <p>
+         * Adds an entry to <code>bufferPools</code> using a builder lambda.
+         */
+        public final Builder bufferPools(String key, Function<NodeBufferPool.Builder, ObjectBuilder<NodeBufferPool>> fn) {
+            return bufferPools(key, fn.apply(new NodeBufferPool.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code classes}
+         */
+        public final Builder classes(JvmClasses value) {
+            this.classes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code classes}
+         */
+        public final Builder classes(Function<JvmClasses.Builder, ObjectBuilder<JvmClasses>> fn) {
+            return this.classes(fn.apply(new JvmClasses.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code gc}
+         */
+        public final Builder gc(GarbageCollector value) {
+            this.gc = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code gc}
+         */
+        public final Builder gc(Function<GarbageCollector.Builder, ObjectBuilder<GarbageCollector>> fn) {
+            return this.gc(fn.apply(new GarbageCollector.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code mem}
+         */
+        public final Builder mem(MemoryStats value) {
+            this.mem = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mem}
+         */
+        public final Builder mem(Function<MemoryStats.Builder, ObjectBuilder<MemoryStats>> fn) {
+            return this.mem(fn.apply(new MemoryStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code threads}
+         */
+        public final Builder threads(JvmThreads value) {
+            this.threads = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code threads}
+         */
+        public final Builder threads(Function<JvmThreads.Builder, ObjectBuilder<JvmThreads>> fn) {
+            return this.threads(fn.apply(new JvmThreads.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code timestamp}
+         */
+        public final Builder timestamp(long value) {
+            this.timestamp = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code uptime_in_millis}
+         */
+        public final Builder uptimeInMillis(long value) {
+            this.uptimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Jvm}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Jvm build() {
+            _checkSingleUse();
+
+            return new Jvm(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Jvm}
+     */
+    public static final JsonpDeserializer<Jvm> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new, Jvm::setupJvmDeserializer);
+
+    protected static void setupJvmDeserializer(ObjectDeserializer<Jvm.Builder> op) {
+
+        op.add(Builder::bufferPools, JsonpDeserializer.stringMapDeserializer(NodeBufferPool._DESERIALIZER), "buffer_pools");
+        op.add(Builder::classes, JvmClasses._DESERIALIZER, "classes");
+        op.add(Builder::gc, GarbageCollector._DESERIALIZER, "gc");
+        op.add(Builder::mem, MemoryStats._DESERIALIZER, "mem");
+        op.add(Builder::threads, JvmThreads._DESERIALIZER, "threads");
+        op.add(Builder::timestamp, JsonpDeserializer.longDeserializer(), "timestamp");
+        op.add(Builder::uptimeInMillis, JsonpDeserializer.longDeserializer(), "uptime_in_millis");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/JvmClasses.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/JvmClasses.java
index 9dada9dc30..df7f53639a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/JvmClasses.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/JvmClasses.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,140 +43,140 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes._types.JvmClasses
 
 @JsonpDeserializable
 public class JvmClasses implements JsonpSerializable {
-	private final long currentLoadedCount;
-
-	private final long totalLoadedCount;
-
-	private final long totalUnloadedCount;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private JvmClasses(Builder builder) {
-
-		this.currentLoadedCount = ApiTypeHelper.requireNonNull(builder.currentLoadedCount, this, "currentLoadedCount");
-		this.totalLoadedCount = ApiTypeHelper.requireNonNull(builder.totalLoadedCount, this, "totalLoadedCount");
-		this.totalUnloadedCount = ApiTypeHelper.requireNonNull(builder.totalUnloadedCount, this, "totalUnloadedCount");
-
-	}
-
-	public static JvmClasses of(Function<Builder, ObjectBuilder<JvmClasses>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code current_loaded_count}
-	 */
-	public final long currentLoadedCount() {
-		return this.currentLoadedCount;
-	}
+    private final long currentLoadedCount;
 
-	/**
-	 * Required - API name: {@code total_loaded_count}
-	 */
-	public final long totalLoadedCount() {
-		return this.totalLoadedCount;
-	}
-
-	/**
-	 * Required - API name: {@code total_unloaded_count}
-	 */
-	public final long totalUnloadedCount() {
-		return this.totalUnloadedCount;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("current_loaded_count");
-		generator.write(this.currentLoadedCount);
-
-		generator.writeKey("total_loaded_count");
-		generator.write(this.totalLoadedCount);
-
-		generator.writeKey("total_unloaded_count");
-		generator.write(this.totalUnloadedCount);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link JvmClasses}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<JvmClasses> {
-		private Long currentLoadedCount;
-
-		private Long totalLoadedCount;
-
-		private Long totalUnloadedCount;
-
-		/**
-		 * Required - API name: {@code current_loaded_count}
-		 */
-		public final Builder currentLoadedCount(long value) {
-			this.currentLoadedCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_loaded_count}
-		 */
-		public final Builder totalLoadedCount(long value) {
-			this.totalLoadedCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_unloaded_count}
-		 */
-		public final Builder totalUnloadedCount(long value) {
-			this.totalUnloadedCount = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link JvmClasses}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public JvmClasses build() {
-			_checkSingleUse();
-
-			return new JvmClasses(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link JvmClasses}
-	 */
-	public static final JsonpDeserializer<JvmClasses> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			JvmClasses::setupJvmClassesDeserializer);
-
-	protected static void setupJvmClassesDeserializer(ObjectDeserializer<JvmClasses.Builder> op) {
-
-		op.add(Builder::currentLoadedCount, JsonpDeserializer.longDeserializer(), "current_loaded_count");
-		op.add(Builder::totalLoadedCount, JsonpDeserializer.longDeserializer(), "total_loaded_count");
-		op.add(Builder::totalUnloadedCount, JsonpDeserializer.longDeserializer(), "total_unloaded_count");
-
-	}
+    private final long totalLoadedCount;
+
+    private final long totalUnloadedCount;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private JvmClasses(Builder builder) {
+
+        this.currentLoadedCount = ApiTypeHelper.requireNonNull(builder.currentLoadedCount, this, "currentLoadedCount");
+        this.totalLoadedCount = ApiTypeHelper.requireNonNull(builder.totalLoadedCount, this, "totalLoadedCount");
+        this.totalUnloadedCount = ApiTypeHelper.requireNonNull(builder.totalUnloadedCount, this, "totalUnloadedCount");
+
+    }
+
+    public static JvmClasses of(Function<Builder, ObjectBuilder<JvmClasses>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code current_loaded_count}
+     */
+    public final long currentLoadedCount() {
+        return this.currentLoadedCount;
+    }
+
+    /**
+     * Required - API name: {@code total_loaded_count}
+     */
+    public final long totalLoadedCount() {
+        return this.totalLoadedCount;
+    }
+
+    /**
+     * Required - API name: {@code total_unloaded_count}
+     */
+    public final long totalUnloadedCount() {
+        return this.totalUnloadedCount;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("current_loaded_count");
+        generator.write(this.currentLoadedCount);
+
+        generator.writeKey("total_loaded_count");
+        generator.write(this.totalLoadedCount);
+
+        generator.writeKey("total_unloaded_count");
+        generator.write(this.totalUnloadedCount);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link JvmClasses}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<JvmClasses> {
+        private Long currentLoadedCount;
+
+        private Long totalLoadedCount;
+
+        private Long totalUnloadedCount;
+
+        /**
+         * Required - API name: {@code current_loaded_count}
+         */
+        public final Builder currentLoadedCount(long value) {
+            this.currentLoadedCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_loaded_count}
+         */
+        public final Builder totalLoadedCount(long value) {
+            this.totalLoadedCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_unloaded_count}
+         */
+        public final Builder totalUnloadedCount(long value) {
+            this.totalUnloadedCount = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link JvmClasses}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public JvmClasses build() {
+            _checkSingleUse();
+
+            return new JvmClasses(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link JvmClasses}
+     */
+    public static final JsonpDeserializer<JvmClasses> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        JvmClasses::setupJvmClassesDeserializer
+    );
+
+    protected static void setupJvmClassesDeserializer(ObjectDeserializer<JvmClasses.Builder> op) {
+
+        op.add(Builder::currentLoadedCount, JsonpDeserializer.longDeserializer(), "current_loaded_count");
+        op.add(Builder::totalLoadedCount, JsonpDeserializer.longDeserializer(), "total_loaded_count");
+        op.add(Builder::totalUnloadedCount, JsonpDeserializer.longDeserializer(), "total_unloaded_count");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/JvmThreads.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/JvmThreads.java
index 9247d9ca89..3ee898cae3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/JvmThreads.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/JvmThreads.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,117 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes._types.JvmThreads
 
-
 @JsonpDeserializable
 public class JvmThreads implements JsonpSerializable {
-	private final long count;
-
-	private final long peakCount;
-
-	// ---------------------------------------------------------------------------------------------
+    private final long count;
 
-	private JvmThreads(Builder builder) {
+    private final long peakCount;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.peakCount = ApiTypeHelper.requireNonNull(builder.peakCount, this, "peakCount");
+    private JvmThreads(Builder builder) {
 
-	}
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.peakCount = ApiTypeHelper.requireNonNull(builder.peakCount, this, "peakCount");
 
-	public static JvmThreads of(Function<Builder, ObjectBuilder<JvmThreads>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code count}
-	 */
-	public final long count() {
-		return this.count;
-	}
+    public static JvmThreads of(Function<Builder, ObjectBuilder<JvmThreads>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code peak_count}
-	 */
-	public final long peakCount() {
-		return this.peakCount;
-	}
+    /**
+     * Required - API name: {@code count}
+     */
+    public final long count() {
+        return this.count;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code peak_count}
+     */
+    public final long peakCount() {
+        return this.peakCount;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("count");
-		generator.write(this.count);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("peak_count");
-		generator.write(this.peakCount);
+        generator.writeKey("count");
+        generator.write(this.count);
 
-	}
+        generator.writeKey("peak_count");
+        generator.write(this.peakCount);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link JvmThreads}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<JvmThreads> {
-		private Long count;
+    /**
+     * Builder for {@link JvmThreads}.
+     */
 
-		private Long peakCount;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<JvmThreads> {
+        private Long count;
 
-		/**
-		 * Required - API name: {@code count}
-		 */
-		public final Builder count(long value) {
-			this.count = value;
-			return this;
-		}
+        private Long peakCount;
 
-		/**
-		 * Required - API name: {@code peak_count}
-		 */
-		public final Builder peakCount(long value) {
-			this.peakCount = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code count}
+         */
+        public final Builder count(long value) {
+            this.count = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link JvmThreads}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public JvmThreads build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code peak_count}
+         */
+        public final Builder peakCount(long value) {
+            this.peakCount = value;
+            return this;
+        }
 
-			return new JvmThreads(this);
-		}
-	}
+        /**
+         * Builds a {@link JvmThreads}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public JvmThreads build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new JvmThreads(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link JvmThreads}
-	 */
-	public static final JsonpDeserializer<JvmThreads> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			JvmThreads::setupJvmThreadsDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupJvmThreadsDeserializer(ObjectDeserializer<JvmThreads.Builder> op) {
+    /**
+     * Json deserializer for {@link JvmThreads}
+     */
+    public static final JsonpDeserializer<JvmThreads> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        JvmThreads::setupJvmThreadsDeserializer
+    );
 
-		op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
-		op.add(Builder::peakCount, JsonpDeserializer.longDeserializer(), "peak_count");
+    protected static void setupJvmThreadsDeserializer(ObjectDeserializer<JvmThreads.Builder> op) {
 
-	}
+        op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
+        op.add(Builder::peakCount, JsonpDeserializer.longDeserializer(), "peak_count");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/KeyedProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/KeyedProcessor.java
index 6c2c95c32a..a197ea5c84 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/KeyedProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/KeyedProcessor.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,124 +43,123 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes._types.KeyedProcessor
 
-
 @JsonpDeserializable
 public class KeyedProcessor implements JsonpSerializable {
-	private final Process statistics;
-
-	private final String type;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private KeyedProcessor(Builder builder) {
-
-		this.statistics = ApiTypeHelper.requireNonNull(builder.statistics, this, "statistics");
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-
-	}
-
-	public static KeyedProcessor of(Function<Builder, ObjectBuilder<KeyedProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code statistics}
-	 */
-	public final Process statistics() {
-		return this.statistics;
-	}
-
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("statistics");
-		this.statistics.serialize(generator, mapper);
-
-		generator.writeKey("type");
-		generator.write(this.type);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link KeyedProcessor}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<KeyedProcessor> {
-		private Process statistics;
-
-		private String type;
-
-		/**
-		 * Required - API name: {@code statistics}
-		 */
-		public final Builder statistics(Process value) {
-			this.statistics = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code statistics}
-		 */
-		public final Builder statistics(Function<Process.Builder, ObjectBuilder<Process>> fn) {
-			return this.statistics(fn.apply(new Process.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link KeyedProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public KeyedProcessor build() {
-			_checkSingleUse();
-
-			return new KeyedProcessor(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link KeyedProcessor}
-	 */
-	public static final JsonpDeserializer<KeyedProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			KeyedProcessor::setupKeyedProcessorDeserializer);
-
-	protected static void setupKeyedProcessorDeserializer(ObjectDeserializer<KeyedProcessor.Builder> op) {
-
-		op.add(Builder::statistics, Process._DESERIALIZER, "statistics");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-
-	}
+    private final Process statistics;
+
+    private final String type;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private KeyedProcessor(Builder builder) {
+
+        this.statistics = ApiTypeHelper.requireNonNull(builder.statistics, this, "statistics");
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+
+    }
+
+    public static KeyedProcessor of(Function<Builder, ObjectBuilder<KeyedProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code statistics}
+     */
+    public final Process statistics() {
+        return this.statistics;
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("statistics");
+        this.statistics.serialize(generator, mapper);
+
+        generator.writeKey("type");
+        generator.write(this.type);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link KeyedProcessor}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<KeyedProcessor> {
+        private Process statistics;
+
+        private String type;
+
+        /**
+         * Required - API name: {@code statistics}
+         */
+        public final Builder statistics(Process value) {
+            this.statistics = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code statistics}
+         */
+        public final Builder statistics(Function<Process.Builder, ObjectBuilder<Process>> fn) {
+            return this.statistics(fn.apply(new Process.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link KeyedProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public KeyedProcessor build() {
+            _checkSingleUse();
+
+            return new KeyedProcessor(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link KeyedProcessor}
+     */
+    public static final JsonpDeserializer<KeyedProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        KeyedProcessor::setupKeyedProcessorDeserializer
+    );
+
+    protected static void setupKeyedProcessorDeserializer(ObjectDeserializer<KeyedProcessor.Builder> op) {
+
+        op.add(Builder::statistics, Process._DESERIALIZER, "statistics");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/MemoryStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/MemoryStats.java
index f02e0a2d95..1a9ea002d6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/MemoryStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/MemoryStats.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,338 +43,333 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: nodes._types.MemoryStats
 
-
 @JsonpDeserializable
 public class MemoryStats implements JsonpSerializable {
-	@Nullable
-	private final String resident;
-
-	@Nullable
-	private final Long residentInBytes;
-
-	@Nullable
-	private final String share;
-
-	@Nullable
-	private final Long shareInBytes;
-
-	@Nullable
-	private final String totalVirtual;
-
-	@Nullable
-	private final Long totalVirtualInBytes;
-
-	@Nullable
-	private final Long totalInBytes;
-
-	@Nullable
-	private final Long freeInBytes;
-
-	@Nullable
-	private final Long usedInBytes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected MemoryStats(AbstractBuilder<?> builder) {
-
-		this.resident = builder.resident;
-		this.residentInBytes = builder.residentInBytes;
-		this.share = builder.share;
-		this.shareInBytes = builder.shareInBytes;
-		this.totalVirtual = builder.totalVirtual;
-		this.totalVirtualInBytes = builder.totalVirtualInBytes;
-		this.totalInBytes = builder.totalInBytes;
-		this.freeInBytes = builder.freeInBytes;
-		this.usedInBytes = builder.usedInBytes;
-
-	}
-
-	public static MemoryStats memoryStatsOf(Function<Builder, ObjectBuilder<MemoryStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code resident}
-	 */
-	@Nullable
-	public final String resident() {
-		return this.resident;
-	}
-
-	/**
-	 * API name: {@code resident_in_bytes}
-	 */
-	@Nullable
-	public final Long residentInBytes() {
-		return this.residentInBytes;
-	}
-
-	/**
-	 * API name: {@code share}
-	 */
-	@Nullable
-	public final String share() {
-		return this.share;
-	}
-
-	/**
-	 * API name: {@code share_in_bytes}
-	 */
-	@Nullable
-	public final Long shareInBytes() {
-		return this.shareInBytes;
-	}
-
-	/**
-	 * API name: {@code total_virtual}
-	 */
-	@Nullable
-	public final String totalVirtual() {
-		return this.totalVirtual;
-	}
-
-	/**
-	 * API name: {@code total_virtual_in_bytes}
-	 */
-	@Nullable
-	public final Long totalVirtualInBytes() {
-		return this.totalVirtualInBytes;
-	}
-
-	/**
-	 * API name: {@code total_in_bytes}
-	 */
-	public final long totalInBytes() {
-		return this.totalInBytes;
-	}
-
-	/**
-	 * API name: {@code free_in_bytes}
-	 */
-	public final long freeInBytes() {
-		return this.freeInBytes;
-	}
-
-	/**
-	 * API name: {@code used_in_bytes}
-	 */
-	public final long usedInBytes() {
-		return this.usedInBytes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.resident != null) {
-			generator.writeKey("resident");
-			generator.write(this.resident);
-
-		}
-		if (this.residentInBytes != null) {
-			generator.writeKey("resident_in_bytes");
-			generator.write(this.residentInBytes);
-
-		}
-		if (this.share != null) {
-			generator.writeKey("share");
-			generator.write(this.share);
-
-		}
-		if (this.shareInBytes != null) {
-			generator.writeKey("share_in_bytes");
-			generator.write(this.shareInBytes);
-
-		}
-		if (this.totalVirtual != null) {
-			generator.writeKey("total_virtual");
-			generator.write(this.totalVirtual);
-
-		}
-		if (this.totalVirtualInBytes != null) {
-			generator.writeKey("total_virtual_in_bytes");
-			generator.write(this.totalVirtualInBytes);
-
-		}
-		
-		if (this.totalInBytes != null) {
-		    generator.writeKey("total_in_bytes");
-		    generator.write(this.totalInBytes);
-		}
-
-	    if (this.freeInBytes != null) {
-	        generator.writeKey("free_in_bytes");
-	        generator.write(this.freeInBytes);
-	    }
-
-	    if (this.usedInBytes != null) {
-	        generator.writeKey("used_in_bytes");
-	        generator.write(this.usedInBytes);
-	    }
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link MemoryStats}.
-	 */
-
-	public static class Builder extends MemoryStats.AbstractBuilder<Builder> implements ObjectBuilder<MemoryStats> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link MemoryStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public MemoryStats build() {
-			_checkSingleUse();
-
-			return new MemoryStats(this);
-		}
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		@Nullable
-		private String resident;
-
-		@Nullable
-		private Long residentInBytes;
-
-		@Nullable
-		private String share;
-
-		@Nullable
-		private Long shareInBytes;
-
-		@Nullable
-		private String totalVirtual;
-
-		@Nullable
-		private Long totalVirtualInBytes;
-
-		private Long totalInBytes;
-
-		private Long freeInBytes;
-
-		private Long usedInBytes;
-
-		/**
-		 * API name: {@code resident}
-		 */
-		public final BuilderT resident(@Nullable String value) {
-			this.resident = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code resident_in_bytes}
-		 */
-		public final BuilderT residentInBytes(@Nullable Long value) {
-			this.residentInBytes = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code share}
-		 */
-		public final BuilderT share(@Nullable String value) {
-			this.share = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code share_in_bytes}
-		 */
-		public final BuilderT shareInBytes(@Nullable Long value) {
-			this.shareInBytes = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code total_virtual}
-		 */
-		public final BuilderT totalVirtual(@Nullable String value) {
-			this.totalVirtual = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code total_virtual_in_bytes}
-		 */
-		public final BuilderT totalVirtualInBytes(@Nullable Long value) {
-			this.totalVirtualInBytes = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code total_in_bytes}
-		 */
-		public final BuilderT totalInBytes(long value) {
-			this.totalInBytes = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code free_in_bytes}
-		 */
-		public final BuilderT freeInBytes(long value) {
-			this.freeInBytes = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code used_in_bytes}
-		 */
-		public final BuilderT usedInBytes(long value) {
-			this.usedInBytes = value;
-			return self();
-		}
-
-		protected abstract BuilderT self();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link MemoryStats}
-	 */
-	public static final JsonpDeserializer<MemoryStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			MemoryStats::setupMemoryStatsDeserializer);
-
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupMemoryStatsDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-
-		op.add(AbstractBuilder::resident, JsonpDeserializer.stringDeserializer(), "resident");
-		op.add(AbstractBuilder::residentInBytes, JsonpDeserializer.longDeserializer(), "resident_in_bytes");
-		op.add(AbstractBuilder::share, JsonpDeserializer.stringDeserializer(), "share");
-		op.add(AbstractBuilder::shareInBytes, JsonpDeserializer.longDeserializer(), "share_in_bytes");
-		op.add(AbstractBuilder::totalVirtual, JsonpDeserializer.stringDeserializer(), "total_virtual");
-		op.add(AbstractBuilder::totalVirtualInBytes, JsonpDeserializer.longDeserializer(), "total_virtual_in_bytes");
-		op.add(AbstractBuilder::totalInBytes, JsonpDeserializer.longDeserializer(), "total_in_bytes");
-		op.add(AbstractBuilder::freeInBytes, JsonpDeserializer.longDeserializer(), "free_in_bytes");
-		op.add(AbstractBuilder::usedInBytes, JsonpDeserializer.longDeserializer(), "used_in_bytes");
-
-	}
+    @Nullable
+    private final String resident;
+
+    @Nullable
+    private final Long residentInBytes;
+
+    @Nullable
+    private final String share;
+
+    @Nullable
+    private final Long shareInBytes;
+
+    @Nullable
+    private final String totalVirtual;
+
+    @Nullable
+    private final Long totalVirtualInBytes;
+
+    @Nullable
+    private final Long totalInBytes;
+
+    @Nullable
+    private final Long freeInBytes;
+
+    @Nullable
+    private final Long usedInBytes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected MemoryStats(AbstractBuilder<?> builder) {
+
+        this.resident = builder.resident;
+        this.residentInBytes = builder.residentInBytes;
+        this.share = builder.share;
+        this.shareInBytes = builder.shareInBytes;
+        this.totalVirtual = builder.totalVirtual;
+        this.totalVirtualInBytes = builder.totalVirtualInBytes;
+        this.totalInBytes = builder.totalInBytes;
+        this.freeInBytes = builder.freeInBytes;
+        this.usedInBytes = builder.usedInBytes;
+
+    }
+
+    public static MemoryStats memoryStatsOf(Function<Builder, ObjectBuilder<MemoryStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code resident}
+     */
+    @Nullable
+    public final String resident() {
+        return this.resident;
+    }
+
+    /**
+     * API name: {@code resident_in_bytes}
+     */
+    @Nullable
+    public final Long residentInBytes() {
+        return this.residentInBytes;
+    }
+
+    /**
+     * API name: {@code share}
+     */
+    @Nullable
+    public final String share() {
+        return this.share;
+    }
+
+    /**
+     * API name: {@code share_in_bytes}
+     */
+    @Nullable
+    public final Long shareInBytes() {
+        return this.shareInBytes;
+    }
+
+    /**
+     * API name: {@code total_virtual}
+     */
+    @Nullable
+    public final String totalVirtual() {
+        return this.totalVirtual;
+    }
+
+    /**
+     * API name: {@code total_virtual_in_bytes}
+     */
+    @Nullable
+    public final Long totalVirtualInBytes() {
+        return this.totalVirtualInBytes;
+    }
+
+    /**
+     * API name: {@code total_in_bytes}
+     */
+    public final long totalInBytes() {
+        return this.totalInBytes;
+    }
+
+    /**
+     * API name: {@code free_in_bytes}
+     */
+    public final long freeInBytes() {
+        return this.freeInBytes;
+    }
+
+    /**
+     * API name: {@code used_in_bytes}
+     */
+    public final long usedInBytes() {
+        return this.usedInBytes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.resident != null) {
+            generator.writeKey("resident");
+            generator.write(this.resident);
+
+        }
+        if (this.residentInBytes != null) {
+            generator.writeKey("resident_in_bytes");
+            generator.write(this.residentInBytes);
+
+        }
+        if (this.share != null) {
+            generator.writeKey("share");
+            generator.write(this.share);
+
+        }
+        if (this.shareInBytes != null) {
+            generator.writeKey("share_in_bytes");
+            generator.write(this.shareInBytes);
+
+        }
+        if (this.totalVirtual != null) {
+            generator.writeKey("total_virtual");
+            generator.write(this.totalVirtual);
+
+        }
+        if (this.totalVirtualInBytes != null) {
+            generator.writeKey("total_virtual_in_bytes");
+            generator.write(this.totalVirtualInBytes);
+
+        }
+
+        if (this.totalInBytes != null) {
+            generator.writeKey("total_in_bytes");
+            generator.write(this.totalInBytes);
+        }
+
+        if (this.freeInBytes != null) {
+            generator.writeKey("free_in_bytes");
+            generator.write(this.freeInBytes);
+        }
+
+        if (this.usedInBytes != null) {
+            generator.writeKey("used_in_bytes");
+            generator.write(this.usedInBytes);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link MemoryStats}.
+     */
+
+    public static class Builder extends MemoryStats.AbstractBuilder<Builder> implements ObjectBuilder<MemoryStats> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link MemoryStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public MemoryStats build() {
+            _checkSingleUse();
+
+            return new MemoryStats(this);
+        }
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        @Nullable
+        private String resident;
+
+        @Nullable
+        private Long residentInBytes;
+
+        @Nullable
+        private String share;
+
+        @Nullable
+        private Long shareInBytes;
+
+        @Nullable
+        private String totalVirtual;
+
+        @Nullable
+        private Long totalVirtualInBytes;
+
+        private Long totalInBytes;
+
+        private Long freeInBytes;
+
+        private Long usedInBytes;
+
+        /**
+         * API name: {@code resident}
+         */
+        public final BuilderT resident(@Nullable String value) {
+            this.resident = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code resident_in_bytes}
+         */
+        public final BuilderT residentInBytes(@Nullable Long value) {
+            this.residentInBytes = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code share}
+         */
+        public final BuilderT share(@Nullable String value) {
+            this.share = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code share_in_bytes}
+         */
+        public final BuilderT shareInBytes(@Nullable Long value) {
+            this.shareInBytes = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code total_virtual}
+         */
+        public final BuilderT totalVirtual(@Nullable String value) {
+            this.totalVirtual = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code total_virtual_in_bytes}
+         */
+        public final BuilderT totalVirtualInBytes(@Nullable Long value) {
+            this.totalVirtualInBytes = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code total_in_bytes}
+         */
+        public final BuilderT totalInBytes(long value) {
+            this.totalInBytes = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code free_in_bytes}
+         */
+        public final BuilderT freeInBytes(long value) {
+            this.freeInBytes = value;
+            return self();
+        }
+
+        /**
+         * API name: {@code used_in_bytes}
+         */
+        public final BuilderT usedInBytes(long value) {
+            this.usedInBytes = value;
+            return self();
+        }
+
+        protected abstract BuilderT self();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link MemoryStats}
+     */
+    public static final JsonpDeserializer<MemoryStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        MemoryStats::setupMemoryStatsDeserializer
+    );
+
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupMemoryStatsDeserializer(ObjectDeserializer<BuilderT> op) {
+
+        op.add(AbstractBuilder::resident, JsonpDeserializer.stringDeserializer(), "resident");
+        op.add(AbstractBuilder::residentInBytes, JsonpDeserializer.longDeserializer(), "resident_in_bytes");
+        op.add(AbstractBuilder::share, JsonpDeserializer.stringDeserializer(), "share");
+        op.add(AbstractBuilder::shareInBytes, JsonpDeserializer.longDeserializer(), "share_in_bytes");
+        op.add(AbstractBuilder::totalVirtual, JsonpDeserializer.stringDeserializer(), "total_virtual");
+        op.add(AbstractBuilder::totalVirtualInBytes, JsonpDeserializer.longDeserializer(), "total_virtual_in_bytes");
+        op.add(AbstractBuilder::totalInBytes, JsonpDeserializer.longDeserializer(), "total_in_bytes");
+        op.add(AbstractBuilder::freeInBytes, JsonpDeserializer.longDeserializer(), "free_in_bytes");
+        op.add(AbstractBuilder::usedInBytes, JsonpDeserializer.longDeserializer(), "used_in_bytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodeBufferPool.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodeBufferPool.java
index 479819abf0..37f254674c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodeBufferPool.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodeBufferPool.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,142 +43,140 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes._types.NodeBufferPool
 
-
 @JsonpDeserializable
 public class NodeBufferPool implements JsonpSerializable {
-	private final long count;
+    private final long count;
 
-	private final long totalCapacityInBytes;
-
-	private final long usedInBytes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeBufferPool(Builder builder) {
-
-		this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
-		this.totalCapacityInBytes = ApiTypeHelper.requireNonNull(builder.totalCapacityInBytes, this,
-				"totalCapacityInBytes");
-		this.usedInBytes = ApiTypeHelper.requireNonNull(builder.usedInBytes, this, "usedInBytes");
-
-	}
-
-	public static NodeBufferPool of(Function<Builder, ObjectBuilder<NodeBufferPool>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code count}
-	 */
-	public final long count() {
-		return this.count;
-	}
-
-	/**
-	 * Required - API name: {@code total_capacity_in_bytes}
-	 */
-	public final long totalCapacityInBytes() {
-		return this.totalCapacityInBytes;
-	}
-
-	/**
-	 * Required - API name: {@code used_in_bytes}
-	 */
-	public final long usedInBytes() {
-		return this.usedInBytes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("count");
-		generator.write(this.count);
-
-		generator.writeKey("total_capacity_in_bytes");
-		generator.write(this.totalCapacityInBytes);
-
-		generator.writeKey("used_in_bytes");
-		generator.write(this.usedInBytes);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeBufferPool}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeBufferPool> {
-		private Long count;
-
-		private Long totalCapacityInBytes;
-
-		private Long usedInBytes;
-
-		/**
-		 * Required - API name: {@code count}
-		 */
-		public final Builder count(long value) {
-			this.count = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_capacity_in_bytes}
-		 */
-		public final Builder totalCapacityInBytes(long value) {
-			this.totalCapacityInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code used_in_bytes}
-		 */
-		public final Builder usedInBytes(long value) {
-			this.usedInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeBufferPool}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeBufferPool build() {
-			_checkSingleUse();
-
-			return new NodeBufferPool(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeBufferPool}
-	 */
-	public static final JsonpDeserializer<NodeBufferPool> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeBufferPool::setupNodeBufferPoolDeserializer);
-
-	protected static void setupNodeBufferPoolDeserializer(ObjectDeserializer<NodeBufferPool.Builder> op) {
-
-		op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
-		op.add(Builder::totalCapacityInBytes, JsonpDeserializer.longDeserializer(), "total_capacity_in_bytes");
-		op.add(Builder::usedInBytes, JsonpDeserializer.longDeserializer(), "used_in_bytes");
-
-	}
+    private final long totalCapacityInBytes;
+
+    private final long usedInBytes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeBufferPool(Builder builder) {
+
+        this.count = ApiTypeHelper.requireNonNull(builder.count, this, "count");
+        this.totalCapacityInBytes = ApiTypeHelper.requireNonNull(builder.totalCapacityInBytes, this, "totalCapacityInBytes");
+        this.usedInBytes = ApiTypeHelper.requireNonNull(builder.usedInBytes, this, "usedInBytes");
+
+    }
+
+    public static NodeBufferPool of(Function<Builder, ObjectBuilder<NodeBufferPool>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code count}
+     */
+    public final long count() {
+        return this.count;
+    }
+
+    /**
+     * Required - API name: {@code total_capacity_in_bytes}
+     */
+    public final long totalCapacityInBytes() {
+        return this.totalCapacityInBytes;
+    }
+
+    /**
+     * Required - API name: {@code used_in_bytes}
+     */
+    public final long usedInBytes() {
+        return this.usedInBytes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("count");
+        generator.write(this.count);
+
+        generator.writeKey("total_capacity_in_bytes");
+        generator.write(this.totalCapacityInBytes);
+
+        generator.writeKey("used_in_bytes");
+        generator.write(this.usedInBytes);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeBufferPool}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeBufferPool> {
+        private Long count;
+
+        private Long totalCapacityInBytes;
+
+        private Long usedInBytes;
+
+        /**
+         * Required - API name: {@code count}
+         */
+        public final Builder count(long value) {
+            this.count = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_capacity_in_bytes}
+         */
+        public final Builder totalCapacityInBytes(long value) {
+            this.totalCapacityInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code used_in_bytes}
+         */
+        public final Builder usedInBytes(long value) {
+            this.usedInBytes = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeBufferPool}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeBufferPool build() {
+            _checkSingleUse();
+
+            return new NodeBufferPool(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeBufferPool}
+     */
+    public static final JsonpDeserializer<NodeBufferPool> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeBufferPool::setupNodeBufferPoolDeserializer
+    );
+
+    protected static void setupNodeBufferPoolDeserializer(ObjectDeserializer<NodeBufferPool.Builder> op) {
+
+        op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
+        op.add(Builder::totalCapacityInBytes, JsonpDeserializer.longDeserializer(), "total_capacity_in_bytes");
+        op.add(Builder::usedInBytes, JsonpDeserializer.longDeserializer(), "used_in_bytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesInfoRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesInfoRequest.java
index f90f852868..d34ad8a6d5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesInfoRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesInfoRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,13 +47,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: nodes.info.Request
 
 /**
@@ -56,344 +55,342 @@
  */
 
 public class NodesInfoRequest extends RequestBase {
-	@Nullable
-	private final Boolean flatSettings;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final List<String> metric;
-
-	private final List<String> nodeId;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodesInfoRequest(Builder builder) {
-
-		this.flatSettings = builder.flatSettings;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.metric = ApiTypeHelper.unmodifiable(builder.metric);
-		this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
-		this.timeout = builder.timeout;
-
-	}
-
-	public static NodesInfoRequest of(Function<Builder, ObjectBuilder<NodesInfoRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * If true, returns settings in flat format.
-	 * <p>
-	 * API name: {@code flat_settings}
-	 */
-	@Nullable
-	public final Boolean flatSettings() {
-		return this.flatSettings;
-	}
-
-	/**
-	 * Period to wait for a connection to the master node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Period to wait for a connection to the cluster-manager node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Limits the information returned to the specific metrics. Supports a
-	 * comma-separated list, such as http,ingest.
-	 * <p>
-	 * API name: {@code metric}
-	 */
-	public final List<String> metric() {
-		return this.metric;
-	}
-
-	/**
-	 * Comma-separated list of node IDs or names used to limit returned information.
-	 * <p>
-	 * API name: {@code node_id}
-	 */
-	public final List<String> nodeId() {
-		return this.nodeId;
-	}
-
-	/**
-	 * Period to wait for a response. If no response is received before the timeout
-	 * expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodesInfoRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodesInfoRequest> {
-		@Nullable
-		private Boolean flatSettings;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private List<String> metric;
-
-		@Nullable
-		private List<String> nodeId;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * If true, returns settings in flat format.
-		 * <p>
-		 * API name: {@code flat_settings}
-		 */
-		public final Builder flatSettings(@Nullable Boolean value) {
-			this.flatSettings = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Limits the information returned to the specific metrics. Supports a
-		 * comma-separated list, such as http,ingest.
-		 * <p>
-		 * API name: {@code metric}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>metric</code>.
-		 */
-		public final Builder metric(List<String> list) {
-			this.metric = _listAddAll(this.metric, list);
-			return this;
-		}
-
-		/**
-		 * Limits the information returned to the specific metrics. Supports a
-		 * comma-separated list, such as http,ingest.
-		 * <p>
-		 * API name: {@code metric}
-		 * <p>
-		 * Adds one or more values to <code>metric</code>.
-		 */
-		public final Builder metric(String value, String... values) {
-			this.metric = _listAdd(this.metric, value, values);
-			return this;
-		}
-
-		/**
-		 * Comma-separated list of node IDs or names used to limit returned information.
-		 * <p>
-		 * API name: {@code node_id}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>nodeId</code>.
-		 */
-		public final Builder nodeId(List<String> list) {
-			this.nodeId = _listAddAll(this.nodeId, list);
-			return this;
-		}
-
-		/**
-		 * Comma-separated list of node IDs or names used to limit returned information.
-		 * <p>
-		 * API name: {@code node_id}
-		 * <p>
-		 * Adds one or more values to <code>nodeId</code>.
-		 */
-		public final Builder nodeId(String value, String... values) {
-			this.nodeId = _listAdd(this.nodeId, value, values);
-			return this;
-		}
-
-		/**
-		 * Period to wait for a response. If no response is received before the timeout
-		 * expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a response. If no response is received before the timeout
-		 * expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link NodesInfoRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodesInfoRequest build() {
-			_checkSingleUse();
-
-			return new NodesInfoRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code nodes.info}".
-	 */
-	public static final Endpoint<NodesInfoRequest, NodesInfoResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _metric = 1 << 0;
-				final int _nodeId = 1 << 1;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.metric()))
-					propsSet |= _metric;
-				if (ApiTypeHelper.isDefined(request.nodeId()))
-					propsSet |= _nodeId;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_nodes");
-					return buf.toString();
-				}
-				if (propsSet == (_nodeId)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_nodes");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).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).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);
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.flatSettings != null) {
-					params.put("flat_settings", String.valueOf(request.flatSettings));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, NodesInfoResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean flatSettings;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final List<String> metric;
+
+    private final List<String> nodeId;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodesInfoRequest(Builder builder) {
+
+        this.flatSettings = builder.flatSettings;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.metric = ApiTypeHelper.unmodifiable(builder.metric);
+        this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
+        this.timeout = builder.timeout;
+
+    }
+
+    public static NodesInfoRequest of(Function<Builder, ObjectBuilder<NodesInfoRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * If true, returns settings in flat format.
+     * <p>
+     * API name: {@code flat_settings}
+     */
+    @Nullable
+    public final Boolean flatSettings() {
+        return this.flatSettings;
+    }
+
+    /**
+     * Period to wait for a connection to the master node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Period to wait for a connection to the cluster-manager node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Limits the information returned to the specific metrics. Supports a
+     * comma-separated list, such as http,ingest.
+     * <p>
+     * API name: {@code metric}
+     */
+    public final List<String> metric() {
+        return this.metric;
+    }
+
+    /**
+     * Comma-separated list of node IDs or names used to limit returned information.
+     * <p>
+     * API name: {@code node_id}
+     */
+    public final List<String> nodeId() {
+        return this.nodeId;
+    }
+
+    /**
+     * Period to wait for a response. If no response is received before the timeout
+     * expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodesInfoRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodesInfoRequest> {
+        @Nullable
+        private Boolean flatSettings;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private List<String> metric;
+
+        @Nullable
+        private List<String> nodeId;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * If true, returns settings in flat format.
+         * <p>
+         * API name: {@code flat_settings}
+         */
+        public final Builder flatSettings(@Nullable Boolean value) {
+            this.flatSettings = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Limits the information returned to the specific metrics. Supports a
+         * comma-separated list, such as http,ingest.
+         * <p>
+         * API name: {@code metric}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>metric</code>.
+         */
+        public final Builder metric(List<String> list) {
+            this.metric = _listAddAll(this.metric, list);
+            return this;
+        }
+
+        /**
+         * Limits the information returned to the specific metrics. Supports a
+         * comma-separated list, such as http,ingest.
+         * <p>
+         * API name: {@code metric}
+         * <p>
+         * Adds one or more values to <code>metric</code>.
+         */
+        public final Builder metric(String value, String... values) {
+            this.metric = _listAdd(this.metric, value, values);
+            return this;
+        }
+
+        /**
+         * Comma-separated list of node IDs or names used to limit returned information.
+         * <p>
+         * API name: {@code node_id}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>nodeId</code>.
+         */
+        public final Builder nodeId(List<String> list) {
+            this.nodeId = _listAddAll(this.nodeId, list);
+            return this;
+        }
+
+        /**
+         * Comma-separated list of node IDs or names used to limit returned information.
+         * <p>
+         * API name: {@code node_id}
+         * <p>
+         * Adds one or more values to <code>nodeId</code>.
+         */
+        public final Builder nodeId(String value, String... values) {
+            this.nodeId = _listAdd(this.nodeId, value, values);
+            return this;
+        }
+
+        /**
+         * Period to wait for a response. If no response is received before the timeout
+         * expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a response. If no response is received before the timeout
+         * expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link NodesInfoRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodesInfoRequest build() {
+            _checkSingleUse();
+
+            return new NodesInfoRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code nodes.info}".
+     */
+    public static final Endpoint<NodesInfoRequest, NodesInfoResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _metric = 1 << 0;
+            final int _nodeId = 1 << 1;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.metric())) propsSet |= _metric;
+            if (ApiTypeHelper.isDefined(request.nodeId())) propsSet |= _nodeId;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_nodes");
+                return buf.toString();
+            }
+            if (propsSet == (_nodeId)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_nodes");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).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).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);
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.flatSettings != null) {
+                params.put("flat_settings", String.valueOf(request.flatSettings));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        NodesInfoResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesInfoResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesInfoResponse.java
index 8cf27ac036..4681f951ac 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesInfoResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesInfoResponse.java
@@ -32,157 +32,155 @@
 
 package org.opensearch.client.opensearch.nodes;
 
-import org.opensearch.client.opensearch.nodes.info.NodeInfo;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.nodes.info.NodeInfo;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: nodes.info.Response
 
-
 @JsonpDeserializable
 public class NodesInfoResponse extends NodesResponseBase {
-	private final String clusterName;
-
-	private final Map<String, NodeInfo> nodes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodesInfoResponse(Builder builder) {
-		super(builder);
-
-		this.clusterName = ApiTypeHelper.requireNonNull(builder.clusterName, this, "clusterName");
-		this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
-
-	}
-
-	public static NodesInfoResponse of(Function<Builder, ObjectBuilder<NodesInfoResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code cluster_name}
-	 */
-	public final String clusterName() {
-		return this.clusterName;
-	}
-
-	/**
-	 * Required - API name: {@code nodes}
-	 */
-	public final Map<String, NodeInfo> nodes() {
-		return this.nodes;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("cluster_name");
-		generator.write(this.clusterName);
-
-		if (ApiTypeHelper.isDefined(this.nodes)) {
-			generator.writeKey("nodes");
-			generator.writeStartObject();
-			for (Map.Entry<String, NodeInfo> item0 : this.nodes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodesInfoResponse}.
-	 */
-
-	public static class Builder extends NodesResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<NodesInfoResponse> {
-		private String clusterName;
-
-		private Map<String, NodeInfo> nodes;
-
-		/**
-		 * Required - API name: {@code cluster_name}
-		 */
-		public final Builder clusterName(String value) {
-			this.clusterName = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>nodes</code>.
-		 */
-		public final Builder nodes(Map<String, NodeInfo> map) {
-			this.nodes = _mapPutAll(this.nodes, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code>.
-		 */
-		public final Builder nodes(String key, NodeInfo value) {
-			this.nodes = _mapPut(this.nodes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code> using a builder lambda.
-		 */
-		public final Builder nodes(String key, Function<NodeInfo.Builder, ObjectBuilder<NodeInfo>> fn) {
-			return nodes(key, fn.apply(new NodeInfo.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodesInfoResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodesInfoResponse build() {
-			_checkSingleUse();
-
-			return new NodesInfoResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodesInfoResponse}
-	 */
-	public static final JsonpDeserializer<NodesInfoResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodesInfoResponse::setupNodesInfoResponseDeserializer);
-
-	protected static void setupNodesInfoResponseDeserializer(ObjectDeserializer<NodesInfoResponse.Builder> op) {
-		NodesResponseBase.setupNodesResponseBaseDeserializer(op);
-		op.add(Builder::clusterName, JsonpDeserializer.stringDeserializer(), "cluster_name");
-		op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(NodeInfo._DESERIALIZER), "nodes");
-
-	}
+    private final String clusterName;
+
+    private final Map<String, NodeInfo> nodes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodesInfoResponse(Builder builder) {
+        super(builder);
+
+        this.clusterName = ApiTypeHelper.requireNonNull(builder.clusterName, this, "clusterName");
+        this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
+
+    }
+
+    public static NodesInfoResponse of(Function<Builder, ObjectBuilder<NodesInfoResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code cluster_name}
+     */
+    public final String clusterName() {
+        return this.clusterName;
+    }
+
+    /**
+     * Required - API name: {@code nodes}
+     */
+    public final Map<String, NodeInfo> nodes() {
+        return this.nodes;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("cluster_name");
+        generator.write(this.clusterName);
+
+        if (ApiTypeHelper.isDefined(this.nodes)) {
+            generator.writeKey("nodes");
+            generator.writeStartObject();
+            for (Map.Entry<String, NodeInfo> item0 : this.nodes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodesInfoResponse}.
+     */
+
+    public static class Builder extends NodesResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<NodesInfoResponse> {
+        private String clusterName;
+
+        private Map<String, NodeInfo> nodes;
+
+        /**
+         * Required - API name: {@code cluster_name}
+         */
+        public final Builder clusterName(String value) {
+            this.clusterName = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>nodes</code>.
+         */
+        public final Builder nodes(Map<String, NodeInfo> map) {
+            this.nodes = _mapPutAll(this.nodes, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code>.
+         */
+        public final Builder nodes(String key, NodeInfo value) {
+            this.nodes = _mapPut(this.nodes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code> using a builder lambda.
+         */
+        public final Builder nodes(String key, Function<NodeInfo.Builder, ObjectBuilder<NodeInfo>> fn) {
+            return nodes(key, fn.apply(new NodeInfo.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodesInfoResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodesInfoResponse build() {
+            _checkSingleUse();
+
+            return new NodesInfoResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodesInfoResponse}
+     */
+    public static final JsonpDeserializer<NodesInfoResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodesInfoResponse::setupNodesInfoResponseDeserializer
+    );
+
+    protected static void setupNodesInfoResponseDeserializer(ObjectDeserializer<NodesInfoResponse.Builder> op) {
+        NodesResponseBase.setupNodesResponseBaseDeserializer(op);
+        op.add(Builder::clusterName, JsonpDeserializer.stringDeserializer(), "cluster_name");
+        op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(NodeInfo._DESERIALIZER), "nodes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesResponseBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesResponseBase.java
index 5cd7de9589..9ce20d76dd 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesResponseBase.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesResponseBase.java
@@ -32,94 +32,88 @@
 
 package org.opensearch.client.opensearch.nodes;
 
-import org.opensearch.client.opensearch._types.NodeStatistics;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.NodeStatistics;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: nodes._types.NodesResponseBase
 
+public abstract class NodesResponseBase implements JsonpSerializable {
+    private final NodeStatistics nodeStats;
 
+    // ---------------------------------------------------------------------------------------------
 
-public abstract class NodesResponseBase implements JsonpSerializable {
-	private final NodeStatistics nodeStats;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected NodesResponseBase(AbstractBuilder<?> builder) {
-
-		this.nodeStats = ApiTypeHelper.requireNonNull(builder.nodeStats, this, "nodeStats");
-
-	}
-
-	/**
-	 * Required - Contains statistics about the number of nodes selected by the
-	 * request's node filters.
-	 * <p>
-	 * API name: {@code _nodes}
-	 */
-	public final NodeStatistics nodeStats() {
-		return this.nodeStats;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("_nodes");
-		this.nodeStats.serialize(generator, mapper);
-
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		private NodeStatistics nodeStats;
-
-		/**
-		 * Required - Contains statistics about the number of nodes selected by the
-		 * request's node filters.
-		 * <p>
-		 * API name: {@code _nodes}
-		 */
-		public final BuilderT nodeStats(NodeStatistics value) {
-			this.nodeStats = value;
-			return self();
-		}
-
-		/**
-		 * Required - Contains statistics about the number of nodes selected by the
-		 * request's node filters.
-		 * <p>
-		 * API name: {@code _nodes}
-		 */
-		public final BuilderT nodeStats(Function<NodeStatistics.Builder, ObjectBuilder<NodeStatistics>> fn) {
-			return this.nodeStats(fn.apply(new NodeStatistics.Builder()).build());
-		}
-
-		protected abstract BuilderT self();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupNodesResponseBaseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-
-		op.add(AbstractBuilder::nodeStats, NodeStatistics._DESERIALIZER, "_nodes");
-
-	}
+    protected NodesResponseBase(AbstractBuilder<?> builder) {
+
+        this.nodeStats = ApiTypeHelper.requireNonNull(builder.nodeStats, this, "nodeStats");
+
+    }
+
+    /**
+     * Required - Contains statistics about the number of nodes selected by the
+     * request's node filters.
+     * <p>
+     * API name: {@code _nodes}
+     */
+    public final NodeStatistics nodeStats() {
+        return this.nodeStats;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("_nodes");
+        this.nodeStats.serialize(generator, mapper);
+
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        private NodeStatistics nodeStats;
+
+        /**
+         * Required - Contains statistics about the number of nodes selected by the
+         * request's node filters.
+         * <p>
+         * API name: {@code _nodes}
+         */
+        public final BuilderT nodeStats(NodeStatistics value) {
+            this.nodeStats = value;
+            return self();
+        }
+
+        /**
+         * Required - Contains statistics about the number of nodes selected by the
+         * request's node filters.
+         * <p>
+         * API name: {@code _nodes}
+         */
+        public final BuilderT nodeStats(Function<NodeStatistics.Builder, ObjectBuilder<NodeStatistics>> fn) {
+            return this.nodeStats(fn.apply(new NodeStatistics.Builder()).build());
+        }
+
+        protected abstract BuilderT self();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupNodesResponseBaseDeserializer(ObjectDeserializer<BuilderT> op) {
+
+        op.add(AbstractBuilder::nodeStats, NodeStatistics._DESERIALIZER, "_nodes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesStatsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesStatsRequest.java
index 0c5d7591bd..9572efd5a8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesStatsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesStatsRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.Level;
 import org.opensearch.client.opensearch._types.RequestBase;
@@ -42,13 +48,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: nodes.stats.Request
 
 /**
@@ -57,692 +56,682 @@
  */
 
 public class NodesStatsRequest extends RequestBase {
-	private final List<String> completionFields;
-
-	private final List<String> fielddataFields;
-
-	private final List<String> fields;
-
-	@Nullable
-	private final Boolean groups;
-
-	@Nullable
-	private final Boolean includeSegmentFileSizes;
-
-	@Nullable
-	private final Boolean includeUnloadedSegments;
-
-	private final List<String> indexMetric;
-
-	@Nullable
-	private final Level level;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final List<String> metric;
-
-	private final List<String> nodeId;
-
-	@Nullable
-	private final Time timeout;
-
-	private final List<String> types;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodesStatsRequest(Builder builder) {
-
-		this.completionFields = ApiTypeHelper.unmodifiable(builder.completionFields);
-		this.fielddataFields = ApiTypeHelper.unmodifiable(builder.fielddataFields);
-		this.fields = ApiTypeHelper.unmodifiable(builder.fields);
-		this.groups = builder.groups;
-		this.includeSegmentFileSizes = builder.includeSegmentFileSizes;
-		this.includeUnloadedSegments = builder.includeUnloadedSegments;
-		this.indexMetric = ApiTypeHelper.unmodifiable(builder.indexMetric);
-		this.level = builder.level;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.metric = ApiTypeHelper.unmodifiable(builder.metric);
-		this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
-		this.timeout = builder.timeout;
-		this.types = ApiTypeHelper.unmodifiable(builder.types);
-
-	}
-
-	public static NodesStatsRequest of(Function<Builder, ObjectBuilder<NodesStatsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Comma-separated list or wildcard expressions of fields to include in
-	 * fielddata and suggest statistics.
-	 * <p>
-	 * API name: {@code completion_fields}
-	 */
-	public final List<String> completionFields() {
-		return this.completionFields;
-	}
-
-	/**
-	 * Comma-separated list or wildcard expressions of fields to include in
-	 * fielddata statistics.
-	 * <p>
-	 * API name: {@code fielddata_fields}
-	 */
-	public final List<String> fielddataFields() {
-		return this.fielddataFields;
-	}
-
-	/**
-	 * Comma-separated list or wildcard expressions of fields to include in the
-	 * statistics.
-	 * <p>
-	 * API name: {@code fields}
-	 */
-	public final List<String> fields() {
-		return this.fields;
-	}
-
-	/**
-	 * Comma-separated list of search groups to include in the search statistics.
-	 * <p>
-	 * API name: {@code groups}
-	 */
-	@Nullable
-	public final Boolean groups() {
-		return this.groups;
-	}
-
-	/**
-	 * If true, the call reports the aggregated disk usage of each one of the Lucene
-	 * index files (only applies if segment stats are requested).
-	 * <p>
-	 * API name: {@code include_segment_file_sizes}
-	 */
-	@Nullable
-	public final Boolean includeSegmentFileSizes() {
-		return this.includeSegmentFileSizes;
-	}
-
-	/**
-	 * If set to true segment stats will include stats for segments that are not
-	 * currently loaded into memory
-	 * <p>
-	 * API name: {@code include_unloaded_segments}
-	 */
-	@Nullable
-	public final Boolean includeUnloadedSegments() {
-		return this.includeUnloadedSegments;
-	}
-
-	/**
-	 * Limit the information returned for indices metric to the specific index
-	 * metrics. It can be used only if indices (or all) metric is specified.
-	 * <p>
-	 * API name: {@code index_metric}
-	 */
-	public final List<String> indexMetric() {
-		return this.indexMetric;
-	}
-
-	/**
-	 * Indicates whether statistics are aggregated at the cluster, index, or shard
-	 * level.
-	 * <p>
-	 * API name: {@code level}
-	 */
-	@Nullable
-	public final Level level() {
-		return this.level;
-	}
-
-	/**
-	 * Period to wait for a connection to the master node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Period to wait for a connection to the cluster-manager node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Limit the information returned to the specified metrics
-	 * <p>
-	 * API name: {@code metric}
-	 */
-	public final List<String> metric() {
-		return this.metric;
-	}
-
-	/**
-	 * Comma-separated list of node IDs or names used to limit returned information.
-	 * <p>
-	 * API name: {@code node_id}
-	 */
-	public final List<String> nodeId() {
-		return this.nodeId;
-	}
-
-	/**
-	 * Period to wait for a response. If no response is received before the timeout
-	 * expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * A comma-separated list of document types for the indexing index metric.
-	 * <p>
-	 * API name: {@code types}
-	 */
-	public final List<String> types() {
-		return this.types;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodesStatsRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodesStatsRequest> {
-		@Nullable
-		private List<String> completionFields;
-
-		@Nullable
-		private List<String> fielddataFields;
-
-		@Nullable
-		private List<String> fields;
-
-		@Nullable
-		private Boolean groups;
-
-		@Nullable
-		private Boolean includeSegmentFileSizes;
-
-		@Nullable
-		private Boolean includeUnloadedSegments;
-
-		@Nullable
-		private List<String> indexMetric;
-
-		@Nullable
-		private Level level;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private List<String> metric;
-
-		@Nullable
-		private List<String> nodeId;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private List<String> types;
-
-		/**
-		 * Comma-separated list or wildcard expressions of fields to include in
-		 * fielddata and suggest statistics.
-		 * <p>
-		 * API name: {@code completion_fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>completionFields</code>.
-		 */
-		public final Builder completionFields(List<String> list) {
-			this.completionFields = _listAddAll(this.completionFields, list);
-			return this;
-		}
-
-		/**
-		 * Comma-separated list or wildcard expressions of fields to include in
-		 * fielddata and suggest statistics.
-		 * <p>
-		 * API name: {@code completion_fields}
-		 * <p>
-		 * Adds one or more values to <code>completionFields</code>.
-		 */
-		public final Builder completionFields(String value, String... values) {
-			this.completionFields = _listAdd(this.completionFields, value, values);
-			return this;
-		}
-
-		/**
-		 * Comma-separated list or wildcard expressions of fields to include in
-		 * fielddata statistics.
-		 * <p>
-		 * API name: {@code fielddata_fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fielddataFields</code>.
-		 */
-		public final Builder fielddataFields(List<String> list) {
-			this.fielddataFields = _listAddAll(this.fielddataFields, list);
-			return this;
-		}
-
-		/**
-		 * Comma-separated list or wildcard expressions of fields to include in
-		 * fielddata statistics.
-		 * <p>
-		 * API name: {@code fielddata_fields}
-		 * <p>
-		 * Adds one or more values to <code>fielddataFields</code>.
-		 */
-		public final Builder fielddataFields(String value, String... values) {
-			this.fielddataFields = _listAdd(this.fielddataFields, value, values);
-			return this;
-		}
-
-		/**
-		 * Comma-separated list or wildcard expressions of fields to include in the
-		 * statistics.
-		 * <p>
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>fields</code>.
-		 */
-		public final Builder fields(List<String> list) {
-			this.fields = _listAddAll(this.fields, list);
-			return this;
-		}
-
-		/**
-		 * Comma-separated list or wildcard expressions of fields to include in the
-		 * statistics.
-		 * <p>
-		 * API name: {@code fields}
-		 * <p>
-		 * Adds one or more values to <code>fields</code>.
-		 */
-		public final Builder fields(String value, String... values) {
-			this.fields = _listAdd(this.fields, value, values);
-			return this;
-		}
-
-		/**
-		 * Comma-separated list of search groups to include in the search statistics.
-		 * <p>
-		 * API name: {@code groups}
-		 */
-		public final Builder groups(@Nullable Boolean value) {
-			this.groups = value;
-			return this;
-		}
-
-		/**
-		 * If true, the call reports the aggregated disk usage of each one of the Lucene
-		 * index files (only applies if segment stats are requested).
-		 * <p>
-		 * API name: {@code include_segment_file_sizes}
-		 */
-		public final Builder includeSegmentFileSizes(@Nullable Boolean value) {
-			this.includeSegmentFileSizes = value;
-			return this;
-		}
-
-		/**
-		 * If set to true segment stats will include stats for segments that are not
-		 * currently loaded into memory
-		 * <p>
-		 * API name: {@code include_unloaded_segments}
-		 */
-		public final Builder includeUnloadedSegments(@Nullable Boolean value) {
-			this.includeUnloadedSegments = value;
-			return this;
-		}
-
-		/**
-		 * Limit the information returned for indices metric to the specific index
-		 * metrics. It can be used only if indices (or all) metric is specified.
-		 * <p>
-		 * API name: {@code index_metric}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indexMetric</code>.
-		 */
-		public final Builder indexMetric(List<String> list) {
-			this.indexMetric = _listAddAll(this.indexMetric, list);
-			return this;
-		}
-
-		/**
-		 * Limit the information returned for indices metric to the specific index
-		 * metrics. It can be used only if indices (or all) metric is specified.
-		 * <p>
-		 * API name: {@code index_metric}
-		 * <p>
-		 * Adds one or more values to <code>indexMetric</code>.
-		 */
-		public final Builder indexMetric(String value, String... values) {
-			this.indexMetric = _listAdd(this.indexMetric, value, values);
-			return this;
-		}
-
-		/**
-		 * Indicates whether statistics are aggregated at the cluster, index, or shard
-		 * level.
-		 * <p>
-		 * API name: {@code level}
-		 */
-		public final Builder level(@Nullable Level value) {
-			this.level = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Limit the information returned to the specified metrics
-		 * <p>
-		 * API name: {@code metric}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>metric</code>.
-		 */
-		public final Builder metric(List<String> list) {
-			this.metric = _listAddAll(this.metric, list);
-			return this;
-		}
-
-		/**
-		 * Limit the information returned to the specified metrics
-		 * <p>
-		 * API name: {@code metric}
-		 * <p>
-		 * Adds one or more values to <code>metric</code>.
-		 */
-		public final Builder metric(String value, String... values) {
-			this.metric = _listAdd(this.metric, value, values);
-			return this;
-		}
-
-		/**
-		 * Comma-separated list of node IDs or names used to limit returned information.
-		 * <p>
-		 * API name: {@code node_id}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>nodeId</code>.
-		 */
-		public final Builder nodeId(List<String> list) {
-			this.nodeId = _listAddAll(this.nodeId, list);
-			return this;
-		}
-
-		/**
-		 * Comma-separated list of node IDs or names used to limit returned information.
-		 * <p>
-		 * API name: {@code node_id}
-		 * <p>
-		 * Adds one or more values to <code>nodeId</code>.
-		 */
-		public final Builder nodeId(String value, String... values) {
-			this.nodeId = _listAdd(this.nodeId, value, values);
-			return this;
-		}
-
-		/**
-		 * Period to wait for a response. If no response is received before the timeout
-		 * expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a response. If no response is received before the timeout
-		 * expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * A comma-separated list of document types for the indexing index metric.
-		 * <p>
-		 * API name: {@code types}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>types</code>.
-		 */
-		public final Builder types(List<String> list) {
-			this.types = _listAddAll(this.types, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of document types for the indexing index metric.
-		 * <p>
-		 * API name: {@code types}
-		 * <p>
-		 * Adds one or more values to <code>types</code>.
-		 */
-		public final Builder types(String value, String... values) {
-			this.types = _listAdd(this.types, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodesStatsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodesStatsRequest build() {
-			_checkSingleUse();
-
-			return new NodesStatsRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code nodes.stats}".
-	 */
-	public static final Endpoint<NodesStatsRequest, NodesStatsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _metric = 1 << 0;
-				final int _indexMetric = 1 << 1;
-				final int _nodeId = 1 << 2;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.metric()))
-					propsSet |= _metric;
-				if (ApiTypeHelper.isDefined(request.indexMetric()))
-					propsSet |= _indexMetric;
-				if (ApiTypeHelper.isDefined(request.nodeId()))
-					propsSet |= _nodeId;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_nodes");
-					buf.append("/stats");
-					return buf.toString();
-				}
-				if (propsSet == (_nodeId)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_nodes");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					buf.append("/stats");
-					return buf.toString();
-				}
-				if (propsSet == (_metric)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_nodes");
-					buf.append("/stats");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).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);
-					buf.append("/stats");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					return buf.toString();
-				}
-				if (propsSet == (_metric | _indexMetric)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_nodes");
-					buf.append("/stats");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.indexMetric.stream().map(v -> v).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);
-					buf.append("/stats");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.indexMetric.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (ApiTypeHelper.isDefined(request.types)) {
-					params.put("types", request.types.stream().map(v -> v).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(",")));
-				}
-				if (ApiTypeHelper.isDefined(request.fielddataFields)) {
-					params.put("fielddata_fields",
-							request.fielddataFields.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.groups != null) {
-					params.put("groups", String.valueOf(request.groups));
-				}
-				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(",")));
-				}
-				if (request.includeSegmentFileSizes != null) {
-					params.put("include_segment_file_sizes", String.valueOf(request.includeSegmentFileSizes));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, NodesStatsResponse._DESERIALIZER);
+    private final List<String> completionFields;
+
+    private final List<String> fielddataFields;
+
+    private final List<String> fields;
+
+    @Nullable
+    private final Boolean groups;
+
+    @Nullable
+    private final Boolean includeSegmentFileSizes;
+
+    @Nullable
+    private final Boolean includeUnloadedSegments;
+
+    private final List<String> indexMetric;
+
+    @Nullable
+    private final Level level;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final List<String> metric;
+
+    private final List<String> nodeId;
+
+    @Nullable
+    private final Time timeout;
+
+    private final List<String> types;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodesStatsRequest(Builder builder) {
+
+        this.completionFields = ApiTypeHelper.unmodifiable(builder.completionFields);
+        this.fielddataFields = ApiTypeHelper.unmodifiable(builder.fielddataFields);
+        this.fields = ApiTypeHelper.unmodifiable(builder.fields);
+        this.groups = builder.groups;
+        this.includeSegmentFileSizes = builder.includeSegmentFileSizes;
+        this.includeUnloadedSegments = builder.includeUnloadedSegments;
+        this.indexMetric = ApiTypeHelper.unmodifiable(builder.indexMetric);
+        this.level = builder.level;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.metric = ApiTypeHelper.unmodifiable(builder.metric);
+        this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
+        this.timeout = builder.timeout;
+        this.types = ApiTypeHelper.unmodifiable(builder.types);
+
+    }
+
+    public static NodesStatsRequest of(Function<Builder, ObjectBuilder<NodesStatsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Comma-separated list or wildcard expressions of fields to include in
+     * fielddata and suggest statistics.
+     * <p>
+     * API name: {@code completion_fields}
+     */
+    public final List<String> completionFields() {
+        return this.completionFields;
+    }
+
+    /**
+     * Comma-separated list or wildcard expressions of fields to include in
+     * fielddata statistics.
+     * <p>
+     * API name: {@code fielddata_fields}
+     */
+    public final List<String> fielddataFields() {
+        return this.fielddataFields;
+    }
+
+    /**
+     * Comma-separated list or wildcard expressions of fields to include in the
+     * statistics.
+     * <p>
+     * API name: {@code fields}
+     */
+    public final List<String> fields() {
+        return this.fields;
+    }
+
+    /**
+     * Comma-separated list of search groups to include in the search statistics.
+     * <p>
+     * API name: {@code groups}
+     */
+    @Nullable
+    public final Boolean groups() {
+        return this.groups;
+    }
+
+    /**
+     * If true, the call reports the aggregated disk usage of each one of the Lucene
+     * index files (only applies if segment stats are requested).
+     * <p>
+     * API name: {@code include_segment_file_sizes}
+     */
+    @Nullable
+    public final Boolean includeSegmentFileSizes() {
+        return this.includeSegmentFileSizes;
+    }
+
+    /**
+     * If set to true segment stats will include stats for segments that are not
+     * currently loaded into memory
+     * <p>
+     * API name: {@code include_unloaded_segments}
+     */
+    @Nullable
+    public final Boolean includeUnloadedSegments() {
+        return this.includeUnloadedSegments;
+    }
+
+    /**
+     * Limit the information returned for indices metric to the specific index
+     * metrics. It can be used only if indices (or all) metric is specified.
+     * <p>
+     * API name: {@code index_metric}
+     */
+    public final List<String> indexMetric() {
+        return this.indexMetric;
+    }
+
+    /**
+     * Indicates whether statistics are aggregated at the cluster, index, or shard
+     * level.
+     * <p>
+     * API name: {@code level}
+     */
+    @Nullable
+    public final Level level() {
+        return this.level;
+    }
+
+    /**
+     * Period to wait for a connection to the master node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Period to wait for a connection to the cluster-manager node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Limit the information returned to the specified metrics
+     * <p>
+     * API name: {@code metric}
+     */
+    public final List<String> metric() {
+        return this.metric;
+    }
+
+    /**
+     * Comma-separated list of node IDs or names used to limit returned information.
+     * <p>
+     * API name: {@code node_id}
+     */
+    public final List<String> nodeId() {
+        return this.nodeId;
+    }
+
+    /**
+     * Period to wait for a response. If no response is received before the timeout
+     * expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * A comma-separated list of document types for the indexing index metric.
+     * <p>
+     * API name: {@code types}
+     */
+    public final List<String> types() {
+        return this.types;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodesStatsRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodesStatsRequest> {
+        @Nullable
+        private List<String> completionFields;
+
+        @Nullable
+        private List<String> fielddataFields;
+
+        @Nullable
+        private List<String> fields;
+
+        @Nullable
+        private Boolean groups;
+
+        @Nullable
+        private Boolean includeSegmentFileSizes;
+
+        @Nullable
+        private Boolean includeUnloadedSegments;
+
+        @Nullable
+        private List<String> indexMetric;
+
+        @Nullable
+        private Level level;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private List<String> metric;
+
+        @Nullable
+        private List<String> nodeId;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private List<String> types;
+
+        /**
+         * Comma-separated list or wildcard expressions of fields to include in
+         * fielddata and suggest statistics.
+         * <p>
+         * API name: {@code completion_fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>completionFields</code>.
+         */
+        public final Builder completionFields(List<String> list) {
+            this.completionFields = _listAddAll(this.completionFields, list);
+            return this;
+        }
+
+        /**
+         * Comma-separated list or wildcard expressions of fields to include in
+         * fielddata and suggest statistics.
+         * <p>
+         * API name: {@code completion_fields}
+         * <p>
+         * Adds one or more values to <code>completionFields</code>.
+         */
+        public final Builder completionFields(String value, String... values) {
+            this.completionFields = _listAdd(this.completionFields, value, values);
+            return this;
+        }
+
+        /**
+         * Comma-separated list or wildcard expressions of fields to include in
+         * fielddata statistics.
+         * <p>
+         * API name: {@code fielddata_fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fielddataFields</code>.
+         */
+        public final Builder fielddataFields(List<String> list) {
+            this.fielddataFields = _listAddAll(this.fielddataFields, list);
+            return this;
+        }
+
+        /**
+         * Comma-separated list or wildcard expressions of fields to include in
+         * fielddata statistics.
+         * <p>
+         * API name: {@code fielddata_fields}
+         * <p>
+         * Adds one or more values to <code>fielddataFields</code>.
+         */
+        public final Builder fielddataFields(String value, String... values) {
+            this.fielddataFields = _listAdd(this.fielddataFields, value, values);
+            return this;
+        }
+
+        /**
+         * Comma-separated list or wildcard expressions of fields to include in the
+         * statistics.
+         * <p>
+         * API name: {@code fields}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>fields</code>.
+         */
+        public final Builder fields(List<String> list) {
+            this.fields = _listAddAll(this.fields, list);
+            return this;
+        }
+
+        /**
+         * Comma-separated list or wildcard expressions of fields to include in the
+         * statistics.
+         * <p>
+         * API name: {@code fields}
+         * <p>
+         * Adds one or more values to <code>fields</code>.
+         */
+        public final Builder fields(String value, String... values) {
+            this.fields = _listAdd(this.fields, value, values);
+            return this;
+        }
+
+        /**
+         * Comma-separated list of search groups to include in the search statistics.
+         * <p>
+         * API name: {@code groups}
+         */
+        public final Builder groups(@Nullable Boolean value) {
+            this.groups = value;
+            return this;
+        }
+
+        /**
+         * If true, the call reports the aggregated disk usage of each one of the Lucene
+         * index files (only applies if segment stats are requested).
+         * <p>
+         * API name: {@code include_segment_file_sizes}
+         */
+        public final Builder includeSegmentFileSizes(@Nullable Boolean value) {
+            this.includeSegmentFileSizes = value;
+            return this;
+        }
+
+        /**
+         * If set to true segment stats will include stats for segments that are not
+         * currently loaded into memory
+         * <p>
+         * API name: {@code include_unloaded_segments}
+         */
+        public final Builder includeUnloadedSegments(@Nullable Boolean value) {
+            this.includeUnloadedSegments = value;
+            return this;
+        }
+
+        /**
+         * Limit the information returned for indices metric to the specific index
+         * metrics. It can be used only if indices (or all) metric is specified.
+         * <p>
+         * API name: {@code index_metric}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indexMetric</code>.
+         */
+        public final Builder indexMetric(List<String> list) {
+            this.indexMetric = _listAddAll(this.indexMetric, list);
+            return this;
+        }
+
+        /**
+         * Limit the information returned for indices metric to the specific index
+         * metrics. It can be used only if indices (or all) metric is specified.
+         * <p>
+         * API name: {@code index_metric}
+         * <p>
+         * Adds one or more values to <code>indexMetric</code>.
+         */
+        public final Builder indexMetric(String value, String... values) {
+            this.indexMetric = _listAdd(this.indexMetric, value, values);
+            return this;
+        }
+
+        /**
+         * Indicates whether statistics are aggregated at the cluster, index, or shard
+         * level.
+         * <p>
+         * API name: {@code level}
+         */
+        public final Builder level(@Nullable Level value) {
+            this.level = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Limit the information returned to the specified metrics
+         * <p>
+         * API name: {@code metric}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>metric</code>.
+         */
+        public final Builder metric(List<String> list) {
+            this.metric = _listAddAll(this.metric, list);
+            return this;
+        }
+
+        /**
+         * Limit the information returned to the specified metrics
+         * <p>
+         * API name: {@code metric}
+         * <p>
+         * Adds one or more values to <code>metric</code>.
+         */
+        public final Builder metric(String value, String... values) {
+            this.metric = _listAdd(this.metric, value, values);
+            return this;
+        }
+
+        /**
+         * Comma-separated list of node IDs or names used to limit returned information.
+         * <p>
+         * API name: {@code node_id}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>nodeId</code>.
+         */
+        public final Builder nodeId(List<String> list) {
+            this.nodeId = _listAddAll(this.nodeId, list);
+            return this;
+        }
+
+        /**
+         * Comma-separated list of node IDs or names used to limit returned information.
+         * <p>
+         * API name: {@code node_id}
+         * <p>
+         * Adds one or more values to <code>nodeId</code>.
+         */
+        public final Builder nodeId(String value, String... values) {
+            this.nodeId = _listAdd(this.nodeId, value, values);
+            return this;
+        }
+
+        /**
+         * Period to wait for a response. If no response is received before the timeout
+         * expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a response. If no response is received before the timeout
+         * expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * A comma-separated list of document types for the indexing index metric.
+         * <p>
+         * API name: {@code types}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>types</code>.
+         */
+        public final Builder types(List<String> list) {
+            this.types = _listAddAll(this.types, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of document types for the indexing index metric.
+         * <p>
+         * API name: {@code types}
+         * <p>
+         * Adds one or more values to <code>types</code>.
+         */
+        public final Builder types(String value, String... values) {
+            this.types = _listAdd(this.types, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodesStatsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodesStatsRequest build() {
+            _checkSingleUse();
+
+            return new NodesStatsRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code nodes.stats}".
+     */
+    public static final Endpoint<NodesStatsRequest, NodesStatsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _metric = 1 << 0;
+            final int _indexMetric = 1 << 1;
+            final int _nodeId = 1 << 2;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.metric())) propsSet |= _metric;
+            if (ApiTypeHelper.isDefined(request.indexMetric())) propsSet |= _indexMetric;
+            if (ApiTypeHelper.isDefined(request.nodeId())) propsSet |= _nodeId;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_nodes");
+                buf.append("/stats");
+                return buf.toString();
+            }
+            if (propsSet == (_nodeId)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_nodes");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/stats");
+                return buf.toString();
+            }
+            if (propsSet == (_metric)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_nodes");
+                buf.append("/stats");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).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);
+                buf.append("/stats");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            if (propsSet == (_metric | _indexMetric)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_nodes");
+                buf.append("/stats");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.indexMetric.stream().map(v -> v).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);
+                buf.append("/stats");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.indexMetric.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (ApiTypeHelper.isDefined(request.types)) {
+                params.put("types", request.types.stream().map(v -> v).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(",")));
+            }
+            if (ApiTypeHelper.isDefined(request.fielddataFields)) {
+                params.put("fielddata_fields", request.fielddataFields.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.groups != null) {
+                params.put("groups", String.valueOf(request.groups));
+            }
+            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(",")));
+            }
+            if (request.includeSegmentFileSizes != null) {
+                params.put("include_segment_file_sizes", String.valueOf(request.includeSegmentFileSizes));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        NodesStatsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesStatsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesStatsResponse.java
index 22a907509c..694f988d12 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesStatsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesStatsResponse.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,148 +42,144 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: nodes.stats.Response
 
-
 @JsonpDeserializable
 public class NodesStatsResponse extends NodesResponseBase {
-	private final String clusterName;
-
-	private final Map<String, Stats> nodes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodesStatsResponse(Builder builder) {
-		super(builder);
-
-		this.clusterName = ApiTypeHelper.requireNonNull(builder.clusterName, this, "clusterName");
-		this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
-
-	}
-
-	public static NodesStatsResponse of(Function<Builder, ObjectBuilder<NodesStatsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code cluster_name}
-	 */
-	public final String clusterName() {
-		return this.clusterName;
-	}
-
-	/**
-	 * Required - API name: {@code nodes}
-	 */
-	public final Map<String, Stats> nodes() {
-		return this.nodes;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("cluster_name");
-		generator.write(this.clusterName);
-
-		if (ApiTypeHelper.isDefined(this.nodes)) {
-			generator.writeKey("nodes");
-			generator.writeStartObject();
-			for (Map.Entry<String, Stats> item0 : this.nodes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodesStatsResponse}.
-	 */
-
-	public static class Builder extends NodesResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<NodesStatsResponse> {
-		private String clusterName;
-
-		private Map<String, Stats> nodes;
-
-		/**
-		 * Required - API name: {@code cluster_name}
-		 */
-		public final Builder clusterName(String value) {
-			this.clusterName = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>nodes</code>.
-		 */
-		public final Builder nodes(Map<String, Stats> map) {
-			this.nodes = _mapPutAll(this.nodes, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code>.
-		 */
-		public final Builder nodes(String key, Stats value) {
-			this.nodes = _mapPut(this.nodes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code> using a builder lambda.
-		 */
-		public final Builder nodes(String key, Function<Stats.Builder, ObjectBuilder<Stats>> fn) {
-			return nodes(key, fn.apply(new Stats.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodesStatsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodesStatsResponse build() {
-			_checkSingleUse();
-
-			return new NodesStatsResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodesStatsResponse}
-	 */
-	public static final JsonpDeserializer<NodesStatsResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodesStatsResponse::setupNodesStatsResponseDeserializer);
-
-	protected static void setupNodesStatsResponseDeserializer(ObjectDeserializer<NodesStatsResponse.Builder> op) {
-		setupNodesResponseBaseDeserializer(op);
-		op.add(Builder::clusterName, JsonpDeserializer.stringDeserializer(), "cluster_name");
-		op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(Stats._DESERIALIZER), "nodes");
-
-	}
+    private final String clusterName;
+
+    private final Map<String, Stats> nodes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodesStatsResponse(Builder builder) {
+        super(builder);
+
+        this.clusterName = ApiTypeHelper.requireNonNull(builder.clusterName, this, "clusterName");
+        this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
+
+    }
+
+    public static NodesStatsResponse of(Function<Builder, ObjectBuilder<NodesStatsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code cluster_name}
+     */
+    public final String clusterName() {
+        return this.clusterName;
+    }
+
+    /**
+     * Required - API name: {@code nodes}
+     */
+    public final Map<String, Stats> nodes() {
+        return this.nodes;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("cluster_name");
+        generator.write(this.clusterName);
+
+        if (ApiTypeHelper.isDefined(this.nodes)) {
+            generator.writeKey("nodes");
+            generator.writeStartObject();
+            for (Map.Entry<String, Stats> item0 : this.nodes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodesStatsResponse}.
+     */
+
+    public static class Builder extends NodesResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<NodesStatsResponse> {
+        private String clusterName;
+
+        private Map<String, Stats> nodes;
+
+        /**
+         * Required - API name: {@code cluster_name}
+         */
+        public final Builder clusterName(String value) {
+            this.clusterName = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>nodes</code>.
+         */
+        public final Builder nodes(Map<String, Stats> map) {
+            this.nodes = _mapPutAll(this.nodes, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code>.
+         */
+        public final Builder nodes(String key, Stats value) {
+            this.nodes = _mapPut(this.nodes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code> using a builder lambda.
+         */
+        public final Builder nodes(String key, Function<Stats.Builder, ObjectBuilder<Stats>> fn) {
+            return nodes(key, fn.apply(new Stats.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodesStatsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodesStatsResponse build() {
+            _checkSingleUse();
+
+            return new NodesStatsResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodesStatsResponse}
+     */
+    public static final JsonpDeserializer<NodesStatsResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodesStatsResponse::setupNodesStatsResponseDeserializer
+    );
+
+    protected static void setupNodesStatsResponseDeserializer(ObjectDeserializer<NodesStatsResponse.Builder> op) {
+        setupNodesResponseBaseDeserializer(op);
+        op.add(Builder::clusterName, JsonpDeserializer.stringDeserializer(), "cluster_name");
+        op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(Stats._DESERIALIZER), "nodes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesUsageRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesUsageRequest.java
index 9024561a48..b2c65552aa 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesUsageRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesUsageRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,13 +47,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: nodes.usage.Request
 
 /**
@@ -56,229 +55,227 @@
  */
 
 public class NodesUsageRequest extends RequestBase {
-	private final List<String> metric;
-
-	private final List<String> nodeId;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodesUsageRequest(Builder builder) {
-
-		this.metric = ApiTypeHelper.unmodifiable(builder.metric);
-		this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
-		this.timeout = builder.timeout;
-
-	}
-
-	public static NodesUsageRequest of(Function<Builder, ObjectBuilder<NodesUsageRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Limit the information returned to the specified metrics
-	 * <p>
-	 * API name: {@code metric}
-	 */
-	public final List<String> metric() {
-		return this.metric;
-	}
-
-	/**
-	 * A comma-separated list of node IDs or names to limit the returned
-	 * information; use <code>_local</code> to return information from the node
-	 * you're connecting to, leave empty to get information from all nodes
-	 * <p>
-	 * API name: {@code node_id}
-	 */
-	public final List<String> nodeId() {
-		return this.nodeId;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodesUsageRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodesUsageRequest> {
-		@Nullable
-		private List<String> metric;
-
-		@Nullable
-		private List<String> nodeId;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * Limit the information returned to the specified metrics
-		 * <p>
-		 * API name: {@code metric}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>metric</code>.
-		 */
-		public final Builder metric(List<String> list) {
-			this.metric = _listAddAll(this.metric, list);
-			return this;
-		}
-
-		/**
-		 * Limit the information returned to the specified metrics
-		 * <p>
-		 * API name: {@code metric}
-		 * <p>
-		 * Adds one or more values to <code>metric</code>.
-		 */
-		public final Builder metric(String value, String... values) {
-			this.metric = _listAdd(this.metric, value, values);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of node IDs or names to limit the returned
-		 * information; use <code>_local</code> to return information from the node
-		 * you're connecting to, leave empty to get information from all nodes
-		 * <p>
-		 * API name: {@code node_id}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>nodeId</code>.
-		 */
-		public final Builder nodeId(List<String> list) {
-			this.nodeId = _listAddAll(this.nodeId, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of node IDs or names to limit the returned
-		 * information; use <code>_local</code> to return information from the node
-		 * you're connecting to, leave empty to get information from all nodes
-		 * <p>
-		 * API name: {@code node_id}
-		 * <p>
-		 * Adds one or more values to <code>nodeId</code>.
-		 */
-		public final Builder nodeId(String value, String... values) {
-			this.nodeId = _listAdd(this.nodeId, value, values);
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link NodesUsageRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodesUsageRequest build() {
-			_checkSingleUse();
-
-			return new NodesUsageRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code nodes.usage}".
-	 */
-	public static final Endpoint<NodesUsageRequest, NodesUsageResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _metric = 1 << 0;
-				final int _nodeId = 1 << 1;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.metric()))
-					propsSet |= _metric;
-				if (ApiTypeHelper.isDefined(request.nodeId()))
-					propsSet |= _nodeId;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_nodes");
-					buf.append("/usage");
-					return buf.toString();
-				}
-				if (propsSet == (_nodeId)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_nodes");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					buf.append("/usage");
-					return buf.toString();
-				}
-				if (propsSet == (_metric)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_nodes");
-					buf.append("/usage");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).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);
-					buf.append("/usage");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, NodesUsageResponse._DESERIALIZER);
+    private final List<String> metric;
+
+    private final List<String> nodeId;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodesUsageRequest(Builder builder) {
+
+        this.metric = ApiTypeHelper.unmodifiable(builder.metric);
+        this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
+        this.timeout = builder.timeout;
+
+    }
+
+    public static NodesUsageRequest of(Function<Builder, ObjectBuilder<NodesUsageRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Limit the information returned to the specified metrics
+     * <p>
+     * API name: {@code metric}
+     */
+    public final List<String> metric() {
+        return this.metric;
+    }
+
+    /**
+     * A comma-separated list of node IDs or names to limit the returned
+     * information; use <code>_local</code> to return information from the node
+     * you're connecting to, leave empty to get information from all nodes
+     * <p>
+     * API name: {@code node_id}
+     */
+    public final List<String> nodeId() {
+        return this.nodeId;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodesUsageRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodesUsageRequest> {
+        @Nullable
+        private List<String> metric;
+
+        @Nullable
+        private List<String> nodeId;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * Limit the information returned to the specified metrics
+         * <p>
+         * API name: {@code metric}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>metric</code>.
+         */
+        public final Builder metric(List<String> list) {
+            this.metric = _listAddAll(this.metric, list);
+            return this;
+        }
+
+        /**
+         * Limit the information returned to the specified metrics
+         * <p>
+         * API name: {@code metric}
+         * <p>
+         * Adds one or more values to <code>metric</code>.
+         */
+        public final Builder metric(String value, String... values) {
+            this.metric = _listAdd(this.metric, value, values);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of node IDs or names to limit the returned
+         * information; use <code>_local</code> to return information from the node
+         * you're connecting to, leave empty to get information from all nodes
+         * <p>
+         * API name: {@code node_id}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>nodeId</code>.
+         */
+        public final Builder nodeId(List<String> list) {
+            this.nodeId = _listAddAll(this.nodeId, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of node IDs or names to limit the returned
+         * information; use <code>_local</code> to return information from the node
+         * you're connecting to, leave empty to get information from all nodes
+         * <p>
+         * API name: {@code node_id}
+         * <p>
+         * Adds one or more values to <code>nodeId</code>.
+         */
+        public final Builder nodeId(String value, String... values) {
+            this.nodeId = _listAdd(this.nodeId, value, values);
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link NodesUsageRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodesUsageRequest build() {
+            _checkSingleUse();
+
+            return new NodesUsageRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code nodes.usage}".
+     */
+    public static final Endpoint<NodesUsageRequest, NodesUsageResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _metric = 1 << 0;
+            final int _nodeId = 1 << 1;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.metric())) propsSet |= _metric;
+            if (ApiTypeHelper.isDefined(request.nodeId())) propsSet |= _nodeId;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_nodes");
+                buf.append("/usage");
+                return buf.toString();
+            }
+            if (propsSet == (_nodeId)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_nodes");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/usage");
+                return buf.toString();
+            }
+            if (propsSet == (_metric)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_nodes");
+                buf.append("/usage");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).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);
+                buf.append("/usage");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.metric.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        NodesUsageResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesUsageResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesUsageResponse.java
index 38213a40da..1d39723d40 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesUsageResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesUsageResponse.java
@@ -32,157 +32,155 @@
 
 package org.opensearch.client.opensearch.nodes;
 
-import org.opensearch.client.opensearch.nodes.usage.NodeUsage;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.nodes.usage.NodeUsage;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: nodes.usage.Response
 
-
 @JsonpDeserializable
 public class NodesUsageResponse extends NodesResponseBase {
-	private final String clusterName;
-
-	private final Map<String, NodeUsage> nodes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodesUsageResponse(Builder builder) {
-		super(builder);
-
-		this.clusterName = ApiTypeHelper.requireNonNull(builder.clusterName, this, "clusterName");
-		this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
-
-	}
-
-	public static NodesUsageResponse of(Function<Builder, ObjectBuilder<NodesUsageResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code cluster_name}
-	 */
-	public final String clusterName() {
-		return this.clusterName;
-	}
-
-	/**
-	 * Required - API name: {@code nodes}
-	 */
-	public final Map<String, NodeUsage> nodes() {
-		return this.nodes;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("cluster_name");
-		generator.write(this.clusterName);
-
-		if (ApiTypeHelper.isDefined(this.nodes)) {
-			generator.writeKey("nodes");
-			generator.writeStartObject();
-			for (Map.Entry<String, NodeUsage> item0 : this.nodes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodesUsageResponse}.
-	 */
-
-	public static class Builder extends NodesResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<NodesUsageResponse> {
-		private String clusterName;
-
-		private Map<String, NodeUsage> nodes;
-
-		/**
-		 * Required - API name: {@code cluster_name}
-		 */
-		public final Builder clusterName(String value) {
-			this.clusterName = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>nodes</code>.
-		 */
-		public final Builder nodes(Map<String, NodeUsage> map) {
-			this.nodes = _mapPutAll(this.nodes, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code>.
-		 */
-		public final Builder nodes(String key, NodeUsage value) {
-			this.nodes = _mapPut(this.nodes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code> using a builder lambda.
-		 */
-		public final Builder nodes(String key, Function<NodeUsage.Builder, ObjectBuilder<NodeUsage>> fn) {
-			return nodes(key, fn.apply(new NodeUsage.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodesUsageResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodesUsageResponse build() {
-			_checkSingleUse();
-
-			return new NodesUsageResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodesUsageResponse}
-	 */
-	public static final JsonpDeserializer<NodesUsageResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodesUsageResponse::setupNodesUsageResponseDeserializer);
-
-	protected static void setupNodesUsageResponseDeserializer(ObjectDeserializer<NodesUsageResponse.Builder> op) {
-		setupNodesResponseBaseDeserializer(op);
-		op.add(Builder::clusterName, JsonpDeserializer.stringDeserializer(), "cluster_name");
-		op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(NodeUsage._DESERIALIZER), "nodes");
-
-	}
+    private final String clusterName;
+
+    private final Map<String, NodeUsage> nodes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodesUsageResponse(Builder builder) {
+        super(builder);
+
+        this.clusterName = ApiTypeHelper.requireNonNull(builder.clusterName, this, "clusterName");
+        this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
+
+    }
+
+    public static NodesUsageResponse of(Function<Builder, ObjectBuilder<NodesUsageResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code cluster_name}
+     */
+    public final String clusterName() {
+        return this.clusterName;
+    }
+
+    /**
+     * Required - API name: {@code nodes}
+     */
+    public final Map<String, NodeUsage> nodes() {
+        return this.nodes;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("cluster_name");
+        generator.write(this.clusterName);
+
+        if (ApiTypeHelper.isDefined(this.nodes)) {
+            generator.writeKey("nodes");
+            generator.writeStartObject();
+            for (Map.Entry<String, NodeUsage> item0 : this.nodes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodesUsageResponse}.
+     */
+
+    public static class Builder extends NodesResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<NodesUsageResponse> {
+        private String clusterName;
+
+        private Map<String, NodeUsage> nodes;
+
+        /**
+         * Required - API name: {@code cluster_name}
+         */
+        public final Builder clusterName(String value) {
+            this.clusterName = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>nodes</code>.
+         */
+        public final Builder nodes(Map<String, NodeUsage> map) {
+            this.nodes = _mapPutAll(this.nodes, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code>.
+         */
+        public final Builder nodes(String key, NodeUsage value) {
+            this.nodes = _mapPut(this.nodes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code> using a builder lambda.
+         */
+        public final Builder nodes(String key, Function<NodeUsage.Builder, ObjectBuilder<NodeUsage>> fn) {
+            return nodes(key, fn.apply(new NodeUsage.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodesUsageResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodesUsageResponse build() {
+            _checkSingleUse();
+
+            return new NodesUsageResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodesUsageResponse}
+     */
+    public static final JsonpDeserializer<NodesUsageResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodesUsageResponse::setupNodesUsageResponseDeserializer
+    );
+
+    protected static void setupNodesUsageResponseDeserializer(ObjectDeserializer<NodesUsageResponse.Builder> op) {
+        setupNodesResponseBaseDeserializer(op);
+        op.add(Builder::clusterName, JsonpDeserializer.stringDeserializer(), "cluster_name");
+        op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(NodeUsage._DESERIALIZER), "nodes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/OpenSearchNodesAsyncClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/OpenSearchNodesAsyncClient.java
index 1f42fcdd0c..8331322406 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/OpenSearchNodesAsyncClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/OpenSearchNodesAsyncClient.java
@@ -32,247 +32,260 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
+import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.TransportOptions;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.io.IOException;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 /**
  * Client for the nodes namespace.
  */
 public class OpenSearchNodesAsyncClient extends ApiClient<OpenSearchTransport, OpenSearchNodesAsyncClient> {
 
-	public OpenSearchNodesAsyncClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchNodesAsyncClient(OpenSearchTransport transport,
-                                      @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchNodesAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchNodesAsyncClient(this.transport, transportOptions);
-	}
-
-	// ----- Endpoint: nodes.hot_threads
-
-	/**
-	 * Returns information about hot threads on each node in the cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<HotThreadsResponse> hotThreads(HotThreadsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<HotThreadsRequest, HotThreadsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<HotThreadsRequest, HotThreadsResponse, ErrorResponse>) HotThreadsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about hot threads on each node in the cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link HotThreadsRequest}
-	 *
-	 */
-
-	public final CompletableFuture<HotThreadsResponse> hotThreads(
-			Function<HotThreadsRequest.Builder, ObjectBuilder<HotThreadsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return hotThreads(fn.apply(new HotThreadsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about hot threads on each node in the cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<HotThreadsResponse> hotThreads() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new HotThreadsRequest.Builder().build(), HotThreadsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: nodes.info
-
-	/**
-	 * Returns information about nodes in the cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<NodesInfoResponse> info(NodesInfoRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<NodesInfoRequest, NodesInfoResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<NodesInfoRequest, NodesInfoResponse, ErrorResponse>) NodesInfoRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about nodes in the cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link NodesInfoRequest}
-	 *
-	 */
-
-	public final CompletableFuture<NodesInfoResponse> info(
-			Function<NodesInfoRequest.Builder, ObjectBuilder<NodesInfoRequest>> fn)
-			throws IOException, OpenSearchException {
-		return info(fn.apply(new NodesInfoRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about nodes in the cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<NodesInfoResponse> info() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new NodesInfoRequest.Builder().build(), NodesInfoRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: nodes.reload_secure_settings
-
-	/**
-	 * Reloads secure settings.
-	 */
-
-	public CompletableFuture<ReloadSecureSettingsResponse> reloadSecureSettings(ReloadSecureSettingsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ReloadSecureSettingsRequest, ReloadSecureSettingsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ReloadSecureSettingsRequest, ReloadSecureSettingsResponse, ErrorResponse>)
-						ReloadSecureSettingsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Reloads secure settings.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ReloadSecureSettingsRequest}
-	 */
-
-	public final CompletableFuture<ReloadSecureSettingsResponse> reloadSecureSettings(
-			Function<ReloadSecureSettingsRequest.Builder, ObjectBuilder<ReloadSecureSettingsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return reloadSecureSettings(fn.apply(new ReloadSecureSettingsRequest.Builder()).build());
-	}
-
-	/**
-	 * Reloads secure settings.
-	 */
-
-	public CompletableFuture<ReloadSecureSettingsResponse> reloadSecureSettings()
-			throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new ReloadSecureSettingsRequest.Builder().build(),
-				ReloadSecureSettingsRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: nodes.stats
-
-	/**
-	 * Returns statistical information about nodes in the cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<NodesStatsResponse> stats(NodesStatsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<NodesStatsRequest, NodesStatsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<NodesStatsRequest, NodesStatsResponse, ErrorResponse>) NodesStatsRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns statistical information about nodes in the cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link NodesStatsRequest}
-	 */
-
-	public final CompletableFuture<NodesStatsResponse> stats(
-			Function<NodesStatsRequest.Builder, ObjectBuilder<NodesStatsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return stats(fn.apply(new NodesStatsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns statistical information about nodes in the cluster.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<NodesStatsResponse> stats() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new NodesStatsRequest.Builder().build(), NodesStatsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: nodes.usage
-
-	/**
-	 * Returns low-level information about REST actions usage on nodes.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<NodesUsageResponse> usage(NodesUsageRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<NodesUsageRequest, NodesUsageResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<NodesUsageRequest, NodesUsageResponse, ErrorResponse>) NodesUsageRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns low-level information about REST actions usage on nodes.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link NodesUsageRequest}
-	 *
-	 */
-
-	public final CompletableFuture<NodesUsageResponse> usage(
-			Function<NodesUsageRequest.Builder, ObjectBuilder<NodesUsageRequest>> fn)
-			throws IOException, OpenSearchException {
-		return usage(fn.apply(new NodesUsageRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns low-level information about REST actions usage on nodes.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<NodesUsageResponse> usage() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new NodesUsageRequest.Builder().build(), NodesUsageRequest._ENDPOINT,
-				this.transportOptions);
-	}
+    public OpenSearchNodesAsyncClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchNodesAsyncClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchNodesAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchNodesAsyncClient(this.transport, transportOptions);
+    }
+
+    // ----- Endpoint: nodes.hot_threads
+
+    /**
+     * Returns information about hot threads on each node in the cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<HotThreadsResponse> hotThreads(HotThreadsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<HotThreadsRequest, HotThreadsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            HotThreadsRequest,
+            HotThreadsResponse,
+            ErrorResponse>) HotThreadsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about hot threads on each node in the cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link HotThreadsRequest}
+     *
+     */
+
+    public final CompletableFuture<HotThreadsResponse> hotThreads(Function<HotThreadsRequest.Builder, ObjectBuilder<HotThreadsRequest>> fn)
+        throws IOException, OpenSearchException {
+        return hotThreads(fn.apply(new HotThreadsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about hot threads on each node in the cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<HotThreadsResponse> hotThreads() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new HotThreadsRequest.Builder().build(),
+            HotThreadsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: nodes.info
+
+    /**
+     * Returns information about nodes in the cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<NodesInfoResponse> info(NodesInfoRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<NodesInfoRequest, NodesInfoResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            NodesInfoRequest,
+            NodesInfoResponse,
+            ErrorResponse>) NodesInfoRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about nodes in the cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link NodesInfoRequest}
+     *
+     */
+
+    public final CompletableFuture<NodesInfoResponse> info(Function<NodesInfoRequest.Builder, ObjectBuilder<NodesInfoRequest>> fn)
+        throws IOException, OpenSearchException {
+        return info(fn.apply(new NodesInfoRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about nodes in the cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<NodesInfoResponse> info() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new NodesInfoRequest.Builder().build(),
+            NodesInfoRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: nodes.reload_secure_settings
+
+    /**
+     * Reloads secure settings.
+     */
+
+    public CompletableFuture<ReloadSecureSettingsResponse> reloadSecureSettings(ReloadSecureSettingsRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ReloadSecureSettingsRequest, ReloadSecureSettingsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ReloadSecureSettingsRequest,
+            ReloadSecureSettingsResponse,
+            ErrorResponse>) ReloadSecureSettingsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Reloads secure settings.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ReloadSecureSettingsRequest}
+     */
+
+    public final CompletableFuture<ReloadSecureSettingsResponse> reloadSecureSettings(
+        Function<ReloadSecureSettingsRequest.Builder, ObjectBuilder<ReloadSecureSettingsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return reloadSecureSettings(fn.apply(new ReloadSecureSettingsRequest.Builder()).build());
+    }
+
+    /**
+     * Reloads secure settings.
+     */
+
+    public CompletableFuture<ReloadSecureSettingsResponse> reloadSecureSettings() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new ReloadSecureSettingsRequest.Builder().build(),
+            ReloadSecureSettingsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: nodes.stats
+
+    /**
+     * Returns statistical information about nodes in the cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<NodesStatsResponse> stats(NodesStatsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<NodesStatsRequest, NodesStatsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            NodesStatsRequest,
+            NodesStatsResponse,
+            ErrorResponse>) NodesStatsRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns statistical information about nodes in the cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link NodesStatsRequest}
+     */
+
+    public final CompletableFuture<NodesStatsResponse> stats(Function<NodesStatsRequest.Builder, ObjectBuilder<NodesStatsRequest>> fn)
+        throws IOException, OpenSearchException {
+        return stats(fn.apply(new NodesStatsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns statistical information about nodes in the cluster.
+     *
+     *
+     */
+
+    public CompletableFuture<NodesStatsResponse> stats() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new NodesStatsRequest.Builder().build(),
+            NodesStatsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: nodes.usage
+
+    /**
+     * Returns low-level information about REST actions usage on nodes.
+     *
+     *
+     */
+
+    public CompletableFuture<NodesUsageResponse> usage(NodesUsageRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<NodesUsageRequest, NodesUsageResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            NodesUsageRequest,
+            NodesUsageResponse,
+            ErrorResponse>) NodesUsageRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns low-level information about REST actions usage on nodes.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link NodesUsageRequest}
+     *
+     */
+
+    public final CompletableFuture<NodesUsageResponse> usage(Function<NodesUsageRequest.Builder, ObjectBuilder<NodesUsageRequest>> fn)
+        throws IOException, OpenSearchException {
+        return usage(fn.apply(new NodesUsageRequest.Builder()).build());
+    }
+
+    /**
+     * Returns low-level information about REST actions usage on nodes.
+     *
+     *
+     */
+
+    public CompletableFuture<NodesUsageResponse> usage() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new NodesUsageRequest.Builder().build(),
+            NodesUsageRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/OpenSearchNodesClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/OpenSearchNodesClient.java
index dfa9cec517..0f605d7c3b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/OpenSearchNodesClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/OpenSearchNodesClient.java
@@ -32,237 +32,243 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import java.io.IOException;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
+import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.TransportOptions;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.io.IOException;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 /**
  * Client for the nodes namespace.
  */
 public class OpenSearchNodesClient extends ApiClient<OpenSearchTransport, OpenSearchNodesClient> {
 
-	public OpenSearchNodesClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchNodesClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchNodesClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchNodesClient(this.transport, transportOptions);
-	}
-
-	// ----- Endpoint: nodes.hot_threads
-
-	/**
-	 * Returns information about hot threads on each node in the cluster.
-	 * 
-	 *
-	 */
-
-	public HotThreadsResponse hotThreads(HotThreadsRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<HotThreadsRequest, HotThreadsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<HotThreadsRequest, HotThreadsResponse, ErrorResponse>) HotThreadsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about hot threads on each node in the cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link HotThreadsRequest}
-	 *
-	 */
-
-	public final HotThreadsResponse hotThreads(Function<HotThreadsRequest.Builder, ObjectBuilder<HotThreadsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return hotThreads(fn.apply(new HotThreadsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about hot threads on each node in the cluster.
-	 * 
-	 *
-	 */
-
-	public HotThreadsResponse hotThreads() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new HotThreadsRequest.Builder().build(), HotThreadsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: nodes.info
-
-	/**
-	 * Returns information about nodes in the cluster.
-	 * 
-	 *
-	 */
-
-	public NodesInfoResponse info(NodesInfoRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<NodesInfoRequest, NodesInfoResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<NodesInfoRequest, NodesInfoResponse, ErrorResponse>) NodesInfoRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about nodes in the cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link NodesInfoRequest}
-	 *
-	 */
-
-	public final NodesInfoResponse info(Function<NodesInfoRequest.Builder, ObjectBuilder<NodesInfoRequest>> fn)
-			throws IOException, OpenSearchException {
-		return info(fn.apply(new NodesInfoRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about nodes in the cluster.
-	 * 
-	 *
-	 */
-
-	public NodesInfoResponse info() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new NodesInfoRequest.Builder().build(), NodesInfoRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: nodes.reload_secure_settings
-
-	/**
-	 * Reloads secure settings.
-	 */
-
-	public ReloadSecureSettingsResponse reloadSecureSettings(ReloadSecureSettingsRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ReloadSecureSettingsRequest, ReloadSecureSettingsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ReloadSecureSettingsRequest, ReloadSecureSettingsResponse, ErrorResponse>)
-						ReloadSecureSettingsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Reloads secure settings.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ReloadSecureSettingsRequest}
-	 */
-
-	public final ReloadSecureSettingsResponse reloadSecureSettings(
-			Function<ReloadSecureSettingsRequest.Builder, ObjectBuilder<ReloadSecureSettingsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return reloadSecureSettings(fn.apply(new ReloadSecureSettingsRequest.Builder()).build());
-	}
-
-	/**
-	 * Reloads secure settings.
-	 */
-
-	public ReloadSecureSettingsResponse reloadSecureSettings() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new ReloadSecureSettingsRequest.Builder().build(),
-				ReloadSecureSettingsRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: nodes.stats
-
-	/**
-	 * Returns statistical information about nodes in the cluster.
-	 * 
-	 *
-	 */
-
-	public NodesStatsResponse stats(NodesStatsRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<NodesStatsRequest, NodesStatsResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<NodesStatsRequest, NodesStatsResponse, ErrorResponse>) NodesStatsRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns statistical information about nodes in the cluster.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link NodesStatsRequest}
-	 *
-	 */
-
-	public final NodesStatsResponse stats(Function<NodesStatsRequest.Builder, ObjectBuilder<NodesStatsRequest>> fn)
-			throws IOException, OpenSearchException {
-		return stats(fn.apply(new NodesStatsRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns statistical information about nodes in the cluster.
-	 * 
-	 *
-	 */
-
-	public NodesStatsResponse stats() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new NodesStatsRequest.Builder().build(), NodesStatsRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: nodes.usage
-
-	/**
-	 * Returns low-level information about REST actions usage on nodes.
-	 * 
-	 *
-	 */
-
-	public NodesUsageResponse usage(NodesUsageRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<NodesUsageRequest, NodesUsageResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<NodesUsageRequest, NodesUsageResponse, ErrorResponse>) NodesUsageRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns low-level information about REST actions usage on nodes.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link NodesUsageRequest}
-	 *
-	 */
-
-	public final NodesUsageResponse usage(Function<NodesUsageRequest.Builder, ObjectBuilder<NodesUsageRequest>> fn)
-			throws IOException, OpenSearchException {
-		return usage(fn.apply(new NodesUsageRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns low-level information about REST actions usage on nodes.
-	 * 
-	 *
-	 */
-
-	public NodesUsageResponse usage() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new NodesUsageRequest.Builder().build(), NodesUsageRequest._ENDPOINT,
-				this.transportOptions);
-	}
+    public OpenSearchNodesClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchNodesClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchNodesClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchNodesClient(this.transport, transportOptions);
+    }
+
+    // ----- Endpoint: nodes.hot_threads
+
+    /**
+     * Returns information about hot threads on each node in the cluster.
+     *
+     *
+     */
+
+    public HotThreadsResponse hotThreads(HotThreadsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<HotThreadsRequest, HotThreadsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            HotThreadsRequest,
+            HotThreadsResponse,
+            ErrorResponse>) HotThreadsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about hot threads on each node in the cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link HotThreadsRequest}
+     *
+     */
+
+    public final HotThreadsResponse hotThreads(Function<HotThreadsRequest.Builder, ObjectBuilder<HotThreadsRequest>> fn) throws IOException,
+        OpenSearchException {
+        return hotThreads(fn.apply(new HotThreadsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about hot threads on each node in the cluster.
+     *
+     *
+     */
+
+    public HotThreadsResponse hotThreads() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new HotThreadsRequest.Builder().build(), HotThreadsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: nodes.info
+
+    /**
+     * Returns information about nodes in the cluster.
+     *
+     *
+     */
+
+    public NodesInfoResponse info(NodesInfoRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<NodesInfoRequest, NodesInfoResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            NodesInfoRequest,
+            NodesInfoResponse,
+            ErrorResponse>) NodesInfoRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about nodes in the cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link NodesInfoRequest}
+     *
+     */
+
+    public final NodesInfoResponse info(Function<NodesInfoRequest.Builder, ObjectBuilder<NodesInfoRequest>> fn) throws IOException,
+        OpenSearchException {
+        return info(fn.apply(new NodesInfoRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about nodes in the cluster.
+     *
+     *
+     */
+
+    public NodesInfoResponse info() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new NodesInfoRequest.Builder().build(), NodesInfoRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: nodes.reload_secure_settings
+
+    /**
+     * Reloads secure settings.
+     */
+
+    public ReloadSecureSettingsResponse reloadSecureSettings(ReloadSecureSettingsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ReloadSecureSettingsRequest, ReloadSecureSettingsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ReloadSecureSettingsRequest,
+            ReloadSecureSettingsResponse,
+            ErrorResponse>) ReloadSecureSettingsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Reloads secure settings.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ReloadSecureSettingsRequest}
+     */
+
+    public final ReloadSecureSettingsResponse reloadSecureSettings(
+        Function<ReloadSecureSettingsRequest.Builder, ObjectBuilder<ReloadSecureSettingsRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return reloadSecureSettings(fn.apply(new ReloadSecureSettingsRequest.Builder()).build());
+    }
+
+    /**
+     * Reloads secure settings.
+     */
+
+    public ReloadSecureSettingsResponse reloadSecureSettings() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new ReloadSecureSettingsRequest.Builder().build(),
+            ReloadSecureSettingsRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: nodes.stats
+
+    /**
+     * Returns statistical information about nodes in the cluster.
+     *
+     *
+     */
+
+    public NodesStatsResponse stats(NodesStatsRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<NodesStatsRequest, NodesStatsResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            NodesStatsRequest,
+            NodesStatsResponse,
+            ErrorResponse>) NodesStatsRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns statistical information about nodes in the cluster.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link NodesStatsRequest}
+     *
+     */
+
+    public final NodesStatsResponse stats(Function<NodesStatsRequest.Builder, ObjectBuilder<NodesStatsRequest>> fn) throws IOException,
+        OpenSearchException {
+        return stats(fn.apply(new NodesStatsRequest.Builder()).build());
+    }
+
+    /**
+     * Returns statistical information about nodes in the cluster.
+     *
+     *
+     */
+
+    public NodesStatsResponse stats() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new NodesStatsRequest.Builder().build(), NodesStatsRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: nodes.usage
+
+    /**
+     * Returns low-level information about REST actions usage on nodes.
+     *
+     *
+     */
+
+    public NodesUsageResponse usage(NodesUsageRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<NodesUsageRequest, NodesUsageResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            NodesUsageRequest,
+            NodesUsageResponse,
+            ErrorResponse>) NodesUsageRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns low-level information about REST actions usage on nodes.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link NodesUsageRequest}
+     *
+     */
+
+    public final NodesUsageResponse usage(Function<NodesUsageRequest.Builder, ObjectBuilder<NodesUsageRequest>> fn) throws IOException,
+        OpenSearchException {
+        return usage(fn.apply(new NodesUsageRequest.Builder()).build());
+    }
+
+    /**
+     * Returns low-level information about REST actions usage on nodes.
+     *
+     *
+     */
+
+    public NodesUsageResponse usage() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new NodesUsageRequest.Builder().build(), NodesUsageRequest._ENDPOINT, this.transportOptions);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/OperatingSystem.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/OperatingSystem.java
index c7cfa486bc..c8e60e5c24 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/OperatingSystem.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/OperatingSystem.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,186 +43,185 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes._types.OperatingSystem
 
-
 @JsonpDeserializable
 public class OperatingSystem implements JsonpSerializable {
-	private final Cpu cpu;
+    private final Cpu cpu;
 
-	private final ExtendedMemoryStats mem;
+    private final ExtendedMemoryStats mem;
 
-	private final MemoryStats swap;
+    private final MemoryStats swap;
 
-	private final long timestamp;
+    private final long timestamp;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private OperatingSystem(Builder builder) {
+    private OperatingSystem(Builder builder) {
 
-		this.cpu = ApiTypeHelper.requireNonNull(builder.cpu, this, "cpu");
-		this.mem = ApiTypeHelper.requireNonNull(builder.mem, this, "mem");
-		this.swap = ApiTypeHelper.requireNonNull(builder.swap, this, "swap");
-		this.timestamp = ApiTypeHelper.requireNonNull(builder.timestamp, this, "timestamp");
+        this.cpu = ApiTypeHelper.requireNonNull(builder.cpu, this, "cpu");
+        this.mem = ApiTypeHelper.requireNonNull(builder.mem, this, "mem");
+        this.swap = ApiTypeHelper.requireNonNull(builder.swap, this, "swap");
+        this.timestamp = ApiTypeHelper.requireNonNull(builder.timestamp, this, "timestamp");
 
-	}
+    }
 
-	public static OperatingSystem of(Function<Builder, ObjectBuilder<OperatingSystem>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static OperatingSystem of(Function<Builder, ObjectBuilder<OperatingSystem>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code cpu}
-	 */
-	public final Cpu cpu() {
-		return this.cpu;
-	}
-
-	/**
-	 * Required - API name: {@code mem}
-	 */
-	public final ExtendedMemoryStats mem() {
-		return this.mem;
-	}
-
-	/**
-	 * Required - API name: {@code swap}
-	 */
-	public final MemoryStats swap() {
-		return this.swap;
-	}
-
-	/**
-	 * Required - API name: {@code timestamp}
-	 */
-	public final long timestamp() {
-		return this.timestamp;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("cpu");
-		this.cpu.serialize(generator, mapper);
-
-		generator.writeKey("mem");
-		this.mem.serialize(generator, mapper);
-
-		generator.writeKey("swap");
-		this.swap.serialize(generator, mapper);
-
-		generator.writeKey("timestamp");
-		generator.write(this.timestamp);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link OperatingSystem}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<OperatingSystem> {
-		private Cpu cpu;
-
-		private ExtendedMemoryStats mem;
-
-		private MemoryStats swap;
-
-		private Long timestamp;
-
-		/**
-		 * Required - API name: {@code cpu}
-		 */
-		public final Builder cpu(Cpu value) {
-			this.cpu = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code cpu}
-		 */
-		public final Builder cpu(Function<Cpu.Builder, ObjectBuilder<Cpu>> fn) {
-			return this.cpu(fn.apply(new Cpu.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code mem}
-		 */
-		public final Builder mem(ExtendedMemoryStats value) {
-			this.mem = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mem}
-		 */
-		public final Builder mem(Function<ExtendedMemoryStats.Builder, ObjectBuilder<ExtendedMemoryStats>> fn) {
-			return this.mem(fn.apply(new ExtendedMemoryStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code swap}
-		 */
-		public final Builder swap(MemoryStats value) {
-			this.swap = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code swap}
-		 */
-		public final Builder swap(Function<MemoryStats.Builder, ObjectBuilder<MemoryStats>> fn) {
-			return this.swap(fn.apply(new MemoryStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code timestamp}
-		 */
-		public final Builder timestamp(long value) {
-			this.timestamp = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link OperatingSystem}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public OperatingSystem build() {
-			_checkSingleUse();
-
-			return new OperatingSystem(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link OperatingSystem}
-	 */
-	public static final JsonpDeserializer<OperatingSystem> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			OperatingSystem::setupOperatingSystemDeserializer);
-
-	protected static void setupOperatingSystemDeserializer(ObjectDeserializer<OperatingSystem.Builder> op) {
-
-		op.add(Builder::cpu, Cpu._DESERIALIZER, "cpu");
-		op.add(Builder::mem, ExtendedMemoryStats._DESERIALIZER, "mem");
-		op.add(Builder::swap, MemoryStats._DESERIALIZER, "swap");
-		op.add(Builder::timestamp, JsonpDeserializer.longDeserializer(), "timestamp");
-
-	}
+    /**
+     * Required - API name: {@code cpu}
+     */
+    public final Cpu cpu() {
+        return this.cpu;
+    }
+
+    /**
+     * Required - API name: {@code mem}
+     */
+    public final ExtendedMemoryStats mem() {
+        return this.mem;
+    }
+
+    /**
+     * Required - API name: {@code swap}
+     */
+    public final MemoryStats swap() {
+        return this.swap;
+    }
+
+    /**
+     * Required - API name: {@code timestamp}
+     */
+    public final long timestamp() {
+        return this.timestamp;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("cpu");
+        this.cpu.serialize(generator, mapper);
+
+        generator.writeKey("mem");
+        this.mem.serialize(generator, mapper);
+
+        generator.writeKey("swap");
+        this.swap.serialize(generator, mapper);
+
+        generator.writeKey("timestamp");
+        generator.write(this.timestamp);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link OperatingSystem}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<OperatingSystem> {
+        private Cpu cpu;
+
+        private ExtendedMemoryStats mem;
+
+        private MemoryStats swap;
+
+        private Long timestamp;
+
+        /**
+         * Required - API name: {@code cpu}
+         */
+        public final Builder cpu(Cpu value) {
+            this.cpu = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code cpu}
+         */
+        public final Builder cpu(Function<Cpu.Builder, ObjectBuilder<Cpu>> fn) {
+            return this.cpu(fn.apply(new Cpu.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code mem}
+         */
+        public final Builder mem(ExtendedMemoryStats value) {
+            this.mem = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mem}
+         */
+        public final Builder mem(Function<ExtendedMemoryStats.Builder, ObjectBuilder<ExtendedMemoryStats>> fn) {
+            return this.mem(fn.apply(new ExtendedMemoryStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code swap}
+         */
+        public final Builder swap(MemoryStats value) {
+            this.swap = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code swap}
+         */
+        public final Builder swap(Function<MemoryStats.Builder, ObjectBuilder<MemoryStats>> fn) {
+            return this.swap(fn.apply(new MemoryStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code timestamp}
+         */
+        public final Builder timestamp(long value) {
+            this.timestamp = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link OperatingSystem}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public OperatingSystem build() {
+            _checkSingleUse();
+
+            return new OperatingSystem(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link OperatingSystem}
+     */
+    public static final JsonpDeserializer<OperatingSystem> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        OperatingSystem::setupOperatingSystemDeserializer
+    );
+
+    protected static void setupOperatingSystemDeserializer(ObjectDeserializer<OperatingSystem.Builder> op) {
+
+        op.add(Builder::cpu, Cpu._DESERIALIZER, "cpu");
+        op.add(Builder::mem, ExtendedMemoryStats._DESERIALIZER, "mem");
+        op.add(Builder::swap, MemoryStats._DESERIALIZER, "swap");
+        op.add(Builder::timestamp, JsonpDeserializer.longDeserializer(), "timestamp");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Process.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Process.java
index 0d82ff06e5..b581a1ad98 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Process.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Process.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,180 +43,178 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes._types.Process
 
-
 @JsonpDeserializable
 public class Process implements JsonpSerializable {
-	private final Cpu cpu;
+    private final Cpu cpu;
+
+    private final MemoryStats mem;
+
+    private final int openFileDescriptors;
 
-	private final MemoryStats mem;
+    private final long timestamp;
 
-	private final int openFileDescriptors;
+    // ---------------------------------------------------------------------------------------------
 
-	private final long timestamp;
+    private Process(Builder builder) {
 
-	// ---------------------------------------------------------------------------------------------
+        this.cpu = ApiTypeHelper.requireNonNull(builder.cpu, this, "cpu");
+        this.mem = ApiTypeHelper.requireNonNull(builder.mem, this, "mem");
+        this.openFileDescriptors = ApiTypeHelper.requireNonNull(builder.openFileDescriptors, this, "openFileDescriptors");
+        this.timestamp = ApiTypeHelper.requireNonNull(builder.timestamp, this, "timestamp");
 
-	private Process(Builder builder) {
+    }
 
-		this.cpu = ApiTypeHelper.requireNonNull(builder.cpu, this, "cpu");
-		this.mem = ApiTypeHelper.requireNonNull(builder.mem, this, "mem");
-		this.openFileDescriptors = ApiTypeHelper.requireNonNull(builder.openFileDescriptors, this,
-				"openFileDescriptors");
-		this.timestamp = ApiTypeHelper.requireNonNull(builder.timestamp, this, "timestamp");
+    public static Process of(Function<Builder, ObjectBuilder<Process>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	}
-
-	public static Process of(Function<Builder, ObjectBuilder<Process>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code cpu}
-	 */
-	public final Cpu cpu() {
-		return this.cpu;
-	}
-
-	/**
-	 * Required - API name: {@code mem}
-	 */
-	public final MemoryStats mem() {
-		return this.mem;
-	}
-
-	/**
-	 * Required - API name: {@code open_file_descriptors}
-	 */
-	public final int openFileDescriptors() {
-		return this.openFileDescriptors;
-	}
-
-	/**
-	 * Required - API name: {@code timestamp}
-	 */
-	public final long timestamp() {
-		return this.timestamp;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("cpu");
-		this.cpu.serialize(generator, mapper);
-
-		generator.writeKey("mem");
-		this.mem.serialize(generator, mapper);
-
-		generator.writeKey("open_file_descriptors");
-		generator.write(this.openFileDescriptors);
-
-		generator.writeKey("timestamp");
-		generator.write(this.timestamp);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Process}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Process> {
-		private Cpu cpu;
-
-		private MemoryStats mem;
-
-		private Integer openFileDescriptors;
-
-		private Long timestamp;
-
-		/**
-		 * Required - API name: {@code cpu}
-		 */
-		public final Builder cpu(Cpu value) {
-			this.cpu = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code cpu}
-		 */
-		public final Builder cpu(Function<Cpu.Builder, ObjectBuilder<Cpu>> fn) {
-			return this.cpu(fn.apply(new Cpu.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code mem}
-		 */
-		public final Builder mem(MemoryStats value) {
-			this.mem = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mem}
-		 */
-		public final Builder mem(Function<MemoryStats.Builder, ObjectBuilder<MemoryStats>> fn) {
-			return this.mem(fn.apply(new MemoryStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code open_file_descriptors}
-		 */
-		public final Builder openFileDescriptors(int value) {
-			this.openFileDescriptors = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code timestamp}
-		 */
-		public final Builder timestamp(long value) {
-			this.timestamp = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Process}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Process build() {
-			_checkSingleUse();
-
-			return new Process(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Process}
-	 */
-	public static final JsonpDeserializer<Process> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Process::setupProcessDeserializer);
-
-	protected static void setupProcessDeserializer(ObjectDeserializer<Process.Builder> op) {
-
-		op.add(Builder::cpu, Cpu._DESERIALIZER, "cpu");
-		op.add(Builder::mem, MemoryStats._DESERIALIZER, "mem");
-		op.add(Builder::openFileDescriptors, JsonpDeserializer.integerDeserializer(), "open_file_descriptors");
-		op.add(Builder::timestamp, JsonpDeserializer.longDeserializer(), "timestamp");
-
-	}
+    /**
+     * Required - API name: {@code cpu}
+     */
+    public final Cpu cpu() {
+        return this.cpu;
+    }
+
+    /**
+     * Required - API name: {@code mem}
+     */
+    public final MemoryStats mem() {
+        return this.mem;
+    }
+
+    /**
+     * Required - API name: {@code open_file_descriptors}
+     */
+    public final int openFileDescriptors() {
+        return this.openFileDescriptors;
+    }
+
+    /**
+     * Required - API name: {@code timestamp}
+     */
+    public final long timestamp() {
+        return this.timestamp;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("cpu");
+        this.cpu.serialize(generator, mapper);
+
+        generator.writeKey("mem");
+        this.mem.serialize(generator, mapper);
+
+        generator.writeKey("open_file_descriptors");
+        generator.write(this.openFileDescriptors);
+
+        generator.writeKey("timestamp");
+        generator.write(this.timestamp);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Process}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Process> {
+        private Cpu cpu;
+
+        private MemoryStats mem;
+
+        private Integer openFileDescriptors;
+
+        private Long timestamp;
+
+        /**
+         * Required - API name: {@code cpu}
+         */
+        public final Builder cpu(Cpu value) {
+            this.cpu = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code cpu}
+         */
+        public final Builder cpu(Function<Cpu.Builder, ObjectBuilder<Cpu>> fn) {
+            return this.cpu(fn.apply(new Cpu.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code mem}
+         */
+        public final Builder mem(MemoryStats value) {
+            this.mem = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mem}
+         */
+        public final Builder mem(Function<MemoryStats.Builder, ObjectBuilder<MemoryStats>> fn) {
+            return this.mem(fn.apply(new MemoryStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code open_file_descriptors}
+         */
+        public final Builder openFileDescriptors(int value) {
+            this.openFileDescriptors = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code timestamp}
+         */
+        public final Builder timestamp(long value) {
+            this.timestamp = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Process}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Process build() {
+            _checkSingleUse();
+
+            return new Process(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Process}
+     */
+    public static final JsonpDeserializer<Process> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Process::setupProcessDeserializer
+    );
+
+    protected static void setupProcessDeserializer(ObjectDeserializer<Process.Builder> op) {
+
+        op.add(Builder::cpu, Cpu._DESERIALIZER, "cpu");
+        op.add(Builder::mem, MemoryStats._DESERIALIZER, "mem");
+        op.add(Builder::openFileDescriptors, JsonpDeserializer.integerDeserializer(), "open_file_descriptors");
+        op.add(Builder::timestamp, JsonpDeserializer.longDeserializer(), "timestamp");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/ReloadSecureSettingsRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/ReloadSecureSettingsRequest.java
index c453dc527a..be72231e39 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/ReloadSecureSettingsRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/ReloadSecureSettingsRequest.java
@@ -32,28 +32,27 @@
 
 package org.opensearch.client.opensearch.nodes;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+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.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 // typedef: nodes.reload_secure_settings.Request
 
@@ -62,221 +61,223 @@
  */
 @JsonpDeserializable
 public class ReloadSecureSettingsRequest extends RequestBase implements JsonpSerializable {
-	private final List<String> nodeId;
-
-	@Nullable
-	private final String secureSettingsPassword;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ReloadSecureSettingsRequest(Builder builder) {
-
-		this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
-		this.secureSettingsPassword = builder.secureSettingsPassword;
-		this.timeout = builder.timeout;
-
-	}
-
-	public static ReloadSecureSettingsRequest of(Function<Builder, ObjectBuilder<ReloadSecureSettingsRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * A comma-separated list of node IDs to span the reload/reinit call. Should
-	 * stay empty because reloading usually involves all cluster nodes.
-	 * <p>
-	 * API name: {@code node_id}
-	 */
-	public final List<String> nodeId() {
-		return this.nodeId;
-	}
-
-	/**
-	 * API name: {@code secure_settings_password}
-	 */
-	@Nullable
-	public final String secureSettingsPassword() {
-		return this.secureSettingsPassword;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.secureSettingsPassword != null) {
-			generator.writeKey("secure_settings_password");
-			generator.write(this.secureSettingsPassword);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ReloadSecureSettingsRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ReloadSecureSettingsRequest> {
-		@Nullable
-		private List<String> nodeId;
-
-		@Nullable
-		private String secureSettingsPassword;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * A comma-separated list of node IDs to span the reload/reinit call. Should
-		 * stay empty because reloading usually involves all cluster nodes.
-		 * <p>
-		 * API name: {@code node_id}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>nodeId</code>.
-		 */
-		public final Builder nodeId(List<String> list) {
-			this.nodeId = _listAddAll(this.nodeId, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of node IDs to span the reload/reinit call. Should
-		 * stay empty because reloading usually involves all cluster nodes.
-		 * <p>
-		 * API name: {@code node_id}
-		 * <p>
-		 * Adds one or more values to <code>nodeId</code>.
-		 */
-		public final Builder nodeId(String value, String... values) {
-			this.nodeId = _listAdd(this.nodeId, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code secure_settings_password}
-		 */
-		public final Builder secureSettingsPassword(@Nullable String value) {
-			this.secureSettingsPassword = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link ReloadSecureSettingsRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ReloadSecureSettingsRequest build() {
-			_checkSingleUse();
-
-			return new ReloadSecureSettingsRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ReloadSecureSettingsRequest}
-	 */
-	public static final JsonpDeserializer<ReloadSecureSettingsRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ReloadSecureSettingsRequest::setupReloadSecureSettingsRequestDeserializer);
-
-	protected static void setupReloadSecureSettingsRequestDeserializer(
-			ObjectDeserializer<ReloadSecureSettingsRequest.Builder> op) {
-
-		op.add(Builder::secureSettingsPassword, JsonpDeserializer.stringDeserializer(), "secure_settings_password");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code nodes.reload_secure_settings}".
-	 */
-	public static final Endpoint<ReloadSecureSettingsRequest, ReloadSecureSettingsResponse, ErrorResponse> _ENDPOINT =
-			new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _nodeId = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.nodeId()))
-					propsSet |= _nodeId;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_nodes");
-					buf.append("/reload_secure_settings");
-					return buf.toString();
-				}
-				if (propsSet == (_nodeId)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_nodes");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					buf.append("/reload_secure_settings");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, ReloadSecureSettingsResponse._DESERIALIZER);
+    private final List<String> nodeId;
+
+    @Nullable
+    private final String secureSettingsPassword;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ReloadSecureSettingsRequest(Builder builder) {
+
+        this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
+        this.secureSettingsPassword = builder.secureSettingsPassword;
+        this.timeout = builder.timeout;
+
+    }
+
+    public static ReloadSecureSettingsRequest of(Function<Builder, ObjectBuilder<ReloadSecureSettingsRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * A comma-separated list of node IDs to span the reload/reinit call. Should
+     * stay empty because reloading usually involves all cluster nodes.
+     * <p>
+     * API name: {@code node_id}
+     */
+    public final List<String> nodeId() {
+        return this.nodeId;
+    }
+
+    /**
+     * API name: {@code secure_settings_password}
+     */
+    @Nullable
+    public final String secureSettingsPassword() {
+        return this.secureSettingsPassword;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.secureSettingsPassword != null) {
+            generator.writeKey("secure_settings_password");
+            generator.write(this.secureSettingsPassword);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ReloadSecureSettingsRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ReloadSecureSettingsRequest> {
+        @Nullable
+        private List<String> nodeId;
+
+        @Nullable
+        private String secureSettingsPassword;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * A comma-separated list of node IDs to span the reload/reinit call. Should
+         * stay empty because reloading usually involves all cluster nodes.
+         * <p>
+         * API name: {@code node_id}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>nodeId</code>.
+         */
+        public final Builder nodeId(List<String> list) {
+            this.nodeId = _listAddAll(this.nodeId, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of node IDs to span the reload/reinit call. Should
+         * stay empty because reloading usually involves all cluster nodes.
+         * <p>
+         * API name: {@code node_id}
+         * <p>
+         * Adds one or more values to <code>nodeId</code>.
+         */
+        public final Builder nodeId(String value, String... values) {
+            this.nodeId = _listAdd(this.nodeId, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code secure_settings_password}
+         */
+        public final Builder secureSettingsPassword(@Nullable String value) {
+            this.secureSettingsPassword = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link ReloadSecureSettingsRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ReloadSecureSettingsRequest build() {
+            _checkSingleUse();
+
+            return new ReloadSecureSettingsRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ReloadSecureSettingsRequest}
+     */
+    public static final JsonpDeserializer<ReloadSecureSettingsRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ReloadSecureSettingsRequest::setupReloadSecureSettingsRequestDeserializer
+    );
+
+    protected static void setupReloadSecureSettingsRequestDeserializer(ObjectDeserializer<ReloadSecureSettingsRequest.Builder> op) {
+
+        op.add(Builder::secureSettingsPassword, JsonpDeserializer.stringDeserializer(), "secure_settings_password");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code nodes.reload_secure_settings}".
+     */
+    public static final Endpoint<ReloadSecureSettingsRequest, ReloadSecureSettingsResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _nodeId = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.nodeId())) propsSet |= _nodeId;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_nodes");
+                buf.append("/reload_secure_settings");
+                return buf.toString();
+            }
+            if (propsSet == (_nodeId)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_nodes");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/reload_secure_settings");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        ReloadSecureSettingsResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/ReloadSecureSettingsResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/ReloadSecureSettingsResponse.java
index 8d1dcebc9a..31fd6f5640 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/ReloadSecureSettingsResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/ReloadSecureSettingsResponse.java
@@ -32,157 +32,155 @@
 
 package org.opensearch.client.opensearch.nodes;
 
-import org.opensearch.client.opensearch.nodes.reload_secure_settings.NodeReloadResult;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.nodes.reload_secure_settings.NodeReloadResult;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: nodes.reload_secure_settings.Response
 
 @JsonpDeserializable
 public class ReloadSecureSettingsResponse extends NodesResponseBase {
-	private final String clusterName;
-
-	private final Map<String, NodeReloadResult> nodes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ReloadSecureSettingsResponse(Builder builder) {
-		super(builder);
-
-		this.clusterName = ApiTypeHelper.requireNonNull(builder.clusterName, this, "clusterName");
-		this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
-
-	}
-
-	public static ReloadSecureSettingsResponse of(Function<Builder, ObjectBuilder<ReloadSecureSettingsResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code cluster_name}
-	 */
-	public final String clusterName() {
-		return this.clusterName;
-	}
-
-	/**
-	 * Required - API name: {@code nodes}
-	 */
-	public final Map<String, NodeReloadResult> nodes() {
-		return this.nodes;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		generator.writeKey("cluster_name");
-		generator.write(this.clusterName);
-
-		if (ApiTypeHelper.isDefined(this.nodes)) {
-			generator.writeKey("nodes");
-			generator.writeStartObject();
-			for (Map.Entry<String, NodeReloadResult> item0 : this.nodes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ReloadSecureSettingsResponse}.
-	 */
-
-	public static class Builder extends NodesResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<ReloadSecureSettingsResponse> {
-		private String clusterName;
-
-		private Map<String, NodeReloadResult> nodes;
-
-		/**
-		 * Required - API name: {@code cluster_name}
-		 */
-		public final Builder clusterName(String value) {
-			this.clusterName = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>nodes</code>.
-		 */
-		public final Builder nodes(Map<String, NodeReloadResult> map) {
-			this.nodes = _mapPutAll(this.nodes, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code>.
-		 */
-		public final Builder nodes(String key, NodeReloadResult value) {
-			this.nodes = _mapPut(this.nodes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code> using a builder lambda.
-		 */
-		public final Builder nodes(String key, Function<NodeReloadResult.Builder, ObjectBuilder<NodeReloadResult>> fn) {
-			return nodes(key, fn.apply(new NodeReloadResult.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ReloadSecureSettingsResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ReloadSecureSettingsResponse build() {
-			_checkSingleUse();
-
-			return new ReloadSecureSettingsResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ReloadSecureSettingsResponse}
-	 */
-	public static final JsonpDeserializer<ReloadSecureSettingsResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ReloadSecureSettingsResponse::setupReloadSecureSettingsResponseDeserializer);
-
-	protected static void setupReloadSecureSettingsResponseDeserializer(
-			ObjectDeserializer<ReloadSecureSettingsResponse.Builder> op) {
-		setupNodesResponseBaseDeserializer(op);
-		op.add(Builder::clusterName, JsonpDeserializer.stringDeserializer(), "cluster_name");
-		op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(NodeReloadResult._DESERIALIZER), "nodes");
-
-	}
+    private final String clusterName;
+
+    private final Map<String, NodeReloadResult> nodes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ReloadSecureSettingsResponse(Builder builder) {
+        super(builder);
+
+        this.clusterName = ApiTypeHelper.requireNonNull(builder.clusterName, this, "clusterName");
+        this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
+
+    }
+
+    public static ReloadSecureSettingsResponse of(Function<Builder, ObjectBuilder<ReloadSecureSettingsResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code cluster_name}
+     */
+    public final String clusterName() {
+        return this.clusterName;
+    }
+
+    /**
+     * Required - API name: {@code nodes}
+     */
+    public final Map<String, NodeReloadResult> nodes() {
+        return this.nodes;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        generator.writeKey("cluster_name");
+        generator.write(this.clusterName);
+
+        if (ApiTypeHelper.isDefined(this.nodes)) {
+            generator.writeKey("nodes");
+            generator.writeStartObject();
+            for (Map.Entry<String, NodeReloadResult> item0 : this.nodes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ReloadSecureSettingsResponse}.
+     */
+
+    public static class Builder extends NodesResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<ReloadSecureSettingsResponse> {
+        private String clusterName;
+
+        private Map<String, NodeReloadResult> nodes;
+
+        /**
+         * Required - API name: {@code cluster_name}
+         */
+        public final Builder clusterName(String value) {
+            this.clusterName = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>nodes</code>.
+         */
+        public final Builder nodes(Map<String, NodeReloadResult> map) {
+            this.nodes = _mapPutAll(this.nodes, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code>.
+         */
+        public final Builder nodes(String key, NodeReloadResult value) {
+            this.nodes = _mapPut(this.nodes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code> using a builder lambda.
+         */
+        public final Builder nodes(String key, Function<NodeReloadResult.Builder, ObjectBuilder<NodeReloadResult>> fn) {
+            return nodes(key, fn.apply(new NodeReloadResult.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ReloadSecureSettingsResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ReloadSecureSettingsResponse build() {
+            _checkSingleUse();
+
+            return new ReloadSecureSettingsResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ReloadSecureSettingsResponse}
+     */
+    public static final JsonpDeserializer<ReloadSecureSettingsResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ReloadSecureSettingsResponse::setupReloadSecureSettingsResponseDeserializer
+    );
+
+    protected static void setupReloadSecureSettingsResponseDeserializer(ObjectDeserializer<ReloadSecureSettingsResponse.Builder> op) {
+        setupNodesResponseBaseDeserializer(op);
+        op.add(Builder::clusterName, JsonpDeserializer.stringDeserializer(), "cluster_name");
+        op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(NodeReloadResult._DESERIALIZER), "nodes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Scripting.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Scripting.java
index b0a1d6ec1c..9fb8d57ece 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Scripting.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Scripting.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,117 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes._types.Scripting
 
-
 @JsonpDeserializable
 public class Scripting implements JsonpSerializable {
-	private final long cacheEvictions;
-
-	private final long compilations;
-
-	// ---------------------------------------------------------------------------------------------
+    private final long cacheEvictions;
 
-	private Scripting(Builder builder) {
+    private final long compilations;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.cacheEvictions = ApiTypeHelper.requireNonNull(builder.cacheEvictions, this, "cacheEvictions");
-		this.compilations = ApiTypeHelper.requireNonNull(builder.compilations, this, "compilations");
+    private Scripting(Builder builder) {
 
-	}
+        this.cacheEvictions = ApiTypeHelper.requireNonNull(builder.cacheEvictions, this, "cacheEvictions");
+        this.compilations = ApiTypeHelper.requireNonNull(builder.compilations, this, "compilations");
 
-	public static Scripting of(Function<Builder, ObjectBuilder<Scripting>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code cache_evictions}
-	 */
-	public final long cacheEvictions() {
-		return this.cacheEvictions;
-	}
+    public static Scripting of(Function<Builder, ObjectBuilder<Scripting>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code compilations}
-	 */
-	public final long compilations() {
-		return this.compilations;
-	}
+    /**
+     * Required - API name: {@code cache_evictions}
+     */
+    public final long cacheEvictions() {
+        return this.cacheEvictions;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code compilations}
+     */
+    public final long compilations() {
+        return this.compilations;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("cache_evictions");
-		generator.write(this.cacheEvictions);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("compilations");
-		generator.write(this.compilations);
+        generator.writeKey("cache_evictions");
+        generator.write(this.cacheEvictions);
 
-	}
+        generator.writeKey("compilations");
+        generator.write(this.compilations);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link Scripting}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Scripting> {
-		private Long cacheEvictions;
+    /**
+     * Builder for {@link Scripting}.
+     */
 
-		private Long compilations;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Scripting> {
+        private Long cacheEvictions;
 
-		/**
-		 * Required - API name: {@code cache_evictions}
-		 */
-		public final Builder cacheEvictions(long value) {
-			this.cacheEvictions = value;
-			return this;
-		}
+        private Long compilations;
 
-		/**
-		 * Required - API name: {@code compilations}
-		 */
-		public final Builder compilations(long value) {
-			this.compilations = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code cache_evictions}
+         */
+        public final Builder cacheEvictions(long value) {
+            this.cacheEvictions = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link Scripting}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Scripting build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code compilations}
+         */
+        public final Builder compilations(long value) {
+            this.compilations = value;
+            return this;
+        }
 
-			return new Scripting(this);
-		}
-	}
+        /**
+         * Builds a {@link Scripting}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Scripting build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new Scripting(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link Scripting}
-	 */
-	public static final JsonpDeserializer<Scripting> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Scripting::setupScriptingDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupScriptingDeserializer(ObjectDeserializer<Scripting.Builder> op) {
+    /**
+     * Json deserializer for {@link Scripting}
+     */
+    public static final JsonpDeserializer<Scripting> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Scripting::setupScriptingDeserializer
+    );
 
-		op.add(Builder::cacheEvictions, JsonpDeserializer.longDeserializer(), "cache_evictions");
-		op.add(Builder::compilations, JsonpDeserializer.longDeserializer(), "compilations");
+    protected static void setupScriptingDeserializer(ObjectDeserializer<Scripting.Builder> op) {
 
-	}
+        op.add(Builder::cacheEvictions, JsonpDeserializer.longDeserializer(), "cache_evictions");
+        op.add(Builder::compilations, JsonpDeserializer.longDeserializer(), "compilations");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Stats.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Stats.java
index 70abe80619..36369fbe2c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Stats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Stats.java
@@ -32,754 +32,750 @@
 
 package org.opensearch.client.opensearch.nodes;
 
-import org.opensearch.client.opensearch._types.NodeRole;
-import org.opensearch.client.opensearch.indices.stats.IndexStats;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.NodeRole;
+import org.opensearch.client.opensearch.indices.stats.IndexStats;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
-import javax.annotation.Nullable;
 
 // typedef: nodes._types.Stats
 
 @JsonpDeserializable
 public class Stats implements JsonpSerializable {
-	private final Map<String, AdaptiveSelection> adaptiveSelection;
+    private final Map<String, AdaptiveSelection> adaptiveSelection;
+
+    private final Map<String, Breaker> breakers;
+
+    private final FileSystem fs;
 
-	private final Map<String, Breaker> breakers;
+    private final String host;
 
-	private final FileSystem fs;
+    private final Http http;
 
-	private final String host;
+    private final IndexStats indices;
 
-	private final Http http;
+    private final Ingest ingest;
 
-	private final IndexStats indices;
+    private final List<String> ip;
 
-	private final Ingest ingest;
+    private final Jvm jvm;
 
-	private final List<String> ip;
+    private final String name;
 
-	private final Jvm jvm;
+    private final OperatingSystem os;
 
-	private final String name;
+    private final Process process;
 
-	private final OperatingSystem os;
+    private final List<NodeRole> roles;
 
-	private final Process process;
+    private final Scripting script;
 
-	private final List<NodeRole> roles;
+    private final Map<String, ThreadCount> threadPool;
 
-	private final Scripting script;
+    private final long timestamp;
 
-	private final Map<String, ThreadCount> threadPool;
+    private final Transport transport;
 
-	private final long timestamp;
-
-	private final Transport transport;
+    private final String transportAddress;
+
+    @Nullable
+    private final Map<String, String> attributes;
 
-	private final String transportAddress;
-
-	@Nullable
-	private final Map<String, String> attributes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Stats(Builder builder) {
-
-		this.adaptiveSelection = ApiTypeHelper.unmodifiableRequired(builder.adaptiveSelection, this,
-				"adaptiveSelection");
-		this.breakers = ApiTypeHelper.unmodifiableRequired(builder.breakers, this, "breakers");
-		this.fs = ApiTypeHelper.requireNonNull(builder.fs, this, "fs");
-		this.host = ApiTypeHelper.requireNonNull(builder.host, this, "host");
-		this.http = ApiTypeHelper.requireNonNull(builder.http, this, "http");
-		this.indices = ApiTypeHelper.requireNonNull(builder.indices, this, "indices");
-		this.ingest = ApiTypeHelper.requireNonNull(builder.ingest, this, "ingest");
-		this.ip = ApiTypeHelper.unmodifiableRequired(builder.ip, this, "ip");
-		this.jvm = ApiTypeHelper.requireNonNull(builder.jvm, this, "jvm");
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.os = ApiTypeHelper.requireNonNull(builder.os, this, "os");
-		this.process = ApiTypeHelper.requireNonNull(builder.process, this, "process");
-		this.roles = ApiTypeHelper.unmodifiableRequired(builder.roles, this, "roles");
-		this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
-		this.threadPool = ApiTypeHelper.unmodifiableRequired(builder.threadPool, this, "threadPool");
-		this.timestamp = ApiTypeHelper.requireNonNull(builder.timestamp, this, "timestamp");
-		this.transport = ApiTypeHelper.requireNonNull(builder.transport, this, "transport");
-		this.transportAddress = ApiTypeHelper.requireNonNull(builder.transportAddress, this, "transportAddress");
-		this.attributes = builder.attributes;
-
-	}
-
-	public static Stats of(Function<Builder, ObjectBuilder<Stats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code adaptive_selection}
-	 */
-	public final Map<String, AdaptiveSelection> adaptiveSelection() {
-		return this.adaptiveSelection;
-	}
-
-	/**
-	 * Required - API name: {@code breakers}
-	 */
-	public final Map<String, Breaker> breakers() {
-		return this.breakers;
-	}
-
-	/**
-	 * Required - API name: {@code fs}
-	 */
-	public final FileSystem fs() {
-		return this.fs;
-	}
-
-	/**
-	 * Required - API name: {@code host}
-	 */
-	public final String host() {
-		return this.host;
-	}
-
-	/**
-	 * Required - API name: {@code http}
-	 */
-	public final Http http() {
-		return this.http;
-	}
-
-	/**
-	 * Required - API name: {@code indices}
-	 */
-	public final IndexStats indices() {
-		return this.indices;
-	}
-
-	/**
-	 * Required - API name: {@code ingest}
-	 */
-	public final Ingest ingest() {
-		return this.ingest;
-	}
-
-	/**
-	 * Required - API name: {@code ip}
-	 */
-	public final List<String> ip() {
-		return this.ip;
-	}
-
-	/**
-	 * Required - API name: {@code jvm}
-	 */
-	public final Jvm jvm() {
-		return this.jvm;
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Required - API name: {@code os}
-	 */
-	public final OperatingSystem os() {
-		return this.os;
-	}
-
-	/**
-	 * Required - API name: {@code process}
-	 */
-	public final Process process() {
-		return this.process;
-	}
-
-	/**
-	 * Required - API name: {@code roles}
-	 */
-	public final List<NodeRole> roles() {
-		return this.roles;
-	}
-
-	/**
-	 * Required - API name: {@code script}
-	 */
-	public final Scripting script() {
-		return this.script;
-	}
-
-	/**
-	 * Required - API name: {@code thread_pool}
-	 */
-	public final Map<String, ThreadCount> threadPool() {
-		return this.threadPool;
-	}
-
-	/**
-	 * Required - API name: {@code timestamp}
-	 */
-	public final long timestamp() {
-		return this.timestamp;
-	}
-
-	/**
-	 * Required - API name: {@code transport}
-	 */
-	public final Transport transport() {
-		return this.transport;
-	}
-
-	/**
-	 * Required - API name: {@code transport_address}
-	 */
-	public final String transportAddress() {
-		return this.transportAddress;
-	}
-
-	/**
-	 * API name: {@code attributes}
-	 */
-	public final Map<String, String> attributes() {
-		return this.attributes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.adaptiveSelection)) {
-			generator.writeKey("adaptive_selection");
-			generator.writeStartObject();
-			for (Map.Entry<String, AdaptiveSelection> item0 : this.adaptiveSelection.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.breakers)) {
-			generator.writeKey("breakers");
-			generator.writeStartObject();
-			for (Map.Entry<String, Breaker> item0 : this.breakers.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("fs");
-		this.fs.serialize(generator, mapper);
-
-		generator.writeKey("host");
-		generator.write(this.host);
-
-		generator.writeKey("http");
-		this.http.serialize(generator, mapper);
-
-		generator.writeKey("indices");
-		this.indices.serialize(generator, mapper);
-
-		generator.writeKey("ingest");
-		this.ingest.serialize(generator, mapper);
+    // ---------------------------------------------------------------------------------------------
+
+    private Stats(Builder builder) {
+
+        this.adaptiveSelection = ApiTypeHelper.unmodifiableRequired(builder.adaptiveSelection, this, "adaptiveSelection");
+        this.breakers = ApiTypeHelper.unmodifiableRequired(builder.breakers, this, "breakers");
+        this.fs = ApiTypeHelper.requireNonNull(builder.fs, this, "fs");
+        this.host = ApiTypeHelper.requireNonNull(builder.host, this, "host");
+        this.http = ApiTypeHelper.requireNonNull(builder.http, this, "http");
+        this.indices = ApiTypeHelper.requireNonNull(builder.indices, this, "indices");
+        this.ingest = ApiTypeHelper.requireNonNull(builder.ingest, this, "ingest");
+        this.ip = ApiTypeHelper.unmodifiableRequired(builder.ip, this, "ip");
+        this.jvm = ApiTypeHelper.requireNonNull(builder.jvm, this, "jvm");
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.os = ApiTypeHelper.requireNonNull(builder.os, this, "os");
+        this.process = ApiTypeHelper.requireNonNull(builder.process, this, "process");
+        this.roles = ApiTypeHelper.unmodifiableRequired(builder.roles, this, "roles");
+        this.script = ApiTypeHelper.requireNonNull(builder.script, this, "script");
+        this.threadPool = ApiTypeHelper.unmodifiableRequired(builder.threadPool, this, "threadPool");
+        this.timestamp = ApiTypeHelper.requireNonNull(builder.timestamp, this, "timestamp");
+        this.transport = ApiTypeHelper.requireNonNull(builder.transport, this, "transport");
+        this.transportAddress = ApiTypeHelper.requireNonNull(builder.transportAddress, this, "transportAddress");
+        this.attributes = builder.attributes;
+
+    }
+
+    public static Stats of(Function<Builder, ObjectBuilder<Stats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code adaptive_selection}
+     */
+    public final Map<String, AdaptiveSelection> adaptiveSelection() {
+        return this.adaptiveSelection;
+    }
+
+    /**
+     * Required - API name: {@code breakers}
+     */
+    public final Map<String, Breaker> breakers() {
+        return this.breakers;
+    }
+
+    /**
+     * Required - API name: {@code fs}
+     */
+    public final FileSystem fs() {
+        return this.fs;
+    }
+
+    /**
+     * Required - API name: {@code host}
+     */
+    public final String host() {
+        return this.host;
+    }
+
+    /**
+     * Required - API name: {@code http}
+     */
+    public final Http http() {
+        return this.http;
+    }
+
+    /**
+     * Required - API name: {@code indices}
+     */
+    public final IndexStats indices() {
+        return this.indices;
+    }
+
+    /**
+     * Required - API name: {@code ingest}
+     */
+    public final Ingest ingest() {
+        return this.ingest;
+    }
+
+    /**
+     * Required - API name: {@code ip}
+     */
+    public final List<String> ip() {
+        return this.ip;
+    }
+
+    /**
+     * Required - API name: {@code jvm}
+     */
+    public final Jvm jvm() {
+        return this.jvm;
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Required - API name: {@code os}
+     */
+    public final OperatingSystem os() {
+        return this.os;
+    }
+
+    /**
+     * Required - API name: {@code process}
+     */
+    public final Process process() {
+        return this.process;
+    }
+
+    /**
+     * Required - API name: {@code roles}
+     */
+    public final List<NodeRole> roles() {
+        return this.roles;
+    }
+
+    /**
+     * Required - API name: {@code script}
+     */
+    public final Scripting script() {
+        return this.script;
+    }
+
+    /**
+     * Required - API name: {@code thread_pool}
+     */
+    public final Map<String, ThreadCount> threadPool() {
+        return this.threadPool;
+    }
+
+    /**
+     * Required - API name: {@code timestamp}
+     */
+    public final long timestamp() {
+        return this.timestamp;
+    }
+
+    /**
+     * Required - API name: {@code transport}
+     */
+    public final Transport transport() {
+        return this.transport;
+    }
+
+    /**
+     * Required - API name: {@code transport_address}
+     */
+    public final String transportAddress() {
+        return this.transportAddress;
+    }
+
+    /**
+     * API name: {@code attributes}
+     */
+    public final Map<String, String> attributes() {
+        return this.attributes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.adaptiveSelection)) {
+            generator.writeKey("adaptive_selection");
+            generator.writeStartObject();
+            for (Map.Entry<String, AdaptiveSelection> item0 : this.adaptiveSelection.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.breakers)) {
+            generator.writeKey("breakers");
+            generator.writeStartObject();
+            for (Map.Entry<String, Breaker> item0 : this.breakers.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("fs");
+        this.fs.serialize(generator, mapper);
+
+        generator.writeKey("host");
+        generator.write(this.host);
+
+        generator.writeKey("http");
+        this.http.serialize(generator, mapper);
+
+        generator.writeKey("indices");
+        this.indices.serialize(generator, mapper);
+
+        generator.writeKey("ingest");
+        this.ingest.serialize(generator, mapper);
 
-		if (ApiTypeHelper.isDefined(this.ip)) {
-			generator.writeKey("ip");
-			generator.writeStartArray();
-			for (String item0 : this.ip) {
-				generator.write(item0);
+        if (ApiTypeHelper.isDefined(this.ip)) {
+            generator.writeKey("ip");
+            generator.writeStartArray();
+            for (String item0 : this.ip) {
+                generator.write(item0);
 
-			}
-			generator.writeEnd();
+            }
+            generator.writeEnd();
 
-		}
-		generator.writeKey("jvm");
-		this.jvm.serialize(generator, mapper);
+        }
+        generator.writeKey("jvm");
+        this.jvm.serialize(generator, mapper);
 
-		generator.writeKey("name");
-		generator.write(this.name);
+        generator.writeKey("name");
+        generator.write(this.name);
 
-		generator.writeKey("os");
-		this.os.serialize(generator, mapper);
+        generator.writeKey("os");
+        this.os.serialize(generator, mapper);
 
-		generator.writeKey("process");
-		this.process.serialize(generator, mapper);
+        generator.writeKey("process");
+        this.process.serialize(generator, mapper);
 
-		if (ApiTypeHelper.isDefined(this.roles)) {
-			generator.writeKey("roles");
-			generator.writeStartArray();
-			for (NodeRole item0 : this.roles) {
-				item0.serialize(generator, mapper);
-			}
-			generator.writeEnd();
+        if (ApiTypeHelper.isDefined(this.roles)) {
+            generator.writeKey("roles");
+            generator.writeStartArray();
+            for (NodeRole item0 : this.roles) {
+                item0.serialize(generator, mapper);
+            }
+            generator.writeEnd();
 
-		}
-		generator.writeKey("script");
-		this.script.serialize(generator, mapper);
+        }
+        generator.writeKey("script");
+        this.script.serialize(generator, mapper);
 
-		if (ApiTypeHelper.isDefined(this.threadPool)) {
-			generator.writeKey("thread_pool");
-			generator.writeStartObject();
-			for (Map.Entry<String, ThreadCount> item0 : this.threadPool.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.threadPool)) {
+            generator.writeKey("thread_pool");
+            generator.writeStartObject();
+            for (Map.Entry<String, ThreadCount> item0 : this.threadPool.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
 
-			}
-			generator.writeEnd();
+            }
+            generator.writeEnd();
 
-		}
-		generator.writeKey("timestamp");
-		generator.write(this.timestamp);
+        }
+        generator.writeKey("timestamp");
+        generator.write(this.timestamp);
 
-		generator.writeKey("transport");
-		this.transport.serialize(generator, mapper);
+        generator.writeKey("transport");
+        this.transport.serialize(generator, mapper);
 
-		generator.writeKey("transport_address");
-		generator.write(this.transportAddress);
+        generator.writeKey("transport_address");
+        generator.write(this.transportAddress);
 
-		if (ApiTypeHelper.isDefined(this.attributes)) {
-			generator.writeKey("attributes");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.attributes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
+        if (ApiTypeHelper.isDefined(this.attributes)) {
+            generator.writeKey("attributes");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.attributes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
 
-			}
-			generator.writeEnd();
+            }
+            generator.writeEnd();
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link Stats}.
-	 */
+    /**
+     * Builder for {@link Stats}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Stats> {
-		private Map<String, AdaptiveSelection> adaptiveSelection;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Stats> {
+        private Map<String, AdaptiveSelection> adaptiveSelection;
 
-		private Map<String, Breaker> breakers;
+        private Map<String, Breaker> breakers;
 
-		private FileSystem fs;
+        private FileSystem fs;
 
-		private String host;
+        private String host;
 
-		private Http http;
+        private Http http;
 
-		private IndexStats indices;
+        private IndexStats indices;
 
-		private Ingest ingest;
+        private Ingest ingest;
 
-		private List<String> ip;
+        private List<String> ip;
 
-		private Jvm jvm;
-
-		private String name;
-
-		private OperatingSystem os;
-
-		private Process process;
-
-		private List<NodeRole> roles;
-
-		private Scripting script;
-
-		private Map<String, ThreadCount> threadPool;
-
-		private Long timestamp;
-
-		private Transport transport;
-
-		private String transportAddress;
-
-		@Nullable
-		private Map<String, String> attributes;
-
-		/**
-		 * Required - API name: {@code adaptive_selection}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>adaptiveSelection</code>.
-		 */
-		public final Builder adaptiveSelection(Map<String, AdaptiveSelection> map) {
-			this.adaptiveSelection = _mapPutAll(this.adaptiveSelection, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code adaptive_selection}
-		 * <p>
-		 * Adds an entry to <code>adaptiveSelection</code>.
-		 */
-		public final Builder adaptiveSelection(String key, AdaptiveSelection value) {
-			this.adaptiveSelection = _mapPut(this.adaptiveSelection, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code adaptive_selection}
-		 * <p>
-		 * Adds an entry to <code>adaptiveSelection</code> using a builder lambda.
-		 */
-		public final Builder adaptiveSelection(String key,
-				Function<AdaptiveSelection.Builder, ObjectBuilder<AdaptiveSelection>> fn) {
-			return adaptiveSelection(key, fn.apply(new AdaptiveSelection.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code breakers}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>breakers</code>.
-		 */
-		public final Builder breakers(Map<String, Breaker> map) {
-			this.breakers = _mapPutAll(this.breakers, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code breakers}
-		 * <p>
-		 * Adds an entry to <code>breakers</code>.
-		 */
-		public final Builder breakers(String key, Breaker value) {
-			this.breakers = _mapPut(this.breakers, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code breakers}
-		 * <p>
-		 * Adds an entry to <code>breakers</code> using a builder lambda.
-		 */
-		public final Builder breakers(String key, Function<Breaker.Builder, ObjectBuilder<Breaker>> fn) {
-			return breakers(key, fn.apply(new Breaker.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code fs}
-		 */
-		public final Builder fs(FileSystem value) {
-			this.fs = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code fs}
-		 */
-		public final Builder fs(Function<FileSystem.Builder, ObjectBuilder<FileSystem>> fn) {
-			return this.fs(fn.apply(new FileSystem.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code host}
-		 */
-		public final Builder host(String value) {
-			this.host = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code http}
-		 */
-		public final Builder http(Http value) {
-			this.http = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code http}
-		 */
-		public final Builder http(Function<Http.Builder, ObjectBuilder<Http>> fn) {
-			return this.http(fn.apply(new Http.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 */
-		public final Builder indices(IndexStats value) {
-			this.indices = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 */
-		public final Builder indices(Function<IndexStats.Builder, ObjectBuilder<IndexStats>> fn) {
-			return this.indices(fn.apply(new IndexStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code ingest}
-		 */
-		public final Builder ingest(Ingest value) {
-			this.ingest = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code ingest}
-		 */
-		public final Builder ingest(Function<Ingest.Builder, ObjectBuilder<Ingest>> fn) {
-			return this.ingest(fn.apply(new Ingest.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code ip}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>ip</code>.
-		 */
-		public final Builder ip(List<String> list) {
-			this.ip = _listAddAll(this.ip, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code ip}
-		 * <p>
-		 * Adds one or more values to <code>ip</code>.
-		 */
-		public final Builder ip(String value, String... values) {
-			this.ip = _listAdd(this.ip, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code jvm}
-		 */
-		public final Builder jvm(Jvm value) {
-			this.jvm = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code jvm}
-		 */
-		public final Builder jvm(Function<Jvm.Builder, ObjectBuilder<Jvm>> fn) {
-			return this.jvm(fn.apply(new Jvm.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code os}
-		 */
-		public final Builder os(OperatingSystem value) {
-			this.os = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code os}
-		 */
-		public final Builder os(Function<OperatingSystem.Builder, ObjectBuilder<OperatingSystem>> fn) {
-			return this.os(fn.apply(new OperatingSystem.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code process}
-		 */
-		public final Builder process(Process value) {
-			this.process = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code process}
-		 */
-		public final Builder process(Function<Process.Builder, ObjectBuilder<Process>> fn) {
-			return this.process(fn.apply(new Process.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code roles}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>roles</code>.
-		 */
-		public final Builder roles(List<NodeRole> list) {
-			this.roles = _listAddAll(this.roles, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code roles}
-		 * <p>
-		 * Adds one or more values to <code>roles</code>.
-		 */
-		public final Builder roles(NodeRole value, NodeRole... values) {
-			this.roles = _listAdd(this.roles, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(Scripting value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code script}
-		 */
-		public final Builder script(Function<Scripting.Builder, ObjectBuilder<Scripting>> fn) {
-			return this.script(fn.apply(new Scripting.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code thread_pool}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>threadPool</code>.
-		 */
-		public final Builder threadPool(Map<String, ThreadCount> map) {
-			this.threadPool = _mapPutAll(this.threadPool, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code thread_pool}
-		 * <p>
-		 * Adds an entry to <code>threadPool</code>.
-		 */
-		public final Builder threadPool(String key, ThreadCount value) {
-			this.threadPool = _mapPut(this.threadPool, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code thread_pool}
-		 * <p>
-		 * Adds an entry to <code>threadPool</code> using a builder lambda.
-		 */
-		public final Builder threadPool(String key, Function<ThreadCount.Builder, ObjectBuilder<ThreadCount>> fn) {
-			return threadPool(key, fn.apply(new ThreadCount.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code timestamp}
-		 */
-		public final Builder timestamp(long value) {
-			this.timestamp = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code transport}
-		 */
-		public final Builder transport(Transport value) {
-			this.transport = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code transport}
-		 */
-		public final Builder transport(Function<Transport.Builder, ObjectBuilder<Transport>> fn) {
-			return this.transport(fn.apply(new Transport.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code transport_address}
-		 */
-		public final Builder transportAddress(String value) {
-			this.transportAddress = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code attributes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>attributes</code>.
-		 */
-		public final Builder attributes(Map<String, String> map) {
-			this.attributes = _mapPutAll(this.attributes, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code attributes}
-		 * <p>
-		 * Adds an entry to <code>attributes</code>.
-		 */
-		public final Builder attributes(String key, String value) {
-			this.attributes = _mapPut(this.attributes, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Stats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Stats build() {
-			_checkSingleUse();
-
-			return new Stats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Stats}
-	 */
-	public static final JsonpDeserializer<Stats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Stats::setupStatsDeserializer);
-
-	protected static void setupStatsDeserializer(ObjectDeserializer<Stats.Builder> op) {
-
-		op.add(Builder::adaptiveSelection, JsonpDeserializer.stringMapDeserializer(AdaptiveSelection._DESERIALIZER),
-				"adaptive_selection");
-		op.add(Builder::breakers, JsonpDeserializer.stringMapDeserializer(Breaker._DESERIALIZER), "breakers");
-		op.add(Builder::fs, FileSystem._DESERIALIZER, "fs");
-		op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host");
-		op.add(Builder::http, Http._DESERIALIZER, "http");
-		op.add(Builder::indices, IndexStats._DESERIALIZER, "indices");
-		op.add(Builder::ingest, Ingest._DESERIALIZER, "ingest");
-		op.add(Builder::ip, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "ip");
-		op.add(Builder::jvm, Jvm._DESERIALIZER, "jvm");
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::os, OperatingSystem._DESERIALIZER, "os");
-		op.add(Builder::process, Process._DESERIALIZER, "process");
-		op.add(Builder::roles, JsonpDeserializer.arrayDeserializer(NodeRole._DESERIALIZER), "roles");
-		op.add(Builder::script, Scripting._DESERIALIZER, "script");
-		op.add(Builder::threadPool, JsonpDeserializer.stringMapDeserializer(ThreadCount._DESERIALIZER), "thread_pool");
-		op.add(Builder::timestamp, JsonpDeserializer.longDeserializer(), "timestamp");
-		op.add(Builder::transport, Transport._DESERIALIZER, "transport");
-		op.add(Builder::transportAddress, JsonpDeserializer.stringDeserializer(), "transport_address");
-		op.add(Builder::attributes, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
-				"attributes");
-
-	}
+        private Jvm jvm;
+
+        private String name;
+
+        private OperatingSystem os;
+
+        private Process process;
+
+        private List<NodeRole> roles;
+
+        private Scripting script;
+
+        private Map<String, ThreadCount> threadPool;
+
+        private Long timestamp;
+
+        private Transport transport;
+
+        private String transportAddress;
+
+        @Nullable
+        private Map<String, String> attributes;
+
+        /**
+         * Required - API name: {@code adaptive_selection}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>adaptiveSelection</code>.
+         */
+        public final Builder adaptiveSelection(Map<String, AdaptiveSelection> map) {
+            this.adaptiveSelection = _mapPutAll(this.adaptiveSelection, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code adaptive_selection}
+         * <p>
+         * Adds an entry to <code>adaptiveSelection</code>.
+         */
+        public final Builder adaptiveSelection(String key, AdaptiveSelection value) {
+            this.adaptiveSelection = _mapPut(this.adaptiveSelection, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code adaptive_selection}
+         * <p>
+         * Adds an entry to <code>adaptiveSelection</code> using a builder lambda.
+         */
+        public final Builder adaptiveSelection(String key, Function<AdaptiveSelection.Builder, ObjectBuilder<AdaptiveSelection>> fn) {
+            return adaptiveSelection(key, fn.apply(new AdaptiveSelection.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code breakers}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>breakers</code>.
+         */
+        public final Builder breakers(Map<String, Breaker> map) {
+            this.breakers = _mapPutAll(this.breakers, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code breakers}
+         * <p>
+         * Adds an entry to <code>breakers</code>.
+         */
+        public final Builder breakers(String key, Breaker value) {
+            this.breakers = _mapPut(this.breakers, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code breakers}
+         * <p>
+         * Adds an entry to <code>breakers</code> using a builder lambda.
+         */
+        public final Builder breakers(String key, Function<Breaker.Builder, ObjectBuilder<Breaker>> fn) {
+            return breakers(key, fn.apply(new Breaker.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code fs}
+         */
+        public final Builder fs(FileSystem value) {
+            this.fs = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code fs}
+         */
+        public final Builder fs(Function<FileSystem.Builder, ObjectBuilder<FileSystem>> fn) {
+            return this.fs(fn.apply(new FileSystem.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code host}
+         */
+        public final Builder host(String value) {
+            this.host = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code http}
+         */
+        public final Builder http(Http value) {
+            this.http = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code http}
+         */
+        public final Builder http(Function<Http.Builder, ObjectBuilder<Http>> fn) {
+            return this.http(fn.apply(new Http.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         */
+        public final Builder indices(IndexStats value) {
+            this.indices = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         */
+        public final Builder indices(Function<IndexStats.Builder, ObjectBuilder<IndexStats>> fn) {
+            return this.indices(fn.apply(new IndexStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code ingest}
+         */
+        public final Builder ingest(Ingest value) {
+            this.ingest = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code ingest}
+         */
+        public final Builder ingest(Function<Ingest.Builder, ObjectBuilder<Ingest>> fn) {
+            return this.ingest(fn.apply(new Ingest.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code ip}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>ip</code>.
+         */
+        public final Builder ip(List<String> list) {
+            this.ip = _listAddAll(this.ip, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code ip}
+         * <p>
+         * Adds one or more values to <code>ip</code>.
+         */
+        public final Builder ip(String value, String... values) {
+            this.ip = _listAdd(this.ip, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code jvm}
+         */
+        public final Builder jvm(Jvm value) {
+            this.jvm = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code jvm}
+         */
+        public final Builder jvm(Function<Jvm.Builder, ObjectBuilder<Jvm>> fn) {
+            return this.jvm(fn.apply(new Jvm.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code os}
+         */
+        public final Builder os(OperatingSystem value) {
+            this.os = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code os}
+         */
+        public final Builder os(Function<OperatingSystem.Builder, ObjectBuilder<OperatingSystem>> fn) {
+            return this.os(fn.apply(new OperatingSystem.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code process}
+         */
+        public final Builder process(Process value) {
+            this.process = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code process}
+         */
+        public final Builder process(Function<Process.Builder, ObjectBuilder<Process>> fn) {
+            return this.process(fn.apply(new Process.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code roles}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>roles</code>.
+         */
+        public final Builder roles(List<NodeRole> list) {
+            this.roles = _listAddAll(this.roles, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code roles}
+         * <p>
+         * Adds one or more values to <code>roles</code>.
+         */
+        public final Builder roles(NodeRole value, NodeRole... values) {
+            this.roles = _listAdd(this.roles, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(Scripting value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code script}
+         */
+        public final Builder script(Function<Scripting.Builder, ObjectBuilder<Scripting>> fn) {
+            return this.script(fn.apply(new Scripting.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code thread_pool}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>threadPool</code>.
+         */
+        public final Builder threadPool(Map<String, ThreadCount> map) {
+            this.threadPool = _mapPutAll(this.threadPool, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code thread_pool}
+         * <p>
+         * Adds an entry to <code>threadPool</code>.
+         */
+        public final Builder threadPool(String key, ThreadCount value) {
+            this.threadPool = _mapPut(this.threadPool, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code thread_pool}
+         * <p>
+         * Adds an entry to <code>threadPool</code> using a builder lambda.
+         */
+        public final Builder threadPool(String key, Function<ThreadCount.Builder, ObjectBuilder<ThreadCount>> fn) {
+            return threadPool(key, fn.apply(new ThreadCount.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code timestamp}
+         */
+        public final Builder timestamp(long value) {
+            this.timestamp = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code transport}
+         */
+        public final Builder transport(Transport value) {
+            this.transport = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code transport}
+         */
+        public final Builder transport(Function<Transport.Builder, ObjectBuilder<Transport>> fn) {
+            return this.transport(fn.apply(new Transport.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code transport_address}
+         */
+        public final Builder transportAddress(String value) {
+            this.transportAddress = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code attributes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>attributes</code>.
+         */
+        public final Builder attributes(Map<String, String> map) {
+            this.attributes = _mapPutAll(this.attributes, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code attributes}
+         * <p>
+         * Adds an entry to <code>attributes</code>.
+         */
+        public final Builder attributes(String key, String value) {
+            this.attributes = _mapPut(this.attributes, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link Stats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Stats build() {
+            _checkSingleUse();
+
+            return new Stats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Stats}
+     */
+    public static final JsonpDeserializer<Stats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Stats::setupStatsDeserializer
+    );
+
+    protected static void setupStatsDeserializer(ObjectDeserializer<Stats.Builder> op) {
+
+        op.add(Builder::adaptiveSelection, JsonpDeserializer.stringMapDeserializer(AdaptiveSelection._DESERIALIZER), "adaptive_selection");
+        op.add(Builder::breakers, JsonpDeserializer.stringMapDeserializer(Breaker._DESERIALIZER), "breakers");
+        op.add(Builder::fs, FileSystem._DESERIALIZER, "fs");
+        op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host");
+        op.add(Builder::http, Http._DESERIALIZER, "http");
+        op.add(Builder::indices, IndexStats._DESERIALIZER, "indices");
+        op.add(Builder::ingest, Ingest._DESERIALIZER, "ingest");
+        op.add(Builder::ip, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "ip");
+        op.add(Builder::jvm, Jvm._DESERIALIZER, "jvm");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::os, OperatingSystem._DESERIALIZER, "os");
+        op.add(Builder::process, Process._DESERIALIZER, "process");
+        op.add(Builder::roles, JsonpDeserializer.arrayDeserializer(NodeRole._DESERIALIZER), "roles");
+        op.add(Builder::script, Scripting._DESERIALIZER, "script");
+        op.add(Builder::threadPool, JsonpDeserializer.stringMapDeserializer(ThreadCount._DESERIALIZER), "thread_pool");
+        op.add(Builder::timestamp, JsonpDeserializer.longDeserializer(), "timestamp");
+        op.add(Builder::transport, Transport._DESERIALIZER, "transport");
+        op.add(Builder::transportAddress, JsonpDeserializer.stringDeserializer(), "transport_address");
+        op.add(Builder::attributes, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "attributes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/ThreadCount.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/ThreadCount.java
index 624c93e304..c96f7a9d1f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/ThreadCount.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/ThreadCount.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,213 +43,212 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes._types.ThreadCount
 
-
 @JsonpDeserializable
 public class ThreadCount implements JsonpSerializable {
-	private final long active;
+    private final long active;
 
-	private final long completed;
+    private final long completed;
 
-	private final long largest;
+    private final long largest;
 
-	private final long queue;
+    private final long queue;
 
-	private final long rejected;
+    private final long rejected;
 
-	private final long threads;
+    private final long threads;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ThreadCount(Builder builder) {
+    private ThreadCount(Builder builder) {
 
-		this.active = ApiTypeHelper.requireNonNull(builder.active, this, "active");
-		this.completed = ApiTypeHelper.requireNonNull(builder.completed, this, "completed");
-		this.largest = ApiTypeHelper.requireNonNull(builder.largest, this, "largest");
-		this.queue = ApiTypeHelper.requireNonNull(builder.queue, this, "queue");
-		this.rejected = ApiTypeHelper.requireNonNull(builder.rejected, this, "rejected");
-		this.threads = ApiTypeHelper.requireNonNull(builder.threads, this, "threads");
+        this.active = ApiTypeHelper.requireNonNull(builder.active, this, "active");
+        this.completed = ApiTypeHelper.requireNonNull(builder.completed, this, "completed");
+        this.largest = ApiTypeHelper.requireNonNull(builder.largest, this, "largest");
+        this.queue = ApiTypeHelper.requireNonNull(builder.queue, this, "queue");
+        this.rejected = ApiTypeHelper.requireNonNull(builder.rejected, this, "rejected");
+        this.threads = ApiTypeHelper.requireNonNull(builder.threads, this, "threads");
 
-	}
+    }
 
-	public static ThreadCount of(Function<Builder, ObjectBuilder<ThreadCount>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ThreadCount of(Function<Builder, ObjectBuilder<ThreadCount>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code active}
-	 */
-	public final long active() {
-		return this.active;
-	}
+    /**
+     * Required - API name: {@code active}
+     */
+    public final long active() {
+        return this.active;
+    }
 
-	/**
-	 * Required - API name: {@code completed}
-	 */
-	public final long completed() {
-		return this.completed;
-	}
+    /**
+     * Required - API name: {@code completed}
+     */
+    public final long completed() {
+        return this.completed;
+    }
 
-	/**
-	 * Required - API name: {@code largest}
-	 */
-	public final long largest() {
-		return this.largest;
-	}
+    /**
+     * Required - API name: {@code largest}
+     */
+    public final long largest() {
+        return this.largest;
+    }
 
-	/**
-	 * Required - API name: {@code queue}
-	 */
-	public final long queue() {
-		return this.queue;
-	}
-
-	/**
-	 * Required - API name: {@code rejected}
-	 */
-	public final long rejected() {
-		return this.rejected;
-	}
-
-	/**
-	 * Required - API name: {@code threads}
-	 */
-	public final long threads() {
-		return this.threads;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("active");
-		generator.write(this.active);
-
-		generator.writeKey("completed");
-		generator.write(this.completed);
-
-		generator.writeKey("largest");
-		generator.write(this.largest);
-
-		generator.writeKey("queue");
-		generator.write(this.queue);
-
-		generator.writeKey("rejected");
-		generator.write(this.rejected);
-
-		generator.writeKey("threads");
-		generator.write(this.threads);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ThreadCount}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ThreadCount> {
-		private Long active;
-
-		private Long completed;
-
-		private Long largest;
-
-		private Long queue;
-
-		private Long rejected;
-
-		private Long threads;
-
-		/**
-		 * Required - API name: {@code active}
-		 */
-		public final Builder active(long value) {
-			this.active = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code completed}
-		 */
-		public final Builder completed(long value) {
-			this.completed = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code largest}
-		 */
-		public final Builder largest(long value) {
-			this.largest = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code queue}
-		 */
-		public final Builder queue(long value) {
-			this.queue = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code rejected}
-		 */
-		public final Builder rejected(long value) {
-			this.rejected = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code threads}
-		 */
-		public final Builder threads(long value) {
-			this.threads = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ThreadCount}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ThreadCount build() {
-			_checkSingleUse();
-
-			return new ThreadCount(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ThreadCount}
-	 */
-	public static final JsonpDeserializer<ThreadCount> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ThreadCount::setupThreadCountDeserializer);
-
-	protected static void setupThreadCountDeserializer(ObjectDeserializer<ThreadCount.Builder> op) {
-
-		op.add(Builder::active, JsonpDeserializer.longDeserializer(), "active");
-		op.add(Builder::completed, JsonpDeserializer.longDeserializer(), "completed");
-		op.add(Builder::largest, JsonpDeserializer.longDeserializer(), "largest");
-		op.add(Builder::queue, JsonpDeserializer.longDeserializer(), "queue");
-		op.add(Builder::rejected, JsonpDeserializer.longDeserializer(), "rejected");
-		op.add(Builder::threads, JsonpDeserializer.longDeserializer(), "threads");
-
-	}
+    /**
+     * Required - API name: {@code queue}
+     */
+    public final long queue() {
+        return this.queue;
+    }
+
+    /**
+     * Required - API name: {@code rejected}
+     */
+    public final long rejected() {
+        return this.rejected;
+    }
+
+    /**
+     * Required - API name: {@code threads}
+     */
+    public final long threads() {
+        return this.threads;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("active");
+        generator.write(this.active);
+
+        generator.writeKey("completed");
+        generator.write(this.completed);
+
+        generator.writeKey("largest");
+        generator.write(this.largest);
+
+        generator.writeKey("queue");
+        generator.write(this.queue);
+
+        generator.writeKey("rejected");
+        generator.write(this.rejected);
+
+        generator.writeKey("threads");
+        generator.write(this.threads);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ThreadCount}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ThreadCount> {
+        private Long active;
+
+        private Long completed;
+
+        private Long largest;
+
+        private Long queue;
+
+        private Long rejected;
+
+        private Long threads;
+
+        /**
+         * Required - API name: {@code active}
+         */
+        public final Builder active(long value) {
+            this.active = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code completed}
+         */
+        public final Builder completed(long value) {
+            this.completed = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code largest}
+         */
+        public final Builder largest(long value) {
+            this.largest = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code queue}
+         */
+        public final Builder queue(long value) {
+            this.queue = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code rejected}
+         */
+        public final Builder rejected(long value) {
+            this.rejected = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code threads}
+         */
+        public final Builder threads(long value) {
+            this.threads = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ThreadCount}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ThreadCount build() {
+            _checkSingleUse();
+
+            return new ThreadCount(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ThreadCount}
+     */
+    public static final JsonpDeserializer<ThreadCount> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ThreadCount::setupThreadCountDeserializer
+    );
+
+    protected static void setupThreadCountDeserializer(ObjectDeserializer<ThreadCount.Builder> op) {
+
+        op.add(Builder::active, JsonpDeserializer.longDeserializer(), "active");
+        op.add(Builder::completed, JsonpDeserializer.longDeserializer(), "completed");
+        op.add(Builder::largest, JsonpDeserializer.longDeserializer(), "largest");
+        op.add(Builder::queue, JsonpDeserializer.longDeserializer(), "queue");
+        op.add(Builder::rejected, JsonpDeserializer.longDeserializer(), "rejected");
+        op.add(Builder::threads, JsonpDeserializer.longDeserializer(), "threads");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Transport.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Transport.java
index 74b82a3628..f7c728cd0e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Transport.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/Transport.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,189 +43,188 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes._types.Transport
 
-
 @JsonpDeserializable
 public class Transport implements JsonpSerializable {
-	private final long rxCount;
+    private final long rxCount;
 
-	private final long rxSizeInBytes;
+    private final long rxSizeInBytes;
 
-	private final int serverOpen;
+    private final int serverOpen;
 
-	private final long txCount;
+    private final long txCount;
 
-	private final long txSizeInBytes;
+    private final long txSizeInBytes;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private Transport(Builder builder) {
+    private Transport(Builder builder) {
 
-		this.rxCount = ApiTypeHelper.requireNonNull(builder.rxCount, this, "rxCount");
-		this.rxSizeInBytes = ApiTypeHelper.requireNonNull(builder.rxSizeInBytes, this, "rxSizeInBytes");
-		this.serverOpen = ApiTypeHelper.requireNonNull(builder.serverOpen, this, "serverOpen");
-		this.txCount = ApiTypeHelper.requireNonNull(builder.txCount, this, "txCount");
-		this.txSizeInBytes = ApiTypeHelper.requireNonNull(builder.txSizeInBytes, this, "txSizeInBytes");
+        this.rxCount = ApiTypeHelper.requireNonNull(builder.rxCount, this, "rxCount");
+        this.rxSizeInBytes = ApiTypeHelper.requireNonNull(builder.rxSizeInBytes, this, "rxSizeInBytes");
+        this.serverOpen = ApiTypeHelper.requireNonNull(builder.serverOpen, this, "serverOpen");
+        this.txCount = ApiTypeHelper.requireNonNull(builder.txCount, this, "txCount");
+        this.txSizeInBytes = ApiTypeHelper.requireNonNull(builder.txSizeInBytes, this, "txSizeInBytes");
 
-	}
+    }
 
-	public static Transport of(Function<Builder, ObjectBuilder<Transport>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static Transport of(Function<Builder, ObjectBuilder<Transport>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code rx_count}
-	 */
-	public final long rxCount() {
-		return this.rxCount;
-	}
+    /**
+     * Required - API name: {@code rx_count}
+     */
+    public final long rxCount() {
+        return this.rxCount;
+    }
 
-	/**
-	 * Required - API name: {@code rx_size_in_bytes}
-	 */
-	public final long rxSizeInBytes() {
-		return this.rxSizeInBytes;
-	}
-
-	/**
-	 * Required - API name: {@code server_open}
-	 */
-	public final int serverOpen() {
-		return this.serverOpen;
-	}
-
-	/**
-	 * Required - API name: {@code tx_count}
-	 */
-	public final long txCount() {
-		return this.txCount;
-	}
-
-	/**
-	 * Required - API name: {@code tx_size_in_bytes}
-	 */
-	public final long txSizeInBytes() {
-		return this.txSizeInBytes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("rx_count");
-		generator.write(this.rxCount);
-
-		generator.writeKey("rx_size_in_bytes");
-		generator.write(this.rxSizeInBytes);
-
-		generator.writeKey("server_open");
-		generator.write(this.serverOpen);
-
-		generator.writeKey("tx_count");
-		generator.write(this.txCount);
-
-		generator.writeKey("tx_size_in_bytes");
-		generator.write(this.txSizeInBytes);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Transport}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Transport> {
-		private Long rxCount;
-
-		private Long rxSizeInBytes;
-
-		private Integer serverOpen;
-
-		private Long txCount;
-
-		private Long txSizeInBytes;
-
-		/**
-		 * Required - API name: {@code rx_count}
-		 */
-		public final Builder rxCount(long value) {
-			this.rxCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code rx_size_in_bytes}
-		 */
-		public final Builder rxSizeInBytes(long value) {
-			this.rxSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code server_open}
-		 */
-		public final Builder serverOpen(int value) {
-			this.serverOpen = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tx_count}
-		 */
-		public final Builder txCount(long value) {
-			this.txCount = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tx_size_in_bytes}
-		 */
-		public final Builder txSizeInBytes(long value) {
-			this.txSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Transport}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Transport build() {
-			_checkSingleUse();
-
-			return new Transport(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Transport}
-	 */
-	public static final JsonpDeserializer<Transport> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Transport::setupTransportDeserializer);
-
-	protected static void setupTransportDeserializer(ObjectDeserializer<Transport.Builder> op) {
-
-		op.add(Builder::rxCount, JsonpDeserializer.longDeserializer(), "rx_count");
-		op.add(Builder::rxSizeInBytes, JsonpDeserializer.longDeserializer(), "rx_size_in_bytes");
-		op.add(Builder::serverOpen, JsonpDeserializer.integerDeserializer(), "server_open");
-		op.add(Builder::txCount, JsonpDeserializer.longDeserializer(), "tx_count");
-		op.add(Builder::txSizeInBytes, JsonpDeserializer.longDeserializer(), "tx_size_in_bytes");
-
-	}
+    /**
+     * Required - API name: {@code rx_size_in_bytes}
+     */
+    public final long rxSizeInBytes() {
+        return this.rxSizeInBytes;
+    }
+
+    /**
+     * Required - API name: {@code server_open}
+     */
+    public final int serverOpen() {
+        return this.serverOpen;
+    }
+
+    /**
+     * Required - API name: {@code tx_count}
+     */
+    public final long txCount() {
+        return this.txCount;
+    }
+
+    /**
+     * Required - API name: {@code tx_size_in_bytes}
+     */
+    public final long txSizeInBytes() {
+        return this.txSizeInBytes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("rx_count");
+        generator.write(this.rxCount);
+
+        generator.writeKey("rx_size_in_bytes");
+        generator.write(this.rxSizeInBytes);
+
+        generator.writeKey("server_open");
+        generator.write(this.serverOpen);
+
+        generator.writeKey("tx_count");
+        generator.write(this.txCount);
+
+        generator.writeKey("tx_size_in_bytes");
+        generator.write(this.txSizeInBytes);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Transport}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Transport> {
+        private Long rxCount;
+
+        private Long rxSizeInBytes;
+
+        private Integer serverOpen;
+
+        private Long txCount;
+
+        private Long txSizeInBytes;
+
+        /**
+         * Required - API name: {@code rx_count}
+         */
+        public final Builder rxCount(long value) {
+            this.rxCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code rx_size_in_bytes}
+         */
+        public final Builder rxSizeInBytes(long value) {
+            this.rxSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code server_open}
+         */
+        public final Builder serverOpen(int value) {
+            this.serverOpen = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tx_count}
+         */
+        public final Builder txCount(long value) {
+            this.txCount = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tx_size_in_bytes}
+         */
+        public final Builder txSizeInBytes(long value) {
+            this.txSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Transport}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Transport build() {
+            _checkSingleUse();
+
+            return new Transport(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Transport}
+     */
+    public static final JsonpDeserializer<Transport> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Transport::setupTransportDeserializer
+    );
+
+    protected static void setupTransportDeserializer(ObjectDeserializer<Transport.Builder> op) {
+
+        op.add(Builder::rxCount, JsonpDeserializer.longDeserializer(), "rx_count");
+        op.add(Builder::rxSizeInBytes, JsonpDeserializer.longDeserializer(), "rx_size_in_bytes");
+        op.add(Builder::serverOpen, JsonpDeserializer.integerDeserializer(), "server_open");
+        op.add(Builder::txCount, JsonpDeserializer.longDeserializer(), "tx_count");
+        op.add(Builder::txSizeInBytes, JsonpDeserializer.longDeserializer(), "tx_size_in_bytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/hot_threads/HotThread.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/hot_threads/HotThread.java
index 68716b1b3e..920f75b062 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/hot_threads/HotThread.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/hot_threads/HotThread.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.nodes.hot_threads;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,206 +44,203 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: nodes.hot_threads.HotThread
 
-
 @JsonpDeserializable
 public class HotThread implements JsonpSerializable {
-	private final List<String> hosts;
+    private final List<String> hosts;
 
-	private final String nodeId;
+    private final String nodeId;
 
-	private final String nodeName;
+    private final String nodeName;
 
-	private final List<String> threads;
+    private final List<String> threads;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private HotThread(Builder builder) {
+    private HotThread(Builder builder) {
 
-		this.hosts = ApiTypeHelper.unmodifiableRequired(builder.hosts, this, "hosts");
-		this.nodeId = ApiTypeHelper.requireNonNull(builder.nodeId, this, "nodeId");
-		this.nodeName = ApiTypeHelper.requireNonNull(builder.nodeName, this, "nodeName");
-		this.threads = ApiTypeHelper.unmodifiableRequired(builder.threads, this, "threads");
+        this.hosts = ApiTypeHelper.unmodifiableRequired(builder.hosts, this, "hosts");
+        this.nodeId = ApiTypeHelper.requireNonNull(builder.nodeId, this, "nodeId");
+        this.nodeName = ApiTypeHelper.requireNonNull(builder.nodeName, this, "nodeName");
+        this.threads = ApiTypeHelper.unmodifiableRequired(builder.threads, this, "threads");
 
-	}
+    }
 
-	public static HotThread of(Function<Builder, ObjectBuilder<HotThread>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static HotThread of(Function<Builder, ObjectBuilder<HotThread>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code hosts}
-	 */
-	public final List<String> hosts() {
-		return this.hosts;
-	}
-
-	/**
-	 * Required - API name: {@code node_id}
-	 */
-	public final String nodeId() {
-		return this.nodeId;
-	}
-
-	/**
-	 * Required - API name: {@code node_name}
-	 */
-	public final String nodeName() {
-		return this.nodeName;
-	}
-
-	/**
-	 * Required - API name: {@code threads}
-	 */
-	public final List<String> threads() {
-		return this.threads;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.hosts)) {
-			generator.writeKey("hosts");
-			generator.writeStartArray();
-			for (String item0 : this.hosts) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("node_id");
-		generator.write(this.nodeId);
-
-		generator.writeKey("node_name");
-		generator.write(this.nodeName);
-
-		if (ApiTypeHelper.isDefined(this.threads)) {
-			generator.writeKey("threads");
-			generator.writeStartArray();
-			for (String item0 : this.threads) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HotThread}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HotThread> {
-		private List<String> hosts;
-
-		private String nodeId;
-
-		private String nodeName;
-
-		private List<String> threads;
-
-		/**
-		 * Required - API name: {@code hosts}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>hosts</code>.
-		 */
-		public final Builder hosts(List<String> list) {
-			this.hosts = _listAddAll(this.hosts, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code hosts}
-		 * <p>
-		 * Adds one or more values to <code>hosts</code>.
-		 */
-		public final Builder hosts(String value, String... values) {
-			this.hosts = _listAdd(this.hosts, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code node_id}
-		 */
-		public final Builder nodeId(String value) {
-			this.nodeId = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code node_name}
-		 */
-		public final Builder nodeName(String value) {
-			this.nodeName = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code threads}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>threads</code>.
-		 */
-		public final Builder threads(List<String> list) {
-			this.threads = _listAddAll(this.threads, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code threads}
-		 * <p>
-		 * Adds one or more values to <code>threads</code>.
-		 */
-		public final Builder threads(String value, String... values) {
-			this.threads = _listAdd(this.threads, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HotThread}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HotThread build() {
-			_checkSingleUse();
-
-			return new HotThread(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HotThread}
-	 */
-	public static final JsonpDeserializer<HotThread> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			HotThread::setupHotThreadDeserializer);
-
-	protected static void setupHotThreadDeserializer(ObjectDeserializer<HotThread.Builder> op) {
-
-		op.add(Builder::hosts, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "hosts");
-		op.add(Builder::nodeId, JsonpDeserializer.stringDeserializer(), "node_id");
-		op.add(Builder::nodeName, JsonpDeserializer.stringDeserializer(), "node_name");
-		op.add(Builder::threads, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"threads");
-
-	}
+    /**
+     * Required - API name: {@code hosts}
+     */
+    public final List<String> hosts() {
+        return this.hosts;
+    }
+
+    /**
+     * Required - API name: {@code node_id}
+     */
+    public final String nodeId() {
+        return this.nodeId;
+    }
+
+    /**
+     * Required - API name: {@code node_name}
+     */
+    public final String nodeName() {
+        return this.nodeName;
+    }
+
+    /**
+     * Required - API name: {@code threads}
+     */
+    public final List<String> threads() {
+        return this.threads;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.hosts)) {
+            generator.writeKey("hosts");
+            generator.writeStartArray();
+            for (String item0 : this.hosts) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("node_id");
+        generator.write(this.nodeId);
+
+        generator.writeKey("node_name");
+        generator.write(this.nodeName);
+
+        if (ApiTypeHelper.isDefined(this.threads)) {
+            generator.writeKey("threads");
+            generator.writeStartArray();
+            for (String item0 : this.threads) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HotThread}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HotThread> {
+        private List<String> hosts;
+
+        private String nodeId;
+
+        private String nodeName;
+
+        private List<String> threads;
+
+        /**
+         * Required - API name: {@code hosts}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>hosts</code>.
+         */
+        public final Builder hosts(List<String> list) {
+            this.hosts = _listAddAll(this.hosts, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code hosts}
+         * <p>
+         * Adds one or more values to <code>hosts</code>.
+         */
+        public final Builder hosts(String value, String... values) {
+            this.hosts = _listAdd(this.hosts, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code node_id}
+         */
+        public final Builder nodeId(String value) {
+            this.nodeId = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code node_name}
+         */
+        public final Builder nodeName(String value) {
+            this.nodeName = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code threads}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>threads</code>.
+         */
+        public final Builder threads(List<String> list) {
+            this.threads = _listAddAll(this.threads, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code threads}
+         * <p>
+         * Adds one or more values to <code>threads</code>.
+         */
+        public final Builder threads(String value, String... values) {
+            this.threads = _listAdd(this.threads, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link HotThread}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HotThread build() {
+            _checkSingleUse();
+
+            return new HotThread(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HotThread}
+     */
+    public static final JsonpDeserializer<HotThread> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HotThread::setupHotThreadDeserializer
+    );
+
+    protected static void setupHotThreadDeserializer(ObjectDeserializer<HotThread.Builder> op) {
+
+        op.add(Builder::hosts, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "hosts");
+        op.add(Builder::nodeId, JsonpDeserializer.stringDeserializer(), "node_id");
+        op.add(Builder::nodeName, JsonpDeserializer.stringDeserializer(), "node_name");
+        op.add(Builder::threads, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "threads");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfo.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfo.java
index b0977484b7..d0db0c6a49 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfo.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfo.java
@@ -32,22 +32,22 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
-import org.opensearch.client.opensearch._types.NodeRole;
-import org.opensearch.client.opensearch._types.PluginStats;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.NodeRole;
+import org.opensearch.client.opensearch._types.PluginStats;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: nodes.info.NodeInfo
 
@@ -56,919 +56,915 @@ public class NodeInfo implements JsonpSerializable {
     @Nullable
     private final Map<String, String> attributes;
 
-	private final String buildHash;
+    private final String buildHash;
+
+    private final String buildType;
+
+    private final String host;
+
+    @Nullable
+    private final NodeInfoHttp http;
+
+    private final String ip;
+
+    @Nullable
+    private final NodeJvmInfo jvm;
+
+    private final String name;
 
-	private final String buildType;
+    @Nullable
+    private final NodeInfoNetwork network;
 
-	private final String host;
+    @Nullable
+    private final NodeOperatingSystemInfo os;
 
-	@Nullable
-	private final NodeInfoHttp http;
+    private final List<PluginStats> plugins;
 
-	private final String ip;
+    @Nullable
+    private final NodeProcessInfo process;
 
-	@Nullable
-	private final NodeJvmInfo jvm;
+    private final List<NodeRole> roles;
 
-	private final String name;
+    @Nullable
+    private final NodeInfoSettings settings;
 
-	@Nullable
-	private final NodeInfoNetwork network;
+    private final Map<String, NodeThreadPoolInfo> threadPool;
 
-	@Nullable
-	private final NodeOperatingSystemInfo os;
+    @Nullable
+    private final Long totalIndexingBuffer;
 
-	private final List<PluginStats> plugins;
+    @Nullable
+    private final String totalIndexingBufferInBytes;
 
-	@Nullable
-	private final NodeProcessInfo process;
+    @Nullable
+    private final NodeInfoTransport transport;
+
+    private final String transportAddress;
+
+    private final String version;
 
-	private final List<NodeRole> roles;
+    private final List<PluginStats> modules;
+
+    @Nullable
+    private final NodeInfoIngest ingest;
+
+    private final Map<String, NodeInfoAggregation> aggregations;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeInfo(Builder builder) {
+
+        this.attributes = ApiTypeHelper.unmodifiable(builder.attributes);
+        this.buildHash = ApiTypeHelper.requireNonNull(builder.buildHash, this, "buildHash");
+        this.buildType = ApiTypeHelper.requireNonNull(builder.buildType, this, "buildType");
+        this.host = ApiTypeHelper.requireNonNull(builder.host, this, "host");
+        this.http = builder.http;
+        this.ip = ApiTypeHelper.requireNonNull(builder.ip, this, "ip");
+        this.jvm = builder.jvm;
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.network = builder.network;
+        this.os = builder.os;
+        this.plugins = ApiTypeHelper.unmodifiable(builder.plugins);
+        this.process = builder.process;
+        this.roles = ApiTypeHelper.unmodifiableRequired(builder.roles, this, "roles");
+        this.settings = builder.settings;
+        this.threadPool = ApiTypeHelper.unmodifiable(builder.threadPool);
+        this.totalIndexingBuffer = builder.totalIndexingBuffer;
+        this.totalIndexingBufferInBytes = builder.totalIndexingBufferInBytes;
+        this.transport = builder.transport;
+        this.transportAddress = ApiTypeHelper.requireNonNull(builder.transportAddress, this, "transportAddress");
+        this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
+        this.modules = ApiTypeHelper.unmodifiable(builder.modules);
+        this.ingest = builder.ingest;
+        this.aggregations = ApiTypeHelper.unmodifiable(builder.aggregations);
+
+    }
+
+    public static NodeInfo of(Function<Builder, ObjectBuilder<NodeInfo>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code attributes}
+     */
+    @Nullable
+    public final Map<String, String> attributes() {
+        return this.attributes;
+    }
+
+    /**
+     * Required - Short hash of the last git commit in this release.
+     * <p>
+     * API name: {@code build_hash}
+     */
+    public final String buildHash() {
+        return this.buildHash;
+    }
+
+    /**
+     * Required - API name: {@code build_type}
+     */
+    public final String buildType() {
+        return this.buildType;
+    }
+
+    /**
+     * Required - The node's host name.
+     * <p>
+     * API name: {@code host}
+     */
+    public final String host() {
+        return this.host;
+    }
+
+    /**
+     * API name: {@code http}
+     */
+    @Nullable
+    public final NodeInfoHttp http() {
+        return this.http;
+    }
+
+    /**
+     * Required - The node's IP address.
+     * <p>
+     * API name: {@code ip}
+     */
+    public final String ip() {
+        return this.ip;
+    }
+
+    /**
+     * API name: {@code jvm}
+     */
+    @Nullable
+    public final NodeJvmInfo jvm() {
+        return this.jvm;
+    }
+
+    /**
+     * Required - The node's name
+     * <p>
+     * API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * API name: {@code network}
+     */
+    @Nullable
+    public final NodeInfoNetwork network() {
+        return this.network;
+    }
 
-	@Nullable
-	private final NodeInfoSettings settings;
+    /**
+     * API name: {@code os}
+     */
+    @Nullable
+    public final NodeOperatingSystemInfo os() {
+        return this.os;
+    }
+
+    /**
+     * API name: {@code plugins}
+     */
+    public final List<PluginStats> plugins() {
+        return this.plugins;
+    }
+
+    /**
+     * API name: {@code process}
+     */
+    @Nullable
+    public final NodeProcessInfo process() {
+        return this.process;
+    }
+
+    /**
+     * Required - API name: {@code roles}
+     */
+    public final List<NodeRole> roles() {
+        return this.roles;
+    }
+
+    /**
+     * API name: {@code settings}
+     */
+    @Nullable
+    public final NodeInfoSettings settings() {
+        return this.settings;
+    }
+
+    /**
+     * API name: {@code thread_pool}
+     */
+    public final Map<String, NodeThreadPoolInfo> threadPool() {
+        return this.threadPool;
+    }
+
+    /**
+     * Total heap allowed to be used to hold recently indexed documents before they
+     * must be written to disk. This size is a shared pool across all shards on this
+     * node, and is controlled by Indexing Buffer settings.
+     * <p>
+     * API name: {@code total_indexing_buffer}
+     */
+    @Nullable
+    public final Long totalIndexingBuffer() {
+        return this.totalIndexingBuffer;
+    }
+
+    /**
+     * Same as total_indexing_buffer, but expressed in bytes.
+     * <p>
+     * API name: {@code total_indexing_buffer_in_bytes}
+     */
+    @Nullable
+    public final String totalIndexingBufferInBytes() {
+        return this.totalIndexingBufferInBytes;
+    }
 
-	private final Map<String, NodeThreadPoolInfo> threadPool;
+    /**
+     * API name: {@code transport}
+     */
+    @Nullable
+    public final NodeInfoTransport transport() {
+        return this.transport;
+    }
+
+    /**
+     * Required - Host and port where transport HTTP connections are accepted.
+     * <p>
+     * API name: {@code transport_address}
+     */
+    public final String transportAddress() {
+        return this.transportAddress;
+    }
+
+    /**
+     * Required - Elasticsearch version running on this node.
+     * <p>
+     * API name: {@code version}
+     */
+    public final String version() {
+        return this.version;
+    }
+
+    /**
+     * API name: {@code modules}
+     */
+    public final List<PluginStats> modules() {
+        return this.modules;
+    }
+
+    /**
+     * API name: {@code ingest}
+     */
+    @Nullable
+    public final NodeInfoIngest ingest() {
+        return this.ingest;
+    }
+
+    /**
+     * API name: {@code aggregations}
+     */
+    public final Map<String, NodeInfoAggregation> aggregations() {
+        return this.aggregations;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.attributes)) {
+            generator.writeKey("attributes");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.attributes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+
+        generator.writeKey("build_hash");
+        generator.write(this.buildHash);
+
+        generator.writeKey("build_type");
+        generator.write(this.buildType);
+
+        generator.writeKey("host");
+        generator.write(this.host);
+
+        if (this.http != null) {
+            generator.writeKey("http");
+            this.http.serialize(generator, mapper);
+
+        }
+        generator.writeKey("ip");
+        generator.write(this.ip);
+
+        if (this.jvm != null) {
+            generator.writeKey("jvm");
+            this.jvm.serialize(generator, mapper);
+
+        }
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        if (this.network != null) {
+            generator.writeKey("network");
+            this.network.serialize(generator, mapper);
+
+        }
+        if (this.os != null) {
+            generator.writeKey("os");
+            this.os.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.plugins)) {
+            generator.writeKey("plugins");
+            generator.writeStartArray();
+            for (PluginStats item0 : this.plugins) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.process != null) {
+            generator.writeKey("process");
+            this.process.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.roles)) {
+            generator.writeKey("roles");
+            generator.writeStartArray();
+            for (NodeRole item0 : this.roles) {
+                item0.serialize(generator, mapper);
+            }
+            generator.writeEnd();
+
+        }
+        if (this.settings != null) {
+            generator.writeKey("settings");
+            this.settings.serialize(generator, mapper);
 
-	@Nullable
-	private final Long totalIndexingBuffer;
-
-	@Nullable
-	private final String totalIndexingBufferInBytes;
-
-	@Nullable
-	private final NodeInfoTransport transport;
-
-	private final String transportAddress;
-
-	private final String version;
-
-	private final List<PluginStats> modules;
-
-	@Nullable
-	private final NodeInfoIngest ingest;
-
-	private final Map<String, NodeInfoAggregation> aggregations;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeInfo(Builder builder) {
-
-		this.attributes = ApiTypeHelper.unmodifiable(builder.attributes);
-		this.buildHash = ApiTypeHelper.requireNonNull(builder.buildHash, this, "buildHash");
-		this.buildType = ApiTypeHelper.requireNonNull(builder.buildType, this, "buildType");
-		this.host = ApiTypeHelper.requireNonNull(builder.host, this, "host");
-		this.http = builder.http;
-		this.ip = ApiTypeHelper.requireNonNull(builder.ip, this, "ip");
-		this.jvm = builder.jvm;
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.network = builder.network;
-		this.os = builder.os;
-		this.plugins = ApiTypeHelper.unmodifiable(builder.plugins);
-		this.process = builder.process;
-		this.roles = ApiTypeHelper.unmodifiableRequired(builder.roles, this, "roles");
-		this.settings = builder.settings;
-		this.threadPool = ApiTypeHelper.unmodifiable(builder.threadPool);
-		this.totalIndexingBuffer = builder.totalIndexingBuffer;
-		this.totalIndexingBufferInBytes = builder.totalIndexingBufferInBytes;
-		this.transport = builder.transport;
-		this.transportAddress = ApiTypeHelper.requireNonNull(builder.transportAddress, this, "transportAddress");
-		this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
-		this.modules = ApiTypeHelper.unmodifiable(builder.modules);
-		this.ingest = builder.ingest;
-		this.aggregations = ApiTypeHelper.unmodifiable(builder.aggregations);
-
-	}
-
-	public static NodeInfo of(Function<Builder, ObjectBuilder<NodeInfo>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code attributes}
-	 */
-	@Nullable
-	public final Map<String, String> attributes() {
-		return this.attributes;
-	}
-
-	/**
-	 * Required - Short hash of the last git commit in this release.
-	 * <p>
-	 * API name: {@code build_hash}
-	 */
-	public final String buildHash() {
-		return this.buildHash;
-	}
-
-	/**
-	 * Required - API name: {@code build_type}
-	 */
-	public final String buildType() {
-		return this.buildType;
-	}
-
-	/**
-	 * Required - The node's host name.
-	 * <p>
-	 * API name: {@code host}
-	 */
-	public final String host() {
-		return this.host;
-	}
-
-	/**
-	 * API name: {@code http}
-	 */
-	@Nullable
-	public final NodeInfoHttp http() {
-		return this.http;
-	}
-
-	/**
-	 * Required - The node's IP address.
-	 * <p>
-	 * API name: {@code ip}
-	 */
-	public final String ip() {
-		return this.ip;
-	}
-
-	/**
-	 * API name: {@code jvm}
-	 */
-	@Nullable
-	public final NodeJvmInfo jvm() {
-		return this.jvm;
-	}
-
-	/**
-	 * Required - The node's name
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * API name: {@code network}
-	 */
-	@Nullable
-	public final NodeInfoNetwork network() {
-		return this.network;
-	}
-
-	/**
-	 * API name: {@code os}
-	 */
-	@Nullable
-	public final NodeOperatingSystemInfo os() {
-		return this.os;
-	}
-
-	/**
-	 * API name: {@code plugins}
-	 */
-	public final List<PluginStats> plugins() {
-		return this.plugins;
-	}
-
-	/**
-	 * API name: {@code process}
-	 */
-	@Nullable
-	public final NodeProcessInfo process() {
-		return this.process;
-	}
-
-	/**
-	 * Required - API name: {@code roles}
-	 */
-	public final List<NodeRole> roles() {
-		return this.roles;
-	}
-
-	/**
-	 * API name: {@code settings}
-	 */
-	@Nullable
-	public final NodeInfoSettings settings() {
-		return this.settings;
-	}
-
-	/**
-	 * API name: {@code thread_pool}
-	 */
-	public final Map<String, NodeThreadPoolInfo> threadPool() {
-		return this.threadPool;
-	}
-
-	/**
-	 * Total heap allowed to be used to hold recently indexed documents before they
-	 * must be written to disk. This size is a shared pool across all shards on this
-	 * node, and is controlled by Indexing Buffer settings.
-	 * <p>
-	 * API name: {@code total_indexing_buffer}
-	 */
-	@Nullable
-	public final Long totalIndexingBuffer() {
-		return this.totalIndexingBuffer;
-	}
-
-	/**
-	 * Same as total_indexing_buffer, but expressed in bytes.
-	 * <p>
-	 * API name: {@code total_indexing_buffer_in_bytes}
-	 */
-	@Nullable
-	public final String totalIndexingBufferInBytes() {
-		return this.totalIndexingBufferInBytes;
-	}
-
-	/**
-	 * API name: {@code transport}
-	 */
-	@Nullable
-	public final NodeInfoTransport transport() {
-		return this.transport;
-	}
-
-	/**
-	 * Required - Host and port where transport HTTP connections are accepted.
-	 * <p>
-	 * API name: {@code transport_address}
-	 */
-	public final String transportAddress() {
-		return this.transportAddress;
-	}
-
-	/**
-	 * Required - Elasticsearch version running on this node.
-	 * <p>
-	 * API name: {@code version}
-	 */
-	public final String version() {
-		return this.version;
-	}
-
-	/**
-	 * API name: {@code modules}
-	 */
-	public final List<PluginStats> modules() {
-		return this.modules;
-	}
-
-	/**
-	 * API name: {@code ingest}
-	 */
-	@Nullable
-	public final NodeInfoIngest ingest() {
-		return this.ingest;
-	}
-
-	/**
-	 * API name: {@code aggregations}
-	 */
-	public final Map<String, NodeInfoAggregation> aggregations() {
-		return this.aggregations;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.attributes)) {
-			generator.writeKey("attributes");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.attributes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-
-		generator.writeKey("build_hash");
-		generator.write(this.buildHash);
-
-		generator.writeKey("build_type");
-		generator.write(this.buildType);
-
-		generator.writeKey("host");
-		generator.write(this.host);
-
-		if (this.http != null) {
-			generator.writeKey("http");
-			this.http.serialize(generator, mapper);
-
-		}
-		generator.writeKey("ip");
-		generator.write(this.ip);
-
-		if (this.jvm != null) {
-			generator.writeKey("jvm");
-			this.jvm.serialize(generator, mapper);
-
-		}
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		if (this.network != null) {
-			generator.writeKey("network");
-			this.network.serialize(generator, mapper);
-
-		}
-		if (this.os != null) {
-			generator.writeKey("os");
-			this.os.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.plugins)) {
-			generator.writeKey("plugins");
-			generator.writeStartArray();
-			for (PluginStats item0 : this.plugins) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.process != null) {
-			generator.writeKey("process");
-			this.process.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.roles)) {
-			generator.writeKey("roles");
-			generator.writeStartArray();
-			for (NodeRole item0 : this.roles) {
-				item0.serialize(generator, mapper);
-			}
-			generator.writeEnd();
-
-		}
-		if (this.settings != null) {
-			generator.writeKey("settings");
-			this.settings.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.threadPool)) {
-			generator.writeKey("thread_pool");
-			generator.writeStartObject();
-			for (Map.Entry<String, NodeThreadPoolInfo> item0 : this.threadPool.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
+        }
+        if (ApiTypeHelper.isDefined(this.threadPool)) {
+            generator.writeKey("thread_pool");
+            generator.writeStartObject();
+            for (Map.Entry<String, NodeThreadPoolInfo> item0 : this.threadPool.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
 
-			}
-			generator.writeEnd();
+            }
+            generator.writeEnd();
 
-		}
-		if (this.totalIndexingBuffer != null) {
-			generator.writeKey("total_indexing_buffer");
-			generator.write(this.totalIndexingBuffer);
+        }
+        if (this.totalIndexingBuffer != null) {
+            generator.writeKey("total_indexing_buffer");
+            generator.write(this.totalIndexingBuffer);
 
-		}
-		if (this.totalIndexingBufferInBytes != null) {
-			generator.writeKey("total_indexing_buffer_in_bytes");
-			generator.write(this.totalIndexingBufferInBytes);
+        }
+        if (this.totalIndexingBufferInBytes != null) {
+            generator.writeKey("total_indexing_buffer_in_bytes");
+            generator.write(this.totalIndexingBufferInBytes);
 
-		}
-		if (this.transport != null) {
-			generator.writeKey("transport");
-			this.transport.serialize(generator, mapper);
+        }
+        if (this.transport != null) {
+            generator.writeKey("transport");
+            this.transport.serialize(generator, mapper);
 
-		}
-		generator.writeKey("transport_address");
-		generator.write(this.transportAddress);
+        }
+        generator.writeKey("transport_address");
+        generator.write(this.transportAddress);
 
-		generator.writeKey("version");
-		generator.write(this.version);
+        generator.writeKey("version");
+        generator.write(this.version);
 
-		if (ApiTypeHelper.isDefined(this.modules)) {
-			generator.writeKey("modules");
-			generator.writeStartArray();
-			for (PluginStats item0 : this.modules) {
-				item0.serialize(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.modules)) {
+            generator.writeKey("modules");
+            generator.writeStartArray();
+            for (PluginStats item0 : this.modules) {
+                item0.serialize(generator, mapper);
 
-			}
-			generator.writeEnd();
+            }
+            generator.writeEnd();
 
-		}
-		if (this.ingest != null) {
-			generator.writeKey("ingest");
-			this.ingest.serialize(generator, mapper);
+        }
+        if (this.ingest != null) {
+            generator.writeKey("ingest");
+            this.ingest.serialize(generator, mapper);
 
-		}
-		if (ApiTypeHelper.isDefined(this.aggregations)) {
-			generator.writeKey("aggregations");
-			generator.writeStartObject();
-			for (Map.Entry<String, NodeInfoAggregation> item0 : this.aggregations.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
+        }
+        if (ApiTypeHelper.isDefined(this.aggregations)) {
+            generator.writeKey("aggregations");
+            generator.writeStartObject();
+            for (Map.Entry<String, NodeInfoAggregation> item0 : this.aggregations.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
 
-			}
-			generator.writeEnd();
+            }
+            generator.writeEnd();
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeInfo}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfo> {
-	    @Nullable
-		private Map<String, String> attributes;
-
-		private String buildHash;
-
-		private String buildType;
-
-		private String host;
-
-		@Nullable
-		private NodeInfoHttp http;
-
-		private String ip;
-
-		@Nullable
-		private NodeJvmInfo jvm;
-
-		private String name;
-
-		@Nullable
-		private NodeInfoNetwork network;
-
-		@Nullable
-		private NodeOperatingSystemInfo os;
-
-		@Nullable
-		private List<PluginStats> plugins;
-
-		@Nullable
-		private NodeProcessInfo process;
-
-		private List<NodeRole> roles;
-
-		@Nullable
-		private NodeInfoSettings settings;
-
-		@Nullable
-		private Map<String, NodeThreadPoolInfo> threadPool;
-
-		@Nullable
-		private Long totalIndexingBuffer;
-
-		@Nullable
-		private String totalIndexingBufferInBytes;
-
-		@Nullable
-		private NodeInfoTransport transport;
-
-		private String transportAddress;
-
-		private String version;
-
-		@Nullable
-		private List<PluginStats> modules;
-
-		@Nullable
-		private NodeInfoIngest ingest;
-
-		@Nullable
-		private Map<String, NodeInfoAggregation> aggregations;
-
-		/**
-		 * API name: {@code attributes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>attributes</code>.
-		 */
-		public final Builder attributes(Map<String, String> map) {
-			this.attributes = _mapPutAll(this.attributes, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code attributes}
-		 * <p>
-		 * Adds an entry to <code>attributes</code>.
-		 */
-		public final Builder attributes(String key, String value) {
-			this.attributes = _mapPut(this.attributes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - Short hash of the last git commit in this release.
-		 * <p>
-		 * API name: {@code build_hash}
-		 */
-		public final Builder buildHash(String value) {
-			this.buildHash = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code build_type}
-		 */
-		public final Builder buildType(String value) {
-			this.buildType = value;
-			return this;
-		}
-
-		/**
-		 * Required - The node's host name.
-		 * <p>
-		 * API name: {@code host}
-		 */
-		public final Builder host(String value) {
-			this.host = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code http}
-		 */
-		public final Builder http(@Nullable NodeInfoHttp value) {
-			this.http = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code http}
-		 */
-		public final Builder http(Function<NodeInfoHttp.Builder, ObjectBuilder<NodeInfoHttp>> fn) {
-			return this.http(fn.apply(new NodeInfoHttp.Builder()).build());
-		}
-
-		/**
-		 * Required - The node's IP address.
-		 * <p>
-		 * API name: {@code ip}
-		 */
-		public final Builder ip(String value) {
-			this.ip = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code jvm}
-		 */
-		public final Builder jvm(@Nullable NodeJvmInfo value) {
-			this.jvm = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code jvm}
-		 */
-		public final Builder jvm(Function<NodeJvmInfo.Builder, ObjectBuilder<NodeJvmInfo>> fn) {
-			return this.jvm(fn.apply(new NodeJvmInfo.Builder()).build());
-		}
-
-		/**
-		 * Required - The node's name
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code network}
-		 */
-		public final Builder network(@Nullable NodeInfoNetwork value) {
-			this.network = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code network}
-		 */
-		public final Builder network(Function<NodeInfoNetwork.Builder, ObjectBuilder<NodeInfoNetwork>> fn) {
-			return this.network(fn.apply(new NodeInfoNetwork.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code os}
-		 */
-		public final Builder os(@Nullable NodeOperatingSystemInfo value) {
-			this.os = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code os}
-		 */
-		public final Builder os(Function<NodeOperatingSystemInfo.Builder, ObjectBuilder<NodeOperatingSystemInfo>> fn) {
-			return this.os(fn.apply(new NodeOperatingSystemInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code plugins}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>plugins</code>.
-		 */
-		public final Builder plugins(List<PluginStats> list) {
-			this.plugins = _listAddAll(this.plugins, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code plugins}
-		 * <p>
-		 * Adds one or more values to <code>plugins</code>.
-		 */
-		public final Builder plugins(PluginStats value, PluginStats... values) {
-			this.plugins = _listAdd(this.plugins, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code plugins}
-		 * <p>
-		 * Adds a value to <code>plugins</code> using a builder lambda.
-		 */
-		public final Builder plugins(Function<PluginStats.Builder, ObjectBuilder<PluginStats>> fn) {
-			return plugins(fn.apply(new PluginStats.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code process}
-		 */
-		public final Builder process(@Nullable NodeProcessInfo value) {
-			this.process = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code process}
-		 */
-		public final Builder process(Function<NodeProcessInfo.Builder, ObjectBuilder<NodeProcessInfo>> fn) {
-			return this.process(fn.apply(new NodeProcessInfo.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code roles}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>roles</code>.
-		 */
-		public final Builder roles(List<NodeRole> list) {
-			this.roles = _listAddAll(this.roles, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code roles}
-		 * <p>
-		 * Adds one or more values to <code>roles</code>.
-		 */
-		public final Builder roles(NodeRole value, NodeRole... values) {
-			this.roles = _listAdd(this.roles, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code settings}
-		 */
-		public final Builder settings(@Nullable NodeInfoSettings value) {
-			this.settings = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code settings}
-		 */
-		public final Builder settings(Function<NodeInfoSettings.Builder, ObjectBuilder<NodeInfoSettings>> fn) {
-			return this.settings(fn.apply(new NodeInfoSettings.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code thread_pool}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>threadPool</code>.
-		 */
-		public final Builder threadPool(Map<String, NodeThreadPoolInfo> map) {
-			this.threadPool = _mapPutAll(this.threadPool, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code thread_pool}
-		 * <p>
-		 * Adds an entry to <code>threadPool</code>.
-		 */
-		public final Builder threadPool(String key, NodeThreadPoolInfo value) {
-			this.threadPool = _mapPut(this.threadPool, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code thread_pool}
-		 * <p>
-		 * Adds an entry to <code>threadPool</code> using a builder lambda.
-		 */
-		public final Builder threadPool(String key,
-				Function<NodeThreadPoolInfo.Builder, ObjectBuilder<NodeThreadPoolInfo>> fn) {
-			return threadPool(key, fn.apply(new NodeThreadPoolInfo.Builder()).build());
-		}
-
-		/**
-		 * Total heap allowed to be used to hold recently indexed documents before they
-		 * must be written to disk. This size is a shared pool across all shards on this
-		 * node, and is controlled by Indexing Buffer settings.
-		 * <p>
-		 * API name: {@code total_indexing_buffer}
-		 */
-		public final Builder totalIndexingBuffer(@Nullable Long value) {
-			this.totalIndexingBuffer = value;
-			return this;
-		}
-
-		/**
-		 * Same as total_indexing_buffer, but expressed in bytes.
-		 * <p>
-		 * API name: {@code total_indexing_buffer_in_bytes}
-		 */
-		public final Builder totalIndexingBufferInBytes(@Nullable String value) {
-			this.totalIndexingBufferInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code transport}
-		 */
-		public final Builder transport(@Nullable NodeInfoTransport value) {
-			this.transport = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code transport}
-		 */
-		public final Builder transport(Function<NodeInfoTransport.Builder, ObjectBuilder<NodeInfoTransport>> fn) {
-			return this.transport(fn.apply(new NodeInfoTransport.Builder()).build());
-		}
-
-		/**
-		 * Required - Host and port where transport HTTP connections are accepted.
-		 * <p>
-		 * API name: {@code transport_address}
-		 */
-		public final Builder transportAddress(String value) {
-			this.transportAddress = value;
-			return this;
-		}
-
-		/**
-		 * Required - Elasticsearch version running on this node.
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder version(String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code modules}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>modules</code>.
-		 */
-		public final Builder modules(List<PluginStats> list) {
-			this.modules = _listAddAll(this.modules, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code modules}
-		 * <p>
-		 * Adds one or more values to <code>modules</code>.
-		 */
-		public final Builder modules(PluginStats value, PluginStats... values) {
-			this.modules = _listAdd(this.modules, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code modules}
-		 * <p>
-		 * Adds a value to <code>modules</code> using a builder lambda.
-		 */
-		public final Builder modules(Function<PluginStats.Builder, ObjectBuilder<PluginStats>> fn) {
-			return modules(fn.apply(new PluginStats.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code ingest}
-		 */
-		public final Builder ingest(@Nullable NodeInfoIngest value) {
-			this.ingest = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ingest}
-		 */
-		public final Builder ingest(Function<NodeInfoIngest.Builder, ObjectBuilder<NodeInfoIngest>> fn) {
-			return this.ingest(fn.apply(new NodeInfoIngest.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code aggregations}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aggregations</code>.
-		 */
-		public final Builder aggregations(Map<String, NodeInfoAggregation> map) {
-			this.aggregations = _mapPutAll(this.aggregations, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aggregations}
-		 * <p>
-		 * Adds an entry to <code>aggregations</code>.
-		 */
-		public final Builder aggregations(String key, NodeInfoAggregation value) {
-			this.aggregations = _mapPut(this.aggregations, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code aggregations}
-		 * <p>
-		 * Adds an entry to <code>aggregations</code> using a builder lambda.
-		 */
-		public final Builder aggregations(String key,
-				Function<NodeInfoAggregation.Builder, ObjectBuilder<NodeInfoAggregation>> fn) {
-			return aggregations(key, fn.apply(new NodeInfoAggregation.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link NodeInfo}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfo build() {
-			_checkSingleUse();
-
-			return new NodeInfo(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeInfo}
-	 */
-	public static final JsonpDeserializer<NodeInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeInfo::setupNodeInfoDeserializer);
-
-	protected static void setupNodeInfoDeserializer(ObjectDeserializer<NodeInfo.Builder> op) {
-
-		op.add(Builder::attributes, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
-				"attributes");
-		op.add(Builder::buildHash, JsonpDeserializer.stringDeserializer(), "build_hash");
-		op.add(Builder::buildType, JsonpDeserializer.stringDeserializer(), "build_type");
-		op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host");
-		op.add(Builder::http, NodeInfoHttp._DESERIALIZER, "http");
-		op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip");
-		op.add(Builder::jvm, NodeJvmInfo._DESERIALIZER, "jvm");
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::network, NodeInfoNetwork._DESERIALIZER, "network");
-		op.add(Builder::os, NodeOperatingSystemInfo._DESERIALIZER, "os");
-		op.add(Builder::plugins, JsonpDeserializer.arrayDeserializer(PluginStats._DESERIALIZER), "plugins");
-		op.add(Builder::process, NodeProcessInfo._DESERIALIZER, "process");
-		op.add(Builder::roles, JsonpDeserializer.arrayDeserializer(NodeRole._DESERIALIZER), "roles");
-		op.add(Builder::settings, NodeInfoSettings._DESERIALIZER, "settings");
-		op.add(Builder::threadPool, JsonpDeserializer.stringMapDeserializer(NodeThreadPoolInfo._DESERIALIZER),
-				"thread_pool");
-		op.add(Builder::totalIndexingBuffer, JsonpDeserializer.longDeserializer(), "total_indexing_buffer");
-		op.add(Builder::totalIndexingBufferInBytes, JsonpDeserializer.stringDeserializer(),
-				"total_indexing_buffer_in_bytes");
-		op.add(Builder::transport, NodeInfoTransport._DESERIALIZER, "transport");
-		op.add(Builder::transportAddress, JsonpDeserializer.stringDeserializer(), "transport_address");
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
-		op.add(Builder::modules, JsonpDeserializer.arrayDeserializer(PluginStats._DESERIALIZER), "modules");
-		op.add(Builder::ingest, NodeInfoIngest._DESERIALIZER, "ingest");
-		op.add(Builder::aggregations, JsonpDeserializer.stringMapDeserializer(NodeInfoAggregation._DESERIALIZER),
-				"aggregations");
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeInfo}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfo> {
+        @Nullable
+        private Map<String, String> attributes;
+
+        private String buildHash;
+
+        private String buildType;
+
+        private String host;
+
+        @Nullable
+        private NodeInfoHttp http;
+
+        private String ip;
+
+        @Nullable
+        private NodeJvmInfo jvm;
+
+        private String name;
+
+        @Nullable
+        private NodeInfoNetwork network;
+
+        @Nullable
+        private NodeOperatingSystemInfo os;
+
+        @Nullable
+        private List<PluginStats> plugins;
+
+        @Nullable
+        private NodeProcessInfo process;
+
+        private List<NodeRole> roles;
+
+        @Nullable
+        private NodeInfoSettings settings;
+
+        @Nullable
+        private Map<String, NodeThreadPoolInfo> threadPool;
+
+        @Nullable
+        private Long totalIndexingBuffer;
+
+        @Nullable
+        private String totalIndexingBufferInBytes;
+
+        @Nullable
+        private NodeInfoTransport transport;
+
+        private String transportAddress;
+
+        private String version;
+
+        @Nullable
+        private List<PluginStats> modules;
+
+        @Nullable
+        private NodeInfoIngest ingest;
+
+        @Nullable
+        private Map<String, NodeInfoAggregation> aggregations;
+
+        /**
+         * API name: {@code attributes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>attributes</code>.
+         */
+        public final Builder attributes(Map<String, String> map) {
+            this.attributes = _mapPutAll(this.attributes, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code attributes}
+         * <p>
+         * Adds an entry to <code>attributes</code>.
+         */
+        public final Builder attributes(String key, String value) {
+            this.attributes = _mapPut(this.attributes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - Short hash of the last git commit in this release.
+         * <p>
+         * API name: {@code build_hash}
+         */
+        public final Builder buildHash(String value) {
+            this.buildHash = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code build_type}
+         */
+        public final Builder buildType(String value) {
+            this.buildType = value;
+            return this;
+        }
+
+        /**
+         * Required - The node's host name.
+         * <p>
+         * API name: {@code host}
+         */
+        public final Builder host(String value) {
+            this.host = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code http}
+         */
+        public final Builder http(@Nullable NodeInfoHttp value) {
+            this.http = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code http}
+         */
+        public final Builder http(Function<NodeInfoHttp.Builder, ObjectBuilder<NodeInfoHttp>> fn) {
+            return this.http(fn.apply(new NodeInfoHttp.Builder()).build());
+        }
+
+        /**
+         * Required - The node's IP address.
+         * <p>
+         * API name: {@code ip}
+         */
+        public final Builder ip(String value) {
+            this.ip = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code jvm}
+         */
+        public final Builder jvm(@Nullable NodeJvmInfo value) {
+            this.jvm = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code jvm}
+         */
+        public final Builder jvm(Function<NodeJvmInfo.Builder, ObjectBuilder<NodeJvmInfo>> fn) {
+            return this.jvm(fn.apply(new NodeJvmInfo.Builder()).build());
+        }
+
+        /**
+         * Required - The node's name
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code network}
+         */
+        public final Builder network(@Nullable NodeInfoNetwork value) {
+            this.network = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code network}
+         */
+        public final Builder network(Function<NodeInfoNetwork.Builder, ObjectBuilder<NodeInfoNetwork>> fn) {
+            return this.network(fn.apply(new NodeInfoNetwork.Builder()).build());
+        }
+
+        /**
+         * API name: {@code os}
+         */
+        public final Builder os(@Nullable NodeOperatingSystemInfo value) {
+            this.os = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code os}
+         */
+        public final Builder os(Function<NodeOperatingSystemInfo.Builder, ObjectBuilder<NodeOperatingSystemInfo>> fn) {
+            return this.os(fn.apply(new NodeOperatingSystemInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code plugins}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>plugins</code>.
+         */
+        public final Builder plugins(List<PluginStats> list) {
+            this.plugins = _listAddAll(this.plugins, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code plugins}
+         * <p>
+         * Adds one or more values to <code>plugins</code>.
+         */
+        public final Builder plugins(PluginStats value, PluginStats... values) {
+            this.plugins = _listAdd(this.plugins, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code plugins}
+         * <p>
+         * Adds a value to <code>plugins</code> using a builder lambda.
+         */
+        public final Builder plugins(Function<PluginStats.Builder, ObjectBuilder<PluginStats>> fn) {
+            return plugins(fn.apply(new PluginStats.Builder()).build());
+        }
+
+        /**
+         * API name: {@code process}
+         */
+        public final Builder process(@Nullable NodeProcessInfo value) {
+            this.process = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code process}
+         */
+        public final Builder process(Function<NodeProcessInfo.Builder, ObjectBuilder<NodeProcessInfo>> fn) {
+            return this.process(fn.apply(new NodeProcessInfo.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code roles}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>roles</code>.
+         */
+        public final Builder roles(List<NodeRole> list) {
+            this.roles = _listAddAll(this.roles, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code roles}
+         * <p>
+         * Adds one or more values to <code>roles</code>.
+         */
+        public final Builder roles(NodeRole value, NodeRole... values) {
+            this.roles = _listAdd(this.roles, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code settings}
+         */
+        public final Builder settings(@Nullable NodeInfoSettings value) {
+            this.settings = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code settings}
+         */
+        public final Builder settings(Function<NodeInfoSettings.Builder, ObjectBuilder<NodeInfoSettings>> fn) {
+            return this.settings(fn.apply(new NodeInfoSettings.Builder()).build());
+        }
+
+        /**
+         * API name: {@code thread_pool}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>threadPool</code>.
+         */
+        public final Builder threadPool(Map<String, NodeThreadPoolInfo> map) {
+            this.threadPool = _mapPutAll(this.threadPool, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code thread_pool}
+         * <p>
+         * Adds an entry to <code>threadPool</code>.
+         */
+        public final Builder threadPool(String key, NodeThreadPoolInfo value) {
+            this.threadPool = _mapPut(this.threadPool, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code thread_pool}
+         * <p>
+         * Adds an entry to <code>threadPool</code> using a builder lambda.
+         */
+        public final Builder threadPool(String key, Function<NodeThreadPoolInfo.Builder, ObjectBuilder<NodeThreadPoolInfo>> fn) {
+            return threadPool(key, fn.apply(new NodeThreadPoolInfo.Builder()).build());
+        }
+
+        /**
+         * Total heap allowed to be used to hold recently indexed documents before they
+         * must be written to disk. This size is a shared pool across all shards on this
+         * node, and is controlled by Indexing Buffer settings.
+         * <p>
+         * API name: {@code total_indexing_buffer}
+         */
+        public final Builder totalIndexingBuffer(@Nullable Long value) {
+            this.totalIndexingBuffer = value;
+            return this;
+        }
+
+        /**
+         * Same as total_indexing_buffer, but expressed in bytes.
+         * <p>
+         * API name: {@code total_indexing_buffer_in_bytes}
+         */
+        public final Builder totalIndexingBufferInBytes(@Nullable String value) {
+            this.totalIndexingBufferInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code transport}
+         */
+        public final Builder transport(@Nullable NodeInfoTransport value) {
+            this.transport = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code transport}
+         */
+        public final Builder transport(Function<NodeInfoTransport.Builder, ObjectBuilder<NodeInfoTransport>> fn) {
+            return this.transport(fn.apply(new NodeInfoTransport.Builder()).build());
+        }
+
+        /**
+         * Required - Host and port where transport HTTP connections are accepted.
+         * <p>
+         * API name: {@code transport_address}
+         */
+        public final Builder transportAddress(String value) {
+            this.transportAddress = value;
+            return this;
+        }
+
+        /**
+         * Required - Elasticsearch version running on this node.
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder version(String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code modules}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>modules</code>.
+         */
+        public final Builder modules(List<PluginStats> list) {
+            this.modules = _listAddAll(this.modules, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code modules}
+         * <p>
+         * Adds one or more values to <code>modules</code>.
+         */
+        public final Builder modules(PluginStats value, PluginStats... values) {
+            this.modules = _listAdd(this.modules, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code modules}
+         * <p>
+         * Adds a value to <code>modules</code> using a builder lambda.
+         */
+        public final Builder modules(Function<PluginStats.Builder, ObjectBuilder<PluginStats>> fn) {
+            return modules(fn.apply(new PluginStats.Builder()).build());
+        }
+
+        /**
+         * API name: {@code ingest}
+         */
+        public final Builder ingest(@Nullable NodeInfoIngest value) {
+            this.ingest = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ingest}
+         */
+        public final Builder ingest(Function<NodeInfoIngest.Builder, ObjectBuilder<NodeInfoIngest>> fn) {
+            return this.ingest(fn.apply(new NodeInfoIngest.Builder()).build());
+        }
+
+        /**
+         * API name: {@code aggregations}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aggregations</code>.
+         */
+        public final Builder aggregations(Map<String, NodeInfoAggregation> map) {
+            this.aggregations = _mapPutAll(this.aggregations, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code aggregations}
+         * <p>
+         * Adds an entry to <code>aggregations</code>.
+         */
+        public final Builder aggregations(String key, NodeInfoAggregation value) {
+            this.aggregations = _mapPut(this.aggregations, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code aggregations}
+         * <p>
+         * Adds an entry to <code>aggregations</code> using a builder lambda.
+         */
+        public final Builder aggregations(String key, Function<NodeInfoAggregation.Builder, ObjectBuilder<NodeInfoAggregation>> fn) {
+            return aggregations(key, fn.apply(new NodeInfoAggregation.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link NodeInfo}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfo build() {
+            _checkSingleUse();
+
+            return new NodeInfo(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeInfo}
+     */
+    public static final JsonpDeserializer<NodeInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfo::setupNodeInfoDeserializer
+    );
+
+    protected static void setupNodeInfoDeserializer(ObjectDeserializer<NodeInfo.Builder> op) {
+
+        op.add(Builder::attributes, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "attributes");
+        op.add(Builder::buildHash, JsonpDeserializer.stringDeserializer(), "build_hash");
+        op.add(Builder::buildType, JsonpDeserializer.stringDeserializer(), "build_type");
+        op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host");
+        op.add(Builder::http, NodeInfoHttp._DESERIALIZER, "http");
+        op.add(Builder::ip, JsonpDeserializer.stringDeserializer(), "ip");
+        op.add(Builder::jvm, NodeJvmInfo._DESERIALIZER, "jvm");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::network, NodeInfoNetwork._DESERIALIZER, "network");
+        op.add(Builder::os, NodeOperatingSystemInfo._DESERIALIZER, "os");
+        op.add(Builder::plugins, JsonpDeserializer.arrayDeserializer(PluginStats._DESERIALIZER), "plugins");
+        op.add(Builder::process, NodeProcessInfo._DESERIALIZER, "process");
+        op.add(Builder::roles, JsonpDeserializer.arrayDeserializer(NodeRole._DESERIALIZER), "roles");
+        op.add(Builder::settings, NodeInfoSettings._DESERIALIZER, "settings");
+        op.add(Builder::threadPool, JsonpDeserializer.stringMapDeserializer(NodeThreadPoolInfo._DESERIALIZER), "thread_pool");
+        op.add(Builder::totalIndexingBuffer, JsonpDeserializer.longDeserializer(), "total_indexing_buffer");
+        op.add(Builder::totalIndexingBufferInBytes, JsonpDeserializer.stringDeserializer(), "total_indexing_buffer_in_bytes");
+        op.add(Builder::transport, NodeInfoTransport._DESERIALIZER, "transport");
+        op.add(Builder::transportAddress, JsonpDeserializer.stringDeserializer(), "transport_address");
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
+        op.add(Builder::modules, JsonpDeserializer.arrayDeserializer(PluginStats._DESERIALIZER), "modules");
+        op.add(Builder::ingest, NodeInfoIngest._DESERIALIZER, "ingest");
+        op.add(Builder::aggregations, JsonpDeserializer.stringMapDeserializer(NodeInfoAggregation._DESERIALIZER), "aggregations");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoAction.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoAction.java
index ea0cc2a5cf..42301372eb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoAction.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoAction.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,93 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoAction
 
 @JsonpDeserializable
 public class NodeInfoAction implements JsonpSerializable {
-	private final String destructiveRequiresName;
+    private final String destructiveRequiresName;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private NodeInfoAction(Builder builder) {
+    private NodeInfoAction(Builder builder) {
 
-		this.destructiveRequiresName = ApiTypeHelper.requireNonNull(builder.destructiveRequiresName, this,
-				"destructiveRequiresName");
+        this.destructiveRequiresName = ApiTypeHelper.requireNonNull(builder.destructiveRequiresName, this, "destructiveRequiresName");
 
-	}
+    }
 
-	public static NodeInfoAction of(Function<Builder, ObjectBuilder<NodeInfoAction>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static NodeInfoAction of(Function<Builder, ObjectBuilder<NodeInfoAction>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code destructive_requires_name}
-	 */
-	public final String destructiveRequiresName() {
-		return this.destructiveRequiresName;
-	}
+    /**
+     * Required - API name: {@code destructive_requires_name}
+     */
+    public final String destructiveRequiresName() {
+        return this.destructiveRequiresName;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("destructive_requires_name");
-		generator.write(this.destructiveRequiresName);
+        generator.writeKey("destructive_requires_name");
+        generator.write(this.destructiveRequiresName);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link NodeInfoAction}.
-	 */
+    /**
+     * Builder for {@link NodeInfoAction}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoAction> {
-		private String destructiveRequiresName;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoAction> {
+        private String destructiveRequiresName;
 
-		/**
-		 * Required - API name: {@code destructive_requires_name}
-		 */
-		public final Builder destructiveRequiresName(String value) {
-			this.destructiveRequiresName = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code destructive_requires_name}
+         */
+        public final Builder destructiveRequiresName(String value) {
+            this.destructiveRequiresName = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link NodeInfoAction}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoAction build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link NodeInfoAction}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoAction build() {
+            _checkSingleUse();
 
-			return new NodeInfoAction(this);
-		}
-	}
+            return new NodeInfoAction(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link NodeInfoAction}
-	 */
-	public static final JsonpDeserializer<NodeInfoAction> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeInfoAction::setupNodeInfoActionDeserializer);
+    /**
+     * Json deserializer for {@link NodeInfoAction}
+     */
+    public static final JsonpDeserializer<NodeInfoAction> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoAction::setupNodeInfoActionDeserializer
+    );
 
-	protected static void setupNodeInfoActionDeserializer(ObjectDeserializer<NodeInfoAction.Builder> op) {
+    protected static void setupNodeInfoActionDeserializer(ObjectDeserializer<NodeInfoAction.Builder> op) {
 
-		op.add(Builder::destructiveRequiresName, JsonpDeserializer.stringDeserializer(), "destructive_requires_name");
+        op.add(Builder::destructiveRequiresName, JsonpDeserializer.stringDeserializer(), "destructive_requires_name");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoAggregation.java
index 759e8a0ed4..542c0e2983 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoAggregation.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoAggregation.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,113 +44,112 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoAggregation
 
 @JsonpDeserializable
 public class NodeInfoAggregation implements JsonpSerializable {
-	private final List<String> types;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeInfoAggregation(Builder builder) {
-
-		this.types = ApiTypeHelper.unmodifiableRequired(builder.types, this, "types");
-
-	}
-
-	public static NodeInfoAggregation of(Function<Builder, ObjectBuilder<NodeInfoAggregation>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code types}
-	 */
-	public final List<String> types() {
-		return this.types;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.types)) {
-			generator.writeKey("types");
-			generator.writeStartArray();
-			for (String item0 : this.types) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeInfoAggregation}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoAggregation> {
-		private List<String> types;
-
-		/**
-		 * Required - API name: {@code types}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>types</code>.
-		 */
-		public final Builder types(List<String> list) {
-			this.types = _listAddAll(this.types, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code types}
-		 * <p>
-		 * Adds one or more values to <code>types</code>.
-		 */
-		public final Builder types(String value, String... values) {
-			this.types = _listAdd(this.types, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeInfoAggregation}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoAggregation build() {
-			_checkSingleUse();
-
-			return new NodeInfoAggregation(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeInfoAggregation}
-	 */
-	public static final JsonpDeserializer<NodeInfoAggregation> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoAggregation::setupNodeInfoAggregationDeserializer);
-
-	protected static void setupNodeInfoAggregationDeserializer(ObjectDeserializer<NodeInfoAggregation.Builder> op) {
-
-		op.add(Builder::types, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "types");
-
-	}
+    private final List<String> types;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeInfoAggregation(Builder builder) {
+
+        this.types = ApiTypeHelper.unmodifiableRequired(builder.types, this, "types");
+
+    }
+
+    public static NodeInfoAggregation of(Function<Builder, ObjectBuilder<NodeInfoAggregation>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code types}
+     */
+    public final List<String> types() {
+        return this.types;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.types)) {
+            generator.writeKey("types");
+            generator.writeStartArray();
+            for (String item0 : this.types) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeInfoAggregation}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoAggregation> {
+        private List<String> types;
+
+        /**
+         * Required - API name: {@code types}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>types</code>.
+         */
+        public final Builder types(List<String> list) {
+            this.types = _listAddAll(this.types, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code types}
+         * <p>
+         * Adds one or more values to <code>types</code>.
+         */
+        public final Builder types(String value, String... values) {
+            this.types = _listAdd(this.types, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeInfoAggregation}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoAggregation build() {
+            _checkSingleUse();
+
+            return new NodeInfoAggregation(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeInfoAggregation}
+     */
+    public static final JsonpDeserializer<NodeInfoAggregation> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoAggregation::setupNodeInfoAggregationDeserializer
+    );
+
+    protected static void setupNodeInfoAggregationDeserializer(ObjectDeserializer<NodeInfoAggregation.Builder> op) {
+
+        op.add(Builder::types, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "types");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoBootstrap.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoBootstrap.java
index 5b4067c96d..002163cf7c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoBootstrap.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoBootstrap.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,92 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoBootstrap
 
 @JsonpDeserializable
 public class NodeInfoBootstrap implements JsonpSerializable {
-	private final String memoryLock;
+    private final String memoryLock;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private NodeInfoBootstrap(Builder builder) {
+    private NodeInfoBootstrap(Builder builder) {
 
-		this.memoryLock = ApiTypeHelper.requireNonNull(builder.memoryLock, this, "memoryLock");
+        this.memoryLock = ApiTypeHelper.requireNonNull(builder.memoryLock, this, "memoryLock");
 
-	}
+    }
 
-	public static NodeInfoBootstrap of(Function<Builder, ObjectBuilder<NodeInfoBootstrap>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static NodeInfoBootstrap of(Function<Builder, ObjectBuilder<NodeInfoBootstrap>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code memory_lock}
-	 */
-	public final String memoryLock() {
-		return this.memoryLock;
-	}
+    /**
+     * Required - API name: {@code memory_lock}
+     */
+    public final String memoryLock() {
+        return this.memoryLock;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("memory_lock");
-		generator.write(this.memoryLock);
+        generator.writeKey("memory_lock");
+        generator.write(this.memoryLock);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link NodeInfoBootstrap}.
-	 */
+    /**
+     * Builder for {@link NodeInfoBootstrap}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoBootstrap> {
-		private String memoryLock;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoBootstrap> {
+        private String memoryLock;
 
-		/**
-		 * Required - API name: {@code memory_lock}
-		 */
-		public final Builder memoryLock(String value) {
-			this.memoryLock = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code memory_lock}
+         */
+        public final Builder memoryLock(String value) {
+            this.memoryLock = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link NodeInfoBootstrap}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoBootstrap build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link NodeInfoBootstrap}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoBootstrap build() {
+            _checkSingleUse();
 
-			return new NodeInfoBootstrap(this);
-		}
-	}
+            return new NodeInfoBootstrap(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link NodeInfoBootstrap}
-	 */
-	public static final JsonpDeserializer<NodeInfoBootstrap> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoBootstrap::setupNodeInfoBootstrapDeserializer);
+    /**
+     * Json deserializer for {@link NodeInfoBootstrap}
+     */
+    public static final JsonpDeserializer<NodeInfoBootstrap> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoBootstrap::setupNodeInfoBootstrapDeserializer
+    );
 
-	protected static void setupNodeInfoBootstrapDeserializer(ObjectDeserializer<NodeInfoBootstrap.Builder> op) {
+    protected static void setupNodeInfoBootstrapDeserializer(ObjectDeserializer<NodeInfoBootstrap.Builder> op) {
 
-		op.add(Builder::memoryLock, JsonpDeserializer.stringDeserializer(), "memory_lock");
+        op.add(Builder::memoryLock, JsonpDeserializer.stringDeserializer(), "memory_lock");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoClient.java
index 8d1c3ff09e..8217625004 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoClient.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,92 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoClient
 
 @JsonpDeserializable
 public class NodeInfoClient implements JsonpSerializable {
-	private final String type;
+    private final String type;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private NodeInfoClient(Builder builder) {
+    private NodeInfoClient(Builder builder) {
 
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
 
-	}
+    }
 
-	public static NodeInfoClient of(Function<Builder, ObjectBuilder<NodeInfoClient>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static NodeInfoClient of(Function<Builder, ObjectBuilder<NodeInfoClient>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("type");
-		generator.write(this.type);
+        generator.writeKey("type");
+        generator.write(this.type);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link NodeInfoClient}.
-	 */
+    /**
+     * Builder for {@link NodeInfoClient}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoClient> {
-		private String type;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoClient> {
+        private String type;
 
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link NodeInfoClient}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoClient build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link NodeInfoClient}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoClient build() {
+            _checkSingleUse();
 
-			return new NodeInfoClient(this);
-		}
-	}
+            return new NodeInfoClient(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link NodeInfoClient}
-	 */
-	public static final JsonpDeserializer<NodeInfoClient> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeInfoClient::setupNodeInfoClientDeserializer);
+    /**
+     * Json deserializer for {@link NodeInfoClient}
+     */
+    public static final JsonpDeserializer<NodeInfoClient> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoClient::setupNodeInfoClientDeserializer
+    );
 
-	protected static void setupNodeInfoClientDeserializer(ObjectDeserializer<NodeInfoClient.Builder> op) {
+    protected static void setupNodeInfoClientDeserializer(ObjectDeserializer<NodeInfoClient.Builder> op) {
 
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoDiscover.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoDiscover.java
index 3690f1cd10..52430e25d7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoDiscover.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoDiscover.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,13 +45,6 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Function;
-
-import javax.annotation.Nullable;
 
 // typedef: nodes.info.NodeInfoDiscover
 
@@ -55,85 +53,87 @@ public class NodeInfoDiscover implements JsonpSerializable {
     @Nullable
     private final List<String> seedHosts;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeInfoDiscover(Builder builder) {
-
-		this.seedHosts = builder.seedHosts;
-
-	}
-
-	public static NodeInfoDiscover of(Function<Builder, ObjectBuilder<NodeInfoDiscover>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code seed_hosts}
-	 */
-	public final List<String> seedHosts() {
-		return Collections.unmodifiableList(this.seedHosts);
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-	    if (this.seedHosts != null) {
-    	    generator.writeStartArray("seed_hosts");
-    	    this.seedHosts.forEach(generator::write);
-    	    generator.writeEnd();
-	    }
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeInfoDiscover}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoDiscover> {
-	    @Nullable
-	    private List<String> seedHosts;
-
-		/**
-		 * API name: {@code seed_hosts}
-		 */
-		public final Builder seedHosts(List<String> values) {
-			this.seedHosts = values;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeInfoDiscover}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoDiscover build() {
-			_checkSingleUse();
-
-			return new NodeInfoDiscover(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeInfoDiscover}
-	 */
-	public static final JsonpDeserializer<NodeInfoDiscover> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeInfoDiscover::setupNodeInfoDiscoverDeserializer);
-
-	protected static void setupNodeInfoDiscoverDeserializer(ObjectDeserializer<NodeInfoDiscover.Builder> op) {
-
-		op.add(Builder::seedHosts, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "seed_hosts");
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeInfoDiscover(Builder builder) {
+
+        this.seedHosts = builder.seedHosts;
+
+    }
+
+    public static NodeInfoDiscover of(Function<Builder, ObjectBuilder<NodeInfoDiscover>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code seed_hosts}
+     */
+    public final List<String> seedHosts() {
+        return Collections.unmodifiableList(this.seedHosts);
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        if (this.seedHosts != null) {
+            generator.writeStartArray("seed_hosts");
+            this.seedHosts.forEach(generator::write);
+            generator.writeEnd();
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeInfoDiscover}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoDiscover> {
+        @Nullable
+        private List<String> seedHosts;
+
+        /**
+         * API name: {@code seed_hosts}
+         */
+        public final Builder seedHosts(List<String> values) {
+            this.seedHosts = values;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeInfoDiscover}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoDiscover build() {
+            _checkSingleUse();
+
+            return new NodeInfoDiscover(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeInfoDiscover}
+     */
+    public static final JsonpDeserializer<NodeInfoDiscover> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoDiscover::setupNodeInfoDiscoverDeserializer
+    );
+
+    protected static void setupNodeInfoDiscoverDeserializer(ObjectDeserializer<NodeInfoDiscover.Builder> op) {
+
+        op.add(Builder::seedHosts, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "seed_hosts");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoHttp.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoHttp.java
index e39d45053e..17ecc5bf6a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoHttp.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoHttp.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,192 +45,188 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: nodes.info.NodeInfoHttp
 
 @JsonpDeserializable
 public class NodeInfoHttp implements JsonpSerializable {
-	private final List<String> boundAddress;
+    private final List<String> boundAddress;
+
+    @Nullable
+    private final String maxContentLength;
 
-	@Nullable
-	private final String maxContentLength;
+    private final long maxContentLengthInBytes;
 
-	private final long maxContentLengthInBytes;
+    private final String publishAddress;
 
-	private final String publishAddress;
+    // ---------------------------------------------------------------------------------------------
 
-	// ---------------------------------------------------------------------------------------------
+    private NodeInfoHttp(Builder builder) {
 
-	private NodeInfoHttp(Builder builder) {
-
-		this.boundAddress = ApiTypeHelper.unmodifiableRequired(builder.boundAddress, this, "boundAddress");
-		this.maxContentLength = builder.maxContentLength;
-		this.maxContentLengthInBytes = ApiTypeHelper.requireNonNull(builder.maxContentLengthInBytes, this,
-				"maxContentLengthInBytes");
-		this.publishAddress = ApiTypeHelper.requireNonNull(builder.publishAddress, this, "publishAddress");
-
-	}
-
-	public static NodeInfoHttp of(Function<Builder, ObjectBuilder<NodeInfoHttp>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code bound_address}
-	 */
-	public final List<String> boundAddress() {
-		return this.boundAddress;
-	}
-
-	/**
-	 * API name: {@code max_content_length}
-	 */
-	@Nullable
-	public final String maxContentLength() {
-		return this.maxContentLength;
-	}
-
-	/**
-	 * Required - API name: {@code max_content_length_in_bytes}
-	 */
-	public final long maxContentLengthInBytes() {
-		return this.maxContentLengthInBytes;
-	}
-
-	/**
-	 * Required - API name: {@code publish_address}
-	 */
-	public final String publishAddress() {
-		return this.publishAddress;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.boundAddress)) {
-			generator.writeKey("bound_address");
-			generator.writeStartArray();
-			for (String item0 : this.boundAddress) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.maxContentLength != null) {
-			generator.writeKey("max_content_length");
-			generator.write(this.maxContentLength);
-
-		}
-		generator.writeKey("max_content_length_in_bytes");
-		generator.write(this.maxContentLengthInBytes);
-
-		generator.writeKey("publish_address");
-		generator.write(this.publishAddress);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeInfoHttp}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoHttp> {
-		private List<String> boundAddress;
-
-		@Nullable
-		private String maxContentLength;
-
-		private Long maxContentLengthInBytes;
-
-		private String publishAddress;
-
-		/**
-		 * Required - API name: {@code bound_address}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>boundAddress</code>.
-		 */
-		public final Builder boundAddress(List<String> list) {
-			this.boundAddress = _listAddAll(this.boundAddress, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code bound_address}
-		 * <p>
-		 * Adds one or more values to <code>boundAddress</code>.
-		 */
-		public final Builder boundAddress(String value, String... values) {
-			this.boundAddress = _listAdd(this.boundAddress, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_content_length}
-		 */
-		public final Builder maxContentLength(@Nullable String value) {
-			this.maxContentLength = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code max_content_length_in_bytes}
-		 */
-		public final Builder maxContentLengthInBytes(long value) {
-			this.maxContentLengthInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code publish_address}
-		 */
-		public final Builder publishAddress(String value) {
-			this.publishAddress = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeInfoHttp}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoHttp build() {
-			_checkSingleUse();
-
-			return new NodeInfoHttp(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeInfoHttp}
-	 */
-	public static final JsonpDeserializer<NodeInfoHttp> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeInfoHttp::setupNodeInfoHttpDeserializer);
-
-	protected static void setupNodeInfoHttpDeserializer(ObjectDeserializer<NodeInfoHttp.Builder> op) {
-
-		op.add(Builder::boundAddress, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"bound_address");
-		op.add(Builder::maxContentLength, JsonpDeserializer.stringDeserializer(), "max_content_length");
-		op.add(Builder::maxContentLengthInBytes, JsonpDeserializer.longDeserializer(), "max_content_length_in_bytes");
-		op.add(Builder::publishAddress, JsonpDeserializer.stringDeserializer(), "publish_address");
-
-	}
+        this.boundAddress = ApiTypeHelper.unmodifiableRequired(builder.boundAddress, this, "boundAddress");
+        this.maxContentLength = builder.maxContentLength;
+        this.maxContentLengthInBytes = ApiTypeHelper.requireNonNull(builder.maxContentLengthInBytes, this, "maxContentLengthInBytes");
+        this.publishAddress = ApiTypeHelper.requireNonNull(builder.publishAddress, this, "publishAddress");
+
+    }
+
+    public static NodeInfoHttp of(Function<Builder, ObjectBuilder<NodeInfoHttp>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code bound_address}
+     */
+    public final List<String> boundAddress() {
+        return this.boundAddress;
+    }
+
+    /**
+     * API name: {@code max_content_length}
+     */
+    @Nullable
+    public final String maxContentLength() {
+        return this.maxContentLength;
+    }
+
+    /**
+     * Required - API name: {@code max_content_length_in_bytes}
+     */
+    public final long maxContentLengthInBytes() {
+        return this.maxContentLengthInBytes;
+    }
+
+    /**
+     * Required - API name: {@code publish_address}
+     */
+    public final String publishAddress() {
+        return this.publishAddress;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.boundAddress)) {
+            generator.writeKey("bound_address");
+            generator.writeStartArray();
+            for (String item0 : this.boundAddress) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.maxContentLength != null) {
+            generator.writeKey("max_content_length");
+            generator.write(this.maxContentLength);
+
+        }
+        generator.writeKey("max_content_length_in_bytes");
+        generator.write(this.maxContentLengthInBytes);
+
+        generator.writeKey("publish_address");
+        generator.write(this.publishAddress);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeInfoHttp}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoHttp> {
+        private List<String> boundAddress;
+
+        @Nullable
+        private String maxContentLength;
+
+        private Long maxContentLengthInBytes;
+
+        private String publishAddress;
+
+        /**
+         * Required - API name: {@code bound_address}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>boundAddress</code>.
+         */
+        public final Builder boundAddress(List<String> list) {
+            this.boundAddress = _listAddAll(this.boundAddress, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code bound_address}
+         * <p>
+         * Adds one or more values to <code>boundAddress</code>.
+         */
+        public final Builder boundAddress(String value, String... values) {
+            this.boundAddress = _listAdd(this.boundAddress, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code max_content_length}
+         */
+        public final Builder maxContentLength(@Nullable String value) {
+            this.maxContentLength = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code max_content_length_in_bytes}
+         */
+        public final Builder maxContentLengthInBytes(long value) {
+            this.maxContentLengthInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code publish_address}
+         */
+        public final Builder publishAddress(String value) {
+            this.publishAddress = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeInfoHttp}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoHttp build() {
+            _checkSingleUse();
+
+            return new NodeInfoHttp(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeInfoHttp}
+     */
+    public static final JsonpDeserializer<NodeInfoHttp> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoHttp::setupNodeInfoHttpDeserializer
+    );
+
+    protected static void setupNodeInfoHttpDeserializer(ObjectDeserializer<NodeInfoHttp.Builder> op) {
+
+        op.add(Builder::boundAddress, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "bound_address");
+        op.add(Builder::maxContentLength, JsonpDeserializer.stringDeserializer(), "max_content_length");
+        op.add(Builder::maxContentLengthInBytes, JsonpDeserializer.longDeserializer(), "max_content_length_in_bytes");
+        op.add(Builder::publishAddress, JsonpDeserializer.stringDeserializer(), "publish_address");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoIngest.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoIngest.java
index 3fc3af4a27..7f028caf6d 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoIngest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoIngest.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,124 +44,121 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoIngest
 
 @JsonpDeserializable
 public class NodeInfoIngest implements JsonpSerializable {
-	private final List<NodeInfoIngestProcessor> processors;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeInfoIngest(Builder builder) {
-
-		this.processors = ApiTypeHelper.unmodifiableRequired(builder.processors, this, "processors");
-
-	}
-
-	public static NodeInfoIngest of(Function<Builder, ObjectBuilder<NodeInfoIngest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code processors}
-	 */
-	public final List<NodeInfoIngestProcessor> processors() {
-		return this.processors;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.processors)) {
-			generator.writeKey("processors");
-			generator.writeStartArray();
-			for (NodeInfoIngestProcessor item0 : this.processors) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeInfoIngest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoIngest> {
-		private List<NodeInfoIngestProcessor> processors;
-
-		/**
-		 * Required - API name: {@code processors}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>processors</code>.
-		 */
-		public final Builder processors(List<NodeInfoIngestProcessor> list) {
-			this.processors = _listAddAll(this.processors, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code processors}
-		 * <p>
-		 * Adds one or more values to <code>processors</code>.
-		 */
-		public final Builder processors(NodeInfoIngestProcessor value, NodeInfoIngestProcessor... values) {
-			this.processors = _listAdd(this.processors, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code processors}
-		 * <p>
-		 * Adds a value to <code>processors</code> using a builder lambda.
-		 */
-		public final Builder processors(
-				Function<NodeInfoIngestProcessor.Builder, ObjectBuilder<NodeInfoIngestProcessor>> fn) {
-			return processors(fn.apply(new NodeInfoIngestProcessor.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link NodeInfoIngest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoIngest build() {
-			_checkSingleUse();
-
-			return new NodeInfoIngest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeInfoIngest}
-	 */
-	public static final JsonpDeserializer<NodeInfoIngest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeInfoIngest::setupNodeInfoIngestDeserializer);
-
-	protected static void setupNodeInfoIngestDeserializer(ObjectDeserializer<NodeInfoIngest.Builder> op) {
-
-		op.add(Builder::processors, JsonpDeserializer.arrayDeserializer(NodeInfoIngestProcessor._DESERIALIZER),
-				"processors");
-
-	}
+    private final List<NodeInfoIngestProcessor> processors;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeInfoIngest(Builder builder) {
+
+        this.processors = ApiTypeHelper.unmodifiableRequired(builder.processors, this, "processors");
+
+    }
+
+    public static NodeInfoIngest of(Function<Builder, ObjectBuilder<NodeInfoIngest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code processors}
+     */
+    public final List<NodeInfoIngestProcessor> processors() {
+        return this.processors;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.processors)) {
+            generator.writeKey("processors");
+            generator.writeStartArray();
+            for (NodeInfoIngestProcessor item0 : this.processors) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeInfoIngest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoIngest> {
+        private List<NodeInfoIngestProcessor> processors;
+
+        /**
+         * Required - API name: {@code processors}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>processors</code>.
+         */
+        public final Builder processors(List<NodeInfoIngestProcessor> list) {
+            this.processors = _listAddAll(this.processors, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code processors}
+         * <p>
+         * Adds one or more values to <code>processors</code>.
+         */
+        public final Builder processors(NodeInfoIngestProcessor value, NodeInfoIngestProcessor... values) {
+            this.processors = _listAdd(this.processors, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code processors}
+         * <p>
+         * Adds a value to <code>processors</code> using a builder lambda.
+         */
+        public final Builder processors(Function<NodeInfoIngestProcessor.Builder, ObjectBuilder<NodeInfoIngestProcessor>> fn) {
+            return processors(fn.apply(new NodeInfoIngestProcessor.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link NodeInfoIngest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoIngest build() {
+            _checkSingleUse();
+
+            return new NodeInfoIngest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeInfoIngest}
+     */
+    public static final JsonpDeserializer<NodeInfoIngest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoIngest::setupNodeInfoIngestDeserializer
+    );
+
+    protected static void setupNodeInfoIngestDeserializer(ObjectDeserializer<NodeInfoIngest.Builder> op) {
+
+        op.add(Builder::processors, JsonpDeserializer.arrayDeserializer(NodeInfoIngestProcessor._DESERIALIZER), "processors");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoIngestDownloader.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoIngestDownloader.java
index bc3f81ebcd..a7c6a3176e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoIngestDownloader.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoIngestDownloader.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,93 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoIngestDownloader
 
 @JsonpDeserializable
 public class NodeInfoIngestDownloader implements JsonpSerializable {
-	private final String enabled;
+    private final String enabled;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private NodeInfoIngestDownloader(Builder builder) {
+    private NodeInfoIngestDownloader(Builder builder) {
 
-		this.enabled = ApiTypeHelper.requireNonNull(builder.enabled, this, "enabled");
+        this.enabled = ApiTypeHelper.requireNonNull(builder.enabled, this, "enabled");
 
-	}
+    }
 
-	public static NodeInfoIngestDownloader of(Function<Builder, ObjectBuilder<NodeInfoIngestDownloader>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static NodeInfoIngestDownloader of(Function<Builder, ObjectBuilder<NodeInfoIngestDownloader>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code enabled}
-	 */
-	public final String enabled() {
-		return this.enabled;
-	}
+    /**
+     * Required - API name: {@code enabled}
+     */
+    public final String enabled() {
+        return this.enabled;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("enabled");
-		generator.write(this.enabled);
+        generator.writeKey("enabled");
+        generator.write(this.enabled);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link NodeInfoIngestDownloader}.
-	 */
+    /**
+     * Builder for {@link NodeInfoIngestDownloader}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoIngestDownloader> {
-		private String enabled;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoIngestDownloader> {
+        private String enabled;
 
-		/**
-		 * Required - API name: {@code enabled}
-		 */
-		public final Builder enabled(String value) {
-			this.enabled = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code enabled}
+         */
+        public final Builder enabled(String value) {
+            this.enabled = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link NodeInfoIngestDownloader}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoIngestDownloader build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link NodeInfoIngestDownloader}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoIngestDownloader build() {
+            _checkSingleUse();
 
-			return new NodeInfoIngestDownloader(this);
-		}
-	}
+            return new NodeInfoIngestDownloader(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link NodeInfoIngestDownloader}
-	 */
-	public static final JsonpDeserializer<NodeInfoIngestDownloader> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoIngestDownloader::setupNodeInfoIngestDownloaderDeserializer);
+    /**
+     * Json deserializer for {@link NodeInfoIngestDownloader}
+     */
+    public static final JsonpDeserializer<NodeInfoIngestDownloader> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoIngestDownloader::setupNodeInfoIngestDownloaderDeserializer
+    );
 
-	protected static void setupNodeInfoIngestDownloaderDeserializer(
-			ObjectDeserializer<NodeInfoIngestDownloader.Builder> op) {
+    protected static void setupNodeInfoIngestDownloaderDeserializer(ObjectDeserializer<NodeInfoIngestDownloader.Builder> op) {
 
-		op.add(Builder::enabled, JsonpDeserializer.stringDeserializer(), "enabled");
+        op.add(Builder::enabled, JsonpDeserializer.stringDeserializer(), "enabled");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoIngestInfo.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoIngestInfo.java
index b93bc1eb7f..11f87c4591 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoIngestInfo.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoIngestInfo.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,101 +43,99 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoIngestInfo
 
 @JsonpDeserializable
 public class NodeInfoIngestInfo implements JsonpSerializable {
-	private final NodeInfoIngestDownloader downloader;
+    private final NodeInfoIngestDownloader downloader;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private NodeInfoIngestInfo(Builder builder) {
+    private NodeInfoIngestInfo(Builder builder) {
 
-		this.downloader = ApiTypeHelper.requireNonNull(builder.downloader, this, "downloader");
+        this.downloader = ApiTypeHelper.requireNonNull(builder.downloader, this, "downloader");
 
-	}
+    }
 
-	public static NodeInfoIngestInfo of(Function<Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static NodeInfoIngestInfo of(Function<Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code downloader}
-	 */
-	public final NodeInfoIngestDownloader downloader() {
-		return this.downloader;
-	}
+    /**
+     * Required - API name: {@code downloader}
+     */
+    public final NodeInfoIngestDownloader downloader() {
+        return this.downloader;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("downloader");
-		this.downloader.serialize(generator, mapper);
+        generator.writeKey("downloader");
+        this.downloader.serialize(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link NodeInfoIngestInfo}.
-	 */
+    /**
+     * Builder for {@link NodeInfoIngestInfo}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoIngestInfo> {
-		private NodeInfoIngestDownloader downloader;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoIngestInfo> {
+        private NodeInfoIngestDownloader downloader;
 
-		/**
-		 * Required - API name: {@code downloader}
-		 */
-		public final Builder downloader(NodeInfoIngestDownloader value) {
-			this.downloader = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code downloader}
+         */
+        public final Builder downloader(NodeInfoIngestDownloader value) {
+            this.downloader = value;
+            return this;
+        }
 
-		/**
-		 * Required - API name: {@code downloader}
-		 */
-		public final Builder downloader(
-				Function<NodeInfoIngestDownloader.Builder, ObjectBuilder<NodeInfoIngestDownloader>> fn) {
-			return this.downloader(fn.apply(new NodeInfoIngestDownloader.Builder()).build());
-		}
+        /**
+         * Required - API name: {@code downloader}
+         */
+        public final Builder downloader(Function<NodeInfoIngestDownloader.Builder, ObjectBuilder<NodeInfoIngestDownloader>> fn) {
+            return this.downloader(fn.apply(new NodeInfoIngestDownloader.Builder()).build());
+        }
 
-		/**
-		 * Builds a {@link NodeInfoIngestInfo}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoIngestInfo build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link NodeInfoIngestInfo}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoIngestInfo build() {
+            _checkSingleUse();
 
-			return new NodeInfoIngestInfo(this);
-		}
-	}
+            return new NodeInfoIngestInfo(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link NodeInfoIngestInfo}
-	 */
-	public static final JsonpDeserializer<NodeInfoIngestInfo> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoIngestInfo::setupNodeInfoIngestInfoDeserializer);
+    /**
+     * Json deserializer for {@link NodeInfoIngestInfo}
+     */
+    public static final JsonpDeserializer<NodeInfoIngestInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoIngestInfo::setupNodeInfoIngestInfoDeserializer
+    );
 
-	protected static void setupNodeInfoIngestInfoDeserializer(ObjectDeserializer<NodeInfoIngestInfo.Builder> op) {
+    protected static void setupNodeInfoIngestInfoDeserializer(ObjectDeserializer<NodeInfoIngestInfo.Builder> op) {
 
-		op.add(Builder::downloader, NodeInfoIngestDownloader._DESERIALIZER, "downloader");
+        op.add(Builder::downloader, NodeInfoIngestDownloader._DESERIALIZER, "downloader");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoIngestProcessor.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoIngestProcessor.java
index d88c5720ed..8ed86f9508 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoIngestProcessor.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoIngestProcessor.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,93 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoIngestProcessor
 
 @JsonpDeserializable
 public class NodeInfoIngestProcessor implements JsonpSerializable {
-	private final String type;
+    private final String type;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private NodeInfoIngestProcessor(Builder builder) {
+    private NodeInfoIngestProcessor(Builder builder) {
 
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
 
-	}
+    }
 
-	public static NodeInfoIngestProcessor of(Function<Builder, ObjectBuilder<NodeInfoIngestProcessor>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static NodeInfoIngestProcessor of(Function<Builder, ObjectBuilder<NodeInfoIngestProcessor>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("type");
-		generator.write(this.type);
+        generator.writeKey("type");
+        generator.write(this.type);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link NodeInfoIngestProcessor}.
-	 */
+    /**
+     * Builder for {@link NodeInfoIngestProcessor}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoIngestProcessor> {
-		private String type;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoIngestProcessor> {
+        private String type;
 
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link NodeInfoIngestProcessor}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoIngestProcessor build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link NodeInfoIngestProcessor}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoIngestProcessor build() {
+            _checkSingleUse();
 
-			return new NodeInfoIngestProcessor(this);
-		}
-	}
+            return new NodeInfoIngestProcessor(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link NodeInfoIngestProcessor}
-	 */
-	public static final JsonpDeserializer<NodeInfoIngestProcessor> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoIngestProcessor::setupNodeInfoIngestProcessorDeserializer);
+    /**
+     * Json deserializer for {@link NodeInfoIngestProcessor}
+     */
+    public static final JsonpDeserializer<NodeInfoIngestProcessor> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoIngestProcessor::setupNodeInfoIngestProcessorDeserializer
+    );
 
-	protected static void setupNodeInfoIngestProcessorDeserializer(
-			ObjectDeserializer<NodeInfoIngestProcessor.Builder> op) {
+    protected static void setupNodeInfoIngestProcessorDeserializer(ObjectDeserializer<NodeInfoIngestProcessor.Builder> op) {
 
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoJvmMemory.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoJvmMemory.java
index 4b72d9e202..308e267c6a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoJvmMemory.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoJvmMemory.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,334 +44,333 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: nodes.info.NodeInfoJvmMemory
 
 @JsonpDeserializable
 public class NodeInfoJvmMemory implements JsonpSerializable {
-	@Nullable
-	private final String directMax;
-
-	private final long directMaxInBytes;
-
-	@Nullable
-	private final String heapInit;
-
-	private final long heapInitInBytes;
-
-	@Nullable
-	private final String heapMax;
-
-	private final long heapMaxInBytes;
-
-	@Nullable
-	private final String nonHeapInit;
-
-	private final long nonHeapInitInBytes;
-
-	@Nullable
-	private final String nonHeapMax;
-
-	private final long nonHeapMaxInBytes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeInfoJvmMemory(Builder builder) {
-
-		this.directMax = builder.directMax;
-		this.directMaxInBytes = ApiTypeHelper.requireNonNull(builder.directMaxInBytes, this, "directMaxInBytes");
-		this.heapInit = builder.heapInit;
-		this.heapInitInBytes = ApiTypeHelper.requireNonNull(builder.heapInitInBytes, this, "heapInitInBytes");
-		this.heapMax = builder.heapMax;
-		this.heapMaxInBytes = ApiTypeHelper.requireNonNull(builder.heapMaxInBytes, this, "heapMaxInBytes");
-		this.nonHeapInit = builder.nonHeapInit;
-		this.nonHeapInitInBytes = ApiTypeHelper.requireNonNull(builder.nonHeapInitInBytes, this, "nonHeapInitInBytes");
-		this.nonHeapMax = builder.nonHeapMax;
-		this.nonHeapMaxInBytes = ApiTypeHelper.requireNonNull(builder.nonHeapMaxInBytes, this, "nonHeapMaxInBytes");
-
-	}
-
-	public static NodeInfoJvmMemory of(Function<Builder, ObjectBuilder<NodeInfoJvmMemory>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code direct_max}
-	 */
-	@Nullable
-	public final String directMax() {
-		return this.directMax;
-	}
-
-	/**
-	 * Required - API name: {@code direct_max_in_bytes}
-	 */
-	public final long directMaxInBytes() {
-		return this.directMaxInBytes;
-	}
-
-	/**
-	 * API name: {@code heap_init}
-	 */
-	@Nullable
-	public final String heapInit() {
-		return this.heapInit;
-	}
-
-	/**
-	 * Required - API name: {@code heap_init_in_bytes}
-	 */
-	public final long heapInitInBytes() {
-		return this.heapInitInBytes;
-	}
-
-	/**
-	 * API name: {@code heap_max}
-	 */
-	@Nullable
-	public final String heapMax() {
-		return this.heapMax;
-	}
-
-	/**
-	 * Required - API name: {@code heap_max_in_bytes}
-	 */
-	public final long heapMaxInBytes() {
-		return this.heapMaxInBytes;
-	}
-
-	/**
-	 * API name: {@code non_heap_init}
-	 */
-	@Nullable
-	public final String nonHeapInit() {
-		return this.nonHeapInit;
-	}
-
-	/**
-	 * Required - API name: {@code non_heap_init_in_bytes}
-	 */
-	public final long nonHeapInitInBytes() {
-		return this.nonHeapInitInBytes;
-	}
-
-	/**
-	 * API name: {@code non_heap_max}
-	 */
-	@Nullable
-	public final String nonHeapMax() {
-		return this.nonHeapMax;
-	}
-
-	/**
-	 * Required - API name: {@code non_heap_max_in_bytes}
-	 */
-	public final long nonHeapMaxInBytes() {
-		return this.nonHeapMaxInBytes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.directMax != null) {
-			generator.writeKey("direct_max");
-			generator.write(this.directMax);
-
-		}
-		generator.writeKey("direct_max_in_bytes");
-		generator.write(this.directMaxInBytes);
-
-		if (this.heapInit != null) {
-			generator.writeKey("heap_init");
-			generator.write(this.heapInit);
-
-		}
-		generator.writeKey("heap_init_in_bytes");
-		generator.write(this.heapInitInBytes);
-
-		if (this.heapMax != null) {
-			generator.writeKey("heap_max");
-			generator.write(this.heapMax);
-
-		}
-		generator.writeKey("heap_max_in_bytes");
-		generator.write(this.heapMaxInBytes);
-
-		if (this.nonHeapInit != null) {
-			generator.writeKey("non_heap_init");
-			generator.write(this.nonHeapInit);
-
-		}
-		generator.writeKey("non_heap_init_in_bytes");
-		generator.write(this.nonHeapInitInBytes);
-
-		if (this.nonHeapMax != null) {
-			generator.writeKey("non_heap_max");
-			generator.write(this.nonHeapMax);
-
-		}
-		generator.writeKey("non_heap_max_in_bytes");
-		generator.write(this.nonHeapMaxInBytes);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeInfoJvmMemory}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoJvmMemory> {
-		@Nullable
-		private String directMax;
-
-		private Long directMaxInBytes;
-
-		@Nullable
-		private String heapInit;
-
-		private Long heapInitInBytes;
-
-		@Nullable
-		private String heapMax;
-
-		private Long heapMaxInBytes;
-
-		@Nullable
-		private String nonHeapInit;
-
-		private Long nonHeapInitInBytes;
-
-		@Nullable
-		private String nonHeapMax;
-
-		private Long nonHeapMaxInBytes;
-
-		/**
-		 * API name: {@code direct_max}
-		 */
-		public final Builder directMax(@Nullable String value) {
-			this.directMax = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code direct_max_in_bytes}
-		 */
-		public final Builder directMaxInBytes(long value) {
-			this.directMaxInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code heap_init}
-		 */
-		public final Builder heapInit(@Nullable String value) {
-			this.heapInit = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code heap_init_in_bytes}
-		 */
-		public final Builder heapInitInBytes(long value) {
-			this.heapInitInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code heap_max}
-		 */
-		public final Builder heapMax(@Nullable String value) {
-			this.heapMax = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code heap_max_in_bytes}
-		 */
-		public final Builder heapMaxInBytes(long value) {
-			this.heapMaxInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code non_heap_init}
-		 */
-		public final Builder nonHeapInit(@Nullable String value) {
-			this.nonHeapInit = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code non_heap_init_in_bytes}
-		 */
-		public final Builder nonHeapInitInBytes(long value) {
-			this.nonHeapInitInBytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code non_heap_max}
-		 */
-		public final Builder nonHeapMax(@Nullable String value) {
-			this.nonHeapMax = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code non_heap_max_in_bytes}
-		 */
-		public final Builder nonHeapMaxInBytes(long value) {
-			this.nonHeapMaxInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeInfoJvmMemory}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoJvmMemory build() {
-			_checkSingleUse();
-
-			return new NodeInfoJvmMemory(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeInfoJvmMemory}
-	 */
-	public static final JsonpDeserializer<NodeInfoJvmMemory> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoJvmMemory::setupNodeInfoJvmMemoryDeserializer);
-
-	protected static void setupNodeInfoJvmMemoryDeserializer(ObjectDeserializer<NodeInfoJvmMemory.Builder> op) {
-
-		op.add(Builder::directMax, JsonpDeserializer.stringDeserializer(), "direct_max");
-		op.add(Builder::directMaxInBytes, JsonpDeserializer.longDeserializer(), "direct_max_in_bytes");
-		op.add(Builder::heapInit, JsonpDeserializer.stringDeserializer(), "heap_init");
-		op.add(Builder::heapInitInBytes, JsonpDeserializer.longDeserializer(), "heap_init_in_bytes");
-		op.add(Builder::heapMax, JsonpDeserializer.stringDeserializer(), "heap_max");
-		op.add(Builder::heapMaxInBytes, JsonpDeserializer.longDeserializer(), "heap_max_in_bytes");
-		op.add(Builder::nonHeapInit, JsonpDeserializer.stringDeserializer(), "non_heap_init");
-		op.add(Builder::nonHeapInitInBytes, JsonpDeserializer.longDeserializer(), "non_heap_init_in_bytes");
-		op.add(Builder::nonHeapMax, JsonpDeserializer.stringDeserializer(), "non_heap_max");
-		op.add(Builder::nonHeapMaxInBytes, JsonpDeserializer.longDeserializer(), "non_heap_max_in_bytes");
-
-	}
+    @Nullable
+    private final String directMax;
+
+    private final long directMaxInBytes;
+
+    @Nullable
+    private final String heapInit;
+
+    private final long heapInitInBytes;
+
+    @Nullable
+    private final String heapMax;
+
+    private final long heapMaxInBytes;
+
+    @Nullable
+    private final String nonHeapInit;
+
+    private final long nonHeapInitInBytes;
+
+    @Nullable
+    private final String nonHeapMax;
+
+    private final long nonHeapMaxInBytes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeInfoJvmMemory(Builder builder) {
+
+        this.directMax = builder.directMax;
+        this.directMaxInBytes = ApiTypeHelper.requireNonNull(builder.directMaxInBytes, this, "directMaxInBytes");
+        this.heapInit = builder.heapInit;
+        this.heapInitInBytes = ApiTypeHelper.requireNonNull(builder.heapInitInBytes, this, "heapInitInBytes");
+        this.heapMax = builder.heapMax;
+        this.heapMaxInBytes = ApiTypeHelper.requireNonNull(builder.heapMaxInBytes, this, "heapMaxInBytes");
+        this.nonHeapInit = builder.nonHeapInit;
+        this.nonHeapInitInBytes = ApiTypeHelper.requireNonNull(builder.nonHeapInitInBytes, this, "nonHeapInitInBytes");
+        this.nonHeapMax = builder.nonHeapMax;
+        this.nonHeapMaxInBytes = ApiTypeHelper.requireNonNull(builder.nonHeapMaxInBytes, this, "nonHeapMaxInBytes");
+
+    }
+
+    public static NodeInfoJvmMemory of(Function<Builder, ObjectBuilder<NodeInfoJvmMemory>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code direct_max}
+     */
+    @Nullable
+    public final String directMax() {
+        return this.directMax;
+    }
+
+    /**
+     * Required - API name: {@code direct_max_in_bytes}
+     */
+    public final long directMaxInBytes() {
+        return this.directMaxInBytes;
+    }
+
+    /**
+     * API name: {@code heap_init}
+     */
+    @Nullable
+    public final String heapInit() {
+        return this.heapInit;
+    }
+
+    /**
+     * Required - API name: {@code heap_init_in_bytes}
+     */
+    public final long heapInitInBytes() {
+        return this.heapInitInBytes;
+    }
+
+    /**
+     * API name: {@code heap_max}
+     */
+    @Nullable
+    public final String heapMax() {
+        return this.heapMax;
+    }
+
+    /**
+     * Required - API name: {@code heap_max_in_bytes}
+     */
+    public final long heapMaxInBytes() {
+        return this.heapMaxInBytes;
+    }
+
+    /**
+     * API name: {@code non_heap_init}
+     */
+    @Nullable
+    public final String nonHeapInit() {
+        return this.nonHeapInit;
+    }
+
+    /**
+     * Required - API name: {@code non_heap_init_in_bytes}
+     */
+    public final long nonHeapInitInBytes() {
+        return this.nonHeapInitInBytes;
+    }
+
+    /**
+     * API name: {@code non_heap_max}
+     */
+    @Nullable
+    public final String nonHeapMax() {
+        return this.nonHeapMax;
+    }
+
+    /**
+     * Required - API name: {@code non_heap_max_in_bytes}
+     */
+    public final long nonHeapMaxInBytes() {
+        return this.nonHeapMaxInBytes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.directMax != null) {
+            generator.writeKey("direct_max");
+            generator.write(this.directMax);
+
+        }
+        generator.writeKey("direct_max_in_bytes");
+        generator.write(this.directMaxInBytes);
+
+        if (this.heapInit != null) {
+            generator.writeKey("heap_init");
+            generator.write(this.heapInit);
+
+        }
+        generator.writeKey("heap_init_in_bytes");
+        generator.write(this.heapInitInBytes);
+
+        if (this.heapMax != null) {
+            generator.writeKey("heap_max");
+            generator.write(this.heapMax);
+
+        }
+        generator.writeKey("heap_max_in_bytes");
+        generator.write(this.heapMaxInBytes);
+
+        if (this.nonHeapInit != null) {
+            generator.writeKey("non_heap_init");
+            generator.write(this.nonHeapInit);
+
+        }
+        generator.writeKey("non_heap_init_in_bytes");
+        generator.write(this.nonHeapInitInBytes);
+
+        if (this.nonHeapMax != null) {
+            generator.writeKey("non_heap_max");
+            generator.write(this.nonHeapMax);
+
+        }
+        generator.writeKey("non_heap_max_in_bytes");
+        generator.write(this.nonHeapMaxInBytes);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeInfoJvmMemory}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoJvmMemory> {
+        @Nullable
+        private String directMax;
+
+        private Long directMaxInBytes;
+
+        @Nullable
+        private String heapInit;
+
+        private Long heapInitInBytes;
+
+        @Nullable
+        private String heapMax;
+
+        private Long heapMaxInBytes;
+
+        @Nullable
+        private String nonHeapInit;
+
+        private Long nonHeapInitInBytes;
+
+        @Nullable
+        private String nonHeapMax;
+
+        private Long nonHeapMaxInBytes;
+
+        /**
+         * API name: {@code direct_max}
+         */
+        public final Builder directMax(@Nullable String value) {
+            this.directMax = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code direct_max_in_bytes}
+         */
+        public final Builder directMaxInBytes(long value) {
+            this.directMaxInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code heap_init}
+         */
+        public final Builder heapInit(@Nullable String value) {
+            this.heapInit = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code heap_init_in_bytes}
+         */
+        public final Builder heapInitInBytes(long value) {
+            this.heapInitInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code heap_max}
+         */
+        public final Builder heapMax(@Nullable String value) {
+            this.heapMax = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code heap_max_in_bytes}
+         */
+        public final Builder heapMaxInBytes(long value) {
+            this.heapMaxInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code non_heap_init}
+         */
+        public final Builder nonHeapInit(@Nullable String value) {
+            this.nonHeapInit = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code non_heap_init_in_bytes}
+         */
+        public final Builder nonHeapInitInBytes(long value) {
+            this.nonHeapInitInBytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code non_heap_max}
+         */
+        public final Builder nonHeapMax(@Nullable String value) {
+            this.nonHeapMax = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code non_heap_max_in_bytes}
+         */
+        public final Builder nonHeapMaxInBytes(long value) {
+            this.nonHeapMaxInBytes = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeInfoJvmMemory}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoJvmMemory build() {
+            _checkSingleUse();
+
+            return new NodeInfoJvmMemory(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeInfoJvmMemory}
+     */
+    public static final JsonpDeserializer<NodeInfoJvmMemory> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoJvmMemory::setupNodeInfoJvmMemoryDeserializer
+    );
+
+    protected static void setupNodeInfoJvmMemoryDeserializer(ObjectDeserializer<NodeInfoJvmMemory.Builder> op) {
+
+        op.add(Builder::directMax, JsonpDeserializer.stringDeserializer(), "direct_max");
+        op.add(Builder::directMaxInBytes, JsonpDeserializer.longDeserializer(), "direct_max_in_bytes");
+        op.add(Builder::heapInit, JsonpDeserializer.stringDeserializer(), "heap_init");
+        op.add(Builder::heapInitInBytes, JsonpDeserializer.longDeserializer(), "heap_init_in_bytes");
+        op.add(Builder::heapMax, JsonpDeserializer.stringDeserializer(), "heap_max");
+        op.add(Builder::heapMaxInBytes, JsonpDeserializer.longDeserializer(), "heap_max_in_bytes");
+        op.add(Builder::nonHeapInit, JsonpDeserializer.stringDeserializer(), "non_heap_init");
+        op.add(Builder::nonHeapInitInBytes, JsonpDeserializer.longDeserializer(), "non_heap_init_in_bytes");
+        op.add(Builder::nonHeapMax, JsonpDeserializer.stringDeserializer(), "non_heap_max");
+        op.add(Builder::nonHeapMaxInBytes, JsonpDeserializer.longDeserializer(), "non_heap_max_in_bytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoMemory.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoMemory.java
index aafaf116c8..817c175e82 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoMemory.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoMemory.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,116 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoMemory
 
 @JsonpDeserializable
 public class NodeInfoMemory implements JsonpSerializable {
-	private final String total;
-
-	private final long totalInBytes;
-
-	// ---------------------------------------------------------------------------------------------
+    private final String total;
 
-	private NodeInfoMemory(Builder builder) {
+    private final long totalInBytes;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
-		this.totalInBytes = ApiTypeHelper.requireNonNull(builder.totalInBytes, this, "totalInBytes");
+    private NodeInfoMemory(Builder builder) {
 
-	}
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+        this.totalInBytes = ApiTypeHelper.requireNonNull(builder.totalInBytes, this, "totalInBytes");
 
-	public static NodeInfoMemory of(Function<Builder, ObjectBuilder<NodeInfoMemory>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final String total() {
-		return this.total;
-	}
+    public static NodeInfoMemory of(Function<Builder, ObjectBuilder<NodeInfoMemory>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code total_in_bytes}
-	 */
-	public final long totalInBytes() {
-		return this.totalInBytes;
-	}
+    /**
+     * Required - API name: {@code total}
+     */
+    public final String total() {
+        return this.total;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code total_in_bytes}
+     */
+    public final long totalInBytes() {
+        return this.totalInBytes;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("total");
-		generator.write(this.total);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("total_in_bytes");
-		generator.write(this.totalInBytes);
+        generator.writeKey("total");
+        generator.write(this.total);
 
-	}
+        generator.writeKey("total_in_bytes");
+        generator.write(this.totalInBytes);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link NodeInfoMemory}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoMemory> {
-		private String total;
+    /**
+     * Builder for {@link NodeInfoMemory}.
+     */
 
-		private Long totalInBytes;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoMemory> {
+        private String total;
 
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(String value) {
-			this.total = value;
-			return this;
-		}
+        private Long totalInBytes;
 
-		/**
-		 * Required - API name: {@code total_in_bytes}
-		 */
-		public final Builder totalInBytes(long value) {
-			this.totalInBytes = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(String value) {
+            this.total = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link NodeInfoMemory}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoMemory build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code total_in_bytes}
+         */
+        public final Builder totalInBytes(long value) {
+            this.totalInBytes = value;
+            return this;
+        }
 
-			return new NodeInfoMemory(this);
-		}
-	}
+        /**
+         * Builds a {@link NodeInfoMemory}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoMemory build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new NodeInfoMemory(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link NodeInfoMemory}
-	 */
-	public static final JsonpDeserializer<NodeInfoMemory> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeInfoMemory::setupNodeInfoMemoryDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupNodeInfoMemoryDeserializer(ObjectDeserializer<NodeInfoMemory.Builder> op) {
+    /**
+     * Json deserializer for {@link NodeInfoMemory}
+     */
+    public static final JsonpDeserializer<NodeInfoMemory> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoMemory::setupNodeInfoMemoryDeserializer
+    );
 
-		op.add(Builder::total, JsonpDeserializer.stringDeserializer(), "total");
-		op.add(Builder::totalInBytes, JsonpDeserializer.longDeserializer(), "total_in_bytes");
+    protected static void setupNodeInfoMemoryDeserializer(ObjectDeserializer<NodeInfoMemory.Builder> op) {
 
-	}
+        op.add(Builder::total, JsonpDeserializer.stringDeserializer(), "total");
+        op.add(Builder::totalInBytes, JsonpDeserializer.longDeserializer(), "total_in_bytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoNetwork.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoNetwork.java
index d8873052e1..93ecdb75ca 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoNetwork.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoNetwork.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,124 +43,123 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoNetwork
 
 @JsonpDeserializable
 public class NodeInfoNetwork implements JsonpSerializable {
-	private final NodeInfoNetworkInterface primaryInterface;
-
-	private final int refreshInterval;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeInfoNetwork(Builder builder) {
-
-		this.primaryInterface = ApiTypeHelper.requireNonNull(builder.primaryInterface, this, "primaryInterface");
-		this.refreshInterval = ApiTypeHelper.requireNonNull(builder.refreshInterval, this, "refreshInterval");
-
-	}
-
-	public static NodeInfoNetwork of(Function<Builder, ObjectBuilder<NodeInfoNetwork>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code primary_interface}
-	 */
-	public final NodeInfoNetworkInterface primaryInterface() {
-		return this.primaryInterface;
-	}
-
-	/**
-	 * Required - API name: {@code refresh_interval}
-	 */
-	public final int refreshInterval() {
-		return this.refreshInterval;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("primary_interface");
-		this.primaryInterface.serialize(generator, mapper);
-
-		generator.writeKey("refresh_interval");
-		generator.write(this.refreshInterval);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeInfoNetwork}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoNetwork> {
-		private NodeInfoNetworkInterface primaryInterface;
-
-		private Integer refreshInterval;
-
-		/**
-		 * Required - API name: {@code primary_interface}
-		 */
-		public final Builder primaryInterface(NodeInfoNetworkInterface value) {
-			this.primaryInterface = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code primary_interface}
-		 */
-		public final Builder primaryInterface(
-				Function<NodeInfoNetworkInterface.Builder, ObjectBuilder<NodeInfoNetworkInterface>> fn) {
-			return this.primaryInterface(fn.apply(new NodeInfoNetworkInterface.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code refresh_interval}
-		 */
-		public final Builder refreshInterval(int value) {
-			this.refreshInterval = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeInfoNetwork}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoNetwork build() {
-			_checkSingleUse();
-
-			return new NodeInfoNetwork(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeInfoNetwork}
-	 */
-	public static final JsonpDeserializer<NodeInfoNetwork> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeInfoNetwork::setupNodeInfoNetworkDeserializer);
-
-	protected static void setupNodeInfoNetworkDeserializer(ObjectDeserializer<NodeInfoNetwork.Builder> op) {
-
-		op.add(Builder::primaryInterface, NodeInfoNetworkInterface._DESERIALIZER, "primary_interface");
-		op.add(Builder::refreshInterval, JsonpDeserializer.integerDeserializer(), "refresh_interval");
-
-	}
+    private final NodeInfoNetworkInterface primaryInterface;
+
+    private final int refreshInterval;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeInfoNetwork(Builder builder) {
+
+        this.primaryInterface = ApiTypeHelper.requireNonNull(builder.primaryInterface, this, "primaryInterface");
+        this.refreshInterval = ApiTypeHelper.requireNonNull(builder.refreshInterval, this, "refreshInterval");
+
+    }
+
+    public static NodeInfoNetwork of(Function<Builder, ObjectBuilder<NodeInfoNetwork>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code primary_interface}
+     */
+    public final NodeInfoNetworkInterface primaryInterface() {
+        return this.primaryInterface;
+    }
+
+    /**
+     * Required - API name: {@code refresh_interval}
+     */
+    public final int refreshInterval() {
+        return this.refreshInterval;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("primary_interface");
+        this.primaryInterface.serialize(generator, mapper);
+
+        generator.writeKey("refresh_interval");
+        generator.write(this.refreshInterval);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeInfoNetwork}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoNetwork> {
+        private NodeInfoNetworkInterface primaryInterface;
+
+        private Integer refreshInterval;
+
+        /**
+         * Required - API name: {@code primary_interface}
+         */
+        public final Builder primaryInterface(NodeInfoNetworkInterface value) {
+            this.primaryInterface = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code primary_interface}
+         */
+        public final Builder primaryInterface(Function<NodeInfoNetworkInterface.Builder, ObjectBuilder<NodeInfoNetworkInterface>> fn) {
+            return this.primaryInterface(fn.apply(new NodeInfoNetworkInterface.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code refresh_interval}
+         */
+        public final Builder refreshInterval(int value) {
+            this.refreshInterval = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeInfoNetwork}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoNetwork build() {
+            _checkSingleUse();
+
+            return new NodeInfoNetwork(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeInfoNetwork}
+     */
+    public static final JsonpDeserializer<NodeInfoNetwork> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoNetwork::setupNodeInfoNetworkDeserializer
+    );
+
+    protected static void setupNodeInfoNetworkDeserializer(ObjectDeserializer<NodeInfoNetwork.Builder> op) {
+
+        op.add(Builder::primaryInterface, NodeInfoNetworkInterface._DESERIALIZER, "primary_interface");
+        op.add(Builder::refreshInterval, JsonpDeserializer.integerDeserializer(), "refresh_interval");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoNetworkInterface.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoNetworkInterface.java
index 053d33f267..19bc708d6b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoNetworkInterface.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoNetworkInterface.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,141 +43,140 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoNetworkInterface
 
 @JsonpDeserializable
 public class NodeInfoNetworkInterface implements JsonpSerializable {
-	private final String address;
+    private final String address;
 
-	private final String macAddress;
-
-	private final String name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeInfoNetworkInterface(Builder builder) {
-
-		this.address = ApiTypeHelper.requireNonNull(builder.address, this, "address");
-		this.macAddress = ApiTypeHelper.requireNonNull(builder.macAddress, this, "macAddress");
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-
-	}
-
-	public static NodeInfoNetworkInterface of(Function<Builder, ObjectBuilder<NodeInfoNetworkInterface>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code address}
-	 */
-	public final String address() {
-		return this.address;
-	}
-
-	/**
-	 * Required - API name: {@code mac_address}
-	 */
-	public final String macAddress() {
-		return this.macAddress;
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("address");
-		generator.write(this.address);
-
-		generator.writeKey("mac_address");
-		generator.write(this.macAddress);
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeInfoNetworkInterface}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoNetworkInterface> {
-		private String address;
-
-		private String macAddress;
-
-		private String name;
-
-		/**
-		 * Required - API name: {@code address}
-		 */
-		public final Builder address(String value) {
-			this.address = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mac_address}
-		 */
-		public final Builder macAddress(String value) {
-			this.macAddress = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeInfoNetworkInterface}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoNetworkInterface build() {
-			_checkSingleUse();
-
-			return new NodeInfoNetworkInterface(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeInfoNetworkInterface}
-	 */
-	public static final JsonpDeserializer<NodeInfoNetworkInterface> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoNetworkInterface::setupNodeInfoNetworkInterfaceDeserializer);
-
-	protected static void setupNodeInfoNetworkInterfaceDeserializer(
-			ObjectDeserializer<NodeInfoNetworkInterface.Builder> op) {
-
-		op.add(Builder::address, JsonpDeserializer.stringDeserializer(), "address");
-		op.add(Builder::macAddress, JsonpDeserializer.stringDeserializer(), "mac_address");
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-
-	}
+    private final String macAddress;
+
+    private final String name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeInfoNetworkInterface(Builder builder) {
+
+        this.address = ApiTypeHelper.requireNonNull(builder.address, this, "address");
+        this.macAddress = ApiTypeHelper.requireNonNull(builder.macAddress, this, "macAddress");
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+
+    }
+
+    public static NodeInfoNetworkInterface of(Function<Builder, ObjectBuilder<NodeInfoNetworkInterface>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code address}
+     */
+    public final String address() {
+        return this.address;
+    }
+
+    /**
+     * Required - API name: {@code mac_address}
+     */
+    public final String macAddress() {
+        return this.macAddress;
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("address");
+        generator.write(this.address);
+
+        generator.writeKey("mac_address");
+        generator.write(this.macAddress);
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeInfoNetworkInterface}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoNetworkInterface> {
+        private String address;
+
+        private String macAddress;
+
+        private String name;
+
+        /**
+         * Required - API name: {@code address}
+         */
+        public final Builder address(String value) {
+            this.address = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mac_address}
+         */
+        public final Builder macAddress(String value) {
+            this.macAddress = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeInfoNetworkInterface}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoNetworkInterface build() {
+            _checkSingleUse();
+
+            return new NodeInfoNetworkInterface(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeInfoNetworkInterface}
+     */
+    public static final JsonpDeserializer<NodeInfoNetworkInterface> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoNetworkInterface::setupNodeInfoNetworkInterfaceDeserializer
+    );
+
+    protected static void setupNodeInfoNetworkInterfaceDeserializer(ObjectDeserializer<NodeInfoNetworkInterface.Builder> op) {
+
+        op.add(Builder::address, JsonpDeserializer.stringDeserializer(), "address");
+        op.add(Builder::macAddress, JsonpDeserializer.stringDeserializer(), "mac_address");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoOSCPU.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoOSCPU.java
index d81afce90c..12100ce24f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoOSCPU.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoOSCPU.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,260 +43,260 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoOSCPU
 
 @JsonpDeserializable
 public class NodeInfoOSCPU implements JsonpSerializable {
-	private final String cacheSize;
-
-	private final int cacheSizeInBytes;
-
-	private final int coresPerSocket;
-
-	private final int mhz;
-
-	private final String model;
-
-	private final int totalCores;
-
-	private final int totalSockets;
-
-	private final String vendor;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeInfoOSCPU(Builder builder) {
-
-		this.cacheSize = ApiTypeHelper.requireNonNull(builder.cacheSize, this, "cacheSize");
-		this.cacheSizeInBytes = ApiTypeHelper.requireNonNull(builder.cacheSizeInBytes, this, "cacheSizeInBytes");
-		this.coresPerSocket = ApiTypeHelper.requireNonNull(builder.coresPerSocket, this, "coresPerSocket");
-		this.mhz = ApiTypeHelper.requireNonNull(builder.mhz, this, "mhz");
-		this.model = ApiTypeHelper.requireNonNull(builder.model, this, "model");
-		this.totalCores = ApiTypeHelper.requireNonNull(builder.totalCores, this, "totalCores");
-		this.totalSockets = ApiTypeHelper.requireNonNull(builder.totalSockets, this, "totalSockets");
-		this.vendor = ApiTypeHelper.requireNonNull(builder.vendor, this, "vendor");
+    private final String cacheSize;
+
+    private final int cacheSizeInBytes;
+
+    private final int coresPerSocket;
+
+    private final int mhz;
+
+    private final String model;
+
+    private final int totalCores;
+
+    private final int totalSockets;
+
+    private final String vendor;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeInfoOSCPU(Builder builder) {
+
+        this.cacheSize = ApiTypeHelper.requireNonNull(builder.cacheSize, this, "cacheSize");
+        this.cacheSizeInBytes = ApiTypeHelper.requireNonNull(builder.cacheSizeInBytes, this, "cacheSizeInBytes");
+        this.coresPerSocket = ApiTypeHelper.requireNonNull(builder.coresPerSocket, this, "coresPerSocket");
+        this.mhz = ApiTypeHelper.requireNonNull(builder.mhz, this, "mhz");
+        this.model = ApiTypeHelper.requireNonNull(builder.model, this, "model");
+        this.totalCores = ApiTypeHelper.requireNonNull(builder.totalCores, this, "totalCores");
+        this.totalSockets = ApiTypeHelper.requireNonNull(builder.totalSockets, this, "totalSockets");
+        this.vendor = ApiTypeHelper.requireNonNull(builder.vendor, this, "vendor");
 
-	}
+    }
 
-	public static NodeInfoOSCPU of(Function<Builder, ObjectBuilder<NodeInfoOSCPU>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static NodeInfoOSCPU of(Function<Builder, ObjectBuilder<NodeInfoOSCPU>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code cache_size}
-	 */
-	public final String cacheSize() {
-		return this.cacheSize;
-	}
+    /**
+     * Required - API name: {@code cache_size}
+     */
+    public final String cacheSize() {
+        return this.cacheSize;
+    }
 
-	/**
-	 * Required - API name: {@code cache_size_in_bytes}
-	 */
-	public final int cacheSizeInBytes() {
-		return this.cacheSizeInBytes;
-	}
+    /**
+     * Required - API name: {@code cache_size_in_bytes}
+     */
+    public final int cacheSizeInBytes() {
+        return this.cacheSizeInBytes;
+    }
 
-	/**
-	 * Required - API name: {@code cores_per_socket}
-	 */
-	public final int coresPerSocket() {
-		return this.coresPerSocket;
-	}
+    /**
+     * Required - API name: {@code cores_per_socket}
+     */
+    public final int coresPerSocket() {
+        return this.coresPerSocket;
+    }
 
-	/**
-	 * Required - API name: {@code mhz}
-	 */
-	public final int mhz() {
-		return this.mhz;
-	}
+    /**
+     * Required - API name: {@code mhz}
+     */
+    public final int mhz() {
+        return this.mhz;
+    }
 
-	/**
-	 * Required - API name: {@code model}
-	 */
-	public final String model() {
-		return this.model;
-	}
+    /**
+     * Required - API name: {@code model}
+     */
+    public final String model() {
+        return this.model;
+    }
 
-	/**
-	 * Required - API name: {@code total_cores}
-	 */
-	public final int totalCores() {
-		return this.totalCores;
-	}
+    /**
+     * Required - API name: {@code total_cores}
+     */
+    public final int totalCores() {
+        return this.totalCores;
+    }
 
-	/**
-	 * Required - API name: {@code total_sockets}
-	 */
-	public final int totalSockets() {
-		return this.totalSockets;
-	}
+    /**
+     * Required - API name: {@code total_sockets}
+     */
+    public final int totalSockets() {
+        return this.totalSockets;
+    }
 
-	/**
-	 * Required - API name: {@code vendor}
-	 */
-	public final String vendor() {
-		return this.vendor;
-	}
+    /**
+     * Required - API name: {@code vendor}
+     */
+    public final String vendor() {
+        return this.vendor;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("cache_size");
-		generator.write(this.cacheSize);
-
-		generator.writeKey("cache_size_in_bytes");
-		generator.write(this.cacheSizeInBytes);
-
-		generator.writeKey("cores_per_socket");
-		generator.write(this.coresPerSocket);
-
-		generator.writeKey("mhz");
-		generator.write(this.mhz);
-
-		generator.writeKey("model");
-		generator.write(this.model);
-
-		generator.writeKey("total_cores");
-		generator.write(this.totalCores);
-
-		generator.writeKey("total_sockets");
-		generator.write(this.totalSockets);
-
-		generator.writeKey("vendor");
-		generator.write(this.vendor);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeInfoOSCPU}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoOSCPU> {
-		private String cacheSize;
-
-		private Integer cacheSizeInBytes;
-
-		private Integer coresPerSocket;
-
-		private Integer mhz;
-
-		private String model;
-
-		private Integer totalCores;
-
-		private Integer totalSockets;
-
-		private String vendor;
-
-		/**
-		 * Required - API name: {@code cache_size}
-		 */
-		public final Builder cacheSize(String value) {
-			this.cacheSize = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code cache_size_in_bytes}
-		 */
-		public final Builder cacheSizeInBytes(int value) {
-			this.cacheSizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code cores_per_socket}
-		 */
-		public final Builder coresPerSocket(int value) {
-			this.coresPerSocket = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mhz}
-		 */
-		public final Builder mhz(int value) {
-			this.mhz = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code model}
-		 */
-		public final Builder model(String value) {
-			this.model = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_cores}
-		 */
-		public final Builder totalCores(int value) {
-			this.totalCores = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total_sockets}
-		 */
-		public final Builder totalSockets(int value) {
-			this.totalSockets = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code vendor}
-		 */
-		public final Builder vendor(String value) {
-			this.vendor = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeInfoOSCPU}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoOSCPU build() {
-			_checkSingleUse();
-
-			return new NodeInfoOSCPU(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeInfoOSCPU}
-	 */
-	public static final JsonpDeserializer<NodeInfoOSCPU> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeInfoOSCPU::setupNodeInfoOSCPUDeserializer);
-
-	protected static void setupNodeInfoOSCPUDeserializer(ObjectDeserializer<NodeInfoOSCPU.Builder> op) {
-
-		op.add(Builder::cacheSize, JsonpDeserializer.stringDeserializer(), "cache_size");
-		op.add(Builder::cacheSizeInBytes, JsonpDeserializer.integerDeserializer(), "cache_size_in_bytes");
-		op.add(Builder::coresPerSocket, JsonpDeserializer.integerDeserializer(), "cores_per_socket");
-		op.add(Builder::mhz, JsonpDeserializer.integerDeserializer(), "mhz");
-		op.add(Builder::model, JsonpDeserializer.stringDeserializer(), "model");
-		op.add(Builder::totalCores, JsonpDeserializer.integerDeserializer(), "total_cores");
-		op.add(Builder::totalSockets, JsonpDeserializer.integerDeserializer(), "total_sockets");
-		op.add(Builder::vendor, JsonpDeserializer.stringDeserializer(), "vendor");
-
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("cache_size");
+        generator.write(this.cacheSize);
+
+        generator.writeKey("cache_size_in_bytes");
+        generator.write(this.cacheSizeInBytes);
+
+        generator.writeKey("cores_per_socket");
+        generator.write(this.coresPerSocket);
+
+        generator.writeKey("mhz");
+        generator.write(this.mhz);
+
+        generator.writeKey("model");
+        generator.write(this.model);
+
+        generator.writeKey("total_cores");
+        generator.write(this.totalCores);
+
+        generator.writeKey("total_sockets");
+        generator.write(this.totalSockets);
+
+        generator.writeKey("vendor");
+        generator.write(this.vendor);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeInfoOSCPU}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoOSCPU> {
+        private String cacheSize;
+
+        private Integer cacheSizeInBytes;
+
+        private Integer coresPerSocket;
+
+        private Integer mhz;
+
+        private String model;
+
+        private Integer totalCores;
+
+        private Integer totalSockets;
+
+        private String vendor;
+
+        /**
+         * Required - API name: {@code cache_size}
+         */
+        public final Builder cacheSize(String value) {
+            this.cacheSize = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code cache_size_in_bytes}
+         */
+        public final Builder cacheSizeInBytes(int value) {
+            this.cacheSizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code cores_per_socket}
+         */
+        public final Builder coresPerSocket(int value) {
+            this.coresPerSocket = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mhz}
+         */
+        public final Builder mhz(int value) {
+            this.mhz = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code model}
+         */
+        public final Builder model(String value) {
+            this.model = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_cores}
+         */
+        public final Builder totalCores(int value) {
+            this.totalCores = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total_sockets}
+         */
+        public final Builder totalSockets(int value) {
+            this.totalSockets = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code vendor}
+         */
+        public final Builder vendor(String value) {
+            this.vendor = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeInfoOSCPU}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoOSCPU build() {
+            _checkSingleUse();
+
+            return new NodeInfoOSCPU(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeInfoOSCPU}
+     */
+    public static final JsonpDeserializer<NodeInfoOSCPU> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoOSCPU::setupNodeInfoOSCPUDeserializer
+    );
+
+    protected static void setupNodeInfoOSCPUDeserializer(ObjectDeserializer<NodeInfoOSCPU.Builder> op) {
+
+        op.add(Builder::cacheSize, JsonpDeserializer.stringDeserializer(), "cache_size");
+        op.add(Builder::cacheSizeInBytes, JsonpDeserializer.integerDeserializer(), "cache_size_in_bytes");
+        op.add(Builder::coresPerSocket, JsonpDeserializer.integerDeserializer(), "cores_per_socket");
+        op.add(Builder::mhz, JsonpDeserializer.integerDeserializer(), "mhz");
+        op.add(Builder::model, JsonpDeserializer.stringDeserializer(), "model");
+        op.add(Builder::totalCores, JsonpDeserializer.integerDeserializer(), "total_cores");
+        op.add(Builder::totalSockets, JsonpDeserializer.integerDeserializer(), "total_sockets");
+        op.add(Builder::vendor, JsonpDeserializer.stringDeserializer(), "vendor");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoPath.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoPath.java
index 603599a80f..fe1ba9ea67 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoPath.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoPath.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,207 +45,205 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: nodes.info.NodeInfoPath
 
 @JsonpDeserializable
 public class NodeInfoPath implements JsonpSerializable {
-	private final String logs;
+    private final String logs;
 
-	private final String home;
+    private final String home;
 
-	@Nullable
-	private final List<String> repo;
+    @Nullable
+    private final List<String> repo;
 
-	private final List<String> data;
+    private final List<String> data;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private NodeInfoPath(Builder builder) {
+    private NodeInfoPath(Builder builder) {
 
-		this.logs = ApiTypeHelper.requireNonNull(builder.logs, this, "logs");
-		this.home = ApiTypeHelper.requireNonNull(builder.home, this, "home");
-		this.repo = ApiTypeHelper.unmodifiable(builder.repo);
-		this.data = ApiTypeHelper.unmodifiable(builder.data);
+        this.logs = ApiTypeHelper.requireNonNull(builder.logs, this, "logs");
+        this.home = ApiTypeHelper.requireNonNull(builder.home, this, "home");
+        this.repo = ApiTypeHelper.unmodifiable(builder.repo);
+        this.data = ApiTypeHelper.unmodifiable(builder.data);
 
-	}
+    }
 
-	public static NodeInfoPath of(Function<Builder, ObjectBuilder<NodeInfoPath>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static NodeInfoPath of(Function<Builder, ObjectBuilder<NodeInfoPath>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code logs}
-	 */
-	public final String logs() {
-		return this.logs;
-	}
-
-	/**
-	 * Required - API name: {@code home}
-	 */
-	public final String home() {
-		return this.home;
-	}
-
-	/**
-	 * API name: {@code repo}
-	 */
-	public final List<String> repo() {
-		return this.repo;
-	}
-
-	/**
-	 * API name: {@code data}
-	 */
-	public final List<String> data() {
-		return this.data;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("logs");
-		generator.write(this.logs);
-
-		generator.writeKey("home");
-		generator.write(this.home);
-
-		if (ApiTypeHelper.isDefined(this.repo)) {
-			generator.writeKey("repo");
-			generator.writeStartArray();
-			for (String item0 : this.repo) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.data)) {
-			generator.writeKey("data");
-			generator.writeStartArray();
-			for (String item0 : this.data) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeInfoPath}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoPath> {
-		private String logs;
-
-		private String home;
-
-		private List<String> repo;
-
-		@Nullable
-		private List<String> data;
-
-		/**
-		 * Required - API name: {@code logs}
-		 */
-		public final Builder logs(String value) {
-			this.logs = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code home}
-		 */
-		public final Builder home(String value) {
-			this.home = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code repo}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>repo</code>.
-		 */
-		public final Builder repo(List<String> list) {
-			this.repo = _listAddAll(this.repo, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code repo}
-		 * <p>
-		 * Adds one or more values to <code>repo</code>.
-		 */
-		public final Builder repo(String value, String... values) {
-			this.repo = _listAdd(this.repo, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code data}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>data</code>.
-		 */
-		public final Builder data(List<String> list) {
-			this.data = _listAddAll(this.data, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code data}
-		 * <p>
-		 * Adds one or more values to <code>data</code>.
-		 */
-		public final Builder data(String value, String... values) {
-			this.data = _listAdd(this.data, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeInfoPath}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoPath build() {
-			_checkSingleUse();
-
-			return new NodeInfoPath(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeInfoPath}
-	 */
-	public static final JsonpDeserializer<NodeInfoPath> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeInfoPath::setupNodeInfoPathDeserializer);
-
-	protected static void setupNodeInfoPathDeserializer(ObjectDeserializer<NodeInfoPath.Builder> op) {
-
-		op.add(Builder::logs, JsonpDeserializer.stringDeserializer(), "logs");
-		op.add(Builder::home, JsonpDeserializer.stringDeserializer(), "home");
-		op.add(Builder::repo, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "repo");
-		op.add(Builder::data, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "data");
-
-	}
+    /**
+     * Required - API name: {@code logs}
+     */
+    public final String logs() {
+        return this.logs;
+    }
+
+    /**
+     * Required - API name: {@code home}
+     */
+    public final String home() {
+        return this.home;
+    }
+
+    /**
+     * API name: {@code repo}
+     */
+    public final List<String> repo() {
+        return this.repo;
+    }
+
+    /**
+     * API name: {@code data}
+     */
+    public final List<String> data() {
+        return this.data;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("logs");
+        generator.write(this.logs);
+
+        generator.writeKey("home");
+        generator.write(this.home);
+
+        if (ApiTypeHelper.isDefined(this.repo)) {
+            generator.writeKey("repo");
+            generator.writeStartArray();
+            for (String item0 : this.repo) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.data)) {
+            generator.writeKey("data");
+            generator.writeStartArray();
+            for (String item0 : this.data) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeInfoPath}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoPath> {
+        private String logs;
+
+        private String home;
+
+        private List<String> repo;
+
+        @Nullable
+        private List<String> data;
+
+        /**
+         * Required - API name: {@code logs}
+         */
+        public final Builder logs(String value) {
+            this.logs = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code home}
+         */
+        public final Builder home(String value) {
+            this.home = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code repo}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>repo</code>.
+         */
+        public final Builder repo(List<String> list) {
+            this.repo = _listAddAll(this.repo, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code repo}
+         * <p>
+         * Adds one or more values to <code>repo</code>.
+         */
+        public final Builder repo(String value, String... values) {
+            this.repo = _listAdd(this.repo, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code data}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>data</code>.
+         */
+        public final Builder data(List<String> list) {
+            this.data = _listAddAll(this.data, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code data}
+         * <p>
+         * Adds one or more values to <code>data</code>.
+         */
+        public final Builder data(String value, String... values) {
+            this.data = _listAdd(this.data, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeInfoPath}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoPath build() {
+            _checkSingleUse();
+
+            return new NodeInfoPath(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeInfoPath}
+     */
+    public static final JsonpDeserializer<NodeInfoPath> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoPath::setupNodeInfoPathDeserializer
+    );
+
+    protected static void setupNodeInfoPathDeserializer(ObjectDeserializer<NodeInfoPath.Builder> op) {
+
+        op.add(Builder::logs, JsonpDeserializer.stringDeserializer(), "logs");
+        op.add(Builder::home, JsonpDeserializer.stringDeserializer(), "home");
+        op.add(Builder::repo, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "repo");
+        op.add(Builder::data, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "data");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoRepositories.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoRepositories.java
index 5c92308812..bacdb053af 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoRepositories.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoRepositories.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,100 +43,99 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoRepositories
 
 @JsonpDeserializable
 public class NodeInfoRepositories implements JsonpSerializable {
-	private final NodeInfoRepositoriesUrl url;
+    private final NodeInfoRepositoriesUrl url;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private NodeInfoRepositories(Builder builder) {
+    private NodeInfoRepositories(Builder builder) {
 
-		this.url = ApiTypeHelper.requireNonNull(builder.url, this, "url");
+        this.url = ApiTypeHelper.requireNonNull(builder.url, this, "url");
 
-	}
+    }
 
-	public static NodeInfoRepositories of(Function<Builder, ObjectBuilder<NodeInfoRepositories>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static NodeInfoRepositories of(Function<Builder, ObjectBuilder<NodeInfoRepositories>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code url}
-	 */
-	public final NodeInfoRepositoriesUrl url() {
-		return this.url;
-	}
+    /**
+     * Required - API name: {@code url}
+     */
+    public final NodeInfoRepositoriesUrl url() {
+        return this.url;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("url");
-		this.url.serialize(generator, mapper);
+        generator.writeKey("url");
+        this.url.serialize(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link NodeInfoRepositories}.
-	 */
+    /**
+     * Builder for {@link NodeInfoRepositories}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoRepositories> {
-		private NodeInfoRepositoriesUrl url;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoRepositories> {
+        private NodeInfoRepositoriesUrl url;
 
-		/**
-		 * Required - API name: {@code url}
-		 */
-		public final Builder url(NodeInfoRepositoriesUrl value) {
-			this.url = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code url}
+         */
+        public final Builder url(NodeInfoRepositoriesUrl value) {
+            this.url = value;
+            return this;
+        }
 
-		/**
-		 * Required - API name: {@code url}
-		 */
-		public final Builder url(Function<NodeInfoRepositoriesUrl.Builder, ObjectBuilder<NodeInfoRepositoriesUrl>> fn) {
-			return this.url(fn.apply(new NodeInfoRepositoriesUrl.Builder()).build());
-		}
+        /**
+         * Required - API name: {@code url}
+         */
+        public final Builder url(Function<NodeInfoRepositoriesUrl.Builder, ObjectBuilder<NodeInfoRepositoriesUrl>> fn) {
+            return this.url(fn.apply(new NodeInfoRepositoriesUrl.Builder()).build());
+        }
 
-		/**
-		 * Builds a {@link NodeInfoRepositories}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoRepositories build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link NodeInfoRepositories}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoRepositories build() {
+            _checkSingleUse();
 
-			return new NodeInfoRepositories(this);
-		}
-	}
+            return new NodeInfoRepositories(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link NodeInfoRepositories}
-	 */
-	public static final JsonpDeserializer<NodeInfoRepositories> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoRepositories::setupNodeInfoRepositoriesDeserializer);
+    /**
+     * Json deserializer for {@link NodeInfoRepositories}
+     */
+    public static final JsonpDeserializer<NodeInfoRepositories> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoRepositories::setupNodeInfoRepositoriesDeserializer
+    );
 
-	protected static void setupNodeInfoRepositoriesDeserializer(ObjectDeserializer<NodeInfoRepositories.Builder> op) {
+    protected static void setupNodeInfoRepositoriesDeserializer(ObjectDeserializer<NodeInfoRepositories.Builder> op) {
 
-		op.add(Builder::url, NodeInfoRepositoriesUrl._DESERIALIZER, "url");
+        op.add(Builder::url, NodeInfoRepositoriesUrl._DESERIALIZER, "url");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoRepositoriesUrl.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoRepositoriesUrl.java
index e1461181ae..48de4505c1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoRepositoriesUrl.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoRepositoriesUrl.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,93 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoRepositoriesUrl
 
 @JsonpDeserializable
 public class NodeInfoRepositoriesUrl implements JsonpSerializable {
-	private final String allowedUrls;
+    private final String allowedUrls;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private NodeInfoRepositoriesUrl(Builder builder) {
+    private NodeInfoRepositoriesUrl(Builder builder) {
 
-		this.allowedUrls = ApiTypeHelper.requireNonNull(builder.allowedUrls, this, "allowedUrls");
+        this.allowedUrls = ApiTypeHelper.requireNonNull(builder.allowedUrls, this, "allowedUrls");
 
-	}
+    }
 
-	public static NodeInfoRepositoriesUrl of(Function<Builder, ObjectBuilder<NodeInfoRepositoriesUrl>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static NodeInfoRepositoriesUrl of(Function<Builder, ObjectBuilder<NodeInfoRepositoriesUrl>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code allowed_urls}
-	 */
-	public final String allowedUrls() {
-		return this.allowedUrls;
-	}
+    /**
+     * Required - API name: {@code allowed_urls}
+     */
+    public final String allowedUrls() {
+        return this.allowedUrls;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("allowed_urls");
-		generator.write(this.allowedUrls);
+        generator.writeKey("allowed_urls");
+        generator.write(this.allowedUrls);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link NodeInfoRepositoriesUrl}.
-	 */
+    /**
+     * Builder for {@link NodeInfoRepositoriesUrl}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoRepositoriesUrl> {
-		private String allowedUrls;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoRepositoriesUrl> {
+        private String allowedUrls;
 
-		/**
-		 * Required - API name: {@code allowed_urls}
-		 */
-		public final Builder allowedUrls(String value) {
-			this.allowedUrls = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code allowed_urls}
+         */
+        public final Builder allowedUrls(String value) {
+            this.allowedUrls = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link NodeInfoRepositoriesUrl}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoRepositoriesUrl build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link NodeInfoRepositoriesUrl}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoRepositoriesUrl build() {
+            _checkSingleUse();
 
-			return new NodeInfoRepositoriesUrl(this);
-		}
-	}
+            return new NodeInfoRepositoriesUrl(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link NodeInfoRepositoriesUrl}
-	 */
-	public static final JsonpDeserializer<NodeInfoRepositoriesUrl> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoRepositoriesUrl::setupNodeInfoRepositoriesUrlDeserializer);
+    /**
+     * Json deserializer for {@link NodeInfoRepositoriesUrl}
+     */
+    public static final JsonpDeserializer<NodeInfoRepositoriesUrl> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoRepositoriesUrl::setupNodeInfoRepositoriesUrlDeserializer
+    );
 
-	protected static void setupNodeInfoRepositoriesUrlDeserializer(
-			ObjectDeserializer<NodeInfoRepositoriesUrl.Builder> op) {
+    protected static void setupNodeInfoRepositoriesUrlDeserializer(ObjectDeserializer<NodeInfoRepositoriesUrl.Builder> op) {
 
-		op.add(Builder::allowedUrls, JsonpDeserializer.stringDeserializer(), "allowed_urls");
+        op.add(Builder::allowedUrls, JsonpDeserializer.stringDeserializer(), "allowed_urls");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoScript.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoScript.java
index cfe68d7c15..55e05e34c3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoScript.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoScript.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,124 +44,124 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-
-import javax.annotation.Nullable;
 
 // typedef: nodes.info.NodeInfoScript
 
 @JsonpDeserializable
 public class NodeInfoScript implements JsonpSerializable {
     @Nullable
-	private final String allowedTypes;
-
-	private final String disableMaxCompilationsRate;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeInfoScript(Builder builder) {
-
-		this.allowedTypes = builder.allowedTypes;
-		this.disableMaxCompilationsRate = ApiTypeHelper.requireNonNull(builder.disableMaxCompilationsRate, this,
-				"disableMaxCompilationsRate");
-
-	}
-
-	public static NodeInfoScript of(Function<Builder, ObjectBuilder<NodeInfoScript>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code allowed_types}
-	 */
-	@Nullable
-	public final String allowedTypes() {
-		return this.allowedTypes;
-	}
-
-	/**
-	 * Required - API name: {@code disable_max_compilations_rate}
-	 */
-	public final String disableMaxCompilationsRate() {
-		return this.disableMaxCompilationsRate;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-	    if (this.allowedTypes != null) {
-    		generator.writeKey("allowed_types");
-    		generator.write(this.allowedTypes);
-		}
-
-		generator.writeKey("disable_max_compilations_rate");
-		generator.write(this.disableMaxCompilationsRate);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeInfoScript}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoScript> {
-	    @Nullable
-	    private String allowedTypes;
-
-		private String disableMaxCompilationsRate;
-
-		/**
-		 * API name: {@code allowed_types}
-		 */
-		public final Builder allowedTypes(String value) {
-			this.allowedTypes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code disable_max_compilations_rate}
-		 */
-		public final Builder disableMaxCompilationsRate(String value) {
-			this.disableMaxCompilationsRate = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeInfoScript}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoScript build() {
-			_checkSingleUse();
-
-			return new NodeInfoScript(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeInfoScript}
-	 */
-	public static final JsonpDeserializer<NodeInfoScript> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeInfoScript::setupNodeInfoScriptDeserializer);
-
-	protected static void setupNodeInfoScriptDeserializer(ObjectDeserializer<NodeInfoScript.Builder> op) {
-
-		op.add(Builder::allowedTypes, JsonpDeserializer.stringDeserializer(), "allowed_types");
-		op.add(Builder::disableMaxCompilationsRate, JsonpDeserializer.stringDeserializer(),
-				"disable_max_compilations_rate");
-
-	}
+    private final String allowedTypes;
+
+    private final String disableMaxCompilationsRate;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeInfoScript(Builder builder) {
+
+        this.allowedTypes = builder.allowedTypes;
+        this.disableMaxCompilationsRate = ApiTypeHelper.requireNonNull(
+            builder.disableMaxCompilationsRate,
+            this,
+            "disableMaxCompilationsRate"
+        );
+
+    }
+
+    public static NodeInfoScript of(Function<Builder, ObjectBuilder<NodeInfoScript>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code allowed_types}
+     */
+    @Nullable
+    public final String allowedTypes() {
+        return this.allowedTypes;
+    }
+
+    /**
+     * Required - API name: {@code disable_max_compilations_rate}
+     */
+    public final String disableMaxCompilationsRate() {
+        return this.disableMaxCompilationsRate;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+        if (this.allowedTypes != null) {
+            generator.writeKey("allowed_types");
+            generator.write(this.allowedTypes);
+        }
+
+        generator.writeKey("disable_max_compilations_rate");
+        generator.write(this.disableMaxCompilationsRate);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeInfoScript}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoScript> {
+        @Nullable
+        private String allowedTypes;
+
+        private String disableMaxCompilationsRate;
+
+        /**
+         * API name: {@code allowed_types}
+         */
+        public final Builder allowedTypes(String value) {
+            this.allowedTypes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code disable_max_compilations_rate}
+         */
+        public final Builder disableMaxCompilationsRate(String value) {
+            this.disableMaxCompilationsRate = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeInfoScript}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoScript build() {
+            _checkSingleUse();
+
+            return new NodeInfoScript(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeInfoScript}
+     */
+    public static final JsonpDeserializer<NodeInfoScript> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoScript::setupNodeInfoScriptDeserializer
+    );
+
+    protected static void setupNodeInfoScriptDeserializer(ObjectDeserializer<NodeInfoScript.Builder> op) {
+
+        op.add(Builder::allowedTypes, JsonpDeserializer.stringDeserializer(), "allowed_types");
+        op.add(Builder::disableMaxCompilationsRate, JsonpDeserializer.stringDeserializer(), "disable_max_compilations_rate");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSearch.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSearch.java
index 5d33e5a7fd..53351d2859 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSearch.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSearch.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,100 +43,99 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoSearch
 
 @JsonpDeserializable
 public class NodeInfoSearch implements JsonpSerializable {
-	private final NodeInfoSearchRemote remote;
+    private final NodeInfoSearchRemote remote;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private NodeInfoSearch(Builder builder) {
+    private NodeInfoSearch(Builder builder) {
 
-		this.remote = ApiTypeHelper.requireNonNull(builder.remote, this, "remote");
+        this.remote = ApiTypeHelper.requireNonNull(builder.remote, this, "remote");
 
-	}
+    }
 
-	public static NodeInfoSearch of(Function<Builder, ObjectBuilder<NodeInfoSearch>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static NodeInfoSearch of(Function<Builder, ObjectBuilder<NodeInfoSearch>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code remote}
-	 */
-	public final NodeInfoSearchRemote remote() {
-		return this.remote;
-	}
+    /**
+     * Required - API name: {@code remote}
+     */
+    public final NodeInfoSearchRemote remote() {
+        return this.remote;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("remote");
-		this.remote.serialize(generator, mapper);
+        generator.writeKey("remote");
+        this.remote.serialize(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link NodeInfoSearch}.
-	 */
+    /**
+     * Builder for {@link NodeInfoSearch}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSearch> {
-		private NodeInfoSearchRemote remote;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSearch> {
+        private NodeInfoSearchRemote remote;
 
-		/**
-		 * Required - API name: {@code remote}
-		 */
-		public final Builder remote(NodeInfoSearchRemote value) {
-			this.remote = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code remote}
+         */
+        public final Builder remote(NodeInfoSearchRemote value) {
+            this.remote = value;
+            return this;
+        }
 
-		/**
-		 * Required - API name: {@code remote}
-		 */
-		public final Builder remote(Function<NodeInfoSearchRemote.Builder, ObjectBuilder<NodeInfoSearchRemote>> fn) {
-			return this.remote(fn.apply(new NodeInfoSearchRemote.Builder()).build());
-		}
+        /**
+         * Required - API name: {@code remote}
+         */
+        public final Builder remote(Function<NodeInfoSearchRemote.Builder, ObjectBuilder<NodeInfoSearchRemote>> fn) {
+            return this.remote(fn.apply(new NodeInfoSearchRemote.Builder()).build());
+        }
 
-		/**
-		 * Builds a {@link NodeInfoSearch}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoSearch build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link NodeInfoSearch}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoSearch build() {
+            _checkSingleUse();
 
-			return new NodeInfoSearch(this);
-		}
-	}
+            return new NodeInfoSearch(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link NodeInfoSearch}
-	 */
-	public static final JsonpDeserializer<NodeInfoSearch> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeInfoSearch::setupNodeInfoSearchDeserializer);
+    /**
+     * Json deserializer for {@link NodeInfoSearch}
+     */
+    public static final JsonpDeserializer<NodeInfoSearch> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoSearch::setupNodeInfoSearchDeserializer
+    );
 
-	protected static void setupNodeInfoSearchDeserializer(ObjectDeserializer<NodeInfoSearch.Builder> op) {
+    protected static void setupNodeInfoSearchDeserializer(ObjectDeserializer<NodeInfoSearch.Builder> op) {
 
-		op.add(Builder::remote, NodeInfoSearchRemote._DESERIALIZER, "remote");
+        op.add(Builder::remote, NodeInfoSearchRemote._DESERIALIZER, "remote");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSearchRemote.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSearchRemote.java
index 1dacb9960a..40d837c68c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSearchRemote.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSearchRemote.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,92 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoSearchRemote
 
 @JsonpDeserializable
 public class NodeInfoSearchRemote implements JsonpSerializable {
-	private final String connect;
+    private final String connect;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private NodeInfoSearchRemote(Builder builder) {
+    private NodeInfoSearchRemote(Builder builder) {
 
-		this.connect = ApiTypeHelper.requireNonNull(builder.connect, this, "connect");
+        this.connect = ApiTypeHelper.requireNonNull(builder.connect, this, "connect");
 
-	}
+    }
 
-	public static NodeInfoSearchRemote of(Function<Builder, ObjectBuilder<NodeInfoSearchRemote>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static NodeInfoSearchRemote of(Function<Builder, ObjectBuilder<NodeInfoSearchRemote>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code connect}
-	 */
-	public final String connect() {
-		return this.connect;
-	}
+    /**
+     * Required - API name: {@code connect}
+     */
+    public final String connect() {
+        return this.connect;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("connect");
-		generator.write(this.connect);
+        generator.writeKey("connect");
+        generator.write(this.connect);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link NodeInfoSearchRemote}.
-	 */
+    /**
+     * Builder for {@link NodeInfoSearchRemote}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSearchRemote> {
-		private String connect;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSearchRemote> {
+        private String connect;
 
-		/**
-		 * Required - API name: {@code connect}
-		 */
-		public final Builder connect(String value) {
-			this.connect = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code connect}
+         */
+        public final Builder connect(String value) {
+            this.connect = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link NodeInfoSearchRemote}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoSearchRemote build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link NodeInfoSearchRemote}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoSearchRemote build() {
+            _checkSingleUse();
 
-			return new NodeInfoSearchRemote(this);
-		}
-	}
+            return new NodeInfoSearchRemote(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link NodeInfoSearchRemote}
-	 */
-	public static final JsonpDeserializer<NodeInfoSearchRemote> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoSearchRemote::setupNodeInfoSearchRemoteDeserializer);
+    /**
+     * Json deserializer for {@link NodeInfoSearchRemote}
+     */
+    public static final JsonpDeserializer<NodeInfoSearchRemote> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoSearchRemote::setupNodeInfoSearchRemoteDeserializer
+    );
 
-	protected static void setupNodeInfoSearchRemoteDeserializer(ObjectDeserializer<NodeInfoSearchRemote.Builder> op) {
+    protected static void setupNodeInfoSearchRemoteDeserializer(ObjectDeserializer<NodeInfoSearchRemote.Builder> op) {
 
-		op.add(Builder::connect, JsonpDeserializer.stringDeserializer(), "connect");
+        op.add(Builder::connect, JsonpDeserializer.stringDeserializer(), "connect");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettings.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettings.java
index c450a08506..421637ecdb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettings.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettings.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,550 +44,543 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: nodes.info.NodeInfoSettings
 
 @JsonpDeserializable
 public class NodeInfoSettings implements JsonpSerializable {
-	private final NodeInfoSettingsCluster cluster;
-
-	private final NodeInfoSettingsNode node;
-
-	private final NodeInfoPath path;
-
-	@Nullable
-	private final NodeInfoRepositories repositories;
-
-	@Nullable
-	private final NodeInfoDiscover discovery;
-
-	@Nullable
-	private final NodeInfoAction action;
-
-	private final NodeInfoClient client;
-
-	private final NodeInfoSettingsHttp http;
-
-	@Nullable
-	private final NodeInfoBootstrap bootstrap;
-
-	private final NodeInfoSettingsTransport transport;
-
-	@Nullable
-	private final NodeInfoSettingsNetwork network;
-
-	@Nullable
-	private final NodeInfoScript script;
-
-	@Nullable
-	private final NodeInfoSearch search;
-
-	@Nullable
-	private final NodeInfoSettingsIngest ingest;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeInfoSettings(Builder builder) {
-
-		this.cluster = ApiTypeHelper.requireNonNull(builder.cluster, this, "cluster");
-		this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
-		this.path = ApiTypeHelper.requireNonNull(builder.path, this, "path");
-		this.repositories = builder.repositories;
-		this.discovery = builder.discovery;
-		this.action = builder.action;
-		this.client = ApiTypeHelper.requireNonNull(builder.client, this, "client");
-		this.http = ApiTypeHelper.requireNonNull(builder.http, this, "http");
-		this.bootstrap = builder.bootstrap;
-		this.transport = ApiTypeHelper.requireNonNull(builder.transport, this, "transport");
-		this.network = builder.network;
-		this.script = builder.script;
-		this.search = builder.search;
-		this.ingest = builder.ingest;
-
-	}
-
-	public static NodeInfoSettings of(Function<Builder, ObjectBuilder<NodeInfoSettings>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code cluster}
-	 */
-	public final NodeInfoSettingsCluster cluster() {
-		return this.cluster;
-	}
-
-	/**
-	 * Required - API name: {@code node}
-	 */
-	public final NodeInfoSettingsNode node() {
-		return this.node;
-	}
-
-	/**
-	 * Required - API name: {@code path}
-	 */
-	public final NodeInfoPath path() {
-		return this.path;
-	}
-
-	/**
-	 * API name: {@code repositories}
-	 */
-	@Nullable
-	public final NodeInfoRepositories repositories() {
-		return this.repositories;
-	}
-
-	/**
-	 * API name: {@code discovery}
-	 */
-	@Nullable
-	public final NodeInfoDiscover discovery() {
-		return this.discovery;
-	}
-
-	/**
-	 * API name: {@code action}
-	 */
-	@Nullable
-	public final NodeInfoAction action() {
-		return this.action;
-	}
-
-	/**
-	 * Required - API name: {@code client}
-	 */
-	public final NodeInfoClient client() {
-		return this.client;
-	}
-
-	/**
-	 * Required - API name: {@code http}
-	 */
-	public final NodeInfoSettingsHttp http() {
-		return this.http;
-	}
-
-	/**
-	 * API name: {@code bootstrap}
-	 */
-	@Nullable
-	public final NodeInfoBootstrap bootstrap() {
-		return this.bootstrap;
-	}
-
-	/**
-	 * Required - API name: {@code transport}
-	 */
-	public final NodeInfoSettingsTransport transport() {
-		return this.transport;
-	}
-
-	/**
-	 * API name: {@code network}
-	 */
-	@Nullable
-	public final NodeInfoSettingsNetwork network() {
-		return this.network;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final NodeInfoScript script() {
-		return this.script;
-	}
-
-	/**
-	 * API name: {@code search}
-	 */
-	@Nullable
-	public final NodeInfoSearch search() {
-		return this.search;
-	}
-
-	/**
-	 * API name: {@code ingest}
-	 */
-	@Nullable
-	public final NodeInfoSettingsIngest ingest() {
-		return this.ingest;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("cluster");
-		this.cluster.serialize(generator, mapper);
-
-		generator.writeKey("node");
-		this.node.serialize(generator, mapper);
-
-		generator.writeKey("path");
-		this.path.serialize(generator, mapper);
-
-		if (this.repositories != null) {
-			generator.writeKey("repositories");
-			this.repositories.serialize(generator, mapper);
-
-		}
-		if (this.discovery != null) {
-			generator.writeKey("discovery");
-			this.discovery.serialize(generator, mapper);
-
-		}
-		if (this.action != null) {
-			generator.writeKey("action");
-			this.action.serialize(generator, mapper);
-
-		}
-		generator.writeKey("client");
-		this.client.serialize(generator, mapper);
-
-		generator.writeKey("http");
-		this.http.serialize(generator, mapper);
-
-		if (this.bootstrap != null) {
-			generator.writeKey("bootstrap");
-			this.bootstrap.serialize(generator, mapper);
-
-		}
-		generator.writeKey("transport");
-		this.transport.serialize(generator, mapper);
-
-		if (this.network != null) {
-			generator.writeKey("network");
-			this.network.serialize(generator, mapper);
-
-		}
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-		if (this.search != null) {
-			generator.writeKey("search");
-			this.search.serialize(generator, mapper);
-
-		}
-		if (this.ingest != null) {
-			generator.writeKey("ingest");
-			this.ingest.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeInfoSettings}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettings> {
-		private NodeInfoSettingsCluster cluster;
-
-		private NodeInfoSettingsNode node;
-
-		private NodeInfoPath path;
-
-		@Nullable
-		private NodeInfoRepositories repositories;
-
-		@Nullable
-		private NodeInfoDiscover discovery;
-
-		@Nullable
-		private NodeInfoAction action;
-
-		private NodeInfoClient client;
-
-		private NodeInfoSettingsHttp http;
-
-		@Nullable
-		private NodeInfoBootstrap bootstrap;
-
-		private NodeInfoSettingsTransport transport;
-
-		@Nullable
-		private NodeInfoSettingsNetwork network;
-
-		@Nullable
-		private NodeInfoScript script;
-
-		@Nullable
-		private NodeInfoSearch search;
-
-		@Nullable
-		private NodeInfoSettingsIngest ingest;
-
-		/**
-		 * Required - API name: {@code cluster}
-		 */
-		public final Builder cluster(NodeInfoSettingsCluster value) {
-			this.cluster = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code cluster}
-		 */
-		public final Builder cluster(
-				Function<NodeInfoSettingsCluster.Builder, ObjectBuilder<NodeInfoSettingsCluster>> fn) {
-			return this.cluster(fn.apply(new NodeInfoSettingsCluster.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code node}
-		 */
-		public final Builder node(NodeInfoSettingsNode value) {
-			this.node = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code node}
-		 */
-		public final Builder node(Function<NodeInfoSettingsNode.Builder, ObjectBuilder<NodeInfoSettingsNode>> fn) {
-			return this.node(fn.apply(new NodeInfoSettingsNode.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code path}
-		 */
-		public final Builder path(NodeInfoPath value) {
-			this.path = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code path}
-		 */
-		public final Builder path(Function<NodeInfoPath.Builder, ObjectBuilder<NodeInfoPath>> fn) {
-			return this.path(fn.apply(new NodeInfoPath.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code repositories}
-		 */
-		public final Builder repositories(@Nullable NodeInfoRepositories value) {
-			this.repositories = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code repositories}
-		 */
-		public final Builder repositories(
-				Function<NodeInfoRepositories.Builder, ObjectBuilder<NodeInfoRepositories>> fn) {
-			return this.repositories(fn.apply(new NodeInfoRepositories.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code discovery}
-		 */
-		public final Builder discovery(@Nullable NodeInfoDiscover value) {
-			this.discovery = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code discovery}
-		 */
-		public final Builder discovery(Function<NodeInfoDiscover.Builder, ObjectBuilder<NodeInfoDiscover>> fn) {
-			return this.discovery(fn.apply(new NodeInfoDiscover.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code action}
-		 */
-		public final Builder action(@Nullable NodeInfoAction value) {
-			this.action = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code action}
-		 */
-		public final Builder action(Function<NodeInfoAction.Builder, ObjectBuilder<NodeInfoAction>> fn) {
-			return this.action(fn.apply(new NodeInfoAction.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code client}
-		 */
-		public final Builder client(NodeInfoClient value) {
-			this.client = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code client}
-		 */
-		public final Builder client(Function<NodeInfoClient.Builder, ObjectBuilder<NodeInfoClient>> fn) {
-			return this.client(fn.apply(new NodeInfoClient.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code http}
-		 */
-		public final Builder http(NodeInfoSettingsHttp value) {
-			this.http = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code http}
-		 */
-		public final Builder http(Function<NodeInfoSettingsHttp.Builder, ObjectBuilder<NodeInfoSettingsHttp>> fn) {
-			return this.http(fn.apply(new NodeInfoSettingsHttp.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code bootstrap}
-		 */
-		public final Builder bootstrap(@Nullable NodeInfoBootstrap value) {
-			this.bootstrap = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code bootstrap}
-		 */
-		public final Builder bootstrap(Function<NodeInfoBootstrap.Builder, ObjectBuilder<NodeInfoBootstrap>> fn) {
-			return this.bootstrap(fn.apply(new NodeInfoBootstrap.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code transport}
-		 */
-		public final Builder transport(NodeInfoSettingsTransport value) {
-			this.transport = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code transport}
-		 */
-		public final Builder transport(
-				Function<NodeInfoSettingsTransport.Builder, ObjectBuilder<NodeInfoSettingsTransport>> fn) {
-			return this.transport(fn.apply(new NodeInfoSettingsTransport.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code network}
-		 */
-		public final Builder network(@Nullable NodeInfoSettingsNetwork value) {
-			this.network = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code network}
-		 */
-		public final Builder network(
-				Function<NodeInfoSettingsNetwork.Builder, ObjectBuilder<NodeInfoSettingsNetwork>> fn) {
-			return this.network(fn.apply(new NodeInfoSettingsNetwork.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(@Nullable NodeInfoScript value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(Function<NodeInfoScript.Builder, ObjectBuilder<NodeInfoScript>> fn) {
-			return this.script(fn.apply(new NodeInfoScript.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code search}
-		 */
-		public final Builder search(@Nullable NodeInfoSearch value) {
-			this.search = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code search}
-		 */
-		public final Builder search(Function<NodeInfoSearch.Builder, ObjectBuilder<NodeInfoSearch>> fn) {
-			return this.search(fn.apply(new NodeInfoSearch.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code ingest}
-		 */
-		public final Builder ingest(@Nullable NodeInfoSettingsIngest value) {
-			this.ingest = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code ingest}
-		 */
-		public final Builder ingest(
-				Function<NodeInfoSettingsIngest.Builder, ObjectBuilder<NodeInfoSettingsIngest>> fn) {
-			return this.ingest(fn.apply(new NodeInfoSettingsIngest.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link NodeInfoSettings}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoSettings build() {
-			_checkSingleUse();
-
-			return new NodeInfoSettings(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeInfoSettings}
-	 */
-	public static final JsonpDeserializer<NodeInfoSettings> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeInfoSettings::setupNodeInfoSettingsDeserializer);
-
-	protected static void setupNodeInfoSettingsDeserializer(ObjectDeserializer<NodeInfoSettings.Builder> op) {
-
-		op.add(Builder::cluster, NodeInfoSettingsCluster._DESERIALIZER, "cluster");
-		op.add(Builder::node, NodeInfoSettingsNode._DESERIALIZER, "node");
-		op.add(Builder::path, NodeInfoPath._DESERIALIZER, "path");
-		op.add(Builder::repositories, NodeInfoRepositories._DESERIALIZER, "repositories");
-		op.add(Builder::discovery, NodeInfoDiscover._DESERIALIZER, "discovery");
-		op.add(Builder::action, NodeInfoAction._DESERIALIZER, "action");
-		op.add(Builder::client, NodeInfoClient._DESERIALIZER, "client");
-		op.add(Builder::http, NodeInfoSettingsHttp._DESERIALIZER, "http");
-		op.add(Builder::bootstrap, NodeInfoBootstrap._DESERIALIZER, "bootstrap");
-		op.add(Builder::transport, NodeInfoSettingsTransport._DESERIALIZER, "transport");
-		op.add(Builder::network, NodeInfoSettingsNetwork._DESERIALIZER, "network");
-		op.add(Builder::script, NodeInfoScript._DESERIALIZER, "script");
-		op.add(Builder::search, NodeInfoSearch._DESERIALIZER, "search");
-		op.add(Builder::ingest, NodeInfoSettingsIngest._DESERIALIZER, "ingest");
-
-	}
+    private final NodeInfoSettingsCluster cluster;
+
+    private final NodeInfoSettingsNode node;
+
+    private final NodeInfoPath path;
+
+    @Nullable
+    private final NodeInfoRepositories repositories;
+
+    @Nullable
+    private final NodeInfoDiscover discovery;
+
+    @Nullable
+    private final NodeInfoAction action;
+
+    private final NodeInfoClient client;
+
+    private final NodeInfoSettingsHttp http;
+
+    @Nullable
+    private final NodeInfoBootstrap bootstrap;
+
+    private final NodeInfoSettingsTransport transport;
+
+    @Nullable
+    private final NodeInfoSettingsNetwork network;
+
+    @Nullable
+    private final NodeInfoScript script;
+
+    @Nullable
+    private final NodeInfoSearch search;
+
+    @Nullable
+    private final NodeInfoSettingsIngest ingest;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeInfoSettings(Builder builder) {
+
+        this.cluster = ApiTypeHelper.requireNonNull(builder.cluster, this, "cluster");
+        this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
+        this.path = ApiTypeHelper.requireNonNull(builder.path, this, "path");
+        this.repositories = builder.repositories;
+        this.discovery = builder.discovery;
+        this.action = builder.action;
+        this.client = ApiTypeHelper.requireNonNull(builder.client, this, "client");
+        this.http = ApiTypeHelper.requireNonNull(builder.http, this, "http");
+        this.bootstrap = builder.bootstrap;
+        this.transport = ApiTypeHelper.requireNonNull(builder.transport, this, "transport");
+        this.network = builder.network;
+        this.script = builder.script;
+        this.search = builder.search;
+        this.ingest = builder.ingest;
+
+    }
+
+    public static NodeInfoSettings of(Function<Builder, ObjectBuilder<NodeInfoSettings>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code cluster}
+     */
+    public final NodeInfoSettingsCluster cluster() {
+        return this.cluster;
+    }
+
+    /**
+     * Required - API name: {@code node}
+     */
+    public final NodeInfoSettingsNode node() {
+        return this.node;
+    }
+
+    /**
+     * Required - API name: {@code path}
+     */
+    public final NodeInfoPath path() {
+        return this.path;
+    }
+
+    /**
+     * API name: {@code repositories}
+     */
+    @Nullable
+    public final NodeInfoRepositories repositories() {
+        return this.repositories;
+    }
+
+    /**
+     * API name: {@code discovery}
+     */
+    @Nullable
+    public final NodeInfoDiscover discovery() {
+        return this.discovery;
+    }
+
+    /**
+     * API name: {@code action}
+     */
+    @Nullable
+    public final NodeInfoAction action() {
+        return this.action;
+    }
+
+    /**
+     * Required - API name: {@code client}
+     */
+    public final NodeInfoClient client() {
+        return this.client;
+    }
+
+    /**
+     * Required - API name: {@code http}
+     */
+    public final NodeInfoSettingsHttp http() {
+        return this.http;
+    }
+
+    /**
+     * API name: {@code bootstrap}
+     */
+    @Nullable
+    public final NodeInfoBootstrap bootstrap() {
+        return this.bootstrap;
+    }
+
+    /**
+     * Required - API name: {@code transport}
+     */
+    public final NodeInfoSettingsTransport transport() {
+        return this.transport;
+    }
+
+    /**
+     * API name: {@code network}
+     */
+    @Nullable
+    public final NodeInfoSettingsNetwork network() {
+        return this.network;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final NodeInfoScript script() {
+        return this.script;
+    }
+
+    /**
+     * API name: {@code search}
+     */
+    @Nullable
+    public final NodeInfoSearch search() {
+        return this.search;
+    }
+
+    /**
+     * API name: {@code ingest}
+     */
+    @Nullable
+    public final NodeInfoSettingsIngest ingest() {
+        return this.ingest;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("cluster");
+        this.cluster.serialize(generator, mapper);
+
+        generator.writeKey("node");
+        this.node.serialize(generator, mapper);
+
+        generator.writeKey("path");
+        this.path.serialize(generator, mapper);
+
+        if (this.repositories != null) {
+            generator.writeKey("repositories");
+            this.repositories.serialize(generator, mapper);
+
+        }
+        if (this.discovery != null) {
+            generator.writeKey("discovery");
+            this.discovery.serialize(generator, mapper);
+
+        }
+        if (this.action != null) {
+            generator.writeKey("action");
+            this.action.serialize(generator, mapper);
+
+        }
+        generator.writeKey("client");
+        this.client.serialize(generator, mapper);
+
+        generator.writeKey("http");
+        this.http.serialize(generator, mapper);
+
+        if (this.bootstrap != null) {
+            generator.writeKey("bootstrap");
+            this.bootstrap.serialize(generator, mapper);
+
+        }
+        generator.writeKey("transport");
+        this.transport.serialize(generator, mapper);
+
+        if (this.network != null) {
+            generator.writeKey("network");
+            this.network.serialize(generator, mapper);
+
+        }
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+        if (this.search != null) {
+            generator.writeKey("search");
+            this.search.serialize(generator, mapper);
+
+        }
+        if (this.ingest != null) {
+            generator.writeKey("ingest");
+            this.ingest.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeInfoSettings}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettings> {
+        private NodeInfoSettingsCluster cluster;
+
+        private NodeInfoSettingsNode node;
+
+        private NodeInfoPath path;
+
+        @Nullable
+        private NodeInfoRepositories repositories;
+
+        @Nullable
+        private NodeInfoDiscover discovery;
+
+        @Nullable
+        private NodeInfoAction action;
+
+        private NodeInfoClient client;
+
+        private NodeInfoSettingsHttp http;
+
+        @Nullable
+        private NodeInfoBootstrap bootstrap;
+
+        private NodeInfoSettingsTransport transport;
+
+        @Nullable
+        private NodeInfoSettingsNetwork network;
+
+        @Nullable
+        private NodeInfoScript script;
+
+        @Nullable
+        private NodeInfoSearch search;
+
+        @Nullable
+        private NodeInfoSettingsIngest ingest;
+
+        /**
+         * Required - API name: {@code cluster}
+         */
+        public final Builder cluster(NodeInfoSettingsCluster value) {
+            this.cluster = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code cluster}
+         */
+        public final Builder cluster(Function<NodeInfoSettingsCluster.Builder, ObjectBuilder<NodeInfoSettingsCluster>> fn) {
+            return this.cluster(fn.apply(new NodeInfoSettingsCluster.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code node}
+         */
+        public final Builder node(NodeInfoSettingsNode value) {
+            this.node = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code node}
+         */
+        public final Builder node(Function<NodeInfoSettingsNode.Builder, ObjectBuilder<NodeInfoSettingsNode>> fn) {
+            return this.node(fn.apply(new NodeInfoSettingsNode.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code path}
+         */
+        public final Builder path(NodeInfoPath value) {
+            this.path = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code path}
+         */
+        public final Builder path(Function<NodeInfoPath.Builder, ObjectBuilder<NodeInfoPath>> fn) {
+            return this.path(fn.apply(new NodeInfoPath.Builder()).build());
+        }
+
+        /**
+         * API name: {@code repositories}
+         */
+        public final Builder repositories(@Nullable NodeInfoRepositories value) {
+            this.repositories = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code repositories}
+         */
+        public final Builder repositories(Function<NodeInfoRepositories.Builder, ObjectBuilder<NodeInfoRepositories>> fn) {
+            return this.repositories(fn.apply(new NodeInfoRepositories.Builder()).build());
+        }
+
+        /**
+         * API name: {@code discovery}
+         */
+        public final Builder discovery(@Nullable NodeInfoDiscover value) {
+            this.discovery = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code discovery}
+         */
+        public final Builder discovery(Function<NodeInfoDiscover.Builder, ObjectBuilder<NodeInfoDiscover>> fn) {
+            return this.discovery(fn.apply(new NodeInfoDiscover.Builder()).build());
+        }
+
+        /**
+         * API name: {@code action}
+         */
+        public final Builder action(@Nullable NodeInfoAction value) {
+            this.action = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code action}
+         */
+        public final Builder action(Function<NodeInfoAction.Builder, ObjectBuilder<NodeInfoAction>> fn) {
+            return this.action(fn.apply(new NodeInfoAction.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code client}
+         */
+        public final Builder client(NodeInfoClient value) {
+            this.client = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code client}
+         */
+        public final Builder client(Function<NodeInfoClient.Builder, ObjectBuilder<NodeInfoClient>> fn) {
+            return this.client(fn.apply(new NodeInfoClient.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code http}
+         */
+        public final Builder http(NodeInfoSettingsHttp value) {
+            this.http = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code http}
+         */
+        public final Builder http(Function<NodeInfoSettingsHttp.Builder, ObjectBuilder<NodeInfoSettingsHttp>> fn) {
+            return this.http(fn.apply(new NodeInfoSettingsHttp.Builder()).build());
+        }
+
+        /**
+         * API name: {@code bootstrap}
+         */
+        public final Builder bootstrap(@Nullable NodeInfoBootstrap value) {
+            this.bootstrap = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code bootstrap}
+         */
+        public final Builder bootstrap(Function<NodeInfoBootstrap.Builder, ObjectBuilder<NodeInfoBootstrap>> fn) {
+            return this.bootstrap(fn.apply(new NodeInfoBootstrap.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code transport}
+         */
+        public final Builder transport(NodeInfoSettingsTransport value) {
+            this.transport = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code transport}
+         */
+        public final Builder transport(Function<NodeInfoSettingsTransport.Builder, ObjectBuilder<NodeInfoSettingsTransport>> fn) {
+            return this.transport(fn.apply(new NodeInfoSettingsTransport.Builder()).build());
+        }
+
+        /**
+         * API name: {@code network}
+         */
+        public final Builder network(@Nullable NodeInfoSettingsNetwork value) {
+            this.network = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code network}
+         */
+        public final Builder network(Function<NodeInfoSettingsNetwork.Builder, ObjectBuilder<NodeInfoSettingsNetwork>> fn) {
+            return this.network(fn.apply(new NodeInfoSettingsNetwork.Builder()).build());
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(@Nullable NodeInfoScript value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(Function<NodeInfoScript.Builder, ObjectBuilder<NodeInfoScript>> fn) {
+            return this.script(fn.apply(new NodeInfoScript.Builder()).build());
+        }
+
+        /**
+         * API name: {@code search}
+         */
+        public final Builder search(@Nullable NodeInfoSearch value) {
+            this.search = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code search}
+         */
+        public final Builder search(Function<NodeInfoSearch.Builder, ObjectBuilder<NodeInfoSearch>> fn) {
+            return this.search(fn.apply(new NodeInfoSearch.Builder()).build());
+        }
+
+        /**
+         * API name: {@code ingest}
+         */
+        public final Builder ingest(@Nullable NodeInfoSettingsIngest value) {
+            this.ingest = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code ingest}
+         */
+        public final Builder ingest(Function<NodeInfoSettingsIngest.Builder, ObjectBuilder<NodeInfoSettingsIngest>> fn) {
+            return this.ingest(fn.apply(new NodeInfoSettingsIngest.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link NodeInfoSettings}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoSettings build() {
+            _checkSingleUse();
+
+            return new NodeInfoSettings(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeInfoSettings}
+     */
+    public static final JsonpDeserializer<NodeInfoSettings> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoSettings::setupNodeInfoSettingsDeserializer
+    );
+
+    protected static void setupNodeInfoSettingsDeserializer(ObjectDeserializer<NodeInfoSettings.Builder> op) {
+
+        op.add(Builder::cluster, NodeInfoSettingsCluster._DESERIALIZER, "cluster");
+        op.add(Builder::node, NodeInfoSettingsNode._DESERIALIZER, "node");
+        op.add(Builder::path, NodeInfoPath._DESERIALIZER, "path");
+        op.add(Builder::repositories, NodeInfoRepositories._DESERIALIZER, "repositories");
+        op.add(Builder::discovery, NodeInfoDiscover._DESERIALIZER, "discovery");
+        op.add(Builder::action, NodeInfoAction._DESERIALIZER, "action");
+        op.add(Builder::client, NodeInfoClient._DESERIALIZER, "client");
+        op.add(Builder::http, NodeInfoSettingsHttp._DESERIALIZER, "http");
+        op.add(Builder::bootstrap, NodeInfoBootstrap._DESERIALIZER, "bootstrap");
+        op.add(Builder::transport, NodeInfoSettingsTransport._DESERIALIZER, "transport");
+        op.add(Builder::network, NodeInfoSettingsNetwork._DESERIALIZER, "network");
+        op.add(Builder::script, NodeInfoScript._DESERIALIZER, "script");
+        op.add(Builder::search, NodeInfoSearch._DESERIALIZER, "search");
+        op.add(Builder::ingest, NodeInfoSettingsIngest._DESERIALIZER, "ingest");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsCluster.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsCluster.java
index e72bb97455..24245aae62 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsCluster.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsCluster.java
@@ -32,241 +32,250 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
-import org.opensearch.client.opensearch.indices.IndexRouting;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.indices.IndexRouting;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: nodes.info.NodeInfoSettingsCluster
 
 @JsonpDeserializable
 public class NodeInfoSettingsCluster implements JsonpSerializable {
-	private final String name;
-
-	@Nullable
-	private final IndexRouting routing;
-
-	@Nullable
-	private final NodeInfoSettingsClusterElection election;
-
-	@Deprecated
-	@Nullable
-	private final List<String> initialMasterNodes;
-
-	@Nullable
-	private final List<String> initialClusterManagerNodes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeInfoSettingsCluster(Builder builder) {
-
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.routing = builder.routing;
-		this.election = builder.election;
-		this.initialMasterNodes = builder.initialMasterNodes;
-		this.initialClusterManagerNodes = builder.initialClusterManagerNodes;
-
-	}
-
-	public static NodeInfoSettingsCluster of(Function<Builder, ObjectBuilder<NodeInfoSettingsCluster>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * API name: {@code routing}
-	 */
-	@Nullable
-	public final IndexRouting routing() {
-		return this.routing;
-	}
-
-	/**
-	 * API name: {@code election}
-	 */
-	@Nullable
-	public final NodeInfoSettingsClusterElection election() {
-		return this.election;
-	}
-
-	/**
-	 * API name: {@code initial_master_nodes}
-	 */
-	@Deprecated
-	@Nullable
-	public final List<String> initialMasterNodes() {
-		return this.initialMasterNodes;
-	}
-
-	/**
-	 * API name: {@code initial_cluster_manager_nodes}
-	 */
-	@Nullable
-	public final List<String> initialClusterManagerNodes() {
-		return this.initialClusterManagerNodes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		if (this.routing != null) {
-			generator.writeKey("routing");
-			this.routing.serialize(generator, mapper);
-
-		}
-		generator.writeKey("election");
-		this.election.serialize(generator, mapper);
-
-		if (this.initialMasterNodes != null) {
-		    generator.writeStartArray("initial_master_nodes");
-		    this.initialMasterNodes.forEach(generator::write);
-		    generator.writeEnd();
-		}
-
-		if (this.initialClusterManagerNodes != null) {
-			generator.writeStartArray("initial_cluster_manager_nodes");
-			this.initialClusterManagerNodes.forEach(generator::write);
-			generator.writeEnd();
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeInfoSettingsCluster}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettingsCluster> {
-		private String name;
-
-		@Nullable
-		private IndexRouting routing;
-
-		@Nullable
-		private NodeInfoSettingsClusterElection election;
-
-		@Deprecated
-		@Nullable
-		private List<String> initialMasterNodes;
-
-		@Nullable
-		private List<String> initialClusterManagerNodes;
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(@Nullable IndexRouting value) {
-			this.routing = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code routing}
-		 */
-		public final Builder routing(Function<IndexRouting.Builder, ObjectBuilder<IndexRouting>> fn) {
-			return this.routing(fn.apply(new IndexRouting.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code election}
-		 */
-		public final Builder election(NodeInfoSettingsClusterElection value) {
-			this.election = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code election}
-		 */
-		public final Builder election(
-				Function<NodeInfoSettingsClusterElection.Builder, ObjectBuilder<NodeInfoSettingsClusterElection>> fn) {
-			return this.election(fn.apply(new NodeInfoSettingsClusterElection.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code initial_master_nodes}
-		 */
-		@Deprecated
-		public final Builder initialMasterNodes(@Nullable List<String> value) {
-			this.initialMasterNodes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code initial_cluster_manager_nodes}
-		 */
-		public final Builder initialClusterManagerNodes(@Nullable List<String> value) {
-			this.initialClusterManagerNodes = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeInfoSettingsCluster}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoSettingsCluster build() {
-			_checkSingleUse();
-
-			return new NodeInfoSettingsCluster(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeInfoSettingsCluster}
-	 */
-	public static final JsonpDeserializer<NodeInfoSettingsCluster> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoSettingsCluster::setupNodeInfoSettingsClusterDeserializer);
-
-	protected static void setupNodeInfoSettingsClusterDeserializer(
-			ObjectDeserializer<NodeInfoSettingsCluster.Builder> op) {
-
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::routing, IndexRouting._DESERIALIZER, "routing");
-		op.add(Builder::election, NodeInfoSettingsClusterElection._DESERIALIZER, "election");
-		op.add(Builder::initialMasterNodes, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "initial_master_nodes");
-		op.add(Builder::initialClusterManagerNodes, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "initial_cluster_manager_nodes");
-
-	}
+    private final String name;
+
+    @Nullable
+    private final IndexRouting routing;
+
+    @Nullable
+    private final NodeInfoSettingsClusterElection election;
+
+    @Deprecated
+    @Nullable
+    private final List<String> initialMasterNodes;
+
+    @Nullable
+    private final List<String> initialClusterManagerNodes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeInfoSettingsCluster(Builder builder) {
+
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.routing = builder.routing;
+        this.election = builder.election;
+        this.initialMasterNodes = builder.initialMasterNodes;
+        this.initialClusterManagerNodes = builder.initialClusterManagerNodes;
+
+    }
+
+    public static NodeInfoSettingsCluster of(Function<Builder, ObjectBuilder<NodeInfoSettingsCluster>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * API name: {@code routing}
+     */
+    @Nullable
+    public final IndexRouting routing() {
+        return this.routing;
+    }
+
+    /**
+     * API name: {@code election}
+     */
+    @Nullable
+    public final NodeInfoSettingsClusterElection election() {
+        return this.election;
+    }
+
+    /**
+     * API name: {@code initial_master_nodes}
+     */
+    @Deprecated
+    @Nullable
+    public final List<String> initialMasterNodes() {
+        return this.initialMasterNodes;
+    }
+
+    /**
+     * API name: {@code initial_cluster_manager_nodes}
+     */
+    @Nullable
+    public final List<String> initialClusterManagerNodes() {
+        return this.initialClusterManagerNodes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        if (this.routing != null) {
+            generator.writeKey("routing");
+            this.routing.serialize(generator, mapper);
+
+        }
+        generator.writeKey("election");
+        this.election.serialize(generator, mapper);
+
+        if (this.initialMasterNodes != null) {
+            generator.writeStartArray("initial_master_nodes");
+            this.initialMasterNodes.forEach(generator::write);
+            generator.writeEnd();
+        }
+
+        if (this.initialClusterManagerNodes != null) {
+            generator.writeStartArray("initial_cluster_manager_nodes");
+            this.initialClusterManagerNodes.forEach(generator::write);
+            generator.writeEnd();
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeInfoSettingsCluster}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettingsCluster> {
+        private String name;
+
+        @Nullable
+        private IndexRouting routing;
+
+        @Nullable
+        private NodeInfoSettingsClusterElection election;
+
+        @Deprecated
+        @Nullable
+        private List<String> initialMasterNodes;
+
+        @Nullable
+        private List<String> initialClusterManagerNodes;
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code routing}
+         */
+        public final Builder routing(@Nullable IndexRouting value) {
+            this.routing = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code routing}
+         */
+        public final Builder routing(Function<IndexRouting.Builder, ObjectBuilder<IndexRouting>> fn) {
+            return this.routing(fn.apply(new IndexRouting.Builder()).build());
+        }
+
+        /**
+         * API name: {@code election}
+         */
+        public final Builder election(NodeInfoSettingsClusterElection value) {
+            this.election = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code election}
+         */
+        public final Builder election(
+            Function<NodeInfoSettingsClusterElection.Builder, ObjectBuilder<NodeInfoSettingsClusterElection>> fn
+        ) {
+            return this.election(fn.apply(new NodeInfoSettingsClusterElection.Builder()).build());
+        }
+
+        /**
+         * API name: {@code initial_master_nodes}
+         */
+        @Deprecated
+        public final Builder initialMasterNodes(@Nullable List<String> value) {
+            this.initialMasterNodes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code initial_cluster_manager_nodes}
+         */
+        public final Builder initialClusterManagerNodes(@Nullable List<String> value) {
+            this.initialClusterManagerNodes = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeInfoSettingsCluster}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoSettingsCluster build() {
+            _checkSingleUse();
+
+            return new NodeInfoSettingsCluster(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeInfoSettingsCluster}
+     */
+    public static final JsonpDeserializer<NodeInfoSettingsCluster> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoSettingsCluster::setupNodeInfoSettingsClusterDeserializer
+    );
+
+    protected static void setupNodeInfoSettingsClusterDeserializer(ObjectDeserializer<NodeInfoSettingsCluster.Builder> op) {
+
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::routing, IndexRouting._DESERIALIZER, "routing");
+        op.add(Builder::election, NodeInfoSettingsClusterElection._DESERIALIZER, "election");
+        op.add(
+            Builder::initialMasterNodes,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
+            "initial_master_nodes"
+        );
+        op.add(
+            Builder::initialClusterManagerNodes,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
+            "initial_cluster_manager_nodes"
+        );
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsClusterElection.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsClusterElection.java
index f23e134b86..7901e47775 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsClusterElection.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsClusterElection.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,94 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoSettingsClusterElection
 
 @JsonpDeserializable
 public class NodeInfoSettingsClusterElection implements JsonpSerializable {
-	private final String strategy;
+    private final String strategy;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private NodeInfoSettingsClusterElection(Builder builder) {
+    private NodeInfoSettingsClusterElection(Builder builder) {
 
-		this.strategy = ApiTypeHelper.requireNonNull(builder.strategy, this, "strategy");
+        this.strategy = ApiTypeHelper.requireNonNull(builder.strategy, this, "strategy");
 
-	}
+    }
 
-	public static NodeInfoSettingsClusterElection of(
-			Function<Builder, ObjectBuilder<NodeInfoSettingsClusterElection>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static NodeInfoSettingsClusterElection of(Function<Builder, ObjectBuilder<NodeInfoSettingsClusterElection>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code strategy}
-	 */
-	public final String strategy() {
-		return this.strategy;
-	}
+    /**
+     * Required - API name: {@code strategy}
+     */
+    public final String strategy() {
+        return this.strategy;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("strategy");
-		generator.write(this.strategy);
+        generator.writeKey("strategy");
+        generator.write(this.strategy);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link NodeInfoSettingsClusterElection}.
-	 */
+    /**
+     * Builder for {@link NodeInfoSettingsClusterElection}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettingsClusterElection> {
-		private String strategy;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettingsClusterElection> {
+        private String strategy;
 
-		/**
-		 * Required - API name: {@code strategy}
-		 */
-		public final Builder strategy(String value) {
-			this.strategy = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code strategy}
+         */
+        public final Builder strategy(String value) {
+            this.strategy = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link NodeInfoSettingsClusterElection}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoSettingsClusterElection build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link NodeInfoSettingsClusterElection}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoSettingsClusterElection build() {
+            _checkSingleUse();
 
-			return new NodeInfoSettingsClusterElection(this);
-		}
-	}
+            return new NodeInfoSettingsClusterElection(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link NodeInfoSettingsClusterElection}
-	 */
-	public static final JsonpDeserializer<NodeInfoSettingsClusterElection> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoSettingsClusterElection::setupNodeInfoSettingsClusterElectionDeserializer);
+    /**
+     * Json deserializer for {@link NodeInfoSettingsClusterElection}
+     */
+    public static final JsonpDeserializer<NodeInfoSettingsClusterElection> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoSettingsClusterElection::setupNodeInfoSettingsClusterElectionDeserializer
+    );
 
-	protected static void setupNodeInfoSettingsClusterElectionDeserializer(
-			ObjectDeserializer<NodeInfoSettingsClusterElection.Builder> op) {
+    protected static void setupNodeInfoSettingsClusterElectionDeserializer(ObjectDeserializer<NodeInfoSettingsClusterElection.Builder> op) {
 
-		op.add(Builder::strategy, JsonpDeserializer.stringDeserializer(), "strategy");
+        op.add(Builder::strategy, JsonpDeserializer.stringDeserializer(), "strategy");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsHttp.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsHttp.java
index 48360e8488..df27325cba 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsHttp.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsHttp.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,189 +44,187 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: nodes.info.NodeInfoSettingsHttp
 
 @JsonpDeserializable
 public class NodeInfoSettingsHttp implements JsonpSerializable {
-	private final NodeInfoSettingsHttpType type;
+    private final NodeInfoSettingsHttpType type;
 
-	@Nullable
-	private final String typeDefault;
+    @Nullable
+    private final String typeDefault;
 
-	@Nullable
-	private final Boolean compression;
+    @Nullable
+    private final Boolean compression;
 
-	@Nullable
-	private final String port;
+    @Nullable
+    private final String port;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeInfoSettingsHttp(Builder builder) {
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeInfoSettingsHttp(Builder builder) {
 
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-		this.typeDefault = builder.typeDefault;
-		this.compression = builder.compression;
-		this.port = builder.port;
-
-	}
-
-	public static NodeInfoSettingsHttp of(Function<Builder, ObjectBuilder<NodeInfoSettingsHttp>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final NodeInfoSettingsHttpType type() {
-		return this.type;
-	}
-
-	/**
-	 * API name: {@code type.default}
-	 */
-	@Nullable
-	public final String typeDefault() {
-		return this.typeDefault;
-	}
-
-	/**
-	 * API name: {@code compression}
-	 */
-	@Nullable
-	public final Boolean compression() {
-		return this.compression;
-	}
-
-	/**
-	 * API name: {@code port}
-	 */
-	@Nullable
-	public final String port() {
-		return this.port;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("type");
-		this.type.serialize(generator, mapper);
-
-		if (this.typeDefault != null) {
-			generator.writeKey("type.default");
-			generator.write(this.typeDefault);
-
-		}
-		if (this.compression != null) {
-			generator.writeKey("compression");
-			generator.write(this.compression);
-
-		}
-		if (this.port != null) {
-			generator.writeKey("port");
-			generator.write(this.port);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeInfoSettingsHttp}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettingsHttp> {
-		private NodeInfoSettingsHttpType type;
-
-		@Nullable
-		private String typeDefault;
-
-		@Nullable
-		private Boolean compression;
-
-		@Nullable
-		private String port;
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(NodeInfoSettingsHttpType value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(
-				Function<NodeInfoSettingsHttpType.Builder, ObjectBuilder<NodeInfoSettingsHttpType>> fn) {
-			return this.type(fn.apply(new NodeInfoSettingsHttpType.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code type.default}
-		 */
-		public final Builder typeDefault(@Nullable String value) {
-			this.typeDefault = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code compression}
-		 */
-		public final Builder compression(@Nullable Boolean value) {
-			this.compression = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code port}
-		 */
-		public final Builder port(@Nullable String value) {
-			this.port = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeInfoSettingsHttp}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoSettingsHttp build() {
-			_checkSingleUse();
-
-			return new NodeInfoSettingsHttp(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeInfoSettingsHttp}
-	 */
-	public static final JsonpDeserializer<NodeInfoSettingsHttp> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoSettingsHttp::setupNodeInfoSettingsHttpDeserializer);
-
-	protected static void setupNodeInfoSettingsHttpDeserializer(ObjectDeserializer<NodeInfoSettingsHttp.Builder> op) {
-
-		op.add(Builder::type, NodeInfoSettingsHttpType._DESERIALIZER, "type");
-		op.add(Builder::typeDefault, JsonpDeserializer.stringDeserializer(), "type.default");
-		op.add(Builder::compression, JsonpDeserializer.booleanDeserializer(), "compression");
-		op.add(Builder::port, JsonpDeserializer.stringDeserializer(), "port");
-
-	}
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.typeDefault = builder.typeDefault;
+        this.compression = builder.compression;
+        this.port = builder.port;
+
+    }
+
+    public static NodeInfoSettingsHttp of(Function<Builder, ObjectBuilder<NodeInfoSettingsHttp>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    public final NodeInfoSettingsHttpType type() {
+        return this.type;
+    }
+
+    /**
+     * API name: {@code type.default}
+     */
+    @Nullable
+    public final String typeDefault() {
+        return this.typeDefault;
+    }
+
+    /**
+     * API name: {@code compression}
+     */
+    @Nullable
+    public final Boolean compression() {
+        return this.compression;
+    }
+
+    /**
+     * API name: {@code port}
+     */
+    @Nullable
+    public final String port() {
+        return this.port;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("type");
+        this.type.serialize(generator, mapper);
+
+        if (this.typeDefault != null) {
+            generator.writeKey("type.default");
+            generator.write(this.typeDefault);
+
+        }
+        if (this.compression != null) {
+            generator.writeKey("compression");
+            generator.write(this.compression);
+
+        }
+        if (this.port != null) {
+            generator.writeKey("port");
+            generator.write(this.port);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeInfoSettingsHttp}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettingsHttp> {
+        private NodeInfoSettingsHttpType type;
+
+        @Nullable
+        private String typeDefault;
+
+        @Nullable
+        private Boolean compression;
+
+        @Nullable
+        private String port;
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(NodeInfoSettingsHttpType value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(Function<NodeInfoSettingsHttpType.Builder, ObjectBuilder<NodeInfoSettingsHttpType>> fn) {
+            return this.type(fn.apply(new NodeInfoSettingsHttpType.Builder()).build());
+        }
+
+        /**
+         * API name: {@code type.default}
+         */
+        public final Builder typeDefault(@Nullable String value) {
+            this.typeDefault = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code compression}
+         */
+        public final Builder compression(@Nullable Boolean value) {
+            this.compression = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code port}
+         */
+        public final Builder port(@Nullable String value) {
+            this.port = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeInfoSettingsHttp}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoSettingsHttp build() {
+            _checkSingleUse();
+
+            return new NodeInfoSettingsHttp(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeInfoSettingsHttp}
+     */
+    public static final JsonpDeserializer<NodeInfoSettingsHttp> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoSettingsHttp::setupNodeInfoSettingsHttpDeserializer
+    );
+
+    protected static void setupNodeInfoSettingsHttpDeserializer(ObjectDeserializer<NodeInfoSettingsHttp.Builder> op) {
+
+        op.add(Builder::type, NodeInfoSettingsHttpType._DESERIALIZER, "type");
+        op.add(Builder::typeDefault, JsonpDeserializer.stringDeserializer(), "type.default");
+        op.add(Builder::compression, JsonpDeserializer.booleanDeserializer(), "compression");
+        op.add(Builder::port, JsonpDeserializer.stringDeserializer(), "port");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsHttpType.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsHttpType.java
index 6bf1ba6fbf..10df5c4719 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsHttpType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsHttpType.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,95 +43,94 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoSettingsHttpType
 
 @JsonpDeserializable
 public class NodeInfoSettingsHttpType implements JsonpSerializable {
-	private final String default_;
+    private final String default_;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private NodeInfoSettingsHttpType(Builder builder) {
+    private NodeInfoSettingsHttpType(Builder builder) {
 
-		this.default_ = ApiTypeHelper.requireNonNull(builder.default_, this, "default_");
+        this.default_ = ApiTypeHelper.requireNonNull(builder.default_, this, "default_");
 
-	}
+    }
 
-	public static NodeInfoSettingsHttpType of(Function<Builder, ObjectBuilder<NodeInfoSettingsHttpType>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static NodeInfoSettingsHttpType of(Function<Builder, ObjectBuilder<NodeInfoSettingsHttpType>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code default}
-	 */
-	public final String default_() {
-		return this.default_;
-	}
+    /**
+     * Required - API name: {@code default}
+     */
+    public final String default_() {
+        return this.default_;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("default");
-		generator.write(this.default_);
+        generator.writeKey("default");
+        generator.write(this.default_);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link NodeInfoSettingsHttpType}.
-	 */
+    /**
+     * Builder for {@link NodeInfoSettingsHttpType}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettingsHttpType> {
-		private String default_;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettingsHttpType> {
+        private String default_;
 
-		/**
-		 * Required - API name: {@code default}
-		 */
-		public final Builder default_(String value) {
-			this.default_ = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code default}
+         */
+        public final Builder default_(String value) {
+            this.default_ = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link NodeInfoSettingsHttpType}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoSettingsHttpType build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link NodeInfoSettingsHttpType}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoSettingsHttpType build() {
+            _checkSingleUse();
 
-			return new NodeInfoSettingsHttpType(this);
-		}
-	}
+            return new NodeInfoSettingsHttpType(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link NodeInfoSettingsHttpType}
-	 */
-	public static final JsonpDeserializer<NodeInfoSettingsHttpType> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoSettingsHttpType::setupNodeInfoSettingsHttpTypeDeserializer);
+    /**
+     * Json deserializer for {@link NodeInfoSettingsHttpType}
+     */
+    public static final JsonpDeserializer<NodeInfoSettingsHttpType> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoSettingsHttpType::setupNodeInfoSettingsHttpTypeDeserializer
+    );
 
-	protected static void setupNodeInfoSettingsHttpTypeDeserializer(
-			ObjectDeserializer<NodeInfoSettingsHttpType.Builder> op) {
+    protected static void setupNodeInfoSettingsHttpTypeDeserializer(ObjectDeserializer<NodeInfoSettingsHttpType.Builder> op) {
 
-		op.add(Builder::default_, JsonpDeserializer.stringDeserializer(), "default");
+        op.add(Builder::default_, JsonpDeserializer.stringDeserializer(), "default");
 
-		op.shortcutProperty("default");
+        op.shortcutProperty("default");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsIngest.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsIngest.java
index 43a84c6f57..f0993da030 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsIngest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsIngest.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -40,1261 +43,1257 @@
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: nodes.info.NodeInfoSettingsIngest
 
 @JsonpDeserializable
 public class NodeInfoSettingsIngest implements JsonpSerializable {
-	@Nullable
-	private final NodeInfoIngestInfo attachment;
+    @Nullable
+    private final NodeInfoIngestInfo attachment;
 
-	@Nullable
-	private final NodeInfoIngestInfo append;
+    @Nullable
+    private final NodeInfoIngestInfo append;
 
-	@Nullable
-	private final NodeInfoIngestInfo csv;
+    @Nullable
+    private final NodeInfoIngestInfo csv;
 
-	@Nullable
-	private final NodeInfoIngestInfo convert;
+    @Nullable
+    private final NodeInfoIngestInfo convert;
 
-	@Nullable
-	private final NodeInfoIngestInfo date;
+    @Nullable
+    private final NodeInfoIngestInfo date;
 
-	@Nullable
-	private final NodeInfoIngestInfo dateIndexName;
+    @Nullable
+    private final NodeInfoIngestInfo dateIndexName;
 
-	@Nullable
-	private final NodeInfoIngestInfo dotExpander;
+    @Nullable
+    private final NodeInfoIngestInfo dotExpander;
 
-	@Nullable
-	private final NodeInfoIngestInfo fail;
+    @Nullable
+    private final NodeInfoIngestInfo fail;
 
-	@Nullable
-	private final NodeInfoIngestInfo foreach;
+    @Nullable
+    private final NodeInfoIngestInfo foreach;
 
-	@Nullable
-	private final NodeInfoIngestInfo json;
+    @Nullable
+    private final NodeInfoIngestInfo json;
 
-	@Nullable
-	private final NodeInfoIngestInfo userAgent;
+    @Nullable
+    private final NodeInfoIngestInfo userAgent;
 
-	@Nullable
-	private final NodeInfoIngestInfo kv;
+    @Nullable
+    private final NodeInfoIngestInfo kv;
 
-	@Nullable
-	private final NodeInfoIngestInfo geoip;
+    @Nullable
+    private final NodeInfoIngestInfo geoip;
 
-	@Nullable
-	private final NodeInfoIngestInfo grok;
+    @Nullable
+    private final NodeInfoIngestInfo grok;
 
-	@Nullable
-	private final NodeInfoIngestInfo gsub;
+    @Nullable
+    private final NodeInfoIngestInfo gsub;
 
-	@Nullable
-	private final NodeInfoIngestInfo join;
+    @Nullable
+    private final NodeInfoIngestInfo join;
 
-	@Nullable
-	private final NodeInfoIngestInfo lowercase;
+    @Nullable
+    private final NodeInfoIngestInfo lowercase;
 
-	@Nullable
-	private final NodeInfoIngestInfo remove;
+    @Nullable
+    private final NodeInfoIngestInfo remove;
 
-	@Nullable
-	private final NodeInfoIngestInfo rename;
+    @Nullable
+    private final NodeInfoIngestInfo rename;
 
-	@Nullable
-	private final NodeInfoIngestInfo script;
+    @Nullable
+    private final NodeInfoIngestInfo script;
 
-	@Nullable
-	private final NodeInfoIngestInfo set;
+    @Nullable
+    private final NodeInfoIngestInfo set;
 
-	@Nullable
-	private final NodeInfoIngestInfo sort;
-
-	@Nullable
-	private final NodeInfoIngestInfo split;
-
-	@Nullable
-	private final NodeInfoIngestInfo trim;
-
-	@Nullable
-	private final NodeInfoIngestInfo uppercase;
-
-	@Nullable
-	private final NodeInfoIngestInfo urldecode;
-
-	@Nullable
-	private final NodeInfoIngestInfo bytes;
-
-	@Nullable
-	private final NodeInfoIngestInfo dissect;
-
-	@Nullable
-	private final NodeInfoIngestInfo setSecurityUser;
-
-	@Nullable
-	private final NodeInfoIngestInfo pipeline;
-
-	@Nullable
-	private final NodeInfoIngestInfo drop;
-
-	@Nullable
-	private final NodeInfoIngestInfo circle;
-
-	@Nullable
-	private final NodeInfoIngestInfo inference;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeInfoSettingsIngest(Builder builder) {
-
-		this.attachment = builder.attachment;
-		this.append = builder.append;
-		this.csv = builder.csv;
-		this.convert = builder.convert;
-		this.date = builder.date;
-		this.dateIndexName = builder.dateIndexName;
-		this.dotExpander = builder.dotExpander;
-		this.fail = builder.fail;
-		this.foreach = builder.foreach;
-		this.json = builder.json;
-		this.userAgent = builder.userAgent;
-		this.kv = builder.kv;
-		this.geoip = builder.geoip;
-		this.grok = builder.grok;
-		this.gsub = builder.gsub;
-		this.join = builder.join;
-		this.lowercase = builder.lowercase;
-		this.remove = builder.remove;
-		this.rename = builder.rename;
-		this.script = builder.script;
-		this.set = builder.set;
-		this.sort = builder.sort;
-		this.split = builder.split;
-		this.trim = builder.trim;
-		this.uppercase = builder.uppercase;
-		this.urldecode = builder.urldecode;
-		this.bytes = builder.bytes;
-		this.dissect = builder.dissect;
-		this.setSecurityUser = builder.setSecurityUser;
-		this.pipeline = builder.pipeline;
-		this.drop = builder.drop;
-		this.circle = builder.circle;
-		this.inference = builder.inference;
-
-	}
-
-	public static NodeInfoSettingsIngest of(Function<Builder, ObjectBuilder<NodeInfoSettingsIngest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code attachment}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo attachment() {
-		return this.attachment;
-	}
-
-	/**
-	 * API name: {@code append}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo append() {
-		return this.append;
-	}
-
-	/**
-	 * API name: {@code csv}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo csv() {
-		return this.csv;
-	}
-
-	/**
-	 * API name: {@code convert}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo convert() {
-		return this.convert;
-	}
-
-	/**
-	 * API name: {@code date}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo date() {
-		return this.date;
-	}
-
-	/**
-	 * API name: {@code date_index_name}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo dateIndexName() {
-		return this.dateIndexName;
-	}
-
-	/**
-	 * API name: {@code dot_expander}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo dotExpander() {
-		return this.dotExpander;
-	}
-
-	/**
-	 * API name: {@code fail}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo fail() {
-		return this.fail;
-	}
-
-	/**
-	 * API name: {@code foreach}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo foreach() {
-		return this.foreach;
-	}
-
-	/**
-	 * API name: {@code json}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo json() {
-		return this.json;
-	}
-
-	/**
-	 * API name: {@code user_agent}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo userAgent() {
-		return this.userAgent;
-	}
-
-	/**
-	 * API name: {@code kv}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo kv() {
-		return this.kv;
-	}
-
-	/**
-	 * API name: {@code geoip}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo geoip() {
-		return this.geoip;
-	}
-
-	/**
-	 * API name: {@code grok}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo grok() {
-		return this.grok;
-	}
-
-	/**
-	 * API name: {@code gsub}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo gsub() {
-		return this.gsub;
-	}
-
-	/**
-	 * API name: {@code join}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo join() {
-		return this.join;
-	}
-
-	/**
-	 * API name: {@code lowercase}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo lowercase() {
-		return this.lowercase;
-	}
-
-	/**
-	 * API name: {@code remove}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo remove() {
-		return this.remove;
-	}
-
-	/**
-	 * API name: {@code rename}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo rename() {
-		return this.rename;
-	}
-
-	/**
-	 * API name: {@code script}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo script() {
-		return this.script;
-	}
-
-	/**
-	 * API name: {@code set}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo set() {
-		return this.set;
-	}
-
-	/**
-	 * API name: {@code sort}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo sort() {
-		return this.sort;
-	}
-
-	/**
-	 * API name: {@code split}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo split() {
-		return this.split;
-	}
-
-	/**
-	 * API name: {@code trim}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo trim() {
-		return this.trim;
-	}
-
-	/**
-	 * API name: {@code uppercase}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo uppercase() {
-		return this.uppercase;
-	}
-
-	/**
-	 * API name: {@code urldecode}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo urldecode() {
-		return this.urldecode;
-	}
-
-	/**
-	 * API name: {@code bytes}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo bytes() {
-		return this.bytes;
-	}
-
-	/**
-	 * API name: {@code dissect}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo dissect() {
-		return this.dissect;
-	}
-
-	/**
-	 * API name: {@code set_security_user}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo setSecurityUser() {
-		return this.setSecurityUser;
-	}
-
-	/**
-	 * API name: {@code pipeline}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo pipeline() {
-		return this.pipeline;
-	}
-
-	/**
-	 * API name: {@code drop}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo drop() {
-		return this.drop;
-	}
-
-	/**
-	 * API name: {@code circle}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo circle() {
-		return this.circle;
-	}
-
-	/**
-	 * API name: {@code inference}
-	 */
-	@Nullable
-	public final NodeInfoIngestInfo inference() {
-		return this.inference;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.attachment != null) {
-			generator.writeKey("attachment");
-			this.attachment.serialize(generator, mapper);
-
-		}
-		if (this.append != null) {
-			generator.writeKey("append");
-			this.append.serialize(generator, mapper);
-
-		}
-		if (this.csv != null) {
-			generator.writeKey("csv");
-			this.csv.serialize(generator, mapper);
-
-		}
-		if (this.convert != null) {
-			generator.writeKey("convert");
-			this.convert.serialize(generator, mapper);
-
-		}
-		if (this.date != null) {
-			generator.writeKey("date");
-			this.date.serialize(generator, mapper);
-
-		}
-		if (this.dateIndexName != null) {
-			generator.writeKey("date_index_name");
-			this.dateIndexName.serialize(generator, mapper);
-
-		}
-		if (this.dotExpander != null) {
-			generator.writeKey("dot_expander");
-			this.dotExpander.serialize(generator, mapper);
-
-		}
-		if (this.fail != null) {
-			generator.writeKey("fail");
-			this.fail.serialize(generator, mapper);
-
-		}
-		if (this.foreach != null) {
-			generator.writeKey("foreach");
-			this.foreach.serialize(generator, mapper);
-
-		}
-		if (this.json != null) {
-			generator.writeKey("json");
-			this.json.serialize(generator, mapper);
-
-		}
-		if (this.userAgent != null) {
-			generator.writeKey("user_agent");
-			this.userAgent.serialize(generator, mapper);
-
-		}
-		if (this.kv != null) {
-			generator.writeKey("kv");
-			this.kv.serialize(generator, mapper);
-
-		}
-		if (this.geoip != null) {
-			generator.writeKey("geoip");
-			this.geoip.serialize(generator, mapper);
-
-		}
-		if (this.grok != null) {
-			generator.writeKey("grok");
-			this.grok.serialize(generator, mapper);
-
-		}
-		if (this.gsub != null) {
-			generator.writeKey("gsub");
-			this.gsub.serialize(generator, mapper);
-
-		}
-		if (this.join != null) {
-			generator.writeKey("join");
-			this.join.serialize(generator, mapper);
-
-		}
-		if (this.lowercase != null) {
-			generator.writeKey("lowercase");
-			this.lowercase.serialize(generator, mapper);
-
-		}
-		if (this.remove != null) {
-			generator.writeKey("remove");
-			this.remove.serialize(generator, mapper);
-
-		}
-		if (this.rename != null) {
-			generator.writeKey("rename");
-			this.rename.serialize(generator, mapper);
-
-		}
-		if (this.script != null) {
-			generator.writeKey("script");
-			this.script.serialize(generator, mapper);
-
-		}
-		if (this.set != null) {
-			generator.writeKey("set");
-			this.set.serialize(generator, mapper);
-
-		}
-		if (this.sort != null) {
-			generator.writeKey("sort");
-			this.sort.serialize(generator, mapper);
-
-		}
-		if (this.split != null) {
-			generator.writeKey("split");
-			this.split.serialize(generator, mapper);
-
-		}
-		if (this.trim != null) {
-			generator.writeKey("trim");
-			this.trim.serialize(generator, mapper);
-
-		}
-		if (this.uppercase != null) {
-			generator.writeKey("uppercase");
-			this.uppercase.serialize(generator, mapper);
-
-		}
-		if (this.urldecode != null) {
-			generator.writeKey("urldecode");
-			this.urldecode.serialize(generator, mapper);
+    @Nullable
+    private final NodeInfoIngestInfo sort;
+
+    @Nullable
+    private final NodeInfoIngestInfo split;
+
+    @Nullable
+    private final NodeInfoIngestInfo trim;
+
+    @Nullable
+    private final NodeInfoIngestInfo uppercase;
+
+    @Nullable
+    private final NodeInfoIngestInfo urldecode;
+
+    @Nullable
+    private final NodeInfoIngestInfo bytes;
+
+    @Nullable
+    private final NodeInfoIngestInfo dissect;
+
+    @Nullable
+    private final NodeInfoIngestInfo setSecurityUser;
+
+    @Nullable
+    private final NodeInfoIngestInfo pipeline;
+
+    @Nullable
+    private final NodeInfoIngestInfo drop;
+
+    @Nullable
+    private final NodeInfoIngestInfo circle;
+
+    @Nullable
+    private final NodeInfoIngestInfo inference;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeInfoSettingsIngest(Builder builder) {
+
+        this.attachment = builder.attachment;
+        this.append = builder.append;
+        this.csv = builder.csv;
+        this.convert = builder.convert;
+        this.date = builder.date;
+        this.dateIndexName = builder.dateIndexName;
+        this.dotExpander = builder.dotExpander;
+        this.fail = builder.fail;
+        this.foreach = builder.foreach;
+        this.json = builder.json;
+        this.userAgent = builder.userAgent;
+        this.kv = builder.kv;
+        this.geoip = builder.geoip;
+        this.grok = builder.grok;
+        this.gsub = builder.gsub;
+        this.join = builder.join;
+        this.lowercase = builder.lowercase;
+        this.remove = builder.remove;
+        this.rename = builder.rename;
+        this.script = builder.script;
+        this.set = builder.set;
+        this.sort = builder.sort;
+        this.split = builder.split;
+        this.trim = builder.trim;
+        this.uppercase = builder.uppercase;
+        this.urldecode = builder.urldecode;
+        this.bytes = builder.bytes;
+        this.dissect = builder.dissect;
+        this.setSecurityUser = builder.setSecurityUser;
+        this.pipeline = builder.pipeline;
+        this.drop = builder.drop;
+        this.circle = builder.circle;
+        this.inference = builder.inference;
+
+    }
+
+    public static NodeInfoSettingsIngest of(Function<Builder, ObjectBuilder<NodeInfoSettingsIngest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code attachment}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo attachment() {
+        return this.attachment;
+    }
+
+    /**
+     * API name: {@code append}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo append() {
+        return this.append;
+    }
+
+    /**
+     * API name: {@code csv}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo csv() {
+        return this.csv;
+    }
+
+    /**
+     * API name: {@code convert}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo convert() {
+        return this.convert;
+    }
+
+    /**
+     * API name: {@code date}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo date() {
+        return this.date;
+    }
+
+    /**
+     * API name: {@code date_index_name}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo dateIndexName() {
+        return this.dateIndexName;
+    }
+
+    /**
+     * API name: {@code dot_expander}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo dotExpander() {
+        return this.dotExpander;
+    }
+
+    /**
+     * API name: {@code fail}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo fail() {
+        return this.fail;
+    }
+
+    /**
+     * API name: {@code foreach}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo foreach() {
+        return this.foreach;
+    }
+
+    /**
+     * API name: {@code json}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo json() {
+        return this.json;
+    }
+
+    /**
+     * API name: {@code user_agent}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo userAgent() {
+        return this.userAgent;
+    }
+
+    /**
+     * API name: {@code kv}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo kv() {
+        return this.kv;
+    }
+
+    /**
+     * API name: {@code geoip}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo geoip() {
+        return this.geoip;
+    }
+
+    /**
+     * API name: {@code grok}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo grok() {
+        return this.grok;
+    }
+
+    /**
+     * API name: {@code gsub}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo gsub() {
+        return this.gsub;
+    }
+
+    /**
+     * API name: {@code join}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo join() {
+        return this.join;
+    }
+
+    /**
+     * API name: {@code lowercase}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo lowercase() {
+        return this.lowercase;
+    }
+
+    /**
+     * API name: {@code remove}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo remove() {
+        return this.remove;
+    }
+
+    /**
+     * API name: {@code rename}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo rename() {
+        return this.rename;
+    }
+
+    /**
+     * API name: {@code script}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo script() {
+        return this.script;
+    }
+
+    /**
+     * API name: {@code set}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo set() {
+        return this.set;
+    }
+
+    /**
+     * API name: {@code sort}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo sort() {
+        return this.sort;
+    }
+
+    /**
+     * API name: {@code split}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo split() {
+        return this.split;
+    }
+
+    /**
+     * API name: {@code trim}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo trim() {
+        return this.trim;
+    }
+
+    /**
+     * API name: {@code uppercase}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo uppercase() {
+        return this.uppercase;
+    }
+
+    /**
+     * API name: {@code urldecode}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo urldecode() {
+        return this.urldecode;
+    }
+
+    /**
+     * API name: {@code bytes}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo bytes() {
+        return this.bytes;
+    }
+
+    /**
+     * API name: {@code dissect}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo dissect() {
+        return this.dissect;
+    }
+
+    /**
+     * API name: {@code set_security_user}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo setSecurityUser() {
+        return this.setSecurityUser;
+    }
+
+    /**
+     * API name: {@code pipeline}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo pipeline() {
+        return this.pipeline;
+    }
+
+    /**
+     * API name: {@code drop}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo drop() {
+        return this.drop;
+    }
+
+    /**
+     * API name: {@code circle}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo circle() {
+        return this.circle;
+    }
+
+    /**
+     * API name: {@code inference}
+     */
+    @Nullable
+    public final NodeInfoIngestInfo inference() {
+        return this.inference;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.attachment != null) {
+            generator.writeKey("attachment");
+            this.attachment.serialize(generator, mapper);
+
+        }
+        if (this.append != null) {
+            generator.writeKey("append");
+            this.append.serialize(generator, mapper);
+
+        }
+        if (this.csv != null) {
+            generator.writeKey("csv");
+            this.csv.serialize(generator, mapper);
+
+        }
+        if (this.convert != null) {
+            generator.writeKey("convert");
+            this.convert.serialize(generator, mapper);
+
+        }
+        if (this.date != null) {
+            generator.writeKey("date");
+            this.date.serialize(generator, mapper);
+
+        }
+        if (this.dateIndexName != null) {
+            generator.writeKey("date_index_name");
+            this.dateIndexName.serialize(generator, mapper);
+
+        }
+        if (this.dotExpander != null) {
+            generator.writeKey("dot_expander");
+            this.dotExpander.serialize(generator, mapper);
+
+        }
+        if (this.fail != null) {
+            generator.writeKey("fail");
+            this.fail.serialize(generator, mapper);
+
+        }
+        if (this.foreach != null) {
+            generator.writeKey("foreach");
+            this.foreach.serialize(generator, mapper);
+
+        }
+        if (this.json != null) {
+            generator.writeKey("json");
+            this.json.serialize(generator, mapper);
+
+        }
+        if (this.userAgent != null) {
+            generator.writeKey("user_agent");
+            this.userAgent.serialize(generator, mapper);
+
+        }
+        if (this.kv != null) {
+            generator.writeKey("kv");
+            this.kv.serialize(generator, mapper);
+
+        }
+        if (this.geoip != null) {
+            generator.writeKey("geoip");
+            this.geoip.serialize(generator, mapper);
+
+        }
+        if (this.grok != null) {
+            generator.writeKey("grok");
+            this.grok.serialize(generator, mapper);
+
+        }
+        if (this.gsub != null) {
+            generator.writeKey("gsub");
+            this.gsub.serialize(generator, mapper);
+
+        }
+        if (this.join != null) {
+            generator.writeKey("join");
+            this.join.serialize(generator, mapper);
+
+        }
+        if (this.lowercase != null) {
+            generator.writeKey("lowercase");
+            this.lowercase.serialize(generator, mapper);
+
+        }
+        if (this.remove != null) {
+            generator.writeKey("remove");
+            this.remove.serialize(generator, mapper);
+
+        }
+        if (this.rename != null) {
+            generator.writeKey("rename");
+            this.rename.serialize(generator, mapper);
+
+        }
+        if (this.script != null) {
+            generator.writeKey("script");
+            this.script.serialize(generator, mapper);
+
+        }
+        if (this.set != null) {
+            generator.writeKey("set");
+            this.set.serialize(generator, mapper);
+
+        }
+        if (this.sort != null) {
+            generator.writeKey("sort");
+            this.sort.serialize(generator, mapper);
+
+        }
+        if (this.split != null) {
+            generator.writeKey("split");
+            this.split.serialize(generator, mapper);
+
+        }
+        if (this.trim != null) {
+            generator.writeKey("trim");
+            this.trim.serialize(generator, mapper);
+
+        }
+        if (this.uppercase != null) {
+            generator.writeKey("uppercase");
+            this.uppercase.serialize(generator, mapper);
+
+        }
+        if (this.urldecode != null) {
+            generator.writeKey("urldecode");
+            this.urldecode.serialize(generator, mapper);
 
-		}
-		if (this.bytes != null) {
-			generator.writeKey("bytes");
-			this.bytes.serialize(generator, mapper);
+        }
+        if (this.bytes != null) {
+            generator.writeKey("bytes");
+            this.bytes.serialize(generator, mapper);
 
-		}
-		if (this.dissect != null) {
-			generator.writeKey("dissect");
-			this.dissect.serialize(generator, mapper);
+        }
+        if (this.dissect != null) {
+            generator.writeKey("dissect");
+            this.dissect.serialize(generator, mapper);
 
-		}
-		if (this.setSecurityUser != null) {
-			generator.writeKey("set_security_user");
-			this.setSecurityUser.serialize(generator, mapper);
+        }
+        if (this.setSecurityUser != null) {
+            generator.writeKey("set_security_user");
+            this.setSecurityUser.serialize(generator, mapper);
 
-		}
-		if (this.pipeline != null) {
-			generator.writeKey("pipeline");
-			this.pipeline.serialize(generator, mapper);
+        }
+        if (this.pipeline != null) {
+            generator.writeKey("pipeline");
+            this.pipeline.serialize(generator, mapper);
 
-		}
-		if (this.drop != null) {
-			generator.writeKey("drop");
-			this.drop.serialize(generator, mapper);
+        }
+        if (this.drop != null) {
+            generator.writeKey("drop");
+            this.drop.serialize(generator, mapper);
 
-		}
-		if (this.circle != null) {
-			generator.writeKey("circle");
-			this.circle.serialize(generator, mapper);
+        }
+        if (this.circle != null) {
+            generator.writeKey("circle");
+            this.circle.serialize(generator, mapper);
 
-		}
-		if (this.inference != null) {
-			generator.writeKey("inference");
-			this.inference.serialize(generator, mapper);
+        }
+        if (this.inference != null) {
+            generator.writeKey("inference");
+            this.inference.serialize(generator, mapper);
 
-		}
+        }
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link NodeInfoSettingsIngest}.
-	 */
+    /**
+     * Builder for {@link NodeInfoSettingsIngest}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettingsIngest> {
-		@Nullable
-		private NodeInfoIngestInfo attachment;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettingsIngest> {
+        @Nullable
+        private NodeInfoIngestInfo attachment;
 
-		@Nullable
-		private NodeInfoIngestInfo append;
+        @Nullable
+        private NodeInfoIngestInfo append;
 
-		@Nullable
-		private NodeInfoIngestInfo csv;
+        @Nullable
+        private NodeInfoIngestInfo csv;
 
-		@Nullable
-		private NodeInfoIngestInfo convert;
+        @Nullable
+        private NodeInfoIngestInfo convert;
 
-		@Nullable
-		private NodeInfoIngestInfo date;
+        @Nullable
+        private NodeInfoIngestInfo date;
 
-		@Nullable
-		private NodeInfoIngestInfo dateIndexName;
+        @Nullable
+        private NodeInfoIngestInfo dateIndexName;
 
-		@Nullable
-		private NodeInfoIngestInfo dotExpander;
+        @Nullable
+        private NodeInfoIngestInfo dotExpander;
 
-		@Nullable
-		private NodeInfoIngestInfo fail;
+        @Nullable
+        private NodeInfoIngestInfo fail;
 
-		@Nullable
-		private NodeInfoIngestInfo foreach;
+        @Nullable
+        private NodeInfoIngestInfo foreach;
 
-		@Nullable
-		private NodeInfoIngestInfo json;
+        @Nullable
+        private NodeInfoIngestInfo json;
 
-		@Nullable
-		private NodeInfoIngestInfo userAgent;
+        @Nullable
+        private NodeInfoIngestInfo userAgent;
 
-		@Nullable
-		private NodeInfoIngestInfo kv;
+        @Nullable
+        private NodeInfoIngestInfo kv;
 
-		@Nullable
-		private NodeInfoIngestInfo geoip;
+        @Nullable
+        private NodeInfoIngestInfo geoip;
 
-		@Nullable
-		private NodeInfoIngestInfo grok;
+        @Nullable
+        private NodeInfoIngestInfo grok;
 
-		@Nullable
-		private NodeInfoIngestInfo gsub;
+        @Nullable
+        private NodeInfoIngestInfo gsub;
 
-		@Nullable
-		private NodeInfoIngestInfo join;
+        @Nullable
+        private NodeInfoIngestInfo join;
 
-		@Nullable
-		private NodeInfoIngestInfo lowercase;
+        @Nullable
+        private NodeInfoIngestInfo lowercase;
 
-		@Nullable
-		private NodeInfoIngestInfo remove;
+        @Nullable
+        private NodeInfoIngestInfo remove;
 
-		@Nullable
-		private NodeInfoIngestInfo rename;
+        @Nullable
+        private NodeInfoIngestInfo rename;
 
-		@Nullable
-		private NodeInfoIngestInfo script;
+        @Nullable
+        private NodeInfoIngestInfo script;
 
-		@Nullable
-		private NodeInfoIngestInfo set;
+        @Nullable
+        private NodeInfoIngestInfo set;
 
-		@Nullable
-		private NodeInfoIngestInfo sort;
+        @Nullable
+        private NodeInfoIngestInfo sort;
 
-		@Nullable
-		private NodeInfoIngestInfo split;
+        @Nullable
+        private NodeInfoIngestInfo split;
 
-		@Nullable
-		private NodeInfoIngestInfo trim;
+        @Nullable
+        private NodeInfoIngestInfo trim;
 
-		@Nullable
-		private NodeInfoIngestInfo uppercase;
+        @Nullable
+        private NodeInfoIngestInfo uppercase;
 
-		@Nullable
-		private NodeInfoIngestInfo urldecode;
+        @Nullable
+        private NodeInfoIngestInfo urldecode;
 
-		@Nullable
-		private NodeInfoIngestInfo bytes;
-
-		@Nullable
-		private NodeInfoIngestInfo dissect;
+        @Nullable
+        private NodeInfoIngestInfo bytes;
+
+        @Nullable
+        private NodeInfoIngestInfo dissect;
 
-		@Nullable
-		private NodeInfoIngestInfo setSecurityUser;
-
-		@Nullable
-		private NodeInfoIngestInfo pipeline;
-
-		@Nullable
-		private NodeInfoIngestInfo drop;
-
-		@Nullable
-		private NodeInfoIngestInfo circle;
-
-		@Nullable
-		private NodeInfoIngestInfo inference;
-
-		/**
-		 * API name: {@code attachment}
-		 */
-		public final Builder attachment(@Nullable NodeInfoIngestInfo value) {
-			this.attachment = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code attachment}
-		 */
-		public final Builder attachment(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.attachment(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code append}
-		 */
-		public final Builder append(@Nullable NodeInfoIngestInfo value) {
-			this.append = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code append}
-		 */
-		public final Builder append(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.append(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code csv}
-		 */
-		public final Builder csv(@Nullable NodeInfoIngestInfo value) {
-			this.csv = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code csv}
-		 */
-		public final Builder csv(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.csv(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code convert}
-		 */
-		public final Builder convert(@Nullable NodeInfoIngestInfo value) {
-			this.convert = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code convert}
-		 */
-		public final Builder convert(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.convert(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code date}
-		 */
-		public final Builder date(@Nullable NodeInfoIngestInfo value) {
-			this.date = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code date}
-		 */
-		public final Builder date(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.date(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code date_index_name}
-		 */
-		public final Builder dateIndexName(@Nullable NodeInfoIngestInfo value) {
-			this.dateIndexName = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code date_index_name}
-		 */
-		public final Builder dateIndexName(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.dateIndexName(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code dot_expander}
-		 */
-		public final Builder dotExpander(@Nullable NodeInfoIngestInfo value) {
-			this.dotExpander = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code dot_expander}
-		 */
-		public final Builder dotExpander(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.dotExpander(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code fail}
-		 */
-		public final Builder fail(@Nullable NodeInfoIngestInfo value) {
-			this.fail = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code fail}
-		 */
-		public final Builder fail(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.fail(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code foreach}
-		 */
-		public final Builder foreach(@Nullable NodeInfoIngestInfo value) {
-			this.foreach = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code foreach}
-		 */
-		public final Builder foreach(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.foreach(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code json}
-		 */
-		public final Builder json(@Nullable NodeInfoIngestInfo value) {
-			this.json = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code json}
-		 */
-		public final Builder json(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.json(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code user_agent}
-		 */
-		public final Builder userAgent(@Nullable NodeInfoIngestInfo value) {
-			this.userAgent = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code user_agent}
-		 */
-		public final Builder userAgent(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.userAgent(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code kv}
-		 */
-		public final Builder kv(@Nullable NodeInfoIngestInfo value) {
-			this.kv = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code kv}
-		 */
-		public final Builder kv(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.kv(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code geoip}
-		 */
-		public final Builder geoip(@Nullable NodeInfoIngestInfo value) {
-			this.geoip = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code geoip}
-		 */
-		public final Builder geoip(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.geoip(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code grok}
-		 */
-		public final Builder grok(@Nullable NodeInfoIngestInfo value) {
-			this.grok = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code grok}
-		 */
-		public final Builder grok(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.grok(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code gsub}
-		 */
-		public final Builder gsub(@Nullable NodeInfoIngestInfo value) {
-			this.gsub = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code gsub}
-		 */
-		public final Builder gsub(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.gsub(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code join}
-		 */
-		public final Builder join(@Nullable NodeInfoIngestInfo value) {
-			this.join = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code join}
-		 */
-		public final Builder join(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.join(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code lowercase}
-		 */
-		public final Builder lowercase(@Nullable NodeInfoIngestInfo value) {
-			this.lowercase = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code lowercase}
-		 */
-		public final Builder lowercase(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.lowercase(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code remove}
-		 */
-		public final Builder remove(@Nullable NodeInfoIngestInfo value) {
-			this.remove = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code remove}
-		 */
-		public final Builder remove(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.remove(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code rename}
-		 */
-		public final Builder rename(@Nullable NodeInfoIngestInfo value) {
-			this.rename = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code rename}
-		 */
-		public final Builder rename(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.rename(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(@Nullable NodeInfoIngestInfo value) {
-			this.script = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code script}
-		 */
-		public final Builder script(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.script(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code set}
-		 */
-		public final Builder set(@Nullable NodeInfoIngestInfo value) {
-			this.set = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code set}
-		 */
-		public final Builder set(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.set(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code sort}
-		 */
-		public final Builder sort(@Nullable NodeInfoIngestInfo value) {
-			this.sort = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code sort}
-		 */
-		public final Builder sort(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.sort(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code split}
-		 */
-		public final Builder split(@Nullable NodeInfoIngestInfo value) {
-			this.split = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code split}
-		 */
-		public final Builder split(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.split(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code trim}
-		 */
-		public final Builder trim(@Nullable NodeInfoIngestInfo value) {
-			this.trim = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code trim}
-		 */
-		public final Builder trim(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.trim(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code uppercase}
-		 */
-		public final Builder uppercase(@Nullable NodeInfoIngestInfo value) {
-			this.uppercase = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code uppercase}
-		 */
-		public final Builder uppercase(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.uppercase(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code urldecode}
-		 */
-		public final Builder urldecode(@Nullable NodeInfoIngestInfo value) {
-			this.urldecode = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code urldecode}
-		 */
-		public final Builder urldecode(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.urldecode(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code bytes}
-		 */
-		public final Builder bytes(@Nullable NodeInfoIngestInfo value) {
-			this.bytes = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code bytes}
-		 */
-		public final Builder bytes(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.bytes(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code dissect}
-		 */
-		public final Builder dissect(@Nullable NodeInfoIngestInfo value) {
-			this.dissect = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code dissect}
-		 */
-		public final Builder dissect(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.dissect(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code set_security_user}
-		 */
-		public final Builder setSecurityUser(@Nullable NodeInfoIngestInfo value) {
-			this.setSecurityUser = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code set_security_user}
-		 */
-		public final Builder setSecurityUser(
-				Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.setSecurityUser(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code pipeline}
-		 */
-		public final Builder pipeline(@Nullable NodeInfoIngestInfo value) {
-			this.pipeline = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code pipeline}
-		 */
-		public final Builder pipeline(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.pipeline(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code drop}
-		 */
-		public final Builder drop(@Nullable NodeInfoIngestInfo value) {
-			this.drop = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code drop}
-		 */
-		public final Builder drop(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.drop(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code circle}
-		 */
-		public final Builder circle(@Nullable NodeInfoIngestInfo value) {
-			this.circle = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code circle}
-		 */
-		public final Builder circle(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.circle(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code inference}
-		 */
-		public final Builder inference(@Nullable NodeInfoIngestInfo value) {
-			this.inference = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code inference}
-		 */
-		public final Builder inference(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
-			return this.inference(fn.apply(new NodeInfoIngestInfo.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link NodeInfoSettingsIngest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoSettingsIngest build() {
-			_checkSingleUse();
-
-			return new NodeInfoSettingsIngest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeInfoSettingsIngest}
-	 */
-	public static final JsonpDeserializer<NodeInfoSettingsIngest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoSettingsIngest::setupNodeInfoSettingsIngestDeserializer);
-
-	protected static void setupNodeInfoSettingsIngestDeserializer(
-			ObjectDeserializer<NodeInfoSettingsIngest.Builder> op) {
-
-		op.add(Builder::attachment, NodeInfoIngestInfo._DESERIALIZER, "attachment");
-		op.add(Builder::append, NodeInfoIngestInfo._DESERIALIZER, "append");
-		op.add(Builder::csv, NodeInfoIngestInfo._DESERIALIZER, "csv");
-		op.add(Builder::convert, NodeInfoIngestInfo._DESERIALIZER, "convert");
-		op.add(Builder::date, NodeInfoIngestInfo._DESERIALIZER, "date");
-		op.add(Builder::dateIndexName, NodeInfoIngestInfo._DESERIALIZER, "date_index_name");
-		op.add(Builder::dotExpander, NodeInfoIngestInfo._DESERIALIZER, "dot_expander");
-		op.add(Builder::fail, NodeInfoIngestInfo._DESERIALIZER, "fail");
-		op.add(Builder::foreach, NodeInfoIngestInfo._DESERIALIZER, "foreach");
-		op.add(Builder::json, NodeInfoIngestInfo._DESERIALIZER, "json");
-		op.add(Builder::userAgent, NodeInfoIngestInfo._DESERIALIZER, "user_agent");
-		op.add(Builder::kv, NodeInfoIngestInfo._DESERIALIZER, "kv");
-		op.add(Builder::geoip, NodeInfoIngestInfo._DESERIALIZER, "geoip");
-		op.add(Builder::grok, NodeInfoIngestInfo._DESERIALIZER, "grok");
-		op.add(Builder::gsub, NodeInfoIngestInfo._DESERIALIZER, "gsub");
-		op.add(Builder::join, NodeInfoIngestInfo._DESERIALIZER, "join");
-		op.add(Builder::lowercase, NodeInfoIngestInfo._DESERIALIZER, "lowercase");
-		op.add(Builder::remove, NodeInfoIngestInfo._DESERIALIZER, "remove");
-		op.add(Builder::rename, NodeInfoIngestInfo._DESERIALIZER, "rename");
-		op.add(Builder::script, NodeInfoIngestInfo._DESERIALIZER, "script");
-		op.add(Builder::set, NodeInfoIngestInfo._DESERIALIZER, "set");
-		op.add(Builder::sort, NodeInfoIngestInfo._DESERIALIZER, "sort");
-		op.add(Builder::split, NodeInfoIngestInfo._DESERIALIZER, "split");
-		op.add(Builder::trim, NodeInfoIngestInfo._DESERIALIZER, "trim");
-		op.add(Builder::uppercase, NodeInfoIngestInfo._DESERIALIZER, "uppercase");
-		op.add(Builder::urldecode, NodeInfoIngestInfo._DESERIALIZER, "urldecode");
-		op.add(Builder::bytes, NodeInfoIngestInfo._DESERIALIZER, "bytes");
-		op.add(Builder::dissect, NodeInfoIngestInfo._DESERIALIZER, "dissect");
-		op.add(Builder::setSecurityUser, NodeInfoIngestInfo._DESERIALIZER, "set_security_user");
-		op.add(Builder::pipeline, NodeInfoIngestInfo._DESERIALIZER, "pipeline");
-		op.add(Builder::drop, NodeInfoIngestInfo._DESERIALIZER, "drop");
-		op.add(Builder::circle, NodeInfoIngestInfo._DESERIALIZER, "circle");
-		op.add(Builder::inference, NodeInfoIngestInfo._DESERIALIZER, "inference");
-
-	}
+        @Nullable
+        private NodeInfoIngestInfo setSecurityUser;
+
+        @Nullable
+        private NodeInfoIngestInfo pipeline;
+
+        @Nullable
+        private NodeInfoIngestInfo drop;
+
+        @Nullable
+        private NodeInfoIngestInfo circle;
+
+        @Nullable
+        private NodeInfoIngestInfo inference;
+
+        /**
+         * API name: {@code attachment}
+         */
+        public final Builder attachment(@Nullable NodeInfoIngestInfo value) {
+            this.attachment = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code attachment}
+         */
+        public final Builder attachment(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.attachment(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code append}
+         */
+        public final Builder append(@Nullable NodeInfoIngestInfo value) {
+            this.append = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code append}
+         */
+        public final Builder append(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.append(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code csv}
+         */
+        public final Builder csv(@Nullable NodeInfoIngestInfo value) {
+            this.csv = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code csv}
+         */
+        public final Builder csv(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.csv(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code convert}
+         */
+        public final Builder convert(@Nullable NodeInfoIngestInfo value) {
+            this.convert = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code convert}
+         */
+        public final Builder convert(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.convert(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code date}
+         */
+        public final Builder date(@Nullable NodeInfoIngestInfo value) {
+            this.date = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code date}
+         */
+        public final Builder date(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.date(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code date_index_name}
+         */
+        public final Builder dateIndexName(@Nullable NodeInfoIngestInfo value) {
+            this.dateIndexName = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code date_index_name}
+         */
+        public final Builder dateIndexName(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.dateIndexName(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code dot_expander}
+         */
+        public final Builder dotExpander(@Nullable NodeInfoIngestInfo value) {
+            this.dotExpander = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code dot_expander}
+         */
+        public final Builder dotExpander(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.dotExpander(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code fail}
+         */
+        public final Builder fail(@Nullable NodeInfoIngestInfo value) {
+            this.fail = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code fail}
+         */
+        public final Builder fail(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.fail(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code foreach}
+         */
+        public final Builder foreach(@Nullable NodeInfoIngestInfo value) {
+            this.foreach = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code foreach}
+         */
+        public final Builder foreach(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.foreach(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code json}
+         */
+        public final Builder json(@Nullable NodeInfoIngestInfo value) {
+            this.json = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code json}
+         */
+        public final Builder json(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.json(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code user_agent}
+         */
+        public final Builder userAgent(@Nullable NodeInfoIngestInfo value) {
+            this.userAgent = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code user_agent}
+         */
+        public final Builder userAgent(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.userAgent(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code kv}
+         */
+        public final Builder kv(@Nullable NodeInfoIngestInfo value) {
+            this.kv = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code kv}
+         */
+        public final Builder kv(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.kv(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code geoip}
+         */
+        public final Builder geoip(@Nullable NodeInfoIngestInfo value) {
+            this.geoip = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code geoip}
+         */
+        public final Builder geoip(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.geoip(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code grok}
+         */
+        public final Builder grok(@Nullable NodeInfoIngestInfo value) {
+            this.grok = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code grok}
+         */
+        public final Builder grok(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.grok(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code gsub}
+         */
+        public final Builder gsub(@Nullable NodeInfoIngestInfo value) {
+            this.gsub = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code gsub}
+         */
+        public final Builder gsub(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.gsub(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code join}
+         */
+        public final Builder join(@Nullable NodeInfoIngestInfo value) {
+            this.join = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code join}
+         */
+        public final Builder join(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.join(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code lowercase}
+         */
+        public final Builder lowercase(@Nullable NodeInfoIngestInfo value) {
+            this.lowercase = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code lowercase}
+         */
+        public final Builder lowercase(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.lowercase(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code remove}
+         */
+        public final Builder remove(@Nullable NodeInfoIngestInfo value) {
+            this.remove = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code remove}
+         */
+        public final Builder remove(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.remove(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code rename}
+         */
+        public final Builder rename(@Nullable NodeInfoIngestInfo value) {
+            this.rename = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code rename}
+         */
+        public final Builder rename(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.rename(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(@Nullable NodeInfoIngestInfo value) {
+            this.script = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code script}
+         */
+        public final Builder script(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.script(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code set}
+         */
+        public final Builder set(@Nullable NodeInfoIngestInfo value) {
+            this.set = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code set}
+         */
+        public final Builder set(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.set(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code sort}
+         */
+        public final Builder sort(@Nullable NodeInfoIngestInfo value) {
+            this.sort = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code sort}
+         */
+        public final Builder sort(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.sort(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code split}
+         */
+        public final Builder split(@Nullable NodeInfoIngestInfo value) {
+            this.split = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code split}
+         */
+        public final Builder split(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.split(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code trim}
+         */
+        public final Builder trim(@Nullable NodeInfoIngestInfo value) {
+            this.trim = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code trim}
+         */
+        public final Builder trim(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.trim(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code uppercase}
+         */
+        public final Builder uppercase(@Nullable NodeInfoIngestInfo value) {
+            this.uppercase = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code uppercase}
+         */
+        public final Builder uppercase(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.uppercase(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code urldecode}
+         */
+        public final Builder urldecode(@Nullable NodeInfoIngestInfo value) {
+            this.urldecode = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code urldecode}
+         */
+        public final Builder urldecode(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.urldecode(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code bytes}
+         */
+        public final Builder bytes(@Nullable NodeInfoIngestInfo value) {
+            this.bytes = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code bytes}
+         */
+        public final Builder bytes(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.bytes(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code dissect}
+         */
+        public final Builder dissect(@Nullable NodeInfoIngestInfo value) {
+            this.dissect = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code dissect}
+         */
+        public final Builder dissect(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.dissect(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code set_security_user}
+         */
+        public final Builder setSecurityUser(@Nullable NodeInfoIngestInfo value) {
+            this.setSecurityUser = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code set_security_user}
+         */
+        public final Builder setSecurityUser(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.setSecurityUser(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code pipeline}
+         */
+        public final Builder pipeline(@Nullable NodeInfoIngestInfo value) {
+            this.pipeline = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code pipeline}
+         */
+        public final Builder pipeline(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.pipeline(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code drop}
+         */
+        public final Builder drop(@Nullable NodeInfoIngestInfo value) {
+            this.drop = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code drop}
+         */
+        public final Builder drop(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.drop(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code circle}
+         */
+        public final Builder circle(@Nullable NodeInfoIngestInfo value) {
+            this.circle = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code circle}
+         */
+        public final Builder circle(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.circle(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code inference}
+         */
+        public final Builder inference(@Nullable NodeInfoIngestInfo value) {
+            this.inference = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code inference}
+         */
+        public final Builder inference(Function<NodeInfoIngestInfo.Builder, ObjectBuilder<NodeInfoIngestInfo>> fn) {
+            return this.inference(fn.apply(new NodeInfoIngestInfo.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link NodeInfoSettingsIngest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoSettingsIngest build() {
+            _checkSingleUse();
+
+            return new NodeInfoSettingsIngest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeInfoSettingsIngest}
+     */
+    public static final JsonpDeserializer<NodeInfoSettingsIngest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoSettingsIngest::setupNodeInfoSettingsIngestDeserializer
+    );
+
+    protected static void setupNodeInfoSettingsIngestDeserializer(ObjectDeserializer<NodeInfoSettingsIngest.Builder> op) {
+
+        op.add(Builder::attachment, NodeInfoIngestInfo._DESERIALIZER, "attachment");
+        op.add(Builder::append, NodeInfoIngestInfo._DESERIALIZER, "append");
+        op.add(Builder::csv, NodeInfoIngestInfo._DESERIALIZER, "csv");
+        op.add(Builder::convert, NodeInfoIngestInfo._DESERIALIZER, "convert");
+        op.add(Builder::date, NodeInfoIngestInfo._DESERIALIZER, "date");
+        op.add(Builder::dateIndexName, NodeInfoIngestInfo._DESERIALIZER, "date_index_name");
+        op.add(Builder::dotExpander, NodeInfoIngestInfo._DESERIALIZER, "dot_expander");
+        op.add(Builder::fail, NodeInfoIngestInfo._DESERIALIZER, "fail");
+        op.add(Builder::foreach, NodeInfoIngestInfo._DESERIALIZER, "foreach");
+        op.add(Builder::json, NodeInfoIngestInfo._DESERIALIZER, "json");
+        op.add(Builder::userAgent, NodeInfoIngestInfo._DESERIALIZER, "user_agent");
+        op.add(Builder::kv, NodeInfoIngestInfo._DESERIALIZER, "kv");
+        op.add(Builder::geoip, NodeInfoIngestInfo._DESERIALIZER, "geoip");
+        op.add(Builder::grok, NodeInfoIngestInfo._DESERIALIZER, "grok");
+        op.add(Builder::gsub, NodeInfoIngestInfo._DESERIALIZER, "gsub");
+        op.add(Builder::join, NodeInfoIngestInfo._DESERIALIZER, "join");
+        op.add(Builder::lowercase, NodeInfoIngestInfo._DESERIALIZER, "lowercase");
+        op.add(Builder::remove, NodeInfoIngestInfo._DESERIALIZER, "remove");
+        op.add(Builder::rename, NodeInfoIngestInfo._DESERIALIZER, "rename");
+        op.add(Builder::script, NodeInfoIngestInfo._DESERIALIZER, "script");
+        op.add(Builder::set, NodeInfoIngestInfo._DESERIALIZER, "set");
+        op.add(Builder::sort, NodeInfoIngestInfo._DESERIALIZER, "sort");
+        op.add(Builder::split, NodeInfoIngestInfo._DESERIALIZER, "split");
+        op.add(Builder::trim, NodeInfoIngestInfo._DESERIALIZER, "trim");
+        op.add(Builder::uppercase, NodeInfoIngestInfo._DESERIALIZER, "uppercase");
+        op.add(Builder::urldecode, NodeInfoIngestInfo._DESERIALIZER, "urldecode");
+        op.add(Builder::bytes, NodeInfoIngestInfo._DESERIALIZER, "bytes");
+        op.add(Builder::dissect, NodeInfoIngestInfo._DESERIALIZER, "dissect");
+        op.add(Builder::setSecurityUser, NodeInfoIngestInfo._DESERIALIZER, "set_security_user");
+        op.add(Builder::pipeline, NodeInfoIngestInfo._DESERIALIZER, "pipeline");
+        op.add(Builder::drop, NodeInfoIngestInfo._DESERIALIZER, "drop");
+        op.add(Builder::circle, NodeInfoIngestInfo._DESERIALIZER, "circle");
+        op.add(Builder::inference, NodeInfoIngestInfo._DESERIALIZER, "inference");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsNetwork.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsNetwork.java
index 38f5c662b9..7466fb5724 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsNetwork.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsNetwork.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,93 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoSettingsNetwork
 
 @JsonpDeserializable
 public class NodeInfoSettingsNetwork implements JsonpSerializable {
-	private final String host;
+    private final String host;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private NodeInfoSettingsNetwork(Builder builder) {
+    private NodeInfoSettingsNetwork(Builder builder) {
 
-		this.host = ApiTypeHelper.requireNonNull(builder.host, this, "host");
+        this.host = ApiTypeHelper.requireNonNull(builder.host, this, "host");
 
-	}
+    }
 
-	public static NodeInfoSettingsNetwork of(Function<Builder, ObjectBuilder<NodeInfoSettingsNetwork>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static NodeInfoSettingsNetwork of(Function<Builder, ObjectBuilder<NodeInfoSettingsNetwork>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code host}
-	 */
-	public final String host() {
-		return this.host;
-	}
+    /**
+     * Required - API name: {@code host}
+     */
+    public final String host() {
+        return this.host;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("host");
-		generator.write(this.host);
+        generator.writeKey("host");
+        generator.write(this.host);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link NodeInfoSettingsNetwork}.
-	 */
+    /**
+     * Builder for {@link NodeInfoSettingsNetwork}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettingsNetwork> {
-		private String host;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettingsNetwork> {
+        private String host;
 
-		/**
-		 * Required - API name: {@code host}
-		 */
-		public final Builder host(String value) {
-			this.host = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code host}
+         */
+        public final Builder host(String value) {
+            this.host = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link NodeInfoSettingsNetwork}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoSettingsNetwork build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link NodeInfoSettingsNetwork}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoSettingsNetwork build() {
+            _checkSingleUse();
 
-			return new NodeInfoSettingsNetwork(this);
-		}
-	}
+            return new NodeInfoSettingsNetwork(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link NodeInfoSettingsNetwork}
-	 */
-	public static final JsonpDeserializer<NodeInfoSettingsNetwork> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoSettingsNetwork::setupNodeInfoSettingsNetworkDeserializer);
+    /**
+     * Json deserializer for {@link NodeInfoSettingsNetwork}
+     */
+    public static final JsonpDeserializer<NodeInfoSettingsNetwork> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoSettingsNetwork::setupNodeInfoSettingsNetworkDeserializer
+    );
 
-	protected static void setupNodeInfoSettingsNetworkDeserializer(
-			ObjectDeserializer<NodeInfoSettingsNetwork.Builder> op) {
+    protected static void setupNodeInfoSettingsNetworkDeserializer(ObjectDeserializer<NodeInfoSettingsNetwork.Builder> op) {
 
-		op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host");
+        op.add(Builder::host, JsonpDeserializer.stringDeserializer(), "host");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsNode.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsNode.java
index e537b83c99..533843776b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsNode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsNode.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,171 +46,169 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: nodes.info.NodeInfoSettingsNode
 
 @JsonpDeserializable
 public class NodeInfoSettingsNode implements JsonpSerializable {
-	private final String name;
+    private final String name;
 
-	@Nullable
-	private final Map<String, JsonData> attr;
-
-	@Nullable
-	private final String maxLocalStorageNodes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeInfoSettingsNode(Builder builder) {
-
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.attr = ApiTypeHelper.unmodifiable(builder.attr);
-		this.maxLocalStorageNodes = builder.maxLocalStorageNodes;
-
-	}
-
-	public static NodeInfoSettingsNode of(Function<Builder, ObjectBuilder<NodeInfoSettingsNode>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * API name: {@code attr}
-	 */
-	@Nullable
-	public final Map<String, JsonData> attr() {
-		return this.attr;
-	}
-
-	/**
-	 * API name: {@code max_local_storage_nodes}
-	 */
-	@Nullable
-	public final String maxLocalStorageNodes() {
-		return this.maxLocalStorageNodes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		if (ApiTypeHelper.isDefined(this.attr)) {
-			generator.writeKey("attr");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.attr.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.maxLocalStorageNodes != null) {
-			generator.writeKey("max_local_storage_nodes");
-			generator.write(this.maxLocalStorageNodes);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeInfoSettingsNode}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettingsNode> {
-		private String name;
-
-		@Nullable
-		private Map<String, JsonData> attr;
-
-		@Nullable
-		private String maxLocalStorageNodes;
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code attr}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>attr</code>.
-		 */
-		public final Builder attr(Map<String, JsonData> map) {
-			this.attr = _mapPutAll(this.attr, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code attr}
-		 * <p>
-		 * Adds an entry to <code>attr</code>.
-		 */
-		public final Builder attr(String key, JsonData value) {
-			this.attr = _mapPut(this.attr, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code max_local_storage_nodes}
-		 */
-		public final Builder maxLocalStorageNodes(@Nullable String value) {
-			this.maxLocalStorageNodes = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeInfoSettingsNode}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoSettingsNode build() {
-			_checkSingleUse();
-
-			return new NodeInfoSettingsNode(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeInfoSettingsNode}
-	 */
-	public static final JsonpDeserializer<NodeInfoSettingsNode> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoSettingsNode::setupNodeInfoSettingsNodeDeserializer);
-
-	protected static void setupNodeInfoSettingsNodeDeserializer(ObjectDeserializer<NodeInfoSettingsNode.Builder> op) {
-
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::attr, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "attr");
-		op.add(Builder::maxLocalStorageNodes, JsonpDeserializer.stringDeserializer(), "max_local_storage_nodes");
-
-	}
+    @Nullable
+    private final Map<String, JsonData> attr;
+
+    @Nullable
+    private final String maxLocalStorageNodes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeInfoSettingsNode(Builder builder) {
+
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.attr = ApiTypeHelper.unmodifiable(builder.attr);
+        this.maxLocalStorageNodes = builder.maxLocalStorageNodes;
+
+    }
+
+    public static NodeInfoSettingsNode of(Function<Builder, ObjectBuilder<NodeInfoSettingsNode>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * API name: {@code attr}
+     */
+    @Nullable
+    public final Map<String, JsonData> attr() {
+        return this.attr;
+    }
+
+    /**
+     * API name: {@code max_local_storage_nodes}
+     */
+    @Nullable
+    public final String maxLocalStorageNodes() {
+        return this.maxLocalStorageNodes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        if (ApiTypeHelper.isDefined(this.attr)) {
+            generator.writeKey("attr");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.attr.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.maxLocalStorageNodes != null) {
+            generator.writeKey("max_local_storage_nodes");
+            generator.write(this.maxLocalStorageNodes);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeInfoSettingsNode}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettingsNode> {
+        private String name;
+
+        @Nullable
+        private Map<String, JsonData> attr;
+
+        @Nullable
+        private String maxLocalStorageNodes;
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code attr}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>attr</code>.
+         */
+        public final Builder attr(Map<String, JsonData> map) {
+            this.attr = _mapPutAll(this.attr, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code attr}
+         * <p>
+         * Adds an entry to <code>attr</code>.
+         */
+        public final Builder attr(String key, JsonData value) {
+            this.attr = _mapPut(this.attr, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code max_local_storage_nodes}
+         */
+        public final Builder maxLocalStorageNodes(@Nullable String value) {
+            this.maxLocalStorageNodes = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeInfoSettingsNode}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoSettingsNode build() {
+            _checkSingleUse();
+
+            return new NodeInfoSettingsNode(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeInfoSettingsNode}
+     */
+    public static final JsonpDeserializer<NodeInfoSettingsNode> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoSettingsNode::setupNodeInfoSettingsNodeDeserializer
+    );
+
+    protected static void setupNodeInfoSettingsNodeDeserializer(ObjectDeserializer<NodeInfoSettingsNode.Builder> op) {
+
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::attr, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "attr");
+        op.add(Builder::maxLocalStorageNodes, JsonpDeserializer.stringDeserializer(), "max_local_storage_nodes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsTransport.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsTransport.java
index 3de8e6ea55..f105482d23 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsTransport.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsTransport.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,132 +44,129 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: nodes.info.NodeInfoSettingsTransport
 
 @JsonpDeserializable
 public class NodeInfoSettingsTransport implements JsonpSerializable {
-	private final NodeInfoSettingsTransportType type;
-
-	@Nullable
-	private final String typeDefault;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeInfoSettingsTransport(Builder builder) {
-
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-		this.typeDefault = builder.typeDefault;
-
-	}
-
-	public static NodeInfoSettingsTransport of(Function<Builder, ObjectBuilder<NodeInfoSettingsTransport>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final NodeInfoSettingsTransportType type() {
-		return this.type;
-	}
-
-	/**
-	 * API name: {@code type.default}
-	 */
-	@Nullable
-	public final String typeDefault() {
-		return this.typeDefault;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("type");
-		this.type.serialize(generator, mapper);
-
-		if (this.typeDefault != null) {
-			generator.writeKey("type.default");
-			generator.write(this.typeDefault);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeInfoSettingsTransport}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettingsTransport> {
-		private NodeInfoSettingsTransportType type;
-
-		@Nullable
-		private String typeDefault;
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(NodeInfoSettingsTransportType value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(
-				Function<NodeInfoSettingsTransportType.Builder, ObjectBuilder<NodeInfoSettingsTransportType>> fn) {
-			return this.type(fn.apply(new NodeInfoSettingsTransportType.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code type.default}
-		 */
-		public final Builder typeDefault(@Nullable String value) {
-			this.typeDefault = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeInfoSettingsTransport}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoSettingsTransport build() {
-			_checkSingleUse();
-
-			return new NodeInfoSettingsTransport(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeInfoSettingsTransport}
-	 */
-	public static final JsonpDeserializer<NodeInfoSettingsTransport> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoSettingsTransport::setupNodeInfoSettingsTransportDeserializer);
-
-	protected static void setupNodeInfoSettingsTransportDeserializer(
-			ObjectDeserializer<NodeInfoSettingsTransport.Builder> op) {
-
-		op.add(Builder::type, NodeInfoSettingsTransportType._DESERIALIZER, "type");
-		op.add(Builder::typeDefault, JsonpDeserializer.stringDeserializer(), "type.default");
-
-	}
+    private final NodeInfoSettingsTransportType type;
+
+    @Nullable
+    private final String typeDefault;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeInfoSettingsTransport(Builder builder) {
+
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.typeDefault = builder.typeDefault;
+
+    }
+
+    public static NodeInfoSettingsTransport of(Function<Builder, ObjectBuilder<NodeInfoSettingsTransport>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    public final NodeInfoSettingsTransportType type() {
+        return this.type;
+    }
+
+    /**
+     * API name: {@code type.default}
+     */
+    @Nullable
+    public final String typeDefault() {
+        return this.typeDefault;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("type");
+        this.type.serialize(generator, mapper);
+
+        if (this.typeDefault != null) {
+            generator.writeKey("type.default");
+            generator.write(this.typeDefault);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeInfoSettingsTransport}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettingsTransport> {
+        private NodeInfoSettingsTransportType type;
+
+        @Nullable
+        private String typeDefault;
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(NodeInfoSettingsTransportType value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(Function<NodeInfoSettingsTransportType.Builder, ObjectBuilder<NodeInfoSettingsTransportType>> fn) {
+            return this.type(fn.apply(new NodeInfoSettingsTransportType.Builder()).build());
+        }
+
+        /**
+         * API name: {@code type.default}
+         */
+        public final Builder typeDefault(@Nullable String value) {
+            this.typeDefault = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeInfoSettingsTransport}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoSettingsTransport build() {
+            _checkSingleUse();
+
+            return new NodeInfoSettingsTransport(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeInfoSettingsTransport}
+     */
+    public static final JsonpDeserializer<NodeInfoSettingsTransport> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoSettingsTransport::setupNodeInfoSettingsTransportDeserializer
+    );
+
+    protected static void setupNodeInfoSettingsTransportDeserializer(ObjectDeserializer<NodeInfoSettingsTransport.Builder> op) {
+
+        op.add(Builder::type, NodeInfoSettingsTransportType._DESERIALIZER, "type");
+        op.add(Builder::typeDefault, JsonpDeserializer.stringDeserializer(), "type.default");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsTransportType.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsTransportType.java
index d34084950b..1a3a34c322 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsTransportType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsTransportType.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,95 +43,94 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoSettingsTransportType
 
 @JsonpDeserializable
 public class NodeInfoSettingsTransportType implements JsonpSerializable {
-	private final String default_;
+    private final String default_;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private NodeInfoSettingsTransportType(Builder builder) {
+    private NodeInfoSettingsTransportType(Builder builder) {
 
-		this.default_ = ApiTypeHelper.requireNonNull(builder.default_, this, "default_");
+        this.default_ = ApiTypeHelper.requireNonNull(builder.default_, this, "default_");
 
-	}
+    }
 
-	public static NodeInfoSettingsTransportType of(Function<Builder, ObjectBuilder<NodeInfoSettingsTransportType>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static NodeInfoSettingsTransportType of(Function<Builder, ObjectBuilder<NodeInfoSettingsTransportType>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code default}
-	 */
-	public final String default_() {
-		return this.default_;
-	}
+    /**
+     * Required - API name: {@code default}
+     */
+    public final String default_() {
+        return this.default_;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("default");
-		generator.write(this.default_);
+        generator.writeKey("default");
+        generator.write(this.default_);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link NodeInfoSettingsTransportType}.
-	 */
+    /**
+     * Builder for {@link NodeInfoSettingsTransportType}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettingsTransportType> {
-		private String default_;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoSettingsTransportType> {
+        private String default_;
 
-		/**
-		 * Required - API name: {@code default}
-		 */
-		public final Builder default_(String value) {
-			this.default_ = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code default}
+         */
+        public final Builder default_(String value) {
+            this.default_ = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link NodeInfoSettingsTransportType}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoSettingsTransportType build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link NodeInfoSettingsTransportType}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoSettingsTransportType build() {
+            _checkSingleUse();
 
-			return new NodeInfoSettingsTransportType(this);
-		}
-	}
+            return new NodeInfoSettingsTransportType(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link NodeInfoSettingsTransportType}
-	 */
-	public static final JsonpDeserializer<NodeInfoSettingsTransportType> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoSettingsTransportType::setupNodeInfoSettingsTransportTypeDeserializer);
+    /**
+     * Json deserializer for {@link NodeInfoSettingsTransportType}
+     */
+    public static final JsonpDeserializer<NodeInfoSettingsTransportType> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoSettingsTransportType::setupNodeInfoSettingsTransportTypeDeserializer
+    );
 
-	protected static void setupNodeInfoSettingsTransportTypeDeserializer(
-			ObjectDeserializer<NodeInfoSettingsTransportType.Builder> op) {
+    protected static void setupNodeInfoSettingsTransportTypeDeserializer(ObjectDeserializer<NodeInfoSettingsTransportType.Builder> op) {
 
-		op.add(Builder::default_, JsonpDeserializer.stringDeserializer(), "default");
+        op.add(Builder::default_, JsonpDeserializer.stringDeserializer(), "default");
 
-		op.shortcutProperty("default");
+        op.shortcutProperty("default");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoTransport.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoTransport.java
index 06ac34d6a5..1aa10a9662 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoTransport.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfoTransport.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,184 +45,180 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeInfoTransport
 
 @JsonpDeserializable
 public class NodeInfoTransport implements JsonpSerializable {
-	private final List<String> boundAddress;
+    private final List<String> boundAddress;
 
-	private final String publishAddress;
+    private final String publishAddress;
 
-	private final Map<String, String> profiles;
+    private final Map<String, String> profiles;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeInfoTransport(Builder builder) {
-
-		this.boundAddress = ApiTypeHelper.unmodifiableRequired(builder.boundAddress, this, "boundAddress");
-		this.publishAddress = ApiTypeHelper.requireNonNull(builder.publishAddress, this, "publishAddress");
-		this.profiles = ApiTypeHelper.unmodifiableRequired(builder.profiles, this, "profiles");
-
-	}
-
-	public static NodeInfoTransport of(Function<Builder, ObjectBuilder<NodeInfoTransport>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code bound_address}
-	 */
-	public final List<String> boundAddress() {
-		return this.boundAddress;
-	}
-
-	/**
-	 * Required - API name: {@code publish_address}
-	 */
-	public final String publishAddress() {
-		return this.publishAddress;
-	}
-
-	/**
-	 * Required - API name: {@code profiles}
-	 */
-	public final Map<String, String> profiles() {
-		return this.profiles;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.boundAddress)) {
-			generator.writeKey("bound_address");
-			generator.writeStartArray();
-			for (String item0 : this.boundAddress) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("publish_address");
-		generator.write(this.publishAddress);
-
-		if (ApiTypeHelper.isDefined(this.profiles)) {
-			generator.writeKey("profiles");
-			generator.writeStartObject();
-			for (Map.Entry<String, String> item0 : this.profiles.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeInfoTransport}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoTransport> {
-		private List<String> boundAddress;
-
-		private String publishAddress;
-
-		private Map<String, String> profiles;
-
-		/**
-		 * Required - API name: {@code bound_address}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>boundAddress</code>.
-		 */
-		public final Builder boundAddress(List<String> list) {
-			this.boundAddress = _listAddAll(this.boundAddress, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code bound_address}
-		 * <p>
-		 * Adds one or more values to <code>boundAddress</code>.
-		 */
-		public final Builder boundAddress(String value, String... values) {
-			this.boundAddress = _listAdd(this.boundAddress, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code publish_address}
-		 */
-		public final Builder publishAddress(String value) {
-			this.publishAddress = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code profiles}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>profiles</code>.
-		 */
-		public final Builder profiles(Map<String, String> map) {
-			this.profiles = _mapPutAll(this.profiles, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code profiles}
-		 * <p>
-		 * Adds an entry to <code>profiles</code>.
-		 */
-		public final Builder profiles(String key, String value) {
-			this.profiles = _mapPut(this.profiles, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeInfoTransport}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeInfoTransport build() {
-			_checkSingleUse();
-
-			return new NodeInfoTransport(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeInfoTransport}
-	 */
-	public static final JsonpDeserializer<NodeInfoTransport> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeInfoTransport::setupNodeInfoTransportDeserializer);
-
-	protected static void setupNodeInfoTransportDeserializer(ObjectDeserializer<NodeInfoTransport.Builder> op) {
-
-		op.add(Builder::boundAddress, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"bound_address");
-		op.add(Builder::publishAddress, JsonpDeserializer.stringDeserializer(), "publish_address");
-		op.add(Builder::profiles, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()),
-				"profiles");
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeInfoTransport(Builder builder) {
+
+        this.boundAddress = ApiTypeHelper.unmodifiableRequired(builder.boundAddress, this, "boundAddress");
+        this.publishAddress = ApiTypeHelper.requireNonNull(builder.publishAddress, this, "publishAddress");
+        this.profiles = ApiTypeHelper.unmodifiableRequired(builder.profiles, this, "profiles");
+
+    }
+
+    public static NodeInfoTransport of(Function<Builder, ObjectBuilder<NodeInfoTransport>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code bound_address}
+     */
+    public final List<String> boundAddress() {
+        return this.boundAddress;
+    }
+
+    /**
+     * Required - API name: {@code publish_address}
+     */
+    public final String publishAddress() {
+        return this.publishAddress;
+    }
+
+    /**
+     * Required - API name: {@code profiles}
+     */
+    public final Map<String, String> profiles() {
+        return this.profiles;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.boundAddress)) {
+            generator.writeKey("bound_address");
+            generator.writeStartArray();
+            for (String item0 : this.boundAddress) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("publish_address");
+        generator.write(this.publishAddress);
+
+        if (ApiTypeHelper.isDefined(this.profiles)) {
+            generator.writeKey("profiles");
+            generator.writeStartObject();
+            for (Map.Entry<String, String> item0 : this.profiles.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeInfoTransport}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeInfoTransport> {
+        private List<String> boundAddress;
+
+        private String publishAddress;
+
+        private Map<String, String> profiles;
+
+        /**
+         * Required - API name: {@code bound_address}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>boundAddress</code>.
+         */
+        public final Builder boundAddress(List<String> list) {
+            this.boundAddress = _listAddAll(this.boundAddress, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code bound_address}
+         * <p>
+         * Adds one or more values to <code>boundAddress</code>.
+         */
+        public final Builder boundAddress(String value, String... values) {
+            this.boundAddress = _listAdd(this.boundAddress, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code publish_address}
+         */
+        public final Builder publishAddress(String value) {
+            this.publishAddress = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code profiles}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>profiles</code>.
+         */
+        public final Builder profiles(Map<String, String> map) {
+            this.profiles = _mapPutAll(this.profiles, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code profiles}
+         * <p>
+         * Adds an entry to <code>profiles</code>.
+         */
+        public final Builder profiles(String key, String value) {
+            this.profiles = _mapPut(this.profiles, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeInfoTransport}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeInfoTransport build() {
+            _checkSingleUse();
+
+            return new NodeInfoTransport(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeInfoTransport}
+     */
+    public static final JsonpDeserializer<NodeInfoTransport> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeInfoTransport::setupNodeInfoTransportDeserializer
+    );
+
+    protected static void setupNodeInfoTransportDeserializer(ObjectDeserializer<NodeInfoTransport.Builder> op) {
+
+        op.add(Builder::boundAddress, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "bound_address");
+        op.add(Builder::publishAddress, JsonpDeserializer.stringDeserializer(), "publish_address");
+        op.add(Builder::profiles, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.stringDeserializer()), "profiles");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeJvmInfo.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeJvmInfo.java
index 61ad2b10ba..5d156d71fc 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeJvmInfo.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeJvmInfo.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,456 +45,454 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: nodes.info.NodeJvmInfo
 
 @JsonpDeserializable
 public class NodeJvmInfo implements JsonpSerializable {
-	private final List<String> gcCollectors;
+    private final List<String> gcCollectors;
 
-	private final NodeInfoJvmMemory mem;
-
-	private final List<String> memoryPools;
-
-	private final int pid;
-
-	private final long startTimeInMillis;
-
-	private final String version;
-
-	private final String vmName;
-
-	private final String vmVendor;
-
-	private final String vmVersion;
-
-	private final boolean bundledJdk;
-
-	private final boolean usingBundledJdk;
-
-	@Nullable
-	private final Boolean usingCompressedOrdinaryObjectPointers;
-
-	private final List<String> inputArguments;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeJvmInfo(Builder builder) {
-
-		this.gcCollectors = ApiTypeHelper.unmodifiableRequired(builder.gcCollectors, this, "gcCollectors");
-		this.mem = ApiTypeHelper.requireNonNull(builder.mem, this, "mem");
-		this.memoryPools = ApiTypeHelper.unmodifiableRequired(builder.memoryPools, this, "memoryPools");
-		this.pid = ApiTypeHelper.requireNonNull(builder.pid, this, "pid");
-		this.startTimeInMillis = ApiTypeHelper.requireNonNull(builder.startTimeInMillis, this, "startTimeInMillis");
-		this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
-		this.vmName = ApiTypeHelper.requireNonNull(builder.vmName, this, "vmName");
-		this.vmVendor = ApiTypeHelper.requireNonNull(builder.vmVendor, this, "vmVendor");
-		this.vmVersion = ApiTypeHelper.requireNonNull(builder.vmVersion, this, "vmVersion");
-		this.bundledJdk = ApiTypeHelper.requireNonNull(builder.bundledJdk, this, "bundledJdk");
-		this.usingBundledJdk = ApiTypeHelper.requireNonNull(builder.usingBundledJdk, this, "usingBundledJdk");
-		this.usingCompressedOrdinaryObjectPointers = builder.usingCompressedOrdinaryObjectPointers;
-		this.inputArguments = ApiTypeHelper.unmodifiableRequired(builder.inputArguments, this, "inputArguments");
-
-	}
-
-	public static NodeJvmInfo of(Function<Builder, ObjectBuilder<NodeJvmInfo>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code gc_collectors}
-	 */
-	public final List<String> gcCollectors() {
-		return this.gcCollectors;
-	}
-
-	/**
-	 * Required - API name: {@code mem}
-	 */
-	public final NodeInfoJvmMemory mem() {
-		return this.mem;
-	}
-
-	/**
-	 * Required - API name: {@code memory_pools}
-	 */
-	public final List<String> memoryPools() {
-		return this.memoryPools;
-	}
-
-	/**
-	 * Required - API name: {@code pid}
-	 */
-	public final int pid() {
-		return this.pid;
-	}
-
-	/**
-	 * Required - API name: {@code start_time_in_millis}
-	 */
-	public final long startTimeInMillis() {
-		return this.startTimeInMillis;
-	}
-
-	/**
-	 * Required - API name: {@code version}
-	 */
-	public final String version() {
-		return this.version;
-	}
-
-	/**
-	 * Required - API name: {@code vm_name}
-	 */
-	public final String vmName() {
-		return this.vmName;
-	}
-
-	/**
-	 * Required - API name: {@code vm_vendor}
-	 */
-	public final String vmVendor() {
-		return this.vmVendor;
-	}
-
-	/**
-	 * Required - API name: {@code vm_version}
-	 */
-	public final String vmVersion() {
-		return this.vmVersion;
-	}
-
-	/**
-	 * Required - API name: {@code bundled_jdk}
-	 */
-	public final boolean bundledJdk() {
-		return this.bundledJdk;
-	}
-
-	/**
-	 * Required - API name: {@code using_bundled_jdk}
-	 */
-	public final boolean usingBundledJdk() {
-		return this.usingBundledJdk;
-	}
-
-	/**
-	 * API name: {@code using_compressed_ordinary_object_pointers}
-	 */
-	@Nullable
-	public final Boolean usingCompressedOrdinaryObjectPointers() {
-		return this.usingCompressedOrdinaryObjectPointers;
-	}
-
-	/**
-	 * Required - API name: {@code input_arguments}
-	 */
-	public final List<String> inputArguments() {
-		return this.inputArguments;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.gcCollectors)) {
-			generator.writeKey("gc_collectors");
-			generator.writeStartArray();
-			for (String item0 : this.gcCollectors) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("mem");
-		this.mem.serialize(generator, mapper);
-
-		if (ApiTypeHelper.isDefined(this.memoryPools)) {
-			generator.writeKey("memory_pools");
-			generator.writeStartArray();
-			for (String item0 : this.memoryPools) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("pid");
-		generator.write(this.pid);
-
-		generator.writeKey("start_time_in_millis");
-		generator.write(this.startTimeInMillis);
-
-		generator.writeKey("version");
-		generator.write(this.version);
-
-		generator.writeKey("vm_name");
-		generator.write(this.vmName);
-
-		generator.writeKey("vm_vendor");
-		generator.write(this.vmVendor);
-
-		generator.writeKey("vm_version");
-		generator.write(this.vmVersion);
-
-		generator.writeKey("bundled_jdk");
-		generator.write(this.bundledJdk);
-
-		generator.writeKey("using_bundled_jdk");
-		generator.write(this.usingBundledJdk);
-
-		if (this.usingCompressedOrdinaryObjectPointers != null) {
-			generator.writeKey("using_compressed_ordinary_object_pointers");
-			generator.write(this.usingCompressedOrdinaryObjectPointers);
-
-		}
-		if (ApiTypeHelper.isDefined(this.inputArguments)) {
-			generator.writeKey("input_arguments");
-			generator.writeStartArray();
-			for (String item0 : this.inputArguments) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeJvmInfo}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeJvmInfo> {
-		private List<String> gcCollectors;
-
-		private NodeInfoJvmMemory mem;
-
-		private List<String> memoryPools;
-
-		private Integer pid;
-
-		private Long startTimeInMillis;
-
-		private String version;
-
-		private String vmName;
-
-		private String vmVendor;
-
-		private String vmVersion;
-
-		private Boolean bundledJdk;
-
-		private Boolean usingBundledJdk;
-
-		@Nullable
-		private Boolean usingCompressedOrdinaryObjectPointers;
-
-		private List<String> inputArguments;
-
-		/**
-		 * Required - API name: {@code gc_collectors}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>gcCollectors</code>.
-		 */
-		public final Builder gcCollectors(List<String> list) {
-			this.gcCollectors = _listAddAll(this.gcCollectors, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code gc_collectors}
-		 * <p>
-		 * Adds one or more values to <code>gcCollectors</code>.
-		 */
-		public final Builder gcCollectors(String value, String... values) {
-			this.gcCollectors = _listAdd(this.gcCollectors, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mem}
-		 */
-		public final Builder mem(NodeInfoJvmMemory value) {
-			this.mem = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code mem}
-		 */
-		public final Builder mem(Function<NodeInfoJvmMemory.Builder, ObjectBuilder<NodeInfoJvmMemory>> fn) {
-			return this.mem(fn.apply(new NodeInfoJvmMemory.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code memory_pools}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>memoryPools</code>.
-		 */
-		public final Builder memoryPools(List<String> list) {
-			this.memoryPools = _listAddAll(this.memoryPools, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code memory_pools}
-		 * <p>
-		 * Adds one or more values to <code>memoryPools</code>.
-		 */
-		public final Builder memoryPools(String value, String... values) {
-			this.memoryPools = _listAdd(this.memoryPools, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code pid}
-		 */
-		public final Builder pid(int value) {
-			this.pid = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code start_time_in_millis}
-		 */
-		public final Builder startTimeInMillis(long value) {
-			this.startTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code version}
-		 */
-		public final Builder version(String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code vm_name}
-		 */
-		public final Builder vmName(String value) {
-			this.vmName = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code vm_vendor}
-		 */
-		public final Builder vmVendor(String value) {
-			this.vmVendor = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code vm_version}
-		 */
-		public final Builder vmVersion(String value) {
-			this.vmVersion = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code bundled_jdk}
-		 */
-		public final Builder bundledJdk(boolean value) {
-			this.bundledJdk = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code using_bundled_jdk}
-		 */
-		public final Builder usingBundledJdk(boolean value) {
-			this.usingBundledJdk = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code using_compressed_ordinary_object_pointers}
-		 */
-		public final Builder usingCompressedOrdinaryObjectPointers(@Nullable Boolean value) {
-			this.usingCompressedOrdinaryObjectPointers = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code input_arguments}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>inputArguments</code>.
-		 */
-		public final Builder inputArguments(List<String> list) {
-			this.inputArguments = _listAddAll(this.inputArguments, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code input_arguments}
-		 * <p>
-		 * Adds one or more values to <code>inputArguments</code>.
-		 */
-		public final Builder inputArguments(String value, String... values) {
-			this.inputArguments = _listAdd(this.inputArguments, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeJvmInfo}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeJvmInfo build() {
-			_checkSingleUse();
-
-			return new NodeJvmInfo(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeJvmInfo}
-	 */
-	public static final JsonpDeserializer<NodeJvmInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeJvmInfo::setupNodeJvmInfoDeserializer);
-
-	protected static void setupNodeJvmInfoDeserializer(ObjectDeserializer<NodeJvmInfo.Builder> op) {
-
-		op.add(Builder::gcCollectors, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"gc_collectors");
-		op.add(Builder::mem, NodeInfoJvmMemory._DESERIALIZER, "mem");
-		op.add(Builder::memoryPools, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"memory_pools");
-		op.add(Builder::pid, JsonpDeserializer.integerDeserializer(), "pid");
-		op.add(Builder::startTimeInMillis, JsonpDeserializer.longDeserializer(), "start_time_in_millis");
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
-		op.add(Builder::vmName, JsonpDeserializer.stringDeserializer(), "vm_name");
-		op.add(Builder::vmVendor, JsonpDeserializer.stringDeserializer(), "vm_vendor");
-		op.add(Builder::vmVersion, JsonpDeserializer.stringDeserializer(), "vm_version");
-		op.add(Builder::bundledJdk, JsonpDeserializer.booleanDeserializer(), "bundled_jdk");
-		op.add(Builder::usingBundledJdk, JsonpDeserializer.booleanDeserializer(), "using_bundled_jdk");
-		op.add(Builder::usingCompressedOrdinaryObjectPointers, JsonpDeserializer.booleanDeserializer(),
-				"using_compressed_ordinary_object_pointers");
-		op.add(Builder::inputArguments, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"input_arguments");
-
-	}
+    private final NodeInfoJvmMemory mem;
+
+    private final List<String> memoryPools;
+
+    private final int pid;
+
+    private final long startTimeInMillis;
+
+    private final String version;
+
+    private final String vmName;
+
+    private final String vmVendor;
+
+    private final String vmVersion;
+
+    private final boolean bundledJdk;
+
+    private final boolean usingBundledJdk;
+
+    @Nullable
+    private final Boolean usingCompressedOrdinaryObjectPointers;
+
+    private final List<String> inputArguments;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeJvmInfo(Builder builder) {
+
+        this.gcCollectors = ApiTypeHelper.unmodifiableRequired(builder.gcCollectors, this, "gcCollectors");
+        this.mem = ApiTypeHelper.requireNonNull(builder.mem, this, "mem");
+        this.memoryPools = ApiTypeHelper.unmodifiableRequired(builder.memoryPools, this, "memoryPools");
+        this.pid = ApiTypeHelper.requireNonNull(builder.pid, this, "pid");
+        this.startTimeInMillis = ApiTypeHelper.requireNonNull(builder.startTimeInMillis, this, "startTimeInMillis");
+        this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
+        this.vmName = ApiTypeHelper.requireNonNull(builder.vmName, this, "vmName");
+        this.vmVendor = ApiTypeHelper.requireNonNull(builder.vmVendor, this, "vmVendor");
+        this.vmVersion = ApiTypeHelper.requireNonNull(builder.vmVersion, this, "vmVersion");
+        this.bundledJdk = ApiTypeHelper.requireNonNull(builder.bundledJdk, this, "bundledJdk");
+        this.usingBundledJdk = ApiTypeHelper.requireNonNull(builder.usingBundledJdk, this, "usingBundledJdk");
+        this.usingCompressedOrdinaryObjectPointers = builder.usingCompressedOrdinaryObjectPointers;
+        this.inputArguments = ApiTypeHelper.unmodifiableRequired(builder.inputArguments, this, "inputArguments");
+
+    }
+
+    public static NodeJvmInfo of(Function<Builder, ObjectBuilder<NodeJvmInfo>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code gc_collectors}
+     */
+    public final List<String> gcCollectors() {
+        return this.gcCollectors;
+    }
+
+    /**
+     * Required - API name: {@code mem}
+     */
+    public final NodeInfoJvmMemory mem() {
+        return this.mem;
+    }
+
+    /**
+     * Required - API name: {@code memory_pools}
+     */
+    public final List<String> memoryPools() {
+        return this.memoryPools;
+    }
+
+    /**
+     * Required - API name: {@code pid}
+     */
+    public final int pid() {
+        return this.pid;
+    }
+
+    /**
+     * Required - API name: {@code start_time_in_millis}
+     */
+    public final long startTimeInMillis() {
+        return this.startTimeInMillis;
+    }
+
+    /**
+     * Required - API name: {@code version}
+     */
+    public final String version() {
+        return this.version;
+    }
+
+    /**
+     * Required - API name: {@code vm_name}
+     */
+    public final String vmName() {
+        return this.vmName;
+    }
+
+    /**
+     * Required - API name: {@code vm_vendor}
+     */
+    public final String vmVendor() {
+        return this.vmVendor;
+    }
+
+    /**
+     * Required - API name: {@code vm_version}
+     */
+    public final String vmVersion() {
+        return this.vmVersion;
+    }
+
+    /**
+     * Required - API name: {@code bundled_jdk}
+     */
+    public final boolean bundledJdk() {
+        return this.bundledJdk;
+    }
+
+    /**
+     * Required - API name: {@code using_bundled_jdk}
+     */
+    public final boolean usingBundledJdk() {
+        return this.usingBundledJdk;
+    }
+
+    /**
+     * API name: {@code using_compressed_ordinary_object_pointers}
+     */
+    @Nullable
+    public final Boolean usingCompressedOrdinaryObjectPointers() {
+        return this.usingCompressedOrdinaryObjectPointers;
+    }
+
+    /**
+     * Required - API name: {@code input_arguments}
+     */
+    public final List<String> inputArguments() {
+        return this.inputArguments;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.gcCollectors)) {
+            generator.writeKey("gc_collectors");
+            generator.writeStartArray();
+            for (String item0 : this.gcCollectors) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("mem");
+        this.mem.serialize(generator, mapper);
+
+        if (ApiTypeHelper.isDefined(this.memoryPools)) {
+            generator.writeKey("memory_pools");
+            generator.writeStartArray();
+            for (String item0 : this.memoryPools) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("pid");
+        generator.write(this.pid);
+
+        generator.writeKey("start_time_in_millis");
+        generator.write(this.startTimeInMillis);
+
+        generator.writeKey("version");
+        generator.write(this.version);
+
+        generator.writeKey("vm_name");
+        generator.write(this.vmName);
+
+        generator.writeKey("vm_vendor");
+        generator.write(this.vmVendor);
+
+        generator.writeKey("vm_version");
+        generator.write(this.vmVersion);
+
+        generator.writeKey("bundled_jdk");
+        generator.write(this.bundledJdk);
+
+        generator.writeKey("using_bundled_jdk");
+        generator.write(this.usingBundledJdk);
+
+        if (this.usingCompressedOrdinaryObjectPointers != null) {
+            generator.writeKey("using_compressed_ordinary_object_pointers");
+            generator.write(this.usingCompressedOrdinaryObjectPointers);
+
+        }
+        if (ApiTypeHelper.isDefined(this.inputArguments)) {
+            generator.writeKey("input_arguments");
+            generator.writeStartArray();
+            for (String item0 : this.inputArguments) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeJvmInfo}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeJvmInfo> {
+        private List<String> gcCollectors;
+
+        private NodeInfoJvmMemory mem;
+
+        private List<String> memoryPools;
+
+        private Integer pid;
+
+        private Long startTimeInMillis;
+
+        private String version;
+
+        private String vmName;
+
+        private String vmVendor;
+
+        private String vmVersion;
+
+        private Boolean bundledJdk;
+
+        private Boolean usingBundledJdk;
+
+        @Nullable
+        private Boolean usingCompressedOrdinaryObjectPointers;
+
+        private List<String> inputArguments;
+
+        /**
+         * Required - API name: {@code gc_collectors}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>gcCollectors</code>.
+         */
+        public final Builder gcCollectors(List<String> list) {
+            this.gcCollectors = _listAddAll(this.gcCollectors, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code gc_collectors}
+         * <p>
+         * Adds one or more values to <code>gcCollectors</code>.
+         */
+        public final Builder gcCollectors(String value, String... values) {
+            this.gcCollectors = _listAdd(this.gcCollectors, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mem}
+         */
+        public final Builder mem(NodeInfoJvmMemory value) {
+            this.mem = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code mem}
+         */
+        public final Builder mem(Function<NodeInfoJvmMemory.Builder, ObjectBuilder<NodeInfoJvmMemory>> fn) {
+            return this.mem(fn.apply(new NodeInfoJvmMemory.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code memory_pools}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>memoryPools</code>.
+         */
+        public final Builder memoryPools(List<String> list) {
+            this.memoryPools = _listAddAll(this.memoryPools, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code memory_pools}
+         * <p>
+         * Adds one or more values to <code>memoryPools</code>.
+         */
+        public final Builder memoryPools(String value, String... values) {
+            this.memoryPools = _listAdd(this.memoryPools, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code pid}
+         */
+        public final Builder pid(int value) {
+            this.pid = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code start_time_in_millis}
+         */
+        public final Builder startTimeInMillis(long value) {
+            this.startTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code version}
+         */
+        public final Builder version(String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code vm_name}
+         */
+        public final Builder vmName(String value) {
+            this.vmName = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code vm_vendor}
+         */
+        public final Builder vmVendor(String value) {
+            this.vmVendor = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code vm_version}
+         */
+        public final Builder vmVersion(String value) {
+            this.vmVersion = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code bundled_jdk}
+         */
+        public final Builder bundledJdk(boolean value) {
+            this.bundledJdk = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code using_bundled_jdk}
+         */
+        public final Builder usingBundledJdk(boolean value) {
+            this.usingBundledJdk = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code using_compressed_ordinary_object_pointers}
+         */
+        public final Builder usingCompressedOrdinaryObjectPointers(@Nullable Boolean value) {
+            this.usingCompressedOrdinaryObjectPointers = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code input_arguments}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>inputArguments</code>.
+         */
+        public final Builder inputArguments(List<String> list) {
+            this.inputArguments = _listAddAll(this.inputArguments, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code input_arguments}
+         * <p>
+         * Adds one or more values to <code>inputArguments</code>.
+         */
+        public final Builder inputArguments(String value, String... values) {
+            this.inputArguments = _listAdd(this.inputArguments, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeJvmInfo}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeJvmInfo build() {
+            _checkSingleUse();
+
+            return new NodeJvmInfo(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeJvmInfo}
+     */
+    public static final JsonpDeserializer<NodeJvmInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeJvmInfo::setupNodeJvmInfoDeserializer
+    );
+
+    protected static void setupNodeJvmInfoDeserializer(ObjectDeserializer<NodeJvmInfo.Builder> op) {
+
+        op.add(Builder::gcCollectors, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "gc_collectors");
+        op.add(Builder::mem, NodeInfoJvmMemory._DESERIALIZER, "mem");
+        op.add(Builder::memoryPools, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "memory_pools");
+        op.add(Builder::pid, JsonpDeserializer.integerDeserializer(), "pid");
+        op.add(Builder::startTimeInMillis, JsonpDeserializer.longDeserializer(), "start_time_in_millis");
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
+        op.add(Builder::vmName, JsonpDeserializer.stringDeserializer(), "vm_name");
+        op.add(Builder::vmVendor, JsonpDeserializer.stringDeserializer(), "vm_vendor");
+        op.add(Builder::vmVersion, JsonpDeserializer.stringDeserializer(), "vm_version");
+        op.add(Builder::bundledJdk, JsonpDeserializer.booleanDeserializer(), "bundled_jdk");
+        op.add(Builder::usingBundledJdk, JsonpDeserializer.booleanDeserializer(), "using_bundled_jdk");
+        op.add(
+            Builder::usingCompressedOrdinaryObjectPointers,
+            JsonpDeserializer.booleanDeserializer(),
+            "using_compressed_ordinary_object_pointers"
+        );
+        op.add(Builder::inputArguments, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "input_arguments");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeOperatingSystemInfo.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeOperatingSystemInfo.java
index 73f8dd3c5e..64580d0958 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeOperatingSystemInfo.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeOperatingSystemInfo.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,382 +44,378 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: nodes.info.NodeOperatingSystemInfo
 
 @JsonpDeserializable
 public class NodeOperatingSystemInfo implements JsonpSerializable {
-	private final String arch;
-
-	private final int availableProcessors;
-
-	@Nullable
-	private final Integer allocatedProcessors;
-
-	private final String name;
-
-	private final String prettyName;
-
-	private final int refreshIntervalInMillis;
-
-	private final String version;
-
-	@Nullable
-	private final NodeInfoOSCPU cpu;
-
-	@Nullable
-	private final NodeInfoMemory mem;
-
-	@Nullable
-	private final NodeInfoMemory swap;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeOperatingSystemInfo(Builder builder) {
-
-		this.arch = ApiTypeHelper.requireNonNull(builder.arch, this, "arch");
-		this.availableProcessors = ApiTypeHelper.requireNonNull(builder.availableProcessors, this,
-				"availableProcessors");
-		this.allocatedProcessors = builder.allocatedProcessors;
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.prettyName = ApiTypeHelper.requireNonNull(builder.prettyName, this, "prettyName");
-		this.refreshIntervalInMillis = ApiTypeHelper.requireNonNull(builder.refreshIntervalInMillis, this,
-				"refreshIntervalInMillis");
-		this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
-		this.cpu = builder.cpu;
-		this.mem = builder.mem;
-		this.swap = builder.swap;
-
-	}
-
-	public static NodeOperatingSystemInfo of(Function<Builder, ObjectBuilder<NodeOperatingSystemInfo>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Name of the JVM architecture (ex: amd64, x86)
-	 * <p>
-	 * API name: {@code arch}
-	 */
-	public final String arch() {
-		return this.arch;
-	}
-
-	/**
-	 * Required - Number of processors available to the Java virtual machine
-	 * <p>
-	 * API name: {@code available_processors}
-	 */
-	public final int availableProcessors() {
-		return this.availableProcessors;
-	}
-
-	/**
-	 * The number of processors actually used to calculate thread pool size. This
-	 * number can be set with the node.processors setting of a node and defaults to
-	 * the number of processors reported by the OS.
-	 * <p>
-	 * API name: {@code allocated_processors}
-	 */
-	@Nullable
-	public final Integer allocatedProcessors() {
-		return this.allocatedProcessors;
-	}
-
-	/**
-	 * Required - Name of the operating system (ex: Linux, Windows, Mac OS X)
-	 * <p>
-	 * API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Required - API name: {@code pretty_name}
-	 */
-	public final String prettyName() {
-		return this.prettyName;
-	}
-
-	/**
-	 * Required - Refresh interval for the OS statistics
-	 * <p>
-	 * API name: {@code refresh_interval_in_millis}
-	 */
-	public final int refreshIntervalInMillis() {
-		return this.refreshIntervalInMillis;
-	}
-
-	/**
-	 * Required - Version of the operating system
-	 * <p>
-	 * API name: {@code version}
-	 */
-	public final String version() {
-		return this.version;
-	}
-
-	/**
-	 * API name: {@code cpu}
-	 */
-	@Nullable
-	public final NodeInfoOSCPU cpu() {
-		return this.cpu;
-	}
-
-	/**
-	 * API name: {@code mem}
-	 */
-	@Nullable
-	public final NodeInfoMemory mem() {
-		return this.mem;
-	}
-
-	/**
-	 * API name: {@code swap}
-	 */
-	@Nullable
-	public final NodeInfoMemory swap() {
-		return this.swap;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("arch");
-		generator.write(this.arch);
-
-		generator.writeKey("available_processors");
-		generator.write(this.availableProcessors);
-
-		if (this.allocatedProcessors != null) {
-			generator.writeKey("allocated_processors");
-			generator.write(this.allocatedProcessors);
-
-		}
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		generator.writeKey("pretty_name");
-		generator.write(this.prettyName);
-
-		generator.writeKey("refresh_interval_in_millis");
-		generator.write(this.refreshIntervalInMillis);
-
-		generator.writeKey("version");
-		generator.write(this.version);
-
-		if (this.cpu != null) {
-			generator.writeKey("cpu");
-			this.cpu.serialize(generator, mapper);
-
-		}
-		if (this.mem != null) {
-			generator.writeKey("mem");
-			this.mem.serialize(generator, mapper);
-
-		}
-		if (this.swap != null) {
-			generator.writeKey("swap");
-			this.swap.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeOperatingSystemInfo}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeOperatingSystemInfo> {
-		private String arch;
-
-		private Integer availableProcessors;
-
-		@Nullable
-		private Integer allocatedProcessors;
-
-		private String name;
-
-		private String prettyName;
-
-		private Integer refreshIntervalInMillis;
-
-		private String version;
-
-		@Nullable
-		private NodeInfoOSCPU cpu;
-
-		@Nullable
-		private NodeInfoMemory mem;
-
-		@Nullable
-		private NodeInfoMemory swap;
-
-		/**
-		 * Required - Name of the JVM architecture (ex: amd64, x86)
-		 * <p>
-		 * API name: {@code arch}
-		 */
-		public final Builder arch(String value) {
-			this.arch = value;
-			return this;
-		}
-
-		/**
-		 * Required - Number of processors available to the Java virtual machine
-		 * <p>
-		 * API name: {@code available_processors}
-		 */
-		public final Builder availableProcessors(int value) {
-			this.availableProcessors = value;
-			return this;
-		}
-
-		/**
-		 * The number of processors actually used to calculate thread pool size. This
-		 * number can be set with the node.processors setting of a node and defaults to
-		 * the number of processors reported by the OS.
-		 * <p>
-		 * API name: {@code allocated_processors}
-		 */
-		public final Builder allocatedProcessors(@Nullable Integer value) {
-			this.allocatedProcessors = value;
-			return this;
-		}
-
-		/**
-		 * Required - Name of the operating system (ex: Linux, Windows, Mac OS X)
-		 * <p>
-		 * API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code pretty_name}
-		 */
-		public final Builder prettyName(String value) {
-			this.prettyName = value;
-			return this;
-		}
-
-		/**
-		 * Required - Refresh interval for the OS statistics
-		 * <p>
-		 * API name: {@code refresh_interval_in_millis}
-		 */
-		public final Builder refreshIntervalInMillis(int value) {
-			this.refreshIntervalInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - Version of the operating system
-		 * <p>
-		 * API name: {@code version}
-		 */
-		public final Builder version(String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code cpu}
-		 */
-		public final Builder cpu(@Nullable NodeInfoOSCPU value) {
-			this.cpu = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code cpu}
-		 */
-		public final Builder cpu(Function<NodeInfoOSCPU.Builder, ObjectBuilder<NodeInfoOSCPU>> fn) {
-			return this.cpu(fn.apply(new NodeInfoOSCPU.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code mem}
-		 */
-		public final Builder mem(@Nullable NodeInfoMemory value) {
-			this.mem = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code mem}
-		 */
-		public final Builder mem(Function<NodeInfoMemory.Builder, ObjectBuilder<NodeInfoMemory>> fn) {
-			return this.mem(fn.apply(new NodeInfoMemory.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code swap}
-		 */
-		public final Builder swap(@Nullable NodeInfoMemory value) {
-			this.swap = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code swap}
-		 */
-		public final Builder swap(Function<NodeInfoMemory.Builder, ObjectBuilder<NodeInfoMemory>> fn) {
-			return this.swap(fn.apply(new NodeInfoMemory.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link NodeOperatingSystemInfo}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeOperatingSystemInfo build() {
-			_checkSingleUse();
-
-			return new NodeOperatingSystemInfo(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeOperatingSystemInfo}
-	 */
-	public static final JsonpDeserializer<NodeOperatingSystemInfo> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeOperatingSystemInfo::setupNodeOperatingSystemInfoDeserializer);
-
-	protected static void setupNodeOperatingSystemInfoDeserializer(
-			ObjectDeserializer<NodeOperatingSystemInfo.Builder> op) {
-
-		op.add(Builder::arch, JsonpDeserializer.stringDeserializer(), "arch");
-		op.add(Builder::availableProcessors, JsonpDeserializer.integerDeserializer(), "available_processors");
-		op.add(Builder::allocatedProcessors, JsonpDeserializer.integerDeserializer(), "allocated_processors");
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::prettyName, JsonpDeserializer.stringDeserializer(), "pretty_name");
-		op.add(Builder::refreshIntervalInMillis, JsonpDeserializer.integerDeserializer(), "refresh_interval_in_millis");
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
-		op.add(Builder::cpu, NodeInfoOSCPU._DESERIALIZER, "cpu");
-		op.add(Builder::mem, NodeInfoMemory._DESERIALIZER, "mem");
-		op.add(Builder::swap, NodeInfoMemory._DESERIALIZER, "swap");
-
-	}
+    private final String arch;
+
+    private final int availableProcessors;
+
+    @Nullable
+    private final Integer allocatedProcessors;
+
+    private final String name;
+
+    private final String prettyName;
+
+    private final int refreshIntervalInMillis;
+
+    private final String version;
+
+    @Nullable
+    private final NodeInfoOSCPU cpu;
+
+    @Nullable
+    private final NodeInfoMemory mem;
+
+    @Nullable
+    private final NodeInfoMemory swap;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeOperatingSystemInfo(Builder builder) {
+
+        this.arch = ApiTypeHelper.requireNonNull(builder.arch, this, "arch");
+        this.availableProcessors = ApiTypeHelper.requireNonNull(builder.availableProcessors, this, "availableProcessors");
+        this.allocatedProcessors = builder.allocatedProcessors;
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.prettyName = ApiTypeHelper.requireNonNull(builder.prettyName, this, "prettyName");
+        this.refreshIntervalInMillis = ApiTypeHelper.requireNonNull(builder.refreshIntervalInMillis, this, "refreshIntervalInMillis");
+        this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
+        this.cpu = builder.cpu;
+        this.mem = builder.mem;
+        this.swap = builder.swap;
+
+    }
+
+    public static NodeOperatingSystemInfo of(Function<Builder, ObjectBuilder<NodeOperatingSystemInfo>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Name of the JVM architecture (ex: amd64, x86)
+     * <p>
+     * API name: {@code arch}
+     */
+    public final String arch() {
+        return this.arch;
+    }
+
+    /**
+     * Required - Number of processors available to the Java virtual machine
+     * <p>
+     * API name: {@code available_processors}
+     */
+    public final int availableProcessors() {
+        return this.availableProcessors;
+    }
+
+    /**
+     * The number of processors actually used to calculate thread pool size. This
+     * number can be set with the node.processors setting of a node and defaults to
+     * the number of processors reported by the OS.
+     * <p>
+     * API name: {@code allocated_processors}
+     */
+    @Nullable
+    public final Integer allocatedProcessors() {
+        return this.allocatedProcessors;
+    }
+
+    /**
+     * Required - Name of the operating system (ex: Linux, Windows, Mac OS X)
+     * <p>
+     * API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Required - API name: {@code pretty_name}
+     */
+    public final String prettyName() {
+        return this.prettyName;
+    }
+
+    /**
+     * Required - Refresh interval for the OS statistics
+     * <p>
+     * API name: {@code refresh_interval_in_millis}
+     */
+    public final int refreshIntervalInMillis() {
+        return this.refreshIntervalInMillis;
+    }
+
+    /**
+     * Required - Version of the operating system
+     * <p>
+     * API name: {@code version}
+     */
+    public final String version() {
+        return this.version;
+    }
+
+    /**
+     * API name: {@code cpu}
+     */
+    @Nullable
+    public final NodeInfoOSCPU cpu() {
+        return this.cpu;
+    }
+
+    /**
+     * API name: {@code mem}
+     */
+    @Nullable
+    public final NodeInfoMemory mem() {
+        return this.mem;
+    }
+
+    /**
+     * API name: {@code swap}
+     */
+    @Nullable
+    public final NodeInfoMemory swap() {
+        return this.swap;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("arch");
+        generator.write(this.arch);
+
+        generator.writeKey("available_processors");
+        generator.write(this.availableProcessors);
+
+        if (this.allocatedProcessors != null) {
+            generator.writeKey("allocated_processors");
+            generator.write(this.allocatedProcessors);
+
+        }
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        generator.writeKey("pretty_name");
+        generator.write(this.prettyName);
+
+        generator.writeKey("refresh_interval_in_millis");
+        generator.write(this.refreshIntervalInMillis);
+
+        generator.writeKey("version");
+        generator.write(this.version);
+
+        if (this.cpu != null) {
+            generator.writeKey("cpu");
+            this.cpu.serialize(generator, mapper);
+
+        }
+        if (this.mem != null) {
+            generator.writeKey("mem");
+            this.mem.serialize(generator, mapper);
+
+        }
+        if (this.swap != null) {
+            generator.writeKey("swap");
+            this.swap.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeOperatingSystemInfo}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeOperatingSystemInfo> {
+        private String arch;
+
+        private Integer availableProcessors;
+
+        @Nullable
+        private Integer allocatedProcessors;
+
+        private String name;
+
+        private String prettyName;
+
+        private Integer refreshIntervalInMillis;
+
+        private String version;
+
+        @Nullable
+        private NodeInfoOSCPU cpu;
+
+        @Nullable
+        private NodeInfoMemory mem;
+
+        @Nullable
+        private NodeInfoMemory swap;
+
+        /**
+         * Required - Name of the JVM architecture (ex: amd64, x86)
+         * <p>
+         * API name: {@code arch}
+         */
+        public final Builder arch(String value) {
+            this.arch = value;
+            return this;
+        }
+
+        /**
+         * Required - Number of processors available to the Java virtual machine
+         * <p>
+         * API name: {@code available_processors}
+         */
+        public final Builder availableProcessors(int value) {
+            this.availableProcessors = value;
+            return this;
+        }
+
+        /**
+         * The number of processors actually used to calculate thread pool size. This
+         * number can be set with the node.processors setting of a node and defaults to
+         * the number of processors reported by the OS.
+         * <p>
+         * API name: {@code allocated_processors}
+         */
+        public final Builder allocatedProcessors(@Nullable Integer value) {
+            this.allocatedProcessors = value;
+            return this;
+        }
+
+        /**
+         * Required - Name of the operating system (ex: Linux, Windows, Mac OS X)
+         * <p>
+         * API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code pretty_name}
+         */
+        public final Builder prettyName(String value) {
+            this.prettyName = value;
+            return this;
+        }
+
+        /**
+         * Required - Refresh interval for the OS statistics
+         * <p>
+         * API name: {@code refresh_interval_in_millis}
+         */
+        public final Builder refreshIntervalInMillis(int value) {
+            this.refreshIntervalInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - Version of the operating system
+         * <p>
+         * API name: {@code version}
+         */
+        public final Builder version(String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code cpu}
+         */
+        public final Builder cpu(@Nullable NodeInfoOSCPU value) {
+            this.cpu = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code cpu}
+         */
+        public final Builder cpu(Function<NodeInfoOSCPU.Builder, ObjectBuilder<NodeInfoOSCPU>> fn) {
+            return this.cpu(fn.apply(new NodeInfoOSCPU.Builder()).build());
+        }
+
+        /**
+         * API name: {@code mem}
+         */
+        public final Builder mem(@Nullable NodeInfoMemory value) {
+            this.mem = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code mem}
+         */
+        public final Builder mem(Function<NodeInfoMemory.Builder, ObjectBuilder<NodeInfoMemory>> fn) {
+            return this.mem(fn.apply(new NodeInfoMemory.Builder()).build());
+        }
+
+        /**
+         * API name: {@code swap}
+         */
+        public final Builder swap(@Nullable NodeInfoMemory value) {
+            this.swap = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code swap}
+         */
+        public final Builder swap(Function<NodeInfoMemory.Builder, ObjectBuilder<NodeInfoMemory>> fn) {
+            return this.swap(fn.apply(new NodeInfoMemory.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link NodeOperatingSystemInfo}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeOperatingSystemInfo build() {
+            _checkSingleUse();
+
+            return new NodeOperatingSystemInfo(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeOperatingSystemInfo}
+     */
+    public static final JsonpDeserializer<NodeOperatingSystemInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeOperatingSystemInfo::setupNodeOperatingSystemInfoDeserializer
+    );
+
+    protected static void setupNodeOperatingSystemInfoDeserializer(ObjectDeserializer<NodeOperatingSystemInfo.Builder> op) {
+
+        op.add(Builder::arch, JsonpDeserializer.stringDeserializer(), "arch");
+        op.add(Builder::availableProcessors, JsonpDeserializer.integerDeserializer(), "available_processors");
+        op.add(Builder::allocatedProcessors, JsonpDeserializer.integerDeserializer(), "allocated_processors");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::prettyName, JsonpDeserializer.stringDeserializer(), "pretty_name");
+        op.add(Builder::refreshIntervalInMillis, JsonpDeserializer.integerDeserializer(), "refresh_interval_in_millis");
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
+        op.add(Builder::cpu, NodeInfoOSCPU._DESERIALIZER, "cpu");
+        op.add(Builder::mem, NodeInfoMemory._DESERIALIZER, "mem");
+        op.add(Builder::swap, NodeInfoMemory._DESERIALIZER, "swap");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeProcessInfo.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeProcessInfo.java
index 1f76a49feb..4cb6e5eb2f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeProcessInfo.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeProcessInfo.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,155 +43,154 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes.info.NodeProcessInfo
 
 @JsonpDeserializable
 public class NodeProcessInfo implements JsonpSerializable {
-	private final long id;
-
-	private final boolean mlockall;
-
-	private final long refreshIntervalInMillis;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeProcessInfo(Builder builder) {
-
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.mlockall = ApiTypeHelper.requireNonNull(builder.mlockall, this, "mlockall");
-		this.refreshIntervalInMillis = ApiTypeHelper.requireNonNull(builder.refreshIntervalInMillis, this,
-				"refreshIntervalInMillis");
-
-	}
-
-	public static NodeProcessInfo of(Function<Builder, ObjectBuilder<NodeProcessInfo>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Process identifier (PID)
-	 * <p>
-	 * API name: {@code id}
-	 */
-	public final long id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - Indicates if the process address space has been successfully
-	 * locked in memory
-	 * <p>
-	 * API name: {@code mlockall}
-	 */
-	public final boolean mlockall() {
-		return this.mlockall;
-	}
-
-	/**
-	 * Required - Refresh interval for the process statistics
-	 * <p>
-	 * API name: {@code refresh_interval_in_millis}
-	 */
-	public final long refreshIntervalInMillis() {
-		return this.refreshIntervalInMillis;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("id");
-		generator.write(this.id);
-
-		generator.writeKey("mlockall");
-		generator.write(this.mlockall);
-
-		generator.writeKey("refresh_interval_in_millis");
-		generator.write(this.refreshIntervalInMillis);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeProcessInfo}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeProcessInfo> {
-		private Long id;
-
-		private Boolean mlockall;
-
-		private Long refreshIntervalInMillis;
-
-		/**
-		 * Required - Process identifier (PID)
-		 * <p>
-		 * API name: {@code id}
-		 */
-		public final Builder id(long value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - Indicates if the process address space has been successfully
-		 * locked in memory
-		 * <p>
-		 * API name: {@code mlockall}
-		 */
-		public final Builder mlockall(boolean value) {
-			this.mlockall = value;
-			return this;
-		}
-
-		/**
-		 * Required - Refresh interval for the process statistics
-		 * <p>
-		 * API name: {@code refresh_interval_in_millis}
-		 */
-		public final Builder refreshIntervalInMillis(long value) {
-			this.refreshIntervalInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeProcessInfo}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeProcessInfo build() {
-			_checkSingleUse();
-
-			return new NodeProcessInfo(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeProcessInfo}
-	 */
-	public static final JsonpDeserializer<NodeProcessInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeProcessInfo::setupNodeProcessInfoDeserializer);
-
-	protected static void setupNodeProcessInfoDeserializer(ObjectDeserializer<NodeProcessInfo.Builder> op) {
-
-		op.add(Builder::id, JsonpDeserializer.longDeserializer(), "id");
-		op.add(Builder::mlockall, JsonpDeserializer.booleanDeserializer(), "mlockall");
-		op.add(Builder::refreshIntervalInMillis, JsonpDeserializer.longDeserializer(), "refresh_interval_in_millis");
-
-	}
+    private final long id;
+
+    private final boolean mlockall;
+
+    private final long refreshIntervalInMillis;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeProcessInfo(Builder builder) {
+
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.mlockall = ApiTypeHelper.requireNonNull(builder.mlockall, this, "mlockall");
+        this.refreshIntervalInMillis = ApiTypeHelper.requireNonNull(builder.refreshIntervalInMillis, this, "refreshIntervalInMillis");
+
+    }
+
+    public static NodeProcessInfo of(Function<Builder, ObjectBuilder<NodeProcessInfo>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Process identifier (PID)
+     * <p>
+     * API name: {@code id}
+     */
+    public final long id() {
+        return this.id;
+    }
+
+    /**
+     * Required - Indicates if the process address space has been successfully
+     * locked in memory
+     * <p>
+     * API name: {@code mlockall}
+     */
+    public final boolean mlockall() {
+        return this.mlockall;
+    }
+
+    /**
+     * Required - Refresh interval for the process statistics
+     * <p>
+     * API name: {@code refresh_interval_in_millis}
+     */
+    public final long refreshIntervalInMillis() {
+        return this.refreshIntervalInMillis;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("id");
+        generator.write(this.id);
+
+        generator.writeKey("mlockall");
+        generator.write(this.mlockall);
+
+        generator.writeKey("refresh_interval_in_millis");
+        generator.write(this.refreshIntervalInMillis);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeProcessInfo}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeProcessInfo> {
+        private Long id;
+
+        private Boolean mlockall;
+
+        private Long refreshIntervalInMillis;
+
+        /**
+         * Required - Process identifier (PID)
+         * <p>
+         * API name: {@code id}
+         */
+        public final Builder id(long value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - Indicates if the process address space has been successfully
+         * locked in memory
+         * <p>
+         * API name: {@code mlockall}
+         */
+        public final Builder mlockall(boolean value) {
+            this.mlockall = value;
+            return this;
+        }
+
+        /**
+         * Required - Refresh interval for the process statistics
+         * <p>
+         * API name: {@code refresh_interval_in_millis}
+         */
+        public final Builder refreshIntervalInMillis(long value) {
+            this.refreshIntervalInMillis = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeProcessInfo}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeProcessInfo build() {
+            _checkSingleUse();
+
+            return new NodeProcessInfo(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeProcessInfo}
+     */
+    public static final JsonpDeserializer<NodeProcessInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeProcessInfo::setupNodeProcessInfoDeserializer
+    );
+
+    protected static void setupNodeProcessInfoDeserializer(ObjectDeserializer<NodeProcessInfo.Builder> op) {
+
+        op.add(Builder::id, JsonpDeserializer.longDeserializer(), "id");
+        op.add(Builder::mlockall, JsonpDeserializer.booleanDeserializer(), "mlockall");
+        op.add(Builder::refreshIntervalInMillis, JsonpDeserializer.longDeserializer(), "refresh_interval_in_millis");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeThreadPoolInfo.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeThreadPoolInfo.java
index d851e09af4..d037587798 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeThreadPoolInfo.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeThreadPoolInfo.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.nodes.info;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,233 +44,232 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: nodes.info.NodeThreadPoolInfo
 
 @JsonpDeserializable
 public class NodeThreadPoolInfo implements JsonpSerializable {
-	@Nullable
-	private final Integer core;
-
-	@Nullable
-	private final String keepAlive;
-
-	@Nullable
-	private final Integer max;
-
-	private final int queueSize;
-
-	@Nullable
-	private final Integer size;
-
-	private final String type;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeThreadPoolInfo(Builder builder) {
-
-		this.core = builder.core;
-		this.keepAlive = builder.keepAlive;
-		this.max = builder.max;
-		this.queueSize = ApiTypeHelper.requireNonNull(builder.queueSize, this, "queueSize");
-		this.size = builder.size;
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-
-	}
-
-	public static NodeThreadPoolInfo of(Function<Builder, ObjectBuilder<NodeThreadPoolInfo>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code core}
-	 */
-	@Nullable
-	public final Integer core() {
-		return this.core;
-	}
-
-	/**
-	 * API name: {@code keep_alive}
-	 */
-	@Nullable
-	public final String keepAlive() {
-		return this.keepAlive;
-	}
-
-	/**
-	 * API name: {@code max}
-	 */
-	@Nullable
-	public final Integer max() {
-		return this.max;
-	}
-
-	/**
-	 * Required - API name: {@code queue_size}
-	 */
-	public final int queueSize() {
-		return this.queueSize;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final Integer size() {
-		return this.size;
-	}
-
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.core != null) {
-			generator.writeKey("core");
-			generator.write(this.core);
-
-		}
-		if (this.keepAlive != null) {
-			generator.writeKey("keep_alive");
-			generator.write(this.keepAlive);
-
-		}
-		if (this.max != null) {
-			generator.writeKey("max");
-			generator.write(this.max);
-
-		}
-		generator.writeKey("queue_size");
-		generator.write(this.queueSize);
-
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		generator.writeKey("type");
-		generator.write(this.type);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeThreadPoolInfo}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeThreadPoolInfo> {
-		@Nullable
-		private Integer core;
-
-		@Nullable
-		private String keepAlive;
-
-		@Nullable
-		private Integer max;
-
-		private Integer queueSize;
-
-		@Nullable
-		private Integer size;
-
-		private String type;
-
-		/**
-		 * API name: {@code core}
-		 */
-		public final Builder core(@Nullable Integer value) {
-			this.core = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code keep_alive}
-		 */
-		public final Builder keepAlive(@Nullable String value) {
-			this.keepAlive = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code max}
-		 */
-		public final Builder max(@Nullable Integer value) {
-			this.max = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code queue_size}
-		 */
-		public final Builder queueSize(int value) {
-			this.queueSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable Integer value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeThreadPoolInfo}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeThreadPoolInfo build() {
-			_checkSingleUse();
-
-			return new NodeThreadPoolInfo(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeThreadPoolInfo}
-	 */
-	public static final JsonpDeserializer<NodeThreadPoolInfo> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeThreadPoolInfo::setupNodeThreadPoolInfoDeserializer);
-
-	protected static void setupNodeThreadPoolInfoDeserializer(ObjectDeserializer<NodeThreadPoolInfo.Builder> op) {
-
-		op.add(Builder::core, JsonpDeserializer.integerDeserializer(), "core");
-		op.add(Builder::keepAlive, JsonpDeserializer.stringDeserializer(), "keep_alive");
-		op.add(Builder::max, JsonpDeserializer.integerDeserializer(), "max");
-		op.add(Builder::queueSize, JsonpDeserializer.integerDeserializer(), "queue_size");
-		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-
-	}
+    @Nullable
+    private final Integer core;
+
+    @Nullable
+    private final String keepAlive;
+
+    @Nullable
+    private final Integer max;
+
+    private final int queueSize;
+
+    @Nullable
+    private final Integer size;
+
+    private final String type;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeThreadPoolInfo(Builder builder) {
+
+        this.core = builder.core;
+        this.keepAlive = builder.keepAlive;
+        this.max = builder.max;
+        this.queueSize = ApiTypeHelper.requireNonNull(builder.queueSize, this, "queueSize");
+        this.size = builder.size;
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+
+    }
+
+    public static NodeThreadPoolInfo of(Function<Builder, ObjectBuilder<NodeThreadPoolInfo>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code core}
+     */
+    @Nullable
+    public final Integer core() {
+        return this.core;
+    }
+
+    /**
+     * API name: {@code keep_alive}
+     */
+    @Nullable
+    public final String keepAlive() {
+        return this.keepAlive;
+    }
+
+    /**
+     * API name: {@code max}
+     */
+    @Nullable
+    public final Integer max() {
+        return this.max;
+    }
+
+    /**
+     * Required - API name: {@code queue_size}
+     */
+    public final int queueSize() {
+        return this.queueSize;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.core != null) {
+            generator.writeKey("core");
+            generator.write(this.core);
+
+        }
+        if (this.keepAlive != null) {
+            generator.writeKey("keep_alive");
+            generator.write(this.keepAlive);
+
+        }
+        if (this.max != null) {
+            generator.writeKey("max");
+            generator.write(this.max);
+
+        }
+        generator.writeKey("queue_size");
+        generator.write(this.queueSize);
+
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        generator.writeKey("type");
+        generator.write(this.type);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeThreadPoolInfo}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeThreadPoolInfo> {
+        @Nullable
+        private Integer core;
+
+        @Nullable
+        private String keepAlive;
+
+        @Nullable
+        private Integer max;
+
+        private Integer queueSize;
+
+        @Nullable
+        private Integer size;
+
+        private String type;
+
+        /**
+         * API name: {@code core}
+         */
+        public final Builder core(@Nullable Integer value) {
+            this.core = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code keep_alive}
+         */
+        public final Builder keepAlive(@Nullable String value) {
+            this.keepAlive = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code max}
+         */
+        public final Builder max(@Nullable Integer value) {
+            this.max = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code queue_size}
+         */
+        public final Builder queueSize(int value) {
+            this.queueSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable Integer value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeThreadPoolInfo}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeThreadPoolInfo build() {
+            _checkSingleUse();
+
+            return new NodeThreadPoolInfo(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeThreadPoolInfo}
+     */
+    public static final JsonpDeserializer<NodeThreadPoolInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeThreadPoolInfo::setupNodeThreadPoolInfoDeserializer
+    );
+
+    protected static void setupNodeThreadPoolInfoDeserializer(ObjectDeserializer<NodeThreadPoolInfo.Builder> op) {
+
+        op.add(Builder::core, JsonpDeserializer.integerDeserializer(), "core");
+        op.add(Builder::keepAlive, JsonpDeserializer.stringDeserializer(), "keep_alive");
+        op.add(Builder::max, JsonpDeserializer.integerDeserializer(), "max");
+        op.add(Builder::queueSize, JsonpDeserializer.integerDeserializer(), "queue_size");
+        op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/reload_secure_settings/NodeReloadError.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/reload_secure_settings/NodeReloadError.java
index 0be9bbeaea..c3d05a3028 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/reload_secure_settings/NodeReloadError.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/reload_secure_settings/NodeReloadError.java
@@ -32,140 +32,142 @@
 
 package org.opensearch.client.opensearch.nodes.reload_secure_settings;
 
-import org.opensearch.client.opensearch._types.ErrorCause;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorCause;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: nodes.reload_secure_settings.NodeReloadError
 
 @JsonpDeserializable
 public class NodeReloadError implements JsonpSerializable {
-	private final String name;
-
-	@Nullable
-	private final ErrorCause reloadException;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeReloadError(Builder builder) {
-
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.reloadException = builder.reloadException;
-
-	}
-
-	public static NodeReloadError of(Function<Builder, ObjectBuilder<NodeReloadError>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * API name: {@code reload_exception}
-	 */
-	@Nullable
-	public final ErrorCause reloadException() {
-		return this.reloadException;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("name");
-		generator.write(this.name);
-
-		if (this.reloadException != null) {
-			generator.writeKey("reload_exception");
-			this.reloadException.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeReloadError}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeReloadError> {
-		private String name;
-
-		@Nullable
-		private ErrorCause reloadException;
-
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code reload_exception}
-		 */
-		public final Builder reloadException(@Nullable ErrorCause value) {
-			this.reloadException = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code reload_exception}
-		 */
-		public final Builder reloadException(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
-			return this.reloadException(fn.apply(new ErrorCause.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link NodeReloadError}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeReloadError build() {
-			_checkSingleUse();
-
-			return new NodeReloadError(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeReloadError}
-	 */
-	public static final JsonpDeserializer<NodeReloadError> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeReloadError::setupNodeReloadErrorDeserializer);
-
-	protected static void setupNodeReloadErrorDeserializer(ObjectDeserializer<NodeReloadError.Builder> op) {
-
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::reloadException, ErrorCause._DESERIALIZER, "reload_exception");
-
-	}
+    private final String name;
+
+    @Nullable
+    private final ErrorCause reloadException;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeReloadError(Builder builder) {
+
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.reloadException = builder.reloadException;
+
+    }
+
+    public static NodeReloadError of(Function<Builder, ObjectBuilder<NodeReloadError>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * API name: {@code reload_exception}
+     */
+    @Nullable
+    public final ErrorCause reloadException() {
+        return this.reloadException;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("name");
+        generator.write(this.name);
+
+        if (this.reloadException != null) {
+            generator.writeKey("reload_exception");
+            this.reloadException.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeReloadError}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeReloadError> {
+        private String name;
+
+        @Nullable
+        private ErrorCause reloadException;
+
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code reload_exception}
+         */
+        public final Builder reloadException(@Nullable ErrorCause value) {
+            this.reloadException = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code reload_exception}
+         */
+        public final Builder reloadException(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
+            return this.reloadException(fn.apply(new ErrorCause.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link NodeReloadError}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeReloadError build() {
+            _checkSingleUse();
+
+            return new NodeReloadError(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeReloadError}
+     */
+    public static final JsonpDeserializer<NodeReloadError> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeReloadError::setupNodeReloadErrorDeserializer
+    );
+
+    protected static void setupNodeReloadErrorDeserializer(ObjectDeserializer<NodeReloadError.Builder> op) {
+
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::reloadException, ErrorCause._DESERIALIZER, "reload_exception");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/reload_secure_settings/NodeReloadResult.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/reload_secure_settings/NodeReloadResult.java
index 02581b4f34..52b57e741e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/reload_secure_settings/NodeReloadResult.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/reload_secure_settings/NodeReloadResult.java
@@ -32,139 +32,141 @@
 
 package org.opensearch.client.opensearch.nodes.reload_secure_settings;
 
-import org.opensearch.client.opensearch.nodes.Stats;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.UnionDeserializer;
+import org.opensearch.client.opensearch.nodes.Stats;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: nodes.reload_secure_settings.NodeReloadResult
 
 @JsonpDeserializable
 public class NodeReloadResult implements TaggedUnion<NodeReloadResult.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Stats, Error
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private NodeReloadResult(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	private NodeReloadResult(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static NodeReloadResult of(Function<Builder, ObjectBuilder<NodeReloadResult>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code stats}?
-	 */
-	public boolean isStats() {
-		return _kind == Kind.Stats;
-	}
-
-	/**
-	 * Get the {@code stats} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code stats} kind.
-	 */
-	public Stats stats() {
-		return TaggedUnionUtils.get(this, Kind.Stats);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code error}?
-	 */
-	public boolean isError() {
-		return _kind == Kind.Error;
-	}
-
-	/**
-	 * Get the {@code error} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code error} kind.
-	 */
-	public NodeReloadError error() {
-		return TaggedUnionUtils.get(this, Kind.Error);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeReloadResult> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<NodeReloadResult> stats(Stats v) {
-			this._kind = Kind.Stats;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<NodeReloadResult> stats(Function<Stats.Builder, ObjectBuilder<Stats>> fn) {
-			return this.stats(fn.apply(new Stats.Builder()).build());
-		}
-
-		public ObjectBuilder<NodeReloadResult> error(NodeReloadError v) {
-			this._kind = Kind.Error;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<NodeReloadResult> error(
-				Function<NodeReloadError.Builder, ObjectBuilder<NodeReloadError>> fn) {
-			return this.error(fn.apply(new NodeReloadError.Builder()).build());
-		}
-
-		public NodeReloadResult build() {
-			_checkSingleUse();
-			return new NodeReloadResult(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<NodeReloadResult> buildNodeReloadResultDeserializer() {
-		return new UnionDeserializer.Builder<NodeReloadResult, Kind, Object>(NodeReloadResult::new, false)
-				.addMember(Kind.Stats, Stats._DESERIALIZER).addMember(Kind.Error, NodeReloadError._DESERIALIZER)
-				.build();
-	}
-
-	public static final JsonpDeserializer<NodeReloadResult> _DESERIALIZER = JsonpDeserializer
-			.lazy(NodeReloadResult::buildNodeReloadResultDeserializer);
+    public enum Kind {
+        Stats,
+        Error
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private NodeReloadResult(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private NodeReloadResult(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static NodeReloadResult of(Function<Builder, ObjectBuilder<NodeReloadResult>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code stats}?
+     */
+    public boolean isStats() {
+        return _kind == Kind.Stats;
+    }
+
+    /**
+     * Get the {@code stats} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code stats} kind.
+     */
+    public Stats stats() {
+        return TaggedUnionUtils.get(this, Kind.Stats);
+    }
+
+    /**
+     * Is this variant instance of kind {@code error}?
+     */
+    public boolean isError() {
+        return _kind == Kind.Error;
+    }
+
+    /**
+     * Get the {@code error} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code error} kind.
+     */
+    public NodeReloadError error() {
+        return TaggedUnionUtils.get(this, Kind.Error);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeReloadResult> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<NodeReloadResult> stats(Stats v) {
+            this._kind = Kind.Stats;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<NodeReloadResult> stats(Function<Stats.Builder, ObjectBuilder<Stats>> fn) {
+            return this.stats(fn.apply(new Stats.Builder()).build());
+        }
+
+        public ObjectBuilder<NodeReloadResult> error(NodeReloadError v) {
+            this._kind = Kind.Error;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<NodeReloadResult> error(Function<NodeReloadError.Builder, ObjectBuilder<NodeReloadError>> fn) {
+            return this.error(fn.apply(new NodeReloadError.Builder()).build());
+        }
+
+        public NodeReloadResult build() {
+            _checkSingleUse();
+            return new NodeReloadResult(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<NodeReloadResult> buildNodeReloadResultDeserializer() {
+        return new UnionDeserializer.Builder<NodeReloadResult, Kind, Object>(NodeReloadResult::new, false).addMember(
+            Kind.Stats,
+            Stats._DESERIALIZER
+        ).addMember(Kind.Error, NodeReloadError._DESERIALIZER).build();
+    }
+
+    public static final JsonpDeserializer<NodeReloadResult> _DESERIALIZER = JsonpDeserializer.lazy(
+        NodeReloadResult::buildNodeReloadResultDeserializer
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/reload_secure_settings/NodeReloadResultBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/reload_secure_settings/NodeReloadResultBuilders.java
index 51006daac2..298a240f52 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/reload_secure_settings/NodeReloadResultBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/reload_secure_settings/NodeReloadResultBuilders.java
@@ -38,23 +38,22 @@
  * Builders for {@link NodeReloadResult} variants.
  */
 public class NodeReloadResultBuilders {
-	private NodeReloadResultBuilders() {
-	}
-
-	/**
-	 * Creates a builder for the {@link Stats stats} {@code NodeReloadResult}
-	 * variant.
-	 */
-	public static Stats.Builder stats() {
-		return new Stats.Builder();
-	}
-
-	/**
-	 * Creates a builder for the {@link NodeReloadError error}
-	 * {@code NodeReloadResult} variant.
-	 */
-	public static NodeReloadError.Builder error() {
-		return new NodeReloadError.Builder();
-	}
+    private NodeReloadResultBuilders() {}
+
+    /**
+     * Creates a builder for the {@link Stats stats} {@code NodeReloadResult}
+     * variant.
+     */
+    public static Stats.Builder stats() {
+        return new Stats.Builder();
+    }
+
+    /**
+     * Creates a builder for the {@link NodeReloadError error}
+     * {@code NodeReloadResult} variant.
+     */
+    public static NodeReloadError.Builder error() {
+        return new NodeReloadError.Builder();
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/usage/NodeUsage.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/usage/NodeUsage.java
index bd5511bfba..09095b3d3b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/usage/NodeUsage.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/usage/NodeUsage.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.nodes.usage;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,207 +45,205 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: nodes.usage.NodeUsage
 
 @JsonpDeserializable
 public class NodeUsage implements JsonpSerializable {
-	private final Map<String, Integer> restActions;
+    private final Map<String, Integer> restActions;
 
-	private final String since;
+    private final String since;
 
-	private final String timestamp;
+    private final String timestamp;
 
-	private final Map<String, JsonData> aggregations;
+    private final Map<String, JsonData> aggregations;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private NodeUsage(Builder builder) {
+    private NodeUsage(Builder builder) {
 
-		this.restActions = ApiTypeHelper.unmodifiableRequired(builder.restActions, this, "restActions");
-		this.since = ApiTypeHelper.requireNonNull(builder.since, this, "since");
-		this.timestamp = ApiTypeHelper.requireNonNull(builder.timestamp, this, "timestamp");
-		this.aggregations = ApiTypeHelper.unmodifiableRequired(builder.aggregations, this, "aggregations");
+        this.restActions = ApiTypeHelper.unmodifiableRequired(builder.restActions, this, "restActions");
+        this.since = ApiTypeHelper.requireNonNull(builder.since, this, "since");
+        this.timestamp = ApiTypeHelper.requireNonNull(builder.timestamp, this, "timestamp");
+        this.aggregations = ApiTypeHelper.unmodifiableRequired(builder.aggregations, this, "aggregations");
 
-	}
+    }
 
-	public static NodeUsage of(Function<Builder, ObjectBuilder<NodeUsage>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static NodeUsage of(Function<Builder, ObjectBuilder<NodeUsage>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code rest_actions}
-	 */
-	public final Map<String, Integer> restActions() {
-		return this.restActions;
-	}
-
-	/**
-	 * Required - API name: {@code since}
-	 */
-	public final String since() {
-		return this.since;
-	}
-
-	/**
-	 * Required - API name: {@code timestamp}
-	 */
-	public final String timestamp() {
-		return this.timestamp;
-	}
-
-	/**
-	 * Required - API name: {@code aggregations}
-	 */
-	public final Map<String, JsonData> aggregations() {
-		return this.aggregations;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.restActions)) {
-			generator.writeKey("rest_actions");
-			generator.writeStartObject();
-			for (Map.Entry<String, Integer> item0 : this.restActions.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.write(item0.getValue());
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("since");
-		generator.write(this.since);
-
-		generator.writeKey("timestamp");
-		generator.write(this.timestamp);
-
-		if (ApiTypeHelper.isDefined(this.aggregations)) {
-			generator.writeKey("aggregations");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.aggregations.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeUsage}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeUsage> {
-		private Map<String, Integer> restActions;
-
-		private String since;
-
-		private String timestamp;
-
-		private Map<String, JsonData> aggregations;
-
-		/**
-		 * Required - API name: {@code rest_actions}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>restActions</code>.
-		 */
-		public final Builder restActions(Map<String, Integer> map) {
-			this.restActions = _mapPutAll(this.restActions, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code rest_actions}
-		 * <p>
-		 * Adds an entry to <code>restActions</code>.
-		 */
-		public final Builder restActions(String key, Integer value) {
-			this.restActions = _mapPut(this.restActions, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code since}
-		 */
-		public final Builder since(String value) {
-			this.since = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code timestamp}
-		 */
-		public final Builder timestamp(String value) {
-			this.timestamp = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code aggregations}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>aggregations</code>.
-		 */
-		public final Builder aggregations(Map<String, JsonData> map) {
-			this.aggregations = _mapPutAll(this.aggregations, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code aggregations}
-		 * <p>
-		 * Adds an entry to <code>aggregations</code>.
-		 */
-		public final Builder aggregations(String key, JsonData value) {
-			this.aggregations = _mapPut(this.aggregations, key, value);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link NodeUsage}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeUsage build() {
-			_checkSingleUse();
-
-			return new NodeUsage(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeUsage}
-	 */
-	public static final JsonpDeserializer<NodeUsage> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			NodeUsage::setupNodeUsageDeserializer);
-
-	protected static void setupNodeUsageDeserializer(ObjectDeserializer<NodeUsage.Builder> op) {
-
-		op.add(Builder::restActions, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.integerDeserializer()),
-				"rest_actions");
-		op.add(Builder::since, JsonpDeserializer.stringDeserializer(), "since");
-		op.add(Builder::timestamp, JsonpDeserializer.stringDeserializer(), "timestamp");
-		op.add(Builder::aggregations, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "aggregations");
-
-	}
+    /**
+     * Required - API name: {@code rest_actions}
+     */
+    public final Map<String, Integer> restActions() {
+        return this.restActions;
+    }
+
+    /**
+     * Required - API name: {@code since}
+     */
+    public final String since() {
+        return this.since;
+    }
+
+    /**
+     * Required - API name: {@code timestamp}
+     */
+    public final String timestamp() {
+        return this.timestamp;
+    }
+
+    /**
+     * Required - API name: {@code aggregations}
+     */
+    public final Map<String, JsonData> aggregations() {
+        return this.aggregations;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.restActions)) {
+            generator.writeKey("rest_actions");
+            generator.writeStartObject();
+            for (Map.Entry<String, Integer> item0 : this.restActions.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.write(item0.getValue());
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("since");
+        generator.write(this.since);
+
+        generator.writeKey("timestamp");
+        generator.write(this.timestamp);
+
+        if (ApiTypeHelper.isDefined(this.aggregations)) {
+            generator.writeKey("aggregations");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.aggregations.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeUsage}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeUsage> {
+        private Map<String, Integer> restActions;
+
+        private String since;
+
+        private String timestamp;
+
+        private Map<String, JsonData> aggregations;
+
+        /**
+         * Required - API name: {@code rest_actions}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>restActions</code>.
+         */
+        public final Builder restActions(Map<String, Integer> map) {
+            this.restActions = _mapPutAll(this.restActions, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code rest_actions}
+         * <p>
+         * Adds an entry to <code>restActions</code>.
+         */
+        public final Builder restActions(String key, Integer value) {
+            this.restActions = _mapPut(this.restActions, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code since}
+         */
+        public final Builder since(String value) {
+            this.since = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code timestamp}
+         */
+        public final Builder timestamp(String value) {
+            this.timestamp = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code aggregations}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>aggregations</code>.
+         */
+        public final Builder aggregations(Map<String, JsonData> map) {
+            this.aggregations = _mapPutAll(this.aggregations, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code aggregations}
+         * <p>
+         * Adds an entry to <code>aggregations</code>.
+         */
+        public final Builder aggregations(String key, JsonData value) {
+            this.aggregations = _mapPut(this.aggregations, key, value);
+            return this;
+        }
+
+        /**
+         * Builds a {@link NodeUsage}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeUsage build() {
+            _checkSingleUse();
+
+            return new NodeUsage(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeUsage}
+     */
+    public static final JsonpDeserializer<NodeUsage> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeUsage::setupNodeUsageDeserializer
+    );
+
+    protected static void setupNodeUsageDeserializer(ObjectDeserializer<NodeUsage.Builder> op) {
+
+        op.add(Builder::restActions, JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.integerDeserializer()), "rest_actions");
+        op.add(Builder::since, JsonpDeserializer.stringDeserializer(), "since");
+        op.add(Builder::timestamp, JsonpDeserializer.stringDeserializer(), "timestamp");
+        op.add(Builder::aggregations, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "aggregations");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/DeleteNodeRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/DeleteNodeRequest.java
index 43be11e857..d3c2422175 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/DeleteNodeRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/DeleteNodeRequest.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.shutdown;
 
+import java.util.Collections;
+import java.util.function.Function;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -40,109 +42,110 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.Collections;
-import java.util.function.Function;
-
 // typedef: shutdown.delete_node.Request
 
 /**
  * Removes a node from the shutdown list. Designed for indirect use by ECE/ESS
  * and ECK. Direct use is not supported.
- * 
+ *
  */
 
 public class DeleteNodeRequest extends RequestBase {
-	private final String nodeId;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteNodeRequest(Builder builder) {
-
-		this.nodeId = ApiTypeHelper.requireNonNull(builder.nodeId, this, "nodeId");
-
-	}
-
-	public static DeleteNodeRequest of(Function<Builder, ObjectBuilder<DeleteNodeRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - The node id of node to be removed from the shutdown state
-	 * <p>
-	 * API name: {@code node_id}
-	 */
-	public final String nodeId() {
-		return this.nodeId;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteNodeRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteNodeRequest> {
-		private String nodeId;
-
-		/**
-		 * Required - The node id of node to be removed from the shutdown state
-		 * <p>
-		 * API name: {@code node_id}
-		 */
-		public final Builder nodeId(String value) {
-			this.nodeId = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DeleteNodeRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteNodeRequest build() {
-			_checkSingleUse();
-
-			return new DeleteNodeRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code shutdown.delete_node}".
-	 */
-	public static final Endpoint<DeleteNodeRequest, DeleteNodeResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "DELETE";
-
-			},
-
-			// Request path
-			request -> {
-				final int _nodeId = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _nodeId;
-
-				if (propsSet == (_nodeId)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_nodes");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.nodeId, buf);
-					buf.append("/shutdown");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
-
-			}, SimpleEndpoint.emptyMap(), false, DeleteNodeResponse._DESERIALIZER);
+    private final String nodeId;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteNodeRequest(Builder builder) {
+
+        this.nodeId = ApiTypeHelper.requireNonNull(builder.nodeId, this, "nodeId");
+
+    }
+
+    public static DeleteNodeRequest of(Function<Builder, ObjectBuilder<DeleteNodeRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - The node id of node to be removed from the shutdown state
+     * <p>
+     * API name: {@code node_id}
+     */
+    public final String nodeId() {
+        return this.nodeId;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteNodeRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteNodeRequest> {
+        private String nodeId;
+
+        /**
+         * Required - The node id of node to be removed from the shutdown state
+         * <p>
+         * API name: {@code node_id}
+         */
+        public final Builder nodeId(String value) {
+            this.nodeId = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link DeleteNodeRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteNodeRequest build() {
+            _checkSingleUse();
+
+            return new DeleteNodeRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code shutdown.delete_node}".
+     */
+    public static final Endpoint<DeleteNodeRequest, DeleteNodeResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "DELETE";
+
+        },
+
+        // Request path
+        request -> {
+            final int _nodeId = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _nodeId;
+
+            if (propsSet == (_nodeId)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_nodes");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.nodeId, buf);
+                buf.append("/shutdown");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        DeleteNodeResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/DeleteNodeResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/DeleteNodeResponse.java
index 1020a6b304..6f2f21af7f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/DeleteNodeResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/DeleteNodeResponse.java
@@ -32,68 +32,67 @@
 
 package org.opensearch.client.opensearch.shutdown;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: shutdown.delete_node.Response
 
 @JsonpDeserializable
 public class DeleteNodeResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private DeleteNodeResponse(Builder builder) {
-		super(builder);
+    private DeleteNodeResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static DeleteNodeResponse of(Function<Builder, ObjectBuilder<DeleteNodeResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static DeleteNodeResponse of(Function<Builder, ObjectBuilder<DeleteNodeResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link DeleteNodeResponse}.
-	 */
+    /**
+     * Builder for {@link DeleteNodeResponse}.
+     */
 
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DeleteNodeResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<DeleteNodeResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link DeleteNodeResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteNodeResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link DeleteNodeResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteNodeResponse build() {
+            _checkSingleUse();
 
-			return new DeleteNodeResponse(this);
-		}
-	}
+            return new DeleteNodeResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link DeleteNodeResponse}
-	 */
-	public static final JsonpDeserializer<DeleteNodeResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DeleteNodeResponse::setupDeleteNodeResponseDeserializer);
+    /**
+     * Json deserializer for {@link DeleteNodeResponse}
+     */
+    public static final JsonpDeserializer<DeleteNodeResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DeleteNodeResponse::setupDeleteNodeResponseDeserializer
+    );
 
-	protected static void setupDeleteNodeResponseDeserializer(ObjectDeserializer<DeleteNodeResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+    protected static void setupDeleteNodeResponseDeserializer(ObjectDeserializer<DeleteNodeResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/GetNodeRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/GetNodeRequest.java
index cae4bf2fb7..436ec9f5ab 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/GetNodeRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/GetNodeRequest.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch.shutdown;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -40,136 +45,132 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: shutdown.get_node.Request
 
 /**
  * Retrieve status of a node or nodes that are currently marked as shutting
  * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
  * supported.
- * 
+ *
  */
 
 public class GetNodeRequest extends RequestBase {
-	private final List<String> nodeId;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetNodeRequest(Builder builder) {
-
-		this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
-
-	}
-
-	public static GetNodeRequest of(Function<Builder, ObjectBuilder<GetNodeRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Which node for which to retrieve the shutdown status
-	 * <p>
-	 * API name: {@code node_id}
-	 */
-	public final List<String> nodeId() {
-		return this.nodeId;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetNodeRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetNodeRequest> {
-		@Nullable
-		private List<String> nodeId;
-
-		/**
-		 * Which node for which to retrieve the shutdown status
-		 * <p>
-		 * API name: {@code node_id}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>nodeId</code>.
-		 */
-		public final Builder nodeId(List<String> list) {
-			this.nodeId = _listAddAll(this.nodeId, list);
-			return this;
-		}
-
-		/**
-		 * Which node for which to retrieve the shutdown status
-		 * <p>
-		 * API name: {@code node_id}
-		 * <p>
-		 * Adds one or more values to <code>nodeId</code>.
-		 */
-		public final Builder nodeId(String value, String... values) {
-			this.nodeId = _listAdd(this.nodeId, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetNodeRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetNodeRequest build() {
-			_checkSingleUse();
-
-			return new GetNodeRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code shutdown.get_node}".
-	 */
-	public static final Endpoint<GetNodeRequest, GetNodeResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _nodeId = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.nodeId()))
-					propsSet |= _nodeId;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_nodes");
-					buf.append("/shutdown");
-					return buf.toString();
-				}
-				if (propsSet == (_nodeId)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_nodes");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					buf.append("/shutdown");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
-
-			}, SimpleEndpoint.emptyMap(), false, GetNodeResponse._DESERIALIZER);
+    private final List<String> nodeId;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetNodeRequest(Builder builder) {
+
+        this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
+
+    }
+
+    public static GetNodeRequest of(Function<Builder, ObjectBuilder<GetNodeRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Which node for which to retrieve the shutdown status
+     * <p>
+     * API name: {@code node_id}
+     */
+    public final List<String> nodeId() {
+        return this.nodeId;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetNodeRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetNodeRequest> {
+        @Nullable
+        private List<String> nodeId;
+
+        /**
+         * Which node for which to retrieve the shutdown status
+         * <p>
+         * API name: {@code node_id}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>nodeId</code>.
+         */
+        public final Builder nodeId(List<String> list) {
+            this.nodeId = _listAddAll(this.nodeId, list);
+            return this;
+        }
+
+        /**
+         * Which node for which to retrieve the shutdown status
+         * <p>
+         * API name: {@code node_id}
+         * <p>
+         * Adds one or more values to <code>nodeId</code>.
+         */
+        public final Builder nodeId(String value, String... values) {
+            this.nodeId = _listAdd(this.nodeId, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetNodeRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetNodeRequest build() {
+            _checkSingleUse();
+
+            return new GetNodeRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code shutdown.get_node}".
+     */
+    public static final Endpoint<GetNodeRequest, GetNodeResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _nodeId = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.nodeId())) propsSet |= _nodeId;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_nodes");
+                buf.append("/shutdown");
+                return buf.toString();
+            }
+            if (propsSet == (_nodeId)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_nodes");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/shutdown");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetNodeResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/GetNodeResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/GetNodeResponse.java
index 67e2534b45..03b81125f5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/GetNodeResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/GetNodeResponse.java
@@ -32,133 +32,134 @@
 
 package org.opensearch.client.opensearch.shutdown;
 
-import org.opensearch.client.opensearch.shutdown.get_node.NodeShutdownStatus;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.shutdown.get_node.NodeShutdownStatus;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: shutdown.get_node.Response
 
 @JsonpDeserializable
 public class GetNodeResponse implements JsonpSerializable {
-	private final List<NodeShutdownStatus> nodes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetNodeResponse(Builder builder) {
-
-		this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
-
-	}
-
-	public static GetNodeResponse of(Function<Builder, ObjectBuilder<GetNodeResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code nodes}
-	 */
-	public final List<NodeShutdownStatus> nodes() {
-		return this.nodes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.nodes)) {
-			generator.writeKey("nodes");
-			generator.writeStartArray();
-			for (NodeShutdownStatus item0 : this.nodes) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetNodeResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetNodeResponse> {
-		private List<NodeShutdownStatus> nodes;
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>nodes</code>.
-		 */
-		public final Builder nodes(List<NodeShutdownStatus> list) {
-			this.nodes = _listAddAll(this.nodes, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds one or more values to <code>nodes</code>.
-		 */
-		public final Builder nodes(NodeShutdownStatus value, NodeShutdownStatus... values) {
-			this.nodes = _listAdd(this.nodes, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds a value to <code>nodes</code> using a builder lambda.
-		 */
-		public final Builder nodes(Function<NodeShutdownStatus.Builder, ObjectBuilder<NodeShutdownStatus>> fn) {
-			return nodes(fn.apply(new NodeShutdownStatus.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link GetNodeResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetNodeResponse build() {
-			_checkSingleUse();
-
-			return new GetNodeResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetNodeResponse}
-	 */
-	public static final JsonpDeserializer<GetNodeResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GetNodeResponse::setupGetNodeResponseDeserializer);
-
-	protected static void setupGetNodeResponseDeserializer(ObjectDeserializer<GetNodeResponse.Builder> op) {
-
-		op.add(Builder::nodes, JsonpDeserializer.arrayDeserializer(NodeShutdownStatus._DESERIALIZER), "nodes");
-
-	}
+    private final List<NodeShutdownStatus> nodes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetNodeResponse(Builder builder) {
+
+        this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
+
+    }
+
+    public static GetNodeResponse of(Function<Builder, ObjectBuilder<GetNodeResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code nodes}
+     */
+    public final List<NodeShutdownStatus> nodes() {
+        return this.nodes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.nodes)) {
+            generator.writeKey("nodes");
+            generator.writeStartArray();
+            for (NodeShutdownStatus item0 : this.nodes) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetNodeResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetNodeResponse> {
+        private List<NodeShutdownStatus> nodes;
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>nodes</code>.
+         */
+        public final Builder nodes(List<NodeShutdownStatus> list) {
+            this.nodes = _listAddAll(this.nodes, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds one or more values to <code>nodes</code>.
+         */
+        public final Builder nodes(NodeShutdownStatus value, NodeShutdownStatus... values) {
+            this.nodes = _listAdd(this.nodes, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds a value to <code>nodes</code> using a builder lambda.
+         */
+        public final Builder nodes(Function<NodeShutdownStatus.Builder, ObjectBuilder<NodeShutdownStatus>> fn) {
+            return nodes(fn.apply(new NodeShutdownStatus.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link GetNodeResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetNodeResponse build() {
+            _checkSingleUse();
+
+            return new GetNodeResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetNodeResponse}
+     */
+    public static final JsonpDeserializer<GetNodeResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetNodeResponse::setupGetNodeResponseDeserializer
+    );
+
+    protected static void setupGetNodeResponseDeserializer(ObjectDeserializer<GetNodeResponse.Builder> op) {
+
+        op.add(Builder::nodes, JsonpDeserializer.arrayDeserializer(NodeShutdownStatus._DESERIALIZER), "nodes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/OpenSearchShutdownAsyncClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/OpenSearchShutdownAsyncClient.java
index f577919a94..bdd369a084 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/OpenSearchShutdownAsyncClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/OpenSearchShutdownAsyncClient.java
@@ -32,154 +32,150 @@
 
 package org.opensearch.client.opensearch.shutdown;
 
+import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
+import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.TransportOptions;
 import org.opensearch.client.util.ObjectBuilder;
-import java.io.IOException;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 /**
  * Client for the shutdown namespace.
  */
-public class OpenSearchShutdownAsyncClient
-		extends
-			ApiClient<OpenSearchTransport, OpenSearchShutdownAsyncClient> {
-
-	public OpenSearchShutdownAsyncClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchShutdownAsyncClient(OpenSearchTransport transport,
-                                         @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchShutdownAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchShutdownAsyncClient(this.transport, transportOptions);
-	}
-
-	// ----- Endpoint: shutdown.delete_node
-
-	/**
-	 * Removes a node from the shutdown list. Designed for indirect use by ECE/ESS
-	 * and ECK. Direct use is not supported.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<DeleteNodeResponse> deleteNode(DeleteNodeRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteNodeRequest, DeleteNodeResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteNodeRequest, DeleteNodeResponse, ErrorResponse>) DeleteNodeRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Removes a node from the shutdown list. Designed for indirect use by ECE/ESS
-	 * and ECK. Direct use is not supported.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteNodeRequest}
-	 *
-	 */
-
-	public final CompletableFuture<DeleteNodeResponse> deleteNode(
-			Function<DeleteNodeRequest.Builder, ObjectBuilder<DeleteNodeRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteNode(fn.apply(new DeleteNodeRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: shutdown.get_node
-
-	/**
-	 * Retrieve status of a node or nodes that are currently marked as shutting
-	 * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
-	 * supported.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetNodeResponse> getNode(GetNodeRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetNodeRequest, GetNodeResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetNodeRequest, GetNodeResponse, ErrorResponse>) GetNodeRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Retrieve status of a node or nodes that are currently marked as shutting
-	 * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
-	 * supported.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetNodeRequest}
-	 *
-	 */
-
-	public final CompletableFuture<GetNodeResponse> getNode(
-			Function<GetNodeRequest.Builder, ObjectBuilder<GetNodeRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getNode(fn.apply(new GetNodeRequest.Builder()).build());
-	}
-
-	/**
-	 * Retrieve status of a node or nodes that are currently marked as shutting
-	 * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
-	 * supported.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetNodeResponse> getNode() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new GetNodeRequest.Builder().build(), GetNodeRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: shutdown.put_node
-
-	/**
-	 * Adds a node to be shut down. Designed for indirect use by ECE/ESS and ECK.
-	 * Direct use is not supported.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<PutNodeResponse> putNode(PutNodeRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutNodeRequest, PutNodeResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutNodeRequest, PutNodeResponse, ErrorResponse>) PutNodeRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Adds a node to be shut down. Designed for indirect use by ECE/ESS and ECK.
-	 * Direct use is not supported.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutNodeRequest}
-	 *
-	 */
-
-	public final CompletableFuture<PutNodeResponse> putNode(
-			Function<PutNodeRequest.Builder, ObjectBuilder<PutNodeRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putNode(fn.apply(new PutNodeRequest.Builder()).build());
-	}
+public class OpenSearchShutdownAsyncClient extends ApiClient<OpenSearchTransport, OpenSearchShutdownAsyncClient> {
+
+    public OpenSearchShutdownAsyncClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchShutdownAsyncClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchShutdownAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchShutdownAsyncClient(this.transport, transportOptions);
+    }
+
+    // ----- Endpoint: shutdown.delete_node
+
+    /**
+     * Removes a node from the shutdown list. Designed for indirect use by ECE/ESS
+     * and ECK. Direct use is not supported.
+     *
+     *
+     */
+
+    public CompletableFuture<DeleteNodeResponse> deleteNode(DeleteNodeRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteNodeRequest, DeleteNodeResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteNodeRequest,
+            DeleteNodeResponse,
+            ErrorResponse>) DeleteNodeRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Removes a node from the shutdown list. Designed for indirect use by ECE/ESS
+     * and ECK. Direct use is not supported.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteNodeRequest}
+     *
+     */
+
+    public final CompletableFuture<DeleteNodeResponse> deleteNode(Function<DeleteNodeRequest.Builder, ObjectBuilder<DeleteNodeRequest>> fn)
+        throws IOException, OpenSearchException {
+        return deleteNode(fn.apply(new DeleteNodeRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: shutdown.get_node
+
+    /**
+     * Retrieve status of a node or nodes that are currently marked as shutting
+     * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
+     * supported.
+     *
+     *
+     */
+
+    public CompletableFuture<GetNodeResponse> getNode(GetNodeRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetNodeRequest, GetNodeResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetNodeRequest,
+            GetNodeResponse,
+            ErrorResponse>) GetNodeRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Retrieve status of a node or nodes that are currently marked as shutting
+     * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
+     * supported.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetNodeRequest}
+     *
+     */
+
+    public final CompletableFuture<GetNodeResponse> getNode(Function<GetNodeRequest.Builder, ObjectBuilder<GetNodeRequest>> fn)
+        throws IOException, OpenSearchException {
+        return getNode(fn.apply(new GetNodeRequest.Builder()).build());
+    }
+
+    /**
+     * Retrieve status of a node or nodes that are currently marked as shutting
+     * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
+     * supported.
+     *
+     *
+     */
+
+    public CompletableFuture<GetNodeResponse> getNode() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new GetNodeRequest.Builder().build(), GetNodeRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: shutdown.put_node
+
+    /**
+     * Adds a node to be shut down. Designed for indirect use by ECE/ESS and ECK.
+     * Direct use is not supported.
+     *
+     *
+     */
+
+    public CompletableFuture<PutNodeResponse> putNode(PutNodeRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutNodeRequest, PutNodeResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutNodeRequest,
+            PutNodeResponse,
+            ErrorResponse>) PutNodeRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Adds a node to be shut down. Designed for indirect use by ECE/ESS and ECK.
+     * Direct use is not supported.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutNodeRequest}
+     *
+     */
+
+    public final CompletableFuture<PutNodeResponse> putNode(Function<PutNodeRequest.Builder, ObjectBuilder<PutNodeRequest>> fn)
+        throws IOException, OpenSearchException {
+        return putNode(fn.apply(new PutNodeRequest.Builder()).build());
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/OpenSearchShutdownClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/OpenSearchShutdownClient.java
index ce0337cdbc..957a578146 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/OpenSearchShutdownClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/OpenSearchShutdownClient.java
@@ -32,144 +32,149 @@
 
 package org.opensearch.client.opensearch.shutdown;
 
+import java.io.IOException;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
+import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.TransportOptions;
 import org.opensearch.client.util.ObjectBuilder;
-import java.io.IOException;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 /**
  * Client for the shutdown namespace.
  */
 public class OpenSearchShutdownClient extends ApiClient<OpenSearchTransport, OpenSearchShutdownClient> {
 
-	public OpenSearchShutdownClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchShutdownClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchShutdownClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchShutdownClient(this.transport, transportOptions);
-	}
-
-	// ----- Endpoint: shutdown.delete_node
-
-	/**
-	 * Removes a node from the shutdown list. Designed for indirect use by ECE/ESS
-	 * and ECK. Direct use is not supported.
-	 * 
-	 *
-	 */
-
-	public DeleteNodeResponse deleteNode(DeleteNodeRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteNodeRequest, DeleteNodeResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteNodeRequest, DeleteNodeResponse, ErrorResponse>) DeleteNodeRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Removes a node from the shutdown list. Designed for indirect use by ECE/ESS
-	 * and ECK. Direct use is not supported.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteNodeRequest}
-	 *
-	 */
-
-	public final DeleteNodeResponse deleteNode(Function<DeleteNodeRequest.Builder, ObjectBuilder<DeleteNodeRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteNode(fn.apply(new DeleteNodeRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: shutdown.get_node
-
-	/**
-	 * Retrieve status of a node or nodes that are currently marked as shutting
-	 * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
-	 * supported.
-	 * 
-	 *
-	 */
-
-	public GetNodeResponse getNode(GetNodeRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetNodeRequest, GetNodeResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetNodeRequest, GetNodeResponse, ErrorResponse>) GetNodeRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Retrieve status of a node or nodes that are currently marked as shutting
-	 * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
-	 * supported.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetNodeRequest}
-	 *
-	 */
-
-	public final GetNodeResponse getNode(Function<GetNodeRequest.Builder, ObjectBuilder<GetNodeRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getNode(fn.apply(new GetNodeRequest.Builder()).build());
-	}
-
-	/**
-	 * Retrieve status of a node or nodes that are currently marked as shutting
-	 * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
-	 * supported.
-	 * 
-	 *
-	 */
-
-	public GetNodeResponse getNode() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new GetNodeRequest.Builder().build(), GetNodeRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: shutdown.put_node
-
-	/**
-	 * Adds a node to be shut down. Designed for indirect use by ECE/ESS and ECK.
-	 * Direct use is not supported.
-	 * 
-	 *
-	 */
-
-	public PutNodeResponse putNode(PutNodeRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<PutNodeRequest, PutNodeResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<PutNodeRequest, PutNodeResponse, ErrorResponse>) PutNodeRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Adds a node to be shut down. Designed for indirect use by ECE/ESS and ECK.
-	 * Direct use is not supported.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link PutNodeRequest}
-	 *
-	 */
-
-	public final PutNodeResponse putNode(Function<PutNodeRequest.Builder, ObjectBuilder<PutNodeRequest>> fn)
-			throws IOException, OpenSearchException {
-		return putNode(fn.apply(new PutNodeRequest.Builder()).build());
-	}
+    public OpenSearchShutdownClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchShutdownClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchShutdownClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchShutdownClient(this.transport, transportOptions);
+    }
+
+    // ----- Endpoint: shutdown.delete_node
+
+    /**
+     * Removes a node from the shutdown list. Designed for indirect use by ECE/ESS
+     * and ECK. Direct use is not supported.
+     *
+     *
+     */
+
+    public DeleteNodeResponse deleteNode(DeleteNodeRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteNodeRequest, DeleteNodeResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteNodeRequest,
+            DeleteNodeResponse,
+            ErrorResponse>) DeleteNodeRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Removes a node from the shutdown list. Designed for indirect use by ECE/ESS
+     * and ECK. Direct use is not supported.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteNodeRequest}
+     *
+     */
+
+    public final DeleteNodeResponse deleteNode(Function<DeleteNodeRequest.Builder, ObjectBuilder<DeleteNodeRequest>> fn) throws IOException,
+        OpenSearchException {
+        return deleteNode(fn.apply(new DeleteNodeRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: shutdown.get_node
+
+    /**
+     * Retrieve status of a node or nodes that are currently marked as shutting
+     * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
+     * supported.
+     *
+     *
+     */
+
+    public GetNodeResponse getNode(GetNodeRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetNodeRequest, GetNodeResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetNodeRequest,
+            GetNodeResponse,
+            ErrorResponse>) GetNodeRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Retrieve status of a node or nodes that are currently marked as shutting
+     * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
+     * supported.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetNodeRequest}
+     *
+     */
+
+    public final GetNodeResponse getNode(Function<GetNodeRequest.Builder, ObjectBuilder<GetNodeRequest>> fn) throws IOException,
+        OpenSearchException {
+        return getNode(fn.apply(new GetNodeRequest.Builder()).build());
+    }
+
+    /**
+     * Retrieve status of a node or nodes that are currently marked as shutting
+     * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
+     * supported.
+     *
+     *
+     */
+
+    public GetNodeResponse getNode() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new GetNodeRequest.Builder().build(), GetNodeRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: shutdown.put_node
+
+    /**
+     * Adds a node to be shut down. Designed for indirect use by ECE/ESS and ECK.
+     * Direct use is not supported.
+     *
+     *
+     */
+
+    public PutNodeResponse putNode(PutNodeRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<PutNodeRequest, PutNodeResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            PutNodeRequest,
+            PutNodeResponse,
+            ErrorResponse>) PutNodeRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Adds a node to be shut down. Designed for indirect use by ECE/ESS and ECK.
+     * Direct use is not supported.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link PutNodeRequest}
+     *
+     */
+
+    public final PutNodeResponse putNode(Function<PutNodeRequest.Builder, ObjectBuilder<PutNodeRequest>> fn) throws IOException,
+        OpenSearchException {
+        return putNode(fn.apply(new PutNodeRequest.Builder()).build());
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/PutNodeRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/PutNodeRequest.java
index 61db8b8a7f..1ebfff4fc9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/PutNodeRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/PutNodeRequest.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.shutdown;
 
+import java.util.Collections;
+import java.util.function.Function;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -40,109 +42,110 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.Collections;
-import java.util.function.Function;
-
 // typedef: shutdown.put_node.Request
 
 /**
  * Adds a node to be shut down. Designed for indirect use by ECE/ESS and ECK.
  * Direct use is not supported.
- * 
+ *
  */
 
 public class PutNodeRequest extends RequestBase {
-	private final String nodeId;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private PutNodeRequest(Builder builder) {
-
-		this.nodeId = ApiTypeHelper.requireNonNull(builder.nodeId, this, "nodeId");
-
-	}
-
-	public static PutNodeRequest of(Function<Builder, ObjectBuilder<PutNodeRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - The node id of node to be shut down
-	 * <p>
-	 * API name: {@code node_id}
-	 */
-	public final String nodeId() {
-		return this.nodeId;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link PutNodeRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutNodeRequest> {
-		private String nodeId;
-
-		/**
-		 * Required - The node id of node to be shut down
-		 * <p>
-		 * API name: {@code node_id}
-		 */
-		public final Builder nodeId(String value) {
-			this.nodeId = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link PutNodeRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutNodeRequest build() {
-			_checkSingleUse();
-
-			return new PutNodeRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code shutdown.put_node}".
-	 */
-	public static final Endpoint<PutNodeRequest, PutNodeResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "PUT";
-
-			},
-
-			// Request path
-			request -> {
-				final int _nodeId = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _nodeId;
-
-				if (propsSet == (_nodeId)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_nodes");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.nodeId, buf);
-					buf.append("/shutdown");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				return Collections.emptyMap();
-
-			}, SimpleEndpoint.emptyMap(), false, PutNodeResponse._DESERIALIZER);
+    private final String nodeId;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private PutNodeRequest(Builder builder) {
+
+        this.nodeId = ApiTypeHelper.requireNonNull(builder.nodeId, this, "nodeId");
+
+    }
+
+    public static PutNodeRequest of(Function<Builder, ObjectBuilder<PutNodeRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - The node id of node to be shut down
+     * <p>
+     * API name: {@code node_id}
+     */
+    public final String nodeId() {
+        return this.nodeId;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link PutNodeRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PutNodeRequest> {
+        private String nodeId;
+
+        /**
+         * Required - The node id of node to be shut down
+         * <p>
+         * API name: {@code node_id}
+         */
+        public final Builder nodeId(String value) {
+            this.nodeId = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link PutNodeRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutNodeRequest build() {
+            _checkSingleUse();
+
+            return new PutNodeRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code shutdown.put_node}".
+     */
+    public static final Endpoint<PutNodeRequest, PutNodeResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "PUT";
+
+        },
+
+        // Request path
+        request -> {
+            final int _nodeId = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _nodeId;
+
+            if (propsSet == (_nodeId)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_nodes");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.nodeId, buf);
+                buf.append("/shutdown");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            return Collections.emptyMap();
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        PutNodeResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/PutNodeResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/PutNodeResponse.java
index e0a37ecbf3..187da06511 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/PutNodeResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/PutNodeResponse.java
@@ -32,68 +32,67 @@
 
 package org.opensearch.client.opensearch.shutdown;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: shutdown.put_node.Response
 
 @JsonpDeserializable
 public class PutNodeResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private PutNodeResponse(Builder builder) {
-		super(builder);
+    private PutNodeResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static PutNodeResponse of(Function<Builder, ObjectBuilder<PutNodeResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static PutNodeResponse of(Function<Builder, ObjectBuilder<PutNodeResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link PutNodeResponse}.
-	 */
+    /**
+     * Builder for {@link PutNodeResponse}.
+     */
 
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<PutNodeResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<PutNodeResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link PutNodeResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PutNodeResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link PutNodeResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PutNodeResponse build() {
+            _checkSingleUse();
 
-			return new PutNodeResponse(this);
-		}
-	}
+            return new PutNodeResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link PutNodeResponse}
-	 */
-	public static final JsonpDeserializer<PutNodeResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			PutNodeResponse::setupPutNodeResponseDeserializer);
+    /**
+     * Json deserializer for {@link PutNodeResponse}
+     */
+    public static final JsonpDeserializer<PutNodeResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PutNodeResponse::setupPutNodeResponseDeserializer
+    );
 
-	protected static void setupPutNodeResponseDeserializer(ObjectDeserializer<PutNodeResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+    protected static void setupPutNodeResponseDeserializer(ObjectDeserializer<PutNodeResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/NodeShutdownStatus.java b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/NodeShutdownStatus.java
index 8e8f8fc4f9..667affd878 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/NodeShutdownStatus.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/NodeShutdownStatus.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.shutdown.get_node;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,8 +43,6 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: shutdown.get_node.NodeShutdownStatus
 
@@ -51,275 +51,274 @@
  */
 @JsonpDeserializable
 public class NodeShutdownStatus implements JsonpSerializable {
-	private final String nodeId;
-
-	private final ShutdownType type;
-
-	private final String reason;
-
-	private final String shutdownStartedmillis;
-
-	private final ShutdownStatus status;
-
-	private final ShardMigrationStatus shardMigration;
-
-	private final PersistentTaskStatus persistentTasks;
-
-	private final PluginsStatus plugins;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private NodeShutdownStatus(Builder builder) {
-
-		this.nodeId = ApiTypeHelper.requireNonNull(builder.nodeId, this, "nodeId");
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-		this.reason = ApiTypeHelper.requireNonNull(builder.reason, this, "reason");
-		this.shutdownStartedmillis = ApiTypeHelper.requireNonNull(builder.shutdownStartedmillis, this,
-				"shutdownStartedmillis");
-		this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
-		this.shardMigration = ApiTypeHelper.requireNonNull(builder.shardMigration, this, "shardMigration");
-		this.persistentTasks = ApiTypeHelper.requireNonNull(builder.persistentTasks, this, "persistentTasks");
-		this.plugins = ApiTypeHelper.requireNonNull(builder.plugins, this, "plugins");
-
-	}
-
-	public static NodeShutdownStatus of(Function<Builder, ObjectBuilder<NodeShutdownStatus>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code node_id}
-	 */
-	public final String nodeId() {
-		return this.nodeId;
-	}
+    private final String nodeId;
+
+    private final ShutdownType type;
+
+    private final String reason;
+
+    private final String shutdownStartedmillis;
+
+    private final ShutdownStatus status;
+
+    private final ShardMigrationStatus shardMigration;
+
+    private final PersistentTaskStatus persistentTasks;
+
+    private final PluginsStatus plugins;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private NodeShutdownStatus(Builder builder) {
+
+        this.nodeId = ApiTypeHelper.requireNonNull(builder.nodeId, this, "nodeId");
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.reason = ApiTypeHelper.requireNonNull(builder.reason, this, "reason");
+        this.shutdownStartedmillis = ApiTypeHelper.requireNonNull(builder.shutdownStartedmillis, this, "shutdownStartedmillis");
+        this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
+        this.shardMigration = ApiTypeHelper.requireNonNull(builder.shardMigration, this, "shardMigration");
+        this.persistentTasks = ApiTypeHelper.requireNonNull(builder.persistentTasks, this, "persistentTasks");
+        this.plugins = ApiTypeHelper.requireNonNull(builder.plugins, this, "plugins");
+
+    }
+
+    public static NodeShutdownStatus of(Function<Builder, ObjectBuilder<NodeShutdownStatus>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code node_id}
+     */
+    public final String nodeId() {
+        return this.nodeId;
+    }
 
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final ShutdownType type() {
-		return this.type;
-	}
+    /**
+     * Required - API name: {@code type}
+     */
+    public final ShutdownType type() {
+        return this.type;
+    }
 
-	/**
-	 * Required - API name: {@code reason}
-	 */
-	public final String reason() {
-		return this.reason;
-	}
+    /**
+     * Required - API name: {@code reason}
+     */
+    public final String reason() {
+        return this.reason;
+    }
 
-	/**
-	 * Required - API name: {@code shutdown_startedmillis}
-	 */
-	public final String shutdownStartedmillis() {
-		return this.shutdownStartedmillis;
-	}
+    /**
+     * Required - API name: {@code shutdown_startedmillis}
+     */
+    public final String shutdownStartedmillis() {
+        return this.shutdownStartedmillis;
+    }
 
-	/**
-	 * Required - API name: {@code status}
-	 */
-	public final ShutdownStatus status() {
-		return this.status;
-	}
+    /**
+     * Required - API name: {@code status}
+     */
+    public final ShutdownStatus status() {
+        return this.status;
+    }
 
-	/**
-	 * Required - API name: {@code shard_migration}
-	 */
-	public final ShardMigrationStatus shardMigration() {
-		return this.shardMigration;
-	}
-
-	/**
-	 * Required - API name: {@code persistent_tasks}
-	 */
-	public final PersistentTaskStatus persistentTasks() {
-		return this.persistentTasks;
-	}
-
-	/**
-	 * Required - API name: {@code plugins}
-	 */
-	public final PluginsStatus plugins() {
-		return this.plugins;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("node_id");
-		generator.write(this.nodeId);
-
-		generator.writeKey("type");
-		this.type.serialize(generator, mapper);
-		generator.writeKey("reason");
-		generator.write(this.reason);
-
-		generator.writeKey("shutdown_startedmillis");
-		generator.write(this.shutdownStartedmillis);
-
-		generator.writeKey("status");
-		this.status.serialize(generator, mapper);
-		generator.writeKey("shard_migration");
-		this.shardMigration.serialize(generator, mapper);
-
-		generator.writeKey("persistent_tasks");
-		this.persistentTasks.serialize(generator, mapper);
-
-		generator.writeKey("plugins");
-		this.plugins.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link NodeShutdownStatus}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeShutdownStatus> {
-		private String nodeId;
-
-		private ShutdownType type;
-
-		private String reason;
-
-		private String shutdownStartedmillis;
-
-		private ShutdownStatus status;
-
-		private ShardMigrationStatus shardMigration;
-
-		private PersistentTaskStatus persistentTasks;
-
-		private PluginsStatus plugins;
-
-		/**
-		 * Required - API name: {@code node_id}
-		 */
-		public final Builder nodeId(String value) {
-			this.nodeId = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(ShutdownType value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code reason}
-		 */
-		public final Builder reason(String value) {
-			this.reason = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shutdown_startedmillis}
-		 */
-		public final Builder shutdownStartedmillis(String value) {
-			this.shutdownStartedmillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code status}
-		 */
-		public final Builder status(ShutdownStatus value) {
-			this.status = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shard_migration}
-		 */
-		public final Builder shardMigration(ShardMigrationStatus value) {
-			this.shardMigration = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shard_migration}
-		 */
-		public final Builder shardMigration(
-				Function<ShardMigrationStatus.Builder, ObjectBuilder<ShardMigrationStatus>> fn) {
-			return this.shardMigration(fn.apply(new ShardMigrationStatus.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code persistent_tasks}
-		 */
-		public final Builder persistentTasks(PersistentTaskStatus value) {
-			this.persistentTasks = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code persistent_tasks}
-		 */
-		public final Builder persistentTasks(
-				Function<PersistentTaskStatus.Builder, ObjectBuilder<PersistentTaskStatus>> fn) {
-			return this.persistentTasks(fn.apply(new PersistentTaskStatus.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code plugins}
-		 */
-		public final Builder plugins(PluginsStatus value) {
-			this.plugins = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code plugins}
-		 */
-		public final Builder plugins(Function<PluginsStatus.Builder, ObjectBuilder<PluginsStatus>> fn) {
-			return this.plugins(fn.apply(new PluginsStatus.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link NodeShutdownStatus}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public NodeShutdownStatus build() {
-			_checkSingleUse();
-
-			return new NodeShutdownStatus(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link NodeShutdownStatus}
-	 */
-	public static final JsonpDeserializer<NodeShutdownStatus> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, NodeShutdownStatus::setupNodeShutdownStatusDeserializer);
-
-	protected static void setupNodeShutdownStatusDeserializer(ObjectDeserializer<NodeShutdownStatus.Builder> op) {
-
-		op.add(Builder::nodeId, JsonpDeserializer.stringDeserializer(), "node_id");
-		op.add(Builder::type, ShutdownType._DESERIALIZER, "type");
-		op.add(Builder::reason, JsonpDeserializer.stringDeserializer(), "reason");
-		op.add(Builder::shutdownStartedmillis, JsonpDeserializer.stringDeserializer(), "shutdown_startedmillis");
-		op.add(Builder::status, ShutdownStatus._DESERIALIZER, "status");
-		op.add(Builder::shardMigration, ShardMigrationStatus._DESERIALIZER, "shard_migration");
-		op.add(Builder::persistentTasks, PersistentTaskStatus._DESERIALIZER, "persistent_tasks");
-		op.add(Builder::plugins, PluginsStatus._DESERIALIZER, "plugins");
-
-	}
+    /**
+     * Required - API name: {@code shard_migration}
+     */
+    public final ShardMigrationStatus shardMigration() {
+        return this.shardMigration;
+    }
+
+    /**
+     * Required - API name: {@code persistent_tasks}
+     */
+    public final PersistentTaskStatus persistentTasks() {
+        return this.persistentTasks;
+    }
+
+    /**
+     * Required - API name: {@code plugins}
+     */
+    public final PluginsStatus plugins() {
+        return this.plugins;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("node_id");
+        generator.write(this.nodeId);
+
+        generator.writeKey("type");
+        this.type.serialize(generator, mapper);
+        generator.writeKey("reason");
+        generator.write(this.reason);
+
+        generator.writeKey("shutdown_startedmillis");
+        generator.write(this.shutdownStartedmillis);
+
+        generator.writeKey("status");
+        this.status.serialize(generator, mapper);
+        generator.writeKey("shard_migration");
+        this.shardMigration.serialize(generator, mapper);
+
+        generator.writeKey("persistent_tasks");
+        this.persistentTasks.serialize(generator, mapper);
+
+        generator.writeKey("plugins");
+        this.plugins.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link NodeShutdownStatus}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeShutdownStatus> {
+        private String nodeId;
+
+        private ShutdownType type;
+
+        private String reason;
+
+        private String shutdownStartedmillis;
+
+        private ShutdownStatus status;
+
+        private ShardMigrationStatus shardMigration;
+
+        private PersistentTaskStatus persistentTasks;
+
+        private PluginsStatus plugins;
+
+        /**
+         * Required - API name: {@code node_id}
+         */
+        public final Builder nodeId(String value) {
+            this.nodeId = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(ShutdownType value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code reason}
+         */
+        public final Builder reason(String value) {
+            this.reason = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shutdown_startedmillis}
+         */
+        public final Builder shutdownStartedmillis(String value) {
+            this.shutdownStartedmillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code status}
+         */
+        public final Builder status(ShutdownStatus value) {
+            this.status = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shard_migration}
+         */
+        public final Builder shardMigration(ShardMigrationStatus value) {
+            this.shardMigration = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shard_migration}
+         */
+        public final Builder shardMigration(Function<ShardMigrationStatus.Builder, ObjectBuilder<ShardMigrationStatus>> fn) {
+            return this.shardMigration(fn.apply(new ShardMigrationStatus.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code persistent_tasks}
+         */
+        public final Builder persistentTasks(PersistentTaskStatus value) {
+            this.persistentTasks = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code persistent_tasks}
+         */
+        public final Builder persistentTasks(Function<PersistentTaskStatus.Builder, ObjectBuilder<PersistentTaskStatus>> fn) {
+            return this.persistentTasks(fn.apply(new PersistentTaskStatus.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code plugins}
+         */
+        public final Builder plugins(PluginsStatus value) {
+            this.plugins = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code plugins}
+         */
+        public final Builder plugins(Function<PluginsStatus.Builder, ObjectBuilder<PluginsStatus>> fn) {
+            return this.plugins(fn.apply(new PluginsStatus.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link NodeShutdownStatus}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public NodeShutdownStatus build() {
+            _checkSingleUse();
+
+            return new NodeShutdownStatus(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link NodeShutdownStatus}
+     */
+    public static final JsonpDeserializer<NodeShutdownStatus> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        NodeShutdownStatus::setupNodeShutdownStatusDeserializer
+    );
+
+    protected static void setupNodeShutdownStatusDeserializer(ObjectDeserializer<NodeShutdownStatus.Builder> op) {
+
+        op.add(Builder::nodeId, JsonpDeserializer.stringDeserializer(), "node_id");
+        op.add(Builder::type, ShutdownType._DESERIALIZER, "type");
+        op.add(Builder::reason, JsonpDeserializer.stringDeserializer(), "reason");
+        op.add(Builder::shutdownStartedmillis, JsonpDeserializer.stringDeserializer(), "shutdown_startedmillis");
+        op.add(Builder::status, ShutdownStatus._DESERIALIZER, "status");
+        op.add(Builder::shardMigration, ShardMigrationStatus._DESERIALIZER, "shard_migration");
+        op.add(Builder::persistentTasks, PersistentTaskStatus._DESERIALIZER, "persistent_tasks");
+        op.add(Builder::plugins, PluginsStatus._DESERIALIZER, "plugins");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/PersistentTaskStatus.java b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/PersistentTaskStatus.java
index ae2f44266b..929b8c5963 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/PersistentTaskStatus.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/PersistentTaskStatus.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.shutdown.get_node;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,93 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: shutdown.get_node.PersistentTaskStatus
 
 @JsonpDeserializable
 public class PersistentTaskStatus implements JsonpSerializable {
-	private final ShutdownStatus status;
+    private final ShutdownStatus status;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private PersistentTaskStatus(Builder builder) {
+    private PersistentTaskStatus(Builder builder) {
 
-		this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
+        this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
 
-	}
+    }
 
-	public static PersistentTaskStatus of(Function<Builder, ObjectBuilder<PersistentTaskStatus>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static PersistentTaskStatus of(Function<Builder, ObjectBuilder<PersistentTaskStatus>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code status}
-	 */
-	public final ShutdownStatus status() {
-		return this.status;
-	}
+    /**
+     * Required - API name: {@code status}
+     */
+    public final ShutdownStatus status() {
+        return this.status;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("status");
-		this.status.serialize(generator, mapper);
+        generator.writeKey("status");
+        this.status.serialize(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link PersistentTaskStatus}.
-	 */
+    /**
+     * Builder for {@link PersistentTaskStatus}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PersistentTaskStatus> {
-		private ShutdownStatus status;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PersistentTaskStatus> {
+        private ShutdownStatus status;
 
-		/**
-		 * Required - API name: {@code status}
-		 */
-		public final Builder status(ShutdownStatus value) {
-			this.status = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code status}
+         */
+        public final Builder status(ShutdownStatus value) {
+            this.status = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link PersistentTaskStatus}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PersistentTaskStatus build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link PersistentTaskStatus}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PersistentTaskStatus build() {
+            _checkSingleUse();
 
-			return new PersistentTaskStatus(this);
-		}
-	}
+            return new PersistentTaskStatus(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link PersistentTaskStatus}
-	 */
-	public static final JsonpDeserializer<PersistentTaskStatus> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, PersistentTaskStatus::setupPersistentTaskStatusDeserializer);
+    /**
+     * Json deserializer for {@link PersistentTaskStatus}
+     */
+    public static final JsonpDeserializer<PersistentTaskStatus> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PersistentTaskStatus::setupPersistentTaskStatusDeserializer
+    );
 
-	protected static void setupPersistentTaskStatusDeserializer(ObjectDeserializer<PersistentTaskStatus.Builder> op) {
+    protected static void setupPersistentTaskStatusDeserializer(ObjectDeserializer<PersistentTaskStatus.Builder> op) {
 
-		op.add(Builder::status, ShutdownStatus._DESERIALIZER, "status");
+        op.add(Builder::status, ShutdownStatus._DESERIALIZER, "status");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/PluginsStatus.java b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/PluginsStatus.java
index a055688104..a9528b6ed6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/PluginsStatus.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/PluginsStatus.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.shutdown.get_node;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,93 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: shutdown.get_node.PluginsStatus
 
 @JsonpDeserializable
 public class PluginsStatus implements JsonpSerializable {
-	private final ShutdownStatus status;
+    private final ShutdownStatus status;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private PluginsStatus(Builder builder) {
+    private PluginsStatus(Builder builder) {
 
-		this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
+        this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
 
-	}
+    }
 
-	public static PluginsStatus of(Function<Builder, ObjectBuilder<PluginsStatus>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static PluginsStatus of(Function<Builder, ObjectBuilder<PluginsStatus>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code status}
-	 */
-	public final ShutdownStatus status() {
-		return this.status;
-	}
+    /**
+     * Required - API name: {@code status}
+     */
+    public final ShutdownStatus status() {
+        return this.status;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("status");
-		this.status.serialize(generator, mapper);
+        generator.writeKey("status");
+        this.status.serialize(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link PluginsStatus}.
-	 */
+    /**
+     * Builder for {@link PluginsStatus}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PluginsStatus> {
-		private ShutdownStatus status;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PluginsStatus> {
+        private ShutdownStatus status;
 
-		/**
-		 * Required - API name: {@code status}
-		 */
-		public final Builder status(ShutdownStatus value) {
-			this.status = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code status}
+         */
+        public final Builder status(ShutdownStatus value) {
+            this.status = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link PluginsStatus}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public PluginsStatus build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link PluginsStatus}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public PluginsStatus build() {
+            _checkSingleUse();
 
-			return new PluginsStatus(this);
-		}
-	}
+            return new PluginsStatus(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link PluginsStatus}
-	 */
-	public static final JsonpDeserializer<PluginsStatus> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			PluginsStatus::setupPluginsStatusDeserializer);
+    /**
+     * Json deserializer for {@link PluginsStatus}
+     */
+    public static final JsonpDeserializer<PluginsStatus> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        PluginsStatus::setupPluginsStatusDeserializer
+    );
 
-	protected static void setupPluginsStatusDeserializer(ObjectDeserializer<PluginsStatus.Builder> op) {
+    protected static void setupPluginsStatusDeserializer(ObjectDeserializer<PluginsStatus.Builder> op) {
 
-		op.add(Builder::status, ShutdownStatus._DESERIALIZER, "status");
+        op.add(Builder::status, ShutdownStatus._DESERIALIZER, "status");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/ShardMigrationStatus.java b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/ShardMigrationStatus.java
index a655c2faa1..cf9f37bd4a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/ShardMigrationStatus.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/ShardMigrationStatus.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.shutdown.get_node;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,93 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: shutdown.get_node.ShardMigrationStatus
 
 @JsonpDeserializable
 public class ShardMigrationStatus implements JsonpSerializable {
-	private final ShutdownStatus status;
+    private final ShutdownStatus status;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ShardMigrationStatus(Builder builder) {
+    private ShardMigrationStatus(Builder builder) {
 
-		this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
+        this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
 
-	}
+    }
 
-	public static ShardMigrationStatus of(Function<Builder, ObjectBuilder<ShardMigrationStatus>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ShardMigrationStatus of(Function<Builder, ObjectBuilder<ShardMigrationStatus>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code status}
-	 */
-	public final ShutdownStatus status() {
-		return this.status;
-	}
+    /**
+     * Required - API name: {@code status}
+     */
+    public final ShutdownStatus status() {
+        return this.status;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("status");
-		this.status.serialize(generator, mapper);
+        generator.writeKey("status");
+        this.status.serialize(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link ShardMigrationStatus}.
-	 */
+    /**
+     * Builder for {@link ShardMigrationStatus}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardMigrationStatus> {
-		private ShutdownStatus status;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardMigrationStatus> {
+        private ShutdownStatus status;
 
-		/**
-		 * Required - API name: {@code status}
-		 */
-		public final Builder status(ShutdownStatus value) {
-			this.status = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code status}
+         */
+        public final Builder status(ShutdownStatus value) {
+            this.status = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link ShardMigrationStatus}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardMigrationStatus build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link ShardMigrationStatus}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardMigrationStatus build() {
+            _checkSingleUse();
 
-			return new ShardMigrationStatus(this);
-		}
-	}
+            return new ShardMigrationStatus(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link ShardMigrationStatus}
-	 */
-	public static final JsonpDeserializer<ShardMigrationStatus> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ShardMigrationStatus::setupShardMigrationStatusDeserializer);
+    /**
+     * Json deserializer for {@link ShardMigrationStatus}
+     */
+    public static final JsonpDeserializer<ShardMigrationStatus> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardMigrationStatus::setupShardMigrationStatusDeserializer
+    );
 
-	protected static void setupShardMigrationStatusDeserializer(ObjectDeserializer<ShardMigrationStatus.Builder> op) {
+    protected static void setupShardMigrationStatusDeserializer(ObjectDeserializer<ShardMigrationStatus.Builder> op) {
 
-		op.add(Builder::status, ShutdownStatus._DESERIALIZER, "status");
+        op.add(Builder::status, ShutdownStatus._DESERIALIZER, "status");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/ShutdownStatus.java b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/ShutdownStatus.java
index 45886a9178..934ef473e2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/ShutdownStatus.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/ShutdownStatus.java
@@ -37,26 +37,25 @@
 
 @JsonpDeserializable
 public enum ShutdownStatus implements JsonEnum {
-	NotStarted("not_started"),
+    NotStarted("not_started"),
 
-	InProgress("in_progress"),
+    InProgress("in_progress"),
 
-	Stalled("stalled"),
+    Stalled("stalled"),
 
-	Complete("complete"),
+    Complete("complete"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	ShutdownStatus(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    ShutdownStatus(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<ShutdownStatus> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			ShutdownStatus.values());
+    public static final JsonEnum.Deserializer<ShutdownStatus> _DESERIALIZER = new JsonEnum.Deserializer<>(ShutdownStatus.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/ShutdownType.java b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/ShutdownType.java
index 7bc2e538f0..d56aa4581e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/ShutdownType.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/shutdown/get_node/ShutdownType.java
@@ -37,22 +37,21 @@
 
 @JsonpDeserializable
 public enum ShutdownType implements JsonEnum {
-	Remove("remove"),
+    Remove("remove"),
 
-	Restart("restart"),
+    Restart("restart"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	ShutdownType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    ShutdownType(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<ShutdownType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			ShutdownType.values());
+    public static final JsonEnum.Deserializer<ShutdownType> _DESERIALIZER = new JsonEnum.Deserializer<>(ShutdownType.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CleanupRepositoryRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CleanupRepositoryRequest.java
index b47e4b629a..1d262d386a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CleanupRepositoryRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CleanupRepositoryRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,233 +45,232 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: snapshot.cleanup_repository.Request
 
 /**
  * Removes stale data from repository.
- * 
+ *
  */
 
 public class CleanupRepositoryRequest extends RequestBase {
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final String name;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CleanupRepositoryRequest(Builder builder) {
-
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.timeout = builder.timeout;
-
-	}
-
-	public static CleanupRepositoryRequest of(Function<Builder, ObjectBuilder<CleanupRepositoryRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Explicit operation timeout for connection to master node
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to cluster-manager node
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Required - A repository name
-	 * <p>
-	 * API name: {@code repository}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CleanupRepositoryRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CleanupRepositoryRequest> {
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		private String name;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - A repository name
-		 * <p>
-		 * API name: {@code repository}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link CleanupRepositoryRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CleanupRepositoryRequest build() {
-			_checkSingleUse();
-
-			return new CleanupRepositoryRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code snapshot.cleanup_repository}".
-	 */
-	public static final Endpoint<CleanupRepositoryRequest, CleanupRepositoryResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _name;
-
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_snapshot");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name, buf);
-					buf.append("/_cleanup");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, CleanupRepositoryResponse._DESERIALIZER);
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final String name;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CleanupRepositoryRequest(Builder builder) {
+
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.timeout = builder.timeout;
+
+    }
+
+    public static CleanupRepositoryRequest of(Function<Builder, ObjectBuilder<CleanupRepositoryRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Explicit operation timeout for connection to master node
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Explicit operation timeout for connection to cluster-manager node
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Required - A repository name
+     * <p>
+     * API name: {@code repository}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CleanupRepositoryRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CleanupRepositoryRequest> {
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        private String name;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - A repository name
+         * <p>
+         * API name: {@code repository}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link CleanupRepositoryRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CleanupRepositoryRequest build() {
+            _checkSingleUse();
+
+            return new CleanupRepositoryRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code snapshot.cleanup_repository}".
+     */
+    public static final Endpoint<CleanupRepositoryRequest, CleanupRepositoryResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _name;
+
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_snapshot");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name, buf);
+                buf.append("/_cleanup");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        CleanupRepositoryResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CleanupRepositoryResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CleanupRepositoryResponse.java
index bc772ff5e8..88bd225e5f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CleanupRepositoryResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CleanupRepositoryResponse.java
@@ -32,112 +32,111 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
-import org.opensearch.client.opensearch.snapshot.cleanup_repository.CleanupRepositoryResults;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.snapshot.cleanup_repository.CleanupRepositoryResults;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: snapshot.cleanup_repository.Response
 
 @JsonpDeserializable
 public class CleanupRepositoryResponse implements JsonpSerializable {
-	private final CleanupRepositoryResults results;
+    private final CleanupRepositoryResults results;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private CleanupRepositoryResponse(Builder builder) {
+    private CleanupRepositoryResponse(Builder builder) {
 
-		this.results = ApiTypeHelper.requireNonNull(builder.results, this, "results");
+        this.results = ApiTypeHelper.requireNonNull(builder.results, this, "results");
 
-	}
+    }
 
-	public static CleanupRepositoryResponse of(Function<Builder, ObjectBuilder<CleanupRepositoryResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static CleanupRepositoryResponse of(Function<Builder, ObjectBuilder<CleanupRepositoryResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code results}
-	 */
-	public final CleanupRepositoryResults results() {
-		return this.results;
-	}
+    /**
+     * Required - API name: {@code results}
+     */
+    public final CleanupRepositoryResults results() {
+        return this.results;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("results");
-		this.results.serialize(generator, mapper);
+        generator.writeKey("results");
+        this.results.serialize(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link CleanupRepositoryResponse}.
-	 */
+    /**
+     * Builder for {@link CleanupRepositoryResponse}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CleanupRepositoryResponse> {
-		private CleanupRepositoryResults results;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CleanupRepositoryResponse> {
+        private CleanupRepositoryResults results;
 
-		/**
-		 * Required - API name: {@code results}
-		 */
-		public final Builder results(CleanupRepositoryResults value) {
-			this.results = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code results}
+         */
+        public final Builder results(CleanupRepositoryResults value) {
+            this.results = value;
+            return this;
+        }
 
-		/**
-		 * Required - API name: {@code results}
-		 */
-		public final Builder results(
-				Function<CleanupRepositoryResults.Builder, ObjectBuilder<CleanupRepositoryResults>> fn) {
-			return this.results(fn.apply(new CleanupRepositoryResults.Builder()).build());
-		}
+        /**
+         * Required - API name: {@code results}
+         */
+        public final Builder results(Function<CleanupRepositoryResults.Builder, ObjectBuilder<CleanupRepositoryResults>> fn) {
+            return this.results(fn.apply(new CleanupRepositoryResults.Builder()).build());
+        }
 
-		/**
-		 * Builds a {@link CleanupRepositoryResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CleanupRepositoryResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link CleanupRepositoryResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CleanupRepositoryResponse build() {
+            _checkSingleUse();
 
-			return new CleanupRepositoryResponse(this);
-		}
-	}
+            return new CleanupRepositoryResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link CleanupRepositoryResponse}
-	 */
-	public static final JsonpDeserializer<CleanupRepositoryResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CleanupRepositoryResponse::setupCleanupRepositoryResponseDeserializer);
+    /**
+     * Json deserializer for {@link CleanupRepositoryResponse}
+     */
+    public static final JsonpDeserializer<CleanupRepositoryResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CleanupRepositoryResponse::setupCleanupRepositoryResponseDeserializer
+    );
 
-	protected static void setupCleanupRepositoryResponseDeserializer(
-			ObjectDeserializer<CleanupRepositoryResponse.Builder> op) {
+    protected static void setupCleanupRepositoryResponseDeserializer(ObjectDeserializer<CleanupRepositoryResponse.Builder> op) {
 
-		op.add(Builder::results, CleanupRepositoryResults._DESERIALIZER, "results");
+        op.add(Builder::results, CleanupRepositoryResults._DESERIALIZER, "results");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CloneSnapshotRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CloneSnapshotRequest.java
index 6cac3d16a4..565c45d508 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CloneSnapshotRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CloneSnapshotRequest.java
@@ -32,25 +32,25 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+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.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: snapshot.clone.Request
 
@@ -60,319 +60,325 @@
  */
 @JsonpDeserializable
 public class CloneSnapshotRequest extends RequestBase implements JsonpSerializable {
-	private final String indices;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final String repository;
-
-	private final String snapshot;
-
-	private final String targetSnapshot;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CloneSnapshotRequest(Builder builder) {
-
-		this.indices = ApiTypeHelper.requireNonNull(builder.indices, this, "indices");
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.repository = ApiTypeHelper.requireNonNull(builder.repository, this, "repository");
-		this.snapshot = ApiTypeHelper.requireNonNull(builder.snapshot, this, "snapshot");
-		this.targetSnapshot = ApiTypeHelper.requireNonNull(builder.targetSnapshot, this, "targetSnapshot");
-		this.timeout = builder.timeout;
-
-	}
-
-	public static CloneSnapshotRequest of(Function<Builder, ObjectBuilder<CloneSnapshotRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code indices}
-	 */
-	public final String indices() {
-		return this.indices;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to master node
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to cluster-manager node
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Required - A repository name
-	 * <p>
-	 * API name: {@code repository}
-	 */
-	public final String repository() {
-		return this.repository;
-	}
-
-	/**
-	 * Required - The name of the snapshot to clone from
-	 * <p>
-	 * API name: {@code snapshot}
-	 */
-	public final String snapshot() {
-		return this.snapshot;
-	}
-
-	/**
-	 * Required - The name of the cloned snapshot to create
-	 * <p>
-	 * API name: {@code target_snapshot}
-	 */
-	public final String targetSnapshot() {
-		return this.targetSnapshot;
-	}
-
-	/**
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("indices");
-		generator.write(this.indices);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CloneSnapshotRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CloneSnapshotRequest> {
-		private String indices;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		private String repository;
-
-		private String snapshot;
-
-		private String targetSnapshot;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * Required - API name: {@code indices}
-		 */
-		public final Builder indices(String value) {
-			this.indices = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - A repository name
-		 * <p>
-		 * API name: {@code repository}
-		 */
-		public final Builder repository(String value) {
-			this.repository = value;
-			return this;
-		}
-
-		/**
-		 * Required - The name of the snapshot to clone from
-		 * <p>
-		 * API name: {@code snapshot}
-		 */
-		public final Builder snapshot(String value) {
-			this.snapshot = value;
-			return this;
-		}
-
-		/**
-		 * Required - The name of the cloned snapshot to create
-		 * <p>
-		 * API name: {@code target_snapshot}
-		 */
-		public final Builder targetSnapshot(String value) {
-			this.targetSnapshot = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link CloneSnapshotRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CloneSnapshotRequest build() {
-			_checkSingleUse();
-
-			return new CloneSnapshotRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CloneSnapshotRequest}
-	 */
-	public static final JsonpDeserializer<CloneSnapshotRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CloneSnapshotRequest::setupCloneSnapshotRequestDeserializer);
-
-	protected static void setupCloneSnapshotRequestDeserializer(ObjectDeserializer<CloneSnapshotRequest.Builder> op) {
-
-		op.add(Builder::indices, JsonpDeserializer.stringDeserializer(), "indices");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code snapshot.clone}".
-	 */
-	public static final Endpoint<CloneSnapshotRequest, CloneSnapshotResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "PUT";
-
-			},
-
-			// Request path
-			request -> {
-				final int _targetSnapshot = 1 << 0;
-				final int _repository = 1 << 1;
-				final int _snapshot = 1 << 2;
-
-				int propsSet = 0;
-
-				propsSet |= _targetSnapshot;
-				propsSet |= _repository;
-				propsSet |= _snapshot;
-
-				if (propsSet == (_repository | _snapshot | _targetSnapshot)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_snapshot");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.repository, buf);
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.snapshot, buf);
-					buf.append("/_clone");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.targetSnapshot, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, CloneSnapshotResponse._DESERIALIZER);
+    private final String indices;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final String repository;
+
+    private final String snapshot;
+
+    private final String targetSnapshot;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CloneSnapshotRequest(Builder builder) {
+
+        this.indices = ApiTypeHelper.requireNonNull(builder.indices, this, "indices");
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.repository = ApiTypeHelper.requireNonNull(builder.repository, this, "repository");
+        this.snapshot = ApiTypeHelper.requireNonNull(builder.snapshot, this, "snapshot");
+        this.targetSnapshot = ApiTypeHelper.requireNonNull(builder.targetSnapshot, this, "targetSnapshot");
+        this.timeout = builder.timeout;
+
+    }
+
+    public static CloneSnapshotRequest of(Function<Builder, ObjectBuilder<CloneSnapshotRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code indices}
+     */
+    public final String indices() {
+        return this.indices;
+    }
+
+    /**
+     * Explicit operation timeout for connection to master node
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Explicit operation timeout for connection to cluster-manager node
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Required - A repository name
+     * <p>
+     * API name: {@code repository}
+     */
+    public final String repository() {
+        return this.repository;
+    }
+
+    /**
+     * Required - The name of the snapshot to clone from
+     * <p>
+     * API name: {@code snapshot}
+     */
+    public final String snapshot() {
+        return this.snapshot;
+    }
+
+    /**
+     * Required - The name of the cloned snapshot to create
+     * <p>
+     * API name: {@code target_snapshot}
+     */
+    public final String targetSnapshot() {
+        return this.targetSnapshot;
+    }
+
+    /**
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("indices");
+        generator.write(this.indices);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CloneSnapshotRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CloneSnapshotRequest> {
+        private String indices;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        private String repository;
+
+        private String snapshot;
+
+        private String targetSnapshot;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * Required - API name: {@code indices}
+         */
+        public final Builder indices(String value) {
+            this.indices = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - A repository name
+         * <p>
+         * API name: {@code repository}
+         */
+        public final Builder repository(String value) {
+            this.repository = value;
+            return this;
+        }
+
+        /**
+         * Required - The name of the snapshot to clone from
+         * <p>
+         * API name: {@code snapshot}
+         */
+        public final Builder snapshot(String value) {
+            this.snapshot = value;
+            return this;
+        }
+
+        /**
+         * Required - The name of the cloned snapshot to create
+         * <p>
+         * API name: {@code target_snapshot}
+         */
+        public final Builder targetSnapshot(String value) {
+            this.targetSnapshot = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link CloneSnapshotRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CloneSnapshotRequest build() {
+            _checkSingleUse();
+
+            return new CloneSnapshotRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CloneSnapshotRequest}
+     */
+    public static final JsonpDeserializer<CloneSnapshotRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CloneSnapshotRequest::setupCloneSnapshotRequestDeserializer
+    );
+
+    protected static void setupCloneSnapshotRequestDeserializer(ObjectDeserializer<CloneSnapshotRequest.Builder> op) {
+
+        op.add(Builder::indices, JsonpDeserializer.stringDeserializer(), "indices");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code snapshot.clone}".
+     */
+    public static final Endpoint<CloneSnapshotRequest, CloneSnapshotResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "PUT";
+
+        },
+
+        // Request path
+        request -> {
+            final int _targetSnapshot = 1 << 0;
+            final int _repository = 1 << 1;
+            final int _snapshot = 1 << 2;
+
+            int propsSet = 0;
+
+            propsSet |= _targetSnapshot;
+            propsSet |= _repository;
+            propsSet |= _snapshot;
+
+            if (propsSet == (_repository | _snapshot | _targetSnapshot)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_snapshot");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.repository, buf);
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.snapshot, buf);
+                buf.append("/_clone");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.targetSnapshot, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        CloneSnapshotResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CloneSnapshotResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CloneSnapshotResponse.java
index ebd5899b8e..b41d071c45 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CloneSnapshotResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CloneSnapshotResponse.java
@@ -32,68 +32,67 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: snapshot.clone.Response
 
 @JsonpDeserializable
 public class CloneSnapshotResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private CloneSnapshotResponse(Builder builder) {
-		super(builder);
+    private CloneSnapshotResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static CloneSnapshotResponse of(Function<Builder, ObjectBuilder<CloneSnapshotResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static CloneSnapshotResponse of(Function<Builder, ObjectBuilder<CloneSnapshotResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link CloneSnapshotResponse}.
-	 */
+    /**
+     * Builder for {@link CloneSnapshotResponse}.
+     */
 
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<CloneSnapshotResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<CloneSnapshotResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link CloneSnapshotResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CloneSnapshotResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link CloneSnapshotResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CloneSnapshotResponse build() {
+            _checkSingleUse();
 
-			return new CloneSnapshotResponse(this);
-		}
-	}
+            return new CloneSnapshotResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link CloneSnapshotResponse}
-	 */
-	public static final JsonpDeserializer<CloneSnapshotResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CloneSnapshotResponse::setupCloneSnapshotResponseDeserializer);
+    /**
+     * Json deserializer for {@link CloneSnapshotResponse}
+     */
+    public static final JsonpDeserializer<CloneSnapshotResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CloneSnapshotResponse::setupCloneSnapshotResponseDeserializer
+    );
 
-	protected static void setupCloneSnapshotResponseDeserializer(ObjectDeserializer<CloneSnapshotResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+    protected static void setupCloneSnapshotResponseDeserializer(ObjectDeserializer<CloneSnapshotResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateRepositoryRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateRepositoryRequest.java
index fdea0fc57f..5019dcd0e1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateRepositoryRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateRepositoryRequest.java
@@ -32,395 +32,400 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+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.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: snapshot.create_repository.Request
 
 /**
  * Creates a repository.
- * 
+ *
  */
 @JsonpDeserializable
 public class CreateRepositoryRequest extends RequestBase implements JsonpSerializable {
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final String name;
-
-	@Nullable
-	private final Repository repository;
-
-	private final RepositorySettings settings;
-
-	@Nullable
-	private final Time timeout;
-
-	private final String type;
-
-	@Nullable
-	private final Boolean verify;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CreateRepositoryRequest(Builder builder) {
-
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.repository = builder.repository;
-		this.settings = ApiTypeHelper.requireNonNull(builder.settings, this, "settings");
-		this.timeout = builder.timeout;
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-		this.verify = builder.verify;
-
-	}
-
-	public static CreateRepositoryRequest of(Function<Builder, ObjectBuilder<CreateRepositoryRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Explicit operation timeout for connection to master node
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to cluster-manager node
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Required - A repository name
-	 * <p>
-	 * API name: {@code repository}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * API name: {@code repository}
-	 */
-	@Nullable
-	public final Repository repository() {
-		return this.repository;
-	}
-
-	/**
-	 * Required - API name: {@code settings}
-	 */
-	public final RepositorySettings settings() {
-		return this.settings;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * Whether to verify the repository after creation
-	 * <p>
-	 * API name: {@code verify}
-	 */
-	@Nullable
-	public final Boolean verify() {
-		return this.verify;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.repository != null) {
-			generator.writeKey("repository");
-			this.repository.serialize(generator, mapper);
-
-		}
-		generator.writeKey("settings");
-		this.settings.serialize(generator, mapper);
-
-		generator.writeKey("type");
-		generator.write(this.type);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CreateRepositoryRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CreateRepositoryRequest> {
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		private String name;
-
-		@Nullable
-		private Repository repository;
-
-		private RepositorySettings settings;
-
-		@Nullable
-		private Time timeout;
-
-		private String type;
-
-		@Nullable
-		private Boolean verify;
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - A repository name
-		 * <p>
-		 * API name: {@code repository}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code repository}
-		 */
-		public final Builder repository(@Nullable Repository value) {
-			this.repository = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code repository}
-		 */
-		public final Builder repository(Function<Repository.Builder, ObjectBuilder<Repository>> fn) {
-			return this.repository(fn.apply(new Repository.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code settings}
-		 */
-		public final Builder settings(RepositorySettings value) {
-			this.settings = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code settings}
-		 */
-		public final Builder settings(Function<RepositorySettings.Builder, ObjectBuilder<RepositorySettings>> fn) {
-			return this.settings(fn.apply(new RepositorySettings.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Whether to verify the repository after creation
-		 * <p>
-		 * API name: {@code verify}
-		 */
-		public final Builder verify(@Nullable Boolean value) {
-			this.verify = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CreateRepositoryRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CreateRepositoryRequest build() {
-			_checkSingleUse();
-
-			return new CreateRepositoryRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CreateRepositoryRequest}
-	 */
-	public static final JsonpDeserializer<CreateRepositoryRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CreateRepositoryRequest::setupCreateRepositoryRequestDeserializer);
-
-	protected static void setupCreateRepositoryRequestDeserializer(
-			ObjectDeserializer<CreateRepositoryRequest.Builder> op) {
-
-		op.add(Builder::repository, Repository._DESERIALIZER, "repository");
-		op.add(Builder::settings, RepositorySettings._DESERIALIZER, "settings");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code snapshot.create_repository}".
-	 */
-	public static final Endpoint<CreateRepositoryRequest, CreateRepositoryResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "PUT";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _name;
-
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_snapshot");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.verify != null) {
-					params.put("verify", String.valueOf(request.verify));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, CreateRepositoryResponse._DESERIALIZER);
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final String name;
+
+    @Nullable
+    private final Repository repository;
+
+    private final RepositorySettings settings;
+
+    @Nullable
+    private final Time timeout;
+
+    private final String type;
+
+    @Nullable
+    private final Boolean verify;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CreateRepositoryRequest(Builder builder) {
+
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.repository = builder.repository;
+        this.settings = ApiTypeHelper.requireNonNull(builder.settings, this, "settings");
+        this.timeout = builder.timeout;
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.verify = builder.verify;
+
+    }
+
+    public static CreateRepositoryRequest of(Function<Builder, ObjectBuilder<CreateRepositoryRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Explicit operation timeout for connection to master node
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Explicit operation timeout for connection to cluster-manager node
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Required - A repository name
+     * <p>
+     * API name: {@code repository}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * API name: {@code repository}
+     */
+    @Nullable
+    public final Repository repository() {
+        return this.repository;
+    }
+
+    /**
+     * Required - API name: {@code settings}
+     */
+    public final RepositorySettings settings() {
+        return this.settings;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * Whether to verify the repository after creation
+     * <p>
+     * API name: {@code verify}
+     */
+    @Nullable
+    public final Boolean verify() {
+        return this.verify;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.repository != null) {
+            generator.writeKey("repository");
+            this.repository.serialize(generator, mapper);
+
+        }
+        generator.writeKey("settings");
+        this.settings.serialize(generator, mapper);
+
+        generator.writeKey("type");
+        generator.write(this.type);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CreateRepositoryRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CreateRepositoryRequest> {
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        private String name;
+
+        @Nullable
+        private Repository repository;
+
+        private RepositorySettings settings;
+
+        @Nullable
+        private Time timeout;
+
+        private String type;
+
+        @Nullable
+        private Boolean verify;
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - A repository name
+         * <p>
+         * API name: {@code repository}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code repository}
+         */
+        public final Builder repository(@Nullable Repository value) {
+            this.repository = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code repository}
+         */
+        public final Builder repository(Function<Repository.Builder, ObjectBuilder<Repository>> fn) {
+            return this.repository(fn.apply(new Repository.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code settings}
+         */
+        public final Builder settings(RepositorySettings value) {
+            this.settings = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code settings}
+         */
+        public final Builder settings(Function<RepositorySettings.Builder, ObjectBuilder<RepositorySettings>> fn) {
+            return this.settings(fn.apply(new RepositorySettings.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Whether to verify the repository after creation
+         * <p>
+         * API name: {@code verify}
+         */
+        public final Builder verify(@Nullable Boolean value) {
+            this.verify = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link CreateRepositoryRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CreateRepositoryRequest build() {
+            _checkSingleUse();
+
+            return new CreateRepositoryRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CreateRepositoryRequest}
+     */
+    public static final JsonpDeserializer<CreateRepositoryRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CreateRepositoryRequest::setupCreateRepositoryRequestDeserializer
+    );
+
+    protected static void setupCreateRepositoryRequestDeserializer(ObjectDeserializer<CreateRepositoryRequest.Builder> op) {
+
+        op.add(Builder::repository, Repository._DESERIALIZER, "repository");
+        op.add(Builder::settings, RepositorySettings._DESERIALIZER, "settings");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code snapshot.create_repository}".
+     */
+    public static final Endpoint<CreateRepositoryRequest, CreateRepositoryResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "PUT";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _name;
+
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_snapshot");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.verify != null) {
+                params.put("verify", String.valueOf(request.verify));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        CreateRepositoryResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateRepositoryResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateRepositoryResponse.java
index 7d96b6d9db..33b2585dde 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateRepositoryResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateRepositoryResponse.java
@@ -32,69 +32,69 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: snapshot.create_repository.Response
 
 @JsonpDeserializable
 public class CreateRepositoryResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
-
-	private CreateRepositoryResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static CreateRepositoryResponse of(Function<Builder, ObjectBuilder<CreateRepositoryResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CreateRepositoryResponse}.
-	 */
-
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<CreateRepositoryResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CreateRepositoryResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CreateRepositoryResponse build() {
-			_checkSingleUse();
-
-			return new CreateRepositoryResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CreateRepositoryResponse}
-	 */
-	public static final JsonpDeserializer<CreateRepositoryResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CreateRepositoryResponse::setupCreateRepositoryResponseDeserializer);
-
-	protected static void setupCreateRepositoryResponseDeserializer(
-			ObjectDeserializer<CreateRepositoryResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private CreateRepositoryResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static CreateRepositoryResponse of(Function<Builder, ObjectBuilder<CreateRepositoryResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CreateRepositoryResponse}.
+     */
+
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<CreateRepositoryResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link CreateRepositoryResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CreateRepositoryResponse build() {
+            _checkSingleUse();
+
+            return new CreateRepositoryResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CreateRepositoryResponse}
+     */
+    public static final JsonpDeserializer<CreateRepositoryResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CreateRepositoryResponse::setupCreateRepositoryResponseDeserializer
+    );
+
+    protected static void setupCreateRepositoryResponseDeserializer(ObjectDeserializer<CreateRepositoryResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateSnapshotRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateSnapshotRequest.java
index aced99af8d..9ffaa6a5e8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateSnapshotRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateSnapshotRequest.java
@@ -32,9 +32,12 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -42,590 +45,591 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+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.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: snapshot.create.Request
 
 /**
  * Creates a snapshot in a repository.
- * 
+ *
  */
 @JsonpDeserializable
 public class CreateSnapshotRequest extends RequestBase implements JsonpSerializable {
-	private final List<String> featureStates;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	@Nullable
-	private final Boolean includeGlobalState;
-
-	private final List<String> indices;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final Map<String, JsonData> metadata;
-
-	@Nullable
-	private final Boolean partial;
-
-	private final String repository;
-
-	private final String snapshot;
-
-	@Nullable
-	private final Boolean waitForCompletion;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CreateSnapshotRequest(Builder builder) {
-
-		this.featureStates = ApiTypeHelper.unmodifiable(builder.featureStates);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.includeGlobalState = builder.includeGlobalState;
-		this.indices = ApiTypeHelper.unmodifiable(builder.indices);
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.metadata = ApiTypeHelper.unmodifiable(builder.metadata);
-		this.partial = builder.partial;
-		this.repository = ApiTypeHelper.requireNonNull(builder.repository, this, "repository");
-		this.snapshot = ApiTypeHelper.requireNonNull(builder.snapshot, this, "snapshot");
-		this.waitForCompletion = builder.waitForCompletion;
-
-	}
-
-	public static CreateSnapshotRequest of(Function<Builder, ObjectBuilder<CreateSnapshotRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Feature states to include in the snapshot. Each feature state includes one or
-	 * more system indices containing related data. You can view a list of eligible
-	 * features using the get features API. If <code>include_global_state</code> is
-	 * <code>true</code>, all current feature states are included by default. If
-	 * <code>include_global_state</code> is <code>false</code>, no feature states
-	 * are included by default.
-	 * <p>
-	 * API name: {@code feature_states}
-	 */
-	public final List<String> featureStates() {
-		return this.featureStates;
-	}
-
-	/**
-	 * If <code>true</code>, the request ignores data streams and indices in
-	 * <code>indices</code> that are missing or closed. If <code>false</code>, the
-	 * request returns an error for any data stream or index that is missing or
-	 * closed.
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * If <code>true</code>, 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 indices, such as Watches and task records
-	 * (configurable via <code>feature_states</code>).
-	 * <p>
-	 * API name: {@code include_global_state}
-	 */
-	@Nullable
-	public final Boolean includeGlobalState() {
-		return this.includeGlobalState;
-	}
-
-	/**
-	 * Data streams and indices to include in the snapshot. Supports multi-target
-	 * syntax. Includes all data streams and indices by default.
-	 * <p>
-	 * API name: {@code indices}
-	 */
-	public final List<String> indices() {
-		return this.indices;
-	}
-
-	/**
-	 * Period to wait for a connection to the master node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Period to wait for a connection to the cluster-manager node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Optional metadata for the snapshot. May have any contents. Must be less than
-	 * 1024 bytes. This map is not automatically generated by Elasticsearch.
-	 * <p>
-	 * API name: {@code metadata}
-	 */
-	public final Map<String, JsonData> metadata() {
-		return this.metadata;
-	}
-
-	/**
-	 * If <code>true</code>, allows restoring a partial snapshot of indices with
-	 * unavailable shards. Only shards that were successfully included in the
-	 * snapshot will be restored. All missing shards will be recreated as empty. If
-	 * <code>false</code>, the entire restore operation will fail if one or more
-	 * indices included in the snapshot do not have all primary shards available.
-	 * <p>
-	 * API name: {@code partial}
-	 */
-	@Nullable
-	public final Boolean partial() {
-		return this.partial;
-	}
-
-	/**
-	 * Required - Repository for the snapshot.
-	 * <p>
-	 * API name: {@code repository}
-	 */
-	public final String repository() {
-		return this.repository;
-	}
-
-	/**
-	 * Required - Name of the snapshot. Must be unique in the repository.
-	 * <p>
-	 * API name: {@code snapshot}
-	 */
-	public final String snapshot() {
-		return this.snapshot;
-	}
-
-	/**
-	 * If <code>true</code>, the request returns a response when the snapshot is
-	 * complete. If <code>false</code>, the request returns a response when the
-	 * snapshot initializes.
-	 * <p>
-	 * API name: {@code wait_for_completion}
-	 */
-	@Nullable
-	public final Boolean waitForCompletion() {
-		return this.waitForCompletion;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.featureStates)) {
-			generator.writeKey("feature_states");
-			generator.writeStartArray();
-			for (String item0 : this.featureStates) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.ignoreUnavailable != null) {
-			generator.writeKey("ignore_unavailable");
-			generator.write(this.ignoreUnavailable);
-
-		}
-		if (this.includeGlobalState != null) {
-			generator.writeKey("include_global_state");
-			generator.write(this.includeGlobalState);
-
-		}
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartArray();
-			for (String item0 : this.indices) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.metadata)) {
-			generator.writeKey("metadata");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.metadata.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.partial != null) {
-			generator.writeKey("partial");
-			generator.write(this.partial);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CreateSnapshotRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CreateSnapshotRequest> {
-		@Nullable
-		private List<String> featureStates;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private Boolean includeGlobalState;
-
-		@Nullable
-		private List<String> indices;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Map<String, JsonData> metadata;
-
-		@Nullable
-		private Boolean partial;
-
-		private String repository;
-
-		private String snapshot;
-
-		@Nullable
-		private Boolean waitForCompletion;
-
-		/**
-		 * Feature states to include in the snapshot. Each feature state includes one or
-		 * more system indices containing related data. You can view a list of eligible
-		 * features using the get features API. If <code>include_global_state</code> is
-		 * <code>true</code>, all current feature states are included by default. If
-		 * <code>include_global_state</code> is <code>false</code>, no feature states
-		 * are included by default.
-		 * <p>
-		 * API name: {@code feature_states}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>featureStates</code>.
-		 */
-		public final Builder featureStates(List<String> list) {
-			this.featureStates = _listAddAll(this.featureStates, list);
-			return this;
-		}
-
-		/**
-		 * Feature states to include in the snapshot. Each feature state includes one or
-		 * more system indices containing related data. You can view a list of eligible
-		 * features using the get features API. If <code>include_global_state</code> is
-		 * <code>true</code>, all current feature states are included by default. If
-		 * <code>include_global_state</code> is <code>false</code>, no feature states
-		 * are included by default.
-		 * <p>
-		 * API name: {@code feature_states}
-		 * <p>
-		 * Adds one or more values to <code>featureStates</code>.
-		 */
-		public final Builder featureStates(String value, String... values) {
-			this.featureStates = _listAdd(this.featureStates, value, values);
-			return this;
-		}
-
-		/**
-		 * If <code>true</code>, the request ignores data streams and indices in
-		 * <code>indices</code> that are missing or closed. If <code>false</code>, the
-		 * request returns an error for any data stream or index that is missing or
-		 * closed.
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * If <code>true</code>, 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 indices, such as Watches and task records
-		 * (configurable via <code>feature_states</code>).
-		 * <p>
-		 * API name: {@code include_global_state}
-		 */
-		public final Builder includeGlobalState(@Nullable Boolean value) {
-			this.includeGlobalState = value;
-			return this;
-		}
-
-		/**
-		 * Data streams and indices to include in the snapshot. Supports multi-target
-		 * syntax. Includes all data streams and indices by default.
-		 * <p>
-		 * API name: {@code indices}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indices</code>.
-		 */
-		public final Builder indices(List<String> list) {
-			this.indices = _listAddAll(this.indices, list);
-			return this;
-		}
-
-		/**
-		 * Data streams and indices to include in the snapshot. Supports multi-target
-		 * syntax. Includes all data streams and indices by default.
-		 * <p>
-		 * API name: {@code indices}
-		 * <p>
-		 * Adds one or more values to <code>indices</code>.
-		 */
-		public final Builder indices(String value, String... values) {
-			this.indices = _listAdd(this.indices, value, values);
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Optional metadata for the snapshot. May have any contents. Must be less than
-		 * 1024 bytes. This map is not automatically generated by Elasticsearch.
-		 * <p>
-		 * API name: {@code metadata}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>metadata</code>.
-		 */
-		public final Builder metadata(Map<String, JsonData> map) {
-			this.metadata = _mapPutAll(this.metadata, map);
-			return this;
-		}
-
-		/**
-		 * Optional metadata for the snapshot. May have any contents. Must be less than
-		 * 1024 bytes. This map is not automatically generated by Elasticsearch.
-		 * <p>
-		 * API name: {@code metadata}
-		 * <p>
-		 * Adds an entry to <code>metadata</code>.
-		 */
-		public final Builder metadata(String key, JsonData value) {
-			this.metadata = _mapPut(this.metadata, key, value);
-			return this;
-		}
-
-		/**
-		 * If <code>true</code>, allows restoring a partial snapshot of indices with
-		 * unavailable shards. Only shards that were successfully included in the
-		 * snapshot will be restored. All missing shards will be recreated as empty. If
-		 * <code>false</code>, the entire restore operation will fail if one or more
-		 * indices included in the snapshot do not have all primary shards available.
-		 * <p>
-		 * API name: {@code partial}
-		 */
-		public final Builder partial(@Nullable Boolean value) {
-			this.partial = value;
-			return this;
-		}
-
-		/**
-		 * Required - Repository for the snapshot.
-		 * <p>
-		 * API name: {@code repository}
-		 */
-		public final Builder repository(String value) {
-			this.repository = value;
-			return this;
-		}
-
-		/**
-		 * Required - Name of the snapshot. Must be unique in the repository.
-		 * <p>
-		 * API name: {@code snapshot}
-		 */
-		public final Builder snapshot(String value) {
-			this.snapshot = value;
-			return this;
-		}
-
-		/**
-		 * If <code>true</code>, the request returns a response when the snapshot is
-		 * complete. If <code>false</code>, the request returns a response when the
-		 * snapshot initializes.
-		 * <p>
-		 * API name: {@code wait_for_completion}
-		 */
-		public final Builder waitForCompletion(@Nullable Boolean value) {
-			this.waitForCompletion = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CreateSnapshotRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CreateSnapshotRequest build() {
-			_checkSingleUse();
-
-			return new CreateSnapshotRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CreateSnapshotRequest}
-	 */
-	public static final JsonpDeserializer<CreateSnapshotRequest> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CreateSnapshotRequest::setupCreateSnapshotRequestDeserializer);
-
-	protected static void setupCreateSnapshotRequestDeserializer(ObjectDeserializer<CreateSnapshotRequest.Builder> op) {
-
-		op.add(Builder::featureStates, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"feature_states");
-		op.add(Builder::ignoreUnavailable, JsonpDeserializer.booleanDeserializer(), "ignore_unavailable");
-		op.add(Builder::includeGlobalState, JsonpDeserializer.booleanDeserializer(), "include_global_state");
-		op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"indices");
-		op.add(Builder::metadata, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "metadata");
-		op.add(Builder::partial, JsonpDeserializer.booleanDeserializer(), "partial");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code snapshot.create}".
-	 */
-	public static final Endpoint<CreateSnapshotRequest, CreateSnapshotResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "PUT";
-
-			},
-
-			// Request path
-			request -> {
-				final int _repository = 1 << 0;
-				final int _snapshot = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _repository;
-				propsSet |= _snapshot;
-
-				if (propsSet == (_repository | _snapshot)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_snapshot");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.repository, buf);
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.snapshot, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.waitForCompletion != null) {
-					params.put("wait_for_completion", String.valueOf(request.waitForCompletion));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, CreateSnapshotResponse._DESERIALIZER);
+    private final List<String> featureStates;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    @Nullable
+    private final Boolean includeGlobalState;
+
+    private final List<String> indices;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final Map<String, JsonData> metadata;
+
+    @Nullable
+    private final Boolean partial;
+
+    private final String repository;
+
+    private final String snapshot;
+
+    @Nullable
+    private final Boolean waitForCompletion;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CreateSnapshotRequest(Builder builder) {
+
+        this.featureStates = ApiTypeHelper.unmodifiable(builder.featureStates);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.includeGlobalState = builder.includeGlobalState;
+        this.indices = ApiTypeHelper.unmodifiable(builder.indices);
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.metadata = ApiTypeHelper.unmodifiable(builder.metadata);
+        this.partial = builder.partial;
+        this.repository = ApiTypeHelper.requireNonNull(builder.repository, this, "repository");
+        this.snapshot = ApiTypeHelper.requireNonNull(builder.snapshot, this, "snapshot");
+        this.waitForCompletion = builder.waitForCompletion;
+
+    }
+
+    public static CreateSnapshotRequest of(Function<Builder, ObjectBuilder<CreateSnapshotRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Feature states to include in the snapshot. Each feature state includes one or
+     * more system indices containing related data. You can view a list of eligible
+     * features using the get features API. If <code>include_global_state</code> is
+     * <code>true</code>, all current feature states are included by default. If
+     * <code>include_global_state</code> is <code>false</code>, no feature states
+     * are included by default.
+     * <p>
+     * API name: {@code feature_states}
+     */
+    public final List<String> featureStates() {
+        return this.featureStates;
+    }
+
+    /**
+     * If <code>true</code>, the request ignores data streams and indices in
+     * <code>indices</code> that are missing or closed. If <code>false</code>, the
+     * request returns an error for any data stream or index that is missing or
+     * closed.
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * If <code>true</code>, 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 indices, such as Watches and task records
+     * (configurable via <code>feature_states</code>).
+     * <p>
+     * API name: {@code include_global_state}
+     */
+    @Nullable
+    public final Boolean includeGlobalState() {
+        return this.includeGlobalState;
+    }
+
+    /**
+     * Data streams and indices to include in the snapshot. Supports multi-target
+     * syntax. Includes all data streams and indices by default.
+     * <p>
+     * API name: {@code indices}
+     */
+    public final List<String> indices() {
+        return this.indices;
+    }
+
+    /**
+     * Period to wait for a connection to the master node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Period to wait for a connection to the cluster-manager node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Optional metadata for the snapshot. May have any contents. Must be less than
+     * 1024 bytes. This map is not automatically generated by Elasticsearch.
+     * <p>
+     * API name: {@code metadata}
+     */
+    public final Map<String, JsonData> metadata() {
+        return this.metadata;
+    }
+
+    /**
+     * If <code>true</code>, allows restoring a partial snapshot of indices with
+     * unavailable shards. Only shards that were successfully included in the
+     * snapshot will be restored. All missing shards will be recreated as empty. If
+     * <code>false</code>, the entire restore operation will fail if one or more
+     * indices included in the snapshot do not have all primary shards available.
+     * <p>
+     * API name: {@code partial}
+     */
+    @Nullable
+    public final Boolean partial() {
+        return this.partial;
+    }
+
+    /**
+     * Required - Repository for the snapshot.
+     * <p>
+     * API name: {@code repository}
+     */
+    public final String repository() {
+        return this.repository;
+    }
+
+    /**
+     * Required - Name of the snapshot. Must be unique in the repository.
+     * <p>
+     * API name: {@code snapshot}
+     */
+    public final String snapshot() {
+        return this.snapshot;
+    }
+
+    /**
+     * If <code>true</code>, the request returns a response when the snapshot is
+     * complete. If <code>false</code>, the request returns a response when the
+     * snapshot initializes.
+     * <p>
+     * API name: {@code wait_for_completion}
+     */
+    @Nullable
+    public final Boolean waitForCompletion() {
+        return this.waitForCompletion;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.featureStates)) {
+            generator.writeKey("feature_states");
+            generator.writeStartArray();
+            for (String item0 : this.featureStates) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.ignoreUnavailable != null) {
+            generator.writeKey("ignore_unavailable");
+            generator.write(this.ignoreUnavailable);
+
+        }
+        if (this.includeGlobalState != null) {
+            generator.writeKey("include_global_state");
+            generator.write(this.includeGlobalState);
+
+        }
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartArray();
+            for (String item0 : this.indices) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.metadata)) {
+            generator.writeKey("metadata");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.metadata.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.partial != null) {
+            generator.writeKey("partial");
+            generator.write(this.partial);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CreateSnapshotRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CreateSnapshotRequest> {
+        @Nullable
+        private List<String> featureStates;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private Boolean includeGlobalState;
+
+        @Nullable
+        private List<String> indices;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Map<String, JsonData> metadata;
+
+        @Nullable
+        private Boolean partial;
+
+        private String repository;
+
+        private String snapshot;
+
+        @Nullable
+        private Boolean waitForCompletion;
+
+        /**
+         * Feature states to include in the snapshot. Each feature state includes one or
+         * more system indices containing related data. You can view a list of eligible
+         * features using the get features API. If <code>include_global_state</code> is
+         * <code>true</code>, all current feature states are included by default. If
+         * <code>include_global_state</code> is <code>false</code>, no feature states
+         * are included by default.
+         * <p>
+         * API name: {@code feature_states}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>featureStates</code>.
+         */
+        public final Builder featureStates(List<String> list) {
+            this.featureStates = _listAddAll(this.featureStates, list);
+            return this;
+        }
+
+        /**
+         * Feature states to include in the snapshot. Each feature state includes one or
+         * more system indices containing related data. You can view a list of eligible
+         * features using the get features API. If <code>include_global_state</code> is
+         * <code>true</code>, all current feature states are included by default. If
+         * <code>include_global_state</code> is <code>false</code>, no feature states
+         * are included by default.
+         * <p>
+         * API name: {@code feature_states}
+         * <p>
+         * Adds one or more values to <code>featureStates</code>.
+         */
+        public final Builder featureStates(String value, String... values) {
+            this.featureStates = _listAdd(this.featureStates, value, values);
+            return this;
+        }
+
+        /**
+         * If <code>true</code>, the request ignores data streams and indices in
+         * <code>indices</code> that are missing or closed. If <code>false</code>, the
+         * request returns an error for any data stream or index that is missing or
+         * closed.
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * If <code>true</code>, 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 indices, such as Watches and task records
+         * (configurable via <code>feature_states</code>).
+         * <p>
+         * API name: {@code include_global_state}
+         */
+        public final Builder includeGlobalState(@Nullable Boolean value) {
+            this.includeGlobalState = value;
+            return this;
+        }
+
+        /**
+         * Data streams and indices to include in the snapshot. Supports multi-target
+         * syntax. Includes all data streams and indices by default.
+         * <p>
+         * API name: {@code indices}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indices</code>.
+         */
+        public final Builder indices(List<String> list) {
+            this.indices = _listAddAll(this.indices, list);
+            return this;
+        }
+
+        /**
+         * Data streams and indices to include in the snapshot. Supports multi-target
+         * syntax. Includes all data streams and indices by default.
+         * <p>
+         * API name: {@code indices}
+         * <p>
+         * Adds one or more values to <code>indices</code>.
+         */
+        public final Builder indices(String value, String... values) {
+            this.indices = _listAdd(this.indices, value, values);
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Optional metadata for the snapshot. May have any contents. Must be less than
+         * 1024 bytes. This map is not automatically generated by Elasticsearch.
+         * <p>
+         * API name: {@code metadata}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>metadata</code>.
+         */
+        public final Builder metadata(Map<String, JsonData> map) {
+            this.metadata = _mapPutAll(this.metadata, map);
+            return this;
+        }
+
+        /**
+         * Optional metadata for the snapshot. May have any contents. Must be less than
+         * 1024 bytes. This map is not automatically generated by Elasticsearch.
+         * <p>
+         * API name: {@code metadata}
+         * <p>
+         * Adds an entry to <code>metadata</code>.
+         */
+        public final Builder metadata(String key, JsonData value) {
+            this.metadata = _mapPut(this.metadata, key, value);
+            return this;
+        }
+
+        /**
+         * If <code>true</code>, allows restoring a partial snapshot of indices with
+         * unavailable shards. Only shards that were successfully included in the
+         * snapshot will be restored. All missing shards will be recreated as empty. If
+         * <code>false</code>, the entire restore operation will fail if one or more
+         * indices included in the snapshot do not have all primary shards available.
+         * <p>
+         * API name: {@code partial}
+         */
+        public final Builder partial(@Nullable Boolean value) {
+            this.partial = value;
+            return this;
+        }
+
+        /**
+         * Required - Repository for the snapshot.
+         * <p>
+         * API name: {@code repository}
+         */
+        public final Builder repository(String value) {
+            this.repository = value;
+            return this;
+        }
+
+        /**
+         * Required - Name of the snapshot. Must be unique in the repository.
+         * <p>
+         * API name: {@code snapshot}
+         */
+        public final Builder snapshot(String value) {
+            this.snapshot = value;
+            return this;
+        }
+
+        /**
+         * If <code>true</code>, the request returns a response when the snapshot is
+         * complete. If <code>false</code>, the request returns a response when the
+         * snapshot initializes.
+         * <p>
+         * API name: {@code wait_for_completion}
+         */
+        public final Builder waitForCompletion(@Nullable Boolean value) {
+            this.waitForCompletion = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link CreateSnapshotRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CreateSnapshotRequest build() {
+            _checkSingleUse();
+
+            return new CreateSnapshotRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CreateSnapshotRequest}
+     */
+    public static final JsonpDeserializer<CreateSnapshotRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CreateSnapshotRequest::setupCreateSnapshotRequestDeserializer
+    );
+
+    protected static void setupCreateSnapshotRequestDeserializer(ObjectDeserializer<CreateSnapshotRequest.Builder> op) {
+
+        op.add(Builder::featureStates, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "feature_states");
+        op.add(Builder::ignoreUnavailable, JsonpDeserializer.booleanDeserializer(), "ignore_unavailable");
+        op.add(Builder::includeGlobalState, JsonpDeserializer.booleanDeserializer(), "include_global_state");
+        op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "indices");
+        op.add(Builder::metadata, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "metadata");
+        op.add(Builder::partial, JsonpDeserializer.booleanDeserializer(), "partial");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code snapshot.create}".
+     */
+    public static final Endpoint<CreateSnapshotRequest, CreateSnapshotResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "PUT";
+
+        },
+
+        // Request path
+        request -> {
+            final int _repository = 1 << 0;
+            final int _snapshot = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _repository;
+            propsSet |= _snapshot;
+
+            if (propsSet == (_repository | _snapshot)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_snapshot");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.repository, buf);
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.snapshot, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.waitForCompletion != null) {
+                params.put("wait_for_completion", String.valueOf(request.waitForCompletion));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        CreateSnapshotResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateSnapshotResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateSnapshotResponse.java
index 49c0344bb8..0ebb53a094 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateSnapshotResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateSnapshotResponse.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,130 +44,128 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: snapshot.create.Response
 
 @JsonpDeserializable
 public class CreateSnapshotResponse implements JsonpSerializable {
-	@Nullable
-	private final Boolean accepted;
-
-	private final SnapshotInfo snapshot;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CreateSnapshotResponse(Builder builder) {
-
-		this.accepted = builder.accepted;
-		this.snapshot = ApiTypeHelper.requireNonNull(builder.snapshot, this, "snapshot");
-
-	}
-
-	public static CreateSnapshotResponse of(Function<Builder, ObjectBuilder<CreateSnapshotResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code accepted}
-	 */
-	@Nullable
-	public final Boolean accepted() {
-		return this.accepted;
-	}
-
-	/**
-	 * Required - API name: {@code snapshot}
-	 */
-	public final SnapshotInfo snapshot() {
-		return this.snapshot;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.accepted != null) {
-			generator.writeKey("accepted");
-			generator.write(this.accepted);
-
-		}
-		generator.writeKey("snapshot");
-		this.snapshot.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CreateSnapshotResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CreateSnapshotResponse> {
-		@Nullable
-		private Boolean accepted;
-
-		private SnapshotInfo snapshot;
-
-		/**
-		 * API name: {@code accepted}
-		 */
-		public final Builder accepted(@Nullable Boolean value) {
-			this.accepted = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code snapshot}
-		 */
-		public final Builder snapshot(SnapshotInfo value) {
-			this.snapshot = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code snapshot}
-		 */
-		public final Builder snapshot(Function<SnapshotInfo.Builder, ObjectBuilder<SnapshotInfo>> fn) {
-			return this.snapshot(fn.apply(new SnapshotInfo.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link CreateSnapshotResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CreateSnapshotResponse build() {
-			_checkSingleUse();
-
-			return new CreateSnapshotResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CreateSnapshotResponse}
-	 */
-	public static final JsonpDeserializer<CreateSnapshotResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CreateSnapshotResponse::setupCreateSnapshotResponseDeserializer);
-
-	protected static void setupCreateSnapshotResponseDeserializer(
-			ObjectDeserializer<CreateSnapshotResponse.Builder> op) {
-
-		op.add(Builder::accepted, JsonpDeserializer.booleanDeserializer(), "accepted");
-		op.add(Builder::snapshot, SnapshotInfo._DESERIALIZER, "snapshot");
-
-	}
+    @Nullable
+    private final Boolean accepted;
+
+    private final SnapshotInfo snapshot;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CreateSnapshotResponse(Builder builder) {
+
+        this.accepted = builder.accepted;
+        this.snapshot = ApiTypeHelper.requireNonNull(builder.snapshot, this, "snapshot");
+
+    }
+
+    public static CreateSnapshotResponse of(Function<Builder, ObjectBuilder<CreateSnapshotResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code accepted}
+     */
+    @Nullable
+    public final Boolean accepted() {
+        return this.accepted;
+    }
+
+    /**
+     * Required - API name: {@code snapshot}
+     */
+    public final SnapshotInfo snapshot() {
+        return this.snapshot;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.accepted != null) {
+            generator.writeKey("accepted");
+            generator.write(this.accepted);
+
+        }
+        generator.writeKey("snapshot");
+        this.snapshot.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CreateSnapshotResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CreateSnapshotResponse> {
+        @Nullable
+        private Boolean accepted;
+
+        private SnapshotInfo snapshot;
+
+        /**
+         * API name: {@code accepted}
+         */
+        public final Builder accepted(@Nullable Boolean value) {
+            this.accepted = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code snapshot}
+         */
+        public final Builder snapshot(SnapshotInfo value) {
+            this.snapshot = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code snapshot}
+         */
+        public final Builder snapshot(Function<SnapshotInfo.Builder, ObjectBuilder<SnapshotInfo>> fn) {
+            return this.snapshot(fn.apply(new SnapshotInfo.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link CreateSnapshotResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CreateSnapshotResponse build() {
+            _checkSingleUse();
+
+            return new CreateSnapshotResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CreateSnapshotResponse}
+     */
+    public static final JsonpDeserializer<CreateSnapshotResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CreateSnapshotResponse::setupCreateSnapshotResponseDeserializer
+    );
+
+    protected static void setupCreateSnapshotResponseDeserializer(ObjectDeserializer<CreateSnapshotResponse.Builder> op) {
+
+        op.add(Builder::accepted, JsonpDeserializer.booleanDeserializer(), "accepted");
+        op.add(Builder::snapshot, SnapshotInfo._DESERIALIZER, "snapshot");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/DeleteRepositoryRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/DeleteRepositoryRequest.java
index 841d583adb..bc42a3d20a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/DeleteRepositoryRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/DeleteRepositoryRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,250 +47,247 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: snapshot.delete_repository.Request
 
 /**
  * Deletes a repository.
- * 
+ *
  */
 
 public class DeleteRepositoryRequest extends RequestBase {
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final List<String> name;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteRepositoryRequest(Builder builder) {
-
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = ApiTypeHelper.unmodifiableRequired(builder.name, this, "name");
-		this.timeout = builder.timeout;
-
-	}
-
-	public static DeleteRepositoryRequest of(Function<Builder, ObjectBuilder<DeleteRepositoryRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Explicit operation timeout for connection to master node
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to cluster-manager node
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Required - Name of the snapshot repository to unregister. Wildcard
-	 * (<code>*</code>) patterns are supported.
-	 * <p>
-	 * API name: {@code repository}
-	 */
-	public final List<String> name() {
-		return this.name;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteRepositoryRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteRepositoryRequest> {
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		private List<String> name;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - Name of the snapshot repository to unregister. Wildcard
-		 * (<code>*</code>) patterns are supported.
-		 * <p>
-		 * API name: {@code repository}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>name</code>.
-		 */
-		public final Builder name(List<String> list) {
-			this.name = _listAddAll(this.name, list);
-			return this;
-		}
-
-		/**
-		 * Required - Name of the snapshot repository to unregister. Wildcard
-		 * (<code>*</code>) patterns are supported.
-		 * <p>
-		 * API name: {@code repository}
-		 * <p>
-		 * Adds one or more values to <code>name</code>.
-		 */
-		public final Builder name(String value, String... values) {
-			this.name = _listAdd(this.name, value, values);
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link DeleteRepositoryRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteRepositoryRequest build() {
-			_checkSingleUse();
-
-			return new DeleteRepositoryRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code snapshot.delete_repository}".
-	 */
-	public static final Endpoint<DeleteRepositoryRequest, DeleteRepositoryResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "DELETE";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _name;
-
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_snapshot");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, DeleteRepositoryResponse._DESERIALIZER);
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final List<String> name;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteRepositoryRequest(Builder builder) {
+
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = ApiTypeHelper.unmodifiableRequired(builder.name, this, "name");
+        this.timeout = builder.timeout;
+
+    }
+
+    public static DeleteRepositoryRequest of(Function<Builder, ObjectBuilder<DeleteRepositoryRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Explicit operation timeout for connection to master node
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Explicit operation timeout for connection to cluster-manager node
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Required - Name of the snapshot repository to unregister. Wildcard
+     * (<code>*</code>) patterns are supported.
+     * <p>
+     * API name: {@code repository}
+     */
+    public final List<String> name() {
+        return this.name;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteRepositoryRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteRepositoryRequest> {
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        private List<String> name;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - Name of the snapshot repository to unregister. Wildcard
+         * (<code>*</code>) patterns are supported.
+         * <p>
+         * API name: {@code repository}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>name</code>.
+         */
+        public final Builder name(List<String> list) {
+            this.name = _listAddAll(this.name, list);
+            return this;
+        }
+
+        /**
+         * Required - Name of the snapshot repository to unregister. Wildcard
+         * (<code>*</code>) patterns are supported.
+         * <p>
+         * API name: {@code repository}
+         * <p>
+         * Adds one or more values to <code>name</code>.
+         */
+        public final Builder name(String value, String... values) {
+            this.name = _listAdd(this.name, value, values);
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link DeleteRepositoryRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteRepositoryRequest build() {
+            _checkSingleUse();
+
+            return new DeleteRepositoryRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code snapshot.delete_repository}".
+     */
+    public static final Endpoint<DeleteRepositoryRequest, DeleteRepositoryResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "DELETE";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _name;
+
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_snapshot");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        DeleteRepositoryResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/DeleteRepositoryResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/DeleteRepositoryResponse.java
index 9ec745de61..78541abe80 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/DeleteRepositoryResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/DeleteRepositoryResponse.java
@@ -32,69 +32,69 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: snapshot.delete_repository.Response
 
 @JsonpDeserializable
 public class DeleteRepositoryResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteRepositoryResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static DeleteRepositoryResponse of(Function<Builder, ObjectBuilder<DeleteRepositoryResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteRepositoryResponse}.
-	 */
-
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DeleteRepositoryResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DeleteRepositoryResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteRepositoryResponse build() {
-			_checkSingleUse();
-
-			return new DeleteRepositoryResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link DeleteRepositoryResponse}
-	 */
-	public static final JsonpDeserializer<DeleteRepositoryResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DeleteRepositoryResponse::setupDeleteRepositoryResponseDeserializer);
-
-	protected static void setupDeleteRepositoryResponseDeserializer(
-			ObjectDeserializer<DeleteRepositoryResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteRepositoryResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static DeleteRepositoryResponse of(Function<Builder, ObjectBuilder<DeleteRepositoryResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteRepositoryResponse}.
+     */
+
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
+        implements
+            ObjectBuilder<DeleteRepositoryResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link DeleteRepositoryResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteRepositoryResponse build() {
+            _checkSingleUse();
+
+            return new DeleteRepositoryResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link DeleteRepositoryResponse}
+     */
+    public static final JsonpDeserializer<DeleteRepositoryResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DeleteRepositoryResponse::setupDeleteRepositoryResponseDeserializer
+    );
+
+    protected static void setupDeleteRepositoryResponseDeserializer(ObjectDeserializer<DeleteRepositoryResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/DeleteSnapshotRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/DeleteSnapshotRequest.java
index fdb50696c5..850ca3458c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/DeleteSnapshotRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/DeleteSnapshotRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,218 +45,217 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: snapshot.delete.Request
 
 /**
  * Deletes a snapshot.
- * 
+ *
  */
 
 public class DeleteSnapshotRequest extends RequestBase {
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final String repository;
-
-	private final String snapshot;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private DeleteSnapshotRequest(Builder builder) {
-
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.repository = ApiTypeHelper.requireNonNull(builder.repository, this, "repository");
-		this.snapshot = ApiTypeHelper.requireNonNull(builder.snapshot, this, "snapshot");
-
-	}
-
-	public static DeleteSnapshotRequest of(Function<Builder, ObjectBuilder<DeleteSnapshotRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Explicit operation timeout for connection to master node
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to cluster-manager node
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Required - A repository name
-	 * <p>
-	 * API name: {@code repository}
-	 */
-	public final String repository() {
-		return this.repository;
-	}
-
-	/**
-	 * Required - A snapshot name
-	 * <p>
-	 * API name: {@code snapshot}
-	 */
-	public final String snapshot() {
-		return this.snapshot;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DeleteSnapshotRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteSnapshotRequest> {
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		private String repository;
-
-		private String snapshot;
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - A repository name
-		 * <p>
-		 * API name: {@code repository}
-		 */
-		public final Builder repository(String value) {
-			this.repository = value;
-			return this;
-		}
-
-		/**
-		 * Required - A snapshot name
-		 * <p>
-		 * API name: {@code snapshot}
-		 */
-		public final Builder snapshot(String value) {
-			this.snapshot = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DeleteSnapshotRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteSnapshotRequest build() {
-			_checkSingleUse();
-
-			return new DeleteSnapshotRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code snapshot.delete}".
-	 */
-	public static final Endpoint<DeleteSnapshotRequest, DeleteSnapshotResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "DELETE";
-
-			},
-
-			// Request path
-			request -> {
-				final int _repository = 1 << 0;
-				final int _snapshot = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _repository;
-				propsSet |= _snapshot;
-
-				if (propsSet == (_repository | _snapshot)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_snapshot");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.repository, buf);
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.snapshot, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, DeleteSnapshotResponse._DESERIALIZER);
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final String repository;
+
+    private final String snapshot;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private DeleteSnapshotRequest(Builder builder) {
+
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.repository = ApiTypeHelper.requireNonNull(builder.repository, this, "repository");
+        this.snapshot = ApiTypeHelper.requireNonNull(builder.snapshot, this, "snapshot");
+
+    }
+
+    public static DeleteSnapshotRequest of(Function<Builder, ObjectBuilder<DeleteSnapshotRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Explicit operation timeout for connection to master node
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Explicit operation timeout for connection to cluster-manager node
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Required - A repository name
+     * <p>
+     * API name: {@code repository}
+     */
+    public final String repository() {
+        return this.repository;
+    }
+
+    /**
+     * Required - A snapshot name
+     * <p>
+     * API name: {@code snapshot}
+     */
+    public final String snapshot() {
+        return this.snapshot;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link DeleteSnapshotRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<DeleteSnapshotRequest> {
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        private String repository;
+
+        private String snapshot;
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - A repository name
+         * <p>
+         * API name: {@code repository}
+         */
+        public final Builder repository(String value) {
+            this.repository = value;
+            return this;
+        }
+
+        /**
+         * Required - A snapshot name
+         * <p>
+         * API name: {@code snapshot}
+         */
+        public final Builder snapshot(String value) {
+            this.snapshot = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link DeleteSnapshotRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteSnapshotRequest build() {
+            _checkSingleUse();
+
+            return new DeleteSnapshotRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code snapshot.delete}".
+     */
+    public static final Endpoint<DeleteSnapshotRequest, DeleteSnapshotResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "DELETE";
+
+        },
+
+        // Request path
+        request -> {
+            final int _repository = 1 << 0;
+            final int _snapshot = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _repository;
+            propsSet |= _snapshot;
+
+            if (propsSet == (_repository | _snapshot)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_snapshot");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.repository, buf);
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.snapshot, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        DeleteSnapshotResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/DeleteSnapshotResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/DeleteSnapshotResponse.java
index f3eff25cef..adb84b2fe2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/DeleteSnapshotResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/DeleteSnapshotResponse.java
@@ -32,69 +32,67 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
-import org.opensearch.client.opensearch._types.AcknowledgedResponseBase;
+import java.util.function.Function;
 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.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: snapshot.delete.Response
 
 @JsonpDeserializable
 public class DeleteSnapshotResponse extends AcknowledgedResponseBase {
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private DeleteSnapshotResponse(Builder builder) {
-		super(builder);
+    private DeleteSnapshotResponse(Builder builder) {
+        super(builder);
 
-	}
+    }
 
-	public static DeleteSnapshotResponse of(Function<Builder, ObjectBuilder<DeleteSnapshotResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static DeleteSnapshotResponse of(Function<Builder, ObjectBuilder<DeleteSnapshotResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link DeleteSnapshotResponse}.
-	 */
+    /**
+     * Builder for {@link DeleteSnapshotResponse}.
+     */
 
-	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
-			implements
-				ObjectBuilder<DeleteSnapshotResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
+    public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder> implements ObjectBuilder<DeleteSnapshotResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
 
-		/**
-		 * Builds a {@link DeleteSnapshotResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DeleteSnapshotResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link DeleteSnapshotResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public DeleteSnapshotResponse build() {
+            _checkSingleUse();
 
-			return new DeleteSnapshotResponse(this);
-		}
-	}
+            return new DeleteSnapshotResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link DeleteSnapshotResponse}
-	 */
-	public static final JsonpDeserializer<DeleteSnapshotResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DeleteSnapshotResponse::setupDeleteSnapshotResponseDeserializer);
+    /**
+     * Json deserializer for {@link DeleteSnapshotResponse}
+     */
+    public static final JsonpDeserializer<DeleteSnapshotResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        DeleteSnapshotResponse::setupDeleteSnapshotResponseDeserializer
+    );
 
-	protected static void setupDeleteSnapshotResponseDeserializer(
-			ObjectDeserializer<DeleteSnapshotResponse.Builder> op) {
-		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+    protected static void setupDeleteSnapshotResponseDeserializer(ObjectDeserializer<DeleteSnapshotResponse.Builder> op) {
+        AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/FileCountSnapshotStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/FileCountSnapshotStats.java
index ca7a6e7556..b097fdfa39 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/FileCountSnapshotStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/FileCountSnapshotStats.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,117 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: snapshot._types.FileCountSnapshotStats
 
 @JsonpDeserializable
 public class FileCountSnapshotStats implements JsonpSerializable {
-	private final int fileCount;
-
-	private final long sizeInBytes;
-
-	// ---------------------------------------------------------------------------------------------
+    private final int fileCount;
 
-	private FileCountSnapshotStats(Builder builder) {
+    private final long sizeInBytes;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.fileCount = ApiTypeHelper.requireNonNull(builder.fileCount, this, "fileCount");
-		this.sizeInBytes = ApiTypeHelper.requireNonNull(builder.sizeInBytes, this, "sizeInBytes");
+    private FileCountSnapshotStats(Builder builder) {
 
-	}
+        this.fileCount = ApiTypeHelper.requireNonNull(builder.fileCount, this, "fileCount");
+        this.sizeInBytes = ApiTypeHelper.requireNonNull(builder.sizeInBytes, this, "sizeInBytes");
 
-	public static FileCountSnapshotStats of(Function<Builder, ObjectBuilder<FileCountSnapshotStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code file_count}
-	 */
-	public final int fileCount() {
-		return this.fileCount;
-	}
+    public static FileCountSnapshotStats of(Function<Builder, ObjectBuilder<FileCountSnapshotStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code size_in_bytes}
-	 */
-	public final long sizeInBytes() {
-		return this.sizeInBytes;
-	}
+    /**
+     * Required - API name: {@code file_count}
+     */
+    public final int fileCount() {
+        return this.fileCount;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code size_in_bytes}
+     */
+    public final long sizeInBytes() {
+        return this.sizeInBytes;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("file_count");
-		generator.write(this.fileCount);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("size_in_bytes");
-		generator.write(this.sizeInBytes);
+        generator.writeKey("file_count");
+        generator.write(this.fileCount);
 
-	}
+        generator.writeKey("size_in_bytes");
+        generator.write(this.sizeInBytes);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link FileCountSnapshotStats}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FileCountSnapshotStats> {
-		private Integer fileCount;
+    /**
+     * Builder for {@link FileCountSnapshotStats}.
+     */
 
-		private Long sizeInBytes;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FileCountSnapshotStats> {
+        private Integer fileCount;
 
-		/**
-		 * Required - API name: {@code file_count}
-		 */
-		public final Builder fileCount(int value) {
-			this.fileCount = value;
-			return this;
-		}
+        private Long sizeInBytes;
 
-		/**
-		 * Required - API name: {@code size_in_bytes}
-		 */
-		public final Builder sizeInBytes(long value) {
-			this.sizeInBytes = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code file_count}
+         */
+        public final Builder fileCount(int value) {
+            this.fileCount = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link FileCountSnapshotStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public FileCountSnapshotStats build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code size_in_bytes}
+         */
+        public final Builder sizeInBytes(long value) {
+            this.sizeInBytes = value;
+            return this;
+        }
 
-			return new FileCountSnapshotStats(this);
-		}
-	}
+        /**
+         * Builds a {@link FileCountSnapshotStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public FileCountSnapshotStats build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new FileCountSnapshotStats(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link FileCountSnapshotStats}
-	 */
-	public static final JsonpDeserializer<FileCountSnapshotStats> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, FileCountSnapshotStats::setupFileCountSnapshotStatsDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupFileCountSnapshotStatsDeserializer(
-			ObjectDeserializer<FileCountSnapshotStats.Builder> op) {
+    /**
+     * Json deserializer for {@link FileCountSnapshotStats}
+     */
+    public static final JsonpDeserializer<FileCountSnapshotStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        FileCountSnapshotStats::setupFileCountSnapshotStatsDeserializer
+    );
 
-		op.add(Builder::fileCount, JsonpDeserializer.integerDeserializer(), "file_count");
-		op.add(Builder::sizeInBytes, JsonpDeserializer.longDeserializer(), "size_in_bytes");
+    protected static void setupFileCountSnapshotStatsDeserializer(ObjectDeserializer<FileCountSnapshotStats.Builder> op) {
 
-	}
+        op.add(Builder::fileCount, JsonpDeserializer.integerDeserializer(), "file_count");
+        op.add(Builder::sizeInBytes, JsonpDeserializer.longDeserializer(), "size_in_bytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetRepositoryRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetRepositoryRequest.java
index 00959c3115..fb8e7c8de5 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetRepositoryRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetRepositoryRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,13 +47,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: snapshot.get_repository.Request
 
 /**
@@ -55,233 +54,236 @@
  */
 
 public class GetRepositoryRequest extends RequestBase {
-	@Nullable
-	private final Boolean local;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final List<String> name;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetRepositoryRequest(Builder builder) {
-
-		this.local = builder.local;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = ApiTypeHelper.unmodifiable(builder.name);
-
-	}
-
-	public static GetRepositoryRequest of(Function<Builder, ObjectBuilder<GetRepositoryRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Return local information, do not retrieve the state from cluster-manager node
-	 * (default: false)
-	 * <p>
-	 * API name: {@code local}
-	 */
-	@Nullable
-	public final Boolean local() {
-		return this.local;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to master node
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to cluster-manager node
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * A comma-separated list of repository names
-	 * <p>
-	 * API name: {@code repository}
-	 */
-	public final List<String> name() {
-		return this.name;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetRepositoryRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetRepositoryRequest> {
-		@Nullable
-		private Boolean local;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private List<String> name;
-
-		/**
-		 * Return local information, do not retrieve the state from cluster-manager node
-		 * (default: false)
-		 * <p>
-		 * API name: {@code local}
-		 */
-		public final Builder local(@Nullable Boolean value) {
-			this.local = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * A comma-separated list of repository names
-		 * <p>
-		 * API name: {@code repository}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>name</code>.
-		 */
-		public final Builder name(List<String> list) {
-			this.name = _listAddAll(this.name, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of repository names
-		 * <p>
-		 * API name: {@code repository}
-		 * <p>
-		 * Adds one or more values to <code>name</code>.
-		 */
-		public final Builder name(String value, String... values) {
-			this.name = _listAdd(this.name, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetRepositoryRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetRepositoryRequest build() {
-			_checkSingleUse();
-
-			return new GetRepositoryRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code snapshot.get_repository}".
-	 */
-	public static final Endpoint<GetRepositoryRequest, GetRepositoryResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				if (ApiTypeHelper.isDefined(request.name()))
-					propsSet |= _name;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_snapshot");
-					return buf.toString();
-				}
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_snapshot");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.local != null) {
-					params.put("local", String.valueOf(request.local));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, GetRepositoryResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean local;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final List<String> name;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetRepositoryRequest(Builder builder) {
+
+        this.local = builder.local;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = ApiTypeHelper.unmodifiable(builder.name);
+
+    }
+
+    public static GetRepositoryRequest of(Function<Builder, ObjectBuilder<GetRepositoryRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Return local information, do not retrieve the state from cluster-manager node
+     * (default: false)
+     * <p>
+     * API name: {@code local}
+     */
+    @Nullable
+    public final Boolean local() {
+        return this.local;
+    }
+
+    /**
+     * Explicit operation timeout for connection to master node
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Explicit operation timeout for connection to cluster-manager node
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * A comma-separated list of repository names
+     * <p>
+     * API name: {@code repository}
+     */
+    public final List<String> name() {
+        return this.name;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetRepositoryRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetRepositoryRequest> {
+        @Nullable
+        private Boolean local;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private List<String> name;
+
+        /**
+         * Return local information, do not retrieve the state from cluster-manager node
+         * (default: false)
+         * <p>
+         * API name: {@code local}
+         */
+        public final Builder local(@Nullable Boolean value) {
+            this.local = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * A comma-separated list of repository names
+         * <p>
+         * API name: {@code repository}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>name</code>.
+         */
+        public final Builder name(List<String> list) {
+            this.name = _listAddAll(this.name, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of repository names
+         * <p>
+         * API name: {@code repository}
+         * <p>
+         * Adds one or more values to <code>name</code>.
+         */
+        public final Builder name(String value, String... values) {
+            this.name = _listAdd(this.name, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetRepositoryRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetRepositoryRequest build() {
+            _checkSingleUse();
+
+            return new GetRepositoryRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code snapshot.get_repository}".
+     */
+    public static final Endpoint<GetRepositoryRequest, GetRepositoryResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            if (ApiTypeHelper.isDefined(request.name())) propsSet |= _name;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_snapshot");
+                return buf.toString();
+            }
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_snapshot");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.local != null) {
+                params.put("local", String.valueOf(request.local));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetRepositoryResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetRepositoryResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetRepositoryResponse.java
index 0cad51418a..1ee954697c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetRepositoryResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetRepositoryResponse.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
@@ -39,64 +40,63 @@
 import org.opensearch.client.transport.endpoints.DictionaryResponse;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.util.function.Function;
-
 // typedef: snapshot.get_repository.Response
 
 @JsonpDeserializable
 public class GetRepositoryResponse extends DictionaryResponse<String, Repository> {
-	// ---------------------------------------------------------------------------------------------
-
-	private GetRepositoryResponse(Builder builder) {
-		super(builder);
-
-	}
-
-	public static GetRepositoryResponse of(Function<Builder, ObjectBuilder<GetRepositoryResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetRepositoryResponse}.
-	 */
-
-	public static class Builder extends DictionaryResponse.AbstractBuilder<String, Repository, Builder>
-			implements
-				ObjectBuilder<GetRepositoryResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetRepositoryResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetRepositoryResponse build() {
-			_checkSingleUse();
-			super.tKeySerializer(null);
-			super.tValueSerializer(null);
-
-			return new GetRepositoryResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetRepositoryResponse}
-	 */
-	public static final JsonpDeserializer<GetRepositoryResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GetRepositoryResponse::setupGetRepositoryResponseDeserializer);
-
-	protected static void setupGetRepositoryResponseDeserializer(ObjectDeserializer<GetRepositoryResponse.Builder> op) {
-		DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(),
-				Repository._DESERIALIZER);
-
-	}
+    // ---------------------------------------------------------------------------------------------
+
+    private GetRepositoryResponse(Builder builder) {
+        super(builder);
+
+    }
+
+    public static GetRepositoryResponse of(Function<Builder, ObjectBuilder<GetRepositoryResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetRepositoryResponse}.
+     */
+
+    public static class Builder extends DictionaryResponse.AbstractBuilder<String, Repository, Builder>
+        implements
+            ObjectBuilder<GetRepositoryResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetRepositoryResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetRepositoryResponse build() {
+            _checkSingleUse();
+            super.tKeySerializer(null);
+            super.tValueSerializer(null);
+
+            return new GetRepositoryResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetRepositoryResponse}
+     */
+    public static final JsonpDeserializer<GetRepositoryResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetRepositoryResponse::setupGetRepositoryResponseDeserializer
+    );
+
+    protected static void setupGetRepositoryResponseDeserializer(ObjectDeserializer<GetRepositoryResponse.Builder> op) {
+        DictionaryResponse.setupDictionaryResponseDeserializer(op, JsonpDeserializer.stringDeserializer(), Repository._DESERIALIZER);
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetSnapshotRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetSnapshotRequest.java
index 38f8c75a61..0e05ffdc0e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetSnapshotRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetSnapshotRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,13 +47,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: snapshot.get.Request
 
 /**
@@ -56,412 +55,415 @@
  */
 
 public class GetSnapshotRequest extends RequestBase {
-	@Nullable
-	private final Boolean human;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	@Nullable
-	private final Boolean includeRepository;
-
-	@Nullable
-	private final Boolean indexDetails;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final String repository;
-
-	private final List<String> snapshot;
-
-	@Nullable
-	private final Boolean verbose;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetSnapshotRequest(Builder builder) {
-
-		this.human = builder.human;
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.includeRepository = builder.includeRepository;
-		this.indexDetails = builder.indexDetails;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.repository = ApiTypeHelper.requireNonNull(builder.repository, this, "repository");
-		this.snapshot = ApiTypeHelper.unmodifiableRequired(builder.snapshot, this, "snapshot");
-		this.verbose = builder.verbose;
-
-	}
-
-	public static GetSnapshotRequest of(Function<Builder, ObjectBuilder<GetSnapshotRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code human}
-	 */
-	@Nullable
-	public final Boolean human() {
-		return this.human;
-	}
-
-	/**
-	 * If false, the request returns an error for any snapshots that are
-	 * unavailable.
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * Whether to include the repository name in the snapshot info. Defaults to
-	 * true.
-	 * <p>
-	 * API name: {@code include_repository}
-	 */
-	@Nullable
-	public final Boolean includeRepository() {
-		return this.includeRepository;
-	}
-
-	/**
-	 * If true, returns additional information about each index in the snapshot
-	 * comprising the number of shards in the index, the total size of the index in
-	 * bytes, and the maximum number of segments per shard in the index. Defaults to
-	 * false, meaning that this information is omitted.
-	 * <p>
-	 * API name: {@code index_details}
-	 */
-	@Nullable
-	public final Boolean indexDetails() {
-		return this.indexDetails;
-	}
-
-	/**
-	 * Period to wait for a connection to the master node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Period to wait for a connection to the cluster-manager node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Required - Comma-separated list of snapshot repository names used to limit
-	 * the request. Wildcard (*) expressions are supported.
-	 * <p>
-	 * API name: {@code repository}
-	 */
-	public final String repository() {
-		return this.repository;
-	}
-
-	/**
-	 * Required - Comma-separated list of snapshot names to retrieve. Also accepts
-	 * wildcards (*).
-	 * <ul>
-	 * <li>To get information about all snapshots in a registered repository, use a
-	 * wildcard (*) or _all.</li>
-	 * <li>To get information about any snapshots that are currently running, use
-	 * _current.</li>
-	 * </ul>
-	 * <p>
-	 * API name: {@code snapshot}
-	 */
-	public final List<String> snapshot() {
-		return this.snapshot;
-	}
-
-	/**
-	 * If true, returns additional information about each snapshot such as the
-	 * version of Elasticsearch which took the snapshot, the start and end times of
-	 * the snapshot, and the number of shards snapshotted.
-	 * <p>
-	 * API name: {@code verbose}
-	 */
-	@Nullable
-	public final Boolean verbose() {
-		return this.verbose;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetSnapshotRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetSnapshotRequest> {
-		@Nullable
-		private Boolean human;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private Boolean includeRepository;
-
-		@Nullable
-		private Boolean indexDetails;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		private String repository;
-
-		private List<String> snapshot;
-
-		@Nullable
-		private Boolean verbose;
-
-		/**
-		 * API name: {@code human}
-		 */
-		public final Builder human(@Nullable Boolean value) {
-			this.human = value;
-			return this;
-		}
-
-		/**
-		 * If false, the request returns an error for any snapshots that are
-		 * unavailable.
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Whether to include the repository name in the snapshot info. Defaults to
-		 * true.
-		 * <p>
-		 * API name: {@code include_repository}
-		 */
-		public final Builder includeRepository(@Nullable Boolean value) {
-			this.includeRepository = value;
-			return this;
-		}
-
-		/**
-		 * If true, returns additional information about each index in the snapshot
-		 * comprising the number of shards in the index, the total size of the index in
-		 * bytes, and the maximum number of segments per shard in the index. Defaults to
-		 * false, meaning that this information is omitted.
-		 * <p>
-		 * API name: {@code index_details}
-		 */
-		public final Builder indexDetails(@Nullable Boolean value) {
-			this.indexDetails = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Period to wait for a connection to the cluster-manager node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - Comma-separated list of snapshot repository names used to limit
-		 * the request. Wildcard (*) expressions are supported.
-		 * <p>
-		 * API name: {@code repository}
-		 */
-		public final Builder repository(String value) {
-			this.repository = value;
-			return this;
-		}
-
-		/**
-		 * Required - Comma-separated list of snapshot names to retrieve. Also accepts
-		 * wildcards (*).
-		 * <ul>
-		 * <li>To get information about all snapshots in a registered repository, use a
-		 * wildcard (*) or _all.</li>
-		 * <li>To get information about any snapshots that are currently running, use
-		 * _current.</li>
-		 * </ul>
-		 * <p>
-		 * API name: {@code snapshot}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>snapshot</code>.
-		 */
-		public final Builder snapshot(List<String> list) {
-			this.snapshot = _listAddAll(this.snapshot, list);
-			return this;
-		}
-
-		/**
-		 * Required - Comma-separated list of snapshot names to retrieve. Also accepts
-		 * wildcards (*).
-		 * <ul>
-		 * <li>To get information about all snapshots in a registered repository, use a
-		 * wildcard (*) or _all.</li>
-		 * <li>To get information about any snapshots that are currently running, use
-		 * _current.</li>
-		 * </ul>
-		 * <p>
-		 * API name: {@code snapshot}
-		 * <p>
-		 * Adds one or more values to <code>snapshot</code>.
-		 */
-		public final Builder snapshot(String value, String... values) {
-			this.snapshot = _listAdd(this.snapshot, value, values);
-			return this;
-		}
-
-		/**
-		 * If true, returns additional information about each snapshot such as the
-		 * version of Elasticsearch which took the snapshot, the start and end times of
-		 * the snapshot, and the number of shards snapshotted.
-		 * <p>
-		 * API name: {@code verbose}
-		 */
-		public final Builder verbose(@Nullable Boolean value) {
-			this.verbose = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetSnapshotRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetSnapshotRequest build() {
-			_checkSingleUse();
-
-			return new GetSnapshotRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code snapshot.get}".
-	 */
-	public static final Endpoint<GetSnapshotRequest, GetSnapshotResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _repository = 1 << 0;
-				final int _snapshot = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _repository;
-				propsSet |= _snapshot;
-
-				if (propsSet == (_repository | _snapshot)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_snapshot");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.repository, buf);
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.snapshot.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.includeRepository != null) {
-					params.put("include_repository", String.valueOf(request.includeRepository));
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				if (request.indexDetails != null) {
-					params.put("index_details", String.valueOf(request.indexDetails));
-				}
-				if (request.human != null) {
-					params.put("human", String.valueOf(request.human));
-				}
-				if (request.verbose != null) {
-					params.put("verbose", String.valueOf(request.verbose));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, GetSnapshotResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean human;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    @Nullable
+    private final Boolean includeRepository;
+
+    @Nullable
+    private final Boolean indexDetails;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final String repository;
+
+    private final List<String> snapshot;
+
+    @Nullable
+    private final Boolean verbose;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetSnapshotRequest(Builder builder) {
+
+        this.human = builder.human;
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.includeRepository = builder.includeRepository;
+        this.indexDetails = builder.indexDetails;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.repository = ApiTypeHelper.requireNonNull(builder.repository, this, "repository");
+        this.snapshot = ApiTypeHelper.unmodifiableRequired(builder.snapshot, this, "snapshot");
+        this.verbose = builder.verbose;
+
+    }
+
+    public static GetSnapshotRequest of(Function<Builder, ObjectBuilder<GetSnapshotRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code human}
+     */
+    @Nullable
+    public final Boolean human() {
+        return this.human;
+    }
+
+    /**
+     * If false, the request returns an error for any snapshots that are
+     * unavailable.
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * Whether to include the repository name in the snapshot info. Defaults to
+     * true.
+     * <p>
+     * API name: {@code include_repository}
+     */
+    @Nullable
+    public final Boolean includeRepository() {
+        return this.includeRepository;
+    }
+
+    /**
+     * If true, returns additional information about each index in the snapshot
+     * comprising the number of shards in the index, the total size of the index in
+     * bytes, and the maximum number of segments per shard in the index. Defaults to
+     * false, meaning that this information is omitted.
+     * <p>
+     * API name: {@code index_details}
+     */
+    @Nullable
+    public final Boolean indexDetails() {
+        return this.indexDetails;
+    }
+
+    /**
+     * Period to wait for a connection to the master node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Period to wait for a connection to the cluster-manager node. If no response is
+     * received before the timeout expires, the request fails and returns an error.
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Required - Comma-separated list of snapshot repository names used to limit
+     * the request. Wildcard (*) expressions are supported.
+     * <p>
+     * API name: {@code repository}
+     */
+    public final String repository() {
+        return this.repository;
+    }
+
+    /**
+     * Required - Comma-separated list of snapshot names to retrieve. Also accepts
+     * wildcards (*).
+     * <ul>
+     * <li>To get information about all snapshots in a registered repository, use a
+     * wildcard (*) or _all.</li>
+     * <li>To get information about any snapshots that are currently running, use
+     * _current.</li>
+     * </ul>
+     * <p>
+     * API name: {@code snapshot}
+     */
+    public final List<String> snapshot() {
+        return this.snapshot;
+    }
+
+    /**
+     * If true, returns additional information about each snapshot such as the
+     * version of Elasticsearch which took the snapshot, the start and end times of
+     * the snapshot, and the number of shards snapshotted.
+     * <p>
+     * API name: {@code verbose}
+     */
+    @Nullable
+    public final Boolean verbose() {
+        return this.verbose;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetSnapshotRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetSnapshotRequest> {
+        @Nullable
+        private Boolean human;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private Boolean includeRepository;
+
+        @Nullable
+        private Boolean indexDetails;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        private String repository;
+
+        private List<String> snapshot;
+
+        @Nullable
+        private Boolean verbose;
+
+        /**
+         * API name: {@code human}
+         */
+        public final Builder human(@Nullable Boolean value) {
+            this.human = value;
+            return this;
+        }
+
+        /**
+         * If false, the request returns an error for any snapshots that are
+         * unavailable.
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Whether to include the repository name in the snapshot info. Defaults to
+         * true.
+         * <p>
+         * API name: {@code include_repository}
+         */
+        public final Builder includeRepository(@Nullable Boolean value) {
+            this.includeRepository = value;
+            return this;
+        }
+
+        /**
+         * If true, returns additional information about each index in the snapshot
+         * comprising the number of shards in the index, the total size of the index in
+         * bytes, and the maximum number of segments per shard in the index. Defaults to
+         * false, meaning that this information is omitted.
+         * <p>
+         * API name: {@code index_details}
+         */
+        public final Builder indexDetails(@Nullable Boolean value) {
+            this.indexDetails = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the master node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Period to wait for a connection to the cluster-manager node. If no response is
+         * received before the timeout expires, the request fails and returns an error.
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - Comma-separated list of snapshot repository names used to limit
+         * the request. Wildcard (*) expressions are supported.
+         * <p>
+         * API name: {@code repository}
+         */
+        public final Builder repository(String value) {
+            this.repository = value;
+            return this;
+        }
+
+        /**
+         * Required - Comma-separated list of snapshot names to retrieve. Also accepts
+         * wildcards (*).
+         * <ul>
+         * <li>To get information about all snapshots in a registered repository, use a
+         * wildcard (*) or _all.</li>
+         * <li>To get information about any snapshots that are currently running, use
+         * _current.</li>
+         * </ul>
+         * <p>
+         * API name: {@code snapshot}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>snapshot</code>.
+         */
+        public final Builder snapshot(List<String> list) {
+            this.snapshot = _listAddAll(this.snapshot, list);
+            return this;
+        }
+
+        /**
+         * Required - Comma-separated list of snapshot names to retrieve. Also accepts
+         * wildcards (*).
+         * <ul>
+         * <li>To get information about all snapshots in a registered repository, use a
+         * wildcard (*) or _all.</li>
+         * <li>To get information about any snapshots that are currently running, use
+         * _current.</li>
+         * </ul>
+         * <p>
+         * API name: {@code snapshot}
+         * <p>
+         * Adds one or more values to <code>snapshot</code>.
+         */
+        public final Builder snapshot(String value, String... values) {
+            this.snapshot = _listAdd(this.snapshot, value, values);
+            return this;
+        }
+
+        /**
+         * If true, returns additional information about each snapshot such as the
+         * version of Elasticsearch which took the snapshot, the start and end times of
+         * the snapshot, and the number of shards snapshotted.
+         * <p>
+         * API name: {@code verbose}
+         */
+        public final Builder verbose(@Nullable Boolean value) {
+            this.verbose = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetSnapshotRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetSnapshotRequest build() {
+            _checkSingleUse();
+
+            return new GetSnapshotRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code snapshot.get}".
+     */
+    public static final Endpoint<GetSnapshotRequest, GetSnapshotResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _repository = 1 << 0;
+            final int _snapshot = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _repository;
+            propsSet |= _snapshot;
+
+            if (propsSet == (_repository | _snapshot)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_snapshot");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.repository, buf);
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.snapshot.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.includeRepository != null) {
+                params.put("include_repository", String.valueOf(request.includeRepository));
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            if (request.indexDetails != null) {
+                params.put("index_details", String.valueOf(request.indexDetails));
+            }
+            if (request.human != null) {
+                params.put("human", String.valueOf(request.human));
+            }
+            if (request.verbose != null) {
+                params.put("verbose", String.valueOf(request.verbose));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetSnapshotResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetSnapshotResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetSnapshotResponse.java
index 8cdea472ac..d3c51899a9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetSnapshotResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetSnapshotResponse.java
@@ -32,251 +32,250 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
-import org.opensearch.client.opensearch.snapshot.get.SnapshotResponseItem;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.snapshot.get.SnapshotResponseItem;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: snapshot.get.Response
 
-
 @JsonpDeserializable
 public class GetSnapshotResponse implements JsonpSerializable {
-	private final List<SnapshotResponseItem> responses;
-
-	private final List<SnapshotInfo> snapshots;
-
-	private final int total;
-
-	private final int remaining;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetSnapshotResponse(Builder builder) {
-
-		this.responses = ApiTypeHelper.unmodifiable(builder.responses);
-		this.snapshots = ApiTypeHelper.unmodifiable(builder.snapshots);
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
-		this.remaining = ApiTypeHelper.requireNonNull(builder.remaining, this, "remaining");
-
-	}
-
-	public static GetSnapshotResponse of(Function<Builder, ObjectBuilder<GetSnapshotResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code responses}
-	 */
-	public final List<SnapshotResponseItem> responses() {
-		return this.responses;
-	}
-
-	/**
-	 * API name: {@code snapshots}
-	 */
-	public final List<SnapshotInfo> snapshots() {
-		return this.snapshots;
-	}
-
-	/**
-	 * Required - The total number of snapshots that match the request when ignoring
-	 * size limit or after query parameter.
-	 * <p>
-	 * API name: {@code total}
-	 */
-	public final int total() {
-		return this.total;
-	}
-
-	/**
-	 * Required - The number of remaining snapshots that were not returned due to
-	 * size limits and that can be fetched by additional requests using the next
-	 * field value.
-	 * <p>
-	 * API name: {@code remaining}
-	 */
-	public final int remaining() {
-		return this.remaining;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.responses)) {
-			generator.writeKey("responses");
-			generator.writeStartArray();
-			for (SnapshotResponseItem item0 : this.responses) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.snapshots)) {
-			generator.writeKey("snapshots");
-			generator.writeStartArray();
-			for (SnapshotInfo item0 : this.snapshots) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("total");
-		generator.write(this.total);
-
-		generator.writeKey("remaining");
-		generator.write(this.remaining);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetSnapshotResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetSnapshotResponse> {
-		@Nullable
-		private List<SnapshotResponseItem> responses;
-
-		@Nullable
-		private List<SnapshotInfo> snapshots;
-
-		private Integer total;
-
-		private Integer remaining;
-
-		/**
-		 * API name: {@code responses}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>responses</code>.
-		 */
-		public final Builder responses(List<SnapshotResponseItem> list) {
-			this.responses = _listAddAll(this.responses, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code responses}
-		 * <p>
-		 * Adds one or more values to <code>responses</code>.
-		 */
-		public final Builder responses(SnapshotResponseItem value, SnapshotResponseItem... values) {
-			this.responses = _listAdd(this.responses, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code responses}
-		 * <p>
-		 * Adds a value to <code>responses</code> using a builder lambda.
-		 */
-		public final Builder responses(Function<SnapshotResponseItem.Builder, ObjectBuilder<SnapshotResponseItem>> fn) {
-			return responses(fn.apply(new SnapshotResponseItem.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code snapshots}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>snapshots</code>.
-		 */
-		public final Builder snapshots(List<SnapshotInfo> list) {
-			this.snapshots = _listAddAll(this.snapshots, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code snapshots}
-		 * <p>
-		 * Adds one or more values to <code>snapshots</code>.
-		 */
-		public final Builder snapshots(SnapshotInfo value, SnapshotInfo... values) {
-			this.snapshots = _listAdd(this.snapshots, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code snapshots}
-		 * <p>
-		 * Adds a value to <code>snapshots</code> using a builder lambda.
-		 */
-		public final Builder snapshots(Function<SnapshotInfo.Builder, ObjectBuilder<SnapshotInfo>> fn) {
-			return snapshots(fn.apply(new SnapshotInfo.Builder()).build());
-		}
-
-		/**
-		 * Required - The total number of snapshots that match the request when ignoring
-		 * size limit or after query parameter.
-		 * <p>
-		 * API name: {@code total}
-		 */
-		public final Builder total(int value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * Required - The number of remaining snapshots that were not returned due to
-		 * size limits and that can be fetched by additional requests using the next
-		 * field value.
-		 * <p>
-		 * API name: {@code remaining}
-		 */
-		public final Builder remaining(int value) {
-			this.remaining = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetSnapshotResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetSnapshotResponse build() {
-			_checkSingleUse();
-
-			return new GetSnapshotResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetSnapshotResponse}
-	 */
-	public static final JsonpDeserializer<GetSnapshotResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, GetSnapshotResponse::setupGetSnapshotResponseDeserializer);
-
-	protected static void setupGetSnapshotResponseDeserializer(ObjectDeserializer<GetSnapshotResponse.Builder> op) {
-
-		op.add(Builder::responses, JsonpDeserializer.arrayDeserializer(SnapshotResponseItem._DESERIALIZER),
-				"responses");
-		op.add(Builder::snapshots, JsonpDeserializer.arrayDeserializer(SnapshotInfo._DESERIALIZER), "snapshots");
-		op.add(Builder::total, JsonpDeserializer.integerDeserializer(), "total");
-		op.add(Builder::remaining, JsonpDeserializer.integerDeserializer(), "remaining");
-
-	}
+    private final List<SnapshotResponseItem> responses;
+
+    private final List<SnapshotInfo> snapshots;
+
+    private final int total;
+
+    private final int remaining;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetSnapshotResponse(Builder builder) {
+
+        this.responses = ApiTypeHelper.unmodifiable(builder.responses);
+        this.snapshots = ApiTypeHelper.unmodifiable(builder.snapshots);
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+        this.remaining = ApiTypeHelper.requireNonNull(builder.remaining, this, "remaining");
+
+    }
+
+    public static GetSnapshotResponse of(Function<Builder, ObjectBuilder<GetSnapshotResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code responses}
+     */
+    public final List<SnapshotResponseItem> responses() {
+        return this.responses;
+    }
+
+    /**
+     * API name: {@code snapshots}
+     */
+    public final List<SnapshotInfo> snapshots() {
+        return this.snapshots;
+    }
+
+    /**
+     * Required - The total number of snapshots that match the request when ignoring
+     * size limit or after query parameter.
+     * <p>
+     * API name: {@code total}
+     */
+    public final int total() {
+        return this.total;
+    }
+
+    /**
+     * Required - The number of remaining snapshots that were not returned due to
+     * size limits and that can be fetched by additional requests using the next
+     * field value.
+     * <p>
+     * API name: {@code remaining}
+     */
+    public final int remaining() {
+        return this.remaining;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.responses)) {
+            generator.writeKey("responses");
+            generator.writeStartArray();
+            for (SnapshotResponseItem item0 : this.responses) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.snapshots)) {
+            generator.writeKey("snapshots");
+            generator.writeStartArray();
+            for (SnapshotInfo item0 : this.snapshots) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("total");
+        generator.write(this.total);
+
+        generator.writeKey("remaining");
+        generator.write(this.remaining);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetSnapshotResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetSnapshotResponse> {
+        @Nullable
+        private List<SnapshotResponseItem> responses;
+
+        @Nullable
+        private List<SnapshotInfo> snapshots;
+
+        private Integer total;
+
+        private Integer remaining;
+
+        /**
+         * API name: {@code responses}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>responses</code>.
+         */
+        public final Builder responses(List<SnapshotResponseItem> list) {
+            this.responses = _listAddAll(this.responses, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code responses}
+         * <p>
+         * Adds one or more values to <code>responses</code>.
+         */
+        public final Builder responses(SnapshotResponseItem value, SnapshotResponseItem... values) {
+            this.responses = _listAdd(this.responses, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code responses}
+         * <p>
+         * Adds a value to <code>responses</code> using a builder lambda.
+         */
+        public final Builder responses(Function<SnapshotResponseItem.Builder, ObjectBuilder<SnapshotResponseItem>> fn) {
+            return responses(fn.apply(new SnapshotResponseItem.Builder()).build());
+        }
+
+        /**
+         * API name: {@code snapshots}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>snapshots</code>.
+         */
+        public final Builder snapshots(List<SnapshotInfo> list) {
+            this.snapshots = _listAddAll(this.snapshots, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code snapshots}
+         * <p>
+         * Adds one or more values to <code>snapshots</code>.
+         */
+        public final Builder snapshots(SnapshotInfo value, SnapshotInfo... values) {
+            this.snapshots = _listAdd(this.snapshots, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code snapshots}
+         * <p>
+         * Adds a value to <code>snapshots</code> using a builder lambda.
+         */
+        public final Builder snapshots(Function<SnapshotInfo.Builder, ObjectBuilder<SnapshotInfo>> fn) {
+            return snapshots(fn.apply(new SnapshotInfo.Builder()).build());
+        }
+
+        /**
+         * Required - The total number of snapshots that match the request when ignoring
+         * size limit or after query parameter.
+         * <p>
+         * API name: {@code total}
+         */
+        public final Builder total(int value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * Required - The number of remaining snapshots that were not returned due to
+         * size limits and that can be fetched by additional requests using the next
+         * field value.
+         * <p>
+         * API name: {@code remaining}
+         */
+        public final Builder remaining(int value) {
+            this.remaining = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetSnapshotResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetSnapshotResponse build() {
+            _checkSingleUse();
+
+            return new GetSnapshotResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetSnapshotResponse}
+     */
+    public static final JsonpDeserializer<GetSnapshotResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetSnapshotResponse::setupGetSnapshotResponseDeserializer
+    );
+
+    protected static void setupGetSnapshotResponseDeserializer(ObjectDeserializer<GetSnapshotResponse.Builder> op) {
+
+        op.add(Builder::responses, JsonpDeserializer.arrayDeserializer(SnapshotResponseItem._DESERIALIZER), "responses");
+        op.add(Builder::snapshots, JsonpDeserializer.arrayDeserializer(SnapshotInfo._DESERIALIZER), "snapshots");
+        op.add(Builder::total, JsonpDeserializer.integerDeserializer(), "total");
+        op.add(Builder::remaining, JsonpDeserializer.integerDeserializer(), "remaining");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/IndexDetails.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/IndexDetails.java
index 13b6924ae5..bcf7f608f4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/IndexDetails.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/IndexDetails.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,171 +44,169 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: snapshot._types.IndexDetails
 
 @JsonpDeserializable
 public class IndexDetails implements JsonpSerializable {
-	private final int shardCount;
+    private final int shardCount;
 
-	@Nullable
-	private final String size;
+    @Nullable
+    private final String size;
 
-	private final long sizeInBytes;
+    private final long sizeInBytes;
 
-	private final long maxSegmentsPerShard;
+    private final long maxSegmentsPerShard;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private IndexDetails(Builder builder) {
+    private IndexDetails(Builder builder) {
 
-		this.shardCount = ApiTypeHelper.requireNonNull(builder.shardCount, this, "shardCount");
-		this.size = builder.size;
-		this.sizeInBytes = ApiTypeHelper.requireNonNull(builder.sizeInBytes, this, "sizeInBytes");
-		this.maxSegmentsPerShard = ApiTypeHelper.requireNonNull(builder.maxSegmentsPerShard, this,
-				"maxSegmentsPerShard");
-
-	}
-
-	public static IndexDetails of(Function<Builder, ObjectBuilder<IndexDetails>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code shard_count}
-	 */
-	public final int shardCount() {
-		return this.shardCount;
-	}
-
-	/**
-	 * API name: {@code size}
-	 */
-	@Nullable
-	public final String size() {
-		return this.size;
-	}
-
-	/**
-	 * Required - API name: {@code size_in_bytes}
-	 */
-	public final long sizeInBytes() {
-		return this.sizeInBytes;
-	}
-
-	/**
-	 * Required - API name: {@code max_segments_per_shard}
-	 */
-	public final long maxSegmentsPerShard() {
-		return this.maxSegmentsPerShard;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("shard_count");
-		generator.write(this.shardCount);
-
-		if (this.size != null) {
-			generator.writeKey("size");
-			generator.write(this.size);
-
-		}
-		generator.writeKey("size_in_bytes");
-		generator.write(this.sizeInBytes);
-
-		generator.writeKey("max_segments_per_shard");
-		generator.write(this.maxSegmentsPerShard);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link IndexDetails}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexDetails> {
-		private Integer shardCount;
-
-		@Nullable
-		private String size;
-
-		private Long sizeInBytes;
-
-		private Long maxSegmentsPerShard;
-
-		/**
-		 * Required - API name: {@code shard_count}
-		 */
-		public final Builder shardCount(int value) {
-			this.shardCount = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code size}
-		 */
-		public final Builder size(@Nullable String value) {
-			this.size = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code size_in_bytes}
-		 */
-		public final Builder sizeInBytes(long value) {
-			this.sizeInBytes = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code max_segments_per_shard}
-		 */
-		public final Builder maxSegmentsPerShard(long value) {
-			this.maxSegmentsPerShard = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link IndexDetails}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public IndexDetails build() {
-			_checkSingleUse();
-
-			return new IndexDetails(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link IndexDetails}
-	 */
-	public static final JsonpDeserializer<IndexDetails> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			IndexDetails::setupIndexDetailsDeserializer);
-
-	protected static void setupIndexDetailsDeserializer(ObjectDeserializer<IndexDetails.Builder> op) {
-
-		op.add(Builder::shardCount, JsonpDeserializer.integerDeserializer(), "shard_count");
-		op.add(Builder::size, JsonpDeserializer.stringDeserializer(), "size");
-		op.add(Builder::sizeInBytes, JsonpDeserializer.longDeserializer(), "size_in_bytes");
-		op.add(Builder::maxSegmentsPerShard, JsonpDeserializer.longDeserializer(), "max_segments_per_shard");
-
-	}
+        this.shardCount = ApiTypeHelper.requireNonNull(builder.shardCount, this, "shardCount");
+        this.size = builder.size;
+        this.sizeInBytes = ApiTypeHelper.requireNonNull(builder.sizeInBytes, this, "sizeInBytes");
+        this.maxSegmentsPerShard = ApiTypeHelper.requireNonNull(builder.maxSegmentsPerShard, this, "maxSegmentsPerShard");
+
+    }
+
+    public static IndexDetails of(Function<Builder, ObjectBuilder<IndexDetails>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code shard_count}
+     */
+    public final int shardCount() {
+        return this.shardCount;
+    }
+
+    /**
+     * API name: {@code size}
+     */
+    @Nullable
+    public final String size() {
+        return this.size;
+    }
+
+    /**
+     * Required - API name: {@code size_in_bytes}
+     */
+    public final long sizeInBytes() {
+        return this.sizeInBytes;
+    }
+
+    /**
+     * Required - API name: {@code max_segments_per_shard}
+     */
+    public final long maxSegmentsPerShard() {
+        return this.maxSegmentsPerShard;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("shard_count");
+        generator.write(this.shardCount);
+
+        if (this.size != null) {
+            generator.writeKey("size");
+            generator.write(this.size);
+
+        }
+        generator.writeKey("size_in_bytes");
+        generator.write(this.sizeInBytes);
+
+        generator.writeKey("max_segments_per_shard");
+        generator.write(this.maxSegmentsPerShard);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link IndexDetails}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexDetails> {
+        private Integer shardCount;
+
+        @Nullable
+        private String size;
+
+        private Long sizeInBytes;
+
+        private Long maxSegmentsPerShard;
+
+        /**
+         * Required - API name: {@code shard_count}
+         */
+        public final Builder shardCount(int value) {
+            this.shardCount = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code size}
+         */
+        public final Builder size(@Nullable String value) {
+            this.size = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code size_in_bytes}
+         */
+        public final Builder sizeInBytes(long value) {
+            this.sizeInBytes = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code max_segments_per_shard}
+         */
+        public final Builder maxSegmentsPerShard(long value) {
+            this.maxSegmentsPerShard = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link IndexDetails}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public IndexDetails build() {
+            _checkSingleUse();
+
+            return new IndexDetails(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link IndexDetails}
+     */
+    public static final JsonpDeserializer<IndexDetails> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        IndexDetails::setupIndexDetailsDeserializer
+    );
+
+    protected static void setupIndexDetailsDeserializer(ObjectDeserializer<IndexDetails.Builder> op) {
+
+        op.add(Builder::shardCount, JsonpDeserializer.integerDeserializer(), "shard_count");
+        op.add(Builder::size, JsonpDeserializer.stringDeserializer(), "size");
+        op.add(Builder::sizeInBytes, JsonpDeserializer.longDeserializer(), "size_in_bytes");
+        op.add(Builder::maxSegmentsPerShard, JsonpDeserializer.longDeserializer(), "max_segments_per_shard");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/InfoFeatureState.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/InfoFeatureState.java
index 60aa34229f..4e48263d57 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/InfoFeatureState.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/InfoFeatureState.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,138 +44,136 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: snapshot._types.InfoFeatureState
 
 @JsonpDeserializable
 public class InfoFeatureState implements JsonpSerializable {
-	private final String featureName;
-
-	private final List<String> indices;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private InfoFeatureState(Builder builder) {
-
-		this.featureName = ApiTypeHelper.requireNonNull(builder.featureName, this, "featureName");
-		this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
-
-	}
-
-	public static InfoFeatureState of(Function<Builder, ObjectBuilder<InfoFeatureState>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code feature_name}
-	 */
-	public final String featureName() {
-		return this.featureName;
-	}
-
-	/**
-	 * Required - API name: {@code indices}
-	 */
-	public final List<String> indices() {
-		return this.indices;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("feature_name");
-		generator.write(this.featureName);
-
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartArray();
-			for (String item0 : this.indices) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link InfoFeatureState}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InfoFeatureState> {
-		private String featureName;
-
-		private List<String> indices;
-
-		/**
-		 * Required - API name: {@code feature_name}
-		 */
-		public final Builder featureName(String value) {
-			this.featureName = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indices</code>.
-		 */
-		public final Builder indices(List<String> list) {
-			this.indices = _listAddAll(this.indices, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds one or more values to <code>indices</code>.
-		 */
-		public final Builder indices(String value, String... values) {
-			this.indices = _listAdd(this.indices, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link InfoFeatureState}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public InfoFeatureState build() {
-			_checkSingleUse();
-
-			return new InfoFeatureState(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link InfoFeatureState}
-	 */
-	public static final JsonpDeserializer<InfoFeatureState> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			InfoFeatureState::setupInfoFeatureStateDeserializer);
-
-	protected static void setupInfoFeatureStateDeserializer(ObjectDeserializer<InfoFeatureState.Builder> op) {
-
-		op.add(Builder::featureName, JsonpDeserializer.stringDeserializer(), "feature_name");
-		op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"indices");
-
-	}
+    private final String featureName;
+
+    private final List<String> indices;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private InfoFeatureState(Builder builder) {
+
+        this.featureName = ApiTypeHelper.requireNonNull(builder.featureName, this, "featureName");
+        this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
+
+    }
+
+    public static InfoFeatureState of(Function<Builder, ObjectBuilder<InfoFeatureState>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code feature_name}
+     */
+    public final String featureName() {
+        return this.featureName;
+    }
+
+    /**
+     * Required - API name: {@code indices}
+     */
+    public final List<String> indices() {
+        return this.indices;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("feature_name");
+        generator.write(this.featureName);
+
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartArray();
+            for (String item0 : this.indices) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link InfoFeatureState}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<InfoFeatureState> {
+        private String featureName;
+
+        private List<String> indices;
+
+        /**
+         * Required - API name: {@code feature_name}
+         */
+        public final Builder featureName(String value) {
+            this.featureName = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indices</code>.
+         */
+        public final Builder indices(List<String> list) {
+            this.indices = _listAddAll(this.indices, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds one or more values to <code>indices</code>.
+         */
+        public final Builder indices(String value, String... values) {
+            this.indices = _listAdd(this.indices, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link InfoFeatureState}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public InfoFeatureState build() {
+            _checkSingleUse();
+
+            return new InfoFeatureState(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link InfoFeatureState}
+     */
+    public static final JsonpDeserializer<InfoFeatureState> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        InfoFeatureState::setupInfoFeatureStateDeserializer
+    );
+
+    protected static void setupInfoFeatureStateDeserializer(ObjectDeserializer<InfoFeatureState.Builder> op) {
+
+        op.add(Builder::featureName, JsonpDeserializer.stringDeserializer(), "feature_name");
+        op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "indices");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/OpenSearchSnapshotAsyncClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/OpenSearchSnapshotAsyncClient.java
index b1e9f00a05..002845d767 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/OpenSearchSnapshotAsyncClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/OpenSearchSnapshotAsyncClient.java
@@ -32,421 +32,429 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
+import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.TransportOptions;
 import org.opensearch.client.util.ObjectBuilder;
-import java.io.IOException;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 /**
  * Client for the snapshot namespace.
  */
-public class OpenSearchSnapshotAsyncClient
-		extends
-			ApiClient<OpenSearchTransport, OpenSearchSnapshotAsyncClient> {
-
-	public OpenSearchSnapshotAsyncClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchSnapshotAsyncClient(OpenSearchTransport transport,
-										 @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchSnapshotAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchSnapshotAsyncClient(this.transport, transportOptions);
-	}
-
-	// ----- Endpoint: snapshot.cleanup_repository
-
-	/**
-	 * Removes stale data from repository.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<CleanupRepositoryResponse> cleanupRepository(CleanupRepositoryRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CleanupRepositoryRequest, CleanupRepositoryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CleanupRepositoryRequest, CleanupRepositoryResponse, ErrorResponse>)
-						CleanupRepositoryRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Removes stale data from repository.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CleanupRepositoryRequest}
-	 *
-	 */
-
-	public final CompletableFuture<CleanupRepositoryResponse> cleanupRepository(
-			Function<CleanupRepositoryRequest.Builder, ObjectBuilder<CleanupRepositoryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return cleanupRepository(fn.apply(new CleanupRepositoryRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: snapshot.clone
-
-	/**
-	 * Clones indices from one snapshot into another snapshot in the same
-	 * repository.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<CloneSnapshotResponse> clone(CloneSnapshotRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CloneSnapshotRequest, CloneSnapshotResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CloneSnapshotRequest, CloneSnapshotResponse, ErrorResponse>)
-						CloneSnapshotRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Clones indices from one snapshot into another snapshot in the same
-	 * repository.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CloneSnapshotRequest}
-	 *
-	 */
-
-	public final CompletableFuture<CloneSnapshotResponse> clone(
-			Function<CloneSnapshotRequest.Builder, ObjectBuilder<CloneSnapshotRequest>> fn)
-			throws IOException, OpenSearchException {
-		return clone(fn.apply(new CloneSnapshotRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: snapshot.create
-
-	/**
-	 * Creates a snapshot in a repository.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<CreateSnapshotResponse> create(CreateSnapshotRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CreateSnapshotRequest, CreateSnapshotResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CreateSnapshotRequest, CreateSnapshotResponse, ErrorResponse>)
-						CreateSnapshotRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates a snapshot in a repository.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CreateSnapshotRequest}
-	 *
-	 */
-
-	public final CompletableFuture<CreateSnapshotResponse> create(
-			Function<CreateSnapshotRequest.Builder, ObjectBuilder<CreateSnapshotRequest>> fn)
-			throws IOException, OpenSearchException {
-		return create(fn.apply(new CreateSnapshotRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: snapshot.create_repository
-
-	/**
-	 * Creates a repository.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<CreateRepositoryResponse> createRepository(CreateRepositoryRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CreateRepositoryRequest, CreateRepositoryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CreateRepositoryRequest, CreateRepositoryResponse, ErrorResponse>)
-						CreateRepositoryRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates a repository.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CreateRepositoryRequest}
-	 *
-	 */
-
-	public final CompletableFuture<CreateRepositoryResponse> createRepository(
-			Function<CreateRepositoryRequest.Builder, ObjectBuilder<CreateRepositoryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return createRepository(fn.apply(new CreateRepositoryRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: snapshot.delete
-
-	/**
-	 * Deletes a snapshot.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<DeleteSnapshotResponse> delete(DeleteSnapshotRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteSnapshotRequest, DeleteSnapshotResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteSnapshotRequest, DeleteSnapshotResponse, ErrorResponse>)
-						DeleteSnapshotRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes a snapshot.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteSnapshotRequest}
-	 *
-	 */
-
-	public final CompletableFuture<DeleteSnapshotResponse> delete(
-			Function<DeleteSnapshotRequest.Builder, ObjectBuilder<DeleteSnapshotRequest>> fn)
-			throws IOException, OpenSearchException {
-		return delete(fn.apply(new DeleteSnapshotRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: snapshot.delete_repository
-
-	/**
-	 * Deletes a repository.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<DeleteRepositoryResponse> deleteRepository(DeleteRepositoryRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteRepositoryRequest, DeleteRepositoryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteRepositoryRequest, DeleteRepositoryResponse, ErrorResponse>)
-						DeleteRepositoryRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes a repository.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteRepositoryRequest}
-	 *
-	 */
-
-	public final CompletableFuture<DeleteRepositoryResponse> deleteRepository(
-			Function<DeleteRepositoryRequest.Builder, ObjectBuilder<DeleteRepositoryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteRepository(fn.apply(new DeleteRepositoryRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: snapshot.get
-
-	/**
-	 * Returns information about a snapshot.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetSnapshotResponse> get(GetSnapshotRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetSnapshotRequest, GetSnapshotResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetSnapshotRequest, GetSnapshotResponse, ErrorResponse>) GetSnapshotRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about a snapshot.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetSnapshotRequest}
-	 *
-	 */
-
-	public final CompletableFuture<GetSnapshotResponse> get(
-			Function<GetSnapshotRequest.Builder, ObjectBuilder<GetSnapshotRequest>> fn)
-			throws IOException, OpenSearchException {
-		return get(fn.apply(new GetSnapshotRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: snapshot.get_repository
-
-	/**
-	 * Returns information about a repository.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetRepositoryResponse> getRepository(GetRepositoryRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetRepositoryRequest, GetRepositoryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetRepositoryRequest, GetRepositoryResponse, ErrorResponse>) GetRepositoryRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about a repository.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetRepositoryRequest}
-	 *
-	 */
-
-	public final CompletableFuture<GetRepositoryResponse> getRepository(
-			Function<GetRepositoryRequest.Builder, ObjectBuilder<GetRepositoryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getRepository(fn.apply(new GetRepositoryRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about a repository.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<GetRepositoryResponse> getRepository() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new GetRepositoryRequest.Builder().build(),
-				GetRepositoryRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: snapshot.restore
-
-	/**
-	 * Restores a snapshot.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<RestoreResponse> restore(RestoreRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<RestoreRequest, RestoreResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<RestoreRequest, RestoreResponse, ErrorResponse>) RestoreRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Restores a snapshot.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link RestoreRequest}
-	 *
-	 */
-
-	public final CompletableFuture<RestoreResponse> restore(
-			Function<RestoreRequest.Builder, ObjectBuilder<RestoreRequest>> fn)
-			throws IOException, OpenSearchException {
-		return restore(fn.apply(new RestoreRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: snapshot.status
-
-	/**
-	 * Returns information about the status of a snapshot.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<SnapshotStatusResponse> status(SnapshotStatusRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SnapshotStatusRequest, SnapshotStatusResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<SnapshotStatusRequest, SnapshotStatusResponse, ErrorResponse>)
-						SnapshotStatusRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about the status of a snapshot.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SnapshotStatusRequest}
-	 *
-	 */
-
-	public final CompletableFuture<SnapshotStatusResponse> status(
-			Function<SnapshotStatusRequest.Builder, ObjectBuilder<SnapshotStatusRequest>> fn)
-			throws IOException, OpenSearchException {
-		return status(fn.apply(new SnapshotStatusRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about the status of a snapshot.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<SnapshotStatusResponse> status() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new SnapshotStatusRequest.Builder().build(),
-				SnapshotStatusRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: snapshot.verify_repository
-
-	/**
-	 * Verifies a repository.
-	 * 
-	 *
-	 */
-
-	public CompletableFuture<VerifyRepositoryResponse> verifyRepository(VerifyRepositoryRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<VerifyRepositoryRequest, VerifyRepositoryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<VerifyRepositoryRequest, VerifyRepositoryResponse, ErrorResponse>)
-						VerifyRepositoryRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Verifies a repository.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link VerifyRepositoryRequest}
-	 *
-	 */
-
-	public final CompletableFuture<VerifyRepositoryResponse> verifyRepository(
-			Function<VerifyRepositoryRequest.Builder, ObjectBuilder<VerifyRepositoryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return verifyRepository(fn.apply(new VerifyRepositoryRequest.Builder()).build());
-	}
+public class OpenSearchSnapshotAsyncClient extends ApiClient<OpenSearchTransport, OpenSearchSnapshotAsyncClient> {
+
+    public OpenSearchSnapshotAsyncClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchSnapshotAsyncClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchSnapshotAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchSnapshotAsyncClient(this.transport, transportOptions);
+    }
+
+    // ----- Endpoint: snapshot.cleanup_repository
+
+    /**
+     * Removes stale data from repository.
+     *
+     *
+     */
+
+    public CompletableFuture<CleanupRepositoryResponse> cleanupRepository(CleanupRepositoryRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CleanupRepositoryRequest, CleanupRepositoryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CleanupRepositoryRequest,
+            CleanupRepositoryResponse,
+            ErrorResponse>) CleanupRepositoryRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Removes stale data from repository.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CleanupRepositoryRequest}
+     *
+     */
+
+    public final CompletableFuture<CleanupRepositoryResponse> cleanupRepository(
+        Function<CleanupRepositoryRequest.Builder, ObjectBuilder<CleanupRepositoryRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return cleanupRepository(fn.apply(new CleanupRepositoryRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: snapshot.clone
+
+    /**
+     * Clones indices from one snapshot into another snapshot in the same
+     * repository.
+     *
+     *
+     */
+
+    public CompletableFuture<CloneSnapshotResponse> clone(CloneSnapshotRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CloneSnapshotRequest, CloneSnapshotResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CloneSnapshotRequest,
+            CloneSnapshotResponse,
+            ErrorResponse>) CloneSnapshotRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Clones indices from one snapshot into another snapshot in the same
+     * repository.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CloneSnapshotRequest}
+     *
+     */
+
+    public final CompletableFuture<CloneSnapshotResponse> clone(
+        Function<CloneSnapshotRequest.Builder, ObjectBuilder<CloneSnapshotRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return clone(fn.apply(new CloneSnapshotRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: snapshot.create
+
+    /**
+     * Creates a snapshot in a repository.
+     *
+     *
+     */
+
+    public CompletableFuture<CreateSnapshotResponse> create(CreateSnapshotRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CreateSnapshotRequest, CreateSnapshotResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CreateSnapshotRequest,
+            CreateSnapshotResponse,
+            ErrorResponse>) CreateSnapshotRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates a snapshot in a repository.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CreateSnapshotRequest}
+     *
+     */
+
+    public final CompletableFuture<CreateSnapshotResponse> create(
+        Function<CreateSnapshotRequest.Builder, ObjectBuilder<CreateSnapshotRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return create(fn.apply(new CreateSnapshotRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: snapshot.create_repository
+
+    /**
+     * Creates a repository.
+     *
+     *
+     */
+
+    public CompletableFuture<CreateRepositoryResponse> createRepository(CreateRepositoryRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CreateRepositoryRequest, CreateRepositoryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CreateRepositoryRequest,
+            CreateRepositoryResponse,
+            ErrorResponse>) CreateRepositoryRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates a repository.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CreateRepositoryRequest}
+     *
+     */
+
+    public final CompletableFuture<CreateRepositoryResponse> createRepository(
+        Function<CreateRepositoryRequest.Builder, ObjectBuilder<CreateRepositoryRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return createRepository(fn.apply(new CreateRepositoryRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: snapshot.delete
+
+    /**
+     * Deletes a snapshot.
+     *
+     *
+     */
+
+    public CompletableFuture<DeleteSnapshotResponse> delete(DeleteSnapshotRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteSnapshotRequest, DeleteSnapshotResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteSnapshotRequest,
+            DeleteSnapshotResponse,
+            ErrorResponse>) DeleteSnapshotRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes a snapshot.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteSnapshotRequest}
+     *
+     */
+
+    public final CompletableFuture<DeleteSnapshotResponse> delete(
+        Function<DeleteSnapshotRequest.Builder, ObjectBuilder<DeleteSnapshotRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return delete(fn.apply(new DeleteSnapshotRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: snapshot.delete_repository
+
+    /**
+     * Deletes a repository.
+     *
+     *
+     */
+
+    public CompletableFuture<DeleteRepositoryResponse> deleteRepository(DeleteRepositoryRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteRepositoryRequest, DeleteRepositoryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteRepositoryRequest,
+            DeleteRepositoryResponse,
+            ErrorResponse>) DeleteRepositoryRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes a repository.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteRepositoryRequest}
+     *
+     */
+
+    public final CompletableFuture<DeleteRepositoryResponse> deleteRepository(
+        Function<DeleteRepositoryRequest.Builder, ObjectBuilder<DeleteRepositoryRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deleteRepository(fn.apply(new DeleteRepositoryRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: snapshot.get
+
+    /**
+     * Returns information about a snapshot.
+     *
+     *
+     */
+
+    public CompletableFuture<GetSnapshotResponse> get(GetSnapshotRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetSnapshotRequest, GetSnapshotResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetSnapshotRequest,
+            GetSnapshotResponse,
+            ErrorResponse>) GetSnapshotRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about a snapshot.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetSnapshotRequest}
+     *
+     */
+
+    public final CompletableFuture<GetSnapshotResponse> get(Function<GetSnapshotRequest.Builder, ObjectBuilder<GetSnapshotRequest>> fn)
+        throws IOException, OpenSearchException {
+        return get(fn.apply(new GetSnapshotRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: snapshot.get_repository
+
+    /**
+     * Returns information about a repository.
+     *
+     *
+     */
+
+    public CompletableFuture<GetRepositoryResponse> getRepository(GetRepositoryRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetRepositoryRequest, GetRepositoryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetRepositoryRequest,
+            GetRepositoryResponse,
+            ErrorResponse>) GetRepositoryRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about a repository.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetRepositoryRequest}
+     *
+     */
+
+    public final CompletableFuture<GetRepositoryResponse> getRepository(
+        Function<GetRepositoryRequest.Builder, ObjectBuilder<GetRepositoryRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return getRepository(fn.apply(new GetRepositoryRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about a repository.
+     *
+     *
+     */
+
+    public CompletableFuture<GetRepositoryResponse> getRepository() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new GetRepositoryRequest.Builder().build(),
+            GetRepositoryRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: snapshot.restore
+
+    /**
+     * Restores a snapshot.
+     *
+     *
+     */
+
+    public CompletableFuture<RestoreResponse> restore(RestoreRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<RestoreRequest, RestoreResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            RestoreRequest,
+            RestoreResponse,
+            ErrorResponse>) RestoreRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Restores a snapshot.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link RestoreRequest}
+     *
+     */
+
+    public final CompletableFuture<RestoreResponse> restore(Function<RestoreRequest.Builder, ObjectBuilder<RestoreRequest>> fn)
+        throws IOException, OpenSearchException {
+        return restore(fn.apply(new RestoreRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: snapshot.status
+
+    /**
+     * Returns information about the status of a snapshot.
+     *
+     *
+     */
+
+    public CompletableFuture<SnapshotStatusResponse> status(SnapshotStatusRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SnapshotStatusRequest, SnapshotStatusResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            SnapshotStatusRequest,
+            SnapshotStatusResponse,
+            ErrorResponse>) SnapshotStatusRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about the status of a snapshot.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SnapshotStatusRequest}
+     *
+     */
+
+    public final CompletableFuture<SnapshotStatusResponse> status(
+        Function<SnapshotStatusRequest.Builder, ObjectBuilder<SnapshotStatusRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return status(fn.apply(new SnapshotStatusRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about the status of a snapshot.
+     *
+     *
+     */
+
+    public CompletableFuture<SnapshotStatusResponse> status() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(
+            new SnapshotStatusRequest.Builder().build(),
+            SnapshotStatusRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: snapshot.verify_repository
+
+    /**
+     * Verifies a repository.
+     *
+     *
+     */
+
+    public CompletableFuture<VerifyRepositoryResponse> verifyRepository(VerifyRepositoryRequest request) throws IOException,
+        OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<VerifyRepositoryRequest, VerifyRepositoryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            VerifyRepositoryRequest,
+            VerifyRepositoryResponse,
+            ErrorResponse>) VerifyRepositoryRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Verifies a repository.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link VerifyRepositoryRequest}
+     *
+     */
+
+    public final CompletableFuture<VerifyRepositoryResponse> verifyRepository(
+        Function<VerifyRepositoryRequest.Builder, ObjectBuilder<VerifyRepositoryRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return verifyRepository(fn.apply(new VerifyRepositoryRequest.Builder()).build());
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/OpenSearchSnapshotClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/OpenSearchSnapshotClient.java
index b20ef23b48..be2081adeb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/OpenSearchSnapshotClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/OpenSearchSnapshotClient.java
@@ -32,408 +32,419 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import java.io.IOException;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
+import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.TransportOptions;
 import org.opensearch.client.util.ObjectBuilder;
-import java.io.IOException;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 /**
  * Client for the snapshot namespace.
  */
 public class OpenSearchSnapshotClient extends ApiClient<OpenSearchTransport, OpenSearchSnapshotClient> {
 
-	public OpenSearchSnapshotClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchSnapshotClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchSnapshotClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchSnapshotClient(this.transport, transportOptions);
-	}
-
-	// ----- Endpoint: snapshot.cleanup_repository
-
-	/**
-	 * Removes stale data from repository.
-	 * 
-	 *
-	 */
-
-	public CleanupRepositoryResponse cleanupRepository(CleanupRepositoryRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CleanupRepositoryRequest, CleanupRepositoryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CleanupRepositoryRequest, CleanupRepositoryResponse, ErrorResponse>)
-						CleanupRepositoryRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Removes stale data from repository.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CleanupRepositoryRequest}
-	 *
-	 */
-
-	public final CleanupRepositoryResponse cleanupRepository(
-			Function<CleanupRepositoryRequest.Builder, ObjectBuilder<CleanupRepositoryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return cleanupRepository(fn.apply(new CleanupRepositoryRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: snapshot.clone
-
-	/**
-	 * Clones indices from one snapshot into another snapshot in the same
-	 * repository.
-	 * 
-	 *
-	 */
-
-	public CloneSnapshotResponse clone(CloneSnapshotRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CloneSnapshotRequest, CloneSnapshotResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CloneSnapshotRequest, CloneSnapshotResponse, ErrorResponse>) CloneSnapshotRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Clones indices from one snapshot into another snapshot in the same
-	 * repository.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CloneSnapshotRequest}
-	 *
-	 */
-
-	public final CloneSnapshotResponse clone(
-			Function<CloneSnapshotRequest.Builder, ObjectBuilder<CloneSnapshotRequest>> fn)
-			throws IOException, OpenSearchException {
-		return clone(fn.apply(new CloneSnapshotRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: snapshot.create
-
-	/**
-	 * Creates a snapshot in a repository.
-	 * 
-	 *
-	 */
-
-	public CreateSnapshotResponse create(CreateSnapshotRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CreateSnapshotRequest, CreateSnapshotResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CreateSnapshotRequest, CreateSnapshotResponse, ErrorResponse>)
-						CreateSnapshotRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates a snapshot in a repository.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CreateSnapshotRequest}
-	 *
-	 */
-
-	public final CreateSnapshotResponse create(
-			Function<CreateSnapshotRequest.Builder, ObjectBuilder<CreateSnapshotRequest>> fn)
-			throws IOException, OpenSearchException {
-		return create(fn.apply(new CreateSnapshotRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: snapshot.create_repository
-
-	/**
-	 * Creates a repository.
-	 * 
-	 *
-	 */
-
-	public CreateRepositoryResponse createRepository(CreateRepositoryRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CreateRepositoryRequest, CreateRepositoryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CreateRepositoryRequest, CreateRepositoryResponse, ErrorResponse>)
-						CreateRepositoryRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Creates a repository.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CreateRepositoryRequest}
-	 *
-	 */
-
-	public final CreateRepositoryResponse createRepository(
-			Function<CreateRepositoryRequest.Builder, ObjectBuilder<CreateRepositoryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return createRepository(fn.apply(new CreateRepositoryRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: snapshot.delete
-
-	/**
-	 * Deletes a snapshot.
-	 * 
-	 *
-	 */
-
-	public DeleteSnapshotResponse delete(DeleteSnapshotRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteSnapshotRequest, DeleteSnapshotResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteSnapshotRequest, DeleteSnapshotResponse, ErrorResponse>)
-						DeleteSnapshotRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes a snapshot.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteSnapshotRequest}
-	 *
-	 */
-
-	public final DeleteSnapshotResponse delete(
-			Function<DeleteSnapshotRequest.Builder, ObjectBuilder<DeleteSnapshotRequest>> fn)
-			throws IOException, OpenSearchException {
-		return delete(fn.apply(new DeleteSnapshotRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: snapshot.delete_repository
-
-	/**
-	 * Deletes a repository.
-	 * 
-	 *
-	 */
-
-	public DeleteRepositoryResponse deleteRepository(DeleteRepositoryRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<DeleteRepositoryRequest, DeleteRepositoryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<DeleteRepositoryRequest, DeleteRepositoryResponse, ErrorResponse>)
-						DeleteRepositoryRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Deletes a repository.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link DeleteRepositoryRequest}
-	 *
-	 */
-
-	public final DeleteRepositoryResponse deleteRepository(
-			Function<DeleteRepositoryRequest.Builder, ObjectBuilder<DeleteRepositoryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return deleteRepository(fn.apply(new DeleteRepositoryRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: snapshot.get
-
-	/**
-	 * Returns information about a snapshot.
-	 * 
-	 *
-	 */
-
-	public GetSnapshotResponse get(GetSnapshotRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetSnapshotRequest, GetSnapshotResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetSnapshotRequest, GetSnapshotResponse, ErrorResponse>) GetSnapshotRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about a snapshot.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetSnapshotRequest}
-	 *
-	 */
-
-	public final GetSnapshotResponse get(Function<GetSnapshotRequest.Builder, ObjectBuilder<GetSnapshotRequest>> fn)
-			throws IOException, OpenSearchException {
-		return get(fn.apply(new GetSnapshotRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: snapshot.get_repository
-
-	/**
-	 * Returns information about a repository.
-	 * 
-	 *
-	 */
-
-	public GetRepositoryResponse getRepository(GetRepositoryRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetRepositoryRequest, GetRepositoryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetRepositoryRequest, GetRepositoryResponse, ErrorResponse>) GetRepositoryRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about a repository.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetRepositoryRequest}
-	 *
-	 */
-
-	public final GetRepositoryResponse getRepository(
-			Function<GetRepositoryRequest.Builder, ObjectBuilder<GetRepositoryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return getRepository(fn.apply(new GetRepositoryRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about a repository.
-	 * 
-	 *
-	 */
-
-	public GetRepositoryResponse getRepository() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new GetRepositoryRequest.Builder().build(), GetRepositoryRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: snapshot.restore
-
-	/**
-	 * Restores a snapshot.
-	 * 
-	 *
-	 */
-
-	public RestoreResponse restore(RestoreRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<RestoreRequest, RestoreResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<RestoreRequest, RestoreResponse, ErrorResponse>) RestoreRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Restores a snapshot.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link RestoreRequest}
-	 *
-	 */
-
-	public final RestoreResponse restore(Function<RestoreRequest.Builder, ObjectBuilder<RestoreRequest>> fn)
-			throws IOException, OpenSearchException {
-		return restore(fn.apply(new RestoreRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: snapshot.status
-
-	/**
-	 * Returns information about the status of a snapshot.
-	 * 
-	 *
-	 */
-
-	public SnapshotStatusResponse status(SnapshotStatusRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<SnapshotStatusRequest, SnapshotStatusResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<SnapshotStatusRequest, SnapshotStatusResponse, ErrorResponse>)
-						SnapshotStatusRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about the status of a snapshot.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link SnapshotStatusRequest}
-	 *
-	 */
-
-	public final SnapshotStatusResponse status(
-			Function<SnapshotStatusRequest.Builder, ObjectBuilder<SnapshotStatusRequest>> fn)
-			throws IOException, OpenSearchException {
-		return status(fn.apply(new SnapshotStatusRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns information about the status of a snapshot.
-	 * 
-	 *
-	 */
-
-	public SnapshotStatusResponse status() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new SnapshotStatusRequest.Builder().build(),
-				SnapshotStatusRequest._ENDPOINT, this.transportOptions);
-	}
-
-	// ----- Endpoint: snapshot.verify_repository
-
-	/**
-	 * Verifies a repository.
-	 * 
-	 *
-	 */
-
-	public VerifyRepositoryResponse verifyRepository(VerifyRepositoryRequest request)
-			throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<VerifyRepositoryRequest, VerifyRepositoryResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<VerifyRepositoryRequest, VerifyRepositoryResponse, ErrorResponse>)
-						VerifyRepositoryRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Verifies a repository.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link VerifyRepositoryRequest}
-	 *
-	 */
-
-	public final VerifyRepositoryResponse verifyRepository(
-			Function<VerifyRepositoryRequest.Builder, ObjectBuilder<VerifyRepositoryRequest>> fn)
-			throws IOException, OpenSearchException {
-		return verifyRepository(fn.apply(new VerifyRepositoryRequest.Builder()).build());
-	}
+    public OpenSearchSnapshotClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchSnapshotClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchSnapshotClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchSnapshotClient(this.transport, transportOptions);
+    }
+
+    // ----- Endpoint: snapshot.cleanup_repository
+
+    /**
+     * Removes stale data from repository.
+     *
+     *
+     */
+
+    public CleanupRepositoryResponse cleanupRepository(CleanupRepositoryRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CleanupRepositoryRequest, CleanupRepositoryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CleanupRepositoryRequest,
+            CleanupRepositoryResponse,
+            ErrorResponse>) CleanupRepositoryRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Removes stale data from repository.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CleanupRepositoryRequest}
+     *
+     */
+
+    public final CleanupRepositoryResponse cleanupRepository(
+        Function<CleanupRepositoryRequest.Builder, ObjectBuilder<CleanupRepositoryRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return cleanupRepository(fn.apply(new CleanupRepositoryRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: snapshot.clone
+
+    /**
+     * Clones indices from one snapshot into another snapshot in the same
+     * repository.
+     *
+     *
+     */
+
+    public CloneSnapshotResponse clone(CloneSnapshotRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CloneSnapshotRequest, CloneSnapshotResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CloneSnapshotRequest,
+            CloneSnapshotResponse,
+            ErrorResponse>) CloneSnapshotRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Clones indices from one snapshot into another snapshot in the same
+     * repository.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CloneSnapshotRequest}
+     *
+     */
+
+    public final CloneSnapshotResponse clone(Function<CloneSnapshotRequest.Builder, ObjectBuilder<CloneSnapshotRequest>> fn)
+        throws IOException, OpenSearchException {
+        return clone(fn.apply(new CloneSnapshotRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: snapshot.create
+
+    /**
+     * Creates a snapshot in a repository.
+     *
+     *
+     */
+
+    public CreateSnapshotResponse create(CreateSnapshotRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CreateSnapshotRequest, CreateSnapshotResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CreateSnapshotRequest,
+            CreateSnapshotResponse,
+            ErrorResponse>) CreateSnapshotRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates a snapshot in a repository.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CreateSnapshotRequest}
+     *
+     */
+
+    public final CreateSnapshotResponse create(Function<CreateSnapshotRequest.Builder, ObjectBuilder<CreateSnapshotRequest>> fn)
+        throws IOException, OpenSearchException {
+        return create(fn.apply(new CreateSnapshotRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: snapshot.create_repository
+
+    /**
+     * Creates a repository.
+     *
+     *
+     */
+
+    public CreateRepositoryResponse createRepository(CreateRepositoryRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CreateRepositoryRequest, CreateRepositoryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CreateRepositoryRequest,
+            CreateRepositoryResponse,
+            ErrorResponse>) CreateRepositoryRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Creates a repository.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CreateRepositoryRequest}
+     *
+     */
+
+    public final CreateRepositoryResponse createRepository(
+        Function<CreateRepositoryRequest.Builder, ObjectBuilder<CreateRepositoryRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return createRepository(fn.apply(new CreateRepositoryRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: snapshot.delete
+
+    /**
+     * Deletes a snapshot.
+     *
+     *
+     */
+
+    public DeleteSnapshotResponse delete(DeleteSnapshotRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteSnapshotRequest, DeleteSnapshotResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteSnapshotRequest,
+            DeleteSnapshotResponse,
+            ErrorResponse>) DeleteSnapshotRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes a snapshot.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteSnapshotRequest}
+     *
+     */
+
+    public final DeleteSnapshotResponse delete(Function<DeleteSnapshotRequest.Builder, ObjectBuilder<DeleteSnapshotRequest>> fn)
+        throws IOException, OpenSearchException {
+        return delete(fn.apply(new DeleteSnapshotRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: snapshot.delete_repository
+
+    /**
+     * Deletes a repository.
+     *
+     *
+     */
+
+    public DeleteRepositoryResponse deleteRepository(DeleteRepositoryRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<DeleteRepositoryRequest, DeleteRepositoryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            DeleteRepositoryRequest,
+            DeleteRepositoryResponse,
+            ErrorResponse>) DeleteRepositoryRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Deletes a repository.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link DeleteRepositoryRequest}
+     *
+     */
+
+    public final DeleteRepositoryResponse deleteRepository(
+        Function<DeleteRepositoryRequest.Builder, ObjectBuilder<DeleteRepositoryRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return deleteRepository(fn.apply(new DeleteRepositoryRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: snapshot.get
+
+    /**
+     * Returns information about a snapshot.
+     *
+     *
+     */
+
+    public GetSnapshotResponse get(GetSnapshotRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetSnapshotRequest, GetSnapshotResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetSnapshotRequest,
+            GetSnapshotResponse,
+            ErrorResponse>) GetSnapshotRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about a snapshot.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetSnapshotRequest}
+     *
+     */
+
+    public final GetSnapshotResponse get(Function<GetSnapshotRequest.Builder, ObjectBuilder<GetSnapshotRequest>> fn) throws IOException,
+        OpenSearchException {
+        return get(fn.apply(new GetSnapshotRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: snapshot.get_repository
+
+    /**
+     * Returns information about a repository.
+     *
+     *
+     */
+
+    public GetRepositoryResponse getRepository(GetRepositoryRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetRepositoryRequest, GetRepositoryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetRepositoryRequest,
+            GetRepositoryResponse,
+            ErrorResponse>) GetRepositoryRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about a repository.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetRepositoryRequest}
+     *
+     */
+
+    public final GetRepositoryResponse getRepository(Function<GetRepositoryRequest.Builder, ObjectBuilder<GetRepositoryRequest>> fn)
+        throws IOException, OpenSearchException {
+        return getRepository(fn.apply(new GetRepositoryRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about a repository.
+     *
+     *
+     */
+
+    public GetRepositoryResponse getRepository() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new GetRepositoryRequest.Builder().build(),
+            GetRepositoryRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: snapshot.restore
+
+    /**
+     * Restores a snapshot.
+     *
+     *
+     */
+
+    public RestoreResponse restore(RestoreRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<RestoreRequest, RestoreResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            RestoreRequest,
+            RestoreResponse,
+            ErrorResponse>) RestoreRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Restores a snapshot.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link RestoreRequest}
+     *
+     */
+
+    public final RestoreResponse restore(Function<RestoreRequest.Builder, ObjectBuilder<RestoreRequest>> fn) throws IOException,
+        OpenSearchException {
+        return restore(fn.apply(new RestoreRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: snapshot.status
+
+    /**
+     * Returns information about the status of a snapshot.
+     *
+     *
+     */
+
+    public SnapshotStatusResponse status(SnapshotStatusRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<SnapshotStatusRequest, SnapshotStatusResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            SnapshotStatusRequest,
+            SnapshotStatusResponse,
+            ErrorResponse>) SnapshotStatusRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about the status of a snapshot.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link SnapshotStatusRequest}
+     *
+     */
+
+    public final SnapshotStatusResponse status(Function<SnapshotStatusRequest.Builder, ObjectBuilder<SnapshotStatusRequest>> fn)
+        throws IOException, OpenSearchException {
+        return status(fn.apply(new SnapshotStatusRequest.Builder()).build());
+    }
+
+    /**
+     * Returns information about the status of a snapshot.
+     *
+     *
+     */
+
+    public SnapshotStatusResponse status() throws IOException, OpenSearchException {
+        return this.transport.performRequest(
+            new SnapshotStatusRequest.Builder().build(),
+            SnapshotStatusRequest._ENDPOINT,
+            this.transportOptions
+        );
+    }
+
+    // ----- Endpoint: snapshot.verify_repository
+
+    /**
+     * Verifies a repository.
+     *
+     *
+     */
+
+    public VerifyRepositoryResponse verifyRepository(VerifyRepositoryRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<VerifyRepositoryRequest, VerifyRepositoryResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            VerifyRepositoryRequest,
+            VerifyRepositoryResponse,
+            ErrorResponse>) VerifyRepositoryRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Verifies a repository.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link VerifyRepositoryRequest}
+     *
+     */
+
+    public final VerifyRepositoryResponse verifyRepository(
+        Function<VerifyRepositoryRequest.Builder, ObjectBuilder<VerifyRepositoryRequest>> fn
+    ) throws IOException, OpenSearchException {
+        return verifyRepository(fn.apply(new VerifyRepositoryRequest.Builder()).build());
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/Repository.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/Repository.java
index 173d8c63ef..d199f71e25 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/Repository.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/Repository.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,153 +44,152 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: snapshot._types.Repository
 
 @JsonpDeserializable
 public class Repository implements JsonpSerializable {
-	private final String type;
-
-	@Nullable
-	private final String uuid;
-
-	private final RepositorySettings settings;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Repository(Builder builder) {
-
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-		this.uuid = builder.uuid;
-		this.settings = ApiTypeHelper.requireNonNull(builder.settings, this, "settings");
-
-	}
-
-	public static Repository of(Function<Builder, ObjectBuilder<Repository>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * API name: {@code uuid}
-	 */
-	@Nullable
-	public final String uuid() {
-		return this.uuid;
-	}
-
-	/**
-	 * Required - API name: {@code settings}
-	 */
-	public final RepositorySettings settings() {
-		return this.settings;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("type");
-		generator.write(this.type);
-
-		if (this.uuid != null) {
-			generator.writeKey("uuid");
-			generator.write(this.uuid);
-
-		}
-		generator.writeKey("settings");
-		this.settings.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Repository}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Repository> {
-		private String type;
-
-		@Nullable
-		private String uuid;
-
-		private RepositorySettings settings;
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code uuid}
-		 */
-		public final Builder uuid(@Nullable String value) {
-			this.uuid = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code settings}
-		 */
-		public final Builder settings(RepositorySettings value) {
-			this.settings = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code settings}
-		 */
-		public final Builder settings(Function<RepositorySettings.Builder, ObjectBuilder<RepositorySettings>> fn) {
-			return this.settings(fn.apply(new RepositorySettings.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link Repository}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Repository build() {
-			_checkSingleUse();
-
-			return new Repository(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Repository}
-	 */
-	public static final JsonpDeserializer<Repository> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Repository::setupRepositoryDeserializer);
-
-	protected static void setupRepositoryDeserializer(ObjectDeserializer<Repository.Builder> op) {
-
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-		op.add(Builder::uuid, JsonpDeserializer.stringDeserializer(), "uuid");
-		op.add(Builder::settings, RepositorySettings._DESERIALIZER, "settings");
-
-	}
+    private final String type;
+
+    @Nullable
+    private final String uuid;
+
+    private final RepositorySettings settings;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Repository(Builder builder) {
+
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.uuid = builder.uuid;
+        this.settings = ApiTypeHelper.requireNonNull(builder.settings, this, "settings");
+
+    }
+
+    public static Repository of(Function<Builder, ObjectBuilder<Repository>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * API name: {@code uuid}
+     */
+    @Nullable
+    public final String uuid() {
+        return this.uuid;
+    }
+
+    /**
+     * Required - API name: {@code settings}
+     */
+    public final RepositorySettings settings() {
+        return this.settings;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("type");
+        generator.write(this.type);
+
+        if (this.uuid != null) {
+            generator.writeKey("uuid");
+            generator.write(this.uuid);
+
+        }
+        generator.writeKey("settings");
+        this.settings.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Repository}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Repository> {
+        private String type;
+
+        @Nullable
+        private String uuid;
+
+        private RepositorySettings settings;
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code uuid}
+         */
+        public final Builder uuid(@Nullable String value) {
+            this.uuid = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code settings}
+         */
+        public final Builder settings(RepositorySettings value) {
+            this.settings = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code settings}
+         */
+        public final Builder settings(Function<RepositorySettings.Builder, ObjectBuilder<RepositorySettings>> fn) {
+            return this.settings(fn.apply(new RepositorySettings.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link Repository}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Repository build() {
+            _checkSingleUse();
+
+            return new Repository(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Repository}
+     */
+    public static final JsonpDeserializer<Repository> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Repository::setupRepositoryDeserializer
+    );
+
+    protected static void setupRepositoryDeserializer(ObjectDeserializer<Repository.Builder> op) {
+
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+        op.add(Builder::uuid, JsonpDeserializer.stringDeserializer(), "uuid");
+        op.add(Builder::settings, RepositorySettings._DESERIALIZER, "settings");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/RepositorySettings.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/RepositorySettings.java
index 6134b8f614..0298450ac9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/RepositorySettings.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/RepositorySettings.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,210 +44,209 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: snapshot._types.RepositorySettings
 
 @JsonpDeserializable
 public class RepositorySettings implements JsonpSerializable {
-	@Nullable
-	private final String chunkSize;
-
-	@Nullable
-	private final Boolean compress;
-
-	@Nullable
-	private final String concurrentStreams;
-
-	private final String location;
-
-	@Nullable
-	private final Boolean readOnly;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RepositorySettings(Builder builder) {
-
-		this.chunkSize = builder.chunkSize;
-		this.compress = builder.compress;
-		this.concurrentStreams = builder.concurrentStreams;
-		this.location = ApiTypeHelper.requireNonNull(builder.location, this, "location");
-		this.readOnly = builder.readOnly;
-
-	}
-
-	public static RepositorySettings of(Function<Builder, ObjectBuilder<RepositorySettings>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code chunk_size}
-	 */
-	@Nullable
-	public final String chunkSize() {
-		return this.chunkSize;
-	}
-
-	/**
-	 * API name: {@code compress}
-	 */
-	@Nullable
-	public final Boolean compress() {
-		return this.compress;
-	}
-
-	/**
-	 * API name: {@code concurrent_streams}
-	 */
-	@Nullable
-	public final String concurrentStreams() {
-		return this.concurrentStreams;
-	}
-
-	/**
-	 * Required - API name: {@code location}
-	 */
-	public final String location() {
-		return this.location;
-	}
-
-	/**
-	 * API name: {@code read_only}
-	 */
-	@Nullable
-	public final Boolean readOnly() {
-		return this.readOnly;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (this.chunkSize != null) {
-			generator.writeKey("chunk_size");
-			generator.write(this.chunkSize);
-
-		}
-		if (this.compress != null) {
-			generator.writeKey("compress");
-			generator.write(this.compress);
-
-		}
-		if (this.concurrentStreams != null) {
-			generator.writeKey("concurrent_streams");
-			generator.write(this.concurrentStreams);
-
-		}
-		generator.writeKey("location");
-		generator.write(this.location);
-
-		if (this.readOnly != null) {
-			generator.writeKey("read_only");
-			generator.write(this.readOnly);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RepositorySettings}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RepositorySettings> {
-		@Nullable
-		private String chunkSize;
-
-		@Nullable
-		private Boolean compress;
-
-		@Nullable
-		private String concurrentStreams;
-
-		private String location;
-
-		@Nullable
-		private Boolean readOnly;
-
-		/**
-		 * API name: {@code chunk_size}
-		 */
-		public final Builder chunkSize(@Nullable String value) {
-			this.chunkSize = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code compress}
-		 */
-		public final Builder compress(@Nullable Boolean value) {
-			this.compress = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code concurrent_streams}
-		 */
-		public final Builder concurrentStreams(@Nullable String value) {
-			this.concurrentStreams = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code location}
-		 */
-		public final Builder location(String value) {
-			this.location = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code read_only}
-		 */
-		public final Builder readOnly(@Nullable Boolean value) {
-			this.readOnly = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RepositorySettings}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RepositorySettings build() {
-			_checkSingleUse();
-
-			return new RepositorySettings(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RepositorySettings}
-	 */
-	public static final JsonpDeserializer<RepositorySettings> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, RepositorySettings::setupRepositorySettingsDeserializer);
-
-	protected static void setupRepositorySettingsDeserializer(ObjectDeserializer<RepositorySettings.Builder> op) {
-
-		op.add(Builder::chunkSize, JsonpDeserializer.stringDeserializer(), "chunk_size");
-		op.add(Builder::compress, JsonpDeserializer.booleanDeserializer(), "compress");
-		op.add(Builder::concurrentStreams, JsonpDeserializer.stringDeserializer(), "concurrent_streams");
-		op.add(Builder::location, JsonpDeserializer.stringDeserializer(), "location");
-		op.add(Builder::readOnly, JsonpDeserializer.booleanDeserializer(), "read_only", "readonly");
-
-	}
+    @Nullable
+    private final String chunkSize;
+
+    @Nullable
+    private final Boolean compress;
+
+    @Nullable
+    private final String concurrentStreams;
+
+    private final String location;
+
+    @Nullable
+    private final Boolean readOnly;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RepositorySettings(Builder builder) {
+
+        this.chunkSize = builder.chunkSize;
+        this.compress = builder.compress;
+        this.concurrentStreams = builder.concurrentStreams;
+        this.location = ApiTypeHelper.requireNonNull(builder.location, this, "location");
+        this.readOnly = builder.readOnly;
+
+    }
+
+    public static RepositorySettings of(Function<Builder, ObjectBuilder<RepositorySettings>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code chunk_size}
+     */
+    @Nullable
+    public final String chunkSize() {
+        return this.chunkSize;
+    }
+
+    /**
+     * API name: {@code compress}
+     */
+    @Nullable
+    public final Boolean compress() {
+        return this.compress;
+    }
+
+    /**
+     * API name: {@code concurrent_streams}
+     */
+    @Nullable
+    public final String concurrentStreams() {
+        return this.concurrentStreams;
+    }
+
+    /**
+     * Required - API name: {@code location}
+     */
+    public final String location() {
+        return this.location;
+    }
+
+    /**
+     * API name: {@code read_only}
+     */
+    @Nullable
+    public final Boolean readOnly() {
+        return this.readOnly;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (this.chunkSize != null) {
+            generator.writeKey("chunk_size");
+            generator.write(this.chunkSize);
+
+        }
+        if (this.compress != null) {
+            generator.writeKey("compress");
+            generator.write(this.compress);
+
+        }
+        if (this.concurrentStreams != null) {
+            generator.writeKey("concurrent_streams");
+            generator.write(this.concurrentStreams);
+
+        }
+        generator.writeKey("location");
+        generator.write(this.location);
+
+        if (this.readOnly != null) {
+            generator.writeKey("read_only");
+            generator.write(this.readOnly);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RepositorySettings}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RepositorySettings> {
+        @Nullable
+        private String chunkSize;
+
+        @Nullable
+        private Boolean compress;
+
+        @Nullable
+        private String concurrentStreams;
+
+        private String location;
+
+        @Nullable
+        private Boolean readOnly;
+
+        /**
+         * API name: {@code chunk_size}
+         */
+        public final Builder chunkSize(@Nullable String value) {
+            this.chunkSize = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code compress}
+         */
+        public final Builder compress(@Nullable Boolean value) {
+            this.compress = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code concurrent_streams}
+         */
+        public final Builder concurrentStreams(@Nullable String value) {
+            this.concurrentStreams = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code location}
+         */
+        public final Builder location(String value) {
+            this.location = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code read_only}
+         */
+        public final Builder readOnly(@Nullable Boolean value) {
+            this.readOnly = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RepositorySettings}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RepositorySettings build() {
+            _checkSingleUse();
+
+            return new RepositorySettings(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RepositorySettings}
+     */
+    public static final JsonpDeserializer<RepositorySettings> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RepositorySettings::setupRepositorySettingsDeserializer
+    );
+
+    protected static void setupRepositorySettingsDeserializer(ObjectDeserializer<RepositorySettings.Builder> op) {
+
+        op.add(Builder::chunkSize, JsonpDeserializer.stringDeserializer(), "chunk_size");
+        op.add(Builder::compress, JsonpDeserializer.booleanDeserializer(), "compress");
+        op.add(Builder::concurrentStreams, JsonpDeserializer.stringDeserializer(), "concurrent_streams");
+        op.add(Builder::location, JsonpDeserializer.stringDeserializer(), "location");
+        op.add(Builder::readOnly, JsonpDeserializer.booleanDeserializer(), "read_only", "readonly");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/RestoreRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/RestoreRequest.java
index 03ebcd2f27..0d315c0ae2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/RestoreRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/RestoreRequest.java
@@ -32,28 +32,27 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch._types.RequestBase;
-import org.opensearch.client.opensearch._types.Time;
-import org.opensearch.client.opensearch.indices.PutIndicesSettingsRequest;
+import jakarta.json.stream.JsonGenerator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch._types.RequestBase;
+import org.opensearch.client.opensearch._types.Time;
+import org.opensearch.client.opensearch.indices.PutIndicesSettingsRequest;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: snapshot.restore.Request
 
@@ -62,567 +61,574 @@
  */
 @JsonpDeserializable
 public class RestoreRequest extends RequestBase implements JsonpSerializable {
-	private final List<String> ignoreIndexSettings;
-
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	@Nullable
-	private final Boolean includeAliases;
-
-	@Nullable
-	private final Boolean includeGlobalState;
-
-	@Nullable
-	private final PutIndicesSettingsRequest indexSettings;
-
-	private final List<String> indices;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final Boolean partial;
-
-	@Nullable
-	private final String renamePattern;
-
-	@Nullable
-	private final String renameReplacement;
-
-	private final String repository;
-
-	private final String snapshot;
-
-	@Nullable
-	private final Boolean waitForCompletion;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private RestoreRequest(Builder builder) {
-
-		this.ignoreIndexSettings = ApiTypeHelper.unmodifiable(builder.ignoreIndexSettings);
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.includeAliases = builder.includeAliases;
-		this.includeGlobalState = builder.includeGlobalState;
-		this.indexSettings = builder.indexSettings;
-		this.indices = ApiTypeHelper.unmodifiable(builder.indices);
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.partial = builder.partial;
-		this.renamePattern = builder.renamePattern;
-		this.renameReplacement = builder.renameReplacement;
-		this.repository = ApiTypeHelper.requireNonNull(builder.repository, this, "repository");
-		this.snapshot = ApiTypeHelper.requireNonNull(builder.snapshot, this, "snapshot");
-		this.waitForCompletion = builder.waitForCompletion;
-
-	}
-
-	public static RestoreRequest of(Function<Builder, ObjectBuilder<RestoreRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code ignore_index_settings}
-	 */
-	public final List<String> ignoreIndexSettings() {
-		return this.ignoreIndexSettings;
-	}
-
-	/**
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * API name: {@code include_aliases}
-	 */
-	@Nullable
-	public final Boolean includeAliases() {
-		return this.includeAliases;
-	}
-
-	/**
-	 * API name: {@code include_global_state}
-	 */
-	@Nullable
-	public final Boolean includeGlobalState() {
-		return this.includeGlobalState;
-	}
-
-	/**
-	 * API name: {@code index_settings}
-	 */
-	@Nullable
-	public final PutIndicesSettingsRequest indexSettings() {
-		return this.indexSettings;
-	}
-
-	/**
-	 * API name: {@code indices}
-	 */
-	public final List<String> indices() {
-		return this.indices;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to master node
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to cluster-manager node
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * API name: {@code partial}
-	 */
-	@Nullable
-	public final Boolean partial() {
-		return this.partial;
-	}
-
-	/**
-	 * API name: {@code rename_pattern}
-	 */
-	@Nullable
-	public final String renamePattern() {
-		return this.renamePattern;
-	}
-
-	/**
-	 * API name: {@code rename_replacement}
-	 */
-	@Nullable
-	public final String renameReplacement() {
-		return this.renameReplacement;
-	}
-
-	/**
-	 * Required - A repository name
-	 * <p>
-	 * API name: {@code repository}
-	 */
-	public final String repository() {
-		return this.repository;
-	}
-
-	/**
-	 * Required - A snapshot name
-	 * <p>
-	 * API name: {@code snapshot}
-	 */
-	public final String snapshot() {
-		return this.snapshot;
-	}
-
-	/**
-	 * Should this request wait until the operation has completed before returning
-	 * <p>
-	 * API name: {@code wait_for_completion}
-	 */
-	@Nullable
-	public final Boolean waitForCompletion() {
-		return this.waitForCompletion;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.ignoreIndexSettings)) {
-			generator.writeKey("ignore_index_settings");
-			generator.writeStartArray();
-			for (String item0 : this.ignoreIndexSettings) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.ignoreUnavailable != null) {
-			generator.writeKey("ignore_unavailable");
-			generator.write(this.ignoreUnavailable);
-
-		}
-		if (this.includeAliases != null) {
-			generator.writeKey("include_aliases");
-			generator.write(this.includeAliases);
-
-		}
-		if (this.includeGlobalState != null) {
-			generator.writeKey("include_global_state");
-			generator.write(this.includeGlobalState);
-
-		}
-		if (this.indexSettings != null) {
-			generator.writeKey("index_settings");
-			this.indexSettings.serialize(generator, mapper);
-
-		}
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartArray();
-			for (String item0 : this.indices) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.partial != null) {
-			generator.writeKey("partial");
-			generator.write(this.partial);
-
-		}
-		if (this.renamePattern != null) {
-			generator.writeKey("rename_pattern");
-			generator.write(this.renamePattern);
-
-		}
-		if (this.renameReplacement != null) {
-			generator.writeKey("rename_replacement");
-			generator.write(this.renameReplacement);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link RestoreRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RestoreRequest> {
-		@Nullable
-		private List<String> ignoreIndexSettings;
-
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Nullable
-		private Boolean includeAliases;
-
-		@Nullable
-		private Boolean includeGlobalState;
-
-		@Nullable
-		private PutIndicesSettingsRequest indexSettings;
-
-		@Nullable
-		private List<String> indices;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private Boolean partial;
-
-		@Nullable
-		private String renamePattern;
-
-		@Nullable
-		private String renameReplacement;
-
-		private String repository;
-
-		private String snapshot;
-
-		@Nullable
-		private Boolean waitForCompletion;
-
-		/**
-		 * API name: {@code ignore_index_settings}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>ignoreIndexSettings</code>.
-		 */
-		public final Builder ignoreIndexSettings(List<String> list) {
-			this.ignoreIndexSettings = _listAddAll(this.ignoreIndexSettings, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_index_settings}
-		 * <p>
-		 * Adds one or more values to <code>ignoreIndexSettings</code>.
-		 */
-		public final Builder ignoreIndexSettings(String value, String... values) {
-			this.ignoreIndexSettings = _listAdd(this.ignoreIndexSettings, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code include_aliases}
-		 */
-		public final Builder includeAliases(@Nullable Boolean value) {
-			this.includeAliases = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code include_global_state}
-		 */
-		public final Builder includeGlobalState(@Nullable Boolean value) {
-			this.includeGlobalState = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_settings}
-		 */
-		public final Builder indexSettings(@Nullable PutIndicesSettingsRequest value) {
-			this.indexSettings = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_settings}
-		 */
-		public final Builder indexSettings(
-				Function<PutIndicesSettingsRequest.Builder, ObjectBuilder<PutIndicesSettingsRequest>> fn) {
-			return this.indexSettings(fn.apply(new PutIndicesSettingsRequest.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code indices}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indices</code>.
-		 */
-		public final Builder indices(List<String> list) {
-			this.indices = _listAddAll(this.indices, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code indices}
-		 * <p>
-		 * Adds one or more values to <code>indices</code>.
-		 */
-		public final Builder indices(String value, String... values) {
-			this.indices = _listAdd(this.indices, value, values);
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code partial}
-		 */
-		public final Builder partial(@Nullable Boolean value) {
-			this.partial = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code rename_pattern}
-		 */
-		public final Builder renamePattern(@Nullable String value) {
-			this.renamePattern = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code rename_replacement}
-		 */
-		public final Builder renameReplacement(@Nullable String value) {
-			this.renameReplacement = value;
-			return this;
-		}
-
-		/**
-		 * Required - A repository name
-		 * <p>
-		 * API name: {@code repository}
-		 */
-		public final Builder repository(String value) {
-			this.repository = value;
-			return this;
-		}
-
-		/**
-		 * Required - A snapshot name
-		 * <p>
-		 * API name: {@code snapshot}
-		 */
-		public final Builder snapshot(String value) {
-			this.snapshot = value;
-			return this;
-		}
-
-		/**
-		 * Should this request wait until the operation has completed before returning
-		 * <p>
-		 * API name: {@code wait_for_completion}
-		 */
-		public final Builder waitForCompletion(@Nullable Boolean value) {
-			this.waitForCompletion = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link RestoreRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RestoreRequest build() {
-			_checkSingleUse();
-
-			return new RestoreRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link RestoreRequest}
-	 */
-	public static final JsonpDeserializer<RestoreRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RestoreRequest::setupRestoreRequestDeserializer);
-
-	protected static void setupRestoreRequestDeserializer(ObjectDeserializer<RestoreRequest.Builder> op) {
-
-		op.add(Builder::ignoreIndexSettings,
-				JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "ignore_index_settings");
-		op.add(Builder::ignoreUnavailable, JsonpDeserializer.booleanDeserializer(), "ignore_unavailable");
-		op.add(Builder::includeAliases, JsonpDeserializer.booleanDeserializer(), "include_aliases");
-		op.add(Builder::includeGlobalState, JsonpDeserializer.booleanDeserializer(), "include_global_state");
-		op.add(Builder::indexSettings, PutIndicesSettingsRequest._DESERIALIZER, "index_settings");
-		op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"indices");
-		op.add(Builder::partial, JsonpDeserializer.booleanDeserializer(), "partial");
-		op.add(Builder::renamePattern, JsonpDeserializer.stringDeserializer(), "rename_pattern");
-		op.add(Builder::renameReplacement, JsonpDeserializer.stringDeserializer(), "rename_replacement");
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code snapshot.restore}".
-	 */
-	public static final Endpoint<RestoreRequest, RestoreResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _repository = 1 << 0;
-				final int _snapshot = 1 << 1;
-
-				int propsSet = 0;
-
-				propsSet |= _repository;
-				propsSet |= _snapshot;
-
-				if (propsSet == (_repository | _snapshot)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_snapshot");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.repository, buf);
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.snapshot, buf);
-					buf.append("/_restore");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.waitForCompletion != null) {
-					params.put("wait_for_completion", String.valueOf(request.waitForCompletion));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), true, RestoreResponse._DESERIALIZER);
+    private final List<String> ignoreIndexSettings;
+
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    @Nullable
+    private final Boolean includeAliases;
+
+    @Nullable
+    private final Boolean includeGlobalState;
+
+    @Nullable
+    private final PutIndicesSettingsRequest indexSettings;
+
+    private final List<String> indices;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final Boolean partial;
+
+    @Nullable
+    private final String renamePattern;
+
+    @Nullable
+    private final String renameReplacement;
+
+    private final String repository;
+
+    private final String snapshot;
+
+    @Nullable
+    private final Boolean waitForCompletion;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private RestoreRequest(Builder builder) {
+
+        this.ignoreIndexSettings = ApiTypeHelper.unmodifiable(builder.ignoreIndexSettings);
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.includeAliases = builder.includeAliases;
+        this.includeGlobalState = builder.includeGlobalState;
+        this.indexSettings = builder.indexSettings;
+        this.indices = ApiTypeHelper.unmodifiable(builder.indices);
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.partial = builder.partial;
+        this.renamePattern = builder.renamePattern;
+        this.renameReplacement = builder.renameReplacement;
+        this.repository = ApiTypeHelper.requireNonNull(builder.repository, this, "repository");
+        this.snapshot = ApiTypeHelper.requireNonNull(builder.snapshot, this, "snapshot");
+        this.waitForCompletion = builder.waitForCompletion;
+
+    }
+
+    public static RestoreRequest of(Function<Builder, ObjectBuilder<RestoreRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code ignore_index_settings}
+     */
+    public final List<String> ignoreIndexSettings() {
+        return this.ignoreIndexSettings;
+    }
+
+    /**
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * API name: {@code include_aliases}
+     */
+    @Nullable
+    public final Boolean includeAliases() {
+        return this.includeAliases;
+    }
+
+    /**
+     * API name: {@code include_global_state}
+     */
+    @Nullable
+    public final Boolean includeGlobalState() {
+        return this.includeGlobalState;
+    }
+
+    /**
+     * API name: {@code index_settings}
+     */
+    @Nullable
+    public final PutIndicesSettingsRequest indexSettings() {
+        return this.indexSettings;
+    }
+
+    /**
+     * API name: {@code indices}
+     */
+    public final List<String> indices() {
+        return this.indices;
+    }
+
+    /**
+     * Explicit operation timeout for connection to master node
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Explicit operation timeout for connection to cluster-manager node
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * API name: {@code partial}
+     */
+    @Nullable
+    public final Boolean partial() {
+        return this.partial;
+    }
+
+    /**
+     * API name: {@code rename_pattern}
+     */
+    @Nullable
+    public final String renamePattern() {
+        return this.renamePattern;
+    }
+
+    /**
+     * API name: {@code rename_replacement}
+     */
+    @Nullable
+    public final String renameReplacement() {
+        return this.renameReplacement;
+    }
+
+    /**
+     * Required - A repository name
+     * <p>
+     * API name: {@code repository}
+     */
+    public final String repository() {
+        return this.repository;
+    }
+
+    /**
+     * Required - A snapshot name
+     * <p>
+     * API name: {@code snapshot}
+     */
+    public final String snapshot() {
+        return this.snapshot;
+    }
+
+    /**
+     * Should this request wait until the operation has completed before returning
+     * <p>
+     * API name: {@code wait_for_completion}
+     */
+    @Nullable
+    public final Boolean waitForCompletion() {
+        return this.waitForCompletion;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.ignoreIndexSettings)) {
+            generator.writeKey("ignore_index_settings");
+            generator.writeStartArray();
+            for (String item0 : this.ignoreIndexSettings) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.ignoreUnavailable != null) {
+            generator.writeKey("ignore_unavailable");
+            generator.write(this.ignoreUnavailable);
+
+        }
+        if (this.includeAliases != null) {
+            generator.writeKey("include_aliases");
+            generator.write(this.includeAliases);
+
+        }
+        if (this.includeGlobalState != null) {
+            generator.writeKey("include_global_state");
+            generator.write(this.includeGlobalState);
+
+        }
+        if (this.indexSettings != null) {
+            generator.writeKey("index_settings");
+            this.indexSettings.serialize(generator, mapper);
+
+        }
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartArray();
+            for (String item0 : this.indices) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.partial != null) {
+            generator.writeKey("partial");
+            generator.write(this.partial);
+
+        }
+        if (this.renamePattern != null) {
+            generator.writeKey("rename_pattern");
+            generator.write(this.renamePattern);
+
+        }
+        if (this.renameReplacement != null) {
+            generator.writeKey("rename_replacement");
+            generator.write(this.renameReplacement);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link RestoreRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RestoreRequest> {
+        @Nullable
+        private List<String> ignoreIndexSettings;
+
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Nullable
+        private Boolean includeAliases;
+
+        @Nullable
+        private Boolean includeGlobalState;
+
+        @Nullable
+        private PutIndicesSettingsRequest indexSettings;
+
+        @Nullable
+        private List<String> indices;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private Boolean partial;
+
+        @Nullable
+        private String renamePattern;
+
+        @Nullable
+        private String renameReplacement;
+
+        private String repository;
+
+        private String snapshot;
+
+        @Nullable
+        private Boolean waitForCompletion;
+
+        /**
+         * API name: {@code ignore_index_settings}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>ignoreIndexSettings</code>.
+         */
+        public final Builder ignoreIndexSettings(List<String> list) {
+            this.ignoreIndexSettings = _listAddAll(this.ignoreIndexSettings, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_index_settings}
+         * <p>
+         * Adds one or more values to <code>ignoreIndexSettings</code>.
+         */
+        public final Builder ignoreIndexSettings(String value, String... values) {
+            this.ignoreIndexSettings = _listAdd(this.ignoreIndexSettings, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code include_aliases}
+         */
+        public final Builder includeAliases(@Nullable Boolean value) {
+            this.includeAliases = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code include_global_state}
+         */
+        public final Builder includeGlobalState(@Nullable Boolean value) {
+            this.includeGlobalState = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index_settings}
+         */
+        public final Builder indexSettings(@Nullable PutIndicesSettingsRequest value) {
+            this.indexSettings = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code index_settings}
+         */
+        public final Builder indexSettings(Function<PutIndicesSettingsRequest.Builder, ObjectBuilder<PutIndicesSettingsRequest>> fn) {
+            return this.indexSettings(fn.apply(new PutIndicesSettingsRequest.Builder()).build());
+        }
+
+        /**
+         * API name: {@code indices}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indices</code>.
+         */
+        public final Builder indices(List<String> list) {
+            this.indices = _listAddAll(this.indices, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code indices}
+         * <p>
+         * Adds one or more values to <code>indices</code>.
+         */
+        public final Builder indices(String value, String... values) {
+            this.indices = _listAdd(this.indices, value, values);
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code partial}
+         */
+        public final Builder partial(@Nullable Boolean value) {
+            this.partial = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code rename_pattern}
+         */
+        public final Builder renamePattern(@Nullable String value) {
+            this.renamePattern = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code rename_replacement}
+         */
+        public final Builder renameReplacement(@Nullable String value) {
+            this.renameReplacement = value;
+            return this;
+        }
+
+        /**
+         * Required - A repository name
+         * <p>
+         * API name: {@code repository}
+         */
+        public final Builder repository(String value) {
+            this.repository = value;
+            return this;
+        }
+
+        /**
+         * Required - A snapshot name
+         * <p>
+         * API name: {@code snapshot}
+         */
+        public final Builder snapshot(String value) {
+            this.snapshot = value;
+            return this;
+        }
+
+        /**
+         * Should this request wait until the operation has completed before returning
+         * <p>
+         * API name: {@code wait_for_completion}
+         */
+        public final Builder waitForCompletion(@Nullable Boolean value) {
+            this.waitForCompletion = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link RestoreRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RestoreRequest build() {
+            _checkSingleUse();
+
+            return new RestoreRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link RestoreRequest}
+     */
+    public static final JsonpDeserializer<RestoreRequest> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RestoreRequest::setupRestoreRequestDeserializer
+    );
+
+    protected static void setupRestoreRequestDeserializer(ObjectDeserializer<RestoreRequest.Builder> op) {
+
+        op.add(
+            Builder::ignoreIndexSettings,
+            JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
+            "ignore_index_settings"
+        );
+        op.add(Builder::ignoreUnavailable, JsonpDeserializer.booleanDeserializer(), "ignore_unavailable");
+        op.add(Builder::includeAliases, JsonpDeserializer.booleanDeserializer(), "include_aliases");
+        op.add(Builder::includeGlobalState, JsonpDeserializer.booleanDeserializer(), "include_global_state");
+        op.add(Builder::indexSettings, PutIndicesSettingsRequest._DESERIALIZER, "index_settings");
+        op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "indices");
+        op.add(Builder::partial, JsonpDeserializer.booleanDeserializer(), "partial");
+        op.add(Builder::renamePattern, JsonpDeserializer.stringDeserializer(), "rename_pattern");
+        op.add(Builder::renameReplacement, JsonpDeserializer.stringDeserializer(), "rename_replacement");
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code snapshot.restore}".
+     */
+    public static final Endpoint<RestoreRequest, RestoreResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _repository = 1 << 0;
+            final int _snapshot = 1 << 1;
+
+            int propsSet = 0;
+
+            propsSet |= _repository;
+            propsSet |= _snapshot;
+
+            if (propsSet == (_repository | _snapshot)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_snapshot");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.repository, buf);
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.snapshot, buf);
+                buf.append("/_restore");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.waitForCompletion != null) {
+                params.put("wait_for_completion", String.valueOf(request.waitForCompletion));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        true,
+        RestoreResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/RestoreResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/RestoreResponse.java
index 1c5a79fcda..b8c6e5e51e 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/RestoreResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/RestoreResponse.java
@@ -32,110 +32,111 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
-import org.opensearch.client.opensearch.snapshot.restore.SnapshotRestore;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.snapshot.restore.SnapshotRestore;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: snapshot.restore.Response
 
 @JsonpDeserializable
 public class RestoreResponse implements JsonpSerializable {
-	private final SnapshotRestore snapshot;
+    private final SnapshotRestore snapshot;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private RestoreResponse(Builder builder) {
+    private RestoreResponse(Builder builder) {
 
-		this.snapshot = ApiTypeHelper.requireNonNull(builder.snapshot, this, "snapshot");
+        this.snapshot = ApiTypeHelper.requireNonNull(builder.snapshot, this, "snapshot");
 
-	}
+    }
 
-	public static RestoreResponse of(Function<Builder, ObjectBuilder<RestoreResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static RestoreResponse of(Function<Builder, ObjectBuilder<RestoreResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code snapshot}
-	 */
-	public final SnapshotRestore snapshot() {
-		return this.snapshot;
-	}
+    /**
+     * Required - API name: {@code snapshot}
+     */
+    public final SnapshotRestore snapshot() {
+        return this.snapshot;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("snapshot");
-		this.snapshot.serialize(generator, mapper);
+        generator.writeKey("snapshot");
+        this.snapshot.serialize(generator, mapper);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link RestoreResponse}.
-	 */
+    /**
+     * Builder for {@link RestoreResponse}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RestoreResponse> {
-		private SnapshotRestore snapshot;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<RestoreResponse> {
+        private SnapshotRestore snapshot;
 
-		/**
-		 * Required - API name: {@code snapshot}
-		 */
-		public final Builder snapshot(SnapshotRestore value) {
-			this.snapshot = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code snapshot}
+         */
+        public final Builder snapshot(SnapshotRestore value) {
+            this.snapshot = value;
+            return this;
+        }
 
-		/**
-		 * Required - API name: {@code snapshot}
-		 */
-		public final Builder snapshot(Function<SnapshotRestore.Builder, ObjectBuilder<SnapshotRestore>> fn) {
-			return this.snapshot(fn.apply(new SnapshotRestore.Builder()).build());
-		}
+        /**
+         * Required - API name: {@code snapshot}
+         */
+        public final Builder snapshot(Function<SnapshotRestore.Builder, ObjectBuilder<SnapshotRestore>> fn) {
+            return this.snapshot(fn.apply(new SnapshotRestore.Builder()).build());
+        }
 
-		/**
-		 * Builds a {@link RestoreResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public RestoreResponse build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link RestoreResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public RestoreResponse build() {
+            _checkSingleUse();
 
-			return new RestoreResponse(this);
-		}
-	}
+            return new RestoreResponse(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link RestoreResponse}
-	 */
-	public static final JsonpDeserializer<RestoreResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			RestoreResponse::setupRestoreResponseDeserializer);
+    /**
+     * Json deserializer for {@link RestoreResponse}
+     */
+    public static final JsonpDeserializer<RestoreResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        RestoreResponse::setupRestoreResponseDeserializer
+    );
 
-	protected static void setupRestoreResponseDeserializer(ObjectDeserializer<RestoreResponse.Builder> op) {
+    protected static void setupRestoreResponseDeserializer(ObjectDeserializer<RestoreResponse.Builder> op) {
 
-		op.add(Builder::snapshot, SnapshotRestore._DESERIALIZER, "snapshot");
+        op.add(Builder::snapshot, SnapshotRestore._DESERIALIZER, "snapshot");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/ShardsStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/ShardsStats.java
index 01bc31bb26..d898f1665b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/ShardsStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/ShardsStats.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,212 +43,212 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: snapshot._types.ShardsStats
 
 @JsonpDeserializable
 public class ShardsStats implements JsonpSerializable {
-	private final long done;
+    private final long done;
 
-	private final long failed;
+    private final long failed;
 
-	private final long finalizing;
+    private final long finalizing;
 
-	private final long initializing;
+    private final long initializing;
 
-	private final long started;
+    private final long started;
 
-	private final long total;
+    private final long total;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ShardsStats(Builder builder) {
+    private ShardsStats(Builder builder) {
 
-		this.done = ApiTypeHelper.requireNonNull(builder.done, this, "done");
-		this.failed = ApiTypeHelper.requireNonNull(builder.failed, this, "failed");
-		this.finalizing = ApiTypeHelper.requireNonNull(builder.finalizing, this, "finalizing");
-		this.initializing = ApiTypeHelper.requireNonNull(builder.initializing, this, "initializing");
-		this.started = ApiTypeHelper.requireNonNull(builder.started, this, "started");
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+        this.done = ApiTypeHelper.requireNonNull(builder.done, this, "done");
+        this.failed = ApiTypeHelper.requireNonNull(builder.failed, this, "failed");
+        this.finalizing = ApiTypeHelper.requireNonNull(builder.finalizing, this, "finalizing");
+        this.initializing = ApiTypeHelper.requireNonNull(builder.initializing, this, "initializing");
+        this.started = ApiTypeHelper.requireNonNull(builder.started, this, "started");
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
 
-	}
+    }
 
-	public static ShardsStats of(Function<Builder, ObjectBuilder<ShardsStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ShardsStats of(Function<Builder, ObjectBuilder<ShardsStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code done}
-	 */
-	public final long done() {
-		return this.done;
-	}
+    /**
+     * Required - API name: {@code done}
+     */
+    public final long done() {
+        return this.done;
+    }
 
-	/**
-	 * Required - API name: {@code failed}
-	 */
-	public final long failed() {
-		return this.failed;
-	}
+    /**
+     * Required - API name: {@code failed}
+     */
+    public final long failed() {
+        return this.failed;
+    }
 
-	/**
-	 * Required - API name: {@code finalizing}
-	 */
-	public final long finalizing() {
-		return this.finalizing;
-	}
+    /**
+     * Required - API name: {@code finalizing}
+     */
+    public final long finalizing() {
+        return this.finalizing;
+    }
 
-	/**
-	 * Required - API name: {@code initializing}
-	 */
-	public final long initializing() {
-		return this.initializing;
-	}
-
-	/**
-	 * Required - API name: {@code started}
-	 */
-	public final long started() {
-		return this.started;
-	}
-
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final long total() {
-		return this.total;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("done");
-		generator.write(this.done);
-
-		generator.writeKey("failed");
-		generator.write(this.failed);
-
-		generator.writeKey("finalizing");
-		generator.write(this.finalizing);
-
-		generator.writeKey("initializing");
-		generator.write(this.initializing);
-
-		generator.writeKey("started");
-		generator.write(this.started);
-
-		generator.writeKey("total");
-		generator.write(this.total);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardsStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardsStats> {
-		private Long done;
-
-		private Long failed;
-
-		private Long finalizing;
-
-		private Long initializing;
-
-		private Long started;
-
-		private Long total;
-
-		/**
-		 * Required - API name: {@code done}
-		 */
-		public final Builder done(long value) {
-			this.done = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code failed}
-		 */
-		public final Builder failed(long value) {
-			this.failed = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code finalizing}
-		 */
-		public final Builder finalizing(long value) {
-			this.finalizing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code initializing}
-		 */
-		public final Builder initializing(long value) {
-			this.initializing = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code started}
-		 */
-		public final Builder started(long value) {
-			this.started = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(long value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShardsStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardsStats build() {
-			_checkSingleUse();
-
-			return new ShardsStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardsStats}
-	 */
-	public static final JsonpDeserializer<ShardsStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ShardsStats::setupShardsStatsDeserializer);
-
-	protected static void setupShardsStatsDeserializer(ObjectDeserializer<ShardsStats.Builder> op) {
-
-		op.add(Builder::done, JsonpDeserializer.longDeserializer(), "done");
-		op.add(Builder::failed, JsonpDeserializer.longDeserializer(), "failed");
-		op.add(Builder::finalizing, JsonpDeserializer.longDeserializer(), "finalizing");
-		op.add(Builder::initializing, JsonpDeserializer.longDeserializer(), "initializing");
-		op.add(Builder::started, JsonpDeserializer.longDeserializer(), "started");
-		op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
-
-	}
+    /**
+     * Required - API name: {@code initializing}
+     */
+    public final long initializing() {
+        return this.initializing;
+    }
+
+    /**
+     * Required - API name: {@code started}
+     */
+    public final long started() {
+        return this.started;
+    }
+
+    /**
+     * Required - API name: {@code total}
+     */
+    public final long total() {
+        return this.total;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("done");
+        generator.write(this.done);
+
+        generator.writeKey("failed");
+        generator.write(this.failed);
+
+        generator.writeKey("finalizing");
+        generator.write(this.finalizing);
+
+        generator.writeKey("initializing");
+        generator.write(this.initializing);
+
+        generator.writeKey("started");
+        generator.write(this.started);
+
+        generator.writeKey("total");
+        generator.write(this.total);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardsStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardsStats> {
+        private Long done;
+
+        private Long failed;
+
+        private Long finalizing;
+
+        private Long initializing;
+
+        private Long started;
+
+        private Long total;
+
+        /**
+         * Required - API name: {@code done}
+         */
+        public final Builder done(long value) {
+            this.done = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code failed}
+         */
+        public final Builder failed(long value) {
+            this.failed = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code finalizing}
+         */
+        public final Builder finalizing(long value) {
+            this.finalizing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code initializing}
+         */
+        public final Builder initializing(long value) {
+            this.initializing = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code started}
+         */
+        public final Builder started(long value) {
+            this.started = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(long value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShardsStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardsStats build() {
+            _checkSingleUse();
+
+            return new ShardsStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardsStats}
+     */
+    public static final JsonpDeserializer<ShardsStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardsStats::setupShardsStatsDeserializer
+    );
+
+    protected static void setupShardsStatsDeserializer(ObjectDeserializer<ShardsStats.Builder> op) {
+
+        op.add(Builder::done, JsonpDeserializer.longDeserializer(), "done");
+        op.add(Builder::failed, JsonpDeserializer.longDeserializer(), "failed");
+        op.add(Builder::finalizing, JsonpDeserializer.longDeserializer(), "finalizing");
+        op.add(Builder::initializing, JsonpDeserializer.longDeserializer(), "initializing");
+        op.add(Builder::started, JsonpDeserializer.longDeserializer(), "started");
+        op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/ShardsStatsStage.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/ShardsStatsStage.java
index 4806d5adae..22033a7ddf 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/ShardsStatsStage.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/ShardsStatsStage.java
@@ -37,48 +37,47 @@
 
 @JsonpDeserializable
 public enum ShardsStatsStage implements JsonEnum {
-	/**
-	 * Number of shards in the snapshot that were successfully stored in the
-	 * repository.
-	 */
-	Done("DONE"),
+    /**
+     * Number of shards in the snapshot that were successfully stored in the
+     * repository.
+     */
+    Done("DONE"),
 
-	/**
-	 * Number of shards in the snapshot that were not successfully stored in the
-	 * repository.
-	 */
-	Failure("FAILURE"),
+    /**
+     * Number of shards in the snapshot that were not successfully stored in the
+     * repository.
+     */
+    Failure("FAILURE"),
 
-	/**
-	 * Number of shards in the snapshot that are in the finalizing stage of being
-	 * stored in the repository.
-	 */
-	Finalize("FINALIZE"),
+    /**
+     * Number of shards in the snapshot that are in the finalizing stage of being
+     * stored in the repository.
+     */
+    Finalize("FINALIZE"),
 
-	/**
-	 * Number of shards in the snapshot that are in the initializing stage of being
-	 * stored in the repository.
-	 */
-	Init("INIT"),
+    /**
+     * Number of shards in the snapshot that are in the initializing stage of being
+     * stored in the repository.
+     */
+    Init("INIT"),
 
-	/**
-	 * Number of shards in the snapshot that are in the started stage of being
-	 * stored in the repository.
-	 */
-	Started("STARTED"),
+    /**
+     * Number of shards in the snapshot that are in the started stage of being
+     * stored in the repository.
+     */
+    Started("STARTED"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	ShardsStatsStage(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    ShardsStatsStage(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<ShardsStatsStage> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			ShardsStatsStage.values());
+    public static final JsonEnum.Deserializer<ShardsStatsStage> _DESERIALIZER = new JsonEnum.Deserializer<>(ShardsStatsStage.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/ShardsStatsSummary.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/ShardsStatsSummary.java
index 7f6a388d30..827435ffdb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/ShardsStatsSummary.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/ShardsStatsSummary.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,179 +43,178 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: snapshot._types.ShardsStatsSummary
 
 @JsonpDeserializable
 public class ShardsStatsSummary implements JsonpSerializable {
-	private final ShardsStatsSummaryItem incremental;
+    private final ShardsStatsSummaryItem incremental;
 
-	private final ShardsStatsSummaryItem total;
+    private final ShardsStatsSummaryItem total;
 
-	private final long startTimeInMillis;
+    private final long startTimeInMillis;
 
-	private final long timeInMillis;
+    private final long timeInMillis;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private ShardsStatsSummary(Builder builder) {
+    private ShardsStatsSummary(Builder builder) {
 
-		this.incremental = ApiTypeHelper.requireNonNull(builder.incremental, this, "incremental");
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
-		this.startTimeInMillis = ApiTypeHelper.requireNonNull(builder.startTimeInMillis, this, "startTimeInMillis");
-		this.timeInMillis = ApiTypeHelper.requireNonNull(builder.timeInMillis, this, "timeInMillis");
+        this.incremental = ApiTypeHelper.requireNonNull(builder.incremental, this, "incremental");
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+        this.startTimeInMillis = ApiTypeHelper.requireNonNull(builder.startTimeInMillis, this, "startTimeInMillis");
+        this.timeInMillis = ApiTypeHelper.requireNonNull(builder.timeInMillis, this, "timeInMillis");
 
-	}
+    }
 
-	public static ShardsStatsSummary of(Function<Builder, ObjectBuilder<ShardsStatsSummary>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static ShardsStatsSummary of(Function<Builder, ObjectBuilder<ShardsStatsSummary>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code incremental}
-	 */
-	public final ShardsStatsSummaryItem incremental() {
-		return this.incremental;
-	}
-
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final ShardsStatsSummaryItem total() {
-		return this.total;
-	}
-
-	/**
-	 * Required - API name: {@code start_time_in_millis}
-	 */
-	public final long startTimeInMillis() {
-		return this.startTimeInMillis;
-	}
-
-	/**
-	 * Required - API name: {@code time_in_millis}
-	 */
-	public final long timeInMillis() {
-		return this.timeInMillis;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("incremental");
-		this.incremental.serialize(generator, mapper);
-
-		generator.writeKey("total");
-		this.total.serialize(generator, mapper);
-
-		generator.writeKey("start_time_in_millis");
-		generator.write(this.startTimeInMillis);
-
-		generator.writeKey("time_in_millis");
-		generator.write(this.timeInMillis);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ShardsStatsSummary}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardsStatsSummary> {
-		private ShardsStatsSummaryItem incremental;
-
-		private ShardsStatsSummaryItem total;
-
-		private Long startTimeInMillis;
-
-		private Long timeInMillis;
-
-		/**
-		 * Required - API name: {@code incremental}
-		 */
-		public final Builder incremental(ShardsStatsSummaryItem value) {
-			this.incremental = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code incremental}
-		 */
-		public final Builder incremental(
-				Function<ShardsStatsSummaryItem.Builder, ObjectBuilder<ShardsStatsSummaryItem>> fn) {
-			return this.incremental(fn.apply(new ShardsStatsSummaryItem.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(ShardsStatsSummaryItem value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(Function<ShardsStatsSummaryItem.Builder, ObjectBuilder<ShardsStatsSummaryItem>> fn) {
-			return this.total(fn.apply(new ShardsStatsSummaryItem.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code start_time_in_millis}
-		 */
-		public final Builder startTimeInMillis(long value) {
-			this.startTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code time_in_millis}
-		 */
-		public final Builder timeInMillis(long value) {
-			this.timeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ShardsStatsSummary}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardsStatsSummary build() {
-			_checkSingleUse();
-
-			return new ShardsStatsSummary(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ShardsStatsSummary}
-	 */
-	public static final JsonpDeserializer<ShardsStatsSummary> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ShardsStatsSummary::setupShardsStatsSummaryDeserializer);
-
-	protected static void setupShardsStatsSummaryDeserializer(ObjectDeserializer<ShardsStatsSummary.Builder> op) {
-
-		op.add(Builder::incremental, ShardsStatsSummaryItem._DESERIALIZER, "incremental");
-		op.add(Builder::total, ShardsStatsSummaryItem._DESERIALIZER, "total");
-		op.add(Builder::startTimeInMillis, JsonpDeserializer.longDeserializer(), "start_time_in_millis");
-		op.add(Builder::timeInMillis, JsonpDeserializer.longDeserializer(), "time_in_millis");
-
-	}
+    /**
+     * Required - API name: {@code incremental}
+     */
+    public final ShardsStatsSummaryItem incremental() {
+        return this.incremental;
+    }
+
+    /**
+     * Required - API name: {@code total}
+     */
+    public final ShardsStatsSummaryItem total() {
+        return this.total;
+    }
+
+    /**
+     * Required - API name: {@code start_time_in_millis}
+     */
+    public final long startTimeInMillis() {
+        return this.startTimeInMillis;
+    }
+
+    /**
+     * Required - API name: {@code time_in_millis}
+     */
+    public final long timeInMillis() {
+        return this.timeInMillis;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("incremental");
+        this.incremental.serialize(generator, mapper);
+
+        generator.writeKey("total");
+        this.total.serialize(generator, mapper);
+
+        generator.writeKey("start_time_in_millis");
+        generator.write(this.startTimeInMillis);
+
+        generator.writeKey("time_in_millis");
+        generator.write(this.timeInMillis);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ShardsStatsSummary}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardsStatsSummary> {
+        private ShardsStatsSummaryItem incremental;
+
+        private ShardsStatsSummaryItem total;
+
+        private Long startTimeInMillis;
+
+        private Long timeInMillis;
+
+        /**
+         * Required - API name: {@code incremental}
+         */
+        public final Builder incremental(ShardsStatsSummaryItem value) {
+            this.incremental = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code incremental}
+         */
+        public final Builder incremental(Function<ShardsStatsSummaryItem.Builder, ObjectBuilder<ShardsStatsSummaryItem>> fn) {
+            return this.incremental(fn.apply(new ShardsStatsSummaryItem.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(ShardsStatsSummaryItem value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(Function<ShardsStatsSummaryItem.Builder, ObjectBuilder<ShardsStatsSummaryItem>> fn) {
+            return this.total(fn.apply(new ShardsStatsSummaryItem.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code start_time_in_millis}
+         */
+        public final Builder startTimeInMillis(long value) {
+            this.startTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code time_in_millis}
+         */
+        public final Builder timeInMillis(long value) {
+            this.timeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ShardsStatsSummary}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardsStatsSummary build() {
+            _checkSingleUse();
+
+            return new ShardsStatsSummary(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ShardsStatsSummary}
+     */
+    public static final JsonpDeserializer<ShardsStatsSummary> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardsStatsSummary::setupShardsStatsSummaryDeserializer
+    );
+
+    protected static void setupShardsStatsSummaryDeserializer(ObjectDeserializer<ShardsStatsSummary.Builder> op) {
+
+        op.add(Builder::incremental, ShardsStatsSummaryItem._DESERIALIZER, "incremental");
+        op.add(Builder::total, ShardsStatsSummaryItem._DESERIALIZER, "total");
+        op.add(Builder::startTimeInMillis, JsonpDeserializer.longDeserializer(), "start_time_in_millis");
+        op.add(Builder::timeInMillis, JsonpDeserializer.longDeserializer(), "time_in_millis");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/ShardsStatsSummaryItem.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/ShardsStatsSummaryItem.java
index 01333645f9..a54739a113 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/ShardsStatsSummaryItem.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/ShardsStatsSummaryItem.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,117 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: snapshot._types.ShardsStatsSummaryItem
 
 @JsonpDeserializable
 public class ShardsStatsSummaryItem implements JsonpSerializable {
-	private final long fileCount;
-
-	private final long sizeInBytes;
-
-	// ---------------------------------------------------------------------------------------------
+    private final long fileCount;
 
-	private ShardsStatsSummaryItem(Builder builder) {
+    private final long sizeInBytes;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.fileCount = ApiTypeHelper.requireNonNull(builder.fileCount, this, "fileCount");
-		this.sizeInBytes = ApiTypeHelper.requireNonNull(builder.sizeInBytes, this, "sizeInBytes");
+    private ShardsStatsSummaryItem(Builder builder) {
 
-	}
+        this.fileCount = ApiTypeHelper.requireNonNull(builder.fileCount, this, "fileCount");
+        this.sizeInBytes = ApiTypeHelper.requireNonNull(builder.sizeInBytes, this, "sizeInBytes");
 
-	public static ShardsStatsSummaryItem of(Function<Builder, ObjectBuilder<ShardsStatsSummaryItem>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code file_count}
-	 */
-	public final long fileCount() {
-		return this.fileCount;
-	}
+    public static ShardsStatsSummaryItem of(Function<Builder, ObjectBuilder<ShardsStatsSummaryItem>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code size_in_bytes}
-	 */
-	public final long sizeInBytes() {
-		return this.sizeInBytes;
-	}
+    /**
+     * Required - API name: {@code file_count}
+     */
+    public final long fileCount() {
+        return this.fileCount;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code size_in_bytes}
+     */
+    public final long sizeInBytes() {
+        return this.sizeInBytes;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("file_count");
-		generator.write(this.fileCount);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("size_in_bytes");
-		generator.write(this.sizeInBytes);
+        generator.writeKey("file_count");
+        generator.write(this.fileCount);
 
-	}
+        generator.writeKey("size_in_bytes");
+        generator.write(this.sizeInBytes);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link ShardsStatsSummaryItem}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardsStatsSummaryItem> {
-		private Long fileCount;
+    /**
+     * Builder for {@link ShardsStatsSummaryItem}.
+     */
 
-		private Long sizeInBytes;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ShardsStatsSummaryItem> {
+        private Long fileCount;
 
-		/**
-		 * Required - API name: {@code file_count}
-		 */
-		public final Builder fileCount(long value) {
-			this.fileCount = value;
-			return this;
-		}
+        private Long sizeInBytes;
 
-		/**
-		 * Required - API name: {@code size_in_bytes}
-		 */
-		public final Builder sizeInBytes(long value) {
-			this.sizeInBytes = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code file_count}
+         */
+        public final Builder fileCount(long value) {
+            this.fileCount = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link ShardsStatsSummaryItem}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ShardsStatsSummaryItem build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code size_in_bytes}
+         */
+        public final Builder sizeInBytes(long value) {
+            this.sizeInBytes = value;
+            return this;
+        }
 
-			return new ShardsStatsSummaryItem(this);
-		}
-	}
+        /**
+         * Builds a {@link ShardsStatsSummaryItem}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ShardsStatsSummaryItem build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new ShardsStatsSummaryItem(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link ShardsStatsSummaryItem}
-	 */
-	public static final JsonpDeserializer<ShardsStatsSummaryItem> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, ShardsStatsSummaryItem::setupShardsStatsSummaryItemDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupShardsStatsSummaryItemDeserializer(
-			ObjectDeserializer<ShardsStatsSummaryItem.Builder> op) {
+    /**
+     * Json deserializer for {@link ShardsStatsSummaryItem}
+     */
+    public static final JsonpDeserializer<ShardsStatsSummaryItem> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ShardsStatsSummaryItem::setupShardsStatsSummaryItemDeserializer
+    );
 
-		op.add(Builder::fileCount, JsonpDeserializer.longDeserializer(), "file_count");
-		op.add(Builder::sizeInBytes, JsonpDeserializer.longDeserializer(), "size_in_bytes");
+    protected static void setupShardsStatsSummaryItemDeserializer(ObjectDeserializer<ShardsStatsSummaryItem.Builder> op) {
 
-	}
+        op.add(Builder::fileCount, JsonpDeserializer.longDeserializer(), "file_count");
+        op.add(Builder::sizeInBytes, JsonpDeserializer.longDeserializer(), "size_in_bytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotIndexStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotIndexStats.java
index 895edb404b..ccd9093c87 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotIndexStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotIndexStats.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,185 +44,183 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: snapshot._types.SnapshotIndexStats
 
 @JsonpDeserializable
 public class SnapshotIndexStats implements JsonpSerializable {
-	private final Map<String, SnapshotShardsStatus> shards;
-
-	private final ShardsStats shardsStats;
-
-	private final SnapshotStats stats;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SnapshotIndexStats(Builder builder) {
-
-		this.shards = ApiTypeHelper.unmodifiableRequired(builder.shards, this, "shards");
-		this.shardsStats = ApiTypeHelper.requireNonNull(builder.shardsStats, this, "shardsStats");
-		this.stats = ApiTypeHelper.requireNonNull(builder.stats, this, "stats");
-
-	}
-
-	public static SnapshotIndexStats of(Function<Builder, ObjectBuilder<SnapshotIndexStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code shards}
-	 */
-	public final Map<String, SnapshotShardsStatus> shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Required - API name: {@code shards_stats}
-	 */
-	public final ShardsStats shardsStats() {
-		return this.shardsStats;
-	}
-
-	/**
-	 * Required - API name: {@code stats}
-	 */
-	public final SnapshotStats stats() {
-		return this.stats;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.shards)) {
-			generator.writeKey("shards");
-			generator.writeStartObject();
-			for (Map.Entry<String, SnapshotShardsStatus> item0 : this.shards.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("shards_stats");
-		this.shardsStats.serialize(generator, mapper);
-
-		generator.writeKey("stats");
-		this.stats.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SnapshotIndexStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotIndexStats> {
-		private Map<String, SnapshotShardsStatus> shards;
-
-		private ShardsStats shardsStats;
-
-		private SnapshotStats stats;
-
-		/**
-		 * Required - API name: {@code shards}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>shards</code>.
-		 */
-		public final Builder shards(Map<String, SnapshotShardsStatus> map) {
-			this.shards = _mapPutAll(this.shards, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards}
-		 * <p>
-		 * Adds an entry to <code>shards</code>.
-		 */
-		public final Builder shards(String key, SnapshotShardsStatus value) {
-			this.shards = _mapPut(this.shards, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards}
-		 * <p>
-		 * Adds an entry to <code>shards</code> using a builder lambda.
-		 */
-		public final Builder shards(String key,
-				Function<SnapshotShardsStatus.Builder, ObjectBuilder<SnapshotShardsStatus>> fn) {
-			return shards(key, fn.apply(new SnapshotShardsStatus.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code shards_stats}
-		 */
-		public final Builder shardsStats(ShardsStats value) {
-			this.shardsStats = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards_stats}
-		 */
-		public final Builder shardsStats(Function<ShardsStats.Builder, ObjectBuilder<ShardsStats>> fn) {
-			return this.shardsStats(fn.apply(new ShardsStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code stats}
-		 */
-		public final Builder stats(SnapshotStats value) {
-			this.stats = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code stats}
-		 */
-		public final Builder stats(Function<SnapshotStats.Builder, ObjectBuilder<SnapshotStats>> fn) {
-			return this.stats(fn.apply(new SnapshotStats.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link SnapshotIndexStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SnapshotIndexStats build() {
-			_checkSingleUse();
-
-			return new SnapshotIndexStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SnapshotIndexStats}
-	 */
-	public static final JsonpDeserializer<SnapshotIndexStats> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SnapshotIndexStats::setupSnapshotIndexStatsDeserializer);
-
-	protected static void setupSnapshotIndexStatsDeserializer(ObjectDeserializer<SnapshotIndexStats.Builder> op) {
-
-		op.add(Builder::shards, JsonpDeserializer.stringMapDeserializer(SnapshotShardsStatus._DESERIALIZER), "shards");
-		op.add(Builder::shardsStats, ShardsStats._DESERIALIZER, "shards_stats");
-		op.add(Builder::stats, SnapshotStats._DESERIALIZER, "stats");
-
-	}
+    private final Map<String, SnapshotShardsStatus> shards;
+
+    private final ShardsStats shardsStats;
+
+    private final SnapshotStats stats;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SnapshotIndexStats(Builder builder) {
+
+        this.shards = ApiTypeHelper.unmodifiableRequired(builder.shards, this, "shards");
+        this.shardsStats = ApiTypeHelper.requireNonNull(builder.shardsStats, this, "shardsStats");
+        this.stats = ApiTypeHelper.requireNonNull(builder.stats, this, "stats");
+
+    }
+
+    public static SnapshotIndexStats of(Function<Builder, ObjectBuilder<SnapshotIndexStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code shards}
+     */
+    public final Map<String, SnapshotShardsStatus> shards() {
+        return this.shards;
+    }
+
+    /**
+     * Required - API name: {@code shards_stats}
+     */
+    public final ShardsStats shardsStats() {
+        return this.shardsStats;
+    }
+
+    /**
+     * Required - API name: {@code stats}
+     */
+    public final SnapshotStats stats() {
+        return this.stats;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.shards)) {
+            generator.writeKey("shards");
+            generator.writeStartObject();
+            for (Map.Entry<String, SnapshotShardsStatus> item0 : this.shards.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("shards_stats");
+        this.shardsStats.serialize(generator, mapper);
+
+        generator.writeKey("stats");
+        this.stats.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SnapshotIndexStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotIndexStats> {
+        private Map<String, SnapshotShardsStatus> shards;
+
+        private ShardsStats shardsStats;
+
+        private SnapshotStats stats;
+
+        /**
+         * Required - API name: {@code shards}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>shards</code>.
+         */
+        public final Builder shards(Map<String, SnapshotShardsStatus> map) {
+            this.shards = _mapPutAll(this.shards, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards}
+         * <p>
+         * Adds an entry to <code>shards</code>.
+         */
+        public final Builder shards(String key, SnapshotShardsStatus value) {
+            this.shards = _mapPut(this.shards, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards}
+         * <p>
+         * Adds an entry to <code>shards</code> using a builder lambda.
+         */
+        public final Builder shards(String key, Function<SnapshotShardsStatus.Builder, ObjectBuilder<SnapshotShardsStatus>> fn) {
+            return shards(key, fn.apply(new SnapshotShardsStatus.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code shards_stats}
+         */
+        public final Builder shardsStats(ShardsStats value) {
+            this.shardsStats = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards_stats}
+         */
+        public final Builder shardsStats(Function<ShardsStats.Builder, ObjectBuilder<ShardsStats>> fn) {
+            return this.shardsStats(fn.apply(new ShardsStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code stats}
+         */
+        public final Builder stats(SnapshotStats value) {
+            this.stats = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code stats}
+         */
+        public final Builder stats(Function<SnapshotStats.Builder, ObjectBuilder<SnapshotStats>> fn) {
+            return this.stats(fn.apply(new SnapshotStats.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link SnapshotIndexStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SnapshotIndexStats build() {
+            _checkSingleUse();
+
+            return new SnapshotIndexStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SnapshotIndexStats}
+     */
+    public static final JsonpDeserializer<SnapshotIndexStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SnapshotIndexStats::setupSnapshotIndexStatsDeserializer
+    );
+
+    protected static void setupSnapshotIndexStatsDeserializer(ObjectDeserializer<SnapshotIndexStats.Builder> op) {
+
+        op.add(Builder::shards, JsonpDeserializer.stringMapDeserializer(SnapshotShardsStatus._DESERIALIZER), "shards");
+        op.add(Builder::shardsStats, ShardsStats._DESERIALIZER, "shards_stats");
+        op.add(Builder::stats, SnapshotStats._DESERIALIZER, "stats");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotInfo.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotInfo.java
index cdb913fe0d..fcb0ed53a6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotInfo.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotInfo.java
@@ -32,8 +32,11 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
-import org.opensearch.client.opensearch._types.ShardStatistics;
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -41,824 +44,818 @@
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ShardStatistics;
+import org.opensearch.client.opensearch._types.Time;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: snapshot._types.SnapshotInfo
 
-
 @JsonpDeserializable
 public class SnapshotInfo implements JsonpSerializable {
-	private final List<String> dataStreams;
+    private final List<String> dataStreams;
 
-	@Nullable
-	private final Time duration;
+    @Nullable
+    private final Time duration;
 
-	@Nullable
-	private final String durationInMillis;
+    @Nullable
+    private final String durationInMillis;
 
-	@Nullable
-	private final Time endTime;
+    @Nullable
+    private final Time endTime;
 
-	@Nullable
-	private final String endTimeInMillis;
+    @Nullable
+    private final String endTimeInMillis;
 
-	private final List<SnapshotShardFailure> failures;
+    private final List<SnapshotShardFailure> failures;
 
-	@Nullable
-	private final Boolean includeGlobalState;
+    @Nullable
+    private final Boolean includeGlobalState;
 
-	private final List<String> indices;
+    private final List<String> indices;
 
-	private final Map<String, IndexDetails> indexDetails;
+    private final Map<String, IndexDetails> indexDetails;
 
-	private final Map<String, JsonData> metadata;
-
-	@Nullable
-	private final String reason;
-
-	@Nullable
-	private final String repository;
-
-	private final String snapshot;
-
-	@Nullable
-	private final ShardStatistics shards;
-
-	@Nullable
-	private final Time startTime;
-
-	@Nullable
-	private final String startTimeInMillis;
-
-	@Nullable
-	private final String state;
-
-	private final String uuid;
-
-	@Nullable
-	private final String version;
-
-	@Nullable
-	private final Long versionId;
-
-	private final List<InfoFeatureState> featureStates;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SnapshotInfo(Builder builder) {
-
-		this.dataStreams = ApiTypeHelper.unmodifiableRequired(builder.dataStreams, this, "dataStreams");
-		this.duration = builder.duration;
-		this.durationInMillis = builder.durationInMillis;
-		this.endTime = builder.endTime;
-		this.endTimeInMillis = builder.endTimeInMillis;
-		this.failures = ApiTypeHelper.unmodifiable(builder.failures);
-		this.includeGlobalState = builder.includeGlobalState;
-		this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
-		this.indexDetails = ApiTypeHelper.unmodifiable(builder.indexDetails);
-		this.metadata = ApiTypeHelper.unmodifiable(builder.metadata);
-		this.reason = builder.reason;
-		this.repository = builder.repository;
-		this.snapshot = ApiTypeHelper.requireNonNull(builder.snapshot, this, "snapshot");
-		this.shards = builder.shards;
-		this.startTime = builder.startTime;
-		this.startTimeInMillis = builder.startTimeInMillis;
-		this.state = builder.state;
-		this.uuid = ApiTypeHelper.requireNonNull(builder.uuid, this, "uuid");
-		this.version = builder.version;
-		this.versionId = builder.versionId;
-		this.featureStates = ApiTypeHelper.unmodifiable(builder.featureStates);
-
-	}
-
-	public static SnapshotInfo of(Function<Builder, ObjectBuilder<SnapshotInfo>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code data_streams}
-	 */
-	public final List<String> dataStreams() {
-		return this.dataStreams;
-	}
-
-	/**
-	 * API name: {@code duration}
-	 */
-	@Nullable
-	public final Time duration() {
-		return this.duration;
-	}
-
-	/**
-	 * API name: {@code duration_in_millis}
-	 */
-	@Nullable
-	public final String durationInMillis() {
-		return this.durationInMillis;
-	}
-
-	/**
-	 * API name: {@code end_time}
-	 */
-	@Nullable
-	public final Time endTime() {
-		return this.endTime;
-	}
-
-	/**
-	 * API name: {@code end_time_in_millis}
-	 */
-	@Nullable
-	public final String endTimeInMillis() {
-		return this.endTimeInMillis;
-	}
-
-	/**
-	 * API name: {@code failures}
-	 */
-	public final List<SnapshotShardFailure> failures() {
-		return this.failures;
-	}
-
-	/**
-	 * API name: {@code include_global_state}
-	 */
-	@Nullable
-	public final Boolean includeGlobalState() {
-		return this.includeGlobalState;
-	}
-
-	/**
-	 * Required - API name: {@code indices}
-	 */
-	public final List<String> indices() {
-		return this.indices;
-	}
-
-	/**
-	 * API name: {@code index_details}
-	 */
-	public final Map<String, IndexDetails> indexDetails() {
-		return this.indexDetails;
-	}
-
-	/**
-	 * API name: {@code metadata}
-	 */
-	public final Map<String, JsonData> metadata() {
-		return this.metadata;
-	}
-
-	/**
-	 * API name: {@code reason}
-	 */
-	@Nullable
-	public final String reason() {
-		return this.reason;
-	}
-
-	/**
-	 * API name: {@code repository}
-	 */
-	@Nullable
-	public final String repository() {
-		return this.repository;
-	}
-
-	/**
-	 * Required - API name: {@code snapshot}
-	 */
-	public final String snapshot() {
-		return this.snapshot;
-	}
-
-	/**
-	 * API name: {@code shards}
-	 */
-	@Nullable
-	public final ShardStatistics shards() {
-		return this.shards;
-	}
-
-	/**
-	 * API name: {@code start_time}
-	 */
-	@Nullable
-	public final Time startTime() {
-		return this.startTime;
-	}
-
-	/**
-	 * API name: {@code start_time_in_millis}
-	 */
-	@Nullable
-	public final String startTimeInMillis() {
-		return this.startTimeInMillis;
-	}
-
-	/**
-	 * API name: {@code state}
-	 */
-	@Nullable
-	public final String state() {
-		return this.state;
-	}
-
-	/**
-	 * Required - API name: {@code uuid}
-	 */
-	public final String uuid() {
-		return this.uuid;
-	}
-
-	/**
-	 * API name: {@code version}
-	 */
-	@Nullable
-	public final String version() {
-		return this.version;
-	}
-
-	/**
-	 * API name: {@code version_id}
-	 */
-	@Nullable
-	public final Long versionId() {
-		return this.versionId;
-	}
-
-	/**
-	 * API name: {@code feature_states}
-	 */
-	public final List<InfoFeatureState> featureStates() {
-		return this.featureStates;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.dataStreams)) {
-			generator.writeKey("data_streams");
-			generator.writeStartArray();
-			for (String item0 : this.dataStreams) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.duration != null) {
-			generator.writeKey("duration");
-			this.duration.serialize(generator, mapper);
-
-		}
-		if (this.durationInMillis != null) {
-			generator.writeKey("duration_in_millis");
-			generator.write(this.durationInMillis);
-
-		}
-		if (this.endTime != null) {
-			generator.writeKey("end_time");
-			this.endTime.serialize(generator, mapper);
-
-		}
-		if (this.endTimeInMillis != null) {
-			generator.writeKey("end_time_in_millis");
-			generator.write(this.endTimeInMillis);
-
-		}
-		if (ApiTypeHelper.isDefined(this.failures)) {
-			generator.writeKey("failures");
-			generator.writeStartArray();
-			for (SnapshotShardFailure item0 : this.failures) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.includeGlobalState != null) {
-			generator.writeKey("include_global_state");
-			generator.write(this.includeGlobalState);
-
-		}
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartArray();
-			for (String item0 : this.indices) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.indexDetails)) {
-			generator.writeKey("index_details");
-			generator.writeStartObject();
-			for (Map.Entry<String, IndexDetails> item0 : this.indexDetails.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.metadata)) {
-			generator.writeKey("metadata");
-			generator.writeStartObject();
-			for (Map.Entry<String, JsonData> item0 : this.metadata.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.reason != null) {
-			generator.writeKey("reason");
-			generator.write(this.reason);
-
-		}
-		if (this.repository != null) {
-			generator.writeKey("repository");
-			generator.write(this.repository);
-
-		}
-		generator.writeKey("snapshot");
-		generator.write(this.snapshot);
-
-		if (this.shards != null) {
-			generator.writeKey("shards");
-			this.shards.serialize(generator, mapper);
+    private final Map<String, JsonData> metadata;
+
+    @Nullable
+    private final String reason;
+
+    @Nullable
+    private final String repository;
+
+    private final String snapshot;
+
+    @Nullable
+    private final ShardStatistics shards;
+
+    @Nullable
+    private final Time startTime;
+
+    @Nullable
+    private final String startTimeInMillis;
+
+    @Nullable
+    private final String state;
+
+    private final String uuid;
+
+    @Nullable
+    private final String version;
+
+    @Nullable
+    private final Long versionId;
+
+    private final List<InfoFeatureState> featureStates;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SnapshotInfo(Builder builder) {
+
+        this.dataStreams = ApiTypeHelper.unmodifiableRequired(builder.dataStreams, this, "dataStreams");
+        this.duration = builder.duration;
+        this.durationInMillis = builder.durationInMillis;
+        this.endTime = builder.endTime;
+        this.endTimeInMillis = builder.endTimeInMillis;
+        this.failures = ApiTypeHelper.unmodifiable(builder.failures);
+        this.includeGlobalState = builder.includeGlobalState;
+        this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
+        this.indexDetails = ApiTypeHelper.unmodifiable(builder.indexDetails);
+        this.metadata = ApiTypeHelper.unmodifiable(builder.metadata);
+        this.reason = builder.reason;
+        this.repository = builder.repository;
+        this.snapshot = ApiTypeHelper.requireNonNull(builder.snapshot, this, "snapshot");
+        this.shards = builder.shards;
+        this.startTime = builder.startTime;
+        this.startTimeInMillis = builder.startTimeInMillis;
+        this.state = builder.state;
+        this.uuid = ApiTypeHelper.requireNonNull(builder.uuid, this, "uuid");
+        this.version = builder.version;
+        this.versionId = builder.versionId;
+        this.featureStates = ApiTypeHelper.unmodifiable(builder.featureStates);
+
+    }
+
+    public static SnapshotInfo of(Function<Builder, ObjectBuilder<SnapshotInfo>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code data_streams}
+     */
+    public final List<String> dataStreams() {
+        return this.dataStreams;
+    }
+
+    /**
+     * API name: {@code duration}
+     */
+    @Nullable
+    public final Time duration() {
+        return this.duration;
+    }
+
+    /**
+     * API name: {@code duration_in_millis}
+     */
+    @Nullable
+    public final String durationInMillis() {
+        return this.durationInMillis;
+    }
+
+    /**
+     * API name: {@code end_time}
+     */
+    @Nullable
+    public final Time endTime() {
+        return this.endTime;
+    }
+
+    /**
+     * API name: {@code end_time_in_millis}
+     */
+    @Nullable
+    public final String endTimeInMillis() {
+        return this.endTimeInMillis;
+    }
+
+    /**
+     * API name: {@code failures}
+     */
+    public final List<SnapshotShardFailure> failures() {
+        return this.failures;
+    }
+
+    /**
+     * API name: {@code include_global_state}
+     */
+    @Nullable
+    public final Boolean includeGlobalState() {
+        return this.includeGlobalState;
+    }
+
+    /**
+     * Required - API name: {@code indices}
+     */
+    public final List<String> indices() {
+        return this.indices;
+    }
+
+    /**
+     * API name: {@code index_details}
+     */
+    public final Map<String, IndexDetails> indexDetails() {
+        return this.indexDetails;
+    }
+
+    /**
+     * API name: {@code metadata}
+     */
+    public final Map<String, JsonData> metadata() {
+        return this.metadata;
+    }
+
+    /**
+     * API name: {@code reason}
+     */
+    @Nullable
+    public final String reason() {
+        return this.reason;
+    }
+
+    /**
+     * API name: {@code repository}
+     */
+    @Nullable
+    public final String repository() {
+        return this.repository;
+    }
+
+    /**
+     * Required - API name: {@code snapshot}
+     */
+    public final String snapshot() {
+        return this.snapshot;
+    }
+
+    /**
+     * API name: {@code shards}
+     */
+    @Nullable
+    public final ShardStatistics shards() {
+        return this.shards;
+    }
+
+    /**
+     * API name: {@code start_time}
+     */
+    @Nullable
+    public final Time startTime() {
+        return this.startTime;
+    }
+
+    /**
+     * API name: {@code start_time_in_millis}
+     */
+    @Nullable
+    public final String startTimeInMillis() {
+        return this.startTimeInMillis;
+    }
+
+    /**
+     * API name: {@code state}
+     */
+    @Nullable
+    public final String state() {
+        return this.state;
+    }
+
+    /**
+     * Required - API name: {@code uuid}
+     */
+    public final String uuid() {
+        return this.uuid;
+    }
+
+    /**
+     * API name: {@code version}
+     */
+    @Nullable
+    public final String version() {
+        return this.version;
+    }
+
+    /**
+     * API name: {@code version_id}
+     */
+    @Nullable
+    public final Long versionId() {
+        return this.versionId;
+    }
+
+    /**
+     * API name: {@code feature_states}
+     */
+    public final List<InfoFeatureState> featureStates() {
+        return this.featureStates;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.dataStreams)) {
+            generator.writeKey("data_streams");
+            generator.writeStartArray();
+            for (String item0 : this.dataStreams) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.duration != null) {
+            generator.writeKey("duration");
+            this.duration.serialize(generator, mapper);
+
+        }
+        if (this.durationInMillis != null) {
+            generator.writeKey("duration_in_millis");
+            generator.write(this.durationInMillis);
+
+        }
+        if (this.endTime != null) {
+            generator.writeKey("end_time");
+            this.endTime.serialize(generator, mapper);
+
+        }
+        if (this.endTimeInMillis != null) {
+            generator.writeKey("end_time_in_millis");
+            generator.write(this.endTimeInMillis);
+
+        }
+        if (ApiTypeHelper.isDefined(this.failures)) {
+            generator.writeKey("failures");
+            generator.writeStartArray();
+            for (SnapshotShardFailure item0 : this.failures) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.includeGlobalState != null) {
+            generator.writeKey("include_global_state");
+            generator.write(this.includeGlobalState);
+
+        }
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartArray();
+            for (String item0 : this.indices) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.indexDetails)) {
+            generator.writeKey("index_details");
+            generator.writeStartObject();
+            for (Map.Entry<String, IndexDetails> item0 : this.indexDetails.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.metadata)) {
+            generator.writeKey("metadata");
+            generator.writeStartObject();
+            for (Map.Entry<String, JsonData> item0 : this.metadata.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.reason != null) {
+            generator.writeKey("reason");
+            generator.write(this.reason);
+
+        }
+        if (this.repository != null) {
+            generator.writeKey("repository");
+            generator.write(this.repository);
+
+        }
+        generator.writeKey("snapshot");
+        generator.write(this.snapshot);
+
+        if (this.shards != null) {
+            generator.writeKey("shards");
+            this.shards.serialize(generator, mapper);
 
-		}
-		if (this.startTime != null) {
-			generator.writeKey("start_time");
-			this.startTime.serialize(generator, mapper);
+        }
+        if (this.startTime != null) {
+            generator.writeKey("start_time");
+            this.startTime.serialize(generator, mapper);
 
-		}
-		if (this.startTimeInMillis != null) {
-			generator.writeKey("start_time_in_millis");
-			generator.write(this.startTimeInMillis);
+        }
+        if (this.startTimeInMillis != null) {
+            generator.writeKey("start_time_in_millis");
+            generator.write(this.startTimeInMillis);
 
-		}
-		if (this.state != null) {
-			generator.writeKey("state");
-			generator.write(this.state);
+        }
+        if (this.state != null) {
+            generator.writeKey("state");
+            generator.write(this.state);
 
-		}
-		generator.writeKey("uuid");
-		generator.write(this.uuid);
+        }
+        generator.writeKey("uuid");
+        generator.write(this.uuid);
 
-		if (this.version != null) {
-			generator.writeKey("version");
-			generator.write(this.version);
+        if (this.version != null) {
+            generator.writeKey("version");
+            generator.write(this.version);
 
-		}
-		if (this.versionId != null) {
-			generator.writeKey("version_id");
-			generator.write(this.versionId);
+        }
+        if (this.versionId != null) {
+            generator.writeKey("version_id");
+            generator.write(this.versionId);
 
-		}
-		if (ApiTypeHelper.isDefined(this.featureStates)) {
-			generator.writeKey("feature_states");
-			generator.writeStartArray();
-			for (InfoFeatureState item0 : this.featureStates) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SnapshotInfo}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotInfo> {
-		private List<String> dataStreams;
-
-		@Nullable
-		private Time duration;
-
-		@Nullable
-		private String durationInMillis;
-
-		@Nullable
-		private Time endTime;
-
-		@Nullable
-		private String endTimeInMillis;
-
-		@Nullable
-		private List<SnapshotShardFailure> failures;
-
-		@Nullable
-		private Boolean includeGlobalState;
-
-		private List<String> indices;
-
-		@Nullable
-		private Map<String, IndexDetails> indexDetails;
-
-		@Nullable
-		private Map<String, JsonData> metadata;
-
-		@Nullable
-		private String reason;
-
-		@Nullable
-		private String repository;
-
-		private String snapshot;
-
-		@Nullable
-		private ShardStatistics shards;
-
-		@Nullable
-		private Time startTime;
-
-		@Nullable
-		private String startTimeInMillis;
-
-		@Nullable
-		private String state;
-
-		private String uuid;
-
-		@Nullable
-		private String version;
-
-		@Nullable
-		private Long versionId;
-
-		@Nullable
-		private List<InfoFeatureState> featureStates;
-
-		/**
-		 * Required - API name: {@code data_streams}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>dataStreams</code>.
-		 */
-		public final Builder dataStreams(List<String> list) {
-			this.dataStreams = _listAddAll(this.dataStreams, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code data_streams}
-		 * <p>
-		 * Adds one or more values to <code>dataStreams</code>.
-		 */
-		public final Builder dataStreams(String value, String... values) {
-			this.dataStreams = _listAdd(this.dataStreams, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code duration}
-		 */
-		public final Builder duration(@Nullable Time value) {
-			this.duration = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code duration}
-		 */
-		public final Builder duration(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.duration(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code duration_in_millis}
-		 */
-		public final Builder durationInMillis(@Nullable String value) {
-			this.durationInMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code end_time}
-		 */
-		public final Builder endTime(@Nullable Time value) {
-			this.endTime = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code end_time}
-		 */
-		public final Builder endTime(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.endTime(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code end_time_in_millis}
-		 */
-		public final Builder endTimeInMillis(@Nullable String value) {
-			this.endTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>failures</code>.
-		 */
-		public final Builder failures(List<SnapshotShardFailure> list) {
-			this.failures = _listAddAll(this.failures, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds one or more values to <code>failures</code>.
-		 */
-		public final Builder failures(SnapshotShardFailure value, SnapshotShardFailure... values) {
-			this.failures = _listAdd(this.failures, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds a value to <code>failures</code> using a builder lambda.
-		 */
-		public final Builder failures(Function<SnapshotShardFailure.Builder, ObjectBuilder<SnapshotShardFailure>> fn) {
-			return failures(fn.apply(new SnapshotShardFailure.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code include_global_state}
-		 */
-		public final Builder includeGlobalState(@Nullable Boolean value) {
-			this.includeGlobalState = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indices</code>.
-		 */
-		public final Builder indices(List<String> list) {
-			this.indices = _listAddAll(this.indices, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds one or more values to <code>indices</code>.
-		 */
-		public final Builder indices(String value, String... values) {
-			this.indices = _listAdd(this.indices, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_details}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>indexDetails</code>.
-		 */
-		public final Builder indexDetails(Map<String, IndexDetails> map) {
-			this.indexDetails = _mapPutAll(this.indexDetails, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_details}
-		 * <p>
-		 * Adds an entry to <code>indexDetails</code>.
-		 */
-		public final Builder indexDetails(String key, IndexDetails value) {
-			this.indexDetails = _mapPut(this.indexDetails, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code index_details}
-		 * <p>
-		 * Adds an entry to <code>indexDetails</code> using a builder lambda.
-		 */
-		public final Builder indexDetails(String key, Function<IndexDetails.Builder, ObjectBuilder<IndexDetails>> fn) {
-			return indexDetails(key, fn.apply(new IndexDetails.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code metadata}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>metadata</code>.
-		 */
-		public final Builder metadata(Map<String, JsonData> map) {
-			this.metadata = _mapPutAll(this.metadata, map);
-			return this;
-		}
-
-		/**
-		 * API name: {@code metadata}
-		 * <p>
-		 * Adds an entry to <code>metadata</code>.
-		 */
-		public final Builder metadata(String key, JsonData value) {
-			this.metadata = _mapPut(this.metadata, key, value);
-			return this;
-		}
-
-		/**
-		 * API name: {@code reason}
-		 */
-		public final Builder reason(@Nullable String value) {
-			this.reason = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code repository}
-		 */
-		public final Builder repository(@Nullable String value) {
-			this.repository = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code snapshot}
-		 */
-		public final Builder snapshot(String value) {
-			this.snapshot = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code shards}
-		 */
-		public final Builder shards(@Nullable ShardStatistics value) {
-			this.shards = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code shards}
-		 */
-		public final Builder shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
-			return this.shards(fn.apply(new ShardStatistics.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code start_time}
-		 */
-		public final Builder startTime(@Nullable Time value) {
-			this.startTime = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code start_time}
-		 */
-		public final Builder startTime(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.startTime(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code start_time_in_millis}
-		 */
-		public final Builder startTimeInMillis(@Nullable String value) {
-			this.startTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code state}
-		 */
-		public final Builder state(@Nullable String value) {
-			this.state = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code uuid}
-		 */
-		public final Builder uuid(String value) {
-			this.uuid = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code version}
-		 */
-		public final Builder version(@Nullable String value) {
-			this.version = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code version_id}
-		 */
-		public final Builder versionId(@Nullable Long value) {
-			this.versionId = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code feature_states}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>featureStates</code>.
-		 */
-		public final Builder featureStates(List<InfoFeatureState> list) {
-			this.featureStates = _listAddAll(this.featureStates, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code feature_states}
-		 * <p>
-		 * Adds one or more values to <code>featureStates</code>.
-		 */
-		public final Builder featureStates(InfoFeatureState value, InfoFeatureState... values) {
-			this.featureStates = _listAdd(this.featureStates, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code feature_states}
-		 * <p>
-		 * Adds a value to <code>featureStates</code> using a builder lambda.
-		 */
-		public final Builder featureStates(Function<InfoFeatureState.Builder, ObjectBuilder<InfoFeatureState>> fn) {
-			return featureStates(fn.apply(new InfoFeatureState.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link SnapshotInfo}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SnapshotInfo build() {
-			_checkSingleUse();
-
-			return new SnapshotInfo(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SnapshotInfo}
-	 */
-	public static final JsonpDeserializer<SnapshotInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SnapshotInfo::setupSnapshotInfoDeserializer);
-
-	protected static void setupSnapshotInfoDeserializer(ObjectDeserializer<SnapshotInfo.Builder> op) {
-
-		op.add(Builder::dataStreams, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"data_streams");
-		op.add(Builder::duration, Time._DESERIALIZER, "duration");
-		op.add(Builder::durationInMillis, JsonpDeserializer.stringDeserializer(), "duration_in_millis");
-		op.add(Builder::endTime, Time._DESERIALIZER, "end_time");
-		op.add(Builder::endTimeInMillis, JsonpDeserializer.stringDeserializer(), "end_time_in_millis");
-		op.add(Builder::failures, JsonpDeserializer.arrayDeserializer(SnapshotShardFailure._DESERIALIZER), "failures");
-		op.add(Builder::includeGlobalState, JsonpDeserializer.booleanDeserializer(), "include_global_state");
-		op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"indices");
-		op.add(Builder::indexDetails, JsonpDeserializer.stringMapDeserializer(IndexDetails._DESERIALIZER),
-				"index_details");
-		op.add(Builder::metadata, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "metadata");
-		op.add(Builder::reason, JsonpDeserializer.stringDeserializer(), "reason");
-		op.add(Builder::repository, JsonpDeserializer.stringDeserializer(), "repository");
-		op.add(Builder::snapshot, JsonpDeserializer.stringDeserializer(), "snapshot");
-		op.add(Builder::shards, ShardStatistics._DESERIALIZER, "shards");
-		op.add(Builder::startTime, Time._DESERIALIZER, "start_time");
-		op.add(Builder::startTimeInMillis, JsonpDeserializer.stringDeserializer(), "start_time_in_millis");
-		op.add(Builder::state, JsonpDeserializer.stringDeserializer(), "state");
-		op.add(Builder::uuid, JsonpDeserializer.stringDeserializer(), "uuid");
-		op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
-		op.add(Builder::versionId, JsonpDeserializer.longDeserializer(), "version_id");
-		op.add(Builder::featureStates, JsonpDeserializer.arrayDeserializer(InfoFeatureState._DESERIALIZER),
-				"feature_states");
-
-	}
+        }
+        if (ApiTypeHelper.isDefined(this.featureStates)) {
+            generator.writeKey("feature_states");
+            generator.writeStartArray();
+            for (InfoFeatureState item0 : this.featureStates) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SnapshotInfo}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotInfo> {
+        private List<String> dataStreams;
+
+        @Nullable
+        private Time duration;
+
+        @Nullable
+        private String durationInMillis;
+
+        @Nullable
+        private Time endTime;
+
+        @Nullable
+        private String endTimeInMillis;
+
+        @Nullable
+        private List<SnapshotShardFailure> failures;
+
+        @Nullable
+        private Boolean includeGlobalState;
+
+        private List<String> indices;
+
+        @Nullable
+        private Map<String, IndexDetails> indexDetails;
+
+        @Nullable
+        private Map<String, JsonData> metadata;
+
+        @Nullable
+        private String reason;
+
+        @Nullable
+        private String repository;
+
+        private String snapshot;
+
+        @Nullable
+        private ShardStatistics shards;
+
+        @Nullable
+        private Time startTime;
+
+        @Nullable
+        private String startTimeInMillis;
+
+        @Nullable
+        private String state;
+
+        private String uuid;
+
+        @Nullable
+        private String version;
+
+        @Nullable
+        private Long versionId;
+
+        @Nullable
+        private List<InfoFeatureState> featureStates;
+
+        /**
+         * Required - API name: {@code data_streams}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>dataStreams</code>.
+         */
+        public final Builder dataStreams(List<String> list) {
+            this.dataStreams = _listAddAll(this.dataStreams, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code data_streams}
+         * <p>
+         * Adds one or more values to <code>dataStreams</code>.
+         */
+        public final Builder dataStreams(String value, String... values) {
+            this.dataStreams = _listAdd(this.dataStreams, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code duration}
+         */
+        public final Builder duration(@Nullable Time value) {
+            this.duration = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code duration}
+         */
+        public final Builder duration(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.duration(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code duration_in_millis}
+         */
+        public final Builder durationInMillis(@Nullable String value) {
+            this.durationInMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code end_time}
+         */
+        public final Builder endTime(@Nullable Time value) {
+            this.endTime = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code end_time}
+         */
+        public final Builder endTime(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.endTime(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code end_time_in_millis}
+         */
+        public final Builder endTimeInMillis(@Nullable String value) {
+            this.endTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>failures</code>.
+         */
+        public final Builder failures(List<SnapshotShardFailure> list) {
+            this.failures = _listAddAll(this.failures, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds one or more values to <code>failures</code>.
+         */
+        public final Builder failures(SnapshotShardFailure value, SnapshotShardFailure... values) {
+            this.failures = _listAdd(this.failures, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds a value to <code>failures</code> using a builder lambda.
+         */
+        public final Builder failures(Function<SnapshotShardFailure.Builder, ObjectBuilder<SnapshotShardFailure>> fn) {
+            return failures(fn.apply(new SnapshotShardFailure.Builder()).build());
+        }
+
+        /**
+         * API name: {@code include_global_state}
+         */
+        public final Builder includeGlobalState(@Nullable Boolean value) {
+            this.includeGlobalState = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indices</code>.
+         */
+        public final Builder indices(List<String> list) {
+            this.indices = _listAddAll(this.indices, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds one or more values to <code>indices</code>.
+         */
+        public final Builder indices(String value, String... values) {
+            this.indices = _listAdd(this.indices, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code index_details}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>indexDetails</code>.
+         */
+        public final Builder indexDetails(Map<String, IndexDetails> map) {
+            this.indexDetails = _mapPutAll(this.indexDetails, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code index_details}
+         * <p>
+         * Adds an entry to <code>indexDetails</code>.
+         */
+        public final Builder indexDetails(String key, IndexDetails value) {
+            this.indexDetails = _mapPut(this.indexDetails, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code index_details}
+         * <p>
+         * Adds an entry to <code>indexDetails</code> using a builder lambda.
+         */
+        public final Builder indexDetails(String key, Function<IndexDetails.Builder, ObjectBuilder<IndexDetails>> fn) {
+            return indexDetails(key, fn.apply(new IndexDetails.Builder()).build());
+        }
+
+        /**
+         * API name: {@code metadata}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>metadata</code>.
+         */
+        public final Builder metadata(Map<String, JsonData> map) {
+            this.metadata = _mapPutAll(this.metadata, map);
+            return this;
+        }
+
+        /**
+         * API name: {@code metadata}
+         * <p>
+         * Adds an entry to <code>metadata</code>.
+         */
+        public final Builder metadata(String key, JsonData value) {
+            this.metadata = _mapPut(this.metadata, key, value);
+            return this;
+        }
+
+        /**
+         * API name: {@code reason}
+         */
+        public final Builder reason(@Nullable String value) {
+            this.reason = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code repository}
+         */
+        public final Builder repository(@Nullable String value) {
+            this.repository = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code snapshot}
+         */
+        public final Builder snapshot(String value) {
+            this.snapshot = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code shards}
+         */
+        public final Builder shards(@Nullable ShardStatistics value) {
+            this.shards = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code shards}
+         */
+        public final Builder shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
+            return this.shards(fn.apply(new ShardStatistics.Builder()).build());
+        }
+
+        /**
+         * API name: {@code start_time}
+         */
+        public final Builder startTime(@Nullable Time value) {
+            this.startTime = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code start_time}
+         */
+        public final Builder startTime(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.startTime(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * API name: {@code start_time_in_millis}
+         */
+        public final Builder startTimeInMillis(@Nullable String value) {
+            this.startTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code state}
+         */
+        public final Builder state(@Nullable String value) {
+            this.state = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code uuid}
+         */
+        public final Builder uuid(String value) {
+            this.uuid = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code version}
+         */
+        public final Builder version(@Nullable String value) {
+            this.version = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code version_id}
+         */
+        public final Builder versionId(@Nullable Long value) {
+            this.versionId = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code feature_states}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>featureStates</code>.
+         */
+        public final Builder featureStates(List<InfoFeatureState> list) {
+            this.featureStates = _listAddAll(this.featureStates, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code feature_states}
+         * <p>
+         * Adds one or more values to <code>featureStates</code>.
+         */
+        public final Builder featureStates(InfoFeatureState value, InfoFeatureState... values) {
+            this.featureStates = _listAdd(this.featureStates, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code feature_states}
+         * <p>
+         * Adds a value to <code>featureStates</code> using a builder lambda.
+         */
+        public final Builder featureStates(Function<InfoFeatureState.Builder, ObjectBuilder<InfoFeatureState>> fn) {
+            return featureStates(fn.apply(new InfoFeatureState.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link SnapshotInfo}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SnapshotInfo build() {
+            _checkSingleUse();
+
+            return new SnapshotInfo(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SnapshotInfo}
+     */
+    public static final JsonpDeserializer<SnapshotInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SnapshotInfo::setupSnapshotInfoDeserializer
+    );
+
+    protected static void setupSnapshotInfoDeserializer(ObjectDeserializer<SnapshotInfo.Builder> op) {
+
+        op.add(Builder::dataStreams, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "data_streams");
+        op.add(Builder::duration, Time._DESERIALIZER, "duration");
+        op.add(Builder::durationInMillis, JsonpDeserializer.stringDeserializer(), "duration_in_millis");
+        op.add(Builder::endTime, Time._DESERIALIZER, "end_time");
+        op.add(Builder::endTimeInMillis, JsonpDeserializer.stringDeserializer(), "end_time_in_millis");
+        op.add(Builder::failures, JsonpDeserializer.arrayDeserializer(SnapshotShardFailure._DESERIALIZER), "failures");
+        op.add(Builder::includeGlobalState, JsonpDeserializer.booleanDeserializer(), "include_global_state");
+        op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "indices");
+        op.add(Builder::indexDetails, JsonpDeserializer.stringMapDeserializer(IndexDetails._DESERIALIZER), "index_details");
+        op.add(Builder::metadata, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "metadata");
+        op.add(Builder::reason, JsonpDeserializer.stringDeserializer(), "reason");
+        op.add(Builder::repository, JsonpDeserializer.stringDeserializer(), "repository");
+        op.add(Builder::snapshot, JsonpDeserializer.stringDeserializer(), "snapshot");
+        op.add(Builder::shards, ShardStatistics._DESERIALIZER, "shards");
+        op.add(Builder::startTime, Time._DESERIALIZER, "start_time");
+        op.add(Builder::startTimeInMillis, JsonpDeserializer.stringDeserializer(), "start_time_in_millis");
+        op.add(Builder::state, JsonpDeserializer.stringDeserializer(), "state");
+        op.add(Builder::uuid, JsonpDeserializer.stringDeserializer(), "uuid");
+        op.add(Builder::version, JsonpDeserializer.stringDeserializer(), "version");
+        op.add(Builder::versionId, JsonpDeserializer.longDeserializer(), "version_id");
+        op.add(Builder::featureStates, JsonpDeserializer.arrayDeserializer(InfoFeatureState._DESERIALIZER), "feature_states");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotShardFailure.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotShardFailure.java
index 082f9f47e2..9d48723f17 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotShardFailure.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotShardFailure.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,188 +43,188 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: snapshot._types.SnapshotShardFailure
 
 @JsonpDeserializable
 public class SnapshotShardFailure implements JsonpSerializable {
-	private final String index;
+    private final String index;
 
-	private final String nodeId;
+    private final String nodeId;
 
-	private final String reason;
+    private final String reason;
 
-	private final String shardId;
+    private final String shardId;
 
-	private final String status;
+    private final String status;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private SnapshotShardFailure(Builder builder) {
+    private SnapshotShardFailure(Builder builder) {
 
-		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.nodeId = ApiTypeHelper.requireNonNull(builder.nodeId, this, "nodeId");
-		this.reason = ApiTypeHelper.requireNonNull(builder.reason, this, "reason");
-		this.shardId = ApiTypeHelper.requireNonNull(builder.shardId, this, "shardId");
-		this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
+        this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
+        this.nodeId = ApiTypeHelper.requireNonNull(builder.nodeId, this, "nodeId");
+        this.reason = ApiTypeHelper.requireNonNull(builder.reason, this, "reason");
+        this.shardId = ApiTypeHelper.requireNonNull(builder.shardId, this, "shardId");
+        this.status = ApiTypeHelper.requireNonNull(builder.status, this, "status");
 
-	}
+    }
 
-	public static SnapshotShardFailure of(Function<Builder, ObjectBuilder<SnapshotShardFailure>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static SnapshotShardFailure of(Function<Builder, ObjectBuilder<SnapshotShardFailure>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code index}
-	 */
-	public final String index() {
-		return this.index;
-	}
+    /**
+     * Required - API name: {@code index}
+     */
+    public final String index() {
+        return this.index;
+    }
 
-	/**
-	 * Required - API name: {@code node_id}
-	 */
-	public final String nodeId() {
-		return this.nodeId;
-	}
-
-	/**
-	 * Required - API name: {@code reason}
-	 */
-	public final String reason() {
-		return this.reason;
-	}
-
-	/**
-	 * Required - API name: {@code shard_id}
-	 */
-	public final String shardId() {
-		return this.shardId;
-	}
-
-	/**
-	 * Required - API name: {@code status}
-	 */
-	public final String status() {
-		return this.status;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("index");
-		generator.write(this.index);
-
-		generator.writeKey("node_id");
-		generator.write(this.nodeId);
-
-		generator.writeKey("reason");
-		generator.write(this.reason);
-
-		generator.writeKey("shard_id");
-		generator.write(this.shardId);
-
-		generator.writeKey("status");
-		generator.write(this.status);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SnapshotShardFailure}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotShardFailure> {
-		private String index;
-
-		private String nodeId;
-
-		private String reason;
-
-		private String shardId;
-
-		private String status;
-
-		/**
-		 * Required - API name: {@code index}
-		 */
-		public final Builder index(String value) {
-			this.index = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code node_id}
-		 */
-		public final Builder nodeId(String value) {
-			this.nodeId = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code reason}
-		 */
-		public final Builder reason(String value) {
-			this.reason = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shard_id}
-		 */
-		public final Builder shardId(String value) {
-			this.shardId = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code status}
-		 */
-		public final Builder status(String value) {
-			this.status = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SnapshotShardFailure}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SnapshotShardFailure build() {
-			_checkSingleUse();
-
-			return new SnapshotShardFailure(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SnapshotShardFailure}
-	 */
-	public static final JsonpDeserializer<SnapshotShardFailure> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SnapshotShardFailure::setupSnapshotShardFailureDeserializer);
-
-	protected static void setupSnapshotShardFailureDeserializer(ObjectDeserializer<SnapshotShardFailure.Builder> op) {
-
-		op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
-		op.add(Builder::nodeId, JsonpDeserializer.stringDeserializer(), "node_id");
-		op.add(Builder::reason, JsonpDeserializer.stringDeserializer(), "reason");
-		op.add(Builder::shardId, JsonpDeserializer.stringDeserializer(), "shard_id");
-		op.add(Builder::status, JsonpDeserializer.stringDeserializer(), "status");
-
-	}
+    /**
+     * Required - API name: {@code node_id}
+     */
+    public final String nodeId() {
+        return this.nodeId;
+    }
+
+    /**
+     * Required - API name: {@code reason}
+     */
+    public final String reason() {
+        return this.reason;
+    }
+
+    /**
+     * Required - API name: {@code shard_id}
+     */
+    public final String shardId() {
+        return this.shardId;
+    }
+
+    /**
+     * Required - API name: {@code status}
+     */
+    public final String status() {
+        return this.status;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("index");
+        generator.write(this.index);
+
+        generator.writeKey("node_id");
+        generator.write(this.nodeId);
+
+        generator.writeKey("reason");
+        generator.write(this.reason);
+
+        generator.writeKey("shard_id");
+        generator.write(this.shardId);
+
+        generator.writeKey("status");
+        generator.write(this.status);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SnapshotShardFailure}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotShardFailure> {
+        private String index;
+
+        private String nodeId;
+
+        private String reason;
+
+        private String shardId;
+
+        private String status;
+
+        /**
+         * Required - API name: {@code index}
+         */
+        public final Builder index(String value) {
+            this.index = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code node_id}
+         */
+        public final Builder nodeId(String value) {
+            this.nodeId = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code reason}
+         */
+        public final Builder reason(String value) {
+            this.reason = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shard_id}
+         */
+        public final Builder shardId(String value) {
+            this.shardId = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code status}
+         */
+        public final Builder status(String value) {
+            this.status = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link SnapshotShardFailure}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SnapshotShardFailure build() {
+            _checkSingleUse();
+
+            return new SnapshotShardFailure(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SnapshotShardFailure}
+     */
+    public static final JsonpDeserializer<SnapshotShardFailure> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SnapshotShardFailure::setupSnapshotShardFailureDeserializer
+    );
+
+    protected static void setupSnapshotShardFailureDeserializer(ObjectDeserializer<SnapshotShardFailure.Builder> op) {
+
+        op.add(Builder::index, JsonpDeserializer.stringDeserializer(), "index");
+        op.add(Builder::nodeId, JsonpDeserializer.stringDeserializer(), "node_id");
+        op.add(Builder::reason, JsonpDeserializer.stringDeserializer(), "reason");
+        op.add(Builder::shardId, JsonpDeserializer.stringDeserializer(), "shard_id");
+        op.add(Builder::status, JsonpDeserializer.stringDeserializer(), "status");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotShardsStatus.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotShardsStatus.java
index 985f693887..23e93651ba 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotShardsStatus.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotShardsStatus.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,123 +43,122 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 // typedef: snapshot._types.SnapshotShardsStatus
 
 @JsonpDeserializable
 public class SnapshotShardsStatus implements JsonpSerializable {
-	private final ShardsStatsStage stage;
-
-	private final ShardsStatsSummary stats;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SnapshotShardsStatus(Builder builder) {
-
-		this.stage = ApiTypeHelper.requireNonNull(builder.stage, this, "stage");
-		this.stats = ApiTypeHelper.requireNonNull(builder.stats, this, "stats");
-
-	}
-
-	public static SnapshotShardsStatus of(Function<Builder, ObjectBuilder<SnapshotShardsStatus>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code stage}
-	 */
-	public final ShardsStatsStage stage() {
-		return this.stage;
-	}
-
-	/**
-	 * Required - API name: {@code stats}
-	 */
-	public final ShardsStatsSummary stats() {
-		return this.stats;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("stage");
-		this.stage.serialize(generator, mapper);
-		generator.writeKey("stats");
-		this.stats.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SnapshotShardsStatus}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotShardsStatus> {
-		private ShardsStatsStage stage;
-
-		private ShardsStatsSummary stats;
-
-		/**
-		 * Required - API name: {@code stage}
-		 */
-		public final Builder stage(ShardsStatsStage value) {
-			this.stage = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code stats}
-		 */
-		public final Builder stats(ShardsStatsSummary value) {
-			this.stats = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code stats}
-		 */
-		public final Builder stats(Function<ShardsStatsSummary.Builder, ObjectBuilder<ShardsStatsSummary>> fn) {
-			return this.stats(fn.apply(new ShardsStatsSummary.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link SnapshotShardsStatus}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SnapshotShardsStatus build() {
-			_checkSingleUse();
-
-			return new SnapshotShardsStatus(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SnapshotShardsStatus}
-	 */
-	public static final JsonpDeserializer<SnapshotShardsStatus> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SnapshotShardsStatus::setupSnapshotShardsStatusDeserializer);
-
-	protected static void setupSnapshotShardsStatusDeserializer(ObjectDeserializer<SnapshotShardsStatus.Builder> op) {
-
-		op.add(Builder::stage, ShardsStatsStage._DESERIALIZER, "stage");
-		op.add(Builder::stats, ShardsStatsSummary._DESERIALIZER, "stats");
-
-	}
+    private final ShardsStatsStage stage;
+
+    private final ShardsStatsSummary stats;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SnapshotShardsStatus(Builder builder) {
+
+        this.stage = ApiTypeHelper.requireNonNull(builder.stage, this, "stage");
+        this.stats = ApiTypeHelper.requireNonNull(builder.stats, this, "stats");
+
+    }
+
+    public static SnapshotShardsStatus of(Function<Builder, ObjectBuilder<SnapshotShardsStatus>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code stage}
+     */
+    public final ShardsStatsStage stage() {
+        return this.stage;
+    }
+
+    /**
+     * Required - API name: {@code stats}
+     */
+    public final ShardsStatsSummary stats() {
+        return this.stats;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("stage");
+        this.stage.serialize(generator, mapper);
+        generator.writeKey("stats");
+        this.stats.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SnapshotShardsStatus}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotShardsStatus> {
+        private ShardsStatsStage stage;
+
+        private ShardsStatsSummary stats;
+
+        /**
+         * Required - API name: {@code stage}
+         */
+        public final Builder stage(ShardsStatsStage value) {
+            this.stage = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code stats}
+         */
+        public final Builder stats(ShardsStatsSummary value) {
+            this.stats = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code stats}
+         */
+        public final Builder stats(Function<ShardsStatsSummary.Builder, ObjectBuilder<ShardsStatsSummary>> fn) {
+            return this.stats(fn.apply(new ShardsStatsSummary.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link SnapshotShardsStatus}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SnapshotShardsStatus build() {
+            _checkSingleUse();
+
+            return new SnapshotShardsStatus(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SnapshotShardsStatus}
+     */
+    public static final JsonpDeserializer<SnapshotShardsStatus> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SnapshotShardsStatus::setupSnapshotShardsStatusDeserializer
+    );
+
+    protected static void setupSnapshotShardsStatusDeserializer(ObjectDeserializer<SnapshotShardsStatus.Builder> op) {
+
+        op.add(Builder::stage, ShardsStatsStage._DESERIALIZER, "stage");
+        op.add(Builder::stats, ShardsStatsSummary._DESERIALIZER, "stats");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotStats.java
index fd7b3229fe..b910465379 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotStats.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotStats.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,180 +43,178 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: snapshot._types.SnapshotStats
 
-
 @JsonpDeserializable
 public class SnapshotStats implements JsonpSerializable {
-	private final FileCountSnapshotStats incremental;
+    private final FileCountSnapshotStats incremental;
 
-	private final long startTimeInMillis;
+    private final long startTimeInMillis;
 
-	private final long timeInMillis;
+    private final long timeInMillis;
 
-	private final FileCountSnapshotStats total;
+    private final FileCountSnapshotStats total;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private SnapshotStats(Builder builder) {
+    private SnapshotStats(Builder builder) {
 
-		this.incremental = ApiTypeHelper.requireNonNull(builder.incremental, this, "incremental");
-		this.startTimeInMillis = ApiTypeHelper.requireNonNull(builder.startTimeInMillis, this, "startTimeInMillis");
-		this.timeInMillis = ApiTypeHelper.requireNonNull(builder.timeInMillis, this, "timeInMillis");
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+        this.incremental = ApiTypeHelper.requireNonNull(builder.incremental, this, "incremental");
+        this.startTimeInMillis = ApiTypeHelper.requireNonNull(builder.startTimeInMillis, this, "startTimeInMillis");
+        this.timeInMillis = ApiTypeHelper.requireNonNull(builder.timeInMillis, this, "timeInMillis");
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
 
-	}
+    }
 
-	public static SnapshotStats of(Function<Builder, ObjectBuilder<SnapshotStats>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static SnapshotStats of(Function<Builder, ObjectBuilder<SnapshotStats>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code incremental}
-	 */
-	public final FileCountSnapshotStats incremental() {
-		return this.incremental;
-	}
-
-	/**
-	 * Required - API name: {@code start_time_in_millis}
-	 */
-	public final long startTimeInMillis() {
-		return this.startTimeInMillis;
-	}
-
-	/**
-	 * Required - API name: {@code time_in_millis}
-	 */
-	public final long timeInMillis() {
-		return this.timeInMillis;
-	}
-
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final FileCountSnapshotStats total() {
-		return this.total;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("incremental");
-		this.incremental.serialize(generator, mapper);
-
-		generator.writeKey("start_time_in_millis");
-		generator.write(this.startTimeInMillis);
-
-		generator.writeKey("time_in_millis");
-		generator.write(this.timeInMillis);
-
-		generator.writeKey("total");
-		this.total.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SnapshotStats}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotStats> {
-		private FileCountSnapshotStats incremental;
-
-		private Long startTimeInMillis;
-
-		private Long timeInMillis;
-
-		private FileCountSnapshotStats total;
-
-		/**
-		 * Required - API name: {@code incremental}
-		 */
-		public final Builder incremental(FileCountSnapshotStats value) {
-			this.incremental = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code incremental}
-		 */
-		public final Builder incremental(
-				Function<FileCountSnapshotStats.Builder, ObjectBuilder<FileCountSnapshotStats>> fn) {
-			return this.incremental(fn.apply(new FileCountSnapshotStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code start_time_in_millis}
-		 */
-		public final Builder startTimeInMillis(long value) {
-			this.startTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code time_in_millis}
-		 */
-		public final Builder timeInMillis(long value) {
-			this.timeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(FileCountSnapshotStats value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(Function<FileCountSnapshotStats.Builder, ObjectBuilder<FileCountSnapshotStats>> fn) {
-			return this.total(fn.apply(new FileCountSnapshotStats.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link SnapshotStats}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SnapshotStats build() {
-			_checkSingleUse();
-
-			return new SnapshotStats(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SnapshotStats}
-	 */
-	public static final JsonpDeserializer<SnapshotStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SnapshotStats::setupSnapshotStatsDeserializer);
-
-	protected static void setupSnapshotStatsDeserializer(ObjectDeserializer<SnapshotStats.Builder> op) {
-
-		op.add(Builder::incremental, FileCountSnapshotStats._DESERIALIZER, "incremental");
-		op.add(Builder::startTimeInMillis, JsonpDeserializer.longDeserializer(), "start_time_in_millis");
-		op.add(Builder::timeInMillis, JsonpDeserializer.longDeserializer(), "time_in_millis");
-		op.add(Builder::total, FileCountSnapshotStats._DESERIALIZER, "total");
-
-	}
+    /**
+     * Required - API name: {@code incremental}
+     */
+    public final FileCountSnapshotStats incremental() {
+        return this.incremental;
+    }
+
+    /**
+     * Required - API name: {@code start_time_in_millis}
+     */
+    public final long startTimeInMillis() {
+        return this.startTimeInMillis;
+    }
+
+    /**
+     * Required - API name: {@code time_in_millis}
+     */
+    public final long timeInMillis() {
+        return this.timeInMillis;
+    }
+
+    /**
+     * Required - API name: {@code total}
+     */
+    public final FileCountSnapshotStats total() {
+        return this.total;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("incremental");
+        this.incremental.serialize(generator, mapper);
+
+        generator.writeKey("start_time_in_millis");
+        generator.write(this.startTimeInMillis);
+
+        generator.writeKey("time_in_millis");
+        generator.write(this.timeInMillis);
+
+        generator.writeKey("total");
+        this.total.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SnapshotStats}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotStats> {
+        private FileCountSnapshotStats incremental;
+
+        private Long startTimeInMillis;
+
+        private Long timeInMillis;
+
+        private FileCountSnapshotStats total;
+
+        /**
+         * Required - API name: {@code incremental}
+         */
+        public final Builder incremental(FileCountSnapshotStats value) {
+            this.incremental = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code incremental}
+         */
+        public final Builder incremental(Function<FileCountSnapshotStats.Builder, ObjectBuilder<FileCountSnapshotStats>> fn) {
+            return this.incremental(fn.apply(new FileCountSnapshotStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code start_time_in_millis}
+         */
+        public final Builder startTimeInMillis(long value) {
+            this.startTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code time_in_millis}
+         */
+        public final Builder timeInMillis(long value) {
+            this.timeInMillis = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(FileCountSnapshotStats value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(Function<FileCountSnapshotStats.Builder, ObjectBuilder<FileCountSnapshotStats>> fn) {
+            return this.total(fn.apply(new FileCountSnapshotStats.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link SnapshotStats}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SnapshotStats build() {
+            _checkSingleUse();
+
+            return new SnapshotStats(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SnapshotStats}
+     */
+    public static final JsonpDeserializer<SnapshotStats> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SnapshotStats::setupSnapshotStatsDeserializer
+    );
+
+    protected static void setupSnapshotStatsDeserializer(ObjectDeserializer<SnapshotStats.Builder> op) {
+
+        op.add(Builder::incremental, FileCountSnapshotStats._DESERIALIZER, "incremental");
+        op.add(Builder::startTimeInMillis, JsonpDeserializer.longDeserializer(), "start_time_in_millis");
+        op.add(Builder::timeInMillis, JsonpDeserializer.longDeserializer(), "time_in_millis");
+        op.add(Builder::total, FileCountSnapshotStats._DESERIALIZER, "total");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotStatusRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotStatusRequest.java
index 5fd339db3a..1e0a59dfe1 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotStatusRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotStatusRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,291 +47,285 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: snapshot.status.Request
 
 /**
  * Returns information about the status of a snapshot.
- * 
+ *
  */
 
 public class SnapshotStatusRequest extends RequestBase {
-	@Nullable
-	private final Boolean ignoreUnavailable;
-
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	@Nullable
-	private final String repository;
-
-	private final List<String> snapshot;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SnapshotStatusRequest(Builder builder) {
-
-		this.ignoreUnavailable = builder.ignoreUnavailable;
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.repository = builder.repository;
-		this.snapshot = ApiTypeHelper.unmodifiable(builder.snapshot);
-
-	}
-
-	public static SnapshotStatusRequest of(Function<Builder, ObjectBuilder<SnapshotStatusRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Whether to ignore unavailable snapshots, defaults to false which means a
-	 * SnapshotMissingException is thrown
-	 * <p>
-	 * API name: {@code ignore_unavailable}
-	 */
-	@Nullable
-	public final Boolean ignoreUnavailable() {
-		return this.ignoreUnavailable;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to master node
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to cluster-manager node
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * A repository name
-	 * <p>
-	 * API name: {@code repository}
-	 */
-	@Nullable
-	public final String repository() {
-		return this.repository;
-	}
-
-	/**
-	 * A comma-separated list of snapshot names
-	 * <p>
-	 * API name: {@code snapshot}
-	 */
-	public final List<String> snapshot() {
-		return this.snapshot;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SnapshotStatusRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotStatusRequest> {
-		@Nullable
-		private Boolean ignoreUnavailable;
-
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		@Nullable
-		private String repository;
-
-		@Nullable
-		private List<String> snapshot;
-
-		/**
-		 * Whether to ignore unavailable snapshots, defaults to false which means a
-		 * SnapshotMissingException is thrown
-		 * <p>
-		 * API name: {@code ignore_unavailable}
-		 */
-		public final Builder ignoreUnavailable(@Nullable Boolean value) {
-			this.ignoreUnavailable = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * A repository name
-		 * <p>
-		 * API name: {@code repository}
-		 */
-		public final Builder repository(@Nullable String value) {
-			this.repository = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of snapshot names
-		 * <p>
-		 * API name: {@code snapshot}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>snapshot</code>.
-		 */
-		public final Builder snapshot(List<String> list) {
-			this.snapshot = _listAddAll(this.snapshot, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of snapshot names
-		 * <p>
-		 * API name: {@code snapshot}
-		 * <p>
-		 * Adds one or more values to <code>snapshot</code>.
-		 */
-		public final Builder snapshot(String value, String... values) {
-			this.snapshot = _listAdd(this.snapshot, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SnapshotStatusRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SnapshotStatusRequest build() {
-			_checkSingleUse();
-
-			return new SnapshotStatusRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code snapshot.status}".
-	 */
-	public static final Endpoint<SnapshotStatusRequest, SnapshotStatusResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _repository = 1 << 0;
-				final int _snapshot = 1 << 1;
-
-				int propsSet = 0;
-
-				if (request.repository() != null)
-					propsSet |= _repository;
-				if (ApiTypeHelper.isDefined(request.snapshot()))
-					propsSet |= _snapshot;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_snapshot");
-					buf.append("/_status");
-					return buf.toString();
-				}
-				if (propsSet == (_repository)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_snapshot");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.repository, buf);
-					buf.append("/_status");
-					return buf.toString();
-				}
-				if (propsSet == (_repository | _snapshot)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_snapshot");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.repository, buf);
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.snapshot.stream().map(v -> v).collect(Collectors.joining(",")),
-							buf);
-					buf.append("/_status");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.ignoreUnavailable != null) {
-					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, SnapshotStatusResponse._DESERIALIZER);
+    @Nullable
+    private final Boolean ignoreUnavailable;
+
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    @Nullable
+    private final String repository;
+
+    private final List<String> snapshot;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SnapshotStatusRequest(Builder builder) {
+
+        this.ignoreUnavailable = builder.ignoreUnavailable;
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.repository = builder.repository;
+        this.snapshot = ApiTypeHelper.unmodifiable(builder.snapshot);
+
+    }
+
+    public static SnapshotStatusRequest of(Function<Builder, ObjectBuilder<SnapshotStatusRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Whether to ignore unavailable snapshots, defaults to false which means a
+     * SnapshotMissingException is thrown
+     * <p>
+     * API name: {@code ignore_unavailable}
+     */
+    @Nullable
+    public final Boolean ignoreUnavailable() {
+        return this.ignoreUnavailable;
+    }
+
+    /**
+     * Explicit operation timeout for connection to master node
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Explicit operation timeout for connection to cluster-manager node
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * A repository name
+     * <p>
+     * API name: {@code repository}
+     */
+    @Nullable
+    public final String repository() {
+        return this.repository;
+    }
+
+    /**
+     * A comma-separated list of snapshot names
+     * <p>
+     * API name: {@code snapshot}
+     */
+    public final List<String> snapshot() {
+        return this.snapshot;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SnapshotStatusRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotStatusRequest> {
+        @Nullable
+        private Boolean ignoreUnavailable;
+
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        @Nullable
+        private String repository;
+
+        @Nullable
+        private List<String> snapshot;
+
+        /**
+         * Whether to ignore unavailable snapshots, defaults to false which means a
+         * SnapshotMissingException is thrown
+         * <p>
+         * API name: {@code ignore_unavailable}
+         */
+        public final Builder ignoreUnavailable(@Nullable Boolean value) {
+            this.ignoreUnavailable = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * A repository name
+         * <p>
+         * API name: {@code repository}
+         */
+        public final Builder repository(@Nullable String value) {
+            this.repository = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of snapshot names
+         * <p>
+         * API name: {@code snapshot}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>snapshot</code>.
+         */
+        public final Builder snapshot(List<String> list) {
+            this.snapshot = _listAddAll(this.snapshot, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of snapshot names
+         * <p>
+         * API name: {@code snapshot}
+         * <p>
+         * Adds one or more values to <code>snapshot</code>.
+         */
+        public final Builder snapshot(String value, String... values) {
+            this.snapshot = _listAdd(this.snapshot, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link SnapshotStatusRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SnapshotStatusRequest build() {
+            _checkSingleUse();
+
+            return new SnapshotStatusRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code snapshot.status}".
+     */
+    public static final Endpoint<SnapshotStatusRequest, SnapshotStatusResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _repository = 1 << 0;
+            final int _snapshot = 1 << 1;
+
+            int propsSet = 0;
+
+            if (request.repository() != null) propsSet |= _repository;
+            if (ApiTypeHelper.isDefined(request.snapshot())) propsSet |= _snapshot;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_snapshot");
+                buf.append("/_status");
+                return buf.toString();
+            }
+            if (propsSet == (_repository)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_snapshot");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.repository, buf);
+                buf.append("/_status");
+                return buf.toString();
+            }
+            if (propsSet == (_repository | _snapshot)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_snapshot");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.repository, buf);
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.snapshot.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+                buf.append("/_status");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.ignoreUnavailable != null) {
+                params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        SnapshotStatusResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotStatusResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotStatusResponse.java
index 79dfe95907..01790f8b4b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotStatusResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/SnapshotStatusResponse.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,123 +44,121 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: snapshot.status.Response
 
 @JsonpDeserializable
 public class SnapshotStatusResponse implements JsonpSerializable {
-	private final List<Status> snapshots;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SnapshotStatusResponse(Builder builder) {
-
-		this.snapshots = ApiTypeHelper.unmodifiableRequired(builder.snapshots, this, "snapshots");
-
-	}
-
-	public static SnapshotStatusResponse of(Function<Builder, ObjectBuilder<SnapshotStatusResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code snapshots}
-	 */
-	public final List<Status> snapshots() {
-		return this.snapshots;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.snapshots)) {
-			generator.writeKey("snapshots");
-			generator.writeStartArray();
-			for (Status item0 : this.snapshots) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SnapshotStatusResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotStatusResponse> {
-		private List<Status> snapshots;
-
-		/**
-		 * Required - API name: {@code snapshots}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>snapshots</code>.
-		 */
-		public final Builder snapshots(List<Status> list) {
-			this.snapshots = _listAddAll(this.snapshots, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code snapshots}
-		 * <p>
-		 * Adds one or more values to <code>snapshots</code>.
-		 */
-		public final Builder snapshots(Status value, Status... values) {
-			this.snapshots = _listAdd(this.snapshots, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code snapshots}
-		 * <p>
-		 * Adds a value to <code>snapshots</code> using a builder lambda.
-		 */
-		public final Builder snapshots(Function<Status.Builder, ObjectBuilder<Status>> fn) {
-			return snapshots(fn.apply(new Status.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link SnapshotStatusResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SnapshotStatusResponse build() {
-			_checkSingleUse();
-
-			return new SnapshotStatusResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SnapshotStatusResponse}
-	 */
-	public static final JsonpDeserializer<SnapshotStatusResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SnapshotStatusResponse::setupSnapshotStatusResponseDeserializer);
-
-	protected static void setupSnapshotStatusResponseDeserializer(
-			ObjectDeserializer<SnapshotStatusResponse.Builder> op) {
-
-		op.add(Builder::snapshots, JsonpDeserializer.arrayDeserializer(Status._DESERIALIZER), "snapshots");
-
-	}
+    private final List<Status> snapshots;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SnapshotStatusResponse(Builder builder) {
+
+        this.snapshots = ApiTypeHelper.unmodifiableRequired(builder.snapshots, this, "snapshots");
+
+    }
+
+    public static SnapshotStatusResponse of(Function<Builder, ObjectBuilder<SnapshotStatusResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code snapshots}
+     */
+    public final List<Status> snapshots() {
+        return this.snapshots;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.snapshots)) {
+            generator.writeKey("snapshots");
+            generator.writeStartArray();
+            for (Status item0 : this.snapshots) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SnapshotStatusResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotStatusResponse> {
+        private List<Status> snapshots;
+
+        /**
+         * Required - API name: {@code snapshots}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>snapshots</code>.
+         */
+        public final Builder snapshots(List<Status> list) {
+            this.snapshots = _listAddAll(this.snapshots, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code snapshots}
+         * <p>
+         * Adds one or more values to <code>snapshots</code>.
+         */
+        public final Builder snapshots(Status value, Status... values) {
+            this.snapshots = _listAdd(this.snapshots, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code snapshots}
+         * <p>
+         * Adds a value to <code>snapshots</code> using a builder lambda.
+         */
+        public final Builder snapshots(Function<Status.Builder, ObjectBuilder<Status>> fn) {
+            return snapshots(fn.apply(new Status.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link SnapshotStatusResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SnapshotStatusResponse build() {
+            _checkSingleUse();
+
+            return new SnapshotStatusResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SnapshotStatusResponse}
+     */
+    public static final JsonpDeserializer<SnapshotStatusResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SnapshotStatusResponse::setupSnapshotStatusResponseDeserializer
+    );
+
+    protected static void setupSnapshotStatusResponseDeserializer(ObjectDeserializer<SnapshotStatusResponse.Builder> op) {
+
+        op.add(Builder::snapshots, JsonpDeserializer.arrayDeserializer(Status._DESERIALIZER), "snapshots");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/Status.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/Status.java
index 5e12039309..b9845a59c8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/Status.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/Status.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,306 +44,303 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: snapshot._types.Status
 
-
 @JsonpDeserializable
 public class Status implements JsonpSerializable {
-	private final boolean includeGlobalState;
-
-	private final Map<String, SnapshotIndexStats> indices;
-
-	private final String repository;
-
-	private final ShardsStats shardsStats;
-
-	private final String snapshot;
-
-	private final String state;
-
-	private final SnapshotStats stats;
-
-	private final String uuid;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Status(Builder builder) {
-
-		this.includeGlobalState = ApiTypeHelper.requireNonNull(builder.includeGlobalState, this, "includeGlobalState");
-		this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
-		this.repository = ApiTypeHelper.requireNonNull(builder.repository, this, "repository");
-		this.shardsStats = ApiTypeHelper.requireNonNull(builder.shardsStats, this, "shardsStats");
-		this.snapshot = ApiTypeHelper.requireNonNull(builder.snapshot, this, "snapshot");
-		this.state = ApiTypeHelper.requireNonNull(builder.state, this, "state");
-		this.stats = ApiTypeHelper.requireNonNull(builder.stats, this, "stats");
-		this.uuid = ApiTypeHelper.requireNonNull(builder.uuid, this, "uuid");
-
-	}
-
-	public static Status of(Function<Builder, ObjectBuilder<Status>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code include_global_state}
-	 */
-	public final boolean includeGlobalState() {
-		return this.includeGlobalState;
-	}
+    private final boolean includeGlobalState;
+
+    private final Map<String, SnapshotIndexStats> indices;
+
+    private final String repository;
+
+    private final ShardsStats shardsStats;
+
+    private final String snapshot;
+
+    private final String state;
+
+    private final SnapshotStats stats;
+
+    private final String uuid;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Status(Builder builder) {
+
+        this.includeGlobalState = ApiTypeHelper.requireNonNull(builder.includeGlobalState, this, "includeGlobalState");
+        this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
+        this.repository = ApiTypeHelper.requireNonNull(builder.repository, this, "repository");
+        this.shardsStats = ApiTypeHelper.requireNonNull(builder.shardsStats, this, "shardsStats");
+        this.snapshot = ApiTypeHelper.requireNonNull(builder.snapshot, this, "snapshot");
+        this.state = ApiTypeHelper.requireNonNull(builder.state, this, "state");
+        this.stats = ApiTypeHelper.requireNonNull(builder.stats, this, "stats");
+        this.uuid = ApiTypeHelper.requireNonNull(builder.uuid, this, "uuid");
+
+    }
+
+    public static Status of(Function<Builder, ObjectBuilder<Status>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code include_global_state}
+     */
+    public final boolean includeGlobalState() {
+        return this.includeGlobalState;
+    }
 
-	/**
-	 * Required - API name: {@code indices}
-	 */
-	public final Map<String, SnapshotIndexStats> indices() {
-		return this.indices;
-	}
+    /**
+     * Required - API name: {@code indices}
+     */
+    public final Map<String, SnapshotIndexStats> indices() {
+        return this.indices;
+    }
 
-	/**
-	 * Required - API name: {@code repository}
-	 */
-	public final String repository() {
-		return this.repository;
-	}
+    /**
+     * Required - API name: {@code repository}
+     */
+    public final String repository() {
+        return this.repository;
+    }
 
-	/**
-	 * Required - API name: {@code shards_stats}
-	 */
-	public final ShardsStats shardsStats() {
-		return this.shardsStats;
-	}
+    /**
+     * Required - API name: {@code shards_stats}
+     */
+    public final ShardsStats shardsStats() {
+        return this.shardsStats;
+    }
 
-	/**
-	 * Required - API name: {@code snapshot}
-	 */
-	public final String snapshot() {
-		return this.snapshot;
-	}
+    /**
+     * Required - API name: {@code snapshot}
+     */
+    public final String snapshot() {
+        return this.snapshot;
+    }
 
-	/**
-	 * Required - API name: {@code state}
-	 */
-	public final String state() {
-		return this.state;
-	}
+    /**
+     * Required - API name: {@code state}
+     */
+    public final String state() {
+        return this.state;
+    }
 
-	/**
-	 * Required - API name: {@code stats}
-	 */
-	public final SnapshotStats stats() {
-		return this.stats;
-	}
-
-	/**
-	 * Required - API name: {@code uuid}
-	 */
-	public final String uuid() {
-		return this.uuid;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("include_global_state");
-		generator.write(this.includeGlobalState);
-
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartObject();
-			for (Map.Entry<String, SnapshotIndexStats> item0 : this.indices.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("repository");
-		generator.write(this.repository);
-
-		generator.writeKey("shards_stats");
-		this.shardsStats.serialize(generator, mapper);
-
-		generator.writeKey("snapshot");
-		generator.write(this.snapshot);
-
-		generator.writeKey("state");
-		generator.write(this.state);
-
-		generator.writeKey("stats");
-		this.stats.serialize(generator, mapper);
-
-		generator.writeKey("uuid");
-		generator.write(this.uuid);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Status}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Status> {
-		private Boolean includeGlobalState;
-
-		private Map<String, SnapshotIndexStats> indices;
-
-		private String repository;
-
-		private ShardsStats shardsStats;
-
-		private String snapshot;
-
-		private String state;
-
-		private SnapshotStats stats;
-
-		private String uuid;
-
-		/**
-		 * Required - API name: {@code include_global_state}
-		 */
-		public final Builder includeGlobalState(boolean value) {
-			this.includeGlobalState = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>indices</code>.
-		 */
-		public final Builder indices(Map<String, SnapshotIndexStats> map) {
-			this.indices = _mapPutAll(this.indices, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds an entry to <code>indices</code>.
-		 */
-		public final Builder indices(String key, SnapshotIndexStats value) {
-			this.indices = _mapPut(this.indices, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds an entry to <code>indices</code> using a builder lambda.
-		 */
-		public final Builder indices(String key,
-				Function<SnapshotIndexStats.Builder, ObjectBuilder<SnapshotIndexStats>> fn) {
-			return indices(key, fn.apply(new SnapshotIndexStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code repository}
-		 */
-		public final Builder repository(String value) {
-			this.repository = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards_stats}
-		 */
-		public final Builder shardsStats(ShardsStats value) {
-			this.shardsStats = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards_stats}
-		 */
-		public final Builder shardsStats(Function<ShardsStats.Builder, ObjectBuilder<ShardsStats>> fn) {
-			return this.shardsStats(fn.apply(new ShardsStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code snapshot}
-		 */
-		public final Builder snapshot(String value) {
-			this.snapshot = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code state}
-		 */
-		public final Builder state(String value) {
-			this.state = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code stats}
-		 */
-		public final Builder stats(SnapshotStats value) {
-			this.stats = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code stats}
-		 */
-		public final Builder stats(Function<SnapshotStats.Builder, ObjectBuilder<SnapshotStats>> fn) {
-			return this.stats(fn.apply(new SnapshotStats.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code uuid}
-		 */
-		public final Builder uuid(String value) {
-			this.uuid = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Status}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Status build() {
-			_checkSingleUse();
-
-			return new Status(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Status}
-	 */
-	public static final JsonpDeserializer<Status> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Status::setupStatusDeserializer);
-
-	protected static void setupStatusDeserializer(ObjectDeserializer<Status.Builder> op) {
-
-		op.add(Builder::includeGlobalState, JsonpDeserializer.booleanDeserializer(), "include_global_state");
-		op.add(Builder::indices, JsonpDeserializer.stringMapDeserializer(SnapshotIndexStats._DESERIALIZER), "indices");
-		op.add(Builder::repository, JsonpDeserializer.stringDeserializer(), "repository");
-		op.add(Builder::shardsStats, ShardsStats._DESERIALIZER, "shards_stats");
-		op.add(Builder::snapshot, JsonpDeserializer.stringDeserializer(), "snapshot");
-		op.add(Builder::state, JsonpDeserializer.stringDeserializer(), "state");
-		op.add(Builder::stats, SnapshotStats._DESERIALIZER, "stats");
-		op.add(Builder::uuid, JsonpDeserializer.stringDeserializer(), "uuid");
-
-	}
+    /**
+     * Required - API name: {@code stats}
+     */
+    public final SnapshotStats stats() {
+        return this.stats;
+    }
+
+    /**
+     * Required - API name: {@code uuid}
+     */
+    public final String uuid() {
+        return this.uuid;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("include_global_state");
+        generator.write(this.includeGlobalState);
+
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartObject();
+            for (Map.Entry<String, SnapshotIndexStats> item0 : this.indices.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("repository");
+        generator.write(this.repository);
+
+        generator.writeKey("shards_stats");
+        this.shardsStats.serialize(generator, mapper);
+
+        generator.writeKey("snapshot");
+        generator.write(this.snapshot);
+
+        generator.writeKey("state");
+        generator.write(this.state);
+
+        generator.writeKey("stats");
+        this.stats.serialize(generator, mapper);
+
+        generator.writeKey("uuid");
+        generator.write(this.uuid);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Status}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Status> {
+        private Boolean includeGlobalState;
+
+        private Map<String, SnapshotIndexStats> indices;
+
+        private String repository;
+
+        private ShardsStats shardsStats;
+
+        private String snapshot;
+
+        private String state;
+
+        private SnapshotStats stats;
+
+        private String uuid;
+
+        /**
+         * Required - API name: {@code include_global_state}
+         */
+        public final Builder includeGlobalState(boolean value) {
+            this.includeGlobalState = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>indices</code>.
+         */
+        public final Builder indices(Map<String, SnapshotIndexStats> map) {
+            this.indices = _mapPutAll(this.indices, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds an entry to <code>indices</code>.
+         */
+        public final Builder indices(String key, SnapshotIndexStats value) {
+            this.indices = _mapPut(this.indices, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds an entry to <code>indices</code> using a builder lambda.
+         */
+        public final Builder indices(String key, Function<SnapshotIndexStats.Builder, ObjectBuilder<SnapshotIndexStats>> fn) {
+            return indices(key, fn.apply(new SnapshotIndexStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code repository}
+         */
+        public final Builder repository(String value) {
+            this.repository = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards_stats}
+         */
+        public final Builder shardsStats(ShardsStats value) {
+            this.shardsStats = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards_stats}
+         */
+        public final Builder shardsStats(Function<ShardsStats.Builder, ObjectBuilder<ShardsStats>> fn) {
+            return this.shardsStats(fn.apply(new ShardsStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code snapshot}
+         */
+        public final Builder snapshot(String value) {
+            this.snapshot = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code state}
+         */
+        public final Builder state(String value) {
+            this.state = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code stats}
+         */
+        public final Builder stats(SnapshotStats value) {
+            this.stats = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code stats}
+         */
+        public final Builder stats(Function<SnapshotStats.Builder, ObjectBuilder<SnapshotStats>> fn) {
+            return this.stats(fn.apply(new SnapshotStats.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code uuid}
+         */
+        public final Builder uuid(String value) {
+            this.uuid = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Status}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Status build() {
+            _checkSingleUse();
+
+            return new Status(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Status}
+     */
+    public static final JsonpDeserializer<Status> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Status::setupStatusDeserializer
+    );
+
+    protected static void setupStatusDeserializer(ObjectDeserializer<Status.Builder> op) {
+
+        op.add(Builder::includeGlobalState, JsonpDeserializer.booleanDeserializer(), "include_global_state");
+        op.add(Builder::indices, JsonpDeserializer.stringMapDeserializer(SnapshotIndexStats._DESERIALIZER), "indices");
+        op.add(Builder::repository, JsonpDeserializer.stringDeserializer(), "repository");
+        op.add(Builder::shardsStats, ShardsStats._DESERIALIZER, "shards_stats");
+        op.add(Builder::snapshot, JsonpDeserializer.stringDeserializer(), "snapshot");
+        op.add(Builder::state, JsonpDeserializer.stringDeserializer(), "state");
+        op.add(Builder::stats, SnapshotStats._DESERIALIZER, "stats");
+        op.add(Builder::uuid, JsonpDeserializer.stringDeserializer(), "uuid");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/VerifyRepositoryRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/VerifyRepositoryRequest.java
index eb9e7491ae..5df9766364 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/VerifyRepositoryRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/VerifyRepositoryRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,11 +45,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: snapshot.verify_repository.Request
 
 /**
@@ -53,220 +52,224 @@
  */
 
 public class VerifyRepositoryRequest extends RequestBase {
-	@Deprecated
-	@Nullable
-	private final Time masterTimeout;
-
-	@Nullable
-	private final Time clusterManagerTimeout;
-
-	private final String name;
-
-	@Nullable
-	private final Time timeout;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private VerifyRepositoryRequest(Builder builder) {
-
-		this.masterTimeout = builder.masterTimeout;
-		this.clusterManagerTimeout = builder.clusterManagerTimeout;
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.timeout = builder.timeout;
-
-	}
-
-	public static VerifyRepositoryRequest of(Function<Builder, ObjectBuilder<VerifyRepositoryRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Explicit operation timeout for connection to master node
-	 * <p>
-	 * API name: {@code master_timeout}
-	 */
-	@Deprecated
-	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
-	}
-
-	/**
-	 * Explicit operation timeout for connection to cluster-manager node
-	 * <p>
-	 * API name: {@code cluster_manager_timeout}
-	 */
-	@Nullable
-	public final Time clusterManagerTimeout() {
-		return this.clusterManagerTimeout;
-	}
-
-	/**
-	 * Required - A repository name
-	 * <p>
-	 * API name: {@code repository}
-	 */
-	public final String name() {
-		return this.name;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link VerifyRepositoryRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<VerifyRepositoryRequest> {
-		@Deprecated
-		@Nullable
-		private Time masterTimeout;
-
-		@Nullable
-		private Time clusterManagerTimeout;
-
-		private String name;
-
-		@Nullable
-		private Time timeout;
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to master node
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		@Deprecated
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(@Nullable Time value) {
-			this.clusterManagerTimeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout for connection to cluster-manager node
-		 * <p>
-		 * API name: {@code cluster_manager_timeout}
-		 */
-		public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - A repository name
-		 * <p>
-		 * API name: {@code repository}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link VerifyRepositoryRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public VerifyRepositoryRequest build() {
-			_checkSingleUse();
-
-			return new VerifyRepositoryRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code snapshot.verify_repository}".
-	 */
-	public static final Endpoint<VerifyRepositoryRequest, VerifyRepositoryResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _name = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _name;
-
-				if (propsSet == (_name)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_snapshot");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.name, buf);
-					buf.append("/_verify");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
-				if (request.clusterManagerTimeout != null) {
-					params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, VerifyRepositoryResponse._DESERIALIZER);
+    @Deprecated
+    @Nullable
+    private final Time masterTimeout;
+
+    @Nullable
+    private final Time clusterManagerTimeout;
+
+    private final String name;
+
+    @Nullable
+    private final Time timeout;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private VerifyRepositoryRequest(Builder builder) {
+
+        this.masterTimeout = builder.masterTimeout;
+        this.clusterManagerTimeout = builder.clusterManagerTimeout;
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.timeout = builder.timeout;
+
+    }
+
+    public static VerifyRepositoryRequest of(Function<Builder, ObjectBuilder<VerifyRepositoryRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Explicit operation timeout for connection to master node
+     * <p>
+     * API name: {@code master_timeout}
+     */
+    @Deprecated
+    @Nullable
+    public final Time masterTimeout() {
+        return this.masterTimeout;
+    }
+
+    /**
+     * Explicit operation timeout for connection to cluster-manager node
+     * <p>
+     * API name: {@code cluster_manager_timeout}
+     */
+    @Nullable
+    public final Time clusterManagerTimeout() {
+        return this.clusterManagerTimeout;
+    }
+
+    /**
+     * Required - A repository name
+     * <p>
+     * API name: {@code repository}
+     */
+    public final String name() {
+        return this.name;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link VerifyRepositoryRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<VerifyRepositoryRequest> {
+        @Deprecated
+        @Nullable
+        private Time masterTimeout;
+
+        @Nullable
+        private Time clusterManagerTimeout;
+
+        private String name;
+
+        @Nullable
+        private Time timeout;
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(@Nullable Time value) {
+            this.masterTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to master node
+         * <p>
+         * API name: {@code master_timeout}
+         */
+        @Deprecated
+        public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.masterTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(@Nullable Time value) {
+            this.clusterManagerTimeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout for connection to cluster-manager node
+         * <p>
+         * API name: {@code cluster_manager_timeout}
+         */
+        public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.clusterManagerTimeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - A repository name
+         * <p>
+         * API name: {@code repository}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link VerifyRepositoryRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public VerifyRepositoryRequest build() {
+            _checkSingleUse();
+
+            return new VerifyRepositoryRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code snapshot.verify_repository}".
+     */
+    public static final Endpoint<VerifyRepositoryRequest, VerifyRepositoryResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _name = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _name;
+
+            if (propsSet == (_name)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_snapshot");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.name, buf);
+                buf.append("/_verify");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.masterTimeout != null) {
+                params.put("master_timeout", request.masterTimeout._toJsonString());
+            }
+            if (request.clusterManagerTimeout != null) {
+                params.put("cluster_manager_timeout", request.clusterManagerTimeout._toJsonString());
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        VerifyRepositoryResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/VerifyRepositoryResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/VerifyRepositoryResponse.java
index 41fd59cf85..09350291e8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/VerifyRepositoryResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/VerifyRepositoryResponse.java
@@ -32,134 +32,135 @@
 
 package org.opensearch.client.opensearch.snapshot;
 
-import org.opensearch.client.opensearch.snapshot.verify_repository.CompactNodeInfo;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.snapshot.verify_repository.CompactNodeInfo;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: snapshot.verify_repository.Response
 
 @JsonpDeserializable
 public class VerifyRepositoryResponse implements JsonpSerializable {
-	private final Map<String, CompactNodeInfo> nodes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private VerifyRepositoryResponse(Builder builder) {
-
-		this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
-
-	}
-
-	public static VerifyRepositoryResponse of(Function<Builder, ObjectBuilder<VerifyRepositoryResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code nodes}
-	 */
-	public final Map<String, CompactNodeInfo> nodes() {
-		return this.nodes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.nodes)) {
-			generator.writeKey("nodes");
-			generator.writeStartObject();
-			for (Map.Entry<String, CompactNodeInfo> item0 : this.nodes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link VerifyRepositoryResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<VerifyRepositoryResponse> {
-		private Map<String, CompactNodeInfo> nodes;
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>nodes</code>.
-		 */
-		public final Builder nodes(Map<String, CompactNodeInfo> map) {
-			this.nodes = _mapPutAll(this.nodes, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code>.
-		 */
-		public final Builder nodes(String key, CompactNodeInfo value) {
-			this.nodes = _mapPut(this.nodes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code> using a builder lambda.
-		 */
-		public final Builder nodes(String key, Function<CompactNodeInfo.Builder, ObjectBuilder<CompactNodeInfo>> fn) {
-			return nodes(key, fn.apply(new CompactNodeInfo.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link VerifyRepositoryResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public VerifyRepositoryResponse build() {
-			_checkSingleUse();
-
-			return new VerifyRepositoryResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link VerifyRepositoryResponse}
-	 */
-	public static final JsonpDeserializer<VerifyRepositoryResponse> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, VerifyRepositoryResponse::setupVerifyRepositoryResponseDeserializer);
-
-	protected static void setupVerifyRepositoryResponseDeserializer(
-			ObjectDeserializer<VerifyRepositoryResponse.Builder> op) {
-
-		op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(CompactNodeInfo._DESERIALIZER), "nodes");
-
-	}
+    private final Map<String, CompactNodeInfo> nodes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private VerifyRepositoryResponse(Builder builder) {
+
+        this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
+
+    }
+
+    public static VerifyRepositoryResponse of(Function<Builder, ObjectBuilder<VerifyRepositoryResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code nodes}
+     */
+    public final Map<String, CompactNodeInfo> nodes() {
+        return this.nodes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.nodes)) {
+            generator.writeKey("nodes");
+            generator.writeStartObject();
+            for (Map.Entry<String, CompactNodeInfo> item0 : this.nodes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link VerifyRepositoryResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<VerifyRepositoryResponse> {
+        private Map<String, CompactNodeInfo> nodes;
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>nodes</code>.
+         */
+        public final Builder nodes(Map<String, CompactNodeInfo> map) {
+            this.nodes = _mapPutAll(this.nodes, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code>.
+         */
+        public final Builder nodes(String key, CompactNodeInfo value) {
+            this.nodes = _mapPut(this.nodes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code> using a builder lambda.
+         */
+        public final Builder nodes(String key, Function<CompactNodeInfo.Builder, ObjectBuilder<CompactNodeInfo>> fn) {
+            return nodes(key, fn.apply(new CompactNodeInfo.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link VerifyRepositoryResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public VerifyRepositoryResponse build() {
+            _checkSingleUse();
+
+            return new VerifyRepositoryResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link VerifyRepositoryResponse}
+     */
+    public static final JsonpDeserializer<VerifyRepositoryResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        VerifyRepositoryResponse::setupVerifyRepositoryResponseDeserializer
+    );
+
+    protected static void setupVerifyRepositoryResponseDeserializer(ObjectDeserializer<VerifyRepositoryResponse.Builder> op) {
+
+        op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(CompactNodeInfo._DESERIALIZER), "nodes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/cleanup_repository/CleanupRepositoryResults.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/cleanup_repository/CleanupRepositoryResults.java
index 37332362b5..45e8a791f4 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/cleanup_repository/CleanupRepositoryResults.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/cleanup_repository/CleanupRepositoryResults.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.snapshot.cleanup_repository;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,117 +43,116 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: snapshot.cleanup_repository.CleanupRepositoryResults
 
 @JsonpDeserializable
 public class CleanupRepositoryResults implements JsonpSerializable {
-	private final long deletedBlobs;
-
-	private final long deletedBytes;
-
-	// ---------------------------------------------------------------------------------------------
+    private final long deletedBlobs;
 
-	private CleanupRepositoryResults(Builder builder) {
+    private final long deletedBytes;
+
+    // ---------------------------------------------------------------------------------------------
 
-		this.deletedBlobs = ApiTypeHelper.requireNonNull(builder.deletedBlobs, this, "deletedBlobs");
-		this.deletedBytes = ApiTypeHelper.requireNonNull(builder.deletedBytes, this, "deletedBytes");
+    private CleanupRepositoryResults(Builder builder) {
 
-	}
+        this.deletedBlobs = ApiTypeHelper.requireNonNull(builder.deletedBlobs, this, "deletedBlobs");
+        this.deletedBytes = ApiTypeHelper.requireNonNull(builder.deletedBytes, this, "deletedBytes");
 
-	public static CleanupRepositoryResults of(Function<Builder, ObjectBuilder<CleanupRepositoryResults>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    }
 
-	/**
-	 * Required - API name: {@code deleted_blobs}
-	 */
-	public final long deletedBlobs() {
-		return this.deletedBlobs;
-	}
+    public static CleanupRepositoryResults of(Function<Builder, ObjectBuilder<CleanupRepositoryResults>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code deleted_bytes}
-	 */
-	public final long deletedBytes() {
-		return this.deletedBytes;
-	}
+    /**
+     * Required - API name: {@code deleted_blobs}
+     */
+    public final long deletedBlobs() {
+        return this.deletedBlobs;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Required - API name: {@code deleted_bytes}
+     */
+    public final long deletedBytes() {
+        return this.deletedBytes;
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-		generator.writeKey("deleted_blobs");
-		generator.write(this.deletedBlobs);
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("deleted_bytes");
-		generator.write(this.deletedBytes);
+        generator.writeKey("deleted_blobs");
+        generator.write(this.deletedBlobs);
 
-	}
+        generator.writeKey("deleted_bytes");
+        generator.write(this.deletedBytes);
 
-	// ---------------------------------------------------------------------------------------------
+    }
 
-	/**
-	 * Builder for {@link CleanupRepositoryResults}.
-	 */
+    // ---------------------------------------------------------------------------------------------
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CleanupRepositoryResults> {
-		private Long deletedBlobs;
+    /**
+     * Builder for {@link CleanupRepositoryResults}.
+     */
 
-		private Long deletedBytes;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CleanupRepositoryResults> {
+        private Long deletedBlobs;
 
-		/**
-		 * Required - API name: {@code deleted_blobs}
-		 */
-		public final Builder deletedBlobs(long value) {
-			this.deletedBlobs = value;
-			return this;
-		}
+        private Long deletedBytes;
 
-		/**
-		 * Required - API name: {@code deleted_bytes}
-		 */
-		public final Builder deletedBytes(long value) {
-			this.deletedBytes = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code deleted_blobs}
+         */
+        public final Builder deletedBlobs(long value) {
+            this.deletedBlobs = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link CleanupRepositoryResults}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CleanupRepositoryResults build() {
-			_checkSingleUse();
+        /**
+         * Required - API name: {@code deleted_bytes}
+         */
+        public final Builder deletedBytes(long value) {
+            this.deletedBytes = value;
+            return this;
+        }
 
-			return new CleanupRepositoryResults(this);
-		}
-	}
+        /**
+         * Builds a {@link CleanupRepositoryResults}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CleanupRepositoryResults build() {
+            _checkSingleUse();
 
-	// ---------------------------------------------------------------------------------------------
+            return new CleanupRepositoryResults(this);
+        }
+    }
 
-	/**
-	 * Json deserializer for {@link CleanupRepositoryResults}
-	 */
-	public static final JsonpDeserializer<CleanupRepositoryResults> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, CleanupRepositoryResults::setupCleanupRepositoryResultsDeserializer);
+    // ---------------------------------------------------------------------------------------------
 
-	protected static void setupCleanupRepositoryResultsDeserializer(
-			ObjectDeserializer<CleanupRepositoryResults.Builder> op) {
+    /**
+     * Json deserializer for {@link CleanupRepositoryResults}
+     */
+    public static final JsonpDeserializer<CleanupRepositoryResults> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CleanupRepositoryResults::setupCleanupRepositoryResultsDeserializer
+    );
 
-		op.add(Builder::deletedBlobs, JsonpDeserializer.longDeserializer(), "deleted_blobs");
-		op.add(Builder::deletedBytes, JsonpDeserializer.longDeserializer(), "deleted_bytes");
+    protected static void setupCleanupRepositoryResultsDeserializer(ObjectDeserializer<CleanupRepositoryResults.Builder> op) {
 
-	}
+        op.add(Builder::deletedBlobs, JsonpDeserializer.longDeserializer(), "deleted_blobs");
+        op.add(Builder::deletedBytes, JsonpDeserializer.longDeserializer(), "deleted_bytes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/get/SnapshotResponseItem.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/get/SnapshotResponseItem.java
index fc23e8528e..dea724109c 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/get/SnapshotResponseItem.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/get/SnapshotResponseItem.java
@@ -32,196 +32,197 @@
 
 package org.opensearch.client.opensearch.snapshot.get;
 
-import org.opensearch.client.opensearch._types.ErrorCause;
-import org.opensearch.client.opensearch.snapshot.SnapshotInfo;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorCause;
+import org.opensearch.client.opensearch.snapshot.SnapshotInfo;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: snapshot.get.SnapshotResponseItem
 
-
 @JsonpDeserializable
 public class SnapshotResponseItem implements JsonpSerializable {
-	private final String repository;
+    private final String repository;
 
-	private final List<SnapshotInfo> snapshots;
-
-	@Nullable
-	private final ErrorCause error;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SnapshotResponseItem(Builder builder) {
-
-		this.repository = ApiTypeHelper.requireNonNull(builder.repository, this, "repository");
-		this.snapshots = ApiTypeHelper.unmodifiable(builder.snapshots);
-		this.error = builder.error;
-
-	}
-
-	public static SnapshotResponseItem of(Function<Builder, ObjectBuilder<SnapshotResponseItem>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code repository}
-	 */
-	public final String repository() {
-		return this.repository;
-	}
-
-	/**
-	 * API name: {@code snapshots}
-	 */
-	public final List<SnapshotInfo> snapshots() {
-		return this.snapshots;
-	}
-
-	/**
-	 * API name: {@code error}
-	 */
-	@Nullable
-	public final ErrorCause error() {
-		return this.error;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("repository");
-		generator.write(this.repository);
-
-		if (ApiTypeHelper.isDefined(this.snapshots)) {
-			generator.writeKey("snapshots");
-			generator.writeStartArray();
-			for (SnapshotInfo item0 : this.snapshots) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.error != null) {
-			generator.writeKey("error");
-			this.error.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SnapshotResponseItem}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotResponseItem> {
-		private String repository;
-
-		@Nullable
-		private List<SnapshotInfo> snapshots;
-
-		@Nullable
-		private ErrorCause error;
-
-		/**
-		 * Required - API name: {@code repository}
-		 */
-		public final Builder repository(String value) {
-			this.repository = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code snapshots}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>snapshots</code>.
-		 */
-		public final Builder snapshots(List<SnapshotInfo> list) {
-			this.snapshots = _listAddAll(this.snapshots, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code snapshots}
-		 * <p>
-		 * Adds one or more values to <code>snapshots</code>.
-		 */
-		public final Builder snapshots(SnapshotInfo value, SnapshotInfo... values) {
-			this.snapshots = _listAdd(this.snapshots, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code snapshots}
-		 * <p>
-		 * Adds a value to <code>snapshots</code> using a builder lambda.
-		 */
-		public final Builder snapshots(Function<SnapshotInfo.Builder, ObjectBuilder<SnapshotInfo>> fn) {
-			return snapshots(fn.apply(new SnapshotInfo.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code error}
-		 */
-		public final Builder error(@Nullable ErrorCause value) {
-			this.error = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code error}
-		 */
-		public final Builder error(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
-			return this.error(fn.apply(new ErrorCause.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link SnapshotResponseItem}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SnapshotResponseItem build() {
-			_checkSingleUse();
-
-			return new SnapshotResponseItem(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SnapshotResponseItem}
-	 */
-	public static final JsonpDeserializer<SnapshotResponseItem> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SnapshotResponseItem::setupSnapshotResponseItemDeserializer);
-
-	protected static void setupSnapshotResponseItemDeserializer(ObjectDeserializer<SnapshotResponseItem.Builder> op) {
-
-		op.add(Builder::repository, JsonpDeserializer.stringDeserializer(), "repository");
-		op.add(Builder::snapshots, JsonpDeserializer.arrayDeserializer(SnapshotInfo._DESERIALIZER), "snapshots");
-		op.add(Builder::error, ErrorCause._DESERIALIZER, "error");
-
-	}
+    private final List<SnapshotInfo> snapshots;
+
+    @Nullable
+    private final ErrorCause error;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SnapshotResponseItem(Builder builder) {
+
+        this.repository = ApiTypeHelper.requireNonNull(builder.repository, this, "repository");
+        this.snapshots = ApiTypeHelper.unmodifiable(builder.snapshots);
+        this.error = builder.error;
+
+    }
+
+    public static SnapshotResponseItem of(Function<Builder, ObjectBuilder<SnapshotResponseItem>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code repository}
+     */
+    public final String repository() {
+        return this.repository;
+    }
+
+    /**
+     * API name: {@code snapshots}
+     */
+    public final List<SnapshotInfo> snapshots() {
+        return this.snapshots;
+    }
+
+    /**
+     * API name: {@code error}
+     */
+    @Nullable
+    public final ErrorCause error() {
+        return this.error;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("repository");
+        generator.write(this.repository);
+
+        if (ApiTypeHelper.isDefined(this.snapshots)) {
+            generator.writeKey("snapshots");
+            generator.writeStartArray();
+            for (SnapshotInfo item0 : this.snapshots) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.error != null) {
+            generator.writeKey("error");
+            this.error.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SnapshotResponseItem}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotResponseItem> {
+        private String repository;
+
+        @Nullable
+        private List<SnapshotInfo> snapshots;
+
+        @Nullable
+        private ErrorCause error;
+
+        /**
+         * Required - API name: {@code repository}
+         */
+        public final Builder repository(String value) {
+            this.repository = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code snapshots}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>snapshots</code>.
+         */
+        public final Builder snapshots(List<SnapshotInfo> list) {
+            this.snapshots = _listAddAll(this.snapshots, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code snapshots}
+         * <p>
+         * Adds one or more values to <code>snapshots</code>.
+         */
+        public final Builder snapshots(SnapshotInfo value, SnapshotInfo... values) {
+            this.snapshots = _listAdd(this.snapshots, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code snapshots}
+         * <p>
+         * Adds a value to <code>snapshots</code> using a builder lambda.
+         */
+        public final Builder snapshots(Function<SnapshotInfo.Builder, ObjectBuilder<SnapshotInfo>> fn) {
+            return snapshots(fn.apply(new SnapshotInfo.Builder()).build());
+        }
+
+        /**
+         * API name: {@code error}
+         */
+        public final Builder error(@Nullable ErrorCause value) {
+            this.error = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code error}
+         */
+        public final Builder error(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
+            return this.error(fn.apply(new ErrorCause.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link SnapshotResponseItem}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SnapshotResponseItem build() {
+            _checkSingleUse();
+
+            return new SnapshotResponseItem(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SnapshotResponseItem}
+     */
+    public static final JsonpDeserializer<SnapshotResponseItem> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SnapshotResponseItem::setupSnapshotResponseItemDeserializer
+    );
+
+    protected static void setupSnapshotResponseItemDeserializer(ObjectDeserializer<SnapshotResponseItem.Builder> op) {
+
+        op.add(Builder::repository, JsonpDeserializer.stringDeserializer(), "repository");
+        op.add(Builder::snapshots, JsonpDeserializer.arrayDeserializer(SnapshotInfo._DESERIALIZER), "snapshots");
+        op.add(Builder::error, ErrorCause._DESERIALIZER, "error");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/restore/SnapshotRestore.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/restore/SnapshotRestore.java
index 307354422c..2b02a0cfe8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/restore/SnapshotRestore.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/restore/SnapshotRestore.java
@@ -32,178 +32,179 @@
 
 package org.opensearch.client.opensearch.snapshot.restore;
 
-import org.opensearch.client.opensearch._types.ShardStatistics;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ShardStatistics;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: snapshot.restore.SnapshotRestore
 
 @JsonpDeserializable
 public class SnapshotRestore implements JsonpSerializable {
-	private final List<String> indices;
-
-	private final String snapshot;
-
-	private final ShardStatistics shards;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private SnapshotRestore(Builder builder) {
-
-		this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
-		this.snapshot = ApiTypeHelper.requireNonNull(builder.snapshot, this, "snapshot");
-		this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
-
-	}
-
-	public static SnapshotRestore of(Function<Builder, ObjectBuilder<SnapshotRestore>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code indices}
-	 */
-	public final List<String> indices() {
-		return this.indices;
-	}
-
-	/**
-	 * Required - API name: {@code snapshot}
-	 */
-	public final String snapshot() {
-		return this.snapshot;
-	}
-
-	/**
-	 * Required - API name: {@code shards}
-	 */
-	public final ShardStatistics shards() {
-		return this.shards;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.indices)) {
-			generator.writeKey("indices");
-			generator.writeStartArray();
-			for (String item0 : this.indices) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("snapshot");
-		generator.write(this.snapshot);
-
-		generator.writeKey("shards");
-		this.shards.serialize(generator, mapper);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link SnapshotRestore}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotRestore> {
-		private List<String> indices;
-
-		private String snapshot;
-
-		private ShardStatistics shards;
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>indices</code>.
-		 */
-		public final Builder indices(List<String> list) {
-			this.indices = _listAddAll(this.indices, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code indices}
-		 * <p>
-		 * Adds one or more values to <code>indices</code>.
-		 */
-		public final Builder indices(String value, String... values) {
-			this.indices = _listAdd(this.indices, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code snapshot}
-		 */
-		public final Builder snapshot(String value) {
-			this.snapshot = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards}
-		 */
-		public final Builder shards(ShardStatistics value) {
-			this.shards = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code shards}
-		 */
-		public final Builder shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
-			return this.shards(fn.apply(new ShardStatistics.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link SnapshotRestore}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SnapshotRestore build() {
-			_checkSingleUse();
-
-			return new SnapshotRestore(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link SnapshotRestore}
-	 */
-	public static final JsonpDeserializer<SnapshotRestore> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			SnapshotRestore::setupSnapshotRestoreDeserializer);
-
-	protected static void setupSnapshotRestoreDeserializer(ObjectDeserializer<SnapshotRestore.Builder> op) {
-
-		op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"indices");
-		op.add(Builder::snapshot, JsonpDeserializer.stringDeserializer(), "snapshot");
-		op.add(Builder::shards, ShardStatistics._DESERIALIZER, "shards");
-
-	}
+    private final List<String> indices;
+
+    private final String snapshot;
+
+    private final ShardStatistics shards;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private SnapshotRestore(Builder builder) {
+
+        this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
+        this.snapshot = ApiTypeHelper.requireNonNull(builder.snapshot, this, "snapshot");
+        this.shards = ApiTypeHelper.requireNonNull(builder.shards, this, "shards");
+
+    }
+
+    public static SnapshotRestore of(Function<Builder, ObjectBuilder<SnapshotRestore>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code indices}
+     */
+    public final List<String> indices() {
+        return this.indices;
+    }
+
+    /**
+     * Required - API name: {@code snapshot}
+     */
+    public final String snapshot() {
+        return this.snapshot;
+    }
+
+    /**
+     * Required - API name: {@code shards}
+     */
+    public final ShardStatistics shards() {
+        return this.shards;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.indices)) {
+            generator.writeKey("indices");
+            generator.writeStartArray();
+            for (String item0 : this.indices) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("snapshot");
+        generator.write(this.snapshot);
+
+        generator.writeKey("shards");
+        this.shards.serialize(generator, mapper);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link SnapshotRestore}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SnapshotRestore> {
+        private List<String> indices;
+
+        private String snapshot;
+
+        private ShardStatistics shards;
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>indices</code>.
+         */
+        public final Builder indices(List<String> list) {
+            this.indices = _listAddAll(this.indices, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code indices}
+         * <p>
+         * Adds one or more values to <code>indices</code>.
+         */
+        public final Builder indices(String value, String... values) {
+            this.indices = _listAdd(this.indices, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code snapshot}
+         */
+        public final Builder snapshot(String value) {
+            this.snapshot = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards}
+         */
+        public final Builder shards(ShardStatistics value) {
+            this.shards = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code shards}
+         */
+        public final Builder shards(Function<ShardStatistics.Builder, ObjectBuilder<ShardStatistics>> fn) {
+            return this.shards(fn.apply(new ShardStatistics.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link SnapshotRestore}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public SnapshotRestore build() {
+            _checkSingleUse();
+
+            return new SnapshotRestore(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link SnapshotRestore}
+     */
+    public static final JsonpDeserializer<SnapshotRestore> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        SnapshotRestore::setupSnapshotRestoreDeserializer
+    );
+
+    protected static void setupSnapshotRestoreDeserializer(ObjectDeserializer<SnapshotRestore.Builder> op) {
+
+        op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "indices");
+        op.add(Builder::snapshot, JsonpDeserializer.stringDeserializer(), "snapshot");
+        op.add(Builder::shards, ShardStatistics._DESERIALIZER, "shards");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/verify_repository/CompactNodeInfo.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/verify_repository/CompactNodeInfo.java
index ed253fcf9a..353da4f6b3 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/verify_repository/CompactNodeInfo.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/verify_repository/CompactNodeInfo.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.snapshot.verify_repository;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,92 +43,92 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.function.Function;
 
 // typedef: snapshot.verify_repository.CompactNodeInfo
 
 @JsonpDeserializable
 public class CompactNodeInfo implements JsonpSerializable {
-	private final String name;
+    private final String name;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private CompactNodeInfo(Builder builder) {
+    private CompactNodeInfo(Builder builder) {
 
-		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+        this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
 
-	}
+    }
 
-	public static CompactNodeInfo of(Function<Builder, ObjectBuilder<CompactNodeInfo>> fn) {
-		return fn.apply(new Builder()).build();
-	}
+    public static CompactNodeInfo of(Function<Builder, ObjectBuilder<CompactNodeInfo>> fn) {
+        return fn.apply(new Builder()).build();
+    }
 
-	/**
-	 * Required - API name: {@code name}
-	 */
-	public final String name() {
-		return this.name;
-	}
+    /**
+     * Required - API name: {@code name}
+     */
+    public final String name() {
+        return this.name;
+    }
 
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("name");
-		generator.write(this.name);
+        generator.writeKey("name");
+        generator.write(this.name);
 
-	}
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Builder for {@link CompactNodeInfo}.
-	 */
+    /**
+     * Builder for {@link CompactNodeInfo}.
+     */
 
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CompactNodeInfo> {
-		private String name;
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CompactNodeInfo> {
+        private String name;
 
-		/**
-		 * Required - API name: {@code name}
-		 */
-		public final Builder name(String value) {
-			this.name = value;
-			return this;
-		}
+        /**
+         * Required - API name: {@code name}
+         */
+        public final Builder name(String value) {
+            this.name = value;
+            return this;
+        }
 
-		/**
-		 * Builds a {@link CompactNodeInfo}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CompactNodeInfo build() {
-			_checkSingleUse();
+        /**
+         * Builds a {@link CompactNodeInfo}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CompactNodeInfo build() {
+            _checkSingleUse();
 
-			return new CompactNodeInfo(this);
-		}
-	}
+            return new CompactNodeInfo(this);
+        }
+    }
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link CompactNodeInfo}
-	 */
-	public static final JsonpDeserializer<CompactNodeInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CompactNodeInfo::setupCompactNodeInfoDeserializer);
+    /**
+     * Json deserializer for {@link CompactNodeInfo}
+     */
+    public static final JsonpDeserializer<CompactNodeInfo> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CompactNodeInfo::setupCompactNodeInfoDeserializer
+    );
 
-	protected static void setupCompactNodeInfoDeserializer(ObjectDeserializer<CompactNodeInfo.Builder> op) {
+    protected static void setupCompactNodeInfoDeserializer(ObjectDeserializer<CompactNodeInfo.Builder> op) {
 
-		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
 
-	}
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/CancelRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/CancelRequest.java
index e65b5d73a8..7f23b42031 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/CancelRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/CancelRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.tasks;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.transport.Endpoint;
@@ -40,13 +46,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: tasks.cancel.Request
 
 /**
@@ -55,265 +54,268 @@
  */
 
 public class CancelRequest extends RequestBase {
-	private final List<String> actions;
-
-	private final List<String> nodes;
-
-	@Nullable
-	private final String parentTaskId;
-
-	@Nullable
-	private final String taskId;
-
-	@Nullable
-	private final Boolean waitForCompletion;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CancelRequest(Builder builder) {
-
-		this.actions = ApiTypeHelper.unmodifiable(builder.actions);
-		this.nodes = ApiTypeHelper.unmodifiable(builder.nodes);
-		this.parentTaskId = builder.parentTaskId;
-		this.taskId = builder.taskId;
-		this.waitForCompletion = builder.waitForCompletion;
-
-	}
-
-	public static CancelRequest of(Function<Builder, ObjectBuilder<CancelRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * A comma-separated list of actions that should be cancelled. Leave empty to
-	 * cancel all.
-	 * <p>
-	 * API name: {@code actions}
-	 */
-	public final List<String> actions() {
-		return this.actions;
-	}
-
-	/**
-	 * A comma-separated list of node IDs or names to limit the returned
-	 * information; use <code>_local</code> to return information from the node
-	 * you're connecting to, leave empty to get information from all nodes
-	 * <p>
-	 * API name: {@code nodes}
-	 */
-	public final List<String> nodes() {
-		return this.nodes;
-	}
-
-	/**
-	 * Cancel tasks with specified parent task id (node_id:task_number). Set to -1
-	 * to cancel all.
-	 * <p>
-	 * API name: {@code parent_task_id}
-	 */
-	@Nullable
-	public final String parentTaskId() {
-		return this.parentTaskId;
-	}
-
-	/**
-	 * Cancel the task with specified task id (node_id:task_number)
-	 * <p>
-	 * API name: {@code task_id}
-	 */
-	@Nullable
-	public final String taskId() {
-		return this.taskId;
-	}
-
-	/**
-	 * Should the request block until the cancellation of the task and its
-	 * descendant tasks is completed. Defaults to false
-	 * <p>
-	 * API name: {@code wait_for_completion}
-	 */
-	@Nullable
-	public final Boolean waitForCompletion() {
-		return this.waitForCompletion;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CancelRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CancelRequest> {
-		@Nullable
-		private List<String> actions;
-
-		@Nullable
-		private List<String> nodes;
-
-		@Nullable
-		private String parentTaskId;
-
-		@Nullable
-		private String taskId;
-
-		@Nullable
-		private Boolean waitForCompletion;
-
-		/**
-		 * A comma-separated list of actions that should be cancelled. Leave empty to
-		 * cancel all.
-		 * <p>
-		 * API name: {@code actions}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>actions</code>.
-		 */
-		public final Builder actions(List<String> list) {
-			this.actions = _listAddAll(this.actions, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of actions that should be cancelled. Leave empty to
-		 * cancel all.
-		 * <p>
-		 * API name: {@code actions}
-		 * <p>
-		 * Adds one or more values to <code>actions</code>.
-		 */
-		public final Builder actions(String value, String... values) {
-			this.actions = _listAdd(this.actions, value, values);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of node IDs or names to limit the returned
-		 * information; use <code>_local</code> to return information from the node
-		 * you're connecting to, leave empty to get information from all nodes
-		 * <p>
-		 * API name: {@code nodes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>nodes</code>.
-		 */
-		public final Builder nodes(List<String> list) {
-			this.nodes = _listAddAll(this.nodes, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of node IDs or names to limit the returned
-		 * information; use <code>_local</code> to return information from the node
-		 * you're connecting to, leave empty to get information from all nodes
-		 * <p>
-		 * API name: {@code nodes}
-		 * <p>
-		 * Adds one or more values to <code>nodes</code>.
-		 */
-		public final Builder nodes(String value, String... values) {
-			this.nodes = _listAdd(this.nodes, value, values);
-			return this;
-		}
-
-		/**
-		 * Cancel tasks with specified parent task id (node_id:task_number). Set to -1
-		 * to cancel all.
-		 * <p>
-		 * API name: {@code parent_task_id}
-		 */
-		public final Builder parentTaskId(@Nullable String value) {
-			this.parentTaskId = value;
-			return this;
-		}
-
-		/**
-		 * Cancel the task with specified task id (node_id:task_number)
-		 * <p>
-		 * API name: {@code task_id}
-		 */
-		public final Builder taskId(@Nullable String value) {
-			this.taskId = value;
-			return this;
-		}
-
-		/**
-		 * Should the request block until the cancellation of the task and its
-		 * descendant tasks is completed. Defaults to false
-		 * <p>
-		 * API name: {@code wait_for_completion}
-		 */
-		public final Builder waitForCompletion(@Nullable Boolean value) {
-			this.waitForCompletion = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link CancelRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CancelRequest build() {
-			_checkSingleUse();
-
-			return new CancelRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code tasks.cancel}".
-	 */
-	public static final Endpoint<CancelRequest, CancelResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "POST";
-
-			},
-
-			// Request path
-			request -> {
-				final int _taskId = 1 << 0;
-
-				int propsSet = 0;
-
-				if (request.taskId() != null)
-					propsSet |= _taskId;
-
-				if (propsSet == 0) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_tasks");
-					buf.append("/_cancel");
-					return buf.toString();
-				}
-				if (propsSet == (_taskId)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_tasks");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.taskId, buf);
-					buf.append("/_cancel");
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (ApiTypeHelper.isDefined(request.nodes)) {
-					params.put("nodes", request.nodes.stream().map(v -> v).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(",")));
-				}
-				if (request.waitForCompletion != null) {
-					params.put("wait_for_completion", String.valueOf(request.waitForCompletion));
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, CancelResponse._DESERIALIZER);
+    private final List<String> actions;
+
+    private final List<String> nodes;
+
+    @Nullable
+    private final String parentTaskId;
+
+    @Nullable
+    private final String taskId;
+
+    @Nullable
+    private final Boolean waitForCompletion;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CancelRequest(Builder builder) {
+
+        this.actions = ApiTypeHelper.unmodifiable(builder.actions);
+        this.nodes = ApiTypeHelper.unmodifiable(builder.nodes);
+        this.parentTaskId = builder.parentTaskId;
+        this.taskId = builder.taskId;
+        this.waitForCompletion = builder.waitForCompletion;
+
+    }
+
+    public static CancelRequest of(Function<Builder, ObjectBuilder<CancelRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * A comma-separated list of actions that should be cancelled. Leave empty to
+     * cancel all.
+     * <p>
+     * API name: {@code actions}
+     */
+    public final List<String> actions() {
+        return this.actions;
+    }
+
+    /**
+     * A comma-separated list of node IDs or names to limit the returned
+     * information; use <code>_local</code> to return information from the node
+     * you're connecting to, leave empty to get information from all nodes
+     * <p>
+     * API name: {@code nodes}
+     */
+    public final List<String> nodes() {
+        return this.nodes;
+    }
+
+    /**
+     * Cancel tasks with specified parent task id (node_id:task_number). Set to -1
+     * to cancel all.
+     * <p>
+     * API name: {@code parent_task_id}
+     */
+    @Nullable
+    public final String parentTaskId() {
+        return this.parentTaskId;
+    }
+
+    /**
+     * Cancel the task with specified task id (node_id:task_number)
+     * <p>
+     * API name: {@code task_id}
+     */
+    @Nullable
+    public final String taskId() {
+        return this.taskId;
+    }
+
+    /**
+     * Should the request block until the cancellation of the task and its
+     * descendant tasks is completed. Defaults to false
+     * <p>
+     * API name: {@code wait_for_completion}
+     */
+    @Nullable
+    public final Boolean waitForCompletion() {
+        return this.waitForCompletion;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CancelRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CancelRequest> {
+        @Nullable
+        private List<String> actions;
+
+        @Nullable
+        private List<String> nodes;
+
+        @Nullable
+        private String parentTaskId;
+
+        @Nullable
+        private String taskId;
+
+        @Nullable
+        private Boolean waitForCompletion;
+
+        /**
+         * A comma-separated list of actions that should be cancelled. Leave empty to
+         * cancel all.
+         * <p>
+         * API name: {@code actions}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>actions</code>.
+         */
+        public final Builder actions(List<String> list) {
+            this.actions = _listAddAll(this.actions, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of actions that should be cancelled. Leave empty to
+         * cancel all.
+         * <p>
+         * API name: {@code actions}
+         * <p>
+         * Adds one or more values to <code>actions</code>.
+         */
+        public final Builder actions(String value, String... values) {
+            this.actions = _listAdd(this.actions, value, values);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of node IDs or names to limit the returned
+         * information; use <code>_local</code> to return information from the node
+         * you're connecting to, leave empty to get information from all nodes
+         * <p>
+         * API name: {@code nodes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>nodes</code>.
+         */
+        public final Builder nodes(List<String> list) {
+            this.nodes = _listAddAll(this.nodes, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of node IDs or names to limit the returned
+         * information; use <code>_local</code> to return information from the node
+         * you're connecting to, leave empty to get information from all nodes
+         * <p>
+         * API name: {@code nodes}
+         * <p>
+         * Adds one or more values to <code>nodes</code>.
+         */
+        public final Builder nodes(String value, String... values) {
+            this.nodes = _listAdd(this.nodes, value, values);
+            return this;
+        }
+
+        /**
+         * Cancel tasks with specified parent task id (node_id:task_number). Set to -1
+         * to cancel all.
+         * <p>
+         * API name: {@code parent_task_id}
+         */
+        public final Builder parentTaskId(@Nullable String value) {
+            this.parentTaskId = value;
+            return this;
+        }
+
+        /**
+         * Cancel the task with specified task id (node_id:task_number)
+         * <p>
+         * API name: {@code task_id}
+         */
+        public final Builder taskId(@Nullable String value) {
+            this.taskId = value;
+            return this;
+        }
+
+        /**
+         * Should the request block until the cancellation of the task and its
+         * descendant tasks is completed. Defaults to false
+         * <p>
+         * API name: {@code wait_for_completion}
+         */
+        public final Builder waitForCompletion(@Nullable Boolean value) {
+            this.waitForCompletion = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link CancelRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CancelRequest build() {
+            _checkSingleUse();
+
+            return new CancelRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code tasks.cancel}".
+     */
+    public static final Endpoint<CancelRequest, CancelResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "POST";
+
+        },
+
+        // Request path
+        request -> {
+            final int _taskId = 1 << 0;
+
+            int propsSet = 0;
+
+            if (request.taskId() != null) propsSet |= _taskId;
+
+            if (propsSet == 0) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_tasks");
+                buf.append("/_cancel");
+                return buf.toString();
+            }
+            if (propsSet == (_taskId)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_tasks");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.taskId, buf);
+                buf.append("/_cancel");
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (ApiTypeHelper.isDefined(request.nodes)) {
+                params.put("nodes", request.nodes.stream().map(v -> v).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(",")));
+            }
+            if (request.waitForCompletion != null) {
+                params.put("wait_for_completion", String.valueOf(request.waitForCompletion));
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        CancelResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/CancelResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/CancelResponse.java
index 28af9bac43..937803e200 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/CancelResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/CancelResponse.java
@@ -32,191 +32,190 @@
 
 package org.opensearch.client.opensearch.tasks;
 
-import org.opensearch.client.opensearch._types.ErrorCause;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorCause;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: tasks.cancel.Response
 
-
 @JsonpDeserializable
 public class CancelResponse implements JsonpSerializable {
-	private final List<ErrorCause> nodeFailures;
-
-	private final Map<String, TaskExecutingNode> nodes;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private CancelResponse(Builder builder) {
-
-		this.nodeFailures = ApiTypeHelper.unmodifiable(builder.nodeFailures);
-		this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
-
-	}
-
-	public static CancelResponse of(Function<Builder, ObjectBuilder<CancelResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code node_failures}
-	 */
-	public final List<ErrorCause> nodeFailures() {
-		return this.nodeFailures;
-	}
-
-	/**
-	 * Required - API name: {@code nodes}
-	 */
-	public final Map<String, TaskExecutingNode> nodes() {
-		return this.nodes;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.nodeFailures)) {
-			generator.writeKey("node_failures");
-			generator.writeStartArray();
-			for (ErrorCause item0 : this.nodeFailures) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.nodes)) {
-			generator.writeKey("nodes");
-			generator.writeStartObject();
-			for (Map.Entry<String, TaskExecutingNode> item0 : this.nodes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link CancelResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CancelResponse> {
-		@Nullable
-		private List<ErrorCause> nodeFailures;
-
-		private Map<String, TaskExecutingNode> nodes;
-
-		/**
-		 * API name: {@code node_failures}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>nodeFailures</code>.
-		 */
-		public final Builder nodeFailures(List<ErrorCause> list) {
-			this.nodeFailures = _listAddAll(this.nodeFailures, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code node_failures}
-		 * <p>
-		 * Adds one or more values to <code>nodeFailures</code>.
-		 */
-		public final Builder nodeFailures(ErrorCause value, ErrorCause... values) {
-			this.nodeFailures = _listAdd(this.nodeFailures, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code node_failures}
-		 * <p>
-		 * Adds a value to <code>nodeFailures</code> using a builder lambda.
-		 */
-		public final Builder nodeFailures(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
-			return nodeFailures(fn.apply(new ErrorCause.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>nodes</code>.
-		 */
-		public final Builder nodes(Map<String, TaskExecutingNode> map) {
-			this.nodes = _mapPutAll(this.nodes, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code>.
-		 */
-		public final Builder nodes(String key, TaskExecutingNode value) {
-			this.nodes = _mapPut(this.nodes, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code> using a builder lambda.
-		 */
-		public final Builder nodes(String key,
-				Function<TaskExecutingNode.Builder, ObjectBuilder<TaskExecutingNode>> fn) {
-			return nodes(key, fn.apply(new TaskExecutingNode.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link CancelResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public CancelResponse build() {
-			_checkSingleUse();
-
-			return new CancelResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link CancelResponse}
-	 */
-	public static final JsonpDeserializer<CancelResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			CancelResponse::setupCancelResponseDeserializer);
-
-	protected static void setupCancelResponseDeserializer(ObjectDeserializer<CancelResponse.Builder> op) {
-
-		op.add(Builder::nodeFailures, JsonpDeserializer.arrayDeserializer(ErrorCause._DESERIALIZER), "node_failures");
-		op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(TaskExecutingNode._DESERIALIZER), "nodes");
-
-	}
+    private final List<ErrorCause> nodeFailures;
+
+    private final Map<String, TaskExecutingNode> nodes;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private CancelResponse(Builder builder) {
+
+        this.nodeFailures = ApiTypeHelper.unmodifiable(builder.nodeFailures);
+        this.nodes = ApiTypeHelper.unmodifiableRequired(builder.nodes, this, "nodes");
+
+    }
+
+    public static CancelResponse of(Function<Builder, ObjectBuilder<CancelResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code node_failures}
+     */
+    public final List<ErrorCause> nodeFailures() {
+        return this.nodeFailures;
+    }
+
+    /**
+     * Required - API name: {@code nodes}
+     */
+    public final Map<String, TaskExecutingNode> nodes() {
+        return this.nodes;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.nodeFailures)) {
+            generator.writeKey("node_failures");
+            generator.writeStartArray();
+            for (ErrorCause item0 : this.nodeFailures) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.nodes)) {
+            generator.writeKey("nodes");
+            generator.writeStartObject();
+            for (Map.Entry<String, TaskExecutingNode> item0 : this.nodes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link CancelResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CancelResponse> {
+        @Nullable
+        private List<ErrorCause> nodeFailures;
+
+        private Map<String, TaskExecutingNode> nodes;
+
+        /**
+         * API name: {@code node_failures}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>nodeFailures</code>.
+         */
+        public final Builder nodeFailures(List<ErrorCause> list) {
+            this.nodeFailures = _listAddAll(this.nodeFailures, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code node_failures}
+         * <p>
+         * Adds one or more values to <code>nodeFailures</code>.
+         */
+        public final Builder nodeFailures(ErrorCause value, ErrorCause... values) {
+            this.nodeFailures = _listAdd(this.nodeFailures, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code node_failures}
+         * <p>
+         * Adds a value to <code>nodeFailures</code> using a builder lambda.
+         */
+        public final Builder nodeFailures(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
+            return nodeFailures(fn.apply(new ErrorCause.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>nodes</code>.
+         */
+        public final Builder nodes(Map<String, TaskExecutingNode> map) {
+            this.nodes = _mapPutAll(this.nodes, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code>.
+         */
+        public final Builder nodes(String key, TaskExecutingNode value) {
+            this.nodes = _mapPut(this.nodes, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code> using a builder lambda.
+         */
+        public final Builder nodes(String key, Function<TaskExecutingNode.Builder, ObjectBuilder<TaskExecutingNode>> fn) {
+            return nodes(key, fn.apply(new TaskExecutingNode.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link CancelResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public CancelResponse build() {
+            _checkSingleUse();
+
+            return new CancelResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link CancelResponse}
+     */
+    public static final JsonpDeserializer<CancelResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        CancelResponse::setupCancelResponseDeserializer
+    );
+
+    protected static void setupCancelResponseDeserializer(ObjectDeserializer<CancelResponse.Builder> op) {
+
+        op.add(Builder::nodeFailures, JsonpDeserializer.arrayDeserializer(ErrorCause._DESERIALIZER), "node_failures");
+        op.add(Builder::nodes, JsonpDeserializer.stringMapDeserializer(TaskExecutingNode._DESERIALIZER), "nodes");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/GetTasksRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/GetTasksRequest.java
index 118f8766cd..1dd8575647 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/GetTasksRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/GetTasksRequest.java
@@ -32,6 +32,10 @@
 
 package org.opensearch.client.opensearch.tasks;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,11 +45,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 // typedef: tasks.get.Request
 
 /**
@@ -54,166 +53,170 @@
  */
 
 public class GetTasksRequest extends RequestBase {
-	private final String taskId;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final Boolean waitForCompletion;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private GetTasksRequest(Builder builder) {
-
-		this.taskId = ApiTypeHelper.requireNonNull(builder.taskId, this, "taskId");
-		this.timeout = builder.timeout;
-		this.waitForCompletion = builder.waitForCompletion;
-
-	}
-
-	public static GetTasksRequest of(Function<Builder, ObjectBuilder<GetTasksRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Return the task with specified id (node_id:task_number)
-	 * <p>
-	 * API name: {@code task_id}
-	 */
-	public final String taskId() {
-		return this.taskId;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Wait for the matching tasks to complete (default: false)
-	 * <p>
-	 * API name: {@code wait_for_completion}
-	 */
-	@Nullable
-	public final Boolean waitForCompletion() {
-		return this.waitForCompletion;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetTasksRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetTasksRequest> {
-		private String taskId;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private Boolean waitForCompletion;
-
-		/**
-		 * Required - Return the task with specified id (node_id:task_number)
-		 * <p>
-		 * API name: {@code task_id}
-		 */
-		public final Builder taskId(String value) {
-			this.taskId = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Wait for the matching tasks to complete (default: false)
-		 * <p>
-		 * API name: {@code wait_for_completion}
-		 */
-		public final Builder waitForCompletion(@Nullable Boolean value) {
-			this.waitForCompletion = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link GetTasksRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetTasksRequest build() {
-			_checkSingleUse();
-
-			return new GetTasksRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code tasks.get}".
-	 */
-	public static final Endpoint<GetTasksRequest, GetTasksResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				final int _taskId = 1 << 0;
-
-				int propsSet = 0;
-
-				propsSet |= _taskId;
-
-				if (propsSet == (_taskId)) {
-					StringBuilder buf = new StringBuilder();
-					buf.append("/_tasks");
-					buf.append("/");
-					SimpleEndpoint.pathEncode(request.taskId, buf);
-					return buf.toString();
-				}
-				throw SimpleEndpoint.noPathTemplateFound("path");
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (request.waitForCompletion != null) {
-					params.put("wait_for_completion", String.valueOf(request.waitForCompletion));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, GetTasksResponse._DESERIALIZER);
+    private final String taskId;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final Boolean waitForCompletion;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private GetTasksRequest(Builder builder) {
+
+        this.taskId = ApiTypeHelper.requireNonNull(builder.taskId, this, "taskId");
+        this.timeout = builder.timeout;
+        this.waitForCompletion = builder.waitForCompletion;
+
+    }
+
+    public static GetTasksRequest of(Function<Builder, ObjectBuilder<GetTasksRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - Return the task with specified id (node_id:task_number)
+     * <p>
+     * API name: {@code task_id}
+     */
+    public final String taskId() {
+        return this.taskId;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Wait for the matching tasks to complete (default: false)
+     * <p>
+     * API name: {@code wait_for_completion}
+     */
+    @Nullable
+    public final Boolean waitForCompletion() {
+        return this.waitForCompletion;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetTasksRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetTasksRequest> {
+        private String taskId;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private Boolean waitForCompletion;
+
+        /**
+         * Required - Return the task with specified id (node_id:task_number)
+         * <p>
+         * API name: {@code task_id}
+         */
+        public final Builder taskId(String value) {
+            this.taskId = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Wait for the matching tasks to complete (default: false)
+         * <p>
+         * API name: {@code wait_for_completion}
+         */
+        public final Builder waitForCompletion(@Nullable Boolean value) {
+            this.waitForCompletion = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link GetTasksRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetTasksRequest build() {
+            _checkSingleUse();
+
+            return new GetTasksRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code tasks.get}".
+     */
+    public static final Endpoint<GetTasksRequest, GetTasksResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            final int _taskId = 1 << 0;
+
+            int propsSet = 0;
+
+            propsSet |= _taskId;
+
+            if (propsSet == (_taskId)) {
+                StringBuilder buf = new StringBuilder();
+                buf.append("/_tasks");
+                buf.append("/");
+                SimpleEndpoint.pathEncode(request.taskId, buf);
+                return buf.toString();
+            }
+            throw SimpleEndpoint.noPathTemplateFound("path");
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (request.waitForCompletion != null) {
+                params.put("wait_for_completion", String.valueOf(request.waitForCompletion));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        GetTasksResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/GetTasksResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/GetTasksResponse.java
index fb9eed1520..1e4357eabb 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/GetTasksResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/GetTasksResponse.java
@@ -32,209 +32,209 @@
 
 package org.opensearch.client.opensearch.tasks;
 
-import org.opensearch.client.opensearch._types.ErrorCause;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorCause;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: tasks.get.Response
 
-
 @JsonpDeserializable
 public class GetTasksResponse implements JsonpSerializable {
-	private final boolean completed;
+    private final boolean completed;
 
-	private final Info task;
+    private final Info task;
 
-	@Nullable
-	private final Status response;
+    @Nullable
+    private final Status response;
 
-	@Nullable
-	private final ErrorCause error;
+    @Nullable
+    private final ErrorCause error;
 
-	// ---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-	private GetTasksResponse(Builder builder) {
+    private GetTasksResponse(Builder builder) {
 
-		this.completed = ApiTypeHelper.requireNonNull(builder.completed, this, "completed");
-		this.task = ApiTypeHelper.requireNonNull(builder.task, this, "task");
-		this.response = builder.response;
-		this.error = builder.error;
+        this.completed = ApiTypeHelper.requireNonNull(builder.completed, this, "completed");
+        this.task = ApiTypeHelper.requireNonNull(builder.task, this, "task");
+        this.response = builder.response;
+        this.error = builder.error;
 
-	}
-
-	public static GetTasksResponse of(Function<Builder, ObjectBuilder<GetTasksResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code completed}
-	 */
-	public final boolean completed() {
-		return this.completed;
-	}
-
-	/**
-	 * Required - API name: {@code task}
-	 */
-	public final Info task() {
-		return this.task;
-	}
-
-	/**
-	 * API name: {@code response}
-	 */
-	@Nullable
-	public final Status response() {
-		return this.response;
-	}
-
-	/**
-	 * API name: {@code error}
-	 */
-	@Nullable
-	public final ErrorCause error() {
-		return this.error;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("completed");
-		generator.write(this.completed);
-
-		generator.writeKey("task");
-		this.task.serialize(generator, mapper);
-
-		if (this.response != null) {
-			generator.writeKey("response");
-			this.response.serialize(generator, mapper);
-
-		}
-		if (this.error != null) {
-			generator.writeKey("error");
-			this.error.serialize(generator, mapper);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link GetTasksResponse}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetTasksResponse> {
-		private Boolean completed;
-
-		private Info task;
-
-		@Nullable
-		private Status response;
-
-		@Nullable
-		private ErrorCause error;
-
-		/**
-		 * Required - API name: {@code completed}
-		 */
-		public final Builder completed(boolean value) {
-			this.completed = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code task}
-		 */
-		public final Builder task(Info value) {
-			this.task = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code task}
-		 */
-		public final Builder task(Function<Info.Builder, ObjectBuilder<Info>> fn) {
-			return this.task(fn.apply(new Info.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code response}
-		 */
-		public final Builder response(@Nullable Status value) {
-			this.response = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code response}
-		 */
-		public final Builder response(Function<Status.Builder, ObjectBuilder<Status>> fn) {
-			return this.response(fn.apply(new Status.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code error}
-		 */
-		public final Builder error(@Nullable ErrorCause value) {
-			this.error = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code error}
-		 */
-		public final Builder error(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
-			return this.error(fn.apply(new ErrorCause.Builder()).build());
-		}
-
-		/**
-		 * Builds a {@link GetTasksResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public GetTasksResponse build() {
-			_checkSingleUse();
-
-			return new GetTasksResponse(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link GetTasksResponse}
-	 */
-	public static final JsonpDeserializer<GetTasksResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			GetTasksResponse::setupGetTasksResponseDeserializer);
-
-	protected static void setupGetTasksResponseDeserializer(ObjectDeserializer<GetTasksResponse.Builder> op) {
-
-		op.add(Builder::completed, JsonpDeserializer.booleanDeserializer(), "completed");
-		op.add(Builder::task, Info._DESERIALIZER, "task");
-		op.add(Builder::response, Status._DESERIALIZER, "response");
-		op.add(Builder::error, ErrorCause._DESERIALIZER, "error");
-
-	}
+    }
+
+    public static GetTasksResponse of(Function<Builder, ObjectBuilder<GetTasksResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code completed}
+     */
+    public final boolean completed() {
+        return this.completed;
+    }
+
+    /**
+     * Required - API name: {@code task}
+     */
+    public final Info task() {
+        return this.task;
+    }
+
+    /**
+     * API name: {@code response}
+     */
+    @Nullable
+    public final Status response() {
+        return this.response;
+    }
+
+    /**
+     * API name: {@code error}
+     */
+    @Nullable
+    public final ErrorCause error() {
+        return this.error;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("completed");
+        generator.write(this.completed);
+
+        generator.writeKey("task");
+        this.task.serialize(generator, mapper);
+
+        if (this.response != null) {
+            generator.writeKey("response");
+            this.response.serialize(generator, mapper);
+
+        }
+        if (this.error != null) {
+            generator.writeKey("error");
+            this.error.serialize(generator, mapper);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link GetTasksResponse}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GetTasksResponse> {
+        private Boolean completed;
+
+        private Info task;
+
+        @Nullable
+        private Status response;
+
+        @Nullable
+        private ErrorCause error;
+
+        /**
+         * Required - API name: {@code completed}
+         */
+        public final Builder completed(boolean value) {
+            this.completed = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code task}
+         */
+        public final Builder task(Info value) {
+            this.task = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code task}
+         */
+        public final Builder task(Function<Info.Builder, ObjectBuilder<Info>> fn) {
+            return this.task(fn.apply(new Info.Builder()).build());
+        }
+
+        /**
+         * API name: {@code response}
+         */
+        public final Builder response(@Nullable Status value) {
+            this.response = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code response}
+         */
+        public final Builder response(Function<Status.Builder, ObjectBuilder<Status>> fn) {
+            return this.response(fn.apply(new Status.Builder()).build());
+        }
+
+        /**
+         * API name: {@code error}
+         */
+        public final Builder error(@Nullable ErrorCause value) {
+            this.error = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code error}
+         */
+        public final Builder error(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
+            return this.error(fn.apply(new ErrorCause.Builder()).build());
+        }
+
+        /**
+         * Builds a {@link GetTasksResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public GetTasksResponse build() {
+            _checkSingleUse();
+
+            return new GetTasksResponse(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link GetTasksResponse}
+     */
+    public static final JsonpDeserializer<GetTasksResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        GetTasksResponse::setupGetTasksResponseDeserializer
+    );
+
+    protected static void setupGetTasksResponseDeserializer(ObjectDeserializer<GetTasksResponse.Builder> op) {
+
+        op.add(Builder::completed, JsonpDeserializer.booleanDeserializer(), "completed");
+        op.add(Builder::task, Info._DESERIALIZER, "task");
+        op.add(Builder::response, Status._DESERIALIZER, "response");
+        op.add(Builder::error, ErrorCause._DESERIALIZER, "error");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/GroupBy.java b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/GroupBy.java
index a3e62a2b4f..97e40d2b95 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/GroupBy.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/GroupBy.java
@@ -35,26 +35,25 @@
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 
-
 @JsonpDeserializable
 public enum GroupBy implements JsonEnum {
-	Nodes("nodes"),
+    Nodes("nodes"),
 
-	Parents("parents"),
+    Parents("parents"),
 
-	None("none"),
+    None("none"),
 
-	;
+    ;
 
-	private final String jsonValue;
+    private final String jsonValue;
 
-	GroupBy(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
+    GroupBy(String jsonValue) {
+        this.jsonValue = jsonValue;
+    }
 
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+    public String jsonValue() {
+        return this.jsonValue;
+    }
 
-	public static final JsonEnum.Deserializer<GroupBy> _DESERIALIZER = new JsonEnum.Deserializer<>(GroupBy.values());
+    public static final JsonEnum.Deserializer<GroupBy> _DESERIALIZER = new JsonEnum.Deserializer<>(GroupBy.values());
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/Info.java b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/Info.java
index 936ba6e29c..ceb3e6f887 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/Info.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/Info.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch.tasks;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,440 +46,436 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: tasks._types.Info
 
-
 @JsonpDeserializable
 public class Info implements JsonpSerializable {
-	private final String action;
-
-	private final boolean cancellable;
-
-	private final List<Info> children;
-
-	@Nullable
-	private final String description;
-
-	private final Map<String, List<String>> headers;
-
-	private final long id;
-
-	private final String node;
-
-	private final long runningTimeInNanos;
-
-	private final long startTimeInMillis;
-
-	@Nullable
-	private final Status status;
-
-	private final String type;
-
-	@Nullable
-	private final String parentTaskId;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Info(Builder builder) {
-
-		this.action = ApiTypeHelper.requireNonNull(builder.action, this, "action");
-		this.cancellable = ApiTypeHelper.requireNonNull(builder.cancellable, this, "cancellable");
-		this.children = ApiTypeHelper.unmodifiable(builder.children);
-		this.description = builder.description;
-		this.headers = ApiTypeHelper.unmodifiableRequired(builder.headers, this, "headers");
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
-		this.runningTimeInNanos = ApiTypeHelper.requireNonNull(builder.runningTimeInNanos, this, "runningTimeInNanos");
-		this.startTimeInMillis = ApiTypeHelper.requireNonNull(builder.startTimeInMillis, this, "startTimeInMillis");
-		this.status = builder.status;
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-		this.parentTaskId = builder.parentTaskId;
-
-	}
-
-	public static Info of(Function<Builder, ObjectBuilder<Info>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code action}
-	 */
-	public final String action() {
-		return this.action;
-	}
-
-	/**
-	 * Required - API name: {@code cancellable}
-	 */
-	public final boolean cancellable() {
-		return this.cancellable;
-	}
-
-	/**
-	 * API name: {@code children}
-	 */
-	public final List<Info> children() {
-		return this.children;
-	}
-
-	/**
-	 * API name: {@code description}
-	 */
-	@Nullable
-	public final String description() {
-		return this.description;
-	}
-
-	/**
-	 * Required - API name: {@code headers}
-	 */
-	public final Map<String, List<String>> headers() {
-		return this.headers;
-	}
-
-	/**
-	 * Required - API name: {@code id}
-	 */
-	public final long id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - API name: {@code node}
-	 */
-	public final String node() {
-		return this.node;
-	}
-
-	/**
-	 * Required - API name: {@code running_time_in_nanos}
-	 */
-	public final long runningTimeInNanos() {
-		return this.runningTimeInNanos;
-	}
-
-	/**
-	 * Required - API name: {@code start_time_in_millis}
-	 */
-	public final long startTimeInMillis() {
-		return this.startTimeInMillis;
-	}
-
-	/**
-	 * API name: {@code status}
-	 */
-	@Nullable
-	public final Status status() {
-		return this.status;
-	}
-
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * API name: {@code parent_task_id}
-	 */
-	@Nullable
-	public final String parentTaskId() {
-		return this.parentTaskId;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("action");
-		generator.write(this.action);
-
-		generator.writeKey("cancellable");
-		generator.write(this.cancellable);
-
-		if (ApiTypeHelper.isDefined(this.children)) {
-			generator.writeKey("children");
-			generator.writeStartArray();
-			for (Info item0 : this.children) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (this.description != null) {
-			generator.writeKey("description");
-			generator.write(this.description);
-
-		}
-		if (ApiTypeHelper.isDefined(this.headers)) {
-			generator.writeKey("headers");
-			generator.writeStartObject();
-			for (Map.Entry<String, List<String>> item0 : this.headers.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.writeStartArray();
-				if (item0.getValue() != null) {
-					for (String item1 : item0.getValue()) {
-						generator.write(item1);
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("id");
-		generator.write(this.id);
-
-		generator.writeKey("node");
-		generator.write(this.node);
-
-		generator.writeKey("running_time_in_nanos");
-		generator.write(this.runningTimeInNanos);
-
-		generator.writeKey("start_time_in_millis");
-		generator.write(this.startTimeInMillis);
-
-		if (this.status != null) {
-			generator.writeKey("status");
-			this.status.serialize(generator, mapper);
-
-		}
-		generator.writeKey("type");
-		generator.write(this.type);
-
-		if (this.parentTaskId != null) {
-			generator.writeKey("parent_task_id");
-			generator.write(this.parentTaskId);
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Info}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Info> {
-		private String action;
-
-		private Boolean cancellable;
-
-		@Nullable
-		private List<Info> children;
-
-		@Nullable
-		private String description;
-
-		private Map<String, List<String>> headers;
-
-		private Long id;
-
-		private String node;
-
-		private Long runningTimeInNanos;
-
-		private Long startTimeInMillis;
-
-		@Nullable
-		private Status status;
-
-		private String type;
-
-		@Nullable
-		private String parentTaskId;
-
-		/**
-		 * Required - API name: {@code action}
-		 */
-		public final Builder action(String value) {
-			this.action = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code cancellable}
-		 */
-		public final Builder cancellable(boolean value) {
-			this.cancellable = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code children}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>children</code>.
-		 */
-		public final Builder children(List<Info> list) {
-			this.children = _listAddAll(this.children, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code children}
-		 * <p>
-		 * Adds one or more values to <code>children</code>.
-		 */
-		public final Builder children(Info value, Info... values) {
-			this.children = _listAdd(this.children, value, values);
-			return this;
-		}
-
-		/**
-		 * API name: {@code children}
-		 * <p>
-		 * Adds a value to <code>children</code> using a builder lambda.
-		 */
-		public final Builder children(Function<Info.Builder, ObjectBuilder<Info>> fn) {
-			return children(fn.apply(new Info.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code description}
-		 */
-		public final Builder description(@Nullable String value) {
-			this.description = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code headers}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>headers</code>.
-		 */
-		public final Builder headers(Map<String, List<String>> map) {
-			this.headers = _mapPutAll(this.headers, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code headers}
-		 * <p>
-		 * Adds an entry to <code>headers</code>.
-		 */
-		public final Builder headers(String key, List<String> value) {
-			this.headers = _mapPut(this.headers, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code id}
-		 */
-		public final Builder id(long value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code node}
-		 */
-		public final Builder node(String value) {
-			this.node = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code running_time_in_nanos}
-		 */
-		public final Builder runningTimeInNanos(long value) {
-			this.runningTimeInNanos = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code start_time_in_millis}
-		 */
-		public final Builder startTimeInMillis(long value) {
-			this.startTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code status}
-		 */
-		public final Builder status(@Nullable Status value) {
-			this.status = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code status}
-		 */
-		public final Builder status(Function<Status.Builder, ObjectBuilder<Status>> fn) {
-			return this.status(fn.apply(new Status.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code parent_task_id}
-		 */
-		public final Builder parentTaskId(@Nullable String value) {
-			this.parentTaskId = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Info}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Info build() {
-			_checkSingleUse();
-
-			return new Info(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Info}
-	 */
-	public static final JsonpDeserializer<Info> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Info::setupInfoDeserializer);
-
-	protected static void setupInfoDeserializer(ObjectDeserializer<Info.Builder> op) {
-
-		op.add(Builder::action, JsonpDeserializer.stringDeserializer(), "action");
-		op.add(Builder::cancellable, JsonpDeserializer.booleanDeserializer(), "cancellable");
-		op.add(Builder::children, JsonpDeserializer.arrayDeserializer(Info._DESERIALIZER), "children");
-		op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
-		op.add(Builder::headers, JsonpDeserializer.stringMapDeserializer(
-				JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer())), "headers");
-		op.add(Builder::id, JsonpDeserializer.longDeserializer(), "id");
-		op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
-		op.add(Builder::runningTimeInNanos, JsonpDeserializer.longDeserializer(), "running_time_in_nanos");
-		op.add(Builder::startTimeInMillis, JsonpDeserializer.longDeserializer(), "start_time_in_millis");
-		op.add(Builder::status, Status._DESERIALIZER, "status");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-		op.add(Builder::parentTaskId, JsonpDeserializer.stringDeserializer(), "parent_task_id");
-
-	}
+    private final String action;
+
+    private final boolean cancellable;
+
+    private final List<Info> children;
+
+    @Nullable
+    private final String description;
+
+    private final Map<String, List<String>> headers;
+
+    private final long id;
+
+    private final String node;
+
+    private final long runningTimeInNanos;
+
+    private final long startTimeInMillis;
+
+    @Nullable
+    private final Status status;
+
+    private final String type;
+
+    @Nullable
+    private final String parentTaskId;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Info(Builder builder) {
+
+        this.action = ApiTypeHelper.requireNonNull(builder.action, this, "action");
+        this.cancellable = ApiTypeHelper.requireNonNull(builder.cancellable, this, "cancellable");
+        this.children = ApiTypeHelper.unmodifiable(builder.children);
+        this.description = builder.description;
+        this.headers = ApiTypeHelper.unmodifiableRequired(builder.headers, this, "headers");
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
+        this.runningTimeInNanos = ApiTypeHelper.requireNonNull(builder.runningTimeInNanos, this, "runningTimeInNanos");
+        this.startTimeInMillis = ApiTypeHelper.requireNonNull(builder.startTimeInMillis, this, "startTimeInMillis");
+        this.status = builder.status;
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+        this.parentTaskId = builder.parentTaskId;
+
+    }
+
+    public static Info of(Function<Builder, ObjectBuilder<Info>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code action}
+     */
+    public final String action() {
+        return this.action;
+    }
+
+    /**
+     * Required - API name: {@code cancellable}
+     */
+    public final boolean cancellable() {
+        return this.cancellable;
+    }
+
+    /**
+     * API name: {@code children}
+     */
+    public final List<Info> children() {
+        return this.children;
+    }
+
+    /**
+     * API name: {@code description}
+     */
+    @Nullable
+    public final String description() {
+        return this.description;
+    }
+
+    /**
+     * Required - API name: {@code headers}
+     */
+    public final Map<String, List<String>> headers() {
+        return this.headers;
+    }
+
+    /**
+     * Required - API name: {@code id}
+     */
+    public final long id() {
+        return this.id;
+    }
+
+    /**
+     * Required - API name: {@code node}
+     */
+    public final String node() {
+        return this.node;
+    }
+
+    /**
+     * Required - API name: {@code running_time_in_nanos}
+     */
+    public final long runningTimeInNanos() {
+        return this.runningTimeInNanos;
+    }
+
+    /**
+     * Required - API name: {@code start_time_in_millis}
+     */
+    public final long startTimeInMillis() {
+        return this.startTimeInMillis;
+    }
+
+    /**
+     * API name: {@code status}
+     */
+    @Nullable
+    public final Status status() {
+        return this.status;
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * API name: {@code parent_task_id}
+     */
+    @Nullable
+    public final String parentTaskId() {
+        return this.parentTaskId;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("action");
+        generator.write(this.action);
+
+        generator.writeKey("cancellable");
+        generator.write(this.cancellable);
+
+        if (ApiTypeHelper.isDefined(this.children)) {
+            generator.writeKey("children");
+            generator.writeStartArray();
+            for (Info item0 : this.children) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (this.description != null) {
+            generator.writeKey("description");
+            generator.write(this.description);
+
+        }
+        if (ApiTypeHelper.isDefined(this.headers)) {
+            generator.writeKey("headers");
+            generator.writeStartObject();
+            for (Map.Entry<String, List<String>> item0 : this.headers.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.writeStartArray();
+                if (item0.getValue() != null) {
+                    for (String item1 : item0.getValue()) {
+                        generator.write(item1);
+
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("id");
+        generator.write(this.id);
+
+        generator.writeKey("node");
+        generator.write(this.node);
+
+        generator.writeKey("running_time_in_nanos");
+        generator.write(this.runningTimeInNanos);
+
+        generator.writeKey("start_time_in_millis");
+        generator.write(this.startTimeInMillis);
+
+        if (this.status != null) {
+            generator.writeKey("status");
+            this.status.serialize(generator, mapper);
+
+        }
+        generator.writeKey("type");
+        generator.write(this.type);
+
+        if (this.parentTaskId != null) {
+            generator.writeKey("parent_task_id");
+            generator.write(this.parentTaskId);
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Info}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Info> {
+        private String action;
+
+        private Boolean cancellable;
+
+        @Nullable
+        private List<Info> children;
+
+        @Nullable
+        private String description;
+
+        private Map<String, List<String>> headers;
+
+        private Long id;
+
+        private String node;
+
+        private Long runningTimeInNanos;
+
+        private Long startTimeInMillis;
+
+        @Nullable
+        private Status status;
+
+        private String type;
+
+        @Nullable
+        private String parentTaskId;
+
+        /**
+         * Required - API name: {@code action}
+         */
+        public final Builder action(String value) {
+            this.action = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code cancellable}
+         */
+        public final Builder cancellable(boolean value) {
+            this.cancellable = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code children}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>children</code>.
+         */
+        public final Builder children(List<Info> list) {
+            this.children = _listAddAll(this.children, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code children}
+         * <p>
+         * Adds one or more values to <code>children</code>.
+         */
+        public final Builder children(Info value, Info... values) {
+            this.children = _listAdd(this.children, value, values);
+            return this;
+        }
+
+        /**
+         * API name: {@code children}
+         * <p>
+         * Adds a value to <code>children</code> using a builder lambda.
+         */
+        public final Builder children(Function<Info.Builder, ObjectBuilder<Info>> fn) {
+            return children(fn.apply(new Info.Builder()).build());
+        }
+
+        /**
+         * API name: {@code description}
+         */
+        public final Builder description(@Nullable String value) {
+            this.description = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code headers}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>headers</code>.
+         */
+        public final Builder headers(Map<String, List<String>> map) {
+            this.headers = _mapPutAll(this.headers, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code headers}
+         * <p>
+         * Adds an entry to <code>headers</code>.
+         */
+        public final Builder headers(String key, List<String> value) {
+            this.headers = _mapPut(this.headers, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code id}
+         */
+        public final Builder id(long value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code node}
+         */
+        public final Builder node(String value) {
+            this.node = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code running_time_in_nanos}
+         */
+        public final Builder runningTimeInNanos(long value) {
+            this.runningTimeInNanos = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code start_time_in_millis}
+         */
+        public final Builder startTimeInMillis(long value) {
+            this.startTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code status}
+         */
+        public final Builder status(@Nullable Status value) {
+            this.status = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code status}
+         */
+        public final Builder status(Function<Status.Builder, ObjectBuilder<Status>> fn) {
+            return this.status(fn.apply(new Status.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code parent_task_id}
+         */
+        public final Builder parentTaskId(@Nullable String value) {
+            this.parentTaskId = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Info}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Info build() {
+            _checkSingleUse();
+
+            return new Info(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Info}
+     */
+    public static final JsonpDeserializer<Info> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new, Info::setupInfoDeserializer);
+
+    protected static void setupInfoDeserializer(ObjectDeserializer<Info.Builder> op) {
+
+        op.add(Builder::action, JsonpDeserializer.stringDeserializer(), "action");
+        op.add(Builder::cancellable, JsonpDeserializer.booleanDeserializer(), "cancellable");
+        op.add(Builder::children, JsonpDeserializer.arrayDeserializer(Info._DESERIALIZER), "children");
+        op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
+        op.add(
+            Builder::headers,
+            JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer())),
+            "headers"
+        );
+        op.add(Builder::id, JsonpDeserializer.longDeserializer(), "id");
+        op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
+        op.add(Builder::runningTimeInNanos, JsonpDeserializer.longDeserializer(), "running_time_in_nanos");
+        op.add(Builder::startTimeInMillis, JsonpDeserializer.longDeserializer(), "start_time_in_millis");
+        op.add(Builder::status, Status._DESERIALIZER, "status");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+        op.add(Builder::parentTaskId, JsonpDeserializer.stringDeserializer(), "parent_task_id");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/ListRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/ListRequest.java
index 2485d273b3..19a18cebd9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/ListRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/ListRequest.java
@@ -32,6 +32,12 @@
 
 package org.opensearch.client.opensearch.tasks;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.opensearch._types.RequestBase;
 import org.opensearch.client.opensearch._types.Time;
@@ -41,13 +47,6 @@
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-
 // typedef: tasks.list.Request
 
 /**
@@ -56,314 +55,318 @@
  */
 
 public class ListRequest extends RequestBase {
-	private final List<String> actions;
-
-	@Nullable
-	private final Boolean detailed;
-
-	@Nullable
-	private final GroupBy groupBy;
-
-	private final List<String> nodes;
-
-	@Nullable
-	private final String parentTaskId;
-
-	@Nullable
-	private final Time timeout;
-
-	@Nullable
-	private final Boolean waitForCompletion;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private ListRequest(Builder builder) {
-
-		this.actions = ApiTypeHelper.unmodifiable(builder.actions);
-		this.detailed = builder.detailed;
-		this.groupBy = builder.groupBy;
-		this.nodes = ApiTypeHelper.unmodifiable(builder.nodes);
-		this.parentTaskId = builder.parentTaskId;
-		this.timeout = builder.timeout;
-		this.waitForCompletion = builder.waitForCompletion;
-
-	}
-
-	public static ListRequest of(Function<Builder, ObjectBuilder<ListRequest>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * A comma-separated list of actions that should be returned. Leave empty to
-	 * return all.
-	 * <p>
-	 * API name: {@code actions}
-	 */
-	public final List<String> actions() {
-		return this.actions;
-	}
-
-	/**
-	 * Return detailed task information (default: false)
-	 * <p>
-	 * API name: {@code detailed}
-	 */
-	@Nullable
-	public final Boolean detailed() {
-		return this.detailed;
-	}
-
-	/**
-	 * Group tasks by nodes or parent/child relationships
-	 * <p>
-	 * API name: {@code group_by}
-	 */
-	@Nullable
-	public final GroupBy groupBy() {
-		return this.groupBy;
-	}
-
-	/**
-	 * A comma-separated list of node IDs or names to limit the returned
-	 * information; use <code>_local</code> to return information from the node
-	 * you're connecting to, leave empty to get information from all nodes
-	 * <p>
-	 * API name: {@code nodes}
-	 */
-	public final List<String> nodes() {
-		return this.nodes;
-	}
-
-	/**
-	 * Return tasks with specified parent task id (node_id:task_number). Set to -1
-	 * to return all.
-	 * <p>
-	 * API name: {@code parent_task_id}
-	 */
-	@Nullable
-	public final String parentTaskId() {
-		return this.parentTaskId;
-	}
-
-	/**
-	 * Explicit operation timeout
-	 * <p>
-	 * API name: {@code timeout}
-	 */
-	@Nullable
-	public final Time timeout() {
-		return this.timeout;
-	}
-
-	/**
-	 * Wait for the matching tasks to complete (default: false)
-	 * <p>
-	 * API name: {@code wait_for_completion}
-	 */
-	@Nullable
-	public final Boolean waitForCompletion() {
-		return this.waitForCompletion;
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ListRequest}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ListRequest> {
-		@Nullable
-		private List<String> actions;
-
-		@Nullable
-		private Boolean detailed;
-
-		@Nullable
-		private GroupBy groupBy;
-
-		@Nullable
-		private List<String> nodes;
-
-		@Nullable
-		private String parentTaskId;
-
-		@Nullable
-		private Time timeout;
-
-		@Nullable
-		private Boolean waitForCompletion;
-
-		/**
-		 * A comma-separated list of actions that should be returned. Leave empty to
-		 * return all.
-		 * <p>
-		 * API name: {@code actions}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>actions</code>.
-		 */
-		public final Builder actions(List<String> list) {
-			this.actions = _listAddAll(this.actions, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of actions that should be returned. Leave empty to
-		 * return all.
-		 * <p>
-		 * API name: {@code actions}
-		 * <p>
-		 * Adds one or more values to <code>actions</code>.
-		 */
-		public final Builder actions(String value, String... values) {
-			this.actions = _listAdd(this.actions, value, values);
-			return this;
-		}
-
-		/**
-		 * Return detailed task information (default: false)
-		 * <p>
-		 * API name: {@code detailed}
-		 */
-		public final Builder detailed(@Nullable Boolean value) {
-			this.detailed = value;
-			return this;
-		}
-
-		/**
-		 * Group tasks by nodes or parent/child relationships
-		 * <p>
-		 * API name: {@code group_by}
-		 */
-		public final Builder groupBy(@Nullable GroupBy value) {
-			this.groupBy = value;
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of node IDs or names to limit the returned
-		 * information; use <code>_local</code> to return information from the node
-		 * you're connecting to, leave empty to get information from all nodes
-		 * <p>
-		 * API name: {@code nodes}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>nodes</code>.
-		 */
-		public final Builder nodes(List<String> list) {
-			this.nodes = _listAddAll(this.nodes, list);
-			return this;
-		}
-
-		/**
-		 * A comma-separated list of node IDs or names to limit the returned
-		 * information; use <code>_local</code> to return information from the node
-		 * you're connecting to, leave empty to get information from all nodes
-		 * <p>
-		 * API name: {@code nodes}
-		 * <p>
-		 * Adds one or more values to <code>nodes</code>.
-		 */
-		public final Builder nodes(String value, String... values) {
-			this.nodes = _listAdd(this.nodes, value, values);
-			return this;
-		}
-
-		/**
-		 * Return tasks with specified parent task id (node_id:task_number). Set to -1
-		 * to return all.
-		 * <p>
-		 * API name: {@code parent_task_id}
-		 */
-		public final Builder parentTaskId(@Nullable String value) {
-			this.parentTaskId = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(@Nullable Time value) {
-			this.timeout = value;
-			return this;
-		}
-
-		/**
-		 * Explicit operation timeout
-		 * <p>
-		 * API name: {@code timeout}
-		 */
-		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.timeout(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Wait for the matching tasks to complete (default: false)
-		 * <p>
-		 * API name: {@code wait_for_completion}
-		 */
-		public final Builder waitForCompletion(@Nullable Boolean value) {
-			this.waitForCompletion = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ListRequest}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ListRequest build() {
-			_checkSingleUse();
-
-			return new ListRequest(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Endpoint "{@code tasks.list}".
-	 */
-	public static final Endpoint<ListRequest, ListResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
-
-			// Request method
-			request -> {
-				return "GET";
-
-			},
-
-			// Request path
-			request -> {
-				return "/_tasks";
-
-			},
-
-			// Request parameters
-			request -> {
-				Map<String, String> params = new HashMap<>();
-				if (ApiTypeHelper.isDefined(request.nodes)) {
-					params.put("nodes", request.nodes.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.parentTaskId != null) {
-					params.put("parent_task_id", request.parentTaskId);
-				}
-				if (request.detailed != null) {
-					params.put("detailed", String.valueOf(request.detailed));
-				}
-				if (request.groupBy != null) {
-					params.put("group_by", request.groupBy.jsonValue());
-				}
-				if (ApiTypeHelper.isDefined(request.actions)) {
-					params.put("actions", request.actions.stream().map(v -> v).collect(Collectors.joining(",")));
-				}
-				if (request.waitForCompletion != null) {
-					params.put("wait_for_completion", String.valueOf(request.waitForCompletion));
-				}
-				if (request.timeout != null) {
-					params.put("timeout", request.timeout._toJsonString());
-				}
-				return params;
-
-			}, SimpleEndpoint.emptyMap(), false, ListResponse._DESERIALIZER);
+    private final List<String> actions;
+
+    @Nullable
+    private final Boolean detailed;
+
+    @Nullable
+    private final GroupBy groupBy;
+
+    private final List<String> nodes;
+
+    @Nullable
+    private final String parentTaskId;
+
+    @Nullable
+    private final Time timeout;
+
+    @Nullable
+    private final Boolean waitForCompletion;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private ListRequest(Builder builder) {
+
+        this.actions = ApiTypeHelper.unmodifiable(builder.actions);
+        this.detailed = builder.detailed;
+        this.groupBy = builder.groupBy;
+        this.nodes = ApiTypeHelper.unmodifiable(builder.nodes);
+        this.parentTaskId = builder.parentTaskId;
+        this.timeout = builder.timeout;
+        this.waitForCompletion = builder.waitForCompletion;
+
+    }
+
+    public static ListRequest of(Function<Builder, ObjectBuilder<ListRequest>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * A comma-separated list of actions that should be returned. Leave empty to
+     * return all.
+     * <p>
+     * API name: {@code actions}
+     */
+    public final List<String> actions() {
+        return this.actions;
+    }
+
+    /**
+     * Return detailed task information (default: false)
+     * <p>
+     * API name: {@code detailed}
+     */
+    @Nullable
+    public final Boolean detailed() {
+        return this.detailed;
+    }
+
+    /**
+     * Group tasks by nodes or parent/child relationships
+     * <p>
+     * API name: {@code group_by}
+     */
+    @Nullable
+    public final GroupBy groupBy() {
+        return this.groupBy;
+    }
+
+    /**
+     * A comma-separated list of node IDs or names to limit the returned
+     * information; use <code>_local</code> to return information from the node
+     * you're connecting to, leave empty to get information from all nodes
+     * <p>
+     * API name: {@code nodes}
+     */
+    public final List<String> nodes() {
+        return this.nodes;
+    }
+
+    /**
+     * Return tasks with specified parent task id (node_id:task_number). Set to -1
+     * to return all.
+     * <p>
+     * API name: {@code parent_task_id}
+     */
+    @Nullable
+    public final String parentTaskId() {
+        return this.parentTaskId;
+    }
+
+    /**
+     * Explicit operation timeout
+     * <p>
+     * API name: {@code timeout}
+     */
+    @Nullable
+    public final Time timeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Wait for the matching tasks to complete (default: false)
+     * <p>
+     * API name: {@code wait_for_completion}
+     */
+    @Nullable
+    public final Boolean waitForCompletion() {
+        return this.waitForCompletion;
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ListRequest}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ListRequest> {
+        @Nullable
+        private List<String> actions;
+
+        @Nullable
+        private Boolean detailed;
+
+        @Nullable
+        private GroupBy groupBy;
+
+        @Nullable
+        private List<String> nodes;
+
+        @Nullable
+        private String parentTaskId;
+
+        @Nullable
+        private Time timeout;
+
+        @Nullable
+        private Boolean waitForCompletion;
+
+        /**
+         * A comma-separated list of actions that should be returned. Leave empty to
+         * return all.
+         * <p>
+         * API name: {@code actions}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>actions</code>.
+         */
+        public final Builder actions(List<String> list) {
+            this.actions = _listAddAll(this.actions, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of actions that should be returned. Leave empty to
+         * return all.
+         * <p>
+         * API name: {@code actions}
+         * <p>
+         * Adds one or more values to <code>actions</code>.
+         */
+        public final Builder actions(String value, String... values) {
+            this.actions = _listAdd(this.actions, value, values);
+            return this;
+        }
+
+        /**
+         * Return detailed task information (default: false)
+         * <p>
+         * API name: {@code detailed}
+         */
+        public final Builder detailed(@Nullable Boolean value) {
+            this.detailed = value;
+            return this;
+        }
+
+        /**
+         * Group tasks by nodes or parent/child relationships
+         * <p>
+         * API name: {@code group_by}
+         */
+        public final Builder groupBy(@Nullable GroupBy value) {
+            this.groupBy = value;
+            return this;
+        }
+
+        /**
+         * A comma-separated list of node IDs or names to limit the returned
+         * information; use <code>_local</code> to return information from the node
+         * you're connecting to, leave empty to get information from all nodes
+         * <p>
+         * API name: {@code nodes}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>nodes</code>.
+         */
+        public final Builder nodes(List<String> list) {
+            this.nodes = _listAddAll(this.nodes, list);
+            return this;
+        }
+
+        /**
+         * A comma-separated list of node IDs or names to limit the returned
+         * information; use <code>_local</code> to return information from the node
+         * you're connecting to, leave empty to get information from all nodes
+         * <p>
+         * API name: {@code nodes}
+         * <p>
+         * Adds one or more values to <code>nodes</code>.
+         */
+        public final Builder nodes(String value, String... values) {
+            this.nodes = _listAdd(this.nodes, value, values);
+            return this;
+        }
+
+        /**
+         * Return tasks with specified parent task id (node_id:task_number). Set to -1
+         * to return all.
+         * <p>
+         * API name: {@code parent_task_id}
+         */
+        public final Builder parentTaskId(@Nullable String value) {
+            this.parentTaskId = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(@Nullable Time value) {
+            this.timeout = value;
+            return this;
+        }
+
+        /**
+         * Explicit operation timeout
+         * <p>
+         * API name: {@code timeout}
+         */
+        public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.timeout(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Wait for the matching tasks to complete (default: false)
+         * <p>
+         * API name: {@code wait_for_completion}
+         */
+        public final Builder waitForCompletion(@Nullable Boolean value) {
+            this.waitForCompletion = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link ListRequest}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ListRequest build() {
+            _checkSingleUse();
+
+            return new ListRequest(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Endpoint "{@code tasks.list}".
+     */
+    public static final Endpoint<ListRequest, ListResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+
+        // Request method
+        request -> {
+            return "GET";
+
+        },
+
+        // Request path
+        request -> {
+            return "/_tasks";
+
+        },
+
+        // Request parameters
+        request -> {
+            Map<String, String> params = new HashMap<>();
+            if (ApiTypeHelper.isDefined(request.nodes)) {
+                params.put("nodes", request.nodes.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.parentTaskId != null) {
+                params.put("parent_task_id", request.parentTaskId);
+            }
+            if (request.detailed != null) {
+                params.put("detailed", String.valueOf(request.detailed));
+            }
+            if (request.groupBy != null) {
+                params.put("group_by", request.groupBy.jsonValue());
+            }
+            if (ApiTypeHelper.isDefined(request.actions)) {
+                params.put("actions", request.actions.stream().map(v -> v).collect(Collectors.joining(",")));
+            }
+            if (request.waitForCompletion != null) {
+                params.put("wait_for_completion", String.valueOf(request.waitForCompletion));
+            }
+            if (request.timeout != null) {
+                params.put("timeout", request.timeout._toJsonString());
+            }
+            return params;
+
+        },
+        SimpleEndpoint.emptyMap(),
+        false,
+        ListResponse._DESERIALIZER
+    );
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/ListResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/ListResponse.java
index 52c745cc08..cad62425c7 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/ListResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/ListResponse.java
@@ -32,261 +32,255 @@
 
 package org.opensearch.client.opensearch.tasks;
 
-import org.opensearch.client.opensearch._types.ErrorCause;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorCause;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: tasks.list.Response
 
-
 @JsonpDeserializable
 public class ListResponse implements JsonpSerializable {
-	private final List<ErrorCause> nodeFailures;
-
-	private final Map<String, TaskExecutingNode> nodes;
-
-	private final Map<String, Info> tasks;
-
-	// ---------------------------------------------------------------------------------------------
-
-	protected ListResponse(AbstractBuilder<?> builder) {
-
-		this.nodeFailures = ApiTypeHelper.unmodifiable(builder.nodeFailures);
-		this.nodes = ApiTypeHelper.unmodifiable(builder.nodes);
-		this.tasks = ApiTypeHelper.unmodifiable(builder.tasks);
-
-	}
-
-	public static ListResponse listResponseOf(Function<Builder, ObjectBuilder<ListResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * API name: {@code node_failures}
-	 */
-	public final List<ErrorCause> nodeFailures() {
-		return this.nodeFailures;
-	}
-
-	/**
-	 * API name: {@code nodes}
-	 */
-	public final Map<String, TaskExecutingNode> nodes() {
-		return this.nodes;
-	}
-
-	/**
-	 * API name: {@code tasks}
-	 */
-	public final Map<String, Info> tasks() {
-		return this.tasks;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.nodeFailures)) {
-			generator.writeKey("node_failures");
-			generator.writeStartArray();
-			for (ErrorCause item0 : this.nodeFailures) {
-				item0.serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.nodes)) {
-			generator.writeKey("nodes");
-			generator.writeStartObject();
-			for (Map.Entry<String, TaskExecutingNode> item0 : this.nodes.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.tasks)) {
-			generator.writeKey("tasks");
-			generator.writeStartObject();
-			for (Map.Entry<String, Info> item0 : this.tasks.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link ListResponse}.
-	 */
-
-	public static class Builder extends ListResponse.AbstractBuilder<Builder> implements ObjectBuilder<ListResponse> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link ListResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public ListResponse build() {
-			_checkSingleUse();
-
-			return new ListResponse(this);
-		}
-	}
-
-	protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				ObjectBuilderBase {
-		@Nullable
-		private List<ErrorCause> nodeFailures;
-
-		@Nullable
-		private Map<String, TaskExecutingNode> nodes;
-
-		@Nullable
-		private Map<String, Info> tasks;
-
-		/**
-		 * API name: {@code node_failures}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>nodeFailures</code>.
-		 */
-		public final BuilderT nodeFailures(List<ErrorCause> list) {
-			this.nodeFailures = _listAddAll(this.nodeFailures, list);
-			return self();
-		}
-
-		/**
-		 * API name: {@code node_failures}
-		 * <p>
-		 * Adds one or more values to <code>nodeFailures</code>.
-		 */
-		public final BuilderT nodeFailures(ErrorCause value, ErrorCause... values) {
-			this.nodeFailures = _listAdd(this.nodeFailures, value, values);
-			return self();
-		}
-
-		/**
-		 * API name: {@code node_failures}
-		 * <p>
-		 * Adds a value to <code>nodeFailures</code> using a builder lambda.
-		 */
-		public final BuilderT nodeFailures(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
-			return nodeFailures(fn.apply(new ErrorCause.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code nodes}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>nodes</code>.
-		 */
-		public final BuilderT nodes(Map<String, TaskExecutingNode> map) {
-			this.nodes = _mapPutAll(this.nodes, map);
-			return self();
-		}
-
-		/**
-		 * API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code>.
-		 */
-		public final BuilderT nodes(String key, TaskExecutingNode value) {
-			this.nodes = _mapPut(this.nodes, key, value);
-			return self();
-		}
-
-		/**
-		 * API name: {@code nodes}
-		 * <p>
-		 * Adds an entry to <code>nodes</code> using a builder lambda.
-		 */
-		public final BuilderT nodes(String key,
-				Function<TaskExecutingNode.Builder, ObjectBuilder<TaskExecutingNode>> fn) {
-			return nodes(key, fn.apply(new TaskExecutingNode.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code tasks}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>tasks</code>.
-		 */
-		public final BuilderT tasks(Map<String, Info> map) {
-			this.tasks = _mapPutAll(this.tasks, map);
-			return self();
-		}
-
-		/**
-		 * API name: {@code tasks}
-		 * <p>
-		 * Adds an entry to <code>tasks</code>.
-		 */
-		public final BuilderT tasks(String key, Info value) {
-			this.tasks = _mapPut(this.tasks, key, value);
-			return self();
-		}
-
-		/**
-		 * API name: {@code tasks}
-		 * <p>
-		 * Adds an entry to <code>tasks</code> using a builder lambda.
-		 */
-		public final BuilderT tasks(String key, Function<Info.Builder, ObjectBuilder<Info>> fn) {
-			return tasks(key, fn.apply(new Info.Builder()).build());
-		}
-
-		protected abstract BuilderT self();
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link ListResponse}
-	 */
-	public static final JsonpDeserializer<ListResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			ListResponse::setupListResponseDeserializer);
-
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupListResponseDeserializer(
-			ObjectDeserializer<BuilderT> op) {
-
-		op.add(AbstractBuilder::nodeFailures, JsonpDeserializer.arrayDeserializer(ErrorCause._DESERIALIZER),
-				"node_failures");
-		op.add(AbstractBuilder::nodes, JsonpDeserializer.stringMapDeserializer(TaskExecutingNode._DESERIALIZER),
-				"nodes");
-		op.add(AbstractBuilder::tasks, JsonpDeserializer.stringMapDeserializer(Info._DESERIALIZER), "tasks");
-
-	}
+    private final List<ErrorCause> nodeFailures;
+
+    private final Map<String, TaskExecutingNode> nodes;
+
+    private final Map<String, Info> tasks;
+
+    // ---------------------------------------------------------------------------------------------
+
+    protected ListResponse(AbstractBuilder<?> builder) {
+
+        this.nodeFailures = ApiTypeHelper.unmodifiable(builder.nodeFailures);
+        this.nodes = ApiTypeHelper.unmodifiable(builder.nodes);
+        this.tasks = ApiTypeHelper.unmodifiable(builder.tasks);
+
+    }
+
+    public static ListResponse listResponseOf(Function<Builder, ObjectBuilder<ListResponse>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * API name: {@code node_failures}
+     */
+    public final List<ErrorCause> nodeFailures() {
+        return this.nodeFailures;
+    }
+
+    /**
+     * API name: {@code nodes}
+     */
+    public final Map<String, TaskExecutingNode> nodes() {
+        return this.nodes;
+    }
+
+    /**
+     * API name: {@code tasks}
+     */
+    public final Map<String, Info> tasks() {
+        return this.tasks;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.nodeFailures)) {
+            generator.writeKey("node_failures");
+            generator.writeStartArray();
+            for (ErrorCause item0 : this.nodeFailures) {
+                item0.serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.nodes)) {
+            generator.writeKey("nodes");
+            generator.writeStartObject();
+            for (Map.Entry<String, TaskExecutingNode> item0 : this.nodes.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.tasks)) {
+            generator.writeKey("tasks");
+            generator.writeStartObject();
+            for (Map.Entry<String, Info> item0 : this.tasks.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link ListResponse}.
+     */
+
+    public static class Builder extends ListResponse.AbstractBuilder<Builder> implements ObjectBuilder<ListResponse> {
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link ListResponse}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public ListResponse build() {
+            _checkSingleUse();
+
+            return new ListResponse(this);
+        }
+    }
+
+    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+        @Nullable
+        private List<ErrorCause> nodeFailures;
+
+        @Nullable
+        private Map<String, TaskExecutingNode> nodes;
+
+        @Nullable
+        private Map<String, Info> tasks;
+
+        /**
+         * API name: {@code node_failures}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>nodeFailures</code>.
+         */
+        public final BuilderT nodeFailures(List<ErrorCause> list) {
+            this.nodeFailures = _listAddAll(this.nodeFailures, list);
+            return self();
+        }
+
+        /**
+         * API name: {@code node_failures}
+         * <p>
+         * Adds one or more values to <code>nodeFailures</code>.
+         */
+        public final BuilderT nodeFailures(ErrorCause value, ErrorCause... values) {
+            this.nodeFailures = _listAdd(this.nodeFailures, value, values);
+            return self();
+        }
+
+        /**
+         * API name: {@code node_failures}
+         * <p>
+         * Adds a value to <code>nodeFailures</code> using a builder lambda.
+         */
+        public final BuilderT nodeFailures(Function<ErrorCause.Builder, ObjectBuilder<ErrorCause>> fn) {
+            return nodeFailures(fn.apply(new ErrorCause.Builder()).build());
+        }
+
+        /**
+         * API name: {@code nodes}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>nodes</code>.
+         */
+        public final BuilderT nodes(Map<String, TaskExecutingNode> map) {
+            this.nodes = _mapPutAll(this.nodes, map);
+            return self();
+        }
+
+        /**
+         * API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code>.
+         */
+        public final BuilderT nodes(String key, TaskExecutingNode value) {
+            this.nodes = _mapPut(this.nodes, key, value);
+            return self();
+        }
+
+        /**
+         * API name: {@code nodes}
+         * <p>
+         * Adds an entry to <code>nodes</code> using a builder lambda.
+         */
+        public final BuilderT nodes(String key, Function<TaskExecutingNode.Builder, ObjectBuilder<TaskExecutingNode>> fn) {
+            return nodes(key, fn.apply(new TaskExecutingNode.Builder()).build());
+        }
+
+        /**
+         * API name: {@code tasks}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>tasks</code>.
+         */
+        public final BuilderT tasks(Map<String, Info> map) {
+            this.tasks = _mapPutAll(this.tasks, map);
+            return self();
+        }
+
+        /**
+         * API name: {@code tasks}
+         * <p>
+         * Adds an entry to <code>tasks</code>.
+         */
+        public final BuilderT tasks(String key, Info value) {
+            this.tasks = _mapPut(this.tasks, key, value);
+            return self();
+        }
+
+        /**
+         * API name: {@code tasks}
+         * <p>
+         * Adds an entry to <code>tasks</code> using a builder lambda.
+         */
+        public final BuilderT tasks(String key, Function<Info.Builder, ObjectBuilder<Info>> fn) {
+            return tasks(key, fn.apply(new Info.Builder()).build());
+        }
+
+        protected abstract BuilderT self();
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link ListResponse}
+     */
+    public static final JsonpDeserializer<ListResponse> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        ListResponse::setupListResponseDeserializer
+    );
+
+    protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupListResponseDeserializer(ObjectDeserializer<BuilderT> op) {
+
+        op.add(AbstractBuilder::nodeFailures, JsonpDeserializer.arrayDeserializer(ErrorCause._DESERIALIZER), "node_failures");
+        op.add(AbstractBuilder::nodes, JsonpDeserializer.stringMapDeserializer(TaskExecutingNode._DESERIALIZER), "nodes");
+        op.add(AbstractBuilder::tasks, JsonpDeserializer.stringMapDeserializer(Info._DESERIALIZER), "tasks");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/OpenSearchTasksAsyncClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/OpenSearchTasksAsyncClient.java
index 764e62a93f..a37ffb494f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/OpenSearchTasksAsyncClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/OpenSearchTasksAsyncClient.java
@@ -32,150 +32,150 @@
 
 package org.opensearch.client.opensearch.tasks;
 
+import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
+import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.TransportOptions;
 import org.opensearch.client.util.ObjectBuilder;
 
-import javax.annotation.Nullable;
-import java.io.IOException;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-
 /**
  * Client for the tasks namespace.
  */
 public class OpenSearchTasksAsyncClient extends ApiClient<OpenSearchTransport, OpenSearchTasksAsyncClient> {
 
-	public OpenSearchTasksAsyncClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchTasksAsyncClient(OpenSearchTransport transport,
-									  @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchTasksAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchTasksAsyncClient(this.transport, transportOptions);
-	}
-
-	// ----- Endpoint: tasks.cancel
-
-	/**
-	 * Cancels a task, if it can be cancelled through an API.
-	 *
-	 *
-	 */
-
-	public CompletableFuture<CancelResponse> cancel(CancelRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CancelRequest, CancelResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CancelRequest, CancelResponse, ErrorResponse>) CancelRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Cancels a task, if it can be cancelled through an API.
-	 *
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CancelRequest}
-	 *
-	 */
-
-	public final CompletableFuture<CancelResponse> cancel(
-			Function<CancelRequest.Builder, ObjectBuilder<CancelRequest>> fn)
-			throws IOException, OpenSearchException {
-		return cancel(fn.apply(new CancelRequest.Builder()).build());
-	}
-
-	/**
-	 * Cancels a task, if it can be cancelled through an API.
-	 *
-	 *
-	 */
-
-	public CompletableFuture<CancelResponse> cancel() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new CancelRequest.Builder().build(), CancelRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: tasks.get
-
-	/**
-	 * Returns information about a task.
-	 *
-	 *
-	 */
-
-	public CompletableFuture<GetTasksResponse> get(GetTasksRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetTasksRequest, GetTasksResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetTasksRequest, GetTasksResponse, ErrorResponse>) GetTasksRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about a task.
-	 *
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetTasksRequest}
-	 *
-	 */
-
-	public final CompletableFuture<GetTasksResponse> get(
-			Function<GetTasksRequest.Builder, ObjectBuilder<GetTasksRequest>> fn)
-			throws IOException, OpenSearchException {
-		return get(fn.apply(new GetTasksRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: tasks.list
-
-	/**
-	 * Returns a list of tasks.
-	 *
-	 *
-	 */
-
-	public CompletableFuture<ListResponse> list(ListRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ListRequest, ListResponse, ErrorResponse> endpoint =
-                (JsonEndpoint<ListRequest, ListResponse, ErrorResponse>) ListRequest._ENDPOINT;
-
-		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns a list of tasks.
-	 *
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ListRequest}
-	 *
-	 */
-
-	public final CompletableFuture<ListResponse> list(Function<ListRequest.Builder, ObjectBuilder<ListRequest>> fn)
-			throws IOException, OpenSearchException {
-		return list(fn.apply(new ListRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns a list of tasks.
-	 *
-	 *
-	 */
-
-	public CompletableFuture<ListResponse> list() throws IOException, OpenSearchException {
-		return this.transport.performRequestAsync(new ListRequest.Builder().build(), ListRequest._ENDPOINT,
-				this.transportOptions);
-	}
+    public OpenSearchTasksAsyncClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchTasksAsyncClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchTasksAsyncClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchTasksAsyncClient(this.transport, transportOptions);
+    }
+
+    // ----- Endpoint: tasks.cancel
+
+    /**
+     * Cancels a task, if it can be cancelled through an API.
+     *
+     *
+     */
+
+    public CompletableFuture<CancelResponse> cancel(CancelRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CancelRequest, CancelResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CancelRequest,
+            CancelResponse,
+            ErrorResponse>) CancelRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Cancels a task, if it can be cancelled through an API.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CancelRequest}
+     *
+     */
+
+    public final CompletableFuture<CancelResponse> cancel(Function<CancelRequest.Builder, ObjectBuilder<CancelRequest>> fn)
+        throws IOException, OpenSearchException {
+        return cancel(fn.apply(new CancelRequest.Builder()).build());
+    }
+
+    /**
+     * Cancels a task, if it can be cancelled through an API.
+     *
+     *
+     */
+
+    public CompletableFuture<CancelResponse> cancel() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new CancelRequest.Builder().build(), CancelRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: tasks.get
+
+    /**
+     * Returns information about a task.
+     *
+     *
+     */
+
+    public CompletableFuture<GetTasksResponse> get(GetTasksRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetTasksRequest, GetTasksResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetTasksRequest,
+            GetTasksResponse,
+            ErrorResponse>) GetTasksRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about a task.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetTasksRequest}
+     *
+     */
+
+    public final CompletableFuture<GetTasksResponse> get(Function<GetTasksRequest.Builder, ObjectBuilder<GetTasksRequest>> fn)
+        throws IOException, OpenSearchException {
+        return get(fn.apply(new GetTasksRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: tasks.list
+
+    /**
+     * Returns a list of tasks.
+     *
+     *
+     */
+
+    public CompletableFuture<ListResponse> list(ListRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ListRequest, ListResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ListRequest,
+            ListResponse,
+            ErrorResponse>) ListRequest._ENDPOINT;
+
+        return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns a list of tasks.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ListRequest}
+     *
+     */
+
+    public final CompletableFuture<ListResponse> list(Function<ListRequest.Builder, ObjectBuilder<ListRequest>> fn) throws IOException,
+        OpenSearchException {
+        return list(fn.apply(new ListRequest.Builder()).build());
+    }
+
+    /**
+     * Returns a list of tasks.
+     *
+     *
+     */
+
+    public CompletableFuture<ListResponse> list() throws IOException, OpenSearchException {
+        return this.transport.performRequestAsync(new ListRequest.Builder().build(), ListRequest._ENDPOINT, this.transportOptions);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/OpenSearchTasksClient.java b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/OpenSearchTasksClient.java
index 8e8024ef52..163c83465b 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/OpenSearchTasksClient.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/OpenSearchTasksClient.java
@@ -32,146 +32,148 @@
 
 package org.opensearch.client.opensearch.tasks;
 
+import java.io.IOException;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.ApiClient;
-import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.transport.JsonEndpoint;
+import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.TransportOptions;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.io.IOException;
-import java.util.function.Function;
-import javax.annotation.Nullable;
-
 /**
  * Client for the tasks namespace.
  */
 public class OpenSearchTasksClient extends ApiClient<OpenSearchTransport, OpenSearchTasksClient> {
 
-	public OpenSearchTasksClient(OpenSearchTransport transport) {
-		super(transport, null);
-	}
-
-	public OpenSearchTasksClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
-		super(transport, transportOptions);
-	}
-
-	@Override
-	public OpenSearchTasksClient withTransportOptions(@Nullable TransportOptions transportOptions) {
-		return new OpenSearchTasksClient(this.transport, transportOptions);
-	}
-
-	// ----- Endpoint: tasks.cancel
-
-	/**
-	 * Cancels a task, if it can be cancelled through an API.
-	 * 
-	 *
-	 */
-
-	public CancelResponse cancel(CancelRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<CancelRequest, CancelResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<CancelRequest, CancelResponse, ErrorResponse>) CancelRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Cancels a task, if it can be cancelled through an API.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link CancelRequest}
-	 *
-	 */
-
-	public final CancelResponse cancel(Function<CancelRequest.Builder, ObjectBuilder<CancelRequest>> fn)
-			throws IOException, OpenSearchException {
-		return cancel(fn.apply(new CancelRequest.Builder()).build());
-	}
-
-	/**
-	 * Cancels a task, if it can be cancelled through an API.
-	 * 
-	 *
-	 */
-
-	public CancelResponse cancel() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new CancelRequest.Builder().build(), CancelRequest._ENDPOINT,
-				this.transportOptions);
-	}
-
-	// ----- Endpoint: tasks.get
-
-	/**
-	 * Returns information about a task.
-	 * 
-	 *
-	 */
-
-	public GetTasksResponse get(GetTasksRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<GetTasksRequest, GetTasksResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<GetTasksRequest, GetTasksResponse, ErrorResponse>) GetTasksRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns information about a task.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link GetTasksRequest}
-	 *
-	 */
-
-	public final GetTasksResponse get(Function<GetTasksRequest.Builder, ObjectBuilder<GetTasksRequest>> fn)
-			throws IOException, OpenSearchException {
-		return get(fn.apply(new GetTasksRequest.Builder()).build());
-	}
-
-	// ----- Endpoint: tasks.list
-
-	/**
-	 * Returns a list of tasks.
-	 * 
-	 *
-	 */
-
-	public ListResponse list(ListRequest request) throws IOException, OpenSearchException {
-		@SuppressWarnings("unchecked")
-		JsonEndpoint<ListRequest, ListResponse, ErrorResponse> endpoint =
-				(JsonEndpoint<ListRequest, ListResponse, ErrorResponse>) ListRequest._ENDPOINT;
-
-		return this.transport.performRequest(request, endpoint, this.transportOptions);
-	}
-
-	/**
-	 * Returns a list of tasks.
-	 * 
-	 * @param fn
-	 *            a function that initializes a builder to create the
-	 *            {@link ListRequest}
-	 *
-	 */
-
-	public final ListResponse list(Function<ListRequest.Builder, ObjectBuilder<ListRequest>> fn)
-			throws IOException, OpenSearchException {
-		return list(fn.apply(new ListRequest.Builder()).build());
-	}
-
-	/**
-	 * Returns a list of tasks.
-	 * 
-	 *
-	 */
-
-	public ListResponse list() throws IOException, OpenSearchException {
-		return this.transport.performRequest(new ListRequest.Builder().build(), ListRequest._ENDPOINT,
-				this.transportOptions);
-	}
+    public OpenSearchTasksClient(OpenSearchTransport transport) {
+        super(transport, null);
+    }
+
+    public OpenSearchTasksClient(OpenSearchTransport transport, @Nullable TransportOptions transportOptions) {
+        super(transport, transportOptions);
+    }
+
+    @Override
+    public OpenSearchTasksClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+        return new OpenSearchTasksClient(this.transport, transportOptions);
+    }
+
+    // ----- Endpoint: tasks.cancel
+
+    /**
+     * Cancels a task, if it can be cancelled through an API.
+     *
+     *
+     */
+
+    public CancelResponse cancel(CancelRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<CancelRequest, CancelResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            CancelRequest,
+            CancelResponse,
+            ErrorResponse>) CancelRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Cancels a task, if it can be cancelled through an API.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link CancelRequest}
+     *
+     */
+
+    public final CancelResponse cancel(Function<CancelRequest.Builder, ObjectBuilder<CancelRequest>> fn) throws IOException,
+        OpenSearchException {
+        return cancel(fn.apply(new CancelRequest.Builder()).build());
+    }
+
+    /**
+     * Cancels a task, if it can be cancelled through an API.
+     *
+     *
+     */
+
+    public CancelResponse cancel() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new CancelRequest.Builder().build(), CancelRequest._ENDPOINT, this.transportOptions);
+    }
+
+    // ----- Endpoint: tasks.get
+
+    /**
+     * Returns information about a task.
+     *
+     *
+     */
+
+    public GetTasksResponse get(GetTasksRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<GetTasksRequest, GetTasksResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            GetTasksRequest,
+            GetTasksResponse,
+            ErrorResponse>) GetTasksRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns information about a task.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link GetTasksRequest}
+     *
+     */
+
+    public final GetTasksResponse get(Function<GetTasksRequest.Builder, ObjectBuilder<GetTasksRequest>> fn) throws IOException,
+        OpenSearchException {
+        return get(fn.apply(new GetTasksRequest.Builder()).build());
+    }
+
+    // ----- Endpoint: tasks.list
+
+    /**
+     * Returns a list of tasks.
+     *
+     *
+     */
+
+    public ListResponse list(ListRequest request) throws IOException, OpenSearchException {
+        @SuppressWarnings("unchecked")
+        JsonEndpoint<ListRequest, ListResponse, ErrorResponse> endpoint = (JsonEndpoint<
+            ListRequest,
+            ListResponse,
+            ErrorResponse>) ListRequest._ENDPOINT;
+
+        return this.transport.performRequest(request, endpoint, this.transportOptions);
+    }
+
+    /**
+     * Returns a list of tasks.
+     *
+     * @param fn
+     *            a function that initializes a builder to create the
+     *            {@link ListRequest}
+     *
+     */
+
+    public final ListResponse list(Function<ListRequest.Builder, ObjectBuilder<ListRequest>> fn) throws IOException, OpenSearchException {
+        return list(fn.apply(new ListRequest.Builder()).build());
+    }
+
+    /**
+     * Returns a list of tasks.
+     *
+     *
+     */
+
+    public ListResponse list() throws IOException, OpenSearchException {
+        return this.transport.performRequest(new ListRequest.Builder().build(), ListRequest._ENDPOINT, this.transportOptions);
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/State.java b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/State.java
index 879da36f33..9bcd9e4121 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/State.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/State.java
@@ -32,6 +32,11 @@
 
 package org.opensearch.client.opensearch.tasks;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,386 +46,385 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: tasks._types.State
 
-
 @JsonpDeserializable
 public class State implements JsonpSerializable {
-	private final String action;
-
-	private final boolean cancellable;
-
-	@Nullable
-	private final String description;
-
-	private final Map<String, List<String>> headers;
-
-	private final long id;
-
-	private final String node;
-
-	@Nullable
-	private final String parentTaskId;
-
-	private final long runningTimeInNanos;
-
-	private final long startTimeInMillis;
-
-	@Nullable
-	private final Status status;
-
-	private final String type;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private State(Builder builder) {
-
-		this.action = ApiTypeHelper.requireNonNull(builder.action, this, "action");
-		this.cancellable = ApiTypeHelper.requireNonNull(builder.cancellable, this, "cancellable");
-		this.description = builder.description;
-		this.headers = ApiTypeHelper.unmodifiableRequired(builder.headers, this, "headers");
-		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
-		this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
-		this.parentTaskId = builder.parentTaskId;
-		this.runningTimeInNanos = ApiTypeHelper.requireNonNull(builder.runningTimeInNanos, this, "runningTimeInNanos");
-		this.startTimeInMillis = ApiTypeHelper.requireNonNull(builder.startTimeInMillis, this, "startTimeInMillis");
-		this.status = builder.status;
-		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
-
-	}
-
-	public static State of(Function<Builder, ObjectBuilder<State>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code action}
-	 */
-	public final String action() {
-		return this.action;
-	}
-
-	/**
-	 * Required - API name: {@code cancellable}
-	 */
-	public final boolean cancellable() {
-		return this.cancellable;
-	}
-
-	/**
-	 * API name: {@code description}
-	 */
-	@Nullable
-	public final String description() {
-		return this.description;
-	}
-
-	/**
-	 * Required - API name: {@code headers}
-	 */
-	public final Map<String, List<String>> headers() {
-		return this.headers;
-	}
-
-	/**
-	 * Required - API name: {@code id}
-	 */
-	public final long id() {
-		return this.id;
-	}
-
-	/**
-	 * Required - API name: {@code node}
-	 */
-	public final String node() {
-		return this.node;
-	}
-
-	/**
-	 * API name: {@code parent_task_id}
-	 */
-	@Nullable
-	public final String parentTaskId() {
-		return this.parentTaskId;
-	}
-
-	/**
-	 * Required - API name: {@code running_time_in_nanos}
-	 */
-	public final long runningTimeInNanos() {
-		return this.runningTimeInNanos;
-	}
-
-	/**
-	 * Required - API name: {@code start_time_in_millis}
-	 */
-	public final long startTimeInMillis() {
-		return this.startTimeInMillis;
-	}
-
-	/**
-	 * API name: {@code status}
-	 */
-	@Nullable
-	public final Status status() {
-		return this.status;
-	}
-
-	/**
-	 * Required - API name: {@code type}
-	 */
-	public final String type() {
-		return this.type;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("action");
-		generator.write(this.action);
-
-		generator.writeKey("cancellable");
-		generator.write(this.cancellable);
-
-		if (this.description != null) {
-			generator.writeKey("description");
-			generator.write(this.description);
-
-		}
-		if (ApiTypeHelper.isDefined(this.headers)) {
-			generator.writeKey("headers");
-			generator.writeStartObject();
-			for (Map.Entry<String, List<String>> item0 : this.headers.entrySet()) {
-				generator.writeKey(item0.getKey());
-				generator.writeStartArray();
-				if (item0.getValue() != null) {
-					for (String item1 : item0.getValue()) {
-						generator.write(item1);
-
-					}
-				}
-				generator.writeEnd();
-
-			}
-			generator.writeEnd();
-
-		}
-		generator.writeKey("id");
-		generator.write(this.id);
-
-		generator.writeKey("node");
-		generator.write(this.node);
-
-		if (this.parentTaskId != null) {
-			generator.writeKey("parent_task_id");
-			generator.write(this.parentTaskId);
-
-		}
-		generator.writeKey("running_time_in_nanos");
-		generator.write(this.runningTimeInNanos);
-
-		generator.writeKey("start_time_in_millis");
-		generator.write(this.startTimeInMillis);
-
-		if (this.status != null) {
-			generator.writeKey("status");
-			this.status.serialize(generator, mapper);
-
-		}
-		generator.writeKey("type");
-		generator.write(this.type);
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link State}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<State> {
-		private String action;
-
-		private Boolean cancellable;
-
-		@Nullable
-		private String description;
-
-		private Map<String, List<String>> headers;
-
-		private Long id;
-
-		private String node;
-
-		@Nullable
-		private String parentTaskId;
-
-		private Long runningTimeInNanos;
-
-		private Long startTimeInMillis;
-
-		@Nullable
-		private Status status;
-
-		private String type;
-
-		/**
-		 * Required - API name: {@code action}
-		 */
-		public final Builder action(String value) {
-			this.action = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code cancellable}
-		 */
-		public final Builder cancellable(boolean value) {
-			this.cancellable = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code description}
-		 */
-		public final Builder description(@Nullable String value) {
-			this.description = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code headers}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>headers</code>.
-		 */
-		public final Builder headers(Map<String, List<String>> map) {
-			this.headers = _mapPutAll(this.headers, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code headers}
-		 * <p>
-		 * Adds an entry to <code>headers</code>.
-		 */
-		public final Builder headers(String key, List<String> value) {
-			this.headers = _mapPut(this.headers, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code id}
-		 */
-		public final Builder id(long value) {
-			this.id = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code node}
-		 */
-		public final Builder node(String value) {
-			this.node = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code parent_task_id}
-		 */
-		public final Builder parentTaskId(@Nullable String value) {
-			this.parentTaskId = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code running_time_in_nanos}
-		 */
-		public final Builder runningTimeInNanos(long value) {
-			this.runningTimeInNanos = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code start_time_in_millis}
-		 */
-		public final Builder startTimeInMillis(long value) {
-			this.startTimeInMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code status}
-		 */
-		public final Builder status(@Nullable Status value) {
-			this.status = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code status}
-		 */
-		public final Builder status(Function<Status.Builder, ObjectBuilder<Status>> fn) {
-			return this.status(fn.apply(new Status.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code type}
-		 */
-		public final Builder type(String value) {
-			this.type = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link State}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public State build() {
-			_checkSingleUse();
-
-			return new State(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link State}
-	 */
-	public static final JsonpDeserializer<State> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			State::setupStateDeserializer);
-
-	protected static void setupStateDeserializer(ObjectDeserializer<State.Builder> op) {
-
-		op.add(Builder::action, JsonpDeserializer.stringDeserializer(), "action");
-		op.add(Builder::cancellable, JsonpDeserializer.booleanDeserializer(), "cancellable");
-		op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
-		op.add(Builder::headers, JsonpDeserializer.stringMapDeserializer(
-				JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer())), "headers");
-		op.add(Builder::id, JsonpDeserializer.longDeserializer(), "id");
-		op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
-		op.add(Builder::parentTaskId, JsonpDeserializer.stringDeserializer(), "parent_task_id");
-		op.add(Builder::runningTimeInNanos, JsonpDeserializer.longDeserializer(), "running_time_in_nanos");
-		op.add(Builder::startTimeInMillis, JsonpDeserializer.longDeserializer(), "start_time_in_millis");
-		op.add(Builder::status, Status._DESERIALIZER, "status");
-		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
-
-	}
+    private final String action;
+
+    private final boolean cancellable;
+
+    @Nullable
+    private final String description;
+
+    private final Map<String, List<String>> headers;
+
+    private final long id;
+
+    private final String node;
+
+    @Nullable
+    private final String parentTaskId;
+
+    private final long runningTimeInNanos;
+
+    private final long startTimeInMillis;
+
+    @Nullable
+    private final Status status;
+
+    private final String type;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private State(Builder builder) {
+
+        this.action = ApiTypeHelper.requireNonNull(builder.action, this, "action");
+        this.cancellable = ApiTypeHelper.requireNonNull(builder.cancellable, this, "cancellable");
+        this.description = builder.description;
+        this.headers = ApiTypeHelper.unmodifiableRequired(builder.headers, this, "headers");
+        this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+        this.node = ApiTypeHelper.requireNonNull(builder.node, this, "node");
+        this.parentTaskId = builder.parentTaskId;
+        this.runningTimeInNanos = ApiTypeHelper.requireNonNull(builder.runningTimeInNanos, this, "runningTimeInNanos");
+        this.startTimeInMillis = ApiTypeHelper.requireNonNull(builder.startTimeInMillis, this, "startTimeInMillis");
+        this.status = builder.status;
+        this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+
+    }
+
+    public static State of(Function<Builder, ObjectBuilder<State>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code action}
+     */
+    public final String action() {
+        return this.action;
+    }
+
+    /**
+     * Required - API name: {@code cancellable}
+     */
+    public final boolean cancellable() {
+        return this.cancellable;
+    }
+
+    /**
+     * API name: {@code description}
+     */
+    @Nullable
+    public final String description() {
+        return this.description;
+    }
+
+    /**
+     * Required - API name: {@code headers}
+     */
+    public final Map<String, List<String>> headers() {
+        return this.headers;
+    }
+
+    /**
+     * Required - API name: {@code id}
+     */
+    public final long id() {
+        return this.id;
+    }
+
+    /**
+     * Required - API name: {@code node}
+     */
+    public final String node() {
+        return this.node;
+    }
+
+    /**
+     * API name: {@code parent_task_id}
+     */
+    @Nullable
+    public final String parentTaskId() {
+        return this.parentTaskId;
+    }
+
+    /**
+     * Required - API name: {@code running_time_in_nanos}
+     */
+    public final long runningTimeInNanos() {
+        return this.runningTimeInNanos;
+    }
+
+    /**
+     * Required - API name: {@code start_time_in_millis}
+     */
+    public final long startTimeInMillis() {
+        return this.startTimeInMillis;
+    }
+
+    /**
+     * API name: {@code status}
+     */
+    @Nullable
+    public final Status status() {
+        return this.status;
+    }
+
+    /**
+     * Required - API name: {@code type}
+     */
+    public final String type() {
+        return this.type;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("action");
+        generator.write(this.action);
+
+        generator.writeKey("cancellable");
+        generator.write(this.cancellable);
+
+        if (this.description != null) {
+            generator.writeKey("description");
+            generator.write(this.description);
+
+        }
+        if (ApiTypeHelper.isDefined(this.headers)) {
+            generator.writeKey("headers");
+            generator.writeStartObject();
+            for (Map.Entry<String, List<String>> item0 : this.headers.entrySet()) {
+                generator.writeKey(item0.getKey());
+                generator.writeStartArray();
+                if (item0.getValue() != null) {
+                    for (String item1 : item0.getValue()) {
+                        generator.write(item1);
+
+                    }
+                }
+                generator.writeEnd();
+
+            }
+            generator.writeEnd();
+
+        }
+        generator.writeKey("id");
+        generator.write(this.id);
+
+        generator.writeKey("node");
+        generator.write(this.node);
+
+        if (this.parentTaskId != null) {
+            generator.writeKey("parent_task_id");
+            generator.write(this.parentTaskId);
+
+        }
+        generator.writeKey("running_time_in_nanos");
+        generator.write(this.runningTimeInNanos);
+
+        generator.writeKey("start_time_in_millis");
+        generator.write(this.startTimeInMillis);
+
+        if (this.status != null) {
+            generator.writeKey("status");
+            this.status.serialize(generator, mapper);
+
+        }
+        generator.writeKey("type");
+        generator.write(this.type);
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link State}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<State> {
+        private String action;
+
+        private Boolean cancellable;
+
+        @Nullable
+        private String description;
+
+        private Map<String, List<String>> headers;
+
+        private Long id;
+
+        private String node;
+
+        @Nullable
+        private String parentTaskId;
+
+        private Long runningTimeInNanos;
+
+        private Long startTimeInMillis;
+
+        @Nullable
+        private Status status;
+
+        private String type;
+
+        /**
+         * Required - API name: {@code action}
+         */
+        public final Builder action(String value) {
+            this.action = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code cancellable}
+         */
+        public final Builder cancellable(boolean value) {
+            this.cancellable = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code description}
+         */
+        public final Builder description(@Nullable String value) {
+            this.description = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code headers}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>headers</code>.
+         */
+        public final Builder headers(Map<String, List<String>> map) {
+            this.headers = _mapPutAll(this.headers, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code headers}
+         * <p>
+         * Adds an entry to <code>headers</code>.
+         */
+        public final Builder headers(String key, List<String> value) {
+            this.headers = _mapPut(this.headers, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code id}
+         */
+        public final Builder id(long value) {
+            this.id = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code node}
+         */
+        public final Builder node(String value) {
+            this.node = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code parent_task_id}
+         */
+        public final Builder parentTaskId(@Nullable String value) {
+            this.parentTaskId = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code running_time_in_nanos}
+         */
+        public final Builder runningTimeInNanos(long value) {
+            this.runningTimeInNanos = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code start_time_in_millis}
+         */
+        public final Builder startTimeInMillis(long value) {
+            this.startTimeInMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code status}
+         */
+        public final Builder status(@Nullable Status value) {
+            this.status = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code status}
+         */
+        public final Builder status(Function<Status.Builder, ObjectBuilder<Status>> fn) {
+            return this.status(fn.apply(new Status.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code type}
+         */
+        public final Builder type(String value) {
+            this.type = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link State}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public State build() {
+            _checkSingleUse();
+
+            return new State(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link State}
+     */
+    public static final JsonpDeserializer<State> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        State::setupStateDeserializer
+    );
+
+    protected static void setupStateDeserializer(ObjectDeserializer<State.Builder> op) {
+
+        op.add(Builder::action, JsonpDeserializer.stringDeserializer(), "action");
+        op.add(Builder::cancellable, JsonpDeserializer.booleanDeserializer(), "cancellable");
+        op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
+        op.add(
+            Builder::headers,
+            JsonpDeserializer.stringMapDeserializer(JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer())),
+            "headers"
+        );
+        op.add(Builder::id, JsonpDeserializer.longDeserializer(), "id");
+        op.add(Builder::node, JsonpDeserializer.stringDeserializer(), "node");
+        op.add(Builder::parentTaskId, JsonpDeserializer.stringDeserializer(), "parent_task_id");
+        op.add(Builder::runningTimeInNanos, JsonpDeserializer.longDeserializer(), "running_time_in_nanos");
+        op.add(Builder::startTimeInMillis, JsonpDeserializer.longDeserializer(), "start_time_in_millis");
+        op.add(Builder::status, Status._DESERIALIZER, "status");
+        op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/Status.java b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/Status.java
index 230eb2492a..59e5ad85ad 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/Status.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/Status.java
@@ -32,559 +32,557 @@
 
 package org.opensearch.client.opensearch.tasks;
 
-import org.opensearch.client.opensearch._types.Retries;
-import org.opensearch.client.opensearch._types.Time;
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.Retries;
+import org.opensearch.client.opensearch._types.Time;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.List;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 // typedef: tasks._types.Status
 
-
 @JsonpDeserializable
 public class Status implements JsonpSerializable {
-	private final long batches;
+    private final long batches;
+
+    @Nullable
+    private final String canceled;
 
-	@Nullable
-	private final String canceled;
+    private final long created;
 
-	private final long created;
+    private final long deleted;
 
-	private final long deleted;
+    private final long noops;
 
-	private final long noops;
+    private final List<String> failures;
 
-	private final List<String> failures;
+    private final float requestsPerSecond;
 
-	private final float requestsPerSecond;
+    private final Retries retries;
 
-	private final Retries retries;
-
-	@Nullable
-	private final Time throttled;
-
-	private final long throttledMillis;
-
-	@Nullable
-	private final Time throttledUntil;
-
-	private final long throttledUntilMillis;
-
-	@Nullable
-	private final Boolean timedOut;
-
-	@Nullable
-	private final Long took;
-
-	private final long total;
-
-	private final long updated;
-
-	private final long versionConflicts;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private Status(Builder builder) {
-
-		this.batches = ApiTypeHelper.requireNonNull(builder.batches, this, "batches");
-		this.canceled = builder.canceled;
-		this.created = ApiTypeHelper.requireNonNull(builder.created, this, "created");
-		this.deleted = ApiTypeHelper.requireNonNull(builder.deleted, this, "deleted");
-		this.noops = ApiTypeHelper.requireNonNull(builder.noops, this, "noops");
-		this.failures = ApiTypeHelper.unmodifiable(builder.failures);
-		this.requestsPerSecond = ApiTypeHelper.requireNonNull(builder.requestsPerSecond, this, "requestsPerSecond");
-		this.retries = ApiTypeHelper.requireNonNull(builder.retries, this, "retries");
-		this.throttled = builder.throttled;
-		this.throttledMillis = ApiTypeHelper.requireNonNull(builder.throttledMillis, this, "throttledMillis");
-		this.throttledUntil = builder.throttledUntil;
-		this.throttledUntilMillis = ApiTypeHelper.requireNonNull(builder.throttledUntilMillis, this,
-				"throttledUntilMillis");
-		this.timedOut = builder.timedOut;
-		this.took = builder.took;
-		this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
-		this.updated = ApiTypeHelper.requireNonNull(builder.updated, this, "updated");
-		this.versionConflicts = ApiTypeHelper.requireNonNull(builder.versionConflicts, this, "versionConflicts");
-
-	}
-
-	public static Status of(Function<Builder, ObjectBuilder<Status>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code batches}
-	 */
-	public final long batches() {
-		return this.batches;
-	}
-
-	/**
-	 * API name: {@code canceled}
-	 */
-	@Nullable
-	public final String canceled() {
-		return this.canceled;
-	}
-
-	/**
-	 * Required - API name: {@code created}
-	 */
-	public final long created() {
-		return this.created;
-	}
-
-	/**
-	 * Required - API name: {@code deleted}
-	 */
-	public final long deleted() {
-		return this.deleted;
-	}
-
-	/**
-	 * Required - API name: {@code noops}
-	 */
-	public final long noops() {
-		return this.noops;
-	}
-
-	/**
-	 * API name: {@code failures}
-	 */
-	public final List<String> failures() {
-		return this.failures;
-	}
-
-	/**
-	 * Required - API name: {@code requests_per_second}
-	 */
-	public final float requestsPerSecond() {
-		return this.requestsPerSecond;
-	}
-
-	/**
-	 * Required - API name: {@code retries}
-	 */
-	public final Retries retries() {
-		return this.retries;
-	}
-
-	/**
-	 * API name: {@code throttled}
-	 */
-	@Nullable
-	public final Time throttled() {
-		return this.throttled;
-	}
-
-	/**
-	 * Required - API name: {@code throttled_millis}
-	 */
-	public final long throttledMillis() {
-		return this.throttledMillis;
-	}
-
-	/**
-	 * API name: {@code throttled_until}
-	 */
-	@Nullable
-	public final Time throttledUntil() {
-		return this.throttledUntil;
-	}
-
-	/**
-	 * Required - API name: {@code throttled_until_millis}
-	 */
-	public final long throttledUntilMillis() {
-		return this.throttledUntilMillis;
-	}
-
-	/**
-	 * API name: {@code timed_out}
-	 */
-	@Nullable
-	public final Boolean timedOut() {
-		return this.timedOut;
-	}
-
-	/**
-	 * API name: {@code took}
-	 */
-	@Nullable
-	public final Long took() {
-		return this.took;
-	}
-
-	/**
-	 * Required - API name: {@code total}
-	 */
-	public final long total() {
-		return this.total;
-	}
-
-	/**
-	 * Required - API name: {@code updated}
-	 */
-	public final long updated() {
-		return this.updated;
-	}
-
-	/**
-	 * Required - API name: {@code version_conflicts}
-	 */
-	public final long versionConflicts() {
-		return this.versionConflicts;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		generator.writeKey("batches");
-		generator.write(this.batches);
-
-		if (this.canceled != null) {
-			generator.writeKey("canceled");
-			generator.write(this.canceled);
-
-		}
-		generator.writeKey("created");
-		generator.write(this.created);
-
-		generator.writeKey("deleted");
-		generator.write(this.deleted);
-
-		generator.writeKey("noops");
-		generator.write(this.noops);
+    @Nullable
+    private final Time throttled;
+
+    private final long throttledMillis;
+
+    @Nullable
+    private final Time throttledUntil;
+
+    private final long throttledUntilMillis;
+
+    @Nullable
+    private final Boolean timedOut;
+
+    @Nullable
+    private final Long took;
+
+    private final long total;
+
+    private final long updated;
+
+    private final long versionConflicts;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private Status(Builder builder) {
+
+        this.batches = ApiTypeHelper.requireNonNull(builder.batches, this, "batches");
+        this.canceled = builder.canceled;
+        this.created = ApiTypeHelper.requireNonNull(builder.created, this, "created");
+        this.deleted = ApiTypeHelper.requireNonNull(builder.deleted, this, "deleted");
+        this.noops = ApiTypeHelper.requireNonNull(builder.noops, this, "noops");
+        this.failures = ApiTypeHelper.unmodifiable(builder.failures);
+        this.requestsPerSecond = ApiTypeHelper.requireNonNull(builder.requestsPerSecond, this, "requestsPerSecond");
+        this.retries = ApiTypeHelper.requireNonNull(builder.retries, this, "retries");
+        this.throttled = builder.throttled;
+        this.throttledMillis = ApiTypeHelper.requireNonNull(builder.throttledMillis, this, "throttledMillis");
+        this.throttledUntil = builder.throttledUntil;
+        this.throttledUntilMillis = ApiTypeHelper.requireNonNull(builder.throttledUntilMillis, this, "throttledUntilMillis");
+        this.timedOut = builder.timedOut;
+        this.took = builder.took;
+        this.total = ApiTypeHelper.requireNonNull(builder.total, this, "total");
+        this.updated = ApiTypeHelper.requireNonNull(builder.updated, this, "updated");
+        this.versionConflicts = ApiTypeHelper.requireNonNull(builder.versionConflicts, this, "versionConflicts");
+
+    }
+
+    public static Status of(Function<Builder, ObjectBuilder<Status>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code batches}
+     */
+    public final long batches() {
+        return this.batches;
+    }
+
+    /**
+     * API name: {@code canceled}
+     */
+    @Nullable
+    public final String canceled() {
+        return this.canceled;
+    }
+
+    /**
+     * Required - API name: {@code created}
+     */
+    public final long created() {
+        return this.created;
+    }
+
+    /**
+     * Required - API name: {@code deleted}
+     */
+    public final long deleted() {
+        return this.deleted;
+    }
+
+    /**
+     * Required - API name: {@code noops}
+     */
+    public final long noops() {
+        return this.noops;
+    }
+
+    /**
+     * API name: {@code failures}
+     */
+    public final List<String> failures() {
+        return this.failures;
+    }
+
+    /**
+     * Required - API name: {@code requests_per_second}
+     */
+    public final float requestsPerSecond() {
+        return this.requestsPerSecond;
+    }
+
+    /**
+     * Required - API name: {@code retries}
+     */
+    public final Retries retries() {
+        return this.retries;
+    }
+
+    /**
+     * API name: {@code throttled}
+     */
+    @Nullable
+    public final Time throttled() {
+        return this.throttled;
+    }
+
+    /**
+     * Required - API name: {@code throttled_millis}
+     */
+    public final long throttledMillis() {
+        return this.throttledMillis;
+    }
+
+    /**
+     * API name: {@code throttled_until}
+     */
+    @Nullable
+    public final Time throttledUntil() {
+        return this.throttledUntil;
+    }
+
+    /**
+     * Required - API name: {@code throttled_until_millis}
+     */
+    public final long throttledUntilMillis() {
+        return this.throttledUntilMillis;
+    }
+
+    /**
+     * API name: {@code timed_out}
+     */
+    @Nullable
+    public final Boolean timedOut() {
+        return this.timedOut;
+    }
+
+    /**
+     * API name: {@code took}
+     */
+    @Nullable
+    public final Long took() {
+        return this.took;
+    }
+
+    /**
+     * Required - API name: {@code total}
+     */
+    public final long total() {
+        return this.total;
+    }
+
+    /**
+     * Required - API name: {@code updated}
+     */
+    public final long updated() {
+        return this.updated;
+    }
+
+    /**
+     * Required - API name: {@code version_conflicts}
+     */
+    public final long versionConflicts() {
+        return this.versionConflicts;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        generator.writeKey("batches");
+        generator.write(this.batches);
+
+        if (this.canceled != null) {
+            generator.writeKey("canceled");
+            generator.write(this.canceled);
+
+        }
+        generator.writeKey("created");
+        generator.write(this.created);
+
+        generator.writeKey("deleted");
+        generator.write(this.deleted);
+
+        generator.writeKey("noops");
+        generator.write(this.noops);
 
-		if (ApiTypeHelper.isDefined(this.failures)) {
-			generator.writeKey("failures");
-			generator.writeStartArray();
-			for (String item0 : this.failures) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
+        if (ApiTypeHelper.isDefined(this.failures)) {
+            generator.writeKey("failures");
+            generator.writeStartArray();
+            for (String item0 : this.failures) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
 
-		}
-		generator.writeKey("requests_per_second");
-		generator.write(this.requestsPerSecond);
+        }
+        generator.writeKey("requests_per_second");
+        generator.write(this.requestsPerSecond);
 
-		generator.writeKey("retries");
-		this.retries.serialize(generator, mapper);
+        generator.writeKey("retries");
+        this.retries.serialize(generator, mapper);
 
-		if (this.throttled != null) {
-			generator.writeKey("throttled");
-			this.throttled.serialize(generator, mapper);
+        if (this.throttled != null) {
+            generator.writeKey("throttled");
+            this.throttled.serialize(generator, mapper);
 
-		}
-		generator.writeKey("throttled_millis");
-		generator.write(this.throttledMillis);
+        }
+        generator.writeKey("throttled_millis");
+        generator.write(this.throttledMillis);
 
-		if (this.throttledUntil != null) {
-			generator.writeKey("throttled_until");
-			this.throttledUntil.serialize(generator, mapper);
+        if (this.throttledUntil != null) {
+            generator.writeKey("throttled_until");
+            this.throttledUntil.serialize(generator, mapper);
 
-		}
-		generator.writeKey("throttled_until_millis");
-		generator.write(this.throttledUntilMillis);
+        }
+        generator.writeKey("throttled_until_millis");
+        generator.write(this.throttledUntilMillis);
 
-		if (this.timedOut != null) {
-			generator.writeKey("timed_out");
-			generator.write(this.timedOut);
-
-		}
-		if (this.took != null) {
-			generator.writeKey("took");
-			generator.write(this.took);
+        if (this.timedOut != null) {
+            generator.writeKey("timed_out");
+            generator.write(this.timedOut);
+
+        }
+        if (this.took != null) {
+            generator.writeKey("took");
+            generator.write(this.took);
 
-		}
-		generator.writeKey("total");
-		generator.write(this.total);
-
-		generator.writeKey("updated");
-		generator.write(this.updated);
-
-		generator.writeKey("version_conflicts");
-		generator.write(this.versionConflicts);
+        }
+        generator.writeKey("total");
+        generator.write(this.total);
+
+        generator.writeKey("updated");
+        generator.write(this.updated);
+
+        generator.writeKey("version_conflicts");
+        generator.write(this.versionConflicts);
 
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link Status}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Status> {
-		private Long batches;
-
-		@Nullable
-		private String canceled;
-
-		private Long created;
-
-		private Long deleted;
-
-		private Long noops;
-
-		@Nullable
-		private List<String> failures;
-
-		private Float requestsPerSecond;
-
-		private Retries retries;
-
-		@Nullable
-		private Time throttled;
-
-		private Long throttledMillis;
-
-		@Nullable
-		private Time throttledUntil;
-
-		private Long throttledUntilMillis;
-
-		@Nullable
-		private Boolean timedOut;
-
-		@Nullable
-		private Long took;
-
-		private Long total;
-
-		private Long updated;
-
-		private Long versionConflicts;
-
-		/**
-		 * Required - API name: {@code batches}
-		 */
-		public final Builder batches(long value) {
-			this.batches = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code canceled}
-		 */
-		public final Builder canceled(@Nullable String value) {
-			this.canceled = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code created}
-		 */
-		public final Builder created(long value) {
-			this.created = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code deleted}
-		 */
-		public final Builder deleted(long value) {
-			this.deleted = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code noops}
-		 */
-		public final Builder noops(long value) {
-			this.noops = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>failures</code>.
-		 */
-		public final Builder failures(List<String> list) {
-			this.failures = _listAddAll(this.failures, list);
-			return this;
-		}
-
-		/**
-		 * API name: {@code failures}
-		 * <p>
-		 * Adds one or more values to <code>failures</code>.
-		 */
-		public final Builder failures(String value, String... values) {
-			this.failures = _listAdd(this.failures, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code requests_per_second}
-		 */
-		public final Builder requestsPerSecond(float value) {
-			this.requestsPerSecond = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code retries}
-		 */
-		public final Builder retries(Retries value) {
-			this.retries = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code retries}
-		 */
-		public final Builder retries(Function<Retries.Builder, ObjectBuilder<Retries>> fn) {
-			return this.retries(fn.apply(new Retries.Builder()).build());
-		}
-
-		/**
-		 * API name: {@code throttled}
-		 */
-		public final Builder throttled(@Nullable Time value) {
-			this.throttled = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code throttled}
-		 */
-		public final Builder throttled(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.throttled(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code throttled_millis}
-		 */
-		public final Builder throttledMillis(long value) {
-			this.throttledMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code throttled_until}
-		 */
-		public final Builder throttledUntil(@Nullable Time value) {
-			this.throttledUntil = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code throttled_until}
-		 */
-		public final Builder throttledUntil(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.throttledUntil(fn.apply(new Time.Builder()).build());
-		}
-
-		/**
-		 * Required - API name: {@code throttled_until_millis}
-		 */
-		public final Builder throttledUntilMillis(long value) {
-			this.throttledUntilMillis = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code timed_out}
-		 */
-		public final Builder timedOut(@Nullable Boolean value) {
-			this.timedOut = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code took}
-		 */
-		public final Builder took(@Nullable Long value) {
-			this.took = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code total}
-		 */
-		public final Builder total(long value) {
-			this.total = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code updated}
-		 */
-		public final Builder updated(long value) {
-			this.updated = value;
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code version_conflicts}
-		 */
-		public final Builder versionConflicts(long value) {
-			this.versionConflicts = value;
-			return this;
-		}
-
-		/**
-		 * Builds a {@link Status}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public Status build() {
-			_checkSingleUse();
-
-			return new Status(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link Status}
-	 */
-	public static final JsonpDeserializer<Status> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			Status::setupStatusDeserializer);
-
-	protected static void setupStatusDeserializer(ObjectDeserializer<Status.Builder> op) {
-
-		op.add(Builder::batches, JsonpDeserializer.longDeserializer(), "batches");
-		op.add(Builder::canceled, JsonpDeserializer.stringDeserializer(), "canceled");
-		op.add(Builder::created, JsonpDeserializer.longDeserializer(), "created");
-		op.add(Builder::deleted, JsonpDeserializer.longDeserializer(), "deleted");
-		op.add(Builder::noops, JsonpDeserializer.longDeserializer(), "noops");
-		op.add(Builder::failures, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
-				"failures");
-		op.add(Builder::requestsPerSecond, JsonpDeserializer.floatDeserializer(), "requests_per_second");
-		op.add(Builder::retries, Retries._DESERIALIZER, "retries");
-		op.add(Builder::throttled, Time._DESERIALIZER, "throttled");
-		op.add(Builder::throttledMillis, JsonpDeserializer.longDeserializer(), "throttled_millis");
-		op.add(Builder::throttledUntil, Time._DESERIALIZER, "throttled_until");
-		op.add(Builder::throttledUntilMillis, JsonpDeserializer.longDeserializer(), "throttled_until_millis");
-		op.add(Builder::timedOut, JsonpDeserializer.booleanDeserializer(), "timed_out");
-		op.add(Builder::took, JsonpDeserializer.longDeserializer(), "took");
-		op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
-		op.add(Builder::updated, JsonpDeserializer.longDeserializer(), "updated");
-		op.add(Builder::versionConflicts, JsonpDeserializer.longDeserializer(), "version_conflicts");
-
-	}
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link Status}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Status> {
+        private Long batches;
+
+        @Nullable
+        private String canceled;
+
+        private Long created;
+
+        private Long deleted;
+
+        private Long noops;
+
+        @Nullable
+        private List<String> failures;
+
+        private Float requestsPerSecond;
+
+        private Retries retries;
+
+        @Nullable
+        private Time throttled;
+
+        private Long throttledMillis;
+
+        @Nullable
+        private Time throttledUntil;
+
+        private Long throttledUntilMillis;
+
+        @Nullable
+        private Boolean timedOut;
+
+        @Nullable
+        private Long took;
+
+        private Long total;
+
+        private Long updated;
+
+        private Long versionConflicts;
+
+        /**
+         * Required - API name: {@code batches}
+         */
+        public final Builder batches(long value) {
+            this.batches = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code canceled}
+         */
+        public final Builder canceled(@Nullable String value) {
+            this.canceled = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code created}
+         */
+        public final Builder created(long value) {
+            this.created = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code deleted}
+         */
+        public final Builder deleted(long value) {
+            this.deleted = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code noops}
+         */
+        public final Builder noops(long value) {
+            this.noops = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>failures</code>.
+         */
+        public final Builder failures(List<String> list) {
+            this.failures = _listAddAll(this.failures, list);
+            return this;
+        }
+
+        /**
+         * API name: {@code failures}
+         * <p>
+         * Adds one or more values to <code>failures</code>.
+         */
+        public final Builder failures(String value, String... values) {
+            this.failures = _listAdd(this.failures, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code requests_per_second}
+         */
+        public final Builder requestsPerSecond(float value) {
+            this.requestsPerSecond = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code retries}
+         */
+        public final Builder retries(Retries value) {
+            this.retries = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code retries}
+         */
+        public final Builder retries(Function<Retries.Builder, ObjectBuilder<Retries>> fn) {
+            return this.retries(fn.apply(new Retries.Builder()).build());
+        }
+
+        /**
+         * API name: {@code throttled}
+         */
+        public final Builder throttled(@Nullable Time value) {
+            this.throttled = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code throttled}
+         */
+        public final Builder throttled(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.throttled(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code throttled_millis}
+         */
+        public final Builder throttledMillis(long value) {
+            this.throttledMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code throttled_until}
+         */
+        public final Builder throttledUntil(@Nullable Time value) {
+            this.throttledUntil = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code throttled_until}
+         */
+        public final Builder throttledUntil(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+            return this.throttledUntil(fn.apply(new Time.Builder()).build());
+        }
+
+        /**
+         * Required - API name: {@code throttled_until_millis}
+         */
+        public final Builder throttledUntilMillis(long value) {
+            this.throttledUntilMillis = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code timed_out}
+         */
+        public final Builder timedOut(@Nullable Boolean value) {
+            this.timedOut = value;
+            return this;
+        }
+
+        /**
+         * API name: {@code took}
+         */
+        public final Builder took(@Nullable Long value) {
+            this.took = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code total}
+         */
+        public final Builder total(long value) {
+            this.total = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code updated}
+         */
+        public final Builder updated(long value) {
+            this.updated = value;
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code version_conflicts}
+         */
+        public final Builder versionConflicts(long value) {
+            this.versionConflicts = value;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Status}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public Status build() {
+            _checkSingleUse();
+
+            return new Status(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link Status}
+     */
+    public static final JsonpDeserializer<Status> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        Status::setupStatusDeserializer
+    );
+
+    protected static void setupStatusDeserializer(ObjectDeserializer<Status.Builder> op) {
+
+        op.add(Builder::batches, JsonpDeserializer.longDeserializer(), "batches");
+        op.add(Builder::canceled, JsonpDeserializer.stringDeserializer(), "canceled");
+        op.add(Builder::created, JsonpDeserializer.longDeserializer(), "created");
+        op.add(Builder::deleted, JsonpDeserializer.longDeserializer(), "deleted");
+        op.add(Builder::noops, JsonpDeserializer.longDeserializer(), "noops");
+        op.add(Builder::failures, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "failures");
+        op.add(Builder::requestsPerSecond, JsonpDeserializer.floatDeserializer(), "requests_per_second");
+        op.add(Builder::retries, Retries._DESERIALIZER, "retries");
+        op.add(Builder::throttled, Time._DESERIALIZER, "throttled");
+        op.add(Builder::throttledMillis, JsonpDeserializer.longDeserializer(), "throttled_millis");
+        op.add(Builder::throttledUntil, Time._DESERIALIZER, "throttled_until");
+        op.add(Builder::throttledUntilMillis, JsonpDeserializer.longDeserializer(), "throttled_until_millis");
+        op.add(Builder::timedOut, JsonpDeserializer.booleanDeserializer(), "timed_out");
+        op.add(Builder::took, JsonpDeserializer.longDeserializer(), "took");
+        op.add(Builder::total, JsonpDeserializer.longDeserializer(), "total");
+        op.add(Builder::updated, JsonpDeserializer.longDeserializer(), "updated");
+        op.add(Builder::versionConflicts, JsonpDeserializer.longDeserializer(), "version_conflicts");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/TaskExecutingNode.java b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/TaskExecutingNode.java
index b3104b6850..3decbb9016 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/TaskExecutingNode.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/TaskExecutingNode.java
@@ -32,131 +32,131 @@
 
 package org.opensearch.client.opensearch.tasks;
 
-import org.opensearch.client.opensearch._types.BaseNode;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.BaseNode;
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
 
 // typedef: tasks._types.TaskExecutingNode
 
-
 @JsonpDeserializable
 public class TaskExecutingNode extends BaseNode {
-	private final Map<String, State> tasks;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private TaskExecutingNode(Builder builder) {
-		super(builder);
-
-		this.tasks = ApiTypeHelper.unmodifiableRequired(builder.tasks, this, "tasks");
-
-	}
-
-	public static TaskExecutingNode of(Function<Builder, ObjectBuilder<TaskExecutingNode>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code tasks}
-	 */
-	public final Map<String, State> tasks() {
-		return this.tasks;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (ApiTypeHelper.isDefined(this.tasks)) {
-			generator.writeKey("tasks");
-			generator.writeStartObject();
-			for (Map.Entry<String, State> item0 : this.tasks.entrySet()) {
-				generator.writeKey(item0.getKey());
-				item0.getValue().serialize(generator, mapper);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link TaskExecutingNode}.
-	 */
-
-	public static class Builder extends BaseNode.AbstractBuilder<Builder> implements ObjectBuilder<TaskExecutingNode> {
-		private Map<String, State> tasks;
-
-		/**
-		 * Required - API name: {@code tasks}
-		 * <p>
-		 * Adds all entries of <code>map</code> to <code>tasks</code>.
-		 */
-		public final Builder tasks(Map<String, State> map) {
-			this.tasks = _mapPutAll(this.tasks, map);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tasks}
-		 * <p>
-		 * Adds an entry to <code>tasks</code>.
-		 */
-		public final Builder tasks(String key, State value) {
-			this.tasks = _mapPut(this.tasks, key, value);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code tasks}
-		 * <p>
-		 * Adds an entry to <code>tasks</code> using a builder lambda.
-		 */
-		public final Builder tasks(String key, Function<State.Builder, ObjectBuilder<State>> fn) {
-			return tasks(key, fn.apply(new State.Builder()).build());
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link TaskExecutingNode}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public TaskExecutingNode build() {
-			_checkSingleUse();
-
-			return new TaskExecutingNode(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link TaskExecutingNode}
-	 */
-	public static final JsonpDeserializer<TaskExecutingNode> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, TaskExecutingNode::setupTaskExecutingNodeDeserializer);
-
-	protected static void setupTaskExecutingNodeDeserializer(ObjectDeserializer<TaskExecutingNode.Builder> op) {
-		BaseNode.setupBaseNodeDeserializer(op);
-		op.add(Builder::tasks, JsonpDeserializer.stringMapDeserializer(State._DESERIALIZER), "tasks");
-
-	}
+    private final Map<String, State> tasks;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private TaskExecutingNode(Builder builder) {
+        super(builder);
+
+        this.tasks = ApiTypeHelper.unmodifiableRequired(builder.tasks, this, "tasks");
+
+    }
+
+    public static TaskExecutingNode of(Function<Builder, ObjectBuilder<TaskExecutingNode>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code tasks}
+     */
+    public final Map<String, State> tasks() {
+        return this.tasks;
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        super.serializeInternal(generator, mapper);
+        if (ApiTypeHelper.isDefined(this.tasks)) {
+            generator.writeKey("tasks");
+            generator.writeStartObject();
+            for (Map.Entry<String, State> item0 : this.tasks.entrySet()) {
+                generator.writeKey(item0.getKey());
+                item0.getValue().serialize(generator, mapper);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link TaskExecutingNode}.
+     */
+
+    public static class Builder extends BaseNode.AbstractBuilder<Builder> implements ObjectBuilder<TaskExecutingNode> {
+        private Map<String, State> tasks;
+
+        /**
+         * Required - API name: {@code tasks}
+         * <p>
+         * Adds all entries of <code>map</code> to <code>tasks</code>.
+         */
+        public final Builder tasks(Map<String, State> map) {
+            this.tasks = _mapPutAll(this.tasks, map);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tasks}
+         * <p>
+         * Adds an entry to <code>tasks</code>.
+         */
+        public final Builder tasks(String key, State value) {
+            this.tasks = _mapPut(this.tasks, key, value);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code tasks}
+         * <p>
+         * Adds an entry to <code>tasks</code> using a builder lambda.
+         */
+        public final Builder tasks(String key, Function<State.Builder, ObjectBuilder<State>> fn) {
+            return tasks(key, fn.apply(new State.Builder()).build());
+        }
+
+        @Override
+        protected Builder self() {
+            return this;
+        }
+
+        /**
+         * Builds a {@link TaskExecutingNode}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public TaskExecutingNode build() {
+            _checkSingleUse();
+
+            return new TaskExecutingNode(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link TaskExecutingNode}
+     */
+    public static final JsonpDeserializer<TaskExecutingNode> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        TaskExecutingNode::setupTaskExecutingNodeDeserializer
+    );
+
+    protected static void setupTaskExecutingNodeDeserializer(ObjectDeserializer<TaskExecutingNode.Builder> op) {
+        BaseNode.setupBaseNodeDeserializer(op);
+        op.add(Builder::tasks, JsonpDeserializer.stringMapDeserializer(State._DESERIALIZER), "tasks");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/watcher/HourAndMinute.java b/java-client/src/main/java/org/opensearch/client/opensearch/watcher/HourAndMinute.java
index f306519849..7df892369a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/watcher/HourAndMinute.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/watcher/HourAndMinute.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.watcher;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.List;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -41,157 +44,155 @@
 import org.opensearch.client.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.ObjectBuilderBase;
-import jakarta.json.stream.JsonGenerator;
-import java.util.List;
-import java.util.function.Function;
 
 // typedef: watcher._types.HourAndMinute
 
-
 @JsonpDeserializable
 public class HourAndMinute implements JsonpSerializable {
-	private final List<Integer> hour;
-
-	private final List<Integer> minute;
-
-	// ---------------------------------------------------------------------------------------------
-
-	private HourAndMinute(Builder builder) {
-
-		this.hour = ApiTypeHelper.unmodifiableRequired(builder.hour, this, "hour");
-		this.minute = ApiTypeHelper.unmodifiableRequired(builder.minute, this, "minute");
-
-	}
-
-	public static HourAndMinute of(Function<Builder, ObjectBuilder<HourAndMinute>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - API name: {@code hour}
-	 */
-	public final List<Integer> hour() {
-		return this.hour;
-	}
-
-	/**
-	 * Required - API name: {@code minute}
-	 */
-	public final List<Integer> minute() {
-		return this.minute;
-	}
-
-	/**
-	 * Serialize this object to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		if (ApiTypeHelper.isDefined(this.hour)) {
-			generator.writeKey("hour");
-			generator.writeStartArray();
-			for (Integer item0 : this.hour) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-		if (ApiTypeHelper.isDefined(this.minute)) {
-			generator.writeKey("minute");
-			generator.writeStartArray();
-			for (Integer item0 : this.minute) {
-				generator.write(item0);
-
-			}
-			generator.writeEnd();
-
-		}
-
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HourAndMinute}.
-	 */
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HourAndMinute> {
-		private List<Integer> hour;
-
-		private List<Integer> minute;
-
-		/**
-		 * Required - API name: {@code hour}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>hour</code>.
-		 */
-		public final Builder hour(List<Integer> list) {
-			this.hour = _listAddAll(this.hour, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code hour}
-		 * <p>
-		 * Adds one or more values to <code>hour</code>.
-		 */
-		public final Builder hour(Integer value, Integer... values) {
-			this.hour = _listAdd(this.hour, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code minute}
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>minute</code>.
-		 */
-		public final Builder minute(List<Integer> list) {
-			this.minute = _listAddAll(this.minute, list);
-			return this;
-		}
-
-		/**
-		 * Required - API name: {@code minute}
-		 * <p>
-		 * Adds one or more values to <code>minute</code>.
-		 */
-		public final Builder minute(Integer value, Integer... values) {
-			this.minute = _listAdd(this.minute, value, values);
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HourAndMinute}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HourAndMinute build() {
-			_checkSingleUse();
-
-			return new HourAndMinute(this);
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Json deserializer for {@link HourAndMinute}
-	 */
-	public static final JsonpDeserializer<HourAndMinute> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			HourAndMinute::setupHourAndMinuteDeserializer);
-
-	protected static void setupHourAndMinuteDeserializer(ObjectDeserializer<HourAndMinute.Builder> op) {
-
-		op.add(Builder::hour, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.integerDeserializer()), "hour");
-		op.add(Builder::minute, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.integerDeserializer()), "minute");
-
-	}
+    private final List<Integer> hour;
+
+    private final List<Integer> minute;
+
+    // ---------------------------------------------------------------------------------------------
+
+    private HourAndMinute(Builder builder) {
+
+        this.hour = ApiTypeHelper.unmodifiableRequired(builder.hour, this, "hour");
+        this.minute = ApiTypeHelper.unmodifiableRequired(builder.minute, this, "minute");
+
+    }
+
+    public static HourAndMinute of(Function<Builder, ObjectBuilder<HourAndMinute>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Required - API name: {@code hour}
+     */
+    public final List<Integer> hour() {
+        return this.hour;
+    }
+
+    /**
+     * Required - API name: {@code minute}
+     */
+    public final List<Integer> minute() {
+        return this.minute;
+    }
+
+    /**
+     * Serialize this object to JSON.
+     */
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        generator.writeStartObject();
+        serializeInternal(generator, mapper);
+        generator.writeEnd();
+    }
+
+    protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+        if (ApiTypeHelper.isDefined(this.hour)) {
+            generator.writeKey("hour");
+            generator.writeStartArray();
+            for (Integer item0 : this.hour) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+        if (ApiTypeHelper.isDefined(this.minute)) {
+            generator.writeKey("minute");
+            generator.writeStartArray();
+            for (Integer item0 : this.minute) {
+                generator.write(item0);
+
+            }
+            generator.writeEnd();
+
+        }
+
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Builder for {@link HourAndMinute}.
+     */
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HourAndMinute> {
+        private List<Integer> hour;
+
+        private List<Integer> minute;
+
+        /**
+         * Required - API name: {@code hour}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>hour</code>.
+         */
+        public final Builder hour(List<Integer> list) {
+            this.hour = _listAddAll(this.hour, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code hour}
+         * <p>
+         * Adds one or more values to <code>hour</code>.
+         */
+        public final Builder hour(Integer value, Integer... values) {
+            this.hour = _listAdd(this.hour, value, values);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code minute}
+         * <p>
+         * Adds all elements of <code>list</code> to <code>minute</code>.
+         */
+        public final Builder minute(List<Integer> list) {
+            this.minute = _listAddAll(this.minute, list);
+            return this;
+        }
+
+        /**
+         * Required - API name: {@code minute}
+         * <p>
+         * Adds one or more values to <code>minute</code>.
+         */
+        public final Builder minute(Integer value, Integer... values) {
+            this.minute = _listAdd(this.minute, value, values);
+            return this;
+        }
+
+        /**
+         * Builds a {@link HourAndMinute}.
+         *
+         * @throws NullPointerException
+         *             if some of the required fields are null.
+         */
+        public HourAndMinute build() {
+            _checkSingleUse();
+
+            return new HourAndMinute(this);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------
+
+    /**
+     * Json deserializer for {@link HourAndMinute}
+     */
+    public static final JsonpDeserializer<HourAndMinute> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        Builder::new,
+        HourAndMinute::setupHourAndMinuteDeserializer
+    );
+
+    protected static void setupHourAndMinuteDeserializer(ObjectDeserializer<HourAndMinute.Builder> op) {
+
+        op.add(Builder::hour, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.integerDeserializer()), "hour");
+        op.add(Builder::minute, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.integerDeserializer()), "minute");
+
+    }
 
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/watcher/TimeOfDay.java b/java-client/src/main/java/org/opensearch/client/opensearch/watcher/TimeOfDay.java
index f88a09a7a9..c2c299a511 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/watcher/TimeOfDay.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/watcher/TimeOfDay.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.watcher;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -42,133 +44,129 @@
 import org.opensearch.client.util.ObjectBuilderBase;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-import java.lang.Object;
-import java.lang.String;
-import java.util.function.Function;
 
 // typedef: watcher._types.TimeOfDay
 
-
 @JsonpDeserializable
 public class TimeOfDay implements TaggedUnion<TimeOfDay.Kind, Object>, JsonpSerializable {
 
-	public enum Kind {
-		Text, HourMinute
-
-	}
-
-	private final Kind _kind;
-	private final Object _value;
-
-	@Override
-	public final Kind _kind() {
-		return _kind;
-	}
-
-	@Override
-	public final Object _get() {
-		return _value;
-	}
-
-	private TimeOfDay(Kind kind, Object value) {
-		this._kind = kind;
-		this._value = value;
-	}
-
-	private TimeOfDay(Builder builder) {
-
-		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
-		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
-
-	}
-
-	public static TimeOfDay of(Function<Builder, ObjectBuilder<TimeOfDay>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Is this variant instance of kind {@code text}?
-	 */
-	public boolean isText() {
-		return _kind == Kind.Text;
-	}
-
-	/**
-	 * Get the {@code text} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code text} kind.
-	 */
-	public String text() {
-		return TaggedUnionUtils.get(this, Kind.Text);
-	}
-
-	/**
-	 * Is this variant instance of kind {@code hour_minute}?
-	 */
-	public boolean isHourMinute() {
-		return _kind == Kind.HourMinute;
-	}
-
-	/**
-	 * Get the {@code hour_minute} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code hour_minute} kind.
-	 */
-	public HourAndMinute hourMinute() {
-		return TaggedUnionUtils.get(this, Kind.HourMinute);
-	}
-
-	@Override
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		if (_value instanceof JsonpSerializable) {
-			((JsonpSerializable) _value).serialize(generator, mapper);
-		} else {
-			switch (_kind) {
-				case Text :
-					generator.write(((String) this._value));
-
-					break;
-			}
-		}
-
-	}
-
-	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TimeOfDay> {
-		private Kind _kind;
-		private Object _value;
-
-		public ObjectBuilder<TimeOfDay> text(String v) {
-			this._kind = Kind.Text;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TimeOfDay> hourMinute(HourAndMinute v) {
-			this._kind = Kind.HourMinute;
-			this._value = v;
-			return this;
-		}
-
-		public ObjectBuilder<TimeOfDay> hourMinute(Function<HourAndMinute.Builder, ObjectBuilder<HourAndMinute>> fn) {
-			return this.hourMinute(fn.apply(new HourAndMinute.Builder()).build());
-		}
-
-		public TimeOfDay build() {
-			_checkSingleUse();
-			return new TimeOfDay(this);
-		}
-
-	}
-
-	private static JsonpDeserializer<TimeOfDay> buildTimeOfDayDeserializer() {
-		return new UnionDeserializer.Builder<TimeOfDay, Kind, Object>(TimeOfDay::new, false)
-				.addMember(Kind.Text, JsonpDeserializer.stringDeserializer())
-				.addMember(Kind.HourMinute, HourAndMinute._DESERIALIZER).build();
-	}
-
-	public static final JsonpDeserializer<TimeOfDay> _DESERIALIZER = JsonpDeserializer
-			.lazy(TimeOfDay::buildTimeOfDayDeserializer);
+    public enum Kind {
+        Text,
+        HourMinute
+
+    }
+
+    private final Kind _kind;
+    private final Object _value;
+
+    @Override
+    public final Kind _kind() {
+        return _kind;
+    }
+
+    @Override
+    public final Object _get() {
+        return _value;
+    }
+
+    private TimeOfDay(Kind kind, Object value) {
+        this._kind = kind;
+        this._value = value;
+    }
+
+    private TimeOfDay(Builder builder) {
+
+        this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+        this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+    }
+
+    public static TimeOfDay of(Function<Builder, ObjectBuilder<TimeOfDay>> fn) {
+        return fn.apply(new Builder()).build();
+    }
+
+    /**
+     * Is this variant instance of kind {@code text}?
+     */
+    public boolean isText() {
+        return _kind == Kind.Text;
+    }
+
+    /**
+     * Get the {@code text} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code text} kind.
+     */
+    public String text() {
+        return TaggedUnionUtils.get(this, Kind.Text);
+    }
+
+    /**
+     * Is this variant instance of kind {@code hour_minute}?
+     */
+    public boolean isHourMinute() {
+        return _kind == Kind.HourMinute;
+    }
+
+    /**
+     * Get the {@code hour_minute} variant value.
+     *
+     * @throws IllegalStateException
+     *             if the current variant is not of the {@code hour_minute} kind.
+     */
+    public HourAndMinute hourMinute() {
+        return TaggedUnionUtils.get(this, Kind.HourMinute);
+    }
+
+    @Override
+    public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+        if (_value instanceof JsonpSerializable) {
+            ((JsonpSerializable) _value).serialize(generator, mapper);
+        } else {
+            switch (_kind) {
+                case Text:
+                    generator.write(((String) this._value));
+
+                    break;
+            }
+        }
+
+    }
+
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TimeOfDay> {
+        private Kind _kind;
+        private Object _value;
+
+        public ObjectBuilder<TimeOfDay> text(String v) {
+            this._kind = Kind.Text;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TimeOfDay> hourMinute(HourAndMinute v) {
+            this._kind = Kind.HourMinute;
+            this._value = v;
+            return this;
+        }
+
+        public ObjectBuilder<TimeOfDay> hourMinute(Function<HourAndMinute.Builder, ObjectBuilder<HourAndMinute>> fn) {
+            return this.hourMinute(fn.apply(new HourAndMinute.Builder()).build());
+        }
+
+        public TimeOfDay build() {
+            _checkSingleUse();
+            return new TimeOfDay(this);
+        }
+
+    }
+
+    private static JsonpDeserializer<TimeOfDay> buildTimeOfDayDeserializer() {
+        return new UnionDeserializer.Builder<TimeOfDay, Kind, Object>(TimeOfDay::new, false).addMember(
+            Kind.Text,
+            JsonpDeserializer.stringDeserializer()
+        ).addMember(Kind.HourMinute, HourAndMinute._DESERIALIZER).build();
+    }
+
+    public static final JsonpDeserializer<TimeOfDay> _DESERIALIZER = JsonpDeserializer.lazy(TimeOfDay::buildTimeOfDayDeserializer);
 }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/watcher/TimeOfDayBuilders.java b/java-client/src/main/java/org/opensearch/client/opensearch/watcher/TimeOfDayBuilders.java
index ffb505a167..ae2ba43b04 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/watcher/TimeOfDayBuilders.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/watcher/TimeOfDayBuilders.java
@@ -37,18 +37,17 @@
  * <p>
  * Variants <code>text</code> are not available here as they don't have a
  * dedicated class. Use {@link TimeOfDay}'s builder for these.
- * 
+ *
  */
 public class TimeOfDayBuilders {
-	private TimeOfDayBuilders() {
-	}
+    private TimeOfDayBuilders() {}
 
-	/**
-	 * Creates a builder for the {@link HourAndMinute hour_minute} {@code TimeOfDay}
-	 * variant.
-	 */
-	public static HourAndMinute.Builder hourMinute() {
-		return new HourAndMinute.Builder();
-	}
+    /**
+     * Creates a builder for the {@link HourAndMinute hour_minute} {@code TimeOfDay}
+     * variant.
+     */
+    public static HourAndMinute.Builder hourMinute() {
+        return new HourAndMinute.Builder();
+    }
 
 }
diff --git a/java-client/src/test/java/org/opensearch/client/documentation/ApiConventionsTest.java b/java-client/src/test/java/org/opensearch/client/documentation/ApiConventionsTest.java
index 867e7d45ef..8d4b2ce9d6 100644
--- a/java-client/src/test/java/org/opensearch/client/documentation/ApiConventionsTest.java
+++ b/java-client/src/test/java/org/opensearch/client/documentation/ApiConventionsTest.java
@@ -32,6 +32,14 @@
 
 package org.opensearch.client.documentation;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
+import org.junit.Assert;
+import org.junit.Test;
 import org.opensearch.client.opensearch.OpenSearchAsyncClient;
 import org.opensearch.client.opensearch.OpenSearchClient;
 import org.opensearch.client.opensearch._types.NodeStatistics;
@@ -46,15 +54,6 @@
 import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.TransportException;
 import org.opensearch.client.util.ApiTypeHelper;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.LogManager;
-import java.util.logging.Logger;
 
 public class ApiConventionsTest extends Assert {
 
diff --git a/java-client/src/test/java/org/opensearch/client/documentation/ConnectingTest.java b/java-client/src/test/java/org/opensearch/client/documentation/ConnectingTest.java
index 22e1583967..16ec98af51 100644
--- a/java-client/src/test/java/org/opensearch/client/documentation/ConnectingTest.java
+++ b/java-client/src/test/java/org/opensearch/client/documentation/ConnectingTest.java
@@ -32,20 +32,20 @@
 
 package org.opensearch.client.documentation;
 
+import org.apache.http.HttpHost;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.opensearch.client.RestClient;
+import org.opensearch.client.json.jackson.JacksonJsonpMapper;
 import org.opensearch.client.opensearch.OpenSearchClient;
 import org.opensearch.client.opensearch.core.SearchResponse;
 import org.opensearch.client.opensearch.core.search.Hit;
-import org.opensearch.client.json.jackson.JacksonJsonpMapper;
 import org.opensearch.client.transport.OpenSearchTransport;
 import org.opensearch.client.transport.rest_client.RestClientTransport;
-import org.apache.http.HttpHost;
-import org.opensearch.client.RestClient;
-import org.junit.Ignore;
-import org.junit.Test;
 
 public class ConnectingTest {
 
-    private static class Product{}
+    private static class Product {}
 
     @Ignore // we don't have a running ES
     @Test
diff --git a/java-client/src/test/java/org/opensearch/client/documentation/FailingTransport.java b/java-client/src/test/java/org/opensearch/client/documentation/FailingTransport.java
index 87d11d4795..07e9215c6f 100644
--- a/java-client/src/test/java/org/opensearch/client/documentation/FailingTransport.java
+++ b/java-client/src/test/java/org/opensearch/client/documentation/FailingTransport.java
@@ -32,14 +32,6 @@
 
 package org.opensearch.client.documentation;
 
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.jsonb.JsonbJsonpMapper;
-import org.opensearch.client.transport.OpenSearchTransport;
-import org.opensearch.client.transport.Endpoint;
-import org.opensearch.client.transport.TransportException;
-import org.opensearch.client.transport.TransportOptions;
-
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
@@ -47,6 +39,13 @@
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
+import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.jsonb.JsonbJsonpMapper;
+import org.opensearch.client.transport.Endpoint;
+import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.transport.TransportException;
+import org.opensearch.client.transport.TransportOptions;
 
 /**
  * A transport implementation that always fails. Used for simple doc sections where we just want to check compilation.
@@ -87,8 +86,11 @@ public <RequestT, ResponseT, ErrorT> ResponseT performRequest(
     }
 
     @Override
-    public <RequestT, ResponseT, ErrorT> CompletableFuture<ResponseT> performRequestAsync(RequestT request, Endpoint<RequestT, ResponseT,
-        ErrorT> endpoint, @Nullable TransportOptions options) {
+    public <RequestT, ResponseT, ErrorT> CompletableFuture<ResponseT> performRequestAsync(
+        RequestT request,
+        Endpoint<RequestT, ResponseT, ErrorT> endpoint,
+        @Nullable TransportOptions options
+    ) {
         CompletableFuture<ResponseT> future = new CompletableFuture<>();
         future.completeExceptionally(new TransportException("Not implemented"));
         return future;
@@ -105,6 +107,5 @@ public TransportOptions options() {
     }
 
     @Override
-    public void close() throws IOException {
-    }
+    public void close() throws IOException {}
 }
diff --git a/java-client/src/test/java/org/opensearch/client/documentation/MigrateHlrcTest.java b/java-client/src/test/java/org/opensearch/client/documentation/MigrateHlrcTest.java
index 27d0529f9f..10e98788a3 100644
--- a/java-client/src/test/java/org/opensearch/client/documentation/MigrateHlrcTest.java
+++ b/java-client/src/test/java/org/opensearch/client/documentation/MigrateHlrcTest.java
@@ -32,21 +32,20 @@
 
 package org.opensearch.client.documentation;
 
-import org.opensearch.client.opensearch.OpenSearchClient;
-import org.opensearch.client.json.jackson.JacksonJsonpMapper;
-import org.opensearch.client.transport.OpenSearchTransport;
-import org.opensearch.client.transport.rest_client.RestClientTransport;
 import org.apache.http.HttpHost;
+import org.junit.Test;
 import org.opensearch.client.RestClient;
 import org.opensearch.client.RestClientBuilder;
-import org.junit.Test;
+import org.opensearch.client.json.jackson.JacksonJsonpMapper;
+import org.opensearch.client.opensearch.OpenSearchClient;
+import org.opensearch.client.transport.OpenSearchTransport;
+import org.opensearch.client.transport.rest_client.RestClientTransport;
 
 public class MigrateHlrcTest {
 
     // Fake HLRC -- we don't want to import it for just one example
     public static class RestHighLevelClient {
-        public RestHighLevelClient(RestClientBuilder builder) {
-        }
+        public RestHighLevelClient(RestClientBuilder builder) {}
 
         public RestClient getLowLevelClient() {
             return null;
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorMethodTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorMethodTest.java
index d81f000d76..538eef9d15 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorMethodTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorMethodTest.java
@@ -10,34 +10,28 @@
 
 import static org.junit.Assert.assertEquals;
 
+import jakarta.json.stream.JsonParser;
 import java.io.StringReader;
 import java.util.Map;
-
+import junit.framework.TestCase;
 import org.junit.Test;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.json.jackson.JacksonJsonpMapper;
 
-import jakarta.json.stream.JsonParser;
-import junit.framework.TestCase;
-
 public class KnnVectorMethodTest {
     @Test
     public void testCreateKnnVectorMethod() {
-        KnnVectorMethod knnVectorMethod = new KnnVectorMethod.Builder()
-                .name("hnsw")
-                .build();
+        KnnVectorMethod knnVectorMethod = new KnnVectorMethod.Builder().name("hnsw").build();
         assertEquals("hnsw", knnVectorMethod.name());
     }
 
     @Test
     public void testCreateKnnVectorMethodWithAll() {
-        KnnVectorMethod knnVectorMethod = new KnnVectorMethod.Builder()
-                .name("hnsw")
-                .spaceType("l2")
-                .engine("nmslib")
-                .parameters(Map.of(
-                        "ef_construction", JsonData.of(128)))
-                .build();
+        KnnVectorMethod knnVectorMethod = new KnnVectorMethod.Builder().name("hnsw")
+            .spaceType("l2")
+            .engine("nmslib")
+            .parameters(Map.of("ef_construction", JsonData.of(128)))
+            .build();
         assertEquals("hnsw", knnVectorMethod.name());
         assertEquals("l2", knnVectorMethod.spaceType());
         assertEquals("nmslib", knnVectorMethod.engine());
@@ -46,8 +40,8 @@ public void testCreateKnnVectorMethodWithAll() {
 
     @Test
     public void testDeserializeKnnVectorMethod() {
-        String jsonString = "{\"name\": \"hnsw\", \"space_type\": \"l2\", \"engine\": \"nmslib\"," +
-            " \"parameters\": {\"ef_construction\": 128, \"m\": 24}}";
+        String jsonString = "{\"name\": \"hnsw\", \"space_type\": \"l2\", \"engine\": \"nmslib\","
+            + " \"parameters\": {\"ef_construction\": 128, \"m\": 24}}";
         StringReader reader = new StringReader(jsonString);
         JacksonJsonpMapper mapper = new JacksonJsonpMapper();
         JsonParser parser = mapper.jsonProvider().createParser(reader);
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorPropertyTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorPropertyTest.java
index 56b300638b..33758a6daa 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorPropertyTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/_types/mapping/KnnVectorPropertyTest.java
@@ -10,48 +10,39 @@
 
 import static junit.framework.TestCase.assertEquals;
 
+import jakarta.json.stream.JsonParser;
 import java.io.StringReader;
-
 import org.junit.Test;
 import org.opensearch.client.json.jackson.JacksonJsonpMapper;
 import org.opensearch.client.util.MissingRequiredPropertyException;
 
-import jakarta.json.stream.JsonParser;
-
 public class KnnVectorPropertyTest {
 
     @Test
     public void testCreateKnnVectorProperty() {
-        KnnVectorProperty knnVectorProperty = new KnnVectorProperty.Builder()
-                .dimension(10)
-                .build();
+        KnnVectorProperty knnVectorProperty = new KnnVectorProperty.Builder().dimension(10).build();
         assertEquals(10, knnVectorProperty.dimension());
     }
 
     @Test
     public void testCreateKnnVectorPropertyWithAllFields() {
-        KnnVectorProperty knnVectorProperty = new KnnVectorProperty.Builder()
-                .dimension(10)
-                .method(new KnnVectorMethod.Builder()
-                        .name("hnsw")
-                        .build()
-                )
-                .build();
+        KnnVectorProperty knnVectorProperty = new KnnVectorProperty.Builder().dimension(10)
+            .method(new KnnVectorMethod.Builder().name("hnsw").build())
+            .build();
         assertEquals(10, knnVectorProperty.dimension());
         assertEquals("hnsw", knnVectorProperty.method().name());
     }
 
     @Test(expected = MissingRequiredPropertyException.class)
     public void testCreateKnnVectorPropertyNoDimension() {
-        new KnnVectorProperty.Builder()
-                .build();
+        new KnnVectorProperty.Builder().build();
     }
 
     @Test
     public void testDeserializeKnnVectorProperty() {
-        String jsonString = "{\"type\": \"knn_vector\", \"dimension\": 4, \"model_id\":" +
-            " \"testModelId\", \"method\": {\"name\": \"hnsw\", \"space_type\": \"l2\"," +
-            " \"engine\": \"nmslib\", \"parameters\": {\"ef_construction\": 128, \"m\": 24}}}";
+        String jsonString = "{\"type\": \"knn_vector\", \"dimension\": 4, \"model_id\":"
+            + " \"testModelId\", \"method\": {\"name\": \"hnsw\", \"space_type\": \"l2\","
+            + " \"engine\": \"nmslib\", \"parameters\": {\"ef_construction\": 128, \"m\": 24}}}";
         StringReader reader = new StringReader(jsonString);
         JacksonJsonpMapper mapper = new JacksonJsonpMapper();
         JsonParser parser = mapper.jsonProvider().createParser(reader);
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/core/DeleteByQueryRequestTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/core/DeleteByQueryRequestTest.java
index 7afa14d9a2..3f2d402e29 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/core/DeleteByQueryRequestTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/core/DeleteByQueryRequestTest.java
@@ -8,17 +8,14 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.Map;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.Map;
-
 public class DeleteByQueryRequestTest extends Assert {
     @Test
     public void testEndpointSlicesAuto() {
-        DeleteByQueryRequest deleteByQueryRequest = DeleteByQueryRequest.of(b -> b
-                .index("test-index")
-                .slices(0L));
+        DeleteByQueryRequest deleteByQueryRequest = DeleteByQueryRequest.of(b -> b.index("test-index").slices(0L));
         Map<String, String> queryParameters = DeleteByQueryRequest._ENDPOINT.queryParameters(deleteByQueryRequest);
         assertTrue("Must have a slices query parameter", queryParameters.containsKey("slices"));
         assertEquals("auto", queryParameters.get("slices"));
@@ -26,9 +23,7 @@ public void testEndpointSlicesAuto() {
 
     @Test
     public void DeleteByQueryRequest() {
-        DeleteByQueryRequest deleteByQueryRequest = DeleteByQueryRequest.of(b -> b
-                .index("test-index")
-                .slices(6L));
+        DeleteByQueryRequest deleteByQueryRequest = DeleteByQueryRequest.of(b -> b.index("test-index").slices(6L));
         Map<String, String> queryParameters = DeleteByQueryRequest._ENDPOINT.queryParameters(deleteByQueryRequest);
         assertTrue("Must have a slices query parameter", queryParameters.containsKey("slices"));
         assertEquals("6", queryParameters.get("slices"));
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/core/ReindexRequestTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/core/ReindexRequestTest.java
index 22fd150b66..fdd8495b3a 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/core/ReindexRequestTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/core/ReindexRequestTest.java
@@ -8,16 +8,14 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.Map;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.Map;
-
 public class ReindexRequestTest extends Assert {
     @Test
     public void testEndpointSlicesAuto() {
-        ReindexRequest reindexRequest = ReindexRequest.of(b -> b
-                .slices(0L));
+        ReindexRequest reindexRequest = ReindexRequest.of(b -> b.slices(0L));
         Map<String, String> queryParameters = ReindexRequest._ENDPOINT.queryParameters(reindexRequest);
         assertTrue("Must have a slices query parameter", queryParameters.containsKey("slices"));
         assertEquals("auto", queryParameters.get("slices"));
@@ -25,8 +23,7 @@ public void testEndpointSlicesAuto() {
 
     @Test
     public void testEndpointSlicesNumber() {
-        ReindexRequest reindexRequest = ReindexRequest.of(b -> b
-                .slices(6L));
+        ReindexRequest reindexRequest = ReindexRequest.of(b -> b.slices(6L));
         Map<String, String> queryParameters = ReindexRequest._ENDPOINT.queryParameters(reindexRequest);
         assertTrue("Must have a slices query parameter", queryParameters.containsKey("slices"));
         assertEquals("6", queryParameters.get("slices"));
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/core/UpdateByQueryRequestTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/core/UpdateByQueryRequestTest.java
index 6883dea8a3..f4148159b6 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/core/UpdateByQueryRequestTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/core/UpdateByQueryRequestTest.java
@@ -8,17 +8,14 @@
 
 package org.opensearch.client.opensearch.core;
 
+import java.util.Map;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.Map;
-
 public class UpdateByQueryRequestTest extends Assert {
     @Test
     public void testEndpointSlicesAuto() {
-        UpdateByQueryRequest updateByQueryRequest = UpdateByQueryRequest.of(b -> b
-                .index("test-index")
-                .slices(0L));
+        UpdateByQueryRequest updateByQueryRequest = UpdateByQueryRequest.of(b -> b.index("test-index").slices(0L));
         Map<String, String> queryParameters = UpdateByQueryRequest._ENDPOINT.queryParameters(updateByQueryRequest);
         assertTrue("Must have a slices query parameter", queryParameters.containsKey("slices"));
         assertEquals("auto", queryParameters.get("slices"));
@@ -26,9 +23,7 @@ public void testEndpointSlicesAuto() {
 
     @Test
     public void testEndpointSlicesNumber() {
-        UpdateByQueryRequest updateByQueryRequest = UpdateByQueryRequest.of(b -> b
-                .index("test-index")
-                .slices(6L));
+        UpdateByQueryRequest updateByQueryRequest = UpdateByQueryRequest.of(b -> b.index("test-index").slices(6L));
         Map<String, String> queryParameters = UpdateByQueryRequest._ENDPOINT.queryParameters(updateByQueryRequest);
         assertTrue("Must have a slices query parameter", queryParameters.containsKey("slices"));
         assertEquals("6", queryParameters.get("slices"));
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/ClientTests.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/ClientTests.java
index 7ac43fc81e..3bcf0aee12 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/ClientTests.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/ClientTests.java
@@ -32,6 +32,9 @@
 
 package org.opensearch.client.opensearch.experiments;
 
+import java.io.IOException;
+import java.util.Collections;
+import org.junit.Test;
 import org.opensearch.client.opensearch.experiments.api.Bar;
 import org.opensearch.client.opensearch.experiments.api.FooRequest;
 import org.opensearch.client.opensearch.experiments.api.FooResponse;
@@ -39,83 +42,55 @@
 import org.opensearch.client.opensearch.experiments.api.query2.TermsQuery;
 import org.opensearch.client.opensearch.experiments.base.Client;
 import org.opensearch.client.transport.Endpoint;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.Collections;
 
 public class ClientTests {
 
-  @Test
-  public void testClient() throws Exception {
+    @Test
+    public void testClient() throws Exception {
 
-    Client client = new Client(){
-      @Override
-      protected <RequestT, ResponseT, ErrorT> ResponseT performRequest(
-          RequestT request, Endpoint<RequestT, ResponseT, ErrorT> endpoint
-      ) throws IOException {
-        // don't care for now, we're testing compilation
-        return null;
-      }
-    };
+        Client client = new Client() {
+            @Override
+            protected <RequestT, ResponseT, ErrorT> ResponseT performRequest(
+                RequestT request,
+                Endpoint<RequestT, ResponseT, ErrorT> endpoint
+            ) throws IOException {
+                // don't care for now, we're testing compilation
+                return null;
+            }
+        };
 
-    client.foo(fb -> fb
-        .name("z")
-        .value(1)
-        .routing("fooo")
-        .query(q -> q
-            .bool(b-> b
-                .add_must(m -> m.terms((TermsQuery) null))
-            )
-            //.terms(tq -> tq.term(""))
-            .meta(Collections.emptyMap())
-        )
-    );
+        client.foo(
+            fb -> fb.name("z")
+                .value(1)
+                .routing("fooo")
+                .query(
+                    q -> q.bool(b -> b.add_must(m -> m.terms((TermsQuery) null)))
+                        // .terms(tq -> tq.term(""))
+                        .meta(Collections.emptyMap())
+                )
+        );
 
-    // Builders everywhere
-    FooResponse r1 = client.foo(
-      FooRequest.builder()
-        .name("z")
-        .value(1)
-        .bar(Bar.builder()
-          .name("Raise the bar")
-          .build()
-        )
-      .build()
-    );
+        // Builders everywhere
+        FooResponse r1 = client.foo(FooRequest.builder().name("z").value(1).bar(Bar.builder().name("Raise the bar").build()).build());
 
-    // Illustrates creating an object outside of the client call
-    TermsQuery filter = TermsQuery.builder()
-      .field("foo")
-      .term("bar")
-      .build();
+        // Illustrates creating an object outside of the client call
+        TermsQuery filter = TermsQuery.builder().field("foo").term("bar").build();
 
-    Query filter2 = new Query.Builder()
-        .terms(t -> t
-            .field("foo")
-            .term("bar")
-        ).build();
+        Query filter2 = new Query.Builder().terms(t -> t.field("foo").term("bar")).build();
 
-    // Fluid lambda-based builders
-    FooResponse r2 = client.foo(f -> f
-      .name("z")
-      .value(1)
-      .bar(bar -> bar
-        .name("Raise the bar")
-      )
-      .query(q -> q
-        .bool(b -> b
-          .add_must(q1 -> q1.terms(filter))
-          .add_must(q1 -> q1
-            .terms(t -> t.field("a").term("b"))
-          )
-          .add_must(q1 -> q1
-            .terms(t -> t.field("a").term("b"))
-          )
-          .minimumShouldMatch(2)
-        )
-      )
-    );
-  }
+        // Fluid lambda-based builders
+        FooResponse r2 = client.foo(
+            f -> f.name("z")
+                .value(1)
+                .bar(bar -> bar.name("Raise the bar"))
+                .query(
+                    q -> q.bool(
+                        b -> b.add_must(q1 -> q1.terms(filter))
+                            .add_must(q1 -> q1.terms(t -> t.field("a").term("b")))
+                            .add_must(q1 -> q1.terms(t -> t.field("a").term("b")))
+                            .minimumShouldMatch(2)
+                    )
+                )
+        );
+    }
 }
-
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/ParsingTests.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/ParsingTests.java
index 6e88290ed2..70a598a805 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/ParsingTests.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/ParsingTests.java
@@ -40,11 +40,11 @@
 import org.opensearch.client.opensearch._types.analysis.TokenFilterDefinition;
 import org.opensearch.client.opensearch._types.analysis.TokenizerBuilders;
 import org.opensearch.client.opensearch._types.analysis.TokenizerDefinition;
-import org.opensearch.client.opensearch.core.TermvectorsResponse;
 import org.opensearch.client.opensearch._types.mapping.FieldMapping;
 import org.opensearch.client.opensearch._types.mapping.Property;
 import org.opensearch.client.opensearch._types.mapping.TermVectorOption;
 import org.opensearch.client.opensearch._types.mapping.TextProperty;
+import org.opensearch.client.opensearch.core.TermvectorsResponse;
 import org.opensearch.client.opensearch.experiments.api.FooRequest;
 import org.opensearch.client.opensearch.indices.GetFieldMappingResponse;
 import org.opensearch.client.opensearch.indices.IndexSettings;
@@ -55,81 +55,76 @@
 
 public class ParsingTests extends ModelTestCase {
 
-  @Test
-  public void testFoo() {
+    @Test
+    public void testFoo() {
+
+        FooRequest foo = FooRequest.builder().name("z").value(1).indices("a", "b", "c").bar(b -> b.name("Raise the bar")).build();
+
+        String str = toJson(foo);
+        assertEquals("{\"name\":\"z\",\"value\":1,\"indices\":[\"a\",\"b\",\"c\"],\"bar\":{\"name\":\"Raise the bar\"}}", str);
+
+        FooRequest foo2 = fromJson(str, FooRequest.parser());
+        assertEquals(foo.name(), foo2.name());
+        assertEquals(foo.value(), foo2.value());
+        assertNull(foo2.size());
+        assertEquals(foo.indices(), foo2.indices());
+        assertEquals("Raise the bar", foo.bar().name());
+    }
+
+    @Test
+    public void testIndexSettingsTranslogOptionsParsing() {
 
-    FooRequest foo = FooRequest.builder()
-            .name("z")
-            .value(1)
-            .indices("a", "b", "c")
-            .bar(b -> b
-                    .name("Raise the bar")
+        var indexSettings = IndexSettings.of(
+            _1 -> _1.translog(
+                Translog.of(tr -> tr.syncInterval(Time.of(t -> t.time("10s"))).durability("async").flushThresholdSize("256mb"))
             )
-            .build();
-
-    String str = toJson(foo);
-    assertEquals("{\"name\":\"z\",\"value\":1,\"indices\":[\"a\",\"b\",\"c\"],\"bar\":{\"name\":\"Raise the bar\"}}", str);
-
-    FooRequest foo2 = fromJson(str, FooRequest.parser());
-    assertEquals(foo.name(), foo2.name());
-    assertEquals(foo.value(), foo2.value());
-    assertNull(foo2.size());
-    assertEquals(foo.indices(), foo2.indices());
-    assertEquals("Raise the bar", foo.bar().name());
-  }
-
-  @Test
-  public void testIndexSettingsTranslogOptionsParsing() {
-
-    var indexSettings = IndexSettings.of(_1 -> _1.translog(Translog.of(tr -> tr
-            .syncInterval(Time.of(t -> t.time("10s")))
-            .durability("async")
-            .flushThresholdSize("256mb"))));
-
-    var str = toJson(indexSettings);
-    assertEquals("{\"translog\":{\"durability\":\"async\",\"flush_threshold_size\":\"256mb\"," +
-            "\"sync_interval\":\"10s\"}}", str);
-
-    IndexSettings deserialized = fromJson(str, IndexSettings._DESERIALIZER);
-    assertEquals(indexSettings.translog().syncInterval().time(), deserialized.translog().syncInterval().time());
-    assertEquals(indexSettings.translog().durability(), deserialized.translog().durability());
-    assertEquals(indexSettings.translog().flushThresholdSize(), deserialized.translog().flushThresholdSize());
-
-    var deprecatedForm = "{\"translog\":{\"sync_interval\":\"10s\"},\"translog.durability\":\"async\",\"translog" +
-            ".flush_threshold_size\":\"256mb\"}";
-    IndexSettings deprecatedDeserialized = fromJson(deprecatedForm, IndexSettings._DESERIALIZER);
-    assertEquals(indexSettings.translog().syncInterval().time(), deprecatedDeserialized.translog().syncInterval().time());
-    assertEquals(indexSettings.translog().durability(), deprecatedDeserialized.translog().durability());
-    assertEquals(indexSettings.translog().flushThresholdSize(), deprecatedDeserialized.translog().flushThresholdSize());
-  }
-
-  @Test
-  public void testIndexSettingsMappingParsing() {
-
-    var mapping = IndexSettingsMapping.of(b -> b
-            .totalFields(d -> d.limit(1L))
-            .depth(d -> d.limit(2L))
-            .nestedFields(d -> d.limit(3L))
-            .nestedObjects(d -> d.limit(4L))
-            .fieldNameLength(d -> d.limit(5L)));
-
-    var str = toJson(mapping);
-    assertEquals("{\"total_fields\":{\"limit\":1},\"depth\":{\"limit\":2},\"nested_fields\":{\"limit\":3}," +
-                 "\"nested_objects\":{\"limit\":4},\"field_name_length\":{\"limit\":5}}", str);
-
-    var deserialized = fromJson(str, IndexSettingsMapping._DESERIALIZER);
-    assertEquals(mapping.totalFields().limit(), deserialized.totalFields().limit());
-    assertEquals(mapping.depth().limit(), deserialized.depth().limit());
-    assertEquals(mapping.nestedFields().limit(), deserialized.nestedFields().limit());
-    assertEquals(mapping.nestedObjects().limit(), deserialized.nestedObjects().limit());
-    assertEquals(mapping.fieldNameLength().limit(), deserialized.fieldNameLength().limit());
-  }
+        );
+
+        var str = toJson(indexSettings);
+        assertEquals("{\"translog\":{\"durability\":\"async\",\"flush_threshold_size\":\"256mb\"," + "\"sync_interval\":\"10s\"}}", str);
+
+        IndexSettings deserialized = fromJson(str, IndexSettings._DESERIALIZER);
+        assertEquals(indexSettings.translog().syncInterval().time(), deserialized.translog().syncInterval().time());
+        assertEquals(indexSettings.translog().durability(), deserialized.translog().durability());
+        assertEquals(indexSettings.translog().flushThresholdSize(), deserialized.translog().flushThresholdSize());
+
+        var deprecatedForm = "{\"translog\":{\"sync_interval\":\"10s\"},\"translog.durability\":\"async\",\"translog"
+            + ".flush_threshold_size\":\"256mb\"}";
+        IndexSettings deprecatedDeserialized = fromJson(deprecatedForm, IndexSettings._DESERIALIZER);
+        assertEquals(indexSettings.translog().syncInterval().time(), deprecatedDeserialized.translog().syncInterval().time());
+        assertEquals(indexSettings.translog().durability(), deprecatedDeserialized.translog().durability());
+        assertEquals(indexSettings.translog().flushThresholdSize(), deprecatedDeserialized.translog().flushThresholdSize());
+    }
+
+    @Test
+    public void testIndexSettingsMappingParsing() {
+
+        var mapping = IndexSettingsMapping.of(
+            b -> b.totalFields(d -> d.limit(1L))
+                .depth(d -> d.limit(2L))
+                .nestedFields(d -> d.limit(3L))
+                .nestedObjects(d -> d.limit(4L))
+                .fieldNameLength(d -> d.limit(5L))
+        );
+
+        var str = toJson(mapping);
+        assertEquals(
+            "{\"total_fields\":{\"limit\":1},\"depth\":{\"limit\":2},\"nested_fields\":{\"limit\":3},"
+                + "\"nested_objects\":{\"limit\":4},\"field_name_length\":{\"limit\":5}}",
+            str
+        );
+
+        var deserialized = fromJson(str, IndexSettingsMapping._DESERIALIZER);
+        assertEquals(mapping.totalFields().limit(), deserialized.totalFields().limit());
+        assertEquals(mapping.depth().limit(), deserialized.depth().limit());
+        assertEquals(mapping.nestedFields().limit(), deserialized.nestedFields().limit());
+        assertEquals(mapping.nestedObjects().limit(), deserialized.nestedObjects().limit());
+        assertEquals(mapping.fieldNameLength().limit(), deserialized.fieldNameLength().limit());
+    }
 
     @Test
     public void testSmartcn_Analyzer() {
-        final Analyzer analyzer = new Analyzer.Builder()
-            .smartcn()
-            .build();
+        final Analyzer analyzer = new Analyzer.Builder().smartcn().build();
 
         assertTrue(analyzer.isSmartcn());
 
@@ -152,23 +147,17 @@ public void testSmartcn_Tokenizer() {
 
     @Test
     public void testSmartcn_StopFilter() {
-        final TokenFilterDefinition analyzer = new TokenFilterDefinition.Builder()
-            .smartcn_stop(b -> b)
-            .build();
+        final TokenFilterDefinition analyzer = new TokenFilterDefinition.Builder().smartcn_stop(b -> b).build();
 
         String str = toJson(analyzer);
         assertEquals("{\"type\":\"smartcn_stop\"}", str);
 
         TokenFilterDefinition analyzer2 = fromJson(str, TokenFilterDefinition._DESERIALIZER);
     }
+
     @Test
     public void testCjk_Analyzer() {
-        final Analyzer analyzer = new Analyzer.Builder()
-            .cjk(b -> b
-                .stopwords(List.of("a", "b", "c"))
-                .stopwordsPath("path")
-            )
-            .build();
+        final Analyzer analyzer = new Analyzer.Builder().cjk(b -> b.stopwords(List.of("a", "b", "c")).stopwordsPath("path")).build();
 
         assertTrue(analyzer.isCjk());
 
@@ -186,52 +175,65 @@ public void testFieldMappingResponse() {
         final String indexName = "indexName";
         final String field1Name = "field1";
         final String field1Analyzer = "my_analyzer";
-        final FieldMapping field1 = FieldMapping.of(fmb -> fmb
-            .fullName(field1Name)
-            .mapping(field1Name, pb -> pb
-                .text(tpb -> tpb
-                    .store(true)
-                    .termVector(TermVectorOption.WithPositionsOffsets)
-                    .analyzer(field1Analyzer)
-                    .positionIncrementGap(10))
-            )
+        final FieldMapping field1 = FieldMapping.of(
+            fmb -> fmb.fullName(field1Name)
+                .mapping(
+                    field1Name,
+                    pb -> pb.text(
+                        tpb -> tpb.store(true)
+                            .termVector(TermVectorOption.WithPositionsOffsets)
+                            .analyzer(field1Analyzer)
+                            .positionIncrementGap(10)
+                    )
+                )
         );
         final String field3Name = "field3";
         // Build aFieldMappingResponse with several fields
-        final GetFieldMappingResponse response = GetFieldMappingResponse.of(b -> b
-            .putResult(indexName, TypeFieldMappings.of(tfmb -> tfmb
-                    .putMappings(field1Name, field1)
-                    .putMappings("field2", fmb -> fmb
-                        .fullName("field2")
-                        .mapping("field2", pb -> pb
-                            .text(tpb -> tpb
-                                .store(true)
-                                .termVector(TermVectorOption.WithPositionsOffsets)
-                                .analyzer("another_analyzer")
-                                .positionIncrementGap(10))
+        final GetFieldMappingResponse response = GetFieldMappingResponse.of(
+            b -> b.putResult(
+                indexName,
+                TypeFieldMappings.of(
+                    tfmb -> tfmb.putMappings(field1Name, field1)
+                        .putMappings(
+                            "field2",
+                            fmb -> fmb.fullName("field2")
+                                .mapping(
+                                    "field2",
+                                    pb -> pb.text(
+                                        tpb -> tpb.store(true)
+                                            .termVector(TermVectorOption.WithPositionsOffsets)
+                                            .analyzer("another_analyzer")
+                                            .positionIncrementGap(10)
+                                    )
+                                )
                         )
-                    )
-                    .putMappings(field3Name, fmb -> fmb
-                        .fullName(field3Name)
-                        .mapping(field3Name, pb -> pb
-                            .text(tpb -> tpb
-                                .store(true)
-                                .termVector(TermVectorOption.WithPositionsOffsets)
-                                .analyzer("this_analyzer")
-                                .positionIncrementGap(10))
+                        .putMappings(
+                            field3Name,
+                            fmb -> fmb.fullName(field3Name)
+                                .mapping(
+                                    field3Name,
+                                    pb -> pb.text(
+                                        tpb -> tpb.store(true)
+                                            .termVector(TermVectorOption.WithPositionsOffsets)
+                                            .analyzer("this_analyzer")
+                                            .positionIncrementGap(10)
+                                    )
+                                )
                         )
-                    )
                 )
             )
         );
         String str = toJson(response);
-        assertEquals("{\"indexName\":{\"mappings\":{\"field1\":{\"full_name\":\"field1\",\"mapping\""
-            +":{\"field1\":{\"type\":\"text\",\"store\":true,\"analyzer\":\"my_analyzer\"," +
-            "\"position_increment_gap\":10,\"term_vector\":\"with_positions_offsets\"}}},"
-            +"\"field3\":{\"full_name\":\"field3\",\"mapping\":{\"field3\":{\"type\":\"text\",\"store\":true," +
-            "\"analyzer\":\"this_analyzer\",\"position_increment_gap\":10,\"term_vector\":\"with_positions_offsets\"}}},"
-            +"\"field2\":{\"full_name\":\"field2\",\"mapping\":{\"field2\":{\"type\":\"text\",\"store\":true,"
-            +"\"analyzer\":\"another_analyzer\",\"position_increment_gap\":10,\"term_vector\":\"with_positions_offsets\"}}}}}}", str);
+        assertEquals(
+            "{\"indexName\":{\"mappings\":{\"field1\":{\"full_name\":\"field1\",\"mapping\""
+                + ":{\"field1\":{\"type\":\"text\",\"store\":true,\"analyzer\":\"my_analyzer\","
+                + "\"position_increment_gap\":10,\"term_vector\":\"with_positions_offsets\"}}},"
+                + "\"field3\":{\"full_name\":\"field3\",\"mapping\":{\"field3\":{\"type\":\"text\",\"store\":true,"
+                + "\"analyzer\":\"this_analyzer\",\"position_increment_gap\":10,\"term_vector\":\"with_positions_offsets\"}}},"
+                + "\"field2\":{\"full_name\":\"field2\",\"mapping\":{\"field2\":{\"type\":\"text\",\"store\":true,"
+                + "\"analyzer\":\"another_analyzer\",\"position_increment_gap\":10,\"term_vector\":\"with_positions_offsets\"}}}}}}",
+            str
+        );
 
         final GetFieldMappingResponse response2 = fromJson(str, GetFieldMappingResponse._DESERIALIZER);
         final TypeFieldMappings typeFieldMappings = response2.get(indexName);
@@ -249,26 +251,25 @@ public void testFieldMappingResponse() {
 
         assertNotNull(mappings.get(field3Name));
     }
- 
+
     @Test
     public void testTermvectorsResponseOptionals() {
         // Build a response without any optionals
-        final TermvectorsResponse response = TermvectorsResponse.of(b -> b
-            .index("index")
-            .id("id")
-            .version(1)
-            .found(true)
-            .took(0)
-            .termVectors("key1", tvb -> tvb
-                .terms("term1", tb -> tb
-                    .score(0.3)
-                )
-            )
+        final TermvectorsResponse response = TermvectorsResponse.of(
+            b -> b.index("index")
+                .id("id")
+                .version(1)
+                .found(true)
+                .took(0)
+                .termVectors("key1", tvb -> tvb.terms("term1", tb -> tb.score(0.3)))
         );
 
         String str = toJson(response);
-        assertEquals("{\"found\":true,\"_id\":\"id\",\"_index\":\"index\","
-            +"\"term_vectors\":{\"key1\":{\"terms\":{\"term1\":{\"score\":0.3}}}},\"took\":0,\"_version\":1}", str);
+        assertEquals(
+            "{\"found\":true,\"_id\":\"id\",\"_index\":\"index\","
+                + "\"term_vectors\":{\"key1\":{\"terms\":{\"term1\":{\"score\":0.3}}}},\"took\":0,\"_version\":1}",
+            str
+        );
 
         final TermvectorsResponse response2 = fromJson(str, TermvectorsResponse._DESERIALIZER);
         assertEquals(response.index(), response2.index());
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/Bar.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/Bar.java
index c8e3347fa5..8388634e92 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/Bar.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/Bar.java
@@ -32,64 +32,63 @@
 
 package org.opensearch.client.opensearch.experiments.api;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import javax.annotation.Nullable;
 
 public class Bar implements JsonpSerializable {
 
-  private final String name;
+    private final String name;
 
-  @Nullable
-  public String name() {
-    return this.name;
-  }
+    @Nullable
+    public String name() {
+        return this.name;
+    }
 
-  public Bar(Bar.Builder builder) {
-    this.name = builder.name;
-  }
+    public Bar(Bar.Builder builder) {
+        this.name = builder.name;
+    }
 
-  @Override
-  public void serialize(JsonGenerator builder, JsonpMapper mapper) {
-    builder.writeStartObject();
-    if (this.name != null) builder.write("name", this.name);
-    builder.writeEnd();
-  }
+    @Override
+    public void serialize(JsonGenerator builder, JsonpMapper mapper) {
+        builder.writeStartObject();
+        if (this.name != null) builder.write("name", this.name);
+        builder.writeEnd();
+    }
 
-  public static Builder builder() {
-    return new Builder();
-  }
+    public static Builder builder() {
+        return new Builder();
+    }
 
-  public static class Builder implements ObjectBuilder<Bar> {
-    private String name;
+    public static class Builder implements ObjectBuilder<Bar> {
+        private String name;
 
-    public Bar.Builder name(@Nullable String name) {
-      this.name = name;
-      return this;
-    }
+        public Bar.Builder name(@Nullable String name) {
+            this.name = name;
+            return this;
+        }
 
-    public Bar build() {
-      return new Bar(this);
+        public Bar build() {
+            return new Bar(this);
+        }
     }
-  }
 
-  private static final JsonpDeserializer<Bar> PARSER;
+    private static final JsonpDeserializer<Bar> PARSER;
 
-  public static JsonpDeserializer<Bar> parser() {
-    return PARSER;
-  }
+    public static JsonpDeserializer<Bar> parser() {
+        return PARSER;
+    }
 
-  static {
-    ObjectDeserializer<Builder> op = new ObjectDeserializer<>(Builder::new);
+    static {
+        ObjectDeserializer<Builder> op = new ObjectDeserializer<>(Builder::new);
 
-    op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
 
-    PARSER = new ObjectBuilderDeserializer<>(op);
-  }
+        PARSER = new ObjectBuilderDeserializer<>(op);
+    }
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/FooOptRequest.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/FooOptRequest.java
index 191c8940b3..b1c15a1396 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/FooOptRequest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/FooOptRequest.java
@@ -32,256 +32,254 @@
 
 package org.opensearch.client.opensearch.experiments.api;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
-import org.opensearch.client.transport.Endpoint;
-import org.opensearch.client.transport.endpoints.SimpleEndpoint;
-import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
+import static java.util.Objects.requireNonNull;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.json.stream.JsonGenerator;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
-
-import static java.util.Objects.requireNonNull;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.transport.Endpoint;
+import org.opensearch.client.transport.endpoints.SimpleEndpoint;
+import org.opensearch.client.util.ObjectBuilder;
 
 // Implementing ToXContent is optional, only if there's a request body
 public class FooOptRequest implements JsonpSerializable {
 
-  //===========================================
-  // Fields and getters
-  //===========================================
-
-  //-------------------------------------------
-  // A required String
-
-  private final String name;
-
-  @Nonnull
-  public final String name() {
-    return this.name;
-  }
-
-  //-------------------------------------------
-  // An optional String
-
-  private final String routing;
-
-  @Nonnull
-  public final Optional<String> routing() {
-    return Optional.ofNullable(this.routing);
-  }
+    // ===========================================
+    // Fields and getters
+    // ===========================================
 
-  //-------------------------------------------
-  // A required primitive type
+    // -------------------------------------------
+    // A required String
 
-  private final int value;
+    private final String name;
 
-  public int value() {
-    return this.value;
-  }
-
-  //-------------------------------------------
-  // An optional primitive type
-  private final OptionalInt size;
-
-  /**
-   * Description for field {@code size}
-   */
-  @Nonnull
-  public final OptionalInt size() {
-    return this.size;
-  }
-
-  //-------------------------------------------
-  // An optional array
-
-  private final List<String> indices;
-
-  @Nonnull
-  public final Optional<List<String>> indices() {
-    return Optional.ofNullable(this.indices);
-  }
-
-  //-------------------------------------------
-  // An optional sub-object
-
-  private final Bar bar;
+    @Nonnull
+    public final String name() {
+        return this.name;
+    }
 
-  @Nonnull
-  public Optional<Bar> bar() {
-    return Optional.ofNullable(this.bar);
-  }
+    // -------------------------------------------
+    // An optional String
 
-  public FooOptRequest(Builder builder) {
-    this.name = builder.name;
-    this.routing = builder.routing;
-    this.value = builder.value;
-    this.size = builder.size == null ? OptionalInt.empty() : OptionalInt.of(builder.size);
-    this.indices = builder.indices;
-    this.bar = builder.bar;
-  }
+    private final String routing;
 
-  //===========================================
-  // Serialization
-  //===========================================
+    @Nonnull
+    public final Optional<String> routing() {
+        return Optional.ofNullable(this.routing);
+    }
 
+    // -------------------------------------------
+    // A required primitive type
 
-  @Override
-  public void serialize(JsonGenerator builder, JsonpMapper mapper) {
-    builder.writeStartObject();
+    private final int value;
 
-    // Classic approach is to use the deserialization field's preferred name:
-    //
-    //   if (buckets.isPresent()) builder.field(INT_FIELD.getPreferredName(), buckets.getAsInt());
-    //
-    // In a generated code context we can use the string constant, which also avoids declaring ParseField if we
-    // only serialize (e.g. requests)
+    public int value() {
+        return this.value;
+    }
 
-    // required field
-    builder.write("name", this.name);
+    // -------------------------------------------
+    // An optional primitive type
+    private final OptionalInt size;
 
-    // optional field
-    if (this.routing != null) builder.write("routing", this.routing);
+    /**
+     * Description for field {@code size}
+     */
+    @Nonnull
+    public final OptionalInt size() {
+        return this.size;
+    }
 
-    // required field
-    builder.write("value", value);
+    // -------------------------------------------
+    // An optional array
 
-    // optional field
-    if (this.size.isPresent()) builder.write("size", this.size.getAsInt());
+    private final List<String> indices;
 
-    // We could just call this and let the builder will handle it by itself with:
-    //
-    //   if (this.indices != null) builder.field("indices", this.indices);
-    //
-    // But the logic is a bit involved (like checking circular dependencies) so we use a more direct implementation:
-    if (this.indices != null) {
-      builder.writeKey("indices").writeStartArray();
-      for (String str : this.indices) builder.write(str);
-      builder.writeEnd();
+    @Nonnull
+    public final Optional<List<String>> indices() {
+        return Optional.ofNullable(this.indices);
     }
 
-    if (this.bar != null) {
-      builder.writeKey("bar");
-      this.bar.serialize(builder, mapper);
-    }
+    // -------------------------------------------
+    // An optional sub-object
 
-    builder.writeEnd();
-  }
-
-  //===========================================
-  // Builder
-  //===========================================
-
-  public static Builder builder() {
-    return new Builder();
-  }
-
-  // Constructor with required fields
-  public static Builder builder(String name, int size) {
-    Builder result = new Builder();
-    result.name(name);
-    result.size(size);
-    return result;
-  }
-
-  public static class Builder implements ObjectBuilder<FooOptRequest> {
-    private String name;
-    private String routing;
-    private int value;
-    private boolean value$isSet = false;
-    private Integer size;
-    private List<String> indices;
-    private Bar bar;
-
-    public final Builder name(@Nonnull String v) {
-      this.name = requireNonNull(v);
-      return this;
-    }
+    private final Bar bar;
 
-    public final Builder routing(@Nullable String v) {
-      this.routing = v;
-      return this;
+    @Nonnull
+    public Optional<Bar> bar() {
+        return Optional.ofNullable(this.bar);
     }
 
-    public final Builder value(int v) {
-      this.value = v;
-      this.value$isSet = true;
-      return this;
+    public FooOptRequest(Builder builder) {
+        this.name = builder.name;
+        this.routing = builder.routing;
+        this.value = builder.value;
+        this.size = builder.size == null ? OptionalInt.empty() : OptionalInt.of(builder.size);
+        this.indices = builder.indices;
+        this.bar = builder.bar;
     }
 
-    public final Builder size(@Nullable Integer v) {
-      this.size = v;
-      return this;
+    // ===========================================
+    // Serialization
+    // ===========================================
+
+    @Override
+    public void serialize(JsonGenerator builder, JsonpMapper mapper) {
+        builder.writeStartObject();
+
+        // Classic approach is to use the deserialization field's preferred name:
+        //
+        // if (buckets.isPresent()) builder.field(INT_FIELD.getPreferredName(), buckets.getAsInt());
+        //
+        // In a generated code context we can use the string constant, which also avoids declaring ParseField if we
+        // only serialize (e.g. requests)
+
+        // required field
+        builder.write("name", this.name);
+
+        // optional field
+        if (this.routing != null) builder.write("routing", this.routing);
+
+        // required field
+        builder.write("value", value);
+
+        // optional field
+        if (this.size.isPresent()) builder.write("size", this.size.getAsInt());
+
+        // We could just call this and let the builder will handle it by itself with:
+        //
+        // if (this.indices != null) builder.field("indices", this.indices);
+        //
+        // But the logic is a bit involved (like checking circular dependencies) so we use a more direct implementation:
+        if (this.indices != null) {
+            builder.writeKey("indices").writeStartArray();
+            for (String str : this.indices)
+                builder.write(str);
+            builder.writeEnd();
+        }
+
+        if (this.bar != null) {
+            builder.writeKey("bar");
+            this.bar.serialize(builder, mapper);
+        }
+
+        builder.writeEnd();
     }
 
-    public final Builder indices(@Nullable List<String> v) {
-      indices = v;
-      return this;
-    }
+    // ===========================================
+    // Builder
+    // ===========================================
 
-    // Convenience variant with varargs
-    public final Builder indices(String... v) {
-      indices = Arrays.asList(v);
-      return this;
+    public static Builder builder() {
+        return new Builder();
     }
 
-    public Builder bar(@Nullable Bar v) {
-      bar = v;
-      return this;
+    // Constructor with required fields
+    public static Builder builder(String name, int size) {
+        Builder result = new Builder();
+        result.name(name);
+        result.size(size);
+        return result;
     }
 
-    public Builder bar(@Nullable Bar.Builder v) {
-      bar = v.build();
-      return this;
+    public static class Builder implements ObjectBuilder<FooOptRequest> {
+        private String name;
+        private String routing;
+        private int value;
+        private boolean value$isSet = false;
+        private Integer size;
+        private List<String> indices;
+        private Bar bar;
+
+        public final Builder name(@Nonnull String v) {
+            this.name = requireNonNull(v);
+            return this;
+        }
+
+        public final Builder routing(@Nullable String v) {
+            this.routing = v;
+            return this;
+        }
+
+        public final Builder value(int v) {
+            this.value = v;
+            this.value$isSet = true;
+            return this;
+        }
+
+        public final Builder size(@Nullable Integer v) {
+            this.size = v;
+            return this;
+        }
+
+        public final Builder indices(@Nullable List<String> v) {
+            indices = v;
+            return this;
+        }
+
+        // Convenience variant with varargs
+        public final Builder indices(String... v) {
+            indices = Arrays.asList(v);
+            return this;
+        }
+
+        public Builder bar(@Nullable Bar v) {
+            bar = v;
+            return this;
+        }
+
+        public Builder bar(@Nullable Bar.Builder v) {
+            bar = v.build();
+            return this;
+        }
+
+        public FooOptRequest build() {
+            requireNonNull(this.name, "Name was not set");
+            requireTrue(this.value$isSet, "Value was not set");
+            return new FooOptRequest(this);
+        }
     }
 
-    public FooOptRequest build() {
-      requireNonNull(this.name, "Name was not set");
-      requireTrue(this.value$isSet, "Value was not set");
-      return new FooOptRequest(this);
-    }
-  }
-
-  //===========================================
-  // Deserialization
-  //===========================================
-
-//  // Only expose the most general interface to hide implementation details that may change over time.
-//  public static final ContextParser<FromXContent.Params, FooOptRequest> PARSER;
-//
-//  static {
-//    ObjectParser<Builder, FromXContent.Params> op =
-//      new ObjectParser<>(FooOptRequest.class.getName(), FooOptRequest.Builder::new);
-//
-//    op.declareString(Builder::name, new ParseField("name"));
-//    op.declareString(Builder::routing, new ParseField("routing"));
-//
-//    op.declareInt(Builder::value, new ParseField("value"));
-//    op.declareInt(Builder::size, new ParseField("size"));
-//
-//    op.declareStringArray(Builder::indices, new ParseField("indices"));
-//    op.declareObject(Builder::bar, Bar.PARSER, new ParseField("bar"));
-//
-//    PARSER = new ObjectBuilderParser<>(op);
-//  }
-
-  public static final Endpoint<FooOptRequest, FooResponse, ErrorResponse> ENDPOINT =
-    new SimpleEndpoint<FooOptRequest, FooResponse>(
-      r -> "POST",
-      r -> "/foo",
-      SimpleEndpoint.emptyMap(),
-      SimpleEndpoint.emptyMap(),
-      true,
-      FooResponse.PARSER
+    // ===========================================
+    // Deserialization
+    // ===========================================
+
+    // // Only expose the most general interface to hide implementation details that may change over time.
+    // public static final ContextParser<FromXContent.Params, FooOptRequest> PARSER;
+    //
+    // static {
+    // ObjectParser<Builder, FromXContent.Params> op =
+    // new ObjectParser<>(FooOptRequest.class.getName(), FooOptRequest.Builder::new);
+    //
+    // op.declareString(Builder::name, new ParseField("name"));
+    // op.declareString(Builder::routing, new ParseField("routing"));
+    //
+    // op.declareInt(Builder::value, new ParseField("value"));
+    // op.declareInt(Builder::size, new ParseField("size"));
+    //
+    // op.declareStringArray(Builder::indices, new ParseField("indices"));
+    // op.declareObject(Builder::bar, Bar.PARSER, new ParseField("bar"));
+    //
+    // PARSER = new ObjectBuilderParser<>(op);
+    // }
+
+    public static final Endpoint<FooOptRequest, FooResponse, ErrorResponse> ENDPOINT = new SimpleEndpoint<FooOptRequest, FooResponse>(
+        r -> "POST",
+        r -> "/foo",
+        SimpleEndpoint.emptyMap(),
+        SimpleEndpoint.emptyMap(),
+        true,
+        FooResponse.PARSER
     ) {
-  };
+    };
 
-  public static void requireTrue(boolean v, String message) {
-    if (!v) throw new IllegalStateException(message);
-  }
+    public static void requireTrue(boolean v, String message) {
+        if (!v) throw new IllegalStateException(message);
+    }
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/FooRequest.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/FooRequest.java
index 6a82a795d3..a23c291c62 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/FooRequest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/FooRequest.java
@@ -32,295 +32,293 @@
 
 package org.opensearch.client.opensearch.experiments.api;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
-import org.opensearch.client.opensearch.experiments.api.query2.Query;
+import static java.util.Objects.requireNonNull;
+
+import jakarta.json.stream.JsonGenerator;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Function;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
+import org.opensearch.client.opensearch.experiments.api.query2.Query;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.Function;
-
-import static java.util.Objects.requireNonNull;
 
 // Implementing ToXContent is optional, only if there's a request body
 public class FooRequest implements JsonpSerializable {
 
-  //===========================================
-  // Fields and getters
-  //===========================================
-
-  //-------------------------------------------
-  // A required String
-
-  private final String name;
-
-  @Nonnull
-  public final String name() {
-    return this.name;
-  }
-
-  //-------------------------------------------
-  // An optional String
+    // ===========================================
+    // Fields and getters
+    // ===========================================
 
-  private final String routing;
+    // -------------------------------------------
+    // A required String
 
-  @Nullable
-  public final String routing() {
-    return this.routing;
-  }
+    private final String name;
 
-  //-------------------------------------------
-  // A required primitive type
-
-  private final int value;
-
-  public int value() {
-    return this.value;
-  }
+    @Nonnull
+    public final String name() {
+        return this.name;
+    }
 
-  //-------------------------------------------
-  // An optional primitive type, represented as a nullable boxed value
+    // -------------------------------------------
+    // An optional String
 
-  private final Integer size;
+    private final String routing;
 
-  /**
-   * Description for field {@code size}
-   */
-  @Nullable
-  public final Integer size() {
-    return this.size;
-  }
+    @Nullable
+    public final String routing() {
+        return this.routing;
+    }
 
-  //-------------------------------------------
-  // An optional array
+    // -------------------------------------------
+    // A required primitive type
 
-  private final List<String> indices;
+    private final int value;
 
-  /**
-   * A string[] property
-   */
-  @Nullable
-  public final List<String> indices() {
-    return this.indices;
-  }
+    public int value() {
+        return this.value;
+    }
 
-  //-------------------------------------------
-  // An optional sub-object
+    // -------------------------------------------
+    // An optional primitive type, represented as a nullable boxed value
 
-  private final Bar bar;
+    private final Integer size;
 
-  @Nullable
-  public Bar bar() {
-    return this.bar;
-  }
+    /**
+     * Description for field {@code size}
+     */
+    @Nullable
+    public final Integer size() {
+        return this.size;
+    }
 
-  //-------------------------------------------
-  // An optional query
+    // -------------------------------------------
+    // An optional array
 
-  private final Query query;
+    private final List<String> indices;
 
-  @Nullable
-  public Query query() {
-    return this.query;
-  }
+    /**
+     * A string[] property
+     */
+    @Nullable
+    public final List<String> indices() {
+        return this.indices;
+    }
 
-  //-------------------------------------------
+    // -------------------------------------------
+    // An optional sub-object
 
-  public FooRequest(Builder builder) {
-    this.name = builder.name;
-    this.routing = builder.routing;
-    this.value = builder.value;
-    this.size = builder.size;
-    this.indices = builder.indices;
-    this.bar = builder.bar;
-    this.query = builder.query;
-  }
+    private final Bar bar;
 
+    @Nullable
+    public Bar bar() {
+        return this.bar;
+    }
 
-  //===========================================
-  // Builder
-  //===========================================
+    // -------------------------------------------
+    // An optional query
 
-  public static class Builder implements ObjectBuilder<FooRequest> {
-    protected String name;
-    protected String routing;
-    protected int value;
-    protected boolean value$isSet = false;
-    protected Integer size;
-    protected List<String> indices;
-    protected Bar bar;
-    protected Query query;
+    private final Query query;
 
-    public final Builder name(@Nonnull String v) {
-      this.name = requireNonNull(v);
-      return this;
+    @Nullable
+    public Query query() {
+        return this.query;
     }
 
-    public final Builder routing(String v) {
-      this.routing = v;
-      return this;
-    }
+    // -------------------------------------------
 
-    public final Builder value(int v) {
-      this.value = v;
-      this.value$isSet = true;
-      return this;
+    public FooRequest(Builder builder) {
+        this.name = builder.name;
+        this.routing = builder.routing;
+        this.value = builder.value;
+        this.size = builder.size;
+        this.indices = builder.indices;
+        this.bar = builder.bar;
+        this.query = builder.query;
     }
 
-    public final Builder size(@Nullable Integer v) {
-      this.size = v;
-      return this;
+    // ===========================================
+    // Builder
+    // ===========================================
+
+    public static class Builder implements ObjectBuilder<FooRequest> {
+        protected String name;
+        protected String routing;
+        protected int value;
+        protected boolean value$isSet = false;
+        protected Integer size;
+        protected List<String> indices;
+        protected Bar bar;
+        protected Query query;
+
+        public final Builder name(@Nonnull String v) {
+            this.name = requireNonNull(v);
+            return this;
+        }
+
+        public final Builder routing(String v) {
+            this.routing = v;
+            return this;
+        }
+
+        public final Builder value(int v) {
+            this.value = v;
+            this.value$isSet = true;
+            return this;
+        }
+
+        public final Builder size(@Nullable Integer v) {
+            this.size = v;
+            return this;
+        }
+
+        public final Builder indices(@Nullable List<String> v) {
+            indices = v;
+            return this;
+        }
+
+        // Convenience variant with varargs
+        public final Builder indices(String... v) {
+            indices = Arrays.asList(v);
+            return this;
+        }
+
+        public Builder bar(@Nullable Bar v) {
+            bar = v;
+            return this;
+        }
+
+        public Builder bar(Function<Bar.Builder, ObjectBuilder<Bar>> b) {
+            return bar(b.apply(new Bar.Builder()).build());
+        }
+
+        public Builder query(Query v) {
+            this.query = v;
+            return this;
+        }
+
+        public Builder query(Function<Query.Builder, ObjectBuilder<Query>> b) {
+            return query(b.apply(new Query.Builder()).build());
+        }
+
+        public FooRequest build() {
+            requireNonNull(this.name, "'name' was not set");
+            requireTrue(this.value$isSet, "'value' was not set");
+            return new FooRequest(this);
+        }
     }
 
-    public final Builder indices(@Nullable List<String> v) {
-      indices = v;
-      return this;
+    public static Builder builder() {
+        return new Builder();
     }
 
-    // Convenience variant with varargs
-    public final Builder indices(String... v) {
-      indices = Arrays.asList(v);
-      return this;
+    // Constructor with required fields
+    public static Builder builder(String name, int size) {
+        Builder result = new Builder();
+        result.name(name);
+        result.size(size);
+        return result;
     }
 
-    public Builder bar(@Nullable Bar v) {
-      bar = v;
-      return this;
+    // ===========================================
+    // Serialization
+    // ===========================================
+
+    @Override
+    public void serialize(JsonGenerator builder, JsonpMapper mapper) {
+        builder.writeStartObject();
+
+        // Classic approach is to use the deserialization field's preferred name:
+        //
+        // if (buckets.isPresent()) builder.field(INT_FIELD.getPreferredName(), buckets.getAsInt());
+        //
+        // In a generated code context we can use the string constant, which also avoids declaring ParseField if we
+        // only serialize (e.g. requests)
+
+        // required field
+        builder.write("name", this.name);
+
+        // optional field
+        if (this.routing != null) builder.write("routing", this.routing);
+
+        // required field
+        builder.write("value", value);
+
+        // optional field
+        if (this.size != null) builder.write("size", this.size.intValue());
+
+        // We could just call this and let the builder will handle it by itself with:
+        //
+        // if (this.indices != null) builder.field("indices", this.indices);
+        //
+        // But the logic is a bit involved (like checking circular dependencies) so we use a more direct implementation:
+        if (this.indices != null) {
+            builder.writeKey("indices").writeStartArray();
+            for (String str : this.indices)
+                builder.write(str);
+            builder.writeEnd();
+        }
+
+        if (this.bar != null) {
+            builder.writeKey("bar");
+            this.bar.serialize(builder, mapper);
+        }
+
+        if (this.query != null) {
+            builder.writeKey("query");
+            this.query.serialize(builder, mapper);
+        }
+
+        builder.writeEnd();
     }
 
-    public Builder bar(Function<Bar.Builder, ObjectBuilder<Bar>> b) {
-      return bar(b.apply(new Bar.Builder()).build());
-    }
+    // ===========================================
+    // Deserialization
+    // (formally not needed for requests)
+    // ===========================================
 
-    public Builder query(Query v) {
-      this.query = v;
-      return this;
-    }
+    private static final JsonpDeserializer<FooRequest> PARSER;
 
-    public Builder query(Function<Query.Builder, ObjectBuilder<Query>> b) {
-      return query(b.apply(new Query.Builder()).build());
+    public static JsonpDeserializer<FooRequest> parser() {
+        return PARSER;
     }
 
-    public FooRequest build() {
-      requireNonNull(this.name, "'name' was not set");
-      requireTrue(this.value$isSet, "'value' was not set");
-      return new FooRequest(this);
-    }
-  }
-
-  public static Builder builder() {
-    return new Builder();
-  }
-
-  // Constructor with required fields
-  public static Builder builder(String name, int size) {
-    Builder result = new Builder();
-    result.name(name);
-    result.size(size);
-    return result;
-  }
-
-  //===========================================
-  // Serialization
-  //===========================================
-
-  @Override
-  public void serialize(JsonGenerator builder, JsonpMapper mapper) {
-    builder.writeStartObject();
-
-    // Classic approach is to use the deserialization field's preferred name:
-    //
-    //   if (buckets.isPresent()) builder.field(INT_FIELD.getPreferredName(), buckets.getAsInt());
-    //
-    // In a generated code context we can use the string constant, which also avoids declaring ParseField if we
-    // only serialize (e.g. requests)
-
-    // required field
-    builder.write("name", this.name);
-
-    // optional field
-    if (this.routing != null) builder.write("routing", this.routing);
-
-    // required field
-    builder.write("value", value);
-
-    // optional field
-    if (this.size != null) builder.write("size", this.size.intValue());
-
-    // We could just call this and let the builder will handle it by itself with:
-    //
-    //   if (this.indices != null) builder.field("indices", this.indices);
-    //
-    // But the logic is a bit involved (like checking circular dependencies) so we use a more direct implementation:
-    if (this.indices != null) {
-      builder.writeKey("indices").writeStartArray();
-      for (String str : this.indices) builder.write(str);
-      builder.writeEnd();
-    }
+    static {
+        ObjectDeserializer<Builder> op = new ObjectDeserializer<>(Builder::new);
 
-    if (this.bar != null) {
-      builder.writeKey("bar");
-      this.bar.serialize(builder, mapper);
-    }
+        op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+        op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
+        op.add(Builder::value, "value"); // primitive type
+        op.add(Builder::size, "size");
+        op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "indices");
+        op.add(Builder::bar, Bar.parser(), "bar");
+        op.add(Builder::query, Query.parser(), "query");
 
-    if (this.query != null) {
-      builder.writeKey("query");
-      this.query.serialize(builder, mapper);
+        PARSER = new ObjectBuilderDeserializer<>(op);
     }
 
-    builder.writeEnd();
-  }
-
-  //===========================================
-  // Deserialization
-  // (formally not needed for requests)
-  //===========================================
-
-  private static final JsonpDeserializer<FooRequest> PARSER;
-
-  public static JsonpDeserializer<FooRequest> parser() {
-    return PARSER;
-  }
-
-  static {
-    ObjectDeserializer<Builder> op = new ObjectDeserializer<>(Builder::new);
-
-    op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-    op.add(Builder::routing, JsonpDeserializer.stringDeserializer(), "routing");
-    op.add(Builder::value, "value"); // primitive type
-    op.add(Builder::size, "size");
-    op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "indices");
-    op.add(Builder::bar, Bar.parser(), "bar");
-    op.add(Builder::query, Query.parser(), "query");
-
-    PARSER = new ObjectBuilderDeserializer<>(op);
-  }
-
-  //===========================================
-  // Endpoint
-  //===========================================
-
-  public static final Endpoint<FooRequest, FooResponse, ErrorResponse> ENDPOINT =
-    new SimpleEndpoint<>(
-      r -> "POST",
-      r -> "/foo",
-      SimpleEndpoint.emptyMap(),
-      SimpleEndpoint.emptyMap(),
-      true,
-      FooResponse.PARSER
+    // ===========================================
+    // Endpoint
+    // ===========================================
+
+    public static final Endpoint<FooRequest, FooResponse, ErrorResponse> ENDPOINT = new SimpleEndpoint<>(
+        r -> "POST",
+        r -> "/foo",
+        SimpleEndpoint.emptyMap(),
+        SimpleEndpoint.emptyMap(),
+        true,
+        FooResponse.PARSER
     );
 
-  public static void requireTrue(boolean v, String message) {
-    if (!v) throw new IllegalStateException(message);
-  }
+    public static void requireTrue(boolean v, String message) {
+        if (!v) throw new IllegalStateException(message);
+    }
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/FooResponse.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/FooResponse.java
index 8b99bec059..fdc2f6aa0c 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/FooResponse.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/FooResponse.java
@@ -36,5 +36,5 @@
 
 public class FooResponse {
 
-  public static JsonpDeserializer<FooResponse> PARSER = null;
+    public static JsonpDeserializer<FooResponse> PARSER = null;
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/BoolQuery.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/BoolQuery.java
index 2f2644d454..7897648ccf 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/BoolQuery.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/BoolQuery.java
@@ -32,18 +32,17 @@
 
 package org.opensearch.client.opensearch.experiments.api.query2;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.function.Function;
 
 public class BoolQuery implements Query.Variant, JsonpSerializable {
 
@@ -81,24 +80,23 @@ public void serialize(JsonGenerator builder, JsonpMapper mapper) {
         if (should != null) {
             builder.writeKey("should");
             builder.writeStartArray();
-            for (Query v: should) v.serialize(builder, mapper);
+            for (Query v : should)
+                v.serialize(builder, mapper);
             builder.writeEnd();
         }
 
         if (should != null) {
             builder.writeKey("must");
             builder.writeStartArray();
-            for (Query v: must) v.serialize(builder, mapper);
+            for (Query v : must)
+                v.serialize(builder, mapper);
             builder.writeEnd();
         }
 
         if (minimumShouldMatch != null) {
             builder.writeKey("minimum_should_match");
             // Unions have to be expanded inline as serialization depends on the value type.
-            this.minimumShouldMatch.serialize(builder, mapper,
-                (v, b, p) -> builder.write(v),
-                (v, b, p) -> builder.write(v)
-            );
+            this.minimumShouldMatch.serialize(builder, mapper, (v, b, p) -> builder.write(v), (v, b, p) -> builder.write(v));
         }
 
         builder.writeEnd();
@@ -175,10 +173,11 @@ public static JsonpDeserializer<BoolQuery> parser() {
         op.add(Builder::must, JsonpDeserializer.arrayDeserializer(Query.parser()), "must");
         op.add(Builder::should, JsonpDeserializer.arrayDeserializer(Query.parser()), "should");
 
-        op.add(Builder::minimumShouldMatch, new Union2.JsonpParser<>(
-            JsonpDeserializer.integerDeserializer(),
-            JsonpDeserializer.stringDeserializer()
-        ), "minimum_should_match");
+        op.add(
+            Builder::minimumShouldMatch,
+            new Union2.JsonpParser<>(JsonpDeserializer.integerDeserializer(), JsonpDeserializer.stringDeserializer()),
+            "minimum_should_match"
+        );
 
         PARSER = new ObjectBuilderDeserializer<>(op);
     }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/Query.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/Query.java
index 762febb710..617d6668a0 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/Query.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/Query.java
@@ -32,21 +32,20 @@
 
 package org.opensearch.client.opensearch.experiments.api.query2;
 
-import org.opensearch.client.opensearch.experiments.UnionVariant;
+import jakarta.json.JsonValue;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Map;
+import java.util.function.Function;
 import org.opensearch.client.json.BuildFunctionDeserializer;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.experiments.UnionVariant;
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.JsonValue;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Map;
-import java.util.function.Function;
 
 public class Query implements TaggedUnion<Query.Kind, Query.Variant>, JsonpSerializable {
 
@@ -127,7 +126,7 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         }
         if (meta != null) {
             generator.writeStartObject("meta");
-            for (Map.Entry<String, JsonValue> e: meta.entrySet()) {
+            for (Map.Entry<String, JsonValue> e : meta.entrySet()) {
                 generator.write(e.getKey(), e.getValue());
             }
             generator.writeEnd();
@@ -214,5 +213,4 @@ public static JsonpDeserializer<Query> parser() {
         return PARSER;
     }
 
-
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/QueryTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/QueryTest.java
index f7e51e4a70..6405ad3d44 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/QueryTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/QueryTest.java
@@ -32,11 +32,10 @@
 
 package org.opensearch.client.opensearch.experiments.api.query2;
 
+import java.util.Collection;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.Collection;
-
 public class QueryTest extends Assert {
     @Test
     public void testQuery() {
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/TermsQuery.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/TermsQuery.java
index f953a040cb..fd1cbd724c 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/TermsQuery.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/TermsQuery.java
@@ -32,13 +32,13 @@
 
 package org.opensearch.client.opensearch.experiments.api.query2;
 
+import jakarta.json.stream.JsonGenerator;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
 
 public class TermsQuery implements JsonpSerializable, Query.Variant {
 
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/Union2.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/Union2.java
index 0f7443b73f..bc9cab27c2 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/Union2.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/Union2.java
@@ -32,14 +32,14 @@
 
 package org.opensearch.client.opensearch.experiments.api.query2;
 
-import org.opensearch.client.json.JsonpDeserializer;
-import org.opensearch.client.json.JsonpDeserializerBase;
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.util.TriConsumer;
 import jakarta.json.stream.JsonGenerator;
 import jakarta.json.stream.JsonParser;
 import jakarta.json.stream.JsonParser.Event;
 import jakarta.json.stream.JsonParsingException;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpDeserializerBase;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.util.TriConsumer;
 
 /**
  * A tagged union (also known as variant, sum type or coproduct) with two members.
@@ -56,112 +56,113 @@
 
 public class Union2<A, B> {
 
-  /**
-   * The variant tag.
-   */
-  public enum Tag{A, B};
-
-  private final Tag tag;
-  private final Object value;
-
-  private Union2(Tag tag, Object value) {
-    this.tag = tag;
-    this.value = value;
-  }
-
-  /**
-   * Creates a variant {@code A}.
-   */
-  public static <A, B> Union2<A, B> ofA(A value) {
-    return new Union2<>(Tag.A, value);
-  }
-
-  /**
-   * Creates a variant {@code B}.
-   */
-  public static <A, B> Union2<A, B> ofB(B value) {
-    return new Union2<>(Tag.B, value);
-  }
-
-  /**
-   * Get the variant's tag of this union.
-   *
-   * @return the variant's tag
-   */
-  public Tag tag() {
-    return tag;
-  }
-
-  /**
-   * Get the variant {@code A} of this union.
-   *
-   * @return the variant's value
-   * @throws IllegalStateException if the union is not holding a variant {@code A}
-   */
-  public A a() {
-    return getVariant(Tag.A);
-  }
-
-  /**
-   * Get the variant {@code B} of this union.
-   *
-   * @return the variant's value
-   * @throws IllegalStateException if the union is not holding a variant {@code B}
-   */
-  public B b() {
-    return getVariant(Tag.B);
-  }
-
-  private <T> T getVariant(Tag tag) {
-    if (this.tag != tag) throw new IllegalStateException("Union holds variant " + tag);
-
-    @SuppressWarnings("unchecked")
-    T result = (T)value;
-
-    return result;
-  }
-
-  //-----------------------------------------------------------------------------------------------
-  // Serialization / deserialization
-
-  public void serialize(
-    JsonGenerator builder, JsonpMapper params,
-    TriConsumer<A, JsonGenerator, JsonpMapper> a,
-    TriConsumer<B, JsonGenerator, JsonpMapper> b
-  ) {
-    switch (this.tag) {
-      case A:
-        a.accept(this.a(), builder, params);
-      case B:
-        b.accept(this.b(), builder, params);
+    /**
+     * The variant tag.
+     */
+    public enum Tag {
+        A,
+        B
+    };
+
+    private final Tag tag;
+    private final Object value;
+
+    private Union2(Tag tag, Object value) {
+        this.tag = tag;
+        this.value = value;
+    }
+
+    /**
+     * Creates a variant {@code A}.
+     */
+    public static <A, B> Union2<A, B> ofA(A value) {
+        return new Union2<>(Tag.A, value);
+    }
+
+    /**
+     * Creates a variant {@code B}.
+     */
+    public static <A, B> Union2<A, B> ofB(B value) {
+        return new Union2<>(Tag.B, value);
+    }
+
+    /**
+     * Get the variant's tag of this union.
+     *
+     * @return the variant's tag
+     */
+    public Tag tag() {
+        return tag;
+    }
+
+    /**
+     * Get the variant {@code A} of this union.
+     *
+     * @return the variant's value
+     * @throws IllegalStateException if the union is not holding a variant {@code A}
+     */
+    public A a() {
+        return getVariant(Tag.A);
+    }
+
+    /**
+     * Get the variant {@code B} of this union.
+     *
+     * @return the variant's value
+     * @throws IllegalStateException if the union is not holding a variant {@code B}
+     */
+    public B b() {
+        return getVariant(Tag.B);
     }
-  }
 
-  public static class JsonpParser<A, B> extends JsonpDeserializerBase<Union2<A, B>> {
+    private <T> T getVariant(Tag tag) {
+        if (this.tag != tag) throw new IllegalStateException("Union holds variant " + tag);
 
-    private final JsonpDeserializer<A> parserA;
-    private final JsonpDeserializer<B> parserB;
+        @SuppressWarnings("unchecked")
+        T result = (T) value;
 
-    public JsonpParser(
-        JsonpDeserializer<A> parserA,
-        JsonpDeserializer<B> parserB
+        return result;
+    }
+
+    // -----------------------------------------------------------------------------------------------
+    // Serialization / deserialization
+
+    public void serialize(
+        JsonGenerator builder,
+        JsonpMapper params,
+        TriConsumer<A, JsonGenerator, JsonpMapper> a,
+        TriConsumer<B, JsonGenerator, JsonpMapper> b
     ) {
-      super(allAcceptedEvents(parserA, parserB));
-      this.parserA = parserA;
-      this.parserB = parserB;
+        switch (this.tag) {
+            case A:
+                a.accept(this.a(), builder, params);
+            case B:
+                b.accept(this.b(), builder, params);
+        }
     }
 
-    @Override
-    public Union2<A, B> deserialize(JsonParser parser, JsonpMapper mapper, Event event) {
-      if (parserA.accepts(event)) {
-        return Union2.ofA(parserA.deserialize(parser, mapper, event));
+    public static class JsonpParser<A, B> extends JsonpDeserializerBase<Union2<A, B>> {
+
+        private final JsonpDeserializer<A> parserA;
+        private final JsonpDeserializer<B> parserB;
+
+        public JsonpParser(JsonpDeserializer<A> parserA, JsonpDeserializer<B> parserB) {
+            super(allAcceptedEvents(parserA, parserB));
+            this.parserA = parserA;
+            this.parserB = parserB;
+        }
+
+        @Override
+        public Union2<A, B> deserialize(JsonParser parser, JsonpMapper mapper, Event event) {
+            if (parserA.accepts(event)) {
+                return Union2.ofA(parserA.deserialize(parser, mapper, event));
 
-      } else if (parserB.accepts(event)) {
-        return Union2.ofB(parserB.deserialize(parser, mapper, event));
+            } else if (parserB.accepts(event)) {
+                return Union2.ofB(parserB.deserialize(parser, mapper, event));
 
-      } else {
-        throw new JsonParsingException("Unexpected event '" + event + "'", parser.getLocation());
-      }
+            } else {
+                throw new JsonParsingException("Unexpected event '" + event + "'", parser.getLocation());
+            }
+        }
     }
-  }
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/base/Client.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/base/Client.java
index 164f31cb3d..f2d53f3d5c 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/base/Client.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/base/Client.java
@@ -32,30 +32,28 @@
 
 package org.opensearch.client.opensearch.experiments.base;
 
+import java.io.IOException;
+import java.util.function.Function;
 import org.opensearch.client.opensearch.experiments.api.FooRequest;
 import org.opensearch.client.opensearch.experiments.api.FooResponse;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.Transport;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.io.IOException;
-import java.util.function.Function;
-
 public class Client {
 
-  private Transport transport;
+    private Transport transport;
 
-  public FooResponse foo(FooRequest request) throws IOException {
-    return performRequest(request, FooRequest.ENDPOINT);
-  }
+    public FooResponse foo(FooRequest request) throws IOException {
+        return performRequest(request, FooRequest.ENDPOINT);
+    }
 
-  public FooResponse foo(Function<FooRequest.Builder, ObjectBuilder<FooRequest>> b) throws IOException {
-    return foo(b.apply(new FooRequest.Builder()).build());
-  }
+    public FooResponse foo(Function<FooRequest.Builder, ObjectBuilder<FooRequest>> b) throws IOException {
+        return foo(b.apply(new FooRequest.Builder()).build());
+    }
 
-  protected <RequestT, ResponseT, ErrorT> ResponseT performRequest(
-      RequestT request, Endpoint<RequestT, ResponseT, ErrorT> endpoint
-  ) throws IOException {
-    return transport.performRequest(request, endpoint, null);
-  }
+    protected <RequestT, ResponseT, ErrorT> ResponseT performRequest(RequestT request, Endpoint<RequestT, ResponseT, ErrorT> endpoint)
+        throws IOException {
+        return transport.performRequest(request, endpoint, null);
+    }
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/base/PrimitiveUtils.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/base/PrimitiveUtils.java
index 6031ef74bf..4278259cae 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/base/PrimitiveUtils.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/base/PrimitiveUtils.java
@@ -36,19 +36,19 @@
  * Support functions for primitive fields in generated classes
  */
 public class PrimitiveUtils {
-  public static int checkedValue(int value, boolean isSet) {
-    mustBeSet(isSet);
-    return value;
-  }
+    public static int checkedValue(int value, boolean isSet) {
+        mustBeSet(isSet);
+        return value;
+    }
 
-  public static long checkedValue(long value, boolean isSet) {
-    mustBeSet(isSet);
-    return value;
-  }
+    public static long checkedValue(long value, boolean isSet) {
+        mustBeSet(isSet);
+        return value;
+    }
 
-  private static void mustBeSet(boolean isSet) {
-    if (!isSet) {
-      throw new IllegalStateException("Value is not set");
+    private static void mustBeSet(boolean isSet) {
+        if (!isSet) {
+            throw new IllegalStateException("Value is not set");
+        }
     }
-  }
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/base/Variants.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/base/Variants.java
index d0a1119556..425b6c83cc 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/base/Variants.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/base/Variants.java
@@ -32,137 +32,134 @@
 
 package org.opensearch.client.opensearch.experiments.base;
 
-import org.opensearch.client.json.JsonpDeserializer;
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
-import org.opensearch.client.json.JsonpUtils;
 import jakarta.json.stream.JsonGenerator;
 import jakarta.json.stream.JsonParser;
 import jakarta.json.stream.JsonParsingException;
-
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.JsonpSerializable;
+import org.opensearch.client.json.JsonpUtils;
 
 /**
  * Describes the variants of a transport class, providing their name and parsers. It is representation-agnostic.
  */
 public class Variants<T> {
 
-  private Function<Builder<T>, Builder<T>> builderFunc;
-
-  private Map<Class<?>, String> variantNames;
-  private Map<String, JsonpDeserializer<? extends T>> parsers;
-
-  /**
-   * Builds a new {@code Variants} from a builder-creation function. This approach allows the object to be built lazily,
-   * which is needed for recursive variant data structures (e.g. a query can be a boolean query that itself contains
-   * other queries).
-   *
-   * This is required because cyclic dependencies between static class initialization code can lead to unexpected
-   * behaviour (a subclass static init may be called while static init of the parent class is not finished).
-   */
-  public Variants(Function<Builder<T>, Builder<T>> b) {
-    this.builderFunc = b;
-  }
-
-  public Variants(Builder<T> builder) {
-    this.variantNames = builder.variantNames;
-    this.parsers = builder.parsers;
-  }
-
-  public String variantName(Class<? extends T> clazz) {
-    build();
-    return variantNames.get(clazz);
-  }
-
-  public JsonpDeserializer<? extends T> variantParser(String name) {
-    build();
-    return parsers.get(name);
-  }
-
-  private void build() {
-    if (builderFunc != null) {
-      Builder<T> builder = builderFunc.apply(new Builder<>());
-      this.variantNames = builder.variantNames;
-      this.parsers = builder.parsers;
-      this.builderFunc = null;
+    private Function<Builder<T>, Builder<T>> builderFunc;
+
+    private Map<Class<?>, String> variantNames;
+    private Map<String, JsonpDeserializer<? extends T>> parsers;
+
+    /**
+     * Builds a new {@code Variants} from a builder-creation function. This approach allows the object to be built lazily,
+     * which is needed for recursive variant data structures (e.g. a query can be a boolean query that itself contains
+     * other queries).
+     *
+     * This is required because cyclic dependencies between static class initialization code can lead to unexpected
+     * behaviour (a subclass static init may be called while static init of the parent class is not finished).
+     */
+    public Variants(Function<Builder<T>, Builder<T>> b) {
+        this.builderFunc = b;
     }
-  }
 
-  //-------------------------------------------------------------------------------------------------------------------
+    public Variants(Builder<T> builder) {
+        this.variantNames = builder.variantNames;
+        this.parsers = builder.parsers;
+    }
 
-  public static <BT> Builder<BT> builder() {
-    return new Builder<>();
-  }
+    public String variantName(Class<? extends T> clazz) {
+        build();
+        return variantNames.get(clazz);
+    }
 
-  public static class Builder<BT> {
-    private final Map<Class<?>, String> variantNames = new HashMap<>();
-    private final Map<String, JsonpDeserializer<? extends BT>> parsers = new HashMap<>();
+    public JsonpDeserializer<? extends T> variantParser(String name) {
+        build();
+        return parsers.get(name);
+    }
 
-    public Builder<BT> add(String name, Class<? extends BT> clazz, JsonpDeserializer<? extends BT> parser) {
-      variantNames.put(clazz, name);
-      parsers.put(name, parser);
-      return this;
+    private void build() {
+        if (builderFunc != null) {
+            Builder<T> builder = builderFunc.apply(new Builder<>());
+            this.variantNames = builder.variantNames;
+            this.parsers = builder.parsers;
+            this.builderFunc = null;
+        }
     }
 
-    public Variants<BT> build() {
-      return new Variants<>(this);
+    // -------------------------------------------------------------------------------------------------------------------
+
+    public static <BT> Builder<BT> builder() {
+        return new Builder<>();
     }
-  }
 
-  //-------------------------------------------------------------------------------------------------------------------
+    public static class Builder<BT> {
+        private final Map<Class<?>, String> variantNames = new HashMap<>();
+        private final Map<String, JsonpDeserializer<? extends BT>> parsers = new HashMap<>();
+
+        public Builder<BT> add(String name, Class<? extends BT> clazz, JsonpDeserializer<? extends BT> parser) {
+            variantNames.put(clazz, name);
+            parsers.put(name, parser);
+            return this;
+        }
+
+        public Variants<BT> build() {
+            return new Variants<>(this);
+        }
+    }
 
-  /**
-   * Variant serializer/deserializer using externally tagged JSON.
-   * <p>
-   * See <a href="https://serde.rs/enum-representations.html">Enumerations in Serde.rs</a> that clearly explains the
-   * various strategies to represent polymorphic values in JSON.
-   */
-  public static class ExternallyTagged {
+    // -------------------------------------------------------------------------------------------------------------------
 
     /**
-     * Creates a parser for externally tagged variants
+     * Variant serializer/deserializer using externally tagged JSON.
+     * <p>
+     * See <a href="https://serde.rs/enum-representations.html">Enumerations in Serde.rs</a> that clearly explains the
+     * various strategies to represent polymorphic values in JSON.
      */
-    public static <T> JsonpDeserializer<T> pparser(Variants<T> variants) {
-      return JsonpDeserializer.of(EnumSet.of(JsonParser.Event.START_OBJECT), (parser, params) -> {
-        JsonpUtils.expectNextEvent(parser, JsonParser.Event.START_OBJECT);
-        JsonpUtils.expectNextEvent(parser, JsonParser.Event.KEY_NAME);
+    public static class ExternallyTagged {
 
-        String variant = parser.getString();
-        JsonpDeserializer<? extends T> variantParser = variants.variantParser(variant);
+        /**
+         * Creates a parser for externally tagged variants
+         */
+        public static <T> JsonpDeserializer<T> pparser(Variants<T> variants) {
+            return JsonpDeserializer.of(EnumSet.of(JsonParser.Event.START_OBJECT), (parser, params) -> {
+                JsonpUtils.expectNextEvent(parser, JsonParser.Event.START_OBJECT);
+                JsonpUtils.expectNextEvent(parser, JsonParser.Event.KEY_NAME);
 
-        if (variantParser == null) {
-          throw new JsonParsingException("Unknown variant '" + variant + "'", parser.getLocation());
-        }
+                String variant = parser.getString();
+                JsonpDeserializer<? extends T> variantParser = variants.variantParser(variant);
 
-        T result = variantParser.deserialize(parser, params);
+                if (variantParser == null) {
+                    throw new JsonParsingException("Unknown variant '" + variant + "'", parser.getLocation());
+                }
 
-        JsonpUtils.expectNextEvent(parser, JsonParser.Event.END_OBJECT);
+                T result = variantParser.deserialize(parser, params);
 
-        return result;
-      });
-    }
+                JsonpUtils.expectNextEvent(parser, JsonParser.Event.END_OBJECT);
 
-    /**
-     * Serializes an externally tagged variant object
-     */
+                return result;
+            });
+        }
+
+        /**
+         * Serializes an externally tagged variant object
+         */
 
-    public static <T extends JsonpSerializable> void serialize(
-        Variants<T> variants, T v, JsonGenerator builder, JsonpMapper mapper
-    ) {
-      @SuppressWarnings("unchecked")
-      String variant = variants.variantName((Class<? extends T>)v.getClass());
+        public static <T extends JsonpSerializable> void serialize(Variants<T> variants, T v, JsonGenerator builder, JsonpMapper mapper) {
+            @SuppressWarnings("unchecked")
+            String variant = variants.variantName((Class<? extends T>) v.getClass());
 
-      if (variant == null) {
-        throw new IllegalArgumentException("No variant name found for " + v.getClass().getName());
-      }
+            if (variant == null) {
+                throw new IllegalArgumentException("No variant name found for " + v.getClass().getName());
+            }
 
-      builder.writeStartObject();
-      builder.writeKey(variant);
-      v.serialize(builder, mapper);
-      builder.writeEnd();
+            builder.writeStartObject();
+            builder.writeKey(variant);
+            v.serialize(builder, mapper);
+            builder.writeEnd();
+        }
     }
-  }
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/SomeUnion.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/SomeUnion.java
index 4a2aa4315b..02eb8d405c 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/SomeUnion.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/SomeUnion.java
@@ -46,6 +46,8 @@ interface VariantB {
   }
 */
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Function;
 import org.opensearch.client.json.JsonEnum;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
@@ -56,9 +58,6 @@ interface VariantB {
 import org.opensearch.client.util.ObjectBuilder;
 import org.opensearch.client.util.TaggedUnion;
 import org.opensearch.client.util.TaggedUnionUtils;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Function;
 
 @JsonpDeserializable
 public class SomeUnion implements TaggedUnion<SomeUnion.Kind, SomeUnionVariant>, JsonpSerializable {
@@ -91,7 +90,7 @@ public SomeUnion(Builder builder) {
     public void serialize(JsonGenerator generator, JsonpMapper mapper) {
         // Delegate to the variant object
         if (_value instanceof JsonpSerializable) {
-            ((JsonpSerializable)_value).serialize(generator, mapper);
+            ((JsonpSerializable) _value).serialize(generator, mapper);
         }
     }
 
@@ -153,8 +152,11 @@ protected SomeUnion build() {
         }
     }
 
-    public static final JsonpDeserializer<SomeUnion> _DESERIALIZER = ObjectBuilderDeserializer.lazy(SomeUnion.Builder::new,
-        SomeUnion::setupSomeUnionDeserializer, SomeUnion.Builder::build);
+    public static final JsonpDeserializer<SomeUnion> _DESERIALIZER = ObjectBuilderDeserializer.lazy(
+        SomeUnion.Builder::new,
+        SomeUnion::setupSomeUnionDeserializer,
+        SomeUnion.Builder::build
+    );
 
     protected static void setupSomeUnionDeserializer(ObjectDeserializer<Builder> op) {
         op.add(SomeUnion.Builder::variantA, UVariantA._DESERIALIZER, "variant_a");
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/SomeUnionTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/SomeUnionTest.java
index 3342bbb65b..9349566aa3 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/SomeUnionTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/SomeUnionTest.java
@@ -38,10 +38,7 @@
 
 public class SomeUnionTest extends ModelTestCase {
 
-    SomeUnion su = new SomeUnion.Builder()
-        .variantA(a_ -> a_
-            .name("a-name")
-        ).build();
+    SomeUnion su = new SomeUnion.Builder().variantA(a_ -> a_.name("a-name")).build();
 
     String json = "{\"type\":\"variant_a\",\"name\":\"a-name\"}";
 
@@ -72,9 +69,7 @@ public void testSerialization() {
     public void testMissingVariantDeserialization() {
         String json = "{}";
 
-        JsonParsingException e = assertThrows(JsonParsingException.class, () -> {
-            fromJson(json, SomeUnion._DESERIALIZER);
-        });
+        JsonParsingException e = assertThrows(JsonParsingException.class, () -> { fromJson(json, SomeUnion._DESERIALIZER); });
 
         assertEquals("Property 'type' not found", e.getMessage());
     }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/SomeUnionVariant.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/SomeUnionVariant.java
index b0461522a6..57f3cc5f6e 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/SomeUnionVariant.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/SomeUnionVariant.java
@@ -34,5 +34,4 @@
 
 import org.opensearch.client.opensearch.experiments.UnionVariant;
 
-public interface SomeUnionVariant extends UnionVariant {
-}
+public interface SomeUnionVariant extends UnionVariant {}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/UVariantA.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/UVariantA.java
index cd82385af9..a23ed20942 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/UVariantA.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/UVariantA.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.experiments.containers;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,9 +41,6 @@
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import javax.annotation.Nullable;
 
 @JsonpDeserializable
 public class UVariantA implements SomeUnionVariant, JsonpSerializable {
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/UVariantB.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/UVariantB.java
index d2c292e736..25bde79072 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/UVariantB.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/containers/UVariantB.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.experiments.containers;
 
+import jakarta.json.stream.JsonGenerator;
+import javax.annotation.Nullable;
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
@@ -39,9 +41,6 @@
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import javax.annotation.Nullable;
 
 @JsonpDeserializable
 public class UVariantB implements SomeUnionVariant, JsonpSerializable {
@@ -54,7 +53,7 @@ public String _variantType() {
     }
 
     @Nullable
-    public Integer number () {
+    public Integer number() {
         return this.number;
     }
 
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/generics/GenericClass.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/generics/GenericClass.java
index 15b83578fd..31228322b4 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/generics/GenericClass.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/generics/GenericClass.java
@@ -32,7 +32,8 @@
 
 package org.opensearch.client.opensearch.experiments.generics;
 
-import org.opensearch.client.opensearch._types.ErrorResponse;
+import jakarta.json.stream.JsonGenerator;
+import java.util.function.Supplier;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
@@ -40,12 +41,10 @@
 import org.opensearch.client.json.JsonpUtils;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch._types.ErrorResponse;
 import org.opensearch.client.transport.Endpoint;
 import org.opensearch.client.transport.endpoints.SimpleEndpoint;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.function.Supplier;
 
 public class GenericClass<GenParam> implements JsonpSerializable {
 
@@ -112,7 +111,6 @@ private static <GenParam> void setupParser(ObjectDeserializer<Builder<GenParam>>
         op.add(Builder::genParam, deserializer, "genParam");
     }
 
-
     public static <GenParam> Endpoint<Boolean, GenericClass<GenParam>, ErrorResponse> endpoint(
         JsonpDeserializer<GenParam> genParamDeserializer
     ) {
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/InheritanceTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/InheritanceTest.java
index 6f1f677844..f80d68e9c2 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/InheritanceTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/InheritanceTest.java
@@ -75,7 +75,6 @@ public void testDeserialization() {
         assertEquals("childValue", fc.childField());
         assertEquals("finalValue", fc.finalField());
 
-
         json = "{\"baseField\":\"baseValue\",\"childField\":\"childValue\"}";
 
         ChildClass cc = fromJson(json, ChildClass.JSONP_PARSER);
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/base/BaseClass.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/base/BaseClass.java
index d4a2e8f673..a783c12edc 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/base/BaseClass.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/base/BaseClass.java
@@ -32,13 +32,12 @@
 
 package org.opensearch.client.opensearch.experiments.inheritance.base;
 
+import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectDeserializer;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Objects;
 
 /**
  * An abstract transport class
@@ -66,7 +65,7 @@ protected void toJsonpInternal(JsonGenerator generator, JsonpMapper mapper) {
         generator.write("baseField", this.baseField);
     }
 
-    //---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
     // This is class protected as it's only of interest to subclasses. Yet public members are visible
     // from the outside on public subclasses.
@@ -82,7 +81,7 @@ public T baseField(String value) {
         protected abstract T self();
     }
 
-    //---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
     protected static <T extends AbstractBuilder<T>> void setupBaseClassParser(ObjectDeserializer<T> op) {
         op.add(AbstractBuilder::baseField, JsonpDeserializer.stringDeserializer(), "baseField");
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/child/ChildClass.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/child/ChildClass.java
index 5bb86da7af..6d6016698d 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/child/ChildClass.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/child/ChildClass.java
@@ -32,16 +32,15 @@
 
 package org.opensearch.client.opensearch.experiments.inheritance.child;
 
-import org.opensearch.client.opensearch.experiments.inheritance.base.BaseClass;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.experiments.inheritance.base.BaseClass;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Objects;
 
 /**
  * A concrete class that both inherits a parent class and has child classes
@@ -65,7 +64,7 @@ protected void toJsonpInternal(JsonGenerator generator, JsonpMapper params) {
         generator.write("childField", this.childField);
     }
 
-    //---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
     protected abstract static class AbstractBuilder<T extends AbstractBuilder<T>> extends BaseClass.AbstractBuilder<T> {
 
@@ -92,7 +91,7 @@ public ChildClass build() {
         }
     }
 
-    //---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
     protected static <T extends AbstractBuilder<T>> void setupChildClassParser(ObjectDeserializer<T> op) {
         BaseClass.setupBaseClassParser(op);
@@ -100,7 +99,8 @@ protected static <T extends AbstractBuilder<T>> void setupChildClassParser(Objec
     }
 
     public static final JsonpDeserializer<ChildClass> JSONP_PARSER = ObjectBuilderDeserializer.createForObject(
-        Builder::new, ChildClass::setupChildClassParser
+        Builder::new,
+        ChildClass::setupChildClassParser
     );
 
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/final_/FinalClass.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/final_/FinalClass.java
index 63acc8485d..257c7790f0 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/final_/FinalClass.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/final_/FinalClass.java
@@ -32,15 +32,14 @@
 
 package org.opensearch.client.opensearch.experiments.inheritance.final_;
 
-import org.opensearch.client.opensearch.experiments.inheritance.child.ChildClass;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.opensearch.experiments.inheritance.child.ChildClass;
 import org.opensearch.client.util.ObjectBuilder;
-import jakarta.json.stream.JsonGenerator;
-
-import java.util.Objects;
 
 /**
  * A concrete class that inherits a parent class but has no child classes
@@ -64,11 +63,9 @@ protected void toJsonpInternal(JsonGenerator generator, JsonpMapper mapper) {
         generator.write("finalField", this.finalField);
     }
 
-    //---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
-    public static class Builder
-        extends ChildClass.AbstractBuilder<Builder>
-        implements ObjectBuilder<FinalClass> {
+    public static class Builder extends ChildClass.AbstractBuilder<Builder> implements ObjectBuilder<FinalClass> {
 
         private String finalField;
 
@@ -88,7 +85,7 @@ public FinalClass build() {
         }
     }
 
-    //---------------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
 
     private static void setupFinalClassParser(ObjectDeserializer<Builder> op) {
         ChildClass.setupChildClassParser(op);
@@ -105,7 +102,8 @@ private static void setupFinalClassParser(ObjectDeserializer<Builder> op) {
     // (even if users should rarely have to interact directly with the parser).
 
     public static final JsonpDeserializer<FinalClass> JSONP_PARSER = ObjectBuilderDeserializer.createForObject(
-        Builder::new, FinalClass::setupFinalClassParser
+        Builder::new,
+        FinalClass::setupFinalClassParser
     );
 
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractAggregationRequestIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractAggregationRequestIT.java
index 402792f90f..18c5589f19 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractAggregationRequestIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractAggregationRequestIT.java
@@ -8,6 +8,11 @@
 
 package org.opensearch.client.opensearch.integTest;
 
+import java.io.IOException;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.List;
 import org.junit.Test;
 import org.opensearch.Version;
 import org.opensearch.client.opensearch._types.Refresh;
@@ -23,255 +28,211 @@
 import org.opensearch.client.opensearch.core.InfoResponse;
 import org.opensearch.client.opensearch.core.SearchResponse;
 
-import java.io.IOException;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.util.List;
-
 public abstract class AbstractAggregationRequestIT extends OpenSearchJavaClientTestCase {
 
-	@Test
-	public void testValueRangeAggregation() throws Exception {
-		var index = "test-value-range-aggregation";
-		createDateRangeDocuments(index);
-		var searchResponse = sendAggregateRequest(index, "cost_ranges", getCostValueRangeAggregation());
-		var costRangesAggregations = searchResponse.aggregations().get("cost_ranges");
-		var buckets = costRangesAggregations._get()
-				._toAggregate()
-				.range()
-				.buckets()
-				.array();
-
-		assertEquals(3, buckets.size());
-		assertEquals(2, buckets.get(0).docCount());
-		assertEquals(2, buckets.get(1).docCount());
-		assertEquals(2, buckets.get(2).docCount());
-	}
-
-	@Test
-	public void testDateRangeAggregation() throws Exception {
-		var index = "test-date-range-aggregation";
-		createDateRangeDocuments(index);
-		var searchResponse = sendAggregateRequest(index, "expiry_ranges", getExpiryDateRangeAggregation());
-		var expiryRangesAggregations = searchResponse.aggregations().get("expiry_ranges");
-		var buckets = expiryRangesAggregations._get()
-				._toAggregate()
-				.dateRange()
-				.buckets()
-				.array();
-
-		assertEquals(3, buckets.size());
-		assertEquals(2, buckets.get(0).docCount());
-		assertEquals(2, buckets.get(1).docCount());
-		assertEquals(2, buckets.get(2).docCount());
-	}
-
-	@Test
-	public void testMultiTermsAggregation() throws Exception {
-		checkIfOpenSearchSupportsMultiTermsAggregation();
-
-		var index = "test-multiterms-aggregation-no-size";
-		createMultiTermsDocuments(index);
-		var searchResponse = sendAggregateRequest(index, "multiterms", getMultiTermsAggregation(null));
-		var multitermsAggregations = searchResponse.aggregations().get("multiterms");
-		var buckets = multitermsAggregations._get()
-		._toAggregate()
-		.multiTerms()
-		.buckets()
-		.array();
-
-		assertEquals(3, buckets.size());
-		assertEquals(1, buckets.get(0).docCount());
-	}
-
-	@Test
-	public void testMultiTermsAggregationWithSizeFewerThenBucketsSize() throws Exception {
-		checkIfOpenSearchSupportsMultiTermsAggregation();
-
-		var index = "test-multiterms-aggregation-fewer-size";
-		createMultiTermsDocuments(index);
-		var searchResponse = sendAggregateRequest(index, "multiterms", getMultiTermsAggregation(1));
-		var multitermsAggregations = searchResponse.aggregations().get("multiterms");
-		var buckets = multitermsAggregations._get()
-				._toAggregate()
-				.multiTerms()
-				.buckets()
-				.array();
-
-		assertEquals(1, buckets.size());
-		assertEquals(1, buckets.get(0).docCount());
-	}
-
-	@Test
-	public void testMultiTermsAggregationWithSizeBiggerThenBucketsSize() throws Exception {
-		checkIfOpenSearchSupportsMultiTermsAggregation();
-
-		var index = "test-multiterms-aggregation-bigger-size";
-		createMultiTermsDocuments(index);
-		var searchResponse = sendAggregateRequest(index, "multiterms", getMultiTermsAggregation(50));
-		var multitermsAggregations = searchResponse.aggregations().get("multiterms");
-		var buckets = multitermsAggregations._get()
-				._toAggregate()
-				.multiTerms()
-				.buckets()
-				.array();
-
-		assertEquals(3, buckets.size());
-		assertEquals(1, buckets.get(0).docCount());
-	}
-
-	private void checkIfOpenSearchSupportsMultiTermsAggregation() throws Exception {
-		InfoResponse info = javaClient().info();
-		String version = info.version().number();
-		if (version.contains("SNAPSHOT")) {
-			version = version.split("-")[0];
-		}
-		assumeTrue("multi_terms is supported in OpenSearch 2.1.0 and later",
-		Version.fromString(version).onOrAfter(Version.fromString("2.1.0")));
-	}
-
-	private Aggregation getExpiryDateRangeAggregation() {
-		DateRangeAggregation expiryDateRangeAggregation = new DateRangeAggregation.Builder()
-				.field("expDate")
-				.ranges(getDateAggregationRanges())
-				.build();
-		return new Aggregation.Builder().dateRange(expiryDateRangeAggregation).build();
-	}
-
-	private Aggregation getCostValueRangeAggregation() {
-		RangeAggregation costValueRangeAggregation = new RangeAggregation.Builder()
-				.field("cost")
-				.ranges(getValueAggregationRanges())
-				.build();
-		return new Aggregation.Builder().range(costValueRangeAggregation).build();
-	}
-
-	private Aggregation getMultiTermsAggregation(Integer size) {
-		MultiTermsAggregation.Builder multiTermsAggregationBuilder = new MultiTermsAggregation.Builder()
-				.terms(List.of(
-					MultiTermLookup.of(multiTermLookup -> multiTermLookup.field("cost")),
-					MultiTermLookup.of(multiTermLookup -> multiTermLookup.field("expDate"))
-				));
-
-		if(size != null) {
-			multiTermsAggregationBuilder = multiTermsAggregationBuilder.size(size);
-		}
-
-		MultiTermsAggregation multiTermsAggregation = multiTermsAggregationBuilder.build();
-		return new Aggregation.Builder().multiTerms(multiTermsAggregation).build();
-	}
-
-	private SearchResponse<Void> sendAggregateRequest(String index, String key, Aggregation value) throws IOException {
-		return javaClient().search(
-				request -> request.index(index)
-						.size(0)
-						.aggregations(key, value),
-				Void.class);
-	}
-
-	private List<DateRangeExpression> getDateAggregationRanges() {
-		return List.of(
-				new DateRangeExpression.Builder()
-						.from(builder -> builder.value((double) getDatePlusDays(1).toEpochMilli()))
-						.to(FieldDateMath.of(
-								builder -> builder.value((double) getDatePlusDays(3).toEpochMilli() - 1000))
-						)
-						.key("from-1-to-2-days")
-						.build(),
-				new DateRangeExpression.Builder()
-						.from(builder -> builder.value((double) getDatePlusDays(3).toEpochMilli()))
-						.to(FieldDateMath.of(
-								builder -> builder.value((double) getDatePlusDays(5).toEpochMilli() - 1000))
-						)
-						.key("from-3-to-4-days")
-						.build(),
-				new DateRangeExpression.Builder()
-						.from(builder -> builder.value((double) getDatePlusDays(5).toEpochMilli()))
-						.to(FieldDateMath.of(
-								builder -> builder.value((double) getDatePlusDays(7).toEpochMilli() - 1000))
-						)
-						.key("from-5-to-6-days")
-						.build()
-		);
-	}
-
-	private List<AggregationRange> getValueAggregationRanges() {
-		return List.of(
-				new AggregationRange.Builder().to("10").build(),
-				new AggregationRange.Builder().from("10").to("30").build(),
-				new AggregationRange.Builder().from("30").build()
-		);
-	}
-
-	private void createDateRangeDocuments(String index) throws IOException {
-		createIndex(index);
-		javaClient().create(_1 -> _1.index(index).id("1").document(createProduct("egg", 2, 1)).refresh(Refresh.True));
-		javaClient().create(_1 -> _1.index(index).id("2").document(createProduct("meat", 15, 2)).refresh(Refresh.True));
-		javaClient().create(_1 -> _1.index(index).id("3").document(createProduct("ham", 30, 3)).refresh(Refresh.True));
-		javaClient().create(_1 -> _1.index(index).id("4").document(createProduct("cheese", 25, 4)).refresh(Refresh.True));
-		javaClient().create(_1 -> _1.index(index).id("5").document(createProduct("pasta", 8, 5)).refresh(Refresh.True));
-		javaClient().create(_1 -> _1.index(index).id("6").document(createProduct("oil", 50, 6)).refresh(Refresh.True));
-	}
-
-	private void createMultiTermsDocuments(String index) throws IOException {
-		createIndex(index);
-		javaClient().create(_1 -> _1.index(index).id("1").document(createProduct("appleA", 2, 1)).refresh(Refresh.True));
-		javaClient().create(_1 -> _1.index(index).id("2").document(createProduct("appleB", 2, 2)).refresh(Refresh.True));
-		javaClient().create(_1 -> _1.index(index).id("3").document(createProduct("appleC", 2, 3)).refresh(Refresh.True));
-	}
-
-	private void createIndex(String index) throws IOException {
-		Property nameValueProp = new Property.Builder()
-				.text(v -> v)
-				.build();
-		Property costValueProp = new Property.Builder()
-				.integer(v -> v)
-				.build();
-		Property expDateKeywordProp = new Property.Builder()
-				.date(v -> v)
-				.build();
-		javaClient().indices().create(c -> c.index(index)
-				.mappings(m -> m.properties("name", nameValueProp)
-						.properties("cost", costValueProp)
-						.properties("expDate", expDateKeywordProp)
-				)
-		);
-	}
-
-	private ProductDetails createProduct(String name, int cost, int plusDays) {
-		return new ProductDetails(name, cost, getDatePlusDays(plusDays).toEpochMilli());
-	}
-
-	private Instant getDatePlusDays(int plusDays) {
-		return LocalDateTime.of(2023, 2, 20, 0, 0, 0, 0).plusDays(plusDays).toInstant(ZoneOffset.UTC);
-	}
-
-	public static class ProductDetails {
-		private String name;
-		private int cost;
-		private Long expDate;
-
-		public ProductDetails() {
-		}
-
-		public ProductDetails(String name, int cost, Long expDate) {
-			this.name = name;
-			this.cost = cost;
-			this.expDate = expDate;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public int getCost() {
-			return cost;
-		}
-
-		public Long getExpDate() {
-			return expDate;
-		}
-	}
+    @Test
+    public void testValueRangeAggregation() throws Exception {
+        var index = "test-value-range-aggregation";
+        createDateRangeDocuments(index);
+        var searchResponse = sendAggregateRequest(index, "cost_ranges", getCostValueRangeAggregation());
+        var costRangesAggregations = searchResponse.aggregations().get("cost_ranges");
+        var buckets = costRangesAggregations._get()._toAggregate().range().buckets().array();
+
+        assertEquals(3, buckets.size());
+        assertEquals(2, buckets.get(0).docCount());
+        assertEquals(2, buckets.get(1).docCount());
+        assertEquals(2, buckets.get(2).docCount());
+    }
+
+    @Test
+    public void testDateRangeAggregation() throws Exception {
+        var index = "test-date-range-aggregation";
+        createDateRangeDocuments(index);
+        var searchResponse = sendAggregateRequest(index, "expiry_ranges", getExpiryDateRangeAggregation());
+        var expiryRangesAggregations = searchResponse.aggregations().get("expiry_ranges");
+        var buckets = expiryRangesAggregations._get()._toAggregate().dateRange().buckets().array();
+
+        assertEquals(3, buckets.size());
+        assertEquals(2, buckets.get(0).docCount());
+        assertEquals(2, buckets.get(1).docCount());
+        assertEquals(2, buckets.get(2).docCount());
+    }
+
+    @Test
+    public void testMultiTermsAggregation() throws Exception {
+        checkIfOpenSearchSupportsMultiTermsAggregation();
+
+        var index = "test-multiterms-aggregation-no-size";
+        createMultiTermsDocuments(index);
+        var searchResponse = sendAggregateRequest(index, "multiterms", getMultiTermsAggregation(null));
+        var multitermsAggregations = searchResponse.aggregations().get("multiterms");
+        var buckets = multitermsAggregations._get()._toAggregate().multiTerms().buckets().array();
+
+        assertEquals(3, buckets.size());
+        assertEquals(1, buckets.get(0).docCount());
+    }
+
+    @Test
+    public void testMultiTermsAggregationWithSizeFewerThenBucketsSize() throws Exception {
+        checkIfOpenSearchSupportsMultiTermsAggregation();
+
+        var index = "test-multiterms-aggregation-fewer-size";
+        createMultiTermsDocuments(index);
+        var searchResponse = sendAggregateRequest(index, "multiterms", getMultiTermsAggregation(1));
+        var multitermsAggregations = searchResponse.aggregations().get("multiterms");
+        var buckets = multitermsAggregations._get()._toAggregate().multiTerms().buckets().array();
+
+        assertEquals(1, buckets.size());
+        assertEquals(1, buckets.get(0).docCount());
+    }
+
+    @Test
+    public void testMultiTermsAggregationWithSizeBiggerThenBucketsSize() throws Exception {
+        checkIfOpenSearchSupportsMultiTermsAggregation();
+
+        var index = "test-multiterms-aggregation-bigger-size";
+        createMultiTermsDocuments(index);
+        var searchResponse = sendAggregateRequest(index, "multiterms", getMultiTermsAggregation(50));
+        var multitermsAggregations = searchResponse.aggregations().get("multiterms");
+        var buckets = multitermsAggregations._get()._toAggregate().multiTerms().buckets().array();
+
+        assertEquals(3, buckets.size());
+        assertEquals(1, buckets.get(0).docCount());
+    }
+
+    private void checkIfOpenSearchSupportsMultiTermsAggregation() throws Exception {
+        InfoResponse info = javaClient().info();
+        String version = info.version().number();
+        if (version.contains("SNAPSHOT")) {
+            version = version.split("-")[0];
+        }
+        assumeTrue(
+            "multi_terms is supported in OpenSearch 2.1.0 and later",
+            Version.fromString(version).onOrAfter(Version.fromString("2.1.0"))
+        );
+    }
+
+    private Aggregation getExpiryDateRangeAggregation() {
+        DateRangeAggregation expiryDateRangeAggregation = new DateRangeAggregation.Builder().field("expDate")
+            .ranges(getDateAggregationRanges())
+            .build();
+        return new Aggregation.Builder().dateRange(expiryDateRangeAggregation).build();
+    }
+
+    private Aggregation getCostValueRangeAggregation() {
+        RangeAggregation costValueRangeAggregation = new RangeAggregation.Builder().field("cost")
+            .ranges(getValueAggregationRanges())
+            .build();
+        return new Aggregation.Builder().range(costValueRangeAggregation).build();
+    }
+
+    private Aggregation getMultiTermsAggregation(Integer size) {
+        MultiTermsAggregation.Builder multiTermsAggregationBuilder = new MultiTermsAggregation.Builder().terms(
+            List.of(
+                MultiTermLookup.of(multiTermLookup -> multiTermLookup.field("cost")),
+                MultiTermLookup.of(multiTermLookup -> multiTermLookup.field("expDate"))
+            )
+        );
+
+        if (size != null) {
+            multiTermsAggregationBuilder = multiTermsAggregationBuilder.size(size);
+        }
+
+        MultiTermsAggregation multiTermsAggregation = multiTermsAggregationBuilder.build();
+        return new Aggregation.Builder().multiTerms(multiTermsAggregation).build();
+    }
+
+    private SearchResponse<Void> sendAggregateRequest(String index, String key, Aggregation value) throws IOException {
+        return javaClient().search(request -> request.index(index).size(0).aggregations(key, value), Void.class);
+    }
+
+    private List<DateRangeExpression> getDateAggregationRanges() {
+        return List.of(
+            new DateRangeExpression.Builder().from(builder -> builder.value((double) getDatePlusDays(1).toEpochMilli()))
+                .to(FieldDateMath.of(builder -> builder.value((double) getDatePlusDays(3).toEpochMilli() - 1000)))
+                .key("from-1-to-2-days")
+                .build(),
+            new DateRangeExpression.Builder().from(builder -> builder.value((double) getDatePlusDays(3).toEpochMilli()))
+                .to(FieldDateMath.of(builder -> builder.value((double) getDatePlusDays(5).toEpochMilli() - 1000)))
+                .key("from-3-to-4-days")
+                .build(),
+            new DateRangeExpression.Builder().from(builder -> builder.value((double) getDatePlusDays(5).toEpochMilli()))
+                .to(FieldDateMath.of(builder -> builder.value((double) getDatePlusDays(7).toEpochMilli() - 1000)))
+                .key("from-5-to-6-days")
+                .build()
+        );
+    }
+
+    private List<AggregationRange> getValueAggregationRanges() {
+        return List.of(
+            new AggregationRange.Builder().to("10").build(),
+            new AggregationRange.Builder().from("10").to("30").build(),
+            new AggregationRange.Builder().from("30").build()
+        );
+    }
+
+    private void createDateRangeDocuments(String index) throws IOException {
+        createIndex(index);
+        javaClient().create(_1 -> _1.index(index).id("1").document(createProduct("egg", 2, 1)).refresh(Refresh.True));
+        javaClient().create(_1 -> _1.index(index).id("2").document(createProduct("meat", 15, 2)).refresh(Refresh.True));
+        javaClient().create(_1 -> _1.index(index).id("3").document(createProduct("ham", 30, 3)).refresh(Refresh.True));
+        javaClient().create(_1 -> _1.index(index).id("4").document(createProduct("cheese", 25, 4)).refresh(Refresh.True));
+        javaClient().create(_1 -> _1.index(index).id("5").document(createProduct("pasta", 8, 5)).refresh(Refresh.True));
+        javaClient().create(_1 -> _1.index(index).id("6").document(createProduct("oil", 50, 6)).refresh(Refresh.True));
+    }
+
+    private void createMultiTermsDocuments(String index) throws IOException {
+        createIndex(index);
+        javaClient().create(_1 -> _1.index(index).id("1").document(createProduct("appleA", 2, 1)).refresh(Refresh.True));
+        javaClient().create(_1 -> _1.index(index).id("2").document(createProduct("appleB", 2, 2)).refresh(Refresh.True));
+        javaClient().create(_1 -> _1.index(index).id("3").document(createProduct("appleC", 2, 3)).refresh(Refresh.True));
+    }
+
+    private void createIndex(String index) throws IOException {
+        Property nameValueProp = new Property.Builder().text(v -> v).build();
+        Property costValueProp = new Property.Builder().integer(v -> v).build();
+        Property expDateKeywordProp = new Property.Builder().date(v -> v).build();
+        javaClient().indices()
+            .create(
+                c -> c.index(index)
+                    .mappings(
+                        m -> m.properties("name", nameValueProp).properties("cost", costValueProp).properties("expDate", expDateKeywordProp)
+                    )
+            );
+    }
+
+    private ProductDetails createProduct(String name, int cost, int plusDays) {
+        return new ProductDetails(name, cost, getDatePlusDays(plusDays).toEpochMilli());
+    }
+
+    private Instant getDatePlusDays(int plusDays) {
+        return LocalDateTime.of(2023, 2, 20, 0, 0, 0, 0).plusDays(plusDays).toInstant(ZoneOffset.UTC);
+    }
+
+    public static class ProductDetails {
+        private String name;
+        private int cost;
+        private Long expDate;
+
+        public ProductDetails() {}
+
+        public ProductDetails(String name, int cost, Long expDate) {
+            this.name = name;
+            this.cost = cost;
+            this.expDate = expDate;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public int getCost() {
+            return cost;
+        }
+
+        public Long getExpDate() {
+            return expDate;
+        }
+    }
 
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractCatClientIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractCatClientIT.java
index 1a1afc77bc..230f067ce8 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractCatClientIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractCatClientIT.java
@@ -12,7 +12,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-
 import org.junit.Test;
 import org.opensearch.Version;
 import org.opensearch.client.opensearch._types.Bytes;
@@ -42,8 +41,12 @@
 public abstract class AbstractCatClientIT extends OpenSearchJavaClientTestCase {
 
     public void testCatNodes() throws Exception {
-        NodesResponse nodesResponse = javaClient().cat().nodes(r -> r.bytes(Bytes.Bytes).fullId(true)
-                .headers("id,ip,name,version,pid,heap.percent,ram.percent,cpu,load_1m,load_5m,load_15m,node.role"));
+        NodesResponse nodesResponse = javaClient().cat()
+            .nodes(
+                r -> r.bytes(Bytes.Bytes)
+                    .fullId(true)
+                    .headers("id,ip,name,version,pid,heap.percent,ram.percent,cpu,load_1m,load_5m,load_15m,node.role")
+            );
 
         assertNotNull(nodesResponse.valueBody());
         assertTrue(nodesResponse.valueBody().size() > 0);
@@ -67,8 +70,13 @@ public void testCatNodes() throws Exception {
     public void testCatIndices() throws Exception {
         createIndex("my-index-for-cat-test");
 
-        IndicesResponse indicesResponse = javaClient().cat().indices(r -> r.headers("index,health,status,uuid,pri,rep,docs.count," +
-                "docs.deleted,store.size,pri.store.size,creation.date,creation.date.string").bytes(Bytes.Bytes));
+        IndicesResponse indicesResponse = javaClient().cat()
+            .indices(
+                r -> r.headers(
+                    "index,health,status,uuid,pri,rep,docs.count,"
+                        + "docs.deleted,store.size,pri.store.size,creation.date,creation.date.string"
+                ).bytes(Bytes.Bytes)
+            );
 
         assertNotNull(indicesResponse.valueBody());
         assertTrue(indicesResponse.valueBody().size() > 0);
@@ -91,8 +99,13 @@ public void testCatIndices() throws Exception {
 
     public void testCatRecovery() throws Exception {
         createIndex("test-cat-recovery-index");
-        RecoveryResponse recoveryResponse = javaClient().cat().recovery(r -> r.headers("index,shard,type,stage,source_host,source_node," +
-                "target_host,target_node,repository,snapshot,files,files_recovered,files_percent,files_total").bytes(Bytes.Bytes));
+        RecoveryResponse recoveryResponse = javaClient().cat()
+            .recovery(
+                r -> r.headers(
+                    "index,shard,type,stage,source_host,source_node,"
+                        + "target_host,target_node,repository,snapshot,files,files_recovered,files_percent,files_total"
+                ).bytes(Bytes.Bytes)
+            );
 
         assertNotNull("recoveryResponse.valueBody() is null", recoveryResponse.valueBody());
         assertTrue("recoveryResponse.valueBody().size() == 0", recoveryResponse.valueBody().size() > 0);
@@ -121,14 +134,17 @@ public void testCatAliases() throws Exception {
         createIndex(indexName);
         assertTrue(javaClient().indices().putAlias(r -> r.index(indexName).name(alias).isWriteIndex(true)).acknowledged());
 
-        AliasesResponse aliasesResponse = javaClient().cat().aliases(r ->
-                r.headers("alias,index,is_write_index,routing.index,routing.search").sort("is_write_index"));
+        AliasesResponse aliasesResponse = javaClient().cat()
+            .aliases(r -> r.headers("alias,index,is_write_index,routing.index,routing.search").sort("is_write_index"));
 
         assertNotNull(aliasesResponse.valueBody());
         assertTrue(aliasesResponse.valueBody().size() > 0);
 
-        AliasesRecord aliasRecord = aliasesResponse.valueBody().stream().filter(aliasesRecord -> aliasesRecord.alias().equals(alias))
-                .findAny().get();
+        AliasesRecord aliasRecord = aliasesResponse.valueBody()
+            .stream()
+            .filter(aliasesRecord -> aliasesRecord.alias().equals(alias))
+            .findAny()
+            .get();
 
         assertTrue(aliasRecord.index().equals(indexName));
         assertTrue(aliasRecord.isWriteIndex().equals(Boolean.TRUE.toString()));
@@ -143,8 +159,8 @@ public void testCatShards() throws Exception {
         createIndex("test-cat-shards-index-2");
         createIndex("a-test-cat-shards-index");
 
-        ShardsResponse shardsResponse = javaClient().cat().shards(r -> r.headers("index,shard,prirep,state,store").sort("index")
-                .bytes(Bytes.Bytes));
+        ShardsResponse shardsResponse = javaClient().cat()
+            .shards(r -> r.headers("index,shard,prirep,state,store").sort("index").bytes(Bytes.Bytes));
         assertNotNull(shardsResponse.valueBody());
         assertTrue(shardsResponse.valueBody().size() > 0);
 
@@ -165,13 +181,16 @@ public void testCatShards() throws Exception {
     public void testCatAllocation() throws Exception {
         createIndex("test-cat-allocations-index");
 
-        AllocationResponse allocationResponse = javaClient().cat().allocation(r ->
-                r.headers("ip,node,shards,disk.indices,disk.used,disk.avail,disk.total,disk.percent").sort("ip"));
+        AllocationResponse allocationResponse = javaClient().cat()
+            .allocation(r -> r.headers("ip,node,shards,disk.indices,disk.used,disk.avail,disk.total,disk.percent").sort("ip"));
         assertNotNull(allocationResponse.valueBody());
         assertTrue(allocationResponse.valueBody().size() > 0);
 
-        AllocationRecord allocationRecord = allocationResponse.valueBody().stream().filter(allocation ->
-                !allocation.node().equals("UNASSIGNED")).findAny().get();
+        AllocationRecord allocationRecord = allocationResponse.valueBody()
+            .stream()
+            .filter(allocation -> !allocation.node().equals("UNASSIGNED"))
+            .findAny()
+            .get();
         assertNotNull(allocationRecord.ip());
         assertNotNull(allocationRecord.node());
         assertNotNull(allocationRecord.shards());
@@ -193,11 +212,12 @@ public void testCatPlugins() throws Exception {
     public void testCatSegments() throws Exception {
         createIndex("cat-segments-test-index");
 
-        final IndexResponse index = javaClient().index(b -> b
-                .index("test-cat-segments-index")
+        final IndexResponse index = javaClient().index(
+            b -> b.index("test-cat-segments-index")
                 .id("id")
                 .refresh(Refresh.True)
-                .document(Map.of("test-cat-segments-key", "test-cat-segments-value")));
+                .document(Map.of("test-cat-segments-key", "test-cat-segments-value"))
+        );
 
         assertTrue(index.result() == Result.Created);
 
@@ -215,39 +235,39 @@ public void testCatSegments() throws Exception {
         assertNull(segmentsRecord.ip());
         assertNull(segmentsRecord.prirep());
     }
-    
+
     @Test
     public void testCatPitSegments() throws Exception {
         InfoResponse info = javaClient().info();
         String version = info.version().number();
         if (version.contains("SNAPSHOT")) {
-                version = version.split("-")[0];
+            version = version.split("-")[0];
         }
-        assumeTrue("The PIT is supported in OpenSearch 2.4.0 and later",
-                Version.fromString(version).onOrAfter(Version.fromString("2.4.0")));
+        assumeTrue(
+            "The PIT is supported in OpenSearch 2.4.0 and later",
+            Version.fromString(version).onOrAfter(Version.fromString("2.4.0"))
+        );
         createIndex("cat-pit-segments-test-index");
 
-        final IndexResponse index = javaClient().index(b -> b
-                .index("test-cat-pit-segments-index")
+        final IndexResponse index = javaClient().index(
+            b -> b.index("test-cat-pit-segments-index")
                 .id("id")
                 .refresh(Refresh.True)
-                .document(Map.of("test-cat-pit-segments-key", "test-cat-pit-segments-value")));
+                .document(Map.of("test-cat-pit-segments-key", "test-cat-pit-segments-value"))
+        );
 
         assertTrue(index.result() == Result.Created);
 
         createPit("cat-pit-segments-test-index");
 
-        SegmentsResponse PitSegmentsResponse = javaClient().cat()
-                .pitSegments(r -> r.headers("index,shard,id,segment,size"));
+        SegmentsResponse PitSegmentsResponse = javaClient().cat().pitSegments(r -> r.headers("index,shard,id,segment,size"));
 
         assertNotNull("PitSegmentsResponse.segments() is null", PitSegmentsResponse.valueBody());
 
         if (Version.fromString(version).onOrAfter(Version.fromString("2.10.0"))) {
-            assertTrue("PitSegmentsResponse.segments().size() == 0",
-                PitSegmentsResponse.valueBody().isEmpty());
+            assertTrue("PitSegmentsResponse.segments().size() == 0", PitSegmentsResponse.valueBody().isEmpty());
         } else {
-            assertTrue("PitSegmentsResponse.segments().size() == 0",
-                PitSegmentsResponse.valueBody().size() > 0);
+            assertTrue("PitSegmentsResponse.segments().size() == 0", PitSegmentsResponse.valueBody().size() > 0);
         }
     }
 
@@ -258,9 +278,9 @@ private void createIndex(String indexName) throws Exception {
     }
 
     private void createPit(String indexName) throws Exception {
-        CreatePitResponse createPitResponse = javaClient()
-                .createPit(r -> r.targetIndexes(Collections.singletonList(indexName))
-                        .keepAlive(new Time.Builder().time("100m").build()));
+        CreatePitResponse createPitResponse = javaClient().createPit(
+            r -> r.targetIndexes(Collections.singletonList(indexName)).keepAlive(new Time.Builder().time("100m").build())
+        );
         assertNotNull(createPitResponse);
         assertNotNull(createPitResponse.pitId());
     }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractClusterClientIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractClusterClientIT.java
index f709de64ee..bd55b6b94b 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractClusterClientIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractClusterClientIT.java
@@ -8,6 +8,13 @@
 
 package org.opensearch.client.opensearch.integTest;
 
+import static java.util.Collections.emptyMap;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 import org.opensearch.client.ResponseException;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.opensearch.OpenSearchClient;
@@ -26,14 +33,6 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.indices.recovery.RecoverySettings;
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import static java.util.Collections.emptyMap;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-
 public abstract class AbstractClusterClientIT extends OpenSearchJavaClientTestCase {
     public void testClusterPutSettings() throws IOException {
         OpenSearchClient openSearchClient = javaClient();
@@ -52,29 +51,34 @@ public void testClusterPutSettings() throws IOException {
         transientSettingsMap.put(transientSettingKey, JsonData.of(transientSettingValue));
         persistentSettingsMap.put(persistentSettingKey, JsonData.of(persistentSettingValue));
 
-        PutClusterSettingsRequest request = new PutClusterSettingsRequest.Builder()
-                .persistent(persistentSettingsMap)
-                .transient_(transientSettingsMap)
-                .build();
+        PutClusterSettingsRequest request = new PutClusterSettingsRequest.Builder().persistent(persistentSettingsMap)
+            .transient_(transientSettingsMap)
+            .build();
         PutClusterSettingsResponse response = openSearchClient.cluster().putSettings(request);
 
         assertTrue(response.acknowledged());
         assertThat(response.transient_().get(transientSettingKeySplit[0]), notNullValue());
         assertThat(response.transient_().get(persistentSettingKeySplit[0]), nullValue());
         assertEquals(
-                response.transient_().get(transientSettingKeySplit[0]).toJson().asJsonObject()
-                        .getJsonObject("recovery")
-                        .getString("max_bytes_per_sec"),
-                transientSettingValue
+            response.transient_()
+                .get(transientSettingKeySplit[0])
+                .toJson()
+                .asJsonObject()
+                .getJsonObject("recovery")
+                .getString("max_bytes_per_sec"),
+            transientSettingValue
         );
         assertThat(response.persistent().get(transientSettingKeySplit[0]), nullValue());
         assertThat(response.persistent().get(persistentSettingKeySplit[0]), notNullValue());
         assertEquals(
-                response.persistent().get(persistentSettingKeySplit[0]).toJson().asJsonObject()
-                        .getJsonObject("routing")
-                        .getJsonObject("allocation")
-                        .getString("enable"),
-                persistentSettingValue
+            response.persistent()
+                .get(persistentSettingKeySplit[0])
+                .toJson()
+                .asJsonObject()
+                .getJsonObject("routing")
+                .getJsonObject("allocation")
+                .getString("enable"),
+            persistentSettingValue
         );
     }
 
@@ -86,9 +90,7 @@ public void testClusterUpdateSettingNonExistent() throws IOException {
         Map<String, JsonData> transientSettingsMap = new HashMap<>();
         transientSettingsMap.put(setting, JsonData.of(value));
 
-        PutClusterSettingsRequest request = new PutClusterSettingsRequest.Builder()
-                .transient_(transientSettingsMap)
-                .build();
+        PutClusterSettingsRequest request = new PutClusterSettingsRequest.Builder().transient_(transientSettingsMap).build();
         try {
             openSearchClient.cluster().putSettings(request);
             fail();
@@ -96,9 +98,8 @@ public void testClusterUpdateSettingNonExistent() throws IOException {
             assertNotNull(e);
             assertEquals(e.response().status(), 400);
             assertEquals(
-                    e.getMessage(),
-                    "Request failed: [illegal_argument_exception] " +
-                            "transient setting [no_idea_what_you_are_talking_about], not recognized"
+                e.getMessage(),
+                "Request failed: [illegal_argument_exception] " + "transient setting [no_idea_what_you_are_talking_about], not recognized"
             );
         }
     }
@@ -118,21 +119,23 @@ public void testClusterGetSettings() throws IOException {
         transientSettingsMap.put(transientSettingKey, JsonData.of(transientSettingValue));
         persistentSettingsMap.put(persistentSettingKey, JsonData.of(persistentSettingValue));
 
-        PutClusterSettingsRequest request = new PutClusterSettingsRequest.Builder()
-                .persistent(persistentSettingsMap)
-                .transient_(transientSettingsMap)
-                .build();
+        PutClusterSettingsRequest request = new PutClusterSettingsRequest.Builder().persistent(persistentSettingsMap)
+            .transient_(transientSettingsMap)
+            .build();
         openSearchClient.cluster().putSettings(request);
 
         GetClusterSettingsResponse getSettingsResponse = openSearchClient.cluster()
-                .getSettings(new GetClusterSettingsRequest.Builder().build());
+            .getSettings(new GetClusterSettingsRequest.Builder().build());
         assertTrue(getSettingsResponse.persistent().containsKey("cluster"));
         assertEquals(
-                getSettingsResponse.persistent().get("cluster").toJson().asJsonObject()
-                        .getJsonObject("routing")
-                        .getJsonObject("allocation")
-                        .getString("enable"),
-                persistentSettingValue
+            getSettingsResponse.persistent()
+                .get("cluster")
+                .toJson()
+                .asJsonObject()
+                .getJsonObject("routing")
+                .getJsonObject("allocation")
+                .getString("enable"),
+            persistentSettingValue
         );
         assertEquals(1, getSettingsResponse.transient_().size());
         assertEquals(0, getSettingsResponse.defaults().size());
@@ -153,31 +156,33 @@ public void testClusterGetSettingsWithDefault() throws IOException {
         transientSettingsMap.put(transientSettingKey, JsonData.of(transientSettingValue));
         persistentSettingsMap.put(persistentSettingKey, JsonData.of(persistentSettingValue));
 
-        PutClusterSettingsRequest request = new PutClusterSettingsRequest.Builder()
-                .persistent(persistentSettingsMap)
-                .transient_(transientSettingsMap)
-                .build();
+        PutClusterSettingsRequest request = new PutClusterSettingsRequest.Builder().persistent(persistentSettingsMap)
+            .transient_(transientSettingsMap)
+            .build();
         openSearchClient.cluster().putSettings(request);
 
-        GetClusterSettingsResponse getSettingsResponse = openSearchClient.cluster().getSettings(new GetClusterSettingsRequest.Builder()
-                .includeDefaults(true).build());
+        GetClusterSettingsResponse getSettingsResponse = openSearchClient.cluster()
+            .getSettings(new GetClusterSettingsRequest.Builder().includeDefaults(true).build());
         assertTrue(getSettingsResponse.persistent().containsKey("cluster"));
         assertEquals(
-                getSettingsResponse.persistent().get("cluster").toJson().asJsonObject()
-                        .getJsonObject("routing")
-                        .getJsonObject("allocation")
-                        .getString("enable"),
-                persistentSettingValue
+            getSettingsResponse.persistent()
+                .get("cluster")
+                .toJson()
+                .asJsonObject()
+                .getJsonObject("routing")
+                .getJsonObject("allocation")
+                .getString("enable"),
+            persistentSettingValue
         );
         assertEquals(1, getSettingsResponse.transient_().size());
-        assertTrue(getSettingsResponse.defaults().size()>0);
+        assertTrue(getSettingsResponse.defaults().size() > 0);
     }
 
     public void testClusterHealthYellowClusterLevel() throws IOException {
         OpenSearchClient openSearchClient = javaClient();
         createIndex("index", Settings.EMPTY);
         createIndex("index2", Settings.EMPTY);
-        HealthRequest request = new HealthRequest.Builder().timeout(t->t.time("5s")).build();
+        HealthRequest request = new HealthRequest.Builder().timeout(t -> t.time("5s")).build();
         HealthResponse response = openSearchClient.cluster().health(request);
         assertEquals(response.indices().size(), 0);
     }
@@ -194,11 +199,10 @@ public void testClusterHealthYellowIndicesLevel() throws IOException {
         if (randomBoolean()) {
             createIndex(ignoredIndex, Settings.EMPTY);
         }
-        HealthRequest request = new HealthRequest.Builder()
-                .index(firstIndex, secondIndex)
-                .timeout(t->t.time("5s"))
-                .level(Level.Indices)
-                .build();
+        HealthRequest request = new HealthRequest.Builder().index(firstIndex, secondIndex)
+            .timeout(t -> t.time("5s"))
+            .level(Level.Indices)
+            .build();
         HealthResponse response = openSearchClient.cluster().health(request);
         assertYellowShards(response);
         assertEquals(response.indices().size(), 2);
@@ -215,7 +219,7 @@ private static void assertYellowShards(HealthResponse response) {
         assertEquals(response.numberOfDataNodes(), 1);
         assertEquals(response.numberOfNodes(), 1);
         assertEquals(response.activeShards(), 2);
-        assertEquals(response.delayedUnassignedShards(),0);
+        assertEquals(response.delayedUnassignedShards(), 0);
         assertEquals(response.initializingShards(), 0);
         assertEquals(response.unassignedShards(), 2);
     }
@@ -224,11 +228,7 @@ public void testClusterHealthYellowSpecificIndex() throws IOException {
         OpenSearchClient openSearchClient = javaClient();
         createIndex("index", Settings.EMPTY);
         createIndex("index2", Settings.EMPTY);
-        HealthRequest request = new HealthRequest.Builder()
-                .index("index")
-                .timeout(t->t.time("5s"))
-                .level(Level.Shards)
-                .build();
+        HealthRequest request = new HealthRequest.Builder().index("index").timeout(t -> t.time("5s")).level(Level.Shards).build();
         HealthResponse response = openSearchClient.cluster().health(request);
 
         assertNotNull(response);
@@ -248,7 +248,7 @@ public void testClusterHealthYellowSpecificIndex() throws IOException {
 
     private static void assertYellowIndex(String indexName, IndexHealthStats indexHealth, boolean emptyShards) {
         assertNotNull(indexHealth);
-        assertEquals(indexHealth.activePrimaryShards(),1);
+        assertEquals(indexHealth.activePrimaryShards(), 1);
         assertEquals(indexHealth.activeShards(), 1);
         assertEquals(indexHealth.numberOfReplicas(), 1);
         assertEquals(indexHealth.initializingShards(), 0);
@@ -288,11 +288,10 @@ private static void assertNoIndices(HealthResponse response) {
     public void testClusterHealthNotFoundIndex() throws IOException {
         OpenSearchClient openSearchClient = javaClient();
         createIndex("index", Settings.EMPTY);
-        HealthRequest request = new HealthRequest.Builder()
-                .index("notexisted-index")
-                .timeout(t->t.time("5s"))
-                .level(Level.Indices)
-                .build();
+        HealthRequest request = new HealthRequest.Builder().index("notexisted-index")
+            .timeout(t -> t.time("5s"))
+            .level(Level.Indices)
+            .build();
         try {
             HealthResponse response = openSearchClient.cluster().health(request);
             assertNotNull(response);
@@ -303,4 +302,4 @@ public void testClusterHealthNotFoundIndex() throws IOException {
             assertNotNull(e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractCrudIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractCrudIT.java
index dbf45cd4e6..16a9d5ff57 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractCrudIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractCrudIT.java
@@ -8,6 +8,10 @@
 
 package org.opensearch.client.opensearch.integTest;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.format.DateTimeFormat;
@@ -34,11 +38,6 @@
 import org.opensearch.client.opensearch.indices.DeleteIndexResponse;
 import org.opensearch.client.transport.endpoints.BooleanResponse;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 public abstract class AbstractCrudIT extends OpenSearchJavaClientTestCase {
 
     public void testDelete() throws IOException {
@@ -59,11 +58,7 @@ public void testDelete() throws IOException {
             String index = "my-index1";
             javaClient().indices().create(b -> b.index(index));
 
-            String id = javaClient().index(b -> b
-                    .index(index)
-                    .id(docId)
-                    .document(Collections.singletonMap("foo", "bar")))
-                    .id();
+            String id = javaClient().index(b -> b.index(index).id(docId).document(Collections.singletonMap("foo", "bar"))).id();
             assertEquals(id, docId);
 
             DeleteResponse deleteResponse = javaClient().delete(d -> d.id(docId).index(index));
@@ -84,19 +79,13 @@ public void testExists() throws IOException {
         assertFalse(javaClient().indices().exists(b -> b.index("index")).value());
         String index = "ingest-test";
         // Create an index
-        CreateIndexResponse createIndexResponse = javaClient().indices().create(b -> b
-                .index(index)
-        );
+        CreateIndexResponse createIndexResponse = javaClient().indices().create(b -> b.index(index));
         assertEquals(index, createIndexResponse.index());
 
         // Check that it actually exists. Example of a boolean response
         assertTrue(javaClient().indices().exists(b -> b.index(index)).value());
 
-        javaClient().index(b -> b
-                .index(index)
-                .id("id")
-                .document(Collections.singletonMap("foo", "bar"))
-                .refresh(Refresh.True));
+        javaClient().index(b -> b.index(index).id("id").document(Collections.singletonMap("foo", "bar")).refresh(Refresh.True));
 
         assertTrue(javaClient().exists(b -> b.index(index).id("id")).value());
         assertFalse(javaClient().exists(b -> b.index(index).id("random_id")).value());
@@ -109,31 +98,18 @@ public void testSourceExists() throws IOException {
         appData.setMsg("foo");
 
         {
-            ExistsSourceRequest request = new ExistsSourceRequest.Builder()
-                    .index("index")
-                    .id("id")
-                    .build();
+            ExistsSourceRequest request = new ExistsSourceRequest.Builder().index("index").id("id").build();
             BooleanResponse response = javaClient().existsSource(request);
             assertFalse(response.value());
         }
-        javaClient().index(b -> b
-                .index("index")
-                .id("id")
-                .refresh(Refresh.True)
-                .document(appData));
+        javaClient().index(b -> b.index("index").id("id").refresh(Refresh.True).document(appData));
         {
-            ExistsSourceRequest request = new ExistsSourceRequest.Builder()
-                    .index("index")
-                    .id("id")
-                    .build();
+            ExistsSourceRequest request = new ExistsSourceRequest.Builder().index("index").id("id").build();
             BooleanResponse response = javaClient().existsSource(request);
             assertTrue(response.value());
         }
         {
-            ExistsSourceRequest request = new ExistsSourceRequest.Builder()
-                    .index("index")
-                    .id("does_not_exist")
-                    .build();
+            ExistsSourceRequest request = new ExistsSourceRequest.Builder().index("index").id("does_not_exist").build();
             BooleanResponse response = javaClient().existsSource(request);
             assertFalse(response.value());
         }
@@ -143,12 +119,11 @@ public void testGet() throws IOException {
 
         {
             OpenSearchException exception = expectThrows(
-                    OpenSearchException.class,
-                    () -> javaClient().get(new GetRequest.Builder().index("index").id("id").build(), String.class)
+                OpenSearchException.class,
+                () -> javaClient().get(new GetRequest.Builder().index("index").id("id").build(), String.class)
             );
             assertEquals(404, exception.status());
-            assertEquals("Request failed: [index_not_found_exception] no such index [index]",
-                    exception.getMessage());
+            assertEquals("Request failed: [index_not_found_exception] no such index [index]", exception.getMessage());
         }
 
         AppData appData = new AppData();
@@ -158,12 +133,7 @@ public void testGet() throws IOException {
         javaClient().index(b -> b.index("index").id("id").document(appData).refresh(Refresh.True));
 
         {
-            GetResponse<AppData> getResponse = javaClient().get(b -> b
-                            .index("index")
-                            .id("id")
-                            .version(1L)
-                    , AppData.class
-            );
+            GetResponse<AppData> getResponse = javaClient().get(b -> b.index("index").id("id").version(1L), AppData.class);
             assertEquals("index", getResponse.index());
             assertEquals("id", getResponse.id());
             assertTrue(getResponse.found());
@@ -172,11 +142,7 @@ public void testGet() throws IOException {
             assertEquals(appData.getMsg(), getResponse.source().getMsg());
         }
         {
-            GetResponse<AppData> getResponse = javaClient().get(b -> b
-                            .index("index")
-                            .id("does_not_exist")
-                    , AppData.class
-            );
+            GetResponse<AppData> getResponse = javaClient().get(b -> b.index("index").id("does_not_exist"), AppData.class);
             assertEquals("index", getResponse.index());
             assertEquals("does_not_exist", getResponse.id());
             assertFalse(getResponse.found());
@@ -190,17 +156,9 @@ public void testGetWithTypes() throws IOException {
         appData.setIntValue(1337);
         appData.setMsg("foo");
 
-        javaClient().index(b -> b
-                .index("index")
-                .id("id")
-                .document(appData)
-                .refresh(Refresh.True));
+        javaClient().index(b -> b.index("index").id("id").document(appData).refresh(Refresh.True));
 
-        GetResponse<AppData> getResponse = javaClient().get(b -> b
-                        .index("index")
-                        .id("id")
-                , AppData.class
-        );
+        GetResponse<AppData> getResponse = javaClient().get(b -> b.index("index").id("id"), AppData.class);
 
         assertEquals("index", getResponse.index());
         assertEquals("id", getResponse.id());
@@ -219,27 +177,17 @@ public void testMultiGet() throws IOException {
             List<String> ids = new ArrayList<>();
             ids.add("id1");
             ids.add("id2");
-            MgetResponse<AppData> response = javaClient().mget(b -> b
-                            .index("index")
-                            .ids(ids)
-                    , AppData.class
-            );
+            MgetResponse<AppData> response = javaClient().mget(b -> b.index("index").ids(ids), AppData.class);
             assertEquals(2, response.docs().size());
 
             assertTrue(response.docs().get(0).isFailure());
             assertEquals("id1", response.docs().get(0).failure().id());
             assertEquals("index", response.docs().get(0).failure().index());
-            assertEquals(
-                    "no such index [index]",
-                    response.docs().get(0).failure().error().reason()
-            );
+            assertEquals("no such index [index]", response.docs().get(0).failure().error().reason());
             assertTrue(response.docs().get(1).isFailure());
             assertEquals("id2", response.docs().get(1).failure().id());
             assertEquals("index", response.docs().get(1).failure().index());
-            assertEquals(
-                    "no such index [index]",
-                    response.docs().get(1).failure().error().reason()
-            );
+            assertEquals("no such index [index]", response.docs().get(1).failure().error().reason());
         }
     }
 
@@ -253,11 +201,10 @@ public void testUpdate() throws Exception {
         appData.setMsg("bar");
 
         {
-            UpdateRequest<AppData, AppData> updateRequest = new UpdateRequest.Builder<AppData, AppData>()
-                    .index("index")
-                    .id("does_not_exist")
-                    .doc(appData)
-                    .build();
+            UpdateRequest<AppData, AppData> updateRequest = new UpdateRequest.Builder<AppData, AppData>().index("index")
+                .id("does_not_exist")
+                .doc(appData)
+                .build();
             try {
                 javaClient().update(updateRequest, AppData.class);
             } catch (OpenSearchException e) {
@@ -269,22 +216,17 @@ public void testUpdate() throws Exception {
             }
         }
         {
-            IndexRequest<AppData> indexRequest = new IndexRequest.Builder<AppData>()
-                    .index("index")
-                    .id("id")
-                    .document(appData)
-                    .build();
+            IndexRequest<AppData> indexRequest = new IndexRequest.Builder<AppData>().index("index").id("id").document(appData).build();
             IndexResponse indexResponse = javaClient().index(indexRequest);
             assertEquals(Result.Created, indexResponse.result());
 
             long lastUpdateSeqNo;
             long lastUpdatePrimaryTerm;
             {
-                UpdateRequest<AppData, AppData> updateRequest = new UpdateRequest.Builder<AppData, AppData>()
-                        .index("index")
-                        .id("id")
-                        .doc(updatedAppData)
-                        .build();
+                UpdateRequest<AppData, AppData> updateRequest = new UpdateRequest.Builder<AppData, AppData>().index("index")
+                    .id("id")
+                    .doc(updatedAppData)
+                    .build();
                 UpdateResponse<AppData> updateResponse = javaClient().update(updateRequest, AppData.class);
                 assertEquals(Result.Updated, updateResponse.result());
                 assertEquals(indexResponse.version() + 1, updateResponse.version());
@@ -307,18 +249,13 @@ public void testUpdateWithTypes() throws IOException {
         appData.setIntValue(3333);
         appData.setMsg("bar");
 
-        IndexRequest<AppData> indexRequest = new IndexRequest.Builder<AppData>()
-                .index("index")
-                .id("id")
-                .document(appData)
-                .build();
+        IndexRequest<AppData> indexRequest = new IndexRequest.Builder<AppData>().index("index").id("id").document(appData).build();
         IndexResponse indexResponse = javaClient().index(indexRequest);
 
-        UpdateRequest<AppData, AppData> updateRequest = new UpdateRequest.Builder<AppData, AppData>()
-                .index("index")
-                .id("id")
-                .doc(updatedAppData)
-                .build();
+        UpdateRequest<AppData, AppData> updateRequest = new UpdateRequest.Builder<AppData, AppData>().index("index")
+            .id("id")
+            .doc(updatedAppData)
+            .build();
         UpdateResponse<AppData> updateResponse = javaClient().update(updateRequest, AppData.class);
 
         assertEquals(Result.Updated, updateResponse.result());
@@ -338,14 +275,15 @@ public void testBulk() throws IOException {
             String id = String.valueOf(i);
             boolean erroneous = randomBoolean();
             errors[i] = erroneous;
-            BulkOperation.Kind opType = randomFrom(BulkOperation.Kind.Delete, BulkOperation.Kind.Index,
-                    BulkOperation.Kind.Create, BulkOperation.Kind.Update);
+            BulkOperation.Kind opType = randomFrom(
+                BulkOperation.Kind.Delete,
+                BulkOperation.Kind.Index,
+                BulkOperation.Kind.Create,
+                BulkOperation.Kind.Update
+            );
             if (opType.equals(BulkOperation.Kind.Delete)) {
                 if (!erroneous) {
-                    assertEquals(
-                            Result.Created,
-                            javaClient().index(b -> b.index("index").id(id).document(appData)).result()
-                    );
+                    assertEquals(Result.Created, javaClient().index(b -> b.index("index").id(id).document(appData)).result());
                 }
                 BulkOperation op = new BulkOperation.Builder().delete(d -> d.index("index").id(id)).build();
                 opsList.add(op);
@@ -353,39 +291,26 @@ public void testBulk() throws IOException {
                 appData.setIntValue(i);
                 appData.setMsg("id");
                 if (opType.equals(BulkOperation.Kind.Index)) {
-                    BulkOperation op = new BulkOperation.Builder().index(b -> b
-                            .index("index")
-                            .id(id)
-                            .document(appData)
-                            .ifSeqNo(erroneous ? 12L : null)
-                            .ifPrimaryTerm(erroneous ? 12L : null)).build();
+                    BulkOperation op = new BulkOperation.Builder().index(
+                        b -> b.index("index").id(id).document(appData).ifSeqNo(erroneous ? 12L : null).ifPrimaryTerm(erroneous ? 12L : null)
+                    ).build();
                     opsList.add(op);
 
                 } else if (opType.equals(BulkOperation.Kind.Create)) {
-                    BulkOperation op = new BulkOperation.Builder().create(o -> o
-                            .index("index")
-                            .id(id)
-                            .document(appData)
-                    ).build();
+                    BulkOperation op = new BulkOperation.Builder().create(o -> o.index("index").id(id).document(appData)).build();
                     opsList.add(op);
 
                     if (erroneous) {
-                        assertEquals(Result.Created, javaClient().index(b -> b.
-                                index("index").id(id).document(appData)).result());
+                        assertEquals(Result.Created, javaClient().index(b -> b.index("index").id(id).document(appData)).result());
                     }
 
                 } else if (opType.equals(BulkOperation.Kind.Update)) {
-                    BulkOperation op = new BulkOperation.Builder().update(o -> o
-                            .index("index")
-                            .id(id)
-                            .document(Collections.singletonMap("key", "value"))
+                    BulkOperation op = new BulkOperation.Builder().update(
+                        o -> o.index("index").id(id).document(Collections.singletonMap("key", "value"))
                     ).build();
                     opsList.add(op);
                     if (!erroneous) {
-                        assertEquals(
-                                Result.Created,
-                                javaClient().index(b -> b.index("index").id(id).document(appData)).result()
-                        );
+                        assertEquals(Result.Created, javaClient().index(b -> b.index("index").id(id).document(appData)).result());
                     }
                 }
             }
@@ -406,20 +331,22 @@ public void testBulkUpdateScript() throws IOException {
         appData.setIntValue(1337);
         appData.setMsg("foo");
 
-        assertEquals(
-            Result.Created,
-            javaClient().index(b -> b.index("index").id(id).document(appData)).result()
-        );
+        assertEquals(Result.Created, javaClient().index(b -> b.index("index").id(id).document(appData)).result());
 
-        final BulkOperation op = new BulkOperation.Builder().update(o -> o
-                .index("index")
+        final BulkOperation op = new BulkOperation.Builder().update(
+            o -> o.index("index")
                 .id(id)
-                .script(Script.of(s -> s.inline(new InlineScript.Builder()
-                    .lang("painless")
-                    .source("ctx._source.intValue += params.inc")
-                    .params("inc", JsonData.of(1))
-                    .build())))
-            ).build();
+                .script(
+                    Script.of(
+                        s -> s.inline(
+                            new InlineScript.Builder().lang("painless")
+                                .source("ctx._source.intValue += params.inc")
+                                .params("inc", JsonData.of(1))
+                                .build()
+                        )
+                    )
+                )
+        ).build();
 
         BulkRequest bulkRequest = new BulkRequest.Builder().operations(op).build();
         BulkResponse bulkResponse = javaClient().bulk(bulkRequest);
@@ -439,16 +366,21 @@ public void testBulkUpdateScriptUpsert() throws IOException {
         appData.setIntValue(1337);
         appData.setMsg("foo");
 
-        final BulkOperation op = new BulkOperation.Builder().update(o -> o
-                .index("index")
+        final BulkOperation op = new BulkOperation.Builder().update(
+            o -> o.index("index")
                 .id(id)
                 .upsert(appData)
-                .script(Script.of(s -> s.inline(new InlineScript.Builder()
-                    .lang("painless")
-                    .source("ctx._source.intValue += params.inc")
-                    .params("inc", JsonData.of(1))
-                    .build())))
-            ).build();
+                .script(
+                    Script.of(
+                        s -> s.inline(
+                            new InlineScript.Builder().lang("painless")
+                                .source("ctx._source.intValue += params.inc")
+                                .params("inc", JsonData.of(1))
+                                .build()
+                        )
+                    )
+                )
+        ).build();
 
         BulkRequest bulkRequest = new BulkRequest.Builder().operations(op).build();
         BulkResponse bulkResponse = javaClient().bulk(bulkRequest);
@@ -468,12 +400,8 @@ public void testBulkUpdateUpsert() throws IOException {
         appData.setIntValue(1337);
         appData.setMsg("foo");
 
-        final BulkOperation op = new BulkOperation.Builder().update(o -> o
-                .index("index")
-                .id(id)
-                .document(new AppData())
-                .upsert(appData)
-            ).build();
+        final BulkOperation op = new BulkOperation.Builder().update(o -> o.index("index").id(id).document(new AppData()).upsert(appData))
+            .build();
 
         BulkRequest bulkRequest = new BulkRequest.Builder().operations(op).build();
         BulkResponse bulkResponse = javaClient().bulk(bulkRequest);
@@ -509,7 +437,7 @@ private void validateBulkResponses(int nbItems, boolean[] errors, BulkResponse b
     public void testUrlEncode() throws IOException {
         String indexPattern = "<logstash-{now/M}>";
         String expectedIndex = "logstash-"
-                + DateTimeFormat.forPattern("YYYY.MM.dd").print(new DateTime(DateTimeZone.UTC).monthOfYear().roundFloorCopy());
+            + DateTimeFormat.forPattern("YYYY.MM.dd").print(new DateTime(DateTimeZone.UTC).monthOfYear().roundFloorCopy());
         AppData appData = new AppData();
         appData.setIntValue(1337);
         appData.setMsg("foo");
@@ -519,8 +447,7 @@ public void testUrlEncode() throws IOException {
             assertEquals("id#1", response.id());
         }
         {
-            GetResponse<AppData> getResponse = javaClient().get(b -> b
-                    .index(indexPattern).id("id#1"), AppData.class);
+            GetResponse<AppData> getResponse = javaClient().get(b -> b.index(indexPattern).id("id#1"), AppData.class);
             assertTrue(getResponse.found());
             assertEquals(expectedIndex, getResponse.index());
             assertEquals("id#1", getResponse.id());
@@ -533,8 +460,7 @@ public void testUrlEncode() throws IOException {
             assertEquals(docId, indexResponse.id());
         }
         {
-            GetResponse<AppData> getResponse = javaClient().get(b -> b
-                    .index("index").id(docId), AppData.class);
+            GetResponse<AppData> getResponse = javaClient().get(b -> b.index("index").id(docId), AppData.class);
             assertTrue(getResponse.found());
             assertEquals("index", getResponse.index());
             assertEquals(docId, getResponse.id());
@@ -555,8 +481,7 @@ public void testParamsEncode() throws IOException {
             assertEquals(id, response.id());
         }
         {
-            GetResponse<AppData> getResponse = javaClient().get(b -> b
-                    .index("index").id("id").routing(routing), AppData.class);
+            GetResponse<AppData> getResponse = javaClient().get(b -> b.index("index").id("id").routing(routing), AppData.class);
             assertTrue(getResponse.found());
             assertEquals("index", getResponse.index());
             assertEquals("id", getResponse.id());
@@ -571,14 +496,12 @@ public void testGetIdWithPlusSign() throws Exception {
         appData.setMsg("foo");
 
         {
-            IndexResponse indexResponse = javaClient().index(b -> b
-                    .index("index").id(id).document(appData));
+            IndexResponse indexResponse = javaClient().index(b -> b.index("index").id(id).document(appData));
             assertEquals("index", indexResponse.index());
             assertEquals(id, indexResponse.id());
         }
         {
-            GetResponse<AppData> getResponse = javaClient().get(b -> b
-                    .index("index").id(id), AppData.class);
+            GetResponse<AppData> getResponse = javaClient().get(b -> b.index("index").id(id), AppData.class);
             assertTrue(getResponse.found());
             assertEquals("index", getResponse.index());
             assertEquals(id, getResponse.id());
@@ -605,4 +528,4 @@ public void setMsg(String msg) {
             this.msg = msg;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractHighlightIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractHighlightIT.java
index 6698f9a828..0b95463975 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractHighlightIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractHighlightIT.java
@@ -8,6 +8,11 @@
 
 package org.opensearch.client.opensearch.integTest;
 
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import org.junit.Test;
 import org.opensearch.client.opensearch._types.Refresh;
 import org.opensearch.client.opensearch.core.SearchResponse;
@@ -15,12 +20,6 @@
 import org.opensearch.client.opensearch.core.search.Hit;
 import org.opensearch.client.util.ObjectBuilder;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 public abstract class AbstractHighlightIT extends OpenSearchJavaClientTestCase {
 
     @Test
@@ -28,8 +27,7 @@ public void testDefaultHighlight() throws Exception {
         String index = "queries_highlight";
         createTestDocuments(index);
 
-        List<Map<String, List<String>>> highlights = highlightQuery("spread",
-                h -> h.fields("content", b -> b));
+        List<Map<String, List<String>>> highlights = highlightQuery("spread", h -> h.fields("content", b -> b));
 
         assertEquals(2, highlights.size());
         for (Map<String, List<String>> hit : highlights) {
@@ -44,8 +42,10 @@ public void testMultiFieldHighlight() throws Exception {
         String index = "queries_highlight";
         createTestDocuments(index);
 
-        List<Map<String, List<String>>> highlights = highlightQuery("real decades",
-                h -> h.fields("title", b -> b).fields("content", b -> b));
+        List<Map<String, List<String>>> highlights = highlightQuery(
+            "real decades",
+            h -> h.fields("title", b -> b).fields("content", b -> b)
+        );
 
         assertEquals(3, highlights.size());
         for (Map<String, List<String>> hit : highlights) {
@@ -62,8 +62,10 @@ public void testDifferentMarkersHighlight() throws Exception {
         String index = "queries_highlight";
         createTestDocuments(index);
 
-        List<Map<String, List<String>>> highlights = highlightQuery("spread",
-                h -> h.preTags("<b>").postTags("</b>").fields("content", b -> b));
+        List<Map<String, List<String>>> highlights = highlightQuery(
+            "spread",
+            h -> h.preTags("<b>").postTags("</b>").fields("content", b -> b)
+        );
 
         assertEquals(2, highlights.size());
         for (Map<String, List<String>> hit : highlights) {
@@ -88,8 +90,7 @@ public void testAnalyzerOffset() throws Exception {
         if (major >= 2 && minor >= 2) {
             String index = "queries_highlight";
             createTestDocuments(index);
-            List<Map<String, List<String>>> highlights = highlightQuery("real",
-                    h -> h.maxAnalyzerOffset("5").fields("title", b -> b));
+            List<Map<String, List<String>>> highlights = highlightQuery("real", h -> h.maxAnalyzerOffset("5").fields("title", b -> b));
 
             assertEquals(3, highlights.size());
             assertEquals(0, highlights.get(0).size());
@@ -101,29 +102,40 @@ public void testAnalyzerOffset() throws Exception {
         }
     }
 
-    private List<Map<String, List<String>>> highlightQuery(String query,
-                                                           Function<Highlight.Builder, ObjectBuilder<Highlight>> fn)
-            throws IOException {
-        SearchResponse<Article> response = javaClient()
-                .search(s -> s
-                        .query(q -> q
-                                .simpleQueryString(sqs -> sqs
-                                        .fields("title", "content", "author")
-                                        .query(query)))
-                        .highlight(fn), Article.class);
+    private List<Map<String, List<String>>> highlightQuery(String query, Function<Highlight.Builder, ObjectBuilder<Highlight>> fn)
+        throws IOException {
+        SearchResponse<Article> response = javaClient().search(
+            s -> s.query(q -> q.simpleQueryString(sqs -> sqs.fields("title", "content", "author").query(query))).highlight(fn),
+            Article.class
+        );
         return response.hits().hits().stream().map(Hit::highlight).collect(Collectors.toList());
     }
 
     private void createTestDocuments(String index) throws IOException {
-        javaClient().create(_1 -> _1.index(index).id("1").document(createArticle(
-                        "Superheroes are Real", "Meet these man avoid the fire spread during last decades.", "John Doe"))
-                .refresh(Refresh.True));
-        javaClient().create(_1 -> _1.index(index).id("2").document(createArticle(
-                        "Real Slow Ideas", "Why some innovations spread quick while others take decades to catch hold.", "John Foo"))
-                .refresh(Refresh.True));
-        javaClient().create(_1 -> _1.index(index).id("3").document(createArticle(
-                        "Real Two Degrees", "How the world failed on climate change during the decades.", "Anne Doe"))
-                .refresh(Refresh.True));
+        javaClient().create(
+            _1 -> _1.index(index)
+                .id("1")
+                .document(createArticle("Superheroes are Real", "Meet these man avoid the fire spread during last decades.", "John Doe"))
+                .refresh(Refresh.True)
+        );
+        javaClient().create(
+            _1 -> _1.index(index)
+                .id("2")
+                .document(
+                    createArticle(
+                        "Real Slow Ideas",
+                        "Why some innovations spread quick while others take decades to catch hold.",
+                        "John Foo"
+                    )
+                )
+                .refresh(Refresh.True)
+        );
+        javaClient().create(
+            _1 -> _1.index(index)
+                .id("3")
+                .document(createArticle("Real Two Degrees", "How the world failed on climate change during the decades.", "Anne Doe"))
+                .refresh(Refresh.True)
+        );
     }
 
     private Article createArticle(String title, String content, String author) {
@@ -135,8 +147,7 @@ public static class Article {
         public String content;
         public String author;
 
-        public Article() {
-        }
+        public Article() {}
 
         public Article(String title, String content, String author) {
             this.title = title;
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractIndicesClientIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractIndicesClientIT.java
index 869e63cc1c..a3f360d245 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractIndicesClientIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractIndicesClientIT.java
@@ -8,6 +8,10 @@
 
 package org.opensearch.client.opensearch.integTest;
 
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 import org.opensearch.client.opensearch.OpenSearchAsyncClient;
 import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch.indices.CreateDataStreamResponse;
@@ -25,11 +29,6 @@
 import org.opensearch.client.opensearch.indices.PutIndexTemplateResponse;
 import org.opensearch.common.settings.Settings;
 
-import java.io.IOException;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
 public abstract class AbstractIndicesClientIT extends OpenSearchJavaClientTestCase {
     public void testIndicesExists() throws IOException {
 
@@ -56,9 +55,7 @@ public void testIndicesExists() throws IOException {
             } catch (OpenSearchException ex) {
                 assertNotNull(ex);
                 assertEquals(ex.status(), 404);
-                assertEquals(ex.getMessage(),
-                        "Request failed: [index_not_found_exception] " +
-                                "no such index [non_existent_index]");
+                assertEquals(ex.getMessage(), "Request failed: [index_not_found_exception] " + "no such index [non_existent_index]");
             }
         }
 
@@ -100,8 +97,7 @@ public void testGetSettingsNonExistentIndex() throws IOException {
 
         String nonExistentIndex = "index_that_doesnt_exist";
 
-        GetIndicesSettingsRequest getIndicesSettingsRequest = new GetIndicesSettingsRequest.Builder()
-                .index(nonExistentIndex).build();
+        GetIndicesSettingsRequest getIndicesSettingsRequest = new GetIndicesSettingsRequest.Builder().index(nonExistentIndex).build();
 
         try {
             javaClient().indices().getSettings(getIndicesSettingsRequest);
@@ -109,9 +105,7 @@ public void testGetSettingsNonExistentIndex() throws IOException {
         } catch (OpenSearchException ex) {
             assertNotNull(ex);
             assertEquals(ex.status(), 404);
-            assertEquals(ex.getMessage(),
-                    "Request failed: [index_not_found_exception] " +
-                            "no such index [index_that_doesnt_exist]");
+            assertEquals(ex.getMessage(), "Request failed: [index_not_found_exception] " + "no such index [index_that_doesnt_exist]");
         }
     }
 
@@ -123,21 +117,19 @@ public void testDataStream() throws IOException {
 
         // create an index template before creating data streams
         PutIndexTemplateResponse putIndexTemplateResponse = javaClient().indices()
-                .putIndexTemplate(b -> b.name(dataStreamIndexTemplateName)
-                                        .dataStream(new DataStream.Builder()
-                                                .timestampField(bd -> bd.name(timestampFieldName))
-                                                .build())
-                                        .indexPatterns(namePattern));
+            .putIndexTemplate(
+                b -> b.name(dataStreamIndexTemplateName)
+                    .dataStream(new DataStream.Builder().timestampField(bd -> bd.name(timestampFieldName)).build())
+                    .indexPatterns(namePattern)
+            );
         assertTrue(putIndexTemplateResponse.acknowledged());
 
         // create data streams follow the index pattern
-        CreateDataStreamResponse createDataStreamResponse1 = javaClient().indices()
-                .createDataStream(b -> b.name(dataStreamName));
+        CreateDataStreamResponse createDataStreamResponse1 = javaClient().indices().createDataStream(b -> b.name(dataStreamName));
         assertTrue(createDataStreamResponse1.acknowledged());
 
         // get data stream
-        GetDataStreamResponse getDataStreamResponse = javaClient().indices()
-                .getDataStream(b -> b.name(dataStreamName));
+        GetDataStreamResponse getDataStreamResponse = javaClient().indices().getDataStream(b -> b.name(dataStreamName));
         assertEquals(1, getDataStreamResponse.dataStreams().size());
         assertEquals(dataStreamName, getDataStreamResponse.dataStreams().get(0).name());
         assertEquals(timestampFieldName, getDataStreamResponse.dataStreams().get(0).timestampField().name());
@@ -149,8 +141,7 @@ public void testDataStream() throws IOException {
         assertEquals(1, getAllDataStreamsResponse.dataStreams().size());
 
         // get one data stream stats
-        DataStreamsStatsResponse dataStreamStatsResponse = javaClient().indices()
-                .dataStreamsStats(b -> b.name(dataStreamName).human(true));
+        DataStreamsStatsResponse dataStreamStatsResponse = javaClient().indices().dataStreamsStats(b -> b.name(dataStreamName).human(true));
         assertNotNull(dataStreamStatsResponse.shards());
         assertEquals(1, dataStreamStatsResponse.dataStreamCount());
         assertEquals(1, dataStreamStatsResponse.backingIndices());
@@ -163,8 +154,7 @@ public void testDataStream() throws IOException {
         assertNotNull(dataStreamStatsResponse.dataStreams().get(0).storeSize());
 
         // get all data streams stats
-        DataStreamsStatsResponse allDataStreamsStatsResponse = javaClient().indices()
-                .dataStreamsStats(b -> b.human(true));
+        DataStreamsStatsResponse allDataStreamsStatsResponse = javaClient().indices().dataStreamsStats(b -> b.human(true));
         assertNotNull(allDataStreamsStatsResponse.shards());
         assertEquals(1, allDataStreamsStatsResponse.dataStreamCount());
         assertEquals(1, allDataStreamsStatsResponse.backingIndices());
@@ -177,8 +167,7 @@ public void testDataStream() throws IOException {
         assertNotNull(allDataStreamsStatsResponse.dataStreams().get(0).storeSize());
 
         // delete data stream
-        DeleteDataStreamResponse deleteDataStreamResponse = javaClient().indices()
-                .deleteDataStream(b -> b.name(namePattern));
+        DeleteDataStreamResponse deleteDataStreamResponse = javaClient().indices().deleteDataStream(b -> b.name(namePattern));
         assertTrue(deleteDataStreamResponse.acknowledged());
 
         // verify data stream is deleted
@@ -200,9 +189,7 @@ public void testGetNotExistingIndexAlias() throws Exception {
         } catch (OpenSearchException ex) {
             assertNotNull(ex);
             assertEquals(ex.status(), 404);
-            assertEquals(ex.getMessage(),
-                    "Request failed: [string_error] " +
-                            "alias [alias_not_exists] missing");
+            assertEquals(ex.getMessage(), "Request failed: [string_error] " + "alias [alias_not_exists] missing");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractKnnIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractKnnIT.java
index ae3f6bee5d..c2d0d87585 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractKnnIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractKnnIT.java
@@ -24,54 +24,44 @@ public void testCanIndexAndSearchKnn() throws Exception {
 
         final String indexName = "knn-index-and-search";
 
-        var createIndexResponse = javaClient()
-                .indices()
-                .create(c -> c
-                        .index(indexName)
-                        .settings(s -> s
-                                .knn(true)
-                                .knnAlgoParamEfSearch(100))
-                        .mappings(m -> m
-                                .properties("vector", p -> p
-                                        .knnVector(k -> k
-                                                .dimension(4)
-                                                .method(km -> km
-                                                        .name("hnsw")
-                                                        .spaceType("l2")
-                                                        .engine("nmslib")
-                                                        .parameters("ef_construction", JsonData.of(256))
-                                                        .parameters("m", JsonData.of(16)))))));
+        var createIndexResponse = javaClient().indices()
+            .create(
+                c -> c.index(indexName)
+                    .settings(s -> s.knn(true).knnAlgoParamEfSearch(100))
+                    .mappings(
+                        m -> m.properties(
+                            "vector",
+                            p -> p.knnVector(
+                                k -> k.dimension(4)
+                                    .method(
+                                        km -> km.name("hnsw")
+                                            .spaceType("l2")
+                                            .engine("nmslib")
+                                            .parameters("ef_construction", JsonData.of(256))
+                                            .parameters("m", JsonData.of(16))
+                                    )
+                            )
+                        )
+                    )
+            );
 
         assertEquals(true, createIndexResponse.acknowledged());
 
         var docs = new Doc[] {
-                new Doc(new float[] { 1.5f, 5.5f, 4.5f, 6.4f }, 10.3f),
-                new Doc(new float[] { 2.5f, 3.5f, 5.6f, 6.7f }, 5.5f),
-                new Doc(new float[] { 4.5f, 5.5f, 6.7f, 3.7f }, 4.4f),
-                new Doc(new float[] { 1.5f, 5.5f, 4.5f, 6.4f }, 8.9f)
-        };
-        var bulkOps = Arrays.stream(docs)
-                .map(d -> BulkOperation.of(o -> o.index(i -> i.document(d))))
-                .collect(Collectors.toList());
-
-        var bulkResponse = javaClient()
-                .bulk(b -> b
-                        .index(indexName)
-                        .refresh(Refresh.WaitFor)
-                        .operations(bulkOps));
+            new Doc(new float[] { 1.5f, 5.5f, 4.5f, 6.4f }, 10.3f),
+            new Doc(new float[] { 2.5f, 3.5f, 5.6f, 6.7f }, 5.5f),
+            new Doc(new float[] { 4.5f, 5.5f, 6.7f, 3.7f }, 4.4f),
+            new Doc(new float[] { 1.5f, 5.5f, 4.5f, 6.4f }, 8.9f) };
+        var bulkOps = Arrays.stream(docs).map(d -> BulkOperation.of(o -> o.index(i -> i.document(d)))).collect(Collectors.toList());
+
+        var bulkResponse = javaClient().bulk(b -> b.index(indexName).refresh(Refresh.WaitFor).operations(bulkOps));
 
         assertFalse(bulkResponse.errors());
 
-        var searchResponse = javaClient()
-                .search(s -> s
-                        .index(indexName)
-                        .size(2)
-                        .query(q -> q
-                                .knn(k -> k
-                                        .field("vector")
-                                        .vector(new float[] { 2.0f, 3.0f, 5.0f, 6.0f })
-                                        .k(2))),
-                    Doc.class);
+        var searchResponse = javaClient().search(
+            s -> s.index(indexName).size(2).query(q -> q.knn(k -> k.field("vector").vector(new float[] { 2.0f, 3.0f, 5.0f, 6.0f }).k(2))),
+            Doc.class
+        );
 
         var hits = searchResponse.hits().hits();
 
@@ -83,10 +73,7 @@ public void testCanIndexAndSearchKnn() throws Exception {
     private void assumeKnnInstalled() throws IOException {
         var plugins = javaClient().cat().plugins();
 
-        var knnInstalled = plugins
-                .valueBody()
-                .stream()
-                .anyMatch(p -> Objects.equals(p.component(), "opensearch-knn"));
+        var knnInstalled = plugins.valueBody().stream().anyMatch(p -> Objects.equals(p.component(), "opensearch-knn"));
 
         assumeTrue("KNN plugin is not installed", knnInstalled);
     }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractMultiSearchRequestIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractMultiSearchRequestIT.java
index c082d9b043..273412817c 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractMultiSearchRequestIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractMultiSearchRequestIT.java
@@ -8,6 +8,13 @@
 
 package org.opensearch.client.opensearch.integTest;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 import org.junit.Test;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.opensearch._types.FieldSort;
@@ -31,363 +38,350 @@
 import org.opensearch.client.opensearch.core.search.SourceConfig;
 import org.opensearch.client.util.ObjectBuilder;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
 public abstract class AbstractMultiSearchRequestIT extends OpenSearchJavaClientTestCase {
 
-	@Test
-	public void shouldReturnMultipleSearches() throws Exception {
-		String index = "multiple_searches_request";
-		createTestDocuments(index);
-
-		RequestItem largeItemsQuery = createMSearchQuery("large");
-		RequestItem mediumItemsQuery = createMSearchQuery("medium");
-		RequestItem smallItemsQuery = createMSearchQuery("small");
-
-		MsearchResponse<ShopItem> response = sendMSearchRequest(index, List.of(largeItemsQuery, mediumItemsQuery, smallItemsQuery));
-		assertEquals(3, response.responses().size());
-		assertEquals(2, response.responses().get(0).result().hits().hits().size());
-		assertEquals(2, response.responses().get(1).result().hits().hits().size());
-		assertEquals(2, response.responses().get(2).result().hits().hits().size());
-	}
-
-	@Test
-	public void shouldReturnHighlightsInMultipleSearches() throws Exception {
-		String index = "multiple_searches_request_with_highlights";
-		createTestDocuments(index);
-
-		RequestItem largeItemsQuery = createMSearchQueryWithHighlight("large");
-		RequestItem mediumItemsQuery = createMSearchQueryWithHighlight("medium");
-		RequestItem smallItemsQuery = createMSearchQueryWithHighlight("small");
-
-		MsearchResponse<ShopItem> response = sendMSearchRequest(index, List.of(largeItemsQuery, mediumItemsQuery, smallItemsQuery));
-		assertEquals(3, response.responses().size());
-		assertResponseHighlights(response.responses().get(0));
-		assertResponseHighlights(response.responses().get(1));
-		assertResponseHighlights(response.responses().get(2));
-	}
-
-	@Test
-	public void shouldReturnMultiSearchesWithSelectedSourceFieldsOnly() throws Exception {
-		String index = "multiple_searches_request_with_sources";
-		createTestDocuments(index);
-
-		RequestItem largeItemsQuery = createMSearchQueryWithSelectedSourceFields("large");
-		RequestItem mediumItemsQuery = createMSearchQueryWithSelectedSourceFields("medium");
-		RequestItem smallItemsQuery = createMSearchQueryWithSelectedSourceFields("small");
-
-		MsearchResponse<ShopItem> response = sendMSearchRequest(index, List.of(largeItemsQuery, mediumItemsQuery, smallItemsQuery));
-		assertEquals(3, response.responses().size());
-		assertResponseSources(response.responses().get(0));
-		assertResponseSources(response.responses().get(1));
-		assertResponseSources(response.responses().get(2));
-	}
-
-	@Test
-	public void shouldReturnMultiSearchesSorted() throws Exception {
-		String index = "multiple_searches_request_sort";
-		createTestDocuments(index);
-
-		RequestItem sortedItemsQuery = createMSearchSortedFuzzyRequest();
-
-		MsearchResponse<ShopItem> response = sendMSearchRequest(index, List.of(sortedItemsQuery));
-		assertEquals(1, response.responses().size());
-		var hits = response.responses().get(0).result().hits().hits();
-		assertEquals(3, hits.size());
-
-		assertEquals("hammer", hits.get(2).source().getName());
-	}
-
-	@Test
-	public void shouldReturnMultiSearchesTrackingScores() throws Exception {
-		String index = "multiple_searches_request_track_scores";
-		createTestDocuments(index);
-
-		RequestItem sortedItemsQuery = createMSearchSortedFuzzyRequest();
-
-		MsearchResponse<ShopItem> response = sendMSearchRequest(index, List.of(sortedItemsQuery));
-		assertEquals(1, response.responses().size());
-		var hits = response.responses().get(0).result().hits().hits();
-		assertEquals(3, hits.size());
-		assertNull(hits.get(0).score());
-		assertNull(hits.get(1).score());
-		assertNull(hits.get(2).score());
-
-		RequestItem trackScoreItemsQuery = createMSearchSortedFuzzyRequest(b -> b.trackScores(true));
-
-		MsearchResponse<ShopItem> responseTrackingScore = sendMSearchRequest(index, List.of(trackScoreItemsQuery));
-		assertEquals(1, responseTrackingScore.responses().size());
-		var hitsTrackingScore = responseTrackingScore.responses().get(0).result().hits().hits();
-		assertEquals(3, hitsTrackingScore.size());
-		assertNotNull(hitsTrackingScore.get(0).score());
-		assertNotNull(hitsTrackingScore.get(1).score());
-		assertNotNull(hitsTrackingScore.get(2).score());
-	}
-
-	@Test
-	public void shouldReturnMultiSearchesAboveMinScore() throws Exception {
-		String index = "multiple_searches_request_min_score";
-		createTestDocuments(index);
-
-		RequestItem sortedItemsQuery = createMSearchFuzzyRequest();
-
-		MsearchResponse<ShopItem> response = sendMSearchRequest(index, List.of(sortedItemsQuery));
-		assertEquals(1, response.responses().size());
-		var hits = response.responses().get(0).result().hits().hits();
-		assertEquals(3, hits.size());
-
-		double minScore = hits.get(2).score();
-		double scoreBetweenFirstAndSecondLowest = (hits.get(1).score() + minScore) / 2;
-
-		RequestItem minScoredItemsQuery = createMSearchFuzzyRequest(b -> b.minScore(scoreBetweenFirstAndSecondLowest));
-
-		MsearchResponse<ShopItem> responseAboveMinScore = sendMSearchRequest(index, List.of(minScoredItemsQuery));
-		assertEquals(1, responseAboveMinScore.responses().size());
-		assertEquals(2, responseAboveMinScore.responses().get(0).result().hits().hits().size());
-	}
-
-	@Test
-	public void shouldReturnMultiSearchesApplyingPostFilter() throws Exception {
-		String index = "multiple_searches_request_post_filter";
-		createTestDocuments(index);
-
-		RequestItem filteredItemsQuery = createMSearchFuzzyRequest(b -> b.postFilter(createItemSizeSearchQuery("large")));
-
-		MsearchResponse<ShopItem> response = sendMSearchRequest(index, List.of(filteredItemsQuery));
-		assertEquals(1, response.responses().size());
-		assertEquals(1, response.responses().get(0).result().hits().hits().size());
-	}
-
-	@Test
-	public void shouldReturnMultiSearchesSearchAfter() throws Exception {
-		String index = "multiple_searches_request_search_after";
-		createTestDocuments(index);
-
-		RequestItem sortedItemsQuery = createMSearchSortedFuzzyRequest();
-
-		MsearchResponse<ShopItem> response = sendMSearchRequest(index, List.of(sortedItemsQuery));
-		assertEquals(1, response.responses().size());
-		assertEquals(3, response.responses().get(0).result().hits().hits().size());
-
-		List<String> sorts = response.responses().get(0).result().hits().hits().get(1).sort();
-		RequestItem sortedAfterItemsQuery = createMSearchSortedFuzzyRequest(b -> b.searchAfter(sorts));
-
-		MsearchResponse<ShopItem> response2 = sendMSearchRequest(index, List.of(sortedAfterItemsQuery));
-		assertEquals(1, response2.responses().size());
-		assertEquals(1, response2.responses().get(0).result().hits().hits().size());
-	}
-
-	@Test
-	public void shouldReturnMultiSearchesScriptFields() throws Exception {
-		String index = "multiple_searches_request_script_fields";
-		createTestDocuments(index);
-
-		RequestItem sortedItemsQuery = createMSearchSortedFuzzyRequest();
-
-		MsearchResponse<ShopItem> response = sendMSearchRequest(index, List.of(sortedItemsQuery));
-		assertEquals(1, response.responses().size());
-		var hits = response.responses().get(0).result().hits().hits();
-		assertEquals(3, hits.size());
-		assertNull(hits.get(0).score());
-		assertNull(hits.get(1).score());
-		assertNull(hits.get(2).score());
-
-		Map<String, ScriptField> scriptFields = new HashMap<>();
-		scriptFields.put("quantity", new ScriptField.Builder().script(Script.of(s -> s.inline(new InlineScript.Builder()
-											.lang("painless")
-											.source("doc['quantity'].value + params.inc")
-                    						.params("inc", JsonData.of(1))
-											.build())))
-										.build());
-		
-
-		RequestItem requestItem = createMSearchQueryWithScriptFields("small", scriptFields);
-		
-		MsearchResponse<ShopItem> responseWithScriptFields = sendMSearchRequest(index, List.of(requestItem));
-		var hitsWithScriptFields = responseWithScriptFields.responses().get(0).result().hits().hits();
-		assertEquals(2, hitsWithScriptFields.size());
-		// validating that the quantity for small items is increased by 1
-    	ObjectMapper mapper = new ObjectMapper();
-		JsonNode node = mapper.readTree(hitsWithScriptFields.get(0).fields().get("quantity").toString());
-		assertEquals(2, (int) mapper.treeToValue(node.get(0), int.class));
-		
-		node = mapper.readTree(hitsWithScriptFields.get(1).fields().get("quantity").toString());
-		assertEquals(3, (int) mapper.treeToValue(node.get(0), int.class));
-	}
-
-
-	private void assertResponseSources(MultiSearchResponseItem<ShopItem> response) {
-		List<Hit<ShopItem>> hitsWithHighlights = response.result().hits().hits();
-		assertEquals(2, hitsWithHighlights.size());
-		for (Hit<ShopItem> shopItemHit : hitsWithHighlights) {
-			assertNotNull(shopItemHit.source());
-			assertNotNull(shopItemHit.source().getName());
-			assertNotNull(shopItemHit.source().getSize());
-			assertNull(shopItemHit.source().getCompany());
-		}
-	}
-
-	private void assertResponseHighlights(MultiSearchResponseItem<ShopItem> response) {
-		List<Hit<ShopItem>> hitsWithHighlights = response.result().hits().hits();
-		assertEquals(2, hitsWithHighlights.size());
-		assertEquals(1, hitsWithHighlights.get(0).highlight().size());
-		assertEquals(1, hitsWithHighlights.get(1).highlight().size());
-	}
-
-	private RequestItem createMSearchQuery(String itemSize) {
-		return createMSearchQuery(itemSize, null, List.of());
-	}
-
-	private RequestItem createMSearchQueryWithScriptFields(String itemSize, Map<String, ScriptField> scriptFields) {
-		return RequestItem.of(item -> item.header(header -> header)
-				.body(body -> body.query(createItemSizeSearchQuery(itemSize))
-								.scriptFields(scriptFields)
-						)
-				);
-	}
-
-	private RequestItem createMSearchQueryWithHighlight(String itemSize) {
-		return createMSearchQuery(itemSize, "size", List.of());
-	}
-
-	private RequestItem createMSearchQueryWithSelectedSourceFields(String itemSize) {
-		return createMSearchQuery(itemSize, null, List.of("name", "size"));
-	}
-
-	private RequestItem createMSearchQuery(String itemSize, String fieldName, List<String> sources) {
-		return RequestItem.of(item -> item.header(header -> header)
-				.body(body -> body.query(createItemSizeSearchQuery(itemSize))
-						.highlight(createHighlight(fieldName))
-						.source(createSourcesConfig(sources))
-				)
-		);
-	}
-
-	private RequestItem createMSearchSortedFuzzyRequest() {
-		return createMSearchSortedFuzzyRequest(b -> b);
-	}
-
-	private RequestItem createMSearchSortedFuzzyRequest(Function<MultisearchBody.Builder, ObjectBuilder<MultisearchBody>> additional) {
-		return createMSearchFuzzyRequest(b -> additional.apply(b
-				.sort(SortOptions.of(sort -> sort.field(FieldSort.of(f -> f.field("quantity").order(SortOrder.Asc)))))));
-	}
-
-	private RequestItem createMSearchFuzzyRequest() {
-		return createMSearchFuzzyRequest(b -> b);
-	}
-
-	private RequestItem createMSearchFuzzyRequest(Function<MultisearchBody.Builder, ObjectBuilder<MultisearchBody>> additional) {
-		return RequestItem.of(item -> item.header(header -> header)
-				.body(b -> additional.apply(b.query(createNameSearchFuzzyQuery())))
-		);
-	}
-
-	private Query createNameSearchFuzzyQuery() {
-		return Query.of(filter -> filter.fuzzy(
-						FuzzyQuery.of(term -> term.field("name")
-								.value(FieldValue.of("rammer"))
-						)
-				)
-		);
-	}
-
-	private SourceConfig createSourcesConfig(List<String> sources) {
-		return sources.isEmpty() ? null : SourceConfig.of(builder -> builder.filter(filter -> filter.includes(sources)));
-	}
-
-	private Highlight createHighlight(String fieldName) {
-		return fieldName != null ? Highlight.of(
-				builder -> builder.fields(
-						fieldName, HighlightField.of(
-								field -> field.preTags("<em class=\"highlight\">")
-										.postTags("</em>")
-						)
-				)
-		) : null;
-	}
-
-	private Query createItemSizeSearchQuery(String itemSize) {
-		return Query.of(query -> query.bool(builder -> builder.filter(
-				filter -> filter.term(
-						TermQuery.of(term -> term.field("size")
-								.value(FieldValue.of(itemSize))
-						)
-				)
-		)));
-	}
-
-	private MsearchResponse<ShopItem> sendMSearchRequest(String index, List<RequestItem> searches) throws IOException {
-		return javaClient().msearch(builder -> builder.index(List.of(index)).searches(searches), ShopItem.class);
-	}
-
-	private void createTestDocuments(String index) throws IOException {
-		javaClient().create(_1 -> _1.index(index).id("1").document(createItem("hummer", "huge", "yes", 2)).refresh(Refresh.True));
-		javaClient().create(_1 -> _1.index(index).id("2").document(createItem("jammer", "huge", "yes", 1)).refresh(Refresh.True));
-		javaClient().create(_1 -> _1.index(index).id("3").document(createItem("hammer", "large", "yes", 3)).refresh(Refresh.True));
-		javaClient().create(_1 -> _1.index(index).id("4").document(createItem("drill", "large", "yes", 3)).refresh(Refresh.True));
-		javaClient().create(_1 -> _1.index(index).id("5").document(createItem("jack", "medium", "yes", 2)).refresh(Refresh.True));
-		javaClient().create(_1 -> _1.index(index).id("6").document(createItem("wrench", "medium", "no", 3)).refresh(Refresh.True));
-		javaClient().create(_1 -> _1.index(index).id("7").document(createItem("screws", "small", "no", 1)).refresh(Refresh.True));
-		javaClient().create(_1 -> _1.index(index).id("8").document(createItem("nuts", "small", "no", 2)).refresh(Refresh.True));
-	}
-
-	private ShopItem createItem(String name, String size, String company, int quantity) {
-		return new ShopItem(name, size, company, quantity);
-	}
-
-	public static class ShopItem {
-		private String name;
-		private String size;
-		private String company;
-		private int quantity;
-
-		public ShopItem() {
-		}
-
-		public ShopItem(String name, String size, String company, int quantity) {
-			this.name = name;
-			this.size = size;
-			this.company = company;
-			this.quantity = quantity;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public void setName(String name) {
-			this.name = name;
-		}
-
-		public String getSize() {
-			return size;
-		}
-
-		public void setSize(String size) {
-			this.size = size;
-		}
-
-		public String getCompany() {
-			return company;
-		}
-
-		public void setCompany(String company) {
-			this.company = company;
-		}
-
-		public int getQuantity() {
-			return quantity;
-		}
-
-		public void setQuantity(int quantity) {
-			this.quantity = quantity;
-		}
-	}
+    @Test
+    public void shouldReturnMultipleSearches() throws Exception {
+        String index = "multiple_searches_request";
+        createTestDocuments(index);
+
+        RequestItem largeItemsQuery = createMSearchQuery("large");
+        RequestItem mediumItemsQuery = createMSearchQuery("medium");
+        RequestItem smallItemsQuery = createMSearchQuery("small");
+
+        MsearchResponse<ShopItem> response = sendMSearchRequest(index, List.of(largeItemsQuery, mediumItemsQuery, smallItemsQuery));
+        assertEquals(3, response.responses().size());
+        assertEquals(2, response.responses().get(0).result().hits().hits().size());
+        assertEquals(2, response.responses().get(1).result().hits().hits().size());
+        assertEquals(2, response.responses().get(2).result().hits().hits().size());
+    }
+
+    @Test
+    public void shouldReturnHighlightsInMultipleSearches() throws Exception {
+        String index = "multiple_searches_request_with_highlights";
+        createTestDocuments(index);
+
+        RequestItem largeItemsQuery = createMSearchQueryWithHighlight("large");
+        RequestItem mediumItemsQuery = createMSearchQueryWithHighlight("medium");
+        RequestItem smallItemsQuery = createMSearchQueryWithHighlight("small");
+
+        MsearchResponse<ShopItem> response = sendMSearchRequest(index, List.of(largeItemsQuery, mediumItemsQuery, smallItemsQuery));
+        assertEquals(3, response.responses().size());
+        assertResponseHighlights(response.responses().get(0));
+        assertResponseHighlights(response.responses().get(1));
+        assertResponseHighlights(response.responses().get(2));
+    }
+
+    @Test
+    public void shouldReturnMultiSearchesWithSelectedSourceFieldsOnly() throws Exception {
+        String index = "multiple_searches_request_with_sources";
+        createTestDocuments(index);
+
+        RequestItem largeItemsQuery = createMSearchQueryWithSelectedSourceFields("large");
+        RequestItem mediumItemsQuery = createMSearchQueryWithSelectedSourceFields("medium");
+        RequestItem smallItemsQuery = createMSearchQueryWithSelectedSourceFields("small");
+
+        MsearchResponse<ShopItem> response = sendMSearchRequest(index, List.of(largeItemsQuery, mediumItemsQuery, smallItemsQuery));
+        assertEquals(3, response.responses().size());
+        assertResponseSources(response.responses().get(0));
+        assertResponseSources(response.responses().get(1));
+        assertResponseSources(response.responses().get(2));
+    }
+
+    @Test
+    public void shouldReturnMultiSearchesSorted() throws Exception {
+        String index = "multiple_searches_request_sort";
+        createTestDocuments(index);
+
+        RequestItem sortedItemsQuery = createMSearchSortedFuzzyRequest();
+
+        MsearchResponse<ShopItem> response = sendMSearchRequest(index, List.of(sortedItemsQuery));
+        assertEquals(1, response.responses().size());
+        var hits = response.responses().get(0).result().hits().hits();
+        assertEquals(3, hits.size());
+
+        assertEquals("hammer", hits.get(2).source().getName());
+    }
+
+    @Test
+    public void shouldReturnMultiSearchesTrackingScores() throws Exception {
+        String index = "multiple_searches_request_track_scores";
+        createTestDocuments(index);
+
+        RequestItem sortedItemsQuery = createMSearchSortedFuzzyRequest();
+
+        MsearchResponse<ShopItem> response = sendMSearchRequest(index, List.of(sortedItemsQuery));
+        assertEquals(1, response.responses().size());
+        var hits = response.responses().get(0).result().hits().hits();
+        assertEquals(3, hits.size());
+        assertNull(hits.get(0).score());
+        assertNull(hits.get(1).score());
+        assertNull(hits.get(2).score());
+
+        RequestItem trackScoreItemsQuery = createMSearchSortedFuzzyRequest(b -> b.trackScores(true));
+
+        MsearchResponse<ShopItem> responseTrackingScore = sendMSearchRequest(index, List.of(trackScoreItemsQuery));
+        assertEquals(1, responseTrackingScore.responses().size());
+        var hitsTrackingScore = responseTrackingScore.responses().get(0).result().hits().hits();
+        assertEquals(3, hitsTrackingScore.size());
+        assertNotNull(hitsTrackingScore.get(0).score());
+        assertNotNull(hitsTrackingScore.get(1).score());
+        assertNotNull(hitsTrackingScore.get(2).score());
+    }
+
+    @Test
+    public void shouldReturnMultiSearchesAboveMinScore() throws Exception {
+        String index = "multiple_searches_request_min_score";
+        createTestDocuments(index);
+
+        RequestItem sortedItemsQuery = createMSearchFuzzyRequest();
+
+        MsearchResponse<ShopItem> response = sendMSearchRequest(index, List.of(sortedItemsQuery));
+        assertEquals(1, response.responses().size());
+        var hits = response.responses().get(0).result().hits().hits();
+        assertEquals(3, hits.size());
+
+        double minScore = hits.get(2).score();
+        double scoreBetweenFirstAndSecondLowest = (hits.get(1).score() + minScore) / 2;
+
+        RequestItem minScoredItemsQuery = createMSearchFuzzyRequest(b -> b.minScore(scoreBetweenFirstAndSecondLowest));
+
+        MsearchResponse<ShopItem> responseAboveMinScore = sendMSearchRequest(index, List.of(minScoredItemsQuery));
+        assertEquals(1, responseAboveMinScore.responses().size());
+        assertEquals(2, responseAboveMinScore.responses().get(0).result().hits().hits().size());
+    }
+
+    @Test
+    public void shouldReturnMultiSearchesApplyingPostFilter() throws Exception {
+        String index = "multiple_searches_request_post_filter";
+        createTestDocuments(index);
+
+        RequestItem filteredItemsQuery = createMSearchFuzzyRequest(b -> b.postFilter(createItemSizeSearchQuery("large")));
+
+        MsearchResponse<ShopItem> response = sendMSearchRequest(index, List.of(filteredItemsQuery));
+        assertEquals(1, response.responses().size());
+        assertEquals(1, response.responses().get(0).result().hits().hits().size());
+    }
+
+    @Test
+    public void shouldReturnMultiSearchesSearchAfter() throws Exception {
+        String index = "multiple_searches_request_search_after";
+        createTestDocuments(index);
+
+        RequestItem sortedItemsQuery = createMSearchSortedFuzzyRequest();
+
+        MsearchResponse<ShopItem> response = sendMSearchRequest(index, List.of(sortedItemsQuery));
+        assertEquals(1, response.responses().size());
+        assertEquals(3, response.responses().get(0).result().hits().hits().size());
+
+        List<String> sorts = response.responses().get(0).result().hits().hits().get(1).sort();
+        RequestItem sortedAfterItemsQuery = createMSearchSortedFuzzyRequest(b -> b.searchAfter(sorts));
+
+        MsearchResponse<ShopItem> response2 = sendMSearchRequest(index, List.of(sortedAfterItemsQuery));
+        assertEquals(1, response2.responses().size());
+        assertEquals(1, response2.responses().get(0).result().hits().hits().size());
+    }
+
+    @Test
+    public void shouldReturnMultiSearchesScriptFields() throws Exception {
+        String index = "multiple_searches_request_script_fields";
+        createTestDocuments(index);
+
+        RequestItem sortedItemsQuery = createMSearchSortedFuzzyRequest();
+
+        MsearchResponse<ShopItem> response = sendMSearchRequest(index, List.of(sortedItemsQuery));
+        assertEquals(1, response.responses().size());
+        var hits = response.responses().get(0).result().hits().hits();
+        assertEquals(3, hits.size());
+        assertNull(hits.get(0).score());
+        assertNull(hits.get(1).score());
+        assertNull(hits.get(2).score());
+
+        Map<String, ScriptField> scriptFields = new HashMap<>();
+        scriptFields.put(
+            "quantity",
+            new ScriptField.Builder().script(
+                Script.of(
+                    s -> s.inline(
+                        new InlineScript.Builder().lang("painless")
+                            .source("doc['quantity'].value + params.inc")
+                            .params("inc", JsonData.of(1))
+                            .build()
+                    )
+                )
+            ).build()
+        );
+
+        RequestItem requestItem = createMSearchQueryWithScriptFields("small", scriptFields);
+
+        MsearchResponse<ShopItem> responseWithScriptFields = sendMSearchRequest(index, List.of(requestItem));
+        var hitsWithScriptFields = responseWithScriptFields.responses().get(0).result().hits().hits();
+        assertEquals(2, hitsWithScriptFields.size());
+        // validating that the quantity for small items is increased by 1
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode node = mapper.readTree(hitsWithScriptFields.get(0).fields().get("quantity").toString());
+        assertEquals(2, (int) mapper.treeToValue(node.get(0), int.class));
+
+        node = mapper.readTree(hitsWithScriptFields.get(1).fields().get("quantity").toString());
+        assertEquals(3, (int) mapper.treeToValue(node.get(0), int.class));
+    }
+
+    private void assertResponseSources(MultiSearchResponseItem<ShopItem> response) {
+        List<Hit<ShopItem>> hitsWithHighlights = response.result().hits().hits();
+        assertEquals(2, hitsWithHighlights.size());
+        for (Hit<ShopItem> shopItemHit : hitsWithHighlights) {
+            assertNotNull(shopItemHit.source());
+            assertNotNull(shopItemHit.source().getName());
+            assertNotNull(shopItemHit.source().getSize());
+            assertNull(shopItemHit.source().getCompany());
+        }
+    }
+
+    private void assertResponseHighlights(MultiSearchResponseItem<ShopItem> response) {
+        List<Hit<ShopItem>> hitsWithHighlights = response.result().hits().hits();
+        assertEquals(2, hitsWithHighlights.size());
+        assertEquals(1, hitsWithHighlights.get(0).highlight().size());
+        assertEquals(1, hitsWithHighlights.get(1).highlight().size());
+    }
+
+    private RequestItem createMSearchQuery(String itemSize) {
+        return createMSearchQuery(itemSize, null, List.of());
+    }
+
+    private RequestItem createMSearchQueryWithScriptFields(String itemSize, Map<String, ScriptField> scriptFields) {
+        return RequestItem.of(
+            item -> item.header(header -> header).body(body -> body.query(createItemSizeSearchQuery(itemSize)).scriptFields(scriptFields))
+        );
+    }
+
+    private RequestItem createMSearchQueryWithHighlight(String itemSize) {
+        return createMSearchQuery(itemSize, "size", List.of());
+    }
+
+    private RequestItem createMSearchQueryWithSelectedSourceFields(String itemSize) {
+        return createMSearchQuery(itemSize, null, List.of("name", "size"));
+    }
+
+    private RequestItem createMSearchQuery(String itemSize, String fieldName, List<String> sources) {
+        return RequestItem.of(
+            item -> item.header(header -> header)
+                .body(
+                    body -> body.query(createItemSizeSearchQuery(itemSize))
+                        .highlight(createHighlight(fieldName))
+                        .source(createSourcesConfig(sources))
+                )
+        );
+    }
+
+    private RequestItem createMSearchSortedFuzzyRequest() {
+        return createMSearchSortedFuzzyRequest(b -> b);
+    }
+
+    private RequestItem createMSearchSortedFuzzyRequest(Function<MultisearchBody.Builder, ObjectBuilder<MultisearchBody>> additional) {
+        return createMSearchFuzzyRequest(
+            b -> additional.apply(b.sort(SortOptions.of(sort -> sort.field(FieldSort.of(f -> f.field("quantity").order(SortOrder.Asc))))))
+        );
+    }
+
+    private RequestItem createMSearchFuzzyRequest() {
+        return createMSearchFuzzyRequest(b -> b);
+    }
+
+    private RequestItem createMSearchFuzzyRequest(Function<MultisearchBody.Builder, ObjectBuilder<MultisearchBody>> additional) {
+        return RequestItem.of(item -> item.header(header -> header).body(b -> additional.apply(b.query(createNameSearchFuzzyQuery()))));
+    }
+
+    private Query createNameSearchFuzzyQuery() {
+        return Query.of(filter -> filter.fuzzy(FuzzyQuery.of(term -> term.field("name").value(FieldValue.of("rammer")))));
+    }
+
+    private SourceConfig createSourcesConfig(List<String> sources) {
+        return sources.isEmpty() ? null : SourceConfig.of(builder -> builder.filter(filter -> filter.includes(sources)));
+    }
+
+    private Highlight createHighlight(String fieldName) {
+        return fieldName != null
+            ? Highlight.of(
+                builder -> builder.fields(
+                    fieldName,
+                    HighlightField.of(field -> field.preTags("<em class=\"highlight\">").postTags("</em>"))
+                )
+            )
+            : null;
+    }
+
+    private Query createItemSizeSearchQuery(String itemSize) {
+        return Query.of(
+            query -> query.bool(
+                builder -> builder.filter(filter -> filter.term(TermQuery.of(term -> term.field("size").value(FieldValue.of(itemSize)))))
+            )
+        );
+    }
+
+    private MsearchResponse<ShopItem> sendMSearchRequest(String index, List<RequestItem> searches) throws IOException {
+        return javaClient().msearch(builder -> builder.index(List.of(index)).searches(searches), ShopItem.class);
+    }
+
+    private void createTestDocuments(String index) throws IOException {
+        javaClient().create(_1 -> _1.index(index).id("1").document(createItem("hummer", "huge", "yes", 2)).refresh(Refresh.True));
+        javaClient().create(_1 -> _1.index(index).id("2").document(createItem("jammer", "huge", "yes", 1)).refresh(Refresh.True));
+        javaClient().create(_1 -> _1.index(index).id("3").document(createItem("hammer", "large", "yes", 3)).refresh(Refresh.True));
+        javaClient().create(_1 -> _1.index(index).id("4").document(createItem("drill", "large", "yes", 3)).refresh(Refresh.True));
+        javaClient().create(_1 -> _1.index(index).id("5").document(createItem("jack", "medium", "yes", 2)).refresh(Refresh.True));
+        javaClient().create(_1 -> _1.index(index).id("6").document(createItem("wrench", "medium", "no", 3)).refresh(Refresh.True));
+        javaClient().create(_1 -> _1.index(index).id("7").document(createItem("screws", "small", "no", 1)).refresh(Refresh.True));
+        javaClient().create(_1 -> _1.index(index).id("8").document(createItem("nuts", "small", "no", 2)).refresh(Refresh.True));
+    }
+
+    private ShopItem createItem(String name, String size, String company, int quantity) {
+        return new ShopItem(name, size, company, quantity);
+    }
+
+    public static class ShopItem {
+        private String name;
+        private String size;
+        private String company;
+        private int quantity;
+
+        public ShopItem() {}
+
+        public ShopItem(String name, String size, String company, int quantity) {
+            this.name = name;
+            this.size = size;
+            this.company = company;
+            this.quantity = quantity;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getSize() {
+            return size;
+        }
+
+        public void setSize(String size) {
+            this.size = size;
+        }
+
+        public String getCompany() {
+            return company;
+        }
+
+        public void setCompany(String company) {
+            this.company = company;
+        }
+
+        public int getQuantity() {
+            return quantity;
+        }
+
+        public void setQuantity(int quantity) {
+            this.quantity = quantity;
+        }
+    }
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractNodesIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractNodesIT.java
index 3cb83a6793..e8376e572a 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractNodesIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractNodesIT.java
@@ -14,7 +14,6 @@
 
 import java.io.IOException;
 import java.util.Arrays;
-
 import org.opensearch.client.opensearch.nodes.NodesStatsResponse;
 import org.opensearch.client.opensearch.tasks.ListRequest;
 import org.opensearch.client.opensearch.tasks.ListResponse;
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractPingAndInfoIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractPingAndInfoIT.java
index 79f4eb97c9..6fc7944aa5 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractPingAndInfoIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractPingAndInfoIT.java
@@ -8,15 +8,14 @@
 
 package org.opensearch.client.opensearch.integTest;
 
+import java.io.IOException;
+import java.util.Map;
 import org.apache.http.client.methods.HttpGet;
 import org.opensearch.client.Request;
 import org.opensearch.client.opensearch.OpenSearchClient;
 import org.opensearch.client.opensearch.core.InfoResponse;
 import org.opensearch.client.transport.endpoints.BooleanResponse;
 
-import java.io.IOException;
-import java.util.Map;
-
 public abstract class AbstractPingAndInfoIT extends OpenSearchJavaClientTestCase {
     public void testPing() throws IOException {
         BooleanResponse ping = javaClient().ping();
@@ -43,4 +42,4 @@ public void testInfo() throws IOException {
         assertEquals(versionMap.get("lucene_version"), info.version().luceneVersion());
         assertTrue(versionMap.get("number").toString().startsWith(info.version().number()));
     }
-} 
\ No newline at end of file
+}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractRequestIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractRequestIT.java
index c52908bbcb..8280cae0d1 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractRequestIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractRequestIT.java
@@ -32,6 +32,14 @@
 
 package org.opensearch.client.opensearch.integTest;
 
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 import org.junit.Test;
 import org.opensearch.Version;
 import org.opensearch.client.opensearch.OpenSearchAsyncClient;
@@ -86,15 +94,6 @@
 import org.opensearch.client.opensearch.model.ModelTestCase;
 import org.opensearch.client.transport.endpoints.BooleanResponse;
 
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
 public abstract class AbstractRequestIT extends OpenSearchJavaClientTestCase {
 
     @Test
@@ -129,15 +128,19 @@ public void testIndexCreation() throws Exception {
     @Test
     public void testIndexSettings() throws Exception {
         var createResponse = javaClient().indices()
-                .create(r -> r.index("test-settings")
-                        .settings(s -> s
-                                .translog(Translog.of(tl -> tl.syncInterval(Time.of(t -> t.time("10s")))))
-                                .mapping(m -> m
-                                        .fieldNameLength(f -> f.limit(300L))
-                                        .totalFields(f -> f.limit(30L))
-                                        .nestedFields(f -> f.limit(10L))
-                                        .depth(f -> f.limit(3L))
-                                        .nestedObjects(f -> f.limit(9L)))));
+            .create(
+                r -> r.index("test-settings")
+                    .settings(
+                        s -> s.translog(Translog.of(tl -> tl.syncInterval(Time.of(t -> t.time("10s")))))
+                            .mapping(
+                                m -> m.fieldNameLength(f -> f.limit(300L))
+                                    .totalFields(f -> f.limit(30L))
+                                    .nestedFields(f -> f.limit(10L))
+                                    .depth(f -> f.limit(3L))
+                                    .nestedObjects(f -> f.limit(9L))
+                            )
+                    )
+            );
         assertTrue(createResponse.acknowledged());
         assertTrue(createResponse.shardsAcknowledged());
 
@@ -163,16 +166,20 @@ public void testIndexSettings() throws Exception {
         assertNotNull(createdMappingSettings.nestedObjects());
         assertEquals(9L, (Object) createdMappingSettings.nestedObjects().limit());
 
-        var putSettingsResponse = javaClient().indices().putSettings(r -> r
-                .index("test-settings")
-                .settings(s -> s
-                        .translog(Translog.of(tl -> tl.syncInterval(Time.of(t -> t.time("5s")))))
-                        .mapping(m -> m
-                                .fieldNameLength(f -> f.limit(400L))
-                                .totalFields(f -> f.limit(130L))
-                                .nestedFields(f -> f.limit(110L))
-                                .depth(f -> f.limit(13L))
-                                .nestedObjects(f -> f.limit(19L)))));
+        var putSettingsResponse = javaClient().indices()
+            .putSettings(
+                r -> r.index("test-settings")
+                    .settings(
+                        s -> s.translog(Translog.of(tl -> tl.syncInterval(Time.of(t -> t.time("5s")))))
+                            .mapping(
+                                m -> m.fieldNameLength(f -> f.limit(400L))
+                                    .totalFields(f -> f.limit(130L))
+                                    .nestedFields(f -> f.limit(110L))
+                                    .depth(f -> f.limit(13L))
+                                    .nestedObjects(f -> f.limit(19L))
+                            )
+                    )
+            );
         assertTrue(putSettingsResponse.acknowledged());
 
         var updatedSettings = javaClient().indices().getSettings(r -> r.index("test-settings"));
@@ -204,9 +211,7 @@ public void testDataIngestion() throws Exception {
         String index = "ingest-test";
 
         // Create an index
-        CreateIndexResponse createIndexResponse = javaClient().indices().create(b -> b
-                .index(index)
-        );
+        CreateIndexResponse createIndexResponse = javaClient().indices().create(b -> b.index(index));
 
         assertEquals(index, createIndexResponse.index());
 
@@ -219,8 +224,8 @@ public void testDataIngestion() throws Exception {
         appData.setIntValue(1337);
         appData.setMsg("foo");
 
-        String docId = javaClient().index(b -> b
-                .index(index)
+        String docId = javaClient().index(
+            b -> b.index(index)
                 .id("my/Id") // test with url-unsafe string
                 .document(appData)
                 .refresh(Refresh.True) // Make it visible for search
@@ -230,36 +235,22 @@ public void testDataIngestion() throws Exception {
 
         // Check auto-created mapping
         GetMappingResponse mapping = javaClient().indices().getMapping(b -> b.index(index));
-        assertEquals(
-                Property.Kind.Long,
-                mapping.get("ingest-test").mappings().properties().get("intValue")._kind()
-        );
+        assertEquals(Property.Kind.Long, mapping.get("ingest-test").mappings().properties().get("intValue")._kind());
 
         // Query by id
-        AppData esData = javaClient().get(b -> b
-                        .index(index)
-                        .id(docId)
-                , AppData.class
-        ).source();
+        AppData esData = javaClient().get(b -> b.index(index).id(docId), AppData.class).source();
 
         assertEquals(1337, esData.getIntValue());
         assertEquals("foo", esData.getMsg());
 
         // Query by id a non-existing document
-        final GetResponse<AppData> notExists = javaClient().get(b -> b
-                        .index(index)
-                        .id("some-random-id")
-                , AppData.class
-        );
+        final GetResponse<AppData> notExists = javaClient().get(b -> b.index(index).id("some-random-id"), AppData.class);
 
         assertFalse(notExists.found());
         assertNull(notExists.source());
 
         // Search
-        SearchResponse<AppData> search = javaClient().search(b -> b
-                        .index(index)
-                , AppData.class
-        );
+        SearchResponse<AppData> search = javaClient().search(b -> b.index(index), AppData.class);
 
         long hits = search.hits().total().value();
         assertEquals(1, hits);
@@ -268,21 +259,14 @@ public void testDataIngestion() throws Exception {
         assertEquals(1337, esData.getIntValue());
         assertEquals("foo", esData.getMsg());
 
-        RequestItem item = RequestItem.of(_1 -> _1
-                .header(_2 -> _2.index("test"))
-                .body(_2 -> _2.size(4))
-        );
+        RequestItem item = RequestItem.of(_1 -> _1.header(_2 -> _2.index("test")).body(_2 -> _2.size(4)));
 
         // MSearch: 1st search on an existing index, 2nd one on a non-existing index
-        final MsearchResponse<AppData> msearch = javaClient().msearch(_0 -> _0
-                        .searches(_1 -> _1
-                                .header(_3 -> _3.index(index))
-                                .body(_3 -> _3.query(_4 -> _4.matchAll(_5 -> _5)))
-                        ).searches(_1 -> _1
-                                .header(_3 -> _3.index("non-existing"))
-                                .body(_3 -> _3.query(_4 -> _4.matchAll(_5 -> _5)))
-                        )
-                , AppData.class);
+        final MsearchResponse<AppData> msearch = javaClient().msearch(
+            _0 -> _0.searches(_1 -> _1.header(_3 -> _3.index(index)).body(_3 -> _3.query(_4 -> _4.matchAll(_5 -> _5))))
+                .searches(_1 -> _1.header(_3 -> _3.index("non-existing")).body(_3 -> _3.query(_4 -> _4.matchAll(_5 -> _5)))),
+            AppData.class
+        );
 
         assertEquals(2, msearch.responses().size());
         assertTrue(msearch.responses().get(0).isResult());
@@ -317,19 +301,9 @@ public void testBulkRequest() throws IOException {
         appData.setIntValue(42);
         appData.setMsg("Some message");
 
-        BulkResponse bulk = javaClient().bulk(_0 -> _0
-                .operations(_1 -> _1
-                        .create(_2 -> _2
-                                .index("foo")
-                                .id("abc")
-                                .document(appData)
-                        ))
-                .operations(_1 -> _1
-                        .create(_2 -> _2
-                                .index("foo")
-                                .id("def")
-                                .document(appData)
-                        ))
+        BulkResponse bulk = javaClient().bulk(
+            _0 -> _0.operations(_1 -> _1.create(_2 -> _2.index("foo").id("abc").document(appData)))
+                .operations(_1 -> _1.create(_2 -> _2.index("foo").id("def").document(appData)))
         );
 
         assertFalse(bulk.errors());
@@ -353,19 +327,12 @@ public void testTrackTotalHitsFalse() throws Exception {
         appData.setIntValue(1337);
         appData.setMsg("foo");
 
-        javaClient().index(b -> b
-                .index(index)
-                .id("myId")
-                .document(appData)
-                .refresh(Refresh.True) // Make it visible for search
+        javaClient().index(
+            b -> b.index(index).id("myId").document(appData).refresh(Refresh.True) // Make it visible for search
         ).id();
 
         // Search
-        SearchResponse<AppData> search = javaClient().search(b -> b
-                        .index(index)
-                        .trackTotalHits(t -> t.enabled(false))
-                , AppData.class
-        );
+        SearchResponse<AppData> search = javaClient().search(b -> b.index(index).trackTotalHits(t -> t.enabled(false)), AppData.class);
 
         List<Hit<AppData>> hits = search.hits().hits();
         AppData appDataResult = search.hits().hits().get(0).source();
@@ -379,12 +346,7 @@ public void testRefresh() throws IOException {
         appData.setIntValue(42);
         appData.setMsg("Some message");
 
-        IndexResponse ir = javaClient().index(_0 -> _0
-                .index("test")
-                .id("1")
-                .document(appData)
-                .refresh(Refresh.WaitFor)
-        );
+        IndexResponse ir = javaClient().index(_0 -> _0.index("test").id("1").document(appData).refresh(Refresh.WaitFor));
 
         assertEquals("1", ir.id());
     }
@@ -395,21 +357,16 @@ public void errorResponse() throws Exception {
         assertFalse(exists.value());
 
         OpenSearchException ex = assertThrows(OpenSearchException.class, () -> {
-            GetResponse<String> response = javaClient().get(
-                    _0 -> _0.index("doesnotexist").id("reallynot"), String.class
-            );
+            GetResponse<String> response = javaClient().get(_0 -> _0.index("doesnotexist").id("reallynot"), String.class);
         });
 
         assertEquals(404, ex.status());
         assertEquals("index_not_found_exception", ex.error().type());
         assertEquals("doesnotexist", ex.error().metadata().get("index").to(String.class));
 
-
         ExecutionException ee = assertThrows(ExecutionException.class, () -> {
             OpenSearchAsyncClient aClient = new OpenSearchAsyncClient(javaClient()._transport());
-            GetResponse<String> response = aClient.get(
-                    _0 -> _0.index("doesnotexist").id("reallynot"), String.class
-            ).get();
+            GetResponse<String> response = aClient.get(_0 -> _0.index("doesnotexist").id("reallynot"), String.class).get();
         });
 
         ex = ((OpenSearchException) ee.getCause());
@@ -423,8 +380,8 @@ public void testErrorStatusCodeWithValidResponse() throws IOException {
         // Transports should first try to decode an error, and if they fail because of missing properties for
         // the error type, then try to decode the regular request.
 
-        final ClearScrollResponse clearResponse = javaClient().clearScroll(b -> b.scrollId(
-                "DXF1ZXJ5QW5kRmV0Y2gBAAAAAAAAAD4WYm9laVYtZndUQlNsdDcwakFMNjU1QQ==")
+        final ClearScrollResponse clearResponse = javaClient().clearScroll(
+            b -> b.scrollId("DXF1ZXJ5QW5kRmV0Y2gBAAAAAAAAAD4WYm9laVYtZndUQlNsdDcwakFMNjU1QQ==")
         );
         assertEquals(0, clearResponse.numFreed());
     }
@@ -436,20 +393,15 @@ public void testSearchAggregation() throws IOException {
         javaClient().create(_1 -> _1.index("products").id("B").document(new Product(15)).refresh(Refresh.True));
         javaClient().create(_1 -> _1.index("products").id("C").document(new Product(25)).refresh(Refresh.True));
 
-        SearchResponse<Product> searchResponse = javaClient().search(_1 -> _1
-                        .index("products")
-                        .size(0)
-                        .aggregations(
-                                "prices", _3 -> _3
-                                        .histogram(_4 -> _4
-                                                .field("price")
-                                                .interval(10.0)
-                                        ).aggregations(
-                                                "average", _5 -> _5
-                                                        .avg(_6 -> _6.field("price"))
-                                        )
-                        )
-                , Product.class
+        SearchResponse<Product> searchResponse = javaClient().search(
+            _1 -> _1.index("products")
+                .size(0)
+                .aggregations(
+                    "prices",
+                    _3 -> _3.histogram(_4 -> _4.field("price").interval(10.0))
+                        .aggregations("average", _5 -> _5.avg(_6 -> _6.field("price")))
+                ),
+            Product.class
         );
 
         HistogramAggregate prices = searchResponse.aggregations().get("prices").histogram();
@@ -471,23 +423,21 @@ public void testSubAggregation() throws IOException {
 
         List<FieldValue> fieldValues = List.of(FieldValue.of("Blue"));
 
-        SearchRequest searchRequest = SearchRequest.of(_1 -> _1
-                .index("products")
+        SearchRequest searchRequest = SearchRequest.of(
+            _1 -> _1.index("products")
                 .size(0)
                 .aggregations(
-                        "price", _3 -> _3
-                                .aggregations(Map.of("price", TermsAggregation.of(_4 -> _4
-                                                .field("price"))
-                                        ._toAggregation()))
-                                .filter(BoolQuery.of(_5 -> _5
-                                                .filter(List.of(TermsQuery.of(_6 -> _6
-                                                                .field("color.keyword")
-                                                                .terms(_7 -> _7
-                                                                        .value(fieldValues)))
-                                                        ._toQuery())))
-                                        ._toQuery()
+                    "price",
+                    _3 -> _3.aggregations(Map.of("price", TermsAggregation.of(_4 -> _4.field("price"))._toAggregation()))
+                        .filter(
+                            BoolQuery.of(
+                                _5 -> _5.filter(
+                                    List.of(TermsQuery.of(_6 -> _6.field("color.keyword").terms(_7 -> _7.value(fieldValues)))._toQuery())
                                 )
-                ));
+                            )._toQuery()
+                        )
+                )
+        );
         SearchResponse<Product> searchResponse = javaClient().search(searchRequest, Product.class);
 
         Aggregate prices = searchResponse.aggregations().get("price")._get()._toAggregate();
@@ -507,14 +457,23 @@ public void testChildAggregation() throws IOException {
         String question = "question";
         String answer = "answer";
 
-        javaClient().indices().create(c -> c.index(index).mappings(m -> m.properties("join", p -> p
-                .join(j -> j.relations(Collections.singletonMap(question, Collections.singletonList(answer)))))));
+        javaClient().indices()
+            .create(
+                c -> c.index(index)
+                    .mappings(
+                        m -> m.properties(
+                            "join",
+                            p -> p.join(j -> j.relations(Collections.singletonMap(question, Collections.singletonList(answer))))
+                        )
+                    )
+            );
         javaClient().index(i -> i.index(index).id("1").document(new Question("exists")).refresh(Refresh.True));
         javaClient().index(i -> i.index(index).id("2").routing("1").document(new Answer("true", "1")).refresh(Refresh.True));
         javaClient().index(i -> i.index(index).id("3").routing("1").document(new Answer("false", "1")).refresh(Refresh.True));
 
-        SearchRequest searchRequest = SearchRequest.of(r -> r.index(index).size(0)
-                .aggregations(answer, a -> a.children(c -> c.type(answer))));
+        SearchRequest searchRequest = SearchRequest.of(
+            r -> r.index(index).size(0).aggregations(answer, a -> a.children(c -> c.type(answer)))
+        );
 
         SearchResponse<Void> searchResponse = javaClient().search(searchRequest, Void.class);
 
@@ -529,18 +488,14 @@ public void testGetMapping() throws Exception {
         Map<String, Property> fields = Collections.singletonMap("keyword", Property.of(p -> p.keyword(k -> k.ignoreAbove(256))));
         Property text = Property.of(p -> p.text(t -> t.fields(fields)));
 
-        javaClient().indices().create(c -> c
-                .index(index)
-                .mappings(m -> m
-                        .properties("id", text)
-                        .properties("name", p -> p
-                                .object(o -> o
-                                        .properties("first", text)
-                                        .properties("last", text)
-                                )
-                        )
-                )
-        );
+        javaClient().indices()
+            .create(
+                c -> c.index(index)
+                    .mappings(
+                        m -> m.properties("id", text)
+                            .properties("name", p -> p.object(o -> o.properties("first", text).properties("last", text)))
+                    )
+            );
 
         GetMappingResponse mr = javaClient().indices().getMapping(mrb -> mrb.index(index));
 
@@ -567,54 +522,28 @@ public void testCompletionSuggesterFailure() throws IOException {
 
         String index = "test-completion-suggester-failure";
 
-
-        Property intValueProp = new Property.Builder()
-                .long_(v -> v)
-                .build();
-        Property msgCompletionProp = new Property.Builder()
-                .completion(c -> c)
-                .build();
-        javaClient().indices().create(c -> c
-                .index(index)
-                .mappings(m -> m
-                        .properties("intValue", intValueProp)
-                        .properties("msg", msgCompletionProp)));
+        Property intValueProp = new Property.Builder().long_(v -> v).build();
+        Property msgCompletionProp = new Property.Builder().completion(c -> c).build();
+        javaClient().indices()
+            .create(c -> c.index(index).mappings(m -> m.properties("intValue", intValueProp).properties("msg", msgCompletionProp)));
 
         AppData appData = new AppData();
         appData.setIntValue(1337);
         appData.setMsg("foo");
 
-        javaClient().index(b -> b
-                .index(index)
-                .id("1")
-                .document(appData)
-                .refresh(Refresh.True));
+        javaClient().index(b -> b.index(index).id("1").document(appData).refresh(Refresh.True));
 
         appData.setIntValue(1338);
         appData.setMsg("foobar");
 
-        javaClient().index(b -> b
-                .index(index)
-                .id("2")
-                .document(appData)
-                .refresh(Refresh.True));
+        javaClient().index(b -> b.index(index).id("2").document(appData).refresh(Refresh.True));
 
         String suggesterName = "msgSuggester";
 
-        CompletionSuggester completionSuggester = FieldSuggesterBuilders.completion()
-                .field("msg")
-                .size(1)
-                .build();
-        FieldSuggester fieldSuggester = new FieldSuggester.Builder().prefix("xyz")
-                .completion(completionSuggester)
-                .build();
-        Suggester suggester = new Suggester.Builder()
-                .suggesters(Collections.singletonMap(suggesterName, fieldSuggester))
-                .build();
-        SearchRequest searchRequest = new SearchRequest.Builder()
-                .index(index)
-                .suggest(suggester)
-                .build();
+        CompletionSuggester completionSuggester = FieldSuggesterBuilders.completion().field("msg").size(1).build();
+        FieldSuggester fieldSuggester = new FieldSuggester.Builder().prefix("xyz").completion(completionSuggester).build();
+        Suggester suggester = new Suggester.Builder().suggesters(Collections.singletonMap(suggesterName, fieldSuggester)).build();
+        SearchRequest searchRequest = new SearchRequest.Builder().index(index).suggest(suggester).build();
 
         SearchResponse<AppData> response = javaClient().search(searchRequest, AppData.class);
         assertTrue(response.suggest().size() > 0);
@@ -625,271 +554,196 @@ public void testCompletionSuggesterFailure() throws IOException {
 
     @Test
     public void testPit() throws IOException {
-            InfoResponse info = javaClient().info();
-            String version = info.version().number();
-            if (version.contains("SNAPSHOT")) {
-                    version = version.split("-")[0];
-            }
-            assumeTrue("The PIT is supported in OpenSearch 2.4.0 and later",
-                            Version.fromString(version).onOrAfter(Version.fromString("2.4.0")));
-
-            String index = "test-point-in-time";
-
-            javaClient().indices().create(c -> c
-                            .index(index));
-
-            AppData appData = new AppData();
-            appData.setIntValue(1337);
-            appData.setMsg("foo");
-
-            javaClient().index(b -> b
-                            .index(index)
-                            .id("1")
-                            .document(appData)
-                            .refresh(Refresh.True));
-            CreatePitRequest createPitRequest = new CreatePitRequest.Builder()
-                            .targetIndexes(Collections.singletonList(index))
-                            .keepAlive(new Time.Builder().time("100m").build()).build();
-
-            CreatePitResponse createPitResponse = javaClient()
-                            .createPit(createPitRequest);
-
-            assertNotNull(createPitResponse);
-            assertNotNull(createPitResponse.pitId());
-            assertEquals(createPitResponse.shards().total(),
-                            createPitResponse.shards().successful());
-
-            ListAllPitResponse listAllPitResponse = javaClient().listAllPit();
-
-            assertNotNull(listAllPitResponse);
-            assertNotNull(listAllPitResponse.pits());
-            assertEquals(listAllPitResponse.pits().get(0).pitId(), createPitResponse.pitId());
-            assertEquals(listAllPitResponse.pits().get(0).keepAlive(), Long.valueOf(6000000L));
-
-            DeletePitRequest deletePitRequest = new DeletePitRequest.Builder()
-                            .pitId(Collections.singletonList(createPitResponse.pitId())).build();
-
-            DeletePitResponse deletePitResponse = javaClient()
-                            .deletePit(deletePitRequest);
-
-            assertNotNull(deletePitResponse);
-            assertNotNull(deletePitResponse.pits());
-            assertEquals(deletePitResponse.pits().get(0).pitId(), createPitResponse.pitId());
-            assertTrue(deletePitResponse.pits().get(0).successful());
+        InfoResponse info = javaClient().info();
+        String version = info.version().number();
+        if (version.contains("SNAPSHOT")) {
+            version = version.split("-")[0];
+        }
+        assumeTrue(
+            "The PIT is supported in OpenSearch 2.4.0 and later",
+            Version.fromString(version).onOrAfter(Version.fromString("2.4.0"))
+        );
+
+        String index = "test-point-in-time";
+
+        javaClient().indices().create(c -> c.index(index));
+
+        AppData appData = new AppData();
+        appData.setIntValue(1337);
+        appData.setMsg("foo");
+
+        javaClient().index(b -> b.index(index).id("1").document(appData).refresh(Refresh.True));
+        CreatePitRequest createPitRequest = new CreatePitRequest.Builder().targetIndexes(Collections.singletonList(index))
+            .keepAlive(new Time.Builder().time("100m").build())
+            .build();
+
+        CreatePitResponse createPitResponse = javaClient().createPit(createPitRequest);
+
+        assertNotNull(createPitResponse);
+        assertNotNull(createPitResponse.pitId());
+        assertEquals(createPitResponse.shards().total(), createPitResponse.shards().successful());
+
+        ListAllPitResponse listAllPitResponse = javaClient().listAllPit();
+
+        assertNotNull(listAllPitResponse);
+        assertNotNull(listAllPitResponse.pits());
+        assertEquals(listAllPitResponse.pits().get(0).pitId(), createPitResponse.pitId());
+        assertEquals(listAllPitResponse.pits().get(0).keepAlive(), Long.valueOf(6000000L));
+
+        DeletePitRequest deletePitRequest = new DeletePitRequest.Builder().pitId(Collections.singletonList(createPitResponse.pitId()))
+            .build();
+
+        DeletePitResponse deletePitResponse = javaClient().deletePit(deletePitRequest);
+
+        assertNotNull(deletePitResponse);
+        assertNotNull(deletePitResponse.pits());
+        assertEquals(deletePitResponse.pits().get(0).pitId(), createPitResponse.pitId());
+        assertTrue(deletePitResponse.pits().get(0).successful());
     }
 
     public void testCompletionSuggester() throws IOException {
 
-            String index = "test-completion-suggester";
-
-            Property intValueProp = new Property.Builder()
-                            .long_(v -> v)
-                            .build();
-            Property msgCompletionProp = new Property.Builder()
-                            .completion(c -> c)
-                            .build();
-            javaClient().indices().create(c -> c
-                            .index(index)
-                            .mappings(m -> m
-                                            .properties("intValue", intValueProp)
-                                            .properties("msg", msgCompletionProp)));
-
-            AppData appData = new AppData();
-            appData.setIntValue(1337);
-            appData.setMsg("foo");
-
-            javaClient().index(b -> b
-                            .index(index)
-                            .id("1")
-                            .document(appData)
-                            .refresh(Refresh.True));
-
-            appData.setIntValue(1338);
-            appData.setMsg("foobar");
-
-            javaClient().index(b -> b
-                            .index(index)
-                            .id("2")
-                            .document(appData)
-                            .refresh(Refresh.True));
-
-            String suggesterName = "msgSuggester";
-
-            CompletionSuggester completionSuggester = FieldSuggesterBuilders.completion()
-                            .field("msg")
-                            .size(1)
-                            .build();
-            FieldSuggester fieldSuggester = new FieldSuggester.Builder().prefix("foo")
-                            .completion(completionSuggester)
-                            .build();
-            Suggester suggester = new Suggester.Builder()
-                            .suggesters(Collections.singletonMap(suggesterName, fieldSuggester))
-                            .build();
-            SearchRequest searchRequest = new SearchRequest.Builder()
-                            .index(index)
-                            .suggest(suggester)
-                            .build();
-
-            SearchResponse<AppData> response = javaClient().search(searchRequest, AppData.class);
-            assertTrue(response.suggest().size() > 0);
-            assertTrue(response.suggest().keySet().contains(suggesterName));
-            assertNotNull(response.suggest().get(suggesterName));
-            assertNotNull(response.suggest().get(suggesterName).get(0).completion().options());
-            assertTrue(response.suggest().get(suggesterName).get(0).isCompletion());
-            assertNotNull(response.suggest().get(suggesterName).get(0).completion().options());
-            assertEquals(response.suggest().get(suggesterName).get(0).completion().options().get(0)
-                            .text(), "foo");
+        String index = "test-completion-suggester";
+
+        Property intValueProp = new Property.Builder().long_(v -> v).build();
+        Property msgCompletionProp = new Property.Builder().completion(c -> c).build();
+        javaClient().indices()
+            .create(c -> c.index(index).mappings(m -> m.properties("intValue", intValueProp).properties("msg", msgCompletionProp)));
+
+        AppData appData = new AppData();
+        appData.setIntValue(1337);
+        appData.setMsg("foo");
+
+        javaClient().index(b -> b.index(index).id("1").document(appData).refresh(Refresh.True));
+
+        appData.setIntValue(1338);
+        appData.setMsg("foobar");
+
+        javaClient().index(b -> b.index(index).id("2").document(appData).refresh(Refresh.True));
+
+        String suggesterName = "msgSuggester";
+
+        CompletionSuggester completionSuggester = FieldSuggesterBuilders.completion().field("msg").size(1).build();
+        FieldSuggester fieldSuggester = new FieldSuggester.Builder().prefix("foo").completion(completionSuggester).build();
+        Suggester suggester = new Suggester.Builder().suggesters(Collections.singletonMap(suggesterName, fieldSuggester)).build();
+        SearchRequest searchRequest = new SearchRequest.Builder().index(index).suggest(suggester).build();
+
+        SearchResponse<AppData> response = javaClient().search(searchRequest, AppData.class);
+        assertTrue(response.suggest().size() > 0);
+        assertTrue(response.suggest().keySet().contains(suggesterName));
+        assertNotNull(response.suggest().get(suggesterName));
+        assertNotNull(response.suggest().get(suggesterName).get(0).completion().options());
+        assertTrue(response.suggest().get(suggesterName).get(0).isCompletion());
+        assertNotNull(response.suggest().get(suggesterName).get(0).completion().options());
+        assertEquals(response.suggest().get(suggesterName).get(0).completion().options().get(0).text(), "foo");
     }
 
     @Test
     public void testTermSuggester() throws IOException {
 
-            String index = "test-term-suggester";
-
-            // term suggester does not require a special mapping
-            javaClient().indices().create(c -> c
-                            .index(index));
-
-            AppData appData = new AppData();
-            appData.setIntValue(1337);
-            appData.setMsg("foo");
-
-            javaClient().index(b -> b
-                            .index(index)
-                            .id("1")
-                            .document(appData)
-                            .refresh(Refresh.True));
-
-            appData.setIntValue(1338);
-            appData.setMsg("foobar");
-
-            javaClient().index(b -> b
-                            .index(index)
-                            .id("2")
-                            .document(appData)
-                            .refresh(Refresh.True));
-
-            String suggesterName = "msgSuggester";
-
-            TermSuggester termSuggester = FieldSuggesterBuilders.term()
-                            .field("msg")
-                            .size(1)
-                            .build();
-            FieldSuggester fieldSuggester = new FieldSuggester.Builder().text("fool")
-                            .term(termSuggester)
-                            .build();
-            Suggester suggester = new Suggester.Builder()
-                            .suggesters(Collections.singletonMap(suggesterName, fieldSuggester))
-                            .build();
-            SearchRequest searchRequest = new SearchRequest.Builder()
-                            .index(index)
-                            .suggest(suggester)
-                            .build();
-
-            SearchResponse<AppData> response = javaClient().search(searchRequest, AppData.class);
-            assertTrue(response.suggest().size() > 0);
-            assertTrue(response.suggest().keySet().contains(suggesterName));
-            assertNotNull(response.suggest().get(suggesterName));
-            assertTrue(response.suggest().get(suggesterName).get(0).isTerm());
-            assertNotNull(response.suggest().get(suggesterName).get(0).term().options());
-            assertEquals(response.suggest().get(suggesterName).get(0).term().options().get(0)
-                            .text(), "foo");
+        String index = "test-term-suggester";
+
+        // term suggester does not require a special mapping
+        javaClient().indices().create(c -> c.index(index));
+
+        AppData appData = new AppData();
+        appData.setIntValue(1337);
+        appData.setMsg("foo");
+
+        javaClient().index(b -> b.index(index).id("1").document(appData).refresh(Refresh.True));
+
+        appData.setIntValue(1338);
+        appData.setMsg("foobar");
+
+        javaClient().index(b -> b.index(index).id("2").document(appData).refresh(Refresh.True));
+
+        String suggesterName = "msgSuggester";
+
+        TermSuggester termSuggester = FieldSuggesterBuilders.term().field("msg").size(1).build();
+        FieldSuggester fieldSuggester = new FieldSuggester.Builder().text("fool").term(termSuggester).build();
+        Suggester suggester = new Suggester.Builder().suggesters(Collections.singletonMap(suggesterName, fieldSuggester)).build();
+        SearchRequest searchRequest = new SearchRequest.Builder().index(index).suggest(suggester).build();
+
+        SearchResponse<AppData> response = javaClient().search(searchRequest, AppData.class);
+        assertTrue(response.suggest().size() > 0);
+        assertTrue(response.suggest().keySet().contains(suggesterName));
+        assertNotNull(response.suggest().get(suggesterName));
+        assertTrue(response.suggest().get(suggesterName).get(0).isTerm());
+        assertNotNull(response.suggest().get(suggesterName).get(0).term().options());
+        assertEquals(response.suggest().get(suggesterName).get(0).term().options().get(0).text(), "foo");
+    }
+
+    @Test
+    public void testPhraseSuggester() throws IOException {
+
+        String index = "test-phrase-suggester";
+
+        ShingleTokenFilter shingleTokenFilter = new ShingleTokenFilter.Builder().minShingleSize("2").maxShingleSize("3").build();
+
+        Analyzer analyzer = new Analyzer.Builder().custom(
+            new CustomAnalyzer.Builder().tokenizer("standard").filter(Arrays.asList("lowercase", "shingle")).build()
+        ).build();
+
+        TokenFilter tokenFilter = new TokenFilter.Builder().definition(
+            new TokenFilterDefinition.Builder().shingle(shingleTokenFilter).build()
+        ).build();
+
+        IndexSettingsAnalysis indexSettingsAnalysis = new IndexSettingsAnalysis.Builder().analyzer("trigram", analyzer)
+            .filter("shingle", tokenFilter)
+            .build();
+
+        IndexSettings settings = new IndexSettings.Builder().analysis(indexSettingsAnalysis).build();
+
+        TypeMapping mapping = new TypeMapping.Builder().properties(
+            "msg",
+            new Property.Builder().text(
+                new TextProperty.Builder().fields(
+                    "trigram",
+                    new Property.Builder().text(new TextProperty.Builder().analyzer("trigram").build()).build()
+                ).build()
+            ).build()
+        ).build();
+
+        javaClient().indices().create(c -> c.index(index).settings(settings).mappings(mapping));
+
+        AppData appData = new AppData();
+        appData.setIntValue(1337);
+        appData.setMsg("Design Patterns");
+
+        javaClient().index(b -> b.index(index).id("1").document(appData).refresh(Refresh.True));
+
+        appData.setIntValue(1338);
+        appData.setMsg("Software Architecture Patterns Explained");
+
+        javaClient().index(b -> b.index(index).id("2").document(appData).refresh(Refresh.True));
+
+        String suggesterName = "msgSuggester";
+
+        PhraseSuggester phraseSuggester = FieldSuggesterBuilders.phrase().field("msg.trigram").build();
+        FieldSuggester fieldSuggester = new FieldSuggester.Builder().text("design paterns").phrase(phraseSuggester).build();
+        Suggester suggester = new Suggester.Builder().suggesters(Collections.singletonMap(suggesterName, fieldSuggester)).build();
+        SearchRequest searchRequest = new SearchRequest.Builder().index(index).suggest(suggester).build();
+
+        SearchResponse<AppData> response = javaClient().search(searchRequest, AppData.class);
+        assertTrue(response.suggest().size() > 0);
+        assertTrue(response.suggest().keySet().contains(suggesterName));
+        assertNotNull(response.suggest().get(suggesterName));
+        assertNotNull(response.suggest().get(suggesterName).get(0));
+        assertTrue(response.suggest().get(suggesterName).get(0).isPhrase());
+        assertNotNull(response.suggest().get(suggesterName).get(0).phrase().options());
+        assertEquals(response.suggest().get(suggesterName).get(0).phrase().options().get(0).text(), "design patterns");
     }
 
-		@Test
-		public void testPhraseSuggester() throws IOException {
-
-			String index = "test-phrase-suggester";
-
-                        ShingleTokenFilter shingleTokenFilter = new ShingleTokenFilter.Builder().minShingleSize("2")
-                                        .maxShingleSize("3")
-                                        .build();
-
-                        Analyzer analyzer = new Analyzer.Builder()
-                                        .custom(new CustomAnalyzer.Builder().tokenizer("standard")
-                                                        .filter(Arrays.asList("lowercase","shingle")).build())
-                                        .build();
-
-                        TokenFilter tokenFilter = new TokenFilter.Builder()
-                                        .definition(new TokenFilterDefinition.Builder()
-                                                        .shingle(shingleTokenFilter).build())
-                                        .build();
-
-                        IndexSettingsAnalysis indexSettingsAnalysis = new IndexSettingsAnalysis.Builder()
-                                        .analyzer("trigram", analyzer)
-                                        .filter("shingle", tokenFilter)
-                                        .build();
-
-                        IndexSettings settings = new IndexSettings.Builder().analysis(indexSettingsAnalysis).build();
-
-                        TypeMapping mapping = new TypeMapping.Builder().properties("msg", new Property.Builder()
-                                        .text(new TextProperty.Builder().fields("trigram", new Property.Builder()
-                                                        .text(new TextProperty.Builder().analyzer("trigram").build())
-                                                        .build()).build())
-                                        .build()).build();
-
-
-			javaClient().indices().create(c -> c
-					.index(index)
-					.settings(settings)
-					.mappings(mapping));
-
-			AppData appData = new AppData();
-			appData.setIntValue(1337);
-			appData.setMsg("Design Patterns");
-
-			javaClient().index(b -> b
-					.index(index)
-					.id("1")
-					.document(appData)
-					.refresh(Refresh.True));
-
-			appData.setIntValue(1338);
-			appData.setMsg("Software Architecture Patterns Explained");
-
-			javaClient().index(b -> b
-					.index(index)
-					.id("2")
-					.document(appData)
-					.refresh(Refresh.True));
-
-			String suggesterName = "msgSuggester";
-
-			PhraseSuggester phraseSuggester = FieldSuggesterBuilders.phrase()
-					.field("msg.trigram")
-					.build();
-			FieldSuggester fieldSuggester = new FieldSuggester.Builder().text("design paterns")
-					.phrase(phraseSuggester)
-					.build();
-			Suggester suggester = new Suggester.Builder()
-					.suggesters(Collections.singletonMap(suggesterName, fieldSuggester))
-					.build();
-			SearchRequest searchRequest = new SearchRequest.Builder()
-					.index(index)
-					.suggest(suggester)
-					.build();
-
-			SearchResponse<AppData> response = javaClient().search(searchRequest, AppData.class);
-			assertTrue(response.suggest().size() > 0);
-			assertTrue(response.suggest().keySet().contains(suggesterName));
-			assertNotNull(response.suggest().get(suggesterName));
-			assertNotNull(response.suggest().get(suggesterName).get(0));
-			assertTrue(response.suggest().get(suggesterName).get(0).isPhrase());
-			assertNotNull(response.suggest().get(suggesterName).get(0).phrase().options());
-			assertEquals(response.suggest().get(suggesterName).get(0).phrase().options().get(0)
-					.text(), "design patterns");
-		}
-
-//    @Test
-//    public void testValueBodyResponse() throws Exception {
-//        DiskUsageResponse resp = highLevelClient().indices().diskUsage(b -> b
-//                .index("*")
-//                .allowNoIndices(true)
-//                .runExpensiveTasks(true)
-//        );
-//
-//        assertNotNull(resp.valueBody().toJson().asJsonObject().get("_shards"));
-//    }
+    // @Test
+    // public void testValueBodyResponse() throws Exception {
+    // DiskUsageResponse resp = highLevelClient().indices().diskUsage(b -> b
+    // .index("*")
+    // .allowNoIndices(true)
+    // .runExpensiveTasks(true)
+    // );
+    //
+    // assertNotNull(resp.valueBody().toJson().asJsonObject().get("_shards"));
+    // }
 
     public static class AppData {
 
@@ -918,8 +772,7 @@ public static class Product {
         public double price;
         public String color;
 
-        public Product() {
-        }
+        public Product() {}
 
         public Product(double price) {
             this.price = price;
@@ -944,8 +797,7 @@ public static class Join {
         public String name;
         public String parent;
 
-        Join() {
-        }
+        Join() {}
 
         Join(String name) {
             this.name = name;
@@ -962,8 +814,7 @@ public static class Question {
         public String title;
         public Join join;
 
-        Question() {
-        }
+        Question() {}
 
         Question(String title) {
             this.title = title;
@@ -976,8 +827,7 @@ public static class Answer {
         public String body;
         public Join join;
 
-        Answer() {
-        }
+        Answer() {}
 
         Answer(String body) {
             this.body = body;
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractSearchTemplateRequestIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractSearchTemplateRequestIT.java
index da8f1007e7..9e029fe95f 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractSearchTemplateRequestIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractSearchTemplateRequestIT.java
@@ -10,7 +10,6 @@
 
 import java.io.IOException;
 import java.util.Map;
-
 import org.junit.Test;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.opensearch._types.Refresh;
@@ -18,189 +17,183 @@
 import org.opensearch.client.opensearch.core.PutScriptRequest;
 import org.opensearch.client.opensearch.core.SearchTemplateResponse;
 
-public abstract class AbstractSearchTemplateRequestIT
-		extends
-			OpenSearchJavaClientTestCase {
-
-	private static final String TEST_SEARCH_TEMPLATE = "search-template-integration-test";
-
-	@Test
-	public void testTemplateSearchResults() throws Exception {
-		var index = "test-search-template-search";
-		createDocuments(index);
-
-		var searchResponse = sendTemplateRequest(index, "NoDocuments", false,
-				false);
-		assertEquals(0, searchResponse.hits().hits().size());
-		assertEquals(0, searchResponse.suggest().size());
-		assertEquals(0, searchResponse.aggregations().size());
-
-		searchResponse = sendTemplateRequest(index, "Document", false, false);
-		assertEquals(4, searchResponse.hits().hits().size());
-		assertEquals(0, searchResponse.suggest().size());
-		assertEquals(0, searchResponse.aggregations().size());
-
-		searchResponse = sendTemplateRequest(index, "1", false, false);
-		assertEquals(1, searchResponse.hits().hits().size());
-		assertEquals(1, searchResponse.hits().hits().get(0).source().getValue().intValue());
-		assertEquals(0, searchResponse.suggest().size());
-		assertEquals(0, searchResponse.aggregations().size());
-	}
-
-	@Test
-	public void testTemplateSearchSuggest() throws Exception {
-		var index = "test-search-template-suggs";
-		createDocuments(index);
-
-		var searchResponse = sendTemplateRequest(index, "Document", true, false);
-		assertEquals(4, searchResponse.hits().hits().size());
-		assertEquals(1, searchResponse.suggest().size());
-		assertEquals(0, searchResponse.aggregations().size());
-		
-		// intentional typo
-		searchResponse = sendTemplateRequest(index, "Docuent", true, false);
-		assertEquals(0, searchResponse.hits().hits().size());
-		assertEquals(1, searchResponse.suggest().size());
-		var options = searchResponse.suggest().get("test-suggest").get(0).term().options();
-		assertEquals(1, options.size());
-		assertEquals("document", options.get(0).text());
-		assertEquals(0, searchResponse.aggregations().size());
-
-	}
-
-	@Test
-	public void testTemplateSearchAggregations() throws Exception {
-		var index = "test-search-template-aggs";
-		createDocuments(index);
-
-		var searchResponse = sendTemplateRequest(index, "NoDocuments", false, true);
-		assertEquals(0, searchResponse.hits().hits().size());
-		assertEquals(0, searchResponse.suggest().size());
-		assertEquals(1, searchResponse.aggregations().size());
-		
-		searchResponse = sendTemplateRequest(index, "Document", false, true);
-		assertEquals(4, searchResponse.hits().hits().size());
-		assertEquals(0, searchResponse.suggest().size());
-		assertEquals(1, searchResponse.aggregations().size());
-		var buckets = searchResponse.aggregations().get("test-aggs").sterms().buckets().array();
-		assertEquals(2, buckets.size());
-		assertEquals(2, buckets.get(0).docCount());
-		assertEquals(2, buckets.get(1).docCount());
-
-	}
-
-	private SearchTemplateResponse<SimpleDoc> sendTemplateRequest(String index,
-			String title, boolean suggs, boolean aggs) throws IOException {
-		return javaClient().searchTemplate(
-				request -> request
-					.index(index)
-					.id(TEST_SEARCH_TEMPLATE)
-					.params(Map.of(
-							"title", JsonData.of(title),
-							"suggs", JsonData.of(suggs),
-							"aggs", JsonData.of(aggs))),
-				SimpleDoc.class);
-	}
-
-	private void createDocuments(String index) throws IOException {
-		createIndex(index);
-		javaClient().create(_1 -> _1.index(index).id("1")
-				.document(createDoc("Document 1", "The text of document 1", 1))
-				.refresh(Refresh.True));
-		javaClient().create(_1 -> _1.index(index).id("2")
-				.document(createDoc("Document 2", "The text of document 2", 1))
-				.refresh(Refresh.True));
-		javaClient().create(_1 -> _1.index(index).id("3")
-				.document(createDoc("Document 3", "The text of document 3", 2))
-				.refresh(Refresh.True));
-		javaClient().create(_1 -> _1.index(index).id("4")
-				.document(createDoc("Document 4", "The text of document 4", 2))
-				.refresh(Refresh.True));
-	}
-
-	private void createIndex(String index) throws IOException {
-		Property titleProp = new Property.Builder().text(v -> v).build();
-		Property textProp = new Property.Builder().text(v -> v).build();
-		Property valueProp = new Property.Builder().keyword(v -> v).build();
-		javaClient().indices().create(c -> c.index(index)
-				.mappings(m -> m
-				.properties("title", titleProp)
-				.properties("text", textProp)
-				.properties("value", valueProp)));
-		createSearchTemplate();
-	}
-
-	/*
-	 * """{
-		  "query": {
-		    "match": {
-		      "title": "{{title}}"
-		    }
-		  }
-		  {{#suggs}}
-		  ,"suggest" : {
-		    "test-suggest" : {
-		      "text" : "{{title}}",
-		      "term" : {
-		        "field" : "title"
-		      }
-		    }
-		  }
-		  {{/suggs}}
-		  {{#aggs}}
-		  ,"aggs": {
-		    "test-aggs": {
-		      "terms": {
-		        "field": "value"
-		      }
-		    }
-		  }
-		  {{/aggs}}
-		}"""
-	 */
-	private void createSearchTemplate() throws IOException {
-		var templateReq = new PutScriptRequest.Builder()
-				.id(TEST_SEARCH_TEMPLATE)
-				.script(s -> s.lang("mustache").source(
-						  "{ \"query\": { \"match\": { \"title\": \"{{title}}\" } } "
-						+ "{{#suggs}},\"suggest\" : { \"test-suggest\" : { \"text\" : "
-						+ "\"{{title}}\", \"term\" : { \"field\" : \"title\" } } } {{/suggs}}"
-						+ "{{#aggs}} ,\"aggs\": {\"test-aggs\": { \"terms\": "
-						+ "{ \"field\": \"value\" } } }{{/aggs}} }"
-					)
-				);
-		javaClient().putScript(templateReq.build());
-	}
-
-	private SimpleDoc createDoc(String title, String text, Integer value) {
-		return new SimpleDoc(title, text, value);
-	}
-
-	public static class SimpleDoc {
-		private String title;
-		private String text;
-		private Integer value;
-
-		public SimpleDoc() {
-		}
-
-		public SimpleDoc(String title, String text, Integer value) {
-			this.title = title;
-			this.text = text;
-			this.value = value;
-		}
-
-		public String getTitle() {
-			return title;
-		}
-
-		public String getText() {
-			return text;
-		}
-		
-		public Integer getValue() {
-			return value;
-		}
-	}
+public abstract class AbstractSearchTemplateRequestIT extends OpenSearchJavaClientTestCase {
+
+    private static final String TEST_SEARCH_TEMPLATE = "search-template-integration-test";
+
+    @Test
+    public void testTemplateSearchResults() throws Exception {
+        var index = "test-search-template-search";
+        createDocuments(index);
+
+        var searchResponse = sendTemplateRequest(index, "NoDocuments", false, false);
+        assertEquals(0, searchResponse.hits().hits().size());
+        assertEquals(0, searchResponse.suggest().size());
+        assertEquals(0, searchResponse.aggregations().size());
+
+        searchResponse = sendTemplateRequest(index, "Document", false, false);
+        assertEquals(4, searchResponse.hits().hits().size());
+        assertEquals(0, searchResponse.suggest().size());
+        assertEquals(0, searchResponse.aggregations().size());
+
+        searchResponse = sendTemplateRequest(index, "1", false, false);
+        assertEquals(1, searchResponse.hits().hits().size());
+        assertEquals(1, searchResponse.hits().hits().get(0).source().getValue().intValue());
+        assertEquals(0, searchResponse.suggest().size());
+        assertEquals(0, searchResponse.aggregations().size());
+    }
+
+    @Test
+    public void testTemplateSearchSuggest() throws Exception {
+        var index = "test-search-template-suggs";
+        createDocuments(index);
+
+        var searchResponse = sendTemplateRequest(index, "Document", true, false);
+        assertEquals(4, searchResponse.hits().hits().size());
+        assertEquals(1, searchResponse.suggest().size());
+        assertEquals(0, searchResponse.aggregations().size());
+
+        // intentional typo
+        searchResponse = sendTemplateRequest(index, "Docuent", true, false);
+        assertEquals(0, searchResponse.hits().hits().size());
+        assertEquals(1, searchResponse.suggest().size());
+        var options = searchResponse.suggest().get("test-suggest").get(0).term().options();
+        assertEquals(1, options.size());
+        assertEquals("document", options.get(0).text());
+        assertEquals(0, searchResponse.aggregations().size());
+
+    }
+
+    @Test
+    public void testTemplateSearchAggregations() throws Exception {
+        var index = "test-search-template-aggs";
+        createDocuments(index);
+
+        var searchResponse = sendTemplateRequest(index, "NoDocuments", false, true);
+        assertEquals(0, searchResponse.hits().hits().size());
+        assertEquals(0, searchResponse.suggest().size());
+        assertEquals(1, searchResponse.aggregations().size());
+
+        searchResponse = sendTemplateRequest(index, "Document", false, true);
+        assertEquals(4, searchResponse.hits().hits().size());
+        assertEquals(0, searchResponse.suggest().size());
+        assertEquals(1, searchResponse.aggregations().size());
+        var buckets = searchResponse.aggregations().get("test-aggs").sterms().buckets().array();
+        assertEquals(2, buckets.size());
+        assertEquals(2, buckets.get(0).docCount());
+        assertEquals(2, buckets.get(1).docCount());
+
+    }
+
+    private SearchTemplateResponse<SimpleDoc> sendTemplateRequest(String index, String title, boolean suggs, boolean aggs)
+        throws IOException {
+        return javaClient().searchTemplate(
+            request -> request.index(index)
+                .id(TEST_SEARCH_TEMPLATE)
+                .params(Map.of("title", JsonData.of(title), "suggs", JsonData.of(suggs), "aggs", JsonData.of(aggs))),
+            SimpleDoc.class
+        );
+    }
+
+    private void createDocuments(String index) throws IOException {
+        createIndex(index);
+        javaClient().create(
+            _1 -> _1.index(index).id("1").document(createDoc("Document 1", "The text of document 1", 1)).refresh(Refresh.True)
+        );
+        javaClient().create(
+            _1 -> _1.index(index).id("2").document(createDoc("Document 2", "The text of document 2", 1)).refresh(Refresh.True)
+        );
+        javaClient().create(
+            _1 -> _1.index(index).id("3").document(createDoc("Document 3", "The text of document 3", 2)).refresh(Refresh.True)
+        );
+        javaClient().create(
+            _1 -> _1.index(index).id("4").document(createDoc("Document 4", "The text of document 4", 2)).refresh(Refresh.True)
+        );
+    }
+
+    private void createIndex(String index) throws IOException {
+        Property titleProp = new Property.Builder().text(v -> v).build();
+        Property textProp = new Property.Builder().text(v -> v).build();
+        Property valueProp = new Property.Builder().keyword(v -> v).build();
+        javaClient().indices()
+            .create(
+                c -> c.index(index)
+                    .mappings(m -> m.properties("title", titleProp).properties("text", textProp).properties("value", valueProp))
+            );
+        createSearchTemplate();
+    }
+
+    /*
+     * """{
+    	  "query": {
+    	    "match": {
+    	      "title": "{{title}}"
+    	    }
+    	  }
+    	  {{#suggs}}
+    	  ,"suggest" : {
+    	    "test-suggest" : {
+    	      "text" : "{{title}}",
+    	      "term" : {
+    	        "field" : "title"
+    	      }
+    	    }
+    	  }
+    	  {{/suggs}}
+    	  {{#aggs}}
+    	  ,"aggs": {
+    	    "test-aggs": {
+    	      "terms": {
+    	        "field": "value"
+    	      }
+    	    }
+    	  }
+    	  {{/aggs}}
+    	}"""
+     */
+    private void createSearchTemplate() throws IOException {
+        var templateReq = new PutScriptRequest.Builder().id(TEST_SEARCH_TEMPLATE)
+            .script(
+                s -> s.lang("mustache")
+                    .source(
+                        "{ \"query\": { \"match\": { \"title\": \"{{title}}\" } } "
+                            + "{{#suggs}},\"suggest\" : { \"test-suggest\" : { \"text\" : "
+                            + "\"{{title}}\", \"term\" : { \"field\" : \"title\" } } } {{/suggs}}"
+                            + "{{#aggs}} ,\"aggs\": {\"test-aggs\": { \"terms\": "
+                            + "{ \"field\": \"value\" } } }{{/aggs}} }"
+                    )
+            );
+        javaClient().putScript(templateReq.build());
+    }
+
+    private SimpleDoc createDoc(String title, String text, Integer value) {
+        return new SimpleDoc(title, text, value);
+    }
+
+    public static class SimpleDoc {
+        private String title;
+        private String text;
+        private Integer value;
+
+        public SimpleDoc() {}
+
+        public SimpleDoc(String title, String text, Integer value) {
+            this.title = title;
+            this.text = text;
+            this.value = value;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public String getText() {
+            return text;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+    }
 
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/OpenSearchJavaClientTestCase.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/OpenSearchJavaClientTestCase.java
index a5511840a7..d60a6e28c3 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/OpenSearchJavaClientTestCase.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/OpenSearchJavaClientTestCase.java
@@ -8,6 +8,21 @@
 
 package org.opensearch.client.opensearch.integTest;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.TreeSet;
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.ssl.SSLContextBuilder;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
 import org.opensearch.Version;
 import org.opensearch.client.RestClient;
 import org.opensearch.client.RestClientBuilder;
@@ -19,25 +34,9 @@
 import org.opensearch.client.opensearch.indices.DeleteIndexRequest;
 import org.opensearch.client.opensearch.nodes.NodesInfoResponse;
 import org.opensearch.client.opensearch.nodes.info.NodeInfo;
-import org.apache.http.HttpHost;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.ssl.SSLContextBuilder;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.test.rest.OpenSearchRestTestCase;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.TreeSet;
-
 public abstract class OpenSearchJavaClientTestCase extends OpenSearchRestTestCase implements OpenSearchTransportSupport {
     private static final List<String> systemIndices = List.of(".opensearch-observability", ".opendistro_security", ".plugins-ml-config");
     private static OpenSearchClient javaClient;
@@ -88,16 +87,14 @@ protected RestClient buildClient(Settings settings, HttpHost[] hosts) throws IOE
             builder.setHttpClientConfigCallback(httpClientBuilder -> {
                 String userName = Optional.ofNullable(System.getProperty("user")).orElse("admin");
                 String password = Optional.ofNullable(System.getProperty("password")).orElse("admin");
-    
+
                 final BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-                for (final HttpHost host: hosts) {
-                    credentialsProvider.setCredentials(AuthScope.ANY,
-                        new UsernamePasswordCredentials(userName, password));
+                for (final HttpHost host : hosts) {
+                    credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(userName, password));
                 }
 
                 try {
-                    return httpClientBuilder
-                        .setDefaultCredentialsProvider(credentialsProvider)
+                    return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider)
                         // disable the certificate since our testing cluster just uses the default security configuration
                         .setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE)
                         .setSSLContext(SSLContextBuilder.create().loadTrustMaterial(null, (chains, authType) -> true).build());
@@ -133,8 +130,7 @@ protected void wipeAllOSIndices() throws IOException {
         adminJavaClient().indices().deleteDataStream(b -> b.name("*"));
 
         // wipe all indices
-        final IndicesResponse response = adminJavaClient()
-            .cat()
+        final IndicesResponse response = adminJavaClient().cat()
             .indices(r -> r.headers("index,creation.date").expandWildcards(ExpandWildcard.All));
 
         for (IndicesRecord index : response.valueBody()) {
@@ -150,7 +146,7 @@ public static void cleanupJavaClient() throws IOException {
             if (javaClient != null) {
                 IOUtils.closeQueitly(javaClient._transport());
             }
-            
+
             if (adminJavaClient != null) {
                 IOUtils.closeQueitly(adminJavaClient._transport());
             }
@@ -166,4 +162,4 @@ public static void cleanupJavaClient() throws IOException {
     protected boolean preserveIndicesUponCompletion() {
         return true;
     }
-} 
\ No newline at end of file
+}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/OpenSearchTransportSupport.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/OpenSearchTransportSupport.java
index 3a469598d8..4f06567a03 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/OpenSearchTransportSupport.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/OpenSearchTransportSupport.java
@@ -10,7 +10,6 @@
 
 import java.io.IOException;
 import java.util.Optional;
-
 import org.apache.http.HttpHost;
 import org.opensearch.client.opensearch.OpenSearchClient;
 import org.opensearch.client.transport.OpenSearchTransport;
@@ -18,9 +17,7 @@
 
 public interface OpenSearchTransportSupport {
     default boolean isHttps() {
-        return Optional.ofNullable(System.getProperty("https"))
-                .map("true"::equalsIgnoreCase)
-                .orElse(false);
+        return Optional.ofNullable(System.getProperty("https")).map("true"::equalsIgnoreCase).orElse(false);
     }
 
     default OpenSearchClient buildJavaClient(Settings settings, HttpHost[] hosts) throws IOException {
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2BulkRequestIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2BulkRequestIT.java
index 36672582ac..759909cddb 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2BulkRequestIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2BulkRequestIT.java
@@ -8,8 +8,10 @@
 
 package org.opensearch.client.opensearch.integTest.aws;
 
-import org.junit.Test;
+import java.util.ArrayList;
+import java.util.List;
 import org.junit.Assert;
+import org.junit.Test;
 import org.opensearch.client.opensearch.OpenSearchClient;
 import org.opensearch.client.opensearch._types.Refresh;
 import org.opensearch.client.opensearch._types.query_dsl.Query;
@@ -20,9 +22,6 @@
 import org.opensearch.client.opensearch.core.bulk.BulkOperation;
 import org.opensearch.client.opensearch.core.bulk.IndexOperation;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class AwsSdk2BulkRequestIT extends AwsSdk2TransportTestCase {
 
     @Test
@@ -32,33 +31,23 @@ public void testBulkRequest() throws Exception {
 
         ArrayList<BulkOperation> ops = new ArrayList<>();
         SimplePojo doc1 = new SimplePojo("Document 1", "The text of document 1");
-        ops.add(new BulkOperation.Builder().index(
-                IndexOperation.of(io -> io.index(TEST_INDEX).id("id1").document(doc1))
-        ).build());
+        ops.add(new BulkOperation.Builder().index(IndexOperation.of(io -> io.index(TEST_INDEX).id("id1").document(doc1))).build());
         SimplePojo doc2 = new SimplePojo("Document 2", "The text of document 2");
-        ops.add(new BulkOperation.Builder().index(
-                IndexOperation.of(io -> io.index(TEST_INDEX).id("id2").document(doc2))
-        ).build());
+        ops.add(new BulkOperation.Builder().index(IndexOperation.of(io -> io.index(TEST_INDEX).id("id2").document(doc2))).build());
         SimplePojo doc3 = getLongDoc("Long Document 3", 100000);
-        ops.add(new BulkOperation.Builder().index(
-                IndexOperation.of(io -> io.index(TEST_INDEX).id("id3").document(doc3))
-        ).build());
+        ops.add(new BulkOperation.Builder().index(IndexOperation.of(io -> io.index(TEST_INDEX).id("id3").document(doc3))).build());
 
-        BulkRequest.Builder bulkReq = new BulkRequest.Builder()
-                .index(TEST_INDEX)
-                .operations(ops)
-                .refresh(Refresh.WaitFor);
+        BulkRequest.Builder bulkReq = new BulkRequest.Builder().index(TEST_INDEX).operations(ops).refresh(Refresh.WaitFor);
         BulkResponse bulkResponse = client.bulk(bulkReq.build());
         Assert.assertEquals(3, bulkResponse.items().size());
 
         Query query = Query.of(qb -> qb.match(mb -> mb.field("title").query(fv -> fv.stringValue("Document"))));
-        final SearchRequest.Builder searchReq = new SearchRequest.Builder()
-                .allowPartialSearchResults(false)
-                .index(List.of(TEST_INDEX))
-                .size(10)
-                .source(sc -> sc.fetch(false))
-                .ignoreThrottled(false)
-                .query(query);
+        final SearchRequest.Builder searchReq = new SearchRequest.Builder().allowPartialSearchResults(false)
+            .index(List.of(TEST_INDEX))
+            .size(10)
+            .source(sc -> sc.fetch(false))
+            .ignoreThrottled(false)
+            .query(query);
         SearchResponse<SimplePojo> searchResponse = client.search(searchReq.build(), SimplePojo.class);
         Assert.assertEquals(3, searchResponse.hits().hits().size());
     }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2SearchIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2SearchIT.java
index 1e7f4ce427..343c1f18d1 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2SearchIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2SearchIT.java
@@ -8,8 +8,10 @@
 
 package org.opensearch.client.opensearch.integTest.aws;
 
-import org.junit.Test;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import org.junit.Assert;
+import org.junit.Test;
 import org.opensearch.client.opensearch.OpenSearchAsyncClient;
 import org.opensearch.client.opensearch.OpenSearchClient;
 import org.opensearch.client.opensearch._types.OpenSearchException;
@@ -19,9 +21,6 @@
 import org.opensearch.client.opensearch.indices.CreateIndexRequest;
 import org.opensearch.client.opensearch.indices.OpenSearchIndicesClient;
 
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
 public class AwsSdk2SearchIT extends AwsSdk2TransportTestCase {
 
     @Test
@@ -54,7 +53,7 @@ void testClient(boolean async) throws Exception {
         addDoc(client, "id2", doc2);
         SimplePojo doc3 = getLongDoc("Long Document 3", 1000000);
         addDoc(client, "id3", doc3);
-        
+
         // wait for the document to index
         Thread.sleep(1000);
 
@@ -82,8 +81,7 @@ void testClientAsync(boolean async) throws Exception {
         SimplePojo doc2 = new SimplePojo("Document 2", "The text of document 2");
         CompletableFuture<IndexResponse> add2 = addDoc(client, "id2", doc2);
         SimplePojo doc3 = getLongDoc("Long Document 3", 1000000);
-        CompletableFuture<IndexResponse> add3 = CompletableFuture.allOf(add1, add2).thenCompose(
-                unused -> addDoc(client, "id3", doc3));
+        CompletableFuture<IndexResponse> add3 = CompletableFuture.allOf(add1, add2).thenCompose(unused -> addDoc(client, "id3", doc3));
 
         // wait for the document to index
         Thread.sleep(1000);
@@ -92,11 +90,7 @@ void testClientAsync(boolean async) throws Exception {
             CompletableFuture<SearchResponse<SimplePojo>> r1 = query(client, "NotPresent", null);
             CompletableFuture<SearchResponse<SimplePojo>> r2 = query(client, "Document", null);
             CompletableFuture<SearchResponse<SimplePojo>> r3 = query(client, "1", null);
-            return CompletableFuture.allOf(r1, r2, r3).thenApply(u2 -> List.of(
-                    r1.getNow(null),
-                    r2.getNow(null),
-                    r3.getNow(null))
-            );
+            return CompletableFuture.allOf(r1, r2, r3).thenApply(u2 -> List.of(r1.getNow(null), r2.getNow(null), r3.getNow(null)));
         }).get();
 
         SearchResponse<SimplePojo> response = results.get(0);
@@ -110,22 +104,13 @@ void testClientAsync(boolean async) throws Exception {
         Assert.assertEquals(doc1, response.hits().hits().get(0).source());
     }
 
-
     private void addDoc(OpenSearchClient client, String id, SimplePojo doc) throws Exception {
-        IndexRequest.Builder<SimplePojo> req = new IndexRequest.Builder<SimplePojo>()
-                .index(TEST_INDEX)
-                .document(doc)
-                .id(id);
+        IndexRequest.Builder<SimplePojo> req = new IndexRequest.Builder<SimplePojo>().index(TEST_INDEX).document(doc).id(id);
         client.index(req.build());
     }
 
-    private CompletableFuture<IndexResponse> addDoc(
-            OpenSearchAsyncClient client, String id, SimplePojo doc
-    ) {
-        IndexRequest.Builder<SimplePojo> req = new IndexRequest.Builder<SimplePojo>()
-                .index(TEST_INDEX)
-                .document(doc)
-                .id(id);
+    private CompletableFuture<IndexResponse> addDoc(OpenSearchAsyncClient client, String id, SimplePojo doc) {
+        IndexRequest.Builder<SimplePojo> req = new IndexRequest.Builder<SimplePojo>().index(TEST_INDEX).document(doc).id(id);
         try {
             return client.index(req.build());
         } catch (Exception e) {
@@ -140,9 +125,7 @@ public void testDoubleWrappedException() throws Exception {
         // attempt to create the same index a second time
         OpenSearchIndicesClient client = getIndexesClient(false, null, null);
         var req = new CreateIndexRequest.Builder().index(TEST_INDEX);
-        Exception exception = Assert.assertThrows(OpenSearchException.class, () -> {
-            client.create(req.build());
-        });
+        Exception exception = Assert.assertThrows(OpenSearchException.class, () -> { client.create(req.build()); });
         // error message contains the actual error, not a generic [http_exception]
         Assert.assertTrue(exception.getMessage().contains("[resource_already_exists_exception]"));
     }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2SecurityIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2SecurityIT.java
index aef59a3abf..6ec60590db 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2SecurityIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2SecurityIT.java
@@ -8,24 +8,22 @@
 
 package org.opensearch.client.opensearch.integTest.aws;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
+
 import org.junit.Test;
 import org.opensearch.client.opensearch.OpenSearchClient;
 import org.opensearch.client.opensearch._types.OpenSearchException;
 import org.opensearch.client.opensearch.cluster.GetClusterSettingsRequest;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThrows;
-
 public class AwsSdk2SecurityIT extends AwsSdk2TransportTestCase {
     private static final String DEFAULT_MESSAGE = "authentication/authorization failure";
+
     @Test
     public void testUnAuthorizedException() {
         final OpenSearchClient client = getClient(false, null, null);
-        final GetClusterSettingsRequest request = new GetClusterSettingsRequest.Builder()
-                .includeDefaults(true)
-                .build();
-        final OpenSearchException ex = assertThrows(
-                OpenSearchException.class, () -> client.cluster().getSettings(request));
+        final GetClusterSettingsRequest request = new GetClusterSettingsRequest.Builder().includeDefaults(true).build();
+        final OpenSearchException ex = assertThrows(OpenSearchException.class, () -> client.cluster().getSettings(request));
         assertFalse(ex.getMessage().contains(DEFAULT_MESSAGE));
     }
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2TransportTestCase.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2TransportTestCase.java
index 8adcd4300b..a1ec172c41 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2TransportTestCase.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/aws/AwsSdk2TransportTestCase.java
@@ -11,6 +11,11 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.IOException;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.CheckForNull;
 import org.junit.AfterClass;
 import org.junit.Assume;
 import org.junit.Before;
@@ -35,12 +40,6 @@
 import software.amazon.awssdk.http.crt.AwsCrtAsyncHttpClient;
 import software.amazon.awssdk.regions.Region;
 
-import javax.annotation.CheckForNull;
-import java.io.IOException;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-
 public abstract class AwsSdk2TransportTestCase {
     public static final String TEST_INDEX = "opensearch-java-integtest";
 
@@ -71,74 +70,79 @@ protected AwsSdk2TransportOptions.Builder getTransportOptions() {
         return AwsSdk2TransportOptions.builder();
     }
 
-    protected OpenSearchClient getClient(
-            boolean async,
-            @CheckForNull JsonpMapper mapper,
-            @CheckForNull TransportOptions options) {
+    protected OpenSearchClient getClient(boolean async, @CheckForNull JsonpMapper mapper, @CheckForNull TransportOptions options) {
 
         AwsSdk2Transport transport;
         if (async) {
             transport = new AwsSdk2Transport(
-                    getAsyncHttpClient(),
-                    getTestClusterHost(),
-                    getTestClusterServiceName(),
-                    getTestClusterRegion(),
-                    getTransportOptions().build());
+                getAsyncHttpClient(),
+                getTestClusterHost(),
+                getTestClusterServiceName(),
+                getTestClusterRegion(),
+                getTransportOptions().build()
+            );
         } else {
             transport = new AwsSdk2Transport(
-                    getHttpClient(),
-                    getTestClusterHost(),
-                    getTestClusterServiceName(),
-                    getTestClusterRegion(),
-                    getTransportOptions().build());
+                getHttpClient(),
+                getTestClusterHost(),
+                getTestClusterServiceName(),
+                getTestClusterRegion(),
+                getTransportOptions().build()
+            );
         }
         return new OpenSearchClient(transport);
     }
 
     protected OpenSearchAsyncClient getAsyncClient(
-            boolean async,
-            @CheckForNull JsonpMapper mapper,
-            @CheckForNull TransportOptions options) {
+        boolean async,
+        @CheckForNull JsonpMapper mapper,
+        @CheckForNull TransportOptions options
+    ) {
 
         AwsSdk2Transport transport;
         if (async) {
             transport = new AwsSdk2Transport(
-                    getAsyncHttpClient(),
-                    getTestClusterHost(),
-                    getTestClusterServiceName(),
-                    getTestClusterRegion(),
-                    getTransportOptions().build());
+                getAsyncHttpClient(),
+                getTestClusterHost(),
+                getTestClusterServiceName(),
+                getTestClusterRegion(),
+                getTransportOptions().build()
+            );
         } else {
             transport = new AwsSdk2Transport(
-                    getHttpClient(),
-                    getTestClusterHost(),
-                    getTestClusterServiceName(),
-                    getTestClusterRegion(),
-                    getTransportOptions().build());
+                getHttpClient(),
+                getTestClusterHost(),
+                getTestClusterServiceName(),
+                getTestClusterRegion(),
+                getTransportOptions().build()
+            );
         }
         return new OpenSearchAsyncClient(transport);
     }
 
     protected OpenSearchIndicesClient getIndexesClient(
-            boolean async,
-            @CheckForNull JsonpMapper mapper,
-            @CheckForNull TransportOptions options) {
+        boolean async,
+        @CheckForNull JsonpMapper mapper,
+        @CheckForNull TransportOptions options
+    ) {
 
         AwsSdk2Transport transport;
         if (async) {
             transport = new AwsSdk2Transport(
-                    getAsyncHttpClient(),
-                    getTestClusterHost(),
-                    getTestClusterServiceName(),
-                    getTestClusterRegion(),
-                    getTransportOptions().build());
+                getAsyncHttpClient(),
+                getTestClusterHost(),
+                getTestClusterServiceName(),
+                getTestClusterRegion(),
+                getTransportOptions().build()
+            );
         } else {
             transport = new AwsSdk2Transport(
-                    getHttpClient(),
-                    getTestClusterHost(),
-                    getTestClusterServiceName(),
-                    getTestClusterRegion(),
-                    getTransportOptions().build());
+                getHttpClient(),
+                getTestClusterHost(),
+                getTestClusterServiceName(),
+                getTestClusterRegion(),
+                getTransportOptions().build()
+            );
         }
         return new OpenSearchIndicesClient(transport);
     }
@@ -207,8 +211,7 @@ public void resetTestIndex(boolean async) throws Exception {
         if (indexExists) {
             client.delete(b -> b.index(List.of(TEST_INDEX)));
         }
-        var req = new CreateIndexRequest.Builder()
-                .index(TEST_INDEX);
+        var req = new CreateIndexRequest.Builder().index(TEST_INDEX);
         client.create(req.build());
     }
 
@@ -222,21 +225,20 @@ protected SearchResponse<SimplePojo> query(OpenSearchClient client, String title
             }
             return qb;
         });
-        final SearchRequest.Builder req = new SearchRequest.Builder()
-                .allowPartialSearchResults(false)
-                .index(List.of(TEST_INDEX))
-                .size(10)
-                .ignoreThrottled(false)
-                .sort(
-                        new SortOptions.Builder().score(o -> o.order(SortOrder.Desc)).build(),
-                        new SortOptions.Builder().doc(o -> o.order(SortOrder.Desc)).build())
-                .query(query);
+        final SearchRequest.Builder req = new SearchRequest.Builder().allowPartialSearchResults(false)
+            .index(List.of(TEST_INDEX))
+            .size(10)
+            .ignoreThrottled(false)
+            .sort(
+                new SortOptions.Builder().score(o -> o.order(SortOrder.Desc)).build(),
+                new SortOptions.Builder().doc(o -> o.order(SortOrder.Desc)).build()
+            )
+            .query(query);
 
         return client.search(req.build(), SimplePojo.class);
     }
 
-    protected CompletableFuture<SearchResponse<SimplePojo>> query(
-            OpenSearchAsyncClient client, String title, String text) {
+    protected CompletableFuture<SearchResponse<SimplePojo>> query(OpenSearchAsyncClient client, String title, String text) {
         var query = Query.of(qb -> {
             if (title != null) {
                 qb.match(mb -> mb.field("title").query(vb -> vb.stringValue(title)));
@@ -246,15 +248,15 @@ protected CompletableFuture<SearchResponse<SimplePojo>> query(
             }
             return qb;
         });
-        final SearchRequest.Builder req = new SearchRequest.Builder()
-                .allowPartialSearchResults(false)
-                .index(List.of(TEST_INDEX))
-                .size(10)
-                .ignoreThrottled(false)
-                .sort(
-                        new SortOptions.Builder().score(o -> o.order(SortOrder.Desc)).build(),
-                        new SortOptions.Builder().doc(o -> o.order(SortOrder.Desc)).build())
-                .query(query);
+        final SearchRequest.Builder req = new SearchRequest.Builder().allowPartialSearchResults(false)
+            .index(List.of(TEST_INDEX))
+            .size(10)
+            .ignoreThrottled(false)
+            .sort(
+                new SortOptions.Builder().score(o -> o.order(SortOrder.Desc)).build(),
+                new SortOptions.Builder().doc(o -> o.order(SortOrder.Desc)).build()
+            )
+            .query(query);
 
         try {
             return client.search(req.build(), SimplePojo.class);
@@ -269,9 +271,7 @@ public static class SimplePojo {
         final String title;
         final String text;
 
-        public SimplePojo(
-                @JsonProperty("title") String title,
-                @JsonProperty("text") String text) {
+        public SimplePojo(@JsonProperty("title") String title, @JsonProperty("text") String text) {
             this.title = title;
             this.text = text;
         }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/AggregationRequestIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/AggregationRequestIT.java
index b91aec9819..195f0b7cd8 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/AggregationRequestIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/AggregationRequestIT.java
@@ -10,5 +10,4 @@
 
 import org.opensearch.client.opensearch.integTest.AbstractAggregationRequestIT;
 
-public class AggregationRequestIT extends AbstractAggregationRequestIT implements HttpClient5TransportSupport{
-}
+public class AggregationRequestIT extends AbstractAggregationRequestIT implements HttpClient5TransportSupport {}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/CatIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/CatIT.java
index f152e23268..5fa4110b3d 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/CatIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/CatIT.java
@@ -10,7 +10,4 @@
 
 import org.opensearch.client.opensearch.integTest.AbstractCatClientIT;
 
-public class CatIT extends AbstractCatClientIT implements HttpClient5TransportSupport {
-}
-
-
+public class CatIT extends AbstractCatClientIT implements HttpClient5TransportSupport {}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/ClusterClientIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/ClusterClientIT.java
index 5e13da89a2..fe0932fc84 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/ClusterClientIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/ClusterClientIT.java
@@ -9,7 +9,6 @@
 package org.opensearch.client.opensearch.integTest.httpclient5;
 
 import java.io.IOException;
-
 import org.opensearch.client.opensearch.integTest.AbstractClusterClientIT;
 import org.opensearch.client.transport.httpclient5.ResponseException;
 
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/CrudIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/CrudIT.java
index 1e4c995944..4445d068ab 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/CrudIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/CrudIT.java
@@ -10,5 +10,4 @@
 
 import org.opensearch.client.opensearch.integTest.AbstractCrudIT;
 
-public class CrudIT extends AbstractCrudIT implements HttpClient5TransportSupport {
-}
+public class CrudIT extends AbstractCrudIT implements HttpClient5TransportSupport {}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/HighlightIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/HighlightIT.java
index 1f097e2497..2b0e71a77c 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/HighlightIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/HighlightIT.java
@@ -10,5 +10,4 @@
 
 import org.opensearch.client.opensearch.integTest.AbstractHighlightIT;
 
-public class HighlightIT extends AbstractHighlightIT implements HttpClient5TransportSupport {
-}
+public class HighlightIT extends AbstractHighlightIT implements HttpClient5TransportSupport {}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/HttpClient5TransportSupport.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/HttpClient5TransportSupport.java
index 6ffe6419a1..f0fe9a4768 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/HttpClient5TransportSupport.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/HttpClient5TransportSupport.java
@@ -18,10 +18,8 @@
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Optional;
-
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
-
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
 import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider;
@@ -47,8 +45,7 @@
 interface HttpClient5TransportSupport extends OpenSearchTransportSupport {
     @Override
     default OpenSearchTransport buildTransport(Settings settings, org.apache.http.HttpHost[] hosts) throws IOException {
-        final HttpHost[] converted = Arrays
-            .stream(hosts)
+        final HttpHost[] converted = Arrays.stream(hosts)
             .map(h -> new HttpHost(h.getSchemeName(), h.getHostName(), h.getPort()))
             .toArray(HttpHost[]::new);
 
@@ -60,19 +57,18 @@ default OpenSearchTransport buildTransport(Settings settings, org.apache.http.Ht
     private void configure(ApacheHttpClient5TransportBuilder builder, Settings settings, HttpHost[] hosts) throws IOException {
         if (isHttps()) {
             try {
-                final SSLContext sslcontext = SSLContextBuilder
-                        .create()
-                        .loadTrustMaterial(null, (chains, authType) -> true)
-                        .build();
+                final SSLContext sslcontext = SSLContextBuilder.create().loadTrustMaterial(null, (chains, authType) -> true).build();
 
                 builder.setHttpClientConfigCallback(httpClientBuilder -> {
                     String userName = Optional.ofNullable(System.getProperty("user")).orElse("admin");
                     String password = Optional.ofNullable(System.getProperty("password")).orElse("admin");
-        
+
                     final BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-                    for (final HttpHost host: hosts) {
-                        credentialsProvider.setCredentials(new AuthScope(host),
-                            new UsernamePasswordCredentials(userName, password.toCharArray()));
+                    for (final HttpHost host : hosts) {
+                        credentialsProvider.setCredentials(
+                            new AuthScope(host),
+                            new UsernamePasswordCredentials(userName, password.toCharArray())
+                        );
                     }
 
                     final TlsStrategy tlsStrategy = ClientTlsStrategyBuilder.create()
@@ -92,9 +88,7 @@ public TlsDetails create(final SSLEngine sslEngine) {
                         .setTlsStrategy(tlsStrategy)
                         .build();
 
-                    return httpClientBuilder
-                        .setDefaultCredentialsProvider(credentialsProvider)
-                        .setConnectionManager(connectionManager);
+                    return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider).setConnectionManager(connectionManager);
                 });
             } catch (KeyStoreException | NoSuchAlgorithmException | KeyManagementException e) {
                 throw new RuntimeException("Error setting up ssl", e);
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/IndicesClientIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/IndicesClientIT.java
index ecd1469d3b..682022dbc9 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/IndicesClientIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/IndicesClientIT.java
@@ -10,5 +10,4 @@
 
 import org.opensearch.client.opensearch.integTest.AbstractIndicesClientIT;
 
-public class IndicesClientIT extends AbstractIndicesClientIT implements HttpClient5TransportSupport {
-}
+public class IndicesClientIT extends AbstractIndicesClientIT implements HttpClient5TransportSupport {}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/KnnIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/KnnIT.java
index a709f7c2a4..2fd41b4487 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/KnnIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/KnnIT.java
@@ -10,5 +10,4 @@
 
 import org.opensearch.client.opensearch.integTest.AbstractKnnIT;
 
-public class KnnIT extends AbstractKnnIT implements HttpClient5TransportSupport {
-}
+public class KnnIT extends AbstractKnnIT implements HttpClient5TransportSupport {}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/MultiSearchRequestIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/MultiSearchRequestIT.java
index e4b85a7891..0737562229 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/MultiSearchRequestIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/MultiSearchRequestIT.java
@@ -10,5 +10,4 @@
 
 import org.opensearch.client.opensearch.integTest.AbstractMultiSearchRequestIT;
 
-public class MultiSearchRequestIT extends AbstractMultiSearchRequestIT implements HttpClient5TransportSupport {
-}
+public class MultiSearchRequestIT extends AbstractMultiSearchRequestIT implements HttpClient5TransportSupport {}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/NodesIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/NodesIT.java
index 286ef7d15d..0efce55170 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/NodesIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/NodesIT.java
@@ -10,5 +10,4 @@
 
 import org.opensearch.client.opensearch.integTest.AbstractNodesIT;
 
-public class NodesIT extends AbstractNodesIT implements HttpClient5TransportSupport {
-}
+public class NodesIT extends AbstractNodesIT implements HttpClient5TransportSupport {}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/PingAndInfoIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/PingAndInfoIT.java
index 9bc6f883b2..d9397b9f85 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/PingAndInfoIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/PingAndInfoIT.java
@@ -10,6 +10,4 @@
 
 import org.opensearch.client.opensearch.integTest.AbstractPingAndInfoIT;
 
-public class PingAndInfoIT extends AbstractPingAndInfoIT implements HttpClient5TransportSupport {
-}
-
+public class PingAndInfoIT extends AbstractPingAndInfoIT implements HttpClient5TransportSupport {}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/RequestIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/RequestIT.java
index bfa6d90798..fab7c06e07 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/RequestIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/RequestIT.java
@@ -10,5 +10,4 @@
 
 import org.opensearch.client.opensearch.integTest.AbstractRequestIT;
 
-public class RequestIT extends AbstractRequestIT implements HttpClient5TransportSupport {
-}
+public class RequestIT extends AbstractRequestIT implements HttpClient5TransportSupport {}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/SearchTemplateRequestIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/SearchTemplateRequestIT.java
index d0a1ebe940..42777826a5 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/SearchTemplateRequestIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/httpclient5/SearchTemplateRequestIT.java
@@ -10,5 +10,4 @@
 
 import org.opensearch.client.opensearch.integTest.AbstractSearchTemplateRequestIT;
 
-public class SearchTemplateRequestIT extends AbstractSearchTemplateRequestIT implements HttpClient5TransportSupport{
-}
+public class SearchTemplateRequestIT extends AbstractSearchTemplateRequestIT implements HttpClient5TransportSupport {}
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/AggregationRequestIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/AggregationRequestIT.java
index ff15c5d2a3..8f4ce89c5a 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/AggregationRequestIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/AggregationRequestIT.java
@@ -8,6 +8,7 @@
 
 package org.opensearch.client.opensearch.integTest.restclient;
 
+import java.io.IOException;
 import org.apache.http.HttpHost;
 import org.opensearch.client.json.jackson.JacksonJsonpMapper;
 import org.opensearch.client.opensearch.integTest.AbstractAggregationRequestIT;
@@ -15,8 +16,6 @@
 import org.opensearch.client.transport.rest_client.RestClientTransport;
 import org.opensearch.common.settings.Settings;
 
-import java.io.IOException;
-
 public class AggregationRequestIT extends AbstractAggregationRequestIT {
     @Override
     public OpenSearchTransport buildTransport(Settings settings, HttpHost[] hosts) throws IOException {
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/CatIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/CatIT.java
index a00207e882..6ff3f27a3e 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/CatIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/CatIT.java
@@ -8,6 +8,7 @@
 
 package org.opensearch.client.opensearch.integTest.restclient;
 
+import java.io.IOException;
 import org.apache.http.HttpHost;
 import org.opensearch.client.json.jackson.JacksonJsonpMapper;
 import org.opensearch.client.opensearch.integTest.AbstractCatClientIT;
@@ -15,8 +16,6 @@
 import org.opensearch.client.transport.rest_client.RestClientTransport;
 import org.opensearch.common.settings.Settings;
 
-import java.io.IOException;
-
 public class CatIT extends AbstractCatClientIT {
     @Override
     public OpenSearchTransport buildTransport(Settings settings, HttpHost[] hosts) throws IOException {
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/ClusterClientIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/ClusterClientIT.java
index 188eb616f5..8d70e3875a 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/ClusterClientIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/ClusterClientIT.java
@@ -9,7 +9,6 @@
 package org.opensearch.client.opensearch.integTest.restclient;
 
 import java.io.IOException;
-
 import org.apache.http.HttpHost;
 import org.opensearch.client.json.jackson.JacksonJsonpMapper;
 import org.opensearch.client.opensearch.integTest.AbstractClusterClientIT;
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/CrudIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/CrudIT.java
index 6831f1d95d..f9a9076a9c 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/CrudIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/CrudIT.java
@@ -9,7 +9,6 @@
 package org.opensearch.client.opensearch.integTest.restclient;
 
 import java.io.IOException;
-
 import org.apache.http.HttpHost;
 import org.opensearch.client.json.jackson.JacksonJsonpMapper;
 import org.opensearch.client.opensearch.integTest.AbstractCrudIT;
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/HighlightIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/HighlightIT.java
index 0db9f5a545..bed40d80e1 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/HighlightIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/HighlightIT.java
@@ -8,6 +8,7 @@
 
 package org.opensearch.client.opensearch.integTest.restclient;
 
+import java.io.IOException;
 import org.apache.http.HttpHost;
 import org.opensearch.client.json.jackson.JacksonJsonpMapper;
 import org.opensearch.client.opensearch.integTest.AbstractHighlightIT;
@@ -15,8 +16,6 @@
 import org.opensearch.client.transport.rest_client.RestClientTransport;
 import org.opensearch.common.settings.Settings;
 
-import java.io.IOException;
-
 public class HighlightIT extends AbstractHighlightIT {
     @Override
     public OpenSearchTransport buildTransport(Settings settings, HttpHost[] hosts) throws IOException {
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/IndicesClientIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/IndicesClientIT.java
index 190127ea9b..64b17dfd43 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/IndicesClientIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/IndicesClientIT.java
@@ -9,7 +9,6 @@
 package org.opensearch.client.opensearch.integTest.restclient;
 
 import java.io.IOException;
-
 import org.apache.http.HttpHost;
 import org.opensearch.client.json.jackson.JacksonJsonpMapper;
 import org.opensearch.client.opensearch.integTest.AbstractIndicesClientIT;
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/MultiSearchRequestIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/MultiSearchRequestIT.java
index 606cf8be2d..3eb7bbc0d6 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/MultiSearchRequestIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/MultiSearchRequestIT.java
@@ -8,6 +8,7 @@
 
 package org.opensearch.client.opensearch.integTest.restclient;
 
+import java.io.IOException;
 import org.apache.http.HttpHost;
 import org.opensearch.client.json.jackson.JacksonJsonpMapper;
 import org.opensearch.client.opensearch.integTest.AbstractMultiSearchRequestIT;
@@ -15,11 +16,9 @@
 import org.opensearch.client.transport.rest_client.RestClientTransport;
 import org.opensearch.common.settings.Settings;
 
-import java.io.IOException;
-
 public class MultiSearchRequestIT extends AbstractMultiSearchRequestIT {
-	@Override
-	public OpenSearchTransport buildTransport(Settings settings, HttpHost[] hosts) throws IOException {
-		return new RestClientTransport(buildClient(settings, hosts), new JacksonJsonpMapper());
-	}
+    @Override
+    public OpenSearchTransport buildTransport(Settings settings, HttpHost[] hosts) throws IOException {
+        return new RestClientTransport(buildClient(settings, hosts), new JacksonJsonpMapper());
+    }
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/NodesIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/NodesIT.java
index 47f07306b8..41a5e2b2df 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/NodesIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/NodesIT.java
@@ -9,7 +9,6 @@
 package org.opensearch.client.opensearch.integTest.restclient;
 
 import java.io.IOException;
-
 import org.apache.http.HttpHost;
 import org.opensearch.client.json.jackson.JacksonJsonpMapper;
 import org.opensearch.client.opensearch.integTest.AbstractNodesIT;
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/PingAndInfoIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/PingAndInfoIT.java
index e5ac93649e..07a258f654 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/PingAndInfoIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/PingAndInfoIT.java
@@ -9,7 +9,6 @@
 package org.opensearch.client.opensearch.integTest.restclient;
 
 import java.io.IOException;
-
 import org.apache.http.HttpHost;
 import org.opensearch.client.json.jackson.JacksonJsonpMapper;
 import org.opensearch.client.opensearch.integTest.AbstractPingAndInfoIT;
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/RequestIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/RequestIT.java
index 7cceb9e39a..7be389daba 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/RequestIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/RequestIT.java
@@ -8,9 +8,11 @@
 
 package org.opensearch.client.opensearch.integTest.restclient;
 
+import static org.hamcrest.CoreMatchers.equalTo;
+
 import java.io.IOException;
 import java.util.Optional;
-
+import javax.net.ssl.SSLContext;
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
@@ -33,10 +35,6 @@
 import org.opensearch.client.transport.rest_client.RestClientTransport;
 import org.opensearch.common.settings.Settings;
 
-import javax.net.ssl.SSLContext;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-
 public class RequestIT extends AbstractRequestIT {
     @Override
     public OpenSearchTransport buildTransport(Settings settings, HttpHost[] hosts) throws IOException {
@@ -49,32 +47,29 @@ public void testUnauthorized() throws Exception {
         Assume.assumeThat(isHttps(), equalTo(true));
 
         final String userName = Optional.ofNullable(System.getProperty("user")).orElse("admin");
-        final String wrongPassword = Optional.ofNullable(System.getProperty("password")).orElse("admin")
-                + "wrong";
+        final String wrongPassword = Optional.ofNullable(System.getProperty("password")).orElse("admin") + "wrong";
 
         final BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-        credentialsProvider.setCredentials(new AuthScope(getClusterHosts().get(0)),
-                new UsernamePasswordCredentials(userName, wrongPassword));
+        credentialsProvider.setCredentials(
+            new AuthScope(getClusterHosts().get(0)),
+            new UsernamePasswordCredentials(userName, wrongPassword)
+        );
 
-        final RestClient restClient = RestClient
-                .builder(getClusterHosts().toArray(new HttpHost[0]))
-                .setHttpClientConfigCallback(httpClientBuilder -> {
-                    try {
-                        final TrustStrategy trustStrategy = new TrustAllStrategy();
-                        final SSLContext sslContext = SSLContexts.custom().loadTrustMaterial(
-                                null, trustStrategy).build();
-                        return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider)
-                                .setSSLContext(sslContext);
-                    } catch (Exception e) {
-                        throw new RuntimeException(e);
-                    }
-                })
-                .build();
+        final RestClient restClient = RestClient.builder(getClusterHosts().toArray(new HttpHost[0]))
+            .setHttpClientConfigCallback(httpClientBuilder -> {
+                try {
+                    final TrustStrategy trustStrategy = new TrustAllStrategy();
+                    final SSLContext sslContext = SSLContexts.custom().loadTrustMaterial(null, trustStrategy).build();
+                    return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider).setSSLContext(sslContext);
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            })
+            .build();
 
         final RestClientTransport transport = new RestClientTransport(restClient, new JacksonJsonpMapper());
         final OpenSearchClient client = new OpenSearchClient(transport);
-        final TransportException transportException = assertThrows(TransportException.class,
-                () -> client.cluster().getSettings());
+        final TransportException transportException = assertThrows(TransportException.class, () -> client.cluster().getSettings());
         assertEquals("Unauthorized access", transportException.getMessage());
         restClient.close();
     }
@@ -83,15 +78,15 @@ public void testUnauthorized() throws Exception {
     public void testForbidden() throws Exception {
         final OpenSearchClient openSearchClient = javaClient();
         final String testIndex = "test-index";
-        final CreateIndexRequest createIndexRequest = new CreateIndexRequest.Builder()
-                .index(testIndex)
-                .settings(new IndexSettings.Builder()
-                        .blocksRead(true).build())
-                .build();
+        final CreateIndexRequest createIndexRequest = new CreateIndexRequest.Builder().index(testIndex)
+            .settings(new IndexSettings.Builder().blocksRead(true).build())
+            .build();
         openSearchClient.indices().create(createIndexRequest);
         final SearchRequest searchRequest = new SearchRequest.Builder().index(testIndex).build();
-        final TransportException transportException = assertThrows(TransportException.class,
-                () -> openSearchClient.search(searchRequest, JsonData.class));
+        final TransportException transportException = assertThrows(
+            TransportException.class,
+            () -> openSearchClient.search(searchRequest, JsonData.class)
+        );
         assertEquals("Forbidden access", transportException.getMessage());
     }
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/SearchTemplateRequestIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/SearchTemplateRequestIT.java
index 663c15cf4d..748e52b7d7 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/SearchTemplateRequestIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/restclient/SearchTemplateRequestIT.java
@@ -8,6 +8,7 @@
 
 package org.opensearch.client.opensearch.integTest.restclient;
 
+import java.io.IOException;
 import org.apache.http.HttpHost;
 import org.opensearch.client.json.jackson.JacksonJsonpMapper;
 import org.opensearch.client.opensearch.integTest.AbstractSearchTemplateRequestIT;
@@ -15,8 +16,6 @@
 import org.opensearch.client.transport.rest_client.RestClientTransport;
 import org.opensearch.common.settings.Settings;
 
-import java.io.IOException;
-
 public class SearchTemplateRequestIT extends AbstractSearchTemplateRequestIT {
     @Override
     public OpenSearchTransport buildTransport(Settings settings, HttpHost[] hosts) throws IOException {
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/model/BehaviorsTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/model/BehaviorsTest.java
index 300eeef743..02f6058af3 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/model/BehaviorsTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/model/BehaviorsTest.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.model;
 
+import org.junit.Test;
+import org.opensearch.client.json.JsonData;
 import org.opensearch.client.opensearch._types.ErrorCause;
 import org.opensearch.client.opensearch._types.FieldValue;
 import org.opensearch.client.opensearch._types.GeoLocation;
@@ -42,20 +44,14 @@
 import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.opensearch._types.query_dsl.ShapeQuery;
 import org.opensearch.client.opensearch._types.query_dsl.TermQuery;
-import org.opensearch.client.json.JsonData;
 import org.opensearch.client.opensearch._types.query_dsl.WrapperQuery;
 import org.opensearch.client.util.MapBuilder;
-import org.junit.Test;
 
 public class BehaviorsTest extends ModelTestCase {
 
     @Test
     public void testSingleKeyDictionary() {
-        TermQuery q = new TermQuery.Builder()
-            .queryName("query-name")
-            .field("field-name")
-            .value(FieldValue.of("some-value"))
-            .build();
+        TermQuery q = new TermQuery.Builder().queryName("query-name").field("field-name").value(FieldValue.of("some-value")).build();
 
         q = checkJsonRoundtrip(q, "{\"field-name\":{\"_name\":\"query-name\",\"value\":\"some-value\"}}");
 
@@ -66,18 +62,13 @@ public void testSingleKeyDictionary() {
 
     @Test
     public void testAdditionalPropertyOnClass() {
-        ShapeQuery q = new ShapeQuery.Builder()
-            .queryName("query-name")
+        ShapeQuery q = new ShapeQuery.Builder().queryName("query-name")
             .field("field-name")
-            .shape(_0 -> _0
-                .relation(GeoShapeRelation.Disjoint)
-            )
+            .shape(_0 -> _0.relation(GeoShapeRelation.Disjoint))
             .ignoreUnmapped(true)
             .build();
 
-        q = checkJsonRoundtrip(q,
-            "{\"field-name\":{\"relation\":\"disjoint\"},\"_name\":\"query-name\",\"ignore_unmapped\":true}"
-        );
+        q = checkJsonRoundtrip(q, "{\"field-name\":{\"relation\":\"disjoint\"},\"_name\":\"query-name\",\"ignore_unmapped\":true}");
 
         assertEquals("query-name", q.queryName());
         assertTrue(q.ignoreUnmapped());
@@ -87,13 +78,9 @@ public void testAdditionalPropertyOnClass() {
 
     @Test
     public void testWrapperQuery() {
-        WrapperQuery q = new WrapperQuery.Builder()
-            .query("encoded_query")
-            .build();
+        WrapperQuery q = new WrapperQuery.Builder().query("encoded_query").build();
 
-        q = checkJsonRoundtrip(q,
-            "{\"query\":\"encoded_query\"}"
-        );
+        q = checkJsonRoundtrip(q, "{\"query\":\"encoded_query\"}");
 
         assertEquals("encoded_query", q.query());
     }
@@ -102,9 +89,7 @@ public void testWrapperQuery() {
     public void testAdditionalPropertyOnContainer() {
         // Regular variant
         {
-            SortOptions so = SortOptions.of(_0 -> _0
-                .doc(_1 -> _1.order(SortOrder.Asc))
-            );
+            SortOptions so = SortOptions.of(_0 -> _0.doc(_1 -> _1.order(SortOrder.Asc)));
 
             so = checkJsonRoundtrip(so, "{\"_doc\":{\"order\":\"asc\"}}");
             assertEquals(SortOptions.Kind.Doc, so._kind());
@@ -126,8 +111,7 @@ public void testAdditionalPropertyOnContainer() {
         }
 
         {
-            SortOptions so = SortOptions.of(_0 -> _0
-                .score(_1 -> _1.order(SortOrder.Asc)));
+            SortOptions so = SortOptions.of(_0 -> _0.score(_1 -> _1.order(SortOrder.Asc)));
 
             so = checkJsonRoundtrip(so, "{\"_score\":{\"order\":\"asc\"}}");
             assertEquals(SortOptions.Kind.Score, so._kind());
@@ -135,9 +119,7 @@ public void testAdditionalPropertyOnContainer() {
         }
 
         {
-            SortOptions so = SortOptions.of(_0 -> _0
-                .script(_1 -> _1.script(_2 -> _2.inline(_3 -> _3.source("blah"))))
-            );
+            SortOptions so = SortOptions.of(_0 -> _0.script(_1 -> _1.script(_2 -> _2.inline(_3 -> _3.source("blah")))));
             so = checkJsonRoundtrip(so, "{\"_script\":{\"script\":{\"source\":\"blah\"}}}");
             assertEquals("blah", so.script().script().inline().source());
 
@@ -145,9 +127,7 @@ public void testAdditionalPropertyOnContainer() {
 
         // Additional property variant
         {
-            SortOptions so = SortOptions.of(_0 -> _0
-                .field(_1 -> _1.field("foo").order(SortOrder.Desc))
-            );
+            SortOptions so = SortOptions.of(_0 -> _0.field(_1 -> _1.field("foo").order(SortOrder.Desc)));
 
             so = checkJsonRoundtrip(so, "{\"foo\":{\"order\":\"desc\"}}");
             assertEquals(SortOptions.Kind.Field, so._kind());
@@ -156,23 +136,15 @@ public void testAdditionalPropertyOnContainer() {
         }
     }
 
-
     @Test
     public void testAdditionalProperties() {
         // Check that additional property map is initialized even if not set explicitly
-        ErrorCause err = new ErrorCause.Builder()
-            .reason("Foo")
-            .type("Bar")
-            .build();
+        ErrorCause err = new ErrorCause.Builder().reason("Foo").type("Bar").build();
         assertEquals(0, err.metadata().size());
 
-        err = new ErrorCause.Builder()
-            .reason("Some failure")
+        err = new ErrorCause.Builder().reason("Some failure")
             .type("Some type")
-            .metadata(MapBuilder.of(
-                "index", JsonData.of("test"),
-                "retries", JsonData.of(1)
-            ))
+            .metadata(MapBuilder.of("index", JsonData.of("test"), "retries", JsonData.of(1)))
             .build();
 
         err = checkJsonRoundtrip(err, "{\"index\":\"test\",\"retries\":1,\"type\":\"Some type\",\"reason\":\"Some failure\"}");
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/model/BuiltinTypesTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/model/BuiltinTypesTest.java
index c501ff12d6..49a412beff 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/model/BuiltinTypesTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/model/BuiltinTypesTest.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.client.opensearch.model;
 
+import java.util.ArrayList;
+import java.util.List;
 import org.junit.Test;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.opensearch._types.FieldValue;
@@ -43,9 +45,6 @@
 import org.opensearch.client.opensearch.core.SearchRequest;
 import org.opensearch.client.opensearch.indices.IndexSettings;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class BuiltinTypesTest extends ModelTestCase {
 
     @Test
@@ -68,10 +67,7 @@ public void testLenientArray() {
     @Test
     public void testSpanGapQuery() {
         // Hand-written class
-        SpanGapQuery q = SpanGapQuery.of(b -> b
-            .field("a-field")
-            .spanWidth(12)
-        );
+        SpanGapQuery q = SpanGapQuery.of(b -> b.field("a-field").spanWidth(12));
 
         q = checkJsonRoundtrip(q, "{\"a-field\":12}");
 
@@ -87,39 +83,43 @@ public void testSortOptions() {
         SortOptions sort;
 
         // Arbitrary field
-        sort = fromJson(
-            "{ \"post_date\" : {\"order\" : \"asc\", \"format\": \"strict_date_optional_time_nanos\"}}",
-            SortOptions.class);
+        sort = fromJson("{ \"post_date\" : {\"order\" : \"asc\", \"format\": \"strict_date_optional_time_nanos\"}}", SortOptions.class);
 
         assertEquals("post_date", sort.field().field());
         assertEquals(SortOrder.Asc, sort.field().order());
 
-        sort = fromJson("{\n" +
-            "          \"offer.price\" : {\n" +
-            "             \"mode\" :  \"avg\",\n" +
-            "             \"order\" : \"asc\",\n" +
-            "             \"nested\": {\n" +
-            "                \"path\": \"offer\",\n" +
-            "                \"filter\": {\n" +
-            "                   \"term\" : { \"offer.color\" : \"blue\" }\n" +
-            "                }\n" +
-            "             }\n" +
-            "          }\n" +
-            "       }", SortOptions.class);
+        sort = fromJson(
+            "{\n"
+                + "          \"offer.price\" : {\n"
+                + "             \"mode\" :  \"avg\",\n"
+                + "             \"order\" : \"asc\",\n"
+                + "             \"nested\": {\n"
+                + "                \"path\": \"offer\",\n"
+                + "                \"filter\": {\n"
+                + "                   \"term\" : { \"offer.color\" : \"blue\" }\n"
+                + "                }\n"
+                + "             }\n"
+                + "          }\n"
+                + "       }",
+            SortOptions.class
+        );
 
         assertEquals("blue", sort.field().nested().filter().term().value().stringValue());
 
         // Geo distance
-        sort = fromJson("{\n" +
-            "      \"_geo_distance\" : {\n" +
-            "        \"pin.location\" : {\n" +
-            "          \"lat\" : 40,\n" +
-            "          \"lon\" : -70\n" +
-            "        },\n" +
-            "        \"order\" : \"asc\",\n" +
-            "        \"unit\" : \"km\"\n" +
-            "      }\n" +
-            "    }", SortOptions.class);
+        sort = fromJson(
+            "{\n"
+                + "      \"_geo_distance\" : {\n"
+                + "        \"pin.location\" : {\n"
+                + "          \"lat\" : 40,\n"
+                + "          \"lon\" : -70\n"
+                + "        },\n"
+                + "        \"order\" : \"asc\",\n"
+                + "        \"unit\" : \"km\"\n"
+                + "      }\n"
+                + "    }",
+            SortOptions.class
+        );
 
         assertEquals(40, sort.geoDistance().location().get(0).latlon().lat(), 0.1);
 
@@ -181,12 +181,13 @@ public void testNullableDouble() {
         StatsAggregate stats;
 
         // Regular values
-        stats = StatsAggregate.statsAggregateOf(b -> b // Parent classes can't have an overloaded "of" method
-            .count(10)
-            .min(1.0)
-            .avg(1.5)
-            .max(2.0)
-            .sum(5.0)
+        stats = StatsAggregate.statsAggregateOf(
+            b -> b // Parent classes can't have an overloaded "of" method
+                .count(10)
+                .min(1.0)
+                .avg(1.5)
+                .max(2.0)
+                .sum(5.0)
         );
 
         stats = checkJsonRoundtrip(stats, "{\"count\":10,\"min\":1.0,\"max\":2.0,\"avg\":1.5,\"sum\":5.0}");
@@ -212,13 +213,7 @@ public void testNullableDouble() {
 
     @Test
     public void testNullableInt() {
-        StringStatsAggregate stats = StringStatsAggregate.of(b -> b
-            .count(1)
-            .minLength(2)
-            .avgLength(3)
-            .maxLength(4)
-            .entropy(0)
-        );
+        StringStatsAggregate stats = StringStatsAggregate.of(b -> b.count(1).minLength(2).avgLength(3).maxLength(4).entropy(0));
 
         stats = checkJsonRoundtrip(stats, "{\"count\":1,\"min_length\":2,\"max_length\":4,\"avg_length\":3.0,\"entropy\":0.0}");
         assertEquals(2, stats.minLength());
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/model/ClassStructureTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/model/ClassStructureTest.java
index 2d456ae0b6..db0842ce40 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/model/ClassStructureTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/model/ClassStructureTest.java
@@ -32,6 +32,16 @@
 
 package org.opensearch.client.opensearch.model;
 
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.junit.Test;
+import org.opensearch.client.json.JsonData;
 import org.opensearch.client.opensearch._types.ErrorCause;
 import org.opensearch.client.opensearch._types.aggregations.Aggregate;
 import org.opensearch.client.opensearch._types.aggregations.Aggregation;
@@ -47,20 +57,9 @@
 import org.opensearch.client.opensearch.core.search.HitsMetadata;
 import org.opensearch.client.opensearch.core.search.TotalHits;
 import org.opensearch.client.opensearch.core.search.TotalHitsRelation;
-import org.opensearch.client.json.JsonData;
-import org.opensearch.client.util.MissingRequiredPropertyException;
 import org.opensearch.client.util.ApiTypeHelper;
+import org.opensearch.client.util.MissingRequiredPropertyException;
 import org.opensearch.client.util.ObjectBuilder;
-import org.junit.Test;
-
-import javax.annotation.Nullable;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * Tests that verify common features of generated classes.
@@ -82,8 +81,7 @@ public void testPrimitiveTypes() throws Exception {
         // Builder setter for optional primitive should use the boxed type and be @Nullable
         {
             Method searchBuilderSize = SearchRequest.Builder.class.getMethod("size", Integer.class);
-            assertTrue(Arrays.stream(searchBuilderSize.getParameterAnnotations()[0])
-                .anyMatch(a -> a.annotationType() == Nullable.class));
+            assertTrue(Arrays.stream(searchBuilderSize.getParameterAnnotations()[0]).anyMatch(a -> a.annotationType() == Nullable.class));
         }
 
         // Required primitive should use the primitive type and not be @Nullable
@@ -96,8 +94,9 @@ public void testPrimitiveTypes() throws Exception {
         // Builder setter for required primitive should use the primitive type and not be @Nullable
         {
             Method totalHitsBuilderValue = TotalHits.Builder.class.getMethod("value", long.class);
-            assertFalse(Arrays.stream(totalHitsBuilderValue.getParameterAnnotations()[0])
-                .anyMatch(a -> a.annotationType() == Nullable.class));
+            assertFalse(
+                Arrays.stream(totalHitsBuilderValue.getParameterAnnotations()[0]).anyMatch(a -> a.annotationType() == Nullable.class)
+            );
         }
 
         // Not setting a required primitive should throw an exception
@@ -113,10 +112,7 @@ public void testPrimitiveTypes() throws Exception {
     public void testDataClassInheritedFieldAssignment() {
         // 1 ancestor
         {
-            CardinalityAggregate card = CardinalityAggregate.of(b -> b
-                .meta(Collections.singletonMap("foo", JsonData.of("bar")))
-                .value(1)
-            );
+            CardinalityAggregate card = CardinalityAggregate.of(b -> b.meta(Collections.singletonMap("foo", JsonData.of("bar"))).value(1));
 
             assertAncestorCount(1, card);
             assertEquals("bar", card.meta().get("foo").to(String.class));
@@ -125,9 +121,9 @@ public void testDataClassInheritedFieldAssignment() {
 
         // 3 ancestors
         {
-            DateRangeAggregate date = DateRangeAggregate.of(_1 -> _1
-                .meta(Collections.singletonMap("foo", JsonData.of("bar")))
-                .buckets(Buckets.of(b -> b.array(Collections.singletonList(RangeBucket.of(_2 -> _2.docCount(1))))))
+            DateRangeAggregate date = DateRangeAggregate.of(
+                _1 -> _1.meta(Collections.singletonMap("foo", JsonData.of("bar")))
+                    .buckets(Buckets.of(b -> b.array(Collections.singletonList(RangeBucket.of(_2 -> _2.docCount(1))))))
             );
 
             assertAncestorCount(3, date);
@@ -141,11 +137,7 @@ public void testDataClassInheritedFieldAssignment() {
      */
     @Test
     public void testUnionInheritedFieldAssignment() {
-        IntervalsQuery iq = IntervalsQuery.of(_1 -> _1
-            .boost(2.0f)
-            .field("foo")
-            .allOf(b -> b.intervals(Collections.emptyList()))
-        );
+        IntervalsQuery iq = IntervalsQuery.of(_1 -> _1.boost(2.0f).field("foo").allOf(b -> b.intervals(Collections.emptyList())));
         assertAncestorCount(1, iq);
         assertEquals(2.0f, iq.boost(), 0.01);
         assertEquals("{\"foo\":{\"boost\":2.0,\"all_of\":{\"intervals\":[]}}}", toJson(iq));
@@ -155,8 +147,10 @@ public void testUnionInheritedFieldAssignment() {
     public void testUndefinedCollections() {
         // Not setting a required list should throw an exception
         {
-            MissingRequiredPropertyException ex = assertThrows(MissingRequiredPropertyException.class,
-                () -> HitsMetadata.of(_1 -> _1.total(_2 -> _2.value(0).relation(TotalHitsRelation.Eq))));
+            MissingRequiredPropertyException ex = assertThrows(
+                MissingRequiredPropertyException.class,
+                () -> HitsMetadata.of(_1 -> _1.total(_2 -> _2.value(0).relation(TotalHitsRelation.Eq)))
+            );
             assertTrue(ex.getMessage().contains(".hits"));
         }
 
@@ -189,10 +183,7 @@ public void testUndefinedCollections() {
 
         // Setting an empty map defines it
         {
-            CardinalityAggregate card = CardinalityAggregate.of(b -> b
-                .value(1)
-                .meta(Collections.emptyMap())
-            );
+            CardinalityAggregate card = CardinalityAggregate.of(b -> b.value(1).meta(Collections.emptyMap()));
             assertNotNull(card.meta());
             assertEquals(0, card.meta().size());
             assertTrue(ApiTypeHelper.isDefined(card.meta()));
@@ -206,47 +197,35 @@ public void testListSetters() {
 
         {
             // Appending doesn't modify the original collection
-            SearchRequest search = SearchRequest.of(b -> b
-                .storedFields(fields)
-                .storedFields("c")
-                .storedFields("d", "e", "f")
-            );
+            SearchRequest search = SearchRequest.of(b -> b.storedFields(fields).storedFields("c").storedFields("d", "e", "f"));
             assertEquals(Arrays.asList("a", "b"), fields);
             assertEquals(Arrays.asList("a", "b", "c", "d", "e", "f"), search.storedFields());
         }
 
         {
             // Appending doesn't modify the original collection (appending the same list twice)
-            SearchRequest search = SearchRequest.of(b -> b
-                .storedFields(fields)
-                .storedFields(fields)
-            );
+            SearchRequest search = SearchRequest.of(b -> b.storedFields(fields).storedFields(fields));
             assertEquals(Arrays.asList("a", "b"), fields);
             assertEquals(Arrays.asList("a", "b", "a", "b"), search.storedFields());
         }
 
-
         {
             // List cannot be null
             List<String> nullFields = null;
-            assertThrows(NullPointerException.class, () -> {
-                SearchRequest.of(b -> b
-                    .storedFields(nullFields)
-                );
-            });
+            assertThrows(NullPointerException.class, () -> { SearchRequest.of(b -> b.storedFields(nullFields)); });
         }
 
         {
             // Combine value and builder
             FieldAndFormat fieldA = FieldAndFormat.of(f -> f.field("a"));
-            SearchRequest search = SearchRequest.of(b -> b
-                .docvalueFields(fieldA)
-                .docvalueFields(f -> f.field("b"))
-                .docvalueFields(f -> f.field("c"))
+            SearchRequest search = SearchRequest.of(
+                b -> b.docvalueFields(fieldA).docvalueFields(f -> f.field("b")).docvalueFields(f -> f.field("c"))
             );
 
-            assertEquals(Arrays.asList("a", "b", "c"), search.docvalueFields().stream()
-                .map(FieldAndFormat::field).collect(Collectors.toList()));
+            assertEquals(
+                Arrays.asList("a", "b", "c"),
+                search.docvalueFields().stream().map(FieldAndFormat::field).collect(Collectors.toList())
+            );
         }
     }
 
@@ -262,10 +241,10 @@ public void testMapSetters() {
 
         {
             // Appending doesn't modify the original collection
-            SearchRequest search = SearchRequest.of(b -> b
-                .aggregations(aggs)
-                .aggregations("aggC", countC._toAggregation())
-                .aggregations("aggD", a -> a.valueCount(c -> c.field("d")))
+            SearchRequest search = SearchRequest.of(
+                b -> b.aggregations(aggs)
+                    .aggregations("aggC", countC._toAggregation())
+                    .aggregations("aggD", a -> a.valueCount(c -> c.field("d")))
             );
 
             // Original map wasn't modified
@@ -315,7 +294,7 @@ public void testRequiredProperty() {
 
         // Missing id property throws an exception
         MissingRequiredPropertyException ex = assertThrows(MissingRequiredPropertyException.class, () -> {
-                GetRequest r1 = GetRequest.of(b -> b.index("foo"));
+            GetRequest r1 = GetRequest.of(b -> b.index("foo"));
         });
         assertEquals("id", ex.getPropertyName());
 
@@ -326,15 +305,13 @@ public void testRequiredProperty() {
         }
 
         // Checks are enabled again after the try block
-        ex = assertThrows(MissingRequiredPropertyException.class, () -> {
-            GetRequest r1 = GetRequest.of(b -> b.index("foo"));
-        });
+        ex = assertThrows(MissingRequiredPropertyException.class, () -> { GetRequest r1 = GetRequest.of(b -> b.index("foo")); });
         assertEquals("id", ex.getPropertyName());
     }
 
     private void assertAncestorCount(int count, Object obj) {
         Class<?> clazz = obj.getClass();
-        while(count-- >= 0) {
+        while (count-- >= 0) {
             clazz = clazz.getSuperclass();
         }
         assertEquals(Object.class, clazz);
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/model/EndpointTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/model/EndpointTest.java
index 6683f23787..1cae67f91e 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/model/EndpointTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/model/EndpointTest.java
@@ -32,10 +32,10 @@
 
 package org.opensearch.client.opensearch.model;
 
-import org.opensearch.client.opensearch._types.ExpandWildcard;
-import org.opensearch.client.opensearch.indices.RefreshRequest;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opensearch.client.opensearch._types.ExpandWildcard;
+import org.opensearch.client.opensearch.indices.RefreshRequest;
 
 public class EndpointTest extends Assert {
 
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/model/EnumTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/model/EnumTest.java
index 7faaee7105..f16f0795a8 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/model/EnumTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/model/EnumTest.java
@@ -32,13 +32,12 @@
 
 package org.opensearch.client.opensearch.model;
 
+import java.util.Arrays;
 import org.junit.Test;
 import org.opensearch.client.opensearch._types.Bytes;
 import org.opensearch.client.opensearch._types.mapping.DynamicMapping;
 import org.opensearch.client.opensearch._types.mapping.GeoOrientation;
 
-import java.util.Arrays;
-
 public class EnumTest extends ModelTestCase {
 
     @Test
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/model/ModelTestCase.java b/java-client/src/test/java/org/opensearch/client/opensearch/model/ModelTestCase.java
index 8408d68f6f..51babb7001 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/model/ModelTestCase.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/model/ModelTestCase.java
@@ -32,19 +32,18 @@
 
 package org.opensearch.client.opensearch.model;
 
-import org.opensearch.client.json.JsonpDeserializer;
-import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.jackson.JacksonJsonpMapper;
-import org.opensearch.client.json.jsonb.JsonbJsonpMapper;
 import jakarta.json.spi.JsonProvider;
 import jakarta.json.stream.JsonGenerator;
 import jakarta.json.stream.JsonParser;
-import org.junit.Assert;
-
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.lang.reflect.Method;
 import java.util.Random;
+import org.junit.Assert;
+import org.opensearch.client.json.JsonpDeserializer;
+import org.opensearch.client.json.JsonpMapper;
+import org.opensearch.client.json.jackson.JacksonJsonpMapper;
+import org.opensearch.client.json.jsonb.JsonbJsonpMapper;
 
 /**
  * Base class for tests that encode/decode json
@@ -110,7 +109,7 @@ protected <T> T fromJson(String json, Class<T> clazz) {
     @SuppressWarnings("unchecked")
     protected <T> T checkJsonRoundtrip(T value, String expectedJson) {
         assertEquals(expectedJson, toJson(value));
-        return fromJson(expectedJson, (Class<T>)value.getClass());
+        return fromJson(expectedJson, (Class<T>) value.getClass());
     }
 
     protected <T> T fromJson(String json, JsonpDeserializer<T> deserializer) {
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/model/RequestEncodingTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/model/RequestEncodingTest.java
index 05219e16c5..61a57e1091 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/model/RequestEncodingTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/model/RequestEncodingTest.java
@@ -32,9 +32,9 @@
 
 package org.opensearch.client.opensearch.model;
 
-import org.opensearch.client.opensearch.core.SearchRequest;
-import org.opensearch.client.json.jsonb.JsonbJsonpMapper;
 import org.junit.Test;
+import org.opensearch.client.json.jsonb.JsonbJsonpMapper;
+import org.opensearch.client.opensearch.core.SearchRequest;
 
 public class RequestEncodingTest extends ModelTestCase {
 
@@ -44,16 +44,9 @@ public void testParametersNotInJson() {
         // This checks that path parameters ("q") are not serialized as json
         // and variant containers ser/deser
 
-        SearchRequest request = new SearchRequest.Builder()
-            .q("blah")
-            .query(b1 -> b1
-                .type(b2 -> b2
-                    .value("foo"))
-            )
-            .aggregations(
-                "myagg", b2 -> b2
-                    .avg(b3 -> b3.field("foo"))
-            )
+        SearchRequest request = new SearchRequest.Builder().q("blah")
+            .query(b1 -> b1.type(b2 -> b2.value("foo")))
+            .aggregations("myagg", b2 -> b2.avg(b3 -> b3.field("foo")))
             .build();
 
         JsonbJsonpMapper mapper = new JsonbJsonpMapper();
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/model/SerializationTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/model/SerializationTest.java
index b61b15f723..ceb8641e0d 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/model/SerializationTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/model/SerializationTest.java
@@ -52,17 +52,13 @@ public class SerializationTest extends ModelTestCase {
     @Test
     public void loadAllDeserializers() throws Exception {
 
-        ScanResult scan = new ClassGraph()
-            .acceptPackages("org.opensearch.client")
-            .enableAnnotationInfo()
-            .enableFieldInfo()
-            .scan();
+        ScanResult scan = new ClassGraph().acceptPackages("org.opensearch.client").enableAnnotationInfo().enableFieldInfo().scan();
 
         ClassInfoList withAnnotation = scan.getClassesWithAnnotation(JsonpDeserializable.class.getName());
 
         assertFalse("No JsonpDeserializable classes", withAnnotation.isEmpty());
 
-        for (ClassInfo info: withAnnotation) {
+        for (ClassInfo info : withAnnotation) {
             Class<?> clazz = Class.forName(info.getName());
             JsonpDeserializer<?> deserializer = JsonpMapperBase.findDeserializer(clazz);
             assertNotNull(deserializer);
@@ -75,24 +71,23 @@ public void loadAllDeserializers() throws Exception {
         ClassInfoList withDeserializer = scan.getAllClasses().filter((c) -> c.hasDeclaredField("_DESERIALIZER"));
         assertFalse("No classes with a _DESERIALIZER field", withDeserializer.isEmpty());
 
-// Disabled for now, empty response classes still need a deserializer object
-// e.g. ExistsIndexTemplateResponse, PingResponse, ExistsResponse, ExistsAliasResponse
-//
-//        Set<String> annotationNames = withAnnotation.stream().map(c -> c.getName()).collect(Collectors.toSet());
-//        Set<String> withFieldNames = withDeserializer.stream().map(c -> c.getName()).collect(Collectors.toSet());
-//
-//        withFieldNames.removeAll(annotationNames);
-//
-//        assertFalse("Some classes with the field but not the annotation: " + withFieldNames, !withFieldNames.isEmpty());
+        // Disabled for now, empty response classes still need a deserializer object
+        // e.g. ExistsIndexTemplateResponse, PingResponse, ExistsResponse, ExistsAliasResponse
+        //
+        // Set<String> annotationNames = withAnnotation.stream().map(c -> c.getName()).collect(Collectors.toSet());
+        // Set<String> withFieldNames = withDeserializer.stream().map(c -> c.getName()).collect(Collectors.toSet());
+        //
+        // withFieldNames.removeAll(annotationNames);
+        //
+        // assertFalse("Some classes with the field but not the annotation: " + withFieldNames, !withFieldNames.isEmpty());
 
     }
 
     @Test
     public void testArrayValueBody() {
 
-        NodesResponse nr = NodesResponse.of(_0 -> _0
-            .valueBody(_1 -> _1.bulkTotalOperations("1"))
-            .valueBody(_1 -> _1.bulkTotalOperations("2"))
+        NodesResponse nr = NodesResponse.of(
+            _0 -> _0.valueBody(_1 -> _1.bulkTotalOperations("1")).valueBody(_1 -> _1.bulkTotalOperations("2"))
         );
 
         checkJsonRoundtrip(nr, "[{\"bulk.total_operations\":\"1\"},{\"bulk.total_operations\":\"2\"}]");
@@ -105,15 +100,14 @@ public void testArrayValueBody() {
     @Test
     public void testGenericValueBody() {
 
-        GetSourceResponse<String> r = GetSourceResponse.of(_0 -> _0
-            .valueBody("The value")
-        );
+        GetSourceResponse<String> r = GetSourceResponse.of(_0 -> _0.valueBody("The value"));
 
         String json = toJson(r);
         assertEquals("\"The value\"", json);
 
-        JsonpDeserializer<GetSourceResponse<String>> deserializer =
-            GetSourceResponse.createGetSourceResponseDeserializer(JsonpDeserializer.stringDeserializer());
+        JsonpDeserializer<GetSourceResponse<String>> deserializer = GetSourceResponse.createGetSourceResponseDeserializer(
+            JsonpDeserializer.stringDeserializer()
+        );
 
         r = fromJson(json, deserializer);
 
@@ -132,8 +126,6 @@ public void testJsonpValuesToString() {
         assertEquals("null", JsonpUtils.toString(JsonValue.NULL));
         assertEquals("a,b,c", JsonpUtils.toString(Json.createArrayBuilder().add("a").add("b").add("c").build()));
 
-        assertThrows(IllegalArgumentException.class, () -> {
-            JsonpUtils.toString(Json.createObjectBuilder().build());
-        });
+        assertThrows(IllegalArgumentException.class, () -> { JsonpUtils.toString(Json.createObjectBuilder().build()); });
     }
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/model/TypedKeysTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/model/TypedKeysTest.java
index 968a8c9401..df69bc98a7 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/model/TypedKeysTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/model/TypedKeysTest.java
@@ -32,41 +32,33 @@
 
 package org.opensearch.client.opensearch.model;
 
+import java.util.Collections;
+import org.junit.Test;
+import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.opensearch._types.aggregations.Aggregate;
 import org.opensearch.client.opensearch._types.aggregations.AvgAggregate;
 import org.opensearch.client.opensearch._types.aggregations.StringTermsAggregate;
 import org.opensearch.client.opensearch._types.aggregations.StringTermsBucket;
 import org.opensearch.client.opensearch.core.SearchResponse;
 import org.opensearch.client.opensearch.core.search.TotalHitsRelation;
-import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.util.ListBuilder;
 import org.opensearch.client.util.MapBuilder;
-import org.junit.Test;
-
-import java.util.Collections;
 
 public class TypedKeysTest extends ModelTestCase {
 
     @Test
     public void testMapProperty() {
 
-        SearchResponse<Void> resp = new SearchResponse.Builder<Void>()
-            .aggregations(
-                "foo", _2 -> _2
-                    .avg(_3 -> _3.value(3.14))
-            )
+        SearchResponse<Void> resp = new SearchResponse.Builder<Void>().aggregations("foo", _2 -> _2.avg(_3 -> _3.value(3.14)))
             // Required properties on a SearchResponse
             .took(1)
             .shards(_1 -> _1.successful(1).failed(0).total(1))
-            .hits(_1 -> _1
-                .total(_2 -> _2.value(0).relation(TotalHitsRelation.Eq))
-                .hits(Collections.emptyList())
-            )
+            .hits(_1 -> _1.total(_2 -> _2.value(0).relation(TotalHitsRelation.Eq)).hits(Collections.emptyList()))
             .timedOut(false)
             .build();
 
-        String json = "{\"took\":1,\"timed_out\":false,\"_shards\":{\"failed\":0.0,\"successful\":1.0,\"total\":1.0}," +
-            "\"hits\":{\"total\":{\"relation\":\"eq\",\"value\":0},\"hits\":[]},\"aggregations\":{\"avg#foo\":{\"value\":3.14}}}";
+        String json = "{\"took\":1,\"timed_out\":false,\"_shards\":{\"failed\":0.0,\"successful\":1.0,\"total\":1.0},"
+            + "\"hits\":{\"total\":{\"relation\":\"eq\",\"value\":0},\"hits\":[]},\"aggregations\":{\"avg#foo\":{\"value\":3.14}}}";
 
         assertEquals(json, toJson(resp));
 
@@ -83,44 +75,32 @@ public void testAdditionalProperties() {
         Aggregate avg1 = AvgAggregate.of(_1 -> _1.value(1.0))._toAggregate();
         Aggregate avg2 = AvgAggregate.of(_1 -> _1.value(2.0))._toAggregate();
 
-        Aggregate aggregate = StringTermsAggregate.of(_0 -> _0
-            .sumOtherDocCount(1)
-            .buckets(b -> b.array(
-                ListBuilder.of(StringTermsBucket.Builder::new)
-                .add(_1 -> _1
-                    .key("key_1")
-                    .docCount(1)
-                    .aggregations(MapBuilder.of("bar", avg1))
+        Aggregate aggregate = StringTermsAggregate.of(
+            _0 -> _0.sumOtherDocCount(1)
+                .buckets(
+                    b -> b.array(
+                        ListBuilder.of(StringTermsBucket.Builder::new)
+                            .add(_1 -> _1.key("key_1").docCount(1).aggregations(MapBuilder.of("bar", avg1)))
+                            .add(_1 -> _1.key("key_2").docCount(2).aggregations(MapBuilder.of("bar", avg2)))
+                            .build()
+                    )
                 )
-                .add(_1 -> _1
-                    .key("key_2")
-                    .docCount(2)
-                    .aggregations(MapBuilder.of("bar", avg2))
-                )
-                .build()
-            ))
-        )
-        ._toAggregate();
+        )._toAggregate();
 
-        SearchResponse<Void> resp = new SearchResponse.Builder<Void>()
-            .aggregations("foo", aggregate)
+        SearchResponse<Void> resp = new SearchResponse.Builder<Void>().aggregations("foo", aggregate)
             // Required properties on a SearchResponse
             .took(1)
             .shards(_1 -> _1.successful(1).failed(0).total(1))
-            .hits(_1 -> _1
-                .total(_2 -> _2.value(0).relation(TotalHitsRelation.Eq))
-                .hits(Collections.emptyList())
-            )
+            .hits(_1 -> _1.total(_2 -> _2.value(0).relation(TotalHitsRelation.Eq)).hits(Collections.emptyList()))
             .timedOut(false)
             .build();
 
-
-        String json = "{\"took\":1,\"timed_out\":false,\"_shards\":{\"failed\":0.0,\"successful\":1.0,\"total\":1.0}," +
-            "\"hits\":{\"total\":{\"relation\":\"eq\",\"value\":0},\"hits\":[]}," +
-            "\"aggregations\":{\"sterms#foo\":{\"buckets\":[" +
-                "{\"avg#bar\":{\"value\":1.0},\"doc_count\":1,\"key\":\"key_1\"}," +
-                "{\"avg#bar\":{\"value\":2.0},\"doc_count\":2,\"key\":\"key_2\"}" +
-            "],\"sum_other_doc_count\":1}}}";
+        String json = "{\"took\":1,\"timed_out\":false,\"_shards\":{\"failed\":0.0,\"successful\":1.0,\"total\":1.0},"
+            + "\"hits\":{\"total\":{\"relation\":\"eq\",\"value\":0},\"hits\":[]},"
+            + "\"aggregations\":{\"sterms#foo\":{\"buckets\":["
+            + "{\"avg#bar\":{\"value\":1.0},\"doc_count\":1,\"key\":\"key_1\"},"
+            + "{\"avg#bar\":{\"value\":2.0},\"doc_count\":2,\"key\":\"key_2\"}"
+            + "],\"sum_other_doc_count\":1}}}";
 
         assertEquals(json, toJson(resp));
         resp = fromJson(json, SearchResponse.createSearchResponseDeserializer(JsonpDeserializer.voidDeserializer()));
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/model/UnionTests.java b/java-client/src/test/java/org/opensearch/client/opensearch/model/UnionTests.java
index ee884eb6dc..b05df6a544 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/model/UnionTests.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/model/UnionTests.java
@@ -32,10 +32,10 @@
 
 package org.opensearch.client.opensearch.model;
 
+import org.junit.Test;
 import org.opensearch.client.opensearch._types.Script;
 import org.opensearch.client.opensearch._types.query_dsl.SimpleQueryStringFlag;
 import org.opensearch.client.opensearch._types.query_dsl.SimpleQueryStringFlags;
-import org.junit.Test;
 
 public class UnionTests extends ModelTestCase {
 
@@ -43,21 +43,13 @@ public class UnionTests extends ModelTestCase {
     public void testScriptDeserializer() {
         // A union discriminated by its field names (source -> inline, id -> stored)
         {
-            Script s = Script.of(_1 -> _1
-                .inline(_2 -> _2
-                    .source("a script")
-                )
-            );
+            Script s = Script.of(_1 -> _1.inline(_2 -> _2.source("a script")));
             s = checkJsonRoundtrip(s, "{\"source\":\"a script\"}");
             assertEquals("a script", s.inline().source());
         }
 
         {
-            Script s = Script.of(_1 -> _1
-                .stored(_2 -> _2
-                    .id("script_id")
-                )
-            );
+            Script s = Script.of(_1 -> _1.stored(_2 -> _2.id("script_id")));
             s = checkJsonRoundtrip(s, "{\"id\":\"script_id\"}");
             assertEquals("script_id", s.stored().id());
         }
@@ -75,12 +67,11 @@ public void testSimpleQueryStringFlag() {
 
         SimpleQueryStringFlags f;
 
-        f= fromJson("\"OR\"", SimpleQueryStringFlags.class);
+        f = fromJson("\"OR\"", SimpleQueryStringFlags.class);
         assertEquals(SimpleQueryStringFlag.Or, f.single());
 
         f = fromJson("\"OR|AND\"", SimpleQueryStringFlags.class);
         assertEquals("OR|AND", f.multiple());
 
-
     }
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/model/VariantsTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/model/VariantsTest.java
index 2124f3e729..b511f4ec1d 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/model/VariantsTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/model/VariantsTest.java
@@ -32,14 +32,14 @@
 
 package org.opensearch.client.opensearch.model;
 
+import org.junit.Test;
+import org.opensearch.client.json.JsonData;
 import org.opensearch.client.opensearch._types.mapping.Property;
 import org.opensearch.client.opensearch._types.mapping.TypeMapping;
 import org.opensearch.client.opensearch._types.query_dsl.Query;
 import org.opensearch.client.opensearch._types.query_dsl.QueryBuilders;
 import org.opensearch.client.opensearch.core.SearchRequest;
 import org.opensearch.client.opensearch.indices.GetMappingResponse;
-import org.opensearch.client.json.JsonData;
-import org.junit.Test;
 
 public class VariantsTest extends ModelTestCase {
 
@@ -49,19 +49,11 @@ public void testNested() {
         // intervals is a single key dictionary
         // query has container properties
 
-        Query q = Query.of(_0 -> _0
-            .intervals(_1 -> _1
-                .queryName("my-query")
-                .field("a_field")
-                .anyOf(_2 -> _2
-                    .intervals(_3 -> _3
-                        .match(
-                            _5 -> _5
-                                .query("match-query")
-                                .analyzer("lowercase")
-                            )
-                        )
-                )
+        Query q = Query.of(
+            _0 -> _0.intervals(
+                _1 -> _1.queryName("my-query")
+                    .field("a_field")
+                    .anyOf(_2 -> _2.intervals(_3 -> _3.match(_5 -> _5.query("match-query").analyzer("lowercase"))))
             )
         );
 
@@ -73,8 +65,11 @@ public void testNested() {
 
         String json = toJson(q);
 
-        assertEquals("{\"intervals\":{\"a_field\":{\"_name\":\"my-query\"," +
-            "\"any_of\":{\"intervals\":[{\"match\":{\"analyzer\":\"lowercase\",\"query\":\"match-query\"}}]}}}}", json);
+        assertEquals(
+            "{\"intervals\":{\"a_field\":{\"_name\":\"my-query\","
+                + "\"any_of\":{\"intervals\":[{\"match\":{\"analyzer\":\"lowercase\",\"query\":\"match-query\"}}]}}}}",
+            json
+        );
 
         Query q2 = fromJson(json, Query.class);
         assertEquals(json, toJson(q2));
@@ -89,21 +84,10 @@ public void testNested() {
 
     @Test
     public void testInternalTag() {
-        String expected = "{\"type\":\"ip\",\"fields\":{\"a-field\":{\"type\":\"float\",\"coerce\":true}},\"boost\":1" +
-            ".0,\"index\":true}";
-
-        Property p = Property.of(_0 -> _0
-            .ip(_1 -> _1
-                .index(true)
-                .boost(1.0)
-                .fields(
-                    "a-field", _3 -> _3
-                    .float_(_4 -> _4
-                        .coerce(true)
-                    )
-                )
-            )
-        );
+        String expected = "{\"type\":\"ip\",\"fields\":{\"a-field\":{\"type\":\"float\",\"coerce\":true}},\"boost\":1"
+            + ".0,\"index\":true}";
+
+        Property p = Property.of(_0 -> _0.ip(_1 -> _1.index(true).boost(1.0).fields("a-field", _3 -> _3.float_(_4 -> _4.coerce(true)))));
 
         assertEquals(expected, toJson(p));
 
@@ -121,7 +105,6 @@ public void testBuilders() {
         assertEquals("{\"exists\":{\"field\":\"foo\"}}", toJson(q));
     }
 
-
     @Test
     public void testNestedTaggedUnionWithDefaultTag() {
 
@@ -132,57 +115,64 @@ public void testNestedTaggedUnionWithDefaultTag() {
         // Mappings are therefore a hierarchy of internally-tagged unions based on the "type" property
         // with a default "object" tag value if the "type" property is missing.
 
-        String json =
-            "{\n" +
-            "  \"testindex\" : {\n" +
-            "    \"mappings\" : {\n" +
-            "      \"properties\" : {\n" +
-            "        \"id\" : {\n" +
-            "          \"type\" : \"text\",\n" +
-            "          \"fields\" : {\n" +
-            "            \"keyword\" : {\n" +
-            "              \"type\" : \"keyword\",\n" +
-            "              \"ignore_above\" : 256\n" +
-            "            }\n" +
-            "          }\n" +
-            "        },\n" +
-            "        \"name\" : {\n" +
-            "          \"properties\" : {\n" +
-            "            \"first\" : {\n" +
-            "              \"type\" : \"text\",\n" +
-            "              \"fields\" : {\n" +
-            "                \"keyword\" : {\n" +
-            "                  \"type\" : \"keyword\",\n" +
-            "                  \"ignore_above\" : 256\n" +
-            "                }\n" +
-            "              }\n" +
-            "            },\n" +
-            "            \"last\" : {\n" +
-            "              \"type\" : \"text\",\n" +
-            "              \"fields\" : {\n" +
-            "                \"keyword\" : {\n" +
-            "                  \"type\" : \"keyword\",\n" +
-            "                  \"ignore_above\" : 256\n" +
-            "                }\n" +
-            "              }\n" +
-            "            }\n" +
-            "          }\n" +
-            "        }\n" +
-            "      }\n" +
-            "    }\n" +
-            "  }\n" +
-            "}";
+        String json = "{\n"
+            + "  \"testindex\" : {\n"
+            + "    \"mappings\" : {\n"
+            + "      \"properties\" : {\n"
+            + "        \"id\" : {\n"
+            + "          \"type\" : \"text\",\n"
+            + "          \"fields\" : {\n"
+            + "            \"keyword\" : {\n"
+            + "              \"type\" : \"keyword\",\n"
+            + "              \"ignore_above\" : 256\n"
+            + "            }\n"
+            + "          }\n"
+            + "        },\n"
+            + "        \"name\" : {\n"
+            + "          \"properties\" : {\n"
+            + "            \"first\" : {\n"
+            + "              \"type\" : \"text\",\n"
+            + "              \"fields\" : {\n"
+            + "                \"keyword\" : {\n"
+            + "                  \"type\" : \"keyword\",\n"
+            + "                  \"ignore_above\" : 256\n"
+            + "                }\n"
+            + "              }\n"
+            + "            },\n"
+            + "            \"last\" : {\n"
+            + "              \"type\" : \"text\",\n"
+            + "              \"fields\" : {\n"
+            + "                \"keyword\" : {\n"
+            + "                  \"type\" : \"keyword\",\n"
+            + "                  \"ignore_above\" : 256\n"
+            + "                }\n"
+            + "              }\n"
+            + "            }\n"
+            + "          }\n"
+            + "        }\n"
+            + "      }\n"
+            + "    }\n"
+            + "  }\n"
+            + "}";
 
         GetMappingResponse response = fromJson(json, GetMappingResponse.class);
 
         TypeMapping mappings = response.get("testindex").mappings();
         assertTrue(mappings.properties().get("name").isObject());
 
-        assertEquals(256, mappings
-            .properties().get("name").object()
-            .properties().get("first").text()
-            .fields().get("keyword").keyword().
-            ignoreAbove().longValue()
+        assertEquals(
+            256,
+            mappings.properties()
+                .get("name")
+                .object()
+                .properties()
+                .get("first")
+                .text()
+                .fields()
+                .get("keyword")
+                .keyword()
+                .ignoreAbove()
+                .longValue()
         );
 
         assertTrue(mappings.properties().get("id").isText());
@@ -201,10 +191,10 @@ public void testEmptyProperty() {
     @Test
     public void testNestedVariantsWithContainerProperties() {
 
-        SearchRequest search = SearchRequest.of(s -> s
-            .aggregations(
-                "agg1", a -> a
-                    .meta("m1", JsonData.of("m1 value"))
+        SearchRequest search = SearchRequest.of(
+            s -> s.aggregations(
+                "agg1",
+                a -> a.meta("m1", JsonData.of("m1 value"))
                     // Here we can choose any aggregation type, but build() isn't accessible
                     .valueCount(v -> v.field("f"))
                     // Here we can only set container properties (meta and (sub)aggregations) or build()